diff -Nru postgresql-9.5-9.5.2/config/perl.m4 postgresql-9.5-9.5.8/config/perl.m4
--- postgresql-9.5-9.5.2/config/perl.m4	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/config/perl.m4	2017-08-07 21:13:41.000000000 +0000
@@ -13,7 +13,7 @@
   pgac_perl_version=`$PERL -v 2>/dev/null | sed -n ['s/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p']`
   AC_MSG_NOTICE([using perl $pgac_perl_version])
   if echo "$pgac_perl_version" | sed ['s/[.a-z_]/ /g'] | \
-    $AWK '{ if ([$]1 = 5 && [$]2 >= 8) exit 1; else exit 0;}'
+    $AWK '{ if ([$]1 == 5 && [$]2 >= 8) exit 1; else exit 0;}'
   then
     AC_MSG_WARN([
 *** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
@@ -49,6 +49,31 @@
 [m4_foreach([pgac_item], [$1], [PGAC_CHECK_PERL_CONFIG(pgac_item)])])
 
 
+# PGAC_CHECK_PERL_EMBED_CCFLAGS
+# -----------------------------
+# We selectively extract stuff from $Config{ccflags}.  We don't really need
+# anything except -D switches, and other sorts of compiler switches can
+# actively break things if Perl was compiled with a different compiler.
+# Moreover, although Perl likes to put stuff like -D_LARGEFILE_SOURCE and
+# -D_FILE_OFFSET_BITS=64 here, it would be fatal to try to compile PL/Perl
+# to a different libc ABI than core Postgres uses.  The available information
+# says that all the symbols that affect Perl's own ABI begin with letters,
+# so it should be sufficient to adopt -D switches for symbols not beginning
+# with underscore.
+# For debugging purposes, let's have the configure output report the raw
+# ccflags value as well as the set of flags we chose to adopt.
+AC_DEFUN([PGAC_CHECK_PERL_EMBED_CCFLAGS],
+[AC_REQUIRE([PGAC_PATH_PERL])
+AC_MSG_CHECKING([for CFLAGS recommended by Perl])
+perl_ccflags=`$PERL -MConfig -e ['print $Config{ccflags}']`
+AC_MSG_RESULT([$perl_ccflags])
+AC_MSG_CHECKING([for CFLAGS to compile embedded Perl])
+perl_embed_ccflags=`$PERL -MConfig -e ['foreach $f (split(" ",$Config{ccflags})) {print $f, " " if ($f =~ /^-D[^_]/)}']`
+AC_SUBST(perl_embed_ccflags)dnl
+AC_MSG_RESULT([$perl_embed_ccflags])
+])# PGAC_CHECK_PERL_EMBED_CCFLAGS
+
+
 # PGAC_CHECK_PERL_EMBED_LDFLAGS
 # -----------------------------
 # We are after Embed's ldopts, but without the subset mentioned in
diff -Nru postgresql-9.5-9.5.2/config/programs.m4 postgresql-9.5-9.5.8/config/programs.m4
--- postgresql-9.5-9.5.2/config/programs.m4	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/config/programs.m4	2017-08-07 21:13:41.000000000 +0000
@@ -77,7 +77,7 @@
         echo '%%'  > conftest.l
         if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
           pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
-          if echo "$pgac_flex_version" | sed ['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 = 2 && ([$]2 > 5 || ([$]2 = 5 && [$]3 >= 31))) exit 0; else exit 1;}'
+          if echo "$pgac_flex_version" | sed ['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 == 2 && ([$]2 > 5 || ([$]2 == 5 && [$]3 >= 31))) exit 0; else exit 1;}'
           then
             pgac_cv_path_flex=$pgac_candidate
             break 2
diff -Nru postgresql-9.5-9.5.2/configure postgresql-9.5-9.5.8/configure
--- postgresql-9.5-9.5.2/configure	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/configure	2017-08-07 21:13:41.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PostgreSQL 9.5.2.
+# Generated by GNU Autoconf 2.69 for PostgreSQL 9.5.8.
 #
 # Report bugs to <pgsql-bugs@postgresql.org>.
 #
@@ -582,8 +582,8 @@
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='9.5.2'
-PACKAGE_STRING='PostgreSQL 9.5.2'
+PACKAGE_VERSION='9.5.8'
+PACKAGE_STRING='PostgreSQL 9.5.8'
 PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 PACKAGE_URL=''
 
@@ -670,6 +670,7 @@
 python_majorversion
 PYTHON
 perl_embed_ldflags
+perl_embed_ccflags
 perl_useshrplib
 perl_privlibexp
 perl_archlibexp
@@ -1395,7 +1396,7 @@
   # 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.5.2 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.5.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1460,7 +1461,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 9.5.2:";;
+     short | recursive ) echo "Configuration of PostgreSQL 9.5.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1610,7 +1611,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 9.5.2
+PostgreSQL configure 9.5.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2321,7 +2322,7 @@
 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.5.2, which was
+It was created by PostgreSQL $as_me 9.5.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7008,7 +7009,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 # When Autoconf chooses install-sh as install program it tries to generate
-# a relative path to it in each makefile where it subsitutes it. This clashes
+# a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $INSTALL in
   *install-sh*) install_bin='';;
@@ -7152,7 +7153,7 @@
 $as_echo "$MKDIR_P" >&6; }
 
 # When Autoconf chooses install-sh as mkdir -p program it tries to generate
-# a relative path to it in each makefile where it subsitutes it. This clashes
+# a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $MKDIR_P in
   *install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
@@ -7272,7 +7273,7 @@
         echo '%%'  > conftest.l
         if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
           pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
-          if echo "$pgac_flex_version" | sed 's/[.a-z]/ /g' | $AWK '{ if ($1 = 2 && ($2 > 5 || ($2 = 5 && $3 >= 31))) exit 0; else exit 1;}'
+          if echo "$pgac_flex_version" | sed 's/[.a-z]/ /g' | $AWK '{ if ($1 == 2 && ($2 > 5 || ($2 == 5 && $3 >= 31))) exit 0; else exit 1;}'
           then
             pgac_cv_path_flex=$pgac_candidate
             break 2
@@ -7370,7 +7371,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: using perl $pgac_perl_version" >&5
 $as_echo "$as_me: using perl $pgac_perl_version" >&6;}
   if echo "$pgac_perl_version" | sed 's/[.a-z_]/ /g' | \
-    $AWK '{ if ($1 = 5 && $2 >= 8) exit 1; else exit 0;}'
+    $AWK '{ if ($1 == 5 && $2 >= 8) exit 1; else exit 0;}'
   then
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 *** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
@@ -7425,6 +7426,18 @@
 PL/Perl." "$LINENO" 5
   fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS recommended by Perl" >&5
+$as_echo_n "checking for CFLAGS recommended by Perl... " >&6; }
+perl_ccflags=`$PERL -MConfig -e 'print $Config{ccflags}'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_ccflags" >&5
+$as_echo "$perl_ccflags" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS to compile embedded Perl" >&5
+$as_echo_n "checking for CFLAGS to compile embedded Perl... " >&6; }
+perl_embed_ccflags=`$PERL -MConfig -e 'foreach $f (split(" ",$Config{ccflags})) {print $f, " " if ($f =~ /^-D[^_]/)}'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_embed_ccflags" >&5
+$as_echo "$perl_embed_ccflags" >&6; }
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flags to link embedded Perl" >&5
 $as_echo_n "checking for flags to link embedded Perl... " >&6; }
 if test "$PORTNAME" = "win32" ; then
@@ -8704,9 +8717,9 @@
   as_fn_error $? "library 'crypto' is required for OpenSSL" "$LINENO" 5
 fi
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
+$as_echo_n "checking for SSL_new in -lssl... " >&6; }
+if ${ac_cv_lib_ssl_SSL_new+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8720,27 +8733,27 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char SSL_new ();
 int
 main ()
 {
-return SSL_library_init ();
+return SSL_new ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ssl_SSL_library_init=yes
+  ac_cv_lib_ssl_SSL_new=yes
 else
-  ac_cv_lib_ssl_SSL_library_init=no
+  ac_cv_lib_ssl_SSL_new=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSSL 1
 _ACEOF
@@ -8810,9 +8823,9 @@
   as_fn_error $? "library 'eay32' or 'crypto' is required for OpenSSL" "$LINENO" 5
 fi
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
-if ${ac_cv_search_SSL_library_init+:} false; then :
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_new" >&5
+$as_echo_n "checking for library containing SSL_new... " >&6; }
+if ${ac_cv_search_SSL_new+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -8825,11 +8838,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char SSL_new ();
 int
 main ()
 {
-return SSL_library_init ();
+return SSL_new ();
   ;
   return 0;
 }
@@ -8842,25 +8855,25 @@
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SSL_library_init=$ac_res
+  ac_cv_search_SSL_new=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_SSL_library_init+:} false; then :
+  if ${ac_cv_search_SSL_new+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_SSL_library_init+:} false; then :
+if ${ac_cv_search_SSL_new+:} false; then :
 
 else
-  ac_cv_search_SSL_library_init=no
+  ac_cv_search_SSL_new=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
-$as_echo "$ac_cv_search_SSL_library_init" >&6; }
-ac_res=$ac_cv_search_SSL_library_init
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_new" >&5
+$as_echo "$ac_cv_search_SSL_new" >&6; }
+ac_res=$ac_cv_search_SSL_new
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
@@ -8880,6 +8893,37 @@
 fi
 done
 
+  # Functions introduced in OpenSSL 1.1.0. We used to check for
+  # OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
+  # defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
+  # doesn't have these OpenSSL 1.1.0 functions. So check for individual
+  # functions.
+  for ac_func in OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+  # OpenSSL versions before 1.1.0 required setting callback functions, for
+  # thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
+  # function was removed.
+  for ac_func in CRYPTO_lock
+do :
+  ac_fn_c_check_func "$LINENO" "CRYPTO_lock" "ac_cv_func_CRYPTO_lock"
+if test "x$ac_cv_func_CRYPTO_lock" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CRYPTO_LOCK 1
+_ACEOF
+
+fi
+done
+
 fi
 
 if test "$with_pam" = yes ; then
@@ -16195,7 +16239,7 @@
 # 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.5.2, which was
+This file was extended by PostgreSQL $as_me 9.5.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16265,7 +16309,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-PostgreSQL config.status 9.5.2
+PostgreSQL config.status 9.5.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru postgresql-9.5-9.5.2/configure.in postgresql-9.5-9.5.8/configure.in
--- postgresql-9.5-9.5.2/configure.in	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/configure.in	2017-08-07 21:13:41.000000000 +0000
@@ -17,7 +17,7 @@
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [9.5.2], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [9.5.8], [pgsql-bugs@postgresql.org])
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not
@@ -862,7 +862,7 @@
 
 AC_PROG_INSTALL
 # When Autoconf chooses install-sh as install program it tries to generate
-# a relative path to it in each makefile where it subsitutes it. This clashes
+# a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $INSTALL in
   *install-sh*) install_bin='';;
@@ -875,7 +875,7 @@
 AC_PROG_AWK
 AC_PROG_MKDIR_P
 # When Autoconf chooses install-sh as mkdir -p program it tries to generate
-# a relative path to it in each makefile where it subsitutes it. This clashes
+# a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $MKDIR_P in
   *install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
@@ -896,6 +896,7 @@
 documentation for details.  Use --without-perl to disable building
 PL/Perl.])
   fi
+  PGAC_CHECK_PERL_EMBED_CCFLAGS
   PGAC_CHECK_PERL_EMBED_LDFLAGS
 fi
 
@@ -1028,12 +1029,22 @@
   dnl Order matters!
   if test "$PORTNAME" != "win32"; then
      AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
-     AC_CHECK_LIB(ssl,    SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
+     AC_CHECK_LIB(ssl,    SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
   else
      AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
-     AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
+     AC_SEARCH_LIBS(SSL_new, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
   fi
   AC_CHECK_FUNCS([SSL_get_current_compression])
+  # Functions introduced in OpenSSL 1.1.0. We used to check for
+  # OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
+  # defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
+  # doesn't have these OpenSSL 1.1.0 functions. So check for individual
+  # functions.
+  AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL])
+  # OpenSSL versions before 1.1.0 required setting callback functions, for
+  # thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
+  # function was removed.
+  AC_CHECK_FUNCS([CRYPTO_lock])
 fi
 
 if test "$with_pam" = yes ; then
diff -Nru postgresql-9.5-9.5.2/contrib/adminpack/adminpack.c postgresql-9.5-9.5.8/contrib/adminpack/adminpack.c
--- postgresql-9.5-9.5.2/contrib/adminpack/adminpack.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/adminpack/adminpack.c	2017-08-07 21:13:41.000000000 +0000
@@ -136,10 +136,10 @@
 					(ERRCODE_DUPLICATE_FILE,
 					 errmsg("file \"%s\" exists", filename)));
 
-		f = fopen(filename, "wb");
+		f = AllocateFile(filename, "wb");
 	}
 	else
-		f = fopen(filename, "ab");
+		f = AllocateFile(filename, "ab");
 
 	if (!f)
 		ereport(ERROR,
@@ -147,16 +147,11 @@
 				 errmsg("could not open file \"%s\" for writing: %m",
 						filename)));
 
-	if (VARSIZE(data) != 0)
-	{
-		count = fwrite(VARDATA(data), 1, VARSIZE(data) - VARHDRSZ, f);
-
-		if (count != VARSIZE(data) - VARHDRSZ)
-			ereport(ERROR,
-					(errcode_for_file_access(),
-					 errmsg("could not write file \"%s\": %m", filename)));
-	}
-	fclose(f);
+	count = fwrite(VARDATA(data), 1, VARSIZE(data) - VARHDRSZ, f);
+	if (count != VARSIZE(data) - VARHDRSZ || FreeFile(f))
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not write file \"%s\": %m", filename)));
 
 	PG_RETURN_INT64(count);
 }
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gin/btree_gin.c postgresql-9.5-9.5.8/contrib/btree_gin/btree_gin.c
--- postgresql-9.5-9.5.2/contrib/btree_gin/btree_gin.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gin/btree_gin.c	2017-08-07 21:13:41.000000000 +0000
@@ -223,10 +223,7 @@
 static Datum
 leftmostvalue_int8(void)
 {
-	/*
-	 * Use sequence's definition to keep compatibility.
-	 */
-	return Int64GetDatum(SEQ_MINVALUE);
+	return Int64GetDatum(PG_INT64_MIN);
 }
 
 GIN_SUPPORT(int8, false, leftmostvalue_int8, btint8cmp)
@@ -250,10 +247,7 @@
 static Datum
 leftmostvalue_money(void)
 {
-	/*
-	 * Use sequence's definition to keep compatibility.
-	 */
-	return Int64GetDatum(SEQ_MINVALUE);
+	return Int64GetDatum(PG_INT64_MIN);
 }
 
 GIN_SUPPORT(money, false, leftmostvalue_money, cash_cmp)
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gin/expected/bytea.out postgresql-9.5-9.5.8/contrib/btree_gin/expected/bytea.out
--- postgresql-9.5-9.5.2/contrib/btree_gin/expected/bytea.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gin/expected/bytea.out	2017-08-07 21:13:41.000000000 +0000
@@ -4,13 +4,13 @@
 CREATE TABLE test_bytea (
 	i bytea
 );
-INSERT INTO test_bytea VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_bytea VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 CREATE INDEX idx_bytea ON test_bytea USING gin (i);
 SELECT * FROM test_bytea WHERE i<'abc'::bytea ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
 (3 rows)
 
@@ -18,7 +18,7 @@
   i  
 -----
  a
- aaa
+ ab
  abb
  abc
 (4 rows)
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gin/expected/text.out postgresql-9.5-9.5.8/contrib/btree_gin/expected/text.out
--- postgresql-9.5-9.5.2/contrib/btree_gin/expected/text.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gin/expected/text.out	2017-08-07 21:13:41.000000000 +0000
@@ -2,13 +2,13 @@
 CREATE TABLE test_text (
 	i text
 );
-INSERT INTO test_text VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_text VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 CREATE INDEX idx_text ON test_text USING gin (i);
 SELECT * FROM test_text WHERE i<'abc' ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
 (3 rows)
 
@@ -16,7 +16,7 @@
   i  
 -----
  a
- aaa
+ ab
  abb
  abc
 (4 rows)
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gin/expected/varchar.out postgresql-9.5-9.5.8/contrib/btree_gin/expected/varchar.out
--- postgresql-9.5-9.5.2/contrib/btree_gin/expected/varchar.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gin/expected/varchar.out	2017-08-07 21:13:41.000000000 +0000
@@ -2,13 +2,13 @@
 CREATE TABLE test_varchar (
 	i varchar
 );
-INSERT INTO test_varchar VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_varchar VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 CREATE INDEX idx_varchar ON test_varchar USING gin (i);
 SELECT * FROM test_varchar WHERE i<'abc'::varchar ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
 (3 rows)
 
@@ -16,7 +16,7 @@
   i  
 -----
  a
- aaa
+ ab
  abb
  abc
 (4 rows)
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gin/sql/bytea.sql postgresql-9.5-9.5.8/contrib/btree_gin/sql/bytea.sql
--- postgresql-9.5-9.5.2/contrib/btree_gin/sql/bytea.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gin/sql/bytea.sql	2017-08-07 21:13:41.000000000 +0000
@@ -6,7 +6,7 @@
 	i bytea
 );
 
-INSERT INTO test_bytea VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_bytea VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 
 CREATE INDEX idx_bytea ON test_bytea USING gin (i);
 
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gin/sql/text.sql postgresql-9.5-9.5.8/contrib/btree_gin/sql/text.sql
--- postgresql-9.5-9.5.2/contrib/btree_gin/sql/text.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gin/sql/text.sql	2017-08-07 21:13:41.000000000 +0000
@@ -4,7 +4,7 @@
 	i text
 );
 
-INSERT INTO test_text VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_text VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 
 CREATE INDEX idx_text ON test_text USING gin (i);
 
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gin/sql/varchar.sql postgresql-9.5-9.5.8/contrib/btree_gin/sql/varchar.sql
--- postgresql-9.5-9.5.2/contrib/btree_gin/sql/varchar.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gin/sql/varchar.sql	2017-08-07 21:13:41.000000000 +0000
@@ -4,7 +4,7 @@
 	i varchar
 );
 
-INSERT INTO test_varchar VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_varchar VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 
 CREATE INDEX idx_varchar ON test_varchar USING gin (i);
 
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gist/expected/interval.out postgresql-9.5-9.5.8/contrib/btree_gist/expected/interval.out
--- postgresql-9.5-9.5.2/contrib/btree_gist/expected/interval.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gist/expected/interval.out	2017-08-07 21:13:41.000000000 +0000
@@ -89,3 +89,21 @@
  @ 220 days 19 hours 5 mins 42 secs  | @ 21 days -2 hours -15 mins -41 secs
 (3 rows)
 
+SET enable_indexonlyscan=off;
+EXPLAIN (COSTS OFF)
+SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Limit
+   ->  Index Scan using intervalidx on intervaltmp
+         Order By: (a <-> '@ 199 days 21 hours 21 mins 23 secs'::interval)
+(3 rows)
+
+SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
+                  a                  |               ?column?               
+-------------------------------------+--------------------------------------
+ @ 199 days 21 hours 21 mins 23 secs | @ 0
+ @ 183 days 6 hours 52 mins 48 secs  | @ 16 days 14 hours 28 mins 35 secs
+ @ 220 days 19 hours 5 mins 42 secs  | @ 21 days -2 hours -15 mins -41 secs
+(3 rows)
+
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gist/expected/not_equal.out postgresql-9.5-9.5.8/contrib/btree_gist/expected/not_equal.out
--- postgresql-9.5-9.5.2/contrib/btree_gist/expected/not_equal.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gist/expected/not_equal.out	2017-08-07 21:13:41.000000000 +0000
@@ -9,6 +9,7 @@
 INSERT INTO test_ne VALUES('2007-02-03', -91.3);
 INSERT INTO test_ne VALUES('2011-09-01', 43.7);
 INSERT INTO test_ne SELECT '2009-01-01', 10.7 FROM generate_series(1,1000);
+SET enable_indexscan to false;
 EXPLAIN (COSTS OFF) SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
                                               QUERY PLAN                                              
 ------------------------------------------------------------------------------------------------------
@@ -25,6 +26,7 @@
  Thu Sep 01 00:00:00 2011 |  43.7
 (2 rows)
 
+RESET enable_indexscan;
 -- test search for "not equals" using an exclusion constraint
 CREATE TABLE zoo (
    cage   INTEGER,
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gist/sql/interval.sql postgresql-9.5-9.5.8/contrib/btree_gist/sql/interval.sql
--- postgresql-9.5-9.5.2/contrib/btree_gist/sql/interval.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gist/sql/interval.sql	2017-08-07 21:13:41.000000000 +0000
@@ -35,3 +35,9 @@
 EXPLAIN (COSTS OFF)
 SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
 SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
+
+SET enable_indexonlyscan=off;
+
+EXPLAIN (COSTS OFF)
+SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
+SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
diff -Nru postgresql-9.5-9.5.2/contrib/btree_gist/sql/not_equal.sql postgresql-9.5-9.5.8/contrib/btree_gist/sql/not_equal.sql
--- postgresql-9.5-9.5.2/contrib/btree_gist/sql/not_equal.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/btree_gist/sql/not_equal.sql	2017-08-07 21:13:41.000000000 +0000
@@ -14,10 +14,14 @@
 INSERT INTO test_ne VALUES('2011-09-01', 43.7);
 INSERT INTO test_ne SELECT '2009-01-01', 10.7 FROM generate_series(1,1000);
 
+SET enable_indexscan to false;
+
 EXPLAIN (COSTS OFF) SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
 
 SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
 
+RESET enable_indexscan;
+
 -- test search for "not equals" using an exclusion constraint
 
 CREATE TABLE zoo (
diff -Nru postgresql-9.5-9.5.2/contrib/citext/expected/citext_1.out postgresql-9.5-9.5.8/contrib/citext/expected/citext_1.out
--- postgresql-9.5-9.5.2/contrib/citext/expected/citext_1.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/citext/expected/citext_1.out	2017-08-07 21:13:41.000000000 +0000
@@ -175,7 +175,7 @@
  f
 (1 row)
 
--- A couple of longer examlpes to ensure that we don't get any issues with bad
+-- A couple of longer examples to ensure that we don't get any issues with bad
 -- conversions to char[] in the c code. Yes, I did do this.
 SELECT 'aardvark'::citext = 'aardvark'::citext AS t;
  t 
@@ -272,14 +272,14 @@
 INSERT INTO try (name) VALUES ('aB');
 ERROR:  duplicate key value violates unique constraint "try_pkey"
 DETAIL:  Key (name)=(aB) already exists.
--- Make sure that citext_smaller() and citext_lager() work properly.
-SELECT citext_smaller( 'aa'::citext, 'ab'::citext ) = 'aa' AS t;
+-- Make sure that citext_smaller() and citext_larger() work properly.
+SELECT citext_smaller( 'ab'::citext, 'ac'::citext ) = 'ab' AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT citext_smaller( 'AAAA'::citext, 'bbbb'::citext ) = 'AAAA' AS t;
+SELECT citext_smaller( 'ABC'::citext, 'bbbb'::citext ) = 'ABC' AS t;
  t 
 ---
  t
@@ -297,13 +297,13 @@
  t
 (1 row)
 
-SELECT citext_larger( 'aa'::citext, 'ab'::citext ) = 'ab' AS t;
+SELECT citext_larger( 'ab'::citext, 'ac'::citext ) = 'ac' AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT citext_larger( 'AAAA'::citext, 'bbbb'::citext ) = 'bbbb' AS t;
+SELECT citext_larger( 'ABC'::citext, 'bbbb'::citext ) = 'bbbb' AS t;
  t 
 ---
  t
@@ -320,18 +320,17 @@
    name CITEXT
 );
 INSERT INTO srt (name)
-VALUES ('aardvark'),
-       ('AAA'),
-       ('aba'),
+VALUES ('abb'),
+       ('ABA'),
        ('ABC'),
        ('abd');
 CREATE INDEX srt_name ON srt (name);
 -- Check the min() and max() aggregates, with and without index.
 set enable_seqscan = off;
-SELECT MIN(name) AS "AAA" FROM srt;
- AAA 
+SELECT MIN(name) AS "ABA" FROM srt;
+ ABA 
 -----
- AAA
+ ABA
 (1 row)
 
 SELECT MAX(name) AS abd FROM srt;
@@ -342,10 +341,10 @@
 
 reset enable_seqscan;
 set enable_indexscan = off;
-SELECT MIN(name) AS "AAA" FROM srt;
- AAA 
+SELECT MIN(name) AS "ABA" FROM srt;
+ ABA 
 -----
- AAA
+ ABA
 (1 row)
 
 SELECT MAX(name) AS abd FROM srt;
@@ -358,162 +357,146 @@
 -- Check sorting likewise
 set enable_seqscan = off;
 SELECT name FROM srt ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 reset enable_seqscan;
 set enable_indexscan = off;
 SELECT name FROM srt ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 reset enable_indexscan;
 -- Test assignment casts.
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::text;
- aaa 
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::text;
+ aba 
 -----
- aaa
+ aba
 (1 row)
 
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::varchar;
- aaa 
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::varchar;
+ aba 
 -----
- aaa
+ aba
 (1 row)
 
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::bpchar;
- aaa 
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::bpchar;
+ aba 
 -----
- aaa
+ aba
 (1 row)
 
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA';
- aaa 
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA';
+ aba 
 -----
- aaa
+ aba
 (1 row)
 
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::citext;
- aaa 
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::citext;
+ aba 
 -----
- aaa
+ aba
 (1 row)
 
 -- LIKE should be case-insensitive
 SELECT name FROM srt WHERE name     LIKE '%a%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name NOT LIKE '%b%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
-(2 rows)
+ name 
+------
+(0 rows)
 
 SELECT name FROM srt WHERE name     LIKE '%A%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name NOT LIKE '%B%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
-(2 rows)
+ name 
+------
+(0 rows)
 
 -- ~~ should be case-insensitive
 SELECT name FROM srt WHERE name ~~  '%a%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name !~~ '%b%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
-(2 rows)
+ name 
+------
+(0 rows)
 
 SELECT name FROM srt WHERE name ~~  '%A%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name !~~ '%B%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
-(2 rows)
+ name 
+------
+(0 rows)
 
 -- ~ should be case-insensitive
 SELECT name FROM srt WHERE name ~  '^a' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name !~ 'a$' ORDER BY name;
-   name   
-----------
- aardvark
+ name 
+------
+ abb
  ABC
  abd
 (3 rows)
 
 SELECT name FROM srt WHERE name ~  '^A' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name !~ 'A$' ORDER BY name;
-   name   
-----------
- aardvark
+ name 
+------
+ abb
  ABC
  abd
 (3 rows)
@@ -522,16 +505,14 @@
 SELECT name FROM srt WHERE name SIMILAR TO '%a.*';
  name 
 ------
- AAA
- aba
-(2 rows)
+ ABA
+(1 row)
 
 SELECT name FROM srt WHERE name SIMILAR TO '%A.*';
  name 
 ------
- AAA
- aba
-(2 rows)
+ ABA
+(1 row)
 
 -- Explicit casts.
 SELECT true::citext = 'true' AS t;
@@ -1503,8 +1484,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT textlen( name ) = textlen( name::text ) AS t FROM srt;
  t 
@@ -1513,8 +1493,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT char_length( name ) = char_length( name::text ) AS t FROM srt;
  t 
@@ -1523,8 +1502,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT lower( name ) = lower( name::text ) AS t FROM srt;
  t 
@@ -1533,8 +1511,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT octet_length( name ) = octet_length( name::text ) AS t FROM srt;
  t 
@@ -1543,8 +1520,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT overlay( name placing 'hom' from 2 for 4) = overlay( name::text placing 'hom' from 2 for 4) AS t FROM srt;
  t 
@@ -1553,8 +1529,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT position( 'a' IN name ) = position( 'a' IN name::text ) AS t FROM srt;
  t 
@@ -1563,8 +1538,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT substr('alphabet'::citext, 3)       = 'phabet' AS t;
  t 
@@ -1645,8 +1619,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 -- Table 9-6. Other String Functions.
 SELECT ascii( name ) = ascii( name::text ) AS t FROM srt;
@@ -1656,8 +1629,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT btrim('    trim'::citext                   ) = 'trim' AS t;
  t 
@@ -1698,8 +1670,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT decode('MTIzAAE='::citext, 'base64') = decode('MTIzAAE='::text, 'base64') AS t;
  t 
@@ -1721,8 +1692,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT lpad('hi'::citext, 5              ) = '   hi' AS t;
  t 
@@ -1779,8 +1749,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 -- pg_client_encoding() takes no args and returns name.
 SELECT quote_ident( name ) = quote_ident( name::text ) AS t FROM srt;
@@ -1790,8 +1759,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT quote_literal( name ) = quote_literal( name::text ) AS t FROM srt;
  t 
@@ -1800,8 +1768,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT regexp_matches('foobarbequebaz'::citext, '(bar)(beque)') = ARRAY[ 'bar', 'beque' ] AS t;
  t 
@@ -2106,37 +2073,37 @@
  t
 (1 row)
 
-SELECT strpos('high'::citext, 'ig'        ) = 2 AS t;
+SELECT strpos('high'::citext, 'gh'        ) = 3 AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT strpos('high',         'ig'::citext) = 2 AS t;
+SELECT strpos('high',         'gh'::citext) = 3 AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT strpos('high'::citext, 'ig'::citext) = 2 AS t;
+SELECT strpos('high'::citext, 'gh'::citext) = 3 AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT strpos('high'::citext, 'IG'        ) = 2 AS t;
+SELECT strpos('high'::citext, 'GH'        ) = 3 AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT strpos('high',         'IG'::citext) = 2 AS t;
+SELECT strpos('high',         'GH'::citext) = 3 AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT strpos('high'::citext, 'IG'::citext) = 2 AS t;
+SELECT strpos('high'::citext, 'GH'::citext) = 3 AS t;
  t 
 ---
  t
@@ -2270,8 +2237,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT like_escape( name::text, ''::citext ) = like_escape( name::text, '' ) AS t FROM srt;
  t 
@@ -2280,8 +2246,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 -- Ensure correct behavior for citext with materialized views.
 CREATE TABLE citext_table (
diff -Nru postgresql-9.5-9.5.2/contrib/citext/expected/citext.out postgresql-9.5-9.5.8/contrib/citext/expected/citext.out
--- postgresql-9.5-9.5.2/contrib/citext/expected/citext.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/citext/expected/citext.out	2017-08-07 21:13:41.000000000 +0000
@@ -175,7 +175,7 @@
  t
 (1 row)
 
--- A couple of longer examlpes to ensure that we don't get any issues with bad
+-- A couple of longer examples to ensure that we don't get any issues with bad
 -- conversions to char[] in the c code. Yes, I did do this.
 SELECT 'aardvark'::citext = 'aardvark'::citext AS t;
  t 
@@ -272,14 +272,14 @@
 INSERT INTO try (name) VALUES ('aB');
 ERROR:  duplicate key value violates unique constraint "try_pkey"
 DETAIL:  Key (name)=(aB) already exists.
--- Make sure that citext_smaller() and citext_lager() work properly.
-SELECT citext_smaller( 'aa'::citext, 'ab'::citext ) = 'aa' AS t;
+-- Make sure that citext_smaller() and citext_larger() work properly.
+SELECT citext_smaller( 'ab'::citext, 'ac'::citext ) = 'ab' AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT citext_smaller( 'AAAA'::citext, 'bbbb'::citext ) = 'AAAA' AS t;
+SELECT citext_smaller( 'ABC'::citext, 'bbbb'::citext ) = 'ABC' AS t;
  t 
 ---
  t
@@ -297,13 +297,13 @@
  t
 (1 row)
 
-SELECT citext_larger( 'aa'::citext, 'ab'::citext ) = 'ab' AS t;
+SELECT citext_larger( 'ab'::citext, 'ac'::citext ) = 'ac' AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT citext_larger( 'AAAA'::citext, 'bbbb'::citext ) = 'bbbb' AS t;
+SELECT citext_larger( 'ABC'::citext, 'bbbb'::citext ) = 'bbbb' AS t;
  t 
 ---
  t
@@ -320,18 +320,17 @@
    name CITEXT
 );
 INSERT INTO srt (name)
-VALUES ('aardvark'),
-       ('AAA'),
-       ('aba'),
+VALUES ('abb'),
+       ('ABA'),
        ('ABC'),
        ('abd');
 CREATE INDEX srt_name ON srt (name);
 -- Check the min() and max() aggregates, with and without index.
 set enable_seqscan = off;
-SELECT MIN(name) AS "AAA" FROM srt;
- AAA 
+SELECT MIN(name) AS "ABA" FROM srt;
+ ABA 
 -----
- AAA
+ ABA
 (1 row)
 
 SELECT MAX(name) AS abd FROM srt;
@@ -342,10 +341,10 @@
 
 reset enable_seqscan;
 set enable_indexscan = off;
-SELECT MIN(name) AS "AAA" FROM srt;
- AAA 
+SELECT MIN(name) AS "ABA" FROM srt;
+ ABA 
 -----
- AAA
+ ABA
 (1 row)
 
 SELECT MAX(name) AS abd FROM srt;
@@ -358,162 +357,146 @@
 -- Check sorting likewise
 set enable_seqscan = off;
 SELECT name FROM srt ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 reset enable_seqscan;
 set enable_indexscan = off;
 SELECT name FROM srt ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 reset enable_indexscan;
 -- Test assignment casts.
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::text;
- aaa 
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::text;
+ aba 
 -----
- aaa
+ aba
 (1 row)
 
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::varchar;
- aaa 
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::varchar;
+ aba 
 -----
- aaa
+ aba
 (1 row)
 
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::bpchar;
- aaa 
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::bpchar;
+ aba 
 -----
- aaa
+ aba
 (1 row)
 
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA';
- aaa 
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA';
+ aba 
 -----
- aaa
+ aba
 (1 row)
 
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::citext;
- aaa 
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::citext;
+ aba 
 -----
- aaa
+ aba
 (1 row)
 
 -- LIKE should be case-insensitive
 SELECT name FROM srt WHERE name     LIKE '%a%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name NOT LIKE '%b%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
-(2 rows)
+ name 
+------
+(0 rows)
 
 SELECT name FROM srt WHERE name     LIKE '%A%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name NOT LIKE '%B%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
-(2 rows)
+ name 
+------
+(0 rows)
 
 -- ~~ should be case-insensitive
 SELECT name FROM srt WHERE name ~~  '%a%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name !~~ '%b%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
-(2 rows)
+ name 
+------
+(0 rows)
 
 SELECT name FROM srt WHERE name ~~  '%A%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name !~~ '%B%' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
-(2 rows)
+ name 
+------
+(0 rows)
 
 -- ~ should be case-insensitive
 SELECT name FROM srt WHERE name ~  '^a' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name !~ 'a$' ORDER BY name;
-   name   
-----------
- aardvark
+ name 
+------
+ abb
  ABC
  abd
 (3 rows)
 
 SELECT name FROM srt WHERE name ~  '^A' ORDER BY name;
-   name   
-----------
- AAA
- aardvark
- aba
+ name 
+------
+ ABA
+ abb
  ABC
  abd
-(5 rows)
+(4 rows)
 
 SELECT name FROM srt WHERE name !~ 'A$' ORDER BY name;
-   name   
-----------
- aardvark
+ name 
+------
+ abb
  ABC
  abd
 (3 rows)
@@ -522,16 +505,14 @@
 SELECT name FROM srt WHERE name SIMILAR TO '%a.*';
  name 
 ------
- AAA
- aba
-(2 rows)
+ ABA
+(1 row)
 
 SELECT name FROM srt WHERE name SIMILAR TO '%A.*';
  name 
 ------
- AAA
- aba
-(2 rows)
+ ABA
+(1 row)
 
 -- Explicit casts.
 SELECT true::citext = 'true' AS t;
@@ -1503,8 +1484,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT textlen( name ) = textlen( name::text ) AS t FROM srt;
  t 
@@ -1513,8 +1493,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT char_length( name ) = char_length( name::text ) AS t FROM srt;
  t 
@@ -1523,8 +1502,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT lower( name ) = lower( name::text ) AS t FROM srt;
  t 
@@ -1533,8 +1511,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT octet_length( name ) = octet_length( name::text ) AS t FROM srt;
  t 
@@ -1543,8 +1520,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT overlay( name placing 'hom' from 2 for 4) = overlay( name::text placing 'hom' from 2 for 4) AS t FROM srt;
  t 
@@ -1553,8 +1529,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT position( 'a' IN name ) = position( 'a' IN name::text ) AS t FROM srt;
  t 
@@ -1563,8 +1538,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT substr('alphabet'::citext, 3)       = 'phabet' AS t;
  t 
@@ -1645,8 +1619,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 -- Table 9-6. Other String Functions.
 SELECT ascii( name ) = ascii( name::text ) AS t FROM srt;
@@ -1656,8 +1629,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT btrim('    trim'::citext                   ) = 'trim' AS t;
  t 
@@ -1698,8 +1670,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT decode('MTIzAAE='::citext, 'base64') = decode('MTIzAAE='::text, 'base64') AS t;
  t 
@@ -1721,8 +1692,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT lpad('hi'::citext, 5              ) = '   hi' AS t;
  t 
@@ -1779,8 +1749,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 -- pg_client_encoding() takes no args and returns name.
 SELECT quote_ident( name ) = quote_ident( name::text ) AS t FROM srt;
@@ -1790,8 +1759,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT quote_literal( name ) = quote_literal( name::text ) AS t FROM srt;
  t 
@@ -1800,8 +1768,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT regexp_matches('foobarbequebaz'::citext, '(bar)(beque)') = ARRAY[ 'bar', 'beque' ] AS t;
  t 
@@ -2106,37 +2073,37 @@
  t
 (1 row)
 
-SELECT strpos('high'::citext, 'ig'        ) = 2 AS t;
+SELECT strpos('high'::citext, 'gh'        ) = 3 AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT strpos('high',         'ig'::citext) = 2 AS t;
+SELECT strpos('high',         'gh'::citext) = 3 AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT strpos('high'::citext, 'ig'::citext) = 2 AS t;
+SELECT strpos('high'::citext, 'gh'::citext) = 3 AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT strpos('high'::citext, 'IG'        ) = 2 AS t;
+SELECT strpos('high'::citext, 'GH'        ) = 3 AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT strpos('high',         'IG'::citext) = 2 AS t;
+SELECT strpos('high',         'GH'::citext) = 3 AS t;
  t 
 ---
  t
 (1 row)
 
-SELECT strpos('high'::citext, 'IG'::citext) = 2 AS t;
+SELECT strpos('high'::citext, 'GH'::citext) = 3 AS t;
  t 
 ---
  t
@@ -2270,8 +2237,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 SELECT like_escape( name::text, ''::citext ) = like_escape( name::text, '' ) AS t FROM srt;
  t 
@@ -2280,8 +2246,7 @@
  t
  t
  t
- t
-(5 rows)
+(4 rows)
 
 -- Ensure correct behavior for citext with materialized views.
 CREATE TABLE citext_table (
diff -Nru postgresql-9.5-9.5.2/contrib/citext/sql/citext.sql postgresql-9.5-9.5.8/contrib/citext/sql/citext.sql
--- postgresql-9.5-9.5.2/contrib/citext/sql/citext.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/citext/sql/citext.sql	2017-08-07 21:13:41.000000000 +0000
@@ -72,7 +72,7 @@
 SELECT 'a'::citext >  'B'::varchar AS t;  -- varchar wins.
 SELECT 'a'::citext >= 'B'::varchar AS t;  -- varchar wins.
 
--- A couple of longer examlpes to ensure that we don't get any issues with bad
+-- A couple of longer examples to ensure that we don't get any issues with bad
 -- conversions to char[] in the c code. Yes, I did do this.
 
 SELECT 'aardvark'::citext = 'aardvark'::citext AS t;
@@ -104,14 +104,14 @@
 INSERT INTO try (name) VALUES ('A');
 INSERT INTO try (name) VALUES ('aB');
 
--- Make sure that citext_smaller() and citext_lager() work properly.
-SELECT citext_smaller( 'aa'::citext, 'ab'::citext ) = 'aa' AS t;
-SELECT citext_smaller( 'AAAA'::citext, 'bbbb'::citext ) = 'AAAA' AS t;
+-- Make sure that citext_smaller() and citext_larger() work properly.
+SELECT citext_smaller( 'ab'::citext, 'ac'::citext ) = 'ab' AS t;
+SELECT citext_smaller( 'ABC'::citext, 'bbbb'::citext ) = 'ABC' AS t;
 SELECT citext_smaller( 'aardvark'::citext, 'Aaba'::citext ) = 'Aaba' AS t;
 SELECT citext_smaller( 'aardvark'::citext, 'AARDVARK'::citext ) = 'AARDVARK' AS t;
 
-SELECT citext_larger( 'aa'::citext, 'ab'::citext ) = 'ab' AS t;
-SELECT citext_larger( 'AAAA'::citext, 'bbbb'::citext ) = 'bbbb' AS t;
+SELECT citext_larger( 'ab'::citext, 'ac'::citext ) = 'ac' AS t;
+SELECT citext_larger( 'ABC'::citext, 'bbbb'::citext ) = 'bbbb' AS t;
 SELECT citext_larger( 'aardvark'::citext, 'Aaba'::citext ) = 'aardvark' AS t;
 
 -- Test aggregate functions and sort ordering
@@ -121,9 +121,8 @@
 );
 
 INSERT INTO srt (name)
-VALUES ('aardvark'),
-       ('AAA'),
-       ('aba'),
+VALUES ('abb'),
+       ('ABA'),
        ('ABC'),
        ('abd');
 
@@ -131,11 +130,11 @@
 
 -- Check the min() and max() aggregates, with and without index.
 set enable_seqscan = off;
-SELECT MIN(name) AS "AAA" FROM srt;
+SELECT MIN(name) AS "ABA" FROM srt;
 SELECT MAX(name) AS abd FROM srt;
 reset enable_seqscan;
 set enable_indexscan = off;
-SELECT MIN(name) AS "AAA" FROM srt;
+SELECT MIN(name) AS "ABA" FROM srt;
 SELECT MAX(name) AS abd FROM srt;
 reset enable_indexscan;
 
@@ -148,11 +147,11 @@
 reset enable_indexscan;
 
 -- Test assignment casts.
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::text;
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::varchar;
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::bpchar;
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA';
-SELECT LOWER(name) as aaa FROM srt WHERE name = 'AAA'::citext;
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::text;
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::varchar;
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::bpchar;
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA';
+SELECT LOWER(name) as aba FROM srt WHERE name = 'ABA'::citext;
 
 -- LIKE should be case-insensitive
 SELECT name FROM srt WHERE name     LIKE '%a%' ORDER BY name;
@@ -657,12 +656,12 @@
 SELECT split_part('abcTdefTghi'::citext, 't'::citext, 2) = 'def' AS t;
 SELECT split_part('abcTdefTghi', 't'::citext, 2) = 'def' AS t;
 
-SELECT strpos('high'::citext, 'ig'        ) = 2 AS t;
-SELECT strpos('high',         'ig'::citext) = 2 AS t;
-SELECT strpos('high'::citext, 'ig'::citext) = 2 AS t;
-SELECT strpos('high'::citext, 'IG'        ) = 2 AS t;
-SELECT strpos('high',         'IG'::citext) = 2 AS t;
-SELECT strpos('high'::citext, 'IG'::citext) = 2 AS t;
+SELECT strpos('high'::citext, 'gh'        ) = 3 AS t;
+SELECT strpos('high',         'gh'::citext) = 3 AS t;
+SELECT strpos('high'::citext, 'gh'::citext) = 3 AS t;
+SELECT strpos('high'::citext, 'GH'        ) = 3 AS t;
+SELECT strpos('high',         'GH'::citext) = 3 AS t;
+SELECT strpos('high'::citext, 'GH'::citext) = 3 AS t;
 
 -- to_ascii() does not support UTF-8.
 -- to_hex() takes a numeric argument.
diff -Nru postgresql-9.5-9.5.2/contrib/cube/cubescan.c postgresql-9.5-9.5.8/contrib/cube/cubescan.c
--- postgresql-9.5-9.5.2/contrib/cube/cubescan.c	2016-03-28 20:23:05.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/cube/cubescan.c	2017-08-07 21:34:43.000000000 +0000
@@ -621,7 +621,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( cube_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -634,7 +634,7 @@
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, cube_yyin))==0 && ferror(cube_yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, cube_yyin)) == 0 && ferror(cube_yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1020,7 +1020,7 @@
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
diff -Nru postgresql-9.5-9.5.2/contrib/cube/expected/cube_1.out postgresql-9.5-9.5.8/contrib/cube/expected/cube_1.out
--- postgresql-9.5-9.5.2/contrib/cube/expected/cube_1.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/cube/expected/cube_1.out	2017-08-07 21:13:41.000000000 +0000
@@ -1019,7 +1019,7 @@
         5
 (1 row)
 
--- Test of cube_ll_coord function (retrieves LL coodinate values)
+-- Test of cube_ll_coord function (retrieves LL coordinate values)
 --
 SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
  cube_ll_coord 
@@ -1075,7 +1075,7 @@
              0
 (1 row)
 
--- Test of cube_ur_coord function (retrieves UR coodinate values)
+-- Test of cube_ur_coord function (retrieves UR coordinate values)
 --
 SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
  cube_ur_coord 
diff -Nru postgresql-9.5-9.5.2/contrib/cube/expected/cube_2.out postgresql-9.5-9.5.8/contrib/cube/expected/cube_2.out
--- postgresql-9.5-9.5.2/contrib/cube/expected/cube_2.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/cube/expected/cube_2.out	2017-08-07 21:13:41.000000000 +0000
@@ -1019,7 +1019,7 @@
         5
 (1 row)
 
--- Test of cube_ll_coord function (retrieves LL coodinate values)
+-- Test of cube_ll_coord function (retrieves LL coordinate values)
 --
 SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
  cube_ll_coord 
@@ -1075,7 +1075,7 @@
              0
 (1 row)
 
--- Test of cube_ur_coord function (retrieves UR coodinate values)
+-- Test of cube_ur_coord function (retrieves UR coordinate values)
 --
 SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
  cube_ur_coord 
diff -Nru postgresql-9.5-9.5.2/contrib/cube/expected/cube_3.out postgresql-9.5-9.5.8/contrib/cube/expected/cube_3.out
--- postgresql-9.5-9.5.2/contrib/cube/expected/cube_3.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/cube/expected/cube_3.out	2017-08-07 21:13:41.000000000 +0000
@@ -1019,7 +1019,7 @@
         5
 (1 row)
 
--- Test of cube_ll_coord function (retrieves LL coodinate values)
+-- Test of cube_ll_coord function (retrieves LL coordinate values)
 --
 SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
  cube_ll_coord 
@@ -1075,7 +1075,7 @@
              0
 (1 row)
 
--- Test of cube_ur_coord function (retrieves UR coodinate values)
+-- Test of cube_ur_coord function (retrieves UR coordinate values)
 --
 SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
  cube_ur_coord 
diff -Nru postgresql-9.5-9.5.2/contrib/cube/expected/cube.out postgresql-9.5-9.5.8/contrib/cube/expected/cube.out
--- postgresql-9.5-9.5.2/contrib/cube/expected/cube.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/cube/expected/cube.out	2017-08-07 21:13:41.000000000 +0000
@@ -1019,7 +1019,7 @@
         5
 (1 row)
 
--- Test of cube_ll_coord function (retrieves LL coodinate values)
+-- Test of cube_ll_coord function (retrieves LL coordinate values)
 --
 SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
  cube_ll_coord 
@@ -1075,7 +1075,7 @@
              0
 (1 row)
 
--- Test of cube_ur_coord function (retrieves UR coodinate values)
+-- Test of cube_ur_coord function (retrieves UR coordinate values)
 --
 SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
  cube_ur_coord 
diff -Nru postgresql-9.5-9.5.2/contrib/cube/sql/cube.sql postgresql-9.5-9.5.8/contrib/cube/sql/cube.sql
--- postgresql-9.5-9.5.2/contrib/cube/sql/cube.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/cube/sql/cube.sql	2017-08-07 21:13:41.000000000 +0000
@@ -246,7 +246,7 @@
 SELECT cube_dim('(42,42,42),(42,42,42)'::cube);
 SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
 
--- Test of cube_ll_coord function (retrieves LL coodinate values)
+-- Test of cube_ll_coord function (retrieves LL coordinate values)
 --
 SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
 SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 2);
@@ -258,7 +258,7 @@
 SELECT cube_ll_coord('(42,137)'::cube, 2);
 SELECT cube_ll_coord('(42,137)'::cube, 3);
 
--- Test of cube_ur_coord function (retrieves UR coodinate values)
+-- Test of cube_ur_coord function (retrieves UR coordinate values)
 --
 SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
 SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 2);
diff -Nru postgresql-9.5-9.5.2/contrib/dblink/dblink.c postgresql-9.5-9.5.8/contrib/dblink/dblink.c
--- postgresql-9.5-9.5.2/contrib/dblink/dblink.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/dblink/dblink.c	2017-08-07 21:13:41.000000000 +0000
@@ -40,6 +40,7 @@
 #include "access/reloptions.h"
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_foreign_data_wrapper.h"
 #include "catalog/pg_foreign_server.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_user_mapping.h"
@@ -112,7 +113,8 @@
 static char *generate_relation_name(Relation rel);
 static void dblink_connstr_check(const char *connstr);
 static void dblink_security_check(PGconn *conn, remoteConn *rconn);
-static void dblink_res_error(const char *conname, PGresult *res, const char *dblink_context_msg, bool fail);
+static void dblink_res_error(PGconn *conn, const char *conname, PGresult *res,
+							 const char *dblink_context_msg, bool fail);
 static char *get_connect_string(const char *servername);
 static char *escape_param_str(const char *from);
 static void validate_pkattnums(Relation rel,
@@ -299,7 +301,11 @@
 		createNewConnection(connname, rconn);
 	}
 	else
+	{
+		if (pconn->conn)
+			PQfinish(pconn->conn);
 		pconn->conn = conn;
+	}
 
 	PG_RETURN_TEXT_P(cstring_to_text("OK"));
 }
@@ -427,7 +433,7 @@
 	res = PQexec(conn, buf.data);
 	if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
-		dblink_res_error(conname, res, "could not open cursor", fail);
+		dblink_res_error(conn, conname, res, "could not open cursor", fail);
 		PG_RETURN_TEXT_P(cstring_to_text("ERROR"));
 	}
 
@@ -496,7 +502,7 @@
 	res = PQexec(conn, buf.data);
 	if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
-		dblink_res_error(conname, res, "could not close cursor", fail);
+		dblink_res_error(conn, conname, res, "could not close cursor", fail);
 		PG_RETURN_TEXT_P(cstring_to_text("ERROR"));
 	}
 
@@ -599,7 +605,8 @@
 		(PQresultStatus(res) != PGRES_COMMAND_OK &&
 		 PQresultStatus(res) != PGRES_TUPLES_OK))
 	{
-		dblink_res_error(conname, res, "could not fetch from cursor", fail);
+		dblink_res_error(conn, conname, res,
+						 "could not fetch from cursor", fail);
 		return (Datum) 0;
 	}
 	else if (PQresultStatus(res) == PGRES_COMMAND_OK)
@@ -750,8 +757,8 @@
 				if (PQresultStatus(res) != PGRES_COMMAND_OK &&
 					PQresultStatus(res) != PGRES_TUPLES_OK)
 				{
-					dblink_res_error(conname, res, "could not execute query",
-									 fail);
+					dblink_res_error(conn, conname, res,
+									 "could not execute query", fail);
 					/* if fail isn't set, we'll return an empty query result */
 				}
 				else
@@ -998,7 +1005,8 @@
 			PGresult   *res1 = res;
 
 			res = NULL;
-			dblink_res_error(conname, res1, "could not execute query", fail);
+			dblink_res_error(conn, conname, res1,
+							 "could not execute query", fail);
 			/* if fail isn't set, we'll return an empty query result */
 		}
 		else if (PQresultStatus(res) == PGRES_COMMAND_OK)
@@ -1433,7 +1441,8 @@
 			(PQresultStatus(res) != PGRES_COMMAND_OK &&
 			 PQresultStatus(res) != PGRES_TUPLES_OK))
 		{
-			dblink_res_error(conname, res, "could not execute command", fail);
+			dblink_res_error(conn, conname, res,
+							 "could not execute command", fail);
 
 			/*
 			 * and save a copy of the command status string to return as our
@@ -2664,7 +2673,8 @@
 }
 
 static void
-dblink_res_error(const char *conname, PGresult *res, const char *dblink_context_msg, bool fail)
+dblink_res_error(PGconn *conn, const char *conname, PGresult *res,
+				 const char *dblink_context_msg, bool fail)
 {
 	int			level;
 	char	   *pg_diag_sqlstate = PQresultErrorField(res, PG_DIAG_SQLSTATE);
@@ -2698,6 +2708,14 @@
 	xpstrdup(message_hint, pg_diag_message_hint);
 	xpstrdup(message_context, pg_diag_context);
 
+	/*
+	 * If we don't get a message from the PGresult, try the PGconn.  This
+	 * is needed because for connection-level failures, PQexec may just
+	 * return NULL, not a PGresult at all.
+	 */
+	if (message_primary == NULL)
+		message_primary = PQerrorMessage(conn);
+
 	if (res)
 		PQclear(res);
 
@@ -2707,7 +2725,7 @@
 	ereport(level,
 			(errcode(sqlstate),
 			 message_primary ? errmsg_internal("%s", message_primary) :
-			 errmsg("unknown error"),
+			 errmsg("could not obtain message string for remote error"),
 			 message_detail ? errdetail_internal("%s", message_detail) : 0,
 			 message_hint ? errhint("%s", message_hint) : 0,
 			 message_context ? errcontext("%s", message_context) : 0,
@@ -2729,6 +2747,25 @@
 	AclResult	aclresult;
 	char	   *srvname;
 
+	static const PQconninfoOption *options = NULL;
+
+	/*
+	 * Get list of valid libpq options.
+	 *
+	 * To avoid unnecessary work, we get the list once and use it throughout
+	 * the lifetime of this backend process.  We don't need to care about
+	 * memory context issues, because PQconndefaults allocates with malloc.
+	 */
+	if (!options)
+	{
+		options = PQconndefaults();
+		if (!options)			/* assume reason for failure is OOM */
+			ereport(ERROR,
+					(errcode(ERRCODE_FDW_OUT_OF_MEMORY),
+					 errmsg("out of memory"),
+			 errdetail("could not get libpq's default connection options")));
+	}
+
 	/* first gather the server connstr options */
 	srvname = pstrdup(servername);
 	truncate_identifier(srvname, strlen(srvname), false);
@@ -2752,16 +2789,18 @@
 		{
 			DefElem    *def = lfirst(cell);
 
-			appendStringInfo(buf, "%s='%s' ", def->defname,
-							 escape_param_str(strVal(def->arg)));
+			if (is_valid_dblink_option(options, def->defname, ForeignDataWrapperRelationId))
+				appendStringInfo(buf, "%s='%s' ", def->defname,
+								 escape_param_str(strVal(def->arg)));
 		}
 
 		foreach(cell, foreign_server->options)
 		{
 			DefElem    *def = lfirst(cell);
 
-			appendStringInfo(buf, "%s='%s' ", def->defname,
-							 escape_param_str(strVal(def->arg)));
+			if (is_valid_dblink_option(options, def->defname, ForeignServerRelationId))
+				appendStringInfo(buf, "%s='%s' ", def->defname,
+								 escape_param_str(strVal(def->arg)));
 		}
 
 		foreach(cell, user_mapping->options)
@@ -2769,8 +2808,9 @@
 
 			DefElem    *def = lfirst(cell);
 
-			appendStringInfo(buf, "%s='%s' ", def->defname,
-							 escape_param_str(strVal(def->arg)));
+			if (is_valid_dblink_option(options, def->defname, UserMappingRelationId))
+				appendStringInfo(buf, "%s='%s' ", def->defname,
+								 escape_param_str(strVal(def->arg)));
 		}
 
 		return buf->data;
diff -Nru postgresql-9.5-9.5.2/contrib/earthdistance/earthdistance--1.0.sql postgresql-9.5-9.5.8/contrib/earthdistance/earthdistance--1.0.sql
--- postgresql-9.5-9.5.2/contrib/earthdistance/earthdistance--1.0.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/earthdistance/earthdistance--1.0.sql	2017-08-07 21:13:41.000000000 +0000
@@ -11,7 +11,7 @@
 LANGUAGE SQL IMMUTABLE
 AS 'SELECT ''6378168''::float8';
 
--- Astromers may want to change the earth function so that distances will be
+-- Astronomers may want to change the earth function so that distances will be
 -- returned in degrees. To do this comment out the above definition and
 -- uncomment the one below. Note that doing this will break the regression
 -- tests.
diff -Nru postgresql-9.5-9.5.2/contrib/hstore_plperl/expected/hstore_plperlu.out postgresql-9.5-9.5.8/contrib/hstore_plperl/expected/hstore_plperlu.out
--- postgresql-9.5-9.5.2/contrib/hstore_plperl/expected/hstore_plperlu.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/hstore_plperl/expected/hstore_plperlu.out	2017-08-07 21:13:41.000000000 +0000
@@ -20,15 +20,12 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 elog(INFO, Dumper($_[0]));
 return scalar(keys %{$_[0]});
 $$;
 SELECT test1('aa=>bb, cc=>NULL'::hstore);
-INFO:  $VAR1 = {
-          'aa' => 'bb',
-          'cc' => undef
-        };
-
+INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};
 CONTEXT:  PL/Perl function "test1"
  test1 
 -------
@@ -40,12 +37,12 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 elog(INFO, Dumper($_[0]));
 return scalar(keys %{$_[0]});
 $$;
 SELECT test1none('aa=>bb, cc=>NULL'::hstore);
 INFO:  $VAR1 = '"aa"=>"bb", "cc"=>NULL';
-
 CONTEXT:  PL/Perl function "test1none"
  test1none 
 -----------
@@ -58,15 +55,12 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 elog(INFO, Dumper($_[0]));
 return scalar(keys %{$_[0]});
 $$;
 SELECT test1list('aa=>bb, cc=>NULL'::hstore);
-INFO:  $VAR1 = {
-          'aa' => 'bb',
-          'cc' => undef
-        };
-
+INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};
 CONTEXT:  PL/Perl function "test1list"
  test1list 
 -----------
@@ -80,18 +74,12 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
 return scalar(keys %{$_[0]});
 $$;
 SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
-INFO:  $VAR1 = {
-          'aa' => 'bb',
-          'cc' => undef
-        };
-$VAR2 = {
-          'dd' => 'ee'
-        };
-
+INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};$VAR2 = {'dd' => 'ee'};
 CONTEXT:  PL/Perl function "test1arr"
  test1arr 
 ----------
@@ -105,6 +93,7 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 
 $rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
 elog(INFO, Dumper($rv->{rows}[0]->{col1}));
@@ -115,14 +104,9 @@
 elog(INFO, Dumper($rv->{rows}[0]->{col1}));
 $$;
 SELECT test3();
-INFO:  $VAR1 = {
-          'aa' => 'bb',
-          'cc' => undef
-        };
-
+INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};
 CONTEXT:  PL/Perl function "test3"
 INFO:  $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
-
 CONTEXT:  PL/Perl function "test3"
  test3 
 -------
@@ -144,6 +128,7 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 elog(INFO, Dumper($_TD->{new}));
 if ($_TD->{new}{a} == 1) {
     $_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
@@ -153,14 +138,7 @@
 $$;
 CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
 UPDATE test1 SET a = a;
-INFO:  $VAR1 = {
-          'a' => '1',
-          'b' => {
-                 'aa' => 'bb',
-                 'cc' => undef
-               }
-        };
-
+INFO:  $VAR1 = {'a' => '1','b' => {'aa' => 'bb','cc' => undef}};
 CONTEXT:  PL/Perl function "test4"
 SELECT * FROM test1;
  a |                b                
diff -Nru postgresql-9.5-9.5.2/contrib/hstore_plperl/hstore_plperl.c postgresql-9.5-9.5.8/contrib/hstore_plperl/hstore_plperl.c
--- postgresql-9.5-9.5.2/contrib/hstore_plperl/hstore_plperl.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/hstore_plperl/hstore_plperl.c	2017-08-07 21:13:41.000000000 +0000
@@ -13,6 +13,7 @@
 Datum
 hstore_to_plperl(PG_FUNCTION_ARGS)
 {
+	dTHX;
 	HStore	   *in = PG_GETARG_HS(0);
 	int			i;
 	int			count = HS_COUNT(in);
@@ -45,7 +46,8 @@
 Datum
 plperl_to_hstore(PG_FUNCTION_ARGS)
 {
-	HV		   *hv;
+	dTHX;
+	HV		   *hv = (HV *) SvRV((SV *) PG_GETARG_POINTER(0));
 	HE		   *he;
 	int32		buflen;
 	int32		i;
@@ -53,8 +55,6 @@
 	HStore	   *out;
 	Pairs	   *pairs;
 
-	hv = (HV *) SvRV((SV *) PG_GETARG_POINTER(0));
-
 	pcount = hv_iterinit(hv);
 
 	pairs = palloc(pcount * sizeof(Pairs));
diff -Nru postgresql-9.5-9.5.2/contrib/hstore_plperl/Makefile postgresql-9.5-9.5.8/contrib/hstore_plperl/Makefile
--- postgresql-9.5-9.5.2/contrib/hstore_plperl/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/hstore_plperl/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -43,4 +43,4 @@
 # last, probably because it sometimes contains some header files with names
 # that clash with some of ours, or with some that we include, notably on
 # Windows.
-override CPPFLAGS := $(CPPFLAGS) -I$(perl_archlibexp)/CORE
+override CPPFLAGS := $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE
diff -Nru postgresql-9.5-9.5.2/contrib/hstore_plperl/sql/hstore_plperlu.sql postgresql-9.5-9.5.8/contrib/hstore_plperl/sql/hstore_plperlu.sql
--- postgresql-9.5-9.5.2/contrib/hstore_plperl/sql/hstore_plperlu.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/hstore_plperl/sql/hstore_plperlu.sql	2017-08-07 21:13:41.000000000 +0000
@@ -17,6 +17,7 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 elog(INFO, Dumper($_[0]));
 return scalar(keys %{$_[0]});
 $$;
@@ -28,6 +29,7 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 elog(INFO, Dumper($_[0]));
 return scalar(keys %{$_[0]});
 $$;
@@ -40,6 +42,7 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 elog(INFO, Dumper($_[0]));
 return scalar(keys %{$_[0]});
 $$;
@@ -54,6 +57,7 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
 return scalar(keys %{$_[0]});
 $$;
@@ -68,6 +72,7 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 
 $rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
 elog(INFO, Dumper($rv->{rows}[0]->{col1}));
@@ -92,6 +97,7 @@
 AS $$
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 0;
 elog(INFO, Dumper($_TD->{new}));
 if ($_TD->{new}{a} == 1) {
     $_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
diff -Nru postgresql-9.5-9.5.2/contrib/intarray/bench/bench.pl postgresql-9.5-9.5.8/contrib/intarray/bench/bench.pl
--- postgresql-9.5-9.5.2/contrib/intarray/bench/bench.pl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/intarray/bench/bench.pl	2017-08-07 21:13:41.000000000 +0000
@@ -92,7 +92,8 @@
 
 if ($opt{e})
 {
-	$dbi->do("explain $sql");
+	my @plan = map { "$_->[0]\n" } @{$dbi->selectall_arrayref("explain $sql")};
+	print @plan;
 }
 
 my $t0    = [gettimeofday];
diff -Nru postgresql-9.5-9.5.2/contrib/isn/isn.c postgresql-9.5-9.5.8/contrib/isn/isn.c
--- postgresql-9.5-9.5.2/contrib/isn/isn.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/isn/isn.c	2017-08-07 21:13:41.000000000 +0000
@@ -160,7 +160,7 @@
  *				  into bufO using the given hyphenation range TABLE.
  *				  Assumes the input string to be used is of only digits.
  *
- * Returns the number of characters acctually hyphenated.
+ * Returns the number of characters actually hyphenated.
  */
 static unsigned
 hyphenate(char *bufO, char *bufI, const char *(*TABLE)[2], const unsigned TABLE_index[10][2])
@@ -748,7 +748,7 @@
 		}
 		else if (*aux2 == '!' && *(aux2 + 1) == '\0')
 		{
-			/* the invalid check digit sufix was found, set it */
+			/* the invalid check digit suffix was found, set it */
 			if (!magic)
 				valid = false;
 			magic = true;
diff -Nru postgresql-9.5-9.5.2/contrib/isn/ISSN.h postgresql-9.5-9.5.8/contrib/isn/ISSN.h
--- postgresql-9.5-9.5.2/contrib/isn/ISSN.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/isn/ISSN.h	2017-08-07 21:13:41.000000000 +0000
@@ -23,7 +23,7 @@
  * Product		9 + 21 + 7 + 3 + 1 + 12 + 4 + 24 + 7 + 15 + 0 + 0 = 103
  *				103 / 10 = 10 remainder 3
  * Check digit	10 - 3 = 7
- * => 977-1144875-00-7 ??  <- suplemental number (number of the week, month, etc.)
+ * => 977-1144875-00-7 ??  <- supplemental number (number of the week, month, etc.)
  *				  ^^ 00 for non-daily publications (01=Monday, 02=Tuesday, ...)
  *
  * The hyphenation is always in after the four digits of the ISSN code.
diff -Nru postgresql-9.5-9.5.2/contrib/ltree/expected/ltree.out postgresql-9.5-9.5.8/contrib/ltree/expected/ltree.out
--- postgresql-9.5-9.5.2/contrib/ltree/expected/ltree.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/ltree/expected/ltree.out	2017-08-07 21:13:41.000000000 +0000
@@ -1105,7 +1105,7 @@
  t
 (1 row)
 
---exractors
+--extractors
 SELECT ('{3456,1.2.3.34}'::ltree[] ?@> '1.2.3.4') is null;
  ?column? 
 ----------
diff -Nru postgresql-9.5-9.5.2/contrib/ltree/ltxtquery_io.c postgresql-9.5-9.5.8/contrib/ltree/ltxtquery_io.c
--- postgresql-9.5-9.5.2/contrib/ltree/ltxtquery_io.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/ltree/ltxtquery_io.c	2017-08-07 21:13:41.000000000 +0000
@@ -96,7 +96,7 @@
 					if (*flag)
 						ereport(ERROR,
 								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("modificators syntax error")));
+								 errmsg("modifiers syntax error")));
 					*lenval += charlen;
 				}
 				else if (charlen == 1 && t_iseq(state->buf, '%'))
@@ -197,7 +197,7 @@
 
 #define STACKDEPTH		32
 /*
- * make polish notaion of query
+ * make polish notation of query
  */
 static int32
 makepol(QPRS_STATE *state)
diff -Nru postgresql-9.5-9.5.2/contrib/ltree/sql/ltree.sql postgresql-9.5-9.5.8/contrib/ltree/sql/ltree.sql
--- postgresql-9.5-9.5.2/contrib/ltree/sql/ltree.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/ltree/sql/ltree.sql	2017-08-07 21:13:41.000000000 +0000
@@ -204,7 +204,7 @@
 SELECT '{a.b.c.d.e,B.df}'::ltree[] ? '{A.b.c.d.e}';
 SELECT '{a.b.c.d.e,B.df}'::ltree[] ? '{A.b.c.d.e,*.df}';
 
---exractors
+--extractors
 SELECT ('{3456,1.2.3.34}'::ltree[] ?@> '1.2.3.4') is null;
 SELECT '{3456,1.2.3}'::ltree[] ?@> '1.2.3.4';
 SELECT '{3456,1.2.3.4}'::ltree[] ?<@ '1.2.3';
diff -Nru postgresql-9.5-9.5.2/contrib/pageinspect/btreefuncs.c postgresql-9.5-9.5.8/contrib/pageinspect/btreefuncs.c
--- postgresql-9.5-9.5.2/contrib/pageinspect/btreefuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pageinspect/btreefuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -42,11 +42,6 @@
 #define IS_INDEX(r) ((r)->rd_rel->relkind == RELKIND_INDEX)
 #define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
 
-#define CHECK_PAGE_OFFSET_RANGE(pg, offnum) { \
-		if ( !(FirstOffsetNumber <= (offnum) && \
-						(offnum) <= PageGetMaxOffsetNumber(pg)) ) \
-			 elog(ERROR, "page offset number out of range"); }
-
 /* note: BlockNumber is unsigned, hence can't be negative */
 #define CHECK_RELATION_BLOCK_RANGE(rel, blkno) { \
 		if ( RelationGetNumberOfBlocks(rel) <= (BlockNumber) (blkno) ) \
diff -Nru postgresql-9.5-9.5.2/contrib/pageinspect/ginfuncs.c postgresql-9.5-9.5.8/contrib/pageinspect/ginfuncs.c
--- postgresql-9.5-9.5.2/contrib/pageinspect/ginfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pageinspect/ginfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -28,11 +28,31 @@
 PG_FUNCTION_INFO_V1(gin_page_opaque_info);
 PG_FUNCTION_INFO_V1(gin_leafpage_items);
 
+
+static Page
+get_page_from_raw(bytea *raw_page)
+{
+	int			raw_page_size;
+	Page		page;
+
+	raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
+	if (raw_page_size < BLCKSZ)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("input page too small (%d bytes)", raw_page_size)));
+
+	/* make a copy so that the page is properly aligned for struct access */
+	page = palloc(raw_page_size);
+	memcpy(page, VARDATA(raw_page), raw_page_size);
+
+	return page;
+}
+
+
 Datum
 gin_metapage_info(PG_FUNCTION_ARGS)
 {
 	bytea	   *raw_page = PG_GETARG_BYTEA_P(0);
-	int			raw_page_size;
 	TupleDesc	tupdesc;
 	Page		page;
 	GinPageOpaque opaq;
@@ -46,12 +66,7 @@
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 (errmsg("must be superuser to use raw page functions"))));
 
-	raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
-	if (raw_page_size < BLCKSZ)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("input page too small (%d bytes)", raw_page_size)));
-	page = VARDATA(raw_page);
+	page = get_page_from_raw(raw_page);
 
 	opaq = (GinPageOpaque) PageGetSpecialPointer(page);
 	if (opaq->flags != GIN_META)
@@ -94,13 +109,12 @@
 gin_page_opaque_info(PG_FUNCTION_ARGS)
 {
 	bytea	   *raw_page = PG_GETARG_BYTEA_P(0);
-	int			raw_page_size;
 	TupleDesc	tupdesc;
 	Page		page;
 	GinPageOpaque opaq;
 	HeapTuple	resultTuple;
 	Datum		values[3];
-	bool		nulls[10];
+	bool		nulls[3];
 	Datum		flags[16];
 	int			nflags = 0;
 	uint16		flagbits;
@@ -110,12 +124,7 @@
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 (errmsg("must be superuser to use raw page functions"))));
 
-	raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
-	if (raw_page_size < BLCKSZ)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("input page too small (%d bytes)", raw_page_size)));
-	page = VARDATA(raw_page);
+	page = get_page_from_raw(raw_page);
 
 	opaq = (GinPageOpaque) PageGetSpecialPointer(page);
 
@@ -152,9 +161,9 @@
 	memset(nulls, 0, sizeof(nulls));
 
 	values[0] = Int64GetDatum(opaq->rightlink);
-	values[1] = Int64GetDatum(opaq->maxoff);
-	values[2] = PointerGetDatum(
-					construct_array(flags, nflags, TEXTOID, -1, false, 'i'));
+	values[1] = Int32GetDatum(opaq->maxoff);
+	values[2] = PointerGetDatum(construct_array(flags, nflags,
+												TEXTOID, -1, false, 'i'));
 
 	/* Build and return the result tuple. */
 	resultTuple = heap_form_tuple(tupdesc, values, nulls);
@@ -173,7 +182,6 @@
 gin_leafpage_items(PG_FUNCTION_ARGS)
 {
 	bytea	   *raw_page = PG_GETARG_BYTEA_P(0);
-	int			raw_page_size;
 	FuncCallContext *fctx;
 	gin_leafpage_items_state *inter_call_data;
 
@@ -182,8 +190,6 @@
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 (errmsg("must be superuser to use raw page functions"))));
 
-	raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
-
 	if (SRF_IS_FIRSTCALL())
 	{
 		TupleDesc	tupdesc;
@@ -191,11 +197,10 @@
 		Page		page;
 		GinPageOpaque opaq;
 
-		if (raw_page_size < BLCKSZ)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				  errmsg("input page too small (%d bytes)", raw_page_size)));
-		page = VARDATA(raw_page);
+		fctx = SRF_FIRSTCALL_INIT();
+		mctx = MemoryContextSwitchTo(fctx->multi_call_memory_ctx);
+
+		page = get_page_from_raw(raw_page);
 
 		if (PageGetSpecialSize(page) != MAXALIGN(sizeof(GinPageOpaqueData)))
 			ereport(ERROR,
@@ -214,9 +219,6 @@
 							   opaq->flags,
 							   (GIN_DATA | GIN_LEAF | GIN_COMPRESSED))));
 
-		fctx = SRF_FIRSTCALL_INIT();
-		mctx = MemoryContextSwitchTo(fctx->multi_call_memory_ctx);
-
 		inter_call_data = palloc(sizeof(gin_leafpage_items_state));
 
 		/* Build a tuple descriptor for our result type */
diff -Nru postgresql-9.5-9.5.2/contrib/pg_buffercache/pg_buffercache_pages.c postgresql-9.5-9.5.8/contrib/pg_buffercache/pg_buffercache_pages.c
--- postgresql-9.5-9.5.2/contrib/pg_buffercache/pg_buffercache_pages.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pg_buffercache/pg_buffercache_pages.c	2017-08-07 21:13:41.000000000 +0000
@@ -124,7 +124,9 @@
 		fctx->tupdesc = BlessTupleDesc(tupledesc);
 
 		/* Allocate NBuffers worth of BufferCachePagesRec records. */
-		fctx->record = (BufferCachePagesRec *) palloc(sizeof(BufferCachePagesRec) * NBuffers);
+		fctx->record = (BufferCachePagesRec *)
+			MemoryContextAllocHuge(CurrentMemoryContext,
+								   sizeof(BufferCachePagesRec) * NBuffers);
 
 		/* Set max calls and remember the user function context. */
 		funcctx->max_calls = NBuffers;
diff -Nru postgresql-9.5-9.5.2/contrib/pgcrypto/internal.c postgresql-9.5-9.5.8/contrib/pgcrypto/internal.c
--- postgresql-9.5-9.5.2/contrib/pgcrypto/internal.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgcrypto/internal.c	2017-08-07 21:13:41.000000000 +0000
@@ -620,15 +620,6 @@
  * Randomness provider
  */
 
-/*
- * Use always strong randomness.
- */
-int
-px_get_pseudo_random_bytes(uint8 *dst, unsigned count)
-{
-	return px_get_random_bytes(dst, count);
-}
-
 static time_t seed_time = 0;
 static time_t check_time = 0;
 
diff -Nru postgresql-9.5-9.5.2/contrib/pgcrypto/mbuf.c postgresql-9.5-9.5.8/contrib/pgcrypto/mbuf.c
--- postgresql-9.5-9.5.2/contrib/pgcrypto/mbuf.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgcrypto/mbuf.c	2017-08-07 21:13:41.000000000 +0000
@@ -311,7 +311,7 @@
 }
 
 /*
- * caller wants exatly len bytes and dont bother with references
+ * caller wants exactly len bytes and don't bother with references
  */
 int
 pullf_read_fixed(PullFilter *src, int len, uint8 *dst)
diff -Nru postgresql-9.5-9.5.2/contrib/pgcrypto/openssl.c postgresql-9.5-9.5.8/contrib/pgcrypto/openssl.c
--- postgresql-9.5-9.5.2/contrib/pgcrypto/openssl.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgcrypto/openssl.c	2017-08-07 21:13:41.000000000 +0000
@@ -40,6 +40,9 @@
 #include <openssl/rand.h>
 #include <openssl/err.h>
 
+#include "utils/memutils.h"
+#include "utils/resowner.h"
+
 /*
  * Max lengths we might want to handle.
  */
@@ -199,18 +202,73 @@
  * Hashes
  */
 
+/*
+ * To make sure we don't leak OpenSSL handles on abort, we keep OSSLDigest
+ * objects in a linked list, allocated in TopMemoryContext. We use the
+ * ResourceOwner mechanism to free them on abort.
+ */
 typedef struct OSSLDigest
 {
 	const EVP_MD *algo;
-	EVP_MD_CTX	ctx;
+	EVP_MD_CTX *ctx;
+
+	ResourceOwner owner;
+	struct OSSLDigest *next;
+	struct OSSLDigest *prev;
 } OSSLDigest;
 
+static OSSLDigest *open_digests = NULL;
+static bool resowner_callback_registered = false;
+
+static void
+free_openssldigest(OSSLDigest *digest)
+{
+	EVP_MD_CTX_destroy(digest->ctx);
+	if (digest->prev)
+		digest->prev->next = digest->next;
+	else
+		open_digests = digest->next;
+	if (digest->next)
+		digest->next->prev = digest->prev;
+	pfree(digest);
+}
+
+/*
+ * Close any open OpenSSL handles on abort.
+ */
+static void
+digest_free_callback(ResourceReleasePhase phase,
+					 bool isCommit,
+					 bool isTopLevel,
+					 void *arg)
+{
+	OSSLDigest *curr;
+	OSSLDigest *next;
+
+	if (phase != RESOURCE_RELEASE_AFTER_LOCKS)
+		return;
+
+	next = open_digests;
+	while (next)
+	{
+		curr = next;
+		next = curr->next;
+
+		if (curr->owner == CurrentResourceOwner)
+		{
+			if (isCommit)
+				elog(WARNING, "pgcrypto digest reference leak: digest %p still referenced", curr);
+			free_openssldigest(curr);
+		}
+	}
+}
+
 static unsigned
 digest_result_size(PX_MD *h)
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
 
-	return EVP_MD_CTX_size(&digest->ctx);
+	return EVP_MD_CTX_size(digest->ctx);
 }
 
 static unsigned
@@ -218,7 +276,7 @@
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
 
-	return EVP_MD_CTX_block_size(&digest->ctx);
+	return EVP_MD_CTX_block_size(digest->ctx);
 }
 
 static void
@@ -226,7 +284,7 @@
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
 
-	EVP_DigestInit_ex(&digest->ctx, digest->algo, NULL);
+	EVP_DigestInit_ex(digest->ctx, digest->algo, NULL);
 }
 
 static void
@@ -234,7 +292,7 @@
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
 
-	EVP_DigestUpdate(&digest->ctx, data, dlen);
+	EVP_DigestUpdate(digest->ctx, data, dlen);
 }
 
 static void
@@ -242,7 +300,7 @@
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
 
-	EVP_DigestFinal_ex(&digest->ctx, dst, NULL);
+	EVP_DigestFinal_ex(digest->ctx, dst, NULL);
 }
 
 static void
@@ -250,9 +308,7 @@
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
 
-	EVP_MD_CTX_cleanup(&digest->ctx);
-
-	px_free(digest);
+	free_openssldigest(digest);
 	px_free(h);
 }
 
@@ -264,6 +320,7 @@
 px_find_digest(const char *name, PX_MD **res)
 {
 	const EVP_MD *md;
+	EVP_MD_CTX *ctx;
 	PX_MD	   *h;
 	OSSLDigest *digest;
 
@@ -273,17 +330,43 @@
 		OpenSSL_add_all_algorithms();
 	}
 
+	if (!resowner_callback_registered)
+	{
+		RegisterResourceReleaseCallback(digest_free_callback, NULL);
+		resowner_callback_registered = true;
+	}
+
 	md = EVP_get_digestbyname(name);
 	if (md == NULL)
 		return compat_find_digest(name, res);
 
-	digest = px_alloc(sizeof(*digest));
-	digest->algo = md;
+	/*
+	 * Create an OSSLDigest object, an OpenSSL MD object, and a PX_MD object.
+	 * The order is crucial, to make sure we don't leak anything on
+	 * out-of-memory or other error.
+	 */
+	digest = MemoryContextAlloc(TopMemoryContext, sizeof(*digest));
 
-	EVP_MD_CTX_init(&digest->ctx);
-	if (EVP_DigestInit_ex(&digest->ctx, digest->algo, NULL) == 0)
+	ctx = EVP_MD_CTX_create();
+	if (!ctx)
+	{
+		pfree(digest);
+		return -1;
+	}
+	if (EVP_DigestInit_ex(ctx, md, NULL) == 0)
+	{
+		pfree(digest);
 		return -1;
+	}
+
+	digest->algo = md;
+	digest->ctx = ctx;
+	digest->owner = CurrentResourceOwner;
+	digest->next = open_digests;
+	digest->prev = NULL;
+	open_digests = digest;
 
+	/* The PX_MD object is allocated in the current memory context. */
 	h = px_alloc(sizeof(*h));
 	h->result_size = digest_result_size;
 	h->block_size = digest_block_size;
@@ -987,7 +1070,13 @@
 init_openssl_rand(void)
 {
 	if (RAND_get_rand_method() == NULL)
+	{
+#ifdef HAVE_RAND_OPENSSL
+		RAND_set_rand_method(RAND_OpenSSL());
+#else
 		RAND_set_rand_method(RAND_SSLeay());
+#endif
+	}
 	openssl_random_init = 1;
 }
 
@@ -1004,21 +1093,6 @@
 		return count;
 
 	return PXE_OSSL_RAND_ERROR;
-}
-
-int
-px_get_pseudo_random_bytes(uint8 *dst, unsigned count)
-{
-	int			res;
-
-	if (!openssl_random_init)
-		init_openssl_rand();
-
-	res = RAND_pseudo_bytes(dst, count);
-	if (res == 0 || res == 1)
-		return count;
-
-	return PXE_OSSL_RAND_ERROR;
 }
 
 int
diff -Nru postgresql-9.5-9.5.2/contrib/pgcrypto/pgcrypto.c postgresql-9.5-9.5.8/contrib/pgcrypto/pgcrypto.c
--- postgresql-9.5-9.5.2/contrib/pgcrypto/pgcrypto.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgcrypto/pgcrypto.c	2017-08-07 21:13:41.000000000 +0000
@@ -454,7 +454,7 @@
 	int			err;
 
 	/* generate random bits */
-	err = px_get_pseudo_random_bytes(buf, UUID_LEN);
+	err = px_get_random_bytes(buf, UUID_LEN);
 	if (err < 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_EXTERNAL_ROUTINE_INVOCATION_EXCEPTION),
diff -Nru postgresql-9.5-9.5.2/contrib/pgcrypto/pgp-mpi-internal.c postgresql-9.5-9.5.8/contrib/pgcrypto/pgp-mpi-internal.c
--- postgresql-9.5-9.5.2/contrib/pgcrypto/pgp-mpi-internal.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgcrypto/pgp-mpi-internal.c	2017-08-07 21:13:41.000000000 +0000
@@ -139,7 +139,7 @@
 }
 
 /*
- * Decide the number of bits in the random componont k
+ * Decide the number of bits in the random component k
  *
  * It should be in the same range as p for signing (which
  * is deprecated), but can be much smaller for encrypting.
@@ -147,8 +147,8 @@
  * Until I research it further, I just mimic gpg behaviour.
  * It has a special mapping table, for values <= 5120,
  * above that it uses 'arbitrary high number'.  Following
- * algorihm hovers 10-70 bits above gpg values.  And for
- * larger p, it uses gpg's algorihm.
+ * algorithm hovers 10-70 bits above gpg values.  And for
+ * larger p, it uses gpg's algorithm.
  *
  * The point is - if k gets large, encryption will be
  * really slow.  It does not matter for decryption.
diff -Nru postgresql-9.5-9.5.2/contrib/pgcrypto/pgp-mpi-openssl.c postgresql-9.5-9.5.8/contrib/pgcrypto/pgp-mpi-openssl.c
--- postgresql-9.5-9.5.2/contrib/pgcrypto/pgp-mpi-openssl.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgcrypto/pgp-mpi-openssl.c	2017-08-07 21:13:41.000000000 +0000
@@ -74,7 +74,7 @@
 }
 
 /*
- * Decide the number of bits in the random componont k
+ * Decide the number of bits in the random component k
  *
  * It should be in the same range as p for signing (which
  * is deprecated), but can be much smaller for encrypting.
@@ -82,8 +82,8 @@
  * Until I research it further, I just mimic gpg behaviour.
  * It has a special mapping table, for values <= 5120,
  * above that it uses 'arbitrary high number'.  Following
- * algorihm hovers 10-70 bits above gpg values.  And for
- * larger p, it uses gpg's algorihm.
+ * algorithm hovers 10-70 bits above gpg values.  And for
+ * larger p, it uses gpg's algorithm.
  *
  * The point is - if k gets large, encryption will be
  * really slow.  It does not matter for decryption.
diff -Nru postgresql-9.5-9.5.2/contrib/pgcrypto/pgp-s2k.c postgresql-9.5-9.5.8/contrib/pgcrypto/pgp-s2k.c
--- postgresql-9.5-9.5.2/contrib/pgcrypto/pgp-s2k.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgcrypto/pgp-s2k.c	2017-08-07 21:13:41.000000000 +0000
@@ -222,13 +222,13 @@
 		case 0:
 			break;
 		case 1:
-			res = px_get_pseudo_random_bytes(s2k->salt, PGP_S2K_SALT);
+			res = px_get_random_bytes(s2k->salt, PGP_S2K_SALT);
 			break;
 		case 3:
-			res = px_get_pseudo_random_bytes(s2k->salt, PGP_S2K_SALT);
+			res = px_get_random_bytes(s2k->salt, PGP_S2K_SALT);
 			if (res < 0)
 				break;
-			res = px_get_pseudo_random_bytes(&tmp, 1);
+			res = px_get_random_bytes(&tmp, 1);
 			if (res < 0)
 				break;
 			s2k->iter = decide_count(tmp);
diff -Nru postgresql-9.5-9.5.2/contrib/pgcrypto/px.c postgresql-9.5-9.5.8/contrib/pgcrypto/px.c
--- postgresql-9.5-9.5.2/contrib/pgcrypto/px.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgcrypto/px.c	2017-08-07 21:13:41.000000000 +0000
@@ -48,7 +48,7 @@
 	{PXE_BAD_OPTION, "Unknown option"},
 	{PXE_BAD_FORMAT, "Badly formatted type"},
 	{PXE_KEY_TOO_BIG, "Key was too big"},
-	{PXE_CIPHER_INIT, "Cipher cannot be initalized ?"},
+	{PXE_CIPHER_INIT, "Cipher cannot be initialized ?"},
 	{PXE_HASH_UNUSABLE_FOR_HMAC, "This hash algorithm is unusable for HMAC"},
 	{PXE_DEV_READ_ERROR, "Error reading from random device"},
 	{PXE_OSSL_RAND_ERROR, "OpenSSL PRNG error"},
diff -Nru postgresql-9.5-9.5.2/contrib/pgcrypto/px-crypt.c postgresql-9.5-9.5.8/contrib/pgcrypto/px-crypt.c
--- postgresql-9.5-9.5.2/contrib/pgcrypto/px-crypt.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgcrypto/px-crypt.c	2017-08-07 21:13:41.000000000 +0000
@@ -153,7 +153,7 @@
 			return PXE_BAD_SALT_ROUNDS;
 	}
 
-	res = px_get_pseudo_random_bytes((uint8 *) rbuf, g->input_len);
+	res = px_get_random_bytes((uint8 *) rbuf, g->input_len);
 	if (res < 0)
 		return res;
 
diff -Nru postgresql-9.5-9.5.2/contrib/pgcrypto/px.h postgresql-9.5-9.5.8/contrib/pgcrypto/px.h
--- postgresql-9.5-9.5.2/contrib/pgcrypto/px.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgcrypto/px.h	2017-08-07 21:13:41.000000000 +0000
@@ -190,7 +190,6 @@
 int			px_find_combo(const char *name, PX_Combo **res);
 
 int			px_get_random_bytes(uint8 *dst, unsigned count);
-int			px_get_pseudo_random_bytes(uint8 *dst, unsigned count);
 int			px_add_entropy(const uint8 *data, unsigned count);
 
 unsigned	px_acquire_system_randomness(uint8 *dst);
diff -Nru postgresql-9.5-9.5.2/contrib/pgrowlocks/pgrowlocks.c postgresql-9.5-9.5.8/contrib/pgrowlocks/pgrowlocks.c
--- postgresql-9.5-9.5.2/contrib/pgrowlocks/pgrowlocks.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgrowlocks/pgrowlocks.c	2017-08-07 21:13:41.000000000 +0000
@@ -158,8 +158,7 @@
 
 				values[Atnum_ismulti] = pstrdup("true");
 
-				allow_old = !(infomask & HEAP_LOCK_MASK) &&
-					(infomask & HEAP_XMAX_LOCK_ONLY);
+				allow_old = HEAP_LOCKED_UPGRADED(infomask);
 				nmembers = GetMultiXactIdMembers(xmax, &members, allow_old,
 												 false);
 				if (nmembers == -1)
diff -Nru postgresql-9.5-9.5.2/contrib/pg_standby/pg_standby.c postgresql-9.5-9.5.8/contrib/pg_standby/pg_standby.c
--- postgresql-9.5-9.5.2/contrib/pg_standby/pg_standby.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pg_standby/pg_standby.c	2017-08-07 21:13:41.000000000 +0000
@@ -57,7 +57,7 @@
 char	   *nextWALFileName;	/* the file we need to get from archive */
 char	   *restartWALFileName; /* the file from which we can restart restore */
 char	   *priorWALFileName;	/* the file we need to get from archive */
-char		WALFilePath[MAXPGPATH];		/* the file path including archive */
+char		WALFilePath[MAXPGPATH * 2];		/* the file path including archive */
 char		restoreCommand[MAXPGPATH];	/* run this to restore */
 char		exclusiveCleanupFileName[MAXFNAMELEN];		/* the file we need to
 														 * get from archive */
@@ -259,9 +259,9 @@
 				  strcmp(xlde->d_name + 8, exclusiveCleanupFileName + 8) < 0)
 				{
 #ifdef WIN32
-					snprintf(WALFilePath, MAXPGPATH, "%s\\%s", archiveLocation, xlde->d_name);
+					snprintf(WALFilePath, sizeof(WALFilePath), "%s\\%s", archiveLocation, xlde->d_name);
 #else
-					snprintf(WALFilePath, MAXPGPATH, "%s/%s", archiveLocation, xlde->d_name);
+					snprintf(WALFilePath, sizeof(WALFilePath), "%s/%s", archiveLocation, xlde->d_name);
 #endif
 
 					if (debug)
@@ -779,7 +779,7 @@
 		{
 			/*
 			 * Once we have restored this file successfully we can remove some
-			 * prior WAL files. If this restore fails we musn't remove any
+			 * prior WAL files. If this restore fails we mustn't remove any
 			 * file because some of them will be requested again immediately
 			 * after the failed restore, or when we restart recovery.
 			 */
diff -Nru postgresql-9.5-9.5.2/contrib/pg_stat_statements/pg_stat_statements.c postgresql-9.5-9.5.8/contrib/pg_stat_statements/pg_stat_statements.c
--- postgresql-9.5-9.5.2/contrib/pg_stat_statements/pg_stat_statements.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pg_stat_statements/pg_stat_statements.c	2017-08-07 21:13:41.000000000 +0000
@@ -138,7 +138,7 @@
 {
 	int64		calls;			/* # of times executed */
 	double		total_time;		/* total execution time, in msec */
-	double		min_time;		/* minimim execution time in msec */
+	double		min_time;		/* minimum execution time in msec */
 	double		max_time;		/* maximum execution time in msec */
 	double		mean_time;		/* mean execution time in msec */
 	double		sum_var_time;	/* sum of variances in execution time in msec */
diff -Nru postgresql-9.5-9.5.2/contrib/pgstattuple/pgstatindex.c postgresql-9.5-9.5.8/contrib/pgstattuple/pgstatindex.c
--- postgresql-9.5-9.5.2/contrib/pgstattuple/pgstatindex.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pgstattuple/pgstatindex.c	2017-08-07 21:13:41.000000000 +0000
@@ -57,16 +57,6 @@
 #define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
 #define IS_GIN(r) ((r)->rd_rel->relam == GIN_AM_OID)
 
-#define CHECK_PAGE_OFFSET_RANGE(pg, offnum) { \
-		if ( !(FirstOffsetNumber <= (offnum) && \
-						(offnum) <= PageGetMaxOffsetNumber(pg)) ) \
-			 elog(ERROR, "page offset number out of range"); }
-
-/* note: BlockNumber is unsigned, hence can't be negative */
-#define CHECK_RELATION_BLOCK_RANGE(rel, blkno) { \
-		if ( RelationGetNumberOfBlocks(rel) <= (BlockNumber) (blkno) ) \
-			 elog(ERROR, "block number out of range"); }
-
 /* ------------------------------------------------
  * A structure for a whole btree index statistics
  * used by pgstatindex().
diff -Nru postgresql-9.5-9.5.2/contrib/pg_trgm/expected/pg_trgm.out postgresql-9.5-9.5.8/contrib/pg_trgm/expected/pg_trgm.out
--- postgresql-9.5-9.5.2/contrib/pg_trgm/expected/pg_trgm.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pg_trgm/expected/pg_trgm.out	2017-08-07 21:13:41.000000000 +0000
@@ -1194,6 +1194,12 @@
       0.5 | qwertyu0987
 (2 rows)
 
+select count(*) from test_trgm where t ~ '[qwerty]{2}-?[qwerty]{2}';
+ count 
+-------
+  1000
+(1 row)
+
 create index trgm_idx on test_trgm using gist (t gist_trgm_ops);
 set enable_seqscan=off;
 select t,similarity(t,'qwertyu0988') as sml from test_trgm where t % 'qwertyu0988' order by sml desc, t;
@@ -2338,6 +2344,12 @@
       0.5 | qwertyu0987
 (2 rows)
 
+select count(*) from test_trgm where t ~ '[qwerty]{2}-?[qwerty]{2}';
+ count 
+-------
+  1000
+(1 row)
+
 drop index trgm_idx;
 create index trgm_idx on test_trgm using gin (t gin_trgm_ops);
 set enable_seqscan=off;
@@ -3467,10 +3479,17 @@
  qwertyu0988 | 0.333333
 (1 row)
 
+select count(*) from test_trgm where t ~ '[qwerty]{2}-?[qwerty]{2}';
+ count 
+-------
+  1000
+(1 row)
+
 create table test2(t text);
 insert into test2 values ('abcdef');
 insert into test2 values ('quark');
 insert into test2 values ('  z foo bar');
+insert into test2 values ('/123/-45/');
 create index test2_idx_gin on test2 using gin (t gin_trgm_ops);
 set enable_seqscan=off;
 explain (costs off)
@@ -3572,7 +3591,8 @@
  abcdef
  quark
    z foo bar
-(3 rows)
+ /123/-45/
+(4 rows)
 
 select * from test2 where t ~* 'DEF';
    t    
@@ -3658,6 +3678,18 @@
    z foo bar
 (1 row)
 
+select * from test2 where t ~ 'qua(?!foo)';
+   t   
+-------
+ quark
+(1 row)
+
+select * from test2 where t ~ '/\d+/-\d';
+     t     
+-----------
+ /123/-45/
+(1 row)
+
 drop index test2_idx_gin;
 create index test2_idx_gist on test2 using gist (t gist_trgm_ops);
 set enable_seqscan=off;
@@ -3752,7 +3784,8 @@
  abcdef
  quark
    z foo bar
-(3 rows)
+ /123/-45/
+(4 rows)
 
 select * from test2 where t ~* 'DEF';
    t    
@@ -3838,3 +3871,15 @@
    z foo bar
 (1 row)
 
+select * from test2 where t ~ 'qua(?!foo)';
+   t   
+-------
+ quark
+(1 row)
+
+select * from test2 where t ~ '/\d+/-\d';
+     t     
+-----------
+ /123/-45/
+(1 row)
+
diff -Nru postgresql-9.5-9.5.2/contrib/pg_trgm/sql/pg_trgm.sql postgresql-9.5-9.5.8/contrib/pg_trgm/sql/pg_trgm.sql
--- postgresql-9.5-9.5.2/contrib/pg_trgm/sql/pg_trgm.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pg_trgm/sql/pg_trgm.sql	2017-08-07 21:13:41.000000000 +0000
@@ -21,6 +21,7 @@
 select t,similarity(t,'gwertyu0988') as sml from test_trgm where t % 'gwertyu0988' order by sml desc, t;
 select t,similarity(t,'gwertyu1988') as sml from test_trgm where t % 'gwertyu1988' order by sml desc, t;
 select t <-> 'q0987wertyu0988', t from test_trgm order by t <-> 'q0987wertyu0988' limit 2;
+select count(*) from test_trgm where t ~ '[qwerty]{2}-?[qwerty]{2}';
 
 create index trgm_idx on test_trgm using gist (t gist_trgm_ops);
 set enable_seqscan=off;
@@ -31,6 +32,7 @@
 explain (costs off)
 select t <-> 'q0987wertyu0988', t from test_trgm order by t <-> 'q0987wertyu0988' limit 2;
 select t <-> 'q0987wertyu0988', t from test_trgm order by t <-> 'q0987wertyu0988' limit 2;
+select count(*) from test_trgm where t ~ '[qwerty]{2}-?[qwerty]{2}';
 
 drop index trgm_idx;
 create index trgm_idx on test_trgm using gin (t gin_trgm_ops);
@@ -39,11 +41,13 @@
 select t,similarity(t,'qwertyu0988') as sml from test_trgm where t % 'qwertyu0988' order by sml desc, t;
 select t,similarity(t,'gwertyu0988') as sml from test_trgm where t % 'gwertyu0988' order by sml desc, t;
 select t,similarity(t,'gwertyu1988') as sml from test_trgm where t % 'gwertyu1988' order by sml desc, t;
+select count(*) from test_trgm where t ~ '[qwerty]{2}-?[qwerty]{2}';
 
 create table test2(t text);
 insert into test2 values ('abcdef');
 insert into test2 values ('quark');
 insert into test2 values ('  z foo bar');
+insert into test2 values ('/123/-45/');
 create index test2_idx_gin on test2 using gin (t gin_trgm_ops);
 set enable_seqscan=off;
 explain (costs off)
@@ -78,7 +82,10 @@
 select * from test2 where t ~ ' z foo bar';
 select * from test2 where t ~ '  z foo bar';
 select * from test2 where t ~ '  z foo';
+select * from test2 where t ~ 'qua(?!foo)';
+select * from test2 where t ~ '/\d+/-\d';
 drop index test2_idx_gin;
+
 create index test2_idx_gist on test2 using gist (t gist_trgm_ops);
 set enable_seqscan=off;
 explain (costs off)
@@ -113,3 +120,5 @@
 select * from test2 where t ~ ' z foo bar';
 select * from test2 where t ~ '  z foo bar';
 select * from test2 where t ~ '  z foo';
+select * from test2 where t ~ 'qua(?!foo)';
+select * from test2 where t ~ '/\d+/-\d';
diff -Nru postgresql-9.5-9.5.2/contrib/pg_trgm/trgm_regexp.c postgresql-9.5-9.5.8/contrib/pg_trgm/trgm_regexp.c
--- postgresql-9.5-9.5.2/contrib/pg_trgm/trgm_regexp.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/pg_trgm/trgm_regexp.c	2017-08-07 21:13:41.000000000 +0000
@@ -200,9 +200,10 @@
 
 
 /*
- * Uncomment to print intermediate stages, for exploring and debugging the
- * algorithm implementation.  This produces three graph files in /tmp,
- * in Graphviz .dot format.
+ * Uncomment (or use -DTRGM_REGEXP_DEBUG) to print debug info,
+ * for exploring and debugging the algorithm implementation.
+ * This produces three graph files in /tmp, in Graphviz .dot format.
+ * Some progress information is also printed to postmaster stderr.
  */
 /* #define TRGM_REGEXP_DEBUG */
 
@@ -226,7 +227,7 @@
  * Penalty multipliers for trigram counts depending on whitespace contents.
  * Numbers based on analysis of real-life texts.
  */
-const float4 penalties[8] = {
+static const float4 penalties[8] = {
 	1.0f,						/* "aaa" */
 	3.5f,						/* "aa " */
 	0.0f,						/* "a a" (impossible) */
@@ -318,22 +319,27 @@
  *	arcs	 - outgoing arcs of this state (List of TrgmArc)
  *	enterKeys - enter keys reachable from this state without reading any
  *			   predictable trigram (List of TrgmStateKey)
- *	fin		 - flag indicating this state is final
- *	init	 - flag indicating this state is initial
+ *	flags	 - flag bits
+ *	snumber  - number of this state (initially assigned as -1, -2, etc,
+ *			   for debugging purposes only; then at the packaging stage,
+ *			   surviving states are renumbered with positive numbers)
  *	parent	 - parent state, if this state has been merged into another
- *	children - child states (states that have been merged into this one)
- *	number	 - number of this state (used at the packaging stage)
+ *	tentFlags - flags this state would acquire via planned merges
+ *	tentParent - planned parent state, if considering a merge
  */
+#define TSTATE_INIT		0x01	/* flag indicating this state is initial */
+#define TSTATE_FIN		0x02	/* flag indicating this state is final */
+
 typedef struct TrgmState
 {
 	TrgmStateKey stateKey;		/* hashtable key: must be first field */
 	List	   *arcs;
 	List	   *enterKeys;
-	bool		fin;
-	bool		init;
+	int			flags;
+	int			snumber;
 	struct TrgmState *parent;
-	List	   *children;
-	int			number;
+	int			tentFlags;
+	struct TrgmState *tentParent;
 } TrgmState;
 
 /*
@@ -360,7 +366,7 @@
  * Information about color trigram (used in stage 3)
  *
  * ctrgm	- trigram itself
- * number	- number of this trigram (used in the packaging stage)
+ * cnumber	- number of this trigram (used in the packaging stage)
  * count	- number of simple trigrams created from this color trigram
  * expanded - indicates this color trigram is expanded into simple trigrams
  * arcs		- list of all arcs labeled with this color trigram.
@@ -368,7 +374,7 @@
 typedef struct
 {
 	ColorTrgm	ctrgm;
-	int			number;
+	int			cnumber;
 	int			count;
 	float4		penalty;
 	bool		expanded;
@@ -402,6 +408,7 @@
 	/* Expanded graph (stage 2) */
 	HTAB	   *states;
 	TrgmState  *initState;
+	int			nstates;
 
 	/* Workspace for stage 2 */
 	List	   *queue;
@@ -601,7 +608,7 @@
 	 * get from the initial state to the final state without reading any
 	 * predictable trigram.
 	 */
-	if (trgmNFA.initState->fin)
+	if (trgmNFA.initState->flags & TSTATE_FIN)
 		return NULL;
 
 	/*
@@ -919,6 +926,7 @@
 								  1024,
 								  &hashCtl,
 								  HASH_ELEM | HASH_BLOBS | HASH_CONTEXT);
+	trgmNFA->nstates = 0;
 
 	/* Create initial state: ambiguous prefix, NFA's initial state */
 	MemSet(&initkey, 0, sizeof(initkey));
@@ -927,7 +935,7 @@
 	initkey.nstate = pg_reg_getinitialstate(trgmNFA->regex);
 
 	initstate = getState(trgmNFA, &initkey);
-	initstate->init = true;
+	initstate->flags |= TSTATE_INIT;
 	trgmNFA->initState = initstate;
 
 	/*
@@ -945,7 +953,7 @@
 		 * actual processing.
 		 */
 		if (trgmNFA->overflowed)
-			state->fin = true;
+			state->flags |= TSTATE_FIN;
 		else
 			processState(trgmNFA, state);
 
@@ -970,7 +978,7 @@
 	 * queue is empty.  But we can quit if the state gets marked final.
 	 */
 	addKey(trgmNFA, state, &state->stateKey);
-	while (trgmNFA->keysQueue != NIL && !state->fin)
+	while (trgmNFA->keysQueue != NIL && !(state->flags & TSTATE_FIN))
 	{
 		TrgmStateKey *key = (TrgmStateKey *) linitial(trgmNFA->keysQueue);
 
@@ -982,7 +990,7 @@
 	 * Add outgoing arcs only if state isn't final (we have no interest in
 	 * outgoing arcs if we already match)
 	 */
-	if (!state->fin)
+	if (!(state->flags & TSTATE_FIN))
 		addArcs(trgmNFA, state);
 }
 
@@ -991,7 +999,7 @@
  * whether this should result in any further enter keys being added.
  * If so, add those keys to keysQueue so that processState will handle them.
  *
- * If the enter key is for the NFA's final state, set state->fin = TRUE.
+ * If the enter key is for the NFA's final state, mark state as TSTATE_FIN.
  * This situation means that we can reach the final state from this expanded
  * state without reading any predictable trigram, so we must consider this
  * state as an accepting one.
@@ -1061,7 +1069,7 @@
 	/* If state is now known final, mark it and we're done */
 	if (key->nstate == pg_reg_getfinalstate(trgmNFA->regex))
 	{
-		state->fin = true;
+		state->flags |= TSTATE_FIN;
 		return;
 	}
 
@@ -1387,11 +1395,12 @@
 		/* New state: initialize and queue it */
 		state->arcs = NIL;
 		state->enterKeys = NIL;
-		state->init = false;
-		state->fin = false;
+		state->flags = 0;
+		/* states are initially given negative numbers */
+		state->snumber = -(++trgmNFA->nstates);
 		state->parent = NULL;
-		state->children = NIL;
-		state->number = -1;
+		state->tentFlags = 0;
+		state->tentParent = NULL;
 
 		trgmNFA->queue = lappend(trgmNFA->queue, state);
 	}
@@ -1456,10 +1465,10 @@
 	ColorTrgmInfo *colorTrgms;
 	int64		totalTrgmCount;
 	float4		totalTrgmPenalty;
-	int			number;
+	int			cnumber;
 
 	/* Collect color trigrams from all arcs */
-	colorTrgms = (ColorTrgmInfo *) palloc(sizeof(ColorTrgmInfo) * arcsCount);
+	colorTrgms = (ColorTrgmInfo *) palloc0(sizeof(ColorTrgmInfo) * arcsCount);
 	trgmNFA->colorTrgms = colorTrgms;
 
 	i = 0;
@@ -1472,12 +1481,15 @@
 		{
 			TrgmArc    *arc = (TrgmArc *) lfirst(cell);
 			TrgmArcInfo *arcInfo = (TrgmArcInfo *) palloc(sizeof(TrgmArcInfo));
+			ColorTrgmInfo *trgmInfo = &colorTrgms[i];
 
 			arcInfo->source = state;
 			arcInfo->target = arc->target;
-			colorTrgms[i].arcs = list_make1(arcInfo);
-			colorTrgms[i].expanded = true;
-			colorTrgms[i].ctrgm = arc->ctrgm;
+			trgmInfo->ctrgm = arc->ctrgm;
+			trgmInfo->cnumber = -1;
+			/* count and penalty will be set below */
+			trgmInfo->expanded = true;
+			trgmInfo->arcs = list_make1(arcInfo);
 			i++;
 		}
 	}
@@ -1575,6 +1587,15 @@
 		if (totalTrgmPenalty <= WISH_TRGM_PENALTY)
 			break;
 
+#ifdef TRGM_REGEXP_DEBUG
+		fprintf(stderr, "considering ctrgm %d %d %d, penalty %f, %d arcs\n",
+				trgmInfo->ctrgm.colors[0],
+				trgmInfo->ctrgm.colors[1],
+				trgmInfo->ctrgm.colors[2],
+				trgmInfo->penalty,
+				list_length(trgmInfo->arcs));
+#endif
+
 		/*
 		 * Does any arc of this color trigram connect initial and final
 		 * states?	If so we can't remove it.
@@ -1584,6 +1605,14 @@
 			TrgmArcInfo *arcInfo = (TrgmArcInfo *) lfirst(cell);
 			TrgmState  *source = arcInfo->source,
 					   *target = arcInfo->target;
+			int			source_flags,
+						target_flags;
+
+#ifdef TRGM_REGEXP_DEBUG
+			fprintf(stderr, "examining arc to s%d (%x) from s%d (%x)\n",
+					-target->snumber, target->flags,
+					-source->snumber, source->flags);
+#endif
 
 			/* examine parent states, if any merging has already happened */
 			while (source->parent)
@@ -1591,15 +1620,98 @@
 			while (target->parent)
 				target = target->parent;
 
-			if ((source->init || target->init) &&
-				(source->fin || target->fin))
+#ifdef TRGM_REGEXP_DEBUG
+			fprintf(stderr, " ... after completed merges: to s%d (%x) from s%d (%x)\n",
+					-target->snumber, target->flags,
+					-source->snumber, source->flags);
+#endif
+
+			/* we must also consider merges we are planning right now */
+			source_flags = source->flags | source->tentFlags;
+			while (source->tentParent)
+			{
+				source = source->tentParent;
+				source_flags |= source->flags | source->tentFlags;
+			}
+			target_flags = target->flags | target->tentFlags;
+			while (target->tentParent)
+			{
+				target = target->tentParent;
+				target_flags |= target->flags | target->tentFlags;
+			}
+
+#ifdef TRGM_REGEXP_DEBUG
+			fprintf(stderr, " ... after tentative merges: to s%d (%x) from s%d (%x)\n",
+					-target->snumber, target_flags,
+					-source->snumber, source_flags);
+#endif
+
+			/* would fully-merged state have both INIT and FIN set? */
+			if (((source_flags | target_flags) & (TSTATE_INIT | TSTATE_FIN)) ==
+				(TSTATE_INIT | TSTATE_FIN))
 			{
 				canRemove = false;
 				break;
 			}
+
+			/* ok so far, so remember planned merge */
+			if (source != target)
+			{
+#ifdef TRGM_REGEXP_DEBUG
+				fprintf(stderr, " ... tentatively merging s%d into s%d\n",
+						-target->snumber, -source->snumber);
+#endif
+				target->tentParent = source;
+				source->tentFlags |= target_flags;
+			}
+		}
+
+		/*
+		 * We must reset all the tentFlags/tentParent fields before
+		 * continuing.  tentFlags could only have become set in states that
+		 * are the source or parent or tentative parent of one of the current
+		 * arcs; likewise tentParent could only have become set in states that
+		 * are the target or parent or tentative parent of one of the current
+		 * arcs.  There might be some overlap between those sets, but if we
+		 * clear tentFlags in target states as well as source states, we
+		 * should be okay even if we visit a state as target before visiting
+		 * it as a source.
+		 */
+		foreach(cell, trgmInfo->arcs)
+		{
+			TrgmArcInfo *arcInfo = (TrgmArcInfo *) lfirst(cell);
+			TrgmState  *source = arcInfo->source,
+					   *target = arcInfo->target;
+			TrgmState  *ttarget;
+
+			/* no need to touch previously-merged states */
+			while (source->parent)
+				source = source->parent;
+			while (target->parent)
+				target = target->parent;
+
+			while (source)
+			{
+				source->tentFlags = 0;
+				source = source->tentParent;
+			}
+
+			while ((ttarget = target->tentParent) != NULL)
+			{
+				target->tentParent = NULL;
+				target->tentFlags = 0;	/* in case it was also a source */
+				target = ttarget;
+			}
 		}
+
+		/* Now, move on if we can't drop this trigram */
 		if (!canRemove)
+		{
+#ifdef TRGM_REGEXP_DEBUG
+			fprintf(stderr, " ... not ok to merge\n");
+#endif
 			continue;
+		}
 
 		/* OK, merge states linked by each arc labeled by the trigram */
 		foreach(cell, trgmInfo->arcs)
@@ -1613,7 +1725,16 @@
 			while (target->parent)
 				target = target->parent;
 			if (source != target)
+			{
+#ifdef TRGM_REGEXP_DEBUG
+				fprintf(stderr, "merging s%d into s%d\n",
+						-target->snumber, -source->snumber);
+#endif
 				mergeStates(source, target);
+				/* Assert we didn't merge initial and final states */
+				Assert((source->flags & (TSTATE_INIT | TSTATE_FIN)) !=
+					   (TSTATE_INIT | TSTATE_FIN));
+			}
 		}
 
 		/* Mark trigram unexpanded, and update totals */
@@ -1632,15 +1753,15 @@
 	 * Sort color trigrams by colors (will be useful for bsearch in packGraph)
 	 * and enumerate the color trigrams that are expanded.
 	 */
-	number = 0;
+	cnumber = 0;
 	qsort(colorTrgms, trgmNFA->colorTrgmsCount, sizeof(ColorTrgmInfo),
 		  colorTrgmInfoCmp);
 	for (i = 0; i < trgmNFA->colorTrgmsCount; i++)
 	{
 		if (colorTrgms[i].expanded)
 		{
-			colorTrgms[i].number = number;
-			number++;
+			colorTrgms[i].cnumber = cnumber;
+			cnumber++;
 		}
 	}
 
@@ -1756,27 +1877,15 @@
 static void
 mergeStates(TrgmState *state1, TrgmState *state2)
 {
-	ListCell   *cell;
-
 	Assert(state1 != state2);
 	Assert(!state1->parent);
 	Assert(!state2->parent);
 
-	/* state1 absorbs state2's init/fin flags */
-	state1->init |= state2->init;
-	state1->fin |= state2->fin;
+	/* state1 absorbs state2's flags */
+	state1->flags |= state2->flags;
 
-	/* state2, and all its children, become children of state1 */
-	foreach(cell, state2->children)
-	{
-		TrgmState  *state = (TrgmState *) lfirst(cell);
-
-		state->parent = state1;
-	}
+	/* state2, and indirectly all its children, become children of state1 */
 	state2->parent = state1;
-	state1->children = list_concat(state1->children, state2->children);
-	state1->children = lappend(state1->children, state2);
-	state2->children = NIL;
 }
 
 /*
@@ -1823,7 +1932,7 @@
 static TrgmPackedGraph *
 packGraph(TrgmNFA *trgmNFA, MemoryContext rcontext)
 {
-	int			number = 2,
+	int			snumber = 2,
 				arcIndex,
 				arcsCount;
 	HASH_SEQ_STATUS scan_status;
@@ -1843,16 +1952,16 @@
 		while (state->parent)
 			state = state->parent;
 
-		if (state->number < 0)
+		if (state->snumber < 0)
 		{
-			if (state->init)
-				state->number = 0;
-			else if (state->fin)
-				state->number = 1;
+			if (state->flags & TSTATE_INIT)
+				state->snumber = 0;
+			else if (state->flags & TSTATE_FIN)
+				state->snumber = 1;
 			else
 			{
-				state->number = number;
-				number++;
+				state->snumber = snumber;
+				snumber++;
 			}
 		}
 	}
@@ -1878,7 +1987,7 @@
 			while (target->parent)
 				target = target->parent;
 
-			if (source->number != target->number)
+			if (source->snumber != target->snumber)
 			{
 				ColorTrgmInfo *ctrgm;
 
@@ -1890,9 +1999,9 @@
 				Assert(ctrgm != NULL);
 				Assert(ctrgm->expanded);
 
-				arcs[arcIndex].sourceState = source->number;
-				arcs[arcIndex].targetState = target->number;
-				arcs[arcIndex].colorTrgm = ctrgm->number;
+				arcs[arcIndex].sourceState = source->snumber;
+				arcs[arcIndex].targetState = target->snumber;
+				arcs[arcIndex].colorTrgm = ctrgm->cnumber;
 				arcIndex++;
 			}
 		}
@@ -1938,13 +2047,13 @@
 	}
 
 	/* Pack states and arcs information */
-	result->statesCount = number;
+	result->statesCount = snumber;
 	result->states = (TrgmPackedState *)
-		MemoryContextAlloc(rcontext, number * sizeof(TrgmPackedState));
+		MemoryContextAlloc(rcontext, snumber * sizeof(TrgmPackedState));
 	packedArcs = (TrgmPackedArc *)
 		MemoryContextAlloc(rcontext, arcsCount * sizeof(TrgmPackedArc));
 	j = 0;
-	for (i = 0; i < number; i++)
+	for (i = 0; i < snumber; i++)
 	{
 		int			cnt = 0;
 
@@ -2110,10 +2219,10 @@
 	{
 		ListCell   *cell;
 
-		appendStringInfo(&buf, "s%p", (void *) state);
-		if (state->fin)
+		appendStringInfo(&buf, "s%d", -state->snumber);
+		if (state->flags & TSTATE_FIN)
 			appendStringInfoString(&buf, " [shape = doublecircle]");
-		if (state->init)
+		if (state->flags & TSTATE_INIT)
 			initstate = state;
 		appendStringInfo(&buf, " [label = \"%d\"]", state->stateKey.nstate);
 		appendStringInfoString(&buf, ";\n");
@@ -2122,8 +2231,8 @@
 		{
 			TrgmArc    *arc = (TrgmArc *) lfirst(cell);
 
-			appendStringInfo(&buf, "  s%p -> s%p [label = \"",
-							 (void *) state, (void *) arc->target);
+			appendStringInfo(&buf, "  s%d -> s%d [label = \"",
+							 -state->snumber, -arc->target->snumber);
 			printTrgmColor(&buf, arc->ctrgm.colors[0]);
 			appendStringInfoChar(&buf, ' ');
 			printTrgmColor(&buf, arc->ctrgm.colors[1]);
@@ -2136,7 +2245,7 @@
 	if (initstate)
 	{
 		appendStringInfoString(&buf, " node [shape = point ]; initial;\n");
-		appendStringInfo(&buf, " initial -> s%p;\n", (void *) initstate);
+		appendStringInfo(&buf, " initial -> s%d;\n", -initstate->snumber);
 	}
 
 	appendStringInfoString(&buf, "}\n");
diff -Nru postgresql-9.5-9.5.2/contrib/postgres_fdw/connection.c postgresql-9.5-9.5.8/contrib/postgres_fdw/connection.c
--- postgresql-9.5-9.5.2/contrib/postgres_fdw/connection.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/postgres_fdw/connection.c	2017-08-07 21:13:41.000000000 +0000
@@ -14,11 +14,16 @@
 
 #include "postgres_fdw.h"
 
+#include "access/htup_details.h"
+#include "catalog/pg_user_mapping.h"
 #include "access/xact.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
+#include "storage/latch.h"
 #include "utils/hsearch.h"
+#include "utils/inval.h"
 #include "utils/memutils.h"
+#include "utils/syscache.h"
 
 
 /*
@@ -45,10 +50,15 @@
 {
 	ConnCacheKey key;			/* hash key (must be first) */
 	PGconn	   *conn;			/* connection to foreign server, or NULL */
+	/* Remaining fields are invalid when conn is NULL: */
 	int			xact_depth;		/* 0 = no xact open, 1 = main xact open, 2 =
 								 * one level of subxact open, etc */
 	bool		have_prep_stmt; /* have we prepared any stmts in this xact? */
 	bool		have_error;		/* have any subxacts aborted in this xact? */
+	bool		changing_xact_state;	/* xact state change in process */
+	bool		invalidated;	/* true if reconnect is pending */
+	uint32		server_hashvalue;	/* hash value of foreign server OID */
+	uint32		mapping_hashvalue;	/* hash value of user mapping OID */
 } ConnCacheEntry;
 
 /*
@@ -65,6 +75,7 @@
 
 /* prototypes of private functions */
 static PGconn *connect_pg_server(ForeignServer *server, UserMapping *user);
+static void disconnect_pg_server(ConnCacheEntry *entry);
 static void check_conn_params(const char **keywords, const char **values);
 static void configure_remote_session(PGconn *conn);
 static void do_sql_command(PGconn *conn, const char *sql);
@@ -74,6 +85,13 @@
 					   SubTransactionId mySubid,
 					   SubTransactionId parentSubid,
 					   void *arg);
+static void pgfdw_inval_callback(Datum arg, int cacheid, uint32 hashvalue);
+static void pgfdw_reject_incomplete_xact_state_change(ConnCacheEntry *entry);
+static bool pgfdw_cancel_query(PGconn *conn);
+static bool pgfdw_exec_cleanup_query(PGconn *conn, const char *query,
+						 bool ignore_errors);
+static bool pgfdw_get_cleanup_result(PGconn *conn, TimestampTz endtime,
+						 PGresult **result);
 
 
 /*
@@ -85,13 +103,6 @@
  * will_prep_stmt must be true if caller intends to create any prepared
  * statements.  Since those don't go away automatically at transaction end
  * (not even on error), we need this flag to cue manual cleanup.
- *
- * XXX Note that caching connections theoretically requires a mechanism to
- * detect change of FDW objects to invalidate already established connections.
- * We could manage that by watching for invalidation events on the relevant
- * syscaches.  For the moment, though, it's not clear that this would really
- * be useful and not mere pedantry.  We could not flush any active connections
- * mid-transaction anyway.
  */
 PGconn *
 GetConnection(ForeignServer *server, UserMapping *user,
@@ -121,6 +132,10 @@
 		 */
 		RegisterXactCallback(pgfdw_xact_callback, NULL);
 		RegisterSubXactCallback(pgfdw_subxact_callback, NULL);
+		CacheRegisterSyscacheCallback(FOREIGNSERVEROID,
+									  pgfdw_inval_callback, (Datum) 0);
+		CacheRegisterSyscacheCallback(USERMAPPINGOID,
+									  pgfdw_inval_callback, (Datum) 0);
 	}
 
 	/* Set flag that we did GetConnection during the current transaction */
@@ -136,11 +151,25 @@
 	entry = hash_search(ConnectionHash, &key, HASH_ENTER, &found);
 	if (!found)
 	{
-		/* initialize new hashtable entry (key is already filled in) */
+		/*
+		 * We need only clear "conn" here; remaining fields will be filled
+		 * later when "conn" is set.
+		 */
 		entry->conn = NULL;
-		entry->xact_depth = 0;
-		entry->have_prep_stmt = false;
-		entry->have_error = false;
+	}
+
+	/* Reject further use of connections which failed abort cleanup. */
+	pgfdw_reject_incomplete_xact_state_change(entry);
+
+	/*
+	 * If the connection needs to be remade due to invalidation, disconnect as
+	 * soon as we're out of all transactions.
+	 */
+	if (entry->conn != NULL && entry->invalidated && entry->xact_depth == 0)
+	{
+		elog(DEBUG3, "closing connection %p for option changes to take effect",
+			 entry->conn);
+		disconnect_pg_server(entry);
 	}
 
 	/*
@@ -152,13 +181,36 @@
 	/*
 	 * If cache entry doesn't have a connection, we have to establish a new
 	 * connection.  (If connect_pg_server throws an error, the cache entry
-	 * will be left in a valid empty state.)
+	 * will remain in a valid empty state, ie conn == NULL.)
 	 */
 	if (entry->conn == NULL)
 	{
-		entry->xact_depth = 0;	/* just to be sure */
+		Oid			umoid;
+
+		/* Reset all transient state fields, to be sure all are clean */
+		entry->xact_depth = 0;
 		entry->have_prep_stmt = false;
 		entry->have_error = false;
+		entry->changing_xact_state = false;
+		entry->invalidated = false;
+		entry->server_hashvalue =
+			GetSysCacheHashValue1(FOREIGNSERVEROID,
+								  ObjectIdGetDatum(server->serverid));
+		/* Pre-9.6, UserMapping doesn't store its OID, so look it up again */
+		umoid = GetSysCacheOid2(USERMAPPINGUSERSERVER,
+								ObjectIdGetDatum(user->userid),
+								ObjectIdGetDatum(user->serverid));
+		if (!OidIsValid(umoid))
+		{
+			/* Not found for the specific user -- try PUBLIC */
+			umoid = GetSysCacheOid2(USERMAPPINGUSERSERVER,
+									ObjectIdGetDatum(InvalidOid),
+									ObjectIdGetDatum(user->serverid));
+		}
+		entry->mapping_hashvalue =
+			GetSysCacheHashValue1(USERMAPPINGOID, ObjectIdGetDatum(umoid));
+
+		/* Now try to make the connection */
 		entry->conn = connect_pg_server(server, user);
 		elog(DEBUG3, "new postgres_fdw connection %p for server \"%s\"",
 			 entry->conn, server->servername);
@@ -272,6 +324,19 @@
 }
 
 /*
+ * Disconnect any open connection for a connection cache entry.
+ */
+static void
+disconnect_pg_server(ConnCacheEntry *entry)
+{
+	if (entry->conn != NULL)
+	{
+		PQfinish(entry->conn);
+		entry->conn = NULL;
+	}
+}
+
+/*
  * For non-superusers, insist that the connstr specify a password.  This
  * prevents a password from being picked up from .pgpass, a service file,
  * the environment, etc.  We don't want the postgres user's passwords
@@ -352,7 +417,9 @@
 {
 	PGresult   *res;
 
-	res = PQexec(conn, sql);
+	if (!PQsendQuery(conn, sql))
+		pgfdw_report_error(ERROR, NULL, conn, false, sql);
+	res = pgfdw_get_result(conn, sql);
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
 		pgfdw_report_error(ERROR, res, conn, true, sql);
 	PQclear(res);
@@ -385,8 +452,10 @@
 			sql = "START TRANSACTION ISOLATION LEVEL SERIALIZABLE";
 		else
 			sql = "START TRANSACTION ISOLATION LEVEL REPEATABLE READ";
+		entry->changing_xact_state = true;
 		do_sql_command(entry->conn, sql);
 		entry->xact_depth = 1;
+		entry->changing_xact_state = false;
 	}
 
 	/*
@@ -399,8 +468,10 @@
 		char		sql[64];
 
 		snprintf(sql, sizeof(sql), "SAVEPOINT s%d", entry->xact_depth + 1);
+		entry->changing_xact_state = true;
 		do_sql_command(entry->conn, sql);
 		entry->xact_depth++;
+		entry->changing_xact_state = false;
 	}
 }
 
@@ -449,6 +520,88 @@
 }
 
 /*
+ * Submit a query and wait for the result.
+ *
+ * This function is interruptible by signals.
+ *
+ * Caller is responsible for the error handling on the result.
+ */
+PGresult *
+pgfdw_exec_query(PGconn *conn, const char *query)
+{
+	/*
+	 * Submit a query.  Since we don't use non-blocking mode, this also can
+	 * block.  But its risk is relatively small, so we ignore that for now.
+	 */
+	if (!PQsendQuery(conn, query))
+		pgfdw_report_error(ERROR, NULL, conn, false, query);
+
+	/* Wait for the result. */
+	return pgfdw_get_result(conn, query);
+}
+
+/*
+ * Wait for the result from a prior asynchronous execution function call.
+ *
+ * This function offers quick responsiveness by checking for any interruptions.
+ *
+ * This function emulates PQexec()'s behavior of returning the last result
+ * when there are many.
+ *
+ * Caller is responsible for the error handling on the result.
+ */
+PGresult *
+pgfdw_get_result(PGconn *conn, const char *query)
+{
+	PGresult   *volatile last_res = NULL;
+
+	/* In what follows, do not leak any PGresults on an error. */
+	PG_TRY();
+	{
+		for (;;)
+		{
+			PGresult   *res;
+
+			while (PQisBusy(conn))
+			{
+				int			wc;
+
+				/* Sleep until there's something to do */
+				wc = WaitLatchOrSocket(MyLatch,
+									   WL_LATCH_SET | WL_SOCKET_READABLE,
+									   PQsocket(conn),
+									   -1L);
+				ResetLatch(MyLatch);
+
+				CHECK_FOR_INTERRUPTS();
+
+				/* Data available in socket? */
+				if (wc & WL_SOCKET_READABLE)
+				{
+					if (!PQconsumeInput(conn))
+						pgfdw_report_error(ERROR, NULL, conn, false, query);
+				}
+			}
+
+			res = PQgetResult(conn);
+			if (res == NULL)
+				break;			/* query is complete */
+
+			PQclear(last_res);
+			last_res = res;
+		}
+	}
+	PG_CATCH();
+	{
+		PQclear(last_res);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
+
+	return last_res;
+}
+
+/*
  * Report an error we got from the remote server.
  *
  * elevel: error level to use (typically ERROR, but might be less)
@@ -495,7 +648,7 @@
 		ereport(elevel,
 				(errcode(sqlstate),
 				 message_primary ? errmsg_internal("%s", message_primary) :
-				 errmsg("unknown error"),
+				 errmsg("could not obtain message string for remote error"),
 			   message_detail ? errdetail_internal("%s", message_detail) : 0,
 				 message_hint ? errhint("%s", message_hint) : 0,
 				 message_context ? errcontext("%s", message_context) : 0,
@@ -541,6 +694,8 @@
 		/* If it has an open remote transaction, try to close it */
 		if (entry->xact_depth > 0)
 		{
+			bool		abort_cleanup_failure = false;
+
 			elog(DEBUG3, "closing remote transaction on connection %p",
 				 entry->conn);
 
@@ -548,8 +703,17 @@
 			{
 				case XACT_EVENT_PARALLEL_PRE_COMMIT:
 				case XACT_EVENT_PRE_COMMIT:
+
+					/*
+					 * If abort cleanup previously failed for this connection,
+					 * we can't issue any more commands against it.
+					 */
+					pgfdw_reject_incomplete_xact_state_change(entry);
+
 					/* Commit all remote transactions during pre-commit */
+					entry->changing_xact_state = true;
 					do_sql_command(entry->conn, "COMMIT TRANSACTION");
+					entry->changing_xact_state = false;
 
 					/*
 					 * If there were any errors in subtransactions, and we
@@ -597,26 +761,66 @@
 					break;
 				case XACT_EVENT_PARALLEL_ABORT:
 				case XACT_EVENT_ABORT:
+
+					/*
+					 * Don't try to clean up the connection if we're already
+					 * in error recursion trouble.
+					 */
+					if (in_error_recursion_trouble())
+						entry->changing_xact_state = true;
+
+					/*
+					 * If connection is already unsalvageable, don't touch it
+					 * further.
+					 */
+					if (entry->changing_xact_state)
+						break;
+
+					/*
+					 * Mark this connection as in the process of changing
+					 * transaction state.
+					 */
+					entry->changing_xact_state = true;
+
 					/* Assume we might have lost track of prepared statements */
 					entry->have_error = true;
-					/* If we're aborting, abort all remote transactions too */
-					res = PQexec(entry->conn, "ABORT TRANSACTION");
-					/* Note: can't throw ERROR, it would be infinite loop */
-					if (PQresultStatus(res) != PGRES_COMMAND_OK)
-						pgfdw_report_error(WARNING, res, entry->conn, true,
-										   "ABORT TRANSACTION");
+
+					/*
+					 * If a command has been submitted to the remote server by
+					 * using an asynchronous execution function, the command
+					 * might not have yet completed.  Check to see if a command
+					 * is still being processed by the remote server, and if so,
+					 * request cancellation of the command.
+					 */
+					if (PQtransactionStatus(entry->conn) == PQTRANS_ACTIVE &&
+						!pgfdw_cancel_query(entry->conn))
+					{
+						/* Unable to cancel running query. */
+						abort_cleanup_failure = true;
+					}
+					else if (!pgfdw_exec_cleanup_query(entry->conn,
+													   "ABORT TRANSACTION",
+													   false))
+					{
+						/* Unable to abort remote transaction. */
+						abort_cleanup_failure = true;
+					}
+					else if (entry->have_prep_stmt && entry->have_error &&
+							 !pgfdw_exec_cleanup_query(entry->conn,
+													   "DEALLOCATE ALL",
+													   true))
+					{
+						/* Trouble clearing prepared statements. */
+						abort_cleanup_failure = true;
+					}
 					else
 					{
-						PQclear(res);
-						/* As above, make sure to clear any prepared stmts */
-						if (entry->have_prep_stmt && entry->have_error)
-						{
-							res = PQexec(entry->conn, "DEALLOCATE ALL");
-							PQclear(res);
-						}
 						entry->have_prep_stmt = false;
 						entry->have_error = false;
 					}
+
+					/* Disarm changing_xact_state if it all worked. */
+					entry->changing_xact_state = abort_cleanup_failure;
 					break;
 			}
 		}
@@ -629,11 +833,11 @@
 		 * recover. Next GetConnection will open a new connection.
 		 */
 		if (PQstatus(entry->conn) != CONNECTION_OK ||
-			PQtransactionStatus(entry->conn) != PQTRANS_IDLE)
+			PQtransactionStatus(entry->conn) != PQTRANS_IDLE ||
+			entry->changing_xact_state)
 		{
 			elog(DEBUG3, "discarding connection %p", entry->conn);
-			PQfinish(entry->conn);
-			entry->conn = NULL;
+			disconnect_pg_server(entry);
 		}
 	}
 
@@ -676,7 +880,6 @@
 	hash_seq_init(&scan, ConnectionHash);
 	while ((entry = (ConnCacheEntry *) hash_seq_search(&scan)))
 	{
-		PGresult   *res;
 		char		sql[100];
 
 		/*
@@ -692,26 +895,315 @@
 
 		if (event == SUBXACT_EVENT_PRE_COMMIT_SUB)
 		{
+			/*
+			 * If abort cleanup previously failed for this connection, we
+			 * can't issue any more commands against it.
+			 */
+			pgfdw_reject_incomplete_xact_state_change(entry);
+
 			/* Commit all remote subtransactions during pre-commit */
 			snprintf(sql, sizeof(sql), "RELEASE SAVEPOINT s%d", curlevel);
+			entry->changing_xact_state = true;
 			do_sql_command(entry->conn, sql);
+			entry->changing_xact_state = false;
 		}
-		else
+		else if (in_error_recursion_trouble())
+		{
+			/*
+			 * Don't try to clean up the connection if we're already in error
+			 * recursion trouble.
+			 */
+			entry->changing_xact_state = true;
+		}
+		else if (!entry->changing_xact_state)
 		{
+			bool		abort_cleanup_failure = false;
+
+			/* Remember that abort cleanup is in progress. */
+			entry->changing_xact_state = true;
+
 			/* Assume we might have lost track of prepared statements */
 			entry->have_error = true;
-			/* Rollback all remote subtransactions during abort */
-			snprintf(sql, sizeof(sql),
-					 "ROLLBACK TO SAVEPOINT s%d; RELEASE SAVEPOINT s%d",
-					 curlevel, curlevel);
-			res = PQexec(entry->conn, sql);
-			if (PQresultStatus(res) != PGRES_COMMAND_OK)
-				pgfdw_report_error(WARNING, res, entry->conn, true, sql);
+
+			/*
+			 * If a command has been submitted to the remote server by using an
+			 * asynchronous execution function, the command might not have yet
+			 * completed.  Check to see if a command is still being processed by
+			 * the remote server, and if so, request cancellation of the
+			 * command.
+			 */
+			if (PQtransactionStatus(entry->conn) == PQTRANS_ACTIVE &&
+				!pgfdw_cancel_query(entry->conn))
+				abort_cleanup_failure = true;
 			else
-				PQclear(res);
+			{
+				/* Rollback all remote subtransactions during abort */
+				snprintf(sql, sizeof(sql),
+						 "ROLLBACK TO SAVEPOINT s%d; RELEASE SAVEPOINT s%d",
+						 curlevel, curlevel);
+				if (!pgfdw_exec_cleanup_query(entry->conn, sql, false))
+					abort_cleanup_failure = true;
+			}
+
+			/* Disarm changing_xact_state if it all worked. */
+			entry->changing_xact_state = abort_cleanup_failure;
 		}
 
 		/* OK, we're outta that level of subtransaction */
 		entry->xact_depth--;
 	}
 }
+
+/*
+ * Connection invalidation callback function
+ *
+ * After a change to a pg_foreign_server or pg_user_mapping catalog entry,
+ * mark connections depending on that entry as needing to be remade.
+ * We can't immediately destroy them, since they might be in the midst of
+ * a transaction, but we'll remake them at the next opportunity.
+ *
+ * Although most cache invalidation callbacks blow away all the related stuff
+ * regardless of the given hashvalue, connections are expensive enough that
+ * it's worth trying to avoid that.
+ *
+ * NB: We could avoid unnecessary disconnection more strictly by examining
+ * individual option values, but it seems too much effort for the gain.
+ */
+static void
+pgfdw_inval_callback(Datum arg, int cacheid, uint32 hashvalue)
+{
+	HASH_SEQ_STATUS scan;
+	ConnCacheEntry *entry;
+
+	Assert(cacheid == FOREIGNSERVEROID || cacheid == USERMAPPINGOID);
+
+	/* ConnectionHash must exist already, if we're registered */
+	hash_seq_init(&scan, ConnectionHash);
+	while ((entry = (ConnCacheEntry *) hash_seq_search(&scan)))
+	{
+		/* Ignore invalid entries */
+		if (entry->conn == NULL)
+			continue;
+
+		/* hashvalue == 0 means a cache reset, must clear all state */
+		if (hashvalue == 0 ||
+			(cacheid == FOREIGNSERVEROID &&
+			 entry->server_hashvalue == hashvalue) ||
+			(cacheid == USERMAPPINGOID &&
+			 entry->mapping_hashvalue == hashvalue))
+			entry->invalidated = true;
+	}
+}
+
+/*
+ * Raise an error if the given connection cache entry is marked as being
+ * in the middle of an xact state change.  This should be called at which no
+ * such change is expected to be in progress; if one is found to be in
+ * progress, it means that we aborted in the middle of a previous state change
+ * and now don't know what the remote transaction state actually is.
+ * Such connections can't safely be further used.  Re-establishing the
+ * connection would change the snapshot and roll back any writes already
+ * performed, so that's not an option, either. Thus, we must abort.
+ */
+static void
+pgfdw_reject_incomplete_xact_state_change(ConnCacheEntry *entry)
+{
+	ForeignServer *server;
+
+	/* nothing to do for inactive entries and entries of sane state */
+	if (entry->conn == NULL || !entry->changing_xact_state)
+		return;
+
+	/* make sure this entry is inactive */
+	disconnect_pg_server(entry);
+
+	/* find server name to be shown in the message below */
+	server = GetForeignServer(entry->key.serverid);
+
+	ereport(ERROR,
+			(errcode(ERRCODE_CONNECTION_EXCEPTION),
+			 errmsg("connection to server \"%s\" was lost",
+					server->servername)));
+}
+
+/*
+ * Cancel the currently-in-progress query (whose query text we do not have)
+ * and ignore the result.  Returns true if we successfully cancel the query
+ * and discard any pending result, and false if not.
+ */
+static bool
+pgfdw_cancel_query(PGconn *conn)
+{
+	PGcancel   *cancel;
+	char		errbuf[256];
+	PGresult   *result = NULL;
+	TimestampTz endtime;
+
+	/*
+	 * If it takes too long to cancel the query and discard the result, assume
+	 * the connection is dead.
+	 */
+	endtime = TimestampTzPlusMilliseconds(GetCurrentTimestamp(), 30000);
+
+	/*
+	 * Issue cancel request.  Unfortunately, there's no good way to limit the
+	 * amount of time that we might block inside PQgetCancel().
+	 */
+	if ((cancel = PQgetCancel(conn)))
+	{
+		if (!PQcancel(cancel, errbuf, sizeof(errbuf)))
+		{
+			ereport(WARNING,
+					(errcode(ERRCODE_CONNECTION_FAILURE),
+					 errmsg("could not send cancel request: %s",
+							errbuf)));
+			PQfreeCancel(cancel);
+			return false;
+		}
+		PQfreeCancel(cancel);
+	}
+
+	/* Get and discard the result of the query. */
+	if (pgfdw_get_cleanup_result(conn, endtime, &result))
+		return false;
+	PQclear(result);
+
+	return true;
+}
+
+/*
+ * Submit a query during (sub)abort cleanup and wait up to 30 seconds for the
+ * result.  If the query is executed without error, the return value is true.
+ * If the query is executed successfully but returns an error, the return
+ * value is true if and only if ignore_errors is set.  If the query can't be
+ * sent or times out, the return value is false.
+ */
+static bool
+pgfdw_exec_cleanup_query(PGconn *conn, const char *query, bool ignore_errors)
+{
+	PGresult   *result = NULL;
+	TimestampTz endtime;
+
+	/*
+	 * If it takes too long to execute a cleanup query, assume the connection
+	 * is dead.  It's fairly likely that this is why we aborted in the first
+	 * place (e.g. statement timeout, user cancel), so the timeout shouldn't
+	 * be too long.
+	 */
+	endtime = TimestampTzPlusMilliseconds(GetCurrentTimestamp(), 30000);
+
+	/*
+	 * Submit a query.  Since we don't use non-blocking mode, this also can
+	 * block.  But its risk is relatively small, so we ignore that for now.
+	 */
+	if (!PQsendQuery(conn, query))
+	{
+		pgfdw_report_error(WARNING, NULL, conn, false, query);
+		return false;
+	}
+
+	/* Get the result of the query. */
+	if (pgfdw_get_cleanup_result(conn, endtime, &result))
+		return false;
+
+	/* Issue a warning if not successful. */
+	if (PQresultStatus(result) != PGRES_COMMAND_OK)
+	{
+		pgfdw_report_error(WARNING, result, conn, true, query);
+		return ignore_errors;
+	}
+	PQclear(result);
+
+	return true;
+}
+
+/*
+ * Get, during abort cleanup, the result of a query that is in progress.  This
+ * might be a query that is being interrupted by transaction abort, or it might
+ * be a query that was initiated as part of transaction abort to get the remote
+ * side back to the appropriate state.
+ *
+ * It's not a huge problem if we throw an ERROR here, but if we get into error
+ * recursion trouble, we'll end up slamming the connection shut, which will
+ * necessitate failing the entire toplevel transaction even if subtransactions
+ * were used.  Try to use WARNING where we can.
+ *
+ * endtime is the time at which we should give up and assume the remote
+ * side is dead.  Returns true if the timeout expired, otherwise false.
+ * Sets *result except in case of a timeout.
+ */
+static bool
+pgfdw_get_cleanup_result(PGconn *conn, TimestampTz endtime, PGresult **result)
+{
+	volatile bool timed_out = false;
+	PGresult   *volatile last_res = NULL;
+
+	/* In what follows, do not leak any PGresults on an error. */
+	PG_TRY();
+	{
+		for (;;)
+		{
+			PGresult   *res;
+
+			while (PQisBusy(conn))
+			{
+				int			wc;
+				TimestampTz now = GetCurrentTimestamp();
+				long		secs;
+				int			microsecs;
+				long		cur_timeout;
+
+				/* If timeout has expired, give up, else get sleep time. */
+				if (now >= endtime)
+				{
+					timed_out = true;
+					goto exit;
+				}
+				TimestampDifference(now, endtime, &secs, &microsecs);
+
+				/* To protect against clock skew, limit sleep to one minute. */
+				cur_timeout = Min(60000, secs * USECS_PER_SEC + microsecs);
+
+				/* Sleep until there's something to do */
+				wc = WaitLatchOrSocket(MyLatch,
+							  WL_LATCH_SET | WL_SOCKET_READABLE | WL_TIMEOUT,
+									   PQsocket(conn),
+									   cur_timeout);
+				ResetLatch(MyLatch);
+
+				CHECK_FOR_INTERRUPTS();
+
+				/* Data available in socket? */
+				if (wc & WL_SOCKET_READABLE)
+				{
+					if (!PQconsumeInput(conn))
+					{
+						/* connection trouble; treat the same as a timeout */
+						timed_out = true;
+						goto exit;
+					}
+				}
+			}
+
+			res = PQgetResult(conn);
+			if (res == NULL)
+				break;			/* query is complete */
+
+			PQclear(last_res);
+			last_res = res;
+		}
+exit:	;
+	}
+	PG_CATCH();
+	{
+		PQclear(last_res);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
+
+	if (timed_out)
+		PQclear(last_res);
+	else
+		*result = last_res;
+	return timed_out;
+}
diff -Nru postgresql-9.5-9.5.2/contrib/postgres_fdw/deparse.c postgresql-9.5-9.5.8/contrib/postgres_fdw/deparse.c
--- postgresql-9.5-9.5.2/contrib/postgres_fdw/deparse.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/postgres_fdw/deparse.c	2017-08-07 21:13:41.000000000 +0000
@@ -1806,10 +1806,27 @@
 
 	appendStringInfoChar(buf, '(');
 	deparseExpr(node->arg, context);
-	if (node->nulltesttype == IS_NULL)
-		appendStringInfoString(buf, " IS NULL)");
+
+	/*
+	 * For scalar inputs, we prefer to print as IS [NOT] NULL, which is
+	 * shorter and traditional.  If it's a rowtype input but we're applying a
+	 * scalar test, must print IS [NOT] DISTINCT FROM NULL to be semantically
+	 * correct.
+	 */
+	if (node->argisrow || !type_is_rowtype(exprType((Node *) node->arg)))
+	{
+		if (node->nulltesttype == IS_NULL)
+			appendStringInfoString(buf, " IS NULL)");
+		else
+			appendStringInfoString(buf, " IS NOT NULL)");
+	}
 	else
-		appendStringInfoString(buf, " IS NOT NULL)");
+	{
+		if (node->nulltesttype == IS_NULL)
+			appendStringInfoString(buf, " IS NOT DISTINCT FROM NULL)");
+		else
+			appendStringInfoString(buf, " IS DISTINCT FROM NULL)");
+	}
 }
 
 /*
diff -Nru postgresql-9.5-9.5.2/contrib/postgres_fdw/expected/postgres_fdw.out postgresql-9.5-9.5.8/contrib/postgres_fdw/expected/postgres_fdw.out
--- postgresql-9.5-9.5.2/contrib/postgres_fdw/expected/postgres_fdw.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/postgres_fdw/expected/postgres_fdw.out	2017-08-07 21:13:41.000000000 +0000
@@ -126,6 +126,44 @@
  public | ft2   | loopback | (schema_name 'S 1', table_name 'T 1') | 
 (2 rows)
 
+-- Test that alteration of server options causes reconnection
+-- Remote's errors might be non-English, so hide them to ensure stable results
+\set VERBOSITY terse
+SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1;  -- should work
+  c3   |              c4              
+-------+------------------------------
+ 00001 | Fri Jan 02 00:00:00 1970 PST
+(1 row)
+
+ALTER SERVER loopback OPTIONS (SET dbname 'no such database');
+SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1;  -- should fail
+ERROR:  could not connect to server "loopback"
+DO $d$
+    BEGIN
+        EXECUTE $$ALTER SERVER loopback
+            OPTIONS (SET dbname '$$||current_database()||$$')$$;
+    END;
+$d$;
+SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1;  -- should work again
+  c3   |              c4              
+-------+------------------------------
+ 00001 | Fri Jan 02 00:00:00 1970 PST
+(1 row)
+
+-- Test that alteration of user mapping options causes reconnection
+ALTER USER MAPPING FOR CURRENT_USER SERVER loopback
+  OPTIONS (ADD user 'no such user');
+SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1;  -- should fail
+ERROR:  could not connect to server "loopback"
+ALTER USER MAPPING FOR CURRENT_USER SERVER loopback
+  OPTIONS (DROP user);
+SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1;  -- should work again
+  c3   |              c4              
+-------+------------------------------
+ 00001 | Fri Jan 02 00:00:00 1970 PST
+(1 row)
+
+\set VERBOSITY default
 -- Now we should be able to run ANALYZE.
 -- To exercise multiple code paths, we use local stats on ft1
 -- and remote-estimate mode on ft2.
@@ -859,12 +897,69 @@
   1 |  1 | 00001 | Fri Jan 02 00:00:00 1970 PST | Fri Jan 02 00:00:00 1970 | 1  | 1          | foo
 (1 row)
 
+-- altering FDW options requires replanning
+PREPARE st6 AS SELECT * FROM ft1 t1 WHERE t1.c1 = t1.c2;
+EXPLAIN (VERBOSE, COSTS OFF) EXECUTE st6;
+                                          QUERY PLAN                                          
+----------------------------------------------------------------------------------------------
+ Foreign Scan on public.ft1 t1
+   Output: c1, c2, c3, c4, c5, c6, c7, c8
+   Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" WHERE (("C 1" = c2))
+(3 rows)
+
+PREPARE st7 AS INSERT INTO ft1 (c1,c2,c3) VALUES (1001,101,'foo');
+EXPLAIN (VERBOSE, COSTS OFF) EXECUTE st7;
+                                                                                           QUERY PLAN                                                                                            
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Insert on public.ft1
+   Remote SQL: INSERT INTO "S 1"."T 1"("C 1", c2, c3, c4, c5, c6, c7, c8) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+   ->  Result
+         Output: NULL::integer, 1001, 101, 'foo'::text, NULL::timestamp with time zone, NULL::timestamp without time zone, NULL::character varying, 'ft1       '::character(10), NULL::user_enum
+(4 rows)
+
+ALTER TABLE "S 1"."T 1" RENAME TO "T 0";
+ALTER FOREIGN TABLE ft1 OPTIONS (SET table_name 'T 0');
+EXPLAIN (VERBOSE, COSTS OFF) EXECUTE st6;
+                                          QUERY PLAN                                          
+----------------------------------------------------------------------------------------------
+ Foreign Scan on public.ft1 t1
+   Output: c1, c2, c3, c4, c5, c6, c7, c8
+   Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 0" WHERE (("C 1" = c2))
+(3 rows)
+
+EXECUTE st6;
+ c1 | c2 |  c3   |              c4              |            c5            | c6 |     c7     | c8  
+----+----+-------+------------------------------+--------------------------+----+------------+-----
+  1 |  1 | 00001 | Fri Jan 02 00:00:00 1970 PST | Fri Jan 02 00:00:00 1970 | 1  | 1          | foo
+  2 |  2 | 00002 | Sat Jan 03 00:00:00 1970 PST | Sat Jan 03 00:00:00 1970 | 2  | 2          | foo
+  3 |  3 | 00003 | Sun Jan 04 00:00:00 1970 PST | Sun Jan 04 00:00:00 1970 | 3  | 3          | foo
+  4 |  4 | 00004 | Mon Jan 05 00:00:00 1970 PST | Mon Jan 05 00:00:00 1970 | 4  | 4          | foo
+  5 |  5 | 00005 | Tue Jan 06 00:00:00 1970 PST | Tue Jan 06 00:00:00 1970 | 5  | 5          | foo
+  6 |  6 | 00006 | Wed Jan 07 00:00:00 1970 PST | Wed Jan 07 00:00:00 1970 | 6  | 6          | foo
+  7 |  7 | 00007 | Thu Jan 08 00:00:00 1970 PST | Thu Jan 08 00:00:00 1970 | 7  | 7          | foo
+  8 |  8 | 00008 | Fri Jan 09 00:00:00 1970 PST | Fri Jan 09 00:00:00 1970 | 8  | 8          | foo
+  9 |  9 | 00009 | Sat Jan 10 00:00:00 1970 PST | Sat Jan 10 00:00:00 1970 | 9  | 9          | foo
+(9 rows)
+
+EXPLAIN (VERBOSE, COSTS OFF) EXECUTE st7;
+                                                                                           QUERY PLAN                                                                                            
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Insert on public.ft1
+   Remote SQL: INSERT INTO "S 1"."T 0"("C 1", c2, c3, c4, c5, c6, c7, c8) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+   ->  Result
+         Output: NULL::integer, 1001, 101, 'foo'::text, NULL::timestamp with time zone, NULL::timestamp without time zone, NULL::character varying, 'ft1       '::character(10), NULL::user_enum
+(4 rows)
+
+ALTER TABLE "S 1"."T 0" RENAME TO "T 1";
+ALTER FOREIGN TABLE ft1 OPTIONS (SET table_name 'T 1');
 -- cleanup
 DEALLOCATE st1;
 DEALLOCATE st2;
 DEALLOCATE st3;
 DEALLOCATE st4;
 DEALLOCATE st5;
+DEALLOCATE st6;
+DEALLOCATE st7;
 -- System columns, except ctid, should not be sent to remote
 EXPLAIN (VERBOSE, COSTS false)
 SELECT * FROM ft1 t1 WHERE t1.tableoid = 'pg_class'::regclass LIMIT 1;
diff -Nru postgresql-9.5-9.5.2/contrib/postgres_fdw/postgres_fdw.c postgresql-9.5-9.5.8/contrib/postgres_fdw/postgres_fdw.c
--- postgresql-9.5-9.5.2/contrib/postgres_fdw/postgres_fdw.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/postgres_fdw/postgres_fdw.c	2017-08-07 21:13:41.000000000 +0000
@@ -1088,7 +1088,7 @@
 	 * We don't use a PG_TRY block here, so be careful not to throw error
 	 * without releasing the PGresult.
 	 */
-	res = PQexec(fsstate->conn, sql);
+	res = pgfdw_exec_query(fsstate->conn, sql);
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
 		pgfdw_report_error(ERROR, res, fsstate->conn, true, sql);
 	PQclear(res);
@@ -1425,18 +1425,24 @@
 	p_values = convert_prep_stmt_params(fmstate, NULL, slot);
 
 	/*
-	 * Execute the prepared statement, and check for success.
+	 * Execute the prepared statement.
+	 */
+	if (!PQsendQueryPrepared(fmstate->conn,
+							 fmstate->p_name,
+							 fmstate->p_nums,
+							 p_values,
+							 NULL,
+							 NULL,
+							 0))
+		pgfdw_report_error(ERROR, NULL, fmstate->conn, false, fmstate->query);
+
+	/*
+	 * Get the result, and check for success.
 	 *
 	 * We don't use a PG_TRY block here, so be careful not to throw error
 	 * without releasing the PGresult.
 	 */
-	res = PQexecPrepared(fmstate->conn,
-						 fmstate->p_name,
-						 fmstate->p_nums,
-						 p_values,
-						 NULL,
-						 NULL,
-						 0);
+	res = pgfdw_get_result(fmstate->conn, fmstate->query);
 	if (PQresultStatus(res) !=
 		(fmstate->has_returning ? PGRES_TUPLES_OK : PGRES_COMMAND_OK))
 		pgfdw_report_error(ERROR, res, fmstate->conn, true, fmstate->query);
@@ -1495,18 +1501,24 @@
 										slot);
 
 	/*
-	 * Execute the prepared statement, and check for success.
+	 * Execute the prepared statement.
+	 */
+	if (!PQsendQueryPrepared(fmstate->conn,
+							 fmstate->p_name,
+							 fmstate->p_nums,
+							 p_values,
+							 NULL,
+							 NULL,
+							 0))
+		pgfdw_report_error(ERROR, NULL, fmstate->conn, false, fmstate->query);
+
+	/*
+	 * Get the result, and check for success.
 	 *
 	 * We don't use a PG_TRY block here, so be careful not to throw error
 	 * without releasing the PGresult.
 	 */
-	res = PQexecPrepared(fmstate->conn,
-						 fmstate->p_name,
-						 fmstate->p_nums,
-						 p_values,
-						 NULL,
-						 NULL,
-						 0);
+	res = pgfdw_get_result(fmstate->conn, fmstate->query);
 	if (PQresultStatus(res) !=
 		(fmstate->has_returning ? PGRES_TUPLES_OK : PGRES_COMMAND_OK))
 		pgfdw_report_error(ERROR, res, fmstate->conn, true, fmstate->query);
@@ -1565,18 +1577,24 @@
 										NULL);
 
 	/*
-	 * Execute the prepared statement, and check for success.
+	 * Execute the prepared statement.
+	 */
+	if (!PQsendQueryPrepared(fmstate->conn,
+							 fmstate->p_name,
+							 fmstate->p_nums,
+							 p_values,
+							 NULL,
+							 NULL,
+							 0))
+		pgfdw_report_error(ERROR, NULL, fmstate->conn, false, fmstate->query);
+
+	/*
+	 * Get the result, and check for success.
 	 *
 	 * We don't use a PG_TRY block here, so be careful not to throw error
 	 * without releasing the PGresult.
 	 */
-	res = PQexecPrepared(fmstate->conn,
-						 fmstate->p_name,
-						 fmstate->p_nums,
-						 p_values,
-						 NULL,
-						 NULL,
-						 0);
+	res = pgfdw_get_result(fmstate->conn, fmstate->query);
 	if (PQresultStatus(res) !=
 		(fmstate->has_returning ? PGRES_TUPLES_OK : PGRES_COMMAND_OK))
 		pgfdw_report_error(ERROR, res, fmstate->conn, true, fmstate->query);
@@ -1626,7 +1644,7 @@
 		 * We don't use a PG_TRY block here, so be careful not to throw error
 		 * without releasing the PGresult.
 		 */
-		res = PQexec(fmstate->conn, sql);
+		res = pgfdw_exec_query(fmstate->conn, sql);
 		if (PQresultStatus(res) != PGRES_COMMAND_OK)
 			pgfdw_report_error(ERROR, res, fmstate->conn, true, sql);
 		PQclear(res);
@@ -1884,7 +1902,7 @@
 		/*
 		 * Execute EXPLAIN remotely.
 		 */
-		res = PQexec(conn, sql);
+		res = pgfdw_exec_query(conn, sql);
 		if (PQresultStatus(res) != PGRES_TUPLES_OK)
 			pgfdw_report_error(ERROR, res, conn, false, sql);
 
@@ -2013,12 +2031,18 @@
 	 * parameter (see deparse.c), the "inference" is trivial and will produce
 	 * the desired result.  This allows us to avoid assuming that the remote
 	 * server has the same OIDs we do for the parameters' types.
+	 */
+	if (!PQsendQueryParams(conn, buf.data, numParams,
+						   NULL, values, NULL, NULL, 0))
+		pgfdw_report_error(ERROR, NULL, conn, false, buf.data);
+
+	/*
+	 * Get the result, and check for success.
 	 *
 	 * We don't use a PG_TRY block here, so be careful not to throw error
 	 * without releasing the PGresult.
 	 */
-	res = PQexecParams(conn, buf.data, numParams, NULL, values,
-					   NULL, NULL, 0);
+	res = pgfdw_get_result(conn, buf.data);
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
 		pgfdw_report_error(ERROR, res, conn, true, fsstate->query);
 	PQclear(res);
@@ -2068,7 +2092,7 @@
 		snprintf(sql, sizeof(sql), "FETCH %d FROM c%u",
 				 fetch_size, fsstate->cursor_number);
 
-		res = PQexec(conn, sql);
+		res = pgfdw_exec_query(conn, sql);
 		/* On error, report the original query, not the FETCH. */
 		if (PQresultStatus(res) != PGRES_TUPLES_OK)
 			pgfdw_report_error(ERROR, res, conn, false, fsstate->query);
@@ -2175,7 +2199,7 @@
 	 * We don't use a PG_TRY block here, so be careful not to throw error
 	 * without releasing the PGresult.
 	 */
-	res = PQexec(conn, sql);
+	res = pgfdw_exec_query(conn, sql);
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
 		pgfdw_report_error(ERROR, res, conn, true, sql);
 	PQclear(res);
@@ -2203,16 +2227,21 @@
 	 * with the remote server using different type OIDs than we do.  All of
 	 * the prepared statements we use in this module are simple enough that
 	 * the remote server will make the right choices.
+	 */
+	if (!PQsendPrepare(fmstate->conn,
+					   p_name,
+					   fmstate->query,
+					   0,
+					   NULL))
+		pgfdw_report_error(ERROR, NULL, fmstate->conn, false, fmstate->query);
+
+	/*
+	 * Get the result, and check for success.
 	 *
 	 * We don't use a PG_TRY block here, so be careful not to throw error
 	 * without releasing the PGresult.
 	 */
-	res = PQprepare(fmstate->conn,
-					p_name,
-					fmstate->query,
-					0,
-					NULL);
-
+	res = pgfdw_get_result(fmstate->conn, fmstate->query);
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
 		pgfdw_report_error(ERROR, res, fmstate->conn, true, fmstate->query);
 	PQclear(res);
@@ -2361,7 +2390,7 @@
 	/* In what follows, do not risk leaking any PGresults. */
 	PG_TRY();
 	{
-		res = PQexec(conn, sql.data);
+		res = pgfdw_exec_query(conn, sql.data);
 		if (PQresultStatus(res) != PGRES_TUPLES_OK)
 			pgfdw_report_error(ERROR, res, conn, false, sql.data);
 
@@ -2455,7 +2484,7 @@
 	/* In what follows, do not risk leaking any PGresults. */
 	PG_TRY();
 	{
-		res = PQexec(conn, sql.data);
+		res = pgfdw_exec_query(conn, sql.data);
 		if (PQresultStatus(res) != PGRES_COMMAND_OK)
 			pgfdw_report_error(ERROR, res, conn, false, sql.data);
 		PQclear(res);
@@ -2485,7 +2514,7 @@
 			snprintf(fetch_sql, sizeof(fetch_sql), "FETCH %d FROM c%u",
 					 fetch_size, cursor_number);
 
-			res = PQexec(conn, fetch_sql);
+			res = pgfdw_exec_query(conn, fetch_sql);
 			/* On error, report the original query, not the FETCH. */
 			if (PQresultStatus(res) != PGRES_TUPLES_OK)
 				pgfdw_report_error(ERROR, res, conn, false, sql.data);
@@ -2659,7 +2688,7 @@
 		appendStringInfoString(&buf, "SELECT 1 FROM pg_catalog.pg_namespace WHERE nspname = ");
 		deparseStringLiteral(&buf, stmt->remote_schema);
 
-		res = PQexec(conn, buf.data);
+		res = pgfdw_exec_query(conn, buf.data);
 		if (PQresultStatus(res) != PGRES_TUPLES_OK)
 			pgfdw_report_error(ERROR, res, conn, false, buf.data);
 
@@ -2758,7 +2787,7 @@
 		appendStringInfoString(&buf, " ORDER BY c.relname, a.attnum");
 
 		/* Fetch the data */
-		res = PQexec(conn, buf.data);
+		res = pgfdw_exec_query(conn, buf.data);
 		if (PQresultStatus(res) != PGRES_TUPLES_OK)
 			pgfdw_report_error(ERROR, res, conn, false, buf.data);
 
diff -Nru postgresql-9.5-9.5.2/contrib/postgres_fdw/postgres_fdw.h postgresql-9.5-9.5.8/contrib/postgres_fdw/postgres_fdw.h
--- postgresql-9.5-9.5.2/contrib/postgres_fdw/postgres_fdw.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/postgres_fdw/postgres_fdw.h	2017-08-07 21:13:41.000000000 +0000
@@ -30,6 +30,8 @@
 extern void ReleaseConnection(PGconn *conn);
 extern unsigned int GetCursorNumber(PGconn *conn);
 extern unsigned int GetPrepStmtNumber(PGconn *conn);
+extern PGresult *pgfdw_get_result(PGconn *conn, const char *query);
+extern PGresult *pgfdw_exec_query(PGconn *conn, const char *query);
 extern void pgfdw_report_error(int elevel, PGresult *res, PGconn *conn,
 				   bool clear, const char *sql);
 
diff -Nru postgresql-9.5-9.5.2/contrib/postgres_fdw/sql/postgres_fdw.sql postgresql-9.5-9.5.8/contrib/postgres_fdw/sql/postgres_fdw.sql
--- postgresql-9.5-9.5.2/contrib/postgres_fdw/sql/postgres_fdw.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/postgres_fdw/sql/postgres_fdw.sql	2017-08-07 21:13:41.000000000 +0000
@@ -129,6 +129,29 @@
 ALTER FOREIGN TABLE ft2 ALTER COLUMN c1 OPTIONS (column_name 'C 1');
 \det+
 
+-- Test that alteration of server options causes reconnection
+-- Remote's errors might be non-English, so hide them to ensure stable results
+\set VERBOSITY terse
+SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1;  -- should work
+ALTER SERVER loopback OPTIONS (SET dbname 'no such database');
+SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1;  -- should fail
+DO $d$
+    BEGIN
+        EXECUTE $$ALTER SERVER loopback
+            OPTIONS (SET dbname '$$||current_database()||$$')$$;
+    END;
+$d$;
+SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1;  -- should work again
+
+-- Test that alteration of user mapping options causes reconnection
+ALTER USER MAPPING FOR CURRENT_USER SERVER loopback
+  OPTIONS (ADD user 'no such user');
+SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1;  -- should fail
+ALTER USER MAPPING FOR CURRENT_USER SERVER loopback
+  OPTIONS (DROP user);
+SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1;  -- should work again
+\set VERBOSITY default
+
 -- Now we should be able to run ANALYZE.
 -- To exercise multiple code paths, we use local stats on ft1
 -- and remote-estimate mode on ft2.
@@ -252,12 +275,27 @@
 EXPLAIN (VERBOSE, COSTS false) EXECUTE st5('foo', 1);
 EXECUTE st5('foo', 1);
 
+-- altering FDW options requires replanning
+PREPARE st6 AS SELECT * FROM ft1 t1 WHERE t1.c1 = t1.c2;
+EXPLAIN (VERBOSE, COSTS OFF) EXECUTE st6;
+PREPARE st7 AS INSERT INTO ft1 (c1,c2,c3) VALUES (1001,101,'foo');
+EXPLAIN (VERBOSE, COSTS OFF) EXECUTE st7;
+ALTER TABLE "S 1"."T 1" RENAME TO "T 0";
+ALTER FOREIGN TABLE ft1 OPTIONS (SET table_name 'T 0');
+EXPLAIN (VERBOSE, COSTS OFF) EXECUTE st6;
+EXECUTE st6;
+EXPLAIN (VERBOSE, COSTS OFF) EXECUTE st7;
+ALTER TABLE "S 1"."T 0" RENAME TO "T 1";
+ALTER FOREIGN TABLE ft1 OPTIONS (SET table_name 'T 1');
+
 -- cleanup
 DEALLOCATE st1;
 DEALLOCATE st2;
 DEALLOCATE st3;
 DEALLOCATE st4;
 DEALLOCATE st5;
+DEALLOCATE st6;
+DEALLOCATE st7;
 
 -- System columns, except ctid, should not be sent to remote
 EXPLAIN (VERBOSE, COSTS false)
diff -Nru postgresql-9.5-9.5.2/contrib/seg/seg.c postgresql-9.5-9.5.8/contrib/seg/seg.c
--- postgresql-9.5-9.5.2/contrib/seg/seg.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/seg/seg.c	2017-08-07 21:13:41.000000000 +0000
@@ -888,7 +888,7 @@
 		if (Abs(exp) <= 4)
 		{
 			/*
-			 * remove the decimal point from the mantyssa and write the digits
+			 * remove the decimal point from the mantissa and write the digits
 			 * to the buf array
 			 */
 			for (p = result + sign, i = 10, dp = 0; *p != 'e'; p++, i++)
diff -Nru postgresql-9.5-9.5.2/contrib/seg/segscan.c postgresql-9.5-9.5.8/contrib/seg/segscan.c
--- postgresql-9.5-9.5.2/contrib/seg/segscan.c	2016-03-28 20:23:05.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/seg/segscan.c	2017-08-07 21:34:43.000000000 +0000
@@ -621,7 +621,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( seg_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -634,7 +634,7 @@
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, seg_yyin))==0 && ferror(seg_yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, seg_yyin)) == 0 && ferror(seg_yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1020,7 +1020,7 @@
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
diff -Nru postgresql-9.5-9.5.2/contrib/sepgsql/expected/label.out postgresql-9.5-9.5.8/contrib/sepgsql/expected/label.out
--- postgresql-9.5-9.5.2/contrib/sepgsql/expected/label.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/sepgsql/expected/label.out	2017-08-07 21:13:41.000000000 +0000
@@ -439,7 +439,7 @@
  unconfined_u:unconfined_r:sepgsql_regtest_pool_t:s0
 (1 row)
 
--- the pooler cannot touch these tables directry
+-- the pooler cannot touch these tables directly
 SELECT * FROM foo_tbl;	-- failed
 ERROR:  SELinux: security policy violation
 SELECT * FROM var_tbl;	-- failed
diff -Nru postgresql-9.5-9.5.2/contrib/sepgsql/label.c postgresql-9.5-9.5.8/contrib/sepgsql/label.c
--- postgresql-9.5-9.5.2/contrib/sepgsql/label.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/sepgsql/label.c	2017-08-07 21:13:41.000000000 +0000
@@ -10,6 +10,16 @@
  */
 #include "postgres.h"
 
+#include <selinux/label.h>
+
+/*
+ * <selinux/label.h> includes <stdbool.h>, which creates an incompatible
+ * #define for bool.  Get rid of that so we can use our own typedef.
+ * (We don't care if <stdbool.h> redefines "true"/"false"; those are close
+ * enough.)
+ */
+#undef bool
+
 #include "access/heapam.h"
 #include "access/htup_details.h"
 #include "access/genam.h"
@@ -37,8 +47,6 @@
 
 #include "sepgsql.h"
 
-#include <selinux/label.h>
-
 /*
  * Saved hook entries (if stacked)
  */
diff -Nru postgresql-9.5-9.5.2/contrib/sepgsql/selinux.c postgresql-9.5-9.5.8/contrib/sepgsql/selinux.c
--- postgresql-9.5-9.5.2/contrib/sepgsql/selinux.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/sepgsql/selinux.c	2017-08-07 21:13:41.000000000 +0000
@@ -23,7 +23,7 @@
  * When we ask SELinux whether the required privileges are allowed or not,
  * we use security_compute_av(3). It needs us to represent object classes
  * and access vectors using 'external' codes defined in the security policy.
- * It is determinded in the runtime, not build time. So, it needs an internal
+ * It is determined in the runtime, not build time. So, it needs an internal
  * service to translate object class/access vectors which we want to check
  * into the code which kernel want to be given.
  */
diff -Nru postgresql-9.5-9.5.2/contrib/sepgsql/sql/label.sql postgresql-9.5-9.5.8/contrib/sepgsql/sql/label.sql
--- postgresql-9.5-9.5.2/contrib/sepgsql/sql/label.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/sepgsql/sql/label.sql	2017-08-07 21:13:41.000000000 +0000
@@ -206,7 +206,7 @@
 SELECT sepgsql_setcon(NULL);	-- end of session
 SELECT sepgsql_getcon();
 
--- the pooler cannot touch these tables directry
+-- the pooler cannot touch these tables directly
 SELECT * FROM foo_tbl;	-- failed
 
 SELECT * FROM var_tbl;	-- failed
diff -Nru postgresql-9.5-9.5.2/contrib/spi/refint.c postgresql-9.5-9.5.8/contrib/spi/refint.c
--- postgresql-9.5-9.5.2/contrib/spi/refint.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/spi/refint.c	2017-08-07 21:13:41.000000000 +0000
@@ -89,7 +89,7 @@
 		/* internal error */
 		elog(ERROR, "check_primary_key: cannot process DELETE events");
 
-	/* If UPDATion the must check new Tuple, not old one */
+	/* If UPDATE, then must check new Tuple, not old one */
 	else
 		tuple = trigdata->tg_newtuple;
 
diff -Nru postgresql-9.5-9.5.2/contrib/start-scripts/osx/PostgreSQL postgresql-9.5-9.5.8/contrib/start-scripts/osx/PostgreSQL
--- postgresql-9.5-9.5.2/contrib/start-scripts/osx/PostgreSQL	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/start-scripts/osx/PostgreSQL	2017-08-07 21:13:41.000000000 +0000
@@ -29,7 +29,7 @@
 # modified by Ray Aspeitia 12-03-2003 :
 # added log rotation script to db startup
 # modified StartupParameters.plist "Provides" parameter to make it easier to
-# start and stop with the SystemStarter utitlity
+# start and stop with the SystemStarter utility
 
 # use the below command in order to correctly start/stop/restart PG with log rotation script:
 # SystemStarter [start|stop|restart] PostgreSQL
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/expected/ddl.out postgresql-9.5-9.5.8/contrib/test_decoding/expected/ddl.out
--- postgresql-9.5-9.5.2/contrib/test_decoding/expected/ddl.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/expected/ddl.out	2017-08-07 21:13:41.000000000 +0000
@@ -227,23 +227,28 @@
 INSERT INTO tr_etoomuch(data) SELECT g.i FROM generate_series(1, 10234) g(i);
 DELETE FROM tr_etoomuch WHERE id < 5000;
 UPDATE tr_etoomuch SET data = - data WHERE id > 5000;
+CREATE TABLE tr_oddlength (id text primary key, data text);
+INSERT INTO tr_oddlength VALUES('ab', 'foo');
 COMMIT;
 /* display results, but hide most of the output */
 SELECT count(*), min(data), max(data)
 FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1')
 GROUP BY substring(data, 1, 24)
 ORDER BY 1,2;
- count |                       min                       |                                  max                                   
--------+-------------------------------------------------+------------------------------------------------------------------------
-     1 | BEGIN                                           | BEGIN
-     1 | COMMIT                                          | COMMIT
- 20467 | table public.tr_etoomuch: DELETE: id[integer]:1 | table public.tr_etoomuch: UPDATE: id[integer]:9999 data[integer]:-9999
-(3 rows)
+ count |                                min                                |                                  max                                   
+-------+-------------------------------------------------------------------+------------------------------------------------------------------------
+     1 | BEGIN                                                             | BEGIN
+     1 | COMMIT                                                            | COMMIT
+     1 | table public.tr_oddlength: INSERT: id[text]:'ab' data[text]:'foo' | table public.tr_oddlength: INSERT: id[text]:'ab' data[text]:'foo'
+ 20467 | table public.tr_etoomuch: DELETE: id[integer]:1                   | table public.tr_etoomuch: UPDATE: id[integer]:9999 data[integer]:-9999
+(4 rows)
 
 -- check updates of primary keys work correctly
 BEGIN;
 CREATE TABLE spoolme AS SELECT g.i FROM generate_series(1, 5000) g(i);
 UPDATE tr_etoomuch SET id = -id WHERE id = 5000;
+UPDATE tr_oddlength SET id = 'x', data = 'quux';
+UPDATE tr_oddlength SET id = 'yy', data = 'a';
 DELETE FROM spoolme;
 DROP TABLE spoolme;
 COMMIT;
@@ -253,7 +258,9 @@
                                                     data                                                     
 -------------------------------------------------------------------------------------------------------------
  table public.tr_etoomuch: UPDATE: old-key: id[integer]:5000 new-tuple: id[integer]:-5000 data[integer]:5000
-(1 row)
+ table public.tr_oddlength: UPDATE: old-key: id[text]:'ab' new-tuple: id[text]:'x' data[text]:'quux'
+ table public.tr_oddlength: UPDATE: old-key: id[text]:'x' new-tuple: id[text]:'yy' data[text]:'a'
+(3 rows)
 
 -- check that a large, spooled, upsert works
 INSERT INTO tr_etoomuch (id, data)
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/expected/ondisk_startup.out postgresql-9.5-9.5.8/contrib/test_decoding/expected/ondisk_startup.out
--- postgresql-9.5-9.5.2/contrib/test_decoding/expected/ondisk_startup.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/expected/ondisk_startup.out	2017-08-07 21:13:41.000000000 +0000
@@ -1,21 +1,30 @@
 Parsed test spec with 3 sessions
 
-starting permutation: s2txid s1init s3txid s2alter s2c s1insert s1checkpoint s1start s1insert s1alter s1insert s1start
-step s2txid: BEGIN ISOLATION LEVEL REPEATABLE READ; SELECT txid_current() IS NULL;
+starting permutation: s2b s2txid s1init s3b s3txid s2alter s2c s2b s2txid s3c s2c s1insert s1checkpoint s1start s1insert s1alter s1insert s1start
+step s2b: BEGIN;
+step s2txid: SELECT txid_current() IS NULL;
 ?column?       
 
 f              
 step s1init: SELECT 'init' FROM pg_create_logical_replication_slot('isolation_slot', 'test_decoding'); <waiting ...>
-step s3txid: BEGIN ISOLATION LEVEL REPEATABLE READ; SELECT txid_current() IS NULL;
+step s3b: BEGIN;
+step s3txid: SELECT txid_current() IS NULL;
 ?column?       
 
 f              
 step s2alter: ALTER TABLE do_write ADD COLUMN addedbys2 int;
 step s2c: COMMIT;
+step s2b: BEGIN;
+step s2txid: SELECT txid_current() IS NULL;
+?column?       
+
+f              
+step s3c: COMMIT;
 step s1init: <... completed>
 ?column?       
 
 init           
+step s2c: COMMIT;
 step s1insert: INSERT INTO do_write DEFAULT VALUES;
 step s1checkpoint: CHECKPOINT;
 step s1start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/expected/spill.out postgresql-9.5-9.5.8/contrib/test_decoding/expected/spill.out
--- postgresql-9.5-9.5.2/contrib/test_decoding/expected/spill.out	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/expected/spill.out	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,256 @@
+-- predictability
+SET synchronous_commit = on;
+SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
+ ?column? 
+----------
+ init
+(1 row)
+
+CREATE TABLE spill_test(data text);
+-- consume DDL
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+ data 
+------
+(0 rows)
+
+-- spilling main xact
+BEGIN;
+INSERT INTO spill_test SELECT 'serialize-topbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+ regexp_split_to_array | count |                              array_agg                              |                               array_agg                                
+-----------------------+-------+---------------------------------------------------------------------+------------------------------------------------------------------------
+ 'serialize-topbig--1  |  5000 | table public.spill_test: INSERT: data[text]:'serialize-topbig--1:1' | table public.spill_test: INSERT: data[text]:'serialize-topbig--1:5000'
+(1 row)
+
+-- spilling subxact, nothing in main
+BEGIN;
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+ regexp_split_to_array | count |                              array_agg                              |                               array_agg                                
+-----------------------+-------+---------------------------------------------------------------------+------------------------------------------------------------------------
+ 'serialize-subbig--1  |  5000 | table public.spill_test: INSERT: data[text]:'serialize-subbig--1:1' | table public.spill_test: INSERT: data[text]:'serialize-subbig--1:5000'
+(1 row)
+
+-- spilling subxact, spilling main xact
+BEGIN;
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topbig--2:'||g.i FROM generate_series(5001, 10000) g(i);
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+    regexp_split_to_array    | count |                                   array_agg                                   |                                   array_agg                                    
+-----------------------------+-------+-------------------------------------------------------------------------------+--------------------------------------------------------------------------------
+ 'serialize-subbig-topbig--1 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-subbig-topbig--1:1'    | table public.spill_test: INSERT: data[text]:'serialize-subbig-topbig--1:5000'
+ 'serialize-subbig-topbig--2 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-subbig-topbig--2:5001' | table public.spill_test: INSERT: data[text]:'serialize-subbig-topbig--2:10000'
+(2 rows)
+
+-- spilling subxact, non-spilling main xact
+BEGIN;
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topsmall--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topsmall--2:'||g.i FROM generate_series(5001, 5001) g(i);
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+     regexp_split_to_array     | count |                                    array_agg                                    |                                    array_agg                                    
+-------------------------------+-------+---------------------------------------------------------------------------------+---------------------------------------------------------------------------------
+ 'serialize-subbig-topsmall--1 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-subbig-topsmall--1:1'    | table public.spill_test: INSERT: data[text]:'serialize-subbig-topsmall--1:5000'
+ 'serialize-subbig-topsmall--2 |     1 | table public.spill_test: INSERT: data[text]:'serialize-subbig-topsmall--2:5001' | table public.spill_test: INSERT: data[text]:'serialize-subbig-topsmall--2:5001'
+(2 rows)
+
+-- not-spilling subxact, spilling main xact
+BEGIN;
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topbig--2:'||g.i FROM generate_series(5001, 10000) g(i);
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+    regexp_split_to_array    | count |                                   array_agg                                   |                                   array_agg                                    
+-----------------------------+-------+-------------------------------------------------------------------------------+--------------------------------------------------------------------------------
+ 'serialize-subbig-topbig--1 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-subbig-topbig--1:1'    | table public.spill_test: INSERT: data[text]:'serialize-subbig-topbig--1:5000'
+ 'serialize-subbig-topbig--2 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-subbig-topbig--2:5001' | table public.spill_test: INSERT: data[text]:'serialize-subbig-topbig--2:10000'
+(2 rows)
+
+-- spilling main xact, spilling subxact
+BEGIN;
+INSERT INTO spill_test SELECT 'serialize-topbig-subbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-topbig-subbig--2:'||g.i FROM generate_series(5001, 10000) g(i);
+RELEASE SAVEPOINT s;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+    regexp_split_to_array    | count |                                   array_agg                                   |                                   array_agg                                    
+-----------------------------+-------+-------------------------------------------------------------------------------+--------------------------------------------------------------------------------
+ 'serialize-topbig-subbig--1 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-topbig-subbig--1:1'    | table public.spill_test: INSERT: data[text]:'serialize-topbig-subbig--1:5000'
+ 'serialize-topbig-subbig--2 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-topbig-subbig--2:5001' | table public.spill_test: INSERT: data[text]:'serialize-topbig-subbig--2:10000'
+(2 rows)
+
+-- spilling main xact, not spilling subxact
+BEGIN;
+INSERT INTO spill_test SELECT 'serialize-topbig-subsmall--1:'||g.i FROM generate_series(1, 5000) g(i);
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-topbig-subsmall--2:'||g.i FROM generate_series(5001, 5001) g(i);
+RELEASE SAVEPOINT s;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+     regexp_split_to_array     | count |                                    array_agg                                    |                                    array_agg                                    
+-------------------------------+-------+---------------------------------------------------------------------------------+---------------------------------------------------------------------------------
+ 'serialize-topbig-subsmall--1 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-topbig-subsmall--1:1'    | table public.spill_test: INSERT: data[text]:'serialize-topbig-subsmall--1:5000'
+ 'serialize-topbig-subsmall--2 |     1 | table public.spill_test: INSERT: data[text]:'serialize-topbig-subsmall--2:5001' | table public.spill_test: INSERT: data[text]:'serialize-topbig-subsmall--2:5001'
+(2 rows)
+
+-- spilling subxact, followed by another spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-subbig-subbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s1;
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-subbig-subbig--2:'||g.i FROM generate_series(5001, 10000) g(i);
+RELEASE SAVEPOINT s2;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+    regexp_split_to_array    | count |                                   array_agg                                   |                                   array_agg                                    
+-----------------------------+-------+-------------------------------------------------------------------------------+--------------------------------------------------------------------------------
+ 'serialize-subbig-subbig--1 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-subbig-subbig--1:1'    | table public.spill_test: INSERT: data[text]:'serialize-subbig-subbig--1:5000'
+ 'serialize-subbig-subbig--2 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-subbig-subbig--2:5001' | table public.spill_test: INSERT: data[text]:'serialize-subbig-subbig--2:10000'
+(2 rows)
+
+-- spilling subxact, followed by not spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-subbig-subsmall--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s1;
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-subbig-subsmall--2:'||g.i FROM generate_series(5001, 5001) g(i);
+RELEASE SAVEPOINT s2;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+     regexp_split_to_array     | count |                                    array_agg                                    |                                    array_agg                                    
+-------------------------------+-------+---------------------------------------------------------------------------------+---------------------------------------------------------------------------------
+ 'serialize-subbig-subsmall--1 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-subbig-subsmall--1:1'    | table public.spill_test: INSERT: data[text]:'serialize-subbig-subsmall--1:5000'
+ 'serialize-subbig-subsmall--2 |     1 | table public.spill_test: INSERT: data[text]:'serialize-subbig-subsmall--2:5001' | table public.spill_test: INSERT: data[text]:'serialize-subbig-subsmall--2:5001'
+(2 rows)
+
+-- not spilling subxact, followed by spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-subsmall-subbig--1:'||g.i FROM generate_series(1, 1) g(i);
+RELEASE SAVEPOINT s1;
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-subsmall-subbig--2:'||g.i FROM generate_series(2, 5001) g(i);
+RELEASE SAVEPOINT s2;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4] COLLATE "C", COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+     regexp_split_to_array     | count |                                  array_agg                                   |                                    array_agg                                    
+-------------------------------+-------+------------------------------------------------------------------------------+---------------------------------------------------------------------------------
+ 'serialize-subsmall-subbig--1 |     1 | table public.spill_test: INSERT: data[text]:'serialize-subsmall-subbig--1:1' | table public.spill_test: INSERT: data[text]:'serialize-subsmall-subbig--1:1'
+ 'serialize-subsmall-subbig--2 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-subsmall-subbig--2:2' | table public.spill_test: INSERT: data[text]:'serialize-subsmall-subbig--2:5001'
+(2 rows)
+
+-- spilling subxact, containing another spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subbig--2:'||g.i FROM generate_series(5001, 10000) g(i);
+RELEASE SAVEPOINT s2;
+RELEASE SAVEPOINT s1;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4] COLLATE "C", COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+       regexp_split_to_array        | count |                                      array_agg                                       |                                       array_agg                                       
+------------------------------------+-------+--------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------
+ 'serialize-nested-subbig-subbig--1 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subbig--1:1'    | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subbig--1:5000'
+ 'serialize-nested-subbig-subbig--2 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subbig--2:5001' | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subbig--2:10000'
+(2 rows)
+
+-- spilling subxact, containing a not spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subsmall--1:'||g.i FROM generate_series(1, 5000) g(i);
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subsmall--2:'||g.i FROM generate_series(5001, 5001) g(i);
+RELEASE SAVEPOINT s2;
+RELEASE SAVEPOINT s1;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4] COLLATE "C", COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+        regexp_split_to_array         | count |                                       array_agg                                        |                                       array_agg                                        
+--------------------------------------+-------+----------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------
+ 'serialize-nested-subbig-subsmall--1 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subsmall--1:1'    | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subsmall--1:5000'
+ 'serialize-nested-subbig-subsmall--2 |     1 | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subsmall--2:5001' | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subsmall--2:5001'
+(2 rows)
+
+-- not spilling subxact, containing a spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-nested-subsmall-subbig--1:'||g.i FROM generate_series(1, 1) g(i);
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-nested-subsmall-subbig--2:'||g.i FROM generate_series(2, 5001) g(i);
+RELEASE SAVEPOINT s2;
+RELEASE SAVEPOINT s1;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4] COLLATE "C", COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+        regexp_split_to_array         | count |                                      array_agg                                      |                                       array_agg                                        
+--------------------------------------+-------+-------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------
+ 'serialize-nested-subsmall-subbig--1 |     1 | table public.spill_test: INSERT: data[text]:'serialize-nested-subsmall-subbig--1:1' | table public.spill_test: INSERT: data[text]:'serialize-nested-subsmall-subbig--1:1'
+ 'serialize-nested-subsmall-subbig--2 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-nested-subsmall-subbig--2:2' | table public.spill_test: INSERT: data[text]:'serialize-nested-subsmall-subbig--2:5001'
+(2 rows)
+
+-- not spilling subxact, containing a spilling subxact that aborts and one that commits
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subbigabort--1:'||g.i FROM generate_series(1, 5000) g(i);
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subbigabort--2:'||g.i FROM generate_series(5001, 10000) g(i);
+ROLLBACK TO SAVEPOINT s2;
+SAVEPOINT s3;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subbigabort-subbig-3:'||g.i FROM generate_series(5001, 10000) g(i);
+RELEASE SAVEPOINT s1;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4] COLLATE "C", COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+             regexp_split_to_array             | count |                                            array_agg                                            |                                            array_agg                                             
+-----------------------------------------------+-------+-------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------
+ 'serialize-nested-subbig-subbigabort--1       |  5000 | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subbigabort--1:1'          | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subbigabort--1:5000'
+ 'serialize-nested-subbig-subbigabort-subbig-3 |  5000 | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subbigabort-subbig-3:5001' | table public.spill_test: INSERT: data[text]:'serialize-nested-subbig-subbigabort-subbig-3:10000'
+(2 rows)
+
+DROP TABLE spill_test;
+SELECT pg_drop_replication_slot('regression_slot');
+ pg_drop_replication_slot 
+--------------------------
+ 
+(1 row)
+
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/expected/toast.out postgresql-9.5-9.5.8/contrib/test_decoding/expected/toast.out
--- postgresql-9.5-9.5.2/contrib/test_decoding/expected/toast.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/expected/toast.out	2017-08-07 21:13:41.000000000 +0000
@@ -305,7 +305,13 @@
 ALTER TABLE toasted_several ALTER COLUMN toasted_key SET STORAGE EXTERNAL;
 ALTER TABLE toasted_several ALTER COLUMN toasted_col1 SET STORAGE EXTERNAL;
 ALTER TABLE toasted_several ALTER COLUMN toasted_col2 SET STORAGE EXTERNAL;
-INSERT INTO toasted_several(toasted_key) VALUES(repeat('9876543210', 2000));
+INSERT INTO toasted_several(toasted_key) VALUES(repeat('9876543210', 10000));
+SELECT pg_column_size(toasted_key) > 2^16 FROM toasted_several;
+ ?column? 
+----------
+ t
+(1 row)
+
 SELECT regexp_replace(data, '^(.{100}).*(.{100})$', '\1..\2') FROM pg_logical_slot_peek_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
                                                                                                regexp_replace                                                                                               
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/expected/xact.out postgresql-9.5-9.5.8/contrib/test_decoding/expected/xact.out
--- postgresql-9.5-9.5.2/contrib/test_decoding/expected/xact.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/expected/xact.out	2017-08-07 21:13:41.000000000 +0000
@@ -6,9 +6,9 @@
  init
 (1 row)
 
--- bug #13844, xids in non-decoded records need to be inspected
 CREATE TABLE xact_test(data text);
 INSERT INTO xact_test VALUES ('before-test');
+-- bug #13844, xids in non-decoded records need to be inspected
 BEGIN;
 -- perform operation in xact that creates and logs xid, but isn't decoded
 SELECT * FROM xact_test FOR UPDATE;
@@ -33,6 +33,28 @@
  COMMIT
 (6 rows)
 
+-- bug #14279, do not propagate null snapshot from subtransaction
+BEGIN;
+-- first insert
+INSERT INTO xact_test VALUES ('main-txn');
+SAVEPOINT foo;
+-- now perform operation in subxact that creates and logs xid, but isn't decoded
+SELECT 1 FROM xact_test FOR UPDATE LIMIT 1;
+ ?column? 
+----------
+        1
+(1 row)
+
+COMMIT;
+-- and now show those changes
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+                         data                          
+-------------------------------------------------------
+ BEGIN
+ table public.xact_test: INSERT: data[text]:'main-txn'
+ COMMIT
+(3 rows)
+
 DROP TABLE xact_test;
 SELECT pg_drop_replication_slot('regression_slot');
  pg_drop_replication_slot 
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/Makefile postgresql-9.5-9.5.8/contrib/test_decoding/Makefile
--- postgresql-9.5-9.5.2/contrib/test_decoding/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -38,7 +38,7 @@
 	$(MAKE) -C $(top_builddir)/contrib/test_decoding
 
 REGRESSCHECKS=ddl xact rewrite toast permissions decoding_in_xact \
-	decoding_into_rel binary prepared replorigin time
+	decoding_into_rel binary prepared replorigin time spill
 
 regresscheck: | submake-regress submake-test_decoding temp-install
 	$(MKDIR_P) regression_output
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/specs/ondisk_startup.spec postgresql-9.5-9.5.8/contrib/test_decoding/specs/ondisk_startup.spec
--- postgresql-9.5-9.5.2/contrib/test_decoding/specs/ondisk_startup.spec	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/specs/ondisk_startup.spec	2017-08-07 21:13:41.000000000 +0000
@@ -24,7 +24,8 @@
 session "s2"
 setup { SET synchronous_commit=on; }
 
-step "s2txid" { BEGIN ISOLATION LEVEL REPEATABLE READ; SELECT txid_current() IS NULL; }
+step "s2b" { BEGIN; }
+step "s2txid" { SELECT txid_current() IS NULL; }
 step "s2alter" { ALTER TABLE do_write ADD COLUMN addedbys2 int; }
 step "s2c" { COMMIT; }
 
@@ -32,7 +33,8 @@
 session "s3"
 setup { SET synchronous_commit=on; }
 
-step "s3txid" { BEGIN ISOLATION LEVEL REPEATABLE READ; SELECT txid_current() IS NULL; }
+step "s3b" { BEGIN; }
+step "s3txid" { SELECT txid_current() IS NULL; }
 step "s3c" { COMMIT; }
 
 # Force usage of ondisk snapshot by starting and not finishing a
@@ -40,4 +42,4 @@
 # reached. In combination with a checkpoint forcing a snapshot to be
 # written and a new restart point computed that'll lead to the usage
 # of the snapshot.
-permutation "s2txid" "s1init" "s3txid" "s2alter" "s2c" "s1insert" "s1checkpoint" "s1start" "s1insert" "s1alter" "s1insert" "s1start"
+permutation "s2b" "s2txid" "s1init" "s3b" "s3txid" "s2alter" "s2c" "s2b" "s2txid" "s3c" "s2c" "s1insert" "s1checkpoint" "s1start" "s1insert" "s1alter" "s1insert" "s1start"
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/sql/ddl.sql postgresql-9.5-9.5.8/contrib/test_decoding/sql/ddl.sql
--- postgresql-9.5-9.5.2/contrib/test_decoding/sql/ddl.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/sql/ddl.sql	2017-08-07 21:13:41.000000000 +0000
@@ -115,6 +115,8 @@
 INSERT INTO tr_etoomuch(data) SELECT g.i FROM generate_series(1, 10234) g(i);
 DELETE FROM tr_etoomuch WHERE id < 5000;
 UPDATE tr_etoomuch SET data = - data WHERE id > 5000;
+CREATE TABLE tr_oddlength (id text primary key, data text);
+INSERT INTO tr_oddlength VALUES('ab', 'foo');
 COMMIT;
 
 /* display results, but hide most of the output */
@@ -127,6 +129,8 @@
 BEGIN;
 CREATE TABLE spoolme AS SELECT g.i FROM generate_series(1, 5000) g(i);
 UPDATE tr_etoomuch SET id = -id WHERE id = 5000;
+UPDATE tr_oddlength SET id = 'x', data = 'quux';
+UPDATE tr_oddlength SET id = 'yy', data = 'a';
 DELETE FROM spoolme;
 DROP TABLE spoolme;
 COMMIT;
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/sql/spill.sql postgresql-9.5-9.5.8/contrib/test_decoding/sql/spill.sql
--- postgresql-9.5-9.5.2/contrib/test_decoding/sql/spill.sql	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/sql/spill.sql	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,179 @@
+-- predictability
+SET synchronous_commit = on;
+
+SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
+
+CREATE TABLE spill_test(data text);
+
+-- consume DDL
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+
+-- spilling main xact
+BEGIN;
+INSERT INTO spill_test SELECT 'serialize-topbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- spilling subxact, nothing in main
+BEGIN;
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- spilling subxact, spilling main xact
+BEGIN;
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topbig--2:'||g.i FROM generate_series(5001, 10000) g(i);
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- spilling subxact, non-spilling main xact
+BEGIN;
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topsmall--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topsmall--2:'||g.i FROM generate_series(5001, 5001) g(i);
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- not-spilling subxact, spilling main xact
+BEGIN;
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-subbig-topbig--2:'||g.i FROM generate_series(5001, 10000) g(i);
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- spilling main xact, spilling subxact
+BEGIN;
+INSERT INTO spill_test SELECT 'serialize-topbig-subbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-topbig-subbig--2:'||g.i FROM generate_series(5001, 10000) g(i);
+RELEASE SAVEPOINT s;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- spilling main xact, not spilling subxact
+BEGIN;
+INSERT INTO spill_test SELECT 'serialize-topbig-subsmall--1:'||g.i FROM generate_series(1, 5000) g(i);
+SAVEPOINT s;
+INSERT INTO spill_test SELECT 'serialize-topbig-subsmall--2:'||g.i FROM generate_series(5001, 5001) g(i);
+RELEASE SAVEPOINT s;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- spilling subxact, followed by another spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-subbig-subbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s1;
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-subbig-subbig--2:'||g.i FROM generate_series(5001, 10000) g(i);
+RELEASE SAVEPOINT s2;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- spilling subxact, followed by not spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-subbig-subsmall--1:'||g.i FROM generate_series(1, 5000) g(i);
+RELEASE SAVEPOINT s1;
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-subbig-subsmall--2:'||g.i FROM generate_series(5001, 5001) g(i);
+RELEASE SAVEPOINT s2;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4], COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- not spilling subxact, followed by spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-subsmall-subbig--1:'||g.i FROM generate_series(1, 1) g(i);
+RELEASE SAVEPOINT s1;
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-subsmall-subbig--2:'||g.i FROM generate_series(2, 5001) g(i);
+RELEASE SAVEPOINT s2;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4] COLLATE "C", COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- spilling subxact, containing another spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subbig--1:'||g.i FROM generate_series(1, 5000) g(i);
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subbig--2:'||g.i FROM generate_series(5001, 10000) g(i);
+RELEASE SAVEPOINT s2;
+RELEASE SAVEPOINT s1;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4] COLLATE "C", COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- spilling subxact, containing a not spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subsmall--1:'||g.i FROM generate_series(1, 5000) g(i);
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subsmall--2:'||g.i FROM generate_series(5001, 5001) g(i);
+RELEASE SAVEPOINT s2;
+RELEASE SAVEPOINT s1;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4] COLLATE "C", COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- not spilling subxact, containing a spilling subxact
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-nested-subsmall-subbig--1:'||g.i FROM generate_series(1, 1) g(i);
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-nested-subsmall-subbig--2:'||g.i FROM generate_series(2, 5001) g(i);
+RELEASE SAVEPOINT s2;
+RELEASE SAVEPOINT s1;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4] COLLATE "C", COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+-- not spilling subxact, containing a spilling subxact that aborts and one that commits
+BEGIN;
+SAVEPOINT s1;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subbigabort--1:'||g.i FROM generate_series(1, 5000) g(i);
+SAVEPOINT s2;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subbigabort--2:'||g.i FROM generate_series(5001, 10000) g(i);
+ROLLBACK TO SAVEPOINT s2;
+SAVEPOINT s3;
+INSERT INTO spill_test SELECT 'serialize-nested-subbig-subbigabort-subbig-3:'||g.i FROM generate_series(5001, 10000) g(i);
+RELEASE SAVEPOINT s1;
+COMMIT;
+SELECT (regexp_split_to_array(data, ':'))[4] COLLATE "C", COUNT(*), (array_agg(data))[1], (array_agg(data))[count(*)]
+FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL) WHERE data ~ 'INSERT'
+GROUP BY 1 ORDER BY 1;
+
+DROP TABLE spill_test;
+
+SELECT pg_drop_replication_slot('regression_slot');
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/sql/toast.sql postgresql-9.5-9.5.8/contrib/test_decoding/sql/toast.sql
--- postgresql-9.5-9.5.2/contrib/test_decoding/sql/toast.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/sql/toast.sql	2017-08-07 21:13:41.000000000 +0000
@@ -279,7 +279,8 @@
 ALTER TABLE toasted_several ALTER COLUMN toasted_col1 SET STORAGE EXTERNAL;
 ALTER TABLE toasted_several ALTER COLUMN toasted_col2 SET STORAGE EXTERNAL;
 
-INSERT INTO toasted_several(toasted_key) VALUES(repeat('9876543210', 2000));
+INSERT INTO toasted_several(toasted_key) VALUES(repeat('9876543210', 10000));
+SELECT pg_column_size(toasted_key) > 2^16 FROM toasted_several;
 
 SELECT regexp_replace(data, '^(.{100}).*(.{100})$', '\1..\2') FROM pg_logical_slot_peek_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
 
diff -Nru postgresql-9.5-9.5.2/contrib/test_decoding/sql/xact.sql postgresql-9.5-9.5.8/contrib/test_decoding/sql/xact.sql
--- postgresql-9.5-9.5.2/contrib/test_decoding/sql/xact.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/test_decoding/sql/xact.sql	2017-08-07 21:13:41.000000000 +0000
@@ -3,10 +3,10 @@
 
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 
--- bug #13844, xids in non-decoded records need to be inspected
 CREATE TABLE xact_test(data text);
 INSERT INTO xact_test VALUES ('before-test');
 
+-- bug #13844, xids in non-decoded records need to be inspected
 BEGIN;
 -- perform operation in xact that creates and logs xid, but isn't decoded
 SELECT * FROM xact_test FOR UPDATE;
@@ -16,6 +16,17 @@
 COMMIT;
 -- and now show those changes
 SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+
+-- bug #14279, do not propagate null snapshot from subtransaction
+BEGIN;
+-- first insert
+INSERT INTO xact_test VALUES ('main-txn');
+SAVEPOINT foo;
+-- now perform operation in subxact that creates and logs xid, but isn't decoded
+SELECT 1 FROM xact_test FOR UPDATE LIMIT 1;
+COMMIT;
+-- and now show those changes
+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
 
 DROP TABLE xact_test;
 
diff -Nru postgresql-9.5-9.5.2/contrib/tsearch2/expected/tsearch2_1.out postgresql-9.5-9.5.8/contrib/tsearch2/expected/tsearch2_1.out
--- postgresql-9.5-9.5.2/contrib/tsearch2/expected/tsearch2_1.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/tsearch2/expected/tsearch2_1.out	1970-01-01 00:00:00.000000000 +0000
@@ -1,2969 +0,0 @@
-CREATE EXTENSION tsearch2;
---tsvector
-SELECT '1'::tsvector;
- tsvector 
-----------
- '1'
-(1 row)
-
-SELECT '1 '::tsvector;
- tsvector 
-----------
- '1'
-(1 row)
-
-SELECT ' 1'::tsvector;
- tsvector 
-----------
- '1'
-(1 row)
-
-SELECT ' 1 '::tsvector;
- tsvector 
-----------
- '1'
-(1 row)
-
-SELECT '1 2'::tsvector;
- tsvector 
-----------
- '1' '2'
-(1 row)
-
-SELECT '''1 2'''::tsvector;
- tsvector 
-----------
- '1 2'
-(1 row)
-
-SELECT E'''1 \\''2'''::tsvector;
- tsvector 
-----------
- '1 ''2'
-(1 row)
-
-SELECT E'''1 \\''2''3'::tsvector;
-  tsvector   
--------------
- '1 ''2' '3'
-(1 row)
-
-SELECT E'''1 \\''2'' 3'::tsvector;
-  tsvector   
--------------
- '1 ''2' '3'
-(1 row)
-
-SELECT E'''1 \\''2'' '' 3'' 4 '::tsvector;
-     tsvector     
-------------------
- ' 3' '1 ''2' '4'
-(1 row)
-
-select '''w'':4A,3B,2C,1D,5 a:8';
-       ?column?        
------------------------
- 'w':4A,3B,2C,1D,5 a:8
-(1 row)
-
-select 'a:3A b:2a'::tsvector || 'ba:1234 a:1B';
-          ?column?          
-----------------------------
- 'a':3A,4B 'b':2A 'ba':1237
-(1 row)
-
-select setweight('w:12B w:13* w:12,5,6 a:1,3* a:3 w asd:1dc asd zxc:81,567,222A'::tsvector, 'c');
-                        setweight                         
-----------------------------------------------------------
- 'a':1C,3C 'asd':1C 'w':5C,6C,12C,13C 'zxc':81C,222C,567C
-(1 row)
-
-select strip('w:12B w:13* w:12,5,6 a:1,3* a:3 w asd:1dc asd'::tsvector);
-     strip     
----------------
- 'a' 'asd' 'w'
-(1 row)
-
---tsquery
-SELECT '1'::tsquery;
- tsquery 
----------
- '1'
-(1 row)
-
-SELECT '1 '::tsquery;
- tsquery 
----------
- '1'
-(1 row)
-
-SELECT ' 1'::tsquery;
- tsquery 
----------
- '1'
-(1 row)
-
-SELECT ' 1 '::tsquery;
- tsquery 
----------
- '1'
-(1 row)
-
-SELECT '''1 2'''::tsquery;
- tsquery 
----------
- '1 2'
-(1 row)
-
-SELECT E'''1 \\''2'''::tsquery;
- tsquery 
----------
- '1 ''2'
-(1 row)
-
-SELECT '!1'::tsquery;
- tsquery 
----------
- !'1'
-(1 row)
-
-SELECT '1|2'::tsquery;
-  tsquery  
------------
- '1' | '2'
-(1 row)
-
-SELECT '1|!2'::tsquery;
-  tsquery   
-------------
- '1' | !'2'
-(1 row)
-
-SELECT '!1|2'::tsquery;
-  tsquery   
-------------
- !'1' | '2'
-(1 row)
-
-SELECT '!1|!2'::tsquery;
-   tsquery   
--------------
- !'1' | !'2'
-(1 row)
-
-SELECT '!(!1|!2)'::tsquery;
-     tsquery      
-------------------
- !( !'1' | !'2' )
-(1 row)
-
-SELECT '!(!1|2)'::tsquery;
-     tsquery     
------------------
- !( !'1' | '2' )
-(1 row)
-
-SELECT '!(1|!2)'::tsquery;
-     tsquery     
------------------
- !( '1' | !'2' )
-(1 row)
-
-SELECT '!(1|2)'::tsquery;
-    tsquery     
-----------------
- !( '1' | '2' )
-(1 row)
-
-SELECT '1&2'::tsquery;
-  tsquery  
------------
- '1' & '2'
-(1 row)
-
-SELECT '!1&2'::tsquery;
-  tsquery   
-------------
- !'1' & '2'
-(1 row)
-
-SELECT '1&!2'::tsquery;
-  tsquery   
-------------
- '1' & !'2'
-(1 row)
-
-SELECT '!1&!2'::tsquery;
-   tsquery   
--------------
- !'1' & !'2'
-(1 row)
-
-SELECT '(1&2)'::tsquery;
-  tsquery  
------------
- '1' & '2'
-(1 row)
-
-SELECT '1&(2)'::tsquery;
-  tsquery  
------------
- '1' & '2'
-(1 row)
-
-SELECT '!(1)&2'::tsquery;
-  tsquery   
-------------
- !'1' & '2'
-(1 row)
-
-SELECT '!(1&2)'::tsquery;
-    tsquery     
-----------------
- !( '1' & '2' )
-(1 row)
-
-SELECT '1|2&3'::tsquery;
-     tsquery     
------------------
- '1' | '2' & '3'
-(1 row)
-
-SELECT '1|(2&3)'::tsquery;
-     tsquery     
------------------
- '1' | '2' & '3'
-(1 row)
-
-SELECT '(1|2)&3'::tsquery;
-       tsquery       
----------------------
- ( '1' | '2' ) & '3'
-(1 row)
-
-SELECT '1|2&!3'::tsquery;
-     tsquery      
-------------------
- '1' | '2' & !'3'
-(1 row)
-
-SELECT '1|!2&3'::tsquery;
-     tsquery      
-------------------
- '1' | !'2' & '3'
-(1 row)
-
-SELECT '!1|2&3'::tsquery;
-     tsquery      
-------------------
- !'1' | '2' & '3'
-(1 row)
-
-SELECT '!1|(2&3)'::tsquery;
-     tsquery      
-------------------
- !'1' | '2' & '3'
-(1 row)
-
-SELECT '!(1|2)&3'::tsquery;
-       tsquery        
-----------------------
- !( '1' | '2' ) & '3'
-(1 row)
-
-SELECT '(!1|2)&3'::tsquery;
-       tsquery        
-----------------------
- ( !'1' | '2' ) & '3'
-(1 row)
-
-SELECT '1|(2|(4|(5|6)))'::tsquery;
-                 tsquery                 
------------------------------------------
- '1' | ( '2' | ( '4' | ( '5' | '6' ) ) )
-(1 row)
-
-SELECT '1|2|4|5|6'::tsquery;
-                 tsquery                 
------------------------------------------
- ( ( ( '1' | '2' ) | '4' ) | '5' ) | '6'
-(1 row)
-
-SELECT '1&(2&(4&(5&6)))'::tsquery;
-           tsquery           
------------------------------
- '1' & '2' & '4' & '5' & '6'
-(1 row)
-
-SELECT '1&2&4&5&6'::tsquery;
-           tsquery           
------------------------------
- '1' & '2' & '4' & '5' & '6'
-(1 row)
-
-SELECT '1&(2&(4&(5|6)))'::tsquery;
-             tsquery             
----------------------------------
- '1' & '2' & '4' & ( '5' | '6' )
-(1 row)
-
-SELECT '1&(2&(4&(5|!6)))'::tsquery;
-             tsquery              
-----------------------------------
- '1' & '2' & '4' & ( '5' | !'6' )
-(1 row)
-
-SELECT E'1&(''2''&('' 4''&(\\|5 | ''6 \\'' !|&'')))'::tsquery;
-                 tsquery                  
-------------------------------------------
- '1' & '2' & ' 4' & ( '|5' | '6 '' !|&' )
-(1 row)
-
-SELECT '''the wether'':dc & '' sKies '':BC & a:d b:a';
-                 ?column?                 
-------------------------------------------
- 'the wether':dc & ' sKies ':BC & a:d b:a
-(1 row)
-
-select 'a' < 'b & c'::tsquery;
- ?column? 
-----------
- t
-(1 row)
-
-select 'a' > 'b & c'::tsquery;
- ?column? 
-----------
- f
-(1 row)
-
-select 'a | f' < 'b & c'::tsquery;
- ?column? 
-----------
- t
-(1 row)
-
-select 'a | ff' < 'b & c'::tsquery;
- ?column? 
-----------
- f
-(1 row)
-
-select 'a | f | g' < 'b & c'::tsquery;
- ?column? 
-----------
- f
-(1 row)
-
-select numnode( 'new'::tsquery );
- numnode 
----------
-       1
-(1 row)
-
-select numnode( 'new & york'::tsquery );
- numnode 
----------
-       3
-(1 row)
-
-select numnode( 'new & york | qwery'::tsquery );
- numnode 
----------
-       5
-(1 row)
-
-create table test_tsquery (txtkeyword text, txtsample text);
-\set ECHO none
-alter table test_tsquery add column keyword tsquery;
-update test_tsquery set keyword = to_tsquery('english', txtkeyword);
-alter table test_tsquery add column sample tsquery;
-update test_tsquery set sample = to_tsquery('english', txtsample::text);
-create unique index bt_tsq on test_tsquery (keyword);
-select count(*) from test_tsquery where keyword <  'new & york';
- count 
--------
-     1
-(1 row)
-
-select count(*) from test_tsquery where keyword <= 'new & york';
- count 
--------
-     2
-(1 row)
-
-select count(*) from test_tsquery where keyword = 'new & york';
- count 
--------
-     1
-(1 row)
-
-select count(*) from test_tsquery where keyword >= 'new & york';
- count 
--------
-     3
-(1 row)
-
-select count(*) from test_tsquery where keyword >  'new & york';
- count 
--------
-     2
-(1 row)
-
-set enable_seqscan=off;
-select count(*) from test_tsquery where keyword <  'new & york';
- count 
--------
-     1
-(1 row)
-
-select count(*) from test_tsquery where keyword <= 'new & york';
- count 
--------
-     2
-(1 row)
-
-select count(*) from test_tsquery where keyword = 'new & york';
- count 
--------
-     1
-(1 row)
-
-select count(*) from test_tsquery where keyword >= 'new & york';
- count 
--------
-     3
-(1 row)
-
-select count(*) from test_tsquery where keyword >  'new & york';
- count 
--------
-     2
-(1 row)
-
-set enable_seqscan=on;
-select rewrite('foo & bar & qq & new & york',  'new & york'::tsquery, 'big & apple | nyc | new & york & city');
-                                     rewrite                                      
-----------------------------------------------------------------------------------
- 'foo' & 'bar' & 'qq' & ( 'city' & 'new' & 'york' | ( 'nyc' | 'big' & 'apple' ) )
-(1 row)
-
-select rewrite('moscow', 'select keyword, sample from test_tsquery'::text );
-       rewrite       
----------------------
- 'moskva' | 'moscow'
-(1 row)
-
-select rewrite('moscow & hotel', 'select keyword, sample from test_tsquery'::text );
-              rewrite              
------------------------------------
- 'hotel' & ( 'moskva' | 'moscow' )
-(1 row)
-
-select rewrite('bar &  new & qq & foo & york', 'select keyword, sample from test_tsquery'::text );
-                                       rewrite                                       
--------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
-(1 row)
-
-select rewrite( ARRAY['moscow', keyword, sample] ) from test_tsquery;
-       rewrite       
----------------------
- 'moskva' | 'moscow'
-(1 row)
-
-select rewrite( ARRAY['moscow & hotel', keyword, sample] ) from test_tsquery;
-              rewrite              
------------------------------------
- ( 'moskva' | 'moscow' ) & 'hotel'
-(1 row)
-
-select rewrite( ARRAY['bar &  new & qq & foo & york', keyword, sample] ) from test_tsquery;
-                                       rewrite                                       
--------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
-(1 row)
-
-select keyword from test_tsquery where keyword @> 'new';
-    keyword     
-----------------
- 'new' & 'york'
-(1 row)
-
-select keyword from test_tsquery where keyword @> 'moscow';
- keyword  
-----------
- 'moscow'
-(1 row)
-
-select keyword from test_tsquery where keyword <@ 'new';
- keyword 
----------
-(0 rows)
-
-select keyword from test_tsquery where keyword <@ 'moscow';
- keyword  
-----------
- 'moscow'
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where keyword <@ query;
-       rewrite       
----------------------
- 'moskva' | 'moscow'
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where keyword <@ query;
-              rewrite              
------------------------------------
- ( 'moskva' | 'moscow' ) & 'hotel'
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where keyword <@ query;
-                                       rewrite                                       
--------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where query @> keyword;
-       rewrite       
----------------------
- 'moskva' | 'moscow'
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where query @> keyword;
-              rewrite              
------------------------------------
- ( 'moskva' | 'moscow' ) & 'hotel'
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where query @> keyword;
-                                       rewrite                                       
--------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
-(1 row)
-
-create index qq on test_tsquery using gist (keyword gist_tp_tsquery_ops);
-set enable_seqscan='off';
-select keyword from test_tsquery where keyword @> 'new';
-    keyword     
-----------------
- 'new' & 'york'
-(1 row)
-
-select keyword from test_tsquery where keyword @> 'moscow';
- keyword  
-----------
- 'moscow'
-(1 row)
-
-select keyword from test_tsquery where keyword <@ 'new';
- keyword 
----------
-(0 rows)
-
-select keyword from test_tsquery where keyword <@ 'moscow';
- keyword  
-----------
- 'moscow'
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where keyword <@ query;
-       rewrite       
----------------------
- 'moskva' | 'moscow'
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where keyword <@ query;
-              rewrite              
------------------------------------
- ( 'moskva' | 'moscow' ) & 'hotel'
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where keyword <@ query;
-                                       rewrite                                       
--------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where query @> keyword;
-       rewrite       
----------------------
- 'moskva' | 'moscow'
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where query @> keyword;
-              rewrite              
------------------------------------
- ( 'moskva' | 'moscow' ) & 'hotel'
-(1 row)
-
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where query @> keyword;
-                                       rewrite                                       
--------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
-(1 row)
-
-set enable_seqscan='on';
-select lexize('simple', 'ASD56 hsdkf');
-     lexize      
------------------
- {"asd56 hsdkf"}
-(1 row)
-
-select lexize('english_stem', 'SKIES Problems identity');
-          lexize          
---------------------------
- {"skies problems ident"}
-(1 row)
-
-select * from token_type('default');
- tokid |      alias      |                  descr                   
--------+-----------------+------------------------------------------
-     1 | asciiword       | Word, all ASCII
-     2 | word            | Word, all letters
-     3 | numword         | Word, letters and digits
-     4 | email           | Email address
-     5 | url             | URL
-     6 | host            | Host
-     7 | sfloat          | Scientific notation
-     8 | version         | Version number
-     9 | hword_numpart   | Hyphenated word part, letters and digits
-    10 | hword_part      | Hyphenated word part, all letters
-    11 | hword_asciipart | Hyphenated word part, all ASCII
-    12 | blank           | Space symbols
-    13 | tag             | XML tag
-    14 | protocol        | Protocol head
-    15 | numhword        | Hyphenated word, letters and digits
-    16 | asciihword      | Hyphenated word, all ASCII
-    17 | hword           | Hyphenated word, all letters
-    18 | url_path        | URL path
-    19 | file            | File or path name
-    20 | float           | Decimal notation
-    21 | int             | Signed integer
-    22 | uint            | Unsigned integer
-    23 | entity          | XML entity
-(23 rows)
-
-select * from parse('default', '345 qwe@efd.r '' http://www.com/ http://aew.werc.ewr/?ad=qwe&dw 1aew.werc.ewr/?ad=qwe&dw 2aew.werc.ewr http://3aew.werc.ewr/?ad=qwe&dw http://4aew.werc.ewr http://5aew.werc.ewr:8100/?  ad=qwe&dw 6aew.werc.ewr:8100/?ad=qwe&dw 7aew.werc.ewr:8100/?ad=qwe&dw=%20%32 +4.0e-10 qwe qwe qwqwe 234.435 455 5.005 teodor@stack.net qwe-wer asdf <fr>qwer jf sdjk<we hjwer <werrwe> ewr1> ewri2 <a href="qwe<qwe>">
-/usr/local/fff /awdf/dwqe/4325 rewt/ewr wefjn /wqe-324/ewr gist.h gist.h.c gist.c. readline 4.2 4.2. 4.2, readline-4.2 readline-4.2. 234 
-<i <b> wow  < jqw <> qwerty');
- tokid |                token                 
--------+--------------------------------------
-    22 | 345
-    12 |  
-     1 | qwe
-    12 | @
-    19 | efd.r
-    12 |  ' 
-    14 | http://
-     6 | www.com
-    12 | / 
-    14 | http://
-     5 | aew.werc.ewr/?ad=qwe&dw
-     6 | aew.werc.ewr
-    18 | /?ad=qwe&dw
-    12 |  
-     5 | 1aew.werc.ewr/?ad=qwe&dw
-     6 | 1aew.werc.ewr
-    18 | /?ad=qwe&dw
-    12 |  
-     6 | 2aew.werc.ewr
-    12 |  
-    14 | http://
-     5 | 3aew.werc.ewr/?ad=qwe&dw
-     6 | 3aew.werc.ewr
-    18 | /?ad=qwe&dw
-    12 |  
-    14 | http://
-     6 | 4aew.werc.ewr
-    12 |  
-    14 | http://
-     5 | 5aew.werc.ewr:8100/?
-     6 | 5aew.werc.ewr:8100
-    18 | /?
-    12 |   
-     1 | ad
-    12 | =
-     1 | qwe
-    12 | &
-     1 | dw
-    12 |  
-     5 | 6aew.werc.ewr:8100/?ad=qwe&dw
-     6 | 6aew.werc.ewr:8100
-    18 | /?ad=qwe&dw
-    12 |  
-     5 | 7aew.werc.ewr:8100/?ad=qwe&dw=%20%32
-     6 | 7aew.werc.ewr:8100
-    18 | /?ad=qwe&dw=%20%32
-    12 |  
-     7 | +4.0e-10
-    12 |  
-     1 | qwe
-    12 |  
-     1 | qwe
-    12 |  
-     1 | qwqwe
-    12 |  
-    20 | 234.435
-    12 |  
-    22 | 455
-    12 |  
-    20 | 5.005
-    12 |  
-     4 | teodor@stack.net
-    12 |  
-    16 | qwe-wer
-    11 | qwe
-    12 | -
-    11 | wer
-    12 |  
-     1 | asdf
-    12 |  
-    13 | <fr>
-     1 | qwer
-    12 |  
-     1 | jf
-    12 |  
-     1 | sdjk
-    12 | <
-     1 | we
-    12 |  
-     1 | hjwer
-    12 |  
-    13 | <werrwe>
-    12 |  
-     3 | ewr1
-    12 | > 
-     3 | ewri2
-    12 |  
-    13 | <a href="qwe<qwe>">
-    12 |                                     +
-       | 
-    19 | /usr/local/fff
-    12 |  
-    19 | /awdf/dwqe/4325
-    12 |  
-    19 | rewt/ewr
-    12 |  
-     1 | wefjn
-    12 |  
-    19 | /wqe-324/ewr
-    12 |  
-    19 | gist.h
-    12 |  
-    19 | gist.h.c
-    12 |  
-    19 | gist.c
-    12 | . 
-     1 | readline
-    12 |  
-    20 | 4.2
-    12 |  
-    20 | 4.2
-    12 | . 
-    20 | 4.2
-    12 | , 
-     1 | readline
-    20 | -4.2
-    12 |  
-     1 | readline
-    20 | -4.2
-    12 | . 
-    22 | 234
-    12 |                                     +
-       | 
-    12 | <
-     1 | i
-    12 |  
-    13 | <b>
-    12 |  
-     1 | wow
-    12 |   
-    12 | < 
-     1 | jqw
-    12 |  
-    12 | <> 
-     1 | qwerty
-(133 rows)
-
-SELECT to_tsvector('english', '345 qwe@efd.r '' http://www.com/ http://aew.werc.ewr/?ad=qwe&dw 1aew.werc.ewr/?ad=qwe&dw 2aew.werc.ewr http://3aew.werc.ewr/?ad=qwe&dw http://4aew.werc.ewr http://5aew.werc.ewr:8100/?  ad=qwe&dw 6aew.werc.ewr:8100/?ad=qwe&dw 7aew.werc.ewr:8100/?ad=qwe&dw=%20%32 +4.0e-10 qwe qwe qwqwe 234.435 455 5.005 teodor@stack.net qwe-wer asdf <fr>qwer jf sdjk<we hjwer <werrwe> ewr1> ewri2 <a href="qwe<qwe>">
-/usr/local/fff /awdf/dwqe/4325 rewt/ewr wefjn /wqe-324/ewr gist.h gist.h.c gist.c. readline 4.2 4.2. 4.2, readline-4.2 readline-4.2. 234 
-<i <b> wow  < jqw <> qwerty');
-                                                                                                                                                                                                                                                                                                                                                                                                                                       to_tsvector                                                                                                                                                                                                                                                                                                                                                                                                                                        
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- '+4.0e-10':28 '-4.2':60,62 '/?':18 '/?ad=qwe&dw':7,10,14,24 '/?ad=qwe&dw=%20%32':27 '/awdf/dwqe/4325':48 '/usr/local/fff':47 '/wqe-324/ewr':51 '1aew.werc.ewr':9 '1aew.werc.ewr/?ad=qwe&dw':8 '234':63 '234.435':32 '2aew.werc.ewr':11 '345':1 '3aew.werc.ewr':13 '3aew.werc.ewr/?ad=qwe&dw':12 '4.2':56,57,58 '455':33 '4aew.werc.ewr':15 '5.005':34 '5aew.werc.ewr:8100':17 '5aew.werc.ewr:8100/?':16 '6aew.werc.ewr:8100':23 '6aew.werc.ewr:8100/?ad=qwe&dw':22 '7aew.werc.ewr:8100':26 '7aew.werc.ewr:8100/?ad=qwe&dw=%20%32':25 'ad':19 'aew.werc.ewr':6 'aew.werc.ewr/?ad=qwe&dw':5 'asdf':39 'dw':21 'efd.r':3 'ewr1':45 'ewri2':46 'gist.c':54 'gist.h':52 'gist.h.c':53 'hjwer':44 'jf':41 'jqw':66 'qwe':2,20,29,30,37 'qwe-wer':36 'qwer':40 'qwerti':67 'qwqwe':31 'readlin':55,59,61 'rewt/ewr':49 'sdjk':42 'teodor@stack.net':35 'wefjn':50 'wer':38 'wow':65 'www.com':4
-(1 row)
-
-SELECT length(to_tsvector('english', '345 qw'));
- length 
---------
-      2
-(1 row)
-
-SELECT length(to_tsvector('english', '345 qwe@efd.r '' http://www.com/ http://aew.werc.ewr/?ad=qwe&dw 1aew.werc.ewr/?ad=qwe&dw 2aew.werc.ewr http://3aew.werc.ewr/?ad=qwe&dw http://4aew.werc.ewr http://5aew.werc.ewr:8100/?  ad=qwe&dw 6aew.werc.ewr:8100/?ad=qwe&dw 7aew.werc.ewr:8100/?ad=qwe&dw=%20%32 +4.0e-10 qwe qwe qwqwe 234.435 455 5.005 teodor@stack.net qwe-wer asdf <fr>qwer jf sdjk<we hjwer <werrwe> ewr1> ewri2 <a href="qwe<qwe>">
-/usr/local/fff /awdf/dwqe/4325 rewt/ewr wefjn /wqe-324/ewr gist.h gist.h.c gist.c. readline 4.2 4.2. 4.2, readline-4.2 readline-4.2. 234 
-<i <b> wow  < jqw <> qwerty'));
- length 
---------
-     53
-(1 row)
-
-select to_tsquery('english', 'qwe & sKies ');
-  to_tsquery   
----------------
- 'qwe' & 'sky'
-(1 row)
-
-select to_tsquery('simple', 'qwe & sKies ');
-   to_tsquery    
------------------
- 'qwe' & 'skies'
-(1 row)
-
-select to_tsquery('english', '''the wether'':dc & ''           sKies '':BC ');
-       to_tsquery       
-------------------------
- 'wether':CD & 'sky':BC
-(1 row)
-
-select to_tsquery('english', 'asd&(and|fghj)');
-   to_tsquery   
-----------------
- 'asd' & 'fghj'
-(1 row)
-
-select to_tsquery('english', '(asd&and)|fghj');
-   to_tsquery   
-----------------
- 'asd' | 'fghj'
-(1 row)
-
-select to_tsquery('english', '(asd&!and)|fghj');
-   to_tsquery   
-----------------
- 'asd' | 'fghj'
-(1 row)
-
-select to_tsquery('english', '(the|and&(i&1))&fghj');
-  to_tsquery  
---------------
- '1' & 'fghj'
-(1 row)
-
-select plainto_tsquery('english', 'the and z 1))& fghj');
-  plainto_tsquery   
---------------------
- 'z' & '1' & 'fghj'
-(1 row)
-
-select plainto_tsquery('english', 'foo bar') && plainto_tsquery('english', 'asd');
-       ?column?        
------------------------
- 'foo' & 'bar' & 'asd'
-(1 row)
-
-select plainto_tsquery('english', 'foo bar') || plainto_tsquery('english', 'asd fg');
-           ?column?           
-------------------------------
- 'foo' & 'bar' | 'asd' & 'fg'
-(1 row)
-
-select plainto_tsquery('english', 'foo bar') || !!plainto_tsquery('english', 'asd fg');
-             ?column?              
------------------------------------
- 'foo' & 'bar' | !( 'asd' & 'fg' )
-(1 row)
-
-select plainto_tsquery('english', 'foo bar') && 'asd | fg';
-             ?column?             
-----------------------------------
- 'foo' & 'bar' & ( 'asd' | 'fg' )
-(1 row)
-
-select 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca';
- ?column? 
-----------
- t
-(1 row)
-
-select 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:B';
- ?column? 
-----------
- t
-(1 row)
-
-select 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:A';
- ?column? 
-----------
- t
-(1 row)
-
-select 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:C';
- ?column? 
-----------
- f
-(1 row)
-
-select 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:CB';
- ?column? 
-----------
- t
-(1 row)
-
-CREATE TABLE test_tsvector( t text, a tsvector );
-\copy test_tsvector from 'data/test_tsearch.data'
-SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
- count 
--------
-   158
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
- count 
--------
-    17
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
- count 
--------
-     6
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
- count 
--------
-    98
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
- count 
--------
-    23
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
- count 
--------
-    39
-(1 row)
-
-create index wowidx on test_tsvector using gist (a);
-set enable_seqscan=off;
-SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
- count 
--------
-   158
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
- count 
--------
-    17
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
- count 
--------
-     6
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
- count 
--------
-    98
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
- count 
--------
-    23
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
- count 
--------
-    39
-(1 row)
-
-select set_curcfg('english');
- set_curcfg 
-------------
- 
-(1 row)
-
-CREATE TRIGGER tsvectorupdate
-BEFORE UPDATE OR INSERT ON test_tsvector
-FOR EACH ROW EXECUTE PROCEDURE tsearch2(a, t);
-SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
- count 
--------
-     0
-(1 row)
-
-INSERT INTO test_tsvector (t) VALUES ('345 qwerty');
-SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
- count 
--------
-     1
-(1 row)
-
-UPDATE test_tsvector SET t = null WHERE t = '345 qwerty';
-SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
- count 
--------
-     0
-(1 row)
-
-insert into test_tsvector (t) values ('345 qwerty copyright');
-select count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
- count 
--------
-     1
-(1 row)
-
-select count(*) FROM test_tsvector WHERE a @@ to_tsquery('copyright');
- count 
--------
-     1
-(1 row)
-
-select rank(' a:1 s:2C d g'::tsvector, 'a | s');
-   rank    
------------
- 0.0911891
-(1 row)
-
-select rank(' a:1 s:2B d g'::tsvector, 'a | s');
-   rank   
-----------
- 0.151982
-(1 row)
-
-select rank(' a:1 s:2 d g'::tsvector, 'a | s');
-   rank    
------------
- 0.0607927
-(1 row)
-
-select rank(' a:1 s:2C d g'::tsvector, 'a & s');
-   rank   
-----------
- 0.140153
-(1 row)
-
-select rank(' a:1 s:2B d g'::tsvector, 'a & s');
-   rank   
-----------
- 0.198206
-(1 row)
-
-select rank(' a:1 s:2 d g'::tsvector, 'a & s');
-   rank    
------------
- 0.0991032
-(1 row)
-
-insert into test_tsvector (t) values ('foo bar foo the over foo qq bar');
-drop trigger tsvectorupdate on test_tsvector;
-select * from stat('select a from test_tsvector') order by ndoc desc, nentry desc, word;
-   word    | ndoc | nentry 
------------+------+--------
- qq        |  109 |    109
- qt        |  102 |    102
- qe        |  100 |    100
- qh        |   98 |     98
- qw        |   98 |     98
- qa        |   97 |     97
- ql        |   94 |     94
- qs        |   94 |     94
- qi        |   92 |     92
- qr        |   92 |     92
- qj        |   91 |     91
- qd        |   87 |     87
- qz        |   87 |     87
- qc        |   86 |     86
- qn        |   86 |     86
- qv        |   85 |     85
- qo        |   84 |     84
- qy        |   84 |     84
- wp        |   84 |     84
- qf        |   81 |     81
- qk        |   80 |     80
- wt        |   80 |     80
- qu        |   79 |     79
- qg        |   78 |     78
- wb        |   78 |     78
- qx        |   77 |     77
- wr        |   77 |     77
- ws        |   73 |     73
- wy        |   73 |     73
- wa        |   72 |     72
- wf        |   70 |     70
- wg        |   70 |     70
- wi        |   70 |     70
- wu        |   70 |     70
- wc        |   69 |     69
- wj        |   69 |     69
- qp        |   68 |     68
- wh        |   68 |     68
- wv        |   68 |     68
- qb        |   66 |     66
- eu        |   65 |     65
- we        |   65 |     65
- wl        |   65 |     65
- wq        |   65 |     65
- wk        |   64 |     64
- ee        |   63 |     63
- eo        |   63 |     63
- qm        |   63 |     63
- wn        |   63 |     63
- ef        |   62 |     62
- eh        |   62 |     62
- ex        |   62 |     62
- re        |   62 |     62
- rl        |   62 |     62
- rr        |   62 |     62
- eb        |   61 |     61
- ek        |   61 |     61
- ww        |   61 |     61
- ea        |   60 |     60
- ei        |   60 |     60
- em        |   60 |     60
- eq        |   60 |     60
- ew        |   60 |     60
- ro        |   60 |     60
- rw        |   60 |     60
- tl        |   60 |     60
- eg        |   59 |     59
- en        |   59 |     59
- ez        |   59 |     59
- rj        |   59 |     59
- ry        |   59 |     59
- tw        |   59 |     59
- tx        |   59 |     59
- ej        |   58 |     58
- es        |   58 |     58
- ra        |   58 |     58
- rd        |   58 |     58
- rg        |   58 |     58
- rx        |   58 |     58
- tb        |   58 |     58
- wd        |   58 |     58
- ed        |   57 |     57
- tc        |   57 |     57
- wx        |   57 |     57
- er        |   56 |     56
- wm        |   56 |     56
- wo        |   56 |     56
- yw        |   56 |     56
- ep        |   55 |     55
- rk        |   55 |     55
- rp        |   55 |     55
- rz        |   55 |     55
- ta        |   55 |     55
- rq        |   54 |     54
- yn        |   54 |     54
- ec        |   53 |     53
- el        |   53 |     53
- ru        |   53 |     53
- rv        |   53 |     53
- tz        |   53 |     53
- un        |   53 |     53
- wz        |   53 |     53
- ys        |   53 |     53
- oe        |   52 |     52
- tn        |   52 |     52
- tq        |   52 |     52
- ty        |   52 |     52
- uq        |   52 |     52
- yg        |   52 |     52
- ym        |   52 |     52
- oi        |   51 |     51
- to        |   51 |     51
- yi        |   51 |     51
- pn        |   50 |     50
- rb        |   50 |     50
- ri        |   50 |     50
- rn        |   50 |     50
- ti        |   50 |     50
- tv        |   50 |     50
- um        |   50 |     50
- ut        |   50 |     50
- ya        |   50 |     50
- et        |   49 |     49
- ix        |   49 |     49
- ox        |   49 |     49
- q3        |   49 |     49
- yf        |   49 |     49
- yl        |   49 |     49
- yo        |   49 |     49
- yr        |   49 |     49
- ev        |   48 |     48
- ey        |   48 |     48
- ot        |   48 |     48
- rc        |   48 |     48
- rm        |   48 |     48
- th        |   48 |     48
- uo        |   48 |     48
- ia        |   47 |     47
- q1        |   47 |     47
- rh        |   47 |     47
- yq        |   47 |     47
- yz        |   47 |     47
- av        |   46 |     46
- im        |   46 |     46
- os        |   46 |     46
- tk        |   46 |     46
- yy        |   46 |     46
- ir        |   45 |     45
- iv        |   45 |     45
- iw        |   45 |     45
- oj        |   45 |     45
- pl        |   45 |     45
- pv        |   45 |     45
- te        |   45 |     45
- tu        |   45 |     45
- uv        |   45 |     45
- ux        |   45 |     45
- yd        |   45 |     45
- yx        |   45 |     45
- ij        |   44 |     44
- pa        |   44 |     44
- se        |   44 |     44
- tg        |   44 |     44
- ue        |   44 |     44
- yb        |   44 |     44
- yt        |   44 |     44
- if        |   43 |     43
- ik        |   43 |     43
- in        |   43 |     43
- ph        |   43 |     43
- pj        |   43 |     43
- q5        |   43 |     43
- rt        |   43 |     43
- ub        |   43 |     43
- ud        |   43 |     43
- uh        |   43 |     43
- uj        |   43 |     43
- w7        |   43 |     43
- ye        |   43 |     43
- yv        |   43 |     43
- db        |   42 |     42
- do        |   42 |     42
- id        |   42 |     42
- ie        |   42 |     42
- ii        |   42 |     42
- of        |   42 |     42
- pr        |   42 |     42
- q4        |   42 |     42
- rf        |   42 |     42
- td        |   42 |     42
- uk        |   42 |     42
- up        |   42 |     42
- yh        |   42 |     42
- yk        |   42 |     42
- io        |   41 |     41
- it        |   41 |     41
- pb        |   41 |     41
- q0        |   41 |     41
- q7        |   41 |     41
- rs        |   41 |     41
- tj        |   41 |     41
- ur        |   41 |     41
- ig        |   40 |     40
- iu        |   40 |     40
- iy        |   40 |     40
- od        |   40 |     40
- q6        |   40 |     40
- tt        |   40 |     40
- ug        |   40 |     40
- ul        |   40 |     40
- us        |   40 |     40
- uu        |   40 |     40
- uz        |   40 |     40
- ah        |   39 |     39
- ar        |   39 |     39
- as        |   39 |     39
- dl        |   39 |     39
- dt        |   39 |     39
- hk        |   39 |     39
- iq        |   39 |     39
- is        |   39 |     39
- oc        |   39 |     39
- ov        |   39 |     39
- oy        |   39 |     39
- uf        |   39 |     39
- ui        |   39 |     39
- aa        |   38 |     38
- ad        |   38 |     38
- fh        |   38 |     38
- gm        |   38 |     38
- ic        |   38 |     38
- jd        |   38 |     38
- om        |   38 |     38
- or        |   38 |     38
- oz        |   38 |     38
- pm        |   38 |     38
- q8        |   38 |     38
- sf        |   38 |     38
- sm        |   38 |     38
- sv        |   38 |     38
- uc        |   38 |     38
- ak        |   37 |     37
- aq        |   37 |     37
- di        |   37 |     37
- e4        |   37 |     37
- fi        |   37 |     37
- fx        |   37 |     37
- ha        |   37 |     37
- hp        |   37 |     37
- ih        |   37 |     37
- og        |   37 |     37
- po        |   37 |     37
- pw        |   37 |     37
- sn        |   37 |     37
- su        |   37 |     37
- sw        |   37 |     37
- w6        |   37 |     37
- yj        |   37 |     37
- yu        |   37 |     37
- ag        |   36 |     36
- am        |   36 |     36
- at        |   36 |     36
- e1        |   36 |     36
- ff        |   36 |     36
- gx        |   36 |     36
- he        |   36 |     36
- hj        |   36 |     36
- ib        |   36 |     36
- iz        |   36 |     36
- lm        |   36 |     36
- ok        |   36 |     36
- pk        |   36 |     36
- pp        |   36 |     36
- pu        |   36 |     36
- sp        |   36 |     36
- tf        |   36 |     36
- tm        |   36 |     36
- ay        |   35 |     35
- dy        |   35 |     35
- fu        |   35 |     35
- ku        |   35 |     35
- lh        |   35 |     35
- lq        |   35 |     35
- ob        |   35 |     35
- on        |   35 |     35
- op        |   35 |     35
- o6        |   35 |     35
- pd        |   35 |     35
- ps        |   35 |     35
- si        |   35 |     35
- sl        |   35 |     35
- sx        |   35 |     35
- tp        |   35 |     35
- tr        |   35 |     35
- w3        |   35 |     35
- y1        |   35 |     35
- al        |   34 |     34
- ap        |   34 |     34
- az        |   34 |     34
- dc        |   34 |     34
- dd        |   34 |     34
- dz        |   34 |     34
- e0        |   34 |     34
- fj        |   34 |     34
- fp        |   34 |     34
- gd        |   34 |     34
- gg        |   34 |     34
- gk        |   34 |     34
- go        |   34 |     34
- ho        |   34 |     34
- jc        |   34 |     34
- oa        |   34 |     34
- oh        |   34 |     34
- oo        |   34 |     34
- pe        |   34 |     34
- px        |   34 |     34
- sd        |   34 |     34
- sq        |   34 |     34
- sy        |   34 |     34
- ab        |   33 |     33
- ae        |   33 |     33
- af        |   33 |     33
- aw        |   33 |     33
- e5        |   33 |     33
- fk        |   33 |     33
- gu        |   33 |     33
- gy        |   33 |     33
- hb        |   33 |     33
- hm        |   33 |     33
- hy        |   33 |     33
- jl        |   33 |     33
- jr        |   33 |     33
- ls        |   33 |     33
- oq        |   33 |     33
- pt        |   33 |     33
- sa        |   33 |     33
- sh        |   33 |     33
- sj        |   33 |     33
- so        |   33 |     33
- sz        |   33 |     33
- t7        |   33 |     33
- uw        |   33 |     33
- w8        |   33 |     33
- yp        |   33 |     33
- y0        |   33 |     33
- dh        |   32 |     32
- dp        |   32 |     32
- dq        |   32 |     32
- e7        |   32 |     32
- fn        |   32 |     32
- fo        |   32 |     32
- fr        |   32 |     32
- ga        |   32 |     32
- gq        |   32 |     32
- hh        |   32 |     32
- il        |   32 |     32
- ip        |   32 |     32
- jv        |   32 |     32
- lc        |   32 |     32
- ol        |   32 |     32
- pc        |   32 |     32
- q9        |   32 |     32
- ds        |   31 |     31
- e9        |   31 |     31
- fd        |   31 |     31
- fe        |   31 |     31
- ft        |   31 |     31
- gs        |   31 |     31
- hl        |   31 |     31
- hs        |   31 |     31
- jb        |   31 |     31
- kc        |   31 |     31
- kw        |   31 |     31
- mj        |   31 |     31
- q2        |   31 |     31
- r3        |   31 |     31
- sb        |   31 |     31
- sk        |   31 |     31
- ts        |   31 |     31
- ua        |   31 |     31
- yc        |   31 |     31
- zw        |   31 |     31
- ao        |   30 |     30
- du        |   30 |     30
- fw        |   30 |     30
- gj        |   30 |     30
- hu        |   30 |     30
- kh        |   30 |     30
- kl        |   30 |     30
- kv        |   30 |     30
- ld        |   30 |     30
- lf        |   30 |     30
- pq        |   30 |     30
- py        |   30 |     30
- sc        |   30 |     30
- sr        |   30 |     30
- uy        |   30 |     30
- vg        |   30 |     30
- w2        |   30 |     30
- xg        |   30 |     30
- xo        |   30 |     30
- au        |   29 |     29
- cx        |   29 |     29
- fv        |   29 |     29
- gh        |   29 |     29
- gl        |   29 |     29
- gt        |   29 |     29
- hw        |   29 |     29
- ji        |   29 |     29
- km        |   29 |     29
- la        |   29 |     29
- ou        |   29 |     29
- r0        |   29 |     29
- w0        |   29 |     29
- y9        |   29 |     29
- zm        |   29 |     29
- zs        |   29 |     29
- zy        |   29 |     29
- ax        |   28 |     28
- cd        |   28 |     28
- dj        |   28 |     28
- dn        |   28 |     28
- dr        |   28 |     28
- ht        |   28 |     28
- jf        |   28 |     28
- lo        |   28 |     28
- lr        |   28 |     28
- na        |   28 |     28
- ng        |   28 |     28
- r8        |   28 |     28
- ss        |   28 |     28
- xt        |   28 |     28
- y6        |   28 |     28
- aj        |   27 |     27
- ca        |   27 |     27
- cg        |   27 |     27
- df        |   27 |     27
- dg        |   27 |     27
- dv        |   27 |     27
- gc        |   27 |     27
- gn        |   27 |     27
- gr        |   27 |     27
- hd        |   27 |     27
- i8        |   27 |     27
- jn        |   27 |     27
- jt        |   27 |     27
- lp        |   27 |     27
- ow        |   27 |     27
- o9        |   27 |     27
- r9        |   27 |     27
- t8        |   27 |     27
- u5        |   27 |     27
- w4        |   27 |     27
- xm        |   27 |     27
- zz        |   27 |     27
- ac        |   26 |     26
- ai        |   26 |     26
- a2        |   26 |     26
- cm        |   26 |     26
- cu        |   26 |     26
- cw        |   26 |     26
- dk        |   26 |     26
- e2        |   26 |     26
- fc        |   26 |     26
- fg        |   26 |     26
- fl        |   26 |     26
- fs        |   26 |     26
- ge        |   26 |     26
- gv        |   26 |     26
- hc        |   26 |     26
- hi        |   26 |     26
- hx        |   26 |     26
- jj        |   26 |     26
- jm        |   26 |     26
- kg        |   26 |     26
- kk        |   26 |     26
- kn        |   26 |     26
- ko        |   26 |     26
- kt        |   26 |     26
- ln        |   26 |     26
- mx        |   26 |     26
- pg        |   26 |     26
- r4        |   26 |     26
- t6        |   26 |     26
- u1        |   26 |     26
- u4        |   26 |     26
- vi        |   26 |     26
- vr        |   26 |     26
- w1        |   26 |     26
- w9        |   26 |     26
- xk        |   26 |     26
- xs        |   26 |     26
- zf        |   26 |     26
- bb        |   25 |     25
- dm        |   25 |     25
- dw        |   25 |     25
- e8        |   25 |     25
- fb        |   25 |     25
- gw        |   25 |     25
- hf        |   25 |     25
- hg        |   25 |     25
- hn        |   25 |     25
- hv        |   25 |     25
- h8        |   25 |     25
- i0        |   25 |     25
- i3        |   25 |     25
- jg        |   25 |     25
- jo        |   25 |     25
- jx        |   25 |     25
- kq        |   25 |     25
- lw        |   25 |     25
- lx        |   25 |     25
- o3        |   25 |     25
- pf        |   25 |     25
- pi        |   25 |     25
- pz        |   25 |     25
- p7        |   25 |     25
- r2        |   25 |     25
- r5        |   25 |     25
- t9        |   25 |     25
- u7        |   25 |     25
- ve        |   25 |     25
- vu        |   25 |     25
- y5        |   25 |     25
- y8        |   25 |     25
- zt        |   25 |     25
- an        |   24 |     24
- bj        |   24 |     24
- dx        |   24 |     24
- fm        |   24 |     24
- fz        |   24 |     24
- gb        |   24 |     24
- gi        |   24 |     24
- gp        |   24 |     24
- hr        |   24 |     24
- hz        |   24 |     24
- i5        |   24 |     24
- jq        |   24 |     24
- kb        |   24 |     24
- ke        |   24 |     24
- kf        |   24 |     24
- kp        |   24 |     24
- lv        |   24 |     24
- lz        |   24 |     24
- o8        |   24 |     24
- r1        |   24 |     24
- sg        |   24 |     24
- s7        |   24 |     24
- u3        |   24 |     24
- vj        |   24 |     24
- vt        |   24 |     24
- w5        |   24 |     24
- zj        |   24 |     24
- be        |   23 |     23
- bi        |   23 |     23
- bn        |   23 |     23
- cn        |   23 |     23
- cy        |   23 |     23
- da        |   23 |     23
- e6        |   23 |     23
- fa        |   23 |     23
- js        |   23 |     23
- ki        |   23 |     23
- kz        |   23 |     23
- li        |   23 |     23
- mt        |   23 |     23
- mz        |   23 |     23
- nu        |   23 |     23
- o2        |   23 |     23
- p5        |   23 |     23
- p8        |   23 |     23
- r7        |   23 |     23
- t0        |   23 |     23
- t1        |   23 |     23
- t3        |   23 |     23
- vm        |   23 |     23
- xh        |   23 |     23
- xx        |   23 |     23
- zp        |   23 |     23
- zr        |   23 |     23
- a3        |   22 |     22
- bg        |   22 |     22
- de        |   22 |     22
- e3        |   22 |     22
- fq        |   22 |     22
- i2        |   22 |     22
- i7        |   22 |     22
- ja        |   22 |     22
- jk        |   22 |     22
- jy        |   22 |     22
- kr        |   22 |     22
- kx        |   22 |     22
- ly        |   22 |     22
- nb        |   22 |     22
- nh        |   22 |     22
- ns        |   22 |     22
- s3        |   22 |     22
- u2        |   22 |     22
- vn        |   22 |     22
- xe        |   22 |     22
- y4        |   22 |     22
- zh        |   22 |     22
- zo        |   22 |     22
- zq        |   22 |     22
- a1        |   21 |     21
- bl        |   21 |     21
- bo        |   21 |     21
- cb        |   21 |     21
- co        |   21 |     21
- cq        |   21 |     21
- cv        |   21 |     21
- d7        |   21 |     21
- g8        |   21 |     21
- ch        |   21 |     21
- je        |   21 |     21
- jp        |   21 |     21
- jz        |   21 |     21
- lg        |   21 |     21
- me        |   21 |     21
- nc        |   21 |     21
- p4        |   21 |     21
- st        |   21 |     21
- vb        |   21 |     21
- vw        |   21 |     21
- vz        |   21 |     21
- xj        |   21 |     21
- xq        |   21 |     21
- xu        |   21 |     21
- xy        |   21 |     21
- zb        |   21 |     21
- bv        |   20 |     20
- bz        |   20 |     20
- cj        |   20 |     20
- cp        |   20 |     20
- cs        |   20 |     20
- d8        |   20 |     20
- ju        |   20 |     20
- ks        |   20 |     20
- ky        |   20 |     20
- k0        |   20 |     20
- lb        |   20 |     20
- lj        |   20 |     20
- lu        |   20 |     20
- l1        |   20 |     20
- nm        |   20 |     20
- nw        |   20 |     20
- nz        |   20 |     20
- o7        |   20 |     20
- p6        |   20 |     20
- vh        |   20 |     20
- vp        |   20 |     20
- vs        |   20 |     20
- xb        |   20 |     20
- xr        |   20 |     20
- zv        |   20 |     20
- z3        |   20 |     20
- bq        |   19 |     19
- br        |   19 |     19
- by        |   19 |     19
- cl        |   19 |     19
- d2        |   19 |     19
- f1        |   19 |     19
- f4        |   19 |     19
- gf        |   19 |     19
- hq        |   19 |     19
- ka        |   19 |     19
- kd        |   19 |     19
- kj        |   19 |     19
- k9        |   19 |     19
- md        |   19 |     19
- mi        |   19 |     19
- ml        |   19 |     19
- my        |   19 |     19
- nj        |   19 |     19
- ny        |   19 |     19
- o1        |   19 |     19
- s4        |   19 |     19
- s8        |   19 |     19
- t5        |   19 |     19
- u0        |   19 |     19
- xl        |   19 |     19
- zg        |   19 |     19
- zi        |   19 |     19
- a5        |   18 |     18
- bh        |   18 |     18
- bx        |   18 |     18
- b9        |   18 |     18
- d3        |   18 |     18
- fy        |   18 |     18
- g2        |   18 |     18
- i4        |   18 |     18
- i6        |   18 |     18
- i9        |   18 |     18
- jw        |   18 |     18
- lk        |   18 |     18
- mb        |   18 |     18
- mv        |   18 |     18
- nd        |   18 |     18
- nr        |   18 |     18
- nt        |   18 |     18
- t2        |   18 |     18
- xf        |   18 |     18
- xv        |   18 |     18
- zc        |   18 |     18
- zd        |   18 |     18
- a7        |   17 |     17
- bc        |   17 |     17
- bd        |   17 |     17
- ce        |   17 |     17
- cf        |   17 |     17
- cr        |   17 |     17
- g9        |   17 |     17
- j0        |   17 |     17
- j5        |   17 |     17
- mp        |   17 |     17
- mr        |   17 |     17
- mw        |   17 |     17
- nk        |   17 |     17
- no        |   17 |     17
- o0        |   17 |     17
- o4        |   17 |     17
- s0        |   17 |     17
- s1        |   17 |     17
- t4        |   17 |     17
- u9        |   17 |     17
- vf        |   17 |     17
- vx        |   17 |     17
- xi        |   17 |     17
- xn        |   17 |     17
- xz        |   17 |     17
- x3        |   17 |     17
- zl        |   17 |     17
- zn        |   17 |     17
- a0        |   16 |     16
- bu        |   16 |     16
- bw        |   16 |     16
- ci        |   16 |     16
- ck        |   16 |     16
- d0        |   16 |     16
- d4        |   16 |     16
- d6        |   16 |     16
- f5        |   16 |     16
- gz        |   16 |     16
- g1        |   16 |     16
- h4        |   16 |     16
- jh        |   16 |     16
- lt        |   16 |     16
- l4        |   16 |     16
- mg        |   16 |     16
- mh        |   16 |     16
- mo        |   16 |     16
- ni        |   16 |     16
- nl        |   16 |     16
- nq        |   16 |     16
- p2        |   16 |     16
- u8        |   16 |     16
- vl        |   16 |     16
- vo        |   16 |     16
- v9        |   16 |     16
- xp        |   16 |     16
- y3        |   16 |     16
- y7        |   16 |     16
- za        |   16 |     16
- zx        |   16 |     16
- z7        |   16 |     16
- bf        |   15 |     15
- bp        |   15 |     15
- cc        |   15 |     15
- g0        |   15 |     15
- j2        |   15 |     15
- j9        |   15 |     15
- le        |   15 |     15
- ll        |   15 |     15
- l6        |   15 |     15
- ma        |   15 |     15
- mu        |   15 |     15
- m8        |   15 |     15
- nf        |   15 |     15
- r6        |   15 |     15
- s5        |   15 |     15
- vd        |   15 |     15
- vk        |   15 |     15
- xa        |   15 |     15
- xw        |   15 |     15
- y2        |   15 |     15
- ze        |   15 |     15
- zu        |   15 |     15
- z8        |   15 |     15
- a6        |   14 |     14
- bk        |   14 |     14
- bt        |   14 |     14
- c0        |   14 |     14
- f8        |   14 |     14
- g3        |   14 |     14
- g4        |   14 |     14
- g7        |   14 |     14
- h6        |   14 |     14
- h7        |   14 |     14
- h9        |   14 |     14
- i1        |   14 |     14
- k1        |   14 |     14
- k2        |   14 |     14
- k6        |   14 |     14
- k7        |   14 |     14
- mc        |   14 |     14
- nn        |   14 |     14
- p9        |   14 |     14
- u6        |   14 |     14
- xd        |   14 |     14
- zk        |   14 |     14
- z6        |   14 |     14
- a4        |   13 |     13
- a9        |   13 |     13
- bm        |   13 |     13
- cz        |   13 |     13
- f2        |   13 |     13
- f3        |   13 |     13
- f6        |   13 |     13
- g6        |   13 |     13
- h2        |   13 |     13
- j1        |   13 |     13
- k5        |   13 |     13
- mf        |   13 |     13
- mq        |   13 |     13
- m1        |   13 |     13
- np        |   13 |     13
- nx        |   13 |     13
- o5        |   13 |     13
- p0        |   13 |     13
- p1        |   13 |     13
- s6        |   13 |     13
- s9        |   13 |     13
- va        |   13 |     13
- vc        |   13 |     13
- v6        |   13 |     13
- xc        |   13 |     13
- z0        |   13 |     13
- c9        |   12 |     12
- d1        |   12 |     12
- h0        |   12 |     12
- h1        |   12 |     12
- j8        |   12 |     12
- k4        |   12 |     12
- l5        |   12 |     12
- l9        |   12 |     12
- m2        |   12 |     12
- m6        |   12 |     12
- m9        |   12 |     12
- nv        |   12 |     12
- n7        |   12 |     12
- p3        |   12 |     12
- vq        |   12 |     12
- vy        |   12 |     12
- x1        |   12 |     12
- x2        |   12 |     12
- z5        |   12 |     12
- ct        |   11 |     11
- c1        |   11 |     11
- c3        |   11 |     11
- f9        |   11 |     11
- g5        |   11 |     11
- j6        |   11 |     11
- l8        |   11 |     11
- n1        |   11 |     11
- vv        |   11 |     11
- v7        |   11 |     11
- x5        |   11 |     11
- x8        |   11 |     11
- z2        |   11 |     11
- b0        |   10 |     10
- b2        |   10 |     10
- b8        |   10 |     10
- c6        |   10 |     10
- f0        |   10 |     10
- f7        |   10 |     10
- h5        |   10 |     10
- j3        |   10 |     10
- j4        |   10 |     10
- j7        |   10 |     10
- l7        |   10 |     10
- mm        |   10 |     10
- mn        |   10 |     10
- m0        |   10 |     10
- m7        |   10 |     10
- n8        |   10 |     10
- v1        |   10 |     10
- x0        |   10 |     10
- x6        |   10 |     10
- x7        |   10 |     10
- x9        |   10 |     10
- a8        |    9 |      9
- ba        |    9 |      9
- bs        |    9 |      9
- b1        |    9 |      9
- b4        |    9 |      9
- b5        |    9 |      9
- b6        |    9 |      9
- c5        |    9 |      9
- d5        |    9 |      9
- k8        |    9 |      9
- l0        |    9 |      9
- mk        |    9 |      9
- ms        |    9 |      9
- m5        |    9 |      9
- ne        |    9 |      9
- n3        |    9 |      9
- n4        |    9 |      9
- n6        |    9 |      9
- v0        |    9 |      9
- v3        |    9 |      9
- v5        |    9 |      9
- v8        |    9 |      9
- b3        |    8 |      8
- b7        |    8 |      8
- c2        |    8 |      8
- c7        |    8 |      8
- c8        |    8 |      8
- d9        |    8 |      8
- k3        |    8 |      8
- l3        |    8 |      8
- m3        |    8 |      8
- m4        |    8 |      8
- n0        |    8 |      8
- n5        |    8 |      8
- v4        |    8 |      8
- x4        |    8 |      8
- z1        |    8 |      8
- z9        |    8 |      8
- l2        |    7 |      7
- s2        |    7 |      7
- z4        |    7 |      7
- c4        |    6 |      6
- h3        |    6 |      6
- n2        |    6 |      6
- n9        |    6 |      6
- v2        |    6 |      6
- 1l        |    6 |      6
- 1o        |    6 |      6
- 1t        |    6 |      6
- 2e        |    6 |      6
- 2o        |    6 |      6
- 2l        |    5 |      5
- 2u        |    5 |      5
- 3k        |    5 |      5
- 4p        |    5 |      5
- 1a        |    4 |      4
- 1i        |    4 |      4
- 18        |    4 |      4
- 2s        |    4 |      4
- 3q        |    4 |      4
- 3y        |    4 |      4
- 5y        |    4 |      4
- 1f        |    3 |      3
- 1h        |    3 |      3
- 1m        |    3 |      3
- 1p        |    3 |      3
- 1s        |    3 |      3
- 1v        |    3 |      3
- 1x        |    3 |      3
- 2a        |    3 |      3
- 2b        |    3 |      3
- 2h        |    3 |      3
- 2n        |    3 |      3
- 2p        |    3 |      3
- 2v        |    3 |      3
- 2y        |    3 |      3
- 27        |    3 |      3
- 3d        |    3 |      3
- 3w        |    3 |      3
- 3z        |    3 |      3
- 4a        |    3 |      3
- 4d        |    3 |      3
- 4v        |    3 |      3
- 4z        |    3 |      3
- 5e        |    3 |      3
- 5i        |    3 |      3
- 5k        |    3 |      3
- 5o        |    3 |      3
- 5t        |    3 |      3
- 6b        |    3 |      3
- 6d        |    3 |      3
- 6o        |    3 |      3
- 6w        |    3 |      3
- 7a        |    3 |      3
- 7h        |    3 |      3
- 7r        |    3 |      3
- 93        |    3 |      3
- 1b        |    2 |      2
- 1d        |    2 |      2
- 1g        |    2 |      2
- 1j        |    2 |      2
- 1n        |    2 |      2
- 1r        |    2 |      2
- 1u        |    2 |      2
- 1w        |    2 |      2
- 1y        |    2 |      2
- 10        |    2 |      2
- 12        |    2 |      2
- 15        |    2 |      2
- 16        |    2 |      2
- 19        |    2 |      2
- 2d        |    2 |      2
- 2i        |    2 |      2
- 2j        |    2 |      2
- 2k        |    2 |      2
- 2q        |    2 |      2
- 2r        |    2 |      2
- 2t        |    2 |      2
- 2w        |    2 |      2
- 2z        |    2 |      2
- 20        |    2 |      2
- 25        |    2 |      2
- 3b        |    2 |      2
- 3f        |    2 |      2
- 3h        |    2 |      2
- 3o        |    2 |      2
- 3p        |    2 |      2
- 3r        |    2 |      2
- 3s        |    2 |      2
- 3v        |    2 |      2
- 4f        |    2 |      2
- 4g        |    2 |      2
- 4h        |    2 |      2
- 4j        |    2 |      2
- 4m        |    2 |      2
- 4r        |    2 |      2
- 4s        |    2 |      2
- 4t        |    2 |      2
- 4u        |    2 |      2
- 42        |    2 |      2
- 43        |    2 |      2
- 5c        |    2 |      2
- 5f        |    2 |      2
- 5h        |    2 |      2
- 5p        |    2 |      2
- 5q        |    2 |      2
- 5z        |    2 |      2
- 6a        |    2 |      2
- 6h        |    2 |      2
- 6q        |    2 |      2
- 6r        |    2 |      2
- 6t        |    2 |      2
- 6y        |    2 |      2
- 7c        |    2 |      2
- 7g        |    2 |      2
- 7k        |    2 |      2
- 7o        |    2 |      2
- 7u        |    2 |      2
- 70        |    2 |      2
- 8j        |    2 |      2
- 8w        |    2 |      2
- 9f        |    2 |      2
- 9y        |    2 |      2
- foo       |    1 |      3
- bar       |    1 |      2
- copyright |    1 |      1
- qwerti    |    1 |      1
- 0e        |    1 |      1
- 0h        |    1 |      1
- 0p        |    1 |      1
- 0w        |    1 |      1
- 0z        |    1 |      1
- 1k        |    1 |      1
- 1q        |    1 |      1
- 1z        |    1 |      1
- 11        |    1 |      1
- 13        |    1 |      1
- 14        |    1 |      1
- 17        |    1 |      1
- 2f        |    1 |      1
- 24        |    1 |      1
- 26        |    1 |      1
- 28        |    1 |      1
- 3a        |    1 |      1
- 3e        |    1 |      1
- 3g        |    1 |      1
- 3i        |    1 |      1
- 3m        |    1 |      1
- 3t        |    1 |      1
- 3u        |    1 |      1
- 30        |    1 |      1
- 345       |    1 |      1
- 37        |    1 |      1
- 39        |    1 |      1
- 4b        |    1 |      1
- 4c        |    1 |      1
- 4i        |    1 |      1
- 4k        |    1 |      1
- 4n        |    1 |      1
- 4o        |    1 |      1
- 4q        |    1 |      1
- 4w        |    1 |      1
- 4y        |    1 |      1
- 40        |    1 |      1
- 41        |    1 |      1
- 44        |    1 |      1
- 45        |    1 |      1
- 48        |    1 |      1
- 5a        |    1 |      1
- 5d        |    1 |      1
- 5g        |    1 |      1
- 5j        |    1 |      1
- 5l        |    1 |      1
- 5s        |    1 |      1
- 5u        |    1 |      1
- 5x        |    1 |      1
- 51        |    1 |      1
- 55        |    1 |      1
- 56        |    1 |      1
- 6c        |    1 |      1
- 6f        |    1 |      1
- 6g        |    1 |      1
- 6i        |    1 |      1
- 6k        |    1 |      1
- 6n        |    1 |      1
- 6p        |    1 |      1
- 6s        |    1 |      1
- 6u        |    1 |      1
- 6x        |    1 |      1
- 64        |    1 |      1
- 68        |    1 |      1
- 7f        |    1 |      1
- 7j        |    1 |      1
- 7n        |    1 |      1
- 7p        |    1 |      1
- 7w        |    1 |      1
- 7y        |    1 |      1
- 7z        |    1 |      1
- 72        |    1 |      1
- 8d        |    1 |      1
- 8i        |    1 |      1
- 8l        |    1 |      1
- 8n        |    1 |      1
- 8p        |    1 |      1
- 8t        |    1 |      1
- 8x        |    1 |      1
- 80        |    1 |      1
- 82        |    1 |      1
- 85        |    1 |      1
- 9a        |    1 |      1
- 9e        |    1 |      1
- 9h        |    1 |      1
- 9r        |    1 |      1
- 9w        |    1 |      1
- 95        |    1 |      1
- 97        |    1 |      1
-(1146 rows)
-
-insert into test_tsvector values ('1', 'a:1a,2,3b b:5a,6a,7c,8');
-insert into test_tsvector values ('1', 'a:1a,2,3c b:5a,6b,7c,8b');
-select * from stat('select a from test_tsvector','a') order by ndoc desc, nentry desc, word;
- word | ndoc | nentry 
-------+------+--------
- b    |    2 |      3
- a    |    2 |      2
-(2 rows)
-
-select * from stat('select a from test_tsvector','b') order by ndoc desc, nentry desc, word;
- word | ndoc | nentry 
-------+------+--------
- b    |    1 |      2
- a    |    1 |      1
-(2 rows)
-
-select * from stat('select a from test_tsvector','c') order by ndoc desc, nentry desc, word;
- word | ndoc | nentry 
-------+------+--------
- b    |    2 |      2
- a    |    1 |      1
-(2 rows)
-
-select * from stat('select a from test_tsvector','d') order by ndoc desc, nentry desc, word;
-   word    | ndoc | nentry 
------------+------+--------
- a         |    2 |      2
- foo       |    1 |      3
- bar       |    1 |      2
- b         |    1 |      1
- copyright |    1 |      1
- qq        |    1 |      1
- qwerti    |    1 |      1
- 345       |    1 |      1
-(8 rows)
-
-select * from stat('select a from test_tsvector','ad') order by ndoc desc, nentry desc, word;
-   word    | ndoc | nentry 
------------+------+--------
- a         |    2 |      4
- b         |    2 |      4
- foo       |    1 |      3
- bar       |    1 |      2
- copyright |    1 |      1
- qq        |    1 |      1
- qwerti    |    1 |      1
- 345       |    1 |      1
-(8 rows)
-
-select to_tsquery('english', 'skies & books');
-   to_tsquery   
-----------------
- 'sky' & 'book'
-(1 row)
-
-select rank_cd(to_tsvector('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-'), to_tsquery('sea&thousand&years'));
-  rank_cd  
------------
- 0.0555556
-(1 row)
-
-select rank_cd(to_tsvector('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-'), to_tsquery('granite&sea'));
-  rank_cd  
------------
- 0.0238095
-(1 row)
-
-select rank_cd(to_tsvector('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-'), to_tsquery('sea'));
- rank_cd 
----------
-     0.2
-(1 row)
-
-select headline('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-', to_tsquery('sea&thousand&years'));
-                  headline                  
---------------------------------------------
- <b>sea</b> a <b>thousand</b> <b>years</b>,+
- A <b>thousand</b> <b>years</b> to trace   +
- The granite features of this cliff
-(1 row)
-
-select headline('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-', to_tsquery('granite&sea'));
-                 headline                  
--------------------------------------------
- <b>sea</b> a thousand years,             +
- A thousand years to trace                +
- The <b>granite</b> features of this cliff
-(1 row)
-
-select headline('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-', to_tsquery('sea'));
-              headline              
-------------------------------------
- <b>sea</b> a thousand years,      +
- A thousand years to trace         +
- The granite features of this cliff
-(1 row)
-
-select headline('
-<html>
-<!-- some comment -->
-<body>
-Sea view wow <u>foo bar</u> <i>qq</i>
-<a href="http://www.google.com/foo.bar.html" target="_blank">YES &nbsp;</a>
-ff-bg
-<script>
-       document.write(15);
-</script>
-</body>
-</html>',
-to_tsquery('sea&foo'), 'HighlightAll=true');
-                                  headline                                   
------------------------------------------------------------------------------
-                                                                            +
- <html>                                                                     +
- <!-- some comment -->                                                      +
- <body>                                                                     +
- <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i>                        +
- <a href="http://www.google.com/foo.bar.html" target="_blank">YES &nbsp;</a>+
- ff-bg                                                                      +
- <script>                                                                   +
-        document.write(15);                                                 +
- </script>                                                                  +
- </body>                                                                    +
- </html>
-(1 row)
-
---check debug
-select * from public.ts_debug('Tsearch module for PostgreSQL 7.3.3');
- ts_name | tok_type  |   description   |   token    |   dict_name    |   tsvector   
----------+-----------+-----------------+------------+----------------+--------------
- english | asciiword | Word, all ASCII | Tsearch    | {english_stem} | 'tsearch'
- english | blank     | Space symbols   |            | {}             | 
- english | asciiword | Word, all ASCII | module     | {english_stem} | 'modul'
- english | blank     | Space symbols   |            | {}             | 
- english | asciiword | Word, all ASCII | for        | {english_stem} | 
- english | blank     | Space symbols   |            | {}             | 
- english | asciiword | Word, all ASCII | PostgreSQL | {english_stem} | 'postgresql'
- english | blank     | Space symbols   |            | {}             | 
- english | version   | Version number  | 7.3.3      | {simple}       | '7.3.3'
-(9 rows)
-
---check ordering
-insert into test_tsvector values (null, null);
-select a is null, a from test_tsvector order by a;
- ?column? |                                                                                                                                                                                                                                                                              a                                                                                                                                                                                                                                                                              
-----------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- f        | 
- f        | 
- f        | 
- f        | 
- f        | 
- f        | 
- f        | 
- f        | 
- f        | 
- f        | 'a':1A,2,3B 'b':5A,6A,7C,8
- f        | 'a':1A,2,3C 'b':5A,6B,7C,8B
- f        | 'bar':2,8 'foo':1,3,6 'qq':7
- f        | '345':1 'copyright':3 'qwerti':2
- f        | '7w' 'ch' 'd7' 'eo' 'gw' 'i4' 'lq' 'o6' 'qt' 'y0'
- f        | 'ar' 'ei' 'kq' 'ma' 'qa' 'qh' 'qq' 'qz' 'rx' 'st'
- f        | 'gs' 'i6' 'i9' 'j2' 'l0' 'oq' 'qx' 'sc' 'xe' 'yu'
- f        | 'ap' 'i2' 'k0' 'n4' 'ou' 'px' 'qe' 'qo' 'qr' 't1' 'yz'
- f        | 'cb' 'ib' 'ih' 'jx' 'oy' 'ph' 'tl' 'ty' 'vb' 'vu' 'wu'
- f        | 'cp' 'i0' 'ia' 'jh' 'kh' 'kl' 'ql' 'sb' 'u3' 'wy' 'ys'
- f        | 'cy' 'ey' 'gr' 'lq' 'n1' 'pp' 'pq' 'qb' 'qe' 'se' 'wb'
- f        | 'ja' 'k2' 'ko' 'o6' 'ob' 'ps' 't9' 'tz' 'uk' 'um' 'vv'
- f        | '5e' 'a2' 'ag' 'ay' 'dc' 'ef' 'jd' 'mn' 'pl' 'qp' 'wu' 'xd'
- f        | '7a' 'ap' 'bl' 'fl' 'g7' 'ko' 'ma' 'qi' 'ri' 'rp' 'y5' 'yo'
- f        | 'a4' 'an' 'go' 'ki' 'px' 'qq' 'td' 'tm' 'ur' 'wc' 'wp' 'yx'
- f        | 'aa' 'ah' 'bo' 'dz' 'pd' 'pm' 'qf' 'qw' 'rd' 'rn' 'tf' 'wu'
- f        | 'aj' 'ar' 'ay' 'eb' 'g5' 'ic' 'la' 'u2' 'up' 'wb' 'x8' 'yr'
- f        | 'aw' 'dz' 'el' 'hb' 'iu' 'lc' 'm9' 'r5' 'rt' 'uz' 'x2' 'zp'
- f        | 'dz' 'ea' 'h8' 'j9' 'mr' 'pc' 'qa' 'qt' 'rm' 'rv' 'ub' 'wg'
- f        | 'ew' 'fi' 'g2' 'ku' 'od' 'pk' 'tm' 'tq' 'tu' 'uf' 'wn' 'y1'
- f        | 'gi' 'n3' 'n7' 'om' 'qa' 'r7' 're' 'ug' 'w7' 'wi' 'x4' 'yn'
- f        | '3k' 'f5' 'if' 'kg' 'lj' 'ol' 'qr' 'so' 'ta' 'u1' 'vu' 'wr' 'y2'
- f        | '70' 'e0' 'ep' 'ex' 'hh' 'jn' 'kg' 'nq' 'rg' 'rj' 'uf' 'vs' 'ys'
- f        | 'ag' 'al' 'ay' 'fw' 'hi' 'ou' 'p6' 'qy' 'rg' 'rz' 'sx' 'uy' 'zb'
- f        | 'cm' 'dm' 'eh' 'em' 'ik' 'j0' 'kk' 'lp' 'ng' 'or' 'pu' 'qd' 'tw'
- f        | 'di' 'ec' 'i4' 'iq' 'iw' 'ko' 'l3' 'mw' 'py' 'qo' 'rx' 'wt' 'yl'
- f        | '5q' 'av' 'd2' 'd4' 'e5' 'jc' 'km' 'mm' 'pa' 'rs' 's4' 'si' 'tc' 'ut'
- f        | '6o' 'av' 'ed' 'ee' 'gf' 'ii' 'o8' 'og' 'om' 'qs' 'ta' 'th' 'tk' 'w0'
- f        | '7y' 'aq' 'cu' 'd3' 'h2' 'ih' 'oc' 'qh' 'rc' 'rs' 't3' 'ud' 'we' 'zt'
- f        | 'b7' 'eu' 'g4' 'hw' 'in' 'pi' 'qt' 'r0' 'rg' 'sn' 'sz' 'tc' 'wd' 'zs'
- f        | 'fb' 'in' 'iy' 'lu' 'p4' 'pd' 'qa' 'qq' 's6' 'ta' 'y1' 'yg' 'yy' 'zk'
- f        | 'at' 'ec' 'hs' 'ix' 'ks' 'lq' 'ls' 'pk' 'qs' 'qy' 'rc' 'ut' 'xv' 'yo' 'ys'
- f        | 'az' 'bl' 'dl' 'ec' 'gg' 'jq' 'o0' 'oj' 'q8' 'qq' 'ta' 'un' 'wb' 'wo' 'xu'
- f        | 'c0' 'd4' 'dw' 'ef' 'em' 'j2' 'kj' 'ql' 'rn' 'ta' 'uk' 'vv' 'wf' 'y9' 'zq'
- f        | 'gn' 'gx' 'hf' 'ji' 'kx' 'nh' 'o6' 'pe' 'q1' 'qt' 'rw' 'sc' 'ss' 'yh' 'zm'
- f        | 'h7' 'in' 'is' 'o7' 'q0' 'qa' 'qq' 'rl' 'rs' 'tu' 'u9' 'v3' 'vr' 'yq' 'zy'
- f        | 'ae' 'af' 'ay' 'da' 'dp' 'dq' 'e1' 'gi' 'gk' 'rl' 'sf' 'ta' 'td' 'tf' 'tt' 'tw'
- f        | 'aj' 'cl' 'cy' 'ee' 'i3' 'ir' 'nx' 'oz' 'qm' 'qw' 'r2' 't2' 'u0' 'ub' 'ur' 'wj'
- f        | 'av' 'dp' 'ff' 'fx' 'jk' 'ke' 'lb' 'lm' 'n1' 'ql' 'rv' 's4' 'uv' 'wl' 'ws' 'yj'
- f        | 'b8' 'eh' 'g5' 'gn' 'jo' 'mx' 'og' 'ol' 'on' 'px' 'rr' 'sl' 'un' 'uz' 'wv' 'yf'
- f        | 'bt' 'dy' 'gy' 'hg' 'i7' 'it' 'jv' 'lh' 'ox' 'qo' 'ri' 's3' 'ss' 'u1' 'uq' 'wr'
- f        | 'ef' 'ej' 'fn' 'ho' 'ia' 'il' 'iq' 'mj' 'nr' 'p5' 'rm' 'sd' 'ux' 'vi' 'wq' 'y6'
- f        | '25' 'cd' 'd2' 'dv' 'eo' 'es' 'f4' 'oc' 'qc' 'sh' 'te' 'tv' 'wd' 'wn' 'wo' 'xp' 'zt'
- f        | '2y' '8i' 'by' 'dl' 'h6' 'hj' 'm3' 'ml' 'qa' 'qx' 'r1' 'rm' 'rn' 'u4' 'uj' 'wo' 'xv'
- f        | 'ad' 'bs' 'dx' 'fi' 'i5' 'ia' 'j3' 'm5' 'mn' 'nr' 'ox' 'tg' 'un' 'vo' 'wj' 'wt' 'ys'
- f        | 'am' 'hw' 'jd' 'na' 'oe' 'pw' 'ql' 'qr' 's9' 'sk' 'u7' 'wa' 'wg' 'wu' 'x6' 'xr' 'yf'
- f        | 'de' 'mc' 'q1' 'q8' 'qp' 'qt' 'rq' 'rv' 'sa' 'sn' 'u8' 'vs' 'w9' 'wo' 'wp' 'ww' 'yl'
- f        | 'aa' 'af' 'ee' 'hb' 'ih' 'j2' 'lv' 'mw' 'pp' 'q3' 'rd' 'tb' 'td' 'ua' 'ug' 'up' 'xh' 'yy'
- f        | 'an' 'cp' 'dq' 'ej' 'ez' 'lj' 'ln' 'nu' 'qy' 'sm' 't8' 'td' 'tg' 'us' 'uw' 'vn' 'y4' 'z9'
- f        | 'ca' 'do' 'h5' 'i9' 'io' 'jk' 'jl' 'kn' 'qq' 'tm' 'ul' 'w9' 'wb' 'wp' 'wt' 'wx' 'y3' 'zd'
- f        | '16' 'ae' 'al' 'ef' 'eg' 'ew' 'gi' 'ha' 'id' 'ng' 'o3' 'on' 'p9' 'rz' 'uf' 'vg' 'wo' 'wr' 'zh'
- f        | 'ca' 'fu' 'hv' 'la' 'mt' 'ov' 'pl' 'q8' 'r3' 'sp' 'sy' 'tg' 'to' 'tv' 'wn' 'x4' 'yh' 'yp' 'ze'
- f        | 'cv' 'ds' 'dx' 'dy' 'ex' 'hh' 'lf' 'mq' 'qe' 'qu' 'rb' 'tb' 'tv' 'tz' 'ue' 'ui' 'wi' 'yb' 'zz'
- f        | 'ec' 'fd' 'gm' 'it' 'iu' 'kx' 'l1' 'pi' 'q1' 'qe' 'qs' 'ra' 'ri' 'rp' 'tn' 'to' 'vx' 'wh' 'wl'
- f        | 'eq' 'g7' 'jc' 'jf' 'ji' 'lw' 'ma' 'oe' 'p7' 'qb' 'qj' 'qo' 'u7' 'v7' 'w3' 'wd' 'wz' 'xg' 'yr'
- f        | 'a2' 'cs' 'ee' 'em' 'gk' 'hv' 'iy' 'kq' 'nc' 'pb' 'q5' 'qy' 'rq' 'rr' 'ts' 'uq' 'vt' 'w0' 'y6' 'yz'
- f        | 'al' 'fh' 'fk' 'gy' 'he' 'ie' 'iz' 'lq' 'oh' 'pu' 'q7' 's6' 'sd' 'sr' 'sw' 'uu' 'uz' 'v6' 'ws' 'xo'
- f        | 'aw' 'bm' 'dw' 'e5' 'ht' 'j4' 'kv' 'm5' 'oi' 'qa' 'qe' 'qf' 'ri' 'rj' 't6' 't8' 'un' 'wc' 'yb' 'yj'
- f        | 'az' 'bl' 'bo' 'cf' 'gt' 'h0' 'hx' 'iq' 'k2' 'kb' 'oc' 'qg' 'qn' 'qz' 're' 'rl' 'rv' 'xp' 'y8' 'yf'
- f        | 'bj' 'dq' 'e2' 'ec' 'fs' 'g8' 'gd' 'iw' 'jt' 'nn' 'ns' 'o9' 'p0' 'tb' 'u7' 'uv' 'wf' 'wr' 'xf' 'z3'
- f        | 'bs' 'ee' 'gz' 'hv' 'ib' 'kc' 'lb' 'nu' 'ps' 'pt' 'qh' 'ud' 'vo' 'vq' 'vu' 'wb' 'wj' 'x3' 'xu' 'yf'
- f        | '2o' 'a5' 'cg' 'ch' 'cp' 'eb' 'eg' 'eh' 'ew' 'fu' 'g4' 'hc' 'hx' 'il' 'li' 'rd' 'sf' 'sw' 'tg' 'uc' 'zj'
- f        | '6d' '8t' 'bl' 'gu' 'iu' 'kd' 'kj' 'kq' 'nw' 'nx' 'o6' 'oa' 'qk' 'ql' 'rd' 'ri' 'uc' 'vi' 'wy' 'xq' 'z2'
- f        | 'a3' 'ch' 'cs' 'e1' 'gq' 'gx' 'lz' 'nh' 'os' 'po' 'qs' 'rr' 'tx' 'ud' 'uj' 'uv' 've' 'w0' 'wj' 'xo' 'xz'
- f        | 'aa' 'al' 'e9' 'hm' 'ir' 'kc' 'l0' 'pi' 'po' 'qa' 'qk' 'r0' 'rd' 'rz' 'se' 'sr' 'vp' 'w6' 'w8' 'yd' 'yk'
- f        | 'am' 'bv' 'dt' 'dy' 'ed' 'gx' 'm7' 'mt' 'q5' 'qv' 'rr' 'sh' 'th' 'ut' 'wd' 'wm' 'y1' 'ym' 'yq' 'yr' 'yt'
- f        | '4f' 'e4' 'ep' 'fa' 'ff' 'iv' 'j4' 'kw' 'oj' 'pa' 'pw' 'q0' 'rv' 'ry' 't3' 'ul' 'vq' 'w1' 'wj' 'xm' 'ye' 'yu'
- f        | '7a' 'a3' 'dl' 'fo' 'hb' 'ki' 'kk' 'lo' 'pl' 'q5' 'qy' 'r1' 'rj' 'sy' 'tv' 'w3' 'wm' 'wn' 'yj' 'yr' 'zi' 'zq'
- f        | '1l' 'b5' 'dq' 'fw' 'hz' 'in' 'ml' 'nb' 'nu' 'o2' 'or' 'q7' 'qb' 'qh' 'qt' 'rv' 'so' 'tp' 'tr' 'u0' 'v6' 'wl' 'xb'
- f        | '5y' 'aw' 'e2' 'gd' 'gn' 'hn' 'ig' 'k9' 'ki' 'oj' 'pk' 'ql' 'qz' 'sl' 't3' 'u4' 'v8' 'wg' 'wu' 'xk' 'ya' 'yf' 'zr'
- f        | '6t' 'a9' 'db' 'ea' 'ec' 'ez' 'fq' 'gj' 'hb' 'hs' 'lc' 'or' 'p4' 'ph' 'pp' 'qr' 'qx' 'rc' 'rl' 'tn' 'u5' 'w9' 'x1'
- f        | 'bt' 'c5' 'd1' 'd7' 'g6' 'gk' 'ib' 'iv' 'ml' 'om' 'qd' 'qg' 'ql' 'r3' 'rc' 'u4' 'uh' 'uo' 'wh' 'y0' 'yn' 'yz' 'zo'
- f        | '1b' 'cp' 'di' 'ed' 'fv' 'gx' 'hs' 'i8' 'lh' 'lq' 'lz' 'p7' 'p8' 'pc' 'ql' 'qn' 'qw' 're' 'rg' 'tv' 'we' 'wp' 'yr' 'zj'
- f        | '1i' 'db' 'e4' 'er' 'fh' 'ft' 'hm' 'lg' 'll' 'of' 'og' 'q6' 'qj' 'r0' 're' 'th' 'up' 'ut' 'uw' 'vf' 'wq' 'ws' 'wx' 'zi'
- f        | 'a0' 'ck' 'fp' 'g4' 'ib' 'ih' 'im' 'iq' 'kz' 'll' 'lv' 'nc' 'oq' 'qf' 'qv' 'rg' 'rk' 'tc' 'tn' 'u1' 'u8' 'uj' 'un' 'vv'
- f        | 'ak' 'ar' 'dg' 'ds' 'ep' 'fv' 'ge' 'jd' 'no' 'on' 'q5' 'qd' 'qo' 'qv' 'qx' 'r7' 'ra' 'ru' 'sa' 'ud' 'uo' 'wl' 'ye' 'yl'
- f        | 'av' 'es' 'fl' 'gt' 'he' 'it' 'kp' 'mu' 'nc' 'ol' 'om' 'ph' 'qr' 'ra' 'rk' 'ui' 'vh' 'w6' 'wm' 'ws' 'yu' 'z0' 'zl' 'zm'
- f        | 'da' 'e5' 'ec' 'gd' 'gf' 'jj' 'kx' 'ly' 'pd' 'pj' 'q6' 'qk' 'rm' 'sa' 'te' 'ut' 'wa' 'wc' 'wl' 'ws' 'wv' 'zb' 'zk' 'zz'
- f        | '12' 'ao' 'ed' 'ek' 'ew' 'ey' 'fm' 'gr' 'hc' 'ht' 'io' 'ir' 'jb' 'jw' 'ke' 'ld' 'qj' 'se' 'tm' 'tn' 'tw' 'wv' 'y5' 'yt' 'z6'
- f        | '1p' '51' 'aj' 'av' 'bj' 'bn' 'c1' 'dx' 'ex' 'gz' 'he' 'ia' 'ic' 'ip' 'kn' 'mx' 'o6' 'or' 'ql' 'rc' 'wf' 'wi' 'wn' 'y8' 'yr'
- f        | 'av' 'ej' 'el' 'ep' 'fp' 'hh' 'hz' 'l9' 'mr' 'q3' 'qn' 'qq' 'qy' 'rh' 'tw' 'vt' 'vu' 'w5' 'wg' 'wk' 'wo' 'x5' 'y9' 'yk' 'zm'
- f        | 'b6' 'bq' 'dv' 'e1' 'ez' 'f5' 'fh' 'ik' 'iy' 'jy' 'li' 'm2' 'qe' 'rp' 'te' 'u4' 'u8' 'uo' 'w3' 'w8' 'we' 'wo' 'wu' 'x5' 'yl'
- f        | 'cq' 'er' 'hy' 'ie' 'jg' 'ke' 'lw' 'mf' 'p0' 'pe' 'pv' 'qk' 'qt' 'qy' 'sh' 'th' 'ti' 'ue' 'w5' 'wl' 'y4' 'y5' 'yi' 'yy' 'za'
- f        | 'a3' 'bh' 'c2' 'ca' 'e1' 'fb' 'fe' 'hd' 'hx' 'jc' 'md' 'nl' 'q9' 'qi' 'qq' 'qs' 'qt' 'rx' 'te' 'tv' 'u2' 'w8' 'wi' 'wr' 'xq' 'y9'
- f        | 'af' 'dt' 'e4' 'e8' 'eq' 'et' 'gr' 'kr' 'kv' 'lu' 'oy' 'pb' 'qh' 'ql' 'qw' 'r4' 't8' 'tb' 'td' 'tn' 'uc' 'uj' 'wh' 'xn' 'xs' 'yi'
- f        | 'au' 'bo' 'dz' 'ek' 'eq' 'et' 'fa' 'hw' 'id' 'im' 'kr' 'p4' 'qx' 'rb' 'rx' 'sf' 'tl' 'tx' 'uf' 'ui' 'uw' 'vr' 'wb' 'wn' 'xw' 'yd'
- f        | 'ay' 'bg' 'bp' 'cm' 'eg' 'ev' 'ff' 'go' 'hc' 'hl' 'jj' 'l0' 'os' 'q9' 'qc' 'qh' 'qo' 'rt' 'rx' 'so' 'sr' 'to' 'tx' 'uk' 'wb' 'y4'
- f        | 'd6' 'e4' 'ev' 'fd' 'i3' 'if' 'j1' 'j5' 'o8' 'oj' 'ok' 'pw' 'qc' 'qd' 'qf' 'qt' 't8' 'tw' 'u1' 'u7' 'wr' 'wv' 'ww' 'yh' 'yn' 'yz'
- f        | '1j' 'ag' 'c3' 'cl' 'e4' 'ef' 'eh' 'f5' 'fi' 'gy' 'hx' 'lw' 'oa' 'pu' 'qa' 'qi' 'qt' 'qu' 'rl' 'ro' 'rs' 'sg' 'uq' 'wq' 'ya' 'yh' 'ys'
- f        | 'a7' 'ah' 'cj' 'co' 'cv' 'dt' 'ex' 'fs' 'gx' 'hn' 'jv' 'kp' 'l5' 'od' 'on' 'pr' 'q6' 'q8' 'qi' 'qq' 'qr' 'rl' 'u2' 'wb' 'wx' 'yh' 'zq'
- f        | 'bg' 'eh' 'eq' 'gg' 'gh' 'gm' 'gx' 'i7' 'iv' 'm3' 'mv' 'n3' 'o6' 'ox' 'oz' 'pb' 'qk' 'rj' 'rs' 'sk' 'su' 'tg' 'uf' 'uj' 've' 'ww' 'yf'
- f        | 'cd' 'dl' 'e6' 'en' 'eu' 'gg' 'je' 'kp' 'lv' 'pv' 'q0' 'q3' 'qc' 'qd' 'qo' 'qs' 'qz' 'rw' 'se' 'tx' 'uh' 'uj' 'ul' 'wo' 'ye' 'yi' 'zx'
- f        | 'd6' 'do' 'e4' 'eg' 'hm' 'i3' 'kg' 'nz' 'ow' 'pc' 'pv' 'q0' 'q4' 'q6' 'qx' 'r0' 'ri' 'sm' 'sn' 'tw' 'u9' 'ul' 'up' 'vk' 'we' 'wm' 'zv'
- f        | 'a1' 'cd' 'cl' 'd8' 'ek' 'ig' 'ih' 'in' 'lq' 'o3' 'ow' 'px' 'qg' 'qm' 'qq' 'qr' 'qs' 'qy' 'rd' 'rh' 'to' 'tq' 'ul' 'wc' 'x9' 'ya' 'yf' 'yw'
- f        | 'aa' 'as' 'cg' 'dh' 'dn' 'dr' 'e0' 'h2' 'hr' 'j2' 'jf' 'js' 'kc' 'kw' 'ld' 'lh' 'mk' 'n3' 'q3' 'qe' 'ql' 'rv' 's3' 'w0' 'xg' 'ym' 'yt' 'zv'
- f        | 'ap' 'ca' 'dt' 'dx' 'ep' 'f5' 'fg' 'gq' 'hi' 'hj' 'i4' 'ic' 'it' 'iy' 'jl' 'lz' 'nd' 'o9' 'og' 'oq' 'pk' 'q6' 'qo' 'ra' 'sf' 'wd' 'wt' 'x9'
- f        | 'e2' 'ef' 'ev' 'fe' 'ij' 'j8' 'jm' 'kw' 'nb' 'ny' 'o6' 'o7' 'ou' 'pb' 'qd' 'qv' 'rh' 'rp' 's7' 'ti' 'ub' 'uk' 'wh' 'wi' 'wj' 'xj' 'xo' 'yx'
- f        | '3d' 'ad' 'dr' 'ee' 'ez' 'f4' 'fd' 'fg' 'fu' 'g9' 'gk' 'h9' 'hl' 'iz' 'jd' 'nb' 'o0' 'oo' 'oy' 'qj' 'qt' 'rp' 'ru' 'sv' 'tl' 'tv' 'wf' 'wp' 'wy'
- f        | '5t' 'al' 'db' 'dt' 'dx' 'ea' 'en' 'g6' 'gc' 'gm' 'gy' 'if' 'ii' 'ik' 'jb' 'jv' 'k5' 'po' 'pv' 'py' 'qj' 'qp' 'rz' 'ux' 'v1' 'w4' 'w8' 'wi' 'yv'
- f        | 'a1' 'b0' 'd0' 'db' 'ef' 'er' 'ev' 'ew' 'fe' 'fm' 'g8' 'la' 'n5' 'oh' 'os' 'pk' 'pn' 'qq' 'r7' 'sq' 'tw' 'ua' 'uu' 'wa' 'wk' 'wr' 'wu' 'xc' 'yi'
- f        | 'ab' 'c1' 'cl' 'd3' 'do' 'e5' 'e8' 'eg' 'ek' 'ex' 'gy' 'ia' 'iq' 'iw' 'jf' 'kv' 'm9' 'n4' 'nh' 'nj' 'q3' 'qa' 'qe' 'qg' 'qm' 'sy' 'ta' 'w5' 'w6'
- f        | 'av' 'bh' 'cd' 'cw' 'dv' 'em' 'gn' 'iw' 'ja' 'ki' 'lc' 'lx' 'my' 'oi' 'ox' 'q0' 'qb' 'qi' 'qn' 'uf' 'ux' 'we' 'wn' 'xd' 'xq' 'y4' 'y9' 'zf' 'zs'
- f        | 'ch' 'e1' 'fi' 'g8' 'go' 'hf' 'i1' 'ic' 'in' 'it' 'j7' 'jk' 'jl' 'jv' 'nm' 'of' 'oz' 'r8' 'rc' 'rk' 'rp' 'rx' 'sp' 'tb' 'tv' 'tw' 'ul' 'wx' 'zj'
- f        | 'an' 'dh' 'do' 'hs' 'hv' 'ia' 'ic' 'ne' 'of' 'oi' 'oq' 'pe' 'pg' 'q9' 'r5' 'rk' 'sc' 'sf' 'sh' 'ta' 'tb' 'tq' 'um' 'wb' 'wj' 'wm' 'wq' 'wt' 'yi' 'ym'
- f        | 'bb' 'bq' 'c2' 'cw' 'cy' 'db' 'dd' 'f3' 'fl' 'fn' 'id' 'ig' 'jb' 'kc' 'kl' 'lp' 'lx' 'mh' 'o0' 'pk' 'qi' 'qx' 'rq' 've' 'w8' 'wd' 'x1' 'y4' 'ye' 'zm'
- f        | 'c7' 'eb' 'er' 'gb' 'if' 'ko' 'ml' 'oq' 'ot' 'pa' 'qk' 'qs' 'rl' 'rp' 'sc' 'tf' 'tv' 'tw' 'uc' 'ud' 'uz' 'vk' 'vm' 'w0' 'wm' 'wu' 'yd' 'yq' 'yy' 'zu'
- f        | '27' '2e' '2p' 'aa' 'eh' 'en' 'eq' 'eu' 'ew' 'ff' 'g8' 'hv' 'mx' 'oi' 'pd' 'q3' 'qs' 'rl' 'sa' 'sw' 'te' 'tn' 'ty' 'uh' 'uo' 'wb' 'wh' 'wy' 'xx' 'z8' 'zt'
- f        | '3k' 'di' 'dp' 'em' 'ew' 'f5' 'hb' 'hn' 'j3' 'k0' 'lk' 'm4' 'mq' 'pr' 'qe' 'qo' 'qy' 'rc' 'ri' 'rt' 'so' 'ts' 've' 'w4' 'w7' 'wl' 'wn' 'wy' 'xf' 'y6' 'yt'
- f        | '3v' 'ab' 'at' 'bn' 'bz' 'cx' 'eh' 'gd' 'hd' 'hr' 'i9' 'j8' 'jg' 'jx' 'lf' 'ng' 'oj' 'ov' 'oz' 'pn' 'ps' 'qq' 'qr' 'ro' 'rt' 'u9' 'up' 'uz' 'yl' 'yw' 'zi'
- f        | '6n' 'da' 'dl' 'dx' 'el' 'ew' 'ff' 'fl' 'gc' 'iu' 'jh' 'jt' 'kt' 'lz' 'pd' 'q6' 'qj' 'ql' 'r3' 'ra' 'rn' 'ry' 'sg' 'tf' 'tp' 'tt' 'ub' 'ye' 'yf' 'yl' 'yp'
- f        | 'a3' 'ai' 'at' 'd7' 'eu' 'fu' 'gd' 'ii' 'ik' 'j0' 'je' 'lw' 'ly' 'mx' 'n7' 'pm' 'qf' 'qk' 'qt' 'ss' 'to' 'tq' 'un' 'vn' 'vq' 'wo' 'wz' 'yk' 'yy' 'zf' 'zg'
- f        | 'aa' 'ch' 'cm' 'db' 'dd' 'e7' 'eu' 'f5' 'fr' 'gg' 'ie' 'jc' 'kt' 'na' 'on' 'or' 'po' 'q0' 're' 's3' 'tb' 'tc' 'td' 'tt' 'tv' 'uf' 'wi' 'wq' 'wt' 'y8' 'ys'
- f        | 'ac' 'al' 'b3' 'bg' 'ci' 'cn' 'ea' 'f4' 'ih' 'ix' 'kt' 'p8' 'pk' 'qd' 'qe' 'qi' 'rb' 'rc' 'ru' 'te' 'th' 'tl' 'tn' 'vb' 'wb' 'ws' 'ww' 'xk' 'xo' 'yb' 'zf'
- f        | 'az' 'eq' 'fe' 'go' 'gv' 'ig' 'iz' 'ja' 'l4' 'mo' 'nm' 'no' 'of' 'pk' 'q9' 'qb' 'ql' 'qt' 'r7' 'rc' 'rm' 'tg' 'tv' 'u3' 'u7' 'wc' 'x4' 'xw' 'yl' 'zk' 'zn'
- f        | 'c8' 'db' 'dh' 'fh' 'g7' 'gm' 'if' 'ih' 'jd' 'li' 'ms' 'mt' 'no' 'or' 'p7' 'pc' 'qb' 'qm' 'sh' 'tk' 'uf' 'uz' 'vb' 'vp' 'wh' 'wr' 'wv' 'xh' 'xm' 'xp' 'zj'
- f        | '5s' 'aa' 'ar' 'bu' 'c2' 'cw' 'd2' 'ej' 'g8' 'gy' 'ij' 'iv' 'k0' 'l1' 'lb' 'm1' 'od' 'pm' 'q1' 'q4' 'q5' 'qd' 'rn' 'ry' 'sj' 'sm' 'ta' 'th' 'u8' 'vf' 'wr' 'xm'
- f        | '6d' 'ao' 'bo' 'cq' 'e0' 'fi' 'fm' 'h6' 'i2' 'jl' 'kn' 'mj' 'nv' 'oq' 'p6' 'qd' 'qi' 'qn' 'r2' 'r8' 'rd' 'sd' 'sl' 'ta' 'tp' 'ub' 'uh' 'w3' 'wh' 'y1' 'yj' 'zk'
- f        | 'aa' 'cb' 'd2' 'dd' 'de' 'e4' 'gd' 'go' 'hc' 'ic' 'in' 'ip' 'js' 'lm' 'o1' 'o3' 'pl' 'ra' 'rx' 'sj' 'ti' 'tu' 'tv' 'wc' 'we' 'wl' 'wq' 'wx' 'xg' 'xi' 'yc' 'yi'
- f        | 'ad' 'ai' 'ak' 'df' 'ee' 'fr' 'gg' 'i2' 'i5' 'ig' 'ij' 'ir' 'j1' 'kk' 'km' 'l9' 'qb' 'ql' 'qt' 'qw' 'rb' 's2' 'te' 'ue' 'w0' 'wk' 'wu' 'y4' 'yb' 'yf' 'yp' 'zn'
- f        | 'ap' 'aw' 'ba' 'cz' 'dw' 'eh' 'g5' 'g9' 'gc' 'gi' 'go' 'ir' 'j8' 'kl' 'mg' 'p6' 'ql' 'qu' 'qz' 'sa' 't7' 'tw' 'v5' 'v7' 'wj' 'xt' 'y6' 'yg' 'yh' 'yq' 'z5' 'zj'
- f        | 'bp' 'cy' 'd6' 'd7' 'em' 'et' 'gf' 'gt' 'hl' 'ib' 'io' 'kz' 'mx' 'nm' 'oe' 'pd' 'qf' 'qk' 'rk' 'rz' 'se' 'si' 'tq' 'tu' 'uu' 'v3' 'wa' 'wf' 'wg' 'wx' 'yd' 'ym'
- f        | '15' '72' 'av' 'ba' 'dt' 'ev' 'hd' 'hu' 'jy' 'lo' 'mo' 'mt' 'oe' 'oi' 'pa' 'qc' 'qe' 'qt' 'r1' 'rg' 'ry' 'td' 'tk' 'us' 'wk' 'wq' 'ww' 'wz' 'x7' 'xq' 'y9' 'yx' 'z3'
- f        | '3q' 'an' 'cp' 'ej' 'fx' 'gj' 'i3' 'ib' 'ik' 'jt' 'k5' 'n9' 'no' 'os' 'pg' 'qo' 'qp' 'qx' 'rb' 'rk' 'su' 'tk' 'tv' 'u1' 'up' 'w1' 'we' 'wj' 'wr' 'yf' 'yq' 'z5' 'zd'
- f        | 'ak' 'dx' 'eb' 'es' 'eu' 'fd' 'ga' 'gf' 'hl' 'i2' 'kb' 'kd' 'mz' 'n1' 'o8' 'qe' 'qs' 'qw' 'rp' 'sf' 'sk' 'sp' 't0' 'tu' 'uh' 'v9' 'vj' 'vs' 'vw' 'wv' 'xs' 'yo' 'z2'
- f        | '25' 'ad' 'ao' 'at' 'ch' 'db' 'dz' 'eq' 'fp' 'gq' 'ih' 'iu' 'jo' 'km' 'p1' 'pb' 'qa' 'qb' 'qc' 'qg' 'ql' 'qq' 'qy' 'rb' 'rf' 'rl' 'rw' 'sp' 'ty' 'uk' 'ur' 'wu' 'wv' 'yw'
- f        | '1o' '3w' 'aw' 'be' 'bx' 'e7' 'eo' 'ey' 'ff' 'fx' 'ht' 'jb' 'km' 'kv' 'l6' 'la' 'nu' 'ny' 'pk' 'qc' 'qi' 'rk' 'ro' 'rw' 's3' 'sh' 't5' 'u1' 'uy' 'vi' 'vm' 'wi' 'x3' 'xo' 'yn'
- f        | '2a' '5d' 'ag' 'ar' 'at' 'dc' 'fa' 'fh' 'gn' 'gx' 'hh' 'iy' 'kd' 'ke' 'ld' 'nd' 'nx' 'oz' 'qc' 'qd' 'qo' 'qp' 'qu' 'r0' 'rg' 't5' 'tc' 'tg' 'th' 'tk' 'w2' 'w5' 'wt' 'yl' 'zn'
- f        | '30' 'cl' 'dl' 'e7' 'ee' 'ef' 'eh' 'el' 'fk' 'fn' 'fs' 'gi' 'gw' 'i2' 'il' 'l7' 'm6' 'm9' 'mf' 'o8' 'ob' 'ok' 'pc' 'pe' 'qb' 'qe' 'qn' 'qr' 'tu' 'uc' 'ud' 'wp' 'xq' 'ym' 'ys'
- f        | '5o' 'ar' 'at' 'az' 'bf' 'bv' 'e0' 'ew' 'fh' 'hd' 'ij' 'in' 'is' 'iu' 'ji' 'l5' 'ld' 'mz' 'nk' 'oc' 'p2' 'ph' 'px' 'q9' 'qi' 'qn' 'qo' 'qq' 'qv' 'rw' 'sf' 'sp' 'te' 'up' 'y8'
- f        | 'a2' 'bx' 'e4' 'em' 'eu' 'ey' 'gd' 'jj' 'k1' 'lm' 'my' 'oz' 'p8' 'pa' 'pj' 'qj' 'qp' 'qy' 'ri' 'rw' 'sj' 'sw' 'tv' 'uj' 'uk' 'um' 'ux' 'vs' 'wd' 'wf' 'xj' 'xs' 'xx' 'xy' 'yd'
- f        | 'ab' 'at' 'cr' 'e9' 'g0' 'gv' 'ib' 'iv' 'iz' 'jb' 'jm' 'k0' 'kh' 'o2' 'o7' 'oq' 'ot' 'pj' 'ps' 'qj' 'qz' 'r9' 'rn' 'sa' 't1' 'ti' 'tq' 'ue' 'us' 'wc' 'wo' 'ww' 'yi' 'ys' 'za'
- f        | 'by' 'c1' 'da' 'ec' 'ej' 'ew' 'g4' 'gq' 'gt' 'ir' 'jv' 'kl' 'kz' 'l5' 'nm' 'oi' 'on' 'pc' 'q2' 'qx' 'qz' 'rd' 'se' 'sq' 'ti' 'tk' 'to' 'ur' 'w8' 'wm' 'wr' 'y1' 'yn' 'yp' 'zy'
- f        | 'd8' 'dm' 'eg' 'et' 'ge' 'gz' 'i8' 'ig' 'il' 'iy' 'jo' 'k6' 'lm' 'oj' 'p3' 'pw' 'qd' 'qp' 'qq' 'qz' 'r7' 's1' 'sr' 'sx' 't4' 'uz' 'vm' 'vr' 'w0' 'wj' 'wp' 'xc' 'y1' 'yj' 'zd'
- f        | '0w' 'bu' 'df' 'dj' 'du' 'dy' 'dz' 'gj' 'ho' 'je' 'kw' 'm1' 'o3' 'oo' 'pf' 'qh' 'qn' 'qu' 'rf' 'rj' 'ro' 'rv' 'ss' 't4' 'tc' 'tf' 'um' 'uo' 'v6' 'v8' 'wn' 'wo' 'xh' 'y0' 'yz' 'zr'
- f        | 'a3' 'do' 'ef' 'hp' 'ih' 'im' 'jp' 'km' 'lv' 'mt' 'nh' 'oc' 'od' 'ph' 'pi' 'pj' 'qe' 'qh' 'qr' 'rq' 'rr' 'rs' 'sc' 'st' 'ts' 'tt' 'tw' 'ut' 'vv' 'w7' 'wv' 'x3' 'xa' 'xc' 'xl' 'zc'
- f        | 'ad' 'aj' 'ar' 'b4' 'dj' 'eo' 'eu' 'ex' 'gt' 'hj' 'ie' 'ij' 'iz' 'kg' 'ks' 'l1' 'ld' 'me' 'my' 'mz' 'oi' 'pr' 'qb' 'ry' 'sd' 'to' 'u5' 'wc' 'wf' 'wl' 'xs' 'y2' 'yg' 'z1' 'zj' 'zt'
- f        | '2y' 'a3' 'ac' 'ae' 'ar' 'dp' 'ec' 'f8' 'f9' 'ga' 'gq' 'gs' 'hm' 'ib' 'if' 'im' 'j0' 'na' 'pb' 'pf' 'q9' 'qa' 'qu' 'qw' 'ra' 'rj' 'rm' 'rr' 'su' 'tj' 'vw' 'wb' 'wf' 'wk' 'wo' 'ym' 'yu'
- f        | '5y' 'a2' 'by' 'c9' 'e6' 'fd' 'fn' 'g7' 'h9' 'hj' 'j9' 'kg' 'kk' 'kn' 'kx' 'ln' 'q3' 'qa' 'qh' 'rb' 'rh' 'sj' 'sn' 'tx' 'tz' 'un' 'us' 've' 'vf' 'vh' 'wf' 'wp' 'wz' 'xj' 'xq' 'yi' 'yz'
- f        | 'a1' 'aj' 'bi' 'cd' 'cw' 'd2' 'e4' 'e9' 'gz' 'ij' 'k1' 'kb' 'kn' 'lw' 'me' 'nj' 'oq' 'p4' 'ph' 'ps' 'q3' 'q4' 'qj' 's7' 'sp' 'sx' 'tc' 'tw' 'v1' 'vj' 'vt' 'w7' 'wa' 'wb' 'wp' 'y1' 'zc'
- f        | 'a9' 'av' 'aw' 'dj' 'e0' 'ej' 'er' 'eu' 'ez' 'fr' 'gq' 'hh' 'hp' 'ko' 'kq' 'lw' 'n8' 'pe' 'pl' 'pn' 'pp' 'pv' 'q9' 'qc' 'qj' 'qs' 'qw' 'r6' 'rl' 'tq' 'u5' 'uu' 'uz' 'wn' 'wp' 'wr' 'zo'
- f        | 'dq' 'ed' 'el' 'fg' 'fv' 'gh' 'hx' 'i2' 'iv' 'jc' 'la' 'ld' 'nb' 'oa' 'of' 'oi' 'py' 'q7' 'qe' 'qr' 'qs' 'qw' 'qx' 'qz' 'rl' 'rr' 'sp' 't3' 'te' 'ti' 'tu' 'ue' 'w0' 'wa' 'wq' 'wu' 'xn'
- f        | '4p' 'bw' 'cq' 'dk' 'dr' 'dx' 'e3' 'e8' 'ex' 'ez' 'g9' 'h9' 'ih' 'in' 'kt' 'lt' 'me' 'o7' 'od' 'oi' 'on' 'p1' 'pu' 'qa' 'qd' 'qm' 'rz' 'sd' 'tn' 'ua' 'uz' 'vg' 'vx' 'wx' 'xy' 'ya' 'yl' 'yx'
- f        | '6b' 'af' 'd3' 'df' 'dg' 'ds' 'e1' 'eb' 'er' 'f3' 'ft' 'ho' 'ik' 'k1' 'k2' 'li' 'mj' 'ni' 'py' 'qx' 'rb' 'rp' 'rv' 'sd' 'sh' 'sl' 'u5' 'uf' 'vk' 'vs' 'vx' 'wg' 'wm' 'wr' 'ws' 'wz' 'xn' 'zh'
- f        | '4u' 'a3' 'ck' 'dw' 'e5' 'fu' 'ij' 'iu' 'jd' 'jp' 'ka' 'kb' 'ld' 'op' 'p1' 'po' 'pw' 'q5' 'q7' 'qf' 'qq' 'qr' 'qv' 'rm' 'sv' 't6' 'td' 'tp' 'uw' 'vb' 'w4' 'w6' 'wq' 'xh' 'y2' 'yf' 'yt' 'zj' 'zz'
- f        | '7n' 'ai' 'aj' 'ap' 'b9' 'bx' 'cu' 'dn' 'e1' 'e2' 'ed' 'eg' 'eo' 'hu' 'ie' 'ln' 'lq' 'nl' 'oa' 'qa' 'qe' 'qo' 'r5' 'ra' 'ri' 'rm' 'rw' 'ss' 'sx' 't3' 'tz' 'ut' 'uz' 'wd' 'we' 'wn' 'wq' 'wr' 'ws'
- f        | '8p' 'ao' 'aq' 'c1' 'dh' 'dt' 'e9' 'eo' 'ev' 'fp' 'fu' 'gc' 'gz' 'hk' 'i5' 'id' 'ip' 'iy' 'jg' 'jr' 'k2' 'lo' 'mb' 'mf' 'oi' 'ou' 'qp' 'qr' 'qw' 'qx' 'ra' 'rj' 'tl' 'ui' 'uu' 'uy' 'vb' 'wh' 'yt'
- f        | 'a7' 'bq' 'el' 'ey' 'fp' 'fu' 'fx' 'gr' 'hi' 'hl' 'jm' 'ki' 'kp' 'n6' 'o9' 'oj' 'op' 'ou' 'p7' 'pm' 'pp' 'q7' 'qa' 'qc' 'qj' 'qk' 'qm' 'si' 'st' 'tn' 'uc' 'w6' 'wp' 'xu' 'y5' 'yk' 'ys' 'yu' 'zs'
- f        | 'ah' 'ai' 'b8' 'ci' 'd2' 'ea' 'ed' 'en' 'et' 'fj' 'fv' 'ht' 'iu' 'iv' 'iw' 'jb' 'jd' 'ky' 'mj' 'nt' 'q1' 'qb' 'qe' 'ql' 'qz' 'ru' 'sg' 'tl' 'tm' 'tn' 'tw' 'ty' 'u1' 'ud' 'us' 'wj' 'y1' 'zd' 'zj'
- f        | 'bf' 'cf' 'cg' 'cj' 'ef' 'ej' 'ek' 'ep' 'fk' 'gi' 'ik' 'ir' 'j0' 'km' 'ko' 'lu' 'mr' 'n6' 'oc' 'op' 'pt' 'q4' 'qe' 'qk' 'qv' 'rc' 'rt' 's8' 't3' 'tk' 'ut' 'wc' 'we' 'ws' 'wt' 'ww' 'y8' 'yd' 'yr'
- f        | '1d' 'a2' 'af' 'bb' 'dd' 'dg' 'dl' 'du' 'ee' 'ff' 'g0' 'hj' 'hk' 'i4' 'iy' 'jt' 'kq' 'm6' 'mh' 'ov' 'qf' 'qh' 'qq' 'rt' 'sw' 'ta' 'tc' 'we' 'wn' 'wy' 'wz' 'xd' 'xs' 'y2' 'yg' 'yj' 'yk' 'zi' 'zq' 'zw'
- f        | '1l' 'e2' 'e4' 'eo' 'ep' 'fd' 'ha' 'hp' 'hx' 'io' 'iu' 'jr' 'jx' 'k4' 'l8' 'nb' 'oa' 'om' 'on' 'ow' 'p2' 'qh' 'qp' 'qz' 'ra' 'rz' 'sy' 'tk' 'tt' 'ul' 'uq' 'vm' 'wt' 'xg' 'xn' 'ya' 'yf' 'yw' 'yx' 'zp'
- f        | '2l' '55' 'aq' 'aw' 'cm' 'dq' 'eb' 'fl' 'fo' 'fp' 'fy' 'gk' 'hy' 'ic' 'iu' 'jc' 'jl' 'lc' 'mb' 'nx' 'oe' 'oo' 'oz' 'p5' 'pa' 'pf' 'qr' 'rj' 'sc' 'sz' 'td' 'tz' 'u1' 'vq' 'wu' 'xb' 'xx' 'y0' 'za' 'zc'
- f        | '4z' 'a2' 'eg' 'f4' 'g9' 'gi' 'hd' 'hn' 'ij' 'io' 'ix' 'iz' 'jb' 'jd' 'kk' 'l4' 'lh' 'lq' 'p9' 'pa' 'pb' 'q7' 'qh' 'qi' 'qk' 'qs' 'r9' 'rc' 'ro' 'rr' 's4' 'tj' 'tz' 'vi' 'we' 'wp' 'xe' 'yd' 'yg' 'zj'
- f        | '7h' 'an' 'b6' 'cl' 'e1' 'e4' 'en' 'ey' 'ff' 'gn' 'h7' 'ht' 'i5' 'i9' 'ia' 'iw' 'jx' 'kl' 'ku' 'op' 'pe' 'pt' 'qb' 'ql' 'qp' 'qy' 'ri' 'se' 'si' 'ta' 'ti' 'tl' 'tp' 'uo' 'vr' 'w4' 'wn' 'xi' 'xs' 'ym'
- f        | '7k' 'et' 'ew' 'ez' 'g9' 'gk' 'he' 'hp' 'ip' 'jp' 'jq' 'jr' 'jv' 'kb' 'kk' 'ku' 'lx' 'o0' 'o3' 'oa' 'or' 'ou' 'q7' 'qa' 'qf' 'qg' 'qh' 'qo' 'ro' 'rx' 'tl' 'us' 'vk' 'vw' 'wc' 'wp' 'x0' 'xz' 'yg' 'z5'
- f        | 'a5' 'ab' 'ad' 'ao' 'b6' 'ea' 'es' 'ez' 'gm' 'gv' 'i0' 'in' 'jw' 'lh' 'lm' 'my' 'oj' 'ox' 'oy' 'pv' 'q1' 'qf' 'qh' 'qj' 'qo' 'qs' 'qt' 'qw' 'r0' 'ri' 'rk' 'ry' 's4' 'vs' 'wa' 'xy' 'y5' 'yg' 'yl' 'zm'
- f        | 'aa' 'ap' 'b0' 'c6' 'e1' 'ex' 'fe' 'fu' 'fz' 'g1' 'g8' 'go' 'hl' 'iz' 'k3' 'ls' 'mw' 'mz' 'oa' 'ow' 'p6' 'q5' 'qh' 'qq' 'qx' 'ra' 'rh' 'rp' 'rw' 'tf' 'tk' 'tl' 'uc' 'wi' 'x1' 'xb' 'yb' 'yw' 'yz' 'zm'
- f        | 'ad' 'as' 'dn' 'dq' 'e7' 'ei' 'ey' 'fj' 'h2' 'hu' 'hw' 'i7' 'i9' 'iu' 'jr' 'ma' 'na' 'nh' 'nk' 'pa' 'q5' 'qd' 'qn' 's0' 'so' 'sx' 'u7' 'uc' 'um' 'vb' 'w9' 'wf' 'wh' 'wl' 'wn' 'wr' 'xl' 'y8' 'yl' 'zw'
- f        | 'ae' 'ai' 'di' 'ea' 'eb' 'ec' 'gw' 'h8' 'hb' 'iw' 'iz' 'jf' 'jg' 'ks' 'le' 'p8' 'pl' 'pp' 'qd' 'qg' 'qm' 'qn' 'qu' 'qy' 'r4' 'rf' 'rq' 's1' 'sc' 'sq' 'v8' 'vh' 'vk' 'wd' 'x7' 'y7' 'ym' 'yp' 'yr' 'yw'
- f        | 'ah' 'aw' 'e5' 'en' 'ew' 'fi' 'fm' 'gq' 'gt' 'hy' 'ib' 'ie' 'ir' 'j9' 'jr' 'js' 'ny' 'ob' 'or' 'ot' 'oy' 'pt' 'qi' 'rd' 'ri' 'rl' 'ro' 'rt' 'ss' 'tb' 'tg' 'th' 'vy' 'wq' 'wz' 'xt' 'y6' 'y8' 'zf' 'zh'
- f        | '43' '9w' 'ah' 'av' 'bl' 'dr' 'ef' 'es' 'fm' 'ft' 'gy' 'hg' 'hq' 'hy' 'iu' 'ix' 'j1' 'jn' 'lg' 'np' 'o9' 'op' 'ou' 'ox' 'qq' 'st' 'sw' 't8' 't9' 'vs' 'vw' 'wd' 'wx' 'wz' 'xr' 'xt' 'xv' 'y5' 'y8' 'yi' 'ze'
- f        | '5f' '5i' 'ak' 'cg' 'dh' 'di' 'dk' 'eq' 'f6' 'g1' 'g8' 'ie' 'md' 'o0' 'oj' 'oq' 'pt' 'q7' 'qb' 'qd' 'qe' 'qo' 'ro' 'ru' 'rv' 'rx' 'sp' 'sr' 'tf' 'tp' 'uh' 'ul' 'vs' 'xn' 'xw' 'y2' 'yh' 'yk' 'zg' 'zm' 'zq'
- f        | 'ab' 'ac' 'b9' 'br' 'c8' 'eh' 'en' 'eq' 'ev' 'ew' 'f6' 'gd' 'ik' 'j5' 'jm' 'kc' 'ke' 'ok' 'p6' 'pa' 'qv' 'ri' 'rm' 'ro' 'rp' 'rq' 'rx' 'rz' 'se' 'tb' 'td' 'ti' 'tj' 'tn' 'ul' 'wj' 'wp' 'ws' 'yh' 'zb' 'zc'
- f        | 'ak' 'at' 'cs' 'di' 'dt' 'ef' 'eq' 'f1' 'f8' 'fb' 'fh' 'fv' 'g4' 'hs' 'j2' 'jo' 'kq' 'lf' 'lq' 'no' 'oa' 'ot' 'q0' 'qh' 'qs' 'qw' 'se' 'so' 'sx' 't3' 'ul' 'un' 'uu' 'wn' 'ws' 'wx' 'y0' 'y3' 'yf' 'zb' 'zc'
- f        | 'bq' 'cc' 'cg' 'dc' 'fu' 'ho' 'ja' 'jt' 'km' 'lk' 'ln' 'o2' 'ob' 'ou' 'pd' 'ph' 'pn' 'pt' 'pz' 'q5' 'qa' 'ql' 'qq' 'qv' 'rk' 'rm' 'ry' 'sq' 'su' 'sx' 'uc' 'un' 'uo' 'ur' 'uy' 'w9' 'wj' 'wl' 'wm' 'yk' 'ym'
- f        | 'ca' 'cm' 'cr' 'eh' 'fd' 'fp' 'g8' 'ga' 'gh' 'h1' 'iu' 'je' 'jy' 'kh' 'lx' 'o4' 'oi' 'ov' 'ph' 'pm' 'qi' 'qv' 're' 'rg' 'rv' 'ry' 'si' 'sl' 'sv' 'sx' 'tq' 'tz' 'uh' 'uq' 'uy' 'wi' 'wo' 'y7' 'yc' 'yn' 'yy'
- f        | '1u' '5k' 'ax' 'az' 'c4' 'eo' 'fi' 'gq' 'hg' 'ho' 'is' 'jq' 'ki' 'oq' 'ov' 'p4' 'pl' 'po' 'qe' 'qf' 'qn' 'qy' 'r3' 'rm' 'sd' 'se' 'sz' 'tb' 'td' 'u4' 'u5' 'vl' 'vv' 'wb' 'we' 'wh' 'wz' 'y5' 'ye' 'yv' 'zh' 'zj'
- f        | '4r' 'ae' 'd9' 'da' 'ef' 'em' 'en' 'gi' 'h8' 'jq' 'kf' 'kh' 'kr' 'kv' 'li' 'lq' 'lr' 'm2' 'ny' 'po' 'q0' 'q8' 'qf' 'qg' 'qu' 'qw' 'qx' 'rd' 'rh' 'ry' 'sm' 'st' 't3' 'tc' 'u5' 'un' 'uw' 'wg' 'wt' 'yt' 'z9' 'zc'
- f        | '4t' 'ay' 'b3' 'dz' 'eo' 'ep' 'fd' 'fh' 'ht' 'hw' 'i3' 'jl' 'kn' 'op' 'qb' 'qd' 'ql' 'qm' 'qp' 'qy' 'rc' 'rh' 'rs' 'rw' 'sm' 't9' 'td' 'tu' 'tw' 'tz' 'u1' 'ug' 'uh' 'ur' 'vt' 'we' 'wi' 'wn' 'x7' 'y8' 'yn' 'yy'
- f        | '5z' 'ai' 'al' 'ax' 'cd' 'dr' 'e1' 'ep' 'fi' 'gh' 'gk' 'ha' 'hc' 'ht' 'i5' 'ic' 'id' 'iq' 'iz' 'kk' 'kt' 'ld' 'mi' 'oh' 'ov' 'pn' 'q2' 'q7' 'qm' 'qy' 'ri' 'ru' 'rv' 'sq' 'u8' 'u9' 'un' 'wq' 'wt' 'yd' 'yk' 'ys'
- f        | 'ar' 'c3' 'c6' 'e0' 'e9' 'ed' 'ex' 'fh' 'fi' 'gu' 'ha' 'hr' 'id' 'jr' 'kk' 'kr' 'kz' 'm0' 'mp' 'ng' 'om' 'pa' 'qa' 'qf' 'rj' 'sp' 'to' 'tu' 'ty' 'ub' 'ud' 'ug' 'uk' 'vj' 'vp' 'wf' 'wl' 'wu' 'x6' 'xs' 'y0' 'ya'
- f        | 'bt' 'dg' 'dz' 'e4' 'ek' 'ep' 'fi' 'gk' 'gl' 'gu' 'hl' 'ho' 'io' 'ls' 'ni' 'nw' 'pv' 'px' 'qe' 'qf' 'qj' 'ql' 'qu' 'qy' 'rw' 'rx' 'ss' 't7' 'tt' 'ty' 'ud' 'up' 'uq' 'uw' 'wn' 'wy' 'xt' 'yv' 'yx' 'za' 'zv' 'zw'
- f        | '2o' '6t' 'a7' 'bv' 'di' 'dm' 'ea' 'eo' 'fd' 'fj' 'ft' 'fw' 'gs' 'hu' 'hz' 'ik' 'it' 'jc' 'js' 'jx' 'jz' 'k4' 'lp' 'lx' 'ol' 'p3' 'pf' 'q9' 'qu' 'qv' 'qx' 're' 'rl' 'ro' 'sb' 'ur' 'vf' 'wd' 'wk' 'wo' 'wx' 'yp' 'zo'
- f        | '5y' 'av' 'ax' 'cl' 'cw' 'dh' 'di' 'g7' 'ga' 'gi' 'gx' 'gy' 'i0' 'iu' 'iv' 'jk' 'jv' 'k3' 'l2' 'lo' 'lq' 'mj' 'oj' 'pd' 'pn' 'pv' 'q6' 'qq' 'qv' 'sc' 'tt' 'tv' 'ug' 'ut' 've' 'vy' 'wi' 'xg' 'xo' 'yi' 'yl' 'yv' 'zm'
- f        | 'ab' 'av' 'c9' 'cs' 'cx' 'dy' 'e4' 'eb' 'ej' 'er' 'ez' 'f0' 'f2' 'ft' 'gk' 'h5' 'i5' 'ic' 'ig' 'io' 'ki' 'kz' 'lj' 'mm' 'of' 'og' 'ov' 'oz' 'p4' 'pl' 'qh' 'qx' 'rw' 's1' 'sf' 'tw' 'uc' 'ui' 'uo' 'uw' 'x4' 'xk' 'ze'
- f        | 'ac' 'bv' 'd2' 'de' 'e8' 'ea' 'go' 'gw' 'h4' 'ht' 'iy' 'jm' 'ot' 'pp' 'pw' 'pz' 'qd' 'qn' 'qu' 'qy' 'r1' 'ra' 'rg' 'rh' 'rp' 's0' 'sb' 'sn' 'st' 'td' 'uz' 'vg' 'w1' 'w6' 'wa' 'wc' 'we' 'wi' 'wj' 'wu' 'ww' 'y9' 'zr'
- f        | 'ak' 'bg' 'bj' 'bn' 'co' 'e6' 'e7' 'ec' 'ek' 'el' 'ew' 'ez' 'fo' 'im' 'jm' 'js' 'lc' 'lh' 'ob' 'oi' 'os' 'ot' 'ou' 'p0' 'pu' 'q0' 'qh' 'ra' 'rc' 'rm' 'rr' 'sd' 'sq' 'tc' 'tl' 'wj' 'wy' 'x2' 'xw' 'y6' 'yp' 'yv' 'zj'
- f        | 'ao' 'ei' 'ep' 'fc' 'fm' 'gr' 'ha' 'he' 'i5' 'ia' 'if' 'kh' 'lv' 'ml' 'ms' 'n9' 'nh' 'nl' 'oe' 'of' 'ow' 'pb' 'pu' 'pw' 'q0' 'qr' 'qt' 'qu' 'qv' 'qw' 'ra' 'sv' 'ti' 'u0' 'u4' 'ug' 'uq' 'vx' 'w1' 'wy' 'x1' 'xh' 'xz'
- f        | 'cr' 'd3' 'e5' 'ei' 'fb' 'gd' 'gx' 'hm' 'it' 'jp' 'ku' 'lf' 'lh' 'lp' 'ma' 'md' 'nt' 'o9' 'ot' 'pk' 'pm' 'ps' 'qc' 'qi' 'qp' 'qt' 'ra' 'rk' 'rq' 'rt' 'tb' 'tc' 'tg' 'to' 'u8' 'vg' 'vj' 'vt' 'w0' 'wr' 'wx' 'yd' 'zx'
- f        | '3p' '5x' 'ag' 'au' 'aw' 'dl' 'eg' 'f2' 'f8' 'fb' 'fn' 'g9' 'ge' 'gt' 'hd' 'i7' 'ia' 'ij' 'is' 'jc' 'ku' 'kx' 'l7' 'lb' 'lq' 'mc' 'o3' 'oj' 'q1' 'qa' 'qg' 'qt' 'r9' 'rg' 'tw' 'tz' 'u6' 'us' 'w2' 'wr' 'wt' 'wu' 'x3' 'xx'
- f        | 'aa' 'al' 'ay' 'c1' 'ca' 'de' 'ea' 'ee' 'eq' 'er' 'ez' 'fc' 'gy' 'i1' 'jb' 'jn' 'jz' 'lp' 'o5' 'om' 'os' 'ou' 'ox' 'px' 'q3' 'qc' 'qs' 'rm' 'rq' 'rt' 'rx' 'ry' 'rz' 'ss' 'ta' 'tg' 'ti' 'tr' 'u6' 'uv' 'vp' 'wn' 'wu' 'zt'
- f        | 'ak' 'bg' 'bk' 'du' 'eb' 'ef' 'el' 'ft' 'gb' 'gc' 'hc' 'ho' 'i6' 'iv' 'ji' 'ke' 'mo' 'oc' 'oh' 'pe' 'pj' 'q6' 'qe' 'qg' 'qs' 'qv' 'r1' 'rr' 'rx' 'tc' 'te' 'tf' 'tk' 'tq' 'ua' 'uq' 'ur' 'wq' 'wx' 'wz' 'xi' 'xq' 'yk' 'yo'
- f        | 'al' 'ar' 'cl' 'dl' 'dz' 'ej' 'fj' 'gu' 'i2' 'i6' 'ih' 'jx' 'k9' 'ln' 'ls' 'mf' 'mx' 'oi' 'om' 'pn' 'q4' 'qd' 'qe' 'qg' 'qk' 'qp' 'qr' 'qw' 'qx' 'rr' 'sd' 'sf' 'ub' 'uh' 'um' 'uu' 'vg' 'w6' 'wj' 'wp' 'ws' 'yn' 'zc' 'zm'
- f        | 'am' 'aw' 'ay' 'bj' 'df' 'eb' 'eo' 'eq' 'et' 'ey' 'f9' 'fo' 'g0' 'gg' 'h4' 'hq' 'in' 'k4' 'k7' 'kb' 'kl' 'my' 'nt' 'o3' 'og' 'pc' 'q4' 'qg' 'qi' 'qm' 'qy' 'ri' 'rv' 's9' 'sv' 'tl' 'ue' 'uo' 'v6' 'wb' 'wt' 'wx' 'xi' 'xu'
- f        | 'bs' 'cd' 'ci' 'cq' 'dd' 'el' 'ev' 'f4' 'f6' 'f7' 'fh' 'fu' 'hi' 'ib' 'kp' 'nn' 'nu' 'oc' 'os' 'qc' 'qj' 'qm' 'qn' 'qu' 'qw' 'qx' 'r7' 'rc' 'rv' 't1' 'tl' 'tr' 'u0' 'vi' 'wl' 'wp' 'wu' 'xc' 'y2' 'yu' 'zc' 'zi' 'zw' 'zy'
- f        | 'bt' 'c9' 'db' 'dy' 'ee' 'ej' 'eo' 'et' 'fr' 'gm' 'hz' 'ic' 'ik' 'is' 'jk' 'ls' 'lt' 'oj' 'or' 'ox' 'p8' 'pl' 'pz' 'q1' 'qq' 'qt' 'rw' 's7' 't4' 't8' 'to' 'tp' 'u7' 'ub' 'vx' 'w4' 'ws' 'wt' 'wv' 'x8' 'xs' 'xt' 'yg' 'yo'
- f        | 'cm' 'd2' 'en' 'ex' 'f4' 'f9' 'fp' 'ga' 'gk' 'hy' 'i3' 'j4' 'j9' 'jb' 'kj' 'ls' 'lw' 'mb' 'mq' 'o9' 'qg' 'qi' 'qm' 'qo' 'qw' 'qy' 'rc' 'rf' 'rj' 'rm' 's8' 'tb' 'tl' 'tp' 'um' 'vg' 'vn' 'wb' 'wf' 'wl' 'xw' 'yl' 'zf' 'zt'
- f        | '28' 'b1' 'bj' 'bm' 'cz' 'dd' 'ds' 'ed' 'em' 'hh' 'hr' 'ie' 'ii' 'im' 'io' 'jn' 'jw' 'lg' 'lo' 'm6' 'mn' 'mw' 'ny' 'o6' 'p7' 'q4' 'qd' 'qf' 'qn' 'qq' 'qt' 'r1' 'r2' 'rn' 'rt' 'sh' 'ur' 'uv' 'ux' 'vc' 'wb' 'wn' 'xh' 'xx' 'yw'
- f        | '2e' 'al' 'am' 'bt' 'eo' 'ff' 'fl' 'ge' 'gz' 'h0' 'hb' 'i0' 'j2' 'lh' 'lm' 'ls' 'mg' 'mw' 'on' 'ox' 'pa' 'pb' 'pg' 'q3' 'q6' 'qe' 'ra' 're' 'rm' 'rr' 'rt' 'ry' 'sc' 'sm' 't9' 'tu' 'tx' 'ul' 'ux' 'vh' 'wn' 'wt' 'wv' 'ys' 'yw'
- f        | '3d' 'at' 'aw' 'bt' 'by' 'cg' 'dk' 'do' 'ec' 'eu' 'gv' 'is' 'k9' 'kb' 'kc' 'me' 'mm' 'o5' 'oe' 'pr' 'qa' 'qn' 'rc' 'rl' 'rn' 'rw' 'sc' 'sk' 'st' 't1' 't7' 'td' 'to' 'ue' 'up' 'ur' 'uy' 've' 'wi' 'xf' 'xu' 'yf' 'z9' 'zo' 'zr'
- f        | '40' '6a' '8j' 'am' 'bf' 'dp' 'dz' 'ew' 'gh' 'he' 'hh' 'ib' 'ii' 'iq' 'is' 'iu' 'kt' 'mf' 'oh' 'or' 'p8' 'pa' 'pb' 'pi' 'qc' 'qo' 'qp' 'qq' 'qs' 'qt' 'qu' 'r4' 'rf' 'rl' 'sd' 'sl' 't4' 'tb' 'ua' 'ue' 'ut' 'wh' 'wm' 'y0' 'y6'
- f        | 'a0' 'a6' 'aa' 'bk' 'dk' 'dv' 'e8' 'ff' 'fo' 'go' 'hh' 'hl' 'hu' 'if' 'jx' 'kc' 'kq' 'lr' 'lx' 'n6' 'ni' 'ob' 'ol' 'ql' 'rf' 'ry' 'sm' 'sn' 't7' 'tu' 'tz' 'uc' 'um' 'uv' 'wf' 'wr' 'ws' 'wu' 'ww' 'xi' 'ym' 'z7' 'zo' 'zv' 'zz'
- f        | 'as' 'dj' 'dq' 'e3' 'ej' 'es' 'fn' 'fp' 'fu' 'ga' 'hb' 'hy' 'jz' 'l6' 'mp' 'ps' 'q4' 'qd' 'qm' 'qw' 'qy' 'qz' 'sa' 'sv' 'td' 'tn' 'tu' 'tx' 'ud' 'ue' 'uq' 'uv' 'v0' 'wi' 'wk' 'wm' 'wx' 'xh' 'y3' 'yd' 'yi' 'yn' 'yx' 'yy' 'zc'
- f        | 'cx' 'dg' 'do' 'dt' 'e7' 'ek' 'ez' 'fn' 'hj' 'hv' 'i2' 'i6' 'is' 'it' 'ka' 'kh' 'l5' 'lg' 'p5' 'qa' 'qf' 'qj' 'qw' 'qz' 'rl' 'sl' 'sr' 't7' 'tf' 'tu' 'uc' 'ud' 'uv' 'vr' 'w0' 'we' 'wf' 'wj' 'ws' 'ww' 'xe' 'xh' 'xn' 'y9' 'yv'
- f        | '2a' '4s' 'c4' 'cd' 'dh' 'dv' 'eh' 'ek' 'ew' 'ex' 'ez' 'fm' 'hh' 'hj' 'ig' 'jf' 'ld' 'ly' 'mg' 'mx' 'o5' 'or' 'pa' 'pv' 'q1' 'qe' 'qj' 'qq' 'qr' 'qw' 'rb' 'rr' 's4' 's9' 'tm' 'uj' 'wc' 'wv' 'x0' 'xt' 'yc' 'ye' 'yh' 'yi' 'yk' 'yy'
- f        | 'a2' 'a9' 'ac' 'bw' 'cu' 'dm' 'e8' 'ee' 'ej' 'ep' 'f7' 'fh' 'ga' 'go' 'im' 'it' 'jv' 'kg' 'lb' 'ml' 'oi' 'p5' 'p9' 'pe' 'pf' 'pp' 'qk' 'rg' 'rh' 'sn' 'sv' 't5' 'tj' 'tk' 'tq' 'ty' 'v6' 'vk' 'w2' 'w5' 'wh' 'wy' 'y7' 'yf' 'zq' 'zt'
- f        | 'aa' 'am' 'av' 'dt' 'du' 'eh' 'em' 'ev' 'ex' 'gu' 'h0' 'i4' 'i8' 'ku' 'la' 'lo' 'lw' 'n0' 'n9' 'on' 'pc' 'pl' 'pn' 'pr' 'q8' 'qc' 'ql' 'qn' 'qz' 'ra' 'rd' 'ry' 'sp' 'tn' 'ts' 'u4' 'vg' 'vs' 'w7' 'wj' 'wm' 'xl' 'yg' 'yh' 'z0' 'zs'
- f        | 'ak' 'ar' 'cm' 'cq' 'da' 'df' 'e3' 'ew' 'fe' 'fr' 'gm' 'id' 'io' 'iy' 'jg' 'jt' 'jx' 'kb' 'lf' 'nv' 'od' 'qy' 'r3' 'r4' 'ro' 'rq' 'rw' 'sl' 'ss' 'su' 'sw' 't7' 'th' 'ti' 'tp' 'u9' 'uq' 'v9' 'vq' 'vw' 'we' 'wg' 'wk' 'ws' 'xr' 'yf'
- f        | 'bv' 'cv' 'dy' 'ec' 'ef' 'eg' 'eh' 'eu' 'ew' 'fc' 'fn' 'fs' 'g9' 'hj' 'hk' 'i3' 'iu' 'ja' 'k6' 'l1' 'la' 'nl' 'oh' 'oi' 'oy' 'pc' 'qe' 'ql' 'qq' 'qs' 'qu' 're' 'sf' 'sq' 'tb' 'up' 'w1' 'w2' 'wg' 'wi' 'xd' 'xt' 'xv' 'yf' 'zn' 'zz'
- f        | '3y' 'ak' 'am' 'b8' 'cp' 'd7' 'df' 'di' 'eg' 'em' 'en' 'eo' 'es' 'f6' 'fc' 'gg' 'gt' 'gv' 'hd' 'i3' 'jk' 'k6' 'la' 'lc' 'ol' 'ov' 'ow' 'p5' 'pl' 'qc' 'qf' 'rl' 'rn' 'rt' 'rx' 't1' 'tf' 'tj' 'tz' 'ug' 'uo' 'we' 'wg' 'wk' 'wp' 'wv' 'y7'
- f        | '5g' 'a5' 'dj' 'dl' 'dr' 'e9' 'ed' 'ep' 'er' 'gb' 'hh' 'hl' 'i0' 'if' 'ig' 'io' 'it' 'k2' 'ki' 'll' 'o9' 'om' 'ot' 'p5' 'q1' 'q6' 'qa' 'qp' 'qw' 'qy' 'r9' 'rb' 'rm' 'ry' 's7' 'tl' 'ts' 'ut' 'w0' 'wd' 'wu' 'wv' 'xk' 'ya' 'z5' 'zq' 'zs'
- f        | '5l' 'a2' 'ak' 'au' 'cj' 'cx' 'ed' 'eg' 'ej' 'em' 'es' 'ex' 'fs' 'ft' 'hm' 'i9' 'ky' 'l3' 'lz' 'mi' 'o2' 'oc' 'oe' 'ok' 'p2' 'q1' 'q5' 'qo' 'qv' 'qw' 'rf' 'rm' 'rv' 'sc' 'si' 'tx' 'uq' 'v3' 'v4' 'vo' 'w4' 'wf' 'wl' 'wq' 'wt' 'xj' 'yr'
- f        | 'al' 'ar' 'av' 'bg' 'bh' 'bz' 'e9' 'ed' 'ee' 'ef' 'eh' 'es' 'fl' 'fz' 'gl' 'h1' 'he' 'hf' 'hv' 'hw' 'i1' 'jg' 'kj' 'kn' 'kz' 'lr' 'pp' 'q1' 'qa' 'qf' 'qt' 'qz' 'rg' 'rj' 's5' 'sv' 'sx' 't4' 'th' 'tn' 'ur' 'wz' 'xp' 'yg' 'ym' 'yr' 'ze'
- f        | 'az' 'cx' 'dm' 'do' 'dq' 'e2' 'e5' 'e8' 'eb' 'fh' 'fj' 'fq' 'gj' 'gl' 'hq' 'im' 'iq' 'iz' 'jn' 'ku' 'l1' 'mz' 'nt' 'o6' 'q1' 'qn' 'qo' 'qz' 'r4' 'rh' 'rn' 'rw' 'sn' 'sv' 't7' 'ud' 'ue' 'ur' 'uv' 'w9' 'wh' 'wk' 'wy' 'xq' 'yh' 'zs' 'zw'
- f        | '18' 'bf' 'bj' 'cs' 'dw' 'el' 'ep' 'ez' 'fr' 'g1' 'gv' 'hu' 'hz' 'ii' 'jc' 'je' 'jj' 'jo' 'jv' 'n5' 'ni' 'ns' 'oh' 'oi' 'ov' 'pe' 'q8' 'qg' 'qi' 'qr' 'r6' 'rh' 's3' 'sj' 'sr' 't0' 'ta' 'u2' 'uj' 'ur' 'vu' 'wb' 'wh' 'wx' 'yn' 'yq' 'zg' 'zr'
- f        | '2s' 'a5' 'aw' 'b5' 'b7' 'ce' 'cq' 'dc' 'dp' 'eb' 'eq' 'ez' 'ff' 'gg' 'gy' 'iw' 'jd' 'jl' 'kw' 'ky' 'mt' 'ng' 'o9' 'od' 'oe' 'po' 'pp' 'qa' 'qe' 'qk' 'ql' 'qp' 'r4' 'r9' 'rb' 'si' 'sl' 'sn' 'sq' 'tg' 'ti' 'tx' 'uh' 'ws' 'xf' 'yv' 'z1' 'zm'
- f        | '4j' 'bi' 'bk' 'c0' 'c5' 'dh' 'dy' 'e8' 'fw' 'g3' 'g8' 'h6' 'hd' 'hn' 'jl' 'kc' 'kj' 'km' 'll' 'lo' 'nh' 'nj' 'nt' 'ob' 'on' 'oq' 'or' 'ox' 'ph' 'qc' 'qj' 'ql' 'qm' 'qo' 'qu' 'qz' 'sr' 't7' 'tc' 'ug' 'uq' 'wn' 'wr' 'ws' 'yv' 'z3' 'zj' 'zz'
- f        | '6w' 'af' 'ak' 'b7' 'bf' 'bi' 'bv' 'cx' 'dy' 'es' 'ey' 'ez' 'f0' 'fe' 'fw' 'ge' 'gt' 'iw' 'j9' 'jh' 'kh' 'l0' 'l1' 'l8' 'm5' 'nv' 'o6' 'pw' 'qi' 'r0' 'se' 'ta' 'tf' 'th' 'to' 'u8' 'ux' 'vm' 'w4' 'w6' 'wa' 'wt' 'wu' 'xo' 'xu' 'yo' 'z0' 'zc'
- f        | 'au' 'bl' 'c4' 'd7' 'dc' 'dm' 'ea' 'eo' 'ft' 'gb' 'h3' 'ia' 'ix' 'jr' 'kc' 'ke' 'lq' 'lr' 'mn' 'op' 'pj' 'qc' 'qj' 'qn' 'qq' 'qx' 'r8' 'rb' 'ri' 'rm' 'rn' 'rx' 't6' 'tf' 'tv' 'um' 'vg' 'vi' 'we' 'wp' 'wz' 'x6' 'xb' 'xd' 'xg' 'xv' 'yx' 'yz'
- f        | '7r' 'a8' 'aa' 'ag' 'bo' 'bp' 'c7' 'd0' 'd6' 'e5' 'er' 'fc' 'ff' 'go' 'ha' 'hs' 'jj' 'jq' 'ki' 'lc' 'le' 'no' 'pf' 'qc' 'qh' 'qq' 'qs' 'qv' 'rf' 'rj' 'rx' 'su' 'ta' 'ti' 'tu' 'tv' 'ty' 'ug' 'un' 'up' 'vb' 'vi' 'wp' 'wu' 'wz' 'xt' 'y0' 'yd' 'yu'
- f        | 'at' 'b7' 'be' 'c3' 'cc' 'cd' 'cj' 'e8' 'eb' 'ei' 'fd' 'g8' 'gh' 'go' 'gv' 'if' 'ih' 'j7' 'jy' 'kj' 'lh' 'mc' 'oe' 'og' 'oy' 'oz' 'pm' 'qd' 'qe' 'qo' 'rg' 'rq' 'rx' 'se' 'su' 't3' 't6' 't9' 'u5' 'us' 'vw' 'w4' 'wb' 'wg' 'ws' 'xw' 'yu' 'yx' 'zj'
- f        | '18' 'a6' 'af' 'ax' 'du' 'dy' 'e7' 'ei' 'ej' 'es' 'eu' 'fj' 'gt' 'hn' 'hu' 'ky' 'le' 'lo' 'm8' 'nb' 'of' 'oj' 'ok' 'op' 'oz' 'pw' 'q7' 'qi' 'qu' 'r4' 'rp' 's7' 'sk' 'tb' 'tf' 'tp' 'ua' 'um' 'up' 'ur' 'uz' 'w4' 'wc' 'wn' 'wv' 'wx' 'wy' 'yc' 'yq' 'yx'
- f        | '82' 'a2' 'ad' 'dp' 'el' 'ep' 'fk' 'gd' 'hj' 'ij' 'lc' 'lm' 'lv' 'ml' 'n2' 'n6' 'o1' 'oi' 'on' 'oo' 'ow' 'pb' 'pe' 'pq' 'q6' 'qi' 'qo' 'qp' 'qw' 'rs' 'rv' 's6' 'sa' 'sk' 't8' 'tl' 'tt' 'tx' 'ub' 'ue' 'uf' 'uj' 'va' 'wl' 'xv' 'y1' 'ye' 'ym' 'yw' 'zm'
- f        | 'a3' 'b9' 'c0' 'cg' 'ct' 'cu' 'dy' 'eh' 'el' 'ge' 'gt' 'hh' 'hu' 'if' 'j5' 'kq' 'lb' 'mh' 'o3' 'o6' 'oe' 'oi' 'ow' 'p5' 'ph' 'pw' 'q0' 'qh' 'ql' 'qy' 'r7' 'si' 'sk' 'sv' 'tf' 'tm' 'to' 'tt' 'ty' 'u3' 'uj' 'uo' 'vi' 'vl' 'wc' 'wf' 'xx' 'y0' 'ya' 'yu'
- f        | 'ad' 'am' 'av' 'ax' 'dl' 'dt' 'dw' 'ej' 'ez' 'f6' 'fe' 'g5' 'ga' 'gv' 'hr' 'hx' 'id' 'ie' 'ii' 'im' 'ix' 'jd' 'kn' 'ml' 'nu' 'ol' 'oo' 'pu' 'qd' 'qm' 'qt' 'r5' 'rb' 'rd' 'rg' 'ru' 'sg' 'ub' 'uk' 'vm' 'wl' 'wr' 'wz' 'x4' 'yf' 'yu' 'yv' 'yw' 'yx' 'zt'
- f        | 'bw' 'ci' 'cp' 'cu' 'cw' 'd7' 'e0' 'e3' 'em' 'ev' 'fi' 'fk' 'fm' 'fu' 'ht' 'ix' 'jn' 'kc' 'kw' 'lm' 'mo' 'n8' 'od' 'oo' 'q1' 'qd' 'qw' 'rs' 'sd' 'su' 'sz' 'th' 'ti' 'ts' 'tw' 'ty' 'u3' 'ua' 'wa' 'wt' 'wy' 'xg' 'xh' 'xp' 'xr' 'yd' 'yj' 'yq' 'yx' 'zu'
- f        | '1d' 'a4' 'ai' 'av' 'b9' 'be' 'c9' 'cc' 'cy' 'de' 'ee' 'g8' 'gg' 'gl' 'gs' 'gu' 'hb' 'kl' 'kr' 'ky' 'mi' 'mz' 'nd' 'og' 'op' 'pr' 'q0' 'q5' 'qk' 'qy' 'r4' 'sk' 'sz' 't1' 't8' 'td' 'tn' 'tx' 'ty' 'tz' 'uc' 'up' 'vq' 'wa' 'ws' 'wv' 'x3' 'yn' 'yq' 'yy' 'zm'
- f        | '1u' 'ad' 'al' 'c4' 'cz' 'db' 'dk' 'dr' 'e5' 'e7' 'ea' 'f6' 'fk' 'fw' 'g3' 'gl' 'gt' 'gu' 'ha' 'hk' 'hv' 'ie' 'ka' 'kq' 'ks' 'lr' 'nf' 'pk' 'q3' 'q8' 'qf' 'qj' 'qo' 'rp' 'rr' 'rz' 'ss' 'sv' 'sx' 'tb' 'th' 'tt' 'ur' 'vp' 'wj' 'ws' 'wt' 'xk' 'xo' 'ym' 'yz'
- f        | '3f' '93' 'am' 'an' 'at' 'bj' 'bm' 'bw' 'c6' 'eb' 'ef' 'em' 'eq' 'es' 'g9' 'hc' 'hl' 'hm' 'kg' 'kt' 'mg' 'nq' 'op' 'ox' 'pc' 'py' 'qd' 'qn' 'qz' 'rb' 'rw' 's6' 'se' 'sr' 'sy' 'ts' 'u4' 'ud' 'un' 'w3' 'w8' 'wb' 'wf' 'wg' 'wy' 'x1' 'xl' 'xy' 'yk' 'yo' 'zp'
- f        | 'a6' 'ad' 'aj' 'b1' 'bz' 'cd' 'df' 'ed' 'eg' 'eh' 'ev' 'fi' 'fo' 'gj' 'h3' 'he' 'ib' 'j0' 'jc' 'jz' 'kz' 'lc' 'mh' 'pk' 'pu' 'q4' 'qc' 'qk' 'qr' 'qw' 'rc' 'rl' 'ro' 'rr' 'so' 'sw' 'td' 'tw' 'tx' 'ue' 'us' 'ut' 'vd' 'wi' 'wu' 'xm' 'y2' 'y8' 'ym' 'z6' 'zm'
- f        | '2e' '3y' 'ap' 'as' 'bl' 'di' 'dl' 'e9' 'eh' 'er' 'ff' 'fg' 'fh' 'gc' 'gg' 'hp' 'hq' 'i3' 'ih' 'jm' 'kw' 'lc' 'li' 'ls' 'nm' 'ok' 'pc' 'pn' 'q1' 'qf' 'qi' 'qk' 'r0' 'rl' 'sp' 'sy' 'sz' 'ta' 'to' 'ts' 'tv' 'uh' 'uk' 'vb' 'wa' 'wg' 'wi' 'wp' 'yl' 'yq' 'yw' 'yy'
- f        | '2h' '9y' 'ac' 'at' 'cf' 'e3' 'e6' 'ec' 'ek' 'en' 'f1' 'fa' 'fn' 'gm' 'gx' 'hk' 'i7' 'id' 'iw' 'ke' 'kl' 'ks' 'l6' 'l8' 'ls' 'lx' 'me' 'o4' 'oi' 'oj' 'ox' 'pn' 'qa' 'qh' 'qk' 'ql' 'rp' 'tb' 'te' 'tn' 'ts' 'u4' 'u9' 'ud' 'vj' 'vz' 'wc' 'wr' 'ye' 'yk' 'yq' 'zq'
- f        | '4j' 'af' 'ap' 'bn' 'ch' 'dc' 'df' 'e0' 'ef' 'eg' 'er' 'g3' 'hh' 'hi' 'hw' 'i1' 'if' 'ii' 'in' 'iy' 'l1' 'mx' 'og' 'px' 'q3' 'qc' 'qg' 'qt' 'qy' 'r3' 'r6' 'rd' 'rj' 'rz' 'sm' 't2' 't4' 'td' 'tj' 'tm' 'tx' 'ty' 'u9' 'uo' 'up' 'v8' 'wv' 'ye' 'zb' 'zc' 'zi' 'zy'
- f        | 'a0' 'ai' 'bx' 'ca' 'e2' 'eb' 'ed' 'eg' 'eh' 'eo' 'et' 'hn' 'ix' 'jh' 'ki' 'lm' 'lw' 'm8' 'mb' 'mh' 'mk' 'nc' 'o3' 'o9' 'of' 'qc' 'qe' 'qf' 'qh' 'qi' 'qq' 'qr' 'qz' 'r2' 'r3' 'rc' 'rh' 'rs' 'rv' 'sr' 'uk' 'up' 'ur' 'uv' 'wm' 'wr' 'wz' 'xd' 'y3' 'ya' 'yv' 'zr'
- f        | 'ab' 'ae' 'al' 'am' 'an' 'ap' 'be' 'd2' 'eb' 'ec' 'ep' 'eq' 'fn' 'hp' 'hx' 'i9' 'ie' 'jn' 'kh' 'kv' 'mi' 'mq' 'mv' 'ox' 'oz' 'pn' 'qk' 'qo' 'qr' 'r8' 're' 'rf' 'rp' 't8' 'uj' 'uk' 'up' 'ur' 'vo' 'w7' 'wf' 'wp' 'ws' 'wt' 'ww' 'wx' 'xw' 'yd' 'yj' 'yn' 'yv' 'zr'
- f        | 'ax' 'ch' 'de' 'dl' 'e1' 'el' 'fl' 'fo' 'fp' 'fx' 'gb' 'gj' 'gx' 'hg' 'ho' 'hs' 'ip' 'jr' 'kg' 'l6' 'li' 'ln' 'mg' 'mm' 'mo' 'o2' 'os' 'pm' 'q2' 'q6' 'qr' 're' 'ro' 'rr' 'rt' 'rw' 'rx' 'sk' 'tl' 'to' 'tr' 'tt' 'u3' 'u6' 'vo' 'w4' 'w5' 'wb' 'wo' 'wt' 'yi' 'zh'
- f        | 'bl' 'bn' 'cy' 'ea' 'ed' 'ef' 'ei' 'em' 'er' 'es' 'fp' 'gb' 'hi' 'hp' 'if' 'io' 'ir' 'kw' 'lg' 'lo' 'ls' 'n8' 'nj' 'np' 'oa' 'of' 'oi' 'p6' 'pw' 'q3' 'q4' 'q8' 'qf' 'qh' 'qo' 'qw' 'rg' 'rt' 'sy' 't3' 'u8' 'ug' 'uo' 'uv' 'w6' 'we' 'wg' 'wl' 'wy' 'x9' 'yy' 'yz'
- f        | '16' '64' 'aj' 'aw' 'bf' 'c0' 'ca' 'd2' 'd6' 'ec' 'ed' 'eq' 'ew' 'go' 'h2' 'in' 'is' 'j0' 'jd' 'ji' 'kv' 'l5' 'lp' 'lz' 'og' 'pb' 'pw' 'q9' 'qb' 'qe' 'qf' 'qg' 'qn' 'qp' 'qt' 'qy' 'r7' 'rh' 'rw' 'sz' 't8' 'tb' 'te' 'tx' 'ui' 'un' 'uq' 'wa' 'wp' 'wu' 'wy' 'yn' 'ys'
- f        | '1m' '1s' 'aa' 'b0' 'be' 'cb' 'dc' 'dd' 'dh' 'eq' 'fa' 'ib' 'if' 'ik' 'it' 'jr' 'jz' 'ka' 'lq' 'lu' 'm2' 'o2' 'ob' 'oc' 'of' 'om' 'oz' 'pv' 'q4' 'qb' 'qk' 'qn' 'qs' 'qu' 'r3' 'r9' 'rs' 'rw' 'sg' 'si' 'sv' 't9' 'tw' 'vq' 'vy' 'w2' 'w6' 'w9' 'y0' 'y1' 'ye' 'yq' 'z1'
- f        | '1o' 'a0' 'aa' 'bd' 'bj' 'ch' 'cm' 'dj' 'e2' 'eq' 'eu' 'fj' 'fo' 'g9' 'go' 'hi' 'ia' 'ix' 'jh' 'jl' 'jy' 'lh' 'nd' 'nw' 'ox' 'p3' 'pi' 'pm' 'pt' 'q3' 'qh' 'qn' 'ra' 'ri' 'rr' 'ru' 'rv' 't3' 'tm' 'u3' 'ue' 'us' 'uz' 'vn' 'w1' 'wl' 'wo' 'wx' 'xj' 'xn' 'yc' 'yp' 'zr'
- f        | '3b' 'am' 'aq' 'ar' 'bm' 'de' 'e7' 'ed' 'eh' 'es' 'ey' 'fx' 'g5' 'gf' 'gs' 'hl' 'i7' 'iy' 'jn' 'k9' 'kf' 'km' 'll' 'ly' 'm0' 'm5' 'mh' 'nm' 'nq' 'of' 'or' 'p5' 'pn' 'pz' 'qp' 'qt' 'qv' 'r0' 'rb' 'sg' 'sv' 'uv' 'w3' 'w8' 'w9' 'wa' 'we' 'wj' 'wn' 'wr' 'yd' 'yk' 'zq'
- f        | '4t' 'a3' 'ac' 'au' 'bp' 'br' 'e5' 'ei' 'ek' 'ez' 'fz' 'g5' 'gn' 'ik' 'k9' 'kb' 'kc' 'lm' 'ls' 'ly' 'mj' 'mx' 'nk' 'nr' 'ny' 'o2' 'o8' 'pb' 'pu' 'q2' 'qa' 'qc' 'qh' 'qi' 'qs' 'qx' 'qz' 'rv' 'rx' 'tc' 'tk' 'tv' 'u8' 'ui' 'uz' 'vo' 'w2' 'wm' 'wp' 'xt' 'yf' 'yv' 'zl'
- f        | 'aa' 'ab' 'ag' 'ar' 'az' 'bp' 'bx' 'cx' 'eb' 'eh' 'ek' 'eo' 'eq' 'ez' 'fl' 'gm' 'gw' 'hd' 'ib' 'ig' 'jz' 'kg' 'lf' 'nw' 'oh' 'ok' 'om' 'oy' 'pg' 'ph' 'pi' 'qb' 'qi' 'qn' 'qs' 'qt' 'qy' 'rl' 'sy' 'tc' 'tt' 'up' 'ur' 'uy' 'w6' 'w8' 'wb' 'wh' 'wv' 'ww' 'y5' 'yi' 'yp'
- f        | 'aa' 'af' 'ah' 'am' 'as' 'cd' 'ch' 'dd' 'dg' 'dr' 'e2' 'eb' 'eq' 'er' 'fb' 'fj' 'fk' 'fn' 'fx' 'gk' 'gs' 'h8' 'hg' 'hj' 'ia' 'ij' 'in' 'jw' 'l9' 'lj' 'lw' 'nk' 'nt' 'o1' 'ob' 'oo' 'p5' 'pd' 'pk' 'qq' 'sb' 'sd' 'sg' 'u4' 'wl' 'wq' 'wr' 'wu' 'xc' 'xj' 'xt' 'yq' 'zl'
- f        | 'ad' 'ao' 'au' 'az' 'ci' 'dj' 'dv' 'e1' 'ei' 'ej' 'em' 'eq' 'fa' 'fi' 'fj' 'fn' 'fw' 'he' 'i8' 'in' 'io' 'jd' 'jt' 'jv' 'lr' 'mt' 'mx' 'ns' 'nt' 'oc' 'oe' 'oi' 'pz' 'qe' 'ql' 'qt' 'qy' 'rq' 'sc' 'sp' 'te' 'um' 'wo' 'wv' 'x6' 'xu' 'yf' 'yi' 'yo' 'yv' 'yw' 'yz' 'zg'
- f        | 'ag' 'ay' 'b6' 'bk' 'c6' 'cp' 'da' 'ea' 'eh' 'es' 'f1' 'fj' 'fv' 'gb' 'gn' 'ic' 'id' 'in' 'iq' 'iw' 'kx' 'ly' 'n7' 'o5' 'oc' 'og' 'op' 'os' 'pa' 'pr' 'q4' 'q6' 'qf' 'qg' 'qh' 'qp' 'qq' 'qu' 'qw' 'qy' 'qz' 'rj' 'rm' 'ro' 's1' 'w2' 'we' 'wl' 'wn' 'wp' 'yj' 'yp' 'yx'
- f        | 'ah' 'bg' 'bw' 'ca' 'cn' 'cy' 'da' 'dq' 'dt' 'eq' 'ex' 'fe' 'ff' 'ga' 'gr' 'kv' 'ld' 'my' 'od' 'oq' 'p3' 'p5' 'pc' 'pf' 'q5' 'qa' 'qc' 'qi' 'ql' 'qr' 'qx' 'qz' 'rd' 'rk' 'rq' 'ru' 'rw' 's7' 'sa' 'sh' 'tk' 'um' 'un' 'v4' 'vw' 'wg' 'wr' 'wt' 'xt' 'ya' 'yo' 'z6' 'zm'
- f        | '2r' '7g' 'a1' 'ar' 'av' 'b8' 'dj' 'dr' 'e7' 'ee' 'fd' 'fn' 'fp' 'gf' 'gp' 'gq' 'gw' 'jm' 'jv' 'ke' 'ki' 'kl' 'l9' 'lc' 'lg' 'lh' 'nm' 'oc' 'oq' 'px' 'q6' 'qe' 'qh' 'qu' 'rs' 's8' 't0' 'tt' 'tw' 'u2' 'uu' 'uy' 'vr' 'vs' 'wg' 'wt' 'ww' 'x3' 'x5' 'xu' 'yw' 'zh' 'zp' 'zt'
- f        | '4u' 'a2' 'aq' 'as' 'b8' 'bu' 'cc' 'cp' 'cv' 'dg' 'e3' 'e9' 'eh' 'fg' 'fh' 'g9' 'gf' 'gk' 'gx' 'hp' 'il' 'jq' 'kc' 'l4' 'lm' 'mt' 'my' 'nw' 'oq' 'pe' 'qe' 'qu' 'qz' 'r1' 'rb' 'sh' 'sx' 't5' 'td' 'tl' 'tr' 'vb' 'vd' 'w6' 'wh' 'wk' 'wp' 'wv' 'y0' 'ye' 'yq' 'z2' 'zj' 'zz'
- f        | 'a1' 'a5' 'aw' 'b5' 'cd' 'dz' 'em' 'eq' 'eu' 'fx' 'gk' 'hi' 'hq' 'ju' 'k8' 'kl' 'kw' 'la' 'lk' 'lm' 'm1' 'mj' 'mp' 'nz' 'o6' 'o8' 'oc' 'q0' 'q1' 'qg' 'qh' 'qw' 'rc' 'rd' 'ro' 'rr' 'sg' 'sy' 'th' 'ti' 'tt' 'uk' 'uo' 'ut' 'vy' 'wg' 'wi' 'x7' 'yr' 'yu' 'yx' 'yz' 'zr' 'zz'
- f        | 'a6' 'au' 'aw' 'bj' 'bn' 'cy' 'dg' 'e3' 'ei' 'ek' 'em' 'et' 'ex' 'fi' 'fm' 'g4' 'gm' 'gz' 'hp' 'ia' 'ie' 'jd' 'lg' 'lj' 'm6' 'mi' 'nd' 'oj' 'oo' 'ov' 'px' 'q0' 'q4' 'qj' 'qp' 'qq' 'r1' 'r5' 'rh' 'ro' 'tg' 'tr' 'tu' 'ty' 'u2' 'uk' 'ux' 'we' 'wi' 'wk' 'wq' 'wu' 'xy' 'y0'
- f        | 'a9' 'aa' 'aq' 'ay' 'bb' 'cg' 'db' 'de' 'do' 'e4' 'e5' 'e9' 'ek' 'ep' 'er' 'fi' 'fp' 'gb' 'hj' 'hk' 'hw' 'ir' 'iy' 'l1' 'lj' 'mb' 'nq' 'oi' 'pj' 'px' 'q9' 'qe' 'qu' 'qw' 'qz' 'rh' 'rl' 'sv' 'tc' 'ts' 'tv' 'uo' 'ur' 'vh' 'vp' 'w7' 'wf' 'wh' 'wo' 'wr' 'xu' 'z4' 'zc' 'zv'
- f        | 'au' 'cm' 'dj' 'e1' 'eh' 'ey' 'f3' 'fd' 'fg' 'fv' 'hn' 'i0' 'ia' 'jt' 'jy' 'k2' 'll' 'ne' 'o0' 'o2' 'op' 'pa' 'pf' 'qq' 'qx' 'rr' 'rs' 's4' 'sn' 'so' 'sq' 'tc' 'tn' 'ts' 'ty' 'tz' 'un' 'va' 'vg' 'vj' 'w8' 'wa' 'wb' 'wk' 'wo' 'wp' 'wr' 'x3' 'xx' 'yj' 'yz' 'z3' 'z7' 'zn'
- f        | '1f' '2u' 'ap' 'as' 'ax' 'bb' 'bf' 'cg' 'di' 'du' 'g3' 'g7' 'gk' 'ha' 'hv' 'hw' 'i6' 'jw' 'kg' 'ko' 'lu' 'ob' 'pn' 'qb' 'qg' 'qi' 'qs' 'qw' 'r3' 'r7' 'r9' 'rc' 're' 'rf' 'rn' 'ru' 'rz' 'sh' 'sq' 't7' 'ta' 'td' 'u2' 'ua' 'uy' 'v8' 'va' 'wk' 'wn' 'wu' 'wy' 'xr' 'yi' 'yt' 'za'
- f        | '1p' 'a7' 'ae' 'b2' 'dd' 'ef' 'eh' 'el' 'em' 'eo' 'fc' 'g0' 'hf' 'hh' 'i8' 'i9' 'in' 'is' 'iy' 'j3' 'ja' 'jl' 'js' 'jt' 'kz' 'lk' 'ng' 'nu' 'o6' 'oc' 'oe' 'om' 'ox' 'pi' 'pp' 'pq' 'ps' 'qc' 'qe' 'qy' 'rh' 'rk' 'rn' 's3' 'sc' 'so' 'st' 'tc' 'tm' 'tp' 'tq' 'vh' 'wa' 'ya' 'zq'
- f        | '1w' '2r' '9e' '9r' 'ci' 'es' 'f1' 'f4' 'fb' 'fx' 'g6' 'ga' 'gk' 'hj' 'hm' 'hu' 'i5' 'ii' 'jg' 'ji' 'ko' 'ku' 'l2' 'ld' 'lx' 'mt' 'n1' 'no' 'nw' 'o7' 'oi' 'pk' 'qy' 'r9' 'rj' 'rr' 'rt' 's6' 'sd' 't0' 'tc' 'to' 'tp' 'tv' 'ud' 'ux' 'vk' 'wr' 'wy' 'xb' 'xr' 'xt' 'yc' 'yp' 'zy'
- f        | '2k' '4s' 'd2' 'dk' 'dm' 'ea' 'ej' 'ep' 'et' 'eu' 'fr' 'gk' 'gs' 'hm' 'iu' 'jq' 'kj' 'km' 'lm' 'nb' 'nr' 'o1' 'oc' 'od' 'of' 'oj' 'ox' 'pf' 'pj' 'px' 'q0' 'q2' 'qa' 'qe' 'qh' 'qv' 'r5' 'r9' 'rb' 'rh' 'ti' 'tl' 'tw' 'u2' 'vb' 'vc' 'vs' 'xe' 'xn' 'y7' 'yb' 'yg' 'yy' 'zb' 'zl'
- f        | '48' 'ae' 'au' 'az' 'b2' 'di' 'ep' 'eq' 'ev' 'f7' 'fw' 'gh' 'gj' 'gn' 'hz' 'i5' 'iy' 'jf' 'kg' 'kj' 'kk' 'nc' 'nm' 'o4' 'oc' 'oe' 'of' 'oh' 'ol' 'ov' 'oz' 'pt' 'pv' 'q5' 'q7' 'qb' 'qe' 'qf' 'rh' 'ry' 'se' 'so' 'tv' 'ua' 'vd' 'wb' 'wg' 'wi' 'wp' 'xf' 'xo' 'yl' 'yr' 'yy' 'z0'
- f        | '70' 'ai' 'bj' 'bm' 'cj' 'ct' 'eb' 'ef' 'ek' 'es' 'fg' 'gh' 'gu' 'hg' 'ia' 'iu' 'iw' 'jt' 'ko' 'kq' 'mb' 'n1' 'o1' 'ox' 'pa' 'pr' 'q4' 'qd' 'qo' 'qr' 'qt' 'qw' 'qz' 'r3' 'r5' 'rg' 'ri' 'rj' 'rn' 'rp' 's7' 'sn' 't9' 'tq' 'tx' 'ty' 'uj' 'v0' 'vt' 'vz' 'w1' 'ww' 'xb' 'z6' 'zi'
- f        | 'a1' 'aa' 'c1' 'd7' 'dc' 'df' 'dh' 'e4' 'e9' 'ec' 'es' 'et' 'eu' 'ev' 'f3' 'g2' 'gu' 'he' 'il' 'j1' 'j6' 'jt' 'jv' 'ke' 'm8' 'm9' 'mh' 'ng' 'o8' 'on' 'pe' 'pf' 'pi' 'pn' 'qf' 'qn' 'qu' 'qv' 'qw' 'rh' 'rl' 'rr' 'ru' 'sg' 'sk' 'uk' 'ul' 'ux' 'vd' 'vj' 'wk' 'yd' 'yn' 'yx' 'z0'
- f        | 'af' 'bq' 'c9' 'cg' 'eg' 'ei' 'eq' 'ez' 'fo' 'fp' 'gl' 'i6' 'it' 'iz' 'jg' 'ka' 'lf' 'lm' 'lr' 'mv' 'oc' 'oj' 'om' 'or' 'p1' 'p4' 'pt' 'q3' 'qd' 'qe' 'qh' 'qx' 'ra' 'rd' 'sr' 'sz' 'tb' 'tc' 'tj' 'ug' 'uh' 'ux' 'wb' 'wc' 'wj' 'wy' 'xa' 'xb' 'y0' 'yj' 'yp' 'yz' 'zf' 'zl' 'zq'
- f        | '1a' '4p' 'bn' 'br' 'dk' 'ec' 'en' 'eu' 'gd' 'h0' 'ha' 'hm' 'if' 'il' 'io' 'ip' 'is' 'iz' 'jl' 'jq' 'k6' 'kd' 'kf' 'kn' 'kp' 'ld' 'lf' 'lt' 'n8' 'na' 'nl' 'o1' 'pd' 'pr' 'q8' 'qf' 'qr' 'qw' 're' 'rx' 'sa' 'sf' 'ta' 'tq' 'ux' 'v3' 'w6' 'wp' 'x2' 'y9' 'yi' 'yw' 'yx' 'z5' 'zl' 'zs'
- f        | '1y' '5p' '6o' 'au' 'b2' 'bg' 'do' 'dw' 'e1' 'e9' 'ea' 'ei' 'em' 'ev' 'f0' 'gc' 'hj' 'hx' 'k7' 'km' 'kp' 'kx' 'mj' 'mu' 'o3' 'oz' 'pf' 'q5' 'qe' 'qg' 'qh' 'qk' 'ql' 'qn' 'qo' 'rh' 'rk' 'ru' 'rx' 't1' 't3' 'th' 'v2' 'vx' 'w2' 'wc' 'wl' 'wm' 'wn' 'ws' 'x5' 'ye' 'yh' 'yk' 'yu' 'zw'
- f        | '2b' '3f' '5e' '7o' 'a4' 'ai' 'as' 'bc' 'bn' 'cz' 'd8' 'dg' 'dj' 'du' 'e5' 'el' 'et' 'ex' 'gc' 'gj' 'hi' 'hn' 'ig' 'ij' 'j3' 'js' 'l3' 'l6' 'lh' 'ls' 'mb' 'n1' 'o0' 'ot' 'q5' 'qd' 'qh' 'qv' 'qz' 'ra' 'rj' 's8' 'tb' 'tf' 'th' 'tx' 'ty' 'vm' 'wf' 'wg' 'wh' 'wn' 'y1' 'y5' 'yw' 'yz'
- f        | '2j' 'ai' 'al' 'ch' 'dy' 'dz' 'ed' 'ei' 'fg' 'fk' 'gp' 'i0' 'il' 'ip' 'iv' 'ix' 'js' 'lm' 'na' 'p1' 'pq' 'pu' 'qe' 'qi' 'qk' 'ql' 'qq' 'qv' 'qx' 'r0' 'rl' 'rm' 'rv' 'sf' 'sj' 'te' 'tk' 'tq' 'tt' 'tu' 'uc' 'ud' 'um' 'un' 'uq' 'vg' 'vu' 'vz' 'w8' 'wa' 'wf' 'xg' 'yj' 'yw' 'yy' 'z6'
- f        | '4c' '4z' 'ag' 'ak' 'an' 'as' 'aw' 'bl' 'd7' 'dy' 'e7' 'eb' 'ec' 'eq' 'et' 'fx' 'gg' 'gm' 'ht' 'hv' 'ik' 'in' 'ip' 'j6' 'k6' 'ka' 'lc' 'md' 'mx' 'n7' 'pw' 'py' 'q7' 'qa' 'qg' 'qh' 'qn' 'qo' 'qt' 'ri' 'rl' 'rs' 'sj' 'su' 'tj' 'u0' 'ua' 'w0' 'wh' 'wi' 'wp' 'wr' 'wx' 'wz' 'ys' 'yx'
- f        | '1y' '4f' 'ao' 'bv' 'co' 'cq' 'dd' 'df' 'dy' 'eq' 'eu' 'ex' 'gg' 'gm' 'gr' 'hm' 'iw' 'j9' 'jb' 'jg' 'jo' 'ju' 'k0' 'km' 'lf' 'ng' 'np' 'nw' 'nz' 'od' 'oj' 'or' 'pp' 'pr' 'pu' 'q5' 'q7' 'q9' 'qc' 'qd' 'qn' 'qx' 'r9' 'rd' 'rk' 'ro' 'sb' 'ta' 'th' 'tv' 'ty' 'tz' 'uq' 'vb' 'wb' 'wj' 'xo'
- f        | '4m' 'at' 'be' 'bo' 'bz' 'cv' 'd0' 'd8' 'ea' 'ec' 'ed' 'ex' 'f9' 'ff' 'fk' 'fv' 'gc' 'ge' 'i8' 'ij' 'is' 'k4' 'k6' 'mw' 'ob' 'ov' 'oy' 'pv' 'q1' 'q2' 'q9' 'qc' 'ql' 'r4' 'rn' 'ru' 'rx' 'ry' 'sj' 'tg' 'ts' 'tv' 'uj' 'vf' 'vh' 'w4' 'wc' 'ww' 'x5' 'xf' 'xx' 'y5' 'yg' 'yy' 'zg' 'zn' 'zw'
- f        | '4p' 'am' 'bj' 'bq' 'cg' 'cm' 'cz' 'dm' 'ds' 'du' 'e6' 'eg' 'en' 'eo' 'eq' 'et' 'ev' 'ex' 'fw' 'go' 'hb' 'hq' 'i0' 'ij' 'k6' 'kg' 'l6' 'lm' 'lq' 'mr' 'ms' 'oa' 'p6' 'q7' 'qa' 'qi' 'qk' 'r8' 'ra' 're' 'rr' 's8' 'sj' 't6' 't9' 'tc' 'v1' 'vd' 'w1' 'wf' 'wj' 'xy' 'yd' 'yn' 'yo' 'yt' 'yu'
- f        | 'a6' 'aa' 'ae' 'bn' 'c0' 'c7' 'ck' 'df' 'dn' 'ds' 'dt' 'e0' 'ea' 'eo' 'eu' 'f0' 'f6' 'g1' 'gd' 'i4' 'j6' 'ja' 'je' 'jt' 'mv' 'no' 'of' 'os' 'ou' 'ox' 'pi' 'pq' 'pr' 'q6' 'qk' 'ql' 'qv' 'qw' 'rh' 'rm' 'rv' 'sv' 't6' 'u2' 'un' 'ux' 'wc' 'wl' 'wo' 'wp' 'xg' 'y7' 'y8' 'ya' 'yn' 'yx' 'zl'
- f        | 'ab' 'am' 'aq' 'b9' 'bj' 'ck' 'cw' 'e2' 'e8' 'ek' 'eo' 'ew' 'f2' 'ff' 'fh' 'ft' 'gl' 'gs' 'h7' 'i0' 'ik' 'jl' 'jo' 'jq' 'jr' 'kc' 'kg' 'kw' 'mm' 'mo' 'pb' 'pn' 'qe' 'qg' 'qk' 'qr' 'qu' 'r2' 's8' 'sd' 'sq' 'su' 'td' 'tr' 'uh' 'uu' 'v2' 'vl' 'w8' 'wg' 'wm' 'wt' 'xl' 'xq' 'yi' 'yo' 'yq'
- f        | 'ah' 'ar' 'bk' 'db' 'dd' 'dq' 'eo' 'fe' 'fj' 'fv' 'g2' 'gc' 'hp' 'i7' 'j2' 'k9' 'kt' 'l9' 'ld' 'lu' 'lz' 'me' 'mr' 'mu' 'mx' 'nr' 'o6' 'ol' 'or' 'pa' 'ph' 'pi' 'q4' 'qn' 'qp' 'r5' 'rb' 'rn' 's8' 'sf' 't6' 'tl' 'tq' 'tx' 'u6' 'uc' 'uv' 'wf' 'x1' 'x7' 'xa' 'xl' 'xm' 'yb' 'yh' 'yw' 'zw'
- f        | '1m' '2u' 'ai' 'ap' 'bb' 'bd' 'cb' 'dn' 'fl' 'fm' 'fo' 'fu' 'gi' 'gl' 'gs' 'hg' 'hi' 'hm' 'hp' 'i0' 'if' 'ij' 'jn' 'jt' 'ju' 'k8' 'ld' 'lm' 'oe' 'ox' 'pa' 'q7' 'qe' 'qi' 'qo' 'qw' 'rf' 'rg' 'ry' 'sq' 't7' 'tk' 'tn' 'tz' 'u5' 'uc' 'v4' 'vr' 'w4' 'w6' 'wd' 'wo' 'ws' 'wt' 'wu' 'wv' 'x3' 'yl'
- f        | '1x' '2h' '6b' 'ah' 'av' 'ay' 'b9' 'bu' 'bv' 'c6' 'dv' 'e2' 'ea' 'ec' 'fh' 'gk' 'ia' 'j2' 'ji' 'k2' 'kc' 'kg' 'kq' 'kz' 'la' 'mq' 'nb' 'od' 'oe' 'ot' 'p8' 'pm' 'pp' 'qc' 'qi' 'qr' 'rg' 'rp' 'rw' 'tl' 'u5' 'ub' 'un' 'uv' 'vc' 'vi' 'wc' 'wi' 'wp' 'wv' 'xg' 'xq' 'yq' 'z3' 'zd' 'zv' 'zx' 'zy'
- f        | 'as' 'bb' 'bn' 'ce' 'd4' 'dp' 'ez' 'gu' 'gw' 'hd' 'hp' 'ia' 'ih' 'ij' 'j6' 'jm' 'jz' 'ku' 'kw' 'lh' 'mu' 'nl' 'nu' 'oc' 'pa' 'pm' 'q8' 'qd' 'qg' 'qi' 'qm' 'qn' 'qr' 'qs' 'qw' 'r9' 're' 'ro' 'ru' 'rv' 'rw' 't1' 't3' 'tm' 'u4' 'uf' 'uw' 'wa' 'wf' 'wk' 'xa' 'xs' 'yg' 'yp' 'ys' 'yu' 'yz' 'z4'
- f        | '3q' '5p' 'a2' 'be' 'bv' 'bw' 'cv' 'd8' 'df' 'dh' 'dk' 'e2' 'ec' 'eo' 'fc' 'g8' 'gq' 'h8' 'ig' 'io' 'ir' 'iv' 'je' 'kq' 'kx' 'lc' 'lr' 'lt' 'ok' 'pk' 'q1' 'q4' 'qe' 'qh' 'qw' 'qz' 'rj' 'rv' 't8' 'tf' 'tl' 'tq' 'uh' 'uz' 'wk' 'wp' 'ws' 'wt' 'wv' 'x3' 'yb' 'ye' 'yo' 'yp' 'yy' 'z6' 'z8' 'zb' 'zm'
- f        | 'a1' 'ag' 'ai' 'ap' 'bp' 'by' 'dc' 'dy' 'e5' 'eg' 'ei' 'el' 'em' 'fc' 'gl' 'h8' 'hr' 'i1' 'ib' 'ie' 'if' 'ij' 'j5' 'jj' 'kf' 'kx' 'lc' 'm3' 'mg' 'nb' 'ol' 'ph' 'py' 'q1' 'q5' 'qi' 'qk' 'ql' 'qp' 'qs' 'sv' 'td' 'te' 'tn' 'vd' 'vm' 'vq' 'wv' 'xp' 'xu' 'yb' 'yo' 'yq' 'yx' 'yy' 'zp' 'zr' 'zx' 'zz'
- f        | 'af' 'ag' 'ak' 'bb' 'cr' 'cy' 'd7' 'db' 'df' 'di' 'eh' 'ew' 'fl' 'fr' 'gd' 'gp' 'hf' 'hk' 'hu' 'ib' 'ik' 'io' 'ix' 'jg' 'k9' 'kc' 'ke' 'm4' 'ma' 'mx' 'mz' 'ob' 'oi' 'oo' 'or' 'ox' 'pg' 'pl' 'pu' 'qc' 'qe' 'qg' 'rl' 'ro' 'rv' 'rz' 'sj' 'sq' 'u4' 've' 'we' 'wi' 'wk' 'wy' 'xd' 'yh' 'yq' 'yv' 'yx'
- f        | 'ah' 'c3' 'd1' 'dh' 'dz' 'ei' 'em' 'ex' 'fe' 'fk' 'g7' 'gz' 'hi' 'hx' 'i3' 'iu' 'j1' 'jm' 'k8' 'kb' 'ku' 'lf' 'lv' 'lz' 'm3' 'mn' 'my' 'nc' 'oj' 'pk' 'qh' 'qn' 'qo' 'qq' 'rf' 'ru' 'ry' 's9' 'sa' 'sc' 'sd' 'se' 'sz' 'td' 'tg' 'tq' 'tx' 'tz' 'vr' 'vu' 'w3' 'wd' 'wl' 'wp' 'x9' 'yb' 'yd' 'yr' 'yt'
- f        | '0z' 'ae' 'br' 'cr' 'dd' 'di' 'du' 'e7' 'ea' 'eb' 'ee' 'ej' 'em' 'eo' 'fo' 'fs' 'gc' 'gf' 'gj' 'hu' 'iv' 'kc' 'lb' 'nw' 'o9' 'ov' 'oz' 'pq' 'qq' 'ro' 'rr' 'rt' 'ru' 'rw' 's4' 'te' 'tm' 'tq' 'um' 'v7' 'va' 'vi' 'vr' 'wb' 'wg' 'wo' 'wp' 'wr' 'ww' 'wy' 'xv' 'y1' 'y9' 'ya' 'ym' 'yt' 'yu' 'z5' 'zl' 'zs'
- f        | '3i' 'a3' 'af' 'cc' 'cs' 'cv' 'd8' 'ei' 'ej' 'ep' 'et' 'ex' 'fb' 'fe' 'fx' 'hc' 'ij' 'jf' 'jp' 'jr' 'js' 'kc' 'km' 'kz' 'lc' 'm7' 'nv' 'ob' 'oc' 'pt' 'q5' 'q7' 'q8' 'qc' 'qm' 'qn' 'qs' 'qy' 'ra' 're' 'rk' 'rx' 's0' 's4' 'se' 'sh' 'sm' 't7' 'tl' 'to' 'tz' 'ue' 'um' 'w3' 'wk' 'wp' 'ya' 'yl' 'yn' 'ys'
- f        | 'a5' 'al' 'b6' 'bu' 'co' 'd0' 'd4' 'db' 'e0' 'e2' 'eb' 'ei' 'ej' 'el' 'et' 'ez' 'g7' 'gu' 'j6' 'jl' 'k3' 'kf' 'km' 'kw' 'kx' 'lp' 'me' 'mw' 'my' 'n2' 'n5' 'n7' 'nr' 'ny' 'oj' 'q8' 'qb' 'qg' 'qn' 'qq' 'qz' 'ra' 'rk' 'rl' 'rn' 's3' 's6' 't2' 't8' 'tk' 'tm' 'ul' 'uq' 'wg' 'y1' 'yc' 'yn' 'yq' 'yy' 'zr'
- f        | 'af' 'am' 'az' 'ce' 'ci' 'dd' 'e5' 'eb' 'ee' 'eh' 'fe' 'fj' 'fv' 'ge' 'gl' 'hp' 'hx' 'i5' 'i8' 'ia' 'ig' 'jb' 'jm' 'jv' 'k6' 'kg' 'kv' 'li' 'ls' 'lx' 'm2' 'md' 'mz' 'o0' 'oe' 'oy' 'pv' 'q5' 'qh' 'qm' 'qo' 'qy' 'rf' 'ri' 'rp' 'rz' 'su' 'tj' 'tz' 'u2' 'uh' 'ur' 'vg' 'we' 'wi' 'xj' 'yb' 'yx' 'yz' 'z0'
- f        | 'b9' 'c9' 'cc' 'cx' 'di' 'ec' 'eo' 'f5' 'fn' 'gd' 'ge' 'gh' 'hc' 'hy' 'i8' 'if' 'iq' 'ir' 'ix' 'ja' 'jl' 'jx' 'km' 'l5' 'l8' 'le' 'mm' 'oc' 'pr' 'qg' 'qo' 'rm' 'ro' 'rv' 'sm' 'td' 'th' 'tm' 'tx' 'u7' 'uc' 'ue' 'uk' 'ux' 'vw' 'wa' 'wb' 'wd' 'wh' 'wr' 'ww' 'xa' 'xj' 'xz' 'y4' 'yd' 'yl' 'ym' 'zf' 'zv'
- f        | '1a' 'a0' 'ab' 'ah' 'ay' 'cd' 'db' 'di' 'eh' 'eo' 'eq' 'f4' 'f8' 'fs' 'gv' 'h7' 'he' 'hf' 'i0' 'id' 'il' 'io' 'ip' 'kc' 'l1' 'l7' 'lw' 'mp' 'na' 'nb' 'nj' 'oj' 'ou' 'pa' 'pn' 'ps' 'pu' 'qb' 'qf' 'ql' 'qn' 'qr' 'rn' 'rw' 'so' 'tf' 'tg' 'th' 'tr' 'us' 'w3' 'w6' 'wb' 'wc' 'wf' 'wg' 'wp' 'wr' 'yv' 'yw' 'zh'
- f        | '1n' 'am' 'b9' 'bc' 'bi' 'dl' 'dv' 'ea' 'eq' 'ey' 'fj' 'g1' 'g3' 'g8' 'ge' 'it' 'iu' 'jh' 'jz' 'kk' 'ln' 'mc' 'mw' 'nf' 'nj' 'o4' 'o9' 'ob' 'ox' 'pq' 'q4' 'qb' 'qk' 'qn' 'qs' 'qt' 'r4' 'ra' 'rg' 'rp' 'rx' 'sj' 'sq' 'ss' 't0' 'tg' 'ty' 'ue' 'ui' 'uj' 'uv' 'v6' 'vr' 'w1' 'w9' 'wj' 'wy' 'xt' 'ym' 'ys' 'yz'
- f        | '1v' '20' 'au' 'bo' 'br' 'c9' 'cv' 'dp' 'ep' 'fo' 'gj' 'hb' 'hx' 'iv' 'iw' 'jc' 'jm' 'jw' 'k8' 'kg' 'km' 'kn' 'nd' 'o8' 'oh' 'ok' 'op' 'oy' 'px' 'pz' 'qh' 'qo' 'qp' 'qs' 'qw' 're' 'rr' 'ry' 's3' 'sj' 't7' 't9' 'tt' 'tw' 'u9' 'ue' 'us' 'uu' 'v2' 'w3' 'wa' 'wf' 'wg' 'wt' 'wv' 'xc' 'yi' 'yu' 'yv' 'z4' 'zj'
- f        | '6g' 'ar' 'ce' 'cn' 'ds' 'dt' 'e9' 'eh' 'el' 'ew' 'gt' 'gw' 'gx' 'hb' 'ho' 'i8' 'j8' 'jp' 'jr' 'kb' 'la' 'lr' 'mg' 'mi' 'ml' 'nd' 'ng' 'oj' 'op' 'pb' 'pd' 'pn' 'py' 'qc' 'qe' 'qk' 'qr' 'qt' 'qv' 'qz' 'sm' 'tc' 'tg' 'ti' 'tp' 'ty' 'u8' 'uq' 'uw' 'uy' 've' 'w0' 'wb' 'wd' 'wp' 'x4' 'xm' 'ym' 'z2' 'zh' 'zz'
- f        | 'af' 'as' 'b2' 'bl' 'bz' 'ca' 'cd' 'co' 'de' 'dp' 'e4' 'ed' 'en' 'eo' 'eu' 'ft' 'g0' 'gj' 'ha' 'hh' 'hn' 'hy' 'ij' 'jb' 'jj' 'jn' 'l7' 'll' 'lp' 'oh' 'ot' 'pb' 'ph' 'pi' 'pn' 'qc' 'qx' 'r5' 'rb' 'ri' 'sb' 'sd' 'sn' 'sv' 'sw' 't7' 'tb' 'ti' 'ty' 'u7' 'un' 'uo' 'wb' 'we' 'wf' 'wh' 'wo' 'wp' 'yb' 'yc' 'ys'
- f        | '4a' 'a9' 'au' 'bn' 'bs' 'cg' 'd4' 'dx' 'fb' 'fk' 'gc' 'hh' 'ht' 'hy' 'iy' 'je' 'jg' 'jj' 'jp' 'ju' 'kz' 'la' 'm8' 'na' 'oa' 'oj' 'ol' 'or' 'ov' 'ox' 'p6' 'po' 'q0' 'q9' 'qc' 'qe' 'qi' 'qq' 'qt' 'qx' 'si' 'sn' 'su' 'sw' 't8' 'ta' 'tv' 'tz' 'uq' 'ut' 'w6' 'w7' 'we' 'wk' 'wl' 'wq' 'wy' 'y4' 'ya' 'ze' 'zq' 'zy'
- f        | 'b0' 'bg' 'bh' 'cu' 'd8' 'dv' 'er' 'fd' 'fm' 'fo' 'gg' 'ij' 'ir' 'iu' 'jc' 'jl' 'jn' 'jo' 'k4' 'kb' 'ku' 'lq' 'ly' 'mw' 'of' 'op' 'ph' 'pk' 'ps' 'px' 'q0' 'qd' 'qg' 'qz' 'rb' 'rp' 'rs' 'rv' 'su' 't9' 'tm' 'tp' 'tx' 'ty' 'ug' 'ul' 'uo' 'up' 'uv' 'v5' 'wh' 'wr' 'ww' 'xw' 'y1' 'yd' 'yf' 'yn' 'z4' 'z8' 'zf' 'zn'
- f        | '1i' 'ap' 'bh' 'ce' 'cp' 'di' 'dm' 'dt' 'es' 'eu' 'f2' 'f3' 'fw' 'fx' 'g5' 'gf' 'gy' 'h2' 'hl' 'i4' 'ii' 'iy' 'kp' 'lh' 'lr' 'me' 'of' 'og' 'ok' 'on' 'oo' 'pb' 'pd' 'pt' 'qf' 'qk' 'qz' 'r4' 'r7' 're' 'ri' 'rj' 'ro' 'rx' 's2' 'tk' 'tl' 'tq' 'tx' 'ub' 'ui' 'us' 'vm' 'w1' 'w7' 'wi' 'wj' 'wq' 'wx' 'xp' 'yg' 'yr' 'yx'
- f        | 'a2' 'a7' 'aq' 'bv' 'cy' 'd0' 'df' 'dg' 'do' 'ei' 'ek' 'ev' 'ey' 'fg' 'ge' 'gg' 'h4' 'hv' 'im' 'iq' 'ix' 'j4' 'j5' 'jt' 'kv' 'nc' 'o2' 'ou' 'ow' 'ph' 'pz' 'qf' 'qj' 'qm' 'qo' 'qq' 'qs' 'ra' 'rl' 'rz' 'te' 'tj' 'tp' 'tr' 'ts' 'tx' 'u5' 'ue' 'uj' 'uk' 'uo' 'us' 'v7' 'w2' 'wa' 'wu' 'wv' 'ww' 'wz' 'y2' 'y8' 'yy' 'zg'
- f        | 'a6' 'ao' 'az' 'by' 'db' 'dl' 'eg' 'ei' 'el' 'eo' 'fh' 'fv' 'gl' 'h0' 'hl' 'hx' 'i9' 'iq' 'j7' 'jx' 'kg' 'kh' 'l9' 'nz' 'o9' 'oi' 'om' 'on' 'oq' 'or' 'pf' 'pz' 'qf' 'qj' 'r5' 'rq' 'rw' 'sr' 'sx' 'tc' 'tg' 'tj' 'tl' 'to' 'uj' 'un' 'vw' 'w1' 'w5' 'w8' 'wn' 'ws' 'wv' 'x2' 'x3' 'xi' 'y4' 'yd' 'ym' 'ys' 'z7' 'zq' 'zv'
- f        | 'am' 'as' 'ay' 'bl' 'e0' 'e1' 'ea' 'eg' 'f6' 'fc' 'fx' 'ia' 'io' 'jq' 'jx' 'kd' 'ky' 'lb' 'll' 'lr' 'lv' 'me' 'nv' 'o4' 'o7' 'oe' 'ok' 'oq' 'pe' 'pr' 'py' 'q7' 'qg' 'qh' 'qj' 'qk' 'ql' 'qq' 'qr' 'qs' 'r1' 'rg' 'rl' 'rm' 'ro' 'sq' 'sr' 'sz' 'ti' 'ts' 'ue' 'ui' 'uu' 'uz' 'vk' 'y0' 'y2' 'y9' 'ym' 'yt' 'yx' 'z8' 'zd'
- f        | '1o' 'ah' 'ap' 'ba' 'bn' 'cs' 'cu' 'd2' 'd8' 'dg' 'dr' 'ed' 'ee' 'er' 'et' 'eu' 'ey' 'ff' 'g1' 'hj' 'i3' 'i5' 'il' 'in' 'jd' 'kd' 'ku' 'lm' 'lv' 'mu' 'nu' 'ok' 'ol' 'oo' 'ov' 'oy' 'p8' 'pu' 'qb' 'qq' 'qx' 'r5' 'rm' 'rp' 'rv' 'sh' 'sk' 'sl' 'sr' 'tx' 'uy' 'v3' 'vu' 'w3' 'wa' 'wb' 'wv' 'xh' 'xq' 'ys' 'yt' 'yx' 'z2' 'zi'
- f        | '2e' 'ak' 'bv' 'cb' 'ch' 'cy' 'd9' 'dq' 'dr' 'e8' 'ec' 'ef' 'ek' 'es' 'f1' 'fw' 'gj' 'gw' 'hh' 'hr' 'i3' 'i6' 'ic' 'ji' 'jr' 'jy' 'kr' 'md' 'mu' 'od' 'og' 'oo' 'p9' 'pd' 'q1' 'q3' 'qq' 'qw' 'qy' 'ra' 'rj' 'rl' 'rn' 'sf' 't4' 't5' 't7' 'tl' 'tm' 'ts' 'u4' 'ug' 'ui' 'uw' 'vo' 'ws' 'ww' 'wy' 'yd' 'yo' 'yq' 'zm' 'zp' 'zw'
- f        | '5y' 'af' 'av' 'az' 'cj' 'cp' 'cq' 'dk' 'e6' 'e7' 'ea' 'ec' 'ee' 'ei' 'ek' 'em' 'ga' 'gk' 'gw' 'hc' 'id' 'ie' 'kp' 'kv' 'lw' 'm0' 'mf' 'mn' 'mw' 'ny' 'ob' 'ol' 'p9' 'ph' 'pk' 'pp' 'pw' 'q0' 'qg' 'qi' 'ql' 'qv' 'qx' 'r3' 'rg' 'ry' 'se' 'sh' 'sq' 'sz' 't1' 'tu' 'u2' 'uh' 'uj' 'uk' 'ut' 'w2' 'wb' 'ww' 'wx' 'yf' 'yo' 'zr'
- f        | 'ab' 'an' 'bm' 'bn' 'bp' 'ca' 'd9' 'dc' 'e0' 'e4' 'e5' 'eh' 'er' 'fe' 'fk' 'fv' 'ga' 'ge' 'hy' 'ic' 'ie' 'io' 'ja' 'jb' 'je' 'kp' 'ks' 'ln' 'md' 'ng' 'nr' 'oj' 'oy' 'p5' 'p6' 'p7' 'pe' 'pg' 'pu' 'qa' 'qq' 'qv' 'qw' 'qy' 'rg' 'rj' 'rk' 'sk' 'tf' 'tw' 'ui' 'um' 'uu' 'v9' 'vu' 'wo' 'wp' 'wx' 'wy' 'xf' 'y0' 'yp' 'z6' 'zi'
- f        | 'ae' 'cn' 'ct' 'dz' 'eb' 'ee' 'ff' 'fi' 'fk' 'fo' 'ft' 'gj' 'gr' 'ie' 'il' 'iv' 'iw' 'iy' 'jb' 'jf' 'ji' 'ke' 'ku' 'kx' 'l3' 'la' 'of' 'ol' 'ox' 'pb' 'pi' 'pq' 'q8' 'qi' 'qj' 'qp' 'qq' 'qw' 'r0' 'r5' 'rk' 'rq' 'ru' 'rz' 'su' 't8' 'tb' 'u0' 'ue' 'um' 'w2' 'wc' 'wm' 'ws' 'wt' 'x4' 'xc' 'xd' 'xm' 'xn' 'y0' 'yb' 'zi' 'zp'
- f        | '3r' '6o' 'ab' 'ay' 'b3' 'bc' 'bh' 'd8' 'dd' 'df' 'eb' 'ee' 'eh' 'el' 'eu' 'ex' 'fn' 'g3' 'ge' 'gr' 'gz' 'hd' 'ib' 'ie' 'ih' 'il' 'it' 'iu' 'jd' 'jq' 'jt' 'jv' 'li' 'pc' 'pp' 'qc' 'ql' 'qp' 'qu' 'qx' 'qz' 'ro' 'rq' 'sj' 'sz' 'te' 'tt' 'tu' 'uh' 'uo' 'up' 'us' 'uu' 'ux' 'v7' 'w3' 'wl' 'wn' 'xf' 'xu' 'ya' 'yh' 'yk' 'za' 'zt'
- f        | '5o' 'ad' 'aw' 'az' 'bi' 'bo' 'd1' 'db' 'di' 'do' 'e7' 'eb' 'ei' 'em' 'ep' 'eq' 'eu' 'fo' 'gg' 'gw' 'i0' 'ig' 'ih' 'iu' 'j3' 'j4' 'jo' 'js' 'kq' 'lc' 'lo' 'lu' 'm9' 'mi' 'mk' 'mt' 'n4' 'ni' 'o7' 'od' 'ot' 'pc' 'pg' 'pp' 'qc' 'qr' 'qw' 'rd' 'rx' 'se' 'sq' 'sy' 't5' 'ts' 'ub' 'vz' 'wb' 'wl' 'wr' 'wt' 'xe' 'xt' 'yg' 'yr' 'zw'
- f        | '5t' 'ad' 'am' 'ed' 'ei' 'en' 'eo' 'ey' 'f0' 'fp' 'fr' 'gc' 'hp' 'hz' 'ic' 'ix' 'jt' 'kn' 'kr' 'lk' 'ls' 'm1' 'mt' 'nk' 'od' 'p3' 'pa' 'pe' 'pi' 'q4' 'qa' 'qi' 'qk' 'qq' 'qt' 'qv' 'rb' 'rr' 'rv' 's3' 'se' 'sr' 't0' 'tj' 'tk' 'tp' 'tu' 'u1' 'ud' 'uf' 'uv' 'ux' 'vd' 'vu' 'wh' 'wi' 'wp' 'wu' 'x9' 'xa' 'ye' 'yn' 'yw' 'zj' 'zs'
- f        | '6h' '7f' 'ab' 'aq' 'ax' 'bc' 'bl' 'ce' 'cm' 'dn' 'do' 'e1' 'ec' 'ed' 'en' 'fc' 'fl' 'g1' 'ga' 'ge' 'gn' 'h8' 'i0' 'id' 'iq' 'iw' 'jc' 'ji' 'lt' 'mj' 'nm' 'o0' 'o6' 'oo' 'pa' 'pb' 'pt' 'q6' 'qf' 'qg' 'qz' 'r1' 'r2' 'r8' 'rd' 'rf' 's9' 'se' 't8' 'tc' 'te' 'u3' 'u5' 'uc' 'ug' 'ul' 'us' 'uu' 'v2' 'vz' 'wp' 'x8' 'ye' 'yq' 'yw'
- f        | 'a5' 'ae' 'ah' 'as' 'b9' 'bh' 'c5' 'd0' 'dc' 'dd' 'do' 'dp' 'dz' 'eg' 'eh' 'fg' 'fu' 'g3' 'gh' 'gu' 'ha' 'hb' 'hd' 'hg' 'hw' 'i3' 'ib' 'jb' 'je' 'jm' 'js' 'm8' 'ma' 'n4' 'nu' 'nz' 'ob' 'oy' 'qu' 'qz' 'r5' 'rd' 're' 'rr' 'ru' 's5' 'sf' 'sp' 'st' 'tn' 'uz' 'vi' 'vo' 'w9' 'wj' 'wm' 'ws' 'wu' 'wv' 'wy' 'xa' 'xc' 'yl' 'zd' 'zp'
- f        | 'a6' 'ad' 'ak' 'ap' 'd1' 'de' 'dj' 'eb' 'eg' 'fi' 'fq' 'ft' 'gx' 'gy' 'hn' 'hs' 'i4' 'ia' 'im' 'is' 'kf' 'ko' 'kt' 'l0' 'lr' 'm8' 'mv' 'oi' 'on' 'pc' 'pl' 'pn' 'pp' 'q2' 'q4' 'qj' 'ql' 'qv' 'qy' 'r2' 'rc' 'rd' 're' 'rm' 'rt' 'sj' 'tb' 'tc' 'tf' 'tk' 'uf' 'uk' 'ul' 'um' 'uq' 'uy' 'vj' 'wl' 'wv' 'ww' 'x7' 'xj' 'y7' 'yx' 'zb'
- f        | 'ab' 'ct' 'cv' 'cw' 'dg' 'ds' 'e0' 'e5' 'f3' 'fj' 'fl' 'fn' 'gy' 'ha' 'ie' 'if' 'jf' 'ju' 'jx' 'kg' 'ki' 'kw' 'l0' 'ls' 'm9' 'mj' 'nj' 'of' 'om' 'oq' 'os' 'ov' 'pv' 'pz' 'q0' 'q5' 'q8' 'qf' 'qg' 'qi' 'qj' 'qm' 'qn' 'qw' 'rk' 'ru' 'sc' 'sn' 'so' 't1' 'tn' 'tz' 'un' 'uv' 'uw' 'vn' 'wh' 'wn' 'ww' 'xy' 'yd' 'yr' 'yv' 'zh' 'zy'
- f        | 'am' 'db' 'dj' 'dn' 'ec' 'eo' 'ev' 'ex' 'fn' 'fw' 'fz' 'gi' 'gn' 'gq' 'ha' 'ho' 'in' 'is' 'ja' 'jj' 'jk' 'js' 'kv' 'lc' 'lz' 'mj' 'o2' 'oa' 'of' 'oi' 'pe' 'pn' 'ps' 'pv' 'py' 'q3' 'qa' 'qb' 'qi' 'qn' 'qo' 'qq' 'qr' 'qv' 'rk' 'rl' 't8' 'tk' 'tv' 'tw' 'ug' 'uk' 'ux' 'uz' 'v7' 'vr' 'wd' 'wf' 'wk' 'wv' 'ya' 'yq' 'yu' 'zp' 'zx'
- f        | 'ao' 'as' 'bz' 'dc' 'dl' 'dn' 'du' 'dy' 'e3' 'ed' 'ee' 'ej' 'em' 'eo' 'ep' 'eq' 'er' 'fc' 'ft' 'g4' 'gc' 'gm' 'gq' 'gr' 'gy' 'hq' 'jg' 'k6' 'k9' 'ks' 'kz' 'l7' 'lo' 'lu' 'lw' 'ly' 'nb' 'oc' 'oo' 'q9' 'qc' 'qd' 'qk' 'qs' 'qv' 'ro' 'rx' 'ry' 'sk' 'sv' 'sy' 'ti' 'tk' 'ui' 'un' 'uq' 'vl' 'w4' 'wl' 'wm' 'yj' 'yo' 'yu' 'yw' 'zg'
- f        | '1i' '3z' 'b6' 'bh' 'bn' 'bu' 'cm' 'do' 'dt' 'ef' 'eg' 'ek' 'eo' 'et' 'ex' 'f9' 'g3' 'gj' 'gl' 'h7' 'hp' 'i8' 'ih' 'im' 'in' 'jn' 'k1' 'k7' 'kd' 'lq' 'ms' 'mv' 'n7' 'nj' 'nt' 'o4' 'o9' 'ov' 'q2' 'qa' 'qh' 'qk' 'ql' 'qp' 'qu' 'qv' 'rj' 's8' 'sf' 'sh' 't7' 't8' 'um' 'un' 'uo' 'ut' 'uu' 'w1' 'wa' 'wf' 'wi' 'wx' 'xj' 'yc' 'yo' 'yt'
- f        | '1w' '5i' 'a4' 'a6' 'bz' 'de' 'dg' 'dt' 'ed' 'ei' 'ej' 'ey' 'fa' 'ff' 'gg' 'hi' 'hj' 'ho' 'i2' 'ii' 'ij' 'jq' 'jy' 'ka' 'kr' 'kw' 'lv' 'm7' 'nd' 'ot' 'ov' 'oy' 'oz' 'pe' 'pj' 'qb' 'qj' 'qq' 'qt' 'qv' 'r0' 'r3' 'r4' 'ri' 'rj' 'si' 'ta' 'tc' 'ts' 'tx' 'u3' 'uj' 'ur' 'v6' 'vh' 'w3' 'w6' 'wc' 'wg' 'wq' 'x5' 'xv' 'yb' 'yt' 'yx' 'zl'
- f        | '10' '2p' '6r' 'a2' 'bb' 'c9' 'dq' 'dy' 'ec' 'eh' 'ej' 'ek' 'es' 'fl' 'g1' 'g9' 'gd' 'h1' 'h2' 'hj' 'hn' 'hw' 'ip' 'iz' 'jg' 'jl' 'l5' 'le' 'lk' 'me' 'mi' 'o0' 'o6' 'oa' 'oe' 'ox' 'pd' 'pm' 'pr' 'py' 'q1' 'qo' 'qq' 'qz' 'r3' 'rs' 'rw' 's7' 'sl' 'sw' 't2' 't4' 'td' 'tj' 'u3' 'ud' 'ur' 'uw' 'vy' 'wi' 'wj' 'wl' 'wq' 'ys' 'yu' 'z7' 'zp'
- f        | '19' 'a4' 'a7' 'ae' 'ar' 'as' 'bj' 'bp' 'bv' 'cp' 'd8' 'dp' 'e0' 'e8' 'ea' 'ee' 'ek' 'ep' 'es' 'et' 'ez' 'fp' 'gu' 'h2' 'h4' 'he' 'hp' 'ii' 'im' 'in' 'lc' 'lk' 'lu' 'lv' 'ma' 'od' 'oe' 'p7' 'pm' 'q7' 'qa' 'qe' 'qf' 'qi' 'qr' 'qu' 'rc' 'rd' 're' 'rj' 'rl' 'ro' 'tj' 'tw' 'v4' 'vb' 'w7' 'wc' 'wg' 'wi' 'wm' 'wu' 'y4' 'yj' 'yv' 'z1' 'zt' 'zu'
- f        | '2f' 'af' 'al' 'at' 'bc' 'bo' 'cd' 'd6' 'dk' 'dp' 'dy' 'ea' 'eu' 'ev' 'ey' 'fe' 'ft' 'gd' 'gi' 'ha' 'hm' 'hr' 'i6' 'im' 'is' 'iz' 'jb' 'jt' 'ju' 'li' 'm4' 'my' 'na' 'nm' 'nu' 'oh' 'p4' 'pa' 'pn' 'po' 'qk' 'qz' 'r4' 're' 'rf' 'rs' 'sm' 'tb' 'ti' 'to' 'tw' 'u7' 'ut' 'vz' 'w3' 'w5' 'w9' 'wc' 'wj' 'wq' 'wr' 'x7' 'xg' 'xz' 'ye' 'yx' 'ze' 'zo'
- f        | '2o' '4i' '93' 'a2' 'az' 'b5' 'bk' 'cd' 'do' 'ea' 'ed' 'ej' 'el' 'es' 'ez' 'fd' 'fk' 'fu' 'h7' 'hg' 'hr' 'hs' 'hv' 'iz' 'j0' 'j9' 'jb' 'jc' 'jt' 'ln' 'lu' 'lw' 'lz' 'mz' 'ns' 'nv' 'o8' 'oi' 'oq' 'ov' 'oz' 'pr' 'qi' 'qw' 'rb' 'rg' 'ro' 'rq' 'sb' 'sc' 't8' 't9' 'te' 'ti' 'tm' 'uo' 'uz' 'wd' 'wi' 'wn' 'wp' 'ww' 'wx' 'xt' 'xv' 'yb' 'yr' 'zs'
- f        | '2p' '3w' 'ah' 'at' 'bg' 'bv' 'bz' 'cu' 'd8' 'dw' 'eb' 'ec' 'ei' 'er' 'es' 'fn' 'gl' 'hd' 'hx' 'ij' 'ip' 'ki' 'lh' 'mx' 'my' 'nq' 'o3' 'o7' 'ok' 'or' 'os' 'pd' 'pu' 'q5' 'qa' 'qc' 'qd' 'qg' 'qh' 'ql' 'qs' 'qt' 'qu' 'qx' 'qy' 'rb' 'rd' 'rk' 'rs' 'ru' 'rv' 'rw' 'sn' 'tm' 'vw' 'w9' 'wa' 'wb' 'wm' 'ws' 'xe' 'xo' 'xu' 'y6' 'yh' 'yj' 'z4' 'zg'
- f        | '45' '85' 'an' 'bi' 'ca' 'cb' 'co' 'cq' 'cu' 'dt' 'e4' 'eb' 'ed' 'ef' 'em' 'eq' 'er' 'et' 'ex' 'fe' 'fk' 'fv' 'fw' 'gm' 'gq' 'hu' 'it' 'iw' 'j5' 'jj' 'jm' 'jr' 'lq' 'lz' 'mc' 'n0' 'nq' 'o7' 'ok' 'pd' 'ph' 'q6' 'qe' 'qh' 'qm' 'qy' 'qz' 'r2' 'r5' 'ra' 're' 's6' 'sb' 'sl' 'tb' 'tg' 'ur' 'vl' 'wa' 'wf' 'wt' 'wv' 'ww' 'xr' 'xz' 'yb' 'yf' 'zx'
- f        | 'a2' 'af' 'an' 'aq' 'ar' 'bj' 'bz' 'cx' 'dy' 'eh' 'ek' 'en' 'ex' 'fy' 'gg' 'gr' 'hh' 'if' 'ip' 'it' 'ix' 'j5' 'jf' 'jn' 'k0' 'kk' 'lq' 'nc' 'oc' 'od' 'og' 'oh' 'oo' 'or' 'pm' 'po' 'qa' 'qd' 'qe' 'qh' 'ql' 'qo' 'qt' 'qx' 'qz' 'rq' 'rr' 'ru' 'sj' 'sk' 'tl' 'tr' 'ug' 'wa' 'wb' 'wd' 'we' 'wk' 'wn' 'wq' 'wr' 'xl' 'xo' 'xw' 'yf' 'yq' 'ys' 'yw'
- f        | 'a6' 'ao' 'aq' 'ba' 'be' 'bg' 'cb' 'ci' 'cj' 'cq' 'cs' 'dc' 'e6' 'ea' 'ei' 'ex' 'fw' 'fy' 'g7' 'gg' 'gq' 'hg' 'ib' 'ig' 'im' 'jz' 'kv' 'me' 'mi' 'mj' 'mp' 'o6' 'oq' 'os' 'ov' 'pd' 'pl' 'pr' 'px' 'qf' 'qg' 'ql' 'qr' 'qz' 'r5' 'rl' 'ro' 'ru' 'rz' 'sy' 'sz' 't7' 'tt' 'u7' 'uf' 'ug' 'uo' 'vt' 'w3' 'w8' 'wb' 'wp' 'ww' 'wy' 'xl' 'xv' 'yc' 'z3'
- f        | 'a7' 'ab' 'ba' 'bv' 'e7' 'ea' 'eh' 'ep' 'er' 'es' 'f4' 'gq' 'hg' 'hi' 'hs' 'ip' 'iw' 'je' 'k0' 'kh' 'kn' 'ko' 'lo' 'ly' 'm6' 'n2' 'o1' 'oh' 'on' 'op' 'os' 'pi' 'q6' 'q9' 'qh' 'qj' 'qm' 'qn' 'qp' 'qs' 's7' 'sa' 'sb' 'sc' 'tn' 'tq' 'tt' 'u4' 'un' 'ux' 've' 'w1' 'wd' 'wf' 'wj' 'wl' 'wr' 'wu' 'wy' 'xf' 'xx' 'y3' 'y9' 'yk' 'zh' 'zn' 'zo' 'zr'
- f        | '1l' '2u' 'ao' 'av' 'bb' 'c7' 'c8' 'ca' 'cm' 'cp' 'dc' 'di' 'e2' 'e4' 'eo' 'er' 'et' 'ex' 'g1' 'gb' 'hi' 'hr' 'ht' 'i9' 'id' 'ie' 'jk' 'jq' 'ju' 'k3' 'k5' 'lb' 'lm' 'lv' 'mg' 'no' 'o8' 'oo' 'ot' 'p2' 'pn' 'pw' 'py' 'q6' 'qg' 'ql' 'qo' 'r2' 'rf' 'rk' 'rq' 'ry' 't2' 'tb' 'tn' 'tr' 'tw' 'ub' 'w1' 'wa' 'wb' 'we' 'wi' 'ww' 'xo' 'yk' 'ys' 'yx' 'zg'
- f        | '26' '4v' 'a1' 'ac' 'af' 'ah' 'au' 'cn' 'd3' 'dn' 'e4' 'ec' 'eg' 'ep' 'er' 'fa' 'fb' 'g6' 'gr' 'h3' 'hb' 'hf' 'hj' 'iu' 'iv' 'j1' 'jk' 'jy' 'k2' 'k8' 'kd' 'lc' 'lf' 'mb' 'nn' 'ot' 'p5' 'pb' 'pl' 'pw' 'py' 'q4' 'q9' 'qf' 'r6' 'ra' 'rl' 'rr' 'ru' 'rz' 'ta' 'te' 'ti' 'tp' 'u1' 'uy' 'w6' 'wb' 'wc' 'wd' 'wh' 'wv' 'wy' 'xo' 'xu' 'yd' 'yh' 'yo' 'yt'
- f        | 'a3' 'ac' 'af' 'ar' 'b4' 'cu' 'd6' 'dx' 'dz' 'eb' 'ej' 'ek' 'eo' 'es' 'eu' 'ff' 'gj' 'go' 'h6' 'ho' 'hx' 'i6' 'ih' 'ir' 'iy' 'jd' 'jg' 'jh' 'k5' 'n0' 'nn' 'oe' 'og' 'pj' 'pk' 'pq' 'px' 'q5' 'qc' 'qf' 'qg' 'qi' 'qm' 'qx' 'rb' 'rd' 're' 'rx' 'sn' 'sq' 'tp' 'uh' 'ul' 'um' 'uo' 'up' 'uq' 'uz' 'vt' 'wb' 'wj' 'wp' 'ws' 'wv' 'xk' 'xo' 'yv' 'yw' 'yx'
- f        | 'a9' 'ag' 'bh' 'dk' 'dq' 'e3' 'e7' 'ea' 'ee' 'ej' 'et' 'ez' 'f1' 'gh' 'gn' 'gr' 'hb' 'hf' 'hh' 'hz' 'ip' 'iw' 'j7' 'jh' 'ki' 'kp' 'kx' 'ml' 'nu' 'ov' 'ow' 'pg' 'ph' 'pn' 'po' 'pu' 'qd' 'qe' 'qr' 'qs' 'qv' 'r2' 'r3' 'rb' 'rd' 'ry' 's3' 'sd' 'sr' 'su' 'sz' 'tp' 'ty' 'uh' 'un' 'v0' 'v4' 'w0' 'wa' 'wk' 'wq' 'wx' 'xe' 'y6' 'yd' 'yf' 'yj' 'yl' 'zt'
- f        | 'ah' 'ai' 'aj' 'cb' 'cg' 'dd' 'dl' 'dp' 'eb' 'ee' 'ei' 'es' 'ey' 'f5' 'fm' 'fr' 'g0' 'gj' 'gp' 'gq' 'gw' 'hc' 'hf' 'ig' 'ij' 'iu' 'kg' 'ld' 'mr' 'nh' 'o2' 'pp' 'pz' 'qk' 'qr' 'qv' 'qz' 'r4' 'rb' 'rd' 'ro' 'rt' 'rw' 'rz' 'sr' 'sw' 'sy' 't6' 't9' 'tb' 'ts' 'tt' 'uo' 'vg' 'wd' 'wj' 'wl' 'wo' 'wp' 'wq' 'wt' 'ww' 'x8' 'yw' 'yx' 'z3' 'z9' 'zi' 'zz'
- f        | 'al' 'ar' 'ax' 'be' 'bu' 'dl' 'do' 'du' 'e5' 'es' 'ey' 'fb' 'fn' 'ga' 'he' 'hh' 'ho' 'i8' 'ic' 'in' 'iy' 'j1' 'j6' 'j9' 'jk' 'jm' 'ko' 'kv' 'kz' 'lk' 'ls' 'nb' 'oe' 'ou' 'pf' 'pj' 'pm' 'pu' 'py' 'q4' 'q7' 'qe' 'ql' 'qo' 'qr' 'qt' 'rh' 'rs' 'ry' 's3' 's6' 'sl' 'sq' 'tm' 'ud' 'uf' 'ur' 'vy' 'w5' 'w8' 'wp' 'wt' 'wx' 'xq' 'yc' 'yd' 'yi' 'yl' 'ym'
- f        | 'b0' 'b7' 'bh' 'bt' 'c0' 'cd' 'dv' 'e5' 'ed' 'ef' 'eq' 'ff' 'fj' 'fk' 'ga' 'gt' 'gx' 'hm' 'hx' 'i1' 'ih' 'il' 'j5' 'ja' 'jf' 'jp' 'jt' 'm2' 'nf' 'nt' 'of' 'oo' 'ou' 'p7' 'pa' 'pl' 'po' 'qa' 'qd' 'qr' 'qs' 'qt' 'qx' 'rb' 'rd' 're' 'rf' 'rv' 's0' 'sj' 'sw' 'tf' 'tu' 'tz' 'u2' 'ue' 'uq' 'ur' 'us' 'vw' 'w8' 'wc' 'wo' 'wt' 'x8' 'xo' 'yd' 'zi' 'zq'
- f        | '1i' '6c' 'ah' 'aq' 'ax' 'b4' 'cg' 'd5' 'da' 'do' 'eu' 'ex' 'ez' 'fa' 'go' 'gt' 'h5' 'h8' 'hi' 'i2' 'ib' 'il' 'in' 'is' 'iz' 'j0' 'j7' 'jn' 'jq' 'ku' 'kw' 'li' 'ls' 'n3' 'nc' 'nt' 'o6' 'oc' 'p4' 'p7' 'pc' 'qc' 'qi' 'qp' 'qs' 'qw' 'r3' 'rl' 'rq' 'ry' 's5' 'si' 'sm' 'ta' 'tr' 'ud' 'ut' 'uw' 'v0' 'w7' 'wg' 'wm' 'xi' 'yi' 'yl' 'yn' 'z1' 'z5' 'zk' 'zp'
- f        | '3y' 'a9' 'au' 'bp' 'ca' 'cf' 'cn' 'de' 'dh' 'dk' 'dw' 'ec' 'er' 'ey' 'fn' 'g1' 'hb' 'hd' 'hg' 'hi' 'hj' 'ib' 'if' 'iu' 'j7' 'jd' 'jg' 'jj' 'jx' 'k2' 'km' 'kv' 'ld' 'lo' 'mz' 'o3' 'ok' 'ot' 'pl' 'pn' 'pr' 'q0' 'q2' 'q7' 'qa' 'qc' 'qg' 'qm' 'qp' 'qx' 'rc' 'rq' 'rt' 'si' 'so' 'tp' 'tu' 'uj' 'vi' 'vx' 'w7' 'wb' 'wd' 'wm' 'ws' 'wt' 'wv' 'y9' 'yf' 'yq'
- f        | '7u' 'a4' 'ah' 'aj' 'al' 'cu' 'e1' 'fi' 'fq' 'fr' 'he' 'hi' 'hk' 'hn' 'hp' 'hs' 'ih' 'iw' 'je' 'k4' 'k6' 'kx' 'l1' 'lf' 'li' 'lj' 'lm' 'lp' 'ls' 'lu' 'ma' 'nr' 'o2' 'o4' 'oe' 'oh' 'os' 'ow' 'p7' 'pl' 'q3' 'qj' 'qt' 'qy' 'qz' 'r3' 'rc' 'rm' 'ro' 's0' 's8' 'so' 't7' 'th' 'ti' 'tm' 'tt' 'ut' 'v5' 'va' 've' 'w7' 'wc' 'wk' 'wl' 'wm' 'wq' 'wu' 'x0' 'zh'
- f        | '8l' 'au' 'ay' 'bn' 'bs' 'ch' 'co' 'cu' 'dq' 'dv' 'eq' 'ev' 'ff' 'fp' 'fr' 'fz' 'gb' 'gu' 'hb' 'he' 'hj' 'id' 'ih' 'jb' 'kg' 'lm' 'ls' 'nm' 'oe' 'ot' 'p6' 'pb' 'ps' 'q0' 'q8' 'qg' 'qh' 'qj' 'qo' 'qp' 'qr' 'qt' 'qz' 'r1' 're' 'rh' 'rp' 'ry' 's1' 's4' 'sc' 'sd' 'sn' 'tf' 'ty' 'u4' 'us' 'vt' 'vx' 'wc' 'wd' 'ws' 'wv' 'xp' 'y2' 'y5' 'y6' 'yy' 'zh' 'zx'
- f        | 'a2' 'al' 'av' 'b9' 'bd' 'bo' 'c8' 'cq' 'dz' 'ej' 'el' 'ep' 'ew' 'f3' 'f5' 'fr' 'ft' 'h2' 'i3' 'ic' 'id' 'iy' 'jd' 'ke' 'kf' 'kr' 'l3' 'lf' 'mg' 'mu' 'nj' 'o3' 'ob' 'ol' 'ov' 'pb' 'pj' 'pl' 'pp' 'qn' 'qz' 're' 'rg' 'rk' 'ru' 's3' 'sa' 'sh' 'sj' 'su' 'sw' 'tb' 'tk' 'tv' 'ue' 'uh' 'ul' 'un' 'vk' 'vu' 'w0' 'wa' 'wm' 'wo' 'wq' 'xa' 'xl' 'ya' 'yn' 'yo'
- f        | 'a3' 'a4' 'a5' 'bd' 'co' 'cq' 'd8' 'da' 'dn' 'do' 'du' 'dv' 'ed' 'ei' 'en' 'eo' 'es' 'et' 'f1' 'fa' 'ha' 'hr' 'i6' 'id' 'ie' 'if' 'ir' 'jx' 'kd' 'kh' 'mb' 'mq' 'mv' 'o6' 'oa' 'or' 'oy' 'pl' 'pr' 'q3' 'q8' 'qa' 'qb' 'qc' 'qd' 'qk' 'qs' 'ra' 'rc' 'rp' 'rz' 'se' 'tg' 'tj' 'u2' 'uq' 'uv' 'uy' 'vm' 'vz' 'wh' 'wu' 'xf' 'xs' 'yc' 'ye' 'yl' 'yn' 'z1' 'zf'
- f        | '18' 'at' 'c6' 'ca' 'dj' 'dl' 'dx' 'ec' 'ek' 'f4' 'fo' 'fs' 'fz' 'h8' 'hn' 'ik' 'il' 'j4' 'jn' 'ld' 'ln' 'ls' 'lx' 'nu' 'o6' 'os' 'ot' 'ox' 'pa' 'pe' 'pp' 'pw' 'q1' 'qc' 'qd' 'qh' 'qk' 'qq' 'qr' 'rq' 'rr' 'rt' 'rv' 'rz' 's5' 'sd' 'sh' 'sy' 't3' 'tu' 'ty' 'uj' 'uo' 'up' 'uu' 've' 'vl' 'vu' 'wa' 'wd' 'wo' 'wr' 'ws' 'ww' 'xk' 'y0' 'y6' 'yi' 'yq' 'yy' 'z3'
- f        | '1t' 'a7' 'aj' 'au' 'ca' 'cn' 'cw' 'dg' 'dp' 'ec' 'ei' 'en' 'ew' 'ez' 'f3' 'f8' 'hp' 'ht' 'hw' 'is' 'iv' 'jd' 'ji' 'kn' 'l4' 'lq' 'lz' 'm7' 'o6' 'oj' 'oz' 'p4' 'p7' 'po' 'pp' 'q2' 'qa' 'qj' 'qo' 'qt' 'qv' 'qw' 'qy' 'ra' 'rd' 'ri' 'rn' 'rr' 'ry' 's7' 'st' 'sz' 'tg' 'to' 'tu' 'tx' 'w2' 'w4' 'w5' 'wd' 'we' 'wg' 'wo' 'ws' 'xm' 'y5' 'yf' 'yl' 'ym' 'yr' 'yz'
- f        | '2e' '3u' 'aa' 'an' 'ap' 'bc' 'br' 'bx' 'cc' 'dt' 'ea' 'ei' 'ej' 'em' 'eo' 'ep' 'eq' 'es' 'et' 'ey' 'fb' 'fw' 'gh' 'gs' 'gv' 'hd' 'hg' 'hn' 'i7' 'it' 'jf' 'ka' 'kl' 'l8' 'la' 'm0' 'nu' 'o2' 'oc' 'oy' 'ph' 'po' 'pz' 'q2' 'qg' 'qh' 'qn' 'qp' 'qt' 'r7' 'r8' 'rd' 'rf' 'rj' 'rk' 'sm' 't1' 'tb' 'th' 'ub' 'ui' 'ul' 'um' 'uu' 've' 'w8' 'wj' 'wx' 'y8' 'zf' 'zn'
- f        | '2n' 'ar' 'b3' 'bc' 'bd' 'c0' 'c9' 'cb' 'cp' 'do' 'ee' 'eh' 'ep' 'f3' 'fb' 'fj' 'gg' 'gk' 'gm' 'h9' 'hk' 'hp' 'ht' 'i7' 'ij' 'iw' 'kx' 'm2' 'mt' 'mv' 'nj' 'ns' 'o7' 'oa' 'od' 'of' 'om' 'or' 'pg' 'pm' 'pu' 'qq' 'qw' 'qx' 'r0' 'rb' 'rg' 'rk' 'rv' 'se' 'sj' 'sp' 'su' 'tf' 'uu' 'v9' 've' 'vg' 'vm' 'w5' 'w6' 'w8' 'wa' 'wp' 'y5' 'y9' 'yk' 'yy' 'z2' 'zd' 'zw'
- f        | '4z' 'a8' 'ds' 'dv' 'dx' 'eq' 'f1' 'fs' 'gs' 'h9' 'hm' 'hp' 'hu' 'hz' 'i6' 'ip' 'is' 'j4' 'jf' 'k3' 'ku' 'lc' 'le' 'lj' 'nb' 'o6' 'ob' 'of' 'p6' 'pj' 'pm' 'ps' 'qc' 'qf' 'qh' 'ql' 'qr' 'qu' 'qx' 'r3' 'rf' 'ri' 's1' 's4' 'sr' 'st' 'sw' 'tb' 'tc' 'tg' 'tr' 'tz' 'ug' 'uq' 'uu' 'uv' 'uw' 'uz' 'vl' 'w2' 'w4' 'wq' 'wx' 'xe' 'xv' 'xx' 'y6' 'yg' 'yn' 'yp' 'yr'
- f        | '6x' 'a4' 'ae' 'as' 'd5' 'df' 'e9' 'ek' 'ew' 'ex' 'ez' 'fa' 'fe' 'fr' 'gk' 'hb' 'hg' 'hl' 'hp' 'id' 'it' 'ix' 'jc' 'jg' 'jk' 'jm' 'js' 'ju' 'ln' 'lq' 'mo' 'ms' 'o7' 'od' 'oi' 'oo' 'pn' 'qd' 'qt' 'qv' 'r0' 'rc' 'rj' 'rk' 'rn' 'rp' 'rx' 'rz' 'sc' 'sg' 'sk' 'so' 'ti' 'tn' 'to' 'tr' 'tz' 'uk' 'um' 'ut' 'v1' 'vr' 'wo' 'wr' 'wu' 'wz' 'xn' 'xu' 'y4' 'yg' 'z2'
- f        | '6y' 'aw' 'az' 'cn' 'cs' 'cx' 'd4' 'di' 'dl' 'e7' 'eg' 'eh' 'eo' 'ep' 'et' 'ew' 'ex' 'ey' 'fv' 'fz' 'gu' 'gv' 'hg' 'hl' 'hm' 'iv' 'jc' 'lb' 'me' 'nc' 'nz' 'o2' 'ox' 'pn' 'po' 'pw' 'q4' 'q5' 'qg' 'qq' 'qv' 'qz' 'r7' 're' 'rl' 'rq' 'rs' 'rx' 'sa' 'se' 'ti' 'tj' 'tn' 'tz' 'u6' 'uq' 'ur' 'us' 'v9' 'we' 'wn' 'wp' 'wr' 'ws' 'xo' 'ya' 'ye' 'yg' 'yx' 'zj' 'zl'
- f        | '8j' 'ao' 'bc' 'bh' 'co' 'cz' 'di' 'dq' 'dr' 'e1' 'ec' 'ei' 'el' 'et' 'eu' 'ex' 'f8' 'g7' 'gl' 'hq' 'hw' 'ib' 'kh' 'kn' 'kt' 'lc' 'md' 'n7' 'oe' 'p0' 'pg' 'pl' 'pm' 'po' 'pr' 'q0' 'q6' 'ql' 'qv' 'qy' 'r7' 'ra' 're' 'rq' 'ru' 'ry' 'sm' 'sn' 't4' 't5' 'tw' 'ty' 'u7' 'ud' 'uh' 'um' 'us' 'ux' 'v0' 'v7' 'vn' 'w6' 'we' 'wi' 'wm' 'x1' 'xo' 'xz' 'yn' 'yo' 'yz'
- f        | 'a9' 'b8' 'de' 'dl' 'eg' 'fb' 'fi' 'fm' 'gj' 'hp' 'hx' 'if' 'ig' 'ii' 'ik' 'io' 'iw' 'ix' 'j1' 'j3' 'j8' 'ji' 'ki' 'kt' 'ld' 'm8' 'mi' 'mj' 'mx' 'mz' 'n2' 'nk' 'oe' 'ok' 'oq' 'os' 'ot' 'pj' 'q4' 'qe' 'ql' 'qp' 'qq' 'r4' 'rl' 'rq' 'rx' 'sf' 'ss' 'td' 'ti' 'tl' 'u4' 'u5' 'uq' 'ux' 'v4' 'vl' 'vs' 'wb' 'wc' 'wg' 'wj' 'wn' 'ww' 'x9' 'xa' 'ye' 'yg' 'yl' 'yn'
- f        | 'ab' 'ap' 'ay' 'b6' 'bg' 'bm' 'bq' 'br' 'ce' 'co' 'dt' 'e4' 'ef' 'ej' 'ek' 'ep' 'fj' 'fq' 'fu' 'g3' 'gg' 'gp' 'hk' 'i3' 'i9' 'je' 'k7' 'ku' 'li' 'lq' 'lt' 'lx' 'mc' 'mz' 'n7' 'nl' 'o1' 'of' 'os' 'pm' 'qc' 'ql' 'qs' 'qw' 'r6' 'rf' 'rj' 'rp' 'ru' 'rx' 'rz' 'tl' 'tw' 'ty' 'u1' 'u3' 'ud' 'un' 'uw' 'vu' 'w6' 'wf' 'wl' 'wq' 'xh' 'xm' 'yc' 'yh' 'yr' 'yw' 'z9'
- f        | 'ad' 'af' 'ar' 'b0' 'bw' 'c4' 'cn' 'do' 'e0' 'e4' 'em' 'eo' 'fn' 'ga' 'gg' 'gy' 'hf' 'ht' 'id' 'ig' 'ik' 'iv' 'j6' 'mi' 'n5' 'ng' 'ob' 'og' 'ou' 'oy' 'p4' 'pd' 'pg' 'pk' 'po' 'pt' 'pw' 'q3' 'q5' 'qb' 'qr' 'qt' 'r3' 'rc' 'rd' 'rl' 's0' 'sy' 't9' 'tc' 'tm' 'tq' 'ub' 'up' 'uv' 'ux' 'vm' 'vv' 'vw' 'wc' 'wg' 'wk' 'wm' 'x0' 'xp' 'xr' 'xv' 'xx' 'yg' 'ym' 'yw'
- f        | 'at' 'bm' 'd0' 'd5' 'eg' 'ei' 'ek' 'eq' 'er' 'eu' 'ez' 'fs' 'gh' 'hc' 'ho' 'ix' 'ko' 'kq' 'l1' 'll' 'mz' 'ob' 'ou' 'p2' 'pi' 'pl' 'ps' 'pt' 'q0' 'q5' 'qa' 'qg' 'qj' 'qm' 'qq' 'qt' 'rf' 'ri' 'rm' 'ru' 'rv' 'rx' 'ry' 's4' 't4' 'td' 'tn' 'tq' 'tx' 'u3' 'up' 'uq' 'vn' 'wb' 'wf' 'wk' 'wr' 'wv' 'wy' 'xh' 'xx' 'y3' 'yc' 'ye' 'ys' 'za' 'zd' 'zo' 'zs' 'zv' 'zy'
- f        | '0p' 'ab' 'as' 'az' 'b5' 'bl' 'cn' 'cr' 'ct' 'cu' 'dq' 'dr' 'em' 'eq' 'fe' 'fj' 'fk' 'fy' 'gn' 'gx' 'h9' 'hg' 'hk' 'hr' 'io' 'iy' 'jh' 'la' 'lb' 'll' 'ln' 'lq' 'me' 'mp' 'mr' 'mv' 'ns' 'od' 'op' 'os' 'ov' 'po' 'pv' 'qa' 'qn' 'qp' 'qs' 'qt' 'r0' 'rc' 'rd' 'rl' 's5' 'si' 't7' 'tc' 'th' 'u0' 'um' 'uz' 'vg' 'vo' 'wa' 'wp' 'wu' 'xk' 'yg' 'yh' 'yi' 'yo' 'yy' 'zy'
- f        | '10' 'ac' 'as' 'av' 'b6' 'bb' 'cj' 'd3' 'd8' 'dt' 'eb' 'ey' 'ez' 'fm' 'g8' 'gf' 'gs' 'hn' 'hq' 'ib' 'ii' 'j0' 'jb' 'k4' 'l5' 'ld' 'mg' 'mu' 'nz' 'oa' 'ou' 'pn' 'q1' 'qa' 'qg' 'qj' 'qm' 'qn' 'qs' 'qx' 'qy' 'rj' 'rm' 'rr' 'ry' 's0' 's7' 't4' 't6' 'tb' 'td' 'u0' 'ua' 'ut' 'ux' 'uz' 'v1' 'v9' 'vd' 'vz' 'wc' 'wj' 'wo' 'ws' 'ww' 'x9' 'xu' 'y7' 'yq' 'yv' 'zw' 'zy'
- f        | '11' '3o' '7a' 'au' 'bc' 'bx' 'cg' 'dz' 'e5' 'ea' 'eb' 'ee' 'eg' 'eo' 'er' 'eu' 'g2' 'gq' 'gx' 'i4' 'in' 'ip' 'iv' 'k4' 'kd' 'kw' 'lf' 'ls' 'oq' 'ot' 'oz' 'p7' 'ph' 'pk' 'ps' 'qa' 'qd' 'qf' 'qi' 'qj' 'qr' 'qt' 'r4' 'rb' 'rd' 'rl' 'th' 'tl' 'tx' 'uc' 'uj' 'v6' 'vj' 'vz' 'we' 'wj' 'wl' 'wm' 'wp' 'wy' 'wz' 'xj' 'xk' 'xl' 'ya' 'yj' 'yl' 'yo' 'yw' 'zs' 'zv' 'zw'
- f        | '5h' 'ak' 'al' 'aq' 'cw' 'd7' 'dm' 'ec' 'ee' 'ef' 'el' 'f4' 'f5' 'f8' 'fh' 'fr' 'fu' 'gh' 'hk' 'ir' 'ix' 'k0' 'k2' 'ka' 'ku' 'lg' 'lr' 'm8' 'mf' 'nq' 'of' 'ph' 'pr' 'px' 'q2' 'qf' 'qh' 'qk' 'qn' 'qq' 'qs' 'qv' 'qx' 'qy' 'qz' 're' 'rh' 'ro' 'rx' 'sa' 'sh' 'sk' 'tb' 'u1' 'ud' 'uo' 'us' 'uw' 'vg' 'vp' 'w3' 'wb' 'wc' 'wf' 'wg' 'wi' 'wk' 'yr' 'ys' 'yw' 'zw' 'zz'
- f        | 'ae' 'ak' 'ax' 'cm' 'cw' 'cx' 'df' 'dm' 'dw' 'eb' 'ef' 'ei' 'el' 'f1' 'fn' 'gu' 'hf' 'hk' 'ik' 'iw' 'jd' 'ju' 'jz' 'k7' 'ku' 'lq' 'mf' 'mw' 'oa' 'od' 'oe' 'ou' 'ow' 'pc' 'ph' 'pw' 'q0' 'q2' 'qd' 'qq' 'qw' 'qx' 'rj' 'rk' 'rn' 'rx' 's2' 'sm' 'sx' 't9' 'ti' 'tu' 'tw' 'u3' 'ud' 'wf' 'wm' 'wt' 'xl' 'xo' 'xs' 'yh' 'yi' 'ym' 'yr' 'yu' 'yw' 'z2' 'za' 'zf' 'zl' 'zz'
- f        | 'ae' 'ap' 'bi' 'd7' 'ee' 'ej' 'ek' 'ev' 'ew' 'fb' 'gm' 'hf' 'ho' 'hz' 'i6' 'ib' 'id' 'il' 'im' 'io' 'ip' 'ir' 'iv' 'j2' 'jf' 'jl' 'jo' 'kh' 'kk' 'kt' 'lr' 'm4' 'mi' 'nm' 'ns' 'og' 'pv' 'pw' 'q4' 'qd' 'qi' 'r6' 'r8' 'rn' 'rp' 'si' 't7' 'ta' 'td' 'te' 'ti' 'tm' 'u6' 'ub' 'vu' 'w6' 'w8' 'wa' 'wb' 'wc' 'wd' 'wf' 'wh' 'wn' 'wt' 'wz' 'y5' 'ya' 'yg' 'yk' 'yn' 'z3'
- f        | 'as' 'b1' 'bc' 'br' 'cd' 'dw' 'e2' 'ec' 'ew' 'f1' 'f2' 'f6' 'g0' 'gi' 'gy' 'hf' 'hk' 'if' 'ii' 'is' 'iy' 'j2' 'jp' 'kl' 'ku' 'l4' 'lg' 'lp' 'lv' 'lw' 'nd' 'ng' 'oo' 'q4' 'q6' 'q9' 'qc' 'qh' 'ql' 'qm' 'qo' 'qx' 'qz' 're' 'ro' 'sm' 't5' 'th' 'tt' 'ul' 'um' 'v0' 'vb' 'vf' 'vx' 'w9' 'wc' 'we' 'wp' 'xi' 'xl' 'xt' 'xv' 'y3' 'y6' 'ye' 'yg' 'yq' 'yw' 'yx' 'zs' 'zu'
- f        | '3y' 'a1' 'ay' 'cn' 'd3' 'dc' 'dh' 'e9' 'ef' 'ew' 'f9' 'fd' 'fg' 'ft' 'h6' 'hs' 'hu' 'hz' 'i0' 'ib' 'ip' 'iu' 'jw' 'kf' 'kp' 'kw' 'li' 'lp' 'mg' 'mj' 'mz' 'ng' 'oc' 'od' 'om' 'ou' 'ov' 'p8' 'pi' 'q8' 'qe' 'qf' 'qh' 'qj' 'qo' 'qt' 'qv' 'qz' 'r2' 'r3' 'rc' 'rm' 't4' 'ty' 'tz' 'u6' 'ua' 'ut' 'v3' 'vj' 'w0' 'w6' 'wi' 'wj' 'wq' 'wt' 'wu' 'xe' 'xv' 'xy' 'y3' 'yv' 'zw'
- f        | '4a' '56' 'ae' 'ao' 'ay' 'bn' 'bx' 'c9' 'cl' 'd0' 'd7' 'en' 'et' 'fj' 'fk' 'fu' 'g4' 'ha' 'ht' 'hv' 'ih' 'ij' 'ir' 'iw' 'k1' 'k7' 'kq' 'kw' 'lg' 'm5' 'me' 'nw' 'oj' 'ou' 'p6' 'pl' 'pq' 'pt' 'qc' 'qg' 'qk' 'ql' 'qm' 'qo' 'qq' 'rj' 's1' 'sd' 'sq' 'sz' 'tb' 'td' 'tr' 'tw' 'ug' 'uj' 'uo' 'ut' 'uy' 'wj' 'wk' 'ws' 'wz' 'x2' 'xx' 'xy' 'y1' 'y4' 'yc' 'yk' 'yt' 'yx' 'zp'
- f        | 'a2' 'a4' 'ac' 'ag' 'ao' 'ay' 'ce' 'di' 'dm' 'dr' 'dz' 'e9' 'eg' 'ej' 'el' 'em' 'eq' 'et' 'ey' 'fa' 'fw' 'fz' 'gg' 'gh' 'gp' 'gr' 'h6' 'hj' 'hk' 'i7' 'id' 'ik' 'iu' 'j2' 'kc' 'l1' 'lh' 'm5' 'm9' 'mj' 'mr' 'mx' 'ok' 'ot' 'ov' 'oz' 'p5' 'q0' 'q1' 'qe' 'qg' 'r2' 'rj' 'rk' 'rw' 'sa' 't3' 't6' 't9' 'te' 'tf' 'tj' 'tk' 'u4' 'wa' 'wf' 'wu' 'wy' 'yg' 'yj' 'ys' 'zk' 'zy'
- f        | '2b' '2e' 'ao' 'ap' 'au' 'bo' 'by' 'cr' 'do' 'du' 'dy' 'e7' 'eb' 'eh' 'em' 'ey' 'f6' 'ff' 'fu' 'gc' 'gi' 'gk' 'h1' 'hp' 'hs' 'hy' 'ia' 'ic' 'ig' 'ik' 'im' 'je' 'jf' 'ji' 'jr' 'l5' 'lf' 'lp' 'mv' 'ne' 'nt' 'oa' 'os' 'pj' 'po' 'q9' 'qd' 'qe' 'qf' 'qw' 'qy' 'ra' 'rg' 'rk' 'rp' 'rq' 'rx' 'sb' 'si' 'sn' 'ta' 'ux' 'v1' 'vd' 'wa' 'wk' 'wr' 'wu' 'xo' 'yg' 'yl' 'yz' 'zi' 'zt'
- f        | '2l' 'a5' 'ah' 'ak' 'ar' 'be' 'e6' 'eh' 'ge' 'gj' 'gn' 'gt' 'gy' 'ia' 'ii' 'iw' 'ix' 'jb' 'k9' 'kd' 'ke' 'kh' 'kv' 'lm' 'ly' 'me' 'mt' 'nb' 'np' 'o5' 'oe' 'of' 'og' 'pd' 'pf' 'pm' 'pt' 'pw' 'q3' 'qc' 'qe' 'qg' 'qh' 'qk' 'ql' 'qs' 'qt' 'qx' 'qz' 'rr' 'rw' 'rx' 'ry' 'sk' 'sr' 'su' 'sv' 'sz' 'ug' 'uk' 'uq' 'vg' 'w7' 'wb' 'wn' 'wr' 'ws' 'wz' 'x6' 'yg' 'yj' 'yo' 'zb' 'zx'
- f        | '3h' '4h' '93' 'ak' 'ao' 'bq' 'cw' 'db' 'dx' 'eb' 'ef' 'el' 'eu' 'ex' 'fc' 'fg' 'fo' 'fr' 'fs' 'fx' 'g5' 'gl' 'go' 'hs' 'i0' 'ii' 'ix' 'j3' 'jc' 'ke' 'l2' 'lf' 'lo' 'm6' 'ms' 'ne' 'oi' 'ox' 'p6' 'pb' 'pr' 'q9' 'qa' 'qi' 'qj' 'qq' 'qs' 'qu' 'qw' 're' 'rq' 's0' 'sa' 'se' 'sk' 'sx' 'tj' 'tk' 'u2' 'ua' 'uh' 'un' 'vy' 'wf' 'wh' 'wj' 'wq' 'wv' 'xl' 'xq' 'yf' 'yi' 'yw' 'z3'
- f        | 'a6' 'ac' 'ao' 'au' 'cf' 'co' 'cr' 'd9' 'da' 'ds' 'du' 'e4' 'ea' 'ew' 'f1' 'fx' 'hr' 'hu' 'ic' 'id' 'ii' 'in' 'iq' 'iy' 'j3' 'jb' 'ji' 'jl' 'kf' 'mi' 'mp' 'o3' 'oe' 'oj' 'on' 'p5' 'ph' 'pk' 'q1' 'q9' 'qa' 'qs' 'qu' 'qv' 'r9' 'rc' 'rj' 'rv' 's1' 'se' 'sl' 'su' 't2' 't5' 'tk' 'u8' 'uv' 'v9' 'vd' 'vi' 'w0' 'w3' 'we' 'wh' 'wm' 'wp' 'xm' 'y0' 'y1' 'y8' 'yf' 'yo' 'yw' 'zv'
- f        | 'a0' 'ad' 'ak' 'ao' 'au' 'b0' 'dg' 'dt' 'e9' 'em' 'fg' 'fk' 'fn' 'gq' 'h7' 'hf' 'hm' 'ia' 'id' 'ig' 'iv' 'kv' 'l1' 'lm' 'lz' 'm1' 'mw' 'mz' 'na' 'nh' 'nl' 'nn' 'o1' 'o3' 'om' 'p2' 'p9' 'pj' 'pw' 'pz' 'qk' 'qm' 'qy' 'rs' 'ru' 'ry' 'sf' 'su' 'sw' 'sx' 'td' 'tl' 'tp' 'tw' 'u1' 'ug' 'un' 'uo' 'uq' 'ur' 'v5' 'vk' 'wd' 'wf' 'wj' 'wq' 'wy' 'xg' 'xk' 'xn' 'xq' 'yb' 'z0' 'zt' 'zu'
- f        | 'a2' 'ag' 'cz' 'd0' 'd3' 'da' 'di' 'ds' 'e5' 'e6' 'e7' 'ej' 'em' 'ex' 'ff' 'fq' 'gm' 'go' 'gt' 'gv' 'gx' 'ho' 'hv' 'i8' 'ic' 'ii' 'il' 'im' 'it' 'ix' 'j1' 'ja' 'jd' 'js' 'kw' 'l6' 'le' 'lk' 'ln' 'mt' 'my' 'ns' 'ol' 'op' 'os' 'p0' 'pu' 'pv' 'pz' 'q4' 'q5' 'qe' 'qh' 'ql' 'qx' 'qy' 'r1' 'rk' 'rr' 'sb' 'sn' 'te' 'tt' 'ui' 'v6' 'w6' 'we' 'ws' 'wy' 'xt' 'xu' 'yf' 'yq' 'yz' 'zy'
- f        | '1l' '2t' '2z' 'af' 'az' 'be' 'br' 'cm' 'cu' 'cy' 'd2' 'd4' 'dd' 'dx' 'ec' 'ed' 'g2' 'gs' 'gu' 'id' 'ig' 'in' 'it' 'jh' 'jl' 'l6' 'ld' 'lg' 'lr' 'ly' 'nf' 'nj' 'ob' 'ot' 'p4' 'p8' 'pe' 'ph' 'q5' 'qa' 'qd' 'qe' 'qi' 'qo' 'qv' 'qz' 'ra' 'ri' 'rl' 'rr' 's7' 'sj' 'sx' 't0' 'tj' 'to' 'u2' 'ui' 'uq' 'ut' 'uw' 'vg' 'vs' 'w2' 'wa' 'wi' 'wl' 'wr' 'wu' 'ww' 'x7' 'xm' 'ym' 'yn' 'yp' 'zh'
- f        | 'a0' 'a7' 'ad' 'ae' 'ah' 'ay' 'b8' 'bh' 'dc' 'di' 'do' 'e5' 'ea' 'eb' 'ep' 'ev' 'fn' 'gq' 'gr' 'gs' 'h8' 'hc' 'hj' 'i3' 'ih' 'it' 'iw' 'ja' 'jf' 'kc' 'l8' 'lp' 'lx' 'ly' 'm1' 'og' 'oy' 'p7' 'pp' 'q7' 'qa' 'qm' 'qq' 'qr' 'qu' 'r3' 'rd' 'rg' 'rj' 'rw' 'si' 'sq' 'ss' 't0' 'tb' 'tg' 'tl' 'to' 'tp' 'tx' 'u9' 'ub' 'um' 'up' 'ux' 'vc' 'w0' 'w2' 'w5' 'wl' 'wy' 'xg' 'yb' 'yg' 'yh' 'za'
- f        | 'af' 'as' 'at' 'aw' 'ax' 'ay' 'az' 'b2' 'bf' 'bl' 'ck' 'cs' 'df' 'dn' 'dv' 'ei' 'ek' 'ev' 'fg' 'fm' 'h0' 'hb' 'hk' 'i0' 'ib' 'if' 'ir' 'lk' 'm5' 'mr' 'np' 'om' 'p5' 'p7' 'pl' 'pq' 'q3' 'qh' 'qi' 'qj' 'qo' 'qp' 'qs' 'qt' 'qu' 'qv' 'qy' 'ra' 'sh' 'sm' 'so' 't2' 'ta' 'ti' 'tv' 'tz' 'u1' 'ug' 'um' 'v5' 'vd' 'w1' 'wn' 'wp' 'wr' 'ws' 'ww' 'xk' 'xx' 'y7' 'yf' 'yh' 'yk' 'yt' 'zr' 'zv'
- f        | 'ai' 'ak' 'as' 'ax' 'b8' 'bd' 'bq' 'bv' 'd1' 'd8' 'dl' 'e9' 'ew' 'ez' 'fz' 'gj' 'gu' 'hk' 'hq' 'i2' 'ie' 'ip' 'iq' 'is' 'iz' 'jf' 'k0' 'kk' 'l6' 'md' 'mx' 'na' 'nf' 'o5' 'ol' 'p3' 'pe' 'q2' 'qf' 'qj' 'qm' 'qn' 'qs' 'qv' 'r2' 'ra' 'rv' 'ry' 's1' 's5' 'si' 't0' 'tc' 'te' 'tn' 'tq' 'tz' 'u1' 'uj' 'ut' 'w3' 'wa' 'wd' 'wh' 'wj' 'wo' 'wu' 'wv' 'ww' 'xk' 'xo' 'yi' 'yk' 'yl' 'zb' 'zw'
- f        | '3b' '4p' 'ae' 'aj' 'ap' 'b3' 'bb' 'c0' 'cc' 'cf' 'cn' 'dz' 'e1' 'e9' 'eo' 'ew' 'ey' 'fk' 'fo' 'gd' 'gp' 'hb' 'i8' 'ia' 'ib' 'ie' 'ij' 'iq' 'ir' 'ix' 'jo' 'kp' 'lc' 'ld' 'lp' 'ml' 'on' 'p8' 'pd' 'pf' 'pi' 'pn' 'pr' 'pt' 'pw' 'qe' 'qi' 'qj' 'qp' 'qr' 'qw' 'qz' 'r0' 'rj' 'rn' 'ro' 'rq' 'rr' 's3' 'sg' 'sz' 'tn' 'tw' 'ty' 'ui' 'uj' 'vj' 'vr' 'w5' 'w9' 'wa' 'wp' 'xt' 'ya' 'ym' 'z0' 'zr'
- f        | 'a7' 'ag' 'aq' 'aw' 'az' 'bf' 'bg' 'ce' 'cp' 'cx' 'dc' 'ek' 'en' 'es' 'fj' 'gb' 'hr' 'hs' 'ie' 'ik' 'is' 'jl' 'jr' 'kc' 'ku' 'l5' 'lj' 'lq' 'lr' 'nu' 'og' 'oj' 'os' 'oy' 'p1' 'p6' 'pc' 'pk' 'pr' 'pu' 'px' 'py' 'q1' 'q4' 'qb' 'qc' 'ql' 'qo' 'qv' 'qz' 'r9' 'ra' 'rg' 'rp' 'sq' 'ts' 'tx' 'u8' 'ue' 'ui' 'uj' 'uk' 'up' 'v4' 'vg' 'vn' 'w2' 'w9' 'wa' 'wk' 'wt' 'y0' 'y9' 'yc' 'ym' 'ys' 'zh'
- f        | 'aq' 'bo' 'cx' 'dl' 'dm' 'ed' 'ee' 'ei' 'er' 'eu' 'f4' 'fe' 'fw' 'g2' 'gj' 'h7' 'hv' 'im' 'j8' 'jf' 'kl' 'la' 'lj' 'mo' 'oc' 'oh' 'oi' 'ol' 'pa' 'pb' 'pf' 'pk' 'po' 'q9' 'qf' 'qj' 'qq' 'qv' 'r8' 're' 'rg' 'rh' 'rj' 'rr' 'ru' 'ry' 's8' 'sd' 'sg' 'sj' 'sk' 'so' 'sv' 't3' 'tz' 'u5' 'ua' 'uk' 'um' 'vi' 'vt' 'wb' 'we' 'wk' 'wn' 'wt' 'wu' 'wz' 'xk' 'xz' 'yi' 'yl' 'yz' 'z9' 'zd' 'zu' 'zw'
- f        | '3w' 'aa' 'ad' 'cj' 'cu' 'cv' 'dv' 'ei' 'ej' 'ep' 'er' 'fc' 'fd' 'g5' 'ga' 'go' 'gr' 'gs' 'hq' 'hx' 'hy' 'i1' 'i5' 'ie' 'ip' 'jh' 'jn' 'jq' 'k7' 'ks' 'l0' 'l6' 'l9' 'lm' 'm5' 'mj' 'ng' 'nh' 'o8' 'od' 'on' 'pq' 'q3' 'q8' 'qb' 'qc' 'qf' 'qp' 'qs' 'r1' 'ra' 'rj' 'rw' 'si' 'sp' 't6' 'ta' 'tc' 'tk' 'tm' 'ty' 'ua' 'ud' 'ug' 'v7' 'vg' 'vm' 'w3' 'wc' 'wi' 'wp' 'wy' 'xk' 'xv' 'yi' 'ym' 'ys' 'zl'
- f        | '5c' 'ag' 'ak' 'ao' 'ap' 'at' 'bo' 'br' 'bs' 'bw' 'cv' 'e9' 'et' 'ex' 'ez' 'fj' 'fu' 'fz' 'gm' 'gq' 'gu' 'h8' 'hl' 'i7' 'ic' 'ik' 'il' 'is' 'j1' 'jc' 'k2' 'k3' 'k6' 'k7' 'kf' 'km' 'kr' 'lj' 'mb' 'md' 'nf' 'om' 'ow' 'p4' 'pk' 'pw' 'q2' 'qe' 'qh' 'qn' 'qq' 'qu' 'qz' 'r0' 'ra' 'rp' 'ru' 'rw' 'rz' 'sv' 'ta' 'ti' 'tq' 'ua' 'up' 'us' 'ut' 'uz' 'vd' 'wl' 'wq' 'xg' 'xk' 'y0' 'yd' 'yw' 'zd' 'zq'
- f        | 'a0' 'a8' 'b4' 'b9' 'bb' 'cb' 'cn' 'cq' 'ds' 'e2' 'eb' 'ex' 'ez' 'fa' 'fu' 'fz' 'ge' 'gy' 'h0' 'hj' 'ht' 'hu' 'ig' 'in' 'iq' 'is' 'iu' 'jg' 'le' 'ln' 'lr' 'nj' 'nu' 'oe' 'oo' 'ow' 'oz' 'pf' 'ph' 'pj' 'ps' 'pu' 'pv' 'q0' 'q4' 'qf' 'qm' 'qn' 'qo' 'qq' 'qs' 'qw' 'r2' 'r3' 'ra' 'rk' 's7' 'sa' 'sp' 'tl' 'ue' 'ui' 'vo' 'vs' 'wj' 'wk' 'wn' 'wv' 'ww' 'x0' 'xg' 'xh' 'xx' 'y0' 'yd' 'yr' 'zg' 'zn'
- f        | '18' '5j' '6y' 'ax' 'bw' 'c5' 'de' 'dh' 'dl' 'do' 'dx' 'ek' 'el' 'en' 'et' 'ez' 'f1' 'fe' 'fw' 'ge' 'h1' 'h9' 'ha' 'hb' 'hl' 'it' 'jy' 'kl' 'ky' 'lo' 'nr' 'o3' 'o9' 'p0' 'pe' 'pg' 'ph' 'q1' 'q5' 'qd' 'qg' 'qh' 'qi' 'qj' 'qp' 'qq' 'qr' 'qv' 'qx' 'r0' 'rd' 're' 'rj' 'rm' 'rn' 'rq' 'rv' 'se' 'sv' 'to' 'tz' 'uo' 'v1' 'vm' 'vr' 'wa' 'we' 'wf' 'wh' 'wp' 'wt' 'wy' 'xe' 'xh' 'xz' 'y6' 'yn' 'zm' 'zy'
- f        | '1s' '95' 'ac' 'aq' 'cb' 'ch' 'cq' 'ct' 'cz' 'dg' 'dj' 'eb' 'ed' 'ee' 'eg' 'en' 'eo' 'ep' 'es' 'fc' 'fl' 'fp' 'gu' 'gw' 'hx' 'i0' 'i2' 'ig' 'ih' 'il' 'in' 'iu' 'iy' 'iz' 'jc' 'k7' 'ka' 'kl' 'km' 'kn' 'lz' 'mx' 'n6' 'nc' 'og' 'pt' 'pw' 'q0' 'qa' 'qe' 'qf' 'ql' 'qm' 'qp' 'qt' 'r7' 'rp' 'ru' 'rw' 'sb' 'sd' 't0' 't7' 'ta' 'tl' 'tn' 'tv' 'ty' 'ui' 'vx' 'wa' 'wc' 'wm' 'wp' 'wy' 'xi' 'xj' 'xk' 'yz'
- f        | '2o' '2w' 'ac' 'an' 'bb' 'be' 'c3' 'db' 'dj' 'dm' 'dw' 'eb' 'ed' 'eh' 'ew' 'ex' 'fb' 'fi' 'g2' 'gh' 'gv' 'h6' 'hw' 'id' 'ie' 'iz' 'j8' 'jk' 'jv' 'kd' 'lk' 'm8' 'ml' 'mr' 'mx' 'np' 'oe' 'on' 'oz' 'pj' 'pk' 'pm' 'pu' 'qb' 'ql' 'qv' 'qx' 'r0' 're' 'rj' 'rq' 'rw' 't3' 'ta' 'tc' 'td' 'th' 'to' 'tu' 'tx' 'ty' 'tz' 'u3' 'uf' 'vp' 'vz' 'wd' 'wh' 'wk' 'wl' 'wx' 'wy' 'wz' 'xe' 'xm' 'xs' 'ye' 'zd' 'zk'
- f        | '2v' '7g' 'a1' 'ar' 'bw' 'cs' 'dt' 'ee' 'eg' 'f4' 'fd' 'fl' 'g0' 'ge' 'gx' 'hf' 'hk' 'ht' 'i7' 'il' 'jy' 'ka' 'kl' 'lb' 'lm' 'lv' 'mu' 'nk' 'ns' 'nw' 'oe' 'og' 'oj' 'ol' 'ou' 'pk' 'q2' 'q3' 'qi' 'qn' 'qo' 'qs' 'qy' 'r5' 'rh' 'rj' 'rm' 'rq' 'rr' 'rs' 'rt' 'ru' 'rv' 'ss' 'th' 'tj' 'uj' 'ul' 'um' 'un' 'uo' 'uv' 'w2' 'w6' 'wf' 'wh' 'wk' 'wo' 'wx' 'y4' 'y5' 'yb' 'yn' 'yo' 'ys' 'yz' 'zb' 'zt' 'zw'
- f        | 'ab' 'ah' 'ax' 'bd' 'ca' 'dh' 'e3' 'ea' 'ed' 'ef' 'en' 'eo' 'er' 'ev' 'ex' 'ez' 'f5' 'fh' 'fo' 'fv' 'ga' 'gb' 'gk' 'id' 'ik' 'in' 'ir' 'jp' 'js' 'jv' 'kf' 'kr' 'lx' 'mu' 'mz' 'n5' 'od' 'on' 'pr' 'pt' 'pv' 'qb' 'qe' 'qj' 'ql' 'qq' 'qu' 'qw' 'rd' 'rl' 'rz' 's4' 'sv' 'ta' 'tj' 'tk' 'u8' 'ui' 'uj' 'uk' 'um' 'ux' 'uz' 'v9' 'vh' 'vl' 'w7' 'wb' 'wi' 'wm' 'ws' 'xi' 'ye' 'yg' 'yr' 'yw' 'zj' 'zn' 'zs'
- f        | '17' 'bv' 'c5' 'cn' 'd0' 'di' 'dm' 'dz' 'ec' 'ef' 'et' 'ev' 'ew' 'fa' 'fb' 'fh' 'fw' 'fy' 'g8' 'he' 'hf' 'hp' 'hu' 'hz' 'i2' 'ig' 'ix' 'jy' 'lt' 'mi' 'nm' 'nq' 'o5' 'oa' 'od' 'oi' 'oo' 'ox' 'pb' 'po' 'qb' 'qc' 'qf' 'qr' 'qs' 'qt' 'qw' 'qx' 'r0' 'rb' 'rf' 'rh' 'rk' 'ry' 'sb' 'sf' 'sh' 'st' 'tb' 'tj' 'tn' 'tq' 'tu' 'ty' 'u9' 'ud' 'ut' 'uw' 'ux' 'w4' 'wi' 'xm' 'ya' 'yl' 'ys' 'yt' 'yv' 'yy' 'zb' 'zv'
- f        | '19' '1t' 'aa' 'ah' 'ak' 'an' 'aq' 'bx' 'cc' 'dd' 'ed' 'ee' 'ei' 'ej' 'en' 'er' 'es' 'eu' 'fj' 'fs' 'fy' 'gd' 'gs' 'hw' 'ie' 'ig' 'ix' 'jc' 'jj' 'jk' 'jq' 'kb' 'kv' 'li' 'mr' 'no' 'nq' 'o9' 'oo' 'os' 'oy' 'p2' 'pd' 'ph' 'pn' 'pp' 'ql' 'qr' 'qy' 'r1' 'rb' 'rd' 'rn' 'ru' 's9' 'sf' 'tk' 'to' 'u1' 'u5' 'ub' 'ud' 'uf' 'vh' 'vx' 'w1' 'w8' 'wg' 'wn' 'wq' 'wu' 'wy' 'xc' 'xm' 'xw' 'y8' 'yk' 'yr' 'z3' 'zm'
- f        | '1n' '2h' 'at' 'ax' 'c0' 'cn' 'dc' 'df' 'dg' 'e1' 'e5' 'ea' 'eq' 'ex' 'ez' 'f7' 'f8' 'fa' 'gt' 'gv' 'gy' 'hb' 'i3' 'i8' 'id' 'iw' 'ix' 'jc' 'jg' 'k0' 'kh' 'ky' 'kz' 'lj' 'lm' 'lq' 'mj' 'o8' 'og' 'op' 'ow' 'p5' 'p9' 'qc' 'qe' 'qf' 'qg' 'qo' 'qq' 'qv' 'qz' 'rq' 'rt' 'ru' 's2' 's5' 'sf' 'sl' 'sm' 'st' 'sw' 'tc' 'tl' 'ts' 'tz' 'ud' 'ur' 've' 'wd' 'wj' 'wn' 'wq' 'xa' 'xb' 'yf' 'yj' 'yn' 'yt' 'yv' 'zf'
- f        | '5h' 'a2' 'ad' 'ag' 'ar' 'cf' 'ch' 'dd' 'e6' 'ei' 'el' 'em' 'f3' 'fx' 'ga' 'gm' 'h8' 'hi' 'hl' 'hm' 'ix' 'jb' 'l5' 'm2' 'mh' 'mm' 'mu' 'n9' 'nf' 'nq' 'nw' 'o4' 'oe' 'pa' 'pl' 'q1' 'qb' 'qd' 'qi' 'qj' 'qk' 'qu' 'qy' 'r0' 'r3' 'r8' 'rg' 'rj' 'rt' 's1' 'sa' 'ss' 'sx' 'tb' 'tc' 'tj' 'uf' 'uh' 'um' 'uo' 'ut' 'vf' 'vo' 'w4' 'w7' 'wf' 'wk' 'wp' 'wq' 'wr' 'wt' 'wy' 'wz' 'xk' 'xt' 'ye' 'yv' 'zd' 'zp' 'zw'
- f        | 'a9' 'ad' 'az' 'bo' 'bq' 'by' 'c8' 'cb' 'cp' 'd9' 'de' 'dj' 'dp' 'e4' 'ef' 'ey' 'fn' 'gc' 'ge' 'gp' 'gs' 'gu' 'gx' 'hf' 'ic' 'ie' 'ir' 'kc' 'kp' 'ku' 'l2' 'lv' 'mx' 'n7' 'o3' 'o7' 'oe' 'pb' 'ps' 'q3' 'q4' 'qb' 'qn' 'qo' 'qq' 'qu' 'qw' 'r3' 'ra' 'rk' 'sg' 'si' 'sv' 'sw' 'tb' 'tg' 'tw' 'u2' 'uc' 'uf' 'uj' 'us' 'ut' 'uu' 'v3' 'va' 'wa' 'wd' 'ww' 'wy' 'wz' 'xk' 'y6' 'y8' 'ya' 'yc' 'ye' 'yo' 'yx' 'z3'
- f        | '2b' 'a4' 'aa' 'ay' 'br' 'cf' 'd3' 'dh' 'dw' 'e1' 'e8' 'eg' 'en' 'ep' 'ff' 'fj' 'g2' 'go' 'gq' 'i4' 'i8' 'if' 'jc' 'jj' 'jo' 'k1' 'kk' 'ks' 'la' 'ld' 'lm' 'm4' 'ml' 'o4' 'oe' 'og' 'os' 'oy' 'pc' 'pd' 'pr' 'px' 'q5' 'q6' 'qd' 'qh' 'qj' 'ql' 'qo' 'qt' 'qu' 'qw' 'rb' 're' 'rk' 'rn' 'rr' 'rw' 'sl' 'sm' 'te' 'tf' 'tk' 'u6' 'ui' 'ul' 'uo' 'ur' 'us' 'va' 'vt' 'w7' 'wf' 'wg' 'wm' 'wn' 'ws' 'xo' 'y8' 'yj' 'zh'
- f        | '3q' 'am' 'ar' 'az' 'bo' 'cb' 'cv' 'dd' 'ds' 'e1' 'e7' 'en' 'eq' 'er' 'eu' 'ew' 'fq' 'fx' 'g8' 'gm' 'h5' 'ic' 'if' 'jp' 'kw' 'kz' 'l4' 'lf' 'li' 'lm' 'lq' 'lu' 'lz' 'ml' 'nz' 'o4' 'o6' 'op' 'ow' 'po' 'py' 'qj' 'qk' 'qn' 'qp' 'qw' 'qz' 'r6' 'r8' 'rc' 'rl' 'rt' 's6' 'sh' 'sx' 'sz' 'tc' 'ti' 'tt' 'ty' 'uf' 'uh' 'uj' 'um' 'ut' 'uu' 'uv' 'vn' 'vt' 'we' 'wh' 'wi' 'wq' 'wu' 'wz' 'xn' 'y4' 'yu' 'yz' 'z9' 'ze'
- f        | 'a5' 'ao' 'av' 'b0' 'bh' 'bk' 'cj' 'd0' 'do' 'ds' 'e1' 'ee' 'ep' 'fa' 'fh' 'fv' 'hc' 'hh' 'hq' 'i1' 'if' 'iv' 'ix' 'iy' 'jq' 'jw' 'jz' 'ko' 'll' 'lr' 'lx' 'ns' 'nz' 'og' 'or' 'os' 'oz' 'p0' 'p8' 'pr' 'pv' 'q6' 'q9' 'qb' 'qd' 'qe' 'qh' 'qi' 'qq' 'qt' 'qu' 'qy' 'rd' 'ri' 'rq' 'rr' 'ry' 'sf' 'sg' 'sh' 'si' 'sw' 'sx' 'tc' 'tq' 'u3' 'uh' 'ul' 'us' 'wg' 'wn' 'wx' 'x3' 'xb' 'ya' 'yg' 'yn' 'yo' 'yp' 'yr' 'yw'
- f        | 'a7' 'ad' 'aq' 'ck' 'cu' 'd8' 'db' 'do' 'dt' 'e7' 'eg' 'em' 'eq' 'ex' 'ez' 'fl' 'gr' 'h4' 'hd' 'he' 'hg' 'id' 'ie' 'if' 'in' 'io' 'j4' 'j7' 'je' 'jm' 'jo' 'k5' 'kg' 'kj' 'kn' 'l9' 'lb' 'lc' 'ld' 'lf' 'li' 'lj' 'na' 'nz' 'oa' 'ok' 'oo' 'pj' 'px' 'q3' 'q4' 'q6' 'qd' 'qi' 'qm' 'qq' 'qt' 'qx' 'r1' 'rg' 'ri' 'rn' 'sm' 'so' 'su' 'sy' 'tq' 'u5' 'uc' 'ue' 'us' 'w3' 'wc' 'we' 'wj' 'wk' 'wt' 'x8' 'xj' 'yc' 'yy'
- f        | '2l' 'a4' 'ae' 'ag' 'cb' 'cs' 'cu' 'cy' 'dd' 'dj' 'ed' 'ee' 'ef' 'es' 'ex' 'ey' 'ft' 'fy' 'gs' 'h4' 'ho' 'ht' 'i2' 'i7' 'ia' 'iq' 'iz' 'jz' 'ku' 'kv' 'lq' 'mv' 'of' 'oi' 'op' 'pb' 'pd' 'pl' 'pn' 'pq' 'q0' 'q3' 'qe' 'qi' 'qp' 'qs' 'qy' 'qz' 'r3' 'ra' 'rh' 'rk' 'ry' 'sj' 'st' 'ta' 'tc' 'te' 'tf' 'th' 'ti' 'to' 'tt' 'u2' 'u5' 'vf' 'vx' 'w4' 'w7' 'wm' 'wt' 'ww' 'wx' 'x2' 'xi' 'y1' 'ye' 'yq' 'yv' 'za' 'zo' 'zy'
- f        | '4a' 'aj' 'an' 'aq' 'ax' 'bb' 'bh' 'ci' 'cn' 'd4' 'df' 'ea' 'ef' 'ek' 'en' 'eo' 'ex' 'fc' 'fj' 'fz' 'gb' 'gl' 'h7' 'hg' 'i1' 'i4' 'ia' 'im' 'j9' 'jg' 'ji' 'jj' 'kl' 'l2' 'lb' 'ld' 'lh' 'm1' 'mf' 'n1' 'nd' 'ob' 'od' 'ot' 'ph' 'pk' 'po' 'pv' 'q1' 'q2' 'q4' 'qb' 'qu' 'qz' 'ra' 'rh' 'ro' 'rp' 's1' 'si' 'sl' 'sn' 't7' 't8' 'ta' 'tc' 'ub' 'ue' 'ul' 'v9' 'w7' 'wd' 'xq' 'y5' 'yj' 'yl' 'yp' 'yw' 'z9' 'zb' 'zu' 'zy'
- f        | '8w' 'ao' 'aw' 'bk' 'by' 'c5' 'ch' 'cw' 'd0' 'dh' 'e2' 'eq' 'ev' 'ha' 'hk' 'ii' 'ir' 'iv' 'j8' 'ki' 'kp' 'lm' 'lx' 'nh' 'ns' 'nt' 'o3' 'on' 'ov' 'ow' 'ox' 'pl' 'q3' 'qc' 'qd' 'qe' 'qh' 'qm' 'qo' 'qr' 'qs' 'qt' 'qx' 'r2' 'r8' 'rc' 'rd' 'rh' 'ri' 'rk' 'rq' 'rt' 's3' 'sm' 'sq' 'sz' 't1' 't6' 'tx' 'u2' 'ue' 'up' 'uq' 'ut' 'ux' 'vg' 'vp' 'w3' 'wb' 'wc' 'wd' 'wr' 'xf' 'xp' 'y1' 'ya' 'yf' 'yg' 'yi' 'yn' 'yq' 'zn'
- f        | '5i' 'a4' 'a8' 'ae' 'af' 'am' 'ap' 'ax' 'bf' 'cr' 'cw' 'dk' 'dz' 'ea' 'eb' 'ec' 'ef' 'ep' 'er' 'et' 'ex' 'fp' 'fv' 'gh' 'hy' 'hz' 'i8' 'ig' 'io' 'iq' 'ji' 'jw' 'kt' 'le' 'lo' 'mi' 'nb' 'nq' 'o1' 'ol' 'oo' 'oq' 'oy' 'q3' 'q8' 'qi' 'qk' 'qo' 'qq' 'qs' 'r0' 'rg' 'rl' 'rt' 's6' 'sb' 'sk' 'sq' 't9' 'ta' 'tb' 'tg' 'tj' 'tu' 'ty' 'un' 'ur' 'uw' 'vi' 'wf' 'wk' 'wo' 'wt' 'wy' 'xj' 'xq' 'y0' 'y1' 'y9' 'yc' 'yn' 'yu' 'zs'
- f        | '6q' 'ac' 'ag' 'av' 'aw' 'az' 'bj' 'bq' 'bx' 'cj' 'dc' 'dd' 'dq' 'eg' 'ei' 'ek' 'em' 'f7' 'fg' 'fq' 'fx' 'gb' 'gp' 'hb' 'hk' 'i9' 'ii' 'im' 'ip' 'ir' 'iz' 'jx' 'le' 'lf' 'll' 'lx' 'mp' 'mv' 'of' 'oq' 'pb' 'pg' 'pj' 'py' 'pz' 'qi' 'qk' 'ql' 'qs' 'qu' 'qw' 'r8' 'ra' 'rc' 'rj' 'sj' 'tg' 'tk' 'tl' 'tm' 'tp' 'tw' 'u4' 'uf' 'ui' 'um' 'vu' 'w7' 'wd' 'wn' 'wt' 'wy' 'wz' 'y1' 'y3' 'y9' 'yl' 'yo' 'yq' 'yu' 'zb' 'zu' 'zv'
- f        | 'a1' 'a6' 'aq' 'bk' 'bu' 'ch' 'dd' 'dj' 'dx' 'e7' 'ef' 'ei' 'ek' 'el' 'ez' 'fp' 'ft' 'gb' 'go' 'hd' 'hh' 'hj' 'ho' 'hs' 'ic' 'il' 'ip' 'jh' 'jn' 'jq' 'jx' 'kq' 'kv' 'la' 'm8' 'mv' 'ng' 'oh' 'or' 'p7' 'p9' 'pe' 'pk' 'px' 'q7' 'qc' 'qd' 'qh' 'qj' 'qk' 'qr' 'qx' 'rd' 'rl' 'rq' 'sl' 'sq' 'st' 'sy' 'th' 'tn' 'u9' 'uc' 'ud' 'ug' 'uy' 'uz' 'vl' 'vn' 'wa' 'wb' 'wd' 'wt' 'xi' 'xs' 'xz' 'y5' 'yi' 'yk' 'yt' 'yw' 'z7' 'zg'
- f        | 'a2' 'a8' 'ae' 'b3' 'b5' 'bn' 'bq' 'd4' 'd7' 'dh' 'dl' 'dt' 'e6' 'es' 'fa' 'fb' 'ff' 'gd' 'ge' 'h8' 'hj' 'hm' 'hq' 'hw' 'hy' 'im' 'ip' 'kb' 'kh' 'ku' 'lm' 'ly' 'mf' 'nn' 'o0' 'oi' 'ok' 'or' 'pn' 'po' 'pq' 'pt' 'pv' 'q4' 'qc' 'qd' 'qu' 'qv' 'rd' 'rh' 'ri' 'rk' 'rp' 'rr' 'ru' 'si' 'sk' 'sq' 'ss' 'sx' 'sy' 'ta' 'tm' 'tq' 'tx' 'ul' 'um' 'uv' 'vj' 'vt' 'w7' 'wh' 'wi' 'wl' 'wn' 'wp' 'wq' 'ww' 'xb' 'y6' 'yq' 'z2' 'zn'
- f        | 'a3' 'b3' 'bv' 'ck' 'cl' 'cs' 'cv' 'cy' 'dc' 'dl' 'dq' 'dr' 'du' 'eg' 'el' 'en' 'ex' 'fv' 'fx' 'gd' 'gk' 'gu' 'h7' 'ic' 'jf' 'jz' 'lf' 'lq' 'nl' 'nm' 'o6' 'ob' 'ol' 'pe' 'po' 'q2' 'qa' 'qk' 'qo' 'qp' 'qr' 'qv' 'qz' 'r5' 're' 'rk' 'ss' 'sv' 't2' 'tf' 'ti' 'tj' 'ua' 'ud' 'v8' 'vb' 'vg' 'vh' 'vi' 'w1' 'w5' 'wb' 'wd' 'we' 'wf' 'wj' 'wr' 'ws' 'wv' 'xq' 'xs' 'y1' 'ye' 'yi' 'yp' 'yr' 'ys' 'yu' 'yw' 'z7' 'z8' 'zf' 'zq'
- f        | 'a7' 'a9' 'al' 'aq' 'ar' 'as' 'b2' 'cj' 'cl' 'co' 'cu' 'cv' 'dc' 'e3' 'e5' 'e7' 'ea' 'ee' 'eh' 'en' 'es' 'ev' 'ez' 'fl' 'fp' 'gm' 'hm' 'it' 'iu' 'iv' 'j8' 'jd' 'jo' 'kn' 'ko' 'ky' 'ln' 'mr' 'nc' 'o2' 'ok' 'ot' 'pc' 'pe' 'pz' 'q2' 'qe' 'qi' 'qq' 'qr' 'qs' 'r8' 'rm' 'rn' 'ro' 'rx' 'sz' 'te' 'tn' 'tq' 'tx' 'u1' 'ub' 'ul' 'up' 'uq' 'wf' 'wh' 'wk' 'wl' 'wo' 'wq' 'wt' 'wu' 'wv' 'xh' 'xz' 'y5' 'y9' 'yv' 'yx' 'yz' 'zj'
- f        | 'a8' 'am' 'as' 'bb' 'cn' 'co' 'dd' 'di' 'dx' 'dz' 'e3' 'e5' 'ea' 'ef' 'eh' 'el' 'en' 'eo' 'ew' 'fe' 'fg' 'gc' 'gi' 'gj' 'gp' 'ha' 'hl' 'hy' 'i3' 'id' 'ij' 'ir' 'is' 'k9' 'kc' 'kf' 'l9' 'ln' 'ls' 'lw' 'm0' 'm8' 'my' 'nn' 'on' 'p9' 'ph' 'pm' 'pw' 'q1' 'q3' 'qc' 'qm' 'qq' 'qv' 'rg' 'ro' 'se' 'sw' 'sx' 'ta' 'tl' 'tz' 'u4' 'uo' 'vg' 'vl' 'vm' 'vn' 'w3' 'wd' 'wm' 'wo' 'wp' 'wt' 'yg' 'yj' 'yv' 'yx' 'yz' 'zu' 'zx' 'zy'
- f        | 'ag' 'ao' 'ay' 'bk' 'bl' 'bw' 'cq' 'dp' 'dv' 'e5' 'ee' 'eu' 'fv' 'fx' 'gg' 'h8' 'ha' 'hk' 'ii' 'im' 'iq' 'it' 'je' 'jf' 'jr' 'js' 'km' 'ks' 'lo' 'lz' 'o8' 'ot' 'pg' 'pl' 'q3' 'q9' 'qa' 'qd' 'qe' 'qf' 'qh' 'qn' 'qq' 'qy' 'qz' 'r7' 're' 'ri' 'rl' 'ro' 'rr' 'rx' 'ry' 'sh' 'sl' 'ss' 'sw' 't5' 'ta' 'te' 'th' 'tr' 'tt' 'tu' 'tv' 'u7' 'uk' 'um' 'up' 'uu' 'vl' 'vw' 'w0' 'wl' 'ws' 'wt' 'ww' 'xe' 'ya' 'yb' 'ye' 'yf' 'za'
- f        | '2i' 'ap' 'aw' 'bd' 'bs' 'c9' 'db' 'di' 'dl' 'dq' 'dr' 'e5' 'ej' 'el' 'ez' 'f9' 'ga' 'gp' 'hm' 'if' 'im' 'j9' 'k9' 'ka' 'kd' 'kj' 'lc' 'lf' 'lk' 'mf' 'mq' 'mr' 'o3' 'oe' 'oj' 'op' 'p5' 'p7' 'p8' 'pb' 'pv' 'py' 'qc' 'qd' 'qf' 'qi' 'qk' 'qq' 'qu' 'qw' 'qz' 'r2' 'r8' 'r9' 'rj' 'rk' 'ry' 'rz' 'sd' 'sk' 'sm' 't2' 't6' 't7' 'tp' 'tq' 'tt' 'tw' 'u7' 'uh' 'uv' 'vh' 'w0' 'wc' 'we' 'wh' 'wk' 'wl' 'yf' 'yk' 'ys' 'zi' 'zq' 'zs'
- f        | '39' 'a9' 'ag' 'ap' 'ax' 'b9' 'c3' 'dn' 'e4' 'ea' 'f7' 'f9' 'g2' 'gi' 'h4' 'ht' 'ie' 'ij' 'ir' 'is' 'it' 'jd' 'jj' 'jv' 'kp' 'kt' 'kv' 'lh' 'ln' 'ls' 'mg' 'mh' 'nc' 'nh' 'o0' 'o2' 'od' 'ox' 'pb' 'pn' 'po' 'pz' 'q1' 'q8' 'qc' 'qd' 'qf' 'qh' 'qi' 'qk' 'qz' 'rd' 'rg' 'ro' 'rz' 's7' 'sa' 'sf' 'sn' 'sw' 'tk' 'tu' 'tw' 'u7' 'uu' 'vh' 'wa' 'wd' 'wk' 'wr' 'wu' 'wy' 'wz' 'xh' 'xm' 'xt' 'yb' 'yi' 'yj' 'yn' 'yr' 'z1' 'z8' 'zn'
- f        | '14' '1t' 'aa' 'ab' 'ag' 'aq' 'ax' 'bc' 'cb' 'cm' 'd1' 'db' 'ea' 'ek' 'en' 'ey' 'f0' 'g6' 'g7' 'gx' 'ha' 'ho' 'i1' 'i6' 'i8' 'it' 'iw' 'jl' 'jp' 'ko' 'kt' 'la' 'le' 'mb' 'mk' 'mt' 'n6' 'na' 'ob' 'oc' 'od' 'on' 'op' 'or' 'ot' 'q6' 'qd' 'qf' 'qk' 'qp' 'qq' 'qr' 'qw' 'qy' 'r5' 'rf' 'rk' 'se' 'sp' 'sx' 't0' 'tj' 'tk' 'tq' 'tv' 'tx' 'u0' 'ub' 'ue' 'uf' 'um' 'us' 'uu' 'v9' 'vi' 'wb' 'wo' 'wu' 'wy' 'x9' 'xs' 'xu' 'y0' 'yo' 'zi'
- f        | '1a' '3r' 'ai' 'b8' 'bp' 'd6' 'do' 'dp' 'du' 'e0' 'e1' 'ek' 'es' 'eu' 'ey' 'ez' 'fq' 'fs' 'fy' 'gd' 'gm' 'h1' 'hu' 'i0' 'is' 'iv' 'iz' 'jd' 'jn' 'jz' 'kc' 'lf' 'lp' 'lt' 'ly' 'm2' 'mb' 'mt' 'n1' 'nr' 'of' 'oi' 'oq' 'ow' 'pe' 'pm' 'pn' 'q0' 'qb' 'qg' 'qk' 'qo' 'qz' 'r4' 'r8' 'ra' 'rn' 'rs' 's7' 'sa' 'sj' 'so' 'su' 'sv' 'sx' 'ti' 'tl' 'ts' 'ty' 'u4' 'up' 'vr' 'w2' 'wg' 'wi' 'wk' 'wl' 'ws' 'xl' 'xx' 'yf' 'yk' 'yn' 'yq' 'yv'
- f        | '1r' '2z' '3d' '6d' 'ay' 'bb' 'bh' 'bq' 'bv' 'cn' 'cr' 'cs' 'd5' 'd9' 'dh' 'dq' 'dw' 'dz' 'e5' 'ea' 'eb' 'eh' 'er' 'fu' 'g0' 'ga' 'gc' 'h4' 'hf' 'hh' 'hx' 'ih' 'io' 'jz' 'kk' 'ko' 'li' 'lz' 'n1' 'n4' 'nn' 'nt' 'o8' 'oa' 'oe' 'oh' 'ov' 'oz' 'p2' 'p5' 'pg' 'pt' 'px' 'qa' 'qe' 'qg' 'qm' 'qt' 'qv' 'qx' 'ro' 'rp' 'rv' 's6' 'sh' 'sn' 'sx' 'sz' 't6' 'th' 'tj' 'tu' 'u5' 'uk' 'uq' 'wg' 'wp' 'wv' 'xe' 'xv' 'y4' 'yf' 'yo' 'yx' 'zr'
- f        | '27' '4g' 'a2' 'al' 'bp' 'ca' 'cp' 'da' 'dt' 'e8' 'ee' 'ef' 'eg' 'ej' 'eq' 'eu' 'ev' 'fe' 'gn' 'gq' 'gy' 'i5' 'ic' 'il' 'io' 'ir' 'iw' 'iz' 'j2' 'kz' 'l2' 'l8' 'lh' 'ln' 'lt' 'np' 'ns' 'oi' 'oj' 'or' 'ph' 'pr' 'pt' 'qa' 'qh' 'qi' 'qs' 'qt' 'qu' 'r1' 'rd' 'ry' 's8' 'sj' 'sk' 'sl' 'sq' 'td' 'te' 'tg' 'tj' 'tq' 'tx' 'u0' 'ub' 'ul' 'uu' 'ux' 'uy' 'v0' 've' 'vg' 'vk' 'wa' 'wj' 'ws' 'wu' 'yb' 'yd' 'yi' 'yk' 'yo' 'yr' 'ys' 'zp'
- f        | '2a' '3o' '6w' '9h' 'ag' 'ak' 'cu' 'db' 'e3' 'ei' 'ep' 'eq' 'f6' 'fm' 'fq' 'fz' 'g5' 'gi' 'gk' 'gn' 'gp' 'gx' 'hb' 'hw' 'ia' 'ic' 'id' 'ig' 'ih' 'im' 'jh' 'jy' 'k3' 'kh' 'kv' 'l4' 'lf' 'lh' 'lu' 'ni' 'o7' 'oe' 'oi' 'op' 'os' 'ow' 'p0' 'p1' 'pj' 'pp' 'qa' 'qe' 'qi' 'qm' 'qz' 'rb' 're' 'rh' 'sa' 'sn' 'te' 'th' 'u3' 'ui' 'uj' 'us' 'vh' 'w1' 'w7' 'wc' 'wg' 'wh' 'wo' 'wx' 'xr' 'xw' 'xz' 'y5' 'y6' 'y9' 'ye' 'yo' 'ze' 'zg' 'zp'
- f        | '2i' 'am' 'ar' 'bl' 'by' 'ci' 'da' 'db' 'dc' 'dg' 'ea' 'ed' 'ei' 'ek' 'em' 'en' 'er' 'f2' 'f7' 'fi' 'fj' 'fu' 'fy' 'g0' 'g8' 'gn' 'gr' 'hl' 'hr' 'i2' 'it' 'ix' 'jg' 'jr' 'ju' 'jx' 'lh' 'lj' 'm8' 'n7' 'o1' 'o5' 'ob' 'og' 'ok' 'oz' 'pg' 'pl' 'pz' 'q4' 'q9' 'qf' 'qh' 'qn' 'qt' 'qu' 'qw' 're' 'ri' 'rn' 'ro' 'rp' 'rz' 's7' 'st' 'sz' 't3' 'tk' 'tw' 'u1' 'u5' 'uh' 'uy' 've' 'vh' 'w1' 'x2' 'xi' 'y4' 'ya' 'yi' 'yk' 'yn' 'zb' 'zo'
- f        | '2v' '7j' '7r' 'a7' 'aj' 'av' 'br' 'cg' 'd8' 'ei' 'en' 'ez' 'f5' 'fb' 'go' 'h0' 'hf' 'hk' 'hm' 'i9' 'ia' 'ig' 'ik' 'im' 'iq' 'it' 'iv' 'ja' 'je' 'ji' 'ks' 'lo' 'mo' 'mq' 'nj' 'o5' 'of' 'on' 'ot' 'ox' 'p1' 'p6' 'pb' 'ph' 'pj' 'pn' 'pp' 'pq' 'pr' 'qa' 'qh' 'qj' 'qm' 'qn' 'qo' 'qu' 'r2' 'ro' 's1' 'sa' 'se' 'sp' 't6' 'ti' 'tu' 'u2' 'ug' 'uh' 'ui' 'ur' 'uy' 'v9' 'wl' 'wn' 'wt' 'wv' 'wy' 'wz' 'xm' 'xs' 'ya' 'yi' 'yu' 'z8' 'zl'
- f        | '68' 'af' 'as' 'at' 'cf' 'ci' 'cx' 'dl' 'dt' 'dv' 'e4' 'ea' 'eg' 'es' 'fd' 'fi' 'fo' 'g1' 'gd' 'gy' 'he' 'hu' 'hw' 'hz' 'i0' 'ia' 'if' 'io' 'it' 'iv' 'iz' 'j0' 'jc' 'jj' 'jm' 'kb' 'ki' 'kk' 'ku' 'ky' 'lr' 'nv' 'oi' 'om' 'p3' 'pa' 'pt' 'qe' 'qh' 'qj' 'qm' 'qq' 'qs' 'qt' 'qu' 'r3' 'rp' 'rr' 'rw' 'rx' 's2' 'sc' 'sp' 'ti' 'tn' 'tv' 'ty' 'ue' 'uk' 'ul' 'up' 'ut' 'uu' 'uw' 'vf' 'vp' 'w2' 'w7' 'wb' 'wl' 'wq' 'xg' 'yc' 'yh' 'z3'
- f        | 'a8' 'ad' 'ai' 'al' 'as' 'av' 'ay' 'az' 'bf' 'bg' 'c6' 'dc' 'dd' 'dz' 'ef' 'eh' 'eu' 'ft' 'g0' 'g4' 'gf' 'gm' 'hq' 'im' 'iw' 'ix' 'j5' 'jj' 'jn' 'jv' 'k1' 'ko' 'ma' 'n0' 'nw' 'o9' 'om' 'op' 'ox' 'p4' 'pa' 'pe' 'pm' 'ps' 'q2' 'qb' 'qc' 'qf' 'qi' 'ql' 'qu' 'qw' 'qy' 'qz' 'rl' 'rn' 'rs' 'ru' 'se' 'sf' 'sm' 't8' 'tc' 'tg' 'uq' 'uz' 'va' 'vj' 'wa' 'we' 'wg' 'wk' 'wq' 'wu' 'wy' 'xb' 'xo' 'y3' 'ye' 'ym' 'ys' 'yt' 'z8' 'zd' 'zo'
- f        | 'aa' 'af' 'bp' 'c2' 'cd' 'ci' 'dl' 'du' 'dz' 'es' 'fn' 'fo' 'g7' 'ga' 'gc' 'gj' 'gx' 'hc' 'ht' 'iu' 'jl' 'jm' 'ke' 'kk' 'kr' 'lc' 'le' 'lr' 'lw' 'ms' 'n2' 'nq' 'nw' 'nz' 'o1' 'op' 'oq' 'ot' 'ow' 'p0' 'pb' 'pp' 'pr' 'qc' 'qh' 'qp' 'qr' 'qu' 'qy' 'r3' 'r9' 'rc' 'rk' 'rr' 'ry' 'sb' 'sf' 'sk' 'sl' 't1' 'ta' 'tb' 'tk' 'tz' 'ud' 'ur' 've' 'vn' 'vt' 'vw' 'w6' 'w9' 'wg' 'wk' 'xg' 'yg' 'yh' 'yj' 'ys' 'yt' 'yv' 'yy' 'z3' 'zo' 'zq'
- f        | '1o' '1v' '4v' 'ab' 'at' 'b5' 'bw' 'bz' 'cm' 'dc' 'dh' 'dj' 'dk' 'dq' 'e1' 'e5' 'ee' 'el' 'em' 'eo' 'ep' 'ew' 'fi' 'fy' 'gd' 'gh' 'gw' 'h7' 'i6' 'ia' 'ii' 'ip' 'is' 'iu' 'jk' 'k5' 'kb' 'mf' 'mp' 'mw' 'mx' 'n1' 'na' 'nm' 'nq' 'ob' 'of' 'pa' 'pb' 'pd' 'pu' 'q4' 'qb' 'qe' 'qf' 'qj' 'qo' 'qr' 're' 'rj' 'ro' 'rt' 'rv' 'sb' 'sp' 'st' 'ub' 'ue' 'um' 'vz' 'w3' 'w7' 'w8' 'wh' 'wo' 'wt' 'x5' 'x9' 'xd' 'xj' 'xm' 'ya' 'yb' 'yg' 'zr' 'zv'
- f        | '2d' '2w' 'ag' 'aj' 'am' 'ce' 'd2' 'd4' 'dd' 'dn' 'e0' 'e6' 'ef' 'ej' 'ek' 'er' 'f9' 'fd' 'fe' 'fq' 'ft' 'fv' 'gq' 'gy' 'he' 'ij' 'iq' 'it' 'iy' 'jf' 'jl' 'jr' 'ju' 'kq' 'ku' 'lm' 'nj' 'nw' 'nx' 'oa' 'oe' 'oj' 'p2' 'pa' 'pm' 'pq' 'pv' 'q5' 'q9' 'qb' 'qd' 'qg' 'qj' 'qk' 'ql' 'qm' 'qu' 'qx' 'qz' 'rp' 'rq' 'rs' 's5' 'sk' 'ss' 'sy' 't2' 'ta' 'ts' 'tw' 'tx' 'u5' 'w3' 'w7' 'wa' 'wp' 'ws' 'wu' 'wy' 'wz' 'xz' 'y4' 'yn' 'yy' 'zt' 'zw'
- f        | '3h' 'aw' 'az' 'b2' 'bl' 'bq' 'bt' 'c0' 'cd' 'ck' 'cm' 'cw' 'cy' 'd3' 'e0' 'ef' 'eo' 'ew' 'fj' 'fk' 'gb' 'gc' 'gm' 'gt' 'gz' 'hv' 'in' 'ix' 'jb' 'jg' 'jl' 'jn' 'js' 'k7' 'kg' 'ku' 'kx' 'kz' 'ld' 'nb' 'ni' 'o3' 'o6' 'od' 'om' 'p3' 'p4' 'pn' 'pu' 'q7' 'qd' 'qh' 'qp' 'qq' 'qr' 'qv' 'qy' 'qz' 'rq' 'sb' 'se' 'sf' 'sh' 'sm' 't0' 'tg' 'tj' 'tl' 'tq' 'ua' 'uk' 'us' 'wd' 'we' 'wj' 'wn' 'wq' 'wv' 'wz' 'yd' 'yg' 'ym' 'yn' 'yr' 'zc' 'zz'
- f        | 'ac' 'al' 'am' 'ap' 'ar' 'av' 'c1' 'cl' 'cz' 'dm' 'dp' 'dt' 'du' 'e0' 'es' 'eu' 'ev' 'ez' 'fa' 'fc' 'fj' 'fw' 'fz' 'gm' 'gx' 'ha' 'i6' 'i7' 'if' 'iz' 'j0' 'jd' 'jx' 'k0' 'kr' 'mj' 'mk' 'mp' 'n4' 'nm' 'om' 'ot' 'pl' 'px' 'qa' 'qb' 'qg' 'qk' 'qn' 'qo' 'qr' 'qu' 'r7' 'rc' 'rk' 's3' 's4' 'se' 'ss' 'su' 't8' 'ta' 'te' 'tj' 'tk' 'ts' 'tz' 'ub' 'v2' 'wb' 'wd' 'we' 'wf' 'wj' 'wq' 'wr' 'ws' 'wv' 'wx' 'y6' 'ym' 'yn' 'yq' 'ys' 'yv' 'zt'
- f        | '20' 'ag' 'az' 'b9' 'bg' 'bh' 'c2' 'dd' 'di' 'do' 'dw' 'e1' 'e3' 'e8' 'eb' 'ev' 'fc' 'fj' 'fu' 'fw' 'fx' 'gb' 'gf' 'hu' 'hw' 'hz' 'ih' 'ik' 'iq' 'jc' 'jq' 'ka' 'kf' 'kh' 'kw' 'ky' 'ly' 'lz' 'mc' 'n8' 'o3' 'o7' 'oa' 'os' 'ou' 'pf' 'q5' 'q6' 'qg' 'ql' 'qo' 'qy' 'r2' 'rf' 'rp' 'ru' 'ry' 's1' 's5' 'se' 'si' 'sn' 'su' 'ta' 'tn' 'tu' 'tv' 'tw' 'u9' 'ua' 'uh' 'uu' 'vo' 'w8' 'wa' 'wc' 'we' 'wi' 'wu' 'ww' 'wy' 'x3' 'xl' 'yb' 'yg' 'yk' 'yv'
- f        | '5f' 'ac' 'ad' 'aj' 'av' 'bg' 'ch' 'ci' 'dg' 'di' 'dl' 'dx' 'ep' 'ew' 'f8' 'fp' 'fr' 'fs' 'g4' 'g6' 'gb' 'h5' 'he' 'hk' 'hx' 'i1' 'ic' 'im' 'ji' 'jm' 'js' 'k9' 'kq' 'lf' 'ln' 'mj' 'n2' 'ni' 'no' 'o5' 'oi' 'ot' 'oy' 'pa' 'pj' 'qk' 'qq' 'qt' 'qu' 'r4' 'r8' 'rb' 'rh' 'rj' 'rm' 'ro' 'rp' 'rq' 'rt' 'ru' 'sb' 'th' 'tu' 'tz' 'u9' 'un' 'uo' 'us' 've' 'vi' 'vq' 'vx' 'wf' 'wg' 'wi' 'wq' 'wr' 'wt' 'x5' 'xz' 'y6' 'yd' 'yo' 'yq' 'yx' 'z3' 'zl'
- f        | 'a5' 'av' 'dc' 'dm' 'dt' 'dw' 'e2' 'ea' 'en' 'et' 'ez' 'f2' 'fg' 'fn' 'fv' 'gn' 'gu' 'h5' 'ht' 'i2' 'ie' 'ik' 'il' 'in' 'it' 'iv' 'iy' 'ji' 'jj' 'ju' 'kf' 'kn' 'ko' 'ku' 'l6' 'ls' 'nz' 'o2' 'o4' 'of' 'on' 'op' 'p7' 'q0' 'q2' 'qa' 'qt' 'r1' 'r9' 'ri' 'rq' 'rv' 'se' 'sp' 'sx' 't0' 't2' 't9' 'te' 'tq' 'tu' 'u8' 'uc' 'ue' 'ug' 'ui' 'ut' 'uu' 'v0' 'v7' 'vs' 'w0' 'wc' 'wh' 'wn' 'wo' 'ws' 'y1' 'y3' 'y5' 'ya' 'yc' 'yi' 'ys' 'yt' 'zf' 'zq'
- f        | 'ab' 'ag' 'aw' 'b4' 'd4' 'ds' 'e1' 'ea' 'eb' 'ee' 'ef' 'eh' 'ek' 'el' 'en' 'eu' 'ex' 'fv' 'fx' 'gi' 'gp' 'gt' 'i3' 'ie' 'jd' 'jk' 'jn' 'kv' 'l7' 'n8' 'ns' 'nx' 'o2' 'o3' 'oh' 'os' 'ow' 'p2' 'pr' 'pu' 'q3' 'qd' 'qe' 'qk' 'qq' 'qz' 'r9' 'rb' 'ri' 'rm' 'rr' 'rw' 'ry' 'sc' 'sj' 'sl' 'sx' 'tk' 'tr' 'tw' 'u4' 'ub' 'ud' 'uf' 'uh' 'un' 'uv' 'v6' 'vc' 'vf' 'vi' 'wg' 'wr' 'ws' 'wv' 'x7' 'xf' 'xo' 'y0' 'yi' 'yo' 'yt' 'yy' 'za' 'zm' 'zu' 'zx'
- f        | 'ad' 'af' 'aj' 'am' 'aq' 'ba' 'bo' 'c0' 'c5' 'cx' 'da' 'dc' 'dk' 'ed' 'ek' 'en' 'eo' 'ep' 'ew' 'fb' 'g4' 'gd' 'h2' 'hm' 'ho' 'hy' 'ib' 'if' 'io' 'ir' 'iv' 'iz' 'jc' 'jp' 'jt' 'kr' 'lo' 'me' 'na' 'nc' 'nh' 'o6' 'ok' 'oq' 'or' 'ow' 'pn' 'ps' 'q6' 'qa' 'qj' 'qo' 'qx' 'r2' 'r6' 'rd' 're' 'rg' 'rw' 'ta' 'tk' 'uj' 'uo' 'vn' 'wc' 'wh' 'wj' 'wl' 'wu' 'wv' 'ww' 'wx' 'xe' 'xl' 'xn' 'xo' 'xs' 'yb' 'yl' 'yp' 'yw' 'zg' 'zq' 'zr' 'zu' 'zx' 'zy'
- f        | 'am' 'as' 'b1' 'd3' 'db' 'dl' 'ea' 'ed' 'ee' 'el' 'em' 'ep' 'er' 'ew' 'ez' 'f4' 'fm' 'go' 'h9' 'he' 'hl' 'i0' 'ie' 'ii' 'iz' 'ji' 'kl' 'kn' 'lc' 'lr' 'm7' 'mb' 'mt' 'my' 'no' 'nu' 'oo' 'or' 'ov' 'ox' 'pe' 'pq' 'q7' 'qc' 'qd' 'qi' 'qj' 'qo' 'qr' 'qs' 'qv' 'qw' 'r0' 'r8' 're' 'rm' 'rn' 'rp' 's0' 'so' 'sp' 'sw' 'sy' 'te' 'tg' 'tl' 'tr' 'uq' 'uz' 'vk' 'wk' 'wl' 'wp' 'wq' 'wr' 'wu' 'ww' 'xs' 'y0' 'yb' 'yn' 'yr' 'ys' 'yt' 'yy' 'zh' 'zr'
- f        | '1v' '44' 'aj' 'al' 'am' 'ba' 'bi' 'br' 'bt' 'c0' 'd6' 'dg' 'di' 'e1' 'e4' 'ei' 'ek' 'er' 'et' 'eu' 'ev' 'ex' 'fa' 'fc' 'fe' 'fh' 'fr' 'ga' 'gh' 'gu' 'hp' 'hq' 'ib' 'if' 'io' 'ix' 'jo' 'jv' 'kd' 'l1' 'me' 'mh' 'mn' 'mo' 'mt' 'n7' 'nf' 'nk' 'oe' 'oy' 'pa' 'pg' 'pj' 'pm' 'pn' 'pq' 'py' 'q1' 'qd' 'qe' 'qi' 'qj' 'qr' 'qs' 'qz' 'rb' 'rs' 'su' 'sw' 't5' 'ti' 'tx' 'uc' 'ug' 'ui' 'uq' 'uz' 'v6' 'vp' 'we' 'wf' 'wj' 'wm' 'wx' 'xe' 'y7' 'yt' 'yy'
- f        | '1x' 'a2' 'ah' 'az' 'bb' 'be' 'bz' 'd1' 'dd' 'du' 'ee' 'eh' 'en' 'eu' 'ey' 'ez' 'fl' 'fs' 'g4' 'gm' 'gr' 'ha' 'hf' 'hg' 'hr' 'hw' 'i6' 'id' 'ij' 'j2' 'jv' 'k9' 'lg' 'm9' 'md' 'me' 'mg' 'mp' 'nd' 'nf' 'ng' 'nj' 'ny' 'nz' 'oj' 'os' 'pi' 'pj' 'pt' 'q9' 'qa' 'qf' 'qh' 'qk' 'qn' 'qq' 'qs' 'rz' 'sb' 't7' 't8' 'tw' 'ty' 'u2' 'u3' 'ua' 'ub' 'uy' 'uz' 'w1' 'w3' 'w5' 'wa' 'wc' 'we' 'wh' 'wp' 'wr' 'xd' 'xs' 'y3' 'yd' 'yk' 'yl' 'yo' 'ze' 'zh' 'zo'
- f        | '4n' '6a' 'a3' 'a5' 'aa' 'ae' 'ag' 'b9' 'ca' 'cf' 'd1' 'da' 'dr' 'dz' 'ee' 'el' 'et' 'ey' 'fj' 'fs' 'gl' 'hk' 'hl' 'hn' 'ie' 'ih' 'im' 'ix' 'j1' 'jr' 'kf' 'kk' 'lc' 'lk' 'lp' 'lx' 'mh' 'mt' 'mx' 'my' 'nr' 'nu' 'o6' 'og' 'oo' 'p4' 'p7' 'pj' 'pr' 'q3' 'qc' 'qd' 'qj' 'qk' 'ql' 'qp' 'qt' 'qv' 'qx' 'r8' 're' 'rm' 'rs' 'ru' 'rv' 'sp' 'sw' 'td' 'tk' 'to' 'tw' 'tz' 'u8' 'uf' 'vf' 'vw' 'w7' 'wq' 'wr' 'xe' 'ym' 'yo' 'yr' 'ys' 'yz' 'zc' 'zn' 'zs'
- f        | 'a3' 'ag' 'ar' 'au' 'ax' 'be' 'cy' 'd7' 'dd' 'do' 'e3' 'eb' 'eo' 'er' 'ev' 'ey' 'fp' 'gj' 'hk' 'hw' 'hy' 'if' 'ig' 'ii' 'in' 'io' 'iq' 'is' 'kh' 'll' 'n8' 'nd' 'np' 'nz' 'og' 'ot' 'ox' 'oy' 'pe' 'px' 'qa' 'qb' 'qe' 'qf' 'qh' 'qj' 'qm' 'qn' 'qt' 'qu' 'qw' 'qx' 'r6' 'r9' 'rb' 'rc' 'rd' 'rn' 'rq' 'se' 't7' 'tb' 'ti' 'tq' 'u0' 'u6' 'ub' 'ud' 'vd' 'vj' 'vl' 'vo' 'wd' 'wg' 'wh' 'wi' 'wk' 'wo' 'wv' 'wz' 'xy' 'y9' 'yl' 'ym' 'yo' 'yp' 'ys' 'yu'
- f        | 'ad' 'av' 'be' 'bi' 'bk' 'bu' 'ce' 'cv' 'd8' 'df' 'dh' 'du' 'e1' 'em' 'ep' 'ex' 'ey' 'f1' 'fd' 'fh' 'fp' 'gn' 'gu' 'h8' 'i8' 'ii' 'il' 'iz' 'j0' 'ji' 'jv' 'jz' 'k2' 'k9' 'ky' 'l9' 'lo' 'm6' 'mc' 'md' 'ng' 'nz' 'ot' 'p2' 'pa' 'pj' 'ps' 'pv' 'q5' 'qd' 'qf' 'qm' 'qq' 'qr' 'qt' 'qv' 'qx' 'rc' 'rh' 'rp' 'rq' 'rs' 'sb' 'sc' 'te' 'to' 'ts' 'tw' 'up' 'vn' 'vw' 'wa' 'wg' 'wh' 'wn' 'wp' 'wz' 'xc' 'xf' 'xt' 'y5' 'yh' 'yn' 'yy' 'yz' 'za' 'zh' 'zy'
- f        | 'aj' 'ak' 'aq' 'ba' 'bd' 'bj' 'bk' 'bx' 'cr' 'cx' 'd0' 'dj' 'dl' 'ef' 'ei' 'ej' 'ek' 'em' 'eq' 'er' 'f3' 'f7' 'fi' 'fp' 'gv' 'h7' 'ha' 'hc' 'hh' 'hk' 'hn' 'ia' 'id' 'im' 'iq' 'is' 'iw' 'ji' 'jk' 'js' 'ju' 'jx' 'l0' 'm1' 'mq' 'ng' 'o8' 'ot' 'ov' 'oy' 'p1' 'pu' 'pv' 'pz' 'qc' 'qh' 'qm' 'qq' 'qs' 'qt' 'qw' 'rc' 'rq' 'rt' 'sd' 't5' 'ta' 'tb' 'tj' 'tp' 'uk' 'un' 'v9' 'vt' 'wa' 'wd' 'wf' 'wm' 'wn' 'wv' 'wz' 'xp' 'ya' 'yg' 'ym' 'yn' 'yr' 'zi'
- f        | 'aj' 'as' 'aw' 'bc' 'bj' 'bm' 'cd' 'd7' 'd9' 'di' 'ef' 'er' 'es' 'ew' 'fi' 'ft' 'g2' 'gq' 'gx' 'h9' 'he' 'hg' 'hu' 'i8' 'ie' 'ik' 'im' 'iq' 'ix' 'iy' 'jf' 'ji' 'ka' 'kl' 'kt' 'la' 'lf' 'm8' 'm9' 'nh' 'nw' 'o7' 'oi' 'pi' 'ps' 'q6' 'qa' 'qb' 'qf' 'qm' 'qo' 'qq' 'qs' 'r9' 'rb' 'rf' 'rk' 'rx' 'sa' 'sb' 'sp' 't1' 'tb' 'tl' 'tm' 'u6' 'uc' 'um' 'un' 'ur' 'w3' 'wj' 'wu' 'xm' 'xr' 'xy' 'ya' 'yd' 'ye' 'yf' 'yj' 'yo' 'ys' 'zc' 'zg' 'zl' 'zv' 'zz'
- f        | '1g' '3e' 'a5' 'ae' 'ar' 'bt' 'cb' 'ck' 'co' 'd5' 'dh' 'dm' 'dr' 'dt' 'e0' 'e9' 'eh' 'el' 'em' 'f2' 'f3' 'fb' 'ff' 'fg' 'gu' 'hb' 'he' 'hr' 'hx' 'i7' 'ib' 'if' 'ig' 'io' 'iu' 'jc' 'jo' 'jv' 'kh' 'kx' 'lb' 'lh' 'lw' 'lx' 'ly' 'mp' 'oa' 'oc' 'oz' 'pa' 'q9' 'qi' 'qp' 'qq' 'qw' 'r3' 'rb' 'rd' 're' 'rn' 'ry' 'rz' 's5' 'su' 'sz' 'td' 'tf' 'tt' 'u9' 'uh' 'um' 'un' 'va' 'vh' 'vt' 'w7' 'wb' 'wc' 'wg' 'wh' 'wx' 'xd' 'xz' 'y8' 'yf' 'yg' 'yh' 'ym' 'zy'
- f        | '1t' 'am' 'aw' 'b4' 'bi' 'bm' 'bx' 'cd' 'cj' 'cv' 'e5' 'ek' 'eo' 'er' 'ex' 'f5' 'f8' 'fp' 'fr' 'fw' 'ga' 'gy' 'hm' 'hs' 'ip' 'ir' 'is' 'it' 'iv' 'iz' 'jf' 'jm' 'jp' 'ju' 'k6' 'kk' 'kr' 'lb' 'le' 'lt' 'mj' 'nk' 'np' 'nr' 'oa' 'oj' 'pm' 'pn' 'q1' 'q3' 'qb' 'qc' 'qf' 'qh' 'qi' 'qj' 'qq' 'qt' 'qw' 'qy' 'r2' 'r8' 'rf' 'rh' 'rw' 's9' 't3' 'te' 'ti' 'tn' 'tq' 'uu' 'uv' 'uw' 'w0' 'w1' 'w3' 'w7' 'wc' 'wi' 'wk' 'wn' 'wr' 'wt' 'xm' 'y5' 'ya' 'z7' 'zu'
- f        | '1f' '2j' '2q' '5c' 'am' 'ap' 'aq' 'az' 'bu' 'bx' 'cr' 'e0' 'e7' 'ea' 'eb' 'ec' 'eg' 'ew' 'ey' 'fh' 'fk' 'g2' 'go' 'h4' 'h8' 'ha' 'hb' 'hm' 'ia' 'ic' 'ie' 'ik' 'iu' 'iv' 'j7' 'ja' 'k9' 'kw' 'lp' 'ly' 'mb' 'ns' 'ny' 'o0' 'of' 'ok' 'oz' 'pe' 'pr' 'qb' 'qd' 'qg' 'qt' 'qx' 'qy' 'rg' 'ro' 'rq' 'rz' 'sh' 'si' 'sl' 'sm' 'td' 'tg' 'tx' 'uh' 'um' 'up' 'uw' 've' 'vl' 'vp' 'vw' 'w2' 'w5' 'wc' 'wf' 'wi' 'wn' 'wq' 'ws' 'wv' 'wy' 'wz' 'x1' 'xr' 'y1' 'zs' 'zz'
- f        | '1q' '2n' '4p' '8n' 'a3' 'aa' 'bn' 'bq' 'bu' 'cg' 'db' 'dl' 'dx' 'dy' 'e2' 'e3' 'e4' 'ea' 'eq' 'ff' 'fk' 'fn' 'fv' 'gf' 'gh' 'h1' 'hs' 'hu' 'ij' 'in' 'iv' 'kc' 'ke' 'ln' 'm2' 'mc' 'mf' 'o2' 'og' 'oo' 'ov' 'p8' 'pl' 'pm' 'ps' 'pv' 'pz' 'qa' 'qc' 'qe' 'qh' 'qi' 'qj' 'qm' 'qo' 'qq' 'qv' 'qw' 'qy' 're' 'rz' 'sd' 'si' 'sj' 'sp' 'su' 'tc' 'tk' 'tn' 'tq' 'u7' 'ut' 'uv' 'v5' 'vr' 'wb' 'we' 'wm' 'ws' 'wv' 'xc' 'xy' 'y9' 'yj' 'yq' 'yv' 'yw' 'zb' 'zw' 'zz'
- f        | '2t' '4d' 'bb' 'bd' 'cg' 'co' 'd6' 'db' 'dg' 'dn' 'do' 'dy' 'e1' 'e3' 'e6' 'ec' 'em' 'en' 'ep' 'es' 'ev' 'ew' 'fu' 'fz' 'gc' 'gt' 'hg' 'hl' 'hy' 'id' 'in' 'io' 'ir' 'iu' 'iw' 'jl' 'jo' 'jp' 'jw' 'k4' 'ke' 'ku' 'ld' 'lg' 'li' 'lj' 'lr' 'ls' 'm7' 'n8' 'o6' 'oi' 'op' 'oy' 'pi' 'pq' 'qk' 'qm' 'qn' 'qp' 'qr' 'qu' 'qv' 'qz' 'r3' 're' 'rj' 'rk' 'rq' 'ru' 'rw' 'rz' 'sh' 'si' 'ta' 'to' 'uq' 'ux' 'vc' 'vr' 'wb' 'wh' 'wn' 'wo' 'wy' 'xg' 'y7' 'yb' 'yd' 'yo'
- f        | '4w' 'ad' 'ak' 'as' 'b3' 'bd' 'cy' 'dt' 'du' 'dy' 'e2' 'e4' 'en' 'es' 'et' 'ew' 'ex' 'f2' 'fl' 'fr' 'ft' 'gv' 'h1' 'ha' 'hd' 'hh' 'hs' 'hv' 'ic' 'io' 'ja' 'jm' 'k2' 'ku' 'kw' 'ld' 'ls' 'lx' 'ma' 'nu' 'ny' 'ov' 'pm' 'ps' 'q6' 'qa' 'qd' 'qo' 'qs' 'qv' 'qy' 'ra' 'rs' 'rt' 'rv' 'rw' 's8' 'sa' 'sw' 'tj' 'ug' 'ui' 'ur' 'ut' 'ux' 'v6' 'vt' 'w4' 'w7' 'wa' 'wb' 'wc' 'wg' 'wh' 'wi' 'wt' 'wu' 'wy' 'wz' 'x2' 'xb' 'xm' 'yg' 'yh' 'yi' 'yu' 'yy' 'z5' 'zg' 'zo'
- f        | '97' 'ac' 'ah' 'bn' 'c8' 'dl' 'ds' 'dw' 'e2' 'eb' 'eg' 'ej' 'ep' 'eu' 'f1' 'fe' 'g9' 'gs' 'h0' 'ha' 'he' 'hh' 'hy' 'i0' 'i8' 'i9' 'ia' 'ij' 'ip' 'jr' 'jt' 'jw' 'kq' 'lo' 'lq' 'm7' 'me' 'na' 'ns' 'o1' 'od' 'oe' 'oi' 'om' 'oz' 'pc' 'pj' 'pk' 'qh' 'qi' 'qj' 'ql' 'qo' 'qq' 'qr' 'qs' 'qt' 'qw' 'qz' 'rc' 're' 'rh' 'ri' 'rr' 'sz' 'tc' 'tf' 'tk' 'tl' 'ue' 'uh' 'uj' 'un' 'uz' 'vq' 'vr' 'vv' 'w3' 'w4' 'we' 'wk' 'wt' 'wx' 'xa' 'xh' 'xl' 'yg' 'yi' 'yj' 'ym'
- f        | 'ae' 'av' 'bj' 'bk' 'c3' 'd3' 'dj' 'eb' 'ed' 'ef' 'ei' 'ej' 'en' 'ep' 'fl' 'fp' 'fr' 'fu' 'fz' 'g8' 'gd' 'h6' 'ht' 'hu' 'i7' 'if' 'im' 'j0' 'j1' 'je' 'jx' 'ku' 'l6' 'l7' 'll' 'lp' 'mc' 'ns' 'o4' 'oi' 'op' 'oz' 'q4' 'qa' 'qf' 'qh' 'ql' 'qn' 'qv' 'r0' 'r1' 'r4' 'rh' 'rj' 'rw' 'sd' 'sn' 'so' 't6' 'ti' 'tw' 'uc' 'uf' 'uk' 'ul' 'uw' 'v3' 'v8' 'vd' 'vr' 'w7' 'w9' 'wa' 'wb' 'wg' 'wh' 'wk' 'wl' 'wn' 'wo' 'wz' 'xf' 'xg' 'xo' 'xv' 'y2' 'yl' 'zr' 'zs' 'zw'
- f        | '4k' 'af' 'ah' 'b7' 'bj' 'by' 'ci' 'df' 'ds' 'eh' 'em' 'eq' 'ey' 'ez' 'fu' 'fv' 'g1' 'ga' 'go' 'gs' 'gy' 'gz' 'ho' 'i0' 'ie' 'ir' 'iv' 'k5' 'kj' 'ks' 'kw' 'l4' 'li' 'm0' 'mo' 'o8' 'ol' 'oq' 'os' 'ox' 'pk' 'pl' 'pq' 'q3' 'q6' 'qa' 'qg' 'qj' 'qn' 'qq' 'qr' 'qu' 'r5' 'r9' 'rb' 'ri' 'rl' 'rs' 'ry' 's7' 's9' 'sa' 'sd' 'sx' 'ta' 'tc' 'td' 'tf' 'tg' 'th' 'ti' 'to' 'tq' 'tv' 'uo' 'ut' 've' 'vt' 'w8' 'wg' 'wm' 'ws' 'wy' 'xy' 'y8' 'ya' 'yc' 'yf' 'ys' 'yu' 'zy'
- f        | 'aa' 'av' 'ay' 'bn' 'by' 'cm' 'da' 'dd' 'dj' 'dk' 'dr' 'dz' 'eu' 'ev' 'ez' 'f1' 'f8' 'gr' 'he' 'hp' 'hs' 'hw' 'iz' 'k1' 'kc' 'km' 'ko' 'kt' 'ln' 'ls' 'mx' 'n3' 'nl' 'oe' 'oj' 'om' 'os' 'oy' 'pg' 'pr' 'pt' 'pv' 'qa' 'qc' 'qe' 'qi' 'qj' 'qm' 'qn' 'qq' 'qu' 'qx' 'qz' 'r0' 'r1' 'rf' 'rs' 'rx' 'ry' 's4' 'sg' 't2' 'tq' 'tt' 'tv' 'ty' 'ua' 'uj' 'uq' 'vi' 'vk' 'vx' 'wc' 'we' 'wi' 'wl' 'wo' 'wp' 'wv' 'ww' 'xi' 'xr' 'xs' 'y9' 'yg' 'ym' 'yr' 'yt' 'yz' 'zo' 'zw'
- f        | 'ag' 'bm' 'co' 'cr' 'd7' 'dk' 'do' 'e6' 'e9' 'eb' 'ed' 'ef' 'eh' 'ep' 'eq' 'ew' 'f4' 'fd' 'fr' 'gc' 'gg' 'gq' 'gt' 'gv' 'h0' 'h4' 'hi' 'hm' 'i4' 'ib' 'im' 'is' 'j0' 'jc' 'jd' 'jo' 'ka' 'kk' 'kx' 'm3' 'nj' 'nr' 'nu' 'o2' 'ob' 'oe' 'oi' 'om' 'ow' 'oz' 'p3' 'pd' 'pf' 'ph' 'qi' 'qj' 'qu' 'qw' 'qy' 'r2' 'ra' 'rg' 'rj' 'rm' 'rn' 'ro' 'rp' 'rr' 'ry' 'rz' 's3' 'sa' 'so' 't6' 't7' 'ta' 'tc' 'u3' 'ub' 'vj' 'vm' 'vn' 'w7' 'wb' 'wf' 'wk' 'wn' 'x2' 'yi' 'zf' 'zh'
- f        | 'av' 'aw' 'bl' 'bt' 'cj' 'cx' 'df' 'ea' 'ed' 'ee' 'ef' 'ew' 'f5' 'fq' 'ft' 'fu' 'g6' 'gl' 'gs' 'ha' 'hj' 'hr' 'i8' 'ia' 'ic' 'ir' 'iz' 'j0' 'j5' 'jp' 'ju' 'k6' 'ki' 'lk' 'lz' 'mh' 'nl' 'o4' 'ob' 'oo' 'op' 'pf' 'po' 'pq' 'pr' 'q2' 'q3' 'q6' 'qd' 'qj' 'qk' 'qn' 'qt' 'qw' 'ro' 'rr' 'ru' 'rv' 'sc' 'sw' 'sy' 'sz' 't2' 'tb' 'tg' 'tl' 'tp' 'tv' 'u4' 'u9' 'um' 'uu' 'vj' 'vt' 'vu' 'wg' 'wh' 'wj' 'wo' 'wq' 'wt' 'xd' 'y1' 'yc' 'ye' 'yl' 'yw' 'zb' 'zd' 'zm' 'zr'
- f        | '41' '7r' 'a2' 'ad' 'aj' 'ak' 'ao' 'as' 'b1' 'b2' 'cn' 'db' 'eb' 'ec' 'ee' 'em' 'ev' 'ex' 'f8' 'fa' 'fo' 'fs' 'fu' 'gh' 'gk' 'gr' 'gx' 'iq' 'iv' 'j9' 'jb' 'jc' 'jr' 'kf' 'lg' 'm1' 'mq' 'mt' 'ne' 'nv' 'o5' 'od' 'os' 'ox' 'pc' 'pj' 'pq' 'q1' 'q6' 'q7' 'q8' 'qk' 'qm' 'qn' 'qp' 'qs' 'rj' 'rk' 's5' 'sb' 'sk' 'sn' 'sv' 't4' 'tb' 'th' 'ti' 'uc' 'uj' 'ut' 'vh' 'vp' 'wg' 'wi' 'wk' 'wp' 'ws' 'wv' 'wx' 'wy' 'x6' 'xa' 'xg' 'xr' 'xy' 'y6' 'yj' 'yo' 'yv' 'yw' 'zt' 'zw'
- f        | '5z' 'ad' 'al' 'ax' 'b4' 'bx' 'd7' 'da' 'dp' 'dz' 'e3' 'ef' 'en' 'es' 'et' 'ev' 'ex' 'f6' 'fj' 'fr' 'ft' 'fv' 'h9' 'hn' 'hx' 'i0' 'ii' 'it' 'jf' 'jk' 'jl' 'ka' 'kr' 'l9' 'lf' 'm3' 'mm' 'nc' 'nd' 'nr' 'o8' 'oe' 'ok' 'om' 'pd' 'ph' 'pz' 'qd' 'qf' 'qo' 'qp' 'qw' 'qx' 'qy' 'r6' 'rc' 'rg' 'rw' 'rx' 's8' 'se' 't3' 'tb' 'tc' 'ti' 'tl' 'to' 'tw' 'ub' 'ue' 'uf' 'uy' 'vf' 'vh' 'vr' 'w0' 'w9' 'wd' 'wf' 'wh' 'wp' 'wu' 'x0' 'x8' 'y2' 'ye' 'yq' 'ys' 'yt' 'z6' 'zf' 'zp'
- f        | '7u' '7z' 'a0' 'a5' 'c6' 'cj' 'cx' 'do' 'e4' 'eg' 'eh' 'eq' 'ey' 'ez' 'fe' 'fu' 'gk' 'gy' 'h9' 'ih' 'ik' 'il' 'j0' 'jt' 'jy' 'k1' 'k5' 'ke' 'lp' 'lx' 'ly' 'ma' 'mj' 'mm' 'mt' 'nb' 'nm' 'o3' 'o5' 'of' 'oi' 'ov' 'p2' 'pf' 'ph' 'pt' 'q8' 'qj' 'qk' 'qp' 'qs' 'r1' 'r8' 'rl' 'rp' 'rt' 's5' 'sb' 'sh' 'sk' 'so' 'sr' 'su' 'tc' 'tn' 'tr' 'tx' 'u4' 'uh' 'ul' 'up' 'ur' 'uw' 'uy' 'vm' 'w5' 'wb' 'wj' 'wm' 'wq' 'wy' 'x6' 'xq' 'xs' 'y8' 'y9' 'yi' 'yj' 'yv' 'yx' 'zi' 'zy'
- f        | 'a7' 'a9' 'ab' 'af' 'ah' 'bc' 'bg' 'bi' 'c2' 'cj' 'cl' 'dj' 'dn' 'do' 'dv' 'dw' 'e5' 'ec' 'es' 'f4' 'fa' 'fk' 'fv' 'h9' 'hi' 'hu' 'i5' 'ic' 'ig' 'im' 'ir' 'ji' 'jt' 'k2' 'kc' 'kd' 'ki' 'km' 'kz' 'l3' 'lh' 'li' 'lv' 'ml' 'ne' 'ni' 'nt' 'nx' 'o9' 'pm' 'pn' 'pr' 'px' 'q0' 'qa' 'qe' 'qj' 'r6' 'ra' 'rj' 'rn' 'rq' 'ru' 'ry' 's0' 'sq' 'tb' 'to' 'tw' 'ua' 'ub' 'uf' 'ui' 'un' 'uu' 'vi' 'vo' 'vv' 'w5' 'w7' 'w8' 'wo' 'wv' 'wy' 'xy' 'y2' 'ya' 'yh' 'yj' 'yo' 'za' 'zh'
- f        | '0h' '42' 'ak' 'al' 'bf' 'bz' 'co' 'd3' 'dc' 'dt' 'dy' 'ed' 'ee' 'eg' 'ev' 'ew' 'fg' 'fr' 'fz' 'gi' 'gy' 'ha' 'hb' 'hd' 'hl' 'hn' 'hs' 'ht' 'ij' 'io' 'iv' 'jh' 'jl' 'jr' 'kc' 'kj' 'kt' 'ku' 'ky' 'ln' 'ml' 'mu' 'ng' 'nm' 'o0' 'o1' 'of' 'oh' 'or' 'p8' 'q8' 'qb' 'qp' 'qr' 'qt' 'qu' 'qv' 'r8' 'rj' 'rl' 'rp' 'rw' 'sk' 'ss' 'sw' 't9' 'th' 'tl' 'u5' 'uj' 'us' 'vg' 'vt' 'vz' 'w4' 'wb' 'we' 'wl' 'ww' 'wx' 'wy' 'wz' 'xj' 'yb' 'yg' 'yn' 'yp' 'ys' 'yw' 'yz' 'zk' 'zp' 'zu'
- f        | '2s' 'a7' 'ae' 'am' 'bx' 'd5' 'de' 'do' 'ds' 'dt' 'e1' 'e3' 'e7' 'ed' 'ee' 'eg' 'ek' 'em' 'es' 'ev' 'fi' 'fw' 'g2' 'gf' 'gs' 'gu' 'gy' 'h7' 'hh' 'hi' 'hm' 'hu' 'ih' 'in' 'io' 'jr' 'js' 'jw' 'k0' 'k5' 'kb' 'l4' 'lu' 'm6' 'm8' 'mc' 'nb' 'od' 'ox' 'pc' 'pg' 'pv' 'py' 'q5' 'qc' 'qe' 'qf' 'qh' 'ql' 'qm' 'qo' 'qq' 'ra' 'rk' 'ro' 'rp' 'rr' 'ru' 'rw' 'se' 'sh' 't9' 'to' 'tq' 'tt' 'tw' 'u1' 'u4' 'ui' 'un' 'uq' 'vr' 'vy' 'vz' 'wh' 'wp' 'ws' 'wt' 'wy' 'xt' 'y8' 'yd' 'zp'
- f        | '3g' 'af' 'aj' 'ak' 'ap' 'as' 'au' 'cp' 'cx' 'dh' 'dn' 'dr' 'ds' 'ej' 'en' 'eo' 'et' 'eu' 'ex' 'fq' 'fs' 'ft' 'gw' 'h5' 'i5' 'ix' 'j6' 'jc' 'jg' 'k1' 'kb' 'kh' 'kn' 'kv' 'lj' 'lu' 'mc' 'mi' 'na' 'nq' 'ns' 'o4' 'o7' 'of' 'q5' 'q7' 'qe' 'qh' 'qi' 'qk' 'qr' 'qu' 'qw' 'r9' 'rb' 'ri' 'rx' 's3' 'sf' 'sm' 'so' 'sq' 'ss' 'su' 'sy' 't7' 'ta' 'ti' 'tn' 'tr' 'tx' 'u1' 'u3' 'ue' 'uh' 'up' 'uw' 'uy' 'va' 'w6' 'wg' 'wm' 'wp' 'ws' 'wy' 'x1' 'y4' 'y6' 'yk' 'ys' 'yy' 'zf' 'zv'
- f        | 'a4' 'ae' 'ax' 'bb' 'bg' 'ca' 'ch' 'cq' 'cv' 'dm' 'dn' 'en' 'ep' 'eu' 'ev' 'f0' 'g3' 'gk' 'gm' 'hd' 'ho' 'hp' 'hy' 'ij' 'im' 'iy' 'jl' 'jr' 'jy' 'kj' 'kt' 'ku' 'lp' 'mo' 'mr' 'mz' 'n4' 'nk' 'oc' 'ol' 'oo' 'os' 'oy' 'oz' 'p8' 'p9' 'ps' 'qb' 'qd' 'qg' 'qi' 'qv' 'qx' 'r1' 'ra' 'rf' 'rg' 'rm' 'ro' 'rr' 'rv' 'rz' 's7' 'sm' 'ss' 'tl' 'tr' 'tu' 'ty' 'u5' 'ui' 'un' 'uq' 'uv' 'vn' 'w1' 'w2' 'w6' 'wd' 'we' 'wg' 'wn' 'wp' 'wy' 'y2' 'y6' 'yc' 'yd' 'yt' 'yw' 'z8' 'ze' 'zs'
- f        | 'ai' 'cg' 'cs' 'dc' 'dg' 'di' 'dj' 'dk' 'dp' 'du' 'eb' 'ec' 'ee' 'ei' 'ek' 'eu' 'f2' 'fh' 'fm' 'fy' 'hc' 'hm' 'i2' 'ia' 'jj' 'ke' 'kl' 'lb' 'lc' 'ln' 'me' 'nc' 'nf' 'o6' 'oc' 'ok' 'os' 'pc' 'po' 'px' 'q2' 'q8' 'qa' 'qb' 'qd' 'qe' 'qg' 'qi' 'qo' 'qs' 'qt' 'qv' 'qx' 'r4' 'r9' 'ri' 'rn' 'rq' 'rr' 'rz' 's9' 'sf' 'sr' 'su' 'sw' 'sy' 'sz' 't2' 'ti' 'tv' 'ud' 'uv' 'wa' 'wc' 'wi' 'wk' 'wm' 'ws' 'wu' 'wv' 'wz' 'x2' 'xa' 'xf' 'y8' 'yb' 'yd' 'yl' 'yp' 'yr' 'ys' 'z5' 'zh'
- f        | '1a' 'a0' 'ae' 'av' 'be' 'bj' 'bv' 'bx' 'bz' 'ck' 'd4' 'do' 'ds' 'du' 'ee' 'eu' 'fg' 'fm' 'fy' 'g1' 'gh' 'h8' 'h9' 'ha' 'he' 'hl' 'hy' 'i6' 'ic' 'io' 'jb' 'jk' 'jq' 'k1' 'kf' 'km' 'kv' 'l8' 'n0' 'n3' 'oh' 'oz' 'po' 'q9' 'qg' 'qh' 'qi' 'ql' 'qp' 'qr' 'qu' 'qw' 'qx' 'rb' 're' 'rf' 'ri' 'rj' 'rv' 'sj' 'sm' 'sz' 't1' 'tl' 'tm' 'tw' 'tz' 'ua' 'uc' 'ug' 'ut' 'uv' 'ux' 'v7' 'wa' 'wc' 'wf' 'wi' 'wl' 'wp' 'wq' 'wr' 'x3' 'x6' 'xk' 'xx' 'y4' 'yp' 'yr' 'yw' 'yy' 'ze' 'zk' 'zy'
- f        | '1z' 'aq' 'cf' 'cl' 'e1' 'e5' 'ee' 'eg' 'eo' 'er' 'ff' 'fh' 'fx' 'g5' 'ga' 'gd' 'gm' 'gn' 'hc' 'hf' 'hi' 'hk' 'ho' 'ib' 'ik' 'in' 'iw' 'ix' 'jd' 'kl' 'ky' 'lp' 'm3' 'm5' 'n4' 'ng' 'o0' 'oc' 'oj' 'ot' 'ou' 'p2' 'pa' 'pd' 'pg' 'ps' 'pw' 'q1' 'q8' 'qb' 'qc' 'qd' 'qi' 'qr' 'qs' 'qu' 'qv' 'ra' 'rg' 'rt' 'rz' 's7' 'sm' 'sn' 't0' 'tb' 'th' 'tx' 'tz' 'ub' 'ud' 'ue' 'un' 'ur' 'ut' 'vb' 'vj' 'wg' 'wh' 'wj' 'wl' 'wn' 'ww' 'wz' 'x0' 'xc' 'xq' 'xr' 'xw' 'y8' 'y9' 'yr' 'z7' 'zt'
- f        | '27' '3p' '6r' 'a8' 'an' 'ap' 'au' 'ay' 'bi' 'c6' 'cy' 'dh' 'ds' 'eg' 'eh' 'ej' 'es' 'eu' 'fm' 'fp' 'fq' 'fx' 'g2' 'gg' 'gv' 'hz' 'ij' 'il' 'iq' 'iw' 'j8' 'j9' 'k3' 'kr' 'lq' 'm7' 'm9' 'mj' 'n0' 'n6' 'nr' 'nx' 'ox' 'pq' 'qc' 'qd' 'qe' 'qg' 'qh' 'qj' 'qk' 'qm' 'qn' 'qr' 'qu' 'qv' 'qw' 'qx' 're' 'rg' 'rr' 'rz' 's1' 'sj' 'sl' 'sy' 't4' 't7' 'tb' 'tr' 'uc' 'un' 'uq' 'ut' 'vf' 'w7' 'w9' 'wg' 'wh' 'wp' 'wq' 'ws' 'wx' 'x8' 'xp' 'xy' 'y0' 'y1' 'ya' 'yu' 'yz' 'z2' 'z5' 'zz'
- f        | '3k' 'ag' 'ak' 'bi' 'bl' 'bw' 'by' 'ch' 'cm' 'dw' 'e1' 'e2' 'ed' 'ej' 'ek' 'er' 'eu' 'ez' 'f8' 'fd' 'fi' 'fl' 'gi' 'gm' 'gx' 'gy' 'h2' 'h8' 'hl' 'hn' 'ij' 'ip' 'iq' 'it' 'jb' 'jl' 'jn' 'k7' 'kh' 'kl' 'kn' 'kt' 'nh' 'nk' 'pa' 'pe' 'pg' 'pp' 'q5' 'q7' 'qi' 'qk' 'ql' 'qs' 'r8' 'ri' 'rj' 'rl' 'rw' 'rx' 'so' 'tb' 'tj' 'tm' 'to' 'tu' 'tv' 'tz' 'u4' 'ue' 'ul' 'uv' 'v1' 'vj' 'vy' 'wc' 'wr' 'wt' 'wx' 'wz' 'xh' 'xj' 'xp' 'xt' 'y4' 'yb' 'yf' 'ym' 'yo' 'yq' 'yy' 'zp' 'zq' 'zt'
- f        | '9a' 'aa' 'bo' 'br' 'bv' 'bz' 'c1' 'c7' 'cz' 'db' 'dh' 'dj' 'e4' 'e8' 'eh' 'ew' 'gd' 'gg' 'gp' 'gu' 'gx' 'hc' 'ho' 'ht' 'hv' 'ia' 'ii' 'ij' 'ir' 'iw' 'j5' 'jk' 'jv' 'la' 'lc' 'lp' 'lt' 'lw' 'na' 'nt' 'nv' 'nw' 'o8' 'o9' 'ou' 'oy' 'p0' 'pc' 'pq' 'py' 'q4' 'q8' 'qi' 'qk' 'qn' 'qr' 'qt' 'qw' 'r5' 'r8' 're' 'rj' 'rt' 'rv' 'ry' 'rz' 's8' 'sg' 'sv' 'ta' 'td' 'tl' 'tm' 'ul' 'up' 'ut' 'uz' 'vf' 'w1' 'wb' 'wc' 'wd' 'wf' 'wi' 'wl' 'wu' 'x8' 'xg' 'xm' 'y1' 'yl' 'yr' 'ys' 'z8'
- f        | 'a3' 'a5' 'ai' 'av' 'ay' 'c3' 'cp' 'd3' 'dn' 'du' 'dz' 'e9' 'ed' 'ei' 'ek' 'em' 'eo' 'ev' 'f2' 'gh' 'gl' 'gy' 'h6' 'h8' 'hb' 'he' 'hg' 'hm' 'hp' 'hy' 'hz' 'id' 'ie' 'it' 'ix' 'j2' 'ja' 'jc' 'jf' 'k5' 'ki' 'kk' 'kv' 'l4' 'l6' 'ls' 'm9' 'mg' 'mt' 'nb' 'ng' 'oh' 'ot' 'oz' 'pw' 'py' 'pz' 'q0' 'q3' 'q8' 'qb' 'qh' 'qj' 'qk' 'ql' 'qp' 'qq' 'qr' 'qt' 'qw' 'rb' 'rz' 's3' 'sl' 'tb' 'u0' 'u5' 'uo' 'us' 'vc' 'wg' 'wh' 'wj' 'wr' 'wt' 'wu' 'wy' 'x1' 'y1' 'yh' 'z7' 'zf' 'zs' 'zu'
- f        | 'af' 'aq' 'at' 'bh' 'cc' 'd3' 'dd' 'dg' 'dq' 'e1' 'e6' 'ec' 'ee' 'ex' 'ey' 'go' 'gt' 'h3' 'h8' 'hd' 'he' 'hm' 'i7' 'ii' 'ik' 'io' 'ip' 'it' 'iz' 'jg' 'k0' 'k5' 'k7' 'kb' 'ks' 'kw' 'ln' 'lp' 'lx' 'm3' 'nf' 'nh' 'of' 'og' 'oj' 'ok' 'ow' 'p7' 'pd' 'pj' 'pm' 'q1' 'q7' 'qg' 'qh' 'qk' 'qq' 'qr' 'qt' 'qw' 'rr' 'rs' 'ry' 's4' 's7' 'sd' 'si' 'sl' 'sp' 'sw' 'sz' 't6' 't8' 'tc' 'u2' 'um' 'uo' 'ux' 'vb' 'w2' 'wb' 'wi' 'wj' 'ws' 'wt' 'wx' 'x3' 'xf' 'xt' 'yb' 'ym' 'zb' 'ze' 'zm'
- f        | '1s' 'a0' 'ac' 'aj' 'am' 'ao' 'aw' 'bi' 'bm' 'by' 'ca' 'cu' 'dc' 'di' 'dp' 'e0' 'e9' 'eg' 'eq' 'fh' 'fi' 'gc' 'gi' 'gq' 'gx' 'h4' 'he' 'hk' 'i2' 'ix' 'jc' 'jl' 'jm' 'k1' 'kf' 'kg' 'kn' 'kq' 'la' 'nj' 'nw' 'o9' 'og' 'p0' 'p6' 'pj' 'pn' 'pp' 'q4' 'qf' 'ql' 'qm' 'qs' 'qt' 'qu' 'qz' 'r5' 'r6' 'ri' 'ro' 'rw' 'sv' 'sx' 't5' 'th' 'tl' 'tp' 'u0' 'ue' 'uf' 'ug' 'un' 'uq' 'vx' 'wd' 'we' 'wg' 'wj' 'wk' 'wp' 'wr' 'ws' 'wt' 'x2' 'xq' 'xt' 'xw' 'xx' 'ya' 'yk' 'yl' 'yr' 'yt' 'za' 'zh'
- f        | '2o' 'af' 'ah' 'aj' 'al' 'ap' 'as' 'bc' 'd2' 'di' 'dm' 'do' 'ds' 'dt' 'dy' 'eb' 'ed' 'ee' 'ej' 'es' 'ev' 'ex' 'ey' 'gs' 'hk' 'hr' 'hw' 'hz' 'ig' 'is' 'jp' 'jv' 'jx' 'k4' 'kh' 'kv' 'lb' 'll' 'lw' 'na' 'no' 'o1' 'o8' 'oh' 'oo' 'op' 'pb' 'po' 'q2' 'q4' 'q7' 'qa' 'qc' 'qe' 'qg' 'qm' 'qo' 'qt' 'qw' 'qy' 'qz' 'r4' 'r7' 'r8' 'rp' 'rs' 's2' 'sb' 'sg' 'sl' 't1' 'tj' 'to' 'ts' 'tx' 'u5' 'uz' 'v6' 'w4' 'w5' 'we' 'wh' 'wn' 'wr' 'wu' 'wv' 'x1' 'y1' 'y8' 'ya' 'yk' 'ym' 'yw' 'z5' 'zx'
- f        | '2s' '4q' '8x' 'aa' 'ac' 'ah' 'av' 'aw' 'c4' 'c5' 'ce' 'd1' 'dj' 'dq' 'e7' 'e9' 'ea' 'ef' 'fc' 'fs' 'fz' 'gb' 'ge' 'gx' 'hf' 'hl' 'hm' 'i5' 'i7' 'ie' 'ii' 'iw' 'kf' 'ko' 'kx' 'lb' 'm6' 'mh' 'ob' 'od' 'oe' 'og' 'oq' 'or' 'pn' 'ps' 'pu' 'q4' 'qf' 'qg' 'qj' 'ql' 'qn' 'qt' 'qy' 'r3' 'ra' 'ri' 'rj' 'rv' 'sr' 'tg' 'th' 'tl' 'tx' 'u7' 'ub' 'uh' 'uq' 'uu' 'uy' 'vn' 'vt' 'wa' 'we' 'wh' 'wn' 'wp' 'wr' 'ww' 'xg' 'xk' 'xs' 'ya' 'yc' 'yd' 'yf' 'yl' 'ym' 'ys' 'z6' 'zj' 'zm' 'zv' 'zw'
- f        | '4d' '5a' 'ab' 'ae' 'ah' 'ai' 'be' 'cb' 'd6' 'dw' 'ea' 'eu' 'fb' 'fd' 'fe' 'fj' 'fk' 'g0' 'g9' 'gf' 'hc' 'hh' 'hk' 'i4' 'ik' 'iv' 'iz' 'j1' 'j3' 'j5' 'ju' 'jz' 'kc' 'md' 'ng' 'nk' 'o1' 'o9' 'oi' 'om' 'p4' 'pl' 'pn' 'ps' 'q8' 'qa' 'qb' 'qh' 'qj' 'qm' 'qn' 'qo' 'qq' 'qr' 'qt' 'qu' 'qy' 'qz' 'ro' 'rs' 's2' 'sl' 'sm' 'sp' 'ti' 'tn' 'tu' 'tw' 'u7' 'ug' 'ui' 'ul' 'us' 'ut' 'vc' 've' 'vj' 'vk' 'w0' 'w2' 'w8' 'wi' 'wk' 'wl' 'wm' 'wt' 'x6' 'xh' 'xy' 'yr' 'ys' 'yt' 'yy' 'yz' 'zr'
- f        | 'a1' 'ab' 'ad' 'ag' 'bd' 'bf' 'bo' 'bt' 'cl' 'cn' 'cq' 'cz' 'd4' 'db' 'dc' 'dk' 'dn' 'dq' 'ea' 'el' 'em' 'ev' 'ew' 'ex' 'fr' 'ft' 'ga' 'gc' 'gd' 'gg' 'gl' 'gp' 'hp' 'hu' 'id' 'ij' 'jn' 'kl' 'kt' 'lh' 'lk' 'lm' 'mi' 'mw' 'n4' 'nk' 'oj' 'ok' 'on' 'ph' 'pk' 'pt' 'q0' 'q8' 'qa' 'qe' 'qf' 'qg' 'qh' 'qi' 'qr' 'qt' 'qv' 'qw' 'qx' 'rd' 're' 'rg' 'rq' 'rr' 'sb' 'sg' 'te' 'tj' 'us' 'w5' 'w9' 'wb' 'wf' 'wh' 'wp' 'wq' 'ws' 'wt' 'wu' 'wv' 'y7' 'yb' 'ye' 'yf' 'yq' 'yu' 'yy' 'yz' 'zx'
- f        | 'ah' 'ao' 'aq' 'aw' 'az' 'b5' 'bd' 'bg' 'bj' 'bq' 'bu' 'cc' 'cv' 'dt' 'e0' 'e2' 'e4' 'ec' 'eu' 'fd' 'fi' 'gg' 'gu' 'ha' 'hb' 'he' 'hj' 'hy' 'ih' 'in' 'iv' 'ji' 'js' 'ks' 'l1' 'la' 'lg' 'mh' 'mi' 'mk' 'o7' 'oh' 'oj' 'om' 'on' 'op' 'oq' 'or' 'os' 'p1' 'pe' 'pq' 'pv' 'q8' 'qe' 'qg' 'qj' 'ql' 'qm' 'qn' 'qo' 'qr' 'qs' 'qt' 'qv' 'qy' 'r1' 'r9' 'rb' 'rl' 'ro' 'ru' 'rw' 'ry' 's0' 's6' 'sn' 't0' 't1' 'tr' 'ty' 'u0' 'u8' 'up' 'uv' 'vn' 'wb' 'wg' 'ww' 'x1' 'yb' 'yj' 'ym' 'yx' 'zz'
- f        | '2k' '2v' '4h' '7c' 'a3' 'aa' 'al' 'an' 'aq' 'aw' 'b7' 'bb' 'bl' 'bn' 'by' 'ca' 'cf' 'cu' 'dd' 'dn' 'e6' 'ej' 'en' 'et' 'eu' 'ey' 'g8' 'gg' 'go' 'gw' 'hj' 'ho' 'i3' 'ii' 'iy' 'ke' 'kh' 'le' 'lf' 'lu' 'ml' 'ny' 'oa' 'oc' 'og' 'oh' 'os' 'pf' 'pl' 'qb' 'qd' 'qf' 'qj' 'qn' 'qu' 'qw' 'r8' 'rd' 're' 'rh' 'sc' 'sn' 'ss' 't0' 't7' 'tl' 'tt' 'tx' 'tz' 'u9' 'uc' 'ud' 'ul' 'us' 'ux' 'vb' 'vf' 'vg' 'vp' 'w5' 'w6' 'wk' 'wt' 'wy' 'xd' 'xk' 'xm' 'xn' 'xr' 'xx' 'y0' 'yf' 'yl' 'yo' 'yw' 'zv'
- f        | '3k' '3v' 'a0' 'ah' 'am' 'an' 'ay' 'bd' 'cs' 'cu' 'cw' 'db' 'dp' 'e3' 'et' 'ey' 'fi' 'gl' 'gq' 'hh' 'hk' 'hx' 'i8' 'ih' 'ii' 'iv' 'iz' 'j5' 'jf' 'jo' 'jr' 'kd' 'km' 'lg' 'li' 'lt' 'm4' 'mo' 'mv' 'mw' 'n3' 'nh' 'nn' 'o9' 'od' 'of' 'oh' 'ok' 'or' 'pc' 'pg' 'pm' 'pn' 'q6' 'qj' 'qn' 'qr' 'qs' 'qw' 'r7' 'r9' 're' 'rm' 'rr' 'rt' 'rz' 'sb' 'sf' 'td' 'tu' 'uc' 'ug' 'uj' 'uu' 'w3' 'wa' 'wc' 'wg' 'wi' 'wm' 'wp' 'ww' 'wx' 'wz' 'xb' 'xi' 'y0' 'y9' 'ya' 'yd' 'yg' 'yh' 'yv' 'yy' 'zo' 'zz'
- f        | '3z' 'ah' 'ai' 'aq' 'bn' 'ck' 'cm' 'cq' 'ct' 'cy' 'd1' 'db' 'dn' 'e2' 'e7' 'ed' 'ee' 'eh' 'eq' 'er' 'ew' 'fc' 'fn' 'fp' 'fs' 'fw' 'fx' 'gl' 'gp' 'gw' 'ha' 'hq' 'hw' 'hx' 'i2' 'ir' 'j9' 'jb' 'jn' 'jr' 'jx' 'jy' 'kk' 'kl' 'kx' 'kz' 'li' 'm2' 'me' 'mj' 'mr' 'na' 'nu' 'oe' 'ol' 'on' 'po' 'pv' 'q7' 'qa' 'qb' 'qd' 'qh' 'qp' 'qv' 'rh' 'rz' 'sf' 'sp' 't6' 'tl' 'to' 'tx' 'ty' 'ue' 'uf' 'un' 'uu' 'uw' 'vb' 'vq' 'wg' 'wp' 'wt' 'wu' 'xb' 'xp' 'y1' 'y9' 'yi' 'yj' 'ys' 'yu' 'z7' 'zf' 'zt'
- f        | '4d' '9f' 'aa' 'ad' 'av' 'b1' 'bb' 'bd' 'bk' 'd2' 'd6' 'd7' 'de' 'do' 'ds' 'dx' 'e4' 'eh' 'en' 'ep' 'ew' 'fd' 'fg' 'fo' 'fp' 'ga' 'gw' 'gz' 'h2' 'h4' 'hc' 'hk' 'ic' 'ih' 'io' 'iv' 'iy' 'jj' 'jt' 'jz' 'kb' 'ke' 'kl' 'lh' 'lm' 'nc' 'ni' 'nl' 'o9' 'oi' 'oo' 'pd' 'pj' 'po' 'pr' 'qa' 'qf' 'qi' 'qm' 'qn' 'qp' 'qt' 'qu' 'rb' 're' 'rf' 'rn' 'rz' 'sz' 't0' 'tg' 'ti' 'ut' 'v9' 'vg' 'wb' 'wc' 'wf' 'wx' 'x0' 'xb' 'xv' 'y6' 'yb' 'yg' 'yh' 'yk' 'ym' 'yn' 'yw' 'yx' 'yz' 'z8' 'zp' 'zs' 'zw'
- f        | '5t' 'al' 'av' 'ax' 'by' 'cr' 'cx' 'df' 'dh' 'dp' 'dq' 'e4' 'e7' 'en' 'ff' 'fg' 'fo' 'g4' 'ge' 'gg' 'gm' 'gr' 'gt' 'hc' 'hn' 'hq' 'hs' 'i0' 'i1' 'id' 'ig' 'im' 'jb' 'jv' 'k9' 'kl' 'km' 'lh' 'lp' 'lq' 'mm' 'ne' 'nk' 'nu' 'od' 'os' 'pj' 'pw' 'pz' 'q0' 'q1' 'qa' 'qd' 'qe' 'qf' 'qk' 'ql' 'qn' 'qp' 'qt' 'r0' 'rx' 'sx' 'sy' 't0' 't1' 't8' 'th' 'ti' 'tp' 'tv' 'tz' 'ub' 'uc' 'ul' 'v5' 'vp' 'vu' 'w8' 'wd' 'we' 'wf' 'wh' 'wm' 'wq' 'wr' 'ws' 'wy' 'wz' 'xg' 'y9' 'yg' 'yh' 'yq' 'yz' 'z0'
- f        | '6w' 'a1' 'aa' 'ab' 'af' 'ao' 'aq' 'ay' 'cd' 'cg' 'dn' 'dp' 'dy' 'e0' 'e6' 'eb' 'ej' 'fh' 'fi' 'fs' 'g0' 'gc' 'gi' 'gs' 'gv' 'gw' 'hd' 'ho' 'i8' 'i9' 'ia' 'ic' 'ie' 'ik' 'ja' 'jd' 'ji' 'jm' 'k0' 'kj' 'lj' 'm8' 'n0' 'nh' 'nl' 'nn' 'o8' 'of' 'ou' 'oz' 'ph' 'po' 'q0' 'q3' 'q6' 'q7' 'qa' 'qc' 'qd' 'qn' 'qp' 'qq' 'qu' 'qw' 'qz' 'rd' 'rm' 'rn' 'rp' 'rs' 'sj' 'tg' 'tj' 'tr' 'tv' 'u0' 'uf' 'uh' 'uk' 'vv' 'wa' 'wc' 'wf' 'wg' 'wn' 'wo' 'wp' 'wr' 'ww' 'xt' 'y3' 'y7' 'yc' 'yf' 'yp' 'yy'
- f        | '9y' 'a0' 'a6' 'ad' 'aj' 'az' 'bw' 'by' 'cg' 'ci' 'dc' 'dk' 'dm' 'dw' 'e0' 'e4' 'ee' 'ef' 'eg' 'en' 'eu' 'fc' 'fg' 'fm' 'fx' 'g7' 'gm' 'go' 'hw' 'hy' 'i4' 'i7' 'ip' 'iq' 'ir' 'jr' 'ju' 'jx' 'kr' 'ky' 'la' 'lk' 'lq' 'm9' 'mg' 'mp' 'my' 'n6' 'nv' 'nz' 'o1' 'o3' 'oe' 'oy' 'pj' 'pv' 'pz' 'qg' 'ql' 'qp' 'qt' 'qy' 'r4' 'rf' 'rg' 'rk' 'ro' 'rw' 'ry' 's3' 'sd' 'sf' 'sm' 'tf' 'tg' 'tq' 'tu' 'ty' 'tz' 'ub' 'uc' 'uf' 'um' 'vi' 'vn' 'wa' 'wc' 'we' 'xo' 'xr' 'xs' 'yb' 'yi' 'yw' 'zn' 'zo'
- f        | 'ag' 'ai' 'az' 'br' 'c2' 'cd' 'ck' 'db' 'du' 'e0' 'e7' 'eb' 'ee' 'em' 'ep' 'eq' 'es' 'eu' 'ex' 'fh' 'fi' 'ga' 'gm' 'gn' 'hj' 'hq' 'if' 'ig' 'ii' 'ix' 'jk' 'kd' 'kg' 'kk' 'kr' 'kt' 'ku' 'lx' 'mp' 'mq' 'nx' 'o9' 'oa' 'om' 'oq' 'p5' 'pd' 'pr' 'pu' 'pw' 'q3' 'qa' 'qd' 'qe' 'qf' 'qi' 'qj' 'ql' 'qn' 'qo' 'qr' 'qt' 'qu' 'qv' 'qx' 'rc' 'rf' 'rl' 'rm' 'rn' 'rp' 'rr' 's7' 'se' 'st' 'sx' 't8' 'to' 'u1' 'ua' 'uq' 'ux' 'w6' 'w8' 'wf' 'wt' 'xb' 'xf' 'xk' 'xn' 'y3' 'ym' 'yp' 'yz' 'zi' 'zk'
- f        | '1k' '1p' 'a6' 'ah' 'ap' 'ay' 'az' 'bi' 'bj' 'cv' 'd1' 'd2' 'd5' 'db' 'dm' 'dn' 'e7' 'eg' 'eh' 'el' 'en' 'eo' 'er' 'f4' 'fy' 'gf' 'gp' 'hd' 'hj' 'hp' 'i2' 'i7' 'ij' 'ik' 'jq' 'jy' 'kg' 'kh' 'kw' 'lr' 'ls' 'n5' 'ne' 'o7' 'od' 'oi' 'oo' 'os' 'oy' 'pd' 'ph' 'pm' 'pw' 'px' 'qa' 'qb' 'qc' 'qk' 'ql' 'qm' 'qn' 'qr' 'qs' 'qu' 'qx' 'r5' 'rh' 'ri' 'rk' 'rn' 'ry' 's0' 'sa' 'si' 'sr' 'st' 'ub' 'uc' 'uf' 'uq' 'ur' 'v9' 'vn' 'w9' 'wd' 'we' 'wk' 'wt' 'wv' 'ww' 'xj' 'xk' 'yh' 'yk' 'zd' 'zw' 'zy'
- f        | '2u' '3q' '7p' 'b4' 'b8' 'bb' 'bq' 'bu' 'ce' 'dk' 'dn' 'e0' 'ea' 'ed' 'ef' 'eg' 'eh' 'ej' 'ek' 'em' 'en' 'eo' 'et' 'fh' 'fr' 'fw' 'gj' 'gx' 'ho' 'i7' 'i9' 'if' 'ii' 'il' 'in' 'iq' 'iw' 'jy' 'k0' 'k1' 'km' 'kr' 'lh' 'lq' 'lw' 'ma' 'mb' 'md' 'mj' 'nh' 'ni' 'nj' 'ob' 'p5' 'p7' 'pc' 'pk' 'pl' 'pu' 'q2' 'qa' 'qc' 'qe' 'qi' 'qm' 'qn' 'qt' 'rb' 'rp' 'rx' 'sd' 't6' 'tb' 'tl' 'tw' 'u5' 'u7' 'ug' 'uh' 'ut' 'vs' 'wi' 'wj' 'wp' 'ws' 'wu' 'wv' 'xm' 'xs' 'y2' 'y6' 'yd' 'yh' 'yl' 'yr' 'yx' 'yz'
- f        | '2u' 'au' 'bz' 'cd' 'cj' 'cm' 'cq' 'ct' 'cw' 'd1' 'ds' 'dw' 'dz' 'ec' 'ei' 'eo' 'fk' 'fq' 'fx' 'g6' 'gl' 'gs' 'i5' 'if' 'im' 'iq' 'jd' 'k0' 'k5' 'kr' 'lv' 'lx' 'n5' 'na' 'ny' 'ob' 'ot' 'ox' 'pa' 'pi' 'ps' 'qa' 'qc' 'qg' 'qh' 'qj' 'ql' 'qm' 'qo' 'qr' 'qs' 'r2' 'rh' 'rl' 'rr' 'rw' 'rx' 's0' 's8' 'sb' 'sc' 'sg' 'si' 'sl' 'so' 'sv' 't7' 't9' 'tc' 'te' 'tl' 'tn' 'to' 'tr' 'tx' 'ty' 'un' 'uz' 'vg' 'vw' 'ws' 'wt' 'wu' 'xj' 'xy' 'y0' 'y1' 'ya' 'ye' 'yl' 'yn' 'yr' 'ys' 'yt' 'z3' 'z6' 'zw'
- f        | '3a' '5k' 'a2' 'ah' 'au' 'ba' 'bb' 'bh' 'bu' 'cb' 'cj' 'cv' 'cx' 'df' 'dy' 'e4' 'e6' 'ed' 'ep' 'et' 'ev' 'ez' 'f1' 'fb' 'fl' 'fx' 'fz' 'gg' 'h5' 'hj' 'io' 'iz' 'ja' 'k7' 'kf' 'lu' 'lv' 'md' 'ne' 'nh' 'oh' 'on' 'ow' 'p0' 'p8' 'pc' 'px' 'q3' 'qa' 'qf' 'qg' 'qj' 'qr' 'qs' 'qt' 'qv' 'qx' 'qz' 'r3' 'rm' 'rq' 'rt' 'rv' 'sa' 'sf' 'so' 't1' 't7' 'tb' 'tn' 'tq' 'tr' 'ts' 'tu' 'tz' 'u7' 'uf' 'uk' 'um' 'ut' 'va' 'vj' 'vm' 'vx' 'vz' 'wa' 'we' 'wf' 'xe' 'xg' 'ya' 'yb' 'yu' 'zg' 'zo' 'zt' 'zz'
- f        | '3t' '5u' 'aa' 'ab' 'b9' 'd8' 'di' 'dj' 'dq' 'dx' 'dy' 'ea' 'ek' 'el' 'es' 'ev' 'ey' 'ez' 'fk' 'fp' 'g3' 'gb' 'gd' 'gg' 'gi' 'go' 'hj' 'hz' 'i3' 'i5' 'in' 'io' 'is' 'jv' 'kb' 'kr' 'lu' 'md' 'nd' 'ny' 'o6' 'oe' 'ok' 'ow' 'ox' 'p4' 'p7' 'p8' 'pb' 'pu' 'q1' 'q3' 'q4' 'qd' 'qj' 'qk' 'qq' 'qx' 'qy' 'r6' 'ro' 'rw' 'rx' 'ry' 'se' 'sp' 't0' 't1' 'th' 'tl' 'tn' 'tp' 'tr' 'tx' 'u5' 'uf' 'uo' 'ux' 'vc' 'vz' 'w2' 'w5' 'wa' 'wb' 'we' 'wi' 'wj' 'ws' 'wt' 'xh' 'y1' 'yb' 'yg' 'yi' 'zd' 'zm' 'zt'
- f        | '4g' '8w' 'ab' 'aq' 'at' 'bc' 'bi' 'c7' 'cb' 'cj' 'cs' 'd2' 'd3' 'di' 'dm' 'dx' 'dz' 'ed' 'ex' 'fj' 'gs' 'h1' 'h6' 'he' 'hj' 'hr' 'i1' 'ia' 'ie' 'il' 'ix' 'iy' 'j2' 'jd' 'jo' 'jy' 'kx' 'la' 'lv' 'ma' 'mh' 'mp' 'mt' 'n9' 'na' 'nf' 'ng' 'np' 'o7' 'ob' 'on' 'ou' 'ov' 'p9' 'pg' 'po' 'pq' 'q0' 'q4' 'q5' 'qc' 'qj' 'qp' 'qq' 'qt' 'ra' 'rb' 'rq' 'ru' 'sl' 'sp' 't8' 'ta' 'te' 'tl' 'tz' 'u1' 'ud' 'ui' 'uv' 'uw' 'vf' 'vt' 'vu' 'vz' 'w0' 'w7' 'wc' 'wg' 'wh' 'wq' 'wr' 'wz' 'y6' 'y7' 'ye' 'yh'
- f        | '6u' 'a5' 'ai' 'au' 'b1' 'be' 'bg' 'by' 'ce' 'co' 'cw' 'db' 'dw' 'e8' 'ec' 'em' 'en' 'er' 'f7' 'fh' 'fu' 'gb' 'gq' 'h4' 'hf' 'hy' 'hz' 'ig' 'iq' 'kj' 'kk' 'kp' 'ky' 'ld' 'lr' 'na' 'nd' 'ny' 'o8' 'o9' 'og' 'oh' 'ok' 'ot' 'ou' 'ow' 'ox' 'p8' 'pl' 'pp' 'ps' 'px' 'q0' 'q1' 'qa' 'qm' 'qr' 'qs' 'qx' 'r9' 'rd' 're' 'rf' 'rl' 'rn' 'rr' 'ru' 'rz' 'sc' 'sn' 'so' 't1' 'tl' 'tr' 'ts' 'tt' 'tx' 'ub' 'um' 'un' 'uo' 'ut' 'vr' 'wa' 'wb' 'wc' 'wj' 'wl' 'wp' 'wq' 'ws' 'wx' 'wz' 'yp' 'yt' 'yy' 'zc'
- f        | '7h' '7k' 'bi' 'c8' 'cc' 'cj' 'cs' 'd7' 'dh' 'dl' 'dp' 'dt' 'e9' 'ea' 'eh' 'ei' 'ej' 'el' 'ew' 'fo' 'fp' 'ge' 'gg' 'gi' 'gk' 'h2' 'h7' 'hk' 'hs' 'hy' 'ii' 'j4' 'kd' 'kh' 'kp' 'ks' 'm2' 'n1' 'n3' 'nk' 'nr' 'od' 'ok' 'om' 'oy' 'pb' 'ph' 'pm' 'pp' 'pt' 'q2' 'q8' 'q9' 'qc' 'qf' 'qg' 'qh' 'qj' 'qk' 'qn' 'qo' 'qq' 'qv' 'qx' 'r4' 'rc' 'rg' 'rj' 's9' 'sb' 'sg' 'sj' 'ss' 't6' 'ta' 'tc' 'tm' 'tv' 'us' 'uu' 'uy' 'w7' 'wf' 'wh' 'wk' 'wz' 'x2' 'xr' 'ya' 'yc' 'yk' 'yp' 'ys' 'yz' 'z4' 'zg' 'zn'
- f        | '15' '4o' '7h' 'aa' 'av' 'b0' 'cb' 'da' 'dh' 'di' 'dr' 'e0' 'ee' 'eo' 'ep' 'ey' 'fi' 'fo' 'fq' 'fx' 'fz' 'g9' 'ge' 'hd' 'hh' 'hs' 'i4' 'i9' 'iq' 'it' 'iw' 'ix' 'iy' 'j8' 'jr' 'ld' 'm1' 'mo' 'nx' 'ob' 'ol' 'ot' 'pj' 'qf' 'qj' 'qk' 'qp' 'qv' 'qy' 'r4' 'r5' 'rl' 'rm' 'rq' 'rz' 's8' 'sc' 'sd' 'sf' 'sh' 'sn' 'ss' 't5' 't7' 'tj' 'to' 'tw' 'u6' 'uc' 'ud' 'ug' 'ui' 'uk' 'ut' 'uy' 'uz' 'vi' 'w0' 'w9' 'wb' 'wg' 'wl' 'ww' 'wx' 'wy' 'xa' 'xb' 'xo' 'ya' 'yi' 'yu' 'yv' 'yz' 'zm' 'zv' 'zx' 'zy' 'zz'
- f        | '1g' '6b' 'az' 'be' 'c5' 'dp' 'dt' 'e6' 'eg' 'en' 'es' 'et' 'f1' 'fi' 'fn' 'ft' 'fz' 'g0' 'gj' 'gv' 'h8' 'hp' 'hs' 'hu' 'hw' 'hz' 'ia' 'im' 'is' 'iv' 'iw' 'iy' 'jd' 'kw' 'ky' 'l4' 'l7' 'mn' 'nn' 'nr' 'ny' 'ot' 'p2' 'p8' 'pt' 'q8' 'qa' 'qb' 'qf' 'qh' 'qi' 'qm' 'qt' 'qu' 'qv' 'qy' 'ra' 'rl' 'ro' 'rw' 'rx' 's8' 's9' 'sk' 'sn' 'st' 'sv' 'th' 'tl' 'to' 'tp' 'tu' 'ua' 'uk' 'un' 'uv' 'v8' 've' 'vt' 'vu' 'vv' 'w4' 'wc' 'wh' 'wo' 'wq' 'wy' 'xe' 'xm' 'xp' 'xu' 'yc' 'yn' 'yq' 'zf' 'zj' 'zs' 'zt'
- f        | '1t' 'a0' 'ah' 'ar' 'at' 'be' 'bs' 'bt' 'co' 'd9' 'e9' 'ea' 'ec' 'ei' 'eo' 'er' 'ez' 'fa' 'fz' 'gl' 'gt' 'h8' 'h9' 'hb' 'hv' 'ia' 'ic' 'if' 'im' 'io' 'iq' 'ix' 'k9' 'kq' 'lo' 'm4' 'md' 'mo' 'mz' 'ni' 'nr' 'nz' 'o8' 'ox' 'pk' 'pr' 'q1' 'q3' 'q8' 'qa' 'qb' 'qf' 'qg' 'qi' 'ql' 'qr' 'r3' 'rc' 'rf' 'rg' 'rr' 's0' 'sf' 'tg' 'tw' 'u2' 'uh' 'un' 'ur' 'ux' 'vb' 'vr' 'w7' 'w9' 'wd' 'wh' 'wm' 'wo' 'wr' 'ws' 'wv' 'x4' 'xj' 'xx' 'y3' 'y8' 'yd' 'yl' 'yo' 'yq' 'yr' 'yw' 'z8' 'za' 'zb' 'zg' 'zo' 'zs'
- f        | '2n' 'aa' 'ab' 'ae' 'ah' 'aj' 'as' 'av' 'ax' 'bc' 'be' 'bi' 'by' 'cg' 'ck' 'cm' 'cx' 'dq' 'dr' 'e5' 'ed' 'ef' 'ei' 'em' 'eu' 'fd' 'fq' 'fu' 'gd' 'gl' 'gs' 'he' 'ia' 'iz' 'jc' 'je' 'jt' 'k7' 'km' 'ko' 'l4' 'lh' 'mk' 'nl' 'ny' 'oa' 'oh' 'op' 'p1' 'pj' 'pm' 'ps' 'q1' 'q7' 'qc' 'qg' 'qj' 'qo' 'qr' 'qt' 'qu' 'qv' 'qw' 'rf' 'ri' 'rl' 'rw' 'sf' 'su' 't4' 'tc' 'tn' 'to' 'tq' 'tr' 'tt' 'tv' 'tz' 'u0' 'u6' 'ub' 'ug' 'up' 'uv' 'ux' 'uy' 'vv' 'w2' 'wx' 'xi' 'xu' 'xw' 'yj' 'yt' 'yw' 'z3' 'z7' 'zb'
- f        | '2y' '4v' 'ac' 'at' 'av' 'bd' 'bs' 'c3' 'ca' 'cf' 'cg' 'cq' 'cw' 'cz' 'db' 'dx' 'e7' 'eg' 'ei' 'el' 'et' 'ey' 'fo' 'fq' 'fw' 'fx' 'gd' 'gl' 'gw' 'h6' 'hd' 'hp' 'hy' 'il' 'ir' 'is' 'j5' 'k4' 'k8' 'kc' 'kp' 'kz' 'l0' 'l1' 'm4' 'm6' 'mn' 'mr' 'nx' 'ov' 'ox' 'pn' 'pq' 'q3' 'qd' 'qj' 'qk' 'qo' 'qw' 'qx' 'rd' 're' 'rg' 'rq' 'rr' 'rx' 'rz' 'sb' 't0' 't3' 't4' 'tc' 'tk' 'tp' 'tr' 'tv' 'u7' 'uf' 'um' 'uo' 'uq' 'va' 'vc' 'vi' 'vy' 'vz' 'w1' 'w6' 'wo' 'wq' 'xh' 'xn' 'y5' 'yo' 'ys' 'yt' 'zs' 'zu'
- f        | '4y' '6h' 'a0' 'a6' 'bo' 'bq' 'co' 'cv' 'dv' 'ec' 'ee' 'eh' 'ei' 'en' 'er' 'ew' 'f1' 'fk' 'fq' 'fy' 'ga' 'gj' 'gp' 'gv' 'gx' 'hv' 'i0' 'i5' 'ij' 'ik' 'in' 'kb' 'ks' 'kw' 'kz' 'la' 'lh' 'lq' 'ls' 'mu' 'nl' 'og' 'oi' 'om' 'pf' 'pu' 'pv' 'q6' 'q9' 'qe' 'qk' 'ql' 'qo' 'qq' 'qu' 'qw' 'r5' 'rb' 'rn' 'rr' 'rt' 's4' 'sc' 'sg' 'si' 'sm' 'sn' 'sp' 'ss' 'tb' 'tc' 'tg' 'tk' 'tm' 'tr' 'tt' 'tu' 'tv' 'u0' 'u3' 'uj' 'un' 'uz' 'vp' 'w6' 'w8' 'wc' 'we' 'wi' 'wt' 'wx' 'xp' 'xz' 'y0' 'y4' 'z0' 'zj' 'zy'
- f        | '5e' 'a1' 'ak' 'at' 'av' 'bi' 'bj' 'c7' 'dl' 'do' 'e0' 'ee' 'el' 'em' 'es' 'fl' 'fy' 'g2' 'g6' 'g7' 'gr' 'gv' 'h3' 'hg' 'hr' 'ht' 'ii' 'il' 'is' 'j8' 'jm' 'jq' 'jv' 'k0' 'ka' 'kk' 'l3' 'la' 'lh' 'ms' 'mz' 'no' 'oa' 'os' 'ox' 'pa' 'pc' 'pl' 'pq' 'px' 'q1' 'q3' 'q5' 'q8' 'qb' 'qi' 'ql' 'qw' 'qy' 'qz' 're' 'ri' 'rp' 'rx' 's1' 's3' 'sh' 'sq' 't1' 't5' 'ta' 'td' 'tj' 'to' 'tt' 'ub' 'uc' 'ur' 'uv' 'v1' 'vs' 'w7' 'wb' 'wd' 'wj' 'wl' 'wm' 'wq' 'xr' 'xt' 'ym' 'yu' 'yx' 'yz' 'z8' 'zp' 'zr' 'zs'
- f        | '5o' 'ar' 'at' 'c1' 'ch' 'cr' 'dp' 'dy' 'ed' 'el' 'er' 'f0' 'f7' 'fc' 'fh' 'fm' 'fx' 'g8' 'gd' 'gf' 'gh' 'gl' 'gp' 'gv' 'gy' 'hs' 'ht' 'hv' 'hy' 'i2' 'ia' 'lc' 'lu' 'lv' 'ly' 'mb' 'mq' 'nn' 'nz' 'oa' 'oq' 'ot' 'ox' 'oz' 'p8' 'pc' 'pn' 'py' 'q2' 'q7' 'qe' 'qj' 'qn' 'qs' 'qv' 'qw' 'r1' 'r4' 'rh' 'rn' 'rq' 'rr' 's1' 'sa' 'sd' 'se' 'sr' 't6' 'ta' 'tf' 'ts' 'tw' 'tx' 'uk' 'ul' 'uw' 'v7' 'vu' 'vz' 'w7' 'wc' 'wd' 'wk' 'wl' 'wo' 'wr' 'wv' 'x9' 'xe' 'xj' 'xl' 'xu' 'yi' 'ym' 'yq' 'z1' 'z5' 'zm'
- f        | '8d' 'a2' 'af' 'ap' 'as' 'cg' 'cr' 'd4' 'dg' 'du' 'dv' 'eg' 'ei' 'el' 'em' 'fg' 'ft' 'g1' 'gt' 'h1' 'hg' 'i5' 'i8' 'ih' 'im' 'ir' 'iw' 'jd' 'jf' 'js' 'jw' 'jz' 'k8' 'ko' 'ky' 'la' 'lr' 'mq' 'no' 'ox' 'p8' 'p9' 'pb' 'pv' 'pw' 'px' 'q0' 'q1' 'q5' 'q7' 'qd' 'qh' 'qj' 'ql' 'qn' 'qo' 'qq' 'qx' 'qy' 'rc' 'rd' 'rf' 'rh' 'rr' 'rs' 'sd' 'sw' 'sz' 't3' 'tf' 'tn' 'to' 'tv' 'tx' 'ty' 'ua' 'ub' 'ud' 'uk' 'ul' 'us' 'uu' 'ux' 'vl' 'vs' 'wf' 'wg' 'wl' 'wq' 'wt' 'wu' 'wx' 'x6' 'xi' 'yg' 'yh' 'z7' 'ze'
- f        | 'a3' 'ai' 'ap' 'ar' 'at' 'be' 'br' 'bz' 'cw' 'd2' 'd6' 'df' 'dk' 'do' 'dp' 'dr' 'dw' 'e2' 'ef' 'eg' 'ej' 'eq' 'fb' 'fd' 'fq' 'ge' 'gr' 'h0' 'hp' 'i8' 'ih' 'ir' 'jb' 'jd' 'kj' 'kz' 'l4' 'lm' 'lt' 'mj' 'mz' 'nc' 'ni' 'nw' 'of' 'oh' 'ol' 'ot' 'ov' 'p5' 'pf' 'pn' 'pp' 'pv' 'py' 'q2' 'q3' 'q7' 'qb' 'qc' 'qj' 'qo' 'qp' 'qr' 'qs' 'r6' 'ra' 'rc' 'rd' 'rx' 'se' 'sn' 'sr' 'sx' 't2' 't9' 'tm' 'tr' 'uj' 'vh' 'vn' 'vs' 'w0' 'w2' 'w3' 'wd' 'we' 'wj' 'wq' 'wr' 'wv' 'xe' 'xo' 'ya' 'ye' 'yq' 'yt' 'yw'
- f        | '1h' '4r' 'a9' 'ag' 'ah' 'ak' 'as' 'at' 'b2' 'be' 'cs' 'd6' 'd7' 'da' 'dg' 'dl' 'dr' 'dy' 'dz' 'e8' 'e9' 'eg' 'eh' 'ek' 'eq' 'es' 'f3' 'f9' 'fs' 'gh' 'go' 'gq' 'gz' 'ha' 'hc' 'hi' 'hp' 'if' 'ig' 'im' 'iv' 'jd' 'jt' 'kp' 'kt' 'l6' 'le' 'lg' 'lo' 'mz' 'ns' 'oc' 'ok' 'p6' 'pa' 'pt' 'pv' 'px' 'q1' 'q5' 'qa' 'qe' 'qg' 'qh' 'qi' 'qn' 'qp' 'qs' 'qu' 'qv' 'qy' 'rh' 'rl' 'rp' 'rv' 'rx' 'rz' 's8' 'sc' 'sr' 'su' 't6' 'tb' 'tq' 'tw' 'u9' 'vr' 'w7' 'wb' 'wj' 'wq' 'ww' 'xr' 'xx' 'yb' 'yl' 'yn' 'yr' 'zw'
- f        | '1r' '2q' 'aa' 'ae' 'ah' 'aq' 'at' 'bx' 'c6' 'ca' 'cl' 'da' 'dp' 'ds' 'e0' 'e6' 'ea' 'eb' 'eg' 'er' 'ev' 'ew' 'fs' 'fw' 'gm' 'gx' 'hl' 'hv' 'hw' 'ib' 'iw' 'jc' 'jn' 'jr' 'ju' 'k0' 'k5' 'k8' 'kf' 'kn' 'l1' 'ln' 'lp' 'ly' 'mz' 'n3' 'nc' 'ng' 'nk' 'o8' 'oe' 'oi' 'ol' 'ot' 'pb' 'pe' 'pk' 'q0' 'qa' 'qe' 'qg' 'qi' 'ql' 'qo' 'qv' 'r0' 'r2' 'r4' 'rg' 'rj' 'rm' 'sv' 'tk' 'to' 'tt' 'u7' 'ud' 'uo' 'ur' 'us' 'uv' 'vf' 'vm' 'vn' 'w6' 'w7' 'wa' 'wb' 'wf' 'wg' 'wi' 'wv' 'ww' 'wx' 'xk' 'xy' 'yg' 'yh' 'ym'
- f        | '6i' 'a3' 'ac' 'ax' 'br' 'ck' 'dc' 'dj' 'dn' 'dq' 'dt' 'dv' 'eb' 'ed' 'ei' 'en' 'eq' 'ey' 'f4' 'fk' 'fm' 'fp' 'fw' 'gn' 'gw' 'he' 'ho' 'io' 'ja' 'jj' 'jn' 'ju' 'jy' 'kc' 'kk' 'l1' 'l4' 'lt' 'lx' 'm1' 'm7' 'mc' 'o6' 'ol' 'p3' 'pc' 'pe' 'pp' 'pv' 'px' 'q0' 'qb' 'qe' 'qr' 'qs' 'qt' 'qu' 'qv' 'qy' 'rg' 'rq' 's3' 'sm' 'so' 't5' 't9' 'tb' 'tp' 'ty' 'tz' 'u6' 'ua' 'ui' 'uv' 'vm' 'vw' 'w2' 'wa' 'wf' 'wi' 'wj' 'wt' 'ww' 'wz' 'xg' 'y1' 'ya' 'yb' 'yd' 'yg' 'yh' 'yi' 'yk' 'yp' 'yz' 'zb' 'zk' 'zm' 'zo'
- f        | '0e' 'a0' 'a1' 'a5' 'ad' 'ao' 'bp' 'bw' 'c0' 'ca' 'cw' 'cx' 'cy' 'dg' 'e8' 'eb' 'ef' 'ek' 'fd' 'fk' 'fv' 'g3' 'gj' 'gn' 'gw' 'hr' 'if' 'ij' 'is' 'ix' 'j7' 'km' 'kp' 'kq' 'ks' 'kt' 'kv' 'lk' 'mj' 'mn' 'mv' 'mz' 'nn' 'o5' 'oa' 'ol' 'on' 'os' 'pa' 'pb' 'pf' 'po' 'pq' 'pr' 'pv' 'py' 'q1' 'q6' 'qf' 'qh' 'qj' 'qn' 'qt' 'qu' 'qw' 'rf' 'rk' 'rt' 's5' 'sq' 'ss' 't5' 'ta' 'th' 'tj' 'to' 'ts' 'tx' 'tz' 'u0' 'ua' 'ug' 'ui' 'uw' 'ux' 'vh' 'vp' 'we' 'wg' 'wi' 'wj' 'wp' 'wq' 'xm' 'y6' 'yr' 'yt' 'yu' 'z8' 'zs'
- f        | '1l' '24' '2o' 'ad' 'am' 'ao' 'bf' 'bl' 'ca' 'ce' 'cn' 'cw' 'cy' 'd4' 'dm' 'e9' 'ed' 'ee' 'ei' 'ep' 'f0' 'fk' 'fu' 'fw' 'g3' 'g4' 'gm' 'gn' 'gu' 'ha' 'hh' 'id' 'iq' 'it' 'iw' 'ix' 'iy' 'j4' 'j6' 'jo' 'jp' 'js' 'jv' 'k6' 'kb' 'ke' 'kh' 'l9' 'lh' 'lr' 'mr' 'n7' 'n8' 'nd' 'o6' 'of' 'oi' 'op' 'ox' 'p6' 'q2' 'qb' 'qd' 'qi' 'qk' 'qn' 'qq' 'qt' 'qy' 'r2' 're' 'rf' 'rk' 's4' 'sb' 'se' 'sh' 't4' 'tb' 'tn' 'tq' 'ty' 'u4' 'u5' 'ub' 'ue' 'uf' 'uk' 'uo' 'vc' 'vs' 'vu' 'w7' 'wd' 'wh' 'xm' 'yk' 'yv' 'zl' 'zz'
- f        | '1m' '37' 'a8' 'ab' 'at' 'ce' 'cx' 'd6' 'dk' 'e9' 'eh' 'ei' 'el' 'eo' 'eu' 'ew' 'ex' 'f4' 'fh' 'fr' 'fs' 'fy' 'g6' 'gf' 'gl' 'gm' 'gp' 'h8' 'ha' 'hf' 'hi' 'hl' 'hr' 'ie' 'ir' 'j6' 'jd' 'jr' 'jv' 'kz' 'l1' 'lg' 'ln' 'lp' 'ls' 'm0' 'ma' 'mi' 'mo' 'mu' 'na' 'np' 'o8' 'oc' 'oe' 'oh' 'ot' 'oy' 'ps' 'pw' 'q5' 'qa' 'qe' 'qg' 'qh' 'qi' 'qq' 'qz' 'rd' 'rg' 'ru' 'rv' 's9' 'sr' 'sv' 'sy' 'sz' 'ts' 'ty' 'uc' 'uh' 'uj' 'uk' 'up' 'v9' 'vc' 'vg' 'vt' 'vy' 'wl' 'wm' 'wv' 'wy' 'wz' 'xg' 'yg' 'yv' 'yw' 'yy' 'z0'
- f        | '2s' '3k' '4b' '6s' 'a1' 'b2' 'b9' 'bi' 'bz' 'c0' 'c3' 'ck' 'cl' 'cu' 'de' 'dl' 'do' 'dp' 'e8' 'ec' 'ee' 'ei' 'ek' 'eu' 'ez' 'fi' 'fo' 'fr' 'fu' 'fx' 'gh' 'gk' 'go' 'gq' 'h4' 'hd' 'hm' 'hz' 'ia' 'id' 'iv' 'jb' 'jh' 'km' 'kp' 'l4' 'l7' 'l8' 'ld' 'lj' 'nb' 'o7' 'oc' 'oh' 'os' 'p4' 'p9' 'pd' 'q6' 'q7' 'q8' 'qc' 'qh' 'qj' 'qk' 'qw' 'rg' 'rj' 'rm' 'rn' 'rp' 'ru' 'rz' 's5' 'si' 'sv' 'sy' 'tc' 'tg' 'tk' 'tv' 'ue' 'uf' 'ux' 'uz' 'vl' 'w2' 'w6' 'wf' 'wm' 'wu' 'wx' 'xh' 'ya' 'yc' 'ye' 'z7' 'zi' 'zo' 'zq'
- f        | '3s' '6q' 'ad' 'am' 'as' 'ay' 'cd' 'ci' 'cl' 'dw' 'eb' 'en' 'ep' 'ew' 'ey' 'fh' 'g6' 'gb' 'gk' 'h5' 'hk' 'hp' 'hy' 'i8' 'ia' 'ic' 'ih' 'in' 'is' 'iw' 'jd' 'je' 'kh' 'kp' 'ks' 'lg' 'lz' 'mx' 'my' 'nf' 'nh' 'no' 'nv' 'o4' 'oa' 'oc' 'op' 'p2' 'p5' 'pa' 'pb' 'pt' 'pw' 'q2' 'q4' 'qb' 'qg' 'qh' 'qq' 'qs' 'qt' 'qx' 'qy' 'qz' 'r7' 'rc' 'rk' 'rt' 'sr' 'sx' 'sy' 'tc' 'tn' 'tr' 'tv' 'u1' 'u7' 'ua' 'uh' 'uz' 'vi' 'wd' 'wr' 'x3' 'x5' 'xa' 'xe' 'y5' 'y7' 'yb' 'yg' 'yk' 'ym' 'yr' 'yt' 'z7' 'zc' 'zf' 'zj' 'zp'
- f        | '5k' 'a1' 'ab' 'an' 'ar' 'as' 'av' 'ax' 'br' 'c2' 'c7' 'd5' 'da' 'dl' 'dr' 'dz' 'e3' 'ec' 'ed' 'ek' 'el' 'em' 'eu' 'ew' 'fd' 'ff' 'fw' 'g8' 'gb' 'gl' 'hh' 'hs' 'hz' 'i6' 'ia' 'ig' 'ii' 'ik' 'iq' 'ix' 'j0' 'j9' 'jf' 'jl' 'jo' 'jw' 'ko' 'kt' 'lm' 'nl' 'nm' 'ov' 'p3' 'p6' 'p7' 'pg' 'pl' 'pn' 'pp' 'qd' 'qe' 'qf' 'qn' 'qo' 'qq' 'qs' 'qt' 'qv' 'r9' 'rf' 'rj' 'rt' 'rw' 'sa' 'sl' 't2' 'tg' 'tk' 'tq' 'ty' 'ua' 'ud' 'vi' 'vm' 'w2' 'w6' 'wb' 'wd' 'wf' 'wi' 'wl' 'wq' 'wr' 'wy' 'x5' 'x8' 'y0' 'y1' 'ys' 'yx'
- f        | '6f' 'a1' 'ag' 'ak' 'ap' 'au' 'b1' 'b5' 'bi' 'c1' 'cu' 'd5' 'dc' 'dr' 'dv' 'eg' 'ej' 'ek' 'em' 'et' 'fe' 'fr' 'fz' 'ga' 'gb' 'gk' 'gu' 'gv' 'h5' 'hh' 'ho' 'hy' 'ii' 'ik' 'ip' 'iv' 'ja' 'jg' 'jz' 'k0' 'kt' 'm6' 'mj' 'nd' 'o0' 'o1' 'oj' 'or' 'ot' 'ov' 'oz' 'ph' 'pm' 'pv' 'qa' 'qe' 'qf' 'qg' 'qh' 'qj' 'qn' 'qt' 'qy' 'r5' 'rd' 'rg' 'rs' 'ru' 'rz' 's7' 'sf' 'si' 'sl' 'sw' 'sy' 't0' 't3' 'th' 'tn' 'tq' 'tu' 'ub' 'us' 'ux' 'vb' 'vo' 'wa' 'wd' 'wn' 'wq' 'wt' 'ww' 'wx' 'y1' 'yh' 'yo' 'yq' 'yz' 'z7' 'ze'
- f        | 'an' 'as' 'cm' 'dh' 'dk' 'do' 'ds' 'dv' 'e1' 'eh' 'ek' 'el' 'er' 'ew' 'ff' 'fo' 'fq' 'g2' 'gz' 'h0' 'hi' 'hk' 'hm' 'hs' 'i4' 'ij' 'iy' 'j5' 'jj' 'jk' 'jw' 'kq' 'kx' 'ky' 'lo' 'lp' 'lw' 'ly' 'm2' 'm6' 'md' 'mv' 'ng' 'of' 'om' 'oy' 'p7' 'pr' 'q7' 'qc' 'ql' 'qq' 'qs' 'qy' 'qz' 'r2' 'r9' 'ra' 'rn' 'ro' 'rq' 'rv' 'rx' 'ry' 'rz' 's0' 'si' 'sy' 'sz' 't6' 't7' 'to' 'tt' 'tv' 'tx' 'ub' 'ur' 'uv' 've' 'vj' 'w3' 'w8' 'w9' 'wa' 'wb' 'wc' 'we' 'wm' 'wt' 'wu' 'wx' 'wy' 'y9' 'yd' 'yg' 'ym' 'yp' 'yt' 'yu' 'yy'
- f        | '1h' '1j' '1o' '2d' 'ac' 'ak' 'b6' 'cx' 'd3' 'ds' 'dv' 'e7' 'es' 'ev' 'ez' 'fs' 'fx' 'fy' 'gc' 'gh' 'gs' 'gt' 'hk' 'ho' 'i8' 'id' 'ig' 'ii' 'iq' 'j5' 'jd' 'je' 'jg' 'jk' 'jl' 'jo' 'jr' 'kf' 'kl' 'kq' 'lf' 'lh' 'lz' 'mb' 'mu' 'ni' 'nz' 'o4' 'ol' 'p7' 'pl' 'pm' 'pv' 'q5' 'qa' 'qe' 'qh' 'qi' 'ql' 'qq' 'qw' 'ra' 'rb' 'rn' 's5' 'sf' 'sh' 'so' 'sp' 'sq' 'sw' 'tj' 'tu' 'ty' 'u3' 'ue' 'uo' 'ux' 'v8' 'vo' 'vr' 'vz' 'w4' 'w8' 'wa' 'wk' 'wl' 'wo' 'wr' 'wu' 'ww' 'xs' 'xx' 'yb' 'yf' 'yn' 'yt' 'yw' 'zf' 'zg' 'zs'
- f        | '1l' '2l' 'ag' 'aj' 'al' 'an' 'ay' 'bo' 'cg' 'cs' 'cw' 'cx' 'db' 'dd' 'e1' 'e8' 'ee' 'ef' 'ej' 'eu' 'ew' 'fc' 'ff' 'fh' 'fo' 'fv' 'fz' 'g1' 'gj' 'gk' 'gw' 'ha' 'i3' 'ib' 'iu' 'jv' 'k9' 'kq' 'ku' 'kw' 'lv' 'lw' 'ly' 'mp' 'my' 'nf' 'ng' 'nw' 'o6' 'oe' 'or' 'ou' 'oz' 'p4' 'pc' 'ph' 'pn' 'py' 'q0' 'qd' 'qe' 'qp' 'qs' 'qu' 'qv' 'qz' 'r6' 'rg' 'rj' 'rt' 'ru' 'rv' 'rw' 'sx' 't2' 'tl' 'tn' 'tq' 'tx' 'tz' 'ue' 'ui' 'ul' 'uo' 'uu' 'w0' 'w1' 'w4' 'w6' 'w8' 'w9' 'wh' 'wi' 'wp' 'ws' 'wt' 'wx' 'yd' 'zd' 'zf' 'zx'
- f        | '1x' '3m' 'a1' 'a5' 'a7' 'al' 'aq' 'ar' 'c8' 'cc' 'cd' 'd0' 'dt' 'e6' 'ei' 'em' 'ez' 'f6' 'fc' 'ff' 'fg' 'fp' 'gm' 'h3' 'ha' 'hg' 'ho' 'hs' 'ib' 'ie' 'il' 'it' 'ix' 'j3' 'jl' 'jt' 'jv' 'jw' 'kd' 'ki' 'l1' 'lk' 'lr' 'lv' 'm0' 'mx' 'my' 'n6' 'ni' 'o2' 'o4' 'o9' 'om' 'p0' 'p6' 'pi' 'pj' 'q5' 'qa' 'qc' 'qg' 'qp' 'qs' 'qu' 'qw' 'rg' 'rt' 'rz' 'se' 'sj' 'sp' 'su' 'sw' 'te' 'tp' 'tq' 'tt' 'tu' 'tx' 'u3' 'un' 'uo' 'up' 'uq' 'vc' 'vj' 'vu' 'w2' 'wh' 'wj' 'ws' 'wv' 'ww' 'xg' 'yc' 'yf' 'yv' 'z2' 'zl' 'zw' 'zy'
- f        | '5q' '7c' 'a1' 'ac' 'ao' 'az' 'bw' 'cz' 'd8' 'dr' 'dy' 'ec' 'eg' 'ej' 'el' 'es' 'et' 'fa' 'fh' 'g2' 'gm' 'go' 'gp' 'gy' 'h6' 'hd' 'he' 'ho' 'ij' 'ik' 'it' 'jc' 'ji' 'k8' 'ku' 'l8' 'lf' 'mw' 'n8' 'nb' 'nd' 'o3' 'ok' 'ol' 'ot' 'p8' 'pi' 'pl' 'pn' 'ps' 'qd' 'qe' 'qk' 'ql' 'qt' 'qz' 'r0' 'r7' 'rd' 'rg' 'rh' 'rm' 'ro' 'rp' 'ru' 'rz' 'sj' 'sm' 'sr' 'su' 'sv' 'sx' 't1' 'tc' 'tl' 'tq' 'uj' 'um' 'uv' 'uw' 'wa' 'wb' 'wi' 'wo' 'wr' 'ws' 'wv' 'wz' 'xb' 'xg' 'ya' 'yb' 'yh' 'yi' 'ym' 'yn' 'yr' 'yv' 'z6' 'zf' 'zz'
- f        | 'ab' 'ad' 'al' 'cm' 'cw' 'dh' 'dn' 'dy' 'e8' 'ea' 'ed' 'ej' 'eq' 'er' 'eu' 'ev' 'f5' 'fb' 'fj' 'fr' 'gc' 'gp' 'h2' 'h6' 'hc' 'hw' 'i3' 'i5' 'id' 'ir' 'ix' 'ka' 'kj' 'ko' 'lv' 'lx' 'mj' 'mv' 'nq' 'ns' 'oa' 'od' 'ok' 'om' 'os' 'p1' 'p5' 'pb' 'pg' 'pj' 'pl' 'ps' 'pu' 'q1' 'qb' 'qd' 'qe' 'qj' 'qk' 'ql' 'qr' 'qs' 'rd' 'rl' 'ro' 'rs' 'rx' 's1' 'sf' 'sg' 't0' 'tb' 'te' 'tf' 'tg' 'tl' 'tp' 'tq' 'u3' 'uf' 'ug' 'up' 'uq' 'vx' 'vy' 'w5' 'wa' 'wc' 'wr' 'ws' 'wu' 'wx' 'wy' 'wz' 'yf' 'ym' 'yz' 'ze' 'zs' 'zy' 'zz'
- f        | '13' '6k' 'ae' 'ah' 'an' 'at' 'aw' 'cc' 'cn' 'du' 'dx' 'ek' 'el' 'em' 'en' 'es' 'ey' 'f2' 'fe' 'fh' 'fk' 'fv' 'g6' 'g9' 'gw' 'hj' 'hn' 'hs' 'hu' 'hv' 'ia' 'im' 'iq' 'ix' 'jh' 'jm' 'ki' 'lj' 'lo' 'lt' 'lw' 'm1' 'nv' 'nw' 'ny' 'oj' 'oo' 'ot' 'ov' 'ox' 'pd' 'pv' 'q1' 'q7' 'qc' 'qd' 'qj' 'ql' 'qp' 'qq' 'qv' 'qw' 'qx' 'r7' 'ry' 'so' 'st' 'su' 'sx' 't9' 'tf' 'th' 'ty' 'uh' 'uo' 'ut' 'uv' 'uy' 'vj' 'vp' 'vu' 'vw' 'w3' 'w5' 'w8' 'wc' 'we' 'wg' 'wi' 'wl' 'wv' 'xh' 'xx' 'yb' 'yd' 'yj' 'yn' 'yo' 'yr' 'yy' 'zk' 'zx'
- f        | '4m' 'a3' 'ac' 'ag' 'ai' 'au' 'av' 'bd' 'bu' 'cl' 'd0' 'dc' 'dy' 'ej' 'el' 'eo' 'es' 'eu' 'ex' 'fr' 'fx' 'g6' 'g9' 'gk' 'gq' 'gr' 'gw' 'gx' 'gz' 'hv' 'ii' 'ix' 'jj' 'jy' 'k0' 'kl' 'kn' 'kw' 'l5' 'lo' 'lz' 'm1' 'n5' 'n9' 'nf' 'nm' 'nz' 'ol' 'os' 'ot' 'oy' 'p1' 'p9' 'pa' 'pj' 'pl' 'pp' 'qc' 'qh' 'qj' 'qr' 'qs' 'qw' 'qz' 'rg' 'ri' 'rl' 'rn' 'rp' 'rt' 'rx' 'rz' 'se' 'sl' 'sv' 'sy' 't8' 'td' 'th' 'tr' 'tx' 'u3' 'u7' 'uc' 'ud' 'ul' 'un' 'up' 'uv' 've' 'vz' 'w7' 'wr' 'y0' 'y6' 'yh' 'yo' 'yu' 'yy' 'yz' 'z6' 'zm'
- f        | '6p' 'an' 'aq' 'au' 'br' 'bz' 'c3' 'ca' 'cg' 'cn' 'db' 'dk' 'dq' 'e0' 'e8' 'ek' 'eo' 'er' 'ez' 'fd' 'ft' 'g0' 'gd' 'gh' 'gk' 'gn' 'gr' 'gv' 'gy' 'hb' 'hc' 'he' 'ht' 'ii' 'ip' 'iu' 'j9' 'jn' 'jo' 'jq' 'jz' 'kh' 'kn' 'ko' 'l3' 'ls' 'lz' 'nh' 'nk' 'ok' 'oy' 'p7' 'pd' 'ph' 'pu' 'pw' 'py' 'q7' 'qa' 'qi' 'qk' 'ql' 'qn' 'qq' 'qr' 'qs' 'qv' 'qx' 'qy' 'rg' 'rs' 'ru' 'sg' 'sl' 'sq' 'sr' 'su' 'ts' 'tt' 'ui' 'um' 'ut' 'uu' 'v0' 'v5' 'w7' 'wb' 'wc' 'wf' 'wi' 'wm' 'xd' 'xs' 'xz' 'y3' 'y4' 'y9' 'yi' 'yp' 'yx' 'z0' 'zf'
- f        | '1f' '3z' '43' 'am' 'b9' 'bg' 'cc' 'ct' 'cx' 'd0' 'de' 'dm' 'dr' 'e0' 'e8' 'ef' 'en' 'ev' 'fd' 'ff' 'fx' 'ga' 'gm' 'gp' 'gr' 'gs' 'gy' 'h1' 'hi' 'hl' 'hs' 'i4' 'i5' 'ic' 'jb' 'jj' 'kj' 'lh' 'ng' 'ni' 'nn' 'ns' 'nx' 'o1' 'oa' 'oe' 'og' 'p4' 'pd' 'ph' 'pj' 'pl' 'pw' 'q9' 'qa' 'qd' 'qh' 'ql' 'qr' 'qs' 'qw' 'qx' 'ro' 'rs' 'rw' 'ry' 'rz' 'sb' 'sj' 'sm' 'so' 't0' 't6' 'tc' 'ti' 'tk' 'tn' 'uk' 'um' 'uw' 'uy' 'v9' 'vd' 'vg' 'w3' 'wf' 'wg' 'wi' 'wk' 'wm' 'wx' 'xe' 'xm' 'xn' 'y5' 'ye' 'yk' 'yq' 'z3' 'zj' 'zk' 'zt' 'zz'
- f        | '1t' 'ai' 'cu' 'cw' 'cx' 'dd' 'de' 'ds' 'e0' 'e2' 'e6' 'eb' 'ei' 'eq' 'eu' 'ev' 'ez' 'f5' 'f8' 'fc' 'g2' 'gd' 'gs' 'gv' 'hu' 'hy' 'id' 'ig' 'ij' 'ir' 'iv' 'ju' 'ka' 'kj' 'kl' 'ks' 'kv' 'kw' 'kx' 'la' 'lh' 'lm' 'ls' 'lv' 'lz' 'mg' 'mh' 'mp' 'ns' 'nt' 'nu' 'nx' 'o6' 'o9' 'oc' 'oj' 'pa' 'pj' 'pl' 'pv' 'q3' 'q5' 'qb' 'qh' 'ql' 'qn' 'qr' 'qs' 'qz' 'rb' 'rf' 'rh' 'rm' 'sm' 'sn' 'sw' 't5' 't9' 'tq' 'ty' 'uj' 'v2' 'vz' 'w6' 'wc' 'wg' 'wi' 'wj' 'wk' 'wm' 'wn' 'wt' 'wv' 'ww' 'wz' 'x0' 'xb' 'xc' 'yb' 'yt' 'yv' 'zp' 'zy'
- f        | 'a3' 'ad' 'ar' 'at' 'bb' 'bf' 'bt' 'cg' 'cx' 'd6' 'de' 'df' 'e4' 'e6' 'eg' 'et' 'ex' 'f0' 'fe' 'fg' 'fj' 'fo' 'gh' 'hb' 'hj' 'hq' 'hr' 'hv' 'ia' 'id' 'is' 'it' 'iy' 'ja' 'jj' 'jq' 'jw' 'l2' 'l7' 'lc' 'lu' 'nc' 'no' 'np' 'nt' 'ob' 'od' 'og' 'oo' 'os' 'pe' 'pj' 'pl' 'po' 'pq' 'pu' 'q2' 'qa' 'qc' 'qf' 'qr' 'qt' 'qx' 're' 'rk' 'rn' 'ro' 'ru' 'rw' 'rx' 's7' 's8' 'sy' 'tc' 'tf' 'tg' 'th' 'tm' 'to' 'tv' 'tx' 'tz' 'va' 'vp' 'w0' 'w1' 'wh' 'wl' 'wq' 'wr' 'wt' 'ww' 'wy' 'x7' 'xl' 'xy' 'y0' 'ye' 'yr' 'yy' 'z3' 'zf' 'zo'
- f        | 'ad' 'ar' 'az' 'b7' 'cf' 'cm' 'ct' 'cw' 'cy' 'dh' 'dn' 'ds' 'ef' 'en' 'eo' 'er' 'fh' 'fi' 'fq' 'fr' 'fx' 'gp' 'gq' 'gu' 'gx' 'h8' 'hf' 'hj' 'hk' 'ho' 'hw' 'hy' 'i3' 'i4' 'ik' 'iu' 'iy' 'jj' 'kn' 'l8' 'lb' 'lg' 'lo' 'm7' 'mx' 'nj' 'nt' 'o6' 'ob' 'oh' 'ok' 'ot' 'pr' 'pz' 'q7' 'q8' 'qa' 'qd' 'qg' 'qh' 'qi' 'qn' 'qz' 'r7' 're' 'ri' 'rk' 'ry' 's4' 'sa' 'sd' 'sm' 'sn' 'sp' 'sw' 'sy' 'tf' 'th' 'to' 'tr' 'tv' 'tz' 'u0' 'u1' 'u5' 'ue' 'uk' 'uq' 'vb' 'vp' 'vr' 'vu' 'wa' 'wb' 'wg' 'wi' 'wk' 'wm' 'wt' 'ya' 'yj' 'yl' 'z3'
- f        | '12' 'ac' 'ay' 'bc' 'bj' 'bm' 'bo' 'ce' 'cf' 'ck' 'cr' 'db' 'do' 'du' 'dy' 'ea' 'ej' 'ek' 'eo' 'ep' 'et' 'f2' 'fc' 'fl' 'fs' 'fy' 'g9' 'gf' 'hj' 'hk' 'hp' 'i1' 'i5' 'ih' 'ii' 'im' 'jp' 'jx' 'k9' 'kf' 'ky' 'mb' 'mj' 'mk' 'nb' 'nc' 'o0' 'o9' 'oc' 'oj' 'oq' 'pm' 'ps' 'pt' 'pu' 'pv' 'py' 'qd' 'qi' 'qj' 'qk' 'ql' 'qm' 'qs' 'qz' 'ra' 'rc' 'rd' 'rh' 'ri' 'ro' 's0' 's3' 's7' 's9' 'sv' 't2' 't7' 'tm' 'tp' 'tw' 'tx' 'ty' 'u3' 'u6' 'uf' 'ug' 'ui' 'uk' 'ut' 'ux' 'v5' 'w3' 'wk' 'wt' 'xo' 'xq' 'xr' 'xu' 'ye' 'yl' 'yn' 'yt' 'yv' 'zm'
- f        | '1o' '7o' 'a1' 'aq' 'b4' 'bi' 'bp' 'c9' 'cb' 'cd' 'cf' 'co' 'cp' 'd3' 'd8' 'ds' 'dv' 'dy' 'eb' 'ee' 'ef' 'eh' 'em' 'eo' 'es' 'ez' 'fi' 'fk' 'fl' 'gj' 'gn' 'gt' 'h1' 'hn' 'ho' 'hp' 'hu' 'ic' 'ik' 'il' 'im' 'ir' 'iw' 'ji' 'jp' 'k4' 'ks' 'm0' 'ml' 'n0' 'ns' 'oj' 'on' 'or' 'os' 'ov' 'pr' 'pv' 'px' 'py' 'q6' 'qa' 'qc' 'qg' 'qj' 'qm' 'qn' 'qp' 'qq' 'qs' 'qv' 'qz' 'r0' 'ra' 's0' 'te' 'tg' 'tm' 'to' 'tw' 'u1' 'u7' 'ug' 'um' 'uw' 'ux' 'uz' 'vm' 'vu' 'w4' 'wg' 'wh' 'wj' 'wk' 'wm' 'wo' 'wq' 'ws' 'wt' 'wz' 'x0' 'x5' 'yg' 'yn' 'z6'
- f        | '2l' '9f' 'a2' 'ak' 'as' 'av' 'bi' 'c1' 'cf' 'ct' 'cu' 'db' 'dp' 'du' 'dv' 'e3' 'e9' 'ee' 'eg' 'el' 'fm' 'gu' 'hc' 'he' 'i3' 'i9' 'ib' 'ik' 'im' 'ir' 'j7' 'jp' 'jv' 'ki' 'kl' 'l6' 'lj' 'lo' 'lw' 'md' 'mj' 'mk' 'ms' 'mw' 'na' 'nq' 'o2' 'od' 'ox' 'p3' 'pj' 'pp' 'q6' 'q7' 'q9' 'qb' 'qg' 'qr' 'qs' 'r7' 'r8' 'rd' 're' 'rf' 'rg' 'rp' 'rv' 'rw' 's6' 'sc' 'sq' 't6' 'tb' 'tc' 'te' 'tj' 'tn' 'tx' 'tz' 'uh' 'uq' 'uu' 'v4' 'vw' 'w3' 'w8' 'wa' 'wj' 'wk' 'wp' 'x3' 'xg' 'xy' 'y1' 'y6' 'yc' 'yi' 'yn' 'yo' 'yw' 'yz' 'z6' 'z8' 'zk' 'zz'
- f        | '80' 'ak' 'al' 'an' 'aq' 'as' 'at' 'bg' 'bn' 'bq' 'bx' 'd4' 'db' 'dg' 'dq' 'dv' 'ef' 'ej' 'en' 'eu' 'ex' 'f9' 'fu' 'g1' 'g2' 'g3' 'gj' 'gn' 'gs' 'gt' 'gx' 'h4' 'h8' 'hb' 'hn' 'hx' 'hy' 'i5' 'im' 'ji' 'jo' 'jy' 'k1' 'kb' 'kh' 'kp' 'kv' 'l4' 'lf' 'lt' 'ml' 'mv' 'na' 'ny' 'o2' 'oj' 'oq' 'or' 'os' 'pp' 'q3' 'q8' 'qc' 'qf' 'qp' 'qt' 'qv' 'rc' 'rg' 'rm' 's4' 'sa' 'sk' 'sp' 'su' 'sv' 'sy' 't5' 'te' 'tm' 'tn' 'to' 'tt' 'tw' 'tx' 'tz' 'ue' 'ug' 'ul' 'un' 'uq' 'us' 'v3' 'wd' 'wr' 'wu' 'wy' 'x3' 'x8' 'xk' 'yf' 'yj' 'yk' 'yp' 'z0'
- f        | '1b' '42' 'a7' 'ab' 'ak' 'ap' 'at' 'av' 'ay' 'b0' 'b9' 'bb' 'bp' 'bu' 'bz' 'cq' 'da' 'de' 'dn' 'e0' 'eb' 'ef' 'eg' 'ek' 'eq' 'er' 'eu' 'ey' 'fn' 'ft' 'gg' 'h4' 'hk' 'hl' 'i7' 'ig' 'ik' 'ip' 'ir' 'iu' 'iw' 'jr' 'jw' 'jx' 'kg' 'lc' 'lg' 'm0' 'na' 'np' 'om' 'on' 'oz' 'pg' 'pn' 'ps' 'pt' 'pz' 'q3' 'q6' 'qa' 'qb' 'ql' 'qq' 'qt' 'qv' 'qw' 'qy' 'r8' 'rf' 'ri' 'rk' 'rl' 'rw' 'sg' 'si' 'sp' 'sw' 'ta' 'th' 'ua' 'uj' 'uu' 'uv' 'uz' 'vj' 'vk' 'vm' 'wc' 'wf' 'wh' 'wn' 'wo' 'ww' 'xb' 'xk' 'xt' 'xw' 'y7' 'ye' 'yl' 'yt' 'yw' 'z4' 'z7' 'zc' 'zw'
- f        | '1h' '3s' 'ab' 'ae' 'ax' 'b1' 'bz' 'cy' 'dk' 'dq' 'ds' 'du' 'e8' 'ef' 'ej' 'ek' 'ex' 'f1' 'fe' 'ff' 'fn' 'fo' 'ft' 'fx' 'ge' 'go' 'gz' 'h6' 'hz' 'i2' 'iv' 'iy' 'j5' 'j6' 'ke' 'kf' 'lh' 'lr' 'mc' 'mj' 'na' 'ng' 'oh' 'om' 'oy' 'p2' 'pi' 'pk' 'py' 'q3' 'qb' 'qc' 'qg' 'qn' 'qo' 'qq' 'qu' 'qw' 'qx' 'qy' 'qz' 'r1' 'rk' 'rl' 'rq' 'rs' 'rt' 'ry' 'rz' 'sk' 'sl' 'so' 't9' 'td' 'te' 'tn' 'tw' 'tz' 'ud' 'uk' 'uo' 'uq' 'uw' 'ux' 'uy' 'v1' 'vg' 'vq' 'w4' 'w9' 'wa' 'wg' 'wj' 'wm' 'wo' 'wr' 'ww' 'wy' 'xf' 'xg' 'y9' 'yh' 'yi' 'yk' 'ym' 'yq' 'yv' 'zm'
- t        | 
-(514 rows)
-
-drop index wowidx;
-create index wowidx on test_tsvector using gin (a);
-set enable_seqscan=off;
-SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
- count 
--------
-   158
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
- count 
--------
-    17
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
- count 
--------
-     6
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
- count 
--------
-    98
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
- count 
--------
-    23
-(1 row)
-
-SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
- count 
--------
-    39
-(1 row)
-
diff -Nru postgresql-9.5-9.5.2/contrib/tsearch2/expected/tsearch2.out postgresql-9.5-9.5.8/contrib/tsearch2/expected/tsearch2.out
--- postgresql-9.5-9.5.2/contrib/tsearch2/expected/tsearch2.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/tsearch2/expected/tsearch2.out	2017-08-07 21:13:41.000000000 +0000
@@ -1067,7 +1067,7 @@
 
 insert into test_tsvector (t) values ('foo bar foo the over foo qq bar');
 drop trigger tsvectorupdate on test_tsvector;
-select * from stat('select a from test_tsvector') order by ndoc desc, nentry desc, word;
+select * from stat('select a from test_tsvector') order by ndoc desc, nentry desc, word collate "C";
    word    | ndoc | nentry 
 -----------+------+--------
  qq        |  109 |    109
@@ -2220,28 +2220,28 @@
 
 insert into test_tsvector values ('1', 'a:1a,2,3b b:5a,6a,7c,8');
 insert into test_tsvector values ('1', 'a:1a,2,3c b:5a,6b,7c,8b');
-select * from stat('select a from test_tsvector','a') order by ndoc desc, nentry desc, word;
+select * from stat('select a from test_tsvector','a') order by ndoc desc, nentry desc, word collate "C";
  word | ndoc | nentry 
 ------+------+--------
  b    |    2 |      3
  a    |    2 |      2
 (2 rows)
 
-select * from stat('select a from test_tsvector','b') order by ndoc desc, nentry desc, word;
+select * from stat('select a from test_tsvector','b') order by ndoc desc, nentry desc, word collate "C";
  word | ndoc | nentry 
 ------+------+--------
  b    |    1 |      2
  a    |    1 |      1
 (2 rows)
 
-select * from stat('select a from test_tsvector','c') order by ndoc desc, nentry desc, word;
+select * from stat('select a from test_tsvector','c') order by ndoc desc, nentry desc, word collate "C";
  word | ndoc | nentry 
 ------+------+--------
  b    |    2 |      2
  a    |    1 |      1
 (2 rows)
 
-select * from stat('select a from test_tsvector','d') order by ndoc desc, nentry desc, word;
+select * from stat('select a from test_tsvector','d') order by ndoc desc, nentry desc, word collate "C";
    word    | ndoc | nentry 
 -----------+------+--------
  a         |    2 |      2
@@ -2254,7 +2254,7 @@
  qwerti    |    1 |      1
 (8 rows)
 
-select * from stat('select a from test_tsvector','ad') order by ndoc desc, nentry desc, word;
+select * from stat('select a from test_tsvector','ad') order by ndoc desc, nentry desc, word collate "C";
    word    | ndoc | nentry 
 -----------+------+--------
  a         |    2 |      4
diff -Nru postgresql-9.5-9.5.2/contrib/tsearch2/sql/tsearch2.sql postgresql-9.5-9.5.8/contrib/tsearch2/sql/tsearch2.sql
--- postgresql-9.5-9.5.2/contrib/tsearch2/sql/tsearch2.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/tsearch2/sql/tsearch2.sql	2017-08-07 21:13:41.000000000 +0000
@@ -230,14 +230,14 @@
 
 insert into test_tsvector (t) values ('foo bar foo the over foo qq bar');
 drop trigger tsvectorupdate on test_tsvector;
-select * from stat('select a from test_tsvector') order by ndoc desc, nentry desc, word;
+select * from stat('select a from test_tsvector') order by ndoc desc, nentry desc, word collate "C";
 insert into test_tsvector values ('1', 'a:1a,2,3b b:5a,6a,7c,8');
 insert into test_tsvector values ('1', 'a:1a,2,3c b:5a,6b,7c,8b');
-select * from stat('select a from test_tsvector','a') order by ndoc desc, nentry desc, word;
-select * from stat('select a from test_tsvector','b') order by ndoc desc, nentry desc, word;
-select * from stat('select a from test_tsvector','c') order by ndoc desc, nentry desc, word;
-select * from stat('select a from test_tsvector','d') order by ndoc desc, nentry desc, word;
-select * from stat('select a from test_tsvector','ad') order by ndoc desc, nentry desc, word;
+select * from stat('select a from test_tsvector','a') order by ndoc desc, nentry desc, word collate "C";
+select * from stat('select a from test_tsvector','b') order by ndoc desc, nentry desc, word collate "C";
+select * from stat('select a from test_tsvector','c') order by ndoc desc, nentry desc, word collate "C";
+select * from stat('select a from test_tsvector','d') order by ndoc desc, nentry desc, word collate "C";
+select * from stat('select a from test_tsvector','ad') order by ndoc desc, nentry desc, word collate "C";
 
 select to_tsquery('english', 'skies & books');
 
diff -Nru postgresql-9.5-9.5.2/contrib/tsearch2/tsearch2--1.0.sql postgresql-9.5-9.5.8/contrib/tsearch2/tsearch2--1.0.sql
--- postgresql-9.5-9.5.2/contrib/tsearch2/tsearch2--1.0.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/tsearch2/tsearch2--1.0.sql	2017-08-07 21:13:41.000000000 +0000
@@ -414,7 +414,7 @@
 	LANGUAGE INTERNAL
 	RETURNS NULL ON NULL INPUT;
 
---reset - just for debuging
+--reset - just for debugging
 CREATE FUNCTION reset_tsearch()
         RETURNS void
         as 'MODULE_PATHNAME', 'tsa_reset_tsearch'
diff -Nru postgresql-9.5-9.5.2/contrib/uuid-ossp/uuid-ossp.c postgresql-9.5-9.5.8/contrib/uuid-ossp/uuid-ossp.c
--- postgresql-9.5-9.5.2/contrib/uuid-ossp/uuid-ossp.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/uuid-ossp/uuid-ossp.c	2017-08-07 21:13:41.000000000 +0000
@@ -17,6 +17,10 @@
 #include "utils/builtins.h"
 #include "utils/uuid.h"
 
+/* for ntohl/htonl */
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 /*
  * It's possible that there's more than one uuid.h header file present.
  * We expect configure to set the HAVE_ symbol for only the one we want.
@@ -26,14 +30,14 @@
  */
 #define uuid_hash bsd_uuid_hash
 
-#ifdef HAVE_UUID_H
+#if defined(HAVE_UUID_H)
 #include <uuid.h>
-#endif
-#ifdef HAVE_OSSP_UUID_H
+#elif defined(HAVE_OSSP_UUID_H)
 #include <ossp/uuid.h>
-#endif
-#ifdef HAVE_UUID_UUID_H
+#elif defined(HAVE_UUID_UUID_H)
 #include <uuid/uuid.h>
+#else
+#error "please use configure's --with-uuid switch to select a UUID library"
 #endif
 
 #undef uuid_hash
diff -Nru postgresql-9.5-9.5.2/contrib/xml2/xpath.c postgresql-9.5-9.5.8/contrib/xml2/xpath.c
--- postgresql-9.5-9.5.2/contrib/xml2/xpath.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/contrib/xml2/xpath.c	2017-08-07 21:13:41.000000000 +0000
@@ -611,7 +611,7 @@
 
 	/*
 	 * At the moment we assume that the returned attributes make sense for the
-	 * XPath specififed (i.e. we trust the caller). It's not fatal if they get
+	 * XPath specified (i.e. we trust the caller). It's not fatal if they get
 	 * it wrong - the input function for the column type will raise an error
 	 * if the path result can't be converted into the correct binary
 	 * representation.
diff -Nru postgresql-9.5-9.5.2/COPYRIGHT postgresql-9.5-9.5.8/COPYRIGHT
--- postgresql-9.5-9.5.2/COPYRIGHT	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/COPYRIGHT	2017-08-07 21:13:41.000000000 +0000
@@ -1,7 +1,7 @@
 PostgreSQL Database Management System
 (formerly known as Postgres, then as Postgres95)
 
-Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
 
 Portions Copyright (c) 1994, The Regents of the University of California
 
diff -Nru postgresql-9.5-9.5.2/debian/changelog postgresql-9.5-9.5.8/debian/changelog
--- postgresql-9.5-9.5.2/debian/changelog	2016-03-29 18:48:52.000000000 +0000
+++ postgresql-9.5-9.5.8/debian/changelog	2017-08-14 12:46:13.000000000 +0000
@@ -1,3 +1,128 @@
+postgresql-9.5 (9.5.8-0ubuntu0.16.04.1) xenial-security; urgency=medium
+
+  * SECURITY UPDATE: Update to 9.5.8 to fix security issues
+    - Further restrict visibility of pg_user_mappings.umoptions, to protect
+      passwords stored as user mapping options (CVE-2017-7547)
+    - Disallow empty passwords in all password-based authentication methods
+      (CVE-2017-7546)
+    - Make lo_put() check for UPDATE privilege on the target large object
+      (CVE-2017-7548)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 14 Aug 2017 08:45:32 -0400
+
+postgresql-9.5 (9.5.7-0ubuntu0.16.04) xenial; urgency=medium
+
+  * New upstream release (LP: #1690730)
+    - Restrict visibility of pg_user_mappings.umoptions, to protect passwords
+      stored as user mapping options (CVE-2017-7486)
+    - Prevent exposure of statistical information via leaky operators
+      (CVE-2017-7484)
+    - Restore libpq's recognition of the PGREQUIRESSL environment variable
+      (CVE-2017-7485)
+
+    - A dump/restore is not required for those running 9.5.X.
+    - However, if you use foreign data servers that make use of user passwords
+      for authentication, see the first changelog entry.
+    - Also, if you are using third-party replication tools that depend on
+      "logical decoding", see the fourth changelog entry.
+
+    - Details about other changes at full changelog:
+      https://www.postgresql.org/docs/9.5/static/release-9-5-7.html
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Mon, 15 May 2017 08:46:07 +0200
+
+postgresql-9.5 (9.5.6-0ubuntu0.16.04) xenial; urgency=medium
+
+  * New upstream release (LP: #1664478)
+    - Fix a race condition that could cause indexes built with CREATE INDEX
+      CONCURRENTLY to be corrupt (Pavan Deolasee, Tom Lane).
+      If CREATE INDEX CONCURRENTLY was used to build an index that depends on
+      a column not previously indexed, then rows inserted or updated by
+      transactions that ran concurrently with the CREATE INDEX command could
+      have received incorrect index entries.  If you suspect this may have
+      happened, the most reliable solution is to rebuild affected indexes
+      after installing this update
+
+    - Details about other changes:
+      http://www.postgresql.org/docs/9.5/static/release-9-5-6.html
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Tue, 14 Feb 2017 09:29:09 +0100
+
+postgresql-9.5 (9.5.5-0ubuntu0.16.04) xenial-proposed; urgency=medium
+
+  * New upstream bug fix release (LP: #1637236)
+    - Fix WAL-logging of truncation of relation free space maps and visibility
+      maps.
+      It was possible for these files to not be correctly restored during
+      crash recovery, or to be written incorrectly on a standby server. Bogus
+      entries in a free space map could lead to attempts to access pages that
+      have been truncated away from the relation itself, typically producing
+      errors like "could not read block XXX: read only 0 of 8192 bytes".
+      Checksum failures in the visibility map are also possible, if
+      checksumming is enabled.
+
+      Procedures for determining whether there is a problem and repairing it
+      if so are discussed at
+         https://wiki.postgresql.org/wiki/Free_Space_Map_Problems.
+
+    - Details about other changes:
+      http://www.postgresql.org/docs/9.5/static/release-9-5-5.html
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 27 Oct 2016 18:03:43 +0200
+
+postgresql-9.5 (9.5.4-0ubuntu0.16.04) xenial-security; urgency=medium
+
+  * New upstream security/bug fix release (LP: #1614113)
+    - Fix possible mis-evaluation of nested CASE-WHEN expressions
+      A CASE expression appearing within the test value subexpression of
+      another CASE could become confused about whether its own test value was
+      null or not.  Also, inlining of a SQL function implementing the equality
+      operator used by a CASE expression could result in passing the wrong
+      test value to functions called within a CASE expression in the SQL
+      function's body.  If the test values were of different data types, a
+      crash might result; moreover such situations could be abused to allow
+      disclosure of portions of server memory.  (CVE-2016-5423)
+
+    - Fix client programs' handling of special characters in database and role
+      names
+      Numerous places in vacuumdb and other client programs could become
+      confused by database and role names containing double quotes or
+      backslashes.  Tighten up quoting rules to make that safe. Also, ensure
+      that when a conninfo string is used as a database name parameter to
+      these programs, it is correctly treated as such throughout.
+
+      Fix handling of paired double quotes in psql's \connect and \password
+      commands to match the documentation.
+
+      Introduce a new -reuse-previous option in psql's \connect command to
+      allow explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether the
+      database name looks like a conninfo string, as before.)  This allows
+      secure handling of database names containing special characters in
+      pg_dumpall scripts.
+
+      pg_dumpall now refuses to deal with database and role names containing
+      carriage returns or newlines, as it seems impractical to quote those
+      characters safely on Windows.  In future we may reject such names on the
+      server side, but that step has not been taken yet.
+
+      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute commands
+      with superuser privileges the next time a superuser executes pg_dumpall
+      or other routine maintenance operations.  (CVE-2016-5424)
+
+    - Details about other fixes:
+      https://www.postgresql.org/docs/9.5/static/release-9-5-4.html
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 17 Aug 2016 16:12:33 +0200
+
+postgresql-9.5 (9.5.3-0ubuntu0.16.04) xenial-proposed; urgency=medium
+
+  * New upstream bug fix release (LP: #1581016)
+    - Details: http://www.postgresql.org/docs/9.5/static/release-9-5-3.html
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 12 May 2016 14:57:49 +0200
+
 postgresql-9.5 (9.5.2-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru postgresql-9.5-9.5.2/debian/control postgresql-9.5-9.5.8/debian/control
--- postgresql-9.5-9.5.2/debian/control	2016-03-29 10:11:52.000000000 +0000
+++ postgresql-9.5-9.5.8/debian/control	2016-05-12 13:00:03.000000000 +0000
@@ -1,7 +1,8 @@
 Source: postgresql-9.5
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <pkg-postgresql-public@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <pkg-postgresql-public@lists.alioth.debian.org>
 Uploaders: Martin Pitt <mpitt@debian.org>, Peter Eisentraut <petere@debian.org>, Christoph Berg <myon@debian.org>
 Standards-Version: 3.9.7
 Build-Depends: debhelper (>= 9~),
diff -Nru postgresql-9.5-9.5.2/doc/bug.template postgresql-9.5-9.5.8/doc/bug.template
--- postgresql-9.5-9.5.2/doc/bug.template	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/bug.template	2017-08-07 21:13:41.000000000 +0000
@@ -9,7 +9,7 @@
 then e-mail it to pgsql-hackers@postgresql.org instead.  Please use the
 command "diff -c" to generate the patch.
 
-You may also enter a bug report at http://www.postgresql.org/ instead of
+You may also enter a bug report at https://www.postgresql.org/ instead of
 e-mailing this form.
 
 ============================================================================
@@ -27,7 +27,7 @@
 
   Operating System (example: Linux 2.4.18)	:
 
-  PostgreSQL version (example: PostgreSQL 9.5.2):  PostgreSQL 9.5.2
+  PostgreSQL version (example: PostgreSQL 9.5.8):  PostgreSQL 9.5.8
 
   Compiler used (example: gcc 3.3.5)		:
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/acronyms.sgml postgresql-9.5-9.5.8/doc/src/sgml/acronyms.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/acronyms.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/acronyms.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -300,7 +300,7 @@
     <listitem>
      <para>
       <ulink
-      url="http://git.postgresql.org/gitweb?p=postgresql.git;a=blob;f=src/backend/access/heap/README.HOT;hb=HEAD">Heap-Only
+      url="https://git.postgresql.org/gitweb?p=postgresql.git;a=blob;f=src/backend/access/heap/README.HOT;hb=HEAD">Heap-Only
       Tuples</ulink>
      </para>
     </listitem>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/adminpack.sgml postgresql-9.5-9.5.8/doc/src/sgml/adminpack.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/adminpack.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/adminpack.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -12,29 +12,151 @@
   <application>pgAdmin</> and other administration and management tools can
   use to provide additional functionality, such as remote management
   of server log files.
+  Use of all these functions is restricted to superusers.
  </para>
 
- <sect2>
-  <title>Functions Implemented</title>
+ <para>
+  The functions shown in <xref linkend="functions-adminpack-table"> provide
+  write access to files on the machine hosting the server.  (See also the
+  functions in <xref linkend="functions-admin-genfile-table">, which
+  provide read-only access.)
+  Only files within the database cluster directory can be accessed, but
+  either a relative or absolute path is allowable.
+ </para>
+
+ <table id="functions-adminpack-table">
+  <title><filename>adminpack</> Functions</title>
+  <tgroup cols="3">
+   <thead>
+    <row><entry>Name</entry> <entry>Return Type</entry> <entry>Description</entry>
+    </row>
+   </thead>
+
+   <tbody>
+    <row>
+     <entry><function>pg_catalog.pg_file_write(filename text, data text, append boolean)</function></entry>
+     <entry><type>bigint</type></entry>
+     <entry>
+      Write, or append to, a text file
+     </entry>
+    </row>
+    <row>
+     <entry><function>pg_catalog.pg_file_rename(oldname text, newname text <optional>, archivename text</optional>)</function></entry>
+     <entry><type>boolean</type></entry>
+     <entry>
+      Rename a file
+     </entry>
+    </row>
+    <row>
+     <entry><function>pg_catalog.pg_file_unlink(filename text)</function></entry>
+     <entry><type>boolean</type></entry>
+     <entry>
+      Remove a file
+     </entry>
+    </row>
+    <row>
+     <entry><function>pg_catalog.pg_logdir_ls()</function></entry>
+     <entry><type>setof record</type></entry>
+     <entry>
+      List the log files in the <varname>log_directory</> directory
+     </entry>
+    </row>
+   </tbody>
+  </tgroup>
+ </table>
+
+ <indexterm>
+  <primary>pg_file_write</primary>
+ </indexterm>
+ <para>
+  <function>pg_file_write</> writes the specified <parameter>data</> into
+  the file named by <parameter>filename</>.  If <parameter>append</> is
+  false, the file must not already exist.  If <parameter>append</> is true,
+  the file can already exist, and will be appended to if so.
+  Returns the number of bytes written.
+ </para>
+
+ <indexterm>
+  <primary>pg_file_rename</primary>
+ </indexterm>
+ <para>
+  <function>pg_file_rename</> renames a file.  If <parameter>archivename</>
+  is omitted or NULL, it simply renames <parameter>oldname</>
+  to <parameter>newname</> (which must not already exist).
+  If <parameter>archivename</> is provided, it first
+  renames <parameter>newname</> to <parameter>archivename</> (which must
+  not already exist), and then renames <parameter>oldname</>
+  to <parameter>newname</>.  In event of failure of the second rename step,
+  it will try to rename <parameter>archivename</> back
+  to <parameter>newname</> before reporting the error.
+  Returns true on success, false if the source file(s) are not present or
+  not writable; other cases throw errors.
+ </para>
 
-  <para>
-   The functions implemented by <filename>adminpack</> can only be run by a
-   superuser. Here's a list of these functions:
-
-<programlisting>
-int8 pg_catalog.pg_file_write(fname text, data text, append bool)
-bool pg_catalog.pg_file_rename(oldname text, newname text, archivename text)
-bool pg_catalog.pg_file_rename(oldname text, newname text)
-bool pg_catalog.pg_file_unlink(fname text)
-setof record pg_catalog.pg_logdir_ls()
-
-/* Renaming of existing backend functions for pgAdmin compatibility */
-int8 pg_catalog.pg_file_read(fname text, data text, append bool)
-bigint pg_catalog.pg_file_length(text)
-int4 pg_catalog.pg_logfile_rotate()
-</programlisting>
-  </para>
+ <indexterm>
+  <primary>pg_file_unlink</primary>
+ </indexterm>
+ <para>
+  <function>pg_file_unlink</> removes the specified file.
+  Returns true on success, false if the specified file is not present
+  or the <function>unlink()</> call fails; other cases throw errors.
+ </para>
+
+ <indexterm>
+  <primary>pg_logdir_ls</primary>
+ </indexterm>
+ <para>
+  <function>pg_logdir_ls</> returns the start timestamps and path
+  names of all the log files in the <xref linkend="guc-log-directory">
+  directory.  The <xref linkend="guc-log-filename"> parameter must have its
+  default setting (<literal>postgresql-%Y-%m-%d_%H%M%S.log</>) to use this
+  function.
+ </para>
+
+ <para>
+  The functions shown
+  in <xref linkend="functions-adminpack-deprecated-table"> are deprecated
+  and should not be used in new applications; instead use those shown
+  in <xref linkend="functions-admin-signal-table">
+  and <xref linkend="functions-admin-genfile-table">.  These functions are
+  provided in <filename>adminpack</> only for compatibility with old
+  versions of <application>pgAdmin</>.
+ </para>
 
- </sect2>
+ <table id="functions-adminpack-deprecated-table">
+  <title>Deprecated <filename>adminpack</> Functions</title>
+  <tgroup cols="3">
+   <thead>
+    <row><entry>Name</entry> <entry>Return Type</entry> <entry>Description</entry>
+    </row>
+   </thead>
+
+   <tbody>
+    <row>
+     <entry><function>pg_catalog.pg_file_read(filename text, offset bigint, nbytes bigint)</function></entry>
+     <entry><type>text</type></entry>
+     <entry>
+      Alternate name for <function>pg_read_file()</>
+     </entry>
+    </row>
+    <row>
+     <entry><function>pg_catalog.pg_file_length(filename text)</function></entry>
+     <entry><type>bigint</type></entry>
+     <entry>
+      Same as <structfield>size</> column returned
+      by <function>pg_stat_file()</>
+     </entry>
+    </row>
+    <row>
+     <entry><function>pg_catalog.pg_logfile_rotate()</function></entry>
+     <entry><type>integer</type></entry>
+     <entry>
+      Alternate name for <function>pg_rotate_logfile()</>, but note that it
+      returns integer 0 or 1 rather than boolean
+     </entry>
+    </row>
+   </tbody>
+  </tgroup>
+ </table>
 
 </sect1>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/advanced.sgml postgresql-9.5-9.5.8/doc/src/sgml/advanced.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/advanced.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/advanced.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -712,7 +712,7 @@
 
    <para>
     If you feel you need more introductory material, please visit the PostgreSQL
-    <ulink url="http://www.postgresql.org">web site</ulink>
+    <ulink url="https://www.postgresql.org">web site</ulink>
     for links to more resources.
    </para>
   </sect1>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/biblio.sgml postgresql-9.5-9.5.8/doc/src/sgml/biblio.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/biblio.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/biblio.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -295,7 +295,7 @@
     <pubdate>April, 1990</pubdate>
     <publisher>
      <publishername>University  of  California</publishername>
-     <address>Berkely, California</address>
+     <address>Berkeley, California</address>
     </publisher>
    </biblioset>
    </biblioentry>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/btree-gist.sgml postgresql-9.5-9.5.8/doc/src/sgml/btree-gist.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/btree-gist.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/btree-gist.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -98,7 +98,7 @@
   <title>Authors</title>
 
   <para>
-   Teodor Sigaev (<email>teodor@stack.net</email>) ,
+   Teodor Sigaev (<email>teodor@stack.net</email>),
    Oleg Bartunov (<email>oleg@sai.msu.su</email>), and
    Janko Richter (<email>jankorichter@yahoo.de</email>).  See
    <ulink url="http://www.sai.msu.su/~megera/postgres/gist/"></ulink>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/catalogs.sgml postgresql-9.5-9.5.8/doc/src/sgml/catalogs.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/catalogs.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/catalogs.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -234,23 +234,13 @@
      </row>
 
      <row>
-      <entry><link linkend="catalog-pg-rewrite"><structname>pg_rewrite</structname></link></entry>
-      <entry>query rewrite rules</entry>
-     </row>
-
-     <row>
       <entry><link linkend="catalog-pg-replication-origin"><structname>pg_replication_origin</structname></link></entry>
       <entry>registered replication origins</entry>
      </row>
 
      <row>
-      <entry><link linkend="catalog-pg-replication-origin-status"><structname>pg_replication_origin_status</structname></link></entry>
-      <entry>information about replication origins, including replication progress</entry>
-     </row>
-
-     <row>
-      <entry><link linkend="catalog-pg-replication-slots"><structname>pg_replication_slots</structname></link></entry>
-      <entry>replication slot information</entry>
+      <entry><link linkend="catalog-pg-rewrite"><structname>pg_rewrite</structname></link></entry>
+      <entry>query rewrite rules</entry>
      </row>
 
      <row>
@@ -5245,6 +5235,54 @@
 
  </sect1>
 
+ <sect1 id="catalog-pg-replication-origin">
+  <title><structname>pg_replication_origin</structname></title>
+
+  <indexterm zone="catalog-pg-replication-origin">
+   <primary>pg_replication_origin</primary>
+  </indexterm>
+
+  <para>
+   The <structname>pg_replication_origin</structname> catalog contains
+   all replication origins created.  For more on replication origins
+   see <xref linkend="replication-origins">.
+  </para>
+
+  <table>
+
+   <title><structname>pg_replication_origin</structname> Columns</title>
+
+   <tgroup cols="4">
+    <thead>
+     <row>
+      <entry>Name</entry>
+      <entry>Type</entry>
+      <entry>References</entry>
+      <entry>Description</entry>
+     </row>
+    </thead>
+
+    <tbody>
+     <row>
+      <entry><structfield>roident</structfield></entry>
+      <entry><type>Oid</type></entry>
+      <entry></entry>
+      <entry>A unique, cluster-wide identifier for the replication
+      origin. Should never leave the system.</entry>
+     </row>
+
+     <row>
+      <entry><structfield>roname</structfield></entry>
+      <entry><type>text</type></entry>
+      <entry></entry>
+      <entry>The external, user defined, name of a replication
+      origin.</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+ </sect1>
+
  <sect1 id="catalog-pg-rewrite">
   <title><structname>pg_rewrite</structname></title>
 
@@ -5357,71 +5395,28 @@
 
  </sect1>
 
- <sect1 id="catalog-pg-replication-origin">
-  <title><structname>pg_replication_origin</structname></title>
+ <sect1 id="catalog-pg-seclabel">
+  <title><structname>pg_seclabel</structname></title>
 
-  <indexterm zone="catalog-pg-replication-origin">
-   <primary>pg_replication_origin</primary>
+  <indexterm zone="catalog-pg-seclabel">
+   <primary>pg_seclabel</primary>
   </indexterm>
 
   <para>
-   The <structname>pg_replication_origin</structname> catalog contains
-   all replication origins created.  For more on replication origins
-   see <xref linkend="replication-origins">.
+   The catalog <structname>pg_seclabel</structname> stores security
+   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>
-
-   <title><structname>pg_replication_origin</structname> Columns</title>
-
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>Name</entry>
-      <entry>Type</entry>
-      <entry>References</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-
-    <tbody>
-     <row>
-      <entry><structfield>roident</structfield></entry>
-      <entry><type>Oid</type></entry>
-      <entry></entry>
-      <entry>A unique, cluster-wide identifier for the replication
-      origin. Should never leave the system.</entry>
-     </row>
-
-     <row>
-      <entry><structfield>roname</structfield></entry>
-      <entry><type>text</type></entry>
-      <entry></entry>
-      <entry>The external, user defined, name of a replication
-      origin.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </sect1>
-
-  <sect1 id="catalog-pg-replication-origin-status">
-  <title><structname>pg_replication_origin_status</structname></title>
-
-  <indexterm zone="catalog-pg-replication-origin-status">
-   <primary>pg_replication_origin_status</primary>
-  </indexterm>
-
   <para>
-   The <structname>pg_replication_origin_status</structname> view
-   contains information about how far replay for a certain origin has
-   progressed.  For more on replication origins
-   see <xref linkend="replication-origins">.
+   See also <link linkend="catalog-pg-shseclabel"><structname>pg_shseclabel</structname></link>,
+   which performs a similar function for security labels of database objects
+   that are shared across a database cluster.
   </para>
 
   <table>
-
-   <title><structname>pg_replication_origin_status</structname> Columns</title>
+   <title><structname>pg_seclabel</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -5435,63 +5430,79 @@
 
     <tbody>
      <row>
-      <entry><structfield>local_id</structfield></entry>
-      <entry><type>Oid</type></entry>
-      <entry><literal><link linkend="catalog-pg-replication-origin"><structname>pg_replication_origin</structname></link>.roident</literal></entry>
-      <entry>internal node identifier</entry>
+      <entry><structfield>objoid</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry>any OID column</entry>
+      <entry>The OID of the object this security label pertains to</entry>
      </row>
 
      <row>
-      <entry><structfield>external_id</structfield></entry>
-      <entry><type>text</type></entry>
-      <entry><literal><link linkend="catalog-pg-replication-origin"><structname>pg_replication_origin</structname></link>.roname</literal></entry>
-      <entry>external node identifier</entry>
+      <entry><structfield>classoid</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
+      <entry>The OID of the system catalog this object appears in</entry>
      </row>
 
      <row>
-      <entry><structfield>remote_lsn</structfield></entry>
-      <entry><type>pg_lsn</type></entry>
+      <entry><structfield>objsubid</structfield></entry>
+      <entry><type>int4</type></entry>
       <entry></entry>
-      <entry>The origin node's LSN up to which data has been replicated.</entry>
+      <entry>
+       For a security label on a table column, this is the column number (the
+       <structfield>objoid</> and <structfield>classoid</> refer to
+       the table itself).  For all other object types, this column is
+       zero.
+      </entry>
      </row>
 
+     <row>
+      <entry><structfield>provider</structfield></entry>
+      <entry><type>text</type></entry>
+      <entry></entry>
+      <entry>The label provider associated with this label.</entry>
+     </row>
 
      <row>
-      <entry><structfield>local_lsn</structfield></entry>
-      <entry><type>pg_lsn</type></entry>
+      <entry><structfield>label</structfield></entry>
+      <entry><type>text</type></entry>
       <entry></entry>
-      <entry>
-       This node's LSN at which <literal>remote_lsn</literal> has
-       been replicated. Used to flush commit records before persisting
-       data to disk when using asynchronous commits.
-      </entry>
+      <entry>The security label applied to this object.</entry>
      </row>
     </tbody>
    </tgroup>
   </table>
  </sect1>
 
- <sect1 id="catalog-pg-replication-slots">
-  <title><structname>pg_replication_slots</structname></title>
+ <sect1 id="catalog-pg-shdepend">
+  <title><structname>pg_shdepend</structname></title>
 
-  <indexterm zone="catalog-pg-replication-slots">
-   <primary>pg_replication_slots</primary>
+  <indexterm zone="catalog-pg-shdepend">
+   <primary>pg_shdepend</primary>
   </indexterm>
 
   <para>
-   The <structname>pg_replication_slots</structname> view provides a listing
-   of all replication slots that currently exist on the database cluster,
-   along with their current state.
+   The catalog <structname>pg_shdepend</structname> records the
+   dependency relationships between database objects and shared objects,
+   such as roles.  This information allows
+   <productname>PostgreSQL</productname> to ensure that those objects are
+   unreferenced before attempting to delete them.
   </para>
 
   <para>
-   For more on replication slots,
-   see <xref linkend="streaming-replication-slots"> and <xref linkend="logicaldecoding">.
+   See also <link linkend="catalog-pg-depend"><structname>pg_depend</structname></link>,
+   which performs a similar function for dependencies involving objects
+   within a single database.
   </para>
 
-  <table>
+  <para>
+   Unlike most system catalogs, <structname>pg_shdepend</structname>
+   is shared across all databases of a cluster: there is only one
+   copy of <structname>pg_shdepend</structname> per cluster, not
+   one per database.
+  </para>
 
-   <title><structname>pg_replication_slots</structname> Columns</title>
+  <table>
+   <title><structname>pg_shdepend</> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -5505,268 +5516,60 @@
 
     <tbody>
      <row>
-      <entry><structfield>slot_name</structfield></entry>
-      <entry><type>name</type></entry>
-      <entry></entry>
-      <entry>A unique, cluster-wide identifier for the replication slot</entry>
+      <entry><structfield>dbid</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry><literal><link linkend="catalog-pg-database"><structname>pg_database</structname></link>.oid</literal></entry>
+      <entry>The OID of the database the dependent object is in,
+       or zero for a shared object</entry>
      </row>
 
      <row>
-      <entry><structfield>plugin</structfield></entry>
-      <entry><type>name</type></entry>
-      <entry></entry>
-      <entry>The base name of the shared object containing the output plugin this logical slot is using, or null for physical slots.</entry>
+      <entry><structfield>classid</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
+      <entry>The OID of the system catalog the dependent object is in</entry>
      </row>
 
      <row>
-      <entry><structfield>slot_type</structfield></entry>
-      <entry><type>text</type></entry>
+      <entry><structfield>objid</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry>any OID column</entry>
+      <entry>The OID of the specific dependent object</entry>
+     </row>
+
+     <row>
+      <entry><structfield>objsubid</structfield></entry>
+      <entry><type>int4</type></entry>
       <entry></entry>
-      <entry>The slot type - <literal>physical</> or <literal>logical</></entry>
+      <entry>
+       For a table column, this is the column number (the
+       <structfield>objid</> and <structfield>classid</> refer to the
+       table itself).  For all other object types, this column is zero.
+      </entry>
      </row>
 
      <row>
-      <entry><structfield>datoid</structfield></entry>
+      <entry><structfield>refclassid</structfield></entry>
       <entry><type>oid</type></entry>
-      <entry><literal><link linkend="catalog-pg-database"><structname>pg_database</structname></link>.oid</literal></entry>
-      <entry>The OID of the database this slot is associated with, or
-      null. Only logical slots have an associated database.</entry>
+      <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
+      <entry>The OID of the system catalog the referenced object is in
+       (must be a shared catalog)</entry>
      </row>
 
      <row>
-      <entry><structfield>database</structfield></entry>
-      <entry><type>text</type></entry>
-      <entry><literal><link linkend="catalog-pg-database"><structname>pg_database</structname></link>.datname</literal></entry>
-      <entry>The name of the database this slot is associated with, or
-      null. Only logical slots have an associated database.</entry>
+      <entry><structfield>refobjid</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry>any OID column</entry>
+      <entry>The OID of the specific referenced object</entry>
      </row>
 
      <row>
-      <entry><structfield>active</structfield></entry>
-      <entry><type>boolean</type></entry>
+      <entry><structfield>deptype</structfield></entry>
+      <entry><type>char</type></entry>
       <entry></entry>
-      <entry>True if this slot is currently actively being used</entry>
-     </row>
-
-     <row>
-      <entry><structfield>active_pid</structfield></entry>
-      <entry><type>integer</type></entry>
-      <entry></entry>
-      <entry>The process ID of the session using this slot if the slot
-       is currently actively being used. <literal>NULL</literal> if
-       inactive.
-      </entry>
-     </row>
-
-     <row>
-      <entry><structfield>xmin</structfield></entry>
-      <entry><type>xid</type></entry>
-      <entry></entry>
-      <entry>The oldest transaction that this slot needs the database to
-      retain.  <literal>VACUUM</literal> cannot remove tuples deleted
-      by any later transaction.
-      </entry>
-     </row>
-
-     <row>
-      <entry><structfield>catalog_xmin</structfield></entry>
-      <entry><type>xid</type></entry>
-      <entry></entry>
-      <entry>The oldest transaction affecting the system catalogs that this
-      slot needs the database to retain.  <literal>VACUUM</literal> cannot
-      remove catalog tuples deleted by any later transaction.
-      </entry>
-     </row>
-
-     <row>
-      <entry><structfield>restart_lsn</structfield></entry>
-      <entry><type>pg_lsn</type></entry>
-      <entry></entry>
-      <entry>The address (<literal>LSN</literal>) of oldest WAL which still
-      might be required by the consumer of this slot and thus won't be
-      automatically removed during checkpoints.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </sect1>
-
- <sect1 id="catalog-pg-seclabel">
-  <title><structname>pg_seclabel</structname></title>
-
-  <indexterm zone="catalog-pg-seclabel">
-   <primary>pg_seclabel</primary>
-  </indexterm>
-
-  <para>
-   The catalog <structname>pg_seclabel</structname> stores security
-   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>
-
-  <para>
-   See also <link linkend="catalog-pg-shseclabel"><structname>pg_shseclabel</structname></link>,
-   which performs a similar function for security labels of database objects
-   that are shared across a database cluster.
-  </para>
-
-  <table>
-   <title><structname>pg_seclabel</structname> Columns</title>
-
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>Name</entry>
-      <entry>Type</entry>
-      <entry>References</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-
-    <tbody>
-     <row>
-      <entry><structfield>objoid</structfield></entry>
-      <entry><type>oid</type></entry>
-      <entry>any OID column</entry>
-      <entry>The OID of the object this security label pertains to</entry>
-     </row>
-
-     <row>
-      <entry><structfield>classoid</structfield></entry>
-      <entry><type>oid</type></entry>
-      <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
-      <entry>The OID of the system catalog this object appears in</entry>
-     </row>
-
-     <row>
-      <entry><structfield>objsubid</structfield></entry>
-      <entry><type>int4</type></entry>
-      <entry></entry>
-      <entry>
-       For a security label on a table column, this is the column number (the
-       <structfield>objoid</> and <structfield>classoid</> refer to
-       the table itself).  For all other object types, this column is
-       zero.
-      </entry>
-     </row>
-
-     <row>
-      <entry><structfield>provider</structfield></entry>
-      <entry><type>text</type></entry>
-      <entry></entry>
-      <entry>The label provider associated with this label.</entry>
-     </row>
-
-     <row>
-      <entry><structfield>label</structfield></entry>
-      <entry><type>text</type></entry>
-      <entry></entry>
-      <entry>The security label applied to this object.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </sect1>
-
- <sect1 id="catalog-pg-shdepend">
-  <title><structname>pg_shdepend</structname></title>
-
-  <indexterm zone="catalog-pg-shdepend">
-   <primary>pg_shdepend</primary>
-  </indexterm>
-
-  <para>
-   The catalog <structname>pg_shdepend</structname> records the
-   dependency relationships between database objects and shared objects,
-   such as roles.  This information allows
-   <productname>PostgreSQL</productname> to ensure that those objects are
-   unreferenced before attempting to delete them.
-  </para>
-
-  <para>
-   See also <link linkend="catalog-pg-depend"><structname>pg_depend</structname></link>,
-   which performs a similar function for dependencies involving objects
-   within a single database.
-  </para>
-
-  <para>
-   Unlike most system catalogs, <structname>pg_shdepend</structname>
-   is shared across all databases of a cluster: there is only one
-   copy of <structname>pg_shdepend</structname> per cluster, not
-   one per database.
-  </para>
-
-  <table>
-   <title><structname>pg_shdepend</> Columns</title>
-
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>Name</entry>
-      <entry>Type</entry>
-      <entry>References</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-
-    <tbody>
-     <row>
-      <entry><structfield>dbid</structfield></entry>
-      <entry><type>oid</type></entry>
-      <entry><literal><link linkend="catalog-pg-database"><structname>pg_database</structname></link>.oid</literal></entry>
-      <entry>The OID of the database the dependent object is in,
-       or zero for a shared object</entry>
-     </row>
-
-     <row>
-      <entry><structfield>classid</structfield></entry>
-      <entry><type>oid</type></entry>
-      <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
-      <entry>The OID of the system catalog the dependent object is in</entry>
-     </row>
-
-     <row>
-      <entry><structfield>objid</structfield></entry>
-      <entry><type>oid</type></entry>
-      <entry>any OID column</entry>
-      <entry>The OID of the specific dependent object</entry>
-     </row>
-
-     <row>
-      <entry><structfield>objsubid</structfield></entry>
-      <entry><type>int4</type></entry>
-      <entry></entry>
-      <entry>
-       For a table column, this is the column number (the
-       <structfield>objid</> and <structfield>classid</> refer to the
-       table itself).  For all other object types, this column is zero.
-      </entry>
-     </row>
-
-     <row>
-      <entry><structfield>refclassid</structfield></entry>
-      <entry><type>oid</type></entry>
-      <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
-      <entry>The OID of the system catalog the referenced object is in
-       (must be a shared catalog)</entry>
-     </row>
-
-     <row>
-      <entry><structfield>refobjid</structfield></entry>
-      <entry><type>oid</type></entry>
-      <entry>any OID column</entry>
-      <entry>The OID of the specific referenced object</entry>
-     </row>
-
-     <row>
-      <entry><structfield>deptype</structfield></entry>
-      <entry><type>char</type></entry>
-      <entry></entry>
-      <entry>
-       A code defining the specific semantics of this dependency relationship; see text
-      </entry>
+      <entry>
+       A code defining the specific semantics of this dependency relationship; see text
+      </entry>
      </row>
 
     </tbody>
@@ -6087,9 +5890,9 @@
       <entry>The number of distinct nonnull data values in the column.
       A value greater than zero is the actual number of distinct values.
       A value less than zero is the negative of a multiplier for the number
-      of rows in the table; for example, a column in which values appear about
-      twice on the average could be represented by
-      <structfield>stadistinct</> = -0.5.
+      of rows in the table; for example, a column in which about 80% of the
+      values are nonnull and each nonnull value appears about twice on
+      average could be represented by <structfield>stadistinct</> = -0.4.
       A zero value means the number of distinct values is unknown.
       </entry>
      </row>
@@ -7566,6 +7369,16 @@
      </row>
 
      <row>
+      <entry><link linkend="view-pg-replication-origin-status"><structname>pg_replication_origin_status</structname></link></entry>
+      <entry>information about replication origins, including replication progress</entry>
+     </row>
+
+     <row>
+      <entry><link linkend="view-pg-replication-slots"><structname>pg_replication_slots</structname></link></entry>
+      <entry>replication slot information</entry>
+     </row>
+
+     <row>
       <entry><link linkend="view-pg-roles"><structname>pg_roles</structname></link></entry>
       <entry>database roles</entry>
      </row>
@@ -8760,6 +8573,193 @@
 
  </sect1>
 
+  <sect1 id="view-pg-replication-origin-status">
+  <title><structname>pg_replication_origin_status</structname></title>
+
+  <indexterm zone="view-pg-replication-origin-status">
+   <primary>pg_replication_origin_status</primary>
+  </indexterm>
+
+  <para>
+   The <structname>pg_replication_origin_status</structname> view
+   contains information about how far replay for a certain origin has
+   progressed.  For more on replication origins
+   see <xref linkend="replication-origins">.
+  </para>
+
+  <table>
+
+   <title><structname>pg_replication_origin_status</structname> Columns</title>
+
+   <tgroup cols="4">
+    <thead>
+     <row>
+      <entry>Name</entry>
+      <entry>Type</entry>
+      <entry>References</entry>
+      <entry>Description</entry>
+     </row>
+    </thead>
+
+    <tbody>
+     <row>
+      <entry><structfield>local_id</structfield></entry>
+      <entry><type>Oid</type></entry>
+      <entry><literal><link linkend="catalog-pg-replication-origin"><structname>pg_replication_origin</structname></link>.roident</literal></entry>
+      <entry>internal node identifier</entry>
+     </row>
+
+     <row>
+      <entry><structfield>external_id</structfield></entry>
+      <entry><type>text</type></entry>
+      <entry><literal><link linkend="catalog-pg-replication-origin"><structname>pg_replication_origin</structname></link>.roname</literal></entry>
+      <entry>external node identifier</entry>
+     </row>
+
+     <row>
+      <entry><structfield>remote_lsn</structfield></entry>
+      <entry><type>pg_lsn</type></entry>
+      <entry></entry>
+      <entry>The origin node's LSN up to which data has been replicated.</entry>
+     </row>
+
+     <row>
+      <entry><structfield>local_lsn</structfield></entry>
+      <entry><type>pg_lsn</type></entry>
+      <entry></entry>
+      <entry>
+       This node's LSN at which <literal>remote_lsn</literal> has
+       been replicated. Used to flush commit records before persisting
+       data to disk when using asynchronous commits.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+ </sect1>
+
+ <sect1 id="view-pg-replication-slots">
+  <title><structname>pg_replication_slots</structname></title>
+
+  <indexterm zone="view-pg-replication-slots">
+   <primary>pg_replication_slots</primary>
+  </indexterm>
+
+  <para>
+   The <structname>pg_replication_slots</structname> view provides a listing
+   of all replication slots that currently exist on the database cluster,
+   along with their current state.
+  </para>
+
+  <para>
+   For more on replication slots,
+   see <xref linkend="streaming-replication-slots"> and <xref linkend="logicaldecoding">.
+  </para>
+
+  <table>
+
+   <title><structname>pg_replication_slots</structname> Columns</title>
+
+   <tgroup cols="4">
+    <thead>
+     <row>
+      <entry>Name</entry>
+      <entry>Type</entry>
+      <entry>References</entry>
+      <entry>Description</entry>
+     </row>
+    </thead>
+
+    <tbody>
+     <row>
+      <entry><structfield>slot_name</structfield></entry>
+      <entry><type>name</type></entry>
+      <entry></entry>
+      <entry>A unique, cluster-wide identifier for the replication slot</entry>
+     </row>
+
+     <row>
+      <entry><structfield>plugin</structfield></entry>
+      <entry><type>name</type></entry>
+      <entry></entry>
+      <entry>The base name of the shared object containing the output plugin this logical slot is using, or null for physical slots.</entry>
+     </row>
+
+     <row>
+      <entry><structfield>slot_type</structfield></entry>
+      <entry><type>text</type></entry>
+      <entry></entry>
+      <entry>The slot type - <literal>physical</> or <literal>logical</></entry>
+     </row>
+
+     <row>
+      <entry><structfield>datoid</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry><literal><link linkend="catalog-pg-database"><structname>pg_database</structname></link>.oid</literal></entry>
+      <entry>The OID of the database this slot is associated with, or
+      null. Only logical slots have an associated database.</entry>
+     </row>
+
+     <row>
+      <entry><structfield>database</structfield></entry>
+      <entry><type>text</type></entry>
+      <entry><literal><link linkend="catalog-pg-database"><structname>pg_database</structname></link>.datname</literal></entry>
+      <entry>The name of the database this slot is associated with, or
+      null. Only logical slots have an associated database.</entry>
+     </row>
+
+     <row>
+      <entry><structfield>active</structfield></entry>
+      <entry><type>boolean</type></entry>
+      <entry></entry>
+      <entry>True if this slot is currently actively being used</entry>
+     </row>
+
+     <row>
+      <entry><structfield>active_pid</structfield></entry>
+      <entry><type>integer</type></entry>
+      <entry></entry>
+      <entry>The process ID of the session using this slot if the slot
+       is currently actively being used. <literal>NULL</literal> if
+       inactive.
+      </entry>
+     </row>
+
+     <row>
+      <entry><structfield>xmin</structfield></entry>
+      <entry><type>xid</type></entry>
+      <entry></entry>
+      <entry>The oldest transaction that this slot needs the database to
+      retain.  <literal>VACUUM</literal> cannot remove tuples deleted
+      by any later transaction.
+      </entry>
+     </row>
+
+     <row>
+      <entry><structfield>catalog_xmin</structfield></entry>
+      <entry><type>xid</type></entry>
+      <entry></entry>
+      <entry>The oldest transaction affecting the system catalogs that this
+      slot needs the database to retain.  <literal>VACUUM</literal> cannot
+      remove catalog tuples deleted by any later transaction.
+      </entry>
+     </row>
+
+     <row>
+      <entry><structfield>restart_lsn</structfield></entry>
+      <entry><type>pg_lsn</type></entry>
+      <entry></entry>
+      <entry>The address (<literal>LSN</literal>) of oldest WAL which still
+      might be required by the consumer of this slot and thus won't be
+      automatically removed during checkpoints.
+      </entry>
+     </row>
+
+    </tbody>
+   </tgroup>
+  </table>
+ </sect1>
+
  <sect1 id="view-pg-roles">
   <title><structname>pg_roles</structname></title>
 
@@ -8878,6 +8878,16 @@
      </row>
 
      <row>
+      <entry><structfield>rolbypassrls</structfield></entry>
+      <entry><type>bool</type></entry>
+      <entry></entry>
+      <entry>
+       Role bypasses every row level security policy, see
+       <xref linkend="ddl-rowsecurity"> for more information.
+      </entry>
+     </row>
+
+     <row>
       <entry><structfield>rolconfig</structfield></entry>
       <entry><type>text[]</type></entry>
       <entry></entry>
@@ -9745,6 +9755,13 @@
    </tgroup>
   </table>
 
+  <para>
+   While most timezone abbreviations represent fixed offsets from UTC,
+   there are some that have historically varied in value
+   (see <xref linkend="datetime-config-files"> for more information).
+   In such cases this view presents their current meaning.
+  </para>
+
  </sect1>
 
  <sect1 id="view-pg-timezone-names">
@@ -9972,14 +9989,37 @@
       <entry><type>text[]</type></entry>
       <entry></entry>
       <entry>
-       User mapping specific options, as <quote>keyword=value</>
-       strings, if the current user is the owner of the foreign
-       server, else null
+       User mapping specific options, as <quote>keyword=value</> strings
       </entry>
      </row>
     </tbody>
    </tgroup>
   </table>
+
+  <para>
+   To protect password information stored as a user mapping option,
+   the <structfield>umoptions</structfield> column will read as null
+   unless one of the following applies:
+   <itemizedlist>
+    <listitem>
+     <para>
+      current user is the user being mapped, and owns the server or
+      holds <literal>USAGE</> privilege on it
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      current user is the server owner and mapping is for <literal>PUBLIC</>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      current user is a superuser
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
+
  </sect1>
 
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/config.sgml postgresql-9.5-9.5.8/doc/src/sgml/config.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/config.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/config.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -532,10 +532,10 @@
       </term>
       <listitem>
        <para>
-         Specifies the configuration file for
-         <xref linkend="auth-username-maps"> user name mapping
+         Specifies the configuration file for user name mapping
          (customarily called <filename>pg_ident.conf</>).
          This parameter can only be set at server start.
+         See also <xref linkend="auth-username-maps">.
        </para>
       </listitem>
      </varlistentry>
@@ -856,8 +856,8 @@
         Specifies the number of seconds of inactivity after which TCP
         should send a keepalive message to the client.  A value of 0 uses
         the system default.
-        This parameter is supported only on systems that support the
-        <symbol>TCP_KEEPIDLE</> or <symbol>TCP_KEEPALIVE</> symbols, and on
+        This parameter is supported only on systems that support
+        <symbol>TCP_KEEPIDLE</> or an equivalent socket option, and on
         Windows; on other systems, it must be zero.
         In sessions connected via a Unix-domain socket, this parameter is
         ignored and always reads as zero.
@@ -882,9 +882,9 @@
         Specifies the number of seconds after which a TCP keepalive message
         that is not acknowledged by the client should be retransmitted.
         A value of 0 uses the system default.
-        This parameter is supported only on systems that support the
-        <symbol>TCP_KEEPINTVL</> symbol, and on Windows; on other systems, it
-        must be zero.
+        This parameter is supported only on systems that support
+        <symbol>TCP_KEEPINTVL</> or an equivalent socket option, and on
+        Windows; on other systems, it must be zero.
         In sessions connected via a Unix-domain socket, this parameter is
         ignored and always reads as zero.
        </para>
@@ -906,10 +906,11 @@
       <listitem>
        <para>
         Specifies the number of TCP keepalives that can be lost before
-        the server's connection to the client is considered dead.  A value of 0
-        uses the system default.  This parameter is
-        supported only on systems that support the <symbol>TCP_KEEPCNT</>
-        symbol; on other systems, it must be zero.
+        the server's connection to the client is considered dead.
+        A value of 0 uses the system default.
+        This parameter is supported only on systems that support
+        <symbol>TCP_KEEPCNT</> or an equivalent socket option;
+        on other systems, it must be zero.
         In sessions connected via a Unix-domain socket, this parameter is
         ignored and always reads as zero.
        </para>
@@ -1048,7 +1049,8 @@
         in the <application>OpenSSL</> package for the syntax of this setting
         and a list of supported values.  The default value is
         <literal>HIGH:MEDIUM:+3DES:!aNULL</>.  It is usually reasonable,
-        unless you have specific security requirements.
+        unless you have specific security requirements.  This parameter can only
+        be set at server start.
        </para>
 
        <para>
@@ -1120,7 +1122,8 @@
       <listitem>
        <para>
         Specifies whether to use the server's SSL cipher preferences, rather
-        than the client's.  The default is true.
+        than the client's.  The default is true.  This parameter can only be
+        set at server start.
        </para>
 
        <para>
@@ -1144,7 +1147,8 @@
         Specifies the name of the curve to use in <acronym>ECDH</> key
         exchange.  It needs to be supported by all clients that connect.
         It does not need to be same curve as used by server's Elliptic
-        Curve key.  The default is <literal>prime256v1</>.
+        Curve key.  The default is <literal>prime256v1</>.  This parameter
+        can only be set at server start.
        </para>
 
        <para>
@@ -4712,6 +4716,7 @@
         longer than <xref linkend="guc-deadlock-timeout"> to acquire a
         lock.  This is useful in determining if lock waits are causing
         poor performance.  The default is <literal>off</>.
+        Only superusers can change this setting.
        </para>
       </listitem>
      </varlistentry>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/contacts.sgml postgresql-9.5-9.5.8/doc/src/sgml/contacts.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/contacts.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/contacts.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -16,7 +16,7 @@
 <para>
 Refer to the introduction in this manual or to the
 <productname>PostgreSQL</productname>
-<ulink url="http://www.postgresql.org">web page</ulink>
+<ulink url="https://www.postgresql.org">web page</ulink>
 for subscription information to the no-cost mailing lists.
 </para>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/datatype.sgml postgresql-9.5-9.5.8/doc/src/sgml/datatype.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/datatype.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/datatype.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -952,6 +952,11 @@
    </para>
 
    <para>
+    Division of a <type>money</type> value by an integer value is performed
+    with truncation of the fractional part towards zero.  To get a rounded
+    result, divide by a floating-point value, or cast the <type>money</type>
+    value to <type>numeric</> before dividing and back to <type>money</type>
+    afterwards.  (The latter is preferable to avoid risking precision loss.)
     When a <type>money</type> value is divided by another <type>money</type>
     value, the result is <type>double precision</type> (i.e., a pure number,
     not money); the currency units cancel each other out in the division.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/datetime.sgml postgresql-9.5-9.5.8/doc/src/sgml/datetime.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/datetime.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/datetime.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -384,20 +384,39 @@
 
    <para>
     A <replaceable>zone_abbreviation</replaceable> is just the abbreviation
-    being defined.  The <replaceable>offset</replaceable> is the equivalent
-    offset in seconds from UTC, positive being east from Greenwich and
-    negative being west.  For example, -18000 would be five hours west
-    of Greenwich, or North American east coast standard time.  <literal>D</>
-    indicates that the zone name represents local daylight-savings time rather
-    than standard time.  Alternatively, a <replaceable>time_zone_name</> can
-    be given, in which case that time zone definition is consulted, and the
-    abbreviation's meaning in that zone is used.  This alternative is
-    recommended only for abbreviations whose meaning has historically varied,
-    as looking up the meaning is noticeably more expensive than just using
-    a fixed integer value.
+    being defined.  An <replaceable>offset</replaceable> is an integer giving
+    the equivalent offset in seconds from UTC, positive being east from
+    Greenwich and negative being west.  For example, -18000 would be five
+    hours west of Greenwich, or North American east coast standard time.
+    <literal>D</> indicates that the zone name represents local
+    daylight-savings time rather than standard time.
    </para>
 
    <para>
+    Alternatively, a <replaceable>time_zone_name</> can be given, referencing
+    a zone name defined in the IANA timezone database.  The zone's definition
+    is consulted to see whether the abbreviation is or has been in use in
+    that zone, and if so, the appropriate meaning is used &mdash; that is,
+    the meaning that was currently in use at the timestamp whose value is
+    being determined, or the meaning in use immediately before that if it
+    wasn't current at that time, or the oldest meaning if it was used only
+    after that time.  This behavior is essential for dealing with
+    abbreviations whose meaning has historically varied.  It is also allowed
+    to define an abbreviation in terms of a zone name in which that
+    abbreviation does not appear; then using the abbreviation is just
+    equivalent to writing out the zone name.
+   </para>
+
+   <tip>
+    <para>
+     Using a simple integer <replaceable>offset</replaceable> is preferred
+     when defining an abbreviation whose offset from UTC has never changed,
+     as such abbreviations are much cheaper to process than those that
+     require consulting a time zone definition.
+    </para>
+   </tip>
+
+   <para>
     The <literal>@INCLUDE</> syntax allows inclusion of another file in the
     <filename>.../share/timezonesets/</> directory.  Inclusion can be nested,
     to a limited depth.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ddl.sgml postgresql-9.5-9.5.8/doc/src/sgml/ddl.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ddl.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ddl.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -1629,7 +1629,7 @@
 
 <programlisting>
 CREATE POLICY user_policy ON users
-    USING (user = current_user);
+    USING (user_name = current_user);
 </programlisting>
 
   <para>
@@ -1642,7 +1642,7 @@
 <programlisting>
 CREATE POLICY user_policy ON users
     USING (true)
-    WITH CHECK (user = current_user);
+    WITH CHECK (user_name = current_user);
 </programlisting>
 
   <para>
@@ -1662,7 +1662,7 @@
 <programlisting>
 -- Simple passwd-file based example
 CREATE TABLE passwd (
-  username              text UNIQUE NOT NULL,
+  user_name             text UNIQUE NOT NULL,
   pwhash                text,
   uid                   int  PRIMARY KEY,
   gid                   int  NOT NULL,
@@ -1696,9 +1696,9 @@
 -- Normal users can update their own records, but
 -- limit which shells a normal user is allowed to set
 CREATE POLICY user_mod ON passwd FOR UPDATE
-  USING (current_user = username)
+  USING (current_user = user_name)
   WITH CHECK (
-    current_user = username AND
+    current_user = user_name AND
     shell IN ('/bin/bash','/bin/sh','/bin/dash','/bin/zsh','/bin/tcsh')
   );
 
@@ -1706,7 +1706,7 @@
 GRANT SELECT, INSERT, UPDATE, DELETE ON passwd TO admin;
 -- Users only get select access on public columns
 GRANT SELECT
-  (username, uid, gid, real_name, home_phone, extra_info, home_dir, shell)
+  (user_name, uid, gid, real_name, home_phone, extra_info, home_dir, shell)
   ON passwd TO public;
 -- Allow users to update certain columns
 GRANT UPDATE
@@ -1725,11 +1725,11 @@
 postgres=&gt; set role admin;
 SET
 postgres=&gt; table passwd;
- username | pwhash | uid | gid | real_name |  home_phone  | extra_info | home_dir    |   shell
-----------+--------+-----+-----+-----------+--------------+------------+-------------+-----------
- admin    | xxx    |   0 |   0 | Admin     | 111-222-3333 |            | /root       | /bin/dash
- bob      | xxx    |   1 |   1 | Bob       | 123-456-7890 |            | /home/bob   | /bin/zsh
- alice    | xxx    |   2 |   1 | Alice     | 098-765-4321 |            | /home/alice | /bin/zsh
+ user_name | pwhash | uid | gid | real_name |  home_phone  | extra_info | home_dir    |   shell
+-----------+--------+-----+-----+-----------+--------------+------------+-------------+-----------
+ admin     | xxx    |   0 |   0 | Admin     | 111-222-3333 |            | /root       | /bin/dash
+ bob       | xxx    |   1 |   1 | Bob       | 123-456-7890 |            | /home/bob   | /bin/zsh
+ alice     | xxx    |   2 |   1 | Alice     | 098-765-4321 |            | /home/alice | /bin/zsh
 (3 rows)
 
 -- Test what Alice is able to do
@@ -1737,26 +1737,26 @@
 SET
 postgres=&gt; table passwd;
 ERROR:  permission denied for relation passwd
-postgres=&gt; select username,real_name,home_phone,extra_info,home_dir,shell from passwd;
- username | real_name |  home_phone  | extra_info | home_dir    |   shell
-----------+-----------+--------------+------------+-------------+-----------
- admin    | Admin     | 111-222-3333 |            | /root       | /bin/dash
- bob      | Bob       | 123-456-7890 |            | /home/bob   | /bin/zsh
- alice    | Alice     | 098-765-4321 |            | /home/alice | /bin/zsh
+postgres=&gt; select user_name,real_name,home_phone,extra_info,home_dir,shell from passwd;
+ user_name | real_name |  home_phone  | extra_info | home_dir    |   shell
+-----------+-----------+--------------+------------+-------------+-----------
+ admin     | Admin     | 111-222-3333 |            | /root       | /bin/dash
+ bob       | Bob       | 123-456-7890 |            | /home/bob   | /bin/zsh
+ alice     | Alice     | 098-765-4321 |            | /home/alice | /bin/zsh
 (3 rows)
 
-postgres=&gt; update passwd set username = 'joe';
+postgres=&gt; update passwd set user_name = 'joe';
 ERROR:  permission denied for relation passwd
 -- Alice is allowed to change her own real_name, but no others
 postgres=&gt; update passwd set real_name = 'Alice Doe';
 UPDATE 1
-postgres=&gt; update passwd set real_name = 'John Doe' where username = 'admin';
+postgres=&gt; update passwd set real_name = 'John Doe' where user_name = 'admin';
 UPDATE 0
 postgres=&gt; update passwd set shell = '/bin/xx';
 ERROR:  new row violates WITH CHECK OPTION for "passwd"
 postgres=&gt; delete from passwd;
 ERROR:  permission denied for relation passwd
-postgres=&gt; insert into passwd (username) values ('xxx');
+postgres=&gt; insert into passwd (user_name) values ('xxx');
 ERROR:  permission denied for relation passwd
 -- Alice can change her own password; RLS silently prevents updating other rows
 postgres=&gt; update passwd set pwhash = 'abc';
@@ -2055,7 +2055,7 @@
     (since this is one of the ways to restrict the activities of your
     users to well-defined namespaces).  The syntax for that is:
 <programlisting>
-CREATE SCHEMA <replaceable>schemaname</replaceable> AUTHORIZATION <replaceable>username</replaceable>;
+CREATE SCHEMA <replaceable>schema_name</replaceable> AUTHORIZATION <replaceable>user_name</replaceable>;
 </programlisting>
     You can even omit the schema name, in which case the schema name
     will be the same as the user name.  See <xref
@@ -2344,7 +2344,7 @@
     implements only the basic schema support specified in the
     standard.  Therefore, many users consider qualified names to
     really consist of
-    <literal><replaceable>username</>.<replaceable>tablename</></literal>.
+    <literal><replaceable>user_name</>.<replaceable>table_name</></literal>.
     This is how <productname>PostgreSQL</productname> will effectively
     behave if you create a per-user schema for every user.
    </para>
@@ -2559,7 +2559,8 @@
 
   <para>
    All check constraints and not-null constraints on a parent table are
-   automatically inherited by its children.  Other types of constraints
+   automatically inherited by its children, unless explicitly specified
+   otherwise with <literal>NO INHERIT</> clauses.  Other types of constraints
    (unique, primary key, and foreign key constraints) are not inherited.
   </para>
 
@@ -2570,10 +2571,12 @@
    same column name appears in multiple parent tables, or in both a parent
    table and the child's definition, then these columns are <quote>merged</>
    so that there is only one such column in the child table.  To be merged,
-   columns must have the same data types, else an error is raised.  The
-   merged column will have copies of all the check constraints coming from
-   any one of the column definitions it came from, and will be marked not-null
-   if any of them are.
+   columns must have the same data types, else an error is raised.
+   Inheritable check constraints and not-null constraints are merged in a
+   similar fashion.  Thus, for example, a merged column will be marked
+   not-null if any one of the column definitions it came from is marked
+   not-null.  Check constraints are merged if they have the same name,
+   and the merge will fail if their conditions are different.
   </para>
 
   <para>
@@ -2625,12 +2628,19 @@
   </para>
 
   <para>
-   Note how table access permissions are handled.  Querying a parent
-   table can automatically access data in child tables without further
-   access privilege checking.  This preserves the appearance that the
-   data is (also) in the parent table.  Accessing the child tables
-   directly is, however, not automatically allowed and would require
-   further privileges to be granted.
+   Inherited queries perform access permission checks on the parent table
+   only.  Thus, for example, granting <literal>UPDATE</> permission on
+   the <structname>cities</> table implies permission to update rows in
+   the <structname>capitals</structname> table as well, when they are
+   accessed through <structname>cities</>.  This preserves the appearance
+   that the data is (also) in the parent table.  But
+   the <structname>capitals</structname> table could not be updated directly
+   without an additional grant.  In a similar way, the parent table's row
+   security policies (see <xref linkend="ddl-rowsecurity">) are applied to
+   rows coming from child tables during an inherited query.  A child table's
+   policies, if any, are applied only when it is the table explicitly named
+   in the query; and in that case, any policies attached to its parent(s) are
+   ignored.
   </para>
 
   <para>
@@ -3571,14 +3581,14 @@
    To ensure the integrity of the entire database structure,
    <productname>PostgreSQL</productname> makes sure that you cannot
    drop objects that other objects still depend on.  For example,
-   attempting to drop the products table we had considered in <xref
+   attempting to drop the products table we considered in <xref
    linkend="ddl-constraints-fk">, with the orders table depending on
-   it, would result in an error message such as this:
+   it, would result in an error message like this:
 <screen>
 DROP TABLE products;
 
-NOTICE:  constraint orders_product_no_fkey on table orders depends on table products
 ERROR:  cannot drop table products because other objects depend on it
+DETAIL:  constraint orders_product_no_fkey on table orders depends on table products
 HINT:  Use DROP ... CASCADE to drop the dependent objects too.
 </screen>
    The error message contains a useful hint: if you do not want to
@@ -3589,11 +3599,12 @@
    and all the dependent objects will be removed.  In this case, it
    doesn't remove the orders table, it only removes the foreign key
    constraint.  (If you want to check what <command>DROP ... CASCADE</> will do,
-   run <command>DROP</> without <literal>CASCADE</> and read the <literal>NOTICE</> messages.)
+   run <command>DROP</> without <literal>CASCADE</> and read the
+   <literal>DETAIL</> output.)
   </para>
 
   <para>
-   All drop commands in <productname>PostgreSQL</productname> support
+   All <command>DROP</> commands in <productname>PostgreSQL</> support
    specifying <literal>CASCADE</literal>.  Of course, the nature of
    the possible dependencies varies with the type of the object.  You
    can also write <literal>RESTRICT</literal> instead of
@@ -3605,21 +3616,43 @@
    <para>
     According to the SQL standard, specifying either
     <literal>RESTRICT</literal> or <literal>CASCADE</literal> is
-    required.  No database system actually enforces that rule, but
-    whether the default behavior is <literal>RESTRICT</literal> or
-    <literal>CASCADE</literal> varies across systems.
+    required in a <command>DROP</> command.  No database system actually
+    enforces that rule, but whether the default behavior
+    is <literal>RESTRICT</literal> or <literal>CASCADE</literal> varies
+    across systems.
    </para>
   </note>
 
-  <note>
-   <para>
-    Foreign key constraint dependencies and serial column dependencies
-    from <productname>PostgreSQL</productname> versions prior to 7.3
-    are <emphasis>not</emphasis> maintained or created during the
-    upgrade process.  All other dependency types will be properly
-    created during an upgrade from a pre-7.3 database.
-   </para>
-  </note>
+  <para>
+   For user-defined functions, <productname>PostgreSQL</productname> tracks
+   dependencies associated with a function's externally-visible properties,
+   such as its argument and result types, but <emphasis>not</> dependencies
+   that could only be known by examining the function body.  As an example,
+   consider this situation:
+
+<programlisting>
+CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow',
+                             'green', 'blue', 'purple');
+
+CREATE TABLE my_colors (color rainbow, note text);
+
+CREATE FUNCTION get_color_note (rainbow) RETURNS text AS
+  'SELECT note FROM my_colors WHERE color = $1'
+  LANGUAGE SQL;
+</programlisting>
+
+   (See <xref linkend="xfunc-sql"> for an explanation of SQL-language
+   functions.)  <productname>PostgreSQL</productname> will be aware that
+   the <function>get_color_note</> function depends on the <type>rainbow</>
+   type: dropping the type would force dropping the function, because its
+   argument type would no longer be defined.  But <productname>PostgreSQL</>
+   will not consider <function>get_color_note</> to depend on
+   the <structname>my_colors</> table, and so will not drop the function if
+   the table is dropped.  While there are disadvantages to this approach,
+   there are also benefits.  The function is still valid in some sense if the
+   table is missing, though executing it would cause an error; creating a new
+   table of the same name would allow the function to work again.
+  </para>
  </sect1>
 
 </chapter>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/dfunc.sgml postgresql-9.5-9.5.8/doc/src/sgml/dfunc.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/dfunc.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/dfunc.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -63,10 +63,10 @@
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
-      <option>-fpic</option>.  To create shared libraries the compiler
+      <option>-fPIC</option>.  To create shared libraries the compiler
       flag is <option>-shared</option>.
 <programlisting>
-gcc -fpic -c foo.c
+gcc -fPIC -c foo.c
 gcc -shared -o foo.so foo.o
 </programlisting>
       This is applicable as of version 3.0 of
@@ -84,14 +84,14 @@
      <para>
       The compiler flag of the system compiler to create
       <acronym>PIC</acronym> is <option>+z</option>.  When using
-      <application>GCC</application> it's <option>-fpic</option>. The
+      <application>GCC</application> it's <option>-fPIC</option>. The
       linker flag for shared libraries is <option>-b</option>.  So:
 <programlisting>
 cc +z -c foo.c
 </programlisting>
       or:
 <programlisting>
-gcc -fpic -c foo.c
+gcc -fPIC -c foo.c
 </programlisting>
       and then:
 <programlisting>
@@ -112,13 +112,11 @@
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
-      <option>-fpic</option>.  On some platforms in some situations
-      <option>-fPIC</option> must be used if <option>-fpic</option>
-      does not work.  Refer to the GCC manual for more information.
+      <option>-fPIC</option>.
       The compiler flag to create a shared library is
       <option>-shared</option>.  A complete example looks like this:
 <programlisting>
-cc -fpic -c foo.c
+cc -fPIC -c foo.c
 cc -shared -o foo.so foo.o
 </programlisting>
      </para>
@@ -149,12 +147,12 @@
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
-      <option>-fpic</option>.  For <acronym>ELF</acronym> systems, the
+      <option>-fPIC</option>.  For <acronym>ELF</acronym> systems, the
       compiler with the flag <option>-shared</option> is used to link
       shared libraries.  On the older non-ELF systems, <literal>ld
       -Bshareable</literal> is used.
 <programlisting>
-gcc -fpic -c foo.c
+gcc -fPIC -c foo.c
 gcc -shared -o foo.so foo.o
 </programlisting>
      </para>
@@ -169,10 +167,10 @@
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
-      <option>-fpic</option>.  <literal>ld -Bshareable</literal> is
+      <option>-fPIC</option>.  <literal>ld -Bshareable</literal> is
       used to link shared libraries.
 <programlisting>
-gcc -fpic -c foo.c
+gcc -fPIC -c foo.c
 ld -Bshareable -o foo.so foo.o
 </programlisting>
      </para>
@@ -188,7 +186,7 @@
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
       <option>-KPIC</option> with the Sun compiler and
-      <option>-fpic</option> with <application>GCC</>.  To
+      <option>-fPIC</option> with <application>GCC</>.  To
       link shared libraries, the compiler option is
       <option>-G</option> with either compiler or alternatively
       <option>-shared</option> with <application>GCC</>.
@@ -198,7 +196,7 @@
 </programlisting>
       or
 <programlisting>
-gcc -fpic -c foo.c
+gcc -fPIC -c foo.c
 gcc -G -o foo.so foo.o
 </programlisting>
      </para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/dml.sgml postgresql-9.5-9.5.8/doc/src/sgml/dml.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/dml.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/dml.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -102,6 +102,18 @@
 </programlisting>
   </para>
 
+  <para>
+   It is also possible to insert the result of a query (which might be no
+   rows, one row, or many rows):
+<programlisting>
+INSERT INTO products (product_no, name, price)
+  SELECT product_no, name, price FROM new_products
+    WHERE release_date = 'today';
+</programlisting>
+   This provides the full power of the SQL query mechanism (<xref
+   linkend="queries">) for computing the rows to be inserted.
+  </para>
+
   <tip>
    <para>
     When inserting a lot of data at the same time, considering using
@@ -252,4 +264,91 @@
    then all rows in the table will be deleted!  Caveat programmer.
   </para>
  </sect1>
+
+ <sect1 id="dml-returning">
+  <title>Returning Data From Modified Rows</title>
+
+  <indexterm zone="dml-returning">
+   <primary>RETURNING</primary>
+  </indexterm>
+
+  <indexterm zone="dml-returning">
+   <primary>INSERT</primary>
+   <secondary>RETURNING</secondary>
+  </indexterm>
+
+  <indexterm zone="dml-returning">
+   <primary>UPDATE</primary>
+   <secondary>RETURNING</secondary>
+  </indexterm>
+
+  <indexterm zone="dml-returning">
+   <primary>DELETE</primary>
+   <secondary>RETURNING</secondary>
+  </indexterm>
+
+  <para>
+   Sometimes it is useful to obtain data from modified rows while they are
+   being manipulated.  The <command>INSERT</>, <command>UPDATE</>,
+   and <command>DELETE</> commands all have an
+   optional <literal>RETURNING</> clause that supports this.  Use
+   of <literal>RETURNING</> avoids performing an extra database query to
+   collect the data, and is especially valuable when it would otherwise be
+   difficult to identify the modified rows reliably.
+  </para>
+
+  <para>
+   The allowed contents of a <literal>RETURNING</> clause are the same as
+   a <command>SELECT</> command's output list
+   (see <xref linkend="queries-select-lists">).  It can contain column
+   names of the command's target table, or value expressions using those
+   columns.  A common shorthand is <literal>RETURNING *</>, which selects
+   all columns of the target table in order.
+  </para>
+
+  <para>
+   In an <command>INSERT</>, the data available to <literal>RETURNING</> is
+   the row as it was inserted.  This is not so useful in trivial inserts,
+   since it would just repeat the data provided by the client.  But it can
+   be very handy when relying on computed default values.  For example,
+   when using a <link linkend="datatype-serial"><type>serial</></link>
+   column to provide unique identifiers, <literal>RETURNING</> can return
+   the ID assigned to a new row:
+<programlisting>
+CREATE TABLE users (firstname text, lastname text, id serial primary key);
+
+INSERT INTO users (firstname, lastname) VALUES ('Joe', 'Cool') RETURNING id;
+</programlisting>
+   The <literal>RETURNING</> clause is also very useful
+   with <literal>INSERT ... SELECT</>.
+  </para>
+
+  <para>
+   In an <command>UPDATE</>, the data available to <literal>RETURNING</> is
+   the new content of the modified row.  For example:
+<programlisting>
+UPDATE products SET price = price * 1.10
+  WHERE price &lt;= 99.99
+  RETURNING name, price AS new_price;
+</programlisting>
+  </para>
+
+  <para>
+   In a <command>DELETE</>, the data available to <literal>RETURNING</> is
+   the content of the deleted row.  For example:
+<programlisting>
+DELETE FROM products
+  WHERE obsoletion_date = 'today'
+  RETURNING *;
+</programlisting>
+  </para>
+
+  <para>
+   If there are triggers (<xref linkend="triggers">) on the target table,
+   the data available to <literal>RETURNING</> is the row as modified by
+   the triggers.  Thus, inspecting columns computed by triggers is another
+   common use-case for <literal>RETURNING</>.
+  </para>
+
+ </sect1>
 </chapter>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ecpg.sgml postgresql-9.5-9.5.8/doc/src/sgml/ecpg.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ecpg.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ecpg.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -240,8 +240,7 @@
   <para>
    If your application uses multiple threads of execution, they cannot share a
    connection concurrently. You must either explicitly control access to the connection
-   (using mutexes) or use a connection for each thread. If each thread uses its own connection,
-   you will need to use the AT clause to specify which connection the thread will use.
+   (using mutexes) or use a connection for each thread.
   </para>
 
   <para>
@@ -251,7 +250,7 @@
 EXEC SQL SET CONNECTION <replaceable>connection-name</replaceable>;
 </programlisting>
    This option is particularly convenient if many statements are to be
-   executed on the same connection.  It is not thread-aware.
+   executed on the same connection.
   </para>
 
   <para>
@@ -636,7 +635,7 @@
 <programlisting>
 EXEC SQL INSERT INTO sometable VALUES (:v1, 'foo', :v2);
 </programlisting>
-    This statements refers to two C variables named
+    This statement refers to two C variables named
     <varname>v1</varname> and <varname>v2</varname> and also uses a
     regular SQL string literal, to illustrate that you are not
     restricted to use one kind of data or the other.
@@ -1162,7 +1161,7 @@
       There are two use cases for arrays as host variables.  The first
       is a way to store some text string in <type>char[]</type>
       or <type>VARCHAR[]</type>, as
-      explained <xref linkend="ecpg-char">.  The second use case is to
+      explained in <xref linkend="ecpg-char">.  The second use case is to
       retrieve multiple rows from a query result without using a
       cursor.  Without an array, to process a query result consisting
       of multiple rows, it is required to use a cursor and
@@ -3917,7 +3916,7 @@
       <term><literal>sqln</></term>
       <listitem>
        <para>
-        It contains the number of input parameters for a parametrized query
+        It contains the number of input parameters for a parametrized query in
         case it's passed into <command>OPEN</command>, <command>DECLARE</command> or
         <command>EXECUTE</command> statements using the <literal>USING</literal>
         keyword. In case it's used as output of <command>SELECT</command>,
@@ -6190,7 +6189,7 @@
 
    <para>
     Next, generate <filename>test_cpp.o</> by compiling
-    <filename>test_cpp.cpp</> with the C++ compiler:.
+    <filename>test_cpp.cpp</> with the C++ compiler:
 <programlisting>
 c++ -c test_cpp.cpp -o test_cpp.o
 </programlisting>
@@ -6296,9 +6295,9 @@
 
    <refsynopsisdiv>
 <synopsis>
-CONNECT TO <replaceable>connection_target</replaceable> [ AS <replaceable>connection_name</replaceable> ] [ USER <replaceable>connection_user_name</replaceable> ]
+CONNECT TO <replaceable>connection_target</replaceable> [ AS <replaceable>connection_name</replaceable> ] [ USER <replaceable>connection_user</replaceable> ]
 CONNECT TO DEFAULT
-CONNECT <replaceable>connection_user_name</replaceable>
+CONNECT <replaceable>connection_user</replaceable>
 DATABASE <replaceable>connection_target</replaceable>
 </synopsis>
    </refsynopsisdiv>
@@ -7830,7 +7829,7 @@
    this mode is active, it tries to behave as if it were the <productname>Informix</productname>
    precompiler for <productname>Informix</productname> E/SQL. Generally spoken this will allow you to use
    the dollar sign instead of the <literal>EXEC SQL</> primitive to introduce
-   embedded SQL commands.:
+   embedded SQL commands:
 <programlisting>
 $int j = 3;
 $CONNECT TO :dbname;
@@ -7902,7 +7901,7 @@
       <listitem>
        <para>
         This statement closes the current connection. In fact, this is a
-        synonym for ECPG's <literal>DISCONNECT CURRENT</>.:
+        synonym for ECPG's <literal>DISCONNECT CURRENT</>:
 <programlisting>
 $CLOSE DATABASE;                /* close the current connection */
 EXEC SQL CLOSE DATABASE;
@@ -8559,7 +8558,7 @@
 int rdatestr(date d, char *str);
 </synopsis>
         The function receives two arguments, the first one is the date to
-        convert (<literal>d</> and the second one is a pointer to the target
+        convert (<literal>d</>) and the second one is a pointer to the target
         string. The output format is always <literal>yyyy-mm-dd</>, so you need
         to allocate at least 11 bytes (including the zero-byte terminator) for the
         string.
@@ -8912,7 +8911,7 @@
 </synopsis>
         The function receives a pointer to the timestamp variable to convert
         (<literal>ts</>) and the string that should hold the result of the
-        operation <literal>output</>). It converts <literal>ts</> to its
+        operation (<literal>output</>). It converts <literal>ts</> to its
         textual representation according to the SQL standard, which is
         be <literal>YYYY-MM-DD HH:MM:SS</literal>.
        </para>
@@ -8959,7 +8958,7 @@
 </synopsis>
         The function receives a pointer to the interval variable to convert
         (<literal>i</>) and the string that should hold the result of the
-        operation <literal>str</>). It converts <literal>i</> to its
+        operation (<literal>str</>). It converts <literal>i</> to its
         textual representation according to the SQL standard, which is
         be <literal>YYYY-MM-DD HH:MM:SS</literal>.
        </para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/external-projects.sgml postgresql-9.5-9.5.8/doc/src/sgml/external-projects.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/external-projects.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/external-projects.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -65,42 +65,63 @@
       <entry>DBD::Pg</entry>
       <entry>Perl</entry>
       <entry>Perl DBI driver</entry>
-      <entry><ulink url="http://search.cpan.org/dist/DBD-Pg/">http://search.cpan.org/dist/DBD-Pg/</ulink></entry>
+      <entry><ulink url="http://search.cpan.org/dist/DBD-Pg/"></ulink></entry>
      </row>
 
      <row>
       <entry>JDBC</entry>
-      <entry>JDBC</entry>
+      <entry>Java</entry>
       <entry>Type 4 JDBC driver</entry>
-      <entry><ulink url="http://jdbc.postgresql.org/">http://jdbc.postgresql.org/</ulink></entry>
+      <entry><ulink url="https://jdbc.postgresql.org/"></ulink></entry>
      </row>
 
      <row>
       <entry>libpqxx</entry>
       <entry>C++</entry>
       <entry>New-style C++ interface</entry>
-      <entry><ulink url="http://pqxx.org/">http://pqxx.org/</ulink></entry>
+      <entry><ulink url="http://pqxx.org/"></ulink></entry>
+     </row>
+
+     <row>
+      <entry>node-postgres</entry>
+      <entry>JavaScript</entry>
+      <entry>Node.js driver</entry>
+      <entry><ulink url="https://node-postgres.com/"></ulink></entry>
      </row>
 
      <row>
       <entry>Npgsql</entry>
       <entry>.NET</entry>
       <entry>.NET data provider</entry>
-      <entry><ulink url="http://www.npgsql.org/">http://www.npgsql.org/</ulink></entry>
+      <entry><ulink url="http://www.npgsql.org/"></ulink></entry>
+     </row>
+
+     <row>
+      <entry>pgtcl</entry>
+      <entry>Tcl</entry>
+      <entry></entry>
+      <entry><ulink url="https://github.com/flightaware/Pgtcl"></ulink></entry>
      </row>
 
      <row>
       <entry>pgtclng</entry>
       <entry>Tcl</entry>
       <entry></entry>
-      <entry><ulink url="http://sourceforge.net/projects/pgtclng/">http://sourceforge.net/projects/pgtclng/</ulink></entry>
+      <entry><ulink url="http://sourceforge.net/projects/pgtclng/"></ulink></entry>
+     </row>
+
+     <row>
+      <entry>pq</entry>
+      <entry>Go</entry>
+      <entry>Pure Go driver for Go's database/sql</entry>
+      <entry><ulink url="https://github.com/lib/pq"></ulink></entry>
      </row>
 
      <row>
       <entry>psqlODBC</entry>
       <entry>ODBC</entry>
       <entry>ODBC driver</entry>
-      <entry><ulink url="https://odbc.postgresql.org/">https://odbc.postgresql.org/</ulink></entry>
+      <entry><ulink url="https://odbc.postgresql.org/"></ulink></entry>
      </row>
 
      <row>
@@ -178,7 +199,7 @@
      <row>
       <entry>PL/PHP</entry>
       <entry>PHP</entry>
-      <entry><ulink url="http://www.commandprompt.com/community/plphp/">http://www.commandprompt.com/community/plphp/</ulink></entry>
+      <entry><ulink url="https://public.commandprompt.com/projects/plphp">https://public.commandprompt.com/projects/plphp</ulink></entry>
      </row>
 
      <row>
@@ -190,7 +211,7 @@
      <row>
       <entry>PL/R</entry>
       <entry>R</entry>
-      <entry><ulink url="http://www.joeconway.com/plr/">http://www.joeconway.com/plr/</ulink></entry>
+      <entry><ulink url="http://www.joeconway.com/plr.html">http://www.joeconway.com/plr.html</ulink></entry>
      </row>
 
      <row>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/func.sgml postgresql-9.5-9.5.8/doc/src/sgml/func.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/func.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/func.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -291,6 +291,32 @@
 
    <para>
     <indexterm>
+     <primary>IS DISTINCT FROM</primary>
+    </indexterm>
+    <indexterm>
+     <primary>IS NOT DISTINCT FROM</primary>
+    </indexterm>
+    Ordinary comparison operators yield null (signifying <quote>unknown</>),
+    not true or false, when either input is null.  For example,
+    <literal>7 = NULL</> yields null, as does <literal>7 &lt;&gt; NULL</>.  When
+    this behavior is not suitable, use the
+    <literal>IS <optional> NOT </> DISTINCT FROM</literal> constructs:
+<synopsis>
+<replaceable>a</replaceable> IS DISTINCT FROM <replaceable>b</replaceable>
+<replaceable>a</replaceable> IS NOT DISTINCT FROM <replaceable>b</replaceable>
+</synopsis>
+    For non-null inputs, <literal>IS DISTINCT FROM</literal> is
+    the same as the <literal>&lt;&gt;</> operator.  However, if both
+    inputs are null it returns false, and if only one input is
+    null it returns true.  Similarly, <literal>IS NOT DISTINCT
+    FROM</literal> is identical to <literal>=</literal> for non-null
+    inputs, but it returns true when both inputs are null, and false when only
+    one input is null. Thus, these constructs effectively act as though null
+    were a normal data value, rather than <quote>unknown</>.
+   </para>
+
+   <para>
+    <indexterm>
      <primary>IS NULL</primary>
     </indexterm>
     <indexterm>
@@ -320,8 +346,7 @@
     <literal><replaceable>expression</replaceable> = NULL</literal>
     because <literal>NULL</> is not <quote>equal to</quote>
     <literal>NULL</>.  (The null value represents an unknown value,
-    and it is not known whether two unknown values are equal.) This
-    behavior conforms to the SQL standard.
+    and it is not known whether two unknown values are equal.)
    </para>
 
   <tip>
@@ -338,7 +363,6 @@
    </para>
   </tip>
 
-  <note>
    <para>
     If the <replaceable>expression</replaceable> is row-valued, then
     <literal>IS NULL</> is true when the row expression itself is null
@@ -346,39 +370,13 @@
     <literal>IS NOT NULL</> is true when the row expression itself is non-null
     and all the row's fields are non-null.  Because of this behavior,
     <literal>IS NULL</> and <literal>IS NOT NULL</> do not always return
-    inverse results for row-valued expressions, i.e., a row-valued
-    expression that contains both NULL and non-null values will return false
-    for both tests.
-    This definition conforms to the SQL standard, and is a change from the
-    inconsistent behavior exhibited by <productname>PostgreSQL</productname>
-    versions prior to 8.2.
-   </para>
-  </note>
-
-   <para>
-    <indexterm>
-     <primary>IS DISTINCT FROM</primary>
-    </indexterm>
-    <indexterm>
-     <primary>IS NOT DISTINCT FROM</primary>
-    </indexterm>
-    Ordinary comparison operators yield null (signifying <quote>unknown</>),
-    not true or false, when either input is null.  For example,
-    <literal>7 = NULL</> yields null, as does <literal>7 &lt;&gt; NULL</>.  When
-    this behavior is not suitable, use the
-    <literal>IS <optional> NOT </> DISTINCT FROM</literal> constructs:
-<synopsis>
-<replaceable>expression</replaceable> IS DISTINCT FROM <replaceable>expression</replaceable>
-<replaceable>expression</replaceable> IS NOT DISTINCT FROM <replaceable>expression</replaceable>
-</synopsis>
-    For non-null inputs, <literal>IS DISTINCT FROM</literal> is
-    the same as the <literal>&lt;&gt;</> operator.  However, if both
-    inputs are null it returns false, and if only one input is
-    null it returns true.  Similarly, <literal>IS NOT DISTINCT
-    FROM</literal> is identical to <literal>=</literal> for non-null
-    inputs, but it returns true when both inputs are null, and false when only
-    one input is null. Thus, these constructs effectively act as though null
-    were a normal data value, rather than <quote>unknown</>.
+    inverse results for row-valued expressions; in particular, a row-valued
+    expression that contains both null and non-null fields will return false
+    for both tests.  In some cases, it may be preferable to
+    write <replaceable>row</replaceable> <literal>IS DISTINCT FROM NULL</>
+    or <replaceable>row</replaceable> <literal>IS NOT DISTINCT FROM NULL</>,
+    which will simply check whether the overall row value is null without any
+    additional tests on the row fields.
    </para>
 
    <para>
@@ -659,7 +657,7 @@
         <literal><function>ceil(<type>dp</type> or <type>numeric</type>)</function></literal>
        </entry>
        <entry>(same as input)</entry>
-       <entry>smallest integer not less than argument</entry>
+       <entry>nearest integer greater than or equal to argument</entry>
        <entry><literal>ceil(-42.8)</literal></entry>
        <entry><literal>-42</literal></entry>
       </row>
@@ -672,7 +670,7 @@
         <literal><function>ceiling(<type>dp</type> or <type>numeric</type>)</function></literal>
        </entry>
        <entry>(same as input)</entry>
-       <entry>smallest integer not less than argument (alias for <function>ceil</function>)</entry>
+       <entry>nearest integer greater than or equal to argument (same as <function>ceil</function>)</entry>
        <entry><literal>ceiling(-95.3)</literal></entry>
        <entry><literal>-95</literal></entry>
       </row>
@@ -725,7 +723,7 @@
         <literal><function>floor(<type>dp</type> or <type>numeric</type>)</function></literal>
        </entry>
        <entry>(same as input)</entry>
-       <entry>largest integer not greater than argument</entry>
+       <entry>nearest integer less than or equal to argument</entry>
        <entry><literal>floor(-42.8)</literal></entry>
        <entry><literal>-43</literal></entry>
       </row>
@@ -1323,11 +1321,12 @@
        </entry>
        <entry><type>text</type></entry>
        <entry>
-        Remove the longest string containing only the
+        Remove the longest string containing only characters from
         <parameter>characters</parameter> (a space by default) from the
-        start/end/both ends of the <parameter>string</parameter>
+        start, end, or both ends (<literal>both</> is the default)
+        of <parameter>string</parameter>
        </entry>
-       <entry><literal>trim(both 'x' from 'xTomxx')</literal></entry>
+       <entry><literal>trim(both 'xyz' from 'yxTomxx')</literal></entry>
        <entry><literal>Tom</literal></entry>
       </row>
 
@@ -1336,14 +1335,14 @@
         <literal><function>trim(<optional>leading | trailing
         | both</optional> <optional>from</optional>
         <parameter>string</parameter>
-        <optional><parameter>, characters</parameter></optional>
+        <optional>, <parameter>characters</parameter></optional>
         )</function></literal>
        </entry>
        <entry><type>text</type></entry>
        <entry>
-        Non-standard version of <function>trim()</>
+        Non-standard syntax for <function>trim()</>
        </entry>
-       <entry><literal>trim(both from 'xTomxx', 'x')</literal></entry>
+       <entry><literal>trim(both from 'yxTomxx', 'xyz')</literal></entry>
        <entry><literal>Tom</literal></entry>
       </row>
 
@@ -1415,7 +1414,7 @@
         in <parameter>characters</parameter> (a space by default)
         from the start and end of <parameter>string</parameter>
        </entry>
-       <entry><literal>btrim('xyxtrimyyx', 'xy')</literal></entry>
+       <entry><literal>btrim('xyxtrimyyx', 'xyz')</literal></entry>
        <entry><literal>trim</literal></entry>
       </row>
 
@@ -1684,8 +1683,8 @@
         <parameter>characters</parameter> (a space by default) from the start of
         <parameter>string</parameter>
        </entry>
-       <entry><literal>ltrim('zzzytrim', 'xyz')</literal></entry>
-       <entry><literal>trim</literal></entry>
+       <entry><literal>ltrim('zzzytest', 'xyz')</literal></entry>
+       <entry><literal>test</literal></entry>
       </row>
 
       <row>
@@ -1967,8 +1966,8 @@
         <parameter>characters</parameter> (a space by default) from the end of
         <parameter>string</parameter>
        </entry>
-       <entry><literal>rtrim('trimxxxx', 'x')</literal></entry>
-       <entry><literal>trim</literal></entry>
+       <entry><literal>rtrim('testxxzx', 'xyz')</literal></entry>
+       <entry><literal>test</literal></entry>
       </row>
 
       <row>
@@ -3233,11 +3232,11 @@
        </entry>
        <entry><type>bytea</type></entry>
        <entry>
-        Remove the longest string containing only the bytes in
+        Remove the longest string containing only bytes appearing in
         <parameter>bytes</parameter> from the start
         and end of <parameter>string</parameter>
        </entry>
-       <entry><literal>trim(E'\\000'::bytea from E'\\000Tom\\000'::bytea)</literal></entry>
+       <entry><literal>trim(E'\\000\\001'::bytea from E'\\000Tom\\001'::bytea)</literal></entry>
        <entry><literal>Tom</literal></entry>
       </row>
      </tbody>
@@ -3276,11 +3275,11 @@
        </entry>
        <entry><type>bytea</type></entry>
        <entry>
-        Remove the longest string consisting only of bytes
-        in <parameter>bytes</parameter> from the start and end of
+        Remove the longest string containing only bytes appearing in
+        <parameter>bytes</parameter> from the start and end of
         <parameter>string</parameter>
       </entry>
-      <entry><literal>btrim(E'\\000trim\\000'::bytea, E'\\000'::bytea)</literal></entry>
+      <entry><literal>btrim(E'\\000trim\\001'::bytea, E'\\000\\001'::bytea)</literal></entry>
       <entry><literal>trim</literal></entry>
      </row>
 
@@ -5747,15 +5746,18 @@
        </row>
        <row>
         <entry><literal>TZ</literal></entry>
-        <entry>upper case time-zone name</entry>
+        <entry>upper case time-zone abbreviation
+         (only supported in <function>to_char</>)</entry>
        </row>
        <row>
         <entry><literal>tz</literal></entry>
-        <entry>lower case time-zone name</entry>
+        <entry>lower case time-zone abbreviation
+         (only supported in <function>to_char</>)</entry>
        </row>
        <row>
         <entry><literal>OF</literal></entry>
-        <entry>time-zone offset</entry>
+        <entry>time-zone offset from UTC
+         (only supported in <function>to_char</>)</entry>
        </row>
       </tbody>
      </tgroup>
@@ -5989,7 +5991,7 @@
       <para>
        Here is a more
        complex example:
-       <literal>to_timestamp('15:12:02.020.001230', 'HH:MI:SS.MS.US')</literal>
+       <literal>to_timestamp('15:12:02.020.001230', 'HH24:MI:SS.MS.US')</literal>
        is 15 hours, 12 minutes, and 2 seconds + 20 milliseconds +
        1230 microseconds = 2.021230 seconds.
       </para>
@@ -8039,12 +8041,12 @@
        <row>
         <entry> <literal>#</literal> </entry>
         <entry>Point or box of intersection</entry>
-        <entry><literal>'((1,-1),(-1,1))' # '((1,1),(-1,-1))'</literal></entry>
+        <entry><literal>box '((1,-1),(-1,1))' # box '((1,1),(-2,-2))'</literal></entry>
        </row>
        <row>
         <entry> <literal>#</literal> </entry>
         <entry>Number of points in path or polygon</entry>
-        <entry><literal># '((1,0),(0,1),(-1,0))'</literal></entry>
+        <entry><literal># path '((1,0),(0,1),(-1,0))'</literal></entry>
        </row>
        <row>
         <entry> <literal>@-@</literal> </entry>
@@ -11186,13 +11188,19 @@
 
        <important>
         <para>
-         To avoid blocking concurrent transactions that obtain numbers from the
-         same sequence, a <function>nextval</function> operation is never
+         To avoid blocking concurrent transactions that obtain numbers from
+         the same sequence, a <function>nextval</function> operation is never
          rolled back; that is, once a value has been fetched it is considered
-         used, even if the transaction that did the
-         <function>nextval</function> later aborts.  This means that aborted
-         transactions might leave unused <quote>holes</quote> in the sequence
-         of assigned values.
+         used and will not be returned again.  This is true even if the
+         surrounding transaction later aborts, or if the calling query ends
+         up not using the value.  For example an <command>INSERT</> with
+         an <literal>ON CONFLICT</> clause will compute the to-be-inserted
+         tuple, including doing any required <function>nextval</function>
+         calls, before detecting any conflict that would cause it to follow
+         the <literal>ON CONFLICT</> rule instead.  Such cases will leave
+         unused <quote>holes</quote> in the sequence of assigned values.
+         Thus, <productname>PostgreSQL</> sequence objects <emphasis>cannot
+         be used to obtain <quote>gapless</> sequences</emphasis>.
         </para>
        </important>
 
@@ -11221,8 +11229,8 @@
         Return the value most recently returned by
         <function>nextval</> in the current session. This function is
         identical to <function>currval</function>, except that instead
-        of taking the sequence name as an argument it fetches the
-        value of the last sequence used by <function>nextval</function>
+        of taking the sequence name as an argument it refers to whichever
+        sequence <function>nextval</function> was most recently applied to
         in the current session. It is an error to call
         <function>lastval</function> if <function>nextval</function>
         has not yet been called in the current session.
@@ -13207,9 +13215,6 @@
         <primary>percentile</primary>
         <secondary>continuous</secondary>
        </indexterm>
-       <indexterm>
-        <primary>median</primary>
-       </indexterm>
        <function>percentile_cont(<replaceable class="parameter">fraction</replaceable>) WITHIN GROUP (ORDER BY <replaceable class="parameter">sort_expression</replaceable>)</function>
       </entry>
       <entry>
@@ -14805,6 +14810,12 @@
       </row>
 
       <row>
+       <entry><literal><function>current_role</function></literal></entry>
+       <entry><type>name</type></entry>
+       <entry>equivalent to <function>current_user</function></entry>
+      </row>
+
+      <row>
        <entry><literal><function>current_schema</function>[()]</literal></entry>
        <entry><type>name</type></entry>
        <entry>name of current schema</entry>
@@ -14915,8 +14926,11 @@
 
    <note>
     <para>
-     <function>current_catalog</function>, <function>current_schema</function>,
-     <function>current_user</function>, <function>session_user</function>,
+     <function>current_catalog</function>,
+     <function>current_role</function>,
+     <function>current_schema</function>,
+     <function>current_user</function>,
+     <function>session_user</function>,
      and <function>user</function> have special syntactic status
      in <acronym>SQL</acronym>: they must be called without trailing
      parentheses.  (In PostgreSQL, parentheses can optionally be used with
@@ -14937,6 +14951,10 @@
    </indexterm>
 
    <indexterm>
+    <primary>current_role</primary>
+   </indexterm>
+
+   <indexterm>
     <primary>current_schema</primary>
    </indexterm>
 
@@ -14987,6 +15005,11 @@
     functions with the attribute <literal>SECURITY DEFINER</literal>.
     In Unix parlance, the session user is the <quote>real user</quote> and
     the current user is the <quote>effective user</quote>.
+    <function>current_role</function> and <function>user</function> are
+    synonyms for <function>current_user</function>.  (The SQL standard draws
+    a distinction between <function>current_role</function>
+    and <function>current_user</function>, but <productname>PostgreSQL</>
+    does not, since it unifies users and roles into a single kind of entity.)
    </para>
 
    <para>
@@ -15290,6 +15313,21 @@
        <entry>does current user have privilege for tablespace</entry>
       </row>
       <row>
+       <entry><literal><function>has_type_privilege</function>(<parameter>user</parameter>,
+                                  <parameter>type</parameter>,
+                                  <parameter>privilege</parameter>)</literal>
+       </entry>
+       <entry><type>boolean</type></entry>
+       <entry>does user have privilege for type</entry>
+      </row>
+      <row>
+       <entry><literal><function>has_type_privilege</function>(<parameter>type</parameter>,
+                                  <parameter>privilege</parameter>)</literal>
+       </entry>
+       <entry><type>boolean</type></entry>
+       <entry>does current user have privilege for type</entry>
+      </row>
+      <row>
        <entry><literal><function>pg_has_role</function>(<parameter>user</parameter>,
                                   <parameter>role</parameter>,
                                   <parameter>privilege</parameter>)</literal>
@@ -15348,6 +15386,9 @@
     <primary>has_tablespace_privilege</primary>
    </indexterm>
    <indexterm>
+    <primary>has_type_privilege</primary>
+   </indexterm>
+   <indexterm>
     <primary>pg_has_role</primary>
    </indexterm>
    <indexterm>
@@ -15502,6 +15543,18 @@
    </para>
 
    <para>
+    <function>has_type_privilege</function> checks whether a user
+    can access a type in a particular way.
+    Its argument possibilities
+    are analogous to <function>has_table_privilege</function>.
+    When specifying a type by a text string rather than by OID,
+    the allowed input is the same as for the <type>regtype</> data type
+    (see <xref linkend="datatype-oid">).
+    The desired access privilege type must evaluate to
+    <literal>USAGE</literal>.
+   </para>
+
+   <para>
     <function>pg_has_role</function> checks whether a user
     can access a role in a particular way.
     Its argument possibilities
@@ -17515,7 +17568,7 @@
         <indexterm>
          <primary>pg_replication_origin_xact_reset</primary>
         </indexterm>
-        <literal><function>pg_replication_origin_xact_reset()</function></literal>
+        <literal><function>pg_replication_origin_xact_reset(<parameter>origin_lsn</parameter> <type>pg_lsn</type>, <parameter>origin_timestamp</parameter> <type>timestamptz</type>)</function></literal>
        </entry>
        <entry>
         void
@@ -17523,6 +17576,12 @@
        <entry>
         Cancel the effects of
         <function>pg_replication_origin_xact_setup()</function>.
+        Note that two arguments were introduced <emphasis>by mistake</>
+        during the <productname>PostgreSQL</> 9.5 development cycle while
+        <function>pg_replication_origin_xact_reset()</function> actually
+        doesn't use them at all. Therefore, any dummy values except
+        <literal>NULL</> can be safely specified as the arguments.
+        This mistake will be fixed in a future release.
        </entry>
       </row>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/gin.sgml postgresql-9.5-9.5.8/doc/src/sgml/gin.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/gin.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/gin.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -539,7 +539,7 @@
        <function>extractQuery</> to pass additional data to the
        <function>consistent</> and <function>comparePartial</> methods.
        To use it, <function>extractQuery</> must allocate
-       an array of <literal>*nkeys</> Pointers and store its address at
+       an array of <literal>*nkeys</> pointers and store its address at
        <literal>*extra_data</>, then store whatever it wants to into the
        individual pointers.  The variable is initialized to <symbol>NULL</symbol> before
        call, so this argument can simply be ignored by operator classes that
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/high-availability.sgml postgresql-9.5-9.5.8/doc/src/sgml/high-availability.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/high-availability.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/high-availability.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -76,9 +76,7 @@
 
  <para>
   The remainder of this section outlines various failover, replication,
-  and load balancing solutions.  A <ulink
-  url="http://www.postgres-r.org/documentation/terms">glossary</ulink> is
-  also available.
+  and load balancing solutions.
  </para>
 
  <sect1 id="different-replication-solutions">
@@ -209,7 +207,7 @@
      middleware.  Care must also be taken that all
      transactions either commit or abort on all servers, perhaps
      using two-phase commit (<xref linkend="sql-prepare-transaction">
-     and <xref linkend="sql-commit-prepared">.
+     and <xref linkend="sql-commit-prepared">).
      <productname>Pgpool-II</> and <productname>Continuent Tungsten</>
      are examples of this type of replication.
     </para>
@@ -914,7 +912,7 @@
     </para>
     <para>
      Existing replication slots and their state can be seen in the
-     <link linkend="catalog-pg-replication-slots"><structname>pg_replication_slots</structname></link>
+     <link linkend="view-pg-replication-slots"><structname>pg_replication_slots</structname></link>
      view.
     </para>
     <para>
@@ -1732,7 +1730,7 @@
 
    <para>
     In normal operation, <quote>read-only</> transactions are allowed to
-    update sequences and to use <command>LISTEN</>, <command>UNLISTEN</>, and
+    use <command>LISTEN</>, <command>UNLISTEN</>, and
     <command>NOTIFY</>, so Hot Standby sessions operate under slightly tighter
     restrictions than ordinary read-only sessions.  It is possible that some
     of these restrictions might be loosened in a future release.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/acronyms.html postgresql-9.5-9.5.8/doc/src/sgml/html/acronyms.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/acronyms.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/acronyms.html	2017-08-07 21:33:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -547,7 +547,7 @@
 ><DD
 ><P
 >      <A
-HREF="http://git.postgresql.org/gitweb?p=postgresql.git;a=blob;f=src/backend/access/heap/README.HOT;hb=HEAD"
+HREF="https://git.postgresql.org/gitweb?p=postgresql.git;a=blob;f=src/backend/access/heap/README.HOT;hb=HEAD"
 TARGET="_top"
 >Heap-Only
       Tuples</A
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/admin.html postgresql-9.5-9.5.8/doc/src/sgml/html/admin.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/admin.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/admin.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Non-Durable Settings"
@@ -23,7 +23,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="PART"
 ><DIV
@@ -41,7 +41,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -97,7 +97,7 @@
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN27524"
+NAME="AEN27763"
 ></A
 ><P
 >    This part covers topics that are of interest to a
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/adminpack.html postgresql-9.5-9.5.8/doc/src/sgml/html/adminpack.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/adminpack.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/adminpack.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -106,36 +106,326 @@
 > and other administration and management tools can
   use to provide additional functionality, such as remote management
   of server log files.
+  Use of all these functions is restricted to superusers.
+ </P
+><P
+>  The functions shown in <A
+HREF="adminpack.html#FUNCTIONS-ADMINPACK-TABLE"
+>Table F-1</A
+> provide
+  write access to files on the machine hosting the server.  (See also the
+  functions in <A
+HREF="functions-admin.html#FUNCTIONS-ADMIN-GENFILE-TABLE"
+>Table 9-76</A
+>, which
+  provide read-only access.)
+  Only files within the database cluster directory can be accessed, but
+  either a relative or absolute path is allowable.
+ </P
+><DIV
+CLASS="TABLE"
+><A
+NAME="FUNCTIONS-ADMINPACK-TABLE"
+></A
+><P
+><B
+>Table F-1. <TT
+CLASS="FILENAME"
+>adminpack</TT
+> Functions</B
+></P
+><TABLE
+BORDER="1"
+CLASS="CALSTABLE"
+><COL><COL><COL><THEAD
+><TR
+><TH
+>Name</TH
+><TH
+>Return Type</TH
+><TH
+>Description</TH
+></TR
+></THEAD
+><TBODY
+><TR
+><TD
+><CODE
+CLASS="FUNCTION"
+>pg_catalog.pg_file_write(filename text, data text, append boolean)</CODE
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>bigint</TT
+></TD
+><TD
+>      Write, or append to, a text file
+     </TD
+></TR
+><TR
+><TD
+><CODE
+CLASS="FUNCTION"
+>pg_catalog.pg_file_rename(oldname text, newname text [<SPAN
+CLASS="OPTIONAL"
+>, archivename text</SPAN
+>])</CODE
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>boolean</TT
+></TD
+><TD
+>      Rename a file
+     </TD
+></TR
+><TR
+><TD
+><CODE
+CLASS="FUNCTION"
+>pg_catalog.pg_file_unlink(filename text)</CODE
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>boolean</TT
+></TD
+><TD
+>      Remove a file
+     </TD
+></TR
+><TR
+><TD
+><CODE
+CLASS="FUNCTION"
+>pg_catalog.pg_logdir_ls()</CODE
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>setof record</TT
+></TD
+><TD
+>      List the log files in the <TT
+CLASS="VARNAME"
+>log_directory</TT
+> directory
+     </TD
+></TR
+></TBODY
+></TABLE
+></DIV
+><P
+>  <CODE
+CLASS="FUNCTION"
+>pg_file_write</CODE
+> writes the specified <TT
+CLASS="PARAMETER"
+>data</TT
+> into
+  the file named by <TT
+CLASS="PARAMETER"
+>filename</TT
+>.  If <TT
+CLASS="PARAMETER"
+>append</TT
+> is
+  false, the file must not already exist.  If <TT
+CLASS="PARAMETER"
+>append</TT
+> is true,
+  the file can already exist, and will be appended to if so.
+  Returns the number of bytes written.
+ </P
+><P
+>  <CODE
+CLASS="FUNCTION"
+>pg_file_rename</CODE
+> renames a file.  If <TT
+CLASS="PARAMETER"
+>archivename</TT
+>
+  is omitted or NULL, it simply renames <TT
+CLASS="PARAMETER"
+>oldname</TT
+>
+  to <TT
+CLASS="PARAMETER"
+>newname</TT
+> (which must not already exist).
+  If <TT
+CLASS="PARAMETER"
+>archivename</TT
+> is provided, it first
+  renames <TT
+CLASS="PARAMETER"
+>newname</TT
+> to <TT
+CLASS="PARAMETER"
+>archivename</TT
+> (which must
+  not already exist), and then renames <TT
+CLASS="PARAMETER"
+>oldname</TT
+>
+  to <TT
+CLASS="PARAMETER"
+>newname</TT
+>.  In event of failure of the second rename step,
+  it will try to rename <TT
+CLASS="PARAMETER"
+>archivename</TT
+> back
+  to <TT
+CLASS="PARAMETER"
+>newname</TT
+> before reporting the error.
+  Returns true on success, false if the source file(s) are not present or
+  not writable; other cases throw errors.
+ </P
+><P
+>  <CODE
+CLASS="FUNCTION"
+>pg_file_unlink</CODE
+> removes the specified file.
+  Returns true on success, false if the specified file is not present
+  or the <CODE
+CLASS="FUNCTION"
+>unlink()</CODE
+> call fails; other cases throw errors.
+ </P
+><P
+>  <CODE
+CLASS="FUNCTION"
+>pg_logdir_ls</CODE
+> returns the start timestamps and path
+  names of all the log files in the <A
+HREF="runtime-config-logging.html#GUC-LOG-DIRECTORY"
+>log_directory</A
+>
+  directory.  The <A
+HREF="runtime-config-logging.html#GUC-LOG-FILENAME"
+>log_filename</A
+> parameter must have its
+  default setting (<TT
+CLASS="LITERAL"
+>postgresql-%Y-%m-%d_%H%M%S.log</TT
+>) to use this
+  function.
+ </P
+><P
+>  The functions shown
+  in <A
+HREF="adminpack.html#FUNCTIONS-ADMINPACK-DEPRECATED-TABLE"
+>Table F-2</A
+> are deprecated
+  and should not be used in new applications; instead use those shown
+  in <A
+HREF="functions-admin.html#FUNCTIONS-ADMIN-SIGNAL-TABLE"
+>Table 9-67</A
+>
+  and <A
+HREF="functions-admin.html#FUNCTIONS-ADMIN-GENFILE-TABLE"
+>Table 9-76</A
+>.  These functions are
+  provided in <TT
+CLASS="FILENAME"
+>adminpack</TT
+> only for compatibility with old
+  versions of <SPAN
+CLASS="APPLICATION"
+>pgAdmin</SPAN
+>.
  </P
 ><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN167460"
->F.1.1. Functions Implemented</A
-></H2
+CLASS="TABLE"
+><A
+NAME="FUNCTIONS-ADMINPACK-DEPRECATED-TABLE"
+></A
 ><P
->   The functions implemented by <TT
+><B
+>Table F-2. Deprecated <TT
 CLASS="FILENAME"
 >adminpack</TT
-> can only be run by a
-   superuser. Here's a list of these functions:
-
-</P><PRE
-CLASS="PROGRAMLISTING"
->int8 pg_catalog.pg_file_write(fname text, data text, append bool)
-bool pg_catalog.pg_file_rename(oldname text, newname text, archivename text)
-bool pg_catalog.pg_file_rename(oldname text, newname text)
-bool pg_catalog.pg_file_unlink(fname text)
-setof record pg_catalog.pg_logdir_ls()
-
-/* Renaming of existing backend functions for pgAdmin compatibility */
-int8 pg_catalog.pg_file_read(fname text, data text, append bool)
-bigint pg_catalog.pg_file_length(text)
-int4 pg_catalog.pg_logfile_rotate()</PRE
-><P>
-  </P
+> Functions</B
+></P
+><TABLE
+BORDER="1"
+CLASS="CALSTABLE"
+><COL><COL><COL><THEAD
+><TR
+><TH
+>Name</TH
+><TH
+>Return Type</TH
+><TH
+>Description</TH
+></TR
+></THEAD
+><TBODY
+><TR
+><TD
+><CODE
+CLASS="FUNCTION"
+>pg_catalog.pg_file_read(filename text, offset bigint, nbytes bigint)</CODE
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
+><TD
+>      Alternate name for <CODE
+CLASS="FUNCTION"
+>pg_read_file()</CODE
+>
+     </TD
+></TR
+><TR
+><TD
+><CODE
+CLASS="FUNCTION"
+>pg_catalog.pg_file_length(filename text)</CODE
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>bigint</TT
+></TD
+><TD
+>      Same as <TT
+CLASS="STRUCTFIELD"
+>size</TT
+> column returned
+      by <CODE
+CLASS="FUNCTION"
+>pg_stat_file()</CODE
+>
+     </TD
+></TR
+><TR
+><TD
+><CODE
+CLASS="FUNCTION"
+>pg_catalog.pg_logfile_rotate()</CODE
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>integer</TT
+></TD
+><TD
+>      Alternate name for <CODE
+CLASS="FUNCTION"
+>pg_rotate_logfile()</CODE
+>, but note that it
+      returns integer 0 or 1 rather than boolean
+     </TD
+></TR
+></TBODY
+></TABLE
 ></DIV
 ></DIV
 ><DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-clusterdb.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-clusterdb.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-clusterdb.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-clusterdb.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN89142"
+NAME="AEN89474"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN89146"
+NAME="AEN89478"
 ></A
 ><H2
 >Synopsis</H2
@@ -174,7 +174,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89180"
+NAME="AEN89512"
 ></A
 ><H2
 >Description</H2
@@ -207,7 +207,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89188"
+NAME="AEN89520"
 ></A
 ><H2
 >Options</H2
@@ -564,7 +564,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89321"
+NAME="AEN89653"
 ></A
 ><H2
 >Environment</H2
@@ -612,7 +612,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89339"
+NAME="AEN89671"
 ></A
 ><H2
 >Diagnostics</H2
@@ -641,7 +641,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89345"
+NAME="AEN89677"
 ></A
 ><H2
 >Examples</H2
@@ -685,7 +685,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89358"
+NAME="AEN89690"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-createdb.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-createdb.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-createdb.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-createdb.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN89371"
+NAME="AEN89703"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN89375"
+NAME="AEN89707"
 ></A
 ><H2
 >Synopsis</H2
@@ -186,7 +186,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89397"
+NAME="AEN89729"
 ></A
 ><H2
 >Options</H2
@@ -648,7 +648,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89563"
+NAME="AEN89895"
 ></A
 ><H2
 >Environment</H2
@@ -712,7 +712,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89586"
+NAME="AEN89918"
 ></A
 ><H2
 >Diagnostics</H2
@@ -741,7 +741,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89592"
+NAME="AEN89924"
 ></A
 ><H2
 >Examples</H2
@@ -794,7 +794,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89607"
+NAME="AEN89939"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-createlang.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-createlang.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-createlang.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-createlang.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN89622"
+NAME="AEN89954"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN89626"
+NAME="AEN89958"
 ></A
 ><H2
 >Synopsis</H2
@@ -158,7 +158,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89646"
+NAME="AEN89978"
 ></A
 ><H2
 >Description</H2
@@ -222,7 +222,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89659"
+NAME="AEN89991"
 ></A
 ><H2
 >Options</H2
@@ -494,7 +494,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89760"
+NAME="AEN90092"
 ></A
 ><H2
 >Environment</H2
@@ -542,7 +542,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89778"
+NAME="AEN90110"
 ></A
 ><H2
 >Diagnostics</H2
@@ -570,7 +570,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89785"
+NAME="AEN90117"
 ></A
 ><H2
 >Notes</H2
@@ -587,7 +587,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89789"
+NAME="AEN90121"
 ></A
 ><H2
 >Examples</H2
@@ -621,7 +621,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89798"
+NAME="AEN90130"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-createuser.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-createuser.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-createuser.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-createuser.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN89815"
+NAME="AEN90147"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN89819"
+NAME="AEN90151"
 ></A
 ><H2
 >Synopsis</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89828"
+NAME="AEN90160"
 ></A
 ><H2
 >Description</H2
@@ -192,7 +192,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89842"
+NAME="AEN90174"
 ></A
 ><H2
 >Options</H2
@@ -742,7 +742,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90065"
+NAME="AEN90397"
 ></A
 ><H2
 >Environment</H2
@@ -787,7 +787,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90081"
+NAME="AEN90413"
 ></A
 ><H2
 >Diagnostics</H2
@@ -816,7 +816,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90087"
+NAME="AEN90419"
 ></A
 ><H2
 >Examples</H2
@@ -958,7 +958,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90125"
+NAME="AEN90457"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-dropdb.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-dropdb.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-dropdb.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-dropdb.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN90140"
+NAME="AEN90472"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN90144"
+NAME="AEN90476"
 ></A
 ><H2
 >Synopsis</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90153"
+NAME="AEN90485"
 ></A
 ><H2
 >Description</H2
@@ -172,7 +172,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90162"
+NAME="AEN90494"
 ></A
 ><H2
 >Options</H2
@@ -452,7 +452,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90266"
+NAME="AEN90598"
 ></A
 ><H2
 >Environment</H2
@@ -497,7 +497,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90282"
+NAME="AEN90614"
 ></A
 ><H2
 >Diagnostics</H2
@@ -526,7 +526,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90288"
+NAME="AEN90620"
 ></A
 ><H2
 >Examples</H2
@@ -583,7 +583,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90304"
+NAME="AEN90636"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-droplang.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-droplang.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-droplang.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-droplang.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN90319"
+NAME="AEN90651"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN90323"
+NAME="AEN90655"
 ></A
 ><H2
 >Synopsis</H2
@@ -224,7 +224,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90356"
+NAME="AEN90688"
 ></A
 ><H2
 >Options</H2
@@ -496,7 +496,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90457"
+NAME="AEN90789"
 ></A
 ><H2
 >Environment</H2
@@ -544,7 +544,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90475"
+NAME="AEN90807"
 ></A
 ><H2
 >Diagnostics</H2
@@ -572,7 +572,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90482"
+NAME="AEN90814"
 ></A
 ><H2
 >Notes</H2
@@ -589,7 +589,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90486"
+NAME="AEN90818"
 ></A
 ><H2
 >Examples</H2
@@ -612,7 +612,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90493"
+NAME="AEN90825"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-dropuser.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-dropuser.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-dropuser.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-dropuser.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN90510"
+NAME="AEN90842"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN90514"
+NAME="AEN90846"
 ></A
 ><H2
 >Synopsis</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90523"
+NAME="AEN90855"
 ></A
 ><H2
 >Description</H2
@@ -179,7 +179,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90534"
+NAME="AEN90866"
 ></A
 ><H2
 >Options</H2
@@ -447,7 +447,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90633"
+NAME="AEN90965"
 ></A
 ><H2
 >Environment</H2
@@ -492,7 +492,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90649"
+NAME="AEN90981"
 ></A
 ><H2
 >Diagnostics</H2
@@ -521,7 +521,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90655"
+NAME="AEN90987"
 ></A
 ><H2
 >Examples</H2
@@ -578,7 +578,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90671"
+NAME="AEN91003"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-ecpg.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-ecpg.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-ecpg.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-ecpg.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN90686"
+NAME="AEN91018"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN90690"
+NAME="AEN91022"
 ></A
 ><H2
 >Synopsis</H2
@@ -155,20 +155,12 @@
    preferably have the extension <TT
 CLASS="FILENAME"
 >.pgc</TT
->, in which
-   case the extension will be replaced by <TT
+>.
+   The extension will be replaced by <TT
 CLASS="FILENAME"
 >.c</TT
 > to
-   determine the output file name.  If the extension of the input file
-   is not <TT
-CLASS="FILENAME"
->.pgc</TT
->, then the output file name is
-   computed by appending <TT
-CLASS="LITERAL"
->.c</TT
-> to the full file name.
+   determine the output file name.
    The output file name can also be overridden using the
    <TT
 CLASS="OPTION"
@@ -186,7 +178,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90710"
+NAME="AEN91040"
 ></A
 ><H2
 >Options</H2
@@ -460,7 +452,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90809"
+NAME="AEN91139"
 ></A
 ><H2
 >Notes</H2
@@ -505,7 +497,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90821"
+NAME="AEN91151"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/appendixes.html postgresql-9.5-9.5.8/doc/src/sgml/html/appendixes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/appendixes.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/appendixes.html	2017-08-07 21:33:17.000000000 +0000
@@ -9,11 +9,11 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Row Estimation Examples"
-HREF="row-estimation-examples.html"><LINK
+TITLE="Planner Statistics and Security"
+HREF="planner-stats-security.html"><LINK
 REL="NEXT"
 TITLE="PostgreSQL Error Codes"
 HREF="errcodes-appendix.html"><LINK
@@ -23,7 +23,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="PART"
 ><DIV
@@ -41,7 +41,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -50,8 +50,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="Row Estimation Examples"
-HREF="row-estimation-examples.html"
+TITLE="Planner Statistics and Security"
+HREF="planner-stats-security.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -174,1496 +174,1631 @@
 ><DL
 ><DT
 >E.1. <A
+HREF="release-9-5-8.html"
+>Release 9.5.8</A
+></DT
+><DT
+>E.2. <A
+HREF="release-9-5-7.html"
+>Release 9.5.7</A
+></DT
+><DT
+>E.3. <A
+HREF="release-9-5-6.html"
+>Release 9.5.6</A
+></DT
+><DT
+>E.4. <A
+HREF="release-9-5-5.html"
+>Release 9.5.5</A
+></DT
+><DT
+>E.5. <A
+HREF="release-9-5-4.html"
+>Release 9.5.4</A
+></DT
+><DT
+>E.6. <A
+HREF="release-9-5-3.html"
+>Release 9.5.3</A
+></DT
+><DT
+>E.7. <A
 HREF="release-9-5-2.html"
 >Release 9.5.2</A
 ></DT
 ><DT
->E.2. <A
+>E.8. <A
 HREF="release-9-5-1.html"
 >Release 9.5.1</A
 ></DT
 ><DT
->E.3. <A
+>E.9. <A
 HREF="release-9-5.html"
 >Release 9.5</A
 ></DT
 ><DT
->E.4. <A
+>E.10. <A
+HREF="release-9-4-13.html"
+>Release 9.4.13</A
+></DT
+><DT
+>E.11. <A
+HREF="release-9-4-12.html"
+>Release 9.4.12</A
+></DT
+><DT
+>E.12. <A
+HREF="release-9-4-11.html"
+>Release 9.4.11</A
+></DT
+><DT
+>E.13. <A
+HREF="release-9-4-10.html"
+>Release 9.4.10</A
+></DT
+><DT
+>E.14. <A
+HREF="release-9-4-9.html"
+>Release 9.4.9</A
+></DT
+><DT
+>E.15. <A
+HREF="release-9-4-8.html"
+>Release 9.4.8</A
+></DT
+><DT
+>E.16. <A
 HREF="release-9-4-7.html"
 >Release 9.4.7</A
 ></DT
 ><DT
->E.5. <A
+>E.17. <A
 HREF="release-9-4-6.html"
 >Release 9.4.6</A
 ></DT
 ><DT
->E.6. <A
+>E.18. <A
 HREF="release-9-4-5.html"
 >Release 9.4.5</A
 ></DT
 ><DT
->E.7. <A
+>E.19. <A
 HREF="release-9-4-4.html"
 >Release 9.4.4</A
 ></DT
 ><DT
->E.8. <A
+>E.20. <A
 HREF="release-9-4-3.html"
 >Release 9.4.3</A
 ></DT
 ><DT
->E.9. <A
+>E.21. <A
 HREF="release-9-4-2.html"
 >Release 9.4.2</A
 ></DT
 ><DT
->E.10. <A
+>E.22. <A
 HREF="release-9-4-1.html"
 >Release 9.4.1</A
 ></DT
 ><DT
->E.11. <A
+>E.23. <A
 HREF="release-9-4.html"
 >Release 9.4</A
 ></DT
 ><DT
->E.12. <A
+>E.24. <A
+HREF="release-9-3-18.html"
+>Release 9.3.18</A
+></DT
+><DT
+>E.25. <A
+HREF="release-9-3-17.html"
+>Release 9.3.17</A
+></DT
+><DT
+>E.26. <A
+HREF="release-9-3-16.html"
+>Release 9.3.16</A
+></DT
+><DT
+>E.27. <A
+HREF="release-9-3-15.html"
+>Release 9.3.15</A
+></DT
+><DT
+>E.28. <A
+HREF="release-9-3-14.html"
+>Release 9.3.14</A
+></DT
+><DT
+>E.29. <A
+HREF="release-9-3-13.html"
+>Release 9.3.13</A
+></DT
+><DT
+>E.30. <A
 HREF="release-9-3-12.html"
 >Release 9.3.12</A
 ></DT
 ><DT
->E.13. <A
+>E.31. <A
 HREF="release-9-3-11.html"
 >Release 9.3.11</A
 ></DT
 ><DT
->E.14. <A
+>E.32. <A
 HREF="release-9-3-10.html"
 >Release 9.3.10</A
 ></DT
 ><DT
->E.15. <A
+>E.33. <A
 HREF="release-9-3-9.html"
 >Release 9.3.9</A
 ></DT
 ><DT
->E.16. <A
+>E.34. <A
 HREF="release-9-3-8.html"
 >Release 9.3.8</A
 ></DT
 ><DT
->E.17. <A
+>E.35. <A
 HREF="release-9-3-7.html"
 >Release 9.3.7</A
 ></DT
 ><DT
->E.18. <A
+>E.36. <A
 HREF="release-9-3-6.html"
 >Release 9.3.6</A
 ></DT
 ><DT
->E.19. <A
+>E.37. <A
 HREF="release-9-3-5.html"
 >Release 9.3.5</A
 ></DT
 ><DT
->E.20. <A
+>E.38. <A
 HREF="release-9-3-4.html"
 >Release 9.3.4</A
 ></DT
 ><DT
->E.21. <A
+>E.39. <A
 HREF="release-9-3-3.html"
 >Release 9.3.3</A
 ></DT
 ><DT
->E.22. <A
+>E.40. <A
 HREF="release-9-3-2.html"
 >Release 9.3.2</A
 ></DT
 ><DT
->E.23. <A
+>E.41. <A
 HREF="release-9-3-1.html"
 >Release 9.3.1</A
 ></DT
 ><DT
->E.24. <A
+>E.42. <A
 HREF="release-9-3.html"
 >Release 9.3</A
 ></DT
 ><DT
->E.25. <A
+>E.43. <A
+HREF="release-9-2-22.html"
+>Release 9.2.22</A
+></DT
+><DT
+>E.44. <A
+HREF="release-9-2-21.html"
+>Release 9.2.21</A
+></DT
+><DT
+>E.45. <A
+HREF="release-9-2-20.html"
+>Release 9.2.20</A
+></DT
+><DT
+>E.46. <A
+HREF="release-9-2-19.html"
+>Release 9.2.19</A
+></DT
+><DT
+>E.47. <A
+HREF="release-9-2-18.html"
+>Release 9.2.18</A
+></DT
+><DT
+>E.48. <A
+HREF="release-9-2-17.html"
+>Release 9.2.17</A
+></DT
+><DT
+>E.49. <A
 HREF="release-9-2-16.html"
 >Release 9.2.16</A
 ></DT
 ><DT
->E.26. <A
+>E.50. <A
 HREF="release-9-2-15.html"
 >Release 9.2.15</A
 ></DT
 ><DT
->E.27. <A
+>E.51. <A
 HREF="release-9-2-14.html"
 >Release 9.2.14</A
 ></DT
 ><DT
->E.28. <A
+>E.52. <A
 HREF="release-9-2-13.html"
 >Release 9.2.13</A
 ></DT
 ><DT
->E.29. <A
+>E.53. <A
 HREF="release-9-2-12.html"
 >Release 9.2.12</A
 ></DT
 ><DT
->E.30. <A
+>E.54. <A
 HREF="release-9-2-11.html"
 >Release 9.2.11</A
 ></DT
 ><DT
->E.31. <A
+>E.55. <A
 HREF="release-9-2-10.html"
 >Release 9.2.10</A
 ></DT
 ><DT
->E.32. <A
+>E.56. <A
 HREF="release-9-2-9.html"
 >Release 9.2.9</A
 ></DT
 ><DT
->E.33. <A
+>E.57. <A
 HREF="release-9-2-8.html"
 >Release 9.2.8</A
 ></DT
 ><DT
->E.34. <A
+>E.58. <A
 HREF="release-9-2-7.html"
 >Release 9.2.7</A
 ></DT
 ><DT
->E.35. <A
+>E.59. <A
 HREF="release-9-2-6.html"
 >Release 9.2.6</A
 ></DT
 ><DT
->E.36. <A
+>E.60. <A
 HREF="release-9-2-5.html"
 >Release 9.2.5</A
 ></DT
 ><DT
->E.37. <A
+>E.61. <A
 HREF="release-9-2-4.html"
 >Release 9.2.4</A
 ></DT
 ><DT
->E.38. <A
+>E.62. <A
 HREF="release-9-2-3.html"
 >Release 9.2.3</A
 ></DT
 ><DT
->E.39. <A
+>E.63. <A
 HREF="release-9-2-2.html"
 >Release 9.2.2</A
 ></DT
 ><DT
->E.40. <A
+>E.64. <A
 HREF="release-9-2-1.html"
 >Release 9.2.1</A
 ></DT
 ><DT
->E.41. <A
+>E.65. <A
 HREF="release-9-2.html"
 >Release 9.2</A
 ></DT
 ><DT
->E.42. <A
+>E.66. <A
+HREF="release-9-1-24.html"
+>Release 9.1.24</A
+></DT
+><DT
+>E.67. <A
+HREF="release-9-1-23.html"
+>Release 9.1.23</A
+></DT
+><DT
+>E.68. <A
+HREF="release-9-1-22.html"
+>Release 9.1.22</A
+></DT
+><DT
+>E.69. <A
 HREF="release-9-1-21.html"
 >Release 9.1.21</A
 ></DT
 ><DT
->E.43. <A
+>E.70. <A
 HREF="release-9-1-20.html"
 >Release 9.1.20</A
 ></DT
 ><DT
->E.44. <A
+>E.71. <A
 HREF="release-9-1-19.html"
 >Release 9.1.19</A
 ></DT
 ><DT
->E.45. <A
+>E.72. <A
 HREF="release-9-1-18.html"
 >Release 9.1.18</A
 ></DT
 ><DT
->E.46. <A
+>E.73. <A
 HREF="release-9-1-17.html"
 >Release 9.1.17</A
 ></DT
 ><DT
->E.47. <A
+>E.74. <A
 HREF="release-9-1-16.html"
 >Release 9.1.16</A
 ></DT
 ><DT
->E.48. <A
+>E.75. <A
 HREF="release-9-1-15.html"
 >Release 9.1.15</A
 ></DT
 ><DT
->E.49. <A
+>E.76. <A
 HREF="release-9-1-14.html"
 >Release 9.1.14</A
 ></DT
 ><DT
->E.50. <A
+>E.77. <A
 HREF="release-9-1-13.html"
 >Release 9.1.13</A
 ></DT
 ><DT
->E.51. <A
+>E.78. <A
 HREF="release-9-1-12.html"
 >Release 9.1.12</A
 ></DT
 ><DT
->E.52. <A
+>E.79. <A
 HREF="release-9-1-11.html"
 >Release 9.1.11</A
 ></DT
 ><DT
->E.53. <A
+>E.80. <A
 HREF="release-9-1-10.html"
 >Release 9.1.10</A
 ></DT
 ><DT
->E.54. <A
+>E.81. <A
 HREF="release-9-1-9.html"
 >Release 9.1.9</A
 ></DT
 ><DT
->E.55. <A
+>E.82. <A
 HREF="release-9-1-8.html"
 >Release 9.1.8</A
 ></DT
 ><DT
->E.56. <A
+>E.83. <A
 HREF="release-9-1-7.html"
 >Release 9.1.7</A
 ></DT
 ><DT
->E.57. <A
+>E.84. <A
 HREF="release-9-1-6.html"
 >Release 9.1.6</A
 ></DT
 ><DT
->E.58. <A
+>E.85. <A
 HREF="release-9-1-5.html"
 >Release 9.1.5</A
 ></DT
 ><DT
->E.59. <A
+>E.86. <A
 HREF="release-9-1-4.html"
 >Release 9.1.4</A
 ></DT
 ><DT
->E.60. <A
+>E.87. <A
 HREF="release-9-1-3.html"
 >Release 9.1.3</A
 ></DT
 ><DT
->E.61. <A
+>E.88. <A
 HREF="release-9-1-2.html"
 >Release 9.1.2</A
 ></DT
 ><DT
->E.62. <A
+>E.89. <A
 HREF="release-9-1-1.html"
 >Release 9.1.1</A
 ></DT
 ><DT
->E.63. <A
+>E.90. <A
 HREF="release-9-1.html"
 >Release 9.1</A
 ></DT
 ><DT
->E.64. <A
+>E.91. <A
 HREF="release-9-0-23.html"
 >Release 9.0.23</A
 ></DT
 ><DT
->E.65. <A
+>E.92. <A
 HREF="release-9-0-22.html"
 >Release 9.0.22</A
 ></DT
 ><DT
->E.66. <A
+>E.93. <A
 HREF="release-9-0-21.html"
 >Release 9.0.21</A
 ></DT
 ><DT
->E.67. <A
+>E.94. <A
 HREF="release-9-0-20.html"
 >Release 9.0.20</A
 ></DT
 ><DT
->E.68. <A
+>E.95. <A
 HREF="release-9-0-19.html"
 >Release 9.0.19</A
 ></DT
 ><DT
->E.69. <A
+>E.96. <A
 HREF="release-9-0-18.html"
 >Release 9.0.18</A
 ></DT
 ><DT
->E.70. <A
+>E.97. <A
 HREF="release-9-0-17.html"
 >Release 9.0.17</A
 ></DT
 ><DT
->E.71. <A
+>E.98. <A
 HREF="release-9-0-16.html"
 >Release 9.0.16</A
 ></DT
 ><DT
->E.72. <A
+>E.99. <A
 HREF="release-9-0-15.html"
 >Release 9.0.15</A
 ></DT
 ><DT
->E.73. <A
+>E.100. <A
 HREF="release-9-0-14.html"
 >Release 9.0.14</A
 ></DT
 ><DT
->E.74. <A
+>E.101. <A
 HREF="release-9-0-13.html"
 >Release 9.0.13</A
 ></DT
 ><DT
->E.75. <A
+>E.102. <A
 HREF="release-9-0-12.html"
 >Release 9.0.12</A
 ></DT
 ><DT
->E.76. <A
+>E.103. <A
 HREF="release-9-0-11.html"
 >Release 9.0.11</A
 ></DT
 ><DT
->E.77. <A
+>E.104. <A
 HREF="release-9-0-10.html"
 >Release 9.0.10</A
 ></DT
 ><DT
->E.78. <A
+>E.105. <A
 HREF="release-9-0-9.html"
 >Release 9.0.9</A
 ></DT
 ><DT
->E.79. <A
+>E.106. <A
 HREF="release-9-0-8.html"
 >Release 9.0.8</A
 ></DT
 ><DT
->E.80. <A
+>E.107. <A
 HREF="release-9-0-7.html"
 >Release 9.0.7</A
 ></DT
 ><DT
->E.81. <A
+>E.108. <A
 HREF="release-9-0-6.html"
 >Release 9.0.6</A
 ></DT
 ><DT
->E.82. <A
+>E.109. <A
 HREF="release-9-0-5.html"
 >Release 9.0.5</A
 ></DT
 ><DT
->E.83. <A
+>E.110. <A
 HREF="release-9-0-4.html"
 >Release 9.0.4</A
 ></DT
 ><DT
->E.84. <A
+>E.111. <A
 HREF="release-9-0-3.html"
 >Release 9.0.3</A
 ></DT
 ><DT
->E.85. <A
+>E.112. <A
 HREF="release-9-0-2.html"
 >Release 9.0.2</A
 ></DT
 ><DT
->E.86. <A
+>E.113. <A
 HREF="release-9-0-1.html"
 >Release 9.0.1</A
 ></DT
 ><DT
->E.87. <A
+>E.114. <A
 HREF="release-9-0.html"
 >Release 9.0</A
 ></DT
 ><DT
->E.88. <A
+>E.115. <A
 HREF="release-8-4-22.html"
 >Release 8.4.22</A
 ></DT
 ><DT
->E.89. <A
+>E.116. <A
 HREF="release-8-4-21.html"
 >Release 8.4.21</A
 ></DT
 ><DT
->E.90. <A
+>E.117. <A
 HREF="release-8-4-20.html"
 >Release 8.4.20</A
 ></DT
 ><DT
->E.91. <A
+>E.118. <A
 HREF="release-8-4-19.html"
 >Release 8.4.19</A
 ></DT
 ><DT
->E.92. <A
+>E.119. <A
 HREF="release-8-4-18.html"
 >Release 8.4.18</A
 ></DT
 ><DT
->E.93. <A
+>E.120. <A
 HREF="release-8-4-17.html"
 >Release 8.4.17</A
 ></DT
 ><DT
->E.94. <A
+>E.121. <A
 HREF="release-8-4-16.html"
 >Release 8.4.16</A
 ></DT
 ><DT
->E.95. <A
+>E.122. <A
 HREF="release-8-4-15.html"
 >Release 8.4.15</A
 ></DT
 ><DT
->E.96. <A
+>E.123. <A
 HREF="release-8-4-14.html"
 >Release 8.4.14</A
 ></DT
 ><DT
->E.97. <A
+>E.124. <A
 HREF="release-8-4-13.html"
 >Release 8.4.13</A
 ></DT
 ><DT
->E.98. <A
+>E.125. <A
 HREF="release-8-4-12.html"
 >Release 8.4.12</A
 ></DT
 ><DT
->E.99. <A
+>E.126. <A
 HREF="release-8-4-11.html"
 >Release 8.4.11</A
 ></DT
 ><DT
->E.100. <A
+>E.127. <A
 HREF="release-8-4-10.html"
 >Release 8.4.10</A
 ></DT
 ><DT
->E.101. <A
+>E.128. <A
 HREF="release-8-4-9.html"
 >Release 8.4.9</A
 ></DT
 ><DT
->E.102. <A
+>E.129. <A
 HREF="release-8-4-8.html"
 >Release 8.4.8</A
 ></DT
 ><DT
->E.103. <A
+>E.130. <A
 HREF="release-8-4-7.html"
 >Release 8.4.7</A
 ></DT
 ><DT
->E.104. <A
+>E.131. <A
 HREF="release-8-4-6.html"
 >Release 8.4.6</A
 ></DT
 ><DT
->E.105. <A
+>E.132. <A
 HREF="release-8-4-5.html"
 >Release 8.4.5</A
 ></DT
 ><DT
->E.106. <A
+>E.133. <A
 HREF="release-8-4-4.html"
 >Release 8.4.4</A
 ></DT
 ><DT
->E.107. <A
+>E.134. <A
 HREF="release-8-4-3.html"
 >Release 8.4.3</A
 ></DT
 ><DT
->E.108. <A
+>E.135. <A
 HREF="release-8-4-2.html"
 >Release 8.4.2</A
 ></DT
 ><DT
->E.109. <A
+>E.136. <A
 HREF="release-8-4-1.html"
 >Release 8.4.1</A
 ></DT
 ><DT
->E.110. <A
+>E.137. <A
 HREF="release-8-4.html"
 >Release 8.4</A
 ></DT
 ><DT
->E.111. <A
+>E.138. <A
 HREF="release-8-3-23.html"
 >Release 8.3.23</A
 ></DT
 ><DT
->E.112. <A
+>E.139. <A
 HREF="release-8-3-22.html"
 >Release 8.3.22</A
 ></DT
 ><DT
->E.113. <A
+>E.140. <A
 HREF="release-8-3-21.html"
 >Release 8.3.21</A
 ></DT
 ><DT
->E.114. <A
+>E.141. <A
 HREF="release-8-3-20.html"
 >Release 8.3.20</A
 ></DT
 ><DT
->E.115. <A
+>E.142. <A
 HREF="release-8-3-19.html"
 >Release 8.3.19</A
 ></DT
 ><DT
->E.116. <A
+>E.143. <A
 HREF="release-8-3-18.html"
 >Release 8.3.18</A
 ></DT
 ><DT
->E.117. <A
+>E.144. <A
 HREF="release-8-3-17.html"
 >Release 8.3.17</A
 ></DT
 ><DT
->E.118. <A
+>E.145. <A
 HREF="release-8-3-16.html"
 >Release 8.3.16</A
 ></DT
 ><DT
->E.119. <A
+>E.146. <A
 HREF="release-8-3-15.html"
 >Release 8.3.15</A
 ></DT
 ><DT
->E.120. <A
+>E.147. <A
 HREF="release-8-3-14.html"
 >Release 8.3.14</A
 ></DT
 ><DT
->E.121. <A
+>E.148. <A
 HREF="release-8-3-13.html"
 >Release 8.3.13</A
 ></DT
 ><DT
->E.122. <A
+>E.149. <A
 HREF="release-8-3-12.html"
 >Release 8.3.12</A
 ></DT
 ><DT
->E.123. <A
+>E.150. <A
 HREF="release-8-3-11.html"
 >Release 8.3.11</A
 ></DT
 ><DT
->E.124. <A
+>E.151. <A
 HREF="release-8-3-10.html"
 >Release 8.3.10</A
 ></DT
 ><DT
->E.125. <A
+>E.152. <A
 HREF="release-8-3-9.html"
 >Release 8.3.9</A
 ></DT
 ><DT
->E.126. <A
+>E.153. <A
 HREF="release-8-3-8.html"
 >Release 8.3.8</A
 ></DT
 ><DT
->E.127. <A
+>E.154. <A
 HREF="release-8-3-7.html"
 >Release 8.3.7</A
 ></DT
 ><DT
->E.128. <A
+>E.155. <A
 HREF="release-8-3-6.html"
 >Release 8.3.6</A
 ></DT
 ><DT
->E.129. <A
+>E.156. <A
 HREF="release-8-3-5.html"
 >Release 8.3.5</A
 ></DT
 ><DT
->E.130. <A
+>E.157. <A
 HREF="release-8-3-4.html"
 >Release 8.3.4</A
 ></DT
 ><DT
->E.131. <A
+>E.158. <A
 HREF="release-8-3-3.html"
 >Release 8.3.3</A
 ></DT
 ><DT
->E.132. <A
+>E.159. <A
 HREF="release-8-3-2.html"
 >Release 8.3.2</A
 ></DT
 ><DT
->E.133. <A
+>E.160. <A
 HREF="release-8-3-1.html"
 >Release 8.3.1</A
 ></DT
 ><DT
->E.134. <A
+>E.161. <A
 HREF="release-8-3.html"
 >Release 8.3</A
 ></DT
 ><DT
->E.135. <A
+>E.162. <A
 HREF="release-8-2-23.html"
 >Release 8.2.23</A
 ></DT
 ><DT
->E.136. <A
+>E.163. <A
 HREF="release-8-2-22.html"
 >Release 8.2.22</A
 ></DT
 ><DT
->E.137. <A
+>E.164. <A
 HREF="release-8-2-21.html"
 >Release 8.2.21</A
 ></DT
 ><DT
->E.138. <A
+>E.165. <A
 HREF="release-8-2-20.html"
 >Release 8.2.20</A
 ></DT
 ><DT
->E.139. <A
+>E.166. <A
 HREF="release-8-2-19.html"
 >Release 8.2.19</A
 ></DT
 ><DT
->E.140. <A
+>E.167. <A
 HREF="release-8-2-18.html"
 >Release 8.2.18</A
 ></DT
 ><DT
->E.141. <A
+>E.168. <A
 HREF="release-8-2-17.html"
 >Release 8.2.17</A
 ></DT
 ><DT
->E.142. <A
+>E.169. <A
 HREF="release-8-2-16.html"
 >Release 8.2.16</A
 ></DT
 ><DT
->E.143. <A
+>E.170. <A
 HREF="release-8-2-15.html"
 >Release 8.2.15</A
 ></DT
 ><DT
->E.144. <A
+>E.171. <A
 HREF="release-8-2-14.html"
 >Release 8.2.14</A
 ></DT
 ><DT
->E.145. <A
+>E.172. <A
 HREF="release-8-2-13.html"
 >Release 8.2.13</A
 ></DT
 ><DT
->E.146. <A
+>E.173. <A
 HREF="release-8-2-12.html"
 >Release 8.2.12</A
 ></DT
 ><DT
->E.147. <A
+>E.174. <A
 HREF="release-8-2-11.html"
 >Release 8.2.11</A
 ></DT
 ><DT
->E.148. <A
+>E.175. <A
 HREF="release-8-2-10.html"
 >Release 8.2.10</A
 ></DT
 ><DT
->E.149. <A
+>E.176. <A
 HREF="release-8-2-9.html"
 >Release 8.2.9</A
 ></DT
 ><DT
->E.150. <A
+>E.177. <A
 HREF="release-8-2-8.html"
 >Release 8.2.8</A
 ></DT
 ><DT
->E.151. <A
+>E.178. <A
 HREF="release-8-2-7.html"
 >Release 8.2.7</A
 ></DT
 ><DT
->E.152. <A
+>E.179. <A
 HREF="release-8-2-6.html"
 >Release 8.2.6</A
 ></DT
 ><DT
->E.153. <A
+>E.180. <A
 HREF="release-8-2-5.html"
 >Release 8.2.5</A
 ></DT
 ><DT
->E.154. <A
+>E.181. <A
 HREF="release-8-2-4.html"
 >Release 8.2.4</A
 ></DT
 ><DT
->E.155. <A
+>E.182. <A
 HREF="release-8-2-3.html"
 >Release 8.2.3</A
 ></DT
 ><DT
->E.156. <A
+>E.183. <A
 HREF="release-8-2-2.html"
 >Release 8.2.2</A
 ></DT
 ><DT
->E.157. <A
+>E.184. <A
 HREF="release-8-2-1.html"
 >Release 8.2.1</A
 ></DT
 ><DT
->E.158. <A
+>E.185. <A
 HREF="release-8-2.html"
 >Release 8.2</A
 ></DT
 ><DT
->E.159. <A
+>E.186. <A
 HREF="release-8-1-23.html"
 >Release 8.1.23</A
 ></DT
 ><DT
->E.160. <A
+>E.187. <A
 HREF="release-8-1-22.html"
 >Release 8.1.22</A
 ></DT
 ><DT
->E.161. <A
+>E.188. <A
 HREF="release-8-1-21.html"
 >Release 8.1.21</A
 ></DT
 ><DT
->E.162. <A
+>E.189. <A
 HREF="release-8-1-20.html"
 >Release 8.1.20</A
 ></DT
 ><DT
->E.163. <A
+>E.190. <A
 HREF="release-8-1-19.html"
 >Release 8.1.19</A
 ></DT
 ><DT
->E.164. <A
+>E.191. <A
 HREF="release-8-1-18.html"
 >Release 8.1.18</A
 ></DT
 ><DT
->E.165. <A
+>E.192. <A
 HREF="release-8-1-17.html"
 >Release 8.1.17</A
 ></DT
 ><DT
->E.166. <A
+>E.193. <A
 HREF="release-8-1-16.html"
 >Release 8.1.16</A
 ></DT
 ><DT
->E.167. <A
+>E.194. <A
 HREF="release-8-1-15.html"
 >Release 8.1.15</A
 ></DT
 ><DT
->E.168. <A
+>E.195. <A
 HREF="release-8-1-14.html"
 >Release 8.1.14</A
 ></DT
 ><DT
->E.169. <A
+>E.196. <A
 HREF="release-8-1-13.html"
 >Release 8.1.13</A
 ></DT
 ><DT
->E.170. <A
+>E.197. <A
 HREF="release-8-1-12.html"
 >Release 8.1.12</A
 ></DT
 ><DT
->E.171. <A
+>E.198. <A
 HREF="release-8-1-11.html"
 >Release 8.1.11</A
 ></DT
 ><DT
->E.172. <A
+>E.199. <A
 HREF="release-8-1-10.html"
 >Release 8.1.10</A
 ></DT
 ><DT
->E.173. <A
+>E.200. <A
 HREF="release-8-1-9.html"
 >Release 8.1.9</A
 ></DT
 ><DT
->E.174. <A
+>E.201. <A
 HREF="release-8-1-8.html"
 >Release 8.1.8</A
 ></DT
 ><DT
->E.175. <A
+>E.202. <A
 HREF="release-8-1-7.html"
 >Release 8.1.7</A
 ></DT
 ><DT
->E.176. <A
+>E.203. <A
 HREF="release-8-1-6.html"
 >Release 8.1.6</A
 ></DT
 ><DT
->E.177. <A
+>E.204. <A
 HREF="release-8-1-5.html"
 >Release 8.1.5</A
 ></DT
 ><DT
->E.178. <A
+>E.205. <A
 HREF="release-8-1-4.html"
 >Release 8.1.4</A
 ></DT
 ><DT
->E.179. <A
+>E.206. <A
 HREF="release-8-1-3.html"
 >Release 8.1.3</A
 ></DT
 ><DT
->E.180. <A
+>E.207. <A
 HREF="release-8-1-2.html"
 >Release 8.1.2</A
 ></DT
 ><DT
->E.181. <A
+>E.208. <A
 HREF="release-8-1-1.html"
 >Release 8.1.1</A
 ></DT
 ><DT
->E.182. <A
+>E.209. <A
 HREF="release-8-1.html"
 >Release 8.1</A
 ></DT
 ><DT
->E.183. <A
+>E.210. <A
 HREF="release-8-0-26.html"
 >Release 8.0.26</A
 ></DT
 ><DT
->E.184. <A
+>E.211. <A
 HREF="release-8-0-25.html"
 >Release 8.0.25</A
 ></DT
 ><DT
->E.185. <A
+>E.212. <A
 HREF="release-8-0-24.html"
 >Release 8.0.24</A
 ></DT
 ><DT
->E.186. <A
+>E.213. <A
 HREF="release-8-0-23.html"
 >Release 8.0.23</A
 ></DT
 ><DT
->E.187. <A
+>E.214. <A
 HREF="release-8-0-22.html"
 >Release 8.0.22</A
 ></DT
 ><DT
->E.188. <A
+>E.215. <A
 HREF="release-8-0-21.html"
 >Release 8.0.21</A
 ></DT
 ><DT
->E.189. <A
+>E.216. <A
 HREF="release-8-0-20.html"
 >Release 8.0.20</A
 ></DT
 ><DT
->E.190. <A
+>E.217. <A
 HREF="release-8-0-19.html"
 >Release 8.0.19</A
 ></DT
 ><DT
->E.191. <A
+>E.218. <A
 HREF="release-8-0-18.html"
 >Release 8.0.18</A
 ></DT
 ><DT
->E.192. <A
+>E.219. <A
 HREF="release-8-0-17.html"
 >Release 8.0.17</A
 ></DT
 ><DT
->E.193. <A
+>E.220. <A
 HREF="release-8-0-16.html"
 >Release 8.0.16</A
 ></DT
 ><DT
->E.194. <A
+>E.221. <A
 HREF="release-8-0-15.html"
 >Release 8.0.15</A
 ></DT
 ><DT
->E.195. <A
+>E.222. <A
 HREF="release-8-0-14.html"
 >Release 8.0.14</A
 ></DT
 ><DT
->E.196. <A
+>E.223. <A
 HREF="release-8-0-13.html"
 >Release 8.0.13</A
 ></DT
 ><DT
->E.197. <A
+>E.224. <A
 HREF="release-8-0-12.html"
 >Release 8.0.12</A
 ></DT
 ><DT
->E.198. <A
+>E.225. <A
 HREF="release-8-0-11.html"
 >Release 8.0.11</A
 ></DT
 ><DT
->E.199. <A
+>E.226. <A
 HREF="release-8-0-10.html"
 >Release 8.0.10</A
 ></DT
 ><DT
->E.200. <A
+>E.227. <A
 HREF="release-8-0-9.html"
 >Release 8.0.9</A
 ></DT
 ><DT
->E.201. <A
+>E.228. <A
 HREF="release-8-0-8.html"
 >Release 8.0.8</A
 ></DT
 ><DT
->E.202. <A
+>E.229. <A
 HREF="release-8-0-7.html"
 >Release 8.0.7</A
 ></DT
 ><DT
->E.203. <A
+>E.230. <A
 HREF="release-8-0-6.html"
 >Release 8.0.6</A
 ></DT
 ><DT
->E.204. <A
+>E.231. <A
 HREF="release-8-0-5.html"
 >Release 8.0.5</A
 ></DT
 ><DT
->E.205. <A
+>E.232. <A
 HREF="release-8-0-4.html"
 >Release 8.0.4</A
 ></DT
 ><DT
->E.206. <A
+>E.233. <A
 HREF="release-8-0-3.html"
 >Release 8.0.3</A
 ></DT
 ><DT
->E.207. <A
+>E.234. <A
 HREF="release-8-0-2.html"
 >Release 8.0.2</A
 ></DT
 ><DT
->E.208. <A
+>E.235. <A
 HREF="release-8-0-1.html"
 >Release 8.0.1</A
 ></DT
 ><DT
->E.209. <A
+>E.236. <A
 HREF="release-8-0.html"
 >Release 8.0</A
 ></DT
 ><DT
->E.210. <A
+>E.237. <A
 HREF="release-7-4-30.html"
 >Release 7.4.30</A
 ></DT
 ><DT
->E.211. <A
+>E.238. <A
 HREF="release-7-4-29.html"
 >Release 7.4.29</A
 ></DT
 ><DT
->E.212. <A
+>E.239. <A
 HREF="release-7-4-28.html"
 >Release 7.4.28</A
 ></DT
 ><DT
->E.213. <A
+>E.240. <A
 HREF="release-7-4-27.html"
 >Release 7.4.27</A
 ></DT
 ><DT
->E.214. <A
+>E.241. <A
 HREF="release-7-4-26.html"
 >Release 7.4.26</A
 ></DT
 ><DT
->E.215. <A
+>E.242. <A
 HREF="release-7-4-25.html"
 >Release 7.4.25</A
 ></DT
 ><DT
->E.216. <A
+>E.243. <A
 HREF="release-7-4-24.html"
 >Release 7.4.24</A
 ></DT
 ><DT
->E.217. <A
+>E.244. <A
 HREF="release-7-4-23.html"
 >Release 7.4.23</A
 ></DT
 ><DT
->E.218. <A
+>E.245. <A
 HREF="release-7-4-22.html"
 >Release 7.4.22</A
 ></DT
 ><DT
->E.219. <A
+>E.246. <A
 HREF="release-7-4-21.html"
 >Release 7.4.21</A
 ></DT
 ><DT
->E.220. <A
+>E.247. <A
 HREF="release-7-4-20.html"
 >Release 7.4.20</A
 ></DT
 ><DT
->E.221. <A
+>E.248. <A
 HREF="release-7-4-19.html"
 >Release 7.4.19</A
 ></DT
 ><DT
->E.222. <A
+>E.249. <A
 HREF="release-7-4-18.html"
 >Release 7.4.18</A
 ></DT
 ><DT
->E.223. <A
+>E.250. <A
 HREF="release-7-4-17.html"
 >Release 7.4.17</A
 ></DT
 ><DT
->E.224. <A
+>E.251. <A
 HREF="release-7-4-16.html"
 >Release 7.4.16</A
 ></DT
 ><DT
->E.225. <A
+>E.252. <A
 HREF="release-7-4-15.html"
 >Release 7.4.15</A
 ></DT
 ><DT
->E.226. <A
+>E.253. <A
 HREF="release-7-4-14.html"
 >Release 7.4.14</A
 ></DT
 ><DT
->E.227. <A
+>E.254. <A
 HREF="release-7-4-13.html"
 >Release 7.4.13</A
 ></DT
 ><DT
->E.228. <A
+>E.255. <A
 HREF="release-7-4-12.html"
 >Release 7.4.12</A
 ></DT
 ><DT
->E.229. <A
+>E.256. <A
 HREF="release-7-4-11.html"
 >Release 7.4.11</A
 ></DT
 ><DT
->E.230. <A
+>E.257. <A
 HREF="release-7-4-10.html"
 >Release 7.4.10</A
 ></DT
 ><DT
->E.231. <A
+>E.258. <A
 HREF="release-7-4-9.html"
 >Release 7.4.9</A
 ></DT
 ><DT
->E.232. <A
+>E.259. <A
 HREF="release-7-4-8.html"
 >Release 7.4.8</A
 ></DT
 ><DT
->E.233. <A
+>E.260. <A
 HREF="release-7-4-7.html"
 >Release 7.4.7</A
 ></DT
 ><DT
->E.234. <A
+>E.261. <A
 HREF="release-7-4-6.html"
 >Release 7.4.6</A
 ></DT
 ><DT
->E.235. <A
+>E.262. <A
 HREF="release-7-4-5.html"
 >Release 7.4.5</A
 ></DT
 ><DT
->E.236. <A
+>E.263. <A
 HREF="release-7-4-4.html"
 >Release 7.4.4</A
 ></DT
 ><DT
->E.237. <A
+>E.264. <A
 HREF="release-7-4-3.html"
 >Release 7.4.3</A
 ></DT
 ><DT
->E.238. <A
+>E.265. <A
 HREF="release-7-4-2.html"
 >Release 7.4.2</A
 ></DT
 ><DT
->E.239. <A
+>E.266. <A
 HREF="release-7-4-1.html"
 >Release 7.4.1</A
 ></DT
 ><DT
->E.240. <A
+>E.267. <A
 HREF="release-7-4.html"
 >Release 7.4</A
 ></DT
 ><DT
->E.241. <A
+>E.268. <A
 HREF="release-7-3-21.html"
 >Release 7.3.21</A
 ></DT
 ><DT
->E.242. <A
+>E.269. <A
 HREF="release-7-3-20.html"
 >Release 7.3.20</A
 ></DT
 ><DT
->E.243. <A
+>E.270. <A
 HREF="release-7-3-19.html"
 >Release 7.3.19</A
 ></DT
 ><DT
->E.244. <A
+>E.271. <A
 HREF="release-7-3-18.html"
 >Release 7.3.18</A
 ></DT
 ><DT
->E.245. <A
+>E.272. <A
 HREF="release-7-3-17.html"
 >Release 7.3.17</A
 ></DT
 ><DT
->E.246. <A
+>E.273. <A
 HREF="release-7-3-16.html"
 >Release 7.3.16</A
 ></DT
 ><DT
->E.247. <A
+>E.274. <A
 HREF="release-7-3-15.html"
 >Release 7.3.15</A
 ></DT
 ><DT
->E.248. <A
+>E.275. <A
 HREF="release-7-3-14.html"
 >Release 7.3.14</A
 ></DT
 ><DT
->E.249. <A
+>E.276. <A
 HREF="release-7-3-13.html"
 >Release 7.3.13</A
 ></DT
 ><DT
->E.250. <A
+>E.277. <A
 HREF="release-7-3-12.html"
 >Release 7.3.12</A
 ></DT
 ><DT
->E.251. <A
+>E.278. <A
 HREF="release-7-3-11.html"
 >Release 7.3.11</A
 ></DT
 ><DT
->E.252. <A
+>E.279. <A
 HREF="release-7-3-10.html"
 >Release 7.3.10</A
 ></DT
 ><DT
->E.253. <A
+>E.280. <A
 HREF="release-7-3-9.html"
 >Release 7.3.9</A
 ></DT
 ><DT
->E.254. <A
+>E.281. <A
 HREF="release-7-3-8.html"
 >Release 7.3.8</A
 ></DT
 ><DT
->E.255. <A
+>E.282. <A
 HREF="release-7-3-7.html"
 >Release 7.3.7</A
 ></DT
 ><DT
->E.256. <A
+>E.283. <A
 HREF="release-7-3-6.html"
 >Release 7.3.6</A
 ></DT
 ><DT
->E.257. <A
+>E.284. <A
 HREF="release-7-3-5.html"
 >Release 7.3.5</A
 ></DT
 ><DT
->E.258. <A
+>E.285. <A
 HREF="release-7-3-4.html"
 >Release 7.3.4</A
 ></DT
 ><DT
->E.259. <A
+>E.286. <A
 HREF="release-7-3-3.html"
 >Release 7.3.3</A
 ></DT
 ><DT
->E.260. <A
+>E.287. <A
 HREF="release-7-3-2.html"
 >Release 7.3.2</A
 ></DT
 ><DT
->E.261. <A
+>E.288. <A
 HREF="release-7-3-1.html"
 >Release 7.3.1</A
 ></DT
 ><DT
->E.262. <A
+>E.289. <A
 HREF="release-7-3.html"
 >Release 7.3</A
 ></DT
 ><DT
->E.263. <A
+>E.290. <A
 HREF="release-7-2-8.html"
 >Release 7.2.8</A
 ></DT
 ><DT
->E.264. <A
+>E.291. <A
 HREF="release-7-2-7.html"
 >Release 7.2.7</A
 ></DT
 ><DT
->E.265. <A
+>E.292. <A
 HREF="release-7-2-6.html"
 >Release 7.2.6</A
 ></DT
 ><DT
->E.266. <A
+>E.293. <A
 HREF="release-7-2-5.html"
 >Release 7.2.5</A
 ></DT
 ><DT
->E.267. <A
+>E.294. <A
 HREF="release-7-2-4.html"
 >Release 7.2.4</A
 ></DT
 ><DT
->E.268. <A
+>E.295. <A
 HREF="release-7-2-3.html"
 >Release 7.2.3</A
 ></DT
 ><DT
->E.269. <A
+>E.296. <A
 HREF="release-7-2-2.html"
 >Release 7.2.2</A
 ></DT
 ><DT
->E.270. <A
+>E.297. <A
 HREF="release-7-2-1.html"
 >Release 7.2.1</A
 ></DT
 ><DT
->E.271. <A
+>E.298. <A
 HREF="release-7-2.html"
 >Release 7.2</A
 ></DT
 ><DT
->E.272. <A
+>E.299. <A
 HREF="release-7-1-3.html"
 >Release 7.1.3</A
 ></DT
 ><DT
->E.273. <A
+>E.300. <A
 HREF="release-7-1-2.html"
 >Release 7.1.2</A
 ></DT
 ><DT
->E.274. <A
+>E.301. <A
 HREF="release-7-1-1.html"
 >Release 7.1.1</A
 ></DT
 ><DT
->E.275. <A
+>E.302. <A
 HREF="release-7-1.html"
 >Release 7.1</A
 ></DT
 ><DT
->E.276. <A
+>E.303. <A
 HREF="release-7-0-3.html"
 >Release 7.0.3</A
 ></DT
 ><DT
->E.277. <A
+>E.304. <A
 HREF="release-7-0-2.html"
 >Release 7.0.2</A
 ></DT
 ><DT
->E.278. <A
+>E.305. <A
 HREF="release-7-0-1.html"
 >Release 7.0.1</A
 ></DT
 ><DT
->E.279. <A
+>E.306. <A
 HREF="release-7-0.html"
 >Release 7.0</A
 ></DT
 ><DT
->E.280. <A
+>E.307. <A
 HREF="release-6-5-3.html"
 >Release 6.5.3</A
 ></DT
 ><DT
->E.281. <A
+>E.308. <A
 HREF="release-6-5-2.html"
 >Release 6.5.2</A
 ></DT
 ><DT
->E.282. <A
+>E.309. <A
 HREF="release-6-5-1.html"
 >Release 6.5.1</A
 ></DT
 ><DT
->E.283. <A
+>E.310. <A
 HREF="release-6-5.html"
 >Release 6.5</A
 ></DT
 ><DT
->E.284. <A
+>E.311. <A
 HREF="release-6-4-2.html"
 >Release 6.4.2</A
 ></DT
 ><DT
->E.285. <A
+>E.312. <A
 HREF="release-6-4-1.html"
 >Release 6.4.1</A
 ></DT
 ><DT
->E.286. <A
+>E.313. <A
 HREF="release-6-4.html"
 >Release 6.4</A
 ></DT
 ><DT
->E.287. <A
+>E.314. <A
 HREF="release-6-3-2.html"
 >Release 6.3.2</A
 ></DT
 ><DT
->E.288. <A
+>E.315. <A
 HREF="release-6-3-1.html"
 >Release 6.3.1</A
 ></DT
 ><DT
->E.289. <A
+>E.316. <A
 HREF="release-6-3.html"
 >Release 6.3</A
 ></DT
 ><DT
->E.290. <A
+>E.317. <A
 HREF="release-6-2-1.html"
 >Release 6.2.1</A
 ></DT
 ><DT
->E.291. <A
+>E.318. <A
 HREF="release-6-2.html"
 >Release 6.2</A
 ></DT
 ><DT
->E.292. <A
+>E.319. <A
 HREF="release-6-1-1.html"
 >Release 6.1.1</A
 ></DT
 ><DT
->E.293. <A
+>E.320. <A
 HREF="release-6-1.html"
 >Release 6.1</A
 ></DT
 ><DT
->E.294. <A
+>E.321. <A
 HREF="release-6-0.html"
 >Release 6.0</A
 ></DT
 ><DT
->E.295. <A
+>E.322. <A
 HREF="release-1-09.html"
 >Release 1.09</A
 ></DT
 ><DT
->E.296. <A
+>E.323. <A
 HREF="release-1-02.html"
 >Release 1.02</A
 ></DT
 ><DT
->E.297. <A
+>E.324. <A
 HREF="release-1-01.html"
 >Release 1.01</A
 ></DT
 ><DT
->E.298. <A
+>E.325. <A
 HREF="release-1-0.html"
 >Release 1.0</A
 ></DT
 ><DT
->E.299. <A
+>E.326. <A
 HREF="release-0-03.html"
 ><SPAN
 CLASS="PRODUCTNAME"
@@ -1671,7 +1806,7 @@
 > Release 0.03</A
 ></DT
 ><DT
->E.300. <A
+>E.327. <A
 HREF="release-0-02.html"
 ><SPAN
 CLASS="PRODUCTNAME"
@@ -1679,7 +1814,7 @@
 > Release 0.02</A
 ></DT
 ><DT
->E.301. <A
+>E.328. <A
 HREF="release-0-01.html"
 ><SPAN
 CLASS="PRODUCTNAME"
@@ -2041,7 +2176,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="row-estimation-examples.html"
+HREF="planner-stats-security.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -2069,7 +2204,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Row Estimation Examples</TD
+>Planner Statistics and Security</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-initdb.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-initdb.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-initdb.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-initdb.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN97358"
+NAME="AEN97711"
 ></A
 ><H2
 >Name</H2
@@ -106,7 +106,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN97362"
+NAME="AEN97715"
 ></A
 ><H2
 >Synopsis</H2
@@ -297,7 +297,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97414"
+NAME="AEN97767"
 ></A
 ><H2
 >Options</H2
@@ -877,7 +877,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97620"
+NAME="AEN97973"
 ></A
 ><H2
 >Environment</H2
@@ -935,7 +935,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97639"
+NAME="AEN97992"
 ></A
 ><H2
 >Notes</H2
@@ -953,7 +953,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97644"
+NAME="AEN97997"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/applevel-consistency.html postgresql-9.5-9.5.8/doc/src/sgml/html/applevel-consistency.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/applevel-consistency.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/applevel-consistency.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Concurrency Control"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgbasebackup.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgbasebackup.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgbasebackup.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgbasebackup.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN90833"
+NAME="AEN91163"
 ></A
 ><H2
 >Name</H2
@@ -106,7 +106,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN90837"
+NAME="AEN91167"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90842"
+NAME="AEN91172"
 ></A
 ><H2
 >   Description
@@ -235,7 +235,7 @@
 >      There is no guarantee that all WAL files required for the backup are archived
       at the end of backup. If you are planning to use the backup for an archive
       recovery and want to ensure that all required files are available at that moment,
-      you need to include them into the backup by using <TT
+      you need to include them into the backup by using the <TT
 CLASS="LITERAL"
 >-x</TT
 > option.
@@ -270,7 +270,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90880"
+NAME="AEN91210"
 ></A
 ><H2
 >Options</H2
@@ -726,7 +726,7 @@
 ><DD
 ><P
 >        Enables gzip compression of tar file output, and specifies the
-        compression level (1 through 9, 9 being best
+        compression level (0 through 9, 0 being no compression and 9 being best
         compression). Compression is only available when using the tar
         format.
        </P
@@ -764,7 +764,7 @@
 ></DT
 ><DD
 ><P
->        Sets checkpoint mode to fast or spread (default) (see <A
+>        Sets checkpoint mode to fast (immediate) or spread (default) (see <A
 HREF="continuous-archiving.html#BACKUP-LOWLEVEL-BASE-BACKUP"
 >Section 24.3.3</A
 >).
@@ -1112,7 +1112,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91159"
+NAME="AEN91489"
 ></A
 ><H2
 >Environment</H2
@@ -1134,11 +1134,24 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91165"
+NAME="AEN91495"
 ></A
 ><H2
 >Notes</H2
 ><P
+>   At the beginning of the backup, a checkpoint needs to be written on the
+   server the backup is taken from.  Especially if the option
+   <TT
+CLASS="LITERAL"
+>--checkpoint=fast</TT
+> is not used, this can take some time
+   during which <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> will be appear
+   to be idle.
+  </P
+><P
 >   The backup will include all files in the data directory and tablespaces,
    including the configuration files and any additional files placed in the
    directory by third parties. But only regular files and directories are
@@ -1195,7 +1208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91178"
+NAME="AEN91511"
 ></A
 ><H2
 >Examples</H2
@@ -1282,7 +1295,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91202"
+NAME="AEN91535"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgconfig.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgconfig.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgconfig.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgconfig.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN91936"
+NAME="AEN92270"
 ></A
 ><H2
 >Name</H2
@@ -106,7 +106,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN91940"
+NAME="AEN92274"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91945"
+NAME="AEN92279"
 ></A
 ><H2
 >Description</H2
@@ -148,7 +148,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91951"
+NAME="AEN92285"
 ></A
 ><H2
 >Options</H2
@@ -522,7 +522,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN92104"
+NAME="AEN92438"
 ></A
 ><H2
 >Notes</H2
@@ -595,7 +595,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN92125"
+NAME="AEN92459"
 ></A
 ><H2
 >Example</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgcontroldata.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgcontroldata.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgcontroldata.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgcontroldata.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN97776"
+NAME="AEN98129"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN97780"
+NAME="AEN98133"
 ></A
 ><H2
 >Synopsis</H2
@@ -184,7 +184,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97801"
+NAME="AEN98154"
 ></A
 ><H2
 >Environment</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pg-ctl.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pg-ctl.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pg-ctl.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pg-ctl.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN97817"
+NAME="AEN98170"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN97821"
+NAME="AEN98174"
 ></A
 ><H2
 >Synopsis</H2
@@ -1175,7 +1175,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98205"
+NAME="AEN98558"
 ></A
 ><H2
 >Environment</H2
@@ -1236,7 +1236,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98224"
+NAME="AEN98577"
 ></A
 ><H2
 >Files</H2
@@ -1484,7 +1484,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98295"
+NAME="AEN98648"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pg-dumpall.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pg-dumpall.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pg-dumpall.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pg-dumpall.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN92881"
+NAME="AEN93224"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN92885"
+NAME="AEN93228"
 ></A
 ><H2
 >Synopsis</H2
@@ -213,7 +213,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN92911"
+NAME="AEN93254"
 ></A
 ><H2
 >Options</H2
@@ -684,9 +684,28 @@
 ></DT
 ><DD
 ><P
->        Force quoting of all identifiers.  This may be useful when dumping a
-        database for migration to a future version that may have introduced
-        additional keywords.
+>        Force quoting of all identifiers.  This option is recommended when
+        dumping a database from a server whose <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+        major version is different from <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+>'s, or when
+        the output is intended to be loaded into a server of a different
+        major version.  By default, <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> quotes only
+        identifiers that are reserved words in its own major version.
+        This sometimes results in compatibility issues when dealing with
+        servers of other versions that may have slightly different sets
+        of reserved words.  Using <TT
+CLASS="OPTION"
+>--quote-all-identifiers</TT
+> prevents
+        such issues, at the price of a harder-to-read dump script.
        </P
 ></DD
 ><DT
@@ -1008,7 +1027,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93202"
+NAME="AEN93549"
 ></A
 ><H2
 >Environment</H2
@@ -1056,7 +1075,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93220"
+NAME="AEN93567"
 ></A
 ><H2
 >Notes</H2
@@ -1141,7 +1160,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93242"
+NAME="AEN93589"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgdump.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgdump.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgdump.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgdump.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN92138"
+NAME="AEN92472"
 ></A
 ><H2
 >Name</H2
@@ -107,7 +107,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN92142"
+NAME="AEN92476"
 ></A
 ><H2
 >Synopsis</H2
@@ -326,11 +326,14 @@
         <TT
 CLASS="OPTION"
 >--schema-only</TT
-> is specified, so the <TT
+> is specified.  The <TT
 CLASS="OPTION"
 >-b</TT
 >
-        switch is only useful to add large objects to selective dumps.
+        switch is therefore only useful to add large objects to dumps
+        where a specific schema or table has been requested.  Note that
+        blobs are considered data and therefore will be included when
+        --data-only is used, but not when --schema-only is.
        </P
 ></DD
 ><DT
@@ -1430,6 +1433,17 @@
 > to on instead, allowing the user
         to dump the parts of the contents of the table that they have access to.
        </P
+><P
+>        Note that if you use this option currently, you probably also want
+        the dump be in <TT
+CLASS="COMMAND"
+>INSERT</TT
+> format, as the
+        <TT
+CLASS="COMMAND"
+>COPY FROM</TT
+> during restore does not support row security.
+       </P
 ></DD
 ><DT
 ><TT
@@ -1616,9 +1630,28 @@
 ></DT
 ><DD
 ><P
->        Force quoting of all identifiers.  This may be useful when dumping a
-        database for migration to a future version that may have introduced
-        additional keywords.
+>        Force quoting of all identifiers.  This option is recommended when
+        dumping a database from a server whose <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+        major version is different from <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>'s, or when
+        the output is intended to be loaded into a server of a different
+        major version.  By default, <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> quotes only
+        identifiers that are reserved words in its own major version.
+        This sometimes results in compatibility issues when dealing with
+        servers of other versions that may have slightly different sets
+        of reserved words.  Using <TT
+CLASS="OPTION"
+>--quote-all-identifiers</TT
+> prevents
+        such issues, at the price of a harder-to-read dump script.
        </P
 ></DD
 ><DT
@@ -2029,7 +2062,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN92738"
+NAME="AEN93079"
 ></A
 ><H2
 >Environment</H2
@@ -2254,6 +2287,15 @@
    dump was taken from a server of that version.  Loading a dump file
    into an older server may require manual editing of the dump file
    to remove syntax not understood by the older server.
+   Use of the <TT
+CLASS="OPTION"
+>--quote-all-identifiers</TT
+> option is recommended
+   in cross-version cases, as it can prevent problems arising from varying
+   reserved-word lists in different <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> versions.
   </P
 ></DIV
 ><DIV
@@ -2490,7 +2532,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN92864"
+NAME="AEN93207"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pg-isready.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pg-isready.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pg-isready.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pg-isready.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN93254"
+NAME="AEN93601"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN93258"
+NAME="AEN93605"
 ></A
 ><H2
 >Synopsis</H2
@@ -369,7 +369,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93350"
+NAME="AEN93697"
 ></A
 ><H2
 >Exit Status</H2
@@ -399,7 +399,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93358"
+NAME="AEN93705"
 ></A
 ><H2
 >Environment</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgreceivexlog.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgreceivexlog.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgreceivexlog.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgreceivexlog.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN93403"
+NAME="AEN93750"
 ></A
 ><H2
 >Name</H2
@@ -106,7 +106,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN93407"
+NAME="AEN93754"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93412"
+NAME="AEN93759"
 ></A
 ><H2
 >   Description
@@ -220,7 +220,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93435"
+NAME="AEN93782"
 ></A
 ><H2
 >Options</H2
@@ -262,7 +262,7 @@
 ></DT
 ><DD
 ><P
->        Do not not error out when <TT
+>        Do not error out when <TT
 CLASS="OPTION"
 >--create-slot</TT
 > is specified
@@ -684,7 +684,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93597"
+NAME="AEN93944"
 ></A
 ><H2
 >Environment</H2
@@ -706,7 +706,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93603"
+NAME="AEN93950"
 ></A
 ><H2
 >Notes</H2
@@ -734,7 +734,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93609"
+NAME="AEN93956"
 ></A
 ><H2
 >Examples</H2
@@ -762,7 +762,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93617"
+NAME="AEN93964"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgrecvlogical.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgrecvlogical.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgrecvlogical.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgrecvlogical.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN93630"
+NAME="AEN93977"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN93634"
+NAME="AEN93981"
 ></A
 ><H2
 >Synopsis</H2
@@ -127,7 +127,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93639"
+NAME="AEN93986"
 ></A
 ><H2
 >Description</H2
@@ -153,7 +153,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93646"
+NAME="AEN93993"
 ></A
 ><H2
 >Options</H2
@@ -375,7 +375,7 @@
 ></DT
 ><DD
 ><P
->        Do not not error out when <TT
+>        Do not error out when <TT
 CLASS="OPTION"
 >--create-slot</TT
 > is specified
@@ -784,7 +784,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93863"
+NAME="AEN94210"
 ></A
 ><H2
 >Environment</H2
@@ -806,7 +806,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93869"
+NAME="AEN94216"
 ></A
 ><H2
 >Examples</H2
@@ -820,7 +820,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN93873"
+NAME="AEN94220"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgresetxlog.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgresetxlog.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgresetxlog.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgresetxlog.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN98310"
+NAME="AEN98663"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN98314"
+NAME="AEN98667"
 ></A
 ><H2
 >Synopsis</H2
@@ -547,7 +547,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98430"
+NAME="AEN98783"
 ></A
 ><H2
 >Notes</H2
@@ -566,6 +566,13 @@
 > to run.  But before you do
    so, make doubly certain that there is no server process still alive.
   </P
+><P
+>   <TT
+CLASS="COMMAND"
+>pg_resetxlog</TT
+> works only with servers of the same
+   major version.
+  </P
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgrestore.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgrestore.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgrestore.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgrestore.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN93885"
+NAME="AEN94232"
 ></A
 ><H2
 >Name</H2
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN93890"
+NAME="AEN94237"
 ></A
 ><H2
 >Synopsis</H2
@@ -1021,7 +1021,7 @@
 >
         format, as <TT
 CLASS="COMMAND"
->COPY TO</TT
+>COPY FROM</TT
 > does not support row security.
        </P
 ></DD
@@ -1367,7 +1367,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN94322"
+NAME="AEN94669"
 ></A
 ><H2
 >Environment</H2
@@ -1732,7 +1732,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN94416"
+NAME="AEN94763"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgrewind.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgrewind.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-pgrewind.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-pgrewind.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN98443"
+NAME="AEN98798"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN98447"
+NAME="AEN98802"
 ></A
 ><H2
 >Synopsis</H2
@@ -154,7 +154,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98466"
+NAME="AEN98821"
 ></A
 ><H2
 >Description</H2
@@ -260,7 +260,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98490"
+NAME="AEN98845"
 ></A
 ><H2
 >Options</H2
@@ -419,7 +419,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98553"
+NAME="AEN98908"
 ></A
 ><H2
 >Environment</H2
@@ -444,14 +444,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98560"
+NAME="AEN98915"
 ></A
 ><H2
 >Notes</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN98562"
+NAME="AEN98917"
 ></A
 ><H3
 >How it works</H3
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-postgres.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-postgres.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-postgres.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-postgres.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN99329"
+NAME="AEN99682"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN99333"
+NAME="AEN99686"
 ></A
 ><H2
 >Synopsis</H2
@@ -127,7 +127,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99338"
+NAME="AEN99691"
 ></A
 ><H2
 >Description</H2
@@ -269,7 +269,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN99370"
+NAME="AEN99723"
 ></A
 ><H3
 >General Purpose</H3
@@ -829,7 +829,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN99550"
+NAME="AEN99903"
 ></A
 ><H3
 >Semi-internal Options</H3
@@ -1039,7 +1039,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN99615"
+NAME="AEN99968"
 ></A
 ><H3
 >Options for Single-User Mode</H3
@@ -1124,7 +1124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99648"
+NAME="AEN100001"
 ></A
 ><H2
 >Environment</H2
@@ -1179,23 +1179,13 @@
 >      Default port number (preferably set in the configuration file)
      </P
 ></DD
-><DT
-><TT
-CLASS="ENVAR"
->TZ</TT
-></DT
-><DD
-><P
->      Server time zone
-     </P
-></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99677"
+NAME="AEN100025"
 ></A
 ><H2
 >Diagnostics</H2
@@ -1281,7 +1271,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99697"
+NAME="AEN100045"
 ></A
 ><H2
 >Notes</H2
@@ -1443,7 +1433,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99736"
+NAME="AEN100084"
 ></A
 ><H2
 >Usage</H2
@@ -1640,7 +1630,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99788"
+NAME="AEN100136"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-postmaster.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-postmaster.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-postmaster.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-postmaster.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN99801"
+NAME="AEN100149"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN99805"
+NAME="AEN100153"
 ></A
 ><H2
 >Synopsis</H2
@@ -127,7 +127,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99810"
+NAME="AEN100158"
 ></A
 ><H2
 >Description</H2
@@ -144,7 +144,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99815"
+NAME="AEN100163"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-psql.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-psql.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-psql.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-psql.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN94433"
+NAME="AEN94780"
 ></A
 ><H2
 >Name</H2
@@ -113,7 +113,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN94438"
+NAME="AEN94785"
 ></A
 ><H2
 >Synopsis</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN94447"
+NAME="AEN94794"
 ></A
 ><H2
 >Description</H2
@@ -1274,7 +1274,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN94837"
+NAME="AEN95184"
 ></A
 ><H2
 >Exit Status</H2
@@ -1295,7 +1295,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN94842"
+NAME="AEN95189"
 ></A
 ><H2
 >Usage</H2
@@ -1481,7 +1481,7 @@
 CLASS="USERINPUT"
 >psql testdb</KBD
 >
-psql (9.5.2)
+psql (9.5.8)
 Type "help" for help.
 
 testdb=&gt;</PRE
@@ -1716,10 +1716,12 @@
 >\c</TT
 > or <TT
 CLASS="LITERAL"
->\connect</TT
-> <TT
-CLASS="LITERAL"
->[ <TT
+>\connect [ -reuse-previous=<TT
+CLASS="REPLACEABLE"
+><I
+>on|off</I
+></TT
+> ] [ <TT
 CLASS="REPLACEABLE"
 ><I
 >dbname</I
@@ -1739,12 +1741,12 @@
 ><I
 >port</I
 ></TT
-> ] ] | <TT
+> ] | <TT
 CLASS="REPLACEABLE"
 ><I
 >conninfo</I
 ></TT
-> </TT
+> ]</TT
 ></DT
 ><DD
 ><P
@@ -1763,8 +1765,27 @@
 >.
         </P
 ><P
->        When using positional parameters, if any of
-        <TT
+>        Where the command omits database name, user, host, or port, the new
+        connection can reuse values from the previous connection.  By default,
+        values from the previous connection are reused except when processing
+        a <TT
+CLASS="LITERAL"
+>conninfo</TT
+> string.  Passing a first argument
+        of <TT
+CLASS="LITERAL"
+>-reuse-previous=on</TT
+>
+        or <TT
+CLASS="LITERAL"
+>-reuse-previous=off</TT
+> overrides that default.
+        When the command neither specifies nor reuses a particular parameter,
+        the <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> default is used.  Specifying any
+        of <TT
 CLASS="REPLACEABLE"
 ><I
 >dbname</I
@@ -1787,21 +1808,11 @@
 ><I
 >port</I
 ></TT
-> are omitted or
-        specified as <TT
+>
+        as <TT
 CLASS="LITERAL"
 >-</TT
->, the value of that parameter from
-        the previous connection is used; if there is no previous connection,
-        the <SPAN
-CLASS="APPLICATION"
->libpq</SPAN
-> default for the parameter's value
-        is used.  When using <TT
-CLASS="LITERAL"
->conninfo</TT
-> strings, no values from the
-        previous connection are used for the new connection.
+> is equivalent to omitting that parameter.
         </P
 ><P
 >        If the new connection is successfully made, the previous
@@ -2127,7 +2138,8 @@
 ></DT
 ><DD
 ><P
->        For each relation (table, view, index, sequence, or foreign table)
+>        For each relation (table, view, materialized view, index, sequence,
+        or foreign table)
         or composite type matching the
         <TT
 CLASS="REPLACEABLE"
@@ -2160,8 +2172,8 @@
 CLASS="LITERAL"
 >\d</TT
 > shows additional information
-        for each column: column values for sequences, indexed expression for
-        indexes and foreign data wrapper options for foreign tables.
+        for each column: column values for sequences, indexed expressions for
+        indexes, and foreign data wrapper options for foreign tables.
         </P
 ><P
 >        The command form <TT
@@ -2204,9 +2216,10 @@
 > argument, it is
         equivalent to <TT
 CLASS="COMMAND"
->\dtvsE</TT
+>\dtvmsE</TT
 > which will show a list of
-        all visible tables, views, sequences and foreign tables.
+        all visible tables, views, materialized views, sequences and
+        foreign tables.
         This is purely a convenience measure.
         </P
 ></BLOCKQUOTE
@@ -6041,7 +6054,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN96153"
+NAME="AEN96502"
 ></A
 ><H3
 >Advanced Features</H3
@@ -7008,17 +7021,18 @@
 CLASS="APPLICATION"
 >psql</SPAN
 > requests a new command. Prompt 2 is
-    issued when more input is expected during command input because the
-    command was not terminated with a semicolon or a quote was not closed.
-    Prompt 3 is issued when you run an <ACRONYM
+    issued when more input is expected during command entry, for example
+    because the command was not terminated with a semicolon or a quote
+    was not closed.
+    Prompt 3 is issued when you are running an <ACRONYM
 CLASS="ACRONYM"
 >SQL</ACRONYM
 >
     <TT
 CLASS="COMMAND"
->COPY</TT
-> command and you are expected to type in the
-    row values on the terminal.
+>COPY FROM STDIN</TT
+> command and you need to type in
+    a row value on the terminal.
     </P
 ><P
 >    The value of the selected prompt variable is printed literally,
@@ -7158,38 +7172,50 @@
 >        In prompt 1 normally <TT
 CLASS="LITERAL"
 >=</TT
->, but <TT
+>,
+        but <TT
 CLASS="LITERAL"
 >^</TT
-> if
-        in single-line mode, and <TT
+> if in single-line mode,
+        or <TT
 CLASS="LITERAL"
 >!</TT
-> if the session is
-        disconnected from the database (which can happen if
-        <TT
+> if the session is disconnected from the
+        database (which can happen if <TT
 CLASS="COMMAND"
 >\connect</TT
-> fails). In prompt 2 the sequence is
-        replaced by <TT
+> fails).
+        In prompt 2 <TT
+CLASS="LITERAL"
+>%R</TT
+> is replaced by a character that
+        depends on why <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+> expects more input:
+        <TT
 CLASS="LITERAL"
 >-</TT
->, <TT
+> if the command simply wasn't terminated yet,
+        but <TT
 CLASS="LITERAL"
 >*</TT
->, a single quote,
-        a double quote, or a dollar sign, depending on whether
-        <SPAN
-CLASS="APPLICATION"
->psql</SPAN
-> expects more input because the
-        command wasn't terminated yet, because you are inside a
+> if there is an unfinished
         <TT
 CLASS="LITERAL"
 >/* ... */</TT
-> comment, or because you are inside
-        a quoted or dollar-escaped string. In prompt 3 the sequence doesn't
-        produce anything.
+> comment,
+        a single quote if there is an unfinished quoted string,
+        a double quote if there is an unfinished quoted identifier,
+        a dollar sign if there is an unfinished dollar-quoted string,
+        or <TT
+CLASS="LITERAL"
+>(</TT
+> if there is an unmatched left parenthesis.
+        In prompt 3 <TT
+CLASS="LITERAL"
+>%R</TT
+> doesn't produce anything.
         </P
 ></DD
 ><DT
@@ -7382,7 +7408,7 @@
 ><DIV
 CLASS="REFSECT3"
 ><A
-NAME="AEN96556"
+NAME="AEN96908"
 ></A
 ><H4
 >Command-Line Editing</H4
@@ -7486,8 +7512,12 @@
 CLASS="LITERAL"
 >less</TT
 >.  The default
-      is platform-dependent.  The use of the pager can be disabled by
-      using the <TT
+      is platform-dependent.  Use of the pager can be disabled by setting
+      <TT
+CLASS="ENVAR"
+>PAGER</TT
+> to empty, or by using pager-related options of
+      the <TT
 CLASS="COMMAND"
 >\pset</TT
 > command.
@@ -7670,7 +7700,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN96655"
+NAME="AEN97008"
 ></A
 ><H2
 >Files</H2
@@ -7818,7 +7848,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN96696"
+NAME="AEN97049"
 ></A
 ><H2
 >Notes</H2
@@ -7888,7 +7918,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN96713"
+NAME="AEN97066"
 ></A
 ><H2
 >Notes for Windows Users</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-reindexdb.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-reindexdb.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-reindexdb.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-reindexdb.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN96763"
+NAME="AEN97116"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN96767"
+NAME="AEN97120"
 ></A
 ><H2
 >Synopsis</H2
@@ -226,7 +226,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN96824"
+NAME="AEN97177"
 ></A
 ><H2
 >Description</H2
@@ -256,7 +256,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN96832"
+NAME="AEN97185"
 ></A
 ><H2
 >Options</H2
@@ -693,7 +693,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN96994"
+NAME="AEN97347"
 ></A
 ><H2
 >Environment</H2
@@ -741,7 +741,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97012"
+NAME="AEN97365"
 ></A
 ><H2
 >Diagnostics</H2
@@ -770,7 +770,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97018"
+NAME="AEN97371"
 ></A
 ><H2
 >Notes</H2
@@ -796,7 +796,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97025"
+NAME="AEN97378"
 ></A
 ><H2
 >Examples</H2
@@ -842,7 +842,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97039"
+NAME="AEN97392"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/app-vacuumdb.html postgresql-9.5-9.5.8/doc/src/sgml/html/app-vacuumdb.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/app-vacuumdb.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/app-vacuumdb.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN97052"
+NAME="AEN97405"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN97056"
+NAME="AEN97409"
 ></A
 ><H2
 >Synopsis</H2
@@ -178,7 +178,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97086"
+NAME="AEN97439"
 ></A
 ><H2
 >Description</H2
@@ -217,7 +217,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97096"
+NAME="AEN97449"
 ></A
 ><H2
 >Options</H2
@@ -745,7 +745,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97290"
+NAME="AEN97643"
 ></A
 ><H2
 >Environment</H2
@@ -793,7 +793,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97308"
+NAME="AEN97661"
 ></A
 ><H2
 >Diagnostics</H2
@@ -822,7 +822,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97314"
+NAME="AEN97667"
 ></A
 ><H2
 >Notes</H2
@@ -848,7 +848,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97321"
+NAME="AEN97674"
 ></A
 ><H2
 >Examples</H2
@@ -913,7 +913,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97340"
+NAME="AEN97693"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/archive-recovery-settings.html postgresql-9.5-9.5.8/doc/src/sgml/html/archive-recovery-settings.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/archive-recovery-settings.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/archive-recovery-settings.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Recovery Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/arrays.html postgresql-9.5-9.5.8/doc/src/sgml/html/arrays.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/arrays.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/arrays.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/auth-delay.html postgresql-9.5-9.5.8/doc/src/sgml/html/auth-delay.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/auth-delay.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/auth-delay.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -121,7 +121,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167474"
+NAME="AEN172325"
 >F.2.1. Configuration Parameters</A
 ></H2
 ><P
@@ -165,7 +165,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167489"
+NAME="AEN172340"
 >F.2.2. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/auth-methods.html postgresql-9.5-9.5.8/doc/src/sgml/html/auth-methods.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/auth-methods.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/auth-methods.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Client Authentication"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -894,7 +894,7 @@
     trust the machine running the ident server.
     Heed the warning:
     <A
-NAME="AEN35540"
+NAME="AEN35813"
 ></A
 ><TABLE
 BORDER="0"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/auth-pg-hba-conf.html postgresql-9.5-9.5.8/doc/src/sgml/html/auth-pg-hba-conf.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/auth-pg-hba-conf.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/auth-pg-hba-conf.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Client Authentication"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -774,7 +774,7 @@
 ><P
 ></P
 ><A
-NAME="AEN35114"
+NAME="AEN35387"
 ></A
 ><P
 >        Users sometimes wonder why host names are handled
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/auth-username-maps.html postgresql-9.5-9.5.8/doc/src/sgml/html/auth-username-maps.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/auth-username-maps.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/auth-username-maps.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Client Authentication"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/auto-explain.html postgresql-9.5-9.5.8/doc/src/sgml/html/auto-explain.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/auto-explain.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/auto-explain.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -142,7 +142,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167506"
+NAME="AEN172357"
 >F.3.1. Configuration Parameters</A
 ></H2
 ><P
@@ -430,7 +430,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167615"
+NAME="AEN172466"
 >F.3.2. Example</A
 ></H2
 ><PRE
@@ -464,7 +464,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167620"
+NAME="AEN172471"
 >F.3.3. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/backup-dump.html postgresql-9.5-9.5.8/doc/src/sgml/html/backup-dump.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/backup-dump.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/backup-dump.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Backup and Restore"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/backup-file.html postgresql-9.5-9.5.8/doc/src/sgml/html/backup-file.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/backup-file.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/backup-file.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Backup and Restore"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/backup.html postgresql-9.5-9.5.8/doc/src/sgml/html/backup.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/backup.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/backup.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/bgworker.html postgresql-9.5-9.5.8/doc/src/sgml/html/bgworker.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/bgworker.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/bgworker.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/biblio.html postgresql-9.5-9.5.8/doc/src/sgml/html/biblio.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/biblio.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/biblio.html	2017-08-07 21:33:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Acronyms"
@@ -23,7 +23,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="BIBLIOGRAPHY"
 ><DIV
@@ -41,7 +41,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -118,7 +118,7 @@
 ><H2
 CLASS="BIBLIODIV"
 ><A
-NAME="AEN176900"
+NAME="AEN181775"
 ><ACRONYM
 CLASS="ACRONYM"
 >SQL</ACRONYM
@@ -272,7 +272,7 @@
 ><H2
 CLASS="BIBLIODIV"
 ><A
-NAME="AEN177010"
+NAME="AEN181885"
 >PostgreSQL-specific Documentation</A
 ></H2
 ><DIV
@@ -362,7 +362,7 @@
 ><H2
 CLASS="BIBLIODIV"
 ><A
-NAME="AEN177056"
+NAME="AEN181931"
 >Proceedings and Articles</A
 ></H2
 ><DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/bki-commands.html postgresql-9.5-9.5.8/doc/src/sgml/html/bki-commands.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/bki-commands.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/bki-commands.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="BKI Backend Interface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/bki-example.html postgresql-9.5-9.5.8/doc/src/sgml/html/bki-example.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/bki-example.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/bki-example.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="BKI Backend Interface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/bki-format.html postgresql-9.5-9.5.8/doc/src/sgml/html/bki-format.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/bki-format.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/bki-format.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="BKI Backend Interface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/bki.html postgresql-9.5-9.5.8/doc/src/sgml/html/bki.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/bki.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/bki.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/bki-structure.html postgresql-9.5-9.5.8/doc/src/sgml/html/bki-structure.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/bki-structure.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/bki-structure.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="BKI Backend Interface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/bookindex.html postgresql-9.5-9.5.8/doc/src/sgml/html/bookindex.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/bookindex.html	2016-03-28 20:21:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/bookindex.html	2017-08-07 21:33:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Bibliography"
@@ -20,7 +20,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="INDEX"
 ><DIV
@@ -38,7 +38,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -86,85 +86,85 @@
 ><P
 CLASS="INDEXDIV-QUICKLINKS"
 ><A
-HREF="bookindex.html#AEN177252"
+HREF="bookindex.html#AEN182127"
 >Symbols</A
 > | <A
-HREF="bookindex.html#AEN177285"
+HREF="bookindex.html#AEN182160"
 >A</A
 > | <A
-HREF="bookindex.html#AEN177721"
+HREF="bookindex.html#AEN182596"
 >B</A
 > | <A
-HREF="bookindex.html#AEN177887"
+HREF="bookindex.html#AEN182762"
 >C</A
 > | <A
-HREF="bookindex.html#AEN178487"
+HREF="bookindex.html#AEN183365"
 >D</A
 > | <A
-HREF="bookindex.html#AEN178942"
+HREF="bookindex.html#AEN183822"
 >E</A
 > | <A
-HREF="bookindex.html#AEN179166"
+HREF="bookindex.html#AEN184046"
 >F</A
 > | <A
-HREF="bookindex.html#AEN179326"
+HREF="bookindex.html#AEN184206"
 >G</A
 > | <A
-HREF="bookindex.html#AEN179441"
+HREF="bookindex.html#AEN184321"
 >H</A
 > | <A
-HREF="bookindex.html#AEN179560"
+HREF="bookindex.html#AEN184443"
 >I</A
 > | <A
-HREF="bookindex.html#AEN179840"
+HREF="bookindex.html#AEN184725"
 >J</A
 > | <A
-HREF="bookindex.html#AEN180010"
+HREF="bookindex.html#AEN184895"
 >K</A
 > | <A
-HREF="bookindex.html#AEN180024"
+HREF="bookindex.html#AEN184909"
 >L</A
 > | <A
-HREF="bookindex.html#AEN180419"
+HREF="bookindex.html#AEN185304"
 >M</A
 > | <A
-HREF="bookindex.html#AEN180569"
+HREF="bookindex.html#AEN185455"
 >N</A
 > | <A
-HREF="bookindex.html#AEN180720"
+HREF="bookindex.html#AEN185606"
 >O</A
 > | <A
-HREF="bookindex.html#AEN180851"
+HREF="bookindex.html#AEN185737"
 >P</A
 > | <A
-HREF="bookindex.html#AEN182508"
+HREF="bookindex.html#AEN187403"
 >Q</A
 > | <A
-HREF="bookindex.html#AEN182557"
+HREF="bookindex.html#AEN187452"
 >R</A
 > | <A
-HREF="bookindex.html#AEN182915"
+HREF="bookindex.html#AEN187813"
 >S</A
 > | <A
-HREF="bookindex.html#AEN183667"
+HREF="bookindex.html#AEN188565"
 >T</A
 > | <A
-HREF="bookindex.html#AEN184130"
+HREF="bookindex.html#AEN189028"
 >U</A
 > | <A
-HREF="bookindex.html#AEN184249"
+HREF="bookindex.html#AEN189149"
 >V</A
 > | <A
-HREF="bookindex.html#AEN184354"
+HREF="bookindex.html#AEN189254"
 >W</A
 > | <A
-HREF="bookindex.html#AEN184452"
+HREF="bookindex.html#AEN189352"
 >X</A
 > | <A
-HREF="bookindex.html#AEN184534"
+HREF="bookindex.html#AEN189434"
 >Y</A
 > | <A
-HREF="bookindex.html#AEN184539"
+HREF="bookindex.html#AEN189439"
 >Z</A
 ></P
 ><DIV
@@ -172,7 +172,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN177252"
+NAME="AEN182127"
 >Symbols</A
 ></H2
 ><DL
@@ -257,7 +257,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN177285"
+NAME="AEN182160"
 >A</A
 ></H2
 ><DL
@@ -459,7 +459,7 @@
 ><DT
 >akeys,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
@@ -922,7 +922,7 @@
 ><DT
 >armor,
     <A
-HREF="pgcrypto.html#AEN171872"
+HREF="pgcrypto.html#AEN176723"
 >armor(), dearmor()</A
 >
   </DT
@@ -1047,7 +1047,7 @@
 >Aggregate Functions</A
 >,
     <A
-HREF="intagg.html#AEN169970"
+HREF="intagg.html#AEN174821"
 >Functions</A
 >
   </DT
@@ -1258,7 +1258,7 @@
 ><DT
 >auth_delay.milliseconds configuration parameter,
     <A
-HREF="auth-delay.html#AEN167474"
+HREF="auth-delay.html#AEN172325"
 >Configuration Parameters</A
 >
   </DT
@@ -1423,63 +1423,63 @@
 ><DT
 >auto_explain.log_analyze configuration parameter,
     <A
-HREF="auto-explain.html#AEN167506"
+HREF="auto-explain.html#AEN172357"
 >Configuration Parameters</A
 >
   </DT
 ><DT
 >auto_explain.log_buffers configuration parameter,
     <A
-HREF="auto-explain.html#AEN167506"
+HREF="auto-explain.html#AEN172357"
 >Configuration Parameters</A
 >
   </DT
 ><DT
 >auto_explain.log_format configuration parameter,
     <A
-HREF="auto-explain.html#AEN167506"
+HREF="auto-explain.html#AEN172357"
 >Configuration Parameters</A
 >
   </DT
 ><DT
 >auto_explain.log_min_duration configuration parameter,
     <A
-HREF="auto-explain.html#AEN167506"
+HREF="auto-explain.html#AEN172357"
 >Configuration Parameters</A
 >
   </DT
 ><DT
 >auto_explain.log_nested_statements configuration parameter,
     <A
-HREF="auto-explain.html#AEN167506"
+HREF="auto-explain.html#AEN172357"
 >Configuration Parameters</A
 >
   </DT
 ><DT
 >auto_explain.log_timing configuration parameter,
     <A
-HREF="auto-explain.html#AEN167506"
+HREF="auto-explain.html#AEN172357"
 >Configuration Parameters</A
 >
   </DT
 ><DT
 >auto_explain.log_triggers configuration parameter,
     <A
-HREF="auto-explain.html#AEN167506"
+HREF="auto-explain.html#AEN172357"
 >Configuration Parameters</A
 >
   </DT
 ><DT
 >auto_explain.log_verbose configuration parameter,
     <A
-HREF="auto-explain.html#AEN167506"
+HREF="auto-explain.html#AEN172357"
 >Configuration Parameters</A
 >
   </DT
 ><DT
 >avals,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
@@ -1504,7 +1504,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN177721"
+NAME="AEN182596"
 >B</A
 ></H2
 ><DL
@@ -1859,7 +1859,7 @@
 ><DT
 >box (data type),
     <A
-HREF="datatype-geometric.html#AEN6984"
+HREF="datatype-geometric.html#AEN7060"
 >Boxes</A
 >
   </DT
@@ -1875,28 +1875,28 @@
 ><DT
 >brin_metapage_info,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
 ><DT
 >brin_page_items,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
 ><DT
 >brin_page_type,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
 ><DT
 >brin_revmap_data,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
@@ -1942,21 +1942,21 @@
 ><DT
 >bt_metap,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
 ><DT
 >bt_page_items,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
 ><DT
 >bt_page_stats,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
@@ -1981,7 +1981,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN177887"
+NAME="AEN182762"
 >C</A
 ></H2
 ><DL
@@ -2437,7 +2437,7 @@
 ><DT
 >cluster_name configuration parameter,
     <A
-HREF="runtime-config-logging.html#AEN33166"
+HREF="runtime-config-logging.html#AEN33439"
 >Process Title</A
 >
   </DT
@@ -2492,7 +2492,7 @@
 ><DT
 >in SQL functions,
     <A
-HREF="xfunc-sql.html#AEN56812"
+HREF="xfunc-sql.html#AEN57065"
 >SQL Functions with Collations</A
 >
   </DT
@@ -2547,7 +2547,7 @@
 ><DT
 >renaming,
     <A
-HREF="ddl-alter.html#AEN2869"
+HREF="ddl-alter.html#AEN2874"
 >Renaming a Column</A
 >
   </DT
@@ -2576,7 +2576,7 @@
 ><DT
 >changing,
     <A
-HREF="ddl-alter.html#AEN2859"
+HREF="ddl-alter.html#AEN2864"
 >Changing a Column's Data Type</A
 >
   </DT
@@ -2766,8 +2766,8 @@
 ><DT
 >constant,
     <A
-HREF="rowtypes.html#AEN8006"
->Composite Value Input</A
+HREF="rowtypes.html#AEN8082"
+>Constructing Composite Values</A
 >
   </DT
 ><DD
@@ -2790,8 +2790,8 @@
 ><DT
 >computed field,
     <A
-HREF="xfunc-sql.html#XFUNC-SQL-COMPOSITE-FUNCTIONS"
->SQL Functions on Composite Types</A
+HREF="rowtypes.html#ROWTYPES-USAGE"
+>Using Composite Types in Queries</A
 >
   </DT
 ><DT
@@ -2892,11 +2892,11 @@
 ><DT
 >connectby,
     <A
-HREF="tablefunc.html#AEN174233"
+HREF="tablefunc.html#AEN179090"
 >Functions Provided</A
 >,
     <A
-HREF="tablefunc.html#AEN174471"
+HREF="tablefunc.html#AEN179328"
 >connectby</A
 >
   </DT
@@ -2988,7 +2988,7 @@
 ><DT
 >NOT NULL,
     <A
-HREF="ddl-constraints.html#AEN2531"
+HREF="ddl-constraints.html#AEN2536"
 >Not-Null Constraints</A
 >
   </DT
@@ -3057,7 +3057,7 @@
 ><DT
 >in PL/pgSQL,
     <A
-HREF="plpgsql-control-structures.html#AEN62843"
+HREF="plpgsql-control-structures.html#AEN63135"
 >CONTINUE</A
 >
   </DT
@@ -3092,7 +3092,7 @@
 ><DT
 >control file,
     <A
-HREF="extend-extensions.html#AEN58944"
+HREF="extend-extensions.html#AEN59201"
 >Extension Files</A
 >
   </DT
@@ -3574,22 +3574,22 @@
 ><DT
 >crosstab,
     <A
-HREF="tablefunc.html#AEN174316"
+HREF="tablefunc.html#AEN179173"
 >crosstab(text)</A
 >,
     <A
-HREF="tablefunc.html#AEN174362"
+HREF="tablefunc.html#AEN179219"
 >crosstabN(text)</A
 >,
     <A
-HREF="tablefunc.html#AEN174403"
+HREF="tablefunc.html#AEN179260"
 >crosstab(text, text)</A
 >
   </DT
 ><DT
 >crypt,
     <A
-HREF="pgcrypto.html#AEN171598"
+HREF="pgcrypto.html#AEN176449"
 >crypt()</A
 >
   </DT
@@ -3607,7 +3607,7 @@
 >System Columns</A
 >,
     <A
-HREF="rules-views.html#AEN61188"
+HREF="rules-views.html#AEN61445"
 >View Rules in Non-SELECT Statements</A
 >
   </DT
@@ -3676,6 +3676,13 @@
 >
   </DT
 ><DT
+>current_role,
+    <A
+HREF="functions-info.html"
+>System Information Functions</A
+>
+  </DT
+><DT
 >current_schema,
     <A
 HREF="functions-info.html"
@@ -3847,7 +3854,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN178487"
+NAME="AEN183365"
 >D</A
 ></H2
 ><DL
@@ -4071,7 +4078,7 @@
 >Date/Time Types</A
 >,
     <A
-HREF="datatype-datetime.html#AEN5966"
+HREF="datatype-datetime.html#AEN6042"
 >Dates</A
 >
   </DT
@@ -4080,7 +4087,7 @@
 ><DT
 >constants,
     <A
-HREF="datatype-datetime.html#AEN6209"
+HREF="datatype-datetime.html#AEN6285"
 >Special Values</A
 >
   </DT
@@ -4326,7 +4333,7 @@
 ><DT
 >dearmor,
     <A
-HREF="pgcrypto.html#AEN171872"
+HREF="pgcrypto.html#AEN176723"
 >armor(), dearmor()</A
 >
   </DT
@@ -4420,14 +4427,14 @@
 ><DT
 >decrypt,
     <A
-HREF="pgcrypto.html#AEN171983"
+HREF="pgcrypto.html#AEN176834"
 >Raw Encryption Functions</A
 >
   </DT
 ><DT
 >decrypt_iv,
     <A
-HREF="pgcrypto.html#AEN171983"
+HREF="pgcrypto.html#AEN176834"
 >Raw Encryption Functions</A
 >
   </DT
@@ -4443,7 +4450,7 @@
 ><DT
 >changing,
     <A
-HREF="ddl-alter.html#AEN2849"
+HREF="ddl-alter.html#AEN2854"
 >Changing a Column's Default Value</A
 >
   </DT
@@ -4534,7 +4541,7 @@
 ><DT
 >defined,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
@@ -4567,10 +4574,25 @@
 >DELETE</A
 >,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
+><DD
+><DL
+><DT
+>RETURNING,
+    <A
+HREF="dml-returning.html"
+>Returning Data From Modified Rows</A
+>
+  </DT
+><DD
+><DL
+></DL
+></DD
+></DL
+></DD
 ><DT
 >deleting,
     <A
@@ -4624,14 +4646,14 @@
 ><DT
 >difference,
     <A
-HREF="fuzzystrmatch.html#AEN169312"
+HREF="fuzzystrmatch.html#AEN174163"
 >Soundex</A
 >
   </DT
 ><DT
 >digest,
     <A
-HREF="pgcrypto.html#AEN171497"
+HREF="pgcrypto.html#AEN176348"
 >digest()</A
 >
   </DT
@@ -4698,14 +4720,14 @@
 ><DT
 >dmetaphone,
     <A
-HREF="fuzzystrmatch.html#AEN169360"
+HREF="fuzzystrmatch.html#AEN174211"
 >Double Metaphone</A
 >
   </DT
 ><DT
 >dmetaphone_alt,
     <A
-HREF="fuzzystrmatch.html#AEN169360"
+HREF="fuzzystrmatch.html#AEN174211"
 >Double Metaphone</A
 >
   </DT
@@ -5058,7 +5080,7 @@
 ><DT
 >DTD,
     <A
-HREF="datatype-xml.html#AEN7438"
+HREF="datatype-xml.html#AEN7514"
 >Creating XML Values</A
 >
   </DT
@@ -5126,21 +5148,21 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN178942"
+NAME="AEN183822"
 >E</A
 ></H2
 ><DL
 ><DT
 >each,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
 ><DT
 >earth,
     <A
-HREF="earthdistance.html#AEN169072"
+HREF="earthdistance.html#AEN173923"
 >Cube-based Earth Distances</A
 >
   </DT
@@ -5154,14 +5176,14 @@
 ><DT
 >earth_box,
     <A
-HREF="earthdistance.html#AEN169072"
+HREF="earthdistance.html#AEN173923"
 >Cube-based Earth Distances</A
 >
   </DT
 ><DT
 >earth_distance,
     <A
-HREF="earthdistance.html#AEN169072"
+HREF="earthdistance.html#AEN173923"
 >Cube-based Earth Distances</A
 >
   </DT
@@ -5422,7 +5444,7 @@
 ><DT
 >encrypt,
     <A
-HREF="pgcrypto.html#AEN171983"
+HREF="pgcrypto.html#AEN176834"
 >Raw Encryption Functions</A
 >
   </DT
@@ -5451,7 +5473,7 @@
 ><DT
 >encrypt_iv,
     <A
-HREF="pgcrypto.html#AEN171983"
+HREF="pgcrypto.html#AEN176834"
 >Raw Encryption Functions</A
 >
   </DT
@@ -5686,7 +5708,7 @@
 ><DT
 >exist,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
@@ -5705,7 +5727,7 @@
 ><DT
 >in PL/pgSQL,
     <A
-HREF="plpgsql-control-structures.html#AEN62811"
+HREF="plpgsql-control-structures.html#AEN63103"
 >EXIT</A
 >
   </DT
@@ -5830,7 +5852,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN179166"
+NAME="AEN184046"
 >F</A
 ></H2
 ><DL
@@ -5884,8 +5906,8 @@
 ><DT
 >computed,
     <A
-HREF="xfunc-sql.html#XFUNC-SQL-COMPOSITE-FUNCTIONS"
->SQL Functions on Composite Types</A
+HREF="rowtypes.html#ROWTYPES-USAGE"
+>Using Composite Types in Queries</A
 >
   </DT
 ><DD
@@ -6135,7 +6157,7 @@
 ><DT
 >fsm_page_contents,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
@@ -6397,14 +6419,14 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN179326"
+NAME="AEN184206"
 >G</A
 ></H2
 ><DL
 ><DT
 >gc_to_sec,
     <A
-HREF="earthdistance.html#AEN169072"
+HREF="earthdistance.html#AEN173923"
 >Cube-based Earth Distances</A
 >
   </DT
@@ -6432,21 +6454,21 @@
 ><DT
 >gen_random_bytes,
     <A
-HREF="pgcrypto.html#AEN172046"
+HREF="pgcrypto.html#AEN176897"
 >Random-Data Functions</A
 >
   </DT
 ><DT
 >gen_random_uuid,
     <A
-HREF="pgcrypto.html#AEN172046"
+HREF="pgcrypto.html#AEN176897"
 >Random-Data Functions</A
 >
   </DT
 ><DT
 >gen_salt,
     <A
-HREF="pgcrypto.html#AEN171614"
+HREF="pgcrypto.html#AEN176465"
 >gen_salt()</A
 >
   </DT
@@ -6532,7 +6554,7 @@
 ><DT
 >get_raw_page,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
@@ -6555,21 +6577,21 @@
 ><DT
 >gin_leafpage_items,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
 ><DT
 >gin_metapage_info,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
 ><DT
 >gin_page_opaque_info,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
@@ -6708,7 +6730,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN179441"
+NAME="AEN184321"
 >H</A
 ></H2
 ><DL
@@ -6799,6 +6821,13 @@
 >
   </DT
 ><DT
+>has_type_privilege,
+    <A
+HREF="functions-info.html"
+>System Information Functions</A
+>
+  </DT
+><DT
 >HAVING,
     <A
 HREF="tutorial-agg.html"
@@ -6819,7 +6848,7 @@
 ><DT
 >heap_page_items,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
@@ -6865,7 +6894,7 @@
 ><DT
 >hmac,
     <A
-HREF="pgcrypto.html#AEN171517"
+HREF="pgcrypto.html#AEN176368"
 >hmac()</A
 >
   </DT
@@ -6958,49 +6987,49 @@
 >hstore</A
 >,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
 ><DT
 >hstore_to_array,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
 ><DT
 >hstore_to_json,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
 ><DT
 >hstore_to_jsonb,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
 ><DT
 >hstore_to_jsonb_loose,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
 ><DT
 >hstore_to_json_loose,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
 ><DT
 >hstore_to_matrix,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
@@ -7036,14 +7065,14 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN179560"
+NAME="AEN184443"
 >I</A
 ></H2
 ><DL
 ><DT
 >icount,
     <A
-HREF="intarray.html#AEN170013"
+HREF="intarray.html#AEN174864"
 >intarray Functions and Operators</A
 >
   </DT
@@ -7100,7 +7129,7 @@
 ><DT
 >idx,
     <A
-HREF="intarray.html#AEN170013"
+HREF="intarray.html#AEN174864"
 >intarray Functions and Operators</A
 >
   </DT
@@ -7211,7 +7240,7 @@
 >Indexes</A
 >,
     <A
-HREF="ltree.html#AEN170683"
+HREF="ltree.html#AEN175534"
 >Operators and Functions</A
 >
   </DT
@@ -7557,6 +7586,21 @@
 >INSERT</A
 >
   </DT
+><DD
+><DL
+><DT
+>RETURNING,
+    <A
+HREF="dml-returning.html"
+>Returning Data From Modified Rows</A
+>
+  </DT
+><DD
+><DL
+></DL
+></DD
+></DL
+></DD
 ><DT
 >inserting,
     <A
@@ -7722,21 +7766,21 @@
 ><DT
 >intset,
     <A
-HREF="intarray.html#AEN170013"
+HREF="intarray.html#AEN174864"
 >intarray Functions and Operators</A
 >
   </DT
 ><DT
 >int_array_aggregate,
     <A
-HREF="intagg.html#AEN169970"
+HREF="intagg.html#AEN174821"
 >Functions</A
 >
   </DT
 ><DT
 >int_array_enum,
     <A
-HREF="intagg.html#AEN169970"
+HREF="intagg.html#AEN174821"
 >Functions</A
 >
   </DT
@@ -7761,7 +7805,7 @@
 ><DT
 >IS DOCUMENT,
     <A
-HREF="functions-xml.html#AEN17164"
+HREF="functions-xml.html#AEN17342"
 >IS DOCUMENT</A
 >
   </DT
@@ -7874,7 +7918,7 @@
 ><DT
 >isn_weak,
     <A
-HREF="isn.html#AEN170412"
+HREF="isn.html#AEN175263"
 >Functions and Operators</A
 >
   </DT
@@ -7906,7 +7950,7 @@
 ><DT
 >is_valid,
     <A
-HREF="isn.html#AEN170412"
+HREF="isn.html#AEN175263"
 >Functions and Operators</A
 >
   </DT
@@ -7917,7 +7961,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN179840"
+NAME="AEN184725"
 >J</A
 ></H2
 ><DL
@@ -8405,7 +8449,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN180010"
+NAME="AEN184895"
 >K</A
 ></H2
 ><DL
@@ -8459,7 +8503,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN180024"
+NAME="AEN184909"
 >L</A
 ></H2
 ><DL
@@ -8528,14 +8572,14 @@
 ><DT
 >latitude,
     <A
-HREF="earthdistance.html#AEN169072"
+HREF="earthdistance.html#AEN173923"
 >Cube-based Earth Distances</A
 >
   </DT
 ><DT
 >lca,
     <A
-HREF="ltree.html#AEN170683"
+HREF="ltree.html#AEN175534"
 >Operators and Functions</A
 >
   </DT
@@ -8602,7 +8646,7 @@
 ><DT
 >ldconfig,
     <A
-HREF="install-post.html#AEN28420"
+HREF="install-post.html#AEN28684"
 >Shared Libraries</A
 >
   </DT
@@ -8700,14 +8744,14 @@
 ><DT
 >levenshtein,
     <A
-HREF="fuzzystrmatch.html#AEN169328"
+HREF="fuzzystrmatch.html#AEN174179"
 >Levenshtein</A
 >
   </DT
 ><DT
 >levenshtein_less_equal,
     <A
-HREF="fuzzystrmatch.html#AEN169328"
+HREF="fuzzystrmatch.html#AEN174179"
 >Levenshtein</A
 >
   </DT
@@ -8805,7 +8849,7 @@
 ><DT
 >and locales,
     <A
-HREF="locale.html#AEN36366"
+HREF="locale.html#AEN36639"
 >Behavior</A
 >
   </DT
@@ -8900,7 +8944,7 @@
 ><DT
 >ll_to_earth,
     <A
-HREF="earthdistance.html#AEN169072"
+HREF="earthdistance.html#AEN173923"
 >Cube-based Earth Distances</A
 >
   </DT
@@ -9040,7 +9084,7 @@
 >Logical Decoding</A
 >,
     <A
-HREF="logicaldecoding-explanation.html#AEN68556"
+HREF="logicaldecoding-explanation.html#AEN68866"
 >Logical Decoding</A
 >
   </DT
@@ -9250,7 +9294,7 @@
 ><DT
 >longitude,
     <A
-HREF="earthdistance.html#AEN169072"
+HREF="earthdistance.html#AEN173923"
 >Cube-based Earth Distances</A
 >
   </DT
@@ -9306,7 +9350,7 @@
 ><DT
 >and locales,
     <A
-HREF="locale.html#AEN36366"
+HREF="locale.html#AEN36639"
 >Behavior</A
 >
   </DT
@@ -9514,7 +9558,7 @@
 ><DT
 >ltree2text,
     <A
-HREF="ltree.html#AEN170683"
+HREF="ltree.html#AEN175534"
 >Operators and Functions</A
 >
   </DT
@@ -9532,7 +9576,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN180419"
+NAME="AEN185304"
 >M</A
 ></H2
 ><DL
@@ -9618,14 +9662,14 @@
 ><DT
 >make_valid,
     <A
-HREF="isn.html#AEN170412"
+HREF="isn.html#AEN175263"
 >Functions and Operators</A
 >
   </DT
 ><DT
 >MANPATH,
     <A
-HREF="install-post.html#AEN28471"
+HREF="install-post.html#AEN28735"
 >Environment Variables</A
 >
   </DT
@@ -9791,10 +9835,16 @@
 ><DT
 >median,
     <A
-HREF="functions-aggregate.html"
->Aggregate Functions</A
+HREF="sql-expressions.html#SYNTAX-AGGREGATES"
+>Aggregate Expressions</A
 >
   </DT
+><DD
+><DL
+><DT
+>see also percentile</DT
+></DL
+></DD
 ><DT
 >memory context
   </DT
@@ -9816,7 +9866,7 @@
 ><DT
 >metaphone,
     <A
-HREF="fuzzystrmatch.html#AEN169348"
+HREF="fuzzystrmatch.html#AEN174199"
 >Metaphone</A
 >
   </DT
@@ -9937,7 +9987,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN180569"
+NAME="AEN185455"
 >N</A
 ></H2
 ><DL
@@ -10108,7 +10158,7 @@
 ><DT
 >nlevel,
     <A
-HREF="ltree.html#AEN170683"
+HREF="ltree.html#AEN175534"
 >Operators and Functions</A
 >
   </DT
@@ -10140,7 +10190,7 @@
 ><DT
 >normal_rand,
     <A
-HREF="tablefunc.html#AEN174302"
+HREF="tablefunc.html#AEN179159"
 >normal_rand</A
 >
   </DT
@@ -10194,7 +10244,7 @@
 ><DT
 >not-null constraint,
     <A
-HREF="ddl-constraints.html#AEN2531"
+HREF="ddl-constraints.html#AEN2536"
 >Not-Null Constraints</A
 >
   </DT
@@ -10379,7 +10429,7 @@
 ><DT
 >in PL/Python,
     <A
-HREF="plpython-data.html#AEN65503"
+HREF="plpython-data.html#AEN65813"
 >Null, None</A
 >
   </DT
@@ -10464,7 +10514,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN180720"
+NAME="AEN185606"
 >O</A
 ></H2
 ><DL
@@ -10779,7 +10829,7 @@
 ><DT
 >and locales,
     <A
-HREF="locale.html#AEN36366"
+HREF="locale.html#AEN36639"
 >Behavior</A
 >
   </DT
@@ -10936,7 +10986,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN180851"
+NAME="AEN185737"
 >P</A
 ></H2
 ><DL
@@ -10950,14 +11000,14 @@
 ><DT
 >page_header,
     <A
-HREF="pageinspect.html#AEN171172"
+HREF="pageinspect.html#AEN176023"
 >Functions</A
 >
   </DT
 ><DT
 >palloc,
     <A
-HREF="xfunc-c.html#AEN57425"
+HREF="xfunc-c.html#AEN57678"
 >Writing Code</A
 >
   </DT
@@ -11065,7 +11115,7 @@
 >Geometric Functions and Operators</A
 >,
     <A
-HREF="install-post.html#AEN28471"
+HREF="install-post.html#AEN28735"
 >Environment Variables</A
 >
   </DT
@@ -11087,7 +11137,7 @@
 ><DT
 >path (data type),
     <A
-HREF="datatype-geometric.html#AEN7013"
+HREF="datatype-geometric.html#AEN7089"
 >Paths</A
 >
   </DT
@@ -11211,7 +11261,7 @@
 ><DT
 >pfree,
     <A
-HREF="xfunc-c.html#AEN57425"
+HREF="xfunc-c.html#AEN57678"
 >Writing Code</A
 >
   </DT
@@ -11365,81 +11415,74 @@
 ><DT
 >pgp_armor_headers,
     <A
-HREF="pgcrypto.html#AEN171886"
+HREF="pgcrypto.html#AEN176737"
 >pgp_armor_headers</A
 >
   </DT
 ><DT
 >pgp_key_id,
     <A
-HREF="pgcrypto.html#AEN171851"
+HREF="pgcrypto.html#AEN176702"
 >pgp_key_id()</A
 >
   </DT
 ><DT
 >pgp_pub_decrypt,
     <A
-HREF="pgcrypto.html#AEN171834"
+HREF="pgcrypto.html#AEN176685"
 >pgp_pub_decrypt()</A
 >
   </DT
 ><DT
 >pgp_pub_decrypt_bytea,
     <A
-HREF="pgcrypto.html#AEN171834"
+HREF="pgcrypto.html#AEN176685"
 >pgp_pub_decrypt()</A
 >
   </DT
 ><DT
 >pgp_pub_encrypt,
     <A
-HREF="pgcrypto.html#AEN171821"
+HREF="pgcrypto.html#AEN176672"
 >pgp_pub_encrypt()</A
 >
   </DT
 ><DT
 >pgp_pub_encrypt_bytea,
     <A
-HREF="pgcrypto.html#AEN171821"
+HREF="pgcrypto.html#AEN176672"
 >pgp_pub_encrypt()</A
 >
   </DT
 ><DT
 >pgp_sym_decrypt,
     <A
-HREF="pgcrypto.html#AEN171806"
+HREF="pgcrypto.html#AEN176657"
 >pgp_sym_decrypt()</A
 >
   </DT
 ><DT
 >pgp_sym_decrypt_bytea,
     <A
-HREF="pgcrypto.html#AEN171806"
+HREF="pgcrypto.html#AEN176657"
 >pgp_sym_decrypt()</A
 >
   </DT
 ><DT
 >pgp_sym_encrypt,
     <A
-HREF="pgcrypto.html#AEN171794"
+HREF="pgcrypto.html#AEN176645"
 >pgp_sym_encrypt()</A
 >
   </DT
 ><DT
 >pgp_sym_encrypt_bytea,
     <A
-HREF="pgcrypto.html#AEN171794"
+HREF="pgcrypto.html#AEN176645"
 >pgp_sym_encrypt()</A
 >
   </DT
 ><DT
->PGREALM,
-    <A
-HREF="libpq-envars.html"
->Environment Variables</A
->
-  </DT
-><DT
 >PGREQUIREPEER,
     <A
 HREF="libpq-envars.html"
@@ -11467,7 +11510,7 @@
 >pgrowlocks</A
 >,
     <A
-HREF="pgrowlocks.html#AEN172318"
+HREF="pgrowlocks.html#AEN177169"
 >Overview</A
 >
   </DT
@@ -11530,14 +11573,14 @@
 ><DT
 >pgstatginindex,
     <A
-HREF="pgstattuple.html#AEN172728"
+HREF="pgstattuple.html#AEN177579"
 >Functions</A
 >
   </DT
 ><DT
 >pgstatindex,
     <A
-HREF="pgstattuple.html#AEN172728"
+HREF="pgstattuple.html#AEN177579"
 >Functions</A
 >
   </DT
@@ -11548,14 +11591,14 @@
 >pgstattuple</A
 >,
     <A
-HREF="pgstattuple.html#AEN172728"
+HREF="pgstattuple.html#AEN177579"
 >Functions</A
 >
   </DT
 ><DT
 >pgstattuple_approx,
     <A
-HREF="pgstattuple.html#AEN172728"
+HREF="pgstattuple.html#AEN177579"
 >Functions</A
 >
   </DT
@@ -11831,7 +11874,7 @@
 ><DT
 >with user-defined C functions,
     <A
-HREF="xfunc-c.html#AEN57425"
+HREF="xfunc-c.html#AEN57678"
 >Writing Code</A
 >
   </DT
@@ -12088,7 +12131,7 @@
 ><DT
 >pg_extension_config_dump,
     <A
-HREF="extend-extensions.html#AEN59103"
+HREF="extend-extensions.html#AEN59360"
 >Extension Configuration Tables</A
 >
   </DT
@@ -12100,6 +12143,13 @@
 >
   </DT
 ><DT
+>pg_file_rename,
+    <A
+HREF="adminpack.html"
+>adminpack</A
+>
+  </DT
+><DT
 >pg_file_settings,
     <A
 HREF="view-pg-file-settings.html"
@@ -12107,6 +12157,20 @@
 >
   </DT
 ><DT
+>pg_file_unlink,
+    <A
+HREF="adminpack.html"
+>adminpack</A
+>
+  </DT
+><DT
+>pg_file_write,
+    <A
+HREF="adminpack.html"
+>adminpack</A
+>
+  </DT
+><DT
 >pg_foreign_data_wrapper,
     <A
 HREF="catalog-pg-foreign-data-wrapper.html"
@@ -12130,7 +12194,7 @@
 ><DT
 >pg_freespace,
     <A
-HREF="pgfreespacemap.html#AEN172253"
+HREF="pgfreespacemap.html#AEN177104"
 >Functions</A
 >
   </DT
@@ -12415,6 +12479,13 @@
 >
   </DT
 ><DT
+>pg_logdir_ls,
+    <A
+HREF="adminpack.html"
+>adminpack</A
+>
+  </DT
+><DT
 >pg_logical_slot_get_binary_changes,
     <A
 HREF="functions-admin.html#FUNCTIONS-REPLICATION"
@@ -12480,7 +12551,7 @@
 ><DT
 >pg_notify,
     <A
-HREF="sql-notify.html#AEN85445"
+HREF="sql-notify.html#AEN85775"
 >pg_notify</A
 >
   </DT
@@ -12655,7 +12726,7 @@
 ><DT
 >pg_relpages,
     <A
-HREF="pgstattuple.html#AEN172728"
+HREF="pgstattuple.html#AEN177579"
 >Functions</A
 >
   </DT
@@ -12732,7 +12803,7 @@
 ><DT
 >pg_replication_origin_status,
     <A
-HREF="catalog-pg-replication-origin-status.html"
+HREF="view-pg-replication-origin-status.html"
 >pg_replication_origin_status</A
 >
   </DT
@@ -12753,7 +12824,7 @@
 ><DT
 >pg_replication_slots,
     <A
-HREF="catalog-pg-replication-slots.html"
+HREF="view-pg-replication-slots.html"
 >pg_replication_slots</A
 >
   </DT
@@ -13120,7 +13191,7 @@
 ><DT
 >function,
     <A
-HREF="pgstatstatements.html#AEN172635"
+HREF="pgstatstatements.html#AEN177486"
 >Functions</A
 >
   </DT
@@ -13133,7 +13204,7 @@
 ><DT
 >pg_stat_statements_reset,
     <A
-HREF="pgstatstatements.html#AEN172635"
+HREF="pgstatstatements.html#AEN177486"
 >Functions</A
 >
   </DT
@@ -13738,7 +13809,7 @@
 ><DT
 >point,
     <A
-HREF="datatype-geometric.html#AEN6900"
+HREF="datatype-geometric.html#AEN6976"
 >Points</A
 >,
     <A
@@ -13795,7 +13866,7 @@
 ><DT
 >populate_record,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
@@ -14948,7 +15019,7 @@
 ><DT
 >in PL/Python,
     <A
-HREF="plpython-database.html#AEN65687"
+HREF="plpython-database.html#AEN65997"
 >Database Access Functions</A
 >
   </DT
@@ -15146,7 +15217,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN182508"
+NAME="AEN187403"
 >Q</A
 ></H2
 ><DL
@@ -15335,7 +15406,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN182557"
+NAME="AEN187452"
 >R</A
 ></H2
 ><DL
@@ -15588,7 +15659,7 @@
 ><DT
 >rectangle,
     <A
-HREF="datatype-geometric.html#AEN6984"
+HREF="datatype-geometric.html#AEN7060"
 >Boxes</A
 >
   </DT
@@ -15826,7 +15897,7 @@
 ><DT
 >and locales,
     <A
-HREF="locale.html#AEN36366"
+HREF="locale.html#AEN36639"
 >Behavior</A
 >
   </DT
@@ -15925,7 +15996,7 @@
 ><DT
 >logical replication,
     <A
-HREF="logicaldecoding-explanation.html#AEN68564"
+HREF="logicaldecoding-explanation.html#LOGICALDECODING-REPLICATION-SLOTS"
 >Replication Slots</A
 >
   </DT
@@ -16029,7 +16100,7 @@
 ><DT
 >in PL/pgSQL,
     <A
-HREF="plpgsql-control-structures.html#AEN62576"
+HREF="plpgsql-control-structures.html#AEN62868"
 >RETURN NEXT and RETURN QUERY</A
 >
   </DT
@@ -16047,7 +16118,7 @@
 ><DT
 >in PL/pgSQL,
     <A
-HREF="plpgsql-control-structures.html#AEN62576"
+HREF="plpgsql-control-structures.html#AEN62868"
 >RETURN NEXT and RETURN QUERY</A
 >
   </DT
@@ -16058,6 +16129,13 @@
 ></DL
 ></DD
 ><DT
+>RETURNING,
+    <A
+HREF="dml-returning.html"
+>Returning Data From Modified Rows</A
+>
+  </DT
+><DT
 >RETURNING INTO
   </DT
 ><DD
@@ -16436,7 +16514,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN182915"
+NAME="AEN187813"
 >S</A
 ></H2
 ><DL
@@ -16664,7 +16742,7 @@
 ><DT
 >sec_to_gc,
     <A
-HREF="earthdistance.html#AEN169072"
+HREF="earthdistance.html#AEN173923"
 >Cube-based Earth Distances</A
 >
   </DT
@@ -17063,7 +17141,7 @@
 ><DT
 >set_limit,
     <A
-HREF="pgtrgm.html#AEN173089"
+HREF="pgtrgm.html#AEN177946"
 >Functions and Operators</A
 >
   </DT
@@ -17077,7 +17155,7 @@
 ><DT
 >shared library,
     <A
-HREF="install-post.html#AEN28420"
+HREF="install-post.html#AEN28684"
 >Shared Libraries</A
 >,
     <A
@@ -17102,7 +17180,7 @@
 ><DT
 >shared_preload_libraries,
     <A
-HREF="xfunc-c.html#AEN57830"
+HREF="xfunc-c.html#AEN58081"
 >Shared Memory and LWLocks</A
 >
   </DT
@@ -17134,14 +17212,14 @@
 ><DT
 >show_limit,
     <A
-HREF="pgtrgm.html#AEN173089"
+HREF="pgtrgm.html#AEN177946"
 >Functions and Operators</A
 >
   </DT
 ><DT
 >show_trgm,
     <A
-HREF="pgtrgm.html#AEN173089"
+HREF="pgtrgm.html#AEN177946"
 >Functions and Operators</A
 >
   </DT
@@ -17230,7 +17308,7 @@
 ><DT
 >similarity,
     <A
-HREF="pgtrgm.html#AEN173089"
+HREF="pgtrgm.html#AEN177946"
 >Functions and Operators</A
 >
   </DT
@@ -17244,14 +17322,14 @@
 ><DT
 >single-user mode,
     <A
-HREF="app-postgres.html#AEN99615"
+HREF="app-postgres.html#AEN99968"
 >Options for Single-User Mode</A
 >
   </DT
 ><DT
 >skeys,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
@@ -17265,7 +17343,7 @@
 ><DT
 >slice,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
@@ -17361,7 +17439,7 @@
 ><DT
 >sort,
     <A
-HREF="intarray.html#AEN170013"
+HREF="intarray.html#AEN174864"
 >intarray Functions and Operators</A
 >
   </DT
@@ -17375,21 +17453,21 @@
 ><DT
 >sort_asc,
     <A
-HREF="intarray.html#AEN170013"
+HREF="intarray.html#AEN174864"
 >intarray Functions and Operators</A
 >
   </DT
 ><DT
 >sort_desc,
     <A
-HREF="intarray.html#AEN170013"
+HREF="intarray.html#AEN174864"
 >intarray Functions and Operators</A
 >
   </DT
 ><DT
 >soundex,
     <A
-HREF="fuzzystrmatch.html#AEN169312"
+HREF="fuzzystrmatch.html#AEN174163"
 >Soundex</A
 >
   </DT
@@ -18044,7 +18122,7 @@
 ><DT
 >ssl_cipher,
     <A
-HREF="sslinfo.html#AEN174144"
+HREF="sslinfo.html#AEN179001"
 >Functions Provided</A
 >
   </DT
@@ -18058,28 +18136,28 @@
 ><DT
 >ssl_client_cert_present,
     <A
-HREF="sslinfo.html#AEN174144"
+HREF="sslinfo.html#AEN179001"
 >Functions Provided</A
 >
   </DT
 ><DT
 >ssl_client_dn,
     <A
-HREF="sslinfo.html#AEN174144"
+HREF="sslinfo.html#AEN179001"
 >Functions Provided</A
 >
   </DT
 ><DT
 >ssl_client_dn_field,
     <A
-HREF="sslinfo.html#AEN174144"
+HREF="sslinfo.html#AEN179001"
 >Functions Provided</A
 >
   </DT
 ><DT
 >ssl_client_serial,
     <A
-HREF="sslinfo.html#AEN174144"
+HREF="sslinfo.html#AEN179001"
 >Functions Provided</A
 >
   </DT
@@ -18100,21 +18178,21 @@
 ><DT
 >ssl_issuer_dn,
     <A
-HREF="sslinfo.html#AEN174144"
+HREF="sslinfo.html#AEN179001"
 >Functions Provided</A
 >
   </DT
 ><DT
 >ssl_issuer_field,
     <A
-HREF="sslinfo.html#AEN174144"
+HREF="sslinfo.html#AEN179001"
 >Functions Provided</A
 >
   </DT
 ><DT
 >ssl_is_used,
     <A
-HREF="sslinfo.html#AEN174144"
+HREF="sslinfo.html#AEN179001"
 >Functions Provided</A
 >
   </DT
@@ -18135,7 +18213,7 @@
 ><DT
 >ssl_version,
     <A
-HREF="sslinfo.html#AEN174144"
+HREF="sslinfo.html#AEN179001"
 >Functions Provided</A
 >
   </DT
@@ -18398,21 +18476,21 @@
 ><DT
 >subarray,
     <A
-HREF="intarray.html#AEN170013"
+HREF="intarray.html#AEN174864"
 >intarray Functions and Operators</A
 >
   </DT
 ><DT
 >subltree,
     <A
-HREF="ltree.html#AEN170683"
+HREF="ltree.html#AEN175534"
 >Operators and Functions</A
 >
   </DT
 ><DT
 >subpath,
     <A
-HREF="ltree.html#AEN170683"
+HREF="ltree.html#AEN175534"
 >Operators and Functions</A
 >
   </DT
@@ -18503,7 +18581,7 @@
 ><DT
 >svals,
     <A
-HREF="hstore.html#AEN169412"
+HREF="hstore.html#AEN174263"
 >hstore Operators and Functions</A
 >
   </DT
@@ -18599,7 +18677,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN183667"
+NAME="AEN188565"
 >T</A
 ></H2
 ><DL
@@ -18674,7 +18752,7 @@
 ><DT
 >renaming,
     <A
-HREF="ddl-alter.html#AEN2876"
+HREF="ddl-alter.html#AEN2881"
 >Renaming a Table</A
 >
   </DT
@@ -18926,7 +19004,7 @@
 ><DT
 >text2ltree,
     <A
-HREF="ltree.html#AEN170683"
+HREF="ltree.html#AEN175534"
 >Operators and Functions</A
 >
   </DT
@@ -18962,7 +19040,7 @@
 >Date/Time Types</A
 >,
     <A
-HREF="datatype-datetime.html#AEN6039"
+HREF="datatype-datetime.html#AEN6115"
 >Times</A
 >
   </DT
@@ -18971,7 +19049,7 @@
 ><DT
 >constants,
     <A
-HREF="datatype-datetime.html#AEN6209"
+HREF="datatype-datetime.html#AEN6285"
 >Special Values</A
 >
   </DT
@@ -19019,7 +19097,7 @@
 >Date/Time Types</A
 >,
     <A
-HREF="datatype-datetime.html#AEN6039"
+HREF="datatype-datetime.html#AEN6115"
 >Times</A
 >
   </DT
@@ -19030,7 +19108,7 @@
 >Date/Time Types</A
 >,
     <A
-HREF="datatype-datetime.html#AEN6039"
+HREF="datatype-datetime.html#AEN6115"
 >Times</A
 >
   </DT
@@ -19142,7 +19220,7 @@
 >Date/Time Types</A
 >,
     <A
-HREF="datatype-datetime.html#AEN6159"
+HREF="datatype-datetime.html#AEN6235"
 >Time Stamps</A
 >
   </DT
@@ -19153,7 +19231,7 @@
 >Date/Time Types</A
 >,
     <A
-HREF="datatype-datetime.html#AEN6159"
+HREF="datatype-datetime.html#AEN6235"
 >Time Stamps</A
 >
   </DT
@@ -19164,7 +19242,7 @@
 >Date/Time Types</A
 >,
     <A
-HREF="datatype-datetime.html#AEN6159"
+HREF="datatype-datetime.html#AEN6235"
 >Time Stamps</A
 >
   </DT
@@ -19212,7 +19290,7 @@
 ><DT
 >per-column storage settings,
     <A
-HREF="sql-altertable.html#AEN71979"
+HREF="sql-altertable.html#AEN72289"
 >Description</A
 >
   </DT
@@ -19259,7 +19337,7 @@
 ><DT
 >and locales,
     <A
-HREF="locale.html#AEN36366"
+HREF="locale.html#AEN36639"
 >Behavior</A
 >
   </DT
@@ -20013,7 +20091,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN184130"
+NAME="AEN189028"
 >U</A
 ></H2
 ><DL
@@ -20035,7 +20113,7 @@
 >unaccent</A
 >,
     <A
-HREF="unaccent.html#AEN174776"
+HREF="unaccent.html#AEN179633"
 >Functions</A
 >
   </DT
@@ -20093,7 +20171,7 @@
 ><DT
 >uniq,
     <A
-HREF="intarray.html#AEN170013"
+HREF="intarray.html#AEN174864"
 >intarray Functions and Operators</A
 >
   </DT
@@ -20215,10 +20293,25 @@
 >UPDATE</A
 >
   </DT
+><DD
+><DL
+><DT
+>RETURNING,
+    <A
+HREF="dml-returning.html"
+>Returning Data From Modified Rows</A
+>
+  </DT
+><DD
+><DL
+></DL
+></DD
+></DL
+></DD
 ><DT
 >update_process_title configuration parameter,
     <A
-HREF="runtime-config-logging.html#AEN33166"
+HREF="runtime-config-logging.html#AEN33439"
 >Process Title</A
 >
   </DT
@@ -20252,7 +20345,7 @@
 ><DT
 >and locales,
     <A
-HREF="locale.html#AEN36366"
+HREF="locale.html#AEN36639"
 >Behavior</A
 >
   </DT
@@ -20351,21 +20444,21 @@
 ><DT
 >uuid_generate_v1,
     <A
-HREF="uuid-ossp.html#AEN174799"
+HREF="uuid-ossp.html#AEN179656"
 >uuid-ossp Functions</A
 >
   </DT
 ><DT
 >uuid_generate_v1mc,
     <A
-HREF="uuid-ossp.html#AEN174799"
+HREF="uuid-ossp.html#AEN179656"
 >uuid-ossp Functions</A
 >
   </DT
 ><DT
 >uuid_generate_v3,
     <A
-HREF="uuid-ossp.html#AEN174799"
+HREF="uuid-ossp.html#AEN179656"
 >uuid-ossp Functions</A
 >
   </DT
@@ -20376,7 +20469,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN184249"
+NAME="AEN189149"
 >V</A
 ></H2
 ><DL
@@ -20705,7 +20798,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN184354"
+NAME="AEN189254"
 >W</A
 ></H2
 ><DL
@@ -20843,7 +20936,7 @@
 ><DT
 >in PL/pgSQL,
     <A
-HREF="plpgsql-control-structures.html#AEN62865"
+HREF="plpgsql-control-structures.html#AEN63157"
 >WHILE</A
 >
   </DT
@@ -20997,7 +21090,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN184452"
+NAME="AEN189352"
 >X</A
 ></H2
 ><DL
@@ -21039,7 +21132,7 @@
 ><DT
 >XML option,
     <A
-HREF="datatype-xml.html#AEN7438"
+HREF="datatype-xml.html#AEN7514"
 >Creating XML Values</A
 >,
     <A
@@ -21075,21 +21168,21 @@
 ><DT
 >xmlcomment,
     <A
-HREF="functions-xml.html#AEN17024"
+HREF="functions-xml.html#AEN17202"
 >xmlcomment</A
 >
   </DT
 ><DT
 >xmlconcat,
     <A
-HREF="functions-xml.html#AEN17040"
+HREF="functions-xml.html#AEN17218"
 >xmlconcat</A
 >
   </DT
 ><DT
 >xmlelement,
     <A
-HREF="functions-xml.html#AEN17058"
+HREF="functions-xml.html#AEN17236"
 >xmlelement</A
 >
   </DT
@@ -21103,7 +21196,7 @@
 ><DT
 >xmlforest,
     <A
-HREF="functions-xml.html#AEN17090"
+HREF="functions-xml.html#AEN17268"
 >xmlforest</A
 >
   </DT
@@ -21117,28 +21210,28 @@
 ><DT
 >xmlparse,
     <A
-HREF="datatype-xml.html#AEN7438"
+HREF="datatype-xml.html#AEN7514"
 >Creating XML Values</A
 >
   </DT
 ><DT
 >xmlpi,
     <A
-HREF="functions-xml.html#AEN17111"
+HREF="functions-xml.html#AEN17289"
 >xmlpi</A
 >
   </DT
 ><DT
 >xmlroot,
     <A
-HREF="functions-xml.html#AEN17126"
+HREF="functions-xml.html#AEN17304"
 >xmlroot</A
 >
   </DT
 ><DT
 >xmlserialize,
     <A
-HREF="datatype-xml.html#AEN7438"
+HREF="datatype-xml.html#AEN7514"
 >Creating XML Values</A
 >
   </DT
@@ -21180,14 +21273,14 @@
 ><DT
 >xpath_table,
     <A
-HREF="xml2.html#AEN174996"
+HREF="xml2.html#AEN179853"
 >xpath_table</A
 >
   </DT
 ><DT
 >xslt_process,
     <A
-HREF="xml2.html#AEN175075"
+HREF="xml2.html#AEN179932"
 >xslt_process</A
 >
   </DT
@@ -21198,7 +21291,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN184534"
+NAME="AEN189434"
 >Y</A
 ></H2
 ><DL
@@ -21216,7 +21309,7 @@
 ><H2
 CLASS="INDEXDIV"
 ><A
-NAME="AEN184539"
+NAME="AEN189439"
 >Z</A
 ></H2
 ><DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/brin-builtin-opclasses.html postgresql-9.5-9.5.8/doc/src/sgml/html/brin-builtin-opclasses.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/brin-builtin-opclasses.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/brin-builtin-opclasses.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="BRIN Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/brin-extensibility.html postgresql-9.5-9.5.8/doc/src/sgml/html/brin-extensibility.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/brin-extensibility.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/brin-extensibility.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="BRIN Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/brin.html postgresql-9.5-9.5.8/doc/src/sgml/html/brin.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/brin.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/brin.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/brin-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/brin-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/brin-intro.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/brin-intro.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="BRIN Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/btree-gin.html postgresql-9.5-9.5.8/doc/src/sgml/html/btree-gin.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/btree-gin.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/btree-gin.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -190,7 +190,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167653"
+NAME="AEN172504"
 >F.4.1. Example Usage</A
 ></H2
 ><PRE
@@ -206,7 +206,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167656"
+NAME="AEN172507"
 >F.4.2. Authors</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/btree-gist.html postgresql-9.5-9.5.8/doc/src/sgml/html/btree-gist.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/btree-gist.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/btree-gist.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -266,7 +266,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167712"
+NAME="AEN172563"
 >F.5.1. Example Usage</A
 ></H2
 ><P
@@ -318,7 +318,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167721"
+NAME="AEN172572"
 >F.5.2. Authors</A
 ></H2
 ><P
@@ -328,7 +328,7 @@
 HREF="mailto:teodor@stack.net"
 >teodor@stack.net</A
 >&#62;</CODE
->) ,
+>),
    Oleg Bartunov (<CODE
 CLASS="EMAIL"
 >&#60;<A
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/bug-reporting.html postgresql-9.5-9.5.8/doc/src/sgml/html/bug-reporting.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/bug-reporting.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/bug-reporting.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Preface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -435,7 +435,7 @@
       snapshot, mention that, including the commit hash.
      </P
 ><P
->      If your version is older than 9.5.2 we will almost certainly
+>      If your version is older than 9.5.8 we will almost certainly
       tell you to upgrade. There are many bug fixes and improvements
       in each new release, so it is quite possible that a bug you have
       encountered in an older release of <SPAN
@@ -551,7 +551,7 @@
 >   Another method is to fill in the bug report web-form available
    at the project's
    <A
-HREF="http://www.postgresql.org/"
+HREF="https://www.postgresql.org/"
 TARGET="_top"
 >web site</A
 >.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-aggregate.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-aggregate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-aggregate.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-aggregate.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN100373"
+NAME="AEN100711"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-am.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-am.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-am.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-am.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -113,7 +113,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN100551"
+NAME="AEN100889"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-amop.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-amop.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-amop.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-amop.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -121,7 +121,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN100851"
+NAME="AEN101189"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-amproc.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-amproc.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-amproc.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-amproc.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN100979"
+NAME="AEN101317"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-attrdef.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-attrdef.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-attrdef.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-attrdef.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN101059"
+NAME="AEN101397"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-attribute.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-attribute.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-attribute.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-attribute.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN101125"
+NAME="AEN101463"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-authid.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-authid.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-authid.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-authid.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -165,7 +165,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN101337"
+NAME="AEN101675"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-auth-members.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-auth-members.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-auth-members.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-auth-members.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -121,7 +121,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN101438"
+NAME="AEN101776"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-cast.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-cast.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-cast.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-cast.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN101502"
+NAME="AEN101840"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-class.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-class.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-class.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-class.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN101594"
+NAME="AEN101932"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-collation.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-collation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-collation.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-collation.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -113,7 +113,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN101917"
+NAME="AEN102255"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-constraint.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-constraint.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-constraint.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-constraint.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -125,7 +125,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN102011"
+NAME="AEN102349"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-conversion.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-conversion.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-conversion.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-conversion.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -112,7 +112,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN102270"
+NAME="AEN102608"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-database.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-database.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-database.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-database.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -128,7 +128,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN102358"
+NAME="AEN102696"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-db-role-setting.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-db-role-setting.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-db-role-setting.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-db-role-setting.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -121,7 +121,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN102498"
+NAME="AEN102836"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-default-acl.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-default-acl.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-default-acl.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-default-acl.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,7 +108,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN102543"
+NAME="AEN102881"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-depend.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-depend.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-depend.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-depend.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN102623"
+NAME="AEN102961"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-description.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-description.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-description.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-description.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN102755"
+NAME="AEN103093"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-enum.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-enum.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-enum.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-enum.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -113,7 +113,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN102807"
+NAME="AEN103145"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-event-trigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-event-trigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-event-trigger.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-event-trigger.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN102864"
+NAME="AEN103202"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-extension.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-extension.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-extension.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-extension.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -112,7 +112,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN102939"
+NAME="AEN103277"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-foreign-data-wrapper.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-foreign-data-wrapper.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-foreign-data-wrapper.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-foreign-data-wrapper.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103031"
+NAME="AEN103369"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-foreign-server.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-foreign-server.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-foreign-server.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-foreign-server.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103110"
+NAME="AEN103448"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-foreign-table.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-foreign-table.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-foreign-table.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-foreign-table.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -118,7 +118,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103195"
+NAME="AEN103533"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-index.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-index.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-index.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-index.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -112,7 +112,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103243"
+NAME="AEN103581"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-inherits.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-inherits.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-inherits.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-inherits.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103431"
+NAME="AEN103769"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-language.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-language.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-language.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-language.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -116,7 +116,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103478"
+NAME="AEN103816"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-largeobject.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-largeobject.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-largeobject.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-largeobject.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -149,7 +149,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103587"
+NAME="AEN103925"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-largeobject-metadata.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-largeobject-metadata.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-largeobject-metadata.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-largeobject-metadata.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -116,7 +116,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103636"
+NAME="AEN103974"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-namespace.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-namespace.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-namespace.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-namespace.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103680"
+NAME="AEN104018"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-opclass.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-opclass.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-opclass.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-opclass.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103733"
+NAME="AEN104071"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-operator.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-operator.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-operator.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-operator.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN103843"
+NAME="AEN104181"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-opfamily.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-opfamily.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-opfamily.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-opfamily.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN104007"
+NAME="AEN104345"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-pltemplate.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-pltemplate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-pltemplate.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-pltemplate.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN104082"
+NAME="AEN104420"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-policy.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-policy.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-policy.html	2016-03-28 20:21:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-policy.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -116,7 +116,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN104156"
+NAME="AEN104494"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-proc.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-proc.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-proc.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-proc.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -126,7 +126,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN104241"
+NAME="AEN104579"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-range.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-range.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-range.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-range.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -18,15 +18,15 @@
 TITLE="pg_proc"
 HREF="catalog-pg-proc.html"><LINK
 REL="NEXT"
-TITLE="pg_rewrite"
-HREF="catalog-pg-rewrite.html"><LINK
+TITLE="pg_replication_origin"
+HREF="catalog-pg-replication-origin.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="pg_rewrite"
-HREF="catalog-pg-rewrite.html"
+TITLE="pg_replication_origin"
+HREF="catalog-pg-replication-origin.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN104535"
+NAME="AEN104873"
 ></A
 ><P
 ><B
@@ -352,7 +352,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="catalog-pg-rewrite.html"
+HREF="catalog-pg-replication-origin.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -381,7 +381,7 @@
 VALIGN="top"
 ><TT
 CLASS="STRUCTNAME"
->pg_rewrite</TT
+>pg_replication_origin</TT
 ></TD
 ></TR
 ></TABLE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-replication-origin.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-replication-origin.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-replication-origin.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-replication-origin.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,24 +9,24 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
 HREF="catalogs.html"><LINK
 REL="PREVIOUS"
+TITLE="pg_range"
+HREF="catalog-pg-range.html"><LINK
+REL="NEXT"
 TITLE="pg_rewrite"
 HREF="catalog-pg-rewrite.html"><LINK
-REL="NEXT"
-TITLE="pg_replication_origin_status"
-HREF="catalog-pg-replication-origin-status.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -53,8 +53,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="pg_rewrite"
-HREF="catalog-pg-rewrite.html"
+TITLE="pg_range"
+HREF="catalog-pg-range.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="pg_replication_origin_status"
-HREF="catalog-pg-replication-origin-status.html"
+TITLE="pg_rewrite"
+HREF="catalog-pg-rewrite.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-REPLICATION-ORIGIN"
->49.40. <TT
+>49.39. <TT
 CLASS="STRUCTNAME"
 >pg_replication_origin</TT
 ></A
@@ -112,11 +112,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN104715"
+NAME="AEN104958"
 ></A
 ><P
 ><B
->Table 49-40. <TT
+>Table 49-39. <TT
 CLASS="STRUCTNAME"
 >pg_replication_origin</TT
 > Columns</B
@@ -191,7 +191,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="catalog-pg-rewrite.html"
+HREF="catalog-pg-range.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -209,7 +209,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="catalog-pg-replication-origin-status.html"
+HREF="catalog-pg-rewrite.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -221,7 +221,7 @@
 VALIGN="top"
 ><TT
 CLASS="STRUCTNAME"
->pg_rewrite</TT
+>pg_range</TT
 ></TD
 ><TD
 WIDTH="34%"
@@ -238,7 +238,7 @@
 VALIGN="top"
 ><TT
 CLASS="STRUCTNAME"
->pg_replication_origin_status</TT
+>pg_rewrite</TT
 ></TD
 ></TR
 ></TABLE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-replication-origin-status.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-replication-origin-status.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-replication-origin-status.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-replication-origin-status.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,303 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->pg_replication_origin_status</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REV="MADE"
-HREF="mailto:pgsql-docs@postgresql.org"><LINK
-REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="System Catalogs"
-HREF="catalogs.html"><LINK
-REL="PREVIOUS"
-TITLE="pg_replication_origin"
-HREF="catalog-pg-replication-origin.html"><LINK
-REL="NEXT"
-TITLE="pg_replication_slots"
-HREF="catalog-pg-replication-slots.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="stylesheet.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html; charset=ISO-8859-1"><META
-NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="4"
-ALIGN="center"
-VALIGN="bottom"
-><A
-HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
-></TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="top"
-><A
-TITLE="pg_replication_origin"
-HREF="catalog-pg-replication-origin.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="catalogs.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="60%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 49. System Catalogs</TD
-><TD
-WIDTH="20%"
-ALIGN="right"
-VALIGN="top"
-><A
-TITLE="pg_replication_slots"
-HREF="catalog-pg-replication-slots.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="CATALOG-PG-REPLICATION-ORIGIN-STATUS"
->49.41. <TT
-CLASS="STRUCTNAME"
->pg_replication_origin_status</TT
-></A
-></H1
-><P
->   The <TT
-CLASS="STRUCTNAME"
->pg_replication_origin_status</TT
-> view
-   contains information about how far replay for a certain origin has
-   progressed.  For more on replication origins
-   see <A
-HREF="replication-origins.html"
->Chapter 47</A
->.
-  </P
-><DIV
-CLASS="TABLE"
-><A
-NAME="AEN104748"
-></A
-><P
-><B
->Table 49-41. <TT
-CLASS="STRUCTNAME"
->pg_replication_origin_status</TT
-> Columns</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><COL><COL><COL><THEAD
-><TR
-><TH
->Name</TH
-><TH
->Type</TH
-><TH
->References</TH
-><TH
->Description</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->local_id</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->Oid</TT
-></TD
-><TD
-><TT
-CLASS="LITERAL"
-><A
-HREF="catalog-pg-replication-origin.html"
-><TT
-CLASS="STRUCTNAME"
->pg_replication_origin</TT
-></A
->.roident</TT
-></TD
-><TD
->internal node identifier</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->external_id</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->text</TT
-></TD
-><TD
-><TT
-CLASS="LITERAL"
-><A
-HREF="catalog-pg-replication-origin.html"
-><TT
-CLASS="STRUCTNAME"
->pg_replication_origin</TT
-></A
->.roname</TT
-></TD
-><TD
->external node identifier</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->remote_lsn</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->pg_lsn</TT
-></TD
-><TD
->&nbsp;</TD
-><TD
->The origin node's LSN up to which data has been replicated.</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->local_lsn</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->pg_lsn</TT
-></TD
-><TD
->&nbsp;</TD
-><TD
->       This node's LSN at which <TT
-CLASS="LITERAL"
->remote_lsn</TT
-> has
-       been replicated. Used to flush commit records before persisting
-       data to disk when using asynchronous commits.
-      </TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="catalog-pg-replication-origin.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="catalog-pg-replication-slots.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><TT
-CLASS="STRUCTNAME"
->pg_replication_origin</TT
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="catalogs.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><TT
-CLASS="STRUCTNAME"
->pg_replication_slots</TT
-></TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-replication-slots.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-replication-slots.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-replication-slots.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-replication-slots.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,431 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->pg_replication_slots</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REV="MADE"
-HREF="mailto:pgsql-docs@postgresql.org"><LINK
-REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="System Catalogs"
-HREF="catalogs.html"><LINK
-REL="PREVIOUS"
-TITLE="pg_replication_origin_status"
-HREF="catalog-pg-replication-origin-status.html"><LINK
-REL="NEXT"
-TITLE="pg_seclabel"
-HREF="catalog-pg-seclabel.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="stylesheet.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html; charset=ISO-8859-1"><META
-NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="4"
-ALIGN="center"
-VALIGN="bottom"
-><A
-HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
-></TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="top"
-><A
-TITLE="pg_replication_origin_status"
-HREF="catalog-pg-replication-origin-status.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="catalogs.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="60%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 49. System Catalogs</TD
-><TD
-WIDTH="20%"
-ALIGN="right"
-VALIGN="top"
-><A
-TITLE="pg_seclabel"
-HREF="catalog-pg-seclabel.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="CATALOG-PG-REPLICATION-SLOTS"
->49.42. <TT
-CLASS="STRUCTNAME"
->pg_replication_slots</TT
-></A
-></H1
-><P
->   The <TT
-CLASS="STRUCTNAME"
->pg_replication_slots</TT
-> view provides a listing
-   of all replication slots that currently exist on the database cluster,
-   along with their current state.
-  </P
-><P
->   For more on replication slots,
-   see <A
-HREF="warm-standby.html#STREAMING-REPLICATION-SLOTS"
->Section 25.2.6</A
-> and <A
-HREF="logicaldecoding.html"
->Chapter 46</A
->.
-  </P
-><DIV
-CLASS="TABLE"
-><A
-NAME="AEN104804"
-></A
-><P
-><B
->Table 49-42. <TT
-CLASS="STRUCTNAME"
->pg_replication_slots</TT
-> Columns</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><COL><COL><COL><THEAD
-><TR
-><TH
->Name</TH
-><TH
->Type</TH
-><TH
->References</TH
-><TH
->Description</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->slot_name</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->name</TT
-></TD
-><TD
->&nbsp;</TD
-><TD
->A unique, cluster-wide identifier for the replication slot</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->plugin</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->name</TT
-></TD
-><TD
->&nbsp;</TD
-><TD
->The base name of the shared object containing the output plugin this logical slot is using, or null for physical slots.</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->slot_type</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->text</TT
-></TD
-><TD
->&nbsp;</TD
-><TD
->The slot type - <TT
-CLASS="LITERAL"
->physical</TT
-> or <TT
-CLASS="LITERAL"
->logical</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->datoid</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->oid</TT
-></TD
-><TD
-><TT
-CLASS="LITERAL"
-><A
-HREF="catalog-pg-database.html"
-><TT
-CLASS="STRUCTNAME"
->pg_database</TT
-></A
->.oid</TT
-></TD
-><TD
->The OID of the database this slot is associated with, or
-      null. Only logical slots have an associated database.</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->database</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->text</TT
-></TD
-><TD
-><TT
-CLASS="LITERAL"
-><A
-HREF="catalog-pg-database.html"
-><TT
-CLASS="STRUCTNAME"
->pg_database</TT
-></A
->.datname</TT
-></TD
-><TD
->The name of the database this slot is associated with, or
-      null. Only logical slots have an associated database.</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->active</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->boolean</TT
-></TD
-><TD
->&nbsp;</TD
-><TD
->True if this slot is currently actively being used</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->active_pid</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->integer</TT
-></TD
-><TD
->&nbsp;</TD
-><TD
->The process ID of the session using this slot if the slot
-       is currently actively being used. <TT
-CLASS="LITERAL"
->NULL</TT
-> if
-       inactive.
-      </TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->xmin</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->xid</TT
-></TD
-><TD
->&nbsp;</TD
-><TD
->The oldest transaction that this slot needs the database to
-      retain.  <TT
-CLASS="LITERAL"
->VACUUM</TT
-> cannot remove tuples deleted
-      by any later transaction.
-      </TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->catalog_xmin</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->xid</TT
-></TD
-><TD
->&nbsp;</TD
-><TD
->The oldest transaction affecting the system catalogs that this
-      slot needs the database to retain.  <TT
-CLASS="LITERAL"
->VACUUM</TT
-> cannot
-      remove catalog tuples deleted by any later transaction.
-      </TD
-></TR
-><TR
-><TD
-><TT
-CLASS="STRUCTFIELD"
->restart_lsn</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->pg_lsn</TT
-></TD
-><TD
->&nbsp;</TD
-><TD
->The address (<TT
-CLASS="LITERAL"
->LSN</TT
->) of oldest WAL which still
-      might be required by the consumer of this slot and thus won't be
-      automatically removed during checkpoints.
-      </TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="catalog-pg-replication-origin-status.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="catalog-pg-seclabel.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><TT
-CLASS="STRUCTNAME"
->pg_replication_origin_status</TT
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="catalogs.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><TT
-CLASS="STRUCTNAME"
->pg_seclabel</TT
-></TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-rewrite.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-rewrite.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-rewrite.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-rewrite.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,24 +9,24 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
 HREF="catalogs.html"><LINK
 REL="PREVIOUS"
-TITLE="pg_range"
-HREF="catalog-pg-range.html"><LINK
-REL="NEXT"
 TITLE="pg_replication_origin"
 HREF="catalog-pg-replication-origin.html"><LINK
+REL="NEXT"
+TITLE="pg_seclabel"
+HREF="catalog-pg-seclabel.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -53,8 +53,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="pg_range"
-HREF="catalog-pg-range.html"
+TITLE="pg_replication_origin"
+HREF="catalog-pg-replication-origin.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="pg_replication_origin"
-HREF="catalog-pg-replication-origin.html"
+TITLE="pg_seclabel"
+HREF="catalog-pg-seclabel.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-REWRITE"
->49.39. <TT
+>49.40. <TT
 CLASS="STRUCTNAME"
 >pg_rewrite</TT
 ></A
@@ -107,11 +107,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN104619"
+NAME="AEN104990"
 ></A
 ><P
 ><B
->Table 49-39. <TT
+>Table 49-40. <TT
 CLASS="STRUCTNAME"
 >pg_rewrite</TT
 > Columns</B
@@ -364,7 +364,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="catalog-pg-range.html"
+HREF="catalog-pg-replication-origin.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -382,7 +382,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="catalog-pg-replication-origin.html"
+HREF="catalog-pg-seclabel.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -394,7 +394,7 @@
 VALIGN="top"
 ><TT
 CLASS="STRUCTNAME"
->pg_range</TT
+>pg_replication_origin</TT
 ></TD
 ><TD
 WIDTH="34%"
@@ -411,7 +411,7 @@
 VALIGN="top"
 ><TT
 CLASS="STRUCTNAME"
->pg_replication_origin</TT
+>pg_seclabel</TT
 ></TD
 ></TR
 ></TABLE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-seclabel.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-seclabel.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-seclabel.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-seclabel.html	2017-08-07 21:32:29.000000000 +0000
@@ -9,14 +9,14 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
 HREF="catalogs.html"><LINK
 REL="PREVIOUS"
-TITLE="pg_replication_slots"
-HREF="catalog-pg-replication-slots.html"><LINK
+TITLE="pg_rewrite"
+HREF="catalog-pg-rewrite.html"><LINK
 REL="NEXT"
 TITLE="pg_shdepend"
 HREF="catalog-pg-shdepend.html"><LINK
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -53,8 +53,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="pg_replication_slots"
-HREF="catalog-pg-replication-slots.html"
+TITLE="pg_rewrite"
+HREF="catalog-pg-rewrite.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-SECLABEL"
->49.43. <TT
+>49.41. <TT
 CLASS="STRUCTNAME"
 >pg_seclabel</TT
 ></A
@@ -127,11 +127,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN104909"
+NAME="AEN105090"
 ></A
 ><P
 ><B
->Table 49-43. <TT
+>Table 49-41. <TT
 CLASS="STRUCTNAME"
 >pg_seclabel</TT
 > Columns</B
@@ -271,7 +271,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="catalog-pg-replication-slots.html"
+HREF="catalog-pg-rewrite.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -301,7 +301,7 @@
 VALIGN="top"
 ><TT
 CLASS="STRUCTNAME"
->pg_replication_slots</TT
+>pg_rewrite</TT
 ></TD
 ><TD
 WIDTH="34%"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-shdepend.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-shdepend.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-shdepend.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-shdepend.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-SHDEPEND"
->49.44. <TT
+>49.42. <TT
 CLASS="STRUCTNAME"
 >pg_shdepend</TT
 ></A
@@ -137,11 +137,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN104974"
+NAME="AEN105155"
 ></A
 ><P
 ><B
->Table 49-44. <TT
+>Table 49-42. <TT
 CLASS="STRUCTNAME"
 >pg_shdepend</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-shdescription.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-shdescription.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-shdescription.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-shdescription.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-SHDESCRIPTION"
->49.45. <TT
+>49.43. <TT
 CLASS="STRUCTNAME"
 >pg_shdescription</TT
 ></A
@@ -142,11 +142,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105092"
+NAME="AEN105273"
 ></A
 ><P
 ><B
->Table 49-45. <TT
+>Table 49-43. <TT
 CLASS="STRUCTNAME"
 >pg_shdescription</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-shseclabel.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-shseclabel.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-shseclabel.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-shseclabel.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-SHSECLABEL"
->49.46. <TT
+>49.44. <TT
 CLASS="STRUCTNAME"
 >pg_shseclabel</TT
 ></A
@@ -139,11 +139,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105142"
+NAME="AEN105323"
 ></A
 ><P
 ><B
->Table 49-46. <TT
+>Table 49-44. <TT
 CLASS="STRUCTNAME"
 >pg_shseclabel</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-statistic.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-statistic.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-statistic.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-statistic.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-STATISTIC"
->49.47. <TT
+>49.45. <TT
 CLASS="STRUCTNAME"
 >pg_statistic</TT
 ></A
@@ -237,11 +237,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105220"
+NAME="AEN105401"
 ></A
 ><P
 ><B
->Table 49-47. <TT
+>Table 49-45. <TT
 CLASS="STRUCTNAME"
 >pg_statistic</TT
 > Columns</B
@@ -378,12 +378,12 @@
 >The number of distinct nonnull data values in the column.
       A value greater than zero is the actual number of distinct values.
       A value less than zero is the negative of a multiplier for the number
-      of rows in the table; for example, a column in which values appear about
-      twice on the average could be represented by
-      <TT
+      of rows in the table; for example, a column in which about 80% of the
+      values are nonnull and each nonnull value appears about twice on
+      average could be represented by <TT
 CLASS="STRUCTFIELD"
 >stadistinct</TT
-> = -0.5.
+> = -0.4.
       A zero value means the number of distinct values is unknown.
       </TD
 ></TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-tablespace.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-tablespace.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-tablespace.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-tablespace.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-TABLESPACE"
->49.48. <TT
+>49.46. <TT
 CLASS="STRUCTNAME"
 >pg_tablespace</TT
 ></A
@@ -121,11 +121,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105336"
+NAME="AEN105517"
 ></A
 ><P
 ><B
->Table 49-48. <TT
+>Table 49-46. <TT
 CLASS="STRUCTNAME"
 >pg_tablespace</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-transform.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-transform.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-transform.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-transform.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-TRANSFORM"
->49.49. <TT
+>49.47. <TT
 CLASS="STRUCTNAME"
 >pg_transform</TT
 ></A
@@ -112,11 +112,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105396"
+NAME="AEN105577"
 ></A
 ><P
 ><B
->Table 49-49. <TT
+>Table 49-47. <TT
 CLASS="STRUCTNAME"
 >pg_transform</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-trigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-trigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-trigger.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-trigger.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-TRIGGER"
->49.50. <TT
+>49.48. <TT
 CLASS="STRUCTNAME"
 >pg_trigger</TT
 ></A
@@ -113,11 +113,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105455"
+NAME="AEN105636"
 ></A
 ><P
 ><B
->Table 49-50. <TT
+>Table 49-48. <TT
 CLASS="STRUCTNAME"
 >pg_trigger</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-ts-config.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-ts-config.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-ts-config.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-ts-config.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-TS-CONFIG"
->49.51. <TT
+>49.49. <TT
 CLASS="STRUCTNAME"
 >pg_ts_config</TT
 ></A
@@ -131,11 +131,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105637"
+NAME="AEN105818"
 ></A
 ><P
 ><B
->Table 49-51. <TT
+>Table 49-49. <TT
 CLASS="STRUCTNAME"
 >pg_ts_config</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-ts-config-map.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-ts-config-map.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-ts-config-map.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-ts-config-map.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-TS-CONFIG-MAP"
->49.52. <TT
+>49.50. <TT
 CLASS="STRUCTNAME"
 >pg_ts_config_map</TT
 ></A
@@ -120,11 +120,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105702"
+NAME="AEN105883"
 ></A
 ><P
 ><B
->Table 49-52. <TT
+>Table 49-50. <TT
 CLASS="STRUCTNAME"
 >pg_ts_config_map</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-ts-dict.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-ts-dict.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-ts-dict.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-ts-dict.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-TS-DICT"
->49.53. <TT
+>49.51. <TT
 CLASS="STRUCTNAME"
 >pg_ts_dict</TT
 ></A
@@ -127,11 +127,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105760"
+NAME="AEN105941"
 ></A
 ><P
 ><B
->Table 49-53. <TT
+>Table 49-51. <TT
 CLASS="STRUCTNAME"
 >pg_ts_dict</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-ts-parser.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-ts-parser.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-ts-parser.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-ts-parser.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-TS-PARSER"
->49.54. <TT
+>49.52. <TT
 CLASS="STRUCTNAME"
 >pg_ts_parser</TT
 ></A
@@ -121,11 +121,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105832"
+NAME="AEN106013"
 ></A
 ><P
 ><B
->Table 49-54. <TT
+>Table 49-52. <TT
 CLASS="STRUCTNAME"
 >pg_ts_parser</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-ts-template.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-ts-template.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-ts-template.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-ts-template.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-TS-TEMPLATE"
->49.55. <TT
+>49.53. <TT
 CLASS="STRUCTNAME"
 >pg_ts_template</TT
 ></A
@@ -121,11 +121,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105927"
+NAME="AEN106108"
 ></A
 ><P
 ><B
->Table 49-55. <TT
+>Table 49-53. <TT
 CLASS="STRUCTNAME"
 >pg_ts_template</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-type.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-type.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-type.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-type.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-TYPE"
->49.56. <TT
+>49.54. <TT
 CLASS="STRUCTNAME"
 >pg_type</TT
 ></A
@@ -123,11 +123,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN105992"
+NAME="AEN106173"
 ></A
 ><P
 ><B
->Table 49-56. <TT
+>Table 49-54. <TT
 CLASS="STRUCTNAME"
 >pg_type</TT
 > Columns</B
@@ -374,7 +374,7 @@
 >.
        See <A
 HREF="catalog-pg-type.html#CATALOG-TYPCATEGORY-TABLE"
->Table 49-57</A
+>Table 49-55</A
 >.
       </TD
 ></TR
@@ -1222,7 +1222,7 @@
 ><P
 >   <A
 HREF="catalog-pg-type.html#CATALOG-TYPCATEGORY-TABLE"
->Table 49-57</A
+>Table 49-55</A
 > lists the system-defined values
    of <TT
 CLASS="STRUCTFIELD"
@@ -1238,7 +1238,7 @@
 ></A
 ><P
 ><B
->Table 49-57. <TT
+>Table 49-55. <TT
 CLASS="STRUCTFIELD"
 >typcategory</TT
 > Codes</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-user-mapping.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-user-mapping.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalog-pg-user-mapping.html	2016-03-28 20:21:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalog-pg-user-mapping.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="CATALOG-PG-USER-MAPPING"
->49.57. <TT
+>49.55. <TT
 CLASS="STRUCTNAME"
 >pg_user_mapping</TT
 ></A
@@ -117,11 +117,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN106458"
+NAME="AEN106639"
 ></A
 ><P
 ><B
->Table 49-58. <TT
+>Table 49-56. <TT
 CLASS="STRUCTNAME"
 >pg_user_mapping</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalogs.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalogs.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalogs.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalogs.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -404,14 +404,6 @@
 ></DT
 ><DT
 >49.39. <A
-HREF="catalog-pg-rewrite.html"
-><TT
-CLASS="STRUCTNAME"
->pg_rewrite</TT
-></A
-></DT
-><DT
->49.40. <A
 HREF="catalog-pg-replication-origin.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -419,23 +411,15 @@
 ></A
 ></DT
 ><DT
->49.41. <A
-HREF="catalog-pg-replication-origin-status.html"
-><TT
-CLASS="STRUCTNAME"
->pg_replication_origin_status</TT
-></A
-></DT
-><DT
->49.42. <A
-HREF="catalog-pg-replication-slots.html"
+>49.40. <A
+HREF="catalog-pg-rewrite.html"
 ><TT
 CLASS="STRUCTNAME"
->pg_replication_slots</TT
+>pg_rewrite</TT
 ></A
 ></DT
 ><DT
->49.43. <A
+>49.41. <A
 HREF="catalog-pg-seclabel.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -443,7 +427,7 @@
 ></A
 ></DT
 ><DT
->49.44. <A
+>49.42. <A
 HREF="catalog-pg-shdepend.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -451,7 +435,7 @@
 ></A
 ></DT
 ><DT
->49.45. <A
+>49.43. <A
 HREF="catalog-pg-shdescription.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -459,7 +443,7 @@
 ></A
 ></DT
 ><DT
->49.46. <A
+>49.44. <A
 HREF="catalog-pg-shseclabel.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -467,7 +451,7 @@
 ></A
 ></DT
 ><DT
->49.47. <A
+>49.45. <A
 HREF="catalog-pg-statistic.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -475,7 +459,7 @@
 ></A
 ></DT
 ><DT
->49.48. <A
+>49.46. <A
 HREF="catalog-pg-tablespace.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -483,7 +467,7 @@
 ></A
 ></DT
 ><DT
->49.49. <A
+>49.47. <A
 HREF="catalog-pg-transform.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -491,7 +475,7 @@
 ></A
 ></DT
 ><DT
->49.50. <A
+>49.48. <A
 HREF="catalog-pg-trigger.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -499,7 +483,7 @@
 ></A
 ></DT
 ><DT
->49.51. <A
+>49.49. <A
 HREF="catalog-pg-ts-config.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -507,7 +491,7 @@
 ></A
 ></DT
 ><DT
->49.52. <A
+>49.50. <A
 HREF="catalog-pg-ts-config-map.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -515,7 +499,7 @@
 ></A
 ></DT
 ><DT
->49.53. <A
+>49.51. <A
 HREF="catalog-pg-ts-dict.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -523,7 +507,7 @@
 ></A
 ></DT
 ><DT
->49.54. <A
+>49.52. <A
 HREF="catalog-pg-ts-parser.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -531,7 +515,7 @@
 ></A
 ></DT
 ><DT
->49.55. <A
+>49.53. <A
 HREF="catalog-pg-ts-template.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -539,7 +523,7 @@
 ></A
 ></DT
 ><DT
->49.56. <A
+>49.54. <A
 HREF="catalog-pg-type.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -547,7 +531,7 @@
 ></A
 ></DT
 ><DT
->49.57. <A
+>49.55. <A
 HREF="catalog-pg-user-mapping.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -555,12 +539,12 @@
 ></A
 ></DT
 ><DT
->49.58. <A
+>49.56. <A
 HREF="views-overview.html"
 >System Views</A
 ></DT
 ><DT
->49.59. <A
+>49.57. <A
 HREF="view-pg-available-extensions.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -568,7 +552,7 @@
 ></A
 ></DT
 ><DT
->49.60. <A
+>49.58. <A
 HREF="view-pg-available-extension-versions.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -576,7 +560,7 @@
 ></A
 ></DT
 ><DT
->49.61. <A
+>49.59. <A
 HREF="view-pg-cursors.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -584,7 +568,7 @@
 ></A
 ></DT
 ><DT
->49.62. <A
+>49.60. <A
 HREF="view-pg-file-settings.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -592,7 +576,7 @@
 ></A
 ></DT
 ><DT
->49.63. <A
+>49.61. <A
 HREF="view-pg-group.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -600,7 +584,7 @@
 ></A
 ></DT
 ><DT
->49.64. <A
+>49.62. <A
 HREF="view-pg-indexes.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -608,7 +592,7 @@
 ></A
 ></DT
 ><DT
->49.65. <A
+>49.63. <A
 HREF="view-pg-locks.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -616,7 +600,7 @@
 ></A
 ></DT
 ><DT
->49.66. <A
+>49.64. <A
 HREF="view-pg-matviews.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -624,7 +608,7 @@
 ></A
 ></DT
 ><DT
->49.67. <A
+>49.65. <A
 HREF="view-pg-policies.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -632,7 +616,7 @@
 ></A
 ></DT
 ><DT
->49.68. <A
+>49.66. <A
 HREF="view-pg-prepared-statements.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -640,7 +624,7 @@
 ></A
 ></DT
 ><DT
->49.69. <A
+>49.67. <A
 HREF="view-pg-prepared-xacts.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -648,6 +632,22 @@
 ></A
 ></DT
 ><DT
+>49.68. <A
+HREF="view-pg-replication-origin-status.html"
+><TT
+CLASS="STRUCTNAME"
+>pg_replication_origin_status</TT
+></A
+></DT
+><DT
+>49.69. <A
+HREF="view-pg-replication-slots.html"
+><TT
+CLASS="STRUCTNAME"
+>pg_replication_slots</TT
+></A
+></DT
+><DT
 >49.70. <A
 HREF="view-pg-roles.html"
 ><TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/catalogs-overview.html postgresql-9.5-9.5.8/doc/src/sgml/html/catalogs-overview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/catalogs-overview.html	2016-03-28 20:20:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/catalogs-overview.html	2017-08-07 21:32:28.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -582,18 +582,6 @@
 ><TR
 ><TD
 ><A
-HREF="catalog-pg-rewrite.html"
-><TT
-CLASS="STRUCTNAME"
->pg_rewrite</TT
-></A
-></TD
-><TD
->query rewrite rules</TD
-></TR
-><TR
-><TD
-><A
 HREF="catalog-pg-replication-origin.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -606,26 +594,14 @@
 ><TR
 ><TD
 ><A
-HREF="catalog-pg-replication-origin-status.html"
-><TT
-CLASS="STRUCTNAME"
->pg_replication_origin_status</TT
-></A
-></TD
-><TD
->information about replication origins, including replication progress</TD
-></TR
-><TR
-><TD
-><A
-HREF="catalog-pg-replication-slots.html"
+HREF="catalog-pg-rewrite.html"
 ><TT
 CLASS="STRUCTNAME"
->pg_replication_slots</TT
+>pg_rewrite</TT
 ></A
 ></TD
 ><TD
->replication slot information</TD
+>query rewrite rules</TD
 ></TR
 ><TR
 ><TD
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/charset.html postgresql-9.5-9.5.8/doc/src/sgml/html/charset.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/charset.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/charset.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,17 +110,17 @@
 ><DL
 ><DT
 >22.1.1. <A
-HREF="locale.html#AEN36289"
+HREF="locale.html#AEN36562"
 >Overview</A
 ></DT
 ><DT
 >22.1.2. <A
-HREF="locale.html#AEN36366"
+HREF="locale.html#AEN36639"
 >Behavior</A
 ></DT
 ><DT
 >22.1.3. <A
-HREF="locale.html#AEN36417"
+HREF="locale.html#AEN36690"
 >Problems</A
 ></DT
 ></DL
@@ -134,12 +134,12 @@
 ><DL
 ><DT
 >22.2.1. <A
-HREF="collation.html#AEN36442"
+HREF="collation.html#AEN36715"
 >Concepts</A
 ></DT
 ><DT
 >22.2.2. <A
-HREF="collation.html#AEN36490"
+HREF="collation.html#AEN36763"
 >Managing Collations</A
 ></DT
 ></DL
@@ -158,17 +158,17 @@
 ></DT
 ><DT
 >22.3.2. <A
-HREF="multibyte.html#AEN36967"
+HREF="multibyte.html#AEN37240"
 >Setting the Character Set</A
 ></DT
 ><DT
 >22.3.3. <A
-HREF="multibyte.html#AEN37005"
+HREF="multibyte.html#AEN37278"
 >Automatic Character Set Conversion Between Server and Client</A
 ></DT
 ><DT
 >22.3.4. <A
-HREF="multibyte.html#AEN37334"
+HREF="multibyte.html#AEN37607"
 >Further Reading</A
 ></DT
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/chkpass.html postgresql-9.5-9.5.8/doc/src/sgml/html/chkpass.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/chkpass.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/chkpass.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -181,7 +181,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167745"
+NAME="AEN172596"
 >F.6.1. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/citext.html postgresql-9.5-9.5.8/doc/src/sgml/html/citext.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/citext.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/citext.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -118,7 +118,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167758"
+NAME="AEN172609"
 >F.7.1. Rationale</A
 ></H2
 ><P
@@ -211,7 +211,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167783"
+NAME="AEN172634"
 >F.7.2. How to Use It</A
 ></H2
 ><P
@@ -255,7 +255,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167791"
+NAME="AEN172642"
 >F.7.3. String Comparison Behavior</A
 ></H2
 ><P
@@ -414,7 +414,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167840"
+NAME="AEN172691"
 >F.7.4. Limitations</A
 ></H2
 ><P
@@ -554,7 +554,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167876"
+NAME="AEN172727"
 >F.7.5. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/client-authentication.html postgresql-9.5-9.5.8/doc/src/sgml/html/client-authentication.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/client-authentication.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/client-authentication.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/client-authentication-problems.html postgresql-9.5-9.5.8/doc/src/sgml/html/client-authentication-problems.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/client-authentication-problems.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/client-authentication-problems.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Client Authentication"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/client-interfaces.html postgresql-9.5-9.5.8/doc/src/sgml/html/client-interfaces.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/client-interfaces.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/client-interfaces.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Test Coverage Examination"
@@ -23,7 +23,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="PART"
 ><DIV
@@ -41,7 +41,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -97,7 +97,7 @@
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN42084"
+NAME="AEN42371"
 ></A
 ><P
 >    This part describes the client programming interfaces distributed
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/collation.html postgresql-9.5-9.5.8/doc/src/sgml/html/collation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/collation.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/collation.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Localization"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -113,7 +113,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN36442"
+NAME="AEN36715"
 >22.2.1. Concepts</A
 ></H2
 ><P
@@ -353,7 +353,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN36490"
+NAME="AEN36763"
 >22.2.2. Managing Collations</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/config-setting.html postgresql-9.5-9.5.8/doc/src/sgml/html/config-setting.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/config-setting.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/config-setting.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -568,7 +568,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN30584"
+NAME="AEN30858"
 >18.1.4. Parameter Interaction via the Shell</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/connect-estab.html postgresql-9.5-9.5.8/doc/src/sgml/html/connect-estab.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/connect-estab.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/connect-estab.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Overview of PostgreSQL Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/continuous-archiving.html postgresql-9.5-9.5.8/doc/src/sgml/html/continuous-archiving.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/continuous-archiving.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/continuous-archiving.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Backup and Restore"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-build-sql-delete.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-build-sql-delete.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-build-sql-delete.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-build-sql-delete.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168857"
+NAME="AEN173708"
 ></A
 ><H2
 >Name</H2
@@ -105,7 +105,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168860"
+NAME="AEN173711"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168862"
+NAME="AEN173713"
 ></A
 ><H2
 >Description</H2
@@ -139,7 +139,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168867"
+NAME="AEN173718"
 ></A
 ><H2
 >Arguments</H2
@@ -215,7 +215,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168895"
+NAME="AEN173746"
 ></A
 ><H2
 >Return Value</H2
@@ -225,7 +225,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168898"
+NAME="AEN173749"
 ></A
 ><H2
 >Notes</H2
@@ -251,7 +251,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168904"
+NAME="AEN173755"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-build-sql-insert.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-build-sql-insert.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-build-sql-insert.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-build-sql-insert.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168796"
+NAME="AEN173647"
 ></A
 ><H2
 >Name</H2
@@ -105,7 +105,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168799"
+NAME="AEN173650"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168801"
+NAME="AEN173652"
 ></A
 ><H2
 >Description</H2
@@ -143,7 +143,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168806"
+NAME="AEN173657"
 ></A
 ><H2
 >Arguments</H2
@@ -232,7 +232,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168839"
+NAME="AEN173690"
 ></A
 ><H2
 >Return Value</H2
@@ -242,7 +242,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168842"
+NAME="AEN173693"
 ></A
 ><H2
 >Notes</H2
@@ -268,7 +268,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168848"
+NAME="AEN173699"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-build-sql-update.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-build-sql-update.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-build-sql-update.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-build-sql-update.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168913"
+NAME="AEN173764"
 ></A
 ><H2
 >Name</H2
@@ -105,7 +105,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168916"
+NAME="AEN173767"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168918"
+NAME="AEN173769"
 ></A
 ><H2
 >Description</H2
@@ -152,7 +152,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168925"
+NAME="AEN173776"
 ></A
 ><H2
 >Arguments</H2
@@ -241,7 +241,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168958"
+NAME="AEN173809"
 ></A
 ><H2
 >Return Value</H2
@@ -251,7 +251,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168961"
+NAME="AEN173812"
 ></A
 ><H2
 >Notes</H2
@@ -277,7 +277,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168967"
+NAME="AEN173818"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-cancel-query.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-cancel-query.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-cancel-query.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-cancel-query.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168730"
+NAME="AEN173581"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168733"
+NAME="AEN173584"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168735"
+NAME="AEN173586"
 ></A
 ><H2
 >Description</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168740"
+NAME="AEN173591"
 ></A
 ><H2
 >Arguments</H2
@@ -162,7 +162,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168748"
+NAME="AEN173599"
 ></A
 ><H2
 >Return Value</H2
@@ -177,7 +177,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168752"
+NAME="AEN173603"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-close.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-close.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-close.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-close.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168477"
+NAME="AEN173328"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168480"
+NAME="AEN173331"
 ></A
 ><H2
 >Synopsis</H2
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168482"
+NAME="AEN173333"
 ></A
 ><H2
 >Description</H2
@@ -133,7 +133,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168487"
+NAME="AEN173338"
 ></A
 ><H2
 >Arguments</H2
@@ -185,7 +185,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168506"
+NAME="AEN173357"
 ></A
 ><H2
 >Return Value</H2
@@ -202,7 +202,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168511"
+NAME="AEN173362"
 ></A
 ><H2
 >Notes</H2
@@ -224,7 +224,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168517"
+NAME="AEN173368"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-connect.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-connect.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-connect.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-connect.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168134"
+NAME="AEN172985"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168137"
+NAME="AEN172988"
 ></A
 ><H2
 >Synopsis</H2
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168139"
+NAME="AEN172990"
 ></A
 ><H2
 >Description</H2
@@ -158,7 +158,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168149"
+NAME="AEN173000"
 ></A
 ><H2
 >Arguments</H2
@@ -207,7 +207,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168165"
+NAME="AEN173016"
 ></A
 ><H2
 >Return Value</H2
@@ -222,7 +222,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168169"
+NAME="AEN173020"
 ></A
 ><H2
 >Notes</H2
@@ -249,7 +249,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168176"
+NAME="AEN173027"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-connect-u.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-connect-u.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-connect-u.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-connect-u.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168185"
+NAME="AEN173036"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168188"
+NAME="AEN173039"
 ></A
 ><H2
 >Synopsis</H2
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168190"
+NAME="AEN173041"
 ></A
 ><H2
 >Description</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-disconnect.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-disconnect.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-disconnect.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-disconnect.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168212"
+NAME="AEN173063"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168215"
+NAME="AEN173066"
 ></A
 ><H2
 >Synopsis</H2
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168217"
+NAME="AEN173068"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168222"
+NAME="AEN173073"
 ></A
 ><H2
 >Arguments</H2
@@ -159,7 +159,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168230"
+NAME="AEN173081"
 ></A
 ><H2
 >Return Value</H2
@@ -174,7 +174,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168234"
+NAME="AEN173085"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-error-message.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-error-message.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-error-message.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-error-message.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168548"
+NAME="AEN173399"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168551"
+NAME="AEN173402"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168553"
+NAME="AEN173404"
 ></A
 ><H2
 >Description</H2
@@ -129,7 +129,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168557"
+NAME="AEN173408"
 ></A
 ><H2
 >Arguments</H2
@@ -154,7 +154,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168565"
+NAME="AEN173416"
 ></A
 ><H2
 >Return Value</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168568"
+NAME="AEN173419"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-exec.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-exec.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-exec.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-exec.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168311"
+NAME="AEN173162"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168314"
+NAME="AEN173165"
 ></A
 ><H2
 >Synopsis</H2
@@ -116,7 +116,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168316"
+NAME="AEN173167"
 ></A
 ><H2
 >Description</H2
@@ -144,7 +144,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168323"
+NAME="AEN173174"
 ></A
 ><H2
 >Arguments</H2
@@ -215,7 +215,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168349"
+NAME="AEN173200"
 ></A
 ><H2
 >Return Value</H2
@@ -229,7 +229,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168353"
+NAME="AEN173204"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-fetch.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-fetch.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-fetch.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-fetch.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168425"
+NAME="AEN173276"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168428"
+NAME="AEN173279"
 ></A
 ><H2
 >Synopsis</H2
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168430"
+NAME="AEN173281"
 ></A
 ><H2
 >Description</H2
@@ -133,7 +133,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168435"
+NAME="AEN173286"
 ></A
 ><H2
 >Arguments</H2
@@ -197,7 +197,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168459"
+NAME="AEN173310"
 ></A
 ><H2
 >Return Value</H2
@@ -213,7 +213,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168463"
+NAME="AEN173314"
 ></A
 ><H2
 >Notes</H2
@@ -235,7 +235,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168468"
+NAME="AEN173319"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-function.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-function.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-function.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-function.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168243"
+NAME="AEN173094"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168246"
+NAME="AEN173097"
 ></A
 ><H2
 >Synopsis</H2
@@ -116,7 +116,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168248"
+NAME="AEN173099"
 ></A
 ><H2
 >Description</H2
@@ -147,7 +147,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168256"
+NAME="AEN173107"
 ></A
 ><H2
 >Arguments</H2
@@ -214,7 +214,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168281"
+NAME="AEN173132"
 ></A
 ><H2
 >Return Value</H2
@@ -290,7 +290,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168297"
+NAME="AEN173148"
 ></A
 ><H2
 >Notes</H2
@@ -316,7 +316,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168302"
+NAME="AEN173153"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-get-connections.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-get-connections.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-get-connections.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-get-connections.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168526"
+NAME="AEN173377"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168529"
+NAME="AEN173380"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168531"
+NAME="AEN173382"
 ></A
 ><H2
 >Description</H2
@@ -132,7 +132,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168536"
+NAME="AEN173387"
 ></A
 ><H2
 >Return Value</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168539"
+NAME="AEN173390"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-get-notify.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-get-notify.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-get-notify.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-get-notify.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168646"
+NAME="AEN173497"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168649"
+NAME="AEN173500"
 ></A
 ><H2
 >Synopsis</H2
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168651"
+NAME="AEN173502"
 ></A
 ><H2
 >Description</H2
@@ -145,7 +145,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168659"
+NAME="AEN173510"
 ></A
 ><H2
 >Arguments</H2
@@ -170,7 +170,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168667"
+NAME="AEN173518"
 ></A
 ><H2
 >Return Value</H2
@@ -183,7 +183,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168671"
+NAME="AEN173522"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-get-pkey.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-get-pkey.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-get-pkey.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-get-pkey.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168761"
+NAME="AEN173612"
 ></A
 ><H2
 >Name</H2
@@ -105,7 +105,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168764"
+NAME="AEN173615"
 ></A
 ><H2
 >Synopsis</H2
@@ -116,7 +116,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168766"
+NAME="AEN173617"
 ></A
 ><H2
 >Description</H2
@@ -132,7 +132,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168770"
+NAME="AEN173621"
 ></A
 ><H2
 >Arguments</H2
@@ -170,7 +170,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168781"
+NAME="AEN173632"
 ></A
 ><H2
 >Return Value</H2
@@ -199,7 +199,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168787"
+NAME="AEN173638"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-get-result.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-get-result.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-get-result.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-get-result.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168680"
+NAME="AEN173531"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168683"
+NAME="AEN173534"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168685"
+NAME="AEN173536"
 ></A
 ><H2
 >Description</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168691"
+NAME="AEN173542"
 ></A
 ><H2
 >Arguments</H2
@@ -175,7 +175,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168704"
+NAME="AEN173555"
 ></A
 ><H2
 >Return Value</H2
@@ -202,7 +202,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168710"
+NAME="AEN173561"
 ></A
 ><H2
 >Notes</H2
@@ -252,7 +252,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168721"
+NAME="AEN173572"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-is-busy.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-is-busy.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-is-busy.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-is-busy.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168616"
+NAME="AEN173467"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168619"
+NAME="AEN173470"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168621"
+NAME="AEN173472"
 ></A
 ><H2
 >Description</H2
@@ -128,7 +128,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168625"
+NAME="AEN173476"
 ></A
 ><H2
 >Arguments</H2
@@ -153,7 +153,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168633"
+NAME="AEN173484"
 ></A
 ><H2
 >Return Value</H2
@@ -169,7 +169,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168637"
+NAME="AEN173488"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-open.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-open.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-open.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-open.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168362"
+NAME="AEN173213"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168365"
+NAME="AEN173216"
 ></A
 ><H2
 >Synopsis</H2
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168367"
+NAME="AEN173218"
 ></A
 ><H2
 >Description</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168373"
+NAME="AEN173224"
 ></A
 ><H2
 >Arguments</H2
@@ -206,7 +206,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168399"
+NAME="AEN173250"
 ></A
 ><H2
 >Return Value</H2
@@ -223,7 +223,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168404"
+NAME="AEN173255"
 ></A
 ><H2
 >Notes</H2
@@ -274,7 +274,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168416"
+NAME="AEN173267"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-send-query.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-send-query.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-dblink-send-query.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-dblink-send-query.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="dblink"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN168577"
+NAME="AEN173428"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN168580"
+NAME="AEN173431"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168582"
+NAME="AEN173433"
 ></A
 ><H2
 >Description</H2
@@ -147,7 +147,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168590"
+NAME="AEN173441"
 ></A
 ><H2
 >Arguments</H2
@@ -186,7 +186,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168604"
+NAME="AEN173455"
 ></A
 ><H2
 >Return Value</H2
@@ -197,7 +197,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN168607"
+NAME="AEN173458"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-prog-client.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-prog-client.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-prog-client.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-prog-client.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Programs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-prog.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-prog.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-prog.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-prog.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-prog-server.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-prog-server.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-prog-server.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-prog-server.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Programs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-spi.html postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-spi.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/contrib-spi.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/contrib-spi.html	2017-08-07 21:33:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -115,7 +115,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174057"
+NAME="AEN178914"
 >F.34.1. refint &mdash; Functions for Implementing Referential Integrity</A
 ></H2
 ><P
@@ -187,7 +187,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174073"
+NAME="AEN178930"
 >F.34.2. timetravel &mdash; Functions for Implementing Time Travel</A
 ></H2
 ><P
@@ -330,7 +330,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174104"
+NAME="AEN178961"
 >F.34.3. autoinc &mdash; Functions for Autoincrementing Fields</A
 ></H2
 ><P
@@ -376,7 +376,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174115"
+NAME="AEN178972"
 >F.34.4. insert_username &mdash; Functions for Tracking Who Changed a Table</A
 ></H2
 ><P
@@ -410,7 +410,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174124"
+NAME="AEN178981"
 >F.34.5. moddatetime &mdash; Functions for Tracking Last Modification Time</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/creating-cluster.html postgresql-9.5-9.5.8/doc/src/sgml/html/creating-cluster.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/creating-cluster.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/creating-cluster.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -394,6 +394,20 @@
 >Section 22.3</A
 >.
   </P
+><P
+>   Non-<TT
+CLASS="LITERAL"
+>C</TT
+> and and non-<TT
+CLASS="LITERAL"
+>POSIX</TT
+> locales rely on the
+   operating system's collation library for character set ordering.
+   This controls the ordering of keys stored in indexes.  For this reason,
+   a cluster cannot switch to an incompatible collation library version,
+   either through snapshot restore, binary streaming replication, a
+   different operating system, or an operating system upgrade.
+  </P
 ><DIV
 CLASS="SECT2"
 ><H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/cube.html postgresql-9.5-9.5.8/doc/src/sgml/html/cube.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/cube.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/cube.html	2017-08-07 21:33:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -107,13 +107,13 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167888"
+NAME="AEN172739"
 >F.8.1. Syntax</A
 ></H2
 ><P
 >   <A
 HREF="cube.html#CUBE-REPR-TABLE"
->Table F-1</A
+>Table F-3</A
 > shows the valid external
    representations for the <TT
 CLASS="TYPE"
@@ -139,7 +139,7 @@
 ></A
 ><P
 ><B
->Table F-1. Cube External Representations</B
+>Table F-3. Cube External Representations</B
 ></P
 ><TABLE
 BORDER="1"
@@ -386,7 +386,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167963"
+NAME="AEN172814"
 >F.8.2. Precision</A
 ></H2
 ><P
@@ -399,7 +399,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167966"
+NAME="AEN172817"
 >F.8.3. Usage</A
 ></H2
 ><P
@@ -413,7 +413,7 @@
 > values.
    The operators supported by the GiST operator class are shown in <A
 HREF="cube.html#CUBE-GIST-OPERATORS"
->Table F-2</A
+>Table F-4</A
 >.
   </P
 ><DIV
@@ -423,7 +423,7 @@
 ></A
 ><P
 ><B
->Table F-2. Cube GiST Operators</B
+>Table F-4. Cube GiST Operators</B
 ></P
 ><TABLE
 BORDER="1"
@@ -503,7 +503,7 @@
 ><P
 ></P
 ><A
-NAME="AEN168002"
+NAME="AEN172853"
 ></A
 ><TABLE
 BORDER="1"
@@ -551,7 +551,7 @@
 ><P
 >   <A
 HREF="cube.html#CUBE-FUNCTIONS-TABLE"
->Table F-3</A
+>Table F-5</A
 > shows the available functions.
   </P
 ><DIV
@@ -561,7 +561,7 @@
 ></A
 ><P
 ><B
->Table F-3. Cube Functions</B
+>Table F-5. Cube Functions</B
 ></P
 ><TABLE
 BORDER="1"
@@ -783,7 +783,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN168091"
+NAME="AEN172942"
 >F.8.4. Defaults</A
 ></H2
 ><P
@@ -835,7 +835,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN168101"
+NAME="AEN172952"
 >F.8.5. Notes</A
 ></H2
 ><P
@@ -858,7 +858,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN168107"
+NAME="AEN172958"
 >F.8.6. Credits</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/custom-scan-execution.html postgresql-9.5-9.5.8/doc/src/sgml/html/custom-scan-execution.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/custom-scan-execution.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/custom-scan-execution.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Writing A Custom Scan Provider"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/custom-scan.html postgresql-9.5-9.5.8/doc/src/sgml/html/custom-scan.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/custom-scan.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/custom-scan.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/custom-scan-path.html postgresql-9.5-9.5.8/doc/src/sgml/html/custom-scan-path.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/custom-scan-path.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/custom-scan-path.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Writing A Custom Scan Provider"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/custom-scan-plan.html postgresql-9.5-9.5.8/doc/src/sgml/html/custom-scan-plan.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/custom-scan-plan.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/custom-scan-plan.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Writing A Custom Scan Provider"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/database-roles.html postgresql-9.5-9.5.8/doc/src/sgml/html/database-roles.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/database-roles.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/database-roles.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Roles"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-binary.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-binary.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-binary.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-binary.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -215,7 +215,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5667"
+NAME="AEN5743"
 >8.4.1. <TT
 CLASS="TYPE"
 >bytea</TT
@@ -258,7 +258,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5676"
+NAME="AEN5752"
 >8.4.2. <TT
 CLASS="TYPE"
 >bytea</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-bit.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-bit.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-bit.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-bit.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -215,7 +215,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN7314"
+NAME="AEN7390"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-boolean.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-boolean.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-boolean.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-boolean.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-character.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-character.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-character.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-character.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -492,7 +492,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN5589"
+NAME="AEN5665"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-datetime.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-datetime.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-datetime.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-datetime.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -612,7 +612,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN5966"
+NAME="AEN6042"
 >8.5.1.1. Dates</A
 ></H3
 ><P
@@ -787,7 +787,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN6039"
+NAME="AEN6115"
 >8.5.1.2. Times</A
 ></H3
 ><P
@@ -1091,7 +1091,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN6159"
+NAME="AEN6235"
 >8.5.1.3. Time Stamps</A
 ></H3
 ><P
@@ -1282,7 +1282,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN6209"
+NAME="AEN6285"
 >8.5.1.4. Special Values</A
 ></H3
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-enum.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-enum.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-enum.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-enum.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -111,7 +111,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN6808"
+NAME="AEN6884"
 >8.7.1. Declaration of Enumerated Types</A
 ></H2
 ><P
@@ -149,7 +149,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN6814"
+NAME="AEN6890"
 >8.7.2. Ordering</A
 ></H2
 ><P
@@ -191,7 +191,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN6818"
+NAME="AEN6894"
 >8.7.3. Type Safety</A
 ></H2
 ><P
@@ -235,7 +235,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN6824"
+NAME="AEN6900"
 >8.7.4. Implementation Details</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-geometric.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-geometric.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-geometric.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-geometric.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -251,7 +251,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN6900"
+NAME="AEN6976"
 >8.8.1. Points</A
 ></H2
 ><P
@@ -634,7 +634,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN6984"
+NAME="AEN7060"
 >8.8.4. Boxes</A
 ></H2
 ><P
@@ -759,7 +759,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN7013"
+NAME="AEN7089"
 >8.8.5. Paths</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -149,7 +149,7 @@
 ><DL
 ><DT
 >8.4.1. <A
-HREF="datatype-binary.html#AEN5667"
+HREF="datatype-binary.html#AEN5743"
 ><TT
 CLASS="TYPE"
 >bytea</TT
@@ -157,7 +157,7 @@
 ></DT
 ><DT
 >8.4.2. <A
-HREF="datatype-binary.html#AEN5676"
+HREF="datatype-binary.html#AEN5752"
 ><TT
 CLASS="TYPE"
 >bytea</TT
@@ -213,22 +213,22 @@
 ><DL
 ><DT
 >8.7.1. <A
-HREF="datatype-enum.html#AEN6808"
+HREF="datatype-enum.html#AEN6884"
 >Declaration of Enumerated Types</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="datatype-enum.html#AEN6814"
+HREF="datatype-enum.html#AEN6890"
 >Ordering</A
 ></DT
 ><DT
 >8.7.3. <A
-HREF="datatype-enum.html#AEN6818"
+HREF="datatype-enum.html#AEN6894"
 >Type Safety</A
 ></DT
 ><DT
 >8.7.4. <A
-HREF="datatype-enum.html#AEN6824"
+HREF="datatype-enum.html#AEN6900"
 >Implementation Details</A
 ></DT
 ></DL
@@ -242,7 +242,7 @@
 ><DL
 ><DT
 >8.8.1. <A
-HREF="datatype-geometric.html#AEN6900"
+HREF="datatype-geometric.html#AEN6976"
 >Points</A
 ></DT
 ><DT
@@ -257,12 +257,12 @@
 ></DT
 ><DT
 >8.8.4. <A
-HREF="datatype-geometric.html#AEN6984"
+HREF="datatype-geometric.html#AEN7060"
 >Boxes</A
 ></DT
 ><DT
 >8.8.5. <A
-HREF="datatype-geometric.html#AEN7013"
+HREF="datatype-geometric.html#AEN7089"
 >Paths</A
 ></DT
 ><DT
@@ -371,17 +371,17 @@
 ><DL
 ><DT
 >8.13.1. <A
-HREF="datatype-xml.html#AEN7438"
+HREF="datatype-xml.html#AEN7514"
 >Creating XML Values</A
 ></DT
 ><DT
 >8.13.2. <A
-HREF="datatype-xml.html#AEN7482"
+HREF="datatype-xml.html#AEN7558"
 >Encoding Handling</A
 ></DT
 ><DT
 >8.13.3. <A
-HREF="datatype-xml.html#AEN7494"
+HREF="datatype-xml.html#AEN7570"
 >Accessing XML Values</A
 ></DT
 ></DL
@@ -472,26 +472,31 @@
 ><DL
 ><DT
 >8.16.1. <A
-HREF="rowtypes.html#AEN7991"
+HREF="rowtypes.html#ROWTYPES-DECLARING"
 >Declaration of Composite Types</A
 ></DT
 ><DT
 >8.16.2. <A
-HREF="rowtypes.html#AEN8006"
->Composite Value Input</A
+HREF="rowtypes.html#AEN8082"
+>Constructing Composite Values</A
 ></DT
 ><DT
 >8.16.3. <A
-HREF="rowtypes.html#AEN8027"
+HREF="rowtypes.html#ROWTYPES-ACCESSING"
 >Accessing Composite Types</A
 ></DT
 ><DT
 >8.16.4. <A
-HREF="rowtypes.html#AEN8039"
+HREF="rowtypes.html#AEN8120"
 >Modifying Composite Types</A
 ></DT
 ><DT
 >8.16.5. <A
+HREF="rowtypes.html#ROWTYPES-USAGE"
+>Using Composite Types in Queries</A
+></DT
+><DT
+>8.16.6. <A
 HREF="rowtypes.html#ROWTYPES-IO-SYNTAX"
 >Composite Type Input and Output Syntax</A
 ></DT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-json.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-json.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-json.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-json.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -974,8 +974,8 @@
     while the latter creates index items only for each value in the
     data.
     <A
-NAME="AEN7711"
-HREF="#FTN.AEN7711"
+NAME="AEN7787"
+HREF="#FTN.AEN7787"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
@@ -1193,8 +1193,8 @@
 VALIGN="TOP"
 WIDTH="5%"
 ><A
-NAME="FTN.AEN7711"
-HREF="datatype-json.html#AEN7711"
+NAME="FTN.AEN7787"
+HREF="datatype-json.html#AEN7787"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-money.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-money.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-money.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-money.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -221,7 +221,24 @@
 ><P>
    </P
 ><P
->    When a <TT
+>    Division of a <TT
+CLASS="TYPE"
+>money</TT
+> value by an integer value is performed
+    with truncation of the fractional part towards zero.  To get a rounded
+    result, divide by a floating-point value, or cast the <TT
+CLASS="TYPE"
+>money</TT
+>
+    value to <TT
+CLASS="TYPE"
+>numeric</TT
+> before dividing and back to <TT
+CLASS="TYPE"
+>money</TT
+>
+    afterwards.  (The latter is preferable to avoid risking precision loss.)
+    When a <TT
 CLASS="TYPE"
 >money</TT
 > value is divided by another <TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-net-types.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-net-types.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-net-types.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-net-types.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-numeric.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-numeric.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-numeric.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-numeric.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-oid.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-oid.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-oid.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-oid.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-pg-lsn.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-pg-lsn.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-pg-lsn.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-pg-lsn.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-pseudo.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-pseudo.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-pseudo.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-pseudo.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-textsearch.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-textsearch.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-textsearch.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-textsearch.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-uuid.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-uuid.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-uuid.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-uuid.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-xml.html postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-xml.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datatype-xml.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datatype-xml.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -157,7 +157,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN7438"
+NAME="AEN7514"
 >8.13.1. Creating XML Values</A
 ></H2
 ><P
@@ -323,7 +323,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN7482"
+NAME="AEN7558"
 >8.13.2. Encoding Handling</A
 ></H2
 ><P
@@ -421,7 +421,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN7494"
+NAME="AEN7570"
 >8.13.3. Accessing XML Values</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datetime-appendix.html postgresql-9.5-9.5.8/doc/src/sgml/html/datetime-appendix.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datetime-appendix.html	2016-03-28 20:21:07.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datetime-appendix.html	2017-08-07 21:32:36.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datetime-config-files.html postgresql-9.5-9.5.8/doc/src/sgml/html/datetime-config-files.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datetime-config-files.html	2016-03-28 20:21:06.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datetime-config-files.html	2017-08-07 21:32:36.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Date/Time Support"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -193,31 +193,59 @@
 >zone_abbreviation</I
 ></TT
 > is just the abbreviation
-    being defined.  The <TT
+    being defined.  An <TT
 CLASS="REPLACEABLE"
 ><I
 >offset</I
 ></TT
-> is the equivalent
-    offset in seconds from UTC, positive being east from Greenwich and
-    negative being west.  For example, -18000 would be five hours west
-    of Greenwich, or North American east coast standard time.  <TT
+> is an integer giving
+    the equivalent offset in seconds from UTC, positive being east from
+    Greenwich and negative being west.  For example, -18000 would be five
+    hours west of Greenwich, or North American east coast standard time.
+    <TT
 CLASS="LITERAL"
 >D</TT
->
-    indicates that the zone name represents local daylight-savings time rather
-    than standard time.  Alternatively, a <TT
+> indicates that the zone name represents local
+    daylight-savings time rather than standard time.
+   </P
+><P
+>    Alternatively, a <TT
 CLASS="REPLACEABLE"
 ><I
 >time_zone_name</I
 ></TT
-> can
-    be given, in which case that time zone definition is consulted, and the
-    abbreviation's meaning in that zone is used.  This alternative is
-    recommended only for abbreviations whose meaning has historically varied,
-    as looking up the meaning is noticeably more expensive than just using
-    a fixed integer value.
+> can be given, referencing
+    a zone name defined in the IANA timezone database.  The zone's definition
+    is consulted to see whether the abbreviation is or has been in use in
+    that zone, and if so, the appropriate meaning is used &mdash; that is,
+    the meaning that was currently in use at the timestamp whose value is
+    being determined, or the meaning in use immediately before that if it
+    wasn't current at that time, or the oldest meaning if it was used only
+    after that time.  This behavior is essential for dealing with
+    abbreviations whose meaning has historically varied.  It is also allowed
+    to define an abbreviation in terms of a zone name in which that
+    abbreviation does not appear; then using the abbreviation is just
+    equivalent to writing out the zone name.
    </P
+><DIV
+CLASS="TIP"
+><BLOCKQUOTE
+CLASS="TIP"
+><P
+><B
+>Tip: </B
+>     Using a simple integer <TT
+CLASS="REPLACEABLE"
+><I
+>offset</I
+></TT
+> is preferred
+     when defining an abbreviation whose offset from UTC has never changed,
+     as such abbreviations are much cheaper to process than those that
+     require consulting a time zone definition.
+    </P
+></BLOCKQUOTE
+></DIV
 ><P
 >    The <TT
 CLASS="LITERAL"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datetime-input-rules.html postgresql-9.5-9.5.8/doc/src/sgml/html/datetime-input-rules.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datetime-input-rules.html	2016-03-28 20:21:06.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datetime-input-rules.html	2017-08-07 21:32:36.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Date/Time Support"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datetime-keywords.html postgresql-9.5-9.5.8/doc/src/sgml/html/datetime-keywords.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datetime-keywords.html	2016-03-28 20:21:06.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datetime-keywords.html	2017-08-07 21:32:36.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Date/Time Support"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/datetime-units-history.html postgresql-9.5-9.5.8/doc/src/sgml/html/datetime-units-history.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/datetime-units-history.html	2016-03-28 20:21:07.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/datetime-units-history.html	2017-08-07 21:32:36.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Date/Time Support"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/dblink.html postgresql-9.5-9.5.8/doc/src/sgml/html/dblink.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/dblink.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/dblink.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-alter.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-alter.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-alter.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-alter.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -350,7 +350,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2849"
+NAME="AEN2854"
 >5.5.5. Changing a Column's Default Value</A
 ></H2
 ><P
@@ -382,7 +382,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2859"
+NAME="AEN2864"
 >5.5.6. Changing a Column's Data Type</A
 ></H2
 ><P
@@ -416,7 +416,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2869"
+NAME="AEN2874"
 >5.5.7. Renaming a Column</A
 ></H2
 ><P
@@ -432,7 +432,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2876"
+NAME="AEN2881"
 >5.5.8. Renaming a Table</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-basics.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-basics.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-basics.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-basics.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-constraints.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-constraints.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-constraints.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-constraints.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -268,7 +268,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2531"
+NAME="AEN2536"
 >5.3.2. Not-Null Constraints</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-default.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-default.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-default.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-default.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-depend.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-depend.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-depend.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-depend.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,17 +109,17 @@
 >PostgreSQL</SPAN
 > makes sure that you cannot
    drop objects that other objects still depend on.  For example,
-   attempting to drop the products table we had considered in <A
+   attempting to drop the products table we considered in <A
 HREF="ddl-constraints.html#DDL-CONSTRAINTS-FK"
 >Section 5.3.5</A
 >, with the orders table depending on
-   it, would result in an error message such as this:
+   it, would result in an error message like this:
 </P><PRE
 CLASS="SCREEN"
 >DROP TABLE products;
 
-NOTICE:  constraint orders_product_no_fkey on table orders depends on table products
 ERROR:  cannot drop table products because other objects depend on it
+DETAIL:  constraint orders_product_no_fkey on table orders depends on table products
 HINT:  Use DROP ... CASCADE to drop the dependent objects too.</PRE
 ><P>
    The error message contains a useful hint: if you do not want to
@@ -140,13 +140,17 @@
 > without <TT
 CLASS="LITERAL"
 >CASCADE</TT
-> and read the <TT
+> and read the
+   <TT
 CLASS="LITERAL"
->NOTICE</TT
-> messages.)
+>DETAIL</TT
+> output.)
   </P
 ><P
->   All drop commands in <SPAN
+>   All <TT
+CLASS="COMMAND"
+>DROP</TT
+> commands in <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
 > support
@@ -180,42 +184,83 @@
 CLASS="LITERAL"
 >CASCADE</TT
 > is
-    required.  No database system actually enforces that rule, but
-    whether the default behavior is <TT
+    required in a <TT
+CLASS="COMMAND"
+>DROP</TT
+> command.  No database system actually
+    enforces that rule, but whether the default behavior
+    is <TT
 CLASS="LITERAL"
 >RESTRICT</TT
-> or
-    <TT
+> or <TT
 CLASS="LITERAL"
 >CASCADE</TT
-> varies across systems.
+> varies
+    across systems.
    </P
 ></BLOCKQUOTE
 ></DIV
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
 ><P
-><B
->Note: </B
->    Foreign key constraint dependencies and serial column dependencies
-    from <SPAN
+>   For user-defined functions, <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
-> versions prior to 7.3
-    are <SPAN
+> tracks
+   dependencies associated with a function's externally-visible properties,
+   such as its argument and result types, but <SPAN
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
 >not</I
 ></SPAN
-> maintained or created during the
-    upgrade process.  All other dependency types will be properly
-    created during an upgrade from a pre-7.3 database.
-   </P
-></BLOCKQUOTE
-></DIV
+> dependencies
+   that could only be known by examining the function body.  As an example,
+   consider this situation:
+
+</P><PRE
+CLASS="PROGRAMLISTING"
+>CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow',
+                             'green', 'blue', 'purple');
+
+CREATE TABLE my_colors (color rainbow, note text);
+
+CREATE FUNCTION get_color_note (rainbow) RETURNS text AS
+  'SELECT note FROM my_colors WHERE color = $1'
+  LANGUAGE SQL;</PRE
+><P>
+
+   (See <A
+HREF="xfunc-sql.html"
+>Section 35.4</A
+> for an explanation of SQL-language
+   functions.)  <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> will be aware that
+   the <CODE
+CLASS="FUNCTION"
+>get_color_note</CODE
+> function depends on the <TT
+CLASS="TYPE"
+>rainbow</TT
+>
+   type: dropping the type would force dropping the function, because its
+   argument type would no longer be defined.  But <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+   will not consider <CODE
+CLASS="FUNCTION"
+>get_color_note</CODE
+> to depend on
+   the <TT
+CLASS="STRUCTNAME"
+>my_colors</TT
+> table, and so will not drop the function if
+   the table is dropped.  While there are disadvantages to this approach,
+   there are also benefits.  The function is still valid in some sense if the
+   table is missing, though executing it would cause an error; creating a new
+   table of the same name would allow the function to work again.
+  </P
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-foreign-data.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-foreign-data.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-foreign-data.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-foreign-data.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -125,7 +125,7 @@
 ></DT
 ><DT
 >5.3.2. <A
-HREF="ddl-constraints.html#AEN2531"
+HREF="ddl-constraints.html#AEN2536"
 >Not-Null Constraints</A
 ></DT
 ><DT
@@ -184,22 +184,22 @@
 ></DT
 ><DT
 >5.5.5. <A
-HREF="ddl-alter.html#AEN2849"
+HREF="ddl-alter.html#AEN2854"
 >Changing a Column's Default Value</A
 ></DT
 ><DT
 >5.5.6. <A
-HREF="ddl-alter.html#AEN2859"
+HREF="ddl-alter.html#AEN2864"
 >Changing a Column's Data Type</A
 ></DT
 ><DT
 >5.5.7. <A
-HREF="ddl-alter.html#AEN2869"
+HREF="ddl-alter.html#AEN2874"
 >Renaming a Column</A
 ></DT
 ><DT
 >5.5.8. <A
-HREF="ddl-alter.html#AEN2876"
+HREF="ddl-alter.html#AEN2881"
 >Renaming a Table</A
 ></DT
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-inherit.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-inherit.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-inherit.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-inherit.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -375,7 +375,11 @@
   </P
 ><P
 >   All check constraints and not-null constraints on a parent table are
-   automatically inherited by its children.  Other types of constraints
+   automatically inherited by its children, unless explicitly specified
+   otherwise with <TT
+CLASS="LITERAL"
+>NO INHERIT</TT
+> clauses.  Other types of constraints
    (unique, primary key, and foreign key constraints) are not inherited.
   </P
 ><P
@@ -388,10 +392,12 @@
 >"merged"</SPAN
 >
    so that there is only one such column in the child table.  To be merged,
-   columns must have the same data types, else an error is raised.  The
-   merged column will have copies of all the check constraints coming from
-   any one of the column definitions it came from, and will be marked not-null
-   if any of them are.
+   columns must have the same data types, else an error is raised.
+   Inheritable check constraints and not-null constraints are merged in a
+   similar fashion.  Thus, for example, a merged column will be marked
+   not-null if any one of the column definitions it came from is marked
+   not-null.  Check constraints are merged if they have the same name,
+   and the merge will fail if their conditions are different.
   </P
 ><P
 >   Table inheritance is typically established when the child table is
@@ -489,12 +495,37 @@
 >.
   </P
 ><P
->   Note how table access permissions are handled.  Querying a parent
-   table can automatically access data in child tables without further
-   access privilege checking.  This preserves the appearance that the
-   data is (also) in the parent table.  Accessing the child tables
-   directly is, however, not automatically allowed and would require
-   further privileges to be granted.
+>   Inherited queries perform access permission checks on the parent table
+   only.  Thus, for example, granting <TT
+CLASS="LITERAL"
+>UPDATE</TT
+> permission on
+   the <TT
+CLASS="STRUCTNAME"
+>cities</TT
+> table implies permission to update rows in
+   the <TT
+CLASS="STRUCTNAME"
+>capitals</TT
+> table as well, when they are
+   accessed through <TT
+CLASS="STRUCTNAME"
+>cities</TT
+>.  This preserves the appearance
+   that the data is (also) in the parent table.  But
+   the <TT
+CLASS="STRUCTNAME"
+>capitals</TT
+> table could not be updated directly
+   without an additional grant.  In a similar way, the parent table's row
+   security policies (see <A
+HREF="ddl-rowsecurity.html"
+>Section 5.7</A
+>) are applied to
+   rows coming from child tables during an inherited query.  A child table's
+   policies, if any, are applied only when it is the table explicitly named
+   in the query; and in that case, any policies attached to its parent(s) are
+   ignored.
   </P
 ><P
 >   Foreign tables (see <A
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-others.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-others.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-others.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-others.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-partitioning.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-partitioning.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-partitioning.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-partitioning.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-priv.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-priv.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-priv.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-priv.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-rowsecurity.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-rowsecurity.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-rowsecurity.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-rowsecurity.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -267,7 +267,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >CREATE POLICY user_policy ON users
-    USING (user = current_user);</PRE
+    USING (user_name = current_user);</PRE
 ><P
 >   To use a different policy for rows that are being added to the table
    compared to those rows that are visible, the <TT
@@ -284,7 +284,7 @@
 CLASS="PROGRAMLISTING"
 >CREATE POLICY user_policy ON users
     USING (true)
-    WITH CHECK (user = current_user);</PRE
+    WITH CHECK (user_name = current_user);</PRE
 ><P
 >   Row security can also be disabled with the <TT
 CLASS="COMMAND"
@@ -307,7 +307,7 @@
 CLASS="PROGRAMLISTING"
 >-- Simple passwd-file based example
 CREATE TABLE passwd (
-  username              text UNIQUE NOT NULL,
+  user_name             text UNIQUE NOT NULL,
   pwhash                text,
   uid                   int  PRIMARY KEY,
   gid                   int  NOT NULL,
@@ -341,9 +341,9 @@
 -- Normal users can update their own records, but
 -- limit which shells a normal user is allowed to set
 CREATE POLICY user_mod ON passwd FOR UPDATE
-  USING (current_user = username)
+  USING (current_user = user_name)
   WITH CHECK (
-    current_user = username AND
+    current_user = user_name AND
     shell IN ('/bin/bash','/bin/sh','/bin/dash','/bin/zsh','/bin/tcsh')
   );
 
@@ -351,7 +351,7 @@
 GRANT SELECT, INSERT, UPDATE, DELETE ON passwd TO admin;
 -- Users only get select access on public columns
 GRANT SELECT
-  (username, uid, gid, real_name, home_phone, extra_info, home_dir, shell)
+  (user_name, uid, gid, real_name, home_phone, extra_info, home_dir, shell)
   ON passwd TO public;
 -- Allow users to update certain columns
 GRANT UPDATE
@@ -368,11 +368,11 @@
 postgres=&gt; set role admin;
 SET
 postgres=&gt; table passwd;
- username | pwhash | uid | gid | real_name |  home_phone  | extra_info | home_dir    |   shell
-----------+--------+-----+-----+-----------+--------------+------------+-------------+-----------
- admin    | xxx    |   0 |   0 | Admin     | 111-222-3333 |            | /root       | /bin/dash
- bob      | xxx    |   1 |   1 | Bob       | 123-456-7890 |            | /home/bob   | /bin/zsh
- alice    | xxx    |   2 |   1 | Alice     | 098-765-4321 |            | /home/alice | /bin/zsh
+ user_name | pwhash | uid | gid | real_name |  home_phone  | extra_info | home_dir    |   shell
+-----------+--------+-----+-----+-----------+--------------+------------+-------------+-----------
+ admin     | xxx    |   0 |   0 | Admin     | 111-222-3333 |            | /root       | /bin/dash
+ bob       | xxx    |   1 |   1 | Bob       | 123-456-7890 |            | /home/bob   | /bin/zsh
+ alice     | xxx    |   2 |   1 | Alice     | 098-765-4321 |            | /home/alice | /bin/zsh
 (3 rows)
 
 -- Test what Alice is able to do
@@ -380,26 +380,26 @@
 SET
 postgres=&gt; table passwd;
 ERROR:  permission denied for relation passwd
-postgres=&gt; select username,real_name,home_phone,extra_info,home_dir,shell from passwd;
- username | real_name |  home_phone  | extra_info | home_dir    |   shell
-----------+-----------+--------------+------------+-------------+-----------
- admin    | Admin     | 111-222-3333 |            | /root       | /bin/dash
- bob      | Bob       | 123-456-7890 |            | /home/bob   | /bin/zsh
- alice    | Alice     | 098-765-4321 |            | /home/alice | /bin/zsh
+postgres=&gt; select user_name,real_name,home_phone,extra_info,home_dir,shell from passwd;
+ user_name | real_name |  home_phone  | extra_info | home_dir    |   shell
+-----------+-----------+--------------+------------+-------------+-----------
+ admin     | Admin     | 111-222-3333 |            | /root       | /bin/dash
+ bob       | Bob       | 123-456-7890 |            | /home/bob   | /bin/zsh
+ alice     | Alice     | 098-765-4321 |            | /home/alice | /bin/zsh
 (3 rows)
 
-postgres=&gt; update passwd set username = 'joe';
+postgres=&gt; update passwd set user_name = 'joe';
 ERROR:  permission denied for relation passwd
 -- Alice is allowed to change her own real_name, but no others
 postgres=&gt; update passwd set real_name = 'Alice Doe';
 UPDATE 1
-postgres=&gt; update passwd set real_name = 'John Doe' where username = 'admin';
+postgres=&gt; update passwd set real_name = 'John Doe' where user_name = 'admin';
 UPDATE 0
 postgres=&gt; update passwd set shell = '/bin/xx';
 ERROR:  new row violates WITH CHECK OPTION for "passwd"
 postgres=&gt; delete from passwd;
 ERROR:  permission denied for relation passwd
-postgres=&gt; insert into passwd (username) values ('xxx');
+postgres=&gt; insert into passwd (user_name) values ('xxx');
 ERROR:  permission denied for relation passwd
 -- Alice can change her own password; RLS silently prevents updating other rows
 postgres=&gt; update passwd set pwhash = 'abc';
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-schemas.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-schemas.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-schemas.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-schemas.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -300,12 +300,12 @@
 >CREATE SCHEMA <TT
 CLASS="REPLACEABLE"
 ><I
->schemaname</I
+>schema_name</I
 ></TT
 > AUTHORIZATION <TT
 CLASS="REPLACEABLE"
 ><I
->username</I
+>user_name</I
 ></TT
 >;</PRE
 ><P>
@@ -693,12 +693,12 @@
 ><TT
 CLASS="REPLACEABLE"
 ><I
->username</I
+>user_name</I
 ></TT
 >.<TT
 CLASS="REPLACEABLE"
 ><I
->tablename</I
+>table_name</I
 ></TT
 ></TT
 >.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-system-columns.html postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-system-columns.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ddl-system-columns.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ddl-system-columns.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/dict-int.html postgresql-9.5-9.5.8/doc/src/sgml/html/dict-int.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/dict-int.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/dict-int.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN168976"
+NAME="AEN173827"
 >F.10.1. Configuration</A
 ></H2
 ><P
@@ -164,7 +164,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN168991"
+NAME="AEN173842"
 >F.10.2. Usage</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/dict-xsyn.html postgresql-9.5-9.5.8/doc/src/sgml/html/dict-xsyn.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/dict-xsyn.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/dict-xsyn.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,7 +109,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169008"
+NAME="AEN173859"
 >F.11.1. Configuration</A
 ></H2
 ><P
@@ -240,7 +240,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169048"
+NAME="AEN173899"
 >F.11.2. Usage</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/different-replication-solutions.html postgresql-9.5-9.5.8/doc/src/sgml/html/different-replication-solutions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/different-replication-solutions.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/different-replication-solutions.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="High Availability, Load Balancing, and Replication"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -231,7 +231,7 @@
      and <A
 HREF="sql-commit-prepared.html"
 >COMMIT PREPARED</A
->.
+>).
      <SPAN
 CLASS="PRODUCTNAME"
 >Pgpool-II</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/disk-full.html postgresql-9.5-9.5.8/doc/src/sgml/html/disk-full.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/disk-full.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/disk-full.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Monitoring Disk Usage"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/disk-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/disk-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/disk-usage.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/disk-usage.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Monitoring Disk Usage"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/diskusage.html postgresql-9.5-9.5.8/doc/src/sgml/html/diskusage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/diskusage.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/diskusage.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/dml-delete.html postgresql-9.5-9.5.8/doc/src/sgml/html/dml-delete.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/dml-delete.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/dml-delete.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Manipulation"
@@ -18,15 +18,15 @@
 TITLE="Updating Data"
 HREF="dml-update.html"><LINK
 REL="NEXT"
-TITLE="Queries"
-HREF="queries.html"><LINK
+TITLE="Returning Data From Modified Rows"
+HREF="dml-returning.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="Queries"
-HREF="queries.html"
+TITLE="Returning Data From Modified Rows"
+HREF="dml-returning.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -167,7 +167,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="queries.html"
+HREF="dml-returning.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -191,7 +191,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Queries</TD
+>Returning Data From Modified Rows</TD
 ></TR
 ></TABLE
 ></DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/dml.html postgresql-9.5-9.5.8/doc/src/sgml/html/dml.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/dml.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/dml.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -116,6 +116,11 @@
 HREF="dml-delete.html"
 >Deleting Data</A
 ></DT
+><DT
+>6.4. <A
+HREF="dml-returning.html"
+>Returning Data From Modified Rows</A
+></DT
 ></DL
 ></DIV
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/dml-insert.html postgresql-9.5-9.5.8/doc/src/sgml/html/dml-insert.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/dml-insert.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/dml-insert.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Manipulation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -179,6 +179,20 @@
     (3, 'Milk', 2.99);</PRE
 ><P>
   </P
+><P
+>   It is also possible to insert the result of a query (which might be no
+   rows, one row, or many rows):
+</P><PRE
+CLASS="PROGRAMLISTING"
+>INSERT INTO products (product_no, name, price)
+  SELECT product_no, name, price FROM new_products
+    WHERE release_date = 'today';</PRE
+><P>
+   This provides the full power of the SQL query mechanism (<A
+HREF="queries.html"
+>Chapter 7</A
+>) for computing the rows to be inserted.
+  </P
 ><DIV
 CLASS="TIP"
 ><BLOCKQUOTE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/dml-returning.html postgresql-9.5-9.5.8/doc/src/sgml/html/dml-returning.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/dml-returning.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/dml-returning.html	2017-08-07 21:31:59.000000000 +0000
@@ -0,0 +1,292 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Returning Data From Modified Rows</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Data Manipulation"
+HREF="dml.html"><LINK
+REL="PREVIOUS"
+TITLE="Deleting Data"
+HREF="dml-delete.html"><LINK
+REL="NEXT"
+TITLE="Queries"
+HREF="queries.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Deleting Data"
+HREF="dml-delete.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="dml.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 6. Data Manipulation</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Queries"
+HREF="queries.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="DML-RETURNING"
+>6.4. Returning Data From Modified Rows</A
+></H1
+><P
+>   Sometimes it is useful to obtain data from modified rows while they are
+   being manipulated.  The <TT
+CLASS="COMMAND"
+>INSERT</TT
+>, <TT
+CLASS="COMMAND"
+>UPDATE</TT
+>,
+   and <TT
+CLASS="COMMAND"
+>DELETE</TT
+> commands all have an
+   optional <TT
+CLASS="LITERAL"
+>RETURNING</TT
+> clause that supports this.  Use
+   of <TT
+CLASS="LITERAL"
+>RETURNING</TT
+> avoids performing an extra database query to
+   collect the data, and is especially valuable when it would otherwise be
+   difficult to identify the modified rows reliably.
+  </P
+><P
+>   The allowed contents of a <TT
+CLASS="LITERAL"
+>RETURNING</TT
+> clause are the same as
+   a <TT
+CLASS="COMMAND"
+>SELECT</TT
+> command's output list
+   (see <A
+HREF="queries-select-lists.html"
+>Section 7.3</A
+>).  It can contain column
+   names of the command's target table, or value expressions using those
+   columns.  A common shorthand is <TT
+CLASS="LITERAL"
+>RETURNING *</TT
+>, which selects
+   all columns of the target table in order.
+  </P
+><P
+>   In an <TT
+CLASS="COMMAND"
+>INSERT</TT
+>, the data available to <TT
+CLASS="LITERAL"
+>RETURNING</TT
+> is
+   the row as it was inserted.  This is not so useful in trivial inserts,
+   since it would just repeat the data provided by the client.  But it can
+   be very handy when relying on computed default values.  For example,
+   when using a <A
+HREF="datatype-numeric.html#DATATYPE-SERIAL"
+><TT
+CLASS="TYPE"
+>serial</TT
+></A
+>
+   column to provide unique identifiers, <TT
+CLASS="LITERAL"
+>RETURNING</TT
+> can return
+   the ID assigned to a new row:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>CREATE TABLE users (firstname text, lastname text, id serial primary key);
+
+INSERT INTO users (firstname, lastname) VALUES ('Joe', 'Cool') RETURNING id;</PRE
+><P>
+   The <TT
+CLASS="LITERAL"
+>RETURNING</TT
+> clause is also very useful
+   with <TT
+CLASS="LITERAL"
+>INSERT ... SELECT</TT
+>.
+  </P
+><P
+>   In an <TT
+CLASS="COMMAND"
+>UPDATE</TT
+>, the data available to <TT
+CLASS="LITERAL"
+>RETURNING</TT
+> is
+   the new content of the modified row.  For example:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>UPDATE products SET price = price * 1.10
+  WHERE price &lt;= 99.99
+  RETURNING name, price AS new_price;</PRE
+><P>
+  </P
+><P
+>   In a <TT
+CLASS="COMMAND"
+>DELETE</TT
+>, the data available to <TT
+CLASS="LITERAL"
+>RETURNING</TT
+> is
+   the content of the deleted row.  For example:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>DELETE FROM products
+  WHERE obsoletion_date = 'today'
+  RETURNING *;</PRE
+><P>
+  </P
+><P
+>   If there are triggers (<A
+HREF="triggers.html"
+>Chapter 36</A
+>) on the target table,
+   the data available to <TT
+CLASS="LITERAL"
+>RETURNING</TT
+> is the row as modified by
+   the triggers.  Thus, inspecting columns computed by triggers is another
+   common use-case for <TT
+CLASS="LITERAL"
+>RETURNING</TT
+>.
+  </P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="dml-delete.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="queries.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Deleting Data</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="dml.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Queries</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/dml-update.html postgresql-9.5-9.5.8/doc/src/sgml/html/dml-update.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/dml-update.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/dml-update.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Manipulation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/docguide-authoring.html postgresql-9.5-9.5.8/doc/src/sgml/html/docguide-authoring.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/docguide-authoring.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/docguide-authoring.html	2017-08-07 21:33:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Documentation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -120,7 +120,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN176319"
+NAME="AEN181194"
 >J.4.1. Emacs/PSGML</A
 ></H2
 ><P
@@ -264,7 +264,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN176348"
+NAME="AEN181223"
 >J.4.2. Other Emacs Modes</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/docguide-build.html postgresql-9.5-9.5.8/doc/src/sgml/html/docguide-build.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/docguide-build.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/docguide-build.html	2017-08-07 21:33:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Documentation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,7 +109,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN176107"
+NAME="AEN180982"
 >J.3.1. HTML</A
 ></H2
 ><P
@@ -170,7 +170,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN176124"
+NAME="AEN180999"
 >J.3.2. Manpages</A
 ></H2
 ><P
@@ -201,7 +201,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN176131"
+NAME="AEN181006"
 >J.3.3. Print Output via <SPAN
 CLASS="APPLICATION"
 >JadeTeX</SPAN
@@ -316,7 +316,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN176160"
+NAME="AEN181035"
 >J.3.4. Overflow Text</A
 ></H2
 ><P
@@ -361,7 +361,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN176170"
+NAME="AEN181045"
 >J.3.5. Print Output via <ACRONYM
 CLASS="ACRONYM"
 >RTF</ACRONYM
@@ -595,7 +595,7 @@
 ><P
 ></P
 ><A
-NAME="AEN176233"
+NAME="AEN181108"
 ></A
 ><TABLE
 BORDER="1"
@@ -794,7 +794,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN176298"
+NAME="AEN181173"
 >J.3.6. Plain Text Files</A
 ></H2
 ><P
@@ -829,7 +829,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN176306"
+NAME="AEN181181"
 >J.3.7. Syntax Check</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/docguide-docbook.html postgresql-9.5-9.5.8/doc/src/sgml/html/docguide-docbook.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/docguide-docbook.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/docguide-docbook.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Documentation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/docguide.html postgresql-9.5-9.5.8/doc/src/sgml/html/docguide.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/docguide.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/docguide.html	2017-08-07 21:33:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/docguide-style.html postgresql-9.5-9.5.8/doc/src/sgml/html/docguide-style.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/docguide-style.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/docguide-style.html	2017-08-07 21:33:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Documentation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -100,7 +100,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN176359"
+NAME="AEN181234"
 >J.5.1. Reference Pages</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/docguide-toolsets.html postgresql-9.5-9.5.8/doc/src/sgml/html/docguide-toolsets.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/docguide-toolsets.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/docguide-toolsets.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Documentation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -314,7 +314,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN175911"
+NAME="AEN180786"
 >J.2.1. Installation on Fedora, RHEL, and Derivatives</A
 ></H2
 ><P
@@ -330,7 +330,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN175915"
+NAME="AEN180790"
 >J.2.2. Installation on FreeBSD</A
 ></H2
 ><P
@@ -418,7 +418,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN175944"
+NAME="AEN180819"
 >J.2.3. Debian Packages</A
 ></H2
 ><P
@@ -439,7 +439,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN175949"
+NAME="AEN180824"
 >J.2.4. OS X</A
 ></H2
 ><P
@@ -455,7 +455,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN175953"
+NAME="AEN180828"
 >J.2.5. Manual Installation from Source</A
 ></H2
 ><P
@@ -477,7 +477,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN175958"
+NAME="AEN180833"
 >J.2.5.1. Installing OpenJade</A
 ></H3
 ><DIV
@@ -603,7 +603,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN175985"
+NAME="AEN180860"
 >J.2.5.2. Installing the <SPAN
 CLASS="PRODUCTNAME"
 >DocBook</SPAN
@@ -737,7 +737,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN176021"
+NAME="AEN180896"
 >J.2.5.3. Installing the DocBook <ACRONYM
 CLASS="ACRONYM"
 >DSSSL</ACRONYM
@@ -813,7 +813,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN176039"
+NAME="AEN180914"
 >J.2.5.4. Installing <SPAN
 CLASS="PRODUCTNAME"
 >JadeTeX</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/dynamic-trace.html postgresql-9.5-9.5.8/doc/src/sgml/html/dynamic-trace.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/dynamic-trace.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/dynamic-trace.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Monitoring Database Activity"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/earthdistance.html postgresql-9.5-9.5.8/doc/src/sgml/html/earthdistance.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/earthdistance.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/earthdistance.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -139,7 +139,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169072"
+NAME="AEN173923"
 >F.12.1. Cube-based Earth Distances</A
 ></H2
 ><P
@@ -185,7 +185,7 @@
 >   The provided functions are shown
    in <A
 HREF="earthdistance.html#EARTHDISTANCE-CUBE-FUNCTIONS"
->Table F-4</A
+>Table F-6</A
 >.
   </P
 ><DIV
@@ -195,7 +195,7 @@
 ></A
 ><P
 ><B
->Table F-4. Cube-based Earthdistance Functions</B
+>Table F-6. Cube-based Earthdistance Functions</B
 ></P
 ><TABLE
 BORDER="1"
@@ -358,7 +358,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169160"
+NAME="AEN174011"
 >F.12.2. Point-based Earth Distances</A
 ></H2
 ><P
@@ -376,7 +376,7 @@
 >   A single operator is provided, shown
    in <A
 HREF="earthdistance.html#EARTHDISTANCE-POINT-OPERATORS"
->Table F-5</A
+>Table F-7</A
 >.
   </P
 ><DIV
@@ -386,7 +386,7 @@
 ></A
 ><P
 ><B
->Table F-5. Point-based Earthdistance Operators</B
+>Table F-7. Point-based Earthdistance Operators</B
 ></P
 ><TABLE
 BORDER="1"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-commands.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-commands.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-commands.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-commands.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-concept.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-concept.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-concept.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-concept.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-connect.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-connect.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-connect.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-connect.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -456,8 +456,7 @@
 ><P
 >   If your application uses multiple threads of execution, they cannot share a
    connection concurrently. You must either explicitly control access to the connection
-   (using mutexes) or use a connection for each thread. If each thread uses its own connection,
-   you will need to use the AT clause to specify which connection the thread will use.
+   (using mutexes) or use a connection for each thread.
   </P
 ><P
 >   The second option is to execute a statement to switch the current
@@ -472,7 +471,7 @@
 >;</PRE
 ><P>
    This option is particularly convenient if many statements are to be
-   executed on the same connection.  It is not thread-aware.
+   executed on the same connection.
   </P
 ><P
 >   Here is an example program managing multiple database connections:
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-cpp.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-cpp.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-cpp.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-cpp.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -463,7 +463,7 @@
     <TT
 CLASS="FILENAME"
 >test_cpp.cpp</TT
-> with the C++ compiler:.
+> with the C++ compiler:
 </P><PRE
 CLASS="PROGRAMLISTING"
 >c++ -c test_cpp.cpp -o test_cpp.o</PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-descriptors.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-descriptors.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-descriptors.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-descriptors.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -690,7 +690,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN48300"
+NAME="AEN48578"
 >33.7.2.1. SQLDA Data Structure</A
 ></H3
 ><P
@@ -811,7 +811,7 @@
 ></DT
 ><DD
 ><P
->        It contains the number of input parameters for a parametrized query
+>        It contains the number of input parameters for a parametrized query in
         case it's passed into <TT
 CLASS="COMMAND"
 >OPEN</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-develop.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-develop.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-develop.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-develop.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-dynamic.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-dynamic.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-dynamic.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-dynamic.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-errors.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-errors.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-errors.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-errors.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Client Interfaces"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-informix-compat.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-informix-compat.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-informix-compat.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-informix-compat.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -124,7 +124,7 @@
 CLASS="LITERAL"
 >EXEC SQL</TT
 > primitive to introduce
-   embedded SQL commands.:
+   embedded SQL commands:
 </P><PRE
 CLASS="PROGRAMLISTING"
 >$int j = 3;
@@ -270,7 +270,7 @@
         synonym for ECPG's <TT
 CLASS="LITERAL"
 >DISCONNECT CURRENT</TT
->.:
+>:
 </P><PRE
 CLASS="PROGRAMLISTING"
 >$CLOSE DATABASE;                /* close the current connection */
@@ -1320,7 +1320,7 @@
         convert (<TT
 CLASS="LITERAL"
 >d</TT
-> and the second one is a pointer to the target
+>) and the second one is a pointer to the target
         string. The output format is always <TT
 CLASS="LITERAL"
 >yyyy-mm-dd</TT
@@ -1902,7 +1902,7 @@
 CLASS="LITERAL"
 >ts</TT
 >) and the string that should hold the result of the
-        operation <TT
+        operation (<TT
 CLASS="LITERAL"
 >output</TT
 >). It converts <TT
@@ -1985,7 +1985,7 @@
 CLASS="LITERAL"
 >i</TT
 >) and the string that should hold the result of the
-        operation <TT
+        operation (<TT
 CLASS="LITERAL"
 >str</TT
 >). It converts <TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-library.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-library.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-library.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-library.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-lo.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-lo.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-lo.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-lo.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-pgtypes.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-pgtypes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-pgtypes.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-pgtypes.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-preproc.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-preproc.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-preproc.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-preproc.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-process.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-process.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-process.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-process.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-allocate-descriptor.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-allocate-descriptor.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-allocate-descriptor.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-allocate-descriptor.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49216"
+NAME="AEN49494"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49219"
+NAME="AEN49497"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49222"
+NAME="AEN49500"
 ></A
 ><H2
 >Description</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49228"
+NAME="AEN49506"
 ></A
 ><H2
 >Parameters</H2
@@ -170,7 +170,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49236"
+NAME="AEN49514"
 ></A
 ><H2
 >Examples</H2
@@ -181,7 +181,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49239"
+NAME="AEN49517"
 ></A
 ><H2
 >Compatibility</H2
@@ -196,7 +196,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49243"
+NAME="AEN49521"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-commands.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-commands.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-commands.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-commands.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-connect.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-connect.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-connect.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-connect.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49253"
+NAME="AEN49531"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49256"
+NAME="AEN49534"
 ></A
 ><H2
 >Synopsis</H2
@@ -122,14 +122,14 @@
 > ] [ USER <TT
 CLASS="REPLACEABLE"
 ><I
->connection_user_name</I
+>connection_user</I
 ></TT
 > ]
 CONNECT TO DEFAULT
 CONNECT <TT
 CLASS="REPLACEABLE"
 ><I
->connection_user_name</I
+>connection_user</I
 ></TT
 >
 DATABASE <TT
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49263"
+NAME="AEN49541"
 ></A
 ><H2
 >Description</H2
@@ -157,7 +157,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49267"
+NAME="AEN49545"
 ></A
 ><H2
 >Parameters</H2
@@ -413,7 +413,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49346"
+NAME="AEN49624"
 ></A
 ><H2
 >Examples</H2
@@ -484,7 +484,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49352"
+NAME="AEN49630"
 ></A
 ><H2
 >Compatibility</H2
@@ -500,7 +500,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49356"
+NAME="AEN49634"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-deallocate-descriptor.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-deallocate-descriptor.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-deallocate-descriptor.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-deallocate-descriptor.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49364"
+NAME="AEN49642"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49367"
+NAME="AEN49645"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49370"
+NAME="AEN49648"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49374"
+NAME="AEN49652"
 ></A
 ><H2
 >Parameters</H2
@@ -163,7 +163,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49382"
+NAME="AEN49660"
 ></A
 ><H2
 >Examples</H2
@@ -174,7 +174,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49385"
+NAME="AEN49663"
 ></A
 ><H2
 >Compatibility</H2
@@ -189,7 +189,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49389"
+NAME="AEN49667"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-declare.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-declare.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-declare.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-declare.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49399"
+NAME="AEN49677"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49402"
+NAME="AEN49680"
 ></A
 ><H2
 >Synopsis</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49408"
+NAME="AEN49686"
 ></A
 ><H2
 >Description</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49415"
+NAME="AEN49693"
 ></A
 ><H2
 >Parameters</H2
@@ -234,7 +234,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49437"
+NAME="AEN49715"
 ></A
 ><H2
 >Examples</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49443"
+NAME="AEN49721"
 ></A
 ><H2
 >Compatibility</H2
@@ -273,7 +273,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49447"
+NAME="AEN49725"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-describe.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-describe.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-describe.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-describe.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49457"
+NAME="AEN49735"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49460"
+NAME="AEN49738"
 ></A
 ><H2
 >Synopsis</H2
@@ -146,7 +146,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49468"
+NAME="AEN49746"
 ></A
 ><H2
 >Description</H2
@@ -162,7 +162,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49472"
+NAME="AEN49750"
 ></A
 ><H2
 >Parameters</H2
@@ -215,7 +215,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49490"
+NAME="AEN49768"
 ></A
 ><H2
 >Examples</H2
@@ -230,7 +230,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49493"
+NAME="AEN49771"
 ></A
 ><H2
 >Compatibility</H2
@@ -244,7 +244,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49497"
+NAME="AEN49775"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-disconnect.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-disconnect.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-disconnect.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-disconnect.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49505"
+NAME="AEN49783"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49508"
+NAME="AEN49786"
 ></A
 ><H2
 >Synopsis</H2
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49511"
+NAME="AEN49789"
 ></A
 ><H2
 >Description</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49515"
+NAME="AEN49793"
 ></A
 ><H2
 >Parameters</H2
@@ -211,7 +211,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49542"
+NAME="AEN49820"
 ></A
 ><H2
 >Examples</H2
@@ -235,7 +235,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49545"
+NAME="AEN49823"
 ></A
 ><H2
 >Compatibility</H2
@@ -249,7 +249,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49549"
+NAME="AEN49827"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-execute-immediate.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-execute-immediate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-execute-immediate.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-execute-immediate.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49557"
+NAME="AEN49835"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49560"
+NAME="AEN49838"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49563"
+NAME="AEN49841"
 ></A
 ><H2
 >Description</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49567"
+NAME="AEN49845"
 ></A
 ><H2
 >Parameters</H2
@@ -163,7 +163,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49575"
+NAME="AEN49853"
 ></A
 ><H2
 >Examples</H2
@@ -190,7 +190,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49582"
+NAME="AEN49860"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-get-descriptor.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-get-descriptor.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-get-descriptor.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-get-descriptor.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49587"
+NAME="AEN49865"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49590"
+NAME="AEN49868"
 ></A
 ><H2
 >Synopsis</H2
@@ -150,7 +150,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49599"
+NAME="AEN49877"
 ></A
 ><H2
 >Description</H2
@@ -186,7 +186,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49607"
+NAME="AEN49885"
 ></A
 ><H2
 >Parameters</H2
@@ -273,7 +273,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49637"
+NAME="AEN49915"
 ></A
 ><H2
 >Examples</H2
@@ -359,7 +359,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49649"
+NAME="AEN49927"
 ></A
 ><H2
 >Compatibility</H2
@@ -373,7 +373,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49653"
+NAME="AEN49931"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-open.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-open.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-open.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-open.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49661"
+NAME="AEN49939"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49664"
+NAME="AEN49942"
 ></A
 ><H2
 >Synopsis</H2
@@ -141,7 +141,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49671"
+NAME="AEN49949"
 ></A
 ><H2
 >Description</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49677"
+NAME="AEN49955"
 ></A
 ><H2
 >Parameters</H2
@@ -222,7 +222,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49695"
+NAME="AEN49973"
 ></A
 ><H2
 >Examples</H2
@@ -236,7 +236,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49698"
+NAME="AEN49976"
 ></A
 ><H2
 >Compatibility</H2
@@ -250,7 +250,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49702"
+NAME="AEN49980"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-prepare.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-prepare.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-prepare.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-prepare.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49710"
+NAME="AEN49988"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49713"
+NAME="AEN49991"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49717"
+NAME="AEN49995"
 ></A
 ><H2
 >Description</H2
@@ -148,7 +148,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49723"
+NAME="AEN50001"
 ></A
 ><H2
 >Parameters</H2
@@ -189,7 +189,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49736"
+NAME="AEN50014"
 ></A
 ><H2
 >Examples</H2
@@ -205,7 +205,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49739"
+NAME="AEN50017"
 ></A
 ><H2
 >Compatibility</H2
@@ -219,7 +219,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49743"
+NAME="AEN50021"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-set-autocommit.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-set-autocommit.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-set-autocommit.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-set-autocommit.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49749"
+NAME="AEN50027"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49752"
+NAME="AEN50030"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49754"
+NAME="AEN50032"
 ></A
 ><H2
 >Description</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49760"
+NAME="AEN50038"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-set-connection.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-set-connection.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-set-connection.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-set-connection.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49765"
+NAME="AEN50043"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49768"
+NAME="AEN50046"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49771"
+NAME="AEN50049"
 ></A
 ><H2
 >Description</H2
@@ -138,7 +138,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49776"
+NAME="AEN50054"
 ></A
 ><H2
 >Parameters</H2
@@ -179,7 +179,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49790"
+NAME="AEN50068"
 ></A
 ><H2
 >Examples</H2
@@ -191,7 +191,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49793"
+NAME="AEN50071"
 ></A
 ><H2
 >Compatibility</H2
@@ -205,7 +205,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49797"
+NAME="AEN50075"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-set-descriptor.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-set-descriptor.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-set-descriptor.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-set-descriptor.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49805"
+NAME="AEN50083"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49808"
+NAME="AEN50086"
 ></A
 ><H2
 >Synopsis</H2
@@ -150,7 +150,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49817"
+NAME="AEN50095"
 ></A
 ><H2
 >Description</H2
@@ -175,7 +175,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49823"
+NAME="AEN50101"
 ></A
 ><H2
 >Parameters</H2
@@ -262,7 +262,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49853"
+NAME="AEN50131"
 ></A
 ><H2
 >Examples</H2
@@ -277,7 +277,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49856"
+NAME="AEN50134"
 ></A
 ><H2
 >Compatibility</H2
@@ -291,7 +291,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49860"
+NAME="AEN50138"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-type.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-type.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-type.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-type.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49868"
+NAME="AEN50146"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49871"
+NAME="AEN50149"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49875"
+NAME="AEN50153"
 ></A
 ><H2
 >Description</H2
@@ -153,7 +153,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49883"
+NAME="AEN50161"
 ></A
 ><H2
 >Parameters</H2
@@ -192,7 +192,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49896"
+NAME="AEN50174"
 ></A
 ><H2
 >Examples</H2
@@ -277,7 +277,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49903"
+NAME="AEN50181"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-var.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-var.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-var.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-var.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49908"
+NAME="AEN50186"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49911"
+NAME="AEN50189"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49915"
+NAME="AEN50193"
 ></A
 ><H2
 >Description</H2
@@ -140,7 +140,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49919"
+NAME="AEN50197"
 ></A
 ><H2
 >Parameters</H2
@@ -179,7 +179,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49932"
+NAME="AEN50210"
 ></A
 ><H2
 >Examples</H2
@@ -193,7 +193,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49935"
+NAME="AEN50213"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-whenever.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-whenever.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-sql-whenever.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-sql-whenever.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Embedded SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN49940"
+NAME="AEN50218"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN49943"
+NAME="AEN50221"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49946"
+NAME="AEN50224"
 ></A
 ><H2
 >Description</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49949"
+NAME="AEN50227"
 ></A
 ><H2
 >Parameters</H2
@@ -146,7 +146,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49953"
+NAME="AEN50231"
 ></A
 ><H2
 >Examples</H2
@@ -202,7 +202,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49959"
+NAME="AEN50237"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-variables.html postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-variables.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ecpg-variables.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ecpg-variables.html	2017-08-07 21:32:12.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="ECPG - Embedded SQL in C"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -158,7 +158,7 @@
 CLASS="PROGRAMLISTING"
 >EXEC SQL INSERT INTO sometable VALUES (:v1, 'foo', :v2);</PRE
 ><P>
-    This statements refers to two C variables named
+    This statement refers to two C variables named
     <TT
 CLASS="VARNAME"
 >v1</TT
@@ -590,8 +590,8 @@
 ></TT
 >+1]</TT
 ><A
-NAME="AEN46804"
-HREF="#FTN.AEN46804"
+NAME="AEN47082"
+HREF="#FTN.AEN47082"
 ><SPAN
 CLASS="footnote"
 >[b]</SPAN
@@ -675,8 +675,8 @@
 CLASS="TYPE"
 >bool</TT
 ><A
-NAME="AEN46835"
-HREF="#FTN.AEN46835"
+NAME="AEN47113"
+HREF="#FTN.AEN47113"
 ><SPAN
 CLASS="footnote"
 >[c]</SPAN
@@ -694,13 +694,13 @@
 HREF="ecpg-variables.html#ECPG-SPECIAL-TYPES"
 >Section 33.4.4.2</A
 >.<BR><A
-NAME="FTN.AEN46804"
+NAME="FTN.AEN47082"
 >b. </A
 >declared in <TT
 CLASS="FILENAME"
 >ecpglib.h</TT
 ><BR><A
-NAME="FTN.AEN46835"
+NAME="FTN.AEN47113"
 >c. </A
 >declared in <TT
 CLASS="FILENAME"
@@ -885,7 +885,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN46878"
+NAME="AEN47156"
 >33.4.4.2.1. timestamp, date</A
 ></H4
 ><P
@@ -1145,7 +1145,7 @@
 CLASS="TYPE"
 >VARCHAR[]</TT
 >, as
-      explained <A
+      explained in <A
 HREF="ecpg-variables.html#ECPG-CHAR"
 >Section 33.4.4.1</A
 >.  The second use case is to
@@ -1343,7 +1343,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN46950"
+NAME="AEN47228"
 >33.4.4.3.3. Typedefs</A
 ></H4
 ><P
@@ -1372,7 +1372,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN46956"
+NAME="AEN47234"
 >33.4.4.3.4. Pointers</A
 ></H4
 ><P
@@ -1415,7 +1415,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN46965"
+NAME="AEN47243"
 >33.4.5.1. Arrays</A
 ></H3
 ><P
@@ -1578,7 +1578,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN46989"
+NAME="AEN47267"
 >33.4.5.2. Composite Types</A
 ></H3
 ><P
@@ -1739,7 +1739,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN47011"
+NAME="AEN47289"
 >33.4.5.3. User-defined Base Types</A
 ></H3
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/encryption-options.html postgresql-9.5-9.5.8/doc/src/sgml/html/encryption-options.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/encryption-options.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/encryption-options.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/errcodes-appendix.html postgresql-9.5-9.5.8/doc/src/sgml/html/errcodes-appendix.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/errcodes-appendix.html	2016-03-28 20:21:06.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/errcodes-appendix.html	2017-08-07 21:32:36.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -138,7 +138,7 @@
   <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
-> 9.5.2.  (Some are not actually
+> 9.5.8.  (Some are not actually
   used at present, but are defined by the SQL standard.)
   The error classes are also shown.  For each error class there is a
   <SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/error-message-reporting.html postgresql-9.5-9.5.8/doc/src/sgml/html/error-message-reporting.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/error-message-reporting.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/error-message-reporting.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Coding Conventions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -277,8 +277,8 @@
 >errno</TT
 >.
      <A
-NAME="AEN110634"
-HREF="#FTN.AEN110634"
+NAME="AEN111003"
+HREF="#FTN.AEN111003"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
@@ -714,8 +714,8 @@
 VALIGN="TOP"
 WIDTH="5%"
 ><A
-NAME="FTN.AEN110634"
-HREF="error-message-reporting.html#AEN110634"
+NAME="FTN.AEN111003"
+HREF="error-message-reporting.html#AEN111003"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/error-style-guide.html postgresql-9.5-9.5.8/doc/src/sgml/html/error-style-guide.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/error-style-guide.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/error-style-guide.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Coding Conventions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,7 +108,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110749"
+NAME="AEN111118"
 >51.3.1. What Goes Where</A
 ></H2
 ><P
@@ -158,7 +158,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110758"
+NAME="AEN111127"
 >51.3.2. Formatting</A
 ></H2
 ><P
@@ -181,7 +181,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110762"
+NAME="AEN111131"
 >51.3.3. Quotation Marks</A
 ></H2
 ><P
@@ -204,7 +204,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110766"
+NAME="AEN111135"
 >51.3.4. Use of Quotes</A
 ></H2
 ><P
@@ -232,7 +232,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110772"
+NAME="AEN111141"
 >51.3.5. Grammar and Punctuation</A
 ></H2
 ><P
@@ -270,7 +270,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110779"
+NAME="AEN111148"
 >51.3.6. Upper Case vs. Lower Case</A
 ></H2
 ><P
@@ -288,7 +288,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110783"
+NAME="AEN111152"
 >51.3.7. Avoid Passive Voice</A
 ></H2
 ><P
@@ -312,7 +312,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110789"
+NAME="AEN111158"
 >51.3.8. Present vs. Past Tense</A
 ></H2
 ><P
@@ -360,7 +360,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110799"
+NAME="AEN111168"
 >51.3.9. Type of the Object</A
 ></H2
 ><P
@@ -379,7 +379,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110804"
+NAME="AEN111173"
 >51.3.10. Brackets</A
 ></H2
 ><P
@@ -396,7 +396,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110808"
+NAME="AEN111177"
 >51.3.11. Assembling Error Messages</A
 ></H2
 ><P
@@ -420,7 +420,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110813"
+NAME="AEN111182"
 >51.3.12. Reasons for Errors</A
 ></H2
 ><P
@@ -439,7 +439,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110817"
+NAME="AEN111186"
 >51.3.13. Function Names</A
 ></H2
 ><P
@@ -474,7 +474,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110824"
+NAME="AEN111193"
 >51.3.14. Tricky Words to Avoid</A
 ></H2
 ><DIV
@@ -619,7 +619,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110867"
+NAME="AEN111236"
 >51.3.15. Proper Spelling</A
 ></H2
 ><P
@@ -664,7 +664,7 @@
 ><H2
 CLASS="SIMPLESECT"
 ><A
-NAME="AEN110882"
+NAME="AEN111251"
 >51.3.16. Localization</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/event-log-registration.html postgresql-9.5-9.5.8/doc/src/sgml/html/event-log-registration.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/event-log-registration.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/event-log-registration.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/event-trigger-definition.html postgresql-9.5-9.5.8/doc/src/sgml/html/event-trigger-definition.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/event-trigger-definition.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/event-trigger-definition.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Event Triggers"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/event-trigger-example.html postgresql-9.5-9.5.8/doc/src/sgml/html/event-trigger-example.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/event-trigger-example.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/event-trigger-example.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Event Triggers"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/event-trigger-interface.html postgresql-9.5-9.5.8/doc/src/sgml/html/event-trigger-interface.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/event-trigger-interface.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/event-trigger-interface.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Event Triggers"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/event-trigger-matrix.html postgresql-9.5-9.5.8/doc/src/sgml/html/event-trigger-matrix.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/event-trigger-matrix.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/event-trigger-matrix.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Event Triggers"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/event-triggers.html postgresql-9.5-9.5.8/doc/src/sgml/html/event-triggers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/event-triggers.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/event-triggers.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/event-trigger-table-rewrite-example.html postgresql-9.5-9.5.8/doc/src/sgml/html/event-trigger-table-rewrite-example.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/event-trigger-table-rewrite-example.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/event-trigger-table-rewrite-example.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Event Triggers"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/executor.html postgresql-9.5-9.5.8/doc/src/sgml/html/executor.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/executor.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/executor.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Overview of PostgreSQL Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/explicit-joins.html postgresql-9.5-9.5.8/doc/src/sgml/html/explicit-joins.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/explicit-joins.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/explicit-joins.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Performance Tips"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/explicit-locking.html postgresql-9.5-9.5.8/doc/src/sgml/html/explicit-locking.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/explicit-locking.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/explicit-locking.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Concurrency Control"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/extend-extensions.html postgresql-9.5-9.5.8/doc/src/sgml/html/extend-extensions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/extend-extensions.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/extend-extensions.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -235,7 +235,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN58944"
+NAME="AEN59201"
 >35.15.1. Extension Files</A
 ></H2
 ><P
@@ -633,7 +633,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN59062"
+NAME="AEN59319"
 >35.15.2. Extension Relocatability</A
 ></H2
 ><P
@@ -809,7 +809,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN59103"
+NAME="AEN59360"
 >35.15.3. Extension Configuration Tables</A
 ></H2
 ><P
@@ -913,7 +913,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN59125"
+NAME="AEN59382"
 >35.15.4. Extension Updates</A
 ></H2
 ><P
@@ -1166,7 +1166,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN59180"
+NAME="AEN59437"
 >35.15.5. Extension Example</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/extend-how.html postgresql-9.5-9.5.8/doc/src/sgml/html/extend-how.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/extend-how.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/extend-how.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/extend.html postgresql-9.5-9.5.8/doc/src/sgml/html/extend.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/extend.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/extend.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -121,12 +121,12 @@
 ><DL
 ><DT
 >35.2.1. <A
-HREF="extend-type-system.html#AEN56378"
+HREF="extend-type-system.html#AEN56644"
 >Base Types</A
 ></DT
 ><DT
 >35.2.2. <A
-HREF="extend-type-system.html#AEN56384"
+HREF="extend-type-system.html#AEN56650"
 >Composite Types</A
 ></DT
 ><DT
@@ -136,7 +136,7 @@
 ></DT
 ><DT
 >35.2.4. <A
-HREF="extend-type-system.html#AEN56397"
+HREF="extend-type-system.html#AEN56663"
 >Pseudo-Types</A
 ></DT
 ><DT
@@ -238,7 +238,7 @@
 ></DT
 ><DT
 >35.4.10. <A
-HREF="xfunc-sql.html#AEN56786"
+HREF="xfunc-sql.html#AEN57039"
 >Polymorphic <ACRONYM
 CLASS="ACRONYM"
 >SQL</ACRONYM
@@ -246,7 +246,7 @@
 ></DT
 ><DT
 >35.4.11. <A
-HREF="xfunc-sql.html#AEN56812"
+HREF="xfunc-sql.html#AEN57065"
 ><ACRONYM
 CLASS="ACRONYM"
 >SQL</ACRONYM
@@ -293,17 +293,17 @@
 ></DT
 ><DT
 >35.9.3. <A
-HREF="xfunc-c.html#AEN57340"
+HREF="xfunc-c.html#AEN57593"
 >Version 0 Calling Conventions</A
 ></DT
 ><DT
 >35.9.4. <A
-HREF="xfunc-c.html#AEN57367"
+HREF="xfunc-c.html#AEN57620"
 >Version 1 Calling Conventions</A
 ></DT
 ><DT
 >35.9.5. <A
-HREF="xfunc-c.html#AEN57425"
+HREF="xfunc-c.html#AEN57678"
 >Writing Code</A
 ></DT
 ><DT
@@ -313,12 +313,12 @@
 ></DT
 ><DT
 >35.9.7. <A
-HREF="xfunc-c.html#AEN57626"
+HREF="xfunc-c.html#AEN57877"
 >Composite-type Arguments</A
 ></DT
 ><DT
 >35.9.8. <A
-HREF="xfunc-c.html#AEN57650"
+HREF="xfunc-c.html#AEN57901"
 >Returning Rows (Composite Types)</A
 ></DT
 ><DT
@@ -328,7 +328,7 @@
 ></DT
 ><DT
 >35.9.10. <A
-HREF="xfunc-c.html#AEN57779"
+HREF="xfunc-c.html#AEN58030"
 >Polymorphic Arguments and Return Types</A
 ></DT
 ><DT
@@ -338,7 +338,7 @@
 ></DT
 ><DT
 >35.9.12. <A
-HREF="xfunc-c.html#AEN57830"
+HREF="xfunc-c.html#AEN58081"
 >Shared Memory and LWLocks</A
 ></DT
 ><DT
@@ -396,7 +396,7 @@
 ><DL
 ><DT
 >35.13.1. <A
-HREF="xoper-optimization.html#AEN58171"
+HREF="xoper-optimization.html#AEN58428"
 ><TT
 CLASS="LITERAL"
 >COMMUTATOR</TT
@@ -404,7 +404,7 @@
 ></DT
 ><DT
 >35.13.2. <A
-HREF="xoper-optimization.html#AEN58206"
+HREF="xoper-optimization.html#AEN58463"
 ><TT
 CLASS="LITERAL"
 >NEGATOR</TT
@@ -412,7 +412,7 @@
 ></DT
 ><DT
 >35.13.3. <A
-HREF="xoper-optimization.html#AEN58222"
+HREF="xoper-optimization.html#AEN58479"
 ><TT
 CLASS="LITERAL"
 >RESTRICT</TT
@@ -420,7 +420,7 @@
 ></DT
 ><DT
 >35.13.4. <A
-HREF="xoper-optimization.html#AEN58272"
+HREF="xoper-optimization.html#AEN58529"
 ><TT
 CLASS="LITERAL"
 >JOIN</TT
@@ -428,7 +428,7 @@
 ></DT
 ><DT
 >35.13.5. <A
-HREF="xoper-optimization.html#AEN58304"
+HREF="xoper-optimization.html#AEN58561"
 ><TT
 CLASS="LITERAL"
 >HASHES</TT
@@ -436,7 +436,7 @@
 ></DT
 ><DT
 >35.13.6. <A
-HREF="xoper-optimization.html#AEN58326"
+HREF="xoper-optimization.html#AEN58583"
 ><TT
 CLASS="LITERAL"
 >MERGES</TT
@@ -502,27 +502,27 @@
 ><DL
 ><DT
 >35.15.1. <A
-HREF="extend-extensions.html#AEN58944"
+HREF="extend-extensions.html#AEN59201"
 >Extension Files</A
 ></DT
 ><DT
 >35.15.2. <A
-HREF="extend-extensions.html#AEN59062"
+HREF="extend-extensions.html#AEN59319"
 >Extension Relocatability</A
 ></DT
 ><DT
 >35.15.3. <A
-HREF="extend-extensions.html#AEN59103"
+HREF="extend-extensions.html#AEN59360"
 >Extension Configuration Tables</A
 ></DT
 ><DT
 >35.15.4. <A
-HREF="extend-extensions.html#AEN59125"
+HREF="extend-extensions.html#AEN59382"
 >Extension Updates</A
 ></DT
 ><DT
 >35.15.5. <A
-HREF="extend-extensions.html#AEN59180"
+HREF="extend-extensions.html#AEN59437"
 >Extension Example</A
 ></DT
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/extend-pgxs.html postgresql-9.5-9.5.8/doc/src/sgml/html/extend-pgxs.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/extend-pgxs.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/extend-pgxs.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/extend-type-system.html postgresql-9.5-9.5.8/doc/src/sgml/html/extend-type-system.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/extend-type-system.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/extend-type-system.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -113,7 +113,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN56378"
+NAME="AEN56644"
 >35.2.1. Base Types</A
 ></H2
 ><P
@@ -144,7 +144,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN56384"
+NAME="AEN56650"
 >35.2.2. Composite Types</A
 ></H2
 ><P
@@ -201,7 +201,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN56397"
+NAME="AEN56663"
 >35.2.4. Pseudo-Types</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/external-admin-tools.html postgresql-9.5-9.5.8/doc/src/sgml/html/external-admin-tools.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/external-admin-tools.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/external-admin-tools.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="External Projects"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/external-extensions.html postgresql-9.5-9.5.8/doc/src/sgml/html/external-extensions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/external-extensions.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/external-extensions.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="External Projects"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/external-interfaces.html postgresql-9.5-9.5.8/doc/src/sgml/html/external-interfaces.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/external-interfaces.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/external-interfaces.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="External Projects"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -186,14 +186,14 @@
 ><TD
 >JDBC</TD
 ><TD
->JDBC</TD
+>Java</TD
 ><TD
 >Type 4 JDBC driver</TD
 ><TD
 ><A
-HREF="http://jdbc.postgresql.org/"
+HREF="https://jdbc.postgresql.org/"
 TARGET="_top"
->http://jdbc.postgresql.org/</A
+>https://jdbc.postgresql.org/</A
 ></TD
 ></TR
 ><TR
@@ -212,6 +212,20 @@
 ></TR
 ><TR
 ><TD
+>node-postgres</TD
+><TD
+>JavaScript</TD
+><TD
+>Node.js driver</TD
+><TD
+><A
+HREF="https://node-postgres.com/"
+TARGET="_top"
+>https://node-postgres.com/</A
+></TD
+></TR
+><TR
+><TD
 >Npgsql</TD
 ><TD
 >.NET</TD
@@ -226,6 +240,20 @@
 ></TR
 ><TR
 ><TD
+>pgtcl</TD
+><TD
+>Tcl</TD
+><TD
+>&nbsp;</TD
+><TD
+><A
+HREF="https://github.com/flightaware/Pgtcl"
+TARGET="_top"
+>https://github.com/flightaware/Pgtcl</A
+></TD
+></TR
+><TR
+><TD
 >pgtclng</TD
 ><TD
 >Tcl</TD
@@ -239,6 +267,20 @@
 ></TD
 ></TR
 ><TR
+><TD
+>pq</TD
+><TD
+>Go</TD
+><TD
+>Pure Go driver for Go's database/sql</TD
+><TD
+><A
+HREF="https://github.com/lib/pq"
+TARGET="_top"
+>https://github.com/lib/pq</A
+></TD
+></TR
+><TR
 ><TD
 >psqlODBC</TD
 ><TD
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/external-pl.html postgresql-9.5-9.5.8/doc/src/sgml/html/external-pl.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/external-pl.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/external-pl.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="External Projects"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -175,9 +175,9 @@
 >PHP</TD
 ><TD
 ><A
-HREF="http://www.commandprompt.com/community/plphp/"
+HREF="https://public.commandprompt.com/projects/plphp"
 TARGET="_top"
->http://www.commandprompt.com/community/plphp/</A
+>https://public.commandprompt.com/projects/plphp</A
 ></TD
 ></TR
 ><TR
@@ -199,9 +199,9 @@
 >R</TD
 ><TD
 ><A
-HREF="http://www.joeconway.com/plr/"
+HREF="http://www.joeconway.com/plr.html"
 TARGET="_top"
->http://www.joeconway.com/plr/</A
+>http://www.joeconway.com/plr.html</A
 ></TD
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/external-projects.html postgresql-9.5-9.5.8/doc/src/sgml/html/external-projects.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/external-projects.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/external-projects.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/fdw-callbacks.html postgresql-9.5-9.5.8/doc/src/sgml/html/fdw-callbacks.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/fdw-callbacks.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/fdw-callbacks.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Writing A Foreign Data Wrapper"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/fdw-functions.html postgresql-9.5-9.5.8/doc/src/sgml/html/fdw-functions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/fdw-functions.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/fdw-functions.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Writing A Foreign Data Wrapper"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/fdwhandler.html postgresql-9.5-9.5.8/doc/src/sgml/html/fdwhandler.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/fdwhandler.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/fdwhandler.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/fdw-helpers.html postgresql-9.5-9.5.8/doc/src/sgml/html/fdw-helpers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/fdw-helpers.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/fdw-helpers.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Writing A Foreign Data Wrapper"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/fdw-planning.html postgresql-9.5-9.5.8/doc/src/sgml/html/fdw-planning.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/fdw-planning.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/fdw-planning.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Writing A Foreign Data Wrapper"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/fdw-row-locking.html postgresql-9.5-9.5.8/doc/src/sgml/html/fdw-row-locking.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/fdw-row-locking.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/fdw-row-locking.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Writing A Foreign Data Wrapper"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/features.html postgresql-9.5-9.5.8/doc/src/sgml/html/features.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/features.html	2016-03-28 20:21:09.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/features.html	2017-08-07 21:32:38.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/features-sql-standard.html postgresql-9.5-9.5.8/doc/src/sgml/html/features-sql-standard.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/features-sql-standard.html	2016-03-28 20:21:08.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/features-sql-standard.html	2017-08-07 21:32:38.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Conformance"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -101,7 +101,7 @@
 ><P
 ></P
 ><A
-NAME="AEN122532"
+NAME="AEN122919"
 ></A
 ><TABLE
 BORDER="1"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/file-fdw.html postgresql-9.5-9.5.8/doc/src/sgml/html/file-fdw.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/file-fdw.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/file-fdw.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -376,7 +376,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN169287"
+NAME="AEN174138"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-admin.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-admin.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-admin.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-admin.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -2083,7 +2083,19 @@
 CLASS="LITERAL"
 ><CODE
 CLASS="FUNCTION"
->pg_replication_origin_xact_reset()</CODE
+>pg_replication_origin_xact_reset(<TT
+CLASS="PARAMETER"
+>origin_lsn</TT
+> <TT
+CLASS="TYPE"
+>pg_lsn</TT
+>, <TT
+CLASS="PARAMETER"
+>origin_timestamp</TT
+> <TT
+CLASS="TYPE"
+>timestamptz</TT
+>)</CODE
 ></TT
 >
        </TD
@@ -2096,6 +2108,27 @@
 CLASS="FUNCTION"
 >pg_replication_origin_xact_setup()</CODE
 >.
+        Note that two arguments were introduced <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>by mistake</I
+></SPAN
+>
+        during the <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> 9.5 development cycle while
+        <CODE
+CLASS="FUNCTION"
+>pg_replication_origin_xact_reset()</CODE
+> actually
+        doesn't use them at all. Therefore, any dummy values except
+        <TT
+CLASS="LITERAL"
+>NULL</TT
+> can be safely specified as the arguments.
+        This mistake will be fixed in a future release.
        </TD
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-aggregate.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-aggregate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-aggregate.html	2016-03-28 20:20:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-aggregate.html	2017-08-07 21:32:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -1888,7 +1888,6 @@
 ><TR
 ><TD
 >       
-       
        <CODE
 CLASS="FUNCTION"
 >percentile_cont(<TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-array.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-array.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-array.html	2016-03-28 20:20:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-array.html	2017-08-07 21:32:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-binarystring.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-binarystring.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-binarystring.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-binarystring.html	2017-08-07 21:32:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -396,7 +396,7 @@
 >bytea</TT
 ></TD
 ><TD
->        Remove the longest string containing only the bytes in
+>        Remove the longest string containing only bytes appearing in
         <TT
 CLASS="PARAMETER"
 >bytes</TT
@@ -409,7 +409,7 @@
 ><TD
 ><TT
 CLASS="LITERAL"
->trim(E'\\000'::bytea from E'\\000Tom\\000'::bytea)</TT
+>trim(E'\\000\\001'::bytea from E'\\000Tom\\001'::bytea)</TT
 ></TD
 ><TD
 ><TT
@@ -492,8 +492,8 @@
 >bytea</TT
 ></TD
 ><TD
->        Remove the longest string consisting only of bytes
-        in <TT
+>        Remove the longest string containing only bytes appearing in
+        <TT
 CLASS="PARAMETER"
 >bytes</TT
 > from the start and end of
@@ -505,7 +505,7 @@
 ><TD
 ><TT
 CLASS="LITERAL"
->btrim(E'\\000trim\\000'::bytea, E'\\000'::bytea)</TT
+>btrim(E'\\000trim\\001'::bytea, E'\\000\\001'::bytea)</TT
 ></TD
 ><TD
 ><TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-bitstring.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-bitstring.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-bitstring.html	2016-03-28 20:20:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-bitstring.html	2017-08-07 21:32:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-comparison.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-comparison.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-comparison.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-comparison.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -351,6 +351,78 @@
 ><P
 >    
     
+    Ordinary comparison operators yield null (signifying <SPAN
+CLASS="QUOTE"
+>"unknown"</SPAN
+>),
+    not true or false, when either input is null.  For example,
+    <TT
+CLASS="LITERAL"
+>7 = NULL</TT
+> yields null, as does <TT
+CLASS="LITERAL"
+>7 &lt;&gt; NULL</TT
+>.  When
+    this behavior is not suitable, use the
+    <TT
+CLASS="LITERAL"
+>IS [<SPAN
+CLASS="OPTIONAL"
+> NOT </SPAN
+>] DISTINCT FROM</TT
+> constructs:
+</P><PRE
+CLASS="SYNOPSIS"
+><TT
+CLASS="REPLACEABLE"
+><I
+>a</I
+></TT
+> IS DISTINCT FROM <TT
+CLASS="REPLACEABLE"
+><I
+>b</I
+></TT
+>
+<TT
+CLASS="REPLACEABLE"
+><I
+>a</I
+></TT
+> IS NOT DISTINCT FROM <TT
+CLASS="REPLACEABLE"
+><I
+>b</I
+></TT
+></PRE
+><P>
+    For non-null inputs, <TT
+CLASS="LITERAL"
+>IS DISTINCT FROM</TT
+> is
+    the same as the <TT
+CLASS="LITERAL"
+>&lt;&gt;</TT
+> operator.  However, if both
+    inputs are null it returns false, and if only one input is
+    null it returns true.  Similarly, <TT
+CLASS="LITERAL"
+>IS NOT DISTINCT
+    FROM</TT
+> is identical to <TT
+CLASS="LITERAL"
+>=</TT
+> for non-null
+    inputs, but it returns true when both inputs are null, and false when only
+    one input is null. Thus, these constructs effectively act as though null
+    were a normal data value, rather than <SPAN
+CLASS="QUOTE"
+>"unknown"</SPAN
+>.
+   </P
+><P
+>    
+    
     
     
     To check whether a value is or is not null, use the constructs:
@@ -415,8 +487,7 @@
 CLASS="LITERAL"
 >NULL</TT
 >.  (The null value represents an unknown value,
-    and it is not known whether two unknown values are equal.) This
-    behavior conforms to the SQL standard.
+    and it is not known whether two unknown values are equal.)
    </P
 ><DIV
 CLASS="TIP"
@@ -462,13 +533,7 @@
    </P
 ></BLOCKQUOTE
 ></DIV
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
 ><P
-><B
->Note: </B
 >    If the <TT
 CLASS="REPLACEABLE"
 ><I
@@ -492,89 +557,29 @@
 CLASS="LITERAL"
 >IS NOT NULL</TT
 > do not always return
-    inverse results for row-valued expressions, i.e., a row-valued
-    expression that contains both NULL and non-null values will return false
-    for both tests.
-    This definition conforms to the SQL standard, and is a change from the
-    inconsistent behavior exhibited by <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
->
-    versions prior to 8.2.
-   </P
-></BLOCKQUOTE
-></DIV
-><P
->    
-    
-    Ordinary comparison operators yield null (signifying <SPAN
-CLASS="QUOTE"
->"unknown"</SPAN
->),
-    not true or false, when either input is null.  For example,
-    <TT
-CLASS="LITERAL"
->7 = NULL</TT
-> yields null, as does <TT
-CLASS="LITERAL"
->7 &lt;&gt; NULL</TT
->.  When
-    this behavior is not suitable, use the
-    <TT
-CLASS="LITERAL"
->IS [<SPAN
-CLASS="OPTIONAL"
-> NOT </SPAN
->] DISTINCT FROM</TT
-> constructs:
-</P><PRE
-CLASS="SYNOPSIS"
-><TT
-CLASS="REPLACEABLE"
-><I
->expression</I
-></TT
-> IS DISTINCT FROM <TT
+    inverse results for row-valued expressions; in particular, a row-valued
+    expression that contains both null and non-null fields will return false
+    for both tests.  In some cases, it may be preferable to
+    write <TT
 CLASS="REPLACEABLE"
 ><I
->expression</I
+>row</I
 ></TT
+> <TT
+CLASS="LITERAL"
+>IS DISTINCT FROM NULL</TT
 >
-<TT
+    or <TT
 CLASS="REPLACEABLE"
 ><I
->expression</I
+>row</I
 ></TT
-> IS NOT DISTINCT FROM <TT
-CLASS="REPLACEABLE"
-><I
->expression</I
-></TT
-></PRE
-><P>
-    For non-null inputs, <TT
-CLASS="LITERAL"
->IS DISTINCT FROM</TT
-> is
-    the same as the <TT
-CLASS="LITERAL"
->&lt;&gt;</TT
-> operator.  However, if both
-    inputs are null it returns false, and if only one input is
-    null it returns true.  Similarly, <TT
-CLASS="LITERAL"
->IS NOT DISTINCT
-    FROM</TT
-> is identical to <TT
+> <TT
 CLASS="LITERAL"
->=</TT
-> for non-null
-    inputs, but it returns true when both inputs are null, and false when only
-    one input is null. Thus, these constructs effectively act as though null
-    were a normal data value, rather than <SPAN
-CLASS="QUOTE"
->"unknown"</SPAN
->.
+>IS NOT DISTINCT FROM NULL</TT
+>,
+    which will simply check whether the overall row value is null without any
+    additional tests on the row fields.
    </P
 ><P
 >    
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-comparisons.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-comparisons.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-comparisons.html	2016-03-28 20:20:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-comparisons.html	2017-08-07 21:32:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -117,7 +117,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN20283"
+NAME="AEN20465"
 >9.23.1. <TT
 CLASS="LITERAL"
 >IN</TT
@@ -193,7 +193,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN20299"
+NAME="AEN20481"
 >9.23.2. <TT
 CLASS="LITERAL"
 >NOT IN</TT
@@ -296,7 +296,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN20321"
+NAME="AEN20503"
 >9.23.3. <TT
 CLASS="LITERAL"
 >ANY</TT
@@ -399,7 +399,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN20344"
+NAME="AEN20526"
 >9.23.4. <TT
 CLASS="LITERAL"
 >ALL</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-conditional.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-conditional.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-conditional.html	2016-03-28 20:20:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-conditional.html	2017-08-07 21:32:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-datetime.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-datetime.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-datetime.html	2016-03-28 20:20:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-datetime.html	2017-08-07 21:32:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -2530,8 +2530,8 @@
 ><P
 >        The seconds field, including fractional parts (0 -
         59<A
-NAME="AEN15036"
-HREF="#FTN.AEN15036"
+NAME="AEN15214"
+HREF="#FTN.AEN15214"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
@@ -3619,8 +3619,8 @@
 VALIGN="TOP"
 WIDTH="5%"
 ><A
-NAME="FTN.AEN15036"
-HREF="functions-datetime.html#AEN15036"
+NAME="FTN.AEN15214"
+HREF="functions-datetime.html#AEN15214"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-enum.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-enum.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-enum.html	2016-03-28 20:20:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-enum.html	2017-08-07 21:32:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-event-triggers.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-event-triggers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-event-triggers.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-event-triggers.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -145,7 +145,7 @@
 ><P
 ></P
 ><A
-NAME="AEN23528"
+NAME="AEN23762"
 ></A
 ><TABLE
 BORDER="1"
@@ -338,7 +338,7 @@
 ><P
 ></P
 ><A
-NAME="AEN23600"
+NAME="AEN23834"
 ></A
 ><TABLE
 BORDER="1"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-formatting.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-formatting.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-formatting.html	2016-03-28 20:20:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-formatting.html	2017-08-07 21:32:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -948,7 +948,11 @@
 >TZ</TT
 ></TD
 ><TD
->upper case time-zone name</TD
+>upper case time-zone abbreviation
+         (only supported in <CODE
+CLASS="FUNCTION"
+>to_char</CODE
+>)</TD
 ></TR
 ><TR
 ><TD
@@ -957,7 +961,11 @@
 >tz</TT
 ></TD
 ><TD
->lower case time-zone name</TD
+>lower case time-zone abbreviation
+         (only supported in <CODE
+CLASS="FUNCTION"
+>to_char</CODE
+>)</TD
 ></TR
 ><TR
 ><TD
@@ -966,7 +974,11 @@
 >OF</TT
 ></TD
 ><TD
->time-zone offset</TD
+>time-zone offset from UTC
+         (only supported in <CODE
+CLASS="FUNCTION"
+>to_char</CODE
+>)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1510,7 +1522,7 @@
        complex example:
        <TT
 CLASS="LITERAL"
->to_timestamp('15:12:02.020.001230', 'HH:MI:SS.MS.US')</TT
+>to_timestamp('15:12:02.020.001230', 'HH24:MI:SS.MS.US')</TT
 >
        is 15 hours, 12 minutes, and 2 seconds + 20 milliseconds +
        1230 microseconds = 2.021230 seconds.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-geometry.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-geometry.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-geometry.html	2016-03-28 20:20:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-geometry.html	2017-08-07 21:32:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -285,7 +285,7 @@
 ><TD
 ><TT
 CLASS="LITERAL"
->'((1,-1),(-1,1))' # '((1,1),(-1,-1))'</TT
+>box '((1,-1),(-1,1))' # box '((1,1),(-2,-2))'</TT
 ></TD
 ></TR
 ><TR
@@ -299,7 +299,7 @@
 ><TD
 ><TT
 CLASS="LITERAL"
-># '((1,0),(0,1),(-1,0))'</TT
+># path '((1,0),(0,1),(-1,0))'</TT
 ></TD
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -390,7 +390,7 @@
 ></DT
 ><DT
 >9.22.6. <A
-HREF="functions-subquery.html#AEN20240"
+HREF="functions-subquery.html#AEN20422"
 >Single-row Comparison</A
 ></DT
 ></DL
@@ -404,7 +404,7 @@
 ><DL
 ><DT
 >9.23.1. <A
-HREF="functions-comparisons.html#AEN20283"
+HREF="functions-comparisons.html#AEN20465"
 ><TT
 CLASS="LITERAL"
 >IN</TT
@@ -412,7 +412,7 @@
 ></DT
 ><DT
 >9.23.2. <A
-HREF="functions-comparisons.html#AEN20299"
+HREF="functions-comparisons.html#AEN20481"
 ><TT
 CLASS="LITERAL"
 >NOT IN</TT
@@ -420,7 +420,7 @@
 ></DT
 ><DT
 >9.23.3. <A
-HREF="functions-comparisons.html#AEN20321"
+HREF="functions-comparisons.html#AEN20503"
 ><TT
 CLASS="LITERAL"
 >ANY</TT
@@ -431,7 +431,7 @@
 ></DT
 ><DT
 >9.23.4. <A
-HREF="functions-comparisons.html#AEN20344"
+HREF="functions-comparisons.html#AEN20526"
 ><TT
 CLASS="LITERAL"
 >ALL</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-info.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-info.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-info.html	2016-03-28 20:20:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-info.html	2017-08-07 21:32:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -195,6 +195,26 @@
 CLASS="LITERAL"
 ><CODE
 CLASS="FUNCTION"
+>current_role</CODE
+></TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>name</TT
+></TD
+><TD
+>equivalent to <CODE
+CLASS="FUNCTION"
+>current_user</CODE
+></TD
+></TR
+><TR
+><TD
+><TT
+CLASS="LITERAL"
+><CODE
+CLASS="FUNCTION"
 >current_schema</CODE
 >[()]</TT
 ></TD
@@ -511,14 +531,20 @@
 >     <CODE
 CLASS="FUNCTION"
 >current_catalog</CODE
->, <CODE
+>,
+     <CODE
+CLASS="FUNCTION"
+>current_role</CODE
+>,
+     <CODE
 CLASS="FUNCTION"
 >current_schema</CODE
 >,
      <CODE
 CLASS="FUNCTION"
 >current_user</CODE
->, <CODE
+>,
+     <CODE
 CLASS="FUNCTION"
 >session_user</CODE
 >,
@@ -571,6 +597,29 @@
 CLASS="QUOTE"
 >"effective user"</SPAN
 >.
+    <CODE
+CLASS="FUNCTION"
+>current_role</CODE
+> and <CODE
+CLASS="FUNCTION"
+>user</CODE
+> are
+    synonyms for <CODE
+CLASS="FUNCTION"
+>current_user</CODE
+>.  (The SQL standard draws
+    a distinction between <CODE
+CLASS="FUNCTION"
+>current_role</CODE
+>
+    and <CODE
+CLASS="FUNCTION"
+>current_user</CODE
+>, but <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+    does not, since it unifies users and roles into a single kind of entity.)
    </P
 ><P
 >    <CODE
@@ -1370,6 +1419,60 @@
 CLASS="LITERAL"
 ><CODE
 CLASS="FUNCTION"
+>has_type_privilege</CODE
+>(<TT
+CLASS="PARAMETER"
+>user</TT
+>,
+                                  <TT
+CLASS="PARAMETER"
+>type</TT
+>,
+                                  <TT
+CLASS="PARAMETER"
+>privilege</TT
+>)</TT
+>
+       </TD
+><TD
+><TT
+CLASS="TYPE"
+>boolean</TT
+></TD
+><TD
+>does user have privilege for type</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="LITERAL"
+><CODE
+CLASS="FUNCTION"
+>has_type_privilege</CODE
+>(<TT
+CLASS="PARAMETER"
+>type</TT
+>,
+                                  <TT
+CLASS="PARAMETER"
+>privilege</TT
+>)</TT
+>
+       </TD
+><TD
+><TT
+CLASS="TYPE"
+>boolean</TT
+></TD
+><TD
+>does current user have privilege for type</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="LITERAL"
+><CODE
+CLASS="FUNCTION"
 >pg_has_role</CODE
 >(<TT
 CLASS="PARAMETER"
@@ -1770,6 +1873,32 @@
 >.
    </P
 ><P
+>    <CODE
+CLASS="FUNCTION"
+>has_type_privilege</CODE
+> checks whether a user
+    can access a type in a particular way.
+    Its argument possibilities
+    are analogous to <CODE
+CLASS="FUNCTION"
+>has_table_privilege</CODE
+>.
+    When specifying a type by a text string rather than by OID,
+    the allowed input is the same as for the <TT
+CLASS="TYPE"
+>regtype</TT
+> data type
+    (see <A
+HREF="datatype-oid.html"
+>Section 8.18</A
+>).
+    The desired access privilege type must evaluate to
+    <TT
+CLASS="LITERAL"
+>USAGE</TT
+>.
+   </P
+><P
 >    <CODE
 CLASS="FUNCTION"
 >pg_has_role</CODE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-json.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-json.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-json.html	2016-03-28 20:20:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-json.html	2017-08-07 21:32:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-logical.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-logical.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-logical.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-logical.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -160,7 +160,7 @@
 ><P
 ></P
 ><A
-NAME="AEN8671"
+NAME="AEN8843"
 ></A
 ><TABLE
 BORDER="1"
@@ -280,7 +280,7 @@
 ><P
 ></P
 ><A
-NAME="AEN8716"
+NAME="AEN8888"
 ></A
 ><TABLE
 BORDER="1"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-matching.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-matching.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-matching.html	2016-03-28 20:20:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-matching.html	2017-08-07 21:32:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-math.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-math.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-math.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-math.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -611,7 +611,7 @@
 ><TD
 >(same as input)</TD
 ><TD
->smallest integer not less than argument</TD
+>nearest integer greater than or equal to argument</TD
 ><TD
 ><TT
 CLASS="LITERAL"
@@ -643,7 +643,7 @@
 ><TD
 >(same as input)</TD
 ><TD
->smallest integer not less than argument (alias for <CODE
+>nearest integer greater than or equal to argument (same as <CODE
 CLASS="FUNCTION"
 >ceil</CODE
 >)</TD
@@ -790,7 +790,7 @@
 ><TD
 >(same as input)</TD
 ><TD
->largest integer not greater than argument</TD
+>nearest integer less than or equal to argument</TD
 ><TD
 ><TT
 CLASS="LITERAL"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-net.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-net.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-net.html	2016-03-28 20:20:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-net.html	2017-08-07 21:32:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-range.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-range.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-range.html	2016-03-28 20:20:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-range.html	2017-08-07 21:32:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-sequence.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-sequence.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-sequence.html	2016-03-28 20:20:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-sequence.html	2017-08-07 21:32:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -455,22 +455,49 @@
 ><P
 ><B
 >Important: </B
->         To avoid blocking concurrent transactions that obtain numbers from the
-         same sequence, a <CODE
+>         To avoid blocking concurrent transactions that obtain numbers from
+         the same sequence, a <CODE
 CLASS="FUNCTION"
 >nextval</CODE
 > operation is never
          rolled back; that is, once a value has been fetched it is considered
-         used, even if the transaction that did the
-         <CODE
+         used and will not be returned again.  This is true even if the
+         surrounding transaction later aborts, or if the calling query ends
+         up not using the value.  For example an <TT
+CLASS="COMMAND"
+>INSERT</TT
+> with
+         an <TT
+CLASS="LITERAL"
+>ON CONFLICT</TT
+> clause will compute the to-be-inserted
+         tuple, including doing any required <CODE
 CLASS="FUNCTION"
 >nextval</CODE
-> later aborts.  This means that aborted
-         transactions might leave unused <SPAN
+>
+         calls, before detecting any conflict that would cause it to follow
+         the <TT
+CLASS="LITERAL"
+>ON CONFLICT</TT
+> rule instead.  Such cases will leave
+         unused <SPAN
 CLASS="QUOTE"
 >"holes"</SPAN
-> in the sequence
-         of assigned values.
+> in the sequence of assigned values.
+         Thus, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> sequence objects <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>cannot
+         be used to obtain <SPAN
+CLASS="QUOTE"
+>"gapless"</SPAN
+> sequences</I
+></SPAN
+>.
         </P
 ></BLOCKQUOTE
 ></DIV
@@ -516,11 +543,11 @@
 CLASS="FUNCTION"
 >currval</CODE
 >, except that instead
-        of taking the sequence name as an argument it fetches the
-        value of the last sequence used by <CODE
+        of taking the sequence name as an argument it refers to whichever
+        sequence <CODE
 CLASS="FUNCTION"
 >nextval</CODE
->
+> was most recently applied to
         in the current session. It is an error to call
         <CODE
 CLASS="FUNCTION"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-srf.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-srf.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-srf.html	2016-03-28 20:20:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-srf.html	2017-08-07 21:32:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-string.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-string.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-string.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-string.html	2017-08-07 21:32:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -674,12 +674,16 @@
 >text</TT
 ></TD
 ><TD
->        Remove the longest string containing only the
+>        Remove the longest string containing only characters from
         <TT
 CLASS="PARAMETER"
 >characters</TT
 > (a space by default) from the
-        start/end/both ends of the <TT
+        start, end, or both ends (<TT
+CLASS="LITERAL"
+>both</TT
+> is the default)
+        of <TT
 CLASS="PARAMETER"
 >string</TT
 >
@@ -687,7 +691,7 @@
 ><TD
 ><TT
 CLASS="LITERAL"
->trim(both 'x' from 'xTomxx')</TT
+>trim(both 'xyz' from 'yxTomxx')</TT
 ></TD
 ><TD
 ><TT
@@ -715,9 +719,9 @@
 >
         [<SPAN
 CLASS="OPTIONAL"
-><TT
+>, <TT
 CLASS="PARAMETER"
->, characters</TT
+>characters</TT
 ></SPAN
 >]
         )</CODE
@@ -730,7 +734,7 @@
 >text</TT
 ></TD
 ><TD
->        Non-standard version of <CODE
+>        Non-standard syntax for <CODE
 CLASS="FUNCTION"
 >trim()</CODE
 >
@@ -738,7 +742,7 @@
 ><TD
 ><TT
 CLASS="LITERAL"
->trim(both from 'xTomxx', 'x')</TT
+>trim(both from 'yxTomxx', 'xyz')</TT
 ></TD
 ><TD
 ><TT
@@ -913,7 +917,7 @@
 ><TD
 ><TT
 CLASS="LITERAL"
->btrim('xyxtrimyyx', 'xy')</TT
+>btrim('xyxtrimyyx', 'xyz')</TT
 ></TD
 ><TD
 ><TT
@@ -1702,12 +1706,12 @@
 ><TD
 ><TT
 CLASS="LITERAL"
->ltrim('zzzytrim', 'xyz')</TT
+>ltrim('zzzytest', 'xyz')</TT
 ></TD
 ><TD
 ><TT
 CLASS="LITERAL"
->trim</TT
+>test</TT
 ></TD
 ></TR
 ><TR
@@ -2550,12 +2554,12 @@
 ><TD
 ><TT
 CLASS="LITERAL"
->rtrim('trimxxxx', 'x')</TT
+>rtrim('testxxzx', 'xyz')</TT
 ></TD
 ><TD
 ><TT
 CLASS="LITERAL"
->trim</TT
+>test</TT
 ></TD
 ></TR
 ><TR
@@ -2965,8 +2969,8 @@
 ><TH
 >Conversion Name
         <A
-NAME="AEN10657"
-HREF="#FTN.AEN10657"
+NAME="AEN10832"
+HREF="#FTN.AEN10832"
 ><SPAN
 CLASS="footnote"
 >[a]</SPAN
@@ -5161,7 +5165,7 @@
 ><TD
 COLSPAN="3"
 >Notes:<BR><A
-NAME="FTN.AEN10657"
+NAME="FTN.AEN10832"
 >a. </A
 >          The conversion names follow a standard naming scheme: The
           official name of the source encoding with all
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-subquery.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-subquery.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-subquery.html	2016-03-28 20:20:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-subquery.html	2017-08-07 21:32:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -745,7 +745,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN20240"
+NAME="AEN20422"
 >9.22.6. Single-row Comparison</A
 ></H2
 ><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-textsearch.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-textsearch.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-textsearch.html	2016-03-28 20:20:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-textsearch.html	2017-08-07 21:32:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-trigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-trigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-trigger.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-trigger.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-window.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-window.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-window.html	2016-03-28 20:20:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-window.html	2017-08-07 21:32:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/functions-xml.html postgresql-9.5-9.5.8/doc/src/sgml/html/functions-xml.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/functions-xml.html	2016-03-28 20:20:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/functions-xml.html	2017-08-07 21:32:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Functions and Operators"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -144,7 +144,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN17024"
+NAME="AEN17202"
 >9.14.1.1. <TT
 CLASS="LITERAL"
 >xmlcomment</TT
@@ -200,7 +200,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN17040"
+NAME="AEN17218"
 >9.14.1.2. <TT
 CLASS="LITERAL"
 >xmlconcat</TT
@@ -278,7 +278,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN17058"
+NAME="AEN17236"
 >9.14.1.3. <TT
 CLASS="LITERAL"
 >xmlelement</TT
@@ -439,7 +439,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN17090"
+NAME="AEN17268"
 >9.14.1.4. <TT
 CLASS="LITERAL"
 >xmlforest</TT
@@ -530,7 +530,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN17111"
+NAME="AEN17289"
 >9.14.1.5. <TT
 CLASS="LITERAL"
 >xmlpi</TT
@@ -583,7 +583,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN17126"
+NAME="AEN17304"
 >9.14.1.6. <TT
 CLASS="LITERAL"
 >xmlroot</TT
@@ -738,7 +738,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN17164"
+NAME="AEN17342"
 >9.14.2.1. <TT
 CLASS="LITERAL"
 >IS DOCUMENT</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/fuzzystrmatch.html postgresql-9.5-9.5.8/doc/src/sgml/html/fuzzystrmatch.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/fuzzystrmatch.html	2016-03-28 20:21:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/fuzzystrmatch.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -146,7 +146,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169312"
+NAME="AEN174163"
 >F.14.1. Soundex</A
 ></H2
 ><P
@@ -211,7 +211,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169328"
+NAME="AEN174179"
 >F.14.2. Levenshtein</A
 ></H2
 ><P
@@ -297,7 +297,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169348"
+NAME="AEN174199"
 >F.14.3. Metaphone</A
 ></H2
 ><P
@@ -339,7 +339,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169360"
+NAME="AEN174211"
 >F.14.4. Double Metaphone</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/geqo-biblio.html postgresql-9.5-9.5.8/doc/src/sgml/html/geqo-biblio.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/geqo-biblio.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/geqo-biblio.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Genetic Query Optimizer"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/geqo.html postgresql-9.5-9.5.8/doc/src/sgml/html/geqo.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/geqo.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/geqo.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -123,7 +123,7 @@
 ><DL
 ><DT
 >57.3.1. <A
-HREF="geqo-pg-intro.html#AEN112131"
+HREF="geqo-pg-intro.html#AEN112500"
 >Generating Possible Plans with <ACRONYM
 CLASS="ACRONYM"
 >GEQO</ACRONYM
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/geqo-intro2.html postgresql-9.5-9.5.8/doc/src/sgml/html/geqo-intro2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/geqo-intro2.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/geqo-intro2.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Genetic Query Optimizer"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -182,7 +182,7 @@
 ><P
 ></P
 ><A
-NAME="AEN112092"
+NAME="AEN112461"
 ></A
 ><TABLE
 BORDER="0"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/geqo-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/geqo-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/geqo-intro.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/geqo-intro.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Genetic Query Optimizer"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/geqo-pg-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/geqo-pg-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/geqo-pg-intro.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/geqo-pg-intro.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Genetic Query Optimizer"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -211,7 +211,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN112131"
+NAME="AEN112500"
 >57.3.1. Generating Possible Plans with <ACRONYM
 CLASS="ACRONYM"
 >GEQO</ACRONYM
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gin-builtin-opclasses.html postgresql-9.5-9.5.8/doc/src/sgml/html/gin-builtin-opclasses.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gin-builtin-opclasses.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gin-builtin-opclasses.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GIN Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gin-examples.html postgresql-9.5-9.5.8/doc/src/sgml/html/gin-examples.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gin-examples.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gin-examples.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GIN Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gin-extensibility.html postgresql-9.5-9.5.8/doc/src/sgml/html/gin-extensibility.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gin-extensibility.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gin-extensibility.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GIN Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -357,7 +357,7 @@
        an array of <TT
 CLASS="LITERAL"
 >*nkeys</TT
-> Pointers and store its address at
+> pointers and store its address at
        <TT
 CLASS="LITERAL"
 >*extra_data</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gin.html postgresql-9.5-9.5.8/doc/src/sgml/html/gin.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gin.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gin.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gin-implementation.html postgresql-9.5-9.5.8/doc/src/sgml/html/gin-implementation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gin-implementation.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gin-implementation.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GIN Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gin-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/gin-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gin-intro.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gin-intro.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GIN Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gin-limit.html postgresql-9.5-9.5.8/doc/src/sgml/html/gin-limit.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gin-limit.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gin-limit.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GIN Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gin-tips.html postgresql-9.5-9.5.8/doc/src/sgml/html/gin-tips.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gin-tips.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gin-tips.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GIN Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gist-builtin-opclasses.html postgresql-9.5-9.5.8/doc/src/sgml/html/gist-builtin-opclasses.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gist-builtin-opclasses.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gist-builtin-opclasses.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GiST Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gist-examples.html postgresql-9.5-9.5.8/doc/src/sgml/html/gist-examples.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gist-examples.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gist-examples.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GiST Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gist-extensibility.html postgresql-9.5-9.5.8/doc/src/sgml/html/gist-extensibility.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gist-extensibility.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gist-extensibility.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GiST Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gist.html postgresql-9.5-9.5.8/doc/src/sgml/html/gist.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gist.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gist.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gist-implementation.html postgresql-9.5-9.5.8/doc/src/sgml/html/gist-implementation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gist-implementation.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gist-implementation.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GiST Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/gist-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/gist-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/gist-intro.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/gist-intro.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="GiST Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/git.html postgresql-9.5-9.5.8/doc/src/sgml/html/git.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/git.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/git.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Source Code Repository"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -157,12 +157,12 @@
      a firewall is blocking access to the Git protocol. Just change the URL
      prefix to <TT
 CLASS="LITERAL"
->http</TT
+>https</TT
 >, as in:
 
 </P><PRE
 CLASS="PROGRAMLISTING"
->git clone http://git.postgresql.org/git/postgresql.git</PRE
+>git clone https://git.postgresql.org/git/postgresql.git</PRE
 ><P>
 
      The HTTP protocol is less efficient than the Git protocol, so it will be
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/high-availability.html postgresql-9.5-9.5.8/doc/src/sgml/html/high-availability.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/high-availability.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/high-availability.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -298,12 +298,7 @@
  </P
 ><P
 >  The remainder of this section outlines various failover, replication,
-  and load balancing solutions.  A <A
-HREF="http://www.postgres-r.org/documentation/terms"
-TARGET="_top"
->glossary</A
-> is
-  also available.
+  and load balancing solutions.
  </P
 ></DIV
 ><DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/history.html postgresql-9.5-9.5.8/doc/src/sgml/html/history.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/history.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/history.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Preface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/hot-standby.html postgresql-9.5-9.5.8/doc/src/sgml/html/hot-standby.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/hot-standby.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/hot-standby.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="High Availability, Load Balancing, and Replication"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -472,7 +472,7 @@
 CLASS="QUOTE"
 >"read-only"</SPAN
 > transactions are allowed to
-    update sequences and to use <TT
+    use <TT
 CLASS="COMMAND"
 >LISTEN</TT
 >, <TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/hstore.html postgresql-9.5-9.5.8/doc/src/sgml/html/hstore.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/hstore.html	2016-03-28 20:21:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/hstore.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -113,7 +113,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169381"
+NAME="AEN174232"
 >F.15.1. <TT
 CLASS="TYPE"
 >hstore</TT
@@ -254,7 +254,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169412"
+NAME="AEN174263"
 >F.15.2. <TT
 CLASS="TYPE"
 >hstore</TT
@@ -267,11 +267,11 @@
 > module are
    shown in <A
 HREF="hstore.html#HSTORE-OP-TABLE"
->Table F-6</A
+>Table F-8</A
 >, the functions
    in <A
 HREF="hstore.html#HSTORE-FUNC-TABLE"
->Table F-7</A
+>Table F-9</A
 >.
   </P
 ><DIV
@@ -281,7 +281,7 @@
 ></A
 ><P
 ><B
->Table F-6. <TT
+>Table F-8. <TT
 CLASS="TYPE"
 >hstore</TT
 > Operators</B
@@ -707,7 +707,7 @@
 ></A
 ><P
 ><B
->Table F-7. <TT
+>Table F-9. <TT
 CLASS="TYPE"
 >hstore</TT
 > Functions</B
@@ -1399,7 +1399,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169884"
+NAME="AEN174735"
 >F.15.3. Indexes</A
 ></H2
 ><P
@@ -1479,7 +1479,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169906"
+NAME="AEN174757"
 >F.15.4. Examples</A
 ></H2
 ><P
@@ -1559,7 +1559,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169923"
+NAME="AEN174774"
 >F.15.5. Statistics</A
 ></H2
 ><P
@@ -1613,7 +1613,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169933"
+NAME="AEN174784"
 >F.15.6. Compatibility</A
 ></H2
 ><P
@@ -1657,7 +1657,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169943"
+NAME="AEN174794"
 >F.15.7. Transforms</A
 ></H2
 ><P
@@ -1707,7 +1707,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169955"
+NAME="AEN174806"
 >F.15.8. Authors</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexam.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexam.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexam.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexam.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/index-catalog.html postgresql-9.5-9.5.8/doc/src/sgml/html/index-catalog.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/index-catalog.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/index-catalog.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Index Access Method Interface Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/index-cost-estimation.html postgresql-9.5-9.5.8/doc/src/sgml/html/index-cost-estimation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/index-cost-estimation.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/index-cost-estimation.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Index Access Method Interface Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-bitmap-scans.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-bitmap-scans.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-bitmap-scans.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-bitmap-scans.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-collations.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-collations.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-collations.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-collations.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-examine.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-examine.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-examine.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-examine.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-expressional.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-expressional.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-expressional.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-expressional.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-intro.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-intro.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-multicolumn.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-multicolumn.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-multicolumn.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-multicolumn.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -140,7 +140,8 @@
 ><P>
   </P
 ><P
->   Currently, only the B-tree, GiST and GIN index types support multicolumn
+>   Currently, only the B-tree, GiST, GIN, and BRIN
+   index types support multicolumn
    indexes.  Up to 32 columns can be specified.  (This limit can be
    altered when building <SPAN
 CLASS="PRODUCTNAME"
@@ -215,6 +216,17 @@
    the query conditions use.
   </P
 ><P
+>   A multicolumn BRIN index can be used with query conditions that
+   involve any subset of the index's columns. Like GIN and unlike B-tree or
+   GiST, index search effectiveness is the same regardless of which index
+   column(s) the query conditions use. The only reason to have multiple BRIN
+   indexes instead of one multicolumn BRIN index on a single table is to have
+   a different <TT
+CLASS="LITERAL"
+>pages_per_range</TT
+> storage parameter.
+  </P
+><P
 >   Of course, each column must be used with operators appropriate to the index
    type; clauses that involve other operators will not be considered.
   </P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-opclass.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-opclass.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-opclass.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-opclass.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-ordering.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-ordering.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-ordering.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-ordering.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-partial.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-partial.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-partial.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-partial.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-types.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-types.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-types.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-types.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-unique.html postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-unique.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/indexes-unique.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/indexes-unique.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/index-functions.html postgresql-9.5-9.5.8/doc/src/sgml/html/index-functions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/index-functions.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/index-functions.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Index Access Method Interface Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/index.html postgresql-9.5-9.5.8/doc/src/sgml/html/index.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/index.html	2016-03-28 20:21:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/index.html	2017-08-07 21:33:18.000000000 +0000
@@ -2,7 +2,7 @@
 <HTML
 ><HEAD
 ><TITLE
->PostgreSQL 9.5.2 Documentation</TITLE
+>PostgreSQL 9.5.8 Documentation</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
@@ -17,7 +17,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="BOOK"
 ><DIV
@@ -31,7 +31,7 @@
 CLASS="TITLE"
 ><A
 NAME="POSTGRES"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></H1
 ><H3
 CLASS="CORPAUTHOR"
@@ -41,7 +41,7 @@
 ><A
 HREF="LEGALNOTICE.html"
 >Copyright</A
-> &copy; 1996-2016 The PostgreSQL Global Development Group</P
+> &copy; 1996-2017 The PostgreSQL Global Development Group</P
 ><HR></DIV
 ><DIV
 CLASS="TOC"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/index-locking.html postgresql-9.5-9.5.8/doc/src/sgml/html/index-locking.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/index-locking.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/index-locking.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Index Access Method Interface Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/index-scanning.html postgresql-9.5-9.5.8/doc/src/sgml/html/index-scanning.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/index-scanning.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/index-scanning.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Index Access Method Interface Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/index-unique-checks.html postgresql-9.5-9.5.8/doc/src/sgml/html/index-unique-checks.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/index-unique-checks.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/index-unique-checks.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Index Access Method Interface Definition"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/information-schema.html postgresql-9.5-9.5.8/doc/src/sgml/html/information-schema.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/information-schema.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/information-schema.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Client Interfaces"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-administrable-role-authorizations.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-administrable-role-authorizations.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-administrable-role-authorizations.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-administrable-role-authorizations.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN50954"
+NAME="AEN51232"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-applicable-roles.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-applicable-roles.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-applicable-roles.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-applicable-roles.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -113,7 +113,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN50993"
+NAME="AEN51271"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-attributes.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-attributes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-attributes.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-attributes.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -112,7 +112,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51028"
+NAME="AEN51306"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-character-sets.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-character-sets.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-character-sets.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-character-sets.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51285"
+NAME="AEN51563"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-check-constraint-routine-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-check-constraint-routine-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-check-constraint-routine-usage.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-check-constraint-routine-usage.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51352"
+NAME="AEN51630"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-check-constraints.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-check-constraints.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-check-constraints.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-check-constraints.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51405"
+NAME="AEN51683"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-collation-character-set-applicab.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-collation-character-set-applicab.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-collation-character-set-applicab.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-collation-character-set-applicab.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51486"
+NAME="AEN51764"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-collations.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-collations.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-collations.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-collations.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,7 +108,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51444"
+NAME="AEN51722"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-column-domain-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-column-domain-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-column-domain-usage.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-column-domain-usage.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51537"
+NAME="AEN51815"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-column-options.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-column-options.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-column-options.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-column-options.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51594"
+NAME="AEN51872"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-column-privileges.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-column-privileges.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-column-privileges.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-column-privileges.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -129,7 +129,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51650"
+NAME="AEN51928"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-columns.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-columns.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-columns.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-columns.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51779"
+NAME="AEN52057"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-column-udt-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-column-udt-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-column-udt-usage.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-column-udt-usage.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN51721"
+NAME="AEN51999"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-constraint-column-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-constraint-column-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-constraint-column-usage.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-constraint-column-usage.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52112"
+NAME="AEN52390"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-constraint-table-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-constraint-table-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-constraint-table-usage.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-constraint-table-usage.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52170"
+NAME="AEN52448"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-data-type-privileges.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-data-type-privileges.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-data-type-privileges.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-data-type-privileges.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52221"
+NAME="AEN52499"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-datatypes.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-datatypes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-datatypes.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-datatypes.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-domain-constraints.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-domain-constraints.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-domain-constraints.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-domain-constraints.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52269"
+NAME="AEN52547"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-domains.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-domains.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-domains.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-domains.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52388"
+NAME="AEN52666"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-domain-udt-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-domain-udt-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-domain-udt-usage.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-domain-udt-usage.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52337"
+NAME="AEN52615"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-element-types.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-element-types.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-element-types.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-element-types.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -132,7 +132,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52589"
+NAME="AEN52867"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-enabled-roles.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-enabled-roles.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-enabled-roles.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-enabled-roles.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52809"
+NAME="AEN53087"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-data-wrapper-options.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-data-wrapper-options.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-data-wrapper-options.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-data-wrapper-options.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52830"
+NAME="AEN53108"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-data-wrappers.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-data-wrappers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-data-wrappers.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-data-wrappers.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52869"
+NAME="AEN53147"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-server-options.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-server-options.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-server-options.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-server-options.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52914"
+NAME="AEN53192"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-servers.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-servers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-servers.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-servers.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN52953"
+NAME="AEN53231"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-table-options.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-table-options.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-table-options.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-table-options.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53010"
+NAME="AEN53288"
 ></A
 ><P
 ><B
@@ -177,34 +177,6 @@
 ></TR
 ><TR
 ><TD
-><TT
-CLASS="LITERAL"
->foreign_server_catalog</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->sql_identifier</TT
-></TD
-><TD
->Name of the database that the foreign server is defined in (always the current database)</TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->foreign_server_name</TT
-></TD
-><TD
-><TT
-CLASS="TYPE"
->sql_identifier</TT
-></TD
-><TD
->Name of the foreign server</TD
-></TR
-><TR
-><TD
 ><TT
 CLASS="LITERAL"
 >option_name</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-tables.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-tables.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-foreign-tables.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-foreign-tables.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53067"
+NAME="AEN53333"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-information-schema-catalog-name.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-information-schema-catalog-name.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-information-schema-catalog-name.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-information-schema-catalog-name.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN50933"
+NAME="AEN51211"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-key-column-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-key-column-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-key-column-usage.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-key-column-usage.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53112"
+NAME="AEN53378"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-parameters.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-parameters.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-parameters.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-parameters.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53181"
+NAME="AEN53447"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-referential-constraints.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-referential-constraints.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-referential-constraints.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-referential-constraints.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53418"
+NAME="AEN53684"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-role-column-grants.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-role-column-grants.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-role-column-grants.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-role-column-grants.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53503"
+NAME="AEN53769"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-role-routine-grants.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-role-routine-grants.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-role-routine-grants.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-role-routine-grants.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53575"
+NAME="AEN53841"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-role-table-grants.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-role-table-grants.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-role-table-grants.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-role-table-grants.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53658"
+NAME="AEN53924"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-role-udt-grants.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-role-udt-grants.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-role-udt-grants.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-role-udt-grants.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53740"
+NAME="AEN54006"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-role-usage-grants.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-role-usage-grants.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-role-usage-grants.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-role-usage-grants.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -126,7 +126,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53804"
+NAME="AEN54070"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-routine-privileges.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-routine-privileges.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-routine-privileges.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-routine-privileges.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53875"
+NAME="AEN54141"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-routines.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-routines.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-routines.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-routines.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN53955"
+NAME="AEN54221"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-schema.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-schema.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-schema.html	2016-03-28 20:20:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-schema.html	2017-08-07 21:32:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-schemata.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-schemata.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-schemata.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-schemata.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN54549"
+NAME="AEN54815"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sequences.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sequences.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sequences.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sequences.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN54610"
+NAME="AEN54876"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-features.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-features.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-features.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-features.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN54708"
+NAME="AEN54974"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-implementation-info.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-implementation-info.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-implementation-info.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-implementation-info.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN54769"
+NAME="AEN55035"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-languages.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-languages.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-languages.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-languages.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -121,7 +121,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN54819"
+NAME="AEN55085"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-packages.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-packages.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-packages.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-packages.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN54885"
+NAME="AEN55151"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-parts.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-parts.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-parts.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-parts.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -112,7 +112,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN54935"
+NAME="AEN55201"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-sizing.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-sizing.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-sizing.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-sizing.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN54985"
+NAME="AEN55251"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-sizing-profiles.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-sizing-profiles.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-sql-sizing-profiles.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-sql-sizing-profiles.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -116,7 +116,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55026"
+NAME="AEN55292"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-table-constraints.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-table-constraints.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-table-constraints.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-table-constraints.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -112,7 +112,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55072"
+NAME="AEN55338"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-table-privileges.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-table-privileges.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-table-privileges.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-table-privileges.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55149"
+NAME="AEN55415"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-tables.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-tables.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-tables.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-tables.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55226"
+NAME="AEN55492"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-transforms.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-transforms.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-transforms.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-transforms.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -116,7 +116,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55325"
+NAME="AEN55591"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-triggered-update-columns.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-triggered-update-columns.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-triggered-update-columns.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-triggered-update-columns.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55395"
+NAME="AEN55661"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-triggers.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-triggers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-triggers.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-triggers.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -112,7 +112,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55453"
+NAME="AEN55719"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-udt-privileges.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-udt-privileges.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-udt-privileges.html	2016-03-28 20:20:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-udt-privileges.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,7 +108,7 @@
 >USAGE</TT
 > privileges granted on user-defined types to a
    currently enabled role or by a currently enabled role.  There is one row for
-   each combination of column, grantor, and grantee.  This view shows only
+   each combination of type, grantor, and grantee.  This view shows only
    composite types (see under <A
 HREF="infoschema-user-defined-types.html"
 >Section 34.58</A
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55612"
+NAME="AEN55878"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-usage-privileges.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-usage-privileges.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-usage-privileges.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-usage-privileges.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -149,7 +149,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55682"
+NAME="AEN55948"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-user-defined-types.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-user-defined-types.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-user-defined-types.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-user-defined-types.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55759"
+NAME="AEN56025"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-user-mapping-options.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-user-mapping-options.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-user-mapping-options.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-user-mapping-options.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN55974"
+NAME="AEN56240"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-user-mappings.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-user-mappings.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-user-mappings.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-user-mappings.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN56021"
+NAME="AEN56287"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-view-column-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-view-column-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-view-column-usage.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-view-column-usage.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -126,7 +126,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN56058"
+NAME="AEN56324"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-view-routine-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-view-routine-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-view-routine-usage.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-view-routine-usage.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN56116"
+NAME="AEN56382"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-views.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-views.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-views.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-views.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN56223"
+NAME="AEN56489"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-view-table-usage.html postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-view-table-usage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/infoschema-view-table-usage.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/infoschema-view-table-usage.html	2017-08-07 21:32:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Information Schema"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -125,7 +125,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN56172"
+NAME="AEN56438"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/installation.html postgresql-9.5-9.5.8/doc/src/sgml/html/installation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/installation.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/installation.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -130,12 +130,12 @@
 ><DL
 ><DT
 >15.5.1. <A
-HREF="install-post.html#AEN28420"
+HREF="install-post.html#AEN28684"
 >Shared Libraries</A
 ></DT
 ><DT
 >15.5.2. <A
-HREF="install-post.html#AEN28471"
+HREF="install-post.html#AEN28735"
 >Environment Variables</A
 ></DT
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/installation-platform-notes.html postgresql-9.5-9.5.8/doc/src/sgml/html/installation-platform-notes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/installation-platform-notes.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/installation-platform-notes.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="  Installation from Source Code"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -205,7 +205,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28559"
+NAME="AEN28823"
 >15.7.1.1. GCC Issues</A
 ></H3
 ><P
@@ -226,7 +226,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28563"
+NAME="AEN28827"
 >15.7.1.2. Unix-Domain Sockets Broken</A
 ></H3
 ><P
@@ -270,7 +270,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28572"
+NAME="AEN28836"
 >15.7.1.3. Internet Address Issues</A
 ></H3
 ><P
@@ -385,7 +385,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28595"
+NAME="AEN28859"
 >15.7.1.4. Memory Management</A
 ></H3
 ><P
@@ -546,13 +546,13 @@
     </P
 ><H3
 ><A
-NAME="AEN28628"
+NAME="AEN28892"
 >References and Resources</A
 ></H3
 ><DIV
 CLASS="BIBLIOENTRY"
 ><A
-NAME="AEN28630"
+NAME="AEN28894"
 ></A
 ><P
 >"<A
@@ -570,7 +570,7 @@
 ><DIV
 CLASS="BIBLIOENTRY"
 ><A
-NAME="AEN28636"
+NAME="AEN28900"
 ></A
 ><P
 >"<A
@@ -588,7 +588,7 @@
 ><DIV
 CLASS="BIBLIOENTRY"
 ><A
-NAME="AEN28642"
+NAME="AEN28906"
 ></A
 ><P
 >"<A
@@ -606,7 +606,7 @@
 ><DIV
 CLASS="BIBLIOENTRY"
 ><A
-NAME="AEN28648"
+NAME="AEN28912"
 ></A
 ><P
 >"<A
@@ -624,7 +624,7 @@
 ><DIV
 CLASS="BIBLIOENTRY"
 ><A
-NAME="AEN28654"
+NAME="AEN28918"
 ></A
 ><P
 >"<A
@@ -642,7 +642,7 @@
 ><DIV
 CLASS="BIBLIOENTRY"
 ><A
-NAME="AEN28660"
+NAME="AEN28924"
 ></A
 ><P
 ><I
@@ -1059,7 +1059,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28769"
+NAME="AEN29033"
 >15.7.5.1. Skunkware</A
 ></H3
 ><P
@@ -1092,7 +1092,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28775"
+NAME="AEN29039"
 >15.7.5.2. GNU Make</A
 ></H3
 ><P
@@ -1117,7 +1117,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28781"
+NAME="AEN29045"
 >15.7.5.3. Readline</A
 ></H3
 ><P
@@ -1160,7 +1160,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28791"
+NAME="AEN29055"
 >15.7.5.4. Using the UDK on OpenServer</A
 ></H3
 ><P
@@ -1183,7 +1183,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28796"
+NAME="AEN29060"
 >15.7.5.5. Reading the PostgreSQL Man Pages</A
 ></H3
 ><P
@@ -1219,7 +1219,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28804"
+NAME="AEN29068"
 >15.7.5.6. C99 Issues with the 7.1.1b Feature Supplement</A
 ></H3
 ><P
@@ -1250,7 +1250,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28811"
+NAME="AEN29075"
 >15.7.5.7. Threading on UnixWare</A
 ></H3
 ><P
@@ -1304,7 +1304,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28826"
+NAME="AEN29090"
 >15.7.6.1. Required Tools</A
 ></H3
 ><P
@@ -1351,7 +1351,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28835"
+NAME="AEN29099"
 >15.7.6.2. Problems with OpenSSL</A
 ></H3
 ><P
@@ -1408,7 +1408,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28853"
+NAME="AEN29117"
 >15.7.6.3. configure Complains About a Failed Test Program</A
 ></H3
 ><P
@@ -1447,7 +1447,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28863"
+NAME="AEN29127"
 >15.7.6.4. 64-bit Build Sometimes Crashes</A
 ></H3
 ><P
@@ -1492,7 +1492,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28873"
+NAME="AEN29137"
 >15.7.6.5. Compiling for Optimal Performance</A
 ></H3
 ><P
@@ -1528,7 +1528,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN28880"
+NAME="AEN29144"
 >15.7.6.6. Using DTrace for Tracing PostgreSQL</A
 ></H3
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/install-getsource.html postgresql-9.5-9.5.8/doc/src/sgml/html/install-getsource.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/install-getsource.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/install-getsource.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="  Installation from Source Code"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -99,31 +99,31 @@
 >   The <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
-> 9.5.2 sources can be obtained from the
+> 9.5.8 sources can be obtained from the
    download section of our
    website: <A
-HREF="http://www.postgresql.org/download/"
+HREF="https://www.postgresql.org/download/"
 TARGET="_top"
->http://www.postgresql.org/download/</A
+>https://www.postgresql.org/download/</A
 >.  You
    should get a file named <TT
 CLASS="FILENAME"
->postgresql-9.5.2.tar.gz</TT
+>postgresql-9.5.8.tar.gz</TT
 >
    or <TT
 CLASS="FILENAME"
->postgresql-9.5.2.tar.bz2</TT
+>postgresql-9.5.8.tar.bz2</TT
 >. After
    you have obtained the file, unpack it:
 </P><PRE
 CLASS="SCREEN"
 ><KBD
 CLASS="USERINPUT"
->gunzip postgresql-9.5.2.tar.gz</KBD
+>gunzip postgresql-9.5.8.tar.gz</KBD
 >
 <KBD
 CLASS="USERINPUT"
->tar xf postgresql-9.5.2.tar</KBD
+>tar xf postgresql-9.5.8.tar</KBD
 ></PRE
 ><P>
    (Use <TT
@@ -140,7 +140,7 @@
    This will create a directory
    <TT
 CLASS="FILENAME"
->postgresql-9.5.2</TT
+>postgresql-9.5.8</TT
 > under the current directory
    with the <SPAN
 CLASS="PRODUCTNAME"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/install-post.html postgresql-9.5-9.5.8/doc/src/sgml/html/install-post.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/install-post.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/install-post.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="  Installation from Source Code"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -100,7 +100,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN28420"
+NAME="AEN28684"
 >15.5.1. Shared Libraries</A
 ></H2
 ><P
@@ -292,7 +292,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN28471"
+NAME="AEN28735"
 >15.5.2. Environment Variables</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/install-procedure.html postgresql-9.5-9.5.8/doc/src/sgml/html/install-procedure.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/install-procedure.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/install-procedure.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="  Installation from Source Code"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -1922,7 +1922,7 @@
 ></DT
 ><DD
 ><P
->         Full path to the Perl interpreter.  This will be used to
+>         Full path name of the Perl interpreter.  This will be used to
          determine the dependencies for building PL/Perl.
         </P
 ></DD
@@ -1933,7 +1933,7 @@
 ></DT
 ><DD
 ><P
->         Full path to the Python interpreter.  This will be used to
+>         Full path name of the Python interpreter.  This will be used to
          determine the dependencies for building PL/Python.  Also,
          whether Python 2 or 3 is specified here (or otherwise
          implicitly chosen) determines which variant of the PL/Python
@@ -1953,7 +1953,7 @@
 ></DT
 ><DD
 ><P
->         Full path to the Tcl interpreter.  This will be used to
+>         Full path name of the Tcl interpreter.  This will be used to
          determine the dependencies for building PL/Tcl, and it will
          be substituted into Tcl scripts.
         </P
@@ -1976,6 +1976,72 @@
 ></DIV
 ><P>
     </P
+><P
+>     Sometimes it is useful to add compiler flags after-the-fact to the set
+     that were chosen by <TT
+CLASS="FILENAME"
+>configure</TT
+>.  An important example is
+     that <SPAN
+CLASS="APPLICATION"
+>gcc</SPAN
+>'s <TT
+CLASS="OPTION"
+>-Werror</TT
+> option cannot be included
+     in the <TT
+CLASS="ENVAR"
+>CFLAGS</TT
+> passed to <TT
+CLASS="FILENAME"
+>configure</TT
+>, because
+     it will break many of <TT
+CLASS="FILENAME"
+>configure</TT
+>'s built-in tests.  To add
+     such flags, include them in the <TT
+CLASS="ENVAR"
+>COPT</TT
+> environment variable
+     while running <TT
+CLASS="FILENAME"
+>make</TT
+>.  The contents of <TT
+CLASS="ENVAR"
+>COPT</TT
+>
+     are added to both the <TT
+CLASS="ENVAR"
+>CFLAGS</TT
+> and <TT
+CLASS="ENVAR"
+>LDFLAGS</TT
+>
+     options set up by <TT
+CLASS="FILENAME"
+>configure</TT
+>.  For example, you could do
+</P><PRE
+CLASS="SCREEN"
+><KBD
+CLASS="USERINPUT"
+>make COPT='-Werror'</KBD
+></PRE
+><P>
+     or
+</P><PRE
+CLASS="SCREEN"
+><KBD
+CLASS="USERINPUT"
+>export COPT='-Werror'</KBD
+>
+<KBD
+CLASS="USERINPUT"
+>make</KBD
+></PRE
+><P>
+    </P
 ><DIV
 CLASS="NOTE"
 ><BLOCKQUOTE
@@ -2021,6 +2087,28 @@
 >make PROFILE=-O0 file.o</TT
 >.
      </P
+><P
+>      The <TT
+CLASS="ENVAR"
+>COPT</TT
+> and <TT
+CLASS="ENVAR"
+>PROFILE</TT
+> environment variables are
+      actually handled identically by the <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+      makefiles.  Which to use is a matter of preference, but a common habit
+      among developers is to use <TT
+CLASS="ENVAR"
+>PROFILE</TT
+> for one-time flag
+      adjustments, while <TT
+CLASS="ENVAR"
+>COPT</TT
+> might be kept set all the time.
+     </P
 ></BLOCKQUOTE
 ></DIV
 ></LI
@@ -2053,7 +2141,7 @@
     hardware. The last line displayed should be:
 </P><PRE
 CLASS="SCREEN"
->All of PostgreSQL is successfully made. Ready to install.</PRE
+>All of PostgreSQL successfully made. Ready to install.</PRE
 ><P>
    </P
 ><P
@@ -2073,7 +2161,7 @@
    The last line displayed should be:
 </P><PRE
 CLASS="SCREEN"
->PostgreSQL, contrib and HTML documentation successfully made. Ready to install.</PRE
+>PostgreSQL, contrib, and documentation successfully made. Ready to install.</PRE
 ><P>
    </P
 ></LI
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/install-requirements.html postgresql-9.5-9.5.8/doc/src/sgml/html/install-requirements.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/install-requirements.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/install-requirements.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="  Installation from Source Code"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -337,6 +337,10 @@
 CLASS="FILENAME"
 >libperl</TT
 > library and the header files.
+      The minimum required version is <SPAN
+CLASS="PRODUCTNAME"
+>Perl</SPAN
+> 5.8.3.
       Since <SPAN
 CLASS="APPLICATION"
 >PL/Perl</SPAN
@@ -638,7 +642,7 @@
       <SPAN
 CLASS="APPLICATION"
 >Perl</SPAN
-> 5.8 or later is needed to build from a Git checkout,
+> 5.8.3 or later is needed to build from a Git checkout,
       or if you changed the input files for any of the build steps that
       use Perl scripts.  If building on Windows you will need
       <SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/install-short.html postgresql-9.5-9.5.8/doc/src/sgml/html/install-short.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/install-short.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/install-short.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="  Installation from Source Code"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/install-windows-full.html postgresql-9.5-9.5.8/doc/src/sgml/html/install-windows-full.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/install-windows-full.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/install-windows-full.html	2017-08-07 21:32:07.000000000 +0000
@@ -10,7 +10,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Installation from Source Code on Windows"
@@ -29,7 +29,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -47,7 +47,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -130,7 +130,7 @@
 > environment set up, the easiest
   ways are to use the compilers from <SPAN
 CLASS="PRODUCTNAME"
->Visual Studio Express 2013
+>Visual Studio Express 2015
   for Windows Desktop</SPAN
 > or those in the <SPAN
 CLASS="PRODUCTNAME"
@@ -139,17 +139,18 @@
 >, which are both free downloads from Microsoft.
  </P
 ><P
->  PostgreSQL is known to support compilation using the compilers shipped with
+>  Both 32-bit and 64-bit builds are possible with the Microsoft Compiler suite.
+  32-bit PostgreSQL builds are possible with
   <SPAN
 CLASS="PRODUCTNAME"
 >Visual Studio 2005</SPAN
 > to
   <SPAN
 CLASS="PRODUCTNAME"
->Visual Studio 2013</SPAN
+>Visual Studio 2015</SPAN
 > (including Express editions),
   as well as standalone Windows SDK releases 6.0 to 7.1.
-  64-bit PostgreSQL builds are only supported with
+  64-bit PostgreSQL builds are supported with
   <SPAN
 CLASS="PRODUCTNAME"
 >Microsoft Windows SDK</SPAN
@@ -157,7 +158,34 @@
   <SPAN
 CLASS="PRODUCTNAME"
 >Visual Studio 2008</SPAN
-> and above.
+> and above. Compilation
+  is supported down to <SPAN
+CLASS="PRODUCTNAME"
+>Windows XP</SPAN
+> and
+  <SPAN
+CLASS="PRODUCTNAME"
+>Windows Server 2003</SPAN
+> when building with
+  <SPAN
+CLASS="PRODUCTNAME"
+>Visual Studio 2005</SPAN
+> to
+  <SPAN
+CLASS="PRODUCTNAME"
+>Visual Studio 2013</SPAN
+>. Building with
+  <SPAN
+CLASS="PRODUCTNAME"
+>Visual Studio 2015</SPAN
+> is supported down to
+  <SPAN
+CLASS="PRODUCTNAME"
+>Windows Vista</SPAN
+> and <SPAN
+CLASS="PRODUCTNAME"
+>Windows Server 2008</SPAN
+>.
  </P
 ><P
 >  The tools for building using <SPAN
@@ -272,7 +300,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN28970"
+NAME="AEN29241"
 >16.1.1. Requirements</A
 ></H2
 ><P
@@ -307,9 +335,9 @@
       is recommended that you upgrade to the latest version (currently
       version 7.1), available for download from
       <A
-HREF="http://www.microsoft.com/downloads/"
+HREF="https://www.microsoft.com/download"
 TARGET="_top"
->http://www.microsoft.com/downloads/</A
+>https://www.microsoft.com/download</A
 >.
      </P
 ><P
@@ -348,7 +376,8 @@
 HREF="http://www.activestate.com"
 TARGET="_top"
 >http://www.activestate.com</A
-> (Note: version 5.8 or later is required,
+>
+      (Note: version 5.8.3 or later is required,
       the free Standard Distribution is sufficient).
      </P
 ></DD
@@ -432,19 +461,7 @@
       <SPAN
 CLASS="PRODUCTNAME"
 >MinGW</SPAN
-> compiler suite. You can also get
-      <SPAN
-CLASS="PRODUCTNAME"
->msys</SPAN
-> as part of
-      <SPAN
-CLASS="PRODUCTNAME"
->msysGit</SPAN
-> from <A
-HREF="http://git-scm.com/"
-TARGET="_top"
->http://git-scm.com/</A
->.
+> compiler suite.
      </P
 ><P
 >      You will need to add the directory containing
@@ -464,12 +481,7 @@
 CLASS="FILENAME"
 >\msys\1.0\bin</TT
 > subdirectory of your MinGW
-      installation directory. For msysGit, it's the <TT
-CLASS="FILENAME"
->bin</TT
->
-      directory in your Git install directory. Do not add the MinGW compiler
-      tools themselves to PATH.
+      installation directory.
      </P
 ><DIV
 CLASS="NOTE"
@@ -670,7 +682,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN29089"
+NAME="AEN29356"
 >16.1.2. Special Considerations for 64-bit Windows</A
 ></H2
 ><P
@@ -709,7 +721,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN29097"
+NAME="AEN29364"
 >16.1.3. Building</A
 ></H2
 ><P
@@ -775,7 +787,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN29113"
+NAME="AEN29380"
 >16.1.4. Cleaning and Installing</A
 ></H2
 ><P
@@ -833,7 +845,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN29127"
+NAME="AEN29394"
 >16.1.5. Running the Regression Tests</A
 ></H2
 ><P
@@ -961,7 +973,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN29158"
+NAME="AEN29425"
 >16.1.6. Building the Documentation</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/install-windows.html postgresql-9.5-9.5.8/doc/src/sgml/html/install-windows.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/install-windows.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/install-windows.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -27,7 +27,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -45,7 +45,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -122,32 +122,32 @@
 ><DL
 ><DT
 >16.1.1. <A
-HREF="install-windows-full.html#AEN28970"
+HREF="install-windows-full.html#AEN29241"
 >Requirements</A
 ></DT
 ><DT
 >16.1.2. <A
-HREF="install-windows-full.html#AEN29089"
+HREF="install-windows-full.html#AEN29356"
 >Special Considerations for 64-bit Windows</A
 ></DT
 ><DT
 >16.1.3. <A
-HREF="install-windows-full.html#AEN29097"
+HREF="install-windows-full.html#AEN29364"
 >Building</A
 ></DT
 ><DT
 >16.1.4. <A
-HREF="install-windows-full.html#AEN29113"
+HREF="install-windows-full.html#AEN29380"
 >Cleaning and Installing</A
 ></DT
 ><DT
 >16.1.5. <A
-HREF="install-windows-full.html#AEN29127"
+HREF="install-windows-full.html#AEN29394"
 >Running the Regression Tests</A
 ></DT
 ><DT
 >16.1.6. <A
-HREF="install-windows-full.html#AEN29158"
+HREF="install-windows-full.html#AEN29425"
 >Building the Documentation</A
 ></DT
 ></DL
@@ -191,13 +191,13 @@
 >. The simplest way to build with
   Microsoft tools is to install <SPAN
 CLASS="PRODUCTNAME"
->Visual Studio Express 2013
+>Visual Studio Express 2015
   for Windows Desktop</SPAN
 > and use the included
   compiler. It is also possible to build with the full
   <SPAN
 CLASS="PRODUCTNAME"
->Microsoft Visual C++ 2005 to 2013</SPAN
+>Microsoft Visual C++ 2005 to 2015</SPAN
 >.
   In some cases that requires the installation of the
   <SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/install-windows-libpq.html postgresql-9.5-9.5.8/doc/src/sgml/html/install-windows-libpq.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/install-windows-libpq.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/install-windows-libpq.html	2017-08-07 21:32:07.000000000 +0000
@@ -11,7 +11,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Installation from Source Code on Windows"
@@ -29,7 +29,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -47,7 +47,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -211,7 +211,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN29220"
+NAME="AEN29487"
 >16.2.1. Generated Files</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/intagg.html postgresql-9.5-9.5.8/doc/src/sgml/html/intagg.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/intagg.html	2016-03-28 20:21:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/intagg.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -113,7 +113,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169970"
+NAME="AEN174821"
 >F.16.1. Functions</A
 ></H2
 ><P
@@ -153,7 +153,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN169985"
+NAME="AEN174836"
 >F.16.2. Sample Uses</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/intarray.html postgresql-9.5-9.5.8/doc/src/sgml/html/intarray.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/intarray.html	2016-03-28 20:21:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/intarray.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -117,7 +117,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170013"
+NAME="AEN174864"
 >F.17.1. <TT
 CLASS="FILENAME"
 >intarray</TT
@@ -130,11 +130,11 @@
 > module
    are shown in <A
 HREF="intarray.html#INTARRAY-FUNC-TABLE"
->Table F-8</A
+>Table F-10</A
 >, the operators
    in <A
 HREF="intarray.html#INTARRAY-OP-TABLE"
->Table F-9</A
+>Table F-11</A
 >.
   </P
 ><DIV
@@ -144,7 +144,7 @@
 ></A
 ><P
 ><B
->Table F-8. <TT
+>Table F-10. <TT
 CLASS="FILENAME"
 >intarray</TT
 > Functions</B
@@ -438,7 +438,7 @@
 ></A
 ><P
 ><B
->Table F-9. <TT
+>Table F-11. <TT
 CLASS="FILENAME"
 >intarray</TT
 > Operators</B
@@ -760,7 +760,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170276"
+NAME="AEN175127"
 >F.17.2. Index Support</A
 ></H2
 ><P
@@ -819,7 +819,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170290"
+NAME="AEN175141"
 >F.17.3. Example</A
 ></H2
 ><PRE
@@ -847,7 +847,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170294"
+NAME="AEN175145"
 >F.17.4. Benchmark</A
 ></H2
 ><P
@@ -877,7 +877,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170301"
+NAME="AEN175152"
 >F.17.5. Authors</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/internals.html postgresql-9.5-9.5.8/doc/src/sgml/html/internals.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/internals.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/internals.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="postmaster"
@@ -23,7 +23,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="PART"
 ><DIV
@@ -41,7 +41,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -97,7 +97,7 @@
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN99821"
+NAME="AEN100169"
 ></A
 ><P
 >    This part contains assorted information that might be of use to
@@ -466,14 +466,6 @@
 ></DT
 ><DT
 >49.39. <A
-HREF="catalog-pg-rewrite.html"
-><TT
-CLASS="STRUCTNAME"
->pg_rewrite</TT
-></A
-></DT
-><DT
->49.40. <A
 HREF="catalog-pg-replication-origin.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -481,23 +473,15 @@
 ></A
 ></DT
 ><DT
->49.41. <A
-HREF="catalog-pg-replication-origin-status.html"
-><TT
-CLASS="STRUCTNAME"
->pg_replication_origin_status</TT
-></A
-></DT
-><DT
->49.42. <A
-HREF="catalog-pg-replication-slots.html"
+>49.40. <A
+HREF="catalog-pg-rewrite.html"
 ><TT
 CLASS="STRUCTNAME"
->pg_replication_slots</TT
+>pg_rewrite</TT
 ></A
 ></DT
 ><DT
->49.43. <A
+>49.41. <A
 HREF="catalog-pg-seclabel.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -505,7 +489,7 @@
 ></A
 ></DT
 ><DT
->49.44. <A
+>49.42. <A
 HREF="catalog-pg-shdepend.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -513,7 +497,7 @@
 ></A
 ></DT
 ><DT
->49.45. <A
+>49.43. <A
 HREF="catalog-pg-shdescription.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -521,7 +505,7 @@
 ></A
 ></DT
 ><DT
->49.46. <A
+>49.44. <A
 HREF="catalog-pg-shseclabel.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -529,7 +513,7 @@
 ></A
 ></DT
 ><DT
->49.47. <A
+>49.45. <A
 HREF="catalog-pg-statistic.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -537,7 +521,7 @@
 ></A
 ></DT
 ><DT
->49.48. <A
+>49.46. <A
 HREF="catalog-pg-tablespace.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -545,7 +529,7 @@
 ></A
 ></DT
 ><DT
->49.49. <A
+>49.47. <A
 HREF="catalog-pg-transform.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -553,7 +537,7 @@
 ></A
 ></DT
 ><DT
->49.50. <A
+>49.48. <A
 HREF="catalog-pg-trigger.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -561,7 +545,7 @@
 ></A
 ></DT
 ><DT
->49.51. <A
+>49.49. <A
 HREF="catalog-pg-ts-config.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -569,7 +553,7 @@
 ></A
 ></DT
 ><DT
->49.52. <A
+>49.50. <A
 HREF="catalog-pg-ts-config-map.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -577,7 +561,7 @@
 ></A
 ></DT
 ><DT
->49.53. <A
+>49.51. <A
 HREF="catalog-pg-ts-dict.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -585,7 +569,7 @@
 ></A
 ></DT
 ><DT
->49.54. <A
+>49.52. <A
 HREF="catalog-pg-ts-parser.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -593,7 +577,7 @@
 ></A
 ></DT
 ><DT
->49.55. <A
+>49.53. <A
 HREF="catalog-pg-ts-template.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -601,7 +585,7 @@
 ></A
 ></DT
 ><DT
->49.56. <A
+>49.54. <A
 HREF="catalog-pg-type.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -609,7 +593,7 @@
 ></A
 ></DT
 ><DT
->49.57. <A
+>49.55. <A
 HREF="catalog-pg-user-mapping.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -617,12 +601,12 @@
 ></A
 ></DT
 ><DT
->49.58. <A
+>49.56. <A
 HREF="views-overview.html"
 >System Views</A
 ></DT
 ><DT
->49.59. <A
+>49.57. <A
 HREF="view-pg-available-extensions.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -630,7 +614,7 @@
 ></A
 ></DT
 ><DT
->49.60. <A
+>49.58. <A
 HREF="view-pg-available-extension-versions.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -638,7 +622,7 @@
 ></A
 ></DT
 ><DT
->49.61. <A
+>49.59. <A
 HREF="view-pg-cursors.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -646,7 +630,7 @@
 ></A
 ></DT
 ><DT
->49.62. <A
+>49.60. <A
 HREF="view-pg-file-settings.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -654,7 +638,7 @@
 ></A
 ></DT
 ><DT
->49.63. <A
+>49.61. <A
 HREF="view-pg-group.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -662,7 +646,7 @@
 ></A
 ></DT
 ><DT
->49.64. <A
+>49.62. <A
 HREF="view-pg-indexes.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -670,7 +654,7 @@
 ></A
 ></DT
 ><DT
->49.65. <A
+>49.63. <A
 HREF="view-pg-locks.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -678,7 +662,7 @@
 ></A
 ></DT
 ><DT
->49.66. <A
+>49.64. <A
 HREF="view-pg-matviews.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -686,7 +670,7 @@
 ></A
 ></DT
 ><DT
->49.67. <A
+>49.65. <A
 HREF="view-pg-policies.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -694,7 +678,7 @@
 ></A
 ></DT
 ><DT
->49.68. <A
+>49.66. <A
 HREF="view-pg-prepared-statements.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -702,7 +686,7 @@
 ></A
 ></DT
 ><DT
->49.69. <A
+>49.67. <A
 HREF="view-pg-prepared-xacts.html"
 ><TT
 CLASS="STRUCTNAME"
@@ -710,6 +694,22 @@
 ></A
 ></DT
 ><DT
+>49.68. <A
+HREF="view-pg-replication-origin-status.html"
+><TT
+CLASS="STRUCTNAME"
+>pg_replication_origin_status</TT
+></A
+></DT
+><DT
+>49.69. <A
+HREF="view-pg-replication-slots.html"
+><TT
+CLASS="STRUCTNAME"
+>pg_replication_slots</TT
+></A
+></DT
+><DT
 >49.70. <A
 HREF="view-pg-roles.html"
 ><TT
@@ -1270,6 +1270,11 @@
 HREF="row-estimation-examples.html"
 >Row Estimation Examples</A
 ></DT
+><DT
+>65.2. <A
+HREF="planner-stats-security.html"
+>Planner Statistics and Security</A
+></DT
 ></DL
 ></DD
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/intro-whatis.html postgresql-9.5-9.5.8/doc/src/sgml/html/intro-whatis.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/intro-whatis.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/intro-whatis.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Preface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/isn.html postgresql-9.5-9.5.8/doc/src/sgml/html/isn.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/isn.html	2016-03-28 20:21:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/isn.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -116,13 +116,13 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170313"
+NAME="AEN175164"
 >F.18.1. Data Types</A
 ></H2
 ><P
 >   <A
 HREF="isn.html#ISN-DATATYPES"
->Table F-10</A
+>Table F-12</A
 > shows the data types provided by
    the <TT
 CLASS="FILENAME"
@@ -136,7 +136,7 @@
 ></A
 ><P
 ><B
->Table F-10. <TT
+>Table F-12. <TT
 CLASS="FILENAME"
 >isn</TT
 > Data Types</B
@@ -325,7 +325,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170385"
+NAME="AEN175236"
 >F.18.2. Casts</A
 ></H2
 ><P
@@ -403,7 +403,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170412"
+NAME="AEN175263"
 >F.18.3. Functions and Operators</A
 ></H2
 ><P
@@ -414,7 +414,7 @@
    plus B-tree and hash indexing support for all these data types.  In
    addition there are several specialized functions; shown in <A
 HREF="isn.html#ISN-FUNCTIONS"
->Table F-11</A
+>Table F-13</A
 >.
    In this table,
    <TT
@@ -429,7 +429,7 @@
 ></A
 ><P
 ><B
->Table F-11. <TT
+>Table F-13. <TT
 CLASS="FILENAME"
 >isn</TT
 > Functions</B
@@ -569,7 +569,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170470"
+NAME="AEN175321"
 >F.18.4. Examples</A
 ></H2
 ><PRE
@@ -617,7 +617,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170473"
+NAME="AEN175324"
 >F.18.5. Bibliography</A
 ></H2
 ><P
@@ -718,7 +718,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170505"
+NAME="AEN175356"
 >F.18.6. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/kernel-resources.html postgresql-9.5-9.5.8/doc/src/sgml/html/kernel-resources.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/kernel-resources.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/kernel-resources.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -1250,7 +1250,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN29889"
+NAME="AEN30159"
 >17.4.2. Resource Limits</A
 ></H2
 ><P
@@ -1635,14 +1635,18 @@
 CLASS="SECT2"
 ><A
 NAME="LINUX-HUGE-PAGES"
->17.4.4. Linux huge pages</A
+>17.4.4. Linux Huge Pages</A
 ></H2
 ><P
 >    Using huge pages reduces overhead when using large contiguous chunks of
-    memory, like <SPAN
+    memory, as <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
-> does. To enable this
+> does, particularly when
+    using large values of <A
+HREF="runtime-config-resource.html#GUC-SHARED-BUFFERS"
+>shared_buffers</A
+>.  To use this
     feature in <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
@@ -1654,32 +1658,42 @@
     <TT
 CLASS="VARNAME"
 >CONFIG_HUGETLB_PAGE=y</TT
->. You also have to tune the system
-    setting <TT
+>. You will also have to adjust
+    the kernel setting <TT
 CLASS="VARNAME"
 >vm.nr_hugepages</TT
->. To estimate the number of
-    necessary huge pages start <SPAN
+>. To estimate the
+    number of huge pages needed, start <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
-> without
-    huge pages enabled and check the <TT
+>
+    without huge pages enabled and check the
+    postmaster's <TT
 CLASS="VARNAME"
 >VmPeak</TT
-> value from the
-    proc file system:
+> value, as well as the system's
+    huge page size, using the <TT
+CLASS="FILENAME"
+>/proc</TT
+> file system.  This might
+    look like:
 </P><PRE
 CLASS="PROGRAMLISTING"
 >$ <KBD
 CLASS="USERINPUT"
->head -1 /path/to/data/directory/postmaster.pid</KBD
+>head -1 $PGDATA/postmaster.pid</KBD
 >
 4170
 $ <KBD
 CLASS="USERINPUT"
 >grep ^VmPeak /proc/4170/status</KBD
 >
-VmPeak:  6490428 kB</PRE
+VmPeak:  6490428 kB
+$ <KBD
+CLASS="USERINPUT"
+>grep ^Hugepagesize /proc/meminfo</KBD
+>
+Hugepagesize:       2048 kB</PRE
 ><P>
      <TT
 CLASS="LITERAL"
@@ -1687,22 +1701,15 @@
 > / <TT
 CLASS="LITERAL"
 >2048</TT
->
-     (<TT
-CLASS="VARNAME"
->PAGE_SIZE</TT
-> is <TT
-CLASS="LITERAL"
->2MB</TT
-> in this case) are
-     roughly <TT
+> gives approximately
+     <TT
 CLASS="LITERAL"
 >3169.154</TT
-> huge pages, so you will need at
+>, so in this example we need at
      least <TT
 CLASS="LITERAL"
 >3170</TT
-> huge pages:
+> huge pages, which we can set with:
 </P><PRE
 CLASS="PROGRAMLISTING"
 >$ <KBD
@@ -1710,16 +1717,30 @@
 >sysctl -w vm.nr_hugepages=3170</KBD
 ></PRE
 ><P>
-    Sometimes the kernel is not able to allocate the desired number of huge
-    pages, so it might be necessary to repeat that command or to reboot. Don't
-    forget to add an entry to <TT
+    A larger setting would be appropriate if other programs on the machine
+    also need huge pages.  Don't forget to add this setting
+    to <TT
 CLASS="FILENAME"
 >/etc/sysctl.conf</TT
-> to persist
-    this setting through reboots.
+> so that it will be reapplied
+    after reboots.
    </P
 ><P
->    It is also necessary to give the database server operating system
+>    Sometimes the kernel is not able to allocate the desired number of huge
+    pages immediately, so it might be necessary to repeat the command or to
+    reboot.  (Immediately after a reboot, most of the machine's memory
+    should be available to convert into huge pages.)  To verify the huge
+    page allocation situation, use:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>$ <KBD
+CLASS="USERINPUT"
+>grep Huge /proc/meminfo</KBD
+></PRE
+><P>
+   </P
+><P
+>    It may also be necessary to give the database server's operating system
     user permission to use huge pages by setting
     <TT
 CLASS="VARNAME"
@@ -1727,8 +1748,8 @@
 > via <SPAN
 CLASS="APPLICATION"
 >sysctl</SPAN
->, and
-    permission to lock memory with <TT
+>, and/or
+    give permission to lock memory with <TT
 CLASS="COMMAND"
 >ulimit -l</TT
 >.
@@ -1739,24 +1760,23 @@
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
 > is to use them when possible and
-    to fallback to normal pages when failing. To enforce the use of huge
-    pages, you can set
-    <A
+    to fall back to normal pages when failing. To enforce the use of huge
+    pages, you can set <A
 HREF="runtime-config-resource.html#GUC-HUGE-PAGES"
-><TT
-CLASS="VARNAME"
->huge_pages</TT
-></A
+>huge_pages</A
 >
     to <TT
 CLASS="LITERAL"
 >on</TT
->. Note that in this case
-    <SPAN
+> in <TT
+CLASS="FILENAME"
+>postgresql.conf</TT
+>.
+    Note that with this setting <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
-> will fail to start if not enough huge
-    pages are available.
+> will fail to
+    start if not enough huge pages are available.
    </P
 ><P
 >    For a detailed description of the <SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/largeobjects.html postgresql-9.5-9.5.8/doc/src/sgml/html/largeobjects.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/largeobjects.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/largeobjects.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Client Interfaces"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/LEGALNOTICE.html postgresql-9.5-9.5.8/doc/src/sgml/html/LEGALNOTICE.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/LEGALNOTICE.html	2016-03-28 20:20:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/LEGALNOTICE.html	2017-08-07 21:31:58.000000000 +0000
@@ -7,7 +7,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="NEXT"
 TITLE="Preface"
@@ -18,7 +18,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 ><DIV
 CLASS="NAVHEADER"
@@ -35,7 +35,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ></TABLE
@@ -55,7 +55,7 @@
 >  <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
-> is Copyright &copy; 1996-2016
+> is Copyright &copy; 1996-2017
   by the PostgreSQL Global Development Group.
  </P
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-async.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-async.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-async.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-async.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-build.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-build.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-build.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-build.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-cancel.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-cancel.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-cancel.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-cancel.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-connect.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-connect.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-connect.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-connect.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -1402,7 +1402,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN42510"
+NAME="AEN42797"
 >31.1.1.1. Keyword/Value Connection Strings</A
 ></H3
 ><P
@@ -1445,7 +1445,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN42521"
+NAME="AEN42808"
 >31.1.1.2. Connection URIs</A
 ></H3
 ><P
@@ -1953,16 +1953,13 @@
 >        Controls the number of seconds of inactivity after which TCP should
         send a keepalive message to the server.  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 <TT
+        Unix-domain socket, or if keepalives are disabled.
+        It is only supported on systems where <TT
 CLASS="SYMBOL"
 >TCP_KEEPIDLE</TT
-> or <TT
-CLASS="SYMBOL"
->TCP_KEEPALIVE</TT
->
-        socket option is available, and on Windows; on other systems, it has no
-        effect.
+> or
+        an equivalent socket option is available, and on Windows; on other
+        systems, it has no effect.
        </P
 ></DD
 ><DT
@@ -1979,12 +1976,12 @@
         that is not acknowledged by the server should be retransmitted.  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 <TT
+        It is only supported on systems where <TT
 CLASS="SYMBOL"
 >TCP_KEEPINTVL</TT
->
-        socket option is available, and on Windows; on other systems, it has no
-        effect.
+> or
+        an equivalent socket option is available, and on Windows; on other
+        systems, it has no effect.
        </P
 ></DD
 ><DT
@@ -2001,11 +1998,12 @@
         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 <TT
+        It is only supported on systems where <TT
 CLASS="SYMBOL"
 >TCP_KEEPCNT</TT
->
-        socket option is available; on other systems, it has no effect.
+> or
+        an equivalent socket option is available; on other systems, it has no
+        effect.
        </P
 ></DD
 ><DT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-control.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-control.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-control.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-control.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-copy.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-copy.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-copy.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-copy.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-envars.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-envars.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-envars.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-envars.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -261,31 +261,6 @@
 >      
       <TT
 CLASS="ENVAR"
->PGREALM</TT
-> sets the Kerberos realm to use with
-      <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
->, if  it is different from the
-      local realm.  If <TT
-CLASS="ENVAR"
->PGREALM</TT
-> is set,
-      <SPAN
-CLASS="APPLICATION"
->libpq</SPAN
-> applications will attempt
-      authentication  with  servers for this realm and use separate ticket
-      files to avoid conflicts with local ticket files.   This
-      environment  variable is only used if GSSAPI authentication is
-      selected by the server.
-     </P
-></LI
-><LI
-><P
->      
-      <TT
-CLASS="ENVAR"
 >PGOPTIONS</TT
 > behaves the same as the <A
 HREF="libpq-connect.html#LIBPQ-CONNECT-OPTIONS"
@@ -327,6 +302,12 @@
 HREF="libpq-connect.html#LIBPQ-CONNECT-REQUIRESSL"
 >requiressl</A
 > connection parameter.
+      This environment variable is deprecated in favor of the
+      <TT
+CLASS="ENVAR"
+>PGSSLMODE</TT
+> variable; setting both variables suppresses the
+      effect of this one.
      </P
 ></LI
 ><LI
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-events.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-events.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-events.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-events.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-example.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-example.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-example.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-example.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-exec.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-exec.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-exec.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-exec.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-fastpath.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-fastpath.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-fastpath.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-fastpath.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Client Interfaces"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-ldap.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-ldap.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-ldap.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-ldap.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-misc.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-misc.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-misc.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-misc.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-notice-processing.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-notice-processing.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-notice-processing.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-notice-processing.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-notify.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-notify.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-notify.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-notify.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-pgpass.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-pgpass.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-pgpass.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-pgpass.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-pgservice.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-pgservice.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-pgservice.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-pgservice.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-single-row-mode.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-single-row-mode.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-single-row-mode.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-single-row-mode.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-ssl.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-ssl.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-ssl.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-ssl.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-status.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-status.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-status.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-status.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-threading.html postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-threading.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/libpq-threading.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/libpq-threading.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="libpq - C Library"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/locale.html postgresql-9.5-9.5.8/doc/src/sgml/html/locale.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/locale.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/locale.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Localization"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -117,7 +117,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN36289"
+NAME="AEN36562"
 >22.1.1. Overview</A
 ></H2
 ><P
@@ -211,7 +211,7 @@
 ><P
 ></P
 ><A
-NAME="AEN36310"
+NAME="AEN36583"
 ></A
 ><TABLE
 BORDER="1"
@@ -423,7 +423,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN36366"
+NAME="AEN36639"
 >22.1.2. Behavior</A
 ></H2
 ><P
@@ -545,7 +545,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN36417"
+NAME="AEN36690"
 >22.1.3. Problems</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/locking-indexes.html postgresql-9.5-9.5.8/doc/src/sgml/html/locking-indexes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/locking-indexes.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/locking-indexes.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Concurrency Control"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/lo-examplesect.html postgresql-9.5-9.5.8/doc/src/sgml/html/lo-examplesect.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/lo-examplesect.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/lo-examplesect.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Large Objects"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/lo-funcs.html postgresql-9.5-9.5.8/doc/src/sgml/html/lo-funcs.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/lo-funcs.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/lo-funcs.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Large Objects"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/logfile-maintenance.html postgresql-9.5-9.5.8/doc/src/sgml/html/logfile-maintenance.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/logfile-maintenance.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/logfile-maintenance.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Routine Database Maintenance Tasks"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-catalogs.html postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-catalogs.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-catalogs.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-catalogs.html	2017-08-07 21:32:19.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Logical Decoding"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -97,7 +97,7 @@
 ></H1
 ><P
 >    The <A
-HREF="catalog-pg-replication-slots.html"
+HREF="view-pg-replication-slots.html"
 ><TT
 CLASS="STRUCTNAME"
 >pg_replication_slots</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-example.html postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-example.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-example.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-example.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Logical Decoding"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-explanation.html postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-explanation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-explanation.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-explanation.html	2017-08-07 21:32:19.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Logical Decoding"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -100,7 +100,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN68556"
+NAME="AEN68866"
 >46.2.1. Logical Decoding</A
 ></H2
 ><P
@@ -127,7 +127,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN68564"
+NAME="LOGICALDECODING-REPLICATION-SLOTS"
 >46.2.2. Replication Slots</A
 ></H2
 ><P
@@ -202,7 +202,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN68581"
+NAME="AEN68891"
 >46.2.3. Output Plugins</A
 ></H2
 ><P
@@ -215,7 +215,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN68584"
+NAME="AEN68894"
 >46.2.4. Exported Snapshots</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding.html postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding.html	2017-08-07 21:32:19.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -115,22 +115,22 @@
 ><DL
 ><DT
 >46.2.1. <A
-HREF="logicaldecoding-explanation.html#AEN68556"
+HREF="logicaldecoding-explanation.html#AEN68866"
 >Logical Decoding</A
 ></DT
 ><DT
 >46.2.2. <A
-HREF="logicaldecoding-explanation.html#AEN68564"
+HREF="logicaldecoding-explanation.html#LOGICALDECODING-REPLICATION-SLOTS"
 >Replication Slots</A
 ></DT
 ><DT
 >46.2.3. <A
-HREF="logicaldecoding-explanation.html#AEN68581"
+HREF="logicaldecoding-explanation.html#AEN68891"
 >Output Plugins</A
 ></DT
 ><DT
 >46.2.4. <A
-HREF="logicaldecoding-explanation.html#AEN68584"
+HREF="logicaldecoding-explanation.html#AEN68894"
 >Exported Snapshots</A
 ></DT
 ></DL
@@ -201,7 +201,7 @@
 ></DIV
 ><P
 >   PostgreSQL provides infrastructure to stream the modifications performed
-   via SQL to external consumers.  This functionality can be used to for a
+   via SQL to external consumers.  This functionality can be used for a
    variety of purposes, including replication solutions and auditing.
   </P
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-output-plugin.html postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-output-plugin.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-output-plugin.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-output-plugin.html	2017-08-07 21:32:19.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Logical Decoding"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -139,7 +139,7 @@
     LogicalDecodeShutdownCB shutdown_cb;
 } OutputPluginCallbacks;
 
-typedef void (*LogicalOutputPluginInit)(struct OutputPluginCallbacks *cb);</PRE
+typedef void (*LogicalOutputPluginInit) (struct OutputPluginCallbacks *cb);</PRE
 ><P>
      The <CODE
 CLASS="FUNCTION"
@@ -219,7 +219,7 @@
      server's encoding, it can declare that by
      setting <TT
 CLASS="LITERAL"
->OutputPluginOptions.output_mode</TT
+>OutputPluginOptions.output_type</TT
 >
      to <TT
 CLASS="LITERAL"
@@ -313,11 +313,9 @@
       of the number of changes that are ready to be put out.
 </P><PRE
 CLASS="PROGRAMLISTING"
->typedef void (*LogicalDecodeStartupCB) (
-    struct LogicalDecodingContext *ctx,
-    OutputPluginOptions *options,
-    bool is_init
-);</PRE
+>typedef void (*LogicalDecodeStartupCB) (struct LogicalDecodingContext *ctx,
+                                        OutputPluginOptions *options,
+                                        bool is_init);</PRE
 ><P>
       The <TT
 CLASS="LITERAL"
@@ -384,9 +382,7 @@
       isn't necessarily being dropped, streaming is just being stopped.
 </P><PRE
 CLASS="PROGRAMLISTING"
->typedef void (*LogicalDecodeShutdownCB) (
-    struct LogicalDecodingContext *ctx
-);</PRE
+>typedef void (*LogicalDecodeShutdownCB) (struct LogicalDecodingContext *ctx);</PRE
 ><P>
      </P
 ></DIV
@@ -407,10 +403,8 @@
       and their contents never get decoded.
 </P><PRE
 CLASS="PROGRAMLISTING"
->typedef void (*LogicalDecodeBeginCB) (
-    struct LogicalDecodingContext *,
-    ReorderBufferTXN *txn
-);</PRE
+>typedef void (*LogicalDecodeBeginCB) (struct LogicalDecodingContext *ctx,
+                                      ReorderBufferTXN *txn);</PRE
 ><P>
       The <TT
 CLASS="PARAMETER"
@@ -442,10 +436,9 @@
       rows.
 </P><PRE
 CLASS="PROGRAMLISTING"
->typedef void (*LogicalDecodeCommitCB) (
-    struct LogicalDecodingContext *,
-    ReorderBufferTXN *txn
-);</PRE
+>typedef void (*LogicalDecodeCommitCB) (struct LogicalDecodingContext *ctx,
+                                       ReorderBufferTXN *txn,
+                                       XLogRecPtr commit_lsn);</PRE
 ><P>
      </P
 ></DIV
@@ -478,12 +471,10 @@
       row.
 </P><PRE
 CLASS="PROGRAMLISTING"
->typedef void (*LogicalDecodeChangeCB) (
-    struct LogicalDecodingContext *ctx,
-    ReorderBufferTXN *txn,
-    Relation relation,
-    ReorderBufferChange *change
-);</PRE
+>typedef void (*LogicalDecodeChangeCB) (struct LogicalDecodingContext *ctx,
+                                       ReorderBufferTXN *txn,
+                                       Relation relation,
+                                       ReorderBufferChange *change);</PRE
 ><P>
       The <TT
 CLASS="PARAMETER"
@@ -568,10 +559,8 @@
        output plugin.
 </P><PRE
 CLASS="PROGRAMLISTING"
->typedef bool (*LogicalDecodeFilterByOriginCB) (
-    struct LogicalDecodingContext *ctx,
-    RepNodeId origin_id
-);</PRE
+>typedef bool (*LogicalDecodeFilterByOriginCB) (struct LogicalDecodingContext *ctx,
+                                               RepOriginId origin_id);</PRE
 ><P>
       The <TT
 CLASS="PARAMETER"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-sql.html postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-sql.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-sql.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-sql.html	2017-08-07 21:32:19.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Logical Decoding"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-synchronous.html postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-synchronous.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-synchronous.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-synchronous.html	2017-08-07 21:32:19.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Logical Decoding"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-walsender.html postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-walsender.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-walsender.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-walsender.html	2017-08-07 21:32:19.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Logical Decoding"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-writer.html postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-writer.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/logicaldecoding-writer.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/logicaldecoding-writer.html	2017-08-07 21:32:19.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Logical Decoding"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/log-shipping-alternative.html postgresql-9.5-9.5.8/doc/src/sgml/html/log-shipping-alternative.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/log-shipping-alternative.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/log-shipping-alternative.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="High Availability, Load Balancing, and Replication"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/lo.html postgresql-9.5-9.5.8/doc/src/sgml/html/lo.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/lo.html	2016-03-28 20:21:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/lo.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -114,7 +114,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170518"
+NAME="AEN175369"
 >F.19.1. Rationale</A
 ></H2
 ><P
@@ -184,7 +184,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170533"
+NAME="AEN175384"
 >F.19.2. How to Use It</A
 ></H2
 ><P
@@ -226,7 +226,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170542"
+NAME="AEN175393"
 >F.19.3. Limitations</A
 ></H2
 ><P
@@ -288,7 +288,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170558"
+NAME="AEN175409"
 >F.19.4. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/lo-implementation.html postgresql-9.5-9.5.8/doc/src/sgml/html/lo-implementation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/lo-implementation.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/lo-implementation.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Large Objects"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/lo-interfaces.html postgresql-9.5-9.5.8/doc/src/sgml/html/lo-interfaces.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/lo-interfaces.html	2016-03-28 20:20:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/lo-interfaces.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Large Objects"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/lo-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/lo-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/lo-intro.html	2016-03-28 20:20:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/lo-intro.html	2017-08-07 21:32:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Large Objects"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ltree.html postgresql-9.5-9.5.8/doc/src/sgml/html/ltree.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ltree.html	2016-03-28 20:21:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ltree.html	2017-08-07 21:33:13.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,7 +108,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170568"
+NAME="AEN175419"
 >F.20.1. Definitions</A
 ></H2
 ><P
@@ -529,7 +529,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN170683"
+NAME="AEN175534"
 >F.20.2. Operators and Functions</A
 ></H2
 ><P
@@ -561,7 +561,7 @@
    of a node sorted by label text.  In addition, the specialized
    operators shown in <A
 HREF="ltree.html#LTREE-OP-TABLE"
->Table F-12</A
+>Table F-14</A
 > are available.
   </P
 ><DIV
@@ -571,7 +571,7 @@
 ></A
 ><P
 ><B
->Table F-12. <TT
+>Table F-14. <TT
 CLASS="TYPE"
 >ltree</TT
 > Operators</B
@@ -1220,7 +1220,7 @@
 ><P
 >   The available functions are shown in <A
 HREF="ltree.html#LTREE-FUNC-TABLE"
->Table F-13</A
+>Table F-15</A
 >.
   </P
 ><DIV
@@ -1230,7 +1230,7 @@
 ></A
 ><P
 ><B
->Table F-13. <TT
+>Table F-15. <TT
 CLASS="TYPE"
 >ltree</TT
 > Functions</B
@@ -1581,7 +1581,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171094"
+NAME="AEN175945"
 >F.20.3. Indexes</A
 ></H2
 ><P
@@ -1708,7 +1708,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171133"
+NAME="AEN175984"
 >F.20.4. Example</A
 ></H2
 ><P
@@ -1852,7 +1852,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171151"
+NAME="AEN176002"
 >F.20.5. Transforms</A
 ></H2
 ><P
@@ -1889,7 +1889,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171160"
+NAME="AEN176011"
 >F.20.6. Authors</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/maintenance.html postgresql-9.5-9.5.8/doc/src/sgml/html/maintenance.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/maintenance.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/maintenance.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-config.html postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-config.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-config.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-config.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Managing Databases"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-createdb.html postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-createdb.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-createdb.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-createdb.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Managing Databases"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-dropdb.html postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-dropdb.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-dropdb.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-dropdb.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Managing Databases"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-overview.html postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-overview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-overview.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-overview.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Managing Databases"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-tablespaces.html postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-tablespaces.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-tablespaces.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-tablespaces.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Managing Databases"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-templatedbs.html postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-templatedbs.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/manage-ag-templatedbs.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/manage-ag-templatedbs.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Managing Databases"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/managing-databases.html postgresql-9.5-9.5.8/doc/src/sgml/html/managing-databases.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/managing-databases.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/managing-databases.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/monitoring.html postgresql-9.5-9.5.8/doc/src/sgml/html/monitoring.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/monitoring.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/monitoring.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/monitoring-locks.html postgresql-9.5-9.5.8/doc/src/sgml/html/monitoring-locks.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/monitoring-locks.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/monitoring-locks.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Monitoring Database Activity"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -142,7 +142,7 @@
 > view appear in
    <A
 HREF="view-pg-locks.html"
->Section 49.65</A
+>Section 49.63</A
 >.
    For more information on locking and managing concurrency with
    <SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/monitoring-ps.html postgresql-9.5-9.5.8/doc/src/sgml/html/monitoring-ps.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/monitoring-ps.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/monitoring-ps.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Monitoring Database Activity"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/monitoring-stats.html postgresql-9.5-9.5.8/doc/src/sgml/html/monitoring-stats.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/monitoring-stats.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/monitoring-stats.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Monitoring Database Activity"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/multibyte.html postgresql-9.5-9.5.8/doc/src/sgml/html/multibyte.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/multibyte.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/multibyte.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Localization"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -1107,7 +1107,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN36967"
+NAME="AEN37240"
 >22.3.2. Setting the Character Set</A
 ></H2
 ><P
@@ -1283,7 +1283,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN37005"
+NAME="AEN37278"
 >22.3.3. Automatic Character Set Conversion Between Server and Client</A
 ></H2
 ><P
@@ -2435,7 +2435,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN37334"
+NAME="AEN37607"
 >22.3.4. Further Reading</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/mvcc-caveats.html postgresql-9.5-9.5.8/doc/src/sgml/html/mvcc-caveats.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/mvcc-caveats.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/mvcc-caveats.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Concurrency Control"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/mvcc.html postgresql-9.5-9.5.8/doc/src/sgml/html/mvcc.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/mvcc.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/mvcc.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/mvcc-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/mvcc-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/mvcc-intro.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/mvcc-intro.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Concurrency Control"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/nls.html postgresql-9.5-9.5.8/doc/src/sgml/html/nls.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/nls.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/nls.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,22 +110,22 @@
 ><DL
 ><DT
 >52.1.1. <A
-HREF="nls-translator.html#AEN110893"
+HREF="nls-translator.html#AEN111262"
 >Requirements</A
 ></DT
 ><DT
 >52.1.2. <A
-HREF="nls-translator.html#AEN110905"
+HREF="nls-translator.html#AEN111274"
 >Concepts</A
 ></DT
 ><DT
 >52.1.3. <A
-HREF="nls-translator.html#AEN110923"
+HREF="nls-translator.html#AEN111292"
 >Creating and Maintaining Message Catalogs</A
 ></DT
 ><DT
 >52.1.4. <A
-HREF="nls-translator.html#AEN110957"
+HREF="nls-translator.html#AEN111326"
 >Editing the PO Files</A
 ></DT
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/nls-programmer.html postgresql-9.5-9.5.8/doc/src/sgml/html/nls-programmer.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/nls-programmer.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/nls-programmer.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Native Language Support"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/nls-translator.html postgresql-9.5-9.5.8/doc/src/sgml/html/nls-translator.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/nls-translator.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/nls-translator.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Native Language Support"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -116,7 +116,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN110893"
+NAME="AEN111262"
 >52.1.1. Requirements</A
 ></H2
 ><P
@@ -172,7 +172,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN110905"
+NAME="AEN111274"
 >52.1.2. Concepts</A
 ></H2
 ><P
@@ -285,7 +285,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN110923"
+NAME="AEN111292"
 >52.1.3. Creating and Maintaining Message Catalogs</A
 ></H2
 ><P
@@ -446,7 +446,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN110957"
+NAME="AEN111326"
 >52.1.4. Editing the PO Files</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/non-durability.html postgresql-9.5-9.5.8/doc/src/sgml/html/non-durability.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/non-durability.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/non-durability.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Performance Tips"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/notation.html postgresql-9.5-9.5.8/doc/src/sgml/html/notation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/notation.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/notation.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Preface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/oid2name.html postgresql-9.5-9.5.8/doc/src/sgml/html/oid2name.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/oid2name.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/oid2name.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN175117"
+NAME="AEN179974"
 ></A
 ><H2
 >Name</H2
@@ -106,7 +106,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN175121"
+NAME="AEN179978"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175126"
+NAME="AEN179983"
 ></A
 ><H2
 >Description</H2
@@ -170,7 +170,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175136"
+NAME="AEN179993"
 ></A
 ><H2
 >Options</H2
@@ -506,7 +506,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175260"
+NAME="AEN180117"
 ></A
 ><H2
 >Notes</H2
@@ -522,7 +522,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175264"
+NAME="AEN180121"
 ></A
 ><H2
 >Examples</H2
@@ -648,7 +648,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175267"
+NAME="AEN180124"
 ></A
 ><H2
 >Author</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/overview.html postgresql-9.5-9.5.8/doc/src/sgml/html/overview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/overview.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/overview.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -120,12 +120,12 @@
 ><DL
 ><DT
 >48.3.1. <A
-HREF="parser-stage.html#AEN99907"
+HREF="parser-stage.html#AEN100255"
 >Parser</A
 ></DT
 ><DT
 >48.3.2. <A
-HREF="parser-stage.html#AEN99943"
+HREF="parser-stage.html#AEN100291"
 >Transformation Process</A
 ></DT
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pageinspect.html postgresql-9.5-9.5.8/doc/src/sgml/html/pageinspect.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pageinspect.html	2016-03-28 20:21:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pageinspect.html	2017-08-07 21:33:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,7 +108,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171172"
+NAME="AEN176023"
 >F.21.1. Functions</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/parser-stage.html postgresql-9.5-9.5.8/doc/src/sgml/html/parser-stage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/parser-stage.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/parser-stage.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Overview of PostgreSQL Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -144,7 +144,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN99907"
+NAME="AEN100255"
 >48.3.1. Parser</A
 ></H2
 ><P
@@ -294,7 +294,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN99943"
+NAME="AEN100291"
 >48.3.2. Transformation Process</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/passwordcheck.html postgresql-9.5-9.5.8/doc/src/sgml/html/passwordcheck.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/passwordcheck.html	2016-03-28 20:21:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/passwordcheck.html	2017-08-07 21:33:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/performance-tips.html postgresql-9.5-9.5.8/doc/src/sgml/html/performance-tips.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/performance-tips.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/performance-tips.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/perm-functions.html postgresql-9.5-9.5.8/doc/src/sgml/html/perm-functions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/perm-functions.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/perm-functions.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Roles"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgarchivecleanup.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgarchivecleanup.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgarchivecleanup.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgarchivecleanup.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN97659"
+NAME="AEN98012"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN97663"
+NAME="AEN98016"
 ></A
 ><H2
 >Synopsis</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97672"
+NAME="AEN98025"
 ></A
 ><H2
 >Description</H2
@@ -288,7 +288,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97704"
+NAME="AEN98057"
 ></A
 ><H2
 >Options</H2
@@ -393,7 +393,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97744"
+NAME="AEN98097"
 ></A
 ><H2
 >Notes</H2
@@ -424,7 +424,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97752"
+NAME="AEN98105"
 ></A
 ><H2
 >Examples</H2
@@ -463,7 +463,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97763"
+NAME="AEN98116"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgbench.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgbench.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgbench.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgbench.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN91215"
+NAME="AEN91548"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN91219"
+NAME="AEN91552"
 ></A
 ><H2
 >Synopsis</H2
@@ -150,7 +150,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91234"
+NAME="AEN91567"
 ></A
 ><H2
 >Description</H2
@@ -382,7 +382,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91280"
+NAME="AEN91613"
 ></A
 ><H2
 >Options</H2
@@ -1384,14 +1384,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91632"
+NAME="AEN91965"
 ></A
 ><H2
 >Notes</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN91634"
+NAME="AEN91967"
 ></A
 ><H3
 >What is the <SPAN
@@ -1476,7 +1476,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN91665"
+NAME="AEN91998"
 ></A
 ><H3
 >Custom Scripts</H3
@@ -2137,7 +2137,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN91824"
+NAME="AEN92157"
 ></A
 ><H3
 >Per-Transaction Logging</H3
@@ -2289,21 +2289,23 @@
 CLASS="OPTION"
 >--rate</TT
 > option is used.
-   The last field <TT
-CLASS="REPLACEABLE"
-><I
->skipped_transactions</I
-></TT
-> reports the number of
-   transactions skipped because they were too far behind schedule. It is only
-   present when both options <TT
+   When both <TT
 CLASS="OPTION"
 >--rate</TT
 > and <TT
 CLASS="OPTION"
 >--latency-limit</TT
->
-   are used.
+> are used,
+   the <TT
+CLASS="REPLACEABLE"
+><I
+>time</I
+></TT
+> for a skipped transaction will be reported as
+   <TT
+CLASS="LITERAL"
+>skipped</TT
+>.
   </P
 ><P
 >   Here is a snippet of the log file generated:
@@ -2332,7 +2334,7 @@
  0 84 4142 0 1412881037 918023 2333
  0 85 2465 0 1412881037 919759 740</PRE
 ><P>
-   In this example, transaction 82 was late, because it's latency (6.173 ms) was
+   In this example, transaction 82 was late, because its latency (6.173 ms) was
    over the 5 ms limit. The next two transactions were skipped, because they
    were already late before they were even started.
   </P
@@ -2348,7 +2350,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN91865"
+NAME="AEN92199"
 ></A
 ><H3
 >Aggregated Logging</H3
@@ -2454,7 +2456,7 @@
 ><I
 >latency_2_sum</I
 ></TT
-> is a sum of 2nd powers of latencies. The last two
+> is a sum of 2nd powers of latencies. The next two
    fields are <TT
 CLASS="REPLACEABLE"
 ><I
@@ -2508,7 +2510,7 @@
    scheduled start time and the time it actually started.
   </P
 ><P
->   Here is example outputs:
+>   Here is example output:
 </P><PRE
 CLASS="SCREEN"
 >1345828501 5601 1542744 483552416 61 2573
@@ -2518,15 +2520,15 @@
 1345828509 7073 1979779 573489941 236 1411</PRE
 ><P></P
 ><P
->   Notice that while the plain (unaggregated) log file contains index
-   of the custom script files, the aggregated log does not. Therefore if
+>   Notice that while the plain (unaggregated) log file contains a reference
+   to the custom script files, the aggregated log does not. Therefore if
    you need per script data, you need to aggregate the data on your own.
   </P
 ></DIV
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN91900"
+NAME="AEN92234"
 ></A
 ><H3
 >Per-Statement Latencies</H3
@@ -2589,7 +2591,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN91909"
+NAME="AEN92243"
 ></A
 ><H3
 >Good Practices</H3
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgbuffercache.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgbuffercache.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgbuffercache.html	2016-03-28 20:21:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgbuffercache.html	2017-08-07 21:33:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -123,7 +123,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171382"
+NAME="AEN176233"
 >F.23.1. The <TT
 CLASS="STRUCTNAME"
 >pg_buffercache</TT
@@ -132,7 +132,7 @@
 ><P
 >   The definitions of the columns exposed by the view are shown in <A
 HREF="pgbuffercache.html#PGBUFFERCACHE-COLUMNS"
->Table F-14</A
+>Table F-16</A
 >.
   </P
 ><DIV
@@ -142,7 +142,7 @@
 ></A
 ><P
 ><B
->Table F-14. <TT
+>Table F-16. <TT
 CLASS="STRUCTNAME"
 >pg_buffercache</TT
 > Columns</B
@@ -256,7 +256,7 @@
 >Fork number within the relation;  see
       <TT
 CLASS="FILENAME"
->include/storage/relfilenode.h</TT
+>include/common/relpath.h</TT
 ></TD
 ></TR
 ><TR
@@ -369,7 +369,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171474"
+NAME="AEN176325"
 >F.23.2. Sample Output</A
 ></H2
 ><PRE
@@ -402,7 +402,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171477"
+NAME="AEN176328"
 >F.23.3. Authors</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgcrypto.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgcrypto.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgcrypto.html	2016-03-28 20:21:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgcrypto.html	2017-08-07 21:33:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171495"
+NAME="AEN176346"
 >F.24.1. General Hashing Functions</A
 ></H2
 ><DIV
@@ -118,7 +118,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171497"
+NAME="AEN176348"
 >F.24.1.1. <CODE
 CLASS="FUNCTION"
 >digest()</CODE
@@ -165,7 +165,7 @@
     OpenSSL, more algorithms are available, as detailed in
     <A
 HREF="pgcrypto.html#PGCRYPTO-WITH-WITHOUT-OPENSSL"
->Table F-18</A
+>Table F-20</A
 >.
    </P
 ><P
@@ -187,7 +187,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171517"
+NAME="AEN176368"
 >F.24.1.2. <CODE
 CLASS="FUNCTION"
 >hmac()</CODE
@@ -232,7 +232,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171531"
+NAME="AEN176382"
 >F.24.2. Password Hashing Functions</A
 ></H2
 ><P
@@ -297,7 +297,7 @@
 ><P
 >   <A
 HREF="pgcrypto.html#PGCRYPTO-CRYPT-ALGORITHMS"
->Table F-15</A
+>Table F-17</A
 > lists the algorithms
    supported by the <CODE
 CLASS="FUNCTION"
@@ -311,7 +311,7 @@
 ></A
 ><P
 ><B
->Table F-15. Supported Algorithms for <CODE
+>Table F-17. Supported Algorithms for <CODE
 CLASS="FUNCTION"
 >crypt()</CODE
 ></B
@@ -412,7 +412,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171598"
+NAME="AEN176449"
 >F.24.2.1. <CODE
 CLASS="FUNCTION"
 >crypt()</CODE
@@ -464,7 +464,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171614"
+NAME="AEN176465"
 >F.24.2.2. <CODE
 CLASS="FUNCTION"
 >gen_salt()</CODE
@@ -523,7 +523,7 @@
 > depend on the algorithm and
     are shown in <A
 HREF="pgcrypto.html#PGCRYPTO-ICFC-TABLE"
->Table F-16</A
+>Table F-18</A
 >.
    </P
 ><DIV
@@ -533,7 +533,7 @@
 ></A
 ><P
 ><B
->Table F-16. Iteration Counts for <CODE
+>Table F-18. Iteration Counts for <CODE
 CLASS="FUNCTION"
 >crypt()</CODE
 ></B
@@ -600,7 +600,7 @@
 ><P
 >    <A
 HREF="pgcrypto.html#PGCRYPTO-HASH-SPEED-TABLE"
->Table F-17</A
+>Table F-19</A
 > gives an overview of the relative slowness
     of different hashing algorithms.
     The table shows how much time it would take to try all
@@ -627,7 +627,7 @@
 ></A
 ><P
 ><B
->Table F-17. Hash Algorithm Speeds</B
+>Table F-19. Hash Algorithm Speeds</B
 ></P
 ><TABLE
 BORDER="1"
@@ -867,7 +867,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171759"
+NAME="AEN176610"
 >F.24.3. PGP Encryption Functions</A
 ></H2
 ><P
@@ -981,7 +981,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171794"
+NAME="AEN176645"
 >F.24.3.1. <CODE
 CLASS="FUNCTION"
 >pgp_sym_encrypt()</CODE
@@ -1011,7 +1011,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171806"
+NAME="AEN176657"
 >F.24.3.2. <CODE
 CLASS="FUNCTION"
 >pgp_sym_decrypt()</CODE
@@ -1051,7 +1051,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171821"
+NAME="AEN176672"
 >F.24.3.3. <CODE
 CLASS="FUNCTION"
 >pgp_pub_encrypt()</CODE
@@ -1084,7 +1084,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171834"
+NAME="AEN176685"
 >F.24.3.4. <CODE
 CLASS="FUNCTION"
 >pgp_pub_decrypt()</CODE
@@ -1134,7 +1134,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171851"
+NAME="AEN176702"
 >F.24.3.5. <CODE
 CLASS="FUNCTION"
 >pgp_key_id()</CODE
@@ -1200,7 +1200,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171872"
+NAME="AEN176723"
 >F.24.3.6. <CODE
 CLASS="FUNCTION"
 >armor()</CODE
@@ -1239,7 +1239,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171886"
+NAME="AEN176737"
 >F.24.3.7. <CODE
 CLASS="FUNCTION"
 >pgp_armor_headers</CODE
@@ -1266,7 +1266,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171895"
+NAME="AEN176746"
 >F.24.3.8. Options for PGP Functions</A
 ></H3
 ><P
@@ -1302,7 +1302,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN171904"
+NAME="AEN176755"
 >F.24.3.8.1. cipher-algo</A
 ></H4
 ><P
@@ -1325,7 +1325,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN171910"
+NAME="AEN176761"
 >F.24.3.8.2. compress-algo</A
 ></H4
 ><P
@@ -1349,7 +1349,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN171915"
+NAME="AEN176766"
 >F.24.3.8.3. compress-level</A
 ></H4
 ><P
@@ -1367,7 +1367,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN171919"
+NAME="AEN176770"
 >F.24.3.8.4. convert-crlf</A
 ></H4
 ><P
@@ -1403,7 +1403,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN171928"
+NAME="AEN176779"
 >F.24.3.8.5. disable-mdc</A
 ></H4
 ><P
@@ -1423,7 +1423,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN171932"
+NAME="AEN176783"
 >F.24.3.8.6. sess-key</A
 ></H4
 ><P
@@ -1442,7 +1442,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN171936"
+NAME="AEN176787"
 >F.24.3.8.7. s2k-mode</A
 ></H4
 ><P
@@ -1462,7 +1462,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN171940"
+NAME="AEN176791"
 >F.24.3.8.8. s2k-digest-algo</A
 ></H4
 ><P
@@ -1479,7 +1479,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN171944"
+NAME="AEN176795"
 >F.24.3.8.9. s2k-cipher-algo</A
 ></H4
 ><P
@@ -1496,7 +1496,7 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN171948"
+NAME="AEN176799"
 >F.24.3.8.10. unicode-mode</A
 ></H4
 ><P
@@ -1517,7 +1517,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171952"
+NAME="AEN176803"
 >F.24.3.9. Generating PGP Keys with GnuPG</A
 ></H3
 ><P
@@ -1596,7 +1596,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN171973"
+NAME="AEN176824"
 >F.24.3.10. Limitations of PGP Code</A
 ></H3
 ><P
@@ -1633,7 +1633,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171983"
+NAME="AEN176834"
 >F.24.4. Raw Encryption Functions</A
 ></H2
 ><P
@@ -1832,7 +1832,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172046"
+NAME="AEN176897"
 >F.24.5. Random-Data Functions</A
 ></H2
 ><PRE
@@ -1858,7 +1858,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172057"
+NAME="AEN176908"
 >F.24.6. Notes</A
 ></H2
 ><DIV
@@ -1866,7 +1866,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN172059"
+NAME="AEN176910"
 >F.24.6.1. Configuration</A
 ></H3
 ><P
@@ -1903,7 +1903,7 @@
 ></A
 ><P
 ><B
->Table F-18. Summary of Functionality with and without OpenSSL</B
+>Table F-20. Summary of Functionality with and without OpenSSL</B
 ></P
 ><TABLE
 BORDER="1"
@@ -2041,7 +2041,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN172127"
+NAME="AEN176978"
 >F.24.6.2. NULL Handling</A
 ></H3
 ><P
@@ -2054,7 +2054,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN172130"
+NAME="AEN176981"
 >F.24.6.3. Security Limitations</A
 ></H3
 ><P
@@ -2105,7 +2105,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN172144"
+NAME="AEN176995"
 >F.24.6.4. Useful Reading</A
 ></H3
 ><P
@@ -2170,7 +2170,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN172167"
+NAME="AEN177018"
 >F.24.6.5. Technical References</A
 ></H3
 ><P
@@ -2259,7 +2259,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172199"
+NAME="AEN177050"
 >F.24.7. Author</A
 ></H2
 ><P
@@ -2282,7 +2282,7 @@
 ><P
 ></P
 ><A
-NAME="AEN172205"
+NAME="AEN177056"
 ></A
 ><TABLE
 BORDER="1"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgfreespacemap.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgfreespacemap.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgfreespacemap.html	2016-03-28 20:21:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgfreespacemap.html	2017-08-07 21:33:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -117,7 +117,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172253"
+NAME="AEN177104"
 >F.25.1. Functions</A
 ></H2
 ><P
@@ -191,7 +191,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172276"
+NAME="AEN177127"
 >F.25.2. Sample Output</A
 ></H2
 ><PRE
@@ -232,7 +232,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172279"
+NAME="AEN177130"
 >F.25.3. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgprewarm.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgprewarm.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgprewarm.html	2016-03-28 20:21:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgprewarm.html	2017-08-07 21:33:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -111,7 +111,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172291"
+NAME="AEN177142"
 >F.26.1. Functions</A
 ></H2
 ><PRE
@@ -189,7 +189,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172308"
+NAME="AEN177159"
 >F.26.2. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgrowlocks.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgrowlocks.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgrowlocks.html	2016-03-28 20:21:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgrowlocks.html	2017-08-07 21:33:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -107,7 +107,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172318"
+NAME="AEN177169"
 >F.27.1. Overview</A
 ></H2
 ><PRE
@@ -118,7 +118,7 @@
    with one row for each locked row within the table.  The output columns
    are shown in <A
 HREF="pgrowlocks.html#PGROWLOCKS-COLUMNS"
->Table F-19</A
+>Table F-21</A
 >.
   </P
 ><DIV
@@ -128,7 +128,7 @@
 ></A
 ><P
 ><B
->Table F-19. <CODE
+>Table F-21. <CODE
 CLASS="FUNCTION"
 >pgrowlocks</CODE
 > Output Columns</B
@@ -312,7 +312,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172390"
+NAME="AEN177241"
 >F.27.2. Sample Output</A
 ></H2
 ><PRE
@@ -331,7 +331,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172393"
+NAME="AEN177244"
 >F.27.3. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgstandby.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgstandby.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgstandby.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgstandby.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN175407"
+NAME="AEN180264"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN175411"
+NAME="AEN180268"
 ></A
 ><H2
 >Synopsis</H2
@@ -147,7 +147,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175424"
+NAME="AEN180281"
 ></A
 ><H2
 >Description</H2
@@ -326,7 +326,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175466"
+NAME="AEN180323"
 ></A
 ><H2
 >Options</H2
@@ -561,7 +561,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175540"
+NAME="AEN180397"
 ></A
 ><H2
 >Notes</H2
@@ -620,7 +620,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175556"
+NAME="AEN180413"
 ></A
 ><H2
 >Examples</H2
@@ -796,7 +796,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175605"
+NAME="AEN180462"
 ></A
 ><H2
 >Author</H2
@@ -813,7 +813,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175609"
+NAME="AEN180466"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgstatstatements.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgstatstatements.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgstatstatements.html	2016-03-28 20:21:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgstatstatements.html	2017-08-07 21:33:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -146,7 +146,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172412"
+NAME="AEN177263"
 >F.28.1. The <TT
 CLASS="STRUCTNAME"
 >pg_stat_statements</TT
@@ -163,7 +163,7 @@
    can track).  The columns of the view are shown in
    <A
 HREF="pgstatstatements.html#PGSTATSTATEMENTS-COLUMNS"
->Table F-20</A
+>Table F-22</A
 >.
   </P
 ><DIV
@@ -173,7 +173,7 @@
 ></A
 ><P
 ><B
->Table F-20. <TT
+>Table F-22. <TT
 CLASS="STRUCTNAME"
 >pg_stat_statements</TT
 > Columns</B
@@ -768,7 +768,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172635"
+NAME="AEN177486"
 >F.28.2. Functions</A
 ></H2
 ><P
@@ -852,7 +852,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172663"
+NAME="AEN177514"
 >F.28.3. Configuration Parameters</A
 ></H2
 ><P
@@ -1026,7 +1026,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172714"
+NAME="AEN177565"
 >F.28.4. Sample Output</A
 ></H2
 ><PRE
@@ -1076,7 +1076,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172717"
+NAME="AEN177568"
 >F.28.5. Authors</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgstattuple.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgstattuple.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgstattuple.html	2016-03-28 20:21:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgstattuple.html	2017-08-07 21:33:14.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -107,7 +107,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN172728"
+NAME="AEN177579"
 >F.29.1. Functions</A
 ></H2
 ><P
@@ -149,7 +149,7 @@
 ><P>
      The output columns are described in <A
 HREF="pgstattuple.html#PGSTATTUPLE-COLUMNS"
->Table F-21</A
+>Table F-23</A
 >.
     </P
 ><DIV
@@ -159,7 +159,7 @@
 ></A
 ><P
 ><B
->Table F-21. <CODE
+>Table F-23. <CODE
 CLASS="FUNCTION"
 >pgstattuple</CODE
 > Output Columns</B
@@ -307,6 +307,33 @@
 ></TBODY
 ></TABLE
 ></DIV
+><DIV
+CLASS="NOTE"
+><BLOCKQUOTE
+CLASS="NOTE"
+><P
+><B
+>Note: </B
+>        The <TT
+CLASS="LITERAL"
+>table_len</TT
+> will always be greater than the sum
+        of the <TT
+CLASS="LITERAL"
+>tuple_len</TT
+>, <TT
+CLASS="LITERAL"
+>dead_tuple_len</TT
+>
+        and <TT
+CLASS="LITERAL"
+>free_space</TT
+>. The difference is accounted for by
+        fixed page overhead, the per-page table of pointers to tuples, and
+        padding to ensure that tuples are correctly aligned. 
+      </P
+></BLOCKQUOTE
+></DIV
 ><P
 >     <CODE
 CLASS="FUNCTION"
@@ -381,7 +408,7 @@
 ><P
 ></P
 ><A
-NAME="AEN172828"
+NAME="AEN177685"
 ></A
 ><TABLE
 BORDER="1"
@@ -613,7 +640,7 @@
 ><P
 ></P
 ><A
-NAME="AEN172918"
+NAME="AEN177775"
 ></A
 ><TABLE
 BORDER="1"
@@ -743,7 +770,7 @@
 ><P>
       The output columns are described in <A
 HREF="pgstattuple.html#PGSTATAPPROX-COLUMNS"
->Table F-22</A
+>Table F-24</A
 >.
      </P
 ><P
@@ -782,7 +809,7 @@
 ></A
 ><P
 ><B
->Table F-22. <CODE
+>Table F-24. <CODE
 CLASS="FUNCTION"
 >pgstattuple_approx</CODE
 > Output Columns</B
@@ -962,7 +989,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173046"
+NAME="AEN177903"
 >F.29.2. Authors</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgtestfsync.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgtestfsync.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgtestfsync.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgtestfsync.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN98585"
+NAME="AEN98940"
 ></A
 ><H2
 >Name</H2
@@ -112,7 +112,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN98590"
+NAME="AEN98945"
 ></A
 ><H2
 >Synopsis</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98595"
+NAME="AEN98950"
 ></A
 ><H2
 >Description</H2
@@ -169,7 +169,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98604"
+NAME="AEN98959"
 ></A
 ><H2
 >Options</H2
@@ -272,7 +272,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98643"
+NAME="AEN98998"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgtesttiming.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgtesttiming.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgtesttiming.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgtesttiming.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN98656"
+NAME="AEN99011"
 ></A
 ><H2
 >Name</H2
@@ -106,7 +106,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN98659"
+NAME="AEN99014"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98664"
+NAME="AEN99019"
 ></A
 ><H2
 >Description</H2
@@ -144,7 +144,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98669"
+NAME="AEN99024"
 ></A
 ><H2
 >Options</H2
@@ -227,14 +227,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98699"
+NAME="AEN99054"
 ></A
 ><H2
 >Usage</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN98701"
+NAME="AEN99056"
 ></A
 ><H3
 >Interpreting results</H3
@@ -267,7 +267,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN98706"
+NAME="AEN99061"
 ></A
 ><H3
 >Measuring executor timing overhead</H3
@@ -307,7 +307,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN98714"
+NAME="AEN99069"
 ></A
 ><H3
 >Changing time sources</H3
@@ -394,7 +394,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN98725"
+NAME="AEN99080"
 ></A
 ><H3
 >Clock hardware and timing accuracy</H3
@@ -459,7 +459,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98734"
+NAME="AEN99089"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgtrgm.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgtrgm.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgtrgm.html	2016-03-28 20:21:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgtrgm.html	2017-08-07 21:33:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,7 +110,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173055"
+NAME="AEN177912"
 >F.30.1. Trigram (or Trigraph) Concepts</A
 ></H2
 ><P
@@ -244,7 +244,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173089"
+NAME="AEN177946"
 >F.30.2. Functions and Operators</A
 ></H2
 ><P
@@ -254,11 +254,11 @@
 > module
    are shown in <A
 HREF="pgtrgm.html#PGTRGM-FUNC-TABLE"
->Table F-23</A
+>Table F-25</A
 >, the operators
    in <A
 HREF="pgtrgm.html#PGTRGM-OP-TABLE"
->Table F-24</A
+>Table F-26</A
 >.
   </P
 ><DIV
@@ -268,7 +268,7 @@
 ></A
 ><P
 ><B
->Table F-23. <TT
+>Table F-25. <TT
 CLASS="FILENAME"
 >pg_trgm</TT
 > Functions</B
@@ -372,7 +372,7 @@
 ></A
 ><P
 ><B
->Table F-24. <TT
+>Table F-26. <TT
 CLASS="FILENAME"
 >pg_trgm</TT
 > Operators</B
@@ -457,7 +457,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173169"
+NAME="AEN178026"
 >F.30.3. Index Support</A
 ></H2
 ><P
@@ -614,7 +614,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173202"
+NAME="AEN178059"
 >F.30.4. Text Search Integration</A
 ></H2
 ><P
@@ -690,7 +690,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173217"
+NAME="AEN178074"
 >F.30.5. References</A
 ></H2
 ><P
@@ -715,7 +715,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173223"
+NAME="AEN178080"
 >F.30.6. Authors</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgupgrade.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgupgrade.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgupgrade.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgupgrade.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN98747"
+NAME="AEN99102"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN98751"
+NAME="AEN99106"
 ></A
 ><H2
 >Synopsis</H2
@@ -159,7 +159,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98772"
+NAME="AEN99127"
 ></A
 ><H2
 >Description</H2
@@ -228,7 +228,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98788"
+NAME="AEN99143"
 ></A
 ><H2
 >Options</H2
@@ -383,7 +383,7 @@
 ><DD
 ><P
 >use hard links instead of copying files to the new
-      cluster (use junction points on Windows)</P
+      cluster</P
 ></DD
 ><DT
 ><TT
@@ -574,7 +574,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98932"
+NAME="AEN99287"
 ></A
 ><H2
 >Usage</H2
@@ -714,9 +714,10 @@
 >
      or some other source. Do not install the schema definitions, e.g.
      <TT
-CLASS="FILENAME"
->pgcrypto.sql</TT
->, because these will be upgraded from the old cluster.
+CLASS="COMMAND"
+>CREATE EXTENSION pgcrypto</TT
+>, because these will be upgraded
+     from the old cluster.
      Also, any custom full text search files (dictionary, synonym,
      thesaurus, stop words) must also be copied to the new cluster.
     </P
@@ -781,21 +782,35 @@
 CLASS="STEP"
 ><P
 ><B
->Verify standby servers</B
+>Prepare for standby server upgrades</B
 ></P
 ><P
->     If you are upgrading Streaming Replication and Log-Shipping standby
-     servers, verify that the old standby servers are caught up by running
-     <SPAN
+>     If you are upgrading standby servers (as outlined in section <A
+HREF="pgupgrade.html#PGUPGRADE-STEP-REPLICAS"
+>step 10</A
+>), verify that the old standby
+     servers are caught up by running <SPAN
 CLASS="APPLICATION"
 >pg_controldata</SPAN
-> against the old primary and standby
-     clusters.  Verify that the <SPAN
+>
+     against the old primary and standby clusters.  Verify that the
+     <SPAN
 CLASS="QUOTE"
 >"Latest checkpoint location"</SPAN
+> values match in all clusters.
+     (There will be a mismatch if old standby servers were shut down
+     before the old primary.)
+    </P
+><P
+>     Also, if upgrading standby servers, change <TT
+CLASS="VARNAME"
+>wal_level</TT
 >
-     values match in all clusters.  (There will be a mismatch if old
-     standby servers were shut down before the old primary.)
+     in the <TT
+CLASS="FILENAME"
+>postgresql.conf</TT
+> file on the new master cluster
+     to match the value you used in the old cluster.
     </P
 ></LI
 ><LI
@@ -943,10 +958,12 @@
 ></LI
 ><LI
 CLASS="STEP"
+><A
+NAME="PGUPGRADE-STEP-REPLICAS"
+></A
 ><P
 ><B
->Upgrade Streaming Replication and Log-Shipping standby
-    servers</B
+>Upgrade Streaming Replication and Log-Shipping standby servers</B
 ></P
 ><P
 >     If you have Streaming Replication (see <A
@@ -990,8 +1007,7 @@
 CLASS="EMPHASIS"
 >not</I
 ></SPAN
->
-      exist</B
+> exist</B
 ></P
 ><P
 >       Make sure the new standby data directories do <SPAN
@@ -1052,27 +1068,6 @@
 CLASS="STEP"
 ><P
 ><B
->Start and stop the new master cluster</B
-></P
-><P
->       In the new master cluster, change <TT
-CLASS="VARNAME"
->wal_level</TT
-> to
-       <TT
-CLASS="LITERAL"
->hot_standby</TT
-> in the <TT
-CLASS="FILENAME"
->postgresql.conf</TT
-> file
-       and then start and stop the cluster.
-      </P
-></LI
-><LI
-CLASS="STEP"
-><P
-><B
 >Run <SPAN
 CLASS="APPLICATION"
 >rsync</SPAN
@@ -1148,8 +1143,7 @@
 CLASS="STEP"
 ><P
 ><B
->Configure streaming replication and log-shipping standby
-      servers</B
+>Configure streaming replication and log-shipping standby servers</B
 ></P
 ><P
 >       Configure the servers for log shipping.  (You do not need to run
@@ -1384,7 +1378,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99126"
+NAME="AEN99479"
 ></A
 ><H2
 >Notes</H2
@@ -1502,7 +1496,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99154"
+NAME="AEN99507"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pgxlogdump.html postgresql-9.5-9.5.8/doc/src/sgml/html/pgxlogdump.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pgxlogdump.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pgxlogdump.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Server Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,18 +98,18 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN99173"
+NAME="AEN99526"
 ></A
 ><H2
 >Name</H2
->pg_xlogdump&nbsp;--&nbsp;Display a human-readable rendering of the write-ahead log of a <SPAN
+>pg_xlogdump&nbsp;--&nbsp;display a human-readable rendering of the write-ahead log of a <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
 > database cluster</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN99177"
+NAME="AEN99530"
 ></A
 ><H2
 >Synopsis</H2
@@ -152,7 +152,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99191"
+NAME="AEN99544"
 ></A
 ><H2
 >Options</H2
@@ -355,7 +355,7 @@
 ></TT
 ><BR><TT
 CLASS="OPTION"
->--timelime=<TT
+>--timeline=<TT
 CLASS="REPLACEABLE"
 ><I
 >timeline</I
@@ -451,7 +451,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99308"
+NAME="AEN99661"
 ></A
 ><H2
 >Notes</H2
@@ -480,7 +480,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN99316"
+NAME="AEN99669"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/planner-optimizer.html postgresql-9.5-9.5.8/doc/src/sgml/html/planner-optimizer.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/planner-optimizer.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/planner-optimizer.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Overview of PostgreSQL Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -158,7 +158,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN99994"
+NAME="AEN100342"
 >48.5.1. Generating Possible Plans</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/planner-stats-details.html postgresql-9.5-9.5.8/doc/src/sgml/html/planner-stats-details.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/planner-stats-details.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/planner-stats-details.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -94,6 +94,25 @@
 NAME="PLANNER-STATS-DETAILS"
 ></A
 >Chapter 65. How the Planner Uses Statistics</H1
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+>65.1. <A
+HREF="row-estimation-examples.html"
+>Row Estimation Examples</A
+></DT
+><DT
+>65.2. <A
+HREF="planner-stats-security.html"
+>Planner Statistics and Security</A
+></DT
+></DL
+></DIV
 ><P
 >   This chapter builds on the material covered in <A
 HREF="using-explain.html"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/planner-stats.html postgresql-9.5-9.5.8/doc/src/sgml/html/planner-stats.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/planner-stats.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/planner-stats.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Performance Tips"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/planner-stats-security.html postgresql-9.5-9.5.8/doc/src/sgml/html/planner-stats-security.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/planner-stats-security.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/planner-stats-security.html	2017-08-07 21:32:34.000000000 +0000
@@ -0,0 +1,236 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Planner Statistics and Security</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="How the Planner Uses Statistics"
+HREF="planner-stats-details.html"><LINK
+REL="PREVIOUS"
+TITLE="Row Estimation Examples"
+HREF="row-estimation-examples.html"><LINK
+REL="NEXT"
+TITLE="Appendixes"
+HREF="appendixes.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Row Estimation Examples"
+HREF="row-estimation-examples.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="planner-stats-details.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 65. How the Planner Uses Statistics</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Appendixes"
+HREF="appendixes.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="PLANNER-STATS-SECURITY"
+>65.2. Planner Statistics and Security</A
+></H1
+><P
+>   Access to the table <TT
+CLASS="STRUCTNAME"
+>pg_statistic</TT
+> is restricted to
+   superusers, so that ordinary users cannot learn about the contents of the
+   tables of other users from it.  Some selectivity estimation functions will
+   use a user-provided operator (either the operator appearing in the query or
+   a related operator) to analyze the stored statistics.  For example, in order
+   to determine whether a stored most common value is applicable, the
+   selectivity estimator will have to run the appropriate <TT
+CLASS="LITERAL"
+>=</TT
+>
+   operator to compare the constant in the query to the stored value.
+   Thus the data in <TT
+CLASS="STRUCTNAME"
+>pg_statistic</TT
+> is potentially
+   passed to user-defined operators.  An appropriately crafted operator can
+   intentionally leak the passed operands (for example, by logging them
+   or writing them to a different table), or accidentally leak them by showing
+   their values in error messages, in either case possibly exposing data from
+   <TT
+CLASS="STRUCTNAME"
+>pg_statistic</TT
+> to a user who should not be able to
+   see it.
+  </P
+><P
+>   In order to prevent this, the following applies to all built-in selectivity
+   estimation functions.  When planning a query, in order to be able to use
+   stored statistics, the current user must either
+   have <TT
+CLASS="LITERAL"
+>SELECT</TT
+> privilege on the table or the involved
+   columns, or the operator used must be <TT
+CLASS="LITERAL"
+>LEAKPROOF</TT
+> (more
+   accurately, the function that the operator is based on).  If not, then the
+   selectivity estimator will behave as if no statistics are available, and
+   the planner will proceed with default or fall-back assumptions.
+  </P
+><P
+>   If a user does not have the required privilege on the table or columns,
+   then in many cases the query will ultimately receive a permission-denied
+   error, in which case this mechanism is invisible in practice.  But if the
+   user is reading from a security-barrier view, then the planner might wish
+   to check the statistics of an underlying table that is otherwise
+   inaccessible to the user.  In that case, the operator should be leak-proof
+   or the statistics will not be used.  There is no direct feedback about
+   that, except that the plan might be suboptimal.  If one suspects that this
+   is the case, one could try running the query as a more privileged user,
+   to see if a different plan results.
+  </P
+><P
+>   This restriction applies only to cases where the planner would need to
+   execute a user-defined operator on one or more values
+   from <TT
+CLASS="STRUCTNAME"
+>pg_statistic</TT
+>.  Thus the planner is permitted
+   to use generic statistical information, such as the fraction of null values
+   or the number of distinct values in a column, regardless of access
+   privileges.
+  </P
+><P
+>   Selectivity estimation functions contained in third-party extensions that
+   potentially operate on statistics with user-defined operators should follow
+   the same security rules.  Consult the PostgreSQL source code for guidance.
+  </P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="row-estimation-examples.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="appendixes.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Row Estimation Examples</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="planner-stats-details.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Appendixes</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plhandler.html postgresql-9.5-9.5.8/doc/src/sgml/html/plhandler.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plhandler.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plhandler.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-builtins.html postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-builtins.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-builtins.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-builtins.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Perl - Perl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-data.html postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-data.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-data.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-data.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Perl - Perl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-event-triggers.html postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-event-triggers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-event-triggers.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-event-triggers.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Perl - Perl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-funcs.html postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-funcs.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-funcs.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-funcs.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Perl - Perl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-global.html postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-global.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-global.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-global.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Perl - Perl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plperl.html postgresql-9.5-9.5.8/doc/src/sgml/html/plperl.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plperl.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plperl.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-triggers.html postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-triggers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-triggers.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-triggers.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Perl - Perl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-trusted.html postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-trusted.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-trusted.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-trusted.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Perl - Perl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-under-the-hood.html postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-under-the-hood.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plperl-under-the-hood.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plperl-under-the-hood.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Perl - Perl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-control-structures.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-control-structures.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-control-structures.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-control-structures.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -141,7 +141,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62554"
+NAME="AEN62846"
 >40.6.1.1. <TT
 CLASS="COMMAND"
 >RETURN</TT
@@ -241,7 +241,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62576"
+NAME="AEN62868"
 >40.6.1.2. <TT
 CLASS="COMMAND"
 >RETURN NEXT</TT
@@ -551,21 +551,21 @@
 ><P
 ><TT
 CLASS="LITERAL"
->IF ... THEN</TT
+>IF ... THEN ... END IF</TT
 ></P
 ></LI
 ><LI
 ><P
 ><TT
 CLASS="LITERAL"
->IF ... THEN ... ELSE</TT
+>IF ... THEN ... ELSE ... END IF</TT
 ></P
 ></LI
 ><LI
 ><P
 ><TT
 CLASS="LITERAL"
->IF ... THEN ... ELSIF ... THEN ... ELSE</TT
+>IF ... THEN ... ELSIF ... THEN ... ELSE ... END IF</TT
 ></P
 ></LI
 ></UL
@@ -600,7 +600,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62661"
+NAME="AEN62953"
 >40.6.2.1. <TT
 CLASS="LITERAL"
 >IF-THEN</TT
@@ -655,7 +655,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62674"
+NAME="AEN62966"
 >40.6.2.2. <TT
 CLASS="LITERAL"
 >IF-THEN-ELSE</TT
@@ -724,7 +724,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62687"
+NAME="AEN62979"
 >40.6.2.3. <TT
 CLASS="LITERAL"
 >IF-THEN-ELSIF</TT
@@ -888,7 +888,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62721"
+NAME="AEN63013"
 >40.6.2.4. Simple <TT
 CLASS="LITERAL"
 >CASE</TT
@@ -1036,7 +1036,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62753"
+NAME="AEN63045"
 >40.6.2.5. Searched <TT
 CLASS="LITERAL"
 >CASE</TT
@@ -1206,7 +1206,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62795"
+NAME="AEN63087"
 >40.6.3.1. <TT
 CLASS="LITERAL"
 >LOOP</TT
@@ -1273,7 +1273,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62811"
+NAME="AEN63103"
 >40.6.3.2. <TT
 CLASS="LITERAL"
 >EXIT</TT
@@ -1410,7 +1410,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62843"
+NAME="AEN63135"
 >40.6.3.3. <TT
 CLASS="LITERAL"
 >CONTINUE</TT
@@ -1497,7 +1497,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN62865"
+NAME="AEN63157"
 >40.6.3.4. <TT
 CLASS="LITERAL"
 >WHILE</TT
@@ -2577,11 +2577,17 @@
 >item</I
 ></TT
 > is a key word identifying a status
-     value to be assigned to the specified variable (which should be
-     of the right data type to receive it).  The currently available
-     status items are shown in <A
+     value to be assigned to the specified <TT
+CLASS="REPLACEABLE"
+><I
+>variable</I
+></TT
+>
+     (which should be of the right data type to receive it).  The currently
+     available status items are shown
+     in <A
 HREF="plpgsql-control-structures.html#PLPGSQL-EXCEPTION-DIAGNOSTICS-VALUES"
->Table 40-1</A
+>Table 40-2</A
 >.
     </P
 ><DIV
@@ -2591,7 +2597,7 @@
 ></A
 ><P
 ><B
->Table 40-1. Error Diagnostics Values</B
+>Table 40-2. Error Diagnostics Items</B
 ></P
 ><TABLE
 BORDER="1"
@@ -2614,7 +2620,10 @@
 >RETURNED_SQLSTATE</TT
 ></TD
 ><TD
->text</TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
 ><TD
 >the SQLSTATE error code of the exception</TD
 ></TR
@@ -2625,7 +2634,10 @@
 >COLUMN_NAME</TT
 ></TD
 ><TD
->text</TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
 ><TD
 >the name of the column related to exception</TD
 ></TR
@@ -2636,7 +2648,10 @@
 >CONSTRAINT_NAME</TT
 ></TD
 ><TD
->text</TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
 ><TD
 >the name of the constraint related to exception</TD
 ></TR
@@ -2647,7 +2662,10 @@
 >PG_DATATYPE_NAME</TT
 ></TD
 ><TD
->text</TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
 ><TD
 >the name of the data type related to exception</TD
 ></TR
@@ -2658,7 +2676,10 @@
 >MESSAGE_TEXT</TT
 ></TD
 ><TD
->text</TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
 ><TD
 >the text of the exception's primary message</TD
 ></TR
@@ -2669,7 +2690,10 @@
 >TABLE_NAME</TT
 ></TD
 ><TD
->text</TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
 ><TD
 >the name of the table related to exception</TD
 ></TR
@@ -2680,7 +2704,10 @@
 >SCHEMA_NAME</TT
 ></TD
 ><TD
->text</TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
 ><TD
 >the name of the schema related to exception</TD
 ></TR
@@ -2691,7 +2718,10 @@
 >PG_EXCEPTION_DETAIL</TT
 ></TD
 ><TD
->text</TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
 ><TD
 >the text of the exception's detail message, if any</TD
 ></TR
@@ -2702,7 +2732,10 @@
 >PG_EXCEPTION_HINT</TT
 ></TD
 ><TD
->text</TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
 ><TD
 >the text of the exception's hint message, if any</TD
 ></TR
@@ -2713,9 +2746,16 @@
 >PG_EXCEPTION_CONTEXT</TT
 ></TD
 ><TD
->text</TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
 ><TD
->line(s) of text describing the call stack</TD
+>line(s) of text describing the call stack at the time of the
+          exception (see <A
+HREF="plpgsql-control-structures.html#PLPGSQL-CALL-STACK"
+>Section 40.6.7</A
+>)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2749,52 +2789,34 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="PLPGSQL-GET-DIAGNOSTICS-CONTEXT"
->40.6.7. Obtaining Current Execution Information</A
+NAME="PLPGSQL-CALL-STACK"
+>40.6.7. Obtaining Execution Location Information</A
 ></H2
 ><P
 >    The <TT
 CLASS="COMMAND"
->GET [<SPAN
-CLASS="OPTIONAL"
-> CURRENT </SPAN
->] DIAGNOSTICS</TT
+>GET DIAGNOSTICS</TT
+> command, previously described
+    in <A
+HREF="plpgsql-statements.html#PLPGSQL-STATEMENTS-DIAGNOSTICS"
+>Section 40.5.5</A
+>, retrieves information
+    about current execution state (whereas the <TT
+CLASS="COMMAND"
+>GET STACKED
+    DIAGNOSTICS</TT
+> command discussed above reports information about
+    the execution state as of a previous error).  Its <TT
+CLASS="LITERAL"
+>PG_CONTEXT</TT
 >
-    command retrieves information about current execution state (whereas
-    the <TT
-CLASS="COMMAND"
->GET STACKED DIAGNOSTICS</TT
-> command discussed above
-    reports information about the execution state as of a previous error).
-    This command has the form:
-   </P
-><PRE
-CLASS="SYNOPSIS"
->GET [<SPAN
-CLASS="OPTIONAL"
-> CURRENT </SPAN
->] DIAGNOSTICS <TT
-CLASS="REPLACEABLE"
-><I
->variable</I
-></TT
-> { = | := } <TT
-CLASS="REPLACEABLE"
-><I
->item</I
-></TT
-> [<SPAN
-CLASS="OPTIONAL"
-> , ... </SPAN
->];</PRE
-><P
->    Currently only one information item is supported.  Status
-    item <TT
+    status item is useful for identifying the current execution
+    location.  <TT
 CLASS="LITERAL"
 >PG_CONTEXT</TT
-> will return a text string with line(s) of
-    text describing the call stack.  The first line refers to the
-    current function and currently executing <TT
+> returns a text string with line(s)
+    of text describing the call stack.  The first line refers to the current
+    function and currently executing <TT
 CLASS="COMMAND"
 >GET DIAGNOSTICS</TT
 >
@@ -2832,6 +2854,14 @@
 ><P>
 
    </P
+><P
+>    <TT
+CLASS="LITERAL"
+>GET STACKED DIAGNOSTICS ... PG_EXCEPTION_CONTEXT</TT
+>
+    returns the same sort of stack trace, but describing the location
+    at which an error was detected, rather than the current location.
+   </P
 ></DIV
 ></DIV
 ><DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-cursors.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-cursors.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-cursors.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-cursors.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -305,7 +305,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN63216"
+NAME="AEN63517"
 >40.7.2.1. <TT
 CLASS="COMMAND"
 >OPEN FOR</TT
@@ -393,7 +393,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN63237"
+NAME="AEN63538"
 >40.7.2.2. <TT
 CLASS="COMMAND"
 >OPEN FOR EXECUTE</TT
@@ -662,7 +662,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN63300"
+NAME="AEN63601"
 >40.7.3.1. <TT
 CLASS="LITERAL"
 >FETCH</TT
@@ -815,7 +815,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN63335"
+NAME="AEN63636"
 >40.7.3.2. <TT
 CLASS="LITERAL"
 >MOVE</TT
@@ -978,7 +978,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN63374"
+NAME="AEN63675"
 >40.7.3.3. <TT
 CLASS="LITERAL"
 >UPDATE/DELETE WHERE CURRENT OF</TT
@@ -1036,7 +1036,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN63387"
+NAME="AEN63688"
 >40.7.3.4. <TT
 CLASS="LITERAL"
 >CLOSE</TT
@@ -1071,7 +1071,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN63396"
+NAME="AEN63697"
 >40.7.3.5. Returning Cursors</A
 ></H3
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-declarations.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-declarations.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-declarations.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-declarations.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-development-tips.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-development-tips.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-development-tips.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-development-tips.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-errors-and-messages.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-errors-and-messages.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-errors-and-messages.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-errors-and-messages.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-expressions.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-expressions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-expressions.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-expressions.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -265,8 +265,8 @@
 ></DT
 ><DT
 >40.6.7. <A
-HREF="plpgsql-control-structures.html#PLPGSQL-GET-DIAGNOSTICS-CONTEXT"
->Obtaining Current Execution Information</A
+HREF="plpgsql-control-structures.html#PLPGSQL-CALL-STACK"
+>Obtaining Execution Location Information</A
 ></DT
 ></DL
 ></DD
@@ -393,7 +393,7 @@
 ><DL
 ><DT
 >40.12.1. <A
-HREF="plpgsql-porting.html#AEN64110"
+HREF="plpgsql-porting.html#AEN64411"
 >Porting Examples</A
 ></DT
 ><DT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-implementation.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-implementation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-implementation.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-implementation.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-overview.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-overview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-overview.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-overview.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-porting.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-porting.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-porting.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-porting.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -259,7 +259,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN64110"
+NAME="AEN64411"
 >40.12.1. Porting Examples</A
 ></H2
 ><P
@@ -1051,7 +1051,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN64254"
+NAME="AEN64555"
 >40.12.2.2. <TT
 CLASS="COMMAND"
 >EXECUTE</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-statements.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-statements.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-statements.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-statements.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -1329,62 +1329,134 @@
 >];</PRE
 ><P>
 
-     This command allows retrieval of system status indicators.  Each
+     This command allows retrieval of system status indicators.
      <TT
+CLASS="LITERAL"
+>CURRENT</TT
+> is a noise word (but see also <TT
+CLASS="COMMAND"
+>GET STACKED
+     DIAGNOSTICS</TT
+> in <A
+HREF="plpgsql-control-structures.html#PLPGSQL-EXCEPTION-DIAGNOSTICS"
+>Section 40.6.6.1</A
+>).
+     Each <TT
 CLASS="REPLACEABLE"
 ><I
 >item</I
 ></TT
 > is a key word identifying a status
-     value to be assigned to the specified variable (which should be
-     of the right data type to receive it).  The currently available
-     status items are <TT
+     value to be assigned to the specified <TT
+CLASS="REPLACEABLE"
+><I
+>variable</I
+></TT
+>
+     (which should be of the right data type to receive it).  The currently
+     available status items are shown
+     in <A
+HREF="plpgsql-statements.html#PLPGSQL-CURRENT-DIAGNOSTICS-VALUES"
+>Table 40-1</A
+>.  Colon-equal
+     (<TT
+CLASS="LITERAL"
+>:=</TT
+>) can be used instead of the SQL-standard <TT
+CLASS="LITERAL"
+>=</TT
+>
+     token.  An example:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>GET DIAGNOSTICS integer_var = ROW_COUNT;</PRE
+><P>
+    </P
+><DIV
+CLASS="TABLE"
+><A
+NAME="PLPGSQL-CURRENT-DIAGNOSTICS-VALUES"
+></A
+><P
+><B
+>Table 40-1. Available Diagnostics Items</B
+></P
+><TABLE
+BORDER="1"
+CLASS="CALSTABLE"
+><COL><COL><COL><THEAD
+><TR
+><TH
+>Name</TH
+><TH
+>Type</TH
+><TH
+>Description</TH
+></TR
+></THEAD
+><TBODY
+><TR
+><TD
+><TT
 CLASS="VARNAME"
 >ROW_COUNT</TT
->, the number of rows
-     processed by the last <ACRONYM
-CLASS="ACRONYM"
->SQL</ACRONYM
-> command sent to
-     the <ACRONYM
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>integer</TT
+></TD
+><TD
+>the number of rows processed by the most
+          recent <ACRONYM
 CLASS="ACRONYM"
 >SQL</ACRONYM
-> engine, and <TT
+> command</TD
+></TR
+><TR
+><TD
+><TT
 CLASS="VARNAME"
 >RESULT_OID</TT
->,
-     the OID of the last row inserted by the most recent
-     <ACRONYM
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>oid</TT
+></TD
+><TD
+>the OID of the last row inserted by the most
+          recent <ACRONYM
 CLASS="ACRONYM"
 >SQL</ACRONYM
-> command.  Note that <TT
-CLASS="VARNAME"
->RESULT_OID</TT
->
-     is only useful after an <TT
+> command (only useful after
+          an <TT
 CLASS="COMMAND"
 >INSERT</TT
-> command into a
-     table containing OIDs.
-     Colon-equal (<TT
-CLASS="LITERAL"
->:=</TT
->) can be used instead of SQL-standard
-     <TT
+> command into a table having
+          OIDs)</TD
+></TR
+><TR
+><TD
+><TT
 CLASS="LITERAL"
->=</TT
-> for <TT
-CLASS="COMMAND"
->GET DIAGNOSTICS</TT
->.
-    </P
-><P
->     An example:
-</P><PRE
-CLASS="PROGRAMLISTING"
->GET DIAGNOSTICS integer_var = ROW_COUNT;</PRE
-><P>
-    </P
+>PG_CONTEXT</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
+><TD
+>line(s) of text describing the current call stack
+          (see <A
+HREF="plpgsql-control-structures.html#PLPGSQL-CALL-STACK"
+>Section 40.6.7</A
+>)</TD
+></TR
+></TBODY
+></TABLE
+></DIV
 ><P
 >     The second method to determine the effects of a command is to check the
      special variable named <TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-structure.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-structure.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-structure.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-structure.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -105,11 +105,46 @@
 ></A
 ></H1
 ><P
+>   Functions written in <SPAN
+CLASS="APPLICATION"
+>PL/pgSQL</SPAN
+> are defined
+   to the server by executing <A
+HREF="sql-createfunction.html"
+>CREATE FUNCTION</A
+> commands.
+   Such a command would normally look like, say,
+</P><PRE
+CLASS="PROGRAMLISTING"
+>CREATE FUNCTION somefunc(integer, text) RETURNS integer
+AS '<TT
+CLASS="REPLACEABLE"
+><I
+>function body text</I
+></TT
+>'
+LANGUAGE plpgsql;</PRE
+><P>
+   The function body is simply a string literal so far as <TT
+CLASS="COMMAND"
+>CREATE
+   FUNCTION</TT
+> is concerned.  It is often helpful to use dollar quoting
+   (see <A
+HREF="sql-syntax-lexical.html#SQL-SYNTAX-DOLLAR-QUOTING"
+>Section 4.1.2.4</A
+>) to write the function
+   body, rather than the normal single quote syntax.  Without dollar quoting,
+   any single quotes or backslashes in the function body must be escaped by
+   doubling them.  Almost all the examples in this chapter use dollar-quoted
+   literals for their function bodies.
+  </P
+><P
 >   <SPAN
 CLASS="APPLICATION"
 >PL/pgSQL</SPAN
 > is a block-structured language.
-   The complete text of a function definition must be a
+   The complete text of a function body must be a
    <I
 CLASS="FIRSTTERM"
 >block</I
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-trigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-trigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpgsql-trigger.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpgsql-trigger.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/pgSQL - SQL Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -972,7 +972,7 @@
 >    When a <SPAN
 CLASS="APPLICATION"
 >PL/pgSQL</SPAN
-> function is called as a
+> function is called as an
     event trigger, several special variables are created automatically
     in the top-level block. They are:
 
@@ -1017,7 +1017,7 @@
 >    <A
 HREF="plpgsql-trigger.html#PLPGSQL-EVENT-TRIGGER-EXAMPLE"
 >Example 40-7</A
-> shows an example of a
+> shows an example of an
     event trigger procedure in <SPAN
 CLASS="APPLICATION"
 >PL/pgSQL</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-database.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-database.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-database.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-database.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Python - Python Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -117,7 +117,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN65687"
+NAME="AEN65997"
 >43.7.1. Database Access Functions</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-data.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-data.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-data.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-data.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Python - Python Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,7 +109,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN65441"
+NAME="AEN65751"
 >43.3.1. Data Type Mapping</A
 ></H2
 ><P
@@ -340,7 +340,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN65503"
+NAME="AEN65813"
 >43.3.2. Null, None</A
 ></H2
 ><P
@@ -442,7 +442,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN65521"
+NAME="AEN65831"
 >43.3.4. Composite Types</A
 ></H2
 ><P
@@ -598,7 +598,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN65550"
+NAME="AEN65860"
 >43.3.5. Set-returning Functions</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-do.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-do.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-do.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-do.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Python - Python Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-envar.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-envar.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-envar.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-envar.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Python - Python Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-funcs.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-funcs.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-funcs.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-funcs.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Python - Python Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -120,12 +120,12 @@
 ><DL
 ><DT
 >43.3.1. <A
-HREF="plpython-data.html#AEN65441"
+HREF="plpython-data.html#AEN65751"
 >Data Type Mapping</A
 ></DT
 ><DT
 >43.3.2. <A
-HREF="plpython-data.html#AEN65503"
+HREF="plpython-data.html#AEN65813"
 >Null, None</A
 ></DT
 ><DT
@@ -135,12 +135,12 @@
 ></DT
 ><DT
 >43.3.4. <A
-HREF="plpython-data.html#AEN65521"
+HREF="plpython-data.html#AEN65831"
 >Composite Types</A
 ></DT
 ><DT
 >43.3.5. <A
-HREF="plpython-data.html#AEN65550"
+HREF="plpython-data.html#AEN65860"
 >Set-returning Functions</A
 ></DT
 ></DL
@@ -169,7 +169,7 @@
 ><DL
 ><DT
 >43.7.1. <A
-HREF="plpython-database.html#AEN65687"
+HREF="plpython-database.html#AEN65997"
 >Database Access Functions</A
 ></DT
 ><DT
@@ -188,12 +188,12 @@
 ><DL
 ><DT
 >43.8.1. <A
-HREF="plpython-subtransaction.html#AEN65846"
+HREF="plpython-subtransaction.html#AEN66156"
 >Subtransaction Context Managers</A
 ></DT
 ><DT
 >43.8.2. <A
-HREF="plpython-subtransaction.html#AEN65861"
+HREF="plpython-subtransaction.html#AEN66171"
 >Older Python Versions</A
 ></DT
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-python23.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-python23.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-python23.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-python23.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Python - Python Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-sharing.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-sharing.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-sharing.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-sharing.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Python - Python Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-subtransaction.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-subtransaction.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-subtransaction.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-subtransaction.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Python - Python Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -111,7 +111,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN65846"
+NAME="AEN66156"
 >43.8.1. Subtransaction Context Managers</A
 ></H2
 ><P
@@ -210,7 +210,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN65861"
+NAME="AEN66171"
 >43.8.2. Older Python Versions</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-trigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-trigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-trigger.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-trigger.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Python - Python Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-util.html postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-util.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/plpython-util.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/plpython-util.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Python - Python Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-data.html postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-data.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-data.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-data.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Tcl - Tcl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-dbaccess.html postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-dbaccess.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-dbaccess.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-dbaccess.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Tcl - Tcl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -187,8 +187,17 @@
 CLASS="LITERAL"
 >-array</TT
 > option is given, the column values are
-        instead stored into the named associative array, with the
-        column names used as array indexes.
+        instead stored into elements of the named associative array, with the
+        column names used as array indexes.  In addition, the current row
+        number within the result (counting from zero) is stored into the array
+        element named <SPAN
+CLASS="QUOTE"
+>"<TT
+CLASS="LITERAL"
+>.tupno</TT
+>"</SPAN
+>, unless that name is
+        in use as a column name in the result.
        </P
 ><P
 >        If the command is a <TT
@@ -201,18 +210,17 @@
 ></TT
 >
         script is given, then only the first row of results are stored into
-        Tcl variables; remaining rows, if any, are ignored.  No storing occurs
-        if the
-        query returns no rows.  (This case can be detected by checking the
-        result of <CODE
+        Tcl variables or array elements; remaining rows, if any, are ignored.
+        No storing occurs if the query returns no rows.  (This case can be
+        detected by checking the result of <CODE
 CLASS="FUNCTION"
 >spi_exec</CODE
->.)  For example:
+>.)
+        For example:
 </P><PRE
 CLASS="PROGRAMLISTING"
 >spi_exec "SELECT count(*) AS cnt FROM pg_proc"</PRE
 ><P>
-
         will set the Tcl variable <TT
 CLASS="LITERAL"
 >$cnt</TT
@@ -239,16 +247,16 @@
         command is not a <TT
 CLASS="COMMAND"
 >SELECT</TT
->.)  The values of the current row's columns
-        are stored into Tcl variables before each iteration.  For example:
-
+>.)
+        The values of the current row's columns
+        are stored into Tcl variables or array elements before each iteration.
+        For example:
 </P><PRE
 CLASS="PROGRAMLISTING"
 >spi_exec -array C "SELECT * FROM pg_class" {
     elog DEBUG "have table $C(relname)"
 }</PRE
 ><P>
-
         will print a log message for every row of <TT
 CLASS="LITERAL"
 >pg_class</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-event-trigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-event-trigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-event-trigger.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-event-trigger.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Tcl - Tcl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-functions.html postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-functions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-functions.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-functions.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Tcl - Tcl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-global.html postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-global.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-global.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-global.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Tcl - Tcl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl.html postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-overview.html postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-overview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-overview.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-overview.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Tcl - Tcl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-procnames.html postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-procnames.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-procnames.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-procnames.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Tcl - Tcl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-trigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-trigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-trigger.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-trigger.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Tcl - Tcl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -333,11 +333,8 @@
 > or <TT
 CLASS="LITERAL"
 >SKIP</TT
->, or a list as returned by the
-     <TT
-CLASS="LITERAL"
->array get</TT
-> Tcl command. If the return value is <TT
+>, or a list of column name/value pairs.
+     If the return value is <TT
 CLASS="LITERAL"
 >OK</TT
 >,
@@ -350,13 +347,17 @@
 >/<TT
 CLASS="COMMAND"
 >DELETE</TT
->) that fired the trigger will proceed
+>)
+     that fired the trigger will proceed
      normally. <TT
 CLASS="LITERAL"
 >SKIP</TT
 > tells the trigger manager to silently suppress
      the operation for this row. If a list is returned, it tells PL/Tcl to
-     return a modified row to the trigger manager. This is only meaningful
+     return a modified row to the trigger manager; the contents of the
+     modified row are specified by the column names and values in the list.
+     Any columns not mentioned in the list are set to null.
+     Returning a modified row is only meaningful
      for row-level <TT
 CLASS="LITERAL"
 >BEFORE</TT
@@ -367,7 +368,7 @@
 CLASS="COMMAND"
 >UPDATE</TT
 >
-     triggers for which the modified row will be inserted instead of the one
+     triggers, for which the modified row will be inserted instead of the one
      given in <TT
 CLASS="VARNAME"
 >$NEW</TT
@@ -382,16 +383,49 @@
 CLASS="COMMAND"
 >UPDATE</TT
 > triggers where the returned row
-     is used to support <TT
+     is used as the source data for <TT
 CLASS="COMMAND"
 >INSERT RETURNING</TT
-> and
+> or
      <TT
 CLASS="COMMAND"
 >UPDATE RETURNING</TT
-> commands. The return value is ignored for
-     other types of triggers.
+> clauses.
+     In row-level <TT
+CLASS="LITERAL"
+>BEFORE</TT
+> <TT
+CLASS="COMMAND"
+>DELETE</TT
+> or <TT
+CLASS="LITERAL"
+>INSTEAD
+     OF</TT
+> <TT
+CLASS="COMMAND"
+>DELETE</TT
+> triggers, returning a modified row has the same
+     effect as returning <TT
+CLASS="LITERAL"
+>OK</TT
+>, that is the operation proceeds.
+     The trigger return value is ignored for all other types of triggers.
     </P
+><DIV
+CLASS="TIP"
+><BLOCKQUOTE
+CLASS="TIP"
+><P
+><B
+>Tip: </B
+>      The result list can be made from an array representation of the
+      modified tuple with the <TT
+CLASS="LITERAL"
+>array get</TT
+> Tcl command.
+     </P
+></BLOCKQUOTE
+></DIV
 ><P
 >     Here's a little example trigger procedure that forces an integer value
      in a table to keep track of the number of updates that are performed on the
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-unknown.html postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-unknown.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/pltcl-unknown.html	2016-03-28 20:20:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/pltcl-unknown.html	2017-08-07 21:32:17.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PL/Tcl - Tcl Procedural Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/populate.html postgresql-9.5-9.5.8/doc/src/sgml/html/populate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/populate.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/populate.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Performance Tips"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -703,8 +703,8 @@
     keys.
 
      <A
-NAME="AEN27484"
-HREF="#FTN.AEN27484"
+NAME="AEN27723"
+HREF="#FTN.AEN27723"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
@@ -751,8 +751,8 @@
 VALIGN="TOP"
 WIDTH="5%"
 ><A
-NAME="FTN.AEN27484"
-HREF="populate.html#AEN27484"
+NAME="FTN.AEN27723"
+HREF="populate.html#AEN27723"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/postgres-fdw.html postgresql-9.5-9.5.8/doc/src/sgml/html/postgres-fdw.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/postgres-fdw.html	2016-03-28 20:21:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/postgres-fdw.html	2017-08-07 21:33:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -260,7 +260,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173277"
+NAME="AEN178134"
 >F.31.1. FDW Options of postgres_fdw</A
 ></H2
 ><DIV
@@ -268,7 +268,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173279"
+NAME="AEN178136"
 >F.31.1.1. Connection Options</A
 ></H3
 ><P
@@ -340,7 +340,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173299"
+NAME="AEN178156"
 >F.31.1.2. Object Name Options</A
 ></H3
 ><P
@@ -401,7 +401,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173319"
+NAME="AEN178176"
 >F.31.1.3. Cost Estimation Options</A
 ></H3
 ><P
@@ -539,7 +539,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173355"
+NAME="AEN178212"
 >F.31.1.4. Updatability Options</A
 ></H3
 ><P
@@ -607,7 +607,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173373"
+NAME="AEN178230"
 >F.31.1.5. Importing Options</A
 ></H3
 ><P
@@ -747,7 +747,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173412"
+NAME="AEN178269"
 >F.31.2. Connection Management</A
 ></H2
 ><P
@@ -767,7 +767,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173416"
+NAME="AEN178273"
 >F.31.3. Transaction Management</A
 ></H2
 ><P
@@ -823,7 +823,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173428"
+NAME="AEN178285"
 >F.31.4. Remote Query Optimization</A
 ></H2
 ><P
@@ -861,7 +861,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173437"
+NAME="AEN178294"
 >F.31.5. Remote Query Execution Environment</A
 ></H2
 ><P
@@ -946,7 +946,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173457"
+NAME="AEN178314"
 >F.31.6. Cross-Version Compatibility</A
 ></H2
 ><P
@@ -994,7 +994,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173468"
+NAME="AEN178325"
 >F.31.7. Examples</A
 ></H2
 ><P
@@ -1100,7 +1100,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173491"
+NAME="AEN178348"
 >F.31.8. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/postgres-user.html postgresql-9.5-9.5.8/doc/src/sgml/html/postgres-user.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/postgres-user.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/postgres-user.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/preface.html postgresql-9.5-9.5.8/doc/src/sgml/html/preface.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/preface.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/preface.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,10 +9,10 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="NEXT"
 TITLE=" What is PostgreSQL?"
@@ -23,7 +23,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="PREFACE"
 ><DIV
@@ -41,7 +41,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -50,7 +50,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"
 ACCESSKEY="P"
 >Prev</A
@@ -302,7 +302,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->PostgreSQL 9.5.2 Documentation</TD
+>PostgreSQL 9.5.8 Documentation</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.5-9.5.8/doc/src/sgml/html/preventing-server-spoofing.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/preventing-server-spoofing.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/preventing-server-spoofing.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-changes.html postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-changes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-changes.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-changes.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Frontend/Backend Protocol"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-error-fields.html postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-error-fields.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-error-fields.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-error-fields.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Frontend/Backend Protocol"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-flow.html postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-flow.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-flow.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-flow.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Frontend/Backend Protocol"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -117,7 +117,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN108659"
+NAME="AEN109028"
 >50.2.1. Start-up</A
 ></H2
 ><P
@@ -371,7 +371,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN108734"
+NAME="AEN109103"
 >50.2.2. Simple Query</A
 ></H2
 ><P
@@ -888,7 +888,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN108845"
+NAME="AEN109214"
 >50.2.4. Function Call</A
 ></H2
 ><P
@@ -1294,7 +1294,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN108931"
+NAME="AEN109300"
 >50.2.7. Canceling Requests in Progress</A
 ></H2
 ><P
@@ -1357,7 +1357,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN108939"
+NAME="AEN109308"
 >50.2.8. Termination</A
 ></H2
 ><P
@@ -1407,7 +1407,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN108948"
+NAME="AEN109317"
 >50.2.9. <ACRONYM
 CLASS="ACRONYM"
 >SSL</ACRONYM
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/protocol.html postgresql-9.5-9.5.8/doc/src/sgml/html/protocol.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/protocol.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/protocol.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -134,12 +134,12 @@
 ><DL
 ><DT
 >50.2.1. <A
-HREF="protocol-flow.html#AEN108659"
+HREF="protocol-flow.html#AEN109028"
 >Start-up</A
 ></DT
 ><DT
 >50.2.2. <A
-HREF="protocol-flow.html#AEN108734"
+HREF="protocol-flow.html#AEN109103"
 >Simple Query</A
 ></DT
 ><DT
@@ -149,7 +149,7 @@
 ></DT
 ><DT
 >50.2.4. <A
-HREF="protocol-flow.html#AEN108845"
+HREF="protocol-flow.html#AEN109214"
 >Function Call</A
 ></DT
 ><DT
@@ -164,17 +164,17 @@
 ></DT
 ><DT
 >50.2.7. <A
-HREF="protocol-flow.html#AEN108931"
+HREF="protocol-flow.html#AEN109300"
 >Canceling Requests in Progress</A
 ></DT
 ><DT
 >50.2.8. <A
-HREF="protocol-flow.html#AEN108939"
+HREF="protocol-flow.html#AEN109308"
 >Termination</A
 ></DT
 ><DT
 >50.2.9. <A
-HREF="protocol-flow.html#AEN108948"
+HREF="protocol-flow.html#AEN109317"
 ><ACRONYM
 CLASS="ACRONYM"
 >SSL</ACRONYM
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-message-formats.html postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-message-formats.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-message-formats.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-message-formats.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Frontend/Backend Protocol"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -615,7 +615,7 @@
 CLASS="LITERAL"
 >5678</TT
 > in the
-                least 16 significant bits.  (To avoid confusion, this code
+                least significant 16 bits.  (To avoid confusion, this code
                 must not be the same as any protocol version number.)</P
 ></DD
 ><DT
@@ -2231,7 +2231,7 @@
 CLASS="LITERAL"
 >5679</TT
 > in the
-                least 16 significant bits.  (To avoid confusion, this code
+                least significant 16 bits.  (To avoid confusion, this code
                 must not be the same as any protocol version number.)</P
 ></DD
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-message-types.html postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-message-types.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-message-types.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-message-types.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Frontend/Backend Protocol"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-overview.html postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-overview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-overview.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-overview.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Frontend/Backend Protocol"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-replication.html postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-replication.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/protocol-replication.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/protocol-replication.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Frontend/Backend Protocol"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/queries.html postgresql-9.5-9.5.8/doc/src/sgml/html/queries.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/queries.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/queries.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,14 +9,14 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
 HREF="sql.html"><LINK
 REL="PREVIOUS"
-TITLE="Deleting Data"
-HREF="dml-delete.html"><LINK
+TITLE="Returning Data From Modified Rows"
+HREF="dml-returning.html"><LINK
 REL="NEXT"
 TITLE="Overview"
 HREF="queries-overview.html"><LINK
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -53,8 +53,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="Deleting Data"
-HREF="dml-delete.html"
+TITLE="Returning Data From Modified Rows"
+HREF="dml-returning.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -272,7 +272,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="dml-delete.html"
+HREF="dml-returning.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -300,7 +300,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Deleting Data</TD
+>Returning Data From Modified Rows</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/queries-limit.html postgresql-9.5-9.5.8/doc/src/sgml/html/queries-limit.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/queries-limit.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/queries-limit.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Queries"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/queries-order.html postgresql-9.5-9.5.8/doc/src/sgml/html/queries-order.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/queries-order.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/queries-order.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Queries"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -185,8 +185,8 @@
 >&gt;</TT
 > operator.
     <A
-NAME="AEN4525"
-HREF="#FTN.AEN4525"
+NAME="AEN4596"
+HREF="#FTN.AEN4596"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
@@ -301,8 +301,8 @@
 VALIGN="TOP"
 WIDTH="5%"
 ><A
-NAME="FTN.AEN4525"
-HREF="queries-order.html#AEN4525"
+NAME="FTN.AEN4596"
+HREF="queries-order.html#AEN4596"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/queries-overview.html postgresql-9.5-9.5.8/doc/src/sgml/html/queries-overview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/queries-overview.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/queries-overview.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Queries"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/queries-select-lists.html postgresql-9.5-9.5.8/doc/src/sgml/html/queries-select-lists.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/queries-select-lists.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/queries-select-lists.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Queries"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -182,10 +182,19 @@
 CLASS="PROGRAMLISTING"
 >SELECT tbl1.*, tbl2.a FROM ...</PRE
 ><P>
-    (See also <A
-HREF="queries-table-expressions.html#QUERIES-WHERE"
->Section 7.2.2</A
->.)
+    See <A
+HREF="rowtypes.html#ROWTYPES-USAGE"
+>Section 8.16.5</A
+> for more about
+    the <TT
+CLASS="REPLACEABLE"
+><I
+>table_name</I
+></TT
+><TT
+CLASS="LITERAL"
+>.*</TT
+> notation.
    </P
 ><P
 >    If an arbitrary value expression is used in the select list, it
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/queries-table-expressions.html postgresql-9.5-9.5.8/doc/src/sgml/html/queries-table-expressions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/queries-table-expressions.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/queries-table-expressions.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Queries"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -824,12 +824,12 @@
         only once in the output table.  If there are no common
         column names, <TT
 CLASS="LITERAL"
->NATURAL</TT
+>NATURAL JOIN</TT
 > behaves like
         <TT
 CLASS="LITERAL"
->CROSS JOIN</TT
->.
+>JOIN ... ON TRUE</TT
+>, producing a cross-product join.
        </P
 ><DIV
 CLASS="NOTE"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/queries-union.html postgresql-9.5-9.5.8/doc/src/sgml/html/queries-union.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/queries-union.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/queries-union.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Queries"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/queries-values.html postgresql-9.5-9.5.8/doc/src/sgml/html/queries-values.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/queries-values.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/queries-values.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Queries"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/queries-with.html postgresql-9.5-9.5.8/doc/src/sgml/html/queries-with.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/queries-with.html	2016-03-28 20:20:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/queries-with.html	2017-08-07 21:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Queries"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -743,7 +743,11 @@
     <TT
 CLASS="LITERAL"
 >RETURNING</TT
-> clauses, as seen in the example above.
+> clauses (see <A
+HREF="dml-returning.html"
+>Section 6.4</A
+>),
+    as shown in the example above.
     It is the output of the <TT
 CLASS="LITERAL"
 >RETURNING</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/query-path.html postgresql-9.5-9.5.8/doc/src/sgml/html/query-path.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/query-path.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/query-path.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Overview of PostgreSQL Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/querytree.html postgresql-9.5-9.5.8/doc/src/sgml/html/querytree.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/querytree.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/querytree.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Rule System"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/rangetypes.html postgresql-9.5-9.5.8/doc/src/sgml/html/rangetypes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/rangetypes.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/rangetypes.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -509,7 +509,7 @@
 >    These rules are very similar to those for writing field values in
     composite-type literals.  See <A
 HREF="rowtypes.html#ROWTYPES-IO-SYNTAX"
->Section 8.16.5</A
+>Section 8.16.6</A
 > for
     additional commentary.
    </P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/recovery-config.html postgresql-9.5-9.5.8/doc/src/sgml/html/recovery-config.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/recovery-config.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/recovery-config.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/recovery-target-settings.html postgresql-9.5-9.5.8/doc/src/sgml/html/recovery-target-settings.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/recovery-target-settings.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/recovery-target-settings.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Recovery Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/reference-client.html postgresql-9.5-9.5.8/doc/src/sgml/html/reference-client.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/reference-client.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/reference-client.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Reference"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFERENCE"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -100,7 +100,7 @@
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN89130"
+NAME="AEN89462"
 ></A
 ><P
 >    This part contains reference information for
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/reference.html postgresql-9.5-9.5.8/doc/src/sgml/html/reference.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/reference.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/reference.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Replication Progress Tracking"
@@ -23,7 +23,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="PART"
 ><DIV
@@ -41,7 +41,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -97,7 +97,7 @@
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN68798"
+NAME="AEN69108"
 ></A
 ><P
 >   The entries in this Reference are meant to provide in reasonable
@@ -1291,7 +1291,7 @@
 CLASS="APPLICATION"
 >pg_xlogdump</SPAN
 ></A
->&nbsp;--&nbsp;Display a human-readable rendering of the write-ahead log of a <SPAN
+>&nbsp;--&nbsp;display a human-readable rendering of the write-ahead log of a <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
 > database cluster</DT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/reference-server.html postgresql-9.5-9.5.8/doc/src/sgml/html/reference-server.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/reference-server.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/reference-server.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Reference"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFERENCE"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -100,7 +100,7 @@
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN97347"
+NAME="AEN97700"
 ></A
 ><P
 >    This part contains reference information for
@@ -228,7 +228,7 @@
 CLASS="APPLICATION"
 >pg_xlogdump</SPAN
 ></A
->&nbsp;--&nbsp;Display a human-readable rendering of the write-ahead log of a <SPAN
+>&nbsp;--&nbsp;display a human-readable rendering of the write-ahead log of a <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
 > database cluster</DT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/regress-coverage.html postgresql-9.5-9.5.8/doc/src/sgml/html/regress-coverage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/regress-coverage.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/regress-coverage.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Regression Tests"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/regress-evaluation.html postgresql-9.5-9.5.8/doc/src/sgml/html/regress-evaluation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/regress-evaluation.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/regress-evaluation.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Regression Tests"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -186,7 +186,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41942"
+NAME="AEN42229"
 >30.2.1. Error Message Differences</A
 ></H2
 ><P
@@ -211,7 +211,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41947"
+NAME="AEN42234"
 >30.2.2. Locale Differences</A
 ></H2
 ><P
@@ -274,7 +274,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41958"
+NAME="AEN42245"
 >30.2.3. Date and Time Differences</A
 ></H2
 ><P
@@ -301,7 +301,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41964"
+NAME="AEN42251"
 >30.2.4. Floating-Point Differences</A
 ></H2
 ><P
@@ -358,7 +358,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41978"
+NAME="AEN42265"
 >30.2.5. Row Ordering Differences</A
 ></H2
 ><P
@@ -417,7 +417,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41990"
+NAME="AEN42277"
 >30.2.6. Insufficient Stack Depth</A
 ></H2
 ><P
@@ -463,7 +463,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN42001"
+NAME="AEN42288"
 >30.2.7. The <SPAN
 CLASS="QUOTE"
 >"random"</SPAN
@@ -489,7 +489,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN42007"
+NAME="AEN42294"
 >30.2.8. Configuration Parameters</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/regress.html postgresql-9.5-9.5.8/doc/src/sgml/html/regress.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/regress.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/regress.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -110,32 +110,32 @@
 ><DL
 ><DT
 >30.1.1. <A
-HREF="regress-run.html#AEN41810"
+HREF="regress-run.html#AEN42097"
 >Running the Tests Against a Temporary Installation</A
 ></DT
 ><DT
 >30.1.2. <A
-HREF="regress-run.html#AEN41829"
+HREF="regress-run.html#AEN42116"
 >Running the Tests Against an Existing Installation</A
 ></DT
 ><DT
 >30.1.3. <A
-HREF="regress-run.html#AEN41841"
+HREF="regress-run.html#AEN42128"
 >Additional Test Suites</A
 ></DT
 ><DT
 >30.1.4. <A
-HREF="regress-run.html#AEN41887"
+HREF="regress-run.html#AEN42174"
 >Locale and Encoding</A
 ></DT
 ><DT
 >30.1.5. <A
-HREF="regress-run.html#AEN41898"
+HREF="regress-run.html#AEN42185"
 >Extra Tests</A
 ></DT
 ><DT
 >30.1.6. <A
-HREF="regress-run.html#AEN41906"
+HREF="regress-run.html#AEN42193"
 >Testing Hot Standby</A
 ></DT
 ></DL
@@ -149,37 +149,37 @@
 ><DL
 ><DT
 >30.2.1. <A
-HREF="regress-evaluation.html#AEN41942"
+HREF="regress-evaluation.html#AEN42229"
 >Error Message Differences</A
 ></DT
 ><DT
 >30.2.2. <A
-HREF="regress-evaluation.html#AEN41947"
+HREF="regress-evaluation.html#AEN42234"
 >Locale Differences</A
 ></DT
 ><DT
 >30.2.3. <A
-HREF="regress-evaluation.html#AEN41958"
+HREF="regress-evaluation.html#AEN42245"
 >Date and Time Differences</A
 ></DT
 ><DT
 >30.2.4. <A
-HREF="regress-evaluation.html#AEN41964"
+HREF="regress-evaluation.html#AEN42251"
 >Floating-Point Differences</A
 ></DT
 ><DT
 >30.2.5. <A
-HREF="regress-evaluation.html#AEN41978"
+HREF="regress-evaluation.html#AEN42265"
 >Row Ordering Differences</A
 ></DT
 ><DT
 >30.2.6. <A
-HREF="regress-evaluation.html#AEN41990"
+HREF="regress-evaluation.html#AEN42277"
 >Insufficient Stack Depth</A
 ></DT
 ><DT
 >30.2.7. <A
-HREF="regress-evaluation.html#AEN42001"
+HREF="regress-evaluation.html#AEN42288"
 >The <SPAN
 CLASS="QUOTE"
 >"random"</SPAN
@@ -187,7 +187,7 @@
 ></DT
 ><DT
 >30.2.8. <A
-HREF="regress-evaluation.html#AEN42007"
+HREF="regress-evaluation.html#AEN42294"
 >Configuration Parameters</A
 ></DT
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/regress-run.html postgresql-9.5-9.5.8/doc/src/sgml/html/regress-run.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/regress-run.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/regress-run.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Regression Tests"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -116,7 +116,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41810"
+NAME="AEN42097"
 >30.1.1. Running the Tests Against a Temporary Installation</A
 ></H2
 ><P
@@ -208,7 +208,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41829"
+NAME="AEN42116"
 >30.1.2. Running the Tests Against an Existing Installation</A
 ></H2
 ><P
@@ -261,7 +261,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41841"
+NAME="AEN42128"
 >30.1.3. Additional Test Suites</A
 ></H2
 ><P
@@ -428,7 +428,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41887"
+NAME="AEN42174"
 >30.1.4. Locale and Encoding</A
 ></H2
 ><P
@@ -483,7 +483,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41898"
+NAME="AEN42185"
 >30.1.5. Extra Tests</A
 ></H2
 ><P
@@ -519,7 +519,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN41906"
+NAME="AEN42193"
 >30.1.6. Testing Hot Standby</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/regress-tap.html postgresql-9.5-9.5.8/doc/src/sgml/html/regress-tap.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/regress-tap.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/regress-tap.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Regression Tests"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/regress-variant.html postgresql-9.5-9.5.8/doc/src/sgml/html/regress-variant.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/regress-variant.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/regress-variant.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Regression Tests"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-0-01.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-0-01.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-0-01.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-0-01.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,20 +93,17 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-0-01"
->E.301. <SPAN
+>E.328. <SPAN
 CLASS="PRODUCTNAME"
 >Postgres95</SPAN
 > Release 0.01</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1995-05-01</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >Initial release.</P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-0-02.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-0-02.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-0-02.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-0-02.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,28 +93,25 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-0-02"
->E.300. <SPAN
+>E.327. <SPAN
 CLASS="PRODUCTNAME"
 >Postgres95</SPAN
 > Release 0.02</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1995-05-25</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167399"
->E.300.1. Changes</A
+NAME="AEN172144"
+>E.327.1. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-0-03.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-0-03.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-0-03.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-0-03.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,28 +93,25 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-0-03"
->E.299. <SPAN
+>E.326. <SPAN
 CLASS="PRODUCTNAME"
 >Postgres95</SPAN
 > Release 0.03</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1995-07-21</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167389"
->E.299.1. Changes</A
+NAME="AEN172134"
+>E.326.1. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-1-01.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-1-01.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-1-01.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-1-01.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-1-01"
->E.297. Release 1.01</A
+>E.324. Release 1.01</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1996-02-23</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167319"
->E.297.1. Migration from version 1.0 to version 1.01</A
+NAME="AEN172064"
+>E.324.1. Migration from version 1.0 to version 1.01</A
 ></H2
 ><P
 >The following notes are for the benefit of users who want to migrate
@@ -316,8 +313,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167369"
->E.297.2. Changes</A
+NAME="AEN172114"
+>E.324.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-1-02.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-1-02.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-1-02.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-1-02.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-1-02"
->E.296. Release 1.02</A
+>E.323. Release 1.02</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1996-08-01</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167280"
->E.296.1. Migration from version 1.02 to version 1.02.1</A
+NAME="AEN172025"
+>E.323.1. Migration from version 1.02 to version 1.02.1</A
 ></H2
 ><P
 >Here is a new migration file for 1.02.1.  It includes the 'copy' change
@@ -192,8 +189,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167301"
->E.296.2. Dump/Reload Procedure</A
+NAME="AEN172046"
+>E.323.2. Dump/Reload Procedure</A
 ></H2
 ><P
 >If you are trying to reload a pg_dump or text-mode, <TT
@@ -235,8 +232,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167310"
->E.296.3. Changes</A
+NAME="AEN172055"
+>E.323.3. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-1-09.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-1-09.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-1-09.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-1-09.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-1-09"
->E.295. Release 1.09</A
+>E.322. Release 1.09</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1996-11-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >Sorry, we didn't keep track of changes from 1.02 to 1.09.  Some of
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-1-0.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-1-0.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-1-0.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-1-0.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-1-0"
->E.298. Release 1.0</A
+>E.325. Release 1.0</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1995-09-05</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167378"
->E.298.1. Changes</A
+NAME="AEN172123"
+>E.325.1. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-0.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-0.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-0.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-0.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-0"
->E.294. Release 6.0</A
+>E.321. Release 6.0</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1997-01-29</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >A dump/restore is required for those wishing to migrate data from
@@ -116,8 +113,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167259"
->E.294.1. Migration from version 1.09 to version 6.0</A
+NAME="AEN172004"
+>E.321.1. Migration from version 1.09 to version 6.0</A
 ></H2
 ><P
 >This migration requires a complete dump of the 1.09 database and a
@@ -128,8 +125,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167262"
->E.294.2. Migration from pre-1.09 to version 6.0</A
+NAME="AEN172007"
+>E.321.2. Migration from pre-1.09 to version 6.0</A
 ></H2
 ><P
 >Those migrating from earlier 1.* releases should first upgrade to 1.09
@@ -140,8 +137,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167265"
->E.294.3. Changes</A
+NAME="AEN172010"
+>E.321.3. Changes</A
 ></H2
 ><P
 ></P><PRE
@@ -201,7 +198,7 @@
 Execute lowercase function names if not found with exact case
 Fixes for aggregate/GROUP processing, allow 'select sum(func(x),sum(x+y) from z'
 Gist now included in the distribution(Marc)
-Idend authentication of local users(Bryan)
+Ident authentication of local users(Bryan)
 Implement BETWEEN qualifier(Bruce)
 Implement IN qualifier(Bruce)
 libpq has PQgetisnull()(Bruce)
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-1-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-1-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-1-1.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-1-1.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-1-1"
->E.292. Release 6.1.1</A
+>E.319. Release 6.1.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1997-07-22</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167209"
->E.292.1. Migration from version 6.1 to version 6.1.1</A
+NAME="AEN171954"
+>E.319.1. Migration from version 6.1 to version 6.1.1</A
 ></H2
 ><P
 >This is a minor bug-fix release. A dump/reload is not required from version 6.1,
@@ -123,8 +120,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167212"
->E.292.2. Changes</A
+NAME="AEN171957"
+>E.319.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-1.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-1.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-1"
->E.293. Release 6.1</A
+>E.320. Release 6.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1997-06-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 > The regression tests have been adapted and extensively modified for the
@@ -196,8 +193,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167244"
->E.293.1. Migration to Version 6.1</A
+NAME="AEN171989"
+>E.320.1. Migration to Version 6.1</A
 ></H2
 ><P
 >This migration requires a complete dump of the 6.0 database and a
@@ -211,8 +208,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167248"
->E.293.2. Changes</A
+NAME="AEN171993"
+>E.320.2. Changes</A
 ></H2
 ><P
 ></P><PRE
@@ -240,8 +237,8 @@
 fix gist for use in inner scan, cleanups (Vadim, Andrea)
 avoid unnecessary local buffers allocation (Vadim, Massimo)
 fix local buffers leak in transaction aborts (Vadim)
-fix file manager memmory leaks, cleanups (Vadim, Massimo)
-fix storage manager memmory leaks (Vadim)
+fix file manager memory leaks, cleanups (Vadim, Massimo)
+fix storage manager memory leaks (Vadim)
 fix btree duplicates handling (Vadim)
 fix deleted rows reincarnation caused by vacuum (Vadim)
 fix SELECT varchar()/char() INTO TABLE made zero-length fields(Bruce)
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-2-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-2-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-2-1.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-2-1.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-2-1"
->E.290. Release 6.2.1</A
+>E.317. Release 6.2.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1997-10-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >6.2.1 is a bug-fix and usability release on 6.2.</P
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167171"
->E.290.1. Migration from version 6.2 to version 6.2.1</A
+NAME="AEN171916"
+>E.317.1. Migration from version 6.2 to version 6.2.1</A
 ></H2
 ><P
 >This is a minor bug-fix release. A dump/reload is not required from version 6.2,
@@ -165,8 +162,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167179"
->E.290.2. Changes</A
+NAME="AEN171924"
+>E.317.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-2.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-2.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-2"
->E.291. Release 6.2</A
+>E.318. Release 6.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1997-10-02</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >A dump/restore is required for those wishing to migrate data from
@@ -116,8 +113,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167190"
->E.291.1. Migration from version 6.1 to version 6.2</A
+NAME="AEN171935"
+>E.318.1. Migration from version 6.1 to version 6.2</A
 ></H2
 ><P
 >This migration requires a complete dump of the 6.1 database and a
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167196"
->E.291.2. Migration from version 1.<TT
+NAME="AEN171941"
+>E.318.2. Migration from version 1.<TT
 CLASS="REPLACEABLE"
 ><I
 >x</I
@@ -154,8 +151,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167200"
->E.291.3. Changes</A
+NAME="AEN171945"
+>E.318.3. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-3-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-3-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-3-1.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-3-1.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-3-1"
->E.288. Release 6.3.1</A
+>E.315. Release 6.3.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1998-03-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   Summary:
@@ -154,8 +151,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167091"
->E.288.1. Changes</A
+NAME="AEN171836"
+>E.315.1. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-3-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-3-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-3-2.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-3-2.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-3-2"
->E.287. Release 6.3.2</A
+>E.314. Release 6.3.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1998-04-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >This is a bug-fix release for 6.3.x.
@@ -150,8 +147,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167066"
->E.287.1. Changes</A
+NAME="AEN171811"
+>E.314.1. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-3.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-3.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-3"
->E.289. Release 6.3</A
+>E.316. Release 6.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1998-03-01</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   There are <SPAN
@@ -297,8 +294,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167145"
->E.289.1. Migration to Version 6.3</A
+NAME="AEN171890"
+>E.316.1. Migration to Version 6.3</A
 ></H2
 ><P
 >    A dump/restore using <SPAN
@@ -321,8 +318,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167151"
->E.289.2. Changes</A
+NAME="AEN171896"
+>E.316.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-4-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-4-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-4-1.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-4-1.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-4-1"
->E.285. Release 6.4.1</A
+>E.312. Release 6.4.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1998-12-18</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >This is basically a cleanup release for 6.4.  We have fixed a variety of
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166994"
->E.285.1. Migration to Version 6.4.1</A
+NAME="AEN171739"
+>E.312.1. Migration to Version 6.4.1</A
 ></H2
 ><P
 >A dump/restore is <SPAN
@@ -131,8 +128,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166998"
->E.285.2. Changes</A
+NAME="AEN171743"
+>E.312.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-4-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-4-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-4-2.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-4-2.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-4-2"
->E.284. Release 6.4.2</A
+>E.311. Release 6.4.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1998-12-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >The 6.4.1 release was improperly packaged.  This also has one additional
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166980"
->E.284.1. Migration to Version 6.4.2</A
+NAME="AEN171725"
+>E.311.1. Migration to Version 6.4.2</A
 ></H2
 ><P
 >A dump/restore is <SPAN
@@ -131,8 +128,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166984"
->E.284.2. Changes</A
+NAME="AEN171729"
+>E.311.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-4.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-4.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-4"
->E.286. Release 6.4</A
+>E.313. Release 6.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1998-10-30</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >There are <SPAN
@@ -214,8 +211,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167038"
->E.286.1. Migration to Version 6.4</A
+NAME="AEN171783"
+>E.313.1. Migration to Version 6.4</A
 ></H2
 ><P
 >A dump/restore using <SPAN
@@ -237,8 +234,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN167044"
->E.286.2. Changes</A
+NAME="AEN171789"
+>E.313.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-5-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-5-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-5-1.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-5-1.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-5-1"
->E.282. Release 6.5.1</A
+>E.309. Release 6.5.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1999-07-15</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This is basically a cleanup release for 6.5.  We have fixed a variety of
@@ -114,8 +111,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166872"
->E.282.1. Migration to Version 6.5.1</A
+NAME="AEN171617"
+>E.309.1. Migration to Version 6.5.1</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -133,8 +130,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166876"
->E.282.2. Changes</A
+NAME="AEN171621"
+>E.309.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-5-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-5-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-5-2.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-5-2.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-5-2"
->E.281. Release 6.5.2</A
+>E.308. Release 6.5.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1999-09-15</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This is basically a cleanup release for 6.5.1.  We have fixed a variety of
@@ -114,8 +111,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166858"
->E.281.1. Migration to Version 6.5.2</A
+NAME="AEN171603"
+>E.308.1. Migration to Version 6.5.2</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -133,8 +130,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166862"
->E.281.2. Changes</A
+NAME="AEN171607"
+>E.308.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-5-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-5-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-5-3.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-5-3.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-5-3"
->E.280. Release 6.5.3</A
+>E.307. Release 6.5.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1999-10-13</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This is basically a cleanup release for 6.5.2.  We have added a new
@@ -117,8 +114,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166844"
->E.280.1. Migration to Version 6.5.3</A
+NAME="AEN171589"
+>E.307.1. Migration to Version 6.5.3</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166848"
->E.280.2. Changes</A
+NAME="AEN171593"
+>E.307.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-6-5.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-6-5.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-6-5"
->E.283. Release 6.5</A
+>E.310. Release 6.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >1999-06-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release marks a major step in the development team's mastery of the source
@@ -285,8 +282,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166943"
->E.283.1. Migration to Version 6.5</A
+NAME="AEN171688"
+>E.310.1. Migration to Version 6.5</A
 ></H2
 ><P
 >    A dump/restore using <SPAN
@@ -329,8 +326,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166952"
->E.283.1.1. Multiversion Concurrency Control</A
+NAME="AEN171697"
+>E.310.1.1. Multiversion Concurrency Control</A
 ></H3
 ><P
 >     Because readers in 6.5 don't lock data, regardless of transaction
@@ -418,8 +415,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166970"
->E.283.2. Changes</A
+NAME="AEN171715"
+>E.310.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-0-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-0-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-0-1.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-0-1.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-0-1"
->E.278. Release 7.0.1</A
+>E.305. Release 7.0.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2000-06-01</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This is a cleanup release for 7.0.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166760"
->E.278.1. Migration to Version 7.0.1</A
+NAME="AEN171505"
+>E.305.1. Migration to Version 7.0.1</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166764"
->E.278.2. Changes</A
+NAME="AEN171509"
+>E.305.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-0-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-0-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-0-2.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-0-2.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-0-2"
->E.277. Release 7.0.2</A
+>E.304. Release 7.0.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2000-06-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This is a repackaging of 7.0.1 with added documentation.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166746"
->E.277.1. Migration to Version 7.0.2</A
+NAME="AEN171491"
+>E.304.1. Migration to Version 7.0.2</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166750"
->E.277.2. Changes</A
+NAME="AEN171495"
+>E.304.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-0-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-0-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-0-3.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-0-3.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-0-3"
->E.276. Release 7.0.3</A
+>E.303. Release 7.0.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2000-11-11</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This has a variety of fixes from 7.0.2.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166732"
->E.276.1. Migration to Version 7.0.3</A
+NAME="AEN171477"
+>E.303.1. Migration to Version 7.0.3</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166736"
->E.276.2. Changes</A
+NAME="AEN171481"
+>E.303.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-0.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-0.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-0.html	2016-03-28 20:21:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-0.html	2017-08-07 21:33:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-0"
->E.279. Release 7.0</A
+>E.306. Release 7.0</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2000-05-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains improvements in many areas, demonstrating
@@ -198,8 +195,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166803"
->E.279.1. Migration to Version 7.0</A
+NAME="AEN171548"
+>E.306.1. Migration to Version 7.0</A
 ></H2
 ><P
 >    A dump/restore using <SPAN
@@ -303,8 +300,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166829"
->E.279.2. Changes</A
+NAME="AEN171574"
+>E.306.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-1-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-1-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-1-1.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-1-1.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-1-1"
->E.274. Release 7.1.1</A
+>E.301. Release 7.1.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2001-05-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This has a variety of fixes from 7.1.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166680"
->E.274.1. Migration to Version 7.1.1</A
+NAME="AEN171425"
+>E.301.1. Migration to Version 7.1.1</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166684"
->E.274.2. Changes</A
+NAME="AEN171429"
+>E.301.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-1-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-1-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-1-2.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-1-2.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-1-2"
->E.273. Release 7.1.2</A
+>E.300. Release 7.1.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2001-05-11</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This has one fix from 7.1.1.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166666"
->E.273.1. Migration to Version 7.1.2</A
+NAME="AEN171411"
+>E.300.1. Migration to Version 7.1.2</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166670"
->E.273.2. Changes</A
+NAME="AEN171415"
+>E.300.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-1-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-1-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-1-3.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-1-3.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-1-3"
->E.272. Release 7.1.3</A
+>E.299. Release 7.1.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2001-08-15</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166652"
->E.272.1. Migration to Version 7.1.3</A
+NAME="AEN171397"
+>E.299.1. Migration to Version 7.1.3</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -129,8 +126,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166656"
->E.272.2. Changes</A
+NAME="AEN171401"
+>E.299.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-1.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-1.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-1"
->E.275. Release 7.1</A
+>E.302. Release 7.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2001-04-13</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >       This release focuses on removing limitations that have existed in the
@@ -186,8 +183,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166719"
->E.275.1. Migration to Version 7.1</A
+NAME="AEN171464"
+>E.302.1. Migration to Version 7.1</A
 ></H2
 ><P
 >       A dump/restore using pg_dump is required for those wishing to migrate
@@ -199,8 +196,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166722"
->E.275.2. Changes</A
+NAME="AEN171467"
+>E.302.2. Changes</A
 ></H2
 ><P
 ></P><PRE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-1.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-1.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-2-1"
->E.270. Release 7.2.1</A
+>E.297. Release 7.2.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2002-03-21</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >  This release contains a variety of fixes for version 7.2.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165966"
->E.270.1. Migration to Version 7.2.1</A
+NAME="AEN170711"
+>E.297.1. Migration to Version 7.2.1</A
 ></H2
 ><P
 >   A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165970"
->E.270.2. Changes</A
+NAME="AEN170715"
+>E.297.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-2.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-2.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-2-2"
->E.269. Release 7.2.2</A
+>E.296. Release 7.2.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2002-08-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >  This release contains a variety of fixes for version 7.2.1.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165926"
->E.269.1. Migration to Version 7.2.2</A
+NAME="AEN170671"
+>E.296.1. Migration to Version 7.2.2</A
 ></H2
 ><P
 >   A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165930"
->E.269.2. Changes</A
+NAME="AEN170675"
+>E.296.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-3.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-3.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-2-3"
->E.268. Release 7.2.3</A
+>E.295. Release 7.2.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2002-10-01</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >  This release contains a variety of fixes for version 7.2.2,
@@ -114,8 +111,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165900"
->E.268.1. Migration to Version 7.2.3</A
+NAME="AEN170645"
+>E.295.1. Migration to Version 7.2.3</A
 ></H2
 ><P
 >   A dump/restore is <SPAN
@@ -133,8 +130,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165904"
->E.268.2. Changes</A
+NAME="AEN170649"
+>E.295.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-4.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-4.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-2-4"
->E.267. Release 7.2.4</A
+>E.294. Release 7.2.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2003-01-30</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >  This release contains a variety of fixes for version 7.2.3,
@@ -114,8 +111,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165871"
->E.267.1. Migration to Version 7.2.4</A
+NAME="AEN170616"
+>E.294.1. Migration to Version 7.2.4</A
 ></H2
 ><P
 >   A dump/restore is <SPAN
@@ -133,8 +130,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165875"
->E.267.2. Changes</A
+NAME="AEN170620"
+>E.294.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-5.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-5.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-2-5"
->E.266. Release 7.2.5</A
+>E.293. Release 7.2.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2004-08-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.2.4.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165840"
->E.266.1. Migration to Version 7.2.5</A
+NAME="AEN170585"
+>E.293.1. Migration to Version 7.2.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.2.X.
@@ -125,8 +122,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165843"
->E.266.2. Changes</A
+NAME="AEN170588"
+>E.293.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-6.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-6.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-2-6"
->E.265. Release 7.2.6</A
+>E.292. Release 7.2.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2004-10-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.2.5.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165813"
->E.265.1. Migration to Version 7.2.6</A
+NAME="AEN170558"
+>E.292.1. Migration to Version 7.2.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.2.X.
@@ -125,8 +122,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165816"
->E.265.2. Changes</A
+NAME="AEN170561"
+>E.292.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-7.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-7.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-2-7"
->E.264. Release 7.2.7</A
+>E.291. Release 7.2.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-01-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.2.6, including several
@@ -114,8 +111,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165787"
->E.264.1. Migration to Version 7.2.7</A
+NAME="AEN170532"
+>E.291.1. Migration to Version 7.2.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.2.X.
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165790"
->E.264.2. Changes</A
+NAME="AEN170535"
+>E.291.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2-8.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2-8.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-2-8"
->E.263. Release 7.2.8</A
+>E.290. Release 7.2.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-05-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.2.7, including one
@@ -114,8 +111,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165754"
->E.263.1. Migration to Version 7.2.8</A
+NAME="AEN170499"
+>E.290.1. Migration to Version 7.2.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.2.X.
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165757"
->E.263.2. Changes</A
+NAME="AEN170502"
+>E.290.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-2.html	2016-03-28 20:21:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-2.html	2017-08-07 21:33:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-2"
->E.271. Release 7.2</A
+>E.298. Release 7.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2002-02-04</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166010"
->E.271.1. Overview</A
+NAME="AEN170755"
+>E.298.1. Overview</A
 ></H2
 ><P
 >   This release improves <SPAN
@@ -201,8 +198,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166046"
->E.271.2. Migration to Version 7.2</A
+NAME="AEN170791"
+>E.298.2. Migration to Version 7.2</A
 ></H2
 ><P
 >   A dump/restore using <TT
@@ -323,16 +320,16 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN166082"
->E.271.3. Changes</A
+NAME="AEN170827"
+>E.298.3. Changes</A
 ></H2
 ><DIV
 CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166084"
->E.271.3.1. Server Operation</A
+NAME="AEN170829"
+>E.298.3.1. Server Operation</A
 ></H3
 ><P
 ></P
@@ -424,8 +421,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166127"
->E.271.3.2. Performance</A
+NAME="AEN170872"
+>E.298.3.2. Performance</A
 ></H3
 ><P
 ></P
@@ -477,8 +474,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166150"
->E.271.3.3. Privileges</A
+NAME="AEN170895"
+>E.298.3.3. Privileges</A
 ></H3
 ><P
 ></P
@@ -522,8 +519,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166169"
->E.271.3.4. Client Authentication</A
+NAME="AEN170914"
+>E.298.3.4. Client Authentication</A
 ></H3
 ><P
 ></P
@@ -559,8 +556,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166184"
->E.271.3.5. Server Configuration</A
+NAME="AEN170929"
+>E.298.3.5. Server Configuration</A
 ></H3
 ><P
 ></P
@@ -596,8 +593,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166199"
->E.271.3.6. Queries</A
+NAME="AEN170944"
+>E.298.3.6. Queries</A
 ></H3
 ><P
 ></P
@@ -645,8 +642,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166220"
->E.271.3.7. Schema Manipulation</A
+NAME="AEN170965"
+>E.298.3.7. Schema Manipulation</A
 ></H3
 ><P
 ></P
@@ -726,8 +723,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166257"
->E.271.3.8. Utility Commands</A
+NAME="AEN171002"
+>E.298.3.8. Utility Commands</A
 ></H3
 ><P
 ></P
@@ -779,8 +776,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166280"
->E.271.3.9. Data Types and Functions</A
+NAME="AEN171025"
+>E.298.3.9. Data Types and Functions</A
 ></H3
 ><P
 ></P
@@ -940,8 +937,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166357"
->E.271.3.10. Internationalization</A
+NAME="AEN171102"
+>E.298.3.10. Internationalization</A
 ></H3
 ><P
 ></P
@@ -988,8 +985,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166377"
->E.271.3.11. <SPAN
+NAME="AEN171122"
+>E.298.3.11. <SPAN
 CLASS="APPLICATION"
 >PL/pgSQL</SPAN
 ></A
@@ -1048,8 +1045,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166403"
->E.271.3.12. PL/Perl</A
+NAME="AEN171148"
+>E.298.3.12. PL/Perl</A
 ></H3
 ><P
 ></P
@@ -1069,8 +1066,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166410"
->E.271.3.13. PL/Tcl</A
+NAME="AEN171155"
+>E.298.3.13. PL/Tcl</A
 ></H3
 ><P
 ></P
@@ -1090,8 +1087,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166417"
->E.271.3.14. PL/Python</A
+NAME="AEN171162"
+>E.298.3.14. PL/Python</A
 ></H3
 ><P
 ></P
@@ -1107,8 +1104,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166422"
->E.271.3.15. <SPAN
+NAME="AEN171167"
+>E.298.3.15. <SPAN
 CLASS="APPLICATION"
 >psql</SPAN
 ></A
@@ -1143,8 +1140,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166436"
->E.271.3.16. <SPAN
+NAME="AEN171181"
+>E.298.3.16. <SPAN
 CLASS="APPLICATION"
 >libpq</SPAN
 ></A
@@ -1167,8 +1164,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166444"
->E.271.3.17. JDBC</A
+NAME="AEN171189"
+>E.298.3.17. JDBC</A
 ></H3
 ><P
 ></P
@@ -1308,8 +1305,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166511"
->E.271.3.18. ODBC</A
+NAME="AEN171256"
+>E.298.3.18. ODBC</A
 ></H3
 ><P
 ></P
@@ -1361,8 +1358,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166534"
->E.271.3.19. <SPAN
+NAME="AEN171279"
+>E.298.3.19. <SPAN
 CLASS="APPLICATION"
 >ECPG</SPAN
 ></A
@@ -1417,8 +1414,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166558"
->E.271.3.20. Misc. Interfaces</A
+NAME="AEN171303"
+>E.298.3.20. Misc. Interfaces</A
 ></H3
 ><P
 ></P
@@ -1453,8 +1450,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166572"
->E.271.3.21. Build and Install</A
+NAME="AEN171317"
+>E.298.3.21. Build and Install</A
 ></H3
 ><P
 ></P
@@ -1514,8 +1511,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166599"
->E.271.3.22. Source Code</A
+NAME="AEN171344"
+>E.298.3.22. Source Code</A
 ></H3
 ><P
 ></P
@@ -1571,8 +1568,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN166624"
->E.271.3.23. Contrib</A
+NAME="AEN171369"
+>E.298.3.23. Contrib</A
 ></H3
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-10.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-10.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-10"
->E.252. Release 7.3.10</A
+>E.279. Release 7.3.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-05-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.9, including several
@@ -114,8 +111,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164412"
->E.252.1. Migration to Version 7.3.10</A
+NAME="AEN169157"
+>E.279.1. Migration to Version 7.3.10</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
@@ -202,8 +199,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164427"
->E.252.2. Changes</A
+NAME="AEN169172"
+>E.279.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-11.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-11.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-11"
->E.251. Release 7.3.11</A
+>E.278. Release 7.3.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-10-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.10.
@@ -113,15 +110,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164373"
->E.251.1. Migration to Version 7.3.11</A
+NAME="AEN169118"
+>E.278.1. Migration to Version 7.3.11</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.10,
     see <A
 HREF="release-7-3-10.html"
->Section E.252</A
+>Section E.279</A
 >.
    </P
 ></DIV
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164377"
->E.251.2. Changes</A
+NAME="AEN169122"
+>E.278.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-12.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-12.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-12"
->E.250. Release 7.3.12</A
+>E.277. Release 7.3.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-12-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.11.
@@ -113,15 +110,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164347"
->E.250.1. Migration to Version 7.3.12</A
+NAME="AEN169092"
+>E.277.1. Migration to Version 7.3.12</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.10,
     see <A
 HREF="release-7-3-10.html"
->Section E.252</A
+>Section E.279</A
 >.
    </P
 ></DIV
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164351"
->E.250.2. Changes</A
+NAME="AEN169096"
+>E.277.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-13.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-13.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-13"
->E.249. Release 7.3.13</A
+>E.276. Release 7.3.13</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-01-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.12.
@@ -113,15 +110,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164311"
->E.249.1. Migration to Version 7.3.13</A
+NAME="AEN169056"
+>E.276.1. Migration to Version 7.3.13</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.10,
     see <A
 HREF="release-7-3-10.html"
->Section E.252</A
+>Section E.279</A
 >.
     Also, you might need to <TT
 CLASS="COMMAND"
@@ -139,8 +136,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164317"
->E.249.2. Changes</A
+NAME="AEN169062"
+>E.276.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-14.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-14.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-14"
->E.248. Release 7.3.14</A
+>E.275. Release 7.3.14</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-02-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.13.
@@ -113,15 +110,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164282"
->E.248.1. Migration to Version 7.3.14</A
+NAME="AEN169027"
+>E.275.1. Migration to Version 7.3.14</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
     see <A
 HREF="release-7-3-13.html"
->Section E.249</A
+>Section E.276</A
 >.
    </P
 ></DIV
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164286"
->E.248.2. Changes</A
+NAME="AEN169031"
+>E.275.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-15.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-15.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-15"
->E.247. Release 7.3.15</A
+>E.274. Release 7.3.15</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-05-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.14,
@@ -114,15 +111,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164227"
->E.247.1. Migration to Version 7.3.15</A
+NAME="AEN168972"
+>E.274.1. Migration to Version 7.3.15</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
     see <A
 HREF="release-7-3-13.html"
->Section E.249</A
+>Section E.276</A
 >.
    </P
 ><P
@@ -151,8 +148,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164235"
->E.247.2. Changes</A
+NAME="AEN168980"
+>E.274.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-16.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-16.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-16"
->E.246. Release 7.3.16</A
+>E.273. Release 7.3.16</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-10-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.15.
@@ -113,15 +110,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164200"
->E.246.1. Migration to Version 7.3.16</A
+NAME="AEN168945"
+>E.273.1. Migration to Version 7.3.16</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
     see <A
 HREF="release-7-3-13.html"
->Section E.249</A
+>Section E.276</A
 >.
    </P
 ></DIV
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164204"
->E.246.2. Changes</A
+NAME="AEN168949"
+>E.273.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-17.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-17.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-17"
->E.245. Release 7.3.17</A
+>E.272. Release 7.3.17</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-01-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.16.
@@ -113,15 +110,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164173"
->E.245.1. Migration to Version 7.3.17</A
+NAME="AEN168918"
+>E.272.1. Migration to Version 7.3.17</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
     see <A
 HREF="release-7-3-13.html"
->Section E.249</A
+>Section E.276</A
 >.
    </P
 ></DIV
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164177"
->E.245.2. Changes</A
+NAME="AEN168922"
+>E.272.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-18.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-18.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-18"
->E.244. Release 7.3.18</A
+>E.271. Release 7.3.18</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-02-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.17, including
@@ -114,15 +111,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164153"
->E.244.1. Migration to Version 7.3.18</A
+NAME="AEN168898"
+>E.271.1. Migration to Version 7.3.18</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
     see <A
 HREF="release-7-3-13.html"
->Section E.249</A
+>Section E.276</A
 >.
    </P
 ></DIV
@@ -131,8 +128,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164157"
->E.244.2. Changes</A
+NAME="AEN168902"
+>E.271.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-19.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-19.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-19.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-19.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-19"
->E.243. Release 7.3.19</A
+>E.270. Release 7.3.19</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-04-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains fixes from 7.3.18,
@@ -114,15 +111,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164130"
->E.243.1. Migration to Version 7.3.19</A
+NAME="AEN168875"
+>E.270.1. Migration to Version 7.3.19</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
     see <A
 HREF="release-7-3-13.html"
->Section E.249</A
+>Section E.276</A
 >.
    </P
 ></DIV
@@ -131,8 +128,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164134"
->E.243.2. Changes</A
+NAME="AEN168879"
+>E.270.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-1.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-1.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-1"
->E.261. Release 7.3.1</A
+>E.288. Release 7.3.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2002-12-18</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >  This release contains a variety of fixes for version 7.3.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164953"
->E.261.1. Migration to Version 7.3.1</A
+NAME="AEN169698"
+>E.288.1. Migration to Version 7.3.1</A
 ></H2
 ><P
 >   A dump/restore is <SPAN
@@ -138,8 +135,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164958"
->E.261.2. Changes</A
+NAME="AEN169703"
+>E.288.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-20.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-20.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-20.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-20.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-20"
->E.242. Release 7.3.20</A
+>E.269. Release 7.3.20</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-09-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains fixes from 7.3.19.
@@ -113,15 +110,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164105"
->E.242.1. Migration to Version 7.3.20</A
+NAME="AEN168850"
+>E.269.1. Migration to Version 7.3.20</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
     see <A
 HREF="release-7-3-13.html"
->Section E.249</A
+>Section E.276</A
 >.
    </P
 ></DIV
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164109"
->E.242.2. Changes</A
+NAME="AEN168854"
+>E.269.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-21.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-21.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-21.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-21.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-21"
->E.241. Release 7.3.21</A
+>E.268. Release 7.3.21</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-01-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.20,
@@ -122,15 +119,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164058"
->E.241.1. Migration to Version 7.3.21</A
+NAME="AEN168803"
+>E.268.1. Migration to Version 7.3.21</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
     see <A
 HREF="release-7-3-13.html"
->Section E.249</A
+>Section E.276</A
 >.
    </P
 ></DIV
@@ -139,8 +136,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164062"
->E.241.2. Changes</A
+NAME="AEN168807"
+>E.268.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-2.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-2.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-2"
->E.260. Release 7.3.2</A
+>E.287. Release 7.3.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2003-02-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >  This release contains a variety of fixes for version 7.3.1.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164878"
->E.260.1. Migration to Version 7.3.2</A
+NAME="AEN169623"
+>E.287.1. Migration to Version 7.3.2</A
 ></H2
 ><P
 >   A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164882"
->E.260.2. Changes</A
+NAME="AEN169627"
+>E.287.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-3.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-3.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-3"
->E.259. Release 7.3.3</A
+>E.286. Release 7.3.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2003-05-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >  This release contains a variety of fixes for version 7.3.2.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164675"
->E.259.1. Migration to Version 7.3.3</A
+NAME="AEN169420"
+>E.286.1. Migration to Version 7.3.3</A
 ></H2
 ><P
 >   A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164679"
->E.259.2. Changes</A
+NAME="AEN169424"
+>E.286.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-4.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-4.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-4"
->E.258. Release 7.3.4</A
+>E.285. Release 7.3.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2003-07-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This has a variety of fixes from 7.3.3.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164644"
->E.258.1. Migration to Version 7.3.4</A
+NAME="AEN169389"
+>E.285.1. Migration to Version 7.3.4</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164648"
->E.258.2. Changes</A
+NAME="AEN169393"
+>E.285.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-5.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-5.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-5"
->E.257. Release 7.3.5</A
+>E.284. Release 7.3.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2003-12-03</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This has a variety of fixes from 7.3.4.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164592"
->E.257.1. Migration to Version 7.3.5</A
+NAME="AEN169337"
+>E.284.1. Migration to Version 7.3.5</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164596"
->E.257.2. Changes</A
+NAME="AEN169341"
+>E.284.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-6.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-6.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-6"
->E.256. Release 7.3.6</A
+>E.283. Release 7.3.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2004-03-02</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.5.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164555"
->E.256.1. Migration to Version 7.3.6</A
+NAME="AEN169300"
+>E.283.1. Migration to Version 7.3.6</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -132,8 +129,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164559"
->E.256.2. Changes</A
+NAME="AEN169304"
+>E.283.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-7.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-7.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-7"
->E.255. Release 7.3.7</A
+>E.282. Release 7.3.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2004-08-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains one critical fix over 7.3.6, and some minor items.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164535"
->E.255.1. Migration to Version 7.3.7</A
+NAME="AEN169280"
+>E.282.1. Migration to Version 7.3.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.
@@ -125,8 +122,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164538"
->E.255.2. Changes</A
+NAME="AEN169283"
+>E.282.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-8.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-8.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-8"
->E.254. Release 7.3.8</A
+>E.281. Release 7.3.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2004-10-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.7.
@@ -113,8 +110,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164510"
->E.254.1. Migration to Version 7.3.8</A
+NAME="AEN169255"
+>E.281.1. Migration to Version 7.3.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.
@@ -125,8 +122,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164513"
->E.254.2. Changes</A
+NAME="AEN169258"
+>E.281.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3-9.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3-9.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3-9"
->E.253. Release 7.3.9</A
+>E.280. Release 7.3.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-01-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.3.8, including several
@@ -114,8 +111,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164477"
->E.253.1. Migration to Version 7.3.9</A
+NAME="AEN169222"
+>E.280.1. Migration to Version 7.3.9</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.3.X.
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164480"
->E.253.2. Changes</A
+NAME="AEN169225"
+>E.280.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-3.html	2016-03-28 20:21:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-3.html	2017-08-07 21:33:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-3"
->E.262. Release 7.3</A
+>E.289. Release 7.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2002-11-27</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN164999"
->E.262.1. Overview</A
+NAME="AEN169744"
+>E.289.1. Overview</A
 ></H2
 ><P
 >   Major changes in this release:
@@ -267,8 +264,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165058"
->E.262.2. Migration to Version 7.3</A
+NAME="AEN169803"
+>E.289.2. Migration to Version 7.3</A
 ></H2
 ><P
 >   A dump/restore using <SPAN
@@ -428,16 +425,16 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN165105"
->E.262.3. Changes</A
+NAME="AEN169850"
+>E.289.3. Changes</A
 ></H2
 ><DIV
 CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165107"
->E.262.3.1. Server Operation</A
+NAME="AEN169852"
+>E.289.3.1. Server Operation</A
 ></H3
 ><P
 ></P
@@ -468,8 +465,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165119"
->E.262.3.2. Performance</A
+NAME="AEN169864"
+>E.289.3.2. Performance</A
 ></H3
 ><P
 ></P
@@ -553,8 +550,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165158"
->E.262.3.3. Privileges</A
+NAME="AEN169903"
+>E.289.3.3. Privileges</A
 ></H3
 ><P
 ></P
@@ -586,8 +583,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165171"
->E.262.3.4. Server Configuration</A
+NAME="AEN169916"
+>E.289.3.4. Server Configuration</A
 ></H3
 ><P
 ></P
@@ -663,8 +660,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165206"
->E.262.3.5. Queries</A
+NAME="AEN169951"
+>E.289.3.5. Queries</A
 ></H3
 ><P
 ></P
@@ -748,8 +745,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165245"
->E.262.3.6. Object Manipulation</A
+NAME="AEN169990"
+>E.289.3.6. Object Manipulation</A
 ></H3
 ><P
 ></P
@@ -885,8 +882,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165310"
->E.262.3.7. Utility Commands</A
+NAME="AEN170055"
+>E.289.3.7. Utility Commands</A
 ></H3
 ><P
 ></P
@@ -1046,8 +1043,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165385"
->E.262.3.8. Data Types and Functions</A
+NAME="AEN170130"
+>E.289.3.8. Data Types and Functions</A
 ></H3
 ><P
 ></P
@@ -1219,8 +1216,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165468"
->E.262.3.9. Internationalization</A
+NAME="AEN170213"
+>E.289.3.9. Internationalization</A
 ></H3
 ><P
 ></P
@@ -1280,8 +1277,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165495"
->E.262.3.10. Server-side Languages</A
+NAME="AEN170240"
+>E.289.3.10. Server-side Languages</A
 ></H3
 ><P
 ></P
@@ -1321,8 +1318,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165512"
->E.262.3.11. psql</A
+NAME="AEN170257"
+>E.289.3.11. psql</A
 ></H3
 ><P
 ></P
@@ -1378,8 +1375,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165537"
->E.262.3.12. libpq</A
+NAME="AEN170282"
+>E.289.3.12. libpq</A
 ></H3
 ><P
 ></P
@@ -1423,8 +1420,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165556"
->E.262.3.13. JDBC</A
+NAME="AEN170301"
+>E.289.3.13. JDBC</A
 ></H3
 ><P
 ></P
@@ -1476,8 +1473,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165579"
->E.262.3.14. Miscellaneous Interfaces</A
+NAME="AEN170324"
+>E.289.3.14. Miscellaneous Interfaces</A
 ></H3
 ><P
 ></P
@@ -1529,8 +1526,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165602"
->E.262.3.15. Source Code</A
+NAME="AEN170347"
+>E.289.3.15. Source Code</A
 ></H3
 ><P
 ></P
@@ -1738,8 +1735,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN165703"
->E.262.3.16. Contrib</A
+NAME="AEN170448"
+>E.289.3.16. Contrib</A
 ></H3
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-10.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-10.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-10"
->E.230. Release 7.4.10</A
+>E.257. Release 7.4.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-12-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.9.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162385"
->E.230.1. Migration to Version 7.4.10</A
+NAME="AEN167130"
+>E.257.1. Migration to Version 7.4.10</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.8,
     see <A
 HREF="release-7-4-8.html"
->Section E.232</A
+>Section E.259</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162389"
->E.230.2. Changes</A
+NAME="AEN167134"
+>E.257.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-11.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-11.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-11"
->E.229. Release 7.4.11</A
+>E.256. Release 7.4.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-01-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.10.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162346"
->E.229.1. Migration to Version 7.4.11</A
+NAME="AEN167091"
+>E.256.1. Migration to Version 7.4.11</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.8,
     see <A
 HREF="release-7-4-8.html"
->Section E.232</A
+>Section E.259</A
 >.
     Also, you might need to <TT
 CLASS="COMMAND"
@@ -144,8 +141,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162352"
->E.229.2. Changes</A
+NAME="AEN167097"
+>E.256.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-12.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-12.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-12"
->E.228. Release 7.4.12</A
+>E.255. Release 7.4.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-02-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.11.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162312"
->E.228.1. Migration to Version 7.4.12</A
+NAME="AEN167057"
+>E.255.1. Migration to Version 7.4.12</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162316"
->E.228.2. Changes</A
+NAME="AEN167061"
+>E.255.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-13.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-13.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-13"
->E.227. Release 7.4.13</A
+>E.254. Release 7.4.13</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-05-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.12,
@@ -111,7 +108,7 @@
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162245"
->E.227.1. Migration to Version 7.4.13</A
+NAME="AEN166990"
+>E.254.1. Migration to Version 7.4.13</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ><P
@@ -156,8 +153,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162253"
->E.227.2. Changes</A
+NAME="AEN166998"
+>E.254.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-14.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-14.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-14"
->E.226. Release 7.4.14</A
+>E.253. Release 7.4.14</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-10-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.13.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162214"
->E.226.1. Migration to Version 7.4.14</A
+NAME="AEN166959"
+>E.253.1. Migration to Version 7.4.14</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162218"
->E.226.2. Changes</A
+NAME="AEN166963"
+>E.253.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-15.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-15.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-15"
->E.225. Release 7.4.15</A
+>E.252. Release 7.4.15</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-01-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.14.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162173"
->E.225.1. Migration to Version 7.4.15</A
+NAME="AEN166918"
+>E.252.1. Migration to Version 7.4.15</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162177"
->E.225.2. Changes</A
+NAME="AEN166922"
+>E.252.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-16.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-16.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-16"
->E.224. Release 7.4.16</A
+>E.251. Release 7.4.16</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-02-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.15, including
@@ -111,7 +108,7 @@
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162149"
->E.224.1. Migration to Version 7.4.16</A
+NAME="AEN166894"
+>E.251.1. Migration to Version 7.4.16</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162153"
->E.224.2. Changes</A
+NAME="AEN166898"
+>E.251.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-17.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-17.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-17"
->E.223. Release 7.4.17</A
+>E.250. Release 7.4.17</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-04-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains fixes from 7.4.16,
@@ -111,7 +108,7 @@
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162120"
->E.223.1. Migration to Version 7.4.17</A
+NAME="AEN166865"
+>E.250.1. Migration to Version 7.4.17</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162124"
->E.223.2. Changes</A
+NAME="AEN166869"
+>E.250.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-18.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-18.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-18"
->E.222. Release 7.4.18</A
+>E.249. Release 7.4.18</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-09-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains fixes from 7.4.17.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162088"
->E.222.1. Migration to Version 7.4.18</A
+NAME="AEN166833"
+>E.249.1. Migration to Version 7.4.18</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162092"
->E.222.2. Changes</A
+NAME="AEN166837"
+>E.249.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-19.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-19.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-19.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-19.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-19"
->E.221. Release 7.4.19</A
+>E.248. Release 7.4.19</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-01-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.18,
@@ -111,7 +108,7 @@
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162022"
->E.221.1. Migration to Version 7.4.19</A
+NAME="AEN166767"
+>E.248.1. Migration to Version 7.4.19</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162026"
->E.221.2. Changes</A
+NAME="AEN166771"
+>E.248.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-1.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-1.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-1"
->E.239. Release 7.4.1</A
+>E.266. Release 7.4.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2003-12-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162876"
->E.239.1. Migration to Version 7.4.1</A
+NAME="AEN167621"
+>E.266.1. Migration to Version 7.4.1</A
 ></H2
 ><P
 >    A dump/restore is <SPAN
@@ -161,8 +158,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162885"
->E.239.2. Changes</A
+NAME="AEN167630"
+>E.266.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-20.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-20.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-20.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-20.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-20"
->E.220. Release 7.4.20</A
+>E.247. Release 7.4.20</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >never released</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.19.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161959"
->E.220.1. Migration to Version 7.4.20</A
+NAME="AEN166704"
+>E.247.1. Migration to Version 7.4.20</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161963"
->E.220.2. Changes</A
+NAME="AEN166708"
+>E.247.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-21.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-21.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-21.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-21.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-21"
->E.219. Release 7.4.21</A
+>E.246. Release 7.4.21</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-06-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains one serious bug fix over 7.4.20.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161936"
->E.219.1. Migration to Version 7.4.21</A
+NAME="AEN166681"
+>E.246.1. Migration to Version 7.4.21</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161940"
->E.219.2. Changes</A
+NAME="AEN166685"
+>E.246.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-22.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-22.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-22.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-22.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-22"
->E.218. Release 7.4.22</A
+>E.245. Release 7.4.22</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-09-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.21.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161904"
->E.218.1. Migration to Version 7.4.22</A
+NAME="AEN166649"
+>E.245.1. Migration to Version 7.4.22</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161908"
->E.218.2. Changes</A
+NAME="AEN166653"
+>E.245.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-23.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-23.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-23.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-23.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-23"
->E.217. Release 7.4.23</A
+>E.244. Release 7.4.23</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-11-03</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.22.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161872"
->E.217.1. Migration to Version 7.4.23</A
+NAME="AEN166617"
+>E.244.1. Migration to Version 7.4.23</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161876"
->E.217.2. Changes</A
+NAME="AEN166621"
+>E.244.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-24.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-24.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-24.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-24.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-24"
->E.216. Release 7.4.24</A
+>E.243. Release 7.4.24</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-02-02</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.23.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161833"
->E.216.1. Migration to Version 7.4.24</A
+NAME="AEN166578"
+>E.243.1. Migration to Version 7.4.24</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161837"
->E.216.2. Changes</A
+NAME="AEN166582"
+>E.243.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-25.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-25.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-25.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-25.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-25"
->E.215. Release 7.4.25</A
+>E.242. Release 7.4.25</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-03-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.24.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161805"
->E.215.1. Migration to Version 7.4.25</A
+NAME="AEN166550"
+>E.242.1. Migration to Version 7.4.25</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161809"
->E.215.2. Changes</A
+NAME="AEN166554"
+>E.242.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-26.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-26.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-26.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-26.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-26"
->E.214. Release 7.4.26</A
+>E.241. Release 7.4.26</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-09-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.25.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161751"
->E.214.1. Migration to Version 7.4.26</A
+NAME="AEN166496"
+>E.241.1. Migration to Version 7.4.26</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
@@ -134,7 +131,7 @@
     Also, if you are upgrading from a version earlier than 7.4.11,
     see <A
 HREF="release-7-4-11.html"
->Section E.229</A
+>Section E.256</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161757"
->E.214.2. Changes</A
+NAME="AEN166502"
+>E.241.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-27.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-27.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-27.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-27.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-27"
->E.213. Release 7.4.27</A
+>E.240. Release 7.4.27</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-12-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.26.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161709"
->E.213.1. Migration to Version 7.4.27</A
+NAME="AEN166454"
+>E.240.1. Migration to Version 7.4.27</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.26,
     see <A
 HREF="release-7-4-26.html"
->Section E.214</A
+>Section E.241</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161713"
->E.213.2. Changes</A
+NAME="AEN166458"
+>E.240.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-28.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-28.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-28.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-28.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-28"
->E.212. Release 7.4.28</A
+>E.239. Release 7.4.28</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-03-15</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.27.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><P
@@ -126,15 +123,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161663"
->E.212.1. Migration to Version 7.4.28</A
+NAME="AEN166408"
+>E.239.1. Migration to Version 7.4.28</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.26,
     see <A
 HREF="release-7-4-26.html"
->Section E.214</A
+>Section E.241</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161667"
->E.212.2. Changes</A
+NAME="AEN166412"
+>E.239.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-29.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-29.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-29.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-29.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-29"
->E.211. Release 7.4.29</A
+>E.238. Release 7.4.29</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-05-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.28.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><P
@@ -126,15 +123,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161605"
->E.211.1. Migration to Version 7.4.29</A
+NAME="AEN166350"
+>E.238.1. Migration to Version 7.4.29</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.26,
     see <A
 HREF="release-7-4-26.html"
->Section E.214</A
+>Section E.241</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161609"
->E.211.2. Changes</A
+NAME="AEN166354"
+>E.238.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-2.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-2.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-2"
->E.238. Release 7.4.2</A
+>E.265. Release 7.4.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2004-03-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.1.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162783"
->E.238.1. Migration to Version 7.4.2</A
+NAME="AEN167528"
+>E.265.1. Migration to Version 7.4.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
@@ -267,8 +264,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162814"
->E.238.2. Changes</A
+NAME="AEN167559"
+>E.265.2. Changes</A
 ></H2
 ><P
 >   Release 7.4.2 incorporates all the fixes included in release 7.3.6,
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-30.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-30.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-30.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-30.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-30"
->E.210. Release 7.4.30</A
+>E.237. Release 7.4.30</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-10-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.29.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><P
@@ -126,15 +123,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161562"
->E.210.1. Migration to Version 7.4.30</A
+NAME="AEN166307"
+>E.237.1. Migration to Version 7.4.30</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.26,
     see <A
 HREF="release-7-4-26.html"
->Section E.214</A
+>Section E.241</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161566"
->E.210.2. Changes</A
+NAME="AEN166311"
+>E.237.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-3.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-3.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-3"
->E.237. Release 7.4.3</A
+>E.264. Release 7.4.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2004-06-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.2.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162730"
->E.237.1. Migration to Version 7.4.3</A
+NAME="AEN167475"
+>E.264.1. Migration to Version 7.4.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162733"
->E.237.2. Changes</A
+NAME="AEN167478"
+>E.264.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-4.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-4.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-4"
->E.236. Release 7.4.4</A
+>E.263. Release 7.4.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2004-08-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.3.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162689"
->E.236.1. Migration to Version 7.4.4</A
+NAME="AEN167434"
+>E.263.1. Migration to Version 7.4.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162692"
->E.236.2. Changes</A
+NAME="AEN167437"
+>E.263.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-5.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-5.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-5"
->E.235. Release 7.4.5</A
+>E.262. Release 7.4.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2004-08-18</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains one serious bug fix over 7.4.4.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162673"
->E.235.1. Migration to Version 7.4.5</A
+NAME="AEN167418"
+>E.262.1. Migration to Version 7.4.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162676"
->E.235.2. Changes</A
+NAME="AEN167421"
+>E.262.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-6.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-6.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-6"
->E.234. Release 7.4.6</A
+>E.261. Release 7.4.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2004-10-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.5.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162622"
->E.234.1. Migration to Version 7.4.6</A
+NAME="AEN167367"
+>E.261.1. Migration to Version 7.4.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162625"
->E.234.2. Changes</A
+NAME="AEN167370"
+>E.261.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-7.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-7.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-7"
->E.233. Release 7.4.7</A
+>E.260. Release 7.4.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-01-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.6, including several
@@ -111,7 +108,7 @@
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -119,8 +116,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162586"
->E.233.1. Migration to Version 7.4.7</A
+NAME="AEN167331"
+>E.260.1. Migration to Version 7.4.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.
@@ -131,8 +128,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162589"
->E.233.2. Changes</A
+NAME="AEN167334"
+>E.260.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-8.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-8.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-8"
->E.232. Release 7.4.8</A
+>E.259. Release 7.4.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-05-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.7, including several
@@ -111,7 +108,7 @@
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -119,8 +116,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162479"
->E.232.1. Migration to Version 7.4.8</A
+NAME="AEN167224"
+>E.259.1. Migration to Version 7.4.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
@@ -259,8 +256,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162504"
->E.232.2. Changes</A
+NAME="AEN167249"
+>E.259.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4-9.html	2016-03-28 20:21:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4-9.html	2017-08-07 21:33:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4-9"
->E.231. Release 7.4.9</A
+>E.258. Release 7.4.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-10-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 7.4.8.
    For information about new features in the 7.4 major release, see
    <A
 HREF="release-7-4.html"
->Section E.240</A
+>Section E.267</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162416"
->E.231.1. Migration to Version 7.4.9</A
+NAME="AEN167161"
+>E.258.1. Migration to Version 7.4.9</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.8,
     see <A
 HREF="release-7-4-8.html"
->Section E.232</A
+>Section E.259</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162420"
->E.231.2. Changes</A
+NAME="AEN167165"
+>E.258.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-7-4.html	2016-03-28 20:21:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-7-4.html	2017-08-07 21:33:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-7-4"
->E.240. Release 7.4</A
+>E.267. Release 7.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2003-11-17</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN162974"
->E.240.1. Overview</A
+NAME="AEN167719"
+>E.267.1. Overview</A
 ></H2
 ><P
 >   Major changes in this release:
@@ -381,8 +378,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN163071"
->E.240.2. Migration to Version 7.4</A
+NAME="AEN167816"
+>E.267.2. Migration to Version 7.4</A
 ></H2
 ><P
 >   A dump/restore using <SPAN
@@ -649,8 +646,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN163141"
->E.240.3. Changes</A
+NAME="AEN167886"
+>E.267.3. Changes</A
 ></H2
 ><P
 >   Below you will find a detailed account of the changes between
@@ -661,8 +658,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163144"
->E.240.3.1. Server Operation Changes</A
+NAME="AEN167889"
+>E.267.3.1. Server Operation Changes</A
 ></H3
 ><P
 ></P
@@ -802,8 +799,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163195"
->E.240.3.2. Performance Improvements</A
+NAME="AEN167940"
+>E.267.3.2. Performance Improvements</A
 ></H3
 ><P
 ></P
@@ -1043,8 +1040,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163279"
->E.240.3.3. Server Configuration Changes</A
+NAME="AEN168024"
+>E.267.3.3. Server Configuration Changes</A
 ></H3
 ><P
 ></P
@@ -1322,8 +1319,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163372"
->E.240.3.4. Query Changes</A
+NAME="AEN168117"
+>E.267.3.4. Query Changes</A
 ></H3
 ><P
 ></P
@@ -1435,8 +1432,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163410"
->E.240.3.5. Object Manipulation Changes</A
+NAME="AEN168155"
+>E.267.3.5. Object Manipulation Changes</A
 ></H3
 ><P
 ></P
@@ -1596,8 +1593,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163465"
->E.240.3.6. Utility Command Changes</A
+NAME="AEN168210"
+>E.267.3.6. Utility Command Changes</A
 ></H3
 ><P
 ></P
@@ -1933,8 +1930,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163576"
->E.240.3.7. Data Type and Function Changes</A
+NAME="AEN168321"
+>E.267.3.7. Data Type and Function Changes</A
 ></H3
 ><P
 ></P
@@ -2440,8 +2437,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163745"
->E.240.3.8. Server-Side Language Changes</A
+NAME="AEN168490"
+>E.267.3.8. Server-Side Language Changes</A
 ></H3
 ><P
 ></P
@@ -2536,8 +2533,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163778"
->E.240.3.9. psql Changes</A
+NAME="AEN168523"
+>E.267.3.9. psql Changes</A
 ></H3
 ><P
 ></P
@@ -2658,8 +2655,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163823"
->E.240.3.10. pg_dump Changes</A
+NAME="AEN168568"
+>E.267.3.10. pg_dump Changes</A
 ></H3
 ><P
 ></P
@@ -2764,8 +2761,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163860"
->E.240.3.11. libpq Changes</A
+NAME="AEN168605"
+>E.267.3.11. libpq Changes</A
 ></H3
 ><P
 ></P
@@ -2915,8 +2912,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163909"
->E.240.3.12. JDBC Changes</A
+NAME="AEN168654"
+>E.267.3.12. JDBC Changes</A
 ></H3
 ><P
 ></P
@@ -2954,8 +2951,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163924"
->E.240.3.13. Miscellaneous Interface Changes</A
+NAME="AEN168669"
+>E.267.3.13. Miscellaneous Interface Changes</A
 ></H3
 ><P
 ></P
@@ -3011,8 +3008,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163943"
->E.240.3.14. Source Code Changes</A
+NAME="AEN168688"
+>E.267.3.14. Source Code Changes</A
 ></H3
 ><P
 ></P
@@ -3136,8 +3133,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN163996"
->E.240.3.15. Contrib Changes</A
+NAME="AEN168741"
+>E.267.3.15. Contrib Changes</A
 ></H3
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-10.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-10.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-10"
->E.199. Release 8.0.10</A
+>E.226. Release 8.0.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-01-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.9.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159797"
->E.199.1. Migration to Version 8.0.10</A
+NAME="AEN164542"
+>E.226.1. Migration to Version 8.0.10</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159801"
->E.199.2. Changes</A
+NAME="AEN164546"
+>E.226.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-11.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-11.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-11"
->E.198. Release 8.0.11</A
+>E.225. Release 8.0.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-02-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.10, including
@@ -111,7 +108,7 @@
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159773"
->E.198.1. Migration to Version 8.0.11</A
+NAME="AEN164518"
+>E.225.1. Migration to Version 8.0.11</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159777"
->E.198.2. Changes</A
+NAME="AEN164522"
+>E.225.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-12.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-12.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-12"
->E.197. Release 8.0.12</A
+>E.224. Release 8.0.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-02-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains one fix from 8.0.11.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159757"
->E.197.1. Migration to Version 8.0.12</A
+NAME="AEN164502"
+>E.224.1. Migration to Version 8.0.12</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159761"
->E.197.2. Changes</A
+NAME="AEN164506"
+>E.224.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-13.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-13.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-13"
->E.196. Release 8.0.13</A
+>E.223. Release 8.0.13</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-04-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.12,
@@ -111,7 +108,7 @@
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159726"
->E.196.1. Migration to Version 8.0.13</A
+NAME="AEN164471"
+>E.223.1. Migration to Version 8.0.13</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159730"
->E.196.2. Changes</A
+NAME="AEN164475"
+>E.223.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-14.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-14.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-14"
->E.195. Release 8.0.14</A
+>E.222. Release 8.0.14</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-09-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.13.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159683"
->E.195.1. Migration to Version 8.0.14</A
+NAME="AEN164428"
+>E.222.1. Migration to Version 8.0.14</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159687"
->E.195.2. Changes</A
+NAME="AEN164432"
+>E.222.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-15.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-15.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-15"
->E.194. Release 8.0.15</A
+>E.221. Release 8.0.15</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-01-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.14,
@@ -111,7 +108,7 @@
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><P
@@ -133,15 +130,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159594"
->E.194.1. Migration to Version 8.0.15</A
+NAME="AEN164339"
+>E.221.1. Migration to Version 8.0.15</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -150,8 +147,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159598"
->E.194.2. Changes</A
+NAME="AEN164343"
+>E.221.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-16.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-16.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-16"
->E.193. Release 8.0.16</A
+>E.220. Release 8.0.16</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >never released</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.15.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159488"
->E.193.1. Migration to Version 8.0.16</A
+NAME="AEN164233"
+>E.220.1. Migration to Version 8.0.16</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159492"
->E.193.2. Changes</A
+NAME="AEN164237"
+>E.220.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-17.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-17.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-17"
->E.192. Release 8.0.17</A
+>E.219. Release 8.0.17</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-06-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains one serious bug fix over 8.0.16.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159465"
->E.192.1. Migration to Version 8.0.17</A
+NAME="AEN164210"
+>E.219.1. Migration to Version 8.0.17</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159469"
->E.192.2. Changes</A
+NAME="AEN164214"
+>E.219.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-18.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-18.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-18"
->E.191. Release 8.0.18</A
+>E.218. Release 8.0.18</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-09-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.17.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159411"
->E.191.1. Migration to Version 8.0.18</A
+NAME="AEN164156"
+>E.218.1. Migration to Version 8.0.18</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159415"
->E.191.2. Changes</A
+NAME="AEN164160"
+>E.218.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-19.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-19.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-19.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-19.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-19"
->E.190. Release 8.0.19</A
+>E.217. Release 8.0.19</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-11-03</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.18.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159369"
->E.190.1. Migration to Version 8.0.19</A
+NAME="AEN164114"
+>E.217.1. Migration to Version 8.0.19</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159373"
->E.190.2. Changes</A
+NAME="AEN164118"
+>E.217.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-1.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-1.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-1"
->E.208. Release 8.0.1</A
+>E.235. Release 8.0.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-01-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.0, including several
@@ -111,7 +108,7 @@
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -119,8 +116,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160476"
->E.208.1. Migration to Version 8.0.1</A
+NAME="AEN165221"
+>E.235.1. Migration to Version 8.0.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.0.
@@ -131,8 +128,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160479"
->E.208.2. Changes</A
+NAME="AEN165224"
+>E.235.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-20.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-20.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-20.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-20.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-20"
->E.189. Release 8.0.20</A
+>E.216. Release 8.0.20</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-02-02</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.19.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159331"
->E.189.1. Migration to Version 8.0.20</A
+NAME="AEN164076"
+>E.216.1. Migration to Version 8.0.20</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159335"
->E.189.2. Changes</A
+NAME="AEN164080"
+>E.216.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-21.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-21.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-21.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-21.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-21"
->E.188. Release 8.0.21</A
+>E.215. Release 8.0.21</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-03-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.20.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159303"
->E.188.1. Migration to Version 8.0.21</A
+NAME="AEN164048"
+>E.215.1. Migration to Version 8.0.21</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159307"
->E.188.2. Changes</A
+NAME="AEN164052"
+>E.215.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-22.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-22.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-22.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-22.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-22"
->E.187. Release 8.0.22</A
+>E.214. Release 8.0.22</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-09-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.21.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159231"
->E.187.1. Migration to Version 8.0.22</A
+NAME="AEN163976"
+>E.214.1. Migration to Version 8.0.22</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
@@ -134,7 +131,7 @@
     Also, if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159237"
->E.187.2. Changes</A
+NAME="AEN163982"
+>E.214.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-23.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-23.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-23.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-23.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-23"
->E.186. Release 8.0.23</A
+>E.213. Release 8.0.23</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-12-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.22.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159177"
->E.186.1. Migration to Version 8.0.23</A
+NAME="AEN163922"
+>E.213.1. Migration to Version 8.0.23</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.22,
     see <A
 HREF="release-8-0-22.html"
->Section E.187</A
+>Section E.214</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159181"
->E.186.2. Changes</A
+NAME="AEN163926"
+>E.213.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-24.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-24.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-24.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-24.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-24"
->E.185. Release 8.0.24</A
+>E.212. Release 8.0.24</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-03-15</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.23.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><P
@@ -126,15 +123,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159111"
->E.185.1. Migration to Version 8.0.24</A
+NAME="AEN163856"
+>E.212.1. Migration to Version 8.0.24</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.22,
     see <A
 HREF="release-8-0-22.html"
->Section E.187</A
+>Section E.214</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159115"
->E.185.2. Changes</A
+NAME="AEN163860"
+>E.212.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-25.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-25.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-25.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-25.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-25"
->E.184. Release 8.0.25</A
+>E.211. Release 8.0.25</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-05-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.24.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><P
@@ -126,15 +123,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159047"
->E.184.1. Migration to Version 8.0.25</A
+NAME="AEN163792"
+>E.211.1. Migration to Version 8.0.25</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.22,
     see <A
 HREF="release-8-0-22.html"
->Section E.187</A
+>Section E.214</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159051"
->E.184.2. Changes</A
+NAME="AEN163796"
+>E.211.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-26.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-26.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-26.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-26.html	2017-08-07 21:33:03.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-26"
->E.183. Release 8.0.26</A
+>E.210. Release 8.0.26</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-10-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.25.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><P
@@ -126,15 +123,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN158977"
->E.183.1. Migration to Version 8.0.26</A
+NAME="AEN163722"
+>E.210.1. Migration to Version 8.0.26</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.22,
     see <A
 HREF="release-8-0-22.html"
->Section E.187</A
+>Section E.214</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN158981"
->E.183.2. Changes</A
+NAME="AEN163726"
+>E.210.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-2.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-2.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-2"
->E.207. Release 8.0.2</A
+>E.234. Release 8.0.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-04-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.1.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160334"
->E.207.1. Migration to Version 8.0.2</A
+NAME="AEN165079"
+>E.234.1. Migration to Version 8.0.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.*.
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160338"
->E.207.2. Changes</A
+NAME="AEN165083"
+>E.234.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-3.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-3.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-3"
->E.206. Release 8.0.3</A
+>E.233. Release 8.0.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-05-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.2, including several
@@ -111,7 +108,7 @@
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -119,8 +116,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160251"
->E.206.1. Migration to Version 8.0.3</A
+NAME="AEN164996"
+>E.233.1. Migration to Version 8.0.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
@@ -178,8 +175,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160263"
->E.206.2. Changes</A
+NAME="AEN165008"
+>E.233.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-4.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-4.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-4"
->E.205. Release 8.0.4</A
+>E.232. Release 8.0.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-10-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.3.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160146"
->E.205.1. Migration to Version 8.0.4</A
+NAME="AEN164891"
+>E.232.1. Migration to Version 8.0.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.3,
     see <A
 HREF="release-8-0-3.html"
->Section E.206</A
+>Section E.233</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160150"
->E.205.2. Changes</A
+NAME="AEN164895"
+>E.232.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-5.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-5.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-5"
->E.204. Release 8.0.5</A
+>E.231. Release 8.0.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-12-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.4.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160093"
->E.204.1. Migration to Version 8.0.5</A
+NAME="AEN164838"
+>E.231.1. Migration to Version 8.0.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.3,
     see <A
 HREF="release-8-0-3.html"
->Section E.206</A
+>Section E.233</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160097"
->E.204.2. Changes</A
+NAME="AEN164842"
+>E.231.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-6.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-6.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-6"
->E.203. Release 8.0.6</A
+>E.230. Release 8.0.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-01-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.5.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160042"
->E.203.1. Migration to Version 8.0.6</A
+NAME="AEN164787"
+>E.230.1. Migration to Version 8.0.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.3,
     see <A
 HREF="release-8-0-3.html"
->Section E.206</A
+>Section E.233</A
 >.
     Also, you might need to <TT
 CLASS="COMMAND"
@@ -144,8 +141,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160048"
->E.203.2. Changes</A
+NAME="AEN164793"
+>E.230.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-7.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-7.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-7"
->E.202. Release 8.0.7</A
+>E.229. Release 8.0.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-02-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.6.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159969"
->E.202.1. Migration to Version 8.0.7</A
+NAME="AEN164714"
+>E.229.1. Migration to Version 8.0.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159973"
->E.202.2. Changes</A
+NAME="AEN164718"
+>E.229.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-8.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-8.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-8"
->E.201. Release 8.0.8</A
+>E.228. Release 8.0.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-05-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.7,
@@ -111,7 +108,7 @@
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159896"
->E.201.1. Migration to Version 8.0.8</A
+NAME="AEN164641"
+>E.228.1. Migration to Version 8.0.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ><P
@@ -156,8 +153,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159904"
->E.201.2. Changes</A
+NAME="AEN164649"
+>E.228.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0-9.html	2016-03-28 20:21:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0-9.html	2017-08-07 21:33:04.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0-9"
->E.200. Release 8.0.9</A
+>E.227. Release 8.0.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-10-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.0.8.
    For information about new features in the 8.0 major release, see
    <A
 HREF="release-8-0.html"
->Section E.209</A
+>Section E.236</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159848"
->E.200.1. Migration to Version 8.0.9</A
+NAME="AEN164593"
+>E.227.1. Migration to Version 8.0.9</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
     see <A
 HREF="release-8-0-6.html"
->Section E.203</A
+>Section E.230</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN159852"
->E.200.2. Changes</A
+NAME="AEN164597"
+>E.227.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-0.html	2016-03-28 20:21:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-0.html	2017-08-07 21:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-0"
->E.209. Release 8.0</A
+>E.236. Release 8.0</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-01-19</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160523"
->E.209.1. Overview</A
+NAME="AEN165268"
+>E.236.1. Overview</A
 ></H2
 ><P
 >    Major changes in this release:
@@ -299,8 +296,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160583"
->E.209.2. Migration to Version 8.0</A
+NAME="AEN165328"
+>E.236.2. Migration to Version 8.0</A
 ></H2
 ><P
 >    A dump/restore using <SPAN
@@ -686,8 +683,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160694"
->E.209.3. Deprecated Features</A
+NAME="AEN165439"
+>E.236.3. Deprecated Features</A
 ></H2
 ><P
 >    Some aspects of <SPAN
@@ -776,8 +773,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN160717"
->E.209.4. Changes</A
+NAME="AEN165462"
+>E.236.4. Changes</A
 ></H2
 ><P
 >    Below you will find a detailed account of the changes between
@@ -788,8 +785,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN160720"
->E.209.4.1. Performance Improvements</A
+NAME="AEN165465"
+>E.236.4.1. Performance Improvements</A
 ></H3
 ><P
 ></P
@@ -1026,8 +1023,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN160785"
->E.209.4.2. Server Changes</A
+NAME="AEN165530"
+>E.236.4.2. Server Changes</A
 ></H3
 ><P
 ></P
@@ -1388,8 +1385,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN160893"
->E.209.4.3. Query Changes</A
+NAME="AEN165638"
+>E.236.4.3. Query Changes</A
 ></H3
 ><P
 ></P
@@ -1588,8 +1585,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN160952"
->E.209.4.4. Object Manipulation Changes</A
+NAME="AEN165697"
+>E.236.4.4. Object Manipulation Changes</A
 ></H3
 ><P
 ></P
@@ -1852,8 +1849,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN161033"
->E.209.4.5. Utility Command Changes</A
+NAME="AEN165778"
+>E.236.4.5. Utility Command Changes</A
 ></H3
 ><P
 ></P
@@ -2077,8 +2074,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN161102"
->E.209.4.6. Data Type and Function Changes</A
+NAME="AEN165847"
+>E.236.4.6. Data Type and Function Changes</A
 ></H3
 ><P
 ></P
@@ -2508,8 +2505,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN161239"
->E.209.4.7. Server-Side Language Changes</A
+NAME="AEN165984"
+>E.236.4.7. Server-Side Language Changes</A
 ></H3
 ><P
 ></P
@@ -2669,8 +2666,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN161286"
->E.209.4.8. <SPAN
+NAME="AEN166031"
+>E.236.4.8. <SPAN
 CLASS="APPLICATION"
 >psql</SPAN
 > Changes</A
@@ -2874,8 +2871,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN161353"
->E.209.4.9. <SPAN
+NAME="AEN166098"
+>E.236.4.9. <SPAN
 CLASS="APPLICATION"
 >pg_dump</SPAN
 > Changes</A
@@ -3000,8 +2997,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN161392"
->E.209.4.10. libpq Changes</A
+NAME="AEN166137"
+>E.236.4.10. libpq Changes</A
 ></H3
 ><P
 ></P
@@ -3088,8 +3085,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN161420"
->E.209.4.11. Source Code Changes</A
+NAME="AEN166165"
+>E.236.4.11. Source Code Changes</A
 ></H3
 ><P
 ></P
@@ -3358,8 +3355,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN161513"
->E.209.4.12. Contrib Changes</A
+NAME="AEN166258"
+>E.236.4.12. Contrib Changes</A
 ></H3
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-10.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-10.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-10"
->E.172. Release 8.1.10</A
+>E.199. Release 8.1.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-09-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.9.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157429"
->E.172.1. Migration to Version 8.1.10</A
+NAME="AEN162174"
+>E.199.1. Migration to Version 8.1.10</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157433"
->E.172.2. Changes</A
+NAME="AEN162178"
+>E.199.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-11.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-11.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-11"
->E.171. Release 8.1.11</A
+>E.198. Release 8.1.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-01-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.10,
@@ -111,7 +108,7 @@
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><P
@@ -133,15 +130,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157325"
->E.171.1. Migration to Version 8.1.11</A
+NAME="AEN162070"
+>E.198.1. Migration to Version 8.1.11</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -150,8 +147,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157329"
->E.171.2. Changes</A
+NAME="AEN162074"
+>E.198.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-12.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-12.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-12"
->E.170. Release 8.1.12</A
+>E.197. Release 8.1.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >never released</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.11.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157213"
->E.170.1. Migration to Version 8.1.12</A
+NAME="AEN161958"
+>E.197.1. Migration to Version 8.1.12</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157217"
->E.170.2. Changes</A
+NAME="AEN161962"
+>E.197.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-13.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-13.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-13"
->E.169. Release 8.1.13</A
+>E.196. Release 8.1.13</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-06-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains one serious and one minor bug fix over 8.1.12.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157183"
->E.169.1. Migration to Version 8.1.13</A
+NAME="AEN161928"
+>E.196.1. Migration to Version 8.1.13</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157187"
->E.169.2. Changes</A
+NAME="AEN161932"
+>E.196.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-14.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-14.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-14"
->E.168. Release 8.1.14</A
+>E.195. Release 8.1.14</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-09-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.13.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157114"
->E.168.1. Migration to Version 8.1.14</A
+NAME="AEN161859"
+>E.195.1. Migration to Version 8.1.14</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157118"
->E.168.2. Changes</A
+NAME="AEN161863"
+>E.195.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-15.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-15.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-15"
->E.167. Release 8.1.15</A
+>E.194. Release 8.1.15</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-11-03</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.14.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157053"
->E.167.1. Migration to Version 8.1.15</A
+NAME="AEN161798"
+>E.194.1. Migration to Version 8.1.15</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.  Also, if you were running a previous
     8.1.X release, it is recommended to <TT
 CLASS="COMMAND"
@@ -140,8 +137,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157058"
->E.167.2. Changes</A
+NAME="AEN161803"
+>E.194.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-16.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-16.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-16"
->E.166. Release 8.1.16</A
+>E.193. Release 8.1.16</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-02-02</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.15.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157006"
->E.166.1. Migration to Version 8.1.16</A
+NAME="AEN161751"
+>E.193.1. Migration to Version 8.1.16</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.15,
     see <A
 HREF="release-8-1-15.html"
->Section E.167</A
+>Section E.194</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157010"
->E.166.2. Changes</A
+NAME="AEN161755"
+>E.193.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-17.html	2016-03-28 20:21:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-17.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-17"
->E.165. Release 8.1.17</A
+>E.192. Release 8.1.17</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-03-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.16.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156962"
->E.165.1. Migration to Version 8.1.17</A
+NAME="AEN161707"
+>E.192.1. Migration to Version 8.1.17</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.15,
     see <A
 HREF="release-8-1-15.html"
->Section E.167</A
+>Section E.194</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156966"
->E.165.2. Changes</A
+NAME="AEN161711"
+>E.192.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-18.html	2016-03-28 20:21:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-18.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-18"
->E.164. Release 8.1.18</A
+>E.191. Release 8.1.18</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-09-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.17.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156890"
->E.164.1. Migration to Version 8.1.18</A
+NAME="AEN161635"
+>E.191.1. Migration to Version 8.1.18</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
@@ -134,7 +131,7 @@
     Also, if you are upgrading from a version earlier than 8.1.15,
     see <A
 HREF="release-8-1-15.html"
->Section E.167</A
+>Section E.194</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156896"
->E.164.2. Changes</A
+NAME="AEN161641"
+>E.191.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-19.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-19.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-19.html	2016-03-28 20:21:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-19.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-19"
->E.163. Release 8.1.19</A
+>E.190. Release 8.1.19</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-12-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.18.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156827"
->E.163.1. Migration to Version 8.1.19</A
+NAME="AEN161572"
+>E.190.1. Migration to Version 8.1.19</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.18,
     see <A
 HREF="release-8-1-18.html"
->Section E.164</A
+>Section E.191</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156831"
->E.163.2. Changes</A
+NAME="AEN161576"
+>E.190.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-1.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-1.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-1"
->E.181. Release 8.1.1</A
+>E.208. Release 8.1.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-12-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.0.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157969"
->E.181.1. Migration to Version 8.1.1</A
+NAME="AEN162714"
+>E.208.1. Migration to Version 8.1.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157972"
->E.181.2. Changes</A
+NAME="AEN162717"
+>E.208.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-20.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-20.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-20.html	2016-03-28 20:21:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-20.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-20"
->E.162. Release 8.1.20</A
+>E.189. Release 8.1.20</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-03-15</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.19.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156754"
->E.162.1. Migration to Version 8.1.20</A
+NAME="AEN161499"
+>E.189.1. Migration to Version 8.1.20</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.18,
     see <A
 HREF="release-8-1-18.html"
->Section E.164</A
+>Section E.191</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156758"
->E.162.2. Changes</A
+NAME="AEN161503"
+>E.189.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-21.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-21.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-21.html	2016-03-28 20:21:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-21.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-21"
->E.161. Release 8.1.21</A
+>E.188. Release 8.1.21</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-05-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.20.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156692"
->E.161.1. Migration to Version 8.1.21</A
+NAME="AEN161437"
+>E.188.1. Migration to Version 8.1.21</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.18,
     see <A
 HREF="release-8-1-18.html"
->Section E.164</A
+>Section E.191</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156696"
->E.161.2. Changes</A
+NAME="AEN161441"
+>E.188.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-22.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-22.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-22.html	2016-03-28 20:21:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-22.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-22"
->E.160. Release 8.1.22</A
+>E.187. Release 8.1.22</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-10-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.21.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><P
@@ -126,15 +123,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156620"
->E.160.1. Migration to Version 8.1.22</A
+NAME="AEN161365"
+>E.187.1. Migration to Version 8.1.22</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.18,
     see <A
 HREF="release-8-1-18.html"
->Section E.164</A
+>Section E.191</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156624"
->E.160.2. Changes</A
+NAME="AEN161369"
+>E.187.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-23.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-23.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-23.html	2016-03-28 20:21:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-23.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-23"
->E.159. Release 8.1.23</A
+>E.186. Release 8.1.23</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-12-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.22.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><P
@@ -126,15 +123,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156531"
->E.159.1. Migration to Version 8.1.23</A
+NAME="AEN161276"
+>E.186.1. Migration to Version 8.1.23</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.18,
     see <A
 HREF="release-8-1-18.html"
->Section E.164</A
+>Section E.191</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156535"
->E.159.2. Changes</A
+NAME="AEN161280"
+>E.186.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-2.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-2.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-2"
->E.180. Release 8.1.2</A
+>E.207. Release 8.1.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-01-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.1.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157902"
->E.180.1. Migration to Version 8.1.2</A
+NAME="AEN162647"
+>E.207.1. Migration to Version 8.1.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
@@ -139,8 +136,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157907"
->E.180.2. Changes</A
+NAME="AEN162652"
+>E.207.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-3.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-3.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-3"
->E.179. Release 8.1.3</A
+>E.206. Release 8.1.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-02-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.2,
@@ -111,7 +108,7 @@
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157808"
->E.179.1. Migration to Version 8.1.3</A
+NAME="AEN162553"
+>E.206.1. Migration to Version 8.1.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157812"
->E.179.2. Changes</A
+NAME="AEN162557"
+>E.206.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-4.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-4.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-4"
->E.178. Release 8.1.4</A
+>E.205. Release 8.1.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-05-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.3,
@@ -111,7 +108,7 @@
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157702"
->E.178.1. Migration to Version 8.1.4</A
+NAME="AEN162447"
+>E.205.1. Migration to Version 8.1.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ><P
@@ -156,8 +153,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157710"
->E.178.2. Changes</A
+NAME="AEN162455"
+>E.205.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-5.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-5.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-5"
->E.177. Release 8.1.5</A
+>E.204. Release 8.1.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-10-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.4.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157627"
->E.177.1. Migration to Version 8.1.5</A
+NAME="AEN162372"
+>E.204.1. Migration to Version 8.1.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157631"
->E.177.2. Changes</A
+NAME="AEN162376"
+>E.204.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-6.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-6.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-6"
->E.176. Release 8.1.6</A
+>E.203. Release 8.1.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-01-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.5.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157565"
->E.176.1. Migration to Version 8.1.6</A
+NAME="AEN162310"
+>E.203.1. Migration to Version 8.1.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157569"
->E.176.2. Changes</A
+NAME="AEN162314"
+>E.203.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-7.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-7.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-7"
->E.175. Release 8.1.7</A
+>E.202. Release 8.1.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-02-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.6, including
@@ -111,7 +108,7 @@
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157530"
->E.175.1. Migration to Version 8.1.7</A
+NAME="AEN162275"
+>E.202.1. Migration to Version 8.1.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157534"
->E.175.2. Changes</A
+NAME="AEN162279"
+>E.202.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-8.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-8.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-8"
->E.174. Release 8.1.8</A
+>E.201. Release 8.1.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-02-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains one fix from 8.1.7.
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157514"
->E.174.1. Migration to Version 8.1.8</A
+NAME="AEN162259"
+>E.201.1. Migration to Version 8.1.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157518"
->E.174.2. Changes</A
+NAME="AEN162263"
+>E.201.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1-9.html	2016-03-28 20:21:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1-9.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1-9"
->E.173. Release 8.1.9</A
+>E.200. Release 8.1.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-04-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.1.8,
@@ -111,7 +108,7 @@
    For information about new features in the 8.1 major release, see
    <A
 HREF="release-8-1.html"
->Section E.182</A
+>Section E.209</A
 >.
   </P
 ><DIV
@@ -119,15 +116,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157478"
->E.173.1. Migration to Version 8.1.9</A
+NAME="AEN162223"
+>E.200.1. Migration to Version 8.1.9</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
     see <A
 HREF="release-8-1-2.html"
->Section E.180</A
+>Section E.207</A
 >.
    </P
 ></DIV
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157482"
->E.173.2. Changes</A
+NAME="AEN162227"
+>E.200.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-1.html	2016-03-28 20:21:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-1.html	2017-08-07 21:33:02.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-1"
->E.182. Release 8.1</A
+>E.209. Release 8.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2005-11-08</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN158029"
->E.182.1. Overview</A
+NAME="AEN162774"
+>E.209.1. Overview</A
 ></H2
 ><P
 >    Major changes in this release:
@@ -373,8 +370,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN158109"
->E.182.2. Migration to Version 8.1</A
+NAME="AEN162854"
+>E.209.2. Migration to Version 8.1</A
 ></H2
 ><P
 >    A dump/restore using <SPAN
@@ -910,8 +907,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN158245"
->E.182.3. Additional Changes</A
+NAME="AEN162990"
+>E.209.3. Additional Changes</A
 ></H2
 ><P
 >    Below you will find a detailed account of the additional changes
@@ -926,8 +923,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158249"
->E.182.3.1. Performance Improvements</A
+NAME="AEN162994"
+>E.209.3.1. Performance Improvements</A
 ></H3
 ><P
 ></P
@@ -1094,8 +1091,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158301"
->E.182.3.2. Server Changes</A
+NAME="AEN163046"
+>E.209.3.2. Server Changes</A
 ></H3
 ><P
 ></P
@@ -1302,8 +1299,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158366"
->E.182.3.3. Query Changes</A
+NAME="AEN163111"
+>E.209.3.3. Query Changes</A
 ></H3
 ><P
 ></P
@@ -1440,8 +1437,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158407"
->E.182.3.4. Object Manipulation Changes</A
+NAME="AEN163152"
+>E.209.3.4. Object Manipulation Changes</A
 ></H3
 ><P
 ></P
@@ -1511,8 +1508,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158426"
->E.182.3.5. Utility Command Changes</A
+NAME="AEN163171"
+>E.209.3.5. Utility Command Changes</A
 ></H3
 ><P
 ></P
@@ -1707,8 +1704,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158482"
->E.182.3.6. Data Type and Function Changes</A
+NAME="AEN163227"
+>E.209.3.6. Data Type and Function Changes</A
 ></H3
 ><P
 ></P
@@ -2137,8 +2134,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158617"
->E.182.3.7. Encoding and Locale Changes</A
+NAME="AEN163362"
+>E.209.3.7. Encoding and Locale Changes</A
 ></H3
 ><P
 ></P
@@ -2256,8 +2253,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158656"
->E.182.3.8. General Server-Side Language Changes</A
+NAME="AEN163401"
+>E.209.3.8. General Server-Side Language Changes</A
 ></H3
 ><P
 ></P
@@ -2345,8 +2342,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158683"
->E.182.3.9. PL/pgSQL Server-Side Language Changes</A
+NAME="AEN163428"
+>E.209.3.9. PL/pgSQL Server-Side Language Changes</A
 ></H3
 ><P
 ></P
@@ -2487,8 +2484,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158728"
->E.182.3.10. PL/Perl Server-Side Language Changes</A
+NAME="AEN163473"
+>E.209.3.10. PL/Perl Server-Side Language Changes</A
 ></H3
 ><P
 ></P
@@ -2580,8 +2577,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158757"
->E.182.3.11. <SPAN
+NAME="AEN163502"
+>E.209.3.11. <SPAN
 CLASS="APPLICATION"
 >psql</SPAN
 > Changes</A
@@ -2750,8 +2747,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158809"
->E.182.3.12. <SPAN
+NAME="AEN163554"
+>E.209.3.12. <SPAN
 CLASS="APPLICATION"
 >pg_dump</SPAN
 > Changes</A
@@ -2864,8 +2861,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158843"
->E.182.3.13. <SPAN
+NAME="AEN163588"
+>E.209.3.13. <SPAN
 CLASS="APPLICATION"
 >libpq</SPAN
 > Changes</A
@@ -2915,8 +2912,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158858"
->E.182.3.14. Source Code Changes</A
+NAME="AEN163603"
+>E.209.3.14. Source Code Changes</A
 ></H3
 ><P
 ></P
@@ -3098,8 +3095,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158916"
->E.182.3.15. Contrib Changes</A
+NAME="AEN163661"
+>E.209.3.15. Contrib Changes</A
 ></H3
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-10.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-10.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-10"
->E.148. Release 8.2.10</A
+>E.175. Release 8.2.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-09-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.9.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154619"
->E.148.1. Migration to Version 8.2.10</A
+NAME="AEN159364"
+>E.175.1. Migration to Version 8.2.10</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.7,
     see <A
 HREF="release-8-2-7.html"
->Section E.151</A
+>Section E.178</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154623"
->E.148.2. Changes</A
+NAME="AEN159368"
+>E.175.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-11.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-11.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-11"
->E.147. Release 8.2.11</A
+>E.174. Release 8.2.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-11-03</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.10.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154544"
->E.147.1. Migration to Version 8.2.11</A
+NAME="AEN159289"
+>E.174.1. Migration to Version 8.2.11</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.7,
     see <A
 HREF="release-8-2-7.html"
->Section E.151</A
+>Section E.178</A
 >.  Also, if you were running a previous
     8.2.X release, it is recommended to <TT
 CLASS="COMMAND"
@@ -140,8 +137,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154549"
->E.147.2. Changes</A
+NAME="AEN159294"
+>E.174.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-12.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-12.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-12"
->E.146. Release 8.2.12</A
+>E.173. Release 8.2.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-02-02</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.11.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154474"
->E.146.1. Migration to Version 8.2.12</A
+NAME="AEN159219"
+>E.173.1. Migration to Version 8.2.12</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.11,
     see <A
 HREF="release-8-2-11.html"
->Section E.147</A
+>Section E.174</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154478"
->E.146.2. Changes</A
+NAME="AEN159223"
+>E.173.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-13.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-13.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-13"
->E.145. Release 8.2.13</A
+>E.172. Release 8.2.13</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-03-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.12.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154408"
->E.145.1. Migration to Version 8.2.13</A
+NAME="AEN159153"
+>E.172.1. Migration to Version 8.2.13</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.11,
     see <A
 HREF="release-8-2-11.html"
->Section E.147</A
+>Section E.174</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154412"
->E.145.2. Changes</A
+NAME="AEN159157"
+>E.172.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-14.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-14.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-14"
->E.144. Release 8.2.14</A
+>E.171. Release 8.2.14</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-09-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.13.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154314"
->E.144.1. Migration to Version 8.2.14</A
+NAME="AEN159059"
+>E.171.1. Migration to Version 8.2.14</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
@@ -134,7 +131,7 @@
     Also, if you are upgrading from a version earlier than 8.2.11,
     see <A
 HREF="release-8-2-11.html"
->Section E.147</A
+>Section E.174</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154320"
->E.144.2. Changes</A
+NAME="AEN159065"
+>E.171.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-15.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-15.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-15"
->E.143. Release 8.2.15</A
+>E.170. Release 8.2.15</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-12-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.14.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154231"
->E.143.1. Migration to Version 8.2.15</A
+NAME="AEN158976"
+>E.170.1. Migration to Version 8.2.15</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-2-14.html"
->Section E.144</A
+>Section E.171</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154235"
->E.143.2. Changes</A
+NAME="AEN158980"
+>E.170.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-16.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-16.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-16"
->E.142. Release 8.2.16</A
+>E.169. Release 8.2.16</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-03-15</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.15.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154126"
->E.142.1. Migration to Version 8.2.16</A
+NAME="AEN158871"
+>E.169.1. Migration to Version 8.2.16</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-2-14.html"
->Section E.144</A
+>Section E.171</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154130"
->E.142.2. Changes</A
+NAME="AEN158875"
+>E.169.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-17.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-17.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-17"
->E.141. Release 8.2.17</A
+>E.168. Release 8.2.17</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-05-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.16.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154047"
->E.141.1. Migration to Version 8.2.17</A
+NAME="AEN158792"
+>E.168.1. Migration to Version 8.2.17</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-2-14.html"
->Section E.144</A
+>Section E.171</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154051"
->E.141.2. Changes</A
+NAME="AEN158796"
+>E.168.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-18.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-18.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-18"
->E.140. Release 8.2.18</A
+>E.167. Release 8.2.18</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-10-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.17.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153949"
->E.140.1. Migration to Version 8.2.18</A
+NAME="AEN158694"
+>E.167.1. Migration to Version 8.2.18</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-2-14.html"
->Section E.144</A
+>Section E.171</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153953"
->E.140.2. Changes</A
+NAME="AEN158698"
+>E.167.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-19.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-19.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-19.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-19.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-19"
->E.139. Release 8.2.19</A
+>E.166. Release 8.2.19</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-12-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.18.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153846"
->E.139.1. Migration to Version 8.2.19</A
+NAME="AEN158591"
+>E.166.1. Migration to Version 8.2.19</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-2-14.html"
->Section E.144</A
+>Section E.171</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153850"
->E.139.2. Changes</A
+NAME="AEN158595"
+>E.166.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-1.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-1.html	2017-08-07 21:33:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-1"
->E.157. Release 8.2.1</A
+>E.184. Release 8.2.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-01-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155268"
->E.157.1. Migration to Version 8.2.1</A
+NAME="AEN160013"
+>E.184.1. Migration to Version 8.2.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155271"
->E.157.2. Changes</A
+NAME="AEN160016"
+>E.184.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-20.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-20.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-20.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-20.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-20"
->E.138. Release 8.2.20</A
+>E.165. Release 8.2.20</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-01-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.19.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153788"
->E.138.1. Migration to Version 8.2.20</A
+NAME="AEN158533"
+>E.165.1. Migration to Version 8.2.20</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-2-14.html"
->Section E.144</A
+>Section E.171</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153792"
->E.138.2. Changes</A
+NAME="AEN158537"
+>E.165.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-21.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-21.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-21.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-21.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-21"
->E.137. Release 8.2.21</A
+>E.164. Release 8.2.21</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-04-18</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.20.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153741"
->E.137.1. Migration to Version 8.2.21</A
+NAME="AEN158486"
+>E.164.1. Migration to Version 8.2.21</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-2-14.html"
->Section E.144</A
+>Section E.171</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153745"
->E.137.2. Changes</A
+NAME="AEN158490"
+>E.164.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-22.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-22.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-22.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-22.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-22"
->E.136. Release 8.2.22</A
+>E.163. Release 8.2.22</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-09-26</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.21.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><P
@@ -126,15 +123,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153625"
->E.136.1. Migration to Version 8.2.22</A
+NAME="AEN158370"
+>E.163.1. Migration to Version 8.2.22</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-2-14.html"
->Section E.144</A
+>Section E.171</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153629"
->E.136.2. Changes</A
+NAME="AEN158374"
+>E.163.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-23.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-23.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-23.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-23.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-23"
->E.135. Release 8.2.23</A
+>E.162. Release 8.2.23</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.22.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153537"
->E.135.1. Migration to Version 8.2.23</A
+NAME="AEN158282"
+>E.162.1. Migration to Version 8.2.23</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
@@ -145,7 +142,7 @@
 >    Also, if you are upgrading from a version earlier than 8.2.14,
     see <A
 HREF="release-8-2-14.html"
->Section E.144</A
+>Section E.171</A
 >.
    </P
 ></DIV
@@ -154,8 +151,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN153544"
->E.135.2. Changes</A
+NAME="AEN158289"
+>E.162.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-2.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-2.html	2017-08-07 21:33:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-2"
->E.156. Release 8.2.2</A
+>E.183. Release 8.2.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-02-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.1, including
@@ -111,7 +108,7 @@
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -119,8 +116,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155209"
->E.156.1. Migration to Version 8.2.2</A
+NAME="AEN159954"
+>E.183.1. Migration to Version 8.2.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
@@ -131,8 +128,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155212"
->E.156.2. Changes</A
+NAME="AEN159957"
+>E.183.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-3.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-3.html	2017-08-07 21:33:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-3"
->E.155. Release 8.2.3</A
+>E.182. Release 8.2.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-02-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains two fixes from 8.2.2.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155192"
->E.155.1. Migration to Version 8.2.3</A
+NAME="AEN159937"
+>E.182.1. Migration to Version 8.2.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155195"
->E.155.2. Changes</A
+NAME="AEN159940"
+>E.182.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-4.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-4.html	2017-08-07 21:33:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-4"
->E.154. Release 8.2.4</A
+>E.181. Release 8.2.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-04-23</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.3,
@@ -111,7 +108,7 @@
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -119,8 +116,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155133"
->E.154.1. Migration to Version 8.2.4</A
+NAME="AEN159878"
+>E.181.1. Migration to Version 8.2.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
@@ -131,8 +128,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155136"
->E.154.2. Changes</A
+NAME="AEN159881"
+>E.181.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-5.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-5.html	2017-08-07 21:33:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-5"
->E.153. Release 8.2.5</A
+>E.180. Release 8.2.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2007-09-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.4.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155056"
->E.153.1. Migration to Version 8.2.5</A
+NAME="AEN159801"
+>E.180.1. Migration to Version 8.2.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155059"
->E.153.2. Changes</A
+NAME="AEN159804"
+>E.180.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-6.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-6.html	2017-08-07 21:33:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,17 +93,14 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-6"
->E.152. Release 8.2.6</A
+>E.179. Release 8.2.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-01-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.5,
@@ -111,7 +108,7 @@
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -119,8 +116,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154931"
->E.152.1. Migration to Version 8.2.6</A
+NAME="AEN159676"
+>E.179.1. Migration to Version 8.2.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
@@ -131,8 +128,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154934"
->E.152.2. Changes</A
+NAME="AEN159679"
+>E.179.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-7.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-7.html	2017-08-07 21:33:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-7"
->E.151. Release 8.2.7</A
+>E.178. Release 8.2.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-03-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.6.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154826"
->E.151.1. Migration to Version 8.2.7</A
+NAME="AEN159571"
+>E.178.1. Migration to Version 8.2.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154830"
->E.151.2. Changes</A
+NAME="AEN159575"
+>E.178.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-8.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-8.html	2017-08-07 21:33:00.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-8"
->E.150. Release 8.2.8</A
+>E.177. Release 8.2.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >never released</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.2.7.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154740"
->E.150.1. Migration to Version 8.2.8</A
+NAME="AEN159485"
+>E.177.1. Migration to Version 8.2.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.7,
     see <A
 HREF="release-8-2-7.html"
->Section E.151</A
+>Section E.178</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154744"
->E.150.2. Changes</A
+NAME="AEN159489"
+>E.177.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2-9.html	2016-03-28 20:21:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2-9.html	2017-08-07 21:32:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2-9"
->E.149. Release 8.2.9</A
+>E.176. Release 8.2.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-06-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains one serious and one minor bug fix over 8.2.8.
    For information about new features in the 8.2 major release, see
    <A
 HREF="release-8-2.html"
->Section E.158</A
+>Section E.185</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154710"
->E.149.1. Migration to Version 8.2.9</A
+NAME="AEN159455"
+>E.176.1. Migration to Version 8.2.9</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.7,
     see <A
 HREF="release-8-2-7.html"
->Section E.151</A
+>Section E.178</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN154714"
->E.149.2. Changes</A
+NAME="AEN159459"
+>E.176.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-2.html	2016-03-28 20:21:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-2.html	2017-08-07 21:33:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-2"
->E.158. Release 8.2</A
+>E.185. Release 8.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2006-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155325"
->E.158.1. Overview</A
+NAME="AEN160070"
+>E.185.1. Overview</A
 ></H2
 ><P
 >    This release adds many functionality and performance improvements that
@@ -247,8 +244,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155370"
->E.158.2. Migration to Version 8.2</A
+NAME="AEN160115"
+>E.185.2. Migration to Version 8.2</A
 ></H2
 ><P
 >    A dump/restore using <SPAN
@@ -783,8 +780,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN155529"
->E.158.3. Changes</A
+NAME="AEN160274"
+>E.185.3. Changes</A
 ></H2
 ><P
 >    Below you will find a detailed account of the
@@ -799,8 +796,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN155533"
->E.158.3.1. Performance Improvements</A
+NAME="AEN160278"
+>E.185.3.1. Performance Improvements</A
 ></H3
 ><P
 ></P
@@ -1033,8 +1030,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN155605"
->E.158.3.2. Server Changes</A
+NAME="AEN160350"
+>E.185.3.2. Server Changes</A
 ></H3
 ><P
 ></P
@@ -1471,8 +1468,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN155738"
->E.158.3.3. Query Changes</A
+NAME="AEN160483"
+>E.185.3.3. Query Changes</A
 ></H3
 ><P
 ></P
@@ -1870,8 +1867,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN155858"
->E.158.3.4. Object Manipulation Changes</A
+NAME="AEN160603"
+>E.185.3.4. Object Manipulation Changes</A
 ></H3
 ><P
 ></P
@@ -2172,8 +2169,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN155946"
->E.158.3.5. Utility Command Changes</A
+NAME="AEN160691"
+>E.185.3.5. Utility Command Changes</A
 ></H3
 ><P
 ></P
@@ -2309,8 +2306,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN155987"
->E.158.3.6. Date/Time Changes</A
+NAME="AEN160732"
+>E.185.3.6. Date/Time Changes</A
 ></H3
 ><P
 ></P
@@ -2494,8 +2491,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156044"
->E.158.3.7. Other Data Type and Function Changes</A
+NAME="AEN160789"
+>E.185.3.7. Other Data Type and Function Changes</A
 ></H3
 ><P
 ></P
@@ -2797,8 +2794,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156135"
->E.158.3.8. PL/pgSQL Server-Side Language Changes</A
+NAME="AEN160880"
+>E.185.3.8. PL/pgSQL Server-Side Language Changes</A
 ></H3
 ><P
 ></P
@@ -2880,8 +2877,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156160"
->E.158.3.9. PL/Perl Server-Side Language Changes</A
+NAME="AEN160905"
+>E.185.3.9. PL/Perl Server-Side Language Changes</A
 ></H3
 ><P
 ></P
@@ -2934,8 +2931,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156176"
->E.158.3.10. PL/Python Server-Side Language Changes</A
+NAME="AEN160921"
+>E.185.3.10. PL/Python Server-Side Language Changes</A
 ></H3
 ><P
 ></P
@@ -3001,8 +2998,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156198"
->E.158.3.11. <A
+NAME="AEN160943"
+>E.185.3.11. <A
 HREF="app-psql.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3155,8 +3152,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156245"
->E.158.3.12. <A
+NAME="AEN160990"
+>E.185.3.12. <A
 HREF="app-pgdump.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3259,8 +3256,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156275"
->E.158.3.13. <A
+NAME="AEN161020"
+>E.185.3.13. <A
 HREF="libpq.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3373,8 +3370,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156309"
->E.158.3.14. <A
+NAME="AEN161054"
+>E.185.3.14. <A
 HREF="ecpg.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3426,8 +3423,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156326"
->E.158.3.15. <SPAN
+NAME="AEN161071"
+>E.185.3.15. <SPAN
 CLASS="APPLICATION"
 >Windows</SPAN
 > Port</A
@@ -3507,8 +3504,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156352"
->E.158.3.16. Source Code Changes</A
+NAME="AEN161097"
+>E.185.3.16. Source Code Changes</A
 ></H3
 ><P
 ></P
@@ -3808,8 +3805,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN156445"
->E.158.3.17. Contrib Changes</A
+NAME="AEN161190"
+>E.185.3.17. Contrib Changes</A
 ></H3
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-10.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-10.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-10"
->E.124. Release 8.3.10</A
+>E.151. Release 8.3.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-03-15</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.9.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151301"
->E.124.1. Migration to Version 8.3.10</A
+NAME="AEN156046"
+>E.151.1. Migration to Version 8.3.10</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-3-8.html"
->Section E.126</A
+>Section E.153</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151305"
->E.124.2. Changes</A
+NAME="AEN156050"
+>E.151.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-11.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-11.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-11"
->E.123. Release 8.3.11</A
+>E.150. Release 8.3.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-05-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.10.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151211"
->E.123.1. Migration to Version 8.3.11</A
+NAME="AEN155956"
+>E.150.1. Migration to Version 8.3.11</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-3-8.html"
->Section E.126</A
+>Section E.153</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151215"
->E.123.2. Changes</A
+NAME="AEN155960"
+>E.150.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-12.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-12.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-12"
->E.122. Release 8.3.12</A
+>E.149. Release 8.3.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-10-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.11.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151084"
->E.122.1. Migration to Version 8.3.12</A
+NAME="AEN155829"
+>E.149.1. Migration to Version 8.3.12</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-3-8.html"
->Section E.126</A
+>Section E.153</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151088"
->E.122.2. Changes</A
+NAME="AEN155833"
+>E.149.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-13.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-13.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-13"
->E.121. Release 8.3.13</A
+>E.148. Release 8.3.13</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-12-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.12.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150970"
->E.121.1. Migration to Version 8.3.13</A
+NAME="AEN155715"
+>E.148.1. Migration to Version 8.3.13</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-3-8.html"
->Section E.126</A
+>Section E.153</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150974"
->E.121.2. Changes</A
+NAME="AEN155719"
+>E.148.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-14.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-14.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-14"
->E.120. Release 8.3.14</A
+>E.147. Release 8.3.14</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-01-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.13.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150912"
->E.120.1. Migration to Version 8.3.14</A
+NAME="AEN155657"
+>E.147.1. Migration to Version 8.3.14</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-3-8.html"
->Section E.126</A
+>Section E.153</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150916"
->E.120.2. Changes</A
+NAME="AEN155661"
+>E.147.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-15.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-15.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-15"
->E.119. Release 8.3.15</A
+>E.146. Release 8.3.15</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-04-18</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.14.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150855"
->E.119.1. Migration to Version 8.3.15</A
+NAME="AEN155600"
+>E.146.1. Migration to Version 8.3.15</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-3-8.html"
->Section E.126</A
+>Section E.153</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150859"
->E.119.2. Changes</A
+NAME="AEN155604"
+>E.146.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-16.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-16.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-16"
->E.118. Release 8.3.16</A
+>E.145. Release 8.3.16</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-09-26</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.15.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150711"
->E.118.1. Migration to Version 8.3.16</A
+NAME="AEN155456"
+>E.145.1. Migration to Version 8.3.16</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-3-8.html"
->Section E.126</A
+>Section E.153</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150715"
->E.118.2. Changes</A
+NAME="AEN155460"
+>E.145.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-17.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-17.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-17"
->E.117. Release 8.3.17</A
+>E.144. Release 8.3.17</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.16.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150607"
->E.117.1. Migration to Version 8.3.17</A
+NAME="AEN155352"
+>E.144.1. Migration to Version 8.3.17</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
@@ -137,7 +134,7 @@
 >    Also, if you are upgrading from a version earlier than 8.3.8,
     see <A
 HREF="release-8-3-8.html"
->Section E.126</A
+>Section E.153</A
 >.
    </P
 ></DIV
@@ -146,8 +143,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150614"
->E.117.2. Changes</A
+NAME="AEN155359"
+>E.144.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-18.html	2016-03-28 20:21:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-18.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-18"
->E.116. Release 8.3.18</A
+>E.143. Release 8.3.18</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-02-27</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.17.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150507"
->E.116.1. Migration to Version 8.3.18</A
+NAME="AEN155252"
+>E.143.1. Migration to Version 8.3.18</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 8.3.17,
     see <A
 HREF="release-8-3-17.html"
->Section E.117</A
+>Section E.144</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150512"
->E.116.2. Changes</A
+NAME="AEN155257"
+>E.143.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-19.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-19.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-19.html	2016-03-28 20:21:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-19.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-19"
->E.115. Release 8.3.19</A
+>E.142. Release 8.3.19</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-06-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.18.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150423"
->E.115.1. Migration to Version 8.3.19</A
+NAME="AEN155168"
+>E.142.1. Migration to Version 8.3.19</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 8.3.17,
     see <A
 HREF="release-8-3-17.html"
->Section E.117</A
+>Section E.144</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150428"
->E.115.2. Changes</A
+NAME="AEN155173"
+>E.142.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-1.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-1.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-1"
->E.133. Release 8.3.1</A
+>E.160. Release 8.3.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-03-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.0.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN152298"
->E.133.1. Migration to Version 8.3.1</A
+NAME="AEN157043"
+>E.160.1. Migration to Version 8.3.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN152302"
->E.133.2. Changes</A
+NAME="AEN157047"
+>E.160.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-20.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-20.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-20.html	2016-03-28 20:21:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-20.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-20"
->E.114. Release 8.3.20</A
+>E.141. Release 8.3.20</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-08-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.19.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150338"
->E.114.1. Migration to Version 8.3.20</A
+NAME="AEN155083"
+>E.141.1. Migration to Version 8.3.20</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
@@ -136,7 +133,7 @@
 >    However, if you are upgrading from a version earlier than 8.3.17,
     see <A
 HREF="release-8-3-17.html"
->Section E.117</A
+>Section E.144</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150343"
->E.114.2. Changes</A
+NAME="AEN155088"
+>E.141.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-21.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-21.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-21.html	2016-03-28 20:21:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-21.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-21"
->E.113. Release 8.3.21</A
+>E.140. Release 8.3.21</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-09-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.20.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150296"
->E.113.1. Migration to Version 8.3.21</A
+NAME="AEN155041"
+>E.140.1. Migration to Version 8.3.21</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
@@ -136,7 +133,7 @@
 >    However, if you are upgrading from a version earlier than 8.3.17,
     see <A
 HREF="release-8-3-17.html"
->Section E.117</A
+>Section E.144</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150301"
->E.113.2. Changes</A
+NAME="AEN155046"
+>E.140.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-22.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-22.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-22.html	2016-03-28 20:21:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-22.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-22"
->E.112. Release 8.3.22</A
+>E.139. Release 8.3.22</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-12-06</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.21.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150175"
->E.112.1. Migration to Version 8.3.22</A
+NAME="AEN154920"
+>E.139.1. Migration to Version 8.3.22</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
@@ -136,7 +133,7 @@
 >    However, if you are upgrading from a version earlier than 8.3.17,
     see <A
 HREF="release-8-3-17.html"
->Section E.117</A
+>Section E.144</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150180"
->E.112.2. Changes</A
+NAME="AEN154925"
+>E.139.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-23.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-23.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-23.html	2016-03-28 20:21:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-23.html	2017-08-07 21:32:56.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-23"
->E.111. Release 8.3.23</A
+>E.138. Release 8.3.23</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-02-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.22.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150107"
->E.111.1. Migration to Version 8.3.23</A
+NAME="AEN154852"
+>E.138.1. Migration to Version 8.3.23</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
@@ -136,7 +133,7 @@
 >    However, if you are upgrading from a version earlier than 8.3.17,
     see <A
 HREF="release-8-3-17.html"
->Section E.117</A
+>Section E.144</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN150112"
->E.111.2. Changes</A
+NAME="AEN154857"
+>E.138.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-2.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-2.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-2"
->E.132. Release 8.3.2</A
+>E.159. Release 8.3.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >never released</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.1.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN152142"
->E.132.1. Migration to Version 8.3.2</A
+NAME="AEN156887"
+>E.159.1. Migration to Version 8.3.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.1,
     see <A
 HREF="release-8-3-1.html"
->Section E.133</A
+>Section E.160</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN152146"
->E.132.2. Changes</A
+NAME="AEN156891"
+>E.159.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-3.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-3.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-3"
->E.131. Release 8.3.3</A
+>E.158. Release 8.3.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-06-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains one serious and one minor bug fix over 8.3.2.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN152112"
->E.131.1. Migration to Version 8.3.3</A
+NAME="AEN156857"
+>E.158.1. Migration to Version 8.3.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.1,
     see <A
 HREF="release-8-3-1.html"
->Section E.133</A
+>Section E.160</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN152116"
->E.131.2. Changes</A
+NAME="AEN156861"
+>E.158.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-4.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-4.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-4"
->E.130. Release 8.3.4</A
+>E.157. Release 8.3.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-09-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.3.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151973"
->E.130.1. Migration to Version 8.3.4</A
+NAME="AEN156718"
+>E.157.1. Migration to Version 8.3.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.1,
     see <A
 HREF="release-8-3-1.html"
->Section E.133</A
+>Section E.160</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151977"
->E.130.2. Changes</A
+NAME="AEN156722"
+>E.157.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-5.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-5.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-5"
->E.129. Release 8.3.5</A
+>E.156. Release 8.3.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-11-03</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.4.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151866"
->E.129.1. Migration to Version 8.3.5</A
+NAME="AEN156611"
+>E.156.1. Migration to Version 8.3.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.1,
     see <A
 HREF="release-8-3-1.html"
->Section E.133</A
+>Section E.160</A
 >.  Also, if you were running a previous
     8.3.X release, it is recommended to <TT
 CLASS="COMMAND"
@@ -140,8 +137,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151871"
->E.129.2. Changes</A
+NAME="AEN156616"
+>E.156.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-6.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-6.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-6"
->E.128. Release 8.3.6</A
+>E.155. Release 8.3.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-02-02</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.5.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151755"
->E.128.1. Migration to Version 8.3.6</A
+NAME="AEN156500"
+>E.155.1. Migration to Version 8.3.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.5,
     see <A
 HREF="release-8-3-5.html"
->Section E.129</A
+>Section E.156</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151759"
->E.128.2. Changes</A
+NAME="AEN156504"
+>E.155.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-7.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-7.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-7"
->E.127. Release 8.3.7</A
+>E.154. Release 8.3.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-03-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.6.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151665"
->E.127.1. Migration to Version 8.3.7</A
+NAME="AEN156410"
+>E.154.1. Migration to Version 8.3.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.5,
     see <A
 HREF="release-8-3-5.html"
->Section E.129</A
+>Section E.156</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151669"
->E.127.2. Changes</A
+NAME="AEN156414"
+>E.154.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-8.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-8.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-8"
->E.126. Release 8.3.8</A
+>E.153. Release 8.3.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-09-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.7.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151541"
->E.126.1. Migration to Version 8.3.8</A
+NAME="AEN156286"
+>E.153.1. Migration to Version 8.3.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.3.X.
@@ -134,7 +131,7 @@
     Also, if you are upgrading from a version earlier than 8.3.5,
     see <A
 HREF="release-8-3-5.html"
->Section E.129</A
+>Section E.156</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151547"
->E.126.2. Changes</A
+NAME="AEN156292"
+>E.153.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3-9.html	2016-03-28 20:21:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3-9.html	2017-08-07 21:32:57.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3-9"
->E.125. Release 8.3.9</A
+>E.152. Release 8.3.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-12-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.3.8.
    For information about new features in the 8.3 major release, see
    <A
 HREF="release-8-3.html"
->Section E.134</A
+>Section E.161</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151426"
->E.125.1. Migration to Version 8.3.9</A
+NAME="AEN156171"
+>E.152.1. Migration to Version 8.3.9</A
 ></H2
 ><P
 >    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 <A
 HREF="release-8-3-8.html"
->Section E.126</A
+>Section E.153</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN151430"
->E.125.2. Changes</A
+NAME="AEN156175"
+>E.152.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-3.html	2016-03-28 20:21:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-3.html	2017-08-07 21:32:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-3"
->E.134. Release 8.3</A
+>E.161. Release 8.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2008-02-04</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN152420"
->E.134.1. Overview</A
+NAME="AEN157165"
+>E.161.1. Overview</A
 ></H2
 ><P
 >    With significant new functionality and performance enhancements,
@@ -307,8 +304,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN152486"
->E.134.2. Migration to Version 8.3</A
+NAME="AEN157231"
+>E.161.2. Migration to Version 8.3</A
 ></H2
 ><P
 >    A dump/restore using <SPAN
@@ -326,8 +323,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN152491"
->E.134.2.1. General</A
+NAME="AEN157236"
+>E.161.2.1. General</A
 ></H3
 ><P
 ></P
@@ -695,8 +692,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN152592"
->E.134.2.2. Configuration Parameters</A
+NAME="AEN157337"
+>E.161.2.2. Configuration Parameters</A
 ></H3
 ><P
 ></P
@@ -810,8 +807,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN152625"
->E.134.2.3. Character Encodings</A
+NAME="AEN157370"
+>E.161.2.3. Character Encodings</A
 ></H3
 ><P
 ></P
@@ -974,8 +971,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN152672"
->E.134.3. Changes</A
+NAME="AEN157417"
+>E.161.3. Changes</A
 ></H2
 ><P
 >    Below you will find a detailed account of the
@@ -990,8 +987,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN152676"
->E.134.3.1. Performance</A
+NAME="AEN157421"
+>E.161.3.1. Performance</A
 ></H3
 ><P
 ></P
@@ -1261,8 +1258,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN152749"
->E.134.3.2. Server</A
+NAME="AEN157494"
+>E.161.3.2. Server</A
 ></H3
 ><P
 ></P
@@ -1424,8 +1421,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN152794"
->E.134.3.3. Monitoring</A
+NAME="AEN157539"
+>E.161.3.3. Monitoring</A
 ></H3
 ><P
 ></P
@@ -1630,8 +1627,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN152858"
->E.134.3.4. Authentication</A
+NAME="AEN157603"
+>E.161.3.4. Authentication</A
 ></H3
 ><P
 ></P
@@ -1683,8 +1680,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN152875"
->E.134.3.5. Write-Ahead Log (<ACRONYM
+NAME="AEN157620"
+>E.161.3.5. Write-Ahead Log (<ACRONYM
 CLASS="ACRONYM"
 >WAL</ACRONYM
 >) and Continuous Archiving</A
@@ -1754,8 +1751,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN152895"
->E.134.3.6. Queries</A
+NAME="AEN157640"
+>E.161.3.6. Queries</A
 ></H3
 ><P
 ></P
@@ -1958,8 +1955,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN152955"
->E.134.3.7. Object Manipulation</A
+NAME="AEN157700"
+>E.161.3.7. Object Manipulation</A
 ></H3
 ><P
 ></P
@@ -2111,8 +2108,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153000"
->E.134.3.8. Utility Commands</A
+NAME="AEN157745"
+>E.161.3.8. Utility Commands</A
 ></H3
 ><P
 ></P
@@ -2279,8 +2276,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153047"
->E.134.3.9. Data Types</A
+NAME="AEN157792"
+>E.161.3.9. Data Types</A
 ></H3
 ><P
 ></P
@@ -2395,8 +2392,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153083"
->E.134.3.10. Functions</A
+NAME="AEN157828"
+>E.161.3.10. Functions</A
 ></H3
 ><P
 ></P
@@ -2612,8 +2609,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153149"
->E.134.3.11. PL/pgSQL Server-Side Language</A
+NAME="AEN157894"
+>E.161.3.11. PL/pgSQL Server-Side Language</A
 ></H3
 ><P
 ></P
@@ -2730,8 +2727,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153185"
->E.134.3.12. Other Server-Side Languages</A
+NAME="AEN157930"
+>E.161.3.12. Other Server-Side Languages</A
 ></H3
 ><P
 ></P
@@ -2806,8 +2803,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153208"
->E.134.3.13. <A
+NAME="AEN157953"
+>E.161.3.13. <A
 HREF="app-psql.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -2948,8 +2945,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153255"
->E.134.3.14. <A
+NAME="AEN158000"
+>E.161.3.14. <A
 HREF="app-pgdump.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3040,8 +3037,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153284"
->E.134.3.15. Other Client Applications</A
+NAME="AEN158029"
+>E.161.3.15. Other Client Applications</A
 ></H3
 ><P
 ></P
@@ -3147,8 +3144,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153316"
->E.134.3.16. <A
+NAME="AEN158061"
+>E.161.3.16. <A
 HREF="libpq.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3253,8 +3250,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153347"
->E.134.3.17. <A
+NAME="AEN158092"
+>E.161.3.17. <A
 HREF="ecpg.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3295,8 +3292,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153361"
->E.134.3.18. <SPAN
+NAME="AEN158106"
+>E.161.3.18. <SPAN
 CLASS="APPLICATION"
 >Windows</SPAN
 > Port</A
@@ -3347,8 +3344,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153376"
->E.134.3.19. Server Programming Interface (<ACRONYM
+NAME="AEN158121"
+>E.161.3.19. Server Programming Interface (<ACRONYM
 CLASS="ACRONYM"
 >SPI</ACRONYM
 >)</A
@@ -3410,8 +3407,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153395"
->E.134.3.20. Build Options</A
+NAME="AEN158140"
+>E.161.3.20. Build Options</A
 ></H3
 ><P
 ></P
@@ -3486,8 +3483,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153418"
->E.134.3.21. Source Code</A
+NAME="AEN158163"
+>E.161.3.21. Source Code</A
 ></H3
 ><P
 ></P
@@ -3654,8 +3651,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN153470"
->E.134.3.22. Contrib</A
+NAME="AEN158215"
+>E.161.3.22. Contrib</A
 ></H3
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-10.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-10.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-10"
->E.100. Release 8.4.10</A
+>E.127. Release 8.4.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.9.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147123"
->E.100.1. Migration to Version 8.4.10</A
+NAME="AEN151868"
+>E.127.1. Migration to Version 8.4.10</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -137,7 +134,7 @@
 >    Also, if you are upgrading from a version earlier than 8.4.8,
     see <A
 HREF="release-8-4-8.html"
->Section E.102</A
+>Section E.129</A
 >.
    </P
 ></DIV
@@ -146,8 +143,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147130"
->E.100.2. Changes</A
+NAME="AEN151875"
+>E.127.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-11.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-11.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-11"
->E.99. Release 8.4.11</A
+>E.126. Release 8.4.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-02-27</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.10.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147002"
->E.99.1. Migration to Version 8.4.11</A
+NAME="AEN151747"
+>E.126.1. Migration to Version 8.4.11</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 8.4.10,
     see <A
 HREF="release-8-4-10.html"
->Section E.100</A
+>Section E.127</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147007"
->E.99.2. Changes</A
+NAME="AEN151752"
+>E.126.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-12.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-12.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-12"
->E.98. Release 8.4.12</A
+>E.125. Release 8.4.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-06-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.11.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146897"
->E.98.1. Migration to Version 8.4.12</A
+NAME="AEN151642"
+>E.125.1. Migration to Version 8.4.12</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 8.4.10,
     see <A
 HREF="release-8-4-10.html"
->Section E.100</A
+>Section E.127</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146902"
->E.98.2. Changes</A
+NAME="AEN151647"
+>E.125.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-13.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-13.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-13"
->E.97. Release 8.4.13</A
+>E.124. Release 8.4.13</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-08-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.12.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146795"
->E.97.1. Migration to Version 8.4.13</A
+NAME="AEN151540"
+>E.124.1. Migration to Version 8.4.13</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 8.4.10,
     see <A
 HREF="release-8-4-10.html"
->Section E.100</A
+>Section E.127</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146800"
->E.97.2. Changes</A
+NAME="AEN151545"
+>E.124.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-14.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-14.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-14"
->E.96. Release 8.4.14</A
+>E.123. Release 8.4.14</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-09-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.13.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146751"
->E.96.1. Migration to Version 8.4.14</A
+NAME="AEN151496"
+>E.123.1. Migration to Version 8.4.14</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 8.4.10,
     see <A
 HREF="release-8-4-10.html"
->Section E.100</A
+>Section E.127</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146756"
->E.96.2. Changes</A
+NAME="AEN151501"
+>E.123.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-15.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-15.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-15"
->E.95. Release 8.4.15</A
+>E.122. Release 8.4.15</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-12-06</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.14.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146628"
->E.95.1. Migration to Version 8.4.15</A
+NAME="AEN151373"
+>E.122.1. Migration to Version 8.4.15</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 8.4.10,
     see <A
 HREF="release-8-4-10.html"
->Section E.100</A
+>Section E.127</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146633"
->E.95.2. Changes</A
+NAME="AEN151378"
+>E.122.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-16.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-16.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-16"
->E.94. Release 8.4.16</A
+>E.121. Release 8.4.16</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-02-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.15.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146542"
->E.94.1. Migration to Version 8.4.16</A
+NAME="AEN151287"
+>E.121.1. Migration to Version 8.4.16</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 8.4.10,
     see <A
 HREF="release-8-4-10.html"
->Section E.100</A
+>Section E.127</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146547"
->E.94.2. Changes</A
+NAME="AEN151292"
+>E.121.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-17.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-17.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-17"
->E.93. Release 8.4.17</A
+>E.120. Release 8.4.17</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-04-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.16.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146430"
->E.93.1. Migration to Version 8.4.17</A
+NAME="AEN151175"
+>E.120.1. Migration to Version 8.4.17</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -137,7 +134,7 @@
 >    Also, if you are upgrading from a version earlier than 8.4.10,
     see <A
 HREF="release-8-4-10.html"
->Section E.100</A
+>Section E.127</A
 >.
    </P
 ></DIV
@@ -146,8 +143,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146437"
->E.93.2. Changes</A
+NAME="AEN151182"
+>E.120.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-18.html	2016-03-28 20:21:21.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-18.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-18"
->E.92. Release 8.4.18</A
+>E.119. Release 8.4.18</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-10-10</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.17.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146346"
->E.92.1. Migration to Version 8.4.18</A
+NAME="AEN151091"
+>E.119.1. Migration to Version 8.4.18</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 8.4.17,
     see <A
 HREF="release-8-4-17.html"
->Section E.93</A
+>Section E.120</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146351"
->E.92.2. Changes</A
+NAME="AEN151096"
+>E.119.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-19.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-19.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-19.html	2016-03-28 20:21:21.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-19.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-19"
->E.91. Release 8.4.19</A
+>E.118. Release 8.4.19</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.18.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146269"
->E.91.1. Migration to Version 8.4.19</A
+NAME="AEN151014"
+>E.118.1. Migration to Version 8.4.19</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -133,7 +130,7 @@
 >    Also, if you are upgrading from a version earlier than 8.4.17,
     see <A
 HREF="release-8-4-17.html"
->Section E.93</A
+>Section E.120</A
 >.
    </P
 ></DIV
@@ -142,8 +139,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146275"
->E.91.2. Changes</A
+NAME="AEN151020"
+>E.118.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-1.html	2016-03-28 20:21:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-1.html	2017-08-07 21:32:56.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-1"
->E.109. Release 8.4.1</A
+>E.136. Release 8.4.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-09-09</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN148417"
->E.109.1. Migration to Version 8.4.1</A
+NAME="AEN153162"
+>E.136.1. Migration to Version 8.4.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN148420"
->E.109.2. Changes</A
+NAME="AEN153165"
+>E.136.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-20.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-20.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-20.html	2016-03-28 20:21:21.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-20.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-20"
->E.90. Release 8.4.20</A
+>E.117. Release 8.4.20</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-02-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.19.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146104"
->E.90.1. Migration to Version 8.4.20</A
+NAME="AEN150849"
+>E.117.1. Migration to Version 8.4.20</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -136,7 +133,7 @@
 >    However, if you are upgrading from a version earlier than 8.4.19,
     see <A
 HREF="release-8-4-19.html"
->Section E.91</A
+>Section E.118</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146109"
->E.90.2. Changes</A
+NAME="AEN150854"
+>E.117.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-21.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-21.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-21.html	2016-03-28 20:21:21.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-21.html	2017-08-07 21:32:54.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-21"
->E.89. Release 8.4.21</A
+>E.116. Release 8.4.21</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-03-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.20.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146059"
->E.89.1. Migration to Version 8.4.21</A
+NAME="AEN150804"
+>E.116.1. Migration to Version 8.4.21</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -136,7 +133,7 @@
 >    However, if you are upgrading from a version earlier than 8.4.19,
     see <A
 HREF="release-8-4-19.html"
->Section E.91</A
+>Section E.118</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146064"
->E.89.2. Changes</A
+NAME="AEN150809"
+>E.116.2. Changes</A
 ></H2
 ><P
 ></P
@@ -170,7 +167,7 @@
      </P
 ><P
 >      This prevents scenarios wherein a pathological regular expression
-      could lock up a server process uninterruptably for a long time.
+      could lock up a server process uninterruptibly for a long time.
      </P
 ></LI
 ><LI
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-22.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-22.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-22.html	2016-03-28 20:21:21.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-22.html	2017-08-07 21:32:54.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-22"
->E.88. Release 8.4.22</A
+>E.115. Release 8.4.22</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-07-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.21.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN145938"
->E.88.1. Migration to Version 8.4.22</A
+NAME="AEN150683"
+>E.115.1. Migration to Version 8.4.22</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -141,7 +138,7 @@
 >    Also, if you are upgrading from a version earlier than 8.4.19,
     see <A
 HREF="release-8-4-19.html"
->Section E.91</A
+>Section E.118</A
 >.
    </P
 ></DIV
@@ -150,8 +147,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN145944"
->E.88.2. Changes</A
+NAME="AEN150689"
+>E.115.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-2.html	2016-03-28 20:21:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-2.html	2017-08-07 21:32:56.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-2"
->E.108. Release 8.4.2</A
+>E.135. Release 8.4.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-12-14</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.1.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN148207"
->E.108.1. Migration to Version 8.4.2</A
+NAME="AEN152952"
+>E.135.1. Migration to Version 8.4.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -136,8 +133,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN148211"
->E.108.2. Changes</A
+NAME="AEN152956"
+>E.135.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-3.html	2016-03-28 20:21:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-3.html	2017-08-07 21:32:56.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-3"
->E.107. Release 8.4.3</A
+>E.134. Release 8.4.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-03-15</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.2.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN148026"
->E.107.1. Migration to Version 8.4.3</A
+NAME="AEN152771"
+>E.134.1. Migration to Version 8.4.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
     However, if you are upgrading from a version earlier than 8.4.2,
     see <A
 HREF="release-8-4-2.html"
->Section E.108</A
+>Section E.135</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN148030"
->E.107.2. Changes</A
+NAME="AEN152775"
+>E.134.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-4.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-4.html	2017-08-07 21:32:56.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-4"
->E.106. Release 8.4.4</A
+>E.133. Release 8.4.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-05-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.3.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147907"
->E.106.1. Migration to Version 8.4.4</A
+NAME="AEN152652"
+>E.133.1. Migration to Version 8.4.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
     However, if you are upgrading from a version earlier than 8.4.2,
     see <A
 HREF="release-8-4-2.html"
->Section E.108</A
+>Section E.135</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147911"
->E.106.2. Changes</A
+NAME="AEN152656"
+>E.133.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-5.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-5.html	2017-08-07 21:32:56.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-5"
->E.105. Release 8.4.5</A
+>E.132. Release 8.4.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-10-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.4.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147718"
->E.105.1. Migration to Version 8.4.5</A
+NAME="AEN152463"
+>E.132.1. Migration to Version 8.4.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
     However, if you are upgrading from a version earlier than 8.4.2,
     see <A
 HREF="release-8-4-2.html"
->Section E.108</A
+>Section E.135</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147722"
->E.105.2. Changes</A
+NAME="AEN152467"
+>E.132.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-6.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-6.html	2017-08-07 21:32:56.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-6"
->E.104. Release 8.4.6</A
+>E.131. Release 8.4.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-12-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.5.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147591"
->E.104.1. Migration to Version 8.4.6</A
+NAME="AEN152336"
+>E.131.1. Migration to Version 8.4.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
     However, if you are upgrading from a version earlier than 8.4.2,
     see <A
 HREF="release-8-4-2.html"
->Section E.108</A
+>Section E.135</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147595"
->E.104.2. Changes</A
+NAME="AEN152340"
+>E.131.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-7.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-7.html	2017-08-07 21:32:56.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-7"
->E.103. Release 8.4.7</A
+>E.130. Release 8.4.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-01-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.6.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,15 +115,15 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147533"
->E.103.1. Migration to Version 8.4.7</A
+NAME="AEN152278"
+>E.130.1. Migration to Version 8.4.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
     However, if you are upgrading from a version earlier than 8.4.2,
     see <A
 HREF="release-8-4-2.html"
->Section E.108</A
+>Section E.135</A
 >.
    </P
 ></DIV
@@ -135,8 +132,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147537"
->E.103.2. Changes</A
+NAME="AEN152282"
+>E.130.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-8.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-8.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-8"
->E.102. Release 8.4.8</A
+>E.129. Release 8.4.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-04-18</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.7.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147443"
->E.102.1. Migration to Version 8.4.8</A
+NAME="AEN152188"
+>E.129.1. Migration to Version 8.4.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -149,7 +146,7 @@
 >    Also, if you are upgrading from a version earlier than 8.4.2,
     see <A
 HREF="release-8-4-2.html"
->Section E.108</A
+>Section E.135</A
 >.
    </P
 ></DIV
@@ -158,8 +155,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147453"
->E.102.2. Changes</A
+NAME="AEN152198"
+>E.129.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4-9.html	2016-03-28 20:21:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4-9.html	2017-08-07 21:32:55.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4-9"
->E.101. Release 8.4.9</A
+>E.128. Release 8.4.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-09-26</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 8.4.8.
    For information about new features in the 8.4 major release, see
    <A
 HREF="release-8-4.html"
->Section E.110</A
+>Section E.137</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147241"
->E.101.1. Migration to Version 8.4.9</A
+NAME="AEN151986"
+>E.128.1. Migration to Version 8.4.9</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 8.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 8.4.8,
     see <A
 HREF="release-8-4-8.html"
->Section E.102</A
+>Section E.129</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN147246"
->E.101.2. Changes</A
+NAME="AEN151991"
+>E.128.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-8-4.html	2016-03-28 20:21:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-8-4.html	2017-08-07 21:32:56.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-8-4"
->E.110. Release 8.4</A
+>E.137. Release 8.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2009-07-01</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN148545"
->E.110.1. Overview</A
+NAME="AEN153290"
+>E.137.1. Overview</A
 ></H2
 ><P
 >    After many years of development, <SPAN
@@ -222,8 +219,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN148585"
->E.110.2. Migration to Version 8.4</A
+NAME="AEN153330"
+>E.137.2. Migration to Version 8.4</A
 ></H2
 ><P
 >    A dump/restore using <SPAN
@@ -241,8 +238,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN148590"
->E.110.2.1. General</A
+NAME="AEN153335"
+>E.137.2.1. General</A
 ></H3
 ><P
 ></P
@@ -285,8 +282,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN148603"
->E.110.2.2. Server Settings</A
+NAME="AEN153348"
+>E.137.2.2. Server Settings</A
 ></H3
 ><P
 ></P
@@ -432,8 +429,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN148650"
->E.110.2.3. Queries</A
+NAME="AEN153395"
+>E.137.2.3. Queries</A
 ></H3
 ><P
 ></P
@@ -559,8 +556,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN148686"
->E.110.2.4. Functions and Operators</A
+NAME="AEN153431"
+>E.137.2.4. Functions and Operators</A
 ></H3
 ><P
 ></P
@@ -697,8 +694,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN148728"
->E.110.2.4.1. Temporal Functions and Operators</A
+NAME="AEN153473"
+>E.137.2.4.1. Temporal Functions and Operators</A
 ></H4
 ><P
 ></P
@@ -811,8 +808,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN148761"
->E.110.3. Changes</A
+NAME="AEN153506"
+>E.137.3. Changes</A
 ></H2
 ><P
 >    Below you will find a detailed account of the changes between
@@ -827,8 +824,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN148765"
->E.110.3.1. Performance</A
+NAME="AEN153510"
+>E.137.3.1. Performance</A
 ></H3
 ><P
 ></P
@@ -1051,16 +1048,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN148834"
->E.110.3.2. Server</A
+NAME="AEN153579"
+>E.137.3.2. Server</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN148836"
->E.110.3.2.1. Settings</A
+NAME="AEN153581"
+>E.137.3.2.1. Settings</A
 ></H4
 ><P
 ></P
@@ -1104,8 +1101,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN148849"
->E.110.3.2.2. Authentication and security</A
+NAME="AEN153594"
+>E.137.3.2.2. Authentication and security</A
 ></H4
 ><P
 ></P
@@ -1183,7 +1180,7 @@
 CLASS="SECT4"
 ><A
 NAME="RELEASE-8-4-PG-HBA-CONF"
->E.110.3.2.3. <TT
+>E.137.3.2.3. <TT
 CLASS="FILENAME"
 >pg_hba.conf</TT
 ></A
@@ -1374,8 +1371,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN148929"
->E.110.3.2.4. Continuous Archiving</A
+NAME="AEN153674"
+>E.137.3.2.4. Continuous Archiving</A
 ></H4
 ><P
 ></P
@@ -1458,8 +1455,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN148954"
->E.110.3.2.5. Monitoring</A
+NAME="AEN153699"
+>E.137.3.2.5. Monitoring</A
 ></H4
 ><P
 ></P
@@ -1596,8 +1593,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN148995"
->E.110.3.3. Queries</A
+NAME="AEN153740"
+>E.137.3.3. Queries</A
 ></H3
 ><P
 ></P
@@ -1787,8 +1784,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149054"
->E.110.3.3.1. <TT
+NAME="AEN153799"
+>E.137.3.3.1. <TT
 CLASS="COMMAND"
 >TRUNCATE</TT
 ></A
@@ -1850,8 +1847,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149074"
->E.110.3.3.2. <TT
+NAME="AEN153819"
+>E.137.3.3.2. <TT
 CLASS="COMMAND"
 >EXPLAIN</TT
 ></A
@@ -1917,8 +1914,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149095"
->E.110.3.3.3. <TT
+NAME="AEN153840"
+>E.137.3.3.3. <TT
 CLASS="LITERAL"
 >LIMIT</TT
 >/<TT
@@ -1971,8 +1968,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN149111"
->E.110.3.4. Object Manipulation</A
+NAME="AEN153856"
+>E.137.3.4. Object Manipulation</A
 ></H3
 ><P
 ></P
@@ -2106,8 +2103,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149154"
->E.110.3.4.1. <TT
+NAME="AEN153899"
+>E.137.3.4.1. <TT
 CLASS="COMMAND"
 >ALTER</TT
 ></A
@@ -2234,8 +2231,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149194"
->E.110.3.4.2. Database Manipulation</A
+NAME="AEN153939"
+>E.137.3.4.2. Database Manipulation</A
 ></H4
 ><P
 ></P
@@ -2311,8 +2308,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN149216"
->E.110.3.5. Utility Operations</A
+NAME="AEN153961"
+>E.137.3.5. Utility Operations</A
 ></H3
 ><P
 ></P
@@ -2344,8 +2341,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149226"
->E.110.3.5.1. Indexes</A
+NAME="AEN153971"
+>E.137.3.5.1. Indexes</A
 ></H4
 ><P
 ></P
@@ -2398,8 +2395,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149242"
->E.110.3.5.2. Full Text Indexes</A
+NAME="AEN153987"
+>E.137.3.5.2. Full Text Indexes</A
 ></H4
 ><P
 ></P
@@ -2458,8 +2455,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149261"
->E.110.3.5.3. <TT
+NAME="AEN154006"
+>E.137.3.5.3. <TT
 CLASS="COMMAND"
 >VACUUM</TT
 ></A
@@ -2572,8 +2569,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN149295"
->E.110.3.6. Data Types</A
+NAME="AEN154040"
+>E.137.3.6. Data Types</A
 ></H3
 ><P
 ></P
@@ -2649,8 +2646,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149320"
->E.110.3.6.1. Temporal Data Types</A
+NAME="AEN154065"
+>E.137.3.6.1. Temporal Data Types</A
 ></H4
 ><P
 ></P
@@ -2820,8 +2817,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149372"
->E.110.3.6.2. Arrays</A
+NAME="AEN154117"
+>E.137.3.6.2. Arrays</A
 ></H4
 ><P
 ></P
@@ -2943,8 +2940,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149409"
->E.110.3.6.3. Wide-Value Storage (<ACRONYM
+NAME="AEN154154"
+>E.137.3.6.3. Wide-Value Storage (<ACRONYM
 CLASS="ACRONYM"
 >TOAST</ACRONYM
 >)</A
@@ -2989,8 +2986,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN149422"
->E.110.3.7. Functions</A
+NAME="AEN154167"
+>E.137.3.7. Functions</A
 ></H3
 ><P
 ></P
@@ -3093,8 +3090,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149455"
->E.110.3.7.1. Object Information Functions</A
+NAME="AEN154200"
+>E.137.3.7.1. Object Information Functions</A
 ></H4
 ><P
 ></P
@@ -3340,8 +3337,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149532"
->E.110.3.7.2. Function Creation</A
+NAME="AEN154277"
+>E.137.3.7.2. Function Creation</A
 ></H4
 ><P
 ></P
@@ -3399,8 +3396,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149550"
->E.110.3.7.3. PL/pgSQL Server-Side Language</A
+NAME="AEN154295"
+>E.137.3.7.3. PL/pgSQL Server-Side Language</A
 ></H4
 ><P
 ></P
@@ -3597,8 +3594,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN149612"
->E.110.3.8. Client Applications</A
+NAME="AEN154357"
+>E.137.3.8. Client Applications</A
 ></H3
 ><P
 ></P
@@ -3666,8 +3663,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149633"
->E.110.3.8.1. <SPAN
+NAME="AEN154378"
+>E.137.3.8.1. <SPAN
 CLASS="APPLICATION"
 >psql</SPAN
 ></A
@@ -3812,8 +3809,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149680"
->E.110.3.8.2. <SPAN
+NAME="AEN154425"
+>E.137.3.8.2. <SPAN
 CLASS="APPLICATION"
 >psql</SPAN
 > \d* commands</A
@@ -3948,8 +3945,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149721"
->E.110.3.8.3. <SPAN
+NAME="AEN154466"
+>E.137.3.8.3. <SPAN
 CLASS="APPLICATION"
 >pg_dump</SPAN
 ></A
@@ -4123,16 +4120,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN149773"
->E.110.3.9. Programming Tools</A
+NAME="AEN154518"
+>E.137.3.9. Programming Tools</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149775"
->E.110.3.9.1. <SPAN
+NAME="AEN154520"
+>E.137.3.9.1. <SPAN
 CLASS="APPLICATION"
 >libpq</SPAN
 ></A
@@ -4226,8 +4223,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149803"
->E.110.3.9.2. <SPAN
+NAME="AEN154548"
+>E.137.3.9.2. <SPAN
 CLASS="APPLICATION"
 >libpq</SPAN
 > <ACRONYM
@@ -4329,8 +4326,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149832"
->E.110.3.9.3. <SPAN
+NAME="AEN154577"
+>E.137.3.9.3. <SPAN
 CLASS="APPLICATION"
 >ecpg</SPAN
 ></A
@@ -4360,8 +4357,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN149841"
->E.110.3.9.4. Server Programming Interface (<ACRONYM
+NAME="AEN154586"
+>E.137.3.9.4. Server Programming Interface (<ACRONYM
 CLASS="ACRONYM"
 >SPI</ACRONYM
 >)</A
@@ -4418,8 +4415,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN149858"
->E.110.3.10. Build Options</A
+NAME="AEN154603"
+>E.137.3.10. Build Options</A
 ></H3
 ><P
 ></P
@@ -4627,8 +4624,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN149923"
->E.110.3.11. Source Code</A
+NAME="AEN154668"
+>E.137.3.11. Source Code</A
 ></H3
 ><P
 ></P
@@ -4910,8 +4907,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN150013"
->E.110.3.12. Contrib</A
+NAME="AEN154758"
+>E.137.3.12. Contrib</A
 ></H3
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-10.html	2016-03-28 20:21:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-10.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-10"
->E.77. Release 9.0.10</A
+>E.104. Release 9.0.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-09-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.9.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143142"
->E.77.1. Migration to Version 9.0.10</A
+NAME="AEN147887"
+>E.104.1. Migration to Version 9.0.10</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.6,
     see <A
 HREF="release-9-0-6.html"
->Section E.81</A
+>Section E.108</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143147"
->E.77.2. Changes</A
+NAME="AEN147892"
+>E.104.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-11.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-11.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-11"
->E.76. Release 9.0.11</A
+>E.103. Release 9.0.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-12-06</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.10.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142992"
->E.76.1. Migration to Version 9.0.11</A
+NAME="AEN147737"
+>E.103.1. Migration to Version 9.0.11</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.6,
     see <A
 HREF="release-9-0-6.html"
->Section E.81</A
+>Section E.108</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142997"
->E.76.2. Changes</A
+NAME="AEN147742"
+>E.103.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-12.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-12.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-12"
->E.75. Release 9.0.12</A
+>E.102. Release 9.0.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-02-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.11.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142891"
->E.75.1. Migration to Version 9.0.12</A
+NAME="AEN147636"
+>E.102.1. Migration to Version 9.0.12</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.6,
     see <A
 HREF="release-9-0-6.html"
->Section E.81</A
+>Section E.108</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142896"
->E.75.2. Changes</A
+NAME="AEN147641"
+>E.102.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-13.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-13.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-13"
->E.74. Release 9.0.13</A
+>E.101. Release 9.0.13</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-04-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.12.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142751"
->E.74.1. Migration to Version 9.0.13</A
+NAME="AEN147496"
+>E.101.1. Migration to Version 9.0.13</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -137,7 +134,7 @@
 >    Also, if you are upgrading from a version earlier than 9.0.6,
     see <A
 HREF="release-9-0-6.html"
->Section E.81</A
+>Section E.108</A
 >.
    </P
 ></DIV
@@ -146,8 +143,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142758"
->E.74.2. Changes</A
+NAME="AEN147503"
+>E.101.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-14.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-14.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-14"
->E.73. Release 9.0.14</A
+>E.100. Release 9.0.14</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-10-10</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.13.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142637"
->E.73.1. Migration to Version 9.0.14</A
+NAME="AEN147382"
+>E.100.1. Migration to Version 9.0.14</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.13,
     see <A
 HREF="release-9-0-13.html"
->Section E.74</A
+>Section E.101</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142642"
->E.73.2. Changes</A
+NAME="AEN147387"
+>E.100.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-15.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-15.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-15"
->E.72. Release 9.0.15</A
+>E.99. Release 9.0.15</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.14.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142550"
->E.72.1. Migration to Version 9.0.15</A
+NAME="AEN147295"
+>E.99.1. Migration to Version 9.0.15</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -133,7 +130,7 @@
 >    Also, if you are upgrading from a version earlier than 9.0.13,
     see <A
 HREF="release-9-0-13.html"
->Section E.74</A
+>Section E.101</A
 >.
    </P
 ></DIV
@@ -142,8 +139,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142556"
->E.72.2. Changes</A
+NAME="AEN147301"
+>E.99.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-16.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-16.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-16"
->E.71. Release 9.0.16</A
+>E.98. Release 9.0.16</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-02-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.15.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142369"
->E.71.1. Migration to Version 9.0.16</A
+NAME="AEN147114"
+>E.98.1. Migration to Version 9.0.16</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.15,
     see <A
 HREF="release-9-0-15.html"
->Section E.72</A
+>Section E.99</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142374"
->E.71.2. Changes</A
+NAME="AEN147119"
+>E.98.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-17.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-17.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-17"
->E.70. Release 9.0.17</A
+>E.97. Release 9.0.17</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-03-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.16.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142314"
->E.70.1. Migration to Version 9.0.17</A
+NAME="AEN147059"
+>E.97.1. Migration to Version 9.0.17</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.15,
     see <A
 HREF="release-9-0-15.html"
->Section E.72</A
+>Section E.99</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142319"
->E.70.2. Changes</A
+NAME="AEN147064"
+>E.97.2. Changes</A
 ></H2
 ><P
 ></P
@@ -176,7 +173,7 @@
      </P
 ><P
 >      This prevents scenarios wherein a pathological regular expression
-      could lock up a server process uninterruptably for a long time.
+      could lock up a server process uninterruptibly for a long time.
      </P
 ></LI
 ><LI
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-18.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-18.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-18"
->E.69. Release 9.0.18</A
+>E.96. Release 9.0.18</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-07-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.17.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142184"
->E.69.1. Migration to Version 9.0.18</A
+NAME="AEN146929"
+>E.96.1. Migration to Version 9.0.18</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -133,7 +130,7 @@
 >    Also, if you are upgrading from a version earlier than 9.0.15,
     see <A
 HREF="release-9-0-15.html"
->Section E.72</A
+>Section E.99</A
 >.
    </P
 ></DIV
@@ -142,8 +139,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN142190"
->E.69.2. Changes</A
+NAME="AEN146935"
+>E.96.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-19.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-19.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-19.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-19.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-19"
->E.68. Release 9.0.19</A
+>E.95. Release 9.0.19</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-02-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.18.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN141902"
->E.68.1. Migration to Version 9.0.19</A
+NAME="AEN146647"
+>E.95.1. Migration to Version 9.0.19</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.18,
     see <A
 HREF="release-9-0-18.html"
->Section E.69</A
+>Section E.96</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN141907"
->E.68.2. Changes</A
+NAME="AEN146652"
+>E.95.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-1.html	2016-03-28 20:21:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-1.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-1"
->E.86. Release 9.0.1</A
+>E.113. Release 9.0.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-10-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.0.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144393"
->E.86.1. Migration to Version 9.0.1</A
+NAME="AEN149138"
+>E.113.1. Migration to Version 9.0.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144396"
->E.86.2. Changes</A
+NAME="AEN149141"
+>E.113.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-20.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-20.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-20.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-20.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-20"
->E.67. Release 9.0.20</A
+>E.94. Release 9.0.20</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-05-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.19.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN141753"
->E.67.1. Migration to Version 9.0.20</A
+NAME="AEN146498"
+>E.94.1. Migration to Version 9.0.20</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -136,7 +133,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.18,
     see <A
 HREF="release-9-0-18.html"
->Section E.69</A
+>Section E.96</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN141758"
->E.67.2. Changes</A
+NAME="AEN146503"
+>E.94.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-21.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-21.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-21.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-21.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-21"
->E.66. Release 9.0.21</A
+>E.93. Release 9.0.21</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-06-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.0.20.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN141718"
->E.66.1. Migration to Version 9.0.21</A
+NAME="AEN146463"
+>E.93.1. Migration to Version 9.0.21</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -136,7 +133,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.18,
     see <A
 HREF="release-9-0-18.html"
->Section E.69</A
+>Section E.96</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN141723"
->E.66.2. Changes</A
+NAME="AEN146468"
+>E.93.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-22.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-22.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-22.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-22.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-22"
->E.65. Release 9.0.22</A
+>E.92. Release 9.0.22</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-06-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.0.21.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN141690"
->E.65.1. Migration to Version 9.0.22</A
+NAME="AEN146435"
+>E.92.1. Migration to Version 9.0.22</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -136,7 +133,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.18,
     see <A
 HREF="release-9-0-18.html"
->Section E.69</A
+>Section E.96</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN141695"
->E.65.2. Changes</A
+NAME="AEN146440"
+>E.92.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-23.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-23.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-23.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-23.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-23"
->E.64. Release 9.0.23</A
+>E.91. Release 9.0.23</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-10-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.22.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><P
@@ -126,8 +123,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN141486"
->E.64.1. Migration to Version 9.0.23</A
+NAME="AEN146231"
+>E.91.1. Migration to Version 9.0.23</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -136,7 +133,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.18,
     see <A
 HREF="release-9-0-18.html"
->Section E.69</A
+>Section E.96</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN141491"
->E.64.2. Changes</A
+NAME="AEN146236"
+>E.91.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-2.html	2016-03-28 20:21:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-2.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-2"
->E.85. Release 9.0.2</A
+>E.112. Release 9.0.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-12-16</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.1.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144215"
->E.85.1. Migration to Version 9.0.2</A
+NAME="AEN148960"
+>E.112.1. Migration to Version 9.0.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144218"
->E.85.2. Changes</A
+NAME="AEN148963"
+>E.112.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-3.html	2016-03-28 20:21:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-3.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-3"
->E.84. Release 9.0.3</A
+>E.111. Release 9.0.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-01-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.2.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144142"
->E.84.1. Migration to Version 9.0.3</A
+NAME="AEN148887"
+>E.111.1. Migration to Version 9.0.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144145"
->E.84.2. Changes</A
+NAME="AEN148890"
+>E.111.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-4.html	2016-03-28 20:21:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-4.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-4"
->E.83. Release 9.0.4</A
+>E.110. Release 9.0.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-04-18</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.3.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144016"
->E.83.1. Migration to Version 9.0.4</A
+NAME="AEN148761"
+>E.110.1. Migration to Version 9.0.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -151,8 +148,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144024"
->E.83.2. Changes</A
+NAME="AEN148769"
+>E.110.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-5.html	2016-03-28 20:21:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-5.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-5"
->E.82. Release 9.0.5</A
+>E.109. Release 9.0.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-09-26</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.4.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143764"
->E.82.1. Migration to Version 9.0.5</A
+NAME="AEN148509"
+>E.109.1. Migration to Version 9.0.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.4,
     see <A
 HREF="release-9-0-4.html"
->Section E.83</A
+>Section E.110</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143769"
->E.82.2. Changes</A
+NAME="AEN148514"
+>E.109.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-6.html	2016-03-28 20:21:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-6.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-6"
->E.81. Release 9.0.6</A
+>E.108. Release 9.0.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.5.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143622"
->E.81.1. Migration to Version 9.0.6</A
+NAME="AEN148367"
+>E.108.1. Migration to Version 9.0.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -137,7 +134,7 @@
 >    Also, if you are upgrading from a version earlier than 9.0.4,
     see <A
 HREF="release-9-0-4.html"
->Section E.83</A
+>Section E.110</A
 >.
    </P
 ></DIV
@@ -146,8 +143,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143629"
->E.81.2. Changes</A
+NAME="AEN148374"
+>E.108.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-7.html	2016-03-28 20:21:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-7.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-7"
->E.80. Release 9.0.7</A
+>E.107. Release 9.0.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-02-27</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.6.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143445"
->E.80.1. Migration to Version 9.0.7</A
+NAME="AEN148190"
+>E.107.1. Migration to Version 9.0.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.6,
     see <A
 HREF="release-9-0-6.html"
->Section E.81</A
+>Section E.108</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143450"
->E.80.2. Changes</A
+NAME="AEN148195"
+>E.107.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-8.html	2016-03-28 20:21:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-8.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-8"
->E.79. Release 9.0.8</A
+>E.106. Release 9.0.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-06-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.7.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143324"
->E.79.1. Migration to Version 9.0.8</A
+NAME="AEN148069"
+>E.106.1. Migration to Version 9.0.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.6,
     see <A
 HREF="release-9-0-6.html"
->Section E.81</A
+>Section E.108</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143329"
->E.79.2. Changes</A
+NAME="AEN148074"
+>E.106.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0-9.html	2016-03-28 20:21:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0-9.html	2017-08-07 21:32:53.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0-9"
->E.78. Release 9.0.9</A
+>E.105. Release 9.0.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-08-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.0.8.
    For information about new features in the 9.0 major release, see
    <A
 HREF="release-9-0.html"
->Section E.87</A
+>Section E.114</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143196"
->E.78.1. Migration to Version 9.0.9</A
+NAME="AEN147941"
+>E.105.1. Migration to Version 9.0.9</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.0.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.0.6,
     see <A
 HREF="release-9-0-6.html"
->Section E.81</A
+>Section E.108</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143201"
->E.78.2. Changes</A
+NAME="AEN147946"
+>E.105.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-0.html	2016-03-28 20:21:21.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-0.html	2017-08-07 21:32:54.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-0"
->E.87. Release 9.0</A
+>E.114. Release 9.0</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2010-09-20</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144435"
->E.87.1. Overview</A
+NAME="AEN149180"
+>E.114.1. Overview</A
 ></H2
 ><P
 >    This release of
@@ -363,8 +360,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144506"
->E.87.2. Migration to Version 9.0</A
+NAME="AEN149251"
+>E.114.2. Migration to Version 9.0</A
 ></H2
 ><P
 >   A dump/restore using <SPAN
@@ -391,8 +388,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN144512"
->E.87.2.1. Server Settings</A
+NAME="AEN149257"
+>E.114.2.1. Server Settings</A
 ></H3
 ><P
 ></P
@@ -467,8 +464,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN144535"
->E.87.2.2. Queries</A
+NAME="AEN149280"
+>E.114.2.2. Queries</A
 ></H3
 ><P
 ></P
@@ -495,8 +492,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN144542"
->E.87.2.3. Data Types</A
+NAME="AEN149287"
+>E.114.2.3. Data Types</A
 ></H3
 ><P
 ></P
@@ -609,8 +606,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN144574"
->E.87.2.4. Object Renaming</A
+NAME="AEN149319"
+>E.114.2.4. Object Renaming</A
 ></H3
 ><P
 ></P
@@ -662,8 +659,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN144588"
->E.87.2.5. PL/pgSQL</A
+NAME="AEN149333"
+>E.114.2.5. PL/pgSQL</A
 ></H3
 ><P
 ></P
@@ -816,8 +813,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN144627"
->E.87.2.6. Other Incompatibilities</A
+NAME="AEN149372"
+>E.114.2.6. Other Incompatibilities</A
 ></H3
 ><P
 ></P
@@ -858,8 +855,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN144638"
->E.87.3. Changes</A
+NAME="AEN149383"
+>E.114.3. Changes</A
 ></H2
 ><P
 >    Version 9.0 has an unprecedented number of new major features,
@@ -871,16 +868,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN144641"
->E.87.3.1. Server</A
+NAME="AEN149386"
+>E.114.3.1. Server</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144643"
->E.87.3.1.1. Continuous Archiving and Streaming Replication</A
+NAME="AEN149388"
+>E.114.3.1.1. Continuous Archiving and Streaming Replication</A
 ></H4
 ><P
 >     PostgreSQL's existing standby-server capability has been expanded both to
@@ -974,8 +971,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144668"
->E.87.3.1.2. Performance</A
+NAME="AEN149413"
+>E.114.3.1.2. Performance</A
 ></H4
 ><P
 ></P
@@ -1045,8 +1042,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144689"
->E.87.3.1.3. Optimizer</A
+NAME="AEN149434"
+>E.114.3.1.3. Optimizer</A
 ></H4
 ><P
 ></P
@@ -1114,8 +1111,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144709"
->E.87.3.1.4. <A
+NAME="AEN149454"
+>E.114.3.1.4. <A
 HREF="geqo.html"
 >GEQO</A
 ></A
@@ -1160,8 +1157,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144722"
->E.87.3.1.5. Optimizer Statistics</A
+NAME="AEN149467"
+>E.114.3.1.5. Optimizer Statistics</A
 ></H4
 ><P
 ></P
@@ -1234,8 +1231,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144742"
->E.87.3.1.6. Authentication</A
+NAME="AEN149487"
+>E.114.3.1.6. Authentication</A
 ></H4
 ><P
 ></P
@@ -1316,8 +1313,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144766"
->E.87.3.1.7. Monitoring</A
+NAME="AEN149511"
+>E.114.3.1.7. Monitoring</A
 ></H4
 ><P
 ></P
@@ -1378,8 +1375,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144784"
->E.87.3.1.8. Statistics Counters</A
+NAME="AEN149529"
+>E.114.3.1.8. Statistics Counters</A
 ></H4
 ><P
 ></P
@@ -1421,8 +1418,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144796"
->E.87.3.1.9. Server Settings</A
+NAME="AEN149541"
+>E.114.3.1.9. Server Settings</A
 ></H4
 ><P
 ></P
@@ -1568,8 +1565,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN144836"
->E.87.3.2. Queries</A
+NAME="AEN149581"
+>E.114.3.2. Queries</A
 ></H3
 ><P
 ></P
@@ -1686,8 +1683,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144870"
->E.87.3.2.1. Unicode Strings</A
+NAME="AEN149615"
+>E.114.3.2.1. Unicode Strings</A
 ></H4
 ><P
 ></P
@@ -1725,8 +1722,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN144881"
->E.87.3.3. Object Manipulation</A
+NAME="AEN149626"
+>E.114.3.3. Object Manipulation</A
 ></H3
 ><P
 ></P
@@ -1791,8 +1788,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144901"
->E.87.3.3.1. <TT
+NAME="AEN149646"
+>E.114.3.3.1. <TT
 CLASS="COMMAND"
 >ALTER TABLE</TT
 ></A
@@ -1863,8 +1860,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144921"
->E.87.3.3.2. <A
+NAME="AEN149666"
+>E.114.3.3.2. <A
 HREF="sql-createtable.html"
 ><TT
 CLASS="COMMAND"
@@ -1927,8 +1924,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144939"
->E.87.3.3.3. Constraints</A
+NAME="AEN149684"
+>E.114.3.3.3. Constraints</A
 ></H4
 ><P
 ></P
@@ -2006,8 +2003,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN144958"
->E.87.3.3.4. Object Permissions</A
+NAME="AEN149703"
+>E.114.3.3.4. Object Permissions</A
 ></H4
 ><P
 ></P
@@ -2077,8 +2074,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN144977"
->E.87.3.4. Utility Operations</A
+NAME="AEN149722"
+>E.114.3.4. Utility Operations</A
 ></H3
 ><P
 ></P
@@ -2154,8 +2151,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145000"
->E.87.3.4.1. <A
+NAME="AEN149745"
+>E.114.3.4.1. <A
 HREF="sql-copy.html"
 ><TT
 CLASS="COMMAND"
@@ -2211,8 +2208,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145017"
->E.87.3.4.2. <A
+NAME="AEN149762"
+>E.114.3.4.2. <A
 HREF="sql-explain.html"
 ><TT
 CLASS="COMMAND"
@@ -2301,8 +2298,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145044"
->E.87.3.4.3. <A
+NAME="AEN149789"
+>E.114.3.4.3. <A
 HREF="sql-vacuum.html"
 ><TT
 CLASS="COMMAND"
@@ -2355,8 +2352,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145059"
->E.87.3.4.4. Indexes</A
+NAME="AEN149804"
+>E.114.3.4.4. Indexes</A
 ></H4
 ><P
 ></P
@@ -2454,8 +2451,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN145086"
->E.87.3.5. Data Types</A
+NAME="AEN149831"
+>E.114.3.5. Data Types</A
 ></H3
 ><P
 ></P
@@ -2546,8 +2543,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145112"
->E.87.3.5.1. <A
+NAME="AEN149857"
+>E.114.3.5.1. <A
 HREF="textsearch.html"
 >Full Text Search</A
 ></A
@@ -2598,8 +2595,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN145128"
->E.87.3.6. Functions</A
+NAME="AEN149873"
+>E.114.3.6. Functions</A
 ></H3
 ><P
 ></P
@@ -2760,8 +2757,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145175"
->E.87.3.6.1. Aggregates</A
+NAME="AEN149920"
+>E.114.3.6.1. Aggregates</A
 ></H4
 ><P
 ></P
@@ -2845,8 +2842,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145200"
->E.87.3.6.2. Bit Strings</A
+NAME="AEN149945"
+>E.114.3.6.2. Bit Strings</A
 ></H4
 ><P
 ></P
@@ -2900,8 +2897,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145216"
->E.87.3.6.3. Object Information Functions</A
+NAME="AEN149961"
+>E.114.3.6.3. Object Information Functions</A
 ></H4
 ><P
 ></P
@@ -2980,8 +2977,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145240"
->E.87.3.6.4. Function and Trigger Creation</A
+NAME="AEN149985"
+>E.114.3.6.4. Function and Trigger Creation</A
 ></H4
 ><P
 ></P
@@ -3055,8 +3052,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN145261"
->E.87.3.7. Server-Side Languages</A
+NAME="AEN150006"
+>E.114.3.7. Server-Side Languages</A
 ></H3
 ><P
 ></P
@@ -3087,8 +3084,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145270"
->E.87.3.7.1. <A
+NAME="AEN150015"
+>E.114.3.7.1. <A
 HREF="plpgsql.html"
 >PL/pgSQL</A
 > Server-Side
@@ -3244,8 +3241,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145313"
->E.87.3.7.2. <A
+NAME="AEN150058"
+>E.114.3.7.2. <A
 HREF="plperl.html"
 >PL/Perl</A
 > Server-Side Language</A
@@ -3391,8 +3388,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145358"
->E.87.3.7.3. <A
+NAME="AEN150103"
+>E.114.3.7.3. <A
 HREF="plpython.html"
 >PL/Python</A
 > Server-Side Language</A
@@ -3482,8 +3479,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN145386"
->E.87.3.8. Client Applications</A
+NAME="AEN150131"
+>E.114.3.8. Client Applications</A
 ></H3
 ><P
 ></P
@@ -3509,8 +3506,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145394"
->E.87.3.8.1. <A
+NAME="AEN150139"
+>E.114.3.8.1. <A
 HREF="app-psql.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3620,8 +3617,8 @@
 ><H5
 CLASS="SECT5"
 ><A
-NAME="AEN145428"
->E.87.3.8.1.1. <SPAN
+NAME="AEN150173"
+>E.114.3.8.1.1. <SPAN
 CLASS="APPLICATION"
 >psql</SPAN
 > Display</A
@@ -3665,8 +3662,8 @@
 ><H5
 CLASS="SECT5"
 ><A
-NAME="AEN145441"
->E.87.3.8.1.2. <SPAN
+NAME="AEN150186"
+>E.114.3.8.1.2. <SPAN
 CLASS="APPLICATION"
 >psql</SPAN
 > <A
@@ -3735,8 +3732,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145462"
->E.87.3.8.2. <A
+NAME="AEN150207"
+>E.114.3.8.2. <A
 HREF="app-pgdump.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3849,8 +3846,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145497"
->E.87.3.8.3. <A
+NAME="AEN150242"
+>E.114.3.8.3. <A
 HREF="app-pg-ctl.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3908,8 +3905,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN145514"
->E.87.3.9. <SPAN
+NAME="AEN150259"
+>E.114.3.9. <SPAN
 CLASS="APPLICATION"
 >Development Tools</SPAN
 ></A
@@ -3919,8 +3916,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145517"
->E.87.3.9.1. <A
+NAME="AEN150262"
+>E.114.3.9.1. <A
 HREF="libpq.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -4066,8 +4063,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145561"
->E.87.3.9.2. <A
+NAME="AEN150306"
+>E.114.3.9.2. <A
 HREF="ecpg.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -4192,8 +4189,8 @@
 ><H5
 CLASS="SECT5"
 ><A
-NAME="AEN145601"
->E.87.3.9.2.1. <SPAN
+NAME="AEN150346"
+>E.114.3.9.2.1. <SPAN
 CLASS="APPLICATION"
 >ecpg</SPAN
 > Cursors</A
@@ -4263,8 +4260,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN145622"
->E.87.3.10. Build Options</A
+NAME="AEN150367"
+>E.114.3.10. Build Options</A
 ></H3
 ><P
 ></P
@@ -4322,8 +4319,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145639"
->E.87.3.10.1. Makefiles</A
+NAME="AEN150384"
+>E.114.3.10.1. Makefiles</A
 ></H4
 ><P
 ></P
@@ -4403,8 +4400,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145663"
->E.87.3.10.2. Windows</A
+NAME="AEN150408"
+>E.114.3.10.2. Windows</A
 ></H4
 ><P
 ></P
@@ -4448,8 +4445,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN145676"
->E.87.3.11. Source Code</A
+NAME="AEN150421"
+>E.114.3.11. Source Code</A
 ></H3
 ><P
 ></P
@@ -4701,8 +4698,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145755"
->E.87.3.11.1. New Build Requirements</A
+NAME="AEN150500"
+>E.114.3.11.1. New Build Requirements</A
 ></H4
 ><P
 >      Note that these requirements do not apply when building from a
@@ -4755,8 +4752,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145771"
->E.87.3.11.2. Portability</A
+NAME="AEN150516"
+>E.114.3.11.2. Portability</A
 ></H4
 ><P
 ></P
@@ -4833,8 +4830,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145795"
->E.87.3.11.3. Server Programming</A
+NAME="AEN150540"
+>E.114.3.11.3. Server Programming</A
 ></H4
 ><P
 ></P
@@ -4934,8 +4931,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145823"
->E.87.3.11.4. Server Hooks</A
+NAME="AEN150568"
+>E.114.3.11.4. Server Hooks</A
 ></H4
 ><P
 ></P
@@ -4959,8 +4956,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN145830"
->E.87.3.11.5. Binary Upgrade Support</A
+NAME="AEN150575"
+>E.114.3.11.5. Binary Upgrade Support</A
 ></H4
 ><P
 ></P
@@ -5029,8 +5026,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN145850"
->E.87.3.12. Contrib</A
+NAME="AEN150595"
+>E.114.3.12. Contrib</A
 ></H3
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-10.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-10.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-10"
->E.53. Release 9.1.10</A
+>E.80. Release 9.1.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-10-10</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.9.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138618"
->E.53.1. Migration to Version 9.1.10</A
+NAME="AEN143363"
+>E.80.1. Migration to Version 9.1.10</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.9,
     see <A
 HREF="release-9-1-9.html"
->Section E.54</A
+>Section E.81</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138623"
->E.53.2. Changes</A
+NAME="AEN143368"
+>E.80.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-11.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-11.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-11"
->E.52. Release 9.1.11</A
+>E.79. Release 9.1.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.10.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138525"
->E.52.1. Migration to Version 9.1.11</A
+NAME="AEN143270"
+>E.79.1. Migration to Version 9.1.11</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -133,7 +130,7 @@
 >    Also, if you are upgrading from a version earlier than 9.1.9,
     see <A
 HREF="release-9-1-9.html"
->Section E.54</A
+>Section E.81</A
 >.
    </P
 ></DIV
@@ -142,8 +139,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138531"
->E.52.2. Changes</A
+NAME="AEN143276"
+>E.79.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-12.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-12.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-12"
->E.51. Release 9.1.12</A
+>E.78. Release 9.1.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-02-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.11.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138325"
->E.51.1. Migration to Version 9.1.12</A
+NAME="AEN143070"
+>E.78.1. Migration to Version 9.1.12</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.11,
     see <A
 HREF="release-9-1-11.html"
->Section E.52</A
+>Section E.79</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138330"
->E.51.2. Changes</A
+NAME="AEN143075"
+>E.78.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-13.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-13.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-13"
->E.50. Release 9.1.13</A
+>E.77. Release 9.1.13</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-03-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.12.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138264"
->E.50.1. Migration to Version 9.1.13</A
+NAME="AEN143009"
+>E.77.1. Migration to Version 9.1.13</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.11,
     see <A
 HREF="release-9-1-11.html"
->Section E.52</A
+>Section E.79</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138269"
->E.50.2. Changes</A
+NAME="AEN143014"
+>E.77.2. Changes</A
 ></H2
 ><P
 ></P
@@ -176,7 +173,7 @@
      </P
 ><P
 >      This prevents scenarios wherein a pathological regular expression
-      could lock up a server process uninterruptably for a long time.
+      could lock up a server process uninterruptibly for a long time.
      </P
 ></LI
 ><LI
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-14.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-14.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-14"
->E.49. Release 9.1.14</A
+>E.76. Release 9.1.14</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-07-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.13.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138120"
->E.49.1. Migration to Version 9.1.14</A
+NAME="AEN142865"
+>E.76.1. Migration to Version 9.1.14</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -133,7 +130,7 @@
 >    Also, if you are upgrading from a version earlier than 9.1.11,
     see <A
 HREF="release-9-1-11.html"
->Section E.52</A
+>Section E.79</A
 >.
    </P
 ></DIV
@@ -142,8 +139,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138126"
->E.49.2. Changes</A
+NAME="AEN142871"
+>E.76.2. Changes</A
 ></H2
 ><P
 ></P
@@ -468,7 +465,7 @@
 >      Fix linking of <SPAN
 CLASS="APPLICATION"
 >libpython</SPAN
-> on OS X (Tom Lane)
+> on macOS (Tom Lane)
      </P
 ><P
 >      The method we previously used can fail with the Python library
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-15.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-15.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-15"
->E.48. Release 9.1.15</A
+>E.75. Release 9.1.15</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-02-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.14.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137808"
->E.48.1. Migration to Version 9.1.15</A
+NAME="AEN142553"
+>E.75.1. Migration to Version 9.1.15</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.14,
     see <A
 HREF="release-9-1-14.html"
->Section E.49</A
+>Section E.76</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137813"
->E.48.2. Changes</A
+NAME="AEN142558"
+>E.75.2. Changes</A
 ></H2
 ><P
 ></P
@@ -715,7 +712,7 @@
 ></LI
 ><LI
 ><P
->      Warn if OS X's <CODE
+>      Warn if macOS's <CODE
 CLASS="FUNCTION"
 >setlocale()</CODE
 > starts an unwanted extra
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-16.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-16.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-16"
->E.47. Release 9.1.16</A
+>E.74. Release 9.1.16</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-05-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.15.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137613"
->E.47.1. Migration to Version 9.1.16</A
+NAME="AEN142358"
+>E.74.1. Migration to Version 9.1.16</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -139,7 +136,7 @@
 >    Also, if you are upgrading from a version earlier than 9.1.14,
     see <A
 HREF="release-9-1-14.html"
->Section E.49</A
+>Section E.76</A
 >.
    </P
 ></DIV
@@ -148,8 +145,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137621"
->E.47.2. Changes</A
+NAME="AEN142366"
+>E.74.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-17.html	2016-03-28 20:21:16.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-17.html	2017-08-07 21:32:49.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-17"
->E.46. Release 9.1.17</A
+>E.73. Release 9.1.17</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-06-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.1.16.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137580"
->E.46.1. Migration to Version 9.1.17</A
+NAME="AEN142325"
+>E.73.1. Migration to Version 9.1.17</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.16,
     see <A
 HREF="release-9-1-16.html"
->Section E.47</A
+>Section E.74</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137585"
->E.46.2. Changes</A
+NAME="AEN142330"
+>E.73.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-18.html	2016-03-28 20:21:16.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-18.html	2017-08-07 21:32:49.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-18"
->E.45. Release 9.1.18</A
+>E.72. Release 9.1.18</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-06-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.1.17.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137554"
->E.45.1. Migration to Version 9.1.18</A
+NAME="AEN142299"
+>E.72.1. Migration to Version 9.1.18</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.16,
     see <A
 HREF="release-9-1-16.html"
->Section E.47</A
+>Section E.74</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137559"
->E.45.2. Changes</A
+NAME="AEN142304"
+>E.72.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-19.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-19.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-19.html	2016-03-28 20:21:16.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-19.html	2017-08-07 21:32:49.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-19"
->E.44. Release 9.1.19</A
+>E.71. Release 9.1.19</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-10-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.18.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137326"
->E.44.1. Migration to Version 9.1.19</A
+NAME="AEN142071"
+>E.71.1. Migration to Version 9.1.19</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.16,
     see <A
 HREF="release-9-1-16.html"
->Section E.47</A
+>Section E.74</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137331"
->E.44.2. Changes</A
+NAME="AEN142076"
+>E.71.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-1.html	2016-03-28 20:21:18.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-1.html	2017-08-07 21:32:51.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-1"
->E.62. Release 9.1.1</A
+>E.89. Release 9.1.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-09-26</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.1.0.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN140140"
->E.62.1. Migration to Version 9.1.1</A
+NAME="AEN144885"
+>E.89.1. Migration to Version 9.1.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN140143"
->E.62.2. Changes</A
+NAME="AEN144888"
+>E.89.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-20.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-20.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-20.html	2016-03-28 20:21:16.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-20.html	2017-08-07 21:32:49.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-20"
->E.43. Release 9.1.20</A
+>E.70. Release 9.1.20</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-02-11</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.19.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137118"
->E.43.1. Migration to Version 9.1.20</A
+NAME="AEN141863"
+>E.70.1. Migration to Version 9.1.20</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.16,
     see <A
 HREF="release-9-1-16.html"
->Section E.47</A
+>Section E.74</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137123"
->E.43.2. Changes</A
+NAME="AEN141868"
+>E.70.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-21.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-21.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-21.html	2016-03-28 20:21:16.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-21.html	2017-08-07 21:32:49.000000000 +0000
@@ -9,14 +9,14 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
 HREF="release.html"><LINK
 REL="PREVIOUS"
-TITLE="Release 9.2"
-HREF="release-9-2.html"><LINK
+TITLE="Release 9.1.22"
+HREF="release-9-1-22.html"><LINK
 REL="NEXT"
 TITLE="Release 9.1.20"
 HREF="release-9-1-20.html"><LINK
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -53,8 +53,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="Release 9.2"
-HREF="release-9-2.html"
+TITLE="Release 9.1.22"
+HREF="release-9-1-22.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-21"
->E.42. Release 9.1.21</A
+>E.69. Release 9.1.21</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-03-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.20.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137035"
->E.42.1. Migration to Version 9.1.21</A
+NAME="AEN141780"
+>E.69.1. Migration to Version 9.1.21</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.16,
     see <A
 HREF="release-9-1-16.html"
->Section E.47</A
+>Section E.74</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN137040"
->E.42.2. Changes</A
+NAME="AEN141785"
+>E.69.2. Changes</A
 ></H2
 ><P
 ></P
@@ -229,7 +226,7 @@
      </P
 ><P
 >      This dodges a portability problem on FreeBSD-derived platforms
-      (including OS X).
+      (including macOS).
      </P
 ></LI
 ><LI
@@ -387,7 +384,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="release-9-2.html"
+HREF="release-9-1-22.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -415,7 +412,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Release 9.2</TD
+>Release 9.1.22</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-22.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-22.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-22.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-22.html	2017-08-07 21:32:49.000000000 +0000
@@ -0,0 +1,411 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.1.22</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.1.23"
+HREF="release-9-1-23.html"><LINK
+REL="NEXT"
+TITLE="Release 9.1.21"
+HREF="release-9-1-21.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.1.23"
+HREF="release-9-1-23.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.1.21"
+HREF="release-9-1-21.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-1-22"
+>E.68. Release 9.1.22</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-05-12</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.1.21.
+   For information about new features in the 9.1 major release, see
+   <A
+HREF="release-9-1.html"
+>Section E.90</A
+>.
+  </P
+><P
+>   The <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> community will stop releasing updates
+   for the 9.1.X release series in September 2016.
+   Users are encouraged to update to a newer release branch soon.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN141712"
+>E.68.1. Migration to Version 9.1.22</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.1.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.1.16,
+    see <A
+HREF="release-9-1-16.html"
+>Section E.74</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN141717"
+>E.68.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      afterwards (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </P
+><P
+>      This change prevents problems when there are multiple connections
+      using OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      Failures have been reported specifically when a client application
+      uses SSL connections in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> concurrently with
+      SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
+      It's possible for similar problems to arise within the server as well,
+      if an extension module establishes an outgoing SSL connection.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="QUOTE"
+>"failed to build any <TT
+CLASS="REPLACEABLE"
+><I
+>N</I
+></TT
+>-way joins"</SPAN
+>
+      planner error with a full join enclosed in the right-hand side of a
+      left join (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix possible misbehavior of <TT
+CLASS="LITERAL"
+>TH</TT
+>, <TT
+CLASS="LITERAL"
+>th</TT
+>,
+      and <TT
+CLASS="LITERAL"
+>Y,YYY</TT
+> format codes in <CODE
+CLASS="FUNCTION"
+>to_timestamp()</CODE
+>
+      (Tom Lane)
+     </P
+><P
+>      These could advance off the end of the input string, causing subsequent
+      format codes to read garbage.
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of rules and views in which the <TT
+CLASS="REPLACEABLE"
+><I
+>array</I
+></TT
+>
+      argument of a <TT
+CLASS="LITERAL"
+><TT
+CLASS="REPLACEABLE"
+><I
+>value</I
+></TT
+> <TT
+CLASS="REPLACEABLE"
+><I
+>operator</I
+></TT
+>
+      ANY (<TT
+CLASS="REPLACEABLE"
+><I
+>array</I
+></TT
+>)</TT
+> construct is a sub-SELECT
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_regress</SPAN
+> use a startup timeout from the
+      <TT
+CLASS="ENVAR"
+>PGCTLTIMEOUT</TT
+> environment variable, if that's set (Tom Lane)
+     </P
+><P
+>      This is for consistency with a behavior recently added
+      to <SPAN
+CLASS="APPLICATION"
+>pg_ctl</SPAN
+>; it eases automated testing on slow machines.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to correctly restore extension
+      membership for operator families containing only one operator class
+      (Tom Lane)
+     </P
+><P
+>      In such a case, the operator family was restored into the new database,
+      but it was no longer marked as part of the extension.  This had no
+      immediate ill effects, but would cause later <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      runs to emit output that would cause (harmless) errors on restore.
+     </P
+></LI
+><LI
+><P
+>      Rename internal function <CODE
+CLASS="FUNCTION"
+>strtoi()</CODE
+>
+      to <CODE
+CLASS="FUNCTION"
+>strtoint()</CODE
+> to avoid conflict with a NetBSD library
+      function (Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix reporting of errors from <CODE
+CLASS="FUNCTION"
+>bind()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>listen()</CODE
+> system calls on Windows (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Reduce verbosity of compiler output when building with Microsoft Visual
+      Studio (Christian Ullrich)
+     </P
+></LI
+><LI
+><P
+>      Avoid possibly-unsafe use of Windows' <CODE
+CLASS="FUNCTION"
+>FormatMessage()</CODE
+>
+      function (Christian Ullrich)
+     </P
+><P
+>      Use the <TT
+CLASS="LITERAL"
+>FORMAT_MESSAGE_IGNORE_INSERTS</TT
+> flag where
+      appropriate.  No live bug is known to exist here, but it seems like a
+      good idea to be careful.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016d
+      for DST law changes in Russia and Venezuela.  There are new zone
+      names <TT
+CLASS="LITERAL"
+>Europe/Kirov</TT
+> and <TT
+CLASS="LITERAL"
+>Asia/Tomsk</TT
+> to reflect
+      the fact that these regions now have different time zone histories from
+      adjacent regions.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-1-23.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-1-21.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.1.23</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.1.21</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-23.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-23.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-23.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-23.html	2017-08-07 21:32:49.000000000 +0000
@@ -0,0 +1,620 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.1.23</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.1.24"
+HREF="release-9-1-24.html"><LINK
+REL="NEXT"
+TITLE="Release 9.1.22"
+HREF="release-9-1-22.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.1.24"
+HREF="release-9-1-24.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.1.22"
+HREF="release-9-1-22.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-1-23"
+>E.67. Release 9.1.23</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-08-11</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.1.22.
+   For information about new features in the 9.1 major release, see
+   <A
+HREF="release-9-1.html"
+>Section E.90</A
+>.
+  </P
+><P
+>   The <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> community will stop releasing updates
+   for the 9.1.X release series in September 2016.
+   Users are encouraged to update to a newer release branch soon.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN141582"
+>E.67.1. Migration to Version 9.1.23</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.1.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.1.16,
+    see <A
+HREF="release-9-1-16.html"
+>Section E.74</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN141587"
+>E.67.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix possible mis-evaluation of
+      nested <TT
+CLASS="LITERAL"
+>CASE</TT
+>-<TT
+CLASS="LITERAL"
+>WHEN</TT
+> expressions (Heikki
+      Linnakangas, Michael Paquier, Tom Lane)
+     </P
+><P
+>      A <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression appearing within the test value
+      subexpression of another <TT
+CLASS="LITERAL"
+>CASE</TT
+> could become confused about
+      whether its own test value was null or not.  Also, inlining of a SQL
+      function implementing the equality operator used by
+      a <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression could result in passing the wrong test
+      value to functions called within a <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression in the
+      SQL function's body.  If the test values were of different data
+      types, a crash might result; moreover such situations could be abused
+      to allow disclosure of portions of server memory.  (CVE-2016-5423)
+     </P
+></LI
+><LI
+><P
+>      Fix client programs' handling of special characters in database and
+      role names (Noah Misch, Nathan Bossart, Michael Paquier)
+     </P
+><P
+>      Numerous places in <SPAN
+CLASS="APPLICATION"
+>vacuumdb</SPAN
+> and other client programs
+      could become confused by database and role names containing double
+      quotes or backslashes.  Tighten up quoting rules to make that safe.
+      Also, ensure that when a conninfo string is used as a database name
+      parameter to these programs, it is correctly treated as such throughout.
+     </P
+><P
+>      Fix handling of paired double quotes
+      in <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s <TT
+CLASS="COMMAND"
+>\connect</TT
+>
+      and <TT
+CLASS="COMMAND"
+>\password</TT
+> commands to match the documentation.
+     </P
+><P
+>      Introduce a new <TT
+CLASS="OPTION"
+>-reuse-previous</TT
+> option
+      in <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s <TT
+CLASS="COMMAND"
+>\connect</TT
+> command to allow
+      explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether
+      the database name looks like a conninfo string, as before.)  This
+      allows secure handling of database names containing special
+      characters in <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> scripts.
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> now refuses to deal with database and role
+      names containing carriage returns or newlines, as it seems impractical
+      to quote those characters safely on Windows.  In future we may reject
+      such names on the server side, but that step has not been taken yet.
+     </P
+><P
+>      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute
+      commands with superuser privileges the next time a superuser
+      executes <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> or other routine maintenance
+      operations.  (CVE-2016-5424)
+     </P
+></LI
+><LI
+><P
+>      Fix corner-case misbehaviors for <TT
+CLASS="LITERAL"
+>IS NULL</TT
+>/<TT
+CLASS="LITERAL"
+>IS NOT
+      NULL</TT
+> applied to nested composite values (Andrew Gierth, Tom Lane)
+     </P
+><P
+>      The SQL standard specifies that <TT
+CLASS="LITERAL"
+>IS NULL</TT
+> should return
+      TRUE for a row of all null values (thus <TT
+CLASS="LITERAL"
+>ROW(NULL,NULL) IS
+      NULL</TT
+> yields TRUE), but this is not meant to apply recursively
+      (thus <TT
+CLASS="LITERAL"
+>ROW(NULL, ROW(NULL,NULL)) IS NULL</TT
+> yields FALSE).
+      The core executor got this right, but certain planner optimizations
+      treated the test as recursive (thus producing TRUE in both cases),
+      and <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+> could produce remote queries
+      that misbehaved similarly.
+     </P
+></LI
+><LI
+><P
+>      Make the <TT
+CLASS="TYPE"
+>inet</TT
+> and <TT
+CLASS="TYPE"
+>cidr</TT
+> data types properly reject
+      IPv6 addresses with too many colon-separated fields (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Prevent crash in <CODE
+CLASS="FUNCTION"
+>close_ps()</CODE
+>
+      (the <TT
+CLASS="TYPE"
+>point</TT
+> <TT
+CLASS="LITERAL"
+>##</TT
+> <TT
+CLASS="TYPE"
+>lseg</TT
+> operator)
+      for NaN input coordinates (Tom Lane)
+     </P
+><P
+>      Make it return NULL instead of crashing.
+     </P
+></LI
+><LI
+><P
+>      Fix several one-byte buffer over-reads in <CODE
+CLASS="FUNCTION"
+>to_number()</CODE
+>
+      (Peter Eisentraut)
+     </P
+><P
+>      In several cases the <CODE
+CLASS="FUNCTION"
+>to_number()</CODE
+> function would read one
+      more character than it should from the input string.  There is a
+      small chance of a crash, if the input happens to be adjacent to the
+      end of memory.
+     </P
+></LI
+><LI
+><P
+>      Avoid unsafe intermediate state during expensive paths
+      through <CODE
+CLASS="FUNCTION"
+>heap_update()</CODE
+> (Masahiko Sawada, Andres Freund)
+     </P
+><P
+>      Previously, these cases locked the target tuple (by setting its XMAX)
+      but did not WAL-log that action, thus risking data integrity problems
+      if the page were spilled to disk and then a database crash occurred
+      before the tuple update could be completed.
+     </P
+></LI
+><LI
+><P
+>      Avoid consuming a transaction ID during <TT
+CLASS="COMMAND"
+>VACUUM</TT
+>
+      (Alexander Korotkov)
+     </P
+><P
+>      Some cases in <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> unnecessarily caused an XID to be
+      assigned to the current transaction.  Normally this is negligible,
+      but if one is up against the XID wraparound limit, consuming more
+      XIDs during anti-wraparound vacuums is a very bad thing.
+     </P
+></LI
+><LI
+><P
+>      Avoid canceling hot-standby queries during <TT
+CLASS="COMMAND"
+>VACUUM FREEZE</TT
+>
+      (Simon Riggs, &Aacute;lvaro Herrera)
+     </P
+><P
+>      <TT
+CLASS="COMMAND"
+>VACUUM FREEZE</TT
+> on an otherwise-idle master server could
+      result in unnecessary cancellations of queries on its standby
+      servers.
+     </P
+></LI
+><LI
+><P
+>      When a manual <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+> specifies a column list, don't
+      reset the table's <TT
+CLASS="LITERAL"
+>changes_since_analyze</TT
+> counter
+      (Tom Lane)
+     </P
+><P
+>      If we're only analyzing some columns, we should not prevent routine
+      auto-analyze from happening for the other columns.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+>'s overestimation of <TT
+CLASS="LITERAL"
+>n_distinct</TT
+>
+      for a unique or nearly-unique column with many null entries (Tom
+      Lane)
+     </P
+><P
+>      The nulls could get counted as though they were themselves distinct
+      values, leading to serious planner misestimates in some types of
+      queries.
+     </P
+></LI
+><LI
+><P
+>      Prevent autovacuum from starting multiple workers for the same shared
+      catalog (&Aacute;lvaro Herrera)
+     </P
+><P
+>      Normally this isn't much of a problem because the vacuum doesn't take
+      long anyway; but in the case of a severely bloated catalog, it could
+      result in all but one worker uselessly waiting instead of doing
+      useful work on other tables.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/btree_gin</TT
+> to handle the smallest
+      possible <TT
+CLASS="TYPE"
+>bigint</TT
+> value correctly (Peter Eisentraut)
+     </P
+></LI
+><LI
+><P
+>      Teach libpq to correctly decode server version from future servers
+      (Peter Eisentraut)
+     </P
+><P
+>      It's planned to switch to two-part instead of three-part server
+      version numbers for releases after 9.6.  Make sure
+      that <CODE
+CLASS="FUNCTION"
+>PQserverVersion()</CODE
+> returns the correct value for
+      such cases.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+>'s code for <TT
+CLASS="LITERAL"
+>unsigned long long</TT
+>
+      array elements (Michael Meskes)
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> accept <TT
+CLASS="LITERAL"
+>-Z 0</TT
+> as
+      specifying no compression (Fujii Masao)
+     </P
+></LI
+><LI
+><P
+>      Revert to the old heuristic timeout for <TT
+CLASS="LITERAL"
+>pg_ctl start -w</TT
+>
+      (Tom Lane)
+     </P
+><P
+>      The new method adopted as of release 9.1.20 does not work
+      when <TT
+CLASS="VARNAME"
+>silent_mode</TT
+> is enabled, so go back to the old way.
+     </P
+></LI
+><LI
+><P
+>      Fix makefiles' rule for building AIX shared libraries to be safe for
+      parallel make (Noah Misch)
+     </P
+></LI
+><LI
+><P
+>      Fix TAP tests and MSVC scripts to work when build directory's path
+      name contains spaces (Michael Paquier, Kyotaro Horiguchi)
+     </P
+></LI
+><LI
+><P
+>      Make regression tests safe for Danish and Welsh locales (Jeff Janes,
+      Tom Lane)
+     </P
+><P
+>      Change some test data that triggered the unusual sorting rules of
+      these locales.
+     </P
+></LI
+><LI
+><P
+>      Update our copy of the timezone code to match
+      IANA's <SPAN
+CLASS="APPLICATION"
+>tzcode</SPAN
+> release 2016c (Tom Lane)
+     </P
+><P
+>      This is needed to cope with anticipated future changes in the time
+      zone data files.  It also fixes some corner-case bugs in coping with
+      unusual time zones.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016f
+      for DST law changes in Kemerovo and Novosibirsk, plus historical
+      corrections for Azerbaijan, Belarus, and Morocco.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-1-24.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-1-22.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.1.24</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.1.22</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-24.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-24.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-24.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-24.html	2017-08-07 21:32:49.000000000 +0000
@@ -0,0 +1,433 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.1.24</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.2"
+HREF="release-9-2.html"><LINK
+REL="NEXT"
+TITLE="Release 9.1.23"
+HREF="release-9-1-23.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.2"
+HREF="release-9-2.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.1.23"
+HREF="release-9-1-23.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-1-24"
+>E.66. Release 9.1.24</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-10-27</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.1.23.
+   For information about new features in the 9.1 major release, see
+   <A
+HREF="release-9-1.html"
+>Section E.90</A
+>.
+  </P
+><P
+>   This is expected to be the last <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> release
+   in the 9.1.X series.  Users are encouraged to update to a newer
+   release branch soon.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN141505"
+>E.66.1. Migration to Version 9.1.24</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.1.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.1.16,
+    see <A
+HREF="release-9-1-16.html"
+>Section E.74</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN141510"
+>E.66.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix EvalPlanQual rechecks involving CTE scans (Tom Lane)
+     </P
+><P
+>      The recheck would always see the CTE as returning no rows, typically
+      leading to failure to update rows that were recently updated.
+     </P
+></LI
+><LI
+><P
+>      Fix improper repetition of previous results from hashed aggregation in
+      a subquery (Andrew Gierth)
+     </P
+><P
+>      The test to see if we can reuse a previously-computed hash table of
+      the aggregate state values neglected the possibility of an outer query
+      reference appearing in an aggregate argument expression.  A change in
+      the value of such a reference should lead to recalculating the hash
+      table, but did not.
+     </P
+></LI
+><LI
+><P
+>      Fix timeout length when <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> is waiting for exclusive
+      table lock so that it can truncate the table (Simon Riggs)
+     </P
+><P
+>      The timeout was meant to be 50 milliseconds, but it was actually only
+      50 microseconds, causing <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> to give up on truncation
+      much more easily than intended.  Set it to the intended value.
+     </P
+></LI
+><LI
+><P
+>      Remove artificial restrictions on the values accepted
+      by <CODE
+CLASS="FUNCTION"
+>numeric_in()</CODE
+> and <CODE
+CLASS="FUNCTION"
+>numeric_recv()</CODE
+>
+      (Tom Lane)
+     </P
+><P
+>      We allow numeric values up to the limit of the storage format (more
+      than <TT
+CLASS="LITERAL"
+>1e100000</TT
+>), so it seems fairly pointless
+      that <CODE
+CLASS="FUNCTION"
+>numeric_in()</CODE
+> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <CODE
+CLASS="FUNCTION"
+>numeric_recv()</CODE
+> to
+      reject more than 1000 digits in an input value.
+     </P
+></LI
+><LI
+><P
+>      Avoid very-low-probability data corruption due to testing tuple
+      visibility without holding buffer lock (Thomas Munro, Peter Geoghegan,
+      Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix file descriptor leakage when truncating a temporary relation of
+      more than 1GB (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Disallow starting a standalone backend with <TT
+CLASS="LITERAL"
+>standby_mode</TT
+>
+      turned on (Michael Paquier)
+     </P
+><P
+>      This can't do anything useful, since there will be no WAL receiver
+      process to fetch more WAL data; and it could result in misbehavior
+      in code that wasn't designed with this situation in mind.
+     </P
+></LI
+><LI
+><P
+>      Don't try to share SSL contexts across multiple connections
+      in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> (Heikki Linnakangas)
+     </P
+><P
+>      This led to assorted corner-case bugs, particularly when trying to use
+      different SSL parameters for different connections.
+     </P
+></LI
+><LI
+><P
+>      Avoid corner-case memory leak in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> (Tom Lane)
+     </P
+><P
+>      The reported problem involved leaking an error report
+      during <CODE
+CLASS="FUNCTION"
+>PQreset()</CODE
+>, but there might be related cases.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+>'s <TT
+CLASS="OPTION"
+>--help</TT
+> and <TT
+CLASS="OPTION"
+>--version</TT
+>
+      options work consistently with our other executables (Haribabu Kommi)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/intarray/bench/bench.pl</TT
+> to print the results
+      of the <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> it does when given the <TT
+CLASS="OPTION"
+>-e</TT
+> option
+      (Daniel Gustafsson)
+     </P
+></LI
+><LI
+><P
+>      Prevent failure of obsolete dynamic time zone abbreviations (Tom Lane)
+     </P
+><P
+>      If a dynamic time zone abbreviation does not match any entry in the
+      referenced time zone, treat it as equivalent to the time zone name.
+      This avoids unexpected failures when IANA removes abbreviations from
+      their time zone database, as they did in <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+>
+      release 2016f and seem likely to do again in the future.  The
+      consequences were not limited to not recognizing the individual
+      abbreviation; any mismatch caused
+      the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_abbrevs</TT
+> view to fail altogether.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016h
+      for DST law changes in Palestine and Turkey, plus historical
+      corrections for Turkey and some regions of Russia.
+      Switch to numeric abbreviations for some time zones in Antarctica,
+      the former Soviet Union, and Sri Lanka.
+     </P
+><P
+>      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+>
+      view nor used for output.
+     </P
+><P
+>      In this update, <TT
+CLASS="LITERAL"
+>AMT</TT
+> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <TT
+CLASS="LITERAL"
+>Default</TT
+>
+      abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-2.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-1-23.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.2</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.1.23</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-2.html	2016-03-28 20:21:18.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-2.html	2017-08-07 21:32:51.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-2"
->E.61. Release 9.1.2</A
+>E.88. Release 9.1.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.1.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139893"
->E.61.1. Migration to Version 9.1.2</A
+NAME="AEN144638"
+>E.88.1. Migration to Version 9.1.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -168,8 +165,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139905"
->E.61.2. Changes</A
+NAME="AEN144650"
+>E.88.2. Changes</A
 ></H2
 ><P
 ></P
@@ -897,7 +894,7 @@
 ></LI
 ><LI
 ><P
->      Fix incorrect quoting of log file name in Mac OS X start script
+>      Fix incorrect quoting of log file name in macOS start script
       (Sidar Lopez)
      </P
 ></LI
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-3.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-3.html	2017-08-07 21:32:51.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-3"
->E.60. Release 9.1.3</A
+>E.87. Release 9.1.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-02-27</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.2.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139664"
->E.60.1. Migration to Version 9.1.3</A
+NAME="AEN144409"
+>E.87.1. Migration to Version 9.1.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.2,
     see <A
 HREF="release-9-1-2.html"
->Section E.61</A
+>Section E.88</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139669"
->E.60.2. Changes</A
+NAME="AEN144414"
+>E.87.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-4.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-4.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-4"
->E.59. Release 9.1.4</A
+>E.86. Release 9.1.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-06-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.3.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139478"
->E.59.1. Migration to Version 9.1.4</A
+NAME="AEN144223"
+>E.86.1. Migration to Version 9.1.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -157,7 +154,7 @@
 >    Also, if you are upgrading from a version earlier than 9.1.2,
     see <A
 HREF="release-9-1-2.html"
->Section E.61</A
+>Section E.88</A
 >.
    </P
 ></DIV
@@ -166,8 +163,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139490"
->E.59.2. Changes</A
+NAME="AEN144235"
+>E.86.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-5.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-5.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-5"
->E.58. Release 9.1.5</A
+>E.85. Release 9.1.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-08-17</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.4.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139319"
->E.58.1. Migration to Version 9.1.5</A
+NAME="AEN144064"
+>E.85.1. Migration to Version 9.1.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.4,
     see <A
 HREF="release-9-1-4.html"
->Section E.59</A
+>Section E.86</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139324"
->E.58.2. Changes</A
+NAME="AEN144069"
+>E.85.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-6.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-6.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-6"
->E.57. Release 9.1.6</A
+>E.84. Release 9.1.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-09-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.5.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139221"
->E.57.1. Migration to Version 9.1.6</A
+NAME="AEN143966"
+>E.84.1. Migration to Version 9.1.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -136,7 +133,7 @@
 >    Also, if you are upgrading from a version earlier than 9.1.4,
     see <A
 HREF="release-9-1-4.html"
->Section E.59</A
+>Section E.86</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139228"
->E.57.2. Changes</A
+NAME="AEN143973"
+>E.84.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-7.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-7.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-7"
->E.56. Release 9.1.7</A
+>E.83. Release 9.1.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-12-06</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.6.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139035"
->E.56.1. Migration to Version 9.1.7</A
+NAME="AEN143780"
+>E.83.1. Migration to Version 9.1.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.6,
     see <A
 HREF="release-9-1-6.html"
->Section E.57</A
+>Section E.84</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139040"
->E.56.2. Changes</A
+NAME="AEN143785"
+>E.83.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-8.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-8.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-8"
->E.55. Release 9.1.8</A
+>E.82. Release 9.1.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-02-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.7.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138914"
->E.55.1. Migration to Version 9.1.8</A
+NAME="AEN143659"
+>E.82.1. Migration to Version 9.1.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.1.6,
     see <A
 HREF="release-9-1-6.html"
->Section E.57</A
+>Section E.84</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138919"
->E.55.2. Changes</A
+NAME="AEN143664"
+>E.82.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1-9.html	2016-03-28 20:21:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1-9.html	2017-08-07 21:32:50.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1-9"
->E.54. Release 9.1.9</A
+>E.81. Release 9.1.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-04-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.1.8.
    For information about new features in the 9.1 major release, see
    <A
 HREF="release-9-1.html"
->Section E.63</A
+>Section E.90</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138760"
->E.54.1. Migration to Version 9.1.9</A
+NAME="AEN143505"
+>E.81.1. Migration to Version 9.1.9</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.1.X.
@@ -137,7 +134,7 @@
 >    Also, if you are upgrading from a version earlier than 9.1.6,
     see <A
 HREF="release-9-1-6.html"
->Section E.57</A
+>Section E.84</A
 >.
    </P
 ></DIV
@@ -146,8 +143,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN138767"
->E.54.2. Changes</A
+NAME="AEN143512"
+>E.81.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-1.html	2016-03-28 20:21:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-1.html	2017-08-07 21:32:52.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-1"
->E.63. Release 9.1</A
+>E.90. Release 9.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2011-09-12</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN140163"
->E.63.1. Overview</A
+NAME="AEN144908"
+>E.90.1. Overview</A
 ></H2
 ><P
 >    This release shows <SPAN
@@ -264,8 +261,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN140211"
->E.63.2. Migration to Version 9.1</A
+NAME="AEN144956"
+>E.90.2. Migration to Version 9.1</A
 ></H2
 ><P
 >    A dump/restore using <SPAN
@@ -288,8 +285,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140217"
->E.63.2.1. Strings</A
+NAME="AEN144962"
+>E.90.2.1. Strings</A
 ></H3
 ><P
 ></P
@@ -360,8 +357,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140230"
->E.63.2.2. Casting</A
+NAME="AEN144975"
+>E.90.2.2. Casting</A
 ></H3
 ><P
 ></P
@@ -431,8 +428,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140247"
->E.63.2.3. Arrays</A
+NAME="AEN144992"
+>E.90.2.3. Arrays</A
 ></H3
 ><P
 ></P
@@ -479,8 +476,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140261"
->E.63.2.4. Object Modification</A
+NAME="AEN145006"
+>E.90.2.4. Object Modification</A
 ></H3
 ><P
 ></P
@@ -521,8 +518,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140273"
->E.63.2.5. Server Settings</A
+NAME="AEN145018"
+>E.90.2.5. Server Settings</A
 ></H3
 ><P
 ></P
@@ -568,8 +565,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140287"
->E.63.2.6. <A
+NAME="AEN145032"
+>E.90.2.6. <A
 HREF="plpgsql.html"
 >PL/pgSQL</A
 > Server-Side Language</A
@@ -636,8 +633,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140305"
->E.63.2.7. Contrib</A
+NAME="AEN145050"
+>E.90.2.7. Contrib</A
 ></H3
 ><P
 ></P
@@ -675,8 +672,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140315"
->E.63.2.8. Other Incompatibilities</A
+NAME="AEN145060"
+>E.90.2.8. Other Incompatibilities</A
 ></H3
 ><P
 ></P
@@ -728,8 +725,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN140331"
->E.63.3. Changes</A
+NAME="AEN145076"
+>E.90.3. Changes</A
 ></H2
 ><P
 >    Below you will find a detailed account of the changes between
@@ -744,16 +741,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140335"
->E.63.3.1. Server</A
+NAME="AEN145080"
+>E.90.3.1. Server</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140337"
->E.63.3.1.1. Performance</A
+NAME="AEN145082"
+>E.90.3.1.1. Performance</A
 ></H4
 ><P
 ></P
@@ -866,8 +863,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140370"
->E.63.3.1.2. Optimizer</A
+NAME="AEN145115"
+>E.90.3.1.2. Optimizer</A
 ></H4
 ><P
 ></P
@@ -912,8 +909,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140384"
->E.63.3.1.3. Authentication</A
+NAME="AEN145129"
+>E.90.3.1.3. Authentication</A
 ></H4
 ><P
 ></P
@@ -1071,8 +1068,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140431"
->E.63.3.1.4. Monitoring</A
+NAME="AEN145176"
+>E.90.3.1.4. Monitoring</A
 ></H4
 ><P
 ></P
@@ -1129,8 +1126,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140448"
->E.63.3.1.5. Statistical Views</A
+NAME="AEN145193"
+>E.90.3.1.5. Statistical Views</A
 ></H4
 ><P
 ></P
@@ -1214,8 +1211,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140474"
->E.63.3.1.6. Server Settings</A
+NAME="AEN145219"
+>E.90.3.1.6. Server Settings</A
 ></H4
 ><P
 ></P
@@ -1281,16 +1278,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140493"
->E.63.3.2. Replication and Recovery</A
+NAME="AEN145238"
+>E.90.3.2. Replication and Recovery</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140495"
->E.63.3.2.1. Streaming Replication and Continuous Archiving</A
+NAME="AEN145240"
+>E.90.3.2.1. Streaming Replication and Continuous Archiving</A
 ></H4
 ><P
 ></P
@@ -1393,8 +1390,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140522"
->E.63.3.2.2. Replication Monitoring</A
+NAME="AEN145267"
+>E.90.3.2.2. Replication Monitoring</A
 ></H4
 ><P
 ></P
@@ -1441,8 +1438,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140536"
->E.63.3.2.3. Hot Standby</A
+NAME="AEN145281"
+>E.90.3.2.3. Hot Standby</A
 ></H4
 ><P
 ></P
@@ -1544,8 +1541,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140567"
->E.63.3.2.4. Recovery Control</A
+NAME="AEN145312"
+>E.90.3.2.4. Recovery Control</A
 ></H4
 ><P
 ></P
@@ -1675,8 +1672,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140606"
->E.63.3.3. Queries</A
+NAME="AEN145351"
+>E.90.3.3. Queries</A
 ></H3
 ><P
 ></P
@@ -1830,8 +1827,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140652"
->E.63.3.3.1. Strings</A
+NAME="AEN145397"
+>E.90.3.3.1. Strings</A
 ></H4
 ><P
 ></P
@@ -1862,8 +1859,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140660"
->E.63.3.4. Object Manipulation</A
+NAME="AEN145405"
+>E.90.3.4. Object Manipulation</A
 ></H3
 ><P
 ></P
@@ -1959,8 +1956,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140689"
->E.63.3.4.1. <TT
+NAME="AEN145434"
+>E.90.3.4.1. <TT
 CLASS="COMMAND"
 >ALTER</TT
 > Object</A
@@ -2048,8 +2045,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140714"
->E.63.3.4.2. <A
+NAME="AEN145459"
+>E.90.3.4.2. <A
 HREF="sql-createtable.html"
 ><TT
 CLASS="COMMAND"
@@ -2167,8 +2164,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140748"
->E.63.3.4.3. Object Permissions</A
+NAME="AEN145493"
+>E.90.3.4.3. Object Permissions</A
 ></H4
 ><P
 ></P
@@ -2196,8 +2193,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140756"
->E.63.3.5. Utility Operations</A
+NAME="AEN145501"
+>E.90.3.5. Utility Operations</A
 ></H3
 ><P
 ></P
@@ -2239,8 +2236,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140768"
->E.63.3.5.1. <A
+NAME="AEN145513"
+>E.90.3.5.1. <A
 HREF="sql-copy.html"
 ><TT
 CLASS="COMMAND"
@@ -2295,8 +2292,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140785"
->E.63.3.5.2. <A
+NAME="AEN145530"
+>E.90.3.5.2. <A
 HREF="sql-explain.html"
 ><TT
 CLASS="COMMAND"
@@ -2326,8 +2323,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140794"
->E.63.3.5.3. <A
+NAME="AEN145539"
+>E.90.3.5.3. <A
 HREF="sql-vacuum.html"
 ><TT
 CLASS="COMMAND"
@@ -2383,8 +2380,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140811"
->E.63.3.5.4. <A
+NAME="AEN145556"
+>E.90.3.5.4. <A
 HREF="sql-cluster.html"
 ><TT
 CLASS="COMMAND"
@@ -2411,8 +2408,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140819"
->E.63.3.5.5. Indexes</A
+NAME="AEN145564"
+>E.90.3.5.5. Indexes</A
 ></H4
 ><P
 ></P
@@ -2511,8 +2508,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140848"
->E.63.3.6. Data Types</A
+NAME="AEN145593"
+>E.90.3.6. Data Types</A
 ></H3
 ><P
 ></P
@@ -2593,8 +2590,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140874"
->E.63.3.6.1. Casting</A
+NAME="AEN145619"
+>E.90.3.6.1. Casting</A
 ></H4
 ><P
 ></P
@@ -2643,8 +2640,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140889"
->E.63.3.6.2. <A
+NAME="AEN145634"
+>E.90.3.6.2. <A
 HREF="functions-xml.html"
 ><ACRONYM
 CLASS="ACRONYM"
@@ -2727,8 +2724,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140914"
->E.63.3.7. Functions</A
+NAME="AEN145659"
+>E.90.3.7. Functions</A
 ></H3
 ><P
 ></P
@@ -2845,8 +2842,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140950"
->E.63.3.7.1. Object Information Functions</A
+NAME="AEN145695"
+>E.90.3.7.1. Object Information Functions</A
 ></H4
 ><P
 ></P
@@ -2959,8 +2956,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140984"
->E.63.3.7.2. Function and Trigger Creation</A
+NAME="AEN145729"
+>E.90.3.7.2. Function and Trigger Creation</A
 ></H4
 ><P
 ></P
@@ -2988,16 +2985,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN140992"
->E.63.3.8. Server-Side Languages</A
+NAME="AEN145737"
+>E.90.3.8. Server-Side Languages</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN140994"
->E.63.3.8.1. <A
+NAME="AEN145739"
+>E.90.3.8.1. <A
 HREF="plpgsql.html"
 >PL/pgSQL</A
 > Server-Side Language</A
@@ -3047,8 +3044,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141008"
->E.63.3.8.2. <A
+NAME="AEN145753"
+>E.90.3.8.2. <A
 HREF="plperl.html"
 >PL/Perl</A
 > Server-Side Language</A
@@ -3094,8 +3091,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141022"
->E.63.3.8.3. <A
+NAME="AEN145767"
+>E.90.3.8.3. <A
 HREF="plpython.html"
 >PL/Python</A
 > Server-Side Language</A
@@ -3200,8 +3197,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN141056"
->E.63.3.9. Client Applications</A
+NAME="AEN145801"
+>E.90.3.9. Client Applications</A
 ></H3
 ><P
 ></P
@@ -3232,8 +3229,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141065"
->E.63.3.9.1. <A
+NAME="AEN145810"
+>E.90.3.9.1. <A
 HREF="app-psql.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3389,8 +3386,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141114"
->E.63.3.9.2. <A
+NAME="AEN145859"
+>E.90.3.9.2. <A
 HREF="app-pgdump.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3453,8 +3450,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141133"
->E.63.3.9.3. <A
+NAME="AEN145878"
+>E.90.3.9.3. <A
 HREF="app-pg-ctl.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3523,8 +3520,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN141153"
->E.63.3.10. <SPAN
+NAME="AEN145898"
+>E.90.3.10. <SPAN
 CLASS="APPLICATION"
 >Development Tools</SPAN
 ></A
@@ -3534,8 +3531,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141156"
->E.63.3.10.1. <A
+NAME="AEN145901"
+>E.90.3.10.1. <A
 HREF="libpq.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3641,8 +3638,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141187"
->E.63.3.10.2. <A
+NAME="AEN145932"
+>E.90.3.10.2. <A
 HREF="ecpg.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3683,8 +3680,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN141199"
->E.63.3.11. Build Options</A
+NAME="AEN145944"
+>E.90.3.11. Build Options</A
 ></H3
 ><P
 ></P
@@ -3708,8 +3705,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141206"
->E.63.3.11.1. Makefiles</A
+NAME="AEN145951"
+>E.90.3.11.1. Makefiles</A
 ></H4
 ><P
 ></P
@@ -3792,8 +3789,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141231"
->E.63.3.11.2. Windows</A
+NAME="AEN145976"
+>E.90.3.11.2. Windows</A
 ></H4
 ><P
 ></P
@@ -3843,8 +3840,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN141246"
->E.63.3.12. Source Code</A
+NAME="AEN145991"
+>E.90.3.12. Source Code</A
 ></H3
 ><P
 ></P
@@ -3974,8 +3971,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141287"
->E.63.3.12.1. Server Hooks</A
+NAME="AEN146032"
+>E.90.3.12.1. Server Hooks</A
 ></H4
 ><P
 ></P
@@ -4005,8 +4002,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN141296"
->E.63.3.13. Contrib</A
+NAME="AEN146041"
+>E.90.3.13. Contrib</A
 ></H3
 ><P
 ></P
@@ -4227,8 +4224,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141363"
->E.63.3.13.1. Security</A
+NAME="AEN146108"
+>E.90.3.13.1. Security</A
 ></H4
 ><P
 ></P
@@ -4294,8 +4291,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141383"
->E.63.3.13.2. Performance</A
+NAME="AEN146128"
+>E.90.3.13.2. Performance</A
 ></H4
 ><P
 ></P
@@ -4377,8 +4374,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN141409"
->E.63.3.13.3. Fsync Testing</A
+NAME="AEN146154"
+>E.90.3.13.3. Fsync Testing</A
 ></H4
 ><P
 ></P
@@ -4445,8 +4442,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN141430"
->E.63.3.14. Documentation</A
+NAME="AEN146175"
+>E.90.3.14. Documentation</A
 ></H3
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-10.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-10.html	2017-08-07 21:32:47.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-10"
->E.31. Release 9.2.10</A
+>E.55. Release 9.2.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-02-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.9.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133900"
->E.31.1. Migration to Version 9.2.10</A
+NAME="AEN138368"
+>E.55.1. Migration to Version 9.2.10</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -152,7 +149,7 @@
 >    Also, if you are upgrading from a version earlier than 9.2.9,
     see <A
 HREF="release-9-2-9.html"
->Section E.32</A
+>Section E.56</A
 >.
    </P
 ></DIV
@@ -161,8 +158,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133911"
->E.31.2. Changes</A
+NAME="AEN138379"
+>E.55.2. Changes</A
 ></H2
 ><P
 ></P
@@ -842,7 +839,7 @@
 ></LI
 ><LI
 ><P
->      Warn if OS X's <CODE
+>      Warn if macOS's <CODE
 CLASS="FUNCTION"
 >setlocale()</CODE
 > starts an unwanted extra
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-11.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-11.html	2017-08-07 21:32:47.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-11"
->E.30. Release 9.2.11</A
+>E.54. Release 9.2.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-05-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.10.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133690"
->E.30.1. Migration to Version 9.2.11</A
+NAME="AEN138158"
+>E.54.1. Migration to Version 9.2.11</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -139,7 +136,7 @@
 >    Also, if you are upgrading from a version earlier than 9.2.10,
     see <A
 HREF="release-9-2-10.html"
->Section E.31</A
+>Section E.55</A
 >.
    </P
 ></DIV
@@ -148,8 +145,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133698"
->E.30.2. Changes</A
+NAME="AEN138166"
+>E.54.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-12.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-12.html	2017-08-07 21:32:47.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-12"
->E.29. Release 9.2.12</A
+>E.53. Release 9.2.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-06-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.2.11.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133653"
->E.29.1. Migration to Version 9.2.12</A
+NAME="AEN138121"
+>E.53.1. Migration to Version 9.2.12</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.2.11,
     see <A
 HREF="release-9-2-11.html"
->Section E.30</A
+>Section E.54</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133658"
->E.29.2. Changes</A
+NAME="AEN138126"
+>E.53.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-13.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-13.html	2017-08-07 21:32:47.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-13"
->E.28. Release 9.2.13</A
+>E.52. Release 9.2.13</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-06-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.2.12.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133627"
->E.28.1. Migration to Version 9.2.13</A
+NAME="AEN138095"
+>E.52.1. Migration to Version 9.2.13</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.2.11,
     see <A
 HREF="release-9-2-11.html"
->Section E.30</A
+>Section E.54</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133632"
->E.28.2. Changes</A
+NAME="AEN138100"
+>E.52.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-14.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-14.html	2017-08-07 21:32:47.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-14"
->E.27. Release 9.2.14</A
+>E.51. Release 9.2.14</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-10-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.13.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133384"
->E.27.1. Migration to Version 9.2.14</A
+NAME="AEN137852"
+>E.51.1. Migration to Version 9.2.14</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.2.11,
     see <A
 HREF="release-9-2-11.html"
->Section E.30</A
+>Section E.54</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133389"
->E.27.2. Changes</A
+NAME="AEN137857"
+>E.51.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-15.html	2016-03-28 20:21:14.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-15.html	2017-08-07 21:32:47.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-15"
->E.26. Release 9.2.15</A
+>E.50. Release 9.2.15</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-02-11</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.14.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133160"
->E.26.1. Migration to Version 9.2.15</A
+NAME="AEN137628"
+>E.50.1. Migration to Version 9.2.15</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.2.11,
     see <A
 HREF="release-9-2-11.html"
->Section E.30</A
+>Section E.54</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133165"
->E.26.2. Changes</A
+NAME="AEN137633"
+>E.50.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-16.html	2016-03-28 20:21:14.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-16.html	2017-08-07 21:32:47.000000000 +0000
@@ -9,14 +9,14 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
 HREF="release.html"><LINK
 REL="PREVIOUS"
-TITLE="Release 9.3"
-HREF="release-9-3.html"><LINK
+TITLE="Release 9.2.17"
+HREF="release-9-2-17.html"><LINK
 REL="NEXT"
 TITLE="Release 9.2.15"
 HREF="release-9-2-15.html"><LINK
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -53,8 +53,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="Release 9.3"
-HREF="release-9-3.html"
+TITLE="Release 9.2.17"
+HREF="release-9-2-17.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-16"
->E.25. Release 9.2.16</A
+>E.49. Release 9.2.16</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-03-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.15.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133077"
->E.25.1. Migration to Version 9.2.16</A
+NAME="AEN137545"
+>E.49.1. Migration to Version 9.2.16</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.2.11,
     see <A
 HREF="release-9-2-11.html"
->Section E.30</A
+>Section E.54</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN133082"
->E.25.2. Changes</A
+NAME="AEN137550"
+>E.49.2. Changes</A
 ></H2
 ><P
 ></P
@@ -229,7 +226,7 @@
      </P
 ><P
 >      This dodges a portability problem on FreeBSD-derived platforms
-      (including OS X).
+      (including macOS).
      </P
 ></LI
 ><LI
@@ -387,7 +384,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="release-9-3.html"
+HREF="release-9-2-17.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -415,7 +412,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Release 9.3</TD
+>Release 9.2.17</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-17.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-17.html	2017-08-07 21:32:47.000000000 +0000
@@ -0,0 +1,444 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.2.17</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.2.18"
+HREF="release-9-2-18.html"><LINK
+REL="NEXT"
+TITLE="Release 9.2.16"
+HREF="release-9-2-16.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.2.18"
+HREF="release-9-2-18.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.2.16"
+HREF="release-9-2-16.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-2-17"
+>E.48. Release 9.2.17</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-05-12</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.2.16.
+   For information about new features in the 9.2 major release, see
+   <A
+HREF="release-9-2.html"
+>Section E.65</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN137466"
+>E.48.1. Migration to Version 9.2.17</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.2.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.2.11,
+    see <A
+HREF="release-9-2-11.html"
+>Section E.54</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN137471"
+>E.48.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      afterwards (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </P
+><P
+>      This change prevents problems when there are multiple connections
+      using OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      Failures have been reported specifically when a client application
+      uses SSL connections in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> concurrently with
+      SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
+      It's possible for similar problems to arise within the server as well,
+      if an extension module establishes an outgoing SSL connection.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="QUOTE"
+>"failed to build any <TT
+CLASS="REPLACEABLE"
+><I
+>N</I
+></TT
+>-way joins"</SPAN
+>
+      planner error with a full join enclosed in the right-hand side of a
+      left join (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect handling of equivalence-class tests in multilevel
+      nestloop plans (Tom Lane)
+     </P
+><P
+>      Given a three-or-more-way equivalence class of variables, such
+      as <TT
+CLASS="LITERAL"
+>X.X = Y.Y = Z.Z</TT
+>, it was possible for the planner to omit
+      some of the tests needed to enforce that all the variables are actually
+      equal, leading to join rows being output that didn't satisfy
+      the <TT
+CLASS="LITERAL"
+>WHERE</TT
+> clauses.  For various reasons, erroneous plans
+      were seldom selected in practice, so that this bug has gone undetected
+      for a long time.
+     </P
+></LI
+><LI
+><P
+>      Fix possible misbehavior of <TT
+CLASS="LITERAL"
+>TH</TT
+>, <TT
+CLASS="LITERAL"
+>th</TT
+>,
+      and <TT
+CLASS="LITERAL"
+>Y,YYY</TT
+> format codes in <CODE
+CLASS="FUNCTION"
+>to_timestamp()</CODE
+>
+      (Tom Lane)
+     </P
+><P
+>      These could advance off the end of the input string, causing subsequent
+      format codes to read garbage.
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of rules and views in which the <TT
+CLASS="REPLACEABLE"
+><I
+>array</I
+></TT
+>
+      argument of a <TT
+CLASS="LITERAL"
+><TT
+CLASS="REPLACEABLE"
+><I
+>value</I
+></TT
+> <TT
+CLASS="REPLACEABLE"
+><I
+>operator</I
+></TT
+>
+      ANY (<TT
+CLASS="REPLACEABLE"
+><I
+>array</I
+></TT
+>)</TT
+> construct is a sub-SELECT
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_regress</SPAN
+> use a startup timeout from the
+      <TT
+CLASS="ENVAR"
+>PGCTLTIMEOUT</TT
+> environment variable, if that's set (Tom Lane)
+     </P
+><P
+>      This is for consistency with a behavior recently added
+      to <SPAN
+CLASS="APPLICATION"
+>pg_ctl</SPAN
+>; it eases automated testing on slow machines.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to correctly restore extension
+      membership for operator families containing only one operator class
+      (Tom Lane)
+     </P
+><P
+>      In such a case, the operator family was restored into the new database,
+      but it was no longer marked as part of the extension.  This had no
+      immediate ill effects, but would cause later <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      runs to emit output that would cause (harmless) errors on restore.
+     </P
+></LI
+><LI
+><P
+>      Back-port 9.4-era memory-barrier code changes into 9.2 and 9.3 (Tom Lane)
+     </P
+><P
+>      These changes were not originally needed in pre-9.4 branches, but we
+      recently back-patched a fix that expected the barrier code to work
+      properly.  Only IA64 (when using icc), HPPA, and Alpha platforms are
+      affected.
+     </P
+></LI
+><LI
+><P
+>      Reduce the number of SysV semaphores used by a build configured with
+      <TT
+CLASS="OPTION"
+>--disable-spinlocks</TT
+> (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Rename internal function <CODE
+CLASS="FUNCTION"
+>strtoi()</CODE
+>
+      to <CODE
+CLASS="FUNCTION"
+>strtoint()</CODE
+> to avoid conflict with a NetBSD library
+      function (Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix reporting of errors from <CODE
+CLASS="FUNCTION"
+>bind()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>listen()</CODE
+> system calls on Windows (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Reduce verbosity of compiler output when building with Microsoft Visual
+      Studio (Christian Ullrich)
+     </P
+></LI
+><LI
+><P
+>      Avoid possibly-unsafe use of Windows' <CODE
+CLASS="FUNCTION"
+>FormatMessage()</CODE
+>
+      function (Christian Ullrich)
+     </P
+><P
+>      Use the <TT
+CLASS="LITERAL"
+>FORMAT_MESSAGE_IGNORE_INSERTS</TT
+> flag where
+      appropriate.  No live bug is known to exist here, but it seems like a
+      good idea to be careful.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016d
+      for DST law changes in Russia and Venezuela.  There are new zone
+      names <TT
+CLASS="LITERAL"
+>Europe/Kirov</TT
+> and <TT
+CLASS="LITERAL"
+>Asia/Tomsk</TT
+> to reflect
+      the fact that these regions now have different time zone histories from
+      adjacent regions.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-2-18.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-2-16.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.2.18</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.2.16</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-18.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-18.html	2017-08-07 21:32:47.000000000 +0000
@@ -0,0 +1,630 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.2.18</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.2.19"
+HREF="release-9-2-19.html"><LINK
+REL="NEXT"
+TITLE="Release 9.2.17"
+HREF="release-9-2-17.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.2.19"
+HREF="release-9-2-19.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.2.17"
+HREF="release-9-2-17.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-2-18"
+>E.47. Release 9.2.18</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-08-11</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.2.17.
+   For information about new features in the 9.2 major release, see
+   <A
+HREF="release-9-2.html"
+>Section E.65</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN137332"
+>E.47.1. Migration to Version 9.2.18</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.2.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.2.11,
+    see <A
+HREF="release-9-2-11.html"
+>Section E.54</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN137337"
+>E.47.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix possible mis-evaluation of
+      nested <TT
+CLASS="LITERAL"
+>CASE</TT
+>-<TT
+CLASS="LITERAL"
+>WHEN</TT
+> expressions (Heikki
+      Linnakangas, Michael Paquier, Tom Lane)
+     </P
+><P
+>      A <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression appearing within the test value
+      subexpression of another <TT
+CLASS="LITERAL"
+>CASE</TT
+> could become confused about
+      whether its own test value was null or not.  Also, inlining of a SQL
+      function implementing the equality operator used by
+      a <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression could result in passing the wrong test
+      value to functions called within a <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression in the
+      SQL function's body.  If the test values were of different data
+      types, a crash might result; moreover such situations could be abused
+      to allow disclosure of portions of server memory.  (CVE-2016-5423)
+     </P
+></LI
+><LI
+><P
+>      Fix client programs' handling of special characters in database and
+      role names (Noah Misch, Nathan Bossart, Michael Paquier)
+     </P
+><P
+>      Numerous places in <SPAN
+CLASS="APPLICATION"
+>vacuumdb</SPAN
+> and other client programs
+      could become confused by database and role names containing double
+      quotes or backslashes.  Tighten up quoting rules to make that safe.
+      Also, ensure that when a conninfo string is used as a database name
+      parameter to these programs, it is correctly treated as such throughout.
+     </P
+><P
+>      Fix handling of paired double quotes
+      in <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s <TT
+CLASS="COMMAND"
+>\connect</TT
+>
+      and <TT
+CLASS="COMMAND"
+>\password</TT
+> commands to match the documentation.
+     </P
+><P
+>      Introduce a new <TT
+CLASS="OPTION"
+>-reuse-previous</TT
+> option
+      in <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s <TT
+CLASS="COMMAND"
+>\connect</TT
+> command to allow
+      explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether
+      the database name looks like a conninfo string, as before.)  This
+      allows secure handling of database names containing special
+      characters in <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> scripts.
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> now refuses to deal with database and role
+      names containing carriage returns or newlines, as it seems impractical
+      to quote those characters safely on Windows.  In future we may reject
+      such names on the server side, but that step has not been taken yet.
+     </P
+><P
+>      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute
+      commands with superuser privileges the next time a superuser
+      executes <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> or other routine maintenance
+      operations.  (CVE-2016-5424)
+     </P
+></LI
+><LI
+><P
+>      Fix corner-case misbehaviors for <TT
+CLASS="LITERAL"
+>IS NULL</TT
+>/<TT
+CLASS="LITERAL"
+>IS NOT
+      NULL</TT
+> applied to nested composite values (Andrew Gierth, Tom Lane)
+     </P
+><P
+>      The SQL standard specifies that <TT
+CLASS="LITERAL"
+>IS NULL</TT
+> should return
+      TRUE for a row of all null values (thus <TT
+CLASS="LITERAL"
+>ROW(NULL,NULL) IS
+      NULL</TT
+> yields TRUE), but this is not meant to apply recursively
+      (thus <TT
+CLASS="LITERAL"
+>ROW(NULL, ROW(NULL,NULL)) IS NULL</TT
+> yields FALSE).
+      The core executor got this right, but certain planner optimizations
+      treated the test as recursive (thus producing TRUE in both cases),
+      and <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+> could produce remote queries
+      that misbehaved similarly.
+     </P
+></LI
+><LI
+><P
+>      Make the <TT
+CLASS="TYPE"
+>inet</TT
+> and <TT
+CLASS="TYPE"
+>cidr</TT
+> data types properly reject
+      IPv6 addresses with too many colon-separated fields (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Prevent crash in <CODE
+CLASS="FUNCTION"
+>close_ps()</CODE
+>
+      (the <TT
+CLASS="TYPE"
+>point</TT
+> <TT
+CLASS="LITERAL"
+>##</TT
+> <TT
+CLASS="TYPE"
+>lseg</TT
+> operator)
+      for NaN input coordinates (Tom Lane)
+     </P
+><P
+>      Make it return NULL instead of crashing.
+     </P
+></LI
+><LI
+><P
+>      Fix several one-byte buffer over-reads in <CODE
+CLASS="FUNCTION"
+>to_number()</CODE
+>
+      (Peter Eisentraut)
+     </P
+><P
+>      In several cases the <CODE
+CLASS="FUNCTION"
+>to_number()</CODE
+> function would read one
+      more character than it should from the input string.  There is a
+      small chance of a crash, if the input happens to be adjacent to the
+      end of memory.
+     </P
+></LI
+><LI
+><P
+>      Avoid unsafe intermediate state during expensive paths
+      through <CODE
+CLASS="FUNCTION"
+>heap_update()</CODE
+> (Masahiko Sawada, Andres Freund)
+     </P
+><P
+>      Previously, these cases locked the target tuple (by setting its XMAX)
+      but did not WAL-log that action, thus risking data integrity problems
+      if the page were spilled to disk and then a database crash occurred
+      before the tuple update could be completed.
+     </P
+></LI
+><LI
+><P
+>      Avoid crash in <TT
+CLASS="LITERAL"
+>postgres -C</TT
+> when the specified variable
+      has a null string value (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Avoid consuming a transaction ID during <TT
+CLASS="COMMAND"
+>VACUUM</TT
+>
+      (Alexander Korotkov)
+     </P
+><P
+>      Some cases in <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> unnecessarily caused an XID to be
+      assigned to the current transaction.  Normally this is negligible,
+      but if one is up against the XID wraparound limit, consuming more
+      XIDs during anti-wraparound vacuums is a very bad thing.
+     </P
+></LI
+><LI
+><P
+>      Avoid canceling hot-standby queries during <TT
+CLASS="COMMAND"
+>VACUUM FREEZE</TT
+>
+      (Simon Riggs, &Aacute;lvaro Herrera)
+     </P
+><P
+>      <TT
+CLASS="COMMAND"
+>VACUUM FREEZE</TT
+> on an otherwise-idle master server could
+      result in unnecessary cancellations of queries on its standby
+      servers.
+     </P
+></LI
+><LI
+><P
+>      When a manual <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+> specifies a column list, don't
+      reset the table's <TT
+CLASS="LITERAL"
+>changes_since_analyze</TT
+> counter
+      (Tom Lane)
+     </P
+><P
+>      If we're only analyzing some columns, we should not prevent routine
+      auto-analyze from happening for the other columns.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+>'s overestimation of <TT
+CLASS="LITERAL"
+>n_distinct</TT
+>
+      for a unique or nearly-unique column with many null entries (Tom
+      Lane)
+     </P
+><P
+>      The nulls could get counted as though they were themselves distinct
+      values, leading to serious planner misestimates in some types of
+      queries.
+     </P
+></LI
+><LI
+><P
+>      Prevent autovacuum from starting multiple workers for the same shared
+      catalog (&Aacute;lvaro Herrera)
+     </P
+><P
+>      Normally this isn't much of a problem because the vacuum doesn't take
+      long anyway; but in the case of a severely bloated catalog, it could
+      result in all but one worker uselessly waiting instead of doing
+      useful work on other tables.
+     </P
+></LI
+><LI
+><P
+>      Prevent infinite loop in GiST index build for geometric columns
+      containing NaN component values (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/btree_gin</TT
+> to handle the smallest
+      possible <TT
+CLASS="TYPE"
+>bigint</TT
+> value correctly (Peter Eisentraut)
+     </P
+></LI
+><LI
+><P
+>      Teach libpq to correctly decode server version from future servers
+      (Peter Eisentraut)
+     </P
+><P
+>      It's planned to switch to two-part instead of three-part server
+      version numbers for releases after 9.6.  Make sure
+      that <CODE
+CLASS="FUNCTION"
+>PQserverVersion()</CODE
+> returns the correct value for
+      such cases.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+>'s code for <TT
+CLASS="LITERAL"
+>unsigned long long</TT
+>
+      array elements (Michael Meskes)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> with both <TT
+CLASS="OPTION"
+>-c</TT
+> and <TT
+CLASS="OPTION"
+>-C</TT
+>
+      options, avoid emitting an unwanted <TT
+CLASS="LITERAL"
+>CREATE SCHEMA public</TT
+>
+      command (David Johnston, Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> accept <TT
+CLASS="LITERAL"
+>-Z 0</TT
+> as
+      specifying no compression (Fujii Masao)
+     </P
+></LI
+><LI
+><P
+>      Fix makefiles' rule for building AIX shared libraries to be safe for
+      parallel make (Noah Misch)
+     </P
+></LI
+><LI
+><P
+>      Fix TAP tests and MSVC scripts to work when build directory's path
+      name contains spaces (Michael Paquier, Kyotaro Horiguchi)
+     </P
+></LI
+><LI
+><P
+>      Make regression tests safe for Danish and Welsh locales (Jeff Janes,
+      Tom Lane)
+     </P
+><P
+>      Change some test data that triggered the unusual sorting rules of
+      these locales.
+     </P
+></LI
+><LI
+><P
+>      Update our copy of the timezone code to match
+      IANA's <SPAN
+CLASS="APPLICATION"
+>tzcode</SPAN
+> release 2016c (Tom Lane)
+     </P
+><P
+>      This is needed to cope with anticipated future changes in the time
+      zone data files.  It also fixes some corner-case bugs in coping with
+      unusual time zones.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016f
+      for DST law changes in Kemerovo and Novosibirsk, plus historical
+      corrections for Azerbaijan, Belarus, and Morocco.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-2-19.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-2-17.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.2.19</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.2.17</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-19.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-19.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-19.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-19.html	2017-08-07 21:32:47.000000000 +0000
@@ -0,0 +1,514 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.2.19</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.2.20"
+HREF="release-9-2-20.html"><LINK
+REL="NEXT"
+TITLE="Release 9.2.18"
+HREF="release-9-2-18.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.2.20"
+HREF="release-9-2-20.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.2.18"
+HREF="release-9-2-18.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-2-19"
+>E.46. Release 9.2.19</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-10-27</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.2.18.
+   For information about new features in the 9.2 major release, see
+   <A
+HREF="release-9-2.html"
+>Section E.65</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN137231"
+>E.46.1. Migration to Version 9.2.19</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.2.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.2.11,
+    see <A
+HREF="release-9-2-11.html"
+>Section E.54</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN137236"
+>E.46.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix EvalPlanQual rechecks involving CTE scans (Tom Lane)
+     </P
+><P
+>      The recheck would always see the CTE as returning no rows, typically
+      leading to failure to update rows that were recently updated.
+     </P
+></LI
+><LI
+><P
+>      Fix improper repetition of previous results from hashed aggregation in
+      a subquery (Andrew Gierth)
+     </P
+><P
+>      The test to see if we can reuse a previously-computed hash table of
+      the aggregate state values neglected the possibility of an outer query
+      reference appearing in an aggregate argument expression.  A change in
+      the value of such a reference should lead to recalculating the hash
+      table, but did not.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> to emit valid XML when
+      <A
+HREF="runtime-config-statistics.html#GUC-TRACK-IO-TIMING"
+>track_io_timing</A
+> is on (Markus Winand)
+     </P
+><P
+>      Previously the XML output-format option produced syntactically invalid
+      tags such as <TT
+CLASS="LITERAL"
+>&lt;I/O-Read-Time&gt;</TT
+>.  That is now
+      rendered as <TT
+CLASS="LITERAL"
+>&lt;I-O-Read-Time&gt;</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Suppress printing of zeroes for unmeasured times
+      in <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> (Maksim Milyutin)
+     </P
+><P
+>      Certain option combinations resulted in printing zero values for times
+      that actually aren't ever measured in that combination.  Our general
+      policy in <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> is not to print such fields at all, so
+      do that consistently in all cases.
+     </P
+></LI
+><LI
+><P
+>      Fix timeout length when <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> is waiting for exclusive
+      table lock so that it can truncate the table (Simon Riggs)
+     </P
+><P
+>      The timeout was meant to be 50 milliseconds, but it was actually only
+      50 microseconds, causing <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> to give up on truncation
+      much more easily than intended.  Set it to the intended value.
+     </P
+></LI
+><LI
+><P
+>      Fix bugs in merging inherited <TT
+CLASS="LITERAL"
+>CHECK</TT
+> constraints while
+      creating or altering a table (Tom Lane, Amit Langote)
+     </P
+><P
+>      Allow identical <TT
+CLASS="LITERAL"
+>CHECK</TT
+> constraints to be added to a parent
+      and child table in either order.  Prevent merging of a valid
+      constraint from the parent table with a <TT
+CLASS="LITERAL"
+>NOT VALID</TT
+>
+      constraint on the child.  Likewise, prevent merging of a <TT
+CLASS="LITERAL"
+>NO
+      INHERIT</TT
+> child constraint with an inherited constraint.
+     </P
+></LI
+><LI
+><P
+>      Remove artificial restrictions on the values accepted
+      by <CODE
+CLASS="FUNCTION"
+>numeric_in()</CODE
+> and <CODE
+CLASS="FUNCTION"
+>numeric_recv()</CODE
+>
+      (Tom Lane)
+     </P
+><P
+>      We allow numeric values up to the limit of the storage format (more
+      than <TT
+CLASS="LITERAL"
+>1e100000</TT
+>), so it seems fairly pointless
+      that <CODE
+CLASS="FUNCTION"
+>numeric_in()</CODE
+> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <CODE
+CLASS="FUNCTION"
+>numeric_recv()</CODE
+> to
+      reject more than 1000 digits in an input value.
+     </P
+></LI
+><LI
+><P
+>      Avoid very-low-probability data corruption due to testing tuple
+      visibility without holding buffer lock (Thomas Munro, Peter Geoghegan,
+      Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix file descriptor leakage when truncating a temporary relation of
+      more than 1GB (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Disallow starting a standalone backend with <TT
+CLASS="LITERAL"
+>standby_mode</TT
+>
+      turned on (Michael Paquier)
+     </P
+><P
+>      This can't do anything useful, since there will be no WAL receiver
+      process to fetch more WAL data; and it could result in misbehavior
+      in code that wasn't designed with this situation in mind.
+     </P
+></LI
+><LI
+><P
+>      Don't try to share SSL contexts across multiple connections
+      in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> (Heikki Linnakangas)
+     </P
+><P
+>      This led to assorted corner-case bugs, particularly when trying to use
+      different SSL parameters for different connections.
+     </P
+></LI
+><LI
+><P
+>      Avoid corner-case memory leak in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> (Tom Lane)
+     </P
+><P
+>      The reported problem involved leaking an error report
+      during <CODE
+CLASS="FUNCTION"
+>PQreset()</CODE
+>, but there might be related cases.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+>'s <TT
+CLASS="OPTION"
+>--help</TT
+> and <TT
+CLASS="OPTION"
+>--version</TT
+>
+      options work consistently with our other executables (Haribabu Kommi)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>, never dump range constructor functions
+      (Tom Lane)
+     </P
+><P
+>      This oversight led to <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> failures with
+      extensions containing range types, due to duplicate creation of the
+      constructor functions.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/intarray/bench/bench.pl</TT
+> to print the results
+      of the <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> it does when given the <TT
+CLASS="OPTION"
+>-e</TT
+> option
+      (Daniel Gustafsson)
+     </P
+></LI
+><LI
+><P
+>      Update Windows time zone mapping to recognize some time zone names
+      added in recent Windows versions (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Prevent failure of obsolete dynamic time zone abbreviations (Tom Lane)
+     </P
+><P
+>      If a dynamic time zone abbreviation does not match any entry in the
+      referenced time zone, treat it as equivalent to the time zone name.
+      This avoids unexpected failures when IANA removes abbreviations from
+      their time zone database, as they did in <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+>
+      release 2016f and seem likely to do again in the future.  The
+      consequences were not limited to not recognizing the individual
+      abbreviation; any mismatch caused
+      the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_abbrevs</TT
+> view to fail altogether.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016h
+      for DST law changes in Palestine and Turkey, plus historical
+      corrections for Turkey and some regions of Russia.
+      Switch to numeric abbreviations for some time zones in Antarctica,
+      the former Soviet Union, and Sri Lanka.
+     </P
+><P
+>      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+>
+      view nor used for output.
+     </P
+><P
+>      In this update, <TT
+CLASS="LITERAL"
+>AMT</TT
+> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <TT
+CLASS="LITERAL"
+>Default</TT
+>
+      abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-2-20.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-2-18.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.2.20</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.2.18</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-1.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-1.html	2017-08-07 21:32:48.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-1"
->E.40. Release 9.2.1</A
+>E.64. Release 9.2.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-09-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.0.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135657"
->E.40.1. Migration to Version 9.2.1</A
+NAME="AEN140125"
+>E.64.1. Migration to Version 9.2.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -141,8 +138,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135663"
->E.40.2. Changes</A
+NAME="AEN140131"
+>E.64.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-20.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-20.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-20.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-20.html	2017-08-07 21:32:47.000000000 +0000
@@ -0,0 +1,674 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.2.20</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.2.21"
+HREF="release-9-2-21.html"><LINK
+REL="NEXT"
+TITLE="Release 9.2.19"
+HREF="release-9-2-19.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.2.21"
+HREF="release-9-2-21.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.2.19"
+HREF="release-9-2-19.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-2-20"
+>E.45. Release 9.2.20</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-02-09</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.2.19.
+   For information about new features in the 9.2 major release, see
+   <A
+HREF="release-9-2.html"
+>Section E.65</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN137081"
+>E.45.1. Migration to Version 9.2.20</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.2.X.
+   </P
+><P
+>    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted indexes.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.2.11,
+    see <A
+HREF="release-9-2-11.html"
+>Section E.54</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN137087"
+>E.45.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix a race condition that could cause indexes built
+      with <TT
+CLASS="COMMAND"
+>CREATE INDEX CONCURRENTLY</TT
+> to be corrupt
+      (Pavan Deolasee, Tom Lane)
+     </P
+><P
+>      If <TT
+CLASS="COMMAND"
+>CREATE INDEX CONCURRENTLY</TT
+> was used to build an index
+      that depends on a column not previously indexed, then rows
+      updated by transactions that ran concurrently with
+      the <TT
+CLASS="COMMAND"
+>CREATE INDEX</TT
+> command could have received incorrect
+      index entries.  If you suspect this may have happened, the most
+      reliable solution is to rebuild affected indexes after installing
+      this update.
+     </P
+></LI
+><LI
+><P
+>      Unconditionally WAL-log creation of the <SPAN
+CLASS="QUOTE"
+>"init fork"</SPAN
+> for an
+      unlogged table (Michael Paquier)
+     </P
+><P
+>      Previously, this was skipped when <A
+HREF="runtime-config-wal.html#GUC-WAL-LEVEL"
+>wal_level</A
+>
+      = <TT
+CLASS="LITERAL"
+>minimal</TT
+>, but actually it's necessary even in that case
+      to ensure that the unlogged table is properly reset to empty after a
+      crash.
+     </P
+></LI
+><LI
+><P
+>      Fix WAL page header validation when re-reading segments (Takayuki
+      Tsunakawa, Amit Kapila)
+     </P
+><P
+>      In corner cases, a spurious <SPAN
+CLASS="QUOTE"
+>"out-of-sequence TLI"</SPAN
+> error
+      could be reported during recovery.
+     </P
+></LI
+><LI
+><P
+>      If the stats collector dies during hot standby, restart it (Takayuki
+      Tsunakawa)
+     </P
+></LI
+><LI
+><P
+>      Check for interrupts while hot standby is waiting for a conflicting
+      query (Simon Riggs)
+     </P
+></LI
+><LI
+><P
+>      Avoid constantly respawning the autovacuum launcher in a corner case
+      (Amit Khandekar)
+     </P
+><P
+>      This fix avoids problems when autovacuum is nominally off and there
+      are some tables that require freezing, but all such tables are
+      already being processed by autovacuum workers.
+     </P
+></LI
+><LI
+><P
+>      Fix check for when an extension member object can be dropped (Tom Lane)
+     </P
+><P
+>      Extension upgrade scripts should be able to drop member objects,
+      but this was disallowed for serial-column sequences, and possibly
+      other cases.
+     </P
+></LI
+><LI
+><P
+>      Make sure <TT
+CLASS="COMMAND"
+>ALTER TABLE</TT
+> preserves index tablespace
+      assignments when rebuilding indexes (Tom Lane, Michael Paquier)
+     </P
+><P
+>      Previously, non-default settings
+      of <A
+HREF="runtime-config-client.html#GUC-DEFAULT-TABLESPACE"
+>default_tablespace</A
+> could result in broken
+      indexes.
+     </P
+></LI
+><LI
+><P
+>      Prevent dropping a foreign-key constraint if there are pending
+      trigger events for the referenced relation (Tom Lane)
+     </P
+><P
+>      This avoids <SPAN
+CLASS="QUOTE"
+>"could not find trigger <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+>"</SPAN
+>
+      or <SPAN
+CLASS="QUOTE"
+>"relation <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+> has no triggers"</SPAN
+> errors.
+     </P
+></LI
+><LI
+><P
+>      Fix processing of OID column when a table with OIDs is associated to
+      a parent with OIDs via <TT
+CLASS="COMMAND"
+>ALTER TABLE ... INHERIT</TT
+> (Amit
+      Langote)
+     </P
+><P
+>      The OID column should be treated the same as regular user columns in
+      this case, but it wasn't, leading to odd behavior in later
+      inheritance changes.
+     </P
+></LI
+><LI
+><P
+>      Check for serializability conflicts before reporting
+      constraint-violation failures (Thomas Munro)
+     </P
+><P
+>      When using serializable transaction isolation, it is desirable
+      that any error due to concurrent transactions should manifest
+      as a serialization failure, thereby cueing the application that
+      a retry might succeed.  Unfortunately, this does not reliably
+      happen for duplicate-key failures caused by concurrent insertions.
+      This change ensures that such an error will be reported as a
+      serialization error if the application explicitly checked for
+      the presence of a conflicting key (and did not find it) earlier
+      in the transaction.
+     </P
+></LI
+><LI
+><P
+>      Ensure that column typmods are determined accurately for
+      multi-row <TT
+CLASS="LITERAL"
+>VALUES</TT
+> constructs (Tom Lane)
+     </P
+><P
+>      This fixes problems occurring when the first value in a column has a
+      determinable typmod (e.g., length for a <TT
+CLASS="TYPE"
+>varchar</TT
+> value) but
+      later values don't share the same limit.
+     </P
+></LI
+><LI
+><P
+>      Throw error for an unfinished Unicode surrogate pair at the end of a
+      Unicode string (Tom Lane)
+     </P
+><P
+>      Normally, a Unicode surrogate leading character must be followed by a
+      Unicode surrogate trailing character, but the check for this was
+      missed if the leading character was the last character in a Unicode
+      string literal (<TT
+CLASS="LITERAL"
+>U&amp;'...'</TT
+>) or Unicode identifier
+      (<TT
+CLASS="LITERAL"
+>U&amp;"..."</TT
+>).
+     </P
+></LI
+><LI
+><P
+>      Ensure that a purely negative text search query, such
+      as <TT
+CLASS="LITERAL"
+>!foo</TT
+>, matches empty <TT
+CLASS="TYPE"
+>tsvector</TT
+>s (Tom Dunstan)
+     </P
+><P
+>      Such matches were found by GIN index searches, but not by sequential
+      scans or GiST index searches.
+     </P
+></LI
+><LI
+><P
+>      Prevent crash when <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+> replaces a non-top-level
+      subtree with an empty query (Artur Zakirov)
+     </P
+></LI
+><LI
+><P
+>      Fix performance problems in <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+> (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+>'s handling of nested NOT operators
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>array_fill()</CODE
+> to handle empty arrays properly (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix one-byte buffer overrun in <CODE
+CLASS="FUNCTION"
+>quote_literal_cstr()</CODE
+>
+      (Heikki Linnakangas)
+     </P
+><P
+>      The overrun occurred only if the input consisted entirely of single
+      quotes and/or backslashes.
+     </P
+></LI
+><LI
+><P
+>      Prevent multiple calls of <CODE
+CLASS="FUNCTION"
+>pg_start_backup()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>pg_stop_backup()</CODE
+> from running concurrently (Michael
+      Paquier)
+     </P
+><P
+>      This avoids an assertion failure, and possibly worse things, if
+      someone tries to run these functions in parallel.
+     </P
+></LI
+><LI
+><P
+>      Avoid discarding <TT
+CLASS="TYPE"
+>interval</TT
+>-to-<TT
+CLASS="TYPE"
+>interval</TT
+> casts
+      that aren't really no-ops (Tom Lane)
+     </P
+><P
+>      In some cases, a cast that should result in zeroing out
+      low-order <TT
+CLASS="TYPE"
+>interval</TT
+> fields was mistakenly deemed to be a
+      no-op and discarded.  An example is that casting from <TT
+CLASS="TYPE"
+>INTERVAL
+      MONTH</TT
+> to <TT
+CLASS="TYPE"
+>INTERVAL YEAR</TT
+> failed to clear the months field.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> to dump user-defined casts and transforms
+      that use built-in functions (Stephen Frost)
+     </P
+></LI
+><LI
+><P
+>      Fix possible <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> failure on standby
+      server when including WAL files (Amit Kapila, Robert Haas)
+     </P
+></LI
+><LI
+><P
+>      Ensure that the Python exception objects we create for PL/Python are
+      properly reference-counted (Rafa de la Torre, Tom Lane)
+     </P
+><P
+>      This avoids failures if the objects are used after a Python garbage
+      collection cycle has occurred.
+     </P
+></LI
+><LI
+><P
+>      Fix PL/Tcl to support triggers on tables that have <TT
+CLASS="LITERAL"
+>.tupno</TT
+>
+      as a column name (Tom Lane)
+     </P
+><P
+>      This matches the (previously undocumented) behavior of
+      PL/Tcl's <TT
+CLASS="COMMAND"
+>spi_exec</TT
+> and <TT
+CLASS="COMMAND"
+>spi_execp</TT
+> commands,
+      namely that a magic <TT
+CLASS="LITERAL"
+>.tupno</TT
+> column is inserted only if
+      there isn't a real column named that.
+     </P
+></LI
+><LI
+><P
+>      Allow DOS-style line endings in <TT
+CLASS="FILENAME"
+>~/.pgpass</TT
+> files,
+      even on Unix (Vik Fearing)
+     </P
+><P
+>      This change simplifies use of the same password file across Unix and
+      Windows machines.
+     </P
+></LI
+><LI
+><P
+>      Fix one-byte buffer overrun if <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> is given a file
+      name that ends with a dot (Takayuki Tsunakawa)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s tab completion for <TT
+CLASS="COMMAND"
+>ALTER DEFAULT
+      PRIVILEGES</TT
+> (Gilles Darold, Stephen Frost)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>, treat an empty or all-blank setting of
+      the <TT
+CLASS="ENVAR"
+>PAGER</TT
+> environment variable as meaning <SPAN
+CLASS="QUOTE"
+>"no
+      pager"</SPAN
+> (Tom Lane)
+     </P
+><P
+>      Previously, such a setting caused output intended for the pager to
+      vanish entirely.
+     </P
+></LI
+><LI
+><P
+>      Improve <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+>'s reporting of
+      low-level <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> errors, such as out-of-memory
+      (Joe Conway)
+     </P
+></LI
+><LI
+><P
+>      On Windows, ensure that environment variable changes are propagated
+      to DLLs built with debug options (Christian Ullrich)
+     </P
+></LI
+><LI
+><P
+>      Sync our copy of the timezone library with IANA release tzcode2016j
+      (Tom Lane)
+     </P
+><P
+>      This fixes various issues, most notably that timezone data
+      installation failed if the target directory didn't support hard
+      links.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016j
+      for DST law changes in northern Cyprus (adding a new zone
+      Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
+      and Antarctica/Casey.
+      Historical corrections for Italy, Kazakhstan, Malta, and Palestine.
+      Switch to preferring numeric zone abbreviations for Tonga.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-2-21.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-2-19.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.2.21</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.2.19</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-21.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-21.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-21.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-21.html	2017-08-07 21:32:47.000000000 +0000
@@ -0,0 +1,645 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.2.21</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.2.22"
+HREF="release-9-2-22.html"><LINK
+REL="NEXT"
+TITLE="Release 9.2.20"
+HREF="release-9-2-20.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.2.22"
+HREF="release-9-2-22.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.2.20"
+HREF="release-9-2-20.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-2-21"
+>E.44. Release 9.2.21</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-05-11</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.2.20.
+   For information about new features in the 9.2 major release, see
+   <A
+HREF="release-9-2.html"
+>Section E.65</A
+>.
+  </P
+><P
+>   The <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> community will stop releasing updates
+   for the 9.2.X release series in September 2017.
+   Users are encouraged to update to a newer release branch soon.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN136950"
+>E.44.1. Migration to Version 9.2.21</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.2.X.
+   </P
+><P
+>    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.2.20,
+    see <A
+HREF="release-9-2-20.html"
+>Section E.45</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN136956"
+>E.44.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Restrict visibility
+      of <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>.<TT
+CLASS="STRUCTFIELD"
+>umoptions</TT
+>, to
+      protect passwords stored as user mapping options
+      (Michael Paquier, Feike Steenbergen)
+     </P
+><P
+>      The previous coding allowed the owner of a foreign server object,
+      or anyone he has granted server <TT
+CLASS="LITERAL"
+>USAGE</TT
+> permission to,
+      to see the options for all user mappings associated with that server.
+      This might well include passwords for other users.
+      Adjust the view definition to match the behavior of
+      <TT
+CLASS="STRUCTNAME"
+>information_schema.user_mapping_options</TT
+>, namely that
+      these options are visible to the user being mapped, or if the mapping
+      is for <TT
+CLASS="LITERAL"
+>PUBLIC</TT
+> and the current user is the server
+      owner, or if the current user is a superuser.
+      (CVE-2017-7486)
+     </P
+><P
+>      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      follow the corrected procedure shown in the changelog entry for
+      CVE-2017-7547, in <A
+HREF="release-9-2-22.html"
+>Section E.43</A
+>.
+     </P
+></LI
+><LI
+><P
+>      Prevent exposure of statistical information via leaky operators
+      (Peter Eisentraut)
+     </P
+><P
+>      Some selectivity estimation functions in the planner will apply
+      user-defined operators to values obtained
+      from <TT
+CLASS="STRUCTNAME"
+>pg_statistic</TT
+>, such as most common values and
+      histogram entries.  This occurs before table permissions are checked,
+      so a nefarious user could exploit the behavior to obtain these values
+      for table columns he does not have permission to read.  To fix,
+      fall back to a default estimate if the operator's implementation
+      function is not certified leak-proof and the calling user does not have
+      permission to read the table column whose statistics are needed.
+      At least one of these criteria is satisfied in most cases in practice.
+      (CVE-2017-7484)
+     </P
+></LI
+><LI
+><P
+>      Fix possible corruption of <SPAN
+CLASS="QUOTE"
+>"init forks"</SPAN
+> of unlogged indexes
+      (Robert Haas, Michael Paquier)
+     </P
+><P
+>      This could result in an unlogged index being set to an invalid state
+      after a crash and restart.  Such a problem would persist until the
+      index was dropped and rebuilt.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect reconstruction of <TT
+CLASS="STRUCTNAME"
+>pg_subtrans</TT
+> entries
+      when a standby server replays a prepared but uncommitted two-phase
+      transaction (Tom Lane)
+     </P
+><P
+>      In most cases this turned out to have no visible ill effects, but in
+      corner cases it could result in circular references
+      in <TT
+CLASS="STRUCTNAME"
+>pg_subtrans</TT
+>, potentially causing infinite loops
+      in queries that examine rows modified by the two-phase transaction.
+     </P
+></LI
+><LI
+><P
+>      Ensure parsing of queries in extension scripts sees the results of
+      immediately-preceding DDL (Julien Rouhaud, Tom Lane)
+     </P
+><P
+>      Due to lack of a cache flush step between commands in an extension
+      script file, non-utility queries might not see the effects of an
+      immediately preceding catalog change, such as <TT
+CLASS="COMMAND"
+>ALTER TABLE
+      ... RENAME</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Skip tablespace privilege checks when <TT
+CLASS="COMMAND"
+>ALTER TABLE ... ALTER
+      COLUMN TYPE</TT
+> rebuilds an existing index (Noah Misch)
+     </P
+><P
+>      The command failed if the calling user did not currently have
+      <TT
+CLASS="LITERAL"
+>CREATE</TT
+> privilege for the tablespace containing the index.
+      That behavior seems unhelpful, so skip the check, allowing the
+      index to be rebuilt where it is.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ALTER TABLE ... VALIDATE CONSTRAINT</TT
+> to not recurse
+      to child tables when the constraint is marked <TT
+CLASS="LITERAL"
+>NO INHERIT</TT
+>
+      (Amit Langote)
+     </P
+><P
+>      This fix prevents unwanted <SPAN
+CLASS="QUOTE"
+>"constraint does not exist"</SPAN
+> failures
+      when no matching constraint is present in the child tables.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> to account properly for pages that could not
+      be scanned due to conflicting page pins (Andrew Gierth)
+     </P
+><P
+>      This tended to lead to underestimation of the number of tuples in
+      the table.  In the worst case of a small heavily-contended
+      table, <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> could incorrectly report that the table
+      contained no tuples, leading to very bad planning choices.
+     </P
+></LI
+><LI
+><P
+>      Ensure that bulk-tuple-transfer loops within a hash join are
+      interruptible by query cancel requests (Tom Lane, Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>cursor_to_xml()</CODE
+> to produce valid output
+      with <TT
+CLASS="REPLACEABLE"
+><I
+>tableforest</I
+></TT
+> = false
+      (Thomas Munro, Peter Eisentraut)
+     </P
+><P
+>      Previously it failed to produce a wrapping <TT
+CLASS="LITERAL"
+>&lt;table&gt;</TT
+>
+      element.
+     </P
+></LI
+><LI
+><P
+>      Improve performance of <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+> view
+      (Tom Lane, David Rowley)
+     </P
+></LI
+><LI
+><P
+>      Fix sloppy handling of corner-case errors from <CODE
+CLASS="FUNCTION"
+>lseek()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>close()</CODE
+> (Tom Lane)
+     </P
+><P
+>      Neither of these system calls are likely to fail in typical situations,
+      but if they did, <TT
+CLASS="FILENAME"
+>fd.c</TT
+> could get quite confused.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect check for whether postmaster is running as a Windows
+      service (Michael Paquier)
+     </P
+><P
+>      This could result in attempting to write to the event log when that
+      isn't accessible, so that no logging happens at all.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> to support <TT
+CLASS="COMMAND"
+>COMMIT PREPARED</TT
+>
+      and <TT
+CLASS="COMMAND"
+>ROLLBACK PREPARED</TT
+> (Masahiko Sawada)
+     </P
+></LI
+><LI
+><P
+>      Fix a double-free error when processing dollar-quoted string literals
+      in <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> (Michael Meskes)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>, fix incorrect schema and owner marking for
+      comments and security labels of some types of database objects
+      (Giuseppe Broccolo, Tom Lane)
+     </P
+><P
+>      In simple cases this caused no ill effects; but for example, a
+      schema-selective restore might omit comments it should include, because
+      they were not marked as belonging to the schema of their associated
+      object.
+     </P
+></LI
+><LI
+><P
+>      Avoid emitting an invalid list file in <TT
+CLASS="LITERAL"
+>pg_restore -l</TT
+>
+      when SQL object names contain newlines (Tom Lane)
+     </P
+><P
+>      Replace newlines by spaces, which is sufficient to make the output
+      valid for <TT
+CLASS="LITERAL"
+>pg_restore -L</TT
+>'s purposes.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to transfer comments and security labels
+      attached to <SPAN
+CLASS="QUOTE"
+>"large objects"</SPAN
+> (blobs) (Stephen Frost)
+     </P
+><P
+>      Previously, blobs were correctly transferred to the new database, but
+      any comments or security labels attached to them were lost.
+     </P
+></LI
+><LI
+><P
+>      Improve error handling
+      in <TT
+CLASS="FILENAME"
+>contrib/adminpack</TT
+>'s <CODE
+CLASS="FUNCTION"
+>pg_file_write()</CODE
+>
+      function (Noah Misch)
+     </P
+><P
+>      Notably, it failed to detect errors reported
+      by <CODE
+CLASS="FUNCTION"
+>fclose()</CODE
+>.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+>, avoid leaking the previous unnamed
+      connection when establishing a new unnamed connection (Joe Conway)
+     </P
+></LI
+><LI
+><P
+>      Support OpenSSL 1.1.0 (Heikki Linnakangas, Andreas Karlsson, Tom Lane)
+     </P
+><P
+>      This is a back-patch of work previously done in newer branches;
+      it's needed since many platforms are adopting newer OpenSSL versions.
+     </P
+></LI
+><LI
+><P
+>      Support Tcl 8.6 in MSVC builds (&Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Sync our copy of the timezone library with IANA release tzcode2017b
+      (Tom Lane)
+     </P
+><P
+>      This fixes a bug affecting some DST transitions in January 2038.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2017b
+      for DST law changes in Chile, Haiti, and Mongolia, plus historical
+      corrections for Ecuador, Kazakhstan, Liberia, and Spain.
+      Switch to numeric abbreviations for numerous time zones in South
+      America, the Pacific and Indian oceans, and some Asian and Middle
+      Eastern countries.
+     </P
+><P
+>      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+>
+      view nor used for output.
+     </P
+></LI
+><LI
+><P
+>      Use correct daylight-savings rules for POSIX-style time zone names
+      in MSVC builds (David Rowley)
+     </P
+><P
+>      The Microsoft MSVC build scripts neglected to install
+      the <TT
+CLASS="FILENAME"
+>posixrules</TT
+> file in the timezone directory tree.
+      This resulted in the timezone code falling back to its built-in
+      rule about what DST behavior to assume for a POSIX-style time zone
+      name.  For historical reasons that still corresponds to the DST rules
+      the USA was using before 2007 (i.e., change on first Sunday in April
+      and last Sunday in October).  With this fix, a POSIX-style zone name
+      will use the current and historical DST transition dates of
+      the <TT
+CLASS="LITERAL"
+>US/Eastern</TT
+> zone.  If you don't want that, remove
+      the <TT
+CLASS="FILENAME"
+>posixrules</TT
+> file, or replace it with a copy of some
+      other zone file (see <A
+HREF="datatype-datetime.html#DATATYPE-TIMEZONES"
+>Section 8.5.3</A
+>).  Note that
+      due to caching, you may need to restart the server to get such changes
+      to take effect.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-2-22.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-2-20.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.2.22</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.2.20</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-22.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-22.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-22.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-22.html	2017-08-07 21:32:47.000000000 +0000
@@ -0,0 +1,786 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.2.22</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.3"
+HREF="release-9-3.html"><LINK
+REL="NEXT"
+TITLE="Release 9.2.21"
+HREF="release-9-2-21.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.3"
+HREF="release-9-3.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.2.21"
+HREF="release-9-2-21.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-2-22"
+>E.43. Release 9.2.22</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-08-10</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.2.21.
+   For information about new features in the 9.2 major release, see
+   <A
+HREF="release-9-2.html"
+>Section E.65</A
+>.
+  </P
+><P
+>   The <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> community will stop releasing updates
+   for the 9.2.X release series in September 2017.
+   Users are encouraged to update to a newer release branch soon.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN136775"
+>E.43.1. Migration to Version 9.2.22</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.2.X.
+   </P
+><P
+>    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.2.20,
+    see <A
+HREF="release-9-2-20.html"
+>Section E.45</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN136781"
+>E.43.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Further restrict visibility
+      of <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>.<TT
+CLASS="STRUCTFIELD"
+>umoptions</TT
+>, to
+      protect passwords stored as user mapping options
+      (Noah Misch)
+     </P
+><P
+>      The fix for CVE-2017-7486 was incorrect: it allowed a user
+      to see the options in her own user mapping, even if she did not
+      have <TT
+CLASS="LITERAL"
+>USAGE</TT
+> permission on the associated foreign server.
+      Such options might include a password that had been provided by the
+      server owner rather than the user herself.
+      Since <TT
+CLASS="STRUCTNAME"
+>information_schema.user_mapping_options</TT
+> does not
+      show the options in such cases, <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>
+      should not either.
+      (CVE-2017-7547)
+     </P
+><P
+>      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      you will need to do the following:
+     </P
+><DIV
+CLASS="PROCEDURE"
+><OL
+TYPE="1"
+><LI
+CLASS="STEP"
+><P
+>        Restart the postmaster after adding <TT
+CLASS="LITERAL"
+>allow_system_table_mods
+        = true</TT
+> to <TT
+CLASS="FILENAME"
+>postgresql.conf</TT
+>.  (In versions
+        supporting <TT
+CLASS="COMMAND"
+>ALTER SYSTEM</TT
+>, you can use that to make the
+        configuration change, but you'll still need a restart.)
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        In <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>each</I
+></SPAN
+> database of the cluster,
+        run the following commands as superuser:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SET search_path = pg_catalog;
+CREATE OR REPLACE VIEW pg_user_mappings AS
+    SELECT
+        U.oid       AS umid,
+        S.oid       AS srvid,
+        S.srvname   AS srvname,
+        U.umuser    AS umuser,
+        CASE WHEN U.umuser = 0 THEN
+            'public'
+        ELSE
+            A.rolname
+        END AS usename,
+        CASE WHEN (U.umuser &lt;&gt; 0 AND A.rolname = current_user
+                     AND (pg_has_role(S.srvowner, 'USAGE')
+                          OR has_server_privilege(S.oid, 'USAGE')))
+                    OR (U.umuser = 0 AND pg_has_role(S.srvowner, 'USAGE'))
+                    OR (SELECT rolsuper FROM pg_authid WHERE rolname = current_user)
+                    THEN U.umoptions
+                 ELSE NULL END AS umoptions
+    FROM pg_user_mapping U
+         LEFT JOIN pg_authid A ON (A.oid = U.umuser) JOIN
+        pg_foreign_server S ON (U.umserver = S.oid);</PRE
+><P>
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        Do not forget to include the <TT
+CLASS="LITERAL"
+>template0</TT
+>
+        and <TT
+CLASS="LITERAL"
+>template1</TT
+> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <TT
+CLASS="LITERAL"
+>template0</TT
+>,
+        you'll need to temporarily make it accept connections.
+        In <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> 9.5 and later, you can use
+</P><PRE
+CLASS="PROGRAMLISTING"
+>ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;</PRE
+><P>
+        and then after fixing <TT
+CLASS="LITERAL"
+>template0</TT
+>, undo that with
+</P><PRE
+CLASS="PROGRAMLISTING"
+>ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;</PRE
+><P>
+        In prior versions, instead use
+</P><PRE
+CLASS="PROGRAMLISTING"
+>UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
+UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';</PRE
+><P>
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        Finally, remove the <TT
+CLASS="LITERAL"
+>allow_system_table_mods</TT
+> configuration
+        setting, and again restart the postmaster.
+       </P
+></LI
+></OL
+></DIV
+></LI
+><LI
+><P
+>      Disallow empty passwords in all password-based authentication methods
+      (Heikki Linnakangas)
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> ignores empty password specifications, and does
+      not transmit them to the server.  So, if a user's password has been
+      set to the empty string, it's impossible to log in with that password
+      via <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+> or other <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>-based
+      clients.  An administrator might therefore believe that setting the
+      password to empty is equivalent to disabling password login.
+      However, with a modified or non-<SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>-based client,
+      logging in could be possible, depending on which authentication
+      method is configured.  In particular the most common
+      method, <TT
+CLASS="LITERAL"
+>md5</TT
+>, accepted empty passwords.
+      Change the server to reject empty passwords in all cases.
+      (CVE-2017-7546)
+     </P
+></LI
+><LI
+><P
+>      On Windows, retry process creation if we fail to reserve the address
+      range for our shared memory in the new process (Tom Lane, Amit
+      Kapila)
+     </P
+><P
+>      This is expected to fix infrequent child-process-launch failures that
+      are probably due to interference from antivirus products.
+     </P
+></LI
+><LI
+><P
+>      Fix low-probability corruption of shared predicate-lock hash table
+      in Windows builds (Thomas Munro, Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Avoid logging clean closure of an SSL connection as though
+      it were a connection reset (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Prevent sending SSL session tickets to clients (Tom Lane)
+     </P
+><P
+>      This fix prevents reconnection failures with ticket-aware client-side
+      SSL code.
+     </P
+></LI
+><LI
+><P
+>      Fix code for setting <A
+HREF="runtime-config-connection.html#GUC-TCP-KEEPALIVES-IDLE"
+>tcp_keepalives_idle</A
+> on
+      Solaris (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix statistics collector to honor inquiry messages issued just after
+      a postmaster shutdown and immediate restart (Tom Lane)
+     </P
+><P
+>      Statistics inquiries issued within half a second of the previous
+      postmaster shutdown were effectively ignored.
+     </P
+></LI
+><LI
+><P
+>      Ensure that the statistics collector's receive buffer size is at
+      least 100KB (Tom Lane)
+     </P
+><P
+>      This reduces the risk of dropped statistics data on older platforms
+      whose default receive buffer size is less than that.
+     </P
+></LI
+><LI
+><P
+>      Fix possible creation of an invalid WAL segment when a standby is
+      promoted just after it processes an <TT
+CLASS="LITERAL"
+>XLOG_SWITCH</TT
+> WAL
+      record (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="SYSTEMITEM"
+>SIGHUP</SPAN
+> and <SPAN
+CLASS="SYSTEMITEM"
+>SIGUSR1</SPAN
+> handling in
+      walsender processes (Petr Jelinek, Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Fix unnecessarily slow restarts of <SPAN
+CLASS="APPLICATION"
+>walreceiver</SPAN
+>
+      processes due to race condition in postmaster (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix cases where an <TT
+CLASS="COMMAND"
+>INSERT</TT
+> or <TT
+CLASS="COMMAND"
+>UPDATE</TT
+> assigns
+      to more than one element of a column that is of domain-over-array
+      type (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Move autogenerated array types out of the way during
+      <TT
+CLASS="COMMAND"
+>ALTER ... RENAME</TT
+> (Vik Fearing)
+     </P
+><P
+>      Previously, we would rename a conflicting autogenerated array type
+      out of the way during <TT
+CLASS="COMMAND"
+>CREATE</TT
+>; this fix extends that
+      behavior to renaming operations.
+     </P
+></LI
+><LI
+><P
+>      Ensure that <TT
+CLASS="COMMAND"
+>ALTER USER ... SET</TT
+> accepts all the syntax
+      variants that <TT
+CLASS="COMMAND"
+>ALTER ROLE ... SET</TT
+> does (Peter Eisentraut)
+     </P
+></LI
+><LI
+><P
+>      Properly update dependency info when changing a datatype I/O
+      function's argument or return type from <TT
+CLASS="TYPE"
+>opaque</TT
+> to the
+      correct type (Heikki Linnakangas)
+     </P
+><P
+>      <TT
+CLASS="COMMAND"
+>CREATE TYPE</TT
+> updates I/O functions declared in this
+      long-obsolete style, but it forgot to record a dependency on the
+      type, allowing a subsequent <TT
+CLASS="COMMAND"
+>DROP TYPE</TT
+> to leave broken
+      function definitions behind.
+     </P
+></LI
+><LI
+><P
+>      Reduce memory usage when <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+> processes
+      a <TT
+CLASS="TYPE"
+>tsvector</TT
+> column (Heikki Linnakangas)
+     </P
+></LI
+><LI
+><P
+>      Fix unnecessary precision loss and sloppy rounding when multiplying
+      or dividing <TT
+CLASS="TYPE"
+>money</TT
+> values by integers or floats (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Tighten checks for whitespace in functions that parse identifiers,
+      such as <CODE
+CLASS="FUNCTION"
+>regprocedurein()</CODE
+> (Tom Lane)
+     </P
+><P
+>      Depending on the prevailing locale, these functions could
+      misinterpret fragments of multibyte characters as whitespace.
+     </P
+></LI
+><LI
+><P
+>      Use relevant <TT
+CLASS="LITERAL"
+>#define</TT
+> symbols from Perl while
+      compiling <SPAN
+CLASS="APPLICATION"
+>PL/Perl</SPAN
+> (Ashutosh Sharma, Tom Lane)
+     </P
+><P
+>      This avoids portability problems, typically manifesting as
+      a <SPAN
+CLASS="QUOTE"
+>"handshake"</SPAN
+> mismatch during library load, when working with
+      recent Perl versions.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>, fix failure when <TT
+CLASS="COMMAND"
+>COPY FROM STDIN</TT
+>
+      is ended with a keyboard EOF signal and then another <TT
+CLASS="COMMAND"
+>COPY
+      FROM STDIN</TT
+> is attempted (Thomas Munro)
+     </P
+><P
+>      This misbehavior was observed on BSD-derived platforms (including
+      macOS), but not on most others.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> to not emit invalid SQL for an empty
+      operator class (Daniel Gustafsson)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> output to stdout on Windows (Kuntal Ghosh)
+     </P
+><P
+>      A compressed plain-text dump written to stdout would contain corrupt
+      data due to failure to put the file descriptor into binary mode.
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>pg_get_ruledef()</CODE
+> to print correct output for
+      the <TT
+CLASS="LITERAL"
+>ON SELECT</TT
+> rule of a view whose columns have been
+      renamed (Tom Lane)
+     </P
+><P
+>      In some corner cases, <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> relies
+      on <CODE
+CLASS="FUNCTION"
+>pg_get_ruledef()</CODE
+> to dump views, so that this error
+      could result in dump/reload failures.
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of function expressions in the <TT
+CLASS="LITERAL"
+>FROM</TT
+> clause in
+      cases where the expression does not deparse into something that looks
+      like a function call (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> output to stdout on Windows
+      (Haribabu Kommi)
+     </P
+><P
+>      A backup written to stdout would contain corrupt data due to failure
+      to put the file descriptor into binary mode.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to ensure that the ending WAL record
+      does not have <A
+HREF="runtime-config-wal.html#GUC-WAL-LEVEL"
+>wal_level</A
+> = <TT
+CLASS="LITERAL"
+>minimum</TT
+>
+      (Bruce Momjian)
+     </P
+><P
+>      This condition could prevent upgraded standby servers from
+      reconnecting.
+     </P
+></LI
+><LI
+><P
+>      Always use <TT
+CLASS="OPTION"
+>-fPIC</TT
+>, not <TT
+CLASS="OPTION"
+>-fpic</TT
+>, when building
+      shared libraries with gcc (Tom Lane)
+     </P
+><P
+>      This supports larger extension libraries on platforms where it makes
+      a difference.
+     </P
+></LI
+><LI
+><P
+>      Fix unescaped-braces issue in our build scripts for Microsoft MSVC,
+      to avoid a warning or error from recent Perl versions (Andrew
+      Dunstan)
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, handle the case where the <SPAN
+CLASS="APPLICATION"
+>openssl</SPAN
+>
+      library is not within a <TT
+CLASS="FILENAME"
+>VC</TT
+> subdirectory (Andrew Dunstan)
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, add proper include path for <SPAN
+CLASS="APPLICATION"
+>libxml2</SPAN
+>
+      header files (Andrew Dunstan)
+     </P
+><P
+>      This fixes a former need to move things around in standard Windows
+      installations of <SPAN
+CLASS="APPLICATION"
+>libxml2</SPAN
+>.
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, recognize a Tcl library that is
+      named <TT
+CLASS="FILENAME"
+>tcl86.lib</TT
+> (Noah Misch)
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-3.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-2-21.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.3</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.2.21</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-2.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-2.html	2017-08-07 21:32:48.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-2"
->E.39. Release 9.2.2</A
+>E.63. Release 9.2.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-12-06</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.1.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135370"
->E.39.1. Migration to Version 9.2.2</A
+NAME="AEN139838"
+>E.63.1. Migration to Version 9.2.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -136,7 +133,7 @@
 >    Also, if you are upgrading from version 9.2.0,
     see <A
 HREF="release-9-2-1.html"
->Section E.40</A
+>Section E.64</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135377"
->E.39.2. Changes</A
+NAME="AEN139845"
+>E.63.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-3.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-3.html	2017-08-07 21:32:48.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-3"
->E.38. Release 9.2.3</A
+>E.62. Release 9.2.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-02-07</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.2.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135206"
->E.38.1. Migration to Version 9.2.3</A
+NAME="AEN139674"
+>E.62.1. Migration to Version 9.2.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.2.2,
     see <A
 HREF="release-9-2-2.html"
->Section E.39</A
+>Section E.63</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135211"
->E.38.2. Changes</A
+NAME="AEN139679"
+>E.62.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-4.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-4.html	2017-08-07 21:32:48.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-4"
->E.37. Release 9.2.4</A
+>E.61. Release 9.2.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-04-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.3.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135027"
->E.37.1. Migration to Version 9.2.4</A
+NAME="AEN139495"
+>E.61.1. Migration to Version 9.2.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -137,7 +134,7 @@
 >    Also, if you are upgrading from a version earlier than 9.2.2,
     see <A
 HREF="release-9-2-2.html"
->Section E.39</A
+>Section E.63</A
 >.
    </P
 ></DIV
@@ -146,8 +143,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135034"
->E.37.2. Changes</A
+NAME="AEN139502"
+>E.61.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-5.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-5.html	2017-08-07 21:32:48.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-5"
->E.36. Release 9.2.5</A
+>E.60. Release 9.2.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-10-10</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.4.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN134854"
->E.36.1. Migration to Version 9.2.5</A
+NAME="AEN139322"
+>E.60.1. Migration to Version 9.2.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.2.4,
     see <A
 HREF="release-9-2-4.html"
->Section E.37</A
+>Section E.61</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN134859"
->E.36.2. Changes</A
+NAME="AEN139327"
+>E.60.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-6.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-6.html	2017-08-07 21:32:48.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-6"
->E.35. Release 9.2.6</A
+>E.59. Release 9.2.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.5.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN134734"
->E.35.1. Migration to Version 9.2.6</A
+NAME="AEN139202"
+>E.59.1. Migration to Version 9.2.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -133,7 +130,7 @@
 >    Also, if you are upgrading from a version earlier than 9.2.4,
     see <A
 HREF="release-9-2-4.html"
->Section E.37</A
+>Section E.61</A
 >.
    </P
 ></DIV
@@ -142,8 +139,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN134740"
->E.35.2. Changes</A
+NAME="AEN139208"
+>E.59.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-7.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-7.html	2017-08-07 21:32:48.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-7"
->E.34. Release 9.2.7</A
+>E.58. Release 9.2.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-02-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.6.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN134508"
->E.34.1. Migration to Version 9.2.7</A
+NAME="AEN138976"
+>E.58.1. Migration to Version 9.2.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.2.6,
     see <A
 HREF="release-9-2-6.html"
->Section E.35</A
+>Section E.59</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN134513"
->E.34.2. Changes</A
+NAME="AEN138981"
+>E.58.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-8.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-8.html	2017-08-07 21:32:48.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-8"
->E.33. Release 9.2.8</A
+>E.57. Release 9.2.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-03-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.7.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN134439"
->E.33.1. Migration to Version 9.2.8</A
+NAME="AEN138907"
+>E.57.1. Migration to Version 9.2.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.2.6,
     see <A
 HREF="release-9-2-6.html"
->Section E.35</A
+>Section E.59</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN134444"
->E.33.2. Changes</A
+NAME="AEN138912"
+>E.57.2. Changes</A
 ></H2
 ><P
 ></P
@@ -176,7 +173,7 @@
      </P
 ><P
 >      This prevents scenarios wherein a pathological regular expression
-      could lock up a server process uninterruptably for a long time.
+      could lock up a server process uninterruptibly for a long time.
      </P
 ></LI
 ><LI
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2-9.html	2016-03-28 20:21:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2-9.html	2017-08-07 21:32:48.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2-9"
->E.32. Release 9.2.9</A
+>E.56. Release 9.2.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-07-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.2.8.
    For information about new features in the 9.2 major release, see
    <A
 HREF="release-9-2.html"
->Section E.41</A
+>Section E.65</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN134253"
->E.32.1. Migration to Version 9.2.9</A
+NAME="AEN138721"
+>E.56.1. Migration to Version 9.2.9</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.2.X.
@@ -133,7 +130,7 @@
 >    Also, if you are upgrading from a version earlier than 9.2.6,
     see <A
 HREF="release-9-2-6.html"
->Section E.35</A
+>Section E.59</A
 >.
    </P
 ></DIV
@@ -142,8 +139,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN134259"
->E.32.2. Changes</A
+NAME="AEN138727"
+>E.56.2. Changes</A
 ></H2
 ><P
 ></P
@@ -544,7 +541,7 @@
 >      Fix linking of <SPAN
 CLASS="APPLICATION"
 >libpython</SPAN
-> on OS X (Tom Lane)
+> on macOS (Tom Lane)
      </P
 ><P
 >      The method we previously used can fail with the Python library
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-2.html	2016-03-28 20:21:16.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-2.html	2017-08-07 21:32:49.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -18,15 +18,15 @@
 TITLE="Release 9.2.1"
 HREF="release-9-2-1.html"><LINK
 REL="NEXT"
-TITLE="Release 9.1.21"
-HREF="release-9-1-21.html"><LINK
+TITLE="Release 9.1.24"
+HREF="release-9-1-24.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="Release 9.1.21"
-HREF="release-9-1-21.html"
+TITLE="Release 9.1.24"
+HREF="release-9-1-24.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-2"
->E.41. Release 9.2</A
+>E.65. Release 9.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2012-09-10</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135722"
->E.41.1. Overview</A
+NAME="AEN140190"
+>E.65.1. Overview</A
 ></H2
 ><P
 >    This release has been largely focused on performance improvements, though
@@ -258,8 +255,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135769"
->E.41.2. Migration to Version 9.2</A
+NAME="AEN140237"
+>E.65.2. Migration to Version 9.2</A
 ></H2
 ><P
 >    A dump/restore using <SPAN
@@ -281,8 +278,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN135775"
->E.41.2.1. System Catalogs</A
+NAME="AEN140243"
+>E.65.2.1. System Catalogs</A
 ></H3
 ><P
 ></P
@@ -360,8 +357,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN135797"
->E.41.2.2. Functions</A
+NAME="AEN140265"
+>E.65.2.2. Functions</A
 ></H3
 ><P
 ></P
@@ -529,8 +526,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN135846"
->E.41.2.3. Object Modification</A
+NAME="AEN140314"
+>E.65.2.3. Object Modification</A
 ></H3
 ><P
 ></P
@@ -594,8 +591,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN135864"
->E.41.2.4. Command-Line Tools</A
+NAME="AEN140332"
+>E.65.2.4. Command-Line Tools</A
 ></H3
 ><P
 ></P
@@ -692,8 +689,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN135893"
->E.41.2.5. Server Settings</A
+NAME="AEN140361"
+>E.65.2.5. Server Settings</A
 ></H3
 ><P
 ></P
@@ -786,8 +783,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN135920"
->E.41.2.6. Monitoring</A
+NAME="AEN140388"
+>E.65.2.6. Monitoring</A
 ></H3
 ><P
 ></P
@@ -922,8 +919,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN135958"
->E.41.3. Changes</A
+NAME="AEN140426"
+>E.65.3. Changes</A
 ></H2
 ><P
 >    Below you will find a detailed account of the changes between
@@ -938,16 +935,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN135962"
->E.41.3.1. Server</A
+NAME="AEN140430"
+>E.65.3.1. Server</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN135964"
->E.41.3.1.1. Performance</A
+NAME="AEN140432"
+>E.65.3.1.1. Performance</A
 ></H4
 ><P
 ></P
@@ -1112,8 +1109,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136014"
->E.41.3.1.2. Process Management</A
+NAME="AEN140482"
+>E.65.3.1.2. Process Management</A
 ></H4
 ><P
 ></P
@@ -1175,8 +1172,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136031"
->E.41.3.1.3. Optimizer</A
+NAME="AEN140499"
+>E.65.3.1.3. Optimizer</A
 ></H4
 ><P
 ></P
@@ -1348,8 +1345,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136082"
->E.41.3.1.4. Authentication</A
+NAME="AEN140550"
+>E.65.3.1.4. Authentication</A
 ></H4
 ><P
 ></P
@@ -1410,8 +1407,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136102"
->E.41.3.1.5. Monitoring</A
+NAME="AEN140570"
+>E.65.3.1.5. Monitoring</A
 ></H4
 ><P
 ></P
@@ -1511,8 +1508,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136133"
->E.41.3.1.6. Statistical Views</A
+NAME="AEN140601"
+>E.65.3.1.6. Statistical Views</A
 ></H4
 ><P
 ></P
@@ -1569,8 +1566,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136151"
->E.41.3.1.7. Server Settings</A
+NAME="AEN140619"
+>E.65.3.1.7. Server Settings</A
 ></H4
 ><P
 ></P
@@ -1699,8 +1696,8 @@
 ><H5
 CLASS="SECT5"
 ><A
-NAME="AEN136189"
->E.41.3.1.7.1. <TT
+NAME="AEN140657"
+>E.65.3.1.7.1. <TT
 CLASS="FILENAME"
 >postgresql.conf</TT
 ></A
@@ -1803,8 +1800,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136219"
->E.41.3.2. Replication and Recovery</A
+NAME="AEN140687"
+>E.65.3.2. Replication and Recovery</A
 ></H3
 ><P
 ></P
@@ -1895,8 +1892,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136246"
->E.41.3.3. Queries</A
+NAME="AEN140714"
+>E.65.3.3. Queries</A
 ></H3
 ><P
 ></P
@@ -1987,8 +1984,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136273"
->E.41.3.4. Object Manipulation</A
+NAME="AEN140741"
+>E.65.3.4. Object Manipulation</A
 ></H3
 ><P
 ></P
@@ -2045,8 +2042,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136291"
->E.41.3.4.1. Constraints</A
+NAME="AEN140759"
+>E.65.3.4.1. Constraints</A
 ></H4
 ><P
 ></P
@@ -2124,8 +2121,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136313"
->E.41.3.4.2. <TT
+NAME="AEN140781"
+>E.65.3.4.2. <TT
 CLASS="COMMAND"
 >ALTER</TT
 ></A
@@ -2288,8 +2285,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136362"
->E.41.3.4.3. <A
+NAME="AEN140830"
+>E.65.3.4.3. <A
 HREF="sql-createtable.html"
 ><TT
 CLASS="COMMAND"
@@ -2345,8 +2342,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136379"
->E.41.3.4.4. Object Permissions</A
+NAME="AEN140847"
+>E.65.3.4.4. Object Permissions</A
 ></H4
 ><P
 ></P
@@ -2445,8 +2442,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136407"
->E.41.3.5. Utility Operations</A
+NAME="AEN140875"
+>E.65.3.5. Utility Operations</A
 ></H3
 ><P
 ></P
@@ -2523,8 +2520,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136431"
->E.41.3.6. Data Types</A
+NAME="AEN140899"
+>E.65.3.6. Data Types</A
 ></H3
 ><P
 ></P
@@ -2707,8 +2704,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136487"
->E.41.3.7. Functions</A
+NAME="AEN140955"
+>E.65.3.7. Functions</A
 ></H3
 ><P
 ></P
@@ -2857,8 +2854,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136533"
->E.41.3.8. <A
+NAME="AEN141001"
+>E.65.3.8. <A
 HREF="information-schema.html"
 >Information Schema</A
 ></A
@@ -2963,16 +2960,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136565"
->E.41.3.9. Server-Side Languages</A
+NAME="AEN141033"
+>E.65.3.9. Server-Side Languages</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136567"
->E.41.3.9.1. <A
+NAME="AEN141035"
+>E.65.3.9.1. <A
 HREF="plpgsql.html"
 >PL/pgSQL</A
 > Server-Side Language</A
@@ -3026,8 +3023,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136584"
->E.41.3.9.2. <A
+NAME="AEN141052"
+>E.65.3.9.2. <A
 HREF="plpython.html"
 >PL/Python</A
 > Server-Side Language</A
@@ -3078,8 +3075,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136600"
->E.41.3.9.3. <A
+NAME="AEN141068"
+>E.65.3.9.3. <A
 HREF="xfunc-sql.html"
 >SQL</A
 > Server-Side Language</A
@@ -3111,8 +3108,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136609"
->E.41.3.10. Client Applications</A
+NAME="AEN141077"
+>E.65.3.10. Client Applications</A
 ></H3
 ><P
 ></P
@@ -3212,8 +3209,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136640"
->E.41.3.10.1. <A
+NAME="AEN141108"
+>E.65.3.10.1. <A
 HREF="app-psql.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3384,8 +3381,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136694"
->E.41.3.10.2. Informational Commands</A
+NAME="AEN141162"
+>E.65.3.10.2. Informational Commands</A
 ></H4
 ><P
 ></P
@@ -3481,8 +3478,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136724"
->E.41.3.10.3. Tab Completion</A
+NAME="AEN141192"
+>E.65.3.10.3. Tab Completion</A
 ></H4
 ><P
 ></P
@@ -3550,8 +3547,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136745"
->E.41.3.10.4. <A
+NAME="AEN141213"
+>E.65.3.10.4. <A
 HREF="app-pgdump.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3691,8 +3688,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136788"
->E.41.3.11. <A
+NAME="AEN141256"
+>E.65.3.11. <A
 HREF="libpq.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3816,8 +3813,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136825"
->E.41.3.12. Source Code</A
+NAME="AEN141293"
+>E.65.3.12. Source Code</A
 ></H3
 ><P
 ></P
@@ -3985,8 +3982,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN136882"
->E.41.3.13. Additional Modules</A
+NAME="AEN141350"
+>E.65.3.13. Additional Modules</A
 ></H3
 ><P
 ></P
@@ -4111,8 +4108,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136921"
->E.41.3.13.1. <A
+NAME="AEN141389"
+>E.65.3.13.1. <A
 HREF="pgupgrade.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -4278,8 +4275,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136972"
->E.41.3.13.2. <A
+NAME="AEN141440"
+>E.65.3.13.2. <A
 HREF="pgstatstatements.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -4335,8 +4332,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN136989"
->E.41.3.13.3. <A
+NAME="AEN141457"
+>E.65.3.13.3. <A
 HREF="sepgsql.html"
 >sepgsql</A
 ></A
@@ -4391,8 +4388,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN137006"
->E.41.3.14. Documentation</A
+NAME="AEN141474"
+>E.65.3.14. Documentation</A
 ></H3
 ><P
 ></P
@@ -4494,7 +4491,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="release-9-1-21.html"
+HREF="release-9-1-24.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -4518,7 +4515,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Release 9.1.21</TD
+>Release 9.1.24</TD
 ></TR
 ></TABLE
 ></DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-10.html	2016-03-28 20:21:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-10.html	2017-08-07 21:32:45.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-10"
->E.14. Release 9.3.10</A
+>E.32. Release 9.3.10</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-10-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.3.9.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN130191"
->E.14.1. Migration to Version 9.3.10</A
+NAME="AEN133887"
+>E.32.1. Migration to Version 9.3.10</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.3.9,
     see <A
 HREF="release-9-3-9.html"
->Section E.15</A
+>Section E.33</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN130196"
->E.14.2. Changes</A
+NAME="AEN133892"
+>E.32.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-11.html	2016-03-28 20:21:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-11.html	2017-08-07 21:32:45.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-11"
->E.13. Release 9.3.11</A
+>E.31. Release 9.3.11</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-02-11</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.3.10.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN129936"
->E.13.1. Migration to Version 9.3.11</A
+NAME="AEN133632"
+>E.31.1. Migration to Version 9.3.11</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.3.9,
     see <A
 HREF="release-9-3-9.html"
->Section E.15</A
+>Section E.33</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN129941"
->E.13.2. Changes</A
+NAME="AEN133637"
+>E.31.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-12.html	2016-03-28 20:21:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-12.html	2017-08-07 21:32:45.000000000 +0000
@@ -9,14 +9,14 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
 HREF="release.html"><LINK
 REL="PREVIOUS"
-TITLE="Release 9.4"
-HREF="release-9-4.html"><LINK
+TITLE="Release 9.3.13"
+HREF="release-9-3-13.html"><LINK
 REL="NEXT"
 TITLE="Release 9.3.11"
 HREF="release-9-3-11.html"><LINK
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -53,8 +53,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="Release 9.4"
-HREF="release-9-4.html"
+TITLE="Release 9.3.13"
+HREF="release-9-3-13.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-12"
->E.12. Release 9.3.12</A
+>E.30. Release 9.3.12</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-03-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.3.11.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN129849"
->E.12.1. Migration to Version 9.3.12</A
+NAME="AEN133545"
+>E.30.1. Migration to Version 9.3.12</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.3.9,
     see <A
 HREF="release-9-3-9.html"
->Section E.15</A
+>Section E.33</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN129854"
->E.12.2. Changes</A
+NAME="AEN133550"
+>E.30.2. Changes</A
 ></H2
 ><P
 ></P
@@ -229,7 +226,7 @@
      </P
 ><P
 >      This dodges a portability problem on FreeBSD-derived platforms
-      (including OS X).
+      (including macOS).
      </P
 ></LI
 ><LI
@@ -401,7 +398,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="release-9-4.html"
+HREF="release-9-3-13.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -429,7 +426,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Release 9.4</TD
+>Release 9.3.13</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-13.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-13.html	2017-08-07 21:32:45.000000000 +0000
@@ -0,0 +1,476 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.3.13</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.3.14"
+HREF="release-9-3-14.html"><LINK
+REL="NEXT"
+TITLE="Release 9.3.12"
+HREF="release-9-3-12.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.3.14"
+HREF="release-9-3-14.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.3.12"
+HREF="release-9-3-12.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-3-13"
+>E.29. Release 9.3.13</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-05-12</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.3.12.
+   For information about new features in the 9.3 major release, see
+   <A
+HREF="release-9-3.html"
+>Section E.42</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN133457"
+>E.29.1. Migration to Version 9.3.13</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.3.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.3.9,
+    see <A
+HREF="release-9-3-9.html"
+>Section E.33</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN133462"
+>E.29.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      afterwards (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </P
+><P
+>      This change prevents problems when there are multiple connections
+      using OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      Failures have been reported specifically when a client application
+      uses SSL connections in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> concurrently with
+      SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
+      It's possible for similar problems to arise within the server as well,
+      if an extension module establishes an outgoing SSL connection.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="QUOTE"
+>"failed to build any <TT
+CLASS="REPLACEABLE"
+><I
+>N</I
+></TT
+>-way joins"</SPAN
+>
+      planner error with a full join enclosed in the right-hand side of a
+      left join (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect handling of equivalence-class tests in multilevel
+      nestloop plans (Tom Lane)
+     </P
+><P
+>      Given a three-or-more-way equivalence class of variables, such
+      as <TT
+CLASS="LITERAL"
+>X.X = Y.Y = Z.Z</TT
+>, it was possible for the planner to omit
+      some of the tests needed to enforce that all the variables are actually
+      equal, leading to join rows being output that didn't satisfy
+      the <TT
+CLASS="LITERAL"
+>WHERE</TT
+> clauses.  For various reasons, erroneous plans
+      were seldom selected in practice, so that this bug has gone undetected
+      for a long time.
+     </P
+></LI
+><LI
+><P
+>      Fix possible misbehavior of <TT
+CLASS="LITERAL"
+>TH</TT
+>, <TT
+CLASS="LITERAL"
+>th</TT
+>,
+      and <TT
+CLASS="LITERAL"
+>Y,YYY</TT
+> format codes in <CODE
+CLASS="FUNCTION"
+>to_timestamp()</CODE
+>
+      (Tom Lane)
+     </P
+><P
+>      These could advance off the end of the input string, causing subsequent
+      format codes to read garbage.
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of rules and views in which the <TT
+CLASS="REPLACEABLE"
+><I
+>array</I
+></TT
+>
+      argument of a <TT
+CLASS="LITERAL"
+><TT
+CLASS="REPLACEABLE"
+><I
+>value</I
+></TT
+> <TT
+CLASS="REPLACEABLE"
+><I
+>operator</I
+></TT
+>
+      ANY (<TT
+CLASS="REPLACEABLE"
+><I
+>array</I
+></TT
+>)</TT
+> construct is a sub-SELECT
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_regress</SPAN
+> use a startup timeout from the
+      <TT
+CLASS="ENVAR"
+>PGCTLTIMEOUT</TT
+> environment variable, if that's set (Tom Lane)
+     </P
+><P
+>      This is for consistency with a behavior recently added
+      to <SPAN
+CLASS="APPLICATION"
+>pg_ctl</SPAN
+>; it eases automated testing on slow machines.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to correctly restore extension
+      membership for operator families containing only one operator class
+      (Tom Lane)
+     </P
+><P
+>      In such a case, the operator family was restored into the new database,
+      but it was no longer marked as part of the extension.  This had no
+      immediate ill effects, but would cause later <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      runs to emit output that would cause (harmless) errors on restore.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to not fail when new-cluster TOAST rules
+      differ from old (Tom Lane)
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> had special-case code to handle the
+      situation where the new <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> version thinks that
+      a table should have a TOAST table while the old version did not.  That
+      code was broken, so remove it, and instead do nothing in such cases;
+      there seems no reason to believe that we can't get along fine without
+      a TOAST table if that was okay according to the old version's rules.
+     </P
+></LI
+><LI
+><P
+>      Back-port 9.4-era memory-barrier code changes into 9.2 and 9.3 (Tom Lane)
+     </P
+><P
+>      These changes were not originally needed in pre-9.4 branches, but we
+      recently back-patched a fix that expected the barrier code to work
+      properly.  Only IA64 (when using icc), HPPA, and Alpha platforms are
+      affected.
+     </P
+></LI
+><LI
+><P
+>      Reduce the number of SysV semaphores used by a build configured with
+      <TT
+CLASS="OPTION"
+>--disable-spinlocks</TT
+> (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Rename internal function <CODE
+CLASS="FUNCTION"
+>strtoi()</CODE
+>
+      to <CODE
+CLASS="FUNCTION"
+>strtoint()</CODE
+> to avoid conflict with a NetBSD library
+      function (Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix reporting of errors from <CODE
+CLASS="FUNCTION"
+>bind()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>listen()</CODE
+> system calls on Windows (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Reduce verbosity of compiler output when building with Microsoft Visual
+      Studio (Christian Ullrich)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>putenv()</CODE
+> to work properly with Visual Studio 2013
+      (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Avoid possibly-unsafe use of Windows' <CODE
+CLASS="FUNCTION"
+>FormatMessage()</CODE
+>
+      function (Christian Ullrich)
+     </P
+><P
+>      Use the <TT
+CLASS="LITERAL"
+>FORMAT_MESSAGE_IGNORE_INSERTS</TT
+> flag where
+      appropriate.  No live bug is known to exist here, but it seems like a
+      good idea to be careful.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016d
+      for DST law changes in Russia and Venezuela.  There are new zone
+      names <TT
+CLASS="LITERAL"
+>Europe/Kirov</TT
+> and <TT
+CLASS="LITERAL"
+>Asia/Tomsk</TT
+> to reflect
+      the fact that these regions now have different time zone histories from
+      adjacent regions.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-3-14.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-3-12.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.3.14</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.3.12</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-14.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-14.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-14.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-14.html	2017-08-07 21:32:45.000000000 +0000
@@ -0,0 +1,829 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.3.14</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.3.15"
+HREF="release-9-3-15.html"><LINK
+REL="NEXT"
+TITLE="Release 9.3.13"
+HREF="release-9-3-13.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.3.15"
+HREF="release-9-3-15.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.3.13"
+HREF="release-9-3-13.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-3-14"
+>E.28. Release 9.3.14</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-08-11</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.3.13.
+   For information about new features in the 9.3 major release, see
+   <A
+HREF="release-9-3.html"
+>Section E.42</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN133267"
+>E.28.1. Migration to Version 9.3.14</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.3.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.3.9,
+    see <A
+HREF="release-9-3-9.html"
+>Section E.33</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN133272"
+>E.28.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix possible mis-evaluation of
+      nested <TT
+CLASS="LITERAL"
+>CASE</TT
+>-<TT
+CLASS="LITERAL"
+>WHEN</TT
+> expressions (Heikki
+      Linnakangas, Michael Paquier, Tom Lane)
+     </P
+><P
+>      A <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression appearing within the test value
+      subexpression of another <TT
+CLASS="LITERAL"
+>CASE</TT
+> could become confused about
+      whether its own test value was null or not.  Also, inlining of a SQL
+      function implementing the equality operator used by
+      a <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression could result in passing the wrong test
+      value to functions called within a <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression in the
+      SQL function's body.  If the test values were of different data
+      types, a crash might result; moreover such situations could be abused
+      to allow disclosure of portions of server memory.  (CVE-2016-5423)
+     </P
+></LI
+><LI
+><P
+>      Fix client programs' handling of special characters in database and
+      role names (Noah Misch, Nathan Bossart, Michael Paquier)
+     </P
+><P
+>      Numerous places in <SPAN
+CLASS="APPLICATION"
+>vacuumdb</SPAN
+> and other client programs
+      could become confused by database and role names containing double
+      quotes or backslashes.  Tighten up quoting rules to make that safe.
+      Also, ensure that when a conninfo string is used as a database name
+      parameter to these programs, it is correctly treated as such throughout.
+     </P
+><P
+>      Fix handling of paired double quotes
+      in <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s <TT
+CLASS="COMMAND"
+>\connect</TT
+>
+      and <TT
+CLASS="COMMAND"
+>\password</TT
+> commands to match the documentation.
+     </P
+><P
+>      Introduce a new <TT
+CLASS="OPTION"
+>-reuse-previous</TT
+> option
+      in <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s <TT
+CLASS="COMMAND"
+>\connect</TT
+> command to allow
+      explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether
+      the database name looks like a conninfo string, as before.)  This
+      allows secure handling of database names containing special
+      characters in <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> scripts.
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> now refuses to deal with database and role
+      names containing carriage returns or newlines, as it seems impractical
+      to quote those characters safely on Windows.  In future we may reject
+      such names on the server side, but that step has not been taken yet.
+     </P
+><P
+>      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute
+      commands with superuser privileges the next time a superuser
+      executes <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> or other routine maintenance
+      operations.  (CVE-2016-5424)
+     </P
+></LI
+><LI
+><P
+>      Fix corner-case misbehaviors for <TT
+CLASS="LITERAL"
+>IS NULL</TT
+>/<TT
+CLASS="LITERAL"
+>IS NOT
+      NULL</TT
+> applied to nested composite values (Andrew Gierth, Tom Lane)
+     </P
+><P
+>      The SQL standard specifies that <TT
+CLASS="LITERAL"
+>IS NULL</TT
+> should return
+      TRUE for a row of all null values (thus <TT
+CLASS="LITERAL"
+>ROW(NULL,NULL) IS
+      NULL</TT
+> yields TRUE), but this is not meant to apply recursively
+      (thus <TT
+CLASS="LITERAL"
+>ROW(NULL, ROW(NULL,NULL)) IS NULL</TT
+> yields FALSE).
+      The core executor got this right, but certain planner optimizations
+      treated the test as recursive (thus producing TRUE in both cases),
+      and <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+> could produce remote queries
+      that misbehaved similarly.
+     </P
+></LI
+><LI
+><P
+>      Make the <TT
+CLASS="TYPE"
+>inet</TT
+> and <TT
+CLASS="TYPE"
+>cidr</TT
+> data types properly reject
+      IPv6 addresses with too many colon-separated fields (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Prevent crash in <CODE
+CLASS="FUNCTION"
+>close_ps()</CODE
+>
+      (the <TT
+CLASS="TYPE"
+>point</TT
+> <TT
+CLASS="LITERAL"
+>##</TT
+> <TT
+CLASS="TYPE"
+>lseg</TT
+> operator)
+      for NaN input coordinates (Tom Lane)
+     </P
+><P
+>      Make it return NULL instead of crashing.
+     </P
+></LI
+><LI
+><P
+>      Avoid possible crash in <CODE
+CLASS="FUNCTION"
+>pg_get_expr()</CODE
+> when inconsistent
+      values are passed to it (Michael Paquier, Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix several one-byte buffer over-reads in <CODE
+CLASS="FUNCTION"
+>to_number()</CODE
+>
+      (Peter Eisentraut)
+     </P
+><P
+>      In several cases the <CODE
+CLASS="FUNCTION"
+>to_number()</CODE
+> function would read one
+      more character than it should from the input string.  There is a
+      small chance of a crash, if the input happens to be adjacent to the
+      end of memory.
+     </P
+></LI
+><LI
+><P
+>      Do not run the planner on the query contained in <TT
+CLASS="LITERAL"
+>CREATE
+      MATERIALIZED VIEW</TT
+> or <TT
+CLASS="LITERAL"
+>CREATE TABLE AS</TT
+>
+      when <TT
+CLASS="LITERAL"
+>WITH NO DATA</TT
+> is specified (Michael Paquier,
+      Tom Lane)
+     </P
+><P
+>      This avoids some unnecessary failure conditions, for example if a
+      stable function invoked by the materialized view depends on a table
+      that doesn't exist yet.
+     </P
+></LI
+><LI
+><P
+>      Avoid unsafe intermediate state during expensive paths
+      through <CODE
+CLASS="FUNCTION"
+>heap_update()</CODE
+> (Masahiko Sawada, Andres Freund)
+     </P
+><P
+>      Previously, these cases locked the target tuple (by setting its XMAX)
+      but did not WAL-log that action, thus risking data integrity problems
+      if the page were spilled to disk and then a database crash occurred
+      before the tuple update could be completed.
+     </P
+></LI
+><LI
+><P
+>      Fix hint bit update during WAL replay of row locking operations
+      (Andres Freund)
+     </P
+><P
+>      The only known consequence of this problem is that row locks held by
+      a prepared, but uncommitted, transaction might fail to be enforced
+      after a crash and restart.
+     </P
+></LI
+><LI
+><P
+>      Avoid unnecessary <SPAN
+CLASS="QUOTE"
+>"could not serialize access"</SPAN
+> errors when
+      acquiring <TT
+CLASS="LITERAL"
+>FOR KEY SHARE</TT
+> row locks in serializable mode
+      (&Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Avoid crash in <TT
+CLASS="LITERAL"
+>postgres -C</TT
+> when the specified variable
+      has a null string value (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Ensure that backends see up-to-date statistics for shared catalogs
+      (Tom Lane)
+     </P
+><P
+>      The statistics collector failed to update the statistics file for
+      shared catalogs after a request from a regular backend.  This problem
+      was partially masked because the autovacuum launcher regularly makes
+      requests that did cause such updates; however, it became obvious with
+      autovacuum disabled.
+     </P
+></LI
+><LI
+><P
+>      Avoid redundant writes of the statistics files when multiple
+      backends request updates close together (Tom Lane, Tomas Vondra)
+     </P
+></LI
+><LI
+><P
+>      Avoid consuming a transaction ID during <TT
+CLASS="COMMAND"
+>VACUUM</TT
+>
+      (Alexander Korotkov)
+     </P
+><P
+>      Some cases in <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> unnecessarily caused an XID to be
+      assigned to the current transaction.  Normally this is negligible,
+      but if one is up against the XID wraparound limit, consuming more
+      XIDs during anti-wraparound vacuums is a very bad thing.
+     </P
+></LI
+><LI
+><P
+>      Avoid canceling hot-standby queries during <TT
+CLASS="COMMAND"
+>VACUUM FREEZE</TT
+>
+      (Simon Riggs, &Aacute;lvaro Herrera)
+     </P
+><P
+>      <TT
+CLASS="COMMAND"
+>VACUUM FREEZE</TT
+> on an otherwise-idle master server could
+      result in unnecessary cancellations of queries on its standby
+      servers.
+     </P
+></LI
+><LI
+><P
+>      Prevent possible failure when vacuuming multixact IDs in an
+      installation that has been pg_upgrade'd from pre-9.3 (Andrew Gierth,
+      &Aacute;lvaro Herrera)
+     </P
+><P
+>      The usual symptom of this bug is errors
+      like <SPAN
+CLASS="QUOTE"
+>"MultiXactId <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+> has not been created
+      yet -- apparent wraparound"</SPAN
+>.
+     </P
+></LI
+><LI
+><P
+>      When a manual <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+> specifies a column list, don't
+      reset the table's <TT
+CLASS="LITERAL"
+>changes_since_analyze</TT
+> counter
+      (Tom Lane)
+     </P
+><P
+>      If we're only analyzing some columns, we should not prevent routine
+      auto-analyze from happening for the other columns.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+>'s overestimation of <TT
+CLASS="LITERAL"
+>n_distinct</TT
+>
+      for a unique or nearly-unique column with many null entries (Tom
+      Lane)
+     </P
+><P
+>      The nulls could get counted as though they were themselves distinct
+      values, leading to serious planner misestimates in some types of
+      queries.
+     </P
+></LI
+><LI
+><P
+>      Prevent autovacuum from starting multiple workers for the same shared
+      catalog (&Aacute;lvaro Herrera)
+     </P
+><P
+>      Normally this isn't much of a problem because the vacuum doesn't take
+      long anyway; but in the case of a severely bloated catalog, it could
+      result in all but one worker uselessly waiting instead of doing
+      useful work on other tables.
+     </P
+></LI
+><LI
+><P
+>      Prevent infinite loop in GiST index build for geometric columns
+      containing NaN component values (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/btree_gin</TT
+> to handle the smallest
+      possible <TT
+CLASS="TYPE"
+>bigint</TT
+> value correctly (Peter Eisentraut)
+     </P
+></LI
+><LI
+><P
+>      Teach libpq to correctly decode server version from future servers
+      (Peter Eisentraut)
+     </P
+><P
+>      It's planned to switch to two-part instead of three-part server
+      version numbers for releases after 9.6.  Make sure
+      that <CODE
+CLASS="FUNCTION"
+>PQserverVersion()</CODE
+> returns the correct value for
+      such cases.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+>'s code for <TT
+CLASS="LITERAL"
+>unsigned long long</TT
+>
+      array elements (Michael Meskes)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> with both <TT
+CLASS="OPTION"
+>-c</TT
+> and <TT
+CLASS="OPTION"
+>-C</TT
+>
+      options, avoid emitting an unwanted <TT
+CLASS="LITERAL"
+>CREATE SCHEMA public</TT
+>
+      command (David Johnston, Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Improve handling of <SPAN
+CLASS="SYSTEMITEM"
+>SIGTERM</SPAN
+>/control-C in
+      parallel <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> and <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> (Tom
+      Lane)
+     </P
+><P
+>      Make sure that the worker processes will exit promptly, and also arrange
+      to send query-cancel requests to the connected backends, in case they
+      are doing something long-running such as a <TT
+CLASS="COMMAND"
+>CREATE INDEX</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix error reporting in parallel <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      and <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> (Tom Lane)
+     </P
+><P
+>      Previously, errors reported by <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      or <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> worker processes might never make it to
+      the user's console, because the messages went through the master
+      process, and there were various deadlock scenarios that would prevent
+      the master process from passing on the messages.  Instead, just print
+      everything to <TT
+CLASS="LITERAL"
+>stderr</TT
+>.  In some cases this will result in
+      duplicate messages (for instance, if all the workers report a server
+      shutdown), but that seems better than no message.
+     </P
+></LI
+><LI
+><P
+>      Ensure that parallel <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      or <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> on Windows will shut down properly
+      after an error (Kyotaro Horiguchi)
+     </P
+><P
+>      Previously, it would report the error, but then just sit until
+      manually stopped by the user.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> behave better when built without zlib
+      support (Kyotaro Horiguchi)
+     </P
+><P
+>      It didn't work right for parallel dumps, and emitted some rather
+      pointless warnings in other cases.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> accept <TT
+CLASS="LITERAL"
+>-Z 0</TT
+> as
+      specifying no compression (Fujii Masao)
+     </P
+></LI
+><LI
+><P
+>      Fix makefiles' rule for building AIX shared libraries to be safe for
+      parallel make (Noah Misch)
+     </P
+></LI
+><LI
+><P
+>      Fix TAP tests and MSVC scripts to work when build directory's path
+      name contains spaces (Michael Paquier, Kyotaro Horiguchi)
+     </P
+></LI
+><LI
+><P
+>      Be more predictable about reporting <SPAN
+CLASS="QUOTE"
+>"statement timeout"</SPAN
+>
+      versus <SPAN
+CLASS="QUOTE"
+>"lock timeout"</SPAN
+> (Tom Lane)
+     </P
+><P
+>      On heavily loaded machines, the regression tests sometimes failed due
+      to reporting <SPAN
+CLASS="QUOTE"
+>"lock timeout"</SPAN
+> even though the statement timeout
+      should have occurred first.
+     </P
+></LI
+><LI
+><P
+>      Make regression tests safe for Danish and Welsh locales (Jeff Janes,
+      Tom Lane)
+     </P
+><P
+>      Change some test data that triggered the unusual sorting rules of
+      these locales.
+     </P
+></LI
+><LI
+><P
+>      Update our copy of the timezone code to match
+      IANA's <SPAN
+CLASS="APPLICATION"
+>tzcode</SPAN
+> release 2016c (Tom Lane)
+     </P
+><P
+>      This is needed to cope with anticipated future changes in the time
+      zone data files.  It also fixes some corner-case bugs in coping with
+      unusual time zones.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016f
+      for DST law changes in Kemerovo and Novosibirsk, plus historical
+      corrections for Azerbaijan, Belarus, and Morocco.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-3-15.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-3-13.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.3.15</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.3.13</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-15.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-15.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-15.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-15.html	2017-08-07 21:32:45.000000000 +0000
@@ -0,0 +1,595 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.3.15</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.3.16"
+HREF="release-9-3-16.html"><LINK
+REL="NEXT"
+TITLE="Release 9.3.14"
+HREF="release-9-3-14.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.3.16"
+HREF="release-9-3-16.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.3.14"
+HREF="release-9-3-14.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-3-15"
+>E.27. Release 9.3.15</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-10-27</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.3.14.
+   For information about new features in the 9.3 major release, see
+   <A
+HREF="release-9-3.html"
+>Section E.42</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN133145"
+>E.27.1. Migration to Version 9.3.15</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.3.X.
+   </P
+><P
+>    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted free space maps.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.3.9,
+    see <A
+HREF="release-9-3-9.html"
+>Section E.33</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN133151"
+>E.27.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix WAL-logging of truncation of relation free space maps and
+      visibility maps (Pavan Deolasee, Heikki Linnakangas)
+     </P
+><P
+>      It was possible for these files to not be correctly restored during
+      crash recovery, or to be written incorrectly on a standby server.
+      Bogus entries in a free space map could lead to attempts to access
+      pages that have been truncated away from the relation itself, typically
+      producing errors like <SPAN
+CLASS="QUOTE"
+>"could not read block <TT
+CLASS="REPLACEABLE"
+><I
+>XXX</I
+></TT
+>:
+      read only 0 of 8192 bytes"</SPAN
+>.  Checksum failures in the
+      visibility map are also possible, if checksumming is enabled.
+     </P
+><P
+>      Procedures for determining whether there is a problem and repairing it
+      if so are discussed at
+      <A
+HREF="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"
+TARGET="_top"
+>https://wiki.postgresql.org/wiki/Free_Space_Map_Problems</A
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>SELECT FOR UPDATE/SHARE</TT
+> to correctly lock tuples that
+      have been updated by a subsequently-aborted transaction
+      (&Aacute;lvaro Herrera)
+     </P
+><P
+>      In 9.5 and later, the <TT
+CLASS="COMMAND"
+>SELECT</TT
+> would sometimes fail to
+      return such tuples at all.  A failure has not been proven to occur in
+      earlier releases, but might be possible with concurrent updates.
+     </P
+></LI
+><LI
+><P
+>      Fix EvalPlanQual rechecks involving CTE scans (Tom Lane)
+     </P
+><P
+>      The recheck would always see the CTE as returning no rows, typically
+      leading to failure to update rows that were recently updated.
+     </P
+></LI
+><LI
+><P
+>      Fix improper repetition of previous results from hashed aggregation in
+      a subquery (Andrew Gierth)
+     </P
+><P
+>      The test to see if we can reuse a previously-computed hash table of
+      the aggregate state values neglected the possibility of an outer query
+      reference appearing in an aggregate argument expression.  A change in
+      the value of such a reference should lead to recalculating the hash
+      table, but did not.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> to emit valid XML when
+      <A
+HREF="runtime-config-statistics.html#GUC-TRACK-IO-TIMING"
+>track_io_timing</A
+> is on (Markus Winand)
+     </P
+><P
+>      Previously the XML output-format option produced syntactically invalid
+      tags such as <TT
+CLASS="LITERAL"
+>&lt;I/O-Read-Time&gt;</TT
+>.  That is now
+      rendered as <TT
+CLASS="LITERAL"
+>&lt;I-O-Read-Time&gt;</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Suppress printing of zeroes for unmeasured times
+      in <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> (Maksim Milyutin)
+     </P
+><P
+>      Certain option combinations resulted in printing zero values for times
+      that actually aren't ever measured in that combination.  Our general
+      policy in <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> is not to print such fields at all, so
+      do that consistently in all cases.
+     </P
+></LI
+><LI
+><P
+>      Fix timeout length when <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> is waiting for exclusive
+      table lock so that it can truncate the table (Simon Riggs)
+     </P
+><P
+>      The timeout was meant to be 50 milliseconds, but it was actually only
+      50 microseconds, causing <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> to give up on truncation
+      much more easily than intended.  Set it to the intended value.
+     </P
+></LI
+><LI
+><P
+>      Fix bugs in merging inherited <TT
+CLASS="LITERAL"
+>CHECK</TT
+> constraints while
+      creating or altering a table (Tom Lane, Amit Langote)
+     </P
+><P
+>      Allow identical <TT
+CLASS="LITERAL"
+>CHECK</TT
+> constraints to be added to a parent
+      and child table in either order.  Prevent merging of a valid
+      constraint from the parent table with a <TT
+CLASS="LITERAL"
+>NOT VALID</TT
+>
+      constraint on the child.  Likewise, prevent merging of a <TT
+CLASS="LITERAL"
+>NO
+      INHERIT</TT
+> child constraint with an inherited constraint.
+     </P
+></LI
+><LI
+><P
+>      Remove artificial restrictions on the values accepted
+      by <CODE
+CLASS="FUNCTION"
+>numeric_in()</CODE
+> and <CODE
+CLASS="FUNCTION"
+>numeric_recv()</CODE
+>
+      (Tom Lane)
+     </P
+><P
+>      We allow numeric values up to the limit of the storage format (more
+      than <TT
+CLASS="LITERAL"
+>1e100000</TT
+>), so it seems fairly pointless
+      that <CODE
+CLASS="FUNCTION"
+>numeric_in()</CODE
+> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <CODE
+CLASS="FUNCTION"
+>numeric_recv()</CODE
+> to
+      reject more than 1000 digits in an input value.
+     </P
+></LI
+><LI
+><P
+>      Avoid very-low-probability data corruption due to testing tuple
+      visibility without holding buffer lock (Thomas Munro, Peter Geoghegan,
+      Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix file descriptor leakage when truncating a temporary relation of
+      more than 1GB (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Disallow starting a standalone backend with <TT
+CLASS="LITERAL"
+>standby_mode</TT
+>
+      turned on (Michael Paquier)
+     </P
+><P
+>      This can't do anything useful, since there will be no WAL receiver
+      process to fetch more WAL data; and it could result in misbehavior
+      in code that wasn't designed with this situation in mind.
+     </P
+></LI
+><LI
+><P
+>      Don't try to share SSL contexts across multiple connections
+      in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> (Heikki Linnakangas)
+     </P
+><P
+>      This led to assorted corner-case bugs, particularly when trying to use
+      different SSL parameters for different connections.
+     </P
+></LI
+><LI
+><P
+>      Avoid corner-case memory leak in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> (Tom Lane)
+     </P
+><P
+>      The reported problem involved leaking an error report
+      during <CODE
+CLASS="FUNCTION"
+>PQreset()</CODE
+>, but there might be related cases.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+>'s <TT
+CLASS="OPTION"
+>--help</TT
+> and <TT
+CLASS="OPTION"
+>--version</TT
+>
+      options work consistently with our other executables (Haribabu Kommi)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>, never dump range constructor functions
+      (Tom Lane)
+     </P
+><P
+>      This oversight led to <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> failures with
+      extensions containing range types, due to duplicate creation of the
+      constructor functions.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_xlogdump</SPAN
+>, retry opening new WAL segments when
+      using <TT
+CLASS="OPTION"
+>--follow</TT
+> option (Magnus Hagander)
+     </P
+><P
+>      This allows for a possible delay in the server's creation of the next
+      segment.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_xlogdump</SPAN
+> to cope with a WAL file that begins
+      with a continuation record spanning more than one page (Pavan
+      Deolasee)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/intarray/bench/bench.pl</TT
+> to print the results
+      of the <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> it does when given the <TT
+CLASS="OPTION"
+>-e</TT
+> option
+      (Daniel Gustafsson)
+     </P
+></LI
+><LI
+><P
+>      Update Windows time zone mapping to recognize some time zone names
+      added in recent Windows versions (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Prevent failure of obsolete dynamic time zone abbreviations (Tom Lane)
+     </P
+><P
+>      If a dynamic time zone abbreviation does not match any entry in the
+      referenced time zone, treat it as equivalent to the time zone name.
+      This avoids unexpected failures when IANA removes abbreviations from
+      their time zone database, as they did in <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+>
+      release 2016f and seem likely to do again in the future.  The
+      consequences were not limited to not recognizing the individual
+      abbreviation; any mismatch caused
+      the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_abbrevs</TT
+> view to fail altogether.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016h
+      for DST law changes in Palestine and Turkey, plus historical
+      corrections for Turkey and some regions of Russia.
+      Switch to numeric abbreviations for some time zones in Antarctica,
+      the former Soviet Union, and Sri Lanka.
+     </P
+><P
+>      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+>
+      view nor used for output.
+     </P
+><P
+>      In this update, <TT
+CLASS="LITERAL"
+>AMT</TT
+> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <TT
+CLASS="LITERAL"
+>Default</TT
+>
+      abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-3-16.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-3-14.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.3.16</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.3.14</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-16.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-16.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-16.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-16.html	2017-08-07 21:32:45.000000000 +0000
@@ -0,0 +1,731 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.3.16</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.3.17"
+HREF="release-9-3-17.html"><LINK
+REL="NEXT"
+TITLE="Release 9.3.15"
+HREF="release-9-3-15.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.3.17"
+HREF="release-9-3-17.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.3.15"
+HREF="release-9-3-15.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-3-16"
+>E.26. Release 9.3.16</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-02-09</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.3.15.
+   For information about new features in the 9.3 major release, see
+   <A
+HREF="release-9-3.html"
+>Section E.42</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN132978"
+>E.26.1. Migration to Version 9.3.16</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.3.X.
+   </P
+><P
+>    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted indexes.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.3.15,
+    see <A
+HREF="release-9-3-15.html"
+>Section E.27</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN132984"
+>E.26.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix a race condition that could cause indexes built
+      with <TT
+CLASS="COMMAND"
+>CREATE INDEX CONCURRENTLY</TT
+> to be corrupt
+      (Pavan Deolasee, Tom Lane)
+     </P
+><P
+>      If <TT
+CLASS="COMMAND"
+>CREATE INDEX CONCURRENTLY</TT
+> was used to build an index
+      that depends on a column not previously indexed, then rows
+      updated by transactions that ran concurrently with
+      the <TT
+CLASS="COMMAND"
+>CREATE INDEX</TT
+> command could have received incorrect
+      index entries.  If you suspect this may have happened, the most
+      reliable solution is to rebuild affected indexes after installing
+      this update.
+     </P
+></LI
+><LI
+><P
+>      Unconditionally WAL-log creation of the <SPAN
+CLASS="QUOTE"
+>"init fork"</SPAN
+> for an
+      unlogged table (Michael Paquier)
+     </P
+><P
+>      Previously, this was skipped when <A
+HREF="runtime-config-wal.html#GUC-WAL-LEVEL"
+>wal_level</A
+>
+      = <TT
+CLASS="LITERAL"
+>minimal</TT
+>, but actually it's necessary even in that case
+      to ensure that the unlogged table is properly reset to empty after a
+      crash.
+     </P
+></LI
+><LI
+><P
+>      If the stats collector dies during hot standby, restart it (Takayuki
+      Tsunakawa)
+     </P
+></LI
+><LI
+><P
+>      Ensure that hot standby feedback works correctly when it's enabled at
+      standby server start (Ants Aasma, Craig Ringer)
+     </P
+></LI
+><LI
+><P
+>      Check for interrupts while hot standby is waiting for a conflicting
+      query (Simon Riggs)
+     </P
+></LI
+><LI
+><P
+>      Avoid constantly respawning the autovacuum launcher in a corner case
+      (Amit Khandekar)
+     </P
+><P
+>      This fix avoids problems when autovacuum is nominally off and there
+      are some tables that require freezing, but all such tables are
+      already being processed by autovacuum workers.
+     </P
+></LI
+><LI
+><P
+>      Fix check for when an extension member object can be dropped (Tom Lane)
+     </P
+><P
+>      Extension upgrade scripts should be able to drop member objects,
+      but this was disallowed for serial-column sequences, and possibly
+      other cases.
+     </P
+></LI
+><LI
+><P
+>      Make sure <TT
+CLASS="COMMAND"
+>ALTER TABLE</TT
+> preserves index tablespace
+      assignments when rebuilding indexes (Tom Lane, Michael Paquier)
+     </P
+><P
+>      Previously, non-default settings
+      of <A
+HREF="runtime-config-client.html#GUC-DEFAULT-TABLESPACE"
+>default_tablespace</A
+> could result in broken
+      indexes.
+     </P
+></LI
+><LI
+><P
+>      Prevent dropping a foreign-key constraint if there are pending
+      trigger events for the referenced relation (Tom Lane)
+     </P
+><P
+>      This avoids <SPAN
+CLASS="QUOTE"
+>"could not find trigger <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+>"</SPAN
+>
+      or <SPAN
+CLASS="QUOTE"
+>"relation <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+> has no triggers"</SPAN
+> errors.
+     </P
+></LI
+><LI
+><P
+>      Fix processing of OID column when a table with OIDs is associated to
+      a parent with OIDs via <TT
+CLASS="COMMAND"
+>ALTER TABLE ... INHERIT</TT
+> (Amit
+      Langote)
+     </P
+><P
+>      The OID column should be treated the same as regular user columns in
+      this case, but it wasn't, leading to odd behavior in later
+      inheritance changes.
+     </P
+></LI
+><LI
+><P
+>      Report correct object identity during <TT
+CLASS="COMMAND"
+>ALTER TEXT SEARCH
+      CONFIGURATION</TT
+> (Artur Zakirov)
+     </P
+><P
+>      The wrong catalog OID was reported to extensions such as logical
+      decoding.
+     </P
+></LI
+><LI
+><P
+>      Check for serializability conflicts before reporting
+      constraint-violation failures (Thomas Munro)
+     </P
+><P
+>      When using serializable transaction isolation, it is desirable
+      that any error due to concurrent transactions should manifest
+      as a serialization failure, thereby cueing the application that
+      a retry might succeed.  Unfortunately, this does not reliably
+      happen for duplicate-key failures caused by concurrent insertions.
+      This change ensures that such an error will be reported as a
+      serialization error if the application explicitly checked for
+      the presence of a conflicting key (and did not find it) earlier
+      in the transaction.
+     </P
+></LI
+><LI
+><P
+>      Prevent multicolumn expansion of <TT
+CLASS="REPLACEABLE"
+><I
+>foo</I
+></TT
+><TT
+CLASS="LITERAL"
+>.*</TT
+> in
+      an <TT
+CLASS="COMMAND"
+>UPDATE</TT
+> source expression (Tom Lane)
+     </P
+><P
+>      This led to <SPAN
+CLASS="QUOTE"
+>"UPDATE target count mismatch --- internal
+      error"</SPAN
+>.  Now the syntax is understood as a whole-row variable,
+      as it would be in other contexts.
+     </P
+></LI
+><LI
+><P
+>      Ensure that column typmods are determined accurately for
+      multi-row <TT
+CLASS="LITERAL"
+>VALUES</TT
+> constructs (Tom Lane)
+     </P
+><P
+>      This fixes problems occurring when the first value in a column has a
+      determinable typmod (e.g., length for a <TT
+CLASS="TYPE"
+>varchar</TT
+> value) but
+      later values don't share the same limit.
+     </P
+></LI
+><LI
+><P
+>      Throw error for an unfinished Unicode surrogate pair at the end of a
+      Unicode string (Tom Lane)
+     </P
+><P
+>      Normally, a Unicode surrogate leading character must be followed by a
+      Unicode surrogate trailing character, but the check for this was
+      missed if the leading character was the last character in a Unicode
+      string literal (<TT
+CLASS="LITERAL"
+>U&amp;'...'</TT
+>) or Unicode identifier
+      (<TT
+CLASS="LITERAL"
+>U&amp;"..."</TT
+>).
+     </P
+></LI
+><LI
+><P
+>      Ensure that a purely negative text search query, such
+      as <TT
+CLASS="LITERAL"
+>!foo</TT
+>, matches empty <TT
+CLASS="TYPE"
+>tsvector</TT
+>s (Tom Dunstan)
+     </P
+><P
+>      Such matches were found by GIN index searches, but not by sequential
+      scans or GiST index searches.
+     </P
+></LI
+><LI
+><P
+>      Prevent crash when <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+> replaces a non-top-level
+      subtree with an empty query (Artur Zakirov)
+     </P
+></LI
+><LI
+><P
+>      Fix performance problems in <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+> (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+>'s handling of nested NOT operators
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>array_fill()</CODE
+> to handle empty arrays properly (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix one-byte buffer overrun in <CODE
+CLASS="FUNCTION"
+>quote_literal_cstr()</CODE
+>
+      (Heikki Linnakangas)
+     </P
+><P
+>      The overrun occurred only if the input consisted entirely of single
+      quotes and/or backslashes.
+     </P
+></LI
+><LI
+><P
+>      Prevent multiple calls of <CODE
+CLASS="FUNCTION"
+>pg_start_backup()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>pg_stop_backup()</CODE
+> from running concurrently (Michael
+      Paquier)
+     </P
+><P
+>      This avoids an assertion failure, and possibly worse things, if
+      someone tries to run these functions in parallel.
+     </P
+></LI
+><LI
+><P
+>      Avoid discarding <TT
+CLASS="TYPE"
+>interval</TT
+>-to-<TT
+CLASS="TYPE"
+>interval</TT
+> casts
+      that aren't really no-ops (Tom Lane)
+     </P
+><P
+>      In some cases, a cast that should result in zeroing out
+      low-order <TT
+CLASS="TYPE"
+>interval</TT
+> fields was mistakenly deemed to be a
+      no-op and discarded.  An example is that casting from <TT
+CLASS="TYPE"
+>INTERVAL
+      MONTH</TT
+> to <TT
+CLASS="TYPE"
+>INTERVAL YEAR</TT
+> failed to clear the months field.
+     </P
+></LI
+><LI
+><P
+>      Ensure that cached plans are invalidated by changes in foreign-table
+      options (Amit Langote, Etsuro Fujita, Ashutosh Bapat)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> to dump user-defined casts and transforms
+      that use built-in functions (Stephen Frost)
+     </P
+></LI
+><LI
+><P
+>      Fix possible <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> failure on standby
+      server when including WAL files (Amit Kapila, Robert Haas)
+     </P
+></LI
+><LI
+><P
+>      Ensure that the Python exception objects we create for PL/Python are
+      properly reference-counted (Rafa de la Torre, Tom Lane)
+     </P
+><P
+>      This avoids failures if the objects are used after a Python garbage
+      collection cycle has occurred.
+     </P
+></LI
+><LI
+><P
+>      Fix PL/Tcl to support triggers on tables that have <TT
+CLASS="LITERAL"
+>.tupno</TT
+>
+      as a column name (Tom Lane)
+     </P
+><P
+>      This matches the (previously undocumented) behavior of
+      PL/Tcl's <TT
+CLASS="COMMAND"
+>spi_exec</TT
+> and <TT
+CLASS="COMMAND"
+>spi_execp</TT
+> commands,
+      namely that a magic <TT
+CLASS="LITERAL"
+>.tupno</TT
+> column is inserted only if
+      there isn't a real column named that.
+     </P
+></LI
+><LI
+><P
+>      Allow DOS-style line endings in <TT
+CLASS="FILENAME"
+>~/.pgpass</TT
+> files,
+      even on Unix (Vik Fearing)
+     </P
+><P
+>      This change simplifies use of the same password file across Unix and
+      Windows machines.
+     </P
+></LI
+><LI
+><P
+>      Fix one-byte buffer overrun if <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> is given a file
+      name that ends with a dot (Takayuki Tsunakawa)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s tab completion for <TT
+CLASS="COMMAND"
+>ALTER DEFAULT
+      PRIVILEGES</TT
+> (Gilles Darold, Stephen Frost)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>, treat an empty or all-blank setting of
+      the <TT
+CLASS="ENVAR"
+>PAGER</TT
+> environment variable as meaning <SPAN
+CLASS="QUOTE"
+>"no
+      pager"</SPAN
+> (Tom Lane)
+     </P
+><P
+>      Previously, such a setting caused output intended for the pager to
+      vanish entirely.
+     </P
+></LI
+><LI
+><P
+>      Improve <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+>'s reporting of
+      low-level <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> errors, such as out-of-memory
+      (Joe Conway)
+     </P
+></LI
+><LI
+><P
+>      Teach <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+> to ignore irrelevant server options
+      when it uses a <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+> foreign server as
+      the source of connection options (Corey Huinker)
+     </P
+><P
+>      Previously, if the foreign server object had options that were not
+      also <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> connection options, an error occurred.
+     </P
+></LI
+><LI
+><P
+>      On Windows, ensure that environment variable changes are propagated
+      to DLLs built with debug options (Christian Ullrich)
+     </P
+></LI
+><LI
+><P
+>      Sync our copy of the timezone library with IANA release tzcode2016j
+      (Tom Lane)
+     </P
+><P
+>      This fixes various issues, most notably that timezone data
+      installation failed if the target directory didn't support hard
+      links.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016j
+      for DST law changes in northern Cyprus (adding a new zone
+      Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
+      and Antarctica/Casey.
+      Historical corrections for Italy, Kazakhstan, Malta, and Palestine.
+      Switch to preferring numeric zone abbreviations for Tonga.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-3-17.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-3-15.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.3.17</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.3.15</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-17.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-17.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-17.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-17.html	2017-08-07 21:32:45.000000000 +0000
@@ -0,0 +1,694 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.3.17</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.3.18"
+HREF="release-9-3-18.html"><LINK
+REL="NEXT"
+TITLE="Release 9.3.16"
+HREF="release-9-3-16.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.3.18"
+HREF="release-9-3-18.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.3.16"
+HREF="release-9-3-16.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-3-17"
+>E.25. Release 9.3.17</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-05-11</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.3.16.
+   For information about new features in the 9.3 major release, see
+   <A
+HREF="release-9-3.html"
+>Section E.42</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN132832"
+>E.25.1. Migration to Version 9.3.17</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.3.X.
+   </P
+><P
+>    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.3.16,
+    see <A
+HREF="release-9-3-16.html"
+>Section E.26</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN132838"
+>E.25.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Restrict visibility
+      of <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>.<TT
+CLASS="STRUCTFIELD"
+>umoptions</TT
+>, to
+      protect passwords stored as user mapping options
+      (Michael Paquier, Feike Steenbergen)
+     </P
+><P
+>      The previous coding allowed the owner of a foreign server object,
+      or anyone he has granted server <TT
+CLASS="LITERAL"
+>USAGE</TT
+> permission to,
+      to see the options for all user mappings associated with that server.
+      This might well include passwords for other users.
+      Adjust the view definition to match the behavior of
+      <TT
+CLASS="STRUCTNAME"
+>information_schema.user_mapping_options</TT
+>, namely that
+      these options are visible to the user being mapped, or if the mapping
+      is for <TT
+CLASS="LITERAL"
+>PUBLIC</TT
+> and the current user is the server
+      owner, or if the current user is a superuser.
+      (CVE-2017-7486)
+     </P
+><P
+>      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      follow the corrected procedure shown in the changelog entry for
+      CVE-2017-7547, in <A
+HREF="release-9-3-18.html"
+>Section E.24</A
+>.
+     </P
+></LI
+><LI
+><P
+>      Prevent exposure of statistical information via leaky operators
+      (Peter Eisentraut)
+     </P
+><P
+>      Some selectivity estimation functions in the planner will apply
+      user-defined operators to values obtained
+      from <TT
+CLASS="STRUCTNAME"
+>pg_statistic</TT
+>, such as most common values and
+      histogram entries.  This occurs before table permissions are checked,
+      so a nefarious user could exploit the behavior to obtain these values
+      for table columns he does not have permission to read.  To fix,
+      fall back to a default estimate if the operator's implementation
+      function is not certified leak-proof and the calling user does not have
+      permission to read the table column whose statistics are needed.
+      At least one of these criteria is satisfied in most cases in practice.
+      (CVE-2017-7484)
+     </P
+></LI
+><LI
+><P
+>      Restore <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>'s recognition of
+      the <TT
+CLASS="ENVAR"
+>PGREQUIRESSL</TT
+> environment variable (Daniel Gustafsson)
+     </P
+><P
+>      Processing of this environment variable was unintentionally dropped
+      in <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> 9.3, but its documentation remained.
+      This creates a security hazard, since users might be relying on the
+      environment variable to force SSL-encrypted connections, but that
+      would no longer be guaranteed.  Restore handling of the variable,
+      but give it lower priority than <TT
+CLASS="ENVAR"
+>PGSSLMODE</TT
+>, to avoid
+      breaking configurations that work correctly with post-9.3 code.
+      (CVE-2017-7485)
+     </P
+></LI
+><LI
+><P
+>      Fix possible corruption of <SPAN
+CLASS="QUOTE"
+>"init forks"</SPAN
+> of unlogged indexes
+      (Robert Haas, Michael Paquier)
+     </P
+><P
+>      This could result in an unlogged index being set to an invalid state
+      after a crash and restart.  Such a problem would persist until the
+      index was dropped and rebuilt.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect reconstruction of <TT
+CLASS="STRUCTNAME"
+>pg_subtrans</TT
+> entries
+      when a standby server replays a prepared but uncommitted two-phase
+      transaction (Tom Lane)
+     </P
+><P
+>      In most cases this turned out to have no visible ill effects, but in
+      corner cases it could result in circular references
+      in <TT
+CLASS="STRUCTNAME"
+>pg_subtrans</TT
+>, potentially causing infinite loops
+      in queries that examine rows modified by the two-phase transaction.
+     </P
+></LI
+><LI
+><P
+>      Ensure parsing of queries in extension scripts sees the results of
+      immediately-preceding DDL (Julien Rouhaud, Tom Lane)
+     </P
+><P
+>      Due to lack of a cache flush step between commands in an extension
+      script file, non-utility queries might not see the effects of an
+      immediately preceding catalog change, such as <TT
+CLASS="COMMAND"
+>ALTER TABLE
+      ... RENAME</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Skip tablespace privilege checks when <TT
+CLASS="COMMAND"
+>ALTER TABLE ... ALTER
+      COLUMN TYPE</TT
+> rebuilds an existing index (Noah Misch)
+     </P
+><P
+>      The command failed if the calling user did not currently have
+      <TT
+CLASS="LITERAL"
+>CREATE</TT
+> privilege for the tablespace containing the index.
+      That behavior seems unhelpful, so skip the check, allowing the
+      index to be rebuilt where it is.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ALTER TABLE ... VALIDATE CONSTRAINT</TT
+> to not recurse
+      to child tables when the constraint is marked <TT
+CLASS="LITERAL"
+>NO INHERIT</TT
+>
+      (Amit Langote)
+     </P
+><P
+>      This fix prevents unwanted <SPAN
+CLASS="QUOTE"
+>"constraint does not exist"</SPAN
+> failures
+      when no matching constraint is present in the child tables.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> to account properly for pages that could not
+      be scanned due to conflicting page pins (Andrew Gierth)
+     </P
+><P
+>      This tended to lead to underestimation of the number of tuples in
+      the table.  In the worst case of a small heavily-contended
+      table, <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> could incorrectly report that the table
+      contained no tuples, leading to very bad planning choices.
+     </P
+></LI
+><LI
+><P
+>      Ensure that bulk-tuple-transfer loops within a hash join are
+      interruptible by query cancel requests (Tom Lane, Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>cursor_to_xml()</CODE
+> to produce valid output
+      with <TT
+CLASS="REPLACEABLE"
+><I
+>tableforest</I
+></TT
+> = false
+      (Thomas Munro, Peter Eisentraut)
+     </P
+><P
+>      Previously it failed to produce a wrapping <TT
+CLASS="LITERAL"
+>&lt;table&gt;</TT
+>
+      element.
+     </P
+></LI
+><LI
+><P
+>      Improve performance of <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+> view
+      (Tom Lane, David Rowley)
+     </P
+></LI
+><LI
+><P
+>      Fix sloppy handling of corner-case errors from <CODE
+CLASS="FUNCTION"
+>lseek()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>close()</CODE
+> (Tom Lane)
+     </P
+><P
+>      Neither of these system calls are likely to fail in typical situations,
+      but if they did, <TT
+CLASS="FILENAME"
+>fd.c</TT
+> could get quite confused.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect check for whether postmaster is running as a Windows
+      service (Michael Paquier)
+     </P
+><P
+>      This could result in attempting to write to the event log when that
+      isn't accessible, so that no logging happens at all.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> to support <TT
+CLASS="COMMAND"
+>COMMIT PREPARED</TT
+>
+      and <TT
+CLASS="COMMAND"
+>ROLLBACK PREPARED</TT
+> (Masahiko Sawada)
+     </P
+></LI
+><LI
+><P
+>      Fix a double-free error when processing dollar-quoted string literals
+      in <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> (Michael Meskes)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>, fix incorrect schema and owner marking for
+      comments and security labels of some types of database objects
+      (Giuseppe Broccolo, Tom Lane)
+     </P
+><P
+>      In simple cases this caused no ill effects; but for example, a
+      schema-selective restore might omit comments it should include, because
+      they were not marked as belonging to the schema of their associated
+      object.
+     </P
+></LI
+><LI
+><P
+>      Avoid emitting an invalid list file in <TT
+CLASS="LITERAL"
+>pg_restore -l</TT
+>
+      when SQL object names contain newlines (Tom Lane)
+     </P
+><P
+>      Replace newlines by spaces, which is sufficient to make the output
+      valid for <TT
+CLASS="LITERAL"
+>pg_restore -L</TT
+>'s purposes.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to transfer comments and security labels
+      attached to <SPAN
+CLASS="QUOTE"
+>"large objects"</SPAN
+> (blobs) (Stephen Frost)
+     </P
+><P
+>      Previously, blobs were correctly transferred to the new database, but
+      any comments or security labels attached to them were lost.
+     </P
+></LI
+><LI
+><P
+>      Improve error handling
+      in <TT
+CLASS="FILENAME"
+>contrib/adminpack</TT
+>'s <CODE
+CLASS="FUNCTION"
+>pg_file_write()</CODE
+>
+      function (Noah Misch)
+     </P
+><P
+>      Notably, it failed to detect errors reported
+      by <CODE
+CLASS="FUNCTION"
+>fclose()</CODE
+>.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+>, avoid leaking the previous unnamed
+      connection when establishing a new unnamed connection (Joe Conway)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/pg_trgm</TT
+>'s extraction of trigrams from regular
+      expressions (Tom Lane)
+     </P
+><P
+>      In some cases it would produce a broken data structure that could never
+      match anything, leading to GIN or GiST indexscans that use a trigram
+      index not finding any matches to the regular expression.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+>,
+      transmit query cancellation requests to the remote server
+      (Michael Paquier, Etsuro Fujita)
+     </P
+><P
+>      Previously, a local query cancellation request did not cause an
+      already-sent remote query to terminate early.  This is a back-patch
+      of work originally done for 9.6.
+     </P
+></LI
+><LI
+><P
+>      Support OpenSSL 1.1.0 (Heikki Linnakangas, Andreas Karlsson, Tom Lane)
+     </P
+><P
+>      This is a back-patch of work previously done in newer branches;
+      it's needed since many platforms are adopting newer OpenSSL versions.
+     </P
+></LI
+><LI
+><P
+>      Support Tcl 8.6 in MSVC builds (&Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Sync our copy of the timezone library with IANA release tzcode2017b
+      (Tom Lane)
+     </P
+><P
+>      This fixes a bug affecting some DST transitions in January 2038.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2017b
+      for DST law changes in Chile, Haiti, and Mongolia, plus historical
+      corrections for Ecuador, Kazakhstan, Liberia, and Spain.
+      Switch to numeric abbreviations for numerous time zones in South
+      America, the Pacific and Indian oceans, and some Asian and Middle
+      Eastern countries.
+     </P
+><P
+>      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+>
+      view nor used for output.
+     </P
+></LI
+><LI
+><P
+>      Use correct daylight-savings rules for POSIX-style time zone names
+      in MSVC builds (David Rowley)
+     </P
+><P
+>      The Microsoft MSVC build scripts neglected to install
+      the <TT
+CLASS="FILENAME"
+>posixrules</TT
+> file in the timezone directory tree.
+      This resulted in the timezone code falling back to its built-in
+      rule about what DST behavior to assume for a POSIX-style time zone
+      name.  For historical reasons that still corresponds to the DST rules
+      the USA was using before 2007 (i.e., change on first Sunday in April
+      and last Sunday in October).  With this fix, a POSIX-style zone name
+      will use the current and historical DST transition dates of
+      the <TT
+CLASS="LITERAL"
+>US/Eastern</TT
+> zone.  If you don't want that, remove
+      the <TT
+CLASS="FILENAME"
+>posixrules</TT
+> file, or replace it with a copy of some
+      other zone file (see <A
+HREF="datatype-datetime.html#DATATYPE-TIMEZONES"
+>Section 8.5.3</A
+>).  Note that
+      due to caching, you may need to restart the server to get such changes
+      to take effect.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-3-18.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-3-16.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.3.18</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.3.16</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-18.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-18.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-18.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-18.html	2017-08-07 21:32:44.000000000 +0000
@@ -0,0 +1,898 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.3.18</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.4"
+HREF="release-9-4.html"><LINK
+REL="NEXT"
+TITLE="Release 9.3.17"
+HREF="release-9-3-17.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.4"
+HREF="release-9-4.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.3.17"
+HREF="release-9-3-17.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-3-18"
+>E.24. Release 9.3.18</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-08-10</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.3.17.
+   For information about new features in the 9.3 major release, see
+   <A
+HREF="release-9-3.html"
+>Section E.42</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN132623"
+>E.24.1. Migration to Version 9.3.18</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.3.X.
+   </P
+><P
+>    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.3.16,
+    see <A
+HREF="release-9-3-16.html"
+>Section E.26</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN132629"
+>E.24.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Further restrict visibility
+      of <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>.<TT
+CLASS="STRUCTFIELD"
+>umoptions</TT
+>, to
+      protect passwords stored as user mapping options
+      (Noah Misch)
+     </P
+><P
+>      The fix for CVE-2017-7486 was incorrect: it allowed a user
+      to see the options in her own user mapping, even if she did not
+      have <TT
+CLASS="LITERAL"
+>USAGE</TT
+> permission on the associated foreign server.
+      Such options might include a password that had been provided by the
+      server owner rather than the user herself.
+      Since <TT
+CLASS="STRUCTNAME"
+>information_schema.user_mapping_options</TT
+> does not
+      show the options in such cases, <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>
+      should not either.
+      (CVE-2017-7547)
+     </P
+><P
+>      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      you will need to do the following:
+     </P
+><DIV
+CLASS="PROCEDURE"
+><OL
+TYPE="1"
+><LI
+CLASS="STEP"
+><P
+>        Restart the postmaster after adding <TT
+CLASS="LITERAL"
+>allow_system_table_mods
+        = true</TT
+> to <TT
+CLASS="FILENAME"
+>postgresql.conf</TT
+>.  (In versions
+        supporting <TT
+CLASS="COMMAND"
+>ALTER SYSTEM</TT
+>, you can use that to make the
+        configuration change, but you'll still need a restart.)
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        In <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>each</I
+></SPAN
+> database of the cluster,
+        run the following commands as superuser:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SET search_path = pg_catalog;
+CREATE OR REPLACE VIEW pg_user_mappings AS
+    SELECT
+        U.oid       AS umid,
+        S.oid       AS srvid,
+        S.srvname   AS srvname,
+        U.umuser    AS umuser,
+        CASE WHEN U.umuser = 0 THEN
+            'public'
+        ELSE
+            A.rolname
+        END AS usename,
+        CASE WHEN (U.umuser &lt;&gt; 0 AND A.rolname = current_user
+                     AND (pg_has_role(S.srvowner, 'USAGE')
+                          OR has_server_privilege(S.oid, 'USAGE')))
+                    OR (U.umuser = 0 AND pg_has_role(S.srvowner, 'USAGE'))
+                    OR (SELECT rolsuper FROM pg_authid WHERE rolname = current_user)
+                    THEN U.umoptions
+                 ELSE NULL END AS umoptions
+    FROM pg_user_mapping U
+         LEFT JOIN pg_authid A ON (A.oid = U.umuser) JOIN
+        pg_foreign_server S ON (U.umserver = S.oid);</PRE
+><P>
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        Do not forget to include the <TT
+CLASS="LITERAL"
+>template0</TT
+>
+        and <TT
+CLASS="LITERAL"
+>template1</TT
+> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <TT
+CLASS="LITERAL"
+>template0</TT
+>,
+        you'll need to temporarily make it accept connections.
+        In <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> 9.5 and later, you can use
+</P><PRE
+CLASS="PROGRAMLISTING"
+>ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;</PRE
+><P>
+        and then after fixing <TT
+CLASS="LITERAL"
+>template0</TT
+>, undo that with
+</P><PRE
+CLASS="PROGRAMLISTING"
+>ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;</PRE
+><P>
+        In prior versions, instead use
+</P><PRE
+CLASS="PROGRAMLISTING"
+>UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
+UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';</PRE
+><P>
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        Finally, remove the <TT
+CLASS="LITERAL"
+>allow_system_table_mods</TT
+> configuration
+        setting, and again restart the postmaster.
+       </P
+></LI
+></OL
+></DIV
+></LI
+><LI
+><P
+>      Disallow empty passwords in all password-based authentication methods
+      (Heikki Linnakangas)
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> ignores empty password specifications, and does
+      not transmit them to the server.  So, if a user's password has been
+      set to the empty string, it's impossible to log in with that password
+      via <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+> or other <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>-based
+      clients.  An administrator might therefore believe that setting the
+      password to empty is equivalent to disabling password login.
+      However, with a modified or non-<SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>-based client,
+      logging in could be possible, depending on which authentication
+      method is configured.  In particular the most common
+      method, <TT
+CLASS="LITERAL"
+>md5</TT
+>, accepted empty passwords.
+      Change the server to reject empty passwords in all cases.
+      (CVE-2017-7546)
+     </P
+></LI
+><LI
+><P
+>      Fix concurrent locking of tuple update chains (&Aacute;lvaro Herrera)
+     </P
+><P
+>      If several sessions concurrently lock a tuple update chain with
+      nonconflicting lock modes using an old snapshot, and they all
+      succeed, it was possible for some of them to nonetheless fail (and
+      conclude there is no live tuple version) due to a race condition.
+      This had consequences such as foreign-key checks failing to see a
+      tuple that definitely exists but is being updated concurrently.
+     </P
+></LI
+><LI
+><P
+>      Fix potential data corruption when freezing a tuple whose XMAX is a
+      multixact with exactly one still-interesting member (Teodor Sigaev)
+     </P
+></LI
+><LI
+><P
+>      On Windows, retry process creation if we fail to reserve the address
+      range for our shared memory in the new process (Tom Lane, Amit
+      Kapila)
+     </P
+><P
+>      This is expected to fix infrequent child-process-launch failures that
+      are probably due to interference from antivirus products.
+     </P
+></LI
+><LI
+><P
+>      Fix low-probability corruption of shared predicate-lock hash table
+      in Windows builds (Thomas Munro, Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Avoid logging clean closure of an SSL connection as though
+      it were a connection reset (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Prevent sending SSL session tickets to clients (Tom Lane)
+     </P
+><P
+>      This fix prevents reconnection failures with ticket-aware client-side
+      SSL code.
+     </P
+></LI
+><LI
+><P
+>      Fix code for setting <A
+HREF="runtime-config-connection.html#GUC-TCP-KEEPALIVES-IDLE"
+>tcp_keepalives_idle</A
+> on
+      Solaris (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix statistics collector to honor inquiry messages issued just after
+      a postmaster shutdown and immediate restart (Tom Lane)
+     </P
+><P
+>      Statistics inquiries issued within half a second of the previous
+      postmaster shutdown were effectively ignored.
+     </P
+></LI
+><LI
+><P
+>      Ensure that the statistics collector's receive buffer size is at
+      least 100KB (Tom Lane)
+     </P
+><P
+>      This reduces the risk of dropped statistics data on older platforms
+      whose default receive buffer size is less than that.
+     </P
+></LI
+><LI
+><P
+>      Fix possible creation of an invalid WAL segment when a standby is
+      promoted just after it processes an <TT
+CLASS="LITERAL"
+>XLOG_SWITCH</TT
+> WAL
+      record (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="SYSTEMITEM"
+>SIGHUP</SPAN
+> and <SPAN
+CLASS="SYSTEMITEM"
+>SIGUSR1</SPAN
+> handling in
+      walsender processes (Petr Jelinek, Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Fix unnecessarily slow restarts of <SPAN
+CLASS="APPLICATION"
+>walreceiver</SPAN
+>
+      processes due to race condition in postmaster (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix cases where an <TT
+CLASS="COMMAND"
+>INSERT</TT
+> or <TT
+CLASS="COMMAND"
+>UPDATE</TT
+> assigns
+      to more than one element of a column that is of domain-over-array
+      type (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Allow window functions to be used in sub-<TT
+CLASS="LITERAL"
+>SELECT</TT
+>s that
+      are within the arguments of an aggregate function (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Move autogenerated array types out of the way during
+      <TT
+CLASS="COMMAND"
+>ALTER ... RENAME</TT
+> (Vik Fearing)
+     </P
+><P
+>      Previously, we would rename a conflicting autogenerated array type
+      out of the way during <TT
+CLASS="COMMAND"
+>CREATE</TT
+>; this fix extends that
+      behavior to renaming operations.
+     </P
+></LI
+><LI
+><P
+>      Ensure that <TT
+CLASS="COMMAND"
+>ALTER USER ... SET</TT
+> accepts all the syntax
+      variants that <TT
+CLASS="COMMAND"
+>ALTER ROLE ... SET</TT
+> does (Peter Eisentraut)
+     </P
+></LI
+><LI
+><P
+>      Properly update dependency info when changing a datatype I/O
+      function's argument or return type from <TT
+CLASS="TYPE"
+>opaque</TT
+> to the
+      correct type (Heikki Linnakangas)
+     </P
+><P
+>      <TT
+CLASS="COMMAND"
+>CREATE TYPE</TT
+> updates I/O functions declared in this
+      long-obsolete style, but it forgot to record a dependency on the
+      type, allowing a subsequent <TT
+CLASS="COMMAND"
+>DROP TYPE</TT
+> to leave broken
+      function definitions behind.
+     </P
+></LI
+><LI
+><P
+>      Reduce memory usage when <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+> processes
+      a <TT
+CLASS="TYPE"
+>tsvector</TT
+> column (Heikki Linnakangas)
+     </P
+></LI
+><LI
+><P
+>      Fix unnecessary precision loss and sloppy rounding when multiplying
+      or dividing <TT
+CLASS="TYPE"
+>money</TT
+> values by integers or floats (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Tighten checks for whitespace in functions that parse identifiers,
+      such as <CODE
+CLASS="FUNCTION"
+>regprocedurein()</CODE
+> (Tom Lane)
+     </P
+><P
+>      Depending on the prevailing locale, these functions could
+      misinterpret fragments of multibyte characters as whitespace.
+     </P
+></LI
+><LI
+><P
+>      Use relevant <TT
+CLASS="LITERAL"
+>#define</TT
+> symbols from Perl while
+      compiling <SPAN
+CLASS="APPLICATION"
+>PL/Perl</SPAN
+> (Ashutosh Sharma, Tom Lane)
+     </P
+><P
+>      This avoids portability problems, typically manifesting as
+      a <SPAN
+CLASS="QUOTE"
+>"handshake"</SPAN
+> mismatch during library load, when working with
+      recent Perl versions.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>, reset GSS/SASL and SSPI authentication
+      state properly after a failed connection attempt (Michael Paquier)
+     </P
+><P
+>      Failure to do this meant that when falling back from SSL to non-SSL
+      connections, a GSS/SASL failure in the SSL attempt would always cause
+      the non-SSL attempt to fail.  SSPI did not fail, but it leaked memory.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>, fix failure when <TT
+CLASS="COMMAND"
+>COPY FROM STDIN</TT
+>
+      is ended with a keyboard EOF signal and then another <TT
+CLASS="COMMAND"
+>COPY
+      FROM STDIN</TT
+> is attempted (Thomas Munro)
+     </P
+><P
+>      This misbehavior was observed on BSD-derived platforms (including
+      macOS), but not on most others.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> and <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> to
+      emit <TT
+CLASS="COMMAND"
+>REFRESH MATERIALIZED VIEW</TT
+> commands last (Tom Lane)
+     </P
+><P
+>      This prevents errors during dump/restore when a materialized view
+      refers to tables owned by a different user.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> with the <TT
+CLASS="OPTION"
+>--clean</TT
+> option to
+      drop event triggers as expected (Tom Lane)
+     </P
+><P
+>      It also now correctly assigns ownership of event triggers; before,
+      they were restored as being owned by the superuser running the
+      restore script.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> to not emit invalid SQL for an empty
+      operator class (Daniel Gustafsson)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> output to stdout on Windows (Kuntal Ghosh)
+     </P
+><P
+>      A compressed plain-text dump written to stdout would contain corrupt
+      data due to failure to put the file descriptor into binary mode.
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>pg_get_ruledef()</CODE
+> to print correct output for
+      the <TT
+CLASS="LITERAL"
+>ON SELECT</TT
+> rule of a view whose columns have been
+      renamed (Tom Lane)
+     </P
+><P
+>      In some corner cases, <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> relies
+      on <CODE
+CLASS="FUNCTION"
+>pg_get_ruledef()</CODE
+> to dump views, so that this error
+      could result in dump/reload failures.
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of outer joins with empty constraints, such as the result
+      of a <TT
+CLASS="LITERAL"
+>NATURAL LEFT JOIN</TT
+> with no common columns (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of function expressions in the <TT
+CLASS="LITERAL"
+>FROM</TT
+> clause in
+      cases where the expression does not deparse into something that looks
+      like a function call (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> output to stdout on Windows
+      (Haribabu Kommi)
+     </P
+><P
+>      A backup written to stdout would contain corrupt data due to failure
+      to put the file descriptor into binary mode.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to ensure that the ending WAL record
+      does not have <A
+HREF="runtime-config-wal.html#GUC-WAL-LEVEL"
+>wal_level</A
+> = <TT
+CLASS="LITERAL"
+>minimum</TT
+>
+      (Bruce Momjian)
+     </P
+><P
+>      This condition could prevent upgraded standby servers from
+      reconnecting.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>postgres_fdw</TT
+>, re-establish connections to remote
+      servers after <TT
+CLASS="COMMAND"
+>ALTER SERVER</TT
+> or <TT
+CLASS="COMMAND"
+>ALTER USER
+      MAPPING</TT
+> commands (Kyotaro Horiguchi)
+     </P
+><P
+>      This ensures that option changes affecting connection parameters will
+      be applied promptly.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>postgres_fdw</TT
+>, allow cancellation of remote
+      transaction control commands (Robert Haas, Rafia Sabih)
+     </P
+><P
+>      This change allows us to quickly escape a wait for an unresponsive
+      remote server in many more cases than previously.
+     </P
+></LI
+><LI
+><P
+>      Always use <TT
+CLASS="OPTION"
+>-fPIC</TT
+>, not <TT
+CLASS="OPTION"
+>-fpic</TT
+>, when building
+      shared libraries with gcc (Tom Lane)
+     </P
+><P
+>      This supports larger extension libraries on platforms where it makes
+      a difference.
+     </P
+></LI
+><LI
+><P
+>      Fix unescaped-braces issue in our build scripts for Microsoft MSVC,
+      to avoid a warning or error from recent Perl versions (Andrew
+      Dunstan)
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, handle the case where the <SPAN
+CLASS="APPLICATION"
+>openssl</SPAN
+>
+      library is not within a <TT
+CLASS="FILENAME"
+>VC</TT
+> subdirectory (Andrew Dunstan)
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, add proper include path for <SPAN
+CLASS="APPLICATION"
+>libxml2</SPAN
+>
+      header files (Andrew Dunstan)
+     </P
+><P
+>      This fixes a former need to move things around in standard Windows
+      installations of <SPAN
+CLASS="APPLICATION"
+>libxml2</SPAN
+>.
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, recognize a Tcl library that is
+      named <TT
+CLASS="FILENAME"
+>tcl86.lib</TT
+> (Noah Misch)
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-4.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-3-17.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.4</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.3.17</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-1.html	2016-03-28 20:21:14.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-1.html	2017-08-07 21:32:46.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-1"
->E.23. Release 9.3.1</A
+>E.41. Release 9.3.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-10-10</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.3.0.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN132033"
->E.23.1. Migration to Version 9.3.1</A
+NAME="AEN135729"
+>E.41.1. Migration to Version 9.3.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN132038"
->E.23.2. Changes</A
+NAME="AEN135734"
+>E.41.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-2.html	2016-03-28 20:21:14.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-2.html	2017-08-07 21:32:46.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-2"
->E.22. Release 9.3.2</A
+>E.40. Release 9.3.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-12-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.3.1.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN131866"
->E.22.1. Migration to Version 9.3.2</A
+NAME="AEN135562"
+>E.40.1. Migration to Version 9.3.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -133,7 +130,7 @@
 >    Also, if you are upgrading from a version earlier than 9.3.1,
     see <A
 HREF="release-9-3-1.html"
->Section E.23</A
+>Section E.41</A
 >.
    </P
 ></DIV
@@ -142,8 +139,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN131872"
->E.22.2. Changes</A
+NAME="AEN135568"
+>E.40.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-3.html	2016-03-28 20:21:14.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-3.html	2017-08-07 21:32:46.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-3"
->E.21. Release 9.3.3</A
+>E.39. Release 9.3.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-02-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.3.2.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN131554"
->E.21.1. Migration to Version 9.3.3</A
+NAME="AEN135250"
+>E.39.1. Migration to Version 9.3.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -143,7 +140,7 @@
 >    Also, if you are upgrading from a version earlier than 9.3.2,
     see <A
 HREF="release-9-3-2.html"
->Section E.22</A
+>Section E.40</A
 >.
    </P
 ></DIV
@@ -152,8 +149,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN131561"
->E.21.2. Changes</A
+NAME="AEN135257"
+>E.39.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-4.html	2016-03-28 20:21:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-4.html	2017-08-07 21:32:46.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-4"
->E.20. Release 9.3.4</A
+>E.38. Release 9.3.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-03-20</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.3.3.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN131445"
->E.20.1. Migration to Version 9.3.4</A
+NAME="AEN135141"
+>E.38.1. Migration to Version 9.3.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -134,7 +131,7 @@
 >    Also, if you are upgrading from a version earlier than 9.3.3,
     see <A
 HREF="release-9-3-3.html"
->Section E.21</A
+>Section E.39</A
 >.
    </P
 ></DIV
@@ -143,8 +140,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN131451"
->E.20.2. Changes</A
+NAME="AEN135147"
+>E.38.2. Changes</A
 ></H2
 ><P
 ></P
@@ -215,7 +212,7 @@
      </P
 ><P
 >      This prevents scenarios wherein a pathological regular expression
-      could lock up a server process uninterruptably for a long time.
+      could lock up a server process uninterruptibly for a long time.
      </P
 ></LI
 ><LI
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-5.html	2016-03-28 20:21:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-5.html	2017-08-07 21:32:45.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-5"
->E.19. Release 9.3.5</A
+>E.37. Release 9.3.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-07-24</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.3.4.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN131192"
->E.19.1. Migration to Version 9.3.5</A
+NAME="AEN134888"
+>E.37.1. Migration to Version 9.3.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -138,7 +135,7 @@
 >    Also, if you are upgrading from a version earlier than 9.3.4,
     see <A
 HREF="release-9-3-4.html"
->Section E.20</A
+>Section E.38</A
 >.
    </P
 ></DIV
@@ -147,8 +144,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN131199"
->E.19.2. Changes</A
+NAME="AEN134895"
+>E.37.2. Changes</A
 ></H2
 ><P
 ></P
@@ -729,7 +726,7 @@
 >      Fix linking of <SPAN
 CLASS="APPLICATION"
 >libpython</SPAN
-> on OS X (Tom Lane)
+> on macOS (Tom Lane)
      </P
 ><P
 >      The method we previously used can fail with the Python library
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-6.html	2016-03-28 20:21:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-6.html	2017-08-07 21:32:45.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-6"
->E.18. Release 9.3.6</A
+>E.36. Release 9.3.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-02-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.3.5.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN130762"
->E.18.1. Migration to Version 9.3.6</A
+NAME="AEN134458"
+>E.36.1. Migration to Version 9.3.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -152,7 +149,7 @@
 >    Also, if you are upgrading from a version earlier than 9.3.5,
     see <A
 HREF="release-9-3-5.html"
->Section E.19</A
+>Section E.37</A
 >.
    </P
 ></DIV
@@ -161,8 +158,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN130773"
->E.18.2. Changes</A
+NAME="AEN134469"
+>E.36.2. Changes</A
 ></H2
 ><P
 ></P
@@ -945,7 +942,7 @@
 ></LI
 ><LI
 ><P
->      Warn if OS X's <CODE
+>      Warn if macOS's <CODE
 CLASS="FUNCTION"
 >setlocale()</CODE
 > starts an unwanted extra
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-7.html	2016-03-28 20:21:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-7.html	2017-08-07 21:32:45.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-7"
->E.17. Release 9.3.7</A
+>E.35. Release 9.3.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-05-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.3.6.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN130549"
->E.17.1. Migration to Version 9.3.7</A
+NAME="AEN134245"
+>E.35.1. Migration to Version 9.3.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -139,7 +136,7 @@
 >    Also, if you are upgrading from a version earlier than 9.3.6,
     see <A
 HREF="release-9-3-6.html"
->Section E.18</A
+>Section E.36</A
 >.
    </P
 ></DIV
@@ -148,8 +145,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN130557"
->E.17.2. Changes</A
+NAME="AEN134253"
+>E.35.2. Changes</A
 ></H2
 ><P
 ></P
@@ -841,7 +838,7 @@
 ></LI
 ><LI
 ><P
->      Silence some build warnings on OS X (Tom Lane)
+>      Silence some build warnings on macOS (Tom Lane)
      </P
 ></LI
 ><LI
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-8.html	2016-03-28 20:21:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-8.html	2017-08-07 21:32:45.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-8"
->E.16. Release 9.3.8</A
+>E.34. Release 9.3.8</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-06-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.3.7.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN130510"
->E.16.1. Migration to Version 9.3.8</A
+NAME="AEN134206"
+>E.34.1. Migration to Version 9.3.8</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.3.7,
     see <A
 HREF="release-9-3-7.html"
->Section E.17</A
+>Section E.35</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN130515"
->E.16.2. Changes</A
+NAME="AEN134211"
+>E.34.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3-9.html	2016-03-28 20:21:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3-9.html	2017-08-07 21:32:45.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3-9"
->E.15. Release 9.3.9</A
+>E.33. Release 9.3.9</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-06-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.3.8.
    For information about new features in the 9.3 major release, see
    <A
 HREF="release-9-3.html"
->Section E.24</A
+>Section E.42</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN130449"
->E.15.1. Migration to Version 9.3.9</A
+NAME="AEN134145"
+>E.33.1. Migration to Version 9.3.9</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.3.X.
@@ -136,7 +133,7 @@
 >    Also, if you are upgrading from a version earlier than 9.3.7,
     see <A
 HREF="release-9-3-7.html"
->Section E.17</A
+>Section E.35</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN130456"
->E.15.2. Changes</A
+NAME="AEN134152"
+>E.33.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-3.html	2016-03-28 20:21:14.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-3.html	2017-08-07 21:32:46.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -18,15 +18,15 @@
 TITLE="Release 9.3.1"
 HREF="release-9-3-1.html"><LINK
 REL="NEXT"
-TITLE="Release 9.2.16"
-HREF="release-9-2-16.html"><LINK
+TITLE="Release 9.2.22"
+HREF="release-9-2-22.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="Release 9.2.16"
-HREF="release-9-2-16.html"
+TITLE="Release 9.2.22"
+HREF="release-9-2-22.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-3"
->E.24. Release 9.3</A
+>E.42. Release 9.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2013-09-09</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN132071"
->E.24.1. Overview</A
+NAME="AEN135767"
+>E.42.1. Overview</A
 ></H2
 ><P
 >    Major enhancements in <SPAN
@@ -240,8 +237,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN132113"
->E.24.2. Migration to Version 9.3</A
+NAME="AEN135809"
+>E.42.2. Migration to Version 9.3</A
 ></H2
 ><P
 >    A dump/restore using <A
@@ -269,8 +266,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132121"
->E.24.2.1. Server Settings</A
+NAME="AEN135817"
+>E.42.2.1. Server Settings</A
 ></H3
 ><P
 ></P
@@ -333,8 +330,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132141"
->E.24.2.2. Other</A
+NAME="AEN135837"
+>E.42.2.2. Other</A
 ></H3
 ><P
 ></P
@@ -521,8 +518,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN132193"
->E.24.3. Changes</A
+NAME="AEN135889"
+>E.42.3. Changes</A
 ></H2
 ><P
 >    Below you will find a detailed account of the changes between
@@ -537,16 +534,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132197"
->E.24.3.1. Server</A
+NAME="AEN135893"
+>E.42.3.1. Server</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132199"
->E.24.3.1.1. Locking</A
+NAME="AEN135895"
+>E.42.3.1.1. Locking</A
 ></H4
 ><P
 ></P
@@ -599,8 +596,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132213"
->E.24.3.1.2. Indexes</A
+NAME="AEN135909"
+>E.42.3.1.2. Indexes</A
 ></H4
 ><P
 ></P
@@ -651,8 +648,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132229"
->E.24.3.1.3. Optimizer</A
+NAME="AEN135925"
+>E.42.3.1.3. Optimizer</A
 ></H4
 ><P
 ></P
@@ -701,8 +698,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132244"
->E.24.3.1.4. General Performance</A
+NAME="AEN135940"
+>E.42.3.1.4. General Performance</A
 ></H4
 ><P
 ></P
@@ -812,8 +809,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132278"
->E.24.3.1.5. Monitoring</A
+NAME="AEN135974"
+>E.42.3.1.5. Monitoring</A
 ></H4
 ><P
 ></P
@@ -874,8 +871,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132296"
->E.24.3.1.6. Authentication</A
+NAME="AEN135992"
+>E.42.3.1.6. Authentication</A
 ></H4
 ><P
 ></P
@@ -965,8 +962,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132324"
->E.24.3.1.7. Server Settings</A
+NAME="AEN136020"
+>E.42.3.1.7. Server Settings</A
 ></H4
 ><P
 ></P
@@ -1073,8 +1070,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132356"
->E.24.3.2. Replication and Recovery</A
+NAME="AEN136052"
+>E.42.3.2. Replication and Recovery</A
 ></H3
 ><P
 ></P
@@ -1262,8 +1259,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132413"
->E.24.3.3. Queries</A
+NAME="AEN136109"
+>E.42.3.3. Queries</A
 ></H3
 ><P
 ></P
@@ -1346,8 +1343,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132439"
->E.24.3.4. Object Manipulation</A
+NAME="AEN136135"
+>E.42.3.4. Object Manipulation</A
 ></H3
 ><P
 ></P
@@ -1470,8 +1467,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132476"
->E.24.3.4.1. <TT
+NAME="AEN136172"
+>E.42.3.4.1. <TT
 CLASS="COMMAND"
 >ALTER</TT
 ></A
@@ -1542,8 +1539,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132498"
->E.24.3.4.2. <A
+NAME="AEN136194"
+>E.42.3.4.2. <A
 HREF="rules-views.html"
 ><TT
 CLASS="COMMAND"
@@ -1638,8 +1635,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132524"
->E.24.3.5. Data Types</A
+NAME="AEN136220"
+>E.42.3.5. Data Types</A
 ></H3
 ><P
 ></P
@@ -1686,8 +1683,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132538"
->E.24.3.5.1. <A
+NAME="AEN136234"
+>E.42.3.5.1. <A
 HREF="datatype-json.html"
 ><TT
 CLASS="TYPE"
@@ -1746,8 +1743,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132556"
->E.24.3.6. Functions</A
+NAME="AEN136252"
+>E.42.3.6. Functions</A
 ></H3
 ><P
 ></P
@@ -1920,16 +1917,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132608"
->E.24.3.7. Server-Side Languages</A
+NAME="AEN136304"
+>E.42.3.7. Server-Side Languages</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132610"
->E.24.3.7.1. <A
+NAME="AEN136306"
+>E.42.3.7.1. <A
 HREF="plpgsql.html"
 >PL/pgSQL</A
 > Server-Side Language</A
@@ -2005,8 +2002,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132633"
->E.24.3.7.2. <A
+NAME="AEN136329"
+>E.42.3.7.2. <A
 HREF="plpython.html"
 >PL/Python</A
 > Server-Side Language</A
@@ -2058,8 +2055,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132649"
->E.24.3.8. Server Programming Interface (<A
+NAME="AEN136345"
+>E.42.3.8. Server Programming Interface (<A
 HREF="spi.html"
 >SPI</A
 >)</A
@@ -2114,8 +2111,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132664"
->E.24.3.9. Client Applications</A
+NAME="AEN136360"
+>E.42.3.9. Client Applications</A
 ></H3
 ><P
 ></P
@@ -2228,8 +2225,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132699"
->E.24.3.9.1. <A
+NAME="AEN136395"
+>E.42.3.9.1. <A
 HREF="app-psql.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -2296,8 +2293,8 @@
 ><H5
 CLASS="SECT5"
 ><A
-NAME="AEN132720"
->E.24.3.9.1.1. <A
+NAME="AEN136416"
+>E.42.3.9.1.1. <A
 HREF="app-psql.html#APP-PSQL-META-COMMANDS"
 >Backslash Commands</A
 ></A
@@ -2418,8 +2415,8 @@
 ><H5
 CLASS="SECT5"
 ><A
-NAME="AEN132758"
->E.24.3.9.1.2. Output</A
+NAME="AEN136454"
+>E.42.3.9.1.2. Output</A
 ></H5
 ><P
 ></P
@@ -2483,8 +2480,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132778"
->E.24.3.9.2. <A
+NAME="AEN136474"
+>E.42.3.9.2. <A
 HREF="app-pgdump.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -2550,8 +2547,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132799"
->E.24.3.9.3. <A
+NAME="AEN136495"
+>E.42.3.9.3. <A
 HREF="app-initdb.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -2606,8 +2603,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132816"
->E.24.3.10. Source Code</A
+NAME="AEN136512"
+>E.42.3.10. Source Code</A
 ></H3
 ><P
 ></P
@@ -2904,7 +2901,7 @@
 ><P
 >        Remove <TT
 CLASS="FILENAME"
->src/tool/backend</TT
+>src/tools/backend</TT
 >, now that the content is on
         the <SPAN
 CLASS="PRODUCTNAME"
@@ -2979,8 +2976,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN132937"
->E.24.3.11. Additional Modules</A
+NAME="AEN136633"
+>E.42.3.11. Additional Modules</A
 ></H3
 ><P
 ></P
@@ -3146,8 +3143,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN132988"
->E.24.3.11.1. <A
+NAME="AEN136684"
+>E.42.3.11.1. <A
 HREF="pgupgrade.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3235,8 +3232,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN133015"
->E.24.3.11.2. <A
+NAME="AEN136711"
+>E.42.3.11.2. <A
 HREF="pgbench.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3347,8 +3344,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN133049"
->E.24.3.12. Documentation</A
+NAME="AEN136745"
+>E.42.3.12. Documentation</A
 ></H3
 ><P
 ></P
@@ -3389,9 +3386,9 @@
 HREF="docguide-toolsets.html"
 >instructions</A
 > for setting
-        up the documentation tool chain on Mac <SPAN
+        up the documentation tool chain on <SPAN
 CLASS="PRODUCTNAME"
->OS X</SPAN
+>macOS</SPAN
 >
         (Peter Eisentraut)
        </P
@@ -3446,7 +3443,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="release-9-2-16.html"
+HREF="release-9-2-22.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -3470,7 +3467,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Release 9.2.16</TD
+>Release 9.2.22</TD
 ></TR
 ></TABLE
 ></DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-10.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-10.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-10.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-10.html	2017-08-07 21:32:43.000000000 +0000
@@ -0,0 +1,766 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.4.10</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.4.11"
+HREF="release-9-4-11.html"><LINK
+REL="NEXT"
+TITLE="Release 9.4.9"
+HREF="release-9-4-9.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.4.11"
+HREF="release-9-4-11.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.4.9"
+HREF="release-9-4-9.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-4-10"
+>E.13. Release 9.4.10</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-10-27</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.4.9.
+   For information about new features in the 9.4 major release, see
+   <A
+HREF="release-9-4.html"
+>Section E.23</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN129733"
+>E.13.1. Migration to Version 9.4.10</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.4.X.
+   </P
+><P
+>    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted free space maps.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.4.6,
+    see <A
+HREF="release-9-4-6.html"
+>Section E.17</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN129739"
+>E.13.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix WAL-logging of truncation of relation free space maps and
+      visibility maps (Pavan Deolasee, Heikki Linnakangas)
+     </P
+><P
+>      It was possible for these files to not be correctly restored during
+      crash recovery, or to be written incorrectly on a standby server.
+      Bogus entries in a free space map could lead to attempts to access
+      pages that have been truncated away from the relation itself, typically
+      producing errors like <SPAN
+CLASS="QUOTE"
+>"could not read block <TT
+CLASS="REPLACEABLE"
+><I
+>XXX</I
+></TT
+>:
+      read only 0 of 8192 bytes"</SPAN
+>.  Checksum failures in the
+      visibility map are also possible, if checksumming is enabled.
+     </P
+><P
+>      Procedures for determining whether there is a problem and repairing it
+      if so are discussed at
+      <A
+HREF="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"
+TARGET="_top"
+>https://wiki.postgresql.org/wiki/Free_Space_Map_Problems</A
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect creation of GIN index WAL records on big-endian machines
+      (Tom Lane)
+     </P
+><P
+>      The typical symptom was <SPAN
+CLASS="QUOTE"
+>"unexpected GIN leaf action"</SPAN
+> errors
+      during WAL replay.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>SELECT FOR UPDATE/SHARE</TT
+> to correctly lock tuples that
+      have been updated by a subsequently-aborted transaction
+      (&Aacute;lvaro Herrera)
+     </P
+><P
+>      In 9.5 and later, the <TT
+CLASS="COMMAND"
+>SELECT</TT
+> would sometimes fail to
+      return such tuples at all.  A failure has not been proven to occur in
+      earlier releases, but might be possible with concurrent updates.
+     </P
+></LI
+><LI
+><P
+>      Fix EvalPlanQual rechecks involving CTE scans (Tom Lane)
+     </P
+><P
+>      The recheck would always see the CTE as returning no rows, typically
+      leading to failure to update rows that were recently updated.
+     </P
+></LI
+><LI
+><P
+>      Fix improper repetition of previous results from hashed aggregation in
+      a subquery (Andrew Gierth)
+     </P
+><P
+>      The test to see if we can reuse a previously-computed hash table of
+      the aggregate state values neglected the possibility of an outer query
+      reference appearing in an aggregate argument expression.  A change in
+      the value of such a reference should lead to recalculating the hash
+      table, but did not.
+     </P
+></LI
+><LI
+><P
+>      Fix query-lifespan memory leak in a bulk <TT
+CLASS="COMMAND"
+>UPDATE</TT
+> on a table
+      with a <TT
+CLASS="LITERAL"
+>PRIMARY KEY</TT
+> or <TT
+CLASS="LITERAL"
+>REPLICA IDENTITY</TT
+> index
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> to emit valid XML when
+      <A
+HREF="runtime-config-statistics.html#GUC-TRACK-IO-TIMING"
+>track_io_timing</A
+> is on (Markus Winand)
+     </P
+><P
+>      Previously the XML output-format option produced syntactically invalid
+      tags such as <TT
+CLASS="LITERAL"
+>&lt;I/O-Read-Time&gt;</TT
+>.  That is now
+      rendered as <TT
+CLASS="LITERAL"
+>&lt;I-O-Read-Time&gt;</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Suppress printing of zeroes for unmeasured times
+      in <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> (Maksim Milyutin)
+     </P
+><P
+>      Certain option combinations resulted in printing zero values for times
+      that actually aren't ever measured in that combination.  Our general
+      policy in <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> is not to print such fields at all, so
+      do that consistently in all cases.
+     </P
+></LI
+><LI
+><P
+>      Fix timeout length when <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> is waiting for exclusive
+      table lock so that it can truncate the table (Simon Riggs)
+     </P
+><P
+>      The timeout was meant to be 50 milliseconds, but it was actually only
+      50 microseconds, causing <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> to give up on truncation
+      much more easily than intended.  Set it to the intended value.
+     </P
+></LI
+><LI
+><P
+>      Fix bugs in merging inherited <TT
+CLASS="LITERAL"
+>CHECK</TT
+> constraints while
+      creating or altering a table (Tom Lane, Amit Langote)
+     </P
+><P
+>      Allow identical <TT
+CLASS="LITERAL"
+>CHECK</TT
+> constraints to be added to a parent
+      and child table in either order.  Prevent merging of a valid
+      constraint from the parent table with a <TT
+CLASS="LITERAL"
+>NOT VALID</TT
+>
+      constraint on the child.  Likewise, prevent merging of a <TT
+CLASS="LITERAL"
+>NO
+      INHERIT</TT
+> child constraint with an inherited constraint.
+     </P
+></LI
+><LI
+><P
+>      Remove artificial restrictions on the values accepted
+      by <CODE
+CLASS="FUNCTION"
+>numeric_in()</CODE
+> and <CODE
+CLASS="FUNCTION"
+>numeric_recv()</CODE
+>
+      (Tom Lane)
+     </P
+><P
+>      We allow numeric values up to the limit of the storage format (more
+      than <TT
+CLASS="LITERAL"
+>1e100000</TT
+>), so it seems fairly pointless
+      that <CODE
+CLASS="FUNCTION"
+>numeric_in()</CODE
+> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <CODE
+CLASS="FUNCTION"
+>numeric_recv()</CODE
+> to
+      reject more than 1000 digits in an input value.
+     </P
+></LI
+><LI
+><P
+>      Avoid very-low-probability data corruption due to testing tuple
+      visibility without holding buffer lock (Thomas Munro, Peter Geoghegan,
+      Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix logical WAL decoding to work properly when a subtransaction's WAL
+      output is large enough to spill to disk (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Fix buffer overread in logical WAL decoding (Tom Lane)
+     </P
+><P
+>      Logical decoding of a tuple update record read 23 bytes too many,
+      which was usually harmless but with very bad luck could result in a
+      crash.
+     </P
+></LI
+><LI
+><P
+>      Fix file descriptor leakage when truncating a temporary relation of
+      more than 1GB (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Disallow starting a standalone backend with <TT
+CLASS="LITERAL"
+>standby_mode</TT
+>
+      turned on (Michael Paquier)
+     </P
+><P
+>      This can't do anything useful, since there will be no WAL receiver
+      process to fetch more WAL data; and it could result in misbehavior
+      in code that wasn't designed with this situation in mind.
+     </P
+></LI
+><LI
+><P
+>      Properly initialize replication slot state when recycling a
+      previously-used slot (Michael Paquier)
+     </P
+><P
+>      This failure to reset all of the fields of the slot could
+      prevent <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> from removing dead tuples.
+     </P
+></LI
+><LI
+><P
+>      Round shared-memory allocation request to a multiple of the actual
+      huge page size when attempting to use huge pages on Linux (Tom Lane)
+     </P
+><P
+>      This avoids possible failures during <CODE
+CLASS="FUNCTION"
+>munmap()</CODE
+> on systems
+      with atypical default huge page sizes.  Except in crash-recovery
+      cases, there were no ill effects other than a log message.
+     </P
+></LI
+><LI
+><P
+>      Use a more random value for the dynamic shared memory control
+      segment's ID (Robert Haas, Tom Lane)
+     </P
+><P
+>      Previously, the same value would be chosen every time, because it was
+      derived from <CODE
+CLASS="FUNCTION"
+>random()</CODE
+> but <CODE
+CLASS="FUNCTION"
+>srandom()</CODE
+> had not
+      yet been called.  While relatively harmless, this was not the intended
+      behavior.
+     </P
+></LI
+><LI
+><P
+>      On Windows, retry creation of the dynamic shared memory control
+      segment after an access-denied error (Kyotaro Horiguchi, Amit Kapila)
+     </P
+><P
+>      Windows sometimes returns <TT
+CLASS="LITERAL"
+>ERROR_ACCESS_DENIED</TT
+> rather
+      than <TT
+CLASS="LITERAL"
+>ERROR_ALREADY_EXISTS</TT
+> when there is an existing
+      segment.  This led to postmaster startup failure due to believing that
+      the former was an unrecoverable error.
+     </P
+></LI
+><LI
+><P
+>      Don't try to share SSL contexts across multiple connections
+      in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> (Heikki Linnakangas)
+     </P
+><P
+>      This led to assorted corner-case bugs, particularly when trying to use
+      different SSL parameters for different connections.
+     </P
+></LI
+><LI
+><P
+>      Avoid corner-case memory leak in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> (Tom Lane)
+     </P
+><P
+>      The reported problem involved leaking an error report
+      during <CODE
+CLASS="FUNCTION"
+>PQreset()</CODE
+>, but there might be related cases.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+>'s <TT
+CLASS="OPTION"
+>--help</TT
+> and <TT
+CLASS="OPTION"
+>--version</TT
+>
+      options work consistently with our other executables (Haribabu Kommi)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pgbench</SPAN
+>'s calculation of average latency
+      (Fabien Coelho)
+     </P
+><P
+>      The calculation was incorrect when there were <TT
+CLASS="LITERAL"
+>\sleep</TT
+>
+      commands in the script, or when the test duration was specified in
+      number of transactions rather than total time.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>, never dump range constructor functions
+      (Tom Lane)
+     </P
+><P
+>      This oversight led to <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> failures with
+      extensions containing range types, due to duplicate creation of the
+      constructor functions.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_xlogdump</SPAN
+>, retry opening new WAL segments when
+      using <TT
+CLASS="OPTION"
+>--follow</TT
+> option (Magnus Hagander)
+     </P
+><P
+>      This allows for a possible delay in the server's creation of the next
+      segment.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_xlogdump</SPAN
+> to cope with a WAL file that begins
+      with a continuation record spanning more than one page (Pavan
+      Deolasee)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/pg_buffercache</TT
+> to work
+      when <TT
+CLASS="VARNAME"
+>shared_buffers</TT
+> exceeds 256GB (KaiGai Kohei)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/intarray/bench/bench.pl</TT
+> to print the results
+      of the <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> it does when given the <TT
+CLASS="OPTION"
+>-e</TT
+> option
+      (Daniel Gustafsson)
+     </P
+></LI
+><LI
+><P
+>      Install TAP test infrastructure so that it's available for extension
+      testing (Craig Ringer)
+     </P
+><P
+>      When <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> has been configured
+      with <TT
+CLASS="OPTION"
+>--enable-tap-tests</TT
+>, <SPAN
+CLASS="QUOTE"
+>"make install"</SPAN
+> will now
+      install the Perl support files for TAP testing where PGXS can find
+      them.  This allows non-core extensions to
+      use <TT
+CLASS="LITERAL"
+>$(prove_check)</TT
+> without extra tests.
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, include <SPAN
+CLASS="APPLICATION"
+>pg_recvlogical</SPAN
+> in a
+      client-only installation (MauMau)
+     </P
+></LI
+><LI
+><P
+>      Update Windows time zone mapping to recognize some time zone names
+      added in recent Windows versions (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Prevent failure of obsolete dynamic time zone abbreviations (Tom Lane)
+     </P
+><P
+>      If a dynamic time zone abbreviation does not match any entry in the
+      referenced time zone, treat it as equivalent to the time zone name.
+      This avoids unexpected failures when IANA removes abbreviations from
+      their time zone database, as they did in <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+>
+      release 2016f and seem likely to do again in the future.  The
+      consequences were not limited to not recognizing the individual
+      abbreviation; any mismatch caused
+      the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_abbrevs</TT
+> view to fail altogether.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016h
+      for DST law changes in Palestine and Turkey, plus historical
+      corrections for Turkey and some regions of Russia.
+      Switch to numeric abbreviations for some time zones in Antarctica,
+      the former Soviet Union, and Sri Lanka.
+     </P
+><P
+>      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+>
+      view nor used for output.
+     </P
+><P
+>      In this update, <TT
+CLASS="LITERAL"
+>AMT</TT
+> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <TT
+CLASS="LITERAL"
+>Default</TT
+>
+      abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-4-11.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-4-9.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.4.11</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.4.9</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-11.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-11.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-11.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-11.html	2017-08-07 21:32:43.000000000 +0000
@@ -0,0 +1,840 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.4.11</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.4.12"
+HREF="release-9-4-12.html"><LINK
+REL="NEXT"
+TITLE="Release 9.4.10"
+HREF="release-9-4-10.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.4.12"
+HREF="release-9-4-12.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.4.10"
+HREF="release-9-4-10.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-4-11"
+>E.12. Release 9.4.11</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-02-09</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.4.10.
+   For information about new features in the 9.4 major release, see
+   <A
+HREF="release-9-4.html"
+>Section E.23</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN129534"
+>E.12.1. Migration to Version 9.4.11</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.4.X.
+   </P
+><P
+>    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted indexes.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.4.10,
+    see <A
+HREF="release-9-4-10.html"
+>Section E.13</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN129540"
+>E.12.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix a race condition that could cause indexes built
+      with <TT
+CLASS="COMMAND"
+>CREATE INDEX CONCURRENTLY</TT
+> to be corrupt
+      (Pavan Deolasee, Tom Lane)
+     </P
+><P
+>      If <TT
+CLASS="COMMAND"
+>CREATE INDEX CONCURRENTLY</TT
+> was used to build an index
+      that depends on a column not previously indexed, then rows
+      updated by transactions that ran concurrently with
+      the <TT
+CLASS="COMMAND"
+>CREATE INDEX</TT
+> command could have received incorrect
+      index entries.  If you suspect this may have happened, the most
+      reliable solution is to rebuild affected indexes after installing
+      this update.
+     </P
+></LI
+><LI
+><P
+>      Ensure that the special snapshot used for catalog scans is not
+      invalidated by premature data pruning (Tom Lane)
+     </P
+><P
+>      Backends failed to account for this snapshot when advertising their
+      oldest xmin, potentially allowing concurrent vacuuming operations to
+      remove data that was still needed.  This led to transient failures
+      along the lines of <SPAN
+CLASS="QUOTE"
+>"cache lookup failed for relation 1255"</SPAN
+>.
+     </P
+></LI
+><LI
+><P
+>      Unconditionally WAL-log creation of the <SPAN
+CLASS="QUOTE"
+>"init fork"</SPAN
+> for an
+      unlogged table (Michael Paquier)
+     </P
+><P
+>      Previously, this was skipped when <A
+HREF="runtime-config-wal.html#GUC-WAL-LEVEL"
+>wal_level</A
+>
+      = <TT
+CLASS="LITERAL"
+>minimal</TT
+>, but actually it's necessary even in that case
+      to ensure that the unlogged table is properly reset to empty after a
+      crash.
+     </P
+></LI
+><LI
+><P
+>      Reduce interlocking on standby servers during the replay of btree
+      index vacuuming operations (Simon Riggs)
+     </P
+><P
+>      This change avoids substantial replication delays that sometimes
+      occurred while replaying such operations.
+     </P
+></LI
+><LI
+><P
+>      If the stats collector dies during hot standby, restart it (Takayuki
+      Tsunakawa)
+     </P
+></LI
+><LI
+><P
+>      Ensure that hot standby feedback works correctly when it's enabled at
+      standby server start (Ants Aasma, Craig Ringer)
+     </P
+></LI
+><LI
+><P
+>      Check for interrupts while hot standby is waiting for a conflicting
+      query (Simon Riggs)
+     </P
+></LI
+><LI
+><P
+>      Avoid constantly respawning the autovacuum launcher in a corner case
+      (Amit Khandekar)
+     </P
+><P
+>      This fix avoids problems when autovacuum is nominally off and there
+      are some tables that require freezing, but all such tables are
+      already being processed by autovacuum workers.
+     </P
+></LI
+><LI
+><P
+>      Fix check for when an extension member object can be dropped (Tom Lane)
+     </P
+><P
+>      Extension upgrade scripts should be able to drop member objects,
+      but this was disallowed for serial-column sequences, and possibly
+      other cases.
+     </P
+></LI
+><LI
+><P
+>      Make sure <TT
+CLASS="COMMAND"
+>ALTER TABLE</TT
+> preserves index tablespace
+      assignments when rebuilding indexes (Tom Lane, Michael Paquier)
+     </P
+><P
+>      Previously, non-default settings
+      of <A
+HREF="runtime-config-client.html#GUC-DEFAULT-TABLESPACE"
+>default_tablespace</A
+> could result in broken
+      indexes.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect updating of trigger function properties when changing a
+      foreign-key constraint's deferrability properties with <TT
+CLASS="COMMAND"
+>ALTER
+      TABLE ... ALTER CONSTRAINT</TT
+> (Tom Lane)
+     </P
+><P
+>      This led to odd failures during subsequent exercise of the foreign
+      key, as the triggers were fired at the wrong times.
+     </P
+></LI
+><LI
+><P
+>      Prevent dropping a foreign-key constraint if there are pending
+      trigger events for the referenced relation (Tom Lane)
+     </P
+><P
+>      This avoids <SPAN
+CLASS="QUOTE"
+>"could not find trigger <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+>"</SPAN
+>
+      or <SPAN
+CLASS="QUOTE"
+>"relation <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+> has no triggers"</SPAN
+> errors.
+     </P
+></LI
+><LI
+><P
+>      Fix processing of OID column when a table with OIDs is associated to
+      a parent with OIDs via <TT
+CLASS="COMMAND"
+>ALTER TABLE ... INHERIT</TT
+> (Amit
+      Langote)
+     </P
+><P
+>      The OID column should be treated the same as regular user columns in
+      this case, but it wasn't, leading to odd behavior in later
+      inheritance changes.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>CREATE OR REPLACE VIEW</TT
+> to update the view query
+      before attempting to apply the new view options (Dean Rasheed)
+     </P
+><P
+>      Previously the command would fail if the new options were
+      inconsistent with the old view definition.
+     </P
+></LI
+><LI
+><P
+>      Report correct object identity during <TT
+CLASS="COMMAND"
+>ALTER TEXT SEARCH
+      CONFIGURATION</TT
+> (Artur Zakirov)
+     </P
+><P
+>      The wrong catalog OID was reported to extensions such as logical
+      decoding.
+     </P
+></LI
+><LI
+><P
+>      Check for serializability conflicts before reporting
+      constraint-violation failures (Thomas Munro)
+     </P
+><P
+>      When using serializable transaction isolation, it is desirable
+      that any error due to concurrent transactions should manifest
+      as a serialization failure, thereby cueing the application that
+      a retry might succeed.  Unfortunately, this does not reliably
+      happen for duplicate-key failures caused by concurrent insertions.
+      This change ensures that such an error will be reported as a
+      serialization error if the application explicitly checked for
+      the presence of a conflicting key (and did not find it) earlier
+      in the transaction.
+     </P
+></LI
+><LI
+><P
+>      Prevent multicolumn expansion of <TT
+CLASS="REPLACEABLE"
+><I
+>foo</I
+></TT
+><TT
+CLASS="LITERAL"
+>.*</TT
+> in
+      an <TT
+CLASS="COMMAND"
+>UPDATE</TT
+> source expression (Tom Lane)
+     </P
+><P
+>      This led to <SPAN
+CLASS="QUOTE"
+>"UPDATE target count mismatch --- internal
+      error"</SPAN
+>.  Now the syntax is understood as a whole-row variable,
+      as it would be in other contexts.
+     </P
+></LI
+><LI
+><P
+>      Ensure that column typmods are determined accurately for
+      multi-row <TT
+CLASS="LITERAL"
+>VALUES</TT
+> constructs (Tom Lane)
+     </P
+><P
+>      This fixes problems occurring when the first value in a column has a
+      determinable typmod (e.g., length for a <TT
+CLASS="TYPE"
+>varchar</TT
+> value) but
+      later values don't share the same limit.
+     </P
+></LI
+><LI
+><P
+>      Throw error for an unfinished Unicode surrogate pair at the end of a
+      Unicode string (Tom Lane)
+     </P
+><P
+>      Normally, a Unicode surrogate leading character must be followed by a
+      Unicode surrogate trailing character, but the check for this was
+      missed if the leading character was the last character in a Unicode
+      string literal (<TT
+CLASS="LITERAL"
+>U&amp;'...'</TT
+>) or Unicode identifier
+      (<TT
+CLASS="LITERAL"
+>U&amp;"..."</TT
+>).
+     </P
+></LI
+><LI
+><P
+>      Ensure that a purely negative text search query, such
+      as <TT
+CLASS="LITERAL"
+>!foo</TT
+>, matches empty <TT
+CLASS="TYPE"
+>tsvector</TT
+>s (Tom Dunstan)
+     </P
+><P
+>      Such matches were found by GIN index searches, but not by sequential
+      scans or GiST index searches.
+     </P
+></LI
+><LI
+><P
+>      Prevent crash when <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+> replaces a non-top-level
+      subtree with an empty query (Artur Zakirov)
+     </P
+></LI
+><LI
+><P
+>      Fix performance problems in <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+> (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+>'s handling of nested NOT operators
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>array_fill()</CODE
+> to handle empty arrays properly (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix one-byte buffer overrun in <CODE
+CLASS="FUNCTION"
+>quote_literal_cstr()</CODE
+>
+      (Heikki Linnakangas)
+     </P
+><P
+>      The overrun occurred only if the input consisted entirely of single
+      quotes and/or backslashes.
+     </P
+></LI
+><LI
+><P
+>      Prevent multiple calls of <CODE
+CLASS="FUNCTION"
+>pg_start_backup()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>pg_stop_backup()</CODE
+> from running concurrently (Michael
+      Paquier)
+     </P
+><P
+>      This avoids an assertion failure, and possibly worse things, if
+      someone tries to run these functions in parallel.
+     </P
+></LI
+><LI
+><P
+>      Avoid discarding <TT
+CLASS="TYPE"
+>interval</TT
+>-to-<TT
+CLASS="TYPE"
+>interval</TT
+> casts
+      that aren't really no-ops (Tom Lane)
+     </P
+><P
+>      In some cases, a cast that should result in zeroing out
+      low-order <TT
+CLASS="TYPE"
+>interval</TT
+> fields was mistakenly deemed to be a
+      no-op and discarded.  An example is that casting from <TT
+CLASS="TYPE"
+>INTERVAL
+      MONTH</TT
+> to <TT
+CLASS="TYPE"
+>INTERVAL YEAR</TT
+> failed to clear the months field.
+     </P
+></LI
+><LI
+><P
+>      Ensure that cached plans are invalidated by changes in foreign-table
+      options (Amit Langote, Etsuro Fujita, Ashutosh Bapat)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> to dump user-defined casts and transforms
+      that use built-in functions (Stephen Frost)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> with <TT
+CLASS="OPTION"
+>--create --if-exists</TT
+>
+      to behave more sanely if an archive contains
+      unrecognized <TT
+CLASS="COMMAND"
+>DROP</TT
+> commands (Tom Lane)
+     </P
+><P
+>      This doesn't fix any live bug, but it may improve the behavior in
+      future if <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> is used with an archive
+      generated by a later <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> version.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+>'s rate limiting in the presence of
+      slow I/O (Antonin Houska)
+     </P
+><P
+>      If disk I/O was transiently much slower than the specified rate
+      limit, the calculation overflowed, effectively disabling the rate
+      limit for the rest of the run.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+>'s handling of
+      symlinked <TT
+CLASS="FILENAME"
+>pg_stat_tmp</TT
+> and <TT
+CLASS="FILENAME"
+>pg_replslot</TT
+>
+      subdirectories (Magnus Hagander, Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Fix possible <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> failure on standby
+      server when including WAL files (Amit Kapila, Robert Haas)
+     </P
+></LI
+><LI
+><P
+>      Ensure that the Python exception objects we create for PL/Python are
+      properly reference-counted (Rafa de la Torre, Tom Lane)
+     </P
+><P
+>      This avoids failures if the objects are used after a Python garbage
+      collection cycle has occurred.
+     </P
+></LI
+><LI
+><P
+>      Fix PL/Tcl to support triggers on tables that have <TT
+CLASS="LITERAL"
+>.tupno</TT
+>
+      as a column name (Tom Lane)
+     </P
+><P
+>      This matches the (previously undocumented) behavior of
+      PL/Tcl's <TT
+CLASS="COMMAND"
+>spi_exec</TT
+> and <TT
+CLASS="COMMAND"
+>spi_execp</TT
+> commands,
+      namely that a magic <TT
+CLASS="LITERAL"
+>.tupno</TT
+> column is inserted only if
+      there isn't a real column named that.
+     </P
+></LI
+><LI
+><P
+>      Allow DOS-style line endings in <TT
+CLASS="FILENAME"
+>~/.pgpass</TT
+> files,
+      even on Unix (Vik Fearing)
+     </P
+><P
+>      This change simplifies use of the same password file across Unix and
+      Windows machines.
+     </P
+></LI
+><LI
+><P
+>      Fix one-byte buffer overrun if <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> is given a file
+      name that ends with a dot (Takayuki Tsunakawa)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s tab completion for <TT
+CLASS="COMMAND"
+>ALTER DEFAULT
+      PRIVILEGES</TT
+> (Gilles Darold, Stephen Frost)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>, treat an empty or all-blank setting of
+      the <TT
+CLASS="ENVAR"
+>PAGER</TT
+> environment variable as meaning <SPAN
+CLASS="QUOTE"
+>"no
+      pager"</SPAN
+> (Tom Lane)
+     </P
+><P
+>      Previously, such a setting caused output intended for the pager to
+      vanish entirely.
+     </P
+></LI
+><LI
+><P
+>      Improve <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+>'s reporting of
+      low-level <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> errors, such as out-of-memory
+      (Joe Conway)
+     </P
+></LI
+><LI
+><P
+>      Teach <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+> to ignore irrelevant server options
+      when it uses a <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+> foreign server as
+      the source of connection options (Corey Huinker)
+     </P
+><P
+>      Previously, if the foreign server object had options that were not
+      also <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> connection options, an error occurred.
+     </P
+></LI
+><LI
+><P
+>      On Windows, ensure that environment variable changes are propagated
+      to DLLs built with debug options (Christian Ullrich)
+     </P
+></LI
+><LI
+><P
+>      Sync our copy of the timezone library with IANA release tzcode2016j
+      (Tom Lane)
+     </P
+><P
+>      This fixes various issues, most notably that timezone data
+      installation failed if the target directory didn't support hard
+      links.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016j
+      for DST law changes in northern Cyprus (adding a new zone
+      Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
+      and Antarctica/Casey.
+      Historical corrections for Italy, Kazakhstan, Malta, and Palestine.
+      Switch to preferring numeric zone abbreviations for Tonga.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-4-12.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-4-10.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.4.12</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.4.10</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-12.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-12.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-12.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-12.html	2017-08-07 21:32:43.000000000 +0000
@@ -0,0 +1,785 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.4.12</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.4.13"
+HREF="release-9-4-13.html"><LINK
+REL="NEXT"
+TITLE="Release 9.4.11"
+HREF="release-9-4-11.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.4.13"
+HREF="release-9-4-13.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.4.11"
+HREF="release-9-4-11.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-4-12"
+>E.11. Release 9.4.12</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-05-11</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.4.11.
+   For information about new features in the 9.4 major release, see
+   <A
+HREF="release-9-4.html"
+>Section E.23</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN129363"
+>E.11.1. Migration to Version 9.4.12</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.4.X.
+   </P
+><P
+>    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </P
+><P
+>    Also, if you are using third-party replication tools that depend
+    on <SPAN
+CLASS="QUOTE"
+>"logical decoding"</SPAN
+>, see the fourth changelog entry below.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.4.11,
+    see <A
+HREF="release-9-4-11.html"
+>Section E.12</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN129371"
+>E.11.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Restrict visibility
+      of <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>.<TT
+CLASS="STRUCTFIELD"
+>umoptions</TT
+>, to
+      protect passwords stored as user mapping options
+      (Michael Paquier, Feike Steenbergen)
+     </P
+><P
+>      The previous coding allowed the owner of a foreign server object,
+      or anyone he has granted server <TT
+CLASS="LITERAL"
+>USAGE</TT
+> permission to,
+      to see the options for all user mappings associated with that server.
+      This might well include passwords for other users.
+      Adjust the view definition to match the behavior of
+      <TT
+CLASS="STRUCTNAME"
+>information_schema.user_mapping_options</TT
+>, namely that
+      these options are visible to the user being mapped, or if the mapping
+      is for <TT
+CLASS="LITERAL"
+>PUBLIC</TT
+> and the current user is the server
+      owner, or if the current user is a superuser.
+      (CVE-2017-7486)
+     </P
+><P
+>      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      follow the corrected procedure shown in the changelog entry for
+      CVE-2017-7547, in <A
+HREF="release-9-4-13.html"
+>Section E.10</A
+>.
+     </P
+></LI
+><LI
+><P
+>      Prevent exposure of statistical information via leaky operators
+      (Peter Eisentraut)
+     </P
+><P
+>      Some selectivity estimation functions in the planner will apply
+      user-defined operators to values obtained
+      from <TT
+CLASS="STRUCTNAME"
+>pg_statistic</TT
+>, such as most common values and
+      histogram entries.  This occurs before table permissions are checked,
+      so a nefarious user could exploit the behavior to obtain these values
+      for table columns he does not have permission to read.  To fix,
+      fall back to a default estimate if the operator's implementation
+      function is not certified leak-proof and the calling user does not have
+      permission to read the table column whose statistics are needed.
+      At least one of these criteria is satisfied in most cases in practice.
+      (CVE-2017-7484)
+     </P
+></LI
+><LI
+><P
+>      Restore <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>'s recognition of
+      the <TT
+CLASS="ENVAR"
+>PGREQUIRESSL</TT
+> environment variable (Daniel Gustafsson)
+     </P
+><P
+>      Processing of this environment variable was unintentionally dropped
+      in <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> 9.3, but its documentation remained.
+      This creates a security hazard, since users might be relying on the
+      environment variable to force SSL-encrypted connections, but that
+      would no longer be guaranteed.  Restore handling of the variable,
+      but give it lower priority than <TT
+CLASS="ENVAR"
+>PGSSLMODE</TT
+>, to avoid
+      breaking configurations that work correctly with post-9.3 code.
+      (CVE-2017-7485)
+     </P
+></LI
+><LI
+><P
+>      Fix possibly-invalid initial snapshot during logical decoding
+      (Petr Jelinek, Andres Freund)
+     </P
+><P
+>      The initial snapshot created for a logical decoding replication slot
+      was potentially incorrect.  This could cause third-party tools that
+      use logical decoding to copy incomplete/inconsistent initial data.
+      This was more likely to happen if the source server was busy at the
+      time of slot creation, or if another logical slot already existed.
+     </P
+><P
+>      If you are using a replication tool that depends on logical decoding,
+      and it should have copied a nonempty data set at the start of
+      replication, it is advisable to recreate the replica after
+      installing this update, or to verify its contents against the source
+      server.
+     </P
+></LI
+><LI
+><P
+>      Fix possible corruption of <SPAN
+CLASS="QUOTE"
+>"init forks"</SPAN
+> of unlogged indexes
+      (Robert Haas, Michael Paquier)
+     </P
+><P
+>      This could result in an unlogged index being set to an invalid state
+      after a crash and restart.  Such a problem would persist until the
+      index was dropped and rebuilt.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect reconstruction of <TT
+CLASS="STRUCTNAME"
+>pg_subtrans</TT
+> entries
+      when a standby server replays a prepared but uncommitted two-phase
+      transaction (Tom Lane)
+     </P
+><P
+>      In most cases this turned out to have no visible ill effects, but in
+      corner cases it could result in circular references
+      in <TT
+CLASS="STRUCTNAME"
+>pg_subtrans</TT
+>, potentially causing infinite loops
+      in queries that examine rows modified by the two-phase transaction.
+     </P
+></LI
+><LI
+><P
+>      Avoid possible crash in <SPAN
+CLASS="APPLICATION"
+>walsender</SPAN
+> due to failure
+      to initialize a string buffer (Stas Kelvich, Fujii Masao)
+     </P
+></LI
+><LI
+><P
+>      Fix postmaster's handling of <CODE
+CLASS="FUNCTION"
+>fork()</CODE
+> failure for a
+      background worker process (Tom Lane)
+     </P
+><P
+>      Previously, the postmaster updated portions of its state as though
+      the process had been launched successfully, resulting in subsequent
+      confusion.
+     </P
+></LI
+><LI
+><P
+>      Ensure parsing of queries in extension scripts sees the results of
+      immediately-preceding DDL (Julien Rouhaud, Tom Lane)
+     </P
+><P
+>      Due to lack of a cache flush step between commands in an extension
+      script file, non-utility queries might not see the effects of an
+      immediately preceding catalog change, such as <TT
+CLASS="COMMAND"
+>ALTER TABLE
+      ... RENAME</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Skip tablespace privilege checks when <TT
+CLASS="COMMAND"
+>ALTER TABLE ... ALTER
+      COLUMN TYPE</TT
+> rebuilds an existing index (Noah Misch)
+     </P
+><P
+>      The command failed if the calling user did not currently have
+      <TT
+CLASS="LITERAL"
+>CREATE</TT
+> privilege for the tablespace containing the index.
+      That behavior seems unhelpful, so skip the check, allowing the
+      index to be rebuilt where it is.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ALTER TABLE ... VALIDATE CONSTRAINT</TT
+> to not recurse
+      to child tables when the constraint is marked <TT
+CLASS="LITERAL"
+>NO INHERIT</TT
+>
+      (Amit Langote)
+     </P
+><P
+>      This fix prevents unwanted <SPAN
+CLASS="QUOTE"
+>"constraint does not exist"</SPAN
+> failures
+      when no matching constraint is present in the child tables.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> to account properly for pages that could not
+      be scanned due to conflicting page pins (Andrew Gierth)
+     </P
+><P
+>      This tended to lead to underestimation of the number of tuples in
+      the table.  In the worst case of a small heavily-contended
+      table, <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> could incorrectly report that the table
+      contained no tuples, leading to very bad planning choices.
+     </P
+></LI
+><LI
+><P
+>      Ensure that bulk-tuple-transfer loops within a hash join are
+      interruptible by query cancel requests (Tom Lane, Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix integer-overflow problems in <TT
+CLASS="TYPE"
+>interval</TT
+> comparison (Kyotaro
+      Horiguchi, Tom Lane)
+     </P
+><P
+>      The comparison operators for type <TT
+CLASS="TYPE"
+>interval</TT
+> could yield wrong
+      answers for intervals larger than about 296000 years.  Indexes on
+      columns containing such large values should be reindexed, since they
+      may be corrupt.
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>cursor_to_xml()</CODE
+> to produce valid output
+      with <TT
+CLASS="REPLACEABLE"
+><I
+>tableforest</I
+></TT
+> = false
+      (Thomas Munro, Peter Eisentraut)
+     </P
+><P
+>      Previously it failed to produce a wrapping <TT
+CLASS="LITERAL"
+>&lt;table&gt;</TT
+>
+      element.
+     </P
+></LI
+><LI
+><P
+>      Fix roundoff problems in <CODE
+CLASS="FUNCTION"
+>float8_timestamptz()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>make_interval()</CODE
+> (Tom Lane)
+     </P
+><P
+>      These functions truncated, rather than rounded, when converting a
+      floating-point value to integer microseconds; that could cause
+      unexpectedly off-by-one results.
+     </P
+></LI
+><LI
+><P
+>      Improve performance of <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+> view
+      (Tom Lane, David Rowley)
+     </P
+></LI
+><LI
+><P
+>      Reduce memory management overhead for contexts containing many large
+      blocks (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix sloppy handling of corner-case errors from <CODE
+CLASS="FUNCTION"
+>lseek()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>close()</CODE
+> (Tom Lane)
+     </P
+><P
+>      Neither of these system calls are likely to fail in typical situations,
+      but if they did, <TT
+CLASS="FILENAME"
+>fd.c</TT
+> could get quite confused.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect check for whether postmaster is running as a Windows
+      service (Michael Paquier)
+     </P
+><P
+>      This could result in attempting to write to the event log when that
+      isn't accessible, so that no logging happens at all.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> to support <TT
+CLASS="COMMAND"
+>COMMIT PREPARED</TT
+>
+      and <TT
+CLASS="COMMAND"
+>ROLLBACK PREPARED</TT
+> (Masahiko Sawada)
+     </P
+></LI
+><LI
+><P
+>      Fix a double-free error when processing dollar-quoted string literals
+      in <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> (Michael Meskes)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>, fix incorrect schema and owner marking for
+      comments and security labels of some types of database objects
+      (Giuseppe Broccolo, Tom Lane)
+     </P
+><P
+>      In simple cases this caused no ill effects; but for example, a
+      schema-selective restore might omit comments it should include, because
+      they were not marked as belonging to the schema of their associated
+      object.
+     </P
+></LI
+><LI
+><P
+>      Avoid emitting an invalid list file in <TT
+CLASS="LITERAL"
+>pg_restore -l</TT
+>
+      when SQL object names contain newlines (Tom Lane)
+     </P
+><P
+>      Replace newlines by spaces, which is sufficient to make the output
+      valid for <TT
+CLASS="LITERAL"
+>pg_restore -L</TT
+>'s purposes.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to transfer comments and security labels
+      attached to <SPAN
+CLASS="QUOTE"
+>"large objects"</SPAN
+> (blobs) (Stephen Frost)
+     </P
+><P
+>      Previously, blobs were correctly transferred to the new database, but
+      any comments or security labels attached to them were lost.
+     </P
+></LI
+><LI
+><P
+>      Improve error handling
+      in <TT
+CLASS="FILENAME"
+>contrib/adminpack</TT
+>'s <CODE
+CLASS="FUNCTION"
+>pg_file_write()</CODE
+>
+      function (Noah Misch)
+     </P
+><P
+>      Notably, it failed to detect errors reported
+      by <CODE
+CLASS="FUNCTION"
+>fclose()</CODE
+>.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+>, avoid leaking the previous unnamed
+      connection when establishing a new unnamed connection (Joe Conway)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/pg_trgm</TT
+>'s extraction of trigrams from regular
+      expressions (Tom Lane)
+     </P
+><P
+>      In some cases it would produce a broken data structure that could never
+      match anything, leading to GIN or GiST indexscans that use a trigram
+      index not finding any matches to the regular expression.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+>,
+      transmit query cancellation requests to the remote server
+      (Michael Paquier, Etsuro Fujita)
+     </P
+><P
+>      Previously, a local query cancellation request did not cause an
+      already-sent remote query to terminate early.  This is a back-patch
+      of work originally done for 9.6.
+     </P
+></LI
+><LI
+><P
+>      Support OpenSSL 1.1.0 (Heikki Linnakangas, Andreas Karlsson, Tom Lane)
+     </P
+><P
+>      This is a back-patch of work previously done in newer branches;
+      it's needed since many platforms are adopting newer OpenSSL versions.
+     </P
+></LI
+><LI
+><P
+>      Support Tcl 8.6 in MSVC builds (&Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Sync our copy of the timezone library with IANA release tzcode2017b
+      (Tom Lane)
+     </P
+><P
+>      This fixes a bug affecting some DST transitions in January 2038.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2017b
+      for DST law changes in Chile, Haiti, and Mongolia, plus historical
+      corrections for Ecuador, Kazakhstan, Liberia, and Spain.
+      Switch to numeric abbreviations for numerous time zones in South
+      America, the Pacific and Indian oceans, and some Asian and Middle
+      Eastern countries.
+     </P
+><P
+>      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+>
+      view nor used for output.
+     </P
+></LI
+><LI
+><P
+>      Use correct daylight-savings rules for POSIX-style time zone names
+      in MSVC builds (David Rowley)
+     </P
+><P
+>      The Microsoft MSVC build scripts neglected to install
+      the <TT
+CLASS="FILENAME"
+>posixrules</TT
+> file in the timezone directory tree.
+      This resulted in the timezone code falling back to its built-in
+      rule about what DST behavior to assume for a POSIX-style time zone
+      name.  For historical reasons that still corresponds to the DST rules
+      the USA was using before 2007 (i.e., change on first Sunday in April
+      and last Sunday in October).  With this fix, a POSIX-style zone name
+      will use the current and historical DST transition dates of
+      the <TT
+CLASS="LITERAL"
+>US/Eastern</TT
+> zone.  If you don't want that, remove
+      the <TT
+CLASS="FILENAME"
+>posixrules</TT
+> file, or replace it with a copy of some
+      other zone file (see <A
+HREF="datatype-datetime.html#DATATYPE-TIMEZONES"
+>Section 8.5.3</A
+>).  Note that
+      due to caching, you may need to restart the server to get such changes
+      to take effect.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-4-13.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-4-11.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.4.13</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.4.11</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-13.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-13.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-13.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-13.html	2017-08-07 21:32:43.000000000 +0000
@@ -0,0 +1,1028 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.4.13</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.5"
+HREF="release-9-5.html"><LINK
+REL="NEXT"
+TITLE="Release 9.4.12"
+HREF="release-9-4-12.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.5"
+HREF="release-9-5.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.4.12"
+HREF="release-9-4-12.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-4-13"
+>E.10. Release 9.4.13</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-08-10</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.4.12.
+   For information about new features in the 9.4 major release, see
+   <A
+HREF="release-9-4.html"
+>Section E.23</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN129113"
+>E.10.1. Migration to Version 9.4.13</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.4.X.
+   </P
+><P
+>    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.4.12,
+    see <A
+HREF="release-9-4-12.html"
+>Section E.11</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN129119"
+>E.10.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Further restrict visibility
+      of <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>.<TT
+CLASS="STRUCTFIELD"
+>umoptions</TT
+>, to
+      protect passwords stored as user mapping options
+      (Noah Misch)
+     </P
+><P
+>      The fix for CVE-2017-7486 was incorrect: it allowed a user
+      to see the options in her own user mapping, even if she did not
+      have <TT
+CLASS="LITERAL"
+>USAGE</TT
+> permission on the associated foreign server.
+      Such options might include a password that had been provided by the
+      server owner rather than the user herself.
+      Since <TT
+CLASS="STRUCTNAME"
+>information_schema.user_mapping_options</TT
+> does not
+      show the options in such cases, <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>
+      should not either.
+      (CVE-2017-7547)
+     </P
+><P
+>      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      you will need to do the following:
+     </P
+><DIV
+CLASS="PROCEDURE"
+><OL
+TYPE="1"
+><LI
+CLASS="STEP"
+><P
+>        Restart the postmaster after adding <TT
+CLASS="LITERAL"
+>allow_system_table_mods
+        = true</TT
+> to <TT
+CLASS="FILENAME"
+>postgresql.conf</TT
+>.  (In versions
+        supporting <TT
+CLASS="COMMAND"
+>ALTER SYSTEM</TT
+>, you can use that to make the
+        configuration change, but you'll still need a restart.)
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        In <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>each</I
+></SPAN
+> database of the cluster,
+        run the following commands as superuser:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SET search_path = pg_catalog;
+CREATE OR REPLACE VIEW pg_user_mappings AS
+    SELECT
+        U.oid       AS umid,
+        S.oid       AS srvid,
+        S.srvname   AS srvname,
+        U.umuser    AS umuser,
+        CASE WHEN U.umuser = 0 THEN
+            'public'
+        ELSE
+            A.rolname
+        END AS usename,
+        CASE WHEN (U.umuser &lt;&gt; 0 AND A.rolname = current_user
+                     AND (pg_has_role(S.srvowner, 'USAGE')
+                          OR has_server_privilege(S.oid, 'USAGE')))
+                    OR (U.umuser = 0 AND pg_has_role(S.srvowner, 'USAGE'))
+                    OR (SELECT rolsuper FROM pg_authid WHERE rolname = current_user)
+                    THEN U.umoptions
+                 ELSE NULL END AS umoptions
+    FROM pg_user_mapping U
+         LEFT JOIN pg_authid A ON (A.oid = U.umuser) JOIN
+        pg_foreign_server S ON (U.umserver = S.oid);</PRE
+><P>
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        Do not forget to include the <TT
+CLASS="LITERAL"
+>template0</TT
+>
+        and <TT
+CLASS="LITERAL"
+>template1</TT
+> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <TT
+CLASS="LITERAL"
+>template0</TT
+>,
+        you'll need to temporarily make it accept connections.
+        In <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> 9.5 and later, you can use
+</P><PRE
+CLASS="PROGRAMLISTING"
+>ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;</PRE
+><P>
+        and then after fixing <TT
+CLASS="LITERAL"
+>template0</TT
+>, undo that with
+</P><PRE
+CLASS="PROGRAMLISTING"
+>ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;</PRE
+><P>
+        In prior versions, instead use
+</P><PRE
+CLASS="PROGRAMLISTING"
+>UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
+UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';</PRE
+><P>
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        Finally, remove the <TT
+CLASS="LITERAL"
+>allow_system_table_mods</TT
+> configuration
+        setting, and again restart the postmaster.
+       </P
+></LI
+></OL
+></DIV
+></LI
+><LI
+><P
+>      Disallow empty passwords in all password-based authentication methods
+      (Heikki Linnakangas)
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> ignores empty password specifications, and does
+      not transmit them to the server.  So, if a user's password has been
+      set to the empty string, it's impossible to log in with that password
+      via <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+> or other <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>-based
+      clients.  An administrator might therefore believe that setting the
+      password to empty is equivalent to disabling password login.
+      However, with a modified or non-<SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>-based client,
+      logging in could be possible, depending on which authentication
+      method is configured.  In particular the most common
+      method, <TT
+CLASS="LITERAL"
+>md5</TT
+>, accepted empty passwords.
+      Change the server to reject empty passwords in all cases.
+      (CVE-2017-7546)
+     </P
+></LI
+><LI
+><P
+>      Make <CODE
+CLASS="FUNCTION"
+>lo_put()</CODE
+> check for <TT
+CLASS="LITERAL"
+>UPDATE</TT
+> privilege on
+      the target large object (Tom Lane, Michael Paquier)
+     </P
+><P
+>      <CODE
+CLASS="FUNCTION"
+>lo_put()</CODE
+> should surely require the same permissions
+      as <CODE
+CLASS="FUNCTION"
+>lowrite()</CODE
+>, but the check was missing, allowing any
+      user to change the data in a large object.
+      (CVE-2017-7548)
+     </P
+></LI
+><LI
+><P
+>      Fix concurrent locking of tuple update chains (&Aacute;lvaro Herrera)
+     </P
+><P
+>      If several sessions concurrently lock a tuple update chain with
+      nonconflicting lock modes using an old snapshot, and they all
+      succeed, it was possible for some of them to nonetheless fail (and
+      conclude there is no live tuple version) due to a race condition.
+      This had consequences such as foreign-key checks failing to see a
+      tuple that definitely exists but is being updated concurrently.
+     </P
+></LI
+><LI
+><P
+>      Fix potential data corruption when freezing a tuple whose XMAX is a
+      multixact with exactly one still-interesting member (Teodor Sigaev)
+     </P
+></LI
+><LI
+><P
+>      Avoid integer overflow and ensuing crash when sorting more than one
+      billion tuples in-memory (Sergey Koposov)
+     </P
+></LI
+><LI
+><P
+>      On Windows, retry process creation if we fail to reserve the address
+      range for our shared memory in the new process (Tom Lane, Amit
+      Kapila)
+     </P
+><P
+>      This is expected to fix infrequent child-process-launch failures that
+      are probably due to interference from antivirus products.
+     </P
+></LI
+><LI
+><P
+>      Fix low-probability corruption of shared predicate-lock hash table
+      in Windows builds (Thomas Munro, Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Avoid logging clean closure of an SSL connection as though
+      it were a connection reset (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Prevent sending SSL session tickets to clients (Tom Lane)
+     </P
+><P
+>      This fix prevents reconnection failures with ticket-aware client-side
+      SSL code.
+     </P
+></LI
+><LI
+><P
+>      Fix code for setting <A
+HREF="runtime-config-connection.html#GUC-TCP-KEEPALIVES-IDLE"
+>tcp_keepalives_idle</A
+> on
+      Solaris (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix statistics collector to honor inquiry messages issued just after
+      a postmaster shutdown and immediate restart (Tom Lane)
+     </P
+><P
+>      Statistics inquiries issued within half a second of the previous
+      postmaster shutdown were effectively ignored.
+     </P
+></LI
+><LI
+><P
+>      Ensure that the statistics collector's receive buffer size is at
+      least 100KB (Tom Lane)
+     </P
+><P
+>      This reduces the risk of dropped statistics data on older platforms
+      whose default receive buffer size is less than that.
+     </P
+></LI
+><LI
+><P
+>      Fix possible creation of an invalid WAL segment when a standby is
+      promoted just after it processes an <TT
+CLASS="LITERAL"
+>XLOG_SWITCH</TT
+> WAL
+      record (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>walsender</SPAN
+> to exit promptly when client requests
+      shutdown (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="SYSTEMITEM"
+>SIGHUP</SPAN
+> and <SPAN
+CLASS="SYSTEMITEM"
+>SIGUSR1</SPAN
+> handling in
+      walsender processes (Petr Jelinek, Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Prevent walsender-triggered panics during shutdown checkpoints
+      (Andres Freund, Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Fix unnecessarily slow restarts of <SPAN
+CLASS="APPLICATION"
+>walreceiver</SPAN
+>
+      processes due to race condition in postmaster (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix logical decoding failure with very wide tuples (Andres Freund)
+     </P
+><P
+>      Logical decoding crashed on tuples that are wider than 64KB (after
+      compression, but with all data in-line).  The case arises only
+      when <TT
+CLASS="LITERAL"
+>REPLICA IDENTITY FULL</TT
+> is enabled for a table
+      containing such tuples.
+     </P
+></LI
+><LI
+><P
+>      Fix leakage of small subtransactions spilled to disk during logical
+      decoding (Andres Freund)
+     </P
+><P
+>      This resulted in temporary files consuming excessive disk space.
+     </P
+></LI
+><LI
+><P
+>      Reduce the work needed to build snapshots during creation of
+      logical-decoding slots (Andres Freund, Petr Jelinek)
+     </P
+><P
+>      The previous algorithm was infeasibly expensive on a server with a
+      lot of open transactions.
+     </P
+></LI
+><LI
+><P
+>      Fix race condition that could indefinitely delay creation of
+      logical-decoding slots (Andres Freund, Petr Jelinek)
+     </P
+></LI
+><LI
+><P
+>      Reduce overhead in processing syscache invalidation events (Tom Lane)
+     </P
+><P
+>      This is particularly helpful for logical decoding, which triggers
+      frequent cache invalidation.
+     </P
+></LI
+><LI
+><P
+>      Fix cases where an <TT
+CLASS="COMMAND"
+>INSERT</TT
+> or <TT
+CLASS="COMMAND"
+>UPDATE</TT
+> assigns
+      to more than one element of a column that is of domain-over-array
+      type (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Allow window functions to be used in sub-<TT
+CLASS="LITERAL"
+>SELECT</TT
+>s that
+      are within the arguments of an aggregate function (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Move autogenerated array types out of the way during
+      <TT
+CLASS="COMMAND"
+>ALTER ... RENAME</TT
+> (Vik Fearing)
+     </P
+><P
+>      Previously, we would rename a conflicting autogenerated array type
+      out of the way during <TT
+CLASS="COMMAND"
+>CREATE</TT
+>; this fix extends that
+      behavior to renaming operations.
+     </P
+></LI
+><LI
+><P
+>      Ensure that <TT
+CLASS="COMMAND"
+>ALTER USER ... SET</TT
+> accepts all the syntax
+      variants that <TT
+CLASS="COMMAND"
+>ALTER ROLE ... SET</TT
+> does (Peter Eisentraut)
+     </P
+></LI
+><LI
+><P
+>      Properly update dependency info when changing a datatype I/O
+      function's argument or return type from <TT
+CLASS="TYPE"
+>opaque</TT
+> to the
+      correct type (Heikki Linnakangas)
+     </P
+><P
+>      <TT
+CLASS="COMMAND"
+>CREATE TYPE</TT
+> updates I/O functions declared in this
+      long-obsolete style, but it forgot to record a dependency on the
+      type, allowing a subsequent <TT
+CLASS="COMMAND"
+>DROP TYPE</TT
+> to leave broken
+      function definitions behind.
+     </P
+></LI
+><LI
+><P
+>      Reduce memory usage when <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+> processes
+      a <TT
+CLASS="TYPE"
+>tsvector</TT
+> column (Heikki Linnakangas)
+     </P
+></LI
+><LI
+><P
+>      Fix unnecessary precision loss and sloppy rounding when multiplying
+      or dividing <TT
+CLASS="TYPE"
+>money</TT
+> values by integers or floats (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Tighten checks for whitespace in functions that parse identifiers,
+      such as <CODE
+CLASS="FUNCTION"
+>regprocedurein()</CODE
+> (Tom Lane)
+     </P
+><P
+>      Depending on the prevailing locale, these functions could
+      misinterpret fragments of multibyte characters as whitespace.
+     </P
+></LI
+><LI
+><P
+>      Use relevant <TT
+CLASS="LITERAL"
+>#define</TT
+> symbols from Perl while
+      compiling <SPAN
+CLASS="APPLICATION"
+>PL/Perl</SPAN
+> (Ashutosh Sharma, Tom Lane)
+     </P
+><P
+>      This avoids portability problems, typically manifesting as
+      a <SPAN
+CLASS="QUOTE"
+>"handshake"</SPAN
+> mismatch during library load, when working with
+      recent Perl versions.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>, reset GSS/SASL and SSPI authentication
+      state properly after a failed connection attempt (Michael Paquier)
+     </P
+><P
+>      Failure to do this meant that when falling back from SSL to non-SSL
+      connections, a GSS/SASL failure in the SSL attempt would always cause
+      the non-SSL attempt to fail.  SSPI did not fail, but it leaked memory.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>, fix failure when <TT
+CLASS="COMMAND"
+>COPY FROM STDIN</TT
+>
+      is ended with a keyboard EOF signal and then another <TT
+CLASS="COMMAND"
+>COPY
+      FROM STDIN</TT
+> is attempted (Thomas Munro)
+     </P
+><P
+>      This misbehavior was observed on BSD-derived platforms (including
+      macOS), but not on most others.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> and <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> to
+      emit <TT
+CLASS="COMMAND"
+>REFRESH MATERIALIZED VIEW</TT
+> commands last (Tom Lane)
+     </P
+><P
+>      This prevents errors during dump/restore when a materialized view
+      refers to tables owned by a different user.
+     </P
+></LI
+><LI
+><P
+>      Improve <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>/<SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+>'s
+      reporting of error conditions originating in <SPAN
+CLASS="APPLICATION"
+>zlib</SPAN
+>
+      (Vladimir Kunschikov, &Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> with the <TT
+CLASS="OPTION"
+>--clean</TT
+> option to
+      drop event triggers as expected (Tom Lane)
+     </P
+><P
+>      It also now correctly assigns ownership of event triggers; before,
+      they were restored as being owned by the superuser running the
+      restore script.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> to not emit invalid SQL for an empty
+      operator class (Daniel Gustafsson)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> output to stdout on Windows (Kuntal Ghosh)
+     </P
+><P
+>      A compressed plain-text dump written to stdout would contain corrupt
+      data due to failure to put the file descriptor into binary mode.
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>pg_get_ruledef()</CODE
+> to print correct output for
+      the <TT
+CLASS="LITERAL"
+>ON SELECT</TT
+> rule of a view whose columns have been
+      renamed (Tom Lane)
+     </P
+><P
+>      In some corner cases, <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> relies
+      on <CODE
+CLASS="FUNCTION"
+>pg_get_ruledef()</CODE
+> to dump views, so that this error
+      could result in dump/reload failures.
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of outer joins with empty constraints, such as the result
+      of a <TT
+CLASS="LITERAL"
+>NATURAL LEFT JOIN</TT
+> with no common columns (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of function expressions in the <TT
+CLASS="LITERAL"
+>FROM</TT
+> clause in
+      cases where the expression does not deparse into something that looks
+      like a function call (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> output to stdout on Windows
+      (Haribabu Kommi)
+     </P
+><P
+>      A backup written to stdout would contain corrupt data due to failure
+      to put the file descriptor into binary mode.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to ensure that the ending WAL record
+      does not have <A
+HREF="runtime-config-wal.html#GUC-WAL-LEVEL"
+>wal_level</A
+> = <TT
+CLASS="LITERAL"
+>minimum</TT
+>
+      (Bruce Momjian)
+     </P
+><P
+>      This condition could prevent upgraded standby servers from
+      reconnecting.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>postgres_fdw</TT
+>, re-establish connections to remote
+      servers after <TT
+CLASS="COMMAND"
+>ALTER SERVER</TT
+> or <TT
+CLASS="COMMAND"
+>ALTER USER
+      MAPPING</TT
+> commands (Kyotaro Horiguchi)
+     </P
+><P
+>      This ensures that option changes affecting connection parameters will
+      be applied promptly.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>postgres_fdw</TT
+>, allow cancellation of remote
+      transaction control commands (Robert Haas, Rafia Sabih)
+     </P
+><P
+>      This change allows us to quickly escape a wait for an unresponsive
+      remote server in many more cases than previously.
+     </P
+></LI
+><LI
+><P
+>      Increase <TT
+CLASS="LITERAL"
+>MAX_SYSCACHE_CALLBACKS</TT
+> to provide more room for
+      extensions (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Always use <TT
+CLASS="OPTION"
+>-fPIC</TT
+>, not <TT
+CLASS="OPTION"
+>-fpic</TT
+>, when building
+      shared libraries with gcc (Tom Lane)
+     </P
+><P
+>      This supports larger extension libraries on platforms where it makes
+      a difference.
+     </P
+></LI
+><LI
+><P
+>      Fix unescaped-braces issue in our build scripts for Microsoft MSVC,
+      to avoid a warning or error from recent Perl versions (Andrew
+      Dunstan)
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, handle the case where the <SPAN
+CLASS="APPLICATION"
+>openssl</SPAN
+>
+      library is not within a <TT
+CLASS="FILENAME"
+>VC</TT
+> subdirectory (Andrew Dunstan)
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, add proper include path for <SPAN
+CLASS="APPLICATION"
+>libxml2</SPAN
+>
+      header files (Andrew Dunstan)
+     </P
+><P
+>      This fixes a former need to move things around in standard Windows
+      installations of <SPAN
+CLASS="APPLICATION"
+>libxml2</SPAN
+>.
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, recognize a Tcl library that is
+      named <TT
+CLASS="FILENAME"
+>tcl86.lib</TT
+> (Noah Misch)
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, honor <TT
+CLASS="LITERAL"
+>PROVE_FLAGS</TT
+> settings
+      on <TT
+CLASS="FILENAME"
+>vcregress.pl</TT
+>'s command line (Andrew Dunstan)
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-5.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-4-12.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.5</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.4.12</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-1.html	2016-03-28 20:21:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-1.html	2017-08-07 21:32:44.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-4-1"
->E.10. Release 9.4.1</A
+>E.22. Release 9.4.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-02-05</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.4.0.
    For information about new features in the 9.4 major release, see
    <A
 HREF="release-9-4.html"
->Section E.11</A
+>Section E.23</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128453"
->E.10.1. Migration to Version 9.4.1</A
+NAME="AEN131227"
+>E.22.1. Migration to Version 9.4.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.4.X.
@@ -158,8 +155,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128463"
->E.10.2. Changes</A
+NAME="AEN131237"
+>E.22.2. Changes</A
 ></H2
 ><P
 ></P
@@ -588,7 +585,7 @@
 ></LI
 ><LI
 ><P
->      Warn if OS X's <CODE
+>      Warn if macOS's <CODE
 CLASS="FUNCTION"
 >setlocale()</CODE
 > starts an unwanted extra
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-2.html	2016-03-28 20:21:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-2.html	2017-08-07 21:32:44.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-4-2"
->E.9. Release 9.4.2</A
+>E.21. Release 9.4.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-05-22</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.4.1.
    For information about new features in the 9.4 major release, see
    <A
 HREF="release-9-4.html"
->Section E.11</A
+>Section E.23</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128197"
->E.9.1. Migration to Version 9.4.2</A
+NAME="AEN130971"
+>E.21.1. Migration to Version 9.4.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.4.X.
@@ -139,7 +136,7 @@
 >    Also, if you are upgrading from a version earlier than 9.4.1,
     see <A
 HREF="release-9-4-1.html"
->Section E.10</A
+>Section E.22</A
 >.
    </P
 ></DIV
@@ -148,8 +145,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128205"
->E.9.2. Changes</A
+NAME="AEN130979"
+>E.21.2. Changes</A
 ></H2
 ><P
 ></P
@@ -976,7 +973,7 @@
 ></LI
 ><LI
 ><P
->      Silence some build warnings on OS X (Tom Lane)
+>      Silence some build warnings on macOS (Tom Lane)
      </P
 ></LI
 ><LI
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-3.html	2016-03-28 20:21:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-3.html	2017-08-07 21:32:43.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-4-3"
->E.8. Release 9.4.3</A
+>E.20. Release 9.4.3</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-06-04</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.4.2.
    For information about new features in the 9.4 major release, see
    <A
 HREF="release-9-4.html"
->Section E.11</A
+>Section E.23</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128159"
->E.8.1. Migration to Version 9.4.3</A
+NAME="AEN130933"
+>E.20.1. Migration to Version 9.4.3</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.4.2,
     see <A
 HREF="release-9-4-2.html"
->Section E.9</A
+>Section E.21</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128164"
->E.8.2. Changes</A
+NAME="AEN130938"
+>E.20.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-4.html	2016-03-28 20:21:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-4.html	2017-08-07 21:32:43.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-4-4"
->E.7. Release 9.4.4</A
+>E.19. Release 9.4.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-06-12</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a small number of fixes from 9.4.3.
    For information about new features in the 9.4 major release, see
    <A
 HREF="release-9-4.html"
->Section E.11</A
+>Section E.23</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128099"
->E.7.1. Migration to Version 9.4.4</A
+NAME="AEN130873"
+>E.19.1. Migration to Version 9.4.4</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.4.X.
@@ -136,7 +133,7 @@
 >    Also, if you are upgrading from a version earlier than 9.4.2,
     see <A
 HREF="release-9-4-2.html"
->Section E.9</A
+>Section E.21</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128106"
->E.7.2. Changes</A
+NAME="AEN130880"
+>E.19.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-5.html	2016-03-28 20:21:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-5.html	2017-08-07 21:32:43.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-4-5"
->E.6. Release 9.4.5</A
+>E.18. Release 9.4.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2015-10-08</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.4.4.
    For information about new features in the 9.4 major release, see
    <A
 HREF="release-9-4.html"
->Section E.11</A
+>Section E.23</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN127814"
->E.6.1. Migration to Version 9.4.5</A
+NAME="AEN130588"
+>E.18.1. Migration to Version 9.4.5</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.4.4,
     see <A
 HREF="release-9-4-4.html"
->Section E.7</A
+>Section E.19</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN127819"
->E.6.2. Changes</A
+NAME="AEN130593"
+>E.18.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-6.html	2016-03-28 20:21:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-6.html	2017-08-07 21:32:43.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-4-6"
->E.5. Release 9.4.6</A
+>E.17. Release 9.4.6</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-02-11</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.4.5.
    For information about new features in the 9.4 major release, see
    <A
 HREF="release-9-4.html"
->Section E.11</A
+>Section E.23</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN127542"
->E.5.1. Migration to Version 9.4.6</A
+NAME="AEN130316"
+>E.17.1. Migration to Version 9.4.6</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.4.X.
@@ -136,7 +133,7 @@
 >    Also, if you are upgrading from a version earlier than 9.4.4,
     see <A
 HREF="release-9-4-4.html"
->Section E.7</A
+>Section E.19</A
 >.
    </P
 ></DIV
@@ -145,8 +142,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN127549"
->E.5.2. Changes</A
+NAME="AEN130323"
+>E.17.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-7.html	2016-03-28 20:21:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-7.html	2017-08-07 21:32:43.000000000 +0000
@@ -9,14 +9,14 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
 HREF="release.html"><LINK
 REL="PREVIOUS"
-TITLE="Release 9.5"
-HREF="release-9-5.html"><LINK
+TITLE="Release 9.4.8"
+HREF="release-9-4-8.html"><LINK
 REL="NEXT"
 TITLE="Release 9.4.6"
 HREF="release-9-4-6.html"><LINK
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -53,8 +53,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="Release 9.5"
-HREF="release-9-5.html"
+TITLE="Release 9.4.8"
+HREF="release-9-4-8.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-4-7"
->E.4. Release 9.4.7</A
+>E.16. Release 9.4.7</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-03-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.4.6.
    For information about new features in the 9.4 major release, see
    <A
 HREF="release-9-4.html"
->Section E.11</A
+>Section E.23</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN127434"
->E.4.1. Migration to Version 9.4.7</A
+NAME="AEN130208"
+>E.16.1. Migration to Version 9.4.7</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.4.X.
@@ -128,7 +125,7 @@
 >    However, if you are upgrading from a version earlier than 9.4.6,
     see <A
 HREF="release-9-4-6.html"
->Section E.5</A
+>Section E.17</A
 >.
    </P
 ></DIV
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN127439"
->E.4.2. Changes</A
+NAME="AEN130213"
+>E.16.2. Changes</A
 ></H2
 ><P
 ></P
@@ -302,7 +299,7 @@
      </P
 ><P
 >      This dodges a portability problem on FreeBSD-derived platforms
-      (including OS X).
+      (including macOS).
      </P
 ></LI
 ><LI
@@ -474,7 +471,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="release-9-5.html"
+HREF="release-9-4-8.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -502,7 +499,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Release 9.5</TD
+>Release 9.4.8</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-8.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-8.html	2017-08-07 21:32:43.000000000 +0000
@@ -0,0 +1,526 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.4.8</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.4.9"
+HREF="release-9-4-9.html"><LINK
+REL="NEXT"
+TITLE="Release 9.4.7"
+HREF="release-9-4-7.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.4.9"
+HREF="release-9-4-9.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.4.7"
+HREF="release-9-4-7.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-4-8"
+>E.15. Release 9.4.8</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-05-12</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.4.7.
+   For information about new features in the 9.4 major release, see
+   <A
+HREF="release-9-4.html"
+>Section E.23</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN130104"
+>E.15.1. Migration to Version 9.4.8</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.4.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.4.6,
+    see <A
+HREF="release-9-4-6.html"
+>Section E.17</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN130109"
+>E.15.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      afterwards (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </P
+><P
+>      This change prevents problems when there are multiple connections
+      using OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      Failures have been reported specifically when a client application
+      uses SSL connections in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> concurrently with
+      SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
+      It's possible for similar problems to arise within the server as well,
+      if an extension module establishes an outgoing SSL connection.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="QUOTE"
+>"failed to build any <TT
+CLASS="REPLACEABLE"
+><I
+>N</I
+></TT
+>-way joins"</SPAN
+>
+      planner error with a full join enclosed in the right-hand side of a
+      left join (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect handling of equivalence-class tests in multilevel
+      nestloop plans (Tom Lane)
+     </P
+><P
+>      Given a three-or-more-way equivalence class of variables, such
+      as <TT
+CLASS="LITERAL"
+>X.X = Y.Y = Z.Z</TT
+>, it was possible for the planner to omit
+      some of the tests needed to enforce that all the variables are actually
+      equal, leading to join rows being output that didn't satisfy
+      the <TT
+CLASS="LITERAL"
+>WHERE</TT
+> clauses.  For various reasons, erroneous plans
+      were seldom selected in practice, so that this bug has gone undetected
+      for a long time.
+     </P
+></LI
+><LI
+><P
+>      Fix query-lifespan memory leak in GIN index scans (Julien Rouhaud)
+     </P
+></LI
+><LI
+><P
+>      Fix query-lifespan memory leak and potential index corruption hazard in
+      GIN index insertion (Tom Lane)
+     </P
+><P
+>      The memory leak would typically not amount to much in simple queries,
+      but it could be very substantial during a large GIN index build with
+      high <TT
+CLASS="VARNAME"
+>maintenance_work_mem</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix possible misbehavior of <TT
+CLASS="LITERAL"
+>TH</TT
+>, <TT
+CLASS="LITERAL"
+>th</TT
+>,
+      and <TT
+CLASS="LITERAL"
+>Y,YYY</TT
+> format codes in <CODE
+CLASS="FUNCTION"
+>to_timestamp()</CODE
+>
+      (Tom Lane)
+     </P
+><P
+>      These could advance off the end of the input string, causing subsequent
+      format codes to read garbage.
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of rules and views in which the <TT
+CLASS="REPLACEABLE"
+><I
+>array</I
+></TT
+>
+      argument of a <TT
+CLASS="LITERAL"
+><TT
+CLASS="REPLACEABLE"
+><I
+>value</I
+></TT
+> <TT
+CLASS="REPLACEABLE"
+><I
+>operator</I
+></TT
+>
+      ANY (<TT
+CLASS="REPLACEABLE"
+><I
+>array</I
+></TT
+>)</TT
+> construct is a sub-SELECT
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Disallow newlines in <TT
+CLASS="COMMAND"
+>ALTER SYSTEM</TT
+> parameter values
+      (Tom Lane)
+     </P
+><P
+>      The configuration-file parser doesn't support embedded newlines in
+      string literals, so we mustn't allow them in values to be inserted
+      by <TT
+CLASS="COMMAND"
+>ALTER SYSTEM</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ALTER TABLE ... REPLICA IDENTITY USING INDEX</TT
+> to
+      work properly if an index on OID is selected (David Rowley)
+     </P
+></LI
+><LI
+><P
+>      Fix crash in logical decoding on alignment-picky platforms (Tom Lane,
+      Andres Freund)
+     </P
+><P
+>      The failure occurred only with a transaction large enough to spill to
+      disk and a primary-key change within that transaction.
+     </P
+></LI
+><LI
+><P
+>      Avoid repeated requests for feedback from receiver while shutting down
+      walsender (Nick Cleaton)
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_regress</SPAN
+> use a startup timeout from the
+      <TT
+CLASS="ENVAR"
+>PGCTLTIMEOUT</TT
+> environment variable, if that's set (Tom Lane)
+     </P
+><P
+>      This is for consistency with a behavior recently added
+      to <SPAN
+CLASS="APPLICATION"
+>pg_ctl</SPAN
+>; it eases automated testing on slow machines.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to correctly restore extension
+      membership for operator families containing only one operator class
+      (Tom Lane)
+     </P
+><P
+>      In such a case, the operator family was restored into the new database,
+      but it was no longer marked as part of the extension.  This had no
+      immediate ill effects, but would cause later <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      runs to emit output that would cause (harmless) errors on restore.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to not fail when new-cluster TOAST rules
+      differ from old (Tom Lane)
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> had special-case code to handle the
+      situation where the new <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> version thinks that
+      a table should have a TOAST table while the old version did not.  That
+      code was broken, so remove it, and instead do nothing in such cases;
+      there seems no reason to believe that we can't get along fine without
+      a TOAST table if that was okay according to the old version's rules.
+     </P
+></LI
+><LI
+><P
+>      Reduce the number of SysV semaphores used by a build configured with
+      <TT
+CLASS="OPTION"
+>--disable-spinlocks</TT
+> (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Rename internal function <CODE
+CLASS="FUNCTION"
+>strtoi()</CODE
+>
+      to <CODE
+CLASS="FUNCTION"
+>strtoint()</CODE
+> to avoid conflict with a NetBSD library
+      function (Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix reporting of errors from <CODE
+CLASS="FUNCTION"
+>bind()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>listen()</CODE
+> system calls on Windows (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Reduce verbosity of compiler output when building with Microsoft Visual
+      Studio (Christian Ullrich)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>putenv()</CODE
+> to work properly with Visual Studio 2013
+      (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Avoid possibly-unsafe use of Windows' <CODE
+CLASS="FUNCTION"
+>FormatMessage()</CODE
+>
+      function (Christian Ullrich)
+     </P
+><P
+>      Use the <TT
+CLASS="LITERAL"
+>FORMAT_MESSAGE_IGNORE_INSERTS</TT
+> flag where
+      appropriate.  No live bug is known to exist here, but it seems like a
+      good idea to be careful.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016d
+      for DST law changes in Russia and Venezuela.  There are new zone
+      names <TT
+CLASS="LITERAL"
+>Europe/Kirov</TT
+> and <TT
+CLASS="LITERAL"
+>Asia/Tomsk</TT
+> to reflect
+      the fact that these regions now have different time zone histories from
+      adjacent regions.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-4-9.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-4-7.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.4.9</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.4.7</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-9.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-9.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4-9.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4-9.html	2017-08-07 21:32:43.000000000 +0000
@@ -0,0 +1,854 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.4.9</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.4.10"
+HREF="release-9-4-10.html"><LINK
+REL="NEXT"
+TITLE="Release 9.4.8"
+HREF="release-9-4-8.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.4.10"
+HREF="release-9-4-10.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.4.8"
+HREF="release-9-4-8.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-4-9"
+>E.14. Release 9.4.9</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-08-11</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.4.8.
+   For information about new features in the 9.4 major release, see
+   <A
+HREF="release-9-4.html"
+>Section E.23</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN129906"
+>E.14.1. Migration to Version 9.4.9</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.4.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.4.6,
+    see <A
+HREF="release-9-4-6.html"
+>Section E.17</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN129911"
+>E.14.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix possible mis-evaluation of
+      nested <TT
+CLASS="LITERAL"
+>CASE</TT
+>-<TT
+CLASS="LITERAL"
+>WHEN</TT
+> expressions (Heikki
+      Linnakangas, Michael Paquier, Tom Lane)
+     </P
+><P
+>      A <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression appearing within the test value
+      subexpression of another <TT
+CLASS="LITERAL"
+>CASE</TT
+> could become confused about
+      whether its own test value was null or not.  Also, inlining of a SQL
+      function implementing the equality operator used by
+      a <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression could result in passing the wrong test
+      value to functions called within a <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression in the
+      SQL function's body.  If the test values were of different data
+      types, a crash might result; moreover such situations could be abused
+      to allow disclosure of portions of server memory.  (CVE-2016-5423)
+     </P
+></LI
+><LI
+><P
+>      Fix client programs' handling of special characters in database and
+      role names (Noah Misch, Nathan Bossart, Michael Paquier)
+     </P
+><P
+>      Numerous places in <SPAN
+CLASS="APPLICATION"
+>vacuumdb</SPAN
+> and other client programs
+      could become confused by database and role names containing double
+      quotes or backslashes.  Tighten up quoting rules to make that safe.
+      Also, ensure that when a conninfo string is used as a database name
+      parameter to these programs, it is correctly treated as such throughout.
+     </P
+><P
+>      Fix handling of paired double quotes
+      in <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s <TT
+CLASS="COMMAND"
+>\connect</TT
+>
+      and <TT
+CLASS="COMMAND"
+>\password</TT
+> commands to match the documentation.
+     </P
+><P
+>      Introduce a new <TT
+CLASS="OPTION"
+>-reuse-previous</TT
+> option
+      in <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s <TT
+CLASS="COMMAND"
+>\connect</TT
+> command to allow
+      explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether
+      the database name looks like a conninfo string, as before.)  This
+      allows secure handling of database names containing special
+      characters in <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> scripts.
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> now refuses to deal with database and role
+      names containing carriage returns or newlines, as it seems impractical
+      to quote those characters safely on Windows.  In future we may reject
+      such names on the server side, but that step has not been taken yet.
+     </P
+><P
+>      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute
+      commands with superuser privileges the next time a superuser
+      executes <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> or other routine maintenance
+      operations.  (CVE-2016-5424)
+     </P
+></LI
+><LI
+><P
+>      Fix corner-case misbehaviors for <TT
+CLASS="LITERAL"
+>IS NULL</TT
+>/<TT
+CLASS="LITERAL"
+>IS NOT
+      NULL</TT
+> applied to nested composite values (Andrew Gierth, Tom Lane)
+     </P
+><P
+>      The SQL standard specifies that <TT
+CLASS="LITERAL"
+>IS NULL</TT
+> should return
+      TRUE for a row of all null values (thus <TT
+CLASS="LITERAL"
+>ROW(NULL,NULL) IS
+      NULL</TT
+> yields TRUE), but this is not meant to apply recursively
+      (thus <TT
+CLASS="LITERAL"
+>ROW(NULL, ROW(NULL,NULL)) IS NULL</TT
+> yields FALSE).
+      The core executor got this right, but certain planner optimizations
+      treated the test as recursive (thus producing TRUE in both cases),
+      and <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+> could produce remote queries
+      that misbehaved similarly.
+     </P
+></LI
+><LI
+><P
+>      Make the <TT
+CLASS="TYPE"
+>inet</TT
+> and <TT
+CLASS="TYPE"
+>cidr</TT
+> data types properly reject
+      IPv6 addresses with too many colon-separated fields (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Prevent crash in <CODE
+CLASS="FUNCTION"
+>close_ps()</CODE
+>
+      (the <TT
+CLASS="TYPE"
+>point</TT
+> <TT
+CLASS="LITERAL"
+>##</TT
+> <TT
+CLASS="TYPE"
+>lseg</TT
+> operator)
+      for NaN input coordinates (Tom Lane)
+     </P
+><P
+>      Make it return NULL instead of crashing.
+     </P
+></LI
+><LI
+><P
+>      Avoid possible crash in <CODE
+CLASS="FUNCTION"
+>pg_get_expr()</CODE
+> when inconsistent
+      values are passed to it (Michael Paquier, Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix several one-byte buffer over-reads in <CODE
+CLASS="FUNCTION"
+>to_number()</CODE
+>
+      (Peter Eisentraut)
+     </P
+><P
+>      In several cases the <CODE
+CLASS="FUNCTION"
+>to_number()</CODE
+> function would read one
+      more character than it should from the input string.  There is a
+      small chance of a crash, if the input happens to be adjacent to the
+      end of memory.
+     </P
+></LI
+><LI
+><P
+>      Do not run the planner on the query contained in <TT
+CLASS="LITERAL"
+>CREATE
+      MATERIALIZED VIEW</TT
+> or <TT
+CLASS="LITERAL"
+>CREATE TABLE AS</TT
+>
+      when <TT
+CLASS="LITERAL"
+>WITH NO DATA</TT
+> is specified (Michael Paquier,
+      Tom Lane)
+     </P
+><P
+>      This avoids some unnecessary failure conditions, for example if a
+      stable function invoked by the materialized view depends on a table
+      that doesn't exist yet.
+     </P
+></LI
+><LI
+><P
+>      Avoid unsafe intermediate state during expensive paths
+      through <CODE
+CLASS="FUNCTION"
+>heap_update()</CODE
+> (Masahiko Sawada, Andres Freund)
+     </P
+><P
+>      Previously, these cases locked the target tuple (by setting its XMAX)
+      but did not WAL-log that action, thus risking data integrity problems
+      if the page were spilled to disk and then a database crash occurred
+      before the tuple update could be completed.
+     </P
+></LI
+><LI
+><P
+>      Fix hint bit update during WAL replay of row locking operations
+      (Andres Freund)
+     </P
+><P
+>      The only known consequence of this problem is that row locks held by
+      a prepared, but uncommitted, transaction might fail to be enforced
+      after a crash and restart.
+     </P
+></LI
+><LI
+><P
+>      Avoid unnecessary <SPAN
+CLASS="QUOTE"
+>"could not serialize access"</SPAN
+> errors when
+      acquiring <TT
+CLASS="LITERAL"
+>FOR KEY SHARE</TT
+> row locks in serializable mode
+      (&Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Avoid crash in <TT
+CLASS="LITERAL"
+>postgres -C</TT
+> when the specified variable
+      has a null string value (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Fix possible loss of large subtransactions in logical decoding
+      (Petru-Florin Mihancea)
+     </P
+></LI
+><LI
+><P
+>      Fix failure of logical decoding when a subtransaction contains no
+      actual changes (Marko Tiikkaja, Andrew Gierth)
+     </P
+></LI
+><LI
+><P
+>      Ensure that backends see up-to-date statistics for shared catalogs
+      (Tom Lane)
+     </P
+><P
+>      The statistics collector failed to update the statistics file for
+      shared catalogs after a request from a regular backend.  This problem
+      was partially masked because the autovacuum launcher regularly makes
+      requests that did cause such updates; however, it became obvious with
+      autovacuum disabled.
+     </P
+></LI
+><LI
+><P
+>      Avoid redundant writes of the statistics files when multiple
+      backends request updates close together (Tom Lane, Tomas Vondra)
+     </P
+></LI
+><LI
+><P
+>      Avoid consuming a transaction ID during <TT
+CLASS="COMMAND"
+>VACUUM</TT
+>
+      (Alexander Korotkov)
+     </P
+><P
+>      Some cases in <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> unnecessarily caused an XID to be
+      assigned to the current transaction.  Normally this is negligible,
+      but if one is up against the XID wraparound limit, consuming more
+      XIDs during anti-wraparound vacuums is a very bad thing.
+     </P
+></LI
+><LI
+><P
+>      Avoid canceling hot-standby queries during <TT
+CLASS="COMMAND"
+>VACUUM FREEZE</TT
+>
+      (Simon Riggs, &Aacute;lvaro Herrera)
+     </P
+><P
+>      <TT
+CLASS="COMMAND"
+>VACUUM FREEZE</TT
+> on an otherwise-idle master server could
+      result in unnecessary cancellations of queries on its standby
+      servers.
+     </P
+></LI
+><LI
+><P
+>      Prevent possible failure when vacuuming multixact IDs in an
+      installation that has been pg_upgrade'd from pre-9.3 (Andrew Gierth,
+      &Aacute;lvaro Herrera)
+     </P
+><P
+>      The usual symptom of this bug is errors
+      like <SPAN
+CLASS="QUOTE"
+>"MultiXactId <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+> has not been created
+      yet -- apparent wraparound"</SPAN
+>.
+     </P
+></LI
+><LI
+><P
+>      When a manual <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+> specifies a column list, don't
+      reset the table's <TT
+CLASS="LITERAL"
+>changes_since_analyze</TT
+> counter
+      (Tom Lane)
+     </P
+><P
+>      If we're only analyzing some columns, we should not prevent routine
+      auto-analyze from happening for the other columns.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+>'s overestimation of <TT
+CLASS="LITERAL"
+>n_distinct</TT
+>
+      for a unique or nearly-unique column with many null entries (Tom
+      Lane)
+     </P
+><P
+>      The nulls could get counted as though they were themselves distinct
+      values, leading to serious planner misestimates in some types of
+      queries.
+     </P
+></LI
+><LI
+><P
+>      Prevent autovacuum from starting multiple workers for the same shared
+      catalog (&Aacute;lvaro Herrera)
+     </P
+><P
+>      Normally this isn't much of a problem because the vacuum doesn't take
+      long anyway; but in the case of a severely bloated catalog, it could
+      result in all but one worker uselessly waiting instead of doing
+      useful work on other tables.
+     </P
+></LI
+><LI
+><P
+>      Avoid duplicate buffer lock release when abandoning a b-tree index
+      page deletion attempt (Tom Lane)
+     </P
+><P
+>      This mistake prevented <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> from completing in some
+      cases involving corrupt b-tree indexes.
+     </P
+></LI
+><LI
+><P
+>      Prevent infinite loop in GiST index build for geometric columns
+      containing NaN component values (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/btree_gin</TT
+> to handle the smallest
+      possible <TT
+CLASS="TYPE"
+>bigint</TT
+> value correctly (Peter Eisentraut)
+     </P
+></LI
+><LI
+><P
+>      Teach libpq to correctly decode server version from future servers
+      (Peter Eisentraut)
+     </P
+><P
+>      It's planned to switch to two-part instead of three-part server
+      version numbers for releases after 9.6.  Make sure
+      that <CODE
+CLASS="FUNCTION"
+>PQserverVersion()</CODE
+> returns the correct value for
+      such cases.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+>'s code for <TT
+CLASS="LITERAL"
+>unsigned long long</TT
+>
+      array elements (Michael Meskes)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> with both <TT
+CLASS="OPTION"
+>-c</TT
+> and <TT
+CLASS="OPTION"
+>-C</TT
+>
+      options, avoid emitting an unwanted <TT
+CLASS="LITERAL"
+>CREATE SCHEMA public</TT
+>
+      command (David Johnston, Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Improve handling of <SPAN
+CLASS="SYSTEMITEM"
+>SIGTERM</SPAN
+>/control-C in
+      parallel <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> and <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> (Tom
+      Lane)
+     </P
+><P
+>      Make sure that the worker processes will exit promptly, and also arrange
+      to send query-cancel requests to the connected backends, in case they
+      are doing something long-running such as a <TT
+CLASS="COMMAND"
+>CREATE INDEX</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix error reporting in parallel <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      and <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> (Tom Lane)
+     </P
+><P
+>      Previously, errors reported by <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      or <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> worker processes might never make it to
+      the user's console, because the messages went through the master
+      process, and there were various deadlock scenarios that would prevent
+      the master process from passing on the messages.  Instead, just print
+      everything to <TT
+CLASS="LITERAL"
+>stderr</TT
+>.  In some cases this will result in
+      duplicate messages (for instance, if all the workers report a server
+      shutdown), but that seems better than no message.
+     </P
+></LI
+><LI
+><P
+>      Ensure that parallel <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      or <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> on Windows will shut down properly
+      after an error (Kyotaro Horiguchi)
+     </P
+><P
+>      Previously, it would report the error, but then just sit until
+      manually stopped by the user.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> behave better when built without zlib
+      support (Kyotaro Horiguchi)
+     </P
+><P
+>      It didn't work right for parallel dumps, and emitted some rather
+      pointless warnings in other cases.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> accept <TT
+CLASS="LITERAL"
+>-Z 0</TT
+> as
+      specifying no compression (Fujii Masao)
+     </P
+></LI
+><LI
+><P
+>      Fix makefiles' rule for building AIX shared libraries to be safe for
+      parallel make (Noah Misch)
+     </P
+></LI
+><LI
+><P
+>      Fix TAP tests and MSVC scripts to work when build directory's path
+      name contains spaces (Michael Paquier, Kyotaro Horiguchi)
+     </P
+></LI
+><LI
+><P
+>      Be more predictable about reporting <SPAN
+CLASS="QUOTE"
+>"statement timeout"</SPAN
+>
+      versus <SPAN
+CLASS="QUOTE"
+>"lock timeout"</SPAN
+> (Tom Lane)
+     </P
+><P
+>      On heavily loaded machines, the regression tests sometimes failed due
+      to reporting <SPAN
+CLASS="QUOTE"
+>"lock timeout"</SPAN
+> even though the statement timeout
+      should have occurred first.
+     </P
+></LI
+><LI
+><P
+>      Make regression tests safe for Danish and Welsh locales (Jeff Janes,
+      Tom Lane)
+     </P
+><P
+>      Change some test data that triggered the unusual sorting rules of
+      these locales.
+     </P
+></LI
+><LI
+><P
+>      Update our copy of the timezone code to match
+      IANA's <SPAN
+CLASS="APPLICATION"
+>tzcode</SPAN
+> release 2016c (Tom Lane)
+     </P
+><P
+>      This is needed to cope with anticipated future changes in the time
+      zone data files.  It also fixes some corner-case bugs in coping with
+      unusual time zones.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016f
+      for DST law changes in Kemerovo and Novosibirsk, plus historical
+      corrections for Azerbaijan, Belarus, and Morocco.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-4-10.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-4-8.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.4.10</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.4.8</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-4.html	2016-03-28 20:21:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-4.html	2017-08-07 21:32:44.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -18,15 +18,15 @@
 TITLE="Release 9.4.1"
 HREF="release-9-4-1.html"><LINK
 REL="NEXT"
-TITLE="Release 9.3.12"
-HREF="release-9-3-12.html"><LINK
+TITLE="Release 9.3.18"
+HREF="release-9-3-18.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="Release 9.3.12"
-HREF="release-9-3-12.html"
+TITLE="Release 9.3.18"
+HREF="release-9-3-18.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-4"
->E.11. Release 9.4</A
+>E.23. Release 9.4</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2014-12-18</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128648"
->E.11.1. Overview</A
+NAME="AEN131422"
+>E.23.1. Overview</A
 ></H2
 ><P
 >    Major enhancements in <SPAN
@@ -199,8 +196,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128676"
->E.11.2. Migration to Version 9.4</A
+NAME="AEN131450"
+>E.23.2. Migration to Version 9.4</A
 ></H2
 ><P
 >    A dump/restore using <A
@@ -740,8 +737,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128828"
->E.11.3. Changes</A
+NAME="AEN131602"
+>E.23.3. Changes</A
 ></H2
 ><P
 >    Below you will find a detailed account of the changes between
@@ -756,8 +753,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN128832"
->E.11.3.1. Server</A
+NAME="AEN131606"
+>E.23.3.1. Server</A
 ></H3
 ><P
 ></P
@@ -839,8 +836,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN128856"
->E.11.3.1.1. Indexes</A
+NAME="AEN131630"
+>E.23.3.1.1. Indexes</A
 ></H4
 ><P
 ></P
@@ -938,8 +935,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN128885"
->E.11.3.1.2. General Performance</A
+NAME="AEN131659"
+>E.23.3.1.2. General Performance</A
 ></H4
 ><P
 ></P
@@ -1107,8 +1104,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN128938"
->E.11.3.1.3. Monitoring</A
+NAME="AEN131712"
+>E.23.3.1.3. Monitoring</A
 ></H4
 ><P
 ></P
@@ -1180,8 +1177,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN128959"
->E.11.3.1.4. <ACRONYM
+NAME="AEN131733"
+>E.23.3.1.4. <ACRONYM
 CLASS="ACRONYM"
 >SSL</ACRONYM
 ></A
@@ -1280,8 +1277,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN128988"
->E.11.3.1.5. Server Settings</A
+NAME="AEN131762"
+>E.23.3.1.5. Server Settings</A
 ></H4
 ><P
 ></P
@@ -1486,8 +1483,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129049"
->E.11.3.2. Replication and Recovery</A
+NAME="AEN131823"
+>E.23.3.2. Replication and Recovery</A
 ></H3
 ><P
 ></P
@@ -1620,8 +1617,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129089"
->E.11.3.2.1. <A
+NAME="AEN131863"
+>E.23.3.2.1. <A
 HREF="logicaldecoding.html"
 >Logical Decoding</A
 ></A
@@ -1726,8 +1723,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129119"
->E.11.3.3. Queries</A
+NAME="AEN131893"
+>E.23.3.3. Queries</A
 ></H3
 ><P
 ></P
@@ -1805,8 +1802,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129142"
->E.11.3.4. Utility Commands</A
+NAME="AEN131916"
+>E.23.3.4. Utility Commands</A
 ></H3
 ><P
 ></P
@@ -1884,8 +1881,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129165"
->E.11.3.4.1. <A
+NAME="AEN131939"
+>E.23.3.4.1. <A
 HREF="sql-explain.html"
 >EXPLAIN</A
 ></A
@@ -1927,8 +1924,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129178"
->E.11.3.4.2. Views</A
+NAME="AEN131952"
+>E.23.3.4.2. Views</A
 ></H4
 ><P
 ></P
@@ -2019,8 +2016,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129204"
->E.11.3.5. Object Manipulation</A
+NAME="AEN131978"
+>E.23.3.5. Object Manipulation</A
 ></H3
 ><P
 ></P
@@ -2173,8 +2170,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129250"
->E.11.3.6. Data Types</A
+NAME="AEN132024"
+>E.23.3.6. Data Types</A
 ></H3
 ><P
 ></P
@@ -2313,8 +2310,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129290"
->E.11.3.6.1. <A
+NAME="AEN132064"
+>E.23.3.6.1. <A
 HREF="datatype-json.html"
 ><ACRONYM
 CLASS="ACRONYM"
@@ -2412,8 +2409,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129318"
->E.11.3.7. Functions</A
+NAME="AEN132092"
+>E.23.3.7. Functions</A
 ></H3
 ><P
 ></P
@@ -2596,8 +2593,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129375"
->E.11.3.7.1. System Information Functions</A
+NAME="AEN132149"
+>E.23.3.7.1. System Information Functions</A
 ></H4
 ><P
 ></P
@@ -2691,8 +2688,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129403"
->E.11.3.7.2. Aggregates</A
+NAME="AEN132177"
+>E.23.3.7.2. Aggregates</A
 ></H4
 ><P
 ></P
@@ -2791,8 +2788,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129433"
->E.11.3.8. Server-Side Languages</A
+NAME="AEN132207"
+>E.23.3.8. Server-Side Languages</A
 ></H3
 ><P
 ></P
@@ -2841,8 +2838,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129448"
->E.11.3.8.1. <A
+NAME="AEN132222"
+>E.23.3.8.1. <A
 HREF="plpgsql.html"
 >PL/pgSQL</A
 > Server-Side Language</A
@@ -2852,9 +2849,9 @@
 ><UL
 ><LI
 ><P
->        Add ability to retrieve the current PL/PgSQL call stack
+>        Add ability to retrieve the current PL/pgSQL call stack
         using <A
-HREF="plpgsql-control-structures.html#PLPGSQL-GET-DIAGNOSTICS-CONTEXT"
+HREF="plpgsql-control-structures.html#PLPGSQL-CALL-STACK"
 ><TT
 CLASS="COMMAND"
 >GET
@@ -2907,8 +2904,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129467"
->E.11.3.9. <A
+NAME="AEN132241"
+>E.23.3.9. <A
 HREF="libpq.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -2954,8 +2951,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129481"
->E.11.3.10. Client Applications</A
+NAME="AEN132255"
+>E.23.3.10. Client Applications</A
 ></H3
 ><P
 ></P
@@ -2972,7 +2969,7 @@
 CLASS="OPTION"
 >-g</TT
 >
-        to specify role membership (Chistopher Browne)
+        to specify role membership (Christopher Browne)
        </P
 ></LI
 ><LI
@@ -3093,8 +3090,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129519"
->E.11.3.10.1. <A
+NAME="AEN132293"
+>E.23.3.10.1. <A
 HREF="app-psql.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3138,8 +3135,8 @@
 ><H5
 CLASS="SECT5"
 ><A
-NAME="AEN129532"
->E.11.3.10.1.1. <A
+NAME="AEN132306"
+>E.23.3.10.1.1. <A
 HREF="app-psql.html#APP-PSQL-META-COMMANDS"
 >Backslash Commands</A
 ></A
@@ -3305,8 +3302,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129584"
->E.11.3.10.2. <A
+NAME="AEN132358"
+>E.23.3.10.2. <A
 HREF="app-pgdump.html"
 >pg_dump</A
 ></A
@@ -3384,8 +3381,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129606"
->E.11.3.10.3. <A
+NAME="AEN132380"
+>E.23.3.10.3. <A
 HREF="app-pgbasebackup.html"
 >pg_basebackup</A
 ></A
@@ -3448,8 +3445,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129625"
->E.11.3.11. Source Code</A
+NAME="AEN132399"
+>E.23.3.11. Source Code</A
 ></H3
 ><P
 ></P
@@ -3798,8 +3795,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN129737"
->E.11.3.12. Additional Modules</A
+NAME="AEN132511"
+>E.23.3.12. Additional Modules</A
 ></H3
 ><P
 ></P
@@ -4001,8 +3998,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129797"
->E.11.3.12.1. <A
+NAME="AEN132571"
+>E.23.3.12.1. <A
 HREF="pgbench.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -4068,8 +4065,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN129817"
->E.11.3.12.2. <A
+NAME="AEN132591"
+>E.23.3.12.2. <A
 HREF="pgstatstatements.html"
 >pg_stat_statements</A
 ></A
@@ -4184,7 +4181,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="release-9-3-12.html"
+HREF="release-9-3-18.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -4208,7 +4205,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Release 9.3.12</TD
+>Release 9.3.18</TD
 ></TR
 ></TABLE
 ></DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-1.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-1.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-1.html	2016-03-28 20:21:11.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-1.html	2017-08-07 21:32:42.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-5-1"
->E.2. Release 9.5.1</A
+>E.8. Release 9.5.1</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-02-11</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.5.0.
    For information about new features in the 9.5 major release, see
    <A
 HREF="release-9-5.html"
->Section E.3</A
+>Section E.9</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN126097"
->E.2.1. Migration to Version 9.5.1</A
+NAME="AEN127776"
+>E.8.1. Migration to Version 9.5.1</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.5.X.
@@ -130,8 +127,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN126100"
->E.2.2. Changes</A
+NAME="AEN127779"
+>E.8.2. Changes</A
 ></H2
 ><P
 ></P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-2.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-2.html	2016-03-28 20:21:11.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-2.html	2017-08-07 21:32:42.000000000 +0000
@@ -9,14 +9,14 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
 HREF="release.html"><LINK
 REL="PREVIOUS"
-TITLE="Release Notes"
-HREF="release.html"><LINK
+TITLE="Release 9.5.3"
+HREF="release-9-5-3.html"><LINK
 REL="NEXT"
 TITLE="Release 9.5.1"
 HREF="release-9-5-1.html"><LINK
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -53,8 +53,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="Release Notes"
-HREF="release.html"
+TITLE="Release 9.5.3"
+HREF="release-9-5-3.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -93,24 +93,21 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-5-2"
->E.1. Release 9.5.2</A
+>E.7. Release 9.5.2</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-03-31</P
-></BLOCKQUOTE
 ></DIV
 ><P
 >   This release contains a variety of fixes from 9.5.1.
    For information about new features in the 9.5 major release, see
    <A
 HREF="release-9-5.html"
->Section E.3</A
+>Section E.9</A
 >.
   </P
 ><DIV
@@ -118,8 +115,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN125927"
->E.1.1. Migration to Version 9.5.2</A
+NAME="AEN127606"
+>E.7.1. Migration to Version 9.5.2</A
 ></H2
 ><P
 >    A dump/restore is not required for those running 9.5.X.
@@ -137,8 +134,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN125932"
->E.1.2. Changes</A
+NAME="AEN127611"
+>E.7.2. Changes</A
 ></H2
 ><P
 ></P
@@ -517,7 +514,7 @@
      </P
 ><P
 >      This dodges a portability problem on FreeBSD-derived platforms
-      (including OS X).
+      (including macOS).
      </P
 ></LI
 ><LI
@@ -699,7 +696,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="release.html"
+HREF="release-9-5-3.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -727,7 +724,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Release Notes</TD
+>Release 9.5.3</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-3.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-3.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-3.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-3.html	2017-08-07 21:32:42.000000000 +0000
@@ -0,0 +1,564 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.5.3</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.5.4"
+HREF="release-9-5-4.html"><LINK
+REL="NEXT"
+TITLE="Release 9.5.2"
+HREF="release-9-5-2.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.5.4"
+HREF="release-9-5-4.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.5.2"
+HREF="release-9-5-2.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-5-3"
+>E.6. Release 9.5.3</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-05-12</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.5.2.
+   For information about new features in the 9.5 major release, see
+   <A
+HREF="release-9-5.html"
+>Section E.9</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN127490"
+>E.6.1. Migration to Version 9.5.3</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.5.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.5.2,
+    see <A
+HREF="release-9-5-2.html"
+>Section E.7</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN127495"
+>E.6.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      afterwards (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </P
+><P
+>      This change prevents problems when there are multiple connections
+      using OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      Failures have been reported specifically when a client application
+      uses SSL connections in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> concurrently with
+      SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
+      It's possible for similar problems to arise within the server as well,
+      if an extension module establishes an outgoing SSL connection.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="QUOTE"
+>"failed to build any <TT
+CLASS="REPLACEABLE"
+><I
+>N</I
+></TT
+>-way joins"</SPAN
+>
+      planner error with a full join enclosed in the right-hand side of a
+      left join (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect handling of equivalence-class tests in multilevel
+      nestloop plans (Tom Lane)
+     </P
+><P
+>      Given a three-or-more-way equivalence class of variables, such
+      as <TT
+CLASS="LITERAL"
+>X.X = Y.Y = Z.Z</TT
+>, it was possible for the planner to omit
+      some of the tests needed to enforce that all the variables are actually
+      equal, leading to join rows being output that didn't satisfy
+      the <TT
+CLASS="LITERAL"
+>WHERE</TT
+> clauses.  For various reasons, erroneous plans
+      were seldom selected in practice, so that this bug has gone undetected
+      for a long time.
+     </P
+></LI
+><LI
+><P
+>      Fix corner-case parser failures occurring
+      when <A
+HREF="runtime-config-compatible.html#GUC-OPERATOR-PRECEDENCE-WARNING"
+>operator_precedence_warning</A
+> is turned on
+      (Tom Lane)
+     </P
+><P
+>      An example is that <TT
+CLASS="LITERAL"
+>SELECT (ARRAY[])::text[]</TT
+> gave an error,
+      though it worked without the parentheses.
+     </P
+></LI
+><LI
+><P
+>      Fix query-lifespan memory leak in GIN index scans (Julien Rouhaud)
+     </P
+></LI
+><LI
+><P
+>      Fix query-lifespan memory leak and potential index corruption hazard in
+      GIN index insertion (Tom Lane)
+     </P
+><P
+>      The memory leak would typically not amount to much in simple queries,
+      but it could be very substantial during a large GIN index build with
+      high <TT
+CLASS="VARNAME"
+>maintenance_work_mem</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix possible misbehavior of <TT
+CLASS="LITERAL"
+>TH</TT
+>, <TT
+CLASS="LITERAL"
+>th</TT
+>,
+      and <TT
+CLASS="LITERAL"
+>Y,YYY</TT
+> format codes in <CODE
+CLASS="FUNCTION"
+>to_timestamp()</CODE
+>
+      (Tom Lane)
+     </P
+><P
+>      These could advance off the end of the input string, causing subsequent
+      format codes to read garbage.
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of rules and views in which the <TT
+CLASS="REPLACEABLE"
+><I
+>array</I
+></TT
+>
+      argument of a <TT
+CLASS="LITERAL"
+><TT
+CLASS="REPLACEABLE"
+><I
+>value</I
+></TT
+> <TT
+CLASS="REPLACEABLE"
+><I
+>operator</I
+></TT
+>
+      ANY (<TT
+CLASS="REPLACEABLE"
+><I
+>array</I
+></TT
+>)</TT
+> construct is a sub-SELECT
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Disallow newlines in <TT
+CLASS="COMMAND"
+>ALTER SYSTEM</TT
+> parameter values
+      (Tom Lane)
+     </P
+><P
+>      The configuration-file parser doesn't support embedded newlines in
+      string literals, so we mustn't allow them in values to be inserted
+      by <TT
+CLASS="COMMAND"
+>ALTER SYSTEM</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ALTER TABLE ... REPLICA IDENTITY USING INDEX</TT
+> to
+      work properly if an index on OID is selected (David Rowley)
+     </P
+></LI
+><LI
+><P
+>      Avoid possible misbehavior after failing to remove a tablespace symlink
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix crash in logical decoding on alignment-picky platforms (Tom Lane,
+      Andres Freund)
+     </P
+><P
+>      The failure occurred only with a transaction large enough to spill to
+      disk and a primary-key change within that transaction.
+     </P
+></LI
+><LI
+><P
+>      Avoid repeated requests for feedback from receiver while shutting down
+      walsender (Nick Cleaton)
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_regress</SPAN
+> use a startup timeout from the
+      <TT
+CLASS="ENVAR"
+>PGCTLTIMEOUT</TT
+> environment variable, if that's set (Tom Lane)
+     </P
+><P
+>      This is for consistency with a behavior recently added
+      to <SPAN
+CLASS="APPLICATION"
+>pg_ctl</SPAN
+>; it eases automated testing on slow machines.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to correctly restore extension
+      membership for operator families containing only one operator class
+      (Tom Lane)
+     </P
+><P
+>      In such a case, the operator family was restored into the new database,
+      but it was no longer marked as part of the extension.  This had no
+      immediate ill effects, but would cause later <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      runs to emit output that would cause (harmless) errors on restore.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to not fail when new-cluster TOAST rules
+      differ from old (Tom Lane)
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> had special-case code to handle the
+      situation where the new <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> version thinks that
+      a table should have a TOAST table while the old version did not.  That
+      code was broken, so remove it, and instead do nothing in such cases;
+      there seems no reason to believe that we can't get along fine without
+      a TOAST table if that was okay according to the old version's rules.
+     </P
+></LI
+><LI
+><P
+>      Fix atomic operations for PPC when using IBM's XLC compiler (Noah Misch)
+     </P
+></LI
+><LI
+><P
+>      Reduce the number of SysV semaphores used by a build configured with
+      <TT
+CLASS="OPTION"
+>--disable-spinlocks</TT
+> (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Rename internal function <CODE
+CLASS="FUNCTION"
+>strtoi()</CODE
+>
+      to <CODE
+CLASS="FUNCTION"
+>strtoint()</CODE
+> to avoid conflict with a NetBSD library
+      function (Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix reporting of errors from <CODE
+CLASS="FUNCTION"
+>bind()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>listen()</CODE
+> system calls on Windows (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Reduce verbosity of compiler output when building with Microsoft Visual
+      Studio (Christian Ullrich)
+     </P
+></LI
+><LI
+><P
+>      Support building with Visual Studio 2015
+      (Michael Paquier, Petr Jel&iacute;nek)
+     </P
+><P
+>      Note that builds made with VS2015 will not run on Windows versions
+      before Windows Vista.
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>putenv()</CODE
+> to work properly with Visual Studio 2013
+      (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Avoid possibly-unsafe use of Windows' <CODE
+CLASS="FUNCTION"
+>FormatMessage()</CODE
+>
+      function (Christian Ullrich)
+     </P
+><P
+>      Use the <TT
+CLASS="LITERAL"
+>FORMAT_MESSAGE_IGNORE_INSERTS</TT
+> flag where
+      appropriate.  No live bug is known to exist here, but it seems like a
+      good idea to be careful.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016d
+      for DST law changes in Russia and Venezuela.  There are new zone
+      names <TT
+CLASS="LITERAL"
+>Europe/Kirov</TT
+> and <TT
+CLASS="LITERAL"
+>Asia/Tomsk</TT
+> to reflect
+      the fact that these regions now have different time zone histories from
+      adjacent regions.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-5-4.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-5-2.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.5.4</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.5.2</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-4.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-4.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-4.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-4.html	2017-08-07 21:32:41.000000000 +0000
@@ -0,0 +1,994 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.5.4</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.5.5"
+HREF="release-9-5-5.html"><LINK
+REL="NEXT"
+TITLE="Release 9.5.3"
+HREF="release-9-5-3.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.5.5"
+HREF="release-9-5-5.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.5.3"
+HREF="release-9-5-3.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-5-4"
+>E.5. Release 9.5.4</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-08-11</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.5.3.
+   For information about new features in the 9.5 major release, see
+   <A
+HREF="release-9-5.html"
+>Section E.9</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN127249"
+>E.5.1. Migration to Version 9.5.4</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.5.X.
+   </P
+><P
+>    However, if you are upgrading from a version earlier than 9.5.2,
+    see <A
+HREF="release-9-5-2.html"
+>Section E.7</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN127254"
+>E.5.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix possible mis-evaluation of
+      nested <TT
+CLASS="LITERAL"
+>CASE</TT
+>-<TT
+CLASS="LITERAL"
+>WHEN</TT
+> expressions (Heikki
+      Linnakangas, Michael Paquier, Tom Lane)
+     </P
+><P
+>      A <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression appearing within the test value
+      subexpression of another <TT
+CLASS="LITERAL"
+>CASE</TT
+> could become confused about
+      whether its own test value was null or not.  Also, inlining of a SQL
+      function implementing the equality operator used by
+      a <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression could result in passing the wrong test
+      value to functions called within a <TT
+CLASS="LITERAL"
+>CASE</TT
+> expression in the
+      SQL function's body.  If the test values were of different data
+      types, a crash might result; moreover such situations could be abused
+      to allow disclosure of portions of server memory.  (CVE-2016-5423)
+     </P
+></LI
+><LI
+><P
+>      Fix client programs' handling of special characters in database and
+      role names (Noah Misch, Nathan Bossart, Michael Paquier)
+     </P
+><P
+>      Numerous places in <SPAN
+CLASS="APPLICATION"
+>vacuumdb</SPAN
+> and other client programs
+      could become confused by database and role names containing double
+      quotes or backslashes.  Tighten up quoting rules to make that safe.
+      Also, ensure that when a conninfo string is used as a database name
+      parameter to these programs, it is correctly treated as such throughout.
+     </P
+><P
+>      Fix handling of paired double quotes
+      in <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s <TT
+CLASS="COMMAND"
+>\connect</TT
+>
+      and <TT
+CLASS="COMMAND"
+>\password</TT
+> commands to match the documentation.
+     </P
+><P
+>      Introduce a new <TT
+CLASS="OPTION"
+>-reuse-previous</TT
+> option
+      in <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s <TT
+CLASS="COMMAND"
+>\connect</TT
+> command to allow
+      explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether
+      the database name looks like a conninfo string, as before.)  This
+      allows secure handling of database names containing special
+      characters in <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> scripts.
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> now refuses to deal with database and role
+      names containing carriage returns or newlines, as it seems impractical
+      to quote those characters safely on Windows.  In future we may reject
+      such names on the server side, but that step has not been taken yet.
+     </P
+><P
+>      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute
+      commands with superuser privileges the next time a superuser
+      executes <SPAN
+CLASS="APPLICATION"
+>pg_dumpall</SPAN
+> or other routine maintenance
+      operations.  (CVE-2016-5424)
+     </P
+></LI
+><LI
+><P
+>      Fix corner-case misbehaviors for <TT
+CLASS="LITERAL"
+>IS NULL</TT
+>/<TT
+CLASS="LITERAL"
+>IS NOT
+      NULL</TT
+> applied to nested composite values (Andrew Gierth, Tom Lane)
+     </P
+><P
+>      The SQL standard specifies that <TT
+CLASS="LITERAL"
+>IS NULL</TT
+> should return
+      TRUE for a row of all null values (thus <TT
+CLASS="LITERAL"
+>ROW(NULL,NULL) IS
+      NULL</TT
+> yields TRUE), but this is not meant to apply recursively
+      (thus <TT
+CLASS="LITERAL"
+>ROW(NULL, ROW(NULL,NULL)) IS NULL</TT
+> yields FALSE).
+      The core executor got this right, but certain planner optimizations
+      treated the test as recursive (thus producing TRUE in both cases),
+      and <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+> could produce remote queries
+      that misbehaved similarly.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="QUOTE"
+>"unrecognized node type"</SPAN
+> error for <TT
+CLASS="COMMAND"
+>INSERT ... ON
+      CONFLICT</TT
+> within a recursive CTE (a <TT
+CLASS="LITERAL"
+>WITH</TT
+> item) (Peter
+      Geoghegan)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>INSERT ... ON CONFLICT</TT
+> to successfully match index
+      expressions or index predicates that are simplified during the
+      planner's expression preprocessing phase (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Correctly handle violations of exclusion constraints that apply to
+      the target table of an <TT
+CLASS="LITERAL"
+>INSERT ... ON CONFLICT</TT
+> command,
+      but are not one of the selected arbiter indexes (Tom Lane)
+     </P
+><P
+>      Such a case should raise a normal constraint-violation error, but it
+      got into an infinite loop instead.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>INSERT ... ON CONFLICT</TT
+> to not fail if the target
+      table has a unique index on OID (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Make the <TT
+CLASS="TYPE"
+>inet</TT
+> and <TT
+CLASS="TYPE"
+>cidr</TT
+> data types properly reject
+      IPv6 addresses with too many colon-separated fields (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Prevent crash in <CODE
+CLASS="FUNCTION"
+>close_ps()</CODE
+>
+      (the <TT
+CLASS="TYPE"
+>point</TT
+> <TT
+CLASS="LITERAL"
+>##</TT
+> <TT
+CLASS="TYPE"
+>lseg</TT
+> operator)
+      for NaN input coordinates (Tom Lane)
+     </P
+><P
+>      Make it return NULL instead of crashing.
+     </P
+></LI
+><LI
+><P
+>      Avoid possible crash in <CODE
+CLASS="FUNCTION"
+>pg_get_expr()</CODE
+> when inconsistent
+      values are passed to it (Michael Paquier, Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix several one-byte buffer over-reads in <CODE
+CLASS="FUNCTION"
+>to_number()</CODE
+>
+      (Peter Eisentraut)
+     </P
+><P
+>      In several cases the <CODE
+CLASS="FUNCTION"
+>to_number()</CODE
+> function would read one
+      more character than it should from the input string.  There is a
+      small chance of a crash, if the input happens to be adjacent to the
+      end of memory.
+     </P
+></LI
+><LI
+><P
+>      Do not run the planner on the query contained in <TT
+CLASS="LITERAL"
+>CREATE
+      MATERIALIZED VIEW</TT
+> or <TT
+CLASS="LITERAL"
+>CREATE TABLE AS</TT
+>
+      when <TT
+CLASS="LITERAL"
+>WITH NO DATA</TT
+> is specified (Michael Paquier,
+      Tom Lane)
+     </P
+><P
+>      This avoids some unnecessary failure conditions, for example if a
+      stable function invoked by the materialized view depends on a table
+      that doesn't exist yet.
+     </P
+></LI
+><LI
+><P
+>      Avoid unsafe intermediate state during expensive paths
+      through <CODE
+CLASS="FUNCTION"
+>heap_update()</CODE
+> (Masahiko Sawada, Andres Freund)
+     </P
+><P
+>      Previously, these cases locked the target tuple (by setting its XMAX)
+      but did not WAL-log that action, thus risking data integrity problems
+      if the page were spilled to disk and then a database crash occurred
+      before the tuple update could be completed.
+     </P
+></LI
+><LI
+><P
+>      Fix hint bit update during WAL replay of row locking operations
+      (Andres Freund)
+     </P
+><P
+>      The only known consequence of this problem is that row locks held by
+      a prepared, but uncommitted, transaction might fail to be enforced
+      after a crash and restart.
+     </P
+></LI
+><LI
+><P
+>      Avoid unnecessary <SPAN
+CLASS="QUOTE"
+>"could not serialize access"</SPAN
+> errors when
+      acquiring <TT
+CLASS="LITERAL"
+>FOR KEY SHARE</TT
+> row locks in serializable mode
+      (&Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Make sure <SPAN
+CLASS="QUOTE"
+>"expanded"</SPAN
+> datums returned by a plan node are
+      read-only (Tom Lane)
+     </P
+><P
+>      This avoids failures in some cases where the result of a lower plan
+      node is referenced in multiple places in upper nodes.  So far as
+      core <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> is concerned, only array values
+      returned by PL/pgSQL functions are at risk; but extensions might
+      use expanded datums for other things.
+     </P
+></LI
+><LI
+><P
+>      Avoid crash in <TT
+CLASS="LITERAL"
+>postgres -C</TT
+> when the specified variable
+      has a null string value (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Prevent unintended waits for the receiver in WAL sender processes
+      (Kyotaro Horiguchi)
+     </P
+></LI
+><LI
+><P
+>      Fix possible loss of large subtransactions in logical decoding
+      (Petru-Florin Mihancea)
+     </P
+></LI
+><LI
+><P
+>      Fix failure of logical decoding when a subtransaction contains no
+      actual changes (Marko Tiikkaja, Andrew Gierth)
+     </P
+></LI
+><LI
+><P
+>      Ensure that backends see up-to-date statistics for shared catalogs
+      (Tom Lane)
+     </P
+><P
+>      The statistics collector failed to update the statistics file for
+      shared catalogs after a request from a regular backend.  This problem
+      was partially masked because the autovacuum launcher regularly makes
+      requests that did cause such updates; however, it became obvious with
+      autovacuum disabled.
+     </P
+></LI
+><LI
+><P
+>      Avoid redundant writes of the statistics files when multiple
+      backends request updates close together (Tom Lane, Tomas Vondra)
+     </P
+></LI
+><LI
+><P
+>      Avoid consuming a transaction ID during <TT
+CLASS="COMMAND"
+>VACUUM</TT
+>
+      (Alexander Korotkov)
+     </P
+><P
+>      Some cases in <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> unnecessarily caused an XID to be
+      assigned to the current transaction.  Normally this is negligible,
+      but if one is up against the XID wraparound limit, consuming more
+      XIDs during anti-wraparound vacuums is a very bad thing.
+     </P
+></LI
+><LI
+><P
+>      Prevent possible failure when vacuuming multixact IDs in an
+      installation that has been pg_upgrade'd from pre-9.3 (Andrew Gierth,
+      &Aacute;lvaro Herrera)
+     </P
+><P
+>      The usual symptom of this bug is errors
+      like <SPAN
+CLASS="QUOTE"
+>"MultiXactId <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+> has not been created
+      yet -- apparent wraparound"</SPAN
+>.
+     </P
+></LI
+><LI
+><P
+>      When a manual <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+> specifies a column list, don't
+      reset the table's <TT
+CLASS="LITERAL"
+>changes_since_analyze</TT
+> counter
+      (Tom Lane)
+     </P
+><P
+>      If we're only analyzing some columns, we should not prevent routine
+      auto-analyze from happening for the other columns.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+>'s overestimation of <TT
+CLASS="LITERAL"
+>n_distinct</TT
+>
+      for a unique or nearly-unique column with many null entries (Tom
+      Lane)
+     </P
+><P
+>      The nulls could get counted as though they were themselves distinct
+      values, leading to serious planner misestimates in some types of
+      queries.
+     </P
+></LI
+><LI
+><P
+>      Prevent autovacuum from starting multiple workers for the same shared
+      catalog (&Aacute;lvaro Herrera)
+     </P
+><P
+>      Normally this isn't much of a problem because the vacuum doesn't take
+      long anyway; but in the case of a severely bloated catalog, it could
+      result in all but one worker uselessly waiting instead of doing
+      useful work on other tables.
+     </P
+></LI
+><LI
+><P
+>      Fix bug in b-tree mark/restore processing (Kevin Grittner)
+     </P
+><P
+>      This error could lead to incorrect join results or assertion failures
+      in a merge join whose inner source node is a b-tree indexscan.
+     </P
+></LI
+><LI
+><P
+>      Avoid duplicate buffer lock release when abandoning a b-tree index
+      page deletion attempt (Tom Lane)
+     </P
+><P
+>      This mistake prevented <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> from completing in some
+      cases involving corrupt b-tree indexes.
+     </P
+></LI
+><LI
+><P
+>      Fix building of large (bigger than <TT
+CLASS="VARNAME"
+>shared_buffers</TT
+>)
+      hash indexes (Tom Lane)
+     </P
+><P
+>      The code path used for large indexes contained a bug causing
+      incorrect hash values to be inserted into the index, so that
+      subsequent index searches always failed, except for tuples inserted
+      into the index after the initial build.
+     </P
+></LI
+><LI
+><P
+>      Prevent infinite loop in GiST index build for geometric columns
+      containing NaN component values (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix possible crash during a nearest-neighbor (<TT
+CLASS="LITERAL"
+>ORDER BY</TT
+>
+      distance) indexscan on a <TT
+CLASS="FILENAME"
+>contrib/btree_gist</TT
+> index on
+      an <TT
+CLASS="TYPE"
+>interval</TT
+> column (Peter Geoghegan)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="QUOTE"
+>"PANIC: failed to add BRIN tuple"</SPAN
+> error when attempting
+      to update a BRIN index entry (&Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Fix possible crash during background worker shutdown (Dmitry Ivanov)
+     </P
+></LI
+><LI
+><P
+>      Fix PL/pgSQL's handling of the <TT
+CLASS="LITERAL"
+>INTO</TT
+> clause
+      within <TT
+CLASS="COMMAND"
+>IMPORT FOREIGN SCHEMA</TT
+> commands (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/btree_gin</TT
+> to handle the smallest
+      possible <TT
+CLASS="TYPE"
+>bigint</TT
+> value correctly (Peter Eisentraut)
+     </P
+></LI
+><LI
+><P
+>      Teach libpq to correctly decode server version from future servers
+      (Peter Eisentraut)
+     </P
+><P
+>      It's planned to switch to two-part instead of three-part server
+      version numbers for releases after 9.6.  Make sure
+      that <CODE
+CLASS="FUNCTION"
+>PQserverVersion()</CODE
+> returns the correct value for
+      such cases.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+>'s code for <TT
+CLASS="LITERAL"
+>unsigned long long</TT
+>
+      array elements (Michael Meskes)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> with both <TT
+CLASS="OPTION"
+>-c</TT
+> and <TT
+CLASS="OPTION"
+>-C</TT
+>
+      options, avoid emitting an unwanted <TT
+CLASS="LITERAL"
+>CREATE SCHEMA public</TT
+>
+      command (David Johnston, Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Improve handling of <SPAN
+CLASS="SYSTEMITEM"
+>SIGTERM</SPAN
+>/control-C in
+      parallel <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> and <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> (Tom
+      Lane)
+     </P
+><P
+>      Make sure that the worker processes will exit promptly, and also arrange
+      to send query-cancel requests to the connected backends, in case they
+      are doing something long-running such as a <TT
+CLASS="COMMAND"
+>CREATE INDEX</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix error reporting in parallel <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      and <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> (Tom Lane)
+     </P
+><P
+>      Previously, errors reported by <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      or <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> worker processes might never make it to
+      the user's console, because the messages went through the master
+      process, and there were various deadlock scenarios that would prevent
+      the master process from passing on the messages.  Instead, just print
+      everything to <TT
+CLASS="LITERAL"
+>stderr</TT
+>.  In some cases this will result in
+      duplicate messages (for instance, if all the workers report a server
+      shutdown), but that seems better than no message.
+     </P
+></LI
+><LI
+><P
+>      Ensure that parallel <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>
+      or <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> on Windows will shut down properly
+      after an error (Kyotaro Horiguchi)
+     </P
+><P
+>      Previously, it would report the error, but then just sit until
+      manually stopped by the user.
+     </P
+></LI
+><LI
+><P
+>      Make parallel <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> fail cleanly when run against a
+      standby server (Magnus Hagander)
+     </P
+><P
+>      This usage is not supported
+      unless <TT
+CLASS="OPTION"
+>--no-synchronized-snapshots</TT
+> is specified, but the
+      error was not handled very well.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> behave better when built without zlib
+      support (Kyotaro Horiguchi)
+     </P
+><P
+>      It didn't work right for parallel dumps, and emitted some rather
+      pointless warnings in other cases.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> accept <TT
+CLASS="LITERAL"
+>-Z 0</TT
+> as
+      specifying no compression (Fujii Masao)
+     </P
+></LI
+><LI
+><P
+>      Fix makefiles' rule for building AIX shared libraries to be safe for
+      parallel make (Noah Misch)
+     </P
+></LI
+><LI
+><P
+>      Fix TAP tests and MSVC scripts to work when build directory's path
+      name contains spaces (Michael Paquier, Kyotaro Horiguchi)
+     </P
+></LI
+><LI
+><P
+>      Be more predictable about reporting <SPAN
+CLASS="QUOTE"
+>"statement timeout"</SPAN
+>
+      versus <SPAN
+CLASS="QUOTE"
+>"lock timeout"</SPAN
+> (Tom Lane)
+     </P
+><P
+>      On heavily loaded machines, the regression tests sometimes failed due
+      to reporting <SPAN
+CLASS="QUOTE"
+>"lock timeout"</SPAN
+> even though the statement timeout
+      should have occurred first.
+     </P
+></LI
+><LI
+><P
+>      Make regression tests safe for Danish and Welsh locales (Jeff Janes,
+      Tom Lane)
+     </P
+><P
+>      Change some test data that triggered the unusual sorting rules of
+      these locales.
+     </P
+></LI
+><LI
+><P
+>      Update our copy of the timezone code to match
+      IANA's <SPAN
+CLASS="APPLICATION"
+>tzcode</SPAN
+> release 2016c (Tom Lane)
+     </P
+><P
+>      This is needed to cope with anticipated future changes in the time
+      zone data files.  It also fixes some corner-case bugs in coping with
+      unusual time zones.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016f
+      for DST law changes in Kemerovo and Novosibirsk, plus historical
+      corrections for Azerbaijan, Belarus, and Morocco.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-5-5.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-5-3.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.5.5</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.5.3</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-5.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-5.html	2017-08-07 21:32:41.000000000 +0000
@@ -0,0 +1,952 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.5.5</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.5.6"
+HREF="release-9-5-6.html"><LINK
+REL="NEXT"
+TITLE="Release 9.5.4"
+HREF="release-9-5-4.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.5.6"
+HREF="release-9-5-6.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.5.4"
+HREF="release-9-5-4.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-5-5"
+>E.4. Release 9.5.5</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2016-10-27</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.5.4.
+   For information about new features in the 9.5 major release, see
+   <A
+HREF="release-9-5.html"
+>Section E.9</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN127018"
+>E.4.1. Migration to Version 9.5.5</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.5.X.
+   </P
+><P
+>    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted free space maps.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.5.2,
+    see <A
+HREF="release-9-5-2.html"
+>Section E.7</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN127024"
+>E.4.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix WAL-logging of truncation of relation free space maps and
+      visibility maps (Pavan Deolasee, Heikki Linnakangas)
+     </P
+><P
+>      It was possible for these files to not be correctly restored during
+      crash recovery, or to be written incorrectly on a standby server.
+      Bogus entries in a free space map could lead to attempts to access
+      pages that have been truncated away from the relation itself, typically
+      producing errors like <SPAN
+CLASS="QUOTE"
+>"could not read block <TT
+CLASS="REPLACEABLE"
+><I
+>XXX</I
+></TT
+>:
+      read only 0 of 8192 bytes"</SPAN
+>.  Checksum failures in the
+      visibility map are also possible, if checksumming is enabled.
+     </P
+><P
+>      Procedures for determining whether there is a problem and repairing it
+      if so are discussed at
+      <A
+HREF="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"
+TARGET="_top"
+>https://wiki.postgresql.org/wiki/Free_Space_Map_Problems</A
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect creation of GIN index WAL records on big-endian machines
+      (Tom Lane)
+     </P
+><P
+>      The typical symptom was <SPAN
+CLASS="QUOTE"
+>"unexpected GIN leaf action"</SPAN
+> errors
+      during WAL replay.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>SELECT FOR UPDATE/SHARE</TT
+> to correctly lock tuples that
+      have been updated by a subsequently-aborted transaction
+      (&Aacute;lvaro Herrera)
+     </P
+><P
+>      In 9.5 and later, the <TT
+CLASS="COMMAND"
+>SELECT</TT
+> would sometimes fail to
+      return such tuples at all.  A failure has not been proven to occur in
+      earlier releases, but might be possible with concurrent updates.
+     </P
+></LI
+><LI
+><P
+>      Fix EvalPlanQual rechecks involving CTE scans (Tom Lane)
+     </P
+><P
+>      The recheck would always see the CTE as returning no rows, typically
+      leading to failure to update rows that were recently updated.
+     </P
+></LI
+><LI
+><P
+>      Fix deletion of speculatively inserted TOAST tuples when backing out
+      of <TT
+CLASS="COMMAND"
+>INSERT ... ON CONFLICT</TT
+> (Oskari Saarenmaa)
+     </P
+><P
+>      In the race condition where two transactions try to insert conflicting
+      tuples at about the same time, the loser would fail with
+      an <SPAN
+CLASS="QUOTE"
+>"attempted to delete invisible tuple"</SPAN
+> error if its
+      insertion included any TOAST'ed fields.
+     </P
+></LI
+><LI
+><P
+>      Don't throw serialization errors for self-conflicting insertions
+      in <TT
+CLASS="COMMAND"
+>INSERT ... ON CONFLICT</TT
+> (Thomas Munro, Peter Geoghegan)
+     </P
+></LI
+><LI
+><P
+>      Fix improper repetition of previous results from hashed aggregation in
+      a subquery (Andrew Gierth)
+     </P
+><P
+>      The test to see if we can reuse a previously-computed hash table of
+      the aggregate state values neglected the possibility of an outer query
+      reference appearing in an aggregate argument expression.  A change in
+      the value of such a reference should lead to recalculating the hash
+      table, but did not.
+     </P
+></LI
+><LI
+><P
+>      Fix query-lifespan memory leak in a bulk <TT
+CLASS="COMMAND"
+>UPDATE</TT
+> on a table
+      with a <TT
+CLASS="LITERAL"
+>PRIMARY KEY</TT
+> or <TT
+CLASS="LITERAL"
+>REPLICA IDENTITY</TT
+> index
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>COPY</TT
+> with a column name list from a table that has
+      row-level security enabled (Adam Brightwell)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> to emit valid XML when
+      <A
+HREF="runtime-config-statistics.html#GUC-TRACK-IO-TIMING"
+>track_io_timing</A
+> is on (Markus Winand)
+     </P
+><P
+>      Previously the XML output-format option produced syntactically invalid
+      tags such as <TT
+CLASS="LITERAL"
+>&lt;I/O-Read-Time&gt;</TT
+>.  That is now
+      rendered as <TT
+CLASS="LITERAL"
+>&lt;I-O-Read-Time&gt;</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Suppress printing of zeroes for unmeasured times
+      in <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> (Maksim Milyutin)
+     </P
+><P
+>      Certain option combinations resulted in printing zero values for times
+      that actually aren't ever measured in that combination.  Our general
+      policy in <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> is not to print such fields at all, so
+      do that consistently in all cases.
+     </P
+></LI
+><LI
+><P
+>      Fix statistics update for <TT
+CLASS="COMMAND"
+>TRUNCATE</TT
+> in a prepared
+      transaction (Stas Kelvich)
+     </P
+></LI
+><LI
+><P
+>      Fix timeout length when <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> is waiting for exclusive
+      table lock so that it can truncate the table (Simon Riggs)
+     </P
+><P
+>      The timeout was meant to be 50 milliseconds, but it was actually only
+      50 microseconds, causing <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> to give up on truncation
+      much more easily than intended.  Set it to the intended value.
+     </P
+></LI
+><LI
+><P
+>      Fix bugs in merging inherited <TT
+CLASS="LITERAL"
+>CHECK</TT
+> constraints while
+      creating or altering a table (Tom Lane, Amit Langote)
+     </P
+><P
+>      Allow identical <TT
+CLASS="LITERAL"
+>CHECK</TT
+> constraints to be added to a parent
+      and child table in either order.  Prevent merging of a valid
+      constraint from the parent table with a <TT
+CLASS="LITERAL"
+>NOT VALID</TT
+>
+      constraint on the child.  Likewise, prevent merging of a <TT
+CLASS="LITERAL"
+>NO
+      INHERIT</TT
+> child constraint with an inherited constraint.
+     </P
+></LI
+><LI
+><P
+>      Show a sensible value
+      in <TT
+CLASS="STRUCTNAME"
+>pg_settings</TT
+>.<TT
+CLASS="STRUCTFIELD"
+>unit</TT
+>
+      for <TT
+CLASS="VARNAME"
+>min_wal_size</TT
+> and <TT
+CLASS="VARNAME"
+>max_wal_size</TT
+> (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Remove artificial restrictions on the values accepted
+      by <CODE
+CLASS="FUNCTION"
+>numeric_in()</CODE
+> and <CODE
+CLASS="FUNCTION"
+>numeric_recv()</CODE
+>
+      (Tom Lane)
+     </P
+><P
+>      We allow numeric values up to the limit of the storage format (more
+      than <TT
+CLASS="LITERAL"
+>1e100000</TT
+>), so it seems fairly pointless
+      that <CODE
+CLASS="FUNCTION"
+>numeric_in()</CODE
+> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <CODE
+CLASS="FUNCTION"
+>numeric_recv()</CODE
+> to
+      reject more than 1000 digits in an input value.
+     </P
+></LI
+><LI
+><P
+>      Avoid very-low-probability data corruption due to testing tuple
+      visibility without holding buffer lock (Thomas Munro, Peter Geoghegan,
+      Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Preserve commit timestamps across server restart
+      (Julien Rouhaud, Craig Ringer)
+     </P
+><P
+>      With <A
+HREF="runtime-config-replication.html#GUC-TRACK-COMMIT-TIMESTAMP"
+>track_commit_timestamp</A
+> turned on, old
+      commit timestamps became inaccessible after a clean server restart.
+     </P
+></LI
+><LI
+><P
+>      Fix logical WAL decoding to work properly when a subtransaction's WAL
+      output is large enough to spill to disk (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Fix possible sorting error when aborting use of abbreviated keys
+      (Peter Geoghegan)
+     </P
+><P
+>      In the worst case, this could result in a corrupt btree index, which
+      would need to be rebuilt using <TT
+CLASS="COMMAND"
+>REINDEX</TT
+>.  However, the
+      situation is believed to be rare.
+     </P
+></LI
+><LI
+><P
+>      Fix file descriptor leakage when truncating a temporary relation of
+      more than 1GB (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Disallow starting a standalone backend with <TT
+CLASS="LITERAL"
+>standby_mode</TT
+>
+      turned on (Michael Paquier)
+     </P
+><P
+>      This can't do anything useful, since there will be no WAL receiver
+      process to fetch more WAL data; and it could result in misbehavior
+      in code that wasn't designed with this situation in mind.
+     </P
+></LI
+><LI
+><P
+>      Properly initialize replication slot state when recycling a
+      previously-used slot (Michael Paquier)
+     </P
+><P
+>      This failure to reset all of the fields of the slot could
+      prevent <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> from removing dead tuples.
+     </P
+></LI
+><LI
+><P
+>      Round shared-memory allocation request to a multiple of the actual
+      huge page size when attempting to use huge pages on Linux (Tom Lane)
+     </P
+><P
+>      This avoids possible failures during <CODE
+CLASS="FUNCTION"
+>munmap()</CODE
+> on systems
+      with atypical default huge page sizes.  Except in crash-recovery
+      cases, there were no ill effects other than a log message.
+     </P
+></LI
+><LI
+><P
+>      Use a more random value for the dynamic shared memory control
+      segment's ID (Robert Haas, Tom Lane)
+     </P
+><P
+>      Previously, the same value would be chosen every time, because it was
+      derived from <CODE
+CLASS="FUNCTION"
+>random()</CODE
+> but <CODE
+CLASS="FUNCTION"
+>srandom()</CODE
+> had not
+      yet been called.  While relatively harmless, this was not the intended
+      behavior.
+     </P
+></LI
+><LI
+><P
+>      On Windows, retry creation of the dynamic shared memory control
+      segment after an access-denied error (Kyotaro Horiguchi, Amit Kapila)
+     </P
+><P
+>      Windows sometimes returns <TT
+CLASS="LITERAL"
+>ERROR_ACCESS_DENIED</TT
+> rather
+      than <TT
+CLASS="LITERAL"
+>ERROR_ALREADY_EXISTS</TT
+> when there is an existing
+      segment.  This led to postmaster startup failure due to believing that
+      the former was an unrecoverable error.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>PL/pgSQL</SPAN
+> to not misbehave with parameters and
+      local variables of type <TT
+CLASS="TYPE"
+>int2vector</TT
+> or <TT
+CLASS="TYPE"
+>oidvector</TT
+>
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Don't try to share SSL contexts across multiple connections
+      in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> (Heikki Linnakangas)
+     </P
+><P
+>      This led to assorted corner-case bugs, particularly when trying to use
+      different SSL parameters for different connections.
+     </P
+></LI
+><LI
+><P
+>      Avoid corner-case memory leak in <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> (Tom Lane)
+     </P
+><P
+>      The reported problem involved leaking an error report
+      during <CODE
+CLASS="FUNCTION"
+>PQreset()</CODE
+>, but there might be related cases.
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+>'s <TT
+CLASS="OPTION"
+>--help</TT
+> and <TT
+CLASS="OPTION"
+>--version</TT
+>
+      options work consistently with our other executables (Haribabu Kommi)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pgbench</SPAN
+>'s calculation of average latency
+      (Fabien Coelho)
+     </P
+><P
+>      The calculation was incorrect when there were <TT
+CLASS="LITERAL"
+>\sleep</TT
+>
+      commands in the script, or when the test duration was specified in
+      number of transactions rather than total time.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+>, check library loadability in name order
+      (Tom Lane)
+     </P
+><P
+>      This is a workaround to deal with cross-extension dependencies from
+      language transform modules to their base language and data type
+      modules.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>, never dump range constructor functions
+      (Tom Lane)
+     </P
+><P
+>      This oversight led to <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> failures with
+      extensions containing range types, due to duplicate creation of the
+      constructor functions.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> with <TT
+CLASS="OPTION"
+>-C</TT
+>,
+      suppress <TT
+CLASS="LITERAL"
+>TABLESPACE</TT
+> clause of <TT
+CLASS="COMMAND"
+>CREATE DATABASE</TT
+>
+      if <TT
+CLASS="OPTION"
+>--no-tablespaces</TT
+> is specified (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_receivexlog</SPAN
+> work correctly
+      with <TT
+CLASS="OPTION"
+>--synchronous</TT
+> without slots (Gabriele Bartolini)
+     </P
+></LI
+><LI
+><P
+>      Disallow specifying both <TT
+CLASS="OPTION"
+>--source-server</TT
+>
+      and <TT
+CLASS="OPTION"
+>--source-target</TT
+> options to <SPAN
+CLASS="APPLICATION"
+>pg_rewind</SPAN
+>
+      (Michael Banck)
+     </P
+></LI
+><LI
+><P
+>      Make <SPAN
+CLASS="APPLICATION"
+>pg_rewind</SPAN
+> turn off <TT
+CLASS="VARNAME"
+>synchronous_commit</TT
+>
+      in its session on the source server (Michael Banck, Michael Paquier)
+     </P
+><P
+>      This allows <SPAN
+CLASS="APPLICATION"
+>pg_rewind</SPAN
+> to work even when the source
+      server is using synchronous replication that is not working for some
+      reason.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_xlogdump</SPAN
+>, retry opening new WAL segments when
+      using <TT
+CLASS="OPTION"
+>--follow</TT
+> option (Magnus Hagander)
+     </P
+><P
+>      This allows for a possible delay in the server's creation of the next
+      segment.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_xlogdump</SPAN
+> to cope with a WAL file that begins
+      with a continuation record spanning more than one page (Pavan
+      Deolasee)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/pg_buffercache</TT
+> to work
+      when <TT
+CLASS="VARNAME"
+>shared_buffers</TT
+> exceeds 256GB (KaiGai Kohei)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/intarray/bench/bench.pl</TT
+> to print the results
+      of the <TT
+CLASS="COMMAND"
+>EXPLAIN</TT
+> it does when given the <TT
+CLASS="OPTION"
+>-e</TT
+> option
+      (Daniel Gustafsson)
+     </P
+></LI
+><LI
+><P
+>      Support OpenSSL 1.1.0 (Heikki Linnakangas)
+     </P
+></LI
+><LI
+><P
+>      Install TAP test infrastructure so that it's available for extension
+      testing (Craig Ringer)
+     </P
+><P
+>      When <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> has been configured
+      with <TT
+CLASS="OPTION"
+>--enable-tap-tests</TT
+>, <SPAN
+CLASS="QUOTE"
+>"make install"</SPAN
+> will now
+      install the Perl support files for TAP testing where PGXS can find
+      them.  This allows non-core extensions to
+      use <TT
+CLASS="LITERAL"
+>$(prove_check)</TT
+> without extra tests.
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, include <SPAN
+CLASS="APPLICATION"
+>pg_recvlogical</SPAN
+> in a
+      client-only installation (MauMau)
+     </P
+></LI
+><LI
+><P
+>      Update Windows time zone mapping to recognize some time zone names
+      added in recent Windows versions (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Prevent failure of obsolete dynamic time zone abbreviations (Tom Lane)
+     </P
+><P
+>      If a dynamic time zone abbreviation does not match any entry in the
+      referenced time zone, treat it as equivalent to the time zone name.
+      This avoids unexpected failures when IANA removes abbreviations from
+      their time zone database, as they did in <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+>
+      release 2016f and seem likely to do again in the future.  The
+      consequences were not limited to not recognizing the individual
+      abbreviation; any mismatch caused
+      the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_abbrevs</TT
+> view to fail altogether.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016h
+      for DST law changes in Palestine and Turkey, plus historical
+      corrections for Turkey and some regions of Russia.
+      Switch to numeric abbreviations for some time zones in Antarctica,
+      the former Soviet Union, and Sri Lanka.
+     </P
+><P
+>      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+>
+      view nor used for output.
+     </P
+><P
+>      In this update, <TT
+CLASS="LITERAL"
+>AMT</TT
+> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <TT
+CLASS="LITERAL"
+>Default</TT
+>
+      abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-5-6.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-5-4.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.5.6</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.5.4</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-6.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-6.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-6.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-6.html	2017-08-07 21:32:41.000000000 +0000
@@ -0,0 +1,998 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.5.6</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.5.7"
+HREF="release-9-5-7.html"><LINK
+REL="NEXT"
+TITLE="Release 9.5.5"
+HREF="release-9-5-5.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.5.7"
+HREF="release-9-5-7.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.5.5"
+HREF="release-9-5-5.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-5-6"
+>E.3. Release 9.5.6</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-02-09</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.5.5.
+   For information about new features in the 9.5 major release, see
+   <A
+HREF="release-9-5.html"
+>Section E.9</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN126772"
+>E.3.1. Migration to Version 9.5.6</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.5.X.
+   </P
+><P
+>    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted indexes.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.5.5,
+    see <A
+HREF="release-9-5-5.html"
+>Section E.4</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN126778"
+>E.3.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Fix a race condition that could cause indexes built
+      with <TT
+CLASS="COMMAND"
+>CREATE INDEX CONCURRENTLY</TT
+> to be corrupt
+      (Pavan Deolasee, Tom Lane)
+     </P
+><P
+>      If <TT
+CLASS="COMMAND"
+>CREATE INDEX CONCURRENTLY</TT
+> was used to build an index
+      that depends on a column not previously indexed, then rows
+      updated by transactions that ran concurrently with
+      the <TT
+CLASS="COMMAND"
+>CREATE INDEX</TT
+> command could have received incorrect
+      index entries.  If you suspect this may have happened, the most
+      reliable solution is to rebuild affected indexes after installing
+      this update.
+     </P
+></LI
+><LI
+><P
+>      Ensure that the special snapshot used for catalog scans is not
+      invalidated by premature data pruning (Tom Lane)
+     </P
+><P
+>      Backends failed to account for this snapshot when advertising their
+      oldest xmin, potentially allowing concurrent vacuuming operations to
+      remove data that was still needed.  This led to transient failures
+      along the lines of <SPAN
+CLASS="QUOTE"
+>"cache lookup failed for relation 1255"</SPAN
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect WAL logging for BRIN indexes (Kuntal Ghosh)
+     </P
+><P
+>      The WAL record emitted for a BRIN <SPAN
+CLASS="QUOTE"
+>"revmap"</SPAN
+> page when moving an
+      index tuple to a different page was incorrect.  Replay would make the
+      related portion of the index useless, forcing it to be recomputed.
+     </P
+></LI
+><LI
+><P
+>      Unconditionally WAL-log creation of the <SPAN
+CLASS="QUOTE"
+>"init fork"</SPAN
+> for an
+      unlogged table (Michael Paquier)
+     </P
+><P
+>      Previously, this was skipped when <A
+HREF="runtime-config-wal.html#GUC-WAL-LEVEL"
+>wal_level</A
+>
+      = <TT
+CLASS="LITERAL"
+>minimal</TT
+>, but actually it's necessary even in that case
+      to ensure that the unlogged table is properly reset to empty after a
+      crash.
+     </P
+></LI
+><LI
+><P
+>      Reduce interlocking on standby servers during the replay of btree
+      index vacuuming operations (Simon Riggs)
+     </P
+><P
+>      This change avoids substantial replication delays that sometimes
+      occurred while replaying such operations.
+     </P
+></LI
+><LI
+><P
+>      If the stats collector dies during hot standby, restart it (Takayuki
+      Tsunakawa)
+     </P
+></LI
+><LI
+><P
+>      Ensure that hot standby feedback works correctly when it's enabled at
+      standby server start (Ants Aasma, Craig Ringer)
+     </P
+></LI
+><LI
+><P
+>      Check for interrupts while hot standby is waiting for a conflicting
+      query (Simon Riggs)
+     </P
+></LI
+><LI
+><P
+>      Avoid constantly respawning the autovacuum launcher in a corner case
+      (Amit Khandekar)
+     </P
+><P
+>      This fix avoids problems when autovacuum is nominally off and there
+      are some tables that require freezing, but all such tables are
+      already being processed by autovacuum workers.
+     </P
+></LI
+><LI
+><P
+>      Fix check for when an extension member object can be dropped (Tom Lane)
+     </P
+><P
+>      Extension upgrade scripts should be able to drop member objects,
+      but this was disallowed for serial-column sequences, and possibly
+      other cases.
+     </P
+></LI
+><LI
+><P
+>      Make sure <TT
+CLASS="COMMAND"
+>ALTER TABLE</TT
+> preserves index tablespace
+      assignments when rebuilding indexes (Tom Lane, Michael Paquier)
+     </P
+><P
+>      Previously, non-default settings
+      of <A
+HREF="runtime-config-client.html#GUC-DEFAULT-TABLESPACE"
+>default_tablespace</A
+> could result in broken
+      indexes.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect updating of trigger function properties when changing a
+      foreign-key constraint's deferrability properties with <TT
+CLASS="COMMAND"
+>ALTER
+      TABLE ... ALTER CONSTRAINT</TT
+> (Tom Lane)
+     </P
+><P
+>      This led to odd failures during subsequent exercise of the foreign
+      key, as the triggers were fired at the wrong times.
+     </P
+></LI
+><LI
+><P
+>      Prevent dropping a foreign-key constraint if there are pending
+      trigger events for the referenced relation (Tom Lane)
+     </P
+><P
+>      This avoids <SPAN
+CLASS="QUOTE"
+>"could not find trigger <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+>"</SPAN
+>
+      or <SPAN
+CLASS="QUOTE"
+>"relation <TT
+CLASS="REPLACEABLE"
+><I
+>NNN</I
+></TT
+> has no triggers"</SPAN
+> errors.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ALTER TABLE ... SET DATA TYPE ... USING</TT
+> when child
+      table has different column ordering than the parent
+      (&Aacute;lvaro Herrera)
+     </P
+><P
+>      Failure to adjust the column numbering in the <TT
+CLASS="LITERAL"
+>USING</TT
+>
+      expression led to errors,
+      typically <SPAN
+CLASS="QUOTE"
+>"attribute <TT
+CLASS="REPLACEABLE"
+><I
+>N</I
+></TT
+> has wrong type"</SPAN
+>.
+     </P
+></LI
+><LI
+><P
+>      Fix processing of OID column when a table with OIDs is associated to
+      a parent with OIDs via <TT
+CLASS="COMMAND"
+>ALTER TABLE ... INHERIT</TT
+> (Amit
+      Langote)
+     </P
+><P
+>      The OID column should be treated the same as regular user columns in
+      this case, but it wasn't, leading to odd behavior in later
+      inheritance changes.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>CREATE OR REPLACE VIEW</TT
+> to update the view query
+      before attempting to apply the new view options (Dean Rasheed)
+     </P
+><P
+>      Previously the command would fail if the new options were
+      inconsistent with the old view definition.
+     </P
+></LI
+><LI
+><P
+>      Report correct object identity during <TT
+CLASS="COMMAND"
+>ALTER TEXT SEARCH
+      CONFIGURATION</TT
+> (Artur Zakirov)
+     </P
+><P
+>      The wrong catalog OID was reported to extensions such as logical
+      decoding.
+     </P
+></LI
+><LI
+><P
+>      Fix commit timestamp mechanism to not fail when queried about
+      the special XIDs <TT
+CLASS="LITERAL"
+>FrozenTransactionId</TT
+>
+      and <TT
+CLASS="LITERAL"
+>BootstrapTransactionId</TT
+> (Craig Ringer)
+     </P
+></LI
+><LI
+><P
+>      Check for serializability conflicts before reporting
+      constraint-violation failures (Thomas Munro)
+     </P
+><P
+>      When using serializable transaction isolation, it is desirable
+      that any error due to concurrent transactions should manifest
+      as a serialization failure, thereby cueing the application that
+      a retry might succeed.  Unfortunately, this does not reliably
+      happen for duplicate-key failures caused by concurrent insertions.
+      This change ensures that such an error will be reported as a
+      serialization error if the application explicitly checked for
+      the presence of a conflicting key (and did not find it) earlier
+      in the transaction.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect use of view reloptions as regular table reloptions (Tom
+      Lane)
+     </P
+><P
+>      The symptom was spurious <SPAN
+CLASS="QUOTE"
+>"ON CONFLICT is not supported on table
+      ... used as a catalog table"</SPAN
+> errors when the target
+      of <TT
+CLASS="COMMAND"
+>INSERT ... ON CONFLICT</TT
+> is a view with cascade option.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect <SPAN
+CLASS="QUOTE"
+>"target lists can have at most <TT
+CLASS="REPLACEABLE"
+><I
+>N</I
+></TT
+>
+      entries"</SPAN
+> complaint when using <TT
+CLASS="LITERAL"
+>ON CONFLICT</TT
+> with
+      wide tables (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Prevent multicolumn expansion of <TT
+CLASS="REPLACEABLE"
+><I
+>foo</I
+></TT
+><TT
+CLASS="LITERAL"
+>.*</TT
+> in
+      an <TT
+CLASS="COMMAND"
+>UPDATE</TT
+> source expression (Tom Lane)
+     </P
+><P
+>      This led to <SPAN
+CLASS="QUOTE"
+>"UPDATE target count mismatch --- internal
+      error"</SPAN
+>.  Now the syntax is understood as a whole-row variable,
+      as it would be in other contexts.
+     </P
+></LI
+><LI
+><P
+>      Ensure that column typmods are determined accurately for
+      multi-row <TT
+CLASS="LITERAL"
+>VALUES</TT
+> constructs (Tom Lane)
+     </P
+><P
+>      This fixes problems occurring when the first value in a column has a
+      determinable typmod (e.g., length for a <TT
+CLASS="TYPE"
+>varchar</TT
+> value) but
+      later values don't share the same limit.
+     </P
+></LI
+><LI
+><P
+>      Throw error for an unfinished Unicode surrogate pair at the end of a
+      Unicode string (Tom Lane)
+     </P
+><P
+>      Normally, a Unicode surrogate leading character must be followed by a
+      Unicode surrogate trailing character, but the check for this was
+      missed if the leading character was the last character in a Unicode
+      string literal (<TT
+CLASS="LITERAL"
+>U&amp;'...'</TT
+>) or Unicode identifier
+      (<TT
+CLASS="LITERAL"
+>U&amp;"..."</TT
+>).
+     </P
+></LI
+><LI
+><P
+>      Ensure that a purely negative text search query, such
+      as <TT
+CLASS="LITERAL"
+>!foo</TT
+>, matches empty <TT
+CLASS="TYPE"
+>tsvector</TT
+>s (Tom Dunstan)
+     </P
+><P
+>      Such matches were found by GIN index searches, but not by sequential
+      scans or GiST index searches.
+     </P
+></LI
+><LI
+><P
+>      Prevent crash when <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+> replaces a non-top-level
+      subtree with an empty query (Artur Zakirov)
+     </P
+></LI
+><LI
+><P
+>      Fix performance problems in <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+> (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>ts_rewrite()</CODE
+>'s handling of nested NOT operators
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Improve speed of user-defined aggregates that
+      use <CODE
+CLASS="FUNCTION"
+>array_append()</CODE
+> as transition function (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>array_fill()</CODE
+> to handle empty arrays properly (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix possible crash in <CODE
+CLASS="FUNCTION"
+>array_position()</CODE
+>
+      or <CODE
+CLASS="FUNCTION"
+>array_positions()</CODE
+> when processing arrays of records
+      (Junseok Yang)
+     </P
+></LI
+><LI
+><P
+>      Fix one-byte buffer overrun in <CODE
+CLASS="FUNCTION"
+>quote_literal_cstr()</CODE
+>
+      (Heikki Linnakangas)
+     </P
+><P
+>      The overrun occurred only if the input consisted entirely of single
+      quotes and/or backslashes.
+     </P
+></LI
+><LI
+><P
+>      Prevent multiple calls of <CODE
+CLASS="FUNCTION"
+>pg_start_backup()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>pg_stop_backup()</CODE
+> from running concurrently (Michael
+      Paquier)
+     </P
+><P
+>      This avoids an assertion failure, and possibly worse things, if
+      someone tries to run these functions in parallel.
+     </P
+></LI
+><LI
+><P
+>      Disable transform that attempted to remove no-op <TT
+CLASS="LITERAL"
+>AT TIME
+      ZONE</TT
+> conversions (Tom Lane)
+     </P
+><P
+>      This resulted in wrong answers when the simplified expression was
+      used in an index condition.
+     </P
+></LI
+><LI
+><P
+>      Avoid discarding <TT
+CLASS="TYPE"
+>interval</TT
+>-to-<TT
+CLASS="TYPE"
+>interval</TT
+> casts
+      that aren't really no-ops (Tom Lane)
+     </P
+><P
+>      In some cases, a cast that should result in zeroing out
+      low-order <TT
+CLASS="TYPE"
+>interval</TT
+> fields was mistakenly deemed to be a
+      no-op and discarded.  An example is that casting from <TT
+CLASS="TYPE"
+>INTERVAL
+      MONTH</TT
+> to <TT
+CLASS="TYPE"
+>INTERVAL YEAR</TT
+> failed to clear the months field.
+     </P
+></LI
+><LI
+><P
+>      Fix bugs in transmitting GUC parameter values to parallel workers
+      (Michael Paquier, Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Ensure that cached plans are invalidated by changes in foreign-table
+      options (Amit Langote, Etsuro Fujita, Ashutosh Bapat)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> to dump user-defined casts and transforms
+      that use built-in functions (Stephen Frost)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> with <TT
+CLASS="OPTION"
+>--create --if-exists</TT
+>
+      to behave more sanely if an archive contains
+      unrecognized <TT
+CLASS="COMMAND"
+>DROP</TT
+> commands (Tom Lane)
+     </P
+><P
+>      This doesn't fix any live bug, but it may improve the behavior in
+      future if <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> is used with an archive
+      generated by a later <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> version.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+>'s rate limiting in the presence of
+      slow I/O (Antonin Houska)
+     </P
+><P
+>      If disk I/O was transiently much slower than the specified rate
+      limit, the calculation overflowed, effectively disabling the rate
+      limit for the rest of the run.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+>'s handling of
+      symlinked <TT
+CLASS="FILENAME"
+>pg_stat_tmp</TT
+> and <TT
+CLASS="FILENAME"
+>pg_replslot</TT
+>
+      subdirectories (Magnus Hagander, Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Fix possible <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> failure on standby
+      server when including WAL files (Amit Kapila, Robert Haas)
+     </P
+></LI
+><LI
+><P
+>      Fix possible mishandling of expanded arrays in domain check
+      constraints and <TT
+CLASS="LITERAL"
+>CASE</TT
+> execution (Tom Lane)
+     </P
+><P
+>      It was possible for a PL/pgSQL function invoked in these contexts to
+      modify or even delete an array value that needs to be preserved for
+      additional operations.
+     </P
+></LI
+><LI
+><P
+>      Fix nested uses of PL/pgSQL functions in contexts such as domain
+      check constraints evaluated during assignment to a PL/pgSQL variable
+      (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Ensure that the Python exception objects we create for PL/Python are
+      properly reference-counted (Rafa de la Torre, Tom Lane)
+     </P
+><P
+>      This avoids failures if the objects are used after a Python garbage
+      collection cycle has occurred.
+     </P
+></LI
+><LI
+><P
+>      Fix PL/Tcl to support triggers on tables that have <TT
+CLASS="LITERAL"
+>.tupno</TT
+>
+      as a column name (Tom Lane)
+     </P
+><P
+>      This matches the (previously undocumented) behavior of
+      PL/Tcl's <TT
+CLASS="COMMAND"
+>spi_exec</TT
+> and <TT
+CLASS="COMMAND"
+>spi_execp</TT
+> commands,
+      namely that a magic <TT
+CLASS="LITERAL"
+>.tupno</TT
+> column is inserted only if
+      there isn't a real column named that.
+     </P
+></LI
+><LI
+><P
+>      Allow DOS-style line endings in <TT
+CLASS="FILENAME"
+>~/.pgpass</TT
+> files,
+      even on Unix (Vik Fearing)
+     </P
+><P
+>      This change simplifies use of the same password file across Unix and
+      Windows machines.
+     </P
+></LI
+><LI
+><P
+>      Fix one-byte buffer overrun if <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> is given a file
+      name that ends with a dot (Takayuki Tsunakawa)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>'s tab completion for <TT
+CLASS="COMMAND"
+>ALTER DEFAULT
+      PRIVILEGES</TT
+> (Gilles Darold, Stephen Frost)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>, treat an empty or all-blank setting of
+      the <TT
+CLASS="ENVAR"
+>PAGER</TT
+> environment variable as meaning <SPAN
+CLASS="QUOTE"
+>"no
+      pager"</SPAN
+> (Tom Lane)
+     </P
+><P
+>      Previously, such a setting caused output intended for the pager to
+      vanish entirely.
+     </P
+></LI
+><LI
+><P
+>      Improve <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+>'s reporting of
+      low-level <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> errors, such as out-of-memory
+      (Joe Conway)
+     </P
+></LI
+><LI
+><P
+>      Teach <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+> to ignore irrelevant server options
+      when it uses a <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+> foreign server as
+      the source of connection options (Corey Huinker)
+     </P
+><P
+>      Previously, if the foreign server object had options that were not
+      also <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> connection options, an error occurred.
+     </P
+></LI
+><LI
+><P
+>      Fix portability problems in <TT
+CLASS="FILENAME"
+>contrib/pageinspect</TT
+>'s
+      functions for GIN indexes (Peter Eisentraut, Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      On Windows, ensure that environment variable changes are propagated
+      to DLLs built with debug options (Christian Ullrich)
+     </P
+></LI
+><LI
+><P
+>      Sync our copy of the timezone library with IANA release tzcode2016j
+      (Tom Lane)
+     </P
+><P
+>      This fixes various issues, most notably that timezone data
+      installation failed if the target directory didn't support hard
+      links.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2016j
+      for DST law changes in northern Cyprus (adding a new zone
+      Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
+      and Antarctica/Casey.
+      Historical corrections for Italy, Kazakhstan, Malta, and Palestine.
+      Switch to preferring numeric zone abbreviations for Tonga.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-5-7.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-5-5.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.5.7</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.5.5</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-7.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-7.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-7.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-7.html	2017-08-07 21:32:41.000000000 +0000
@@ -0,0 +1,862 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.5.7</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release 9.5.8"
+HREF="release-9-5-8.html"><LINK
+REL="NEXT"
+TITLE="Release 9.5.6"
+HREF="release-9-5-6.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release 9.5.8"
+HREF="release-9-5-8.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.5.6"
+HREF="release-9-5-6.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-5-7"
+>E.2. Release 9.5.7</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-05-11</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.5.6.
+   For information about new features in the 9.5 major release, see
+   <A
+HREF="release-9-5.html"
+>Section E.9</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN126577"
+>E.2.1. Migration to Version 9.5.7</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.5.X.
+   </P
+><P
+>    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </P
+><P
+>    Also, if you are using third-party replication tools that depend
+    on <SPAN
+CLASS="QUOTE"
+>"logical decoding"</SPAN
+>, see the fourth changelog entry below.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.5.6,
+    see <A
+HREF="release-9-5-6.html"
+>Section E.3</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN126585"
+>E.2.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Restrict visibility
+      of <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>.<TT
+CLASS="STRUCTFIELD"
+>umoptions</TT
+>, to
+      protect passwords stored as user mapping options
+      (Michael Paquier, Feike Steenbergen)
+     </P
+><P
+>      The previous coding allowed the owner of a foreign server object,
+      or anyone he has granted server <TT
+CLASS="LITERAL"
+>USAGE</TT
+> permission to,
+      to see the options for all user mappings associated with that server.
+      This might well include passwords for other users.
+      Adjust the view definition to match the behavior of
+      <TT
+CLASS="STRUCTNAME"
+>information_schema.user_mapping_options</TT
+>, namely that
+      these options are visible to the user being mapped, or if the mapping
+      is for <TT
+CLASS="LITERAL"
+>PUBLIC</TT
+> and the current user is the server
+      owner, or if the current user is a superuser.
+      (CVE-2017-7486)
+     </P
+><P
+>      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      follow the corrected procedure shown in the changelog entry for
+      CVE-2017-7547, in <A
+HREF="release-9-5-8.html"
+>Section E.1</A
+>.
+     </P
+></LI
+><LI
+><P
+>      Prevent exposure of statistical information via leaky operators
+      (Peter Eisentraut)
+     </P
+><P
+>      Some selectivity estimation functions in the planner will apply
+      user-defined operators to values obtained
+      from <TT
+CLASS="STRUCTNAME"
+>pg_statistic</TT
+>, such as most common values and
+      histogram entries.  This occurs before table permissions are checked,
+      so a nefarious user could exploit the behavior to obtain these values
+      for table columns he does not have permission to read.  To fix,
+      fall back to a default estimate if the operator's implementation
+      function is not certified leak-proof and the calling user does not have
+      permission to read the table column whose statistics are needed.
+      At least one of these criteria is satisfied in most cases in practice.
+      (CVE-2017-7484)
+     </P
+></LI
+><LI
+><P
+>      Restore <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>'s recognition of
+      the <TT
+CLASS="ENVAR"
+>PGREQUIRESSL</TT
+> environment variable (Daniel Gustafsson)
+     </P
+><P
+>      Processing of this environment variable was unintentionally dropped
+      in <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> 9.3, but its documentation remained.
+      This creates a security hazard, since users might be relying on the
+      environment variable to force SSL-encrypted connections, but that
+      would no longer be guaranteed.  Restore handling of the variable,
+      but give it lower priority than <TT
+CLASS="ENVAR"
+>PGSSLMODE</TT
+>, to avoid
+      breaking configurations that work correctly with post-9.3 code.
+      (CVE-2017-7485)
+     </P
+></LI
+><LI
+><P
+>      Fix possibly-invalid initial snapshot during logical decoding
+      (Petr Jelinek, Andres Freund)
+     </P
+><P
+>      The initial snapshot created for a logical decoding replication slot
+      was potentially incorrect.  This could cause third-party tools that
+      use logical decoding to copy incomplete/inconsistent initial data.
+      This was more likely to happen if the source server was busy at the
+      time of slot creation, or if another logical slot already existed.
+     </P
+><P
+>      If you are using a replication tool that depends on logical decoding,
+      and it should have copied a nonempty data set at the start of
+      replication, it is advisable to recreate the replica after
+      installing this update, or to verify its contents against the source
+      server.
+     </P
+></LI
+><LI
+><P
+>      Fix possible corruption of <SPAN
+CLASS="QUOTE"
+>"init forks"</SPAN
+> of unlogged indexes
+      (Robert Haas, Michael Paquier)
+     </P
+><P
+>      This could result in an unlogged index being set to an invalid state
+      after a crash and restart.  Such a problem would persist until the
+      index was dropped and rebuilt.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect reconstruction of <TT
+CLASS="STRUCTNAME"
+>pg_subtrans</TT
+> entries
+      when a standby server replays a prepared but uncommitted two-phase
+      transaction (Tom Lane)
+     </P
+><P
+>      In most cases this turned out to have no visible ill effects, but in
+      corner cases it could result in circular references
+      in <TT
+CLASS="STRUCTNAME"
+>pg_subtrans</TT
+>, potentially causing infinite loops
+      in queries that examine rows modified by the two-phase transaction.
+     </P
+></LI
+><LI
+><P
+>      Avoid possible crash in <SPAN
+CLASS="APPLICATION"
+>walsender</SPAN
+> due to failure
+      to initialize a string buffer (Stas Kelvich, Fujii Masao)
+     </P
+></LI
+><LI
+><P
+>      Fix possible crash when rescanning a nearest-neighbor index-only scan
+      on a GiST index (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix postmaster's handling of <CODE
+CLASS="FUNCTION"
+>fork()</CODE
+> failure for a
+      background worker process (Tom Lane)
+     </P
+><P
+>      Previously, the postmaster updated portions of its state as though
+      the process had been launched successfully, resulting in subsequent
+      confusion.
+     </P
+></LI
+><LI
+><P
+>      Fix crash or wrong answers when a <TT
+CLASS="LITERAL"
+>GROUPING SETS</TT
+> column's
+      data type is hashable but not sortable (Pavan Deolasee)
+     </P
+></LI
+><LI
+><P
+>      Avoid applying <SPAN
+CLASS="QUOTE"
+>"physical targetlist"</SPAN
+> optimization to custom
+      scans (Dmitry Ivanov, Tom Lane)
+     </P
+><P
+>      This optimization supposed that retrieving all columns of a tuple
+      is inexpensive, which is true for ordinary Postgres tuples; but it
+      might not be the case for a custom scan provider.
+     </P
+></LI
+><LI
+><P
+>      Use the correct sub-expression when applying a <TT
+CLASS="LITERAL"
+>FOR ALL</TT
+>
+      row-level-security policy (Stephen Frost)
+     </P
+><P
+>      In some cases the <TT
+CLASS="LITERAL"
+>WITH CHECK</TT
+> restriction would be applied
+      when the <TT
+CLASS="LITERAL"
+>USING</TT
+> restriction is more appropriate.
+     </P
+></LI
+><LI
+><P
+>      Ensure parsing of queries in extension scripts sees the results of
+      immediately-preceding DDL (Julien Rouhaud, Tom Lane)
+     </P
+><P
+>      Due to lack of a cache flush step between commands in an extension
+      script file, non-utility queries might not see the effects of an
+      immediately preceding catalog change, such as <TT
+CLASS="COMMAND"
+>ALTER TABLE
+      ... RENAME</TT
+>.
+     </P
+></LI
+><LI
+><P
+>      Skip tablespace privilege checks when <TT
+CLASS="COMMAND"
+>ALTER TABLE ... ALTER
+      COLUMN TYPE</TT
+> rebuilds an existing index (Noah Misch)
+     </P
+><P
+>      The command failed if the calling user did not currently have
+      <TT
+CLASS="LITERAL"
+>CREATE</TT
+> privilege for the tablespace containing the index.
+      That behavior seems unhelpful, so skip the check, allowing the
+      index to be rebuilt where it is.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>ALTER TABLE ... VALIDATE CONSTRAINT</TT
+> to not recurse
+      to child tables when the constraint is marked <TT
+CLASS="LITERAL"
+>NO INHERIT</TT
+>
+      (Amit Langote)
+     </P
+><P
+>      This fix prevents unwanted <SPAN
+CLASS="QUOTE"
+>"constraint does not exist"</SPAN
+> failures
+      when no matching constraint is present in the child tables.
+     </P
+></LI
+><LI
+><P
+>      Avoid dangling pointer in <TT
+CLASS="COMMAND"
+>COPY ... TO</TT
+> when row-level
+      security is active for the source table (Tom Lane)
+     </P
+><P
+>      Usually this had no ill effects, but sometimes it would cause
+      unexpected errors or crashes.
+     </P
+></LI
+><LI
+><P
+>      Avoid accessing an already-closed relcache entry in <TT
+CLASS="COMMAND"
+>CLUSTER</TT
+>
+      and <TT
+CLASS="COMMAND"
+>VACUUM FULL</TT
+> (Tom Lane)
+     </P
+><P
+>      With some bad luck, this could lead to indexes on the target
+      relation getting rebuilt with the wrong persistence setting.
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> to account properly for pages that could not
+      be scanned due to conflicting page pins (Andrew Gierth)
+     </P
+><P
+>      This tended to lead to underestimation of the number of tuples in
+      the table.  In the worst case of a small heavily-contended
+      table, <TT
+CLASS="COMMAND"
+>VACUUM</TT
+> could incorrectly report that the table
+      contained no tuples, leading to very bad planning choices.
+     </P
+></LI
+><LI
+><P
+>      Ensure that bulk-tuple-transfer loops within a hash join are
+      interruptible by query cancel requests (Tom Lane, Thomas Munro)
+     </P
+></LI
+><LI
+><P
+>      Fix integer-overflow problems in <TT
+CLASS="TYPE"
+>interval</TT
+> comparison (Kyotaro
+      Horiguchi, Tom Lane)
+     </P
+><P
+>      The comparison operators for type <TT
+CLASS="TYPE"
+>interval</TT
+> could yield wrong
+      answers for intervals larger than about 296000 years.  Indexes on
+      columns containing such large values should be reindexed, since they
+      may be corrupt.
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>cursor_to_xml()</CODE
+> to produce valid output
+      with <TT
+CLASS="REPLACEABLE"
+><I
+>tableforest</I
+></TT
+> = false
+      (Thomas Munro, Peter Eisentraut)
+     </P
+><P
+>      Previously it failed to produce a wrapping <TT
+CLASS="LITERAL"
+>&lt;table&gt;</TT
+>
+      element.
+     </P
+></LI
+><LI
+><P
+>      Fix roundoff problems in <CODE
+CLASS="FUNCTION"
+>float8_timestamptz()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>make_interval()</CODE
+> (Tom Lane)
+     </P
+><P
+>      These functions truncated, rather than rounded, when converting a
+      floating-point value to integer microseconds; that could cause
+      unexpectedly off-by-one results.
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>pg_get_object_address()</CODE
+> to handle members of operator
+      families correctly (&Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Improve performance of <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+> view
+      (Tom Lane, David Rowley)
+     </P
+></LI
+><LI
+><P
+>      Reduce memory management overhead for contexts containing many large
+      blocks (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix sloppy handling of corner-case errors from <CODE
+CLASS="FUNCTION"
+>lseek()</CODE
+>
+      and <CODE
+CLASS="FUNCTION"
+>close()</CODE
+> (Tom Lane)
+     </P
+><P
+>      Neither of these system calls are likely to fail in typical situations,
+      but if they did, <TT
+CLASS="FILENAME"
+>fd.c</TT
+> could get quite confused.
+     </P
+></LI
+><LI
+><P
+>      Fix incorrect check for whether postmaster is running as a Windows
+      service (Michael Paquier)
+     </P
+><P
+>      This could result in attempting to write to the event log when that
+      isn't accessible, so that no logging happens at all.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> to support <TT
+CLASS="COMMAND"
+>COMMIT PREPARED</TT
+>
+      and <TT
+CLASS="COMMAND"
+>ROLLBACK PREPARED</TT
+> (Masahiko Sawada)
+     </P
+></LI
+><LI
+><P
+>      Fix a double-free error when processing dollar-quoted string literals
+      in <SPAN
+CLASS="APPLICATION"
+>ecpg</SPAN
+> (Michael Meskes)
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>, fix incorrect schema and owner marking for
+      comments and security labels of some types of database objects
+      (Giuseppe Broccolo, Tom Lane)
+     </P
+><P
+>      In simple cases this caused no ill effects; but for example, a
+      schema-selective restore might omit comments it should include, because
+      they were not marked as belonging to the schema of their associated
+      object.
+     </P
+></LI
+><LI
+><P
+>      Avoid emitting an invalid list file in <TT
+CLASS="LITERAL"
+>pg_restore -l</TT
+>
+      when SQL object names contain newlines (Tom Lane)
+     </P
+><P
+>      Replace newlines by spaces, which is sufficient to make the output
+      valid for <TT
+CLASS="LITERAL"
+>pg_restore -L</TT
+>'s purposes.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to transfer comments and security labels
+      attached to <SPAN
+CLASS="QUOTE"
+>"large objects"</SPAN
+> (blobs) (Stephen Frost)
+     </P
+><P
+>      Previously, blobs were correctly transferred to the new database, but
+      any comments or security labels attached to them were lost.
+     </P
+></LI
+><LI
+><P
+>      Improve error handling
+      in <TT
+CLASS="FILENAME"
+>contrib/adminpack</TT
+>'s <CODE
+CLASS="FUNCTION"
+>pg_file_write()</CODE
+>
+      function (Noah Misch)
+     </P
+><P
+>      Notably, it failed to detect errors reported
+      by <CODE
+CLASS="FUNCTION"
+>fclose()</CODE
+>.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>contrib/dblink</TT
+>, avoid leaking the previous unnamed
+      connection when establishing a new unnamed connection (Joe Conway)
+     </P
+></LI
+><LI
+><P
+>      Fix <TT
+CLASS="FILENAME"
+>contrib/pg_trgm</TT
+>'s extraction of trigrams from regular
+      expressions (Tom Lane)
+     </P
+><P
+>      In some cases it would produce a broken data structure that could never
+      match anything, leading to GIN or GiST indexscans that use a trigram
+      index not finding any matches to the regular expression.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>contrib/postgres_fdw</TT
+>,
+      transmit query cancellation requests to the remote server
+      (Michael Paquier, Etsuro Fujita)
+     </P
+><P
+>      Previously, a local query cancellation request did not cause an
+      already-sent remote query to terminate early.  This is a back-patch
+      of work originally done for 9.6.
+     </P
+></LI
+><LI
+><P
+>      Support Tcl 8.6 in MSVC builds (&Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Sync our copy of the timezone library with IANA release tzcode2017b
+      (Tom Lane)
+     </P
+><P
+>      This fixes a bug affecting some DST transitions in January 2038.
+     </P
+></LI
+><LI
+><P
+>      Update time zone data files to <SPAN
+CLASS="APPLICATION"
+>tzdata</SPAN
+> release 2017b
+      for DST law changes in Chile, Haiti, and Mongolia, plus historical
+      corrections for Ecuador, Kazakhstan, Liberia, and Spain.
+      Switch to numeric abbreviations for numerous time zones in South
+      America, the Pacific and Indian oceans, and some Asian and Middle
+      Eastern countries.
+     </P
+><P
+>      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <TT
+CLASS="STRUCTNAME"
+>pg_timezone_names</TT
+>
+      view nor used for output.
+     </P
+></LI
+><LI
+><P
+>      Use correct daylight-savings rules for POSIX-style time zone names
+      in MSVC builds (David Rowley)
+     </P
+><P
+>      The Microsoft MSVC build scripts neglected to install
+      the <TT
+CLASS="FILENAME"
+>posixrules</TT
+> file in the timezone directory tree.
+      This resulted in the timezone code falling back to its built-in
+      rule about what DST behavior to assume for a POSIX-style time zone
+      name.  For historical reasons that still corresponds to the DST rules
+      the USA was using before 2007 (i.e., change on first Sunday in April
+      and last Sunday in October).  With this fix, a POSIX-style zone name
+      will use the current and historical DST transition dates of
+      the <TT
+CLASS="LITERAL"
+>US/Eastern</TT
+> zone.  If you don't want that, remove
+      the <TT
+CLASS="FILENAME"
+>posixrules</TT
+> file, or replace it with a copy of some
+      other zone file (see <A
+HREF="datatype-datetime.html#DATATYPE-TIMEZONES"
+>Section 8.5.3</A
+>).  Note that
+      due to caching, you may need to restart the server to get such changes
+      to take effect.
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release-9-5-8.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-5-6.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release 9.5.8</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.5.6</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-8.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-8.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5-8.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5-8.html	2017-08-07 21:32:41.000000000 +0000
@@ -0,0 +1,1069 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Release 9.5.8</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="PREVIOUS"
+TITLE="Release Notes"
+HREF="release.html"><LINK
+REL="NEXT"
+TITLE="Release 9.5.7"
+HREF="release-9-5-7.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="Release Notes"
+HREF="release.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Appendix E. Release Notes</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="Release 9.5.7"
+HREF="release-9-5-7.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="RELEASE-9-5-8"
+>E.1. Release 9.5.8</A
+></H1
+><DIV
+CLASS="FORMALPARA"
+><P
+><B
+>Release date: </B
+>2017-08-10</P
+></DIV
+><P
+>   This release contains a variety of fixes from 9.5.7.
+   For information about new features in the 9.5 major release, see
+   <A
+HREF="release-9-5.html"
+>Section E.9</A
+>.
+  </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN126314"
+>E.1.1. Migration to Version 9.5.8</A
+></H2
+><P
+>    A dump/restore is not required for those running 9.5.X.
+   </P
+><P
+>    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </P
+><P
+>    Also, if you are upgrading from a version earlier than 9.5.7,
+    see <A
+HREF="release-9-5-7.html"
+>Section E.2</A
+>.
+   </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN126320"
+>E.1.2. Changes</A
+></H2
+><P
+></P
+><UL
+><LI
+><P
+>      Further restrict visibility
+      of <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>.<TT
+CLASS="STRUCTFIELD"
+>umoptions</TT
+>, to
+      protect passwords stored as user mapping options
+      (Noah Misch)
+     </P
+><P
+>      The fix for CVE-2017-7486 was incorrect: it allowed a user
+      to see the options in her own user mapping, even if she did not
+      have <TT
+CLASS="LITERAL"
+>USAGE</TT
+> permission on the associated foreign server.
+      Such options might include a password that had been provided by the
+      server owner rather than the user herself.
+      Since <TT
+CLASS="STRUCTNAME"
+>information_schema.user_mapping_options</TT
+> does not
+      show the options in such cases, <TT
+CLASS="STRUCTNAME"
+>pg_user_mappings</TT
+>
+      should not either.
+      (CVE-2017-7547)
+     </P
+><P
+>      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      you will need to do the following:
+     </P
+><DIV
+CLASS="PROCEDURE"
+><OL
+TYPE="1"
+><LI
+CLASS="STEP"
+><P
+>        Restart the postmaster after adding <TT
+CLASS="LITERAL"
+>allow_system_table_mods
+        = true</TT
+> to <TT
+CLASS="FILENAME"
+>postgresql.conf</TT
+>.  (In versions
+        supporting <TT
+CLASS="COMMAND"
+>ALTER SYSTEM</TT
+>, you can use that to make the
+        configuration change, but you'll still need a restart.)
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        In <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>each</I
+></SPAN
+> database of the cluster,
+        run the following commands as superuser:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SET search_path = pg_catalog;
+CREATE OR REPLACE VIEW pg_user_mappings AS
+    SELECT
+        U.oid       AS umid,
+        S.oid       AS srvid,
+        S.srvname   AS srvname,
+        U.umuser    AS umuser,
+        CASE WHEN U.umuser = 0 THEN
+            'public'
+        ELSE
+            A.rolname
+        END AS usename,
+        CASE WHEN (U.umuser &lt;&gt; 0 AND A.rolname = current_user
+                     AND (pg_has_role(S.srvowner, 'USAGE')
+                          OR has_server_privilege(S.oid, 'USAGE')))
+                    OR (U.umuser = 0 AND pg_has_role(S.srvowner, 'USAGE'))
+                    OR (SELECT rolsuper FROM pg_authid WHERE rolname = current_user)
+                    THEN U.umoptions
+                 ELSE NULL END AS umoptions
+    FROM pg_user_mapping U
+         LEFT JOIN pg_authid A ON (A.oid = U.umuser) JOIN
+        pg_foreign_server S ON (U.umserver = S.oid);</PRE
+><P>
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        Do not forget to include the <TT
+CLASS="LITERAL"
+>template0</TT
+>
+        and <TT
+CLASS="LITERAL"
+>template1</TT
+> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <TT
+CLASS="LITERAL"
+>template0</TT
+>,
+        you'll need to temporarily make it accept connections.
+        In <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> 9.5 and later, you can use
+</P><PRE
+CLASS="PROGRAMLISTING"
+>ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;</PRE
+><P>
+        and then after fixing <TT
+CLASS="LITERAL"
+>template0</TT
+>, undo that with
+</P><PRE
+CLASS="PROGRAMLISTING"
+>ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;</PRE
+><P>
+        In prior versions, instead use
+</P><PRE
+CLASS="PROGRAMLISTING"
+>UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
+UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';</PRE
+><P>
+       </P
+></LI
+><LI
+CLASS="STEP"
+><P
+>        Finally, remove the <TT
+CLASS="LITERAL"
+>allow_system_table_mods</TT
+> configuration
+        setting, and again restart the postmaster.
+       </P
+></LI
+></OL
+></DIV
+></LI
+><LI
+><P
+>      Disallow empty passwords in all password-based authentication methods
+      (Heikki Linnakangas)
+     </P
+><P
+>      <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+> ignores empty password specifications, and does
+      not transmit them to the server.  So, if a user's password has been
+      set to the empty string, it's impossible to log in with that password
+      via <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+> or other <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>-based
+      clients.  An administrator might therefore believe that setting the
+      password to empty is equivalent to disabling password login.
+      However, with a modified or non-<SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>-based client,
+      logging in could be possible, depending on which authentication
+      method is configured.  In particular the most common
+      method, <TT
+CLASS="LITERAL"
+>md5</TT
+>, accepted empty passwords.
+      Change the server to reject empty passwords in all cases.
+      (CVE-2017-7546)
+     </P
+></LI
+><LI
+><P
+>      Make <CODE
+CLASS="FUNCTION"
+>lo_put()</CODE
+> check for <TT
+CLASS="LITERAL"
+>UPDATE</TT
+> privilege on
+      the target large object (Tom Lane, Michael Paquier)
+     </P
+><P
+>      <CODE
+CLASS="FUNCTION"
+>lo_put()</CODE
+> should surely require the same permissions
+      as <CODE
+CLASS="FUNCTION"
+>lowrite()</CODE
+>, but the check was missing, allowing any
+      user to change the data in a large object.
+      (CVE-2017-7548)
+     </P
+></LI
+><LI
+><P
+>      Correct the documentation about the process for upgrading standby
+      servers with <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> (Bruce Momjian)
+     </P
+><P
+>      The previous documentation instructed users to start/stop the primary
+      server after running <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> but before syncing
+      the standby servers.  This sequence is unsafe.
+     </P
+></LI
+><LI
+><P
+>      Fix concurrent locking of tuple update chains (&Aacute;lvaro Herrera)
+     </P
+><P
+>      If several sessions concurrently lock a tuple update chain with
+      nonconflicting lock modes using an old snapshot, and they all
+      succeed, it was possible for some of them to nonetheless fail (and
+      conclude there is no live tuple version) due to a race condition.
+      This had consequences such as foreign-key checks failing to see a
+      tuple that definitely exists but is being updated concurrently.
+     </P
+></LI
+><LI
+><P
+>      Fix potential data corruption when freezing a tuple whose XMAX is a
+      multixact with exactly one still-interesting member (Teodor Sigaev)
+     </P
+></LI
+><LI
+><P
+>      Avoid integer overflow and ensuing crash when sorting more than one
+      billion tuples in-memory (Sergey Koposov)
+     </P
+></LI
+><LI
+><P
+>      On Windows, retry process creation if we fail to reserve the address
+      range for our shared memory in the new process (Tom Lane, Amit
+      Kapila)
+     </P
+><P
+>      This is expected to fix infrequent child-process-launch failures that
+      are probably due to interference from antivirus products.
+     </P
+></LI
+><LI
+><P
+>      Fix low-probability corruption of shared predicate-lock hash table
+      in Windows builds (Thomas Munro, Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Avoid logging clean closure of an SSL connection as though
+      it were a connection reset (Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Prevent sending SSL session tickets to clients (Tom Lane)
+     </P
+><P
+>      This fix prevents reconnection failures with ticket-aware client-side
+      SSL code.
+     </P
+></LI
+><LI
+><P
+>      Fix code for setting <A
+HREF="runtime-config-connection.html#GUC-TCP-KEEPALIVES-IDLE"
+>tcp_keepalives_idle</A
+> on
+      Solaris (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix statistics collector to honor inquiry messages issued just after
+      a postmaster shutdown and immediate restart (Tom Lane)
+     </P
+><P
+>      Statistics inquiries issued within half a second of the previous
+      postmaster shutdown were effectively ignored.
+     </P
+></LI
+><LI
+><P
+>      Ensure that the statistics collector's receive buffer size is at
+      least 100KB (Tom Lane)
+     </P
+><P
+>      This reduces the risk of dropped statistics data on older platforms
+      whose default receive buffer size is less than that.
+     </P
+></LI
+><LI
+><P
+>      Fix possible creation of an invalid WAL segment when a standby is
+      promoted just after it processes an <TT
+CLASS="LITERAL"
+>XLOG_SWITCH</TT
+> WAL
+      record (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>walsender</SPAN
+> to exit promptly when client requests
+      shutdown (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="SYSTEMITEM"
+>SIGHUP</SPAN
+> and <SPAN
+CLASS="SYSTEMITEM"
+>SIGUSR1</SPAN
+> handling in
+      walsender processes (Petr Jelinek, Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      Prevent walsender-triggered panics during shutdown checkpoints
+      (Andres Freund, Michael Paquier)
+     </P
+></LI
+><LI
+><P
+>      Fix unnecessarily slow restarts of <SPAN
+CLASS="APPLICATION"
+>walreceiver</SPAN
+>
+      processes due to race condition in postmaster (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix leakage of small subtransactions spilled to disk during logical
+      decoding (Andres Freund)
+     </P
+><P
+>      This resulted in temporary files consuming excessive disk space.
+     </P
+></LI
+><LI
+><P
+>      Reduce the work needed to build snapshots during creation of
+      logical-decoding slots (Andres Freund, Petr Jelinek)
+     </P
+><P
+>      The previous algorithm was infeasibly expensive on a server with a
+      lot of open transactions.
+     </P
+></LI
+><LI
+><P
+>      Fix race condition that could indefinitely delay creation of
+      logical-decoding slots (Andres Freund, Petr Jelinek)
+     </P
+></LI
+><LI
+><P
+>      Reduce overhead in processing syscache invalidation events (Tom Lane)
+     </P
+><P
+>      This is particularly helpful for logical decoding, which triggers
+      frequent cache invalidation.
+     </P
+></LI
+><LI
+><P
+>      Fix cases where an <TT
+CLASS="COMMAND"
+>INSERT</TT
+> or <TT
+CLASS="COMMAND"
+>UPDATE</TT
+> assigns
+      to more than one element of a column that is of domain-over-array
+      type (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Allow window functions to be used in sub-<TT
+CLASS="LITERAL"
+>SELECT</TT
+>s that
+      are within the arguments of an aggregate function (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Move autogenerated array types out of the way during
+      <TT
+CLASS="COMMAND"
+>ALTER ... RENAME</TT
+> (Vik Fearing)
+     </P
+><P
+>      Previously, we would rename a conflicting autogenerated array type
+      out of the way during <TT
+CLASS="COMMAND"
+>CREATE</TT
+>; this fix extends that
+      behavior to renaming operations.
+     </P
+></LI
+><LI
+><P
+>      Fix dangling pointer in <TT
+CLASS="COMMAND"
+>ALTER TABLE</TT
+> when there is a
+      comment on a constraint belonging to the table (David Rowley)
+     </P
+><P
+>      Re-applying the comment to the reconstructed constraint could fail
+      with a weird error message, or even crash.
+     </P
+></LI
+><LI
+><P
+>      Ensure that <TT
+CLASS="COMMAND"
+>ALTER USER ... SET</TT
+> accepts all the syntax
+      variants that <TT
+CLASS="COMMAND"
+>ALTER ROLE ... SET</TT
+> does (Peter Eisentraut)
+     </P
+></LI
+><LI
+><P
+>      Properly update dependency info when changing a datatype I/O
+      function's argument or return type from <TT
+CLASS="TYPE"
+>opaque</TT
+> to the
+      correct type (Heikki Linnakangas)
+     </P
+><P
+>      <TT
+CLASS="COMMAND"
+>CREATE TYPE</TT
+> updates I/O functions declared in this
+      long-obsolete style, but it forgot to record a dependency on the
+      type, allowing a subsequent <TT
+CLASS="COMMAND"
+>DROP TYPE</TT
+> to leave broken
+      function definitions behind.
+     </P
+></LI
+><LI
+><P
+>      Reduce memory usage when <TT
+CLASS="COMMAND"
+>ANALYZE</TT
+> processes
+      a <TT
+CLASS="TYPE"
+>tsvector</TT
+> column (Heikki Linnakangas)
+     </P
+></LI
+><LI
+><P
+>      Fix unnecessary precision loss and sloppy rounding when multiplying
+      or dividing <TT
+CLASS="TYPE"
+>money</TT
+> values by integers or floats (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Tighten checks for whitespace in functions that parse identifiers,
+      such as <CODE
+CLASS="FUNCTION"
+>regprocedurein()</CODE
+> (Tom Lane)
+     </P
+><P
+>      Depending on the prevailing locale, these functions could
+      misinterpret fragments of multibyte characters as whitespace.
+     </P
+></LI
+><LI
+><P
+>      Use relevant <TT
+CLASS="LITERAL"
+>#define</TT
+> symbols from Perl while
+      compiling <SPAN
+CLASS="APPLICATION"
+>PL/Perl</SPAN
+> (Ashutosh Sharma, Tom Lane)
+     </P
+><P
+>      This avoids portability problems, typically manifesting as
+      a <SPAN
+CLASS="QUOTE"
+>"handshake"</SPAN
+> mismatch during library load, when working with
+      recent Perl versions.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>libpq</SPAN
+>, reset GSS/SASL and SSPI authentication
+      state properly after a failed connection attempt (Michael Paquier)
+     </P
+><P
+>      Failure to do this meant that when falling back from SSL to non-SSL
+      connections, a GSS/SASL failure in the SSL attempt would always cause
+      the non-SSL attempt to fail.  SSPI did not fail, but it leaked memory.
+     </P
+></LI
+><LI
+><P
+>      In <SPAN
+CLASS="APPLICATION"
+>psql</SPAN
+>, fix failure when <TT
+CLASS="COMMAND"
+>COPY FROM STDIN</TT
+>
+      is ended with a keyboard EOF signal and then another <TT
+CLASS="COMMAND"
+>COPY
+      FROM STDIN</TT
+> is attempted (Thomas Munro)
+     </P
+><P
+>      This misbehavior was observed on BSD-derived platforms (including
+      macOS), but not on most others.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> and <SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+> to
+      emit <TT
+CLASS="COMMAND"
+>REFRESH MATERIALIZED VIEW</TT
+> commands last (Tom Lane)
+     </P
+><P
+>      This prevents errors during dump/restore when a materialized view
+      refers to tables owned by a different user.
+     </P
+></LI
+><LI
+><P
+>      Improve <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+>/<SPAN
+CLASS="APPLICATION"
+>pg_restore</SPAN
+>'s
+      reporting of error conditions originating in <SPAN
+CLASS="APPLICATION"
+>zlib</SPAN
+>
+      (Vladimir Kunschikov, &Aacute;lvaro Herrera)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> with the <TT
+CLASS="OPTION"
+>--clean</TT
+> option to
+      drop event triggers as expected (Tom Lane)
+     </P
+><P
+>      It also now correctly assigns ownership of event triggers; before,
+      they were restored as being owned by the superuser running the
+      restore script.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> to not emit invalid SQL for an empty
+      operator class (Daniel Gustafsson)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> output to stdout on Windows (Kuntal Ghosh)
+     </P
+><P
+>      A compressed plain-text dump written to stdout would contain corrupt
+      data due to failure to put the file descriptor into binary mode.
+     </P
+></LI
+><LI
+><P
+>      Fix <CODE
+CLASS="FUNCTION"
+>pg_get_ruledef()</CODE
+> to print correct output for
+      the <TT
+CLASS="LITERAL"
+>ON SELECT</TT
+> rule of a view whose columns have been
+      renamed (Tom Lane)
+     </P
+><P
+>      In some corner cases, <SPAN
+CLASS="APPLICATION"
+>pg_dump</SPAN
+> relies
+      on <CODE
+CLASS="FUNCTION"
+>pg_get_ruledef()</CODE
+> to dump views, so that this error
+      could result in dump/reload failures.
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of outer joins with empty constraints, such as the result
+      of a <TT
+CLASS="LITERAL"
+>NATURAL LEFT JOIN</TT
+> with no common columns (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix dumping of function expressions in the <TT
+CLASS="LITERAL"
+>FROM</TT
+> clause in
+      cases where the expression does not deparse into something that looks
+      like a function call (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_basebackup</SPAN
+> output to stdout on Windows
+      (Haribabu Kommi)
+     </P
+><P
+>      A backup written to stdout would contain corrupt data due to failure
+      to put the file descriptor into binary mode.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_rewind</SPAN
+> to correctly handle files exceeding 2GB
+      (Kuntal Ghosh, Michael Paquier)
+     </P
+><P
+>      Ordinarily such files won't appear in <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> data
+      directories, but they could be present in some cases.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+> to ensure that the ending WAL record
+      does not have <A
+HREF="runtime-config-wal.html#GUC-WAL-LEVEL"
+>wal_level</A
+> = <TT
+CLASS="LITERAL"
+>minimum</TT
+>
+      (Bruce Momjian)
+     </P
+><P
+>      This condition could prevent upgraded standby servers from
+      reconnecting.
+     </P
+></LI
+><LI
+><P
+>      Fix <SPAN
+CLASS="APPLICATION"
+>pg_xlogdump</SPAN
+>'s computation of WAL record length
+      (Andres Freund)
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>postgres_fdw</TT
+>, re-establish connections to remote
+      servers after <TT
+CLASS="COMMAND"
+>ALTER SERVER</TT
+> or <TT
+CLASS="COMMAND"
+>ALTER USER
+      MAPPING</TT
+> commands (Kyotaro Horiguchi)
+     </P
+><P
+>      This ensures that option changes affecting connection parameters will
+      be applied promptly.
+     </P
+></LI
+><LI
+><P
+>      In <TT
+CLASS="FILENAME"
+>postgres_fdw</TT
+>, allow cancellation of remote
+      transaction control commands (Robert Haas, Rafia Sabih)
+     </P
+><P
+>      This change allows us to quickly escape a wait for an unresponsive
+      remote server in many more cases than previously.
+     </P
+></LI
+><LI
+><P
+>      Increase <TT
+CLASS="LITERAL"
+>MAX_SYSCACHE_CALLBACKS</TT
+> to provide more room for
+      extensions (Tom Lane)
+     </P
+></LI
+><LI
+><P
+>      Always use <TT
+CLASS="OPTION"
+>-fPIC</TT
+>, not <TT
+CLASS="OPTION"
+>-fpic</TT
+>, when building
+      shared libraries with gcc (Tom Lane)
+     </P
+><P
+>      This supports larger extension libraries on platforms where it makes
+      a difference.
+     </P
+></LI
+><LI
+><P
+>      Fix unescaped-braces issue in our build scripts for Microsoft MSVC,
+      to avoid a warning or error from recent Perl versions (Andrew
+      Dunstan)
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, handle the case where the <SPAN
+CLASS="APPLICATION"
+>openssl</SPAN
+>
+      library is not within a <TT
+CLASS="FILENAME"
+>VC</TT
+> subdirectory (Andrew Dunstan)
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, add proper include path for <SPAN
+CLASS="APPLICATION"
+>libxml2</SPAN
+>
+      header files (Andrew Dunstan)
+     </P
+><P
+>      This fixes a former need to move things around in standard Windows
+      installations of <SPAN
+CLASS="APPLICATION"
+>libxml2</SPAN
+>.
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, recognize a Tcl library that is
+      named <TT
+CLASS="FILENAME"
+>tcl86.lib</TT
+> (Noah Misch)
+     </P
+></LI
+><LI
+><P
+>      In MSVC builds, honor <TT
+CLASS="LITERAL"
+>PROVE_FLAGS</TT
+> settings
+      on <TT
+CLASS="FILENAME"
+>vcregress.pl</TT
+>'s command line (Andrew Dunstan)
+     </P
+></LI
+></UL
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="release-9-5-7.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Release Notes</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="release.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Release 9.5.7</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5.html postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release-9-5.html	2016-03-28 20:21:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release-9-5.html	2017-08-07 21:32:42.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Release Notes"
@@ -18,15 +18,15 @@
 TITLE="Release 9.5.1"
 HREF="release-9-5-1.html"><LINK
 REL="NEXT"
-TITLE="Release 9.4.7"
-HREF="release-9-4-7.html"><LINK
+TITLE="Release 9.4.13"
+HREF="release-9-4-13.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="Release 9.4.7"
-HREF="release-9-4-7.html"
+TITLE="Release 9.4.13"
+HREF="release-9-4-13.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -93,25 +93,22 @@
 CLASS="SECT1"
 ><A
 NAME="RELEASE-9-5"
->E.3. Release 9.5</A
+>E.9. Release 9.5</A
 ></H1
 ><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
+CLASS="FORMALPARA"
 ><P
 ><B
->Release Date: </B
+>Release date: </B
 >2016-01-07</P
-></BLOCKQUOTE
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN126203"
->E.3.1. Overview</A
+NAME="AEN127882"
+>E.9.1. Overview</A
 ></H2
 ><P
 >    Major enhancements in <SPAN
@@ -216,8 +213,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN126237"
->E.3.2. Migration to Version 9.5</A
+NAME="AEN127916"
+>E.9.2. Migration to Version 9.5</A
 ></H2
 ><P
 >    A dump/restore using <A
@@ -572,8 +569,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN126334"
->E.3.3. Changes</A
+NAME="AEN128013"
+>E.9.3. Changes</A
 ></H2
 ><P
 >    Below you will find a detailed account of the changes between
@@ -588,16 +585,16 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN126338"
->E.3.3.1. Server</A
+NAME="AEN128017"
+>E.9.3.1. Server</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126340"
->E.3.3.1.1. Indexes</A
+NAME="AEN128019"
+>E.9.3.1.1. Indexes</A
 ></H4
 ><P
 ></P
@@ -689,8 +686,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126366"
->E.3.3.1.2. General Performance</A
+NAME="AEN128045"
+>E.9.3.1.2. General Performance</A
 ></H4
 ><P
 ></P
@@ -853,8 +850,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126418"
->E.3.3.1.3. Monitoring</A
+NAME="AEN128097"
+>E.9.3.1.3. Monitoring</A
 ></H4
 ><P
 ></P
@@ -864,7 +861,7 @@
 >        Add per-table autovacuum logging control via new
         <TT
 CLASS="VARNAME"
->log_min_autovacuum_duration</TT
+>log_autovacuum_min_duration</TT
 > storage parameter
         (Michael Paquier)
        </P
@@ -905,8 +902,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126433"
->E.3.3.1.4. <ACRONYM
+NAME="AEN128112"
+>E.9.3.1.4. <ACRONYM
 CLASS="ACRONYM"
 >SSL</ACRONYM
 ></A
@@ -1036,8 +1033,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126472"
->E.3.3.1.5. Server Settings</A
+NAME="AEN128151"
+>E.9.3.1.5. Server Settings</A
 ></H4
 ><P
 ></P
@@ -1258,8 +1255,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN126537"
->E.3.3.2. Replication and Recovery</A
+NAME="AEN128216"
+>E.9.3.2. Replication and Recovery</A
 ></H3
 ><P
 ></P
@@ -1404,7 +1401,7 @@
 ><LI
 ><P
 >        Report the processes holding replication slots in <A
-HREF="catalog-pg-replication-slots.html"
+HREF="view-pg-replication-slots.html"
 ><TT
 CLASS="STRUCTNAME"
 >pg_replication_slots</TT
@@ -1448,8 +1445,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN126595"
->E.3.3.3. Queries</A
+NAME="AEN128274"
+>E.9.3.3. Queries</A
 ></H3
 ><P
 ></P
@@ -1591,8 +1588,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN126637"
->E.3.3.4. Utility Commands</A
+NAME="AEN128316"
+>E.9.3.4. Utility Commands</A
 ></H3
 ><P
 ></P
@@ -1661,8 +1658,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126659"
->E.3.3.4.1. <A
+NAME="AEN128338"
+>E.9.3.4.1. <A
 HREF="sql-reindex.html"
 >REINDEX</A
 ></A
@@ -1730,8 +1727,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN126680"
->E.3.3.5. Object Manipulation</A
+NAME="AEN128359"
+>E.9.3.5. Object Manipulation</A
 ></H3
 ><P
 ></P
@@ -1981,8 +1978,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126756"
->E.3.3.5.1. <A
+NAME="AEN128435"
+>E.9.3.5.1. <A
 HREF="ddl-foreign-data.html"
 >Foreign Tables</A
 ></A
@@ -2050,8 +2047,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126775"
->E.3.3.5.2. <A
+NAME="AEN128454"
+>E.9.3.5.2. <A
 HREF="event-triggers.html"
 >Event Triggers</A
 ></A
@@ -2148,8 +2145,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN126805"
->E.3.3.6. Data Types</A
+NAME="AEN128484"
+>E.9.3.6. Data Types</A
 ></H3
 ><P
 ></P
@@ -2267,8 +2264,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126841"
->E.3.3.6.1. <A
+NAME="AEN128520"
+>E.9.3.6.1. <A
 HREF="datatype-json.html"
 ><ACRONYM
 CLASS="ACRONYM"
@@ -2439,8 +2436,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN126894"
->E.3.3.7. Functions</A
+NAME="AEN128573"
+>E.9.3.7. Functions</A
 ></H3
 ><P
 ></P
@@ -2604,8 +2601,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126945"
->E.3.3.7.1. System Information Functions and Views</A
+NAME="AEN128624"
+>E.9.3.7.1. System Information Functions and Views</A
 ></H4
 ><P
 ></P
@@ -2702,8 +2699,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN126974"
->E.3.3.7.2. Aggregates</A
+NAME="AEN128653"
+>E.9.3.7.2. Aggregates</A
 ></H4
 ><P
 ></P
@@ -2747,8 +2744,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN126987"
->E.3.3.8. Server-Side Languages</A
+NAME="AEN128666"
+>E.9.3.8. Server-Side Languages</A
 ></H3
 ><P
 ></P
@@ -2839,8 +2836,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN127016"
->E.3.3.8.1. <A
+NAME="AEN128695"
+>E.9.3.8.1. <A
 HREF="plpgsql.html"
 >PL/pgSQL</A
 > Server-Side Language</A
@@ -2895,8 +2892,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN127033"
->E.3.3.9. Client Applications</A
+NAME="AEN128712"
+>E.9.3.9. Client Applications</A
 ></H3
 ><P
 ></P
@@ -3088,8 +3085,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN127093"
->E.3.3.9.1. <A
+NAME="AEN128772"
+>E.9.3.9.1. <A
 HREF="app-psql.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3206,7 +3203,7 @@
 CLASS="OPTION"
 >--log-file</TT
 > switch cannot be
-         written (Tom Lane, Daniel Verite)
+         written (Tom Lane, Daniel V&eacute;rit&eacute;)
         </P
 ><P
 >         Previously, it effectively ignored the switch in such cases.
@@ -3242,8 +3239,8 @@
 ><H5
 CLASS="SECT5"
 ><A
-NAME="AEN127141"
->E.3.3.9.1.1. <A
+NAME="AEN128820"
+>E.9.3.9.1.1. <A
 HREF="app-psql.html#APP-PSQL-META-COMMANDS"
 >Backslash Commands</A
 ></A
@@ -3403,8 +3400,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN127190"
->E.3.3.9.2. <A
+NAME="AEN128869"
+>E.9.3.9.2. <A
 HREF="app-pgdump.html"
 >pg_dump</A
 ></A
@@ -3495,8 +3492,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN127217"
->E.3.3.9.3. <A
+NAME="AEN128896"
+>E.9.3.9.3. <A
 HREF="app-pg-ctl.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3569,8 +3566,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN127238"
->E.3.3.9.4. <A
+NAME="AEN128917"
+>E.9.3.9.4. <A
 HREF="pgupgrade.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3641,8 +3638,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN127259"
->E.3.3.9.5. <A
+NAME="AEN128938"
+>E.9.3.9.5. <A
 HREF="pgbench.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -3727,8 +3724,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN127283"
->E.3.3.10. Source Code</A
+NAME="AEN128962"
+>E.9.3.10. Source Code</A
 ></H3
 ><P
 ></P
@@ -3898,8 +3895,8 @@
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN127337"
->E.3.3.10.1. MS Windows</A
+NAME="AEN129016"
+>E.9.3.10.1. MS Windows</A
 ></H4
 ><P
 ></P
@@ -4011,8 +4008,8 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN127372"
->E.3.3.11. Additional Modules</A
+NAME="AEN129051"
+>E.9.3.11. Additional Modules</A
 ></H3
 ><P
 ></P
@@ -4220,7 +4217,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="release-9-4-7.html"
+HREF="release-9-4-13.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -4244,7 +4241,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Release 9.4.7</TD
+>Release 9.4.13</TD
 ></TR
 ></TABLE
 ></DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/release.html postgresql-9.5-9.5.8/doc/src/sgml/html/release.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/release.html	2016-03-28 20:21:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/release.html	2017-08-07 21:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -18,15 +18,15 @@
 TITLE="Unsupported Features"
 HREF="unsupported-features-sql-standard.html"><LINK
 REL="NEXT"
-TITLE="Release 9.5.2"
-HREF="release-9-5-2.html"><LINK
+TITLE="Release 9.5.8"
+HREF="release-9-5-8.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="Release 9.5.2"
-HREF="release-9-5-2.html"
+TITLE="Release 9.5.8"
+HREF="release-9-5-8.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -103,1496 +103,1631 @@
 ></DT
 ><DT
 >E.1. <A
+HREF="release-9-5-8.html"
+>Release 9.5.8</A
+></DT
+><DT
+>E.2. <A
+HREF="release-9-5-7.html"
+>Release 9.5.7</A
+></DT
+><DT
+>E.3. <A
+HREF="release-9-5-6.html"
+>Release 9.5.6</A
+></DT
+><DT
+>E.4. <A
+HREF="release-9-5-5.html"
+>Release 9.5.5</A
+></DT
+><DT
+>E.5. <A
+HREF="release-9-5-4.html"
+>Release 9.5.4</A
+></DT
+><DT
+>E.6. <A
+HREF="release-9-5-3.html"
+>Release 9.5.3</A
+></DT
+><DT
+>E.7. <A
 HREF="release-9-5-2.html"
 >Release 9.5.2</A
 ></DT
 ><DT
->E.2. <A
+>E.8. <A
 HREF="release-9-5-1.html"
 >Release 9.5.1</A
 ></DT
 ><DT
->E.3. <A
+>E.9. <A
 HREF="release-9-5.html"
 >Release 9.5</A
 ></DT
 ><DT
->E.4. <A
+>E.10. <A
+HREF="release-9-4-13.html"
+>Release 9.4.13</A
+></DT
+><DT
+>E.11. <A
+HREF="release-9-4-12.html"
+>Release 9.4.12</A
+></DT
+><DT
+>E.12. <A
+HREF="release-9-4-11.html"
+>Release 9.4.11</A
+></DT
+><DT
+>E.13. <A
+HREF="release-9-4-10.html"
+>Release 9.4.10</A
+></DT
+><DT
+>E.14. <A
+HREF="release-9-4-9.html"
+>Release 9.4.9</A
+></DT
+><DT
+>E.15. <A
+HREF="release-9-4-8.html"
+>Release 9.4.8</A
+></DT
+><DT
+>E.16. <A
 HREF="release-9-4-7.html"
 >Release 9.4.7</A
 ></DT
 ><DT
->E.5. <A
+>E.17. <A
 HREF="release-9-4-6.html"
 >Release 9.4.6</A
 ></DT
 ><DT
->E.6. <A
+>E.18. <A
 HREF="release-9-4-5.html"
 >Release 9.4.5</A
 ></DT
 ><DT
->E.7. <A
+>E.19. <A
 HREF="release-9-4-4.html"
 >Release 9.4.4</A
 ></DT
 ><DT
->E.8. <A
+>E.20. <A
 HREF="release-9-4-3.html"
 >Release 9.4.3</A
 ></DT
 ><DT
->E.9. <A
+>E.21. <A
 HREF="release-9-4-2.html"
 >Release 9.4.2</A
 ></DT
 ><DT
->E.10. <A
+>E.22. <A
 HREF="release-9-4-1.html"
 >Release 9.4.1</A
 ></DT
 ><DT
->E.11. <A
+>E.23. <A
 HREF="release-9-4.html"
 >Release 9.4</A
 ></DT
 ><DT
->E.12. <A
+>E.24. <A
+HREF="release-9-3-18.html"
+>Release 9.3.18</A
+></DT
+><DT
+>E.25. <A
+HREF="release-9-3-17.html"
+>Release 9.3.17</A
+></DT
+><DT
+>E.26. <A
+HREF="release-9-3-16.html"
+>Release 9.3.16</A
+></DT
+><DT
+>E.27. <A
+HREF="release-9-3-15.html"
+>Release 9.3.15</A
+></DT
+><DT
+>E.28. <A
+HREF="release-9-3-14.html"
+>Release 9.3.14</A
+></DT
+><DT
+>E.29. <A
+HREF="release-9-3-13.html"
+>Release 9.3.13</A
+></DT
+><DT
+>E.30. <A
 HREF="release-9-3-12.html"
 >Release 9.3.12</A
 ></DT
 ><DT
->E.13. <A
+>E.31. <A
 HREF="release-9-3-11.html"
 >Release 9.3.11</A
 ></DT
 ><DT
->E.14. <A
+>E.32. <A
 HREF="release-9-3-10.html"
 >Release 9.3.10</A
 ></DT
 ><DT
->E.15. <A
+>E.33. <A
 HREF="release-9-3-9.html"
 >Release 9.3.9</A
 ></DT
 ><DT
->E.16. <A
+>E.34. <A
 HREF="release-9-3-8.html"
 >Release 9.3.8</A
 ></DT
 ><DT
->E.17. <A
+>E.35. <A
 HREF="release-9-3-7.html"
 >Release 9.3.7</A
 ></DT
 ><DT
->E.18. <A
+>E.36. <A
 HREF="release-9-3-6.html"
 >Release 9.3.6</A
 ></DT
 ><DT
->E.19. <A
+>E.37. <A
 HREF="release-9-3-5.html"
 >Release 9.3.5</A
 ></DT
 ><DT
->E.20. <A
+>E.38. <A
 HREF="release-9-3-4.html"
 >Release 9.3.4</A
 ></DT
 ><DT
->E.21. <A
+>E.39. <A
 HREF="release-9-3-3.html"
 >Release 9.3.3</A
 ></DT
 ><DT
->E.22. <A
+>E.40. <A
 HREF="release-9-3-2.html"
 >Release 9.3.2</A
 ></DT
 ><DT
->E.23. <A
+>E.41. <A
 HREF="release-9-3-1.html"
 >Release 9.3.1</A
 ></DT
 ><DT
->E.24. <A
+>E.42. <A
 HREF="release-9-3.html"
 >Release 9.3</A
 ></DT
 ><DT
->E.25. <A
+>E.43. <A
+HREF="release-9-2-22.html"
+>Release 9.2.22</A
+></DT
+><DT
+>E.44. <A
+HREF="release-9-2-21.html"
+>Release 9.2.21</A
+></DT
+><DT
+>E.45. <A
+HREF="release-9-2-20.html"
+>Release 9.2.20</A
+></DT
+><DT
+>E.46. <A
+HREF="release-9-2-19.html"
+>Release 9.2.19</A
+></DT
+><DT
+>E.47. <A
+HREF="release-9-2-18.html"
+>Release 9.2.18</A
+></DT
+><DT
+>E.48. <A
+HREF="release-9-2-17.html"
+>Release 9.2.17</A
+></DT
+><DT
+>E.49. <A
 HREF="release-9-2-16.html"
 >Release 9.2.16</A
 ></DT
 ><DT
->E.26. <A
+>E.50. <A
 HREF="release-9-2-15.html"
 >Release 9.2.15</A
 ></DT
 ><DT
->E.27. <A
+>E.51. <A
 HREF="release-9-2-14.html"
 >Release 9.2.14</A
 ></DT
 ><DT
->E.28. <A
+>E.52. <A
 HREF="release-9-2-13.html"
 >Release 9.2.13</A
 ></DT
 ><DT
->E.29. <A
+>E.53. <A
 HREF="release-9-2-12.html"
 >Release 9.2.12</A
 ></DT
 ><DT
->E.30. <A
+>E.54. <A
 HREF="release-9-2-11.html"
 >Release 9.2.11</A
 ></DT
 ><DT
->E.31. <A
+>E.55. <A
 HREF="release-9-2-10.html"
 >Release 9.2.10</A
 ></DT
 ><DT
->E.32. <A
+>E.56. <A
 HREF="release-9-2-9.html"
 >Release 9.2.9</A
 ></DT
 ><DT
->E.33. <A
+>E.57. <A
 HREF="release-9-2-8.html"
 >Release 9.2.8</A
 ></DT
 ><DT
->E.34. <A
+>E.58. <A
 HREF="release-9-2-7.html"
 >Release 9.2.7</A
 ></DT
 ><DT
->E.35. <A
+>E.59. <A
 HREF="release-9-2-6.html"
 >Release 9.2.6</A
 ></DT
 ><DT
->E.36. <A
+>E.60. <A
 HREF="release-9-2-5.html"
 >Release 9.2.5</A
 ></DT
 ><DT
->E.37. <A
+>E.61. <A
 HREF="release-9-2-4.html"
 >Release 9.2.4</A
 ></DT
 ><DT
->E.38. <A
+>E.62. <A
 HREF="release-9-2-3.html"
 >Release 9.2.3</A
 ></DT
 ><DT
->E.39. <A
+>E.63. <A
 HREF="release-9-2-2.html"
 >Release 9.2.2</A
 ></DT
 ><DT
->E.40. <A
+>E.64. <A
 HREF="release-9-2-1.html"
 >Release 9.2.1</A
 ></DT
 ><DT
->E.41. <A
+>E.65. <A
 HREF="release-9-2.html"
 >Release 9.2</A
 ></DT
 ><DT
->E.42. <A
+>E.66. <A
+HREF="release-9-1-24.html"
+>Release 9.1.24</A
+></DT
+><DT
+>E.67. <A
+HREF="release-9-1-23.html"
+>Release 9.1.23</A
+></DT
+><DT
+>E.68. <A
+HREF="release-9-1-22.html"
+>Release 9.1.22</A
+></DT
+><DT
+>E.69. <A
 HREF="release-9-1-21.html"
 >Release 9.1.21</A
 ></DT
 ><DT
->E.43. <A
+>E.70. <A
 HREF="release-9-1-20.html"
 >Release 9.1.20</A
 ></DT
 ><DT
->E.44. <A
+>E.71. <A
 HREF="release-9-1-19.html"
 >Release 9.1.19</A
 ></DT
 ><DT
->E.45. <A
+>E.72. <A
 HREF="release-9-1-18.html"
 >Release 9.1.18</A
 ></DT
 ><DT
->E.46. <A
+>E.73. <A
 HREF="release-9-1-17.html"
 >Release 9.1.17</A
 ></DT
 ><DT
->E.47. <A
+>E.74. <A
 HREF="release-9-1-16.html"
 >Release 9.1.16</A
 ></DT
 ><DT
->E.48. <A
+>E.75. <A
 HREF="release-9-1-15.html"
 >Release 9.1.15</A
 ></DT
 ><DT
->E.49. <A
+>E.76. <A
 HREF="release-9-1-14.html"
 >Release 9.1.14</A
 ></DT
 ><DT
->E.50. <A
+>E.77. <A
 HREF="release-9-1-13.html"
 >Release 9.1.13</A
 ></DT
 ><DT
->E.51. <A
+>E.78. <A
 HREF="release-9-1-12.html"
 >Release 9.1.12</A
 ></DT
 ><DT
->E.52. <A
+>E.79. <A
 HREF="release-9-1-11.html"
 >Release 9.1.11</A
 ></DT
 ><DT
->E.53. <A
+>E.80. <A
 HREF="release-9-1-10.html"
 >Release 9.1.10</A
 ></DT
 ><DT
->E.54. <A
+>E.81. <A
 HREF="release-9-1-9.html"
 >Release 9.1.9</A
 ></DT
 ><DT
->E.55. <A
+>E.82. <A
 HREF="release-9-1-8.html"
 >Release 9.1.8</A
 ></DT
 ><DT
->E.56. <A
+>E.83. <A
 HREF="release-9-1-7.html"
 >Release 9.1.7</A
 ></DT
 ><DT
->E.57. <A
+>E.84. <A
 HREF="release-9-1-6.html"
 >Release 9.1.6</A
 ></DT
 ><DT
->E.58. <A
+>E.85. <A
 HREF="release-9-1-5.html"
 >Release 9.1.5</A
 ></DT
 ><DT
->E.59. <A
+>E.86. <A
 HREF="release-9-1-4.html"
 >Release 9.1.4</A
 ></DT
 ><DT
->E.60. <A
+>E.87. <A
 HREF="release-9-1-3.html"
 >Release 9.1.3</A
 ></DT
 ><DT
->E.61. <A
+>E.88. <A
 HREF="release-9-1-2.html"
 >Release 9.1.2</A
 ></DT
 ><DT
->E.62. <A
+>E.89. <A
 HREF="release-9-1-1.html"
 >Release 9.1.1</A
 ></DT
 ><DT
->E.63. <A
+>E.90. <A
 HREF="release-9-1.html"
 >Release 9.1</A
 ></DT
 ><DT
->E.64. <A
+>E.91. <A
 HREF="release-9-0-23.html"
 >Release 9.0.23</A
 ></DT
 ><DT
->E.65. <A
+>E.92. <A
 HREF="release-9-0-22.html"
 >Release 9.0.22</A
 ></DT
 ><DT
->E.66. <A
+>E.93. <A
 HREF="release-9-0-21.html"
 >Release 9.0.21</A
 ></DT
 ><DT
->E.67. <A
+>E.94. <A
 HREF="release-9-0-20.html"
 >Release 9.0.20</A
 ></DT
 ><DT
->E.68. <A
+>E.95. <A
 HREF="release-9-0-19.html"
 >Release 9.0.19</A
 ></DT
 ><DT
->E.69. <A
+>E.96. <A
 HREF="release-9-0-18.html"
 >Release 9.0.18</A
 ></DT
 ><DT
->E.70. <A
+>E.97. <A
 HREF="release-9-0-17.html"
 >Release 9.0.17</A
 ></DT
 ><DT
->E.71. <A
+>E.98. <A
 HREF="release-9-0-16.html"
 >Release 9.0.16</A
 ></DT
 ><DT
->E.72. <A
+>E.99. <A
 HREF="release-9-0-15.html"
 >Release 9.0.15</A
 ></DT
 ><DT
->E.73. <A
+>E.100. <A
 HREF="release-9-0-14.html"
 >Release 9.0.14</A
 ></DT
 ><DT
->E.74. <A
+>E.101. <A
 HREF="release-9-0-13.html"
 >Release 9.0.13</A
 ></DT
 ><DT
->E.75. <A
+>E.102. <A
 HREF="release-9-0-12.html"
 >Release 9.0.12</A
 ></DT
 ><DT
->E.76. <A
+>E.103. <A
 HREF="release-9-0-11.html"
 >Release 9.0.11</A
 ></DT
 ><DT
->E.77. <A
+>E.104. <A
 HREF="release-9-0-10.html"
 >Release 9.0.10</A
 ></DT
 ><DT
->E.78. <A
+>E.105. <A
 HREF="release-9-0-9.html"
 >Release 9.0.9</A
 ></DT
 ><DT
->E.79. <A
+>E.106. <A
 HREF="release-9-0-8.html"
 >Release 9.0.8</A
 ></DT
 ><DT
->E.80. <A
+>E.107. <A
 HREF="release-9-0-7.html"
 >Release 9.0.7</A
 ></DT
 ><DT
->E.81. <A
+>E.108. <A
 HREF="release-9-0-6.html"
 >Release 9.0.6</A
 ></DT
 ><DT
->E.82. <A
+>E.109. <A
 HREF="release-9-0-5.html"
 >Release 9.0.5</A
 ></DT
 ><DT
->E.83. <A
+>E.110. <A
 HREF="release-9-0-4.html"
 >Release 9.0.4</A
 ></DT
 ><DT
->E.84. <A
+>E.111. <A
 HREF="release-9-0-3.html"
 >Release 9.0.3</A
 ></DT
 ><DT
->E.85. <A
+>E.112. <A
 HREF="release-9-0-2.html"
 >Release 9.0.2</A
 ></DT
 ><DT
->E.86. <A
+>E.113. <A
 HREF="release-9-0-1.html"
 >Release 9.0.1</A
 ></DT
 ><DT
->E.87. <A
+>E.114. <A
 HREF="release-9-0.html"
 >Release 9.0</A
 ></DT
 ><DT
->E.88. <A
+>E.115. <A
 HREF="release-8-4-22.html"
 >Release 8.4.22</A
 ></DT
 ><DT
->E.89. <A
+>E.116. <A
 HREF="release-8-4-21.html"
 >Release 8.4.21</A
 ></DT
 ><DT
->E.90. <A
+>E.117. <A
 HREF="release-8-4-20.html"
 >Release 8.4.20</A
 ></DT
 ><DT
->E.91. <A
+>E.118. <A
 HREF="release-8-4-19.html"
 >Release 8.4.19</A
 ></DT
 ><DT
->E.92. <A
+>E.119. <A
 HREF="release-8-4-18.html"
 >Release 8.4.18</A
 ></DT
 ><DT
->E.93. <A
+>E.120. <A
 HREF="release-8-4-17.html"
 >Release 8.4.17</A
 ></DT
 ><DT
->E.94. <A
+>E.121. <A
 HREF="release-8-4-16.html"
 >Release 8.4.16</A
 ></DT
 ><DT
->E.95. <A
+>E.122. <A
 HREF="release-8-4-15.html"
 >Release 8.4.15</A
 ></DT
 ><DT
->E.96. <A
+>E.123. <A
 HREF="release-8-4-14.html"
 >Release 8.4.14</A
 ></DT
 ><DT
->E.97. <A
+>E.124. <A
 HREF="release-8-4-13.html"
 >Release 8.4.13</A
 ></DT
 ><DT
->E.98. <A
+>E.125. <A
 HREF="release-8-4-12.html"
 >Release 8.4.12</A
 ></DT
 ><DT
->E.99. <A
+>E.126. <A
 HREF="release-8-4-11.html"
 >Release 8.4.11</A
 ></DT
 ><DT
->E.100. <A
+>E.127. <A
 HREF="release-8-4-10.html"
 >Release 8.4.10</A
 ></DT
 ><DT
->E.101. <A
+>E.128. <A
 HREF="release-8-4-9.html"
 >Release 8.4.9</A
 ></DT
 ><DT
->E.102. <A
+>E.129. <A
 HREF="release-8-4-8.html"
 >Release 8.4.8</A
 ></DT
 ><DT
->E.103. <A
+>E.130. <A
 HREF="release-8-4-7.html"
 >Release 8.4.7</A
 ></DT
 ><DT
->E.104. <A
+>E.131. <A
 HREF="release-8-4-6.html"
 >Release 8.4.6</A
 ></DT
 ><DT
->E.105. <A
+>E.132. <A
 HREF="release-8-4-5.html"
 >Release 8.4.5</A
 ></DT
 ><DT
->E.106. <A
+>E.133. <A
 HREF="release-8-4-4.html"
 >Release 8.4.4</A
 ></DT
 ><DT
->E.107. <A
+>E.134. <A
 HREF="release-8-4-3.html"
 >Release 8.4.3</A
 ></DT
 ><DT
->E.108. <A
+>E.135. <A
 HREF="release-8-4-2.html"
 >Release 8.4.2</A
 ></DT
 ><DT
->E.109. <A
+>E.136. <A
 HREF="release-8-4-1.html"
 >Release 8.4.1</A
 ></DT
 ><DT
->E.110. <A
+>E.137. <A
 HREF="release-8-4.html"
 >Release 8.4</A
 ></DT
 ><DT
->E.111. <A
+>E.138. <A
 HREF="release-8-3-23.html"
 >Release 8.3.23</A
 ></DT
 ><DT
->E.112. <A
+>E.139. <A
 HREF="release-8-3-22.html"
 >Release 8.3.22</A
 ></DT
 ><DT
->E.113. <A
+>E.140. <A
 HREF="release-8-3-21.html"
 >Release 8.3.21</A
 ></DT
 ><DT
->E.114. <A
+>E.141. <A
 HREF="release-8-3-20.html"
 >Release 8.3.20</A
 ></DT
 ><DT
->E.115. <A
+>E.142. <A
 HREF="release-8-3-19.html"
 >Release 8.3.19</A
 ></DT
 ><DT
->E.116. <A
+>E.143. <A
 HREF="release-8-3-18.html"
 >Release 8.3.18</A
 ></DT
 ><DT
->E.117. <A
+>E.144. <A
 HREF="release-8-3-17.html"
 >Release 8.3.17</A
 ></DT
 ><DT
->E.118. <A
+>E.145. <A
 HREF="release-8-3-16.html"
 >Release 8.3.16</A
 ></DT
 ><DT
->E.119. <A
+>E.146. <A
 HREF="release-8-3-15.html"
 >Release 8.3.15</A
 ></DT
 ><DT
->E.120. <A
+>E.147. <A
 HREF="release-8-3-14.html"
 >Release 8.3.14</A
 ></DT
 ><DT
->E.121. <A
+>E.148. <A
 HREF="release-8-3-13.html"
 >Release 8.3.13</A
 ></DT
 ><DT
->E.122. <A
+>E.149. <A
 HREF="release-8-3-12.html"
 >Release 8.3.12</A
 ></DT
 ><DT
->E.123. <A
+>E.150. <A
 HREF="release-8-3-11.html"
 >Release 8.3.11</A
 ></DT
 ><DT
->E.124. <A
+>E.151. <A
 HREF="release-8-3-10.html"
 >Release 8.3.10</A
 ></DT
 ><DT
->E.125. <A
+>E.152. <A
 HREF="release-8-3-9.html"
 >Release 8.3.9</A
 ></DT
 ><DT
->E.126. <A
+>E.153. <A
 HREF="release-8-3-8.html"
 >Release 8.3.8</A
 ></DT
 ><DT
->E.127. <A
+>E.154. <A
 HREF="release-8-3-7.html"
 >Release 8.3.7</A
 ></DT
 ><DT
->E.128. <A
+>E.155. <A
 HREF="release-8-3-6.html"
 >Release 8.3.6</A
 ></DT
 ><DT
->E.129. <A
+>E.156. <A
 HREF="release-8-3-5.html"
 >Release 8.3.5</A
 ></DT
 ><DT
->E.130. <A
+>E.157. <A
 HREF="release-8-3-4.html"
 >Release 8.3.4</A
 ></DT
 ><DT
->E.131. <A
+>E.158. <A
 HREF="release-8-3-3.html"
 >Release 8.3.3</A
 ></DT
 ><DT
->E.132. <A
+>E.159. <A
 HREF="release-8-3-2.html"
 >Release 8.3.2</A
 ></DT
 ><DT
->E.133. <A
+>E.160. <A
 HREF="release-8-3-1.html"
 >Release 8.3.1</A
 ></DT
 ><DT
->E.134. <A
+>E.161. <A
 HREF="release-8-3.html"
 >Release 8.3</A
 ></DT
 ><DT
->E.135. <A
+>E.162. <A
 HREF="release-8-2-23.html"
 >Release 8.2.23</A
 ></DT
 ><DT
->E.136. <A
+>E.163. <A
 HREF="release-8-2-22.html"
 >Release 8.2.22</A
 ></DT
 ><DT
->E.137. <A
+>E.164. <A
 HREF="release-8-2-21.html"
 >Release 8.2.21</A
 ></DT
 ><DT
->E.138. <A
+>E.165. <A
 HREF="release-8-2-20.html"
 >Release 8.2.20</A
 ></DT
 ><DT
->E.139. <A
+>E.166. <A
 HREF="release-8-2-19.html"
 >Release 8.2.19</A
 ></DT
 ><DT
->E.140. <A
+>E.167. <A
 HREF="release-8-2-18.html"
 >Release 8.2.18</A
 ></DT
 ><DT
->E.141. <A
+>E.168. <A
 HREF="release-8-2-17.html"
 >Release 8.2.17</A
 ></DT
 ><DT
->E.142. <A
+>E.169. <A
 HREF="release-8-2-16.html"
 >Release 8.2.16</A
 ></DT
 ><DT
->E.143. <A
+>E.170. <A
 HREF="release-8-2-15.html"
 >Release 8.2.15</A
 ></DT
 ><DT
->E.144. <A
+>E.171. <A
 HREF="release-8-2-14.html"
 >Release 8.2.14</A
 ></DT
 ><DT
->E.145. <A
+>E.172. <A
 HREF="release-8-2-13.html"
 >Release 8.2.13</A
 ></DT
 ><DT
->E.146. <A
+>E.173. <A
 HREF="release-8-2-12.html"
 >Release 8.2.12</A
 ></DT
 ><DT
->E.147. <A
+>E.174. <A
 HREF="release-8-2-11.html"
 >Release 8.2.11</A
 ></DT
 ><DT
->E.148. <A
+>E.175. <A
 HREF="release-8-2-10.html"
 >Release 8.2.10</A
 ></DT
 ><DT
->E.149. <A
+>E.176. <A
 HREF="release-8-2-9.html"
 >Release 8.2.9</A
 ></DT
 ><DT
->E.150. <A
+>E.177. <A
 HREF="release-8-2-8.html"
 >Release 8.2.8</A
 ></DT
 ><DT
->E.151. <A
+>E.178. <A
 HREF="release-8-2-7.html"
 >Release 8.2.7</A
 ></DT
 ><DT
->E.152. <A
+>E.179. <A
 HREF="release-8-2-6.html"
 >Release 8.2.6</A
 ></DT
 ><DT
->E.153. <A
+>E.180. <A
 HREF="release-8-2-5.html"
 >Release 8.2.5</A
 ></DT
 ><DT
->E.154. <A
+>E.181. <A
 HREF="release-8-2-4.html"
 >Release 8.2.4</A
 ></DT
 ><DT
->E.155. <A
+>E.182. <A
 HREF="release-8-2-3.html"
 >Release 8.2.3</A
 ></DT
 ><DT
->E.156. <A
+>E.183. <A
 HREF="release-8-2-2.html"
 >Release 8.2.2</A
 ></DT
 ><DT
->E.157. <A
+>E.184. <A
 HREF="release-8-2-1.html"
 >Release 8.2.1</A
 ></DT
 ><DT
->E.158. <A
+>E.185. <A
 HREF="release-8-2.html"
 >Release 8.2</A
 ></DT
 ><DT
->E.159. <A
+>E.186. <A
 HREF="release-8-1-23.html"
 >Release 8.1.23</A
 ></DT
 ><DT
->E.160. <A
+>E.187. <A
 HREF="release-8-1-22.html"
 >Release 8.1.22</A
 ></DT
 ><DT
->E.161. <A
+>E.188. <A
 HREF="release-8-1-21.html"
 >Release 8.1.21</A
 ></DT
 ><DT
->E.162. <A
+>E.189. <A
 HREF="release-8-1-20.html"
 >Release 8.1.20</A
 ></DT
 ><DT
->E.163. <A
+>E.190. <A
 HREF="release-8-1-19.html"
 >Release 8.1.19</A
 ></DT
 ><DT
->E.164. <A
+>E.191. <A
 HREF="release-8-1-18.html"
 >Release 8.1.18</A
 ></DT
 ><DT
->E.165. <A
+>E.192. <A
 HREF="release-8-1-17.html"
 >Release 8.1.17</A
 ></DT
 ><DT
->E.166. <A
+>E.193. <A
 HREF="release-8-1-16.html"
 >Release 8.1.16</A
 ></DT
 ><DT
->E.167. <A
+>E.194. <A
 HREF="release-8-1-15.html"
 >Release 8.1.15</A
 ></DT
 ><DT
->E.168. <A
+>E.195. <A
 HREF="release-8-1-14.html"
 >Release 8.1.14</A
 ></DT
 ><DT
->E.169. <A
+>E.196. <A
 HREF="release-8-1-13.html"
 >Release 8.1.13</A
 ></DT
 ><DT
->E.170. <A
+>E.197. <A
 HREF="release-8-1-12.html"
 >Release 8.1.12</A
 ></DT
 ><DT
->E.171. <A
+>E.198. <A
 HREF="release-8-1-11.html"
 >Release 8.1.11</A
 ></DT
 ><DT
->E.172. <A
+>E.199. <A
 HREF="release-8-1-10.html"
 >Release 8.1.10</A
 ></DT
 ><DT
->E.173. <A
+>E.200. <A
 HREF="release-8-1-9.html"
 >Release 8.1.9</A
 ></DT
 ><DT
->E.174. <A
+>E.201. <A
 HREF="release-8-1-8.html"
 >Release 8.1.8</A
 ></DT
 ><DT
->E.175. <A
+>E.202. <A
 HREF="release-8-1-7.html"
 >Release 8.1.7</A
 ></DT
 ><DT
->E.176. <A
+>E.203. <A
 HREF="release-8-1-6.html"
 >Release 8.1.6</A
 ></DT
 ><DT
->E.177. <A
+>E.204. <A
 HREF="release-8-1-5.html"
 >Release 8.1.5</A
 ></DT
 ><DT
->E.178. <A
+>E.205. <A
 HREF="release-8-1-4.html"
 >Release 8.1.4</A
 ></DT
 ><DT
->E.179. <A
+>E.206. <A
 HREF="release-8-1-3.html"
 >Release 8.1.3</A
 ></DT
 ><DT
->E.180. <A
+>E.207. <A
 HREF="release-8-1-2.html"
 >Release 8.1.2</A
 ></DT
 ><DT
->E.181. <A
+>E.208. <A
 HREF="release-8-1-1.html"
 >Release 8.1.1</A
 ></DT
 ><DT
->E.182. <A
+>E.209. <A
 HREF="release-8-1.html"
 >Release 8.1</A
 ></DT
 ><DT
->E.183. <A
+>E.210. <A
 HREF="release-8-0-26.html"
 >Release 8.0.26</A
 ></DT
 ><DT
->E.184. <A
+>E.211. <A
 HREF="release-8-0-25.html"
 >Release 8.0.25</A
 ></DT
 ><DT
->E.185. <A
+>E.212. <A
 HREF="release-8-0-24.html"
 >Release 8.0.24</A
 ></DT
 ><DT
->E.186. <A
+>E.213. <A
 HREF="release-8-0-23.html"
 >Release 8.0.23</A
 ></DT
 ><DT
->E.187. <A
+>E.214. <A
 HREF="release-8-0-22.html"
 >Release 8.0.22</A
 ></DT
 ><DT
->E.188. <A
+>E.215. <A
 HREF="release-8-0-21.html"
 >Release 8.0.21</A
 ></DT
 ><DT
->E.189. <A
+>E.216. <A
 HREF="release-8-0-20.html"
 >Release 8.0.20</A
 ></DT
 ><DT
->E.190. <A
+>E.217. <A
 HREF="release-8-0-19.html"
 >Release 8.0.19</A
 ></DT
 ><DT
->E.191. <A
+>E.218. <A
 HREF="release-8-0-18.html"
 >Release 8.0.18</A
 ></DT
 ><DT
->E.192. <A
+>E.219. <A
 HREF="release-8-0-17.html"
 >Release 8.0.17</A
 ></DT
 ><DT
->E.193. <A
+>E.220. <A
 HREF="release-8-0-16.html"
 >Release 8.0.16</A
 ></DT
 ><DT
->E.194. <A
+>E.221. <A
 HREF="release-8-0-15.html"
 >Release 8.0.15</A
 ></DT
 ><DT
->E.195. <A
+>E.222. <A
 HREF="release-8-0-14.html"
 >Release 8.0.14</A
 ></DT
 ><DT
->E.196. <A
+>E.223. <A
 HREF="release-8-0-13.html"
 >Release 8.0.13</A
 ></DT
 ><DT
->E.197. <A
+>E.224. <A
 HREF="release-8-0-12.html"
 >Release 8.0.12</A
 ></DT
 ><DT
->E.198. <A
+>E.225. <A
 HREF="release-8-0-11.html"
 >Release 8.0.11</A
 ></DT
 ><DT
->E.199. <A
+>E.226. <A
 HREF="release-8-0-10.html"
 >Release 8.0.10</A
 ></DT
 ><DT
->E.200. <A
+>E.227. <A
 HREF="release-8-0-9.html"
 >Release 8.0.9</A
 ></DT
 ><DT
->E.201. <A
+>E.228. <A
 HREF="release-8-0-8.html"
 >Release 8.0.8</A
 ></DT
 ><DT
->E.202. <A
+>E.229. <A
 HREF="release-8-0-7.html"
 >Release 8.0.7</A
 ></DT
 ><DT
->E.203. <A
+>E.230. <A
 HREF="release-8-0-6.html"
 >Release 8.0.6</A
 ></DT
 ><DT
->E.204. <A
+>E.231. <A
 HREF="release-8-0-5.html"
 >Release 8.0.5</A
 ></DT
 ><DT
->E.205. <A
+>E.232. <A
 HREF="release-8-0-4.html"
 >Release 8.0.4</A
 ></DT
 ><DT
->E.206. <A
+>E.233. <A
 HREF="release-8-0-3.html"
 >Release 8.0.3</A
 ></DT
 ><DT
->E.207. <A
+>E.234. <A
 HREF="release-8-0-2.html"
 >Release 8.0.2</A
 ></DT
 ><DT
->E.208. <A
+>E.235. <A
 HREF="release-8-0-1.html"
 >Release 8.0.1</A
 ></DT
 ><DT
->E.209. <A
+>E.236. <A
 HREF="release-8-0.html"
 >Release 8.0</A
 ></DT
 ><DT
->E.210. <A
+>E.237. <A
 HREF="release-7-4-30.html"
 >Release 7.4.30</A
 ></DT
 ><DT
->E.211. <A
+>E.238. <A
 HREF="release-7-4-29.html"
 >Release 7.4.29</A
 ></DT
 ><DT
->E.212. <A
+>E.239. <A
 HREF="release-7-4-28.html"
 >Release 7.4.28</A
 ></DT
 ><DT
->E.213. <A
+>E.240. <A
 HREF="release-7-4-27.html"
 >Release 7.4.27</A
 ></DT
 ><DT
->E.214. <A
+>E.241. <A
 HREF="release-7-4-26.html"
 >Release 7.4.26</A
 ></DT
 ><DT
->E.215. <A
+>E.242. <A
 HREF="release-7-4-25.html"
 >Release 7.4.25</A
 ></DT
 ><DT
->E.216. <A
+>E.243. <A
 HREF="release-7-4-24.html"
 >Release 7.4.24</A
 ></DT
 ><DT
->E.217. <A
+>E.244. <A
 HREF="release-7-4-23.html"
 >Release 7.4.23</A
 ></DT
 ><DT
->E.218. <A
+>E.245. <A
 HREF="release-7-4-22.html"
 >Release 7.4.22</A
 ></DT
 ><DT
->E.219. <A
+>E.246. <A
 HREF="release-7-4-21.html"
 >Release 7.4.21</A
 ></DT
 ><DT
->E.220. <A
+>E.247. <A
 HREF="release-7-4-20.html"
 >Release 7.4.20</A
 ></DT
 ><DT
->E.221. <A
+>E.248. <A
 HREF="release-7-4-19.html"
 >Release 7.4.19</A
 ></DT
 ><DT
->E.222. <A
+>E.249. <A
 HREF="release-7-4-18.html"
 >Release 7.4.18</A
 ></DT
 ><DT
->E.223. <A
+>E.250. <A
 HREF="release-7-4-17.html"
 >Release 7.4.17</A
 ></DT
 ><DT
->E.224. <A
+>E.251. <A
 HREF="release-7-4-16.html"
 >Release 7.4.16</A
 ></DT
 ><DT
->E.225. <A
+>E.252. <A
 HREF="release-7-4-15.html"
 >Release 7.4.15</A
 ></DT
 ><DT
->E.226. <A
+>E.253. <A
 HREF="release-7-4-14.html"
 >Release 7.4.14</A
 ></DT
 ><DT
->E.227. <A
+>E.254. <A
 HREF="release-7-4-13.html"
 >Release 7.4.13</A
 ></DT
 ><DT
->E.228. <A
+>E.255. <A
 HREF="release-7-4-12.html"
 >Release 7.4.12</A
 ></DT
 ><DT
->E.229. <A
+>E.256. <A
 HREF="release-7-4-11.html"
 >Release 7.4.11</A
 ></DT
 ><DT
->E.230. <A
+>E.257. <A
 HREF="release-7-4-10.html"
 >Release 7.4.10</A
 ></DT
 ><DT
->E.231. <A
+>E.258. <A
 HREF="release-7-4-9.html"
 >Release 7.4.9</A
 ></DT
 ><DT
->E.232. <A
+>E.259. <A
 HREF="release-7-4-8.html"
 >Release 7.4.8</A
 ></DT
 ><DT
->E.233. <A
+>E.260. <A
 HREF="release-7-4-7.html"
 >Release 7.4.7</A
 ></DT
 ><DT
->E.234. <A
+>E.261. <A
 HREF="release-7-4-6.html"
 >Release 7.4.6</A
 ></DT
 ><DT
->E.235. <A
+>E.262. <A
 HREF="release-7-4-5.html"
 >Release 7.4.5</A
 ></DT
 ><DT
->E.236. <A
+>E.263. <A
 HREF="release-7-4-4.html"
 >Release 7.4.4</A
 ></DT
 ><DT
->E.237. <A
+>E.264. <A
 HREF="release-7-4-3.html"
 >Release 7.4.3</A
 ></DT
 ><DT
->E.238. <A
+>E.265. <A
 HREF="release-7-4-2.html"
 >Release 7.4.2</A
 ></DT
 ><DT
->E.239. <A
+>E.266. <A
 HREF="release-7-4-1.html"
 >Release 7.4.1</A
 ></DT
 ><DT
->E.240. <A
+>E.267. <A
 HREF="release-7-4.html"
 >Release 7.4</A
 ></DT
 ><DT
->E.241. <A
+>E.268. <A
 HREF="release-7-3-21.html"
 >Release 7.3.21</A
 ></DT
 ><DT
->E.242. <A
+>E.269. <A
 HREF="release-7-3-20.html"
 >Release 7.3.20</A
 ></DT
 ><DT
->E.243. <A
+>E.270. <A
 HREF="release-7-3-19.html"
 >Release 7.3.19</A
 ></DT
 ><DT
->E.244. <A
+>E.271. <A
 HREF="release-7-3-18.html"
 >Release 7.3.18</A
 ></DT
 ><DT
->E.245. <A
+>E.272. <A
 HREF="release-7-3-17.html"
 >Release 7.3.17</A
 ></DT
 ><DT
->E.246. <A
+>E.273. <A
 HREF="release-7-3-16.html"
 >Release 7.3.16</A
 ></DT
 ><DT
->E.247. <A
+>E.274. <A
 HREF="release-7-3-15.html"
 >Release 7.3.15</A
 ></DT
 ><DT
->E.248. <A
+>E.275. <A
 HREF="release-7-3-14.html"
 >Release 7.3.14</A
 ></DT
 ><DT
->E.249. <A
+>E.276. <A
 HREF="release-7-3-13.html"
 >Release 7.3.13</A
 ></DT
 ><DT
->E.250. <A
+>E.277. <A
 HREF="release-7-3-12.html"
 >Release 7.3.12</A
 ></DT
 ><DT
->E.251. <A
+>E.278. <A
 HREF="release-7-3-11.html"
 >Release 7.3.11</A
 ></DT
 ><DT
->E.252. <A
+>E.279. <A
 HREF="release-7-3-10.html"
 >Release 7.3.10</A
 ></DT
 ><DT
->E.253. <A
+>E.280. <A
 HREF="release-7-3-9.html"
 >Release 7.3.9</A
 ></DT
 ><DT
->E.254. <A
+>E.281. <A
 HREF="release-7-3-8.html"
 >Release 7.3.8</A
 ></DT
 ><DT
->E.255. <A
+>E.282. <A
 HREF="release-7-3-7.html"
 >Release 7.3.7</A
 ></DT
 ><DT
->E.256. <A
+>E.283. <A
 HREF="release-7-3-6.html"
 >Release 7.3.6</A
 ></DT
 ><DT
->E.257. <A
+>E.284. <A
 HREF="release-7-3-5.html"
 >Release 7.3.5</A
 ></DT
 ><DT
->E.258. <A
+>E.285. <A
 HREF="release-7-3-4.html"
 >Release 7.3.4</A
 ></DT
 ><DT
->E.259. <A
+>E.286. <A
 HREF="release-7-3-3.html"
 >Release 7.3.3</A
 ></DT
 ><DT
->E.260. <A
+>E.287. <A
 HREF="release-7-3-2.html"
 >Release 7.3.2</A
 ></DT
 ><DT
->E.261. <A
+>E.288. <A
 HREF="release-7-3-1.html"
 >Release 7.3.1</A
 ></DT
 ><DT
->E.262. <A
+>E.289. <A
 HREF="release-7-3.html"
 >Release 7.3</A
 ></DT
 ><DT
->E.263. <A
+>E.290. <A
 HREF="release-7-2-8.html"
 >Release 7.2.8</A
 ></DT
 ><DT
->E.264. <A
+>E.291. <A
 HREF="release-7-2-7.html"
 >Release 7.2.7</A
 ></DT
 ><DT
->E.265. <A
+>E.292. <A
 HREF="release-7-2-6.html"
 >Release 7.2.6</A
 ></DT
 ><DT
->E.266. <A
+>E.293. <A
 HREF="release-7-2-5.html"
 >Release 7.2.5</A
 ></DT
 ><DT
->E.267. <A
+>E.294. <A
 HREF="release-7-2-4.html"
 >Release 7.2.4</A
 ></DT
 ><DT
->E.268. <A
+>E.295. <A
 HREF="release-7-2-3.html"
 >Release 7.2.3</A
 ></DT
 ><DT
->E.269. <A
+>E.296. <A
 HREF="release-7-2-2.html"
 >Release 7.2.2</A
 ></DT
 ><DT
->E.270. <A
+>E.297. <A
 HREF="release-7-2-1.html"
 >Release 7.2.1</A
 ></DT
 ><DT
->E.271. <A
+>E.298. <A
 HREF="release-7-2.html"
 >Release 7.2</A
 ></DT
 ><DT
->E.272. <A
+>E.299. <A
 HREF="release-7-1-3.html"
 >Release 7.1.3</A
 ></DT
 ><DT
->E.273. <A
+>E.300. <A
 HREF="release-7-1-2.html"
 >Release 7.1.2</A
 ></DT
 ><DT
->E.274. <A
+>E.301. <A
 HREF="release-7-1-1.html"
 >Release 7.1.1</A
 ></DT
 ><DT
->E.275. <A
+>E.302. <A
 HREF="release-7-1.html"
 >Release 7.1</A
 ></DT
 ><DT
->E.276. <A
+>E.303. <A
 HREF="release-7-0-3.html"
 >Release 7.0.3</A
 ></DT
 ><DT
->E.277. <A
+>E.304. <A
 HREF="release-7-0-2.html"
 >Release 7.0.2</A
 ></DT
 ><DT
->E.278. <A
+>E.305. <A
 HREF="release-7-0-1.html"
 >Release 7.0.1</A
 ></DT
 ><DT
->E.279. <A
+>E.306. <A
 HREF="release-7-0.html"
 >Release 7.0</A
 ></DT
 ><DT
->E.280. <A
+>E.307. <A
 HREF="release-6-5-3.html"
 >Release 6.5.3</A
 ></DT
 ><DT
->E.281. <A
+>E.308. <A
 HREF="release-6-5-2.html"
 >Release 6.5.2</A
 ></DT
 ><DT
->E.282. <A
+>E.309. <A
 HREF="release-6-5-1.html"
 >Release 6.5.1</A
 ></DT
 ><DT
->E.283. <A
+>E.310. <A
 HREF="release-6-5.html"
 >Release 6.5</A
 ></DT
 ><DT
->E.284. <A
+>E.311. <A
 HREF="release-6-4-2.html"
 >Release 6.4.2</A
 ></DT
 ><DT
->E.285. <A
+>E.312. <A
 HREF="release-6-4-1.html"
 >Release 6.4.1</A
 ></DT
 ><DT
->E.286. <A
+>E.313. <A
 HREF="release-6-4.html"
 >Release 6.4</A
 ></DT
 ><DT
->E.287. <A
+>E.314. <A
 HREF="release-6-3-2.html"
 >Release 6.3.2</A
 ></DT
 ><DT
->E.288. <A
+>E.315. <A
 HREF="release-6-3-1.html"
 >Release 6.3.1</A
 ></DT
 ><DT
->E.289. <A
+>E.316. <A
 HREF="release-6-3.html"
 >Release 6.3</A
 ></DT
 ><DT
->E.290. <A
+>E.317. <A
 HREF="release-6-2-1.html"
 >Release 6.2.1</A
 ></DT
 ><DT
->E.291. <A
+>E.318. <A
 HREF="release-6-2.html"
 >Release 6.2</A
 ></DT
 ><DT
->E.292. <A
+>E.319. <A
 HREF="release-6-1-1.html"
 >Release 6.1.1</A
 ></DT
 ><DT
->E.293. <A
+>E.320. <A
 HREF="release-6-1.html"
 >Release 6.1</A
 ></DT
 ><DT
->E.294. <A
+>E.321. <A
 HREF="release-6-0.html"
 >Release 6.0</A
 ></DT
 ><DT
->E.295. <A
+>E.322. <A
 HREF="release-1-09.html"
 >Release 1.09</A
 ></DT
 ><DT
->E.296. <A
+>E.323. <A
 HREF="release-1-02.html"
 >Release 1.02</A
 ></DT
 ><DT
->E.297. <A
+>E.324. <A
 HREF="release-1-01.html"
 >Release 1.01</A
 ></DT
 ><DT
->E.298. <A
+>E.325. <A
 HREF="release-1-0.html"
 >Release 1.0</A
 ></DT
 ><DT
->E.299. <A
+>E.326. <A
 HREF="release-0-03.html"
 ><SPAN
 CLASS="PRODUCTNAME"
@@ -1600,7 +1735,7 @@
 > Release 0.03</A
 ></DT
 ><DT
->E.300. <A
+>E.327. <A
 HREF="release-0-02.html"
 ><SPAN
 CLASS="PRODUCTNAME"
@@ -1608,7 +1743,7 @@
 > Release 0.02</A
 ></DT
 ><DT
->E.301. <A
+>E.328. <A
 HREF="release-0-01.html"
 ><SPAN
 CLASS="PRODUCTNAME"
@@ -1636,7 +1771,7 @@
 >Git</A
 > logs for each release.
    The <A
-HREF="http://archives.postgresql.org/pgsql-committers/"
+HREF="https://archives.postgresql.org/pgsql-committers/"
 TARGET="_top"
 ><TT
 CLASS="LITERAL"
@@ -1645,7 +1780,7 @@
    email list</A
 > records all source code changes as well.  There is also
    a <A
-HREF="http://git.postgresql.org/gitweb?p=postgresql.git;a=summary"
+HREF="https://git.postgresql.org/gitweb?p=postgresql.git;a=summary"
 TARGET="_top"
 >web
    interface</A
@@ -1691,7 +1826,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="release-9-5-2.html"
+HREF="release-9-5-8.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -1715,7 +1850,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Release 9.5.2</TD
+>Release 9.5.8</TD
 ></TR
 ></TABLE
 ></DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/replication-origins.html postgresql-9.5-9.5.8/doc/src/sgml/html/replication-origins.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/replication-origins.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/replication-origins.html	2017-08-07 21:32:19.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -192,7 +192,7 @@
   If that's done replication progress will persist in a crash safe
   manner. Replay progress for all replication origins can be seen in the
   <A
-HREF="catalog-pg-replication-origin-status.html"
+HREF="view-pg-replication-origin-status.html"
 >   <TT
 CLASS="STRUCTNAME"
 >pg_replication_origin_status</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/resources.html postgresql-9.5-9.5.8/doc/src/sgml/html/resources.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/resources.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/resources.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Preface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -115,16 +115,16 @@
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
 > <A
-HREF="http://wiki.postgresql.org"
+HREF="https://wiki.postgresql.org"
 TARGET="_top"
 >wiki</A
 > contains the project's <A
-HREF="http://wiki.postgresql.org/wiki/Frequently_Asked_Questions"
+HREF="https://wiki.postgresql.org/wiki/Frequently_Asked_Questions"
 TARGET="_top"
 >FAQ</A
 >
       (Frequently Asked Questions) list, <A
-HREF="http://wiki.postgresql.org/wiki/Todo"
+HREF="https://wiki.postgresql.org/wiki/Todo"
 TARGET="_top"
 >TODO</A
 > list, and
@@ -140,7 +140,7 @@
 >PostgreSQL</SPAN
 >
       <A
-HREF="http://www.postgresql.org"
+HREF="https://www.postgresql.org"
 TARGET="_top"
 >web site</A
 >
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/role-attributes.html postgresql-9.5-9.5.8/doc/src/sgml/html/role-attributes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/role-attributes.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/role-attributes.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Roles"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/role-membership.html postgresql-9.5-9.5.8/doc/src/sgml/html/role-membership.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/role-membership.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/role-membership.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Roles"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/role-removal.html postgresql-9.5-9.5.8/doc/src/sgml/html/role-removal.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/role-removal.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/role-removal.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Roles"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/routine-reindex.html postgresql-9.5-9.5.8/doc/src/sgml/html/routine-reindex.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/routine-reindex.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/routine-reindex.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Routine Database Maintenance Tasks"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/routine-vacuuming.html postgresql-9.5-9.5.8/doc/src/sgml/html/routine-vacuuming.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/routine-vacuuming.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/routine-vacuuming.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Routine Database Maintenance Tasks"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -664,7 +664,11 @@
 >    <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
->'s MVCC transaction semantics
+>'s
+    <A
+HREF="mvcc-intro.html"
+>MVCC</A
+> transaction semantics
     depend on being able to compare transaction ID (<ACRONYM
 CLASS="ACRONYM"
 >XID</ACRONYM
@@ -699,19 +703,10 @@
 >frozen</I
 ></SPAN
 >, indicating that
-    they were inserted by a transaction which committed sufficiently far in
-    the past that the effects of the inserting transaction is certain to be
-    visible, from an MVCC perspective, to all current and future transactions.
-    <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> reserves a special XID,
-    <TT
-CLASS="LITERAL"
->FrozenTransactionId</TT
->, which does not follow the normal XID
-    comparison rules and is always considered older
-    than every normal XID. Normal XIDs are
+    they were inserted by a transaction that committed sufficiently far in
+    the past that the effects of the inserting transaction are certain to be
+    visible to all current and future transactions.
+    Normal XIDs are
     compared using modulo-2<SUP
 >32</SUP
 > arithmetic. This means
@@ -732,7 +727,17 @@
     the next two billion transactions, no matter which normal XID we are
     talking about. If the row version still exists after more than two billion
     transactions, it will suddenly appear to be in the future. To
-    prevent this, frozen row versions are treated as if the inserting XID were
+    prevent this, <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> reserves a special XID,
+    <TT
+CLASS="LITERAL"
+>FrozenTransactionId</TT
+>, which does not follow the normal XID
+    comparison rules and is always considered older
+    than every normal XID.
+    Frozen row versions are treated as if the inserting XID were
     <TT
 CLASS="LITERAL"
 >FrozenTransactionId</TT
@@ -744,12 +749,70 @@
     issues, and so such row versions will be valid until deleted, no matter
     how long that is.
    </P
+><DIV
+CLASS="NOTE"
+><BLOCKQUOTE
+CLASS="NOTE"
+><P
+><B
+>Note: </B
+>     In <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> versions before 9.4, freezing was
+     implemented by actually replacing a row's insertion XID
+     with <TT
+CLASS="LITERAL"
+>FrozenTransactionId</TT
+>, which was visible in the
+     row's <TT
+CLASS="STRUCTNAME"
+>xmin</TT
+> system column.  Newer versions just set a flag
+     bit, preserving the row's original <TT
+CLASS="STRUCTNAME"
+>xmin</TT
+> for possible
+     forensic use.  However, rows with <TT
+CLASS="STRUCTNAME"
+>xmin</TT
+> equal
+     to <TT
+CLASS="LITERAL"
+>FrozenTransactionId</TT
+> (2) may still be found
+     in databases <SPAN
+CLASS="APPLICATION"
+>pg_upgrade</SPAN
+>'d from pre-9.4 versions.
+    </P
+><P
+>     Also, system catalogs may contain rows with <TT
+CLASS="STRUCTNAME"
+>xmin</TT
+> equal
+     to <TT
+CLASS="LITERAL"
+>BootstrapTransactionId</TT
+> (1), indicating that they were
+     inserted during the first phase of <SPAN
+CLASS="APPLICATION"
+>initdb</SPAN
+>.
+     Like <TT
+CLASS="LITERAL"
+>FrozenTransactionId</TT
+>, this special XID is treated as
+     older than every normal XID.
+    </P
+></BLOCKQUOTE
+></DIV
 ><P
 >    <A
 HREF="runtime-config-client.html#GUC-VACUUM-FREEZE-MIN-AGE"
 >vacuum_freeze_min_age</A
 >
-    controls how old an XID value has to be before its row version will be
+    controls how old an XID value has to be before rows bearing that XID will be
     frozen.  Increasing this setting may avoid unnecessary work if the
     rows that would otherwise be frozen will soon be modified again,
     but decreasing this setting increases
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/row-estimation-examples.html postgresql-9.5-9.5.8/doc/src/sgml/html/row-estimation-examples.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/row-estimation-examples.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/row-estimation-examples.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="How the Planner Uses Statistics"
@@ -18,15 +18,15 @@
 TITLE="How the Planner Uses Statistics"
 HREF="planner-stats-details.html"><LINK
 REL="NEXT"
-TITLE="Appendixes"
-HREF="appendixes.html"><LINK
+TITLE="Planner Statistics and Security"
+HREF="planner-stats-security.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="Appendixes"
-HREF="appendixes.html"
+TITLE="Planner Statistics and Security"
+HREF="planner-stats-security.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -798,7 +798,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="appendixes.html"
+HREF="planner-stats-security.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -822,7 +822,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Appendixes</TD
+>Planner Statistics and Security</TD
 ></TR
 ></TABLE
 ></DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/rowtypes.html postgresql-9.5-9.5.8/doc/src/sgml/html/rowtypes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/rowtypes.html	2016-03-28 20:20:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/rowtypes.html	2017-08-07 21:32:01.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Data Types"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -113,7 +113,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN7991"
+NAME="ROWTYPES-DECLARING"
 >8.16.1. Declaration of Composite Types</A
 ></H2
 ><P
@@ -210,15 +210,18 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN8006"
->8.16.2. Composite Value Input</A
+NAME="AEN8082"
+>8.16.2. Constructing Composite Values</A
 ></H2
 ><P
 >   To write a composite value as a literal constant, enclose the field
    values within parentheses and separate them by commas.  You can put double
    quotes around any field value, and must do so if it contains commas or
-   parentheses.  (More details appear below.)  Thus, the general format of a
-   composite constant is the following:
+   parentheses.  (More details appear <A
+HREF="rowtypes.html#ROWTYPES-IO-SYNTAX"
+>below</A
+>.)  Thus, the general format of
+   a composite constant is the following:
 </P><PRE
 CLASS="SYNOPSIS"
 >'( <TT
@@ -263,7 +266,8 @@
 >Section 4.1.2.7</A
 >.  The constant is initially
    treated as a string and passed to the composite-type input conversion
-   routine.  An explicit type specification might be necessary.)
+   routine.  An explicit type specification might be necessary to tell
+   which type to convert the constant to.)
   </P
 ><P
 >  The <TT
@@ -280,7 +284,7 @@
 ROW('', 42, NULL)</PRE
 ><P>
   The ROW keyword is actually optional as long as you have more than one
-  field in the expression, so these can simplify to:
+  field in the expression, so these can be simplified to:
 </P><PRE
 CLASS="PROGRAMLISTING"
 >('fuzzy dice', 42, 1.99)
@@ -300,7 +304,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN8027"
+NAME="ROWTYPES-ACCESSING"
 >8.16.3. Accessing Composite Types</A
 ></H2
 ><P
@@ -360,13 +364,26 @@
 
   Without the extra parentheses, this will generate a syntax error.
  </P
+><P
+>  The special field name <TT
+CLASS="LITERAL"
+>*</TT
+> means <SPAN
+CLASS="QUOTE"
+>"all fields"</SPAN
+>, as
+  further explained in <A
+HREF="rowtypes.html#ROWTYPES-USAGE"
+>Section 8.16.5</A
+>.
+ </P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN8039"
+NAME="AEN8120"
 >8.16.4. Modifying Composite Types</A
 ></H2
 ><P
@@ -423,8 +440,414 @@
 ><H2
 CLASS="SECT2"
 ><A
+NAME="ROWTYPES-USAGE"
+>8.16.5. Using Composite Types in Queries</A
+></H2
+><P
+>   There are various special syntax rules and behaviors associated with
+   composite types in queries.  These rules provide useful shortcuts,
+   but can be confusing if you don't know the logic behind them.
+  </P
+><P
+>   In <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>, a reference to a table name (or alias)
+   in a query is effectively a reference to the composite value of the
+   table's current row.  For example, if we had a table
+   <TT
+CLASS="STRUCTNAME"
+>inventory_item</TT
+> as shown
+   <A
+HREF="rowtypes.html#ROWTYPES-DECLARING"
+>above</A
+>, we could write:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SELECT c FROM inventory_item c;</PRE
+><P>
+   This query produces a single composite-valued column, so we might get
+   output like:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>           c
+------------------------
+ ("fuzzy dice",42,1.99)
+(1 row)</PRE
+><P>
+   Note however that simple names are matched to column names before table
+   names, so this example works only because there is no column
+   named <TT
+CLASS="STRUCTFIELD"
+>c</TT
+> in the query's tables.
+  </P
+><P
+>   The ordinary qualified-column-name
+   syntax <TT
+CLASS="REPLACEABLE"
+><I
+>table_name</I
+></TT
+><TT
+CLASS="LITERAL"
+>.</TT
+><TT
+CLASS="REPLACEABLE"
+><I
+>column_name</I
+></TT
+>
+   can be understood as applying <A
+HREF="sql-expressions.html#FIELD-SELECTION"
+>field
+   selection</A
+> to the composite value of the table's current row.
+   (For efficiency reasons, it's not actually implemented that way.)
+  </P
+><P
+>   When we write
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SELECT c.* FROM inventory_item c;</PRE
+><P>
+   then, according to the SQL standard, we should get the contents of the
+   table expanded into separate columns:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>    name    | supplier_id | price
+------------+-------------+-------
+ fuzzy dice |          42 |  1.99
+(1 row)</PRE
+><P>
+   as if the query were
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SELECT c.name, c.supplier_id, c.price FROM inventory_item c;</PRE
+><P>
+   <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> will apply this expansion behavior to
+   any composite-valued expression, although as shown <A
+HREF="rowtypes.html#ROWTYPES-ACCESSING"
+>above</A
+>, you need to write parentheses
+   around the value that <TT
+CLASS="LITERAL"
+>.*</TT
+> is applied to whenever it's not a
+   simple table name.  For example, if <CODE
+CLASS="FUNCTION"
+>myfunc()</CODE
+> is a function
+   returning a composite type with columns <TT
+CLASS="STRUCTFIELD"
+>a</TT
+>,
+   <TT
+CLASS="STRUCTFIELD"
+>b</TT
+>, and <TT
+CLASS="STRUCTFIELD"
+>c</TT
+>, then these two queries have the
+   same result:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SELECT (myfunc(x)).* FROM some_table;
+SELECT (myfunc(x)).a, (myfunc(x)).b, (myfunc(x)).c FROM some_table;</PRE
+><P>
+  </P
+><DIV
+CLASS="TIP"
+><BLOCKQUOTE
+CLASS="TIP"
+><P
+><B
+>Tip: </B
+>    <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> handles column expansion by
+    actually transforming the first form into the second.  So, in this
+    example, <CODE
+CLASS="FUNCTION"
+>myfunc()</CODE
+> would get invoked three times per row
+    with either syntax.  If it's an expensive function you may wish to
+    avoid that, which you can do with a query like:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SELECT (m).* FROM (SELECT myfunc(x) AS m FROM some_table OFFSET 0) ss;</PRE
+><P>
+    The <TT
+CLASS="LITERAL"
+>OFFSET 0</TT
+> clause keeps the optimizer
+    from <SPAN
+CLASS="QUOTE"
+>"flattening"</SPAN
+> the sub-select to arrive at the form with
+    multiple calls of <CODE
+CLASS="FUNCTION"
+>myfunc()</CODE
+>.
+   </P
+></BLOCKQUOTE
+></DIV
+><P
+>   The <TT
+CLASS="REPLACEABLE"
+><I
+>composite_value</I
+></TT
+><TT
+CLASS="LITERAL"
+>.*</TT
+> syntax results in
+   column expansion of this kind when it appears at the top level of
+   a <A
+HREF="queries-select-lists.html"
+><TT
+CLASS="COMMAND"
+>SELECT</TT
+> output
+   list</A
+>, a <A
+HREF="dml-returning.html"
+><TT
+CLASS="LITERAL"
+>RETURNING</TT
+>
+   list</A
+> in <TT
+CLASS="COMMAND"
+>INSERT</TT
+>/<TT
+CLASS="COMMAND"
+>UPDATE</TT
+>/<TT
+CLASS="COMMAND"
+>DELETE</TT
+>,
+   a <A
+HREF="queries-values.html"
+><TT
+CLASS="LITERAL"
+>VALUES</TT
+> clause</A
+>, or
+   a <A
+HREF="sql-expressions.html#SQL-SYNTAX-ROW-CONSTRUCTORS"
+>row constructor</A
+>.
+   In all other contexts (including when nested inside one of those
+   constructs), attaching <TT
+CLASS="LITERAL"
+>.*</TT
+> to a composite value does not
+   change the value, since it means <SPAN
+CLASS="QUOTE"
+>"all columns"</SPAN
+> and so the
+   same composite value is produced again.  For example,
+   if <CODE
+CLASS="FUNCTION"
+>somefunc()</CODE
+> accepts a composite-valued argument,
+   these queries are the same:
+
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SELECT somefunc(c.*) FROM inventory_item c;
+SELECT somefunc(c) FROM inventory_item c;</PRE
+><P>
+
+   In both cases, the current row of <TT
+CLASS="STRUCTNAME"
+>inventory_item</TT
+> is
+   passed to the function as a single composite-valued argument.
+   Even though <TT
+CLASS="LITERAL"
+>.*</TT
+> does nothing in such cases, using it is good
+   style, since it makes clear that a composite value is intended.  In
+   particular, the parser will consider <TT
+CLASS="LITERAL"
+>c</TT
+> in <TT
+CLASS="LITERAL"
+>c.*</TT
+> to
+   refer to a table name or alias, not to a column name, so that there is
+   no ambiguity; whereas without <TT
+CLASS="LITERAL"
+>.*</TT
+>, it is not clear
+   whether <TT
+CLASS="LITERAL"
+>c</TT
+> means a table name or a column name, and in fact
+   the column-name interpretation will be preferred if there is a column
+   named <TT
+CLASS="LITERAL"
+>c</TT
+>.
+  </P
+><P
+>   Another example demonstrating these concepts is that all these queries
+   mean the same thing:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SELECT * FROM inventory_item c ORDER BY c;
+SELECT * FROM inventory_item c ORDER BY c.*;
+SELECT * FROM inventory_item c ORDER BY ROW(c.*);</PRE
+><P>
+   All of these <TT
+CLASS="LITERAL"
+>ORDER BY</TT
+> clauses specify the row's composite
+   value, resulting in sorting the rows according to the rules described
+   in <A
+HREF="functions-comparisons.html#COMPOSITE-TYPE-COMPARISON"
+>Section 9.23.6</A
+>.  However,
+   if <TT
+CLASS="STRUCTNAME"
+>inventory_item</TT
+> contained a column
+   named <TT
+CLASS="STRUCTFIELD"
+>c</TT
+>, the first case would be different from the
+   others, as it would mean to sort by that column only.  Given the column
+   names previously shown, these queries are also equivalent to those above:
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SELECT * FROM inventory_item c ORDER BY ROW(c.name, c.supplier_id, c.price);
+SELECT * FROM inventory_item c ORDER BY (c.name, c.supplier_id, c.price);</PRE
+><P>
+   (The last case uses a row constructor with the key word <TT
+CLASS="LITERAL"
+>ROW</TT
+>
+   omitted.)
+  </P
+><P
+>   Another special syntactical behavior associated with composite values is
+   that we can use <I
+CLASS="FIRSTTERM"
+>functional notation</I
+> for extracting a field
+   of a composite value.  The simple way to explain this is that
+   the notations <TT
+CLASS="LITERAL"
+><TT
+CLASS="REPLACEABLE"
+><I
+>field</I
+></TT
+>(<TT
+CLASS="REPLACEABLE"
+><I
+>table</I
+></TT
+>)</TT
+>
+   and <TT
+CLASS="LITERAL"
+><TT
+CLASS="REPLACEABLE"
+><I
+>table</I
+></TT
+>.<TT
+CLASS="REPLACEABLE"
+><I
+>field</I
+></TT
+></TT
+>
+   are interchangeable.  For example, these queries are equivalent:
+
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SELECT c.name FROM inventory_item c WHERE c.price &gt; 1000;
+SELECT name(c) FROM inventory_item c WHERE price(c) &gt; 1000;</PRE
+><P>
+
+   Moreover, if we have a function that accepts a single argument of a
+   composite type, we can call it with either notation.  These queries are
+   all equivalent:
+
+</P><PRE
+CLASS="PROGRAMLISTING"
+>SELECT somefunc(c) FROM inventory_item c;
+SELECT somefunc(c.*) FROM inventory_item c;
+SELECT c.somefunc FROM inventory_item c;</PRE
+><P>
+  </P
+><P
+>   This equivalence between functional notation and field notation
+   makes it possible to use functions on composite types to implement
+   <SPAN
+CLASS="QUOTE"
+>"computed fields"</SPAN
+>.
+   
+   
+   An application using the last query above wouldn't need to be directly
+   aware that <TT
+CLASS="LITERAL"
+>somefunc</TT
+> isn't a real column of the table.
+  </P
+><DIV
+CLASS="TIP"
+><BLOCKQUOTE
+CLASS="TIP"
+><P
+><B
+>Tip: </B
+>    Because of this behavior, it's unwise to give a function that takes a
+    single composite-type argument the same name as any of the fields of
+    that composite type.  If there is ambiguity, the field-name
+    interpretation will be preferred, so that such a function could not be
+    called without tricks.  One way to force the function interpretation is
+    to schema-qualify the function name, that is, write
+    <TT
+CLASS="LITERAL"
+><TT
+CLASS="REPLACEABLE"
+><I
+>schema</I
+></TT
+>.<TT
+CLASS="REPLACEABLE"
+><I
+>func</I
+></TT
+>(<TT
+CLASS="REPLACEABLE"
+><I
+>compositevalue</I
+></TT
+>)</TT
+>.
+   </P
+></BLOCKQUOTE
+></DIV
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
 NAME="ROWTYPES-IO-SYNTAX"
->8.16.5. Composite Type Input and Output Syntax</A
+>8.16.6. Composite Type Input and Output Syntax</A
 ></H2
 ><P
 >   The external text representation of a composite value consists of items that
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/rules.html postgresql-9.5-9.5.8/doc/src/sgml/html/rules.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/rules.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/rules.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -123,7 +123,7 @@
 ></DT
 ><DT
 >38.2.2. <A
-HREF="rules-views.html#AEN61188"
+HREF="rules-views.html#AEN61445"
 >View Rules in Non-<TT
 CLASS="COMMAND"
 >SELECT</TT
@@ -131,7 +131,7 @@
 ></DT
 ><DT
 >38.2.3. <A
-HREF="rules-views.html#AEN61244"
+HREF="rules-views.html#AEN61501"
 >The Power of Views in <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
@@ -167,7 +167,7 @@
 ><DL
 ><DT
 >38.4.1. <A
-HREF="rules-update.html#AEN61376"
+HREF="rules-update.html#AEN61634"
 >How Update Rules Work</A
 ></DT
 ><DT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/rules-materializedviews.html postgresql-9.5-9.5.8/doc/src/sgml/html/rules-materializedviews.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/rules-materializedviews.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/rules-materializedviews.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Rule System"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/rules-privileges.html postgresql-9.5-9.5.8/doc/src/sgml/html/rules-privileges.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/rules-privileges.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/rules-privileges.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Rule System"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/rules-status.html postgresql-9.5-9.5.8/doc/src/sgml/html/rules-status.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/rules-status.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/rules-status.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Rule System"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/rules-triggers.html postgresql-9.5-9.5.8/doc/src/sgml/html/rules-triggers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/rules-triggers.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/rules-triggers.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Rule System"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/rules-update.html postgresql-9.5-9.5.8/doc/src/sgml/html/rules-update.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/rules-update.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/rules-update.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Rule System"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -233,7 +233,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN61376"
+NAME="AEN61634"
 >38.4.1. How Update Rules Work</A
 ></H2
 ><P
@@ -470,7 +470,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN61436"
+NAME="AEN61694"
 >38.4.1.1. A First Rule Step by Step</A
 ></H3
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/rules-views.html postgresql-9.5-9.5.8/doc/src/sgml/html/rules-views.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/rules-views.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/rules-views.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The Rule System"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -626,7 +626,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN61188"
+NAME="AEN61445"
 >38.2.2. View Rules in Non-<TT
 CLASS="COMMAND"
 >SELECT</TT
@@ -848,7 +848,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN61244"
+NAME="AEN61501"
 >38.2.3. The Power of Views in <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
@@ -1020,7 +1020,10 @@
 > commands on
     a view. These rules will rewrite the command, typically into a command
     that updates one or more tables, rather than views. That is the topic
-    of the next section.</P
+    of <A
+HREF="rules-update.html"
+>Section 38.4</A
+>.</P
 ><P
 >    Note that rules are evaluated first, rewriting the original query
     before it is planned and executed. Therefore, if a view has
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/rule-system.html postgresql-9.5-9.5.8/doc/src/sgml/html/rule-system.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/rule-system.html	2016-03-28 20:20:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/rule-system.html	2017-08-07 21:32:27.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Overview of PostgreSQL Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-autovacuum.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-autovacuum.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-autovacuum.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-autovacuum.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-client.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-client.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-client.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-client.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-compatible.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-compatible.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-compatible.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-compatible.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-connection.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-connection.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-connection.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-connection.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -502,14 +502,11 @@
 >        Specifies the number of seconds of inactivity after which TCP
         should send a keepalive message to the client.  A value of 0 uses
         the system default.
-        This parameter is supported only on systems that support the
+        This parameter is supported only on systems that support
         <TT
 CLASS="SYMBOL"
 >TCP_KEEPIDLE</TT
-> or <TT
-CLASS="SYMBOL"
->TCP_KEEPALIVE</TT
-> symbols, and on
+> or an equivalent socket option, and on
         Windows; on other systems, it must be zero.
         In sessions connected via a Unix-domain socket, this parameter is
         ignored and always reads as zero.
@@ -544,12 +541,12 @@
 >        Specifies the number of seconds after which a TCP keepalive message
         that is not acknowledged by the client should be retransmitted.
         A value of 0 uses the system default.
-        This parameter is supported only on systems that support the
+        This parameter is supported only on systems that support
         <TT
 CLASS="SYMBOL"
 >TCP_KEEPINTVL</TT
-> symbol, and on Windows; on other systems, it
-        must be zero.
+> or an equivalent socket option, and on
+        Windows; on other systems, it must be zero.
         In sessions connected via a Unix-domain socket, this parameter is
         ignored and always reads as zero.
        </P
@@ -581,13 +578,14 @@
 ><DD
 ><P
 >        Specifies the number of TCP keepalives that can be lost before
-        the server's connection to the client is considered dead.  A value of 0
-        uses the system default.  This parameter is
-        supported only on systems that support the <TT
+        the server's connection to the client is considered dead.
+        A value of 0 uses the system default.
+        This parameter is supported only on systems that support
+        <TT
 CLASS="SYMBOL"
 >TCP_KEEPCNT</TT
->
-        symbol; on other systems, it must be zero.
+> or an equivalent socket option;
+        on other systems, it must be zero.
         In sessions connected via a Unix-domain socket, this parameter is
         ignored and always reads as zero.
        </P
@@ -814,7 +812,8 @@
 CLASS="LITERAL"
 >HIGH:MEDIUM:+3DES:!aNULL</TT
 >.  It is usually reasonable,
-        unless you have specific security requirements.
+        unless you have specific security requirements.  This parameter can only
+        be set at server start.
        </P
 ><P
 >        Explanation of the default value:
@@ -923,7 +922,8 @@
 ><DD
 ><P
 >        Specifies whether to use the server's SSL cipher preferences, rather
-        than the client's.  The default is true.
+        than the client's.  The default is true.  This parameter can only be
+        set at server start.
        </P
 ><P
 >        Older PostgreSQL versions do not have this setting and always use the
@@ -956,7 +956,8 @@
         Curve key.  The default is <TT
 CLASS="LITERAL"
 >prime256v1</TT
->.
+>.  This parameter
+        can only be set at server start.
        </P
 ><P
 >        OpenSSL names for most common curves:
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-custom.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-custom.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-custom.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-custom.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-developer.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-developer.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-developer.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-developer.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-error-handling.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-error-handling.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-error-handling.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-error-handling.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-file-locations.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-file-locations.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-file-locations.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-file-locations.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -200,16 +200,16 @@
       </DT
 ><DD
 ><P
->         Specifies the configuration file for
-         <A
-HREF="auth-username-maps.html"
->Section 19.2</A
-> user name mapping
+>         Specifies the configuration file for user name mapping
          (customarily called <TT
 CLASS="FILENAME"
 >pg_ident.conf</TT
 >).
          This parameter can only be set at server start.
+         See also <A
+HREF="auth-username-maps.html"
+>Section 19.2</A
+>.
        </P
 ></DD
 ><DT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -125,7 +125,7 @@
 ></DT
 ><DT
 >18.1.4. <A
-HREF="config-setting.html#AEN30584"
+HREF="config-setting.html#AEN30858"
 >Parameter Interaction via the Shell</A
 ></DT
 ><DT
@@ -304,7 +304,7 @@
 ></DT
 ><DT
 >18.8.5. <A
-HREF="runtime-config-logging.html#AEN33166"
+HREF="runtime-config-logging.html#AEN33439"
 >Process Title</A
 ></DT
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-locks.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-locks.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-locks.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-locks.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-logging.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-logging.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-logging.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-logging.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -1783,7 +1783,7 @@
 ><P
 ></P
 ><A
-NAME="AEN32950"
+NAME="AEN33223"
 ></A
 ><TABLE
 BORDER="1"
@@ -2082,6 +2082,7 @@
 CLASS="LITERAL"
 >off</TT
 >.
+        Only superusers can change this setting.
        </P
 ></DD
 ><DT
@@ -2479,7 +2480,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN33166"
+NAME="AEN33439"
 >18.8.5. Process Title</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-preset.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-preset.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-preset.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-preset.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-query.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-query.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-query.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-query.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-replication.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-replication.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-replication.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-replication.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-resource.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-resource.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-resource.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-resource.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-short.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-short.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-short.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-short.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-statistics.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-statistics.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-statistics.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-statistics.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-wal.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-wal.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime-config-wal.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime-config-wal.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/runtime.html postgresql-9.5-9.5.8/doc/src/sgml/html/runtime.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/runtime.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/runtime.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -28,7 +28,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -46,7 +46,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -165,7 +165,7 @@
 ></DT
 ><DT
 >17.4.2. <A
-HREF="kernel-resources.html#AEN29889"
+HREF="kernel-resources.html#AEN30159"
 >Resource Limits</A
 ></DT
 ><DT
@@ -176,7 +176,7 @@
 ><DT
 >17.4.4. <A
 HREF="kernel-resources.html#LINUX-HUGE-PAGES"
->Linux huge pages</A
+>Linux Huge Pages</A
 ></DT
 ></DL
 ></DD
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/seg.html postgresql-9.5-9.5.8/doc/src/sgml/html/seg.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/seg.html	2016-03-28 20:21:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/seg.html	2017-08-07 21:33:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -112,7 +112,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173502"
+NAME="AEN178359"
 >F.32.1. Rationale</A
 ></H2
 ><P
@@ -175,7 +175,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173511"
+NAME="AEN178368"
 >F.32.2. Syntax</A
 ></H2
 ><P
@@ -203,18 +203,18 @@
    (Certainty indicators are ignored by all the built-in operators, however.)
    <A
 HREF="seg.html#SEG-REPR-TABLE"
->Table F-25</A
+>Table F-27</A
 > gives an overview of allowed
    representations; <A
 HREF="seg.html#SEG-INPUT-EXAMPLES"
->Table F-26</A
+>Table F-28</A
 > shows some
    examples.
   </P
 ><P
 >   In <A
 HREF="seg.html#SEG-REPR-TABLE"
->Table F-25</A
+>Table F-27</A
 >, <TT
 CLASS="REPLACEABLE"
 ><I
@@ -257,7 +257,7 @@
 ></A
 ><P
 ><B
->Table F-25. <TT
+>Table F-27. <TT
 CLASS="TYPE"
 >seg</TT
 > External Representations</B
@@ -402,7 +402,7 @@
 ></A
 ><P
 ><B
->Table F-26. Examples of Valid <TT
+>Table F-28. Examples of Valid <TT
 CLASS="TYPE"
 >seg</TT
 > Input</B
@@ -584,7 +584,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173631"
+NAME="AEN178488"
 >F.32.3. Precision</A
 ></H2
 ><P
@@ -609,7 +609,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173636"
+NAME="AEN178493"
 >F.32.4. Usage</A
 ></H2
 ><P
@@ -623,7 +623,7 @@
 > values.
    The operators supported by the GiST operator class are shown in <A
 HREF="seg.html#SEG-GIST-OPERATORS"
->Table F-27</A
+>Table F-29</A
 >.
   </P
 ><DIV
@@ -633,7 +633,7 @@
 ></A
 ><P
 ><B
->Table F-27. Seg GiST Operators</B
+>Table F-29. Seg GiST Operators</B
 ></P
 ><TABLE
 BORDER="1"
@@ -764,7 +764,7 @@
 ><P
 ></P
 ><A
-NAME="AEN173690"
+NAME="AEN178547"
 ></A
 ><TABLE
 BORDER="1"
@@ -815,7 +815,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173705"
+NAME="AEN178562"
 >F.32.5. Notes</A
 ></H2
 ><P
@@ -859,7 +859,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN173715"
+NAME="AEN178572"
 >F.32.6. Credits</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sepgsql.html postgresql-9.5-9.5.8/doc/src/sgml/html/sepgsql.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sepgsql.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sepgsql.html	2017-08-07 21:33:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -608,7 +608,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173848"
+NAME="AEN178705"
 >F.33.5.1. Controlled Object Classes</A
 ></H3
 ><P
@@ -656,7 +656,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173857"
+NAME="AEN178714"
 >F.33.5.2. DML Permissions</A
 ></H3
 ><P
@@ -827,7 +827,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173899"
+NAME="AEN178756"
 >F.33.5.3. DDL Permissions</A
 ></H3
 ><P
@@ -994,7 +994,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173945"
+NAME="AEN178802"
 >F.33.5.4. Trusted Procedures</A
 ></H3
 ><P
@@ -1060,7 +1060,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173955"
+NAME="AEN178812"
 >F.33.5.5. Dynamic Domain Transitions</A
 ></H3
 ><P
@@ -1151,7 +1151,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN173970"
+NAME="AEN178827"
 >F.33.5.6. Miscellaneous</A
 ></H3
 ><P
@@ -1174,7 +1174,7 @@
 ><P
 >   <A
 HREF="sepgsql.html#SEPGSQL-FUNCTIONS-TABLE"
->Table F-28</A
+>Table F-30</A
 > shows the available functions.
   </P
 ><DIV
@@ -1184,7 +1184,7 @@
 ></A
 ><P
 ><B
->Table F-28. Sepgsql Functions</B
+>Table F-30. Sepgsql Functions</B
 ></P
 ><TABLE
 BORDER="1"
@@ -1223,7 +1223,7 @@
 >sepgsql_mcstrans_in(text) returns text</TT
 ></TD
 ><TD
->Translates the given qualifies MLS/MCS range into raw format if
+>Translates the given qualified MLS/MCS range into raw format if
       the mcstrans daemon is running.
       </TD
 ></TR
@@ -1234,7 +1234,7 @@
 >sepgsql_mcstrans_out(text) returns text</TT
 ></TD
 ><TD
->Translates the given raw MCS/MCS range into qualified format if
+>Translates the given raw MLS/MCS range into qualified format if
       the mcstrans daemon is running.
       </TD
 ></TR
@@ -1331,7 +1331,7 @@
 ><DL
 ><DT
 ><A
-HREF="http://wiki.postgresql.org/wiki/SEPostgreSQL"
+HREF="https://wiki.postgresql.org/wiki/SEPostgreSQL"
 TARGET="_top"
 >SE-PostgreSQL Introduction</A
 ></DT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/server-programming.html postgresql-9.5-9.5.8/doc/src/sgml/html/server-programming.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/server-programming.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/server-programming.html	2017-08-07 21:32:19.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="views"
@@ -23,7 +23,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="PART"
 ><DIV
@@ -41,7 +41,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -97,7 +97,7 @@
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN56315"
+NAME="AEN56581"
 ></A
 ><P
 >    This part is about extending the server functionality with
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/server-shutdown.html postgresql-9.5-9.5.8/doc/src/sgml/html/server-shutdown.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/server-shutdown.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/server-shutdown.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/server-start.html postgresql-9.5-9.5.8/doc/src/sgml/html/server-start.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/server-start.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/server-start.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/source-format.html postgresql-9.5-9.5.8/doc/src/sgml/html/source-format.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/source-format.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/source-format.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="PostgreSQL Coding Conventions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/source.html postgresql-9.5-9.5.8/doc/src/sgml/html/source.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/source.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/source.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -120,82 +120,82 @@
 ><DL
 ><DT
 >51.3.1. <A
-HREF="error-style-guide.html#AEN110749"
+HREF="error-style-guide.html#AEN111118"
 >What Goes Where</A
 ></DT
 ><DT
 >51.3.2. <A
-HREF="error-style-guide.html#AEN110758"
+HREF="error-style-guide.html#AEN111127"
 >Formatting</A
 ></DT
 ><DT
 >51.3.3. <A
-HREF="error-style-guide.html#AEN110762"
+HREF="error-style-guide.html#AEN111131"
 >Quotation Marks</A
 ></DT
 ><DT
 >51.3.4. <A
-HREF="error-style-guide.html#AEN110766"
+HREF="error-style-guide.html#AEN111135"
 >Use of Quotes</A
 ></DT
 ><DT
 >51.3.5. <A
-HREF="error-style-guide.html#AEN110772"
+HREF="error-style-guide.html#AEN111141"
 >Grammar and Punctuation</A
 ></DT
 ><DT
 >51.3.6. <A
-HREF="error-style-guide.html#AEN110779"
+HREF="error-style-guide.html#AEN111148"
 >Upper Case vs. Lower Case</A
 ></DT
 ><DT
 >51.3.7. <A
-HREF="error-style-guide.html#AEN110783"
+HREF="error-style-guide.html#AEN111152"
 >Avoid Passive Voice</A
 ></DT
 ><DT
 >51.3.8. <A
-HREF="error-style-guide.html#AEN110789"
+HREF="error-style-guide.html#AEN111158"
 >Present vs. Past Tense</A
 ></DT
 ><DT
 >51.3.9. <A
-HREF="error-style-guide.html#AEN110799"
+HREF="error-style-guide.html#AEN111168"
 >Type of the Object</A
 ></DT
 ><DT
 >51.3.10. <A
-HREF="error-style-guide.html#AEN110804"
+HREF="error-style-guide.html#AEN111173"
 >Brackets</A
 ></DT
 ><DT
 >51.3.11. <A
-HREF="error-style-guide.html#AEN110808"
+HREF="error-style-guide.html#AEN111177"
 >Assembling Error Messages</A
 ></DT
 ><DT
 >51.3.12. <A
-HREF="error-style-guide.html#AEN110813"
+HREF="error-style-guide.html#AEN111182"
 >Reasons for Errors</A
 ></DT
 ><DT
 >51.3.13. <A
-HREF="error-style-guide.html#AEN110817"
+HREF="error-style-guide.html#AEN111186"
 >Function Names</A
 ></DT
 ><DT
 >51.3.14. <A
-HREF="error-style-guide.html#AEN110824"
+HREF="error-style-guide.html#AEN111193"
 >Tricky Words to Avoid</A
 ></DT
 ><DT
 >51.3.15. <A
-HREF="error-style-guide.html#AEN110867"
+HREF="error-style-guide.html#AEN111236"
 >Proper Spelling</A
 ></DT
 ><DT
 >51.3.16. <A
-HREF="error-style-guide.html#AEN110882"
+HREF="error-style-guide.html#AEN111251"
 >Localization</A
 ></DT
 ></DL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sourcerepo.html postgresql-9.5-9.5.8/doc/src/sgml/html/sourcerepo.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sourcerepo.html	2016-03-28 20:21:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sourcerepo.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,9 +108,9 @@
  </P
 ><P
 >  Our wiki, <A
-HREF="http://wiki.postgresql.org/wiki/Working_with_Git"
+HREF="https://wiki.postgresql.org/wiki/Working_with_Git"
 TARGET="_top"
->http://wiki.postgresql.org/wiki/Working_with_Git</A
+>https://wiki.postgresql.org/wiki/Working_with_Git</A
 >,
   has some discussion on working with Git.
  </P
@@ -130,11 +130,11 @@
 CLASS="APPLICATION"
 >Perl</SPAN
 >. These tools are not needed
-   to build from a distribution tarball since the files they are used to build
-   are included in the tarball.  Other tool requirements are the same as shown
-   in <A
-HREF="installation.html"
->Chapter 15</A
+   to build from a distribution tarball, because the files that these tools
+   are used to build are included in the tarball.  Other tool requirements
+   are the same as shown in <A
+HREF="install-requirements.html"
+>Section 15.2</A
 >.
   </P
 ></DIV
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spgist-builtin-opclasses.html postgresql-9.5-9.5.8/doc/src/sgml/html/spgist-builtin-opclasses.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spgist-builtin-opclasses.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spgist-builtin-opclasses.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SP-GiST Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spgist-examples.html postgresql-9.5-9.5.8/doc/src/sgml/html/spgist-examples.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spgist-examples.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spgist-examples.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SP-GiST Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spgist-extensibility.html postgresql-9.5-9.5.8/doc/src/sgml/html/spgist-extensibility.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spgist-extensibility.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spgist-extensibility.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SP-GiST Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spgist.html postgresql-9.5-9.5.8/doc/src/sgml/html/spgist.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spgist.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spgist.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spgist-implementation.html postgresql-9.5-9.5.8/doc/src/sgml/html/spgist-implementation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spgist-implementation.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spgist-implementation.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SP-GiST Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spgist-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/spgist-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spgist-intro.html	2016-03-28 20:21:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spgist-intro.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SP-GiST Indexes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-examples.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-examples.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-examples.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-examples.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming Interface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-interface.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-interface.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-interface.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-interface.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming Interface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-interface-support.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-interface-support.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-interface-support.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-interface-support.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming Interface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-memory.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-memory.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-memory.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-memory.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming Interface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-realloc.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-realloc.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-realloc.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-realloc.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Memory Management"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68024"
+NAME="AEN68334"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68027"
+NAME="AEN68337"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68031"
+NAME="AEN68341"
 ></A
 ><H2
 >Description</H2
@@ -146,7 +146,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68038"
+NAME="AEN68348"
 ></A
 ><H2
 >Arguments</H2
@@ -187,7 +187,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68053"
+NAME="AEN68363"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-connect.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-connect.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-connect.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-connect.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN65987"
+NAME="AEN66297"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN65990"
+NAME="AEN66300"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN65992"
+NAME="AEN66302"
 ></A
 ><H2
 >Description</H2
@@ -175,7 +175,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66007"
+NAME="AEN66317"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-copytuple.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-copytuple.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-copytuple.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-copytuple.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Memory Management"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68091"
+NAME="AEN68401"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68094"
+NAME="AEN68404"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68097"
+NAME="AEN68407"
 ></A
 ><H2
 >Description</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68102"
+NAME="AEN68412"
 ></A
 ><H2
 >Arguments</H2
@@ -165,7 +165,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68111"
+NAME="AEN68421"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-close.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-close.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-close.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-close.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67513"
+NAME="AEN67823"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67516"
+NAME="AEN67826"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67519"
+NAME="AEN67829"
 ></A
 ><H2
 >Description</H2
@@ -140,7 +140,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67525"
+NAME="AEN67835"
 ></A
 ><H2
 >Arguments</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-fetch.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-fetch.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-fetch.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-fetch.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67290"
+NAME="AEN67600"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67293"
+NAME="AEN67603"
 ></A
 ><H2
 >Synopsis</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67298"
+NAME="AEN67608"
 ></A
 ><H2
 >Description</H2
@@ -146,7 +146,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67304"
+NAME="AEN67614"
 ></A
 ><H2
 >Arguments</H2
@@ -200,7 +200,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67325"
+NAME="AEN67635"
 ></A
 ><H2
 >Return Value</H2
@@ -222,7 +222,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67331"
+NAME="AEN67641"
 ></A
 ><H2
 >Notes</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-find.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-find.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-find.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-find.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67261"
+NAME="AEN67571"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67264"
+NAME="AEN67574"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67267"
+NAME="AEN67577"
 ></A
 ><H2
 >Description</H2
@@ -133,7 +133,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67271"
+NAME="AEN67581"
 ></A
 ><H2
 >Arguments</H2
@@ -161,7 +161,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67280"
+NAME="AEN67590"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-move.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-move.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-move.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-move.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67341"
+NAME="AEN67651"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67344"
+NAME="AEN67654"
 ></A
 ><H2
 >Synopsis</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67349"
+NAME="AEN67659"
 ></A
 ><H2
 >Description</H2
@@ -146,7 +146,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67355"
+NAME="AEN67665"
 ></A
 ><H2
 >Arguments</H2
@@ -200,7 +200,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67376"
+NAME="AEN67686"
 ></A
 ><H2
 >Notes</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-open.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-open.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-open.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-open.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67026"
+NAME="AEN67336"
 ></A
 ><H2
 >Name</H2
@@ -106,7 +106,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67030"
+NAME="AEN67340"
 ></A
 ><H2
 >Synopsis</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67037"
+NAME="AEN67347"
 ></A
 ><H2
 >Description</H2
@@ -171,7 +171,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67045"
+NAME="AEN67355"
 ></A
 ><H2
 >Arguments</H2
@@ -300,7 +300,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67091"
+NAME="AEN67401"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-open-with-args.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-open-with-args.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-open-with-args.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-open-with-args.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67101"
+NAME="AEN67411"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67104"
+NAME="AEN67414"
 ></A
 ><H2
 >Synopsis</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67114"
+NAME="AEN67424"
 ></A
 ><H2
 >Description</H2
@@ -184,7 +184,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67124"
+NAME="AEN67434"
 ></A
 ><H2
 >Arguments</H2
@@ -368,7 +368,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67193"
+NAME="AEN67503"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-open-with-paramlist.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-open-with-paramlist.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-cursor-open-with-paramlist.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-cursor-open-with-paramlist.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67203"
+NAME="AEN67513"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67206"
+NAME="AEN67516"
 ></A
 ><H2
 >Synopsis</H2
@@ -129,7 +129,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67212"
+NAME="AEN67522"
 ></A
 ><H2
 >Description</H2
@@ -167,7 +167,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67221"
+NAME="AEN67531"
 ></A
 ><H2
 >Arguments</H2
@@ -243,7 +243,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67251"
+NAME="AEN67561"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-exec.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-exec.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-exec.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-exec.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66311"
+NAME="AEN66621"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66314"
+NAME="AEN66624"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66318"
+NAME="AEN66628"
 ></A
 ><H2
 >Description</H2
@@ -146,7 +146,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66325"
+NAME="AEN66635"
 ></A
 ><H2
 >Arguments</H2
@@ -191,7 +191,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66341"
+NAME="AEN66651"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-execp.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-execp.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-execp.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-execp.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66957"
+NAME="AEN67267"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66960"
+NAME="AEN67270"
 ></A
 ><H2
 >Synopsis</H2
@@ -126,7 +126,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66966"
+NAME="AEN67276"
 ></A
 ><H2
 >Description</H2
@@ -152,7 +152,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66973"
+NAME="AEN67283"
 ></A
 ><H2
 >Arguments</H2
@@ -266,7 +266,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67012"
+NAME="AEN67322"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-execute.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-execute.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-execute.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-execute.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66099"
+NAME="AEN66409"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66102"
+NAME="AEN66412"
 ></A
 ><H2
 >Synopsis</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66107"
+NAME="AEN66417"
 ></A
 ><H2
 >Description</H2
@@ -385,7 +385,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66170"
+NAME="AEN66480"
 ></A
 ><H2
 >Arguments</H2
@@ -445,7 +445,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66193"
+NAME="AEN66503"
 ></A
 ><H2
 >Return Value</H2
@@ -716,7 +716,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66299"
+NAME="AEN66609"
 ></A
 ><H2
 >Notes</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-execute-plan.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-execute-plan.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-execute-plan.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-execute-plan.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66799"
+NAME="AEN67109"
 ></A
 ><H2
 >Name</H2
@@ -106,7 +106,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66803"
+NAME="AEN67113"
 ></A
 ><H2
 >Synopsis</H2
@@ -133,7 +133,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66810"
+NAME="AEN67120"
 ></A
 ><H2
 >Description</H2
@@ -163,7 +163,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66818"
+NAME="AEN67128"
 ></A
 ><H2
 >Arguments</H2
@@ -292,7 +292,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66864"
+NAME="AEN67174"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-execute-plan-with-paramlist.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-execute-plan-with-paramlist.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-execute-plan-with-paramlist.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-execute-plan-with-paramlist.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66895"
+NAME="AEN67205"
 ></A
 ><H2
 >Name</H2
@@ -106,7 +106,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66899"
+NAME="AEN67209"
 ></A
 ><H2
 >Synopsis</H2
@@ -132,7 +132,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66905"
+NAME="AEN67215"
 ></A
 ><H2
 >Description</H2
@@ -165,7 +165,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66913"
+NAME="AEN67223"
 ></A
 ><H2
 >Arguments</H2
@@ -241,7 +241,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66943"
+NAME="AEN67253"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-execute-with-args.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-execute-with-args.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-execute-with-args.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-execute-with-args.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66351"
+NAME="AEN66661"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66354"
+NAME="AEN66664"
 ></A
 ><H2
 >Synopsis</H2
@@ -138,7 +138,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66363"
+NAME="AEN66673"
 ></A
 ><H2
 >Description</H2
@@ -199,7 +199,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66377"
+NAME="AEN66687"
 ></A
 ><H2
 >Arguments</H2
@@ -370,7 +370,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66440"
+NAME="AEN66750"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-finish.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-finish.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-finish.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-finish.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66026"
+NAME="AEN66336"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66029"
+NAME="AEN66339"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66031"
+NAME="AEN66341"
 ></A
 ><H2
 >Description</H2
@@ -148,7 +148,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66039"
+NAME="AEN66349"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-fname.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-fname.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-fname.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-fname.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Support Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67634"
+NAME="AEN67944"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67637"
+NAME="AEN67947"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67641"
+NAME="AEN67951"
 ></A
 ><H2
 >Description</H2
@@ -139,7 +139,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67646"
+NAME="AEN67956"
 ></A
 ><H2
 >Arguments</H2
@@ -180,7 +180,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67661"
+NAME="AEN67971"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-fnumber.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-fnumber.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-fnumber.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-fnumber.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Support Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67674"
+NAME="AEN67984"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67677"
+NAME="AEN67987"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67681"
+NAME="AEN67991"
 ></A
 ><H2
 >Description</H2
@@ -152,7 +152,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67689"
+NAME="AEN67999"
 ></A
 ><H2
 >Arguments</H2
@@ -193,7 +193,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67704"
+NAME="AEN68014"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-freeplan.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-freeplan.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-freeplan.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-freeplan.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Memory Management"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68331"
+NAME="AEN68641"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68334"
+NAME="AEN68644"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68337"
+NAME="AEN68647"
 ></A
 ><H2
 >Description</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68344"
+NAME="AEN68654"
 ></A
 ><H2
 >Arguments</H2
@@ -170,7 +170,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68353"
+NAME="AEN68663"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-freetuple.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-freetuple.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-freetuple.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-freetuple.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Memory Management"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68271"
+NAME="AEN68581"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68274"
+NAME="AEN68584"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68277"
+NAME="AEN68587"
 ></A
 ><H2
 >Description</H2
@@ -140,7 +140,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68283"
+NAME="AEN68593"
 ></A
 ><H2
 >Arguments</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-freetupletable.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-freetupletable.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-freetupletable.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-freetupletable.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Memory Management"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68298"
+NAME="AEN68608"
 ></A
 ><H2
 >Name</H2
@@ -107,7 +107,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68302"
+NAME="AEN68612"
 ></A
 ><H2
 >Synopsis</H2
@@ -121,7 +121,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68305"
+NAME="AEN68615"
 ></A
 ><H2
 >Description</H2
@@ -169,7 +169,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68316"
+NAME="AEN68626"
 ></A
 ><H2
 >Arguments</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getargcount.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getargcount.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getargcount.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getargcount.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66668"
+NAME="AEN66978"
 ></A
 ><H2
 >Name</H2
@@ -107,7 +107,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66672"
+NAME="AEN66982"
 ></A
 ><H2
 >Synopsis</H2
@@ -121,7 +121,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66675"
+NAME="AEN66985"
 ></A
 ><H2
 >Description</H2
@@ -139,7 +139,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66680"
+NAME="AEN66990"
 ></A
 ><H2
 >Arguments</H2
@@ -170,7 +170,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66690"
+NAME="AEN67000"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getargtypeid.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getargtypeid.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getargtypeid.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getargtypeid.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66704"
+NAME="AEN67014"
 ></A
 ><H2
 >Name</H2
@@ -107,7 +107,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66708"
+NAME="AEN67018"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66712"
+NAME="AEN67022"
 ></A
 ><H2
 >Description</H2
@@ -146,7 +146,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66718"
+NAME="AEN67028"
 ></A
 ><H2
 >Arguments</H2
@@ -190,7 +190,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66734"
+NAME="AEN67044"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getbinval.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getbinval.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getbinval.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getbinval.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Support Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67765"
+NAME="AEN68075"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67768"
+NAME="AEN68078"
 ></A
 ><H2
 >Synopsis</H2
@@ -127,7 +127,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67774"
+NAME="AEN68084"
 ></A
 ><H2
 >Description</H2
@@ -150,7 +150,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67780"
+NAME="AEN68090"
 ></A
 ><H2
 >Arguments</H2
@@ -217,7 +217,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67807"
+NAME="AEN68117"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getnspname.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getnspname.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getnspname.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getnspname.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Support Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67929"
+NAME="AEN68239"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67932"
+NAME="AEN68242"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67935"
+NAME="AEN68245"
 ></A
 ><H2
 >Description</H2
@@ -141,7 +141,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67941"
+NAME="AEN68251"
 ></A
 ><H2
 >Arguments</H2
@@ -169,7 +169,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67950"
+NAME="AEN68260"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getrelname.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getrelname.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getrelname.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getrelname.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Support Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67900"
+NAME="AEN68210"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67903"
+NAME="AEN68213"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67906"
+NAME="AEN68216"
 ></A
 ><H2
 >Description</H2
@@ -136,7 +136,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67911"
+NAME="AEN68221"
 ></A
 ><H2
 >Arguments</H2
@@ -164,7 +164,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67920"
+NAME="AEN68230"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-gettype.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-gettype.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-gettype.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-gettype.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Support Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67820"
+NAME="AEN68130"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67823"
+NAME="AEN68133"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67827"
+NAME="AEN68137"
 ></A
 ><H2
 >Description</H2
@@ -139,7 +139,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67832"
+NAME="AEN68142"
 ></A
 ><H2
 >Arguments</H2
@@ -180,7 +180,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67847"
+NAME="AEN68157"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-gettypeid.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-gettypeid.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-gettypeid.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-gettypeid.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Support Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67859"
+NAME="AEN68169"
 ></A
 ><H2
 >Name</H2
@@ -106,7 +106,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67863"
+NAME="AEN68173"
 ></A
 ><H2
 >Synopsis</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67867"
+NAME="AEN68177"
 ></A
 ><H2
 >Description</H2
@@ -141,7 +141,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67872"
+NAME="AEN68182"
 ></A
 ><H2
 >Arguments</H2
@@ -182,7 +182,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67887"
+NAME="AEN68197"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getvalue.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getvalue.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-getvalue.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-getvalue.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Support Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67714"
+NAME="AEN68024"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67717"
+NAME="AEN68027"
 ></A
 ><H2
 >Synopsis</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67722"
+NAME="AEN68032"
 ></A
 ><H2
 >Description</H2
@@ -150,7 +150,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67729"
+NAME="AEN68039"
 ></A
 ><H2
 >Arguments</H2
@@ -204,7 +204,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67750"
+NAME="AEN68060"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-is-cursor-plan.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-is-cursor-plan.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-is-cursor-plan.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-is-cursor-plan.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66750"
+NAME="AEN67060"
 ></A
 ><H2
 >Name</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66756"
+NAME="AEN67066"
 ></A
 ><H2
 >Synopsis</H2
@@ -128,7 +128,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66759"
+NAME="AEN67069"
 ></A
 ><H2
 >Description</H2
@@ -177,7 +177,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66772"
+NAME="AEN67082"
 ></A
 ><H2
 >Arguments</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66782"
+NAME="AEN67092"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-keepplan.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-keepplan.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-keepplan.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-keepplan.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67540"
+NAME="AEN67850"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67543"
+NAME="AEN67853"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67546"
+NAME="AEN67856"
 ></A
 ><H2
 >Description</H2
@@ -141,7 +141,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67552"
+NAME="AEN67862"
 ></A
 ><H2
 >Arguments</H2
@@ -169,7 +169,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67561"
+NAME="AEN67871"
 ></A
 ><H2
 >Return Value</H2
@@ -191,7 +191,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67567"
+NAME="AEN67877"
 ></A
 ><H2
 >Notes</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-modifytuple.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-modifytuple.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-modifytuple.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-modifytuple.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Memory Management"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68168"
+NAME="AEN68478"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68171"
+NAME="AEN68481"
 ></A
 ><H2
 >Synopsis</H2
@@ -133,7 +133,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68179"
+NAME="AEN68489"
 ></A
 ><H2
 >Description</H2
@@ -149,7 +149,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68183"
+NAME="AEN68493"
 ></A
 ><H2
 >Arguments</H2
@@ -294,7 +294,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68235"
+NAME="AEN68545"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-palloc.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-palloc.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-palloc.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-palloc.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Memory Management"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67996"
+NAME="AEN68306"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67999"
+NAME="AEN68309"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68002"
+NAME="AEN68312"
 ></A
 ><H2
 >Description</H2
@@ -132,7 +132,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68006"
+NAME="AEN68316"
 ></A
 ><H2
 >Arguments</H2
@@ -160,7 +160,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68015"
+NAME="AEN68325"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-pfree.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-pfree.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-pfree.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-pfree.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Memory Management"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68062"
+NAME="AEN68372"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68065"
+NAME="AEN68375"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68068"
+NAME="AEN68378"
 ></A
 ><H2
 >Description</H2
@@ -147,7 +147,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68076"
+NAME="AEN68386"
 ></A
 ><H2
 >Arguments</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-pop.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-pop.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-pop.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-pop.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66083"
+NAME="AEN66393"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66086"
+NAME="AEN66396"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66088"
+NAME="AEN66398"
 ></A
 ><H2
 >Description</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-prepare-cursor.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-prepare-cursor.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-prepare-cursor.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-prepare-cursor.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66545"
+NAME="AEN66855"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66548"
+NAME="AEN66858"
 ></A
 ><H2
 >Synopsis</H2
@@ -127,7 +127,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66554"
+NAME="AEN66864"
 ></A
 ><H2
 >Description</H2
@@ -164,7 +164,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66564"
+NAME="AEN66874"
 ></A
 ><H2
 >Arguments</H2
@@ -241,7 +241,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66594"
+NAME="AEN66904"
 ></A
 ><H2
 >Return Value</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66599"
+NAME="AEN66909"
 ></A
 ><H2
 >Notes</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-prepare.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-prepare.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-prepare.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-prepare.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66454"
+NAME="AEN66764"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66457"
+NAME="AEN66767"
 ></A
 ><H2
 >Synopsis</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66462"
+NAME="AEN66772"
 ></A
 ><H2
 >Description</H2
@@ -193,7 +193,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66478"
+NAME="AEN66788"
 ></A
 ><H2
 >Arguments</H2
@@ -257,7 +257,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66502"
+NAME="AEN66812"
 ></A
 ><H2
 >Return Value</H2
@@ -312,7 +312,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66517"
+NAME="AEN66827"
 ></A
 ><H2
 >Notes</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-prepare-params.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-prepare-params.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-prepare-params.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-prepare-params.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66615"
+NAME="AEN66925"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66618"
+NAME="AEN66928"
 ></A
 ><H2
 >Synopsis</H2
@@ -129,7 +129,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66624"
+NAME="AEN66934"
 ></A
 ><H2
 >Description</H2
@@ -150,7 +150,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66629"
+NAME="AEN66939"
 ></A
 ><H2
 >Arguments</H2
@@ -220,7 +220,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66657"
+NAME="AEN66967"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-push.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-push.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-push.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-push.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN66058"
+NAME="AEN66368"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN66061"
+NAME="AEN66371"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66063"
+NAME="AEN66373"
 ></A
 ><H2
 >Description</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-returntuple.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-returntuple.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-returntuple.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-returntuple.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Memory Management"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68123"
+NAME="AEN68433"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68126"
+NAME="AEN68436"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68130"
+NAME="AEN68440"
 ></A
 ><H2
 >Description</H2
@@ -154,7 +154,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68139"
+NAME="AEN68449"
 ></A
 ><H2
 >Arguments</H2
@@ -196,7 +196,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68154"
+NAME="AEN68464"
 ></A
 ><H2
 >Return Value</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-saveplan.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-saveplan.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-saveplan.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-saveplan.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67577"
+NAME="AEN67887"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67580"
+NAME="AEN67890"
 ></A
 ><H2
 >Synopsis</H2
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67583"
+NAME="AEN67893"
 ></A
 ><H2
 >Description</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67589"
+NAME="AEN67899"
 ></A
 ><H2
 >Arguments</H2
@@ -170,7 +170,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67598"
+NAME="AEN67908"
 ></A
 ><H2
 >Return Value</H2
@@ -223,7 +223,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67616"
+NAME="AEN67926"
 ></A
 ><H2
 >Notes</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-scroll-cursor-fetch.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-scroll-cursor-fetch.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-scroll-cursor-fetch.html	2016-03-28 20:20:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-scroll-cursor-fetch.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67386"
+NAME="AEN67696"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67389"
+NAME="AEN67699"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67394"
+NAME="AEN67704"
 ></A
 ><H2
 >Description</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67399"
+NAME="AEN67709"
 ></A
 ><H2
 >Arguments</H2
@@ -227,7 +227,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67428"
+NAME="AEN67738"
 ></A
 ><H2
 >Return Value</H2
@@ -249,7 +249,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67434"
+NAME="AEN67744"
 ></A
 ><H2
 >Notes</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-scroll-cursor-move.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-scroll-cursor-move.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-spi-scroll-cursor-move.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-spi-scroll-cursor-move.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Interface Functions"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN67449"
+NAME="AEN67759"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN67452"
+NAME="AEN67762"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67457"
+NAME="AEN67767"
 ></A
 ><H2
 >Description</H2
@@ -143,7 +143,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67462"
+NAME="AEN67772"
 ></A
 ><H2
 >Arguments</H2
@@ -228,7 +228,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67491"
+NAME="AEN67801"
 ></A
 ><H2
 >Return Value</H2
@@ -254,7 +254,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67498"
+NAME="AEN67808"
 ></A
 ><H2
 >Notes</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/spi-visibility.html postgresql-9.5-9.5.8/doc/src/sgml/html/spi-visibility.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/spi-visibility.html	2016-03-28 20:20:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/spi-visibility.html	2017-08-07 21:32:18.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming Interface"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-abort.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-abort.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-abort.html	2016-03-28 20:20:50.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-abort.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68817"
+NAME="AEN69127"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68820"
+NAME="AEN69130"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68822"
+NAME="AEN69132"
 ></A
 ><H2
 >Description</H2
@@ -139,7 +139,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68828"
+NAME="AEN69138"
 ></A
 ><H2
 >Parameters</H2
@@ -167,7 +167,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68838"
+NAME="AEN69148"
 ></A
 ><H2
 >Notes</H2
@@ -189,7 +189,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68844"
+NAME="AEN69154"
 ></A
 ><H2
 >Examples</H2
@@ -203,7 +203,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68848"
+NAME="AEN69158"
 ></A
 ><H2
 >Compatibility</H2
@@ -222,7 +222,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68853"
+NAME="AEN69163"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alteraggregate.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alteraggregate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alteraggregate.html	2016-03-28 20:20:50.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alteraggregate.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68869"
+NAME="AEN69179"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68872"
+NAME="AEN69182"
 ></A
 ><H2
 >Synopsis</H2
@@ -224,7 +224,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68894"
+NAME="AEN69204"
 ></A
 ><H2
 >Description</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68902"
+NAME="AEN69212"
 ></A
 ><H2
 >Parameters</H2
@@ -385,7 +385,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68946"
+NAME="AEN69256"
 ></A
 ><H2
 >Notes</H2
@@ -418,7 +418,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68954"
+NAME="AEN69264"
 ></A
 ><H2
 >Examples</H2
@@ -486,7 +486,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68973"
+NAME="AEN69283"
 ></A
 ><H2
 >Compatibility</H2
@@ -501,7 +501,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN68977"
+NAME="AEN69287"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altercollation.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altercollation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altercollation.html	2016-03-28 20:20:50.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altercollation.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN68991"
+NAME="AEN69301"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN68994"
+NAME="AEN69304"
 ></A
 ><H2
 >Synopsis</H2
@@ -146,7 +146,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69002"
+NAME="AEN69312"
 ></A
 ><H2
 >Description</H2
@@ -176,7 +176,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69009"
+NAME="AEN69319"
 ></A
 ><H2
 >Parameters</H2
@@ -239,7 +239,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69032"
+NAME="AEN69342"
 ></A
 ><H2
 >Examples</H2
@@ -274,7 +274,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69042"
+NAME="AEN69352"
 ></A
 ><H2
 >Compatibility</H2
@@ -289,7 +289,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69046"
+NAME="AEN69356"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterconversion.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterconversion.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterconversion.html	2016-03-28 20:20:50.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterconversion.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN69060"
+NAME="AEN69370"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN69063"
+NAME="AEN69373"
 ></A
 ><H2
 >Synopsis</H2
@@ -146,7 +146,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69071"
+NAME="AEN69381"
 ></A
 ><H2
 >Description</H2
@@ -176,7 +176,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69078"
+NAME="AEN69388"
 ></A
 ><H2
 >Parameters</H2
@@ -239,7 +239,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69101"
+NAME="AEN69411"
 ></A
 ><H2
 >Examples</H2
@@ -274,7 +274,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69111"
+NAME="AEN69421"
 ></A
 ><H2
 >Compatibility</H2
@@ -289,7 +289,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69115"
+NAME="AEN69425"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterdatabase.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterdatabase.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterdatabase.html	2016-03-28 20:20:50.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterdatabase.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN69129"
+NAME="AEN69439"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN69132"
+NAME="AEN69442"
 ></A
 ><H2
 >Synopsis</H2
@@ -237,7 +237,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69155"
+NAME="AEN69465"
 ></A
 ><H2
 >Description</H2
@@ -308,7 +308,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69169"
+NAME="AEN69479"
 ></A
 ><H2
 >Parameters</H2
@@ -466,7 +466,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69223"
+NAME="AEN69533"
 ></A
 ><H2
 >Notes</H2
@@ -484,7 +484,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69227"
+NAME="AEN69537"
 ></A
 ><H2
 >Examples</H2
@@ -503,7 +503,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69232"
+NAME="AEN69542"
 ></A
 ><H2
 >Compatibility</H2
@@ -521,7 +521,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69237"
+NAME="AEN69547"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterdefaultprivileges.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterdefaultprivileges.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterdefaultprivileges.html	2016-03-28 20:20:50.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterdefaultprivileges.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN69255"
+NAME="AEN69565"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN69258"
+NAME="AEN69568"
 ></A
 ><H2
 >Synopsis</H2
@@ -271,7 +271,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN69282"
+NAME="AEN69592"
 ></A
 ><H3
 >Parameters</H3
@@ -436,7 +436,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69325"
+NAME="AEN69635"
 ></A
 ><H2
 >Compatibility</H2
@@ -451,7 +451,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69329"
+NAME="AEN69639"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterdomain.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterdomain.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterdomain.html	2016-03-28 20:20:50.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterdomain.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN69343"
+NAME="AEN69653"
 ></A
 ><H2
 >Name</H2
@@ -104,7 +104,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN69346"
+NAME="AEN69656"
 ></A
 ><H2
 >Synopsis</H2
@@ -222,7 +222,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69366"
+NAME="AEN69676"
 ></A
 ><H2
 >Description</H2
@@ -382,7 +382,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69423"
+NAME="AEN69733"
 ></A
 ><H2
 >Parameters</H2
@@ -518,7 +518,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69477"
+NAME="AEN69787"
 ></A
 ><H2
 >Notes</H2
@@ -543,7 +543,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69483"
+NAME="AEN69793"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altereventtrigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altereventtrigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altereventtrigger.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altereventtrigger.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN69525"
+NAME="AEN69835"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN69528"
+NAME="AEN69838"
 ></A
 ><H2
 >Synopsis</H2
@@ -147,7 +147,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69536"
+NAME="AEN69846"
 ></A
 ><H2
 >Description</H2
@@ -165,7 +165,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69541"
+NAME="AEN69851"
 ></A
 ><H2
 >Parameters</H2
@@ -249,7 +249,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69570"
+NAME="AEN69880"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterextension.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterextension.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterextension.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterextension.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN69584"
+NAME="AEN69894"
 ></A
 ><H2
 >Name</H2
@@ -104,7 +104,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN69587"
+NAME="AEN69897"
 ></A
 ><H2
 >Synopsis</H2
@@ -434,7 +434,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69645"
+NAME="AEN69955"
 ></A
 ><H2
 >Description</H2
@@ -540,7 +540,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69678"
+NAME="AEN69988"
 ></A
 ><H2
 >Parameters</H2
@@ -791,7 +791,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69768"
+NAME="AEN70078"
 ></A
 ><H2
 >Examples</H2
@@ -832,7 +832,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69780"
+NAME="AEN70090"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterforeigndatawrapper.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterforeigndatawrapper.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterforeigndatawrapper.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterforeigndatawrapper.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN69799"
+NAME="AEN70109"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN69802"
+NAME="AEN70112"
 ></A
 ><H2
 >Synopsis</H2
@@ -164,7 +164,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69813"
+NAME="AEN70123"
 ></A
 ><H2
 >Description</H2
@@ -186,7 +186,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69818"
+NAME="AEN70128"
 ></A
 ><H2
 >Parameters</H2
@@ -345,7 +345,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69873"
+NAME="AEN70183"
 ></A
 ><H2
 >Examples</H2
@@ -383,7 +383,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69884"
+NAME="AEN70194"
 ></A
 ><H2
 >Compatibility</H2
@@ -412,7 +412,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69892"
+NAME="AEN70202"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterforeigntable.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterforeigntable.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterforeigntable.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterforeigntable.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN69906"
+NAME="AEN70216"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN69909"
+NAME="AEN70219"
 ></A
 ><H2
 >Synopsis</H2
@@ -379,7 +379,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN69957"
+NAME="AEN70267"
 ></A
 ><H2
 >Description</H2
@@ -859,7 +859,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70117"
+NAME="AEN70427"
 ></A
 ><H2
 >Parameters</H2
@@ -1067,7 +1067,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70198"
+NAME="AEN70508"
 ></A
 ><H2
 >Notes</H2
@@ -1111,7 +1111,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70210"
+NAME="AEN70520"
 ></A
 ><H2
 >Examples</H2
@@ -1132,7 +1132,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70216"
+NAME="AEN70526"
 ></A
 ><H2
 >Compatibility</H2
@@ -1171,7 +1171,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70226"
+NAME="AEN70536"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterfunction.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterfunction.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterfunction.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterfunction.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN70240"
+NAME="AEN70550"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN70243"
+NAME="AEN70553"
 ></A
 ><H2
 >Synopsis</H2
@@ -274,7 +274,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70273"
+NAME="AEN70583"
 ></A
 ><H2
 >Description</H2
@@ -308,7 +308,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70281"
+NAME="AEN70591"
 ></A
 ><H2
 >Parameters</H2
@@ -623,8 +623,12 @@
         <TT
 CLASS="LITERAL"
 >SET FROM CURRENT</TT
-> saves the session's current value of
-        the parameter as the value to be applied when the function is entered.
+> saves the value of the parameter that
+        is current when <TT
+CLASS="COMMAND"
+>ALTER FUNCTION</TT
+> is executed as the value
+        to be applied when the function is entered.
        </P
 ><P
 >        See <A
@@ -654,7 +658,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70405"
+NAME="AEN70716"
 ></A
 ><H2
 >Examples</H2
@@ -732,7 +736,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70427"
+NAME="AEN70738"
 ></A
 ><H2
 >Compatibility</H2
@@ -759,7 +763,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70433"
+NAME="AEN70744"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altergroup.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altergroup.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altergroup.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altergroup.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN70447"
+NAME="AEN70758"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN70450"
+NAME="AEN70761"
 ></A
 ><H2
 >Synopsis</H2
@@ -169,7 +169,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70461"
+NAME="AEN70772"
 ></A
 ><H2
 >Description</H2
@@ -218,7 +218,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70473"
+NAME="AEN70784"
 ></A
 ><H2
 >Parameters</H2
@@ -274,7 +274,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70492"
+NAME="AEN70803"
 ></A
 ><H2
 >Examples</H2
@@ -296,7 +296,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70497"
+NAME="AEN70808"
 ></A
 ><H2
 >Compatibility</H2
@@ -311,7 +311,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70501"
+NAME="AEN70812"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterindex.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterindex.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterindex.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterindex.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN70517"
+NAME="AEN70828"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN70520"
+NAME="AEN70831"
 ></A
 ><H2
 >Synopsis</H2
@@ -179,7 +179,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70534"
+NAME="AEN70845"
 ></A
 ><H2
 >Description</H2
@@ -198,17 +198,6 @@
 ><DT
 ><TT
 CLASS="LITERAL"
->IF EXISTS</TT
-></DT
-><DD
-><P
->      Do not throw an error if the index does not exist. A notice is issued
-      in this case.
-     </P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
 >RENAME</TT
 ></DT
 ><DD
@@ -329,7 +318,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70579"
+NAME="AEN70885"
 ></A
 ><H2
 >Parameters</H2
@@ -340,6 +329,17 @@
 ><DL
 ><DT
 ><TT
+CLASS="LITERAL"
+>IF EXISTS</TT
+></DT
+><DD
+><P
+>        Do not throw an error if the index does not exist. A notice is issued
+        in this case.
+       </P
+></DD
+><DT
+><TT
 CLASS="REPLACEABLE"
 ><I
 >name</I
@@ -406,7 +406,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70607"
+NAME="AEN70918"
 ></A
 ><H2
 >Notes</H2
@@ -441,7 +441,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70616"
+NAME="AEN70927"
 ></A
 ><H2
 >Examples</H2
@@ -471,7 +471,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70624"
+NAME="AEN70935"
 ></A
 ><H2
 >Compatibility</H2
@@ -489,7 +489,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70629"
+NAME="AEN70940"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterlanguage.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterlanguage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterlanguage.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterlanguage.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN70643"
+NAME="AEN70954"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN70646"
+NAME="AEN70957"
 ></A
 ><H2
 >Synopsis</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70652"
+NAME="AEN70963"
 ></A
 ><H2
 >Description</H2
@@ -155,7 +155,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70657"
+NAME="AEN70968"
 ></A
 ><H2
 >Parameters</H2
@@ -206,7 +206,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70675"
+NAME="AEN70986"
 ></A
 ><H2
 >Compatibility</H2
@@ -221,7 +221,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70679"
+NAME="AEN70990"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterlargeobject.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterlargeobject.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterlargeobject.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterlargeobject.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN70693"
+NAME="AEN71004"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN70696"
+NAME="AEN71007"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70700"
+NAME="AEN71011"
 ></A
 ><H2
 >Description</H2
@@ -144,7 +144,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70705"
+NAME="AEN71016"
 ></A
 ><H2
 >Parameters</H2
@@ -183,7 +183,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70718"
+NAME="AEN71029"
 ></A
 ><H2
 >Compatibility</H2
@@ -198,7 +198,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70722"
+NAME="AEN71033"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altermaterializedview.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altermaterializedview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altermaterializedview.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altermaterializedview.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN70734"
+NAME="AEN71045"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN70737"
+NAME="AEN71048"
 ></A
 ><H2
 >Synopsis</H2
@@ -266,18 +266,12 @@
 ><I
 >new_owner</I
 ></TT
-> | CURRENT_USER | SESSION_USER }
-    SET TABLESPACE <TT
-CLASS="REPLACEABLE"
-><I
->new_tablespace</I
-></TT
-></PRE
+> | CURRENT_USER | SESSION_USER }</PRE
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70767"
+NAME="AEN71077"
 ></A
 ><H2
 >Description</H2
@@ -328,7 +322,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70779"
+NAME="AEN71089"
 ></A
 ><H2
 >Parameters</H2
@@ -415,7 +409,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70812"
+NAME="AEN71122"
 ></A
 ><H2
 >Examples</H2
@@ -436,7 +430,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70818"
+NAME="AEN71128"
 ></A
 ><H2
 >Compatibility</H2
@@ -454,7 +448,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70823"
+NAME="AEN71133"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alteropclass.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alteropclass.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alteropclass.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alteropclass.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN70913"
+NAME="AEN71223"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN70916"
+NAME="AEN71226"
 ></A
 ><H2
 >Synopsis</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70927"
+NAME="AEN71237"
 ></A
 ><H2
 >Description</H2
@@ -196,7 +196,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70934"
+NAME="AEN71244"
 ></A
 ><H2
 >Parameters</H2
@@ -272,7 +272,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70962"
+NAME="AEN71272"
 ></A
 ><H2
 >Compatibility</H2
@@ -287,7 +287,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70966"
+NAME="AEN71276"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alteroperator.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alteroperator.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alteroperator.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alteroperator.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN70839"
+NAME="AEN71149"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN70842"
+NAME="AEN71152"
 ></A
 ><H2
 >Synopsis</H2
@@ -158,7 +158,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70852"
+NAME="AEN71162"
 ></A
 ><H2
 >Description</H2
@@ -188,7 +188,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70859"
+NAME="AEN71169"
 ></A
 ><H2
 >Parameters</H2
@@ -271,7 +271,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70889"
+NAME="AEN71199"
 ></A
 ><H2
 >Examples</H2
@@ -291,7 +291,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70895"
+NAME="AEN71205"
 ></A
 ><H2
 >Compatibility</H2
@@ -306,7 +306,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN70899"
+NAME="AEN71209"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alteropfamily.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alteropfamily.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alteropfamily.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alteropfamily.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN70982"
+NAME="AEN71292"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN70985"
+NAME="AEN71295"
 ></A
 ><H2
 >Synopsis</H2
@@ -278,7 +278,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71016"
+NAME="AEN71326"
 ></A
 ><H2
 >Description</H2
@@ -349,7 +349,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71031"
+NAME="AEN71341"
 ></A
 ><H2
 >Parameters</H2
@@ -579,7 +579,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71110"
+NAME="AEN71420"
 ></A
 ><H2
 >Notes</H2
@@ -636,7 +636,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71123"
+NAME="AEN71433"
 ></A
 ><H2
 >Examples</H2
@@ -696,7 +696,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71131"
+NAME="AEN71441"
 ></A
 ><H2
 >Compatibility</H2
@@ -711,7 +711,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71135"
+NAME="AEN71445"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterpolicy.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterpolicy.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterpolicy.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterpolicy.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN71155"
+NAME="AEN71465"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN71158"
+NAME="AEN71468"
 ></A
 ><H2
 >Synopsis</H2
@@ -159,7 +159,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71168"
+NAME="AEN71478"
 ></A
 ><H2
 >Description</H2
@@ -201,7 +201,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71178"
+NAME="AEN71488"
 ></A
 ><H2
 >Parameters</H2
@@ -308,7 +308,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71216"
+NAME="AEN71526"
 ></A
 ><H2
 >Compatibility</H2
@@ -325,7 +325,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71221"
+NAME="AEN71531"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterrole.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterrole.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterrole.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterrole.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN71235"
+NAME="AEN71545"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN71238"
+NAME="AEN71548"
 ></A
 ><H2
 >Synopsis</H2
@@ -263,7 +263,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71264"
+NAME="AEN71574"
 ></A
 ><H2
 >Description</H2
@@ -387,7 +387,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71291"
+NAME="AEN71601"
 ></A
 ><H2
 >Parameters</H2
@@ -615,7 +615,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71386"
+NAME="AEN71696"
 ></A
 ><H2
 >Notes</H2
@@ -676,7 +676,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71400"
+NAME="AEN71710"
 ></A
 ><H2
 >Examples</H2
@@ -750,7 +750,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71419"
+NAME="AEN71729"
 ></A
 ><H2
 >Compatibility</H2
@@ -768,7 +768,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71424"
+NAME="AEN71734"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterrule.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterrule.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterrule.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterrule.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN71442"
+NAME="AEN71752"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN71445"
+NAME="AEN71755"
 ></A
 ><H2
 >Synopsis</H2
@@ -129,7 +129,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71450"
+NAME="AEN71760"
 ></A
 ><H2
 >Description</H2
@@ -151,7 +151,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71456"
+NAME="AEN71766"
 ></A
 ><H2
 >Parameters</H2
@@ -203,7 +203,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71474"
+NAME="AEN71784"
 ></A
 ><H2
 >Examples</H2
@@ -217,7 +217,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71478"
+NAME="AEN71788"
 ></A
 ><H2
 >Compatibility</H2
@@ -236,7 +236,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71483"
+NAME="AEN71793"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterschema.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterschema.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterschema.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterschema.html	2017-08-07 21:32:20.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN71497"
+NAME="AEN71807"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN71500"
+NAME="AEN71810"
 ></A
 ><H2
 >Synopsis</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71506"
+NAME="AEN71816"
 ></A
 ><H2
 >Description</H2
@@ -167,7 +167,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71514"
+NAME="AEN71824"
 ></A
 ><H2
 >Parameters</H2
@@ -223,7 +223,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71533"
+NAME="AEN71843"
 ></A
 ><H2
 >Compatibility</H2
@@ -238,7 +238,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71537"
+NAME="AEN71847"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altersequence.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altersequence.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altersequence.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altersequence.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN71551"
+NAME="AEN71861"
 ></A
 ><H2
 >Name</H2
@@ -104,7 +104,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN71554"
+NAME="AEN71864"
 ></A
 ><H2
 >Synopsis</H2
@@ -198,7 +198,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71571"
+NAME="AEN71881"
 ></A
 ><H2
 >Description</H2
@@ -236,7 +236,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71580"
+NAME="AEN71890"
 ></A
 ><H2
 >Parameters</H2
@@ -626,7 +626,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71701"
+NAME="AEN72011"
 ></A
 ><H2
 >Notes</H2
@@ -696,7 +696,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71719"
+NAME="AEN72029"
 ></A
 ><H2
 >Examples</H2
@@ -713,7 +713,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71724"
+NAME="AEN72034"
 ></A
 ><H2
 >Compatibility</H2
@@ -752,7 +752,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71735"
+NAME="AEN72045"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterserver.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterserver.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterserver.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterserver.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN71749"
+NAME="AEN72059"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN71752"
+NAME="AEN72062"
 ></A
 ><H2
 >Synopsis</H2
@@ -157,7 +157,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71762"
+NAME="AEN72072"
 ></A
 ><H2
 >Description</H2
@@ -185,7 +185,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71768"
+NAME="AEN72078"
 ></A
 ><H2
 >Parameters</H2
@@ -285,7 +285,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71802"
+NAME="AEN72112"
 ></A
 ><H2
 >Examples</H2
@@ -316,7 +316,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71811"
+NAME="AEN72121"
 ></A
 ><H2
 >Compatibility</H2
@@ -338,7 +338,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71817"
+NAME="AEN72127"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altersystem.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altersystem.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altersystem.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altersystem.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN71831"
+NAME="AEN72141"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN71834"
+NAME="AEN72144"
 ></A
 ><H2
 >Synopsis</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71840"
+NAME="AEN72150"
 ></A
 ><H2
 >Description</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71858"
+NAME="AEN72168"
 ></A
 ><H2
 >Parameters</H2
@@ -261,7 +261,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71874"
+NAME="AEN72184"
 ></A
 ><H2
 >Notes</H2
@@ -289,7 +289,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71882"
+NAME="AEN72192"
 ></A
 ><H2
 >Examples</H2
@@ -318,7 +318,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71890"
+NAME="AEN72200"
 ></A
 ><H2
 >Compatibility</H2
@@ -336,7 +336,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71895"
+NAME="AEN72205"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertable.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertable.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertable.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertable.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN71909"
+NAME="AEN72219"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN71912"
+NAME="AEN72222"
 ></A
 ><H2
 >Synopsis</H2
@@ -502,7 +502,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71979"
+NAME="AEN72289"
 ></A
 ><H2
 >Description</H2
@@ -1596,19 +1596,16 @@
 ><P>
   </P
 ><P
->   All the actions except <TT
-CLASS="LITERAL"
->RENAME</TT
->,
+>   All the forms of ALTER TABLE that act on a single table, except
    <TT
 CLASS="LITERAL"
->SET TABLESPACE</TT
-> and <TT
+>RENAME</TT
+>, and <TT
 CLASS="LITERAL"
 >SET SCHEMA</TT
 >
-   can be combined into
-   a list of multiple alterations to apply in parallel.  For example, it
+   can be combined into a list of multiple alterations to applied together.
+   For example, it
    is possible to add several columns and/or alter the type of several
    columns in a single command.  This is particularly useful with large
    tables, since only one pass over the table need be made.
@@ -1647,7 +1644,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72315"
+NAME="AEN72624"
 ></A
 ><H2
 >Parameters</H2
@@ -1918,7 +1915,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72421"
+NAME="AEN72730"
 ></A
 ><H2
 >Notes</H2
@@ -2142,7 +2139,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72474"
+NAME="AEN72783"
 ></A
 ><H2
 >Examples</H2
@@ -2322,7 +2319,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72520"
+NAME="AEN72829"
 ></A
 ><H2
 >Compatibility</H2
@@ -2371,7 +2368,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72533"
+NAME="AEN72842"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertablespace.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertablespace.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertablespace.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertablespace.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN72545"
+NAME="AEN72854"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN72548"
+NAME="AEN72857"
 ></A
 ><H2
 >Synopsis</H2
@@ -162,7 +162,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72559"
+NAME="AEN72868"
 ></A
 ><H2
 >Description</H2
@@ -183,7 +183,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72564"
+NAME="AEN72873"
 ></A
 ><H2
 >Parameters</H2
@@ -272,7 +272,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72592"
+NAME="AEN72901"
 ></A
 ><H2
 >Examples</H2
@@ -302,7 +302,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72601"
+NAME="AEN72910"
 ></A
 ><H2
 >Compatibility</H2
@@ -317,7 +317,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72605"
+NAME="AEN72914"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertrigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertrigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertrigger.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertrigger.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN72915"
+NAME="AEN73224"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN72918"
+NAME="AEN73227"
 ></A
 ><H2
 >Synopsis</H2
@@ -129,7 +129,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72923"
+NAME="AEN73232"
 ></A
 ><H2
 >Description</H2
@@ -152,7 +152,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72929"
+NAME="AEN73238"
 ></A
 ><H2
 >Parameters</H2
@@ -203,7 +203,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72947"
+NAME="AEN73256"
 ></A
 ><H2
 >Notes</H2
@@ -227,7 +227,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72953"
+NAME="AEN73262"
 ></A
 ><H2
 >Examples</H2
@@ -241,7 +241,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72957"
+NAME="AEN73266"
 ></A
 ><H2
 >Compatibility</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72962"
+NAME="AEN73271"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertsconfig.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertsconfig.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertsconfig.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertsconfig.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN72619"
+NAME="AEN72928"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN72622"
+NAME="AEN72931"
 ></A
 ><H2
 >Synopsis</H2
@@ -231,7 +231,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72645"
+NAME="AEN72954"
 ></A
 ><H2
 >Description</H2
@@ -255,7 +255,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72651"
+NAME="AEN72960"
 ></A
 ><H2
 >Parameters</H2
@@ -418,7 +418,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72704"
+NAME="AEN73013"
 ></A
 ><H2
 >Examples</H2
@@ -447,7 +447,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72712"
+NAME="AEN73021"
 ></A
 ><H2
 >Compatibility</H2
@@ -462,7 +462,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72716"
+NAME="AEN73025"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertsdictionary.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertsdictionary.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertsdictionary.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertsdictionary.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN72730"
+NAME="AEN73039"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN72733"
+NAME="AEN73042"
 ></A
 ><H2
 >Synopsis</H2
@@ -164,7 +164,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72744"
+NAME="AEN73053"
 ></A
 ><H2
 >Description</H2
@@ -187,7 +187,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72750"
+NAME="AEN73059"
 ></A
 ><H2
 >Parameters</H2
@@ -281,7 +281,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72784"
+NAME="AEN73093"
 ></A
 ><H2
 >Examples</H2
@@ -327,7 +327,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72795"
+NAME="AEN73104"
 ></A
 ><H2
 >Compatibility</H2
@@ -342,7 +342,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72799"
+NAME="AEN73108"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertsparser.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertsparser.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertsparser.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertsparser.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN72813"
+NAME="AEN73122"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN72816"
+NAME="AEN73125"
 ></A
 ><H2
 >Synopsis</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72822"
+NAME="AEN73131"
 ></A
 ><H2
 >Description</H2
@@ -157,7 +157,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72828"
+NAME="AEN73137"
 ></A
 ><H2
 >Parameters</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72846"
+NAME="AEN73155"
 ></A
 ><H2
 >Compatibility</H2
@@ -223,7 +223,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72850"
+NAME="AEN73159"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertstemplate.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertstemplate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertstemplate.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertstemplate.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN72864"
+NAME="AEN73173"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN72867"
+NAME="AEN73176"
 ></A
 ><H2
 >Synopsis</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72873"
+NAME="AEN73182"
 ></A
 ><H2
 >Description</H2
@@ -157,7 +157,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72879"
+NAME="AEN73188"
 ></A
 ><H2
 >Parameters</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72897"
+NAME="AEN73206"
 ></A
 ><H2
 >Compatibility</H2
@@ -223,7 +223,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN72901"
+NAME="AEN73210"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertype.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertype.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-altertype.html	2016-03-28 20:20:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-altertype.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN72974"
+NAME="AEN73283"
 ></A
 ><H2
 >Name</H2
@@ -104,7 +104,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN72977"
+NAME="AEN73286"
 ></A
 ><H2
 >Synopsis</H2
@@ -242,7 +242,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73002"
+NAME="AEN73311"
 ></A
 ><H2
 >Description</H2
@@ -427,7 +427,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73067"
+NAME="AEN73376"
 ></A
 ><H2
 >Parameters</H2
@@ -558,7 +558,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73116"
+NAME="AEN73425"
 ></A
 ><H2
 >Notes</H2
@@ -594,7 +594,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73124"
+NAME="AEN73433"
 ></A
 ><H2
 >Examples</H2
@@ -650,7 +650,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73140"
+NAME="AEN73449"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alteruser.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alteruser.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alteruser.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alteruser.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN73157"
+NAME="AEN73466"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN73160"
+NAME="AEN73469"
 ></A
 ><H2
 >Synopsis</H2
@@ -173,12 +173,17 @@
 ></TT
 >
 
-ALTER USER <TT
+ALTER USER { <TT
 CLASS="REPLACEABLE"
 ><I
 >role_specification</I
 ></TT
-> SET <TT
+> | ALL } [ IN DATABASE <TT
+CLASS="REPLACEABLE"
+><I
+>database_name</I
+></TT
+> ] SET <TT
 CLASS="REPLACEABLE"
 ><I
 >configuration_parameter</I
@@ -189,34 +194,49 @@
 >value</I
 ></TT
 > | DEFAULT }
-ALTER USER <TT
+ALTER USER { <TT
 CLASS="REPLACEABLE"
 ><I
 >role_specification</I
 ></TT
-> SET <TT
+> | ALL } [ IN DATABASE <TT
+CLASS="REPLACEABLE"
+><I
+>database_name</I
+></TT
+> ] SET <TT
 CLASS="REPLACEABLE"
 ><I
 >configuration_parameter</I
 ></TT
 > FROM CURRENT
-ALTER USER <TT
+ALTER USER { <TT
 CLASS="REPLACEABLE"
 ><I
 >role_specification</I
 ></TT
-> RESET <TT
+> | ALL } [ IN DATABASE <TT
+CLASS="REPLACEABLE"
+><I
+>database_name</I
+></TT
+> ] RESET <TT
 CLASS="REPLACEABLE"
 ><I
 >configuration_parameter</I
 ></TT
 >
-ALTER USER <TT
+ALTER USER { <TT
 CLASS="REPLACEABLE"
 ><I
 >role_specification</I
 ></TT
-> RESET ALL
+> | ALL } [ IN DATABASE <TT
+CLASS="REPLACEABLE"
+><I
+>database_name</I
+></TT
+> ] RESET ALL
 
 <SPAN
 CLASS="phrase"
@@ -243,7 +263,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73182"
+NAME="AEN73495"
 ></A
 ><H2
 >Description</H2
@@ -261,7 +281,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73187"
+NAME="AEN73500"
 ></A
 ><H2
 >Compatibility</H2
@@ -280,7 +300,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73192"
+NAME="AEN73505"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterusermapping.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterusermapping.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterusermapping.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterusermapping.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN73204"
+NAME="AEN73517"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN73207"
+NAME="AEN73520"
 ></A
 ><H2
 >Synopsis</H2
@@ -136,7 +136,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73213"
+NAME="AEN73526"
 ></A
 ><H2
 >Description</H2
@@ -160,7 +160,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73219"
+NAME="AEN73532"
 ></A
 ><H2
 >Parameters</H2
@@ -249,7 +249,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73246"
+NAME="AEN73559"
 ></A
 ><H2
 >Examples</H2
@@ -257,19 +257,19 @@
 >   Change the password for user mapping <TT
 CLASS="LITERAL"
 >bob</TT
->, server<TT
+>, server <TT
 CLASS="LITERAL"
-> foo</TT
+>foo</TT
 >:
 </P><PRE
 CLASS="PROGRAMLISTING"
->ALTER USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'public');</PRE
+>ALTER USER MAPPING FOR bob SERVER foo OPTIONS (SET password 'public');</PRE
 ><P></P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73252"
+NAME="AEN73565"
 ></A
 ><H2
 >Compatibility</H2
@@ -306,7 +306,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73261"
+NAME="AEN73574"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterview.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-alterview.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-alterview.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN73275"
+NAME="AEN73588"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN73278"
+NAME="AEN73591"
 ></A
 ><H2
 >Synopsis</H2
@@ -200,7 +200,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73296"
+NAME="AEN73609"
 ></A
 ><H2
 >Description</H2
@@ -238,7 +238,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73305"
+NAME="AEN73618"
 ></A
 ><H2
 >Parameters</H2
@@ -413,7 +413,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73368"
+NAME="AEN73681"
 ></A
 ><H2
 >Notes</H2
@@ -432,7 +432,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73373"
+NAME="AEN73686"
 ></A
 ><H2
 >Examples</H2
@@ -464,7 +464,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73381"
+NAME="AEN73694"
 ></A
 ><H2
 >Compatibility</H2
@@ -482,7 +482,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73386"
+NAME="AEN73699"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-analyze.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-analyze.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-analyze.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-analyze.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN73400"
+NAME="AEN73713"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN73403"
+NAME="AEN73716"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73407"
+NAME="AEN73720"
 ></A
 ><H2
 >Description</H2
@@ -160,7 +160,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73416"
+NAME="AEN73729"
 ></A
 ><H2
 >Parameters</H2
@@ -211,7 +211,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73434"
+NAME="AEN73747"
 ></A
 ><H2
 >Outputs</H2
@@ -230,7 +230,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73439"
+NAME="AEN73752"
 ></A
 ><H2
 >Notes</H2
@@ -440,7 +440,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73484"
+NAME="AEN73797"
 ></A
 ><H2
 >Compatibility</H2
@@ -454,7 +454,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73488"
+NAME="AEN73801"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-begin.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-begin.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-begin.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-begin.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN73506"
+NAME="AEN73819"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN73509"
+NAME="AEN73822"
 ></A
 ><H2
 >Synopsis</H2
@@ -136,7 +136,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73514"
+NAME="AEN73827"
 ></A
 ><H2
 >Description</H2
@@ -193,7 +193,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73527"
+NAME="AEN73840"
 ></A
 ><H2
 >Parameters</H2
@@ -228,7 +228,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73539"
+NAME="AEN73852"
 ></A
 ><H2
 >Notes</H2
@@ -279,7 +279,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73552"
+NAME="AEN73865"
 ></A
 ><H2
 >Examples</H2
@@ -294,7 +294,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73556"
+NAME="AEN73869"
 ></A
 ><H2
 >Compatibility</H2
@@ -341,7 +341,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73568"
+NAME="AEN73881"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-checkpoint.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-checkpoint.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-checkpoint.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-checkpoint.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN73586"
+NAME="AEN73899"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN73589"
+NAME="AEN73902"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73591"
+NAME="AEN73904"
 ></A
 ><H2
 >Description</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73604"
+NAME="AEN73917"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-close.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-close.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-close.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-close.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN73619"
+NAME="AEN73932"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN73622"
+NAME="AEN73935"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73625"
+NAME="AEN73938"
 ></A
 ><H2
 >Description</H2
@@ -158,7 +158,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73634"
+NAME="AEN73947"
 ></A
 ><H2
 >Parameters</H2
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73647"
+NAME="AEN73960"
 ></A
 ><H2
 >Notes</H2
@@ -236,7 +236,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73658"
+NAME="AEN73971"
 ></A
 ><H2
 >Examples</H2
@@ -253,7 +253,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73663"
+NAME="AEN73976"
 ></A
 ><H2
 >Compatibility</H2
@@ -275,7 +275,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73669"
+NAME="AEN73982"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-cluster.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-cluster.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-cluster.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-cluster.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN73685"
+NAME="AEN73998"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN73688"
+NAME="AEN74001"
 ></A
 ><H2
 >Synopsis</H2
@@ -125,7 +125,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73692"
+NAME="AEN74005"
 ></A
 ><H2
 >Description</H2
@@ -231,7 +231,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73715"
+NAME="AEN74028"
 ></A
 ><H2
 >Parameters</H2
@@ -280,7 +280,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73733"
+NAME="AEN74046"
 ></A
 ><H2
 >Notes</H2
@@ -369,7 +369,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73752"
+NAME="AEN74065"
 ></A
 ><H2
 >Examples</H2
@@ -408,7 +408,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73763"
+NAME="AEN74076"
 ></A
 ><H2
 >Compatibility</H2
@@ -444,7 +444,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73772"
+NAME="AEN74085"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-commands.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-commands.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-commands.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-commands.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Reference"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFERENCE"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -100,7 +100,7 @@
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN68805"
+NAME="AEN69115"
 ></A
 ><P
 >    This part contains reference information for the
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-comment.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-comment.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-comment.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-comment.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN73784"
+NAME="AEN74097"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN73787"
+NAME="AEN74100"
 ></A
 ><H2
 >Synopsis</H2
@@ -485,7 +485,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73854"
+NAME="AEN74167"
 ></A
 ><H2
 >Description</H2
@@ -554,7 +554,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73872"
+NAME="AEN74185"
 ></A
 ><H2
 >Parameters</H2
@@ -645,9 +645,9 @@
 ></DT
 ><DD
 ><P
->      When creating a comment on a constraint, a table, a domain or
+>      When creating a comment on a constraint, a trigger, a rule or
       a policy these parameters specify the name of the table or domain on
-      which the constraint is defined.
+      which that object is defined.
      </P
 ></DD
 ><DT
@@ -844,7 +844,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73975"
+NAME="AEN74288"
 ></A
 ><H2
 >Notes</H2
@@ -861,7 +861,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73978"
+NAME="AEN74291"
 ></A
 ><H2
 >Examples</H2
@@ -930,7 +930,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73986"
+NAME="AEN74299"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-commit.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-commit.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-commit.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-commit.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN73997"
+NAME="AEN74310"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN74000"
+NAME="AEN74313"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74002"
+NAME="AEN74315"
 ></A
 ><H2
 >Description</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74006"
+NAME="AEN74319"
 ></A
 ><H2
 >Parameters</H2
@@ -158,7 +158,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74016"
+NAME="AEN74329"
 ></A
 ><H2
 >Notes</H2
@@ -180,7 +180,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74022"
+NAME="AEN74335"
 ></A
 ><H2
 >Examples</H2
@@ -194,7 +194,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74026"
+NAME="AEN74339"
 ></A
 ><H2
 >Compatibility</H2
@@ -213,7 +213,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74031"
+NAME="AEN74344"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-commit-prepared.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-commit-prepared.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-commit-prepared.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-commit-prepared.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN74045"
+NAME="AEN74358"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN74048"
+NAME="AEN74361"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74051"
+NAME="AEN74364"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74055"
+NAME="AEN74368"
 ></A
 ><H2
 >Parameters</H2
@@ -162,7 +162,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74063"
+NAME="AEN74376"
 ></A
 ><H2
 >Notes</H2
@@ -209,7 +209,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74075"
+NAME="AEN74388"
 ></A
 ><H2
 >Compatibility</H2
@@ -230,7 +230,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74080"
+NAME="AEN74393"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-copy.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-copy.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-copy.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-copy.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN74094"
+NAME="AEN74407"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN74097"
+NAME="AEN74410"
 ></A
 ><H2
 >Synopsis</H2
@@ -261,7 +261,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74124"
+NAME="AEN74437"
 ></A
 ><H2
 >Description</H2
@@ -357,7 +357,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74146"
+NAME="AEN74459"
 ></A
 ><H2
 >Parameters</H2
@@ -810,7 +810,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74297"
+NAME="AEN74610"
 ></A
 ><H2
 >Outputs</H2
@@ -868,7 +868,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74310"
+NAME="AEN74623"
 ></A
 ><H2
 >Notes</H2
@@ -937,6 +937,31 @@
     to have column privileges on the column(s) listed in the command.
    </P
 ><P
+>    If row-level security is enabled for the table, the relevant 
+    <TT
+CLASS="COMMAND"
+>SELECT</TT
+> policies will apply to <TT
+CLASS="LITERAL"
+>COPY
+    <TT
+CLASS="REPLACEABLE"
+><I
+>table</I
+></TT
+> TO</TT
+> statements.
+    Currently, <TT
+CLASS="COMMAND"
+>COPY FROM</TT
+> is not supported for tables
+    with row-level security. Use equivalent <TT
+CLASS="COMMAND"
+>INSERT</TT
+>
+    statements instead.
+   </P
+><P
 >    Files named in a <TT
 CLASS="COMMAND"
 >COPY</TT
@@ -1126,14 +1151,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74373"
+NAME="AEN74692"
 ></A
 ><H2
 >File Formats</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN74375"
+NAME="AEN74694"
 ></A
 ><H3
 >Text Format</H3
@@ -1224,7 +1249,7 @@
 ><P
 ></P
 ><A
-NAME="AEN74395"
+NAME="AEN74714"
 ></A
 ><TABLE
 BORDER="1"
@@ -1426,7 +1451,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN74458"
+NAME="AEN74777"
 ></A
 ><H3
 >CSV Format</H3
@@ -1627,7 +1652,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN74504"
+NAME="AEN74823"
 ></A
 ><H3
 >Binary Format</H3
@@ -1683,7 +1708,7 @@
 ><DIV
 CLASS="REFSECT3"
 ><A
-NAME="AEN74517"
+NAME="AEN74836"
 ></A
 ><H4
 >File Header</H4
@@ -1776,7 +1801,7 @@
 ><DIV
 CLASS="REFSECT3"
 ><A
-NAME="AEN74543"
+NAME="AEN74862"
 ></A
 ><H4
 >Tuples</H4
@@ -1828,7 +1853,7 @@
 ><DIV
 CLASS="REFSECT3"
 ><A
-NAME="AEN74554"
+NAME="AEN74873"
 ></A
 ><H4
 >File Trailer</H4
@@ -1847,7 +1872,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74558"
+NAME="AEN74877"
 ></A
 ><H2
 >Examples</H2
@@ -1938,7 +1963,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74579"
+NAME="AEN74898"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createaggregate.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createaggregate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createaggregate.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createaggregate.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN74624"
+NAME="AEN74943"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN74627"
+NAME="AEN74946"
 ></A
 ><H2
 >Synopsis</H2
@@ -376,7 +376,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74672"
+NAME="AEN74991"
 ></A
 ><H2
 >Description</H2
@@ -699,7 +699,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74739"
+NAME="AEN75058"
 ></A
 ><H2
 >Parameters</H2
@@ -1175,7 +1175,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74875"
+NAME="AEN75194"
 ></A
 ><H2
 >Notes</H2
@@ -1293,7 +1293,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74897"
+NAME="AEN75216"
 ></A
 ><H2
 >Examples</H2
@@ -1307,7 +1307,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74901"
+NAME="AEN75220"
 ></A
 ><H2
 >Compatibility</H2
@@ -1326,7 +1326,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74906"
+NAME="AEN75225"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createcast.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createcast.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createcast.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createcast.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN74920"
+NAME="AEN75239"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN74923"
+NAME="AEN75242"
 ></A
 ><H2
 >Synopsis</H2
@@ -488,7 +488,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75009"
+NAME="AEN75328"
 ></A
 ><H2
 >Parameters</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createcollation.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createcollation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createcollation.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createcollation.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN75115"
+NAME="AEN75434"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN75118"
+NAME="AEN75437"
 ></A
 ><H2
 >Synopsis</H2
@@ -172,7 +172,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75132"
+NAME="AEN75451"
 ></A
 ><H2
 >Parameters</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createconversion.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createconversion.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createconversion.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createconversion.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN75199"
+NAME="AEN75518"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN75202"
+NAME="AEN75521"
 ></A
 ><H2
 >Synopsis</H2
@@ -173,7 +173,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75217"
+NAME="AEN75536"
 ></A
 ><H2
 >Parameters</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createdatabase.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createdatabase.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createdatabase.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createdatabase.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN75283"
+NAME="AEN75602"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN75286"
+NAME="AEN75605"
 ></A
 ><H2
 >Synopsis</H2
@@ -162,18 +162,18 @@
 ><I
 >connlimit</I
 ></TT
-> ] ]
+> ]
            [ IS_TEMPLATE [=] <TT
 CLASS="REPLACEABLE"
 ><I
 >istemplate</I
 ></TT
-> ]</PRE
+> ] ]</PRE
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75298"
+NAME="AEN75617"
 ></A
 ><H2
 >Description</H2
@@ -234,7 +234,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75313"
+NAME="AEN75632"
 ></A
 ><H2
 >Parameters</H2
@@ -446,7 +446,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75381"
+NAME="AEN75700"
 ></A
 ><H2
 >Notes</H2
@@ -586,7 +586,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75415"
+NAME="AEN75734"
 ></A
 ><H2
 >Examples</H2
@@ -649,7 +649,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75431"
+NAME="AEN75750"
 ></A
 ><H2
 >Compatibility</H2
@@ -665,7 +665,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75435"
+NAME="AEN75754"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createdomain.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createdomain.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createdomain.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createdomain.html	2017-08-07 21:32:21.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN75449"
+NAME="AEN75768"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN75452"
+NAME="AEN75771"
 ></A
 ><H2
 >Synopsis</H2
@@ -168,7 +168,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75463"
+NAME="AEN75782"
 ></A
 ><H2
 >Description</H2
@@ -210,7 +210,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75472"
+NAME="AEN75791"
 ></A
 ><H2
 >Parameters</H2
@@ -394,7 +394,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75531"
+NAME="AEN75850"
 ></A
 ><H2
 >Notes</H2
@@ -430,7 +430,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75538"
+NAME="AEN75857"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createeventtrigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createeventtrigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createeventtrigger.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createeventtrigger.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN75561"
+NAME="AEN75880"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN75564"
+NAME="AEN75883"
 ></A
 ><H2
 >Synopsis</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75570"
+NAME="AEN75889"
 ></A
 ><H2
 >Description</H2
@@ -162,7 +162,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75576"
+NAME="AEN75895"
 ></A
 ><H2
 >Parameters</H2
@@ -338,7 +338,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75625"
+NAME="AEN75944"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createextension.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createextension.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createextension.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createextension.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN75641"
+NAME="AEN75960"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN75644"
+NAME="AEN75963"
 ></A
 ><H2
 >Synopsis</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75650"
+NAME="AEN75969"
 ></A
 ><H2
 >Description</H2
@@ -180,7 +180,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75660"
+NAME="AEN75979"
 ></A
 ><H2
 >Parameters</H2
@@ -334,7 +334,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75703"
+NAME="AEN76022"
 ></A
 ><H2
 >Notes</H2
@@ -384,7 +384,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75716"
+NAME="AEN76035"
 ></A
 ><H2
 >Examples</H2
@@ -419,7 +419,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75725"
+NAME="AEN76044"
 ></A
 ><H2
 >Compatibility</H2
@@ -437,7 +437,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75730"
+NAME="AEN76049"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createforeigndatawrapper.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createforeigndatawrapper.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createforeigndatawrapper.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createforeigndatawrapper.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN75744"
+NAME="AEN76063"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN75747"
+NAME="AEN76066"
 ></A
 ><H2
 >Synopsis</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75754"
+NAME="AEN76073"
 ></A
 ><H2
 >Description</H2
@@ -164,7 +164,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75760"
+NAME="AEN76079"
 ></A
 ><H2
 >Parameters</H2
@@ -292,7 +292,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75795"
+NAME="AEN76114"
 ></A
 ><H2
 >Notes</H2
@@ -309,7 +309,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75799"
+NAME="AEN76118"
 ></A
 ><H2
 >Examples</H2
@@ -352,7 +352,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75811"
+NAME="AEN76130"
 ></A
 ><H2
 >Compatibility</H2
@@ -389,7 +389,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75821"
+NAME="AEN76140"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createforeigntable.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createforeigntable.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createforeigntable.html	2016-03-28 20:20:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createforeigntable.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN75841"
+NAME="AEN76160"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN75844"
+NAME="AEN76163"
 ></A
 ><H2
 >Synopsis</H2
@@ -288,7 +288,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75878"
+NAME="AEN76197"
 ></A
 ><H2
 >Parameters</H2
@@ -566,7 +566,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75969"
+NAME="AEN76288"
 ></A
 ><H2
 >Notes</H2
@@ -682,7 +682,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75994"
+NAME="AEN76313"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createfunction.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createfunction.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createfunction.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createfunction.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN76014"
+NAME="AEN76333"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN76017"
+NAME="AEN76336"
 ></A
 ><H2
 >Synopsis</H2
@@ -318,7 +318,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76059"
+NAME="AEN76378"
 ></A
 ><H2
 >Parameters</H2
@@ -922,8 +922,12 @@
        <TT
 CLASS="LITERAL"
 >SET FROM CURRENT</TT
-> saves the session's current value of
-       the parameter as the value to be applied when the function is entered.
+> saves the value of the parameter that
+       is current when <TT
+CLASS="COMMAND"
+>CREATE FUNCTION</TT
+> is executed as the value
+       to be applied when the function is entered.
       </P
 ><P
 >       If a <TT
@@ -1464,7 +1468,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76372"
+NAME="AEN76692"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-creategroup.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-creategroup.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-creategroup.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-creategroup.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN76394"
+NAME="AEN76714"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN76397"
+NAME="AEN76717"
 ></A
 ><H2
 >Synopsis</H2
@@ -192,7 +192,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76411"
+NAME="AEN76731"
 ></A
 ><H2
 >Description</H2
@@ -210,7 +210,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76416"
+NAME="AEN76736"
 ></A
 ><H2
 >Compatibility</H2
@@ -225,7 +225,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76420"
+NAME="AEN76740"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createindex.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createindex.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createindex.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createindex.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN76432"
+NAME="AEN76752"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN76435"
+NAME="AEN76755"
 ></A
 ><H2
 >Synopsis</H2
@@ -173,7 +173,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76448"
+NAME="AEN76768"
 ></A
 ><H2
 >Description</H2
@@ -274,7 +274,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76470"
+NAME="AEN76790"
 ></A
 ><H2
 >Parameters</H2
@@ -929,7 +929,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76666"
+NAME="AEN76986"
 ></A
 ><H2
 >Notes</H2
@@ -1062,31 +1062,7 @@
 >.
    Larger values will reduce the time needed for index creation, so long
    as you don't make it larger than the amount of memory really available,
-   which would drive the machine into swapping.  For hash indexes, the
-   value of <A
-HREF="runtime-config-query.html#GUC-EFFECTIVE-CACHE-SIZE"
->effective_cache_size</A
-> is also relevant to
-   index creation time: <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> will use one
-   of two different hash index creation methods depending on whether the
-   estimated index size is more or less than <TT
-CLASS="VARNAME"
->effective_cache_size</TT
->.
-   For best results, make sure that this parameter is also set to something
-   reflective of available memory, and be careful that the sum of
-   <TT
-CLASS="VARNAME"
->maintenance_work_mem</TT
-> and <TT
-CLASS="VARNAME"
->effective_cache_size</TT
-> is
-   less than the machine's RAM less whatever space is needed by other
-   programs.
+   which would drive the machine into swapping.
   </P
 ><P
 >   Use <A
@@ -1119,7 +1095,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76704"
+NAME="AEN77019"
 ></A
 ><H2
 >Examples</H2
@@ -1224,7 +1200,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76732"
+NAME="AEN77047"
 ></A
 ><H2
 >Compatibility</H2
@@ -1243,7 +1219,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76737"
+NAME="AEN77052"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createlanguage.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createlanguage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createlanguage.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createlanguage.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN76751"
+NAME="AEN77066"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN76754"
+NAME="AEN77069"
 ></A
 ><H2
 >Synopsis</H2
@@ -679,7 +679,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76895"
+NAME="AEN77210"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-creatematerializedview.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-creatematerializedview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-creatematerializedview.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-creatematerializedview.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN76919"
+NAME="AEN77234"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN76922"
+NAME="AEN77237"
 ></A
 ><H2
 >Synopsis</H2
@@ -149,7 +149,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76930"
+NAME="AEN77245"
 ></A
 ><H2
 >Description</H2
@@ -186,7 +186,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76939"
+NAME="AEN77254"
 ></A
 ><H2
 >Parameters</H2
@@ -347,7 +347,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76991"
+NAME="AEN77306"
 ></A
 ><H2
 >Compatibility</H2
@@ -365,7 +365,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76996"
+NAME="AEN77311"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createopclass.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createopclass.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createopclass.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createopclass.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN77170"
+NAME="AEN77485"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN77173"
+NAME="AEN77488"
 ></A
 ><H2
 >Synopsis</H2
@@ -194,7 +194,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77190"
+NAME="AEN77505"
 ></A
 ><H2
 >Description</H2
@@ -264,7 +264,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77205"
+NAME="AEN77520"
 ></A
 ><H2
 >Parameters</H2
@@ -512,7 +512,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77289"
+NAME="AEN77604"
 ></A
 ><H2
 >Notes</H2
@@ -551,7 +551,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77298"
+NAME="AEN77613"
 ></A
 ><H2
 >Examples</H2
@@ -589,7 +589,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77305"
+NAME="AEN77620"
 ></A
 ><H2
 >Compatibility</H2
@@ -612,7 +612,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77311"
+NAME="AEN77626"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createoperator.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createoperator.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createoperator.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createoperator.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN77016"
+NAME="AEN77331"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN77019"
+NAME="AEN77334"
 ></A
 ><H2
 >Synopsis</H2
@@ -160,7 +160,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77029"
+NAME="AEN77344"
 ></A
 ><H2
 >Description</H2
@@ -314,7 +314,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77069"
+NAME="AEN77384"
 ></A
 ><H2
 >Parameters</H2
@@ -474,7 +474,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77128"
+NAME="AEN77443"
 ></A
 ><H2
 >Notes</H2
@@ -534,7 +534,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77144"
+NAME="AEN77459"
 ></A
 ><H2
 >Examples</H2
@@ -561,7 +561,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77149"
+NAME="AEN77464"
 ></A
 ><H2
 >Compatibility</H2
@@ -580,7 +580,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77154"
+NAME="AEN77469"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createopfamily.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createopfamily.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createopfamily.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createopfamily.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN77329"
+NAME="AEN77644"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN77332"
+NAME="AEN77647"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77336"
+NAME="AEN77651"
 ></A
 ><H2
 >Description</H2
@@ -184,7 +184,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77349"
+NAME="AEN77664"
 ></A
 ><H2
 >Parameters</H2
@@ -224,7 +224,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77362"
+NAME="AEN77677"
 ></A
 ><H2
 >Compatibility</H2
@@ -247,7 +247,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77368"
+NAME="AEN77683"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createpolicy.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createpolicy.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createpolicy.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createpolicy.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN77388"
+NAME="AEN77703"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN77391"
+NAME="AEN77706"
 ></A
 ><H2
 >Synopsis</H2
@@ -143,7 +143,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77398"
+NAME="AEN77713"
 ></A
 ><H2
 >Description</H2
@@ -284,7 +284,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77433"
+NAME="AEN77748"
 ></A
 ><H2
 >Parameters</H2
@@ -450,7 +450,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN77483"
+NAME="AEN77798"
 ></A
 ><H3
 >Per-Command Policies</H3
@@ -966,7 +966,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77621"
+NAME="AEN77936"
 ></A
 ><H2
 >Notes</H2
@@ -1026,7 +1026,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77630"
+NAME="AEN77945"
 ></A
 ><H2
 >Compatibility</H2
@@ -1044,7 +1044,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77635"
+NAME="AEN77950"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createrole.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createrole.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createrole.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createrole.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN77651"
+NAME="AEN77966"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN77654"
+NAME="AEN77969"
 ></A
 ><H2
 >Synopsis</H2
@@ -200,7 +200,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77669"
+NAME="AEN77984"
 ></A
 ><H2
 >Description</H2
@@ -243,7 +243,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77680"
+NAME="AEN77995"
 ></A
 ><H2
 >Parameters</H2
@@ -571,11 +571,6 @@
         password string).  This allows reloading of encrypted
         passwords during dump/restore.
        </P
-><P
->        Note that older clients might lack support for the MD5
-        authentication mechanism that is needed to work with passwords
-        that are stored encrypted.
-       </P
 ></DD
 ><DT
 ><TT
@@ -740,7 +735,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77850"
+NAME="AEN78164"
 ></A
 ><H2
 >Notes</H2
@@ -923,7 +918,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77893"
+NAME="AEN78207"
 ></A
 ><H2
 >Examples</H2
@@ -972,7 +967,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77906"
+NAME="AEN78220"
 ></A
 ><H2
 >Compatibility</H2
@@ -1032,7 +1027,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77920"
+NAME="AEN78234"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createrule.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createrule.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createrule.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createrule.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN77942"
+NAME="AEN78256"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN77945"
+NAME="AEN78259"
 ></A
 ><H2
 >Synopsis</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77956"
+NAME="AEN78270"
 ></A
 ><H2
 >Description</H2
@@ -335,7 +335,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN77993"
+NAME="AEN78307"
 ></A
 ><H2
 >Parameters</H2
@@ -577,7 +577,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78067"
+NAME="AEN78381"
 ></A
 ><H2
 >Notes</H2
@@ -716,7 +716,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78099"
+NAME="AEN78413"
 ></A
 ><H2
 >Compatibility</H2
@@ -735,7 +735,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78104"
+NAME="AEN78418"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createschema.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createschema.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createschema.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createschema.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN78118"
+NAME="AEN78432"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN78121"
+NAME="AEN78435"
 ></A
 ><H2
 >Synopsis</H2
@@ -179,7 +179,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78134"
+NAME="AEN78448"
 ></A
 ><H2
 >Description</H2
@@ -229,7 +229,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78145"
+NAME="AEN78459"
 ></A
 ><H2
 >Parameters</H2
@@ -339,7 +339,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78178"
+NAME="AEN78492"
 ></A
 ><H2
 >Notes</H2
@@ -355,7 +355,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78182"
+NAME="AEN78496"
 ></A
 ><H2
 >Examples</H2
@@ -425,7 +425,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78200"
+NAME="AEN78514"
 ></A
 ><H2
 >Compatibility</H2
@@ -486,7 +486,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78215"
+NAME="AEN78529"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createsequence.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createsequence.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createsequence.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createsequence.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN78229"
+NAME="AEN78543"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN78232"
+NAME="AEN78546"
 ></A
 ><H2
 >Synopsis</H2
@@ -157,7 +157,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78242"
+NAME="AEN78556"
 ></A
 ><H2
 >Description</H2
@@ -232,7 +232,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78258"
+NAME="AEN78572"
 ></A
 ><H2
 >Parameters</H2
@@ -531,7 +531,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78351"
+NAME="AEN78665"
 ></A
 ><H2
 >Notes</H2
@@ -550,6 +550,24 @@
    (-9223372036854775808 to 9223372036854775807).
   </P
 ><P
+>   Because <CODE
+CLASS="FUNCTION"
+>nextval</CODE
+> and <CODE
+CLASS="FUNCTION"
+>setval</CODE
+> calls are never
+   rolled back, sequence objects cannot be used if <SPAN
+CLASS="QUOTE"
+>"gapless"</SPAN
+>
+   assignment of sequence numbers is needed.  It is possible to build
+   gapless assignment by using exclusive locking of a table containing a
+   counter; but this solution is much more expensive than sequence
+   objects, especially if many transactions need sequence numbers
+   concurrently.
+  </P
+><P
 >   Unexpected results might be obtained if a <TT
 CLASS="REPLACEABLE"
 ><I
@@ -647,7 +665,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78376"
+NAME="AEN78694"
 ></A
 ><H2
 >Examples</H2
@@ -709,7 +727,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78391"
+NAME="AEN78709"
 ></A
 ><H2
 >Compatibility</H2
@@ -765,7 +783,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78408"
+NAME="AEN78726"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createserver.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createserver.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createserver.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createserver.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN78422"
+NAME="AEN78740"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN78425"
+NAME="AEN78743"
 ></A
 ><H2
 >Synopsis</H2
@@ -146,7 +146,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78433"
+NAME="AEN78751"
 ></A
 ><H2
 >Description</H2
@@ -177,7 +177,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78441"
+NAME="AEN78759"
 ></A
 ><H2
 >Parameters</H2
@@ -263,7 +263,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78471"
+NAME="AEN78789"
 ></A
 ><H2
 >Notes</H2
@@ -288,7 +288,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78477"
+NAME="AEN78795"
 ></A
 ><H2
 >Examples</H2
@@ -314,7 +314,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78484"
+NAME="AEN78802"
 ></A
 ><H2
 >Compatibility</H2
@@ -328,7 +328,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78488"
+NAME="AEN78806"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtableas.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtableas.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtableas.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtableas.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN79285"
+NAME="AEN79612"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN79288"
+NAME="AEN79615"
 ></A
 ><H2
 >Synopsis</H2
@@ -150,7 +150,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79296"
+NAME="AEN79623"
 ></A
 ><H2
 >Description</H2
@@ -190,7 +190,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79305"
+NAME="AEN79632"
 ></A
 ><H2
 >Parameters</H2
@@ -513,7 +513,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79418"
+NAME="AEN79745"
 ></A
 ><H2
 >Notes</H2
@@ -553,7 +553,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79428"
+NAME="AEN79755"
 ></A
 ><H2
 >Examples</H2
@@ -608,7 +608,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79441"
+NAME="AEN79768"
 ></A
 ><H2
 >Compatibility</H2
@@ -690,7 +690,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79465"
+NAME="AEN79792"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtable.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtable.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtable.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtable.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN78508"
+NAME="AEN78826"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN78511"
+NAME="AEN78829"
 ></A
 ><H2
 >Synopsis</H2
@@ -555,7 +555,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN78591"
+NAME="AEN78909"
 ></A
 ><H2
 >Parameters</H2
@@ -877,19 +877,19 @@
       table.
      </P
 ><P
->      Default expressions for the copied column definitions will only be
-      copied if <TT
+>      Default expressions for the copied column definitions will be copied
+      only if <TT
 CLASS="LITERAL"
 >INCLUDING DEFAULTS</TT
-> is specified.
-      Defaults that call database-modification functions, like
-      <CODE
-CLASS="FUNCTION"
->nextval</CODE
->, create a linkage between the original and
-      new tables.  The
+> is specified.  The
       default behavior is to exclude default expressions, resulting in the
       copied columns in the new table having null defaults.
+      Note that copying defaults that call database-modification functions,
+      such as <CODE
+CLASS="FUNCTION"
+>nextval</CODE
+>, may create a functional linkage between
+      the original and new tables.
      </P
 ><P
 >      Not-null constraints are always copied to the new table.
@@ -901,27 +901,36 @@
 CLASS="LITERAL"
 >INCLUDING CONSTRAINTS</TT
 > is specified.
-      Indexes, <TT
+      No distinction is made between column constraints and table
+      constraints.
+     </P
+><P
+>      Indexes, <TT
 CLASS="LITERAL"
 >PRIMARY KEY</TT
->, and <TT
+>, <TT
 CLASS="LITERAL"
 >UNIQUE</TT
-> constraints
-      on the original table will be created on the new table only if the
-      <TT
+>,
+      and <TT
+CLASS="LITERAL"
+>EXCLUDE</TT
+> constraints on the original table will be
+      created on the new table only if <TT
 CLASS="LITERAL"
 >INCLUDING INDEXES</TT
-> clause is specified.
-      No distinction is made between column constraints and table
-      constraints.
+>
+      is specified.  Names for the new indexes and constraints are
+      chosen according to the default rules, regardless of how the originals
+      were named.  (This behavior avoids possible duplicate-name failures for
+      the new indexes.)
      </P
 ><P
-><TT
+>      <TT
 CLASS="LITERAL"
 >STORAGE</TT
-> settings for the copied column definitions will only
-      be copied if <TT
+> settings for the copied column definitions will be
+      copied only if <TT
 CLASS="LITERAL"
 >INCLUDING STORAGE</TT
 > is specified.  The
@@ -941,7 +950,7 @@
      </P
 ><P
 >      Comments for the copied columns, constraints, and indexes
-      will only be copied if <TT
+      will be copied only if <TT
 CLASS="LITERAL"
 >INCLUDING COMMENTS</TT
 >
@@ -949,7 +958,7 @@
       the copied columns and constraints in the new table having no comments.
      </P
 ><P
-><TT
+>      <TT
 CLASS="LITERAL"
 >INCLUDING ALL</TT
 > is an abbreviated form of
@@ -959,7 +968,7 @@
 >.
      </P
 ><P
->      Note also that unlike <TT
+>      Note that unlike <TT
 CLASS="LITERAL"
 >INHERITS</TT
 >, columns and
@@ -978,12 +987,13 @@
 >      The <TT
 CLASS="LITERAL"
 >LIKE</TT
-> clause can also be used to copy columns from
-      views, foreign tables, or composite types.  Inapplicable options (e.g., <TT
+> clause can also be used to copy column
+      definitions from views, foreign tables, or composite types.
+      Inapplicable options (e.g., <TT
 CLASS="LITERAL"
->INCLUDING
-      INDEXES</TT
-> from a view) are ignored.
+>INCLUDING INDEXES</TT
+> from
+      a view) are ignored.
      </P
 ></DD
 ><DT
@@ -2672,7 +2682,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN79185"
+NAME="AEN79505"
 ></A
 ><H3
 >Temporary Tables</H3
@@ -2771,7 +2781,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN79208"
+NAME="AEN79528"
 ></A
 ><H3
 >Non-deferred Uniqueness Constraints</H3
@@ -2806,7 +2816,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN79216"
+NAME="AEN79536"
 ></A
 ><H3
 >Column Check Constraints</H3
@@ -2830,7 +2840,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN79222"
+NAME="AEN79542"
 ></A
 ><H3
 ><TT
@@ -2851,7 +2861,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN79228"
+NAME="AEN79548"
 ></A
 ><H3
 ><TT
@@ -2885,7 +2895,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN79237"
+NAME="AEN79557"
 ></A
 ><H3
 >Inheritance</H3
@@ -2910,7 +2920,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN79243"
+NAME="AEN79563"
 ></A
 ><H3
 >Zero-column Tables</H3
@@ -2935,7 +2945,33 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN79249"
+NAME="AEN79569"
+></A
+><H3
+><TT
+CLASS="LITERAL"
+>LIKE</TT
+> Clause</H3
+><P
+>    While a <TT
+CLASS="LITERAL"
+>LIKE</TT
+> clause exists in the SQL standard, many of the
+    options that <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+> accepts for it are not
+    in the standard, and some of the standard's options are not implemented
+    by <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>.
+   </P
+></DIV
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN79576"
 ></A
 ><H3
 ><TT
@@ -2956,7 +2992,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN79255"
+NAME="AEN79582"
 ></A
 ><H3
 >Tablespaces</H3
@@ -2978,7 +3014,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN79261"
+NAME="AEN79588"
 ></A
 ><H3
 >Typed Tables</H3
@@ -2998,7 +3034,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79265"
+NAME="AEN79592"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtablespace.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtablespace.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtablespace.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtablespace.html	2017-08-07 21:32:22.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN79487"
+NAME="AEN79814"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN79490"
+NAME="AEN79817"
 ></A
 ><H2
 >Synopsis</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79497"
+NAME="AEN79824"
 ></A
 ><H2
 >Description</H2
@@ -216,7 +216,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79511"
+NAME="AEN79838"
 ></A
 ><H2
 >Parameters</H2
@@ -314,7 +314,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79540"
+NAME="AEN79867"
 ></A
 ><H2
 >Notes</H2
@@ -332,7 +332,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79545"
+NAME="AEN79872"
 ></A
 ><H2
 >Examples</H2
@@ -369,7 +369,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79556"
+NAME="AEN79883"
 ></A
 ><H2
 >Compatibility</H2
@@ -387,7 +387,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79561"
+NAME="AEN79888"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtransform.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtransform.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtransform.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtransform.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN79832"
+NAME="AEN80159"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN79835"
+NAME="AEN80162"
 ></A
 ><H2
 >Synopsis</H2
@@ -230,7 +230,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79863"
+NAME="AEN80190"
 ></A
 ><H2
 >Parameters</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtrigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtrigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtrigger.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtrigger.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN79929"
+NAME="AEN80256"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN79932"
+NAME="AEN80259"
 ></A
 ><H2
 >Synopsis</H2
@@ -178,7 +178,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79944"
+NAME="AEN80271"
 ></A
 ><H2
 >Description</H2
@@ -543,7 +543,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80047"
+NAME="AEN80374"
 ></A
 ><H2
 >Parameters</H2
@@ -1266,7 +1266,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80246"
+NAME="AEN80573"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtsconfig.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtsconfig.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtsconfig.html	2016-03-28 20:20:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtsconfig.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN79581"
+NAME="AEN79908"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN79584"
+NAME="AEN79911"
 ></A
 ><H2
 >Synopsis</H2
@@ -132,7 +132,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79589"
+NAME="AEN79916"
 ></A
 ><H2
 >Description</H2
@@ -173,7 +173,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79599"
+NAME="AEN79926"
 ></A
 ><H2
 >Parameters</H2
@@ -225,7 +225,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79617"
+NAME="AEN79944"
 ></A
 ><H2
 >Notes</H2
@@ -244,7 +244,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79622"
+NAME="AEN79949"
 ></A
 ><H2
 >Compatibility</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79626"
+NAME="AEN79953"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtsdictionary.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtsdictionary.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtsdictionary.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtsdictionary.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN79640"
+NAME="AEN79967"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN79643"
+NAME="AEN79970"
 ></A
 ><H2
 >Synopsis</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79649"
+NAME="AEN79976"
 ></A
 ><H2
 >Description</H2
@@ -169,7 +169,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79657"
+NAME="AEN79984"
 ></A
 ><H2
 >Parameters</H2
@@ -239,7 +239,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79681"
+NAME="AEN80008"
 ></A
 ><H2
 >Examples</H2
@@ -258,7 +258,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79685"
+NAME="AEN80012"
 ></A
 ><H2
 >Compatibility</H2
@@ -273,7 +273,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79689"
+NAME="AEN80016"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtsparser.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtsparser.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtsparser.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtsparser.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN79703"
+NAME="AEN80030"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN79706"
+NAME="AEN80033"
 ></A
 ><H2
 >Synopsis</H2
@@ -150,7 +150,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79714"
+NAME="AEN80041"
 ></A
 ><H2
 >Description</H2
@@ -187,7 +187,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79723"
+NAME="AEN80050"
 ></A
 ><H2
 >Parameters</H2
@@ -285,7 +285,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79758"
+NAME="AEN80085"
 ></A
 ><H2
 >Compatibility</H2
@@ -301,7 +301,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79762"
+NAME="AEN80089"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtstemplate.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtstemplate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtstemplate.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtstemplate.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN79776"
+NAME="AEN80103"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN79779"
+NAME="AEN80106"
 ></A
 ><H2
 >Synopsis</H2
@@ -132,7 +132,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79784"
+NAME="AEN80111"
 ></A
 ><H2
 >Description</H2
@@ -176,7 +176,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79794"
+NAME="AEN80121"
 ></A
 ><H2
 >Parameters</H2
@@ -237,7 +237,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79814"
+NAME="AEN80141"
 ></A
 ><H2
 >Compatibility</H2
@@ -253,7 +253,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79818"
+NAME="AEN80145"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtype.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtype.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createtype.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createtype.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN80264"
+NAME="AEN80591"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN80267"
+NAME="AEN80594"
 ></A
 ><H2
 >Synopsis</H2
@@ -304,7 +304,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80300"
+NAME="AEN80627"
 ></A
 ><H2
 >Description</H2
@@ -359,7 +359,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN80313"
+NAME="AEN80640"
 ></A
 ><H3
 >Composite Types</H3
@@ -522,7 +522,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN80347"
+NAME="AEN80674"
 ></A
 ><H3
 >Base Types</H3
@@ -1151,7 +1151,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN80465"
+NAME="AEN80792"
 ></A
 ><H3
 >Array Types</H3
@@ -1225,7 +1225,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80480"
+NAME="AEN80807"
 ></A
 ><H2
 >Parameters</H2
@@ -1573,7 +1573,7 @@
       Other standard category codes can be found in
       <A
 HREF="catalog-pg-type.html#CATALOG-TYPCATEGORY-TABLE"
->Table 49-57</A
+>Table 49-55</A
 >.  You may also choose
       other ASCII characters in order to create custom categories.
      </P
@@ -1761,7 +1761,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80653"
+NAME="AEN80980"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createuser.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createuser.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createuser.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createuser.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN80702"
+NAME="AEN81029"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN80705"
+NAME="AEN81032"
 ></A
 ><H2
 >Synopsis</H2
@@ -200,7 +200,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80720"
+NAME="AEN81047"
 ></A
 ><H2
 >Description</H2
@@ -235,7 +235,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80729"
+NAME="AEN81056"
 ></A
 ><H2
 >Compatibility</H2
@@ -254,7 +254,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80734"
+NAME="AEN81061"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createusermapping.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createusermapping.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createusermapping.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createusermapping.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN80746"
+NAME="AEN81073"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN80749"
+NAME="AEN81076"
 ></A
 ><H2
 >Synopsis</H2
@@ -136,7 +136,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80755"
+NAME="AEN81082"
 ></A
 ><H2
 >Description</H2
@@ -163,7 +163,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80761"
+NAME="AEN81088"
 ></A
 ><H2
 >Parameters</H2
@@ -239,7 +239,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80784"
+NAME="AEN81111"
 ></A
 ><H2
 >Examples</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80790"
+NAME="AEN81117"
 ></A
 ><H2
 >Compatibility</H2
@@ -273,7 +273,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80794"
+NAME="AEN81121"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createview.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-createview.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-createview.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN80812"
+NAME="AEN81139"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN80815"
+NAME="AEN81142"
 ></A
 ><H2
 >Synopsis</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80822"
+NAME="AEN81149"
 ></A
 ><H2
 >Description</H2
@@ -181,7 +181,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80830"
+NAME="AEN81157"
 ></A
 ><H2
 >Parameters</H2
@@ -226,15 +226,20 @@
 >      Creates a recursive view.  The syntax
 </P><PRE
 CLASS="SYNOPSIS"
->CREATE RECURSIVE VIEW <TT
+>CREATE RECURSIVE VIEW [ <TT
 CLASS="REPLACEABLE"
 ><I
->name</I
+>schema</I
+></TT
+> . ] <TT
+CLASS="REPLACEABLE"
+><I
+>view_name</I
 ></TT
 > (<TT
 CLASS="REPLACEABLE"
 ><I
->columns</I
+>column_names</I
 ></TT
 >) AS SELECT <TT
 CLASS="REPLACEABLE"
@@ -246,20 +251,25 @@
       is equivalent to
 </P><PRE
 CLASS="SYNOPSIS"
->CREATE VIEW <TT
+>CREATE VIEW [ <TT
 CLASS="REPLACEABLE"
 ><I
->name</I
+>schema</I
+></TT
+> . ] <TT
+CLASS="REPLACEABLE"
+><I
+>view_name</I
 ></TT
 > AS WITH RECURSIVE <TT
 CLASS="REPLACEABLE"
 ><I
->name</I
+>view_name</I
 ></TT
 > (<TT
 CLASS="REPLACEABLE"
 ><I
->columns</I
+>column_names</I
 ></TT
 >) AS (SELECT <TT
 CLASS="REPLACEABLE"
@@ -269,16 +279,16 @@
 >) SELECT <TT
 CLASS="REPLACEABLE"
 ><I
->columns</I
+>column_names</I
 ></TT
 > FROM <TT
 CLASS="REPLACEABLE"
 ><I
->name</I
+>view_name</I
 ></TT
 >;</PRE
 ><P>
-      A view column list must be specified for a recursive view.
+      A view column name list must be specified for a recursive view.
      </P
 ></DD
 ><DT
@@ -548,7 +558,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN80943"
+NAME="AEN81272"
 ></A
 ><H2
 >Notes</H2
@@ -833,7 +843,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81017"
+NAME="AEN81346"
 ></A
 ><H2
 >Examples</H2
@@ -964,16 +974,24 @@
 >   Create a recursive view consisting of the numbers from 1 to 100:
 </P><PRE
 CLASS="PROGRAMLISTING"
->CREATE RECURSIVE VIEW nums_1_100 (n) AS
+>CREATE RECURSIVE VIEW public.nums_1_100 (n) AS
     VALUES (1)
 UNION ALL
     SELECT n+1 FROM nums_1_100 WHERE n &#60; 100;</PRE
-><P></P
+><P>
+   Notice that although the recursive view's name is schema-qualified in this
+   <TT
+CLASS="COMMAND"
+>CREATE</TT
+>, its internal self-reference is not schema-qualified.
+   This is because the implicitly-created CTE's name cannot be
+   schema-qualified.
+  </P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81048"
+NAME="AEN81378"
 ></A
 ><H2
 >Compatibility</H2
@@ -996,7 +1014,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81054"
+NAME="AEN81384"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-deallocate.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-deallocate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-deallocate.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-deallocate.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81073"
+NAME="AEN81403"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81076"
+NAME="AEN81406"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81079"
+NAME="AEN81409"
 ></A
 ><H2
 >Description</H2
@@ -141,7 +141,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81085"
+NAME="AEN81415"
 ></A
 ><H2
 >Parameters</H2
@@ -188,7 +188,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81103"
+NAME="AEN81433"
 ></A
 ><H2
 >Compatibility</H2
@@ -203,7 +203,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81107"
+NAME="AEN81437"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-declare.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-declare.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-declare.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-declare.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81124"
+NAME="AEN81454"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81127"
+NAME="AEN81457"
 ></A
 ><H2
 >Synopsis</H2
@@ -125,7 +125,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81131"
+NAME="AEN81461"
 ></A
 ><H2
 >Description</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81140"
+NAME="AEN81470"
 ></A
 ><H2
 >Parameters</H2
@@ -695,7 +695,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81272"
+NAME="AEN81602"
 ></A
 ><H2
 >Examples</H2
@@ -715,7 +715,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81277"
+NAME="AEN81607"
 ></A
 ><H2
 >Compatibility</H2
@@ -754,7 +754,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81287"
+NAME="AEN81617"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-delete.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-delete.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-delete.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-delete.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81303"
+NAME="AEN81633"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81306"
+NAME="AEN81636"
 ></A
 ><H2
 >Synopsis</H2
@@ -158,7 +158,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81316"
+NAME="AEN81646"
 ></A
 ><H2
 >Description</H2
@@ -253,7 +253,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81339"
+NAME="AEN81669"
 ></A
 ><H2
 >Parameters</H2
@@ -483,7 +483,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81408"
+NAME="AEN81738"
 ></A
 ><H2
 >Outputs</H2
@@ -549,7 +549,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81423"
+NAME="AEN81753"
 ></A
 ><H2
 >Notes</H2
@@ -597,7 +597,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81434"
+NAME="AEN81764"
 ></A
 ><H2
 >Examples</H2
@@ -642,7 +642,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81447"
+NAME="AEN81777"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-discard.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-discard.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-discard.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-discard.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81463"
+NAME="AEN81793"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81466"
+NAME="AEN81796"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81468"
+NAME="AEN81798"
 ></A
 ><H2
 >Description</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81473"
+NAME="AEN81803"
 ></A
 ><H2
 >Parameters</H2
@@ -225,7 +225,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81502"
+NAME="AEN81832"
 ></A
 ><H2
 >Notes</H2
@@ -239,7 +239,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81506"
+NAME="AEN81836"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-do.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-do.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-do.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-do.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81520"
+NAME="AEN81850"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81523"
+NAME="AEN81853"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81527"
+NAME="AEN81857"
 ></A
 ><H2
 >Description</H2
@@ -154,7 +154,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81535"
+NAME="AEN81865"
 ></A
 ><H2
 >Parameters</H2
@@ -202,7 +202,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81550"
+NAME="AEN81880"
 ></A
 ><H2
 >Notes</H2
@@ -258,7 +258,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81563"
+NAME="AEN81893"
 ></A
 ><H2
 >Compatibility</H2
@@ -272,7 +272,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81567"
+NAME="AEN81897"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropaggregate.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropaggregate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropaggregate.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropaggregate.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81579"
+NAME="AEN81909"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81582"
+NAME="AEN81912"
 ></A
 ><H2
 >Synopsis</H2
@@ -186,7 +186,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81597"
+NAME="AEN81927"
 ></A
 ><H2
 >Description</H2
@@ -202,7 +202,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81601"
+NAME="AEN81931"
 ></A
 ><H2
 >Parameters</H2
@@ -324,7 +324,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81645"
+NAME="AEN81975"
 ></A
 ><H2
 >Notes</H2
@@ -339,7 +339,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81649"
+NAME="AEN81979"
 ></A
 ><H2
 >Examples</H2
@@ -373,7 +373,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81658"
+NAME="AEN81988"
 ></A
 ><H2
 >Compatibility</H2
@@ -388,7 +388,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81662"
+NAME="AEN81992"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropcast.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropcast.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropcast.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropcast.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81676"
+NAME="AEN82006"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81679"
+NAME="AEN82009"
 ></A
 ><H2
 >Synopsis</H2
@@ -143,7 +143,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81688"
+NAME="AEN82018"
 ></A
 ><H2
 >Parameters</H2
@@ -241,7 +241,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81723"
+NAME="AEN82053"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropcollation.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropcollation.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropcollation.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropcollation.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81735"
+NAME="AEN82065"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81738"
+NAME="AEN82068"
 ></A
 ><H2
 >Synopsis</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81745"
+NAME="AEN82075"
 ></A
 ><H2
 >Parameters</H2
@@ -236,7 +236,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81780"
+NAME="AEN82110"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropconversion.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropconversion.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropconversion.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropconversion.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81794"
+NAME="AEN82124"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81797"
+NAME="AEN82127"
 ></A
 ><H2
 >Synopsis</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81804"
+NAME="AEN82134"
 ></A
 ><H2
 >Parameters</H2
@@ -231,7 +231,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81836"
+NAME="AEN82166"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropdatabase.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropdatabase.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropdatabase.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropdatabase.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81850"
+NAME="AEN82180"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81853"
+NAME="AEN82183"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81856"
+NAME="AEN82186"
 ></A
 ><H2
 >Description</H2
@@ -147,7 +147,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81863"
+NAME="AEN82193"
 ></A
 ><H2
 >Parameters</H2
@@ -185,7 +185,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81876"
+NAME="AEN82206"
 ></A
 ><H2
 >Notes</H2
@@ -212,7 +212,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81882"
+NAME="AEN82212"
 ></A
 ><H2
 >Compatibility</H2
@@ -226,7 +226,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81886"
+NAME="AEN82216"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropdomain.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropdomain.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropdomain.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropdomain.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81898"
+NAME="AEN82228"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81901"
+NAME="AEN82231"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81904"
+NAME="AEN82234"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81908"
+NAME="AEN82238"
 ></A
 ><H2
 >Parameters</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropeventtrigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropeventtrigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropeventtrigger.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropeventtrigger.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN81955"
+NAME="AEN82285"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN81958"
+NAME="AEN82288"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81961"
+NAME="AEN82291"
 ></A
 ><H2
 >Description</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81965"
+NAME="AEN82295"
 ></A
 ><H2
 >Parameters</H2
@@ -227,7 +227,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81997"
+NAME="AEN82327"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropextension.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropextension.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropextension.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropextension.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82011"
+NAME="AEN82341"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82014"
+NAME="AEN82344"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82017"
+NAME="AEN82347"
 ></A
 ><H2
 >Description</H2
@@ -140,7 +140,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82023"
+NAME="AEN82353"
 ></A
 ><H2
 >Parameters</H2
@@ -203,7 +203,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82047"
+NAME="AEN82377"
 ></A
 ><H2
 >Examples</H2
@@ -235,7 +235,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82055"
+NAME="AEN82385"
 ></A
 ><H2
 >Compatibility</H2
@@ -253,7 +253,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82060"
+NAME="AEN82390"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropforeigndatawrapper.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropforeigndatawrapper.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropforeigndatawrapper.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropforeigndatawrapper.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82074"
+NAME="AEN82404"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82077"
+NAME="AEN82407"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82080"
+NAME="AEN82410"
 ></A
 ><H2
 >Description</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82084"
+NAME="AEN82414"
 ></A
 ><H2
 >Parameters</H2
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82107"
+NAME="AEN82437"
 ></A
 ><H2
 >Examples</H2
@@ -212,7 +212,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82112"
+NAME="AEN82442"
 ></A
 ><H2
 >Compatibility</H2
@@ -234,7 +234,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82118"
+NAME="AEN82448"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropforeigntable.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropforeigntable.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropforeigntable.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropforeigntable.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82132"
+NAME="AEN82462"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82135"
+NAME="AEN82465"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82138"
+NAME="AEN82468"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82142"
+NAME="AEN82472"
 ></A
 ><H2
 >Parameters</H2
@@ -194,7 +194,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82165"
+NAME="AEN82495"
 ></A
 ><H2
 >Examples</H2
@@ -216,7 +216,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82171"
+NAME="AEN82501"
 ></A
 ><H2
 >Compatibility</H2
@@ -236,7 +236,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82176"
+NAME="AEN82506"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropfunction.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropfunction.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropfunction.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropfunction.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82190"
+NAME="AEN82520"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82193"
+NAME="AEN82523"
 ></A
 ><H2
 >Synopsis</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82199"
+NAME="AEN82529"
 ></A
 ><H2
 >Description</H2
@@ -153,7 +153,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82203"
+NAME="AEN82533"
 ></A
 ><H2
 >Parameters</H2
@@ -323,7 +323,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82260"
+NAME="AEN82590"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropgroup.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropgroup.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropgroup.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropgroup.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82274"
+NAME="AEN82604"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82277"
+NAME="AEN82607"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82280"
+NAME="AEN82610"
 ></A
 ><H2
 >Description</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82285"
+NAME="AEN82615"
 ></A
 ><H2
 >Compatibility</H2
@@ -151,7 +151,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82289"
+NAME="AEN82619"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropindex.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropindex.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropindex.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropindex.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82301"
+NAME="AEN82631"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82304"
+NAME="AEN82634"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82307"
+NAME="AEN82637"
 ></A
 ><H2
 >Description</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82311"
+NAME="AEN82641"
 ></A
 ><H2
 >Parameters</H2
@@ -235,7 +235,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82346"
+NAME="AEN82676"
 ></A
 ><H2
 >Examples</H2
@@ -253,7 +253,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82351"
+NAME="AEN82681"
 ></A
 ><H2
 >Compatibility</H2
@@ -272,7 +272,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82356"
+NAME="AEN82686"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droplanguage.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droplanguage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droplanguage.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droplanguage.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82368"
+NAME="AEN82698"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82371"
+NAME="AEN82701"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82374"
+NAME="AEN82704"
 ></A
 ><H2
 >Description</H2
@@ -164,7 +164,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82385"
+NAME="AEN82715"
 ></A
 ><H2
 >Parameters</H2
@@ -225,7 +225,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82408"
+NAME="AEN82738"
 ></A
 ><H2
 >Examples</H2
@@ -244,7 +244,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82413"
+NAME="AEN82743"
 ></A
 ><H2
 >Compatibility</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82417"
+NAME="AEN82747"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropmaterializedview.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropmaterializedview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropmaterializedview.html	2016-03-28 20:20:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropmaterializedview.html	2017-08-07 21:32:23.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82433"
+NAME="AEN82763"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82436"
+NAME="AEN82766"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82439"
+NAME="AEN82769"
 ></A
 ><H2
 >Description</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82443"
+NAME="AEN82773"
 ></A
 ><H2
 >Parameters</H2
@@ -196,7 +196,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82466"
+NAME="AEN82796"
 ></A
 ><H2
 >Examples</H2
@@ -214,7 +214,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82471"
+NAME="AEN82801"
 ></A
 ><H2
 >Compatibility</H2
@@ -232,7 +232,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82476"
+NAME="AEN82806"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropopclass.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropopclass.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropopclass.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropopclass.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82571"
+NAME="AEN82901"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82574"
+NAME="AEN82904"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82578"
+NAME="AEN82908"
 ></A
 ><H2
 >Description</H2
@@ -151,7 +151,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82585"
+NAME="AEN82915"
 ></A
 ><H2
 >Parameters</H2
@@ -222,7 +222,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82613"
+NAME="AEN82943"
 ></A
 ><H2
 >Notes</H2
@@ -251,7 +251,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82620"
+NAME="AEN82950"
 ></A
 ><H2
 >Examples</H2
@@ -277,7 +277,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82626"
+NAME="AEN82956"
 ></A
 ><H2
 >Compatibility</H2
@@ -292,7 +292,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82630"
+NAME="AEN82960"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropoperator.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropoperator.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropoperator.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropoperator.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82492"
+NAME="AEN82822"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82495"
+NAME="AEN82825"
 ></A
 ><H2
 >Synopsis</H2
@@ -129,7 +129,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82500"
+NAME="AEN82830"
 ></A
 ><H2
 >Description</H2
@@ -145,7 +145,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82504"
+NAME="AEN82834"
 ></A
 ><H2
 >Parameters</H2
@@ -236,7 +236,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82539"
+NAME="AEN82869"
 ></A
 ><H2
 >Examples</H2
@@ -284,7 +284,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82553"
+NAME="AEN82883"
 ></A
 ><H2
 >Compatibility</H2
@@ -298,7 +298,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82557"
+NAME="AEN82887"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropopfamily.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropopfamily.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropopfamily.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropopfamily.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82646"
+NAME="AEN82976"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82649"
+NAME="AEN82979"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82653"
+NAME="AEN82983"
 ></A
 ><H2
 >Description</H2
@@ -152,7 +152,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82660"
+NAME="AEN82990"
 ></A
 ><H2
 >Parameters</H2
@@ -223,7 +223,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82688"
+NAME="AEN83018"
 ></A
 ><H2
 >Examples</H2
@@ -249,7 +249,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82694"
+NAME="AEN83024"
 ></A
 ><H2
 >Compatibility</H2
@@ -264,7 +264,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82698"
+NAME="AEN83028"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-drop-owned.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-drop-owned.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-drop-owned.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-drop-owned.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82718"
+NAME="AEN83048"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82721"
+NAME="AEN83051"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82724"
+NAME="AEN83054"
 ></A
 ><H2
 >Description</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82728"
+NAME="AEN83058"
 ></A
 ><H2
 >Parameters</H2
@@ -186,7 +186,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82746"
+NAME="AEN83076"
 ></A
 ><H2
 >Notes</H2
@@ -235,7 +235,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82759"
+NAME="AEN83089"
 ></A
 ><H2
 >Compatibility</H2
@@ -253,7 +253,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82764"
+NAME="AEN83094"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droppolicy.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droppolicy.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droppolicy.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droppolicy.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82778"
+NAME="AEN83108"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82781"
+NAME="AEN83111"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82785"
+NAME="AEN83115"
 ></A
 ><H2
 >Description</H2
@@ -149,7 +149,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82791"
+NAME="AEN83121"
 ></A
 ><H2
 >Parameters</H2
@@ -200,7 +200,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82809"
+NAME="AEN83139"
 ></A
 ><H2
 >Examples</H2
@@ -223,7 +223,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82815"
+NAME="AEN83145"
 ></A
 ><H2
 >Compatibility</H2
@@ -240,7 +240,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82820"
+NAME="AEN83150"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droprole.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droprole.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droprole.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droprole.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82834"
+NAME="AEN83164"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82837"
+NAME="AEN83167"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82840"
+NAME="AEN83170"
 ></A
 ><H2
 >Description</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82851"
+NAME="AEN83181"
 ></A
 ><H2
 >Parameters</H2
@@ -204,7 +204,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82864"
+NAME="AEN83194"
 ></A
 ><H2
 >Notes</H2
@@ -226,7 +226,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82869"
+NAME="AEN83199"
 ></A
 ><H2
 >Examples</H2
@@ -240,7 +240,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82873"
+NAME="AEN83203"
 ></A
 ><H2
 >Compatibility</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82878"
+NAME="AEN83208"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droprule.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droprule.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droprule.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droprule.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82894"
+NAME="AEN83224"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82897"
+NAME="AEN83227"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82901"
+NAME="AEN83231"
 ></A
 ><H2
 >Description</H2
@@ -138,7 +138,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82905"
+NAME="AEN83235"
 ></A
 ><H2
 >Parameters</H2
@@ -210,7 +210,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82933"
+NAME="AEN83263"
 ></A
 ><H2
 >Examples</H2
@@ -228,7 +228,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82938"
+NAME="AEN83268"
 ></A
 ><H2
 >Compatibility</H2
@@ -247,7 +247,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82943"
+NAME="AEN83273"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropschema.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropschema.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropschema.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropschema.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82957"
+NAME="AEN83287"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN82960"
+NAME="AEN83290"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82963"
+NAME="AEN83293"
 ></A
 ><H2
 >Description</H2
@@ -138,7 +138,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82968"
+NAME="AEN83298"
 ></A
 ><H2
 >Parameters</H2
@@ -198,7 +198,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82991"
+NAME="AEN83321"
 ></A
 ><H2
 >Examples</H2
@@ -217,7 +217,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82996"
+NAME="AEN83326"
 ></A
 ><H2
 >Compatibility</H2
@@ -241,7 +241,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83002"
+NAME="AEN83332"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropsequence.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropsequence.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropsequence.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropsequence.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83016"
+NAME="AEN83346"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83019"
+NAME="AEN83349"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83022"
+NAME="AEN83352"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83026"
+NAME="AEN83356"
 ></A
 ><H2
 >Parameters</H2
@@ -193,7 +193,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83049"
+NAME="AEN83379"
 ></A
 ><H2
 >Examples</H2
@@ -211,7 +211,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83054"
+NAME="AEN83384"
 ></A
 ><H2
 >Compatibility</H2
@@ -238,7 +238,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83061"
+NAME="AEN83391"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropserver.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropserver.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropserver.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropserver.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83075"
+NAME="AEN83405"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83078"
+NAME="AEN83408"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83081"
+NAME="AEN83411"
 ></A
 ><H2
 >Description</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83085"
+NAME="AEN83415"
 ></A
 ><H2
 >Parameters</H2
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83108"
+NAME="AEN83438"
 ></A
 ><H2
 >Examples</H2
@@ -212,7 +212,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83113"
+NAME="AEN83443"
 ></A
 ><H2
 >Compatibility</H2
@@ -234,7 +234,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83119"
+NAME="AEN83449"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptable.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptable.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptable.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptable.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83133"
+NAME="AEN83463"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83136"
+NAME="AEN83466"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83139"
+NAME="AEN83469"
 ></A
 ><H2
 >Description</H2
@@ -161,7 +161,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83149"
+NAME="AEN83479"
 ></A
 ><H2
 >Parameters</H2
@@ -221,7 +221,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83172"
+NAME="AEN83502"
 ></A
 ><H2
 >Examples</H2
@@ -243,7 +243,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83178"
+NAME="AEN83508"
 ></A
 ><H2
 >Compatibility</H2
@@ -263,7 +263,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83183"
+NAME="AEN83513"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptablespace.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptablespace.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptablespace.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptablespace.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83197"
+NAME="AEN83527"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83200"
+NAME="AEN83530"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83203"
+NAME="AEN83533"
 ></A
 ><H2
 >Description</H2
@@ -148,7 +148,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83210"
+NAME="AEN83540"
 ></A
 ><H2
 >Parameters</H2
@@ -186,7 +186,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83223"
+NAME="AEN83553"
 ></A
 ><H2
 >Notes</H2
@@ -200,7 +200,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83227"
+NAME="AEN83557"
 ></A
 ><H2
 >Examples</H2
@@ -217,7 +217,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83232"
+NAME="AEN83562"
 ></A
 ><H2
 >Compatibility</H2
@@ -235,7 +235,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83237"
+NAME="AEN83567"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptransform.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptransform.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptransform.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptransform.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83480"
+NAME="AEN83810"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83483"
+NAME="AEN83813"
 ></A
 ><H2
 >Synopsis</H2
@@ -142,7 +142,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83492"
+NAME="AEN83822"
 ></A
 ><H2
 >Parameters</H2
@@ -255,7 +255,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83532"
+NAME="AEN83862"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptrigger.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptrigger.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptrigger.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptrigger.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83544"
+NAME="AEN83874"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83547"
+NAME="AEN83877"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83551"
+NAME="AEN83881"
 ></A
 ><H2
 >Description</H2
@@ -140,7 +140,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83555"
+NAME="AEN83885"
 ></A
 ><H2
 >Parameters</H2
@@ -263,7 +263,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83596"
+NAME="AEN83926"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptsconfig.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptsconfig.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptsconfig.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptsconfig.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83251"
+NAME="AEN83581"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83254"
+NAME="AEN83584"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83257"
+NAME="AEN83587"
 ></A
 ><H2
 >Description</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83261"
+NAME="AEN83591"
 ></A
 ><H2
 >Parameters</H2
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83284"
+NAME="AEN83614"
 ></A
 ><H2
 >Examples</H2
@@ -225,7 +225,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83291"
+NAME="AEN83621"
 ></A
 ><H2
 >Compatibility</H2
@@ -240,7 +240,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83295"
+NAME="AEN83625"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptsdictionary.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptsdictionary.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptsdictionary.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptsdictionary.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83309"
+NAME="AEN83639"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83312"
+NAME="AEN83642"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83315"
+NAME="AEN83645"
 ></A
 ><H2
 >Description</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83319"
+NAME="AEN83649"
 ></A
 ><H2
 >Parameters</H2
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83342"
+NAME="AEN83672"
 ></A
 ><H2
 >Examples</H2
@@ -221,7 +221,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83348"
+NAME="AEN83678"
 ></A
 ><H2
 >Compatibility</H2
@@ -236,7 +236,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83352"
+NAME="AEN83682"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptsparser.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptsparser.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptsparser.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptsparser.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83366"
+NAME="AEN83696"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83369"
+NAME="AEN83699"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83372"
+NAME="AEN83702"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83376"
+NAME="AEN83706"
 ></A
 ><H2
 >Parameters</H2
@@ -193,7 +193,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83399"
+NAME="AEN83729"
 ></A
 ><H2
 >Examples</H2
@@ -219,7 +219,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83405"
+NAME="AEN83735"
 ></A
 ><H2
 >Compatibility</H2
@@ -234,7 +234,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83409"
+NAME="AEN83739"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptstemplate.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptstemplate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptstemplate.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptstemplate.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83423"
+NAME="AEN83753"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83426"
+NAME="AEN83756"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83429"
+NAME="AEN83759"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83433"
+NAME="AEN83763"
 ></A
 ><H2
 >Parameters</H2
@@ -194,7 +194,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83456"
+NAME="AEN83786"
 ></A
 ><H2
 >Examples</H2
@@ -220,7 +220,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83462"
+NAME="AEN83792"
 ></A
 ><H2
 >Compatibility</H2
@@ -235,7 +235,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83466"
+NAME="AEN83796"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptype.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptype.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-droptype.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-droptype.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83608"
+NAME="AEN83938"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83611"
+NAME="AEN83941"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83614"
+NAME="AEN83944"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83618"
+NAME="AEN83948"
 ></A
 ><H2
 >Parameters</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropuser.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropuser.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropuser.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropuser.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83667"
+NAME="AEN83997"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83670"
+NAME="AEN84000"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83673"
+NAME="AEN84003"
 ></A
 ><H2
 >Description</H2
@@ -137,7 +137,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83678"
+NAME="AEN84008"
 ></A
 ><H2
 >Compatibility</H2
@@ -156,7 +156,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83683"
+NAME="AEN84013"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropusermapping.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropusermapping.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropusermapping.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropusermapping.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83695"
+NAME="AEN84025"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83698"
+NAME="AEN84028"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83702"
+NAME="AEN84032"
 ></A
 ><H2
 >Description</H2
@@ -148,7 +148,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83708"
+NAME="AEN84038"
 ></A
 ><H2
 >Parameters</H2
@@ -210,7 +210,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83729"
+NAME="AEN84059"
 ></A
 ><H2
 >Examples</H2
@@ -230,7 +230,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83735"
+NAME="AEN84065"
 ></A
 ><H2
 >Compatibility</H2
@@ -252,7 +252,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83741"
+NAME="AEN84071"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropview.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-dropview.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-dropview.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83755"
+NAME="AEN84085"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83758"
+NAME="AEN84088"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83761"
+NAME="AEN84091"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83765"
+NAME="AEN84095"
 ></A
 ><H2
 >Parameters</H2
@@ -194,7 +194,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83788"
+NAME="AEN84118"
 ></A
 ><H2
 >Examples</H2
@@ -211,7 +211,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83793"
+NAME="AEN84123"
 ></A
 ><H2
 >Compatibility</H2
@@ -231,7 +231,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83798"
+NAME="AEN84128"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-end.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-end.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-end.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-end.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83812"
+NAME="AEN84142"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83815"
+NAME="AEN84145"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83817"
+NAME="AEN84147"
 ></A
 ><H2
 >Description</H2
@@ -138,7 +138,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83823"
+NAME="AEN84153"
 ></A
 ><H2
 >Parameters</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83833"
+NAME="AEN84163"
 ></A
 ><H2
 >Notes</H2
@@ -188,7 +188,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83839"
+NAME="AEN84169"
 ></A
 ><H2
 >Examples</H2
@@ -202,7 +202,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83843"
+NAME="AEN84173"
 ></A
 ><H2
 >Compatibility</H2
@@ -224,7 +224,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83849"
+NAME="AEN84179"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-execute.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-execute.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-execute.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-execute.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83868"
+NAME="AEN84198"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83871"
+NAME="AEN84201"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83875"
+NAME="AEN84205"
 ></A
 ><H2
 >Description</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83885"
+NAME="AEN84215"
 ></A
 ><H2
 >Parameters</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83898"
+NAME="AEN84228"
 ></A
 ><H2
 >Outputs</H2
@@ -226,7 +226,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83903"
+NAME="AEN84233"
 ></A
 ><H2
 >Examples</H2
@@ -245,7 +245,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83908"
+NAME="AEN84238"
 ></A
 ><H2
 >Compatibility</H2
@@ -265,7 +265,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83913"
+NAME="AEN84243"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-explain.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-explain.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-explain.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-explain.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN83933"
+NAME="AEN84263"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN83936"
+NAME="AEN84266"
 ></A
 ><H2
 >Synopsis</H2
@@ -175,7 +175,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83948"
+NAME="AEN84278"
 ></A
 ><H2
 >Description</H2
@@ -295,7 +295,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN83973"
+NAME="AEN84303"
 ></A
 ><H2
 >Parameters</H2
@@ -540,7 +540,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84045"
+NAME="AEN84375"
 ></A
 ><H2
 >Outputs</H2
@@ -562,7 +562,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84050"
+NAME="AEN84380"
 ></A
 ><H2
 >Notes</H2
@@ -614,7 +614,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84061"
+NAME="AEN84391"
 ></A
 ><H2
 >Examples</H2
@@ -783,7 +783,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84085"
+NAME="AEN84415"
 ></A
 ><H2
 >Compatibility</H2
@@ -797,7 +797,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84089"
+NAME="AEN84419"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-expressions.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-expressions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-expressions.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-expressions.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Syntax"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -479,11 +479,7 @@
     in the second case.
    </P
 ><P
->    In a select list (see <A
-HREF="queries-select-lists.html"
->Section 7.3</A
->), you
-    can ask for all fields of a composite value by
+>    You can ask for all fields of a composite value by
     writing <TT
 CLASS="LITERAL"
 >.*</TT
@@ -492,6 +488,11 @@
 CLASS="PROGRAMLISTING"
 >(compositecol).*</PRE
 ><P>
+    This notation behaves differently depending on context;
+    see <A
+HREF="rowtypes.html#ROWTYPES-USAGE"
+>Section 8.16.5</A
+> for details.
    </P
 ></DIV
 ><DIV
@@ -701,8 +702,8 @@
 >"computed fields"</SPAN
 >.  For more information see
      <A
-HREF="xfunc-sql.html#XFUNC-SQL-COMPOSITE-FUNCTIONS"
->Section 35.4.3</A
+HREF="rowtypes.html#ROWTYPES-USAGE"
+>Section 8.16.5</A
 >.
     </P
 ></BLOCKQUOTE
@@ -1121,12 +1122,15 @@
 >PostgreSQL</SPAN
 > will actually accept either spelling, but
     only the first way conforms to the SQL standard.)
+   </P
+><P
+>    
     An example of an ordered-set aggregate call is:
 
 </P><PRE
 CLASS="PROGRAMLISTING"
->SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
- percentile_disc
+>SELECT percentile_cont(0.5) WITHIN GROUP (ORDER BY income) FROM households;
+ percentile_cont
 -----------------
            50489</PRE
 ><P>
@@ -2335,7 +2339,11 @@
     of a <TT
 CLASS="COMMAND"
 >SELECT</TT
-> list.  For example, if table <TT
+> list (see <A
+HREF="rowtypes.html#ROWTYPES-USAGE"
+>Section 8.16.5</A
+>).
+    For example, if table <TT
 CLASS="LITERAL"
 >t</TT
 > has
@@ -2366,12 +2374,12 @@
      <TT
 CLASS="LITERAL"
 >.*</TT
-> syntax was not expanded, so that writing
-     <TT
+> syntax was not expanded in row constructors, so
+     that writing <TT
 CLASS="LITERAL"
 >ROW(t.*, 42)</TT
-> created a two-field row whose first field
-     was another row value.  The new behavior is usually more useful.
+> created a two-field row whose first
+     field was another row value.  The new behavior is usually more useful.
      If you need the old behavior of nested row values, write the inner
      row value without <TT
 CLASS="LITERAL"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-fetch.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-fetch.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-fetch.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-fetch.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN84104"
+NAME="AEN84434"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN84107"
+NAME="AEN84437"
 ></A
 ><H2
 >Synopsis</H2
@@ -177,7 +177,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84118"
+NAME="AEN84448"
 ></A
 ><H2
 >Description</H2
@@ -295,7 +295,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84146"
+NAME="AEN84476"
 ></A
 ><H2
 >Parameters</H2
@@ -658,7 +658,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84270"
+NAME="AEN84600"
 ></A
 ><H2
 >Outputs</H2
@@ -698,7 +698,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84279"
+NAME="AEN84609"
 ></A
 ><H2
 >Notes</H2
@@ -764,7 +764,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84295"
+NAME="AEN84625"
 ></A
 ><H2
 >Examples</H2
@@ -804,7 +804,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84299"
+NAME="AEN84629"
 ></A
 ><H2
 >Compatibility</H2
@@ -876,7 +876,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84318"
+NAME="AEN84648"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-grant.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-grant.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-grant.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-grant.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN84334"
+NAME="AEN84664"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN84337"
+NAME="AEN84667"
 ></A
 ><H2
 >Synopsis</H2
@@ -1303,7 +1303,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84614"
+NAME="AEN84944"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Conclusion"
@@ -23,7 +23,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="PART"
 ><DIV
@@ -41,7 +41,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -291,6 +291,11 @@
 HREF="dml-delete.html"
 >Deleting Data</A
 ></DT
+><DT
+>6.4. <A
+HREF="dml-returning.html"
+>Returning Data From Modified Rows</A
+></DT
 ></DL
 ></DD
 ><DT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-importforeignschema.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-importforeignschema.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-importforeignschema.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-importforeignschema.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN84628"
+NAME="AEN84958"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN84631"
+NAME="AEN84961"
 ></A
 ><H2
 >Synopsis</H2
@@ -185,7 +185,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84648"
+NAME="AEN84978"
 ></A
 ><H2
 >Parameters</H2
@@ -361,7 +361,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84703"
+NAME="AEN85033"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-insert.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-insert.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-insert.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-insert.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN84717"
+NAME="AEN85047"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN84720"
+NAME="AEN85050"
 ></A
 ><H2
 >Synopsis</H2
@@ -269,7 +269,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84749"
+NAME="AEN85079"
 ></A
 ><H2
 >Description</H2
@@ -453,7 +453,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84791"
+NAME="AEN85121"
 ></A
 ><H2
 >Parameters</H2
@@ -602,8 +602,8 @@
         the table's name in the specification of a target column.  For
         example, <TT
 CLASS="LITERAL"
->INSERT ... ON CONFLICT DO UPDATE tab SET
-        table_name.col = 1</TT
+>INSERT INTO table_name ... ON CONFLICT DO UPDATE
+        SET table_name.col = 1</TT
 > is invalid (this follows the general
         behavior for <TT
 CLASS="COMMAND"
@@ -779,7 +779,7 @@
     expressions, and an optional <TT
 CLASS="REPLACEABLE"
 ><I
->    index_predicate</I
+>index_predicate</I
 ></TT
 >.  All <TT
 CLASS="REPLACEABLE"
@@ -1239,7 +1239,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85004"
+NAME="AEN85334"
 ></A
 ><H2
 >Outputs</H2
@@ -1315,7 +1315,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85021"
+NAME="AEN85351"
 ></A
 ><H2
 >Examples</H2
@@ -1534,7 +1534,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85067"
+NAME="AEN85397"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-keywords-appendix.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-keywords-appendix.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-keywords-appendix.html	2016-03-28 20:21:08.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-keywords-appendix.html	2017-08-07 21:32:38.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Appendixes"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="APPENDIX"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -106,7 +106,7 @@
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
 >
-  9.5.2.  Background information can be found in <A
+  9.5.8.  Background information can be found in <A
 HREF="sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS"
 >Section 4.1.1</A
 >.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-listen.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-listen.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-listen.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-listen.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85088"
+NAME="AEN85418"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85091"
+NAME="AEN85421"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85094"
+NAME="AEN85424"
 ></A
 ><H2
 >Description</H2
@@ -215,7 +215,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85117"
+NAME="AEN85447"
 ></A
 ><H2
 >Parameters</H2
@@ -242,7 +242,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85125"
+NAME="AEN85455"
 ></A
 ><H2
 >Notes</H2
@@ -272,7 +272,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85133"
+NAME="AEN85463"
 ></A
 ><H2
 >Examples</H2
@@ -293,7 +293,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85138"
+NAME="AEN85468"
 ></A
 ><H2
 >Compatibility</H2
@@ -308,7 +308,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85142"
+NAME="AEN85472"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-load.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-load.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-load.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-load.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85156"
+NAME="AEN85486"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85159"
+NAME="AEN85489"
 ></A
 ><H2
 >Synopsis</H2
@@ -198,7 +198,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85184"
+NAME="AEN85514"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-lock.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-lock.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-lock.html	2016-03-28 20:20:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-lock.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85195"
+NAME="AEN85525"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85198"
+NAME="AEN85528"
 ></A
 ><H2
 >Synopsis</H2
@@ -140,7 +140,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85204"
+NAME="AEN85534"
 ></A
 ><H2
 >Description</H2
@@ -299,7 +299,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85240"
+NAME="AEN85570"
 ></A
 ><H2
 >Parameters</H2
@@ -394,7 +394,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85269"
+NAME="AEN85599"
 ></A
 ><H2
 >Notes</H2
@@ -508,7 +508,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85298"
+NAME="AEN85628"
 ></A
 ><H2
 >Examples</H2
@@ -551,7 +551,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85306"
+NAME="AEN85636"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-move.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-move.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-move.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-move.html	2017-08-07 21:32:24.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85330"
+NAME="AEN85660"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85333"
+NAME="AEN85663"
 ></A
 ><H2
 >Synopsis</H2
@@ -177,7 +177,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85344"
+NAME="AEN85674"
 ></A
 ><H2
 >Description</H2
@@ -214,7 +214,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85354"
+NAME="AEN85684"
 ></A
 ><H2
 >Outputs</H2
@@ -249,7 +249,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85362"
+NAME="AEN85692"
 ></A
 ><H2
 >Examples</H2
@@ -276,7 +276,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85365"
+NAME="AEN85695"
 ></A
 ><H2
 >Compatibility</H2
@@ -290,7 +290,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85369"
+NAME="AEN85699"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-notify.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-notify.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-notify.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-notify.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85385"
+NAME="AEN85715"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85388"
+NAME="AEN85718"
 ></A
 ><H2
 >Synopsis</H2
@@ -124,7 +124,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85392"
+NAME="AEN85722"
 ></A
 ><H2
 >Description</H2
@@ -286,7 +286,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85424"
+NAME="AEN85754"
 ></A
 ><H2
 >Parameters</H2
@@ -332,7 +332,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85438"
+NAME="AEN85768"
 ></A
 ><H2
 >Notes</H2
@@ -364,7 +364,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN85445"
+NAME="AEN85775"
 ></A
 ><H3
 >pg_notify</H3
@@ -396,7 +396,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85455"
+NAME="AEN85785"
 ></A
 ><H2
 >Examples</H2
@@ -423,7 +423,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85460"
+NAME="AEN85790"
 ></A
 ><H2
 >Compatibility</H2
@@ -438,7 +438,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85464"
+NAME="AEN85794"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-prepare.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-prepare.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-prepare.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-prepare.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85481"
+NAME="AEN85811"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85484"
+NAME="AEN85814"
 ></A
 ><H2
 >Synopsis</H2
@@ -129,7 +129,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85489"
+NAME="AEN85819"
 ></A
 ><H2
 >Description</H2
@@ -206,7 +206,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85504"
+NAME="AEN85834"
 ></A
 ><H2
 >Parameters</H2
@@ -290,7 +290,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85530"
+NAME="AEN85860"
 ></A
 ><H2
 >Notes</H2
@@ -429,7 +429,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85559"
+NAME="AEN85889"
 ></A
 ><H2
 >Compatibility</H2
@@ -449,7 +449,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85564"
+NAME="AEN85894"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-prepare-transaction.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-prepare-transaction.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-prepare-transaction.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-prepare-transaction.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85578"
+NAME="AEN85908"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85581"
+NAME="AEN85911"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85584"
+NAME="AEN85914"
 ></A
 ><H2
 >Description</H2
@@ -175,7 +175,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85597"
+NAME="AEN85927"
 ></A
 ><H2
 >Parameters</H2
@@ -212,7 +212,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85607"
+NAME="AEN85937"
 ></A
 ><H2
 >Notes</H2
@@ -372,7 +372,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85642"
+NAME="AEN85972"
 ></A
 ><H2
 >Compatibility</H2
@@ -393,7 +393,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85647"
+NAME="AEN85977"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-reassign-owned.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-reassign-owned.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-reassign-owned.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-reassign-owned.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85661"
+NAME="AEN85991"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85664"
+NAME="AEN85994"
 ></A
 ><H2
 >Synopsis</H2
@@ -125,7 +125,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85668"
+NAME="AEN85998"
 ></A
 ><H2
 >Description</H2
@@ -152,7 +152,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85674"
+NAME="AEN86004"
 ></A
 ><H2
 >Parameters</H2
@@ -200,7 +200,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85688"
+NAME="AEN86018"
 ></A
 ><H2
 >Notes</H2
@@ -258,7 +258,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85703"
+NAME="AEN86033"
 ></A
 ><H2
 >Compatibility</H2
@@ -276,7 +276,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85708"
+NAME="AEN86038"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-refreshmaterializedview.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-refreshmaterializedview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-refreshmaterializedview.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-refreshmaterializedview.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85724"
+NAME="AEN86054"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85727"
+NAME="AEN86057"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85730"
+NAME="AEN86060"
 ></A
 ><H2
 >Description</H2
@@ -156,7 +156,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85739"
+NAME="AEN86069"
 ></A
 ><H2
 >Parameters</H2
@@ -222,7 +222,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85758"
+NAME="AEN86088"
 ></A
 ><H2
 >Notes</H2
@@ -247,7 +247,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85764"
+NAME="AEN86094"
 ></A
 ><H2
 >Examples</H2
@@ -278,7 +278,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85772"
+NAME="AEN86102"
 ></A
 ><H2
 >Compatibility</H2
@@ -296,7 +296,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85777"
+NAME="AEN86107"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-reindex.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-reindex.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-reindex.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-reindex.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85793"
+NAME="AEN86123"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85796"
+NAME="AEN86126"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85799"
+NAME="AEN86129"
 ></A
 ><H2
 >Description</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85823"
+NAME="AEN86153"
 ></A
 ><H2
 >Parameters</H2
@@ -332,7 +332,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85868"
+NAME="AEN86198"
 ></A
 ><H2
 >Notes</H2
@@ -460,7 +460,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85895"
+NAME="AEN86225"
 ></A
 ><H2
 >Examples</H2
@@ -505,7 +505,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85906"
+NAME="AEN86236"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-release-savepoint.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-release-savepoint.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-release-savepoint.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-release-savepoint.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85920"
+NAME="AEN86250"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85923"
+NAME="AEN86253"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85926"
+NAME="AEN86256"
 ></A
 ><H2
 >Description</H2
@@ -153,7 +153,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85934"
+NAME="AEN86264"
 ></A
 ><H2
 >Parameters</H2
@@ -180,7 +180,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85942"
+NAME="AEN86272"
 ></A
 ><H2
 >Notes</H2
@@ -199,7 +199,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85947"
+NAME="AEN86277"
 ></A
 ><H2
 >Examples</H2
@@ -220,7 +220,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85951"
+NAME="AEN86281"
 ></A
 ><H2
 >Compatibility</H2
@@ -243,7 +243,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85957"
+NAME="AEN86287"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-reset.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-reset.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-reset.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-reset.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN85977"
+NAME="AEN86307"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85980"
+NAME="AEN86310"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85983"
+NAME="AEN86313"
 ></A
 ><H2
 >Description</H2
@@ -183,7 +183,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85998"
+NAME="AEN86328"
 ></A
 ><H2
 >Parameters</H2
@@ -228,7 +228,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86013"
+NAME="AEN86343"
 ></A
 ><H2
 >Examples</H2
@@ -245,7 +245,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86018"
+NAME="AEN86348"
 ></A
 ><H2
 >Compatibility</H2
@@ -262,7 +262,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86023"
+NAME="AEN86353"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-revoke.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-revoke.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-revoke.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-revoke.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN86037"
+NAME="AEN86367"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN86040"
+NAME="AEN86370"
 ></A
 ><H2
 >Synopsis</H2
@@ -722,7 +722,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86159"
+NAME="AEN86489"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-rollback.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-rollback.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-rollback.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-rollback.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN86170"
+NAME="AEN86500"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN86173"
+NAME="AEN86503"
 ></A
 ><H2
 >Synopsis</H2
@@ -114,7 +114,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86175"
+NAME="AEN86505"
 ></A
 ><H2
 >Description</H2
@@ -129,7 +129,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86179"
+NAME="AEN86509"
 ></A
 ><H2
 >Parameters</H2
@@ -157,7 +157,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86189"
+NAME="AEN86519"
 ></A
 ><H2
 >Notes</H2
@@ -179,7 +179,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86195"
+NAME="AEN86525"
 ></A
 ><H2
 >Examples</H2
@@ -193,7 +193,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86199"
+NAME="AEN86529"
 ></A
 ><H2
 >Compatibility</H2
@@ -212,7 +212,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86204"
+NAME="AEN86534"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-rollback-prepared.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-rollback-prepared.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-rollback-prepared.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-rollback-prepared.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN86220"
+NAME="AEN86550"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN86223"
+NAME="AEN86553"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86226"
+NAME="AEN86556"
 ></A
 ><H2
 >Description</H2
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86230"
+NAME="AEN86560"
 ></A
 ><H2
 >Parameters</H2
@@ -162,7 +162,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86238"
+NAME="AEN86568"
 ></A
 ><H2
 >Notes</H2
@@ -209,7 +209,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86250"
+NAME="AEN86580"
 ></A
 ><H2
 >Compatibility</H2
@@ -230,7 +230,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86255"
+NAME="AEN86585"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-rollback-to.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-rollback-to.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-rollback-to.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-rollback-to.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN86272"
+NAME="AEN86602"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN86275"
+NAME="AEN86605"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86278"
+NAME="AEN86608"
 ></A
 ><H2
 >Description</H2
@@ -139,7 +139,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86283"
+NAME="AEN86613"
 ></A
 ><H2
 >Parameters</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86291"
+NAME="AEN86621"
 ></A
 ><H2
 >Notes</H2
@@ -222,7 +222,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86303"
+NAME="AEN86633"
 ></A
 ><H2
 >Examples</H2
@@ -265,7 +265,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86310"
+NAME="AEN86640"
 ></A
 ><H2
 >Compatibility</H2
@@ -310,7 +310,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86322"
+NAME="AEN86652"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-savepoint.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-savepoint.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-savepoint.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-savepoint.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN86345"
+NAME="AEN86675"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN86348"
+NAME="AEN86678"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86351"
+NAME="AEN86681"
 ></A
 ><H2
 >Description</H2
@@ -139,7 +139,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86356"
+NAME="AEN86686"
 ></A
 ><H2
 >Parameters</H2
@@ -166,7 +166,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86364"
+NAME="AEN86694"
 ></A
 ><H2
 >Notes</H2
@@ -190,7 +190,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86370"
+NAME="AEN86700"
 ></A
 ><H2
 >Examples</H2
@@ -226,7 +226,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86376"
+NAME="AEN86706"
 ></A
 ><H2
 >Compatibility</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86384"
+NAME="AEN86714"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-security-label.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-security-label.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-security-label.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-security-label.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN86404"
+NAME="AEN86734"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN86407"
+NAME="AEN86737"
 ></A
 ><H2
 >Synopsis</H2
@@ -315,7 +315,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86444"
+NAME="AEN86774"
 ></A
 ><H2
 >Description</H2
@@ -369,7 +369,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86455"
+NAME="AEN86785"
 ></A
 ><H2
 >Parameters</H2
@@ -546,7 +546,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86516"
+NAME="AEN86846"
 ></A
 ><H2
 >Examples</H2
@@ -562,7 +562,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86520"
+NAME="AEN86850"
 ></A
 ><H2
 >Compatibility</H2
@@ -576,7 +576,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86524"
+NAME="AEN86854"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-select.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-select.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-select.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-select.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN86543"
+NAME="AEN86873"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN86548"
+NAME="AEN86878"
 ></A
 ><H2
 >Synopsis</H2
@@ -514,7 +514,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86621"
+NAME="AEN86951"
 ></A
 ><H2
 >Description</H2
@@ -870,7 +870,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86705"
+NAME="AEN87035"
 ></A
 ><H2
 >Parameters</H2
@@ -1295,7 +1295,7 @@
 CLASS="LITERAL"
 >REPEATABLE</TT
 > is not given then a new random
-        sample is selected for each query.
+        seed is selected for each query.
         Note that some add-on sampling methods do not
         accept <TT
 CLASS="LITERAL"
@@ -1742,7 +1742,7 @@
 ></DT
 ><DD
 ><P
-><TT
+>        <TT
 CLASS="LITERAL"
 >NATURAL</TT
 > is shorthand for a
@@ -1750,7 +1750,15 @@
 CLASS="LITERAL"
 >USING</TT
 > list that mentions all columns in the two
-        tables that have the same names.
+        tables that have matching names.  If there are no common
+        column names, <TT
+CLASS="LITERAL"
+>NATURAL</TT
+> is equivalent
+        to <TT
+CLASS="LITERAL"
+>ON TRUE</TT
+>.
        </P
 ></DD
 ><DT
@@ -4267,7 +4275,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87524"
+NAME="AEN87856"
 ></A
 ><H2
 >Examples</H2
@@ -4560,7 +4568,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87566"
+NAME="AEN87898"
 ></A
 ><H2
 >Compatibility</H2
@@ -4575,7 +4583,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87570"
+NAME="AEN87902"
 ></A
 ><H3
 >Omitted <TT
@@ -4636,7 +4644,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87584"
+NAME="AEN87916"
 ></A
 ><H3
 >Empty <TT
@@ -4664,7 +4672,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87591"
+NAME="AEN87923"
 ></A
 ><H3
 >Omitting the <TT
@@ -4713,7 +4721,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87603"
+NAME="AEN87935"
 ></A
 ><H3
 ><TT
@@ -4760,7 +4768,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87616"
+NAME="AEN87948"
 ></A
 ><H3
 ><TT
@@ -4782,7 +4790,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87622"
+NAME="AEN87954"
 ></A
 ><H3
 >Function Calls in <TT
@@ -4860,7 +4868,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87641"
+NAME="AEN87973"
 ></A
 ><H3
 >Namespace Available to <TT
@@ -4914,7 +4922,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87654"
+NAME="AEN87986"
 ></A
 ><H3
 >Functional Dependencies</H3
@@ -4938,7 +4946,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87660"
+NAME="AEN87992"
 ></A
 ><H3
 ><TT
@@ -4963,7 +4971,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87666"
+NAME="AEN87998"
 ></A
 ><H3
 ><TT
@@ -5021,7 +5029,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87680"
+NAME="AEN88012"
 ></A
 ><H3
 ><TT
@@ -5081,7 +5089,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87697"
+NAME="AEN88029"
 ></A
 ><H3
 >Data-Modifying Statements in <TT
@@ -5112,7 +5120,7 @@
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN87706"
+NAME="AEN88038"
 ></A
 ><H3
 >Nonstandard Clauses</H3
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-selectinto.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-selectinto.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-selectinto.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-selectinto.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN87719"
+NAME="AEN88051"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN87722"
+NAME="AEN88054"
 ></A
 ><H2
 >Synopsis</H2
@@ -218,7 +218,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87742"
+NAME="AEN88074"
 ></A
 ><H2
 >Description</H2
@@ -242,7 +242,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87748"
+NAME="AEN88080"
 ></A
 ><H2
 >Parameters</H2
@@ -306,7 +306,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87771"
+NAME="AEN88103"
 ></A
 ><H2
 >Notes</H2
@@ -369,7 +369,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87788"
+NAME="AEN88120"
 ></A
 ><H2
 >Examples</H2
@@ -391,7 +391,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87794"
+NAME="AEN88126"
 ></A
 ><H2
 >Compatibility</H2
@@ -434,7 +434,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87805"
+NAME="AEN88137"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-set-constraints.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-set-constraints.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-set-constraints.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-set-constraints.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88010"
+NAME="AEN88342"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN88013"
+NAME="AEN88345"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88016"
+NAME="AEN88348"
 ></A
 ><H2
 >Description</H2
@@ -267,7 +267,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88052"
+NAME="AEN88384"
 ></A
 ><H2
 >Notes</H2
@@ -295,7 +295,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88058"
+NAME="AEN88390"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-set.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-set.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-set.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-set.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN87817"
+NAME="AEN88149"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN87820"
+NAME="AEN88152"
 ></A
 ><H2
 >Synopsis</H2
@@ -135,7 +135,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87826"
+NAME="AEN88158"
 ></A
 ><H2
 >Description</H2
@@ -280,7 +280,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87861"
+NAME="AEN88193"
 ></A
 ><H2
 >Parameters</H2
@@ -604,7 +604,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87969"
+NAME="AEN88301"
 ></A
 ><H2
 >Notes</H2
@@ -634,7 +634,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87977"
+NAME="AEN88309"
 ></A
 ><H2
 >Examples</H2
@@ -677,7 +677,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87989"
+NAME="AEN88321"
 ></A
 ><H2
 >Compatibility</H2
@@ -704,7 +704,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87996"
+NAME="AEN88328"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-set-role.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-set-role.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-set-role.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-set-role.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88072"
+NAME="AEN88404"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN88075"
+NAME="AEN88407"
 ></A
 ><H2
 >Synopsis</H2
@@ -121,7 +121,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88078"
+NAME="AEN88410"
 ></A
 ><H2
 >Description</H2
@@ -180,7 +180,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88092"
+NAME="AEN88424"
 ></A
 ><H2
 >Notes</H2
@@ -270,7 +270,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88115"
+NAME="AEN88447"
 ></A
 ><H2
 >Examples</H2
@@ -293,7 +293,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88118"
+NAME="AEN88450"
 ></A
 ><H2
 >Compatibility</H2
@@ -333,7 +333,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88128"
+NAME="AEN88460"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-set-session-authorization.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-set-session-authorization.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-set-session-authorization.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-set-session-authorization.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88140"
+NAME="AEN88472"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN88143"
+NAME="AEN88475"
 ></A
 ><H2
 >Synopsis</H2
@@ -121,7 +121,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88146"
+NAME="AEN88478"
 ></A
 ><H2
 >Description</H2
@@ -190,7 +190,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88162"
+NAME="AEN88494"
 ></A
 ><H2
 >Notes</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88167"
+NAME="AEN88499"
 ></A
 ><H2
 >Examples</H2
@@ -231,7 +231,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88170"
+NAME="AEN88502"
 ></A
 ><H2
 >Compatibility</H2
@@ -281,7 +281,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88182"
+NAME="AEN88514"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-set-transaction.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-set-transaction.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-set-transaction.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-set-transaction.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88203"
+NAME="AEN88535"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN88206"
+NAME="AEN88538"
 ></A
 ><H2
 >Synopsis</H2
@@ -148,7 +148,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88213"
+NAME="AEN88545"
 ></A
 ><H2
 >Description</H2
@@ -435,7 +435,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88287"
+NAME="AEN88619"
 ></A
 ><H2
 >Notes</H2
@@ -513,7 +513,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88307"
+NAME="AEN88639"
 ></A
 ><H2
 >Examples</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-show.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-show.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-show.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-show.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88336"
+NAME="AEN88668"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN88339"
+NAME="AEN88671"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88342"
+NAME="AEN88674"
 ></A
 ><H2
 >Description</H2
@@ -162,7 +162,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88353"
+NAME="AEN88685"
 ></A
 ><H2
 >Parameters</H2
@@ -274,7 +274,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88394"
+NAME="AEN88726"
 ></A
 ><H2
 >Notes</H2
@@ -302,7 +302,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88401"
+NAME="AEN88733"
 ></A
 ><H2
 >Examples</H2
@@ -354,7 +354,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88411"
+NAME="AEN88743"
 ></A
 ><H2
 >Compatibility</H2
@@ -372,7 +372,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88416"
+NAME="AEN88748"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-start-transaction.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-start-transaction.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-start-transaction.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-start-transaction.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88430"
+NAME="AEN88762"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN88433"
+NAME="AEN88765"
 ></A
 ><H2
 >Synopsis</H2
@@ -136,7 +136,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88438"
+NAME="AEN88770"
 ></A
 ><H2
 >Description</H2
@@ -156,7 +156,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88443"
+NAME="AEN88775"
 ></A
 ><H2
 >Parameters</H2
@@ -171,7 +171,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88447"
+NAME="AEN88779"
 ></A
 ><H2
 >Compatibility</H2
@@ -242,7 +242,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88465"
+NAME="AEN88797"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-syntax-calling-funcs.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-syntax-calling-funcs.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-syntax-calling-funcs.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-syntax-calling-funcs.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Syntax"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-syntax.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-syntax.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-syntax.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-syntax.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-syntax-lexical.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-syntax-lexical.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-syntax-lexical.html	2016-03-28 20:20:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-syntax-lexical.html	2017-08-07 21:31:59.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Syntax"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-truncate.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-truncate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-truncate.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-truncate.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88485"
+NAME="AEN88817"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN88488"
+NAME="AEN88820"
 ></A
 ><H2
 >Synopsis</H2
@@ -120,7 +120,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88491"
+NAME="AEN88823"
 ></A
 ><H2
 >Description</H2
@@ -145,7 +145,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88497"
+NAME="AEN88829"
 ></A
 ><H2
 >Parameters</H2
@@ -233,7 +233,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88529"
+NAME="AEN88861"
 ></A
 ><H2
 >Notes</H2
@@ -375,7 +375,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88562"
+NAME="AEN88894"
 ></A
 ><H2
 >Examples</H2
@@ -421,7 +421,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88574"
+NAME="AEN88906"
 ></A
 ><H2
 >Compatibility</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-unlisten.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-unlisten.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-unlisten.html	2016-03-28 20:20:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-unlisten.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88589"
+NAME="AEN88921"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN88592"
+NAME="AEN88924"
 ></A
 ><H2
 >Synopsis</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88595"
+NAME="AEN88927"
 ></A
 ><H2
 >Description</H2
@@ -171,7 +171,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88608"
+NAME="AEN88940"
 ></A
 ><H2
 >Parameters</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88621"
+NAME="AEN88953"
 ></A
 ><H2
 >Notes</H2
@@ -234,7 +234,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88628"
+NAME="AEN88960"
 ></A
 ><H2
 >Examples</H2
@@ -268,7 +268,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88636"
+NAME="AEN88968"
 ></A
 ><H2
 >Compatibility</H2
@@ -282,7 +282,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88640"
+NAME="AEN88972"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-update.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-update.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-update.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-update.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88654"
+NAME="AEN88986"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN88657"
+NAME="AEN88989"
 ></A
 ><H2
 >Synopsis</H2
@@ -192,7 +192,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88673"
+NAME="AEN89005"
 ></A
 ><H2
 >Description</H2
@@ -270,7 +270,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88691"
+NAME="AEN89023"
 ></A
 ><H2
 >Parameters</H2
@@ -380,7 +380,7 @@
       specification of a target column &mdash; for example,
       <TT
 CLASS="LITERAL"
->UPDATE tab SET tab.col = 1</TT
+>UPDATE table_name SET table_name.col = 1</TT
 > is invalid.
      </P
 ></DD
@@ -573,7 +573,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88784"
+NAME="AEN89116"
 ></A
 ><H2
 >Outputs</H2
@@ -641,7 +641,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88799"
+NAME="AEN89131"
 ></A
 ><H2
 >Notes</H2
@@ -677,7 +677,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88806"
+NAME="AEN89138"
 ></A
 ><H2
 >Examples</H2
@@ -846,7 +846,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88844"
+NAME="AEN89176"
 ></A
 ><H2
 >Compatibility</H2
@@ -900,7 +900,7 @@
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
 > only allows the source
-   value to be a parenthesized list of expressions (a row constructor) or a
+   value to be a parenthesized list of expressions or a
    sub-<TT
 CLASS="LITERAL"
 >SELECT</TT
@@ -908,7 +908,7 @@
    specified as <TT
 CLASS="LITERAL"
 >DEFAULT</TT
-> in the row-constructor case, but not
+> in the list-of-expressions case, but not
    inside a sub-<TT
 CLASS="LITERAL"
 >SELECT</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-vacuum.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-vacuum.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-vacuum.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-vacuum.html	2017-08-07 21:32:25.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88870"
+NAME="AEN89202"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN88873"
+NAME="AEN89205"
 ></A
 ><H2
 >Synopsis</H2
@@ -141,7 +141,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88880"
+NAME="AEN89212"
 ></A
 ><H2
 >Description</H2
@@ -231,7 +231,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88901"
+NAME="AEN89233"
 ></A
 ><H2
 >Parameters</H2
@@ -349,7 +349,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88942"
+NAME="AEN89274"
 ></A
 ><H2
 >Outputs</H2
@@ -368,7 +368,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88947"
+NAME="AEN89279"
 ></A
 ><H2
 >Notes</H2
@@ -476,54 +476,26 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88973"
+NAME="AEN89305"
 ></A
 ><H2
 >Examples</H2
 ><P
->   The following is an example from running <TT
-CLASS="COMMAND"
->VACUUM</TT
-> on a
-   table in the regression database:
+>   To clean a single table <TT
+CLASS="LITERAL"
+>onek</TT
+>, analyze it for
+   the optimizer and print a detailed vacuum activity report:
 
 </P><PRE
 CLASS="PROGRAMLISTING"
->regression=# VACUUM (VERBOSE, ANALYZE) onek;
-INFO:  vacuuming "public.onek"
-INFO:  index "onek_unique1" now contains 1000 tuples in 14 pages
-DETAIL:  3000 index tuples were removed.
-0 index pages have been deleted, 0 are currently reusable.
-CPU 0.01s/0.08u sec elapsed 0.18 sec.
-INFO:  index "onek_unique2" now contains 1000 tuples in 16 pages
-DETAIL:  3000 index tuples were removed.
-0 index pages have been deleted, 0 are currently reusable.
-CPU 0.00s/0.07u sec elapsed 0.23 sec.
-INFO:  index "onek_hundred" now contains 1000 tuples in 13 pages
-DETAIL:  3000 index tuples were removed.
-0 index pages have been deleted, 0 are currently reusable.
-CPU 0.01s/0.08u sec elapsed 0.17 sec.
-INFO:  index "onek_stringu1" now contains 1000 tuples in 48 pages
-DETAIL:  3000 index tuples were removed.
-0 index pages have been deleted, 0 are currently reusable.
-CPU 0.01s/0.09u sec elapsed 0.59 sec.
-INFO:  "onek": removed 3000 tuples in 108 pages
-DETAIL:  CPU 0.01s/0.06u sec elapsed 0.07 sec.
-INFO:  "onek": found 3000 removable, 1000 nonremovable tuples in 143 pages
-DETAIL:  0 dead tuples cannot be removed yet.
-There were 0 unused item pointers.
-Skipped 0 pages due to buffer pins.
-0 pages are entirely empty.
-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</PRE
+>VACUUM (VERBOSE, ANALYZE) onek;</PRE
 ><P></P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88978"
+NAME="AEN89310"
 ></A
 ><H2
 >Compatibility</H2
@@ -537,7 +509,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN88982"
+NAME="AEN89314"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sql-values.html postgresql-9.5-9.5.8/doc/src/sgml/html/sql-values.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sql-values.html	2016-03-28 20:20:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sql-values.html	2017-08-07 21:32:26.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Commands"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -95,7 +95,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN88998"
+NAME="AEN89330"
 ></A
 ><H2
 >Name</H2
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN89001"
+NAME="AEN89333"
 ></A
 ><H2
 >Synopsis</H2
@@ -148,7 +148,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89009"
+NAME="AEN89341"
 ></A
 ><H2
 >Description</H2
@@ -214,7 +214,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89026"
+NAME="AEN89358"
 ></A
 ><H2
 >Parameters</H2
@@ -360,7 +360,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89067"
+NAME="AEN89399"
 ></A
 ><H2
 >Notes</H2
@@ -391,7 +391,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89075"
+NAME="AEN89407"
 ></A
 ><H2
 >Examples</H2
@@ -560,7 +560,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89113"
+NAME="AEN89445"
 ></A
 ><H2
 >Compatibility</H2
@@ -589,7 +589,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN89121"
+NAME="AEN89453"
 ></A
 ><H2
 >See Also</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ssh-tunnels.html postgresql-9.5-9.5.8/doc/src/sgml/html/ssh-tunnels.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ssh-tunnels.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ssh-tunnels.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/sslinfo.html postgresql-9.5-9.5.8/doc/src/sgml/html/sslinfo.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/sslinfo.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/sslinfo.html	2017-08-07 21:33:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -119,7 +119,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174144"
+NAME="AEN179001"
 >F.35.1. Functions Provided</A
 ></H2
 ><P
@@ -318,7 +318,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174221"
+NAME="AEN179078"
 >F.35.2. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/ssl-tcp.html postgresql-9.5-9.5.8/doc/src/sgml/html/ssl-tcp.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/ssl-tcp.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/ssl-tcp.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/standby-settings.html postgresql-9.5-9.5.8/doc/src/sgml/html/standby-settings.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/standby-settings.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/standby-settings.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Recovery Configuration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/storage-file-layout.html postgresql-9.5-9.5.8/doc/src/sgml/html/storage-file-layout.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/storage-file-layout.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/storage-file-layout.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Physical Storage"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/storage-fsm.html postgresql-9.5-9.5.8/doc/src/sgml/html/storage-fsm.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/storage-fsm.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/storage-fsm.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Physical Storage"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/storage.html postgresql-9.5-9.5.8/doc/src/sgml/html/storage.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/storage.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/storage.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/storage-init.html postgresql-9.5-9.5.8/doc/src/sgml/html/storage-init.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/storage-init.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/storage-init.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Physical Storage"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/storage-page-layout.html postgresql-9.5-9.5.8/doc/src/sgml/html/storage-page-layout.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/storage-page-layout.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/storage-page-layout.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Physical Storage"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -101,8 +101,8 @@
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
 > tables and indexes.<A
-NAME="AEN115022"
-HREF="#FTN.AEN115022"
+NAME="AEN115391"
+HREF="#FTN.AEN115391"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
@@ -670,8 +670,8 @@
 VALIGN="TOP"
 WIDTH="5%"
 ><A
-NAME="FTN.AEN115022"
-HREF="storage-page-layout.html#AEN115022"
+NAME="FTN.AEN115391"
+HREF="storage-page-layout.html#AEN115391"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/storage-toast.html postgresql-9.5-9.5.8/doc/src/sgml/html/storage-toast.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/storage-toast.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/storage-toast.html	2017-08-07 21:32:33.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Physical Storage"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/storage-vm.html postgresql-9.5-9.5.8/doc/src/sgml/html/storage-vm.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/storage-vm.html	2016-03-28 20:21:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/storage-vm.html	2017-08-07 21:32:34.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Database Physical Storage"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/supported-platforms.html postgresql-9.5-9.5.8/doc/src/sgml/html/supported-platforms.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/supported-platforms.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/supported-platforms.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="  Installation from Source Code"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -106,7 +106,7 @@
    on that platform.  Currently, most testing of platform compatibility
    is done automatically by test machines in the
    <A
-HREF="http://buildfarm.postgresql.org/"
+HREF="https://buildfarm.postgresql.org/"
 TARGET="_top"
 >PostgreSQL Build Farm</A
 >.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tablefunc.html postgresql-9.5-9.5.8/doc/src/sgml/html/tablefunc.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tablefunc.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tablefunc.html	2017-08-07 21:33:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -109,13 +109,13 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174233"
+NAME="AEN179090"
 >F.36.1. Functions Provided</A
 ></H2
 ><P
 >   <A
 HREF="tablefunc.html#TABLEFUNC-FUNCTIONS"
->Table F-29</A
+>Table F-31</A
 > shows the functions provided
    by the <TT
 CLASS="FILENAME"
@@ -129,7 +129,7 @@
 ></A
 ><P
 ><B
->Table F-29. <TT
+>Table F-31. <TT
 CLASS="FILENAME"
 >tablefunc</TT
 > Functions</B
@@ -323,7 +323,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN174302"
+NAME="AEN179159"
 >F.36.1.1. <CODE
 CLASS="FUNCTION"
 >normal_rand</CODE
@@ -381,7 +381,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN174316"
+NAME="AEN179173"
 >F.36.1.2. <CODE
 CLASS="FUNCTION"
 >crosstab(text)</CODE
@@ -606,7 +606,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN174362"
+NAME="AEN179219"
 >F.36.1.3. <CODE
 CLASS="FUNCTION"
 >crosstab<TT
@@ -791,7 +791,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN174403"
+NAME="AEN179260"
 >F.36.1.4. <CODE
 CLASS="FUNCTION"
 >crosstab(text, text)</CODE
@@ -1139,7 +1139,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN174471"
+NAME="AEN179328"
 >F.36.1.5. <CODE
 CLASS="FUNCTION"
 >connectby</CODE
@@ -1166,7 +1166,7 @@
 ><P
 >    <A
 HREF="tablefunc.html#TABLEFUNC-CONNECTBY-PARAMETERS"
->Table F-30</A
+>Table F-32</A
 > explains the
     parameters.
    </P
@@ -1177,7 +1177,7 @@
 ></A
 ><P
 ><B
->Table F-30. <CODE
+>Table F-32. <CODE
 CLASS="FUNCTION"
 >connectby</CODE
 > Parameters</B
@@ -1454,7 +1454,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174550"
+NAME="AEN179407"
 >F.36.2. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tablesample-method.html postgresql-9.5-9.5.8/doc/src/sgml/html/tablesample-method.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tablesample-method.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tablesample-method.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Internals"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tablesample-support-functions.html postgresql-9.5-9.5.8/doc/src/sgml/html/tablesample-support-functions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tablesample-support-functions.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tablesample-support-functions.html	2017-08-07 21:32:32.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Writing A Table Sampling Method"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tcn.html postgresql-9.5-9.5.8/doc/src/sgml/html/tcn.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tcn.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tcn.html	2017-08-07 21:33:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/test-decoding.html postgresql-9.5-9.5.8/doc/src/sgml/html/test-decoding.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/test-decoding.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/test-decoding.html	2017-08-07 21:33:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-configuration.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-configuration.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-configuration.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-configuration.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-controls.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-controls.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-controls.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-controls.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-debugging.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-debugging.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-debugging.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-debugging.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-dictionaries.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-dictionaries.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-dictionaries.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-dictionaries.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-features.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-features.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-features.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-features.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-indexes.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-indexes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-indexes.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-indexes.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-intro.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-intro.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-limitations.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-limitations.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-limitations.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-limitations.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-migration.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-migration.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-migration.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-migration.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-parsers.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-parsers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-parsers.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-parsers.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-psql.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-psql.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-psql.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-psql.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-tables.html postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-tables.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/textsearch-tables.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/textsearch-tables.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Full Text Search"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/transaction-iso.html postgresql-9.5-9.5.8/doc/src/sgml/html/transaction-iso.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/transaction-iso.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/transaction-iso.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Concurrency Control"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -873,7 +873,7 @@
 ></SPAN
 > play any part in
     causing a deadlock.  They are used to identify and flag dependencies
-    among concurrent serializable transactions which in certain combinations
+    among concurrent Serializable transactions which in certain combinations
     can lead to serialization anomalies.  In contrast, a Read Committed or
     Repeatable Read transaction which wants to ensure data consistency may
     need to take out a lock on an entire table, which could block other
@@ -942,12 +942,13 @@
    </P
 ><P
 >    Consistent use of Serializable transactions can simplify development.
-    The guarantee that any set of concurrent serializable transactions will
-    have the same effect as if they were run one at a time means that if
-    you can demonstrate that a single transaction, as written, will do the
-    right thing when run by itself, you can have confidence that it will
-    do the right thing in any mix of serializable transactions, even without
-    any information about what those other transactions might do.  It is
+    The guarantee that any set of successfully committed concurrent
+    Serializable transactions will have the same effect as if they were run
+    one at a time means that if you can demonstrate that a single transaction,
+    as written, will do the right thing when run by itself, you can have
+    confidence that it will do the right thing in any mix of Serializable
+    transactions, even without any information about what those other
+    transactions might do, or it will not successfully commit.  It is
     important that an environment which uses this technique have a
     generalized way of handling serialization failures (which always return
     with a SQLSTATE value of '40001'), because it will be very hard to
@@ -967,6 +968,34 @@
     for some environments.
    </P
 ><P
+>    While <SPAN
+CLASS="PRODUCTNAME"
+>PostgreSQL</SPAN
+>'s Serializable transaction isolation
+    level only allows concurrent transactions to commit if it can prove there
+    is a serial order of execution that would produce the same effect, it
+    doesn't always prevent errors from being raised that would not occur in
+    true serial execution.  In particular, it is possible to see unique
+    constraint violations caused by conflicts with overlapping Serializable
+    transactions even after explicitly checking that the key isn't present
+    before attempting to insert it.  This can be avoided by making sure
+    that <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>all</I
+></SPAN
+> Serializable transactions that insert potentially
+    conflicting keys explicitly check if they can do so first.  For example,
+    imagine an application that asks the user for a new key and then checks
+    that it doesn't exist already by trying to select it first, or generates
+    a new key by selecting the maximum existing key and adding one.  If some
+    Serializable transactions insert new keys directly without following this
+    protocol, unique constraints violations might be reported even in cases
+    where they could not occur in a serial execution of the concurrent
+    transactions.
+   </P
+><P
 >    For optimal performance when relying on Serializable transactions for
     concurrency control, these issues should be considered:
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/trigger-datachanges.html postgresql-9.5-9.5.8/doc/src/sgml/html/trigger-datachanges.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/trigger-datachanges.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/trigger-datachanges.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Triggers"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/trigger-definition.html postgresql-9.5-9.5.8/doc/src/sgml/html/trigger-definition.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/trigger-definition.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/trigger-definition.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Triggers"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/trigger-example.html postgresql-9.5-9.5.8/doc/src/sgml/html/trigger-example.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/trigger-example.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/trigger-example.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Triggers"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/trigger-interface.html postgresql-9.5-9.5.8/doc/src/sgml/html/trigger-interface.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/trigger-interface.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/trigger-interface.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Triggers"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/triggers.html postgresql-9.5-9.5.8/doc/src/sgml/html/triggers.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/triggers.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/triggers.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tsearch2.html postgresql-9.5-9.5.8/doc/src/sgml/html/tsearch2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tsearch2.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tsearch2.html	2017-08-07 21:33:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -115,7 +115,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174587"
+NAME="AEN179444"
 >F.39.1. Portability Issues</A
 ></H2
 ><P
@@ -312,7 +312,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174634"
+NAME="AEN179491"
 >F.39.2. Converting a pre-8.3 Installation</A
 ></H2
 ><P
@@ -434,7 +434,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174665"
+NAME="AEN179522"
 >F.39.3. References</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tsm-system-rows.html postgresql-9.5-9.5.8/doc/src/sgml/html/tsm-system-rows.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tsm-system-rows.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tsm-system-rows.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -146,7 +146,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174685"
+NAME="AEN179542"
 >F.40.1. Examples</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tsm-system-time.html postgresql-9.5-9.5.8/doc/src/sgml/html/tsm-system-time.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tsm-system-time.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tsm-system-time.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -148,7 +148,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174711"
+NAME="AEN179568"
 >F.41.1. Examples</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-accessdb.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-accessdb.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-accessdb.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-accessdb.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Getting Started"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -190,7 +190,7 @@
     message:
 </P><PRE
 CLASS="SCREEN"
->psql (9.5.2)
+>psql (9.5.8)
 Type "help" for help.
 
 mydb=&gt;</PRE
@@ -255,7 +255,7 @@
 >
                                version
  -----------------------------------------------------------------------
- PostgreSQL 9.5.2 on i586-pc-linux-gnu, compiled by GCC 2.96, 32-bit
+ PostgreSQL 9.5.8 on i586-pc-linux-gnu, compiled by GCC 2.96, 32-bit
 (1 row)
 
 <SAMP
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-advanced.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-advanced.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-advanced.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-advanced.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Tutorial"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-advanced-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-advanced-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-advanced-intro.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-advanced-intro.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Advanced Features"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-agg.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-agg.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-agg.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-agg.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-arch.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-arch.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-arch.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-arch.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Getting Started"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-concepts.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-concepts.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-concepts.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-concepts.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-conclusion.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-conclusion.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-conclusion.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-conclusion.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Advanced Features"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -111,7 +111,7 @@
 ><P
 >    If you feel you need more introductory material, please visit the PostgreSQL
     <A
-HREF="http://www.postgresql.org"
+HREF="https://www.postgresql.org"
 TARGET="_top"
 >web site</A
 >
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-createdb.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-createdb.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-createdb.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-createdb.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Getting Started"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-delete.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-delete.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-delete.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-delete.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-fk.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-fk.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-fk.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-fk.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Advanced Features"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Bug Reporting Guidelines"
@@ -23,7 +23,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="PART"
 ><DIV
@@ -41,7 +41,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-inheritance.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-inheritance.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-inheritance.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-inheritance.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Advanced Features"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-install.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-install.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-install.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-install.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Getting Started"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-join.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-join.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-join.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-join.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-populate.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-populate.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-populate.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-populate.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-select.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-select.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-select.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-select.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-sql.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-sql.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-sql.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-sql.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Tutorial"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-sql-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-sql-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-sql-intro.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-sql-intro.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-start.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-start.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-start.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-start.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Tutorial"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-table.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-table.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-table.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-table.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-transactions.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-transactions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-transactions.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-transactions.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Advanced Features"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-update.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-update.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-update.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-update.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-views.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-views.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-views.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-views.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Advanced Features"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-window.html postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-window.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/tutorial-window.html	2016-03-28 20:20:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/tutorial-window.html	2017-08-07 21:31:58.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Advanced Features"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv-func.html postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv-func.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv-func.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv-func.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Type Conversion"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -198,8 +198,8 @@
 >CAST</TT
 > specification.
   <A
-NAME="AEN23968"
-HREF="#FTN.AEN23968"
+NAME="AEN24202"
+HREF="#FTN.AEN24202"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
@@ -305,7 +305,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN23994"
+NAME="AEN24228"
 ></A
 ><P
 ><B
@@ -364,7 +364,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN24007"
+NAME="AEN24241"
 ></A
 ><P
 ><B
@@ -499,8 +499,8 @@
 VALIGN="TOP"
 WIDTH="5%"
 ><A
-NAME="FTN.AEN23968"
-HREF="typeconv-func.html#AEN23968"
+NAME="FTN.AEN24202"
+HREF="typeconv-func.html#AEN24202"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv.html postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="The SQL Language"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv-oper.html postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv-oper.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv-oper.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv-oper.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Type Conversion"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -293,7 +293,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN23865"
+NAME="AEN24099"
 ></A
 ><P
 ><B
@@ -335,7 +335,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN23873"
+NAME="AEN24107"
 ></A
 ><P
 ><B
@@ -392,7 +392,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN23885"
+NAME="AEN24119"
 ></A
 ><P
 ><B
@@ -483,7 +483,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN23904"
+NAME="AEN24138"
 ></A
 ><P
 ><B
@@ -548,7 +548,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN23918"
+NAME="AEN24152"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv-overview.html postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv-overview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv-overview.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv-overview.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Type Conversion"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -316,7 +316,7 @@
 >, and
 user-defined.  (For a list see <A
 HREF="catalog-pg-type.html#CATALOG-TYPCATEGORY-TABLE"
->Table 49-57</A
+>Table 49-55</A
 >;
 but note it is also possible to create custom type categories.)  Within each
 category there can be one or more <I
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv-query.html postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv-query.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv-query.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv-query.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Type Conversion"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -168,7 +168,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN24053"
+NAME="AEN24287"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv-union-case.html postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv-union-case.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/typeconv-union-case.html	2016-03-28 20:20:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/typeconv-union-case.html	2017-08-07 21:32:05.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Type Conversion"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -168,8 +168,8 @@
 >If any input is of a domain type, treat it as being of the
 domain's base type for all subsequent steps.
   <A
-NAME="AEN24111"
-HREF="#FTN.AEN24111"
+NAME="AEN24345"
+HREF="#FTN.AEN24345"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
@@ -224,7 +224,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN24128"
+NAME="AEN24362"
 ></A
 ><P
 ><B
@@ -252,7 +252,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN24134"
+NAME="AEN24368"
 ></A
 ><P
 ><B
@@ -291,7 +291,7 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN24143"
+NAME="AEN24377"
 ></A
 ><P
 ><B
@@ -341,8 +341,8 @@
 VALIGN="TOP"
 WIDTH="5%"
 ><A
-NAME="FTN.AEN24111"
-HREF="typeconv-union-case.html#AEN24111"
+NAME="FTN.AEN24345"
+HREF="typeconv-union-case.html#AEN24345"
 ><SPAN
 CLASS="footnote"
 >[1]</SPAN
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/unaccent.html postgresql-9.5-9.5.8/doc/src/sgml/html/unaccent.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/unaccent.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/unaccent.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -121,7 +121,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174730"
+NAME="AEN179587"
 >F.42.1. Configuration</A
 ></H2
 ><P
@@ -242,7 +242,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174761"
+NAME="AEN179618"
 >F.42.2. Usage</A
 ></H2
 ><P
@@ -326,7 +326,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174776"
+NAME="AEN179633"
 >F.42.3. Functions</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/unsupported-features-sql-standard.html postgresql-9.5-9.5.8/doc/src/sgml/html/unsupported-features-sql-standard.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/unsupported-features-sql-standard.html	2016-03-28 20:21:09.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/unsupported-features-sql-standard.html	2017-08-07 21:32:38.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="SQL Conformance"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -112,7 +112,7 @@
 ><P
 ></P
 ><A
-NAME="AEN124386"
+NAME="AEN124773"
 ></A
 ><TABLE
 BORDER="1"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/upgrading.html postgresql-9.5-9.5.8/doc/src/sgml/html/upgrading.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/upgrading.html	2016-03-28 20:20:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/upgrading.html	2017-08-07 21:32:07.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Setup and Operation"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -343,7 +343,7 @@
       command from <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
-> 9.5.2,
+> 9.5.8,
       since this version contains bug fixes and improvements over older
       versions.  While this advice might seem idiosyncratic since you
       haven't installed the new version yet, it is advisable to follow
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/user-manag.html postgresql-9.5-9.5.8/doc/src/sgml/html/user-manag.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/user-manag.html	2016-03-28 20:20:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/user-manag.html	2017-08-07 21:32:08.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/using-explain.html postgresql-9.5-9.5.8/doc/src/sgml/html/using-explain.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/using-explain.html	2016-03-28 20:20:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/using-explain.html	2017-08-07 21:32:06.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Performance Tips"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/uuid-ossp.html postgresql-9.5-9.5.8/doc/src/sgml/html/uuid-ossp.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/uuid-ossp.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/uuid-ossp.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,7 +108,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174799"
+NAME="AEN179656"
 >F.43.1. <TT
 CLASS="LITERAL"
 >uuid-ossp</TT
@@ -117,7 +117,7 @@
 ><P
 >   <A
 HREF="uuid-ossp.html#UUID-OSSP-FUNCTIONS"
->Table F-31</A
+>Table F-33</A
 > shows the functions available to
    generate UUIDs.
    The relevant standards ITU-T Rec. X.667, ISO/IEC 9834-8:2005, and RFC
@@ -133,7 +133,7 @@
 ></A
 ><P
 ><B
->Table F-31. Functions for UUID Generation</B
+>Table F-33. Functions for UUID Generation</B
 ></P
 ><TABLE
 BORDER="1"
@@ -194,7 +194,7 @@
 > functions shown
         in <A
 HREF="uuid-ossp.html#UUID-OSSP-CONSTANTS"
->Table F-32</A
+>Table F-34</A
 >.  (It could be any UUID in theory.)  The name is an identifier
         in the selected namespace.
        </P
@@ -256,7 +256,7 @@
 ></A
 ><P
 ><B
->Table F-32. Functions Returning UUID Constants</B
+>Table F-34. Functions Returning UUID Constants</B
 ></P
 ><TABLE
 BORDER="1"
@@ -345,7 +345,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174878"
+NAME="AEN179735"
 >F.43.2. Building <TT
 CLASS="FILENAME"
 >uuid-ossp</TT
@@ -436,7 +436,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174899"
+NAME="AEN179756"
 >F.43.3. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/vacuumlo.html postgresql-9.5-9.5.8/doc/src/sgml/html/vacuumlo.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/vacuumlo.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/vacuumlo.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Client Applications"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="REFENTRY"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -98,7 +98,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN175279"
+NAME="AEN180136"
 ></A
 ><H2
 >Name</H2
@@ -109,7 +109,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN175283"
+NAME="AEN180140"
 ></A
 ><H2
 >Synopsis</H2
@@ -132,7 +132,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175290"
+NAME="AEN180147"
 ></A
 ><H2
 >Description</H2
@@ -180,7 +180,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175303"
+NAME="AEN180160"
 ></A
 ><H2
 >Options</H2
@@ -391,7 +391,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175381"
+NAME="AEN180238"
 ></A
 ><H2
 >Notes</H2
@@ -421,7 +421,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175388"
+NAME="AEN180245"
 ></A
 ><H2
 >Author</H2
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-available-extensions.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-available-extensions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-available-extensions.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-available-extensions.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-AVAILABLE-EXTENSIONS"
->49.59. <TT
+>49.57. <TT
 CLASS="STRUCTNAME"
 >pg_available_extensions</TT
 ></A
@@ -117,11 +117,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN106647"
+NAME="AEN106838"
 ></A
 ><P
 ><B
->Table 49-60. <TT
+>Table 49-58. <TT
 CLASS="STRUCTNAME"
 >pg_available_extensions</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-available-extension-versions.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-available-extension-versions.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-available-extension-versions.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-available-extension-versions.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-AVAILABLE-EXTENSION-VERSIONS"
->49.60. <TT
+>49.58. <TT
 CLASS="STRUCTNAME"
 >pg_available_extension_versions</TT
 ></A
@@ -116,11 +116,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN106694"
+NAME="AEN106885"
 ></A
 ><P
 ><B
->Table 49-61. <TT
+>Table 49-59. <TT
 CLASS="STRUCTNAME"
 >pg_available_extension_versions</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-cursors.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-cursors.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-cursors.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-cursors.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-CURSORS"
->49.61. <TT
+>49.59. <TT
 CLASS="STRUCTNAME"
 >pg_cursors</TT
 ></A
@@ -175,11 +175,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN106779"
+NAME="AEN106970"
 ></A
 ><P
 ><B
->Table 49-62. <TT
+>Table 49-60. <TT
 CLASS="STRUCTNAME"
 >pg_cursors</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-file-settings.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-file-settings.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-file-settings.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-file-settings.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-FILE-SETTINGS"
->49.62. <TT
+>49.60. <TT
 CLASS="STRUCTNAME"
 >pg_file_settings</TT
 ></A
@@ -145,11 +145,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN106849"
+NAME="AEN107040"
 ></A
 ><P
 ><B
->Table 49-63. <TT
+>Table 49-61. <TT
 CLASS="STRUCTNAME"
 >pg_file_settings</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-group.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-group.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-group.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-group.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-GROUP"
->49.63. <TT
+>49.61. <TT
 CLASS="STRUCTNAME"
 >pg_group</TT
 ></A
@@ -118,11 +118,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN106919"
+NAME="AEN107110"
 ></A
 ><P
 ><B
->Table 49-64. <TT
+>Table 49-62. <TT
 CLASS="STRUCTNAME"
 >pg_group</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-indexes.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-indexes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-indexes.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-indexes.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-INDEXES"
->49.64. <TT
+>49.62. <TT
 CLASS="STRUCTNAME"
 >pg_indexes</TT
 ></A
@@ -108,11 +108,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN106967"
+NAME="AEN107158"
 ></A
 ><P
 ><B
->Table 49-65. <TT
+>Table 49-63. <TT
 CLASS="STRUCTNAME"
 >pg_indexes</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-locks.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-locks.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-locks.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-locks.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-LOCKS"
->49.65. <TT
+>49.63. <TT
 CLASS="STRUCTNAME"
 >pg_locks</TT
 ></A
@@ -145,11 +145,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN107040"
+NAME="AEN107231"
 ></A
 ><P
 ><B
->Table 49-66. <TT
+>Table 49-64. <TT
 CLASS="STRUCTNAME"
 >pg_locks</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-matviews.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-matviews.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-matviews.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-matviews.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-MATVIEWS"
->49.66. <TT
+>49.64. <TT
 CLASS="STRUCTNAME"
 >pg_matviews</TT
 ></A
@@ -108,11 +108,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN107226"
+NAME="AEN107417"
 ></A
 ><P
 ><B
->Table 49-67. <TT
+>Table 49-65. <TT
 CLASS="STRUCTNAME"
 >pg_matviews</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-policies.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-policies.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-policies.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-policies.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-POLICIES"
->49.67. <TT
+>49.65. <TT
 CLASS="STRUCTNAME"
 >pg_policies</TT
 ></A
@@ -108,11 +108,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN107306"
+NAME="AEN107497"
 ></A
 ><P
 ><B
->Table 49-68. <TT
+>Table 49-66. <TT
 CLASS="STRUCTNAME"
 >pg_policies</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-prepared-statements.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-prepared-statements.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-prepared-statements.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-prepared-statements.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-PREPARED-STATEMENTS"
->49.68. <TT
+>49.66. <TT
 CLASS="STRUCTNAME"
 >pg_prepared_statements</TT
 ></A
@@ -125,11 +125,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN107386"
+NAME="AEN107577"
 ></A
 ><P
 ><B
->Table 49-69. <TT
+>Table 49-67. <TT
 CLASS="STRUCTNAME"
 >pg_prepared_statements</TT
 > Columns</B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-prepared-xacts.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-prepared-xacts.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-prepared-xacts.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-prepared-xacts.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -18,15 +18,15 @@
 TITLE="pg_prepared_statements"
 HREF="view-pg-prepared-statements.html"><LINK
 REL="NEXT"
-TITLE="pg_roles"
-HREF="view-pg-roles.html"><LINK
+TITLE="pg_replication_origin_status"
+HREF="view-pg-replication-origin-status.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
 HREF="stylesheet.css"><META
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -77,8 +77,8 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-TITLE="pg_roles"
-HREF="view-pg-roles.html"
+TITLE="pg_replication_origin_status"
+HREF="view-pg-replication-origin-status.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEW-PG-PREPARED-XACTS"
->49.69. <TT
+>49.67. <TT
 CLASS="STRUCTNAME"
 >pg_prepared_xacts</TT
 ></A
@@ -120,11 +120,11 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN107445"
+NAME="AEN107636"
 ></A
 ><P
 ><B
->Table 49-70. <TT
+>Table 49-68. <TT
 CLASS="STRUCTNAME"
 >pg_prepared_xacts</TT
 > Columns</B
@@ -298,7 +298,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="view-pg-roles.html"
+HREF="view-pg-replication-origin-status.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -327,7 +327,7 @@
 VALIGN="top"
 ><TT
 CLASS="STRUCTNAME"
->pg_roles</TT
+>pg_replication_origin_status</TT
 ></TD
 ></TR
 ></TABLE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-replication-origin-status.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-replication-origin-status.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-replication-origin-status.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-replication-origin-status.html	2017-08-07 21:32:31.000000000 +0000
@@ -0,0 +1,303 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>pg_replication_origin_status</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="System Catalogs"
+HREF="catalogs.html"><LINK
+REL="PREVIOUS"
+TITLE="pg_prepared_xacts"
+HREF="view-pg-prepared-xacts.html"><LINK
+REL="NEXT"
+TITLE="pg_replication_slots"
+HREF="view-pg-replication-slots.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="pg_prepared_xacts"
+HREF="view-pg-prepared-xacts.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="catalogs.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 49. System Catalogs</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="pg_replication_slots"
+HREF="view-pg-replication-slots.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="VIEW-PG-REPLICATION-ORIGIN-STATUS"
+>49.68. <TT
+CLASS="STRUCTNAME"
+>pg_replication_origin_status</TT
+></A
+></H1
+><P
+>   The <TT
+CLASS="STRUCTNAME"
+>pg_replication_origin_status</TT
+> view
+   contains information about how far replay for a certain origin has
+   progressed.  For more on replication origins
+   see <A
+HREF="replication-origins.html"
+>Chapter 47</A
+>.
+  </P
+><DIV
+CLASS="TABLE"
+><A
+NAME="AEN107698"
+></A
+><P
+><B
+>Table 49-69. <TT
+CLASS="STRUCTNAME"
+>pg_replication_origin_status</TT
+> Columns</B
+></P
+><TABLE
+BORDER="1"
+CLASS="CALSTABLE"
+><COL><COL><COL><COL><THEAD
+><TR
+><TH
+>Name</TH
+><TH
+>Type</TH
+><TH
+>References</TH
+><TH
+>Description</TH
+></TR
+></THEAD
+><TBODY
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>local_id</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>Oid</TT
+></TD
+><TD
+><TT
+CLASS="LITERAL"
+><A
+HREF="catalog-pg-replication-origin.html"
+><TT
+CLASS="STRUCTNAME"
+>pg_replication_origin</TT
+></A
+>.roident</TT
+></TD
+><TD
+>internal node identifier</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>external_id</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
+><TD
+><TT
+CLASS="LITERAL"
+><A
+HREF="catalog-pg-replication-origin.html"
+><TT
+CLASS="STRUCTNAME"
+>pg_replication_origin</TT
+></A
+>.roname</TT
+></TD
+><TD
+>external node identifier</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>remote_lsn</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>pg_lsn</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>The origin node's LSN up to which data has been replicated.</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>local_lsn</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>pg_lsn</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>       This node's LSN at which <TT
+CLASS="LITERAL"
+>remote_lsn</TT
+> has
+       been replicated. Used to flush commit records before persisting
+       data to disk when using asynchronous commits.
+      </TD
+></TR
+></TBODY
+></TABLE
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="view-pg-prepared-xacts.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="view-pg-replication-slots.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><TT
+CLASS="STRUCTNAME"
+>pg_prepared_xacts</TT
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="catalogs.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><TT
+CLASS="STRUCTNAME"
+>pg_replication_slots</TT
+></TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-replication-slots.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-replication-slots.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-replication-slots.html	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-replication-slots.html	2017-08-07 21:32:31.000000000 +0000
@@ -0,0 +1,431 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>pg_replication_slots</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REV="MADE"
+HREF="mailto:pgsql-docs@postgresql.org"><LINK
+REL="HOME"
+TITLE="PostgreSQL 9.5.8 Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="System Catalogs"
+HREF="catalogs.html"><LINK
+REL="PREVIOUS"
+TITLE="pg_replication_origin_status"
+HREF="view-pg-replication-origin-status.html"><LINK
+REL="NEXT"
+TITLE="pg_roles"
+HREF="view-pg-roles.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2017-08-07T21:31:58"></HEAD
+><BODY
+CLASS="SECT1"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+VALIGN="bottom"
+><A
+HREF="index.html"
+>PostgreSQL 9.5.8 Documentation</A
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+TITLE="pg_replication_origin_status"
+HREF="view-pg-replication-origin-status.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="catalogs.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="60%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 49. System Catalogs</TD
+><TD
+WIDTH="20%"
+ALIGN="right"
+VALIGN="top"
+><A
+TITLE="pg_roles"
+HREF="view-pg-roles.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="VIEW-PG-REPLICATION-SLOTS"
+>49.69. <TT
+CLASS="STRUCTNAME"
+>pg_replication_slots</TT
+></A
+></H1
+><P
+>   The <TT
+CLASS="STRUCTNAME"
+>pg_replication_slots</TT
+> view provides a listing
+   of all replication slots that currently exist on the database cluster,
+   along with their current state.
+  </P
+><P
+>   For more on replication slots,
+   see <A
+HREF="warm-standby.html#STREAMING-REPLICATION-SLOTS"
+>Section 25.2.6</A
+> and <A
+HREF="logicaldecoding.html"
+>Chapter 46</A
+>.
+  </P
+><DIV
+CLASS="TABLE"
+><A
+NAME="AEN107754"
+></A
+><P
+><B
+>Table 49-70. <TT
+CLASS="STRUCTNAME"
+>pg_replication_slots</TT
+> Columns</B
+></P
+><TABLE
+BORDER="1"
+CLASS="CALSTABLE"
+><COL><COL><COL><COL><THEAD
+><TR
+><TH
+>Name</TH
+><TH
+>Type</TH
+><TH
+>References</TH
+><TH
+>Description</TH
+></TR
+></THEAD
+><TBODY
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>slot_name</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>name</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>A unique, cluster-wide identifier for the replication slot</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>plugin</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>name</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>The base name of the shared object containing the output plugin this logical slot is using, or null for physical slots.</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>slot_type</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>The slot type - <TT
+CLASS="LITERAL"
+>physical</TT
+> or <TT
+CLASS="LITERAL"
+>logical</TT
+></TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>datoid</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>oid</TT
+></TD
+><TD
+><TT
+CLASS="LITERAL"
+><A
+HREF="catalog-pg-database.html"
+><TT
+CLASS="STRUCTNAME"
+>pg_database</TT
+></A
+>.oid</TT
+></TD
+><TD
+>The OID of the database this slot is associated with, or
+      null. Only logical slots have an associated database.</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>database</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>text</TT
+></TD
+><TD
+><TT
+CLASS="LITERAL"
+><A
+HREF="catalog-pg-database.html"
+><TT
+CLASS="STRUCTNAME"
+>pg_database</TT
+></A
+>.datname</TT
+></TD
+><TD
+>The name of the database this slot is associated with, or
+      null. Only logical slots have an associated database.</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>active</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>boolean</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>True if this slot is currently actively being used</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>active_pid</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>integer</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>The process ID of the session using this slot if the slot
+       is currently actively being used. <TT
+CLASS="LITERAL"
+>NULL</TT
+> if
+       inactive.
+      </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>xmin</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>xid</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>The oldest transaction that this slot needs the database to
+      retain.  <TT
+CLASS="LITERAL"
+>VACUUM</TT
+> cannot remove tuples deleted
+      by any later transaction.
+      </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>catalog_xmin</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>xid</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>The oldest transaction affecting the system catalogs that this
+      slot needs the database to retain.  <TT
+CLASS="LITERAL"
+>VACUUM</TT
+> cannot
+      remove catalog tuples deleted by any later transaction.
+      </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
+>restart_lsn</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>pg_lsn</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>The address (<TT
+CLASS="LITERAL"
+>LSN</TT
+>) of oldest WAL which still
+      might be required by the consumer of this slot and thus won't be
+      automatically removed during checkpoints.
+      </TD
+></TR
+></TBODY
+></TABLE
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="view-pg-replication-origin-status.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="view-pg-roles.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><TT
+CLASS="STRUCTNAME"
+>pg_replication_origin_status</TT
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="catalogs.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><TT
+CLASS="STRUCTNAME"
+>pg_roles</TT
+></TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-roles.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-roles.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-roles.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-roles.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,14 +9,14 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
 HREF="catalogs.html"><LINK
 REL="PREVIOUS"
-TITLE="pg_prepared_xacts"
-HREF="view-pg-prepared-xacts.html"><LINK
+TITLE="pg_replication_slots"
+HREF="view-pg-replication-slots.html"><LINK
 REL="NEXT"
 TITLE="pg_rules"
 HREF="view-pg-rules.html"><LINK
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -53,8 +53,8 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-TITLE="pg_prepared_xacts"
-HREF="view-pg-prepared-xacts.html"
+TITLE="pg_replication_slots"
+HREF="view-pg-replication-slots.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -121,7 +121,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN107509"
+NAME="AEN107857"
 ></A
 ><P
 ><B
@@ -332,6 +332,27 @@
 ><TD
 ><TT
 CLASS="STRUCTFIELD"
+>rolbypassrls</TT
+></TD
+><TD
+><TT
+CLASS="TYPE"
+>bool</TT
+></TD
+><TD
+>&nbsp;</TD
+><TD
+>       Role bypasses every row level security policy, see
+       <A
+HREF="ddl-rowsecurity.html"
+>Section 5.7</A
+> for more information.
+      </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="STRUCTFIELD"
 >rolconfig</TT
 ></TD
 ><TD
@@ -389,7 +410,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="view-pg-prepared-xacts.html"
+HREF="view-pg-replication-slots.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -419,7 +440,7 @@
 VALIGN="top"
 ><TT
 CLASS="STRUCTNAME"
->pg_prepared_xacts</TT
+>pg_replication_slots</TT
 ></TD
 ><TD
 WIDTH="34%"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-rules.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-rules.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-rules.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-rules.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,7 +108,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN107618"
+NAME="AEN107974"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-seclabels.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-seclabels.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-seclabels.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-seclabels.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN107680"
+NAME="AEN108036"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-settings.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-settings.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-settings.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-settings.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN107771"
+NAME="AEN108127"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-shadow.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-shadow.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-shadow.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-shadow.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -140,7 +140,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN107984"
+NAME="AEN108340"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-stats.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-stats.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-stats.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-stats.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -133,7 +133,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN108080"
+NAME="AEN108436"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-tables.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-tables.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-tables.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-tables.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,7 +108,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN108215"
+NAME="AEN108571"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-timezone-abbrevs.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-timezone-abbrevs.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-timezone-abbrevs.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-timezone-abbrevs.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -113,7 +113,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN108314"
+NAME="AEN108670"
 ></A
 ><P
 ><B
@@ -181,6 +181,15 @@
 ></TBODY
 ></TABLE
 ></DIV
+><P
+>   While most timezone abbreviations represent fixed offsets from UTC,
+   there are some that have historically varied in value
+   (see <A
+HREF="datetime-config-files.html"
+>Section B.3</A
+> for more information).
+   In such cases this view presents their current meaning.
+  </P
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-timezone-names.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-timezone-names.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-timezone-names.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-timezone-names.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -134,7 +134,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN108355"
+NAME="AEN108713"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-user.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-user.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-user.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-user.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -117,7 +117,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN108398"
+NAME="AEN108756"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-user-mappings.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-user-mappings.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-user-mappings.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-user-mappings.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -118,7 +118,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN108473"
+NAME="AEN108831"
 ></A
 ><P
 ><B
@@ -278,14 +278,47 @@
 >       User mapping specific options, as <SPAN
 CLASS="QUOTE"
 >"keyword=value"</SPAN
->
-       strings, if the current user is the owner of the foreign
-       server, else null
+> strings
       </TD
 ></TR
 ></TBODY
 ></TABLE
 ></DIV
+><P
+>   To protect password information stored as a user mapping option,
+   the <TT
+CLASS="STRUCTFIELD"
+>umoptions</TT
+> column will read as null
+   unless one of the following applies:
+   <P
+></P
+></P><UL
+><LI
+><P
+>      current user is the user being mapped, and owns the server or
+      holds <TT
+CLASS="LITERAL"
+>USAGE</TT
+> privilege on it
+     </P
+></LI
+><LI
+><P
+>      current user is the server owner and mapping is for <TT
+CLASS="LITERAL"
+>PUBLIC</TT
+>
+     </P
+></LI
+><LI
+><P
+>      current user is a superuser
+     </P
+></LI
+></UL
+><P>
+  </P
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-views.html postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-views.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/view-pg-views.html	2016-03-28 20:21:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/view-pg-views.html	2017-08-07 21:32:31.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -108,7 +108,7 @@
 ><DIV
 CLASS="TABLE"
 ><A
-NAME="AEN108546"
+NAME="AEN108915"
 ></A
 ><P
 ><B
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/views-overview.html postgresql-9.5-9.5.8/doc/src/sgml/html/views-overview.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/views-overview.html	2016-03-28 20:21:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/views-overview.html	2017-08-07 21:32:30.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="System Catalogs"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -93,7 +93,7 @@
 CLASS="SECT1"
 ><A
 NAME="VIEWS-OVERVIEW"
->49.58. System Views</A
+>49.56. System Views</A
 ></H1
 ><P
 >   In addition to the system catalogs, <SPAN
@@ -121,7 +121,7 @@
 ><P
 >   <A
 HREF="views-overview.html#VIEW-TABLE"
->Table 49-59</A
+>Table 49-57</A
 > lists the system views described here.
    More detailed documentation of each view follows below.
    There are some additional views that provide access to the results of
@@ -140,7 +140,7 @@
 ></A
 ><P
 ><B
->Table 49-59. System Views</B
+>Table 49-57. System Views</B
 ></P
 ><TABLE
 BORDER="1"
@@ -288,6 +288,30 @@
 ></TR
 ><TR
 ><TD
+><A
+HREF="view-pg-replication-origin-status.html"
+><TT
+CLASS="STRUCTNAME"
+>pg_replication_origin_status</TT
+></A
+></TD
+><TD
+>information about replication origins, including replication progress</TD
+></TR
+><TR
+><TD
+><A
+HREF="view-pg-replication-slots.html"
+><TT
+CLASS="STRUCTNAME"
+>pg_replication_slots</TT
+></A
+></TD
+><TD
+>replication slot information</TD
+></TR
+><TR
+><TD
 ><A
 HREF="view-pg-roles.html"
 ><TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/wal-async-commit.html postgresql-9.5-9.5.8/doc/src/sgml/html/wal-async-commit.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/wal-async-commit.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/wal-async-commit.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Reliability and the Write-Ahead Log"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/wal-configuration.html postgresql-9.5-9.5.8/doc/src/sgml/html/wal-configuration.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/wal-configuration.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/wal-configuration.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Reliability and the Write-Ahead Log"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -296,7 +296,7 @@
    removes the rest. The estimate is based on a moving average of the number
    of WAL files used in previous checkpoint cycles. The moving average
    is increased immediately if the actual usage exceeds the estimate, so it
-   accommodates peak usage rather average usage to some extent.
+   accommodates peak usage rather than average usage to some extent.
    <TT
 CLASS="VARNAME"
 >min_wal_size</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/wal.html postgresql-9.5-9.5.8/doc/src/sgml/html/wal.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/wal.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/wal.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Administration"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/wal-internals.html postgresql-9.5-9.5.8/doc/src/sgml/html/wal-internals.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/wal-internals.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/wal-internals.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Reliability and the Write-Ahead Log"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/wal-intro.html postgresql-9.5-9.5.8/doc/src/sgml/html/wal-intro.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/wal-intro.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/wal-intro.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Reliability and the Write-Ahead Log"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/wal-reliability.html postgresql-9.5-9.5.8/doc/src/sgml/html/wal-reliability.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/wal-reliability.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/wal-reliability.html	2017-08-07 21:32:10.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Reliability and the Write-Ahead Log"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/warm-standby-failover.html postgresql-9.5-9.5.8/doc/src/sgml/html/warm-standby-failover.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/warm-standby-failover.html	2016-03-28 20:20:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/warm-standby-failover.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="High Availability, Load Balancing, and Replication"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/warm-standby.html postgresql-9.5-9.5.8/doc/src/sgml/html/warm-standby.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/warm-standby.html	2016-03-28 20:20:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/warm-standby.html	2017-08-07 21:32:09.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="High Availability, Load Balancing, and Replication"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -834,7 +834,7 @@
 ><P
 >     Existing replication slots and their state can be seen in the
      <A
-HREF="catalog-pg-replication-slots.html"
+HREF="view-pg-replication-slots.html"
 ><TT
 CLASS="STRUCTNAME"
 >pg_replication_slots</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xaggr.html postgresql-9.5-9.5.8/doc/src/sgml/html/xaggr.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xaggr.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xaggr.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -865,9 +865,9 @@
    function, the first input
    must be a temporary state value and can therefore safely be modified
    in-place rather than allocating a new copy.
-   See <TT
-CLASS="LITERAL"
->int8inc()</TT
+   See <CODE
+CLASS="FUNCTION"
+>int8inc()</CODE
 > for an example.
    (This is the <SPAN
 CLASS="emphasis"
@@ -882,6 +882,34 @@
    re-executed on the same final state value.)
   </P
 ><P
+>   The second argument of <CODE
+CLASS="FUNCTION"
+>AggCheckCallContext</CODE
+> can be used to
+   retrieve the memory context in which aggregate state values are being kept.
+   This is useful for transition functions that wish to use <SPAN
+CLASS="QUOTE"
+>"expanded"</SPAN
+>
+   objects (see <A
+HREF="xtypes.html#XTYPES-TOAST"
+>Section 35.11.1</A
+>) as their state values.
+   On first call, the transition function should return an expanded object
+   whose memory context is a child of the aggregate state context, and then
+   keep returning the same expanded object on subsequent calls.  See
+   <CODE
+CLASS="FUNCTION"
+>array_append()</CODE
+> for an example.  (<CODE
+CLASS="FUNCTION"
+>array_append()</CODE
+>
+   is not the transition function of any built-in aggregate, but it is written
+   to behave efficiently when used as transition function of a custom
+   aggregate.)
+  </P
+><P
 >   Another support routine available to aggregate functions written in C
    is <CODE
 CLASS="FUNCTION"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-c.html postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-c.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-c.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-c.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -1250,7 +1250,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN57340"
+NAME="AEN57593"
 >35.9.3. Version 0 Calling Conventions</A
 ></H2
 ><P
@@ -1469,7 +1469,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN57367"
+NAME="AEN57620"
 >35.9.4. Version 1 Calling Conventions</A
 ></H2
 ><P
@@ -1836,7 +1836,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN57425"
+NAME="AEN57678"
 >35.9.5. Writing Code</A
 ></H2
 ><P
@@ -2121,7 +2121,7 @@
 > is
       <TT
 CLASS="OPTION"
->-fpic</TT
+>-fPIC</TT
 >.  To create shared libraries the compiler
       flag is <TT
 CLASS="OPTION"
@@ -2129,7 +2129,7 @@
 >.
 </P><PRE
 CLASS="PROGRAMLISTING"
->gcc -fpic -c foo.c
+>gcc -fPIC -c foo.c
 gcc -shared -o foo.so foo.o</PRE
 ><P>
       This is applicable as of version 3.0 of
@@ -2160,7 +2160,7 @@
 >GCC</SPAN
 > it's <TT
 CLASS="OPTION"
->-fpic</TT
+>-fPIC</TT
 >. The
       linker flag for shared libraries is <TT
 CLASS="OPTION"
@@ -2173,7 +2173,7 @@
       or:
 </P><PRE
 CLASS="PROGRAMLISTING"
->gcc -fpic -c foo.c</PRE
+>gcc -fPIC -c foo.c</PRE
 ><P>
       and then:
 </P><PRE
@@ -2205,16 +2205,8 @@
 > is
       <TT
 CLASS="OPTION"
->-fpic</TT
->.  On some platforms in some situations
-      <TT
-CLASS="OPTION"
 >-fPIC</TT
-> must be used if <TT
-CLASS="OPTION"
->-fpic</TT
->
-      does not work.  Refer to the GCC manual for more information.
+>.
       The compiler flag to create a shared library is
       <TT
 CLASS="OPTION"
@@ -2222,7 +2214,7 @@
 >.  A complete example looks like this:
 </P><PRE
 CLASS="PROGRAMLISTING"
->cc -fpic -c foo.c
+>cc -fPIC -c foo.c
 cc -shared -o foo.so foo.o</PRE
 ><P>
      </P
@@ -2257,7 +2249,7 @@
 > is
       <TT
 CLASS="OPTION"
->-fpic</TT
+>-fPIC</TT
 >.  For <ACRONYM
 CLASS="ACRONYM"
 >ELF</ACRONYM
@@ -2273,7 +2265,7 @@
 > is used.
 </P><PRE
 CLASS="PROGRAMLISTING"
->gcc -fpic -c foo.c
+>gcc -fPIC -c foo.c
 gcc -shared -o foo.so foo.o</PRE
 ><P>
      </P
@@ -2292,7 +2284,7 @@
 > is
       <TT
 CLASS="OPTION"
->-fpic</TT
+>-fPIC</TT
 >.  <TT
 CLASS="LITERAL"
 >ld -Bshareable</TT
@@ -2300,7 +2292,7 @@
       used to link shared libraries.
 </P><PRE
 CLASS="PROGRAMLISTING"
->gcc -fpic -c foo.c
+>gcc -fPIC -c foo.c
 ld -Bshareable -o foo.so foo.o</PRE
 ><P>
      </P
@@ -2323,7 +2315,7 @@
 > with the Sun compiler and
       <TT
 CLASS="OPTION"
->-fpic</TT
+>-fPIC</TT
 > with <SPAN
 CLASS="APPLICATION"
 >GCC</SPAN
@@ -2348,7 +2340,7 @@
       or
 </P><PRE
 CLASS="PROGRAMLISTING"
->gcc -fpic -c foo.c
+>gcc -fPIC -c foo.c
 gcc -G -o foo.so foo.o</PRE
 ><P>
      </P
@@ -2461,7 +2453,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN57626"
+NAME="AEN57877"
 >35.9.7. Composite-type Arguments</A
 ></H2
 ><P
@@ -2621,7 +2613,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN57650"
+NAME="AEN57901"
 >35.9.8. Returning Rows (Composite Types)</A
 ></H2
 ><P
@@ -3414,7 +3406,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN57779"
+NAME="AEN58030"
 >35.9.10. Polymorphic Arguments and Return Types</A
 ></H2
 ><P
@@ -3688,7 +3680,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN57830"
+NAME="AEN58081"
 >35.9.12. Shared Memory and LWLocks</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc.html postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-internal.html postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-internal.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-internal.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-internal.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-overload.html postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-overload.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-overload.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-overload.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-pl.html postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-pl.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-pl.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-pl.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-sql.html postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-sql.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-sql.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-sql.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -639,11 +639,16 @@
      how the calling <TT
 CLASS="COMMAND"
 >SELECT</TT
-> command uses <TT
+> command
+     uses <TT
+CLASS="REPLACEABLE"
+><I
+>table_name</I
+></TT
+><TT
 CLASS="LITERAL"
->*</TT
->
-     to select
+>.*</TT
+> to select
      the entire current row of a table as a composite value.  The table
      row can alternatively be referenced using just the table name,
      like this:
@@ -654,6 +659,11 @@
     WHERE emp.cubicle ~= point '(2,1)';</PRE
 ><P>
      but this usage is deprecated since it's easy to get confused.
+     (See <A
+HREF="rowtypes.html#ROWTYPES-USAGE"
+>Section 8.16.5</A
+> for details about these
+     two notations for the composite value of a table row.)
     </P
 ><P
 >     Sometimes it is handy to construct a composite argument value
@@ -740,7 +750,8 @@
      another function that returns the desired composite value.
     </P
 ><P
->     We could call this function directly in either of two ways:
+>     We could call this function directly either by using it in
+     a value expression:
 
 </P><PRE
 CLASS="SCREEN"
@@ -748,9 +759,14 @@
 
          new_emp
 --------------------------
- (None,1000.0,25,"(2,2)")
+ (None,1000.0,25,"(2,2)")</PRE
+><P>
 
-SELECT * FROM new_emp();
+     or by calling it as a table function:
+
+</P><PRE
+CLASS="SCREEN"
+>SELECT * FROM new_emp();
 
  name | salary | age | cubicle
 ------+--------+-----+---------
@@ -788,17 +804,7 @@
 ><P>
     </P
 ><P
->     Another option is to use
-     functional notation for extracting an attribute.  The  simple  way
-     to explain this is that we can use the
-     notations <TT
-CLASS="LITERAL"
->attribute(table)</TT
->  and  <TT
-CLASS="LITERAL"
->table.attribute</TT
->
-     interchangeably.
+>     Another option is to use functional notation for extracting an attribute:
 
 </P><PRE
 CLASS="SCREEN"
@@ -809,59 +815,12 @@
  None</PRE
 ><P>
 
-</P><PRE
-CLASS="SCREEN"
->-- This is the same as:
--- SELECT emp.name AS youngster FROM emp WHERE emp.age &lt; 30;
-
-SELECT name(emp) AS youngster FROM emp WHERE age(emp) &lt; 30;
-
- youngster
------------
- Sam
- Andy</PRE
-><P>
+     As explained in <A
+HREF="rowtypes.html#ROWTYPES-USAGE"
+>Section 8.16.5</A
+>, the field notation and
+     functional notation are equivalent.
     </P
-><DIV
-CLASS="TIP"
-><BLOCKQUOTE
-CLASS="TIP"
-><P
-><B
->Tip: </B
->      The equivalence between functional notation and attribute notation
-      makes it possible to use functions on composite types to emulate
-      <SPAN
-CLASS="QUOTE"
->"computed fields"</SPAN
->.
-      
-      
-      For example, using the previous definition
-      for <TT
-CLASS="LITERAL"
->double_salary(emp)</TT
->, we can write
-
-</P><PRE
-CLASS="SCREEN"
->SELECT emp.name, emp.double_salary FROM emp;</PRE
-><P>
-
-      An application using this wouldn't need to be directly aware that
-      <TT
-CLASS="LITERAL"
->double_salary</TT
-> isn't a real column of the table.
-      (You can also emulate computed fields with views.)
-     </P
-><P
->      Because of this behavior, it's unwise to give a function that takes
-      a single composite-type argument the same name as any of the fields of
-      that composite type.
-     </P
-></BLOCKQUOTE
-></DIV
 ><P
 >     Another way to use a function returning a composite type is to pass the
      result to another function that accepts the correct row type as input:
@@ -879,13 +838,6 @@
 (1 row)</PRE
 ><P>
     </P
-><P
->     Still another way to use a function that returns a composite type is to
-     call it as a table function, as described in <A
-HREF="xfunc-sql.html#XFUNC-SQL-TABLE-FUNCTIONS"
->Section 35.4.7</A
->.
-    </P
 ></DIV
 ><DIV
 CLASS="SECT2"
@@ -1594,7 +1546,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN56786"
+NAME="AEN57039"
 >35.4.10. Polymorphic <ACRONYM
 CLASS="ACRONYM"
 >SQL</ACRONYM
@@ -1748,7 +1700,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN56812"
+NAME="AEN57065"
 >35.4.11. <ACRONYM
 CLASS="ACRONYM"
 >SQL</ACRONYM
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-volatility.html postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-volatility.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xfunc-volatility.html	2016-03-28 20:20:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xfunc-volatility.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xindex.html postgresql-9.5-9.5.8/doc/src/sgml/html/xindex.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xindex.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xindex.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -1174,7 +1174,7 @@
 ></A
 ><P
 ><B
->Table 35-13. GIN Support Functions</B
+>Table 35-13. BRIN Support Functions</B
 ></P
 ><TABLE
 BORDER="1"
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xml2.html postgresql-9.5-9.5.8/doc/src/sgml/html/xml2.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xml2.html	2016-03-28 20:21:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xml2.html	2017-08-07 21:33:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Additional Supplied Modules"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -107,7 +107,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174909"
+NAME="AEN179766"
 >F.44.1. Deprecation Notice</A
 ></H2
 ><P
@@ -138,13 +138,13 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174914"
+NAME="AEN179771"
 >F.44.2. Description of Functions</A
 ></H2
 ><P
 >   <A
 HREF="xml2.html#XML2-FUNCTIONS-TABLE"
->Table F-33</A
+>Table F-35</A
 > shows the functions provided by this module.
    These functions provide straightforward XML parsing and XPath queries.
    All arguments are of type <TT
@@ -159,7 +159,7 @@
 ></A
 ><P
 ><B
->Table F-33. Functions</B
+>Table F-35. Functions</B
 ></P
 ><TABLE
 BORDER="1"
@@ -403,7 +403,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN174996"
+NAME="AEN179853"
 >F.44.3. <TT
 CLASS="LITERAL"
 >xpath_table</TT
@@ -423,7 +423,7 @@
    can readily be used in joins.  The parameters are described in
    <A
 HREF="xml2.html#XML2-XPATH-TABLE-PARAMETERS"
->Table F-34</A
+>Table F-36</A
 >.
   </P
 ><DIV
@@ -433,7 +433,7 @@
 ></A
 ><P
 ><B
->Table F-34. <CODE
+>Table F-36. <CODE
 CLASS="FUNCTION"
 >xpath_table</CODE
 > Parameters</B
@@ -640,7 +640,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN175062"
+NAME="AEN179919"
 >F.44.3.1. Multivalued Results</A
 ></H3
 ><P
@@ -728,7 +728,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN175072"
+NAME="AEN179929"
 >F.44.4. XSLT Functions</A
 ></H2
 ><P
@@ -739,7 +739,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN175075"
+NAME="AEN179932"
 >F.44.4.1. <TT
 CLASS="LITERAL"
 >xslt_process</TT
@@ -776,7 +776,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN175086"
+NAME="AEN179943"
 >F.44.5. Author</A
 ></H2
 ><P
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xoper.html postgresql-9.5-9.5.8/doc/src/sgml/html/xoper.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xoper.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xoper.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xoper-optimization.html postgresql-9.5-9.5.8/doc/src/sgml/html/xoper-optimization.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xoper-optimization.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xoper-optimization.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
@@ -119,14 +119,14 @@
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
 >.  The ones described here are all
-    the ones that release 9.5.2 understands.
+    the ones that release 9.5.8 understands.
    </P
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN58171"
+NAME="AEN58428"
 >35.13.1. <TT
 CLASS="LITERAL"
 >COMMUTATOR</TT
@@ -281,7 +281,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN58206"
+NAME="AEN58463"
 >35.13.2. <TT
 CLASS="LITERAL"
 >NEGATOR</TT
@@ -346,7 +346,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN58222"
+NAME="AEN58479"
 >35.13.3. <TT
 CLASS="LITERAL"
 >RESTRICT</TT
@@ -550,7 +550,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN58272"
+NAME="AEN58529"
 >35.13.4. <TT
 CLASS="LITERAL"
 >JOIN</TT
@@ -674,7 +674,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN58304"
+NAME="AEN58561"
 >35.13.5. <TT
 CLASS="LITERAL"
 >HASHES</TT
@@ -804,7 +804,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN58326"
+NAME="AEN58583"
 >35.13.6. <TT
 CLASS="LITERAL"
 >MERGES</TT
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xplang.html postgresql-9.5-9.5.8/doc/src/sgml/html/xplang.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xplang.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xplang.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Server Programming"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="CHAPTER"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xplang-install.html postgresql-9.5-9.5.8/doc/src/sgml/html/xplang-install.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xplang-install.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xplang-install.html	2017-08-07 21:32:16.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Procedural Languages"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/html/xtypes.html postgresql-9.5-9.5.8/doc/src/sgml/html/xtypes.html
--- postgresql-9.5-9.5.2/doc/src/sgml/html/xtypes.html	2016-03-28 20:20:46.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/html/xtypes.html	2017-08-07 21:32:15.000000000 +0000
@@ -9,7 +9,7 @@
 REV="MADE"
 HREF="mailto:pgsql-docs@postgresql.org"><LINK
 REL="HOME"
-TITLE="PostgreSQL 9.5.2 Documentation"
+TITLE="PostgreSQL 9.5.8 Documentation"
 HREF="index.html"><LINK
 REL="UP"
 TITLE="Extending SQL"
@@ -26,7 +26,7 @@
 HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=ISO-8859-1"><META
 NAME="creation"
-CONTENT="2016-03-28T20:20:27"></HEAD
+CONTENT="2017-08-07T21:31:58"></HEAD
 ><BODY
 CLASS="SECT1"
 ><DIV
@@ -44,7 +44,7 @@
 VALIGN="bottom"
 ><A
 HREF="index.html"
->PostgreSQL 9.5.2 Documentation</A
+>PostgreSQL 9.5.8 Documentation</A
 ></TH
 ></TR
 ><TR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/indices.sgml postgresql-9.5-9.5.8/doc/src/sgml/indices.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/indices.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/indices.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -395,7 +395,8 @@
   </para>
 
   <para>
-   Currently, only the B-tree, GiST and GIN index types support multicolumn
+   Currently, only the B-tree, GiST, GIN, and BRIN
+   index types support multicolumn
    indexes.  Up to 32 columns can be specified.  (This limit can be
    altered when building <productname>PostgreSQL</productname>; see the
    file <filename>pg_config_manual.h</filename>.)
@@ -441,6 +442,15 @@
   </para>
 
   <para>
+   A multicolumn BRIN index can be used with query conditions that
+   involve any subset of the index's columns. Like GIN and unlike B-tree or
+   GiST, index search effectiveness is the same regardless of which index
+   column(s) the query conditions use. The only reason to have multiple BRIN
+   indexes instead of one multicolumn BRIN index on a single table is to have
+   a different <literal>pages_per_range</literal> storage parameter.
+  </para>
+
+  <para>
    Of course, each column must be used with operators appropriate to the index
    type; clauses that involve other operators will not be considered.
   </para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/information_schema.sgml postgresql-9.5-9.5.8/doc/src/sgml/information_schema.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/information_schema.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/information_schema.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -2898,18 +2898,6 @@
      </row>
 
      <row>
-      <entry><literal>foreign_server_catalog</literal></entry>
-      <entry><type>sql_identifier</type></entry>
-      <entry>Name of the database that the foreign server is defined in (always the current database)</entry>
-     </row>
-
-     <row>
-      <entry><literal>foreign_server_name</literal></entry>
-      <entry><type>sql_identifier</type></entry>
-      <entry>Name of the foreign server</entry>
-     </row>
-
-     <row>
       <entry><literal>option_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
       <entry>Name of an option</entry>
@@ -5881,7 +5869,7 @@
    The view <literal>udt_privileges</literal> identifies
    <literal>USAGE</literal> privileges granted on user-defined types to a
    currently enabled role or by a currently enabled role.  There is one row for
-   each combination of column, grantor, and grantee.  This view shows only
+   each combination of type, grantor, and grantee.  This view shows only
    composite types (see under <xref linkend="infoschema-user-defined-types">
    for why); see
    <xref linkend="infoschema-usage-privileges"> for domain privileges.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/info.sgml postgresql-9.5-9.5.8/doc/src/sgml/info.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/info.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/info.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -14,10 +14,10 @@
     <listitem>
      <para>
       The <productname>PostgreSQL</productname> <ulink
-      url="http://wiki.postgresql.org">wiki</ulink> contains the project's <ulink
-      url="http://wiki.postgresql.org/wiki/Frequently_Asked_Questions">FAQ</>
+      url="https://wiki.postgresql.org">wiki</ulink> contains the project's <ulink
+      url="https://wiki.postgresql.org/wiki/Frequently_Asked_Questions">FAQ</>
       (Frequently Asked Questions) list, <ulink
-      url="http://wiki.postgresql.org/wiki/Todo">TODO</> list, and
+      url="https://wiki.postgresql.org/wiki/Todo">TODO</> list, and
       detailed information about many more topics.
      </para>
     </listitem>
@@ -28,7 +28,7 @@
     <listitem>
      <para>
       The <productname>PostgreSQL</productname>
-      <ulink url="http://www.postgresql.org">web site</ulink>
+      <ulink url="https://www.postgresql.org">web site</ulink>
       carries details on the latest release and other
       information to make your work or play with
       <productname>PostgreSQL</productname> more productive.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/installation.sgml postgresql-9.5-9.5.8/doc/src/sgml/installation.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/installation.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/installation.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -163,6 +163,7 @@
       <application>PL/Perl</application> you need a full
       <productname>Perl</productname> installation, including the
       <filename>libperl</filename> library and the header files.
+      The minimum required version is <productname>Perl</productname> 5.8.3.
       Since <application>PL/Perl</application> will be a shared
       library, the <indexterm><primary>libperl</primary></indexterm>
       <filename>libperl</filename> library must be a shared library
@@ -307,7 +308,7 @@
        <primary>perl</primary>
       </indexterm>
 
-      <application>Perl</> 5.8 or later is needed to build from a Git checkout,
+      <application>Perl</> 5.8.3 or later is needed to build from a Git checkout,
       or if you changed the input files for any of the build steps that
       use Perl scripts.  If building on Windows you will need
       <application>Perl</> in any case.  <application>Perl</application> is
@@ -344,7 +345,7 @@
   <para>
    The <productname>PostgreSQL</> &version; sources can be obtained from the
    download section of our
-   website: <ulink url="http://www.postgresql.org/download/"></ulink>.  You
+   website: <ulink url="https://www.postgresql.org/download/"></ulink>.  You
    should get a file named <filename>postgresql-&version;.tar.gz</filename>
    or <filename>postgresql-&version;.tar.bz2</filename>. After
    you have obtained the file, unpack it:
@@ -1396,7 +1397,7 @@
        <term><envar>PERL</envar></term>
        <listitem>
         <para>
-         Full path to the Perl interpreter.  This will be used to
+         Full path name of the Perl interpreter.  This will be used to
          determine the dependencies for building PL/Perl.
         </para>
        </listitem>
@@ -1406,7 +1407,7 @@
        <term><envar>PYTHON</envar></term>
        <listitem>
         <para>
-         Full path to the Python interpreter.  This will be used to
+         Full path name of the Python interpreter.  This will be used to
          determine the dependencies for building PL/Python.  Also,
          whether Python 2 or 3 is specified here (or otherwise
          implicitly chosen) determines which variant of the PL/Python
@@ -1423,7 +1424,7 @@
        <term><envar>TCLSH</envar></term>
        <listitem>
         <para>
-         Full path to the Tcl interpreter.  This will be used to
+         Full path name of the Tcl interpreter.  This will be used to
          determine the dependencies for building PL/Tcl, and it will
          be substituted into Tcl scripts.
         </para>
@@ -1442,6 +1443,26 @@
      </variablelist>
     </para>
 
+    <para>
+     Sometimes it is useful to add compiler flags after-the-fact to the set
+     that were chosen by <filename>configure</>.  An important example is
+     that <application>gcc</>'s <option>-Werror</> option cannot be included
+     in the <envar>CFLAGS</envar> passed to <filename>configure</>, because
+     it will break many of <filename>configure</>'s built-in tests.  To add
+     such flags, include them in the <envar>COPT</envar> environment variable
+     while running <filename>make</>.  The contents of <envar>COPT</envar>
+     are added to both the <envar>CFLAGS</envar> and <envar>LDFLAGS</envar>
+     options set up by <filename>configure</>.  For example, you could do
+<screen>
+<userinput>make COPT='-Werror'</>
+</screen>
+     or
+<screen>
+<userinput>export COPT='-Werror'</>
+<userinput>make</>
+</screen>
+    </para>
+
     <note>
      <para>
       When developing code inside the server, it is recommended to
@@ -1462,6 +1483,14 @@
       <option>-O0</>.  An easy way to do this is by passing an option
       to <application>make</>: <command>make PROFILE=-O0 file.o</>.
      </para>
+
+     <para>
+      The <envar>COPT</> and <envar>PROFILE</> environment variables are
+      actually handled identically by the <productname>PostgreSQL</>
+      makefiles.  Which to use is a matter of preference, but a common habit
+      among developers is to use <envar>PROFILE</> for one-time flag
+      adjustments, while <envar>COPT</> might be kept set all the time.
+     </para>
     </note>
    </step>
 
@@ -1477,7 +1506,7 @@
     will take a few minutes depending on your
     hardware. The last line displayed should be:
 <screen>
-All of PostgreSQL is successfully made. Ready to install.
+All of PostgreSQL successfully made. Ready to install.
 </screen>
    </para>
 
@@ -1490,7 +1519,7 @@
 </screen>
    The last line displayed should be:
 <screen>
-PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
+PostgreSQL, contrib, and documentation successfully made. Ready to install.
 </screen>
    </para>
   </step>
@@ -1957,7 +1986,7 @@
    it has recently been verified to build and pass its regression tests
    on that platform.  Currently, most testing of platform compatibility
    is done automatically by test machines in the
-   <ulink url="http://buildfarm.postgresql.org/">PostgreSQL Build Farm</ulink>.
+   <ulink url="https://buildfarm.postgresql.org/">PostgreSQL Build Farm</ulink>.
    If you are interested in using <productname>PostgreSQL</> on a platform
    that is not represented in the build farm, but on which the code works
    or can be made to work, you are strongly encouraged to set up a build
@@ -2133,7 +2162,7 @@
      should take care of it.
     </para>
 
-    <!-- http://archives.postgresql.org/message-id/6064jt6cfm.fsf_-_@dba2.int.libertyrms.com -->
+    <!-- https://archives.postgresql.org/message-id/6064jt6cfm.fsf_-_@dba2.int.libertyrms.com -->
 
     <para>
      One user reports:
@@ -2195,7 +2224,7 @@
 
    <sect3>
     <title>Memory Management</title>
-    <!-- http://archives.postgresql.org/message-id/603bgqmpl9.fsf@dba2.int.libertyrms.com -->
+    <!-- https://archives.postgresql.org/message-id/603bgqmpl9.fsf@dba2.int.libertyrms.com -->
 
     <para>
      AIX can be somewhat peculiar with regards to the way it does
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/install-windows.sgml postgresql-9.5-9.5.8/doc/src/sgml/install-windows.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/install-windows.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/install-windows.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -19,10 +19,10 @@
  <para>
   There are several different ways of building PostgreSQL on
   <productname>Windows</productname>. The simplest way to build with
-  Microsoft tools is to install <productname>Visual Studio Express 2013
+  Microsoft tools is to install <productname>Visual Studio Express 2015
   for Windows Desktop</productname> and use the included
   compiler. It is also possible to build with the full
-  <productname>Microsoft Visual C++ 2005 to 2013</productname>.
+  <productname>Microsoft Visual C++ 2005 to 2015</productname>.
   In some cases that requires the installation of the
   <productname>Windows SDK</productname> in addition to the compiler.
  </para>
@@ -77,19 +77,26 @@
   <productname>Visual Studio Express</productname> or some versions of the
   <productname>Microsoft Windows SDK</productname>. If you do not already have a
   <productname>Visual Studio</productname> environment set up, the easiest
-  ways are to use the compilers from <productname>Visual Studio Express 2013
+  ways are to use the compilers from <productname>Visual Studio Express 2015
   for Windows Desktop</productname> or those in the <productname>Windows SDK
   7.1</productname>, which are both free downloads from Microsoft.
  </para>
 
  <para>
-  PostgreSQL is known to support compilation using the compilers shipped with
+  Both 32-bit and 64-bit builds are possible with the Microsoft Compiler suite.
+  32-bit PostgreSQL builds are possible with
   <productname>Visual Studio 2005</productname> to
-  <productname>Visual Studio 2013</productname> (including Express editions),
+  <productname>Visual Studio 2015</productname> (including Express editions),
   as well as standalone Windows SDK releases 6.0 to 7.1.
-  64-bit PostgreSQL builds are only supported with
+  64-bit PostgreSQL builds are supported with
   <productname>Microsoft Windows SDK</productname> version 6.0a to 7.1 or
-  <productname>Visual Studio 2008</productname> and above.
+  <productname>Visual Studio 2008</productname> and above. Compilation
+  is supported down to <productname>Windows XP</productname> and
+  <productname>Windows Server 2003</> when building with
+  <productname>Visual Studio 2005</> to
+  <productname>Visual Studio 2013</productname>. Building with
+  <productname>Visual Studio 2015</productname> is supported down to
+  <productname>Windows Vista</> and <productname>Windows Server 2008</>.
  </para>
 
  <para>
@@ -154,7 +161,7 @@
       <productname>Microsoft Windows SDK</productname> it
       is recommended that you upgrade to the latest version (currently
       version 7.1), available for download from
-      <ulink url="http://www.microsoft.com/downloads/"></>.
+      <ulink url="https://www.microsoft.com/download"></>.
      </para>
      <para>
       You must always include the
@@ -173,7 +180,8 @@
       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 or later is required,
+      <ulink url="http://www.activestate.com"></>
+      (Note: version 5.8.3 or later is required,
       the free Standard Distribution is sufficient).
      </para></listitem>
     </varlistentry>
@@ -210,9 +218,7 @@
       Both <productname>Bison</productname> and <productname>Flex</productname>
       are included in the <productname>msys</productname> tool suite, available
       from <ulink url="http://www.mingw.org/wiki/MSYS"></> as part of the
-      <productname>MinGW</productname> compiler suite. You can also get
-      <productname>msys</productname> as part of
-      <productname>msysGit</productname> from <ulink url="http://git-scm.com/"></>.
+      <productname>MinGW</productname> compiler suite.
      </para>
 
      <para>
@@ -221,9 +227,7 @@
       PATH environment variable in <filename>buildenv.pl</filename> unless
       they are already in PATH. In the case of MinGW, the directory is the
       <filename>\msys\1.0\bin</filename> subdirectory of your MinGW
-      installation directory. For msysGit, it's the <filename>bin</filename>
-      directory in your Git install directory. Do not add the MinGW compiler
-      tools themselves to PATH.
+      installation directory.
      </para>
 
      <note>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/legal.sgml postgresql-9.5-9.5.8/doc/src/sgml/legal.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/legal.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/legal.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -1,9 +1,9 @@
 <!-- doc/src/sgml/legal.sgml -->
 
-<date>2016</date>
+<date>2017</date>
 
 <copyright>
- <year>1996-2016</year>
+ <year>1996-2017</year>
  <holder>The PostgreSQL Global Development Group</holder>
 </copyright>
 
@@ -11,7 +11,7 @@
  <title>Legal Notice</title>
 
  <para>
-  <productname>PostgreSQL</productname> is Copyright &copy; 1996-2016
+  <productname>PostgreSQL</productname> is Copyright &copy; 1996-2017
   by the PostgreSQL Global Development Group.
  </para>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/libpq.sgml postgresql-9.5-9.5.8/doc/src/sgml/libpq.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/libpq.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/libpq.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -1073,10 +1073,10 @@
         Controls the number of seconds of inactivity after which TCP should
         send a keepalive message to the server.  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_KEEPIDLE</> or <symbol>TCP_KEEPALIVE</>
-        socket option is available, and on Windows; on other systems, it has no
-        effect.
+        Unix-domain socket, or if keepalives are disabled.
+        It is only supported on systems where <symbol>TCP_KEEPIDLE</> or
+        an equivalent socket option is available, and on Windows; on other
+        systems, it has no effect.
        </para>
       </listitem>
      </varlistentry>
@@ -1089,9 +1089,9 @@
         that is not acknowledged by the server should be retransmitted.  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</>
-        socket option is available, and on Windows; on other systems, it has no
-        effect.
+        It is only supported on systems where <symbol>TCP_KEEPINTVL</> or
+        an equivalent socket option is available, and on Windows; on other
+        systems, it has no effect.
        </para>
       </listitem>
      </varlistentry>
@@ -1104,8 +1104,9 @@
         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_KEEPCNT</>
-        socket option is available; on other systems, it has no effect.
+        It is only supported on systems where <symbol>TCP_KEEPCNT</> or
+        an equivalent socket option is available; on other systems, it has no
+        effect.
        </para>
       </listitem>
      </varlistentry>
@@ -6787,22 +6788,6 @@
     <listitem>
      <para>
       <indexterm>
-       <primary><envar>PGREALM</envar></primary>
-      </indexterm>
-      <envar>PGREALM</envar> sets the Kerberos realm to use with
-      <productname>PostgreSQL</productname>, if  it is different from the
-      local realm.  If <envar>PGREALM</envar> is set,
-      <application>libpq</application> applications will attempt
-      authentication  with  servers for this realm and use separate ticket
-      files to avoid conflicts with local ticket files.   This
-      environment  variable is only used if GSSAPI authentication is
-      selected by the server.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <indexterm>
        <primary><envar>PGOPTIONS</envar></primary>
       </indexterm>
       <envar>PGOPTIONS</envar> behaves the same as the <xref
@@ -6837,6 +6822,9 @@
       </indexterm>
       <envar>PGREQUIRESSL</envar> behaves the same as the <xref
       linkend="libpq-connect-requiressl"> connection parameter.
+      This environment variable is deprecated in favor of the
+      <envar>PGSSLMODE</envar> variable; setting both variables suppresses the
+      effect of this one.
      </para>
     </listitem>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/logicaldecoding.sgml postgresql-9.5-9.5.8/doc/src/sgml/logicaldecoding.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/logicaldecoding.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/logicaldecoding.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -6,7 +6,7 @@
   </indexterm>
   <para>
    PostgreSQL provides infrastructure to stream the modifications performed
-   via SQL to external consumers.  This functionality can be used to for a
+   via SQL to external consumers.  This functionality can be used for a
    variety of purposes, including replication solutions and auditing.
   </para>
 
@@ -192,7 +192,7 @@
     </para>
    </sect2>
 
-   <sect2>
+   <sect2 id="logicaldecoding-replication-slots">
     <title>Replication Slots</title>
 
     <indexterm>
@@ -324,7 +324,7 @@
    <title>System Catalogs Related to Logical Decoding</title>
 
    <para>
-    The <link linkend="catalog-pg-replication-slots"><structname>pg_replication_slots</structname></link>
+    The <link linkend="view-pg-replication-slots"><structname>pg_replication_slots</structname></link>
     view and the
     <link linkend="monitoring-stats-views-table"><structname>pg_stat_replication</structname></link>
     view provide information about the current state of replication slots and
@@ -367,7 +367,7 @@
     LogicalDecodeShutdownCB shutdown_cb;
 } OutputPluginCallbacks;
 
-typedef void (*LogicalOutputPluginInit)(struct OutputPluginCallbacks *cb);
+typedef void (*LogicalOutputPluginInit) (struct OutputPluginCallbacks *cb);
 </programlisting>
      The <function>begin_cb</function>, <function>change_cb</function>
      and <function>commit_cb</function> callbacks are required,
@@ -406,7 +406,7 @@
      data in a data type that can contain arbitrary data (e.g., <type>bytea</type>) is
      cumbersome. If the output plugin only outputs textual data in the
      server's encoding, it can declare that by
-     setting <literal>OutputPluginOptions.output_mode</>
+     setting <literal>OutputPluginOptions.output_type</>
      to <literal>OUTPUT_PLUGIN_TEXTUAL_OUTPUT</> instead
      of <literal>OUTPUT_PLUGIN_BINARY_OUTPUT</> in
      the <link linkend="logicaldecoding-output-plugin-startup">startup
@@ -452,11 +452,9 @@
       a replication slot is created or asked to stream changes, independent
       of the number of changes that are ready to be put out.
 <programlisting>
-typedef void (*LogicalDecodeStartupCB) (
-    struct LogicalDecodingContext *ctx,
-    OutputPluginOptions *options,
-    bool is_init
-);
+typedef void (*LogicalDecodeStartupCB) (struct LogicalDecodingContext *ctx,
+                                        OutputPluginOptions *options,
+                                        bool is_init);
 </programlisting>
       The <literal>is_init</literal> parameter will be true when the
       replication slot is being created and false
@@ -491,9 +489,7 @@
       be used to deallocate resources private to the output plugin. The slot
       isn't necessarily being dropped, streaming is just being stopped.
 <programlisting>
-typedef void (*LogicalDecodeShutdownCB) (
-    struct LogicalDecodingContext *ctx
-);
+typedef void (*LogicalDecodeShutdownCB) (struct LogicalDecodingContext *ctx);
 </programlisting>
      </para>
     </sect3>
@@ -506,10 +502,8 @@
       start of a committed transaction has been decoded. Aborted transactions
       and their contents never get decoded.
 <programlisting>
-typedef void (*LogicalDecodeBeginCB) (
-    struct LogicalDecodingContext *,
-    ReorderBufferTXN *txn
-);
+typedef void (*LogicalDecodeBeginCB) (struct LogicalDecodingContext *ctx,
+                                      ReorderBufferTXN *txn);
 </programlisting>
       The <parameter>txn</parameter> parameter contains meta information about
       the transaction, like the time stamp at which it has been committed and
@@ -527,10 +521,9 @@
       rows will have been called before this, if there have been any modified
       rows.
 <programlisting>
-typedef void (*LogicalDecodeCommitCB) (
-    struct LogicalDecodingContext *,
-    ReorderBufferTXN *txn
-);
+typedef void (*LogicalDecodeCommitCB) (struct LogicalDecodingContext *ctx,
+                                       ReorderBufferTXN *txn,
+                                       XLogRecPtr commit_lsn);
 </programlisting>
      </para>
     </sect3>
@@ -546,12 +539,10 @@
       several rows at once the callback will be called individually for each
       row.
 <programlisting>
-typedef void (*LogicalDecodeChangeCB) (
-    struct LogicalDecodingContext *ctx,
-    ReorderBufferTXN *txn,
-    Relation relation,
-    ReorderBufferChange *change
-);
+typedef void (*LogicalDecodeChangeCB) (struct LogicalDecodingContext *ctx,
+                                       ReorderBufferTXN *txn,
+                                       Relation relation,
+                                       ReorderBufferChange *change);
 </programlisting>
       The <parameter>ctx</parameter> and <parameter>txn</parameter> parameters
       have the same contents as for the <function>begin_cb</function>
@@ -581,10 +572,8 @@
        from <parameter>origin_id</parameter> is of interest to the
        output plugin.
 <programlisting>
-typedef bool (*LogicalDecodeFilterByOriginCB) (
-    struct LogicalDecodingContext *ctx,
-    RepNodeId origin_id
-);
+typedef bool (*LogicalDecodeFilterByOriginCB) (struct LogicalDecodingContext *ctx,
+                                               RepOriginId origin_id);
 </programlisting>
       The <parameter>ctx</parameter> parameter has the same contents
       as for the other callbacks. No information but the origin is
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/maintenance.sgml postgresql-9.5-9.5.8/doc/src/sgml/maintenance.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/maintenance.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/maintenance.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -386,7 +386,8 @@
     </indexterm>
 
    <para>
-    <productname>PostgreSQL</productname>'s MVCC transaction semantics
+    <productname>PostgreSQL</productname>'s
+    <link linkend="mvcc-intro">MVCC</link> transaction semantics
     depend on being able to compare transaction ID (<acronym>XID</>)
     numbers: a row version with an insertion XID greater than the current
     transaction's XID is <quote>in the future</> and should not be visible
@@ -404,13 +405,10 @@
    <para>
     The reason that periodic vacuuming solves the problem is that
     <command>VACUUM</> will mark rows as <emphasis>frozen</>, indicating that
-    they were inserted by a transaction which committed sufficiently far in
-    the past that the effects of the inserting transaction is certain to be
-    visible, from an MVCC perspective, to all current and future transactions.
-    <productname>PostgreSQL</> reserves a special XID,
-    <literal>FrozenTransactionId</>, which does not follow the normal XID
-    comparison rules and is always considered older
-    than every normal XID. Normal XIDs are
+    they were inserted by a transaction that committed sufficiently far in
+    the past that the effects of the inserting transaction are certain to be
+    visible to all current and future transactions.
+    Normal XIDs are
     compared using modulo-2<superscript>32</> arithmetic. This means
     that for every normal XID, there are two billion XIDs that are
     <quote>older</> and two billion that are <quote>newer</>; another
@@ -420,16 +418,40 @@
     the next two billion transactions, no matter which normal XID we are
     talking about. If the row version still exists after more than two billion
     transactions, it will suddenly appear to be in the future. To
-    prevent this, frozen row versions are treated as if the inserting XID were
+    prevent this, <productname>PostgreSQL</> reserves a special XID,
+    <literal>FrozenTransactionId</>, which does not follow the normal XID
+    comparison rules and is always considered older
+    than every normal XID.
+    Frozen row versions are treated as if the inserting XID were
     <literal>FrozenTransactionId</>, so that they will appear to be
     <quote>in the past</> to all normal transactions regardless of wraparound
     issues, and so such row versions will be valid until deleted, no matter
     how long that is.
    </para>
 
+   <note>
+    <para>
+     In <productname>PostgreSQL</> versions before 9.4, freezing was
+     implemented by actually replacing a row's insertion XID
+     with <literal>FrozenTransactionId</>, which was visible in the
+     row's <structname>xmin</> system column.  Newer versions just set a flag
+     bit, preserving the row's original <structname>xmin</> for possible
+     forensic use.  However, rows with <structname>xmin</> equal
+     to <literal>FrozenTransactionId</> (2) may still be found
+     in databases <application>pg_upgrade</>'d from pre-9.4 versions.
+    </para>
+    <para>
+     Also, system catalogs may contain rows with <structname>xmin</> equal
+     to <literal>BootstrapTransactionId</> (1), indicating that they were
+     inserted during the first phase of <application>initdb</>.
+     Like <literal>FrozenTransactionId</>, this special XID is treated as
+     older than every normal XID.
+    </para>
+   </note>
+
    <para>
     <xref linkend="guc-vacuum-freeze-min-age">
-    controls how old an XID value has to be before its row version will be
+    controls how old an XID value has to be before rows bearing that XID will be
     frozen.  Increasing this setting may avoid unnecessary work if the
     rows that would otherwise be frozen will soon be modified again,
     but decreasing this setting increases
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/clusterdb.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/clusterdb.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/clusterdb.1	2016-03-28 20:22:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/clusterdb.1	2017-08-07 21:34:17.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: clusterdb
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CLUSTERDB" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CLUSTERDB" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/createdb.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/createdb.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/createdb.1	2016-03-28 20:22:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/createdb.1	2017-08-07 21:34:18.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: createdb
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATEDB" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATEDB" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/createlang.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/createlang.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/createlang.1	2016-03-28 20:22:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/createlang.1	2017-08-07 21:34:18.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: createlang
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATELANG" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATELANG" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/createuser.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/createuser.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/createuser.1	2016-03-28 20:22:40.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/createuser.1	2017-08-07 21:34:18.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: createuser
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATEUSER" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATEUSER" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/dropdb.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/dropdb.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/dropdb.1	2016-03-28 20:22:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/dropdb.1	2017-08-07 21:34:19.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dropdb
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROPDB" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROPDB" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/droplang.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/droplang.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/droplang.1	2016-03-28 20:22:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/droplang.1	2017-08-07 21:34:19.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: droplang
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROPLANG" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROPLANG" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/dropuser.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/dropuser.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/dropuser.1	2016-03-28 20:22:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/dropuser.1	2017-08-07 21:34:19.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dropuser
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROPUSER" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROPUSER" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/ecpg.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/ecpg.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/ecpg.1	2016-03-28 20:22:41.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/ecpg.1	2017-08-07 21:34:19.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ecpg
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ECPG" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ECPG" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -39,12 +39,9 @@
 .PP
 \fBecpg\fR
 will convert each input file given on the command line to the corresponding C output file\&. Input files preferably have the extension
-\&.pgc, in which case the extension will be replaced by
+\&.pgc\&. The extension will be replaced by
 \&.c
-to determine the output file name\&. If the extension of the input file is not
-\&.pgc, then the output file name is computed by appending
-\&.c
-to the full file name\&. The output file name can also be overridden using the
+to determine the output file name\&. The output file name can also be overridden using the
 \fB\-o\fR
 option\&.
 .PP
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/initdb.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/initdb.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/initdb.1	2016-03-28 20:22:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/initdb.1	2017-08-07 21:34:27.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: initdb
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "INITDB" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "INITDB" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/oid2name.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/oid2name.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/oid2name.1	2016-03-28 20:22:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/oid2name.1	2017-08-07 21:34:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: oid2name
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "OID2NAME" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "OID2NAME" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_archivecleanup.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_archivecleanup.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_archivecleanup.1	2016-03-28 20:22:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_archivecleanup.1	2017-08-07 21:34:27.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_archivecleanup
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_ARCHIVECLEANUP" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_ARCHIVECLEANUP" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_basebackup.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_basebackup.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_basebackup.1	2016-03-28 20:22:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_basebackup.1	2017-08-07 21:34:20.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_basebackup
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_BASEBACKUP" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_BASEBACKUP" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -90,7 +90,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-There is no guarantee that all WAL files required for the backup are archived at the end of backup\&. If you are planning to use the backup for an archive recovery and want to ensure that all required files are available at that moment, you need to include them into the backup by using
+There is no guarantee that all WAL files required for the backup are archived at the end of backup\&. If you are planning to use the backup for an archive recovery and want to ensure that all required files are available at that moment, you need to include them into the backup by using the
 \-x
 option\&.
 .RE
@@ -280,7 +280,7 @@
 .br
 \fB\-\-compress=\fR\fB\fIlevel\fR\fR
 .RS 4
-Enables gzip compression of tar file output, and specifies the compression level (1 through 9, 9 being best compression)\&. Compression is only available when using the tar format\&.
+Enables gzip compression of tar file output, and specifies the compression level (0 through 9, 0 being no compression and 9 being best compression)\&. Compression is only available when using the tar format\&.
 .RE
 .PP
 The following command\-line options control the generation of the backup and the running of the program\&.
@@ -289,7 +289,7 @@
 .br
 \fB\-\-checkpoint=\fR\fB\fIfast|spread\fR\fR
 .RS 4
-Sets checkpoint mode to fast or spread (default) (see
+Sets checkpoint mode to fast (immediate) or spread (default) (see
 Section 24.3.3, \(lqMaking a Base Backup Using the Low Level API\(rq, in the documentation)\&.
 .RE
 .PP
@@ -423,6 +423,12 @@
 Section 31.14, \(lqEnvironment Variables\(rq, in the documentation)\&.
 .SH "NOTES"
 .PP
+At the beginning of the backup, a checkpoint needs to be written on the server the backup is taken from\&. Especially if the option
+\-\-checkpoint=fast
+is not used, this can take some time during which
+pg_basebackup
+will be appear to be idle\&.
+.PP
 The backup will include all files in the data directory and tablespaces, including the configuration files and any additional files placed in the directory by third parties\&. But only regular files and directories are copied\&. Symbolic links (other than those used for tablespaces) and special device files are skipped\&. (See
 Section 50.3, \(lqStreaming Replication Protocol\(rq, in the documentation
 for the precise details\&.)
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pgbench.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pgbench.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pgbench.1	2016-03-28 20:22:42.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pgbench.1	2017-08-07 21:34:21.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pgbench
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PGBENCH" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PGBENCH" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -634,7 +634,7 @@
 option, explained above, or by the meta commands explained below\&. In addition to any variables preset by
 \fB\-D\fR
 command\-line options, there are a few variables that are preset automatically, listed in
-Table\ \&221, \(lqAutomatic variables\(rq\&. A value specified for these variables using
+Table\ \&222, \(lqAutomatic variables\(rq\&. A value specified for these variables using
 \fB\-D\fR
 takes precedence over the automatic presets\&. Once set, a variable\*(Aqs value can be inserted into a SQL command by writing
 :\fIvariablename\fR\&. When running more than one client session, each session has its own set of variables\&.
@@ -643,7 +643,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&221.\ \&Automatic variables
+.B Table\ \&222.\ \&Automatic variables
 .TS
 allbox tab(:);
 lB lB.
@@ -948,13 +948,14 @@
 \fIschedule_lag\fR
 is the difference between the transaction\*(Aqs scheduled start time, and the time it actually started, in microseconds\&. It is only present when the
 \fB\-\-rate\fR
-option is used\&. The last field
-\fIskipped_transactions\fR
-reports the number of transactions skipped because they were too far behind schedule\&. It is only present when both options
+option is used\&. When both
 \fB\-\-rate\fR
 and
 \fB\-\-latency\-limit\fR
-are used\&.
+are used, the
+\fItime\fR
+for a skipped transaction will be reported as
+skipped\&.
 .PP
 Here is a snippet of the log file generated:
 .sp
@@ -991,7 +992,7 @@
 .RE
 .\}
 .sp
-In this example, transaction 82 was late, because it\*(Aqs latency (6\&.173 ms) was over the 5 ms limit\&. The next two transactions were skipped, because they were already late before they were even started\&.
+In this example, transaction 82 was late, because its latency (6\&.173 ms) was over the 5 ms limit\&. The next two transactions were skipped, because they were already late before they were even started\&.
 .PP
 When running a long test on hardware that can handle a lot of transactions, the log files can become very large\&. The
 \fB\-\-sampling\-rate\fR
@@ -1022,7 +1023,7 @@
 \fIlatency_sum\fR
 is a sum of latencies and
 \fIlatency_2_sum\fR
-is a sum of 2nd powers of latencies\&. The last two fields are
+is a sum of 2nd powers of latencies\&. The next two fields are
 \fImin_latency\fR
 \- a minimum latency within the interval, and
 \fImax_latency\fR
@@ -1037,7 +1038,7 @@
 \fB\-\-latency\-limit\fR
 is present, too\&. They are calculated from the time each transaction had to wait for the previous one to finish, i\&.e\&. the difference between each transaction\*(Aqs scheduled start time and the time it actually started\&.
 .PP
-Here is example outputs:
+Here is example output:
 .sp
 .if n \{\
 .RS 4
@@ -1053,7 +1054,7 @@
 .RE
 .\}
 .PP
-Notice that while the plain (unaggregated) log file contains index of the custom script files, the aggregated log does not\&. Therefore if you need per script data, you need to aggregate the data on your own\&.
+Notice that while the plain (unaggregated) log file contains a reference to the custom script files, the aggregated log does not\&. Therefore if you need per script data, you need to aggregate the data on your own\&.
 .SS "Per\-Statement Latencies"
 .PP
 With the
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_config.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_config.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_config.1	2016-03-28 20:22:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_config.1	2017-08-07 21:34:21.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_config
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_CONFIG" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_CONFIG" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_controldata.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_controldata.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_controldata.1	2016-03-28 20:22:48.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_controldata.1	2017-08-07 21:34:27.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_controldata
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_CONTROLDATA" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_CONTROLDATA" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_ctl.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_ctl.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_ctl.1	2016-03-28 20:22:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_ctl.1	2017-08-07 21:34:28.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_ctl
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_CTL" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_CTL" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_dump.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_dump.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_dump.1	2016-03-28 20:22:43.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_dump.1	2017-08-07 21:34:22.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_dump
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_DUMP" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_DUMP" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -100,9 +100,9 @@
 \fB\-\-schema\fR,
 \fB\-\-table\fR, or
 \fB\-\-schema\-only\fR
-is specified, so the
+is specified\&. The
 \fB\-b\fR
-switch is only useful to add large objects to selective dumps\&.
+switch is therefore only useful to add large objects to dumps where a specific schema or table has been requested\&. Note that blobs are considered data and therefore will be included when \-\-data\-only is used, but not when \-\-schema\-only is\&.
 .RE
 .PP
 \fB\-c\fR
@@ -558,6 +558,12 @@
 to set
 row_security
 to on instead, allowing the user to dump the parts of the contents of the table that they have access to\&.
+.sp
+Note that if you use this option currently, you probably also want the dump be in
+\fBINSERT\fR
+format, as the
+\fBCOPY FROM\fR
+during restore does not support row security\&.
 .RE
 .PP
 \fB\-\-exclude\-table\-data=\fR\fB\fItable\fR\fR
@@ -629,7 +635,14 @@
 .PP
 \fB\-\-quote\-all\-identifiers\fR
 .RS 4
-Force quoting of all identifiers\&. This may be useful when dumping a database for migration to a future version that may have introduced additional keywords\&.
+Force quoting of all identifiers\&. This option is recommended when dumping a database from a server whose
+PostgreSQL
+major version is different from
+pg_dump\*(Aqs, or when the output is intended to be loaded into a server of a different major version\&. By default,
+pg_dump
+quotes only identifiers that are reserved words in its own major version\&. This sometimes results in compatibility issues when dealing with servers of other versions that may have slightly different sets of reserved words\&. Using
+\fB\-\-quote\-all\-identifiers\fR
+prevents such issues, at the price of a harder\-to\-read dump script\&.
 .RE
 .PP
 \fB\-\-section=\fR\fB\fIsectionname\fR\fR
@@ -872,7 +885,11 @@
 cannot dump from
 PostgreSQL
 servers newer than its own major version; it will refuse to even try, rather than risk making an invalid dump\&. Also, it is not guaranteed that
-pg_dump\*(Aqs output can be loaded into a server of an older major version \(em not even if the dump was taken from a server of that version\&. Loading a dump file into an older server may require manual editing of the dump file to remove syntax not understood by the older server\&.
+pg_dump\*(Aqs output can be loaded into a server of an older major version \(em not even if the dump was taken from a server of that version\&. Loading a dump file into an older server may require manual editing of the dump file to remove syntax not understood by the older server\&. Use of the
+\fB\-\-quote\-all\-identifiers\fR
+option is recommended in cross\-version cases, as it can prevent problems arising from varying reserved\-word lists in different
+PostgreSQL
+versions\&.
 .SH "EXAMPLES"
 .PP
 To dump a database called
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_dumpall.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_dumpall.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_dumpall.1	2016-03-28 20:22:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_dumpall.1	2017-08-07 21:34:22.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_dumpall
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_DUMPALL" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_DUMPALL" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -253,7 +253,14 @@
 .PP
 \fB\-\-quote\-all\-identifiers\fR
 .RS 4
-Force quoting of all identifiers\&. This may be useful when dumping a database for migration to a future version that may have introduced additional keywords\&.
+Force quoting of all identifiers\&. This option is recommended when dumping a database from a server whose
+PostgreSQL
+major version is different from
+pg_dumpall\*(Aqs, or when the output is intended to be loaded into a server of a different major version\&. By default,
+pg_dumpall
+quotes only identifiers that are reserved words in its own major version\&. This sometimes results in compatibility issues when dealing with servers of other versions that may have slightly different sets of reserved words\&. Using
+\fB\-\-quote\-all\-identifiers\fR
+prevents such issues, at the price of a harder\-to\-read dump script\&.
 .RE
 .PP
 \fB\-\-use\-set\-session\-authorization\fR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_isready.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_isready.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_isready.1	2016-03-28 20:22:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_isready.1	2017-08-07 21:34:22.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_isready
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_ISREADY" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_ISREADY" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_receivexlog.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_receivexlog.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_receivexlog.1	2016-03-28 20:22:44.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_receivexlog.1	2017-08-07 21:34:23.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_receivexlog
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_RECEIVEXLOG" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_RECEIVEXLOG" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -83,7 +83,7 @@
 .PP
 \fB\-\-if\-not\-exists\fR
 .RS 4
-Do not not error out when
+Do not error out when
 \fB\-\-create\-slot\fR
 is specified and a slot with the specified name already exists\&.
 .RE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_recvlogical.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_recvlogical.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_recvlogical.1	2016-03-28 20:22:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_recvlogical.1	2017-08-07 21:34:24.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_recvlogical
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_RECVLOGICAL" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_RECVLOGICAL" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -122,7 +122,7 @@
 .PP
 \fB\-\-if\-not\-exists\fR
 .RS 4
-Do not not error out when
+Do not error out when
 \fB\-\-create\-slot\fR
 is specified and a slot with the specified name already exists\&.
 .RE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_resetxlog.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_resetxlog.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_resetxlog.1	2016-03-28 20:22:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_resetxlog.1	2017-08-07 21:34:28.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_resetxlog
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_RESETXLOG" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_RESETXLOG" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -233,3 +233,6 @@
 will refuse to start up if it finds a server lock file in the data directory\&. If the server crashed then a lock file might have been left behind; in that case you can remove the lock file to allow
 \fBpg_resetxlog\fR
 to run\&. But before you do so, make doubly certain that there is no server process still alive\&.
+.PP
+\fBpg_resetxlog\fR
+works only with servers of the same major version\&.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_restore.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_restore.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_restore.1	2016-03-28 20:22:45.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_restore.1	2017-08-07 21:34:24.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_restore
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_RESTORE" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_RESTORE" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -373,7 +373,7 @@
 Note that this option currently also requires the dump be in
 \fBINSERT\fR
 format, as
-\fBCOPY TO\fR
+\fBCOPY FROM\fR
 does not support row security\&.
 .RE
 .PP
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_rewind.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_rewind.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_rewind.1	2016-03-28 20:22:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_rewind.1	2017-08-07 21:34:28.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_rewind
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_REWIND" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_REWIND" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_standby.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_standby.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_standby.1	2016-03-28 20:22:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_standby.1	2017-08-07 21:34:35.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_standby
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_STANDBY" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_STANDBY" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_test_fsync.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_test_fsync.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_test_fsync.1	2016-03-28 20:22:49.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_test_fsync.1	2017-08-07 21:34:28.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_test_fsync
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_TEST_FSYNC" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_TEST_FSYNC" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_test_timing.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_test_timing.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_test_timing.1	2016-03-28 20:22:50.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_test_timing.1	2017-08-07 21:34:28.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_test_timing
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_TEST_TIMING" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_TEST_TIMING" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_upgrade.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_upgrade.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_upgrade.1	2016-03-28 20:22:50.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_upgrade.1	2017-08-07 21:34:29.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_upgrade
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_UPGRADE" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_UPGRADE" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@
 .br
 \fB\-\-link\fR
 .RS 4
-use hard links instead of copying files to the new cluster (use junction points on Windows)
+use hard links instead of copying files to the new cluster
 .RE
 .PP
 \fB\-o\fR \fIoptions\fR
@@ -289,7 +289,7 @@
 pgcrypto\&.so, whether they are from
 contrib
 or some other source\&. Do not install the schema definitions, e\&.g\&.
-pgcrypto\&.sql, because these will be upgraded from the old cluster\&. Also, any custom full text search files (dictionary, synonym, thesaurus, stop words) must also be copied to the new cluster\&.
+\fBCREATE EXTENSION pgcrypto\fR, because these will be upgraded from the old cluster\&. Also, any custom full text search files (dictionary, synonym, thesaurus, stop words) must also be copied to the new cluster\&.
 .RE
 .sp
 .RS 4
@@ -356,11 +356,18 @@
 .sp -1
 .IP "  8." 4.2
 .\}
-Verify standby servers: If you are upgrading Streaming Replication and Log\-Shipping standby servers, verify that the old standby servers are caught up by running
+Prepare for standby server upgrades: If you are upgrading standby servers (as outlined in section
+Step 10), verify that the old standby servers are caught up by running
 pg_controldata
 against the old primary and standby clusters\&. Verify that the
 \(lqLatest checkpoint location\(rq
 values match in all clusters\&. (There will be a mismatch if old standby servers were shut down before the old primary\&.)
+.sp
+Also, if upgrading standby servers, change
+\fIwal_level\fR
+in the
+postgresql\&.conf
+file on the new master cluster to match the value you used in the old cluster\&.
 .RE
 .sp
 .RS 4
@@ -459,16 +466,14 @@
 .sp -1
 .IP "  10." 4.2
 .\}
-Upgrade Streaming Replication and Log\-Shipping standby
-    servers: If you have Streaming Replication (see
+Upgrade Streaming Replication and Log\-Shipping standby servers: If you have Streaming Replication (see
 Section 25.2.5, \(lqStreaming Replication\(rq, in the documentation) or Log\-Shipping (see
 Section 25.2, \(lqLog-Shipping Standby Servers\(rq, in the documentation) standby servers, follow these steps to upgrade them\&. You will not be running
 pg_upgrade
 on the standby servers, but rather
 rsync\&. Do not start any servers yet\&.
 Install the new PostgreSQL binaries on standby servers: Make sure the new binaries and support files are installed on all standby servers\&.
-Make sure the new standby data directories do \fInot\fR
-      exist: Make sure the new standby data directories do
+Make sure the new standby data directories do \fInot\fR exist: Make sure the new standby data directories do
 \fInot\fR
 exist or are empty\&. If
 initdb
@@ -478,13 +483,6 @@
 Save configuration files: Save any configuration files from the standbys you need to keep, e\&.g\&.
 postgresql\&.conf,
 recovery\&.conf, as these will be overwritten or removed in the next step\&.
-Start and stop the new master cluster: In the new master cluster, change
-\fIwal_level\fR
-to
-hot_standby
-in the
-postgresql\&.conf
-file and then start and stop the cluster\&.
 Run rsync: From a directory that is above the old and new database cluster directories, run this for each slave:
 .sp
 .if n \{\
@@ -522,8 +520,7 @@
 outside the data directories,
 rsync
 must be run on those directories too\&.
-Configure streaming replication and log\-shipping standby
-      servers: Configure the servers for log shipping\&. (You do not need to run
+Configure streaming replication and log\-shipping standby servers: Configure the servers for log shipping\&. (You do not need to run
 \fBpg_start_backup()\fR
 and
 \fBpg_stop_backup()\fR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_xlogdump.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_xlogdump.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/pg_xlogdump.1	2016-03-28 20:22:50.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/pg_xlogdump.1	2017-08-07 21:34:29.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: pg_xlogdump
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PG_XLOGDUMP" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PG_XLOGDUMP" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-pg_xlogdump \- Display a human\-readable rendering of the write\-ahead log of a PostgreSQL database cluster
+pg_xlogdump \- display a human\-readable rendering of the write\-ahead log of a PostgreSQL database cluster
 .SH "SYNOPSIS"
 .HP \w'\fBpg_xlogdump\fR\ 'u
 \fBpg_xlogdump\fR [\fBoption\fR...] [\fBstartseg\fR\ [\fBendseg\fR]]
@@ -107,7 +107,7 @@
 .PP
 \fB\-t \fR\fB\fItimeline\fR\fR
 .br
-\fB\-\-timelime=\fR\fB\fItimeline\fR\fR
+\fB\-\-timeline=\fR\fB\fItimeline\fR\fR
 .RS 4
 Timeline from which to read log records\&. The default is to use the value in
 startseg, if that is specified; otherwise, the default is 1\&.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/postgres.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/postgres.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/postgres.1	2016-03-28 20:22:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/postgres.1	2017-08-07 21:34:30.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: postgres
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "POSTGRES" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "POSTGRES" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -410,11 +410,6 @@
 .RS 4
 Default port number (preferably set in the configuration file)
 .RE
-.PP
-\fBTZ\fR
-.RS 4
-Server time zone
-.RE
 .SH "DIAGNOSTICS"
 .PP
 A failure message mentioning
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/postmaster.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/postmaster.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/postmaster.1	2016-03-28 20:22:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/postmaster.1	2017-08-07 21:34:30.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: postmaster
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "POSTMASTER" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "POSTMASTER" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/psql.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/psql.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/psql.1	2016-03-28 20:22:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/psql.1	2017-08-07 21:34:26.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: psql
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PSQL" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PSQL" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -570,7 +570,7 @@
 .\}
 .nf
 $ \fBpsql testdb\fR
-psql (9\&.5\&.2)
+psql (9\&.5\&.8)
 Type "help" for help\&.
 
 testdb=>
@@ -661,7 +661,7 @@
 for a more general solution\&.
 .RE
 .PP
-\ec or \econnect [ \fIdbname\fR [ \fIusername\fR ] [ \fIhost\fR ] [ \fIport\fR ] ] | \fIconninfo\fR
+\ec or \econnect [ \-reuse\-previous=\fIon|off\fR ] [ \fIdbname\fR [ \fIusername\fR ] [ \fIhost\fR ] [ \fIport\fR ] | \fIconninfo\fR ]
 .RS 4
 Establishes a new connection to a
 PostgreSQL
@@ -670,18 +670,23 @@
 connection strings as detailed in
 Section 31.1.1, \(lqConnection Strings\(rq, in the documentation\&.
 .sp
-When using positional parameters, if any of
+Where the command omits database name, user, host, or port, the new connection can reuse values from the previous connection\&. By default, values from the previous connection are reused except when processing a
+conninfo
+string\&. Passing a first argument of
+\-reuse\-previous=on
+or
+\-reuse\-previous=off
+overrides that default\&. When the command neither specifies nor reuses a particular parameter, the
+libpq
+default is used\&. Specifying any of
 \fIdbname\fR,
 \fIusername\fR,
 \fIhost\fR
 or
 \fIport\fR
-are omitted or specified as
-\-, the value of that parameter from the previous connection is used; if there is no previous connection, the
-libpq
-default for the parameter\*(Aqs value is used\&. When using
-conninfo
-strings, no values from the previous connection are used for the new connection\&.
+as
+\-
+is equivalent to omitting that parameter\&.
 .sp
 If the new connection is successfully made, the previous connection is closed\&. If the connection attempt failed (wrong user name, access denied, etc\&.), the previous connection will only be kept if
 psql
@@ -810,7 +815,7 @@
 .PP
 \ed[S+] [ \fIpattern\fR ]
 .RS 4
-For each relation (table, view, index, sequence, or foreign table) or composite type matching the
+For each relation (table, view, materialized view, index, sequence, or foreign table) or composite type matching the
 \fIpattern\fR, show all columns, their types, the tablespace (if not the default) and any special attributes such as
 NOT NULL
 or defaults\&. Associated indexes, constraints, rules, and triggers are also shown\&. For foreign tables, the associated foreign server is shown as well\&. (\(lqMatching the pattern\(rq
@@ -820,7 +825,7 @@
 .sp
 For some types of relation,
 \ed
-shows additional information for each column: column values for sequences, indexed expression for indexes and foreign data wrapper options for foreign tables\&.
+shows additional information for each column: column values for sequences, indexed expressions for indexes, and foreign data wrapper options for foreign tables\&.
 .sp
 The command form
 \ed+
@@ -848,8 +853,8 @@
 is used without a
 \fIpattern\fR
 argument, it is equivalent to
-\fB\edtvsE\fR
-which will show a list of all visible tables, views, sequences and foreign tables\&. This is purely a convenience measure\&.
+\fB\edtvmsE\fR
+which will show a list of all visible tables, views, materialized views, sequences and foreign tables\&. This is purely a convenience measure\&.
 .sp .5v
 .RE
 .RE
@@ -2830,9 +2835,9 @@
 \fIPROMPT3\fR
 contain strings and special escape sequences that describe the appearance of the prompt\&. Prompt 1 is the normal prompt that is issued when
 psql
-requests a new command\&. Prompt 2 is issued when more input is expected during command input because the command was not terminated with a semicolon or a quote was not closed\&. Prompt 3 is issued when you run an
-SQL\fBCOPY\fR
-command and you are expected to type in the row values on the terminal\&.
+requests a new command\&. Prompt 2 is issued when more input is expected during command entry, for example because the command was not terminated with a semicolon or a quote was not closed\&. Prompt 3 is issued when you are running an
+SQL\fBCOPY FROM STDIN\fR
+command and you need to type in a row value on the terminal\&.
 .PP
 The value of the selected prompt variable is printed literally, except where a percent sign (%) is encountered\&. Depending on the next character, certain other text is substituted instead\&. Defined substitutions are:
 .PP
@@ -2888,17 +2893,25 @@
 In prompt 1 normally
 =, but
 ^
-if in single\-line mode, and
+if in single\-line mode, or
 !
 if the session is disconnected from the database (which can happen if
 \fB\econnect\fR
-fails)\&. In prompt 2 the sequence is replaced by
-\-,
-*, a single quote, a double quote, or a dollar sign, depending on whether
+fails)\&. In prompt 2
+%R
+is replaced by a character that depends on why
 psql
-expects more input because the command wasn\*(Aqt terminated yet, because you are inside a
+expects more input:
+\-
+if the command simply wasn\*(Aqt terminated yet, but
+*
+if there is an unfinished
 /* \&.\&.\&. */
-comment, or because you are inside a quoted or dollar\-escaped string\&. In prompt 3 the sequence doesn\*(Aqt produce anything\&.
+comment, a single quote if there is an unfinished quoted string, a double quote if there is an unfinished quoted identifier, a dollar sign if there is an unfinished dollar\-quoted string, or
+(
+if there is an unmatched left parenthesis\&. In prompt 3
+%R
+doesn\*(Aqt produce anything\&.
 .RE
 .PP
 %x
@@ -3043,7 +3056,9 @@
 If the query results do not fit on the screen, they are piped through this command\&. Typical values are
 more
 or
-less\&. The default is platform\-dependent\&. The use of the pager can be disabled by using the
+less\&. The default is platform\-dependent\&. Use of the pager can be disabled by setting
+\fBPAGER\fR
+to empty, or by using pager\-related options of the
 \fB\epset\fR
 command\&.
 .RE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/reindexdb.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/reindexdb.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/reindexdb.1	2016-03-28 20:22:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/reindexdb.1	2017-08-07 21:34:26.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: reindexdb
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "REINDEXDB" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "REINDEXDB" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/vacuumdb.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/vacuumdb.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/vacuumdb.1	2016-03-28 20:22:47.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/vacuumdb.1	2017-08-07 21:34:26.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: vacuumdb
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "VACUUMDB" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "VACUUMDB" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man1/vacuumlo.1 postgresql-9.5-9.5.8/doc/src/sgml/man1/vacuumlo.1
--- postgresql-9.5-9.5.2/doc/src/sgml/man1/vacuumlo.1	2016-03-28 20:22:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man1/vacuumlo.1	2017-08-07 21:34:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: vacuumlo
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "VACUUMLO" "1" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "VACUUMLO" "1" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink.3	2016-03-28 20:22:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink.3	2017-08-07 21:34:31.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_build_sql_delete.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_build_sql_delete.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_build_sql_delete.3	2016-03-28 20:22:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_build_sql_delete.3	2017-08-07 21:34:33.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_build_sql_delete
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_BUILD_SQL_DELETE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_BUILD_SQL_DELETE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_build_sql_insert.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_build_sql_insert.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_build_sql_insert.3	2016-03-28 20:22:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_build_sql_insert.3	2017-08-07 21:34:33.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_build_sql_insert
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_BUILD_SQL_INSERT" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_BUILD_SQL_INSERT" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_build_sql_update.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_build_sql_update.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_build_sql_update.3	2016-03-28 20:22:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_build_sql_update.3	2017-08-07 21:34:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_build_sql_update
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_BUILD_SQL_UPDATE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_BUILD_SQL_UPDATE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_cancel_query.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_cancel_query.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_cancel_query.3	2016-03-28 20:22:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_cancel_query.3	2017-08-07 21:34:33.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_cancel_query
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_CANCEL_QUERY" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_CANCEL_QUERY" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_close.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_close.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_close.3	2016-03-28 20:22:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_close.3	2017-08-07 21:34:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_close
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_CLOSE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_CLOSE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_connect.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_connect.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_connect.3	2016-03-28 20:22:51.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_connect.3	2017-08-07 21:34:30.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_connect
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_CONNECT" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_CONNECT" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_connect_u.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_connect_u.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_connect_u.3	2016-03-28 20:22:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_connect_u.3	2017-08-07 21:34:30.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_connect_u
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_CONNECT_U" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_CONNECT_U" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_disconnect.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_disconnect.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_disconnect.3	2016-03-28 20:22:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_disconnect.3	2017-08-07 21:34:31.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_disconnect
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_DISCONNECT" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_DISCONNECT" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_error_message.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_error_message.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_error_message.3	2016-03-28 20:22:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_error_message.3	2017-08-07 21:34:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_error_message
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_ERROR_MESSAGE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_ERROR_MESSAGE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_exec.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_exec.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_exec.3	2016-03-28 20:22:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_exec.3	2017-08-07 21:34:31.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_exec
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_EXEC" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_EXEC" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_fetch.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_fetch.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_fetch.3	2016-03-28 20:22:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_fetch.3	2017-08-07 21:34:31.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_fetch
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_FETCH" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_FETCH" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_get_connections.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_get_connections.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_get_connections.3	2016-03-28 20:22:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_get_connections.3	2017-08-07 21:34:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_get_connections
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_GET_CONNECTIONS" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_GET_CONNECTIONS" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_get_notify.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_get_notify.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_get_notify.3	2016-03-28 20:22:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_get_notify.3	2017-08-07 21:34:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_get_notify
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_GET_NOTIFY" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_GET_NOTIFY" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_get_pkey.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_get_pkey.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_get_pkey.3	2016-03-28 20:22:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_get_pkey.3	2017-08-07 21:34:33.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_get_pkey
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_GET_PKEY" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_GET_PKEY" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_get_result.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_get_result.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_get_result.3	2016-03-28 20:22:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_get_result.3	2017-08-07 21:34:33.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_get_result
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_GET_RESULT" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_GET_RESULT" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_is_busy.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_is_busy.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_is_busy.3	2016-03-28 20:22:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_is_busy.3	2017-08-07 21:34:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_is_busy
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_IS_BUSY" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_IS_BUSY" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_open.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_open.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_open.3	2016-03-28 20:22:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_open.3	2017-08-07 21:34:31.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_open
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_OPEN" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_OPEN" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_send_query.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_send_query.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/dblink_send_query.3	2016-03-28 20:22:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/dblink_send_query.3	2017-08-07 21:34:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: dblink_send_query
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DBLINK_SEND_QUERY" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DBLINK_SEND_QUERY" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_connect.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_connect.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_connect.3	2016-03-28 20:21:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_connect.3	2017-08-07 21:33:26.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_connect
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_CONNECT" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_CONNECT" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_copytuple.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_copytuple.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_copytuple.3	2016-03-28 20:21:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_copytuple.3	2017-08-07 21:33:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_copytuple
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_COPYTUPLE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_COPYTUPLE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_close.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_close.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_close.3	2016-03-28 20:21:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_close.3	2017-08-07 21:33:31.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_cursor_close
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_CURSOR_CLOSE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_CURSOR_CLOSE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_fetch.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_fetch.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_fetch.3	2016-03-28 20:21:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_fetch.3	2017-08-07 21:33:30.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_cursor_fetch
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_CURSOR_FETCH" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_CURSOR_FETCH" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_find.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_find.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_find.3	2016-03-28 20:21:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_find.3	2017-08-07 21:33:30.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_cursor_find
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_CURSOR_FIND" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_CURSOR_FIND" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_move.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_move.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_move.3	2016-03-28 20:21:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_move.3	2017-08-07 21:33:30.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_cursor_move
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_CURSOR_MOVE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_CURSOR_MOVE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_open.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_open.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_open.3	2016-03-28 20:21:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_open.3	2017-08-07 21:33:29.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_cursor_open
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_CURSOR_OPEN" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_CURSOR_OPEN" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_open_with_args.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_open_with_args.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_open_with_args.3	2016-03-28 20:21:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_open_with_args.3	2017-08-07 21:33:30.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_cursor_open_with_args
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_CURSOR_OPEN_WITH_ARGS" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_CURSOR_OPEN_WITH_ARGS" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_open_with_paramlist.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_open_with_paramlist.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_cursor_open_with_paramlist.3	2016-03-28 20:21:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_cursor_open_with_paramlist.3	2017-08-07 21:33:30.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_cursor_open_with_paramlist
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_CURSOR_OPEN_WITH_PARAMLIST" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_CURSOR_OPEN_WITH_PARAMLIST" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_exec.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_exec.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_exec.3	2016-03-28 20:21:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_exec.3	2017-08-07 21:33:27.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_exec
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_EXEC" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_EXEC" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_execp.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_execp.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_execp.3	2016-03-28 20:21:55.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_execp.3	2017-08-07 21:33:29.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_execp
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_EXECP" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_EXECP" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_execute.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_execute.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_execute.3	2016-03-28 20:21:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_execute.3	2017-08-07 21:33:27.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_execute
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_EXECUTE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_EXECUTE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_execute_plan.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_execute_plan.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_execute_plan.3	2016-03-28 20:21:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_execute_plan.3	2017-08-07 21:33:29.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_execute_plan
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_EXECUTE_PLAN" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_EXECUTE_PLAN" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_execute_plan_with_paramlist.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_execute_plan_with_paramlist.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_execute_plan_with_paramlist.3	2016-03-28 20:21:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_execute_plan_with_paramlist.3	2017-08-07 21:33:29.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_execute_plan_with_paramlist
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_EXECUTE_PLAN_WITH_PARAMLIST" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_EXECUTE_PLAN_WITH_PARAMLIST" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_execute_with_args.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_execute_with_args.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_execute_with_args.3	2016-03-28 20:21:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_execute_with_args.3	2017-08-07 21:33:28.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_execute_with_args
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_EXECUTE_WITH_ARGS" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_EXECUTE_WITH_ARGS" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_finish.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_finish.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_finish.3	2016-03-28 20:21:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_finish.3	2017-08-07 21:33:27.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_finish
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_FINISH" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_FINISH" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_fname.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_fname.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_fname.3	2016-03-28 20:21:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_fname.3	2017-08-07 21:33:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_fname
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_FNAME" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_FNAME" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_fnumber.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_fnumber.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_fnumber.3	2016-03-28 20:21:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_fnumber.3	2017-08-07 21:33:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_fnumber
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_FNUMBER" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_FNUMBER" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_freeplan.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_freeplan.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_freeplan.3	2016-03-28 20:22:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_freeplan.3	2017-08-07 21:33:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_freeplan
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_FREEPLAN" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_FREEPLAN" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_freetuple.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_freetuple.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_freetuple.3	2016-03-28 20:22:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_freetuple.3	2017-08-07 21:33:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_freetuple
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_FREETUPLE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_FREETUPLE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_freetuptable.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_freetuptable.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_freetuptable.3	2016-03-28 20:22:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_freetuptable.3	2017-08-07 21:33:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_freetuptable
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_FREETUPTABLE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_FREETUPTABLE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getargcount.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getargcount.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getargcount.3	2016-03-28 20:21:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getargcount.3	2017-08-07 21:33:28.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_getargcount
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_GETARGCOUNT" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_GETARGCOUNT" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getargtypeid.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getargtypeid.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getargtypeid.3	2016-03-28 20:21:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getargtypeid.3	2017-08-07 21:33:29.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_getargtypeid
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_GETARGTYPEID" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_GETARGTYPEID" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getbinval.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getbinval.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getbinval.3	2016-03-28 20:21:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getbinval.3	2017-08-07 21:33:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_getbinval
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_GETBINVAL" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_GETBINVAL" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getnspname.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getnspname.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getnspname.3	2016-03-28 20:21:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getnspname.3	2017-08-07 21:33:33.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_getnspname
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_GETNSPNAME" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_GETNSPNAME" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getrelname.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getrelname.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getrelname.3	2016-03-28 20:21:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getrelname.3	2017-08-07 21:33:33.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_getrelname
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_GETRELNAME" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_GETRELNAME" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_gettype.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_gettype.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_gettype.3	2016-03-28 20:21:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_gettype.3	2017-08-07 21:33:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_gettype
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_GETTYPE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_GETTYPE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_gettypeid.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_gettypeid.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_gettypeid.3	2016-03-28 20:21:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_gettypeid.3	2017-08-07 21:33:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_gettypeid
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_GETTYPEID" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_GETTYPEID" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getvalue.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getvalue.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_getvalue.3	2016-03-28 20:21:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_getvalue.3	2017-08-07 21:33:32.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_getvalue
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_GETVALUE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_GETVALUE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_is_cursor_plan.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_is_cursor_plan.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_is_cursor_plan.3	2016-03-28 20:21:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_is_cursor_plan.3	2017-08-07 21:33:29.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_is_cursor_plan
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_IS_CURSOR_PLAN" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_IS_CURSOR_PLAN" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_keepplan.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_keepplan.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_keepplan.3	2016-03-28 20:21:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_keepplan.3	2017-08-07 21:33:31.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_keepplan
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_KEEPPLAN" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_KEEPPLAN" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_modifytuple.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_modifytuple.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_modifytuple.3	2016-03-28 20:21:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_modifytuple.3	2017-08-07 21:33:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_modifytuple
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_MODIFYTUPLE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_MODIFYTUPLE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_palloc.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_palloc.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_palloc.3	2016-03-28 20:21:58.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_palloc.3	2017-08-07 21:33:33.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_palloc
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_PALLOC" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_PALLOC" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_pfree.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_pfree.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_pfree.3	2016-03-28 20:21:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_pfree.3	2017-08-07 21:33:33.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_pfree
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_PFREE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_PFREE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_pop.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_pop.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_pop.3	2016-03-28 20:21:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_pop.3	2017-08-07 21:33:27.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_pop
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_POP" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_POP" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_prepare.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_prepare.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_prepare.3	2016-03-28 20:21:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_prepare.3	2017-08-07 21:33:28.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_prepare
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_PREPARE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_PREPARE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_prepare_cursor.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_prepare_cursor.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_prepare_cursor.3	2016-03-28 20:21:53.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_prepare_cursor.3	2017-08-07 21:33:28.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_prepare_cursor
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_PREPARE_CURSOR" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_PREPARE_CURSOR" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_prepare_params.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_prepare_params.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_prepare_params.3	2016-03-28 20:21:54.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_prepare_params.3	2017-08-07 21:33:28.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_prepare_params
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_PREPARE_PARAMS" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_PREPARE_PARAMS" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_push.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_push.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_push.3	2016-03-28 20:21:52.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_push.3	2017-08-07 21:33:27.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_push
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_PUSH" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_PUSH" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_repalloc.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_repalloc.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_repalloc.3	2016-03-28 20:21:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_repalloc.3	2017-08-07 21:33:33.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_repalloc
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_REPALLOC" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_REPALLOC" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_returntuple.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_returntuple.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_returntuple.3	2016-03-28 20:21:59.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_returntuple.3	2017-08-07 21:33:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_returntuple
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_RETURNTUPLE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_RETURNTUPLE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_saveplan.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_saveplan.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_saveplan.3	2016-03-28 20:21:57.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_saveplan.3	2017-08-07 21:33:31.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_saveplan
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_SAVEPLAN" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_SAVEPLAN" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_scroll_cursor_fetch.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_scroll_cursor_fetch.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_scroll_cursor_fetch.3	2016-03-28 20:21:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_scroll_cursor_fetch.3	2017-08-07 21:33:31.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_scroll_cursor_fetch
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_SCROLL_CURSOR_FETCH" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_SCROLL_CURSOR_FETCH" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_scroll_cursor_move.3 postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_scroll_cursor_move.3
--- postgresql-9.5-9.5.2/doc/src/sgml/man3/SPI_scroll_cursor_move.3	2016-03-28 20:21:56.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man3/SPI_scroll_cursor_move.3	2017-08-07 21:33:31.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SPI_scroll_cursor_move
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SPI_SCROLL_CURSOR_MOVE" "3" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SPI_SCROLL_CURSOR_MOVE" "3" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ABORT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ABORT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ABORT.7	2016-03-28 20:22:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ABORT.7	2017-08-07 21:33:35.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ABORT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ABORT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ABORT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_AGGREGATE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_AGGREGATE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_AGGREGATE.7	2016-03-28 20:22:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_AGGREGATE.7	2017-08-07 21:33:35.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER AGGREGATE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER AGGREGATE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER AGGREGATE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_COLLATION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_COLLATION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_COLLATION.7	2016-03-28 20:22:00.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_COLLATION.7	2017-08-07 21:33:35.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER COLLATION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER COLLATION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER COLLATION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_CONVERSION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_CONVERSION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_CONVERSION.7	2016-03-28 20:22:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_CONVERSION.7	2017-08-07 21:33:35.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER CONVERSION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER CONVERSION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER CONVERSION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_DATABASE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_DATABASE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_DATABASE.7	2016-03-28 20:22:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_DATABASE.7	2017-08-07 21:33:35.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER DATABASE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER DATABASE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER DATABASE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_DEFAULT_PRIVILEGES.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_DEFAULT_PRIVILEGES.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_DEFAULT_PRIVILEGES.7	2016-03-28 20:22:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_DEFAULT_PRIVILEGES.7	2017-08-07 21:33:36.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER DEFAULT PRIVILEGES
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER DEFAULT PRIVILEGES" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER DEFAULT PRIVILEGES" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_DOMAIN.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_DOMAIN.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_DOMAIN.7	2016-03-28 20:22:01.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_DOMAIN.7	2017-08-07 21:33:36.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER DOMAIN
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER DOMAIN" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER DOMAIN" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_EVENT_TRIGGER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_EVENT_TRIGGER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_EVENT_TRIGGER.7	2016-03-28 20:22:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_EVENT_TRIGGER.7	2017-08-07 21:33:36.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER EVENT TRIGGER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER EVENT TRIGGER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER EVENT TRIGGER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_EXTENSION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_EXTENSION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_EXTENSION.7	2016-03-28 20:22:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_EXTENSION.7	2017-08-07 21:33:36.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER EXTENSION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER EXTENSION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER EXTENSION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_FOREIGN_DATA_WRAPPER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_FOREIGN_DATA_WRAPPER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_FOREIGN_DATA_WRAPPER.7	2016-03-28 20:22:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_FOREIGN_DATA_WRAPPER.7	2017-08-07 21:33:37.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER FOREIGN DATA WRAPPER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER FOREIGN DATA WRAPPER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER FOREIGN DATA WRAPPER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_FOREIGN_TABLE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_FOREIGN_TABLE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_FOREIGN_TABLE.7	2016-03-28 20:22:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_FOREIGN_TABLE.7	2017-08-07 21:33:37.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER FOREIGN TABLE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER FOREIGN TABLE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER FOREIGN TABLE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_FUNCTION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_FUNCTION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_FUNCTION.7	2016-03-28 20:22:02.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_FUNCTION.7	2017-08-07 21:33:37.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER FUNCTION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER FUNCTION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER FUNCTION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -190,7 +190,9 @@
 RESET ALL
 to clear all function\-local settings\&.
 SET FROM CURRENT
-saves the session\*(Aqs current value of the parameter as the value to be applied when the function is entered\&.
+saves the value of the parameter that is current when
+\fBALTER FUNCTION\fR
+is executed as the value to be applied when the function is entered\&.
 .sp
 See
 \fBSET\fR(7)
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_GROUP.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_GROUP.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_GROUP.7	2016-03-28 20:22:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_GROUP.7	2017-08-07 21:33:37.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER GROUP
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER GROUP" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER GROUP" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_INDEX.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_INDEX.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_INDEX.7	2016-03-28 20:22:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_INDEX.7	2017-08-07 21:33:37.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER INDEX
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER INDEX" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER INDEX" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -44,11 +44,6 @@
 \fBALTER INDEX\fR
 changes the definition of an existing index\&. There are several subforms:
 .PP
-IF EXISTS
-.RS 4
-Do not throw an error if the index does not exist\&. A notice is issued in this case\&.
-.RE
-.PP
 RENAME
 .RS 4
 The
@@ -91,6 +86,11 @@
 .RE
 .SH "PARAMETERS"
 .PP
+IF EXISTS
+.RS 4
+Do not throw an error if the index does not exist\&. A notice is issued in this case\&.
+.RE
+.PP
 \fIname\fR
 .RS 4
 The name (possibly schema\-qualified) of an existing index to alter\&.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_LANGUAGE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_LANGUAGE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_LANGUAGE.7	2016-03-28 20:22:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_LANGUAGE.7	2017-08-07 21:33:38.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER LANGUAGE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER LANGUAGE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER LANGUAGE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_LARGE_OBJECT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_LARGE_OBJECT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_LARGE_OBJECT.7	2016-03-28 20:22:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_LARGE_OBJECT.7	2017-08-07 21:33:38.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER LARGE OBJECT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER LARGE OBJECT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER LARGE OBJECT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_MATERIALIZED_VIEW.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_MATERIALIZED_VIEW.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_MATERIALIZED_VIEW.7	2016-03-28 20:22:03.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_MATERIALIZED_VIEW.7	2017-08-07 21:33:38.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER MATERIALIZED VIEW
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER MATERIALIZED VIEW" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER MATERIALIZED VIEW" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -54,7 +54,6 @@
     SET ( \fIstorage_parameter\fR = \fIvalue\fR [, \&.\&.\&. ] )
     RESET ( \fIstorage_parameter\fR [, \&.\&.\&. ] )
     OWNER TO { \fInew_owner\fR | CURRENT_USER | SESSION_USER }
-    SET TABLESPACE \fInew_tablespace\fR
 .fi
 .SH "DESCRIPTION"
 .PP
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_OPERATOR.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_OPERATOR.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_OPERATOR.7	2016-03-28 20:22:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_OPERATOR.7	2017-08-07 21:33:38.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER OPERATOR
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER OPERATOR" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER OPERATOR" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_OPERATOR_CLASS.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_OPERATOR_CLASS.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_OPERATOR_CLASS.7	2016-03-28 20:22:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_OPERATOR_CLASS.7	2017-08-07 21:33:38.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER OPERATOR CLASS
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER OPERATOR CLASS" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER OPERATOR CLASS" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_OPERATOR_FAMILY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_OPERATOR_FAMILY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_OPERATOR_FAMILY.7	2016-03-28 20:22:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_OPERATOR_FAMILY.7	2017-08-07 21:33:39.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER OPERATOR FAMILY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER OPERATOR FAMILY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER OPERATOR FAMILY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_POLICY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_POLICY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_POLICY.7	2016-03-28 20:22:04.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_POLICY.7	2017-08-07 21:33:39.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER POLICY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER POLICY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER POLICY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_ROLE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_ROLE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_ROLE.7	2016-03-28 20:22:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_ROLE.7	2017-08-07 21:33:39.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER ROLE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER ROLE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER ROLE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_RULE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_RULE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_RULE.7	2016-03-28 20:22:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_RULE.7	2017-08-07 21:33:39.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER RULE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER RULE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER RULE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_SCHEMA.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_SCHEMA.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_SCHEMA.7	2016-03-28 20:22:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_SCHEMA.7	2017-08-07 21:33:39.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER SCHEMA
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER SCHEMA" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER SCHEMA" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_SEQUENCE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_SEQUENCE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_SEQUENCE.7	2016-03-28 20:22:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_SEQUENCE.7	2017-08-07 21:33:40.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER SEQUENCE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER SEQUENCE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER SEQUENCE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_SERVER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_SERVER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_SERVER.7	2016-03-28 20:22:05.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_SERVER.7	2017-08-07 21:33:40.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER SERVER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER SERVER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER SERVER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_SYSTEM.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_SYSTEM.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_SYSTEM.7	2016-03-28 20:22:06.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_SYSTEM.7	2017-08-07 21:33:40.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER SYSTEM
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER SYSTEM" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER SYSTEM" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TABLE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TABLE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TABLE.7	2016-03-28 20:22:06.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TABLE.7	2017-08-07 21:33:41.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER TABLE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER TABLE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER TABLE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -524,12 +524,10 @@
 This form moves the table into another schema\&. Associated indexes, constraints, and sequences owned by table columns are moved as well\&.
 .RE
 .PP
-All the actions except
-RENAME,
-SET TABLESPACE
-and
+All the forms of ALTER TABLE that act on a single table, except
+RENAME, and
 SET SCHEMA
-can be combined into a list of multiple alterations to apply in parallel\&. For example, it is possible to add several columns and/or alter the type of several columns in a single command\&. This is particularly useful with large tables, since only one pass over the table need be made\&.
+can be combined into a list of multiple alterations to applied together\&. For example, it is possible to add several columns and/or alter the type of several columns in a single command\&. This is particularly useful with large tables, since only one pass over the table need be made\&.
 .PP
 You must own the table to use
 \fBALTER TABLE\fR\&. To change the schema or tablespace of a table, you must also have
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TABLESPACE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TABLESPACE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TABLESPACE.7	2016-03-28 20:22:06.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TABLESPACE.7	2017-08-07 21:33:41.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER TABLESPACE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER TABLESPACE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER TABLESPACE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7	2016-03-28 20:22:07.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7	2017-08-07 21:33:41.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER TEXT SEARCH CONFIGURATION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER TEXT SEARCH CONFIGURATION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER TEXT SEARCH CONFIGURATION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TEXT_SEARCH_DICTIONARY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TEXT_SEARCH_DICTIONARY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TEXT_SEARCH_DICTIONARY.7	2016-03-28 20:22:07.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TEXT_SEARCH_DICTIONARY.7	2017-08-07 21:33:41.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER TEXT SEARCH DICTIONARY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER TEXT SEARCH DICTIONARY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER TEXT SEARCH DICTIONARY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TEXT_SEARCH_PARSER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TEXT_SEARCH_PARSER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TEXT_SEARCH_PARSER.7	2016-03-28 20:22:07.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TEXT_SEARCH_PARSER.7	2017-08-07 21:33:42.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER TEXT SEARCH PARSER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER TEXT SEARCH PARSER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER TEXT SEARCH PARSER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TEXT_SEARCH_TEMPLATE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TEXT_SEARCH_TEMPLATE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TEXT_SEARCH_TEMPLATE.7	2016-03-28 20:22:07.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TEXT_SEARCH_TEMPLATE.7	2017-08-07 21:33:42.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER TEXT SEARCH TEMPLATE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER TEXT SEARCH TEMPLATE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER TEXT SEARCH TEMPLATE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TRIGGER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TRIGGER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TRIGGER.7	2016-03-28 20:22:07.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TRIGGER.7	2017-08-07 21:33:42.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER TRIGGER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER TRIGGER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER TRIGGER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TYPE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TYPE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_TYPE.7	2016-03-28 20:22:08.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_TYPE.7	2017-08-07 21:33:42.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER TYPE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER TYPE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER TYPE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_USER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_USER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_USER.7	2016-03-28 20:22:08.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_USER.7	2017-08-07 21:33:42.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER USER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER USER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER USER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -50,10 +50,10 @@
 
 ALTER USER \fIname\fR RENAME TO \fInew_name\fR
 
-ALTER USER \fIrole_specification\fR SET \fIconfiguration_parameter\fR { TO | = } { \fIvalue\fR | DEFAULT }
-ALTER USER \fIrole_specification\fR SET \fIconfiguration_parameter\fR FROM CURRENT
-ALTER USER \fIrole_specification\fR RESET \fIconfiguration_parameter\fR
-ALTER USER \fIrole_specification\fR RESET ALL
+ALTER USER { \fIrole_specification\fR | ALL } [ IN DATABASE \fIdatabase_name\fR ] SET \fIconfiguration_parameter\fR { TO | = } { \fIvalue\fR | DEFAULT }
+ALTER USER { \fIrole_specification\fR | ALL } [ IN DATABASE \fIdatabase_name\fR ] SET \fIconfiguration_parameter\fR FROM CURRENT
+ALTER USER { \fIrole_specification\fR | ALL } [ IN DATABASE \fIdatabase_name\fR ] RESET \fIconfiguration_parameter\fR
+ALTER USER { \fIrole_specification\fR | ALL } [ IN DATABASE \fIdatabase_name\fR ] RESET ALL
 
 where \fIrole_specification\fR can be:
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_USER_MAPPING.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_USER_MAPPING.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_USER_MAPPING.7	2016-03-28 20:22:08.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_USER_MAPPING.7	2017-08-07 21:33:42.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER USER MAPPING
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER USER MAPPING" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER USER MAPPING" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -75,13 +75,14 @@
 .SH "EXAMPLES"
 .PP
 Change the password for user mapping
-bob, serverfoo:
+bob, server
+foo:
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
-ALTER USER MAPPING FOR bob SERVER foo OPTIONS (user \*(Aqbob\*(Aq, password \*(Aqpublic\*(Aq);
+ALTER USER MAPPING FOR bob SERVER foo OPTIONS (SET password \*(Aqpublic\*(Aq);
 .fi
 .if n \{\
 .RE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_VIEW.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_VIEW.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ALTER_VIEW.7	2016-03-28 20:22:08.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ALTER_VIEW.7	2017-08-07 21:33:43.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ALTER VIEW
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ALTER VIEW" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ALTER VIEW" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ANALYZE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ANALYZE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ANALYZE.7	2016-03-28 20:22:09.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ANALYZE.7	2017-08-07 21:33:43.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ANALYZE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ANALYZE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ANALYZE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/BEGIN.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/BEGIN.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/BEGIN.7	2016-03-28 20:22:09.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/BEGIN.7	2017-08-07 21:33:43.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: BEGIN
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "BEGIN" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "BEGIN" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CHECKPOINT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CHECKPOINT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CHECKPOINT.7	2016-03-28 20:22:09.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CHECKPOINT.7	2017-08-07 21:33:44.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CHECKPOINT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CHECKPOINT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CHECKPOINT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CLOSE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CLOSE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CLOSE.7	2016-03-28 20:22:10.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CLOSE.7	2017-08-07 21:33:44.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CLOSE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CLOSE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CLOSE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CLUSTER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CLUSTER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CLUSTER.7	2016-03-28 20:22:10.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CLUSTER.7	2017-08-07 21:33:44.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CLUSTER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CLUSTER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CLUSTER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/COMMENT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/COMMENT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/COMMENT.7	2016-03-28 20:22:10.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/COMMENT.7	2017-08-07 21:33:44.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: COMMENT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "COMMENT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "COMMENT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -136,7 +136,7 @@
 .br
 \fIdomain_name\fR
 .RS 4
-When creating a comment on a constraint, a table, a domain or a policy these parameters specify the name of the table or domain on which the constraint is defined\&.
+When creating a comment on a constraint, a trigger, a rule or a policy these parameters specify the name of the table or domain on which that object is defined\&.
 .RE
 .PP
 \fIsource_type\fR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/COMMIT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/COMMIT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/COMMIT.7	2016-03-28 20:22:10.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/COMMIT.7	2017-08-07 21:33:45.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: COMMIT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "COMMIT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "COMMIT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/COMMIT_PREPARED.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/COMMIT_PREPARED.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/COMMIT_PREPARED.7	2016-03-28 20:22:10.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/COMMIT_PREPARED.7	2017-08-07 21:33:45.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: COMMIT PREPARED
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "COMMIT PREPARED" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "COMMIT PREPARED" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/COPY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/COPY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/COPY.7	2016-03-28 20:22:11.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/COPY.7	2017-08-07 21:33:45.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: COPY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "COPY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "COPY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -341,6 +341,16 @@
 \fBCOPY TO\fR, and insert privilege on the table into which values are inserted by
 \fBCOPY FROM\fR\&. It is sufficient to have column privileges on the column(s) listed in the command\&.
 .PP
+If row\-level security is enabled for the table, the relevant
+\fBSELECT\fR
+policies will apply to
+COPY \fItable\fR TO
+statements\&. Currently,
+\fBCOPY FROM\fR
+is not supported for tables with row\-level security\&. Use equivalent
+\fBINSERT\fR
+statements instead\&.
+.PP
 Files named in a
 \fBCOPY\fR
 command are read or written directly by the server, not by the client application\&. Therefore, they must reside on or be accessible to the database server machine, not the client\&. They must be accessible to and readable or writable by the
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_AGGREGATE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_AGGREGATE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_AGGREGATE.7	2016-03-28 20:22:11.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_AGGREGATE.7	2017-08-07 21:33:46.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE AGGREGATE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE AGGREGATE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE AGGREGATE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_CAST.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_CAST.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_CAST.7	2016-03-28 20:22:11.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_CAST.7	2017-08-07 21:33:46.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE CAST
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE CAST" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE CAST" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_COLLATION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_COLLATION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_COLLATION.7	2016-03-28 20:22:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_COLLATION.7	2017-08-07 21:33:46.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE COLLATION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE COLLATION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE COLLATION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_CONVERSION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_CONVERSION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_CONVERSION.7	2016-03-28 20:22:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_CONVERSION.7	2017-08-07 21:33:46.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE CONVERSION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE CONVERSION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE CONVERSION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_DATABASE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_DATABASE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_DATABASE.7	2016-03-28 20:22:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_DATABASE.7	2017-08-07 21:33:47.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE DATABASE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE DATABASE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE DATABASE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,8 +40,8 @@
            [ LC_CTYPE [=] \fIlc_ctype\fR ]
            [ TABLESPACE [=] \fItablespace_name\fR ]
            [ ALLOW_CONNECTIONS [=] \fIallowconn\fR ]
-           [ CONNECTION LIMIT [=] \fIconnlimit\fR ] ]
-           [ IS_TEMPLATE [=] \fIistemplate\fR ]
+           [ CONNECTION LIMIT [=] \fIconnlimit\fR ]
+           [ IS_TEMPLATE [=] \fIistemplate\fR ] ]
 .fi
 .SH "DESCRIPTION"
 .PP
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_DOMAIN.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_DOMAIN.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_DOMAIN.7	2016-03-28 20:22:12.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_DOMAIN.7	2017-08-07 21:33:47.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE DOMAIN
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE DOMAIN" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE DOMAIN" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_EVENT_TRIGGER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_EVENT_TRIGGER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_EVENT_TRIGGER.7	2016-03-28 20:22:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_EVENT_TRIGGER.7	2017-08-07 21:33:47.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE EVENT TRIGGER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE EVENT TRIGGER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE EVENT TRIGGER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_EXTENSION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_EXTENSION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_EXTENSION.7	2016-03-28 20:22:13.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_EXTENSION.7	2017-08-07 21:33:48.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE EXTENSION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE EXTENSION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE EXTENSION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_FOREIGN_DATA_WRAPPER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_FOREIGN_DATA_WRAPPER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_FOREIGN_DATA_WRAPPER.7	2016-03-28 20:22:14.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_FOREIGN_DATA_WRAPPER.7	2017-08-07 21:33:48.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE FOREIGN DATA WRAPPER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE FOREIGN DATA WRAPPER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE FOREIGN DATA WRAPPER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_FOREIGN_TABLE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_FOREIGN_TABLE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_FOREIGN_TABLE.7	2016-03-28 20:22:14.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_FOREIGN_TABLE.7	2017-08-07 21:33:48.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE FOREIGN TABLE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE FOREIGN TABLE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE FOREIGN TABLE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_FUNCTION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_FUNCTION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_FUNCTION.7	2016-03-28 20:22:14.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_FUNCTION.7	2017-08-07 21:33:49.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE FUNCTION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE FUNCTION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE FUNCTION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -299,7 +299,9 @@
 SET
 clause causes the specified configuration parameter to be set to the specified value when the function is entered, and then restored to its prior value when the function exits\&.
 SET FROM CURRENT
-saves the session\*(Aqs current value of the parameter as the value to be applied when the function is entered\&.
+saves the value of the parameter that is current when
+\fBCREATE FUNCTION\fR
+is executed as the value to be applied when the function is entered\&.
 .sp
 If a
 SET
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_GROUP.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_GROUP.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_GROUP.7	2016-03-28 20:22:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_GROUP.7	2017-08-07 21:33:49.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE GROUP
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE GROUP" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE GROUP" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_INDEX.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_INDEX.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_INDEX.7	2016-03-28 20:22:15.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_INDEX.7	2017-08-07 21:33:50.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE INDEX
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE INDEX" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE INDEX" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -386,16 +386,7 @@
 \(lqnulls sort high\(rq, in queries that depend on indexes to avoid sorting steps\&.
 .PP
 For most index methods, the speed of creating an index is dependent on the setting of
-maintenance_work_mem\&. Larger values will reduce the time needed for index creation, so long as you don\*(Aqt make it larger than the amount of memory really available, which would drive the machine into swapping\&. For hash indexes, the value of
-effective_cache_size
-is also relevant to index creation time:
-PostgreSQL
-will use one of two different hash index creation methods depending on whether the estimated index size is more or less than
-\fIeffective_cache_size\fR\&. For best results, make sure that this parameter is also set to something reflective of available memory, and be careful that the sum of
-\fImaintenance_work_mem\fR
-and
-\fIeffective_cache_size\fR
-is less than the machine\*(Aqs RAM less whatever space is needed by other programs\&.
+maintenance_work_mem\&. Larger values will reduce the time needed for index creation, so long as you don\*(Aqt make it larger than the amount of memory really available, which would drive the machine into swapping\&.
 .PP
 Use
 DROP INDEX (\fBDROP_INDEX\fR(7))
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_LANGUAGE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_LANGUAGE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_LANGUAGE.7	2016-03-28 20:22:16.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_LANGUAGE.7	2017-08-07 21:33:50.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE LANGUAGE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE LANGUAGE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE LANGUAGE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_MATERIALIZED_VIEW.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_MATERIALIZED_VIEW.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_MATERIALIZED_VIEW.7	2016-03-28 20:22:16.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_MATERIALIZED_VIEW.7	2017-08-07 21:33:51.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE MATERIALIZED VIEW
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE MATERIALIZED VIEW" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE MATERIALIZED VIEW" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_OPERATOR.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_OPERATOR.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_OPERATOR.7	2016-03-28 20:22:16.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_OPERATOR.7	2017-08-07 21:33:51.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE OPERATOR
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE OPERATOR" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE OPERATOR" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_OPERATOR_CLASS.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_OPERATOR_CLASS.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_OPERATOR_CLASS.7	2016-03-28 20:22:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_OPERATOR_CLASS.7	2017-08-07 21:33:51.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE OPERATOR CLASS
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE OPERATOR CLASS" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE OPERATOR CLASS" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_OPERATOR_FAMILY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_OPERATOR_FAMILY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_OPERATOR_FAMILY.7	2016-03-28 20:22:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_OPERATOR_FAMILY.7	2017-08-07 21:33:52.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE OPERATOR FAMILY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE OPERATOR FAMILY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE OPERATOR FAMILY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_POLICY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_POLICY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_POLICY.7	2016-03-28 20:22:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_POLICY.7	2017-08-07 21:33:52.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE POLICY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE POLICY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE POLICY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_ROLE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_ROLE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_ROLE.7	2016-03-28 20:22:17.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_ROLE.7	2017-08-07 21:33:52.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE ROLE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE ROLE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE ROLE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -203,8 +203,6 @@
 or
 UNENCRYPTED
 is specified (since the system cannot decrypt the specified encrypted password string)\&. This allows reloading of encrypted passwords during dump/restore\&.
-.sp
-Note that older clients might lack support for the MD5 authentication mechanism that is needed to work with passwords that are stored encrypted\&.
 .RE
 .PP
 VALID UNTIL \*(Aq\fItimestamp\fR\*(Aq
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_RULE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_RULE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_RULE.7	2016-03-28 20:22:18.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_RULE.7	2017-08-07 21:33:53.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE RULE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE RULE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE RULE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_SCHEMA.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_SCHEMA.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_SCHEMA.7	2016-03-28 20:22:18.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_SCHEMA.7	2017-08-07 21:33:53.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE SCHEMA
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE SCHEMA" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE SCHEMA" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_SEQUENCE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_SEQUENCE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_SEQUENCE.7	2016-03-28 20:22:18.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_SEQUENCE.7	2017-08-07 21:33:53.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE SEQUENCE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE SEQUENCE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE SEQUENCE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -180,6 +180,14 @@
 bigint
 arithmetic, so the range cannot exceed the range of an eight\-byte integer (\-9223372036854775808 to 9223372036854775807)\&.
 .PP
+Because
+\fBnextval\fR
+and
+\fBsetval\fR
+calls are never rolled back, sequence objects cannot be used if
+\(lqgapless\(rq
+assignment of sequence numbers is needed\&. It is possible to build gapless assignment by using exclusive locking of a table containing a counter; but this solution is much more expensive than sequence objects, especially if many transactions need sequence numbers concurrently\&.
+.PP
 Unexpected results might be obtained if a
 \fIcache\fR
 setting greater than one is used for a sequence object that will be used concurrently by multiple sessions\&. Each session will allocate and cache successive sequence values during one access to the sequence object and increase the sequence object\*(Aqs
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_SERVER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_SERVER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_SERVER.7	2016-03-28 20:22:18.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_SERVER.7	2017-08-07 21:33:53.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE SERVER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE SERVER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE SERVER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TABLE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TABLE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TABLE.7	2016-03-28 20:22:19.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TABLE.7	2017-08-07 21:33:55.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE TABLE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE TABLE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE TABLE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -220,24 +220,27 @@
 Unlike
 INHERITS, the new table and original table are completely decoupled after creation is complete\&. Changes to the original table will not be applied to the new table, and it is not possible to include data of the new table in scans of the original table\&.
 .sp
-Default expressions for the copied column definitions will only be copied if
+Default expressions for the copied column definitions will be copied only if
 INCLUDING DEFAULTS
-is specified\&. Defaults that call database\-modification functions, like
-\fBnextval\fR, create a linkage between the original and new tables\&. The default behavior is to exclude default expressions, resulting in the copied columns in the new table having null defaults\&.
+is specified\&. The default behavior is to exclude default expressions, resulting in the copied columns in the new table having null defaults\&. Note that copying defaults that call database\-modification functions, such as
+\fBnextval\fR, may create a functional linkage between the original and new tables\&.
 .sp
 Not\-null constraints are always copied to the new table\&.
 CHECK
 constraints will be copied only if
 INCLUDING CONSTRAINTS
-is specified\&. Indexes,
-PRIMARY KEY, and
-UNIQUE
-constraints on the original table will be created on the new table only if the
+is specified\&. No distinction is made between column constraints and table constraints\&.
+.sp
+Indexes,
+PRIMARY KEY,
+UNIQUE, and
+EXCLUDE
+constraints on the original table will be created on the new table only if
 INCLUDING INDEXES
-clause is specified\&. No distinction is made between column constraints and table constraints\&.
+is specified\&. Names for the new indexes and constraints are chosen according to the default rules, regardless of how the originals were named\&. (This behavior avoids possible duplicate\-name failures for the new indexes\&.)
 .sp
 STORAGE
-settings for the copied column definitions will only be copied if
+settings for the copied column definitions will be copied only if
 INCLUDING STORAGE
 is specified\&. The default behavior is to exclude
 STORAGE
@@ -246,7 +249,7 @@
 settings, see
 Section 63.2, \(lqTOAST\(rq, in the documentation\&.
 .sp
-Comments for the copied columns, constraints, and indexes will only be copied if
+Comments for the copied columns, constraints, and indexes will be copied only if
 INCLUDING COMMENTS
 is specified\&. The default behavior is to exclude comments, resulting in the copied columns and constraints in the new table having no comments\&.
 .sp
@@ -254,7 +257,7 @@
 is an abbreviated form of
 INCLUDING DEFAULTS INCLUDING CONSTRAINTS INCLUDING INDEXES INCLUDING STORAGE INCLUDING COMMENTS\&.
 .sp
-Note also that unlike
+Note that unlike
 INHERITS, columns and constraints copied by
 LIKE
 are not merged with similarly named columns and constraints\&. If the same name is specified explicitly or in another
@@ -263,7 +266,7 @@
 .sp
 The
 LIKE
-clause can also be used to copy columns from views, foreign tables, or composite types\&. Inapplicable options (e\&.g\&.,
+clause can also be used to copy column definitions from views, foreign tables, or composite types\&. Inapplicable options (e\&.g\&.,
 INCLUDING INDEXES
 from a view) are ignored\&.
 .RE
@@ -1137,6 +1140,14 @@
 allows a table of no columns to be created (for example,
 CREATE TABLE foo();)\&. This is an extension from the SQL standard, which does not allow zero\-column tables\&. Zero\-column tables are not in themselves very useful, but disallowing them creates odd special cases for
 \fBALTER TABLE DROP COLUMN\fR, so it seems cleaner to ignore this spec restriction\&.
+.SS "LIKE Clause"
+.PP
+While a
+LIKE
+clause exists in the SQL standard, many of the options that
+PostgreSQL
+accepts for it are not in the standard, and some of the standard\*(Aqs options are not implemented by
+PostgreSQL\&.
 .SS "WITH Clause"
 .PP
 The
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TABLE_AS.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TABLE_AS.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TABLE_AS.7	2016-03-28 20:22:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TABLE_AS.7	2017-08-07 21:33:55.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE TABLE AS
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE TABLE AS" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE TABLE AS" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TABLESPACE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TABLESPACE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TABLESPACE.7	2016-03-28 20:22:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TABLESPACE.7	2017-08-07 21:33:55.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE TABLESPACE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE TABLESPACE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE TABLESPACE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7	2016-03-28 20:22:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7	2017-08-07 21:33:55.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE TEXT SEARCH CONFIGURATION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE TEXT SEARCH CONFIGURATION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE TEXT SEARCH CONFIGURATION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TEXT_SEARCH_DICTIONARY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TEXT_SEARCH_DICTIONARY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TEXT_SEARCH_DICTIONARY.7	2016-03-28 20:22:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TEXT_SEARCH_DICTIONARY.7	2017-08-07 21:33:55.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE TEXT SEARCH DICTIONARY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE TEXT SEARCH DICTIONARY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE TEXT SEARCH DICTIONARY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TEXT_SEARCH_PARSER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TEXT_SEARCH_PARSER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TEXT_SEARCH_PARSER.7	2016-03-28 20:22:20.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TEXT_SEARCH_PARSER.7	2017-08-07 21:33:56.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE TEXT SEARCH PARSER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE TEXT SEARCH PARSER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE TEXT SEARCH PARSER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TEXT_SEARCH_TEMPLATE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TEXT_SEARCH_TEMPLATE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TEXT_SEARCH_TEMPLATE.7	2016-03-28 20:22:21.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TEXT_SEARCH_TEMPLATE.7	2017-08-07 21:33:56.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE TEXT SEARCH TEMPLATE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE TEXT SEARCH TEMPLATE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE TEXT SEARCH TEMPLATE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TRANSFORM.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TRANSFORM.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TRANSFORM.7	2016-03-28 20:22:21.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TRANSFORM.7	2017-08-07 21:33:56.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE TRANSFORM
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE TRANSFORM" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE TRANSFORM" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TRIGGER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TRIGGER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TRIGGER.7	2016-03-28 20:22:21.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TRIGGER.7	2017-08-07 21:33:56.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE TRIGGER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE TRIGGER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE TRIGGER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TYPE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TYPE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_TYPE.7	2016-03-28 20:22:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_TYPE.7	2017-08-07 21:33:57.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE TYPE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE TYPE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE TYPE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -478,7 +478,7 @@
 \*(AqU\*(Aq
 for
 \(lquser\-defined type\(rq\&. Other standard category codes can be found in
-Table\ \&49.57, \(lqtypcategory Codes\(rq\&. You may also choose other ASCII characters in order to create custom categories\&.
+Table\ \&49.55, \(lqtypcategory Codes\(rq\&. You may also choose other ASCII characters in order to create custom categories\&.
 .RE
 .PP
 \fIpreferred\fR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_USER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_USER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_USER.7	2016-03-28 20:22:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_USER.7	2017-08-07 21:33:58.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE USER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE USER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE USER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_USER_MAPPING.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_USER_MAPPING.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_USER_MAPPING.7	2016-03-28 20:22:22.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_USER_MAPPING.7	2017-08-07 21:33:58.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE USER MAPPING
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE USER MAPPING" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE USER MAPPING" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_VIEW.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_VIEW.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/CREATE_VIEW.7	2016-03-28 20:22:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/CREATE_VIEW.7	2017-08-07 21:33:58.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CREATE VIEW
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "CREATE VIEW" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "CREATE VIEW" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -66,7 +66,7 @@
 .RS 4
 .\}
 .nf
-CREATE RECURSIVE VIEW \fIname\fR (\fIcolumns\fR) AS SELECT \fI\&.\&.\&.\fR;
+CREATE RECURSIVE VIEW [ \fIschema\fR \&. ] \fIview_name\fR (\fIcolumn_names\fR) AS SELECT \fI\&.\&.\&.\fR;
 .fi
 .if n \{\
 .RE
@@ -78,13 +78,13 @@
 .RS 4
 .\}
 .nf
-CREATE VIEW \fIname\fR AS WITH RECURSIVE \fIname\fR (\fIcolumns\fR) AS (SELECT \fI\&.\&.\&.\fR) SELECT \fIcolumns\fR FROM \fIname\fR;
+CREATE VIEW [ \fIschema\fR \&. ] \fIview_name\fR AS WITH RECURSIVE \fIview_name\fR (\fIcolumn_names\fR) AS (SELECT \fI\&.\&.\&.\fR) SELECT \fIcolumn_names\fR FROM \fIview_name\fR;
 .fi
 .if n \{\
 .RE
 .\}
 .sp
-A view column list must be specified for a recursive view\&.
+A view column name list must be specified for a recursive view\&.
 .RE
 .PP
 \fIname\fR
@@ -471,7 +471,7 @@
 .RS 4
 .\}
 .nf
-CREATE RECURSIVE VIEW nums_1_100 (n) AS
+CREATE RECURSIVE VIEW public\&.nums_1_100 (n) AS
     VALUES (1)
 UNION ALL
     SELECT n+1 FROM nums_1_100 WHERE n < 100;
@@ -479,6 +479,9 @@
 .if n \{\
 .RE
 .\}
+.sp
+Notice that although the recursive view\*(Aqs name is schema\-qualified in this
+\fBCREATE\fR, its internal self\-reference is not schema\-qualified\&. This is because the implicitly\-created CTE\*(Aqs name cannot be schema\-qualified\&.
 .SH "COMPATIBILITY"
 .PP
 \fBCREATE OR REPLACE VIEW\fR
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DEALLOCATE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DEALLOCATE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DEALLOCATE.7	2016-03-28 20:22:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DEALLOCATE.7	2017-08-07 21:33:59.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DEALLOCATE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DEALLOCATE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DEALLOCATE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DECLARE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DECLARE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DECLARE.7	2016-03-28 20:22:23.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DECLARE.7	2017-08-07 21:33:59.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DECLARE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DECLARE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DECLARE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DELETE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DELETE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DELETE.7	2016-03-28 20:22:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DELETE.7	2017-08-07 21:33:59.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DELETE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DELETE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DELETE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DISCARD.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DISCARD.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DISCARD.7	2016-03-28 20:22:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DISCARD.7	2017-08-07 21:34:00.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DISCARD
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DISCARD" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DISCARD" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DO.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DO.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DO.7	2016-03-28 20:22:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DO.7	2017-08-07 21:34:00.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DO
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DO" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DO" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_AGGREGATE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_AGGREGATE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_AGGREGATE.7	2016-03-28 20:22:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_AGGREGATE.7	2017-08-07 21:34:00.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP AGGREGATE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP AGGREGATE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP AGGREGATE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_CAST.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_CAST.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_CAST.7	2016-03-28 20:22:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_CAST.7	2017-08-07 21:34:00.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP CAST
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP CAST" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP CAST" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_COLLATION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_COLLATION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_COLLATION.7	2016-03-28 20:22:24.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_COLLATION.7	2017-08-07 21:34:00.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP COLLATION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP COLLATION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP COLLATION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_CONVERSION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_CONVERSION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_CONVERSION.7	2016-03-28 20:22:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_CONVERSION.7	2017-08-07 21:34:00.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP CONVERSION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP CONVERSION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP CONVERSION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_DATABASE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_DATABASE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_DATABASE.7	2016-03-28 20:22:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_DATABASE.7	2017-08-07 21:34:01.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP DATABASE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP DATABASE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP DATABASE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_DOMAIN.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_DOMAIN.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_DOMAIN.7	2016-03-28 20:22:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_DOMAIN.7	2017-08-07 21:34:01.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP DOMAIN
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP DOMAIN" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP DOMAIN" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_EVENT_TRIGGER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_EVENT_TRIGGER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_EVENT_TRIGGER.7	2016-03-28 20:22:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_EVENT_TRIGGER.7	2017-08-07 21:34:01.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP EVENT TRIGGER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP EVENT TRIGGER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP EVENT TRIGGER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_EXTENSION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_EXTENSION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_EXTENSION.7	2016-03-28 20:22:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_EXTENSION.7	2017-08-07 21:34:01.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP EXTENSION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP EXTENSION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP EXTENSION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_FOREIGN_DATA_WRAPPER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_FOREIGN_DATA_WRAPPER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_FOREIGN_DATA_WRAPPER.7	2016-03-28 20:22:25.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_FOREIGN_DATA_WRAPPER.7	2017-08-07 21:34:01.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP FOREIGN DATA WRAPPER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP FOREIGN DATA WRAPPER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP FOREIGN DATA WRAPPER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_FOREIGN_TABLE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_FOREIGN_TABLE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_FOREIGN_TABLE.7	2016-03-28 20:22:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_FOREIGN_TABLE.7	2017-08-07 21:34:02.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP FOREIGN TABLE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP FOREIGN TABLE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP FOREIGN TABLE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_FUNCTION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_FUNCTION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_FUNCTION.7	2016-03-28 20:22:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_FUNCTION.7	2017-08-07 21:34:02.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP FUNCTION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP FUNCTION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP FUNCTION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_GROUP.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_GROUP.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_GROUP.7	2016-03-28 20:22:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_GROUP.7	2017-08-07 21:34:02.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP GROUP
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP GROUP" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP GROUP" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_INDEX.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_INDEX.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_INDEX.7	2016-03-28 20:22:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_INDEX.7	2017-08-07 21:34:02.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP INDEX
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP INDEX" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP INDEX" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_LANGUAGE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_LANGUAGE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_LANGUAGE.7	2016-03-28 20:22:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_LANGUAGE.7	2017-08-07 21:34:02.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP LANGUAGE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP LANGUAGE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP LANGUAGE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_MATERIALIZED_VIEW.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_MATERIALIZED_VIEW.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_MATERIALIZED_VIEW.7	2016-03-28 20:22:26.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_MATERIALIZED_VIEW.7	2017-08-07 21:34:03.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP MATERIALIZED VIEW
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP MATERIALIZED VIEW" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP MATERIALIZED VIEW" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_OPERATOR.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_OPERATOR.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_OPERATOR.7	2016-03-28 20:22:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_OPERATOR.7	2017-08-07 21:34:03.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP OPERATOR
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP OPERATOR" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP OPERATOR" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_OPERATOR_CLASS.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_OPERATOR_CLASS.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_OPERATOR_CLASS.7	2016-03-28 20:22:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_OPERATOR_CLASS.7	2017-08-07 21:34:03.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP OPERATOR CLASS
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP OPERATOR CLASS" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP OPERATOR CLASS" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_OPERATOR_FAMILY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_OPERATOR_FAMILY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_OPERATOR_FAMILY.7	2016-03-28 20:22:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_OPERATOR_FAMILY.7	2017-08-07 21:34:03.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP OPERATOR FAMILY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP OPERATOR FAMILY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP OPERATOR FAMILY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_OWNED.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_OWNED.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_OWNED.7	2016-03-28 20:22:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_OWNED.7	2017-08-07 21:34:03.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP OWNED
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP OWNED" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP OWNED" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_POLICY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_POLICY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_POLICY.7	2016-03-28 20:22:27.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_POLICY.7	2017-08-07 21:34:04.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP POLICY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP POLICY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP POLICY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_ROLE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_ROLE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_ROLE.7	2016-03-28 20:22:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_ROLE.7	2017-08-07 21:34:04.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP ROLE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP ROLE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP ROLE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_RULE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_RULE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_RULE.7	2016-03-28 20:22:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_RULE.7	2017-08-07 21:34:04.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP RULE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP RULE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP RULE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_SCHEMA.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_SCHEMA.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_SCHEMA.7	2016-03-28 20:22:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_SCHEMA.7	2017-08-07 21:34:04.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP SCHEMA
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP SCHEMA" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP SCHEMA" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_SEQUENCE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_SEQUENCE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_SEQUENCE.7	2016-03-28 20:22:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_SEQUENCE.7	2017-08-07 21:34:04.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP SEQUENCE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP SEQUENCE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP SEQUENCE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_SERVER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_SERVER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_SERVER.7	2016-03-28 20:22:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_SERVER.7	2017-08-07 21:34:05.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP SERVER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP SERVER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP SERVER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TABLE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TABLE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TABLE.7	2016-03-28 20:22:28.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TABLE.7	2017-08-07 21:34:05.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP TABLE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP TABLE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP TABLE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TABLESPACE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TABLESPACE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TABLESPACE.7	2016-03-28 20:22:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TABLESPACE.7	2017-08-07 21:34:05.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP TABLESPACE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP TABLESPACE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP TABLESPACE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TEXT_SEARCH_CONFIGURATION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TEXT_SEARCH_CONFIGURATION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TEXT_SEARCH_CONFIGURATION.7	2016-03-28 20:22:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TEXT_SEARCH_CONFIGURATION.7	2017-08-07 21:34:05.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP TEXT SEARCH CONFIGURATION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP TEXT SEARCH CONFIGURATION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP TEXT SEARCH CONFIGURATION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TEXT_SEARCH_DICTIONARY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TEXT_SEARCH_DICTIONARY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TEXT_SEARCH_DICTIONARY.7	2016-03-28 20:22:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TEXT_SEARCH_DICTIONARY.7	2017-08-07 21:34:05.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP TEXT SEARCH DICTIONARY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP TEXT SEARCH DICTIONARY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP TEXT SEARCH DICTIONARY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TEXT_SEARCH_PARSER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TEXT_SEARCH_PARSER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TEXT_SEARCH_PARSER.7	2016-03-28 20:22:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TEXT_SEARCH_PARSER.7	2017-08-07 21:34:06.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP TEXT SEARCH PARSER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP TEXT SEARCH PARSER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP TEXT SEARCH PARSER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TEXT_SEARCH_TEMPLATE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TEXT_SEARCH_TEMPLATE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TEXT_SEARCH_TEMPLATE.7	2016-03-28 20:22:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TEXT_SEARCH_TEMPLATE.7	2017-08-07 21:34:06.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP TEXT SEARCH TEMPLATE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP TEXT SEARCH TEMPLATE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP TEXT SEARCH TEMPLATE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TRANSFORM.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TRANSFORM.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TRANSFORM.7	2016-03-28 20:22:29.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TRANSFORM.7	2017-08-07 21:34:06.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP TRANSFORM
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP TRANSFORM" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP TRANSFORM" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TRIGGER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TRIGGER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TRIGGER.7	2016-03-28 20:22:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TRIGGER.7	2017-08-07 21:34:06.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP TRIGGER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP TRIGGER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP TRIGGER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TYPE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TYPE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_TYPE.7	2016-03-28 20:22:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_TYPE.7	2017-08-07 21:34:06.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP TYPE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP TYPE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP TYPE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_USER.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_USER.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_USER.7	2016-03-28 20:22:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_USER.7	2017-08-07 21:34:06.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP USER
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP USER" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP USER" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_USER_MAPPING.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_USER_MAPPING.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_USER_MAPPING.7	2016-03-28 20:22:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_USER_MAPPING.7	2017-08-07 21:34:07.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP USER MAPPING
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP USER MAPPING" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP USER MAPPING" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_VIEW.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_VIEW.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/DROP_VIEW.7	2016-03-28 20:22:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/DROP_VIEW.7	2017-08-07 21:34:07.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: DROP VIEW
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "DROP VIEW" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "DROP VIEW" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/END.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/END.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/END.7	2016-03-28 20:22:30.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/END.7	2017-08-07 21:34:07.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: END
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "END" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "END" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/EXECUTE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/EXECUTE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/EXECUTE.7	2016-03-28 20:22:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/EXECUTE.7	2017-08-07 21:34:07.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: EXECUTE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "EXECUTE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "EXECUTE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/EXPLAIN.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/EXPLAIN.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/EXPLAIN.7	2016-03-28 20:22:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/EXPLAIN.7	2017-08-07 21:34:08.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: EXPLAIN
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "EXPLAIN" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "EXPLAIN" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/FETCH.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/FETCH.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/FETCH.7	2016-03-28 20:22:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/FETCH.7	2017-08-07 21:34:08.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: FETCH
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "FETCH" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "FETCH" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/GRANT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/GRANT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/GRANT.7	2016-03-28 20:22:31.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/GRANT.7	2017-08-07 21:34:08.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: GRANT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "GRANT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "GRANT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/IMPORT_FOREIGN_SCHEMA.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/IMPORT_FOREIGN_SCHEMA.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/IMPORT_FOREIGN_SCHEMA.7	2016-03-28 20:22:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/IMPORT_FOREIGN_SCHEMA.7	2017-08-07 21:34:08.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: IMPORT FOREIGN SCHEMA
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "IMPORT FOREIGN SCHEMA" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "IMPORT FOREIGN SCHEMA" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/INSERT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/INSERT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/INSERT.7	2016-03-28 20:22:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/INSERT.7	2017-08-07 21:34:09.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: INSERT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "INSERT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "INSERT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -177,7 +177,7 @@
 The name of a column in the table named by
 \fItable_name\fR\&. The column name can be qualified with a subfield name or array subscript, if needed\&. (Inserting into only some fields of a composite column leaves the other fields null\&.) When referencing a column with
 ON CONFLICT DO UPDATE, do not include the table\*(Aqs name in the specification of a target column\&. For example,
-INSERT \&.\&.\&. ON CONFLICT DO UPDATE tab SET table_name\&.col = 1
+INSERT INTO table_name \&.\&.\&. ON CONFLICT DO UPDATE SET table_name\&.col = 1
 is invalid (this follows the general behavior for
 \fBUPDATE\fR)\&.
 .RE
@@ -242,7 +242,7 @@
 columns and/or
 \fIindex_expression\fR
 expressions, and an optional
-\fI index_predicate\fR\&. All
+\fIindex_predicate\fR\&. All
 \fItable_name\fR
 unique indexes that, without regard to order, contain exactly the
 \fIconflict_target\fR\-specified columns/expressions are inferred (chosen) as arbiter indexes\&. If an
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/LISTEN.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/LISTEN.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/LISTEN.7	2016-03-28 20:22:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/LISTEN.7	2017-08-07 21:34:09.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: LISTEN
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "LISTEN" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "LISTEN" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/LOAD.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/LOAD.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/LOAD.7	2016-03-28 20:22:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/LOAD.7	2017-08-07 21:34:09.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: LOAD
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "LOAD" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "LOAD" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/LOCK.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/LOCK.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/LOCK.7	2016-03-28 20:22:32.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/LOCK.7	2017-08-07 21:34:09.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: LOCK
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "LOCK" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "LOCK" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/MOVE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/MOVE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/MOVE.7	2016-03-28 20:22:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/MOVE.7	2017-08-07 21:34:10.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: MOVE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "MOVE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "MOVE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/NOTIFY.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/NOTIFY.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/NOTIFY.7	2016-03-28 20:22:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/NOTIFY.7	2017-08-07 21:34:10.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: NOTIFY
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "NOTIFY" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "NOTIFY" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/PREPARE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/PREPARE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/PREPARE.7	2016-03-28 20:22:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/PREPARE.7	2017-08-07 21:34:10.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: PREPARE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PREPARE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PREPARE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/PREPARE_TRANSACTION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/PREPARE_TRANSACTION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/PREPARE_TRANSACTION.7	2016-03-28 20:22:33.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/PREPARE_TRANSACTION.7	2017-08-07 21:34:10.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: PREPARE TRANSACTION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "PREPARE TRANSACTION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "PREPARE TRANSACTION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/REASSIGN_OWNED.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/REASSIGN_OWNED.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/REASSIGN_OWNED.7	2016-03-28 20:22:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/REASSIGN_OWNED.7	2017-08-07 21:34:11.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: REASSIGN OWNED
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "REASSIGN OWNED" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "REASSIGN OWNED" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/REFRESH_MATERIALIZED_VIEW.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/REFRESH_MATERIALIZED_VIEW.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/REFRESH_MATERIALIZED_VIEW.7	2016-03-28 20:22:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/REFRESH_MATERIALIZED_VIEW.7	2017-08-07 21:34:11.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: REFRESH MATERIALIZED VIEW
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "REFRESH MATERIALIZED VIEW" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "REFRESH MATERIALIZED VIEW" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/REINDEX.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/REINDEX.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/REINDEX.7	2016-03-28 20:22:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/REINDEX.7	2017-08-07 21:34:11.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: REINDEX
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "REINDEX" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "REINDEX" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/RELEASE_SAVEPOINT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/RELEASE_SAVEPOINT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/RELEASE_SAVEPOINT.7	2016-03-28 20:22:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/RELEASE_SAVEPOINT.7	2017-08-07 21:34:11.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: RELEASE SAVEPOINT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "RELEASE SAVEPOINT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "RELEASE SAVEPOINT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/RESET.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/RESET.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/RESET.7	2016-03-28 20:22:34.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/RESET.7	2017-08-07 21:34:12.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: RESET
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "RESET" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "RESET" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/REVOKE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/REVOKE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/REVOKE.7	2016-03-28 20:22:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/REVOKE.7	2017-08-07 21:34:12.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: REVOKE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "REVOKE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "REVOKE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ROLLBACK.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ROLLBACK.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ROLLBACK.7	2016-03-28 20:22:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ROLLBACK.7	2017-08-07 21:34:12.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ROLLBACK
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ROLLBACK" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ROLLBACK" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ROLLBACK_PREPARED.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ROLLBACK_PREPARED.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ROLLBACK_PREPARED.7	2016-03-28 20:22:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ROLLBACK_PREPARED.7	2017-08-07 21:34:12.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ROLLBACK PREPARED
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ROLLBACK PREPARED" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ROLLBACK PREPARED" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/ROLLBACK_TO_SAVEPOINT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/ROLLBACK_TO_SAVEPOINT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/ROLLBACK_TO_SAVEPOINT.7	2016-03-28 20:22:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/ROLLBACK_TO_SAVEPOINT.7	2017-08-07 21:34:12.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ROLLBACK TO SAVEPOINT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "ROLLBACK TO SAVEPOINT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "ROLLBACK TO SAVEPOINT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/SAVEPOINT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/SAVEPOINT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/SAVEPOINT.7	2016-03-28 20:22:35.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/SAVEPOINT.7	2017-08-07 21:34:13.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SAVEPOINT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SAVEPOINT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SAVEPOINT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/SECURITY_LABEL.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/SECURITY_LABEL.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/SECURITY_LABEL.7	2016-03-28 20:22:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/SECURITY_LABEL.7	2017-08-07 21:34:13.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SECURITY LABEL
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SECURITY LABEL" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SECURITY LABEL" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/SELECT.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/SELECT.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/SELECT.7	2016-03-28 20:22:36.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/SELECT.7	2017-08-07 21:34:14.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SELECT
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SELECT" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SELECT" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -458,7 +458,7 @@
 \fIargument\fR
 values will select the same sample of the table, if the table has not been changed meanwhile\&. But different seed values will usually produce different samples\&. If
 REPEATABLE
-is not given then a new random sample is selected for each query\&. Note that some add\-on sampling methods do not accept
+is not given then a new random seed is selected for each query\&. Note that some add\-on sampling methods do not accept
 REPEATABLE, and will always produce new samples on each use\&.
 .RE
 .PP
@@ -662,7 +662,10 @@
 NATURAL
 is shorthand for a
 USING
-list that mentions all columns in the two tables that have the same names\&.
+list that mentions all columns in the two tables that have matching names\&. If there are no common column names,
+NATURAL
+is equivalent to
+ON TRUE\&.
 .RE
 .PP
 LATERAL
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/SELECT_INTO.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/SELECT_INTO.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/SELECT_INTO.7	2016-03-28 20:22:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/SELECT_INTO.7	2017-08-07 21:34:14.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SELECT INTO
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SELECT INTO" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SELECT INTO" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/SET.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/SET.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/SET.7	2016-03-28 20:22:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/SET.7	2017-08-07 21:34:14.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SET
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SET" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SET" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/SET_CONSTRAINTS.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/SET_CONSTRAINTS.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/SET_CONSTRAINTS.7	2016-03-28 20:22:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/SET_CONSTRAINTS.7	2017-08-07 21:34:15.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SET CONSTRAINTS
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SET CONSTRAINTS" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SET CONSTRAINTS" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/SET_ROLE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/SET_ROLE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/SET_ROLE.7	2016-03-28 20:22:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/SET_ROLE.7	2017-08-07 21:34:15.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SET ROLE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SET ROLE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SET ROLE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/SET_SESSION_AUTHORIZATION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/SET_SESSION_AUTHORIZATION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/SET_SESSION_AUTHORIZATION.7	2016-03-28 20:22:37.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/SET_SESSION_AUTHORIZATION.7	2017-08-07 21:34:15.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SET SESSION AUTHORIZATION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SET SESSION AUTHORIZATION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SET SESSION AUTHORIZATION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/SET_TRANSACTION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/SET_TRANSACTION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/SET_TRANSACTION.7	2016-03-28 20:22:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/SET_TRANSACTION.7	2017-08-07 21:34:15.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SET TRANSACTION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SET TRANSACTION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SET TRANSACTION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/SHOW.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/SHOW.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/SHOW.7	2016-03-28 20:22:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/SHOW.7	2017-08-07 21:34:16.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: SHOW
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "SHOW" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "SHOW" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/START_TRANSACTION.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/START_TRANSACTION.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/START_TRANSACTION.7	2016-03-28 20:22:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/START_TRANSACTION.7	2017-08-07 21:34:16.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: START TRANSACTION
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "START TRANSACTION" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "START TRANSACTION" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/TRUNCATE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/TRUNCATE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/TRUNCATE.7	2016-03-28 20:22:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/TRUNCATE.7	2017-08-07 21:34:16.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: TRUNCATE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "TRUNCATE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "TRUNCATE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/UNLISTEN.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/UNLISTEN.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/UNLISTEN.7	2016-03-28 20:22:38.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/UNLISTEN.7	2017-08-07 21:34:16.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: UNLISTEN
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "UNLISTEN" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "UNLISTEN" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/UPDATE.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/UPDATE.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/UPDATE.7	2016-03-28 20:22:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/UPDATE.7	2017-08-07 21:34:16.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: UPDATE
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "UPDATE" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "UPDATE" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -112,7 +112,7 @@
 .RS 4
 The name of a column in the table named by
 \fItable_name\fR\&. The column name can be qualified with a subfield name or array subscript, if needed\&. Do not include the table\*(Aqs name in the specification of a target column \(em for example,
-UPDATE tab SET tab\&.col = 1
+UPDATE table_name SET table_name\&.col = 1
 is invalid\&.
 .RE
 .PP
@@ -434,6 +434,6 @@
 .PP
 According to the standard, the source value for a parenthesized sub\-list of column names can be any row\-valued expression yielding the correct number of columns\&.
 PostgreSQL
-only allows the source value to be a parenthesized list of expressions (a row constructor) or a sub\-SELECT\&. An individual column\*(Aqs updated value can be specified as
+only allows the source value to be a parenthesized list of expressions or a sub\-SELECT\&. An individual column\*(Aqs updated value can be specified as
 DEFAULT
-in the row\-constructor case, but not inside a sub\-SELECT\&.
+in the list\-of\-expressions case, but not inside a sub\-SELECT\&.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/VACUUM.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/VACUUM.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/VACUUM.7	2016-03-28 20:22:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/VACUUM.7	2017-08-07 21:34:17.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: VACUUM
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "VACUUM" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "VACUUM" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -173,43 +173,14 @@
 Section 23.1, \(lqRoutine Vacuuming\(rq, in the documentation\&.
 .SH "EXAMPLES"
 .PP
-The following is an example from running
-\fBVACUUM\fR
-on a table in the regression database:
+To clean a single table
+onek, analyze it for the optimizer and print a detailed vacuum activity report:
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
-regression=# VACUUM (VERBOSE, ANALYZE) onek;
-INFO:  vacuuming "public\&.onek"
-INFO:  index "onek_unique1" now contains 1000 tuples in 14 pages
-DETAIL:  3000 index tuples were removed\&.
-0 index pages have been deleted, 0 are currently reusable\&.
-CPU 0\&.01s/0\&.08u sec elapsed 0\&.18 sec\&.
-INFO:  index "onek_unique2" now contains 1000 tuples in 16 pages
-DETAIL:  3000 index tuples were removed\&.
-0 index pages have been deleted, 0 are currently reusable\&.
-CPU 0\&.00s/0\&.07u sec elapsed 0\&.23 sec\&.
-INFO:  index "onek_hundred" now contains 1000 tuples in 13 pages
-DETAIL:  3000 index tuples were removed\&.
-0 index pages have been deleted, 0 are currently reusable\&.
-CPU 0\&.01s/0\&.08u sec elapsed 0\&.17 sec\&.
-INFO:  index "onek_stringu1" now contains 1000 tuples in 48 pages
-DETAIL:  3000 index tuples were removed\&.
-0 index pages have been deleted, 0 are currently reusable\&.
-CPU 0\&.01s/0\&.09u sec elapsed 0\&.59 sec\&.
-INFO:  "onek": removed 3000 tuples in 108 pages
-DETAIL:  CPU 0\&.01s/0\&.06u sec elapsed 0\&.07 sec\&.
-INFO:  "onek": found 3000 removable, 1000 nonremovable tuples in 143 pages
-DETAIL:  0 dead tuples cannot be removed yet\&.
-There were 0 unused item pointers\&.
-Skipped 0 pages due to buffer pins\&.
-0 pages are entirely empty\&.
-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
+VACUUM (VERBOSE, ANALYZE) onek;
 .fi
 .if n \{\
 .RE
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/man7/VALUES.7 postgresql-9.5-9.5.8/doc/src/sgml/man7/VALUES.7
--- postgresql-9.5-9.5.2/doc/src/sgml/man7/VALUES.7	2016-03-28 20:22:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/man7/VALUES.7	2017-08-07 21:34:17.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: VALUES
 .\"    Author: The PostgreSQL Global Development Group
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016
-.\"    Manual: PostgreSQL 9.5.2 Documentation
-.\"    Source: PostgreSQL 9.5.2
+.\"      Date: 2017
+.\"    Manual: PostgreSQL 9.5.8 Documentation
+.\"    Source: PostgreSQL 9.5.8
 .\"  Language: English
 .\"
-.TH "VALUES" "7" "2016" "PostgreSQL 9.5.2" "PostgreSQL 9.5.2 Documentation"
+.TH "VALUES" "7" "2017" "PostgreSQL 9.5.8" "PostgreSQL 9.5.8 Documentation"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/mvcc.sgml postgresql-9.5-9.5.8/doc/src/sgml/mvcc.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/mvcc.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/mvcc.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -644,7 +644,7 @@
     first.  In <productname>PostgreSQL</productname> these locks do not
     cause any blocking and therefore can <emphasis>not</> play any part in
     causing a deadlock.  They are used to identify and flag dependencies
-    among concurrent serializable transactions which in certain combinations
+    among concurrent Serializable transactions which in certain combinations
     can lead to serialization anomalies.  In contrast, a Read Committed or
     Repeatable Read transaction which wants to ensure data consistency may
     need to take out a lock on an entire table, which could block other
@@ -679,12 +679,13 @@
 
    <para>
     Consistent use of Serializable transactions can simplify development.
-    The guarantee that any set of concurrent serializable transactions will
-    have the same effect as if they were run one at a time means that if
-    you can demonstrate that a single transaction, as written, will do the
-    right thing when run by itself, you can have confidence that it will
-    do the right thing in any mix of serializable transactions, even without
-    any information about what those other transactions might do.  It is
+    The guarantee that any set of successfully committed concurrent
+    Serializable transactions will have the same effect as if they were run
+    one at a time means that if you can demonstrate that a single transaction,
+    as written, will do the right thing when run by itself, you can have
+    confidence that it will do the right thing in any mix of Serializable
+    transactions, even without any information about what those other
+    transactions might do, or it will not successfully commit.  It is
     important that an environment which uses this technique have a
     generalized way of handling serialization failures (which always return
     with a SQLSTATE value of '40001'), because it will be very hard to
@@ -699,6 +700,26 @@
    </para>
 
    <para>
+    While <productname>PostgreSQL</>'s Serializable transaction isolation
+    level only allows concurrent transactions to commit if it can prove there
+    is a serial order of execution that would produce the same effect, it
+    doesn't always prevent errors from being raised that would not occur in
+    true serial execution.  In particular, it is possible to see unique
+    constraint violations caused by conflicts with overlapping Serializable
+    transactions even after explicitly checking that the key isn't present
+    before attempting to insert it.  This can be avoided by making sure
+    that <emphasis>all</> Serializable transactions that insert potentially
+    conflicting keys explicitly check if they can do so first.  For example,
+    imagine an application that asks the user for a new key and then checks
+    that it doesn't exist already by trying to select it first, or generates
+    a new key by selecting the maximum existing key and adding one.  If some
+    Serializable transactions insert new keys directly without following this
+    protocol, unique constraints violations might be reported even in cases
+    where they could not occur in a serial execution of the concurrent
+    transactions.
+   </para>
+
+   <para>
     For optimal performance when relying on Serializable transactions for
     concurrency control, these issues should be considered:
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/pgbuffercache.sgml postgresql-9.5-9.5.8/doc/src/sgml/pgbuffercache.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/pgbuffercache.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/pgbuffercache.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -82,7 +82,7 @@
       <entry><type>smallint</type></entry>
       <entry></entry>
       <entry>Fork number within the relation;  see
-      <filename>include/storage/relfilenode.h</></entry>
+      <filename>include/common/relpath.h</></entry>
      </row>
 
      <row>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/pgstattuple.sgml postgresql-9.5-9.5.8/doc/src/sgml/pgstattuple.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/pgstattuple.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/pgstattuple.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -109,6 +109,16 @@
      </tgroup>
     </table>
 
+    <note>
+      <para>
+        The <literal>table_len</literal> will always be greater than the sum
+        of the <literal>tuple_len</literal>, <literal>dead_tuple_len</literal>
+        and <literal>free_space</literal>. The difference is accounted for by
+        fixed page overhead, the per-page table of pointers to tuples, and
+        padding to ensure that tuples are correctly aligned. 
+      </para>
+    </note>
+
     <para>
      <function>pgstattuple</function> acquires only a read lock on the
      relation. So the results do not reflect an instantaneous snapshot;
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/planstats.sgml postgresql-9.5-9.5.8/doc/src/sgml/planstats.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/planstats.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/planstats.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -448,4 +448,64 @@
 
  </sect1>
 
+ <sect1 id="planner-stats-security">
+  <title>Planner Statistics and Security</title>
+
+  <para>
+   Access to the table <structname>pg_statistic</structname> is restricted to
+   superusers, so that ordinary users cannot learn about the contents of the
+   tables of other users from it.  Some selectivity estimation functions will
+   use a user-provided operator (either the operator appearing in the query or
+   a related operator) to analyze the stored statistics.  For example, in order
+   to determine whether a stored most common value is applicable, the
+   selectivity estimator will have to run the appropriate <literal>=</literal>
+   operator to compare the constant in the query to the stored value.
+   Thus the data in <structname>pg_statistic</structname> is potentially
+   passed to user-defined operators.  An appropriately crafted operator can
+   intentionally leak the passed operands (for example, by logging them
+   or writing them to a different table), or accidentally leak them by showing
+   their values in error messages, in either case possibly exposing data from
+   <structname>pg_statistic</structname> to a user who should not be able to
+   see it.
+  </para>
+
+  <para>
+   In order to prevent this, the following applies to all built-in selectivity
+   estimation functions.  When planning a query, in order to be able to use
+   stored statistics, the current user must either
+   have <literal>SELECT</literal> privilege on the table or the involved
+   columns, or the operator used must be <literal>LEAKPROOF</literal> (more
+   accurately, the function that the operator is based on).  If not, then the
+   selectivity estimator will behave as if no statistics are available, and
+   the planner will proceed with default or fall-back assumptions.
+  </para>
+
+  <para>
+   If a user does not have the required privilege on the table or columns,
+   then in many cases the query will ultimately receive a permission-denied
+   error, in which case this mechanism is invisible in practice.  But if the
+   user is reading from a security-barrier view, then the planner might wish
+   to check the statistics of an underlying table that is otherwise
+   inaccessible to the user.  In that case, the operator should be leak-proof
+   or the statistics will not be used.  There is no direct feedback about
+   that, except that the plan might be suboptimal.  If one suspects that this
+   is the case, one could try running the query as a more privileged user,
+   to see if a different plan results.
+  </para>
+
+  <para>
+   This restriction applies only to cases where the planner would need to
+   execute a user-defined operator on one or more values
+   from <structname>pg_statistic</structname>.  Thus the planner is permitted
+   to use generic statistical information, such as the fraction of null values
+   or the number of distinct values in a column, regardless of access
+   privileges.
+  </para>
+
+  <para>
+   Selectivity estimation functions contained in third-party extensions that
+   potentially operate on statistics with user-defined operators should follow
+   the same security rules.  Consult the PostgreSQL source code for guidance.
+  </para>
+ </sect1>
 </chapter>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/plpgsql.sgml postgresql-9.5-9.5.8/doc/src/sgml/plpgsql.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/plpgsql.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/plpgsql.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -180,8 +180,26 @@
   <title>Structure of <application>PL/pgSQL</application></title>
 
   <para>
+   Functions written in <application>PL/pgSQL</application> are defined
+   to the server by executing <xref linkend="sql-createfunction"> commands.
+   Such a command would normally look like, say,
+<programlisting>
+CREATE FUNCTION somefunc(integer, text) RETURNS integer
+AS '<replaceable>function body text</>'
+LANGUAGE plpgsql;
+</programlisting>
+   The function body is simply a string literal so far as <command>CREATE
+   FUNCTION</> is concerned.  It is often helpful to use dollar quoting
+   (see <xref linkend="sql-syntax-dollar-quoting">) to write the function
+   body, rather than the normal single quote syntax.  Without dollar quoting,
+   any single quotes or backslashes in the function body must be escaped by
+   doubling them.  Almost all the examples in this chapter use dollar-quoted
+   literals for their function bodies.
+  </para>
+
+  <para>
    <application>PL/pgSQL</application> is a block-structured language.
-   The complete text of a function definition must be a
+   The complete text of a function body must be a
    <firstterm>block</>. A block is defined as:
 
 <synopsis>
@@ -1441,28 +1459,56 @@
 GET <optional> CURRENT </optional> DIAGNOSTICS <replaceable>variable</replaceable> { = | := } <replaceable>item</replaceable> <optional> , ... </optional>;
 </synopsis>
 
-     This command allows retrieval of system status indicators.  Each
-     <replaceable>item</replaceable> is a key word identifying a status
-     value to be assigned to the specified variable (which should be
-     of the right data type to receive it).  The currently available
-     status items are <varname>ROW_COUNT</>, the number of rows
-     processed by the last <acronym>SQL</acronym> command sent to
-     the <acronym>SQL</acronym> engine, and <varname>RESULT_OID</>,
-     the OID of the last row inserted by the most recent
-     <acronym>SQL</acronym> command.  Note that <varname>RESULT_OID</>
-     is only useful after an <command>INSERT</command> command into a
-     table containing OIDs.
-     Colon-equal (<literal>:=</>) can be used instead of SQL-standard
-     <literal>=</> for <command>GET DIAGNOSTICS</>.
-    </para>
-
-    <para>
-     An example:
+     This command allows retrieval of system status indicators.
+     <literal>CURRENT</> is a noise word (but see also <command>GET STACKED
+     DIAGNOSTICS</command> in <xref linkend="plpgsql-exception-diagnostics">).
+     Each <replaceable>item</replaceable> is a key word identifying a status
+     value to be assigned to the specified <replaceable>variable</replaceable>
+     (which should be of the right data type to receive it).  The currently
+     available status items are shown
+     in <xref linkend="plpgsql-current-diagnostics-values">.  Colon-equal
+     (<literal>:=</>) can be used instead of the SQL-standard <literal>=</>
+     token.  An example:
 <programlisting>
 GET DIAGNOSTICS integer_var = ROW_COUNT;
 </programlisting>
     </para>
 
+     <table id="plpgsql-current-diagnostics-values">
+      <title>Available Diagnostics Items</title>
+      <tgroup cols="3">
+       <thead>
+        <row>
+         <entry>Name</entry>
+         <entry>Type</entry>
+         <entry>Description</entry>
+        </row>
+       </thead>
+       <tbody>
+        <row>
+         <entry><varname>ROW_COUNT</varname></entry>
+         <entry><type>integer</></entry>
+         <entry>the number of rows processed by the most
+          recent <acronym>SQL</acronym> command</entry>
+        </row>
+        <row>
+         <entry><varname>RESULT_OID</varname></entry>
+         <entry><type>oid</></entry>
+         <entry>the OID of the last row inserted by the most
+          recent <acronym>SQL</acronym> command (only useful after
+          an <command>INSERT</command> command into a table having
+          OIDs)</entry>
+        </row>
+        <row>
+         <entry><literal>PG_CONTEXT</literal></entry>
+         <entry><type>text</></entry>
+         <entry>line(s) of text describing the current call stack
+          (see <xref linkend="plpgsql-call-stack">)</entry>
+        </row>
+       </tbody>
+      </tgroup>
+     </table>
+
     <para>
      The second method to determine the effects of a command is to check the
      special variable named <literal>FOUND</literal>, which is of
@@ -1828,13 +1874,13 @@
      <application>PL/pgSQL</> has three forms of <command>IF</>:
     <itemizedlist>
      <listitem>
-      <para><literal>IF ... THEN</></>
+      <para><literal>IF ... THEN ... END IF</></>
      </listitem>
      <listitem>
-      <para><literal>IF ... THEN ... ELSE</></>
+      <para><literal>IF ... THEN ... ELSE ... END IF</></>
      </listitem>
      <listitem>
-      <para><literal>IF ... THEN ... ELSIF ... THEN ... ELSE</></>
+      <para><literal>IF ... THEN ... ELSIF ... THEN ... ELSE ... END IF</></>
      </listitem>
     </itemizedlist>
 
@@ -2699,13 +2745,14 @@
 </synopsis>
 
      Each <replaceable>item</replaceable> is a key word identifying a status
-     value to be assigned to the specified variable (which should be
-     of the right data type to receive it).  The currently available
-     status items are shown in <xref linkend="plpgsql-exception-diagnostics-values">.
+     value to be assigned to the specified <replaceable>variable</replaceable>
+     (which should be of the right data type to receive it).  The currently
+     available status items are shown
+     in <xref linkend="plpgsql-exception-diagnostics-values">.
     </para>
 
      <table id="plpgsql-exception-diagnostics-values">
-      <title>Error Diagnostics Values</title>
+      <title>Error Diagnostics Items</title>
       <tgroup cols="3">
        <thead>
         <row>
@@ -2717,53 +2764,54 @@
        <tbody>
         <row>
          <entry><literal>RETURNED_SQLSTATE</literal></entry>
-         <entry>text</entry>
+         <entry><type>text</></entry>
          <entry>the SQLSTATE error code of the exception</entry>
         </row>
         <row>
          <entry><literal>COLUMN_NAME</literal></entry>
-         <entry>text</entry>
+         <entry><type>text</></entry>
          <entry>the name of the column related to exception</entry>
         </row>
         <row>
          <entry><literal>CONSTRAINT_NAME</literal></entry>
-         <entry>text</entry>
+         <entry><type>text</></entry>
          <entry>the name of the constraint related to exception</entry>
         </row>
         <row>
          <entry><literal>PG_DATATYPE_NAME</literal></entry>
-         <entry>text</entry>
+         <entry><type>text</></entry>
          <entry>the name of the data type related to exception</entry>
         </row>
         <row>
          <entry><literal>MESSAGE_TEXT</literal></entry>
-         <entry>text</entry>
+         <entry><type>text</></entry>
          <entry>the text of the exception's primary message</entry>
         </row>
         <row>
          <entry><literal>TABLE_NAME</literal></entry>
-         <entry>text</entry>
+         <entry><type>text</></entry>
          <entry>the name of the table related to exception</entry>
         </row>
         <row>
          <entry><literal>SCHEMA_NAME</literal></entry>
-         <entry>text</entry>
+         <entry><type>text</></entry>
          <entry>the name of the schema related to exception</entry>
         </row>
         <row>
          <entry><literal>PG_EXCEPTION_DETAIL</literal></entry>
-         <entry>text</entry>
+         <entry><type>text</></entry>
          <entry>the text of the exception's detail message, if any</entry>
         </row>
         <row>
          <entry><literal>PG_EXCEPTION_HINT</literal></entry>
-         <entry>text</entry>
+         <entry><type>text</></entry>
          <entry>the text of the exception's hint message, if any</entry>
         </row>
         <row>
          <entry><literal>PG_EXCEPTION_CONTEXT</literal></entry>
-         <entry>text</entry>
-         <entry>line(s) of text describing the call stack</entry>
+         <entry><type>text</></entry>
+         <entry>line(s) of text describing the call stack at the time of the
+          exception (see <xref linkend="plpgsql-call-stack">)</entry>
         </row>
        </tbody>
       </tgroup>
@@ -2794,26 +2842,19 @@
    </sect3>
   </sect2>
 
-  <sect2 id="plpgsql-get-diagnostics-context">
-   <title>Obtaining Current Execution Information</title>
+  <sect2 id="plpgsql-call-stack">
+   <title>Obtaining Execution Location Information</title>
 
    <para>
-    The <command>GET <optional> CURRENT </optional> DIAGNOSTICS</command>
-    command retrieves information about current execution state (whereas
-    the <command>GET STACKED DIAGNOSTICS</command> command discussed above
-    reports information about the execution state as of a previous error).
-    This command has the form:
-   </para>
-
-<synopsis>
-GET <optional> CURRENT </optional> DIAGNOSTICS <replaceable>variable</replaceable> { = | := } <replaceable>item</replaceable> <optional> , ... </optional>;
-</synopsis>
-
-   <para>
-    Currently only one information item is supported.  Status
-    item <literal>PG_CONTEXT</> will return a text string with line(s) of
-    text describing the call stack.  The first line refers to the
-    current function and currently executing <command>GET DIAGNOSTICS</command>
+    The <command>GET DIAGNOSTICS</command> command, previously described
+    in <xref linkend="plpgsql-statements-diagnostics">, retrieves information
+    about current execution state (whereas the <command>GET STACKED
+    DIAGNOSTICS</command> command discussed above reports information about
+    the execution state as of a previous error).  Its <literal>PG_CONTEXT</>
+    status item is useful for identifying the current execution
+    location.  <literal>PG_CONTEXT</> returns a text string with line(s)
+    of text describing the call stack.  The first line refers to the current
+    function and currently executing <command>GET DIAGNOSTICS</command>
     command.  The second and any subsequent lines refer to calling functions
     further up the call stack.  For example:
 
@@ -2847,6 +2888,12 @@
 </programlisting>
 
    </para>
+
+   <para>
+    <literal>GET STACKED DIAGNOSTICS ... PG_EXCEPTION_CONTEXT</literal>
+    returns the same sort of stack trace, but describing the location
+    at which an error was detected, rather than the current location.
+   </para>
   </sect2>
   </sect1>
 
@@ -4225,7 +4272,7 @@
    </para>
 
    <para>
-    When a <application>PL/pgSQL</application> function is called as a
+    When a <application>PL/pgSQL</application> function is called as an
     event trigger, several special variables are created automatically
     in the top-level block. They are:
 
@@ -4253,7 +4300,7 @@
   </para>
 
    <para>
-    <xref linkend="plpgsql-event-trigger-example"> shows an example of a
+    <xref linkend="plpgsql-event-trigger-example"> shows an example of an
     event trigger procedure in <application>PL/pgSQL</application>.
    </para>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/pltcl.sgml postgresql-9.5-9.5.8/doc/src/sgml/pltcl.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/pltcl.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/pltcl.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -296,20 +296,22 @@
         If the command is a <command>SELECT</> statement, the values of the
         result columns are placed into Tcl variables named after the columns.
         If the <literal>-array</> option is given, the column values are
-        instead stored into the named associative array, with the
-        column names used as array indexes.
+        instead stored into elements of the named associative array, with the
+        column names used as array indexes.  In addition, the current row
+        number within the result (counting from zero) is stored into the array
+        element named <quote><literal>.tupno</></quote>, unless that name is
+        in use as a column name in the result.
        </para>
        <para>
         If the command is a <command>SELECT</> statement and no <replaceable>loop-body</>
         script is given, then only the first row of results are stored into
-        Tcl variables; remaining rows, if any, are ignored.  No storing occurs
-        if the
-        query returns no rows.  (This case can be detected by checking the
-        result of <function>spi_exec</function>.)  For example:
+        Tcl variables or array elements; remaining rows, if any, are ignored.
+        No storing occurs if the query returns no rows.  (This case can be
+        detected by checking the result of <function>spi_exec</function>.)
+        For example:
 <programlisting>
 spi_exec "SELECT count(*) AS cnt FROM pg_proc"
 </programlisting>
-
         will set the Tcl variable <literal>$cnt</> to the number of rows in
         the <structname>pg_proc</> system catalog.
        </para>
@@ -317,15 +319,15 @@
         If the optional <replaceable>loop-body</> argument is given, it is
         a piece of Tcl script that is executed once for each row in the
         query result.  (<replaceable>loop-body</> is ignored if the given
-        command is not a <command>SELECT</>.)  The values of the current row's columns
-        are stored into Tcl variables before each iteration.  For example:
-
+        command is not a <command>SELECT</>.)
+        The values of the current row's columns
+        are stored into Tcl variables or array elements before each iteration.
+        For example:
 <programlisting>
 spi_exec -array C "SELECT * FROM pg_class" {
     elog DEBUG "have table $C(relname)"
 }
 </programlisting>
-
         will print a log message for every row of <literal>pg_class</>.  This
         feature works similarly to other Tcl looping constructs; in
         particular <literal>continue</> and <literal>break</> work in the
@@ -666,21 +668,35 @@
 
     <para>
      The return value from a trigger procedure can be one of the strings
-     <literal>OK</> or <literal>SKIP</>, or a list as returned by the
-     <literal>array get</> Tcl command. If the return value is <literal>OK</>,
-     the operation (<command>INSERT</>/<command>UPDATE</>/<command>DELETE</>) that fired the trigger will proceed
+     <literal>OK</> or <literal>SKIP</>, or a list of column name/value pairs.
+     If the return value is <literal>OK</>,
+     the operation (<command>INSERT</>/<command>UPDATE</>/<command>DELETE</>)
+     that fired the trigger will proceed
      normally. <literal>SKIP</> tells the trigger manager to silently suppress
      the operation for this row. If a list is returned, it tells PL/Tcl to
-     return a modified row to the trigger manager. This is only meaningful
+     return a modified row to the trigger manager; the contents of the
+     modified row are specified by the column names and values in the list.
+     Any columns not mentioned in the list are set to null.
+     Returning a modified row is only meaningful
      for row-level <literal>BEFORE</> <command>INSERT</> or <command>UPDATE</>
-     triggers for which the modified row will be inserted instead of the one
+     triggers, for which the modified row will be inserted instead of the one
      given in <varname>$NEW</>; or for row-level <literal>INSTEAD OF</>
      <command>INSERT</> or <command>UPDATE</> triggers where the returned row
-     is used to support <command>INSERT RETURNING</> and
-     <command>UPDATE RETURNING</> commands. The return value is ignored for
-     other types of triggers.
+     is used as the source data for <command>INSERT RETURNING</> or
+     <command>UPDATE RETURNING</> clauses.
+     In row-level <literal>BEFORE</> <command>DELETE</> or <literal>INSTEAD
+     OF</> <command>DELETE</> triggers, returning a modified row has the same
+     effect as returning <literal>OK</>, that is the operation proceeds.
+     The trigger return value is ignored for all other types of triggers.
     </para>
 
+    <tip>
+     <para>
+      The result list can be made from an array representation of the
+      modified tuple with the <literal>array get</> Tcl command.
+     </para>
+    </tip>
+
     <para>
      Here's a little example trigger procedure that forces an integer value
      in a table to keep track of the number of updates that are performed on the
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/problems.sgml postgresql-9.5-9.5.8/doc/src/sgml/problems.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/problems.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/problems.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -304,7 +304,7 @@
   <para>
    Another method is to fill in the bug report web-form available
    at the project's
-   <ulink url="http://www.postgresql.org/">web site</ulink>.
+   <ulink url="https://www.postgresql.org/">web site</ulink>.
    Entering a bug report this way causes it to be mailed to the
    <email>pgsql-bugs@postgresql.org</email> mailing list.
   </para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/protocol.sgml postgresql-9.5-9.5.8/doc/src/sgml/protocol.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/protocol.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/protocol.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -2844,7 +2844,7 @@
 <para>
                 The cancel request code.  The value is chosen to contain
                 <literal>1234</> in the most significant 16 bits, and <literal>5678</> in the
-                least 16 significant bits.  (To avoid confusion, this code
+                least significant 16 bits.  (To avoid confusion, this code
                 must not be the same as any protocol version number.)
 </para>
 </listitem>
@@ -4650,7 +4650,7 @@
 <para>
                 The <acronym>SSL</acronym> request code.  The value is chosen to contain
                 <literal>1234</> in the most significant 16 bits, and <literal>5679</> in the
-                least 16 significant bits.  (To avoid confusion, this code
+                least significant 16 bits.  (To avoid confusion, this code
                 must not be the same as any protocol version number.)
 </para>
 </listitem>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/queries.sgml postgresql-9.5-9.5.8/doc/src/sgml/queries.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/queries.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/queries.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -393,8 +393,8 @@
         consisting of all column names that appear in both
         input tables.  As with <literal>USING</>, these columns appear
         only once in the output table.  If there are no common
-        column names, <literal>NATURAL</literal> behaves like
-        <literal>CROSS JOIN</literal>.
+        column names, <literal>NATURAL JOIN</literal> behaves like
+        <literal>JOIN ... ON TRUE</literal>, producing a cross-product join.
        </para>
 
        <note>
@@ -1457,7 +1457,8 @@
 <programlisting>
 SELECT tbl1.*, tbl2.a FROM ...
 </programlisting>
-    (See also <xref linkend="queries-where">.)
+    See <xref linkend="rowtypes-usage"> for more about
+    the <replaceable>table_name</><literal>.*</> notation.
    </para>
 
    <para>
@@ -2259,7 +2260,8 @@
 
    <para>
     Data-modifying statements in <literal>WITH</> usually have
-    <literal>RETURNING</> clauses, as seen in the example above.
+    <literal>RETURNING</> clauses (see <xref linkend="dml-returning">),
+    as shown in the example above.
     It is the output of the <literal>RETURNING</> clause, <emphasis>not</> the
     target table of the data-modifying statement, that forms the temporary
     table that can be referred to by the rest of the query.  If a
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_function.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_function.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_function.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_function.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -236,8 +236,9 @@
         setting is removed, so that the function executes with the value
         present in its environment.  Use <literal>RESET
         ALL</literal> to clear all function-local settings.
-        <literal>SET FROM CURRENT</> saves the session's current value of
-        the parameter as the value to be applied when the function is entered.
+        <literal>SET FROM CURRENT</> saves the value of the parameter that
+        is current when <command>ALTER FUNCTION</> is executed as the value
+        to be applied when the function is entered.
        </para>
 
        <para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_index.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_index.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_index.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_index.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -40,16 +40,6 @@
   <variablelist>
 
    <varlistentry>
-    <term><literal>IF EXISTS</literal></term>
-    <listitem>
-     <para>
-      Do not throw an error if the index does not exist. A notice is issued
-      in this case.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
     <term><literal>RENAME</literal></term>
     <listitem>
      <para>
@@ -120,6 +110,16 @@
     <variablelist>
 
      <varlistentry>
+      <term><literal>IF EXISTS</literal></term>
+      <listitem>
+       <para>
+        Do not throw an error if the index does not exist. A notice is issued
+        in this case.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
       <term><replaceable class="PARAMETER">name</replaceable></term>
       <listitem>
        <para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_materialized_view.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_materialized_view.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_materialized_view.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_materialized_view.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -43,7 +43,6 @@
     SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )
     RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] )
     OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-    SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_table.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_table.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_table.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_table.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -702,10 +702,10 @@
   </para>
 
   <para>
-   All the actions except <literal>RENAME</literal>,
-   <literal>SET TABLESPACE</literal> and <literal>SET SCHEMA</literal>
-   can be combined into
-   a list of multiple alterations to apply in parallel.  For example, it
+   All the forms of ALTER TABLE that act on a single table, except
+   <literal>RENAME</literal>, and <literal>SET SCHEMA</literal>
+   can be combined into a list of multiple alterations to applied together.
+   For example, it
    is possible to add several columns and/or alter the type of several
    columns in a single command.  This is particularly useful with large
    tables, since only one pass over the table need be made.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_user_mapping.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_user_mapping.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_user_mapping.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_user_mapping.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -89,9 +89,9 @@
   <title>Examples</title>
 
   <para>
-   Change the password for user mapping <literal>bob</>, server<literal> foo</>:
+   Change the password for user mapping <literal>bob</>, server <literal>foo</>:
 <programlisting>
-ALTER USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'public');
+ALTER USER MAPPING FOR bob SERVER foo OPTIONS (SET password 'public');
 </programlisting></para>
 
  </refsect1>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_user.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_user.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/alter_user.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/alter_user.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -39,10 +39,10 @@
 
 ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 
-ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
-ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
-ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> RESET <replaceable>configuration_parameter</replaceable>
-ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> RESET ALL
+ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
+ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
+ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable>
+ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET ALL
 
 <phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/comment.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/comment.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/comment.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/comment.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -135,9 +135,9 @@
     <term><replaceable class="parameter">domain_name</replaceable></term>
     <listitem>
      <para>
-      When creating a comment on a constraint, a table, a domain or
+      When creating a comment on a constraint, a trigger, a rule or
       a policy these parameters specify the name of the table or domain on
-      which the constraint is defined.
+      which that object is defined.
      </para>
     </listitem>
    </varlistentry>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/copy.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/copy.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/copy.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/copy.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -412,6 +412,15 @@
    </para>
 
    <para>
+    If row-level security is enabled for the table, the relevant 
+    <command>SELECT</command> policies will apply to <literal>COPY
+    <replaceable class="parameter">table</> TO</literal> statements.
+    Currently, <command>COPY FROM</command> is not supported for tables
+    with row-level security. Use equivalent <command>INSERT</command>
+    statements instead.
+   </para>
+
+   <para>
     Files named in a <command>COPY</command> command are read or written
     directly by the server, not by the client application. Therefore,
     they must reside on or be accessible to the database server machine,
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/create_database.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/create_database.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/create_database.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/create_database.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -29,8 +29,8 @@
            [ LC_CTYPE [=] <replaceable class="parameter">lc_ctype</replaceable> ]
            [ TABLESPACE [=] <replaceable class="parameter">tablespace_name</replaceable> ]
            [ ALLOW_CONNECTIONS [=] <replaceable class="parameter">allowconn</replaceable> ]
-           [ CONNECTION LIMIT [=] <replaceable class="parameter">connlimit</replaceable> ] ]
-           [ IS_TEMPLATE [=] <replaceable class="parameter">istemplate</replaceable> ]
+           [ CONNECTION LIMIT [=] <replaceable class="parameter">connlimit</replaceable> ]
+           [ IS_TEMPLATE [=] <replaceable class="parameter">istemplate</replaceable> ] ]
 </synopsis>
  </refsynopsisdiv>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/create_function.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/create_function.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/create_function.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/create_function.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -448,8 +448,9 @@
        The <literal>SET</> clause causes the specified configuration
        parameter to be set to the specified value when the function is
        entered, and then restored to its prior value when the function exits.
-       <literal>SET FROM CURRENT</> saves the session's current value of
-       the parameter as the value to be applied when the function is entered.
+       <literal>SET FROM CURRENT</> saves the value of the parameter that
+       is current when <command>CREATE FUNCTION</> is executed as the value
+       to be applied when the function is entered.
       </para>
 
       <para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/create_index.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/create_index.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/create_index.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/create_index.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -568,16 +568,7 @@
    dependent on the setting of <xref linkend="guc-maintenance-work-mem">.
    Larger values will reduce the time needed for index creation, so long
    as you don't make it larger than the amount of memory really available,
-   which would drive the machine into swapping.  For hash indexes, the
-   value of <xref linkend="guc-effective-cache-size"> is also relevant to
-   index creation time: <productname>PostgreSQL</productname> will use one
-   of two different hash index creation methods depending on whether the
-   estimated index size is more or less than <varname>effective_cache_size</>.
-   For best results, make sure that this parameter is also set to something
-   reflective of available memory, and be careful that the sum of
-   <varname>maintenance_work_mem</> and <varname>effective_cache_size</> is
-   less than the machine's RAM less whatever space is needed by other
-   programs.
+   which would drive the machine into swapping.
   </para>
 
   <para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/create_role.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/create_role.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/create_role.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/create_role.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -249,12 +249,6 @@
         password string).  This allows reloading of encrypted
         passwords during dump/restore.
        </para>
-
-       <para>
-        Note that older clients might lack support for the MD5
-        authentication mechanism that is needed to work with passwords
-        that are stored encrypted.
-       </para>
       </listitem>
      </varlistentry>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/create_sequence.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/create_sequence.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/create_sequence.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/create_sequence.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -240,6 +240,16 @@
   </para>
 
   <para>
+   Because <function>nextval</> and <function>setval</> calls are never
+   rolled back, sequence objects cannot be used if <quote>gapless</>
+   assignment of sequence numbers is needed.  It is possible to build
+   gapless assignment by using exclusive locking of a table containing a
+   counter; but this solution is much more expensive than sequence
+   objects, especially if many transactions need sequence numbers
+   concurrently.
+  </para>
+
+  <para>
    Unexpected results might be obtained if a <replaceable
    class="parameter">cache</replaceable> setting greater than one is
    used for a sequence object that will be used concurrently by
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/create_table.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/create_table.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/create_table.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/create_table.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -329,26 +329,33 @@
       table.
      </para>
      <para>
-      Default expressions for the copied column definitions will only be
-      copied if <literal>INCLUDING DEFAULTS</literal> is specified.
-      Defaults that call database-modification functions, like
-      <function>nextval</>, create a linkage between the original and
-      new tables.  The
+      Default expressions for the copied column definitions will be copied
+      only if <literal>INCLUDING DEFAULTS</literal> is specified.  The
       default behavior is to exclude default expressions, resulting in the
       copied columns in the new table having null defaults.
+      Note that copying defaults that call database-modification functions,
+      such as <function>nextval</>, may create a functional linkage between
+      the original and new tables.
      </para>
      <para>
       Not-null constraints are always copied to the new table.
       <literal>CHECK</literal> constraints will be copied only if
       <literal>INCLUDING CONSTRAINTS</literal> is specified.
-      Indexes, <literal>PRIMARY KEY</>, and <literal>UNIQUE</> constraints
-      on the original table will be created on the new table only if the
-      <literal>INCLUDING INDEXES</literal> clause is specified.
       No distinction is made between column constraints and table
       constraints.
      </para>
-     <para><literal>STORAGE</> settings for the copied column definitions will only
-      be copied if <literal>INCLUDING STORAGE</literal> is specified.  The
+     <para>
+      Indexes, <literal>PRIMARY KEY</>, <literal>UNIQUE</>,
+      and <literal>EXCLUDE</> constraints on the original table will be
+      created on the new table only if <literal>INCLUDING INDEXES</literal>
+      is specified.  Names for the new indexes and constraints are
+      chosen according to the default rules, regardless of how the originals
+      were named.  (This behavior avoids possible duplicate-name failures for
+      the new indexes.)
+     </para>
+     <para>
+      <literal>STORAGE</> settings for the copied column definitions will be
+      copied only 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
       settings.  For more on <literal>STORAGE</> settings, see
@@ -356,24 +363,26 @@
      </para>
      <para>
       Comments for the copied columns, constraints, and indexes
-      will only be copied if <literal>INCLUDING COMMENTS</literal>
+      will be copied only if <literal>INCLUDING COMMENTS</literal>
       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>
-      Note also that unlike <literal>INHERITS</literal>, columns and
+      Note that unlike <literal>INHERITS</literal>, columns and
       constraints copied by <literal>LIKE</> are not merged with similarly
       named columns and constraints.
       If the same name is specified explicitly or in another
       <literal>LIKE</literal> clause, an error is signaled.
      </para>
      <para>
-      The <literal>LIKE</literal> clause can also be used to copy columns from
-      views, foreign tables, or composite types.  Inapplicable options (e.g., <literal>INCLUDING
-      INDEXES</literal> from a view) are ignored.
+      The <literal>LIKE</literal> clause can also be used to copy column
+      definitions from views, foreign tables, or composite types.
+      Inapplicable options (e.g., <literal>INCLUDING INDEXES</literal> from
+      a view) are ignored.
      </para>
     </listitem>
    </varlistentry>
@@ -1486,6 +1495,17 @@
    </para>
   </refsect2>
 
+  <refsect2>
+   <title><literal>LIKE</> Clause</title>
+
+   <para>
+    While a <literal>LIKE</> clause exists in the SQL standard, many of the
+    options that <productname>PostgreSQL</productname> accepts for it are not
+    in the standard, and some of the standard's options are not implemented
+    by <productname>PostgreSQL</productname>.
+   </para>
+  </refsect2>
+
   <refsect2>
    <title><literal>WITH</> Clause</title>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/create_view.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/create_view.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/create_view.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/create_view.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -87,13 +87,13 @@
      <para>
       Creates a recursive view.  The syntax
 <synopsis>
-CREATE RECURSIVE VIEW <replaceable>name</> (<replaceable>columns</>) AS SELECT <replaceable>...</>;
+CREATE RECURSIVE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> (<replaceable>column_names</>) AS SELECT <replaceable>...</>;
 </synopsis>
       is equivalent to
 <synopsis>
-CREATE VIEW <replaceable>name</> AS WITH RECURSIVE <replaceable>name</> (<replaceable>columns</>) AS (SELECT <replaceable>...</>) SELECT <replaceable>columns</> FROM <replaceable>name</>;
+CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECURSIVE <replaceable>view_name</> (<replaceable>column_names</>) AS (SELECT <replaceable>...</>) SELECT <replaceable>column_names</> FROM <replaceable>view_name</>;
 </synopsis>
-      A view column list must be specified for a recursive view.
+      A view column name list must be specified for a recursive view.
      </para>
     </listitem>
    </varlistentry>
@@ -461,11 +461,16 @@
   <para>
    Create a recursive view consisting of the numbers from 1 to 100:
 <programlisting>
-CREATE RECURSIVE VIEW nums_1_100 (n) AS
+CREATE RECURSIVE VIEW public.nums_1_100 (n) AS
     VALUES (1)
 UNION ALL
     SELECT n+1 FROM nums_1_100 WHERE n < 100;
-</programlisting></para>
+</programlisting>
+   Notice that although the recursive view's name is schema-qualified in this
+   <command>CREATE</>, its internal self-reference is not schema-qualified.
+   This is because the implicitly-created CTE's name cannot be
+   schema-qualified.
+  </para>
  </refsect1>
 
  <refsect1>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/ecpg-ref.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/ecpg-ref.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/ecpg-ref.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/ecpg-ref.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -42,11 +42,9 @@
   <para>
    <command>ecpg</command> will convert each input file given on the
    command line to the corresponding C output file.  Input files
-   preferably have the extension <filename>.pgc</filename>, in which
-   case the extension will be replaced by <filename>.c</filename> to
-   determine the output file name.  If the extension of the input file
-   is not <filename>.pgc</filename>, then the output file name is
-   computed by appending <literal>.c</literal> to the full file name.
+   preferably have the extension <filename>.pgc</filename>.
+   The extension will be replaced by <filename>.c</filename> to
+   determine the output file name.
    The output file name can also be overridden using the
    <option>-o</option> option.
   </para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/insert.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/insert.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/insert.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/insert.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -194,8 +194,8 @@
         column leaves the other fields null.)  When referencing a
         column with <literal>ON CONFLICT DO UPDATE</>, do not include
         the table's name in the specification of a target column.  For
-        example, <literal>INSERT ... ON CONFLICT DO UPDATE tab SET
-        table_name.col = 1</> is invalid (this follows the general
+        example, <literal>INSERT INTO table_name ... ON CONFLICT DO UPDATE
+        SET table_name.col = 1</> is invalid (this follows the general
         behavior for <command>UPDATE</>).
        </para>
       </listitem>
@@ -295,8 +295,7 @@
     inference, it consists of one or more <replaceable
     class="PARAMETER">index_column_name</replaceable> columns and/or
     <replaceable class="PARAMETER">index_expression</replaceable>
-    expressions, and an optional <replaceable class="PARAMETER">
-    index_predicate</replaceable>.  All <replaceable
+    expressions, and an optional <replaceable class="PARAMETER">index_predicate</replaceable>.  All <replaceable
     class="PARAMETER">table_name</replaceable> unique indexes that,
     without regard to order, contain exactly the
     <parameter>conflict_target</parameter>-specified
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_basebackup.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_basebackup.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_basebackup.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_basebackup.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -88,7 +88,7 @@
       There is no guarantee that all WAL files required for the backup are archived
       at the end of backup. If you are planning to use the backup for an archive
       recovery and want to ensure that all required files are available at that moment,
-      you need to include them into the backup by using <literal>-x</> option.
+      you need to include them into the backup by using the <literal>-x</> option.
      </para>
     </listitem>
     <listitem>
@@ -343,7 +343,7 @@
       <listitem>
        <para>
         Enables gzip compression of tar file output, and specifies the
-        compression level (1 through 9, 9 being best
+        compression level (0 through 9, 0 being no compression and 9 being best
         compression). Compression is only available when using the tar
         format.
        </para>
@@ -361,7 +361,7 @@
       <term><option>--checkpoint=<replaceable class="parameter">fast|spread</replaceable></option></term>
       <listitem>
        <para>
-        Sets checkpoint mode to fast or spread (default) (see <xref linkend="backup-lowlevel-base-backup">).
+        Sets checkpoint mode to fast (immediate) or spread (default) (see <xref linkend="backup-lowlevel-base-backup">).
        </para>
       </listitem>
      </varlistentry>
@@ -569,6 +569,14 @@
   <title>Notes</title>
 
   <para>
+   At the beginning of the backup, a checkpoint needs to be written on the
+   server the backup is taken from.  Especially if the option
+   <literal>--checkpoint=fast</literal> is not used, this can take some time
+   during which <application>pg_basebackup</application> will be appear
+   to be idle.
+  </para>
+
+  <para>
    The backup will include all files in the data directory and tablespaces,
    including the configuration files and any additional files placed in the
    directory by third parties. But only regular files and directories are
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/pgbench.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/pgbench.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/pgbench.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/pgbench.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -993,10 +993,9 @@
    Field <replaceable>schedule_lag</> is the difference between the
    transaction's scheduled start time, and the time it actually started, in
    microseconds. It is only present when the <option>--rate</> option is used.
-   The last field <replaceable>skipped_transactions</> reports the number of
-   transactions skipped because they were too far behind schedule. It is only
-   present when both options <option>--rate</> and <option>--latency-limit</>
-   are used.
+   When both <option>--rate</> and <option>--latency-limit</> are used,
+   the <replaceable>time</> for a skipped transaction will be reported as
+   <literal>skipped</>.
   </para>
 
   <para>
@@ -1019,7 +1018,7 @@
  0 84 4142 0 1412881037 918023 2333
  0 85 2465 0 1412881037 919759 740
 </screen>
-   In this example, transaction 82 was late, because it's latency (6.173 ms) was
+   In this example, transaction 82 was late, because its latency (6.173 ms) was
    over the 5 ms limit. The next two transactions were skipped, because they
    were already late before they were even started.
   </para>
@@ -1046,7 +1045,7 @@
    within the interval, <replaceable>latency_sum</replaceable> is a sum of latencies
    (so you can compute average latency easily). The following two fields are useful
    for variance estimation - <replaceable>latency_sum</> is a sum of latencies and
-   <replaceable>latency_2_sum</> is a sum of 2nd powers of latencies. The last two
+   <replaceable>latency_2_sum</> is a sum of 2nd powers of latencies. The next two
    fields are <replaceable>min_latency</> - a minimum latency within the interval, and
    <replaceable>max_latency</> - maximum latency within the interval. A transaction is
    counted into the interval when it was committed. The fields in the end,
@@ -1060,7 +1059,7 @@
   </para>
 
   <para>
-   Here is example outputs:
+   Here is example output:
 <screen>
 1345828501 5601 1542744 483552416 61 2573
 1345828503 7884 1979812 565806736 60 1479
@@ -1070,8 +1069,8 @@
 </screen></para>
 
   <para>
-   Notice that while the plain (unaggregated) log file contains index
-   of the custom script files, the aggregated log does not. Therefore if
+   Notice that while the plain (unaggregated) log file contains a reference
+   to the custom script files, the aggregated log does not. Therefore if
    you need per script data, you need to aggregate the data on your own.
   </para>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_dumpall.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_dumpall.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_dumpall.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_dumpall.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -368,9 +368,16 @@
       <term><option>--quote-all-identifiers</></term>
       <listitem>
        <para>
-        Force quoting of all identifiers.  This may be useful when dumping a
-        database for migration to a future version that may have introduced
-        additional keywords.
+        Force quoting of all identifiers.  This option is recommended when
+        dumping a database from a server whose <productname>PostgreSQL</>
+        major version is different from <application>pg_dumpall</>'s, or when
+        the output is intended to be loaded into a server of a different
+        major version.  By default, <application>pg_dumpall</> quotes only
+        identifiers that are reserved words in its own major version.
+        This sometimes results in compatibility issues when dealing with
+        servers of other versions that may have slightly different sets
+        of reserved words.  Using <option>--quote-all-identifiers</> prevents
+        such issues, at the price of a harder-to-read dump script.
        </para>
       </listitem>
      </varlistentry>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_dump.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_dump.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_dump.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_dump.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -138,8 +138,11 @@
        <para>
         Include large objects in the dump.  This is the default behavior
         except when <option>--schema</>, <option>--table</>, or
-        <option>--schema-only</> is specified, so the <option>-b</>
-        switch is only useful to add large objects to selective dumps.
+        <option>--schema-only</> is specified.  The <option>-b</>
+        switch is therefore only useful to add large objects to dumps
+        where a specific schema or table has been requested.  Note that
+        blobs are considered data and therefore will be included when
+        --data-only is used, but not when --schema-only is.
        </para>
       </listitem>
      </varlistentry>
@@ -697,6 +700,11 @@
         to dump the parts of the contents of the table that they have access to.
        </para>
 
+       <para>
+        Note that if you use this option currently, you probably also want
+        the dump be in <command>INSERT</command> format, as the
+        <command>COPY FROM</command> during restore does not support row security.
+       </para>
       </listitem>
      </varlistentry>
 
@@ -817,9 +825,16 @@
       <term><option>--quote-all-identifiers</></term>
       <listitem>
        <para>
-        Force quoting of all identifiers.  This may be useful when dumping a
-        database for migration to a future version that may have introduced
-        additional keywords.
+        Force quoting of all identifiers.  This option is recommended when
+        dumping a database from a server whose <productname>PostgreSQL</>
+        major version is different from <application>pg_dump</>'s, or when
+        the output is intended to be loaded into a server of a different
+        major version.  By default, <application>pg_dump</> quotes only
+        identifiers that are reserved words in its own major version.
+        This sometimes results in compatibility issues when dealing with
+        servers of other versions that may have slightly different sets
+        of reserved words.  Using <option>--quote-all-identifiers</> prevents
+        such issues, at the price of a harder-to-read dump script.
        </para>
       </listitem>
      </varlistentry>
@@ -1150,6 +1165,9 @@
    dump was taken from a server of that version.  Loading a dump file
    into an older server may require manual editing of the dump file
    to remove syntax not understood by the older server.
+   Use of the <option>--quote-all-identifiers</option> option is recommended
+   in cross-version cases, as it can prevent problems arising from varying
+   reserved-word lists in different <productname>PostgreSQL</> versions.
   </para>
  </refsect1>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_receivexlog.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_receivexlog.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_receivexlog.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_receivexlog.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -96,7 +96,7 @@
       <term><option>--if-not-exists</option></term>
       <listitem>
        <para>
-        Do not not error out when <option>--create-slot</option> is specified
+        Do not error out when <option>--create-slot</option> is specified
         and a slot with the specified name already exists.
        </para>
       </listitem>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_recvlogical.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_recvlogical.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_recvlogical.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_recvlogical.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -158,7 +158,7 @@
       <term><option>--if-not-exists</option></term>
       <listitem>
        <para>
-        Do not not error out when <option>--create-slot</option> is specified
+        Do not error out when <option>--create-slot</option> is specified
         and a slot with the specified name already exists.
        </para>
       </listitem>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_resetxlog.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_resetxlog.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_resetxlog.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_resetxlog.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -222,6 +222,11 @@
    <command>pg_resetxlog</command> to run.  But before you do
    so, make doubly certain that there is no server process still alive.
   </para>
+
+  <para>
+   <command>pg_resetxlog</command> works only with servers of the same
+   major version.
+  </para>
  </refsect1>
 
 </refentry>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_restore.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_restore.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_restore.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_restore.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -498,7 +498,7 @@
 
        <para>
         Note that this option currently also requires the dump be in <command>INSERT</command>
-        format, as <command>COPY TO</command> does not support row security.
+        format, as <command>COPY FROM</command> does not support row security.
        </para>
       </listitem>
      </varlistentry>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/pgupgrade.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/pgupgrade.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/pgupgrade.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/pgupgrade.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -123,7 +123,7 @@
       <term><option>-k</option></term>
       <term><option>--link</option></term>
       <listitem><para>use hard links instead of copying files to the new
-      cluster (use junction points on Windows)</para></listitem>
+      cluster</para></listitem>
      </varlistentry>
 
      <varlistentry>
@@ -273,7 +273,8 @@
      into the new cluster, e.g. <filename>pgcrypto.so</filename>,
      whether they are from <filename>contrib</filename>
      or some other source. Do not install the schema definitions, e.g.
-     <filename>pgcrypto.sql</>, because these will be upgraded from the old cluster.
+     <command>CREATE EXTENSION pgcrypto</>, because these will be upgraded
+     from the old cluster.
      Also, any custom full text search files (dictionary, synonym,
      thesaurus, stop words) must also be copied to the new cluster.
     </para>
@@ -316,15 +317,22 @@
    </step>
 
    <step>
-    <title>Verify standby servers</title>
+    <title>Prepare for standby server upgrades</title>
 
     <para>
-     If you are upgrading Streaming Replication and Log-Shipping standby
-     servers, verify that the old standby servers are caught up by running
-     <application>pg_controldata</> against the old primary and standby
-     clusters.  Verify that the <quote>Latest checkpoint location</>
-     values match in all clusters.  (There will be a mismatch if old
-     standby servers were shut down before the old primary.)
+     If you are upgrading standby servers (as outlined in section <xref
+     linkend="pgupgrade-step-replicas">), verify that the old standby
+     servers are caught up by running <application>pg_controldata</>
+     against the old primary and standby clusters.  Verify that the
+     <quote>Latest checkpoint location</> values match in all clusters.
+     (There will be a mismatch if old standby servers were shut down
+     before the old primary.)
+    </para>
+
+    <para>
+     Also, if upgrading standby servers, change <varname>wal_level</>
+     in the <filename>postgresql.conf</> file on the new master cluster
+     to match the value you used in the old cluster.
     </para>
    </step>
 
@@ -409,9 +417,8 @@
     </para>
    </step>
 
-   <step>
-    <title>Upgrade Streaming Replication and Log-Shipping standby
-    servers</title>
+   <step id="pgupgrade-step-replicas">
+    <title>Upgrade Streaming Replication and Log-Shipping standby servers</title>
 
     <para>
      If you have Streaming Replication (see <xref
@@ -434,8 +441,7 @@
      </step>
 
      <step>
-      <title>Make sure the new standby data directories do <emphasis>not</>
-      exist</title>
+      <title>Make sure the new standby data directories do <emphasis>not</> exist</title>
 
       <para>
        Make sure the new standby data directories do <emphasis>not</>
@@ -473,16 +479,6 @@
      </step>
 
      <step>
-      <title>Start and stop the new master cluster</title>
-
-      <para>
-       In the new master cluster, change <varname>wal_level</> to
-       <literal>hot_standby</> in the <filename>postgresql.conf</> file
-       and then start and stop the cluster.
-      </para>
-     </step>
-
-     <step>
       <title>Run <application>rsync</></title>
 
       <para>
@@ -514,8 +510,7 @@
      </step>
 
      <step>
-      <title>Configure streaming replication and log-shipping standby
-      servers</title>
+      <title>Configure streaming replication and log-shipping standby servers</title>
 
       <para>
        Configure the servers for log shipping.  (You do not need to run
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_xlogdump.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_xlogdump.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/pg_xlogdump.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/pg_xlogdump.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -16,7 +16,7 @@
 
  <refnamediv>
   <refname>pg_xlogdump</refname>
-  <refpurpose>Display a human-readable rendering of the write-ahead log of a <productname>PostgreSQL</productname> database cluster</refpurpose>
+  <refpurpose>display a human-readable rendering of the write-ahead log of a <productname>PostgreSQL</productname> database cluster</refpurpose>
  </refnamediv>
 
  <refsynopsisdiv>
@@ -149,7 +149,7 @@
 
      <varlistentry>
       <term><option>-t <replaceable>timeline</replaceable></option></term>
-      <term><option>--timelime=<replaceable>timeline</replaceable></option></term>
+      <term><option>--timeline=<replaceable>timeline</replaceable></option></term>
       <listitem>
        <para>
         Timeline from which to read log records. The default is to use the
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/postgres-ref.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/postgres-ref.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/postgres-ref.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -633,16 +633,6 @@
     </listitem>
    </varlistentry>
 
-   <varlistentry>
-    <term><envar>TZ</envar></term>
-
-    <listitem>
-     <para>
-      Server time zone
-     </para>
-    </listitem>
-   </varlistentry>
-
   </variablelist>
  </refsect1>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/psql-ref.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/psql-ref.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/psql-ref.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/psql-ref.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -799,7 +799,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\c</literal> or <literal>\connect</literal> <literal>[ <replaceable class="parameter">dbname</replaceable> [ <replaceable class="parameter">username</replaceable> ] [ <replaceable class="parameter">host</replaceable> ] [ <replaceable class="parameter">port</replaceable> ] ] | <replaceable class="parameter">conninfo</replaceable> </literal></term>
+        <term><literal>\c</literal> or <literal>\connect [ -reuse-previous=<replaceable class="parameter">on|off</replaceable> ] [ <replaceable class="parameter">dbname</replaceable> [ <replaceable class="parameter">username</replaceable> ] [ <replaceable class="parameter">host</replaceable> ] [ <replaceable class="parameter">port</replaceable> ] | <replaceable class="parameter">conninfo</replaceable> ]</literal></term>
         <listitem>
         <para>
         Establishes a new connection to a <productname>PostgreSQL</>
@@ -809,16 +809,19 @@
         </para>
 
         <para>
-        When using positional parameters, if any of
-        <replaceable class="parameter">dbname</replaceable>,
+        Where the command omits database name, user, host, or port, the new
+        connection can reuse values from the previous connection.  By default,
+        values from the previous connection are reused except when processing
+        a <literal>conninfo</> string.  Passing a first argument
+        of <literal>-reuse-previous=on</>
+        or <literal>-reuse-previous=off</literal> overrides that default.
+        When the command neither specifies nor reuses a particular parameter,
+        the <application>libpq</application> default is used.  Specifying any
+        of <replaceable class="parameter">dbname</replaceable>,
         <replaceable class="parameter">username</replaceable>,
         <replaceable class="parameter">host</replaceable> or
-        <replaceable class="parameter">port</replaceable> are omitted or
-        specified as <literal>-</literal>, the value of that parameter from
-        the previous connection is used; if there is no previous connection,
-        the <application>libpq</application> default for the parameter's value
-        is used.  When using <literal>conninfo</> strings, no values from the
-        previous connection are used for the new connection.
+        <replaceable class="parameter">port</replaceable>
+        as <literal>-</literal> is equivalent to omitting that parameter.
         </para>
 
         <para>
@@ -968,7 +971,8 @@
 
         <listitem>
         <para>
-        For each relation (table, view, index, sequence, or foreign table)
+        For each relation (table, view, materialized 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
@@ -983,8 +987,8 @@
 
         <para>
         For some types of relation, <literal>\d</> shows additional information
-        for each column: column values for sequences, indexed expression for
-        indexes and foreign data wrapper options for foreign tables.
+        for each column: column values for sequences, indexed expressions for
+        indexes, and foreign data wrapper options for foreign tables.
         </para>
 
         <para>
@@ -1006,8 +1010,9 @@
         <para>
         If <command>\d</command> is used without a
         <replaceable class="parameter">pattern</replaceable> argument, it is
-        equivalent to <command>\dtvsE</command> which will show a list of
-        all visible tables, views, sequences and foreign tables.
+        equivalent to <command>\dtvmsE</command> which will show a list of
+        all visible tables, views, materialized views, sequences and
+        foreign tables.
         This is purely a convenience measure.
         </para>
         </note>
@@ -3294,11 +3299,12 @@
     and special escape sequences that describe the appearance of the
     prompt. Prompt 1 is the normal prompt that is issued when
     <application>psql</application> requests a new command. Prompt 2 is
-    issued when more input is expected during command input because the
-    command was not terminated with a semicolon or a quote was not closed.
-    Prompt 3 is issued when you run an <acronym>SQL</acronym>
-    <command>COPY</command> command and you are expected to type in the
-    row values on the terminal.
+    issued when more input is expected during command entry, for example
+    because the command was not terminated with a semicolon or a quote
+    was not closed.
+    Prompt 3 is issued when you are running an <acronym>SQL</acronym>
+    <command>COPY FROM STDIN</command> command and you need to type in
+    a row value on the terminal.
     </para>
 
     <para>
@@ -3378,17 +3384,20 @@
         <term><literal>%R</literal></term>
         <listitem>
         <para>
-        In prompt 1 normally <literal>=</literal>, but <literal>^</literal> if
-        in single-line mode, and <literal>!</literal> if the session is
-        disconnected from the database (which can happen if
-        <command>\connect</command> fails). In prompt 2 the sequence is
-        replaced by <literal>-</literal>, <literal>*</literal>, a single quote,
-        a double quote, or a dollar sign, depending on whether
-        <application>psql</application> expects more input because the
-        command wasn't terminated yet, because you are inside a
-        <literal>/* ... */</literal> comment, or because you are inside
-        a quoted or dollar-escaped string. In prompt 3 the sequence doesn't
-        produce anything.
+        In prompt 1 normally <literal>=</literal>,
+        but <literal>^</literal> if in single-line mode,
+        or <literal>!</literal> if the session is disconnected from the
+        database (which can happen if <command>\connect</command> fails).
+        In prompt 2 <literal>%R</literal> is replaced by a character that
+        depends on why <application>psql</application> expects more input:
+        <literal>-</literal> if the command simply wasn't terminated yet,
+        but <literal>*</literal> if there is an unfinished
+        <literal>/* ... */</literal> comment,
+        a single quote if there is an unfinished quoted string,
+        a double quote if there is an unfinished quoted identifier,
+        a dollar sign if there is an unfinished dollar-quoted string,
+        or <literal>(</literal> if there is an unmatched left parenthesis.
+        In prompt 3 <literal>%R</literal> doesn't produce anything.
         </para>
         </listitem>
       </varlistentry>
@@ -3542,8 +3551,9 @@
       If the query results do not fit on the screen, they are piped
       through this command.  Typical values are
       <literal>more</literal> or <literal>less</literal>.  The default
-      is platform-dependent.  The use of the pager can be disabled by
-      using the <command>\pset</command> command.
+      is platform-dependent.  Use of the pager can be disabled by setting
+      <envar>PAGER</envar> to empty, or by using pager-related options of
+      the <command>\pset</command> command.
      </para>
     </listitem>
    </varlistentry>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/select.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/select.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/select.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/select.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -391,7 +391,7 @@
         not been changed meanwhile.  But different seed values will usually
         produce different samples.
         If <literal>REPEATABLE</literal> is not given then a new random
-        sample is selected for each query.
+        seed is selected for each query.
         Note that some add-on sampling methods do not
         accept <literal>REPEATABLE</literal>, and will always produce new
         samples on each use.
@@ -603,9 +603,12 @@
      <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.
+        tables that have matching names.  If there are no common
+        column names, <literal>NATURAL</literal> is equivalent
+        to <literal>ON TRUE</>.
        </para>
       </listitem>
      </varlistentry>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/update.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/update.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/update.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/update.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -123,7 +123,7 @@
       The column name can be qualified with a subfield name or array
       subscript, if needed.  Do not include the table's name in the
       specification of a target column &mdash; for example,
-      <literal>UPDATE tab SET tab.col = 1</> is invalid.
+      <literal>UPDATE table_name SET table_name.col = 1</> is invalid.
      </para>
     </listitem>
    </varlistentry>
@@ -422,9 +422,9 @@
    According to the standard, the source value for a parenthesized sub-list of
    column names can be any row-valued expression yielding the correct number
    of columns.  <productname>PostgreSQL</productname> only allows the source
-   value to be a parenthesized list of expressions (a row constructor) or a
+   value to be a parenthesized list of expressions or a
    sub-<literal>SELECT</>.  An individual column's updated value can be
-   specified as <literal>DEFAULT</> in the row-constructor case, but not
+   specified as <literal>DEFAULT</> in the list-of-expressions case, but not
    inside a sub-<literal>SELECT</>.
   </para>
  </refsect1>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/ref/vacuum.sgml postgresql-9.5-9.5.8/doc/src/sgml/ref/vacuum.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/ref/vacuum.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/ref/vacuum.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -225,39 +225,11 @@
   <title>Examples</title>
 
   <para>
-   The following is an example from running <command>VACUUM</command> on a
-   table in the regression database:
+   To clean a single table <literal>onek</literal>, analyze it for
+   the optimizer and print a detailed vacuum activity report:
 
 <programlisting>
-regression=# VACUUM (VERBOSE, ANALYZE) onek;
-INFO:  vacuuming "public.onek"
-INFO:  index "onek_unique1" now contains 1000 tuples in 14 pages
-DETAIL:  3000 index tuples were removed.
-0 index pages have been deleted, 0 are currently reusable.
-CPU 0.01s/0.08u sec elapsed 0.18 sec.
-INFO:  index "onek_unique2" now contains 1000 tuples in 16 pages
-DETAIL:  3000 index tuples were removed.
-0 index pages have been deleted, 0 are currently reusable.
-CPU 0.00s/0.07u sec elapsed 0.23 sec.
-INFO:  index "onek_hundred" now contains 1000 tuples in 13 pages
-DETAIL:  3000 index tuples were removed.
-0 index pages have been deleted, 0 are currently reusable.
-CPU 0.01s/0.08u sec elapsed 0.17 sec.
-INFO:  index "onek_stringu1" now contains 1000 tuples in 48 pages
-DETAIL:  3000 index tuples were removed.
-0 index pages have been deleted, 0 are currently reusable.
-CPU 0.01s/0.09u sec elapsed 0.59 sec.
-INFO:  "onek": removed 3000 tuples in 108 pages
-DETAIL:  CPU 0.01s/0.06u sec elapsed 0.07 sec.
-INFO:  "onek": found 3000 removable, 1000 nonremovable tuples in 143 pages
-DETAIL:  0 dead tuples cannot be removed yet.
-There were 0 unused item pointers.
-Skipped 0 pages due to buffer pins.
-0 pages are entirely empty.
-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
+VACUUM (VERBOSE, ANALYZE) onek;
 </programlisting></para>
  </refsect1>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-7.4.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-7.4.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-7.4.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-7.4.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -4,10 +4,10 @@
  <sect1 id="release-7-4-30">
   <title>Release 7.4.30</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-10-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-10-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.29.
@@ -138,10 +138,10 @@
  <sect1 id="release-7-4-29">
   <title>Release 7.4.29</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-05-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-05-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.28.
@@ -282,10 +282,10 @@
  <sect1 id="release-7-4-28">
   <title>Release 7.4.28</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-03-15</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-03-15</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.27.
@@ -401,10 +401,10 @@
  <sect1 id="release-7-4-27">
   <title>Release 7.4.27</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-12-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-12-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.26.
@@ -521,10 +521,10 @@
  <sect1 id="release-7-4-26">
   <title>Release 7.4.26</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-09-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-09-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.25.
@@ -651,10 +651,10 @@
  <sect1 id="release-7-4-25">
   <title>Release 7.4.25</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-03-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-03-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.24.
@@ -731,10 +731,10 @@
  <sect1 id="release-7-4-24">
   <title>Release 7.4.24</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-02-02</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-02-02</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.23.
@@ -817,10 +817,10 @@
  <sect1 id="release-7-4-23">
   <title>Release 7.4.23</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-11-03</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-11-03</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.22.
@@ -901,10 +901,10 @@
  <sect1 id="release-7-4-22">
   <title>Release 7.4.22</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-09-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-09-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.21.
@@ -977,10 +977,10 @@
  <sect1 id="release-7-4-21">
   <title>Release 7.4.21</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-06-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-06-12</para>
+  </formalpara>
 
   <para>
    This release contains one serious bug fix over 7.4.20.
@@ -1031,10 +1031,10 @@
  <sect1 id="release-7-4-20">
   <title>Release 7.4.20</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>never released</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>never released</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.19.
@@ -1176,10 +1176,10 @@
  <sect1 id="release-7-4-19">
   <title>Release 7.4.19</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-01-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-01-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.18,
@@ -1330,10 +1330,10 @@
  <sect1 id="release-7-4-18">
   <title>Release 7.4.18</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-09-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-09-17</para>
+  </formalpara>
 
   <para>
    This release contains fixes from 7.4.17.
@@ -1406,10 +1406,10 @@
  <sect1 id="release-7-4-17">
   <title>Release 7.4.17</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-04-23</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-04-23</para>
+  </formalpara>
 
   <para>
    This release contains fixes from 7.4.16,
@@ -1477,10 +1477,10 @@
  <sect1 id="release-7-4-16">
   <title>Release 7.4.16</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-02-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-02-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.15, including
@@ -1548,10 +1548,10 @@
  <sect1 id="release-7-4-15">
   <title>Release 7.4.15</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-01-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-01-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.14.
@@ -1637,10 +1637,10 @@
  <sect1 id="release-7-4-14">
   <title>Release 7.4.14</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-10-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-10-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.13.
@@ -1684,10 +1684,10 @@
  <sect1 id="release-7-4-13">
   <title>Release 7.4.13</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-05-23</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-05-23</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.12,
@@ -1791,10 +1791,10 @@
  <sect1 id="release-7-4-12">
   <title>Release 7.4.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-02-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-02-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.11.
@@ -1854,10 +1854,10 @@
  <sect1 id="release-7-4-11">
   <title>Release 7.4.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-01-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-01-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.10.
@@ -1921,10 +1921,10 @@
  <sect1 id="release-7-4-10">
   <title>Release 7.4.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-12-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-12-12</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.9.
@@ -1974,10 +1974,10 @@
  <sect1 id="release-7-4-9">
   <title>Release 7.4.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-10-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-10-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.8.
@@ -2043,10 +2043,10 @@
  <sect1 id="release-7-4-8">
   <title>Release 7.4.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-05-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-05-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.7, including several
@@ -2227,10 +2227,10 @@
  <sect1 id="release-7-4-7">
   <title>Release 7.4.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-01-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-01-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.6, including several
@@ -2287,10 +2287,10 @@
  <sect1 id="release-7-4-6">
   <title>Release 7.4.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2004-10-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2004-10-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.5.
@@ -2359,10 +2359,10 @@
  <sect1 id="release-7-4-5">
   <title>Release 7.4.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2004-08-18</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2004-08-18</para>
+  </formalpara>
 
   <para>
    This release contains one serious bug fix over 7.4.4.
@@ -2397,10 +2397,10 @@
  <sect1 id="release-7-4-4">
   <title>Release 7.4.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2004-08-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2004-08-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.3.
@@ -2449,10 +2449,10 @@
  <sect1 id="release-7-4-3">
   <title>Release 7.4.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2004-06-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2004-06-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.2.
@@ -2507,10 +2507,10 @@
  <sect1 id="release-7-4-2">
   <title>Release 7.4.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2004-03-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2004-03-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.1.
@@ -2650,10 +2650,10 @@
  <sect1 id="release-7-4-1">
   <title>Release 7.4.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2003-12-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2003-12-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.4.
@@ -2764,10 +2764,10 @@
 <sect1 id="release-7-4">
  <title>Release 7.4</title>
 
- <note>
-  <title>Release Date</title>
-  <simpara>2003-11-17</simpara>
- </note>
+ <formalpara>
+  <title>Release date:</title>
+  <para>2003-11-17</para>
+ </formalpara>
 
  <sect2>
   <title>Overview</title>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-8.0.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-8.0.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-8.0.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-8.0.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -4,10 +4,10 @@
  <sect1 id="release-8-0-26">
   <title>Release 8.0.26</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-10-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-10-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.25.
@@ -208,10 +208,10 @@
  <sect1 id="release-8-0-25">
   <title>Release 8.0.25</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-05-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-05-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.24.
@@ -368,10 +368,10 @@
  <sect1 id="release-8-0-24">
   <title>Release 8.0.24</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-03-15</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-03-15</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.23.
@@ -545,10 +545,10 @@
  <sect1 id="release-8-0-23">
   <title>Release 8.0.23</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-12-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-12-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.22.
@@ -700,10 +700,10 @@
  <sect1 id="release-8-0-22">
   <title>Release 8.0.22</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-09-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-09-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.21.
@@ -864,10 +864,10 @@
  <sect1 id="release-8-0-21">
   <title>Release 8.0.21</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-03-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-03-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.20.
@@ -944,10 +944,10 @@
  <sect1 id="release-8-0-20">
   <title>Release 8.0.20</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-02-02</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-02-02</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.19.
@@ -1030,10 +1030,10 @@
  <sect1 id="release-8-0-19">
   <title>Release 8.0.19</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-11-03</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-11-03</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.18.
@@ -1141,10 +1141,10 @@
  <sect1 id="release-8-0-18">
   <title>Release 8.0.18</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-09-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-09-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.17.
@@ -1275,10 +1275,10 @@
  <sect1 id="release-8-0-17">
   <title>Release 8.0.17</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-06-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-06-12</para>
+  </formalpara>
 
   <para>
    This release contains one serious bug fix over 8.0.16.
@@ -1329,10 +1329,10 @@
  <sect1 id="release-8-0-16">
   <title>Release 8.0.16</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>never released</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>never released</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.15.
@@ -1566,10 +1566,10 @@
  <sect1 id="release-8-0-15">
   <title>Release 8.0.15</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-01-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-01-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.14,
@@ -1782,10 +1782,10 @@
  <sect1 id="release-8-0-14">
   <title>Release 8.0.14</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-09-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-09-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.13.
@@ -1890,10 +1890,10 @@
  <sect1 id="release-8-0-13">
   <title>Release 8.0.13</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-04-23</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-04-23</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.12,
@@ -1967,10 +1967,10 @@
  <sect1 id="release-8-0-12">
   <title>Release 8.0.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-02-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-02-07</para>
+  </formalpara>
 
   <para>
    This release contains one fix from 8.0.11.
@@ -2009,10 +2009,10 @@
  <sect1 id="release-8-0-11">
   <title>Release 8.0.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-02-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-02-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.10, including
@@ -2080,10 +2080,10 @@
  <sect1 id="release-8-0-10">
   <title>Release 8.0.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-01-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-01-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.9.
@@ -2199,10 +2199,10 @@
  <sect1 id="release-8-0-9">
   <title>Release 8.0.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-10-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-10-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.8.
@@ -2255,10 +2255,10 @@
  <sect1 id="release-8-0-8">
   <title>Release 8.0.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-05-23</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-05-23</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.7,
@@ -2369,10 +2369,10 @@
  <sect1 id="release-8-0-7">
   <title>Release 8.0.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-02-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-02-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.6.
@@ -2468,10 +2468,10 @@
  <sect1 id="release-8-0-6">
   <title>Release 8.0.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-01-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-01-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.5.
@@ -2553,10 +2553,10 @@
  <sect1 id="release-8-0-5">
   <title>Release 8.0.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-12-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-12-12</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.4.
@@ -2635,10 +2635,10 @@
  <sect1 id="release-8-0-4">
   <title>Release 8.0.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-10-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-10-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.3.
@@ -2732,10 +2732,10 @@
  <sect1 id="release-8-0-3">
   <title>Release 8.0.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-05-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-05-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.2, including several
@@ -2852,10 +2852,10 @@
  <sect1 id="release-8-0-2">
   <title>Release 8.0.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-04-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-04-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.1.
@@ -3009,10 +3009,10 @@
  <sect1 id="release-8-0-1">
   <title>Release 8.0.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-01-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-01-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.0.0, including several
@@ -3078,10 +3078,10 @@
  <sect1 id="release-8-0">
   <title>Release 8.0</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2005-01-19</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2005-01-19</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-8.1.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-8.1.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-8.1.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-8.1.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -4,10 +4,10 @@
  <sect1 id="release-8-1-23">
   <title>Release 8.1.23</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-12-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-12-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.22.
@@ -223,10 +223,10 @@
  <sect1 id="release-8-1-22">
   <title>Release 8.1.22</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-10-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-10-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.21.
@@ -441,10 +441,10 @@
  <sect1 id="release-8-1-21">
   <title>Release 8.1.21</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-05-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-05-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.20.
@@ -595,10 +595,10 @@
  <sect1 id="release-8-1-20">
   <title>Release 8.1.20</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-03-15</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-03-15</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.19.
@@ -785,10 +785,10 @@
  <sect1 id="release-8-1-19">
   <title>Release 8.1.19</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-12-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-12-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.18.
@@ -966,10 +966,10 @@
  <sect1 id="release-8-1-18">
   <title>Release 8.1.18</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-09-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-09-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.17.
@@ -1130,10 +1130,10 @@
  <sect1 id="release-8-1-17">
   <title>Release 8.1.17</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-03-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-03-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.16.
@@ -1253,10 +1253,10 @@
  <sect1 id="release-8-1-16">
   <title>Release 8.1.16</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-02-02</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-02-02</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.15.
@@ -1373,10 +1373,10 @@
  <sect1 id="release-8-1-15">
   <title>Release 8.1.15</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-11-03</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-11-03</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.14.
@@ -1525,10 +1525,10 @@
  <sect1 id="release-8-1-14">
   <title>Release 8.1.14</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-09-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-09-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.13.
@@ -1701,10 +1701,10 @@
  <sect1 id="release-8-1-13">
   <title>Release 8.1.13</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-06-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-06-12</para>
+  </formalpara>
 
   <para>
    This release contains one serious and one minor bug fix over 8.1.12.
@@ -1768,10 +1768,10 @@
  <sect1 id="release-8-1-12">
   <title>Release 8.1.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>never released</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>never released</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.11.
@@ -2018,10 +2018,10 @@
  <sect1 id="release-8-1-11">
   <title>Release 8.1.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-01-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-01-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.10,
@@ -2270,10 +2270,10 @@
  <sect1 id="release-8-1-10">
   <title>Release 8.1.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-09-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-09-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.9.
@@ -2391,10 +2391,10 @@
  <sect1 id="release-8-1-9">
   <title>Release 8.1.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-04-23</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-04-23</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.8,
@@ -2482,10 +2482,10 @@
  <sect1 id="release-8-1-8">
   <title>Release 8.1.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-02-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-02-07</para>
+  </formalpara>
 
   <para>
    This release contains one fix from 8.1.7.
@@ -2524,10 +2524,10 @@
  <sect1 id="release-8-1-7">
   <title>Release 8.1.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-02-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-02-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.6, including
@@ -2626,10 +2626,10 @@
  <sect1 id="release-8-1-6">
   <title>Release 8.1.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-01-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-01-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.5.
@@ -2776,10 +2776,10 @@
  <sect1 id="release-8-1-5">
   <title>Release 8.1.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-10-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-10-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.4.
@@ -2853,10 +2853,10 @@
  <sect1 id="release-8-1-4">
   <title>Release 8.1.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-05-23</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-05-23</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.3,
@@ -3007,10 +3007,10 @@
  <sect1 id="release-8-1-3">
   <title>Release 8.1.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-02-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-02-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.2,
@@ -3129,10 +3129,10 @@
  <sect1 id="release-8-1-2">
   <title>Release 8.1.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-01-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-01-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.1.
@@ -3232,10 +3232,10 @@
  <sect1 id="release-8-1-1">
   <title>Release 8.1.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-12-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-12-12</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.1.0.
@@ -3324,10 +3324,10 @@
  <sect1 id="release-8-1">
   <title>Release 8.1</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2005-11-08</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2005-11-08</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-8.2.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-8.2.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-8.2.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-8.2.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -4,10 +4,10 @@
  <sect1 id="release-8-2-23">
   <title>Release 8.2.23</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-12-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-12-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.22.
@@ -232,10 +232,10 @@
  <sect1 id="release-8-2-22">
   <title>Release 8.2.22</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-09-26</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-09-26</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.21.
@@ -539,10 +539,10 @@
  <sect1 id="release-8-2-21">
   <title>Release 8.2.21</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-04-18</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-04-18</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.20.
@@ -671,10 +671,10 @@
  <sect1 id="release-8-2-20">
   <title>Release 8.2.20</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-01-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-01-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.19.
@@ -803,10 +803,10 @@
  <sect1 id="release-8-2-19">
   <title>Release 8.2.19</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-12-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-12-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.18.
@@ -1047,10 +1047,10 @@
  <sect1 id="release-8-2-18">
   <title>Release 8.2.18</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-10-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-10-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.17.
@@ -1333,10 +1333,10 @@
  <sect1 id="release-8-2-17">
   <title>Release 8.2.17</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-05-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-05-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.16.
@@ -1534,10 +1534,10 @@
  <sect1 id="release-8-2-16">
   <title>Release 8.2.16</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-03-15</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-03-15</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.15.
@@ -1805,10 +1805,10 @@
  <sect1 id="release-8-2-15">
   <title>Release 8.2.15</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-12-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-12-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.14.
@@ -2049,10 +2049,10 @@
  <sect1 id="release-8-2-14">
   <title>Release 8.2.14</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-09-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-09-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.13.
@@ -2279,10 +2279,10 @@
  <sect1 id="release-8-2-13">
   <title>Release 8.2.13</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-03-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-03-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.12.
@@ -2445,10 +2445,10 @@
  <sect1 id="release-8-2-12">
   <title>Release 8.2.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-02-02</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-02-02</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.11.
@@ -2624,10 +2624,10 @@
  <sect1 id="release-8-2-11">
   <title>Release 8.2.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-11-03</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-11-03</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.10.
@@ -2808,10 +2808,10 @@
  <sect1 id="release-8-2-10">
   <title>Release 8.2.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-09-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-09-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.9.
@@ -3040,10 +3040,10 @@
  <sect1 id="release-8-2-9">
   <title>Release 8.2.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-06-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-06-12</para>
+  </formalpara>
 
   <para>
    This release contains one serious and one minor bug fix over 8.2.8.
@@ -3107,10 +3107,10 @@
  <sect1 id="release-8-2-8">
   <title>Release 8.2.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>never released</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>never released</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.7.
@@ -3302,10 +3302,10 @@
  <sect1 id="release-8-2-7">
   <title>Release 8.2.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-03-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-03-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.6.
@@ -3571,10 +3571,10 @@
  <sect1 id="release-8-2-6">
   <title>Release 8.2.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-01-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-01-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.5,
@@ -3862,10 +3862,10 @@
  <sect1 id="release-8-2-5">
   <title>Release 8.2.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-09-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-09-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.4.
@@ -4039,10 +4039,10 @@
  <sect1 id="release-8-2-4">
   <title>Release 8.2.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-04-23</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-04-23</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.3,
@@ -4183,10 +4183,10 @@
  <sect1 id="release-8-2-3">
   <title>Release 8.2.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-02-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-02-07</para>
+  </formalpara>
 
   <para>
    This release contains two fixes from 8.2.2.
@@ -4229,10 +4229,10 @@
  <sect1 id="release-8-2-2">
   <title>Release 8.2.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-02-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-02-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.1, including
@@ -4387,10 +4387,10 @@
  <sect1 id="release-8-2-1">
   <title>Release 8.2.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-01-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-01-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.2.
@@ -4522,10 +4522,10 @@
  <sect1 id="release-8-2">
   <title>Release 8.2</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2006-12-05</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2006-12-05</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-8.3.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-8.3.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-8.3.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-8.3.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -4,10 +4,10 @@
  <sect1 id="release-8-3-23">
   <title>Release 8.3.23</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-02-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-02-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.22.
@@ -173,10 +173,10 @@
  <sect1 id="release-8-3-22">
   <title>Release 8.3.22</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-12-06</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-12-06</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.21.
@@ -469,10 +469,10 @@
  <sect1 id="release-8-3-21">
   <title>Release 8.3.21</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-09-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-09-24</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.20.
@@ -579,10 +579,10 @@
  <sect1 id="release-8-3-20">
   <title>Release 8.3.20</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-08-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-08-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.19.
@@ -802,10 +802,10 @@
  <sect1 id="release-8-3-19">
   <title>Release 8.3.19</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-06-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-06-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.18.
@@ -1031,10 +1031,10 @@
  <sect1 id="release-8-3-18">
   <title>Release 8.3.18</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-02-27</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-02-27</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.17.
@@ -1319,10 +1319,10 @@
  <sect1 id="release-8-3-17">
   <title>Release 8.3.17</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-12-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-12-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.16.
@@ -1586,10 +1586,10 @@
  <sect1 id="release-8-3-16">
   <title>Release 8.3.16</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-09-26</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-09-26</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.15.
@@ -1957,10 +1957,10 @@
  <sect1 id="release-8-3-15">
   <title>Release 8.3.15</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-04-18</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-04-18</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.14.
@@ -2120,10 +2120,10 @@
  <sect1 id="release-8-3-14">
   <title>Release 8.3.14</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-01-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-01-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.13.
@@ -2252,10 +2252,10 @@
  <sect1 id="release-8-3-13">
   <title>Release 8.3.13</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-12-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-12-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.12.
@@ -2530,10 +2530,10 @@
  <sect1 id="release-8-3-12">
   <title>Release 8.3.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-10-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-10-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.11.
@@ -2893,10 +2893,10 @@
  <sect1 id="release-8-3-11">
   <title>Release 8.3.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-05-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-05-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.10.
@@ -3122,10 +3122,10 @@
  <sect1 id="release-8-3-10">
   <title>Release 8.3.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-03-15</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-03-15</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.9.
@@ -3449,10 +3449,10 @@
  <sect1 id="release-8-3-9">
   <title>Release 8.3.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-12-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-12-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.8.
@@ -3782,10 +3782,10 @@
  <sect1 id="release-8-3-8">
   <title>Release 8.3.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-09-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-09-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.7.
@@ -4072,10 +4072,10 @@
  <sect1 id="release-8-3-7">
   <title>Release 8.3.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-03-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-03-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.6.
@@ -4295,10 +4295,10 @@
  <sect1 id="release-8-3-6">
   <title>Release 8.3.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-02-02</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-02-02</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.5.
@@ -4589,10 +4589,10 @@
  <sect1 id="release-8-3-5">
   <title>Release 8.3.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-11-03</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-11-03</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.4.
@@ -4844,10 +4844,10 @@
  <sect1 id="release-8-3-4">
   <title>Release 8.3.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-09-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-09-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.3.
@@ -5198,10 +5198,10 @@
  <sect1 id="release-8-3-3">
   <title>Release 8.3.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-06-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-06-12</para>
+  </formalpara>
 
   <para>
    This release contains one serious and one minor bug fix over 8.3.2.
@@ -5265,10 +5265,10 @@
  <sect1 id="release-8-3-2">
   <title>Release 8.3.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>never released</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>never released</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.1.
@@ -5630,10 +5630,10 @@
  <sect1 id="release-8-3-1">
   <title>Release 8.3.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-03-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-03-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.3.0.
@@ -5943,10 +5943,10 @@
  <sect1 id="release-8-3">
   <title>Release 8.3</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2008-02-04</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2008-02-04</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-8.4.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-8.4.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-8.4.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-8.4.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -4,10 +4,10 @@
  <sect1 id="release-8-4-22">
   <title>Release 8.4.22</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-07-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-07-24</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.21.
@@ -323,10 +323,10 @@
  <sect1 id="release-8-4-21">
   <title>Release 8.4.21</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-03-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-03-20</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.20.
@@ -381,7 +381,7 @@
 
      <para>
       This prevents scenarios wherein a pathological regular expression
-      could lock up a server process uninterruptably for a long time.
+      could lock up a server process uninterruptibly for a long time.
      </para>
     </listitem>
 
@@ -442,10 +442,10 @@
  <sect1 id="release-8-4-20">
   <title>Release 8.4.20</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-02-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-02-20</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.19.
@@ -901,10 +901,10 @@
  <sect1 id="release-8-4-19">
   <title>Release 8.4.19</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-12-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-12-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.18.
@@ -1102,10 +1102,10 @@
  <sect1 id="release-8-4-18">
   <title>Release 8.4.18</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-10-10</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-10-10</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.17.
@@ -1302,10 +1302,10 @@
  <sect1 id="release-8-4-17">
   <title>Release 8.4.17</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-04-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-04-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.16.
@@ -1531,10 +1531,10 @@
  <sect1 id="release-8-4-16">
   <title>Release 8.4.16</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-02-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-02-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.15.
@@ -1741,10 +1741,10 @@
  <sect1 id="release-8-4-15">
   <title>Release 8.4.15</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-12-06</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-12-06</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.14.
@@ -2043,10 +2043,10 @@
  <sect1 id="release-8-4-14">
   <title>Release 8.4.14</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-09-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-09-24</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.13.
@@ -2159,10 +2159,10 @@
  <sect1 id="release-8-4-13">
   <title>Release 8.4.13</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-08-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-08-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.12.
@@ -2393,10 +2393,10 @@
  <sect1 id="release-8-4-12">
   <title>Release 8.4.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-06-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-06-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.11.
@@ -2678,10 +2678,10 @@
  <sect1 id="release-8-4-11">
   <title>Release 8.4.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-02-27</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-02-27</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.10.
@@ -3040,10 +3040,10 @@
  <sect1 id="release-8-4-10">
   <title>Release 8.4.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-12-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-12-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.9.
@@ -3355,10 +3355,10 @@
  <sect1 id="release-8-4-9">
   <title>Release 8.4.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-09-26</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-09-26</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.8.
@@ -3880,10 +3880,10 @@
  <sect1 id="release-8-4-8">
   <title>Release 8.4.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-04-18</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-04-18</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.7.
@@ -4125,10 +4125,10 @@
  <sect1 id="release-8-4-7">
   <title>Release 8.4.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-01-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-01-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.6.
@@ -4257,10 +4257,10 @@
  <sect1 id="release-8-4-6">
   <title>Release 8.4.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-12-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-12-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.5.
@@ -4568,10 +4568,10 @@
  <sect1 id="release-8-4-5">
   <title>Release 8.4.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-10-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-10-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.4.
@@ -5090,10 +5090,10 @@
  <sect1 id="release-8-4-4">
   <title>Release 8.4.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-05-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-05-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.3.
@@ -5381,10 +5381,10 @@
  <sect1 id="release-8-4-3">
   <title>Release 8.4.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-03-15</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-03-15</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.2.
@@ -5848,10 +5848,10 @@
  <sect1 id="release-8-4-2">
   <title>Release 8.4.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-12-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-12-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.1.
@@ -6379,10 +6379,10 @@
  <sect1 id="release-8-4-1">
   <title>Release 8.4.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2009-09-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2009-09-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 8.4.
@@ -6678,10 +6678,10 @@
  <sect1 id="release-8-4">
   <title>Release 8.4</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2009-07-01</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2009-07-01</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-9.0.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-9.0.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-9.0.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-9.0.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -4,10 +4,10 @@
  <sect1 id="release-9-0-23">
   <title>Release 9.0.23</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-10-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-10-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.22.
@@ -501,10 +501,10 @@
  <sect1 id="release-9-0-22">
   <title>Release 9.0.22</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-06-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-06-12</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.0.21.
@@ -575,10 +575,10 @@
  <sect1 id="release-9-0-21">
   <title>Release 9.0.21</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-06-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-06-04</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.0.20.
@@ -669,10 +669,10 @@
  <sect1 id="release-9-0-20">
   <title>Release 9.0.20</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-05-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-05-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.19.
@@ -1113,10 +1113,10 @@
  <sect1 id="release-9-0-19">
   <title>Release 9.0.19</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-02-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-02-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.18.
@@ -1839,10 +1839,10 @@
  <sect1 id="release-9-0-18">
   <title>Release 9.0.18</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-07-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-07-24</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.17.
@@ -2185,10 +2185,10 @@
  <sect1 id="release-9-0-17">
   <title>Release 9.0.17</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-03-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-03-20</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.16.
@@ -2250,7 +2250,7 @@
 
      <para>
       This prevents scenarios wherein a pathological regular expression
-      could lock up a server process uninterruptably for a long time.
+      could lock up a server process uninterruptibly for a long time.
      </para>
     </listitem>
 
@@ -2338,10 +2338,10 @@
  <sect1 id="release-9-0-16">
   <title>Release 9.0.16</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-02-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-02-20</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.15.
@@ -2839,10 +2839,10 @@
  <sect1 id="release-9-0-15">
   <title>Release 9.0.15</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-12-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-12-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.14.
@@ -3077,10 +3077,10 @@
  <sect1 id="release-9-0-14">
   <title>Release 9.0.14</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-10-10</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-10-10</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.13.
@@ -3343,10 +3343,10 @@
  <sect1 id="release-9-0-13">
   <title>Release 9.0.13</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-04-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-04-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.12.
@@ -3640,10 +3640,10 @@
  <sect1 id="release-9-0-12">
   <title>Release 9.0.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-02-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-02-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.11.
@@ -3902,10 +3902,10 @@
  <sect1 id="release-9-0-11">
   <title>Release 9.0.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-12-06</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-12-06</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.10.
@@ -4280,10 +4280,10 @@
  <sect1 id="release-9-0-10">
   <title>Release 9.0.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-09-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-09-24</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.9.
@@ -4422,10 +4422,10 @@
  <sect1 id="release-9-0-9">
   <title>Release 9.0.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-08-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-08-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.8.
@@ -4728,10 +4728,10 @@
  <sect1 id="release-9-0-8">
   <title>Release 9.0.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-06-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-06-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.7.
@@ -5048,10 +5048,10 @@
  <sect1 id="release-9-0-7">
   <title>Release 9.0.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-02-27</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-02-27</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.6.
@@ -5564,10 +5564,10 @@
  <sect1 id="release-9-0-6">
   <title>Release 9.0.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-12-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-12-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.5.
@@ -5948,10 +5948,10 @@
  <sect1 id="release-9-0-5">
   <title>Release 9.0.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-09-26</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-09-26</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.4.
@@ -6598,10 +6598,10 @@
  <sect1 id="release-9-0-4">
   <title>Release 9.0.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-04-18</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-04-18</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.3.
@@ -6939,10 +6939,10 @@
  <sect1 id="release-9-0-3">
   <title>Release 9.0.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-01-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-01-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.2.
@@ -7115,10 +7115,10 @@
  <sect1 id="release-9-0-2">
   <title>Release 9.0.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-12-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-12-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.1.
@@ -7562,10 +7562,10 @@
  <sect1 id="release-9-0-1">
   <title>Release 9.0.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2010-10-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2010-10-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.0.0.
@@ -7704,10 +7704,10 @@
  <sect1 id="release-9-0">
   <title>Release 9.0</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2010-09-20</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2010-09-20</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-9.1.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-9.1.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-9.1.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-9.1.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,730 @@
 <!-- doc/src/sgml/release-9.1.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-1-24">
+  <title>Release 9.1.24</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-10-27</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.1.23.
+   For information about new features in the 9.1 major release, see
+   <xref linkend="release-9-1">.
+  </para>
+
+  <para>
+   This is expected to be the last <productname>PostgreSQL</> release
+   in the 9.1.X series.  Users are encouraged to update to a newer
+   release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.1.24</title>
+
+   <para>
+    A dump/restore is not required for those running 9.1.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.1.16,
+    see <xref linkend="release-9-1-16">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix EvalPlanQual rechecks involving CTE scans (Tom Lane)
+     </para>
+
+     <para>
+      The recheck would always see the CTE as returning no rows, typically
+      leading to failure to update rows that were recently updated.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix improper repetition of previous results from hashed aggregation in
+      a subquery (Andrew Gierth)
+     </para>
+
+     <para>
+      The test to see if we can reuse a previously-computed hash table of
+      the aggregate state values neglected the possibility of an outer query
+      reference appearing in an aggregate argument expression.  A change in
+      the value of such a reference should lead to recalculating the hash
+      table, but did not.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      table lock so that it can truncate the table (Simon Riggs)
+     </para>
+
+     <para>
+      The timeout was meant to be 50 milliseconds, but it was actually only
+      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      much more easily than intended.  Set it to the intended value.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove artificial restrictions on the values accepted
+      by <function>numeric_in()</> and <function>numeric_recv()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      We allow numeric values up to the limit of the storage format (more
+      than <literal>1e100000</>), so it seems fairly pointless
+      that <function>numeric_in()</> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      reject more than 1000 digits in an input value.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid very-low-probability data corruption due to testing tuple
+      visibility without holding buffer lock (Thomas Munro, Peter Geoghegan,
+      Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix file descriptor leakage when truncating a temporary relation of
+      more than 1GB (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow starting a standalone backend with <literal>standby_mode</>
+      turned on (Michael Paquier)
+     </para>
+
+     <para>
+      This can't do anything useful, since there will be no WAL receiver
+      process to fetch more WAL data; and it could result in misbehavior
+      in code that wasn't designed with this situation in mind.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't try to share SSL contexts across multiple connections
+      in <application>libpq</> (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This led to assorted corner-case bugs, particularly when trying to use
+      different SSL parameters for different connections.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+     </para>
+
+     <para>
+      The reported problem involved leaking an error report
+      during <function>PQreset()</>, but there might be related cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      options work consistently with our other executables (Haribabu Kommi)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
+      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      (Daniel Gustafsson)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent failure of obsolete dynamic time zone abbreviations (Tom Lane)
+     </para>
+
+     <para>
+      If a dynamic time zone abbreviation does not match any entry in the
+      referenced time zone, treat it as equivalent to the time zone name.
+      This avoids unexpected failures when IANA removes abbreviations from
+      their time zone database, as they did in <application>tzdata</>
+      release 2016f and seem likely to do again in the future.  The
+      consequences were not limited to not recognizing the individual
+      abbreviation; any mismatch caused
+      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016h
+      for DST law changes in Palestine and Turkey, plus historical
+      corrections for Turkey and some regions of Russia.
+      Switch to numeric abbreviations for some time zones in Antarctica,
+      the former Soviet Union, and Sri Lanka.
+     </para>
+
+     <para>
+      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <structname>pg_timezone_names</>
+      view nor used for output.
+     </para>
+
+     <para>
+      In this update, <literal>AMT</> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-1-23">
+  <title>Release 9.1.23</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-08-11</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.1.22.
+   For information about new features in the 9.1 major release, see
+   <xref linkend="release-9-1">.
+  </para>
+
+  <para>
+   The <productname>PostgreSQL</> community will stop releasing updates
+   for the 9.1.X release series in September 2016.
+   Users are encouraged to update to a newer release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.1.23</title>
+
+   <para>
+    A dump/restore is not required for those running 9.1.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.1.16,
+    see <xref linkend="release-9-1-16">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix possible mis-evaluation of
+      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      Linnakangas, Michael Paquier, Tom Lane)
+     </para>
+
+     <para>
+      A <literal>CASE</> expression appearing within the test value
+      subexpression of another <literal>CASE</> could become confused about
+      whether its own test value was null or not.  Also, inlining of a SQL
+      function implementing the equality operator used by
+      a <literal>CASE</> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</> expression in the
+      SQL function's body.  If the test values were of different data
+      types, a crash might result; moreover such situations could be abused
+      to allow disclosure of portions of server memory.  (CVE-2016-5423)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix client programs' handling of special characters in database and
+      role names (Noah Misch, Nathan Bossart, Michael Paquier)
+     </para>
+
+     <para>
+      Numerous places in <application>vacuumdb</> and other client programs
+      could become confused by database and role names containing double
+      quotes or backslashes.  Tighten up quoting rules to make that safe.
+      Also, ensure that when a conninfo string is used as a database name
+      parameter to these programs, it is correctly treated as such throughout.
+     </para>
+
+     <para>
+      Fix handling of paired double quotes
+      in <application>psql</>'s <command>\connect</>
+      and <command>\password</> commands to match the documentation.
+     </para>
+
+     <para>
+      Introduce a new <option>-reuse-previous</> option
+      in <application>psql</>'s <command>\connect</> command to allow
+      explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether
+      the database name looks like a conninfo string, as before.)  This
+      allows secure handling of database names containing special
+      characters in <application>pg_dumpall</> scripts.
+     </para>
+
+     <para>
+      <application>pg_dumpall</> now refuses to deal with database and role
+      names containing carriage returns or newlines, as it seems impractical
+      to quote those characters safely on Windows.  In future we may reject
+      such names on the server side, but that step has not been taken yet.
+     </para>
+
+     <para>
+      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute
+      commands with superuser privileges the next time a superuser
+      executes <application>pg_dumpall</> or other routine maintenance
+      operations.  (CVE-2016-5424)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
+      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+     </para>
+
+     <para>
+      The SQL standard specifies that <literal>IS NULL</> should return
+      TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
+      NULL</> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      The core executor got this right, but certain planner optimizations
+      treated the test as recursive (thus producing TRUE in both cases),
+      and <filename>contrib/postgres_fdw</> could produce remote queries
+      that misbehaved similarly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make the <type>inet</> and <type>cidr</> data types properly reject
+      IPv6 addresses with too many colon-separated fields (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent crash in <function>close_ps()</>
+      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      for NaN input coordinates (Tom Lane)
+     </para>
+
+     <para>
+      Make it return NULL instead of crashing.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix several one-byte buffer over-reads in <function>to_number()</>
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      In several cases the <function>to_number()</> function would read one
+      more character than it should from the input string.  There is a
+      small chance of a crash, if the input happens to be adjacent to the
+      end of memory.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unsafe intermediate state during expensive paths
+      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+     </para>
+
+     <para>
+      Previously, these cases locked the target tuple (by setting its XMAX)
+      but did not WAL-log that action, thus risking data integrity problems
+      if the page were spilled to disk and then a database crash occurred
+      before the tuple update could be completed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid consuming a transaction ID during <command>VACUUM</>
+      (Alexander Korotkov)
+     </para>
+
+     <para>
+      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      assigned to the current transaction.  Normally this is negligible,
+      but if one is up against the XID wraparound limit, consuming more
+      XIDs during anti-wraparound vacuums is a very bad thing.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      (Simon Riggs, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      result in unnecessary cancellations of queries on its standby
+      servers.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      When a manual <command>ANALYZE</> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</> counter
+      (Tom Lane)
+     </para>
+
+     <para>
+      If we're only analyzing some columns, we should not prevent routine
+      auto-analyze from happening for the other columns.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      for a unique or nearly-unique column with many null entries (Tom
+      Lane)
+     </para>
+
+     <para>
+      The nulls could get counted as though they were themselves distinct
+      values, leading to serious planner misestimates in some types of
+      queries.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent autovacuum from starting multiple workers for the same shared
+      catalog (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Normally this isn't much of a problem because the vacuum doesn't take
+      long anyway; but in the case of a severely bloated catalog, it could
+      result in all but one worker uselessly waiting instead of doing
+      useful work on other tables.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/btree_gin</> to handle the smallest
+      possible <type>bigint</> value correctly (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Teach libpq to correctly decode server version from future servers
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      It's planned to switch to two-part instead of three-part server
+      version numbers for releases after 9.6.  Make sure
+      that <function>PQserverVersion()</> returns the correct value for
+      such cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      array elements (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      specifying no compression (Fujii Masao)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_1_STABLE [d56c02f1a] 2016-06-19 13:45:03 -0400
+Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
+-->
+     <para>
+      Revert to the old heuristic timeout for <literal>pg_ctl start -w</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      The new method adopted as of release 9.1.20 does not work
+      when <varname>silent_mode</> is enabled, so go back to the old way.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix makefiles' rule for building AIX shared libraries to be safe for
+      parallel make (Noah Misch)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix TAP tests and MSVC scripts to work when build directory's path
+      name contains spaces (Michael Paquier, Kyotaro Horiguchi)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make regression tests safe for Danish and Welsh locales (Jeff Janes,
+      Tom Lane)
+     </para>
+
+     <para>
+      Change some test data that triggered the unusual sorting rules of
+      these locales.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update our copy of the timezone code to match
+      IANA's <application>tzcode</> release 2016c (Tom Lane)
+     </para>
+
+     <para>
+      This is needed to cope with anticipated future changes in the time
+      zone data files.  It also fixes some corner-case bugs in coping with
+      unusual time zones.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016f
+      for DST law changes in Kemerovo and Novosibirsk, plus historical
+      corrections for Azerbaijan, Belarus, and Morocco.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-1-22">
+  <title>Release 9.1.22</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-05-12</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.1.21.
+   For information about new features in the 9.1 major release, see
+   <xref linkend="release-9-1">.
+  </para>
+
+  <para>
+   The <productname>PostgreSQL</> community will stop releasing updates
+   for the 9.1.X release series in September 2016.
+   Users are encouraged to update to a newer release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.1.22</title>
+
+   <para>
+    A dump/restore is not required for those running 9.1.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.1.16,
+    see <xref linkend="release-9-1-16">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      afterwards (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </para>
+
+     <para>
+      This change prevents problems when there are multiple connections
+      using OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      Failures have been reported specifically when a client application
+      uses SSL connections in <application>libpq</> concurrently with
+      SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
+      It's possible for similar problems to arise within the server as well,
+      if an extension module establishes an outgoing SSL connection.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      planner error with a full join enclosed in the right-hand side of a
+      left join (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
+      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      These could advance off the end of the input string, causing subsequent
+      format codes to read garbage.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of rules and views in which the <replaceable>array</>
+      argument of a <literal><replaceable>value</> <replaceable>operator</>
+      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_regress</> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+     </para>
+
+     <para>
+      This is for consistency with a behavior recently added
+      to <application>pg_ctl</>; it eases automated testing on slow machines.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to correctly restore extension
+      membership for operator families containing only one operator class
+      (Tom Lane)
+     </para>
+
+     <para>
+      In such a case, the operator family was restored into the new database,
+      but it was no longer marked as part of the extension.  This had no
+      immediate ill effects, but would cause later <application>pg_dump</>
+      runs to emit output that would cause (harmless) errors on restore.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Rename internal function <function>strtoi()</>
+      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      function (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix reporting of errors from <function>bind()</>
+      and <function>listen()</> system calls on Windows (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce verbosity of compiler output when building with Microsoft Visual
+      Studio (Christian Ullrich)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      function (Christian Ullrich)
+     </para>
+
+     <para>
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      appropriate.  No live bug is known to exist here, but it seems like a
+      good idea to be careful.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016d
+      for DST law changes in Russia and Venezuela.  There are new zone
+      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      the fact that these regions now have different time zone histories from
+      adjacent regions.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-1-21">
   <title>Release 9.1.21</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2016-03-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-03-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.20.
@@ -92,7 +809,7 @@
 
      <para>
       This dodges a portability problem on FreeBSD-derived platforms
-      (including OS X).
+      (including macOS).
      </para>
     </listitem>
 
@@ -210,10 +927,10 @@
  <sect1 id="release-9-1-20">
   <title>Release 9.1.20</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2016-02-11</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-02-11</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.19.
@@ -723,10 +1440,10 @@
  <sect1 id="release-9-1-19">
   <title>Release 9.1.19</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-10-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-10-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.18.
@@ -1284,10 +2001,10 @@
  <sect1 id="release-9-1-18">
   <title>Release 9.1.18</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-06-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-06-12</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.1.17.
@@ -1352,10 +2069,10 @@
  <sect1 id="release-9-1-17">
   <title>Release 9.1.17</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-06-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-06-04</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.1.16.
@@ -1440,10 +2157,10 @@
  <sect1 id="release-9-1-16">
   <title>Release 9.1.16</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-05-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-05-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.15.
@@ -1966,10 +2683,10 @@
  <sect1 id="release-9-1-15">
   <title>Release 9.1.15</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-02-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-02-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.14.
@@ -2430,7 +3147,7 @@
 
     <listitem>
      <para>
-      Warn if OS X's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
@@ -2776,10 +3493,10 @@
  <sect1 id="release-9-1-14">
   <title>Release 9.1.14</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-07-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-07-24</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.13.
@@ -3067,7 +3784,7 @@
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on OS X (Tom Lane)
+      Fix linking of <application>libpython</> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -3159,10 +3876,10 @@
  <sect1 id="release-9-1-13">
   <title>Release 9.1.13</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-03-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-03-20</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.12.
@@ -3224,7 +3941,7 @@
 
      <para>
       This prevents scenarios wherein a pathological regular expression
-      could lock up a server process uninterruptably for a long time.
+      could lock up a server process uninterruptibly for a long time.
      </para>
     </listitem>
 
@@ -3326,10 +4043,10 @@
  <sect1 id="release-9-1-12">
   <title>Release 9.1.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-02-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-02-20</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.11.
@@ -3876,10 +4593,10 @@
  <sect1 id="release-9-1-11">
   <title>Release 9.1.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-12-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-12-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.10.
@@ -4133,10 +4850,10 @@
  <sect1 id="release-9-1-10">
   <title>Release 9.1.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-10-10</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-10-10</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.9.
@@ -4468,10 +5185,10 @@
  <sect1 id="release-9-1-9">
   <title>Release 9.1.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-04-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-04-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.8.
@@ -4802,10 +5519,10 @@
  <sect1 id="release-9-1-8">
   <title>Release 9.1.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-02-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-02-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.7.
@@ -5124,10 +5841,10 @@
  <sect1 id="release-9-1-7">
   <title>Release 9.1.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-12-06</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-12-06</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.6.
@@ -5587,10 +6304,10 @@
  <sect1 id="release-9-1-6">
   <title>Release 9.1.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-09-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-09-24</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.5.
@@ -5839,10 +6556,10 @@
  <sect1 id="release-9-1-5">
   <title>Release 9.1.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-08-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-08-17</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.4.
@@ -6226,10 +6943,10 @@
  <sect1 id="release-9-1-4">
   <title>Release 9.1.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-06-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-06-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.3.
@@ -6716,10 +7433,10 @@
  <sect1 id="release-9-1-3">
   <title>Release 9.1.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-02-27</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-02-27</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.2.
@@ -7353,10 +8070,10 @@
  <sect1 id="release-9-1-2">
   <title>Release 9.1.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-12-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-12-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.1.1.
@@ -7936,7 +8653,7 @@
 
     <listitem>
      <para>
-      Fix incorrect quoting of log file name in Mac OS X start script
+      Fix incorrect quoting of log file name in macOS start script
       (Sidar Lopez)
      </para>
     </listitem>
@@ -8000,10 +8717,10 @@
  <sect1 id="release-9-1-1">
   <title>Release 9.1.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2011-09-26</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2011-09-26</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.1.0.
@@ -8068,10 +8785,10 @@
  <sect1 id="release-9-1">
   <title>Release 9.1</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2011-09-12</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2011-09-12</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-9.2.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-9.2.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-9.2.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-9.2.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,2074 @@
 <!-- doc/src/sgml/release-9.2.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-2-22">
+  <title>Release 9.2.22</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-08-10</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.2.21.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2">.
+  </para>
+
+  <para>
+   The <productname>PostgreSQL</> community will stop releasing updates
+   for the 9.2.X release series in September 2017.
+   Users are encouraged to update to a newer release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.22</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.2.20,
+    see <xref linkend="release-9-2-20">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Further restrict visibility
+      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      protect passwords stored as user mapping options
+      (Noah Misch)
+     </para>
+
+     <para>
+      The fix for CVE-2017-7486 was incorrect: it allowed a user
+      to see the options in her own user mapping, even if she did not
+      have <literal>USAGE</> permission on the associated foreign server.
+      Such options might include a password that had been provided by the
+      server owner rather than the user herself.
+      Since <structname>information_schema.user_mapping_options</> does not
+      show the options in such cases, <structname>pg_user_mappings</>
+      should not either.
+      (CVE-2017-7547)
+     </para>
+
+     <para>
+      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      you will need to do the following:
+     </para>
+
+     <procedure>
+      <step>
+       <para>
+        Restart the postmaster after adding <literal>allow_system_table_mods
+        = true</> to <filename>postgresql.conf</>.  (In versions
+        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        configuration change, but you'll still need a restart.)
+       </para>
+      </step>
+
+      <step>
+       <para>
+        In <emphasis>each</> database of the cluster,
+        run the following commands as superuser:
+<programlisting>
+SET search_path = pg_catalog;
+CREATE OR REPLACE VIEW pg_user_mappings AS
+    SELECT
+        U.oid       AS umid,
+        S.oid       AS srvid,
+        S.srvname   AS srvname,
+        U.umuser    AS umuser,
+        CASE WHEN U.umuser = 0 THEN
+            'public'
+        ELSE
+            A.rolname
+        END AS usename,
+        CASE WHEN (U.umuser &lt;&gt; 0 AND A.rolname = current_user
+                     AND (pg_has_role(S.srvowner, 'USAGE')
+                          OR has_server_privilege(S.oid, 'USAGE')))
+                    OR (U.umuser = 0 AND pg_has_role(S.srvowner, 'USAGE'))
+                    OR (SELECT rolsuper FROM pg_authid WHERE rolname = current_user)
+                    THEN U.umoptions
+                 ELSE NULL END AS umoptions
+    FROM pg_user_mapping U
+         LEFT JOIN pg_authid A ON (A.oid = U.umuser) JOIN
+        pg_foreign_server S ON (U.umserver = S.oid);
+</programlisting>
+       </para>
+      </step>
+
+      <step>
+       <para>
+        Do not forget to include the <literal>template0</>
+        and <literal>template1</> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</>,
+        you'll need to temporarily make it accept connections.
+        In <productname>PostgreSQL</> 9.5 and later, you can use
+<programlisting>
+ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
+</programlisting>
+        and then after fixing <literal>template0</>, undo that with
+<programlisting>
+ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
+</programlisting>
+        In prior versions, instead use
+<programlisting>
+UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
+UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
+</programlisting>
+       </para>
+      </step>
+
+      <step>
+       <para>
+        Finally, remove the <literal>allow_system_table_mods</> configuration
+        setting, and again restart the postmaster.
+       </para>
+      </step>
+     </procedure>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow empty passwords in all password-based authentication methods
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <application>libpq</> ignores empty password specifications, and does
+      not transmit them to the server.  So, if a user's password has been
+      set to the empty string, it's impossible to log in with that password
+      via <application>psql</> or other <application>libpq</>-based
+      clients.  An administrator might therefore believe that setting the
+      password to empty is equivalent to disabling password login.
+      However, with a modified or non-<application>libpq</>-based client,
+      logging in could be possible, depending on which authentication
+      method is configured.  In particular the most common
+      method, <literal>md5</>, accepted empty passwords.
+      Change the server to reject empty passwords in all cases.
+      (CVE-2017-7546)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, retry process creation if we fail to reserve the address
+      range for our shared memory in the new process (Tom Lane, Amit
+      Kapila)
+     </para>
+
+     <para>
+      This is expected to fix infrequent child-process-launch failures that
+      are probably due to interference from antivirus products.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability corruption of shared predicate-lock hash table
+      in Windows builds (Thomas Munro, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid logging clean closure of an SSL connection as though
+      it were a connection reset (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent sending SSL session tickets to clients (Tom Lane)
+     </para>
+
+     <para>
+      This fix prevents reconnection failures with ticket-aware client-side
+      SSL code.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"> on
+      Solaris (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix statistics collector to honor inquiry messages issued just after
+      a postmaster shutdown and immediate restart (Tom Lane)
+     </para>
+
+     <para>
+      Statistics inquiries issued within half a second of the previous
+      postmaster shutdown were effectively ignored.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that the statistics collector's receive buffer size is at
+      least 100KB (Tom Lane)
+     </para>
+
+     <para>
+      This reduces the risk of dropped statistics data on older platforms
+      whose default receive buffer size is less than that.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible creation of an invalid WAL segment when a standby is
+      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      record (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      walsender processes (Petr Jelinek, Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unnecessarily slow restarts of <application>walreceiver</>
+      processes due to race condition in postmaster (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      to more than one element of a column that is of domain-over-array
+      type (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Move autogenerated array types out of the way during
+      <command>ALTER ... RENAME</> (Vik Fearing)
+     </para>
+
+     <para>
+      Previously, we would rename a conflicting autogenerated array type
+      out of the way during <command>CREATE</>; this fix extends that
+      behavior to renaming operations.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly update dependency info when changing a datatype I/O
+      function's argument or return type from <type>opaque</> to the
+      correct type (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <command>CREATE TYPE</> updates I/O functions declared in this
+      long-obsolete style, but it forgot to record a dependency on the
+      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      function definitions behind.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce memory usage when <command>ANALYZE</> processes
+      a <type>tsvector</> column (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unnecessary precision loss and sloppy rounding when multiplying
+      or dividing <type>money</> values by integers or floats (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Tighten checks for whitespace in functions that parse identifiers,
+      such as <function>regprocedurein()</> (Tom Lane)
+     </para>
+
+     <para>
+      Depending on the prevailing locale, these functions could
+      misinterpret fragments of multibyte characters as whitespace.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use relevant <literal>#define</> symbols from Perl while
+      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+     </para>
+
+     <para>
+      This avoids portability problems, typically manifesting as
+      a <quote>handshake</> mismatch during library load, when working with
+      recent Perl versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      is ended with a keyboard EOF signal and then another <command>COPY
+      FROM STDIN</> is attempted (Thomas Munro)
+     </para>
+
+     <para>
+      This misbehavior was observed on BSD-derived platforms (including
+      macOS), but not on most others.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      operator class (Daniel Gustafsson)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+     </para>
+
+     <para>
+      A compressed plain-text dump written to stdout would contain corrupt
+      data due to failure to put the file descriptor into binary mode.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_get_ruledef()</> to print correct output for
+      the <literal>ON SELECT</> rule of a view whose columns have been
+      renamed (Tom Lane)
+     </para>
+
+     <para>
+      In some corner cases, <application>pg_dump</> relies
+      on <function>pg_get_ruledef()</> to dump views, so that this error
+      could result in dump/reload failures.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of function expressions in the <literal>FROM</> clause in
+      cases where the expression does not deparse into something that looks
+      like a function call (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</> output to stdout on Windows
+      (Haribabu Kommi)
+     </para>
+
+     <para>
+      A backup written to stdout would contain corrupt data due to failure
+      to put the file descriptor into binary mode.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This condition could prevent upgraded standby servers from
+      reconnecting.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      shared libraries with gcc (Tom Lane)
+     </para>
+
+     <para>
+      This supports larger extension libraries on platforms where it makes
+      a difference.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unescaped-braces issue in our build scripts for Microsoft MSVC,
+      to avoid a warning or error from recent Perl versions (Andrew
+      Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, handle the case where the <application>openssl</>
+      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, add proper include path for <application>libxml2</>
+      header files (Andrew Dunstan)
+     </para>
+
+     <para>
+      This fixes a former need to move things around in standard Windows
+      installations of <application>libxml2</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, recognize a Tcl library that is
+      named <filename>tcl86.lib</> (Noah Misch)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-2-21">
+  <title>Release 9.2.21</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-05-11</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.2.20.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2">.
+  </para>
+
+  <para>
+   The <productname>PostgreSQL</> community will stop releasing updates
+   for the 9.2.X release series in September 2017.
+   Users are encouraged to update to a newer release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.21</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.2.20,
+    see <xref linkend="release-9-2-20">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Restrict visibility
+      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      protect passwords stored as user mapping options
+      (Michael Paquier, Feike Steenbergen)
+     </para>
+
+     <para>
+      The previous coding allowed the owner of a foreign server object,
+      or anyone he has granted server <literal>USAGE</> permission to,
+      to see the options for all user mappings associated with that server.
+      This might well include passwords for other users.
+      Adjust the view definition to match the behavior of
+      <structname>information_schema.user_mapping_options</>, namely that
+      these options are visible to the user being mapped, or if the mapping
+      is for <literal>PUBLIC</literal> and the current user is the server
+      owner, or if the current user is a superuser.
+      (CVE-2017-7486)
+     </para>
+
+     <para>
+      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      follow the corrected procedure shown in the changelog entry for
+      CVE-2017-7547, in <xref linkend="release-9-2-22">.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent exposure of statistical information via leaky operators
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      Some selectivity estimation functions in the planner will apply
+      user-defined operators to values obtained
+      from <structname>pg_statistic</>, such as most common values and
+      histogram entries.  This occurs before table permissions are checked,
+      so a nefarious user could exploit the behavior to obtain these values
+      for table columns he does not have permission to read.  To fix,
+      fall back to a default estimate if the operator's implementation
+      function is not certified leak-proof and the calling user does not have
+      permission to read the table column whose statistics are needed.
+      At least one of these criteria is satisfied in most cases in practice.
+      (CVE-2017-7484)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      (Robert Haas, Michael Paquier)
+     </para>
+
+     <para>
+      This could result in an unlogged index being set to an invalid state
+      after a crash and restart.  Such a problem would persist until the
+      index was dropped and rebuilt.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      when a standby server replays a prepared but uncommitted two-phase
+      transaction (Tom Lane)
+     </para>
+
+     <para>
+      In most cases this turned out to have no visible ill effects, but in
+      corner cases it could result in circular references
+      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in queries that examine rows modified by the two-phase transaction.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure parsing of queries in extension scripts sees the results of
+      immediately-preceding DDL (Julien Rouhaud, Tom Lane)
+     </para>
+
+     <para>
+      Due to lack of a cache flush step between commands in an extension
+      script file, non-utility queries might not see the effects of an
+      immediately preceding catalog change, such as <command>ALTER TABLE
+      ... RENAME</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
+      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+     </para>
+
+     <para>
+      The command failed if the calling user did not currently have
+      <literal>CREATE</> privilege for the tablespace containing the index.
+      That behavior seems unhelpful, so skip the check, allowing the
+      index to be rebuilt where it is.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</>
+      (Amit Langote)
+     </para>
+
+     <para>
+      This fix prevents unwanted <quote>constraint does not exist</> failures
+      when no matching constraint is present in the child tables.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>VACUUM</> to account properly for pages that could not
+      be scanned due to conflicting page pins (Andrew Gierth)
+     </para>
+
+     <para>
+      This tended to lead to underestimation of the number of tuples in
+      the table.  In the worst case of a small heavily-contended
+      table, <command>VACUUM</> could incorrectly report that the table
+      contained no tuples, leading to very bad planning choices.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that bulk-tuple-transfer loops within a hash join are
+      interruptible by query cancel requests (Tom Lane, Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>cursor_to_xml()</> to produce valid output
+      with <replaceable>tableforest</> = false
+      (Thomas Munro, Peter Eisentraut)
+     </para>
+
+     <para>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      element.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve performance of <structname>pg_timezone_names</> view
+      (Tom Lane, David Rowley)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sloppy handling of corner-case errors from <function>lseek()</>
+      and <function>close()</> (Tom Lane)
+     </para>
+
+     <para>
+      Neither of these system calls are likely to fail in typical situations,
+      but if they did, <filename>fd.c</> could get quite confused.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect check for whether postmaster is running as a Windows
+      service (Michael Paquier)
+     </para>
+
+     <para>
+      This could result in attempting to write to the event log when that
+      isn't accessible, so that no logging happens at all.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
+      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix a double-free error when processing dollar-quoted string literals
+      in <application>ecpg</> (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      comments and security labels of some types of database objects
+      (Giuseppe Broccolo, Tom Lane)
+     </para>
+
+     <para>
+      In simple cases this caused no ill effects; but for example, a
+      schema-selective restore might omit comments it should include, because
+      they were not marked as belonging to the schema of their associated
+      object.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      when SQL object names contain newlines (Tom Lane)
+     </para>
+
+     <para>
+      Replace newlines by spaces, which is sufficient to make the output
+      valid for <literal>pg_restore -L</>'s purposes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to transfer comments and security labels
+      attached to <quote>large objects</> (blobs) (Stephen Frost)
+     </para>
+
+     <para>
+      Previously, blobs were correctly transferred to the new database, but
+      any comments or security labels attached to them were lost.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve error handling
+      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      function (Noah Misch)
+     </para>
+
+     <para>
+      Notably, it failed to detect errors reported
+      by <function>fclose()</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      connection when establishing a new unnamed connection (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support OpenSSL 1.1.0 (Heikki Linnakangas, Andreas Karlsson, Tom Lane)
+     </para>
+
+     <para>
+      This is a back-patch of work previously done in newer branches;
+      it's needed since many platforms are adopting newer OpenSSL versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support Tcl 8.6 in MSVC builds (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017b
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes a bug affecting some DST transitions in January 2038.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2017b
+      for DST law changes in Chile, Haiti, and Mongolia, plus historical
+      corrections for Ecuador, Kazakhstan, Liberia, and Spain.
+      Switch to numeric abbreviations for numerous time zones in South
+      America, the Pacific and Indian oceans, and some Asian and Middle
+      Eastern countries.
+     </para>
+
+     <para>
+      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <structname>pg_timezone_names</>
+      view nor used for output.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use correct daylight-savings rules for POSIX-style time zone names
+      in MSVC builds (David Rowley)
+     </para>
+
+     <para>
+      The Microsoft MSVC build scripts neglected to install
+      the <filename>posixrules</> file in the timezone directory tree.
+      This resulted in the timezone code falling back to its built-in
+      rule about what DST behavior to assume for a POSIX-style time zone
+      name.  For historical reasons that still corresponds to the DST rules
+      the USA was using before 2007 (i.e., change on first Sunday in April
+      and last Sunday in October).  With this fix, a POSIX-style zone name
+      will use the current and historical DST transition dates of
+      the <literal>US/Eastern</> zone.  If you don't want that, remove
+      the <filename>posixrules</> file, or replace it with a copy of some
+      other zone file (see <xref linkend="datatype-timezones">).  Note that
+      due to caching, you may need to restart the server to get such changes
+      to take effect.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-2-20">
+  <title>Release 9.2.20</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-02-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.2.19.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.20</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted indexes.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.2.11,
+    see <xref linkend="release-9-2-11">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix a race condition that could cause indexes built
+      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      (Pavan Deolasee, Tom Lane)
+     </para>
+
+     <para>
+      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      that depends on a column not previously indexed, then rows
+      updated by transactions that ran concurrently with
+      the <command>CREATE INDEX</> command could have received incorrect
+      index entries.  If you suspect this may have happened, the most
+      reliable solution is to rebuild affected indexes after installing
+      this update.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      unlogged table (Michael Paquier)
+     </para>
+
+     <para>
+      Previously, this was skipped when <xref linkend="guc-wal-level">
+      = <literal>minimal</>, but actually it's necessary even in that case
+      to ensure that the unlogged table is properly reset to empty after a
+      crash.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
+-->
+     <para>
+      Fix WAL page header validation when re-reading segments (Takayuki
+      Tsunakawa, Amit Kapila)
+     </para>
+
+     <para>
+      In corner cases, a spurious <quote>out-of-sequence TLI</> error
+      could be reported during recovery.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      If the stats collector dies during hot standby, restart it (Takayuki
+      Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for interrupts while hot standby is waiting for a conflicting
+      query (Simon Riggs)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid constantly respawning the autovacuum launcher in a corner case
+      (Amit Khandekar)
+     </para>
+
+     <para>
+      This fix avoids problems when autovacuum is nominally off and there
+      are some tables that require freezing, but all such tables are
+      already being processed by autovacuum workers.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix check for when an extension member object can be dropped (Tom Lane)
+     </para>
+
+     <para>
+      Extension upgrade scripts should be able to drop member objects,
+      but this was disallowed for serial-column sequences, and possibly
+      other cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make sure <command>ALTER TABLE</> preserves index tablespace
+      assignments when rebuilding indexes (Tom Lane, Michael Paquier)
+     </para>
+
+     <para>
+      Previously, non-default settings
+      of <xref linkend="guc-default-tablespace"> could result in broken
+      indexes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent dropping a foreign-key constraint if there are pending
+      trigger events for the referenced relation (Tom Lane)
+     </para>
+
+     <para>
+      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
+      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix processing of OID column when a table with OIDs is associated to
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      Langote)
+     </para>
+
+     <para>
+      The OID column should be treated the same as regular user columns in
+      this case, but it wasn't, leading to odd behavior in later
+      inheritance changes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for serializability conflicts before reporting
+      constraint-violation failures (Thomas Munro)
+     </para>
+
+     <para>
+      When using serializable transaction isolation, it is desirable
+      that any error due to concurrent transactions should manifest
+      as a serialization failure, thereby cueing the application that
+      a retry might succeed.  Unfortunately, this does not reliably
+      happen for duplicate-key failures caused by concurrent insertions.
+      This change ensures that such an error will be reported as a
+      serialization error if the application explicitly checked for
+      the presence of a conflicting key (and did not find it) earlier
+      in the transaction.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that column typmods are determined accurately for
+      multi-row <literal>VALUES</> constructs (Tom Lane)
+     </para>
+
+     <para>
+      This fixes problems occurring when the first value in a column has a
+      determinable typmod (e.g., length for a <type>varchar</> value) but
+      later values don't share the same limit.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Throw error for an unfinished Unicode surrogate pair at the end of a
+      Unicode string (Tom Lane)
+     </para>
+
+     <para>
+      Normally, a Unicode surrogate leading character must be followed by a
+      Unicode surrogate trailing character, but the check for this was
+      missed if the leading character was the last character in a Unicode
+      string literal (<literal>U&amp;'...'</>) or Unicode identifier
+      (<literal>U&amp;"..."</>).
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that a purely negative text search query, such
+      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+     </para>
+
+     <para>
+      Such matches were found by GIN index searches, but not by sequential
+      scans or GiST index searches.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      subtree with an empty query (Artur Zakirov)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      The overrun occurred only if the input consisted entirely of single
+      quotes and/or backslashes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent multiple calls of <function>pg_start_backup()</>
+      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Paquier)
+     </para>
+
+     <para>
+      This avoids an assertion failure, and possibly worse things, if
+      someone tries to run these functions in parallel.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      that aren't really no-ops (Tom Lane)
+     </para>
+
+     <para>
+      In some cases, a cast that should result in zeroing out
+      low-order <type>interval</> fields was mistakenly deemed to be a
+      no-op and discarded.  An example is that casting from <type>INTERVAL
+      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      that use built-in functions (Stephen Frost)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible <application>pg_basebackup</> failure on standby
+      server when including WAL files (Amit Kapila, Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that the Python exception objects we create for PL/Python are
+      properly reference-counted (Rafa de la Torre, Tom Lane)
+     </para>
+
+     <para>
+      This avoids failures if the objects are used after a Python garbage
+      collection cycle has occurred.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      as a column name (Tom Lane)
+     </para>
+
+     <para>
+      This matches the (previously undocumented) behavior of
+      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
+      namely that a magic <literal>.tupno</> column is inserted only if
+      there isn't a real column named that.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      even on Unix (Vik Fearing)
+     </para>
+
+     <para>
+      This change simplifies use of the same password file across Unix and
+      Windows machines.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      name that ends with a dot (Takayuki Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>psql</>, treat an empty or all-blank setting of
+      the <envar>PAGER</> environment variable as meaning <quote>no
+      pager</> (Tom Lane)
+     </para>
+
+     <para>
+      Previously, such a setting caused output intended for the pager to
+      vanish entirely.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve <filename>contrib/dblink</>'s reporting of
+      low-level <application>libpq</> errors, such as out-of-memory
+      (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, ensure that environment variable changes are propagated
+      to DLLs built with debug options (Christian Ullrich)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2016j
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues, most notably that timezone data
+      installation failed if the target directory didn't support hard
+      links.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016j
+      for DST law changes in northern Cyprus (adding a new zone
+      Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
+      and Antarctica/Casey.
+      Historical corrections for Italy, Kazakhstan, Malta, and Palestine.
+      Switch to preferring numeric zone abbreviations for Tonga.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-2-19">
+  <title>Release 9.2.19</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-10-27</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.2.18.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.19</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.2.11,
+    see <xref linkend="release-9-2-11">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix EvalPlanQual rechecks involving CTE scans (Tom Lane)
+     </para>
+
+     <para>
+      The recheck would always see the CTE as returning no rows, typically
+      leading to failure to update rows that were recently updated.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix improper repetition of previous results from hashed aggregation in
+      a subquery (Andrew Gierth)
+     </para>
+
+     <para>
+      The test to see if we can reuse a previously-computed hash table of
+      the aggregate state values neglected the possibility of an outer query
+      reference appearing in an aggregate argument expression.  A change in
+      the value of such a reference should lead to recalculating the hash
+      table, but did not.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>EXPLAIN</> to emit valid XML when
+      <xref linkend="guc-track-io-timing"> is on (Markus Winand)
+     </para>
+
+     <para>
+      Previously the XML output-format option produced syntactically invalid
+      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Suppress printing of zeroes for unmeasured times
+      in <command>EXPLAIN</> (Maksim Milyutin)
+     </para>
+
+     <para>
+      Certain option combinations resulted in printing zero values for times
+      that actually aren't ever measured in that combination.  Our general
+      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      do that consistently in all cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      table lock so that it can truncate the table (Simon Riggs)
+     </para>
+
+     <para>
+      The timeout was meant to be 50 milliseconds, but it was actually only
+      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      much more easily than intended.  Set it to the intended value.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      creating or altering a table (Tom Lane, Amit Langote)
+     </para>
+
+     <para>
+      Allow identical <literal>CHECK</> constraints to be added to a parent
+      and child table in either order.  Prevent merging of a valid
+      constraint from the parent table with a <literal>NOT VALID</>
+      constraint on the child.  Likewise, prevent merging of a <literal>NO
+      INHERIT</> child constraint with an inherited constraint.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove artificial restrictions on the values accepted
+      by <function>numeric_in()</> and <function>numeric_recv()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      We allow numeric values up to the limit of the storage format (more
+      than <literal>1e100000</>), so it seems fairly pointless
+      that <function>numeric_in()</> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      reject more than 1000 digits in an input value.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid very-low-probability data corruption due to testing tuple
+      visibility without holding buffer lock (Thomas Munro, Peter Geoghegan,
+      Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix file descriptor leakage when truncating a temporary relation of
+      more than 1GB (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow starting a standalone backend with <literal>standby_mode</>
+      turned on (Michael Paquier)
+     </para>
+
+     <para>
+      This can't do anything useful, since there will be no WAL receiver
+      process to fetch more WAL data; and it could result in misbehavior
+      in code that wasn't designed with this situation in mind.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't try to share SSL contexts across multiple connections
+      in <application>libpq</> (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This led to assorted corner-case bugs, particularly when trying to use
+      different SSL parameters for different connections.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+     </para>
+
+     <para>
+      The reported problem involved leaking an error report
+      during <function>PQreset()</>, but there might be related cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      options work consistently with our other executables (Haribabu Kommi)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, never dump range constructor functions
+      (Tom Lane)
+     </para>
+
+     <para>
+      This oversight led to <application>pg_upgrade</> failures with
+      extensions containing range types, due to duplicate creation of the
+      constructor functions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
+      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      (Daniel Gustafsson)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update Windows time zone mapping to recognize some time zone names
+      added in recent Windows versions (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent failure of obsolete dynamic time zone abbreviations (Tom Lane)
+     </para>
+
+     <para>
+      If a dynamic time zone abbreviation does not match any entry in the
+      referenced time zone, treat it as equivalent to the time zone name.
+      This avoids unexpected failures when IANA removes abbreviations from
+      their time zone database, as they did in <application>tzdata</>
+      release 2016f and seem likely to do again in the future.  The
+      consequences were not limited to not recognizing the individual
+      abbreviation; any mismatch caused
+      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016h
+      for DST law changes in Palestine and Turkey, plus historical
+      corrections for Turkey and some regions of Russia.
+      Switch to numeric abbreviations for some time zones in Antarctica,
+      the former Soviet Union, and Sri Lanka.
+     </para>
+
+     <para>
+      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <structname>pg_timezone_names</>
+      view nor used for output.
+     </para>
+
+     <para>
+      In this update, <literal>AMT</> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-2-18">
+  <title>Release 9.2.18</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-08-11</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.2.17.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.18</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.2.11,
+    see <xref linkend="release-9-2-11">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix possible mis-evaluation of
+      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      Linnakangas, Michael Paquier, Tom Lane)
+     </para>
+
+     <para>
+      A <literal>CASE</> expression appearing within the test value
+      subexpression of another <literal>CASE</> could become confused about
+      whether its own test value was null or not.  Also, inlining of a SQL
+      function implementing the equality operator used by
+      a <literal>CASE</> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</> expression in the
+      SQL function's body.  If the test values were of different data
+      types, a crash might result; moreover such situations could be abused
+      to allow disclosure of portions of server memory.  (CVE-2016-5423)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix client programs' handling of special characters in database and
+      role names (Noah Misch, Nathan Bossart, Michael Paquier)
+     </para>
+
+     <para>
+      Numerous places in <application>vacuumdb</> and other client programs
+      could become confused by database and role names containing double
+      quotes or backslashes.  Tighten up quoting rules to make that safe.
+      Also, ensure that when a conninfo string is used as a database name
+      parameter to these programs, it is correctly treated as such throughout.
+     </para>
+
+     <para>
+      Fix handling of paired double quotes
+      in <application>psql</>'s <command>\connect</>
+      and <command>\password</> commands to match the documentation.
+     </para>
+
+     <para>
+      Introduce a new <option>-reuse-previous</> option
+      in <application>psql</>'s <command>\connect</> command to allow
+      explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether
+      the database name looks like a conninfo string, as before.)  This
+      allows secure handling of database names containing special
+      characters in <application>pg_dumpall</> scripts.
+     </para>
+
+     <para>
+      <application>pg_dumpall</> now refuses to deal with database and role
+      names containing carriage returns or newlines, as it seems impractical
+      to quote those characters safely on Windows.  In future we may reject
+      such names on the server side, but that step has not been taken yet.
+     </para>
+
+     <para>
+      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute
+      commands with superuser privileges the next time a superuser
+      executes <application>pg_dumpall</> or other routine maintenance
+      operations.  (CVE-2016-5424)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
+      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+     </para>
+
+     <para>
+      The SQL standard specifies that <literal>IS NULL</> should return
+      TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
+      NULL</> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      The core executor got this right, but certain planner optimizations
+      treated the test as recursive (thus producing TRUE in both cases),
+      and <filename>contrib/postgres_fdw</> could produce remote queries
+      that misbehaved similarly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make the <type>inet</> and <type>cidr</> data types properly reject
+      IPv6 addresses with too many colon-separated fields (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent crash in <function>close_ps()</>
+      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      for NaN input coordinates (Tom Lane)
+     </para>
+
+     <para>
+      Make it return NULL instead of crashing.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix several one-byte buffer over-reads in <function>to_number()</>
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      In several cases the <function>to_number()</> function would read one
+      more character than it should from the input string.  There is a
+      small chance of a crash, if the input happens to be adjacent to the
+      end of memory.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unsafe intermediate state during expensive paths
+      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+     </para>
+
+     <para>
+      Previously, these cases locked the target tuple (by setting its XMAX)
+      but did not WAL-log that action, thus risking data integrity problems
+      if the page were spilled to disk and then a database crash occurred
+      before the tuple update could be completed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid crash in <literal>postgres -C</> when the specified variable
+      has a null string value (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid consuming a transaction ID during <command>VACUUM</>
+      (Alexander Korotkov)
+     </para>
+
+     <para>
+      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      assigned to the current transaction.  Normally this is negligible,
+      but if one is up against the XID wraparound limit, consuming more
+      XIDs during anti-wraparound vacuums is a very bad thing.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      (Simon Riggs, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      result in unnecessary cancellations of queries on its standby
+      servers.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      When a manual <command>ANALYZE</> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</> counter
+      (Tom Lane)
+     </para>
+
+     <para>
+      If we're only analyzing some columns, we should not prevent routine
+      auto-analyze from happening for the other columns.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      for a unique or nearly-unique column with many null entries (Tom
+      Lane)
+     </para>
+
+     <para>
+      The nulls could get counted as though they were themselves distinct
+      values, leading to serious planner misestimates in some types of
+      queries.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent autovacuum from starting multiple workers for the same shared
+      catalog (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Normally this isn't much of a problem because the vacuum doesn't take
+      long anyway; but in the case of a severely bloated catalog, it could
+      result in all but one worker uselessly waiting instead of doing
+      useful work on other tables.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent infinite loop in GiST index build for geometric columns
+      containing NaN component values (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/btree_gin</> to handle the smallest
+      possible <type>bigint</> value correctly (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Teach libpq to correctly decode server version from future servers
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      It's planned to switch to two-part instead of three-part server
+      version numbers for releases after 9.6.  Make sure
+      that <function>PQserverVersion()</> returns the correct value for
+      such cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      array elements (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      command (David Johnston, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      specifying no compression (Fujii Masao)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix makefiles' rule for building AIX shared libraries to be safe for
+      parallel make (Noah Misch)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix TAP tests and MSVC scripts to work when build directory's path
+      name contains spaces (Michael Paquier, Kyotaro Horiguchi)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make regression tests safe for Danish and Welsh locales (Jeff Janes,
+      Tom Lane)
+     </para>
+
+     <para>
+      Change some test data that triggered the unusual sorting rules of
+      these locales.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update our copy of the timezone code to match
+      IANA's <application>tzcode</> release 2016c (Tom Lane)
+     </para>
+
+     <para>
+      This is needed to cope with anticipated future changes in the time
+      zone data files.  It also fixes some corner-case bugs in coping with
+      unusual time zones.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016f
+      for DST law changes in Kemerovo and Novosibirsk, plus historical
+      corrections for Azerbaijan, Belarus, and Morocco.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-2-17">
+  <title>Release 9.2.17</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-05-12</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.2.16.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.17</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.2.11,
+    see <xref linkend="release-9-2-11">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      afterwards (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </para>
+
+     <para>
+      This change prevents problems when there are multiple connections
+      using OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      Failures have been reported specifically when a client application
+      uses SSL connections in <application>libpq</> concurrently with
+      SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
+      It's possible for similar problems to arise within the server as well,
+      if an extension module establishes an outgoing SSL connection.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      planner error with a full join enclosed in the right-hand side of a
+      left join (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect handling of equivalence-class tests in multilevel
+      nestloop plans (Tom Lane)
+     </para>
+
+     <para>
+      Given a three-or-more-way equivalence class of variables, such
+      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      some of the tests needed to enforce that all the variables are actually
+      equal, leading to join rows being output that didn't satisfy
+      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      were seldom selected in practice, so that this bug has gone undetected
+      for a long time.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
+      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      These could advance off the end of the input string, causing subsequent
+      format codes to read garbage.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of rules and views in which the <replaceable>array</>
+      argument of a <literal><replaceable>value</> <replaceable>operator</>
+      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_regress</> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+     </para>
+
+     <para>
+      This is for consistency with a behavior recently added
+      to <application>pg_ctl</>; it eases automated testing on slow machines.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to correctly restore extension
+      membership for operator families containing only one operator class
+      (Tom Lane)
+     </para>
+
+     <para>
+      In such a case, the operator family was restored into the new database,
+      but it was no longer marked as part of the extension.  This had no
+      immediate ill effects, but would cause later <application>pg_dump</>
+      runs to emit output that would cause (harmless) errors on restore.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Back-port 9.4-era memory-barrier code changes into 9.2 and 9.3 (Tom Lane)
+     </para>
+
+     <para>
+      These changes were not originally needed in pre-9.4 branches, but we
+      recently back-patched a fix that expected the barrier code to work
+      properly.  Only IA64 (when using icc), HPPA, and Alpha platforms are
+      affected.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce the number of SysV semaphores used by a build configured with
+      <option>--disable-spinlocks</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Rename internal function <function>strtoi()</>
+      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      function (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix reporting of errors from <function>bind()</>
+      and <function>listen()</> system calls on Windows (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce verbosity of compiler output when building with Microsoft Visual
+      Studio (Christian Ullrich)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      function (Christian Ullrich)
+     </para>
+
+     <para>
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      appropriate.  No live bug is known to exist here, but it seems like a
+      good idea to be careful.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016d
+      for DST law changes in Russia and Venezuela.  There are new zone
+      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      the fact that these regions now have different time zone histories from
+      adjacent regions.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-2-16">
   <title>Release 9.2.16</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2016-03-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-03-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.15.
@@ -92,7 +2153,7 @@
 
      <para>
       This dodges a portability problem on FreeBSD-derived platforms
-      (including OS X).
+      (including macOS).
      </para>
     </listitem>
 
@@ -210,10 +2271,10 @@
  <sect1 id="release-9-2-15">
   <title>Release 9.2.15</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2016-02-11</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-02-11</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.14.
@@ -754,10 +2815,10 @@
  <sect1 id="release-9-2-14">
   <title>Release 9.2.14</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-10-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-10-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.13.
@@ -1351,10 +3412,10 @@
  <sect1 id="release-9-2-13">
   <title>Release 9.2.13</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-06-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-06-12</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.2.12.
@@ -1419,10 +3480,10 @@
  <sect1 id="release-9-2-12">
   <title>Release 9.2.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-06-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-06-04</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.2.11.
@@ -1514,10 +3575,10 @@
  <sect1 id="release-9-2-11">
   <title>Release 9.2.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-05-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-05-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.10.
@@ -2096,10 +4157,10 @@
  <sect1 id="release-9-2-10">
   <title>Release 9.2.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-02-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-02-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.9.
@@ -2653,7 +4714,7 @@
 
     <listitem>
      <para>
-      Warn if OS X's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
@@ -3013,10 +5074,10 @@
  <sect1 id="release-9-2-9">
   <title>Release 9.2.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-07-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-07-24</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.8.
@@ -3362,7 +5423,7 @@
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on OS X (Tom Lane)
+      Fix linking of <application>libpython</> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -3494,10 +5555,10 @@
  <sect1 id="release-9-2-8">
   <title>Release 9.2.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-03-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-03-20</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.7.
@@ -3559,7 +5620,7 @@
 
      <para>
       This prevents scenarios wherein a pathological regular expression
-      could lock up a server process uninterruptably for a long time.
+      could lock up a server process uninterruptibly for a long time.
      </para>
     </listitem>
 
@@ -3683,10 +5744,10 @@
  <sect1 id="release-9-2-7">
   <title>Release 9.2.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-02-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-02-20</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.6.
@@ -4290,10 +6351,10 @@
  <sect1 id="release-9-2-6">
   <title>Release 9.2.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-12-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-12-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.5.
@@ -4627,10 +6688,10 @@
  <sect1 id="release-9-2-5">
   <title>Release 9.2.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-10-10</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-10-10</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.4.
@@ -5046,10 +7107,10 @@
  <sect1 id="release-9-2-4">
   <title>Release 9.2.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-04-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-04-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.3.
@@ -5453,10 +7514,10 @@
  <sect1 id="release-9-2-3">
   <title>Release 9.2.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-02-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-02-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.2.
@@ -5904,10 +7965,10 @@
  <sect1 id="release-9-2-2">
   <title>Release 9.2.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-12-06</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-12-06</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.1.
@@ -6628,10 +8689,10 @@
  <sect1 id="release-9-2-1">
   <title>Release 9.2.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2012-09-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2012-09-24</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.2.0.
@@ -6796,10 +8857,10 @@
  <sect1 id="release-9-2">
   <title>Release 9.2</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2012-09-10</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2012-09-10</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-9.3.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-9.3.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-9.3.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-9.3.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,2488 @@
 <!-- doc/src/sgml/release-9.3.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-3-18">
+  <title>Release 9.3.18</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-08-10</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.3.17.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.18</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.3.16,
+    see <xref linkend="release-9-3-16">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Further restrict visibility
+      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      protect passwords stored as user mapping options
+      (Noah Misch)
+     </para>
+
+     <para>
+      The fix for CVE-2017-7486 was incorrect: it allowed a user
+      to see the options in her own user mapping, even if she did not
+      have <literal>USAGE</> permission on the associated foreign server.
+      Such options might include a password that had been provided by the
+      server owner rather than the user herself.
+      Since <structname>information_schema.user_mapping_options</> does not
+      show the options in such cases, <structname>pg_user_mappings</>
+      should not either.
+      (CVE-2017-7547)
+     </para>
+
+     <para>
+      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      you will need to do the following:
+     </para>
+
+     <procedure>
+      <step>
+       <para>
+        Restart the postmaster after adding <literal>allow_system_table_mods
+        = true</> to <filename>postgresql.conf</>.  (In versions
+        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        configuration change, but you'll still need a restart.)
+       </para>
+      </step>
+
+      <step>
+       <para>
+        In <emphasis>each</> database of the cluster,
+        run the following commands as superuser:
+<programlisting>
+SET search_path = pg_catalog;
+CREATE OR REPLACE VIEW pg_user_mappings AS
+    SELECT
+        U.oid       AS umid,
+        S.oid       AS srvid,
+        S.srvname   AS srvname,
+        U.umuser    AS umuser,
+        CASE WHEN U.umuser = 0 THEN
+            'public'
+        ELSE
+            A.rolname
+        END AS usename,
+        CASE WHEN (U.umuser &lt;&gt; 0 AND A.rolname = current_user
+                     AND (pg_has_role(S.srvowner, 'USAGE')
+                          OR has_server_privilege(S.oid, 'USAGE')))
+                    OR (U.umuser = 0 AND pg_has_role(S.srvowner, 'USAGE'))
+                    OR (SELECT rolsuper FROM pg_authid WHERE rolname = current_user)
+                    THEN U.umoptions
+                 ELSE NULL END AS umoptions
+    FROM pg_user_mapping U
+         LEFT JOIN pg_authid A ON (A.oid = U.umuser) JOIN
+        pg_foreign_server S ON (U.umserver = S.oid);
+</programlisting>
+       </para>
+      </step>
+
+      <step>
+       <para>
+        Do not forget to include the <literal>template0</>
+        and <literal>template1</> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</>,
+        you'll need to temporarily make it accept connections.
+        In <productname>PostgreSQL</> 9.5 and later, you can use
+<programlisting>
+ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
+</programlisting>
+        and then after fixing <literal>template0</>, undo that with
+<programlisting>
+ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
+</programlisting>
+        In prior versions, instead use
+<programlisting>
+UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
+UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
+</programlisting>
+       </para>
+      </step>
+
+      <step>
+       <para>
+        Finally, remove the <literal>allow_system_table_mods</> configuration
+        setting, and again restart the postmaster.
+       </para>
+      </step>
+     </procedure>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow empty passwords in all password-based authentication methods
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <application>libpq</> ignores empty password specifications, and does
+      not transmit them to the server.  So, if a user's password has been
+      set to the empty string, it's impossible to log in with that password
+      via <application>psql</> or other <application>libpq</>-based
+      clients.  An administrator might therefore believe that setting the
+      password to empty is equivalent to disabling password login.
+      However, with a modified or non-<application>libpq</>-based client,
+      logging in could be possible, depending on which authentication
+      method is configured.  In particular the most common
+      method, <literal>md5</>, accepted empty passwords.
+      Change the server to reject empty passwords in all cases.
+      (CVE-2017-7546)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix concurrent locking of tuple update chains (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      If several sessions concurrently lock a tuple update chain with
+      nonconflicting lock modes using an old snapshot, and they all
+      succeed, it was possible for some of them to nonetheless fail (and
+      conclude there is no live tuple version) due to a race condition.
+      This had consequences such as foreign-key checks failing to see a
+      tuple that definitely exists but is being updated concurrently.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix potential data corruption when freezing a tuple whose XMAX is a
+      multixact with exactly one still-interesting member (Teodor Sigaev)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, retry process creation if we fail to reserve the address
+      range for our shared memory in the new process (Tom Lane, Amit
+      Kapila)
+     </para>
+
+     <para>
+      This is expected to fix infrequent child-process-launch failures that
+      are probably due to interference from antivirus products.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability corruption of shared predicate-lock hash table
+      in Windows builds (Thomas Munro, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid logging clean closure of an SSL connection as though
+      it were a connection reset (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent sending SSL session tickets to clients (Tom Lane)
+     </para>
+
+     <para>
+      This fix prevents reconnection failures with ticket-aware client-side
+      SSL code.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"> on
+      Solaris (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix statistics collector to honor inquiry messages issued just after
+      a postmaster shutdown and immediate restart (Tom Lane)
+     </para>
+
+     <para>
+      Statistics inquiries issued within half a second of the previous
+      postmaster shutdown were effectively ignored.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that the statistics collector's receive buffer size is at
+      least 100KB (Tom Lane)
+     </para>
+
+     <para>
+      This reduces the risk of dropped statistics data on older platforms
+      whose default receive buffer size is less than that.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible creation of an invalid WAL segment when a standby is
+      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      record (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      walsender processes (Petr Jelinek, Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unnecessarily slow restarts of <application>walreceiver</>
+      processes due to race condition in postmaster (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      to more than one element of a column that is of domain-over-array
+      type (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow window functions to be used in sub-<literal>SELECT</>s that
+      are within the arguments of an aggregate function (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Move autogenerated array types out of the way during
+      <command>ALTER ... RENAME</> (Vik Fearing)
+     </para>
+
+     <para>
+      Previously, we would rename a conflicting autogenerated array type
+      out of the way during <command>CREATE</>; this fix extends that
+      behavior to renaming operations.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly update dependency info when changing a datatype I/O
+      function's argument or return type from <type>opaque</> to the
+      correct type (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <command>CREATE TYPE</> updates I/O functions declared in this
+      long-obsolete style, but it forgot to record a dependency on the
+      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      function definitions behind.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce memory usage when <command>ANALYZE</> processes
+      a <type>tsvector</> column (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unnecessary precision loss and sloppy rounding when multiplying
+      or dividing <type>money</> values by integers or floats (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Tighten checks for whitespace in functions that parse identifiers,
+      such as <function>regprocedurein()</> (Tom Lane)
+     </para>
+
+     <para>
+      Depending on the prevailing locale, these functions could
+      misinterpret fragments of multibyte characters as whitespace.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use relevant <literal>#define</> symbols from Perl while
+      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+     </para>
+
+     <para>
+      This avoids portability problems, typically manifesting as
+      a <quote>handshake</> mismatch during library load, when working with
+      recent Perl versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      state properly after a failed connection attempt (Michael Paquier)
+     </para>
+
+     <para>
+      Failure to do this meant that when falling back from SSL to non-SSL
+      connections, a GSS/SASL failure in the SSL attempt would always cause
+      the non-SSL attempt to fail.  SSPI did not fail, but it leaked memory.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      is ended with a keyboard EOF signal and then another <command>COPY
+      FROM STDIN</> is attempted (Thomas Munro)
+     </para>
+
+     <para>
+      This misbehavior was observed on BSD-derived platforms (including
+      macOS), but not on most others.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> and <application>pg_restore</> to
+      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+     </para>
+
+     <para>
+      This prevents errors during dump/restore when a materialized view
+      refers to tables owned by a different user.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> with the <option>--clean</> option to
+      drop event triggers as expected (Tom Lane)
+     </para>
+
+     <para>
+      It also now correctly assigns ownership of event triggers; before,
+      they were restored as being owned by the superuser running the
+      restore script.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      operator class (Daniel Gustafsson)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+     </para>
+
+     <para>
+      A compressed plain-text dump written to stdout would contain corrupt
+      data due to failure to put the file descriptor into binary mode.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_get_ruledef()</> to print correct output for
+      the <literal>ON SELECT</> rule of a view whose columns have been
+      renamed (Tom Lane)
+     </para>
+
+     <para>
+      In some corner cases, <application>pg_dump</> relies
+      on <function>pg_get_ruledef()</> to dump views, so that this error
+      could result in dump/reload failures.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of outer joins with empty constraints, such as the result
+      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of function expressions in the <literal>FROM</> clause in
+      cases where the expression does not deparse into something that looks
+      like a function call (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</> output to stdout on Windows
+      (Haribabu Kommi)
+     </para>
+
+     <para>
+      A backup written to stdout would contain corrupt data due to failure
+      to put the file descriptor into binary mode.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This condition could prevent upgraded standby servers from
+      reconnecting.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>postgres_fdw</>, re-establish connections to remote
+      servers after <command>ALTER SERVER</> or <command>ALTER USER
+      MAPPING</> commands (Kyotaro Horiguchi)
+     </para>
+
+     <para>
+      This ensures that option changes affecting connection parameters will
+      be applied promptly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>postgres_fdw</>, allow cancellation of remote
+      transaction control commands (Robert Haas, Rafia Sabih)
+     </para>
+
+     <para>
+      This change allows us to quickly escape a wait for an unresponsive
+      remote server in many more cases than previously.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      shared libraries with gcc (Tom Lane)
+     </para>
+
+     <para>
+      This supports larger extension libraries on platforms where it makes
+      a difference.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unescaped-braces issue in our build scripts for Microsoft MSVC,
+      to avoid a warning or error from recent Perl versions (Andrew
+      Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, handle the case where the <application>openssl</>
+      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, add proper include path for <application>libxml2</>
+      header files (Andrew Dunstan)
+     </para>
+
+     <para>
+      This fixes a former need to move things around in standard Windows
+      installations of <application>libxml2</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, recognize a Tcl library that is
+      named <filename>tcl86.lib</> (Noah Misch)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-3-17">
+  <title>Release 9.3.17</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-05-11</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.3.16.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.17</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.3.16,
+    see <xref linkend="release-9-3-16">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Restrict visibility
+      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      protect passwords stored as user mapping options
+      (Michael Paquier, Feike Steenbergen)
+     </para>
+
+     <para>
+      The previous coding allowed the owner of a foreign server object,
+      or anyone he has granted server <literal>USAGE</> permission to,
+      to see the options for all user mappings associated with that server.
+      This might well include passwords for other users.
+      Adjust the view definition to match the behavior of
+      <structname>information_schema.user_mapping_options</>, namely that
+      these options are visible to the user being mapped, or if the mapping
+      is for <literal>PUBLIC</literal> and the current user is the server
+      owner, or if the current user is a superuser.
+      (CVE-2017-7486)
+     </para>
+
+     <para>
+      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      follow the corrected procedure shown in the changelog entry for
+      CVE-2017-7547, in <xref linkend="release-9-3-18">.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent exposure of statistical information via leaky operators
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      Some selectivity estimation functions in the planner will apply
+      user-defined operators to values obtained
+      from <structname>pg_statistic</>, such as most common values and
+      histogram entries.  This occurs before table permissions are checked,
+      so a nefarious user could exploit the behavior to obtain these values
+      for table columns he does not have permission to read.  To fix,
+      fall back to a default estimate if the operator's implementation
+      function is not certified leak-proof and the calling user does not have
+      permission to read the table column whose statistics are needed.
+      At least one of these criteria is satisfied in most cases in practice.
+      (CVE-2017-7484)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Restore <application>libpq</>'s recognition of
+      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+     </para>
+
+     <para>
+      Processing of this environment variable was unintentionally dropped
+      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      This creates a security hazard, since users might be relying on the
+      environment variable to force SSL-encrypted connections, but that
+      would no longer be guaranteed.  Restore handling of the variable,
+      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      breaking configurations that work correctly with post-9.3 code.
+      (CVE-2017-7485)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      (Robert Haas, Michael Paquier)
+     </para>
+
+     <para>
+      This could result in an unlogged index being set to an invalid state
+      after a crash and restart.  Such a problem would persist until the
+      index was dropped and rebuilt.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      when a standby server replays a prepared but uncommitted two-phase
+      transaction (Tom Lane)
+     </para>
+
+     <para>
+      In most cases this turned out to have no visible ill effects, but in
+      corner cases it could result in circular references
+      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in queries that examine rows modified by the two-phase transaction.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure parsing of queries in extension scripts sees the results of
+      immediately-preceding DDL (Julien Rouhaud, Tom Lane)
+     </para>
+
+     <para>
+      Due to lack of a cache flush step between commands in an extension
+      script file, non-utility queries might not see the effects of an
+      immediately preceding catalog change, such as <command>ALTER TABLE
+      ... RENAME</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
+      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+     </para>
+
+     <para>
+      The command failed if the calling user did not currently have
+      <literal>CREATE</> privilege for the tablespace containing the index.
+      That behavior seems unhelpful, so skip the check, allowing the
+      index to be rebuilt where it is.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</>
+      (Amit Langote)
+     </para>
+
+     <para>
+      This fix prevents unwanted <quote>constraint does not exist</> failures
+      when no matching constraint is present in the child tables.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>VACUUM</> to account properly for pages that could not
+      be scanned due to conflicting page pins (Andrew Gierth)
+     </para>
+
+     <para>
+      This tended to lead to underestimation of the number of tuples in
+      the table.  In the worst case of a small heavily-contended
+      table, <command>VACUUM</> could incorrectly report that the table
+      contained no tuples, leading to very bad planning choices.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that bulk-tuple-transfer loops within a hash join are
+      interruptible by query cancel requests (Tom Lane, Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>cursor_to_xml()</> to produce valid output
+      with <replaceable>tableforest</> = false
+      (Thomas Munro, Peter Eisentraut)
+     </para>
+
+     <para>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      element.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve performance of <structname>pg_timezone_names</> view
+      (Tom Lane, David Rowley)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sloppy handling of corner-case errors from <function>lseek()</>
+      and <function>close()</> (Tom Lane)
+     </para>
+
+     <para>
+      Neither of these system calls are likely to fail in typical situations,
+      but if they did, <filename>fd.c</> could get quite confused.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect check for whether postmaster is running as a Windows
+      service (Michael Paquier)
+     </para>
+
+     <para>
+      This could result in attempting to write to the event log when that
+      isn't accessible, so that no logging happens at all.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
+      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix a double-free error when processing dollar-quoted string literals
+      in <application>ecpg</> (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      comments and security labels of some types of database objects
+      (Giuseppe Broccolo, Tom Lane)
+     </para>
+
+     <para>
+      In simple cases this caused no ill effects; but for example, a
+      schema-selective restore might omit comments it should include, because
+      they were not marked as belonging to the schema of their associated
+      object.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      when SQL object names contain newlines (Tom Lane)
+     </para>
+
+     <para>
+      Replace newlines by spaces, which is sufficient to make the output
+      valid for <literal>pg_restore -L</>'s purposes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to transfer comments and security labels
+      attached to <quote>large objects</> (blobs) (Stephen Frost)
+     </para>
+
+     <para>
+      Previously, blobs were correctly transferred to the new database, but
+      any comments or security labels attached to them were lost.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve error handling
+      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      function (Noah Misch)
+     </para>
+
+     <para>
+      Notably, it failed to detect errors reported
+      by <function>fclose()</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      connection when establishing a new unnamed connection (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      expressions (Tom Lane)
+     </para>
+
+     <para>
+      In some cases it would produce a broken data structure that could never
+      match anything, leading to GIN or GiST indexscans that use a trigram
+      index not finding any matches to the regular expression.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/postgres_fdw</>,
+      transmit query cancellation requests to the remote server
+      (Michael Paquier, Etsuro Fujita)
+     </para>
+
+     <para>
+      Previously, a local query cancellation request did not cause an
+      already-sent remote query to terminate early.  This is a back-patch
+      of work originally done for 9.6.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support OpenSSL 1.1.0 (Heikki Linnakangas, Andreas Karlsson, Tom Lane)
+     </para>
+
+     <para>
+      This is a back-patch of work previously done in newer branches;
+      it's needed since many platforms are adopting newer OpenSSL versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support Tcl 8.6 in MSVC builds (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017b
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes a bug affecting some DST transitions in January 2038.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2017b
+      for DST law changes in Chile, Haiti, and Mongolia, plus historical
+      corrections for Ecuador, Kazakhstan, Liberia, and Spain.
+      Switch to numeric abbreviations for numerous time zones in South
+      America, the Pacific and Indian oceans, and some Asian and Middle
+      Eastern countries.
+     </para>
+
+     <para>
+      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <structname>pg_timezone_names</>
+      view nor used for output.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use correct daylight-savings rules for POSIX-style time zone names
+      in MSVC builds (David Rowley)
+     </para>
+
+     <para>
+      The Microsoft MSVC build scripts neglected to install
+      the <filename>posixrules</> file in the timezone directory tree.
+      This resulted in the timezone code falling back to its built-in
+      rule about what DST behavior to assume for a POSIX-style time zone
+      name.  For historical reasons that still corresponds to the DST rules
+      the USA was using before 2007 (i.e., change on first Sunday in April
+      and last Sunday in October).  With this fix, a POSIX-style zone name
+      will use the current and historical DST transition dates of
+      the <literal>US/Eastern</> zone.  If you don't want that, remove
+      the <filename>posixrules</> file, or replace it with a copy of some
+      other zone file (see <xref linkend="datatype-timezones">).  Note that
+      due to caching, you may need to restart the server to get such changes
+      to take effect.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-3-16">
+  <title>Release 9.3.16</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-02-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.3.15.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.16</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted indexes.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.3.15,
+    see <xref linkend="release-9-3-15">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix a race condition that could cause indexes built
+      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      (Pavan Deolasee, Tom Lane)
+     </para>
+
+     <para>
+      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      that depends on a column not previously indexed, then rows
+      updated by transactions that ran concurrently with
+      the <command>CREATE INDEX</> command could have received incorrect
+      index entries.  If you suspect this may have happened, the most
+      reliable solution is to rebuild affected indexes after installing
+      this update.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      unlogged table (Michael Paquier)
+     </para>
+
+     <para>
+      Previously, this was skipped when <xref linkend="guc-wal-level">
+      = <literal>minimal</>, but actually it's necessary even in that case
+      to ensure that the unlogged table is properly reset to empty after a
+      crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      If the stats collector dies during hot standby, restart it (Takayuki
+      Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that hot standby feedback works correctly when it's enabled at
+      standby server start (Ants Aasma, Craig Ringer)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for interrupts while hot standby is waiting for a conflicting
+      query (Simon Riggs)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid constantly respawning the autovacuum launcher in a corner case
+      (Amit Khandekar)
+     </para>
+
+     <para>
+      This fix avoids problems when autovacuum is nominally off and there
+      are some tables that require freezing, but all such tables are
+      already being processed by autovacuum workers.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix check for when an extension member object can be dropped (Tom Lane)
+     </para>
+
+     <para>
+      Extension upgrade scripts should be able to drop member objects,
+      but this was disallowed for serial-column sequences, and possibly
+      other cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make sure <command>ALTER TABLE</> preserves index tablespace
+      assignments when rebuilding indexes (Tom Lane, Michael Paquier)
+     </para>
+
+     <para>
+      Previously, non-default settings
+      of <xref linkend="guc-default-tablespace"> could result in broken
+      indexes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent dropping a foreign-key constraint if there are pending
+      trigger events for the referenced relation (Tom Lane)
+     </para>
+
+     <para>
+      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
+      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix processing of OID column when a table with OIDs is associated to
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      Langote)
+     </para>
+
+     <para>
+      The OID column should be treated the same as regular user columns in
+      this case, but it wasn't, leading to odd behavior in later
+      inheritance changes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Report correct object identity during <command>ALTER TEXT SEARCH
+      CONFIGURATION</> (Artur Zakirov)
+     </para>
+
+     <para>
+      The wrong catalog OID was reported to extensions such as logical
+      decoding.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for serializability conflicts before reporting
+      constraint-violation failures (Thomas Munro)
+     </para>
+
+     <para>
+      When using serializable transaction isolation, it is desirable
+      that any error due to concurrent transactions should manifest
+      as a serialization failure, thereby cueing the application that
+      a retry might succeed.  Unfortunately, this does not reliably
+      happen for duplicate-key failures caused by concurrent insertions.
+      This change ensures that such an error will be reported as a
+      serialization error if the application explicitly checked for
+      the presence of a conflicting key (and did not find it) earlier
+      in the transaction.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
+      an <command>UPDATE</> source expression (Tom Lane)
+     </para>
+
+     <para>
+      This led to <quote>UPDATE target count mismatch --- internal
+      error</>.  Now the syntax is understood as a whole-row variable,
+      as it would be in other contexts.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that column typmods are determined accurately for
+      multi-row <literal>VALUES</> constructs (Tom Lane)
+     </para>
+
+     <para>
+      This fixes problems occurring when the first value in a column has a
+      determinable typmod (e.g., length for a <type>varchar</> value) but
+      later values don't share the same limit.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Throw error for an unfinished Unicode surrogate pair at the end of a
+      Unicode string (Tom Lane)
+     </para>
+
+     <para>
+      Normally, a Unicode surrogate leading character must be followed by a
+      Unicode surrogate trailing character, but the check for this was
+      missed if the leading character was the last character in a Unicode
+      string literal (<literal>U&amp;'...'</>) or Unicode identifier
+      (<literal>U&amp;"..."</>).
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that a purely negative text search query, such
+      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+     </para>
+
+     <para>
+      Such matches were found by GIN index searches, but not by sequential
+      scans or GiST index searches.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      subtree with an empty query (Artur Zakirov)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      The overrun occurred only if the input consisted entirely of single
+      quotes and/or backslashes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent multiple calls of <function>pg_start_backup()</>
+      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Paquier)
+     </para>
+
+     <para>
+      This avoids an assertion failure, and possibly worse things, if
+      someone tries to run these functions in parallel.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      that aren't really no-ops (Tom Lane)
+     </para>
+
+     <para>
+      In some cases, a cast that should result in zeroing out
+      low-order <type>interval</> fields was mistakenly deemed to be a
+      no-op and discarded.  An example is that casting from <type>INTERVAL
+      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that cached plans are invalidated by changes in foreign-table
+      options (Amit Langote, Etsuro Fujita, Ashutosh Bapat)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      that use built-in functions (Stephen Frost)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible <application>pg_basebackup</> failure on standby
+      server when including WAL files (Amit Kapila, Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that the Python exception objects we create for PL/Python are
+      properly reference-counted (Rafa de la Torre, Tom Lane)
+     </para>
+
+     <para>
+      This avoids failures if the objects are used after a Python garbage
+      collection cycle has occurred.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      as a column name (Tom Lane)
+     </para>
+
+     <para>
+      This matches the (previously undocumented) behavior of
+      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
+      namely that a magic <literal>.tupno</> column is inserted only if
+      there isn't a real column named that.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      even on Unix (Vik Fearing)
+     </para>
+
+     <para>
+      This change simplifies use of the same password file across Unix and
+      Windows machines.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      name that ends with a dot (Takayuki Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>psql</>, treat an empty or all-blank setting of
+      the <envar>PAGER</> environment variable as meaning <quote>no
+      pager</> (Tom Lane)
+     </para>
+
+     <para>
+      Previously, such a setting caused output intended for the pager to
+      vanish entirely.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve <filename>contrib/dblink</>'s reporting of
+      low-level <application>libpq</> errors, such as out-of-memory
+      (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Teach <filename>contrib/dblink</> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      the source of connection options (Corey Huinker)
+     </para>
+
+     <para>
+      Previously, if the foreign server object had options that were not
+      also <application>libpq</> connection options, an error occurred.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, ensure that environment variable changes are propagated
+      to DLLs built with debug options (Christian Ullrich)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2016j
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues, most notably that timezone data
+      installation failed if the target directory didn't support hard
+      links.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016j
+      for DST law changes in northern Cyprus (adding a new zone
+      Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
+      and Antarctica/Casey.
+      Historical corrections for Italy, Kazakhstan, Malta, and Palestine.
+      Switch to preferring numeric zone abbreviations for Tonga.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-3-15">
+  <title>Release 9.3.15</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-10-27</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.3.14.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.15</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted free space maps.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.3.9,
+    see <xref linkend="release-9-3-9">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix WAL-logging of truncation of relation free space maps and
+      visibility maps (Pavan Deolasee, Heikki Linnakangas)
+     </para>
+
+     <para>
+      It was possible for these files to not be correctly restored during
+      crash recovery, or to be written incorrectly on a standby server.
+      Bogus entries in a free space map could lead to attempts to access
+      pages that have been truncated away from the relation itself, typically
+      producing errors like <quote>could not read block <replaceable>XXX</>:
+      read only 0 of 8192 bytes</quote>.  Checksum failures in the
+      visibility map are also possible, if checksumming is enabled.
+     </para>
+
+     <para>
+      Procedures for determining whether there is a problem and repairing it
+      if so are discussed at
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>SELECT FOR UPDATE/SHARE</> to correctly lock tuples that
+      have been updated by a subsequently-aborted transaction
+      (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      In 9.5 and later, the <command>SELECT</> would sometimes fail to
+      return such tuples at all.  A failure has not been proven to occur in
+      earlier releases, but might be possible with concurrent updates.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix EvalPlanQual rechecks involving CTE scans (Tom Lane)
+     </para>
+
+     <para>
+      The recheck would always see the CTE as returning no rows, typically
+      leading to failure to update rows that were recently updated.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix improper repetition of previous results from hashed aggregation in
+      a subquery (Andrew Gierth)
+     </para>
+
+     <para>
+      The test to see if we can reuse a previously-computed hash table of
+      the aggregate state values neglected the possibility of an outer query
+      reference appearing in an aggregate argument expression.  A change in
+      the value of such a reference should lead to recalculating the hash
+      table, but did not.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>EXPLAIN</> to emit valid XML when
+      <xref linkend="guc-track-io-timing"> is on (Markus Winand)
+     </para>
+
+     <para>
+      Previously the XML output-format option produced syntactically invalid
+      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Suppress printing of zeroes for unmeasured times
+      in <command>EXPLAIN</> (Maksim Milyutin)
+     </para>
+
+     <para>
+      Certain option combinations resulted in printing zero values for times
+      that actually aren't ever measured in that combination.  Our general
+      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      do that consistently in all cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      table lock so that it can truncate the table (Simon Riggs)
+     </para>
+
+     <para>
+      The timeout was meant to be 50 milliseconds, but it was actually only
+      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      much more easily than intended.  Set it to the intended value.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      creating or altering a table (Tom Lane, Amit Langote)
+     </para>
+
+     <para>
+      Allow identical <literal>CHECK</> constraints to be added to a parent
+      and child table in either order.  Prevent merging of a valid
+      constraint from the parent table with a <literal>NOT VALID</>
+      constraint on the child.  Likewise, prevent merging of a <literal>NO
+      INHERIT</> child constraint with an inherited constraint.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove artificial restrictions on the values accepted
+      by <function>numeric_in()</> and <function>numeric_recv()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      We allow numeric values up to the limit of the storage format (more
+      than <literal>1e100000</>), so it seems fairly pointless
+      that <function>numeric_in()</> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      reject more than 1000 digits in an input value.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid very-low-probability data corruption due to testing tuple
+      visibility without holding buffer lock (Thomas Munro, Peter Geoghegan,
+      Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix file descriptor leakage when truncating a temporary relation of
+      more than 1GB (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow starting a standalone backend with <literal>standby_mode</>
+      turned on (Michael Paquier)
+     </para>
+
+     <para>
+      This can't do anything useful, since there will be no WAL receiver
+      process to fetch more WAL data; and it could result in misbehavior
+      in code that wasn't designed with this situation in mind.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't try to share SSL contexts across multiple connections
+      in <application>libpq</> (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This led to assorted corner-case bugs, particularly when trying to use
+      different SSL parameters for different connections.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+     </para>
+
+     <para>
+      The reported problem involved leaking an error report
+      during <function>PQreset()</>, but there might be related cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      options work consistently with our other executables (Haribabu Kommi)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, never dump range constructor functions
+      (Tom Lane)
+     </para>
+
+     <para>
+      This oversight led to <application>pg_upgrade</> failures with
+      extensions containing range types, due to duplicate creation of the
+      constructor functions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_xlogdump</>, retry opening new WAL segments when
+      using <option>--follow</> option (Magnus Hagander)
+     </para>
+
+     <para>
+      This allows for a possible delay in the server's creation of the next
+      segment.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_xlogdump</> to cope with a WAL file that begins
+      with a continuation record spanning more than one page (Pavan
+      Deolasee)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
+      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      (Daniel Gustafsson)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update Windows time zone mapping to recognize some time zone names
+      added in recent Windows versions (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent failure of obsolete dynamic time zone abbreviations (Tom Lane)
+     </para>
+
+     <para>
+      If a dynamic time zone abbreviation does not match any entry in the
+      referenced time zone, treat it as equivalent to the time zone name.
+      This avoids unexpected failures when IANA removes abbreviations from
+      their time zone database, as they did in <application>tzdata</>
+      release 2016f and seem likely to do again in the future.  The
+      consequences were not limited to not recognizing the individual
+      abbreviation; any mismatch caused
+      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016h
+      for DST law changes in Palestine and Turkey, plus historical
+      corrections for Turkey and some regions of Russia.
+      Switch to numeric abbreviations for some time zones in Antarctica,
+      the former Soviet Union, and Sri Lanka.
+     </para>
+
+     <para>
+      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <structname>pg_timezone_names</>
+      view nor used for output.
+     </para>
+
+     <para>
+      In this update, <literal>AMT</> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-3-14">
+  <title>Release 9.3.14</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-08-11</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.3.13.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.14</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.3.9,
+    see <xref linkend="release-9-3-9">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix possible mis-evaluation of
+      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      Linnakangas, Michael Paquier, Tom Lane)
+     </para>
+
+     <para>
+      A <literal>CASE</> expression appearing within the test value
+      subexpression of another <literal>CASE</> could become confused about
+      whether its own test value was null or not.  Also, inlining of a SQL
+      function implementing the equality operator used by
+      a <literal>CASE</> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</> expression in the
+      SQL function's body.  If the test values were of different data
+      types, a crash might result; moreover such situations could be abused
+      to allow disclosure of portions of server memory.  (CVE-2016-5423)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix client programs' handling of special characters in database and
+      role names (Noah Misch, Nathan Bossart, Michael Paquier)
+     </para>
+
+     <para>
+      Numerous places in <application>vacuumdb</> and other client programs
+      could become confused by database and role names containing double
+      quotes or backslashes.  Tighten up quoting rules to make that safe.
+      Also, ensure that when a conninfo string is used as a database name
+      parameter to these programs, it is correctly treated as such throughout.
+     </para>
+
+     <para>
+      Fix handling of paired double quotes
+      in <application>psql</>'s <command>\connect</>
+      and <command>\password</> commands to match the documentation.
+     </para>
+
+     <para>
+      Introduce a new <option>-reuse-previous</> option
+      in <application>psql</>'s <command>\connect</> command to allow
+      explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether
+      the database name looks like a conninfo string, as before.)  This
+      allows secure handling of database names containing special
+      characters in <application>pg_dumpall</> scripts.
+     </para>
+
+     <para>
+      <application>pg_dumpall</> now refuses to deal with database and role
+      names containing carriage returns or newlines, as it seems impractical
+      to quote those characters safely on Windows.  In future we may reject
+      such names on the server side, but that step has not been taken yet.
+     </para>
+
+     <para>
+      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute
+      commands with superuser privileges the next time a superuser
+      executes <application>pg_dumpall</> or other routine maintenance
+      operations.  (CVE-2016-5424)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
+      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+     </para>
+
+     <para>
+      The SQL standard specifies that <literal>IS NULL</> should return
+      TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
+      NULL</> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      The core executor got this right, but certain planner optimizations
+      treated the test as recursive (thus producing TRUE in both cases),
+      and <filename>contrib/postgres_fdw</> could produce remote queries
+      that misbehaved similarly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make the <type>inet</> and <type>cidr</> data types properly reject
+      IPv6 addresses with too many colon-separated fields (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent crash in <function>close_ps()</>
+      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      for NaN input coordinates (Tom Lane)
+     </para>
+
+     <para>
+      Make it return NULL instead of crashing.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possible crash in <function>pg_get_expr()</> when inconsistent
+      values are passed to it (Michael Paquier, Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix several one-byte buffer over-reads in <function>to_number()</>
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      In several cases the <function>to_number()</> function would read one
+      more character than it should from the input string.  There is a
+      small chance of a crash, if the input happens to be adjacent to the
+      end of memory.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Do not run the planner on the query contained in <literal>CREATE
+      MATERIALIZED VIEW</> or <literal>CREATE TABLE AS</>
+      when <literal>WITH NO DATA</> is specified (Michael Paquier,
+      Tom Lane)
+     </para>
+
+     <para>
+      This avoids some unnecessary failure conditions, for example if a
+      stable function invoked by the materialized view depends on a table
+      that doesn't exist yet.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unsafe intermediate state during expensive paths
+      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+     </para>
+
+     <para>
+      Previously, these cases locked the target tuple (by setting its XMAX)
+      but did not WAL-log that action, thus risking data integrity problems
+      if the page were spilled to disk and then a database crash occurred
+      before the tuple update could be completed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix hint bit update during WAL replay of row locking operations
+      (Andres Freund)
+     </para>
+
+     <para>
+      The only known consequence of this problem is that row locks held by
+      a prepared, but uncommitted, transaction might fail to be enforced
+      after a crash and restart.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unnecessary <quote>could not serialize access</> errors when
+      acquiring <literal>FOR KEY SHARE</> row locks in serializable mode
+      (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid crash in <literal>postgres -C</> when the specified variable
+      has a null string value (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that backends see up-to-date statistics for shared catalogs
+      (Tom Lane)
+     </para>
+
+     <para>
+      The statistics collector failed to update the statistics file for
+      shared catalogs after a request from a regular backend.  This problem
+      was partially masked because the autovacuum launcher regularly makes
+      requests that did cause such updates; however, it became obvious with
+      autovacuum disabled.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid redundant writes of the statistics files when multiple
+      backends request updates close together (Tom Lane, Tomas Vondra)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid consuming a transaction ID during <command>VACUUM</>
+      (Alexander Korotkov)
+     </para>
+
+     <para>
+      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      assigned to the current transaction.  Normally this is negligible,
+      but if one is up against the XID wraparound limit, consuming more
+      XIDs during anti-wraparound vacuums is a very bad thing.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      (Simon Riggs, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      result in unnecessary cancellations of queries on its standby
+      servers.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent possible failure when vacuuming multixact IDs in an
+      installation that has been pg_upgrade'd from pre-9.3 (Andrew Gierth,
+      &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      The usual symptom of this bug is errors
+      like <quote>MultiXactId <replaceable>NNN</> has not been created
+      yet -- apparent wraparound</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      When a manual <command>ANALYZE</> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</> counter
+      (Tom Lane)
+     </para>
+
+     <para>
+      If we're only analyzing some columns, we should not prevent routine
+      auto-analyze from happening for the other columns.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      for a unique or nearly-unique column with many null entries (Tom
+      Lane)
+     </para>
+
+     <para>
+      The nulls could get counted as though they were themselves distinct
+      values, leading to serious planner misestimates in some types of
+      queries.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent autovacuum from starting multiple workers for the same shared
+      catalog (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Normally this isn't much of a problem because the vacuum doesn't take
+      long anyway; but in the case of a severely bloated catalog, it could
+      result in all but one worker uselessly waiting instead of doing
+      useful work on other tables.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent infinite loop in GiST index build for geometric columns
+      containing NaN component values (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/btree_gin</> to handle the smallest
+      possible <type>bigint</> value correctly (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Teach libpq to correctly decode server version from future servers
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      It's planned to switch to two-part instead of three-part server
+      version numbers for releases after 9.6.  Make sure
+      that <function>PQserverVersion()</> returns the correct value for
+      such cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      array elements (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      command (David Johnston, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve handling of <systemitem>SIGTERM</>/control-C in
+      parallel <application>pg_dump</> and <application>pg_restore</> (Tom
+      Lane)
+     </para>
+
+     <para>
+      Make sure that the worker processes will exit promptly, and also arrange
+      to send query-cancel requests to the connected backends, in case they
+      are doing something long-running such as a <command>CREATE INDEX</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix error reporting in parallel <application>pg_dump</>
+      and <application>pg_restore</> (Tom Lane)
+     </para>
+
+     <para>
+      Previously, errors reported by <application>pg_dump</>
+      or <application>pg_restore</> worker processes might never make it to
+      the user's console, because the messages went through the master
+      process, and there were various deadlock scenarios that would prevent
+      the master process from passing on the messages.  Instead, just print
+      everything to <literal>stderr</>.  In some cases this will result in
+      duplicate messages (for instance, if all the workers report a server
+      shutdown), but that seems better than no message.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that parallel <application>pg_dump</>
+      or <application>pg_restore</> on Windows will shut down properly
+      after an error (Kyotaro Horiguchi)
+     </para>
+
+     <para>
+      Previously, it would report the error, but then just sit until
+      manually stopped by the user.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_dump</> behave better when built without zlib
+      support (Kyotaro Horiguchi)
+     </para>
+
+     <para>
+      It didn't work right for parallel dumps, and emitted some rather
+      pointless warnings in other cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      specifying no compression (Fujii Masao)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix makefiles' rule for building AIX shared libraries to be safe for
+      parallel make (Noah Misch)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix TAP tests and MSVC scripts to work when build directory's path
+      name contains spaces (Michael Paquier, Kyotaro Horiguchi)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Be more predictable about reporting <quote>statement timeout</>
+      versus <quote>lock timeout</> (Tom Lane)
+     </para>
+
+     <para>
+      On heavily loaded machines, the regression tests sometimes failed due
+      to reporting <quote>lock timeout</> even though the statement timeout
+      should have occurred first.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make regression tests safe for Danish and Welsh locales (Jeff Janes,
+      Tom Lane)
+     </para>
+
+     <para>
+      Change some test data that triggered the unusual sorting rules of
+      these locales.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update our copy of the timezone code to match
+      IANA's <application>tzcode</> release 2016c (Tom Lane)
+     </para>
+
+     <para>
+      This is needed to cope with anticipated future changes in the time
+      zone data files.  It also fixes some corner-case bugs in coping with
+      unusual time zones.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016f
+      for DST law changes in Kemerovo and Novosibirsk, plus historical
+      corrections for Azerbaijan, Belarus, and Morocco.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-3-13">
+  <title>Release 9.3.13</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-05-12</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.3.12.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.13</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.3.9,
+    see <xref linkend="release-9-3-9">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      afterwards (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </para>
+
+     <para>
+      This change prevents problems when there are multiple connections
+      using OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      Failures have been reported specifically when a client application
+      uses SSL connections in <application>libpq</> concurrently with
+      SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
+      It's possible for similar problems to arise within the server as well,
+      if an extension module establishes an outgoing SSL connection.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      planner error with a full join enclosed in the right-hand side of a
+      left join (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect handling of equivalence-class tests in multilevel
+      nestloop plans (Tom Lane)
+     </para>
+
+     <para>
+      Given a three-or-more-way equivalence class of variables, such
+      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      some of the tests needed to enforce that all the variables are actually
+      equal, leading to join rows being output that didn't satisfy
+      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      were seldom selected in practice, so that this bug has gone undetected
+      for a long time.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
+      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      These could advance off the end of the input string, causing subsequent
+      format codes to read garbage.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of rules and views in which the <replaceable>array</>
+      argument of a <literal><replaceable>value</> <replaceable>operator</>
+      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_regress</> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+     </para>
+
+     <para>
+      This is for consistency with a behavior recently added
+      to <application>pg_ctl</>; it eases automated testing on slow machines.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to correctly restore extension
+      membership for operator families containing only one operator class
+      (Tom Lane)
+     </para>
+
+     <para>
+      In such a case, the operator family was restored into the new database,
+      but it was no longer marked as part of the extension.  This had no
+      immediate ill effects, but would cause later <application>pg_dump</>
+      runs to emit output that would cause (harmless) errors on restore.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to not fail when new-cluster TOAST rules
+      differ from old (Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_upgrade</> had special-case code to handle the
+      situation where the new <productname>PostgreSQL</> version thinks that
+      a table should have a TOAST table while the old version did not.  That
+      code was broken, so remove it, and instead do nothing in such cases;
+      there seems no reason to believe that we can't get along fine without
+      a TOAST table if that was okay according to the old version's rules.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_3_STABLE [f4f4f6990] 2016-04-15 16:49:48 -0400
+Branch: REL9_2_STABLE [d7dbc882d] 2016-04-15 16:49:48 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_3_STABLE [992df9658] 2016-04-16 10:42:07 -0400
+Branch: REL9_2_STABLE [9008922bf] 2016-04-16 10:41:57 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_3_STABLE [35166fd76] 2016-04-18 13:19:52 -0400
+Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
+-->
+     <para>
+      Back-port 9.4-era memory-barrier code changes into 9.2 and 9.3 (Tom Lane)
+     </para>
+
+     <para>
+      These changes were not originally needed in pre-9.4 branches, but we
+      recently back-patched a fix that expected the barrier code to work
+      properly.  Only IA64 (when using icc), HPPA, and Alpha platforms are
+      affected.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce the number of SysV semaphores used by a build configured with
+      <option>--disable-spinlocks</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Rename internal function <function>strtoi()</>
+      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      function (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix reporting of errors from <function>bind()</>
+      and <function>listen()</> system calls on Windows (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce verbosity of compiler output when building with Microsoft Visual
+      Studio (Christian Ullrich)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>putenv()</> to work properly with Visual Studio 2013
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      function (Christian Ullrich)
+     </para>
+
+     <para>
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      appropriate.  No live bug is known to exist here, but it seems like a
+      good idea to be careful.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016d
+      for DST law changes in Russia and Venezuela.  There are new zone
+      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      the fact that these regions now have different time zone histories from
+      adjacent regions.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-3-12">
   <title>Release 9.3.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2016-03-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-03-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.3.11.
@@ -92,7 +2567,7 @@
 
      <para>
       This dodges a portability problem on FreeBSD-derived platforms
-      (including OS X).
+      (including macOS).
      </para>
     </listitem>
 
@@ -223,10 +2698,10 @@
  <sect1 id="release-9-3-11">
   <title>Release 9.3.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2016-02-11</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-02-11</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.3.10.
@@ -846,10 +3321,10 @@
  <sect1 id="release-9-3-10">
   <title>Release 9.3.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-10-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-10-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.3.9.
@@ -1475,10 +3950,10 @@
  <sect1 id="release-9-3-9">
   <title>Release 9.3.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-06-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-06-12</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.3.8.
@@ -1624,10 +4099,10 @@
  <sect1 id="release-9-3-8">
   <title>Release 9.3.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-06-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-06-04</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.3.7.
@@ -1732,10 +4207,10 @@
  <sect1 id="release-9-3-7">
   <title>Release 9.3.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-05-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-05-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.3.6.
@@ -2301,7 +4776,7 @@
 
     <listitem>
      <para>
-      Silence some build warnings on OS X (Tom Lane)
+      Silence some build warnings on macOS (Tom Lane)
      </para>
     </listitem>
 
@@ -2322,10 +4797,10 @@
  <sect1 id="release-9-3-6">
   <title>Release 9.3.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-02-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-02-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.3.5.
@@ -3372,7 +5847,7 @@
 
     <listitem>
      <para>
-      Warn if OS X's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
@@ -4207,10 +6682,10 @@
  <sect1 id="release-9-3-5">
   <title>Release 9.3.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-07-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-07-24</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.3.4.
@@ -5023,7 +7498,7 @@
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on OS X (Tom Lane)
+      Fix linking of <application>libpython</> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -5327,10 +7802,10 @@
  <sect1 id="release-9-3-4">
   <title>Release 9.3.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-03-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-03-20</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.3.3.
@@ -5471,7 +7946,7 @@
 
      <para>
       This prevents scenarios wherein a pathological regular expression
-      could lock up a server process uninterruptably for a long time.
+      could lock up a server process uninterruptibly for a long time.
      </para>
     </listitem>
 
@@ -5789,10 +8264,10 @@
  <sect1 id="release-9-3-3">
   <title>Release 9.3.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2014-02-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2014-02-20</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.3.2.
@@ -7251,10 +9726,10 @@
  <sect1 id="release-9-3-2">
   <title>Release 9.3.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-12-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-12-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.3.1.
@@ -7730,10 +10205,10 @@
  <sect1 id="release-9-3-1">
   <title>Release 9.3.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2013-10-10</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2013-10-10</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.3.0.
@@ -7833,10 +10308,10 @@
  <sect1 id="release-9-3">
   <title>Release 9.3</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2013-09-09</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2013-09-09</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
@@ -9689,7 +12164,7 @@
 
       <listitem>
        <para>
-        Remove <filename>src/tool/backend</>, now that the content is on
+        Remove <filename>src/tools/backend</>, now that the content is on
         the <productname>PostgreSQL</> wiki (Bruce Momjian)
        </para>
       </listitem>
@@ -9990,7 +12465,7 @@
       <listitem>
        <para>
         Add <link linkend="docguide-toolsets">instructions</link> for setting
-        up the documentation tool chain on Mac <productname>OS X</>
+        up the documentation tool chain on <productname>macOS</>
         (Peter Eisentraut)
        </para>
       </listitem>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-9.4.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-9.4.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-9.4.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-9.4.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,2978 @@
 <!-- doc/src/sgml/release-9.4.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-4-13">
+  <title>Release 9.4.13</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-08-10</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.4.12.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.13</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.4.12,
+    see <xref linkend="release-9-4-12">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Further restrict visibility
+      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      protect passwords stored as user mapping options
+      (Noah Misch)
+     </para>
+
+     <para>
+      The fix for CVE-2017-7486 was incorrect: it allowed a user
+      to see the options in her own user mapping, even if she did not
+      have <literal>USAGE</> permission on the associated foreign server.
+      Such options might include a password that had been provided by the
+      server owner rather than the user herself.
+      Since <structname>information_schema.user_mapping_options</> does not
+      show the options in such cases, <structname>pg_user_mappings</>
+      should not either.
+      (CVE-2017-7547)
+     </para>
+
+     <para>
+      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      you will need to do the following:
+     </para>
+
+     <procedure>
+      <step>
+       <para>
+        Restart the postmaster after adding <literal>allow_system_table_mods
+        = true</> to <filename>postgresql.conf</>.  (In versions
+        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        configuration change, but you'll still need a restart.)
+       </para>
+      </step>
+
+      <step>
+       <para>
+        In <emphasis>each</> database of the cluster,
+        run the following commands as superuser:
+<programlisting>
+SET search_path = pg_catalog;
+CREATE OR REPLACE VIEW pg_user_mappings AS
+    SELECT
+        U.oid       AS umid,
+        S.oid       AS srvid,
+        S.srvname   AS srvname,
+        U.umuser    AS umuser,
+        CASE WHEN U.umuser = 0 THEN
+            'public'
+        ELSE
+            A.rolname
+        END AS usename,
+        CASE WHEN (U.umuser &lt;&gt; 0 AND A.rolname = current_user
+                     AND (pg_has_role(S.srvowner, 'USAGE')
+                          OR has_server_privilege(S.oid, 'USAGE')))
+                    OR (U.umuser = 0 AND pg_has_role(S.srvowner, 'USAGE'))
+                    OR (SELECT rolsuper FROM pg_authid WHERE rolname = current_user)
+                    THEN U.umoptions
+                 ELSE NULL END AS umoptions
+    FROM pg_user_mapping U
+         LEFT JOIN pg_authid A ON (A.oid = U.umuser) JOIN
+        pg_foreign_server S ON (U.umserver = S.oid);
+</programlisting>
+       </para>
+      </step>
+
+      <step>
+       <para>
+        Do not forget to include the <literal>template0</>
+        and <literal>template1</> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</>,
+        you'll need to temporarily make it accept connections.
+        In <productname>PostgreSQL</> 9.5 and later, you can use
+<programlisting>
+ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
+</programlisting>
+        and then after fixing <literal>template0</>, undo that with
+<programlisting>
+ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
+</programlisting>
+        In prior versions, instead use
+<programlisting>
+UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
+UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
+</programlisting>
+       </para>
+      </step>
+
+      <step>
+       <para>
+        Finally, remove the <literal>allow_system_table_mods</> configuration
+        setting, and again restart the postmaster.
+       </para>
+      </step>
+     </procedure>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow empty passwords in all password-based authentication methods
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <application>libpq</> ignores empty password specifications, and does
+      not transmit them to the server.  So, if a user's password has been
+      set to the empty string, it's impossible to log in with that password
+      via <application>psql</> or other <application>libpq</>-based
+      clients.  An administrator might therefore believe that setting the
+      password to empty is equivalent to disabling password login.
+      However, with a modified or non-<application>libpq</>-based client,
+      logging in could be possible, depending on which authentication
+      method is configured.  In particular the most common
+      method, <literal>md5</>, accepted empty passwords.
+      Change the server to reject empty passwords in all cases.
+      (CVE-2017-7546)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <function>lo_put()</> check for <literal>UPDATE</> privilege on
+      the target large object (Tom Lane, Michael Paquier)
+     </para>
+
+     <para>
+      <function>lo_put()</> should surely require the same permissions
+      as <function>lowrite()</>, but the check was missing, allowing any
+      user to change the data in a large object.
+      (CVE-2017-7548)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix concurrent locking of tuple update chains (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      If several sessions concurrently lock a tuple update chain with
+      nonconflicting lock modes using an old snapshot, and they all
+      succeed, it was possible for some of them to nonetheless fail (and
+      conclude there is no live tuple version) due to a race condition.
+      This had consequences such as foreign-key checks failing to see a
+      tuple that definitely exists but is being updated concurrently.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix potential data corruption when freezing a tuple whose XMAX is a
+      multixact with exactly one still-interesting member (Teodor Sigaev)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid integer overflow and ensuing crash when sorting more than one
+      billion tuples in-memory (Sergey Koposov)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, retry process creation if we fail to reserve the address
+      range for our shared memory in the new process (Tom Lane, Amit
+      Kapila)
+     </para>
+
+     <para>
+      This is expected to fix infrequent child-process-launch failures that
+      are probably due to interference from antivirus products.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability corruption of shared predicate-lock hash table
+      in Windows builds (Thomas Munro, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid logging clean closure of an SSL connection as though
+      it were a connection reset (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent sending SSL session tickets to clients (Tom Lane)
+     </para>
+
+     <para>
+      This fix prevents reconnection failures with ticket-aware client-side
+      SSL code.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"> on
+      Solaris (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix statistics collector to honor inquiry messages issued just after
+      a postmaster shutdown and immediate restart (Tom Lane)
+     </para>
+
+     <para>
+      Statistics inquiries issued within half a second of the previous
+      postmaster shutdown were effectively ignored.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that the statistics collector's receive buffer size is at
+      least 100KB (Tom Lane)
+     </para>
+
+     <para>
+      This reduces the risk of dropped statistics data on older platforms
+      whose default receive buffer size is less than that.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible creation of an invalid WAL segment when a standby is
+      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      record (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>walsender</> to exit promptly when client requests
+      shutdown (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      walsender processes (Petr Jelinek, Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent walsender-triggered panics during shutdown checkpoints
+      (Andres Freund, Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unnecessarily slow restarts of <application>walreceiver</>
+      processes due to race condition in postmaster (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
+-->
+     <para>
+      Fix logical decoding failure with very wide tuples (Andres Freund)
+     </para>
+
+     <para>
+      Logical decoding crashed on tuples that are wider than 64KB (after
+      compression, but with all data in-line).  The case arises only
+      when <literal>REPLICA IDENTITY FULL</> is enabled for a table
+      containing such tuples.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix leakage of small subtransactions spilled to disk during logical
+      decoding (Andres Freund)
+     </para>
+
+     <para>
+      This resulted in temporary files consuming excessive disk space.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce the work needed to build snapshots during creation of
+      logical-decoding slots (Andres Freund, Petr Jelinek)
+     </para>
+
+     <para>
+      The previous algorithm was infeasibly expensive on a server with a
+      lot of open transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition that could indefinitely delay creation of
+      logical-decoding slots (Andres Freund, Petr Jelinek)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce overhead in processing syscache invalidation events (Tom Lane)
+     </para>
+
+     <para>
+      This is particularly helpful for logical decoding, which triggers
+      frequent cache invalidation.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      to more than one element of a column that is of domain-over-array
+      type (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow window functions to be used in sub-<literal>SELECT</>s that
+      are within the arguments of an aggregate function (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Move autogenerated array types out of the way during
+      <command>ALTER ... RENAME</> (Vik Fearing)
+     </para>
+
+     <para>
+      Previously, we would rename a conflicting autogenerated array type
+      out of the way during <command>CREATE</>; this fix extends that
+      behavior to renaming operations.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly update dependency info when changing a datatype I/O
+      function's argument or return type from <type>opaque</> to the
+      correct type (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <command>CREATE TYPE</> updates I/O functions declared in this
+      long-obsolete style, but it forgot to record a dependency on the
+      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      function definitions behind.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce memory usage when <command>ANALYZE</> processes
+      a <type>tsvector</> column (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unnecessary precision loss and sloppy rounding when multiplying
+      or dividing <type>money</> values by integers or floats (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Tighten checks for whitespace in functions that parse identifiers,
+      such as <function>regprocedurein()</> (Tom Lane)
+     </para>
+
+     <para>
+      Depending on the prevailing locale, these functions could
+      misinterpret fragments of multibyte characters as whitespace.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use relevant <literal>#define</> symbols from Perl while
+      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+     </para>
+
+     <para>
+      This avoids portability problems, typically manifesting as
+      a <quote>handshake</> mismatch during library load, when working with
+      recent Perl versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      state properly after a failed connection attempt (Michael Paquier)
+     </para>
+
+     <para>
+      Failure to do this meant that when falling back from SSL to non-SSL
+      connections, a GSS/SASL failure in the SSL attempt would always cause
+      the non-SSL attempt to fail.  SSPI did not fail, but it leaked memory.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      is ended with a keyboard EOF signal and then another <command>COPY
+      FROM STDIN</> is attempted (Thomas Munro)
+     </para>
+
+     <para>
+      This misbehavior was observed on BSD-derived platforms (including
+      macOS), but not on most others.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> and <application>pg_restore</> to
+      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+     </para>
+
+     <para>
+      This prevents errors during dump/restore when a materialized view
+      refers to tables owned by a different user.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve <application>pg_dump</>/<application>pg_restore</>'s
+      reporting of error conditions originating in <application>zlib</>
+      (Vladimir Kunschikov, &Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> with the <option>--clean</> option to
+      drop event triggers as expected (Tom Lane)
+     </para>
+
+     <para>
+      It also now correctly assigns ownership of event triggers; before,
+      they were restored as being owned by the superuser running the
+      restore script.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      operator class (Daniel Gustafsson)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+     </para>
+
+     <para>
+      A compressed plain-text dump written to stdout would contain corrupt
+      data due to failure to put the file descriptor into binary mode.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_get_ruledef()</> to print correct output for
+      the <literal>ON SELECT</> rule of a view whose columns have been
+      renamed (Tom Lane)
+     </para>
+
+     <para>
+      In some corner cases, <application>pg_dump</> relies
+      on <function>pg_get_ruledef()</> to dump views, so that this error
+      could result in dump/reload failures.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of outer joins with empty constraints, such as the result
+      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of function expressions in the <literal>FROM</> clause in
+      cases where the expression does not deparse into something that looks
+      like a function call (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</> output to stdout on Windows
+      (Haribabu Kommi)
+     </para>
+
+     <para>
+      A backup written to stdout would contain corrupt data due to failure
+      to put the file descriptor into binary mode.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This condition could prevent upgraded standby servers from
+      reconnecting.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>postgres_fdw</>, re-establish connections to remote
+      servers after <command>ALTER SERVER</> or <command>ALTER USER
+      MAPPING</> commands (Kyotaro Horiguchi)
+     </para>
+
+     <para>
+      This ensures that option changes affecting connection parameters will
+      be applied promptly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>postgres_fdw</>, allow cancellation of remote
+      transaction control commands (Robert Haas, Rafia Sabih)
+     </para>
+
+     <para>
+      This change allows us to quickly escape a wait for an unresponsive
+      remote server in many more cases than previously.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Increase <literal>MAX_SYSCACHE_CALLBACKS</> to provide more room for
+      extensions (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      shared libraries with gcc (Tom Lane)
+     </para>
+
+     <para>
+      This supports larger extension libraries on platforms where it makes
+      a difference.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unescaped-braces issue in our build scripts for Microsoft MSVC,
+      to avoid a warning or error from recent Perl versions (Andrew
+      Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, handle the case where the <application>openssl</>
+      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, add proper include path for <application>libxml2</>
+      header files (Andrew Dunstan)
+     </para>
+
+     <para>
+      This fixes a former need to move things around in standard Windows
+      installations of <application>libxml2</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, recognize a Tcl library that is
+      named <filename>tcl86.lib</> (Noah Misch)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, honor <literal>PROVE_FLAGS</> settings
+      on <filename>vcregress.pl</>'s command line (Andrew Dunstan)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-4-12">
+  <title>Release 9.4.12</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-05-11</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.4.11.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.12</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are using third-party replication tools that depend
+    on <quote>logical decoding</>, see the fourth changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.4.11,
+    see <xref linkend="release-9-4-11">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Restrict visibility
+      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      protect passwords stored as user mapping options
+      (Michael Paquier, Feike Steenbergen)
+     </para>
+
+     <para>
+      The previous coding allowed the owner of a foreign server object,
+      or anyone he has granted server <literal>USAGE</> permission to,
+      to see the options for all user mappings associated with that server.
+      This might well include passwords for other users.
+      Adjust the view definition to match the behavior of
+      <structname>information_schema.user_mapping_options</>, namely that
+      these options are visible to the user being mapped, or if the mapping
+      is for <literal>PUBLIC</literal> and the current user is the server
+      owner, or if the current user is a superuser.
+      (CVE-2017-7486)
+     </para>
+
+     <para>
+      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      follow the corrected procedure shown in the changelog entry for
+      CVE-2017-7547, in <xref linkend="release-9-4-13">.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent exposure of statistical information via leaky operators
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      Some selectivity estimation functions in the planner will apply
+      user-defined operators to values obtained
+      from <structname>pg_statistic</>, such as most common values and
+      histogram entries.  This occurs before table permissions are checked,
+      so a nefarious user could exploit the behavior to obtain these values
+      for table columns he does not have permission to read.  To fix,
+      fall back to a default estimate if the operator's implementation
+      function is not certified leak-proof and the calling user does not have
+      permission to read the table column whose statistics are needed.
+      At least one of these criteria is satisfied in most cases in practice.
+      (CVE-2017-7484)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Restore <application>libpq</>'s recognition of
+      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+     </para>
+
+     <para>
+      Processing of this environment variable was unintentionally dropped
+      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      This creates a security hazard, since users might be relying on the
+      environment variable to force SSL-encrypted connections, but that
+      would no longer be guaranteed.  Restore handling of the variable,
+      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      breaking configurations that work correctly with post-9.3 code.
+      (CVE-2017-7485)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possibly-invalid initial snapshot during logical decoding
+      (Petr Jelinek, Andres Freund)
+     </para>
+
+     <para>
+      The initial snapshot created for a logical decoding replication slot
+      was potentially incorrect.  This could cause third-party tools that
+      use logical decoding to copy incomplete/inconsistent initial data.
+      This was more likely to happen if the source server was busy at the
+      time of slot creation, or if another logical slot already existed.
+     </para>
+
+     <para>
+      If you are using a replication tool that depends on logical decoding,
+      and it should have copied a nonempty data set at the start of
+      replication, it is advisable to recreate the replica after
+      installing this update, or to verify its contents against the source
+      server.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      (Robert Haas, Michael Paquier)
+     </para>
+
+     <para>
+      This could result in an unlogged index being set to an invalid state
+      after a crash and restart.  Such a problem would persist until the
+      index was dropped and rebuilt.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      when a standby server replays a prepared but uncommitted two-phase
+      transaction (Tom Lane)
+     </para>
+
+     <para>
+      In most cases this turned out to have no visible ill effects, but in
+      corner cases it could result in circular references
+      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in queries that examine rows modified by the two-phase transaction.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possible crash in <application>walsender</> due to failure
+      to initialize a string buffer (Stas Kelvich, Fujii Masao)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix postmaster's handling of <function>fork()</> failure for a
+      background worker process (Tom Lane)
+     </para>
+
+     <para>
+      Previously, the postmaster updated portions of its state as though
+      the process had been launched successfully, resulting in subsequent
+      confusion.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure parsing of queries in extension scripts sees the results of
+      immediately-preceding DDL (Julien Rouhaud, Tom Lane)
+     </para>
+
+     <para>
+      Due to lack of a cache flush step between commands in an extension
+      script file, non-utility queries might not see the effects of an
+      immediately preceding catalog change, such as <command>ALTER TABLE
+      ... RENAME</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
+      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+     </para>
+
+     <para>
+      The command failed if the calling user did not currently have
+      <literal>CREATE</> privilege for the tablespace containing the index.
+      That behavior seems unhelpful, so skip the check, allowing the
+      index to be rebuilt where it is.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</>
+      (Amit Langote)
+     </para>
+
+     <para>
+      This fix prevents unwanted <quote>constraint does not exist</> failures
+      when no matching constraint is present in the child tables.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>VACUUM</> to account properly for pages that could not
+      be scanned due to conflicting page pins (Andrew Gierth)
+     </para>
+
+     <para>
+      This tended to lead to underestimation of the number of tuples in
+      the table.  In the worst case of a small heavily-contended
+      table, <command>VACUUM</> could incorrectly report that the table
+      contained no tuples, leading to very bad planning choices.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that bulk-tuple-transfer loops within a hash join are
+      interruptible by query cancel requests (Tom Lane, Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix integer-overflow problems in <type>interval</> comparison (Kyotaro
+      Horiguchi, Tom Lane)
+     </para>
+
+     <para>
+      The comparison operators for type <type>interval</> could yield wrong
+      answers for intervals larger than about 296000 years.  Indexes on
+      columns containing such large values should be reindexed, since they
+      may be corrupt.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>cursor_to_xml()</> to produce valid output
+      with <replaceable>tableforest</> = false
+      (Thomas Munro, Peter Eisentraut)
+     </para>
+
+     <para>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      element.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix roundoff problems in <function>float8_timestamptz()</>
+      and <function>make_interval()</> (Tom Lane)
+     </para>
+
+     <para>
+      These functions truncated, rather than rounded, when converting a
+      floating-point value to integer microseconds; that could cause
+      unexpectedly off-by-one results.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve performance of <structname>pg_timezone_names</> view
+      (Tom Lane, David Rowley)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce memory management overhead for contexts containing many large
+      blocks (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sloppy handling of corner-case errors from <function>lseek()</>
+      and <function>close()</> (Tom Lane)
+     </para>
+
+     <para>
+      Neither of these system calls are likely to fail in typical situations,
+      but if they did, <filename>fd.c</> could get quite confused.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect check for whether postmaster is running as a Windows
+      service (Michael Paquier)
+     </para>
+
+     <para>
+      This could result in attempting to write to the event log when that
+      isn't accessible, so that no logging happens at all.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
+      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix a double-free error when processing dollar-quoted string literals
+      in <application>ecpg</> (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      comments and security labels of some types of database objects
+      (Giuseppe Broccolo, Tom Lane)
+     </para>
+
+     <para>
+      In simple cases this caused no ill effects; but for example, a
+      schema-selective restore might omit comments it should include, because
+      they were not marked as belonging to the schema of their associated
+      object.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      when SQL object names contain newlines (Tom Lane)
+     </para>
+
+     <para>
+      Replace newlines by spaces, which is sufficient to make the output
+      valid for <literal>pg_restore -L</>'s purposes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to transfer comments and security labels
+      attached to <quote>large objects</> (blobs) (Stephen Frost)
+     </para>
+
+     <para>
+      Previously, blobs were correctly transferred to the new database, but
+      any comments or security labels attached to them were lost.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve error handling
+      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      function (Noah Misch)
+     </para>
+
+     <para>
+      Notably, it failed to detect errors reported
+      by <function>fclose()</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      connection when establishing a new unnamed connection (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      expressions (Tom Lane)
+     </para>
+
+     <para>
+      In some cases it would produce a broken data structure that could never
+      match anything, leading to GIN or GiST indexscans that use a trigram
+      index not finding any matches to the regular expression.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/postgres_fdw</>,
+      transmit query cancellation requests to the remote server
+      (Michael Paquier, Etsuro Fujita)
+     </para>
+
+     <para>
+      Previously, a local query cancellation request did not cause an
+      already-sent remote query to terminate early.  This is a back-patch
+      of work originally done for 9.6.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_4_STABLE [bb132cddf] 2017-04-15 20:16:03 -0400
+Branch: REL9_3_STABLE [fbfeceb25] 2017-04-17 12:51:40 -0400
+Branch: REL9_2_STABLE [58384149b] 2017-04-17 12:51:40 -0400
+Branch: REL9_3_STABLE [4e91330da] 2017-04-17 13:52:42 -0400
+Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
+-->
+     <para>
+      Support OpenSSL 1.1.0 (Heikki Linnakangas, Andreas Karlsson, Tom Lane)
+     </para>
+
+     <para>
+      This is a back-patch of work previously done in newer branches;
+      it's needed since many platforms are adopting newer OpenSSL versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support Tcl 8.6 in MSVC builds (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017b
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes a bug affecting some DST transitions in January 2038.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2017b
+      for DST law changes in Chile, Haiti, and Mongolia, plus historical
+      corrections for Ecuador, Kazakhstan, Liberia, and Spain.
+      Switch to numeric abbreviations for numerous time zones in South
+      America, the Pacific and Indian oceans, and some Asian and Middle
+      Eastern countries.
+     </para>
+
+     <para>
+      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <structname>pg_timezone_names</>
+      view nor used for output.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use correct daylight-savings rules for POSIX-style time zone names
+      in MSVC builds (David Rowley)
+     </para>
+
+     <para>
+      The Microsoft MSVC build scripts neglected to install
+      the <filename>posixrules</> file in the timezone directory tree.
+      This resulted in the timezone code falling back to its built-in
+      rule about what DST behavior to assume for a POSIX-style time zone
+      name.  For historical reasons that still corresponds to the DST rules
+      the USA was using before 2007 (i.e., change on first Sunday in April
+      and last Sunday in October).  With this fix, a POSIX-style zone name
+      will use the current and historical DST transition dates of
+      the <literal>US/Eastern</> zone.  If you don't want that, remove
+      the <filename>posixrules</> file, or replace it with a copy of some
+      other zone file (see <xref linkend="datatype-timezones">).  Note that
+      due to caching, you may need to restart the server to get such changes
+      to take effect.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-4-11">
+  <title>Release 9.4.11</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-02-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.4.10.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.11</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted indexes.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.4.10,
+    see <xref linkend="release-9-4-10">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix a race condition that could cause indexes built
+      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      (Pavan Deolasee, Tom Lane)
+     </para>
+
+     <para>
+      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      that depends on a column not previously indexed, then rows
+      updated by transactions that ran concurrently with
+      the <command>CREATE INDEX</> command could have received incorrect
+      index entries.  If you suspect this may have happened, the most
+      reliable solution is to rebuild affected indexes after installing
+      this update.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that the special snapshot used for catalog scans is not
+      invalidated by premature data pruning (Tom Lane)
+     </para>
+
+     <para>
+      Backends failed to account for this snapshot when advertising their
+      oldest xmin, potentially allowing concurrent vacuuming operations to
+      remove data that was still needed.  This led to transient failures
+      along the lines of <quote>cache lookup failed for relation 1255</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      unlogged table (Michael Paquier)
+     </para>
+
+     <para>
+      Previously, this was skipped when <xref linkend="guc-wal-level">
+      = <literal>minimal</>, but actually it's necessary even in that case
+      to ensure that the unlogged table is properly reset to empty after a
+      crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce interlocking on standby servers during the replay of btree
+      index vacuuming operations (Simon Riggs)
+     </para>
+
+     <para>
+      This change avoids substantial replication delays that sometimes
+      occurred while replaying such operations.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      If the stats collector dies during hot standby, restart it (Takayuki
+      Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that hot standby feedback works correctly when it's enabled at
+      standby server start (Ants Aasma, Craig Ringer)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for interrupts while hot standby is waiting for a conflicting
+      query (Simon Riggs)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid constantly respawning the autovacuum launcher in a corner case
+      (Amit Khandekar)
+     </para>
+
+     <para>
+      This fix avoids problems when autovacuum is nominally off and there
+      are some tables that require freezing, but all such tables are
+      already being processed by autovacuum workers.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix check for when an extension member object can be dropped (Tom Lane)
+     </para>
+
+     <para>
+      Extension upgrade scripts should be able to drop member objects,
+      but this was disallowed for serial-column sequences, and possibly
+      other cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make sure <command>ALTER TABLE</> preserves index tablespace
+      assignments when rebuilding indexes (Tom Lane, Michael Paquier)
+     </para>
+
+     <para>
+      Previously, non-default settings
+      of <xref linkend="guc-default-tablespace"> could result in broken
+      indexes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect updating of trigger function properties when changing a
+      foreign-key constraint's deferrability properties with <command>ALTER
+      TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+     </para>
+
+     <para>
+      This led to odd failures during subsequent exercise of the foreign
+      key, as the triggers were fired at the wrong times.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent dropping a foreign-key constraint if there are pending
+      trigger events for the referenced relation (Tom Lane)
+     </para>
+
+     <para>
+      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
+      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix processing of OID column when a table with OIDs is associated to
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      Langote)
+     </para>
+
+     <para>
+      The OID column should be treated the same as regular user columns in
+      this case, but it wasn't, leading to odd behavior in later
+      inheritance changes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>CREATE OR REPLACE VIEW</> to update the view query
+      before attempting to apply the new view options (Dean Rasheed)
+     </para>
+
+     <para>
+      Previously the command would fail if the new options were
+      inconsistent with the old view definition.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Report correct object identity during <command>ALTER TEXT SEARCH
+      CONFIGURATION</> (Artur Zakirov)
+     </para>
+
+     <para>
+      The wrong catalog OID was reported to extensions such as logical
+      decoding.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for serializability conflicts before reporting
+      constraint-violation failures (Thomas Munro)
+     </para>
+
+     <para>
+      When using serializable transaction isolation, it is desirable
+      that any error due to concurrent transactions should manifest
+      as a serialization failure, thereby cueing the application that
+      a retry might succeed.  Unfortunately, this does not reliably
+      happen for duplicate-key failures caused by concurrent insertions.
+      This change ensures that such an error will be reported as a
+      serialization error if the application explicitly checked for
+      the presence of a conflicting key (and did not find it) earlier
+      in the transaction.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
+      an <command>UPDATE</> source expression (Tom Lane)
+     </para>
+
+     <para>
+      This led to <quote>UPDATE target count mismatch --- internal
+      error</>.  Now the syntax is understood as a whole-row variable,
+      as it would be in other contexts.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that column typmods are determined accurately for
+      multi-row <literal>VALUES</> constructs (Tom Lane)
+     </para>
+
+     <para>
+      This fixes problems occurring when the first value in a column has a
+      determinable typmod (e.g., length for a <type>varchar</> value) but
+      later values don't share the same limit.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Throw error for an unfinished Unicode surrogate pair at the end of a
+      Unicode string (Tom Lane)
+     </para>
+
+     <para>
+      Normally, a Unicode surrogate leading character must be followed by a
+      Unicode surrogate trailing character, but the check for this was
+      missed if the leading character was the last character in a Unicode
+      string literal (<literal>U&amp;'...'</>) or Unicode identifier
+      (<literal>U&amp;"..."</>).
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that a purely negative text search query, such
+      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+     </para>
+
+     <para>
+      Such matches were found by GIN index searches, but not by sequential
+      scans or GiST index searches.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      subtree with an empty query (Artur Zakirov)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      The overrun occurred only if the input consisted entirely of single
+      quotes and/or backslashes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent multiple calls of <function>pg_start_backup()</>
+      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Paquier)
+     </para>
+
+     <para>
+      This avoids an assertion failure, and possibly worse things, if
+      someone tries to run these functions in parallel.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      that aren't really no-ops (Tom Lane)
+     </para>
+
+     <para>
+      In some cases, a cast that should result in zeroing out
+      low-order <type>interval</> fields was mistakenly deemed to be a
+      no-op and discarded.  An example is that casting from <type>INTERVAL
+      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that cached plans are invalidated by changes in foreign-table
+      options (Amit Langote, Etsuro Fujita, Ashutosh Bapat)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      that use built-in functions (Stephen Frost)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_restore</> with <option>--create --if-exists</>
+      to behave more sanely if an archive contains
+      unrecognized <command>DROP</> commands (Tom Lane)
+     </para>
+
+     <para>
+      This doesn't fix any live bug, but it may improve the behavior in
+      future if <application>pg_restore</> is used with an archive
+      generated by a later <application>pg_dump</> version.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</>'s rate limiting in the presence of
+      slow I/O (Antonin Houska)
+     </para>
+
+     <para>
+      If disk I/O was transiently much slower than the specified rate
+      limit, the calculation overflowed, effectively disabling the rate
+      limit for the rest of the run.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</>'s handling of
+      symlinked <filename>pg_stat_tmp</> and <filename>pg_replslot</>
+      subdirectories (Magnus Hagander, Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible <application>pg_basebackup</> failure on standby
+      server when including WAL files (Amit Kapila, Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that the Python exception objects we create for PL/Python are
+      properly reference-counted (Rafa de la Torre, Tom Lane)
+     </para>
+
+     <para>
+      This avoids failures if the objects are used after a Python garbage
+      collection cycle has occurred.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      as a column name (Tom Lane)
+     </para>
+
+     <para>
+      This matches the (previously undocumented) behavior of
+      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
+      namely that a magic <literal>.tupno</> column is inserted only if
+      there isn't a real column named that.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      even on Unix (Vik Fearing)
+     </para>
+
+     <para>
+      This change simplifies use of the same password file across Unix and
+      Windows machines.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      name that ends with a dot (Takayuki Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>psql</>, treat an empty or all-blank setting of
+      the <envar>PAGER</> environment variable as meaning <quote>no
+      pager</> (Tom Lane)
+     </para>
+
+     <para>
+      Previously, such a setting caused output intended for the pager to
+      vanish entirely.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve <filename>contrib/dblink</>'s reporting of
+      low-level <application>libpq</> errors, such as out-of-memory
+      (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Teach <filename>contrib/dblink</> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      the source of connection options (Corey Huinker)
+     </para>
+
+     <para>
+      Previously, if the foreign server object had options that were not
+      also <application>libpq</> connection options, an error occurred.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, ensure that environment variable changes are propagated
+      to DLLs built with debug options (Christian Ullrich)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2016j
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues, most notably that timezone data
+      installation failed if the target directory didn't support hard
+      links.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016j
+      for DST law changes in northern Cyprus (adding a new zone
+      Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
+      and Antarctica/Casey.
+      Historical corrections for Italy, Kazakhstan, Malta, and Palestine.
+      Switch to preferring numeric zone abbreviations for Tonga.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-4-10">
+  <title>Release 9.4.10</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-10-27</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.4.9.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.10</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted free space maps.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.4.6,
+    see <xref linkend="release-9-4-6">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix WAL-logging of truncation of relation free space maps and
+      visibility maps (Pavan Deolasee, Heikki Linnakangas)
+     </para>
+
+     <para>
+      It was possible for these files to not be correctly restored during
+      crash recovery, or to be written incorrectly on a standby server.
+      Bogus entries in a free space map could lead to attempts to access
+      pages that have been truncated away from the relation itself, typically
+      producing errors like <quote>could not read block <replaceable>XXX</>:
+      read only 0 of 8192 bytes</quote>.  Checksum failures in the
+      visibility map are also possible, if checksumming is enabled.
+     </para>
+
+     <para>
+      Procedures for determining whether there is a problem and repairing it
+      if so are discussed at
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect creation of GIN index WAL records on big-endian machines
+      (Tom Lane)
+     </para>
+
+     <para>
+      The typical symptom was <quote>unexpected GIN leaf action</> errors
+      during WAL replay.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>SELECT FOR UPDATE/SHARE</> to correctly lock tuples that
+      have been updated by a subsequently-aborted transaction
+      (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      In 9.5 and later, the <command>SELECT</> would sometimes fail to
+      return such tuples at all.  A failure has not been proven to occur in
+      earlier releases, but might be possible with concurrent updates.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix EvalPlanQual rechecks involving CTE scans (Tom Lane)
+     </para>
+
+     <para>
+      The recheck would always see the CTE as returning no rows, typically
+      leading to failure to update rows that were recently updated.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix improper repetition of previous results from hashed aggregation in
+      a subquery (Andrew Gierth)
+     </para>
+
+     <para>
+      The test to see if we can reuse a previously-computed hash table of
+      the aggregate state values neglected the possibility of an outer query
+      reference appearing in an aggregate argument expression.  A change in
+      the value of such a reference should lead to recalculating the hash
+      table, but did not.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix query-lifespan memory leak in a bulk <command>UPDATE</> on a table
+      with a <literal>PRIMARY KEY</> or <literal>REPLICA IDENTITY</> index
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>EXPLAIN</> to emit valid XML when
+      <xref linkend="guc-track-io-timing"> is on (Markus Winand)
+     </para>
+
+     <para>
+      Previously the XML output-format option produced syntactically invalid
+      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Suppress printing of zeroes for unmeasured times
+      in <command>EXPLAIN</> (Maksim Milyutin)
+     </para>
+
+     <para>
+      Certain option combinations resulted in printing zero values for times
+      that actually aren't ever measured in that combination.  Our general
+      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      do that consistently in all cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      table lock so that it can truncate the table (Simon Riggs)
+     </para>
+
+     <para>
+      The timeout was meant to be 50 milliseconds, but it was actually only
+      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      much more easily than intended.  Set it to the intended value.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      creating or altering a table (Tom Lane, Amit Langote)
+     </para>
+
+     <para>
+      Allow identical <literal>CHECK</> constraints to be added to a parent
+      and child table in either order.  Prevent merging of a valid
+      constraint from the parent table with a <literal>NOT VALID</>
+      constraint on the child.  Likewise, prevent merging of a <literal>NO
+      INHERIT</> child constraint with an inherited constraint.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove artificial restrictions on the values accepted
+      by <function>numeric_in()</> and <function>numeric_recv()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      We allow numeric values up to the limit of the storage format (more
+      than <literal>1e100000</>), so it seems fairly pointless
+      that <function>numeric_in()</> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      reject more than 1000 digits in an input value.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid very-low-probability data corruption due to testing tuple
+      visibility without holding buffer lock (Thomas Munro, Peter Geoghegan,
+      Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix logical WAL decoding to work properly when a subtransaction's WAL
+      output is large enough to spill to disk (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
+-->
+     <para>
+      Fix buffer overread in logical WAL decoding (Tom Lane)
+     </para>
+
+     <para>
+      Logical decoding of a tuple update record read 23 bytes too many,
+      which was usually harmless but with very bad luck could result in a
+      crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix file descriptor leakage when truncating a temporary relation of
+      more than 1GB (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow starting a standalone backend with <literal>standby_mode</>
+      turned on (Michael Paquier)
+     </para>
+
+     <para>
+      This can't do anything useful, since there will be no WAL receiver
+      process to fetch more WAL data; and it could result in misbehavior
+      in code that wasn't designed with this situation in mind.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly initialize replication slot state when recycling a
+      previously-used slot (Michael Paquier)
+     </para>
+
+     <para>
+      This failure to reset all of the fields of the slot could
+      prevent <command>VACUUM</> from removing dead tuples.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Round shared-memory allocation request to a multiple of the actual
+      huge page size when attempting to use huge pages on Linux (Tom Lane)
+     </para>
+
+     <para>
+      This avoids possible failures during <function>munmap()</> on systems
+      with atypical default huge page sizes.  Except in crash-recovery
+      cases, there were no ill effects other than a log message.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use a more random value for the dynamic shared memory control
+      segment's ID (Robert Haas, Tom Lane)
+     </para>
+
+     <para>
+      Previously, the same value would be chosen every time, because it was
+      derived from <function>random()</> but <function>srandom()</> had not
+      yet been called.  While relatively harmless, this was not the intended
+      behavior.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, retry creation of the dynamic shared memory control
+      segment after an access-denied error (Kyotaro Horiguchi, Amit Kapila)
+     </para>
+
+     <para>
+      Windows sometimes returns <literal>ERROR_ACCESS_DENIED</> rather
+      than <literal>ERROR_ALREADY_EXISTS</> when there is an existing
+      segment.  This led to postmaster startup failure due to believing that
+      the former was an unrecoverable error.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't try to share SSL contexts across multiple connections
+      in <application>libpq</> (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This led to assorted corner-case bugs, particularly when trying to use
+      different SSL parameters for different connections.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+     </para>
+
+     <para>
+      The reported problem involved leaking an error report
+      during <function>PQreset()</>, but there might be related cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      options work consistently with our other executables (Haribabu Kommi)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pgbench</>'s calculation of average latency
+      (Fabien Coelho)
+     </para>
+
+     <para>
+      The calculation was incorrect when there were <literal>\sleep</>
+      commands in the script, or when the test duration was specified in
+      number of transactions rather than total time.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, never dump range constructor functions
+      (Tom Lane)
+     </para>
+
+     <para>
+      This oversight led to <application>pg_upgrade</> failures with
+      extensions containing range types, due to duplicate creation of the
+      constructor functions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_xlogdump</>, retry opening new WAL segments when
+      using <option>--follow</> option (Magnus Hagander)
+     </para>
+
+     <para>
+      This allows for a possible delay in the server's creation of the next
+      segment.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_xlogdump</> to cope with a WAL file that begins
+      with a continuation record spanning more than one page (Pavan
+      Deolasee)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/pg_buffercache</> to work
+      when <varname>shared_buffers</> exceeds 256GB (KaiGai Kohei)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
+      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      (Daniel Gustafsson)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Install TAP test infrastructure so that it's available for extension
+      testing (Craig Ringer)
+     </para>
+
+     <para>
+      When <productname>PostgreSQL</> has been configured
+      with <option>--enable-tap-tests</>, <quote>make install</> will now
+      install the Perl support files for TAP testing where PGXS can find
+      them.  This allows non-core extensions to
+      use <literal>$(prove_check)</> without extra tests.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, include <application>pg_recvlogical</> in a
+      client-only installation (MauMau)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update Windows time zone mapping to recognize some time zone names
+      added in recent Windows versions (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent failure of obsolete dynamic time zone abbreviations (Tom Lane)
+     </para>
+
+     <para>
+      If a dynamic time zone abbreviation does not match any entry in the
+      referenced time zone, treat it as equivalent to the time zone name.
+      This avoids unexpected failures when IANA removes abbreviations from
+      their time zone database, as they did in <application>tzdata</>
+      release 2016f and seem likely to do again in the future.  The
+      consequences were not limited to not recognizing the individual
+      abbreviation; any mismatch caused
+      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016h
+      for DST law changes in Palestine and Turkey, plus historical
+      corrections for Turkey and some regions of Russia.
+      Switch to numeric abbreviations for some time zones in Antarctica,
+      the former Soviet Union, and Sri Lanka.
+     </para>
+
+     <para>
+      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <structname>pg_timezone_names</>
+      view nor used for output.
+     </para>
+
+     <para>
+      In this update, <literal>AMT</> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-4-9">
+  <title>Release 9.4.9</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-08-11</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.4.8.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.9</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.4.6,
+    see <xref linkend="release-9-4-6">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix possible mis-evaluation of
+      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      Linnakangas, Michael Paquier, Tom Lane)
+     </para>
+
+     <para>
+      A <literal>CASE</> expression appearing within the test value
+      subexpression of another <literal>CASE</> could become confused about
+      whether its own test value was null or not.  Also, inlining of a SQL
+      function implementing the equality operator used by
+      a <literal>CASE</> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</> expression in the
+      SQL function's body.  If the test values were of different data
+      types, a crash might result; moreover such situations could be abused
+      to allow disclosure of portions of server memory.  (CVE-2016-5423)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix client programs' handling of special characters in database and
+      role names (Noah Misch, Nathan Bossart, Michael Paquier)
+     </para>
+
+     <para>
+      Numerous places in <application>vacuumdb</> and other client programs
+      could become confused by database and role names containing double
+      quotes or backslashes.  Tighten up quoting rules to make that safe.
+      Also, ensure that when a conninfo string is used as a database name
+      parameter to these programs, it is correctly treated as such throughout.
+     </para>
+
+     <para>
+      Fix handling of paired double quotes
+      in <application>psql</>'s <command>\connect</>
+      and <command>\password</> commands to match the documentation.
+     </para>
+
+     <para>
+      Introduce a new <option>-reuse-previous</> option
+      in <application>psql</>'s <command>\connect</> command to allow
+      explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether
+      the database name looks like a conninfo string, as before.)  This
+      allows secure handling of database names containing special
+      characters in <application>pg_dumpall</> scripts.
+     </para>
+
+     <para>
+      <application>pg_dumpall</> now refuses to deal with database and role
+      names containing carriage returns or newlines, as it seems impractical
+      to quote those characters safely on Windows.  In future we may reject
+      such names on the server side, but that step has not been taken yet.
+     </para>
+
+     <para>
+      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute
+      commands with superuser privileges the next time a superuser
+      executes <application>pg_dumpall</> or other routine maintenance
+      operations.  (CVE-2016-5424)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
+      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+     </para>
+
+     <para>
+      The SQL standard specifies that <literal>IS NULL</> should return
+      TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
+      NULL</> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      The core executor got this right, but certain planner optimizations
+      treated the test as recursive (thus producing TRUE in both cases),
+      and <filename>contrib/postgres_fdw</> could produce remote queries
+      that misbehaved similarly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make the <type>inet</> and <type>cidr</> data types properly reject
+      IPv6 addresses with too many colon-separated fields (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent crash in <function>close_ps()</>
+      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      for NaN input coordinates (Tom Lane)
+     </para>
+
+     <para>
+      Make it return NULL instead of crashing.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possible crash in <function>pg_get_expr()</> when inconsistent
+      values are passed to it (Michael Paquier, Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix several one-byte buffer over-reads in <function>to_number()</>
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      In several cases the <function>to_number()</> function would read one
+      more character than it should from the input string.  There is a
+      small chance of a crash, if the input happens to be adjacent to the
+      end of memory.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Do not run the planner on the query contained in <literal>CREATE
+      MATERIALIZED VIEW</> or <literal>CREATE TABLE AS</>
+      when <literal>WITH NO DATA</> is specified (Michael Paquier,
+      Tom Lane)
+     </para>
+
+     <para>
+      This avoids some unnecessary failure conditions, for example if a
+      stable function invoked by the materialized view depends on a table
+      that doesn't exist yet.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unsafe intermediate state during expensive paths
+      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+     </para>
+
+     <para>
+      Previously, these cases locked the target tuple (by setting its XMAX)
+      but did not WAL-log that action, thus risking data integrity problems
+      if the page were spilled to disk and then a database crash occurred
+      before the tuple update could be completed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix hint bit update during WAL replay of row locking operations
+      (Andres Freund)
+     </para>
+
+     <para>
+      The only known consequence of this problem is that row locks held by
+      a prepared, but uncommitted, transaction might fail to be enforced
+      after a crash and restart.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unnecessary <quote>could not serialize access</> errors when
+      acquiring <literal>FOR KEY SHARE</> row locks in serializable mode
+      (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid crash in <literal>postgres -C</> when the specified variable
+      has a null string value (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible loss of large subtransactions in logical decoding
+      (Petru-Florin Mihancea)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix failure of logical decoding when a subtransaction contains no
+      actual changes (Marko Tiikkaja, Andrew Gierth)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that backends see up-to-date statistics for shared catalogs
+      (Tom Lane)
+     </para>
+
+     <para>
+      The statistics collector failed to update the statistics file for
+      shared catalogs after a request from a regular backend.  This problem
+      was partially masked because the autovacuum launcher regularly makes
+      requests that did cause such updates; however, it became obvious with
+      autovacuum disabled.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid redundant writes of the statistics files when multiple
+      backends request updates close together (Tom Lane, Tomas Vondra)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid consuming a transaction ID during <command>VACUUM</>
+      (Alexander Korotkov)
+     </para>
+
+     <para>
+      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      assigned to the current transaction.  Normally this is negligible,
+      but if one is up against the XID wraparound limit, consuming more
+      XIDs during anti-wraparound vacuums is a very bad thing.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: REL9_4_STABLE [7a0f09da7] 2016-05-25 19:39:49 -0400
+Branch: REL9_3_STABLE [6537a48c5] 2016-05-25 19:39:49 -0400
+Branch: REL9_2_STABLE [294509ea9] 2016-05-25 19:39:49 -0400
+Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
+-->
+     <para>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      (Simon Riggs, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      result in unnecessary cancellations of queries on its standby
+      servers.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent possible failure when vacuuming multixact IDs in an
+      installation that has been pg_upgrade'd from pre-9.3 (Andrew Gierth,
+      &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      The usual symptom of this bug is errors
+      like <quote>MultiXactId <replaceable>NNN</> has not been created
+      yet -- apparent wraparound</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      When a manual <command>ANALYZE</> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</> counter
+      (Tom Lane)
+     </para>
+
+     <para>
+      If we're only analyzing some columns, we should not prevent routine
+      auto-analyze from happening for the other columns.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      for a unique or nearly-unique column with many null entries (Tom
+      Lane)
+     </para>
+
+     <para>
+      The nulls could get counted as though they were themselves distinct
+      values, leading to serious planner misestimates in some types of
+      queries.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent autovacuum from starting multiple workers for the same shared
+      catalog (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Normally this isn't much of a problem because the vacuum doesn't take
+      long anyway; but in the case of a severely bloated catalog, it could
+      result in all but one worker uselessly waiting instead of doing
+      useful work on other tables.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid duplicate buffer lock release when abandoning a b-tree index
+      page deletion attempt (Tom Lane)
+     </para>
+
+     <para>
+      This mistake prevented <command>VACUUM</> from completing in some
+      cases involving corrupt b-tree indexes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent infinite loop in GiST index build for geometric columns
+      containing NaN component values (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/btree_gin</> to handle the smallest
+      possible <type>bigint</> value correctly (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Teach libpq to correctly decode server version from future servers
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      It's planned to switch to two-part instead of three-part server
+      version numbers for releases after 9.6.  Make sure
+      that <function>PQserverVersion()</> returns the correct value for
+      such cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      array elements (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      command (David Johnston, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve handling of <systemitem>SIGTERM</>/control-C in
+      parallel <application>pg_dump</> and <application>pg_restore</> (Tom
+      Lane)
+     </para>
+
+     <para>
+      Make sure that the worker processes will exit promptly, and also arrange
+      to send query-cancel requests to the connected backends, in case they
+      are doing something long-running such as a <command>CREATE INDEX</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix error reporting in parallel <application>pg_dump</>
+      and <application>pg_restore</> (Tom Lane)
+     </para>
+
+     <para>
+      Previously, errors reported by <application>pg_dump</>
+      or <application>pg_restore</> worker processes might never make it to
+      the user's console, because the messages went through the master
+      process, and there were various deadlock scenarios that would prevent
+      the master process from passing on the messages.  Instead, just print
+      everything to <literal>stderr</>.  In some cases this will result in
+      duplicate messages (for instance, if all the workers report a server
+      shutdown), but that seems better than no message.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that parallel <application>pg_dump</>
+      or <application>pg_restore</> on Windows will shut down properly
+      after an error (Kyotaro Horiguchi)
+     </para>
+
+     <para>
+      Previously, it would report the error, but then just sit until
+      manually stopped by the user.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_dump</> behave better when built without zlib
+      support (Kyotaro Horiguchi)
+     </para>
+
+     <para>
+      It didn't work right for parallel dumps, and emitted some rather
+      pointless warnings in other cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      specifying no compression (Fujii Masao)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix makefiles' rule for building AIX shared libraries to be safe for
+      parallel make (Noah Misch)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix TAP tests and MSVC scripts to work when build directory's path
+      name contains spaces (Michael Paquier, Kyotaro Horiguchi)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Be more predictable about reporting <quote>statement timeout</>
+      versus <quote>lock timeout</> (Tom Lane)
+     </para>
+
+     <para>
+      On heavily loaded machines, the regression tests sometimes failed due
+      to reporting <quote>lock timeout</> even though the statement timeout
+      should have occurred first.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make regression tests safe for Danish and Welsh locales (Jeff Janes,
+      Tom Lane)
+     </para>
+
+     <para>
+      Change some test data that triggered the unusual sorting rules of
+      these locales.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update our copy of the timezone code to match
+      IANA's <application>tzcode</> release 2016c (Tom Lane)
+     </para>
+
+     <para>
+      This is needed to cope with anticipated future changes in the time
+      zone data files.  It also fixes some corner-case bugs in coping with
+      unusual time zones.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016f
+      for DST law changes in Kemerovo and Novosibirsk, plus historical
+      corrections for Azerbaijan, Belarus, and Morocco.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-4-8">
+  <title>Release 9.4.8</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-05-12</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.4.7.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.8</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.4.6,
+    see <xref linkend="release-9-4-6">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      afterwards (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </para>
+
+     <para>
+      This change prevents problems when there are multiple connections
+      using OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      Failures have been reported specifically when a client application
+      uses SSL connections in <application>libpq</> concurrently with
+      SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
+      It's possible for similar problems to arise within the server as well,
+      if an extension module establishes an outgoing SSL connection.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      planner error with a full join enclosed in the right-hand side of a
+      left join (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect handling of equivalence-class tests in multilevel
+      nestloop plans (Tom Lane)
+     </para>
+
+     <para>
+      Given a three-or-more-way equivalence class of variables, such
+      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      some of the tests needed to enforce that all the variables are actually
+      equal, leading to join rows being output that didn't satisfy
+      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      were seldom selected in practice, so that this bug has gone undetected
+      for a long time.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix query-lifespan memory leak in GIN index scans (Julien Rouhaud)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix query-lifespan memory leak and potential index corruption hazard in
+      GIN index insertion (Tom Lane)
+     </para>
+
+     <para>
+      The memory leak would typically not amount to much in simple queries,
+      but it could be very substantial during a large GIN index build with
+      high <varname>maintenance_work_mem</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
+      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      These could advance off the end of the input string, causing subsequent
+      format codes to read garbage.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of rules and views in which the <replaceable>array</>
+      argument of a <literal><replaceable>value</> <replaceable>operator</>
+      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow newlines in <command>ALTER SYSTEM</> parameter values
+      (Tom Lane)
+     </para>
+
+     <para>
+      The configuration-file parser doesn't support embedded newlines in
+      string literals, so we mustn't allow them in values to be inserted
+      by <command>ALTER SYSTEM</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX</> to
+      work properly if an index on OID is selected (David Rowley)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash in logical decoding on alignment-picky platforms (Tom Lane,
+      Andres Freund)
+     </para>
+
+     <para>
+      The failure occurred only with a transaction large enough to spill to
+      disk and a primary-key change within that transaction.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid repeated requests for feedback from receiver while shutting down
+      walsender (Nick Cleaton)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_regress</> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+     </para>
+
+     <para>
+      This is for consistency with a behavior recently added
+      to <application>pg_ctl</>; it eases automated testing on slow machines.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to correctly restore extension
+      membership for operator families containing only one operator class
+      (Tom Lane)
+     </para>
+
+     <para>
+      In such a case, the operator family was restored into the new database,
+      but it was no longer marked as part of the extension.  This had no
+      immediate ill effects, but would cause later <application>pg_dump</>
+      runs to emit output that would cause (harmless) errors on restore.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to not fail when new-cluster TOAST rules
+      differ from old (Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_upgrade</> had special-case code to handle the
+      situation where the new <productname>PostgreSQL</> version thinks that
+      a table should have a TOAST table while the old version did not.  That
+      code was broken, so remove it, and instead do nothing in such cases;
+      there seems no reason to believe that we can't get along fine without
+      a TOAST table if that was okay according to the old version's rules.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce the number of SysV semaphores used by a build configured with
+      <option>--disable-spinlocks</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Rename internal function <function>strtoi()</>
+      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      function (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix reporting of errors from <function>bind()</>
+      and <function>listen()</> system calls on Windows (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce verbosity of compiler output when building with Microsoft Visual
+      Studio (Christian Ullrich)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>putenv()</> to work properly with Visual Studio 2013
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      function (Christian Ullrich)
+     </para>
+
+     <para>
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      appropriate.  No live bug is known to exist here, but it seems like a
+      good idea to be careful.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016d
+      for DST law changes in Russia and Venezuela.  There are new zone
+      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      the fact that these regions now have different time zone histories from
+      adjacent regions.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-4-7">
   <title>Release 9.4.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2016-03-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-03-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.4.6.
@@ -144,7 +3109,7 @@
 
      <para>
       This dodges a portability problem on FreeBSD-derived platforms
-      (including OS X).
+      (including macOS).
      </para>
     </listitem>
 
@@ -275,10 +3240,10 @@
  <sect1 id="release-9-4-6">
   <title>Release 9.4.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2016-02-11</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-02-11</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.4.5.
@@ -1372,10 +4337,10 @@
  <sect1 id="release-9-4-5">
   <title>Release 9.4.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-10-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-10-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.4.4.
@@ -2895,10 +5860,10 @@
  <sect1 id="release-9-4-4">
   <title>Release 9.4.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-06-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-06-12</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.4.3.
@@ -3076,10 +6041,10 @@
  <sect1 id="release-9-4-3">
   <title>Release 9.4.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-06-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-06-04</para>
+  </formalpara>
 
   <para>
    This release contains a small number of fixes from 9.4.2.
@@ -3219,10 +6184,10 @@
  <sect1 id="release-9-4-2">
   <title>Release 9.4.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-05-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-05-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.4.1.
@@ -4469,7 +7434,7 @@
 
     <listitem>
      <para>
-      Silence some build warnings on OS X (Tom Lane)
+      Silence some build warnings on macOS (Tom Lane)
      </para>
     </listitem>
 
@@ -4500,10 +7465,10 @@
  <sect1 id="release-9-4-1">
   <title>Release 9.4.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2015-02-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2015-02-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.4.0.
@@ -5028,7 +7993,7 @@
 
     <listitem>
      <para>
-      Warn if OS X's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
@@ -5313,10 +8278,10 @@
  <sect1 id="release-9-4">
   <title>Release 9.4</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2014-12-18</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2014-12-18</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
@@ -7044,8 +10009,8 @@
 
       <listitem>
        <para>
-        Add ability to retrieve the current PL/PgSQL call stack
-        using <link linkend="plpgsql-get-diagnostics-context"><command>GET
+        Add ability to retrieve the current PL/pgSQL call stack
+        using <link linkend="plpgsql-call-stack"><command>GET
         DIAGNOSTICS</></link>
         (Pavel Stehule, Stephen Frost)
        </para>
@@ -7115,7 +10080,7 @@
       <listitem>
        <para>
         Add <xref linkend="APP-CREATEUSER"> option <option>-g</>
-        to specify role membership (Chistopher Browne)
+        to specify role membership (Christopher Browne)
        </para>
       </listitem>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-9.5.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-9.5.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-9.5.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-9.5.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,4349 @@
 <!-- doc/src/sgml/release-9.5.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-5-8">
+  <title>Release 9.5.8</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-08-10</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.5.7.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.8</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.5.7,
+    see <xref linkend="release-9-5-7">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Further restrict visibility
+      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      protect passwords stored as user mapping options
+      (Noah Misch)
+     </para>
+
+     <para>
+      The fix for CVE-2017-7486 was incorrect: it allowed a user
+      to see the options in her own user mapping, even if she did not
+      have <literal>USAGE</> permission on the associated foreign server.
+      Such options might include a password that had been provided by the
+      server owner rather than the user herself.
+      Since <structname>information_schema.user_mapping_options</> does not
+      show the options in such cases, <structname>pg_user_mappings</>
+      should not either.
+      (CVE-2017-7547)
+     </para>
+
+     <para>
+      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      you will need to do the following:
+     </para>
+
+     <procedure>
+      <step>
+       <para>
+        Restart the postmaster after adding <literal>allow_system_table_mods
+        = true</> to <filename>postgresql.conf</>.  (In versions
+        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        configuration change, but you'll still need a restart.)
+       </para>
+      </step>
+
+      <step>
+       <para>
+        In <emphasis>each</> database of the cluster,
+        run the following commands as superuser:
+<programlisting>
+SET search_path = pg_catalog;
+CREATE OR REPLACE VIEW pg_user_mappings AS
+    SELECT
+        U.oid       AS umid,
+        S.oid       AS srvid,
+        S.srvname   AS srvname,
+        U.umuser    AS umuser,
+        CASE WHEN U.umuser = 0 THEN
+            'public'
+        ELSE
+            A.rolname
+        END AS usename,
+        CASE WHEN (U.umuser &lt;&gt; 0 AND A.rolname = current_user
+                     AND (pg_has_role(S.srvowner, 'USAGE')
+                          OR has_server_privilege(S.oid, 'USAGE')))
+                    OR (U.umuser = 0 AND pg_has_role(S.srvowner, 'USAGE'))
+                    OR (SELECT rolsuper FROM pg_authid WHERE rolname = current_user)
+                    THEN U.umoptions
+                 ELSE NULL END AS umoptions
+    FROM pg_user_mapping U
+         LEFT JOIN pg_authid A ON (A.oid = U.umuser) JOIN
+        pg_foreign_server S ON (U.umserver = S.oid);
+</programlisting>
+       </para>
+      </step>
+
+      <step>
+       <para>
+        Do not forget to include the <literal>template0</>
+        and <literal>template1</> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</>,
+        you'll need to temporarily make it accept connections.
+        In <productname>PostgreSQL</> 9.5 and later, you can use
+<programlisting>
+ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
+</programlisting>
+        and then after fixing <literal>template0</>, undo that with
+<programlisting>
+ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
+</programlisting>
+        In prior versions, instead use
+<programlisting>
+UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
+UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
+</programlisting>
+       </para>
+      </step>
+
+      <step>
+       <para>
+        Finally, remove the <literal>allow_system_table_mods</> configuration
+        setting, and again restart the postmaster.
+       </para>
+      </step>
+     </procedure>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow empty passwords in all password-based authentication methods
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <application>libpq</> ignores empty password specifications, and does
+      not transmit them to the server.  So, if a user's password has been
+      set to the empty string, it's impossible to log in with that password
+      via <application>psql</> or other <application>libpq</>-based
+      clients.  An administrator might therefore believe that setting the
+      password to empty is equivalent to disabling password login.
+      However, with a modified or non-<application>libpq</>-based client,
+      logging in could be possible, depending on which authentication
+      method is configured.  In particular the most common
+      method, <literal>md5</>, accepted empty passwords.
+      Change the server to reject empty passwords in all cases.
+      (CVE-2017-7546)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <function>lo_put()</> check for <literal>UPDATE</> privilege on
+      the target large object (Tom Lane, Michael Paquier)
+     </para>
+
+     <para>
+      <function>lo_put()</> should surely require the same permissions
+      as <function>lowrite()</>, but the check was missing, allowing any
+      user to change the data in a large object.
+      (CVE-2017-7548)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correct the documentation about the process for upgrading standby
+      servers with <application>pg_upgrade</> (Bruce Momjian)
+     </para>
+
+     <para>
+      The previous documentation instructed users to start/stop the primary
+      server after running <application>pg_upgrade</> but before syncing
+      the standby servers.  This sequence is unsafe.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix concurrent locking of tuple update chains (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      If several sessions concurrently lock a tuple update chain with
+      nonconflicting lock modes using an old snapshot, and they all
+      succeed, it was possible for some of them to nonetheless fail (and
+      conclude there is no live tuple version) due to a race condition.
+      This had consequences such as foreign-key checks failing to see a
+      tuple that definitely exists but is being updated concurrently.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix potential data corruption when freezing a tuple whose XMAX is a
+      multixact with exactly one still-interesting member (Teodor Sigaev)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid integer overflow and ensuing crash when sorting more than one
+      billion tuples in-memory (Sergey Koposov)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, retry process creation if we fail to reserve the address
+      range for our shared memory in the new process (Tom Lane, Amit
+      Kapila)
+     </para>
+
+     <para>
+      This is expected to fix infrequent child-process-launch failures that
+      are probably due to interference from antivirus products.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability corruption of shared predicate-lock hash table
+      in Windows builds (Thomas Munro, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid logging clean closure of an SSL connection as though
+      it were a connection reset (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent sending SSL session tickets to clients (Tom Lane)
+     </para>
+
+     <para>
+      This fix prevents reconnection failures with ticket-aware client-side
+      SSL code.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"> on
+      Solaris (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix statistics collector to honor inquiry messages issued just after
+      a postmaster shutdown and immediate restart (Tom Lane)
+     </para>
+
+     <para>
+      Statistics inquiries issued within half a second of the previous
+      postmaster shutdown were effectively ignored.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that the statistics collector's receive buffer size is at
+      least 100KB (Tom Lane)
+     </para>
+
+     <para>
+      This reduces the risk of dropped statistics data on older platforms
+      whose default receive buffer size is less than that.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible creation of an invalid WAL segment when a standby is
+      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      record (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>walsender</> to exit promptly when client requests
+      shutdown (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      walsender processes (Petr Jelinek, Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent walsender-triggered panics during shutdown checkpoints
+      (Andres Freund, Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unnecessarily slow restarts of <application>walreceiver</>
+      processes due to race condition in postmaster (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix leakage of small subtransactions spilled to disk during logical
+      decoding (Andres Freund)
+     </para>
+
+     <para>
+      This resulted in temporary files consuming excessive disk space.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce the work needed to build snapshots during creation of
+      logical-decoding slots (Andres Freund, Petr Jelinek)
+     </para>
+
+     <para>
+      The previous algorithm was infeasibly expensive on a server with a
+      lot of open transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition that could indefinitely delay creation of
+      logical-decoding slots (Andres Freund, Petr Jelinek)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce overhead in processing syscache invalidation events (Tom Lane)
+     </para>
+
+     <para>
+      This is particularly helpful for logical decoding, which triggers
+      frequent cache invalidation.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      to more than one element of a column that is of domain-over-array
+      type (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow window functions to be used in sub-<literal>SELECT</>s that
+      are within the arguments of an aggregate function (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Move autogenerated array types out of the way during
+      <command>ALTER ... RENAME</> (Vik Fearing)
+     </para>
+
+     <para>
+      Previously, we would rename a conflicting autogenerated array type
+      out of the way during <command>CREATE</>; this fix extends that
+      behavior to renaming operations.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dangling pointer in <command>ALTER TABLE</> when there is a
+      comment on a constraint belonging to the table (David Rowley)
+     </para>
+
+     <para>
+      Re-applying the comment to the reconstructed constraint could fail
+      with a weird error message, or even crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly update dependency info when changing a datatype I/O
+      function's argument or return type from <type>opaque</> to the
+      correct type (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <command>CREATE TYPE</> updates I/O functions declared in this
+      long-obsolete style, but it forgot to record a dependency on the
+      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      function definitions behind.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce memory usage when <command>ANALYZE</> processes
+      a <type>tsvector</> column (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix unnecessary precision loss and sloppy rounding when multiplying
+      or dividing <type>money</> values by integers or floats (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Tighten checks for whitespace in functions that parse identifiers,
+      such as <function>regprocedurein()</> (Tom Lane)
+     </para>
+
+     <para>
+      Depending on the prevailing locale, these functions could
+      misinterpret fragments of multibyte characters as whitespace.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use relevant <literal>#define</> symbols from Perl while
+      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+     </para>
+
+     <para>
+      This avoids portability problems, typically manifesting as
+      a <quote>handshake</> mismatch during library load, when working with
+      recent Perl versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      state properly after a failed connection attempt (Michael Paquier)
+     </para>
+
+     <para>
+      Failure to do this meant that when falling back from SSL to non-SSL
+      connections, a GSS/SASL failure in the SSL attempt would always cause
+      the non-SSL attempt to fail.  SSPI did not fail, but it leaked memory.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      is ended with a keyboard EOF signal and then another <command>COPY
+      FROM STDIN</> is attempted (Thomas Munro)
+     </para>
+
+     <para>
+      This misbehavior was observed on BSD-derived platforms (including
+      macOS), but not on most others.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> and <application>pg_restore</> to
+      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+     </para>
+
+     <para>
+      This prevents errors during dump/restore when a materialized view
+      refers to tables owned by a different user.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve <application>pg_dump</>/<application>pg_restore</>'s
+      reporting of error conditions originating in <application>zlib</>
+      (Vladimir Kunschikov, &Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> with the <option>--clean</> option to
+      drop event triggers as expected (Tom Lane)
+     </para>
+
+     <para>
+      It also now correctly assigns ownership of event triggers; before,
+      they were restored as being owned by the superuser running the
+      restore script.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      operator class (Daniel Gustafsson)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+     </para>
+
+     <para>
+      A compressed plain-text dump written to stdout would contain corrupt
+      data due to failure to put the file descriptor into binary mode.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_get_ruledef()</> to print correct output for
+      the <literal>ON SELECT</> rule of a view whose columns have been
+      renamed (Tom Lane)
+     </para>
+
+     <para>
+      In some corner cases, <application>pg_dump</> relies
+      on <function>pg_get_ruledef()</> to dump views, so that this error
+      could result in dump/reload failures.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of outer joins with empty constraints, such as the result
+      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dumping of function expressions in the <literal>FROM</> clause in
+      cases where the expression does not deparse into something that looks
+      like a function call (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</> output to stdout on Windows
+      (Haribabu Kommi)
+     </para>
+
+     <para>
+      A backup written to stdout would contain corrupt data due to failure
+      to put the file descriptor into binary mode.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_rewind</> to correctly handle files exceeding 2GB
+      (Kuntal Ghosh, Michael Paquier)
+     </para>
+
+     <para>
+      Ordinarily such files won't appear in <productname>PostgreSQL</> data
+      directories, but they could be present in some cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This condition could prevent upgraded standby servers from
+      reconnecting.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_xlogdump</>'s computation of WAL record length
+      (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>postgres_fdw</>, re-establish connections to remote
+      servers after <command>ALTER SERVER</> or <command>ALTER USER
+      MAPPING</> commands (Kyotaro Horiguchi)
+     </para>
+
+     <para>
+      This ensures that option changes affecting connection parameters will
+      be applied promptly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>postgres_fdw</>, allow cancellation of remote
+      transaction control commands (Robert Haas, Rafia Sabih)
+     </para>
+
+     <para>
+      This change allows us to quickly escape a wait for an unresponsive
+      remote server in many more cases than previously.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Increase <literal>MAX_SYSCACHE_CALLBACKS</> to provide more room for
+      extensions (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      shared libraries with gcc (Tom Lane)
+     </para>
+
+     <para>
+      This supports larger extension libraries on platforms where it makes
+      a difference.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_5_STABLE [af1f18259] 2017-08-02 15:07:20 -0400
+Branch: REL9_4_STABLE [8892170e7] 2017-08-02 15:07:20 -0400
+Branch: REL9_3_STABLE [3d9ae20e7] 2017-08-02 15:07:20 -0400
+Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
+-->
+     <para>
+      Fix unescaped-braces issue in our build scripts for Microsoft MSVC,
+      to avoid a warning or error from recent Perl versions (Andrew
+      Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, handle the case where the <application>openssl</>
+      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, add proper include path for <application>libxml2</>
+      header files (Andrew Dunstan)
+     </para>
+
+     <para>
+      This fixes a former need to move things around in standard Windows
+      installations of <application>libxml2</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, recognize a Tcl library that is
+      named <filename>tcl86.lib</> (Noah Misch)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In MSVC builds, honor <literal>PROVE_FLAGS</> settings
+      on <filename>vcregress.pl</>'s command line (Andrew Dunstan)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-5-7">
+  <title>Release 9.5.7</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-05-11</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.5.6.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.7</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if you use foreign data servers that make use of user
+    passwords for authentication, see the first changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are using third-party replication tools that depend
+    on <quote>logical decoding</>, see the fourth changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.5.6,
+    see <xref linkend="release-9-5-6">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Restrict visibility
+      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      protect passwords stored as user mapping options
+      (Michael Paquier, Feike Steenbergen)
+     </para>
+
+     <para>
+      The previous coding allowed the owner of a foreign server object,
+      or anyone he has granted server <literal>USAGE</> permission to,
+      to see the options for all user mappings associated with that server.
+      This might well include passwords for other users.
+      Adjust the view definition to match the behavior of
+      <structname>information_schema.user_mapping_options</>, namely that
+      these options are visible to the user being mapped, or if the mapping
+      is for <literal>PUBLIC</literal> and the current user is the server
+      owner, or if the current user is a superuser.
+      (CVE-2017-7486)
+     </para>
+
+     <para>
+      By itself, this patch will only fix the behavior in newly initdb'd
+      databases.  If you wish to apply this change in an existing database,
+      follow the corrected procedure shown in the changelog entry for
+      CVE-2017-7547, in <xref linkend="release-9-5-8">.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent exposure of statistical information via leaky operators
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      Some selectivity estimation functions in the planner will apply
+      user-defined operators to values obtained
+      from <structname>pg_statistic</>, such as most common values and
+      histogram entries.  This occurs before table permissions are checked,
+      so a nefarious user could exploit the behavior to obtain these values
+      for table columns he does not have permission to read.  To fix,
+      fall back to a default estimate if the operator's implementation
+      function is not certified leak-proof and the calling user does not have
+      permission to read the table column whose statistics are needed.
+      At least one of these criteria is satisfied in most cases in practice.
+      (CVE-2017-7484)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Restore <application>libpq</>'s recognition of
+      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+     </para>
+
+     <para>
+      Processing of this environment variable was unintentionally dropped
+      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      This creates a security hazard, since users might be relying on the
+      environment variable to force SSL-encrypted connections, but that
+      would no longer be guaranteed.  Restore handling of the variable,
+      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      breaking configurations that work correctly with post-9.3 code.
+      (CVE-2017-7485)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possibly-invalid initial snapshot during logical decoding
+      (Petr Jelinek, Andres Freund)
+     </para>
+
+     <para>
+      The initial snapshot created for a logical decoding replication slot
+      was potentially incorrect.  This could cause third-party tools that
+      use logical decoding to copy incomplete/inconsistent initial data.
+      This was more likely to happen if the source server was busy at the
+      time of slot creation, or if another logical slot already existed.
+     </para>
+
+     <para>
+      If you are using a replication tool that depends on logical decoding,
+      and it should have copied a nonempty data set at the start of
+      replication, it is advisable to recreate the replica after
+      installing this update, or to verify its contents against the source
+      server.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      (Robert Haas, Michael Paquier)
+     </para>
+
+     <para>
+      This could result in an unlogged index being set to an invalid state
+      after a crash and restart.  Such a problem would persist until the
+      index was dropped and rebuilt.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      when a standby server replays a prepared but uncommitted two-phase
+      transaction (Tom Lane)
+     </para>
+
+     <para>
+      In most cases this turned out to have no visible ill effects, but in
+      corner cases it could result in circular references
+      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in queries that examine rows modified by the two-phase transaction.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possible crash in <application>walsender</> due to failure
+      to initialize a string buffer (Stas Kelvich, Fujii Masao)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible crash when rescanning a nearest-neighbor index-only scan
+      on a GiST index (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix postmaster's handling of <function>fork()</> failure for a
+      background worker process (Tom Lane)
+     </para>
+
+     <para>
+      Previously, the postmaster updated portions of its state as though
+      the process had been launched successfully, resulting in subsequent
+      confusion.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Gierth <rhodiumtoad@postgresql.org>
+Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
+-->
+     <para>
+      Fix crash or wrong answers when a <literal>GROUPING SETS</> column's
+      data type is hashable but not sortable (Pavan Deolasee)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid applying <quote>physical targetlist</> optimization to custom
+      scans (Dmitry Ivanov, Tom Lane)
+     </para>
+
+     <para>
+      This optimization supposed that retrieving all columns of a tuple
+      is inexpensive, which is true for ordinary Postgres tuples; but it
+      might not be the case for a custom scan provider.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use the correct sub-expression when applying a <literal>FOR ALL</>
+      row-level-security policy (Stephen Frost)
+     </para>
+
+     <para>
+      In some cases the <literal>WITH CHECK</> restriction would be applied
+      when the <literal>USING</> restriction is more appropriate.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure parsing of queries in extension scripts sees the results of
+      immediately-preceding DDL (Julien Rouhaud, Tom Lane)
+     </para>
+
+     <para>
+      Due to lack of a cache flush step between commands in an extension
+      script file, non-utility queries might not see the effects of an
+      immediately preceding catalog change, such as <command>ALTER TABLE
+      ... RENAME</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
+      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+     </para>
+
+     <para>
+      The command failed if the calling user did not currently have
+      <literal>CREATE</> privilege for the tablespace containing the index.
+      That behavior seems unhelpful, so skip the check, allowing the
+      index to be rebuilt where it is.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</>
+      (Amit Langote)
+     </para>
+
+     <para>
+      This fix prevents unwanted <quote>constraint does not exist</> failures
+      when no matching constraint is present in the child tables.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid dangling pointer in <command>COPY ... TO</> when row-level
+      security is active for the source table (Tom Lane)
+     </para>
+
+     <para>
+      Usually this had no ill effects, but sometimes it would cause
+      unexpected errors or crashes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid accessing an already-closed relcache entry in <command>CLUSTER</>
+      and <command>VACUUM FULL</> (Tom Lane)
+     </para>
+
+     <para>
+      With some bad luck, this could lead to indexes on the target
+      relation getting rebuilt with the wrong persistence setting.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>VACUUM</> to account properly for pages that could not
+      be scanned due to conflicting page pins (Andrew Gierth)
+     </para>
+
+     <para>
+      This tended to lead to underestimation of the number of tuples in
+      the table.  In the worst case of a small heavily-contended
+      table, <command>VACUUM</> could incorrectly report that the table
+      contained no tuples, leading to very bad planning choices.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that bulk-tuple-transfer loops within a hash join are
+      interruptible by query cancel requests (Tom Lane, Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix integer-overflow problems in <type>interval</> comparison (Kyotaro
+      Horiguchi, Tom Lane)
+     </para>
+
+     <para>
+      The comparison operators for type <type>interval</> could yield wrong
+      answers for intervals larger than about 296000 years.  Indexes on
+      columns containing such large values should be reindexed, since they
+      may be corrupt.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>cursor_to_xml()</> to produce valid output
+      with <replaceable>tableforest</> = false
+      (Thomas Munro, Peter Eisentraut)
+     </para>
+
+     <para>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      element.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix roundoff problems in <function>float8_timestamptz()</>
+      and <function>make_interval()</> (Tom Lane)
+     </para>
+
+     <para>
+      These functions truncated, rather than rounded, when converting a
+      floating-point value to integer microseconds; that could cause
+      unexpectedly off-by-one results.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_get_object_address()</> to handle members of operator
+      families correctly (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve performance of <structname>pg_timezone_names</> view
+      (Tom Lane, David Rowley)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce memory management overhead for contexts containing many large
+      blocks (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sloppy handling of corner-case errors from <function>lseek()</>
+      and <function>close()</> (Tom Lane)
+     </para>
+
+     <para>
+      Neither of these system calls are likely to fail in typical situations,
+      but if they did, <filename>fd.c</> could get quite confused.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect check for whether postmaster is running as a Windows
+      service (Michael Paquier)
+     </para>
+
+     <para>
+      This could result in attempting to write to the event log when that
+      isn't accessible, so that no logging happens at all.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
+      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix a double-free error when processing dollar-quoted string literals
+      in <application>ecpg</> (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      comments and security labels of some types of database objects
+      (Giuseppe Broccolo, Tom Lane)
+     </para>
+
+     <para>
+      In simple cases this caused no ill effects; but for example, a
+      schema-selective restore might omit comments it should include, because
+      they were not marked as belonging to the schema of their associated
+      object.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      when SQL object names contain newlines (Tom Lane)
+     </para>
+
+     <para>
+      Replace newlines by spaces, which is sufficient to make the output
+      valid for <literal>pg_restore -L</>'s purposes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to transfer comments and security labels
+      attached to <quote>large objects</> (blobs) (Stephen Frost)
+     </para>
+
+     <para>
+      Previously, blobs were correctly transferred to the new database, but
+      any comments or security labels attached to them were lost.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve error handling
+      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      function (Noah Misch)
+     </para>
+
+     <para>
+      Notably, it failed to detect errors reported
+      by <function>fclose()</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      connection when establishing a new unnamed connection (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      expressions (Tom Lane)
+     </para>
+
+     <para>
+      In some cases it would produce a broken data structure that could never
+      match anything, leading to GIN or GiST indexscans that use a trigram
+      index not finding any matches to the regular expression.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: REL9_5_STABLE [cdf5a004b] 2017-05-06 22:21:38 -0400
+Branch: REL9_4_STABLE [f14bf0a8f] 2017-05-06 22:19:56 -0400
+Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
+-->
+     <para>
+      In <filename>contrib/postgres_fdw</>,
+      transmit query cancellation requests to the remote server
+      (Michael Paquier, Etsuro Fujita)
+     </para>
+
+     <para>
+      Previously, a local query cancellation request did not cause an
+      already-sent remote query to terminate early.  This is a back-patch
+      of work originally done for 9.6.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support Tcl 8.6 in MSVC builds (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017b
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes a bug affecting some DST transitions in January 2038.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2017b
+      for DST law changes in Chile, Haiti, and Mongolia, plus historical
+      corrections for Ecuador, Kazakhstan, Liberia, and Spain.
+      Switch to numeric abbreviations for numerous time zones in South
+      America, the Pacific and Indian oceans, and some Asian and Middle
+      Eastern countries.
+     </para>
+
+     <para>
+      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <structname>pg_timezone_names</>
+      view nor used for output.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use correct daylight-savings rules for POSIX-style time zone names
+      in MSVC builds (David Rowley)
+     </para>
+
+     <para>
+      The Microsoft MSVC build scripts neglected to install
+      the <filename>posixrules</> file in the timezone directory tree.
+      This resulted in the timezone code falling back to its built-in
+      rule about what DST behavior to assume for a POSIX-style time zone
+      name.  For historical reasons that still corresponds to the DST rules
+      the USA was using before 2007 (i.e., change on first Sunday in April
+      and last Sunday in October).  With this fix, a POSIX-style zone name
+      will use the current and historical DST transition dates of
+      the <literal>US/Eastern</> zone.  If you don't want that, remove
+      the <filename>posixrules</> file, or replace it with a copy of some
+      other zone file (see <xref linkend="datatype-timezones">).  Note that
+      due to caching, you may need to restart the server to get such changes
+      to take effect.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-5-6">
+  <title>Release 9.5.6</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-02-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.5.5.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.6</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted indexes.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.5.5,
+    see <xref linkend="release-9-5-5">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix a race condition that could cause indexes built
+      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      (Pavan Deolasee, Tom Lane)
+     </para>
+
+     <para>
+      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      that depends on a column not previously indexed, then rows
+      updated by transactions that ran concurrently with
+      the <command>CREATE INDEX</> command could have received incorrect
+      index entries.  If you suspect this may have happened, the most
+      reliable solution is to rebuild affected indexes after installing
+      this update.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that the special snapshot used for catalog scans is not
+      invalidated by premature data pruning (Tom Lane)
+     </para>
+
+     <para>
+      Backends failed to account for this snapshot when advertising their
+      oldest xmin, potentially allowing concurrent vacuuming operations to
+      remove data that was still needed.  This led to transient failures
+      along the lines of <quote>cache lookup failed for relation 1255</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect WAL logging for BRIN indexes (Kuntal Ghosh)
+     </para>
+
+     <para>
+      The WAL record emitted for a BRIN <quote>revmap</> page when moving an
+      index tuple to a different page was incorrect.  Replay would make the
+      related portion of the index useless, forcing it to be recomputed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      unlogged table (Michael Paquier)
+     </para>
+
+     <para>
+      Previously, this was skipped when <xref linkend="guc-wal-level">
+      = <literal>minimal</>, but actually it's necessary even in that case
+      to ensure that the unlogged table is properly reset to empty after a
+      crash.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: REL9_5_STABLE [c0db1ec26] 2016-11-17 13:31:30 -0300
+Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
+-->
+     <para>
+      Reduce interlocking on standby servers during the replay of btree
+      index vacuuming operations (Simon Riggs)
+     </para>
+
+     <para>
+      This change avoids substantial replication delays that sometimes
+      occurred while replaying such operations.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      If the stats collector dies during hot standby, restart it (Takayuki
+      Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that hot standby feedback works correctly when it's enabled at
+      standby server start (Ants Aasma, Craig Ringer)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check for interrupts while hot standby is waiting for a conflicting
+      query (Simon Riggs)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid constantly respawning the autovacuum launcher in a corner case
+      (Amit Khandekar)
+     </para>
+
+     <para>
+      This fix avoids problems when autovacuum is nominally off and there
+      are some tables that require freezing, but all such tables are
+      already being processed by autovacuum workers.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix check for when an extension member object can be dropped (Tom Lane)
+     </para>
+
+     <para>
+      Extension upgrade scripts should be able to drop member objects,
+      but this was disallowed for serial-column sequences, and possibly
+      other cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make sure <command>ALTER TABLE</> preserves index tablespace
+      assignments when rebuilding indexes (Tom Lane, Michael Paquier)
+     </para>
+
+     <para>
+      Previously, non-default settings
+      of <xref linkend="guc-default-tablespace"> could result in broken
+      indexes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect updating of trigger function properties when changing a
+      foreign-key constraint's deferrability properties with <command>ALTER
+      TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+     </para>
+
+     <para>
+      This led to odd failures during subsequent exercise of the foreign
+      key, as the triggers were fired at the wrong times.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent dropping a foreign-key constraint if there are pending
+      trigger events for the referenced relation (Tom Lane)
+     </para>
+
+     <para>
+      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
+      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>ALTER TABLE ... SET DATA TYPE ... USING</> when child
+      table has different column ordering than the parent
+      (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Failure to adjust the column numbering in the <literal>USING</>
+      expression led to errors,
+      typically <quote>attribute <replaceable>N</> has wrong type</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix processing of OID column when a table with OIDs is associated to
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      Langote)
+     </para>
+
+     <para>
+      The OID column should be treated the same as regular user columns in
+      this case, but it wasn't, leading to odd behavior in later
+      inheritance changes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>CREATE OR REPLACE VIEW</> to update the view query
+      before attempting to apply the new view options (Dean Rasheed)
+     </para>
+
+     <para>
+      Previously the command would fail if the new options were
+      inconsistent with the old view definition.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Report correct object identity during <command>ALTER TEXT SEARCH
+      CONFIGURATION</> (Artur Zakirov)
+     </para>
+
+     <para>
+      The wrong catalog OID was reported to extensions such as logical
+      decoding.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix commit timestamp mechanism to not fail when queried about
+      the special XIDs <literal>FrozenTransactionId</>
+      and <literal>BootstrapTransactionId</> (Craig Ringer)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Kevin Grittner <kgrittn@postgresql.org>
+Branch: REL9_5_STABLE [bed2a0b06] 2016-12-13 19:14:42 -0600
+Branch: REL9_4_STABLE [4b9d466c1] 2016-12-13 19:05:12 -0600
+Branch: REL9_3_STABLE [5d80171ad] 2016-12-13 19:05:35 -0600
+Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
+-->
+     <para>
+      Check for serializability conflicts before reporting
+      constraint-violation failures (Thomas Munro)
+     </para>
+
+     <para>
+      When using serializable transaction isolation, it is desirable
+      that any error due to concurrent transactions should manifest
+      as a serialization failure, thereby cueing the application that
+      a retry might succeed.  Unfortunately, this does not reliably
+      happen for duplicate-key failures caused by concurrent insertions.
+      This change ensures that such an error will be reported as a
+      serialization error if the application explicitly checked for
+      the presence of a conflicting key (and did not find it) earlier
+      in the transaction.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect use of view reloptions as regular table reloptions (Tom
+      Lane)
+     </para>
+
+     <para>
+      The symptom was spurious <quote>ON CONFLICT is not supported on table
+      ... used as a catalog table</> errors when the target
+      of <command>INSERT ... ON CONFLICT</> is a view with cascade option.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect <quote>target lists can have at most <replaceable>N</>
+      entries</quote> complaint when using <literal>ON CONFLICT</> with
+      wide tables (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
+      an <command>UPDATE</> source expression (Tom Lane)
+     </para>
+
+     <para>
+      This led to <quote>UPDATE target count mismatch --- internal
+      error</>.  Now the syntax is understood as a whole-row variable,
+      as it would be in other contexts.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that column typmods are determined accurately for
+      multi-row <literal>VALUES</> constructs (Tom Lane)
+     </para>
+
+     <para>
+      This fixes problems occurring when the first value in a column has a
+      determinable typmod (e.g., length for a <type>varchar</> value) but
+      later values don't share the same limit.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Throw error for an unfinished Unicode surrogate pair at the end of a
+      Unicode string (Tom Lane)
+     </para>
+
+     <para>
+      Normally, a Unicode surrogate leading character must be followed by a
+      Unicode surrogate trailing character, but the check for this was
+      missed if the leading character was the last character in a Unicode
+      string literal (<literal>U&amp;'...'</>) or Unicode identifier
+      (<literal>U&amp;"..."</>).
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that a purely negative text search query, such
+      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+     </para>
+
+     <para>
+      Such matches were found by GIN index searches, but not by sequential
+      scans or GiST index searches.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      subtree with an empty query (Artur Zakirov)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve speed of user-defined aggregates that
+      use <function>array_append()</> as transition function (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible crash in <function>array_position()</>
+      or <function>array_positions()</> when processing arrays of records
+      (Junseok Yang)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      The overrun occurred only if the input consisted entirely of single
+      quotes and/or backslashes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent multiple calls of <function>pg_start_backup()</>
+      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Paquier)
+     </para>
+
+     <para>
+      This avoids an assertion failure, and possibly worse things, if
+      someone tries to run these functions in parallel.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disable transform that attempted to remove no-op <literal>AT TIME
+      ZONE</> conversions (Tom Lane)
+     </para>
+
+     <para>
+      This resulted in wrong answers when the simplified expression was
+      used in an index condition.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      that aren't really no-ops (Tom Lane)
+     </para>
+
+     <para>
+      In some cases, a cast that should result in zeroing out
+      low-order <type>interval</> fields was mistakenly deemed to be a
+      no-op and discarded.  An example is that casting from <type>INTERVAL
+      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix bugs in transmitting GUC parameter values to parallel workers
+      (Michael Paquier, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that cached plans are invalidated by changes in foreign-table
+      options (Amit Langote, Etsuro Fujita, Ashutosh Bapat)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      that use built-in functions (Stephen Frost)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_restore</> with <option>--create --if-exists</>
+      to behave more sanely if an archive contains
+      unrecognized <command>DROP</> commands (Tom Lane)
+     </para>
+
+     <para>
+      This doesn't fix any live bug, but it may improve the behavior in
+      future if <application>pg_restore</> is used with an archive
+      generated by a later <application>pg_dump</> version.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</>'s rate limiting in the presence of
+      slow I/O (Antonin Houska)
+     </para>
+
+     <para>
+      If disk I/O was transiently much slower than the specified rate
+      limit, the calculation overflowed, effectively disabling the rate
+      limit for the rest of the run.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</>'s handling of
+      symlinked <filename>pg_stat_tmp</> and <filename>pg_replslot</>
+      subdirectories (Magnus Hagander, Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible <application>pg_basebackup</> failure on standby
+      server when including WAL files (Amit Kapila, Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible mishandling of expanded arrays in domain check
+      constraints and <literal>CASE</> execution (Tom Lane)
+     </para>
+
+     <para>
+      It was possible for a PL/pgSQL function invoked in these contexts to
+      modify or even delete an array value that needs to be preserved for
+      additional operations.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix nested uses of PL/pgSQL functions in contexts such as domain
+      check constraints evaluated during assignment to a PL/pgSQL variable
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that the Python exception objects we create for PL/Python are
+      properly reference-counted (Rafa de la Torre, Tom Lane)
+     </para>
+
+     <para>
+      This avoids failures if the objects are used after a Python garbage
+      collection cycle has occurred.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      as a column name (Tom Lane)
+     </para>
+
+     <para>
+      This matches the (previously undocumented) behavior of
+      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
+      namely that a magic <literal>.tupno</> column is inserted only if
+      there isn't a real column named that.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      even on Unix (Vik Fearing)
+     </para>
+
+     <para>
+      This change simplifies use of the same password file across Unix and
+      Windows machines.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      name that ends with a dot (Takayuki Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>psql</>, treat an empty or all-blank setting of
+      the <envar>PAGER</> environment variable as meaning <quote>no
+      pager</> (Tom Lane)
+     </para>
+
+     <para>
+      Previously, such a setting caused output intended for the pager to
+      vanish entirely.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve <filename>contrib/dblink</>'s reporting of
+      low-level <application>libpq</> errors, such as out-of-memory
+      (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Teach <filename>contrib/dblink</> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      the source of connection options (Corey Huinker)
+     </para>
+
+     <para>
+      Previously, if the foreign server object had options that were not
+      also <application>libpq</> connection options, an error occurred.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix portability problems in <filename>contrib/pageinspect</>'s
+      functions for GIN indexes (Peter Eisentraut, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, ensure that environment variable changes are propagated
+      to DLLs built with debug options (Christian Ullrich)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2016j
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues, most notably that timezone data
+      installation failed if the target directory didn't support hard
+      links.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016j
+      for DST law changes in northern Cyprus (adding a new zone
+      Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
+      and Antarctica/Casey.
+      Historical corrections for Italy, Kazakhstan, Malta, and Palestine.
+      Switch to preferring numeric zone abbreviations for Tonga.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-5-5">
+  <title>Release 9.5.5</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-10-27</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.5.4.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.5</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if your installation has been affected by the bug described in
+    the first changelog entry below, then after updating you may need
+    to take action to repair corrupted free space maps.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.5.2,
+    see <xref linkend="release-9-5-2">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix WAL-logging of truncation of relation free space maps and
+      visibility maps (Pavan Deolasee, Heikki Linnakangas)
+     </para>
+
+     <para>
+      It was possible for these files to not be correctly restored during
+      crash recovery, or to be written incorrectly on a standby server.
+      Bogus entries in a free space map could lead to attempts to access
+      pages that have been truncated away from the relation itself, typically
+      producing errors like <quote>could not read block <replaceable>XXX</>:
+      read only 0 of 8192 bytes</quote>.  Checksum failures in the
+      visibility map are also possible, if checksumming is enabled.
+     </para>
+
+     <para>
+      Procedures for determining whether there is a problem and repairing it
+      if so are discussed at
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [60893786d] 2016-09-03 13:28:53 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [36646d3af] 2016-09-03 13:28:53 -0400
+Branch: REL9_5_STABLE [08a72872f] 2016-09-03 13:28:53 -0400
+Branch: REL9_4_STABLE [a69443564] 2016-09-03 13:28:53 -0400
+-->
+     <para>
+      Fix incorrect creation of GIN index WAL records on big-endian machines
+      (Tom Lane)
+     </para>
+
+     <para>
+      The typical symptom was <quote>unexpected GIN leaf action</> errors
+      during WAL replay.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [5c609a742] 2016-09-09 15:54:29 -0300
+Branch: REL9_6_STABLE Release: REL9_6_0 [c3656c9ff] 2016-09-09 15:54:29 -0300
+Branch: REL9_5_STABLE [f33765885] 2016-09-09 15:54:29 -0300
+Branch: REL9_4_STABLE [8778da2af] 2016-09-09 15:54:29 -0300
+Branch: REL9_3_STABLE [dfe7121df] 2016-09-09 15:54:29 -0300
+-->
+     <para>
+      Fix <command>SELECT FOR UPDATE/SHARE</> to correctly lock tuples that
+      have been updated by a subsequently-aborted transaction
+      (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      In 9.5 and later, the <command>SELECT</> would sometimes fail to
+      return such tuples at all.  A failure has not been proven to occur in
+      earlier releases, but might be possible with concurrent updates.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [96dd77d34] 2016-09-22 11:35:03 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [a88fe25f5] 2016-09-22 11:34:44 -0400
+Branch: REL9_5_STABLE [c35917835] 2016-09-22 11:34:44 -0400
+Branch: REL9_4_STABLE [d3dd00e67] 2016-09-22 11:34:44 -0400
+Branch: REL9_3_STABLE [73df86a37] 2016-09-22 11:34:44 -0400
+Branch: REL9_2_STABLE [8552f9b90] 2016-09-22 11:34:44 -0400
+Branch: REL9_1_STABLE [0183df5dc] 2016-09-22 11:34:45 -0400
+-->
+     <para>
+      Fix EvalPlanQual rechecks involving CTE scans (Tom Lane)
+     </para>
+
+     <para>
+      The recheck would always see the CTE as returning no rows, typically
+      leading to failure to update rows that were recently updated.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [07ef03512] 2016-08-17 17:03:36 -0700
+Branch: REL9_6_STABLE Release: REL9_6_0 [e79aaebcc] 2016-08-17 17:03:36 -0700
+Branch: REL9_5_STABLE [94bc30725] 2016-08-17 17:03:36 -0700
+-->
+     <para>
+      Fix deletion of speculatively inserted TOAST tuples when backing out
+      of <command>INSERT ... ON CONFLICT</> (Oskari Saarenmaa)
+     </para>
+
+     <para>
+      In the race condition where two transactions try to insert conflicting
+      tuples at about the same time, the loser would fail with
+      an <quote>attempted to delete invisible tuple</> error if its
+      insertion included any TOAST'ed fields.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't throw serialization errors for self-conflicting insertions
+      in <command>INSERT ... ON CONFLICT</> (Thomas Munro, Peter Geoghegan)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [2c00fad28] 2016-08-24 14:38:12 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [616be05df] 2016-08-24 14:38:13 -0400
+Branch: REL9_5_STABLE [25fe5f758] 2016-08-24 14:37:50 -0400
+Branch: REL9_4_STABLE [08a823e53] 2016-08-24 14:37:51 -0400
+Branch: REL9_3_STABLE [aaad96e40] 2016-08-24 14:37:51 -0400
+Branch: REL9_2_STABLE [237663897] 2016-08-24 14:37:51 -0400
+Branch: REL9_1_STABLE [3570ea424] 2016-08-24 14:37:51 -0400
+-->
+     <para>
+      Fix improper repetition of previous results from hashed aggregation in
+      a subquery (Andrew Gierth)
+     </para>
+
+     <para>
+      The test to see if we can reuse a previously-computed hash table of
+      the aggregate state values neglected the possibility of an outer query
+      reference appearing in an aggregate argument expression.  A change in
+      the value of such a reference should lead to recalculating the hash
+      table, but did not.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [ae4760d66] 2016-08-24 22:20:25 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [006fb80a5] 2016-08-24 22:20:26 -0400
+Branch: REL9_5_STABLE [46bd14a10] 2016-08-24 22:20:01 -0400
+Branch: REL9_4_STABLE [566afa15c] 2016-08-24 22:20:01 -0400
+-->
+     <para>
+      Fix query-lifespan memory leak in a bulk <command>UPDATE</> on a table
+      with a <literal>PRIMARY KEY</> or <literal>REPLICA IDENTITY</> index
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>COPY</> with a column name list from a table that has
+      row-level security enabled (Adam Brightwell)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>EXPLAIN</> to emit valid XML when
+      <xref linkend="guc-track-io-timing"> is on (Markus Winand)
+     </para>
+
+     <para>
+      Previously the XML output-format option produced syntactically invalid
+      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master Release: REL9_6_BR [4b234fd8b] 2016-08-12 12:13:04 -0400
+Branch: REL9_5_STABLE [ed2d7b8c8] 2016-08-12 12:13:04 -0400
+Branch: REL9_4_STABLE [85974b468] 2016-08-12 12:13:04 -0400
+Branch: REL9_3_STABLE [16cc6d23b] 2016-08-12 12:13:04 -0400
+Branch: REL9_2_STABLE [ceb005319] 2016-08-12 12:13:04 -0400
+-->
+     <para>
+      Suppress printing of zeroes for unmeasured times
+      in <command>EXPLAIN</> (Maksim Milyutin)
+     </para>
+
+     <para>
+      Certain option combinations resulted in printing zero values for times
+      that actually aren't ever measured in that combination.  Our general
+      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      do that consistently in all cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix statistics update for <command>TRUNCATE</> in a prepared
+      transaction (Stas Kelvich)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Simon Riggs <simon@2ndQuadrant.com>
+Branch: master [dcb12ce8d] 2016-09-06 15:35:47 +0100
+Branch: REL9_6_STABLE Release: REL9_6_0 [1fa42debe] 2016-09-09 11:43:08 +0100
+Branch: REL9_5_STABLE [f3b3e871e] 2016-09-09 11:43:46 +0100
+Branch: REL9_4_STABLE [81b0f8204] 2016-09-09 11:44:54 +0100
+Branch: REL9_3_STABLE [e1dddf3e8] 2016-09-09 11:45:16 +0100
+Branch: REL9_2_STABLE [eaf6fe7fa] 2016-09-09 11:45:40 +0100
+Branch: REL9_1_STABLE [3ed7f54bc] 2016-09-09 11:46:03 +0100
+-->
+     <para>
+      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      table lock so that it can truncate the table (Simon Riggs)
+     </para>
+
+     <para>
+      The timeout was meant to be 50 milliseconds, but it was actually only
+      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      much more easily than intended.  Set it to the intended value.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      creating or altering a table (Tom Lane, Amit Langote)
+     </para>
+
+     <para>
+      Allow identical <literal>CHECK</> constraints to be added to a parent
+      and child table in either order.  Prevent merging of a valid
+      constraint from the parent table with a <literal>NOT VALID</>
+      constraint on the child.  Likewise, prevent merging of a <literal>NO
+      INHERIT</> child constraint with an inherited constraint.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Show a sensible value
+      in <structname>pg_settings</>.<structfield>unit</>
+      for <varname>min_wal_size</> and <varname>max_wal_size</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master Release: REL9_6_BR [9389fbd03] 2016-08-14 15:06:01 -0400
+Branch: REL9_5_STABLE [635651214] 2016-08-14 15:06:01 -0400
+Branch: REL9_4_STABLE [4ac3d7794] 2016-08-14 15:06:01 -0400
+Branch: REL9_3_STABLE [e8e20aadd] 2016-08-14 15:06:02 -0400
+Branch: REL9_2_STABLE [9d5bf77b5] 2016-08-14 15:06:02 -0400
+Branch: REL9_1_STABLE [7e01c8ef3] 2016-08-14 15:06:02 -0400
+-->
+     <para>
+      Remove artificial restrictions on the values accepted
+      by <function>numeric_in()</> and <function>numeric_recv()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      We allow numeric values up to the limit of the storage format (more
+      than <literal>1e100000</>), so it seems fairly pointless
+      that <function>numeric_in()</> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      reject more than 1000 digits in an input value.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid very-low-probability data corruption due to testing tuple
+      visibility without holding buffer lock (Thomas Munro, Peter Geoghegan,
+      Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Preserve commit timestamps across server restart
+      (Julien Rouhaud, Craig Ringer)
+     </para>
+
+     <para>
+      With <xref linkend="guc-track-commit-timestamp"> turned on, old
+      commit timestamps became inaccessible after a clean server restart.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix logical WAL decoding to work properly when a subtransaction's WAL
+      output is large enough to spill to disk (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [008c4135c] 2016-08-22 15:22:11 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [48b9ca0b6] 2016-08-22 15:30:31 -0400
+Branch: REL9_5_STABLE [da9659f87] 2016-08-22 15:30:37 -0400
+-->
+     <para>
+      Fix possible sorting error when aborting use of abbreviated keys
+      (Peter Geoghegan)
+     </para>
+
+     <para>
+      In the worst case, this could result in a corrupt btree index, which
+      would need to be rebuilt using <command>REINDEX</>.  However, the
+      situation is believed to be rare.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [769fd9d8e] 2016-09-08 16:51:09 -0700
+Branch: REL9_6_STABLE Release: REL9_6_0 [f6802936a] 2016-09-08 16:52:13 -0700
+Branch: REL9_5_STABLE [26ce63ce7] 2016-09-08 16:52:13 -0700
+Branch: REL9_4_STABLE [075cfbe4a] 2016-09-08 16:52:13 -0700
+Branch: REL9_3_STABLE [d2a5b2b28] 2016-09-08 16:52:13 -0700
+Branch: REL9_2_STABLE [f5462dedb] 2016-09-08 16:52:13 -0700
+Branch: REL9_1_STABLE [08fdfe7a8] 2016-09-08 16:52:13 -0700
+-->
+     <para>
+      Fix file descriptor leakage when truncating a temporary relation of
+      more than 1GB (Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [0e0f43d6f] 2016-08-31 08:52:13 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [3fc489cb3] 2016-08-31 08:52:13 -0400
+Branch: REL9_5_STABLE [c40bb1155] 2016-08-31 08:52:13 -0400
+Branch: REL9_4_STABLE [f4e40537e] 2016-08-31 08:52:13 -0400
+Branch: REL9_3_STABLE [baf111d31] 2016-08-31 08:52:13 -0400
+Branch: REL9_2_STABLE [823df401d] 2016-08-31 08:52:13 -0400
+Branch: REL9_1_STABLE [e3439a455] 2016-08-31 08:52:13 -0400
+-->
+     <para>
+      Disallow starting a standalone backend with <literal>standby_mode</>
+      turned on (Michael Paquier)
+     </para>
+
+     <para>
+      This can't do anything useful, since there will be no WAL receiver
+      process to fetch more WAL data; and it could result in misbehavior
+      in code that wasn't designed with this situation in mind.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [2d7e59100] 2016-08-17 13:15:03 -0700
+Branch: REL9_6_STABLE Release: REL9_6_0 [8cb23dba8] 2016-08-17 13:15:03 -0700
+Branch: REL9_5_STABLE [de396a1cb] 2016-08-17 13:15:03 -0700
+Branch: REL9_4_STABLE [690a2fb90] 2016-08-17 13:15:04 -0700
+-->
+     <para>
+      Properly initialize replication slot state when recycling a
+      previously-used slot (Michael Paquier)
+     </para>
+
+     <para>
+      This failure to reset all of the fields of the slot could
+      prevent <command>VACUUM</> from removing dead tuples.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Round shared-memory allocation request to a multiple of the actual
+      huge page size when attempting to use huge pages on Linux (Tom Lane)
+     </para>
+
+     <para>
+      This avoids possible failures during <function>munmap()</> on systems
+      with atypical default huge page sizes.  Except in crash-recovery
+      cases, there were no ill effects other than a log message.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [470d886c3] 2016-09-20 12:26:29 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [92668cd4d] 2016-09-20 12:28:02 -0400
+Branch: REL9_5_STABLE [b1aed95f5] 2016-09-20 12:30:38 -0400
+Branch: REL9_4_STABLE [626312d1b] 2016-09-20 12:30:42 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [49a91b88e] 2016-09-23 09:54:11 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [b251379fb] 2016-09-23 09:54:11 -0400
+Branch: REL9_5_STABLE [93528f7b4] 2016-09-23 09:54:11 -0400
+Branch: REL9_4_STABLE [32cdf680f] 2016-09-23 09:54:11 -0400
+-->
+     <para>
+      Use a more random value for the dynamic shared memory control
+      segment's ID (Robert Haas, Tom Lane)
+     </para>
+
+     <para>
+      Previously, the same value would be chosen every time, because it was
+      derived from <function>random()</> but <function>srandom()</> had not
+      yet been called.  While relatively harmless, this was not the intended
+      behavior.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [419113dfd] 2016-09-20 12:04:41 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [6bcd26c43] 2016-09-20 12:12:27 -0400
+Branch: REL9_5_STABLE [c124e3649] 2016-09-20 12:12:31 -0400
+Branch: REL9_4_STABLE [c23b2523d] 2016-09-20 12:12:36 -0400
+-->
+     <para>
+      On Windows, retry creation of the dynamic shared memory control
+      segment after an access-denied error (Kyotaro Horiguchi, Amit Kapila)
+     </para>
+
+     <para>
+      Windows sometimes returns <literal>ERROR_ACCESS_DENIED</> rather
+      than <literal>ERROR_ALREADY_EXISTS</> when there is an existing
+      segment.  This led to postmaster startup failure due to believing that
+      the former was an unrecoverable error.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [5697522d8] 2016-08-18 14:49:08 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [c81c71d88] 2016-08-18 14:48:51 -0400
+Branch: REL9_5_STABLE [a8fc19505] 2016-08-18 14:48:51 -0400
+-->
+     <para>
+      Fix <application>PL/pgSQL</> to not misbehave with parameters and
+      local variables of type <type>int2vector</> or <type>oidvector</>
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't try to share SSL contexts across multiple connections
+      in <application>libpq</> (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This led to assorted corner-case bugs, particularly when trying to use
+      different SSL parameters for different connections.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+     </para>
+
+     <para>
+      The reported problem involved leaking an error report
+      during <function>PQreset()</>, but there might be related cases.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [3fcc98c99] 2016-09-18 13:46:32 +0300
+Branch: REL9_6_STABLE Release: REL9_6_0 [e06728d63] 2016-09-18 13:56:11 +0300
+Branch: REL9_5_STABLE [7c177ddc2] 2016-09-18 13:56:52 +0300
+Branch: REL9_4_STABLE [d48e10a68] 2016-09-18 13:59:57 +0300
+Branch: REL9_3_STABLE [b31f335bf] 2016-09-18 14:00:10 +0300
+Branch: REL9_2_STABLE [a4a3fac16] 2016-09-18 14:00:13 +0300
+Branch: REL9_1_STABLE [ed29d2de2] 2016-09-18 14:07:30 +0300
+-->
+     <para>
+      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      options work consistently with our other executables (Haribabu Kommi)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [40c3fe498] 2016-09-19 22:55:43 +0300
+Branch: REL9_6_STABLE Release: REL9_6_0 [f65764a04] 2016-09-19 22:55:50 +0300
+Branch: REL9_5_STABLE [edb5c4097] 2016-09-19 22:58:03 +0300
+Branch: REL9_4_STABLE [476945c45] 2016-09-19 22:59:44 +0300
+Branch: master [65c655638] 2016-09-21 13:14:48 +0300
+Branch: REL9_6_STABLE Release: REL9_6_0 [93834a20f] 2016-09-21 13:16:02 +0300
+Branch: REL9_5_STABLE [b93d37474] 2016-09-21 13:16:20 +0300
+Branch: REL9_4_STABLE [f16d4a241] 2016-09-21 13:16:24 +0300
+-->
+     <para>
+      Fix <application>pgbench</>'s calculation of average latency
+      (Fabien Coelho)
+     </para>
+
+     <para>
+      The calculation was incorrect when there were <literal>\sleep</>
+      commands in the script, or when the test duration was specified in
+      number of transactions rather than total time.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, check library loadability in name order
+      (Tom Lane)
+     </para>
+
+     <para>
+      This is a workaround to deal with cross-extension dependencies from
+      language transform modules to their base language and data type
+      modules.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [12f6eadff] 2016-09-23 13:49:26 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [7e02476f3] 2016-09-23 13:49:26 -0400
+Branch: REL9_5_STABLE [96e16d739] 2016-09-23 13:49:26 -0400
+Branch: REL9_4_STABLE [912ea1945] 2016-09-23 13:49:27 -0400
+Branch: REL9_3_STABLE [f39bb487d] 2016-09-23 13:49:27 -0400
+Branch: REL9_2_STABLE [53b29d986] 2016-09-23 13:49:27 -0400
+-->
+     <para>
+      In <application>pg_dump</>, never dump range constructor functions
+      (Tom Lane)
+     </para>
+
+     <para>
+      This oversight led to <application>pg_upgrade</> failures with
+      extensions containing range types, due to duplicate creation of the
+      constructor functions.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [e97e9c57b] 2016-09-08 10:48:03 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [a88cee90f] 2016-09-08 10:48:03 -0400
+Branch: REL9_5_STABLE [142a110b3] 2016-09-08 10:48:03 -0400
+-->
+     <para>
+      In <application>pg_dump</> with <option>-C</>,
+      suppress <literal>TABLESPACE</> clause of <command>CREATE DATABASE</>
+      if <option>--no-tablespaces</> is specified (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Simon Riggs <simon@2ndQuadrant.com>
+Branch: master [49340627f] 2016-08-29 12:16:18 +0100
+Branch: REL9_6_STABLE Release: REL9_6_0 [216fd7fe7] 2016-08-29 12:18:12 +0100
+Branch: REL9_5_STABLE [9050e5c89] 2016-08-29 12:18:57 +0100
+Branch: REL9_5_STABLE [3aa233f82] 2016-08-29 18:12:04 -0300
+-->
+     <para>
+      Make <application>pg_receivexlog</> work correctly
+      with <option>--synchronous</> without slots (Gabriele Bartolini)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow specifying both <option>--source-server</>
+      and <option>--source-target</> options to <application>pg_rewind</>
+      (Michael Banck)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>pg_rewind</> turn off <varname>synchronous_commit</>
+      in its session on the source server (Michael Banck, Michael Paquier)
+     </para>
+
+     <para>
+      This allows <application>pg_rewind</> to work even when the source
+      server is using synchronous replication that is not working for some
+      reason.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_xlogdump</>, retry opening new WAL segments when
+      using <option>--follow</> option (Magnus Hagander)
+     </para>
+
+     <para>
+      This allows for a possible delay in the server's creation of the next
+      segment.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [bab7823a4] 2016-08-29 14:34:58 +0900
+Branch: REL9_6_STABLE Release: REL9_6_0 [2802b02a5] 2016-08-29 14:35:40 +0900
+Branch: REL9_5_STABLE [7dfb9b479] 2016-08-29 14:35:51 +0900
+Branch: REL9_4_STABLE [314a25fb3] 2016-08-29 14:38:17 +0900
+Branch: REL9_3_STABLE [5833306dd] 2016-08-29 15:51:30 +0900
+-->
+     <para>
+      Fix <application>pg_xlogdump</> to cope with a WAL file that begins
+      with a continuation record spanning more than one page (Pavan
+      Deolasee)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [8a503526e] 2016-09-15 09:30:38 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [bea38f34a] 2016-09-15 09:30:37 -0400
+Branch: REL9_5_STABLE [60b6d99da] 2016-09-15 09:30:36 -0400
+Branch: REL9_4_STABLE [1336bd986] 2016-09-15 09:22:52 -0400
+-->
+     <para>
+      Fix <filename>contrib/pg_buffercache</> to work
+      when <varname>shared_buffers</> exceeds 256GB (KaiGai Kohei)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [6657acc01] 2016-08-17 15:51:10 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [d715b76d1] 2016-08-17 15:51:10 -0400
+Branch: REL9_5_STABLE [509815ed7] 2016-08-17 15:51:10 -0400
+Branch: REL9_4_STABLE [3fa8ec44d] 2016-08-17 15:51:10 -0400
+Branch: REL9_3_STABLE [7baa8bfca] 2016-08-17 15:51:10 -0400
+Branch: REL9_2_STABLE [60bb1bb12] 2016-08-17 15:51:11 -0400
+Branch: REL9_1_STABLE [9942376a5] 2016-08-17 15:51:11 -0400
+-->
+     <para>
+      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
+      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      (Daniel Gustafsson)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
+Branch: master [593d4e47d] 2016-09-15 14:42:29 +0300
+Branch: REL9_6_STABLE Release: REL9_6_0 [fcd93e4af] 2016-09-15 12:55:38 +0300
+Branch: REL9_5_STABLE [e2838c580] 2016-09-15 14:51:42 +0300
+Branch: master [5c6df67e0] 2016-09-15 22:52:51 +0300
+Branch: REL9_6_STABLE Release: REL9_6_0 [9895818d5] 2016-09-15 22:45:08 +0300
+Branch: REL9_5_STABLE [48e5ba61e] 2016-09-15 22:38:01 +0300
+-->
+     <para>
+      Support OpenSSL 1.1.0 (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [c3a081846] 2016-09-23 15:50:00 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [5a83e2d4e] 2016-09-23 15:50:00 -0400
+Branch: REL9_5_STABLE [025c9a722] 2016-09-23 15:50:00 -0400
+Branch: REL9_4_STABLE [5d41f27a9] 2016-09-23 15:50:00 -0400
+-->
+     <para>
+      Install TAP test infrastructure so that it's available for extension
+      testing (Craig Ringer)
+     </para>
+
+     <para>
+      When <productname>PostgreSQL</> has been configured
+      with <option>--enable-tap-tests</>, <quote>make install</> will now
+      install the Perl support files for TAP testing where PGXS can find
+      them.  This allows non-core extensions to
+      use <literal>$(prove_check)</> without extra tests.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [8614b39bc] 2016-09-19 14:25:57 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [156f974f5] 2016-09-19 14:27:04 -0400
+Branch: REL9_5_STABLE [52acf020a] 2016-09-19 14:27:08 -0400
+Branch: REL9_4_STABLE [ca93b816f] 2016-09-19 14:27:13 -0400
+-->
+     <para>
+      In MSVC builds, include <application>pg_recvlogical</> in a
+      client-only installation (MauMau)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Magnus Hagander <magnus@hagander.net>
+Branch: master [a79a68562] 2016-08-18 12:32:42 +0200
+Branch: REL9_6_STABLE Release: REL9_6_0 [191d45793] 2016-08-18 12:37:55 +0200
+Branch: REL9_5_STABLE [a0833b972] 2016-08-18 15:35:12 +0200
+Branch: REL9_4_STABLE [1d990cd8c] 2016-08-18 15:35:26 +0200
+Branch: REL9_3_STABLE [e8aed974b] 2016-08-18 15:35:36 +0200
+Branch: REL9_2_STABLE [35982db49] 2016-08-18 15:35:43 +0200
+-->
+     <para>
+      Update Windows time zone mapping to recognize some time zone names
+      added in recent Windows versions (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [39b691f25] 2016-09-02 17:30:02 -0400
+Branch: REL9_6_STABLE Release: REL9_6_0 [32c9950b3] 2016-09-02 17:29:31 -0400
+Branch: REL9_5_STABLE [73a802a41] 2016-09-02 17:29:31 -0400
+Branch: REL9_4_STABLE [7430ac852] 2016-09-02 17:29:32 -0400
+Branch: REL9_3_STABLE [ee78d4885] 2016-09-02 17:29:32 -0400
+Branch: REL9_2_STABLE [1195b8efe] 2016-09-02 17:29:32 -0400
+Branch: REL9_1_STABLE [380dad29d] 2016-09-02 17:29:32 -0400
+-->
+     <para>
+      Prevent failure of obsolete dynamic time zone abbreviations (Tom Lane)
+     </para>
+
+     <para>
+      If a dynamic time zone abbreviation does not match any entry in the
+      referenced time zone, treat it as equivalent to the time zone name.
+      This avoids unexpected failures when IANA removes abbreviations from
+      their time zone database, as they did in <application>tzdata</>
+      release 2016f and seem likely to do again in the future.  The
+      consequences were not limited to not recognizing the individual
+      abbreviation; any mismatch caused
+      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016h
+      for DST law changes in Palestine and Turkey, plus historical
+      corrections for Turkey and some regions of Russia.
+      Switch to numeric abbreviations for some time zones in Antarctica,
+      the former Soviet Union, and Sri Lanka.
+     </para>
+
+     <para>
+      The IANA time zone database previously provided textual abbreviations
+      for all time zones, sometimes making up abbreviations that have little
+      or no currency among the local population.  They are in process of
+      reversing that policy in favor of using numeric UTC offsets in zones
+      where there is no evidence of real-world use of an English
+      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      will continue to accept such removed abbreviations for timestamp input.
+      But they will not be shown in the <structname>pg_timezone_names</>
+      view nor used for output.
+     </para>
+
+     <para>
+      In this update, <literal>AMT</> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-5-4">
+  <title>Release 9.5.4</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-08-11</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.5.3.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.4</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.5.2,
+    see <xref linkend="release-9-5-2">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [f0c7b789a] 2016-08-08 10:33:46 -0400
+Branch: REL9_5_STABLE [98b0c6280] 2016-08-08 10:33:46 -0400
+Branch: REL9_4_STABLE [f40618092] 2016-08-08 10:33:47 -0400
+Branch: REL9_3_STABLE [6c954a6a5] 2016-08-08 10:33:47 -0400
+Branch: REL9_2_STABLE [8b32516db] 2016-08-08 10:33:47 -0400
+Branch: REL9_1_STABLE [5327b764a] 2016-08-08 10:33:47 -0400
+-->
+     <para>
+      Fix possible mis-evaluation of
+      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      Linnakangas, Michael Paquier, Tom Lane)
+     </para>
+
+     <para>
+      A <literal>CASE</> expression appearing within the test value
+      subexpression of another <literal>CASE</> could become confused about
+      whether its own test value was null or not.  Also, inlining of a SQL
+      function implementing the equality operator used by
+      a <literal>CASE</> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</> expression in the
+      SQL function's body.  If the test values were of different data
+      types, a crash might result; moreover such situations could be abused
+      to allow disclosure of portions of server memory.  (CVE-2016-5423)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [fcd15f135] 2016-08-08 10:07:46 -0400
+Branch: REL9_5_STABLE [286c8bc64] 2016-08-08 10:07:50 -0400
+Branch: REL9_4_STABLE [254eb04f1] 2016-08-08 10:07:51 -0400
+Branch: REL9_3_STABLE [95a6855c5] 2016-08-08 10:07:52 -0400
+Branch: REL9_2_STABLE [e8f4922c8] 2016-08-08 10:07:53 -0400
+Branch: REL9_1_STABLE [a2385cac1] 2016-08-08 10:07:54 -0400
+Branch: master [41f18f021] 2016-08-08 10:07:46 -0400
+Branch: REL9_5_STABLE [8adff3783] 2016-08-08 10:07:50 -0400
+Branch: REL9_4_STABLE [6df8ff49d] 2016-08-08 10:07:51 -0400
+Branch: REL9_3_STABLE [c1b048f49] 2016-08-08 10:07:52 -0400
+Branch: REL9_2_STABLE [f1d0b09cf] 2016-08-08 10:07:53 -0400
+Branch: REL9_1_STABLE [d2dd5df51] 2016-08-08 10:07:54 -0400
+Branch: REL9_2_STABLE [a19edcd24] 2016-08-08 10:07:53 -0400
+Branch: REL9_1_STABLE [c761c9fee] 2016-08-08 10:07:54 -0400
+Branch: master [bd6537185] 2016-08-08 10:07:46 -0400
+Branch: REL9_5_STABLE [2e5e90d8d] 2016-08-08 10:07:50 -0400
+Branch: REL9_4_STABLE [18392ed4a] 2016-08-08 10:07:51 -0400
+Branch: REL9_3_STABLE [395d565ac] 2016-08-08 10:07:52 -0400
+Branch: REL9_2_STABLE [483715529] 2016-08-08 10:07:53 -0400
+Branch: REL9_1_STABLE [2d69f5b12] 2016-08-08 10:07:54 -0400
+Branch: master [142c24c23] 2016-08-08 10:07:46 -0400
+Branch: REL9_5_STABLE [ec3aebdbd] 2016-08-08 10:07:50 -0400
+Branch: REL9_4_STABLE [6bec1a6c8] 2016-08-08 10:07:51 -0400
+Branch: REL9_3_STABLE [0f679d2c1] 2016-08-08 10:07:52 -0400
+Branch: REL9_2_STABLE [ffbdab65d] 2016-08-08 10:07:53 -0400
+Branch: REL9_1_STABLE [61c2cd88d] 2016-08-08 10:07:53 -0400
+Branch: master [c40071717] 2016-08-08 10:07:46 -0400
+Branch: REL9_5_STABLE [640768ceb] 2016-08-08 10:07:50 -0400
+Branch: REL9_4_STABLE [aed038795] 2016-08-08 10:07:51 -0400
+Branch: REL9_3_STABLE [05abd3bcf] 2016-08-08 10:07:52 -0400
+Branch: REL9_2_STABLE [a466ea33c] 2016-08-08 10:07:52 -0400
+Branch: REL9_1_STABLE [ba8c4089d] 2016-08-08 10:07:53 -0400
+Branch: master [9d924e9a6] 2016-08-08 10:07:46 -0400
+Branch: REL9_5_STABLE [6655c0757] 2016-08-08 10:07:50 -0400
+Branch: REL9_4_STABLE [afabfcc0e] 2016-08-08 10:07:51 -0400
+Branch: REL9_3_STABLE [dfb2d8039] 2016-08-08 10:07:51 -0400
+Branch: REL9_2_STABLE [f744e8906] 2016-08-08 10:07:52 -0400
+Branch: REL9_1_STABLE [cf7e5f55b] 2016-08-08 10:07:53 -0400
+Branch: master [984e5beb3] 2016-08-08 10:07:46 -0400
+Branch: REL9_5_STABLE [db951dd19] 2016-08-08 10:07:50 -0400
+Branch: REL9_4_STABLE [fed83cdac] 2016-08-08 10:07:51 -0400
+Branch: REL9_3_STABLE [a44d71351] 2016-08-08 10:07:51 -0400
+Branch: REL9_2_STABLE [0cc3b12d2] 2016-08-08 10:07:52 -0400
+Branch: REL9_1_STABLE [aed766ab5] 2016-08-08 10:07:53 -0400
+-->
+     <para>
+      Fix client programs' handling of special characters in database and
+      role names (Noah Misch, Nathan Bossart, Michael Paquier)
+     </para>
+
+     <para>
+      Numerous places in <application>vacuumdb</> and other client programs
+      could become confused by database and role names containing double
+      quotes or backslashes.  Tighten up quoting rules to make that safe.
+      Also, ensure that when a conninfo string is used as a database name
+      parameter to these programs, it is correctly treated as such throughout.
+     </para>
+
+     <para>
+      Fix handling of paired double quotes
+      in <application>psql</>'s <command>\connect</>
+      and <command>\password</> commands to match the documentation.
+     </para>
+
+     <para>
+      Introduce a new <option>-reuse-previous</> option
+      in <application>psql</>'s <command>\connect</> command to allow
+      explicit control of whether to re-use connection parameters from a
+      previous connection.  (Without this, the choice is based on whether
+      the database name looks like a conninfo string, as before.)  This
+      allows secure handling of database names containing special
+      characters in <application>pg_dumpall</> scripts.
+     </para>
+
+     <para>
+      <application>pg_dumpall</> now refuses to deal with database and role
+      names containing carriage returns or newlines, as it seems impractical
+      to quote those characters safely on Windows.  In future we may reject
+      such names on the server side, but that step has not been taken yet.
+     </para>
+
+     <para>
+      These are considered security fixes because crafted object names
+      containing special characters could have been used to execute
+      commands with superuser privileges the next time a superuser
+      executes <application>pg_dumpall</> or other routine maintenance
+      operations.  (CVE-2016-5424)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [4452000f3] 2016-07-26 15:25:02 -0400
+Branch: REL9_5_STABLE [d2ef7758d] 2016-07-26 15:25:02 -0400
+Branch: REL9_4_STABLE [0733188cc] 2016-07-26 15:25:02 -0400
+Branch: REL9_3_STABLE [c235d510e] 2016-07-26 15:25:02 -0400
+Branch: REL9_2_STABLE [bcdd8a194] 2016-07-26 15:25:02 -0400
+Branch: REL9_1_STABLE [d243bf77c] 2016-07-26 15:25:02 -0400
+Branch: master [9492cf86e] 2016-07-28 16:09:15 -0400
+Branch: REL9_5_STABLE [1e2f96f0a] 2016-07-28 16:09:15 -0400
+Branch: REL9_4_STABLE [66f7e4081] 2016-07-28 16:09:15 -0400
+Branch: REL9_3_STABLE [069714387] 2016-07-28 16:09:15 -0400
+Branch: REL9_2_STABLE [7b8526e5d] 2016-07-28 16:09:15 -0400
+Branch: REL9_1_STABLE [c0e5096fc] 2016-07-28 16:09:15 -0400
+-->
+     <para>
+      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
+      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+     </para>
+
+     <para>
+      The SQL standard specifies that <literal>IS NULL</> should return
+      TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
+      NULL</> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      The core executor got this right, but certain planner optimizations
+      treated the test as recursive (thus producing TRUE in both cases),
+      and <filename>contrib/postgres_fdw</> could produce remote queries
+      that misbehaved similarly.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [eae1ad9b6] 2016-05-23 19:23:36 -0400
+Branch: REL9_5_STABLE [e504d915b] 2016-05-23 19:23:36 -0400
+-->
+     <para>
+      Fix <quote>unrecognized node type</> error for <command>INSERT ... ON
+      CONFLICT</> within a recursive CTE (a <literal>WITH</> item) (Peter
+      Geoghegan)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [26e66184d] 2016-05-11 16:20:23 -0400
+Branch: REL9_5_STABLE [58d802410] 2016-05-11 16:20:03 -0400
+-->
+     <para>
+      Fix <command>INSERT ... ON CONFLICT</> to successfully match index
+      expressions or index predicates that are simplified during the
+      planner's expression preprocessing phase (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [9c810a2ed] 2016-07-04 16:09:11 -0400
+Branch: REL9_5_STABLE [31ce32ade] 2016-07-04 16:09:11 -0400
+-->
+     <para>
+      Correctly handle violations of exclusion constraints that apply to
+      the target table of an <literal>INSERT ... ON CONFLICT</> command,
+      but are not one of the selected arbiter indexes (Tom Lane)
+     </para>
+
+     <para>
+      Such a case should raise a normal constraint-violation error, but it
+      got into an infinite loop instead.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [8a13d5e6d] 2016-05-11 17:06:53 -0400
+Branch: REL9_5_STABLE [428484ce1] 2016-05-11 17:06:53 -0400
+-->
+     <para>
+      Fix <command>INSERT ... ON CONFLICT</> to not fail if the target
+      table has a unique index on OID (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [4c56f3269] 2016-06-16 17:16:32 -0400
+Branch: REL9_5_STABLE [a41b14f94] 2016-06-16 17:16:40 -0400
+Branch: REL9_4_STABLE [2a8b5d210] 2016-06-16 17:16:44 -0400
+Branch: REL9_3_STABLE [519445ba2] 2016-06-16 17:16:48 -0400
+Branch: REL9_2_STABLE [f66e0fec3] 2016-06-16 17:16:53 -0400
+Branch: REL9_1_STABLE [7b97dafa2] 2016-06-16 17:16:58 -0400
+-->
+     <para>
+      Make the <type>inet</> and <type>cidr</> data types properly reject
+      IPv6 addresses with too many colon-separated fields (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [278148907] 2016-07-16 14:42:37 -0400
+Branch: REL9_5_STABLE [884bae143] 2016-07-16 14:42:37 -0400
+Branch: REL9_4_STABLE [59fa0195c] 2016-07-16 14:42:37 -0400
+Branch: REL9_3_STABLE [16e28fcec] 2016-07-16 14:42:37 -0400
+Branch: REL9_2_STABLE [89b301104] 2016-07-16 14:42:37 -0400
+Branch: REL9_1_STABLE [608cc0c41] 2016-07-16 14:42:37 -0400
+-->
+     <para>
+      Prevent crash in <function>close_ps()</>
+      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      for NaN input coordinates (Tom Lane)
+     </para>
+
+     <para>
+      Make it return NULL instead of crashing.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [0daeba0e9] 2016-07-01 11:40:33 -0400
+Branch: REL9_5_STABLE [40d0bd8d5] 2016-07-01 11:40:22 -0400
+Branch: REL9_4_STABLE [b25d87f91] 2016-07-01 11:40:22 -0400
+Branch: REL9_3_STABLE [b0f20c2ea] 2016-07-01 11:40:22 -0400
+-->
+     <para>
+      Avoid possible crash in <function>pg_get_expr()</> when inconsistent
+      values are passed to it (Michael Paquier, Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [9a46324fd] 2016-08-08 11:12:59 -0400
+Branch: REL9_5_STABLE [04cee8f83] 2016-08-08 11:13:25 -0400
+Branch: REL9_4_STABLE [20f870fd7] 2016-08-08 11:13:34 -0400
+Branch: REL9_3_STABLE [43d7a0af5] 2016-08-08 11:13:40 -0400
+Branch: REL9_2_STABLE [b0134fe84] 2016-08-08 11:13:45 -0400
+Branch: REL9_1_STABLE [d555d2642] 2016-08-08 11:13:51 -0400
+-->
+     <para>
+      Fix several one-byte buffer over-reads in <function>to_number()</>
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      In several cases the <function>to_number()</> function would read one
+      more character than it should from the input string.  There is a
+      small chance of a crash, if the input happens to be adjacent to the
+      end of memory.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [874fe3aea] 2016-06-27 15:57:50 -0400
+Branch: REL9_5_STABLE [1651b9aa2] 2016-06-27 15:57:21 -0400
+Branch: REL9_4_STABLE [dc9e03bf4] 2016-06-27 15:57:21 -0400
+Branch: REL9_3_STABLE [17bfef80e] 2016-06-27 15:57:21 -0400
+-->
+     <para>
+      Do not run the planner on the query contained in <literal>CREATE
+      MATERIALIZED VIEW</> or <literal>CREATE TABLE AS</>
+      when <literal>WITH NO DATA</> is specified (Michael Paquier,
+      Tom Lane)
+     </para>
+
+     <para>
+      This avoids some unnecessary failure conditions, for example if a
+      stable function invoked by the materialized view depends on a table
+      that doesn't exist yet.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [bfa2ab56b] 2016-07-15 17:49:48 -0700
+Branch: REL9_5_STABLE [1f9534b49] 2016-07-15 17:49:48 -0700
+Branch: REL9_4_STABLE [3d5b227ba] 2016-07-15 17:49:48 -0700
+Branch: REL9_3_STABLE [2e51ae1f6] 2016-07-15 17:49:48 -0700
+Branch: REL9_2_STABLE [941557f18] 2016-07-15 17:49:48 -0700
+Branch: REL9_1_STABLE [37276017f] 2016-07-15 17:49:49 -0700
+-->
+     <para>
+      Avoid unsafe intermediate state during expensive paths
+      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+     </para>
+
+     <para>
+      Previously, these cases locked the target tuple (by setting its XMAX)
+      but did not WAL-log that action, thus risking data integrity problems
+      if the page were spilled to disk and then a database crash occurred
+      before the tuple update could be completed.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [a4d357bfb] 2016-07-15 14:45:37 -0700
+Branch: REL9_5_STABLE [b33e81cba] 2016-07-15 14:45:38 -0700
+Branch: REL9_4_STABLE [f66828ba6] 2016-07-15 14:50:46 -0700
+Branch: REL9_3_STABLE [46acbeb2f] 2016-07-15 14:51:03 -0700
+-->
+     <para>
+      Fix hint bit update during WAL replay of row locking operations
+      (Andres Freund)
+     </para>
+
+     <para>
+      The only known consequence of this problem is that row locks held by
+      a prepared, but uncommitted, transaction might fail to be enforced
+      after a crash and restart.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [533e9c6b0] 2016-07-15 14:17:20 -0400
+Branch: REL9_5_STABLE [649dd1b58] 2016-07-15 14:17:20 -0400
+Branch: REL9_4_STABLE [166873dd0] 2016-07-15 14:17:20 -0400
+Branch: REL9_3_STABLE [6c243f90a] 2016-07-15 14:17:20 -0400
+-->
+     <para>
+      Avoid unnecessary <quote>could not serialize access</> errors when
+      acquiring <literal>FOR KEY SHARE</> row locks in serializable mode
+      (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [69f526aa4] 2016-06-03 15:14:50 -0400
+Branch: REL9_5_STABLE [a102f98e2] 2016-06-03 15:14:35 -0400
+Branch: master [9eaf5be50] 2016-06-03 18:07:14 -0400
+Branch: REL9_5_STABLE [8355897ff] 2016-06-03 18:07:14 -0400
+-->
+     <para>
+      Make sure <quote>expanded</> datums returned by a plan node are
+      read-only (Tom Lane)
+     </para>
+
+     <para>
+      This avoids failures in some cases where the result of a lower plan
+      node is referenced in multiple places in upper nodes.  So far as
+      core <productname>PostgreSQL</> is concerned, only array values
+      returned by PL/pgSQL functions are at risk; but extensions might
+      use expanded datums for other things.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [0b0baf262] 2016-06-16 12:17:38 -0400
+Branch: REL9_5_STABLE [4f5995dd9] 2016-06-16 12:17:11 -0400
+Branch: REL9_4_STABLE [e542bfe61] 2016-06-16 12:17:16 -0400
+Branch: REL9_3_STABLE [29987b2e1] 2016-06-16 12:17:20 -0400
+Branch: REL9_2_STABLE [23ed284a5] 2016-06-16 12:17:25 -0400
+Branch: master [e45e990e4] 2016-06-22 11:55:18 -0400
+Branch: REL9_5_STABLE [f2c28bb1f] 2016-06-22 11:55:24 -0400
+Branch: REL9_4_STABLE [f22a3e5ce] 2016-06-22 11:55:28 -0400
+Branch: REL9_3_STABLE [dafdcbb6c] 2016-06-22 11:55:32 -0400
+Branch: REL9_2_STABLE [dd41661d2] 2016-06-22 11:55:35 -0400
+-->
+     <para>
+      Avoid crash in <literal>postgres -C</> when the specified variable
+      has a null string value (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [80b346c20] 2016-07-29 12:52:57 -0400
+Branch: REL9_5_STABLE [c8966a925] 2016-07-29 12:53:02 -0400
+-->
+     <para>
+      Prevent unintended waits for the receiver in WAL sender processes
+      (Kyotaro Horiguchi)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [f8c58554d] 2016-06-30 12:37:02 -0400
+Branch: REL9_5_STABLE [8caf9fe62] 2016-06-30 12:37:02 -0400
+Branch: REL9_4_STABLE [1843d88e0] 2016-06-30 12:37:02 -0400
+-->
+     <para>
+      Fix possible loss of large subtransactions in logical decoding
+      (Petru-Florin Mihancea)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [bcbecbce2] 2016-08-07 13:15:55 -0400
+Branch: REL9_5_STABLE [71dca408c] 2016-08-07 13:15:55 -0400
+Branch: REL9_4_STABLE [c63588feb] 2016-08-07 13:15:55 -0400
+-->
+     <para>
+      Fix failure of logical decoding when a subtransaction contains no
+      actual changes (Marko Tiikkaja, Andrew Gierth)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [52e8fc3e2] 2016-05-25 17:48:15 -0400
+Branch: REL9_5_STABLE [b2355a29c] 2016-05-25 17:48:15 -0400
+Branch: REL9_4_STABLE [4b612a78f] 2016-05-25 17:48:15 -0400
+Branch: REL9_3_STABLE [463207630] 2016-05-25 17:48:15 -0400
+-->
+     <para>
+      Ensure that backends see up-to-date statistics for shared catalogs
+      (Tom Lane)
+     </para>
+
+     <para>
+      The statistics collector failed to update the statistics file for
+      shared catalogs after a request from a regular backend.  This problem
+      was partially masked because the autovacuum launcher regularly makes
+      requests that did cause such updates; however, it became obvious with
+      autovacuum disabled.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [22b27b4c9] 2016-05-31 15:55:15 -0400
+Branch: REL9_5_STABLE [47215c16f] 2016-05-31 15:54:46 -0400
+Branch: REL9_4_STABLE [3ffff7257] 2016-05-31 15:54:46 -0400
+Branch: REL9_3_STABLE [a84cad224] 2016-05-31 15:54:47 -0400
+-->
+     <para>
+      Avoid redundant writes of the statistics files when multiple
+      backends request updates close together (Tom Lane, Tomas Vondra)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [996d27397] 2016-05-24 15:20:36 -0400
+Branch: REL9_5_STABLE [a34c3dd50] 2016-05-24 15:20:12 -0400
+Branch: REL9_4_STABLE [defe936ef] 2016-05-24 15:20:12 -0400
+Branch: REL9_3_STABLE [9f3e4c813] 2016-05-24 15:20:12 -0400
+Branch: REL9_2_STABLE [2e7f0c34a] 2016-05-24 15:20:12 -0400
+Branch: REL9_1_STABLE [fe1731fca] 2016-05-24 15:20:12 -0400
+Branch: master [2d2e40e3b] 2016-05-24 15:47:51 -0400
+Branch: REL9_5_STABLE [bbbe2c97e] 2016-05-24 15:47:51 -0400
+Branch: REL9_4_STABLE [edd8873ff] 2016-05-24 15:47:51 -0400
+Branch: REL9_3_STABLE [ff98ae908] 2016-05-24 15:47:51 -0400
+Branch: REL9_2_STABLE [4cf0978ea] 2016-05-24 15:47:51 -0400
+Branch: REL9_1_STABLE [5551dac59] 2016-05-24 15:47:51 -0400
+-->
+     <para>
+      Avoid consuming a transaction ID during <command>VACUUM</>
+      (Alexander Korotkov)
+     </para>
+
+     <para>
+      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      assigned to the current transaction.  Normally this is negligible,
+      but if one is up against the XID wraparound limit, consuming more
+      XIDs during anti-wraparound vacuums is a very bad thing.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [e3ad3ffa6] 2016-06-24 18:29:28 -0400
+Branch: REL9_5_STABLE [d372cb173] 2016-06-24 18:29:28 -0400
+Branch: REL9_4_STABLE [61b24fef8] 2016-06-24 18:29:28 -0400
+Branch: REL9_3_STABLE [28f294afd] 2016-06-24 18:29:28 -0400
+-->
+     <para>
+      Prevent possible failure when vacuuming multixact IDs in an
+      installation that has been pg_upgrade'd from pre-9.3 (Andrew Gierth,
+      &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      The usual symptom of this bug is errors
+      like <quote>MultiXactId <replaceable>NNN</> has not been created
+      yet -- apparent wraparound</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [f64340e74] 2016-06-06 17:44:17 -0400
+Branch: REL9_5_STABLE [5acc58c5e] 2016-06-06 17:44:17 -0400
+Branch: REL9_4_STABLE [a4400c251] 2016-06-06 17:44:17 -0400
+Branch: REL9_3_STABLE [5f3e0e84b] 2016-06-06 17:44:17 -0400
+Branch: REL9_2_STABLE [3201709de] 2016-06-06 17:44:18 -0400
+Branch: REL9_1_STABLE [32ceb8dfb] 2016-06-06 17:44:18 -0400
+-->
+     <para>
+      When a manual <command>ANALYZE</> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</> counter
+      (Tom Lane)
+     </para>
+
+     <para>
+      If we're only analyzing some columns, we should not prevent routine
+      auto-analyze from happening for the other columns.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [95bee941b] 2016-08-07 18:52:02 -0400
+Branch: REL9_5_STABLE [cb5c14984] 2016-08-07 18:52:02 -0400
+Branch: REL9_4_STABLE [8f180a6cc] 2016-08-07 18:52:02 -0400
+Branch: REL9_3_STABLE [20a859504] 2016-08-07 18:52:02 -0400
+Branch: REL9_2_STABLE [127d73009] 2016-08-07 18:52:02 -0400
+Branch: REL9_1_STABLE [a449ad095] 2016-08-07 18:52:02 -0400
+-->
+     <para>
+      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      for a unique or nearly-unique column with many null entries (Tom
+      Lane)
+     </para>
+
+     <para>
+      The nulls could get counted as though they were themselves distinct
+      values, leading to serious planner misestimates in some types of
+      queries.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [15739393e] 2016-05-10 16:23:54 -0300
+Branch: REL9_5_STABLE [7516cdb76] 2016-05-10 16:23:54 -0300
+Branch: REL9_4_STABLE [e9a273199] 2016-05-10 16:23:54 -0300
+Branch: REL9_3_STABLE [92ebe509e] 2016-05-10 16:23:54 -0300
+Branch: REL9_2_STABLE [ca4c6d043] 2016-05-10 16:23:54 -0300
+Branch: REL9_1_STABLE [2152762c5] 2016-05-10 16:23:54 -0300
+-->
+     <para>
+      Prevent autovacuum from starting multiple workers for the same shared
+      catalog (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Normally this isn't much of a problem because the vacuum doesn't take
+      long anyway; but in the case of a severely bloated catalog, it could
+      result in all but one worker uselessly waiting instead of doing
+      useful work on other tables.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Kevin Grittner <kgrittn@postgresql.org>
+Branch: master [7392eed7c] 2016-06-02 12:23:01 -0500
+Branch: REL9_5_STABLE [236d569f9] 2016-06-02 12:23:19 -0500
+-->
+     <para>
+      Fix bug in b-tree mark/restore processing (Kevin Grittner)
+     </para>
+
+     <para>
+      This error could lead to incorrect join results or assertion failures
+      in a merge join whose inner source node is a b-tree indexscan.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [e89526d4f] 2016-08-06 14:28:37 -0400
+Branch: REL9_5_STABLE [ee5d1de04] 2016-08-06 14:28:37 -0400
+Branch: REL9_4_STABLE [98d5f366b] 2016-08-06 14:28:38 -0400
+-->
+     <para>
+      Avoid duplicate buffer lock release when abandoning a b-tree index
+      page deletion attempt (Tom Lane)
+     </para>
+
+     <para>
+      This mistake prevented <command>VACUUM</> from completing in some
+      cases involving corrupt b-tree indexes.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [8cf739de8] 2016-06-24 16:57:36 -0400
+Branch: REL9_5_STABLE [07f69137b] 2016-06-24 16:57:36 -0400
+-->
+     <para>
+      Fix building of large (bigger than <varname>shared_buffers</>)
+      hash indexes (Tom Lane)
+     </para>
+
+     <para>
+      The code path used for large indexes contained a bug causing
+      incorrect hash values to be inserted into the index, so that
+      subsequent index searches always failed, except for tuples inserted
+      into the index after the initial build.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [1acf75725] 2016-07-14 18:45:59 -0400
+Branch: REL9_5_STABLE [503546376] 2016-07-14 18:46:00 -0400
+Branch: REL9_4_STABLE [054052b3a] 2016-07-14 18:46:00 -0400
+Branch: REL9_3_STABLE [57dba87a7] 2016-07-14 18:46:00 -0400
+Branch: REL9_2_STABLE [042009f24] 2016-07-14 18:46:00 -0400
+-->
+     <para>
+      Prevent infinite loop in GiST index build for geometric columns
+      containing NaN component values (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [8a859691d] 2016-06-05 11:53:06 -0400
+Branch: REL9_5_STABLE [a7aa61ffe] 2016-06-05 11:53:06 -0400
+-->
+     <para>
+      Fix possible crash during a nearest-neighbor (<literal>ORDER BY</>
+      distance) indexscan on a <filename>contrib/btree_gist</> index on
+      an <type>interval</> column (Peter Geoghegan)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [975ad4e60] 2016-05-30 14:47:22 -0400
+Branch: REL9_5_STABLE [2973d7d02] 2016-05-30 14:47:22 -0400
+-->
+     <para>
+      Fix <quote>PANIC: failed to add BRIN tuple</> error when attempting
+      to update a BRIN index entry (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [8d498a5c8] 2016-08-04 16:06:14 -0400
+Branch: REL9_5_STABLE [c1d6ee879] 2016-08-04 16:06:14 -0400
+-->
+     <para>
+      Fix possible crash during background worker shutdown (Dmitry Ivanov)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [baebab3ac] 2016-07-12 18:07:03 -0400
+Branch: REL9_5_STABLE [a0943dbbe] 2016-07-12 18:06:50 -0400
+-->
+     <para>
+      Fix PL/pgSQL's handling of the <literal>INTO</> clause
+      within <command>IMPORT FOREIGN SCHEMA</> commands (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [f36ca9af0] 2016-07-17 09:15:37 -0400
+Branch: REL9_5_STABLE [fb279fc7a] 2016-07-17 09:24:06 -0400
+Branch: REL9_4_STABLE [97d741650] 2016-07-17 09:37:33 -0400
+Branch: REL9_3_STABLE [805f2bb53] 2016-07-17 09:38:23 -0400
+Branch: REL9_2_STABLE [6c0be49b2] 2016-07-17 09:39:51 -0400
+Branch: REL9_1_STABLE [84d679204] 2016-07-17 09:41:08 -0400
+-->
+     <para>
+      Fix <filename>contrib/btree_gin</> to handle the smallest
+      possible <type>bigint</> value correctly (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [69dc5ae40] 2016-08-05 18:58:12 -0400
+Branch: REL9_5_STABLE [cae0d4f9b] 2016-08-05 18:58:19 -0400
+Branch: REL9_4_STABLE [a3cd60ebf] 2016-08-05 18:58:23 -0400
+Branch: REL9_3_STABLE [c3107f18a] 2016-08-05 18:58:28 -0400
+Branch: REL9_2_STABLE [3e40d9227] 2016-08-05 18:58:32 -0400
+Branch: REL9_1_STABLE [1f63b0e09] 2016-08-05 18:58:36 -0400
+-->
+     <para>
+      Teach libpq to correctly decode server version from future servers
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      It's planned to switch to two-part instead of three-part server
+      version numbers for releases after 9.6.  Make sure
+      that <function>PQserverVersion()</> returns the correct value for
+      such cases.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [3ebc88e56] 2016-08-01 15:08:12 +0200
+Branch: REL9_5_STABLE [dc6b20c6b] 2016-08-01 15:09:23 +0200
+Branch: REL9_4_STABLE [057404854] 2016-08-01 15:09:12 +0200
+Branch: REL9_3_STABLE [3ca359426] 2016-08-01 15:08:59 +0200
+Branch: REL9_2_STABLE [295edbecf] 2016-08-01 15:08:48 +0200
+Branch: REL9_1_STABLE [c15f502b6] 2016-08-01 15:08:36 +0200
+-->
+     <para>
+      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      array elements (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [e2e95f5ef] 2016-08-02 12:49:40 -0400
+Branch: REL9_5_STABLE [89c30d113] 2016-08-02 12:49:41 -0400
+Branch: REL9_4_STABLE [2ff8a2fc0] 2016-08-02 12:49:04 -0400
+Branch: REL9_3_STABLE [6693c9d7b] 2016-08-02 12:49:09 -0400
+Branch: REL9_2_STABLE [a5a7caaa1] 2016-08-02 12:49:15 -0400
+-->
+     <para>
+      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      command (David Johnston, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [e652273e0] 2016-06-02 13:28:17 -0400
+Branch: REL9_5_STABLE [404429038] 2016-06-02 13:28:18 -0400
+Branch: REL9_4_STABLE [96aac0e6d] 2016-06-02 13:27:53 -0400
+Branch: REL9_3_STABLE [5c9724305] 2016-06-02 13:27:53 -0400
+Branch: master [6c72a28e5] 2016-06-03 11:29:38 -0400
+Branch: REL9_5_STABLE [ec5622351] 2016-06-03 11:29:20 -0400
+Branch: REL9_4_STABLE [53c2601a5] 2016-06-03 11:29:20 -0400
+Branch: REL9_3_STABLE [4a21c6fd7] 2016-06-03 11:29:20 -0400
+-->
+     <para>
+      Improve handling of <systemitem>SIGTERM</>/control-C in
+      parallel <application>pg_dump</> and <application>pg_restore</> (Tom
+      Lane)
+     </para>
+
+     <para>
+      Make sure that the worker processes will exit promptly, and also arrange
+      to send query-cancel requests to the connected backends, in case they
+      are doing something long-running such as a <command>CREATE INDEX</>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [9abd64ec9] 2016-05-25 12:40:12 -0400
+Branch: REL9_5_STABLE [af6555b80] 2016-05-25 12:39:57 -0400
+Branch: REL9_4_STABLE [ea274b2f4] 2016-05-25 12:39:57 -0400
+Branch: REL9_3_STABLE [1c8205159] 2016-05-25 12:39:57 -0400
+-->
+     <para>
+      Fix error reporting in parallel <application>pg_dump</>
+      and <application>pg_restore</> (Tom Lane)
+     </para>
+
+     <para>
+      Previously, errors reported by <application>pg_dump</>
+      or <application>pg_restore</> worker processes might never make it to
+      the user's console, because the messages went through the master
+      process, and there were various deadlock scenarios that would prevent
+      the master process from passing on the messages.  Instead, just print
+      everything to <literal>stderr</>.  In some cases this will result in
+      duplicate messages (for instance, if all the workers report a server
+      shutdown), but that seems better than no message.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [df8d2d8c4] 2016-05-26 10:50:30 -0400
+Branch: REL9_5_STABLE [6479df137] 2016-05-26 10:50:38 -0400
+Branch: REL9_4_STABLE [d32bc204c] 2016-05-26 10:50:42 -0400
+Branch: REL9_3_STABLE [b9784e1f7] 2016-05-26 10:50:46 -0400
+-->
+     <para>
+      Ensure that parallel <application>pg_dump</>
+      or <application>pg_restore</> on Windows will shut down properly
+      after an error (Kyotaro Horiguchi)
+     </para>
+
+     <para>
+      Previously, it would report the error, but then just sit until
+      manually stopped by the user.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Magnus Hagander <magnus@hagander.net>
+Branch: master [d74048def] 2016-05-26 22:14:23 +0200
+Branch: REL9_5_STABLE [47e596976] 2016-05-26 22:18:04 +0200
+-->
+     <para>
+      Make parallel <application>pg_dump</> fail cleanly when run against a
+      standby server (Magnus Hagander)
+     </para>
+
+     <para>
+      This usage is not supported
+      unless <option>--no-synchronized-snapshots</> is specified, but the
+      error was not handled very well.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [cae2bb198] 2016-05-26 11:51:04 -0400
+Branch: REL9_5_STABLE [64b296976] 2016-05-26 11:51:11 -0400
+Branch: REL9_4_STABLE [f2f18a37c] 2016-05-26 11:51:16 -0400
+Branch: REL9_3_STABLE [99565a1ef] 2016-05-26 11:51:20 -0400
+-->
+     <para>
+      Make <application>pg_dump</> behave better when built without zlib
+      support (Kyotaro Horiguchi)
+     </para>
+
+     <para>
+      It didn't work right for parallel dumps, and emitted some rather
+      pointless warnings in other cases.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Fujii Masao <fujii@postgresql.org>
+Branch: master [74d8c95b7] 2016-08-01 17:36:14 +0900
+Branch: REL9_5_STABLE [928e92fda] 2016-08-01 17:37:18 +0900
+Branch: REL9_4_STABLE [dbe56f2a1] 2016-08-01 17:37:41 +0900
+Branch: REL9_3_STABLE [013f42372] 2016-08-01 17:37:53 +0900
+Branch: REL9_2_STABLE [a21617759] 2016-08-01 17:38:00 +0900
+Branch: REL9_1_STABLE [366f4a962] 2016-08-01 17:38:05 +0900
+-->
+     <para>
+      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      specifying no compression (Fujii Masao)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [e8564ef03] 2016-07-23 20:30:03 -0400
+Branch: REL9_5_STABLE [cf35406f9] 2016-07-23 20:30:40 -0400
+Branch: REL9_4_STABLE [f0c9e4697] 2016-07-23 20:30:44 -0400
+Branch: REL9_3_STABLE [98b7a3cf2] 2016-07-23 20:30:48 -0400
+Branch: REL9_2_STABLE [a4daf59ee] 2016-07-23 20:30:55 -0400
+Branch: REL9_1_STABLE [b1fa6c0eb] 2016-07-23 20:30:59 -0400
+-->
+     <para>
+      Fix makefiles' rule for building AIX shared libraries to be safe for
+      parallel make (Noah Misch)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [30b2731bd] 2016-07-09 16:47:38 -0400
+Branch: REL9_5_STABLE [f80395ca1] 2016-07-09 16:47:39 -0400
+Branch: REL9_4_STABLE [02a898b00] 2016-07-09 16:47:39 -0400
+Branch: REL9_3_STABLE [57e9ea2dd] 2016-07-11 11:24:04 -0400
+Branch: REL9_2_STABLE [fdf2ee62e] 2016-07-11 11:24:04 -0400
+Branch: REL9_1_STABLE [71af6c006] 2016-07-11 11:24:04 -0400
+-->
+     <para>
+      Fix TAP tests and MSVC scripts to work when build directory's path
+      name contains spaces (Michael Paquier, Kyotaro Horiguchi)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [9dd4178ce] 2016-05-27 10:40:20 -0400
+Branch: REL9_5_STABLE [cea17ba07] 2016-05-27 10:40:20 -0400
+Branch: REL9_4_STABLE [c2651cd24] 2016-05-27 10:40:20 -0400
+Branch: REL9_3_STABLE [1f1e70a87] 2016-05-27 10:40:20 -0400
+-->
+     <para>
+      Be more predictable about reporting <quote>statement timeout</>
+      versus <quote>lock timeout</> (Tom Lane)
+     </para>
+
+     <para>
+      On heavily loaded machines, the regression tests sometimes failed due
+      to reporting <quote>lock timeout</> even though the statement timeout
+      should have occurred first.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [b3399cb0f] 2016-07-21 13:11:00 -0400
+Branch: REL9_5_STABLE [fd507d542] 2016-07-21 13:11:00 -0400
+Branch: master [9d7abca90] 2016-07-22 15:41:39 -0400
+Branch: REL9_5_STABLE [2aa2533f2] 2016-07-22 15:41:40 -0400
+Branch: master [95810ed8e] 2016-07-21 14:24:07 -0400
+Branch: REL9_5_STABLE [95e8b44f0] 2016-07-21 14:24:07 -0400
+Branch: REL9_4_STABLE [dfddc452d] 2016-07-21 14:24:07 -0400
+Branch: REL9_3_STABLE [0060638c8] 2016-07-21 14:24:07 -0400
+Branch: REL9_2_STABLE [52502e7a5] 2016-07-21 14:24:07 -0400
+Branch: REL9_1_STABLE [f61ecd01e] 2016-07-21 14:24:07 -0400
+Branch: master [d70d11915] 2016-07-21 16:52:35 -0400
+Branch: REL9_5_STABLE [d365dc3d1] 2016-07-21 16:52:36 -0400
+Branch: REL9_4_STABLE [1156a9db8] 2016-07-21 16:52:36 -0400
+Branch: REL9_3_STABLE [e15e7886e] 2016-07-21 16:52:36 -0400
+Branch: REL9_2_STABLE [a1e750553] 2016-07-21 16:52:36 -0400
+Branch: REL9_1_STABLE [ba64aed70] 2016-07-21 16:52:36 -0400
+-->
+     <para>
+      Make regression tests safe for Danish and Welsh locales (Jeff Janes,
+      Tom Lane)
+     </para>
+
+     <para>
+      Change some test data that triggered the unusual sorting rules of
+      these locales.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_5_STABLE [19d477aa6] 2016-07-19 15:59:36 -0400
+Branch: REL9_4_STABLE [590a7f82b] 2016-07-19 15:59:36 -0400
+Branch: REL9_3_STABLE [3928132ea] 2016-07-19 15:59:36 -0400
+Branch: REL9_2_STABLE [cd951aa61] 2016-07-19 15:59:36 -0400
+Branch: REL9_1_STABLE [5db14fad0] 2016-07-19 15:59:36 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_5_STABLE [0aabe80c6] 2016-07-19 17:53:31 -0400
+Branch: REL9_4_STABLE [bdbcfba35] 2016-07-19 17:53:31 -0400
+Branch: REL9_3_STABLE [f102bd868] 2016-07-19 17:53:31 -0400
+Branch: REL9_2_STABLE [4d37b7cff] 2016-07-19 17:53:31 -0400
+Branch: REL9_1_STABLE [d70df7867] 2016-07-19 17:53:31 -0400
+-->
+     <para>
+      Update our copy of the timezone code to match
+      IANA's <application>tzcode</> release 2016c (Tom Lane)
+     </para>
+
+     <para>
+      This is needed to cope with anticipated future changes in the time
+      zone data files.  It also fixes some corner-case bugs in coping with
+      unusual time zones.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [a629330b2] 2016-08-05 12:59:29 -0400
+Branch: REL9_5_STABLE [3fddd6484] 2016-08-05 12:58:38 -0400
+Branch: REL9_4_STABLE [8080337b0] 2016-08-05 12:58:46 -0400
+Branch: REL9_3_STABLE [5630bd2ec] 2016-08-05 12:58:53 -0400
+Branch: REL9_2_STABLE [7822792f7] 2016-08-05 12:58:58 -0400
+Branch: REL9_1_STABLE [a44388ffe] 2016-08-05 12:59:02 -0400
+-->
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016f
+      for DST law changes in Kemerovo and Novosibirsk, plus historical
+      corrections for Azerbaijan, Belarus, and Morocco.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-5-3">
+  <title>Release 9.5.3</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-05-12</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.5.2.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.3</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.5.2,
+    see <xref linkend="release-9-5-2">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [7c7d4fdda] 2016-04-08 14:11:56 -0400
+Branch: REL9_5_STABLE [a3c17b2af] 2016-05-06 23:47:42 -0400
+Branch: REL9_4_STABLE [e3b14de9f] 2016-05-07 00:10:31 -0400
+Branch: REL9_3_STABLE [a9d8644de] 2016-05-07 00:10:17 -0400
+Branch: REL9_2_STABLE [e3a493ac0] 2016-05-07 00:05:39 -0400
+Branch: REL9_1_STABLE [9b676fd49] 2016-05-07 00:09:37 -0400
+-->
+     <para>
+      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      afterwards (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </para>
+
+     <para>
+      This change prevents problems when there are multiple connections
+      using OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      Failures have been reported specifically when a client application
+      uses SSL connections in <application>libpq</> concurrently with
+      SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
+      It's possible for similar problems to arise within the server as well,
+      if an extension module establishes an outgoing SSL connection.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [80f66a9ad] 2016-04-21 20:05:58 -0400
+Branch: REL9_5_STABLE [94c685a7c] 2016-04-21 20:05:58 -0400
+Branch: REL9_4_STABLE [3232c2427] 2016-04-21 20:05:58 -0400
+Branch: REL9_3_STABLE [d9742ac46] 2016-04-21 20:05:58 -0400
+Branch: REL9_2_STABLE [ad2d32b57] 2016-04-21 20:05:58 -0400
+Branch: REL9_1_STABLE [6882dbd34] 2016-04-21 20:05:58 -0400
+-->
+     <para>
+      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      planner error with a full join enclosed in the right-hand side of a
+      left join (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [207d5a656] 2016-04-29 20:19:38 -0400
+Branch: REL9_5_STABLE [f25d0619c] 2016-04-29 20:19:38 -0400
+Branch: REL9_4_STABLE [72edc8ffe] 2016-04-29 20:19:38 -0400
+Branch: REL9_3_STABLE [67349e5a8] 2016-04-29 20:19:38 -0400
+Branch: REL9_2_STABLE [f02cb8c9a] 2016-04-29 20:19:38 -0400
+-->
+     <para>
+      Fix incorrect handling of equivalence-class tests in multilevel
+      nestloop plans (Tom Lane)
+     </para>
+
+     <para>
+      Given a three-or-more-way equivalence class of variables, such
+      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      some of the tests needed to enforce that all the variables are actually
+      equal, leading to join rows being output that didn't satisfy
+      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      were seldom selected in practice, so that this bug has gone undetected
+      for a long time.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [abb164655] 2016-04-21 23:17:36 -0400
+Branch: REL9_5_STABLE [81deadd31] 2016-04-21 23:17:36 -0400
+-->
+     <para>
+      Fix corner-case parser failures occurring
+      when <xref linkend="guc-operator-precedence-warning"> is turned on
+      (Tom Lane)
+     </para>
+
+     <para>
+      An example is that <literal>SELECT (ARRAY[])::text[]</> gave an error,
+      though it worked without the parentheses.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [f0e766bd7] 2016-04-15 00:02:26 -0400
+Branch: REL9_5_STABLE [edd57377f] 2016-04-15 00:02:26 -0400
+Branch: REL9_4_STABLE [0479eccdc] 2016-04-15 00:02:26 -0400
+-->
+     <para>
+      Fix query-lifespan memory leak in GIN index scans (Julien Rouhaud)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [bde361fef] 2016-04-20 14:25:15 -0400
+Branch: REL9_5_STABLE [be2754456] 2016-04-20 14:25:15 -0400
+Branch: REL9_4_STABLE [ef35afa35] 2016-04-20 14:25:15 -0400
+-->
+     <para>
+      Fix query-lifespan memory leak and potential index corruption hazard in
+      GIN index insertion (Tom Lane)
+     </para>
+
+     <para>
+      The memory leak would typically not amount to much in simple queries,
+      but it could be very substantial during a large GIN index build with
+      high <varname>maintenance_work_mem</>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [d136d600f] 2016-05-06 12:09:20 -0400
+Branch: REL9_5_STABLE [504af1fe0] 2016-05-06 12:09:20 -0400
+Branch: REL9_4_STABLE [1180868d1] 2016-05-06 12:09:20 -0400
+Branch: REL9_3_STABLE [462456d8d] 2016-05-06 12:09:20 -0400
+Branch: REL9_2_STABLE [11247dd99] 2016-05-06 12:09:20 -0400
+Branch: REL9_1_STABLE [7bad282c3] 2016-05-06 12:09:20 -0400
+-->
+     <para>
+      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
+      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      These could advance off the end of the input string, causing subsequent
+      format codes to read garbage.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [1f7c85b82] 2016-04-21 14:20:30 -0400
+Branch: REL9_5_STABLE [4b52cc289] 2016-04-21 14:20:18 -0400
+Branch: REL9_4_STABLE [679c92238] 2016-04-21 14:20:18 -0400
+Branch: REL9_3_STABLE [e5882f26b] 2016-04-21 14:20:18 -0400
+Branch: REL9_2_STABLE [c7c145e4f] 2016-04-21 14:20:18 -0400
+Branch: REL9_1_STABLE [663624e60] 2016-04-21 14:20:18 -0400
+-->
+     <para>
+      Fix dumping of rules and views in which the <replaceable>array</>
+      argument of a <literal><replaceable>value</> <replaceable>operator</>
+      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [99f3b5613] 2016-04-04 18:05:23 -0400
+Branch: REL9_5_STABLE [f3d17491c] 2016-04-04 18:05:23 -0400
+Branch: REL9_4_STABLE [28148e258] 2016-04-04 18:05:24 -0400
+-->
+     <para>
+      Disallow newlines in <command>ALTER SYSTEM</> parameter values
+      (Tom Lane)
+     </para>
+
+     <para>
+      The configuration-file parser doesn't support embedded newlines in
+      string literals, so we mustn't allow them in values to be inserted
+      by <command>ALTER SYSTEM</>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [8f1911d5e] 2016-04-15 12:11:40 -0400
+Branch: REL9_5_STABLE [8f8e65d34] 2016-04-15 12:11:27 -0400
+Branch: REL9_4_STABLE [8eed31ffb] 2016-04-15 12:11:27 -0400
+-->
+     <para>
+      Fix <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX</> to
+      work properly if an index on OID is selected (David Rowley)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [93c301fc4] 2016-04-08 12:31:53 -0400
+Branch: REL9_5_STABLE [0da7cf6e8] 2016-04-08 12:31:42 -0400
+-->
+     <para>
+      Avoid possible misbehavior after failing to remove a tablespace symlink
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [6a3d3965d] 2016-04-14 19:42:21 -0400
+Branch: REL9_5_STABLE [e7a456174] 2016-04-14 19:42:22 -0400
+Branch: REL9_4_STABLE [00456911f] 2016-04-14 19:42:22 -0400
+-->
+     <para>
+      Fix crash in logical decoding on alignment-picky platforms (Tom Lane,
+      Andres Freund)
+     </para>
+
+     <para>
+      The failure occurred only with a transaction large enough to spill to
+      disk and a primary-key change within that transaction.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [59455018a] 2016-04-28 22:11:18 -0700
+Branch: REL9_5_STABLE [2e1b4adf3] 2016-04-28 22:11:18 -0700
+Branch: REL9_4_STABLE [596f93605] 2016-04-28 22:11:18 -0700
+-->
+     <para>
+      Avoid repeated requests for feedback from receiver while shutting down
+      walsender (Nick Cleaton)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [cbabb70f3] 2016-04-20 23:48:13 -0400
+Branch: REL9_5_STABLE [0b8e0bf0a] 2016-04-20 23:48:13 -0400
+Branch: REL9_4_STABLE [f05ac711b] 2016-04-20 23:48:13 -0400
+Branch: REL9_3_STABLE [691073bd8] 2016-04-20 23:48:13 -0400
+Branch: REL9_2_STABLE [1b22368ff] 2016-04-20 23:48:13 -0400
+Branch: REL9_1_STABLE [4c1c9f80b] 2016-04-20 23:48:13 -0400
+-->
+     <para>
+      Make <application>pg_regress</> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+     </para>
+
+     <para>
+      This is for consistency with a behavior recently added
+      to <application>pg_ctl</>; it eases automated testing on slow machines.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [6cead413b] 2016-04-13 18:58:14 -0400
+Branch: REL9_5_STABLE [fb0f63933] 2016-04-13 18:57:52 -0400
+Branch: REL9_4_STABLE [5daf1012a] 2016-04-13 18:57:52 -0400
+Branch: REL9_3_STABLE [34bf6bc56] 2016-04-13 18:57:52 -0400
+Branch: REL9_2_STABLE [6bb42d520] 2016-04-13 18:57:52 -0400
+Branch: REL9_1_STABLE [3ef1f3a3e] 2016-04-13 18:57:52 -0400
+-->
+     <para>
+      Fix <application>pg_upgrade</> to correctly restore extension
+      membership for operator families containing only one operator class
+      (Tom Lane)
+     </para>
+
+     <para>
+      In such a case, the operator family was restored into the new database,
+      but it was no longer marked as part of the extension.  This had no
+      immediate ill effects, but would cause later <application>pg_dump</>
+      runs to emit output that would cause (harmless) errors on restore.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [1a2c17f8e] 2016-05-06 22:05:56 -0400
+Branch: REL9_5_STABLE [196870f2f] 2016-05-06 22:05:51 -0400
+Branch: REL9_4_STABLE [e1aecebc0] 2016-05-06 22:05:51 -0400
+Branch: REL9_3_STABLE [e1d88f983] 2016-05-06 22:05:51 -0400
+-->
+     <para>
+      Fix <application>pg_upgrade</> to not fail when new-cluster TOAST rules
+      differ from old (Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_upgrade</> had special-case code to handle the
+      situation where the new <productname>PostgreSQL</> version thinks that
+      a table should have a TOAST table while the old version did not.  That
+      code was broken, so remove it, and instead do nothing in such cases;
+      there seems no reason to believe that we can't get along fine without
+      a TOAST table if that was okay according to the old version's rules.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [213c7df03] 2016-04-26 21:53:58 -0400
+Branch: REL9_5_STABLE [f9989482d] 2016-04-26 21:54:07 -0400
+-->
+     <para>
+      Fix atomic operations for PPC when using IBM's XLC compiler (Noah Misch)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [75c24d0f7] 2016-04-18 13:33:06 -0400
+Branch: REL9_5_STABLE [c6a5b6677] 2016-04-18 13:33:07 -0400
+Branch: REL9_4_STABLE [21b7f49eb] 2016-04-18 13:33:07 -0400
+Branch: REL9_3_STABLE [6ec1ff852] 2016-04-18 13:33:07 -0400
+Branch: REL9_2_STABLE [b24f7e280] 2016-04-18 13:33:07 -0400
+-->
+     <para>
+      Reduce the number of SysV semaphores used by a build configured with
+      <option>--disable-spinlocks</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [0ab3595e5] 2016-04-23 16:53:15 -0400
+Branch: REL9_5_STABLE [bdf7744f7] 2016-04-23 16:53:15 -0400
+Branch: REL9_4_STABLE [2a715371c] 2016-04-23 16:53:15 -0400
+Branch: REL9_3_STABLE [252c35895] 2016-04-23 16:53:15 -0400
+Branch: REL9_2_STABLE [0f5491283] 2016-04-23 16:53:15 -0400
+Branch: REL9_1_STABLE [cbff4b708] 2016-04-23 16:53:15 -0400
+-->
+     <para>
+      Rename internal function <function>strtoi()</>
+      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      function (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_5_STABLE [20d4428f0] 2016-04-21 15:44:18 -0400
+Branch: REL9_4_STABLE [5e2fb8862] 2016-04-21 15:44:18 -0400
+Branch: REL9_3_STABLE [8f9518414] 2016-04-21 15:44:18 -0400
+Branch: REL9_2_STABLE [6848827b4] 2016-04-21 15:44:18 -0400
+Branch: REL9_1_STABLE [b2bb59bd5] 2016-04-21 15:44:18 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [125ad539a] 2016-04-21 16:58:47 -0400
+Branch: REL9_5_STABLE [d2e59cbc3] 2016-04-21 16:58:59 -0400
+Branch: REL9_4_STABLE [56dee70d9] 2016-04-21 16:59:04 -0400
+Branch: REL9_3_STABLE [82bf369ed] 2016-04-21 16:59:08 -0400
+Branch: REL9_2_STABLE [b5ebc513d] 2016-04-21 16:59:13 -0400
+Branch: REL9_1_STABLE [9028f404e] 2016-04-21 16:59:17 -0400
+-->
+     <para>
+      Fix reporting of errors from <function>bind()</>
+      and <function>listen()</> system calls on Windows (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [01a07e6c1] 2016-04-08 12:37:20 -0400
+Branch: REL9_5_STABLE [849167943] 2016-04-08 12:36:59 -0400
+Branch: REL9_4_STABLE [f79a7fa90] 2016-04-08 12:29:31 -0400
+Branch: REL9_3_STABLE [ca5d6edbf] 2016-04-08 12:29:34 -0400
+Branch: REL9_2_STABLE [9e77d0e3c] 2016-04-08 12:29:36 -0400
+Branch: REL9_1_STABLE [d2189a802] 2016-04-08 12:33:29 -0400
+-->
+     <para>
+      Reduce verbosity of compiler output when building with Microsoft Visual
+      Studio (Christian Ullrich)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [0fb54de9a] 2016-04-29 08:09:07 -0400
+Branch: REL9_5_STABLE [da52474f3] 2016-04-29 08:06:25 -0400
+Branch: master [7dc549238] 2016-04-29 09:49:31 -0400
+Branch: REL9_5_STABLE [b71b4d852] 2016-04-29 09:50:38 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [23b09e15b] 2016-04-28 11:50:58 -0400
+Branch: REL9_5_STABLE [94a16531b] 2016-04-28 11:51:08 -0400
+Branch: REL9_4_STABLE [65c2eeb00] 2016-04-28 11:51:13 -0400
+Branch: REL9_3_STABLE [707c44fe2] 2016-04-28 11:51:17 -0400
+Branch: REL9_2_STABLE [c563d97c6] 2016-04-28 11:51:22 -0400
+Branch: REL9_1_STABLE [a6c6789c4] 2016-04-28 11:51:26 -0400
+-->
+     <para>
+      Support building with Visual Studio 2015
+      (Michael Paquier, Petr Jel&iacute;nek)
+     </para>
+
+     <para>
+      Note that builds made with VS2015 will not run on Windows versions
+      before Windows Vista.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Magnus Hagander <magnus@hagander.net>
+Branch: master [9f633b404] 2016-04-22 05:18:59 -0400
+Branch: REL9_5_STABLE [409c49c64] 2016-04-22 05:19:57 -0400
+Branch: REL9_4_STABLE [c238a4101] 2016-04-22 05:20:07 -0400
+Branch: REL9_3_STABLE [ab5c6d01f] 2016-04-22 05:20:18 -0400
+-->
+     <para>
+      Fix <function>putenv()</> to work properly with Visual Studio 2013
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [7abc15716] 2016-03-29 11:55:19 -0400
+Branch: REL9_5_STABLE [491e84738] 2016-03-29 11:54:57 -0400
+Branch: REL9_4_STABLE [2fed676c9] 2016-03-29 11:54:57 -0400
+Branch: REL9_3_STABLE [11cc7bb88] 2016-03-29 11:54:57 -0400
+Branch: REL9_2_STABLE [b4b06931e] 2016-03-29 11:54:58 -0400
+Branch: REL9_1_STABLE [6cd30292b] 2016-03-29 11:54:58 -0400
+-->
+     <para>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      function (Christian Ullrich)
+     </para>
+
+     <para>
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      appropriate.  No live bug is known to exist here, but it seems like a
+      good idea to be careful.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [98f158e41] 2016-05-05 20:08:58 -0400
+Branch: REL9_5_STABLE [4edbb265c] 2016-05-05 20:09:10 -0400
+Branch: REL9_4_STABLE [a5148e800] 2016-05-05 20:09:17 -0400
+Branch: REL9_3_STABLE [d30c67af8] 2016-05-05 20:09:22 -0400
+Branch: REL9_2_STABLE [29d154e36] 2016-05-05 20:09:27 -0400
+Branch: REL9_1_STABLE [bfc39da64] 2016-05-05 20:09:32 -0400
+-->
+     <para>
+      Update time zone data files to <application>tzdata</> release 2016d
+      for DST law changes in Russia and Venezuela.  There are new zone
+      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      the fact that these regions now have different time zone histories from
+      adjacent regions.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-5-2">
   <title>Release 9.5.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2016-03-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-03-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.5.1.
@@ -449,7 +4785,7 @@
 
      <para>
       This dodges a portability problem on FreeBSD-derived platforms
-      (including OS X).
+      (including macOS).
      </para>
     </listitem>
 
@@ -715,10 +5051,10 @@
  <sect1 id="release-9-5-1">
   <title>Release 9.5.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2016-02-11</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2016-02-11</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 9.5.0.
@@ -1163,10 +5499,10 @@
  <sect1 id="release-9-5">
   <title>Release 9.5</title>
 
-  <note>
-   <title>Release Date</title>
-   <simpara>2016-01-07</simpara>
-  </note>
+  <formalpara>
+   <title>Release date:</title>
+   <para>2016-01-07</para>
+  </formalpara>
 
   <sect2>
    <title>Overview</title>
@@ -1770,7 +6106,7 @@
 -->
        <para>
         Add per-table autovacuum logging control via new
-        <varname>log_min_autovacuum_duration</> storage parameter
+        <varname>log_autovacuum_min_duration</> storage parameter
         (Michael Paquier)
        </para>
       </listitem>
@@ -2176,7 +6512,7 @@
 -->
        <para>
         Report the processes holding replication slots in <link
-        linkend="catalog-pg-replication-slots"><structname>pg_replication_slots</></>
+        linkend="view-pg-replication-slots"><structname>pg_replication_slots</></>
         (Craig Ringer)
        </para>
 
@@ -3401,7 +7737,7 @@
         <para>
          <application>psql</> now fails if the file specified by
          an <option>--output</> or <option>--log-file</> switch cannot be
-         written (Tom Lane, Daniel Verite)
+         written (Tom Lane, Daniel V&eacute;rit&eacute;)
         </para>
 
         <para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release-old.sgml postgresql-9.5-9.5.8/doc/src/sgml/release-old.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release-old.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release-old.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -4,10 +4,10 @@
  <sect1 id="release-7-3-21">
   <title>Release 7.3.21</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2008-01-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2008-01-07</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.20,
@@ -116,10 +116,10 @@
  <sect1 id="release-7-3-20">
   <title>Release 7.3.20</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-09-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-09-17</para>
+  </formalpara>
 
   <para>
    This release contains fixes from 7.3.19.
@@ -177,10 +177,10 @@
  <sect1 id="release-7-3-19">
   <title>Release 7.3.19</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-04-23</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-04-23</para>
+  </formalpara>
 
   <para>
    This release contains fixes from 7.3.18,
@@ -233,10 +233,10 @@
  <sect1 id="release-7-3-18">
   <title>Release 7.3.18</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-02-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-02-05</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.17, including
@@ -295,10 +295,10 @@
  <sect1 id="release-7-3-17">
   <title>Release 7.3.17</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2007-01-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2007-01-08</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.16.
@@ -351,10 +351,10 @@
  <sect1 id="release-7-3-16">
   <title>Release 7.3.16</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-10-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-10-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.15.
@@ -393,10 +393,10 @@
  <sect1 id="release-7-3-15">
   <title>Release 7.3.15</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-05-23</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-05-23</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.14,
@@ -485,10 +485,10 @@
  <sect1 id="release-7-3-14">
   <title>Release 7.3.14</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-02-14</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-02-14</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.13.
@@ -542,10 +542,10 @@
  <sect1 id="release-7-3-13">
   <title>Release 7.3.13</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2006-01-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2006-01-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.12.
@@ -604,10 +604,10 @@
  <sect1 id="release-7-3-12">
   <title>Release 7.3.12</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-12-12</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-12-12</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.11.
@@ -651,10 +651,10 @@
  <sect1 id="release-7-3-11">
   <title>Release 7.3.11</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-10-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-10-04</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.10.
@@ -702,10 +702,10 @@
  <sect1 id="release-7-3-10">
   <title>Release 7.3.10</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-05-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-05-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.9, including several
@@ -828,10 +828,10 @@
  <sect1 id="release-7-3-9">
   <title>Release 7.3.9</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-01-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-01-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.8, including several
@@ -884,10 +884,10 @@
  <sect1 id="release-7-3-8">
   <title>Release 7.3.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2004-10-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2004-10-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.7.
@@ -934,10 +934,10 @@
  <sect1 id="release-7-3-7">
   <title>Release 7.3.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2004-08-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2004-08-16</para>
+  </formalpara>
 
   <para>
    This release contains one critical fix over 7.3.6, and some minor items.
@@ -974,10 +974,10 @@
  <sect1 id="release-7-3-6">
   <title>Release 7.3.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2004-03-02</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2004-03-02</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.3.5.
@@ -1039,10 +1039,10 @@
  <sect1 id="release-7-3-5">
   <title>Release 7.3.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2003-12-03</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2003-12-03</para>
+  </formalpara>
 
   <para>
    This has a variety of fixes from 7.3.4.
@@ -1090,10 +1090,10 @@
  <sect1 id="release-7-3-4">
   <title>Release 7.3.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2003-07-24</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2003-07-24</para>
+  </formalpara>
 
   <para>
    This has a variety of fixes from 7.3.3.
@@ -1130,10 +1130,10 @@
 <sect1 id="release-7-3-3">
  <title>Release 7.3.3</title>
 
- <note>
-  <title>Release Date</title>
-  <simpara>2003-05-22</simpara>
- </note>
+ <formalpara>
+  <title>Release date:</title>
+  <para>2003-05-22</para>
+ </formalpara>
 
  <para>
   This release contains a variety of fixes for version 7.3.2.
@@ -1240,10 +1240,10 @@
 <sect1 id="release-7-3-2">
  <title>Release 7.3.2</title>
 
- <note>
-  <title>Release Date</title>
-  <simpara>2003-02-04</simpara>
- </note>
+ <formalpara>
+  <title>Release date:</title>
+  <para>2003-02-04</para>
+ </formalpara>
 
  <para>
   This release contains a variety of fixes for version 7.3.1.
@@ -1301,10 +1301,10 @@
 <sect1 id="release-7-3-1">
  <title>Release 7.3.1</title>
 
- <note>
-  <title>Release Date</title>
-  <simpara>2002-12-18</simpara>
- </note>
+ <formalpara>
+  <title>Release date:</title>
+  <para>2002-12-18</para>
+ </formalpara>
 
  <para>
   This release contains a variety of fixes for version 7.3.
@@ -1351,10 +1351,10 @@
 <sect1 id="release-7-3">
  <title>Release 7.3</title>
 
- <note>
-  <title>Release Date</title>
-  <simpara>2002-11-27</simpara>
- </note>
+ <formalpara>
+  <title>Release date:</title>
+  <para>2002-11-27</para>
+ </formalpara>
 
  <sect2>
   <title>Overview</title>
@@ -1987,10 +1987,10 @@
  <sect1 id="release-7-2-8">
   <title>Release 7.2.8</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-05-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-05-09</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.2.7, including one
@@ -2038,10 +2038,10 @@
  <sect1 id="release-7-2-7">
   <title>Release 7.2.7</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2005-01-31</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2005-01-31</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.2.6, including several
@@ -2086,10 +2086,10 @@
  <sect1 id="release-7-2-6">
   <title>Release 7.2.6</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2004-10-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2004-10-22</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.2.5.
@@ -2137,10 +2137,10 @@
  <sect1 id="release-7-2-5">
   <title>Release 7.2.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2004-08-16</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2004-08-16</para>
+  </formalpara>
 
   <para>
    This release contains a variety of fixes from 7.2.4.
@@ -2180,10 +2180,10 @@
 <sect1 id="release-7-2-4">
  <title>Release 7.2.4</title>
 
- <note>
-  <title>Release Date</title>
-  <simpara>2003-01-30</simpara>
- </note>
+ <formalpara>
+  <title>Release date:</title>
+  <para>2003-01-30</para>
+ </formalpara>
 
  <para>
   This release contains a variety of fixes for version 7.2.3,
@@ -2219,10 +2219,10 @@
 <sect1 id="release-7-2-3">
  <title>Release 7.2.3</title>
 
- <note>
-  <title>Release Date</title>
-  <simpara>2002-10-01</simpara>
- </note>
+ <formalpara>
+  <title>Release date:</title>
+  <para>2002-10-01</para>
+ </formalpara>
 
  <para>
   This release contains a variety of fixes for version 7.2.2,
@@ -2256,10 +2256,10 @@
 <sect1 id="release-7-2-2">
  <title>Release 7.2.2</title>
 
- <note>
-  <title>Release Date</title>
-  <simpara>2002-08-23</simpara>
- </note>
+ <formalpara>
+  <title>Release date:</title>
+  <para>2002-08-23</para>
+ </formalpara>
 
  <para>
   This release contains a variety of fixes for version 7.2.1.
@@ -2299,10 +2299,10 @@
 <sect1 id="release-7-2-1">
  <title>Release 7.2.1</title>
 
- <note>
-  <title>Release Date</title>
-  <simpara>2002-03-21</simpara>
- </note>
+ <formalpara>
+  <title>Release date:</title>
+  <para>2002-03-21</para>
+ </formalpara>
 
  <para>
   This release contains a variety of fixes for version 7.2.
@@ -2345,10 +2345,10 @@
 <sect1 id="release-7-2">
  <title>Release 7.2</title>
 
- <note>
-  <title>Release Date</title>
-  <simpara>2002-02-04</simpara>
- </note>
+ <formalpara>
+  <title>Release date:</title>
+  <para>2002-02-04</para>
+ </formalpara>
 
  <sect2>
   <title>Overview</title>
@@ -2901,10 +2901,10 @@
  <sect1 id="release-7-1-3">
   <title>Release 7.1.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2001-08-15</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2001-08-15</para>
+  </formalpara>
 
   <sect2>
    <title>Migration to Version 7.1.3</title>
@@ -2939,10 +2939,10 @@
  <sect1 id="release-7-1-2">
   <title>Release 7.1.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2001-05-11</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2001-05-11</para>
+  </formalpara>
 
   <para>
    This has one fix from 7.1.1.
@@ -2977,10 +2977,10 @@
  <sect1 id="release-7-1-1">
   <title>Release 7.1.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2001-05-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2001-05-05</para>
+  </formalpara>
 
   <para>
    This has a variety of fixes from 7.1.
@@ -3024,10 +3024,10 @@
  <sect1 id="release-7-1">
   <title>Release 7.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2001-04-13</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2001-04-13</para>
+  </formalpara>
 
   <para>
        This release focuses on removing limitations that have existed in the
@@ -3322,10 +3322,10 @@
  <sect1 id="release-7-0-3">
   <title>Release 7.0.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2000-11-11</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2000-11-11</para>
+  </formalpara>
 
   <para>
    This has a variety of fixes from 7.0.2.
@@ -3394,10 +3394,10 @@
  <sect1 id="release-7-0-2">
   <title>Release 7.0.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2000-06-05</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2000-06-05</para>
+  </formalpara>
 
   <para>
    This is a repackaging of 7.0.1 with added documentation.
@@ -3428,10 +3428,10 @@
  <sect1 id="release-7-0-1">
   <title>Release 7.0.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2000-06-01</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2000-06-01</para>
+  </formalpara>
 
   <para>
    This is a cleanup release for 7.0.
@@ -3483,10 +3483,10 @@
  <sect1 id="release-7-0">
   <title>Release 7.0</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>2000-05-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>2000-05-08</para>
+  </formalpara>
 
   <para>
    This release contains improvements in many areas, demonstrating
@@ -3952,10 +3952,10 @@
  <sect1 id="release-6-5-3">
   <title>Release 6.5.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1999-10-13</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1999-10-13</para>
+  </formalpara>
 
   <para>
    This is basically a cleanup release for 6.5.2.  We have added a new
@@ -3988,10 +3988,10 @@
  <sect1 id="release-6-5-2">
   <title>Release 6.5.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1999-09-15</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1999-09-15</para>
+  </formalpara>
 
   <para>
    This is basically a cleanup release for 6.5.1.  We have fixed a variety of
@@ -4045,10 +4045,10 @@
  <sect1 id="release-6-5-1">
   <title>Release 6.5.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1999-07-15</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1999-07-15</para>
+  </formalpara>
 
   <para>
    This is basically a cleanup release for 6.5.  We have fixed a variety of
@@ -4100,10 +4100,10 @@
  <sect1 id="release-6-5">
   <title>Release 6.5</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1999-06-09</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1999-06-09</para>
+  </formalpara>
 
   <para>
    This release marks a major step in the development team's mastery of the source
@@ -4500,10 +4500,10 @@
 <sect1 id="release-6-4-2">
 <title>Release 6.4.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1998-12-20</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1998-12-20</para>
+  </formalpara>
 
 <para>
 The 6.4.1 release was improperly packaged.  This also has one additional
@@ -4535,10 +4535,10 @@
 <sect1 id="release-6-4-1">
 <title>Release 6.4.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1998-12-18</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1998-12-18</para>
+  </formalpara>
 
 <para>
 This is basically a cleanup release for 6.4.  We have fixed a variety of
@@ -4599,10 +4599,10 @@
 <sect1 id="release-6-4">
 <title>Release 6.4</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1998-10-30</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1998-10-30</para>
+  </formalpara>
 
 <para>
 There are <emphasis>many</emphasis> new features and improvements in this release.
@@ -4896,10 +4896,10 @@
 <sect1 id="release-6-3-2">
 <title>Release 6.3.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1998-04-07</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1998-04-07</para>
+  </formalpara>
 
 <para>
 This is a bug-fix release for 6.3.x.
@@ -4966,10 +4966,10 @@
  <sect1 id="release-6-3-1">
   <title>Release 6.3.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1998-03-23</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1998-03-23</para>
+  </formalpara>
 
   <para>
    Summary:
@@ -5052,10 +5052,10 @@
  <sect1 id="release-6-3">
   <title>Release 6.3</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1998-03-01</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1998-03-01</para>
+  </formalpara>
 
   <para>
    There are <emphasis>many</emphasis> new features and improvements in this release.
@@ -5364,10 +5364,10 @@
 <sect1 id="release-6-2-1">
 <title>Release 6.2.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1997-10-17</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1997-10-17</para>
+  </formalpara>
 
 <para>
 6.2.1 is a bug-fix and usability release on 6.2.
@@ -5446,10 +5446,10 @@
 <sect1 id="release-6-2">
 <title>Release 6.2</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1997-10-02</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1997-10-02</para>
+  </formalpara>
 
 <para>
 A dump/restore is required for those wishing to migrate data from
@@ -5599,10 +5599,10 @@
 <sect1 id="release-6-1-1">
 <title>Release 6.1.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1997-07-22</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1997-07-22</para>
+  </formalpara>
 
 <sect2>
 <title>Migration from version 6.1 to version 6.1.1</title>
@@ -5644,10 +5644,10 @@
 <sect1 id="release-6-1">
 <title>Release 6.1</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1997-06-08</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1997-06-08</para>
+  </formalpara>
 
 <para>
  The regression tests have been adapted and extensively modified for the
@@ -5737,8 +5737,8 @@
 fix gist for use in inner scan, cleanups (Vadim, Andrea)
 avoid unnecessary local buffers allocation (Vadim, Massimo)
 fix local buffers leak in transaction aborts (Vadim)
-fix file manager memmory leaks, cleanups (Vadim, Massimo)
-fix storage manager memmory leaks (Vadim)
+fix file manager memory leaks, cleanups (Vadim, Massimo)
+fix storage manager memory leaks (Vadim)
 fix btree duplicates handling (Vadim)
 fix deleted rows reincarnation caused by vacuum (Vadim)
 fix SELECT varchar()/char() INTO TABLE made zero-length fields(Bruce)
@@ -5816,10 +5816,10 @@
 <sect1 id="release-6-0">
 <title>Release 6.0</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1997-01-29</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1997-01-29</para>
+  </formalpara>
 
 <para>
 A dump/restore is required for those wishing to migrate data from
@@ -5904,7 +5904,7 @@
 Execute lowercase function names if not found with exact case
 Fixes for aggregate/GROUP processing, allow 'select sum(func(x),sum(x+y) from z'
 Gist now included in the distribution(Marc)
-Idend authentication of local users(Bryan)
+Ident authentication of local users(Bryan)
 Implement BETWEEN qualifier(Bruce)
 Implement IN qualifier(Bruce)
 libpq has PQgetisnull()(Bruce)
@@ -5960,10 +5960,10 @@
 <sect1 id="release-1-09">
 <title>Release 1.09</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1996-11-04</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1996-11-04</para>
+  </formalpara>
 
 <para>
 Sorry, we didn't keep track of changes from 1.02 to 1.09.  Some of
@@ -5975,10 +5975,10 @@
 <sect1 id="release-1-02">
 <title>Release 1.02</title>
 
-  <note>
-  <title>Release Date</title>
-  <simpara>1996-08-01</simpara>
-  </note>
+  <formalpara>
+  <title>Release date:</title>
+  <para>1996-08-01</para>
+  </formalpara>
 
 <sect2>
 <title>Migration from version 1.02 to version 1.02.1</title>
@@ -6124,10 +6124,10 @@
 <sect1 id="release-1-01">
 <title>Release 1.01</title>
 
-   <note>
-   <title>Release Date</title>
-   <simpara>1996-02-23</simpara>
-   </note>
+   <formalpara>
+   <title>Release date:</title>
+   <para>1996-02-23</para>
+   </formalpara>
 
 
 <sect2>
@@ -6316,10 +6316,10 @@
 <sect1 id="release-1-0">
 <title>Release 1.0</title>
 
-   <note>
-   <title>Release Date</title>
-   <simpara>1995-09-05</simpara>
-   </note>
+   <formalpara>
+   <title>Release date:</title>
+   <para>1995-09-05</para>
+   </formalpara>
 
 <sect2>
 <title>Changes</title>
@@ -6373,10 +6373,10 @@
 <sect1 id="release-0-03">
 <title><productname>Postgres95</productname> Release 0.03</title>
 
-   <note>
-   <title>Release Date</title>
-   <simpara>1995-07-21</simpara>
-   </note>
+   <formalpara>
+   <title>Release date:</title>
+   <para>1995-07-21</para>
+   </formalpara>
 
 <sect2>
 <title>Changes</title>
@@ -6495,10 +6495,10 @@
 <sect1 id="release-0-02">
 <title><productname>Postgres95</productname> Release 0.02</title>
 
-   <note>
-   <title>Release Date</title>
-   <simpara>1995-05-25</simpara>
-   </note>
+   <formalpara>
+   <title>Release date:</title>
+   <para>1995-05-25</para>
+   </formalpara>
 
 <sect2>
 <title>Changes</title>
@@ -6546,10 +6546,10 @@
 <sect1 id="release-0-01">
 <title><productname>Postgres95</productname> Release 0.01</title>
 
-   <note>
-   <title>Release Date</title>
-   <simpara>1995-05-01</simpara>
-   </note>
+   <formalpara>
+   <title>Release date:</title>
+   <para>1995-05-01</para>
+   </formalpara>
 
 <para>
 Initial release.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/release.sgml postgresql-9.5-9.5.8/doc/src/sgml/release.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/release.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/release.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -55,9 +55,9 @@
    A complete list of changes for each release can be obtained by
    viewing the <link linkend="git">Git</link> logs for each release.
    The <ulink
-   url="http://archives.postgresql.org/pgsql-committers/"><literal>pgsql-committers</literal>
+   url="https://archives.postgresql.org/pgsql-committers/"><literal>pgsql-committers</literal>
    email list</ulink> records all source code changes as well.  There is also
-   a <ulink url="http://git.postgresql.org/gitweb?p=postgresql.git;a=summary">web
+   a <ulink url="https://git.postgresql.org/gitweb?p=postgresql.git;a=summary">web
    interface</ulink> that shows changes to specific files.
   </para>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/replication-origins.sgml postgresql-9.5-9.5.8/doc/src/sgml/replication-origins.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/replication-origins.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/replication-origins.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -66,7 +66,7 @@
   <link linkend="pg-replication-origin-xact-setup"><function>pg_replication_origin_xact_setup()</function></link>.
   If that's done replication progress will persist in a crash safe
   manner. Replay progress for all replication origins can be seen in the
-  <link linkend="catalog-pg-replication-origin-status">
+  <link linkend="view-pg-replication-origin-status">
    <structname>pg_replication_origin_status</structname>
   </link> view. An individual origin's progress, e.g. when resuming
   replication, can be acquired using
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/rowtypes.sgml postgresql-9.5-9.5.8/doc/src/sgml/rowtypes.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/rowtypes.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/rowtypes.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -19,7 +19,7 @@
   column of a table can be declared to be of a composite type.
  </para>
 
- <sect2>
+ <sect2 id="rowtypes-declaring">
   <title>Declaration of Composite Types</title>
 
  <para>
@@ -90,7 +90,7 @@
  </sect2>
 
  <sect2>
-  <title>Composite Value Input</title>
+  <title>Constructing Composite Values</title>
 
   <indexterm>
    <primary>composite type</primary>
@@ -101,8 +101,9 @@
    To write a composite value as a literal constant, enclose the field
    values within parentheses and separate them by commas.  You can put double
    quotes around any field value, and must do so if it contains commas or
-   parentheses.  (More details appear below.)  Thus, the general format of a
-   composite constant is the following:
+   parentheses.  (More details appear <link
+   linkend="rowtypes-io-syntax">below</link>.)  Thus, the general format of
+   a composite constant is the following:
 <synopsis>
 '( <replaceable>val1</replaceable> , <replaceable>val2</replaceable> , ... )'
 </synopsis>
@@ -129,7 +130,8 @@
    the generic type constants discussed in <xref
    linkend="sql-syntax-constants-generic">.  The constant is initially
    treated as a string and passed to the composite-type input conversion
-   routine.  An explicit type specification might be necessary.)
+   routine.  An explicit type specification might be necessary to tell
+   which type to convert the constant to.)
   </para>
 
  <para>
@@ -143,7 +145,7 @@
 ROW('', 42, NULL)
 </programlisting>
   The ROW keyword is actually optional as long as you have more than one
-  field in the expression, so these can simplify to:
+  field in the expression, so these can be simplified to:
 <programlisting>
 ('fuzzy dice', 42, 1.99)
 ('', 42, NULL)
@@ -153,7 +155,7 @@
  </para>
  </sect2>
 
- <sect2>
+ <sect2 id="rowtypes-accessing">
   <title>Accessing Composite Types</title>
 
  <para>
@@ -198,6 +200,11 @@
 
   Without the extra parentheses, this will generate a syntax error.
  </para>
+
+ <para>
+  The special field name <literal>*</> means <quote>all fields</>, as
+  further explained in <xref linkend="rowtypes-usage">.
+ </para>
  </sect2>
 
  <sect2>
@@ -243,6 +250,199 @@
  </para>
  </sect2>
 
+ <sect2 id="rowtypes-usage">
+  <title>Using Composite Types in Queries</title>
+
+  <para>
+   There are various special syntax rules and behaviors associated with
+   composite types in queries.  These rules provide useful shortcuts,
+   but can be confusing if you don't know the logic behind them.
+  </para>
+
+  <para>
+   In <productname>PostgreSQL</>, a reference to a table name (or alias)
+   in a query is effectively a reference to the composite value of the
+   table's current row.  For example, if we had a table
+   <structname>inventory_item</> as shown
+   <link linkend="rowtypes-declaring">above</link>, we could write:
+<programlisting>
+SELECT c FROM inventory_item c;
+</programlisting>
+   This query produces a single composite-valued column, so we might get
+   output like:
+<programlisting>
+           c
+------------------------
+ ("fuzzy dice",42,1.99)
+(1 row)
+</programlisting>
+   Note however that simple names are matched to column names before table
+   names, so this example works only because there is no column
+   named <structfield>c</> in the query's tables.
+  </para>
+
+  <para>
+   The ordinary qualified-column-name
+   syntax <replaceable>table_name</><literal>.</><replaceable>column_name</>
+   can be understood as applying <link linkend="field-selection">field
+   selection</link> to the composite value of the table's current row.
+   (For efficiency reasons, it's not actually implemented that way.)
+  </para>
+
+  <para>
+   When we write
+<programlisting>
+SELECT c.* FROM inventory_item c;
+</programlisting>
+   then, according to the SQL standard, we should get the contents of the
+   table expanded into separate columns:
+<programlisting>
+    name    | supplier_id | price
+------------+-------------+-------
+ fuzzy dice |          42 |  1.99
+(1 row)
+</programlisting>
+   as if the query were
+<programlisting>
+SELECT c.name, c.supplier_id, c.price FROM inventory_item c;
+</programlisting>
+   <productname>PostgreSQL</> will apply this expansion behavior to
+   any composite-valued expression, although as shown <link
+   linkend="rowtypes-accessing">above</link>, you need to write parentheses
+   around the value that <literal>.*</> is applied to whenever it's not a
+   simple table name.  For example, if <function>myfunc()</> is a function
+   returning a composite type with columns <structfield>a</>,
+   <structfield>b</>, and <structfield>c</>, then these two queries have the
+   same result:
+<programlisting>
+SELECT (myfunc(x)).* FROM some_table;
+SELECT (myfunc(x)).a, (myfunc(x)).b, (myfunc(x)).c FROM some_table;
+</programlisting>
+  </para>
+
+  <tip>
+   <para>
+    <productname>PostgreSQL</> handles column expansion by
+    actually transforming the first form into the second.  So, in this
+    example, <function>myfunc()</> would get invoked three times per row
+    with either syntax.  If it's an expensive function you may wish to
+    avoid that, which you can do with a query like:
+<programlisting>
+SELECT (m).* FROM (SELECT myfunc(x) AS m FROM some_table OFFSET 0) ss;
+</programlisting>
+    The <literal>OFFSET 0</> clause keeps the optimizer
+    from <quote>flattening</> the sub-select to arrive at the form with
+    multiple calls of <function>myfunc()</>.
+   </para>
+  </tip>
+
+  <para>
+   The <replaceable>composite_value</><literal>.*</> syntax results in
+   column expansion of this kind when it appears at the top level of
+   a <link linkend="queries-select-lists"><command>SELECT</> output
+   list</link>, a <link linkend="dml-returning"><literal>RETURNING</>
+   list</link> in <command>INSERT</>/<command>UPDATE</>/<command>DELETE</>,
+   a <link linkend="queries-values"><literal>VALUES</> clause</link>, or
+   a <link linkend="sql-syntax-row-constructors">row constructor</link>.
+   In all other contexts (including when nested inside one of those
+   constructs), attaching <literal>.*</> to a composite value does not
+   change the value, since it means <quote>all columns</> and so the
+   same composite value is produced again.  For example,
+   if <function>somefunc()</> accepts a composite-valued argument,
+   these queries are the same:
+
+<programlisting>
+SELECT somefunc(c.*) FROM inventory_item c;
+SELECT somefunc(c) FROM inventory_item c;
+</programlisting>
+
+   In both cases, the current row of <structname>inventory_item</> is
+   passed to the function as a single composite-valued argument.
+   Even though <literal>.*</> does nothing in such cases, using it is good
+   style, since it makes clear that a composite value is intended.  In
+   particular, the parser will consider <literal>c</> in <literal>c.*</> to
+   refer to a table name or alias, not to a column name, so that there is
+   no ambiguity; whereas without <literal>.*</>, it is not clear
+   whether <literal>c</> means a table name or a column name, and in fact
+   the column-name interpretation will be preferred if there is a column
+   named <literal>c</>.
+  </para>
+
+  <para>
+   Another example demonstrating these concepts is that all these queries
+   mean the same thing:
+<programlisting>
+SELECT * FROM inventory_item c ORDER BY c;
+SELECT * FROM inventory_item c ORDER BY c.*;
+SELECT * FROM inventory_item c ORDER BY ROW(c.*);
+</programlisting>
+   All of these <literal>ORDER BY</> clauses specify the row's composite
+   value, resulting in sorting the rows according to the rules described
+   in <xref linkend="composite-type-comparison">.  However,
+   if <structname>inventory_item</> contained a column
+   named <structfield>c</>, the first case would be different from the
+   others, as it would mean to sort by that column only.  Given the column
+   names previously shown, these queries are also equivalent to those above:
+<programlisting>
+SELECT * FROM inventory_item c ORDER BY ROW(c.name, c.supplier_id, c.price);
+SELECT * FROM inventory_item c ORDER BY (c.name, c.supplier_id, c.price);
+</programlisting>
+   (The last case uses a row constructor with the key word <literal>ROW</>
+   omitted.)
+  </para>
+
+  <para>
+   Another special syntactical behavior associated with composite values is
+   that we can use <firstterm>functional notation</> for extracting a field
+   of a composite value.  The simple way to explain this is that
+   the notations <literal><replaceable>field</>(<replaceable>table</>)</>
+   and <literal><replaceable>table</>.<replaceable>field</></>
+   are interchangeable.  For example, these queries are equivalent:
+
+<programlisting>
+SELECT c.name FROM inventory_item c WHERE c.price &gt; 1000;
+SELECT name(c) FROM inventory_item c WHERE price(c) &gt; 1000;
+</programlisting>
+
+   Moreover, if we have a function that accepts a single argument of a
+   composite type, we can call it with either notation.  These queries are
+   all equivalent:
+
+<programlisting>
+SELECT somefunc(c) FROM inventory_item c;
+SELECT somefunc(c.*) FROM inventory_item c;
+SELECT c.somefunc FROM inventory_item c;
+</programlisting>
+  </para>
+
+  <para>
+   This equivalence between functional notation and field notation
+   makes it possible to use functions on composite types to implement
+   <quote>computed fields</>.
+   <indexterm>
+    <primary>computed field</primary>
+   </indexterm>
+   <indexterm>
+    <primary>field</primary>
+    <secondary>computed</secondary>
+   </indexterm>
+   An application using the last query above wouldn't need to be directly
+   aware that <literal>somefunc</> isn't a real column of the table.
+  </para>
+
+  <tip>
+   <para>
+    Because of this behavior, it's unwise to give a function that takes a
+    single composite-type argument the same name as any of the fields of
+    that composite type.  If there is ambiguity, the field-name
+    interpretation will be preferred, so that such a function could not be
+    called without tricks.  One way to force the function interpretation is
+    to schema-qualify the function name, that is, write
+    <literal><replaceable>schema</>.<replaceable>func</>(<replaceable>compositevalue</>)</literal>.
+   </para>
+  </tip>
+ </sect2>
+
  <sect2 id="rowtypes-io-syntax">
   <title>Composite Type Input and Output Syntax</title>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/rules.sgml postgresql-9.5-9.5.8/doc/src/sgml/rules.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/rules.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/rules.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -862,7 +862,7 @@
     <command>UPDATE</command>, and <command>DELETE</command> commands on
     a view. These rules will rewrite the command, typically into a command
     that updates one or more tables, rather than views. That is the topic
-    of the next section.
+    of <xref linkend="rules-update">.
 </para>
 
 <para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/runtime.sgml postgresql-9.5-9.5.8/doc/src/sgml/runtime.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/runtime.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/runtime.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -183,6 +183,15 @@
    locale setting.  For details see <xref linkend="multibyte">.
   </para>
 
+  <para>
+   Non-<literal>C</> and and non-<literal>POSIX</> locales rely on the
+   operating system's collation library for character set ordering.
+   This controls the ordering of keys stored in indexes.  For this reason,
+   a cluster cannot switch to an incompatible collation library version,
+   either through snapshot restore, binary streaming replication, a
+   different operating system, or an operating system upgrade.
+  </para>
+
   <sect2 id="creating-cluster-mount-points">
    <title>Use of Secondary File Systems</title>
 
@@ -1366,53 +1375,67 @@
   </sect2>
 
   <sect2 id="linux-huge-pages">
-   <title>Linux huge pages</title>
+   <title>Linux Huge Pages</title>
 
    <para>
     Using huge pages reduces overhead when using large contiguous chunks of
-    memory, like <productname>PostgreSQL</productname> does. To enable this
+    memory, as <productname>PostgreSQL</productname> does, particularly when
+    using large values of <xref linkend="guc-shared-buffers">.  To use this
     feature in <productname>PostgreSQL</productname> you need a kernel
     with <varname>CONFIG_HUGETLBFS=y</varname> and
-    <varname>CONFIG_HUGETLB_PAGE=y</varname>. You also have to tune the system
-    setting <varname>vm.nr_hugepages</varname>. To estimate the number of
-    necessary huge pages start <productname>PostgreSQL</productname> without
-    huge pages enabled and check the <varname>VmPeak</varname> value from the
-    proc file system:
+    <varname>CONFIG_HUGETLB_PAGE=y</varname>. You will also have to adjust
+    the kernel setting <varname>vm.nr_hugepages</varname>. To estimate the
+    number of huge pages needed, start <productname>PostgreSQL</productname>
+    without huge pages enabled and check the
+    postmaster's <varname>VmPeak</varname> value, as well as the system's
+    huge page size, using the <filename>/proc</> file system.  This might
+    look like:
 <programlisting>
-$ <userinput>head -1 /path/to/data/directory/postmaster.pid</userinput>
+$ <userinput>head -1 $PGDATA/postmaster.pid</userinput>
 4170
 $ <userinput>grep ^VmPeak /proc/4170/status</userinput>
 VmPeak:  6490428 kB
+$ <userinput>grep ^Hugepagesize /proc/meminfo</userinput>
+Hugepagesize:       2048 kB
 </programlisting>
-     <literal>6490428</literal> / <literal>2048</literal>
-     (<varname>PAGE_SIZE</varname> is <literal>2MB</literal> in this case) are
-     roughly <literal>3169.154</literal> huge pages, so you will need at
-     least <literal>3170</literal> huge pages:
+     <literal>6490428</literal> / <literal>2048</literal> gives approximately
+     <literal>3169.154</literal>, so in this example we need at
+     least <literal>3170</literal> huge pages, which we can set with:
 <programlisting>
 $ <userinput>sysctl -w vm.nr_hugepages=3170</userinput>
 </programlisting>
+    A larger setting would be appropriate if other programs on the machine
+    also need huge pages.  Don't forget to add this setting
+    to <filename>/etc/sysctl.conf</filename> so that it will be reapplied
+    after reboots.
+   </para>
+
+   <para>
     Sometimes the kernel is not able to allocate the desired number of huge
-    pages, so it might be necessary to repeat that command or to reboot. Don't
-    forget to add an entry to <filename>/etc/sysctl.conf</filename> to persist
-    this setting through reboots.
+    pages immediately, so it might be necessary to repeat the command or to
+    reboot.  (Immediately after a reboot, most of the machine's memory
+    should be available to convert into huge pages.)  To verify the huge
+    page allocation situation, use:
+<programlisting>
+$ <userinput>grep Huge /proc/meminfo</userinput>
+</programlisting>
    </para>
 
    <para>
-    It is also necessary to give the database server operating system
+    It may also be necessary to give the database server's operating system
     user permission to use huge pages by setting
-    <varname>vm.hugetlb_shm_group</> via <application>sysctl</>, and
-    permission to lock memory with <command>ulimit -l</>.
+    <varname>vm.hugetlb_shm_group</> via <application>sysctl</>, and/or
+    give permission to lock memory with <command>ulimit -l</>.
    </para>
 
    <para>
     The default behavior for huge pages in
     <productname>PostgreSQL</productname> is to use them when possible and
-    to fallback to normal pages when failing. To enforce the use of huge
-    pages, you can set
-    <link linkend="guc-huge-pages"><varname>huge_pages</varname></link>
-    to <literal>on</literal>. Note that in this case
-    <productname>PostgreSQL</productname> will fail to start if not enough huge
-    pages are available.
+    to fall back to normal pages when failing. To enforce the use of huge
+    pages, you can set <xref linkend="guc-huge-pages">
+    to <literal>on</literal> in <filename>postgresql.conf</>.
+    Note that with this setting <productname>PostgreSQL</> will fail to
+    start if not enough huge pages are available.
    </para>
 
    <para>
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/sepgsql.sgml postgresql-9.5-9.5.8/doc/src/sgml/sepgsql.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/sepgsql.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/sepgsql.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -675,13 +675,13 @@
      </row>
      <row>
       <entry><literal>sepgsql_mcstrans_in(text) returns text</literal></entry>
-      <entry>Translates the given qualifies MLS/MCS range into raw format if
+      <entry>Translates the given qualified MLS/MCS range into raw format if
       the mcstrans daemon is running.
       </entry>
      </row>
      <row>
       <entry><literal>sepgsql_mcstrans_out(text) returns text</literal></entry>
-      <entry>Translates the given raw MCS/MCS range into qualified format if
+      <entry>Translates the given raw MLS/MCS range into qualified format if
       the mcstrans daemon is running.
       </entry>
      </row>
@@ -753,7 +753,7 @@
   <title>External Resources</title>
   <variablelist>
    <varlistentry>
-    <term><ulink url="http://wiki.postgresql.org/wiki/SEPostgreSQL">SE-PostgreSQL Introduction</ulink></term>
+    <term><ulink url="https://wiki.postgresql.org/wiki/SEPostgreSQL">SE-PostgreSQL Introduction</ulink></term>
     <listitem>
      <para>
       This wiki page provides a brief overview, security design, architecture,
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/sourcerepo.sgml postgresql-9.5-9.5.8/doc/src/sgml/sourcerepo.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/sourcerepo.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/sourcerepo.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -12,7 +12,7 @@
 
  <para>
   Our wiki, <ulink
-  url="http://wiki.postgresql.org/wiki/Working_with_Git"></ulink>,
+  url="https://wiki.postgresql.org/wiki/Working_with_Git"></ulink>,
   has some discussion on working with Git.
  </para>
 
@@ -20,9 +20,9 @@
    Note that building <productname>PostgreSQL</productname> from the source
    repository requires reasonably up-to-date versions of <application>bison</>,
    <application>flex</>, and <application>Perl</>. These tools are not needed
-   to build from a distribution tarball since the files they are used to build
-   are included in the tarball.  Other tool requirements are the same as shown
-   in <xref linkend="installation">.
+   to build from a distribution tarball, because the files that these tools
+   are used to build are included in the tarball.  Other tool requirements
+   are the same as shown in <xref linkend="install-requirements">.
   </para>
 
  <sect1 id="git">
@@ -64,10 +64,10 @@
     <para>
      The Git mirror can also be reached via the HTTP protocol, if for example
      a firewall is blocking access to the Git protocol. Just change the URL
-     prefix to <literal>http</>, as in:
+     prefix to <literal>https</>, as in:
 
 <programlisting>
-git clone http://git.postgresql.org/git/postgresql.git
+git clone https://git.postgresql.org/git/postgresql.git
 </programlisting>
 
      The HTTP protocol is less efficient than the Git protocol, so it will be
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/stylesheet.xsl postgresql-9.5-9.5.8/doc/src/sgml/stylesheet.xsl
--- postgresql-9.5-9.5.2/doc/src/sgml/stylesheet.xsl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/stylesheet.xsl	2017-08-07 21:13:41.000000000 +0000
@@ -24,7 +24,7 @@
 <xsl:param name="html.stylesheet">
   <xsl:choose>
     <xsl:when test="$website.stylesheet = 0">stylesheet.css</xsl:when>
-    <xsl:otherwise>http://www.postgresql.org/media/css/docs.css</xsl:otherwise>
+    <xsl:otherwise>https://www.postgresql.org/media/css/docs.css</xsl:otherwise>
   </xsl:choose>
 </xsl:param>
 
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/syntax.sgml postgresql-9.5-9.5.8/doc/src/sgml/syntax.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/syntax.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/syntax.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -1449,12 +1449,13 @@
    </para>
 
    <para>
-    In a select list (see <xref linkend="queries-select-lists">), you
-    can ask for all fields of a composite value by
+    You can ask for all fields of a composite value by
     writing <literal>.*</literal>:
 <programlisting>
 (compositecol).*
 </programlisting>
+    This notation behaves differently depending on context;
+    see <xref linkend="rowtypes-usage"> for details.
    </para>
   </sect2>
 
@@ -1531,7 +1532,7 @@
      interchangeable.  This behavior is not SQL-standard but is provided
      in <productname>PostgreSQL</> because it allows use of functions to
      emulate <quote>computed fields</>.  For more information see
-     <xref linkend="xfunc-sql-composite-functions">.
+     <xref linkend="rowtypes-usage">.
     </para>
    </note>
   </sect2>
@@ -1693,11 +1694,18 @@
     case, write just <literal>()</> not <literal>(*)</>.
     (<productname>PostgreSQL</> will actually accept either spelling, but
     only the first way conforms to the SQL standard.)
+   </para>
+
+   <para>
+    <indexterm>
+     <primary>median</primary>
+     <seealso>percentile</seealso>
+    </indexterm>
     An example of an ordered-set aggregate call is:
 
 <programlisting>
-SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
- percentile_disc
+SELECT percentile_cont(0.5) WITHIN GROUP (ORDER BY income) FROM households;
+ percentile_cont
 -----------------
            50489
 </programlisting>
@@ -2291,7 +2299,8 @@
     <replaceable>rowvalue</replaceable><literal>.*</literal>,
     which will be expanded to a list of the elements of the row value,
     just as occurs when the <literal>.*</> syntax is used at the top level
-    of a <command>SELECT</> list.  For example, if table <literal>t</> has
+    of a <command>SELECT</> list (see <xref linkend="rowtypes-usage">).
+    For example, if table <literal>t</> has
     columns <literal>f1</> and <literal>f2</>, these are the same:
 <programlisting>
 SELECT ROW(t.*, 42) FROM t;
@@ -2302,9 +2311,9 @@
    <note>
     <para>
      Before <productname>PostgreSQL</productname> 8.2, the
-     <literal>.*</literal> syntax was not expanded, so that writing
-     <literal>ROW(t.*, 42)</> created a two-field row whose first field
-     was another row value.  The new behavior is usually more useful.
+     <literal>.*</literal> syntax was not expanded in row constructors, so
+     that writing <literal>ROW(t.*, 42)</> created a two-field row whose first
+     field was another row value.  The new behavior is usually more useful.
      If you need the old behavior of nested row values, write the inner
      row value without <literal>.*</literal>, for instance
      <literal>ROW(t, 42)</>.
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/wal.sgml postgresql-9.5-9.5.8/doc/src/sgml/wal.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/wal.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/wal.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -558,7 +558,7 @@
    removes the rest. The estimate is based on a moving average of the number
    of WAL files used in previous checkpoint cycles. The moving average
    is increased immediately if the actual usage exceeds the estimate, so it
-   accommodates peak usage rather average usage to some extent.
+   accommodates peak usage rather than average usage to some extent.
    <varname>min_wal_size</> puts a minimum on the amount of WAL files
    recycled for future usage; that much WAL is always recycled for future use,
    even if the system is idle and the WAL usage estimate suggests that little
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/xaggr.sgml postgresql-9.5-9.5.8/doc/src/sgml/xaggr.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/xaggr.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/xaggr.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -530,7 +530,7 @@
    function, the first input
    must be a temporary state value and can therefore safely be modified
    in-place rather than allocating a new copy.
-   See <literal>int8inc()</> for an example.
+   See <function>int8inc()</> for an example.
    (This is the <emphasis>only</>
    case where it is safe for a function to modify a pass-by-reference input.
    In particular, final functions for normal aggregates must not
@@ -539,6 +539,20 @@
   </para>
 
   <para>
+   The second argument of <function>AggCheckCallContext</> can be used to
+   retrieve the memory context in which aggregate state values are being kept.
+   This is useful for transition functions that wish to use <quote>expanded</>
+   objects (see <xref linkend="xtypes-toast">) as their state values.
+   On first call, the transition function should return an expanded object
+   whose memory context is a child of the aggregate state context, and then
+   keep returning the same expanded object on subsequent calls.  See
+   <function>array_append()</> for an example.  (<function>array_append()</>
+   is not the transition function of any built-in aggregate, but it is written
+   to behave efficiently when used as transition function of a custom
+   aggregate.)
+  </para>
+
+  <para>
    Another support routine available to aggregate functions written in C
    is <function>AggGetAggref</>, which returns the <literal>Aggref</>
    parse node that defines the aggregate call.  This is mainly useful
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/xfunc.sgml postgresql-9.5-9.5.8/doc/src/sgml/xfunc.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/xfunc.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/xfunc.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -394,8 +394,8 @@
     <para>
      Notice the use of the syntax <literal>$1.salary</literal>
      to select one field of the argument row value.  Also notice
-     how the calling <command>SELECT</> command uses <literal>*</>
-     to select
+     how the calling <command>SELECT</> command
+     uses <replaceable>table_name</><literal>.*</> to select
      the entire current row of a table as a composite value.  The table
      row can alternatively be referenced using just the table name,
      like this:
@@ -405,6 +405,8 @@
     WHERE emp.cubicle ~= point '(2,1)';
 </screen>
      but this usage is deprecated since it's easy to get confused.
+     (See <xref linkend="rowtypes-usage"> for details about these
+     two notations for the composite value of a table row.)
     </para>
 
     <para>
@@ -479,7 +481,8 @@
     </para>
 
     <para>
-     We could call this function directly in either of two ways:
+     We could call this function directly either by using it in
+     a value expression:
 
 <screen>
 SELECT new_emp();
@@ -487,7 +490,11 @@
          new_emp
 --------------------------
  (None,1000.0,25,"(2,2)")
+</screen>
+
+     or by calling it as a table function:
 
+<screen>
 SELECT * FROM new_emp();
 
  name | salary | age | cubicle
@@ -524,11 +531,7 @@
     </para>
 
     <para>
-     Another option is to use
-     functional notation for extracting an attribute.  The  simple  way
-     to explain this is that we can use the
-     notations <literal>attribute(table)</>  and  <literal>table.attribute</>
-     interchangeably.
+     Another option is to use functional notation for extracting an attribute:
 
 <screen>
 SELECT name(new_emp());
@@ -538,50 +541,10 @@
  None
 </screen>
 
-<screen>
--- This is the same as:
--- SELECT emp.name AS youngster FROM emp WHERE emp.age &lt; 30;
-
-SELECT name(emp) AS youngster FROM emp WHERE age(emp) &lt; 30;
-
- youngster
------------
- Sam
- Andy
-</screen>
+     As explained in <xref linkend="rowtypes-usage">, the field notation and
+     functional notation are equivalent.
     </para>
 
-    <tip>
-     <para>
-      The equivalence between functional notation and attribute notation
-      makes it possible to use functions on composite types to emulate
-      <quote>computed fields</>.
-      <indexterm>
-       <primary>computed field</primary>
-      </indexterm>
-      <indexterm>
-       <primary>field</primary>
-       <secondary>computed</secondary>
-      </indexterm>
-      For example, using the previous definition
-      for <literal>double_salary(emp)</>, we can write
-
-<screen>
-SELECT emp.name, emp.double_salary FROM emp;
-</screen>
-
-      An application using this wouldn't need to be directly aware that
-      <literal>double_salary</> isn't a real column of the table.
-      (You can also emulate computed fields with views.)
-     </para>
-
-     <para>
-      Because of this behavior, it's unwise to give a function that takes
-      a single composite-type argument the same name as any of the fields of
-      that composite type.
-     </para>
-    </tip>
-
     <para>
      Another way to use a function returning a composite type is to pass the
      result to another function that accepts the correct row type as input:
@@ -598,12 +561,6 @@
 (1 row)
 </screen>
     </para>
-
-    <para>
-     Still another way to use a function that returns a composite type is to
-     call it as a table function, as described in <xref
-     linkend="xfunc-sql-table-functions">.
-    </para>
    </sect2>
 
    <sect2 id="xfunc-output-parameters">
diff -Nru postgresql-9.5-9.5.2/doc/src/sgml/xindex.sgml postgresql-9.5-9.5.8/doc/src/sgml/xindex.sgml
--- postgresql-9.5-9.5.2/doc/src/sgml/xindex.sgml	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/src/sgml/xindex.sgml	2017-08-07 21:13:41.000000000 +0000
@@ -652,7 +652,7 @@
   </para>
 
    <table tocentry="1" id="xindex-brin-support-table">
-    <title>GIN Support Functions</title>
+    <title>BRIN Support Functions</title>
     <tgroup cols="3">
      <thead>
       <row>
diff -Nru postgresql-9.5-9.5.2/doc/TODO postgresql-9.5-9.5.8/doc/TODO
--- postgresql-9.5-9.5.2/doc/TODO	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/doc/TODO	2017-08-07 21:13:41.000000000 +0000
@@ -1,3 +1,3 @@
 The TODO list is now maintained at:
 
-	http://wiki.postgresql.org/wiki/Todo
+	https://wiki.postgresql.org/wiki/Todo
diff -Nru postgresql-9.5-9.5.2/HISTORY postgresql-9.5-9.5.8/HISTORY
--- postgresql-9.5-9.5.2/HISTORY	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/HISTORY	2017-08-07 21:13:41.000000000 +0000
@@ -1,5 +1,5 @@
 Release notes for all versions of PostgreSQL can be found on-line at
-http://www.postgresql.org/docs/current/static/release.html
+https://www.postgresql.org/docs/current/static/release.html
 
 Distribution file sets include release notes for their version and preceding
 versions.  Visit the file doc/src/sgml/html/release.html in an HTML browser.
diff -Nru postgresql-9.5-9.5.2/INSTALL postgresql-9.5-9.5.8/INSTALL
--- postgresql-9.5-9.5.2/INSTALL	2016-03-28 20:23:06.000000000 +0000
+++ postgresql-9.5-9.5.8/INSTALL	2017-08-07 21:34:44.000000000 +0000
@@ -68,15 +68,15 @@
 
      * To build the server programming language PL/Perl you need a full
        Perl installation, including the "libperl" library and the header
-       files. Since PL/Perl will be a shared library, the "libperl"
-       library must be a shared library also on most platforms. This
-       appears to be the default in recent Perl versions, but it was not
-       in earlier versions, and in any case it is the choice of whomever
-       installed Perl at your site. "configure" will fail if building
-       PL/Perl is selected but it cannot find a shared "libperl". In that
-       case, you will have to rebuild and install Perl manually to be able
-       to build PL/Perl. During the configuration process for Perl,
-       request a shared library.
+       files. The minimum required version is Perl 5.8.3. Since PL/Perl
+       will be a shared library, the "libperl" library must be a shared
+       library also on most platforms. This appears to be the default in
+       recent Perl versions, but it was not in earlier versions, and in
+       any case it is the choice of whomever installed Perl at your site.
+       "configure" will fail if building PL/Perl is selected but it cannot
+       find a shared "libperl". In that case, you will have to rebuild and
+       install Perl manually to be able to build PL/Perl. During the
+       configuration process for Perl, request a shared library.
        If you intend to make more than incidental use of PL/Perl, you
        should ensure that the Perl installation was built with the
        usemultiplicity option enabled (perl -V will show whether this is
@@ -124,10 +124,10 @@
        you changed the actual scanner and parser definition files. If you
        need them, be sure to get Flex 2.5.31 or later and Bison 1.875 or
        later. Other lex and yacc programs cannot be used.
-     * Perl 5.8 or later is needed to build from a Git checkout, or if you
-       changed the input files for any of the build steps that use Perl
-       scripts. If building on Windows you will need Perl in any case.
-       Perl is also required to run some test suites.
+     * Perl 5.8.3 or later is needed to build from a Git checkout, or if
+       you changed the input files for any of the build steps that use
+       Perl scripts. If building on Windows you will need Perl in any
+       case. Perl is also required to run some test suites.
 
    If you need to get a GNU package, you can find it at your local GNU
    mirror site (see http://www.gnu.org/order/ftp.html for a list) or at
@@ -661,26 +661,39 @@
                 "msgfmt" program for native language support
 
         PERL
-                Full path to the Perl interpreter. This will be used to
-                determine the dependencies for building PL/Perl.
+                Full path name of the Perl interpreter. This will be used
+                to determine the dependencies for building PL/Perl.
 
         PYTHON
-                Full path to the Python interpreter. This will be used to
-                determine the dependencies for building PL/Python. Also,
-                whether Python 2 or 3 is specified here (or otherwise
-                implicitly chosen) determines which variant of the
-                PL/Python language becomes available. See the PL/Python
-                documentation for more information.
+                Full path name of the Python interpreter. This will be
+                used to determine the dependencies for building PL/Python.
+                Also, whether Python 2 or 3 is specified here (or
+                otherwise implicitly chosen) determines which variant of
+                the PL/Python language becomes available. See the
+                PL/Python documentation for more information.
 
         TCLSH
-                Full path to the Tcl interpreter. This will be used to
-                determine the dependencies for building PL/Tcl, and it
+                Full path name of the Tcl interpreter. This will be used
+                to determine the dependencies for building PL/Tcl, and it
                 will be substituted into Tcl scripts.
 
         XML2_CONFIG
                 "xml2-config" program used to locate the libxml
                 installation.
 
+       Sometimes it is useful to add compiler flags after-the-fact to the
+       set that were chosen by "configure". An important example is that
+       gcc's "-Werror" option cannot be included in the CFLAGS passed to
+       "configure", because it will break many of "configure"'s built-in
+       tests. To add such flags, include them in the COPT environment
+       variable while running "make". The contents of COPT are added to
+       both the CFLAGS and LDFLAGS options set up by "configure". For
+       example, you could do
+make COPT='-Werror'
+       or
+export COPT='-Werror'
+make
+
      Note: When developing code inside the server, it is recommended to
      use the configure options "--enable-cassert" (which turns on many
      run-time error checks) and "--enable-debug" (which improves the
@@ -694,18 +707,23 @@
      while trying to debug optimized code, recompile the specific files
      of interest with "-O0". An easy way to do this is by passing an
      option to make: "make PROFILE=-O0 file.o".
+     The COPT and PROFILE environment variables are actually handled
+     identically by the PostgreSQL makefiles. Which to use is a matter of
+     preference, but a common habit among developers is to use PROFILE
+     for one-time flag adjustments, while COPT might be kept set all the
+     time.
     2. Build
        To start the build, type:
 make
        (Remember to use GNU make.) The build will take a few minutes
        depending on your hardware. The last line displayed should be:
-All of PostgreSQL is successfully made. Ready to install.
+All of PostgreSQL successfully made. Ready to install.
        If you want to build everything that can be built, including the
        documentation (HTML and man pages), and the additional modules
        ("contrib"), type instead:
 make world
        The last line displayed should be:
-PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
+PostgreSQL, contrib, and documentation successfully made. Ready to install.
     3. Regression Tests
        If you want to test the newly built server before you install it,
        you can run the regression tests at this point. The regression
diff -Nru postgresql-9.5-9.5.2/README postgresql-9.5-9.5.8/README
--- postgresql-9.5-9.5.2/README	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/README	2017-08-07 21:13:41.000000000 +0000
@@ -11,7 +11,7 @@
 
 PostgreSQL has many language interfaces, many of which are listed here:
 
-	http://www.postgresql.org/download
+	https://www.postgresql.org/download
 
 See the file INSTALL for instructions on how to build and install
 PostgreSQL.  That file also lists supported operating systems and
@@ -23,5 +23,5 @@
 instructions.
 
 The latest version of this software may be obtained at
-http://www.postgresql.org/download/.  For more information look at our
-web site located at http://www.postgresql.org/.
+https://www.postgresql.org/download/.  For more information look at our
+web site located at https://www.postgresql.org/.
diff -Nru postgresql-9.5-9.5.2/src/backend/access/brin/brin_pageops.c postgresql-9.5-9.5.8/src/backend/access/brin/brin_pageops.c
--- postgresql-9.5-9.5.2/src/backend/access/brin/brin_pageops.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/brin/brin_pageops.c	2017-08-07 21:13:41.000000000 +0000
@@ -73,10 +73,8 @@
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-			errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",
-				   (unsigned long) newsz,
-				   (unsigned long) BrinMaxItemSize,
-				   RelationGetRelationName(idxrel))));
+			errmsg("index row size %zu exceeds maximum %zu for index \"%s\"",
+				   newsz, BrinMaxItemSize, RelationGetRelationName(idxrel))));
 		return false;			/* keep compiler quiet */
 	}
 
@@ -179,8 +177,8 @@
 
 		START_CRIT_SECTION();
 		PageIndexDeleteNoCompact(oldpage, &oldoff, 1);
-		if (PageAddItem(oldpage, (Item) newtup, newsz, oldoff, true,
-						false) == InvalidOffsetNumber)
+		if (PageAddItemExtended(oldpage, (Item) newtup, newsz, oldoff,
+				PAI_OVERWRITE | PAI_ALLOW_FAR_OFFSET) == InvalidOffsetNumber)
 			elog(ERROR, "failed to add BRIN tuple");
 		MarkBufferDirty(oldbuf);
 
@@ -289,7 +287,7 @@
 			XLogRegisterBufData(0, (char *) newtup, newsz);
 
 			/* revmap page */
-			XLogRegisterBuffer(1, revmapbuf, REGBUF_STANDARD);
+			XLogRegisterBuffer(1, revmapbuf, 0);
 
 			/* old page */
 			XLogRegisterBuffer(2, oldbuf, REGBUF_STANDARD);
@@ -359,10 +357,8 @@
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-			errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",
-				   (unsigned long) itemsz,
-				   (unsigned long) BrinMaxItemSize,
-				   RelationGetRelationName(idxrel))));
+			errmsg("index row size %zu exceeds maximum %zu for index \"%s\"",
+				   itemsz, BrinMaxItemSize, RelationGetRelationName(idxrel))));
 		return InvalidOffsetNumber;		/* keep compiler quiet */
 	}
 
@@ -669,7 +665,7 @@
 	BlockNumber oldblk;
 	BlockNumber newblk;
 	Page		page;
-	int			freespace;
+	Size		freespace;
 
 	/* callers must have checked */
 	Assert(itemsz <= BrinMaxItemSize);
@@ -825,10 +821,8 @@
 
 			ereport(ERROR,
 					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-			errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",
-				   (unsigned long) itemsz,
-				   (unsigned long) freespace,
-				   RelationGetRelationName(irel))));
+			errmsg("index row size %zu exceeds maximum %zu for index \"%s\"",
+				   itemsz, freespace, RelationGetRelationName(irel))));
 			return InvalidBuffer;		/* keep compiler quiet */
 		}
 
diff -Nru postgresql-9.5-9.5.2/src/backend/access/brin/brin_revmap.c postgresql-9.5-9.5.8/src/backend/access/brin/brin_revmap.c
--- postgresql-9.5-9.5.2/src/backend/access/brin/brin_revmap.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/brin/brin_revmap.c	2017-08-07 21:13:41.000000000 +0000
@@ -266,6 +266,10 @@
 		/* If we land on a revmap page, start over */
 		if (BRIN_IS_REGULAR_PAGE(page))
 		{
+			if (*off > PageGetMaxOffsetNumber(page))
+				ereport(ERROR,
+						(errcode(ERRCODE_INDEX_CORRUPTED),
+						 errmsg_internal("corrupted BRIN index: inconsistent range map")));
 			lp = PageGetItemId(page, *off);
 			if (ItemIdIsUsed(lp))
 			{
diff -Nru postgresql-9.5-9.5.2/src/backend/access/brin/brin_xlog.c postgresql-9.5-9.5.8/src/backend/access/brin/brin_xlog.c
--- postgresql-9.5-9.5.2/src/backend/access/brin/brin_xlog.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/brin/brin_xlog.c	2017-08-07 21:13:41.000000000 +0000
@@ -193,7 +193,8 @@
 			elog(PANIC, "brin_xlog_samepage_update: invalid max offset number");
 
 		PageIndexDeleteNoCompact(page, &offnum, 1);
-		offnum = PageAddItem(page, (Item) brintuple, tuplen, offnum, true, false);
+		offnum = PageAddItemExtended(page, (Item) brintuple, tuplen, offnum,
+									 PAI_OVERWRITE | PAI_ALLOW_FAR_OFFSET);
 		if (offnum == InvalidOffsetNumber)
 			elog(PANIC, "brin_xlog_samepage_update: failed to add tuple");
 
diff -Nru postgresql-9.5-9.5.2/src/backend/access/common/tupconvert.c postgresql-9.5-9.5.8/src/backend/access/common/tupconvert.c
--- postgresql-9.5-9.5.2/src/backend/access/common/tupconvert.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/common/tupconvert.c	2017-08-07 21:13:41.000000000 +0000
@@ -206,55 +206,12 @@
 {
 	TupleConversionMap *map;
 	AttrNumber *attrMap;
-	int			n;
+	int			n = outdesc->natts;
 	int			i;
 	bool		same;
 
 	/* Verify compatibility and prepare attribute-number map */
-	n = outdesc->natts;
-	attrMap = (AttrNumber *) palloc0(n * sizeof(AttrNumber));
-	for (i = 0; i < n; i++)
-	{
-		Form_pg_attribute att = outdesc->attrs[i];
-		char	   *attname;
-		Oid			atttypid;
-		int32		atttypmod;
-		int			j;
-
-		if (att->attisdropped)
-			continue;			/* attrMap[i] is already 0 */
-		attname = NameStr(att->attname);
-		atttypid = att->atttypid;
-		atttypmod = att->atttypmod;
-		for (j = 0; j < indesc->natts; j++)
-		{
-			att = indesc->attrs[j];
-			if (att->attisdropped)
-				continue;
-			if (strcmp(attname, NameStr(att->attname)) == 0)
-			{
-				/* Found it, check type */
-				if (atttypid != att->atttypid || atttypmod != att->atttypmod)
-					ereport(ERROR,
-							(errcode(ERRCODE_DATATYPE_MISMATCH),
-							 errmsg_internal("%s", _(msg)),
-							 errdetail("Attribute \"%s\" of type %s does not match corresponding attribute of type %s.",
-									   attname,
-									   format_type_be(outdesc->tdtypeid),
-									   format_type_be(indesc->tdtypeid))));
-				attrMap[i] = (AttrNumber) (j + 1);
-				break;
-			}
-		}
-		if (attrMap[i] == 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg_internal("%s", _(msg)),
-					 errdetail("Attribute \"%s\" of type %s does not exist in type %s.",
-							   attname,
-							   format_type_be(outdesc->tdtypeid),
-							   format_type_be(indesc->tdtypeid))));
-	}
+	attrMap = convert_tuples_by_name_map(indesc, outdesc, msg);
 
 	/*
 	 * Check to see if the map is one-to-one and the tuple types are the same.
@@ -313,6 +270,69 @@
 }
 
 /*
+ * Return a palloc'd bare attribute map for tuple conversion, matching input
+ * and output columns by name.  (Dropped columns are ignored in both input and
+ * output.)  This is normally a subroutine for convert_tuples_by_name, but can
+ * be used standalone.
+ */
+AttrNumber *
+convert_tuples_by_name_map(TupleDesc indesc,
+						   TupleDesc outdesc,
+						   const char *msg)
+{
+	AttrNumber *attrMap;
+	int			n;
+	int			i;
+
+	n = outdesc->natts;
+	attrMap = (AttrNumber *) palloc0(n * sizeof(AttrNumber));
+	for (i = 0; i < n; i++)
+	{
+		Form_pg_attribute att = outdesc->attrs[i];
+		char	   *attname;
+		Oid			atttypid;
+		int32		atttypmod;
+		int			j;
+
+		if (att->attisdropped)
+			continue;			/* attrMap[i] is already 0 */
+		attname = NameStr(att->attname);
+		atttypid = att->atttypid;
+		atttypmod = att->atttypmod;
+		for (j = 0; j < indesc->natts; j++)
+		{
+			att = indesc->attrs[j];
+			if (att->attisdropped)
+				continue;
+			if (strcmp(attname, NameStr(att->attname)) == 0)
+			{
+				/* Found it, check type */
+				if (atttypid != att->atttypid || atttypmod != att->atttypmod)
+					ereport(ERROR,
+							(errcode(ERRCODE_DATATYPE_MISMATCH),
+							 errmsg_internal("%s", _(msg)),
+							 errdetail("Attribute \"%s\" of type %s does not match corresponding attribute of type %s.",
+									   attname,
+									   format_type_be(outdesc->tdtypeid),
+									   format_type_be(indesc->tdtypeid))));
+				attrMap[i] = (AttrNumber) (j + 1);
+				break;
+			}
+		}
+		if (attrMap[i] == 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg_internal("%s", _(msg)),
+					 errdetail("Attribute \"%s\" of type %s does not exist in type %s.",
+							   attname,
+							   format_type_be(outdesc->tdtypeid),
+							   format_type_be(indesc->tdtypeid))));
+	}
+
+	return attrMap;
+}
+
+/*
  * Perform conversion of a tuple according to the map.
  */
 HeapTuple
diff -Nru postgresql-9.5-9.5.2/src/backend/access/gin/ginbtree.c postgresql-9.5-9.5.8/src/backend/access/gin/ginbtree.c
--- postgresql-9.5-9.5.2/src/backend/access/gin/ginbtree.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/gin/ginbtree.c	2017-08-07 21:13:41.000000000 +0000
@@ -17,6 +17,7 @@
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
 #include "miscadmin.h"
+#include "utils/memutils.h"
 #include "utils/rel.h"
 
 static void ginFindParents(GinBtree btree, GinBtreeStack *stack);
@@ -310,15 +311,16 @@
  * Insert a new item to a page.
  *
  * Returns true if the insertion was finished. On false, the page was split and
- * the parent needs to be updated. (a root split returns true as it doesn't
- * need any further action by the caller to complete)
+ * the parent needs to be updated. (A root split returns true as it doesn't
+ * need any further action by the caller to complete.)
  *
  * When inserting a downlink to an internal page, 'childbuf' contains the
  * child page that was split. Its GIN_INCOMPLETE_SPLIT flag will be cleared
- * atomically with the insert. Also, the existing item at the given location
- * is updated to point to 'updateblkno'.
+ * atomically with the insert. Also, the existing item at offset stack->off
+ * in the target page is updated to point to updateblkno.
  *
  * stack->buffer is locked on entry, and is kept locked.
+ * Likewise for childbuf, if given.
  */
 static bool
 ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
@@ -326,11 +328,28 @@
 			   Buffer childbuf, GinStatsData *buildStats)
 {
 	Page		page = BufferGetPage(stack->buffer);
+	bool		result;
 	GinPlaceToPageRC rc;
 	uint16		xlflags = 0;
 	Page		childpage = NULL;
 	Page		newlpage = NULL,
 				newrpage = NULL;
+	void	   *ptp_workspace = NULL;
+	MemoryContext tmpCxt;
+	MemoryContext oldCxt;
+
+	/*
+	 * We do all the work of this function and its subfunctions in a temporary
+	 * memory context.  This avoids leakages and simplifies APIs, since some
+	 * subfunctions allocate storage that has to survive until we've finished
+	 * the WAL insertion.
+	 */
+	tmpCxt = AllocSetContextCreate(CurrentMemoryContext,
+								   "ginPlaceToPage temporary context",
+								   ALLOCSET_DEFAULT_MINSIZE,
+								   ALLOCSET_DEFAULT_INITSIZE,
+								   ALLOCSET_DEFAULT_MAXSIZE);
+	oldCxt = MemoryContextSwitchTo(tmpCxt);
 
 	if (GinPageIsData(page))
 		xlflags |= GIN_INSERT_ISDATA;
@@ -348,40 +367,42 @@
 	}
 
 	/*
-	 * Try to put the incoming tuple on the page. placeToPage will decide if
-	 * the page needs to be split.
-	 *
-	 * WAL-logging this operation is a bit funny:
-	 *
-	 * We're responsible for calling XLogBeginInsert() and XLogInsert().
-	 * XLogBeginInsert() must be called before placeToPage, because
-	 * placeToPage can register some data to the WAL record.
-	 *
-	 * If placeToPage returns INSERTED, placeToPage has already called
-	 * START_CRIT_SECTION() and XLogBeginInsert(), and registered any data
-	 * required to replay the operation, in block index 0. We're responsible
-	 * for filling in the main data portion of the WAL record, calling
-	 * XLogInsert(), and END_CRIT_SECTION.
-	 *
-	 * If placeToPage returns SPLIT, we're wholly responsible for WAL logging.
-	 * Splits happen infrequently, so we just make a full-page image of all
-	 * the pages involved.
+	 * See if the incoming tuple will fit on the page.  beginPlaceToPage will
+	 * decide if the page needs to be split, and will compute the split
+	 * contents if so.  See comments for beginPlaceToPage and execPlaceToPage
+	 * functions for more details of the API here.
 	 */
-	rc = btree->placeToPage(btree, stack->buffer, stack,
-							insertdata, updateblkno,
-							&newlpage, &newrpage);
-	if (rc == UNMODIFIED)
+	rc = btree->beginPlaceToPage(btree, stack->buffer, stack,
+								 insertdata, updateblkno,
+								 &ptp_workspace,
+								 &newlpage, &newrpage);
+
+	if (rc == GPTP_NO_WORK)
 	{
-		XLogResetInsertion();
-		return true;
+		/* Nothing to do */
+		result = true;
 	}
-	else if (rc == INSERTED)
+	else if (rc == GPTP_INSERT)
 	{
-		/* placeToPage did START_CRIT_SECTION() */
+		/* It will fit, perform the insertion */
+		START_CRIT_SECTION();
+
+		if (RelationNeedsWAL(btree->index))
+		{
+			XLogBeginInsert();
+			XLogRegisterBuffer(0, stack->buffer, REGBUF_STANDARD);
+			if (BufferIsValid(childbuf))
+				XLogRegisterBuffer(1, childbuf, REGBUF_STANDARD);
+		}
+
+		/* Perform the page update, and register any extra WAL data */
+		btree->execPlaceToPage(btree, stack->buffer, stack,
+							   insertdata, updateblkno, ptp_workspace);
+
 		MarkBufferDirty(stack->buffer);
 
 		/* An insert to an internal page finishes the split of the child. */
-		if (childbuf != InvalidBuffer)
+		if (BufferIsValid(childbuf))
 		{
 			GinPageGetOpaque(childpage)->flags &= ~GIN_INCOMPLETE_SPLIT;
 			MarkBufferDirty(childbuf);
@@ -393,21 +414,15 @@
 			ginxlogInsert xlrec;
 			BlockIdData childblknos[2];
 
-			/*
-			 * placetopage already registered stack->buffer as block 0.
-			 */
 			xlrec.flags = xlflags;
 
-			if (childbuf != InvalidBuffer)
-				XLogRegisterBuffer(1, childbuf, REGBUF_STANDARD);
-
 			XLogRegisterData((char *) &xlrec, sizeof(ginxlogInsert));
 
 			/*
 			 * Log information about child if this was an insertion of a
 			 * downlink.
 			 */
-			if (childbuf != InvalidBuffer)
+			if (BufferIsValid(childbuf))
 			{
 				BlockIdSet(&childblknos[0], BufferGetBlockNumber(childbuf));
 				BlockIdSet(&childblknos[1], GinPageGetOpaque(childpage)->rightlink);
@@ -417,23 +432,29 @@
 
 			recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_INSERT);
 			PageSetLSN(page, recptr);
-			if (childbuf != InvalidBuffer)
+			if (BufferIsValid(childbuf))
 				PageSetLSN(childpage, recptr);
 		}
 
 		END_CRIT_SECTION();
 
-		return true;
+		/* Insertion is complete. */
+		result = true;
 	}
-	else if (rc == SPLIT)
+	else if (rc == GPTP_SPLIT)
 	{
-		/* Didn't fit, had to split */
+		/*
+		 * Didn't fit, need to split.  The split has been computed in newlpage
+		 * and newrpage, which are pointers to palloc'd pages, not associated
+		 * with buffers.  stack->buffer is not touched yet.
+		 */
 		Buffer		rbuffer;
 		BlockNumber savedRightLink;
 		ginxlogSplit data;
 		Buffer		lbuffer = InvalidBuffer;
 		Page		newrootpg = NULL;
 
+		/* Get a new index page to become the right page */
 		rbuffer = GinNewBuffer(btree->index);
 
 		/* During index build, count the new page */
@@ -447,19 +468,11 @@
 
 		savedRightLink = GinPageGetOpaque(page)->rightlink;
 
-		/*
-		 * newlpage and newrpage are pointers to memory pages, not associated
-		 * with buffers. stack->buffer is not touched yet.
-		 */
-
+		/* Begin setting up WAL record */
 		data.node = btree->index->rd_node;
 		data.flags = xlflags;
-		if (childbuf != InvalidBuffer)
+		if (BufferIsValid(childbuf))
 		{
-			Page		childpage = BufferGetPage(childbuf);
-
-			GinPageGetOpaque(childpage)->flags &= ~GIN_INCOMPLETE_SPLIT;
-
 			data.leftChildBlkno = BufferGetBlockNumber(childbuf);
 			data.rightChildBlkno = GinPageGetOpaque(childpage)->rightlink;
 		}
@@ -469,12 +482,12 @@
 		if (stack->parent == NULL)
 		{
 			/*
-			 * split root, so we need to allocate new left page and place
-			 * pointer on root to left and right page
+			 * splitting the root, so we need to allocate new left page and
+			 * place pointers to left and right page on root page.
 			 */
 			lbuffer = GinNewBuffer(btree->index);
 
-			/* During index build, count the newly-added root page */
+			/* During index build, count the new left page */
 			if (buildStats)
 			{
 				if (btree->isData)
@@ -491,9 +504,9 @@
 
 			/*
 			 * Construct a new root page containing downlinks to the new left
-			 * and right pages. (do this in a temporary copy first rather than
-			 * overwriting the original page directly, so that we can still
-			 * abort gracefully if this fails.)
+			 * and right pages.  (Do this in a temporary copy rather than
+			 * overwriting the original page directly, since we're not in the
+			 * critical section yet.)
 			 */
 			newrootpg = PageGetTempPage(newrpage);
 			GinInitPage(newrootpg, GinPageGetOpaque(newlpage)->flags & ~(GIN_LEAF | GIN_COMPRESSED), BLCKSZ);
@@ -504,7 +517,7 @@
 		}
 		else
 		{
-			/* split non-root page */
+			/* splitting a non-root page */
 			data.rrlink = savedRightLink;
 
 			GinPageGetOpaque(newrpage)->rightlink = savedRightLink;
@@ -513,41 +526,44 @@
 		}
 
 		/*
-		 * Ok, we have the new contents of the left page in a temporary copy
-		 * now (newlpage), and the newly-allocated right block has been filled
-		 * in. The original page is still unchanged.
+		 * OK, we have the new contents of the left page in a temporary copy
+		 * now (newlpage), and likewise for the new contents of the
+		 * newly-allocated right block. The original page is still unchanged.
 		 *
 		 * If this is a root split, we also have a temporary page containing
-		 * the new contents of the root. Copy the new left page to a
-		 * newly-allocated block, and initialize the (original) root page the
-		 * new copy. Otherwise, copy over the temporary copy of the new left
-		 * page over the old left page.
+		 * the new contents of the root.
 		 */
 
 		START_CRIT_SECTION();
 
 		MarkBufferDirty(rbuffer);
 		MarkBufferDirty(stack->buffer);
-		if (BufferIsValid(childbuf))
-			MarkBufferDirty(childbuf);
 
 		/*
-		 * Restore the temporary copies over the real buffers. But don't free
-		 * the temporary copies yet, WAL record data points to them.
+		 * Restore the temporary copies over the real buffers.
 		 */
 		if (stack->parent == NULL)
 		{
+			/* Splitting the root, three pages to update */
 			MarkBufferDirty(lbuffer);
-			memcpy(BufferGetPage(stack->buffer), newrootpg, BLCKSZ);
+			memcpy(page, newrootpg, BLCKSZ);
 			memcpy(BufferGetPage(lbuffer), newlpage, BLCKSZ);
 			memcpy(BufferGetPage(rbuffer), newrpage, BLCKSZ);
 		}
 		else
 		{
-			memcpy(BufferGetPage(stack->buffer), newlpage, BLCKSZ);
+			/* Normal split, only two pages to update */
+			memcpy(page, newlpage, BLCKSZ);
 			memcpy(BufferGetPage(rbuffer), newrpage, BLCKSZ);
 		}
 
+		/* We also clear childbuf's INCOMPLETE_SPLIT flag, if passed */
+		if (BufferIsValid(childbuf))
+		{
+			GinPageGetOpaque(childpage)->flags &= ~GIN_INCOMPLETE_SPLIT;
+			MarkBufferDirty(childbuf);
+		}
+
 		/* write WAL record */
 		if (RelationNeedsWAL(btree->index))
 		{
@@ -572,12 +588,13 @@
 				XLogRegisterBuffer(1, rbuffer, REGBUF_FORCE_IMAGE | REGBUF_STANDARD);
 			}
 			if (BufferIsValid(childbuf))
-				XLogRegisterBuffer(3, childbuf, 0);
+				XLogRegisterBuffer(3, childbuf, REGBUF_STANDARD);
 
 			XLogRegisterData((char *) &data, sizeof(ginxlogSplit));
 
 			recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_SPLIT);
-			PageSetLSN(BufferGetPage(stack->buffer), recptr);
+
+			PageSetLSN(page, recptr);
 			PageSetLSN(BufferGetPage(rbuffer), recptr);
 			if (stack->parent == NULL)
 				PageSetLSN(BufferGetPage(lbuffer), recptr);
@@ -587,33 +604,31 @@
 		END_CRIT_SECTION();
 
 		/*
-		 * We can release the lock on the right page now, but keep the
-		 * original buffer locked.
+		 * We can release the locks/pins on the new pages now, but keep
+		 * stack->buffer locked.  childbuf doesn't get unlocked either.
 		 */
 		UnlockReleaseBuffer(rbuffer);
 		if (stack->parent == NULL)
 			UnlockReleaseBuffer(lbuffer);
 
-		pfree(newlpage);
-		pfree(newrpage);
-		if (newrootpg)
-			pfree(newrootpg);
-
 		/*
 		 * If we split the root, we're done. Otherwise the split is not
 		 * complete until the downlink for the new page has been inserted to
 		 * the parent.
 		 */
-		if (stack->parent == NULL)
-			return true;
-		else
-			return false;
+		result = (stack->parent == NULL);
 	}
 	else
 	{
-		elog(ERROR, "unknown return code from GIN placeToPage method: %d", rc);
-		return false;			/* keep compiler quiet */
+		elog(ERROR, "invalid return code from GIN placeToPage method: %d", rc);
+		result = false;			/* keep compiler quiet */
 	}
+
+	/* Clean up temp context */
+	MemoryContextSwitchTo(oldCxt);
+	MemoryContextDelete(tmpCxt);
+
+	return result;
 }
 
 /*
diff -Nru postgresql-9.5-9.5.2/src/backend/access/gin/gindatapage.c postgresql-9.5-9.5.8/src/backend/access/gin/gindatapage.c
--- postgresql-9.5-9.5.2/src/backend/access/gin/gindatapage.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/gin/gindatapage.c	2017-08-07 21:13:41.000000000 +0000
@@ -18,7 +18,6 @@
 #include "access/xloginsert.h"
 #include "lib/ilist.h"
 #include "miscadmin.h"
-#include "utils/memutils.h"
 #include "utils/rel.h"
 
 /*
@@ -57,6 +56,13 @@
 	int			rsize;			/* total size on right page */
 
 	bool		oldformat;		/* page is in pre-9.4 format on disk */
+
+	/*
+	 * If we need WAL data representing the reconstructed leaf page, it's
+	 * stored here by computeLeafRecompressWALData.
+	 */
+	char	   *walinfo;		/* buffer start */
+	int			walinfolen;		/* and length */
 } disassembledLeaf;
 
 typedef struct
@@ -80,7 +86,7 @@
 	char		action;
 
 	ItemPointerData *modifieditems;
-	int			nmodifieditems;
+	uint16		nmodifieditems;
 
 	/*
 	 * The following fields represent the items in this segment. If 'items' is
@@ -105,10 +111,9 @@
 static bool addItemsToLeaf(disassembledLeaf *leaf, ItemPointer newItems,
 			   int nNewItems);
 
-static void registerLeafRecompressWALData(Buffer buf, disassembledLeaf *leaf);
+static void computeLeafRecompressWALData(disassembledLeaf *leaf);
 static void dataPlaceToPageLeafRecompress(Buffer buf, disassembledLeaf *leaf);
-static void dataPlaceToPageLeafSplit(Buffer buf,
-						 disassembledLeaf *leaf,
+static void dataPlaceToPageLeafSplit(disassembledLeaf *leaf,
 						 ItemPointerData lbound, ItemPointerData rbound,
 						 Page lpage, Page rpage);
 
@@ -423,11 +428,22 @@
 }
 
 /*
- * Places keys to leaf data page and fills WAL record.
+ * Prepare to insert data on a leaf data page.
+ *
+ * If it will fit, return GPTP_INSERT after doing whatever setup is needed
+ * before we enter the insertion critical section.  *ptp_workspace can be
+ * set to pass information along to the execPlaceToPage function.
+ *
+ * If it won't fit, perform a page split and return two temporary page
+ * images into *newlpage and *newrpage, with result GPTP_SPLIT.
+ *
+ * In neither case should the given page buffer be modified here.
  */
 static GinPlaceToPageRC
-dataPlaceToPageLeaf(GinBtree btree, Buffer buf, GinBtreeStack *stack,
-					void *insertdata, Page *newlpage, Page *newrpage)
+dataBeginPlaceToPageLeaf(GinBtree btree, Buffer buf, GinBtreeStack *stack,
+						 void *insertdata,
+						 void **ptp_workspace,
+						 Page *newlpage, Page *newrpage)
 {
 	GinBtreeDataLeafInsertData *items = insertdata;
 	ItemPointer newItems = &items->items[items->curitem];
@@ -440,15 +456,11 @@
 	bool		append;
 	int			segsize;
 	Size		freespace;
-	MemoryContext tmpCxt;
-	MemoryContext oldCxt;
 	disassembledLeaf *leaf;
 	leafSegmentInfo *lastleftinfo;
 	ItemPointerData maxOldItem;
 	ItemPointerData remaining;
 
-	Assert(GinPageIsData(page));
-
 	rbound = *GinDataPageGetRightBound(page);
 
 	/*
@@ -472,18 +484,7 @@
 		maxitems = i;
 	}
 
-	/*
-	 * The following operations do quite a lot of small memory allocations,
-	 * create a temporary memory context so that we don't need to keep track
-	 * of them individually.
-	 */
-	tmpCxt = AllocSetContextCreate(CurrentMemoryContext,
-								   "Gin split temporary context",
-								   ALLOCSET_DEFAULT_MINSIZE,
-								   ALLOCSET_DEFAULT_INITSIZE,
-								   ALLOCSET_DEFAULT_MAXSIZE);
-	oldCxt = MemoryContextSwitchTo(tmpCxt);
-
+	/* Disassemble the data on the page */
 	leaf = disassembleLeaf(page);
 
 	/*
@@ -548,16 +549,13 @@
 		maxitems = Min(maxitems, nnewsegments * MinTuplesPerSegment);
 	}
 
-	/* Add the new items to the segments */
+	/* Add the new items to the segment list */
 	if (!addItemsToLeaf(leaf, newItems, maxitems))
 	{
 		/* all items were duplicates, we have nothing to do */
 		items->curitem += maxitems;
 
-		MemoryContextSwitchTo(oldCxt);
-		MemoryContextDelete(tmpCxt);
-
-		return UNMODIFIED;
+		return GPTP_NO_WORK;
 	}
 
 	/*
@@ -590,22 +588,17 @@
 	if (!needsplit)
 	{
 		/*
-		 * Great, all the items fit on a single page. Construct a WAL record
-		 * describing the changes we made, and write the segments back to the
-		 * page.
-		 *
-		 * Once we start modifying the page, there's no turning back. The
-		 * caller is responsible for calling END_CRIT_SECTION() after writing
-		 * the WAL record.
+		 * Great, all the items fit on a single page.  If needed, prepare data
+		 * for a WAL record describing the changes we'll make.
 		 */
-		MemoryContextSwitchTo(oldCxt);
 		if (RelationNeedsWAL(btree->index))
-		{
-			XLogBeginInsert();
-			registerLeafRecompressWALData(buf, leaf);
-		}
-		START_CRIT_SECTION();
-		dataPlaceToPageLeafRecompress(buf, leaf);
+			computeLeafRecompressWALData(leaf);
+
+		/*
+		 * We're ready to enter the critical section, but
+		 * dataExecPlaceToPageLeaf will need access to the "leaf" data.
+		 */
+		*ptp_workspace = leaf;
 
 		if (append)
 			elog(DEBUG2, "appended %d new items to block %u; %d bytes (%d to go)",
@@ -619,7 +612,7 @@
 	else
 	{
 		/*
-		 * Had to split.
+		 * Have to split.
 		 *
 		 * leafRepackItems already divided the segments between the left and
 		 * the right page. It filled the left page as full as possible, and
@@ -631,7 +624,7 @@
 		 * until they're balanced.
 		 *
 		 * As a further heuristic, when appending items to the end of the
-		 * page, try make the left page 75% full, one the assumption that
+		 * page, try to make the left page 75% full, on the assumption that
 		 * subsequent insertions will probably also go to the end. This packs
 		 * the index somewhat tighter when appending to a table, which is very
 		 * common.
@@ -680,10 +673,13 @@
 													   &lastleftinfo->nitems);
 		lbound = lastleftinfo->items[lastleftinfo->nitems - 1];
 
-		*newlpage = MemoryContextAlloc(oldCxt, BLCKSZ);
-		*newrpage = MemoryContextAlloc(oldCxt, BLCKSZ);
+		/*
+		 * Now allocate a couple of temporary page images, and fill them.
+		 */
+		*newlpage = palloc(BLCKSZ);
+		*newrpage = palloc(BLCKSZ);
 
-		dataPlaceToPageLeafSplit(buf, leaf, lbound, rbound,
+		dataPlaceToPageLeafSplit(leaf, lbound, rbound,
 								 *newlpage, *newrpage);
 
 		Assert(GinPageRightMost(page) ||
@@ -700,12 +696,31 @@
 				 items->nitem - items->curitem - maxitems);
 	}
 
-	MemoryContextSwitchTo(oldCxt);
-	MemoryContextDelete(tmpCxt);
-
 	items->curitem += maxitems;
 
-	return needsplit ? SPLIT : INSERTED;
+	return needsplit ? GPTP_SPLIT : GPTP_INSERT;
+}
+
+/*
+ * Perform data insertion after beginPlaceToPage has decided it will fit.
+ *
+ * This is invoked within a critical section, and XLOG record creation (if
+ * needed) is already started.  The target buffer is registered in slot 0.
+ */
+static void
+dataExecPlaceToPageLeaf(GinBtree btree, Buffer buf, GinBtreeStack *stack,
+						void *insertdata, void *ptp_workspace)
+{
+	disassembledLeaf *leaf = (disassembledLeaf *) ptp_workspace;
+
+	/* Apply changes to page */
+	dataPlaceToPageLeafRecompress(buf, leaf);
+
+	/* If needed, register WAL data built by computeLeafRecompressWALData */
+	if (RelationNeedsWAL(btree->index))
+	{
+		XLogRegisterBufData(0, leaf->walinfo, leaf->walinfolen);
+	}
 }
 
 /*
@@ -816,11 +831,11 @@
 		}
 
 		if (RelationNeedsWAL(indexrel))
-		{
-			XLogBeginInsert();
-			registerLeafRecompressWALData(buffer, leaf);
-		}
+			computeLeafRecompressWALData(leaf);
+
+		/* Apply changes to page */
 		START_CRIT_SECTION();
+
 		dataPlaceToPageLeafRecompress(buffer, leaf);
 
 		MarkBufferDirty(buffer);
@@ -829,6 +844,9 @@
 		{
 			XLogRecPtr	recptr;
 
+			XLogBeginInsert();
+			XLogRegisterBuffer(0, buffer, REGBUF_STANDARD);
+			XLogRegisterBufData(0, leaf->walinfo, leaf->walinfolen);
 			recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_VACUUM_DATA_LEAF_PAGE);
 			PageSetLSN(page, recptr);
 		}
@@ -839,10 +857,11 @@
 
 /*
  * Construct a ginxlogRecompressDataLeaf record representing the changes
- * in *leaf.
+ * in *leaf.  (Because this requires a palloc, we have to do it before
+ * we enter the critical section that actually updates the page.)
  */
 static void
-registerLeafRecompressWALData(Buffer buf, disassembledLeaf *leaf)
+computeLeafRecompressWALData(disassembledLeaf *leaf)
 {
 	int			nmodified = 0;
 	char	   *walbufbegin;
@@ -933,18 +952,15 @@
 			segno++;
 	}
 
-
-	XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
-	XLogRegisterBufData(0, walbufbegin, walbufend - walbufbegin);
-
+	/* Pass back the constructed info via *leaf */
+	leaf->walinfo = walbufbegin;
+	leaf->walinfolen = walbufend - walbufbegin;
 }
 
 /*
  * Assemble a disassembled posting tree leaf page back to a buffer.
  *
- * *prdata is filled with WAL information about this operation. The caller
- * is responsible for inserting to the WAL, along with any other information
- * about the operation that triggered this recompression.
+ * This just updates the target buffer; WAL stuff is caller's responsibility.
  *
  * NOTE: The segment pointers must not point directly to the same buffer,
  * except for segments that have not been modified and whose preceding
@@ -1003,11 +1019,11 @@
  * segments to two pages instead of one.
  *
  * This is different from the non-split cases in that this does not modify
- * the original page directly, but to temporary in-memory copies of the new
- * left and right pages.
+ * the original page directly, but writes to temporary in-memory copies of
+ * the new left and right pages.
  */
 static void
-dataPlaceToPageLeafSplit(Buffer buf, disassembledLeaf *leaf,
+dataPlaceToPageLeafSplit(disassembledLeaf *leaf,
 						 ItemPointerData lbound, ItemPointerData rbound,
 						 Page lpage, Page rpage)
 {
@@ -1076,39 +1092,55 @@
 }
 
 /*
- * Place a PostingItem to page, and fill a WAL record.
+ * Prepare to insert data on an internal data page.
+ *
+ * If it will fit, return GPTP_INSERT after doing whatever setup is needed
+ * before we enter the insertion critical section.  *ptp_workspace can be
+ * set to pass information along to the execPlaceToPage function.
  *
- * If the item doesn't fit, returns false without modifying the page.
+ * If it won't fit, perform a page split and return two temporary page
+ * images into *newlpage and *newrpage, with result GPTP_SPLIT.
  *
- * In addition to inserting the given item, the downlink of the existing item
- * at 'off' is updated to point to 'updateblkno'.
+ * In neither case should the given page buffer be modified here.
  *
- * On INSERTED, registers the buffer as buffer ID 0, with data.
- * On SPLIT, returns rdata that represents the split pages in *prdata.
+ * Note: on insertion to an internal node, in addition to inserting the given
+ * item, the downlink of the existing item at stack->off will be updated to
+ * point to updateblkno.
  */
 static GinPlaceToPageRC
-dataPlaceToPageInternal(GinBtree btree, Buffer buf, GinBtreeStack *stack,
-						void *insertdata, BlockNumber updateblkno,
-						Page *newlpage, Page *newrpage)
+dataBeginPlaceToPageInternal(GinBtree btree, Buffer buf, GinBtreeStack *stack,
+							 void *insertdata, BlockNumber updateblkno,
+							 void **ptp_workspace,
+							 Page *newlpage, Page *newrpage)
 {
 	Page		page = BufferGetPage(buf);
-	OffsetNumber off = stack->off;
-	PostingItem *pitem;
 
-	/* this must be static so it can be returned to caller */
-	static ginxlogInsertDataInternal data;
-
-	/* split if we have to */
+	/* If it doesn't fit, deal with split case */
 	if (GinNonLeafDataPageGetFreeSpace(page) < sizeof(PostingItem))
 	{
 		dataSplitPageInternal(btree, buf, stack, insertdata, updateblkno,
 							  newlpage, newrpage);
-		return SPLIT;
+		return GPTP_SPLIT;
 	}
 
-	Assert(GinPageIsData(page));
+	/* Else, we're ready to proceed with insertion */
+	return GPTP_INSERT;
+}
 
-	START_CRIT_SECTION();
+/*
+ * Perform data insertion after beginPlaceToPage has decided it will fit.
+ *
+ * This is invoked within a critical section, and XLOG record creation (if
+ * needed) is already started.  The target buffer is registered in slot 0.
+ */
+static void
+dataExecPlaceToPageInternal(GinBtree btree, Buffer buf, GinBtreeStack *stack,
+							void *insertdata, BlockNumber updateblkno,
+							void *ptp_workspace)
+{
+	Page		page = BufferGetPage(buf);
+	OffsetNumber off = stack->off;
+	PostingItem *pitem;
 
 	/* Update existing downlink to point to next page (on internal page) */
 	pitem = GinDataPageGetPostingItem(page, off);
@@ -1120,43 +1152,90 @@
 
 	if (RelationNeedsWAL(btree->index))
 	{
+		/*
+		 * This must be static, because it has to survive until XLogInsert,
+		 * and we can't palloc here.  Ugly, but the XLogInsert infrastructure
+		 * isn't reentrant anyway.
+		 */
+		static ginxlogInsertDataInternal data;
+
 		data.offset = off;
 		data.newitem = *pitem;
 
-		XLogBeginInsert();
-		XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
 		XLogRegisterBufData(0, (char *) &data,
 							sizeof(ginxlogInsertDataInternal));
 	}
-
-	return INSERTED;
 }
 
 /*
- * Places an item (or items) to a posting tree. Calls relevant function of
- * internal of leaf page because they are handled very differently.
+ * Prepare to insert data on a posting-tree data page.
+ *
+ * If it will fit, return GPTP_INSERT after doing whatever setup is needed
+ * before we enter the insertion critical section.  *ptp_workspace can be
+ * set to pass information along to the execPlaceToPage function.
+ *
+ * If it won't fit, perform a page split and return two temporary page
+ * images into *newlpage and *newrpage, with result GPTP_SPLIT.
+ *
+ * In neither case should the given page buffer be modified here.
+ *
+ * Note: on insertion to an internal node, in addition to inserting the given
+ * item, the downlink of the existing item at stack->off will be updated to
+ * point to updateblkno.
+ *
+ * Calls relevant function for internal or leaf page because they are handled
+ * very differently.
  */
 static GinPlaceToPageRC
-dataPlaceToPage(GinBtree btree, Buffer buf, GinBtreeStack *stack,
-				void *insertdata, BlockNumber updateblkno,
-				Page *newlpage, Page *newrpage)
+dataBeginPlaceToPage(GinBtree btree, Buffer buf, GinBtreeStack *stack,
+					 void *insertdata, BlockNumber updateblkno,
+					 void **ptp_workspace,
+					 Page *newlpage, Page *newrpage)
 {
 	Page		page = BufferGetPage(buf);
 
 	Assert(GinPageIsData(page));
 
 	if (GinPageIsLeaf(page))
-		return dataPlaceToPageLeaf(btree, buf, stack, insertdata,
-								   newlpage, newrpage);
+		return dataBeginPlaceToPageLeaf(btree, buf, stack, insertdata,
+										ptp_workspace,
+										newlpage, newrpage);
+	else
+		return dataBeginPlaceToPageInternal(btree, buf, stack,
+											insertdata, updateblkno,
+											ptp_workspace,
+											newlpage, newrpage);
+}
+
+/*
+ * Perform data insertion after beginPlaceToPage has decided it will fit.
+ *
+ * This is invoked within a critical section, and XLOG record creation (if
+ * needed) is already started.  The target buffer is registered in slot 0.
+ *
+ * Calls relevant function for internal or leaf page because they are handled
+ * very differently.
+ */
+static void
+dataExecPlaceToPage(GinBtree btree, Buffer buf, GinBtreeStack *stack,
+					void *insertdata, BlockNumber updateblkno,
+					void *ptp_workspace)
+{
+	Page		page = BufferGetPage(buf);
+
+	if (GinPageIsLeaf(page))
+		dataExecPlaceToPageLeaf(btree, buf, stack, insertdata,
+								ptp_workspace);
 	else
-		return dataPlaceToPageInternal(btree, buf, stack,
-									   insertdata, updateblkno,
-									   newlpage, newrpage);
+		dataExecPlaceToPageInternal(btree, buf, stack, insertdata,
+									updateblkno, ptp_workspace);
 }
 
 /*
- * Split page and fill WAL record. Returns a new temp buffer filled with data
- * that should go to the left page. The original buffer is left untouched.
+ * Split internal page and insert new data.
+ *
+ * Returns new temp pages to *newlpage and *newrpage.
+ * The original buffer is left untouched.
  */
 static void
 dataSplitPageInternal(GinBtree btree, Buffer origbuf,
@@ -1231,6 +1310,7 @@
 	/* set up right bound for right page */
 	*GinDataPageGetRightBound(rpage) = oldbound;
 
+	/* return temp pages to caller */
 	*newlpage = lpage;
 	*newrpage = rpage;
 }
@@ -1789,7 +1869,8 @@
 	btree->isMoveRight = dataIsMoveRight;
 	btree->findItem = NULL;
 	btree->findChildPtr = dataFindChildPtr;
-	btree->placeToPage = dataPlaceToPage;
+	btree->beginPlaceToPage = dataBeginPlaceToPage;
+	btree->execPlaceToPage = dataExecPlaceToPage;
 	btree->fillRoot = ginDataFillRoot;
 	btree->prepareDownlink = dataPrepareDownlink;
 
diff -Nru postgresql-9.5-9.5.2/src/backend/access/gin/ginentrypage.c postgresql-9.5-9.5.8/src/backend/access/gin/ginentrypage.c
--- postgresql-9.5-9.5.2/src/backend/access/gin/ginentrypage.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/gin/ginentrypage.c	2017-08-07 21:13:41.000000000 +0000
@@ -21,7 +21,7 @@
 
 static void entrySplitPage(GinBtree btree, Buffer origbuf,
 			   GinBtreeStack *stack,
-			   void *insertPayload,
+			   GinBtreeEntryInsertData *insertData,
 			   BlockNumber updateblkno,
 			   Page *newlpage, Page *newrpage);
 
@@ -508,39 +508,57 @@
 }
 
 /*
- * Place tuple on page and fills WAL record
+ * Prepare to insert data on an entry page.
  *
- * If the tuple doesn't fit, returns false without modifying the page.
+ * If it will fit, return GPTP_INSERT after doing whatever setup is needed
+ * before we enter the insertion critical section.  *ptp_workspace can be
+ * set to pass information along to the execPlaceToPage function.
  *
- * On insertion to an internal node, in addition to inserting the given item,
- * the downlink of the existing item at 'off' is updated to point to
- * 'updateblkno'.
+ * If it won't fit, perform a page split and return two temporary page
+ * images into *newlpage and *newrpage, with result GPTP_SPLIT.
  *
- * On INSERTED, registers the buffer as buffer ID 0, with data.
- * On SPLIT, returns rdata that represents the split pages in *prdata.
+ * In neither case should the given page buffer be modified here.
+ *
+ * Note: on insertion to an internal node, in addition to inserting the given
+ * item, the downlink of the existing item at stack->off will be updated to
+ * point to updateblkno.
  */
 static GinPlaceToPageRC
-entryPlaceToPage(GinBtree btree, Buffer buf, GinBtreeStack *stack,
-				 void *insertPayload, BlockNumber updateblkno,
-				 Page *newlpage, Page *newrpage)
+entryBeginPlaceToPage(GinBtree btree, Buffer buf, GinBtreeStack *stack,
+					  void *insertPayload, BlockNumber updateblkno,
+					  void **ptp_workspace,
+					  Page *newlpage, Page *newrpage)
 {
 	GinBtreeEntryInsertData *insertData = insertPayload;
-	Page		page = BufferGetPage(buf);
 	OffsetNumber off = stack->off;
-	OffsetNumber placed;
 
-	/* this must be static so it can be returned to caller. */
-	static ginxlogInsertEntry data;
-
-	/* quick exit if it doesn't fit */
+	/* If it doesn't fit, deal with split case */
 	if (!entryIsEnoughSpace(btree, buf, off, insertData))
 	{
-		entrySplitPage(btree, buf, stack, insertPayload, updateblkno,
+		entrySplitPage(btree, buf, stack, insertData, updateblkno,
 					   newlpage, newrpage);
-		return SPLIT;
+		return GPTP_SPLIT;
 	}
 
-	START_CRIT_SECTION();
+	/* Else, we're ready to proceed with insertion */
+	return GPTP_INSERT;
+}
+
+/*
+ * Perform data insertion after beginPlaceToPage has decided it will fit.
+ *
+ * This is invoked within a critical section, and XLOG record creation (if
+ * needed) is already started.  The target buffer is registered in slot 0.
+ */
+static void
+entryExecPlaceToPage(GinBtree btree, Buffer buf, GinBtreeStack *stack,
+					 void *insertPayload, BlockNumber updateblkno,
+					 void *ptp_workspace)
+{
+	GinBtreeEntryInsertData *insertData = insertPayload;
+	Page		page = BufferGetPage(buf);
+	OffsetNumber off = stack->off;
+	OffsetNumber placed;
 
 	entryPreparePage(btree, page, off, insertData, updateblkno);
 
@@ -554,34 +572,36 @@
 
 	if (RelationNeedsWAL(btree->index))
 	{
+		/*
+		 * This must be static, because it has to survive until XLogInsert,
+		 * and we can't palloc here.  Ugly, but the XLogInsert infrastructure
+		 * isn't reentrant anyway.
+		 */
+		static ginxlogInsertEntry data;
+
 		data.isDelete = insertData->isDelete;
 		data.offset = off;
 
-		XLogBeginInsert();
-		XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
 		XLogRegisterBufData(0, (char *) &data,
 							offsetof(ginxlogInsertEntry, tuple));
 		XLogRegisterBufData(0, (char *) insertData->entry,
 							IndexTupleSize(insertData->entry));
 	}
-
-	return INSERTED;
 }
 
 /*
- * Place tuple and split page, original buffer(lbuf) leaves untouched,
- * returns shadow pages filled with new data.
- * Tuples are distributed between pages by equal size on its, not
- * an equal number!
+ * Split entry page and insert new data.
+ *
+ * Returns new temp pages to *newlpage and *newrpage.
+ * The original buffer is left untouched.
  */
 static void
 entrySplitPage(GinBtree btree, Buffer origbuf,
 			   GinBtreeStack *stack,
-			   void *insertPayload,
+			   GinBtreeEntryInsertData *insertData,
 			   BlockNumber updateblkno,
 			   Page *newlpage, Page *newrpage)
 {
-	GinBtreeEntryInsertData *insertData = insertPayload;
 	OffsetNumber off = stack->off;
 	OffsetNumber i,
 				maxoff,
@@ -646,6 +666,10 @@
 	{
 		itup = (IndexTuple) ptr;
 
+		/*
+		 * Decide where to split.  We try to equalize the pages' total data
+		 * size, not number of tuples.
+		 */
 		if (lsize > totalsize / 2)
 		{
 			if (separator == InvalidOffsetNumber)
@@ -663,6 +687,7 @@
 		ptr += MAXALIGN(IndexTupleSize(itup));
 	}
 
+	/* return temp pages to caller */
 	*newlpage = lpage;
 	*newrpage = rpage;
 }
@@ -731,7 +756,8 @@
 	btree->isMoveRight = entryIsMoveRight;
 	btree->findItem = entryLocateLeafEntry;
 	btree->findChildPtr = entryFindChildPtr;
-	btree->placeToPage = entryPlaceToPage;
+	btree->beginPlaceToPage = entryBeginPlaceToPage;
+	btree->execPlaceToPage = entryExecPlaceToPage;
 	btree->fillRoot = ginEntryFillRoot;
 	btree->prepareDownlink = entryPrepareDownlink;
 
diff -Nru postgresql-9.5-9.5.2/src/backend/access/gin/ginget.c postgresql-9.5-9.5.8/src/backend/access/gin/ginget.c
--- postgresql-9.5-9.5.2/src/backend/access/gin/ginget.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/gin/ginget.c	2017-08-07 21:13:41.000000000 +0000
@@ -278,6 +278,7 @@
 			ipd = ginReadTuple(btree->ginstate, scanEntry->attnum, itup, &nipd);
 			tbm_add_tuples(scanEntry->matchBitmap, ipd, nipd, false);
 			scanEntry->predictNumberResult += GinGetNPosting(itup);
+			pfree(ipd);
 		}
 
 		/*
diff -Nru postgresql-9.5-9.5.2/src/backend/access/gist/gistget.c postgresql-9.5-9.5.8/src/backend/access/gist/gistget.c
--- postgresql-9.5-9.5.2/src/backend/access/gist/gistget.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/gist/gistget.c	2017-08-07 21:13:41.000000000 +0000
@@ -302,6 +302,7 @@
 	}
 
 	so->nPageData = so->curPageData = 0;
+	scan->xs_itup = NULL;		/* might point into pageDataCxt */
 	if (so->pageDataCxt)
 		MemoryContextReset(so->pageDataCxt);
 
@@ -552,6 +553,7 @@
 
 		so->firstCall = false;
 		so->curPageData = so->nPageData = 0;
+		scan->xs_itup = NULL;
 		if (so->pageDataCxt)
 			MemoryContextReset(so->pageDataCxt);
 
@@ -629,6 +631,7 @@
 
 	/* Begin the scan by processing the root page */
 	so->curPageData = so->nPageData = 0;
+	scan->xs_itup = NULL;
 	if (so->pageDataCxt)
 		MemoryContextReset(so->pageDataCxt);
 
diff -Nru postgresql-9.5-9.5.2/src/backend/access/gist/gistproc.c postgresql-9.5-9.5.8/src/backend/access/gist/gistproc.c
--- postgresql-9.5-9.5.2/src/backend/access/gist/gistproc.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/gist/gistproc.c	2017-08-07 21:13:41.000000000 +0000
@@ -17,20 +17,31 @@
  */
 #include "postgres.h"
 
+#include <math.h>
+
 #include "access/gist.h"
 #include "access/stratnum.h"
+#include "utils/builtins.h"
 #include "utils/geo_decls.h"
 
 
 static bool gist_box_leaf_consistent(BOX *key, BOX *query,
 						 StrategyNumber strategy);
-static double size_box(BOX *box);
 static bool rtree_internal_consistent(BOX *key, BOX *query,
 						  StrategyNumber strategy);
 
 /* Minimum accepted ratio of split */
 #define LIMIT_RATIO 0.3
 
+/* Convenience macros for NaN-aware comparisons */
+#define FLOAT8_EQ(a,b)	(float8_cmp_internal(a, b) == 0)
+#define FLOAT8_LT(a,b)	(float8_cmp_internal(a, b) < 0)
+#define FLOAT8_LE(a,b)	(float8_cmp_internal(a, b) <= 0)
+#define FLOAT8_GT(a,b)	(float8_cmp_internal(a, b) > 0)
+#define FLOAT8_GE(a,b)	(float8_cmp_internal(a, b) >= 0)
+#define FLOAT8_MAX(a,b)  (FLOAT8_GT(a, b) ? (a) : (b))
+#define FLOAT8_MIN(a,b)  (FLOAT8_LT(a, b) ? (a) : (b))
+
 
 /**************************************************
  * Box ops
@@ -40,12 +51,53 @@
  * Calculates union of two boxes, a and b. The result is stored in *n.
  */
 static void
-rt_box_union(BOX *n, BOX *a, BOX *b)
+rt_box_union(BOX *n, const BOX *a, const BOX *b)
+{
+	n->high.x = FLOAT8_MAX(a->high.x, b->high.x);
+	n->high.y = FLOAT8_MAX(a->high.y, b->high.y);
+	n->low.x = FLOAT8_MIN(a->low.x, b->low.x);
+	n->low.y = FLOAT8_MIN(a->low.y, b->low.y);
+}
+
+/*
+ * Size of a BOX for penalty-calculation purposes.
+ * The result can be +Infinity, but not NaN.
+ */
+static double
+size_box(const BOX *box)
+{
+	/*
+	 * Check for zero-width cases.  Note that we define the size of a zero-
+	 * by-infinity box as zero.  It's important to special-case this somehow,
+	 * as naively multiplying infinity by zero will produce NaN.
+	 *
+	 * The less-than cases should not happen, but if they do, say "zero".
+	 */
+	if (FLOAT8_LE(box->high.x, box->low.x) ||
+		FLOAT8_LE(box->high.y, box->low.y))
+		return 0.0;
+
+	/*
+	 * We treat NaN as larger than +Infinity, so any distance involving a NaN
+	 * and a non-NaN is infinite.  Note the previous check eliminated the
+	 * possibility that the low fields are NaNs.
+	 */
+	if (isnan(box->high.x) || isnan(box->high.y))
+		return get_float8_infinity();
+	return (box->high.x - box->low.x) * (box->high.y - box->low.y);
+}
+
+/*
+ * Return amount by which the union of the two boxes is larger than
+ * the original BOX's area.  The result can be +Infinity, but not NaN.
+ */
+static double
+box_penalty(const BOX *original, const BOX *new)
 {
-	n->high.x = Max(a->high.x, b->high.x);
-	n->high.y = Max(a->high.y, b->high.y);
-	n->low.x = Min(a->low.x, b->low.x);
-	n->low.y = Min(a->low.y, b->low.y);
+	BOX			unionbox;
+
+	rt_box_union(&unionbox, original, new);
+	return size_box(&unionbox) - size_box(original);
 }
 
 /*
@@ -85,16 +137,19 @@
 												 strategy));
 }
 
+/*
+ * Increase BOX b to include addon.
+ */
 static void
-adjustBox(BOX *b, BOX *addon)
+adjustBox(BOX *b, const BOX *addon)
 {
-	if (b->high.x < addon->high.x)
+	if (FLOAT8_LT(b->high.x, addon->high.x))
 		b->high.x = addon->high.x;
-	if (b->low.x > addon->low.x)
+	if (FLOAT8_GT(b->low.x, addon->low.x))
 		b->low.x = addon->low.x;
-	if (b->high.y < addon->high.y)
+	if (FLOAT8_LT(b->high.y, addon->high.y))
 		b->high.y = addon->high.y;
-	if (b->low.y > addon->low.y)
+	if (FLOAT8_GT(b->low.y, addon->low.y))
 		b->low.y = addon->low.y;
 }
 
@@ -174,10 +229,8 @@
 	float	   *result = (float *) PG_GETARG_POINTER(2);
 	BOX		   *origbox = DatumGetBoxP(origentry->key);
 	BOX		   *newbox = DatumGetBoxP(newentry->key);
-	BOX			unionbox;
 
-	rt_box_union(&unionbox, origbox, newbox);
-	*result = (float) (size_box(&unionbox) - size_box(origbox));
+	*result = (float) box_penalty(origbox, newbox);
 	PG_RETURN_POINTER(result);
 }
 
@@ -290,12 +343,7 @@
 	double		lower1 = ((const SplitInterval *) i1)->lower,
 				lower2 = ((const SplitInterval *) i2)->lower;
 
-	if (lower1 < lower2)
-		return -1;
-	else if (lower1 > lower2)
-		return 1;
-	else
-		return 0;
+	return float8_cmp_internal(lower1, lower2);
 }
 
 /*
@@ -307,16 +355,11 @@
 	double		upper1 = ((const SplitInterval *) i1)->upper,
 				upper2 = ((const SplitInterval *) i2)->upper;
 
-	if (upper1 < upper2)
-		return -1;
-	else if (upper1 > upper2)
-		return 1;
-	else
-		return 0;
+	return float8_cmp_internal(upper1, upper2);
 }
 
 /*
- * Replace negative value with zero.
+ * Replace negative (or NaN) value with zero.
  */
 static inline float
 non_negative(float val)
@@ -436,24 +479,8 @@
 }
 
 /*
- * Return increase of original BOX area by new BOX area insertion.
- */
-static double
-box_penalty(BOX *original, BOX *new)
-{
-	double		union_width,
-				union_height;
-
-	union_width = Max(original->high.x, new->high.x) -
-		Min(original->low.x, new->low.x);
-	union_height = Max(original->high.y, new->high.y) -
-		Min(original->low.y, new->low.y);
-	return union_width * union_height - (original->high.x - original->low.x) *
-		(original->high.y - original->low.y);
-}
-
-/*
  * Compare common entries by their deltas.
+ * (We assume the deltas can't be NaN.)
  */
 static int
 common_entry_cmp(const void *i1, const void *i2)
@@ -615,9 +642,11 @@
 			/*
 			 * Find next lower bound of right group.
 			 */
-			while (i1 < nentries && rightLower == intervalsLower[i1].lower)
+			while (i1 < nentries &&
+				   FLOAT8_EQ(rightLower, intervalsLower[i1].lower))
 			{
-				leftUpper = Max(leftUpper, intervalsLower[i1].upper);
+				if (FLOAT8_LT(leftUpper, intervalsLower[i1].upper))
+					leftUpper = intervalsLower[i1].upper;
 				i1++;
 			}
 			if (i1 >= nentries)
@@ -628,7 +657,8 @@
 			 * Find count of intervals which anyway should be placed to the
 			 * left group.
 			 */
-			while (i2 < nentries && intervalsUpper[i2].upper <= leftUpper)
+			while (i2 < nentries &&
+				   FLOAT8_LE(intervalsUpper[i2].upper, leftUpper))
 				i2++;
 
 			/*
@@ -650,9 +680,10 @@
 			/*
 			 * Find next upper bound of left group.
 			 */
-			while (i2 >= 0 && leftUpper == intervalsUpper[i2].upper)
+			while (i2 >= 0 && FLOAT8_EQ(leftUpper, intervalsUpper[i2].upper))
 			{
-				rightLower = Min(rightLower, intervalsUpper[i2].lower);
+				if (FLOAT8_GT(rightLower, intervalsUpper[i2].lower))
+					rightLower = intervalsUpper[i2].lower;
 				i2--;
 			}
 			if (i2 < 0)
@@ -663,7 +694,7 @@
 			 * Find count of intervals which anyway should be placed to the
 			 * right group.
 			 */
-			while (i1 >= 0 && intervalsLower[i1].lower >= rightLower)
+			while (i1 >= 0 && FLOAT8_GE(intervalsLower[i1].lower, rightLower))
 				i1--;
 
 			/*
@@ -751,10 +782,10 @@
 			upper = box->high.y;
 		}
 
-		if (upper <= context.leftUpper)
+		if (FLOAT8_LE(upper, context.leftUpper))
 		{
 			/* Fits to the left group */
-			if (lower >= context.rightLower)
+			if (FLOAT8_GE(lower, context.rightLower))
 			{
 				/* Fits also to the right group, so "common entry" */
 				commonEntries[commonEntriesCount++].index = i;
@@ -772,7 +803,7 @@
 			 * entry didn't fit on the left group, it better fit in the right
 			 * group.
 			 */
-			Assert(lower >= context.rightLower);
+			Assert(FLOAT8_GE(lower, context.rightLower));
 
 			/* Doesn't fit to the left group, so join to the right group */
 			PLACE_RIGHT(box, i);
@@ -856,8 +887,10 @@
 	bool	   *result = (bool *) PG_GETARG_POINTER(2);
 
 	if (b1 && b2)
-		*result = (b1->low.x == b2->low.x && b1->low.y == b2->low.y &&
-				   b1->high.x == b2->high.x && b1->high.y == b2->high.y);
+		*result = (FLOAT8_EQ(b1->low.x, b2->low.x) &&
+				   FLOAT8_EQ(b1->low.y, b2->low.y) &&
+				   FLOAT8_EQ(b1->high.x, b2->high.x) &&
+				   FLOAT8_EQ(b1->high.y, b2->high.y));
 	else
 		*result = (b1 == NULL && b2 == NULL);
 	PG_RETURN_POINTER(result);
@@ -943,14 +976,6 @@
 	return retval;
 }
 
-static double
-size_box(BOX *box)
-{
-	if (box->high.x <= box->low.x || box->high.y <= box->low.y)
-		return 0.0;
-	return (box->high.x - box->low.x) * (box->high.y - box->low.y);
-}
-
 /*****************************************
  * Common rtree functions (for boxes, polygons, and circles)
  *****************************************/
diff -Nru postgresql-9.5-9.5.2/src/backend/access/gist/gistscan.c postgresql-9.5-9.5.8/src/backend/access/gist/gistscan.c
--- postgresql-9.5-9.5.2/src/backend/access/gist/gistscan.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/gist/gistscan.c	2017-08-07 21:13:41.000000000 +0000
@@ -126,7 +126,7 @@
 	 * which is created on the second call and reset on later calls.  Thus, in
 	 * the common case where a scan is only rescan'd once, we just put the
 	 * queue in scanCxt and don't pay the overhead of making a second memory
-	 * context.  If we do rescan more than once, the first RBTree is just left
+	 * context.  If we do rescan more than once, the first queue is just left
 	 * for dead until end of scan; this small wastage seems worth the savings
 	 * in the common case.
 	 */
@@ -186,7 +186,7 @@
 												ALLOCSET_DEFAULT_MAXSIZE);
 	}
 
-	/* create new, empty RBTree for search queue */
+	/* create new, empty pairing heap for search queue */
 	oldCxt = MemoryContextSwitchTo(so->queueCxt);
 	so->queue = pairingheap_allocate(pairingheap_GISTSearchItem_cmp, scan);
 	MemoryContextSwitchTo(oldCxt);
@@ -318,6 +318,9 @@
 			pfree(fn_extras);
 	}
 
+	/* any previous xs_itup will have been pfree'd in context resets above */
+	scan->xs_itup = NULL;
+
 	PG_RETURN_VOID();
 }
 
diff -Nru postgresql-9.5-9.5.2/src/backend/access/gist/README postgresql-9.5-9.5.8/src/backend/access/gist/README
--- postgresql-9.5-9.5.2/src/backend/access/gist/README	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/gist/README	2017-08-07 21:13:41.000000000 +0000
@@ -28,7 +28,7 @@
 
 The support for concurrency implemented in PostgreSQL was developed based on
 the paper "Access Methods for Next-Generation Database Systems" by
-Marcel Kornaker:
+Marcel Kornacker:
 
     http://www.sai.msu.su/~megera/postgres/gist/papers/concurrency/access-methods-for-next-generation.pdf.gz
 
diff -Nru postgresql-9.5-9.5.2/src/backend/access/hash/hash.c postgresql-9.5-9.5.8/src/backend/access/hash/hash.c
--- postgresql-9.5-9.5.2/src/backend/access/hash/hash.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/hash/hash.c	2017-08-07 21:13:41.000000000 +0000
@@ -140,19 +140,25 @@
 				  void *state)
 {
 	HashBuildState *buildstate = (HashBuildState *) state;
+	Datum		index_values[1];
+	bool		index_isnull[1];
 	IndexTuple	itup;
 
-	/* Hash indexes don't index nulls, see notes in hashinsert */
-	if (isnull[0])
+	/* convert data to a hash key; on failure, do not insert anything */
+	if (!_hash_convert_tuple(index,
+							 values, isnull,
+							 index_values, index_isnull))
 		return;
 
 	/* Either spool the tuple for sorting, or just put it into the index */
 	if (buildstate->spool)
-		_h_spool(buildstate->spool, &htup->t_self, values, isnull);
+		_h_spool(buildstate->spool, &htup->t_self,
+				 index_values, index_isnull);
 	else
 	{
 		/* form an index tuple and point it at the heap tuple */
-		itup = _hash_form_tuple(index, values, isnull);
+		itup = index_form_tuple(RelationGetDescr(index),
+								index_values, index_isnull);
 		itup->t_tid = htup->t_self;
 		_hash_doinsert(index, itup);
 		pfree(itup);
@@ -179,22 +185,18 @@
 	Relation	heapRel = (Relation) PG_GETARG_POINTER(4);
 	IndexUniqueCheck checkUnique = (IndexUniqueCheck) PG_GETARG_INT32(5);
 #endif
+	Datum		index_values[1];
+	bool		index_isnull[1];
 	IndexTuple	itup;
 
-	/*
-	 * If the single index key is null, we don't insert it into the index.
-	 * Hash tables support scans on '='. Relational algebra says that A = B
-	 * returns null if either A or B is null.  This means that no
-	 * qualification used in an index scan could ever return true on a null
-	 * attribute.  It also means that indices can't be used by ISNULL or
-	 * NOTNULL scans, but that's an artifact of the strategy map architecture
-	 * chosen in 1986, not of the way nulls are handled here.
-	 */
-	if (isnull[0])
+	/* convert data to a hash key; on failure, do not insert anything */
+	if (!_hash_convert_tuple(rel,
+							 values, isnull,
+							 index_values, index_isnull))
 		PG_RETURN_BOOL(false);
 
-	/* generate an index tuple */
-	itup = _hash_form_tuple(rel, values, isnull);
+	/* form an index tuple and point it at the heap tuple */
+	itup = index_form_tuple(RelationGetDescr(rel), index_values, index_isnull);
 	itup->t_tid = *ht_ctid;
 
 	_hash_doinsert(rel, itup);
diff -Nru postgresql-9.5-9.5.2/src/backend/access/hash/hashfunc.c postgresql-9.5-9.5.8/src/backend/access/hash/hashfunc.c
--- postgresql-9.5-9.5.2/src/backend/access/hash/hashfunc.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/hash/hashfunc.c	2017-08-07 21:13:41.000000000 +0000
@@ -142,11 +142,8 @@
 hashname(PG_FUNCTION_ARGS)
 {
 	char	   *key = NameStr(*PG_GETARG_NAME(0));
-	int			keylen = strlen(key);
 
-	Assert(keylen < NAMEDATALEN);		/* else it's not truncated correctly */
-
-	return hash_any((unsigned char *) key, keylen);
+	return hash_any((unsigned char *) key, strlen(key));
 }
 
 Datum
diff -Nru postgresql-9.5-9.5.2/src/backend/access/hash/hashinsert.c postgresql-9.5-9.5.8/src/backend/access/hash/hashinsert.c
--- postgresql-9.5-9.5.2/src/backend/access/hash/hashinsert.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/hash/hashinsert.c	2017-08-07 21:13:41.000000000 +0000
@@ -34,6 +34,7 @@
 	BlockNumber blkno;
 	BlockNumber oldblkno = InvalidBlockNumber;
 	bool		retry = false;
+	Page		metapage;
 	Page		page;
 	HashPageOpaque pageopaque;
 	Size		itemsz;
@@ -53,7 +54,8 @@
 
 	/* Read the metapage */
 	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_READ, LH_META_PAGE);
-	metap = HashPageGetMeta(BufferGetPage(metabuf));
+	metapage = BufferGetPage(metabuf);
+	metap = HashPageGetMeta(metapage);
 
 	/*
 	 * Check whether the item can fit on a hash page at all. (Eventually, we
@@ -62,11 +64,11 @@
 	 *
 	 * XXX this is useless code if we are only storing hash keys.
 	 */
-	if (itemsz > HashMaxItemSize((Page) metap))
+	if (itemsz > HashMaxItemSize(metapage))
 		ereport(ERROR,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 				 errmsg("index row size %zu exceeds hash maximum %zu",
-						itemsz, HashMaxItemSize((Page) metap)),
+						itemsz, HashMaxItemSize(metapage)),
 			errhint("Values larger than a buffer page cannot be indexed.")));
 
 	/*
diff -Nru postgresql-9.5-9.5.2/src/backend/access/hash/hashutil.c postgresql-9.5-9.5.8/src/backend/access/hash/hashutil.c
--- postgresql-9.5-9.5.2/src/backend/access/hash/hashutil.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/hash/hashutil.c	2017-08-07 21:13:41.000000000 +0000
@@ -248,27 +248,37 @@
 }
 
 /*
- * _hash_form_tuple - form an index tuple containing hash code only
+ * _hash_convert_tuple - convert raw index data to hash key
+ *
+ * Inputs: values and isnull arrays for the user data column(s)
+ * Outputs: values and isnull arrays for the index tuple, suitable for
+ *		passing to index_form_tuple().
+ *
+ * Returns true if successful, false if not (because there are null values).
+ * On a false result, the given data need not be indexed.
+ *
+ * Note: callers know that the index-column arrays are always of length 1.
+ * In principle, there could be more than one input column, though we do not
+ * currently support that.
  */
-IndexTuple
-_hash_form_tuple(Relation index, Datum *values, bool *isnull)
+bool
+_hash_convert_tuple(Relation index,
+					Datum *user_values, bool *user_isnull,
+					Datum *index_values, bool *index_isnull)
 {
-	IndexTuple	itup;
 	uint32		hashkey;
-	Datum		hashkeydatum;
-	TupleDesc	hashdesc;
 
-	if (isnull[0])
-		hashkeydatum = (Datum) 0;
-	else
-	{
-		hashkey = _hash_datum2hashkey(index, values[0]);
-		hashkeydatum = UInt32GetDatum(hashkey);
-	}
-	hashdesc = RelationGetDescr(index);
-	Assert(hashdesc->natts == 1);
-	itup = index_form_tuple(hashdesc, &hashkeydatum, isnull);
-	return itup;
+	/*
+	 * We do not insert null values into hash indexes.  This is okay because
+	 * the only supported search operator is '=', and we assume it is strict.
+	 */
+	if (user_isnull[0])
+		return false;
+
+	hashkey = _hash_datum2hashkey(index, user_values[0]);
+	index_values[0] = UInt32GetDatum(hashkey);
+	index_isnull[0] = false;
+	return true;
 }
 
 /*
diff -Nru postgresql-9.5-9.5.2/src/backend/access/heap/heapam.c postgresql-9.5-9.5.8/src/backend/access/heap/heapam.c
--- postgresql-9.5-9.5.2/src/backend/access/heap/heapam.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/heap/heapam.c	2017-08-07 21:13:41.000000000 +0000
@@ -3112,7 +3112,7 @@
 		Assert(!HeapTupleHasExternal(&tp));
 	}
 	else if (HeapTupleHasExternal(&tp))
-		toast_delete(relation, &tp);
+		toast_delete(relation, &tp, false);
 
 	/*
 	 * Mark tuple for invalidation from system caches at next command
@@ -3232,8 +3232,7 @@
 				newbuf,
 				vmbuffer = InvalidBuffer,
 				vmbuffer_new = InvalidBuffer;
-	bool		need_toast,
-				already_marked;
+	bool		need_toast;
 	Size		newtupsize,
 				pagefree;
 	bool		have_tuple_lock = false;
@@ -3580,6 +3579,7 @@
 			ReleaseBuffer(vmbuffer);
 		bms_free(hot_attrs);
 		bms_free(key_attrs);
+		bms_free(id_attrs);
 		return result;
 	}
 
@@ -3621,6 +3621,7 @@
 	 * HEAP_XMAX_INVALID bit set; that's fine.)
 	 */
 	if ((oldtup.t_data->t_infomask & HEAP_XMAX_INVALID) ||
+		HEAP_LOCKED_UPGRADED(oldtup.t_data->t_infomask) ||
 		(checked_lockers && !locker_remains))
 		xmax_new_tuple = InvalidTransactionId;
 	else
@@ -3674,8 +3675,8 @@
 	 * on the same page as the old, then we need to release the content lock
 	 * (but not the pin!) on the old tuple's buffer while we are off doing
 	 * TOAST and/or table-file-extension work.  We must mark the old tuple to
-	 * show that it's already being updated, else other processes may try to
-	 * update it themselves.
+	 * show that it's locked, else other processes may try to update it
+	 * themselves.
 	 *
 	 * We need to invoke the toaster if there are already any out-of-line
 	 * toasted values present, or if the new tuple is over-threshold.
@@ -3699,19 +3700,73 @@
 
 	if (need_toast || newtupsize > pagefree)
 	{
+		TransactionId xmax_lock_old_tuple;
+		uint16		infomask_lock_old_tuple,
+					infomask2_lock_old_tuple;
+
+		/*
+		 * To prevent concurrent sessions from updating the tuple, we have to
+		 * temporarily mark it locked, while we release the lock.
+		 *
+		 * To satisfy the rule that any xid potentially appearing in a buffer
+		 * written out to disk, we unfortunately have to WAL log this
+		 * temporary modification.  We can reuse xl_heap_lock for this
+		 * purpose.  If we crash/error before following through with the
+		 * actual update, xmax will be of an aborted transaction, allowing
+		 * other sessions to proceed.
+		 */
+
+		/*
+		 * Compute xmax / infomask appropriate for locking the tuple. This has
+		 * to be done separately from the lock, because the potentially
+		 * created multixact would otherwise be wrong.
+		 */
+		compute_new_xmax_infomask(HeapTupleHeaderGetRawXmax(oldtup.t_data),
+								  oldtup.t_data->t_infomask,
+								  oldtup.t_data->t_infomask2,
+								  xid, *lockmode, false,
+							  &xmax_lock_old_tuple, &infomask_lock_old_tuple,
+								  &infomask2_lock_old_tuple);
+
+		Assert(HEAP_XMAX_IS_LOCKED_ONLY(infomask_lock_old_tuple));
+
+		START_CRIT_SECTION();
+
 		/* Clear obsolete visibility flags ... */
 		oldtup.t_data->t_infomask &= ~(HEAP_XMAX_BITS | HEAP_MOVED);
 		oldtup.t_data->t_infomask2 &= ~HEAP_KEYS_UPDATED;
 		HeapTupleClearHotUpdated(&oldtup);
 		/* ... and store info about transaction updating this tuple */
-		Assert(TransactionIdIsValid(xmax_old_tuple));
-		HeapTupleHeaderSetXmax(oldtup.t_data, xmax_old_tuple);
-		oldtup.t_data->t_infomask |= infomask_old_tuple;
-		oldtup.t_data->t_infomask2 |= infomask2_old_tuple;
+		Assert(TransactionIdIsValid(xmax_lock_old_tuple));
+		HeapTupleHeaderSetXmax(oldtup.t_data, xmax_lock_old_tuple);
+		oldtup.t_data->t_infomask |= infomask_lock_old_tuple;
+		oldtup.t_data->t_infomask2 |= infomask2_lock_old_tuple;
 		HeapTupleHeaderSetCmax(oldtup.t_data, cid, iscombo);
-		/* temporarily make it look not-updated */
+
+		/* temporarily make it look not-updated, but locked */
 		oldtup.t_data->t_ctid = oldtup.t_self;
-		already_marked = true;
+
+		MarkBufferDirty(buffer);
+
+		if (RelationNeedsWAL(relation))
+		{
+			xl_heap_lock xlrec;
+			XLogRecPtr	recptr;
+
+			XLogBeginInsert();
+			XLogRegisterBuffer(0, buffer, REGBUF_STANDARD);
+
+			xlrec.offnum = ItemPointerGetOffsetNumber(&oldtup.t_self);
+			xlrec.locking_xid = xmax_lock_old_tuple;
+			xlrec.infobits_set = compute_infobits(oldtup.t_data->t_infomask,
+												  oldtup.t_data->t_infomask2);
+			XLogRegisterData((char *) &xlrec, SizeOfHeapLock);
+			recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_LOCK);
+			PageSetLSN(page, recptr);
+		}
+
+		END_CRIT_SECTION();
+
 		LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 
 		/*
@@ -3782,7 +3837,6 @@
 	else
 	{
 		/* No TOAST work needed, and it'll fit on same page */
-		already_marked = false;
 		newbuf = buffer;
 		heaptup = newtup;
 	}
@@ -3869,18 +3923,16 @@
 
 	RelationPutHeapTuple(relation, newbuf, heaptup, false);		/* insert new tuple */
 
-	if (!already_marked)
-	{
-		/* Clear obsolete visibility flags ... */
-		oldtup.t_data->t_infomask &= ~(HEAP_XMAX_BITS | HEAP_MOVED);
-		oldtup.t_data->t_infomask2 &= ~HEAP_KEYS_UPDATED;
-		/* ... and store info about transaction updating this tuple */
-		Assert(TransactionIdIsValid(xmax_old_tuple));
-		HeapTupleHeaderSetXmax(oldtup.t_data, xmax_old_tuple);
-		oldtup.t_data->t_infomask |= infomask_old_tuple;
-		oldtup.t_data->t_infomask2 |= infomask2_old_tuple;
-		HeapTupleHeaderSetCmax(oldtup.t_data, cid, iscombo);
-	}
+
+	/* Clear obsolete visibility flags, possibly set by ourselves above... */
+	oldtup.t_data->t_infomask &= ~(HEAP_XMAX_BITS | HEAP_MOVED);
+	oldtup.t_data->t_infomask2 &= ~HEAP_KEYS_UPDATED;
+	/* ... and store info about transaction updating this tuple */
+	Assert(TransactionIdIsValid(xmax_old_tuple));
+	HeapTupleHeaderSetXmax(oldtup.t_data, xmax_old_tuple);
+	oldtup.t_data->t_infomask |= infomask_old_tuple;
+	oldtup.t_data->t_infomask2 |= infomask2_old_tuple;
+	HeapTupleHeaderSetCmax(oldtup.t_data, cid, iscombo);
 
 	/* record address of new tuple in t_ctid of old one */
 	oldtup.t_data->t_ctid = heaptup->t_self;
@@ -3980,6 +4032,7 @@
 
 	bms_free(hot_attrs);
 	bms_free(key_attrs);
+	bms_free(id_attrs);
 
 	return HeapTupleMayBeUpdated;
 }
@@ -4316,7 +4369,7 @@
 		 */
 		return HeapTupleInvisible;
 	}
-	else if (result == HeapTupleBeingUpdated)
+	else if (result == HeapTupleBeingUpdated || result == HeapTupleUpdated)
 	{
 		TransactionId xwait;
 		uint16		infomask;
@@ -4576,12 +4629,22 @@
 		}
 
 		/*
+		 * Time to sleep on the other transaction/multixact, if necessary.
+		 *
+		 * If the other transaction is an update that's already committed,
+		 * then sleeping cannot possibly do any good: if we're required to
+		 * sleep, get out to raise an error instead.
+		 *
 		 * By here, we either have already acquired the buffer exclusive lock,
 		 * or we must wait for the locking transaction or multixact; so below
 		 * we ensure that we grab buffer lock after the sleep.
 		 */
-
-		if (require_sleep)
+		if (require_sleep && result == HeapTupleUpdated)
+		{
+			LockBuffer(*buffer, BUFFER_LOCK_EXCLUSIVE);
+			goto failed;
+		}
+		else if (require_sleep)
 		{
 			/*
 			 * Acquire tuple lock to establish our priority for the tuple, or
@@ -5002,8 +5065,7 @@
 		 * pg_upgrade; both MultiXactIdIsRunning and MultiXactIdExpand assume
 		 * that such multis are never passed.
 		 */
-		if (!(old_infomask & HEAP_LOCK_MASK) &&
-			HEAP_XMAX_IS_LOCKED_ONLY(old_infomask))
+		if (HEAP_LOCKED_UPGRADED(old_infomask))
 		{
 			old_infomask &= ~HEAP_XMAX_IS_MULTI;
 			old_infomask |= HEAP_XMAX_INVALID;
@@ -5199,8 +5261,10 @@
  * with the given xid, does the current transaction need to wait, fail, or can
  * it continue if it wanted to acquire a lock of the given mode?  "needwait"
  * is set to true if waiting is necessary; if it can continue, then
- * HeapTupleMayBeUpdated is returned.  In case of a conflict, a different
- * HeapTupleSatisfiesUpdate return code is returned.
+ * HeapTupleMayBeUpdated is returned.  If the lock is already held by the
+ * current transaction, return HeapTupleSelfUpdated.  In case of a conflict
+ * with another transaction, a different HeapTupleSatisfiesUpdate return code
+ * is returned.
  *
  * The held status is said to be hypothetical because it might correspond to a
  * lock held by a single Xid, i.e. not a real MultiXactId; we express it this
@@ -5223,8 +5287,9 @@
 	if (TransactionIdIsCurrentTransactionId(xid))
 	{
 		/*
-		 * Updated by our own transaction? Just return failure.  This
-		 * shouldn't normally happen.
+		 * The tuple has already been locked by our own transaction.  This is
+		 * very rare but can happen if multiple transactions are trying to
+		 * lock an ancient version of the same tuple.
 		 */
 		return HeapTupleSelfUpdated;
 	}
@@ -5341,6 +5406,17 @@
 			return HeapTupleMayBeUpdated;
 		}
 
+		/*
+		 * Also check Xmin: if this tuple was created by an aborted
+		 * (sub)transaction, then we already locked the last live one in the
+		 * chain, thus we're done, so return success.
+		 */
+		if (TransactionIdDidAbort(HeapTupleHeaderGetXmin(mytup.t_data)))
+		{
+			UnlockReleaseBuffer(buf);
+			return HeapTupleMayBeUpdated;
+		}
+
 		old_infomask = mytup.t_data->t_infomask;
 		old_infomask2 = mytup.t_data->t_infomask2;
 		xmax = HeapTupleHeaderGetRawXmax(mytup.t_data);
@@ -5363,6 +5439,17 @@
 				int			i;
 				MultiXactMember *members;
 
+				/*
+				 * We don't need a test for pg_upgrade'd tuples: this is only
+				 * applied to tuples after the first in an update chain.  Said
+				 * first tuple in the chain may well be locked-in-9.2-and-
+				 * pg_upgraded, but that one was already locked by our caller,
+				 * not us; and any subsequent ones cannot be because our
+				 * caller must necessarily have obtained a snapshot later than
+				 * the pg_upgrade itself.
+				 */
+				Assert(!HEAP_LOCKED_UPGRADED(mytup.t_data->t_infomask));
+
 				nmembers = GetMultiXactIdMembers(rawxmax, &members, false,
 									 HEAP_XMAX_IS_LOCKED_ONLY(old_infomask));
 				for (i = 0; i < nmembers; i++)
@@ -5373,6 +5460,22 @@
 													 members[i].xid,
 													 mode, &needwait);
 
+					/*
+					 * If the tuple was already locked by ourselves in a
+					 * previous iteration of this (say heap_lock_tuple was
+					 * forced to restart the locking loop because of a change
+					 * in xmax), then we hold the lock already on this tuple
+					 * version and we don't need to do anything; and this is
+					 * not an error condition either.  We just need to skip
+					 * this tuple and continue locking the next version in the
+					 * update chain.
+					 */
+					if (res == HeapTupleSelfUpdated)
+					{
+						pfree(members);
+						goto next;
+					}
+
 					if (needwait)
 					{
 						LockBuffer(buf, BUFFER_LOCK_UNLOCK);
@@ -5435,6 +5538,19 @@
 
 				res = test_lockmode_for_conflict(status, rawxmax, mode,
 												 &needwait);
+
+				/*
+				 * If the tuple was already locked by ourselves in a previous
+				 * iteration of this (say heap_lock_tuple was forced to
+				 * restart the locking loop because of a change in xmax), then
+				 * we hold the lock already on this tuple version and we don't
+				 * need to do anything; and this is not an error condition
+				 * either.  We just need to skip this tuple and continue
+				 * locking the next version in the update chain.
+				 */
+				if (res == HeapTupleSelfUpdated)
+					goto next;
+
 				if (needwait)
 				{
 					LockBuffer(buf, BUFFER_LOCK_UNLOCK);
@@ -5489,6 +5605,7 @@
 
 		END_CRIT_SECTION();
 
+next:
 		/* if we find the end of update chain, we're done. */
 		if (mytup.t_data->t_infomask & HEAP_XMAX_INVALID ||
 			ItemPointerEquals(&mytup.t_self, &mytup.t_data->t_ctid) ||
@@ -5652,7 +5769,8 @@
  * could deadlock with each other, which would not be acceptable.
  *
  * This is somewhat redundant with heap_delete, but we prefer to have a
- * dedicated routine with stripped down requirements.
+ * dedicated routine with stripped down requirements.  Note that this is also
+ * used to delete the TOAST tuples created during speculative insertion.
  *
  * This routine does not affect logical decoding as it only looks at
  * confirmation records.
@@ -5696,7 +5814,7 @@
 	 */
 	if (tp.t_data->t_choice.t_heap.t_xmin != xid)
 		elog(ERROR, "attempted to kill a tuple inserted by another transaction");
-	if (!HeapTupleHeaderIsSpeculative(tp.t_data))
+	if (!(IsToastRelation(relation) || HeapTupleHeaderIsSpeculative(tp.t_data)))
 		elog(ERROR, "attempted to kill a non-speculative tuple");
 	Assert(!HeapTupleHeaderIsHeapOnly(tp.t_data));
 
@@ -5766,7 +5884,10 @@
 	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 
 	if (HeapTupleHasExternal(&tp))
-		toast_delete(relation, &tp);
+	{
+		Assert(!IsToastRelation(relation));
+		toast_delete(relation, &tp, true);
+	}
 
 	/*
 	 * Never need to mark tuple for invalidation, since catalogs don't support
@@ -5921,14 +6042,14 @@
 	bool		has_lockers;
 	TransactionId update_xid;
 	bool		update_committed;
-	bool		allow_old;
 
 	*flags = 0;
 
 	/* We should only be called in Multis */
 	Assert(t_infomask & HEAP_XMAX_IS_MULTI);
 
-	if (!MultiXactIdIsValid(multi))
+	if (!MultiXactIdIsValid(multi) ||
+		HEAP_LOCKED_UPGRADED(t_infomask))
 	{
 		/* Ensure infomask bits are appropriately set/reset */
 		*flags |= FRM_INVALIDATE_XMAX;
@@ -5941,14 +6062,8 @@
 		 * was a locker only, it can be removed without any further
 		 * consideration; but if it contained an update, we might need to
 		 * preserve it.
-		 *
-		 * Don't assert MultiXactIdIsRunning if the multi came from a
-		 * pg_upgrade'd share-locked tuple, though, as doing that causes an
-		 * error to be raised unnecessarily.
-		 */
-		Assert((!(t_infomask & HEAP_LOCK_MASK) &&
-				HEAP_XMAX_IS_LOCKED_ONLY(t_infomask)) ||
-			   !MultiXactIdIsRunning(multi,
+		 */
+		Assert(!MultiXactIdIsRunning(multi,
 									 HEAP_XMAX_IS_LOCKED_ONLY(t_infomask)));
 		if (HEAP_XMAX_IS_LOCKED_ONLY(t_infomask))
 		{
@@ -5990,10 +6105,8 @@
 	 * anything.
 	 */
 
-	allow_old = !(t_infomask & HEAP_LOCK_MASK) &&
-		HEAP_XMAX_IS_LOCKED_ONLY(t_infomask);
 	nmembers =
-		GetMultiXactIdMembers(multi, &members, allow_old,
+		GetMultiXactIdMembers(multi, &members, false,
 							  HEAP_XMAX_IS_LOCKED_ONLY(t_infomask));
 	if (nmembers <= 0)
 	{
@@ -6233,7 +6346,7 @@
 			frz->t_infomask &= ~HEAP_XMAX_BITS;
 			frz->xmax = newxmax;
 			if (flags & FRM_MARK_COMMITTED)
-				frz->t_infomask &= HEAP_XMAX_COMMITTED;
+				frz->t_infomask |= HEAP_XMAX_COMMITTED;
 			changed = true;
 		}
 		else if (flags & FRM_RETURN_IS_MULTI)
@@ -6535,14 +6648,15 @@
 DoesMultiXactIdConflict(MultiXactId multi, uint16 infomask,
 						LockTupleMode lockmode)
 {
-	bool		allow_old;
 	int			nmembers;
 	MultiXactMember *members;
 	bool		result = false;
 	LOCKMODE	wanted = tupleLockExtraInfo[lockmode].hwlock;
 
-	allow_old = !(infomask & HEAP_LOCK_MASK) && HEAP_XMAX_IS_LOCKED_ONLY(infomask);
-	nmembers = GetMultiXactIdMembers(multi, &members, allow_old,
+	if (HEAP_LOCKED_UPGRADED(infomask))
+		return false;
+
+	nmembers = GetMultiXactIdMembers(multi, &members, false,
 									 HEAP_XMAX_IS_LOCKED_ONLY(infomask));
 	if (nmembers >= 0)
 	{
@@ -6625,15 +6739,15 @@
 				   Relation rel, ItemPointer ctid, XLTW_Oper oper,
 				   int *remaining)
 {
-	bool		allow_old;
 	bool		result = true;
 	MultiXactMember *members;
 	int			nmembers;
 	int			remain = 0;
 
-	allow_old = !(infomask & HEAP_LOCK_MASK) && HEAP_XMAX_IS_LOCKED_ONLY(infomask);
-	nmembers = GetMultiXactIdMembers(multi, &members, allow_old,
-									 HEAP_XMAX_IS_LOCKED_ONLY(infomask));
+	/* for pre-pg_upgrade tuples, no need to sleep at all */
+	nmembers = HEAP_LOCKED_UPGRADED(infomask) ? -1 :
+		GetMultiXactIdMembers(multi, &members, false,
+							  HEAP_XMAX_IS_LOCKED_ONLY(infomask));
 
 	if (nmembers >= 0)
 	{
@@ -6752,8 +6866,8 @@
 
 	/*
 	 * The considerations for multixacts are complicated; look at
-	 * heap_freeze_tuple for justifications.  This routine had better be in
-	 * sync with that one!
+	 * heap_prepare_freeze_tuple for justifications.  This routine had better
+	 * be in sync with that one!
 	 */
 	if (tuple->t_infomask & HEAP_XMAX_IS_MULTI)
 	{
@@ -6765,6 +6879,8 @@
 			/* no xmax set, ignore */
 			;
 		}
+		else if (HEAP_LOCKED_UPGRADED(tuple->t_infomask))
+			return true;
 		else if (MultiXactIdPrecedes(multi, cutoff_multi))
 			return true;
 		else
@@ -6772,13 +6888,10 @@
 			MultiXactMember *members;
 			int			nmembers;
 			int			i;
-			bool		allow_old;
 
 			/* need to check whether any member of the mxact is too old */
 
-			allow_old = !(tuple->t_infomask & HEAP_LOCK_MASK) &&
-				HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask);
-			nmembers = GetMultiXactIdMembers(multi, &members, allow_old,
+			nmembers = GetMultiXactIdMembers(multi, &members, false,
 								HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask));
 
 			for (i = 0; i < nmembers; i++)
@@ -7611,8 +7724,8 @@
 			PageInit(vmpage, BLCKSZ, 0);
 
 		/*
-		 * XLogReplayBufferExtended locked the buffer. But visibilitymap_set
-		 * will handle locking itself.
+		 * XLogReadBufferForRedoExtended locked the buffer. But
+		 * visibilitymap_set will handle locking itself.
 		 */
 		LockBuffer(vmbuffer, BUFFER_LOCK_UNLOCK);
 
@@ -8380,6 +8493,8 @@
 
 		htup = (HeapTupleHeader) PageGetItem(page, lp);
 
+		htup->t_infomask &= ~(HEAP_XMAX_BITS | HEAP_MOVED);
+		htup->t_infomask2 &= ~HEAP_KEYS_UPDATED;
 		fix_infomask_from_infobits(xlrec->infobits_set, &htup->t_infomask,
 								   &htup->t_infomask2);
 
@@ -8430,6 +8545,8 @@
 
 		htup = (HeapTupleHeader) PageGetItem(page, lp);
 
+		htup->t_infomask &= ~(HEAP_XMAX_BITS | HEAP_MOVED);
+		htup->t_infomask2 &= ~HEAP_KEYS_UPDATED;
 		fix_infomask_from_infobits(xlrec->infobits_set, &htup->t_infomask,
 								   &htup->t_infomask2);
 		HeapTupleHeaderSetXmax(htup, xlrec->xmax);
diff -Nru postgresql-9.5-9.5.2/src/backend/access/heap/rewriteheap.c postgresql-9.5-9.5.8/src/backend/access/heap/rewriteheap.c
--- postgresql-9.5-9.5.2/src/backend/access/heap/rewriteheap.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/heap/rewriteheap.c	2017-08-07 21:13:41.000000000 +0000
@@ -209,7 +209,7 @@
 } RewriteMappingFile;
 
 /*
- * A single In-Memeory logical rewrite mapping, hanging of
+ * A single In-Memory logical rewrite mapping, hanging off
  * RewriteMappingFile->mappings.
  */
 typedef struct RewriteMappingDataEntry
@@ -1196,7 +1196,7 @@
 	XLogRecPtr	redo;
 	DIR		   *mappings_dir;
 	struct dirent *mapping_de;
-	char		path[MAXPGPATH];
+	char		path[MAXPGPATH + 20];
 
 	/*
 	 * We start of with a minimum of the last redo pointer. No new decoding
@@ -1227,7 +1227,7 @@
 			strcmp(mapping_de->d_name, "..") == 0)
 			continue;
 
-		snprintf(path, MAXPGPATH, "pg_logical/mappings/%s", mapping_de->d_name);
+		snprintf(path, sizeof(path), "pg_logical/mappings/%s", mapping_de->d_name);
 		if (lstat(path, &statbuf) == 0 && !S_ISREG(statbuf.st_mode))
 			continue;
 
diff -Nru postgresql-9.5-9.5.2/src/backend/access/heap/tuptoaster.c postgresql-9.5-9.5.8/src/backend/access/heap/tuptoaster.c
--- postgresql-9.5-9.5.2/src/backend/access/heap/tuptoaster.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/heap/tuptoaster.c	2017-08-07 21:13:41.000000000 +0000
@@ -66,7 +66,7 @@
 #define TOAST_COMPRESS_SET_RAWSIZE(ptr, len) \
 	(((toast_compress_header *) (ptr))->rawsize = (len))
 
-static void toast_delete_datum(Relation rel, Datum value);
+static void toast_delete_datum(Relation rel, Datum value, bool is_speculative);
 static Datum toast_save_datum(Relation rel, Datum value,
 				 struct varlena * oldexternal, int options);
 static bool toastrel_valueid_exists(Relation toastrel, Oid valueid);
@@ -459,7 +459,7 @@
  * ----------
  */
 void
-toast_delete(Relation rel, HeapTuple oldtup)
+toast_delete(Relation rel, HeapTuple oldtup, bool is_speculative)
 {
 	TupleDesc	tupleDesc;
 	Form_pg_attribute *att;
@@ -506,7 +506,7 @@
 			if (toast_isnull[i])
 				continue;
 			else if (VARATT_IS_EXTERNAL_ONDISK(PointerGetDatum(value)))
-				toast_delete_datum(rel, value);
+				toast_delete_datum(rel, value, is_speculative);
 		}
 	}
 }
@@ -1062,7 +1062,7 @@
 	if (need_delold)
 		for (i = 0; i < numAttrs; i++)
 			if (toast_delold[i])
-				toast_delete_datum(rel, toast_oldvalues[i]);
+				toast_delete_datum(rel, toast_oldvalues[i], false);
 
 	return result_tuple;
 }
@@ -1654,7 +1654,7 @@
  * ----------
  */
 static void
-toast_delete_datum(Relation rel, Datum value)
+toast_delete_datum(Relation rel, Datum value, bool is_speculative)
 {
 	struct varlena *attr = (struct varlena *) DatumGetPointer(value);
 	struct varatt_external toast_pointer;
@@ -1703,7 +1703,10 @@
 		/*
 		 * Have a chunk, delete it
 		 */
-		simple_heap_delete(toastrel, &toasttup->t_self);
+		if (is_speculative)
+			heap_abort_speculative(toastrel, toasttup);
+		else
+			simple_heap_delete(toastrel, &toasttup->t_self);
 	}
 
 	/*
diff -Nru postgresql-9.5-9.5.2/src/backend/access/heap/visibilitymap.c postgresql-9.5-9.5.8/src/backend/access/heap/visibilitymap.c
--- postgresql-9.5-9.5.2/src/backend/access/heap/visibilitymap.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/heap/visibilitymap.c	2017-08-07 21:13:41.000000000 +0000
@@ -474,6 +474,9 @@
 
 		LockBuffer(mapBuffer, BUFFER_LOCK_EXCLUSIVE);
 
+		/* NO EREPORT(ERROR) from here till changes are logged */
+		START_CRIT_SECTION();
+
 		/* Clear out the unwanted bytes. */
 		MemSet(&map[truncByte + 1], 0, MAPSIZE - (truncByte + 1));
 
@@ -489,7 +492,20 @@
 		 */
 		map[truncByte] &= (1 << truncBit) - 1;
 
+		/*
+		 * Truncation of a relation is WAL-logged at a higher-level, and we
+		 * will be called at WAL replay. But if checksums are enabled, we need
+		 * to still write a WAL record to protect against a torn page, if the
+		 * page is flushed to disk before the truncation WAL record. We cannot
+		 * use MarkBufferDirtyHint here, because that will not dirty the page
+		 * during recovery.
+		 */
 		MarkBufferDirty(mapBuffer);
+		if (!InRecovery && RelationNeedsWAL(rel) && XLogHintBitIsNeeded())
+			log_newpage_buffer(mapBuffer, false);
+
+		END_CRIT_SECTION();
+
 		UnlockReleaseBuffer(mapBuffer);
 	}
 	else
diff -Nru postgresql-9.5-9.5.2/src/backend/access/nbtree/nbtinsert.c postgresql-9.5-9.5.8/src/backend/access/nbtree/nbtinsert.c
--- postgresql-9.5-9.5.2/src/backend/access/nbtree/nbtinsert.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/nbtree/nbtinsert.c	2017-08-07 21:13:41.000000000 +0000
@@ -392,6 +392,14 @@
 					}
 
 					/*
+					 * Check for a conflict-in as we would if we were going to
+					 * write to this page.  We aren't actually going to write,
+					 * but we want a chance to report SSI conflicts that would
+					 * otherwise be masked by this unique constraint violation.
+					 */
+					CheckForSerializableConflictIn(rel, NULL, buf);
+
+					/*
 					 * This is a definite conflict.  Break the tuple down into
 					 * datums and report the error.  But first, make sure we
 					 * release the buffer locks we're holding ---
diff -Nru postgresql-9.5-9.5.2/src/backend/access/nbtree/nbtpage.c postgresql-9.5-9.5.8/src/backend/access/nbtree/nbtpage.c
--- postgresql-9.5-9.5.2/src/backend/access/nbtree/nbtpage.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/nbtree/nbtpage.c	2017-08-07 21:13:41.000000000 +0000
@@ -1284,7 +1284,7 @@
 		{
 			if (!_bt_unlink_halfdead_page(rel, buf, &rightsib_empty))
 			{
-				_bt_relbuf(rel, buf);
+				/* _bt_unlink_halfdead_page already released buffer */
 				return ndeleted;
 			}
 			ndeleted++;
@@ -1501,6 +1501,11 @@
  * Returns 'false' if the page could not be unlinked (shouldn't happen).
  * If the (new) right sibling of the page is empty, *rightsib_empty is set
  * to true.
+ *
+ * Must hold pin and lock on leafbuf at entry (read or write doesn't matter).
+ * On success exit, we'll be holding pin and write lock.  On failure exit,
+ * we'll release both pin and lock before returning (we define it that way
+ * to avoid having to reacquire a lock we already released).
  */
 static bool
 _bt_unlink_halfdead_page(Relation rel, Buffer leafbuf, bool *rightsib_empty)
@@ -1543,11 +1548,13 @@
 	/*
 	 * If the leaf page still has a parent pointing to it (or a chain of
 	 * parents), we don't unlink the leaf page yet, but the topmost remaining
-	 * parent in the branch.
+	 * parent in the branch.  Set 'target' and 'buf' to reference the page
+	 * actually being unlinked.
 	 */
 	if (ItemPointerIsValid(leafhikey))
 	{
 		target = ItemPointerGetBlockNumber(leafhikey);
+		Assert(target != leafblkno);
 
 		/* fetch the block number of the topmost parent's left sibling */
 		buf = _bt_getbuf(rel, target, BT_READ);
@@ -1567,7 +1574,7 @@
 		target = leafblkno;
 
 		buf = leafbuf;
-		leftsib = opaque->btpo_prev;
+		leftsib = leafleftsib;
 		targetlevel = 0;
 	}
 
@@ -1598,8 +1605,20 @@
 			_bt_relbuf(rel, lbuf);
 			if (leftsib == P_NONE)
 			{
-				elog(LOG, "no left sibling (concurrent deletion?) in \"%s\"",
+				elog(LOG, "no left sibling (concurrent deletion?) of block %u in \"%s\"",
+					 target,
 					 RelationGetRelationName(rel));
+				if (target != leafblkno)
+				{
+					/* we have only a pin on target, but pin+lock on leafbuf */
+					ReleaseBuffer(buf);
+					_bt_relbuf(rel, leafbuf);
+				}
+				else
+				{
+					/* we have only a pin on leafbuf */
+					ReleaseBuffer(leafbuf);
+				}
 				return false;
 			}
 			lbuf = _bt_getbuf(rel, leftsib, BT_WRITE);
diff -Nru postgresql-9.5-9.5.2/src/backend/access/nbtree/nbtree.c postgresql-9.5-9.5.8/src/backend/access/nbtree/nbtree.c
--- postgresql-9.5-9.5.2/src/backend/access/nbtree/nbtree.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/nbtree/nbtree.c	2017-08-07 21:13:41.000000000 +0000
@@ -200,13 +200,18 @@
 	metapage = (Page) palloc(BLCKSZ);
 	_bt_initmetapage(metapage, P_NONE, 0);
 
-	/* Write the page.  If archiving/streaming, XLOG it. */
+	/*
+	 * Write the page and log it.  It might seem that an immediate sync
+	 * would be sufficient to guarantee that the file exists on disk, but
+	 * recovery itself might remove it while replaying, for example, an
+	 * XLOG_DBASE_CREATE or XLOG_TBLSPC_CREATE record.  Therefore, we
+	 * need this even when wal_level=minimal.
+	 */
 	PageSetChecksumInplace(metapage, BTREE_METAPAGE);
 	smgrwrite(index->rd_smgr, INIT_FORKNUM, BTREE_METAPAGE,
 			  (char *) metapage, true);
-	if (XLogIsNeeded())
-		log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
-					BTREE_METAPAGE, metapage, false);
+	log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
+				BTREE_METAPAGE, metapage, false);
 
 	/*
 	 * An immediate sync is required even if we xlog'd the page, because the
@@ -592,25 +597,6 @@
 		 */
 		so->currPos.itemIndex = so->markItemIndex;
 	}
-	else if (so->currPos.currPage == so->markPos.currPage)
-	{
-		/*
-		 * so->markItemIndex < 0 but mark and current positions are on the
-		 * same page.  This would be an unusual case, where the scan moved to
-		 * a new index page after the mark, restored, and later restored again
-		 * without moving off the marked page.  It is not clear that this code
-		 * can currently be reached, but it seems better to make this function
-		 * robust for this case than to Assert() or elog() that it can't
-		 * happen.
-		 *
-		 * We neither want to set so->markItemIndex >= 0 (because that could
-		 * cause a later move to a new page to redo the memcpy() executions)
-		 * nor re-execute the memcpy() functions for a restore within the same
-		 * page.  The previous restore to this page already set everything
-		 * except markPos as it should be.
-		 */
-		so->currPos.itemIndex = so->markPos.itemIndex;
-	}
 	else
 	{
 		/*
@@ -823,6 +809,10 @@
 	}
 
 	/*
+	 * Check to see if we need to issue one final WAL record for this index,
+	 * which may be needed for correctness on a hot standby node when non-MVCC
+	 * index scans could take place.
+	 *
 	 * If the WAL is replayed in hot standby, the replay process needs to get
 	 * cleanup locks on all index leaf pages, just as we've been doing here.
 	 * However, we won't issue any WAL records about pages that have no items
@@ -1032,10 +1022,13 @@
 		if (ndeletable > 0)
 		{
 			/*
-			 * Notice that the issued XLOG_BTREE_VACUUM WAL record includes an
-			 * instruction to the replay code to get cleanup lock on all pages
-			 * between the previous lastBlockVacuumed and this page.  This
-			 * ensures that WAL replay locks all leaf pages at some point.
+			 * Notice that the issued XLOG_BTREE_VACUUM WAL record includes
+			 * all information to the replay code to allow it to get a cleanup
+			 * lock on all pages between the previous lastBlockVacuumed and
+			 * this page. This ensures that WAL replay locks all leaf pages at
+			 * some point, which is important should non-MVCC scans be
+			 * requested. This is currently unused on standby, but we record
+			 * it anyway, so that the WAL contains the required information.
 			 *
 			 * Since we can visit leaf pages out-of-order when recursing,
 			 * replay might end up locking such pages an extra time, but it
diff -Nru postgresql-9.5-9.5.2/src/backend/access/nbtree/nbtsearch.c postgresql-9.5-9.5.8/src/backend/access/nbtree/nbtsearch.c
--- postgresql-9.5-9.5.2/src/backend/access/nbtree/nbtsearch.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/nbtree/nbtsearch.c	2017-08-07 21:13:41.000000000 +0000
@@ -1000,7 +1000,7 @@
 		so->currPos.moreRight = false;
 	}
 	so->numKilled = 0;			/* just paranoia */
-	so->markItemIndex = -1;		/* ditto */
+	Assert(so->markItemIndex == -1);
 
 	/* position to the precise item on the page */
 	offnum = _bt_binsrch(rel, buf, keysCount, scankeys, nextkey);
diff -Nru postgresql-9.5-9.5.2/src/backend/access/nbtree/nbtxlog.c postgresql-9.5-9.5.8/src/backend/access/nbtree/nbtxlog.c
--- postgresql-9.5-9.5.2/src/backend/access/nbtree/nbtxlog.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/nbtree/nbtxlog.c	2017-08-07 21:13:41.000000000 +0000
@@ -385,12 +385,29 @@
 btree_xlog_vacuum(XLogReaderState *record)
 {
 	XLogRecPtr	lsn = record->EndRecPtr;
-	xl_btree_vacuum *xlrec = (xl_btree_vacuum *) XLogRecGetData(record);
 	Buffer		buffer;
 	Page		page;
 	BTPageOpaque opaque;
+#ifdef UNUSED
+	xl_btree_vacuum *xlrec = (xl_btree_vacuum *) XLogRecGetData(record);
 
 	/*
+	 * This section of code is thought to be no longer needed, after analysis
+	 * of the calling paths. It is retained to allow the code to be reinstated
+	 * if a flaw is revealed in that thinking.
+	 *
+	 * If we are running non-MVCC scans using this index we need to do some
+	 * additional work to ensure correctness, which is known as a "pin scan"
+	 * described in more detail in next paragraphs. We used to do the extra
+	 * work in all cases, whereas we now avoid that work in most cases. If
+	 * lastBlockVacuumed is set to InvalidBlockNumber then we skip the
+	 * additional work required for the pin scan.
+	 *
+	 * Avoiding this extra work is important since it requires us to touch
+	 * every page in the index, so is an O(N) operation. Worse, it is an
+	 * operation performed in the foreground during redo, so it delays
+	 * replication directly.
+	 *
 	 * If queries might be active then we need to ensure every leaf page is
 	 * unpinned between the lastBlockVacuumed and the current block, if there
 	 * are any.  This prevents replay of the VACUUM from reaching the stage of
@@ -412,7 +429,7 @@
 	 * isn't yet consistent; so we need not fear reading still-corrupt blocks
 	 * here during crash recovery.
 	 */
-	if (HotStandbyActiveInReplay())
+	if (HotStandbyActiveInReplay() && BlockNumberIsValid(xlrec->lastBlockVacuumed))
 	{
 		RelFileNode thisrnode;
 		BlockNumber thisblkno;
@@ -433,7 +450,8 @@
 			 * XXX we don't actually need to read the block, we just need to
 			 * confirm it is unpinned. If we had a special call into the
 			 * buffer manager we could optimise this so that if the block is
-			 * not in shared_buffers we confirm it as unpinned.
+			 * not in shared_buffers we confirm it as unpinned. Optimizing
+			 * this is now moot, since in most cases we avoid the scan.
 			 */
 			buffer = XLogReadBufferExtended(thisrnode, MAIN_FORKNUM, blkno,
 											RBM_NORMAL_NO_LOG);
@@ -444,6 +462,7 @@
 			}
 		}
 	}
+#endif
 
 	/*
 	 * Like in btvacuumpage(), we need to take a cleanup lock on every leaf
diff -Nru postgresql-9.5-9.5.2/src/backend/access/nbtree/README postgresql-9.5-9.5.8/src/backend/access/nbtree/README
--- postgresql-9.5-9.5.2/src/backend/access/nbtree/README	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/nbtree/README	2017-08-07 21:13:41.000000000 +0000
@@ -520,6 +520,28 @@
 because it allows running applications to continue while the standby
 changes state into a normally running server.
 
+The interlocking required to avoid returning incorrect results from
+non-MVCC scans is not required on standby nodes. That is because
+HeapTupleSatisfiesUpdate(), HeapTupleSatisfiesSelf(),
+HeapTupleSatisfiesDirty() and HeapTupleSatisfiesVacuum() are only
+ever used during write transactions, which cannot exist on the standby.
+MVCC scans are already protected by definition, so HeapTupleSatisfiesMVCC()
+is not a problem.  That leaves concern only for HeapTupleSatisfiesToast().
+HeapTupleSatisfiesToast() doesn't use MVCC semantics, though that's
+because it doesn't need to - if the main heap row is visible then the
+toast rows will also be visible. So as long as we follow a toast
+pointer from a visible (live) tuple the corresponding toast rows
+will also be visible, so we do not need to recheck MVCC on them.
+There is one minor exception, which is that the optimizer sometimes
+looks at the boundaries of value ranges using SnapshotDirty, which
+could result in returning a newer value for query statistics; this
+would affect the query plan in rare cases, but not the correctness.
+The risk window is small since the stats look at the min and max values
+in the index, so the scan retrieves a tid then immediately uses it
+to look in the heap. It is unlikely that the tid could have been
+deleted, vacuumed and re-inserted in the time taken to look in the heap
+via direct tid access. So we ignore that scan type as a problem.
+
 Other Things That Are Handy to Know
 -----------------------------------
 
diff -Nru postgresql-9.5-9.5.2/src/backend/access/rmgrdesc/gindesc.c postgresql-9.5-9.5.8/src/backend/access/rmgrdesc/gindesc.c
--- postgresql-9.5-9.5.2/src/backend/access/rmgrdesc/gindesc.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/rmgrdesc/gindesc.c	2017-08-07 21:13:41.000000000 +0000
@@ -87,13 +87,13 @@
 		case XLOG_GIN_INSERT:
 			{
 				ginxlogInsert *xlrec = (ginxlogInsert *) rec;
-				char	   *payload = rec + sizeof(ginxlogInsert);
 
 				appendStringInfo(buf, "isdata: %c isleaf: %c",
 							  (xlrec->flags & GIN_INSERT_ISDATA) ? 'T' : 'F',
 							 (xlrec->flags & GIN_INSERT_ISLEAF) ? 'T' : 'F');
 				if (!(xlrec->flags & GIN_INSERT_ISLEAF))
 				{
+					char	   *payload = rec + sizeof(ginxlogInsert);
 					BlockNumber leftChildBlkno;
 					BlockNumber rightChildBlkno;
 
@@ -104,27 +104,27 @@
 					appendStringInfo(buf, " children: %u/%u",
 									 leftChildBlkno, rightChildBlkno);
 				}
-				if (!(xlrec->flags & GIN_INSERT_ISDATA))
-					appendStringInfo(buf, " isdelete: %c",
-					(((ginxlogInsertEntry *) payload)->isDelete) ? 'T' : 'F');
-				else if (xlrec->flags & GIN_INSERT_ISLEAF)
-				{
-					ginxlogRecompressDataLeaf *insertData =
-					(ginxlogRecompressDataLeaf *) payload;
-
-					if (XLogRecHasBlockImage(record, 0))
-						appendStringInfoString(buf, " (full page image)");
-					else
-						desc_recompress_leaf(buf, insertData);
-				}
+				if (XLogRecHasBlockImage(record, 0))
+					appendStringInfoString(buf, " (full page image)");
 				else
 				{
-					ginxlogInsertDataInternal *insertData = (ginxlogInsertDataInternal *) payload;
+					char	   *payload = XLogRecGetBlockData(record, 0, NULL);
 
-					appendStringInfo(buf, " pitem: %u-%u/%u",
-							 PostingItemGetBlockNumber(&insertData->newitem),
-						 ItemPointerGetBlockNumber(&insertData->newitem.key),
-					   ItemPointerGetOffsetNumber(&insertData->newitem.key));
+					if (!(xlrec->flags & GIN_INSERT_ISDATA))
+						appendStringInfo(buf, " isdelete: %c",
+						 (((ginxlogInsertEntry *) payload)->isDelete) ? 'T' : 'F');
+					else if (xlrec->flags & GIN_INSERT_ISLEAF)
+						desc_recompress_leaf(buf, (ginxlogRecompressDataLeaf *) payload);
+					else
+					{
+						ginxlogInsertDataInternal *insertData =
+							(ginxlogInsertDataInternal *) payload;
+
+						appendStringInfo(buf, " pitem: %u-%u/%u",
+										 PostingItemGetBlockNumber(&insertData->newitem),
+										 ItemPointerGetBlockNumber(&insertData->newitem.key),
+										 ItemPointerGetOffsetNumber(&insertData->newitem.key));
+					}
 				}
 			}
 			break;
@@ -144,12 +144,15 @@
 			break;
 		case XLOG_GIN_VACUUM_DATA_LEAF_PAGE:
 			{
-				ginxlogVacuumDataLeafPage *xlrec = (ginxlogVacuumDataLeafPage *) rec;
-
 				if (XLogRecHasBlockImage(record, 0))
 					appendStringInfoString(buf, " (full page image)");
 				else
+				{
+					ginxlogVacuumDataLeafPage *xlrec =
+						(ginxlogVacuumDataLeafPage *) XLogRecGetBlockData(record, 0, NULL);
+
 					desc_recompress_leaf(buf, &xlrec->data);
+				}
 			}
 			break;
 		case XLOG_GIN_DELETE_PAGE:
diff -Nru postgresql-9.5-9.5.2/src/backend/access/spgist/spginsert.c postgresql-9.5-9.5.8/src/backend/access/spgist/spginsert.c
--- postgresql-9.5-9.5.2/src/backend/access/spgist/spginsert.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/spgist/spginsert.c	2017-08-07 21:13:41.000000000 +0000
@@ -167,13 +167,18 @@
 	page = (Page) palloc(BLCKSZ);
 	SpGistInitMetapage(page);
 
-	/* Write the page.  If archiving/streaming, XLOG it. */
+	/*
+	 * Write the page and log it unconditionally.  This is important
+	 * particularly for indexes created on tablespaces and databases
+	 * whose creation happened after the last redo pointer as recovery
+	 * removes any of their existing content when the corresponding
+	 * create records are replayed.
+	 */
 	PageSetChecksumInplace(page, SPGIST_METAPAGE_BLKNO);
 	smgrwrite(index->rd_smgr, INIT_FORKNUM, SPGIST_METAPAGE_BLKNO,
 			  (char *) page, true);
-	if (XLogIsNeeded())
-		log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
-					SPGIST_METAPAGE_BLKNO, page, false);
+	log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
+				SPGIST_METAPAGE_BLKNO, page, false);
 
 	/* Likewise for the root page. */
 	SpGistInitPage(page, SPGIST_LEAF);
@@ -181,9 +186,8 @@
 	PageSetChecksumInplace(page, SPGIST_ROOT_BLKNO);
 	smgrwrite(index->rd_smgr, INIT_FORKNUM, SPGIST_ROOT_BLKNO,
 			  (char *) page, true);
-	if (XLogIsNeeded())
-		log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
-					SPGIST_ROOT_BLKNO, page, true);
+	log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
+				SPGIST_ROOT_BLKNO, page, true);
 
 	/* Likewise for the null-tuples root page. */
 	SpGistInitPage(page, SPGIST_LEAF | SPGIST_NULLS);
@@ -191,9 +195,8 @@
 	PageSetChecksumInplace(page, SPGIST_NULL_BLKNO);
 	smgrwrite(index->rd_smgr, INIT_FORKNUM, SPGIST_NULL_BLKNO,
 			  (char *) page, true);
-	if (XLogIsNeeded())
-		log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
-					SPGIST_NULL_BLKNO, page, true);
+	log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
+				SPGIST_NULL_BLKNO, page, true);
 
 	/*
 	 * An immediate sync is required even if we xlog'd the pages, because the
diff -Nru postgresql-9.5-9.5.2/src/backend/access/transam/commit_ts.c postgresql-9.5-9.5.8/src/backend/access/transam/commit_ts.c
--- postgresql-9.5-9.5.2/src/backend/access/transam/commit_ts.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/transam/commit_ts.c	2017-08-07 21:13:41.000000000 +0000
@@ -288,11 +288,18 @@
 	TransactionId oldestCommitTsXid;
 	TransactionId newestCommitTsXid;
 
-	/* error if the given Xid doesn't normally commit */
-	if (!TransactionIdIsNormal(xid))
+	if (!TransactionIdIsValid(xid))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 		errmsg("cannot retrieve commit timestamp for transaction %u", xid)));
+	else if (!TransactionIdIsNormal(xid))
+	{
+		/* frozen and bootstrap xids are always committed far in the past */
+		*ts = 0;
+		if (nodeid)
+			*nodeid = 0;
+		return false;
+	}
 
 	LWLockAcquire(CommitTsLock, LW_SHARED);
 
@@ -606,7 +613,7 @@
 
 /*
  * Activate this module whenever necessary.
- *		This must happen during postmaster or standalong-backend startup,
+ *		This must happen during postmaster or standalone-backend startup,
  *		or during WAL replay anytime the track_commit_timestamp setting is
  *		changed in the master.
  *
@@ -842,6 +849,8 @@
 	else
 	{
 		Assert(ShmemVariableCache->newestCommitTsXid == InvalidTransactionId);
+		ShmemVariableCache->oldestCommitTsXid = oldestXact;
+		ShmemVariableCache->newestCommitTsXid = newestXact;
 	}
 	LWLockRelease(CommitTsLock);
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/access/transam/multixact.c postgresql-9.5-9.5.8/src/backend/access/transam/multixact.c
--- postgresql-9.5-9.5.2/src/backend/access/transam/multixact.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/transam/multixact.c	2017-08-07 21:13:41.000000000 +0000
@@ -1181,19 +1181,25 @@
 
 /*
  * GetMultiXactIdMembers
- *		Returns the set of MultiXactMembers that make up a MultiXactId
+ *		Return the set of MultiXactMembers that make up a MultiXactId
  *
- * If the given MultiXactId is older than the value we know to be oldest, we
- * return -1.  The caller is expected to allow that only in permissible cases,
- * i.e. when the infomask lets it presuppose that the tuple had been
- * share-locked before a pg_upgrade; this means that the HEAP_XMAX_LOCK_ONLY
- * needs to be set, but HEAP_XMAX_KEYSHR_LOCK and HEAP_XMAX_EXCL_LOCK are not
- * set.
+ * Return value is the number of members found, or -1 if there are none,
+ * and *members is set to a newly palloc'ed array of members.  It's the
+ * caller's responsibility to free it when done with it.
  *
- * Other border conditions, such as trying to read a value that's larger than
- * the value currently known as the next to assign, raise an error.  Previously
- * these also returned -1, but since this can lead to the wrong visibility
- * results, it is dangerous to do that.
+ * from_pgupgrade must be passed as true if and only if only the multixact
+ * corresponds to a value from a tuple that was locked in a 9.2-or-older
+ * installation and later pg_upgrade'd (that is, the infomask is
+ * HEAP_LOCKED_UPGRADED).  In this case, we know for certain that no members
+ * can still be running, so we return -1 just like for an empty multixact
+ * without any further checking.  It would be wrong to try to resolve such a
+ * multixact: either the multixact is within the current valid multixact
+ * range, in which case the returned result would be bogus, or outside that
+ * range, in which case an error would be raised.
+ *
+ * In all other cases, the passed multixact must be within the known valid
+ * range, that is, greater to or equal than oldestMultiXactId, and less than
+ * nextMXact.  Otherwise, an error is raised.
  *
  * onlyLock must be set to true if caller is certain that the given multi
  * is used only to lock tuples; can be false without loss of correctness,
@@ -1202,7 +1208,7 @@
  */
 int
 GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members,
-					  bool allow_old, bool onlyLock)
+					  bool from_pgupgrade, bool onlyLock)
 {
 	int			pageno;
 	int			prev_pageno;
@@ -1221,7 +1227,7 @@
 
 	debug_elog3(DEBUG2, "GetMembers: asked for %u", multi);
 
-	if (!MultiXactIdIsValid(multi))
+	if (!MultiXactIdIsValid(multi) || from_pgupgrade)
 		return -1;
 
 	/* See if the MultiXactId is in the local cache */
@@ -1254,18 +1260,11 @@
 	 *
 	 * An ID older than MultiXactState->oldestMultiXactId cannot possibly be
 	 * useful; it has already been removed, or will be removed shortly, by
-	 * truncation.  Returning the wrong values could lead to an incorrect
-	 * visibility result.  However, to support pg_upgrade we need to allow an
-	 * empty set to be returned regardless, if the caller is willing to accept
-	 * it; the caller is expected to check that it's an allowed condition
-	 * (such as ensuring that the infomask bits set on the tuple are
-	 * consistent with the pg_upgrade scenario).  If the caller is expecting
-	 * this to be called only on recently created multis, then we raise an
-	 * error.
+	 * truncation.  If one is passed, an error is raised.
 	 *
-	 * Conversely, an ID >= nextMXact shouldn't ever be seen here; if it is
-	 * seen, it implies undetected ID wraparound has occurred.  This raises a
-	 * hard error.
+	 * Also, an ID >= nextMXact shouldn't ever be seen here; if it is seen, it
+	 * implies undetected ID wraparound has occurred.  This raises a hard
+	 * error.
 	 *
 	 * Shared lock is enough here since we aren't modifying any global state.
 	 * Acquire it just long enough to grab the current counter values.  We may
@@ -1281,7 +1280,7 @@
 
 	if (MultiXactIdPrecedes(multi, oldestMXact))
 	{
-		ereport(allow_old ? DEBUG1 : ERROR,
+		ereport(ERROR,
 				(errcode(ERRCODE_INTERNAL_ERROR),
 		 errmsg("MultiXactId %u does no longer exist -- apparent wraparound",
 				multi)));
diff -Nru postgresql-9.5-9.5.2/src/backend/access/transam/parallel.c postgresql-9.5-9.5.8/src/backend/access/transam/parallel.c
--- postgresql-9.5-9.5.2/src/backend/access/transam/parallel.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/transam/parallel.c	2017-08-07 21:13:41.000000000 +0000
@@ -14,9 +14,9 @@
 
 #include "postgres.h"
 
+#include "access/parallel.h"
 #include "access/xact.h"
 #include "access/xlog.h"
-#include "access/parallel.h"
 #include "commands/async.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
@@ -33,6 +33,7 @@
 #include "utils/resowner.h"
 #include "utils/snapmgr.h"
 
+
 /*
  * We don't want to waste a lot of memory on an error queue which, most of
  * the time, will process only a handful of small messages.  However, it is
@@ -90,7 +91,7 @@
 int			ParallelWorkerNumber = -1;
 
 /* Is there a parallel message pending which we need to receive? */
-bool		ParallelMessagePending = false;
+volatile bool ParallelMessagePending = false;
 
 /* Are we initializing a parallel worker? */
 bool		InitializingParallelWorker = false;
@@ -102,10 +103,10 @@
 static dlist_head pcxt_list = DLIST_STATIC_INIT(pcxt_list);
 
 /* Private functions. */
-static void HandleParallelMessage(ParallelContext *, int, StringInfo msg);
+static void HandleParallelMessage(ParallelContext *pcxt, int i, StringInfo msg);
 static void ParallelErrorContext(void *arg);
 static void ParallelExtensionTrampoline(dsm_segment *seg, shm_toc *toc);
-static void ParallelWorkerMain(Datum main_arg);
+
 
 /*
  * Establish a new parallel context.  This should be done after entering
@@ -178,8 +179,8 @@
 
 /*
  * Establish the dynamic shared memory segment for a parallel context and
- * copied state and other bookkeeping information that will need by parallel
- * workers into it.
+ * copy state and other bookkeeping information that will be needed by
+ * parallel workers into it.
  */
 void
 InitializeParallelDSM(ParallelContext *pcxt)
@@ -231,7 +232,8 @@
 						 PARALLEL_ERROR_QUEUE_SIZE,
 						 "parallel error queue size not buffer-aligned");
 		shm_toc_estimate_chunk(&pcxt->estimator,
-							   PARALLEL_ERROR_QUEUE_SIZE * pcxt->nworkers);
+							   mul_size(PARALLEL_ERROR_QUEUE_SIZE,
+										pcxt->nworkers));
 		shm_toc_estimate_keys(&pcxt->estimator, 1);
 
 		/* Estimate how much we'll need for extension entrypoint info. */
@@ -257,7 +259,7 @@
 	 * parallelism than to fail outright.
 	 */
 	segsize = shm_toc_estimate(&pcxt->estimator);
-	if (pcxt->nworkers != 0)
+	if (pcxt->nworkers > 0)
 		pcxt->seg = dsm_create(segsize, DSM_CREATE_NULL_IF_MAXSEGMENTS);
 	if (pcxt->seg != NULL)
 		pcxt->toc = shm_toc_create(PARALLEL_MAGIC,
@@ -337,7 +339,8 @@
 		 */
 		error_queue_space =
 			shm_toc_allocate(pcxt->toc,
-							 PARALLEL_ERROR_QUEUE_SIZE * pcxt->nworkers);
+							 mul_size(PARALLEL_ERROR_QUEUE_SIZE,
+									  pcxt->nworkers));
 		for (i = 0; i < pcxt->nworkers; ++i)
 		{
 			char	   *start;
@@ -397,7 +400,9 @@
 		BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	worker.bgw_start_time = BgWorkerStart_ConsistentState;
 	worker.bgw_restart_time = BGW_NEVER_RESTART;
-	worker.bgw_main = ParallelWorkerMain;
+	worker.bgw_main = NULL;
+	sprintf(worker.bgw_library_name, "postgres");
+	sprintf(worker.bgw_function_name, "ParallelWorkerMain");
 	worker.bgw_main_arg = UInt32GetDatum(dsm_segment_handle(pcxt->seg));
 	worker.bgw_notify_pid = MyProcPid;
 	memset(&worker.bgw_extra, 0, BGW_EXTRALEN);
@@ -603,17 +608,17 @@
 
 /*
  * Handle receipt of an interrupt indicating a parallel worker message.
+ *
+ * Note: this is called within a signal handler!  All we can do is set
+ * a flag that will cause the next CHECK_FOR_INTERRUPTS() to invoke
+ * HandleParallelMessages().
  */
 void
 HandleParallelMessageInterrupt(void)
 {
-	int			save_errno = errno;
-
 	InterruptPending = true;
 	ParallelMessagePending = true;
 	SetLatch(MyLatch);
-
-	errno = save_errno;
 }
 
 /*
@@ -623,15 +628,42 @@
 HandleParallelMessages(void)
 {
 	dlist_iter	iter;
+	MemoryContext oldcontext;
+
+	static MemoryContext hpm_context = NULL;
+
+	/*
+	 * This is invoked from ProcessInterrupts(), and since some of the
+	 * functions it calls contain CHECK_FOR_INTERRUPTS(), there is a potential
+	 * for recursive calls if more signals are received while this runs.  It's
+	 * unclear that recursive entry would be safe, and it doesn't seem useful
+	 * even if it is safe, so let's block interrupts until done.
+	 */
+	HOLD_INTERRUPTS();
 
+	/*
+	 * Moreover, CurrentMemoryContext might be pointing almost anywhere.  We
+	 * don't want to risk leaking data into long-lived contexts, so let's do
+	 * our work here in a private context that we can reset on each use.
+	 */
+	if (hpm_context == NULL)	/* first time through? */
+		hpm_context = AllocSetContextCreate(TopMemoryContext,
+											"HandleParallelMessages context",
+											ALLOCSET_DEFAULT_MINSIZE,
+											ALLOCSET_DEFAULT_INITSIZE,
+											ALLOCSET_DEFAULT_MAXSIZE);
+	else
+		MemoryContextReset(hpm_context);
+
+	oldcontext = MemoryContextSwitchTo(hpm_context);
+
+	/* OK to process messages.  Reset the flag saying there are more to do. */
 	ParallelMessagePending = false;
 
 	dlist_foreach(iter, &pcxt_list)
 	{
 		ParallelContext *pcxt;
 		int			i;
-		Size		nbytes;
-		void	   *data;
 
 		pcxt = dlist_container(ParallelContext, node, iter.cur);
 		if (pcxt->worker == NULL)
@@ -641,13 +673,15 @@
 		{
 			/*
 			 * Read as many messages as we can from each worker, but stop when
-			 * either (1) the error queue goes away, which can happen if we
-			 * receive a Terminate message from the worker; or (2) no more
-			 * messages can be read from the worker without blocking.
+			 * either (1) the worker's error queue goes away, which can happen
+			 * if we receive a Terminate message from the worker; or (2) no
+			 * more messages can be read from the worker without blocking.
 			 */
 			while (pcxt->worker[i].error_mqh != NULL)
 			{
 				shm_mq_result res;
+				Size		nbytes;
+				void	   *data;
 
 				res = shm_mq_receive(pcxt->worker[i].error_mqh, &nbytes,
 									 &data, true);
@@ -664,14 +698,18 @@
 				}
 				else
 					ereport(ERROR,
-							(errcode(ERRCODE_INTERNAL_ERROR),	/* XXX: wrong errcode? */
-							 errmsg("lost connection to parallel worker")));
-
-				/* This might make the error queue go away. */
-				CHECK_FOR_INTERRUPTS();
+						  (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+						   errmsg("lost connection to parallel worker")));
 			}
 		}
 	}
+
+	MemoryContextSwitchTo(oldcontext);
+
+	/* Might as well clear the context on our way out */
+	MemoryContextReset(hpm_context);
+
+	RESUME_INTERRUPTS();
 }
 
 /*
@@ -714,7 +752,7 @@
 				errctx.previous = pcxt->error_context_stack;
 				error_context_stack = &errctx;
 
-				/* Parse ErrorReponse or NoticeResponse. */
+				/* Parse ErrorResponse or NoticeResponse. */
 				pq_parse_errornotice(msg, &edata);
 
 				/* Death of a worker isn't enough justification for suicide. */
@@ -747,7 +785,7 @@
 
 		default:
 			{
-				elog(ERROR, "unknown message type: %c (%d bytes)",
+				elog(ERROR, "unrecognized message type received from parallel worker: %c (message length %d bytes)",
 					 msgtype, msg->len);
 			}
 	}
@@ -797,7 +835,7 @@
 /*
  * Main entrypoint for parallel workers.
  */
-static void
+void
 ParallelWorkerMain(Datum main_arg)
 {
 	dsm_segment *seg;
@@ -847,7 +885,7 @@
 	if (toc == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-			   errmsg("invalid magic number in dynamic shared memory segment")));
+		   errmsg("invalid magic number in dynamic shared memory segment")));
 
 	/* Look up fixed parallel state. */
 	fps = shm_toc_lookup(toc, PARALLEL_KEY_FIXED);
diff -Nru postgresql-9.5-9.5.2/src/backend/access/transam/README postgresql-9.5-9.5.8/src/backend/access/transam/README
--- postgresql-9.5-9.5.2/src/backend/access/transam/README	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/transam/README	2017-08-07 21:13:41.000000000 +0000
@@ -624,7 +624,7 @@
 MarkBufferDirtyHint() to mark the block dirty.
 
 If the buffer is clean and checksums are in use then
-MarkBufferDirtyHint() inserts an XLOG_HINT record to ensure that we
+MarkBufferDirtyHint() inserts an XLOG_FPI record to ensure that we
 take a full page image that includes the hint. We do this to avoid
 a partial page write, when we write the dirtied page. WAL is not
 written during recovery, so we simply skip dirtying blocks because
diff -Nru postgresql-9.5-9.5.2/src/backend/access/transam/twophase.c postgresql-9.5-9.5.8/src/backend/access/transam/twophase.c
--- postgresql-9.5-9.5.2/src/backend/access/transam/twophase.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/transam/twophase.c	2017-08-07 21:13:41.000000000 +0000
@@ -1934,7 +1934,7 @@
 				TransactionId subxid = subxids[i];
 
 				Assert(TransactionIdFollows(subxid, xid));
-				SubTransSetParent(xid, subxid, overwriteOK);
+				SubTransSetParent(subxid, xid, overwriteOK);
 			}
 		}
 	}
diff -Nru postgresql-9.5-9.5.2/src/backend/access/transam/xact.c postgresql-9.5-9.5.8/src/backend/access/transam/xact.c
--- postgresql-9.5-9.5.2/src/backend/access/transam/xact.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/transam/xact.c	2017-08-07 21:13:41.000000000 +0000
@@ -2728,7 +2728,7 @@
 			 * These shouldn't happen.  TBLOCK_DEFAULT means the previous
 			 * StartTransactionCommand didn't set the STARTED state
 			 * appropriately, while TBLOCK_PARALLEL_INPROGRESS should be ended
-			 * by EndParallelWorkerTranaction(), not this function.
+			 * by EndParallelWorkerTransaction(), not this function.
 			 */
 		case TBLOCK_DEFAULT:
 		case TBLOCK_PARALLEL_INPROGRESS:
diff -Nru postgresql-9.5-9.5.2/src/backend/access/transam/xlog.c postgresql-9.5-9.5.8/src/backend/access/transam/xlog.c
--- postgresql-9.5-9.5.2/src/backend/access/transam/xlog.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/transam/xlog.c	2017-08-07 21:13:41.000000000 +0000
@@ -457,6 +457,29 @@
 } WALInsertLockPadded;
 
 /*
+ * State of an exclusive backup, necessary to control concurrent activities
+ * across sessions when working on exclusive backups.
+ *
+ * EXCLUSIVE_BACKUP_NONE means that there is no exclusive backup actually
+ * running, to be more precise pg_start_backup() is not being executed for
+ * an exclusive backup and there is no exclusive backup in progress.
+ * EXCLUSIVE_BACKUP_STARTING means that pg_start_backup() is starting an
+ * exclusive backup.
+ * EXCLUSIVE_BACKUP_IN_PROGRESS means that pg_start_backup() has finished
+ * running and an exclusive backup is in progress. pg_stop_backup() is
+ * needed to finish it.
+ * EXCLUSIVE_BACKUP_STOPPING means that pg_stop_backup() is stopping an
+ * exclusive backup.
+ */
+typedef enum ExclusiveBackupState
+{
+	EXCLUSIVE_BACKUP_NONE = 0,
+	EXCLUSIVE_BACKUP_STARTING,
+	EXCLUSIVE_BACKUP_IN_PROGRESS,
+	EXCLUSIVE_BACKUP_STOPPING
+} ExclusiveBackupState;
+
+/*
  * Shared state data for WAL insertion.
  */
 typedef struct XLogCtlInsert
@@ -497,13 +520,15 @@
 	bool		fullPageWrites;
 
 	/*
-	 * exclusiveBackup is true if a backup started with pg_start_backup() is
-	 * in progress, and nonExclusiveBackups is a counter indicating the number
-	 * of streaming base backups currently in progress. forcePageWrites is set
-	 * to true when either of these is non-zero. lastBackupStart is the latest
-	 * checkpoint redo location used as a starting point for an online backup.
+	 * exclusiveBackupState indicates the state of an exclusive backup
+	 * (see comments of ExclusiveBackupState for more details).
+	 * nonExclusiveBackups is a counter indicating the number of streaming
+	 * base backups currently in progress. forcePageWrites is set to true
+	 * when either of these is non-zero. lastBackupStart is the latest
+	 * checkpoint redo location used as a starting point for an online
+	 * backup.
 	 */
-	bool		exclusiveBackup;
+	ExclusiveBackupState exclusiveBackupState;
 	int			nonExclusiveBackups;
 	XLogRecPtr	lastBackupStart;
 
@@ -610,11 +635,14 @@
 
 	/*
 	 * During recovery, we keep a copy of the latest checkpoint record here.
-	 * Used by the background writer when it wants to create a restartpoint.
+	 * lastCheckPointRecPtr points to start of checkpoint record and
+	 * lastCheckPointEndPtr points to end+1 of checkpoint record.  Used by the
+	 * background writer when it wants to create a restartpoint.
 	 *
 	 * Protected by info_lck.
 	 */
 	XLogRecPtr	lastCheckPointRecPtr;
+	XLogRecPtr	lastCheckPointEndPtr;
 	CheckPoint	lastCheckPoint;
 
 	/*
@@ -810,7 +838,7 @@
 					   bool find_free, XLogSegNo max_segno,
 					   bool use_lock);
 static int XLogFileRead(XLogSegNo segno, int emode, TimeLineID tli,
-			 int source, bool notexistOk);
+			 int source, bool notfoundOk);
 static int	XLogFileReadAnyTLI(XLogSegNo segno, int emode, int source);
 static int XLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
 			 int reqLen, XLogRecPtr targetRecPtr, char *readBuf,
@@ -842,6 +870,7 @@
 #endif
 static void xlog_outdesc(StringInfo buf, XLogReaderState *record);
 static void pg_start_backup_callback(int code, Datum arg);
+static void pg_stop_backup_callback(int code, Datum arg);
 static bool read_backup_label(XLogRecPtr *checkPointLoc,
 				  bool *backupEndRequired, bool *backupFromStandby);
 static bool read_tablespace_map(List **tablespaces);
@@ -3729,7 +3758,7 @@
 	/*
 	 * Initialize info about where to try to recycle to.
 	 */
-	XLByteToPrevSeg(endptr, endlogSegNo);
+	XLByteToSeg(endptr, endlogSegNo);
 	if (PriorRedoPtr == InvalidXLogRecPtr)
 		recycleSegNo = endlogSegNo + 10;
 	else
@@ -3859,7 +3888,7 @@
 {
 	DIR		   *xldir;
 	struct dirent *xlde;
-	char		path[MAXPGPATH];
+	char		path[MAXPGPATH + sizeof(XLOGDIR)];
 
 	xldir = AllocateDir(XLOGDIR);
 	if (xldir == NULL)
@@ -3877,7 +3906,7 @@
 				ereport(DEBUG2,
 				(errmsg("removing transaction log backup history file \"%s\"",
 						xlde->d_name)));
-				snprintf(path, MAXPGPATH, XLOGDIR "/%s", xlde->d_name);
+				snprintf(path, sizeof(path), XLOGDIR "/%s", xlde->d_name);
 				unlink(path);
 				XLogArchiveCleanup(xlde->d_name);
 			}
@@ -3890,7 +3919,7 @@
 /*
  * Attempt to read an XLOG record.
  *
- * If RecPtr is not NULL, try to read a record at that position.  Otherwise
+ * If RecPtr is valid, try to read a record at that position.  Otherwise
  * try to read a record just after the last one previously read.
  *
  * If no valid record is available, returns NULL, or fails if emode is PANIC.
@@ -4801,7 +4830,7 @@
 	record->xl_rmid = RM_XLOG_ID;
 	recptr += SizeOfXLogRecord;
 	/* fill the XLogRecordDataHeaderShort struct */
-	*(recptr++) = XLR_BLOCK_ID_DATA_SHORT;
+	*(recptr++) = (char) XLR_BLOCK_ID_DATA_SHORT;
 	*(recptr++) = sizeof(checkPoint);
 	memcpy(recptr, &checkPoint, sizeof(checkPoint));
 	recptr += sizeof(checkPoint);
@@ -4980,7 +5009,8 @@
 				rtli = (TimeLineID) strtoul(item->value, NULL, 0);
 				if (errno == EINVAL || errno == ERANGE)
 					ereport(FATAL,
-							(errmsg("recovery_target_timeline is not a valid number: \"%s\"",
+							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+							 errmsg("recovery_target_timeline is not a valid number: \"%s\"",
 									item->value)));
 			}
 			if (rtli)
@@ -4996,7 +5026,8 @@
 			recoveryTargetXid = (TransactionId) strtoul(item->value, NULL, 0);
 			if (errno == EINVAL || errno == ERANGE)
 				ereport(FATAL,
-				 (errmsg("recovery_target_xid is not a valid number: \"%s\"",
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				  errmsg("recovery_target_xid is not a valid number: \"%s\"",
 						 item->value)));
 			ereport(DEBUG2,
 					(errmsg_internal("recovery_target_xid = %u",
@@ -5111,7 +5142,8 @@
 		}
 		else
 			ereport(FATAL,
-					(errmsg("unrecognized recovery parameter \"%s\"",
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("unrecognized recovery parameter \"%s\"",
 							item->name)));
 	}
 
@@ -5130,7 +5162,8 @@
 	{
 		if (recoveryRestoreCommand == NULL)
 			ereport(FATAL,
-					(errmsg("recovery command file \"%s\" must specify restore_command when standby mode is not enabled",
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("recovery command file \"%s\" must specify restore_command when standby mode is not enabled",
 							RECOVERY_COMMAND_FILE)));
 	}
 
@@ -5144,6 +5177,15 @@
 		!EnableHotStandby)
 		recoveryTargetAction = RECOVERY_TARGET_ACTION_SHUTDOWN;
 
+	/*
+	 * We don't support standby_mode in standalone backends; that requires
+	 * other processes such as the WAL receiver to be alive.
+	 */
+	if (StandbyModeRequested && !IsUnderPostmaster)
+		ereport(FATAL,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			errmsg("standby mode is not supported by single-user servers")));
+
 	/* Enable fetching from archive recovery area */
 	ArchiveRecoveryRequested = true;
 
@@ -5160,7 +5202,8 @@
 			/* Timeline 1 does not have a history file, all else should */
 			if (rtli != 1 && !existsTimeLineHistory(rtli))
 				ereport(FATAL,
-						(errmsg("recovery target timeline %u does not exist",
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("recovery target timeline %u does not exist",
 								rtli)));
 			recoveryTargetTLI = rtli;
 			recoveryTargetIsLatest = false;
@@ -7906,6 +7949,17 @@
 	ereport(IsPostmasterEnvironment ? LOG : NOTICE,
 			(errmsg("shutting down")));
 
+	/*
+	 * Signal walsenders to move to stopping state.
+	 */
+	WalSndInitStopping();
+
+	/*
+	 * Wait for WAL senders to be in stopping state.  This prevents commands
+	 * from writing new WAL.
+	 */
+	WalSndWaitStopping();
+
 	if (RecoveryInProgress())
 		CreateRestartPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
 	else
@@ -8630,6 +8684,7 @@
 	 */
 	SpinLockAcquire(&XLogCtl->info_lck);
 	XLogCtl->lastCheckPointRecPtr = ReadRecPtr;
+	XLogCtl->lastCheckPointEndPtr = EndRecPtr;
 	XLogCtl->lastCheckPoint = *checkPoint;
 	SpinLockRelease(&XLogCtl->info_lck);
 }
@@ -8649,6 +8704,7 @@
 CreateRestartPoint(int flags)
 {
 	XLogRecPtr	lastCheckPointRecPtr;
+	XLogRecPtr	lastCheckPointEndPtr;
 	CheckPoint	lastCheckPoint;
 	XLogRecPtr	PriorRedoPtr;
 	TimestampTz xtime;
@@ -8662,6 +8718,7 @@
 	/* Get a local copy of the last safe checkpoint record. */
 	SpinLockAcquire(&XLogCtl->info_lck);
 	lastCheckPointRecPtr = XLogCtl->lastCheckPointRecPtr;
+	lastCheckPointEndPtr = XLogCtl->lastCheckPointEndPtr;
 	lastCheckPoint = XLogCtl->lastCheckPoint;
 	SpinLockRelease(&XLogCtl->info_lck);
 
@@ -8765,6 +8822,27 @@
 		ControlFile->checkPoint = lastCheckPointRecPtr;
 		ControlFile->checkPointCopy = lastCheckPoint;
 		ControlFile->time = (pg_time_t) time(NULL);
+
+		/*
+		 * Ensure minRecoveryPoint is past the checkpoint record.  Normally,
+		 * this will have happened already while writing out dirty buffers,
+		 * but not necessarily - e.g. because no buffers were dirtied.  We do
+		 * this because a non-exclusive base backup uses minRecoveryPoint to
+		 * determine which WAL files must be included in the backup, and the
+		 * file (or files) containing the checkpoint record must be included,
+		 * at a minimum. Note that for an ordinary restart of recovery there's
+		 * no value in having the minimum recovery point any earlier than this
+		 * anyway, because redo will begin just after the checkpoint record.
+		 */
+		if (ControlFile->minRecoveryPoint < lastCheckPointEndPtr)
+		{
+			ControlFile->minRecoveryPoint = lastCheckPointEndPtr;
+			ControlFile->minRecoveryPointTLI = lastCheckPoint.ThisTimeLineID;
+
+			/* update local copy */
+			minRecoveryPoint = ControlFile->minRecoveryPoint;
+			minRecoveryPointTLI = ControlFile->minRecoveryPointTLI;
+		}
 		if (flags & CHECKPOINT_IS_SHUTDOWN)
 			ControlFile->state = DB_SHUTDOWNED_IN_RECOVERY;
 		UpdateControlFile();
@@ -8898,7 +8976,7 @@
 	/* then check whether slots limit removal further */
 	if (max_replication_slots > 0 && keep != InvalidXLogRecPtr)
 	{
-		XLogRecPtr	slotSegNo;
+		XLogSegNo	slotSegNo;
 
 		XLByteToSeg(keep, slotSegNo);
 
@@ -9788,7 +9866,12 @@
 	WALInsertLockAcquireExclusive();
 	if (exclusive)
 	{
-		if (XLogCtl->Insert.exclusiveBackup)
+		/*
+		 * At first, mark that we're now starting an exclusive backup,
+		 * to ensure that there are no other sessions currently running
+		 * pg_start_backup() or pg_stop_backup().
+		 */
+		if (XLogCtl->Insert.exclusiveBackupState != EXCLUSIVE_BACKUP_NONE)
 		{
 			WALInsertLockRelease();
 			ereport(ERROR,
@@ -9796,7 +9879,7 @@
 					 errmsg("a backup is already in progress"),
 					 errhint("Run pg_stop_backup() and try again.")));
 		}
-		XLogCtl->Insert.exclusiveBackup = true;
+		XLogCtl->Insert.exclusiveBackupState = EXCLUSIVE_BACKUP_STARTING;
 	}
 	else
 		XLogCtl->Insert.nonExclusiveBackups++;
@@ -9939,7 +10022,7 @@
 		/* Collect information about all tablespaces */
 		while ((de = ReadDir(tblspcdir, "pg_tblspc")) != NULL)
 		{
-			char		fullpath[MAXPGPATH];
+			char		fullpath[MAXPGPATH + 10];
 			char		linkpath[MAXPGPATH];
 			char	   *relpath = NULL;
 			int			rllen;
@@ -10049,7 +10132,7 @@
 		{
 			/*
 			 * Check for existing backup label --- implies a backup is already
-			 * running.  (XXX given that we checked exclusiveBackup above,
+			 * running.  (XXX given that we checked exclusiveBackupState above,
 			 * maybe it would be OK to just unlink any such label file?)
 			 */
 			if (stat(BACKUP_LABEL_FILE, &stat_buf) != 0)
@@ -10133,6 +10216,16 @@
 	PG_END_ENSURE_ERROR_CLEANUP(pg_start_backup_callback, (Datum) BoolGetDatum(exclusive));
 
 	/*
+	 * Mark that start phase has correctly finished for an exclusive backup.
+	 */
+	if (exclusive)
+	{
+		WALInsertLockAcquireExclusive();
+		XLogCtl->Insert.exclusiveBackupState = EXCLUSIVE_BACKUP_IN_PROGRESS;
+		WALInsertLockRelease();
+	}
+
+	/*
 	 * We're done.  As a convenience, return the starting WAL location.
 	 */
 	if (starttli_p)
@@ -10150,8 +10243,8 @@
 	WALInsertLockAcquireExclusive();
 	if (exclusive)
 	{
-		Assert(XLogCtl->Insert.exclusiveBackup);
-		XLogCtl->Insert.exclusiveBackup = false;
+		Assert(XLogCtl->Insert.exclusiveBackupState == EXCLUSIVE_BACKUP_STARTING);
+		XLogCtl->Insert.exclusiveBackupState = EXCLUSIVE_BACKUP_NONE;
 	}
 	else
 	{
@@ -10159,7 +10252,7 @@
 		XLogCtl->Insert.nonExclusiveBackups--;
 	}
 
-	if (!XLogCtl->Insert.exclusiveBackup &&
+	if (XLogCtl->Insert.exclusiveBackupState == EXCLUSIVE_BACKUP_NONE &&
 		XLogCtl->Insert.nonExclusiveBackups == 0)
 	{
 		XLogCtl->Insert.forcePageWrites = false;
@@ -10168,6 +10261,24 @@
 }
 
 /*
+ * Error cleanup callback for pg_stop_backup
+ */
+static void
+pg_stop_backup_callback(int code, Datum arg)
+{
+	bool		exclusive = DatumGetBool(arg);
+
+	/* Update backup status on failure */
+	WALInsertLockAcquireExclusive();
+	if (exclusive)
+	{
+		Assert(XLogCtl->Insert.exclusiveBackupState == EXCLUSIVE_BACKUP_STOPPING);
+		XLogCtl->Insert.exclusiveBackupState = EXCLUSIVE_BACKUP_IN_PROGRESS;
+	}
+	WALInsertLockRelease();
+}
+
+/*
  * do_pg_stop_backup is the workhorse of the user-visible pg_stop_backup()
  * function.
 
@@ -10229,12 +10340,93 @@
 			  errmsg("WAL level not sufficient for making an online backup"),
 				 errhint("wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start.")));
 
+
+	if (exclusive)
+	{
+		/*
+		 * At first, mark that we're now stopping an exclusive backup,
+		 * to ensure that there are no other sessions currently running
+		 * pg_start_backup() or pg_stop_backup().
+		 */
+		WALInsertLockAcquireExclusive();
+		if (XLogCtl->Insert.exclusiveBackupState != EXCLUSIVE_BACKUP_IN_PROGRESS)
+		{
+			WALInsertLockRelease();
+			ereport(ERROR,
+					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+					 errmsg("exclusive backup not in progress")));
+		}
+		XLogCtl->Insert.exclusiveBackupState = EXCLUSIVE_BACKUP_STOPPING;
+		WALInsertLockRelease();
+
+		/*
+		 * Remove backup_label. In case of failure, the state for an exclusive
+		 * backup is switched back to in-progress.
+		 */
+		PG_ENSURE_ERROR_CLEANUP(pg_stop_backup_callback, (Datum) BoolGetDatum(exclusive));
+		{
+			/*
+			 * Read the existing label file into memory.
+			 */
+			struct stat statbuf;
+			int			r;
+
+			if (stat(BACKUP_LABEL_FILE, &statbuf))
+			{
+				/* should not happen per the upper checks */
+				if (errno != ENOENT)
+					ereport(ERROR,
+							(errcode_for_file_access(),
+							 errmsg("could not stat file \"%s\": %m",
+									BACKUP_LABEL_FILE)));
+				ereport(ERROR,
+						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+						 errmsg("a backup is not in progress")));
+			}
+
+			lfp = AllocateFile(BACKUP_LABEL_FILE, "r");
+			if (!lfp)
+			{
+				ereport(ERROR,
+						(errcode_for_file_access(),
+						 errmsg("could not read file \"%s\": %m",
+								BACKUP_LABEL_FILE)));
+			}
+			labelfile = palloc(statbuf.st_size + 1);
+			r = fread(labelfile, statbuf.st_size, 1, lfp);
+			labelfile[statbuf.st_size] = '\0';
+
+			/*
+			 * Close and remove the backup label file
+			 */
+			if (r != 1 || ferror(lfp) || FreeFile(lfp))
+				ereport(ERROR,
+						(errcode_for_file_access(),
+						 errmsg("could not read file \"%s\": %m",
+								BACKUP_LABEL_FILE)));
+			if (unlink(BACKUP_LABEL_FILE) != 0)
+				ereport(ERROR,
+						(errcode_for_file_access(),
+						 errmsg("could not remove file \"%s\": %m",
+								BACKUP_LABEL_FILE)));
+
+			/*
+			 * Remove tablespace_map file if present, it is created only if there
+			 * are tablespaces.
+			 */
+			unlink(TABLESPACE_MAP);
+		}
+		PG_END_ENSURE_ERROR_CLEANUP(pg_stop_backup_callback, (Datum) BoolGetDatum(exclusive));
+	}
+
 	/*
 	 * OK to update backup counters and forcePageWrites
 	 */
 	WALInsertLockAcquireExclusive();
 	if (exclusive)
-		XLogCtl->Insert.exclusiveBackup = false;
+	{
+		XLogCtl->Insert.exclusiveBackupState = EXCLUSIVE_BACKUP_NONE;
+	}
 	else
 	{
 		/*
@@ -10247,66 +10439,13 @@
 		XLogCtl->Insert.nonExclusiveBackups--;
 	}
 
-	if (!XLogCtl->Insert.exclusiveBackup &&
+	if (XLogCtl->Insert.exclusiveBackupState == EXCLUSIVE_BACKUP_NONE &&
 		XLogCtl->Insert.nonExclusiveBackups == 0)
 	{
 		XLogCtl->Insert.forcePageWrites = false;
 	}
 	WALInsertLockRelease();
 
-	if (exclusive)
-	{
-		/*
-		 * Read the existing label file into memory.
-		 */
-		struct stat statbuf;
-		int			r;
-
-		if (stat(BACKUP_LABEL_FILE, &statbuf))
-		{
-			if (errno != ENOENT)
-				ereport(ERROR,
-						(errcode_for_file_access(),
-						 errmsg("could not stat file \"%s\": %m",
-								BACKUP_LABEL_FILE)));
-			ereport(ERROR,
-					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-					 errmsg("a backup is not in progress")));
-		}
-
-		lfp = AllocateFile(BACKUP_LABEL_FILE, "r");
-		if (!lfp)
-		{
-			ereport(ERROR,
-					(errcode_for_file_access(),
-					 errmsg("could not read file \"%s\": %m",
-							BACKUP_LABEL_FILE)));
-		}
-		labelfile = palloc(statbuf.st_size + 1);
-		r = fread(labelfile, statbuf.st_size, 1, lfp);
-		labelfile[statbuf.st_size] = '\0';
-
-		/*
-		 * Close and remove the backup label file
-		 */
-		if (r != 1 || ferror(lfp) || FreeFile(lfp))
-			ereport(ERROR,
-					(errcode_for_file_access(),
-					 errmsg("could not read file \"%s\": %m",
-							BACKUP_LABEL_FILE)));
-		if (unlink(BACKUP_LABEL_FILE) != 0)
-			ereport(ERROR,
-					(errcode_for_file_access(),
-					 errmsg("could not remove file \"%s\": %m",
-							BACKUP_LABEL_FILE)));
-
-		/*
-		 * Remove tablespace_map file if present, it is created only if there
-		 * are tablespaces.
-		 */
-		unlink(TABLESPACE_MAP);
-	}
-
 	/*
 	 * Read and parse the START WAL LOCATION line (this code is pretty crude,
 	 * but we are not expecting any variability in the file format).
@@ -10543,7 +10682,7 @@
 	Assert(XLogCtl->Insert.nonExclusiveBackups > 0);
 	XLogCtl->Insert.nonExclusiveBackups--;
 
-	if (!XLogCtl->Insert.exclusiveBackup &&
+	if (XLogCtl->Insert.exclusiveBackupState == EXCLUSIVE_BACKUP_NONE &&
 		XLogCtl->Insert.nonExclusiveBackups == 0)
 	{
 		XLogCtl->Insert.forcePageWrites = false;
diff -Nru postgresql-9.5-9.5.2/src/backend/access/transam/xloginsert.c postgresql-9.5-9.5.8/src/backend/access/transam/xloginsert.c
--- postgresql-9.5-9.5.2/src/backend/access/transam/xloginsert.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/transam/xloginsert.c	2017-08-07 21:13:41.000000000 +0000
@@ -703,7 +703,7 @@
 	/* followed by the record's origin, if any */
 	if (include_origin && replorigin_session_origin != InvalidRepOriginId)
 	{
-		*(scratch++) = XLR_BLOCK_ID_ORIGIN;
+		*(scratch++) = (char) XLR_BLOCK_ID_ORIGIN;
 		memcpy(scratch, &replorigin_session_origin, sizeof(replorigin_session_origin));
 		scratch += sizeof(replorigin_session_origin);
 	}
@@ -713,13 +713,13 @@
 	{
 		if (mainrdata_len > 255)
 		{
-			*(scratch++) = XLR_BLOCK_ID_DATA_LONG;
+			*(scratch++) = (char) XLR_BLOCK_ID_DATA_LONG;
 			memcpy(scratch, &mainrdata_len, sizeof(uint32));
 			scratch += sizeof(uint32);
 		}
 		else
 		{
-			*(scratch++) = XLR_BLOCK_ID_DATA_SHORT;
+			*(scratch++) = (char) XLR_BLOCK_ID_DATA_SHORT;
 			*(scratch++) = (uint8) mainrdata_len;
 		}
 		rdt_datas_last->next = mainrdata_head;
diff -Nru postgresql-9.5-9.5.2/src/backend/access/transam/xlogreader.c postgresql-9.5-9.5.8/src/backend/access/transam/xlogreader.c
--- postgresql-9.5-9.5.2/src/backend/access/transam/xlogreader.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/transam/xlogreader.c	2017-08-07 21:13:41.000000000 +0000
@@ -844,46 +844,83 @@
 XLogFindNextRecord(XLogReaderState *state, XLogRecPtr RecPtr)
 {
 	XLogReaderState saved_state = *state;
-	XLogRecPtr	targetPagePtr;
 	XLogRecPtr	tmpRecPtr;
-	int			targetRecOff;
 	XLogRecPtr	found = InvalidXLogRecPtr;
-	uint32		pageHeaderSize;
 	XLogPageHeader header;
-	int			readLen;
 	char	   *errormsg;
 
 	Assert(!XLogRecPtrIsInvalid(RecPtr));
 
-	targetRecOff = RecPtr % XLOG_BLCKSZ;
-
-	/* scroll back to page boundary */
-	targetPagePtr = RecPtr - targetRecOff;
-
-	/* Read the page containing the record */
-	readLen = ReadPageInternal(state, targetPagePtr, targetRecOff);
-	if (readLen < 0)
-		goto err;
-
-	header = (XLogPageHeader) state->readBuf;
-
-	pageHeaderSize = XLogPageHeaderSize(header);
-
-	/* make sure we have enough data for the page header */
-	readLen = ReadPageInternal(state, targetPagePtr, pageHeaderSize);
-	if (readLen < 0)
-		goto err;
-
-	/* skip over potential continuation data */
-	if (header->xlp_info & XLP_FIRST_IS_CONTRECORD)
-	{
-		/* record headers are MAXALIGN'ed */
-		tmpRecPtr = targetPagePtr + pageHeaderSize
-			+ MAXALIGN(header->xlp_rem_len);
-	}
-	else
+	/*
+	 * skip over potential continuation data, keeping in mind that it may span
+	 * multiple pages
+	 */
+	tmpRecPtr = RecPtr;
+	while (true)
 	{
-		tmpRecPtr = targetPagePtr + pageHeaderSize;
+		XLogRecPtr	targetPagePtr;
+		int			targetRecOff;
+		uint32		pageHeaderSize;
+		int			readLen;
+
+		/*
+		 * Compute targetRecOff. It should typically be equal or greater than
+		 * short page-header since a valid record can't start anywhere before
+		 * that, except when caller has explicitly specified the offset that
+		 * falls somewhere there or when we are skipping multi-page
+		 * continuation record. It doesn't matter though because
+		 * ReadPageInternal() is prepared to handle that and will read at least
+		 * short page-header worth of data
+		 */
+		targetRecOff = tmpRecPtr % XLOG_BLCKSZ;
+
+		/* scroll back to page boundary */
+		targetPagePtr = tmpRecPtr - targetRecOff;
+
+		/* Read the page containing the record */
+		readLen = ReadPageInternal(state, targetPagePtr, targetRecOff);
+		if (readLen < 0)
+			goto err;
+
+		header = (XLogPageHeader) state->readBuf;
+
+		pageHeaderSize = XLogPageHeaderSize(header);
+
+		/* make sure we have enough data for the page header */
+		readLen = ReadPageInternal(state, targetPagePtr, pageHeaderSize);
+		if (readLen < 0)
+			goto err;
+
+		/* skip over potential continuation data */
+		if (header->xlp_info & XLP_FIRST_IS_CONTRECORD)
+		{
+			/*
+			 * If the length of the remaining continuation data is more than
+			 * what can fit in this page, the continuation record crosses over
+			 * this page. Read the next page and try again. xlp_rem_len in the
+			 * next page header will contain the remaining length of the
+			 * continuation data
+			 *
+			 * Note that record headers are MAXALIGN'ed
+			 */
+			if (MAXALIGN(header->xlp_rem_len) > (XLOG_BLCKSZ - pageHeaderSize))
+				tmpRecPtr = targetPagePtr + XLOG_BLCKSZ;
+			else
+			{
+				/*
+				 * The previous continuation record ends in this page. Set
+				 * tmpRecPtr to point to the first valid record
+				 */
+				tmpRecPtr = targetPagePtr + pageHeaderSize
+					+ MAXALIGN(header->xlp_rem_len);
+				break;
+			}
+		}
+		else
+		{
+			tmpRecPtr = targetPagePtr + pageHeaderSize;
+			break;
+		}
 	}
 
 	/*
diff -Nru postgresql-9.5-9.5.2/src/backend/access/transam/xlogutils.c postgresql-9.5-9.5.8/src/backend/access/transam/xlogutils.c
--- postgresql-9.5-9.5.2/src/backend/access/transam/xlogutils.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/access/transam/xlogutils.c	2017-08-07 21:13:41.000000000 +0000
@@ -422,9 +422,10 @@
  * to imply that the page should be dropped or truncated later.
  *
  * NB: A redo function should normally not call this directly. To get a page
- * to modify, use XLogReplayBuffer instead. It is important that all pages
- * modified by a WAL record are registered in the WAL records, or they will be
- * invisible to tools that that need to know which pages are modified.
+ * to modify, use XLogReadBufferForRedoExtended instead. It is important that
+ * all pages modified by a WAL record are registered in the WAL records, or
+ * they will be invisible to tools that that need to know which pages are
+ * modified.
  */
 Buffer
 XLogReadBufferExtended(RelFileNode rnode, ForkNumber forknum,
diff -Nru postgresql-9.5-9.5.2/src/backend/bootstrap/bootscanner.c postgresql-9.5-9.5.8/src/backend/bootstrap/bootscanner.c
--- postgresql-9.5-9.5.2/src/backend/bootstrap/bootscanner.c	2016-03-28 20:22:59.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/bootstrap/bootscanner.c	2017-08-07 21:34:38.000000000 +0000
@@ -896,7 +896,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( boot_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -909,7 +909,7 @@
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, boot_yyin))==0 && ferror(boot_yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, boot_yyin)) == 0 && ferror(boot_yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1450,7 +1450,7 @@
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/aclchk.c postgresql-9.5-9.5.8/src/backend/catalog/aclchk.c
--- postgresql-9.5-9.5.2/src/backend/catalog/aclchk.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/aclchk.c	2017-08-07 21:13:41.000000000 +0000
@@ -4068,7 +4068,8 @@
 	tuple = SearchSysCache1(FOREIGNDATAWRAPPEROID, ObjectIdGetDatum(fdw_oid));
 	if (!HeapTupleIsValid(tuple))
 		ereport(ERROR,
-				(errmsg("foreign-data wrapper with OID %u does not exist",
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("foreign-data wrapper with OID %u does not exist",
 						fdw_oid)));
 	fdwForm = (Form_pg_foreign_data_wrapper) GETSTRUCT(tuple);
 
@@ -4129,7 +4130,8 @@
 	tuple = SearchSysCache1(FOREIGNSERVEROID, ObjectIdGetDatum(srv_oid));
 	if (!HeapTupleIsValid(tuple))
 		ereport(ERROR,
-				(errmsg("foreign server with OID %u does not exist",
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("foreign server with OID %u does not exist",
 						srv_oid)));
 	srvForm = (Form_pg_foreign_server) GETSTRUCT(tuple);
 
@@ -4188,27 +4190,30 @@
 	tuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(type_oid));
 	if (!HeapTupleIsValid(tuple))
 		ereport(ERROR,
-				(errmsg("type with OID %u does not exist",
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("type with OID %u does not exist",
 						type_oid)));
 	typeForm = (Form_pg_type) GETSTRUCT(tuple);
 
-	/* "True" array types don't manage permissions of their own */
-	if (typeForm->typelem != 0 && typeForm->typlen == -1)
+	/*
+	 * "True" array types don't manage permissions of their own; consult the
+	 * element type instead.
+	 */
+	if (OidIsValid(typeForm->typelem) && typeForm->typlen == -1)
 	{
 		Oid			elttype_oid = typeForm->typelem;
 
 		ReleaseSysCache(tuple);
 
 		tuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(elttype_oid));
+		/* this case is not a user-facing error, so elog not ereport */
 		if (!HeapTupleIsValid(tuple))
-			ereport(ERROR,
-					(errmsg("type with OID %u does not exist",
-							type_oid)));
+			elog(ERROR, "cache lookup failed for type %u", elttype_oid);
 		typeForm = (Form_pg_type) GETSTRUCT(tuple);
 	}
 
 	/*
-	 * Normal case: get the type's ACL from pg_type
+	 * Now get the type's owner and ACL from the tuple
 	 */
 	ownerId = typeForm->typowner;
 
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/catalog.c postgresql-9.5-9.5.8/src/backend/catalog/catalog.c
--- postgresql-9.5-9.5.2/src/backend/catalog/catalog.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/catalog.c	2017-08-07 21:13:41.000000000 +0000
@@ -37,6 +37,7 @@
 #include "catalog/pg_shdescription.h"
 #include "catalog/pg_shseclabel.h"
 #include "catalog/pg_tablespace.h"
+#include "catalog/pg_type.h"
 #include "catalog/toasting.h"
 #include "miscadmin.h"
 #include "storage/fd.h"
@@ -335,6 +336,14 @@
 	ScanKeyData key;
 	bool		collides;
 
+	/*
+	 * We should never be asked to generate a new pg_type OID during
+	 * pg_upgrade; doing so would risk collisions with the OIDs it wants to
+	 * assign.  Hitting this assert means there's some path where we failed to
+	 * ensure that a type OID is determined by commands in the dump script.
+	 */
+	Assert(!IsBinaryUpgrade || RelationGetRelid(relation) != TypeRelationId);
+
 	InitDirtySnapshot(SnapshotDirty);
 
 	/* Generate new OIDs until we find one not in the table */
@@ -386,6 +395,13 @@
 	bool		collides;
 	BackendId	backend;
 
+	/*
+	 * If we ever get here during pg_upgrade, there's something wrong; all
+	 * relfilenode assignments during a binary-upgrade run should be
+	 * determined by commands in the dump script.
+	 */
+	Assert(!IsBinaryUpgrade);
+
 	switch (relpersistence)
 	{
 		case RELPERSISTENCE_TEMP:
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/dependency.c postgresql-9.5-9.5.8/src/backend/catalog/dependency.c
--- postgresql-9.5-9.5.2/src/backend/catalog/dependency.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/dependency.c	2017-08-07 21:13:41.000000000 +0000
@@ -588,29 +588,43 @@
 			case DEPENDENCY_AUTO:
 				/* no problem */
 				break;
-			case DEPENDENCY_INTERNAL:
+
 			case DEPENDENCY_EXTENSION:
 
 				/*
+				 * If the other object is the extension currently being
+				 * created/altered, ignore this dependency and continue with
+				 * the deletion.  This allows dropping of an extension's
+				 * objects within the extension's scripts, as well as corner
+				 * cases such as dropping a transient object created within
+				 * such a script.
+				 */
+				if (creating_extension &&
+					otherObject.classId == ExtensionRelationId &&
+					otherObject.objectId == CurrentExtensionObject)
+					break;
+
+				/* Otherwise, treat this like an internal dependency */
+				/* FALL THRU */
+
+			case DEPENDENCY_INTERNAL:
+
+				/*
 				 * This object is part of the internal implementation of
 				 * another object, or is part of the extension that is the
 				 * other object.  We have three cases:
 				 *
-				 * 1. At the outermost recursion level, we normally disallow
-				 * the DROP.  (We just ereport here, rather than proceeding,
-				 * since no other dependencies are likely to be interesting.)
-				 * However, there are exceptions.
+				 * 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 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.
 				 */
 				if (stack == NULL)
 				{
 					char	   *otherObjDesc;
 
-					/*
-					 * Exception 1a: if 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.
-					 */
 					if (pendingObjects &&
 						object_address_present(&otherObject, pendingObjects))
 					{
@@ -619,21 +633,6 @@
 						ReleaseDeletionLock(object);
 						return;
 					}
-
-					/*
-					 * Exception 1b: if the owning object is the extension
-					 * currently being created/altered, it's okay to continue
-					 * with the deletion.  This allows dropping of an
-					 * extension's objects within the extension's scripts, as
-					 * well as corner cases such as dropping a transient
-					 * object created within such a script.
-					 */
-					if (creating_extension &&
-						otherObject.classId == ExtensionRelationId &&
-						otherObject.objectId == CurrentExtensionObject)
-						break;
-
-					/* No exception applies, so throw the error */
 					otherObjDesc = getObjectDescription(&otherObject);
 					ereport(ERROR,
 							(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
@@ -1777,6 +1776,15 @@
 		add_object_address(OCLASS_TYPE, cd->resulttype, 0,
 						   context->addrs);
 	}
+	else if (IsA(node, OnConflictExpr))
+	{
+		OnConflictExpr *onconflict = (OnConflictExpr *) node;
+
+		if (OidIsValid(onconflict->constraint))
+			add_object_address(OCLASS_CONSTRAINT, onconflict->constraint, 0,
+							   context->addrs);
+		/* fall through to examine arguments */
+	}
 	else if (IsA(node, SortGroupClause))
 	{
 		SortGroupClause *sgc = (SortGroupClause *) node;
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/heap.c postgresql-9.5-9.5.8/src/backend/catalog/heap.c
--- postgresql-9.5-9.5.2/src/backend/catalog/heap.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/heap.c	2017-08-07 21:13:41.000000000 +0000
@@ -104,6 +104,7 @@
 				 bool is_internal);
 static bool MergeWithExistingConstraint(Relation rel, char *ccname, Node *expr,
 							bool allow_merge, bool is_local,
+							bool is_initially_valid,
 							bool is_no_inherit);
 static void SetRelationNumChecks(Relation rel, int numchecks);
 static Node *cookConstraint(ParseState *pstate,
@@ -1368,18 +1369,19 @@
 
 /*
  * Set up an init fork for an unlogged table 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.
+ * reinitialized on restart.  An immediate sync is required even if the
+ * page has been logged, because the write did not go through
+ * shared_buffers and therefore a concurrent checkpoint may have moved
+ * the redo pointer past our xlog record.  Recovery may as well remove it
+ * while replaying, for example, XLOG_DBASE_CREATE or XLOG_TBLSPC_CREATE
+ * record. Therefore, logging is necessary even if wal_level=minimal.
  */
 void
 heap_create_init_fork(Relation rel)
 {
 	RelationOpenSmgr(rel);
 	smgrcreate(rel->rd_smgr, INIT_FORKNUM, false);
-	if (XLogIsNeeded())
-		log_smgrcreate(&rel->rd_smgr->smgr_rnode.node, INIT_FORKNUM);
+	log_smgrcreate(&rel->rd_smgr->smgr_rnode.node, INIT_FORKNUM);
 	smgrimmedsync(rel->rd_smgr, INIT_FORKNUM);
 }
 
@@ -2302,6 +2304,7 @@
 			 */
 			if (MergeWithExistingConstraint(rel, ccname, expr,
 											allow_merge, is_local,
+											cdef->initially_valid,
 											cdef->is_no_inherit))
 				continue;
 		}
@@ -2392,6 +2395,7 @@
 static bool
 MergeWithExistingConstraint(Relation rel, char *ccname, Node *expr,
 							bool allow_merge, bool is_local,
+							bool is_initially_valid,
 							bool is_no_inherit)
 {
 	bool		found;
@@ -2439,22 +2443,58 @@
 				if (equal(expr, stringToNode(TextDatumGetCString(val))))
 					found = true;
 			}
+
+			/*
+			 * If the existing constraint is purely inherited (no local
+			 * definition) then interpret addition of a local constraint as a
+			 * legal merge.  This allows ALTER ADD CONSTRAINT on parent and
+			 * child tables to be given in either order with same end state.
+			 */
+			if (is_local && !con->conislocal)
+				allow_merge = true;
+
 			if (!found || !allow_merge)
 				ereport(ERROR,
 						(errcode(ERRCODE_DUPLICATE_OBJECT),
 				errmsg("constraint \"%s\" for relation \"%s\" already exists",
 					   ccname, RelationGetRelationName(rel))));
 
-			tup = heap_copytuple(tup);
-			con = (Form_pg_constraint) GETSTRUCT(tup);
-
-			/* If the constraint is "no inherit" then cannot merge */
+			/* If the child constraint is "no inherit" then cannot merge */
 			if (con->connoinherit)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
 						 errmsg("constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\"",
 								ccname, RelationGetRelationName(rel))));
 
+			/*
+			 * Must not change an existing inherited constraint to "no
+			 * inherit" status.  That's because inherited constraints should
+			 * be able to propagate to lower-level children.
+			 */
+			if (con->coninhcount > 0 && is_no_inherit)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("constraint \"%s\" conflicts with inherited constraint on relation \"%s\"",
+								ccname, RelationGetRelationName(rel))));
+
+			/*
+			 * If the child constraint is "not valid" then cannot merge with a
+			 * valid parent constraint
+			 */
+			if (is_initially_valid && !con->convalidated)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\"",
+								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
@@ -2464,10 +2504,6 @@
 				Assert(is_local);
 				con->connoinherit = true;
 			}
-			/* OK to update the tuple */
-			ereport(NOTICE,
-			   (errmsg("merging constraint \"%s\" with inherited definition",
-					   ccname)));
 			simple_heap_update(conDesc, &tup->t_self, tup);
 			CatalogUpdateIndexes(conDesc, tup);
 			break;
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/index.c postgresql-9.5-9.5.8/src/backend/catalog/index.c
--- postgresql-9.5-9.5.2/src/backend/catalog/index.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/index.c	2017-08-07 21:13:41.000000000 +0000
@@ -3386,7 +3386,7 @@
 		ereport(INFO,
 				(errmsg("index \"%s\" was reindexed",
 						get_rel_name(indexId)),
-				 errdetail("%s.",
+				 errdetail_internal("%s",
 						   pg_rusage_show(&ru0))));
 
 	/* Close rels, but keep locks */
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/namespace.c postgresql-9.5-9.5.8/src/backend/catalog/namespace.c
--- postgresql-9.5-9.5.2/src/backend/catalog/namespace.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/namespace.c	2017-08-07 21:13:41.000000000 +0000
@@ -3651,7 +3651,7 @@
 	if (IsParallelWorker())
 		ereport(ERROR,
 				(errcode(ERRCODE_READ_ONLY_SQL_TRANSACTION),
-				 errmsg("cannot create temporary tables in parallel mode")));
+				 errmsg("cannot create temporary tables during a parallel operation")));
 
 	snprintf(namespaceName, sizeof(namespaceName), "pg_temp_%d", MyBackendId);
 
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/objectaddress.c postgresql-9.5-9.5.8/src/backend/catalog/objectaddress.c
--- postgresql-9.5-9.5.2/src/backend/catalog/objectaddress.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/objectaddress.c	2017-08-07 21:13:41.000000000 +0000
@@ -709,7 +709,7 @@
  *
  * Note: If the object is not found, we don't give any indication of the
  * reason.  (It might have been a missing schema if the name was qualified, or
- * an inexistant type name in case of a cast, function or operator; etc).
+ * a nonexistent type name in case of a cast, function or operator; etc).
  * Currently there is only one caller that might be interested in such info, so
  * we don't spend much effort here.  If more callers start to care, it might be
  * better to add some support for that in this function.
@@ -1526,8 +1526,8 @@
 	ObjectAddress address;
 	ListCell   *cell;
 	List	   *copy;
-	char	   *typenames[2];
-	Oid			typeoids[2];
+	TypeName   *typenames[2] = { NULL, NULL };
+	Oid			typeoids[2] = { InvalidOid, InvalidOid };
 	int			membernum;
 	int			i;
 
@@ -1548,7 +1548,7 @@
 	{
 		ObjectAddress typaddr;
 
-		typenames[i] = strVal(lfirst(cell));
+		typenames[i] = (TypeName *) lfirst(cell);
 		typaddr = get_object_address_type(OBJECT_TYPE, cell, missing_ok);
 		typeoids[i] = typaddr.objectId;
 		if (++i >= 2)
@@ -1575,7 +1575,9 @@
 						ereport(ERROR,
 								(errcode(ERRCODE_UNDEFINED_OBJECT),
 						  errmsg("operator %d (%s, %s) of %s does not exist",
-								 membernum, typenames[0], typenames[1],
+								 membernum,
+								 TypeNameToString(typenames[0]),
+								 TypeNameToString(typenames[1]),
 								 getObjectDescription(&famaddr))));
 				}
 				else
@@ -1604,7 +1606,9 @@
 						ereport(ERROR,
 								(errcode(ERRCODE_UNDEFINED_OBJECT),
 						  errmsg("function %d (%s, %s) of %s does not exist",
-								 membernum, typenames[0], typenames[1],
+								 membernum,
+								 TypeNameToString(typenames[0]),
+								 TypeNameToString(typenames[1]),
 								 getObjectDescription(&famaddr))));
 				}
 				else
@@ -1941,7 +1945,7 @@
 	}
 
 	/*
-	 * get_object_name is pretty sensitive to the length its input lists;
+	 * get_object_address is pretty sensitive to the length its input lists;
 	 * check that they're what it wants.
 	 */
 	switch (type)
@@ -2237,23 +2241,18 @@
 int
 read_objtype_from_string(const char *objtype)
 {
-	ObjectType	type;
 	int			i;
 
 	for (i = 0; i < lengthof(ObjectTypeMap); i++)
 	{
 		if (strcmp(ObjectTypeMap[i].tm_name, objtype) == 0)
-		{
-			type = ObjectTypeMap[i].tm_type;
-			break;
-		}
+			return ObjectTypeMap[i].tm_type;
 	}
-	if (i >= lengthof(ObjectTypeMap))
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("unrecognized object type \"%s\"", objtype)));
+	ereport(ERROR,
+			(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+			 errmsg("unrecognized object type \"%s\"", objtype)));
 
-	return type;
+	return -1;					/* keep compiler quiet */
 }
 
 /*
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/pg_type.c postgresql-9.5-9.5.8/src/backend/catalog/pg_type.c
--- postgresql-9.5-9.5.2/src/backend/catalog/pg_type.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/pg_type.c	2017-08-07 21:13:41.000000000 +0000
@@ -700,6 +700,7 @@
 	HeapTuple	tuple;
 	Form_pg_type typ;
 	Oid			arrayOid;
+	Oid			oldTypeOid;
 
 	pg_type_desc = heap_open(TypeRelationId, RowExclusiveLock);
 
@@ -713,13 +714,28 @@
 
 	arrayOid = typ->typarray;
 
-	/* Just to give a more friendly error than unique-index violation */
-	if (SearchSysCacheExists2(TYPENAMENSP,
-							  CStringGetDatum(newTypeName),
-							  ObjectIdGetDatum(typeNamespace)))
-		ereport(ERROR,
-				(errcode(ERRCODE_DUPLICATE_OBJECT),
-				 errmsg("type \"%s\" already exists", newTypeName)));
+	/* Check for a conflicting type name. */
+	oldTypeOid = GetSysCacheOid2(TYPENAMENSP,
+								 CStringGetDatum(newTypeName),
+								 ObjectIdGetDatum(typeNamespace));
+
+	/*
+	 * If there is one, see if it's an autogenerated array type, and if so
+	 * rename it out of the way.  (But we must skip that for a shell type
+	 * because moveArrayTypeName will do the wrong thing in that case.)
+	 * Otherwise, we can at least give a more friendly error than unique-index
+	 * violation.
+	 */
+	if (OidIsValid(oldTypeOid))
+	{
+		if (get_typisdefined(oldTypeOid) &&
+			moveArrayTypeName(oldTypeOid, newTypeName, typeNamespace))
+			 /* successfully dodged the problem */ ;
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_DUPLICATE_OBJECT),
+					 errmsg("type \"%s\" already exists", newTypeName)));
+	}
 
 	/* OK, do the rename --- tuple is a copy, so OK to scribble on it */
 	namestrcpy(&(typ->typname), newTypeName);
@@ -734,8 +750,12 @@
 	heap_freetuple(tuple);
 	heap_close(pg_type_desc, RowExclusiveLock);
 
-	/* If the type has an array type, recurse to handle that */
-	if (OidIsValid(arrayOid))
+	/*
+	 * If the type has an array type, recurse to handle that.  But we don't
+	 * need to do anything more if we already renamed that array type above
+	 * (which would happen when, eg, renaming "foo" to "_foo").
+	 */
+	if (OidIsValid(arrayOid) && arrayOid != oldTypeOid)
 	{
 		char	   *arrname = makeArrayTypeName(newTypeName, typeNamespace);
 
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/postgres.description postgresql-9.5-9.5.8/src/backend/catalog/postgres.description
--- postgresql-9.5-9.5.2/src/backend/catalog/postgres.description	2016-03-28 20:23:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/postgres.description	2017-08-07 21:34:38.000000000 +0000
@@ -70,9 +70,9 @@
 224	pg_proc	0	smaller of two
 228	pg_proc	0	round to nearest integer
 229	pg_proc	0	truncate to integer
-2308	pg_proc	0	smallest integer >= value
-2320	pg_proc	0	smallest integer >= value
-2309	pg_proc	0	largest integer <= value
+2308	pg_proc	0	nearest integer >= value
+2320	pg_proc	0	nearest integer >= value
+2309	pg_proc	0	nearest integer <= value
 2310	pg_proc	0	sign of value
 233	pg_proc	0	natural exponential (e^x)
 234	pg_proc	0	natural logarithm
@@ -714,9 +714,9 @@
 1708	pg_proc	0	value rounded to 'scale' of zero
 1709	pg_proc	0	value truncated to 'scale'
 1710	pg_proc	0	value truncated to 'scale' of zero
-1711	pg_proc	0	smallest integer >= value
-2167	pg_proc	0	smallest integer >= value
-1712	pg_proc	0	largest integer <= value
+1711	pg_proc	0	nearest integer >= value
+2167	pg_proc	0	nearest integer >= value
+1712	pg_proc	0	nearest integer <= value
 1728	pg_proc	0	modulus
 1730	pg_proc	0	square root
 1731	pg_proc	0	square root
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/system_views.sql postgresql-9.5-9.5.8/src/backend/catalog/system_views.sql
--- postgresql-9.5-9.5.2/src/backend/catalog/system_views.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/system_views.sql	2017-08-07 21:13:41.000000000 +0000
@@ -775,11 +775,13 @@
         ELSE
             A.rolname
         END AS usename,
-        CASE WHEN pg_has_role(S.srvowner, 'USAGE') OR has_server_privilege(S.oid, 'USAGE') THEN
-            U.umoptions
-        ELSE
-            NULL
-        END AS umoptions
+        CASE WHEN (U.umuser <> 0 AND A.rolname = current_user
+                     AND (pg_has_role(S.srvowner, 'USAGE')
+                          OR has_server_privilege(S.oid, 'USAGE')))
+                    OR (U.umuser = 0 AND pg_has_role(S.srvowner, 'USAGE'))
+                    OR (SELECT rolsuper FROM pg_authid WHERE rolname = current_user)
+                    THEN U.umoptions
+                 ELSE NULL END AS umoptions
     FROM pg_user_mapping U
          LEFT JOIN pg_authid A ON (A.oid = U.umuser) JOIN
         pg_foreign_server S ON (U.umserver = S.oid);
diff -Nru postgresql-9.5-9.5.2/src/backend/catalog/toasting.c postgresql-9.5-9.5.8/src/backend/catalog/toasting.c
--- postgresql-9.5-9.5.2/src/backend/catalog/toasting.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/catalog/toasting.c	2017-08-07 21:13:41.000000000 +0000
@@ -165,50 +165,38 @@
 	if (rel->rd_rel->reltoastrelid != InvalidOid)
 		return false;
 
+	/*
+	 * Check to see whether the table actually needs a TOAST table.
+	 */
 	if (!IsBinaryUpgrade)
 	{
+		/* Normal mode, normal check */
 		if (!needs_toast_table(rel))
 			return false;
 	}
 	else
 	{
 		/*
-		 * Check to see whether the table needs a TOAST table.
+		 * In binary-upgrade mode, create a TOAST table if and only if
+		 * pg_upgrade told us to (ie, a TOAST table OID has been provided).
 		 *
-		 * If an update-in-place TOAST relfilenode is specified, force TOAST
-		 * file creation even if it seems not to need one.  This handles the
-		 * case where the old cluster needed a TOAST table but the new cluster
-		 * would not normally create one.
-		 */
-
-		/*
-		 * If a TOAST oid is not specified, skip TOAST creation as we will do
-		 * it later so we don't create a TOAST table whose OID later conflicts
-		 * with a user-supplied OID.  This handles cases where the old cluster
-		 * didn't need a TOAST table, but the new cluster does.
+		 * This indicates that the old cluster had a TOAST table for the
+		 * current table.  We must create a TOAST table to receive the old
+		 * TOAST file, even if the table seems not to need one.
+		 *
+		 * Contrariwise, if the old cluster did not have a TOAST table, we
+		 * should be able to get along without one even if the new version's
+		 * needs_toast_table rules suggest we should have one.  There is a lot
+		 * of daylight between where we will create a TOAST table and where
+		 * one is really necessary to avoid failures, so small cross-version
+		 * differences in the when-to-create heuristic shouldn't be a problem.
+		 * If we tried to create a TOAST table anyway, we would have the
+		 * problem that it might take up an OID that will conflict with some
+		 * old-cluster table we haven't seen yet.
 		 */
-		if (!OidIsValid(binary_upgrade_next_toast_pg_class_oid))
+		if (!OidIsValid(binary_upgrade_next_toast_pg_class_oid) ||
+			!OidIsValid(binary_upgrade_next_toast_pg_type_oid))
 			return false;
-
-		/*
-		 * If a special TOAST value has been passed in, it means we are in
-		 * cleanup mode --- we are creating needed TOAST tables after all user
-		 * tables with specified OIDs have been created.  We let the system
-		 * assign a TOAST oid for us.  The tables are empty so the missing
-		 * TOAST tables were not a problem.
-		 */
-		if (binary_upgrade_next_toast_pg_class_oid == OPTIONALLY_CREATE_TOAST_OID)
-		{
-			/* clear as it is not to be used; it is just a flag */
-			binary_upgrade_next_toast_pg_class_oid = InvalidOid;
-
-			if (!needs_toast_table(rel))
-				return false;
-		}
-
-		/* both should be set, or not set */
-		Assert(OidIsValid(binary_upgrade_next_toast_pg_class_oid) ==
-			   OidIsValid(binary_upgrade_next_toast_pg_type_oid));
 	}
 
 	/*
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/analyze.c postgresql-9.5-9.5.8/src/backend/commands/analyze.c
--- postgresql-9.5-9.5.2/src/backend/commands/analyze.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/analyze.c	2017-08-07 21:13:41.000000000 +0000
@@ -605,10 +605,13 @@
 	/*
 	 * Report ANALYZE to the stats collector, too.  However, if doing
 	 * inherited stats we shouldn't report, because the stats collector only
-	 * tracks per-table stats.
+	 * tracks per-table stats.  Reset the changes_since_analyze counter only
+	 * if we analyzed all columns; otherwise, there is still work for
+	 * auto-analyze to do.
 	 */
 	if (!inh)
-		pgstat_report_analyze(onerel, totalrows, totaldeadrows);
+		pgstat_report_analyze(onerel, totalrows, totaldeadrows,
+							  (va_cols == NIL));
 
 	/* If this isn't part of VACUUM ANALYZE, let index AMs do cleanup */
 	if (!(options & VACOPT_VACUUM))
@@ -2040,8 +2043,11 @@
 
 		if (nmultiple == 0)
 		{
-			/* If we found no repeated values, assume it's a unique column */
-			stats->stadistinct = -1.0;
+			/*
+			 * If we found no repeated non-null values, assume it's a unique
+			 * column; but be sure to discount for any nulls we found.
+			 */
+			stats->stadistinct = -1.0 * (1.0 - stats->stanullfrac);
 		}
 		else if (track_cnt < track_max && toowide_cnt == 0 &&
 				 nmultiple == track_cnt)
@@ -2395,8 +2401,11 @@
 
 		if (nmultiple == 0)
 		{
-			/* If we found no repeated values, assume it's a unique column */
-			stats->stadistinct = -1.0;
+			/*
+			 * If we found no repeated non-null values, assume it's a unique
+			 * column; but be sure to discount for any nulls we found.
+			 */
+			stats->stadistinct = -1.0 * (1.0 - stats->stanullfrac);
 		}
 		else if (toowide_cnt == 0 && nmultiple == ndistinct)
 		{
@@ -2700,7 +2709,7 @@
 		else
 			stats->stawidth = stats->attrtype->typlen;
 		/* Assume all too-wide values are distinct, so it's a unique column */
-		stats->stadistinct = -1.0;
+		stats->stadistinct = -1.0 * (1.0 - stats->stanullfrac);
 	}
 	else if (null_cnt > 0)
 	{
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/cluster.c postgresql-9.5-9.5.8/src/backend/commands/cluster.c
--- postgresql-9.5-9.5.2/src/backend/commands/cluster.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/cluster.c	2017-08-07 21:13:41.000000000 +0000
@@ -559,6 +559,7 @@
 	Oid			tableOid = RelationGetRelid(OldHeap);
 	Oid			tableSpace = OldHeap->rd_rel->reltablespace;
 	Oid			OIDNewHeap;
+	char		relpersistence;
 	bool		is_system_catalog;
 	bool		swap_toast_by_content;
 	TransactionId frozenXid;
@@ -568,7 +569,8 @@
 	if (OidIsValid(indexOid))
 		mark_index_clustered(OldHeap, indexOid, true);
 
-	/* Remember if it's a system catalog */
+	/* Remember info about rel before closing OldHeap */
+	relpersistence = OldHeap->rd_rel->relpersistence;
 	is_system_catalog = IsSystemRelation(OldHeap);
 
 	/* Close relcache entry, but keep lock until transaction commit */
@@ -576,7 +578,7 @@
 
 	/* Create the transient table that will receive the re-ordered data */
 	OIDNewHeap = make_new_heap(tableOid, tableSpace,
-							   OldHeap->rd_rel->relpersistence,
+							   relpersistence,
 							   AccessExclusiveLock);
 
 	/* Copy the heap data into the new table in the desired order */
@@ -590,7 +592,7 @@
 	finish_heap_swap(tableOid, OIDNewHeap, is_system_catalog,
 					 swap_toast_by_content, false, true,
 					 frozenXid, cutoffMulti,
-					 OldHeap->rd_rel->relpersistence);
+					 relpersistence);
 }
 
 
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/copy.c postgresql-9.5-9.5.8/src/backend/commands/copy.c
--- postgresql-9.5-9.5.2/src/backend/commands/copy.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/copy.c	2017-08-07 21:13:41.000000000 +0000
@@ -873,6 +873,7 @@
 			ColumnRef  *cr;
 			ResTarget  *target;
 			RangeVar   *from;
+			List	   *targetList = NIL;
 
 			if (is_from)
 				ereport(ERROR,
@@ -880,32 +881,71 @@
 				  errmsg("COPY FROM not supported with row-level security"),
 						 errhint("Use INSERT statements instead.")));
 
-			/* Build target list */
-			cr = makeNode(ColumnRef);
-
+			/*
+			 * Build target list
+			 *
+			 * If no columns are specified in the attribute list of the COPY
+			 * command, then the target list is 'all' columns. Therefore, '*'
+			 * should be used as the target list for the resulting SELECT
+			 * statement.
+			 *
+			 * In the case that columns are specified in the attribute list,
+			 * create a ColumnRef and ResTarget for each column and add them to
+			 * the target list for the resulting SELECT statement.
+			 */
 			if (!stmt->attlist)
+			{
+				cr = makeNode(ColumnRef);
 				cr->fields = list_make1(makeNode(A_Star));
-			else
-				cr->fields = stmt->attlist;
+				cr->location = -1;
+
+				target = makeNode(ResTarget);
+				target->name = NULL;
+				target->indirection = NIL;
+				target->val = (Node *) cr;
+				target->location = -1;
 
-			cr->location = 1;
+				targetList = list_make1(target);
+			}
+			else
+			{
+				ListCell   *lc;
 
-			target = makeNode(ResTarget);
-			target->name = NULL;
-			target->indirection = NIL;
-			target->val = (Node *) cr;
-			target->location = 1;
+				foreach(lc, stmt->attlist)
+				{
+					/*
+					 * Build the ColumnRef for each column.  The ColumnRef
+					 * 'fields' property is a String 'Value' node (see
+					 * nodes/value.h) that corresponds to the column name
+					 * respectively.
+					 */
+					cr = makeNode(ColumnRef);
+					cr->fields = list_make1(lfirst(lc));
+					cr->location = -1;
+
+					/* Build the ResTarget and add the ColumnRef to it. */
+					target = makeNode(ResTarget);
+					target->name = NULL;
+					target->indirection = NIL;
+					target->val = (Node *) cr;
+					target->location = -1;
+
+					/* Add each column to the SELECT statement's target list */
+					targetList = lappend(targetList, target);
+				}
+			}
 
 			/*
 			 * Build RangeVar for from clause, fully qualified based on the
 			 * relation which we have opened and locked.
 			 */
 			from = makeRangeVar(get_namespace_name(RelationGetNamespace(rel)),
-								RelationGetRelationName(rel), -1);
+								pstrdup(RelationGetRelationName(rel)),
+								-1);
 
 			/* Build query */
 			select = makeNode(SelectStmt);
-			select->targetList = list_make1(target);
+			select->targetList = targetList;
 			select->fromClause = list_make1(from);
 
 			query = (Node *) select;
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/createas.c postgresql-9.5-9.5.8/src/backend/commands/createas.c
--- postgresql-9.5-9.5.2/src/backend/commands/createas.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/createas.c	2017-08-07 21:13:41.000000000 +0000
@@ -10,7 +10,8 @@
  *
  * Formerly, CTAS was implemented as a variant of SELECT, which led
  * to assorted legacy behaviors that we still try to preserve, notably that
- * we must return a tuples-processed count in the completionTag.
+ * we must return a tuples-processed count in the completionTag.  (We no
+ * longer do that for CTAS ... WITH NO DATA, however.)
  *
  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -36,6 +37,8 @@
 #include "commands/tablecmds.h"
 #include "commands/view.h"
 #include "miscadmin.h"
+#include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
 #include "parser/parse_clause.h"
 #include "rewrite/rewriteHandler.h"
 #include "storage/smgr.h"
@@ -53,14 +56,17 @@
 	IntoClause *into;			/* target relation specification */
 	/* These fields are filled by intorel_startup: */
 	Relation	rel;			/* relation to write to */
+	ObjectAddress reladdr;		/* address of rel, for ExecCreateTableAs */
 	CommandId	output_cid;		/* cmin to insert in output tuples */
 	int			hi_options;		/* heap_insert performance options */
 	BulkInsertState bistate;	/* bulk insert state */
 } DR_intorel;
 
-/* the address of the created table, for ExecCreateTableAs consumption */
-static ObjectAddress CreateAsReladdr = {InvalidOid, InvalidOid, 0};
+/* utility functions for CTAS definition creation */
+static ObjectAddress create_ctas_internal(List *attrList, IntoClause *into);
+static ObjectAddress create_ctas_nodata(List *tlist, IntoClause *into);
 
+/* DestReceiver routines for collecting data */
 static void intorel_startup(DestReceiver *self, int operation, TupleDesc typeinfo);
 static void intorel_receive(TupleTableSlot *slot, DestReceiver *self);
 static void intorel_shutdown(DestReceiver *self);
@@ -68,6 +74,150 @@
 
 
 /*
+ * create_ctas_internal
+ *
+ * Internal utility used for the creation of the definition of a relation
+ * created via CREATE TABLE AS or a materialized view.  Caller needs to
+ * provide a list of attributes (ColumnDef nodes).
+ */
+static ObjectAddress
+create_ctas_internal(List *attrList, IntoClause *into)
+{
+	CreateStmt *create = makeNode(CreateStmt);
+	bool		is_matview;
+	char		relkind;
+	Datum		toast_options;
+	static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
+	ObjectAddress intoRelationAddr;
+
+	/* This code supports both CREATE TABLE AS and CREATE MATERIALIZED VIEW */
+	is_matview = (into->viewQuery != NULL);
+	relkind = is_matview ? RELKIND_MATVIEW : RELKIND_RELATION;
+
+	/*
+	 * Create the target relation by faking up a CREATE TABLE parsetree and
+	 * passing it to DefineRelation.
+	 */
+	create->relation = into->rel;
+	create->tableElts = attrList;
+	create->inhRelations = NIL;
+	create->ofTypename = NULL;
+	create->constraints = NIL;
+	create->options = into->options;
+	create->oncommit = into->onCommit;
+	create->tablespacename = into->tableSpaceName;
+	create->if_not_exists = false;
+
+	/*
+	 * Create the relation.  (This will error out if there's an existing view,
+	 * so we don't need more code to complain if "replace" is false.)
+	 */
+	intoRelationAddr = DefineRelation(create, relkind, InvalidOid, NULL);
+
+	/*
+	 * If necessary, create a TOAST table for the target table.  Note that
+	 * NewRelationCreateToastTable ends with CommandCounterIncrement(), so
+	 * that the TOAST table will be visible for insertion.
+	 */
+	CommandCounterIncrement();
+
+	/* parse and validate reloptions for the toast table */
+	toast_options = transformRelOptions((Datum) 0,
+										create->options,
+										"toast",
+										validnsps,
+										true, false);
+
+	(void) heap_reloptions(RELKIND_TOASTVALUE, toast_options, true);
+
+	NewRelationCreateToastTable(intoRelationAddr.objectId, toast_options);
+
+	/* Create the "view" part of a materialized view. */
+	if (is_matview)
+	{
+		/* StoreViewQuery scribbles on tree, so make a copy */
+		Query	   *query = (Query *) copyObject(into->viewQuery);
+
+		StoreViewQuery(intoRelationAddr.objectId, query, false);
+		CommandCounterIncrement();
+	}
+
+	return intoRelationAddr;
+}
+
+
+/*
+ * create_ctas_nodata
+ *
+ * Create CTAS or materialized view when WITH NO DATA is used, starting from
+ * the targetlist of the SELECT or view definition.
+ */
+static ObjectAddress
+create_ctas_nodata(List *tlist, IntoClause *into)
+{
+	List	   *attrList;
+	ListCell   *t,
+			   *lc;
+
+	/*
+	 * Build list of ColumnDefs from non-junk elements of the tlist.  If a
+	 * column name list was specified in CREATE TABLE AS, override the column
+	 * names in the query.  (Too few column names are OK, too many are not.)
+	 */
+	attrList = NIL;
+	lc = list_head(into->colNames);
+	foreach(t, tlist)
+	{
+		TargetEntry *tle = (TargetEntry *) lfirst(t);
+
+		if (!tle->resjunk)
+		{
+			ColumnDef  *col;
+			char	   *colname;
+
+			if (lc)
+			{
+				colname = strVal(lfirst(lc));
+				lc = lnext(lc);
+			}
+			else
+				colname = tle->resname;
+
+			col = makeColumnDef(colname,
+								exprType((Node *) tle->expr),
+								exprTypmod((Node *) tle->expr),
+								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.  (We must
+			 * check this here because DefineRelation would adopt the type's
+			 * default collation rather than complaining.)
+			 */
+			if (!OidIsValid(col->collOid) &&
+				type_is_collatable(col->typeName->typeOid))
+				ereport(ERROR,
+						(errcode(ERRCODE_INDETERMINATE_COLLATION),
+						 errmsg("no collation was derived for column \"%s\" with collatable type %s",
+								col->colname,
+								format_type_be(col->typeName->typeOid)),
+						 errhint("Use the COLLATE clause to set the collation explicitly.")));
+
+			attrList = lappend(attrList, col);
+		}
+	}
+
+	if (lc != NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("too many column names were specified")));
+
+	/* Create the relation definition using the ColumnDef list */
+	return create_ctas_internal(attrList, into);
+}
+
+
+/*
  * ExecCreateTableAs -- execute a CREATE TABLE AS command
  */
 ObjectAddress
@@ -85,7 +235,6 @@
 	List	   *rewritten;
 	PlannedStmt *plan;
 	QueryDesc  *queryDesc;
-	ScanDirection dir;
 
 	if (stmt->if_not_exists)
 	{
@@ -121,8 +270,9 @@
 		Assert(!is_matview);	/* excluded by syntax */
 		ExecuteQuery(estmt, into, queryString, params, dest, completionTag);
 
-		address = CreateAsReladdr;
-		CreateAsReladdr = InvalidObjectAddress;
+		/* get object address that intorel_startup saved for us */
+		address = ((DR_intorel *) dest)->reladdr;
+
 		return address;
 	}
 	Assert(query->commandType == CMD_SELECT);
@@ -142,70 +292,80 @@
 		save_nestlevel = NewGUCNestLevel();
 	}
 
-	/*
-	 * Parse analysis was done already, but we still have to run the rule
-	 * rewriter.  We do not do AcquireRewriteLocks: we assume the query either
-	 * came straight from the parser, or suitable locks were acquired by
-	 * plancache.c.
-	 *
-	 * Because the rewriter and planner tend to scribble on the input, we make
-	 * a preliminary copy of the source querytree.  This prevents problems in
-	 * the case that CTAS is in a portal or plpgsql function and is executed
-	 * repeatedly.  (See also the same hack in EXPLAIN and PREPARE.)
-	 */
-	rewritten = QueryRewrite((Query *) copyObject(query));
-
-	/* SELECT should never rewrite to more or less than one SELECT query */
-	if (list_length(rewritten) != 1)
-		elog(ERROR, "unexpected rewrite result for CREATE TABLE AS SELECT");
-	query = (Query *) linitial(rewritten);
-	Assert(query->commandType == CMD_SELECT);
+	if (into->skipData)
+	{
+		/*
+		 * If WITH NO DATA was specified, do not go through the rewriter,
+		 * planner and executor.  Just define the relation using a code path
+		 * similar to CREATE VIEW.  This avoids dump/restore problems stemming
+		 * from running the planner before all dependencies are set up.
+		 */
+		address = create_ctas_nodata(query->targetList, into);
+	}
+	else
+	{
+		/*
+		 * Parse analysis was done already, but we still have to run the rule
+		 * rewriter.  We do not do AcquireRewriteLocks: we assume the query
+		 * either came straight from the parser, or suitable locks were
+		 * acquired by plancache.c.
+		 *
+		 * Because the rewriter and planner tend to scribble on the input, we
+		 * make a preliminary copy of the source querytree.  This prevents
+		 * problems in the case that CTAS is in a portal or plpgsql function
+		 * and is executed repeatedly.  (See also the same hack in EXPLAIN and
+		 * PREPARE.)
+		 */
+		rewritten = QueryRewrite((Query *) copyObject(query));
 
-	/* plan the query */
-	plan = pg_plan_query(query, 0, params);
+		/* SELECT should never rewrite to more or less than one SELECT query */
+		if (list_length(rewritten) != 1)
+			elog(ERROR, "unexpected rewrite result for %s",
+				 is_matview ? "CREATE MATERIALIZED VIEW" :
+				 "CREATE TABLE AS SELECT");
+		query = (Query *) linitial(rewritten);
+		Assert(query->commandType == CMD_SELECT);
 
-	/*
-	 * Use a snapshot with an updated command ID to ensure this query sees
-	 * results of any previously executed queries.  (This could only matter if
-	 * the planner executed an allegedly-stable function that changed the
-	 * database contents, but let's do it anyway to be parallel to the EXPLAIN
-	 * code path.)
-	 */
-	PushCopiedSnapshot(GetActiveSnapshot());
-	UpdateActiveSnapshotCommandId();
+		/* plan the query */
+		plan = pg_plan_query(query, 0, params);
 
-	/* Create a QueryDesc, redirecting output to our tuple receiver */
-	queryDesc = CreateQueryDesc(plan, queryString,
-								GetActiveSnapshot(), InvalidSnapshot,
-								dest, params, 0);
+		/*
+		 * Use a snapshot with an updated command ID to ensure this query sees
+		 * results of any previously executed queries.  (This could only
+		 * matter if the planner executed an allegedly-stable function that
+		 * changed the database contents, but let's do it anyway to be
+		 * parallel to the EXPLAIN code path.)
+		 */
+		PushCopiedSnapshot(GetActiveSnapshot());
+		UpdateActiveSnapshotCommandId();
 
-	/* call ExecutorStart to prepare the plan for execution */
-	ExecutorStart(queryDesc, GetIntoRelEFlags(into));
+		/* Create a QueryDesc, redirecting output to our tuple receiver */
+		queryDesc = CreateQueryDesc(plan, queryString,
+									GetActiveSnapshot(), InvalidSnapshot,
+									dest, params, 0);
 
-	/*
-	 * Normally, we run the plan to completion; but if skipData is specified,
-	 * just do tuple receiver startup and shutdown.
-	 */
-	if (into->skipData)
-		dir = NoMovementScanDirection;
-	else
-		dir = ForwardScanDirection;
+		/* call ExecutorStart to prepare the plan for execution */
+		ExecutorStart(queryDesc, GetIntoRelEFlags(into));
 
-	/* run the plan */
-	ExecutorRun(queryDesc, dir, 0L);
+		/* run the plan to completion */
+		ExecutorRun(queryDesc, ForwardScanDirection, 0L);
 
-	/* save the rowcount if we're given a completionTag to fill */
-	if (completionTag)
-		snprintf(completionTag, COMPLETION_TAG_BUFSIZE,
-				 "SELECT %u", queryDesc->estate->es_processed);
+		/* save the rowcount if we're given a completionTag to fill */
+		if (completionTag)
+			snprintf(completionTag, COMPLETION_TAG_BUFSIZE,
+					 "SELECT %u", queryDesc->estate->es_processed);
 
-	/* and clean up */
-	ExecutorFinish(queryDesc);
-	ExecutorEnd(queryDesc);
+		/* get object address that intorel_startup saved for us */
+		address = ((DR_intorel *) dest)->reladdr;
 
-	FreeQueryDesc(queryDesc);
+		/* and clean up */
+		ExecutorFinish(queryDesc);
+		ExecutorEnd(queryDesc);
 
-	PopActiveSnapshot();
+		FreeQueryDesc(queryDesc);
+
+		PopActiveSnapshot();
+	}
 
 	if (is_matview)
 	{
@@ -216,9 +376,6 @@
 		SetUserIdAndSecContext(save_userid, save_sec_context);
 	}
 
-	address = CreateAsReladdr;
-	CreateAsReladdr = InvalidObjectAddress;
-
 	return address;
 }
 
@@ -287,14 +444,12 @@
 	IntoClause *into = myState->into;
 	bool		is_matview;
 	char		relkind;
-	CreateStmt *create;
+	List	   *attrList;
 	ObjectAddress intoRelationAddr;
 	Relation	intoRelationDesc;
 	RangeTblEntry *rte;
-	Datum		toast_options;
 	ListCell   *lc;
 	int			attnum;
-	static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
 
 	Assert(into != NULL);		/* else somebody forgot to set it */
 
@@ -303,62 +458,31 @@
 	relkind = is_matview ? RELKIND_MATVIEW : RELKIND_RELATION;
 
 	/*
-	 * Create the target relation by faking up a CREATE TABLE parsetree and
-	 * passing it to DefineRelation.
-	 */
-	create = makeNode(CreateStmt);
-	create->relation = into->rel;
-	create->tableElts = NIL;	/* will fill below */
-	create->inhRelations = NIL;
-	create->ofTypename = NULL;
-	create->constraints = NIL;
-	create->options = into->options;
-	create->oncommit = into->onCommit;
-	create->tablespacename = into->tableSpaceName;
-	create->if_not_exists = false;
-
-	/*
 	 * Build column definitions using "pre-cooked" type and collation info. If
 	 * a column name list was specified in CREATE TABLE AS, override the
 	 * column names derived from the query.  (Too few column names are OK, too
 	 * many are not.)
 	 */
+	attrList = NIL;
 	lc = list_head(into->colNames);
 	for (attnum = 0; attnum < typeinfo->natts; attnum++)
 	{
 		Form_pg_attribute attribute = typeinfo->attrs[attnum];
-		ColumnDef  *col = makeNode(ColumnDef);
-		TypeName   *coltype = makeNode(TypeName);
+		ColumnDef  *col;
+		char	   *colname;
 
 		if (lc)
 		{
-			col->colname = strVal(lfirst(lc));
+			colname = strVal(lfirst(lc));
 			lc = lnext(lc);
 		}
 		else
-			col->colname = NameStr(attribute->attname);
-		col->typeName = coltype;
-		col->inhcount = 0;
-		col->is_local = true;
-		col->is_not_null = false;
-		col->is_from_type = false;
-		col->storage = 0;
-		col->raw_default = NULL;
-		col->cooked_default = NULL;
-		col->collClause = NULL;
-		col->collOid = attribute->attcollation;
-		col->constraints = NIL;
-		col->fdwoptions = NIL;
-		col->location = -1;
-
-		coltype->names = NIL;
-		coltype->typeOid = attribute->atttypid;
-		coltype->setof = false;
-		coltype->pct_type = false;
-		coltype->typmods = NIL;
-		coltype->typemod = attribute->atttypmod;
-		coltype->arrayBounds = NIL;
-		coltype->location = -1;
+			colname = NameStr(attribute->attname);
+
+		col = makeColumnDef(colname,
+							attribute->atttypid,
+							attribute->atttypmod,
+							attribute->attcollation);
 
 		/*
 		 * It's possible that the column is of a collatable type but the
@@ -367,14 +491,15 @@
 		 * collation rather than complaining.)
 		 */
 		if (!OidIsValid(col->collOid) &&
-			type_is_collatable(coltype->typeOid))
+			type_is_collatable(col->typeName->typeOid))
 			ereport(ERROR,
 					(errcode(ERRCODE_INDETERMINATE_COLLATION),
 					 errmsg("no collation was derived for column \"%s\" with collatable type %s",
-							col->colname, format_type_be(coltype->typeOid)),
+							col->colname,
+							format_type_be(col->typeName->typeOid)),
 					 errhint("Use the COLLATE clause to set the collation explicitly.")));
 
-		create->tableElts = lappend(create->tableElts, col);
+		attrList = lappend(attrList, col);
 	}
 
 	if (lc != NULL)
@@ -385,35 +510,7 @@
 	/*
 	 * Actually create the target table
 	 */
-	intoRelationAddr = DefineRelation(create, relkind, InvalidOid, NULL);
-
-	/*
-	 * If necessary, create a TOAST table for the target table.  Note that
-	 * NewRelationCreateToastTable ends with CommandCounterIncrement(), so
-	 * that the TOAST table will be visible for insertion.
-	 */
-	CommandCounterIncrement();
-
-	/* parse and validate reloptions for the toast table */
-	toast_options = transformRelOptions((Datum) 0,
-										create->options,
-										"toast",
-										validnsps,
-										true, false);
-
-	(void) heap_reloptions(RELKIND_TOASTVALUE, toast_options, true);
-
-	NewRelationCreateToastTable(intoRelationAddr.objectId, toast_options);
-
-	/* Create the "view" part of a materialized view. */
-	if (is_matview)
-	{
-		/* StoreViewQuery scribbles on tree, so make a copy */
-		Query	   *query = (Query *) copyObject(into->viewQuery);
-
-		StoreViewQuery(intoRelationAddr.objectId, query, false);
-		CommandCounterIncrement();
-	}
+	intoRelationAddr = create_ctas_internal(attrList, into);
 
 	/*
 	 * Finally we can open the target table
@@ -462,11 +559,9 @@
 	 * Fill private fields of myState for use by later routines
 	 */
 	myState->rel = intoRelationDesc;
+	myState->reladdr = intoRelationAddr;
 	myState->output_cid = GetCurrentCommandId(true);
 
-	/* and remember the new relation's address for ExecCreateTableAs */
-	CreateAsReladdr = intoRelationAddr;
-
 	/*
 	 * We can skip WAL-logging the insertions, unless PITR or streaming
 	 * replication is in use. We can skip the FSM in any case.
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/dbcommands.c postgresql-9.5-9.5.8/src/backend/commands/dbcommands.c
--- postgresql-9.5-9.5.2/src/backend/commands/dbcommands.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/dbcommands.c	2017-08-07 21:13:41.000000000 +0000
@@ -674,7 +674,7 @@
 
 		/*
 		 * Force synchronous commit, thus minimizing the window between
-		 * creation of the database files and commital of the transaction. If
+		 * creation of the database files and committal of the transaction. If
 		 * we crash before committing, we'll have a DB that's taking up disk
 		 * space but is not in pg_database, which is not good.
 		 */
@@ -928,7 +928,7 @@
 
 	/*
 	 * Force synchronous commit, thus minimizing the window between removal of
-	 * the database files and commital of the transaction. If we crash before
+	 * the database files and committal of the transaction. If we crash before
 	 * committing, we'll have a DB that's gone on disk but still there
 	 * according to pg_database, which is not good.
 	 */
@@ -1286,7 +1286,7 @@
 
 		/*
 		 * Force synchronous commit, thus minimizing the window between
-		 * copying the database files and commital of the transaction. If we
+		 * copying the database files and committal of the transaction. If we
 		 * crash before committing, we'll leave an orphaned set of files on
 		 * disk, which is not fatal but not good either.
 		 */
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/explain.c postgresql-9.5-9.5.8/src/backend/commands/explain.c
--- postgresql-9.5-9.5.2/src/backend/commands/explain.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/explain.c	2017-08-07 21:13:41.000000000 +0000
@@ -25,6 +25,7 @@
 #include "optimizer/clauses.h"
 #include "parser/parsetree.h"
 #include "rewrite/rewriteHandler.h"
+#include "storage/bufmgr.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 #include "utils/json.h"
@@ -684,8 +685,11 @@
 				appendStringInfo(es->str, " for constraint %s", conname);
 			if (show_relname)
 				appendStringInfo(es->str, " on %s", relname);
-			appendStringInfo(es->str, ": time=%.3f calls=%.0f\n",
-							 1000.0 * instr->total, instr->ntuples);
+			if (es->timing)
+				appendStringInfo(es->str, ": time=%.3f calls=%.0f\n",
+								 1000.0 * instr->total, instr->ntuples);
+			else
+				appendStringInfo(es->str, ": calls=%.0f\n", instr->ntuples);
 		}
 		else
 		{
@@ -693,7 +697,8 @@
 			if (conname)
 				ExplainPropertyText("Constraint Name", conname, es);
 			ExplainPropertyText("Relation", relname, es);
-			ExplainPropertyFloat("Time", 1000.0 * instr->total, 3, es);
+			if (es->timing)
+				ExplainPropertyFloat("Time", 1000.0 * instr->total, 3, es);
 			ExplainPropertyFloat("Calls", instr->ntuples, 0, es);
 		}
 
@@ -1600,8 +1605,11 @@
 			ExplainPropertyLong("Local Written Blocks", usage->local_blks_written, es);
 			ExplainPropertyLong("Temp Read Blocks", usage->temp_blks_read, es);
 			ExplainPropertyLong("Temp Written Blocks", usage->temp_blks_written, es);
-			ExplainPropertyFloat("I/O Read Time", INSTR_TIME_GET_MILLISEC(usage->blk_read_time), 3, es);
-			ExplainPropertyFloat("I/O Write Time", INSTR_TIME_GET_MILLISEC(usage->blk_write_time), 3, es);
+			if (track_io_timing)
+			{
+				ExplainPropertyFloat("I/O Read Time", INSTR_TIME_GET_MILLISEC(usage->blk_read_time), 3, es);
+				ExplainPropertyFloat("I/O Write Time", INSTR_TIME_GET_MILLISEC(usage->blk_write_time), 3, es);
+			}
 		}
 	}
 
@@ -3182,13 +3190,15 @@
  * Optionally, OR in X_NOWHITESPACE to suppress the whitespace we'd normally
  * add.
  *
- * XML tag names can't contain white space, so we replace any spaces in
- * "tagname" with dashes.
+ * XML restricts tag names more than our other output formats, eg they can't
+ * contain white space or slashes.  Replace invalid characters with dashes,
+ * so that for example "I/O Read Time" becomes "I-O-Read-Time".
  */
 static void
 ExplainXMLTag(const char *tagname, int flags, ExplainState *es)
 {
 	const char *s;
+	const char *valid = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.";
 
 	if ((flags & X_NOWHITESPACE) == 0)
 		appendStringInfoSpaces(es->str, 2 * es->indent);
@@ -3196,7 +3206,7 @@
 	if ((flags & X_CLOSING) != 0)
 		appendStringInfoCharMacro(es->str, '/');
 	for (s = tagname; *s; s++)
-		appendStringInfoCharMacro(es->str, (*s == ' ') ? '-' : *s);
+		appendStringInfoChar(es->str, strchr(valid, *s) ? *s : '-');
 	if ((flags & X_CLOSE_IMMEDIATE) != 0)
 		appendStringInfoString(es->str, " /");
 	appendStringInfoCharMacro(es->str, '>');
@@ -3247,7 +3257,7 @@
 }
 
 /*
- * YAML is a superset of JSON; unfortuantely, the YAML quoting rules are
+ * YAML is a superset of JSON; unfortunately, the YAML quoting rules are
  * ridiculously complicated -- as documented in sections 5.3 and 7.3.3 of
  * http://yaml.org/spec/1.2/spec.html -- so we chose to just quote everything.
  * Empty strings, strings with leading or trailing whitespace, and strings
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/extension.c postgresql-9.5-9.5.8/src/backend/commands/extension.c
--- postgresql-9.5-9.5.2/src/backend/commands/extension.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/extension.c	2017-08-07 21:13:41.000000000 +0000
@@ -703,6 +703,9 @@
 		List	   *stmt_list;
 		ListCell   *lc2;
 
+		/* Be sure parser can see any DDL done so far */
+		CommandCounterIncrement();
+
 		stmt_list = pg_analyze_and_rewrite(parsetree,
 										   sql,
 										   NULL,
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/functioncmds.c postgresql-9.5-9.5.8/src/backend/commands/functioncmds.c
--- postgresql-9.5-9.5.2/src/backend/commands/functioncmds.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/functioncmds.c	2017-08-07 21:13:41.000000000 +0000
@@ -1006,7 +1006,7 @@
 	}
 	else
 	{
-		/* store SQL NULL instead of emtpy array */
+		/* store SQL NULL instead of empty array */
 		trftypes = NULL;
 	}
 
@@ -1278,6 +1278,8 @@
 	Relation	pg_proc_rel;
 	HeapTuple	tup;
 	Form_pg_proc procForm;
+	ObjectAddress func_address;
+	ObjectAddress type_address;
 
 	pg_proc_rel = heap_open(ProcedureRelationId, RowExclusiveLock);
 
@@ -1298,6 +1300,14 @@
 	CatalogUpdateIndexes(pg_proc_rel, tup);
 
 	heap_close(pg_proc_rel, RowExclusiveLock);
+
+	/*
+	 * Also update the dependency to the new type. Opaque is a pinned type, so
+	 * there is no old dependency record for it that we would need to remove.
+	 */
+	ObjectAddressSet(type_address, TypeRelationId, newRetType);
+	ObjectAddressSet(func_address, ProcedureRelationId, funcOid);
+	recordDependencyOn(&func_address, &type_address, DEPENDENCY_NORMAL);
 }
 
 
@@ -1312,6 +1322,8 @@
 	Relation	pg_proc_rel;
 	HeapTuple	tup;
 	Form_pg_proc procForm;
+	ObjectAddress func_address;
+	ObjectAddress type_address;
 
 	pg_proc_rel = heap_open(ProcedureRelationId, RowExclusiveLock);
 
@@ -1333,6 +1345,14 @@
 	CatalogUpdateIndexes(pg_proc_rel, tup);
 
 	heap_close(pg_proc_rel, RowExclusiveLock);
+
+	/*
+	 * Also update the dependency to the new type. Opaque is a pinned type, so
+	 * there is no old dependency record for it that we would need to remove.
+	 */
+	ObjectAddressSet(type_address, TypeRelationId, newArgType);
+	ObjectAddressSet(func_address, ProcedureRelationId, funcOid);
+	recordDependencyOn(&func_address, &type_address, DEPENDENCY_NORMAL);
 }
 
 
@@ -1406,7 +1426,7 @@
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("cast will be ignored because the target data type is a domain")));
 
-	/* Detemine the cast method */
+	/* Determine the cast method */
 	if (stmt->func != NULL)
 		castmethod = COERCION_METHOD_FUNCTION;
 	else if (stmt->inout)
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/indexcmds.c postgresql-9.5-9.5.8/src/backend/commands/indexcmds.c
--- postgresql-9.5-9.5.2/src/backend/commands/indexcmds.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/indexcmds.c	2017-08-07 21:13:41.000000000 +0000
@@ -96,7 +96,7 @@
  * Errors arising from the attribute list still apply.
  *
  * Most column type changes that can skip a table rewrite do not invalidate
- * indexes.  We ackowledge this when all operator classes, collations and
+ * indexes.  We acknowledge this when all operator classes, collations and
  * exclusion operators match.  Though we could further permit intra-opfamily
  * changes for btree and hash indexes, that adds subtle complexity with no
  * concrete benefit for core types.
@@ -285,8 +285,8 @@
  * 'indexRelationId': normally InvalidOid, but during bootstrap can be
  *		nonzero to specify a preselected OID for the index.
  * 'is_alter_table': this is due to an ALTER rather than a CREATE operation.
- * 'check_rights': check for CREATE rights in the namespace.  (This should
- *		be true except when ALTER is deleting/recreating an index.)
+ * 'check_rights': check for CREATE rights in namespace and tablespace.  (This
+ *		should be true except when ALTER is deleting/recreating an index.)
  * 'skip_build': make the catalog entries but leave the index file empty;
  *		it will be filled later.
  * 'quiet': suppress the NOTICE chatter ordinarily provided for constraints.
@@ -421,8 +421,9 @@
 		/* note InvalidOid is OK in this case */
 	}
 
-	/* Check permissions except when using database's default */
-	if (OidIsValid(tablespaceId) && tablespaceId != MyDatabaseTableSpace)
+	/* Check tablespace permissions */
+	if (check_rights &&
+		OidIsValid(tablespaceId) && tablespaceId != MyDatabaseTableSpace)
 	{
 		AclResult	aclresult;
 
@@ -916,7 +917,7 @@
  * indxpath.c could do something with.  However, that seems overly
  * restrictive.  One useful application of partial indexes is to apply
  * a UNIQUE constraint across a subset of a table, and in that scenario
- * any evaluatable predicate will work.  So accept any predicate here
+ * any evaluable predicate will work.  So accept any predicate here
  * (except ones requiring a plan), and let indxpath.c fend for itself.
  */
 static void
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/tablecmds.c postgresql-9.5-9.5.8/src/backend/commands/tablecmds.c
--- postgresql-9.5-9.5.2/src/backend/commands/tablecmds.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/tablecmds.c	2017-08-07 21:13:41.000000000 +0000
@@ -20,6 +20,7 @@
 #include "access/reloptions.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"
+#include "access/tupconvert.h"
 #include "access/xact.h"
 #include "access/xlog.h"
 #include "catalog/catalog.h"
@@ -6163,7 +6164,7 @@
 
 	/*
 	 * Check if ONLY was specified with ALTER TABLE.  If so, allow the
-	 * contraint creation only if there are no children currently.  Error out
+	 * constraint creation only if there are no children currently.  Error out
 	 * otherwise.
 	 */
 	if (!recurse && children != NIL)
@@ -6710,16 +6711,34 @@
 
 		while (HeapTupleIsValid(tgtuple = systable_getnext(tgscan)))
 		{
+			Form_pg_trigger tgform = (Form_pg_trigger) GETSTRUCT(tgtuple);
 			Form_pg_trigger copy_tg;
 
+			/*
+			 * Remember OIDs of other relation(s) involved in FK constraint.
+			 * (Note: it's likely that we could skip forcing a relcache inval
+			 * for other rels that don't have a trigger whose properties
+			 * change, but let's be conservative.)
+			 */
+			if (tgform->tgrelid != RelationGetRelid(rel))
+				otherrelids = list_append_unique_oid(otherrelids,
+													 tgform->tgrelid);
+
+			/*
+			 * Update deferrability of RI_FKey_noaction_del,
+			 * RI_FKey_noaction_upd, RI_FKey_check_ins and RI_FKey_check_upd
+			 * triggers, but not others; see createForeignKeyTriggers and
+			 * CreateFKCheckTrigger.
+			 */
+			if (tgform->tgfoid != F_RI_FKEY_NOACTION_DEL &&
+				tgform->tgfoid != F_RI_FKEY_NOACTION_UPD &&
+				tgform->tgfoid != F_RI_FKEY_CHECK_INS &&
+				tgform->tgfoid != F_RI_FKEY_CHECK_UPD)
+				continue;
+
 			copyTuple = heap_copytuple(tgtuple);
 			copy_tg = (Form_pg_trigger) GETSTRUCT(copyTuple);
 
-			/* Remember OIDs of other relation(s) involved in FK constraint */
-			if (copy_tg->tgrelid != RelationGetRelid(rel))
-				otherrelids = list_append_unique_oid(otherrelids,
-													 copy_tg->tgrelid);
-
 			copy_tg->tgdeferrable = cmdcon->deferrable;
 			copy_tg->tginitdeferred = cmdcon->initdeferred;
 			simple_heap_update(tgrel, &copyTuple->t_self, copyTuple);
@@ -6854,9 +6873,10 @@
 
 			/*
 			 * If we're recursing, the parent has already done this, so skip
-			 * it.
+			 * it.  Also, if the constraint is a NO INHERIT constraint, we
+			 * shouldn't try to look for it in the children.
 			 */
-			if (!recursing)
+			if (!recursing && !con->connoinherit)
 				children = find_all_inheritors(RelationGetRelid(rel),
 											   lockmode, NULL);
 
@@ -7481,6 +7501,9 @@
 
 /*
  * Create the triggers that implement an FK constraint.
+ *
+ * NB: if you change any trigger properties here, see also
+ * ATExecAlterConstraint.
  */
 static void
 createForeignKeyTriggers(Relation rel, Oid refRelOid, Constraint *fkconstraint,
@@ -7668,6 +7691,24 @@
 		is_no_inherit_constraint = con->connoinherit;
 
 		/*
+		 * If it's a foreign-key constraint, we'd better lock the referenced
+		 * table and check that that's not in use, just as we've already done
+		 * for the constrained table (else we might, eg, be dropping a trigger
+		 * that has unfired events).  But we can/must skip that in the
+		 * self-referential case.
+		 */
+		if (con->contype == CONSTRAINT_FOREIGN &&
+			con->confrelid != RelationGetRelid(rel))
+		{
+			Relation	frel;
+
+			/* Must match lock taken by RemoveTriggerById: */
+			frel = heap_open(con->confrelid, AccessExclusiveLock);
+			CheckTableNotInUse(frel, "ALTER TABLE");
+			heap_close(frel, NoLock);
+		}
+
+		/*
 		 * Perform the actual constraint deletion
 		 */
 		conobj.classId = ConstraintRelationId;
@@ -7960,12 +8001,69 @@
 	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.
+	 * Recurse manually by queueing a new command for each child, if
+	 * necessary. We cannot apply ATSimpleRecursion here because we need to
+	 * remap attribute numbers in the USING expression, if any.
+	 *
+	 * 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);
+	{
+		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");
+
+			/*
+			 * Remap the attribute numbers.  If no USING expression was
+			 * specified, there is no need for this step.
+			 */
+			if (def->cooked_default)
+			{
+				AttrNumber *attmap;
+				bool		found_whole_row;
+
+				/* create a copy to scribble on */
+				cmd = copyObject(cmd);
+
+				attmap = convert_tuples_by_name_map(RelationGetDescr(childrel),
+													RelationGetDescr(rel),
+								 gettext_noop("could not convert row type"));
+				((ColumnDef *) cmd->def)->cooked_default =
+					map_variable_attnos(def->cooked_default,
+										1, 0,
+										attmap, RelationGetDescr(rel)->natts,
+										&found_whole_row);
+				if (found_whole_row)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						  errmsg("cannot convert whole-row table reference"),
+							 errdetail("USING expression contains a whole-row table reference.")));
+				pfree(attmap);
+			}
+			ATPrepCmd(wqueue, childrel, cmd, false, true, lockmode);
+			relation_close(childrel, NoLock);
+		}
+	}
 	else if (!recursing &&
 			 find_inheritance_children(RelationGetRelid(rel), NoLock) != NIL)
 		ereport(ERROR,
@@ -8789,8 +8887,8 @@
 	cmd->objtype = OBJECT_TABCONSTRAINT;
 	cmd->objname = list_make3(
 				   makeString(get_namespace_name(RelationGetNamespace(rel))),
-							  makeString(RelationGetRelationName(rel)),
-							  makeString(conname));
+						   makeString(pstrdup(RelationGetRelationName(rel))),
+							  makeString(pstrdup(conname)));
 	cmd->objargs = NIL;
 	cmd->comment = comment_str;
 
@@ -10260,6 +10358,39 @@
 		}
 	}
 
+	/*
+	 * If the parent has an OID column, so must the child, and we'd better
+	 * update the child's attinhcount and attislocal the same as for normal
+	 * columns.  We needn't check data type or not-nullness though.
+	 */
+	if (tupleDesc->tdhasoid)
+	{
+		/*
+		 * Here we match by column number not name; the match *must* be the
+		 * system column, not some random column named "oid".
+		 */
+		tuple = SearchSysCacheCopy2(ATTNUM,
+							   ObjectIdGetDatum(RelationGetRelid(child_rel)),
+									Int16GetDatum(ObjectIdAttributeNumber));
+		if (HeapTupleIsValid(tuple))
+		{
+			Form_pg_attribute childatt = (Form_pg_attribute) GETSTRUCT(tuple);
+
+			/* See comments above; these changes should be the same */
+			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\"",
+							"oid")));
+		}
+	}
+
 	heap_close(attrrel, RowExclusiveLock);
 }
 
@@ -10342,7 +10473,7 @@
 								RelationGetRelationName(child_rel),
 								NameStr(parent_con->conname))));
 
-			/* If the constraint is "no inherit" then cannot merge */
+			/* If the child constraint is "no inherit" then cannot merge */
 			if (child_con->connoinherit)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -10351,6 +10482,17 @@
 								RelationGetRelationName(child_rel))));
 
 			/*
+			 * If the child constraint is "not valid" then cannot merge with a
+			 * valid parent constraint
+			 */
+			if (parent_con->convalidated && !child_con->convalidated)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\"",
+								NameStr(child_con->conname),
+								RelationGetRelationName(child_rel))));
+
+			/*
 			 * OK, bump the child constraint's inheritance count.  (If we fail
 			 * later on, this change will just roll back.)
 			 */
@@ -11019,10 +11161,20 @@
 		int16		attno = indexRel->rd_index->indkey.values[key];
 		Form_pg_attribute attr;
 
-		/* Of the system columns, only oid is indexable. */
-		if (attno <= 0 && attno != ObjectIdAttributeNumber)
-			elog(ERROR, "internal column %u in unique index \"%s\"",
-				 attno, RelationGetRelationName(indexRel));
+		/* Allow OID column to be indexed; it's certainly not nullable */
+		if (attno == ObjectIdAttributeNumber)
+			continue;
+
+		/*
+		 * Reject any other system columns.  (Going forward, we'll disallow
+		 * indexes containing such columns in the first place, but they might
+		 * exist in older branches.)
+		 */
+		if (attno <= 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
+					 errmsg("index \"%s\" cannot be used as replica identity because column %d is a system column",
+							RelationGetRelationName(indexRel), attno)));
 
 		attr = rel->rd_att->attrs[attno - 1];
 		if (!attr->attnotnull)
@@ -11189,6 +11341,12 @@
 	simple_heap_update(ftrel, &tuple->t_self, tuple);
 	CatalogUpdateIndexes(ftrel, tuple);
 
+	/*
+	 * Invalidate relcache so that all sessions will refresh any cached plans
+	 * that might depend on the old options.
+	 */
+	CacheInvalidateRelcache(rel);
+
 	InvokeObjectPostAlterHook(ForeignTableRelationId,
 							  RelationGetRelid(rel), 0);
 
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/tablespace.c postgresql-9.5-9.5.8/src/backend/commands/tablespace.c
--- postgresql-9.5-9.5.2/src/backend/commands/tablespace.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/tablespace.c	2017-08-07 21:13:41.000000000 +0000
@@ -773,13 +773,26 @@
 remove_symlink:
 	linkloc = pstrdup(linkloc_with_version_dir);
 	get_parent_directory(linkloc);
-	if (lstat(linkloc, &st) == 0 && S_ISDIR(st.st_mode))
+	if (lstat(linkloc, &st) < 0)
+	{
+		int			saved_errno = errno;
+
+		ereport(redo ? LOG : (saved_errno == ENOENT ? WARNING : ERROR),
+				(errcode_for_file_access(),
+				 errmsg("could not stat file \"%s\": %m",
+						linkloc)));
+	}
+	else if (S_ISDIR(st.st_mode))
 	{
 		if (rmdir(linkloc) < 0)
-			ereport(redo ? LOG : ERROR,
+		{
+			int			saved_errno = errno;
+
+			ereport(redo ? LOG : (saved_errno == ENOENT ? WARNING : ERROR),
 					(errcode_for_file_access(),
 					 errmsg("could not remove directory \"%s\": %m",
 							linkloc)));
+		}
 	}
 #ifdef S_ISLNK
 	else if (S_ISLNK(st.st_mode))
@@ -799,7 +812,7 @@
 	{
 		/* Refuse to remove anything that's not a directory or symlink */
 		ereport(redo ? LOG : ERROR,
-				(ERRCODE_SYSTEM_ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("\"%s\" is not a directory or symbolic link",
 						linkloc)));
 	}
@@ -851,7 +864,7 @@
 {
 	struct stat st;
 
-	if (lstat(linkloc, &st) != 0)
+	if (lstat(linkloc, &st) < 0)
 	{
 		if (errno == ENOENT)
 			return;
@@ -863,10 +876,10 @@
 	if (S_ISDIR(st.st_mode))
 	{
 		/*
-		 * This will fail if the directory isn't empty, but not
-		 * if it's a junction point.
+		 * This will fail if the directory isn't empty, but not if it's a
+		 * junction point.
 		 */
-		if (rmdir(linkloc) < 0)
+		if (rmdir(linkloc) < 0 && errno != ENOENT)
 			ereport(ERROR,
 					(errcode_for_file_access(),
 					 errmsg("could not remove directory \"%s\": %m",
@@ -878,7 +891,7 @@
 		if (unlink(linkloc) < 0 && errno != ENOENT)
 			ereport(ERROR,
 					(errcode_for_file_access(),
-						errmsg("could not remove symbolic link \"%s\": %m",
+					 errmsg("could not remove symbolic link \"%s\": %m",
 							linkloc)));
 	}
 #endif
@@ -886,7 +899,8 @@
 	{
 		/* Refuse to remove anything that's not a directory or symlink */
 		ereport(ERROR,
-				(errmsg("\"%s\" is not a directory or symbolic link",
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("\"%s\" is not a directory or symbolic link",
 						linkloc)));
 	}
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/tsearchcmds.c postgresql-9.5-9.5.8/src/backend/commands/tsearchcmds.c
--- postgresql-9.5-9.5.2/src/backend/commands/tsearchcmds.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/tsearchcmds.c	2017-08-07 21:13:41.000000000 +0000
@@ -1215,10 +1215,10 @@
 	/* Update dependencies */
 	makeConfigurationDependencies(tup, true, relMap);
 
-	InvokeObjectPostAlterHook(TSConfigMapRelationId,
+	InvokeObjectPostAlterHook(TSConfigRelationId,
 							  HeapTupleGetOid(tup), 0);
 
-	ObjectAddressSet(address, TSConfigMapRelationId, cfgId);
+	ObjectAddressSet(address, TSConfigRelationId, cfgId);
 
 	heap_close(relMap, RowExclusiveLock);
 
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/vacuum.c postgresql-9.5-9.5.8/src/backend/commands/vacuum.c
--- postgresql-9.5-9.5.2/src/backend/commands/vacuum.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/vacuum.c	2017-08-07 21:13:41.000000000 +0000
@@ -1050,7 +1050,7 @@
 				  TransactionId lastSaneFrozenXid,
 				  MultiXactId lastSaneMinMulti)
 {
-	TransactionId myXID = GetCurrentTransactionId();
+	TransactionId nextXID = ReadNewTransactionId();
 	Relation	relation;
 	HeapScanDesc scan;
 	HeapTuple	tuple;
@@ -1066,6 +1066,12 @@
 	/*
 	 * Scan pg_database to compute the minimum datfrozenxid/datminmxid
 	 *
+	 * Since vac_update_datfrozenxid updates datfrozenxid/datminmxid in-place,
+	 * the values could change while we look at them.  Fetch each one just
+	 * once to ensure sane behavior of the comparison logic.  (Here, as in
+	 * many other places, we assume that fetching or updating an XID in shared
+	 * storage is atomic.)
+	 *
 	 * Note: we need not worry about a race condition with new entries being
 	 * inserted by CREATE DATABASE.  Any such entry will have a copy of some
 	 * existing DB's datfrozenxid, and that source DB cannot be ours because
@@ -1081,10 +1087,12 @@
 
 	while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
 	{
-		Form_pg_database dbform = (Form_pg_database) GETSTRUCT(tuple);
+		volatile FormData_pg_database *dbform = (Form_pg_database) GETSTRUCT(tuple);
+		TransactionId datfrozenxid = dbform->datfrozenxid;
+		TransactionId datminmxid = dbform->datminmxid;
 
-		Assert(TransactionIdIsNormal(dbform->datfrozenxid));
-		Assert(MultiXactIdIsValid(dbform->datminmxid));
+		Assert(TransactionIdIsNormal(datfrozenxid));
+		Assert(MultiXactIdIsValid(datminmxid));
 
 		/*
 		 * If things are working properly, no database should have a
@@ -1095,21 +1103,21 @@
 		 * databases have been scanned and cleaned up.  (We will issue the
 		 * "already wrapped" warning if appropriate, though.)
 		 */
-		if (TransactionIdPrecedes(lastSaneFrozenXid, dbform->datfrozenxid) ||
-			MultiXactIdPrecedes(lastSaneMinMulti, dbform->datminmxid))
+		if (TransactionIdPrecedes(lastSaneFrozenXid, datfrozenxid) ||
+			MultiXactIdPrecedes(lastSaneMinMulti, datminmxid))
 			bogus = true;
 
-		if (TransactionIdPrecedes(myXID, dbform->datfrozenxid))
+		if (TransactionIdPrecedes(nextXID, datfrozenxid))
 			frozenAlreadyWrapped = true;
-		else if (TransactionIdPrecedes(dbform->datfrozenxid, frozenXID))
+		else if (TransactionIdPrecedes(datfrozenxid, frozenXID))
 		{
-			frozenXID = dbform->datfrozenxid;
+			frozenXID = datfrozenxid;
 			oldestxid_datoid = HeapTupleGetOid(tuple);
 		}
 
-		if (MultiXactIdPrecedes(dbform->datminmxid, minMulti))
+		if (MultiXactIdPrecedes(datminmxid, minMulti))
 		{
-			minMulti = dbform->datminmxid;
+			minMulti = datminmxid;
 			minmulti_datoid = HeapTupleGetOid(tuple);
 		}
 	}
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/vacuumlazy.c postgresql-9.5-9.5.8/src/backend/commands/vacuumlazy.c
--- postgresql-9.5-9.5.2/src/backend/commands/vacuumlazy.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/vacuumlazy.c	2017-08-07 21:13:41.000000000 +0000
@@ -106,7 +106,8 @@
 	BlockNumber rel_pages;		/* total number of pages */
 	BlockNumber scanned_pages;	/* number of pages we examined */
 	BlockNumber pinskipped_pages;		/* # of pages we skipped due to a pin */
-	double		scanned_tuples; /* counts only tuples on scanned pages */
+	BlockNumber	tupcount_pages;	/* pages whose tuples we counted */
+	double		scanned_tuples; /* counts only tuples on tupcount_pages */
 	double		old_rel_tuples; /* previous value of pg_class.reltuples */
 	double		new_rel_tuples; /* new estimated total # of tuples */
 	double		new_dead_tuples;	/* new estimated total # of dead tuples */
@@ -286,6 +287,10 @@
 	 * density") with nonzero relpages and reltuples=0 (which means "zero
 	 * tuple density") unless there's some actual evidence for the latter.
 	 *
+	 * It's important that we use tupcount_pages and not scanned_pages for the
+	 * check described above; scanned_pages counts pages where we could not get
+	 * cleanup lock, and which were processed only for frozenxid purposes.
+	 *
 	 * We do update relallvisible even in the corner case, since if the table
 	 * is all-visible we'd definitely like to know that.  But clamp the value
 	 * to be not more than what we're setting relpages to.
@@ -295,7 +300,7 @@
 	 */
 	new_rel_pages = vacrelstats->rel_pages;
 	new_rel_tuples = vacrelstats->new_rel_tuples;
-	if (vacrelstats->scanned_pages == 0 && new_rel_pages > 0)
+	if (vacrelstats->tupcount_pages == 0 && new_rel_pages > 0)
 	{
 		new_rel_pages = vacrelstats->old_rel_pages;
 		new_rel_tuples = vacrelstats->old_rel_tuples;
@@ -474,6 +479,7 @@
 	nblocks = RelationGetNumberOfBlocks(onerel);
 	vacrelstats->rel_pages = nblocks;
 	vacrelstats->scanned_pages = 0;
+	vacrelstats->tupcount_pages = 0;
 	vacrelstats->nonempty_pages = 0;
 	vacrelstats->latestRemovedXid = InvalidTransactionId;
 
@@ -666,6 +672,7 @@
 		}
 
 		vacrelstats->scanned_pages++;
+		vacrelstats->tupcount_pages++;
 
 		page = BufferGetPage(buf);
 
@@ -1074,7 +1081,7 @@
 	/* now we can compute the new value for pg_class.reltuples */
 	vacrelstats->new_rel_tuples = vac_estimate_reltuples(onerel, false,
 														 nblocks,
-												  vacrelstats->scanned_pages,
+												  vacrelstats->tupcount_pages,
 														 num_tuples);
 
 	/*
@@ -1132,8 +1139,7 @@
 									"%u pages are entirely empty.\n",
 									empty_pages),
 					 empty_pages);
-	appendStringInfo(&buf, _("%s."),
-					 pg_rusage_show(&ru0));
+	appendStringInfo(&buf, "%s.", pg_rusage_show(&ru0));
 
 	ereport(elevel,
 			(errmsg("\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u pages",
@@ -1208,8 +1214,7 @@
 			(errmsg("\"%s\": removed %d row versions in %d pages",
 					RelationGetRelationName(onerel),
 					tupindex, npages),
-			 errdetail("%s.",
-					   pg_rusage_show(&ru0))));
+			 errdetail_internal("%s", pg_rusage_show(&ru0))));
 }
 
 /*
@@ -1375,7 +1380,7 @@
 			(errmsg("scanned index \"%s\" to remove %d row versions",
 					RelationGetRelationName(indrel),
 					vacrelstats->num_dead_tuples),
-			 errdetail("%s.", pg_rusage_show(&ru0))));
+			 errdetail_internal("%s", pg_rusage_show(&ru0))));
 }
 
 /*
@@ -1393,7 +1398,7 @@
 
 	ivinfo.index = indrel;
 	ivinfo.analyze_only = false;
-	ivinfo.estimated_count = (vacrelstats->scanned_pages < vacrelstats->rel_pages);
+	ivinfo.estimated_count = (vacrelstats->tupcount_pages < vacrelstats->rel_pages);
 	ivinfo.message_level = elevel;
 	ivinfo.num_heap_tuples = vacrelstats->new_rel_tuples;
 	ivinfo.strategy = vac_strategy;
@@ -1484,7 +1489,7 @@
 				return;
 			}
 
-			pg_usleep(VACUUM_TRUNCATE_LOCK_WAIT_INTERVAL);
+			pg_usleep(VACUUM_TRUNCATE_LOCK_WAIT_INTERVAL * 1000L);
 		}
 
 		/*
@@ -1547,7 +1552,7 @@
 				(errmsg("\"%s\": truncated %u to %u pages",
 						RelationGetRelationName(onerel),
 						old_rel_pages, new_rel_pages),
-				 errdetail("%s.",
+				 errdetail_internal("%s",
 						   pg_rusage_show(&ru0))));
 		old_rel_pages = new_rel_pages;
 	} while (new_rel_pages > vacrelstats->nonempty_pages &&
diff -Nru postgresql-9.5-9.5.2/src/backend/commands/view.c postgresql-9.5-9.5.8/src/backend/commands/view.c
--- postgresql-9.5-9.5.2/src/backend/commands/view.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/commands/view.c	2017-08-07 21:13:41.000000000 +0000
@@ -59,15 +59,13 @@
 /*---------------------------------------------------------------------
  * DefineVirtualRelation
  *
- * Create the "view" relation. `DefineRelation' does all the work,
- * we just provide the correct arguments ... at least when we're
- * creating a view.  If we're updating an existing view, we have to
- * work harder.
+ * Create a view relation and use the rules system to store the query
+ * for the view.
  *---------------------------------------------------------------------
  */
 static ObjectAddress
 DefineVirtualRelation(RangeVar *relation, List *tlist, bool replace,
-					  List *options)
+					  List *options, Query *viewParse)
 {
 	Oid			viewOid;
 	LOCKMODE	lockmode;
@@ -82,25 +80,14 @@
 	attrList = NIL;
 	foreach(t, tlist)
 	{
-		TargetEntry *tle = lfirst(t);
+		TargetEntry *tle = (TargetEntry *) 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);
-			def->location = -1;
+			ColumnDef  *def = makeColumnDef(tle->resname,
+											exprType((Node *) tle->expr),
+											exprTypmod((Node *) tle->expr),
+										  exprCollation((Node *) tle->expr));
 
 			/*
 			 * It's possible that the column is of a collatable type but the
@@ -117,7 +104,6 @@
 			}
 			else
 				Assert(!OidIsValid(def->collOid));
-			def->constraints = NIL;
 
 			attrList = lappend(attrList, def);
 		}
@@ -174,18 +160,13 @@
 		checkViewTupleDesc(descriptor, rel->rd_att);
 
 		/*
-		 * The new options list replaces the existing options list, even if
-		 * it's empty.
-		 */
-		atcmd = makeNode(AlterTableCmd);
-		atcmd->subtype = AT_ReplaceRelOptions;
-		atcmd->def = (Node *) options;
-		atcmds = lappend(atcmds, atcmd);
-
-		/*
 		 * 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.
+		 *
+		 * Note that we must do this before updating the query for the view,
+		 * since the rules system requires that the correct view columns be in
+		 * place when defining the new rules.
 		 */
 		if (list_length(attrList) > rel->rd_att->natts)
 		{
@@ -204,9 +185,38 @@
 				atcmd->def = (Node *) lfirst(c);
 				atcmds = lappend(atcmds, atcmd);
 			}
+
+			AlterTableInternal(viewOid, atcmds, true);
+
+			/* Make the new view columns visible */
+			CommandCounterIncrement();
 		}
 
-		/* OK, let's do it. */
+		/*
+		 * Update the query for the view.
+		 *
+		 * Note that we must do this before updating the view options, because
+		 * the new options may not be compatible with the old view query (for
+		 * example if we attempt to add the WITH CHECK OPTION, we require that
+		 * the new view be automatically updatable, but the old view may not
+		 * have been).
+		 */
+		StoreViewQuery(viewOid, viewParse, replace);
+
+		/* Make the new view query visible */
+		CommandCounterIncrement();
+
+		/*
+		 * Finally update the view options.
+		 *
+		 * The new options list replaces the existing options list, even if
+		 * it's empty.
+		 */
+		atcmd = makeNode(AlterTableCmd);
+		atcmd->subtype = AT_ReplaceRelOptions;
+		atcmd->def = (Node *) options;
+		atcmds = list_make1(atcmd);
+
 		AlterTableInternal(viewOid, atcmds, true);
 
 		ObjectAddressSet(address, RelationRelationId, viewOid);
@@ -223,7 +233,7 @@
 		ObjectAddress address;
 
 		/*
-		 * now set the parameters for keys/inheritance etc. All of these are
+		 * Set the parameters for keys/inheritance etc. All of these are
 		 * uninteresting for views...
 		 */
 		createStmt->relation = relation;
@@ -236,12 +246,19 @@
 		createStmt->if_not_exists = false;
 
 		/*
-		 * finally create the relation (this will error out if there's an
-		 * existing view, so we don't need more code to complain if "replace"
-		 * is false).
+		 * Create the relation (this will error out if there's an existing
+		 * view, so we don't need more code to complain if "replace" is
+		 * false).
 		 */
 		address = DefineRelation(createStmt, RELKIND_VIEW, InvalidOid, NULL);
 		Assert(address.objectId != InvalidOid);
+
+		/* Make the new view relation visible */
+		CommandCounterIncrement();
+
+		/* Store the query for the view */
+		StoreViewQuery(address.objectId, viewParse, replace);
+
 		return address;
 	}
 }
@@ -541,16 +558,7 @@
 	 * aborted.
 	 */
 	address = DefineVirtualRelation(view, viewParse->targetList,
-									stmt->replace, stmt->options);
-
-	/*
-	 * 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();
-
-	StoreViewQuery(address.objectId, viewParse, stmt->replace);
+									stmt->replace, stmt->options, viewParse);
 
 	return address;
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/execIndexing.c postgresql-9.5-9.5.8/src/backend/executor/execIndexing.c
--- postgresql-9.5-9.5.2/src/backend/executor/execIndexing.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/execIndexing.c	2017-08-07 21:13:41.000000000 +0000
@@ -119,7 +119,7 @@
 {
 	CEOUC_WAIT,
 	CEOUC_NOWAIT,
-	CEOUC_LIVELOCK_PREVENTING_WAIT,
+	CEOUC_LIVELOCK_PREVENTING_WAIT
 } CEOUC_WAIT_MODE;
 
 static bool check_exclusion_or_unique_constraint(Relation heap, Relation index,
@@ -259,6 +259,9 @@
  *		the same is done for non-deferred constraints, but report
  *		if conflict was speculative or deferred conflict to caller)
  *
+ *		If 'arbiterIndexes' is nonempty, noDupErr applies only to
+ *		those indexes.  NIL means noDupErr applies to all indexes.
+ *
  *		CAUTION: this must not be called for a HOT update.
  *		We can't defend against that here for lack of info.
  *		Should we change the API to make it safer?
@@ -308,19 +311,15 @@
 	{
 		Relation	indexRelation = relationDescs[i];
 		IndexInfo  *indexInfo;
+		bool		applyNoDupErr;
 		IndexUniqueCheck checkUnique;
 		bool		satisfiesConstraint;
-		bool		arbiter;
 
 		if (indexRelation == NULL)
 			continue;
 
 		indexInfo = indexInfoArray[i];
 
-		/* Record if speculative insertion arbiter */
-		arbiter = list_member_oid(arbiterIndexes,
-								  indexRelation->rd_index->indexrelid);
-
 		/* If the index is marked as read-only, ignore it */
 		if (!indexInfo->ii_ReadyForInserts)
 			continue;
@@ -358,6 +357,12 @@
 					   values,
 					   isnull);
 
+		/* Check whether to apply noDupErr to this index */
+		applyNoDupErr = noDupErr &&
+			(arbiterIndexes == NIL ||
+			 list_member_oid(arbiterIndexes,
+							 indexRelation->rd_index->indexrelid));
+
 		/*
 		 * The index AM does the actual insertion, plus uniqueness checking.
 		 *
@@ -373,7 +378,7 @@
 		 */
 		if (!indexRelation->rd_index->indisunique)
 			checkUnique = UNIQUE_CHECK_NO;
-		else if (noDupErr && (arbiterIndexes == NIL || arbiter))
+		else if (applyNoDupErr)
 			checkUnique = UNIQUE_CHECK_PARTIAL;
 		else if (indexRelation->rd_index->indimmediate)
 			checkUnique = UNIQUE_CHECK_YES;
@@ -407,7 +412,7 @@
 			bool		violationOK;
 			CEOUC_WAIT_MODE waitMode;
 
-			if (noDupErr)
+			if (applyNoDupErr)
 			{
 				violationOK = true;
 				waitMode = CEOUC_LIVELOCK_PREVENTING_WAIT;
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/execMain.c postgresql-9.5-9.5.8/src/backend/executor/execMain.c
--- postgresql-9.5-9.5.2/src/backend/executor/execMain.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/execMain.c	2017-08-07 21:13:41.000000000 +0000
@@ -1793,8 +1793,8 @@
 					 * the permissions on the relation (that is, if the user
 					 * could view it directly anyway).  For RLS violations, we
 					 * don't include the data since we don't know if the user
-					 * should be able to view the tuple as as that depends on
-					 * the USING policy.
+					 * should be able to view the tuple as that depends on the
+					 * USING policy.
 					 */
 				case WCO_VIEW_CHECK:
 					insertedCols = GetInsertedColumns(resultRelInfo, estate);
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/execQual.c postgresql-9.5-9.5.8/src/backend/executor/execQual.c
--- postgresql-9.5-9.5.2/src/backend/executor/execQual.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/execQual.c	2017-08-07 21:13:41.000000000 +0000
@@ -2943,19 +2943,36 @@
 
 	/*
 	 * If there's a test expression, we have to evaluate it and save the value
-	 * where the CaseTestExpr placeholders can find it. We must save and
+	 * where the CaseTestExpr placeholders can find it.  We must save and
 	 * restore prior setting of econtext's caseValue fields, in case this node
-	 * is itself within a larger CASE.
+	 * is itself within a larger CASE.  Furthermore, don't assign to the
+	 * econtext fields until after returning from evaluation of the test
+	 * expression.  We used to pass &econtext->caseValue_isNull to the
+	 * recursive call, but that leads to aliasing that variable within said
+	 * call, which can (and did) produce bugs when the test expression itself
+	 * contains a CASE.
+	 *
+	 * If there's no test expression, we don't actually need to save and
+	 * restore these fields; but it's less code to just do so unconditionally.
 	 */
 	save_datum = econtext->caseValue_datum;
 	save_isNull = econtext->caseValue_isNull;
 
 	if (caseExpr->arg)
 	{
-		econtext->caseValue_datum = ExecEvalExpr(caseExpr->arg,
-												 econtext,
-												 &econtext->caseValue_isNull,
-												 NULL);
+		Datum		arg_value;
+		bool		arg_isNull;
+
+		arg_value = ExecEvalExpr(caseExpr->arg,
+								 econtext,
+								 &arg_isNull,
+								 NULL);
+		/* Since caseValue_datum may be read multiple times, force to R/O */
+		econtext->caseValue_datum =
+			MakeExpandedObjectReadOnly(arg_value,
+									   arg_isNull,
+									   caseExpr->argtyplen);
+		econtext->caseValue_isNull = arg_isNull;
 	}
 
 	/*
@@ -2967,10 +2984,11 @@
 	{
 		CaseWhenState *wclause = lfirst(clause);
 		Datum		clause_value;
+		bool		clause_isNull;
 
 		clause_value = ExecEvalExpr(wclause->expr,
 									econtext,
-									isNull,
+									&clause_isNull,
 									NULL);
 
 		/*
@@ -2978,7 +2996,7 @@
 		 * statement is satisfied.  A NULL result from the test is not
 		 * considered true.
 		 */
-		if (DatumGetBool(clause_value) && !*isNull)
+		if (DatumGetBool(clause_value) && !clause_isNull)
 		{
 			econtext->caseValue_datum = save_datum;
 			econtext->caseValue_isNull = save_isNull;
@@ -3793,6 +3811,21 @@
 
 	if (ntest->argisrow && !(*isNull))
 	{
+		/*
+		 * The SQL standard defines IS [NOT] NULL for a non-null rowtype
+		 * argument as:
+		 *
+		 * "R IS NULL" is true if every field is the null value.
+		 *
+		 * "R IS NOT NULL" is true if no field is the null value.
+		 *
+		 * This definition is (apparently intentionally) not recursive; so our
+		 * tests on the fields are primitive attisnull tests, not recursive
+		 * checks to see if they are all-nulls or no-nulls rowtypes.
+		 *
+		 * The standard does not consider the possibility of zero-field rows,
+		 * but here we consider them to vacuously satisfy both predicates.
+		 */
 		HeapTupleHeader tuple;
 		Oid			tupType;
 		int32		tupTypmod;
@@ -3999,11 +4032,18 @@
 					 * nodes. We must save and restore prior setting of
 					 * econtext's domainValue fields, in case this node is
 					 * itself within a check expression for another domain.
+					 *
+					 * Also, if we are working with a read-write expanded
+					 * datum, be sure that what we pass to CHECK expressions
+					 * is a read-only pointer; else called functions might
+					 * modify or even delete the expanded object.
 					 */
 					save_datum = econtext->domainValue_datum;
 					save_isNull = econtext->domainValue_isNull;
 
-					econtext->domainValue_datum = result;
+					econtext->domainValue_datum =
+						MakeExpandedObjectReadOnly(result, *isNull,
+									 cstate->constraint_ref->tcache->typlen);
 					econtext->domainValue_isNull = *isNull;
 
 					conResult = ExecEvalExpr(con->check_expr,
@@ -4831,6 +4871,8 @@
 				}
 				cstate->args = outlist;
 				cstate->defresult = ExecInitExpr(caseexpr->defresult, parent);
+				if (caseexpr->arg)
+					cstate->argtyplen = get_typlen(exprType((Node *) caseexpr->arg));
 				state = (ExprState *) cstate;
 			}
 			break;
@@ -5333,15 +5375,24 @@
  * of *isDone = ExprMultipleResult signifies a set element, and a return
  * of *isDone = ExprEndResult signifies end of the set of tuple.
  * We assume that *isDone has been initialized to ExprSingleResult by caller.
+ *
+ * Since fields of the result tuple might be multiply referenced in higher
+ * plan nodes, we have to force any read/write expanded values to read-only
+ * status.  It's a bit annoying to have to do that for every projected
+ * expression; in the future, consider teaching the planner to detect
+ * actually-multiply-referenced Vars and insert an expression node that
+ * would do that only where really required.
  */
 static bool
 ExecTargetList(List *targetlist,
+			   TupleDesc tupdesc,
 			   ExprContext *econtext,
 			   Datum *values,
 			   bool *isnull,
 			   ExprDoneCond *itemIsDone,
 			   ExprDoneCond *isDone)
 {
+	Form_pg_attribute *att = tupdesc->attrs;
 	MemoryContext oldContext;
 	ListCell   *tl;
 	bool		haveDoneSets;
@@ -5367,6 +5418,10 @@
 									  &isnull[resind],
 									  &itemIsDone[resind]);
 
+		values[resind] = MakeExpandedObjectReadOnly(values[resind],
+													isnull[resind],
+													att[resind]->attlen);
+
 		if (itemIsDone[resind] != ExprSingleResult)
 		{
 			/* We have a set-valued expression in the tlist */
@@ -5420,6 +5475,10 @@
 												  &isnull[resind],
 												  &itemIsDone[resind]);
 
+					values[resind] = MakeExpandedObjectReadOnly(values[resind],
+															  isnull[resind],
+														att[resind]->attlen);
+
 					if (itemIsDone[resind] == ExprEndResult)
 					{
 						/*
@@ -5453,6 +5512,7 @@
 													  econtext,
 													  &isnull[resind],
 													  &itemIsDone[resind]);
+						/* no need for MakeExpandedObjectReadOnly */
 					}
 				}
 
@@ -5578,6 +5638,7 @@
 	if (projInfo->pi_targetlist)
 	{
 		if (!ExecTargetList(projInfo->pi_targetlist,
+							slot->tts_tupleDescriptor,
 							econtext,
 							slot->tts_values,
 							slot->tts_isnull,
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/execTuples.c postgresql-9.5-9.5.8/src/backend/executor/execTuples.c
--- postgresql-9.5-9.5.2/src/backend/executor/execTuples.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/execTuples.c	2017-08-07 21:13:41.000000000 +0000
@@ -88,7 +88,6 @@
 #include "nodes/nodeFuncs.h"
 #include "storage/bufmgr.h"
 #include "utils/builtins.h"
-#include "utils/expandeddatum.h"
 #include "utils/lsyscache.h"
 #include "utils/typcache.h"
 
@@ -813,52 +812,6 @@
 	return ExecStoreTuple(newTuple, dstslot, InvalidBuffer, true);
 }
 
-/* --------------------------------
- *		ExecMakeSlotContentsReadOnly
- *			Mark any R/W expanded datums in the slot as read-only.
- *
- * This is needed when a slot that might contain R/W datum references is to be
- * used as input for general expression evaluation.  Since the expression(s)
- * might contain more than one Var referencing the same R/W datum, we could
- * get wrong answers if functions acting on those Vars thought they could
- * modify the expanded value in-place.
- *
- * For notational reasons, we return the same slot passed in.
- * --------------------------------
- */
-TupleTableSlot *
-ExecMakeSlotContentsReadOnly(TupleTableSlot *slot)
-{
-	/*
-	 * sanity checks
-	 */
-	Assert(slot != NULL);
-	Assert(slot->tts_tupleDescriptor != NULL);
-	Assert(!slot->tts_isempty);
-
-	/*
-	 * If the slot contains a physical tuple, it can't contain any expanded
-	 * datums, because we flatten those when making a physical tuple.  This
-	 * might change later; but for now, we need do nothing unless the slot is
-	 * virtual.
-	 */
-	if (slot->tts_tuple == NULL)
-	{
-		Form_pg_attribute *att = slot->tts_tupleDescriptor->attrs;
-		int			attnum;
-
-		for (attnum = 0; attnum < slot->tts_nvalid; attnum++)
-		{
-			slot->tts_values[attnum] =
-				MakeExpandedObjectReadOnly(slot->tts_values[attnum],
-										   slot->tts_isnull[attnum],
-										   att[attnum]->attlen);
-		}
-	}
-
-	return slot;
-}
-
 
 /* ----------------------------------------------------------------
  *				convenience initialization routines
@@ -1325,33 +1278,32 @@
  * Should only be used with a single-TEXT-attribute tupdesc.
  */
 void
-do_text_output_multiline(TupOutputState *tstate, char *text)
+do_text_output_multiline(TupOutputState *tstate, const char *txt)
 {
 	Datum		values[1];
 	bool		isnull[1] = {false};
 
-	while (*text)
+	while (*txt)
 	{
-		char	   *eol;
+		const char *eol;
 		int			len;
 
-		eol = strchr(text, '\n');
+		eol = strchr(txt, '\n');
 		if (eol)
 		{
-			len = eol - text;
-
+			len = eol - txt;
 			eol++;
 		}
 		else
 		{
-			len = strlen(text);
-			eol += len;
+			len = strlen(txt);
+			eol = txt + len;
 		}
 
-		values[0] = PointerGetDatum(cstring_to_text_with_len(text, len));
+		values[0] = PointerGetDatum(cstring_to_text_with_len(txt, len));
 		do_tup_output(tstate, values, isnull);
 		pfree(DatumGetPointer(values[0]));
-		text = eol;
+		txt = eol;
 	}
 }
 
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/functions.c postgresql-9.5-9.5.8/src/backend/executor/functions.c
--- postgresql-9.5-9.5.2/src/backend/executor/functions.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/functions.c	2017-08-07 21:13:41.000000000 +0000
@@ -498,7 +498,16 @@
 			else
 				stmt = (Node *) pg_plan_query(queryTree, 0, NULL);
 
-			/* Precheck all commands for validity in a function */
+			/*
+			 * Precheck all commands for validity in a function.  This should
+			 * generally match the restrictions spi.c applies.
+			 */
+			if (IsA(stmt, CopyStmt) &&
+				((CopyStmt *) stmt)->filename == NULL)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					errmsg("cannot COPY to/from client in a SQL function")));
+
 			if (IsA(stmt, TransactionStmt))
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/nodeAgg.c postgresql-9.5-9.5.8/src/backend/executor/nodeAgg.c
--- postgresql-9.5-9.5.2/src/backend/executor/nodeAgg.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/nodeAgg.c	2017-08-07 21:13:41.000000000 +0000
@@ -72,10 +72,13 @@
  *	  transition value or a previous function result, and in either case its
  *	  value need not be preserved.  See int8inc() for an example.  Notice that
  *	  advance_transition_function() is coded to avoid a data copy step when
- *	  the previous transition value pointer is returned.  Also, some
- *	  transition functions want to store working state in addition to the
- *	  nominal transition value; they can use the memory context returned by
- *	  AggCheckCallContext() to do that.
+ *	  the previous transition value pointer is returned.  It is also possible
+ *	  to avoid repeated data copying when the transition value is an expanded
+ *	  object: to do that, the transition function must take care to return
+ *	  an expanded object that is in a child context of the memory context
+ *	  returned by AggCheckCallContext().  Also, some transition functions want
+ *	  to store working state in addition to the nominal transition value; they
+ *	  can use the memory context returned by AggCheckCallContext() to do that.
  *
  *	  Note: AggCheckCallContext() is available as of PostgreSQL 9.0.  The
  *	  AggState is available as context in earlier releases (back to 8.1),
@@ -694,8 +697,10 @@
 
 	/*
 	 * If pass-by-ref datatype, must copy the new value into aggcontext and
-	 * pfree the prior transValue.  But if transfn returned a pointer to its
-	 * first input, we don't need to do anything.
+	 * free the prior transValue.  But if transfn returned a pointer to its
+	 * first input, we don't need to do anything.  Also, if transfn returned a
+	 * pointer to a R/W expanded object that is already a child of the
+	 * aggcontext, assume we can adopt that value without copying it.
 	 */
 	if (!peraggstate->transtypeByVal &&
 		DatumGetPointer(newVal) != DatumGetPointer(pergroupstate->transValue))
@@ -703,12 +708,25 @@
 		if (!fcinfo->isnull)
 		{
 			MemoryContextSwitchTo(aggstate->aggcontexts[aggstate->current_set]->ecxt_per_tuple_memory);
-			newVal = datumCopy(newVal,
-							   peraggstate->transtypeByVal,
-							   peraggstate->transtypeLen);
+			if (DatumIsReadWriteExpandedObject(newVal,
+											   false,
+											   peraggstate->transtypeLen) &&
+				MemoryContextGetParent(DatumGetEOHP(newVal)->eoh_context) == CurrentMemoryContext)
+				 /* do nothing */ ;
+			else
+				newVal = datumCopy(newVal,
+								   peraggstate->transtypeByVal,
+								   peraggstate->transtypeLen);
 		}
 		if (!pergroupstate->transValueIsNull)
-			pfree(DatumGetPointer(pergroupstate->transValue));
+		{
+			if (DatumIsReadWriteExpandedObject(pergroupstate->transValue,
+											   false,
+											   peraggstate->transtypeLen))
+				DeleteExpandedObject(pergroupstate->transValue);
+			else
+				pfree(DatumGetPointer(pergroupstate->transValue));
+		}
 	}
 
 	pergroupstate->transValue = newVal;
@@ -1059,7 +1077,9 @@
 								 (void *) aggstate, NULL);
 
 		/* Fill in the transition state value */
-		fcinfo.arg[0] = pergroupstate->transValue;
+		fcinfo.arg[0] = MakeExpandedObjectReadOnly(pergroupstate->transValue,
+											 pergroupstate->transValueIsNull,
+												   peraggstate->transtypeLen);
 		fcinfo.argnull[0] = pergroupstate->transValueIsNull;
 		anynull |= pergroupstate->transValueIsNull;
 
@@ -1086,6 +1106,7 @@
 	}
 	else
 	{
+		/* Don't need MakeExpandedObjectReadOnly; datumCopy will copy it */
 		*resultVal = pergroupstate->transValue;
 		*resultIsNull = pergroupstate->transValueIsNull;
 	}
@@ -2666,11 +2687,13 @@
 			return;
 
 		/*
-		 * If we do have the hash table and the subplan does not have any
-		 * parameter changes, then we can just rescan the existing hash table;
-		 * no need to build it again.
+		 * If we do have the hash table, and the subplan does not have any
+		 * parameter changes, and none of our own parameter changes affect
+		 * input expressions of the aggregated functions, then we can just
+		 * rescan the existing hash table; no need to build it again.
 		 */
-		if (outerPlan->chgParam == NULL)
+		if (outerPlan->chgParam == NULL &&
+			!bms_overlap(node->ss.ps.chgParam, aggnode->aggParams))
 		{
 			ResetTupleHashIterator(node->hashtable, &node->hashiter);
 			return;
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/nodeCtescan.c postgresql-9.5-9.5.8/src/backend/executor/nodeCtescan.c
--- postgresql-9.5-9.5.2/src/backend/executor/nodeCtescan.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/nodeCtescan.c	2017-08-07 21:13:41.000000000 +0000
@@ -224,9 +224,13 @@
 	{
 		/* Not the leader */
 		Assert(IsA(scanstate->leader, CteScanState));
+		/* Create my own read pointer, and ensure it is at start */
 		scanstate->readptr =
 			tuplestore_alloc_read_pointer(scanstate->leader->cte_table,
 										  scanstate->eflags);
+		tuplestore_select_read_pointer(scanstate->leader->cte_table,
+									   scanstate->readptr);
+		tuplestore_rescan(scanstate->leader->cte_table);
 	}
 
 	/*
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/nodeHash.c postgresql-9.5-9.5.8/src/backend/executor/nodeHash.c
--- postgresql-9.5-9.5.2/src/backend/executor/nodeHash.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/nodeHash.c	2017-08-07 21:13:41.000000000 +0000
@@ -724,6 +724,9 @@
 
 			/* next tuple in this chunk */
 			idx += MAXALIGN(hashTupleSize);
+
+			/* allow this loop to be cancellable */
+			CHECK_FOR_INTERRUPTS();
 		}
 
 		/* we're done with this chunk - free it and proceed to the next one */
@@ -1602,6 +1605,9 @@
 		}
 
 		hashTuple = nextHashTuple;
+
+		/* allow this loop to be cancellable */
+		CHECK_FOR_INTERRUPTS();
 	}
 
 	/*
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/nodeHashjoin.c postgresql-9.5-9.5.8/src/backend/executor/nodeHashjoin.c
--- postgresql-9.5-9.5.2/src/backend/executor/nodeHashjoin.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/nodeHashjoin.c	2017-08-07 21:13:41.000000000 +0000
@@ -912,6 +912,13 @@
 	MinimalTuple tuple;
 
 	/*
+	 * We check for interrupts here because this is typically taken as an
+	 * alternative code path to an ExecProcNode() call, which would include
+	 * such a check.
+	 */
+	CHECK_FOR_INTERRUPTS();
+
+	/*
 	 * Since both the hash value and the MinimalTuple length word are uint32,
 	 * we can read them both in one BufFileRead() call without any type
 	 * cheating.
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/nodeIndexscan.c postgresql-9.5-9.5.8/src/backend/executor/nodeIndexscan.c
--- postgresql-9.5-9.5.2/src/backend/executor/nodeIndexscan.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/nodeIndexscan.c	2017-08-07 21:13:41.000000000 +0000
@@ -966,9 +966,20 @@
 			Oid			orderbyop = lfirst_oid(lco);
 			Node	   *orderbyexpr = (Node *) lfirst(lcx);
 			Oid			orderbyType = exprType(orderbyexpr);
+			Oid			orderbyColl = exprCollation(orderbyexpr);
+			SortSupport orderbysort = &indexstate->iss_SortSupport[i];
+
+			/* Initialize sort support */
+			orderbysort->ssup_cxt = CurrentMemoryContext;
+			orderbysort->ssup_collation = orderbyColl;
+			/* See cmp_orderbyvals() comments on NULLS LAST */
+			orderbysort->ssup_nulls_first = false;
+			/* ssup_attno is unused here and elsewhere */
+			orderbysort->ssup_attno = 0;
+			/* No abbreviation */
+			orderbysort->abbreviate = false;
+			PrepareSortSupportFromOrderingOp(orderbyop, orderbysort);
 
-			PrepareSortSupportFromOrderingOp(orderbyop,
-											 &indexstate->iss_SortSupport[i]);
 			get_typlenbyval(orderbyType,
 							&indexstate->iss_OrderByTypLens[i],
 							&indexstate->iss_OrderByTypByVals[i]);
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/nodeModifyTable.c postgresql-9.5-9.5.8/src/backend/executor/nodeModifyTable.c
--- postgresql-9.5-9.5.2/src/backend/executor/nodeModifyTable.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/nodeModifyTable.c	2017-08-07 21:13:41.000000000 +0000
@@ -177,10 +177,25 @@
 	if (!IsolationUsesXactSnapshot())
 		return;
 
+	/*
+	 * We need buffer pin and lock to call HeapTupleSatisfiesVisibility.
+	 * Caller should be holding pin, but not lock.
+	 */
+	LockBuffer(buffer, BUFFER_LOCK_SHARE);
 	if (!HeapTupleSatisfiesVisibility(tuple, estate->es_snapshot, buffer))
-		ereport(ERROR,
-				(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
+	{
+		/*
+		 * We should not raise a serialization failure if the conflict is
+		 * against a tuple inserted by our own transaction, even if it's not
+		 * visible to our snapshot.  (This would happen, for example, if
+		 * conflicting keys are proposed for insertion in a single command.)
+		 */
+		if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmin(tuple->t_data)))
+			ereport(ERROR,
+					(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 			 errmsg("could not serialize access due to concurrent update")));
+	}
+	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 }
 
 /*
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/nodeSubqueryscan.c postgresql-9.5-9.5.8/src/backend/executor/nodeSubqueryscan.c
--- postgresql-9.5-9.5.2/src/backend/executor/nodeSubqueryscan.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/nodeSubqueryscan.c	2017-08-07 21:13:41.000000000 +0000
@@ -56,15 +56,7 @@
 	 * We just return the subplan's result slot, rather than expending extra
 	 * cycles for ExecCopySlot().  (Our own ScanTupleSlot is used only for
 	 * EvalPlanQual rechecks.)
-	 *
-	 * We do need to mark the slot contents read-only to prevent interference
-	 * between different functions reading the same datum from the slot. It's
-	 * a bit hokey to do this to the subplan's slot, but should be safe
-	 * enough.
 	 */
-	if (!TupIsNull(slot))
-		slot = ExecMakeSlotContentsReadOnly(slot);
-
 	return slot;
 }
 
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/nodeValuesscan.c postgresql-9.5-9.5.8/src/backend/executor/nodeValuesscan.c
--- postgresql-9.5-9.5.2/src/backend/executor/nodeValuesscan.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/nodeValuesscan.c	2017-08-07 21:13:41.000000000 +0000
@@ -25,6 +25,7 @@
 
 #include "executor/executor.h"
 #include "executor/nodeValuesscan.h"
+#include "utils/expandeddatum.h"
 
 
 static TupleTableSlot *ValuesNext(ValuesScanState *node);
@@ -94,6 +95,7 @@
 		List	   *exprstatelist;
 		Datum	   *values;
 		bool	   *isnull;
+		Form_pg_attribute *att;
 		ListCell   *lc;
 		int			resind;
 
@@ -129,6 +131,7 @@
 		 */
 		values = slot->tts_values;
 		isnull = slot->tts_isnull;
+		att = slot->tts_tupleDescriptor->attrs;
 
 		resind = 0;
 		foreach(lc, exprstatelist)
@@ -139,6 +142,17 @@
 										  econtext,
 										  &isnull[resind],
 										  NULL);
+
+			/*
+			 * We must force any R/W expanded datums to read-only state, in
+			 * case they are multiply referenced in the plan node's output
+			 * expressions, or in case we skip the output projection and the
+			 * output column is multiply referenced in higher plan nodes.
+			 */
+			values[resind] = MakeExpandedObjectReadOnly(values[resind],
+														isnull[resind],
+														att[resind]->attlen);
+
 			resind++;
 		}
 
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/nodeWindowAgg.c postgresql-9.5-9.5.8/src/backend/executor/nodeWindowAgg.c
--- postgresql-9.5-9.5.2/src/backend/executor/nodeWindowAgg.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/nodeWindowAgg.c	2017-08-07 21:13:41.000000000 +0000
@@ -354,7 +354,7 @@
 
 	/*
 	 * We must track the number of rows included in transValue, since to
-	 * remove the last input, advance_windowaggregate_base() musn't call the
+	 * remove the last input, advance_windowaggregate_base() mustn't call the
 	 * inverse transition function, but simply reset transValue back to its
 	 * initial value.
 	 */
@@ -362,8 +362,10 @@
 
 	/*
 	 * If pass-by-ref datatype, must copy the new value into aggcontext and
-	 * pfree the prior transValue.  But if transfn returned a pointer to its
-	 * first input, we don't need to do anything.
+	 * free the prior transValue.  But if transfn returned a pointer to its
+	 * first input, we don't need to do anything.  Also, if transfn returned a
+	 * pointer to a R/W expanded object that is already a child of the
+	 * aggcontext, assume we can adopt that value without copying it.
 	 */
 	if (!peraggstate->transtypeByVal &&
 		DatumGetPointer(newVal) != DatumGetPointer(peraggstate->transValue))
@@ -371,12 +373,25 @@
 		if (!fcinfo->isnull)
 		{
 			MemoryContextSwitchTo(peraggstate->aggcontext);
-			newVal = datumCopy(newVal,
-							   peraggstate->transtypeByVal,
-							   peraggstate->transtypeLen);
+			if (DatumIsReadWriteExpandedObject(newVal,
+											   false,
+											   peraggstate->transtypeLen) &&
+				MemoryContextGetParent(DatumGetEOHP(newVal)->eoh_context) == CurrentMemoryContext)
+				 /* do nothing */ ;
+			else
+				newVal = datumCopy(newVal,
+								   peraggstate->transtypeByVal,
+								   peraggstate->transtypeLen);
 		}
 		if (!peraggstate->transValueIsNull)
-			pfree(DatumGetPointer(peraggstate->transValue));
+		{
+			if (DatumIsReadWriteExpandedObject(peraggstate->transValue,
+											   false,
+											   peraggstate->transtypeLen))
+				DeleteExpandedObject(peraggstate->transValue);
+			else
+				pfree(DatumGetPointer(peraggstate->transValue));
+		}
 	}
 
 	MemoryContextSwitchTo(oldContext);
@@ -513,8 +528,10 @@
 
 	/*
 	 * If pass-by-ref datatype, must copy the new value into aggcontext and
-	 * pfree the prior transValue.  But if invtransfn returned a pointer to
-	 * its first input, we don't need to do anything.
+	 * free the prior transValue.  But if invtransfn returned a pointer to its
+	 * first input, we don't need to do anything.  Also, if invtransfn
+	 * returned a pointer to a R/W expanded object that is already a child of
+	 * the aggcontext, assume we can adopt that value without copying it.
 	 *
 	 * Note: the checks for null values here will never fire, but it seems
 	 * best to have this stanza look just like advance_windowaggregate.
@@ -525,12 +542,25 @@
 		if (!fcinfo->isnull)
 		{
 			MemoryContextSwitchTo(peraggstate->aggcontext);
-			newVal = datumCopy(newVal,
-							   peraggstate->transtypeByVal,
-							   peraggstate->transtypeLen);
+			if (DatumIsReadWriteExpandedObject(newVal,
+											   false,
+											   peraggstate->transtypeLen) &&
+				MemoryContextGetParent(DatumGetEOHP(newVal)->eoh_context) == CurrentMemoryContext)
+				 /* do nothing */ ;
+			else
+				newVal = datumCopy(newVal,
+								   peraggstate->transtypeByVal,
+								   peraggstate->transtypeLen);
 		}
 		if (!peraggstate->transValueIsNull)
-			pfree(DatumGetPointer(peraggstate->transValue));
+		{
+			if (DatumIsReadWriteExpandedObject(peraggstate->transValue,
+											   false,
+											   peraggstate->transtypeLen))
+				DeleteExpandedObject(peraggstate->transValue);
+			else
+				pfree(DatumGetPointer(peraggstate->transValue));
+		}
 	}
 
 	MemoryContextSwitchTo(oldContext);
@@ -568,7 +598,9 @@
 								 numFinalArgs,
 								 perfuncstate->winCollation,
 								 (void *) winstate, NULL);
-		fcinfo.arg[0] = peraggstate->transValue;
+		fcinfo.arg[0] = MakeExpandedObjectReadOnly(peraggstate->transValue,
+											   peraggstate->transValueIsNull,
+												   peraggstate->transtypeLen);
 		fcinfo.argnull[0] = peraggstate->transValueIsNull;
 		anynull = peraggstate->transValueIsNull;
 
@@ -596,6 +628,7 @@
 	}
 	else
 	{
+		/* Don't need MakeExpandedObjectReadOnly; datumCopy will copy it */
 		*result = peraggstate->transValue;
 		*isnull = peraggstate->transValueIsNull;
 	}
diff -Nru postgresql-9.5-9.5.2/src/backend/executor/spi.c postgresql-9.5-9.5.8/src/backend/executor/spi.c
--- postgresql-9.5-9.5.2/src/backend/executor/spi.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/executor/spi.c	2017-08-07 21:13:41.000000000 +0000
@@ -2217,15 +2217,27 @@
 				 */
 				if (IsA(stmt, CreateTableAsStmt))
 				{
-					Assert(strncmp(completionTag, "SELECT ", 7) == 0);
-					_SPI_current->processed = strtoul(completionTag + 7,
-													  NULL, 10);
+					CreateTableAsStmt *ctastmt = (CreateTableAsStmt *) stmt;
+
+					if (strncmp(completionTag, "SELECT ", 7) == 0)
+						_SPI_current->processed =
+							strtoul(completionTag + 7, NULL, 10);
+					else
+					{
+						/*
+						 * Must be an IF NOT EXISTS that did nothing, or a
+						 * CREATE ... WITH NO DATA.
+						 */
+						Assert(ctastmt->if_not_exists ||
+							   ctastmt->into->skipData);
+						_SPI_current->processed = 0;
+					}
 
 					/*
 					 * For historical reasons, if CREATE TABLE AS was spelled
 					 * as SELECT INTO, return a special return code.
 					 */
-					if (((CreateTableAsStmt *) stmt)->is_select_into)
+					if (ctastmt->is_select_into)
 						res = SPI_OK_SELINTO;
 				}
 				else if (IsA(stmt, CopyStmt))
diff -Nru postgresql-9.5-9.5.2/src/backend/libpq/auth.c postgresql-9.5-9.5.8/src/backend/libpq/auth.c
--- postgresql-9.5-9.5.2/src/backend/libpq/auth.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/libpq/auth.c	2017-08-07 21:13:41.000000000 +0000
@@ -20,6 +20,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 
 #include "libpq/auth.h"
 #include "libpq/crypt.h"
@@ -667,6 +670,20 @@
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("invalid password packet size")));
 
+	/*
+	 * Don't allow an empty password. Libpq treats an empty password the same
+	 * as no password at all, and won't even try to authenticate. But other
+	 * clients might, so allowing it would be confusing.
+	 *
+	 * Note that this only catches an empty password sent by the client in
+	 * plaintext. There's another check in md5_crypt_verify to prevent an
+	 * empty password from being used with MD5 authentication.
+	 */
+	if (buf.data[0] == '\0')
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PASSWORD),
+				 errmsg("empty password returned by client")));
+
 	/* Do not echo password to logs, for security. */
 	elog(DEBUG5, "received password packet");
 
@@ -1011,7 +1028,9 @@
 {
 	char		sysmsg[256];
 
-	if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, r, 0,
+	if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS |
+					  FORMAT_MESSAGE_FROM_SYSTEM,
+					  NULL, r, 0,
 					  sysmsg, sizeof(sysmsg), NULL) == 0)
 		ereport(severity,
 				(errmsg_internal("%s", errmsg),
@@ -1683,12 +1702,6 @@
 						 */
 						goto fail;
 					}
-					if (strlen(passwd) == 0)
-					{
-						ereport(LOG,
-							  (errmsg("empty password returned by client")));
-						goto fail;
-					}
 				}
 				if ((reply[i].resp = strdup(passwd)) == NULL)
 					goto fail;
@@ -1954,16 +1967,11 @@
 	if (passwd == NULL)
 		return STATUS_EOF;		/* client wouldn't send password */
 
-	if (strlen(passwd) == 0)
-	{
-		ereport(LOG,
-				(errmsg("empty password returned by client")));
-		return STATUS_ERROR;
-	}
-
 	if (InitializeLDAPConnection(port, &ldap) == STATUS_ERROR)
+	{
 		/* Error message already sent */
 		return STATUS_ERROR;
+	}
 
 	if (port->hba->ldapbasedn)
 	{
@@ -2163,13 +2171,15 @@
  */
 
 /*
- * RADIUS authentication is described in RFC2865 (and several
- * others).
+ * RADIUS authentication is described in RFC2865 (and several others).
  */
 
 #define RADIUS_VECTOR_LENGTH 16
 #define RADIUS_HEADER_LENGTH 20
 
+/* Maximum size of a RADIUS packet we will create or accept */
+#define RADIUS_BUFFER_SIZE 1024
+
 typedef struct
 {
 	uint8		attribute;
@@ -2183,6 +2193,8 @@
 	uint8		id;
 	uint16		length;
 	uint8		vector[RADIUS_VECTOR_LENGTH];
+	/* this is a bit longer than strictly necessary: */
+	char		pad[RADIUS_BUFFER_SIZE - RADIUS_VECTOR_LENGTH];
 } radius_packet;
 
 /* RADIUS packet types */
@@ -2199,9 +2211,6 @@
 /* RADIUS service types */
 #define RADIUS_AUTHENTICATE_ONLY	8
 
-/* Maximum size of a RADIUS packet we will create or accept */
-#define RADIUS_BUFFER_SIZE 1024
-
 /* Seconds to wait - XXX: should be in a config variable! */
 #define RADIUS_TIMEOUT 3
 
@@ -2236,10 +2245,12 @@
 {
 	char	   *passwd;
 	char	   *identifier = "postgresql";
-	char		radius_buffer[RADIUS_BUFFER_SIZE];
-	char		receive_buffer[RADIUS_BUFFER_SIZE];
-	radius_packet *packet = (radius_packet *) radius_buffer;
-	radius_packet *receivepacket = (radius_packet *) receive_buffer;
+	radius_packet radius_send_pack;
+	radius_packet radius_recv_pack;
+	radius_packet *packet = &radius_send_pack;
+	radius_packet *receivepacket = &radius_recv_pack;
+	char	   *radius_buffer = (char *) &radius_send_pack;
+	char	   *receive_buffer = (char *) &radius_recv_pack;
 	int32		service = htonl(RADIUS_AUTHENTICATE_ONLY);
 	uint8	   *cryptvector;
 	uint8		encryptedpassword[RADIUS_VECTOR_LENGTH];
@@ -2310,13 +2321,6 @@
 	if (passwd == NULL)
 		return STATUS_EOF;		/* client wouldn't send password */
 
-	if (strlen(passwd) == 0)
-	{
-		ereport(LOG,
-				(errmsg("empty password returned by client")));
-		return STATUS_ERROR;
-	}
-
 	if (strlen(passwd) > RADIUS_VECTOR_LENGTH)
 	{
 		ereport(LOG,
diff -Nru postgresql-9.5-9.5.2/src/backend/libpq/be-fsstubs.c postgresql-9.5-9.5.8/src/backend/libpq/be-fsstubs.c
--- postgresql-9.5-9.5.2/src/backend/libpq/be-fsstubs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/libpq/be-fsstubs.c	2017-08-07 21:13:41.000000000 +0000
@@ -898,6 +898,18 @@
 	CreateFSContext();
 
 	loDesc = inv_open(loOid, INV_WRITE, fscxt);
+
+	/* Permission check */
+	if (!lo_compat_privileges &&
+		pg_largeobject_aclcheck_snapshot(loDesc->id,
+										 GetUserId(),
+										 ACL_UPDATE,
+										 loDesc->snapshot) != ACLCHECK_OK)
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("permission denied for large object %u",
+						loDesc->id)));
+
 	inv_seek(loDesc, offset, SEEK_SET);
 	written = inv_write(loDesc, VARDATA_ANY(str), VARSIZE_ANY_EXHDR(str));
 	Assert(written == VARSIZE_ANY_EXHDR(str));
diff -Nru postgresql-9.5-9.5.2/src/backend/libpq/be-secure-openssl.c postgresql-9.5-9.5.8/src/backend/libpq/be-secure-openssl.c
--- postgresql-9.5-9.5.2/src/backend/libpq/be-secure-openssl.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/libpq/be-secure-openssl.c	2017-08-07 21:13:41.000000000 +0000
@@ -53,7 +53,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/dh.h>
-#if SSLEAY_VERSION_NUMBER >= 0x0907000L
+#if OPENSSL_VERSION_NUMBER >= 0x0907000L
 #include <openssl/conf.h>
 #endif
 #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_ECDH)
@@ -74,11 +74,12 @@
 
 static DH  *load_dh_file(int keylength);
 static DH  *load_dh_buffer(const char *, size_t);
+static DH  *generate_dh_parameters(int prime_len, int generator);
 static DH  *tmp_dh_cb(SSL *s, int is_export, int keylength);
 static int	verify_cb(int, X509_STORE_CTX *);
 static void info_cb(const SSL *ssl, int type, int args);
 static void initialize_ecdh(void);
-static const char *SSLerrmessage(void);
+static const char *SSLerrmessage(unsigned long ecode);
 
 static char *X509_NAME_to_cstring(X509_NAME *name);
 
@@ -166,11 +167,15 @@
 
 	if (!SSL_context)
 	{
-#if SSLEAY_VERSION_NUMBER >= 0x0907000L
+#ifdef HAVE_OPENSSL_INIT_SSL
+		OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
+#else
+#if OPENSSL_VERSION_NUMBER >= 0x0907000L
 		OPENSSL_config(NULL);
 #endif
 		SSL_library_init();
 		SSL_load_error_strings();
+#endif
 
 		/*
 		 * We use SSLv23_method() because it can negotiate use of the highest
@@ -182,7 +187,7 @@
 		if (!SSL_context)
 			ereport(FATAL,
 					(errmsg("could not create SSL context: %s",
-							SSLerrmessage())));
+							SSLerrmessage(ERR_get_error()))));
 
 		/*
 		 * Disable OpenSSL's moving-write-buffer sanity check, because it
@@ -198,7 +203,7 @@
 			ereport(FATAL,
 					(errcode(ERRCODE_CONFIG_FILE_ERROR),
 				  errmsg("could not load server certificate file \"%s\": %s",
-						 ssl_cert_file, SSLerrmessage())));
+						 ssl_cert_file, SSLerrmessage(ERR_get_error()))));
 
 		if (stat(ssl_key_file, &buf) != 0)
 			ereport(FATAL,
@@ -228,12 +233,12 @@
 										SSL_FILETYPE_PEM) != 1)
 			ereport(FATAL,
 					(errmsg("could not load private key file \"%s\": %s",
-							ssl_key_file, SSLerrmessage())));
+							ssl_key_file, SSLerrmessage(ERR_get_error()))));
 
 		if (SSL_CTX_check_private_key(SSL_context) != 1)
 			ereport(FATAL,
 					(errmsg("check of private key failed: %s",
-							SSLerrmessage())));
+							SSLerrmessage(ERR_get_error()))));
 	}
 
 	/* set up ephemeral DH keys, and disallow SSL v2/v3 while at it */
@@ -242,6 +247,14 @@
 						SSL_OP_SINGLE_DH_USE |
 						SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
 
+	/* disallow SSL session tickets */
+#ifdef SSL_OP_NO_TICKET			/* added in openssl 0.9.8f */
+	SSL_CTX_set_options(SSL_context, SSL_OP_NO_TICKET);
+#endif
+
+	/* disallow SSL session caching, too */
+	SSL_CTX_set_session_cache_mode(SSL_context, SSL_SESS_CACHE_OFF);
+
 	/* set up ephemeral ECDH keys */
 	initialize_ecdh();
 
@@ -262,7 +275,7 @@
 			(root_cert_list = SSL_load_client_CA_file(ssl_ca_file)) == NULL)
 			ereport(FATAL,
 					(errmsg("could not load root certificate file \"%s\": %s",
-							ssl_ca_file, SSLerrmessage())));
+							ssl_ca_file, SSLerrmessage(ERR_get_error()))));
 	}
 
 	/*----------
@@ -293,7 +306,7 @@
 			else
 				ereport(FATAL,
 						(errmsg("could not load SSL certificate revocation list file \"%s\": %s",
-								ssl_crl_file, SSLerrmessage())));
+								ssl_crl_file, SSLerrmessage(ERR_get_error()))));
 		}
 	}
 
@@ -330,6 +343,7 @@
 	int			r;
 	int			err;
 	int			waitfor;
+	unsigned long ecode;
 
 	Assert(!port->ssl);
 	Assert(!port->peer);
@@ -339,7 +353,7 @@
 		ereport(COMMERROR,
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("could not initialize SSL connection: %s",
-						SSLerrmessage())));
+						SSLerrmessage(ERR_get_error()))));
 		return -1;
 	}
 	if (!my_SSL_set_fd(port, port->sock))
@@ -347,16 +361,36 @@
 		ereport(COMMERROR,
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("could not set SSL socket: %s",
-						SSLerrmessage())));
+						SSLerrmessage(ERR_get_error()))));
 		return -1;
 	}
 	port->ssl_in_use = true;
 
 aloop:
+	/*
+	 * Prepare to call SSL_get_error() by clearing thread's OpenSSL error
+	 * queue.  In general, the current thread's error queue must be empty
+	 * before the TLS/SSL I/O operation is attempted, or SSL_get_error()
+	 * will not work reliably.  An extension may have failed to clear the
+	 * per-thread error queue following another call to an OpenSSL I/O
+	 * routine.
+	 */
+	ERR_clear_error();
 	r = SSL_accept(port->ssl);
 	if (r <= 0)
 	{
 		err = SSL_get_error(port->ssl, r);
+
+		/*
+		 * Other clients of OpenSSL in the backend may fail to call
+		 * ERR_get_error(), but we always do, so as to not cause problems
+		 * for OpenSSL clients that don't call ERR_clear_error()
+		 * defensively.  Be sure that this happens by calling now.
+		 * SSL_get_error() relies on the OpenSSL per-thread error queue
+		 * being intact, so this is the earliest possible point
+		 * ERR_get_error() may be called.
+		 */
+		ecode = ERR_get_error();
 		switch (err)
 		{
 			case SSL_ERROR_WANT_READ:
@@ -390,7 +424,7 @@
 				ereport(COMMERROR,
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
 						 errmsg("could not accept SSL connection: %s",
-								SSLerrmessage())));
+								SSLerrmessage(ecode))));
 				break;
 			case SSL_ERROR_ZERO_RETURN:
 				ereport(COMMERROR,
@@ -499,10 +533,13 @@
 {
 	ssize_t		n;
 	int			err;
+	unsigned long ecode;
 
 	errno = 0;
+	ERR_clear_error();
 	n = SSL_read(port->ssl, ptr, len);
 	err = SSL_get_error(port->ssl, n);
+	ecode = (err != SSL_ERROR_NONE || n < 0) ? ERR_get_error() : 0;
 	switch (err)
 	{
 		case SSL_ERROR_NONE:
@@ -529,12 +566,14 @@
 		case SSL_ERROR_SSL:
 			ereport(COMMERROR,
 					(errcode(ERRCODE_PROTOCOL_VIOLATION),
-					 errmsg("SSL error: %s", SSLerrmessage())));
-			/* fall through */
-		case SSL_ERROR_ZERO_RETURN:
+					 errmsg("SSL error: %s", SSLerrmessage(ecode))));
 			errno = ECONNRESET;
 			n = -1;
 			break;
+		case SSL_ERROR_ZERO_RETURN:
+			/* connection was cleanly shut down by peer */
+			n = 0;
+			break;
 		default:
 			ereport(COMMERROR,
 					(errcode(ERRCODE_PROTOCOL_VIOLATION),
@@ -556,10 +595,13 @@
 {
 	ssize_t		n;
 	int			err;
+	unsigned long ecode;
 
 	errno = 0;
+	ERR_clear_error();
 	n = SSL_write(port->ssl, ptr, len);
 	err = SSL_get_error(port->ssl, n);
+	ecode = (err != SSL_ERROR_NONE || n < 0) ? ERR_get_error() : 0;
 	switch (err)
 	{
 		case SSL_ERROR_NONE:
@@ -586,9 +628,15 @@
 		case SSL_ERROR_SSL:
 			ereport(COMMERROR,
 					(errcode(ERRCODE_PROTOCOL_VIOLATION),
-					 errmsg("SSL error: %s", SSLerrmessage())));
-			/* fall through */
+					 errmsg("SSL error: %s", SSLerrmessage(ecode))));
+			errno = ECONNRESET;
+			n = -1;
+			break;
 		case SSL_ERROR_ZERO_RETURN:
+			/*
+			 * the SSL connnection was closed, leave it to the caller
+			 * to ereport it
+			 */
 			errno = ECONNRESET;
 			n = -1;
 			break;
@@ -623,8 +671,12 @@
  * to retry; do we need to adopt their logic for that?
  */
 
-static bool my_bio_initialized = false;
-static BIO_METHOD my_bio_methods;
+#ifndef HAVE_BIO_GET_DATA
+#define BIO_get_data(bio) (bio->ptr)
+#define BIO_set_data(bio, data) (bio->ptr = data)
+#endif
+
+static BIO_METHOD *my_bio_methods = NULL;
 
 static int
 my_sock_read(BIO *h, char *buf, int size)
@@ -633,7 +685,7 @@
 
 	if (buf != NULL)
 	{
-		res = secure_raw_read(((Port *) h->ptr), buf, size);
+		res = secure_raw_read(((Port *) BIO_get_data(h)), buf, size);
 		BIO_clear_retry_flags(h);
 		if (res <= 0)
 		{
@@ -653,7 +705,7 @@
 {
 	int			res = 0;
 
-	res = secure_raw_write(((Port *) h->ptr), buf, size);
+	res = secure_raw_write(((Port *) BIO_get_data(h)), buf, size);
 	BIO_clear_retry_flags(h);
 	if (res <= 0)
 	{
@@ -670,14 +722,41 @@
 static BIO_METHOD *
 my_BIO_s_socket(void)
 {
-	if (!my_bio_initialized)
+	if (!my_bio_methods)
 	{
-		memcpy(&my_bio_methods, BIO_s_socket(), sizeof(BIO_METHOD));
-		my_bio_methods.bread = my_sock_read;
-		my_bio_methods.bwrite = my_sock_write;
-		my_bio_initialized = true;
+		BIO_METHOD *biom = (BIO_METHOD *) BIO_s_socket();
+#ifdef HAVE_BIO_METH_NEW
+		int			my_bio_index;
+
+		my_bio_index = BIO_get_new_index();
+		if (my_bio_index == -1)
+			return NULL;
+		my_bio_methods = BIO_meth_new(my_bio_index, "PostgreSQL backend socket");
+		if (!my_bio_methods)
+			return NULL;
+		if (!BIO_meth_set_write(my_bio_methods, my_sock_write) ||
+			!BIO_meth_set_read(my_bio_methods, my_sock_read) ||
+			!BIO_meth_set_gets(my_bio_methods, BIO_meth_get_gets(biom)) ||
+			!BIO_meth_set_puts(my_bio_methods, BIO_meth_get_puts(biom)) ||
+			!BIO_meth_set_ctrl(my_bio_methods, BIO_meth_get_ctrl(biom)) ||
+			!BIO_meth_set_create(my_bio_methods, BIO_meth_get_create(biom)) ||
+			!BIO_meth_set_destroy(my_bio_methods, BIO_meth_get_destroy(biom)) ||
+			!BIO_meth_set_callback_ctrl(my_bio_methods, BIO_meth_get_callback_ctrl(biom)))
+		{
+			BIO_meth_free(my_bio_methods);
+			my_bio_methods = NULL;
+			return NULL;
+		}
+#else
+		my_bio_methods = malloc(sizeof(BIO_METHOD));
+		if (!my_bio_methods)
+			return NULL;
+		memcpy(my_bio_methods, biom, sizeof(BIO_METHOD));
+		my_bio_methods->bread = my_sock_read;
+		my_bio_methods->bwrite = my_sock_write;
+#endif
 	}
-	return &my_bio_methods;
+	return my_bio_methods;
 }
 
 /* This should exactly match openssl's SSL_set_fd except for using my BIO */
@@ -685,17 +764,23 @@
 my_SSL_set_fd(Port *port, int fd)
 {
 	int			ret = 0;
-	BIO		   *bio = NULL;
+	BIO		   *bio;
+	BIO_METHOD *bio_method;
 
-	bio = BIO_new(my_BIO_s_socket());
+	bio_method = my_BIO_s_socket();
+	if (bio_method == NULL)
+	{
+		SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB);
+		goto err;
+	}
+	bio = BIO_new(bio_method);
 
 	if (bio == NULL)
 	{
 		SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB);
 		goto err;
 	}
-	/* Use 'ptr' to store pointer to PGconn */
-	bio->ptr = port;
+	BIO_set_data(bio, port);
 
 	BIO_set_fd(bio, fd, BIO_NOCLOSE);
 	SSL_set_bio(port->ssl, bio, bio);
@@ -742,7 +827,8 @@
 	{
 		if (DH_check(dh, &codes) == 0)
 		{
-			elog(LOG, "DH_check error (%s): %s", fnbuf, SSLerrmessage());
+			elog(LOG, "DH_check error (%s): %s", fnbuf,
+				 SSLerrmessage(ERR_get_error()));
 			return NULL;
 		}
 		if (codes & DH_CHECK_P_NOT_PRIME)
@@ -782,13 +868,38 @@
 	if (dh == NULL)
 		ereport(DEBUG2,
 				(errmsg_internal("DH load buffer: %s",
-								 SSLerrmessage())));
+								 SSLerrmessage(ERR_get_error()))));
 	BIO_free(bio);
 
 	return dh;
 }
 
 /*
+ *	Generate DH parameters.
+ *
+ *	Last resort if we can't load precomputed nor hardcoded
+ *	parameters.
+ */
+static DH  *
+generate_dh_parameters(int prime_len, int generator)
+{
+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
+	DH		   *dh;
+
+	if ((dh = DH_new()) == NULL)
+		return NULL;
+
+	if (DH_generate_parameters_ex(dh, prime_len, generator, NULL))
+		return dh;
+
+	DH_free(dh);
+	return NULL;
+#else
+	return DH_generate_parameters(prime_len, generator, NULL, NULL);
+#endif
+}
+
+/*
  *	Generate an ephemeral DH key.  Because this can take a long
  *	time to compute, we can use precomputed parameters of the
  *	common key sizes.
@@ -857,7 +968,7 @@
 		ereport(DEBUG2,
 				(errmsg_internal("DH: generating parameters (%d bits)",
 								 keylength)));
-		r = DH_generate_parameters(keylength, DH_GENERATOR_2, NULL, NULL);
+		r = generate_dh_parameters(keylength, DH_GENERATOR_2);
 	}
 
 	return r;
@@ -948,26 +1059,26 @@
 }
 
 /*
- * Obtain reason string for last SSL error
+ * Obtain reason string for passed SSL errcode
+ *
+ * ERR_get_error() is used by caller to get errcode to pass here.
  *
  * Some caution is needed here since ERR_reason_error_string will
  * return NULL if it doesn't recognize the error code.  We don't
  * want to return NULL ever.
  */
 static const char *
-SSLerrmessage(void)
+SSLerrmessage(unsigned long ecode)
 {
-	unsigned long errcode;
 	const char *errreason;
 	static char errbuf[32];
 
-	errcode = ERR_get_error();
-	if (errcode == 0)
+	if (ecode == 0)
 		return _("no SSL error reported");
-	errreason = ERR_reason_error_string(errcode);
+	errreason = ERR_reason_error_string(ecode);
 	if (errreason != NULL)
 		return errreason;
-	snprintf(errbuf, sizeof(errbuf), _("SSL error code %lu"), errcode);
+	snprintf(errbuf, sizeof(errbuf), _("SSL error code %lu"), ecode);
 	return errbuf;
 }
 
diff -Nru postgresql-9.5-9.5.2/src/backend/libpq/crypt.c postgresql-9.5-9.5.8/src/backend/libpq/crypt.c
--- postgresql-9.5-9.5.2/src/backend/libpq/crypt.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/libpq/crypt.c	2017-08-07 21:13:41.000000000 +0000
@@ -70,10 +70,39 @@
 
 	ReleaseSysCache(roleTup);
 
+	CHECK_FOR_INTERRUPTS();
+
+	/*
+	 * Don't allow an empty password. Libpq treats an empty password the same
+	 * as no password at all, and won't even try to authenticate. But other
+	 * clients might, so allowing it would be confusing.
+	 *
+	 * For a plaintext password, we can simply check that it's not an empty
+	 * string. For an encrypted password, check that it does not match the MD5
+	 * hash of an empty string.
+	 */
 	if (*shadow_pass == '\0')
+	{
+		*logdetail = psprintf(_("User \"%s\" has an empty password."),
+							  role);
 		return STATUS_ERROR;	/* empty password */
+	}
+	if (isMD5(shadow_pass))
+	{
+		char		crypt_empty[MD5_PASSWD_LEN + 1];
 
-	CHECK_FOR_INTERRUPTS();
+		if (!pg_md5_encrypt("",
+							port->user_name,
+							strlen(port->user_name),
+							crypt_empty))
+			return STATUS_ERROR;
+		if (strcmp(shadow_pass, crypt_empty) == 0)
+		{
+			*logdetail = psprintf(_("User \"%s\" has an empty password."),
+								  role);
+			return STATUS_ERROR;	/* empty password */
+		}
+	}
 
 	/*
 	 * Compare with the encrypted or plain password depending on the
diff -Nru postgresql-9.5-9.5.2/src/backend/libpq/hba.c postgresql-9.5-9.5.8/src/backend/libpq/hba.c
--- postgresql-9.5-9.5.2/src/backend/libpq/hba.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/libpq/hba.c	2017-08-07 21:13:41.000000000 +0000
@@ -87,7 +87,7 @@
  *
  * NOTE: the IdentLine structs can contain pre-compiled regular expressions
  * that live outside the memory context. Before destroying or resetting the
- * memory context, they need to be expliticly free'd.
+ * memory context, they need to be explicitly free'd.
  */
 static List *parsed_ident_lines = NIL;
 static MemoryContext parsed_ident_context = NULL;
diff -Nru postgresql-9.5-9.5.2/src/backend/libpq/pqcomm.c postgresql-9.5-9.5.8/src/backend/libpq/pqcomm.c
--- postgresql-9.5-9.5.2/src/backend/libpq/pqcomm.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/libpq/pqcomm.c	2017-08-07 21:13:41.000000000 +0000
@@ -97,6 +97,25 @@
 #include "utils/memutils.h"
 
 /*
+ * Cope with the various platform-specific ways to spell TCP keepalive socket
+ * options.  This doesn't cover Windows, which as usual does its own thing.
+ */
+#if defined(TCP_KEEPIDLE)
+/* TCP_KEEPIDLE is the name of this option on Linux and *BSD */
+#define PG_TCP_KEEPALIVE_IDLE TCP_KEEPIDLE
+#define PG_TCP_KEEPALIVE_IDLE_STR "TCP_KEEPIDLE"
+#elif defined(TCP_KEEPALIVE_THRESHOLD)
+/* TCP_KEEPALIVE_THRESHOLD is the name of this option on Solaris >= 11 */
+#define PG_TCP_KEEPALIVE_IDLE TCP_KEEPALIVE_THRESHOLD
+#define PG_TCP_KEEPALIVE_IDLE_STR "TCP_KEEPALIVE_THRESHOLD"
+#elif defined(TCP_KEEPALIVE) && defined(__darwin__)
+/* TCP_KEEPALIVE is the name of this option on macOS */
+/* Caution: Solaris has this symbol but it means something different */
+#define PG_TCP_KEEPALIVE_IDLE TCP_KEEPALIVE
+#define PG_TCP_KEEPALIVE_IDLE_STR "TCP_KEEPALIVE"
+#endif
+
+/*
  * Configuration options
  */
 int			Unix_socket_permissions;
@@ -456,7 +475,8 @@
 			{
 				ereport(LOG,
 						(errcode_for_socket_access(),
-						 errmsg("setsockopt(SO_REUSEADDR) failed: %m")));
+						 errmsg("setsockopt(%s) failed: %m",
+								"SO_REUSEADDR")));
 				closesocket(fd);
 				continue;
 			}
@@ -471,7 +491,8 @@
 			{
 				ereport(LOG,
 						(errcode_for_socket_access(),
-						 errmsg("setsockopt(IPV6_V6ONLY) failed: %m")));
+						 errmsg("setsockopt(%s) failed: %m",
+								"IPV6_V6ONLY")));
 				closesocket(fd);
 				continue;
 			}
@@ -708,7 +729,7 @@
 		if (setsockopt(port->sock, IPPROTO_TCP, TCP_NODELAY,
 					   (char *) &on, sizeof(on)) < 0)
 		{
-			elog(LOG, "setsockopt(TCP_NODELAY) failed: %m");
+			elog(LOG, "setsockopt(%s) failed: %m", "TCP_NODELAY");
 			return STATUS_ERROR;
 		}
 #endif
@@ -716,7 +737,7 @@
 		if (setsockopt(port->sock, SOL_SOCKET, SO_KEEPALIVE,
 					   (char *) &on, sizeof(on)) < 0)
 		{
-			elog(LOG, "setsockopt(SO_KEEPALIVE) failed: %m");
+			elog(LOG, "setsockopt(%s) failed: %m", "SO_KEEPALIVE");
 			return STATUS_ERROR;
 		}
 
@@ -730,7 +751,7 @@
 		if (setsockopt(port->sock, SOL_SOCKET, SO_SNDBUF, (char *) &on,
 					   sizeof(on)) < 0)
 		{
-			elog(LOG, "setsockopt(SO_SNDBUF) failed: %m");
+			elog(LOG, "setsockopt(%s) failed: %m", "SO_SNDBUF");
 			return STATUS_ERROR;
 		}
 #endif
@@ -1615,7 +1636,7 @@
 int
 pq_getkeepalivesidle(Port *port)
 {
-#if defined(TCP_KEEPIDLE) || defined(TCP_KEEPALIVE) || defined(WIN32)
+#if defined(PG_TCP_KEEPALIVE_IDLE) || defined(SIO_KEEPALIVE_VALS)
 	if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
 		return 0;
 
@@ -1627,23 +1648,13 @@
 #ifndef WIN32
 		ACCEPT_TYPE_ARG3 size = sizeof(port->default_keepalives_idle);
 
-#ifdef TCP_KEEPIDLE
-		if (getsockopt(port->sock, IPPROTO_TCP, TCP_KEEPIDLE,
-					   (char *) &port->default_keepalives_idle,
-					   &size) < 0)
-		{
-			elog(LOG, "getsockopt(TCP_KEEPIDLE) failed: %m");
-			port->default_keepalives_idle = -1; /* don't know */
-		}
-#else
-		if (getsockopt(port->sock, IPPROTO_TCP, TCP_KEEPALIVE,
+		if (getsockopt(port->sock, IPPROTO_TCP, PG_TCP_KEEPALIVE_IDLE,
 					   (char *) &port->default_keepalives_idle,
 					   &size) < 0)
 		{
-			elog(LOG, "getsockopt(TCP_KEEPALIVE) failed: %m");
+			elog(LOG, "getsockopt(%s) failed: %m", PG_TCP_KEEPALIVE_IDLE_STR);
 			port->default_keepalives_idle = -1; /* don't know */
 		}
-#endif   /* TCP_KEEPIDLE */
 #else							/* WIN32 */
 		/* We can't get the defaults on Windows, so return "don't know" */
 		port->default_keepalives_idle = -1;
@@ -1662,7 +1673,8 @@
 	if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
 		return STATUS_OK;
 
-#if defined(TCP_KEEPIDLE) || defined(TCP_KEEPALIVE) || defined(SIO_KEEPALIVE_VALS)
+/* check SIO_KEEPALIVE_VALS here, not just WIN32, as some toolchains lack it */
+#if defined(PG_TCP_KEEPALIVE_IDLE) || defined(SIO_KEEPALIVE_VALS)
 	if (idle == port->keepalives_idle)
 		return STATUS_OK;
 
@@ -1681,33 +1693,25 @@
 	if (idle == 0)
 		idle = port->default_keepalives_idle;
 
-#ifdef TCP_KEEPIDLE
-	if (setsockopt(port->sock, IPPROTO_TCP, TCP_KEEPIDLE,
+	if (setsockopt(port->sock, IPPROTO_TCP, PG_TCP_KEEPALIVE_IDLE,
 				   (char *) &idle, sizeof(idle)) < 0)
 	{
-		elog(LOG, "setsockopt(TCP_KEEPIDLE) failed: %m");
+		elog(LOG, "setsockopt(%s) failed: %m", PG_TCP_KEEPALIVE_IDLE_STR);
 		return STATUS_ERROR;
 	}
-#else
-	if (setsockopt(port->sock, IPPROTO_TCP, TCP_KEEPALIVE,
-				   (char *) &idle, sizeof(idle)) < 0)
-	{
-		elog(LOG, "setsockopt(TCP_KEEPALIVE) failed: %m");
-		return STATUS_ERROR;
-	}
-#endif
 
 	port->keepalives_idle = idle;
 #else							/* WIN32 */
 	return pq_setkeepaliveswin32(port, idle, port->keepalives_interval);
 #endif
-#else							/* TCP_KEEPIDLE || SIO_KEEPALIVE_VALS */
+#else
 	if (idle != 0)
 	{
 		elog(LOG, "setting the keepalive idle time is not supported");
 		return STATUS_ERROR;
 	}
 #endif
+
 	return STATUS_OK;
 }
 
@@ -1730,7 +1734,7 @@
 					   (char *) &port->default_keepalives_interval,
 					   &size) < 0)
 		{
-			elog(LOG, "getsockopt(TCP_KEEPINTVL) failed: %m");
+			elog(LOG, "getsockopt(%s) failed: %m", "TCP_KEEPINTVL");
 			port->default_keepalives_interval = -1;		/* don't know */
 		}
 #else
@@ -1751,7 +1755,7 @@
 	if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
 		return STATUS_OK;
 
-#if defined(TCP_KEEPINTVL) || defined (SIO_KEEPALIVE_VALS)
+#if defined(TCP_KEEPINTVL) || defined(SIO_KEEPALIVE_VALS)
 	if (interval == port->keepalives_interval)
 		return STATUS_OK;
 
@@ -1773,7 +1777,7 @@
 	if (setsockopt(port->sock, IPPROTO_TCP, TCP_KEEPINTVL,
 				   (char *) &interval, sizeof(interval)) < 0)
 	{
-		elog(LOG, "setsockopt(TCP_KEEPINTVL) failed: %m");
+		elog(LOG, "setsockopt(%s) failed: %m", "TCP_KEEPINTVL");
 		return STATUS_ERROR;
 	}
 
@@ -1784,7 +1788,7 @@
 #else
 	if (interval != 0)
 	{
-		elog(LOG, "setsockopt(TCP_KEEPINTVL) not supported");
+		elog(LOG, "setsockopt(%s) not supported", "TCP_KEEPINTVL");
 		return STATUS_ERROR;
 	}
 #endif
@@ -1810,7 +1814,7 @@
 					   (char *) &port->default_keepalives_count,
 					   &size) < 0)
 		{
-			elog(LOG, "getsockopt(TCP_KEEPCNT) failed: %m");
+			elog(LOG, "getsockopt(%s) failed: %m", "TCP_KEEPCNT");
 			port->default_keepalives_count = -1;		/* don't know */
 		}
 	}
@@ -1848,7 +1852,7 @@
 	if (setsockopt(port->sock, IPPROTO_TCP, TCP_KEEPCNT,
 				   (char *) &count, sizeof(count)) < 0)
 	{
-		elog(LOG, "setsockopt(TCP_KEEPCNT) failed: %m");
+		elog(LOG, "setsockopt(%s) failed: %m", "TCP_KEEPCNT");
 		return STATUS_ERROR;
 	}
 
@@ -1856,7 +1860,7 @@
 #else
 	if (count != 0)
 	{
-		elog(LOG, "setsockopt(TCP_KEEPCNT) not supported");
+		elog(LOG, "setsockopt(%s) not supported", "TCP_KEEPCNT");
 		return STATUS_ERROR;
 	}
 #endif
diff -Nru postgresql-9.5-9.5.2/src/backend/libpq/pqmq.c postgresql-9.5-9.5.8/src/backend/libpq/pqmq.c
--- postgresql-9.5-9.5.2/src/backend/libpq/pqmq.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/libpq/pqmq.c	2017-08-07 21:13:41.000000000 +0000
@@ -172,8 +172,8 @@
 			break;
 
 		WaitLatch(&MyProc->procLatch, WL_LATCH_SET, 0);
-		CHECK_FOR_INTERRUPTS();
 		ResetLatch(&MyProc->procLatch);
+		CHECK_FOR_INTERRUPTS();
 	}
 
 	pq_mq_busy = false;
diff -Nru postgresql-9.5-9.5.2/src/backend/nodes/copyfuncs.c postgresql-9.5-9.5.8/src/backend/nodes/copyfuncs.c
--- postgresql-9.5-9.5.2/src/backend/nodes/copyfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/nodes/copyfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -846,6 +846,7 @@
 		COPY_POINTER_FIELD(grpOperators, from->numCols * sizeof(Oid));
 	}
 	COPY_SCALAR_FIELD(numGroups);
+	COPY_BITMAPSET_FIELD(aggParams);
 	COPY_NODE_FIELD(groupingSets);
 	COPY_NODE_FIELD(chain);
 
diff -Nru postgresql-9.5-9.5.2/src/backend/nodes/makefuncs.c postgresql-9.5-9.5.8/src/backend/nodes/makefuncs.c
--- postgresql-9.5-9.5.2/src/backend/nodes/makefuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/nodes/makefuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -477,6 +477,36 @@
 }
 
 /*
+ * makeColumnDef -
+ *	build a ColumnDef node to represent a simple column definition.
+ *
+ * Type and collation are specified by OID.
+ * Other properties are all basic to start with.
+ */
+ColumnDef *
+makeColumnDef(const char *colname, Oid typeOid, int32 typmod, Oid collOid)
+{
+	ColumnDef  *n = makeNode(ColumnDef);
+
+	n->colname = pstrdup(colname);
+	n->typeName = makeTypeNameFromOid(typeOid, typmod);
+	n->inhcount = 0;
+	n->is_local = true;
+	n->is_not_null = false;
+	n->is_from_type = false;
+	n->storage = 0;
+	n->raw_default = NULL;
+	n->cooked_default = NULL;
+	n->collClause = NULL;
+	n->collOid = collOid;
+	n->constraints = NIL;
+	n->fdwoptions = NIL;
+	n->location = -1;
+
+	return n;
+}
+
+/*
  * makeFuncExpr -
  *	build an expression tree representing a function call.
  *
diff -Nru postgresql-9.5-9.5.2/src/backend/nodes/nodeFuncs.c postgresql-9.5-9.5.8/src/backend/nodes/nodeFuncs.c
--- postgresql-9.5-9.5.2/src/backend/nodes/nodeFuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/nodes/nodeFuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -3365,6 +3365,15 @@
 				/* for now, constraints are ignored */
 			}
 			break;
+		case T_IndexElem:
+			{
+				IndexElem  *indelem = (IndexElem *) node;
+
+				if (walker(indelem->expr, context))
+					return true;
+				/* collation and opclass names are deemed uninteresting */
+			}
+			break;
 		case T_GroupingSet:
 			return walker(((GroupingSet *) node)->content, context);
 		case T_LockingClause:
diff -Nru postgresql-9.5-9.5.2/src/backend/nodes/outfuncs.c postgresql-9.5-9.5.8/src/backend/nodes/outfuncs.c
--- postgresql-9.5-9.5.2/src/backend/nodes/outfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/nodes/outfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -683,7 +683,7 @@
 		appendStringInfo(str, " %u", node->grpOperators[i]);
 
 	WRITE_LONG_FIELD(numGroups);
-
+	WRITE_BITMAPSET_FIELD(aggParams);
 	WRITE_NODE_FIELD(groupingSets);
 	WRITE_NODE_FIELD(chain);
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/geqo/geqo_erx.c postgresql-9.5-9.5.8/src/backend/optimizer/geqo/geqo_erx.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/geqo/geqo_erx.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/geqo/geqo_erx.c	2017-08-07 21:13:41.000000000 +0000
@@ -111,7 +111,7 @@
 	for (index1 = 0; index1 < num_gene; index1++)
 	{
 		/*
-		 * presume the tour is circular, i.e. 1->2, 2->3, 3->1 this operaton
+		 * presume the tour is circular, i.e. 1->2, 2->3, 3->1 this operation
 		 * maps n back to 1
 		 */
 
@@ -314,7 +314,7 @@
 		/*
 		 * give priority to candidates with fewest remaining unused edges;
 		 * find out what the minimum number of unused edges is
-		 * (minimum_edges); if there is more than one cadidate with the
+		 * (minimum_edges); if there is more than one candidate with the
 		 * minimum number of unused edges keep count of this number
 		 * (minimum_count);
 		 */
@@ -458,7 +458,7 @@
 			if (edge_table[i].unused_edges >= 0)
 				return (Gene) i;
 
-		elog(LOG, "no edge found via looking for the last ununsed point");
+		elog(LOG, "no edge found via looking for the last unused point");
 	}
 
 
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/path/equivclass.c postgresql-9.5-9.5.8/src/backend/optimizer/path/equivclass.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/path/equivclass.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/path/equivclass.c	2017-08-07 21:13:41.000000000 +0000
@@ -987,7 +987,7 @@
  *
  * join_relids should always equal bms_union(outer_relids, inner_rel->relids).
  * We could simplify this function's API by computing it internally, but in
- * all current uses, the caller has the value at hand anyway.
+ * most current uses, the caller has the value at hand anyway.
  */
 List *
 generate_join_implied_equalities(PlannerInfo *root,
@@ -995,6 +995,24 @@
 								 Relids outer_relids,
 								 RelOptInfo *inner_rel)
 {
+	return generate_join_implied_equalities_for_ecs(root,
+													root->eq_classes,
+													join_relids,
+													outer_relids,
+													inner_rel);
+}
+
+/*
+ * generate_join_implied_equalities_for_ecs
+ *	  As above, but consider only the listed ECs.
+ */
+List *
+generate_join_implied_equalities_for_ecs(PlannerInfo *root,
+										 List *eclasses,
+										 Relids join_relids,
+										 Relids outer_relids,
+										 RelOptInfo *inner_rel)
+{
 	List	   *result = NIL;
 	Relids		inner_relids = inner_rel->relids;
 	Relids		nominal_inner_relids;
@@ -1015,7 +1033,7 @@
 		nominal_join_relids = join_relids;
 	}
 
-	foreach(lc, root->eq_classes)
+	foreach(lc, eclasses)
 	{
 		EquivalenceClass *ec = (EquivalenceClass *) lfirst(lc);
 		List	   *sublist = NIL;
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/path/joinpath.c postgresql-9.5-9.5.8/src/backend/optimizer/path/joinpath.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/path/joinpath.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/path/joinpath.c	2017-08-07 21:13:41.000000000 +0000
@@ -1319,7 +1319,7 @@
 		/*
 		 * Insist that each side have a non-redundant eclass.  This
 		 * restriction is needed because various bits of the planner expect
-		 * that each clause in a merge be associatable with some pathkey in a
+		 * that each clause in a merge be associable with some pathkey in a
 		 * canonical pathkey list, but redundant eclasses can't appear in
 		 * canonical sort orderings.  (XXX it might be worth relaxing this,
 		 * but not enough time to address it for 8.3.)
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/plan/createplan.c postgresql-9.5-9.5.8/src/backend/optimizer/plan/createplan.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/plan/createplan.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/plan/createplan.c	2017-08-07 21:13:41.000000000 +0000
@@ -47,7 +47,7 @@
 static Plan *create_plan_recurse(PlannerInfo *root, Path *best_path);
 static Plan *create_scan_plan(PlannerInfo *root, Path *best_path);
 static List *build_path_tlist(PlannerInfo *root, Path *path);
-static bool use_physical_tlist(PlannerInfo *root, RelOptInfo *rel);
+static bool use_physical_tlist(PlannerInfo *root, Path *path);
 static void disuse_physical_tlist(PlannerInfo *root, Plan *plan, Path *path);
 static Plan *create_gating_plan(PlannerInfo *root, Plan *plan, List *quals);
 static Plan *create_join_plan(PlannerInfo *root, JoinPath *best_path);
@@ -303,7 +303,7 @@
 	 * planner.c may replace the tlist we generate here, forcing projection to
 	 * occur.)
 	 */
-	if (use_physical_tlist(root, rel))
+	if (use_physical_tlist(root, best_path))
 	{
 		if (best_path->pathtype == T_IndexOnlyScan)
 		{
@@ -493,8 +493,9 @@
  *		rather than only those Vars actually referenced.
  */
 static bool
-use_physical_tlist(PlannerInfo *root, RelOptInfo *rel)
+use_physical_tlist(PlannerInfo *root, Path *path)
 {
+	RelOptInfo *rel = path->parent;
 	int			i;
 	ListCell   *lc;
 
@@ -517,6 +518,13 @@
 		return false;
 
 	/*
+	 * Also, don't do it to a CustomPath; the premise that we're extracting
+	 * columns from a simple physical tuple is unlikely to hold for those.
+	 */
+	if (IsA(path, CustomPath))
+		return false;
+
+	/*
 	 * Can't do it if any system columns or whole-row Vars are requested.
 	 * (This could possibly be fixed but would take some fragile assumptions
 	 * in setrefs.c, I think.)
@@ -4535,6 +4543,7 @@
 	node->grpColIdx = grpColIdx;
 	node->grpOperators = grpOperators;
 	node->numGroups = numGroups;
+	node->aggParams = NULL;		/* SS_finalize_plan() will fill this */
 
 	copy_plan_costsize(plan, lefttree); /* only care about copying size */
 	cost_agg(&agg_path, root,
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/plan/initsplan.c postgresql-9.5-9.5.8/src/backend/optimizer/plan/initsplan.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/plan/initsplan.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/plan/initsplan.c	2017-08-07 21:13:41.000000000 +0000
@@ -1156,9 +1156,32 @@
 	{
 		SpecialJoinInfo *otherinfo = (SpecialJoinInfo *) lfirst(l);
 
-		/* ignore full joins --- other mechanisms preserve their ordering */
+		/*
+		 * A full join is an optimization barrier: we can't associate into or
+		 * out of it.  Hence, if it overlaps either LHS or RHS of the current
+		 * rel, expand that side's min relset to cover the whole full join.
+		 */
 		if (otherinfo->jointype == JOIN_FULL)
+		{
+			if (bms_overlap(left_rels, otherinfo->syn_lefthand) ||
+				bms_overlap(left_rels, otherinfo->syn_righthand))
+			{
+				min_lefthand = bms_add_members(min_lefthand,
+											   otherinfo->syn_lefthand);
+				min_lefthand = bms_add_members(min_lefthand,
+											   otherinfo->syn_righthand);
+			}
+			if (bms_overlap(right_rels, otherinfo->syn_lefthand) ||
+				bms_overlap(right_rels, otherinfo->syn_righthand))
+			{
+				min_righthand = bms_add_members(min_righthand,
+												otherinfo->syn_lefthand);
+				min_righthand = bms_add_members(min_righthand,
+												otherinfo->syn_righthand);
+			}
+			/* Needn't do anything else with the full join */
 			continue;
+		}
 
 		/*
 		 * For a lower OJ in our LHS, if our join condition uses the lower
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/plan/planmain.c postgresql-9.5-9.5.8/src/backend/optimizer/plan/planmain.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/plan/planmain.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/plan/planmain.c	2017-08-07 21:13:41.000000000 +0000
@@ -183,7 +183,7 @@
 	/*
 	 * Now distribute "placeholders" to base rels as needed.  This has to be
 	 * done after join removal because removal could change whether a
-	 * placeholder is evaluatable at a base rel.
+	 * placeholder is evaluable at a base rel.
 	 */
 	add_placeholders_to_base_rels(root);
 
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/plan/planner.c postgresql-9.5-9.5.8/src/backend/optimizer/plan/planner.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/plan/planner.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/plan/planner.c	2017-08-07 21:13:41.000000000 +0000
@@ -65,6 +65,7 @@
 #define EXPRKIND_APPINFO		7
 #define EXPRKIND_PHV			8
 #define EXPRKIND_TABLESAMPLE	9
+#define EXPRKIND_ARBITER_ELEM	10
 
 /* Passthrough data for standard_qp_callback */
 typedef struct
@@ -483,13 +484,23 @@
 
 	if (parse->onConflict)
 	{
+		parse->onConflict->arbiterElems = (List *)
+			preprocess_expression(root,
+								  (Node *) parse->onConflict->arbiterElems,
+								  EXPRKIND_ARBITER_ELEM);
+		parse->onConflict->arbiterWhere =
+			preprocess_expression(root,
+								  parse->onConflict->arbiterWhere,
+								  EXPRKIND_QUAL);
 		parse->onConflict->onConflictSet = (List *)
-			preprocess_expression(root, (Node *) parse->onConflict->onConflictSet,
+			preprocess_expression(root,
+								  (Node *) parse->onConflict->onConflictSet,
 								  EXPRKIND_TARGET);
-
 		parse->onConflict->onConflictWhere =
-			preprocess_expression(root, (Node *) parse->onConflict->onConflictWhere,
+			preprocess_expression(root,
+								  parse->onConflict->onConflictWhere,
 								  EXPRKIND_QUAL);
+		/* exclRelTlist contains only Vars, so no preprocessing needed */
 	}
 
 	root->append_rel_list = (List *)
@@ -1745,6 +1756,11 @@
 
 			if (parse->groupingSets)
 			{
+				if (!grouping_is_sortable(parse->groupClause))
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("could not implement GROUP BY"),
+							 errdetail("Some of the datatypes do not support sorting, which is required for grouping sets.")));
 				use_hashed_grouping = false;
 			}
 			else
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/plan/subselect.c postgresql-9.5-9.5.8/src/backend/optimizer/plan/subselect.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/plan/subselect.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/plan/subselect.c	2017-08-07 21:13:41.000000000 +0000
@@ -81,6 +81,7 @@
 			  Bitmapset *valid_params,
 			  Bitmapset *scan_params);
 static bool finalize_primnode(Node *node, finalize_primnode_context *context);
+static bool finalize_agg_primnode(Node *node, finalize_primnode_context *context);
 
 
 /*
@@ -2426,6 +2427,7 @@
 								  &context);
 				finalize_primnode((Node *) mtplan->onConflictWhere,
 								  &context);
+				/* exclRelTlist contains only Vars, doesn't need examination */
 				foreach(l, mtplan->plans)
 				{
 					context.paramids =
@@ -2557,6 +2559,29 @@
 										 locally_added_param);
 			break;
 
+		case T_Agg:
+			{
+				Agg		   *agg = (Agg *) plan;
+
+				/*
+				 * AGG_HASHED plans need to know which Params are referenced
+				 * in aggregate calls.  Do a separate scan to identify them.
+				 */
+				if (agg->aggstrategy == AGG_HASHED)
+				{
+					finalize_primnode_context aggcontext;
+
+					aggcontext.root = root;
+					aggcontext.paramids = NULL;
+					finalize_agg_primnode((Node *) agg->plan.targetlist,
+										  &aggcontext);
+					finalize_agg_primnode((Node *) agg->plan.qual,
+										  &aggcontext);
+					agg->aggParams = aggcontext.paramids;
+				}
+			}
+			break;
+
 		case T_WindowAgg:
 			finalize_primnode(((WindowAgg *) plan)->startOffset,
 							  &context);
@@ -2565,7 +2590,6 @@
 			break;
 
 		case T_Hash:
-		case T_Agg:
 		case T_Material:
 		case T_Sort:
 		case T_Unique:
@@ -2709,6 +2733,29 @@
 								  (void *) context);
 }
 
+/*
+ * finalize_agg_primnode: find all Aggref nodes in the given expression tree,
+ * and add IDs of all PARAM_EXEC params appearing within their aggregated
+ * arguments to the result set.
+ */
+static bool
+finalize_agg_primnode(Node *node, finalize_primnode_context *context)
+{
+	if (node == NULL)
+		return false;
+	if (IsA(node, Aggref))
+	{
+		Aggref	   *agg = (Aggref *) node;
+
+		/* we should not consider the direct arguments, if any */
+		finalize_primnode((Node *) agg->args, context);
+		finalize_primnode((Node *) agg->aggfilter, context);
+		return false;			/* there can't be any Aggrefs below here */
+	}
+	return expression_tree_walker(node, finalize_agg_primnode,
+								  (void *) context);
+}
+
 /*
  * SS_make_initplan_from_plan - given a plan tree, make it an InitPlan
  *
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/prep/prepjointree.c postgresql-9.5-9.5.8/src/backend/optimizer/prep/prepjointree.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/prep/prepjointree.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/prep/prepjointree.c	2017-08-07 21:13:41.000000000 +0000
@@ -1031,8 +1031,19 @@
 	parse->returningList = (List *)
 		pullup_replace_vars((Node *) parse->returningList, &rvcontext);
 	if (parse->onConflict)
+	{
 		parse->onConflict->onConflictSet = (List *)
-			pullup_replace_vars((Node *) parse->onConflict->onConflictSet, &rvcontext);
+			pullup_replace_vars((Node *) parse->onConflict->onConflictSet,
+								&rvcontext);
+		parse->onConflict->onConflictWhere =
+			pullup_replace_vars(parse->onConflict->onConflictWhere,
+								&rvcontext);
+
+		/*
+		 * We assume ON CONFLICT's arbiterElems, arbiterWhere, exclRelTlist
+		 * can't contain any references to a subquery
+		 */
+	}
 	replace_vars_in_jointree((Node *) parse->jointree, &rvcontext,
 							 lowest_nulling_outer_join);
 	Assert(parse->setOperations == NULL);
@@ -1625,8 +1636,19 @@
 	parse->returningList = (List *)
 		pullup_replace_vars((Node *) parse->returningList, &rvcontext);
 	if (parse->onConflict)
+	{
 		parse->onConflict->onConflictSet = (List *)
-			pullup_replace_vars((Node *) parse->onConflict->onConflictSet, &rvcontext);
+			pullup_replace_vars((Node *) parse->onConflict->onConflictSet,
+								&rvcontext);
+		parse->onConflict->onConflictWhere =
+			pullup_replace_vars(parse->onConflict->onConflictWhere,
+								&rvcontext);
+
+		/*
+		 * We assume ON CONFLICT's arbiterElems, arbiterWhere, exclRelTlist
+		 * can't contain any references to a subquery
+		 */
+	}
 	replace_vars_in_jointree((Node *) parse->jointree, &rvcontext, NULL);
 	Assert(parse->setOperations == NULL);
 	parse->havingQual = pullup_replace_vars(parse->havingQual, &rvcontext);
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/util/clauses.c postgresql-9.5-9.5.8/src/backend/optimizer/util/clauses.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/util/clauses.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/util/clauses.c	2017-08-07 21:13:41.000000000 +0000
@@ -97,6 +97,8 @@
 static bool contain_volatile_functions_walker(Node *node, void *context);
 static bool contain_volatile_functions_not_nextval_walker(Node *node, void *context);
 static bool contain_nonstrict_functions_walker(Node *node, void *context);
+static bool contain_context_dependent_node(Node *clause);
+static bool contain_context_dependent_node_walker(Node *node, int *flags);
 static bool contain_leaked_vars_walker(Node *node, void *context);
 static Relids find_nonnullable_rels_walker(Node *node, bool top_level);
 static List *find_nonnullable_vars_walker(Node *node, bool top_level);
@@ -556,6 +558,16 @@
 			/* Use average width if aggregate definition gave one */
 			if (aggtransspace > 0)
 				avgwidth = aggtransspace;
+			else if (aggtransfn == F_ARRAY_APPEND)
+			{
+				/*
+				 * If the transition function is array_append(), it'll use an
+				 * expanded array as transvalue, which will occupy at least
+				 * ALLOCSET_SMALL_INITSIZE and possibly more.  Use that as the
+				 * estimate for lack of a better idea.
+				 */
+				avgwidth = ALLOCSET_SMALL_INITSIZE;
+			}
 			else
 			{
 				/*
@@ -1323,6 +1335,76 @@
 }
 
 /*****************************************************************************
+ *		Check clauses for context-dependent nodes
+ *****************************************************************************/
+
+/*
+ * contain_context_dependent_node
+ *	  Recursively search for context-dependent nodes within a clause.
+ *
+ * CaseTestExpr nodes must appear directly within the corresponding CaseExpr,
+ * not nested within another one, or they'll see the wrong test value.  If one
+ * appears "bare" in the arguments of a SQL function, then we can't inline the
+ * SQL function for fear of creating such a situation.
+ *
+ * CoerceToDomainValue would have the same issue if domain CHECK expressions
+ * could get inlined into larger expressions, but presently that's impossible.
+ * Still, it might be allowed in future, or other node types with similar
+ * issues might get invented.  So give this function a generic name, and set
+ * up the recursion state to allow multiple flag bits.
+ */
+static bool
+contain_context_dependent_node(Node *clause)
+{
+	int			flags = 0;
+
+	return contain_context_dependent_node_walker(clause, &flags);
+}
+
+#define CCDN_IN_CASEEXPR	0x0001		/* CaseTestExpr okay here? */
+
+static bool
+contain_context_dependent_node_walker(Node *node, int *flags)
+{
+	if (node == NULL)
+		return false;
+	if (IsA(node, CaseTestExpr))
+		return !(*flags & CCDN_IN_CASEEXPR);
+	if (IsA(node, CaseExpr))
+	{
+		CaseExpr   *caseexpr = (CaseExpr *) node;
+
+		/*
+		 * If this CASE doesn't have a test expression, then it doesn't create
+		 * a context in which CaseTestExprs should appear, so just fall
+		 * through and treat it as a generic expression node.
+		 */
+		if (caseexpr->arg)
+		{
+			int			save_flags = *flags;
+			bool		res;
+
+			/*
+			 * Note: in principle, we could distinguish the various sub-parts
+			 * of a CASE construct and set the flag bit only for some of them,
+			 * since we are only expecting CaseTestExprs to appear in the
+			 * "expr" subtree of the CaseWhen nodes.  But it doesn't really
+			 * seem worth any extra code.  If there are any bare CaseTestExprs
+			 * elsewhere in the CASE, something's wrong already.
+			 */
+			*flags |= CCDN_IN_CASEEXPR;
+			res = expression_tree_walker(node,
+									   contain_context_dependent_node_walker,
+										 (void *) flags);
+			*flags = save_flags;
+			return res;
+		}
+	}
+	return expression_tree_walker(node, contain_context_dependent_node_walker,
+								  (void *) flags);
+}
+
+/*****************************************************************************
  *		  Check clauses for Vars passed to non-leakproof functions
  *****************************************************************************/
 
@@ -3330,7 +3412,7 @@
 
 				arg = eval_const_expressions_mutator((Node *) ntest->arg,
 													 context);
-				if (arg && IsA(arg, RowExpr))
+				if (ntest->argisrow && arg && IsA(arg, RowExpr))
 				{
 					/*
 					 * We break ROW(...) IS [NOT] NULL into separate tests on
@@ -3342,8 +3424,6 @@
 					List	   *newargs = NIL;
 					ListCell   *l;
 
-					Assert(ntest->argisrow);
-
 					foreach(l, rarg->args)
 					{
 						Node	   *relem = (Node *) lfirst(l);
@@ -3362,10 +3442,17 @@
 								return makeBoolConst(false, false);
 							continue;
 						}
+
+						/*
+						 * Else, make a scalar (argisrow == false) NullTest
+						 * for this field.  Scalar semantics are required
+						 * because IS [NOT] NULL doesn't recurse; see comments
+						 * in ExecEvalNullTest().
+						 */
 						newntest = makeNode(NullTest);
 						newntest->arg = (Expr *) relem;
 						newntest->nulltesttype = ntest->nulltesttype;
-						newntest->argisrow = type_is_rowtype(exprType(relem));
+						newntest->argisrow = false;
 						newntest->location = ntest->location;
 						newargs = lappend(newargs, newntest);
 					}
@@ -4230,6 +4317,8 @@
  * doesn't work in the general case because it discards information such
  * as OUT-parameter declarations.
  *
+ * Also, context-dependent expression nodes in the argument list are trouble.
+ *
  * Returns a simplified expression if successful, or NULL if cannot
  * simplify the function.
  */
@@ -4425,6 +4514,13 @@
 		goto fail;
 
 	/*
+	 * If any parameter expression contains a context-dependent node, we can't
+	 * inline, for fear of putting such a node into the wrong context.
+	 */
+	if (contain_context_dependent_node((Node *) args))
+		goto fail;
+
+	/*
 	 * We may be able to do it; there are still checks on parameter usage to
 	 * make, but those are most easily done in combination with the actual
 	 * substitution of the inputs.  So start building expression with inputs
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/util/joininfo.c postgresql-9.5-9.5.8/src/backend/optimizer/util/joininfo.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/util/joininfo.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/util/joininfo.c	2017-08-07 21:13:41.000000000 +0000
@@ -24,7 +24,7 @@
  *		Detect whether there is a joinclause that involves
  *		the two given relations.
  *
- * Note: the joinclause does not have to be evaluatable with only these two
+ * Note: the joinclause does not have to be evaluable with only these two
  * relations.  This is intentional.  For example consider
  *		SELECT * FROM a, b, c WHERE a.x = (b.y + c.z)
  * If a is much larger than the other tables, it may be worthwhile to
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/util/plancat.c postgresql-9.5-9.5.8/src/backend/optimizer/util/plancat.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/util/plancat.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/util/plancat.c	2017-08-07 21:13:41.000000000 +0000
@@ -465,26 +465,18 @@
 
 	/*
 	 * Build normalized/BMS representation of plain indexed attributes, as
-	 * well as direct list of inference elements.  This is required for
-	 * matching the cataloged definition of indexes.
+	 * well as a separate list of expression items.  This simplifies matching
+	 * the cataloged definition of indexes.
 	 */
 	foreach(l, onconflict->arbiterElems)
 	{
-		InferenceElem *elem;
+		InferenceElem *elem = (InferenceElem *) lfirst(l);
 		Var		   *var;
 		int			attno;
 
-		elem = (InferenceElem *) lfirst(l);
-
-		/*
-		 * Parse analysis of inference elements performs full parse analysis
-		 * of Vars, even for non-expression indexes (in contrast with utility
-		 * command related use of IndexElem).  However, indexes are cataloged
-		 * with simple attribute numbers for non-expression indexes.  Those
-		 * are handled later.
-		 */
 		if (!IsA(elem->expr, Var))
 		{
+			/* If not a plain Var, just shove it in inferElems for now */
 			inferElems = lappend(inferElems, elem->expr);
 			continue;
 		}
@@ -492,14 +484,13 @@
 		var = (Var *) elem->expr;
 		attno = var->varattno;
 
-		if (attno < 0)
+		if (attno == 0)
 			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
-					 errmsg("system columns cannot be used in an ON CONFLICT clause")));
-		else if (attno == 0)
-			elog(ERROR, "whole row unique index inference specifications are not valid");
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("whole row unique index inference specifications are not supported")));
 
-		inferAttrs = bms_add_member(inferAttrs, attno);
+		inferAttrs = bms_add_member(inferAttrs,
+								 attno - FirstLowInvalidHeapAttributeNumber);
 	}
 
 	/*
@@ -516,21 +507,20 @@
 					 errmsg("constraint in ON CONFLICT clause has no associated index")));
 	}
 
-	indexList = RelationGetIndexList(relation);
-
 	/*
 	 * Using that representation, iterate through the list of indexes on the
 	 * target relation to try and find a match
 	 */
+	indexList = RelationGetIndexList(relation);
+
 	foreach(l, indexList)
 	{
 		Oid			indexoid = lfirst_oid(l);
 		Relation	idxRel;
 		Form_pg_index idxForm;
-		Bitmapset  *indexedAttrs = NULL;
+		Bitmapset  *indexedAttrs;
 		List	   *idxExprs;
 		List	   *predExprs;
-		List	   *whereExplicit;
 		AttrNumber	natt;
 		ListCell   *el;
 
@@ -587,16 +577,15 @@
 		if (!idxForm->indisunique)
 			goto next;
 
-		/* Build BMS representation of cataloged index attributes */
+		/* Build BMS representation of plain (non expression) index attrs */
+		indexedAttrs = NULL;
 		for (natt = 0; natt < idxForm->indnatts; natt++)
 		{
 			int			attno = idxRel->rd_index->indkey.values[natt];
 
-			if (attno < 0)
-				elog(ERROR, "system column in index");
-
 			if (attno != 0)
-				indexedAttrs = bms_add_member(indexedAttrs, attno);
+				indexedAttrs = bms_add_member(indexedAttrs,
+								 attno - FirstLowInvalidHeapAttributeNumber);
 		}
 
 		/* Non-expression attributes (if any) must match */
@@ -652,13 +641,12 @@
 			goto next;
 
 		/*
-		 * Any user-supplied ON CONFLICT unique index inference WHERE clause
-		 * need only be implied by the cataloged index definitions predicate.
+		 * If it's a partial index, its predicate must be implied by the ON
+		 * CONFLICT's WHERE clause.
 		 */
 		predExprs = RelationGetIndexPredicate(idxRel);
-		whereExplicit = make_ands_implicit((Expr *) onconflict->arbiterWhere);
 
-		if (!predicate_implied_by(predExprs, whereExplicit))
+		if (!predicate_implied_by(predExprs, (List *) onconflict->arbiterWhere))
 			goto next;
 
 		results = lappend_oid(results, idxForm->indexrelid);
@@ -1102,7 +1090,13 @@
 												  att->attcollation,
 												  0);
 					ntest->nulltesttype = IS_NOT_NULL;
-					ntest->argisrow = type_is_rowtype(att->atttypid);
+
+					/*
+					 * argisrow=false is correct even for a composite column,
+					 * because attnotnull does not represent a SQL-spec IS NOT
+					 * NULL test in such a case, just IS DISTINCT FROM NULL.
+					 */
+					ntest->argisrow = false;
 					ntest->location = -1;
 					result = lappend(result, ntest);
 				}
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/util/relnode.c postgresql-9.5-9.5.8/src/backend/optimizer/util/relnode.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/util/relnode.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/util/relnode.c	2017-08-07 21:13:41.000000000 +0000
@@ -982,6 +982,7 @@
 	Relids		inner_and_req;
 	List	   *pclauses;
 	List	   *eclauses;
+	List	   *dropped_ecs;
 	double		rows;
 	ListCell   *lc;
 
@@ -1035,6 +1036,7 @@
 												required_outer,
 												joinrel);
 	/* We only want ones that aren't movable to lower levels */
+	dropped_ecs = NIL;
 	foreach(lc, eclauses)
 	{
 		RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
@@ -1051,13 +1053,79 @@
 										   joinrel->relids,
 										   join_and_req));
 #endif
-		if (!join_clause_is_movable_into(rinfo,
-										 outer_path->parent->relids,
-										 outer_and_req) &&
-			!join_clause_is_movable_into(rinfo,
-										 inner_path->parent->relids,
-										 inner_and_req))
-			pclauses = lappend(pclauses, rinfo);
+		if (join_clause_is_movable_into(rinfo,
+										outer_path->parent->relids,
+										outer_and_req))
+			continue;			/* drop if movable into LHS */
+		if (join_clause_is_movable_into(rinfo,
+										inner_path->parent->relids,
+										inner_and_req))
+		{
+			/* drop if movable into RHS, but remember EC for use below */
+			Assert(rinfo->left_ec == rinfo->right_ec);
+			dropped_ecs = lappend(dropped_ecs, rinfo->left_ec);
+			continue;
+		}
+		pclauses = lappend(pclauses, rinfo);
+	}
+
+	/*
+	 * EquivalenceClasses are harder to deal with than we could wish, because
+	 * of the fact that a given EC can generate different clauses depending on
+	 * context.  Suppose we have an EC {X.X, Y.Y, Z.Z} where X and Y are the
+	 * LHS and RHS of the current join and Z is in required_outer, and further
+	 * suppose that the inner_path is parameterized by both X and Z.  The code
+	 * above will have produced either Z.Z = X.X or Z.Z = Y.Y from that EC,
+	 * and in the latter case will have discarded it as being movable into the
+	 * RHS.  However, the EC machinery might have produced either Y.Y = X.X or
+	 * Y.Y = Z.Z as the EC enforcement clause within the inner_path; it will
+	 * not have produced both, and we can't readily tell from here which one
+	 * it did pick.  If we add no clause to this join, we'll end up with
+	 * insufficient enforcement of the EC; either Z.Z or X.X will fail to be
+	 * constrained to be equal to the other members of the EC.  (When we come
+	 * to join Z to this X/Y path, we will certainly drop whichever EC clause
+	 * is generated at that join, so this omission won't get fixed later.)
+	 *
+	 * To handle this, for each EC we discarded such a clause from, try to
+	 * generate a clause connecting the required_outer rels to the join's LHS
+	 * ("Z.Z = X.X" in the terms of the above example).  If successful, and if
+	 * the clause can't be moved to the LHS, add it to the current join's
+	 * restriction clauses.  (If an EC cannot generate such a clause then it
+	 * has nothing that needs to be enforced here, while if the clause can be
+	 * moved into the LHS then it should have been enforced within that path.)
+	 *
+	 * Note that we don't need similar processing for ECs whose clause was
+	 * considered to be movable into the LHS, because the LHS can't refer to
+	 * the RHS so there is no comparable ambiguity about what it might
+	 * actually be enforcing internally.
+	 */
+	if (dropped_ecs)
+	{
+		Relids		real_outer_and_req;
+
+		real_outer_and_req = bms_union(outer_path->parent->relids,
+									   required_outer);
+		eclauses =
+			generate_join_implied_equalities_for_ecs(root,
+													 dropped_ecs,
+													 real_outer_and_req,
+													 required_outer,
+													 outer_path->parent);
+		foreach(lc, eclauses)
+		{
+			RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
+
+			/* As above, can't quite assert this here */
+#ifdef NOT_USED
+			Assert(join_clause_is_movable_into(rinfo,
+											   outer_path->parent->relids,
+											   real_outer_and_req));
+#endif
+			if (!join_clause_is_movable_into(rinfo,
+											 outer_path->parent->relids,
+											 outer_and_req))
+				pclauses = lappend(pclauses, rinfo);
+		}
 	}
 
 	/*
diff -Nru postgresql-9.5-9.5.2/src/backend/optimizer/util/restrictinfo.c postgresql-9.5-9.5.8/src/backend/optimizer/util/restrictinfo.c
--- postgresql-9.5-9.5.2/src/backend/optimizer/util/restrictinfo.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/optimizer/util/restrictinfo.c	2017-08-07 21:13:41.000000000 +0000
@@ -550,7 +550,7 @@
 							Relids currentrelids,
 							Relids current_and_outer)
 {
-	/* Clause must be evaluatable given available context */
+	/* Clause must be evaluable given available context */
 	if (!bms_is_subset(rinfo->clause_relids, current_and_outer))
 		return false;
 
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/analyze.c postgresql-9.5-9.5.8/src/backend/parser/analyze.c
--- postgresql-9.5-9.5.2/src/backend/parser/analyze.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/analyze.c	2017-08-07 21:13:41.000000000 +0000
@@ -915,11 +915,10 @@
 		exclRelIndex = list_length(pstate->p_rtable);
 
 		/*
-		 * Build a targetlist for the EXCLUDED pseudo relation. Have to be
-		 * careful to use resnos that correspond to attnos of the underlying
-		 * relation.
+		 * Build a targetlist representing the columns of the EXCLUDED pseudo
+		 * relation.  Have to be careful to use resnos that correspond to
+		 * attnos of the underlying relation.
 		 */
-		Assert(pstate->p_next_resno == 1);
 		for (attno = 0; attno < targetrel->rd_rel->relnatts; attno++)
 		{
 			Form_pg_attribute attr = targetrel->rd_att->attrs[attno];
@@ -940,14 +939,11 @@
 							  attr->atttypid, attr->atttypmod,
 							  attr->attcollation,
 							  0);
-				var->location = -1;
-
-				name = NameStr(attr->attname);
+				name = pstrdup(NameStr(attr->attname));
 			}
 
-			Assert(pstate->p_next_resno == attno + 1);
 			te = makeTargetEntry((Expr *) var,
-								 pstate->p_next_resno++,
+								 attno + 1,
 								 name,
 								 false);
 
@@ -956,15 +952,16 @@
 		}
 
 		/*
-		 * Additionally add a whole row tlist entry for EXCLUDED. That's
-		 * really only needed for ruleutils' benefit, which expects to find
-		 * corresponding entries in child tlists. Alternatively we could do
-		 * this only when required, but that doesn't seem worth the trouble.
+		 * Add a whole-row-Var entry to support references to "EXCLUDED.*".
+		 * Like the other entries in exclRelTlist, its resno must match the
+		 * Var's varattno, else the wrong things happen while resolving
+		 * references in setrefs.c.  This is against normal conventions for
+		 * targetlists, but it's okay since we don't use this as a real tlist.
 		 */
 		var = makeVar(exclRelIndex, InvalidAttrNumber,
-					  RelationGetRelid(targetrel),
+					  targetrel->rd_rel->reltype,
 					  -1, InvalidOid, 0);
-		te = makeTargetEntry((Expr *) var, 0, NULL, true);
+		te = makeTargetEntry((Expr *) var, InvalidAttrNumber, NULL, true);
 		exclRelTlist = lappend(exclRelTlist, te);
 
 		/*
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/gram.c postgresql-9.5-9.5.8/src/backend/parser/gram.c
--- postgresql-9.5-9.5.2/src/backend/parser/gram.c	2016-03-28 20:22:59.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/gram.c	2017-08-07 21:34:38.000000000 +0000
@@ -1040,16 +1040,16 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  755
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   90345
+#define YYLAST   90318
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  456
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  612
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  2485
+#define YYNRULES  2487
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  4925
+#define YYNSTATES  4931
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
@@ -1154,240 +1154,240 @@
      871,   872,   873,   874,   875,   876,   877,   879,   889,   900,
      901,   902,   911,   912,   916,   917,   921,   926,   930,   935,
      940,   944,   948,   953,   957,  1015,  1017,  1021,  1025,  1029,
-    1033,  1047,  1065,  1076,  1077,  1081,  1089,  1107,  1119,  1140,
-    1147,  1166,  1173,  1190,  1208,  1219,  1220,  1232,  1239,  1256,
-    1266,  1276,  1291,  1309,  1310,  1314,  1321,  1329,  1330,  1331,
-    1332,  1333,  1334,  1348,  1354,  1360,  1369,  1377,  1385,  1389,
-    1397,  1405,  1412,  1421,  1422,  1430,  1441,  1449,  1457,  1468,
-    1476,  1484,  1491,  1500,  1510,  1511,  1515,  1516,  1519,  1521,
-    1525,  1526,  1527,  1528,  1532,  1533,  1534,  1540,  1552,  1556,
-    1560,  1575,  1582,  1583,  1584,  1588,  1589,  1590,  1594,  1595,
-    1599,  1603,  1604,  1611,  1618,  1628,  1635,  1645,  1646,  1651,
-    1652,  1657,  1663,  1669,  1675,  1681,  1691,  1701,  1702,  1706,
-    1707,  1715,  1730,  1736,  1742,  1748,  1754,  1773,  1782,  1791,
-    1802,  1813,  1822,  1831,  1842,  1853,  1862,  1871,  1880,  1889,
-    1898,  1907,  1918,  1932,  1933,  1938,  1946,  1954,  1963,  1971,
-    1979,  1988,  1997,  2006,  2015,  2025,  2038,  2053,  2062,  2070,
-    2085,  2093,  2103,  2113,  2120,  2127,  2135,  2143,  2150,  2157,
-    2165,  2173,  2181,  2188,  2195,  2203,  2210,  2217,  2225,  2233,
-    2241,  2249,  2257,  2265,  2275,  2282,  2290,  2298,  2306,  2314,
-    2322,  2329,  2336,  2343,  2349,  2359,  2360,  2364,  2365,  2366,
-    2370,  2378,  2382,  2383,  2387,  2394,  2401,  2408,  2418,  2421,
-    2422,  2426,  2427,  2432,  2436,  2440,  2445,  2460,  2473,  2474,
-    2479,  2488,  2498,  2508,  2534,  2540,  2570,  2599,  2621,  2622,
-    2626,  2627,  2636,  2637,  2638,  2641,  2642,  2647,  2648,  2652,
-    2656,  2660,  2664,  2668,  2672,  2676,  2680,  2684,  2688,  2692,
-    2696,  2700,  2704,  2713,  2717,  2721,  2725,  2729,  2733,  2737,
-    2738,  2743,  2747,  2754,  2761,  2762,  2763,  2764,  2765,  2769,
-    2773,  2781,  2792,  2808,  2825,  2842,  2872,  2873,  2874,  2875,
-    2876,  2883,  2890,  2891,  2895,  2896,  2900,  2901,  2905,  2909,
-    2916,  2920,  2927,  2928,  2929,  2933,  2934,  2937,  2958,  2979,
-    2980,  2984,  2992,  2993,  2994,  3025,  3032,  3039,  3050,  3061,
-    3071,  3080,  3113,  3120,  3127,  3134,  3145,  3155,  3156,  3157,
-    3161,  3162,  3163,  3164,  3165,  3166,  3175,  3183,  3187,  3200,
-    3215,  3229,  3244,  3258,  3276,  3297,  3298,  3302,  3303,  3307,
-    3308,  3311,  3317,  3321,  3329,  3334,  3340,  3341,  3345,  3350,
-    3357,  3358,  3368,  3370,  3372,  3374,  3377,  3380,  3383,  3387,
-    3388,  3389,  3390,  3391,  3394,  3395,  3400,  3401,  3402,  3403,
-    3406,  3407,  3408,  3409,  3412,  3413,  3416,  3417,  3420,  3435,
-    3448,  3464,  3478,  3479,  3480,  3492,  3505,  3521,  3534,  3535,
-    3547,  3567,  3577,  3590,  3598,  3609,  3610,  3613,  3614,  3617,
-    3621,  3625,  3629,  3633,  3637,  3641,  3645,  3649,  3653,  3657,
-    3661,  3667,  3668,  3672,  3673,  3678,  3681,  3682,  3694,  3706,
-    3721,  3722,  3730,  3731,  3735,  3736,  3740,  3741,  3745,  3746,
-    3750,  3761,  3774,  3775,  3785,  3796,  3797,  3810,  3817,  3834,
-    3842,  3853,  3856,  3860,  3864,  3868,  3880,  3890,  3893,  3897,
-    3910,  3920,  3930,  3939,  3948,  3957,  3967,  3976,  3986,  3995,
-    4004,  4013,  4022,  4031,  4040,  4049,  4058,  4067,  4076,  4085,
-    4094,  4103,  4112,  4121,  4131,  4149,  4160,  4161,  4162,  4163,
-    4167,  4168,  4172,  4173,  4183,  4194,  4214,  4222,  4234,  4235,
-    4239,  4243,  4251,  4255,  4259,  4266,  4270,  4275,  4280,  4287,
-    4294,  4299,  4309,  4323,  4324,  4329,  4330,  4334,  4335,  4345,
-    4356,  4376,  4385,  4393,  4410,  4430,  4460,  4469,  4490,  4505,
-    4506,  4510,  4518,  4533,  4544,  4545,  4555,  4563,  4580,  4602,
-    4618,  4632,  4643,  4657,  4658,  4662,  4663,  4667,  4668,  4672,
-    4673,  4677,  4678,  4682,  4683,  4684,  4685,  4686,  4698,  4718,
-    4743,  4744,  4745,  4749,  4751,  4773,  4775,  4777,  4779,  4781,
-    4786,  4791,  4801,  4802,  4806,  4807,  4811,  4812,  4816,  4817,
-    4818,  4822,  4826,  4827,  4828,  4832,  4833,  4838,  4839,  4866,
-    4867,  4868,  4869,  4870,  4871,  4876,  4887,  4910,  4920,  4934,
-    4936,  4941,  4946,  4948,  4953,  4963,  4964,  4965,  4966,  4978,
-    4998,  5021,  5031,  5042,  5052,  5062,  5073,  5082,  5089,  5096,
-    5105,  5114,  5123,  5132,  5141,  5152,  5155,  5156,  5159,  5163,
-    5170,  5171,  5172,  5173,  5174,  5177,  5180,  5181,  5189,  5196,
-    5197,  5200,  5202,  5213,  5223,  5233,  5245,  5246,  5262,  5277,
-    5278,  5282,  5292,  5303,  5312,  5322,  5331,  5332,  5335,  5336,
-    5339,  5340,  5341,  5344,  5358,  5363,  5373,  5382,  5394,  5395,
-    5399,  5407,  5419,  5429,  5442,  5452,  5474,  5484,  5502,  5513,
-    5524,  5534,  5544,  5554,  5564,  5575,  5589,  5590,  5591,  5592,
-    5593,  5594,  5595,  5596,  5597,  5598,  5599,  5600,  5601,  5602,
-    5603,  5607,  5608,  5611,  5612,  5615,  5617,  5622,  5623,  5633,
-    5644,  5645,  5646,  5679,  5688,  5697,  5706,  5715,  5724,  5733,
-    5742,  5756,  5765,  5774,  5784,  5793,  5802,  5810,  5819,  5828,
-    5837,  5849,  5850,  5851,  5852,  5853,  5854,  5855,  5856,  5857,
-    5858,  5859,  5860,  5861,  5862,  5863,  5864,  5865,  5866,  5867,
-    5868,  5869,  5873,  5874,  5888,  5899,  5910,  5921,  5932,  5943,
-    5954,  5967,  5968,  5972,  5973,  5974,  5975,  5976,  5977,  5978,
-    5979,  5980,  5981,  5982,  5985,  5986,  5996,  6002,  6010,  6018,
-    6026,  6034,  6042,  6050,  6058,  6066,  6074,  6082,  6090,  6098,
-    6106,  6114,  6122,  6130,  6140,  6141,  6144,  6145,  6155,  6171,
-    6185,  6211,  6213,  6215,  6217,  6224,  6233,  6234,  6237,  6244,
-    6251,  6258,  6272,  6280,  6288,  6296,  6304,  6312,  6320,  6328,
-    6336,  6344,  6352,  6360,  6368,  6376,  6384,  6392,  6404,  6405,
-    6409,  6410,  6415,  6416,  6420,  6421,  6426,  6442,  6455,  6465,
-    6477,  6478,  6481,  6482,  6492,  6502,  6503,  6507,  6511,  6515,
-    6526,  6539,  6553,  6570,  6571,  6572,  6573,  6585,  6611,  6640,
-    6641,  6645,  6646,  6650,  6651,  6655,  6656,  6659,  6660,  6668,
-    6679,  6690,  6703,  6704,  6707,  6708,  6709,  6712,  6713,  6714,
-    6717,  6718,  6719,  6735,  6747,  6760,  6775,  6776,  6779,  6780,
-    6784,  6785,  6793,  6794,  6798,  6799,  6814,  6823,  6832,  6841,
-    6850,  6862,  6863,  6864,  6865,  6866,  6872,  6876,  6891,  6892,
-    6898,  6908,  6912,  6917,  6925,  6966,  6970,  6974,  6978,  6986,
-    6987,  6992,  6993,  7000,  7004,  7008,  7012,  7016,  7020,  7024,
-    7028,  7032,  7036,  7040,  7044,  7048,  7052,  7056,  7064,  7068,
-    7072,  7076,  7080,  7086,  7087,  7094,  7095,  7099,  7100,  7103,
-    7115,  7119,  7134,  7145,  7146,  7151,  7152,  7167,  7178,  7192,
-    7203,  7217,  7228,  7242,  7250,  7252,  7254,  7259,  7261,  7274,
-    7283,  7284,  7288,  7292,  7304,  7315,  7326,  7339,  7340,  7341,
-    7345,  7358,  7359,  7369,  7381,  7385,  7389,  7393,  7400,  7421,
-    7430,  7439,  7448,  7459,  7460,  7463,  7464,  7465,  7468,  7469,
-    7472,  7482,  7491,  7508,  7518,  7527,  7536,  7545,  7554,  7563,
-    7572,  7582,  7591,  7600,  7609,  7618,  7628,  7638,  7647,  7656,
-    7666,  7676,  7686,  7696,  7706,  7716,  7726,  7736,  7746,  7756,
-    7766,  7776,  7787,  7798,  7809,  7820,  7830,  7840,  7851,  7862,
-    7872,  7882,  7890,  7899,  7908,  7917,  7926,  7935,  7944,  7953,
-    7962,  7976,  7977,  7980,  7981,  7991,  8001,  8010,  8019,  8028,
-    8037,  8047,  8057,  8066,  8075,  8084,  8093,  8102,  8111,  8120,
-    8129,  8138,  8147,  8156,  8165,  8174,  8183,  8192,  8201,  8218,
-    8227,  8235,  8243,  8251,  8259,  8268,  8276,  8284,  8293,  8301,
-    8309,  8317,  8325,  8333,  8341,  8349,  8357,  8365,  8382,  8399,
-    8400,  8401,  8406,  8412,  8421,  8422,  8423,  8424,  8425,  8429,
-    8430,  8433,  8434,  8435,  8436,  8440,  8441,  8442,  8447,  8458,
-    8480,  8490,  8491,  8494,  8503,  8509,  8528,  8535,  8542,  8549,
-    8556,  8563,  8570,  8578,  8586,  8594,  8602,  8610,  8617,  8624,
-    8633,  8634,  8635,  8639,  8642,  8645,  8648,  8651,  8658,  8660,
-    8662,  8667,  8669,  8681,  8694,  8707,  8725,  8746,  8747,  8748,
-    8749,  8759,  8775,  8785,  8786,  8790,  8791,  8795,  8799,  8803,
-    8821,  8822,  8823,  8824,  8825,  8826,  8827,  8834,  8835,  8846,
-    8853,  8860,  8871,  8888,  8895,  8913,  8919,  8935,  8948,  8957,
-    8965,  8973,  8982,  8993,  9004,  9014,  9015,  9026,  9036,  9047,
-    9058,  9069,  9080,  9089,  9101,  9102,  9116,  9139,  9147,  9156,
-    9167,  9168,  9180,  9194,  9208,  9220,  9228,  9241,  9242,  9246,
-    9247,  9248,  9249,  9253,  9263,  9276,  9277,  9281,  9282,  9285,
-    9286,  9289,  9290,  9294,  9295,  9308,  9315,  9325,  9332,  9342,
-    9343,  9344,  9345,  9346,  9347,  9348,  9349,  9350,  9354,  9358,
-    9365,  9372,  9373,  9377,  9378,  9379,  9389,  9399,  9400,  9404,
-    9405,  9406,  9407,  9417,  9424,  9442,  9443,  9453,  9459,  9465,
-    9471,  9487,  9505,  9509,  9517,  9523,  9529,  9538,  9540,  9545,
-    9556,  9566,  9576,  9582,  9591,  9600,  9606,  9607,  9618,  9632,
-    9633,  9644,  9655,  9656,  9659,  9660,  9661,  9662,  9663,  9664,
-    9665,  9666,  9669,  9670,  9674,  9675,  9676,  9687,  9705,  9706,
-    9710,  9711,  9715,  9731,  9757,  9790,  9801,  9802,  9812,  9823,
-    9826,  9827,  9828,  9829,  9830,  9833,  9834,  9835,  9883,  9884,
-    9888,  9889,  9904,  9905,  9912,  9920,  9928,  9936,  9944,  9952,
-    9963,  9964,  9991, 10005, 10020, 10021, 10040, 10044, 10048, 10065,
-   10072, 10079, 10089, 10090, 10093, 10105, 10106, 10110, 10122, 10130,
-   10135, 10140, 10145, 10150, 10158, 10166, 10171, 10176, 10183, 10184,
-   10188, 10189, 10190, 10197, 10198, 10202, 10203, 10207, 10208, 10212,
-   10216, 10217, 10220, 10229, 10242, 10243, 10244, 10245, 10249, 10250,
-   10254, 10256, 10266, 10271, 10274, 10279, 10280, 10288, 10298, 10299,
-   10300, 10308, 10312, 10313, 10316, 10317, 10342, 10343, 10347, 10348,
-   10352, 10353, 10354, 10355, 10356, 10360, 10373, 10380, 10387, 10394,
-   10395, 10399, 10400, 10404, 10405, 10409, 10410, 10414, 10425, 10426,
-   10427, 10428, 10432, 10433, 10438, 10444, 10462, 10463, 10467, 10468,
-   10474, 10479, 10487, 10494, 10502, 10537, 10562, 10566, 10592, 10596,
-   10608, 10621, 10635, 10646, 10661, 10667, 10672, 10678, 10685, 10686,
-   10694, 10698, 10702, 10708, 10715, 10720, 10721, 10722, 10723, 10727,
-   10728, 10740, 10741, 10746, 10753, 10760, 10767, 10778, 10779, 10792,
-   10796, 10803, 10816, 10829, 10830, 10845, 10855, 10867, 10872, 10873,
-   10876, 10877, 10880, 10881, 10886, 10887, 10892, 10893, 10901, 10906,
-   10907, 10911, 10915, 10921, 10951, 10956, 10963, 10968, 10974, 10979,
-   10988, 10990, 10993, 10997, 10998, 10999, 11000, 11001, 11002, 11007,
-   11027, 11028, 11029, 11030, 11041, 11047, 11055, 11056, 11062, 11067,
-   11072, 11077, 11082, 11087, 11092, 11097, 11103, 11109, 11115, 11122,
-   11144, 11153, 11157, 11165, 11169, 11177, 11189, 11210, 11214, 11220,
-   11224, 11237, 11248, 11263, 11265, 11267, 11269, 11271, 11273, 11278,
-   11279, 11283, 11284, 11291, 11300, 11308, 11317, 11328, 11336, 11337,
-   11338, 11342, 11344, 11346, 11348, 11350, 11352, 11354, 11359, 11364,
-   11370, 11378, 11383, 11390, 11397, 11401, 11405, 11441, 11442, 11444,
-   11452, 11467, 11469, 11471, 11473, 11475, 11477, 11479, 11481, 11483,
-   11485, 11487, 11489, 11491, 11493, 11496, 11498, 11500, 11503, 11505,
-   11507, 11509, 11512, 11517, 11525, 11530, 11538, 11543, 11551, 11556,
-   11565, 11573, 11581, 11589, 11607, 11615, 11623, 11631, 11639, 11655,
-   11663, 11671, 11679, 11687, 11695, 11703, 11707, 11713, 11717, 11721,
-   11729, 11737, 11745, 11753, 11773, 11795, 11806, 11813, 11829, 11834,
-   11851, 11853, 11855, 11857, 11859, 11861, 11863, 11865, 11867, 11869,
-   11871, 11873, 11875, 11877, 11879, 11881, 11883, 11885, 11887, 11889,
-   11893, 11899, 11903, 11907, 11912, 11928, 11929, 11930, 11945, 11975,
-   11977, 11979, 11990, 12014, 12025, 12036, 12044, 12054, 12064, 12073,
-   12077, 12083, 12090, 12097, 12107, 12114, 12142, 12177, 12188, 12189,
-   12196, 12202, 12228, 12238, 12251, 12259, 12272, 12282, 12295, 12305,
-   12318, 12322, 12326, 12330, 12334, 12338, 12342, 12344, 12348, 12357,
-   12362, 12369, 12384, 12391, 12395, 12399, 12403, 12407, 12414, 12422,
-   12430, 12434, 12438, 12442, 12446, 12450, 12456, 12460, 12469, 12473,
-   12477, 12482, 12496, 12498, 12502, 12504, 12506, 12509, 12512, 12515,
-   12516, 12519, 12527, 12537, 12538, 12541, 12542, 12543, 12548, 12552,
-   12556, 12560, 12571, 12572, 12576, 12577, 12585, 12586, 12590, 12591,
-   12596, 12604, 12606, 12620, 12623, 12650, 12651, 12654, 12655, 12666,
-   12684, 12691, 12700, 12717, 12762, 12770, 12778, 12786, 12794, 12815,
-   12816, 12817, 12820, 12821, 12824, 12827, 12828, 12829, 12832, 12833,
-   12836, 12837, 12838, 12839, 12840, 12841, 12842, 12843, 12844, 12845,
-   12846, 12847, 12850, 12852, 12857, 12859, 12864, 12866, 12868, 12870,
-   12872, 12874, 12886, 12890, 12897, 12901, 12907, 12911, 12920, 12931,
-   12932, 12935, 12939, 12943, 12949, 12950, 12955, 12959, 12966, 12967,
-   12968, 12969, 12970, 12971, 12972, 12973, 12983, 12987, 12994, 13001,
-   13002, 13018, 13022, 13027, 13031, 13046, 13051, 13055, 13058, 13061,
-   13062, 13063, 13066, 13073, 13083, 13097, 13098, 13102, 13113, 13114,
-   13117, 13118, 13121, 13125, 13132, 13136, 13140, 13147, 13157, 13158,
-   13162, 13163, 13166, 13167, 13178, 13179, 13188, 13189, 13197, 13207,
-   13208, 13212, 13213, 13216, 13232, 13240, 13248, 13270, 13271, 13282,
-   13286, 13313, 13315, 13320, 13323, 13326, 13328, 13330, 13332, 13342,
-   13344, 13355, 13359, 13363, 13367, 13371, 13380, 13387, 13419, 13423,
-   13429, 13436, 13440, 13444, 13450, 13451, 13453, 13454, 13455, 13459,
-   13489, 13516, 13520, 13526, 13528, 13545, 13546, 13547, 13552, 13553,
-   13554, 13559, 13560, 13561, 13562, 13568, 13569, 13570, 13571, 13572,
-   13592, 13593, 13594, 13595, 13596, 13597, 13598, 13599, 13600, 13601,
-   13602, 13603, 13604, 13605, 13606, 13607, 13608, 13609, 13610, 13611,
-   13612, 13613, 13614, 13615, 13616, 13617, 13618, 13619, 13620, 13621,
-   13622, 13623, 13624, 13625, 13626, 13627, 13628, 13629, 13630, 13631,
-   13632, 13633, 13634, 13635, 13636, 13637, 13638, 13639, 13640, 13641,
-   13642, 13643, 13644, 13645, 13646, 13647, 13648, 13649, 13650, 13651,
-   13652, 13653, 13654, 13655, 13656, 13657, 13658, 13659, 13660, 13661,
-   13662, 13663, 13664, 13665, 13666, 13667, 13668, 13669, 13670, 13671,
-   13672, 13673, 13674, 13675, 13676, 13677, 13678, 13679, 13680, 13681,
-   13682, 13683, 13684, 13685, 13686, 13687, 13688, 13689, 13690, 13691,
-   13692, 13693, 13694, 13695, 13696, 13697, 13698, 13699, 13700, 13701,
-   13702, 13703, 13704, 13705, 13706, 13707, 13708, 13709, 13710, 13711,
-   13712, 13713, 13714, 13715, 13716, 13717, 13718, 13719, 13720, 13721,
-   13722, 13723, 13724, 13725, 13726, 13727, 13728, 13729, 13730, 13731,
-   13732, 13733, 13734, 13735, 13736, 13737, 13738, 13739, 13740, 13741,
-   13742, 13743, 13744, 13745, 13746, 13747, 13748, 13749, 13750, 13751,
-   13752, 13753, 13754, 13755, 13756, 13757, 13758, 13759, 13760, 13761,
-   13762, 13763, 13764, 13765, 13766, 13767, 13768, 13769, 13770, 13771,
-   13772, 13773, 13774, 13775, 13776, 13777, 13778, 13779, 13780, 13781,
-   13782, 13783, 13784, 13785, 13786, 13787, 13788, 13789, 13790, 13791,
-   13792, 13793, 13794, 13795, 13796, 13797, 13798, 13799, 13800, 13801,
-   13802, 13803, 13804, 13805, 13806, 13807, 13808, 13809, 13810, 13811,
-   13812, 13813, 13814, 13815, 13816, 13817, 13818, 13819, 13820, 13821,
-   13822, 13823, 13824, 13825, 13826, 13827, 13828, 13829, 13830, 13831,
-   13832, 13833, 13834, 13835, 13836, 13837, 13838, 13839, 13840, 13841,
-   13842, 13843, 13844, 13845, 13846, 13847, 13848, 13849, 13850, 13851,
-   13852, 13853, 13854, 13855, 13856, 13857, 13858, 13859, 13873, 13874,
-   13875, 13876, 13877, 13878, 13879, 13880, 13881, 13882, 13883, 13884,
-   13885, 13886, 13887, 13888, 13889, 13890, 13891, 13892, 13893, 13894,
-   13895, 13896, 13897, 13898, 13899, 13900, 13901, 13902, 13903, 13904,
-   13905, 13906, 13907, 13908, 13909, 13910, 13911, 13912, 13913, 13914,
-   13915, 13916, 13917, 13918, 13919, 13920, 13934, 13935, 13936, 13937,
-   13938, 13939, 13940, 13941, 13942, 13943, 13944, 13945, 13946, 13947,
-   13948, 13949, 13950, 13951, 13952, 13953, 13954, 13955, 13956, 13966,
-   13967, 13968, 13969, 13970, 13971, 13972, 13973, 13974, 13975, 13976,
-   13977, 13978, 13979, 13980, 13981, 13982, 13983, 13984, 13985, 13986,
-   13987, 13988, 13989, 13990, 13991, 13992, 13993, 13994, 13995, 13996,
-   13997, 13998, 13999, 14000, 14001, 14002, 14003, 14004, 14005, 14006,
-   14007, 14008, 14009, 14010, 14011, 14012, 14013, 14014, 14015, 14016,
-   14017, 14018, 14019, 14020, 14021, 14022, 14023, 14024, 14025, 14026,
-   14027, 14028, 14029, 14030, 14031, 14032, 14033, 14034, 14035, 14036,
-   14037, 14038, 14039, 14040, 14041, 14042
+    1033,  1047,  1065,  1076,  1077,  1081,  1089,  1107,  1119,  1127,
+    1148,  1155,  1174,  1181,  1198,  1216,  1227,  1228,  1240,  1247,
+    1264,  1274,  1284,  1299,  1317,  1318,  1322,  1329,  1337,  1338,
+    1339,  1340,  1341,  1342,  1356,  1362,  1368,  1377,  1385,  1393,
+    1397,  1405,  1413,  1420,  1429,  1430,  1438,  1449,  1457,  1465,
+    1476,  1484,  1492,  1499,  1508,  1518,  1519,  1523,  1524,  1527,
+    1529,  1533,  1534,  1535,  1536,  1540,  1541,  1542,  1548,  1560,
+    1564,  1568,  1583,  1590,  1591,  1592,  1596,  1597,  1598,  1602,
+    1603,  1607,  1611,  1612,  1619,  1626,  1636,  1643,  1653,  1654,
+    1659,  1660,  1665,  1671,  1677,  1683,  1689,  1699,  1709,  1710,
+    1714,  1715,  1723,  1738,  1744,  1750,  1756,  1762,  1781,  1790,
+    1799,  1810,  1821,  1830,  1839,  1850,  1861,  1870,  1879,  1888,
+    1897,  1906,  1915,  1926,  1940,  1941,  1946,  1954,  1962,  1971,
+    1979,  1987,  1996,  2005,  2014,  2023,  2033,  2046,  2061,  2070,
+    2078,  2093,  2101,  2111,  2121,  2128,  2135,  2143,  2151,  2158,
+    2165,  2173,  2181,  2189,  2196,  2203,  2211,  2218,  2225,  2233,
+    2241,  2249,  2257,  2265,  2273,  2283,  2290,  2298,  2306,  2314,
+    2322,  2330,  2337,  2344,  2351,  2357,  2367,  2368,  2372,  2373,
+    2374,  2378,  2386,  2390,  2391,  2395,  2402,  2409,  2416,  2426,
+    2429,  2430,  2434,  2435,  2440,  2444,  2448,  2453,  2468,  2481,
+    2482,  2487,  2496,  2506,  2516,  2542,  2548,  2578,  2607,  2629,
+    2630,  2634,  2635,  2644,  2645,  2646,  2649,  2650,  2655,  2656,
+    2660,  2664,  2668,  2672,  2676,  2680,  2684,  2688,  2692,  2696,
+    2700,  2704,  2708,  2712,  2721,  2725,  2729,  2733,  2737,  2741,
+    2745,  2746,  2751,  2755,  2762,  2769,  2770,  2771,  2772,  2773,
+    2777,  2781,  2789,  2800,  2816,  2833,  2850,  2880,  2881,  2882,
+    2883,  2884,  2891,  2898,  2899,  2903,  2904,  2908,  2909,  2913,
+    2917,  2924,  2928,  2935,  2936,  2937,  2941,  2942,  2945,  2966,
+    2987,  2988,  2992,  3000,  3001,  3002,  3033,  3040,  3047,  3058,
+    3069,  3079,  3088,  3121,  3128,  3135,  3142,  3153,  3163,  3164,
+    3165,  3169,  3170,  3171,  3172,  3173,  3174,  3183,  3191,  3195,
+    3208,  3223,  3237,  3252,  3266,  3284,  3305,  3306,  3310,  3311,
+    3315,  3316,  3319,  3325,  3329,  3337,  3342,  3348,  3349,  3353,
+    3358,  3365,  3366,  3376,  3378,  3380,  3382,  3385,  3388,  3391,
+    3395,  3396,  3397,  3398,  3399,  3402,  3403,  3408,  3409,  3410,
+    3411,  3414,  3415,  3416,  3417,  3420,  3421,  3424,  3425,  3428,
+    3443,  3456,  3472,  3486,  3487,  3488,  3500,  3513,  3529,  3542,
+    3543,  3555,  3575,  3585,  3598,  3606,  3617,  3618,  3621,  3622,
+    3625,  3629,  3633,  3637,  3641,  3645,  3649,  3653,  3657,  3661,
+    3665,  3669,  3675,  3676,  3680,  3681,  3682,  3687,  3690,  3691,
+    3703,  3715,  3730,  3731,  3739,  3740,  3744,  3745,  3749,  3750,
+    3754,  3755,  3759,  3770,  3783,  3784,  3794,  3805,  3806,  3819,
+    3826,  3843,  3851,  3862,  3865,  3869,  3873,  3877,  3889,  3899,
+    3902,  3906,  3919,  3929,  3939,  3948,  3957,  3966,  3976,  3985,
+    3995,  4004,  4013,  4022,  4031,  4040,  4049,  4058,  4067,  4076,
+    4085,  4094,  4103,  4112,  4121,  4130,  4140,  4158,  4169,  4170,
+    4171,  4172,  4176,  4177,  4181,  4182,  4192,  4203,  4223,  4231,
+    4243,  4244,  4248,  4252,  4260,  4264,  4268,  4275,  4279,  4284,
+    4289,  4296,  4303,  4308,  4318,  4332,  4333,  4338,  4339,  4343,
+    4344,  4354,  4365,  4385,  4394,  4402,  4419,  4439,  4469,  4478,
+    4499,  4514,  4515,  4519,  4527,  4542,  4553,  4554,  4564,  4572,
+    4589,  4611,  4627,  4641,  4652,  4666,  4667,  4671,  4672,  4676,
+    4677,  4681,  4682,  4686,  4687,  4691,  4692,  4693,  4694,  4695,
+    4707,  4727,  4752,  4753,  4754,  4758,  4760,  4782,  4784,  4786,
+    4788,  4790,  4795,  4800,  4810,  4811,  4815,  4816,  4820,  4821,
+    4825,  4826,  4827,  4831,  4835,  4836,  4837,  4841,  4842,  4847,
+    4848,  4875,  4876,  4877,  4878,  4879,  4880,  4885,  4896,  4919,
+    4929,  4943,  4945,  4950,  4955,  4957,  4962,  4972,  4973,  4974,
+    4975,  4987,  5007,  5030,  5040,  5051,  5061,  5071,  5082,  5091,
+    5098,  5105,  5114,  5123,  5132,  5141,  5150,  5161,  5164,  5165,
+    5168,  5172,  5179,  5180,  5181,  5182,  5183,  5186,  5189,  5190,
+    5198,  5205,  5206,  5209,  5211,  5222,  5232,  5242,  5254,  5255,
+    5271,  5286,  5287,  5291,  5301,  5312,  5321,  5331,  5340,  5341,
+    5344,  5345,  5348,  5349,  5350,  5353,  5367,  5372,  5382,  5391,
+    5403,  5404,  5408,  5416,  5428,  5438,  5451,  5461,  5483,  5493,
+    5511,  5522,  5533,  5543,  5553,  5563,  5573,  5584,  5598,  5599,
+    5600,  5601,  5602,  5603,  5604,  5605,  5606,  5607,  5608,  5609,
+    5610,  5611,  5612,  5616,  5617,  5620,  5621,  5624,  5626,  5631,
+    5632,  5642,  5653,  5654,  5655,  5688,  5697,  5706,  5715,  5724,
+    5733,  5742,  5751,  5765,  5774,  5783,  5793,  5802,  5811,  5819,
+    5828,  5837,  5846,  5858,  5859,  5860,  5861,  5862,  5863,  5864,
+    5865,  5866,  5867,  5868,  5869,  5870,  5871,  5872,  5873,  5874,
+    5875,  5876,  5877,  5878,  5882,  5883,  5897,  5908,  5919,  5930,
+    5941,  5952,  5963,  5976,  5977,  5981,  5982,  5983,  5984,  5985,
+    5986,  5987,  5988,  5989,  5990,  5991,  5994,  5995,  6005,  6011,
+    6019,  6027,  6035,  6043,  6051,  6059,  6067,  6075,  6083,  6091,
+    6099,  6107,  6115,  6123,  6131,  6139,  6149,  6150,  6153,  6154,
+    6164,  6180,  6194,  6220,  6222,  6224,  6226,  6233,  6242,  6243,
+    6246,  6253,  6260,  6267,  6281,  6289,  6297,  6305,  6313,  6321,
+    6329,  6337,  6345,  6353,  6361,  6369,  6377,  6385,  6393,  6401,
+    6413,  6414,  6418,  6419,  6424,  6425,  6429,  6430,  6435,  6451,
+    6464,  6474,  6486,  6487,  6490,  6491,  6501,  6511,  6512,  6516,
+    6520,  6524,  6535,  6548,  6562,  6579,  6580,  6581,  6582,  6594,
+    6620,  6649,  6650,  6654,  6655,  6659,  6660,  6664,  6665,  6668,
+    6669,  6677,  6688,  6699,  6712,  6713,  6716,  6717,  6718,  6721,
+    6722,  6723,  6726,  6727,  6728,  6744,  6756,  6769,  6784,  6785,
+    6788,  6789,  6793,  6794,  6802,  6803,  6807,  6808,  6823,  6832,
+    6841,  6850,  6859,  6871,  6872,  6873,  6874,  6875,  6881,  6885,
+    6900,  6901,  6907,  6917,  6921,  6926,  6934,  6975,  6979,  6983,
+    6987,  6995,  6996,  7001,  7002,  7009,  7013,  7017,  7021,  7025,
+    7029,  7033,  7037,  7041,  7045,  7049,  7053,  7057,  7061,  7065,
+    7073,  7077,  7081,  7085,  7089,  7095,  7096,  7103,  7104,  7108,
+    7109,  7112,  7124,  7128,  7143,  7154,  7155,  7160,  7161,  7176,
+    7187,  7201,  7212,  7226,  7237,  7251,  7259,  7261,  7263,  7268,
+    7270,  7283,  7292,  7293,  7297,  7301,  7313,  7324,  7335,  7348,
+    7349,  7350,  7354,  7367,  7368,  7378,  7390,  7394,  7398,  7402,
+    7409,  7430,  7439,  7448,  7457,  7468,  7469,  7472,  7473,  7474,
+    7477,  7478,  7481,  7491,  7500,  7517,  7527,  7536,  7545,  7554,
+    7563,  7572,  7581,  7591,  7600,  7609,  7618,  7627,  7637,  7647,
+    7656,  7665,  7675,  7685,  7695,  7705,  7715,  7725,  7735,  7745,
+    7755,  7765,  7775,  7785,  7796,  7807,  7818,  7829,  7839,  7849,
+    7860,  7871,  7881,  7891,  7899,  7908,  7917,  7926,  7935,  7944,
+    7953,  7962,  7971,  7985,  7986,  7989,  7990,  8000,  8010,  8019,
+    8028,  8037,  8046,  8056,  8066,  8075,  8084,  8093,  8102,  8111,
+    8120,  8129,  8138,  8147,  8156,  8165,  8174,  8183,  8192,  8201,
+    8210,  8227,  8236,  8244,  8252,  8260,  8268,  8277,  8285,  8293,
+    8302,  8310,  8318,  8326,  8334,  8342,  8350,  8358,  8366,  8374,
+    8391,  8408,  8409,  8410,  8415,  8421,  8430,  8431,  8432,  8433,
+    8434,  8438,  8439,  8442,  8443,  8444,  8445,  8449,  8450,  8451,
+    8456,  8467,  8489,  8499,  8500,  8503,  8512,  8518,  8537,  8544,
+    8551,  8558,  8565,  8572,  8579,  8587,  8595,  8603,  8611,  8619,
+    8626,  8633,  8642,  8643,  8644,  8648,  8651,  8654,  8657,  8660,
+    8667,  8669,  8671,  8676,  8678,  8690,  8703,  8716,  8734,  8755,
+    8756,  8757,  8758,  8768,  8784,  8794,  8795,  8799,  8800,  8804,
+    8808,  8812,  8830,  8831,  8832,  8833,  8834,  8835,  8836,  8843,
+    8844,  8855,  8862,  8869,  8880,  8897,  8904,  8922,  8928,  8944,
+    8957,  8966,  8974,  8982,  8991,  9002,  9013,  9023,  9024,  9035,
+    9045,  9056,  9067,  9078,  9089,  9098,  9110,  9111,  9125,  9148,
+    9156,  9165,  9176,  9177,  9189,  9203,  9217,  9229,  9237,  9250,
+    9251,  9255,  9256,  9257,  9258,  9262,  9272,  9285,  9286,  9290,
+    9291,  9294,  9295,  9298,  9299,  9303,  9304,  9317,  9324,  9334,
+    9341,  9351,  9352,  9353,  9354,  9355,  9356,  9357,  9358,  9359,
+    9363,  9367,  9374,  9381,  9382,  9386,  9387,  9388,  9398,  9408,
+    9409,  9413,  9414,  9415,  9416,  9426,  9433,  9451,  9452,  9462,
+    9468,  9474,  9480,  9496,  9514,  9518,  9526,  9532,  9538,  9547,
+    9549,  9554,  9565,  9575,  9585,  9591,  9600,  9609,  9615,  9616,
+    9627,  9641,  9642,  9653,  9664,  9665,  9668,  9669,  9670,  9671,
+    9672,  9673,  9674,  9675,  9678,  9679,  9683,  9684,  9685,  9696,
+    9714,  9715,  9719,  9720,  9724,  9740,  9766,  9799,  9810,  9811,
+    9821,  9832,  9835,  9836,  9837,  9838,  9839,  9842,  9843,  9844,
+    9892,  9893,  9897,  9898,  9913,  9914,  9921,  9929,  9937,  9945,
+    9953,  9961,  9972,  9973, 10000, 10014, 10029, 10030, 10049, 10053,
+   10057, 10074, 10081, 10088, 10098, 10099, 10102, 10114, 10115, 10119,
+   10131, 10139, 10144, 10149, 10154, 10159, 10167, 10175, 10180, 10185,
+   10192, 10193, 10197, 10198, 10199, 10206, 10207, 10211, 10212, 10216,
+   10217, 10221, 10225, 10226, 10229, 10238, 10251, 10252, 10253, 10254,
+   10258, 10259, 10263, 10265, 10275, 10280, 10283, 10288, 10289, 10297,
+   10307, 10308, 10309, 10317, 10321, 10322, 10325, 10326, 10351, 10352,
+   10356, 10357, 10361, 10362, 10363, 10364, 10365, 10369, 10382, 10389,
+   10396, 10403, 10404, 10408, 10409, 10413, 10414, 10418, 10419, 10423,
+   10434, 10435, 10436, 10437, 10441, 10442, 10447, 10453, 10471, 10472,
+   10476, 10477, 10483, 10488, 10496, 10503, 10511, 10546, 10571, 10575,
+   10601, 10605, 10617, 10630, 10644, 10655, 10670, 10676, 10681, 10687,
+   10694, 10695, 10703, 10707, 10711, 10717, 10724, 10729, 10730, 10731,
+   10732, 10736, 10737, 10749, 10750, 10755, 10762, 10769, 10776, 10787,
+   10788, 10801, 10805, 10812, 10825, 10838, 10839, 10854, 10864, 10876,
+   10881, 10882, 10885, 10886, 10889, 10890, 10895, 10896, 10901, 10902,
+   10910, 10915, 10916, 10920, 10924, 10930, 10960, 10965, 10972, 10977,
+   10983, 10988, 10997, 10999, 11002, 11006, 11007, 11008, 11009, 11010,
+   11011, 11016, 11036, 11037, 11038, 11039, 11050, 11056, 11064, 11065,
+   11071, 11076, 11081, 11086, 11091, 11096, 11101, 11106, 11112, 11118,
+   11124, 11131, 11153, 11162, 11166, 11174, 11178, 11186, 11198, 11219,
+   11223, 11229, 11233, 11246, 11257, 11272, 11274, 11276, 11278, 11280,
+   11282, 11287, 11288, 11292, 11293, 11300, 11309, 11317, 11326, 11337,
+   11345, 11346, 11347, 11351, 11353, 11355, 11357, 11359, 11361, 11363,
+   11368, 11373, 11379, 11387, 11392, 11399, 11406, 11410, 11414, 11450,
+   11451, 11453, 11461, 11476, 11478, 11480, 11482, 11484, 11486, 11488,
+   11490, 11492, 11494, 11496, 11498, 11500, 11502, 11505, 11507, 11509,
+   11512, 11514, 11516, 11518, 11521, 11526, 11534, 11539, 11547, 11552,
+   11560, 11565, 11574, 11582, 11590, 11598, 11616, 11624, 11632, 11640,
+   11648, 11664, 11672, 11680, 11688, 11696, 11704, 11712, 11716, 11722,
+   11726, 11730, 11738, 11746, 11754, 11762, 11782, 11804, 11815, 11822,
+   11838, 11843, 11860, 11862, 11864, 11866, 11868, 11870, 11872, 11874,
+   11876, 11878, 11880, 11882, 11884, 11886, 11888, 11890, 11892, 11894,
+   11896, 11898, 11902, 11908, 11912, 11916, 11921, 11937, 11938, 11939,
+   11954, 11988, 11990, 11992, 12003, 12027, 12038, 12049, 12057, 12067,
+   12077, 12086, 12090, 12096, 12103, 12110, 12120, 12127, 12155, 12190,
+   12201, 12202, 12209, 12215, 12241, 12251, 12264, 12272, 12285, 12295,
+   12308, 12318, 12331, 12335, 12339, 12343, 12347, 12351, 12355, 12357,
+   12361, 12370, 12375, 12382, 12397, 12404, 12408, 12412, 12416, 12420,
+   12427, 12435, 12443, 12447, 12451, 12455, 12459, 12463, 12469, 12473,
+   12482, 12486, 12490, 12495, 12509, 12511, 12515, 12517, 12519, 12522,
+   12525, 12528, 12529, 12532, 12540, 12550, 12551, 12554, 12555, 12556,
+   12561, 12565, 12569, 12573, 12584, 12585, 12589, 12590, 12598, 12599,
+   12603, 12604, 12609, 12617, 12619, 12633, 12636, 12663, 12664, 12667,
+   12668, 12679, 12697, 12704, 12713, 12730, 12775, 12783, 12791, 12799,
+   12807, 12828, 12829, 12830, 12833, 12834, 12837, 12840, 12841, 12842,
+   12845, 12846, 12849, 12850, 12851, 12852, 12853, 12854, 12855, 12856,
+   12857, 12858, 12859, 12860, 12863, 12865, 12870, 12872, 12877, 12879,
+   12881, 12883, 12885, 12887, 12899, 12903, 12910, 12914, 12920, 12924,
+   12933, 12944, 12945, 12948, 12952, 12956, 12962, 12963, 12968, 12972,
+   12979, 12980, 12981, 12982, 12983, 12984, 12985, 12986, 12996, 13000,
+   13007, 13014, 13015, 13031, 13035, 13040, 13044, 13059, 13064, 13068,
+   13071, 13074, 13075, 13076, 13079, 13086, 13096, 13110, 13111, 13115,
+   13126, 13127, 13130, 13131, 13134, 13138, 13145, 13149, 13153, 13160,
+   13170, 13171, 13175, 13176, 13179, 13180, 13191, 13192, 13201, 13202,
+   13210, 13220, 13221, 13225, 13226, 13229, 13245, 13253, 13261, 13283,
+   13284, 13295, 13299, 13326, 13328, 13333, 13336, 13339, 13341, 13343,
+   13345, 13355, 13357, 13368, 13372, 13376, 13380, 13384, 13393, 13400,
+   13432, 13436, 13442, 13449, 13453, 13457, 13463, 13464, 13466, 13467,
+   13468, 13472, 13502, 13529, 13533, 13539, 13541, 13558, 13559, 13560,
+   13565, 13566, 13567, 13572, 13573, 13574, 13575, 13581, 13582, 13583,
+   13584, 13585, 13605, 13606, 13607, 13608, 13609, 13610, 13611, 13612,
+   13613, 13614, 13615, 13616, 13617, 13618, 13619, 13620, 13621, 13622,
+   13623, 13624, 13625, 13626, 13627, 13628, 13629, 13630, 13631, 13632,
+   13633, 13634, 13635, 13636, 13637, 13638, 13639, 13640, 13641, 13642,
+   13643, 13644, 13645, 13646, 13647, 13648, 13649, 13650, 13651, 13652,
+   13653, 13654, 13655, 13656, 13657, 13658, 13659, 13660, 13661, 13662,
+   13663, 13664, 13665, 13666, 13667, 13668, 13669, 13670, 13671, 13672,
+   13673, 13674, 13675, 13676, 13677, 13678, 13679, 13680, 13681, 13682,
+   13683, 13684, 13685, 13686, 13687, 13688, 13689, 13690, 13691, 13692,
+   13693, 13694, 13695, 13696, 13697, 13698, 13699, 13700, 13701, 13702,
+   13703, 13704, 13705, 13706, 13707, 13708, 13709, 13710, 13711, 13712,
+   13713, 13714, 13715, 13716, 13717, 13718, 13719, 13720, 13721, 13722,
+   13723, 13724, 13725, 13726, 13727, 13728, 13729, 13730, 13731, 13732,
+   13733, 13734, 13735, 13736, 13737, 13738, 13739, 13740, 13741, 13742,
+   13743, 13744, 13745, 13746, 13747, 13748, 13749, 13750, 13751, 13752,
+   13753, 13754, 13755, 13756, 13757, 13758, 13759, 13760, 13761, 13762,
+   13763, 13764, 13765, 13766, 13767, 13768, 13769, 13770, 13771, 13772,
+   13773, 13774, 13775, 13776, 13777, 13778, 13779, 13780, 13781, 13782,
+   13783, 13784, 13785, 13786, 13787, 13788, 13789, 13790, 13791, 13792,
+   13793, 13794, 13795, 13796, 13797, 13798, 13799, 13800, 13801, 13802,
+   13803, 13804, 13805, 13806, 13807, 13808, 13809, 13810, 13811, 13812,
+   13813, 13814, 13815, 13816, 13817, 13818, 13819, 13820, 13821, 13822,
+   13823, 13824, 13825, 13826, 13827, 13828, 13829, 13830, 13831, 13832,
+   13833, 13834, 13835, 13836, 13837, 13838, 13839, 13840, 13841, 13842,
+   13843, 13844, 13845, 13846, 13847, 13848, 13849, 13850, 13851, 13852,
+   13853, 13854, 13855, 13856, 13857, 13858, 13859, 13860, 13861, 13862,
+   13863, 13864, 13865, 13866, 13867, 13868, 13869, 13870, 13871, 13872,
+   13886, 13887, 13888, 13889, 13890, 13891, 13892, 13893, 13894, 13895,
+   13896, 13897, 13898, 13899, 13900, 13901, 13902, 13903, 13904, 13905,
+   13906, 13907, 13908, 13909, 13910, 13911, 13912, 13913, 13914, 13915,
+   13916, 13917, 13918, 13919, 13920, 13921, 13922, 13923, 13924, 13925,
+   13926, 13927, 13928, 13929, 13930, 13931, 13932, 13933, 13947, 13948,
+   13949, 13950, 13951, 13952, 13953, 13954, 13955, 13956, 13957, 13958,
+   13959, 13960, 13961, 13962, 13963, 13964, 13965, 13966, 13967, 13968,
+   13969, 13979, 13980, 13981, 13982, 13983, 13984, 13985, 13986, 13987,
+   13988, 13989, 13990, 13991, 13992, 13993, 13994, 13995, 13996, 13997,
+   13998, 13999, 14000, 14001, 14002, 14003, 14004, 14005, 14006, 14007,
+   14008, 14009, 14010, 14011, 14012, 14013, 14014, 14015, 14016, 14017,
+   14018, 14019, 14020, 14021, 14022, 14023, 14024, 14025, 14026, 14027,
+   14028, 14029, 14030, 14031, 14032, 14033, 14034, 14035, 14036, 14037,
+   14038, 14039, 14040, 14041, 14042, 14043, 14044, 14045, 14046, 14047,
+   14048, 14049, 14050, 14051, 14052, 14053, 14054, 14055
 };
 #endif
 
@@ -1699,513 +1699,514 @@
 };
 # endif
 
-#define YYPACT_NINF -4210
+#define YYPACT_NINF -4439
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-4210)))
+  (!!((Yystate) == (-4439)))
 
-#define YYTABLE_NINF -2392
+#define YYTABLE_NINF -2394
 
 #define yytable_value_is_error(Yytable_value) \
-  (!!((Yytable_value) == (-2392)))
+  (!!((Yytable_value) == (-2394)))
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const int yypact[] =
 {
-    8739,   817, 14407, -4210, -4210,   817, -4210, 61574,    -6,   668,
-      58,   161, 16477, 62005, 68901,   251,   284, 12541,   817, 68901,
-    1536, 46920, 58557,   253, 68901,   959,   614, 46920, 68901, 69332,
-     909,  1156,   162, 69763, 62436, 57264,  1157, 68901,  1337,   342,
-   70194, 62867,  1181, 63298,   614, 43482,   109,  1143, 70625, 68901,
-    2279,  1639,  1236, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210,    -6, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210,  1843, -4210,  1007,
-    1999,  1177,   433,  1296, -4210, -4210, -4210, 55109, 68901, 68901,
-   68901,  1479, 68901,  1413, 68901,   189, 55109, 50799, 63729,  1549,
-    1401, 40028, 71056, -4210, 49506, 68901, 68901, 71487, 68901,  1482,
-   59850, 68901,  1508, 68901, 68901, 51230, 71918,  1737,  1269, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, 68901, 12061,   959, -4210, -4210, 68901,  1580,
-   55109, 68901,  1510, 68901,  1615, 68901, -4210, 68901,  1622, 72349,
-     447,  1235, 50799,  1505, 40460,  1723, 68901, 50799, 72780, 68901,
-   68901, -4210, -4210,  1649, 68901, 68901, -4210,  1801, 51661,    40,
-    1821,  1957,  1885,   688, -4210, 64160, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, 54247,   284, -4210, -4210, 55540, 68901,
-    1895, -4210, -4210, 73211, 87817,  1695, -4210,   514, 55971, 52092,
-    2016,  1666, 40892,  2042, 73642, 52523, 74073, -4210, -4210, 74504,
-   -4210, 74935,  1753,  1895, 75366, 88236, 52954, -4210,  1898, 75797,
-   -4210,  1670,  1287,  1800, 36560, -4210, -4210, -4210,    -6, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210,   312,  1211,   247,
-     211,   352, -4210, -4210,   214,   215,   218,   312,  2103,  2103,
-   -4210, 68901, -4210, -4210,  1211,    25,  1676,  1676,  1676,  1869,
-    1175, -4210,  1676,  1824, -4210, -4210, -4210, -4210, 63298, -4210,
-    1700,   959,  1699,  2115,  1792, -4210, -4210, -4210, -4210, -4210,
-    1798, 68901, 68901, 68901, -4210, -4210,  2168,  1791,  2026,  1781,
-   -4210, -4210, -4210,  1978,  2005,  2000,   120,   959,  1901, -4210,
-    2125, -4210,  2024, 26381, 26381,   959, 64591, 76228,   224, 54247,
-     959, 65022,  1860,  1123,  2033, -4210, -4210, -4210,   769, -4210,
-    2246,  1864,  2095,  1781,  1269, 37861, -4210,  1870,  1542, 63298,
-   -4210, -4210, -4210,   295,  2150, 26829, -4210, 68901,  1877, -4210,
-    1890,  1877,  1903,  1918,  1177, -4210,  8739, 68901,   888,   888,
-    2294,   888,  1275,  1521, -4210,  2272, -4210,  2217,  2194, 63298,
-    1143,   207, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210,  1949,  1542, -4210,   240, -4210,
-    1354,  1975,  1476,  1518, -4210, -4210,   900, 68901,  2069,   204,
-      -1,  1993, 65453,  1213,  1967, -4210, -4210, -4210,  2153,   853,
-   -4210, -4210, -4210, -4210,  2262,  2323,  4869,   309, 65884, -4210,
-   -4210, -4210, -4210, 68901, 68901, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210,  2030, -4210, -4210,  2034,  2352,  2240,
-    2325,  2197,  1155,  2252,   681,  2379,  6228,  1197, 66315, 68901,
-    2345,  2385,  6070,  1531,   873,  2277,   933,  2394,  2242,  1526,
-    2412,  6966, 68901, -4210,  2339,  2444,   910, -4210,   152, -4210,
-    2167,  2313,   763, 55109,  2145, -4210, -4210, 68901, -4210, -4210,
-   88655,  2222, -4210,   722, 55109, -4210,  2340,  2193, 41324, 68901,
-   -4210, 68901, -4210, -4210, -4210, -4210, -4210,  2283,  2466, 68901,
-   88655, -4210,  2417, 68901, -4210,  1676,  2337,  2183,  2571, 88655,
-     103, 68901,   -29,  2602, 68901,  2398,   -29,  2224, 76659, -4210,
-   -4210,   -29, -4210, -4210, -4210, 68901, 68901,  2201,  1184,  2386,
-     -29,  2413,  2610,  2616,  2286,  2390,   929,  1281,   184,  2525,
-     -29,  2274, 77090, 77521, 68901,  2276, 68901,  2603, 55109, 68901,
-    2532, -4210,  2396, -4210, -4210,  1062, -4210, -4210, -4210, -4210,
-    2546,  1949,   246,  2547,  2239,  2549, -4210, -4210, -4210,  2287,
-   -4210,  2287,  2287,  2241,  2241,  2410,  2263,  2573, -4210, -4210,
-   -4210,  1257,  2287,  2241, -4210, 89493, -4210,  1498,  1559, -4210,
-     191, -4210,  2678, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210,   146, -4210,   811,  1604, -4210, -4210,  2297, -4210,  2576,
-    1967,  2577, -4210,  2265, 77952, -4210, 78383, 78814,  2579,  2030,
-   50799,  2580,  2464,  2584,  2265,  2585,  2472,  2592,   246,  2593,
-   -4210,   957,  2582,  2595,  2479,  2597,   191,  2604,  1742,  2265,
-   54678,  2607,   371, -4210, 28621, -4210,  2382, -4210,  1143, -4210,
-    1187, -4210, 46058, -4210,  1800,  1211, -4210, 68901,  1211, 68901,
-    1211, 68901,  1211, 68901,  1211, 68901, 68901, 68901,  1211, -4210,
-   -4210, -4210, 68901,  2299, 68901, 68901, -4210, -4210, -4210, 58988,
-   50799, 59419, -4210, 68901, -4210,   101,   959, -4210, -4210, 88655,
-    2715, 50799,  2603, -4210,  1365, -4210, -4210, -4210, -4210, -4210,
-   -4210,  2536, 68901,  2599,  2600, 58988, 50799, -4210, 79245, 54247,
-    2497,  2309, -4210, -4210, -4210, -4210, -4210,  1809,  2756,   291,
-    2757, 28621,  2314,   243,   243,  2315,  2621, -4210, -4210, -4210,
-     244,  2329,  2330, -4210,   257,   257,  2331,  2333, -4210,   259,
-    2334,  2335,  2770,  2771,   261,  2336,  2338,  2342,  1257,   243,
-   28621, -4210,  2343,   257,  2344,  2350,  2351,  2782,  2353, -4210,
-    2784,  2354,   302,   372,  2355,  2357, -4210,  2331, -4210,   225,
-    2358,  2360,  2362,  2363,  2364,  2365,  2366,  2367, 28621, 28621,
-   28621, -4210, 25037,  1542,   959, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210,   266,  5245, -4210,  2374, -4210, -4210,  2553,
-   -4210, -4210, 28621, -4210, -4210,    96, -4210,   267, -4210, -4210,
-   -4210,  1542,  2619,  2371, -4210, -4210,  1406,  2375, -4210,  1910,
-   -4210, -4210, -4210, -4210, -4210, -4210, 53385,  2786, -4210,   306,
-     959,   152,  1597,  2739, 45196, 45627, -4210, -4210,  2617, -4210,
-   68901, -4210, -4210, 28621, 43051, -4210,  1542,   132, -4210, -4210,
-   -4210,  1560, -4210, -4210, -4210,    -6, -4210, 12936, -4210,  1594,
-    1877, 68901, 68901,  2799, -4210, -4210, -4210,  1890, -4210, -4210,
-    1177,  1177, 28621,  1177,  1151,  1445, 27277, 28621,  2682,  2581,
-     212,  1128,  2686, -4210,  2586,  1275,  1521, 63298, 68901, 79676,
-    2507, -4210, 43913,  1487,  1542,  2469,  2473,  2521, 47782,  2395,
-    2476,  2482,  2528, -4210,  2640, -4210, -4210,  2488,  2490, 80107,
-   -4210, -4210,   752, -4210, -4210, -4210,   752, -4210,  2419,  1293,
-     285,   238,  2491,   221,  1030,  2787, -4210,  1202,  2543, -4210,
-   -4210, -4210,  4458, 68901,  2729,  7240,  2620,   309,  2551, -4210,
-   -4210,  2668,  2508,  2509,  2635,   309,  1182, 80538, -4210, -4210,
-   -4210, -4210, -4210, -4210,  1933, 23751, -4210,  2512,  2492,  2523,
-   68901, 56402,   320,  2628,  1452,  1570,   222,  2569, 68901,   229,
-    2637, 68901,  2443,  2522,  2524,  2721,  2449,  1758,  2822,  2460,
-   -4210, -4210, -4210,  1524,  2644, -4210,  2740,  2778,  7311,  2526,
-    2531, 86979,   678, 41756, 68901, 68901,  2821,  1516,  2557, -4210,
-   -4210, -4210,  1516, 68901,  2559,  2561, 68901,   309, -4210,  2885,
-     309,   309,  1724,  2886,  2568,   395,  1457,   -29,  2460,  1694,
-   -4210,  2572,  2574,   294, -4210,  2680, -4210, -4210,  1233,  2583,
-   63298,   255,  1790,  2460,  2588,  2589,  2449,  2449, 68901, 68901,
-   68901, 68901, 68901,   201,  2908,  2913,  2590,   187,  2634,  2510,
-   -4210, 49937,  2598, 76228, -4210, -4210, 68901,  2605,  2073,  2460,
-    1477,  1503, -4210, -4210, -4210,  1269, -4210, 68901, -4210, 68901,
-    1949, 88655,  2708,  2769, -4210,  2560, -4210,  1967,   309, -4210,
-   68901, 68901,  2030,  2718,   990,  1080, 88655,  2722,  2783, 68901,
-    2785,  2570, -4210,   231, 44339, -4210,  2201,  2533,  2952, 68901,
-   47782, -4210,  2966,   752, -4210, 88655,  2733,  2852, -4210, 68901,
-    2750,  2556, -4210,  2887,  2618, -4210, -4210,    54, 68901, -4210,
-    2860, 50799,   274,   959,  2606, 50799,  2776, 68901, 68901, 68901,
-   68901, -4210, -4210,  2761,   746,   117, -4210, 49937, -4210, 68901,
-    2772,  1694,  2773,  2983,    62,  1676, 80969,  2867, -4210, 81400,
-    2578,  2986, 88655,  2815, -4210,  1855, -4210,  2698, -4210, 55109,
-     246, -4210, -4210, -4210, -4210, 88655, 68901, -4210,  2591, -4210,
-   -4210, 28621, -4210, -4210, -4210,  2103, -4210, 88655,  2287,  2287,
-   -4210, -4210,  2992,  2659,  2660,  2103, -4210,  2103, -4210, 88655,
-   -4210,  2601,  2608,  2700,  2103, -4210,  2665,  2666,  2667, -4210,
-    2596,  2672,  2103, -4210, -4210,  1856, -4210, 81831, 55109,   246,
-   50799, 50799,  2907,   371,  2911,  2661,  2929,  2676, 41756,   246,
-     454, 68901, 68901, 50799, 68901, 68901, 68901, -4210, 68901, -4210,
-   -4210, -4210, -4210, 88655, 68901, 68901, 88655, -4210, 50799, 49937,
-    2932,  2934,   246, 68901, 68901, -4210, 12936,  1662, 82262,  1800,
-   53816, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, 68901,
-   -4210, 68901, -4210, 68901, -4210, 68901, -4210, 68901, -4210, -4210,
-   -4210, 68901, -4210, 68901,  1667, -4210, -4210,  1668,   720, 68901,
-   68901,   789, 55109, 68901,  2829, 68901, 68901, 68901, 68901, 68901,
-    2710,  2375,   488, -4210,   239,   217, 63298,  2836, -4210, -4210,
-    1674,  2279,  1186, 68901,   982,  1798, -4210, -4210, 59419, 58557,
-    2927,   363, 68901, -4210, -4210,  2149, 28621,  1542, 25933, -4210,
-   -4210, 12936,  2677, 28621, 28621,  2636,  2103,  2103, -4210,   856,
-   28621, 28621, 28621,  2103,  2103,  2957, 28621, 41756, 28621, 31757,
-   21985, 28621, 28621, 25485, -4210, 28621,  2855, 33095, 28621,  1597,
-    2857, 28621,  1597,  2957,  3086,  3086,  2408,  5798,  2645,  1542,
-   -4210,  2103,  1031, -4210,   241, 88655, 28621, 28621, 28621, 28621,
-   47782,  2730,   205, 68901, 28621,  2650,  2072, -4210, 28621, -4210,
-    2654, 28621,  2732,   792, 28621, 28621, 28621, 28621, 28621, 28621,
-   28621, 28621, 28621, -4210, 33961,   249,  2940,  2965,    11,   455,
-   66746, 26381,  2959, 21087, -4210,   234,  2959, -4210, -4210, -4210,
-   68901,  2786, -4210, -4210,  2746, -4210, -4210, -4210, -4210, -4210,
-     275, -4210, -4210, -4210, -4210, -4210, -4210, -4210,  2670, -4210,
-   -4210, -4210, -4210,  2670, -4210,  2664,  3063, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210,  2949,  2958,   246, 68901,   295, 60281, -4210,
-   26829, -4210,  1685, -4210,  2689, -4210,  2928, -4210,  2687, -4210,
-    9977,  2928, -4210, -4210,   356,  2791,  2938,  2890, -4210, -4210,
-   -4210,  2697, 12936, -4210,  1190, 12936,  1543, -4210, -4210, -4210,
-   -4210, -4210, -4210,  1073, -4210, 68901,  1204,  2682,  1128,  2758,
-    1330,  3117, 68901, -4210, 38294,  2889, -4210,  3101, -4210, 89493,
-   -4210,  2705, -4210, 89074, 85710, -4210, -4210,   840, -4210,   838,
-    2788,  2790,  2833, 50799, 68901, 68901, -4210, 47782, 50799, 68901,
-   68901, -4210, 50799, 68901, 68901, -4210, -4210, -4210, -4210, -4210,
-   46489,   600, 58557,  2842, 57695, -4210, -4210,  2719, 68901,  2774,
-    2963,  2967,   -33, -4210, -4210, 82693, -4210,  2922, 50799, 68901,
-   68901, 28621,  2926, 68901, 68901, -4210,   478,  2803,  2805, -4210,
-   68901,  2806, 55109,  2731, 68901, 68901, 88655,  2802,   772, 55109,
-    2775, 42188, 68901, 68901, 68901, 68901,  2856,  3031, 88655, 68901,
-    2978,  1194, 63298,   245,  2102,  2460,  2937, -4210,  1380, -4210,
-   50799, 68901,  2930, -4210, -4210, -4210, 67177,  3145,  2844, -4210,
-   -4210, 83124, -4210, -4210, -4210,  1687, -4210, 50799, 50799, 68901,
-    7814, 68901,  1277, -4210, -4210, 88655, -4210, 68901, 68901, 68901,
-    2975, 68901, 60712, 83555, 83986,   649,  1374,  2976, 68901, 61143,
-    2977, -4210,  2873, 68901, -4210, -4210, 48213, 50799, 68901,   804,
-   47782, -4210, -4210, 68901, -4210,  2939,   779, -4210, 68901,  6860,
-   -4210,  2824,  2830, 68901,   260,  2215,  2460, 68901, 68901,  2744,
-    1692,  2826,  2877, -4210,  2944,    61, 68901, -4210, 50799,   886,
-   -4210,  2897, 50799, 68901,  7542, -4210, -4210,   309, -4210, -4210,
-   -4210, -4210, -4210, 68901, 68901,   309, 68901,   309,  1370, -4210,
-   50799, 68901, -4210, -4210, -4210, 68901,  7945, 68901, 68901, 68901,
-   68901, 50799, 68901, -4210, -4210,  1041,  1036,  1199,  1427,  2900,
-   68901,  3033, 68901, 84417, 50799, 68901, 68901, 68901,   972, -4210,
-    2876, -4210, 50799,   886,  8361, 68901, 68901,  2837,  2839,   183,
-    2918, -4210, -4210, -4210, -4210, -4210, -4210,  3013,  3180, 84848,
-     791, -4210,  3015,  3017,  2825,  2828,  3019, 68901,   791, 68901,
-   -4210, -4210, -4210, -4210,  3018, 68901,   791,  3021,   791,  2969,
-     142, -4210, -4210,   -29, -4210,  2789,  1702, -4210, -4210, 28621,
-   88655, -4210,  1710, -4210,  2793,   746, -4210, -4210, 47782, 68901,
-     698,   736,  3088, 56833,   981,  3074, 68901,  2827, 68901,  3077,
-     981, 68901, -4210,  1577, 58557, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210,  3078, -4210,   959,  2201,  2201,  2201,
-    2201, -4210, -4210, -4210, -4210,  2980,  1623, -4210,  2792,  2201,
-   68901,  2903,   981,  2796,  3096, -4210,  1694,  3098,  1320, 68901,
-   56833,  1912,  2832,  2996,  3206,  1676,   959,  3005,  2997, -4210,
-   24170,  3985,  2998,  3050, 54247,  3087,  3089,  3108, -4210,  1949,
-   -4210,  3227, -4210, 28621,  1712,  2812,   191, -4210, -4210,  2823,
-    2608,  2843,  2845,  2831,  2834, -4210,  2103,   192, 68901,  2835,
-    1037,   123,  2945,  2103,  3041,  2838, -4210,  3136,   246,  1967,
-   -4210,  2265, -4210, 68901, -4210, 68901, 68901, 68901, 68901,  2030,
-   -4210, -4210,  3022,   246,  2265,  3023,   246,   246, -4210,  3076,
-    3026,   246,   191,  2265,  2955,  3137, 54247, -4210,   371, -4210,
-   -4210, 28621,  3047,  1676, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210,  1725, -4210, 68901, -4210,  3112,  3113,  3114,  2851,
-    2853,  2892, 68901,  2854, -4210,  2851,   309,  2851,  2375,  2375,
-    2851,  2853, 50368,  3283,  3148, -4210,  2936,  2863,  3156,   711,
-   -4210,   805,    37,  3082, -4210, -4210, -4210, -4210, 88655, -4210,
-   -4210, -4210, -4210, -4210, 50799,  2901, 68901, 68901, -4210,   150,
-    3059,  2864, 50368,  3267,   246, -4210, 55109, -4210, -4210, 88655,
-    2942,  2960, 55109,  3068,  2916, -4210, -4210, -4210, -4210, -4210,
-   88655, -4210,  3118, 68901,  1727, -4210, -4210,  1468, -4210,  1481,
-   28621,   393, -4210, 10526,  1729, 28621,  2879,  2880, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210,  2881,  3169, -4210,  1743,  1747,
-    1766,  2882,  2883,  4714,  2884, 11206,  2888,  2878, 31757, 31757,
-   25037,  1991, -4210, 31757,  2891,  3067,  1772, 10337,  2893,  2895,
-   11225, 27725, 28621, 27725, 27725, 11540,  2893,  2898,  1774, 47782,
-    3061, 11890,  1783, -4210, 28621, 47782,  5448, 28621, -4210, 28621,
-    2904, -4210, -4210,  6613,  6613,  6613,  2957, -4210,  2905, -4210,
-   31757, 31757, -4210,  2326, 25037, -4210, -4210,  3182, -4210, -4210,
-    1522, -4210,  2894, -4210, -4210,  2566, 41756, 13389, 28621,   230,
-   28621,  2650, 28621,  2968,  6613,  6613,  6613,   424,   424,   272,
-     272,   272,   376,   455, -4210, -4210, -4210,  2906,  2909,  2910,
-    3075,  2920, 28621, -4210,  1776,  1995, 68901,  2675,  3475,  3531,
-   -4210, -4210, -4210, 34828,  2946, 28621, 28621, 28621,  2912, -4210,
-    1905, 12936,    39, -4210,   279,  2946, -4210,  1269,  2103,  1031,
-   46058, -4210, -4210, 28621, -4210, -4210, -4210,  1890, -4210, -4210,
-   -4210, -4210, -4210, 68901,  2279, 28621, -4210, -4210,  2467,  2931,
-   28621,  1190, -4210, -4210,  2974, -4210, 28621, -4210, -4210, -4210,
-    2375, -4210,  3126, -4210, -4210, -4210, 34828,  2961,  2970, 37427,
-    3099, -4210, 68901, -4210, 68901,   314, -4210, -4210, -4210,  2935,
-   -4210, -4210, 85710,  1604, -4210, 89074, -4210, 89074, -4210,  1604,
-    3319, -4210, 85710,  1587, 50799, 68901, 68901, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   50799, 50799,  3119, 68901,  3115,  3120, 28621,   765, 68901,  2925,
-    2933,  1361,  3196, 68901, -4210,  3240,   246, -4210, -4210,  3009,
-   -4210, 12936, -4210, -4210, -4210, -4210, -4210, 50799, 68901, -4210,
-   54247, -4210,  1949, 88655, -4210, -4210, -4210, 68901,  2971, 68901,
-   -4210, 68901, 68901, 68901,  2030, -4210, -4210, -4210, -4210,  1115,
-   88655, -4210, -4210, 68901, 68901,   154,  3011,  3020, 68901, -4210,
-     770,  2680,  9647, 68901, 68901, 68901,  3195, -4210, -4210, -4210,
-   -4210,  3143, -4210, -4210, 85710, -4210,  2265,   876,  3024,  2460,
-   -4210,  3144, -4210,   889, -4210,  3079, -4210, -4210, -4210, -4210,
-    3264,   246,  3268,   246, 68901, 68901, 68901, 68901,  3083, -4210,
-   -4210, -4210, -4210,  3090,  3201, -4210, 47782, 47782, 47782,  1784,
-   -4210, -4210,   959, -4210, -4210, -4210, -4210, -4210, -4210,  3236,
-   -4210,  1795, -4210,   -46, -4210, -4210, -4210, -4210, -4210, -4210,
-   50799, 68901,  9661, 68901, 68901, 68901,  1495, -4210,  1045, 88655,
-   -4210, 87398, 50799, 68901, 68901,  3048, 50799,  3027, -4210, -4210,
-   -4210,  3203,  3149, -4210,   825,  3151, 50799,  3032, -4210,  3056,
-   -4210, -4210,  3057,  2485,  2460,  1694, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210, -4210,  1217,   256,  2506,  2460,  3058, -4210,
-    3060, -4210, -4210, -4210,  3205,  3207,  3211,  3066,  3071,  3122,
-    3084,  3085,  3123, -4210,  3092,  3124,  3093,  3125,  3094,   246,
-   88655,  3197,   959,  3127,  3310,   246, -4210,  3095, -4210, -4210,
-    3414, -4210, 68901, -4210,  3104,  2552,  2460, -4210, -4210, 50799,
-   68901, -4210, -4210, -4210,   791, 88655, 68901,  3255, -4210, -4210,
-   -4210,   791,   791, 68901, 68901,   791,  3259, -4210,  3270, 68901,
-    3271, -4210,   791, -4210, -4210, -4210, -4210,  2337,  3028, 39596,
-   -4210,  3466,  5924,  3029, -4210, 47782, 39596,  1759,   270,   388,
-     -29, 54247, 68901, 54247, -4210,   736,  3144, 68901, 68901,  3030,
-    3025, -4210, -4210, -4210, -4210, 50799,   128, 50799,  2103, -4210,
-   -4210,  3091, -4210, 68901,  1676,   823,  3109,  3441,  2616,   274,
-    3176,  1347,  3384,  2832, -4210, -4210, -4210, -4210, 68901, 68901,
-     746,   959, -4210,  3036,  3034, -4210, 68901, 68901, 68901, 68901,
-   68901,  2901,  3039,  3042, 88655,    72,  3233,  3245,  2449,  3463,
-    3372,  2279,  2832,  3142,  3376, 68901, -4210,  1802,   122, -4210,
-     959, 54247, 86129,  3367, -4210,  3408, -4210, -4210,   171, 68901,
-    3353, -4210, -4210,  2279,   246, 88655,  1813, -4210, -4210, -4210,
-    2103, -4210, -4210,   -27,   -27,  3073, -4210,  3080, -4210,  3461,
-   -4210, -4210, -4210, -4210, -4210, -4210,  3081, -4210, -4210, 68901,
-   -4210,   246,   371,  3128,   246,  3129,   246,   246, 68901, -4210,
-   68901, -4210, -4210, 68901, 68901, -4210, -4210, 68901, 49937,   246,
-   -4210, 12936,  3385, -4210, -4210,  3204,  3209,  3210, 68901,  2851,
-   55109, -4210,  3097, 50799,  1311, -4210, -4210,  3266, -4210, -4210,
-   63298,  3202, -4210, -4210, -4210, -4210,  3391,  3397, -4210, -4210,
-   -4210,  1094, -4210, -4210, -4210, 50799, 58988,   458, 50799, -4210,
-    1949,  3336, -4210, -4210,  1967,   309, -4210,  3338, 68901,  3339,
-   -4210, -4210, -4210,  3100, 12613, 28621, -4210,  3409, 88655, -4210,
-    6000, -4210, -4210, -4210, 28621, -4210, -4210, -4210, -4210, -4210,
-   28621, -4210, 28621,  3386, -4210, 22434,  3532,  3532,  3102, 88655,
-   31757, 31757, 31757, 31757,  1355,  2344, 31757, 31757, 31757, 31757,
-   31757, 31757, 31757, 31757, 31757, 32653,   399, -4210,  3278, 28621,
-   28621,  3396,  3386, -4210, 88655,  3103,  2893,  3106,  3111, 28621,
-   -4210, -4210,  1814, 33528,  3116, 47782, -4210, 28621, 10934,  1825,
-    3146, 12837,  1542,  6415,   959, 28621,  2623,  3337, 28621,  1841,
-   28621,  3392, -4210, -4210, -4210,  3105, -4210, -4210, 88655, 28621,
-    3131,  3874, 31757, 31757,  4107, -4210,  4328, 28621, 25037, -4210,
-    3295,  3152, 38727, -4210, 22883,  3130,   614,   614,   614,   614,
-   -4210, 68901, 68901, 68901, 35261,  3402, 34394, 67608,  3141,  1707,
-   -4210, 67608, 68039, -4210,  3132, -4210,  3121,  1542, 28621,  3399,
-     599,   599,  3295, -4210, 28621, 28621, 28173,  3158, -4210,  3399,
-     152,  3159, -4210, -4210,  5708, -4210, -4210,  3161, -4210,  3133,
-   -4210,  2931,  1534, -4210,  6504,  3307, -4210, -4210, -4210,  3141,
-   29069,  3256, -4210,  1849, -4210, -4210,  3491,  3256, -4210, -4210,
-    1861, 38294,  2961, 26829,  1542,  1863,  1591, -4210, -4210, 85710,
-   -4210,  3191, -4210, -4210, -4210,  2265,  2265,   118,  2851,  3423,
-     118,  7207, -4210, -4210, 35694, 68901, 68901, -4210, 68901,  1871,
-    1617, 68901, -4210, 68901, -4210, -4210, -4210, -4210,  3543, -4210,
-   68901, -4210, -4210,  3184,  3217, -4210, 68901, 68901, 68901, 68901,
-    3393, -4210, -4210,  1975, -4210, -4210, 50799, 68901, -4210, -4210,
-   -4210,   417,  2627,  2460, -4210,  3226, -4210, -4210,  3411, -4210,
-    3551,  3242, 68901,  3164, -4210,  1617,   884,  2449,   911, -4210,
-   -4210,  3238, -4210, 68901, -4210, 68901, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210,  3288, -4210, -4210, -4210, -4210, 48213, -4210,
-   -4210, 68901, -4210, 47782, 39596, 47782, -4210,  1253,   418,  2727,
-    2460, -4210,  3251, -4210,  3254,  3257,  3308,   705,   164,  3258,
-    3262,  3312,  3186,  3188,  3189, -4210, -4210,  3340, 68901,  2265,
-    3192,  3230,   312,   959, -4210, -4210,   959,  2265,   959, 68901,
-   68901, 68901,  3595,  3284, 68901, 68901, 68901, 68901, 68901, 68901,
-    3495,  1090,  1811, 50799, 68901, 68901, 50799, 68901, 68901, 68901,
-   68901, 68901, 68901, 68901, -4210,  3580,  3510,  1846,  3552,  3272,
-   68901, -4210, 68901,  2680, 68901, 68901, -4210, -4210, -4210,  3208,
-    3452,   791, -4210, -4210,  3455,  3457, -4210,   791,   791,  3459,
-     791, -4210,   231, 47782, -4210,  2361,  3133,  2103,  1524, -4210,
-   -4210, -4210, -4210, -4210, -4210,  2789, -4210, -4210,  1983, -4210,
-   -4210, 68901,  3213, 68901, 68901, 31757, -4210,  1586,   193, -4210,
-    3456, 68901,  3249, -4210, -4210, -4210,  3375, 68901, -4210, -4210,
-   -4210, -4210, -4210,  3219, -4210,  3485, 56833,  2265, 50799, 50799,
-    2265, -4210, 88655,  3223,  2832, -4210, -4210, -4210, -4210, -4210,
-   -4210, 50799,  3027, 50799,   274,  1176, 85279,  3261, -4210,  3220,
-    3523, -4210,  3231,  3229, -4210, -4210, 68901,  3144,  1882,  1694,
-    3642,   703,  1670, -4210, 58126,  1912,  3485, -4210, -4210, -4210,
-    3606,  3320, -4210,  2279, 68901,  2901,  3320,   959, 68901,  2774,
-   -4210, 85710, 28621, 28621, -4210,  3232, -4210,  3241,  5337, -4210,
-    3305,  3239,  2201, -4210, -4210, -4210, -4210, -4210, -4210,  3317,
-    3246, 68901, -4210, -4210,  3244, -4210,  3250, -4210, -4210, -4210,
-   -4210, -4210, -4210,   246, -4210, -4210, 68901, -4210, 68901, -4210,
-   -4210,   246,   246,   246,   246, -4210,  3365, -4210, 68901, 68901,
-   68901, 68901,  2851, -4210,   309, -4210,  3538, 50368, -4210, -4210,
-    1893, 68901, -4210, -4210, -4210,  3600,   363,  3545, -4210, -4210,
-    3503,   882,  3506,  3507,   882,  3508,   882, -4210, 28621, 12936,
-   -4210,  3260, -4210, 12936,  7356, 12936,  3396, -4210,  1897, 28621,
-   -4210,  1173,  1173,  1173,  1620,  3555, -4210,  1450,  3265,  1173,
-    1173,  1173,   409,   409,   286,   286,   286,  3532,   399, 12936,
-   12936, -4210, -4210,  3263, -4210, -4210, -4210,  2893, -4210, 29517,
-    3410,  3664, -4210, -4210, -4210,  3304,  3306,  3269, -4210, 28621,
-   29965,  3276, 89493,  3465, -4210,  1708, 28621, 28621,  4155, -4210,
-   13881, 28621, 88655,  1908,  4155,   397, 28621,  4125,  4504, 28621,
-   28621,  4653,  7882,  3273, 28621, 86548, -4210, -4210, -4210,  1913,
-   28621, 68901, 68901, 68901, 68901, -4210, -4210, -4210, 67608, 68039,
-    3275, 23317,  1707,  3281, 68901, -4210, -4210,  3285, 34828,  3522,
-    3470, -4210, 34828,  3470,  1418,  3470,  3534,  3382, 39160, -4210,
-   -4210,  3300,  3487, -4210, 21087,  1656, 12936,  3701,  3586, 28621,
-    3311,  3314,  3315, 12936, 12936, 28621, -4210,   959,  3586,   959,
-   -4210, -4210, 41756, -4210, -4210, -4210, -4210, -4210,  3504, 12936,
-   26381, -4210,  2279, 68901,  1542,    48, -4210,  3318, 68901, -4210,
-    3256, -4210, -4210,  3378,  1919, -4210, -4210, -4210, -4210, -4210,
-    3395, 58557,  3601, -4210, 28621,  1925, -4210,  3355,  3702,   157,
-    1930,  1931,  1617, -4210,  3249, -4210,  1599,  3588,   209, -4210,
-     246, -4210, 88655, -4210, 68901, 68901, -4210, -4210, -4210, -4210,
-   68901,  2395, -4210, -4210, 68901, 68901, 68901, 68901, -4210, 50799,
-   68901, -4210, 47782,   270,  3528, -4210, -4210,  3536,   312, 68901,
-   -4210, 88655,   246,   246, -4210, -4210, -4210, -4210, -4210,  3332,
-    3734,  3426, 68901, 68901, 68901, 68901, 50799, 68901, 68901,  2103,
-    2103, 88655,  3342, -4210,  2103,  2103,  3343, -4210, 50799, 68901,
-   68901, -4210, -4210, -4210,  3419, -4210, 28621,  3729, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, 50799, 68901,  3425, -4210,
-    3427, -4210, -4210, -4210, 68901, 68901, 68901, 68901,  3658, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-   68901, -4210, -4210,   959,   959, 88655,   246,   246, -4210, -4210,
-   -4210,  3603,   791, -4210,   791,   791, -4210, -4210,   791, -4210,
-     425,  1935, -4210, 36127, -4210, -4210,  2602,   959,  2602,  1611,
-   -4210, -4210,  2602, -4210,  2602, -4210,  1617,   228,  3645,  3644,
-   28621, -4210,   881,  1620, -4210, -4210, -4210, -4210,  3249,  1676,
-    3412, 55109,  1323, -4210,  3626,   698, 56833,  1400,  3359,  3478,
-   -4210,  2265,  2265,  3416, 68901,  3778,  2265,  3230, -4210,  3570,
-     714, 68901,  3688,  3405, -4210,   959, -4210, -4210,  2832, -4210,
-    2279, 68901, 56833,  2901,  1940, -4210, -4210, -4210,  3406,  3245,
-    1912,   764, 68901, -4210,  3413,  3782, -4210, -4210,  3662,  3566,
-    3377, -4210, 12936, 12936,   959, 89912,  3408, 88655,  3672, -4210,
-   68901,   190,  3638,   246, -4210, -4210,   246,   246, -4210, -4210,
-   -4210, -4210, 68901,  2851,  2851,  2851, -4210,  3568, -4210, -4210,
-    3631, -4210,   246, 50368,   882, -4210, -4210, -4210,   882,   882,
-   -4210,   882, -4210, 12936, -4210, -4210, -4210, -4210,  7972, 31757,
-    3673, -4210,  3388, 88655, -4210,  3390,  1941,  1953, 33095,  3535,
-   -4210, -4210, -4210,  8290,  3431, 12936,  3493,  3394,  3398,  4155,
-    4155, 13881,  1959, -4210,  4155, 28621, 28621,  4155,  4155, 28621,
-   -4210, -4210,  8837,  3561, -4210, -4210,  8916, -4210, -4210, -4210,
-   -4210, -4210, -4210, 48644, 67608,  3400, 68901,  1707, 34828, -4210,
-   -4210,  1161, -4210, 34828,  3639, -4210, 34828, 55109, -4210, 68901,
-    3403, 68901, -4210,    39, 30413, 28621,  3432, -4210, -4210, -4210,
-    3295, -4210,  3432, -4210,  3401, 68901,  2371, -4210, -4210,  3766,
-   35694,  3726,  3404, -4210, -4210, -4210, -4210, 50368,  3597, 50368,
-    1617,  8965,  3249, 35694, 42620, 68901, 68470, 68470,  3556,  3249,
-    3412, -4210, -4210, -4210, -4210, -4210, -4210,  3407, -4210, -4210,
-   -4210, -4210,  3483, -4210, -4210,   569,  2836,  1960, -4210, -4210,
-   -4210, -4210, -4210,  3580, -4210, -4210, 39596, 50799, 68901, -4210,
-    3486, -4210, -4210, -4210, -4210, -4210, 36994, 41756, -4210,   705,
-    3415,  3417,   164, -4210, -4210, -4210, 68901,  9293,  3418,   895,
-    2836, 68901, 68901,  1433,   878,  1562,  2851,  3707, -4210, -4210,
-   -4210,  3580, -4210, -4210,   791, -4210, -4210, -4210, -4210, -4210,
-     -29,  3745, -4210, 47782, -4210, 49075, -4210, -4210, -4210,   959,
-   -4210,   959,  3613, 68901, 44765,   959,   959, 55109,  3829,  3829,
-   68901, -4210,  9380,  3617, -4210,  3412,  3641,  3687, -4210,  3421,
-   68901,  3581,  3424,  3422,   315,   315, 68901, 68901, 68901,  2002,
-    2279, -4210,   274,  3735, 56833,  3144, -4210,  1533,  3428,  3737,
-   -4210,  3840,  2901,  3039,  3429, -4210, -4210, 58126,  3619,  3320,
-    3245,  3558, -4210,  3562, -4210,  1158, -4210,  2279, 68901, 68901,
-   35694, -4210, 89074, -4210,  2003, -4210, -4210, -4210,  3501,  2946,
-    3539,  3541,  3443, 68901,   750, -4210, -4210, -4210, -4210, -4210,
-   68901, -4210,   458, -4210, -4210, -4210, -4210, -4210,  2858, 31757,
-   88655,  2017, 28621, -4210, 28621, -4210,  3843, -4210, -4210, -4210,
-     727, -4210, -4210, -4210,  4155,  4155,  4155, -4210,  3844,  3295,
-   -4210, -4210,  2027,  3857, -4210, 68901,  2046, -4210, 28621,  3447,
-   -4210, -4210, 34828,  1161,  3448,  2048, 68901,  2053, 88655,  3449,
-    3451,   -14,  3453, 21536,  3445, -4210, -4210, -4210, -4210, -4210,
-   12936, 12936, 68901, -4210,  3458, -4210, -4210, -4210, 68901,  2058,
-   -4210,    98, 24589, -4210, -4210,  1311,   118,   458,  3702,  3412,
-   -4210,  3460, -4210, -4210, 68901, -4210,  1373,  1373, 68901,  3412,
-   -4210, -4210, 68901,  3537, -4210, -4210, 47782,  3512, -4210,   943,
-    2836, 68901, 88655,  1967,   102, -4210, 88655, 88655, -4210, -4210,
-   -4210, 28621,  3546, -4210, -4210, -4210, -4210, -4210, 68901, 68901,
-   68901, 68901, 68901,   246, -4210,  3028,   959, -4210, -4210,  2076,
-   -4210, -4210, -4210, 68901,  3220, -4210,  3220, -4210, -4210,  3829,
-    1188, -4210, -4210, -4210,  1633,  3679, -4210,   712,  3648,  3550,
-    3471, -4210, 55109,  3919,  3485, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -4210,  2083,  3144,  3783,  2832,  3413, 68901, -4210,
-   -4210, -4210, -4210, 28621,  3634,  2279, -4210,  1912,  3485, -4210,
-   -4210, -4210,  3320, -4210, -4210,  3865,  3670,  3868,  2901, -4210,
-    2774,  2108, -4210,  5337, 89912, 88655,  3811,  3519,  3520, -4210,
-   -4210,  3540, 68901, -4210, -4210,  3144, -4210,  2858,  2114, -4210,
-    2116,  2118,  3636,  3547, -4210, 28621,  1448,  3132, 48644,  3488,
-   -4210,  2122, -4210, 12936, 68901, -4210, -4210, 28621, -4210,  2124,
-   -4210, -4210, 28621,  3489, 28621, -4210, 30413,  3496, -4210,  3902,
-   -4210, -4210,  2946, 35694, -4210,  3605, -4210,  3784, -4210, 68470,
-    3542, 41756, -4210,  2931,  2931,  1676, -4210,  1617, -4210, 68901,
-   -4210, 28621, -4210,  3582, -4210, -4210,  2128, -4210,  1349,  3651,
-    3798,  2130,  2136,  9413, 68901,  2853,  1562,  2853, -4210,  2851,
-   -4210, -4210, -4210, -4210, 49075,  3220, -4210, -4210, -4210,  3825,
-    3768, -4210, -4210, -4210, -4210,   373, -4210,  3697,  3698, 68901,
-   -4210,  3509, -4210,  2137,  3627, -4210, -4210, 68901,  3926,  3928,
-   -4210,   726,  9431, 55109,  3413,  3245,  1912,   270, -4210,  3703,
-   -4210,  3704, -4210,  3517,  2832,  3408, -4210, -4210,   947,  3810,
-    3813, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,  2893,
-   30861, 30861,  3524, -4210, -4210, 68901, -4210,  2138,  2143, -4210,
-    2162, 30413,  2166, -4210, 68901,  3521, -4210, -4210, 38294, 50368,
-    1373,  3526, -4210,  3527, -4210, -4210,  3641,  1617,  2836, 12936,
-   68901, 55109,  3922, -4210, -4210, -4210,  3651, -4210, -4210, -4210,
-    2836, 68901, -4210,  3660, -4210,   915,   915,  3871, -4210,  3593,
-   -4210, -4210,  3544, -4210,  3984, 68901, -4210,   705,  2279, 56833,
-   -4210,  3549, -4210,  3320,  3245, -4210, -4210, 35694,  3320, -4210,
-   -4210, -4210,  1722, 55109, 55109, 32205,  3671,   757, 10597, -4210,
-   -4210, -4210, -4210,  2205, -4210,  3683, -4210,  2212, -4210, -4210,
-   -4210,  1092,   458,  2931, 28621,  1617, -4210,  3648, -4210,  2836,
-    1967, 68901, -4210, -4210, -4210,  3405, -4210,  3971, -4210,  1230,
-   -4210, -4210, -4210, -4210,  3144,  3342,  3413, 47351, -4210,  3320,
-    2219,  2946, -4210,  2714, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210,  3557,  3559,  3965, -4210, -4210, -4210, -4210, -4210, -4210,
-    3554, -4210, -4210, -4210, -4210, -4210,  9504, -4210, -4210, -4210,
-   -4210,  3860, -4210, -4210, -4210, -4210, -4210, -4210,  2223, -4210,
-   -4210, -4210, -4210, -4210,  2832, -4210,  1965, -4210, -4210,  1997,
-    1918,  3628,  3847, 31309, 28621, -4210,  1617,  3718, -4210, 47351,
-    3320, -4210,  2714,  3663,  3665, -4210,  9870, 55109, -4210,  2946,
-   -4210,  3599,  3602, -4210,  3565, -4210,  3858,  3859, 47351, 55109,
-   55109,  2225, -4210, -4210, -4210
+    5771,    22,  6904, -4439, -4439,    22, -4439, 61547,     7,   734,
+      71,   164, 13523, 61978, 68874,   226,   297, 13056,    22, 68874,
+    1593, 46893, 58530,   787, 68874,  1000,   809, 46893, 68874, 69305,
+    1178,  1179,   744, 69736, 62409, 57237,  1188, 68874,  1306,   863,
+   70167, 62840,  1250, 63271,   809, 43455,   115,  1185, 70598, 68874,
+    1512,  1712,  1335, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439,     7, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439,  1899, -4439,   854,
+    2242,  1543,   215,  1326, -4439, -4439, -4439, 55082, 68874, 68874,
+   68874,  1476, 68874,  1434, 68874,   392, 55082, 51203, 63702,  1589,
+    1451, 40001, 71029, -4439, 49479, 68874, 68874, 71460, 68874,  1340,
+   59823, 68874,  1551, 68874, 68874, 49910, 71891,  1690,   211, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, 68874, 12513,  1000, -4439, -4439, 68874,  1540,
+   55082, 68874,  1435, 68874,  1545, 68874, -4439, 68874,  1568, 72322,
+     648,  1656, 51203,  1688, 40433,  1694, 68874, 51203, 72753, 68874,
+   68874, -4439, -4439,  1692, 68874, 68874, -4439,  1801, 51634,  1140,
+    1824,  2000,  1911,   781, -4439, 64133, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, 54220,   297, -4439, -4439, 55513, 68874,
+    1927, -4439, -4439, 73184, 87790,  1726, -4439,   692, 55944, 52065,
+    2032,  1709, 40865,  2070, 73615, 52496, 74046, -4439, -4439, 74477,
+   -4439, 74908,  1826,  1927, 75339, 88209, 52927, -4439,  1920, 75770,
+   -4439,  1696,  1093,  1101, 36533, -4439, -4439, -4439,     7, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439,   329,  1478,   204,
+     196,   343, -4439, -4439,   209,   237,   240,   329,  2122,  2122,
+   -4439, 68874, -4439, -4439,  1478,    59,  1706,  1706,  1706,  1902,
+      -3, -4439,  1706,  1847, -4439, -4439, -4439, -4439, 63271, -4439,
+    1716,  1000,  1740,  2139,  1788, -4439, -4439, -4439, -4439, -4439,
+    1797, 68874, 68874, 68874, -4439, -4439,  2191,  1807,  2044,  1800,
+   -4439, -4439, -4439,  2016,  2030,  2006,    89,  1000,  1900, -4439,
+    2154, -4439,  2050, 26354, 26354,  1000, 64564, 76201,   189, 54220,
+    1000, 64995,  1907,  1025,  2068, -4439, -4439, -4439,   413, -4439,
+    2281,  1915,  2150,  1800,   211, 37834, -4439,  1922,  1483, 63271,
+   -4439, -4439, -4439,   253,  2222, 26802, -4439, 68874,  1938, -4439,
+    1947,  1938,  1951,  1952,  1543, -4439,  5771, 68874,  1247,  1247,
+    2357,  1247,  1650,  1736, -4439,  2338, -4439,  2261,  2237, 63271,
+    1185,   245, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439,  1993,  1483, -4439,   251, -4439,
+    1348,  1992,  1354,  1594, -4439, -4439,   213, 68874,  2119,   197,
+      25,  2045, 65426,  2850,  2034, -4439, -4439, -4439,  2172,   902,
+   -4439, -4439, -4439, -4439,  2305,  2349,  2792,   368, 65857, -4439,
+   -4439, -4439, -4439, 68874, 68874, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439,  2046, -4439, -4439,  2059,  2361,  2257,
+    2346,  2228,  1033,  2308,  1343,  2432,  5958,   120, 66288, 68874,
+    2398,  2444,  8180,  1307,   262,  2341,  1312,  2346,  2447,  2295,
+    1033,  2465,  9056, 68874, -4439,  2401,  2507,    53, -4439,   294,
+   -4439,  2223,  2365,   745, 55082,  2174, -4439, -4439, 68874, -4439,
+   -4439, 88628,  2247, -4439,   757, 55082, -4439,  2373,  2224, 41297,
+   68874, -4439, 68874, -4439, -4439, -4439, -4439, -4439,  2307,  2478,
+   68874, 88628, -4439,  2427, 68874, -4439,  1706,  2343,  2186,  2574,
+   88628,   105, 68874,     0,  2604, 68874,  2399,     0,  2226, 76632,
+   -4439, -4439,     0, -4439, -4439, -4439, 68874, 68874,  2192,  1671,
+    2391,     0,  2413,  2608,  2616,  2276,  2388,   786,  1162,   181,
+    2509,     0,  2255, 77063, 77494, 68874,  2260, 68874,  2593, 55082,
+   68874,  2520, -4439,  2386, -4439, -4439,   330, -4439, -4439, -4439,
+   -4439,  2537,  1993,   749,  2539,  2231,  2543, -4439, -4439, -4439,
+    2278, -4439,  2278,  2278,  2235,  2235,  2403,  2240,  2546, -4439,
+   -4439, -4439,   362,  2278,  2235, -4439, 89466, -4439,  1466,  1501,
+   -4439,   184, -4439,  2658, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439,   155, -4439,   773,  1619, -4439, -4439,  2275, -4439,
+    2554,  2034,  2556, -4439,  2250, 77925, -4439, 78356, 78787,  2560,
+    2046, 51203,  2565,  2449,  2567,  2250,  2568,  2453,  2571,   749,
+    2578, -4439,   923,  2575,  2579,  2469,  2599,   184,  2601,  1623,
+    2250, 54651,  2602,   224, -4439, 28594, -4439,  2372, -4439,  1185,
+   -4439,  1341, -4439, 46031, -4439,  1101,  1478, -4439, 68874,  1478,
+   68874,  1478, 68874,  1478, 68874,  1478, 68874, 68874, 68874,  1478,
+   -4439, -4439, -4439, 68874,  2300, 68874, 68874, -4439, -4439, -4439,
+   58961, 51203, 59392, -4439, 68874, -4439,    86,  1000, -4439, -4439,
+   88628,  2716, 51203,  2593, -4439,  1550, -4439, -4439, -4439, -4439,
+   -4439, -4439,  2540, 68874,  2605,  2607, 58961, 51203, -4439, 79218,
+   54220,  2501,  2311, -4439, -4439, -4439, -4439, -4439,  1678,  2757,
+     198,  2758, 28594,  2314,   210,   210,  2315,  2613, -4439, -4439,
+   -4439,   257,  2317,  2320, -4439,   218,   218,  2321,  2326, -4439,
+     276,  2328,  2332,  2770,  2778,   283,  2339,  2345,  2347,   362,
+     210, 28594, -4439,  2350,   218,  2351,  2354,  2355,  2801,  2359,
+   -4439,  2802,  2367,   299,   315,  2368,  2369, -4439,  2321, -4439,
+     268,  2374,  2377,  2378,  2380,  2381,  2385,  2387,  2389, 28594,
+   28594, 28594, -4439, 25010,  1483,  1000, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439,   284,  5693, -4439,  2395, -4439, -4439,
+    2553, -4439, -4439, 28594, -4439, -4439,    77, -4439,   290, -4439,
+   -4439, -4439,  1483,  2642,  2392, -4439, -4439,  1328,  2402, -4439,
+    1805, -4439, -4439, -4439, -4439, -4439, -4439, 53358,  2780, -4439,
+     322,  1000,   294,  1487,  2750, 45169, 45600, -4439, -4439,  2638,
+   -4439, 68874, -4439, -4439, 28594, 43024, -4439,  1483,   157, -4439,
+   -4439, -4439,  1611, -4439, -4439, -4439,     7, -4439, 12003, -4439,
+    1633,  1938, 68874, 68874,  2822, -4439, -4439, -4439,  1947, -4439,
+   -4439,  1543,  1543, 28594,  1543,  1137,  1457, 27250, 28594,  2705,
+    2612,   216,  1447,  2708, -4439,  2619,  1650,  1736, 63271, 68874,
+   79649,  2538, -4439, 43886,  1529,  1483,  2502,  2503,  2555, 47755,
+    2425,  2508,  2510,  2558, -4439,  2661, -4439, -4439,  2511,  2513,
+   80080, -4439, -4439,   933, -4439, -4439, -4439,   933, -4439,  2450,
+    1441,   956,  1332,  2517,   188,   843,  2814, -4439,  1234,  2572,
+   -4439, -4439, -4439,  5191, 68874,  2760,  9614,  2640,   368,  2577,
+   -4439, -4439,  2687,  2530,  2533,  2659,   368,  1088, 80511, -4439,
+   -4439, -4439, -4439, -4439, -4439,  3821, 23724, -4439,  2563,  2515,
+    2547, 68874, 56375,  1559,  2655,  1145,  1848,   261,  2595, 68874,
+    1526,  2665, 68874,  2475,  2566,  2570,  2753,  2477,  1238,  2847,
+    2479, -4439, -4439, -4439,  1693,  1835,  2657, -4439,  2765,  2797,
+    9819,  2564,  2573, 86952,  1173, 41729, 68874, 68874,  2848,  1498,
+    2589, -4439, -4439, -4439,  1498, 68874,  2597,  2603, 68874,   368,
+   -4439,  2900,   368,   368,  1677,  2922,  2609,   351,  1254,     0,
+    2479,  1972, -4439,  2610,  2611,   304, -4439,  2717, -4439, -4439,
+    1078,  2615, 63271,   227,  2043,  2479,  2617,  2624,  2477,  2477,
+   68874, 68874, 68874, 68874, 68874,   179,  2937,  2945,  2626,   190,
+    2664,  2535, -4439,  1498, 50341,  2633, -4439,  1498, 68874,  2634,
+    2080,  2479,  1372,  1327, -4439, -4439, -4439,   211, -4439, 68874,
+   -4439, 68874,  1993, 88628,  2738,  2808, -4439,  2591, -4439,  2034,
+     368, -4439, 68874, 68874,  2046,  2754,  1058,   934, 88628,  2755,
+    2810, 68874,  2813,  2600, -4439,   231, 44312, -4439,  2192,  2569,
+    2981, 68874, 47755, -4439,  2994,   933, -4439, 88628,  2764,  2883,
+   -4439, 68874,  2781,  2582, -4439,  2919,  2637, -4439, -4439,   919,
+   68874, -4439,  2888, 51203,   278,  1000,  2628, 51203,  2818, 68874,
+   68874, 68874, 68874, -4439, -4439,  2783,   740,   109, -4439, 50341,
+   -4439, 68874,  2799,  1972,  2803,  3010,    64,  1706, 80942,  2895,
+   -4439, 81373,  2618,  3016, 88628,  2851, -4439,  1733, -4439,  2730,
+   -4439, 55082,   749, -4439, -4439, -4439, -4439, 88628, 68874, -4439,
+    2620, -4439, -4439, 28594, -4439, -4439, -4439,  2122, -4439, 88628,
+    2278,  2278, -4439, -4439,  3029,  2694,  2696,  2122, -4439,  2122,
+   -4439, 88628, -4439,  2625,  2632,  2736,  2122, -4439,  2710,  2711,
+    2712, -4439,  2631,  2713,  2122, -4439, -4439,  1725, -4439, 81804,
+   55082,   749, 51203, 51203,  2948,   224,  2949,  2695,  2951,  2699,
+   41729,   749,   287, 68874, 68874, 51203, 68874, 68874, 68874, -4439,
+   68874, -4439, -4439, -4439, -4439, 88628, 68874, 68874, 88628, -4439,
+   51203, 50341,  2955,  2958,   749, 68874, 68874, -4439, 12003,  1649,
+   82235,  1101, 53789, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, 68874, -4439, 68874, -4439, 68874, -4439, 68874, -4439, 68874,
+   -4439, -4439, -4439, 68874, -4439, 68874,  1659, -4439, -4439,  1660,
+     868, 68874, 68874,   185, 55082, 68874,  2855, 68874, 68874, 68874,
+   68874, 68874,  2740,  2402,   452, -4439,  1143,   716, 63271,  2863,
+   -4439, -4439,  1667,  1512,    15, 68874,   975,  1797, -4439, -4439,
+   59392, 58530,  2959,   324, 68874, -4439, -4439,  4227, 28594,  1483,
+   25906, -4439, -4439, 12003,  2692, 28594, 28594,  2668,  2122,  2122,
+   -4439,   388, 28594, 28594, 28594,  2122,  2122,  3820, 28594, 41729,
+   28594, 31730, 21958, 28594, 28594, 25458, -4439, 28594,  2885, 33068,
+   28594,  1487,  2887, 28594,  1487,  3820,  3108,  3108,  1074,  5342,
+    2671,  1483, -4439,  2122,   203, -4439,   212, 88628, 28594, 28594,
+   28594, 28594, 47755,  2756,   207, 68874, 28594,  2676,  1491, -4439,
+   28594, -4439,  2680, 28594,  2759,   267, 28594, 28594, 28594, 28594,
+   28594, 28594, 28594, 28594, 28594, -4439, 33934,   228,  2967,  2985,
+     620,   536, 66719, 26354,  2980, 21060, -4439,   248,  2980, -4439,
+   -4439, -4439, 68874,  2780, -4439, -4439,  2767, -4439, -4439, -4439,
+   -4439, -4439,   292, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+    2685, -4439, -4439, -4439, -4439,  2685, -4439,  2697,  4293, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439,  2970,  2974,   749, 68874,   253,
+   60254, -4439, 26802, -4439,  1681, -4439,  2700, -4439,  2952, -4439,
+    2698, -4439,  9471,  2952, -4439, -4439,   305,  2812,  2950,  2898,
+   -4439, -4439, -4439,  2704, 12003, -4439,  1428, 12003,  1657, -4439,
+   -4439, -4439, -4439, -4439, -4439,  1012, -4439, 68874,  1046,  2705,
+    1447,  2772,   964,  3119, 68874, -4439, 38267,  2897, -4439,  3109,
+   -4439, 89466, -4439,  2718, -4439, 89047, 85683, -4439, -4439,   724,
+   -4439,   733,  2800,  2804,  2846, 51203, 68874, 68874, -4439, 47755,
+   51203, 68874, 68874, -4439, 51203, 68874, 68874, -4439, -4439, -4439,
+   -4439, -4439, 46462,    92, 58530,  2856, 57668, -4439, -4439,  2722,
+   68874,  2779,  2979,  2983,    36, -4439, -4439, 82666, -4439,  2930,
+   51203, 68874, 68874, 28594,  2936, 68874, 68874, -4439,   429,  2816,
+    2817, -4439, 68874,  2819, 55082,  2743, 68874, 68874, 88628,  2821,
+     764, 55082,  2787, 42161, 68874, 68874, 68874, 68874,  2871,  3047,
+   88628, 68874,  2995,   754, 63271,   171,  2324,  2479,  2954, -4439,
+    1135, -4439, 51203, 68874,  2946, -4439, -4439, -4439, 67150,  3163,
+    2862, -4439, -4439, 83097, -4439, -4439, -4439,  1682, -4439, 51203,
+   51203, 68874,  9997, 68874,   507, -4439, -4439, 88628, -4439, 68874,
+   68874, 68874,  2993, 68874, 60685, 83528, 83959,  1075,  1156,  2996,
+   68874, 61116,  2998, -4439,  2889, 68874, -4439, -4439, 48186, 51203,
+   68874,   177, 47755, -4439, -4439, 68874, -4439,  2953,   871, -4439,
+   68874,  6157, -4439, -4439,  2852,  2865, 68874,   183,  2337,  2479,
+   68874, 68874,  2777,  1686,  2859,  2909, -4439,  2977,    94, 68874,
+   76201, -4439, 51203,  1311, -4439,  2932, 51203, 68874,  8545, -4439,
+   -4439,   368, -4439, -4439, -4439, -4439, -4439, 68874, 68874,   368,
+   68874,   368,  1241, -4439, 51203, 68874, -4439, -4439, -4439, 68874,
+   10126, 68874, 68874, 68874, 68874, 51203, 68874, -4439, -4439,  1438,
+    1207,  1208,  1229,  2939, 68874,  3069, 68874, 84390, 51203, 68874,
+   68874, 68874,  1544, -4439, -4439,  2913, -4439, 51203,  1311, -4439,
+   10972, 68874, 68874,  2876,  2879,   191,  2962, -4439, -4439, -4439,
+   -4439, -4439, -4439,  3049,  3218, 84821,   817, -4439,  3064,  3065,
+    2872,  2875,  3066, 68874,   817, 68874, -4439, -4439, -4439, -4439,
+    3068, 68874,   817,  3076,   817,  3021,   666, -4439, -4439,     0,
+   -4439,  2840,  1687, -4439, -4439, 28594, 88628, -4439,  1707, -4439,
+    2842,   740, -4439, -4439, 47755, 68874,   703,   148,  3142, 56806,
+    2864,  3131, 68874,  2878, 68874,  3134,  2864, 68874, -4439,  2325,
+   58530, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+    3133, -4439,  1000,  2192,  2192,  2192,  2192, -4439, -4439, -4439,
+   -4439,  3035,  1731, -4439,  2845,  2192, 68874,  2957,  2864,  2849,
+    3155, -4439,  1972,  3156,  1271, 68874, 56806,  1796,  2886,  3054,
+    3272,  1706,  1000,  3073,  3050, -4439, 24143,  6116,  3055,  3105,
+   54220,  3153,  3157,  3174, -4439,  1993, -4439,  3295, -4439, 28594,
+    1714,  2880,   184, -4439, -4439,  2890,  2632,  2901,  2902,  2882,
+    2891, -4439,  2122,   205, 68874,  2892,  1044,   664,  3009,  2122,
+    3103,  2893, -4439,  3198,   749,  2034, -4439,  2250, -4439, 68874,
+   -4439, 68874, 68874, 68874, 68874,  2046, -4439, -4439,  3082,   749,
+    2250,  3083,   749,   749, -4439,  3138,  3088,   749,   184,  2250,
+    3014,  3195, 54220, -4439,   224, -4439, -4439, 28594,  3106,  1706,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,  1715, -4439,
+   68874, -4439,  3171,  3172,  3173,  2903,  2904,  2935, 68874,  2907,
+   -4439,  2903,   368,  2903,  2402,  2402,  2903,  2904, 50772,  3332,
+    3192, -4439,  2989,  2914,  3205,   659, -4439,   835,   623,  3132,
+   -4439, -4439, -4439, -4439, 88628, -4439, -4439, -4439, -4439, -4439,
+   51203,  2956, 68874, 68874, -4439,   159,  3110,  2912, 50772,  3315,
+     749, -4439, 55082, -4439, -4439, 88628,  2991,  3011, 55082,  3121,
+    2968, -4439, -4439, -4439, -4439, -4439, 88628, -4439,  3168, 68874,
+    1722, -4439, -4439,  1572, -4439,  1597, 28594,   123, -4439,  9183,
+    1744, 28594,  2927,  2928, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439,  2931,  3223, -4439,  1746,  1754,  1756,  2933,  2934,  4984,
+    2940, 10473,  2941,  2944, 31730, 31730, 25010,  1116, -4439, 31730,
+    2947,  3118,  1758,  9523,  2942,  2961, 10679, 27698, 28594, 27698,
+   27698, 10745,  2942,  2966,  1764, 47755,  3125, 10961,  1765, -4439,
+   28594, 47755,  5054, 28594, -4439, 28594,  2971, -4439, -4439,  2406,
+    2406,  2406,  3820, -4439,  2964, -4439, 31730, 31730, -4439,  3089,
+   25010, -4439, -4439,  3237, -4439, -4439,  1027, -4439,  2960, -4439,
+   -4439,  3236, 41729,  2877, 28594,   239, 28594,  2676, 28594,  3030,
+    2406,  2406,  2406,   405,   405,   187,   187,   187,  1598,   536,
+   -4439, -4439, -4439,  2987,  2988,  2992,  3136,  2999, 28594, -4439,
+    1855,  1953, 68874,  2284,  2411,  2552, -4439, -4439, -4439, 34801,
+    2990, 28594, 28594, 28594,  2976, -4439,  2062, 12003,   684, -4439,
+     295,  2990, -4439,   211,  2122,   203, 46031, -4439, -4439, 28594,
+   -4439, -4439, -4439,  1947, -4439, -4439, -4439, -4439, -4439, 68874,
+    1512, 28594, -4439, -4439,   819,  2972, 28594,  1428, -4439, -4439,
+    3012, -4439, 28594, -4439, -4439, -4439,  2402, -4439,  3183, -4439,
+   -4439, -4439, 34801,  2997,  3019, 37400,  3160, -4439, 68874, -4439,
+   68874,   193, -4439, -4439, -4439,  3000, -4439, -4439, 85683,  1619,
+   -4439, 89047, -4439, 89047, -4439,  1619,  3377, -4439, 85683,  1555,
+   51203, 68874, 68874, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, 51203, 51203,  3175, 68874,
+    3180,  3177, 28594,   384, 68874,  3003,  3004,  1197,  3261, 68874,
+   -4439,  3304,   749, -4439, -4439,  3077, -4439, 12003, -4439, -4439,
+   -4439, -4439, -4439, 51203, 68874, -4439, 54220, -4439,  1993, 88628,
+   -4439, -4439, -4439, 68874,  3036, 68874, -4439, 68874, 68874, 68874,
+    2046, -4439, -4439, -4439, -4439,   994, 88628, -4439, -4439, 68874,
+   68874,   126,  3085,  3086, 68874, -4439,   117,  2717, 11237, 68874,
+   68874, 68874,  3269, -4439, -4439, -4439, -4439,  3214, -4439, -4439,
+   85683, -4439,  2250,   114,  3092,  2479, -4439,  3206, -4439,  1082,
+   -4439,  3139, -4439, -4439, -4439, -4439,  3325,   749,  3328,   749,
+   68874, 68874, 68874, 68874,  3143, -4439, -4439, -4439, -4439,  3144,
+    3255, -4439, 47755, 47755, 47755,  1771, -4439, -4439,  1000, -4439,
+   -4439, -4439, -4439, -4439, -4439,  3290, -4439,  1776, -4439,   495,
+   -4439, -4439, -4439, -4439, -4439, -4439, 51203, 68874, 11359, 68874,
+   68874, 68874,  1554, -4439,   996, 88628, -4439, 87371, 51203, 68874,
+   68874,  3101, 51203,  3079, -4439, -4439, -4439,  3262,  3203, -4439,
+     828,  3212, 51203,  3097, -4439,  3120, -4439, -4439,  3122,  2421,
+    2479,  1972, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+     636,   234,  2505,  2479,  3126, -4439,  3128, -4439, -4439, -4439,
+    3265,  3267,  3276,  3135,  3140,  3158,  3141,  3145,  3181, -4439,
+    3147,  3187,  3148,  3188,  3149,   749, 88628,  3260,  1000,  3179,
+    3386,   749, -4439,  3166, -4439, -4439,  3487, -4439, 68874, -4439,
+    3176,  2542,  2479, -4439, -4439, 51203, 68874, -4439, -4439, -4439,
+     817, 88628, 68874,  3345, -4439, -4439, -4439,   817,   817, 68874,
+   68874,   817,  3346, -4439,  3347, 68874,  3349, -4439,   817, -4439,
+   -4439, -4439, -4439,  2343,  3102, 39569, -4439,  3526,  6012,  3100,
+   -4439, 47755, 39569,  1792,  1741,   341,     0, 54220, 68874, 54220,
+   -4439,   148,  3206, 68874, 68874,  3104,  3107, -4439, -4439, -4439,
+   -4439, 51203,  1011, 51203,  2122, -4439, -4439,  3170, -4439, 68874,
+    1706,   806,  3184,  3512,  2616,   278,  3250,  1602,  3457,  2886,
+   -4439, -4439, -4439, -4439, 68874, 68874,   740,  1000, -4439,  3111,
+    3112, -4439, 68874, 68874, 68874, 68874, 68874,  2956,  3113,  3114,
+   88628,   718,  3303,  3306,  2477,  3532,  3427,  1512,  2886,  3196,
+    3429, 68874, -4439,  1778,   125, -4439,  1000, 54220, 86102,  3419,
+   -4439,  5550, -4439, -4439,   765, 68874,  3405, -4439, -4439,  1512,
+     749, 88628,  1780, -4439, -4439, -4439,  2122, -4439, -4439,  1336,
+    1336,  3127, -4439,  3137, -4439,  3513, -4439, -4439, -4439, -4439,
+   -4439, -4439,  3123, -4439, -4439, 68874, -4439,   749,   224,  3186,
+     749,  3194,   749,   749, 68874, -4439, 68874, -4439, -4439, 68874,
+   68874, -4439, -4439, 68874, 50341,   749, -4439, 12003,  3443, -4439,
+   -4439,  3264,  3270,  3275, 68874,  2903, 55082, -4439,  3146, 51203,
+    1246, -4439, -4439,  3330, -4439, -4439, 63271,  3263, -4439, -4439,
+   -4439, -4439,  3454,  3463, -4439, -4439, -4439,   789, -4439, -4439,
+   -4439, 51203, 58961,   289, 51203, -4439,  1993,  3402, -4439, -4439,
+    2034,   368, -4439,  3403, 68874,  3407, -4439, -4439, -4439,  3167,
+   11431, 28594, -4439,  3474, 88628, -4439,  6348, -4439, -4439, -4439,
+   28594, -4439, -4439, -4439, -4439, -4439, 28594, -4439, 28594,  3456,
+   -4439, 22407,  3608,  3608,  3169, 88628, 31730, 31730, 31730, 31730,
+    1323,  2351, 31730, 31730, 31730, 31730, 31730, 31730, 31730, 31730,
+   31730, 32626,   698, -4439,  3351, 28594, 28594,  3468,  3456, -4439,
+   88628,  3178,  2942,  3182,  3185, 28594, -4439, -4439,  1790, 33501,
+    3189, 47755, -4439, 28594,  9599,  1791,  3215, 11888,  1483,  6454,
+    1000, 28594,  1743,  2075, 28594,  1814, 28594,  3467, -4439, -4439,
+   -4439,  3201, -4439, -4439, 88628, 28594,  3193,  3709, 31730, 31730,
+    3837, -4439,  4537, 28594, 25010, -4439,  3362,  3216, 38700, -4439,
+   22856,  3199,   809,   809,   809,   809, -4439, 68874, 68874, 68874,
+   35234,  3472, 34367, 67581,  3200,  1516, -4439, 67581, 68012, -4439,
+    3202, -4439,  3207,  1483, 28594,  3465,   722,   722,  3362, -4439,
+   28594, 28594, 28146,  3208, -4439,  3465,   294,  3209, -4439, -4439,
+    9134, -4439, -4439,  3211, -4439,  3217, -4439,  2972,  1139, -4439,
+    6663,  3373, -4439, -4439, -4439,  3200, 29042,  3321, -4439,  1820,
+   -4439, -4439,  3558,  3321, -4439, -4439,  1821, 38267,  2997, 26802,
+    1483,  1831,  1567, -4439, -4439, 85683, -4439,  3256, -4439, -4439,
+   -4439,  2250,  2250,  1168,  2903,  3499,  1168,  6950, -4439, -4439,
+   35667, 68874, 68874, -4439, 68874,  1839,  1108, 68874, -4439, 68874,
+   -4439, -4439, -4439, -4439,  3620, -4439, 68874, -4439, -4439,  3268,
+    3273, -4439, 68874, 68874, 68874, 68874,  3449, -4439, -4439,  1992,
+   -4439, -4439, 51203, 68874, -4439, -4439, -4439,   252,  2576,  2479,
+   -4439,  3292, -4439, -4439,  3481, -4439,  3621,  3318, 68874,  3234,
+   -4439,  1108,   247,  2477,   667, -4439, -4439,  3302, -4439, 68874,
+   -4439, 68874, -4439, -4439, -4439, -4439, -4439, -4439, -4439,  3359,
+   -4439, -4439, -4439, -4439, 48186, -4439, -4439, 68874, -4439, 47755,
+   39569, 47755, -4439,   949,   332,  2606,  2479, -4439,  3316, -4439,
+    3317,  3319,  3364,  1022,  1006,  3320,  3322,  3367,  3245,  3246,
+    3248, -4439, -4439,  3394, 68874,  2250,  3251,  3289,   329,  1000,
+   -4439, -4439,  1000,  2250,  1000, 68874, 68874, 68874,  3653,  3341,
+   68874, 68874, 68874, 68874, 68874, 68874,  3554,   717,  1762, 51203,
+   68874, 68874, 51203, 68874, 68874, 68874, 68874, 68874, 68874, 68874,
+   -4439,  3638,  3568,  1253,  3609,  3327, 68874, -4439, 68874,  2717,
+   68874, 68874, -4439, -4439, -4439,  3274,  3511,   817, -4439, -4439,
+    3514,  3515, -4439,   817,   817,  3517,   817, -4439,   231, 47755,
+   -4439,  2623,  3217,  1693,  1835, -4439, -4439, -4439, -4439, -4439,
+   -4439,  2840, -4439, -4439,  1884, -4439, -4439, 68874,  3271, 68874,
+   68874, 31730, -4439,  1406,   275, -4439,  3508, 68874,  3299, -4439,
+   -4439, -4439,  3428, 68874, -4439, -4439, -4439, -4439, -4439,  3277,
+   -4439,  3537, 56806,  2250, 51203, 51203,  2250, -4439, 88628,  3278,
+    2886, -4439, -4439, -4439, -4439, -4439, -4439, 51203,  3079, 51203,
+     278,   731, 85252,  3305, -4439,  3279,  3573, -4439,  3281,  3280,
+   -4439, -4439, 68874,  3206,  1844,  1972,  3695,    78,  1696, -4439,
+   58099,  1796,  3537, -4439, -4439, -4439,  3660,  3371, -4439,  1512,
+   68874,  2956,  3371,  1000, 68874,  2779, -4439, 85683, 28594, 28594,
+   -4439,  3283, -4439,  3288,  6460, -4439,  3356,  3286,  2192, -4439,
+   -4439, -4439, -4439, -4439, -4439,  3368,  3293, 68874, -4439, -4439,
+    3294, -4439,  3297, -4439, -4439, -4439, -4439, -4439, -4439,   749,
+   -4439, -4439, 68874, -4439, 68874, -4439, -4439,   749,   749,   749,
+     749, -4439,  3411, -4439, 68874, 68874, 68874, 68874,  2903, -4439,
+     368, -4439,  3584, 50772, -4439, -4439,  1846, 68874, -4439, -4439,
+   -4439,  3646,   324,  3592, -4439, -4439,  3550,   896,  3551,  3552,
+     896,  3555,   896, -4439, 28594, 12003, -4439,  3307, -4439, 12003,
+    7016, 12003,  3468, -4439,  1851, 28594, -4439,  1530,  1530,  1530,
+    3601,  3602, -4439,  1236,  3309,  1530,  1530,  1530,   395,   395,
+     186,   186,   186,  3608,   698, 12003, 12003, -4439, -4439,  3310,
+   -4439, -4439, -4439,  2942, -4439, 29490,  3462,  3712, -4439, -4439,
+   -4439,  3352,  3354,  3324, -4439, 28594, 29938,  3314, 89466,  3504,
+   -4439,  1387, 28594, 28594,  3042, -4439,  4174, 28594, 88628,  1861,
+    3042,   242, 28594,  3099,  3204, 28594, 28594,  4957,  7339,  3326,
+   28594, 86521, -4439, -4439, -4439,  1866, 28594, 68874, 68874, 68874,
+   68874, -4439, -4439, -4439, 67581, 68012,  3331, 23290,  1516,  3329,
+   68874, -4439, -4439,  3333, 34801,  3574,  3519, -4439, 34801,  3519,
+    1452,  3519,  3578,  3420, 39133, -4439, -4439,  3337,  3523, -4439,
+   21060,  1618, 12003,  3737,  3623, 28594,  3339,  3342,  3343, 12003,
+   12003, 28594, -4439,  1000,  3623,  1000, -4439, -4439, 41729, -4439,
+   -4439, -4439, -4439, -4439,  3541, 12003, 26354, -4439,  1512, 68874,
+    1483,    63, -4439,  3358, 68874, -4439,  3321, -4439, -4439,  3415,
+    1880, -4439, -4439, -4439, -4439, -4439,  3426, 58530,  3643, -4439,
+   28594,  1890, -4439,  3388,  3734,   138,  1891,  1895,  1108, -4439,
+    3299, -4439,  1456,  3625,   199, -4439,   749, -4439, 88628, -4439,
+   68874, 68874, -4439, -4439, -4439, -4439, 68874,  2425, -4439, -4439,
+   68874, 68874, 68874, 68874, -4439, 51203, 68874, -4439, 47755,  1741,
+    3557, -4439, -4439,  3559,   329, 68874, -4439, 88628,   749,   749,
+   -4439, -4439, -4439, -4439, -4439,  3372,  3760,  3448, 68874, 68874,
+   68874, 68874, 51203, 68874, 68874,  2122,  2122, 88628,  3360, -4439,
+    2122,  2122,  3363, -4439, 51203, 68874, 68874, -4439, -4439, -4439,
+    3445, -4439, 28594,  3757, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, 51203, 68874,  3446, -4439,  3450, -4439, -4439, -4439,
+   68874, 68874, 68874, 68874,  3681, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, 68874, -4439, -4439,  1000,
+    1000, 88628,   749,   749, -4439, -4439, -4439,  3624,   817, -4439,
+     817,   817, -4439, -4439,   817, -4439,   379,  1896, -4439, 36100,
+   -4439, -4439,  2604,  1000,  2604,  1352, -4439, -4439,  2604, -4439,
+    2604, -4439,  1108,  1603,  3664,  3668, 28594, -4439,   864,  3601,
+   -4439, -4439, -4439, -4439,  3299,  1706,  3431, 55082,   326, -4439,
+    3654,   703, 56806,  1314,  3383,  3505, -4439,  2250,  2250,  3451,
+   68874,  3806,  2250,  3289, -4439,  3598,    87, 68874,  3717,  3435,
+   -4439,  1000, -4439, -4439,  2886, -4439,  1512, 68874, 56806,  2956,
+    1903, -4439, -4439, -4439,  3434,  3306,  1796,  1100, 68874, -4439,
+    3436,  3815, -4439, -4439,  3694,  3595,  3404, -4439, 12003, 12003,
+    1000, 89885,  5550, 88628,  3702, -4439, 68874,   779,  3669,   749,
+   -4439, -4439,   749,   749, -4439, -4439, -4439, -4439, 68874,  2903,
+    2903,  2903, -4439,  3597, -4439, -4439,  3657, -4439,   749, 50772,
+     896, -4439, -4439, -4439,   896,   896, -4439,   896, -4439, 12003,
+   -4439, -4439, -4439, -4439,  7475, 31730,  3701, -4439,  3412, 88628,
+   -4439,  3413,  1909,  1926, 33068,  3564, -4439, -4439, -4439,  7612,
+    3464, 12003,  3518,  3417,  3418,  3042,  3042,  4174,  1933, -4439,
+    3042, 28594, 28594,  3042,  3042, 28594, -4439, -4439,  7726,  3596,
+   -4439, -4439,  8060, -4439, -4439, -4439, -4439, -4439, -4439, 48617,
+   67581,  3422, 68874,  1516, 34801, -4439, -4439,  1624, -4439, 34801,
+    3666, -4439, 34801, 55082, -4439, 68874,  3423, 68874, -4439,   684,
+   30386, 28594,  3460, -4439, -4439, -4439,  3362, -4439,  3460, -4439,
+    3425, 68874,  2392, -4439, -4439,  3797, 35667,  3759,  3432, -4439,
+   -4439, -4439, -4439, 50772,  3627, 50772,  1108,  8080,  3299, 35667,
+   42593, 68874, 68443, 68443,  3585,  3299,  3431, -4439, -4439, -4439,
+   -4439, -4439, -4439,  3437, -4439, -4439, -4439, -4439,  3506, -4439,
+   -4439,   554,  2863,  1934, -4439, -4439, -4439, -4439, -4439,  3638,
+   -4439, -4439, 39569, 51203, 68874, -4439,  3520, -4439, -4439, -4439,
+   -4439, -4439, 36967, 41729, -4439,  1022,  3441,  3442,  1006, -4439,
+   -4439, -4439, 68874,  8198,  3444,   560,  2863, 68874, 68874,  1410,
+    1463,  1511,  2903,  3742, -4439, -4439, -4439,  3638, -4439, -4439,
+     817, -4439, -4439, -4439, -4439, -4439,     0,  3771, -4439, 47755,
+   -4439, 49048, -4439, -4439, -4439,  1000, -4439,  1000,  3647, 68874,
+   44738,  1000,  1000, 55082,  3867,  3867, 68874, -4439,  8217,  3655,
+   -4439,  3431,  3675,  3722, -4439,  3459, 68874,  3615,  3466,  3461,
+     370,   370, 68874, 68874, 68874,  1940,  1512, -4439,   278,  3769,
+   56806,  3206, -4439,   840,  3470,  3773, -4439,  3879,  2956,  3113,
+    3471, -4439, -4439, 58099,  3659,  3371,  3306,  3594, -4439,  3607,
+   -4439,  1214, -4439,  1512, 68874, 68874, 35667, -4439, 89047, -4439,
+    1942, -4439, -4439, -4439,  3534,  2990,  3582,  3583,  3482, 68874,
+     103, -4439, -4439, -4439, -4439, -4439, 68874, -4439,   289, -4439,
+   -4439, -4439, -4439, -4439,  3755, 31730, 88628,  1956, 28594, -4439,
+   28594, -4439,  3880, -4439, -4439, -4439,   760, -4439, -4439, -4439,
+    3042,  3042,  3042, -4439,  3883,  3362, -4439, -4439,  1979,  3901,
+   -4439, 68874,  1980, -4439, 28594,  3488, -4439, -4439, 34801,  1624,
+    3490,  1987, 68874,  1997, 88628,  3486,  3492,   595,  3493, 21509,
+    3491, -4439, -4439, -4439, -4439, -4439, 12003, 12003, 68874, -4439,
+    3496, -4439, -4439, -4439, 68874,  2003, -4439,   638, 24562, -4439,
+   -4439,  1246,  1168,   289,  3734,  3431, -4439,  3501, -4439, -4439,
+   68874, -4439,  1273,  1273, 68874,  3431, -4439, -4439, 68874,  3587,
+   -4439, -4439, 47755,  3553, -4439,   780,  2863, 68874, 88628,  2034,
+      96, -4439, 88628, 88628, -4439, -4439, -4439, 28594,  3588, -4439,
+   -4439, -4439, -4439, -4439, 68874, 68874, 68874, 68874, 68874,   749,
+   -4439,  3102,  1000, -4439, -4439,  2011, -4439, -4439, -4439, 68874,
+    3279, -4439,  3279, -4439, -4439,  3867,  1132, -4439, -4439, -4439,
+    1631,  3715, -4439,   961,  3696,  3593,  3509, -4439, 55082,  3956,
+    3537, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,  2012,
+    3206,  3823,  2886,  3436, 68874, -4439, -4439, -4439, -4439, 28594,
+    3671,  1512, -4439,  1796,  3537, -4439, -4439, -4439,  3371, -4439,
+   -4439,  3903,  3707,  3909,  2956, -4439,  2779,  2019, -4439,  6460,
+   89885, 88628,  3854,  3562,  3565, -4439, -4439,  3579, 68874, -4439,
+   -4439,  3206, -4439,  3755,  2028, -4439,  2029,  2038,  3682,  3580,
+   -4439, 28594,   107,  3202, 48617,  3535, -4439,  2049, -4439, 12003,
+   68874, -4439, -4439, 28594, -4439,  2082, -4439, -4439, 28594,  3536,
+   28594, -4439, 30386,  3530, -4439,  3953, -4439, -4439,  2990, 35667,
+   -4439,  3661, -4439,  3832, -4439, 68443,  3581, 41729, -4439,  2972,
+    2972,  1706, -4439,  1108, -4439, 68874, -4439, 28594, -4439,  3626,
+   -4439, -4439,  2090, -4439,  1243,  3698,  3848,  2092,  2100,  8672,
+   68874,  2904,  1511,  2904, -4439,  2903, -4439, -4439, -4439, -4439,
+   49048,  3279, -4439, -4439, -4439,  3877,  3824, -4439, -4439, -4439,
+   -4439,   386, -4439,  3747,  3748, 68874, -4439,  3560, -4439,  2102,
+    3678, -4439, -4439, 68874,  3973,  3978, -4439,   535,  8692, 55082,
+    3436,  3306,  1796,  1741, -4439,  3753, -4439,  3758, -4439,  3566,
+    2886,  5550, -4439, -4439,   375,  3858,  3863, -4439, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439,  2942, 30834, 30834,  3575, -4439,
+   -4439, 68874, -4439,  2107,  2111, -4439,  2116, 30386,  2117, -4439,
+   68874,  3591, -4439, -4439, 38267, 50772,  1273,  3599, -4439,  3577,
+   -4439, -4439,  3675,  1108,  2863, 12003, 68874, 55082,  3972, -4439,
+   -4439, -4439,  3698, -4439, -4439, -4439,  2863, 68874, -4439,  3705,
+   -4439,   561,   561,  3915, -4439,  3636, -4439, -4439,  3586, -4439,
+    4026, 68874, -4439,  1022,  1512, 56806, -4439,  3604, -4439,  3371,
+    3306, -4439, -4439, 35667,  3371, -4439, -4439, -4439,  2419, 55082,
+   55082, 32178,  3714,  1051, 10129, -4439, -4439, -4439, -4439,  2128,
+   -4439,  3725, -4439,  2133, -4439, -4439, -4439,   820,   289,  2972,
+   28594,  1108, -4439,  3696, -4439,  2863,  2034, 68874, -4439, -4439,
+   -4439,  3435, -4439,  4027, -4439,   244, -4439, -4439, -4439, -4439,
+    3206,  3360,  3436, 47324, -4439,  3371,  2142,  2990, -4439,  1877,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439,  3606,  3612,  4019,
+   -4439, -4439, -4439, -4439, -4439, -4439,  3605, -4439, -4439, -4439,
+   -4439, -4439,  8813, -4439, -4439, -4439, -4439,  3912, -4439, -4439,
+   -4439, -4439, -4439, -4439,  2156, -4439, -4439, -4439, -4439, -4439,
+    2886, -4439,  1962, -4439, -4439,  2018,  1952,  3683,  3904, 31282,
+   28594, -4439,  1108,  3770, -4439, 47324,  3371, -4439,  1877,  3716,
+    3721, -4439,  9015, 55082, -4439,  2990, -4439,  3656,  3670, -4439,
+    3622, -4439,  3914,  3919, 47324, 55082, 55082,  2163, -4439, -4439,
+   -4439
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -2213,11 +2214,11 @@
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-    1476,  1262,   563,  1346,  1345,  1262,   251,     0,  1348,     0,
-    1262,   384,  1007,     0,     0,     0,     0,   563,  1262,     0,
-    1476,     0,     0,     0,     0,     0,  1489,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1262,     0,     0,  1496,
-       0,     0,     0,     0,  1489,     0,  1350,     0,     0,     0,
+    1478,  1264,   565,  1348,  1347,  1264,   252,     0,  1350,     0,
+    1264,   385,  1009,     0,     0,     0,     0,   565,  1264,     0,
+    1478,     0,     0,     0,     0,     0,  1491,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1264,     0,     0,  1498,
+       0,     0,     0,     0,  1491,     0,  1352,     0,     0,     0,
        0,     0,     2,     4,    64,    65,    27,    26,    32,    31,
       89,    90,    50,    17,    78,    57,   124,   123,   125,    38,
       34,    72,    23,    25,    35,    39,    59,    40,    51,   102,
@@ -2229,175 +2230,175 @@
       49,    16,   110,   109,   111,    73,    42,    75,    61,    87,
      108,    24,   112,    18,    19,   115,    84,   105,   101,   120,
      118,   126,   103,    67,     6,     7,    92,    22,    44,     9,
-      29,    28,    43,    36,   122,    33,  1348,    94,   106,    93,
-      68,   100,    71,   104,   121,    69,   117,  1449,  1448,  1498,
-    1452,  1475,     0,  1464,  1261,  1260,  1246,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   562,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1272,  2055,
-    2070,  2071,  2072,  2073,  2074,  2075,  2076,  2077,   355,  2078,
-    2079,  2080,  2081,  2082,  2083,  2084,  2085,  2086,  2087,  2338,
-    2339,  2340,  2341,  2088,  2089,  2090,  2091,  2092,  2093,  2094,
-    2342,  2343,  2095,  2096,  2097,  2098,  2099,  2344,  2100,  2101,
-    2102,  2103,  2104,  2105,  2106,  2107,  2108,  2109,  2110,  2111,
-    2112,  2113,  2114,  2115,  2116,  2117,  2118,  2119,  2120,  2121,
-    2345,  2346,  2122,  2123,  2124,  2125,  2126,  2127,  2128,  2129,
-    2130,  2131,  2132,  2133,  2134,  2135,  2136,  2137,  2138,  2139,
-    2140,  2141,  2142,  2143,  2144,  2145,  2146,  2347,  2147,  2148,
-    2149,  2348,  2150,  2151,  2152,  2349,  2153,  2154,  2155,  2156,
-    2157,  2158,  2159,  2350,  2351,  2160,  2161,  2162,  2163,  2164,
-    2165,  2166,  2167,  2168,  2169,  2170,  2171,  2172,  2173,  2174,
-    2175,  2176,  2352,  2177,  2178,  2179,  2180,  2353,  2354,  2355,
-    2181,  2182,  2183,  2184,  2185,  2186,  2187,  2188,  2356,  2189,
-    2190,  2191,  2192,  2193,  2194,  2195,  2196,  2197,  2198,  2199,
-    2200,  2201,  2202,  2203,  2204,  2205,  2206,  2207,  2357,  2358,
-    2208,  2209,  2359,  2210,  2211,  2212,  2360,  2213,  2361,  2214,
-    2215,  2216,  2217,  2218,  2219,  2220,  2221,  2362,  2222,  2363,
-    2223,  2224,  2225,  2226,  2227,  2228,  2229,  2230,  2231,  2364,
-    2232,  2365,  2235,  2233,  2234,  2236,  2237,  2238,  2239,  2240,
-    2241,  2242,  2243,  2366,  2244,  2245,  2246,  2247,  2248,  2249,
-    2250,  2251,  2252,  2253,  2254,  2255,  2256,  2257,  2258,  2259,
-    2260,  2261,  2262,  2263,  2367,  2264,  2265,  2266,  2267,  2268,
-    2269,  2270,  2271,  2272,  2273,  2274,  2275,  2276,  2277,  2278,
-    2368,  2279,  2280,  2281,  2282,  2369,  2283,  2284,  2285,  2286,
-    2287,  2288,  2289,  2290,  2291,  2292,  2293,  2294,  2370,  2295,
-    2296,  2297,  2298,  2299,  2300,  2301,  2302,  2371,  2372,  2303,
-    2304,  2373,  2305,  2374,  2306,  2307,  2308,  2309,  2310,  2311,
-    2312,  2313,  2314,  2315,  2316,  2317,  2318,  2319,  2320,  2321,
-    2322,  2375,  2376,  2323,  2324,  2325,  2326,  2327,  2328,  2329,
-    2330,  2331,  2332,  2333,  2334,  2377,  2378,  2379,  2380,  2381,
-    2382,  2383,  2384,  2385,  2335,  2336,  2337,   354,  1439,  2023,
-    2056,  2057,  1347,  1328,   563,     0,  1249,   383,     0,     0,
-       0,     0,     0,     0,     0,     0,   776,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   174,     0,
-       0,   407,   406,     0,     0,     0,   979,   412,     0,     0,
-       0,     0,     0,   551,  1389,  2233,  1387,  1440,   252,   255,
-     256,   253,   254,  2045,     0,  1089,  1090,  1092,     0,     0,
-    1102,   813,   814,     0,     0,     0,   816,     0,     0,     0,
-     810,     0,     0,     0,     0,     0,     0,   815,   807,     0,
-     806,     0,     0,  1102,     0,     0,     0,   808,     0,     0,
-    1250,  1386,   413,  1476,     0,  1364,  1365,  1366,  1348,  1355,
-    1367,  1360,  1362,  1361,  1363,  1359,  2044,  2071,   917,   917,
-     917,   917,   914,   915,   917,   917,   917,  2250,     0,     0,
-     896,     0,   898,  2046,   917,   922,   468,   468,   468,     0,
-     921,   926,   468,     0,  1243,  1281,  2028,  1488,     0,   897,
-    1242,  2303,  1378,     0,     0,  1117,  1113,  1115,  1116,  1114,
-       0,     0,     0,  2266,  1254,   236,  2276,  2371,  2303,   235,
-     230,   231,   204,  2075,     0,     0,   921,     0,  1251,  1252,
-     882,  1495,  1493,     0,  2010,  2093,  2107,  2192,   227,  2261,
-    2267,  2276,  2371,  2303,  2334,   183,   193,   188,     0,   245,
-    2276,  2371,  2303,   241,  1272,     0,  1465,  1593,  2019,     0,
-    1245,  1244,  1349,     0,  1352,     0,  1554,  2246,  1469,  1472,
-    1354,  1470,  1461,     0,     0,     1,  1476,  1343,  1492,  1492,
-       0,  1492,     0,  1453,  1461,  1456,  1460,     0,     0,     0,
-       0,  2055,  2386,  2387,  2388,  2389,  2390,  2391,  2392,  2393,
-    2394,  2395,  2396,  2397,  2398,  2399,  2400,  2401,  2402,  2403,
-    2404,  2405,  2406,  2407,  2408,     0,     0,  2029,  2056,  2060,
-       0,   823,     0,  1284,  2024,   966,     0,     0,     0,     0,
-    2023,     0,     0,     0,     0,  2061,  2051,  2052,     0,  2049,
-    2050,  2062,  2063,  2064,     0,  2165,     0,     0,     0,  1918,
-    1929,  1930,  1931,  2097,  2150,  1926,  1927,  1928,  1920,  1921,
-    1922,  1923,  1924,  1925,     0,  1087,  1919,     0,  2165,     0,
-     153,     0,   131,     0,     0,  2165,     0,     0,     0,     0,
-       0,  2165,     0,     0,     0,     0,     0,  2197,     0,   131,
-    2165,     0,     0,  1266,     0,     0,     0,  1268,  1271,  1247,
-    1331,     0,  2019,     0,     0,   859,   851,     0,   860,   852,
-       0,     0,   862,     0,     0,   854,     0,     0,     0,     0,
-     863,     0,   853,   855,   865,   856,   861,     0,     0,     0,
-       0,   857,     0,     0,  1258,   468,   361,     0,     0,     0,
-       0,     0,   131,  1316,     0,  2165,   131,     0,     0,   411,
-     410,   131,  2049,   409,   408,  2097,  2150,     0,  1006,     0,
-     131,  2165,     0,   176,   634,   566,     0,     0,   735,  2197,
-     131,     0,     0,     0,     0,     0,     0,   982,     0,     0,
-       0,   550,   563,  1390,  1388,     0,  1093,   229,   228,  1091,
-    2165,     0,   329,     0,     0,  2165,  1303,  2058,  1651,  1680,
-    1658,  1680,  1680,  1647,  1647,  2134,  1660,  2165,  1648,  1649,
-    1687,     0,  1680,  1647,  1652,     0,  1650,  1690,  1690,  1675,
-     329,   827,  1632,  1633,  1634,  1635,  1661,  1662,  1636,  1667,
-    1668,  1682,  1637,  1704,  1647,  2059,   812,     0,   811,  2165,
-       0,  2165,  2053,   167,     0,   809,  2097,  2150,  2165,     0,
-       0,  2165,     0,  2165,   159,  2165,     0,  2165,   329,  2165,
-     567,     0,     0,  2165,     0,  2165,   329,  2165,  2197,   161,
-       0,  2165,   329,   821,     0,  1383,     0,  1357,  2375,  1372,
-       0,  1368,  1375,  1371,  1476,   917,   916,     0,   917,     0,
-     917,     0,   917,     0,   917,     0,     0,     0,   917,  2047,
-    2048,   899,     0,   923,     0,     0,   930,   929,   928,     0,
-       0,     0,   931,     0,  1597,  1413,     0,  1240,  1257,     0,
-       0,     0,   982,  1120,     0,  1118,  1109,  1110,  1253,   234,
-     232,     0,     0,     0,     0,     0,     0,  1259,     0,     0,
-       0,     0,  2032,  2034,  2035,  1932,  2000,     0,  2339,  2340,
-    2341,  1991,     0,  2342,  2343,  2344,  2388,  1834,  1821,  1830,
-    1835,  1822,  1824,  1831,  2345,  2346,  2347,  2348,  2042,  2349,
-    2350,  2351,  2353,  2354,  2355,  2356,  1826,  1828,  2357,  2358,
-       0,  2043,  2360,  2361,  2218,  2363,  2364,  2366,  2367,  1832,
-    2369,  2370,  2371,  2372,  2373,  2374,  2041,     0,  1833,  2376,
-    2378,  2379,  2380,  2381,  2382,  2383,  2384,  2385,     0,     0,
-       0,  2016,     0,  1801,     0,  1640,  1641,  1663,  1664,  1642,
-    1669,  1670,  1643,     0,  2015,  1707,  1883,  1800,  1817,     0,
-    1806,  1807,     0,  1799,  1795,  1478,  2011,     0,  1796,  2031,
-    2033,  1992,  1478,  2009,   196,   247,     0,   248,  2017,  2276,
-     184,   226,   198,   225,   199,   197,     0,  2095,   185,     0,
-       0,   186,     0,     0,     0,     0,   244,   242,     0,  1248,
-       0,  1595,  1594,     0,     0,  1998,  2020,   832,  1341,  1342,
-    1340,     0,  1337,  1339,  1351,  1348,  2005,  2004,  2006,     0,
-    1471,     0,     0,     0,  1451,  1450,     3,  1354,  1490,  1491,
-       0,     0,     0,     0,     0,     0,     0,     0,  1544,  1506,
-    1507,  1509,  1541,  1545,  1553,     0,  1457,     0,     0,  1599,
-       0,  1555,     0,     0,  2030,     0,     0,     0,     0,   824,
-       0,     0,     0,  1290,     0,  1292,  1293,  1294,     0,     0,
-    1295,  1296,  1284,   238,  1302,  1300,  1283,  1285,  1298,     0,
-       0,     0,     0,     0,     0,     0,  1308,     0,     0,   165,
-     166,   578,   563,     0,  2165,     0,     0,     0,     0,  1046,
-    1053,     0,     0,     0,     0,     0,     0,     0,  1047,  1045,
-    1048,   240,  1057,  1073,  1076,     0,   956,     0,     0,     0,
-       0,     0,  1172,     0,     0,  1172,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   261,
-     273,   324,   543,     0,     0,   545,     0,  2165,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   129,
-     130,   135,     0,     0,     0,     0,     0,     0,   530,   542,
-       0,     0,     0,     0,     0,   539,     0,   131,   265,   523,
-     527,     0,     0,     0,   643,   642,  1306,  1305,     0,     0,
-       0,  1172,     0,   257,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   347,
-     348,     0,     0,     0,   135,   158,     0,     0,     0,   267,
-       0,     0,  1267,  1264,  1265,     0,  1270,     0,  1327,     0,
-       0,     0,     0,     0,   867,     0,   864,     0,     0,   858,
-    2097,  2150,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   386,   360,     0,     0,   732,     0,     0,     0,     0,
-       0,   743,     0,  1284,  1315,     0,     0,     0,   572,     0,
-    2165,     0,   133,   777,     0,   733,   412,     0,     0,   133,
-       0,     0,   170,     0,   638,     0,     0,     0,     0,     0,
-       0,   681,   680,     0,     0,     0,   734,     0,   133,     0,
-    2165,   526,  2165,     0,   468,   468,     0,     0,   981,   984,
-       0,     0,     0,     0,  1443,  1445,  1444,     0,  1442,     0,
-     329,   327,   328,   730,  1101,     0,     0,  1679,  1666,  1674,
-    1673,     0,  1656,  1655,  1654,     0,  1653,     0,  1680,  1680,
-    1678,  1657,  1632,     0,     0,     0,  1686,     0,  1684,     0,
-     802,  1628,  1624,     0,     0,  1672,  1693,  1694,  1695,  1692,
-    1705,  1691,     0,  1638,  1696,  1647,  1644,     0,     0,   329,
-       0,     0,  2165,   329,  2165,     0,  2165,     0,     0,   329,
-     329,     0,     0,     0,     0,     0,     0,   639,     0,   820,
-     818,   817,   819,     0,     0,     0,     0,   800,     0,     0,
-       0,  2165,   329,     0,     0,   799,  1942,     0,     0,  1476,
-       0,   215,   216,   214,  1373,   217,  1374,  1370,  1356,     0,
-     907,     0,   911,     0,   902,     0,   908,     0,   903,   900,
-     901,     0,   906,     0,     0,   469,   471,     0,     0,  2119,
-    2133,     0,  2156,  2185,  2186,  2267,  2272,     0,  2298,  2308,
-       0,   932,   961,   927,   652,     0,     0,  1423,  1241,  1949,
-       0,  1476,     0,     0,     0,     0,   233,   205,     0,     0,
-       0,   963,  2266,  1256,   881,   563,     0,  1797,     0,  1804,
-    1805,  1990,     0,     0,     0,     0,     0,     0,  1803,  1957,
-       0,     0,     0,     0,     0,  1730,     0,     0,     0,  1970,
-       0,  1976,     0,     0,  1767,     0,     0,     0,     0,     0,
-       0,     0,     0,  1731,  1711,  1712,  1801,  1942,     0,  1802,
-    2038,     0,  1704,  2014,  1932,     0,  1929,  1930,  1931,     0,
-       0,     0,  2003,     0,  1940,     0,     0,  1745,  1938,  1747,
-       0,     0,     0,     0,  1926,  1927,  1928,  1920,  1921,  1922,
-    1923,  1924,  1925,  1936,  1727,     0,     0,  1885,     0,  1726,
-       0,     0,  1557,     0,  2036,  1993,  1557,   249,   250,   246,
-       0,     0,   201,   200,     0,   219,   223,   224,   195,   222,
-       0,   218,   203,  1874,  1873,   202,   194,   191,   189,   206,
-     208,   209,   192,   190,   243,     0,     0,  2065,  2409,  2410,
+      29,    28,    43,    36,   122,    33,  1350,    94,   106,    93,
+      68,   100,    71,   104,   121,    69,   117,  1451,  1450,  1500,
+    1454,  1477,     0,  1466,  1263,  1262,  1248,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   564,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1274,  2057,
+    2072,  2073,  2074,  2075,  2076,  2077,  2078,  2079,   356,  2080,
+    2081,  2082,  2083,  2084,  2085,  2086,  2087,  2088,  2089,  2340,
+    2341,  2342,  2343,  2090,  2091,  2092,  2093,  2094,  2095,  2096,
+    2344,  2345,  2097,  2098,  2099,  2100,  2101,  2346,  2102,  2103,
+    2104,  2105,  2106,  2107,  2108,  2109,  2110,  2111,  2112,  2113,
+    2114,  2115,  2116,  2117,  2118,  2119,  2120,  2121,  2122,  2123,
+    2347,  2348,  2124,  2125,  2126,  2127,  2128,  2129,  2130,  2131,
+    2132,  2133,  2134,  2135,  2136,  2137,  2138,  2139,  2140,  2141,
+    2142,  2143,  2144,  2145,  2146,  2147,  2148,  2349,  2149,  2150,
+    2151,  2350,  2152,  2153,  2154,  2351,  2155,  2156,  2157,  2158,
+    2159,  2160,  2161,  2352,  2353,  2162,  2163,  2164,  2165,  2166,
+    2167,  2168,  2169,  2170,  2171,  2172,  2173,  2174,  2175,  2176,
+    2177,  2178,  2354,  2179,  2180,  2181,  2182,  2355,  2356,  2357,
+    2183,  2184,  2185,  2186,  2187,  2188,  2189,  2190,  2358,  2191,
+    2192,  2193,  2194,  2195,  2196,  2197,  2198,  2199,  2200,  2201,
+    2202,  2203,  2204,  2205,  2206,  2207,  2208,  2209,  2359,  2360,
+    2210,  2211,  2361,  2212,  2213,  2214,  2362,  2215,  2363,  2216,
+    2217,  2218,  2219,  2220,  2221,  2222,  2223,  2364,  2224,  2365,
+    2225,  2226,  2227,  2228,  2229,  2230,  2231,  2232,  2233,  2366,
+    2234,  2367,  2237,  2235,  2236,  2238,  2239,  2240,  2241,  2242,
+    2243,  2244,  2245,  2368,  2246,  2247,  2248,  2249,  2250,  2251,
+    2252,  2253,  2254,  2255,  2256,  2257,  2258,  2259,  2260,  2261,
+    2262,  2263,  2264,  2265,  2369,  2266,  2267,  2268,  2269,  2270,
+    2271,  2272,  2273,  2274,  2275,  2276,  2277,  2278,  2279,  2280,
+    2370,  2281,  2282,  2283,  2284,  2371,  2285,  2286,  2287,  2288,
+    2289,  2290,  2291,  2292,  2293,  2294,  2295,  2296,  2372,  2297,
+    2298,  2299,  2300,  2301,  2302,  2303,  2304,  2373,  2374,  2305,
+    2306,  2375,  2307,  2376,  2308,  2309,  2310,  2311,  2312,  2313,
+    2314,  2315,  2316,  2317,  2318,  2319,  2320,  2321,  2322,  2323,
+    2324,  2377,  2378,  2325,  2326,  2327,  2328,  2329,  2330,  2331,
+    2332,  2333,  2334,  2335,  2336,  2379,  2380,  2381,  2382,  2383,
+    2384,  2385,  2386,  2387,  2337,  2338,  2339,   355,  1441,  2025,
+    2058,  2059,  1349,  1330,   565,     0,  1251,   384,     0,     0,
+       0,     0,     0,     0,     0,     0,   778,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   175,     0,
+       0,   408,   407,     0,     0,     0,   981,   413,     0,     0,
+       0,     0,     0,   553,  1391,  2235,  1389,  1442,   253,   256,
+     257,   254,   255,  2047,     0,  1091,  1092,  1094,     0,     0,
+    1104,   815,   816,     0,     0,     0,   818,     0,     0,     0,
+     812,     0,     0,     0,     0,     0,     0,   817,   809,     0,
+     808,     0,     0,  1104,     0,     0,     0,   810,     0,     0,
+    1252,  1388,   414,  1478,     0,  1366,  1367,  1368,  1350,  1357,
+    1369,  1362,  1364,  1363,  1365,  1361,  2046,  2073,   919,   919,
+     919,   919,   916,   917,   919,   919,   919,  2252,     0,     0,
+     898,     0,   900,  2048,   919,   924,   469,   469,   469,     0,
+     923,   928,   469,     0,  1245,  1283,  2030,  1490,     0,   899,
+    1244,  2305,  1380,     0,     0,  1119,  1115,  1117,  1118,  1116,
+       0,     0,     0,  2268,  1256,   237,  2278,  2373,  2305,   236,
+     231,   232,   205,  2077,     0,     0,   923,     0,  1253,  1254,
+     884,  1497,  1495,     0,  2012,  2095,  2109,  2194,   228,  2263,
+    2269,  2278,  2373,  2305,  2336,   184,   194,   189,     0,   246,
+    2278,  2373,  2305,   242,  1274,     0,  1467,  1595,  2021,     0,
+    1247,  1246,  1351,     0,  1354,     0,  1556,  2248,  1471,  1474,
+    1356,  1472,  1463,     0,     0,     1,  1478,  1345,  1494,  1494,
+       0,  1494,     0,  1455,  1463,  1458,  1462,     0,     0,     0,
+       0,  2057,  2388,  2389,  2390,  2391,  2392,  2393,  2394,  2395,
+    2396,  2397,  2398,  2399,  2400,  2401,  2402,  2403,  2404,  2405,
+    2406,  2407,  2408,  2409,  2410,     0,     0,  2031,  2058,  2062,
+       0,   825,     0,  1286,  2026,   968,     0,     0,     0,     0,
+    2025,     0,     0,     0,     0,  2063,  2053,  2054,     0,  2051,
+    2052,  2064,  2065,  2066,     0,  2167,     0,     0,     0,  1920,
+    1931,  1932,  1933,  2099,  2152,  1928,  1929,  1930,  1922,  1923,
+    1924,  1925,  1926,  1927,     0,  1089,  1921,     0,  2167,     0,
+     153,     0,   131,     0,     0,  2167,     0,     0,     0,     0,
+       0,  2167,     0,     0,     0,     0,     0,   153,  2199,     0,
+     131,  2167,     0,     0,  1268,     0,     0,     0,  1270,  1273,
+    1249,  1333,     0,  2021,     0,     0,   861,   853,     0,   862,
+     854,     0,     0,   864,     0,     0,   856,     0,     0,     0,
+       0,   865,     0,   855,   857,   867,   858,   863,     0,     0,
+       0,     0,   859,     0,     0,  1260,   469,   362,     0,     0,
+       0,     0,     0,   131,  1318,     0,  2167,   131,     0,     0,
+     412,   411,   131,  2051,   410,   409,  2099,  2152,     0,  1008,
+       0,   131,  2167,     0,   177,   636,   568,     0,     0,   737,
+    2199,   131,     0,     0,     0,     0,     0,     0,   984,     0,
+       0,     0,   552,   565,  1392,  1390,     0,  1095,   230,   229,
+    1093,  2167,     0,   330,     0,     0,  2167,  1305,  2060,  1653,
+    1682,  1660,  1682,  1682,  1649,  1649,  2136,  1662,  2167,  1650,
+    1651,  1689,     0,  1682,  1649,  1654,     0,  1652,  1692,  1692,
+    1677,   330,   829,  1634,  1635,  1636,  1637,  1663,  1664,  1638,
+    1669,  1670,  1684,  1639,  1706,  1649,  2061,   814,     0,   813,
+    2167,     0,  2167,  2055,   168,     0,   811,  2099,  2152,  2167,
+       0,     0,  2167,     0,  2167,   160,  2167,     0,  2167,   330,
+    2167,   569,     0,     0,  2167,     0,  2167,   330,  2167,  2199,
+     162,     0,  2167,   330,   823,     0,  1385,     0,  1359,  2377,
+    1374,     0,  1370,  1377,  1373,  1478,   919,   918,     0,   919,
+       0,   919,     0,   919,     0,   919,     0,     0,     0,   919,
+    2049,  2050,   901,     0,   925,     0,     0,   932,   931,   930,
+       0,     0,     0,   933,     0,  1599,  1415,     0,  1242,  1259,
+       0,     0,     0,   984,  1122,     0,  1120,  1111,  1112,  1255,
+     235,   233,     0,     0,     0,     0,     0,     0,  1261,     0,
+       0,     0,     0,  2034,  2036,  2037,  1934,  2002,     0,  2341,
+    2342,  2343,  1993,     0,  2344,  2345,  2346,  2390,  1836,  1823,
+    1832,  1837,  1824,  1826,  1833,  2347,  2348,  2349,  2350,  2044,
+    2351,  2352,  2353,  2355,  2356,  2357,  2358,  1828,  1830,  2359,
+    2360,     0,  2045,  2362,  2363,  2220,  2365,  2366,  2368,  2369,
+    1834,  2371,  2372,  2373,  2374,  2375,  2376,  2043,     0,  1835,
+    2378,  2380,  2381,  2382,  2383,  2384,  2385,  2386,  2387,     0,
+       0,     0,  2018,     0,  1803,     0,  1642,  1643,  1665,  1666,
+    1644,  1671,  1672,  1645,     0,  2017,  1709,  1885,  1802,  1819,
+       0,  1808,  1809,     0,  1801,  1797,  1480,  2013,     0,  1798,
+    2033,  2035,  1994,  1480,  2011,   197,   248,     0,   249,  2019,
+    2278,   185,   227,   199,   226,   200,   198,     0,  2097,   186,
+       0,     0,   187,     0,     0,     0,     0,   245,   243,     0,
+    1250,     0,  1597,  1596,     0,     0,  2000,  2022,   834,  1343,
+    1344,  1342,     0,  1339,  1341,  1353,  1350,  2007,  2006,  2008,
+       0,  1473,     0,     0,     0,  1453,  1452,     3,  1356,  1492,
+    1493,     0,     0,     0,     0,     0,     0,     0,     0,  1546,
+    1508,  1509,  1511,  1543,  1547,  1555,     0,  1459,     0,     0,
+    1601,     0,  1557,     0,     0,  2032,     0,     0,     0,     0,
+     826,     0,     0,     0,  1292,     0,  1294,  1295,  1296,     0,
+       0,  1297,  1298,  1286,   239,  1304,  1302,  1285,  1287,  1300,
+       0,     0,     0,     0,     0,     0,     0,  1310,     0,     0,
+     166,   167,   580,   565,     0,  2167,     0,     0,     0,     0,
+    1048,  1055,     0,     0,     0,     0,     0,     0,     0,  1049,
+    1047,  1050,   241,  1059,  1075,  1078,     0,   958,     0,     0,
+       0,     0,     0,  1174,     0,     0,  1174,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     262,   274,   325,   544,     0,     0,     0,   547,     0,  2167,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   129,   130,   135,     0,     0,     0,     0,     0,     0,
+     531,   543,     0,     0,     0,     0,     0,   540,     0,   131,
+     266,   524,   528,     0,     0,     0,   645,   644,  1308,  1307,
+       0,     0,     0,  1174,     0,   258,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   348,   349,     0,     0,     0,   135,     0,     0,     0,
+       0,   268,     0,     0,  1269,  1266,  1267,     0,  1272,     0,
+    1329,     0,     0,     0,     0,     0,   869,     0,   866,     0,
+       0,   860,  2099,  2152,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   387,   361,     0,     0,   734,     0,     0,
+       0,     0,     0,   745,     0,  1286,  1317,     0,     0,     0,
+     574,     0,  2167,     0,   133,   779,     0,   735,   413,     0,
+       0,   133,     0,     0,   171,     0,   640,     0,     0,     0,
+       0,     0,     0,   683,   682,     0,     0,     0,   736,     0,
+     133,     0,  2167,   527,  2167,     0,   469,   469,     0,     0,
+     983,   986,     0,     0,     0,     0,  1445,  1447,  1446,     0,
+    1444,     0,   330,   328,   329,   732,  1103,     0,     0,  1681,
+    1668,  1676,  1675,     0,  1658,  1657,  1656,     0,  1655,     0,
+    1682,  1682,  1680,  1659,  1634,     0,     0,     0,  1688,     0,
+    1686,     0,   804,  1630,  1626,     0,     0,  1674,  1695,  1696,
+    1697,  1694,  1707,  1693,     0,  1640,  1698,  1649,  1646,     0,
+       0,   330,     0,     0,  2167,   330,  2167,     0,  2167,     0,
+       0,   330,   330,     0,     0,     0,     0,     0,     0,   641,
+       0,   822,   820,   819,   821,     0,     0,     0,     0,   802,
+       0,     0,     0,  2167,   330,     0,     0,   801,  1944,     0,
+       0,  1478,     0,   216,   217,   215,  1375,   218,  1376,  1372,
+    1358,     0,   909,     0,   913,     0,   904,     0,   910,     0,
+     905,   902,   903,     0,   908,     0,     0,   470,   472,     0,
+       0,  2121,  2135,     0,  2158,  2187,  2188,  2269,  2274,     0,
+    2300,  2310,     0,   934,   963,   929,   654,     0,     0,  1425,
+    1243,  1951,     0,  1478,     0,     0,     0,     0,   234,   206,
+       0,     0,     0,   965,  2268,  1258,   883,   565,     0,  1799,
+       0,  1806,  1807,  1992,     0,     0,     0,     0,     0,     0,
+    1805,  1959,     0,     0,     0,     0,     0,  1732,     0,     0,
+       0,  1972,     0,  1978,     0,     0,  1769,     0,     0,     0,
+       0,     0,     0,     0,     0,  1733,  1713,  1714,  1803,  1944,
+       0,  1804,  2040,     0,  1706,  2016,  1934,     0,  1931,  1932,
+    1933,     0,     0,     0,  2005,     0,  1942,     0,     0,  1747,
+    1940,  1749,     0,     0,     0,     0,  1928,  1929,  1930,  1922,
+    1923,  1924,  1925,  1926,  1927,  1938,  1729,     0,     0,  1887,
+       0,  1728,     0,     0,  1559,     0,  2038,  1995,  1559,   250,
+     251,   247,     0,     0,   202,   201,     0,   220,   224,   225,
+     196,   223,     0,   219,   204,  1876,  1875,   203,   195,   192,
+     190,   207,   209,   210,   193,   191,   244,     0,     0,  2067,
     2411,  2412,  2413,  2414,  2415,  2416,  2417,  2418,  2419,  2420,
     2421,  2422,  2423,  2424,  2425,  2426,  2427,  2428,  2429,  2430,
     2431,  2432,  2433,  2434,  2435,  2436,  2437,  2438,  2439,  2440,
@@ -2405,441 +2406,442 @@
     2451,  2452,  2453,  2454,  2455,  2456,  2457,  2458,  2459,  2460,
     2461,  2462,  2463,  2464,  2465,  2466,  2467,  2468,  2469,  2470,
     2471,  2472,  2473,  2474,  2475,  2476,  2477,  2478,  2479,  2480,
-    2481,  2482,  2483,  2484,  2485,  1995,  1994,  2026,  2066,  2067,
-    2068,  2069,  1999,     0,     0,   329,  1335,     0,  1332,  2008,
-       0,  1473,     0,  2021,     0,  1344,  1468,  1467,  1499,  1500,
-     999,  1466,  1524,  1525,  1520,     0,     0,     0,  1550,  1548,
-    1516,  1510,  1515,  1513,     0,  1517,  1707,  1543,  1455,  1504,
-    1505,  1508,  1454,     0,  1546,     0,  1426,  1544,  1509,  1410,
-       0,  1392,     0,  1600,     0,  1021,  1023,     0,  1022,     0,
-    1025,     0,  1034,     0,     0,  1020,  1039,     0,  1028,  1026,
-       0,     0,     0,     0,     0,     0,   825,     0,     0,     0,
-       0,  1291,     0,     0,  2298,   237,  1294,  1299,  1286,  1297,
-       0,     0,     0,     0,     0,   965,   964,     0,     0,   986,
-       0,     0,     0,  1311,   457,     0,   326,     0,     0,     0,
-       0,     0,     0,     0,     0,   728,   725,     0,     0,   724,
-       0,   576,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   613,     0,  1172,     0,   646,     0,  1055,     0,  1054,
-       0,     0,     0,  1056,  1051,  1052,  2267,  2276,  2303,   239,
-    1075,     0,  1074,  1072,  1009,     0,  1010,     0,     0,     0,
-       0,     0,  2143,   275,   288,     0,  1171,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   311,     0,     0,   314,   313,     0,     0,     0,     0,
-       0,   318,   297,     0,   298,     0,     0,   317,     0,     0,
-     544,     0,     0,     0,  1172,     0,   269,     0,     0,     0,
-       0,     0,     0,  1088,     0,   670,     0,   156,     0,   152,
-     155,     0,     0,     0,     0,   529,   541,     0,   533,   534,
-     531,   535,   536,     0,     0,     0,     0,     0,     0,   528,
-       0,     0,   636,   635,   641,     0,     0,     0,     0,     0,
-       0,     0,     0,  1122,  1121,     0,     0,     0,     0,     0,
-       0,   767,     0,     0,     0,     0,     0,     0,     0,   655,
-       0,   654,     0,   157,     0,     0,     0,     0,     0,     0,
-       0,   213,  1263,  1269,  1330,  2027,  1329,     0,     0,     0,
-       0,   866,     0,     0,     0,     0,     0,     0,     0,     0,
-     868,   869,   870,   871,     0,     0,     0,     0,     0,     0,
-       0,   363,   364,   131,   362,  2058,     0,   756,   731,     0,
-       0,   744,     0,   746,   749,     0,  1282,   430,     0,     0,
-     569,   613,     0,   415,   163,     0,     0,     0,     0,   672,
-     128,   174,   176,   413,     0,   175,   177,   179,   180,   181,
-     178,   182,   633,   637,     0,   565,     0,     0,     0,     0,
-       0,   682,   686,   685,   689,   687,     0,   683,     0,     0,
-    1620,     0,   151,     0,     0,   521,   525,     0,     0,     0,
-     415,   499,   340,  2165,     0,   468,     0,  2165,     0,   983,
-       0,     0,     0,     0,     0,     0,     0,     0,  1441,     0,
-    1079,     0,  1304,     0,     0,     0,   329,  1677,  1676,  1629,
-    1625,     0,     0,     0,     0,   828,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1645,  2165,   329,     0,
-    1077,   168,  2054,     0,   804,     0,     0,     0,     0,     0,
-    1081,   796,     0,   329,   160,     0,   329,   329,   568,     0,
-       0,   329,   329,   162,     0,     0,     0,   560,   329,   822,
-    1385,     0,  2165,   468,  1358,  1369,   904,   913,   912,   910,
-     909,   905,     0,   924,     0,   467,     0,     0,     0,   938,
-     939,     0,     0,   937,   954,   940,     0,   942,   934,   933,
-     943,   944,     0,     0,   963,   650,     0,     0,     0,     0,
-    1420,     0,  1418,     0,  1598,  1422,  1411,  1377,     0,  1376,
-    1380,  1382,  1381,  1379,     0,   514,     0,     0,  1119,     0,
-       0,   921,     0,     0,   329,  1255,     0,   883,   884,     0,
-       0,     0,     0,     0,     0,   890,   887,   888,   889,   891,
-       0,   892,     0,     0,     0,  2001,  1953,     0,  1954,     0,
-       0,  1989,  1985,     0,     0,     0,     0,     0,  1958,  1961,
-    1962,  1963,  1960,  1964,  1959,     0,     0,  1965,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2367,     0,     0,
-       0,     0,  1770,     0,     0,  1913,     0,  1942,  1975,     0,
-       0,     0,     0,     0,     0,  1942,  1981,     0,     0,     0,
-       0,  1872,     0,  1869,     0,     0,     0,     0,  2000,     0,
-       0,  2039,  1708,  1722,  1723,  1724,  1728,  2013,     0,  2002,
-       0,     0,  1709,  1736,     0,  1982,  1763,     0,  1768,  1751,
-       0,  1744,     0,  1749,  1753,  1732,     0,  1729,     0,  2003,
-    1941,     0,  1939,     0,  1719,  1720,  1721,  1713,  1714,  1715,
-    1716,  1717,  1718,  1725,  1917,  1915,  1916,     0,     0,     0,
-    1893,     0,     0,  1748,  2158,  2192,     0,  1489,  1489,  1489,
-    1477,  1487,  2012,     0,  1615,     0,     0,     0,     0,  1809,
-       0,  1946,  1498,  1944,  1026,  1615,  2018,     0,     0,  1704,
-       0,  1596,  1996,     0,   830,   831,   829,  1354,  1338,  1334,
-    1333,  2007,  1353,     0,  1476,     0,   997,   998,     0,  1002,
-       0,     0,  1518,  1551,     0,  1542,     0,  1522,  1523,  1514,
-    1552,  1424,     0,  1547,  1459,  1458,     0,  1618,     0,     0,
-    1402,  1394,     0,  1601,     0,  1557,  1428,  1430,  1431,     0,
-    2000,  1024,     0,  1647,  1035,     0,  1019,     0,  1018,  1647,
-       0,  1036,     0,  1647,     0,     0,     0,  1200,  1124,  1176,
-     826,  1201,  1125,  1177,  1202,  1126,  1301,  1289,  1288,  1287,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   707,  2165,   329,  1309,  1203,     0,
-    1127,   325,  1310,  1178,  1314,   727,   726,     0,     0,  1179,
-       0,   577,     0,     0,   582,   583,   584,     0,     0,     0,
-     585,     0,  2097,  2150,     0,   590,   597,   602,   592,     0,
-       0,   604,   598,     0,     0,     0,     0,     0,     0,   610,
-     617,     0,     0,     0,     0,     0,     0,  1049,  1050,  1204,
-    1130,     0,  1180,  1008,     0,  1131,   164,     0,     0,   262,
-     276,   619,   707,  1174,   295,     0,   310,   305,   306,   304,
-    2165,   329,  2165,   329,     0,     0,     0,     0,     0,   307,
-     302,   303,   299,     0,     0,   312,  2074,  2135,  2277,     0,
-     623,   625,     0,   630,   315,  1147,   336,   335,   334,     0,
-     319,     0,   341,   344,   316,   293,   296,   294,   290,   274,
-       0,     0,     0,     0,     0,     0,     0,  2025,     0,     0,
-    1083,     0,     0,     0,     0,     0,     0,   664,   154,  1162,
-     144,     0,     0,   140,     0,     0,     0,     0,   134,     0,
-    1210,  1137,     0,     0,   266,   524,   532,   537,  1141,   540,
-    1190,   538,  1216,  1138,     0,  1172,     0,   258,     0,  1139,
-       0,  1184,  1212,  1164,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1317,     0,     0,     0,     0,     0,   329,
-       0,     0,     0,  1174,  2165,   329,  1211,     0,  1169,  1198,
-       0,   349,     0,  1163,     0,     0,   268,  1143,  1192,     0,
-       0,   211,   210,   212,     0,     0,  2133,     0,   873,   835,
-     872,     0,     0,     0,     0,     0,     0,   843,     0,     0,
-       0,   834,     0,   833,   385,   358,   359,   361,   368,     0,
-     755,     0,     0,     0,   745,     0,     0,     0,  1307,     0,
-     131,     0,     0,     0,   571,   612,   619,     0,     0,     0,
-     414,   418,   422,   423,   424,     0,     0,     0,     0,   145,
-     132,     0,   785,     0,   468,     0,   668,     0,   176,   169,
-       0,     0,     0,   340,   742,   740,   739,   741,     0,     0,
-       0,   760,   738,     0,  1619,  1621,     0,     0,     0,     0,
-       0,   514,   417,     0,   471,     0,     0,   503,     0,     0,
-       0,     0,   340,     0,     0,     0,  1013,     0,  1031,  1014,
-       0,     0,     0,     0,  1061,  1068,  1062,  1041,     0,     0,
-     548,  1446,  1447,     0,   329,     0,     0,  1646,  1659,   803,
-       0,  1689,  1688,  1690,  1690,     0,  1630,     0,  1681,  1682,
-    1698,  1699,  1700,  1701,  1702,  1703,     0,  1697,  1639,     0,
-     614,   329,   329,     0,   329,     0,   329,   329,     0,   661,
-       0,  1238,   640,     0,     0,   715,   801,     0,     0,   329,
-     798,  1943,     0,   925,   470,     0,     0,     0,     0,   936,
-       0,   546,   941,     0,   953,   948,   950,     0,   957,   649,
-       0,     0,  1421,  1414,  1416,  1415,     0,     0,  1412,  1950,
-     797,     0,   520,  1111,  1112,     0,     0,   329,     0,   958,
-       0,     0,   885,   886,     0,     0,   893,     0,     0,     0,
-    1494,  1951,  1952,     0,     0,     0,  1986,     0,     0,  1847,
-       0,  1823,  1825,  1837,     0,  1848,  1808,  1849,  1827,  1829,
-       0,  1933,     0,     0,  1838,     0,  1772,  1773,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1788,  1787,  1839,  1912,     0,
-       0,  1973,  1974,  1840,     0,     0,  1980,     0,     0,     0,
-    1845,  1850,     0,     0,     0,     0,  1856,     0,  1877,     0,
-       0,     0,  1798,  1943,     0,     0,     0,     0,     0,     0,
-       0,     0,  1769,  1752,  1746,     0,  1750,  1754,     0,     0,
-       0,  1740,     0,     0,  1738,  1764,  1734,     0,     0,  1765,
-       0,     0,     0,  1816,     0,     0,  1489,  1489,  1489,  1489,
-    1486,     0,     0,     0,     0,  2264,     0,  1579,  1556,  1558,
-    1566,  1579,  1584,  1818,  1613,  1819,     0,  2019,     0,  1527,
-    1498,  1498,  1498,  1815,     0,     0,     0,     0,  1497,  1527,
-     187,     0,   220,   207,     0,  1336,  2022,     0,  1501,     0,
-    1934,  1002,     0,  1503,     0,     0,  1549,  1511,  1425,  1409,
-       0,  1407,  1396,     0,  1397,  2000,     0,  1407,  1393,  1436,
-       0,     0,  1618,     0,  1435,     0,  1647,  1016,  1017,     0,
-    1040,     0,  1199,  1123,  1175,   968,   969,     0,   967,     0,
-       0,     0,   456,   985,     0,     0,     0,   707,     0,     0,
-     460,     0,  1312,     0,  1217,  1161,   579,   580,     0,   591,
-       0,   600,   599,     0,     0,   587,     0,     0,     0,     0,
-       0,   586,   606,   552,   607,   609,     0,     0,   608,   611,
-     616,  1172,     0,   647,  1149,     0,  1196,  1043,     0,  1011,
-       0,     0,     0,     0,   430,   289,     0,     0,     0,   277,
-     287,     0,   321,     0,   292,     0,   285,   308,   300,   309,
-     301,   320,   322,     0,   627,   628,   626,   622,     0,   629,
-     631,     0,   338,     0,     0,     0,  1206,     0,  1172,     0,
-     270,  1145,     0,  1194,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1207,  1181,     0,     0,   669,
-       0,   666,     0,     0,   137,   136,     0,   143,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   350,   331,     0,   763,     0,     0,
-       0,   352,     0,     0,     0,     0,  1205,  1132,   836,     0,
-       0,     0,   837,   848,     0,     0,   838,     0,     0,     0,
-       0,   850,     0,     0,   357,   365,  2218,  1920,  1921,   753,
-     758,   750,   752,   754,   751,     0,   757,   707,     0,   747,
-     748,     0,     0,     0,     0,     0,   442,     0,     0,   436,
-       0,     0,  1068,   429,   432,   433,     0,     0,   572,   575,
-     573,   574,   605,     0,   449,   495,     0,   147,     0,     0,
-     148,   146,     0,     0,   340,   673,   677,   675,   674,   676,
-     671,     0,   664,     0,   172,   413,     0,     0,   564,   688,
-     691,   684,     0,   759,   761,   736,     0,   619,     0,   526,
-       0,   468,  1386,   509,     0,   499,   495,   497,   496,   498,
-       0,   505,   339,     0,     0,   514,   505,     0,     0,   986,
-    1012,     0,     0,     0,  1058,  1063,  1059,     0,     0,  1027,
-       0,  1060,     0,  1042,  1005,  1233,  1234,  1231,  1232,     0,
-       0,     0,  1438,  1080,     0,  1665,     0,  1685,  1683,  1626,
-    1631,  1671,  1706,   329,  1078,   805,     0,   792,     0,   794,
-    1082,   329,   329,   329,   329,   656,     0,   561,     0,     0,
-       0,     0,   935,   955,     0,   951,     0,     0,   918,   960,
-       0,     0,  1419,  1417,   512,     0,   963,     0,   919,   962,
-       0,     0,     0,     0,     0,     0,     0,  1955,     0,  1988,
-    1984,     0,  1820,  1956,     0,  1968,  1967,  1913,     0,     0,
-    1771,  1783,  1784,  1785,  1969,     0,  1793,     0,     0,  1780,
-    1781,  1782,  1774,  1775,  1776,  1777,  1778,  1779,  1786,  1978,
-    1977,  1971,  1972,     0,  1842,  1843,  1844,  1979,  1851,     0,
-    2088,  1878,  1855,  1871,  1870,     0,     0,     0,  1858,     0,
-       0,  1867,     0,  1914,  2040,  1710,     0,     0,  1737,  1983,
-    1755,     0,     0,     0,  1733,  1933,     0,     0,     0,     0,
-       0,  1742,     0,     0,     0,  1896,  1891,  1892,  1910,     0,
-       0,     0,     0,     0,     0,  1480,  1479,  1485,  1579,  1584,
-       0,  1461,     0,  1566,     0,  1578,  1564,  1577,     0,     0,
-    1590,  1588,     0,  1590,     0,  1590,     0,  1560,     0,  1580,
-    1562,  1577,     0,  1605,     0,  2020,  1614,     0,  1540,     0,
-       0,     0,     0,  1947,  1948,     0,  1945,  1810,  1540,     0,
-    1997,  1474,     0,  1502,  1000,  1001,  1519,  1512,  2115,  1616,
-       0,  1408,     0,     0,  1399,  1405,  1391,     0,     0,  1429,
-    1407,  1432,  1037,     0,     0,  1029,   974,   975,   973,   976,
-       0,     0,     0,   707,     0,     0,   476,     0,   993,   993,
-       0,     0,   462,   508,  1068,   710,     0,     0,     0,   708,
-     329,  1128,     0,   601,     0,     0,   596,   594,   593,   595,
-       0,   553,  1215,  1129,     0,     0,     0,     0,  1044,     0,
-       0,  1148,     0,   427,     0,   282,  1173,     0,     0,     0,
-     281,     0,   329,   329,   323,   624,   337,   342,   343,   346,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   786,   769,     0,     0,   787,   788,     0,     0,
-       0,  1085,  1086,  1084,     0,  1135,     0,     0,   660,   141,
-     138,   139,   142,  1159,  1142,  1191,     0,     0,     0,  1140,
-       0,  1185,  1155,  1151,     0,     0,     0,     0,     0,  1214,
-    1168,  1189,  1213,  1166,  1187,  1165,  1186,  1167,  1188,  1160,
-       0,  1623,   766,     0,     0,     0,   329,   329,   658,  1144,
-    1193,     0,     0,   839,     0,     0,   841,   842,     0,   845,
-     388,     0,   391,   398,   369,   374,  1316,     0,  1316,     0,
-     371,   375,  1316,   370,  1316,   367,   729,     0,     0,   706,
-       0,   434,     0,   440,   444,   445,   443,   435,  1068,   468,
-     507,     0,     0,   719,     0,   570,   415,   446,     0,     0,
-     419,   150,   149,     0,     0,     0,   667,   666,   176,  2165,
-       0,     0,   693,   697,   737,     0,  1622,   653,   340,   522,
-       0,     0,   415,   514,     0,   420,   425,   426,     0,   503,
-     499,     0,     0,   511,  1280,     0,   515,   517,     0,     0,
-       0,  1015,  1032,  1033,     0,     0,  1068,     0,     0,  1067,
-       0,     0,   555,   329,  1627,   615,   329,   329,   662,  1239,
-    1108,   716,     0,   947,   946,   945,   547,     0,   949,   651,
-       0,   513,   329,     0,     0,   895,   876,   894,     0,     0,
-     875,     0,   874,  1987,  1836,  1846,  1966,  1912,  1943,     0,
-       0,  1794,     0,     0,  1841,  2377,     0,     0,     0,     0,
-    1875,  1876,  1857,     0,  2209,  1862,     0,     0,     0,  1761,
-    1759,  1756,     0,  1757,  1741,     0,     0,  1739,  1735,     0,
-    1766,  1882,     0,  1898,  1895,  1909,  1943,  1484,  1483,  1482,
-    1481,  1565,  1563,     0,  1568,  1575,     0,  1559,     0,  1589,
-    1585,     0,  1586,     0,     0,  1587,     0,     0,  1561,     0,
-    1575,     0,  1612,  1498,     0,     0,  1887,  1813,  1814,  1811,
-    1498,  2037,  1887,   221,     0,     0,  1406,  1395,  1398,     0,
-       0,     0,     0,  1437,  1427,  1030,  1038,     0,     0,     0,
-     458,     0,  1068,     0,     0,     0,   996,   996,     0,  1068,
-     507,   712,   711,   714,   709,   713,  1313,     0,   588,   589,
-     603,  1150,     0,  1197,  1157,     0,  1423,     0,   620,   278,
-     279,   280,   283,   331,   291,   284,     0,     0,     0,  1146,
-       0,  1195,  1153,  1208,  1133,  1182,     0,     0,   775,     0,
-       0,     0,     0,  1209,  1134,  1183,     0,     0,     0,     0,
-    1423,     0,     0,     0,     0,     0,  1322,     0,   330,   765,
-     764,   331,   351,  1170,     0,   840,   846,   847,   844,   389,
-     131,     0,   366,     0,   396,     0,   394,   393,   395,     0,
-     382,     0,     0,     0,     0,     0,     0,     0,  1099,  1099,
-       0,   707,     0,     0,   431,   507,   475,     0,   437,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   659,   171,     0,   415,   619,   692,     0,     0,     0,
-     762,     0,   514,   417,     0,  1384,   416,     0,     0,   505,
-     503,     0,   500,     0,   504,     0,  1273,     0,     0,     0,
-       0,  1064,     0,  1070,     0,  1026,  1003,  1065,     0,  1615,
-       0,     0,     0,     0,   559,  1100,   793,   795,   657,   952,
-       0,   959,   329,   877,   878,   879,   880,  1914,  1789,     0,
-       0,     0,     0,  1852,     0,  1853,  1880,  1879,  1859,  1863,
-       0,  1860,  1861,  1758,  1762,  1760,  1743,  1884,     0,  1498,
-    1911,  1608,     0,  1611,  1567,     0,     0,  1569,     0,     0,
-    1571,  1573,     0,     0,     0,     0,     0,     0,  2023,     0,
-    2114,  2351,  2263,     0,  1526,  1528,  1531,  1533,  1532,  1534,
-    1530,  1539,     0,  1463,     0,  1462,  1935,  1617,     0,     0,
-     987,     0,     0,  1434,  1433,   953,     0,   329,   993,   507,
-     477,  2218,   478,   992,     0,   994,   999,   999,     0,   507,
-     707,   581,     0,     0,   263,   618,     0,   333,   345,     0,
-    1423,     0,     0,     0,   782,   770,     0,     0,   789,  1136,
-     663,     0,     0,   259,  1156,  1152,  1324,  1325,     0,     0,
-       0,     0,     0,   329,   849,   368,     0,   392,   401,     0,
-     399,   372,   377,     0,   381,   379,   378,   373,   376,  1099,
-       0,  1096,  1095,   705,     0,   466,   438,     0,   486,     0,
-       0,   720,     0,     0,   495,   455,   454,   451,   450,   452,
-     453,   448,   447,     0,   619,   779,   340,  1280,     0,   632,
-     694,   695,   690,     0,     0,     0,   510,   499,   495,   421,
-     430,   404,   505,   501,   502,     0,     0,     0,   514,  1326,
-     986,     0,  1069,     0,     0,     0,     0,     0,     0,  1103,
-     554,     0,     0,   558,   549,   619,   920,  1790,     0,  1791,
-       0,     0,     0,  1865,  1864,     0,  1901,  1613,     0,     0,
-    1607,     0,  1576,  1592,     0,  1572,  1570,     0,  1581,     0,
-    1583,  1810,     0,     0,     0,  1535,     0,  1886,  1888,     0,
-    1812,  1404,  1615,     0,  1401,     0,   970,     0,   971,   996,
-     481,     0,   995,  1002,  1002,   468,   707,   459,  1158,     0,
-     621,     0,   286,     0,   271,  1154,     0,   773,     0,   784,
-     782,     0,     0,     0,     0,  1318,     0,  1319,  1320,  1323,
-     353,   356,   387,   397,     0,   380,  1094,  1098,  1097,     0,
-       0,   439,   472,   473,   474,     0,   441,   482,   483,     0,
-     717,     0,   722,     0,     0,   494,   644,     0,     0,     0,
-    1274,     0,     0,     0,  1280,   503,   499,   428,   402,     0,
-    1277,     0,   516,     0,   340,  1068,  1071,  1066,  1237,     0,
-       0,   557,   556,   648,  1792,  1868,  1854,  1881,  1866,  1897,
-       0,     0,     0,  1606,  1609,     0,  1574,     0,     0,  1582,
-       0,     0,     0,  1529,     0,     0,  1403,   988,     0,     0,
-     999,     0,   707,     0,   990,   989,   475,   461,  1423,   332,
-       0,     0,     0,   780,   783,   771,   784,   791,   790,   665,
-    1423,     0,   400,     0,   465,     0,     0,     0,   484,     0,
-     485,   506,     0,   721,     0,     0,   778,     0,     0,   415,
-     696,     0,  1275,   505,   503,  1278,  1279,     0,   505,  1004,
-    1236,  1235,  1476,     0,     0,  2338,  2115,  2310,     0,  1899,
-    1902,  1900,  1894,     0,  1591,  1604,  1537,     0,  1536,  1889,
-    1890,  1615,   329,  1002,     0,   463,   479,   486,   264,  1423,
-       0,     0,   772,   260,  1321,   697,   491,     0,   490,     0,
-     488,   487,   718,   723,   619,   768,  1280,   700,   405,   505,
-       0,  1615,  1219,  1476,  1218,  1220,  1228,  1225,  1227,  1226,
-    1224,  1106,  1107,     0,  1906,  1905,  1904,  1908,  1907,  1610,
-       0,  1602,  1538,  1400,   972,   991,     0,   707,   272,   774,
-     781,     0,   489,   493,   492,   645,  1276,   702,     0,   698,
-     701,   703,   704,   403,   340,   977,     0,  1229,  1223,  1461,
-    1448,     0,     0,     0,     0,   480,   464,     0,   678,     0,
-     505,  1221,  1476,     0,     0,  1903,     0,     0,   699,  1615,
-    1222,     0,     0,  1603,     0,   978,     0,     0,   700,     0,
-       0,     0,  1104,  1105,   679
+    2481,  2482,  2483,  2484,  2485,  2486,  2487,  1997,  1996,  2028,
+    2068,  2069,  2070,  2071,  2001,     0,     0,   330,  1337,     0,
+    1334,  2010,     0,  1475,     0,  2023,     0,  1346,  1470,  1469,
+    1501,  1502,  1001,  1468,  1526,  1527,  1522,     0,     0,     0,
+    1552,  1550,  1518,  1512,  1517,  1515,     0,  1519,  1709,  1545,
+    1457,  1506,  1507,  1510,  1456,     0,  1548,     0,  1428,  1546,
+    1511,  1412,     0,  1394,     0,  1602,     0,  1023,  1025,     0,
+    1024,     0,  1027,     0,  1036,     0,     0,  1022,  1041,     0,
+    1030,  1028,     0,     0,     0,     0,     0,     0,   827,     0,
+       0,     0,     0,  1293,     0,     0,  2300,   238,  1296,  1301,
+    1288,  1299,     0,     0,     0,     0,     0,   967,   966,     0,
+       0,   988,     0,     0,     0,  1313,   458,     0,   327,     0,
+       0,     0,     0,     0,     0,     0,     0,   730,   727,     0,
+       0,   726,     0,   578,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   615,     0,  1174,     0,   648,     0,  1057,
+       0,  1056,     0,     0,     0,  1058,  1053,  1054,  2269,  2278,
+    2305,   240,  1077,     0,  1076,  1074,  1011,     0,  1012,     0,
+       0,     0,     0,     0,  2145,   276,   289,     0,  1173,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   312,     0,     0,   315,   314,     0,     0,
+       0,     0,     0,   319,   298,     0,   299,     0,     0,   318,
+       0,     0,   545,   546,     0,     0,     0,  1174,     0,   270,
+       0,     0,     0,     0,     0,     0,  1090,     0,   672,     0,
+       0,   156,     0,   152,   155,     0,     0,     0,     0,   530,
+     542,     0,   534,   535,   532,   536,   537,     0,     0,     0,
+       0,     0,     0,   529,     0,     0,   638,   637,   643,     0,
+       0,     0,     0,     0,     0,     0,     0,  1124,  1123,     0,
+       0,     0,     0,     0,     0,   769,     0,     0,     0,     0,
+       0,     0,     0,   159,   657,     0,   656,     0,   157,   158,
+       0,     0,     0,     0,     0,     0,     0,   214,  1265,  1271,
+    1332,  2029,  1331,     0,     0,     0,     0,   868,     0,     0,
+       0,     0,     0,     0,     0,     0,   870,   871,   872,   873,
+       0,     0,     0,     0,     0,     0,     0,   364,   365,   131,
+     363,  2060,     0,   758,   733,     0,     0,   746,     0,   748,
+     751,     0,  1284,   431,     0,     0,   571,   615,     0,   416,
+     164,     0,     0,     0,     0,   674,   128,   175,   177,   414,
+       0,   176,   178,   180,   181,   182,   179,   183,   635,   639,
+       0,   567,     0,     0,     0,     0,     0,   684,   688,   687,
+     691,   689,     0,   685,     0,     0,  1622,     0,   151,     0,
+       0,   522,   526,     0,     0,     0,   416,   500,   341,  2167,
+       0,   469,     0,  2167,     0,   985,     0,     0,     0,     0,
+       0,     0,     0,     0,  1443,     0,  1081,     0,  1306,     0,
+       0,     0,   330,  1679,  1678,  1631,  1627,     0,     0,     0,
+       0,   830,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1647,  2167,   330,     0,  1079,   169,  2056,     0,
+     806,     0,     0,     0,     0,     0,  1083,   798,     0,   330,
+     161,     0,   330,   330,   570,     0,     0,   330,   330,   163,
+       0,     0,     0,   562,   330,   824,  1387,     0,  2167,   469,
+    1360,  1371,   906,   915,   914,   912,   911,   907,     0,   926,
+       0,   468,     0,     0,     0,   940,   941,     0,     0,   939,
+     956,   942,     0,   944,   936,   935,   945,   946,     0,     0,
+     965,   652,     0,     0,     0,     0,  1422,     0,  1420,     0,
+    1600,  1424,  1413,  1379,     0,  1378,  1382,  1384,  1383,  1381,
+       0,   515,     0,     0,  1121,     0,     0,   923,     0,     0,
+     330,  1257,     0,   885,   886,     0,     0,     0,     0,     0,
+       0,   892,   889,   890,   891,   893,     0,   894,     0,     0,
+       0,  2003,  1955,     0,  1956,     0,     0,  1991,  1987,     0,
+       0,     0,     0,     0,  1960,  1963,  1964,  1965,  1962,  1966,
+    1961,     0,     0,  1967,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2369,     0,     0,     0,     0,  1772,     0,
+       0,  1915,     0,  1944,  1977,     0,     0,     0,     0,     0,
+       0,  1944,  1983,     0,     0,     0,     0,  1874,     0,  1871,
+       0,     0,     0,     0,  2002,     0,     0,  2041,  1710,  1724,
+    1725,  1726,  1730,  2015,     0,  2004,     0,     0,  1711,  1738,
+       0,  1984,  1765,     0,  1770,  1753,     0,  1746,     0,  1751,
+    1755,  1734,     0,  1731,     0,  2005,  1943,     0,  1941,     0,
+    1721,  1722,  1723,  1715,  1716,  1717,  1718,  1719,  1720,  1727,
+    1919,  1917,  1918,     0,     0,     0,  1895,     0,     0,  1750,
+    2160,  2194,     0,  1491,  1491,  1491,  1479,  1489,  2014,     0,
+    1617,     0,     0,     0,     0,  1811,     0,  1948,  1500,  1946,
+    1028,  1617,  2020,     0,     0,  1706,     0,  1598,  1998,     0,
+     832,   833,   831,  1356,  1340,  1336,  1335,  2009,  1355,     0,
+    1478,     0,   999,  1000,     0,  1004,     0,     0,  1520,  1553,
+       0,  1544,     0,  1524,  1525,  1516,  1554,  1426,     0,  1549,
+    1461,  1460,     0,  1620,     0,     0,  1404,  1396,     0,  1603,
+       0,  1559,  1430,  1432,  1433,     0,  2002,  1026,     0,  1649,
+    1037,     0,  1021,     0,  1020,  1649,     0,  1038,     0,  1649,
+       0,     0,     0,  1202,  1126,  1178,   828,  1203,  1127,  1179,
+    1204,  1128,  1303,  1291,  1290,  1289,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     709,  2167,   330,  1311,  1205,     0,  1129,   326,  1312,  1180,
+    1316,   729,   728,     0,     0,  1181,     0,   579,     0,     0,
+     584,   585,   586,     0,     0,     0,   587,     0,  2099,  2152,
+       0,   592,   599,   604,   594,     0,     0,   606,   600,     0,
+       0,     0,     0,     0,     0,   612,   619,     0,     0,     0,
+       0,     0,     0,  1051,  1052,  1206,  1132,     0,  1182,  1010,
+       0,  1133,   165,     0,     0,   263,   277,   621,   709,  1176,
+     296,     0,   311,   306,   307,   305,  2167,   330,  2167,   330,
+       0,     0,     0,     0,     0,   308,   303,   304,   300,     0,
+       0,   313,  2076,  2137,  2279,     0,   625,   627,     0,   632,
+     316,  1149,   337,   336,   335,     0,   320,     0,   342,   345,
+     317,   294,   297,   295,   291,   275,     0,     0,     0,     0,
+       0,     0,     0,  2027,     0,     0,  1085,     0,     0,     0,
+       0,     0,     0,   666,   154,  1164,   144,     0,     0,   140,
+       0,     0,     0,     0,   134,     0,  1212,  1139,     0,     0,
+     267,   525,   533,   538,  1143,   541,  1192,   539,  1218,  1140,
+       0,  1174,     0,   259,     0,  1141,     0,  1186,  1214,  1166,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1319,
+       0,     0,     0,     0,     0,   330,     0,     0,     0,  1176,
+    2167,   330,  1213,     0,  1171,  1200,     0,   350,     0,  1165,
+       0,     0,   269,  1145,  1194,     0,     0,   212,   211,   213,
+       0,     0,  2135,     0,   875,   837,   874,     0,     0,     0,
+       0,     0,     0,   845,     0,     0,     0,   836,     0,   835,
+     386,   359,   360,   362,   369,     0,   757,     0,     0,     0,
+     747,     0,     0,     0,  1309,     0,   131,     0,     0,     0,
+     573,   614,   621,     0,     0,     0,   415,   419,   423,   424,
+     425,     0,     0,     0,     0,   145,   132,     0,   787,     0,
+     469,     0,   670,     0,   177,   170,     0,     0,     0,   341,
+     744,   742,   741,   743,     0,     0,     0,   762,   740,     0,
+    1621,  1623,     0,     0,     0,     0,     0,   515,   418,     0,
+     472,     0,     0,   504,     0,     0,     0,     0,   341,     0,
+       0,     0,  1015,     0,  1033,  1016,     0,     0,     0,     0,
+    1063,  1070,  1064,  1043,     0,     0,   550,  1448,  1449,     0,
+     330,     0,     0,  1648,  1661,   805,     0,  1691,  1690,  1692,
+    1692,     0,  1632,     0,  1683,  1684,  1700,  1701,  1702,  1703,
+    1704,  1705,     0,  1699,  1641,     0,   616,   330,   330,     0,
+     330,     0,   330,   330,     0,   663,     0,  1240,   642,     0,
+       0,   717,   803,     0,     0,   330,   800,  1945,     0,   927,
+     471,     0,     0,     0,     0,   938,     0,   548,   943,     0,
+     955,   950,   952,     0,   959,   651,     0,     0,  1423,  1416,
+    1418,  1417,     0,     0,  1414,  1952,   799,     0,   521,  1113,
+    1114,     0,     0,   330,     0,   960,     0,     0,   887,   888,
+       0,     0,   895,     0,     0,     0,  1496,  1953,  1954,     0,
+       0,     0,  1988,     0,     0,  1849,     0,  1825,  1827,  1839,
+       0,  1850,  1810,  1851,  1829,  1831,     0,  1935,     0,     0,
+    1840,     0,  1774,  1775,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1790,  1789,  1841,  1914,     0,     0,  1975,  1976,  1842,
+       0,     0,  1982,     0,     0,     0,  1847,  1852,     0,     0,
+       0,     0,  1858,     0,  1879,     0,     0,     0,  1800,  1945,
+       0,     0,     0,     0,     0,     0,     0,     0,  1771,  1754,
+    1748,     0,  1752,  1756,     0,     0,     0,  1742,     0,     0,
+    1740,  1766,  1736,     0,     0,  1767,     0,     0,     0,  1818,
+       0,     0,  1491,  1491,  1491,  1491,  1488,     0,     0,     0,
+       0,  2266,     0,  1581,  1558,  1560,  1568,  1581,  1586,  1820,
+    1615,  1821,     0,  2021,     0,  1529,  1500,  1500,  1500,  1817,
+       0,     0,     0,     0,  1499,  1529,   188,     0,   221,   208,
+       0,  1338,  2024,     0,  1503,     0,  1936,  1004,     0,  1505,
+       0,     0,  1551,  1513,  1427,  1411,     0,  1409,  1398,     0,
+    1399,  2002,     0,  1409,  1395,  1438,     0,     0,  1620,     0,
+    1437,     0,  1649,  1018,  1019,     0,  1042,     0,  1201,  1125,
+    1177,   970,   971,     0,   969,     0,     0,     0,   457,   987,
+       0,     0,     0,   709,     0,     0,   461,     0,  1314,     0,
+    1219,  1163,   581,   582,     0,   593,     0,   602,   601,     0,
+       0,   589,     0,     0,     0,     0,     0,   588,   608,   554,
+     609,   611,     0,     0,   610,   613,   618,  1174,     0,   649,
+    1151,     0,  1198,  1045,     0,  1013,     0,     0,     0,     0,
+     431,   290,     0,     0,     0,   278,   288,     0,   322,     0,
+     293,     0,   286,   309,   301,   310,   302,   321,   323,     0,
+     629,   630,   628,   624,     0,   631,   633,     0,   339,     0,
+       0,     0,  1208,     0,  1174,     0,   271,  1147,     0,  1196,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1209,  1183,     0,     0,   671,     0,   668,     0,     0,
+     137,   136,     0,   143,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     351,   332,     0,   765,     0,     0,     0,   353,     0,     0,
+       0,     0,  1207,  1134,   838,     0,     0,     0,   839,   850,
+       0,     0,   840,     0,     0,     0,     0,   852,     0,     0,
+     358,   366,  2220,  1922,  1923,   755,   760,   752,   754,   756,
+     753,     0,   759,   709,     0,   749,   750,     0,     0,     0,
+       0,     0,   443,     0,     0,   437,     0,     0,  1070,   430,
+     433,   434,     0,     0,   574,   577,   575,   576,   607,     0,
+     450,   496,     0,   147,     0,     0,   148,   146,     0,     0,
+     341,   675,   679,   677,   676,   678,   673,     0,   666,     0,
+     173,   414,     0,     0,   566,   690,   693,   686,     0,   761,
+     763,   738,     0,   621,     0,   527,     0,   469,  1388,   510,
+       0,   500,   496,   498,   497,   499,     0,   506,   340,     0,
+       0,   515,   506,     0,     0,   988,  1014,     0,     0,     0,
+    1060,  1065,  1061,     0,     0,  1029,     0,  1062,     0,  1044,
+    1007,  1235,  1236,  1233,  1234,     0,     0,     0,  1440,  1082,
+       0,  1667,     0,  1687,  1685,  1628,  1633,  1673,  1708,   330,
+    1080,   807,     0,   794,     0,   796,  1084,   330,   330,   330,
+     330,   658,     0,   563,     0,     0,     0,     0,   937,   957,
+       0,   953,     0,     0,   920,   962,     0,     0,  1421,  1419,
+     513,     0,   965,     0,   921,   964,     0,     0,     0,     0,
+       0,     0,     0,  1957,     0,  1990,  1986,     0,  1822,  1958,
+       0,  1970,  1969,  1915,     0,     0,  1773,  1785,  1786,  1787,
+    1971,     0,  1795,     0,     0,  1782,  1783,  1784,  1776,  1777,
+    1778,  1779,  1780,  1781,  1788,  1980,  1979,  1973,  1974,     0,
+    1844,  1845,  1846,  1981,  1853,     0,  2090,  1880,  1857,  1873,
+    1872,     0,     0,     0,  1860,     0,     0,  1869,     0,  1916,
+    2042,  1712,     0,     0,  1739,  1985,  1757,     0,     0,     0,
+    1735,  1935,     0,     0,     0,     0,     0,  1744,     0,     0,
+       0,  1898,  1893,  1894,  1912,     0,     0,     0,     0,     0,
+       0,  1482,  1481,  1487,  1581,  1586,     0,  1463,     0,  1568,
+       0,  1580,  1566,  1579,     0,     0,  1592,  1590,     0,  1592,
+       0,  1592,     0,  1562,     0,  1582,  1564,  1579,     0,  1607,
+       0,  2022,  1616,     0,  1542,     0,     0,     0,     0,  1949,
+    1950,     0,  1947,  1812,  1542,     0,  1999,  1476,     0,  1504,
+    1002,  1003,  1521,  1514,  2117,  1618,     0,  1410,     0,     0,
+    1401,  1407,  1393,     0,     0,  1431,  1409,  1434,  1039,     0,
+       0,  1031,   976,   977,   975,   978,     0,     0,     0,   709,
+       0,     0,   477,     0,   995,   995,     0,     0,   463,   509,
+    1070,   712,     0,     0,     0,   710,   330,  1130,     0,   603,
+       0,     0,   598,   596,   595,   597,     0,   555,  1217,  1131,
+       0,     0,     0,     0,  1046,     0,     0,  1150,     0,   428,
+       0,   283,  1175,     0,     0,     0,   282,     0,   330,   330,
+     324,   626,   338,   343,   344,   347,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   788,   771,
+       0,     0,   789,   790,     0,     0,     0,  1087,  1088,  1086,
+       0,  1137,     0,     0,   662,   141,   138,   139,   142,  1161,
+    1144,  1193,     0,     0,     0,  1142,     0,  1187,  1157,  1153,
+       0,     0,     0,     0,     0,  1216,  1170,  1191,  1215,  1168,
+    1189,  1167,  1188,  1169,  1190,  1162,     0,  1625,   768,     0,
+       0,     0,   330,   330,   660,  1146,  1195,     0,     0,   841,
+       0,     0,   843,   844,     0,   847,   389,     0,   392,   399,
+     370,   375,  1318,     0,  1318,     0,   372,   376,  1318,   371,
+    1318,   368,   731,     0,     0,   708,     0,   435,     0,   441,
+     445,   446,   444,   436,  1070,   469,   508,     0,     0,   721,
+       0,   572,   416,   447,     0,     0,   420,   150,   149,     0,
+       0,     0,   669,   668,   177,  2167,     0,     0,   695,   699,
+     739,     0,  1624,   655,   341,   523,     0,     0,   416,   515,
+       0,   421,   426,   427,     0,   504,   500,     0,     0,   512,
+    1282,     0,   516,   518,     0,     0,     0,  1017,  1034,  1035,
+       0,     0,  1070,     0,     0,  1069,     0,     0,   557,   330,
+    1629,   617,   330,   330,   664,  1241,  1110,   718,     0,   949,
+     948,   947,   549,     0,   951,   653,     0,   514,   330,     0,
+       0,   897,   878,   896,     0,     0,   877,     0,   876,  1989,
+    1838,  1848,  1968,  1914,  1945,     0,     0,  1796,     0,     0,
+    1843,  2379,     0,     0,     0,     0,  1877,  1878,  1859,     0,
+    2211,  1864,     0,     0,     0,  1763,  1761,  1758,     0,  1759,
+    1743,     0,     0,  1741,  1737,     0,  1768,  1884,     0,  1900,
+    1897,  1911,  1945,  1486,  1485,  1484,  1483,  1567,  1565,     0,
+    1570,  1577,     0,  1561,     0,  1591,  1587,     0,  1588,     0,
+       0,  1589,     0,     0,  1563,     0,  1577,     0,  1614,  1500,
+       0,     0,  1889,  1815,  1816,  1813,  1500,  2039,  1889,   222,
+       0,     0,  1408,  1397,  1400,     0,     0,     0,     0,  1439,
+    1429,  1032,  1040,     0,     0,     0,   459,     0,  1070,     0,
+       0,     0,   998,   998,     0,  1070,   508,   714,   713,   716,
+     711,   715,  1315,     0,   590,   591,   605,  1152,     0,  1199,
+    1159,     0,  1425,     0,   622,   279,   280,   281,   284,   332,
+     292,   285,     0,     0,     0,  1148,     0,  1197,  1155,  1210,
+    1135,  1184,     0,     0,   777,     0,     0,     0,     0,  1211,
+    1136,  1185,     0,     0,     0,     0,  1425,     0,     0,     0,
+       0,     0,  1324,     0,   331,   767,   766,   332,   352,  1172,
+       0,   842,   848,   849,   846,   390,   131,     0,   367,     0,
+     397,     0,   395,   394,   396,     0,   383,     0,     0,     0,
+       0,     0,     0,     0,  1101,  1101,     0,   709,     0,     0,
+     432,   508,   476,     0,   438,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   661,   172,     0,
+     416,   621,   694,     0,     0,     0,   764,     0,   515,   418,
+       0,  1386,   417,     0,     0,   506,   504,     0,   501,     0,
+     505,     0,  1275,     0,     0,     0,     0,  1066,     0,  1072,
+       0,  1028,  1005,  1067,     0,  1617,     0,     0,     0,     0,
+     561,  1102,   795,   797,   659,   954,     0,   961,   330,   879,
+     880,   881,   882,  1916,  1791,     0,     0,     0,     0,  1854,
+       0,  1855,  1882,  1881,  1861,  1865,     0,  1862,  1863,  1760,
+    1764,  1762,  1745,  1886,     0,  1500,  1913,  1610,     0,  1613,
+    1569,     0,     0,  1571,     0,     0,  1573,  1575,     0,     0,
+       0,     0,     0,     0,  2025,     0,  2116,  2353,  2265,     0,
+    1528,  1530,  1533,  1535,  1534,  1536,  1532,  1541,     0,  1465,
+       0,  1464,  1937,  1619,     0,     0,   989,     0,     0,  1436,
+    1435,   955,     0,   330,   995,   508,   478,  2220,   479,   994,
+       0,   996,  1001,  1001,     0,   508,   709,   583,     0,     0,
+     264,   620,     0,   334,   346,     0,  1425,     0,     0,     0,
+     784,   772,     0,     0,   791,  1138,   665,     0,     0,   260,
+    1158,  1154,  1326,  1327,     0,     0,     0,     0,     0,   330,
+     851,   369,     0,   393,   402,     0,   400,   373,   378,     0,
+     382,   380,   379,   374,   377,  1101,     0,  1098,  1097,   707,
+       0,   467,   439,     0,   487,     0,     0,   722,     0,     0,
+     496,   456,   455,   452,   451,   453,   454,   449,   448,     0,
+     621,   781,   341,  1282,     0,   634,   696,   697,   692,     0,
+       0,     0,   511,   500,   496,   422,   431,   405,   506,   502,
+     503,     0,     0,     0,   515,  1328,   988,     0,  1071,     0,
+       0,     0,     0,     0,     0,  1105,   556,     0,     0,   560,
+     551,   621,   922,  1792,     0,  1793,     0,     0,     0,  1867,
+    1866,     0,  1903,  1615,     0,     0,  1609,     0,  1578,  1594,
+       0,  1574,  1572,     0,  1583,     0,  1585,  1812,     0,     0,
+       0,  1537,     0,  1888,  1890,     0,  1814,  1406,  1617,     0,
+    1403,     0,   972,     0,   973,   998,   482,     0,   997,  1004,
+    1004,   469,   709,   460,  1160,     0,   623,     0,   287,     0,
+     272,  1156,     0,   775,     0,   786,   784,     0,     0,     0,
+       0,  1320,     0,  1321,  1322,  1325,   354,   357,   388,   398,
+       0,   381,  1096,  1100,  1099,     0,     0,   440,   473,   474,
+     475,     0,   442,   483,   484,     0,   719,     0,   724,     0,
+       0,   495,   646,     0,     0,     0,  1276,     0,     0,     0,
+    1282,   504,   500,   429,   403,     0,  1279,     0,   517,     0,
+     341,  1070,  1073,  1068,  1239,     0,     0,   559,   558,   650,
+    1794,  1870,  1856,  1883,  1868,  1899,     0,     0,     0,  1608,
+    1611,     0,  1576,     0,     0,  1584,     0,     0,     0,  1531,
+       0,     0,  1405,   990,     0,     0,  1001,     0,   709,     0,
+     992,   991,   476,   462,  1425,   333,     0,     0,     0,   782,
+     785,   773,   786,   793,   792,   667,  1425,     0,   401,     0,
+     466,     0,     0,     0,   485,     0,   486,   507,     0,   723,
+       0,     0,   780,     0,     0,   416,   698,     0,  1277,   506,
+     504,  1280,  1281,     0,   506,  1006,  1238,  1237,  1478,     0,
+       0,  2340,  2117,  2312,     0,  1901,  1904,  1902,  1896,     0,
+    1593,  1606,  1539,     0,  1538,  1891,  1892,  1617,   330,  1004,
+       0,   464,   480,   487,   265,  1425,     0,     0,   774,   261,
+    1323,   699,   492,     0,   491,     0,   489,   488,   720,   725,
+     621,   770,  1282,   702,   406,   506,     0,  1617,  1221,  1478,
+    1220,  1222,  1230,  1227,  1229,  1228,  1226,  1108,  1109,     0,
+    1908,  1907,  1906,  1910,  1909,  1612,     0,  1604,  1540,  1402,
+     974,   993,     0,   709,   273,   776,   783,     0,   490,   494,
+     493,   647,  1278,   704,     0,   700,   703,   705,   706,   404,
+     341,   979,     0,  1231,  1225,  1463,  1450,     0,     0,     0,
+       0,   481,   465,     0,   680,     0,   506,  1223,  1478,     0,
+       0,  1905,     0,     0,   701,  1617,  1224,     0,     0,  1605,
+       0,   980,     0,     0,   702,     0,     0,     0,  1106,  1107,
+     681
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-   -4210, -4210, -4210,  3277, -4210,  -837,   441,  2558,  -879, -4210,
-   -4210, -4210,  3171, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-    3212, -4210, -4210,  1744, -2195, -4210, -4210,   145,  3165, -1185,
-     130,  2795,  1397, -4210, -1047, -4210, -4210,  -549,   108, -4210,
-    3170,  -670, -4210, -4210, -4210, -4210, -4210, -4210, -4210, -4210,
-    -744,  1899,  1239,  -541, -3869, -4210, -4210, -1307, -2925, -4210,
-     611, -4210, -4210,  1827, -4210, -4210, -4210,  1079,   525,  -464,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210,  -251, -4210, -4210,
-    -620,   163,    47, -2219,  -298, -4210, -4210,   490,  -300, -1191,
-   -4210, -3257, -4210,    36, -4210, -4210, -4210,  -275, -1289,  1339,
-   -4210,  -639, -1059,  1643,  -687, -4210,  -153, -4210,  -756,  -616,
-    -614,  -701, -3442, -3450, -3877, -3476, -3099,  1345,   165, -2832,
-   -2897,   167,   463, -4210,   168,   169, -4210,   479,  -730, -1310,
-   -4210,  -774, -4210, -4210, -4210, -2685, -4210, -4210, -4210, -4210,
-      69, -4210, -4210, -4210, -4210,   521, -4210, -4210, -4210, -4210,
-   -4210, -4210, -1942,  1799,  1803, -4210, -4210, -2877, -4210,  -810,
-   -4210,   653, -2718,  1256, -4210, -4210, -4210,  2541, -4210, -4210,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -1436, -4210, -4210,
-   -4210, -4210, -4210,   504,    41, -4210, -4210, -4210, -4210,   173,
-   -4210,  1812,  1072, -4210, -4210, -4210,  -742,  -831,  -808, -4210,
-   -2716, -4210, -4210, -4210, -4210,  -231, -4210, -4210, -4210, -4210,
-   -4210, -4210,  -868, -4210,  1129, -2841, -4210, -4210,  1138, -4210,
-   -4210, -4210, -4210, -4210,  -675,  -155,  2609, -4210,  -545,  -647,
-   -4210, -4210, -4210,  -151, -4210, -4210, -4210, -4210, -4210, -4210,
-    -984,    46,  -958,  -469, -4210, -4210, -4210, -4210, -2057, -4210,
-   -4210, -4210, -3168, -4210,  4080,  1192,  -116,   174, -4210,   -12,
-      82,  3035, -1040, -2401,   445,  -342, -4210, -1646, -4210, -4210,
-   -4210, -2302, -4210, -4210, -4210, -4210, -3196,   175, -4210,  3012,
-   -4210, -3462, -4138, -3202, -3666, -4014, -3921, -3179, -4210, -4210,
-   -1010, -4210, -4210, -4210, -1300,  2126, -1723, -4210, -1922,   505,
-    1430,  -850, -2490, -3458,  -618, -2944, -4210, -4210, -3396,  -455,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -1008,  -552, -4210,
-   -4210,  3529, -4210, -3494, -4210,  3500, -4210, -4210, -4210, -4210,
-    2411,  2416, -4210,  2420, -4210, -4210, -1298,  1214, -4210, -4210,
-   -4210, -4210, -4210,  -661,  -764, -4210, -4210, -4210,   176, -4210,
-   -4210, -4210, -4210,  1896,  -820,  -649,  3420,   177, -4209, -4210,
-   -4210,  -937, -4210,  2813, -4210, -4210, -4210, -4210, -4210, -4210,
-   -4210, -4210, -1977, -4210, -4210, -4042, -4210, -4210, -4210, -4210,
-   -4210,  2206,  2207,    64,   -18, -4210, -4210, -1157, -4210,  -484,
-   -4210,  2484, -4210, -4210, -4210, -4210,  1502,   178,   556, -4210,
-       3, -4210, -4210, -4210,   316, -4210, -4210, -3113,     5, -4210,
-   -4210, -4210, -4210, -3984, -4210,     6,  -588,   831, -4210, -4210,
-   -2536, -4210,   179,    24, -4210, -4210,     1,     2,   -43,   -28,
-     -24,     4,   139,  2896, -4210,  2947, -4210,    -5,  1713, -4210,
-   -4210,  -731,  -142, -4210,  1513,  -564,  2177,  2869,  2871, -4210,
-    1512, -4210, -4210,  1520, -4210,   875,  -559,  -442, -4210, -4210,
-   -4210, -4210,   358,  -562,  2202, -4210,  2899, -4210, -4210, -4210,
-   -1657,  1514, -3111,   917, -3106, -3066,   402,   390, -1308,  -238,
-       0,  -689,  2902, -4210, -4210,   922,  -411, -4210, -4210,  -409,
-   -2570,   867, -4210, -3985, -2085,  -402,  2611,  -951, -4210, -4210,
-    -920, 13361, -4210, -4210, -4210, 14000, 14230, -4210, -4210, 14616,
-   14784, -4210,  -775,  1124, 15405,  7657,  -932, -1610,  -172, 13306,
-   -2409,  -485, -2543, -4210, -3215, -2263, -4210, -4210, -4210,  -198,
-     979,   450, -4210, -4210, -4210, -4210,     8, -4210,  -536, -4210,
-    -533, -4210, -4210, -4210,  -516, -3577,  2399, -4210, -4210, -4210,
-    -193, -4210, 16253,  1558, -4210, -1006, -2482, -2486, -3080, -1623,
-   -4210, -4210, -4210, -4210, -4210, -4210, -4210, -1358, -3004,  -446,
-    1627, -4210, -4210,  1718, -4210, -4210, -4210, -1207,  -761, -2387,
-    1631, -1824, -4210,  -752, -4210,  -695,  2400,  -700,  1449, -1215,
-    6574,  -462, -2086, -1124, -1409, -4210,  -170, -4210,    -7,   -16,
-       9,  -123,  -109,  -524,  3553,  4218,  -583, -1212,  9556, 11573,
-   11980, -2831
+   -4439, -4439, -4439,  3334, -4439,  -834,   338,  2622, -1769, -4439,
+   -4439, -4439,  1072, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+    3287, -4439, -4439,  1794, -2207, -4439, -4439,   136,  3230, -1199,
+     111,  2854,  1459, -4439, -1046, -4439, -4439,  -553,   118, -4439,
+    3235,   431, -4439, -4439, -4439, -4439, -4439, -4439, -4439, -4439,
+    -670,  1955,  1293,  -583, -3862, -4439, -4439, -1284, -2856, -4439,
+     673, -4439, -4439,  1897, -4439, -4439, -4439,  1151,   597,  -395,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439,  -182, -4439, -4439,
+    -552,   154,    50, -2228,  -230, -4439, -4439,   558,  -232, -1215,
+   -4439, -3286, -4439,   104, -4439, -4439, -4439,  -207, -1282,  1402,
+   -4439,  -639, -1000,  1708,  -625, -4439,   -90, -4439,  -691,  -550,
+    -546,  -633, -3455, -3462, -3885, -3470, -3350,  1413,   156, -2841,
+   -2922,   158,   531, -4439,   160,   161, -4439,   549,  -741, -1339,
+   -4439,  -695, -4439, -4439, -4439, -2702, -4439, -4439, -4439, -4439,
+      58, -4439, -4439, -4439, -4439,   591, -4439, -4439, -4439, -4439,
+   -4439, -4439, -2465,  1869,  1870, -4439, -4439, -2883, -4439,  -817,
+   -4439,   732, -2736,  1339, -4439, -4439, -4439,  2627, -4439, -4439,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -1462, -4439, -4439,
+   -4439, -4439, -4439,   580,   122, -4439, -4439, -4439, -4439,   163,
+   -4439,  1893,  1152, -4439, -4439, -4439,  -664,  -753,  -733, -4439,
+   -2690, -4439, -4439, -4439, -4439,  -153, -4439, -4439, -4439, -4439,
+   -4439, -4439,  -882, -4439,  1203, -2848, -4439, -4439,  1212, -4439,
+   -4439, -4439, -4439, -4439,  -608,   -85,  2662, -4439,  -473,  -576,
+   -4439, -4439, -4439,   -80, -4439, -4439, -4439, -4439, -4439, -4439,
+    -980,  -146,  -961,  -487, -4439, -4439, -4439, -4439, -2133, -4439,
+   -4439, -4439, -3309, -4439,  4168,  1929,  1719,   167, -4439,   -28,
+      62,  3116, -1047, -2386,   529,  -257, -4439, -1634, -4439, -4439,
+   -4439, -2315, -4439, -4439, -4439, -4439, -3216,   169, -4439,  3124,
+   -4439, -3469, -4166, -3224, -3687, -4018, -3965, -3211, -4439, -4439,
+   -1011, -4439, -4439, -4439, -1303,  2209, -1777, -4439, -1919,   589,
+    1513,  -852, -2507, -3487,  -634, -2968, -4439, -4439, -3338,  -371,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439,  -983,  -534, -4439,
+   -4439,  3617, -4439, -4010, -4439,  3600, -4439, -4439, -4439, -4439,
+    2499,  2500, -4439,  2504, -4439, -4439, -1275,  1303, -4439, -4439,
+   -4439, -4439, -4439,  -572,  -680, -4439, -4439, -4439,   170, -4439,
+   -4439, -4439, -4439,  2031,  -821,  -652,  3495,   173, -4218, -4439,
+   -4439,  -492, -4439,  2905, -4439, -4439, -4439, -4439, -4439, -4439,
+   -4439, -4439, -1857, -4439, -4439, -4052, -4439, -4439, -4439, -4439,
+   -4439,  2291,  2293,    74,   -15, -4439, -4439, -1166, -4439,  -497,
+   -4439,  2580, -4439, -4439, -4439, -4439,  1584,   174,   639, -4439,
+       3, -4439, -4439, -4439,   399, -4439, -4439, -3133,     5, -4439,
+   -4439, -4439, -4439, -4043, -4439,     6,  -505,   913, -4439, -4439,
+   -2552, -4439,   175,    12, -4439, -4439,     1,     2,   -38,   -37,
+     -32,     4,   128,  2969, -4439,  3020, -4439,   -23,  1766, -4439,
+   -4439,  -749,  -147, -4439,  1595,  -577,  2267,  2965,  2963, -4439,
+    1586, -4439, -4439,  1610, -4439,   960,  -486,  -362, -4439, -4439,
+   -4439, -4439,   444,  -567,  2290, -4439,  2984, -4439, -4439, -4439,
+   -1675,  1600, -3117,  1001, -3106, -3090,   491,   484, -1270,  -142,
+      14,  -686,  3002, -4439, -4439,  1018,  -312, -4439, -4439,  -310,
+   -2551,   966, -4439, -3994, -2098,  1684,  2703,  -957, -4439, -4439,
+    -920, 13013, -4439, -4439, -4439, 14491, 14518, -4439, -4439, 14573,
+   15306, -4439,  -761,  1223, 15743, 12859,  -926, -1624,  -380, 11994,
+   -2233,  -938, -2412, -4439, -3219, -2326, -4439, -4439, -4439,   -95,
+    1079,   202, -4439, -4439, -4439, -4439,   108, -4439,  -433, -4439,
+    -430, -4439, -4439, -4439,  -415, -4438,  2506, -4439, -4439, -4439,
+    -193, -4439, 16220,  1661, -4439,  -844, -2487, -2490, -3038, -1626,
+   -4439, -4439, -4439, -4439, -4439, -4439, -4439, -1406, -3019,  -459,
+    1727, -4439, -4439,  1816, -4439, -4439, -4439, -1196,  -759, -2406,
+    1732, -1832, -4439,  -752, -4439,  -683,  2516,  -705,   121, -1238,
+    6749,  -432, -2081, -1147, -1420, -4439,   -96, -4439,    -7,   -16,
+      23,   -88,  -102,  -592,  3391, 12737,  -579, -1230,  8802, 10850,
+   12019, -2843
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,    51,    52,    53,    54,  1411,  2274,  2159,  2989,  2990,
-      55,    56,  1407,    57,    58,    59,    60,    61,    62,    63,
-    1342,    64,    65,   942,  1532,  2285,    66,  2015,   726,   727,
-     728,  1838,  1839,  2222,  1840,  1828,  1232,  1665,  1361,   700,
-     701,  1324,  1362,    68,    69,  1226,  1819,    70,    71,    72,
-    1389,  1390,  1336,  1573,  3971,  4642,  2830,  2137,  3029,  2831,
-    2832,    73,  1459,  1460,    74,    75,  2957,  1503,  2253,  3514,
-    3515,  4005,   548,  2250,  4290,  4291,  3991,  3992,  4297,  4509,
-    4510,  2286,  1527,  3023,  3595,  2980,  4054,  2981,  4055,  2982,
-    4056,  2968,  3543,  3544,  3545,  2983,  4027,  4541,  2984,  2034,
-    4671,  2321,  1687,  1685,  4528,  3855,  3856,  4742,  4676,  4677,
-    4678,  4830,  4029,  3027,  3601,  4063,  4318,  2724,   635,  1553,
-    3132,   636,  2324,   580,   637,  2287,    81,  2315,  2316,  1430,
-    2167,  3519,  3112,    82,   962,  3372,  4374,  4583,  4584,    83,
-     217,    84,  1536,    85,    86,  2270,  2974,    87,  2051,  2741,
-      88,    89,  2769,  2770,  2771,    90,    91,  3394,  4237,  1391,
-    2819,  2820,  2821,  2822,  3419,    92,  1534,  1435,  2294,    93,
-      94,    95,    96,    97,  2437,  2438,    98,  2210,    99,   100,
-     101,   102,   103,  3451,  3938,  3572,  2857,  2996,  3570,  2288,
-    1544,  2306,  2307,  4043,  4337,  4552,  4339,  4878,  4879,  4311,
-    3350,  3869,   105,   106,  4022,  4023,  4683,   107,  2049,   108,
-     109,   110,  1511,  2262,  2263,  3520,  1505,  2256,  2257,  3582,
-    3583,   111,  2912,   112,  3922,  3923,   581,  4688,  4649,  4755,
-     113,   114,  3926,  3927,   115,   116,   117,   118,   119,   629,
-    1052,  1053,  1309,  1000,   120,  1935,   121,   913,  2939,   122,
-    1120,  2483,  4106,   123,   660,  1066,  1067,  2289,   125,   669,
-    2461,   671,  1700,  3114,  3115,  3668,  2423,   813,   126,   127,
-    2434,  2464,   128,  1329,  2025,  2026,  3850,  2290,   582,  1559,
-    2328,  2719,  4449,  4450,  4216,  4466,  2649,  3303,   130,   583,
-    1366,  2095,  2331,  3037,  1992,  1993,  1994,  3618,  1995,  3039,
-    1996,  1303,  1997,  3045,  3046,  3047,  3614,  3621,  3624,  4363,
-    4364,   131,  1364,  2093,   132,   133,   134,  1402,   844,   135,
-     595,   596,   136,  4521,   137,   974,   138,  4372,   139,   140,
-     691,   692,  1104,  1105,   141,   142,  2108,  3401,   143,   144,
-     145,  4844,  4886,  4887,  4888,  3629,  4792,   146,  4846,  1097,
-     148,   149,   150,   186,   877,   878,   879,  2291,  4356,   152,
-     153,  1325,  1326,  1327,  1328,  2020,   154,   155,   156,   157,
-     158,   159,  1515,   160,   161,  4498,   162,   163,  1478,   164,
-    1261,  1262,   165,   166,   543,   744,  1265,  1273,   167,   639,
-    1060,  1061,  1062,  1667,   168,  1100,  2449,   640,  1055,   170,
-     641,  1980,  2670,  3313,  3314,  3317,  4201,  3831,   642,  2667,
-     173,  1707,  2443,  2446,  2663,   643,  2675,  2676,  2677,  2678,
-    2679,  3320,   644,   662,   965,  2337,   645,  1193,   178,   179,
-     180,   754,   748,   749,   182,  1812,  2610,   678,  1280,   713,
-     714,   762,  3288,  1948,  1949,  1971,  1972,  1289,  1290,  1961,
-    1963,  2651,  1964,  2659,  1954,  3808,  4434,  4435,  4436,  4437,
-    4438,  4439,  4186,  1967,  1968,  1292,  1293,  1294,  1976,   183,
-    2614,  3268,  3269,  3270,  3785,  3786,  3800,  3796,  4170,  4420,
-    3271,  1095,  1300,  4178,  4861,  3272,  4411,  4412,  4600,  3803,
-    3279,  3311,  3013,  3014,  3015,  1998,  1602,  1002,  1194,  1003,
-    1616,  1195,  1586,  1005,  1196,  1197,  1198,  1008,  1199,  1200,
-    1201,  1011,  1578,  1605,  1202,  1203,  1596,  1613,  1614,  1656,
-    2521,  1205,  1206,  1207,  3274,  1208,  3741,  4137,  4126,  2542,
-    2543,  1835,  3737,  3214,  1807,  2600,  4443,  4617,  4618,  3253,
-    3766,  4153,  4409,  4722,  4799,  4800,  1209,  1210,  1211,  2597,
-    1803,   846,  1212,  3522,  1805,  2536,  2622,  2623,  1710,  1730,
-    2489,  2505,  2506,  2516,  3173,  2524,  2529,  3201,  3202,  2537,
-    2566,  1213,  2491,  2492,  3157,  1732,  1214,  1255,  1256,  1727,
-    2561,  1268,  1269,   746,  1222,  1215,  1216,  1701,   737,  4416,
-     538,   803,  2846,  1926,   881,   675,  1217,  1218,  1219,  1220,
-    1395,   818,  1022,  1023,   539,   797,   820,  2823,   540,   541,
-     799,  1931
+      -1,    51,    52,    53,    54,  1413,  2280,  2163,  2995,  2996,
+      55,    56,  1409,    57,    58,    59,    60,    61,    62,    63,
+    1343,    64,    65,   943,  1534,  2291,    66,  2017,   726,   727,
+     728,  1840,  1841,  2228,  1842,  1830,  1233,  1667,  1362,   700,
+     701,  1325,  1363,    68,    69,  1227,  1821,    70,    71,    72,
+    1390,  1391,  1337,  1575,  3977,  4648,  2836,  2139,  3035,  2837,
+    2838,    73,  1461,  1462,    74,    75,  2963,  1505,  2259,  3520,
+    3521,  4011,   548,  2256,  4296,  4297,  3997,  3998,  4303,  4515,
+    4516,  2292,  1529,  3029,  3601,  2986,  4060,  2987,  4061,  2988,
+    4062,  2974,  3549,  3550,  3551,  2989,  4033,  4547,  2990,  2036,
+    4677,  2327,  1689,  1687,  4534,  3861,  3862,  4748,  4682,  4683,
+    4684,  4836,  4035,  3033,  3607,  4069,  4324,  2730,   635,  1555,
+    3138,   636,  2330,   580,   637,  2293,    81,  2321,  2322,  1432,
+    2171,  3525,  3118,    82,   963,  3378,  4380,  4589,  4590,    83,
+     217,    84,  1538,    85,    86,  2276,  2980,    87,  2053,  2747,
+      88,    89,  2775,  2776,  2777,    90,    91,  3400,  4243,  1392,
+    2825,  2826,  2827,  2828,  3425,    92,  1536,  1437,  2300,    93,
+      94,    95,    96,    97,  2443,  2444,    98,  2215,    99,   100,
+     101,   102,   103,  3457,  3944,  3578,  2863,  3002,  3576,  2294,
+    1546,  2312,  2313,  4049,  4343,  4558,  4345,  4884,  4885,  4317,
+    3356,  3875,   105,   106,  4028,  4029,  4689,   107,  2051,   108,
+     109,   110,  1513,  2268,  2269,  3526,  1507,  2262,  2263,  3588,
+    3589,   111,  2918,   112,  3928,  3929,   581,  4694,  4655,  4761,
+     113,   114,  3932,  3933,   115,   116,   117,   118,   119,   629,
+    1053,  1054,  1310,  1001,   120,  1937,   121,   914,  2945,   122,
+    1121,  2489,  4112,   123,   660,  1067,  1068,  2295,   125,   669,
+    2467,   671,  1702,  3120,  3121,  3674,  2429,   813,   126,   127,
+    2440,  2470,   128,  1330,  2027,  2028,  3856,  2296,   582,  1561,
+    2334,  2725,  4455,  4456,  4222,  4472,  2655,  3309,   130,   583,
+    1367,  2097,  2337,  3043,  1994,  1995,  1996,  3624,  1997,  3045,
+    1998,  1304,  1999,  3051,  3052,  3053,  3620,  3627,  3630,  4369,
+    4370,   131,  1365,  2095,   132,   133,   134,  1404,   844,   135,
+     595,   596,   136,  4527,   137,   975,   138,  4378,   139,   140,
+     691,   692,  1105,  1106,   141,   142,  2110,  3407,   143,   144,
+     145,  4850,  4892,  4893,  4894,  3635,  4798,   146,  4852,  1098,
+     148,   149,   150,   186,   878,   879,   880,  2297,  4362,   152,
+     153,  1326,  1327,  1328,  1329,  2022,   154,   155,   156,   157,
+     158,   159,  1517,   160,   161,  4504,   162,   163,  1480,   164,
+    1262,  1263,   165,   166,   543,   744,  1266,  1274,   167,   639,
+    1061,  1062,  1063,  1669,   168,  1101,  2455,   640,  1056,   170,
+     641,  1982,  2676,  3319,  3320,  3323,  4207,  3837,   642,  2673,
+     173,  1709,  2449,  2452,  2669,   643,  2681,  2682,  2683,  2684,
+    2685,  3326,   644,   662,   966,  2343,   645,  1194,   178,   179,
+     180,   754,   748,   749,   182,  1814,  2616,   678,  1281,   713,
+     714,   762,  3294,  1950,  1951,  1973,  1974,  1290,  1291,  1963,
+    1965,  2657,  1966,  2665,  1956,  3814,  4440,  4441,  4442,  4443,
+    4444,  4445,  4192,  1969,  1970,  1293,  1294,  1295,  1978,   183,
+    2620,  3274,  3275,  3276,  3791,  3792,  3806,  3802,  4176,  4426,
+    3277,  1096,  1301,  4184,  4867,  3278,  4417,  4418,  4606,  3809,
+    3285,  3317,  3019,  3020,  3021,  2000,  1604,  1003,  1195,  1004,
+    1618,  1196,  1588,  1006,  1197,  1198,  1199,  1009,  1200,  1201,
+    1202,  1012,  1580,  1607,  1203,  1204,  1598,  1615,  1616,  1658,
+    2527,  1206,  1207,  1208,  3280,  1209,  3747,  4143,  4132,  2548,
+    2549,  1837,  3743,  3220,  1809,  2606,  4449,  4623,  4624,  3259,
+    3772,  4159,  4415,  4728,  4805,  4806,  1210,  1211,  1212,  2603,
+    1805,   846,  1213,  3528,  1807,  2542,  2628,  2629,  1712,  1732,
+    2495,  2511,  2512,  2522,  3179,  2530,  2535,  3207,  3208,  2543,
+    2572,  1214,  2497,  2498,  3163,  1734,  1215,  1256,  1257,  1729,
+    2567,  1269,  1270,   746,  1223,  1216,  1217,  1703,   737,  4422,
+     538,   803,  2852,  1928,   882,   675,  1218,  1219,  1220,  1221,
+    1397,   818,  1023,  1024,   539,   797,   820,  2829,   540,   541,
+     799,  1933
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -2847,2063 +2849,2060 @@
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-     597,   176,   177,   171,   181,   172,   174,   753,   845,   676,
-    1619,   968,   937,   549,   663,  1664,  1227,   795,  1301,  1223,
-     663,  1629,   177,   705,   181,  1684,   814,  1086,  1087,  1088,
-     664,   537,  1464,  1092,  1295,  1304,   664,   763,   587,   739,
-    1623,  2033,  1927,   736,  1592,   966,  2424,  1434,  1657,  1932,
-    1257,  1063,   752,  1394,  2979,  3289,  1615,  1942,  1476,   579,
-    1029,  3137,  2848,  1582,  1583,  2096,  1598,  1506,  2224,  1525,
-    3273,  2686,  2688,  1591,  1241,  1720,  3395,  2114,  3578,  2131,
-    1546,   851,  2104,  3378,   638,  1513,   628,  2999,   819,  1518,
-    2620,  1034,   868,   922,  1522,   852,  1927,  1932,  3414,  3552,
-    3416,  3623,  1049,  1529,   670,  2488,   869,  3606,    67,  3176,
-    3177,  2311,  1428,  1548,  3196,  2909,  2641,   706,  1443,  2179,
-    1945,  1570,  3823,  3273,  3593,  3530,  1429,  1469,  3524,  3858,
-    4067,  3282,  3118,  3280,  3281,  3524,   968,  3893,  3319,  2193,
-    2194,   976,  3857,  2189,  3852,  4059,  4020,  4070,   757,  1057,
-    2329,  3226,  3227,   765,  4060,  3782,  1046,   766,  3753,  2625,
-    4076,  3222,  2551,    76,   699,    77,  3799,    78,    79,    80,
-    1234,   733,  2089,   104,   124,   129,   147,   151,   169,   175,
-    2103,  2947,  4349,   764,  2006,   725,  1768,  3590,   751,  2951,
-    2992,  2953,  3325,  4217,  4425,  1363,  4427,  3721,  1288,  1465,
-    1291,   646,  1001,  4467,  3836,  3797,  1579,  1580,  1603,   547,
-     862, -2152, -2058,  2394, -2187, -2208,  1933,  1590, -2236,  1545,
-   -2058, -2058,  4571,  1001,  1582,  1583,  1339,  4215,  2205,   593,
-   -1675,  3612,  4500,  4501,   800,   802,   593,  2439,   806, -2030,
-     808,  1598,  2200,  1591,  2559, -2059,  1571, -2085, -1680, -2391,
-    2308,  2115,  4474, -2059, -2059,  4648,   646, -2391, -2391,  2931,
-     866,  1509, -1647,   873, -1660,   685, -1687, -1918,   742,  2559,
-    2685,   593,   593,  1068, -1918,  2594,  1501,   588,  1116,  3846,
-     593,  1705,  2595,  1775, -2029,  3625,  4493, -1675,  1666,   593,
-    3084,   811,  3086,  3324,  3558,  1810, -1680,  3179,  2264,   593,
-    2955,  1571,  2039,   760,  4016, -1680,  4199, -1690,  3135,  1825,
-    1392,   593,  1781,  1392,  1083,   646,  2319,  2106,   646,  2035,
-    4224,   646,  3374,  4613,  3924,     3,     4,  2106,  2106,  3597,
-    1340,  2601,  2106,  1231,  3532,  -823,  2187,  3464,  4690,   951,
-    3533,  4535,  1783,  4624,   545,   686,  1492,  2036,  4370,  2027,
-    3275,  3534, -2155,  2277,  3073,   874,  2440,  3126,  1579,  1580,
-    1284,   646,  2283,  2722,  3626,   646,  2028,  2855,   711,   652,
-     952,   845,   652,   652,  4477,  2435,   652, -1690,  1072,  3535,
-     917,  3536, -2207,  2122,  1590,  2017,  1409,  1775,  4307,  4536,
-    1593,   653,  2106,  3424,   653,   653,   875,  4537,   653,  -131,
-     542,  2107,   953,  3275,  -131,   652,  3425,  1410,   673,  1594,
-    3179,  2309,  4503,  2750,  2123,  1826,  1781,  2723,  4308,   845,
-    3179,  1476,  2029, -1937,  3925,  4538,  1571,   653,   971,  1286,
-   -1937,  3127,  1769,   184,  2856,  1775,  1741,  2284,  1020,   931,
-    2030,  4609,  4017,  1934,   940,  3559,  1783,   876,   954,  3847,
-    1610,  1308,  1258,   932,  1259,   950,  2436,  3537,   932,  1600,
-    1815,  2602,  2278,   712,  1781,  1829,  1775,   968,  4220,   932,
-    1841,  1841,  2613,  4562,  2419,  1084,   185,  2232,  2425,   968,
-    2427,  3848,  2037,  2430,  2236,  4782,   687,  4765,  1483,  2106,
-    2106,   594,  4625,  3286,  1783,  1781,  4644,  1637,  4200,  4539,
-    3627,  1652,  3849,  1572,   990,  1647,  1630,  2735,  1498,  1571,
-     652,  1655,  2320,  1571,  3538,  2956,  4110,  1508,  4112,  3539,
-    2485,  3155,  2130,   688,   689,  1783,  1827,  2463,  3546,   914,
-     589,  2116,   653,  1069,  1071,  1073,   968,  2441,  1075,  1076,
-    1077,  -390,  2117,  2182,  2118,  4633,  4634,   767,  1082,   927,
-    1811,   812,  1401,  1510,  3375,  1706,  2442,  3540,  1572,   743,
-    2206,  3613,  1932,  4371,  2560,  3628,  1702,  2310,  2557,  2932,
-    1724,  3541,  2031,  2077,  1091,  2344,  2266,  1712,   967,   597,
-    1668,  2083,   590,  3908,  2251,  2252,  1706, -1918,  2175,  3242,
-    2177,   753,  1721,  3524,  2040,  2596,  1604, -2207,  1341,   920,
-    2119,  2075,  2201,   923,  1091,  1253,  1475,  4225,  1932,  1254,
-    4350,    50,   690,   912,  4761,  4740,  1017,   591,  2773,   592,
-    1064,   948,  4315,  1296,  2412,  2184,   768,  4876,  2188,  3465,
-    2227,  3862,  3343,  2843,  1510,   177,   752,   181,  2258,  4035,
-     663,  3066,   663,  2165,   663,  1599,  2168,  2169,  1577,  4840,
-     663,  1079,  1080,   968,  2146,  2223,  1065, -2058,  1070,  3542,
-    1074,   968,   968, -2207, -2152,  1098,  1078, -2187, -2208,  2398,
-    4540, -2236,  4142,  3799,  2032, -1675, -2207,  4167,  1094,  1056,
-    4366,  4171,  1253,  1572, -2030,  1081,  1254,  1823,   658,   659,
-   -2059,  1117,  4116, -1680, -2391,  2366,  1577,  1709,  1059,  1224,
-   -2085,  1260,  1233,   967,  1235,   845,  2420,  1581,  4066,  1585,
-    4047, -1687,  4161,  1480,  2233,  2431,  1771,  1813,  1802,  1593,
-    2484,  3273,  2487,  3273,  1487,  2628,   765,  4204,  2494, -2029,
-     766,  1977,  3194,  1978,  2508,  2509,  2510,  2157,  1594,  1094,
-    4803, -1680,  2160, -1937,  2526,  2528,  2092,   658,  1393,  2538,
-     658,  1393,  1595,   658,   659,  1313,   764,   176,   177,   171,
-     181,   172,   174,  3327,  4818,  3328,  1572,  4766,  3321,  1299,
-    1572,  3701,  3702,  3703,  3704,  2774,  4823,  3709,  3710,  3711,
-    3712,  3713,  3714,  3715,  3716,  3717,  3718,  2736,  1560,  1593,
-    3884,  3912,  4629,   658,   659,  1927,   593,   658,   659,  3547,
-    3816,  3273,  1966,  3574,  2490, -2155,  2650,  1263,  1594,   928,
-    1409,  4006,  1345,  2347,  2348,  4522,  4459,  1621,  4783,  4813,
-     663,  4289,  1597,  4469,  1485,  1654,  3590,   769,  3379,  2027,
-     593,  1410,  1314,  3757,  3758,  4868,  -131,  -131,  2579,  3844,
-    3189,  3190,  3191,  3192,  3193,  3194,  2844,  2836,   958,  3565,
-    3122,  2153,  3191,  3192,  3193,  3194,  2971,  3504,  3505,  2498,
-    2302,   593,  1230,   760,    67,  3919,  1238,  1799,  1800,  1801,
-    1802,  4672, -1647,  4561,  2748,  1339,  1018,  3498,  4351,  1399,
-    1400,  2416,  1315,  2700,  3502,  3503,  1270,   593,  3506,  2860,
-    4352,  2421,  2620,  2620,  2620,  3511,  1797,  1798,  1799,  1800,
-    1801,  1802,  2029,  2433,  2764,  4473,  2089,  4839,  1621,  4855,
-    2790,  1323,  3667,  2826,  1278,  1606,  2322,  2710,  2833,    76,
-    2030,    77,  1330,    78,    79,    80,   544,  1243,  3834,   104,
-     124,   129,   147,   151,   169,   175,  4383,  3566,  2764,  2303,
-    4384,  4385,  1621,  4386,  3124,  3532,  4082, -1647,  4413,  1669,
-    2151,  1448,  1671,  1414,  1673,  1453,  1675,  4051,  1677,  1500,
-    2499,  1454,  1681,  2827,   593,  3920,  2861,  2580,  2319,  4593,
-    4826,  2804,  2581,  2708,  4790,  1316,   677,  1323,  2765,  1340,
-    4051,  1523,  1524,  1607,  2860,  3858,  4673,  1415,   699,  1438,
-    3535,  1449,  4581,  2036,  2920,  2711,  2428,  2429,  3858,  2150,
-    1454,  3275,  1557,  3275,  2985,  1769,  2179,  1537,  2582,  1279,
-     959,  3857,  2765,  3896,  2152,  3396,  3567,  2862,  3322,  3292,
-    2041, -2027,  2972,  1621,  2016,  4666,  1331,  2805,  2500,  2340,
-    3038,  1563,  -612,  3379,   967,  1639,  2837,  3521,  1592,  4856,
-    2938,  2693,  1608,  4391,  3521,  1609,   967,  1538,  4353,  2828,
-    3123,  2417,  2031,  3809,  4674,   663,  2969,  4417,  4414,  1455,
-    3921,  2861,  4421,  2894,   960,  4423,   177,  3437,   181,  2895,
-     961,  2863,  1625,  1627,  3454,  1640,  2379,  1063,  2370,  2228,
-    1708,  3275,  2374,  2418,  1486,   685,  4698,  2501,  2380,  2381,
-    2502,  1670,  4684,  1672,  2244,  1674,  2371,  1676,  1455,  1678,
-    1679,  1680, -1647,   967,  2690,  2973,  1682,  4695,  4703,  2384,
-    1564,  2397,  2862,  2267,  2342,  4705,  4696,  1320,  2346,  1321,
-    3619,  4470,  2422,  4341,  2393,  4313,  4013,  2304,  3894,  1729,
-    3539,  4105,  3623,  2583,  2749,  1606,  2768,  4210,  1610,  2041,
-    2305,  4791,  1244,   758,  3125,  3858,  1450,  3390,  1738,   753,
-    4582,  1382,  3568,  4052,  2032,  3897,  4345,  4827,  2240,  4594,
-    2333,  2986,  1565,  2864,  4334,   686,  2863,  2896,  3540,  1473,
-    2768,  3438,  1332,  2341,  4238,  2404,  4779,  2392,  1770,  1754,
-     683,  1125,  3541,  2503,  3179,  1001,  4499,  1772, -2392, -2392,
-   -2392,  2238,   184,  3366,  1766,  2514,  3674,  2355,  2241,  3397,
-    2829,  1814,  1539,  1607,   759,  1456,  1333,  3109,  1245,  3070,
-     845,  1253,  3391,   661,  4565,  1254,  4526,  3569,  4853,   661,
-     967,  1112,  4566,  1831,  1832,  3398,  4667,  4828,   967,   967,
-    1641,  4492,   663,  3367,   873,   185,  1334,   663,   663,  1457,
-    1451,  2389,  1611,  3955,  1001,  3273,  4784,  1938,  2239,  3273,
-    3789,  4829,  1946,  1947,  1566,  1951,   766,   766,  2864,   766,
-    4627,  1612,  1608,  3898,  2522,  1609,  3899,  1346,  3071,  1458,
-    3542,   760,  2540,  2865,  2042,  2660,  1284, -1647,  1955,  4643,
-    2868,  2866,   764,   764,  2867,   764, -1647,  2504,  1581, -1647,
-    1308,  2691, -1647,  4496,  2692,  2084,  1540,  1299,  2987,  1335,
-    1347,  1952,  4203,  4697,  1567,  1541,   687,  4838,  2900,  4789,
-    4588,  4605,  4841,  2897,  4497,  1956,  4905,  3439,  1588,  1589,
-    3790,  2045,  4183,  3816,  1642,  1542,   874,  3212,  2903,  4190,
-    1474,  2046,  2643,  3219,  2868,  1406,  3675,  3056,   561,  4873,
-     663,  2988,  2901,   688,   689,  1286,   561,  2898,   663,  1621,
-    3791,  3440,  2211,  2242,  2043,  4320,  2789,  1348,  1610,  3081,
-    4630,  2130,  2764,  4883,  1610,  3792,  4668,   875,  2865,   652,
-    4636,  3087,  2902,  2552,  4102,  3793,  2866,  2899,  4567,  2867,
-     873,  3441,  2085,  4413,  1287,   684,  1080,  1568,  3368,  3082,
-    1349,   653,  1953,  2876,  2636,   761,   563,  1621,  3956,  2339,
-    3794,  2879,  4646,  2881,   563,  4478,  4651,  4652,  3858,  2646,
-     663,  2070,  1958,   663,   663,  3524,  2958,  2183,   876,  4418,
-    2874,  4737,  2282,  1284,  4909,  1350,  2295,  2125,  1285,  3004,
-    3005,  3006,  3007,  3185,  2875,   845,  2765,   968,  2211,  2668,
-    2186,  3012,  2887,   707,  3983,  4556,  2021,  2243,  2369,   561,
-    3986,  3987,  2661,  3989,  4744,  4745,  2022,  1351,  4549,  1382,
-    3020, -2049,  1611,  4321,  3663,  -153,  2766,  1959,  1240,  1431,
-    2926,  2170,   874,  2023,  2047,  1543,  3705,  3795,  3706,  4874,
-    3295,   663,  3369,  -413,  3389,  1352,  1510,  2254,  3462,  3054,
-    2647,  -153,  1286,  2777,  2195,  2196,  2197,  2198,  3338,  3841,
-    2767,  4046,  3521,  1432,  3278,  2904,    39,   563,  2048,  2754,
-    2657,  2658,  2372,   875,  3178,  1323,  -519,  2292,  1817,  1353,
-    1323,  1313,   814,    34,  3910,  3275,  3206,  1354,  2140,  3275,
-    3687,  1287,   184,   646,  1355,  2905,  2234,  2235,  4324,    43,
-    2211,  1356,   571,   710,   572,  2247,  3321,  2662,  1090,  1357,
-     571,  2705,   572,  3463,   845,  2261,   734,  4419,  3229,  2454,
-    4086,  1358,  4087,  2620,   876,  2179,     3,     4,  1526,  1359,
-    1409,  4120,  3858,  4121,  2786,   185,  1526,  3790,  2345,    47,
-    2778,  4325,  1818,  2297,  2298,  2299,  2300,  3466,  2353,  3911,
-    2354,  1410,  -413,   745,  2768,  4524,  3255,  2359,  1314,  3707,
-    2171,   929,  2172,   930,  1433,  2365,  1244,  3791,  2024,  3708,
-   -2392, -2392, -2392,  4752,  3189,  3190,  3191,  3192,  3193,  3194,
-    3273,  4689,  4173,  1360,   632,  3273,  1305,    50,  1125,  1091,
-    3273,  3179,  3793,  3273,  4865,  3180,  3181,  3182,  1659,   755,
-    1621,  1660,  2106,  3231,    14,  3232,   951,   826,  1315,    39,
-    1955,  2113,  3111,   571,  2746,   572,   856,  3273,   554,    39,
-    1306,   177,  3656,   181,  3349,   871,  2761,  4686,  3233, -1497,
-    3273,  4702,  1245,  2718, -1497,  4753,    19,   952,  2383,   577,
-    1833,  2386,    43,  2132,  3824,  1112,  3032,  1956,  4580,   756,
-    1307,  2391,    43,  2406,  2858,  2407,  2806,  2408,  4014,  2409,
-    2399,  2410,  4382,  2791,  4122,  2411,  2444,  2460,  4713,  3576,
-    4388,  4221,  2453,   177,  2450,   181,  2451,  2452,  3598,  1775,
-    1834,  3602,    47,  2507,  1059,  3326,  3666,  -986,  3865,  2496,
-    2497,  2693,    47,  2906,  3795,    48,  2511,  2512, -1497,   561,
-    1957,  1316,  4720,  3825,  3865,    48,  3365,  1417,  1310,  2217,
-     770,   968,  2807,  2264,  4637,   954,    49,  2722,  4640,  2000,
-    -980,  3623,  4015,  2907,  2550,  3667,    49,  3434,   805,  4721,
-      50,  3234,  2110,  2366,  2111,  4222,  3235, -1497,  1783,  4788,
-    2669,  2176,  1311,  2218,  1958,  3050,  4669,  2565,  4228,  4229,
-    1317,   807,   858,  2001,  2482,  1418,  3789,   563,  2219,  4576,
-    2459,  3435,   827,  1444,  3866,  3059,  4455,  4323,  4457,   828,
-    2220,  3346,  1312,   968,  2629,  3696,  1714,  3273,   859,  1715,
-    3866,  3184,  2133,  2002,  1318,  2170,    34,  3080,    34,  2562,
-    2112,  3436, -2049,  4344,   864,  2221,    34,  1445,    31,  1959,
-    3000,  1446,  3089,  4332,  3722,  3091,  3092,  3099,  4496,  2134,
-    3095,  3096,  1463,  4550,  1319,  4302,  1841,  3100,  2963,  3867,
-    4303,  3868,  1463, -1521, -1521,    39,  3790,  1447,   845,  4497,
-    3973,   933,  2135,   934,  2136,  3867,  1419,  3868,  2122,  3273,
-    3185,  3009,  2742,  1320,  4551,  1321,  3010,  2643,   632,   814,
-    3974,  3287,  3357,  3662,  2697,  1649,  3791,  4712,    43,  2701,
-    3275,   218,  3236,  2704,  4304,  3275,   546,  2130,    14,  2123,
-    3275,  3792,  3237,  3275,   630,  1593,  1650,  3151,  3284,  3285,
-    4747,  3793,  2401,  3139,  1420,  4285,  1421,  4286,  4287,  2728,
-    3152,  4288,   708,  1322,  1594,  3153,  2178,  3275,    47,  3863,
-      19,  1409,   633,   571,   872,   572,  3794,   663,  1595,  3579,
-    3275,    48,  1236,   916,  2171,   574,  2172,  4875,  3588,  4900,
-     919,  3380,  1410,  2652,  3957,  1423,   576,  4842,    28,  1526,
-    2280,  2779,    49,  1821,  2785,   946,  1593,  4496,  3290, -1461,
-    4587,  2671,   177,  3400,  2132,  3958,   634,  1346,   932,  2312,
-    1253, -1461,   880,   921,  1254,  1594, -1461,   915,  4497,  1125,
-     924,  1263,  3179,  3733,   967,  1425,  3180,  3181,  3182,  1597,
-    2712,  1936,  2715,   663,  1937,  2485,  2132,  3531,  2824,  4299,
-    1347,  4301,  3010,  3795,  3240,  4305,  4815,  4306,  3383,  2709,
-    -518,   938,  3331,  2522,  2522,  2859,  3843,  1581,  2522,  2007,
-   -1461,  1581,   956,  2007,  1427,  1939,  3129,   968,  1940,   932,
-     955,    39,  4736,  2870,  1581,  3273,  1308,  3186,  3187,  3188,
-   -1461,  3189,  3190,  3191,  3192,  3193,  3194,  3141,   957,   973,
-    1235,  2882,  2772,  1016,  1025,  2522,  2522,  1348,  3147,  1041,
-    3273,  2620,  2892,  3885,    43,  3205,  2620,  3207,  3208,  2923,
-    3895,  3900,  2620,  1024,  1030,  2916,  3677,  3275,  3430, -1461,
-    2744,  2745,    31,   932,  1253,  1050, -2030, -1461,  1254,  2756,
-    1349,  2758,   646,  2400,  2190,  2762,  2401,  2485,  2413,  2415,
-    1054,  2414,  2414,  2133,    47,  2447,  1085,  1089,  2448,    39,
-    3913,  3637,  3638,  3548,  3682, -1460,  2642,    48,  2783,  2643,
-    1106,  2784,  3256,  2850,  3257,  1350,  2851, -1460,  1093,  1099,
-    2134,  4896, -1460,  2960,  1096,  2133,  2961,   968,    49,  3275,
-     663,  2964,    43,  3057,  2965,  1228,  2401,  1101,   663,  3698,
-     663,  3183,  4843,  2135,  2466,  2136,  3103,  1351,  3150,  2414,
-    3159,  2401,  2134,  2401,  1251,  3352,  3335,  3336,  3072,  3074,
-    3075,  3356,  3184,  2567,  3165,  2568, -1460,  2401,  3166,  4069,
-    1102,  2401,    47,  3727,  1103,  2135,  1277,  2136,  2130,  2544,
-    1109,  2833,  2547,  3909,  2940,    48, -1460,  3167,  2569,  2877,
-    2401,  2467,  2940,  3198,  1110,  3211,  2401,  4504,  2401,  1111,
-    2940, -1461,  2940,  1112,  3216,  3417,    49,  3217,  3418,  1113,
-    2130,  4863,  4545,    34,  3273,  2090,  3422,  1354,  3769,  3423,
-      50,  3185,  2468,  3610,  1355, -1460,  3611,  1728,  1115,    50,
-    3404,  1356,  3406, -1460,  3635,  3728,  1114,  2401,  3729,  2091,
-    2335,  4885,  2336,  2469,  1118,  2937,  3738,  1398,  1119,  3739,
-    3003,  1358,  1121,  2946,  2470,  2948,  3860,  3861,  1246,  1359,
-    3680,  2950,  3749,  1239,  1242,  2401,  3140,  1247,  1248,  2132,
-    3832,  3993,  3144,  3833,  2471,  4057,  1581,  1264,  2007,  2472,
-    3033,  3038,  3837,  1252,  3842,  3838,  2570,  2692,   967,  3021,
-     177,  2571,  3864,  3116,  3521,  2414,  2572,  3025,  2132,  3026,
-    3001,  1271,  3449,  4048,  1774,  3275,  2414,  1775,  4812,  4915,
-    1272,  3358,  3457,  1360,  4099,  3130,  1282,  1706,  4117,  3065,
-    3067,  2401,  4362,  3116,  1274,  3564,  3076,  2473,  3370,  4143,
-    3275,  3258,  2448,  3259,  4155,  3022,  1781,  2401,  3484,  1275,
-    4206,  3683, -2392,  2692,  3491,  1297,  4212,  1521,  2474,  4213,
-     967,  4218,  4219,   845,  2414,  2414,  4292, -1460,   968,  4293,
-     968,  4346,  4393,  1298,  4347,  4394,  1783,  2216,  4007,  1302,
-    4008,  1551,  1554,  1555,  4395,  1338,  2366,  2401,   758,  3994,
-    4403,  4475,  1343,  2448,  4476,  3881,  4901,  1365,  4902,   663,
-   -1498,  3083,  3549,  3085,  3551, -1498,  2775,  1308,  3186,  3187,
-    3188,  3670,  3189,  3190,  3191,  3192,  3193,  3194,  2133,   203,
-    4572,  2132,  1369,  3276,  4093,  4094,  4095,  3442,  1274,  3444,
-   -1449,  3995,  2573,  4546,  4573,  3300,  2414,  4574,   968,  1367,
-    3228,  3557,  2574,  3560,  1370,  2134,  2475,  2133,  4589,   759,
-    1476,  2448,  1281,  2476,  1283,   829,  3996,   753,  4597,  2477,
-    1401,  4598,   830,   831,   832,  4172,  1403,  4175,  2135, -1498,
-    2136,  3997,  3616,  1404,  2134,  3998,  3276,  4602,  1405,  4608,
-    2643, -2392,  3586,  1408,  4610,  1406, -2392,  3586,  3485,  4622,
-    1413,  2478,  4623,  3633,  2479,  3999,  3805,  2135,  4000,  2136,
-    1416,   753,  1766,  2130,  3275,  1439,  1440,  4663, -1498,  3149,
-    4664,  4001,  2480,  3499,  4685,  1452,   760,  1820,  1228,  2845,
-    3644,  3645, -2392,  3647, -1461,  3649,  3650,  1461,  1462,  3810,
-    3811,  3812,  2130,  1466,  1471,  1472, -1461,  2481,  3657,  4704,
-    4344, -1461,  4623,  1477,  1228,  4714,  1766,  4715,  2448,  4716,
-    3217,  1479,  2401,  4726,  1774,  4729,  2643,  1775,  3586,  4751,
-    2133,  4757,  2448,  2565,  2448,  3332,  1790,  4758,  4773,  4804,
-    2448,  4774,  2643,  1488,  4805,  1481,  3678,  2401,  1932,  3249,
-    1484,  1489,  3261,  3262,  3263, -1461,  1781,  2134,    39,  1495,
-    4002,  3676, -2392,  4806,   967,  3267,  2401,  4808,  4003,  1496,
-    2401,  3291,  2791,   663,  1499, -1461,   753,  2485,  3354,  1502,
-    2135,  1125,  2136,  1504,  3179,  1507,  1783,  1514,  3180,  3181,
-    3182,    43,  1517,  1519,  1528,  2453,   177,  2450,   181,  2451,
-    2452,  1510,  1531,  3634,  4004,  3746,  4859,  1530,  -173,  3586,
-     761,  4519,  1535,  4862, -1461,  2130,  4616, -2392,  3267,  1533,
-    4884,   752, -1461,  4623,  4898, -2299,  4924,  4899,  1547,  4899,
-    1558,    47,  1549,  3978,  1556,  1562,   203,  1569,  1574,  1575,
-    1576,  1581,  1577,  1584,    48,  2522,  2522,  2522,  2522,  1845,
-    3239,  2522,  2522,  2522,  2522,  2522,  2522,  2522,  2522,  2522,
-    2522,  2132,  1601,  1585,  1587,    49,  1617,  1618,  1620,  1621,
-    1628,  1631,  1632,  4127,   967,  1633,  1634,  3299,  3731,    50,
-    1635,  3426,  2132,  1636,  1638,  1643,  1644,  1645,  1646,  4273,
-    4274, -2392,  4276,  3445,  1658,  1648, -2392,  1981,  1653,  1683,
-    1711,  1716,  1718,  1719,  4079,  1725,  3691,  2522,  2522,  1726,
-   -2392, -1651, -1658, -2299,  1733,  1734,  3300,  1797,  1798,  1799,
-    1800,  1801,  1802,  3300,  1735, -1648, -1649,  3700,  2132,  1736,
-    1737,    50, -2392,  1739,  1740,  1741,  1742, -1652,  1743, -1650,
-    1806,  4138,  1744,  1746,  1747,  3361, -1461,  3362,  3363,  3364,
-    1748,  1749,  3723,  1750,  1751,  1752,  3420,  1753,  1755,  3461,
-    1756, -2299,  1757,  1758,  1759,  1760,  1761,  1762,  1810,  2100,
-    3496,  1824,  1808, -2299,  3184,  1811,  1790,  2121, -2299,  1820,
-    3467,  1836,  1844, -2299,  1944,  1285,  1709,  1287, -2299,  1973,
-    1975, -2299,  2003,  1984, -2299,  2005,  2004,  2007,  3455,  2008,
-    2133,  4362,  2010,  2132,  2155,  2009,  1253,  2011,  2019,  1274,
-    1254,  2012,  2161,  2013,  2038,  2164,  1125,  2050,  2044,  3179,
-    2072,  2133, -2299,  3180,  3181,  3182,  3495,  2134,  2076,  2078,
-    2079,  2080,  2081,  3185,  2082,  2097,  2109,  2098,  2099,  2120,
-    4096,  2124, -2299,  2126,  2129,  2127,  3487,  2128,  2134,  2130,
-    2135,  2199,  2136,  2138,   835,   836,   837, -2392,   838,   839,
-     840,   841,   842,   843,  2139,  2214,  2141,  2133,  2940,  2143,
-    2142,  2135,  2147,  2136,  2156,  2940,  2940,  2148,  2226,  2940,
-    2158, -2299,  2162, -2299,  2163,  2130,  2940,  2166,  2173, -2299,
-     814,  2174,  1382,  3523,  2134,  2180,  4296,  2181,  2185,  2202,
-    3523,  3886,   663,  2132,  2203,   967,  2130,   967,  2207,   663,
-      28,  2191,  2192,  2204,  2208,  1774,  2229,  2135,  1775,  2136,
-    2230,  2212,  1776,  1777,  1778,  4329,  2237,  2279,  2215,  2231,
-    2245,  3561,  3500,  2259,  2246,  2249,  2248,  2260, -2299,  2211,
-    2265,  2268,  2133,  2269,  2272,  3584,   556,  1781,  2313,  2296,
-   -2392,  2281,  2130,  1782,  3665,  2325,  2273,  1797,  1798,  1799,
-    1800,  1801,  1802,  1433,  2276,  2301,  2314,  2317,  2318,  2134,
-    2326,  2332,  2334,  2338,  3615,   967,  2349,  1783,  2330,  3679,
-    2351,  2352,  3605,   177,  4031,  4032,  2358,   677,  2360,  2361,
-    2362,  2343,  2135,    39,  2136,  2364,  2363,  4036,  2373,  2356,
-    2522,  3914,  2375,  3636,  3632,   177,  2357,  2376,  4057, -2392,
-    3186,  3187,  3188, -2299,  3189,  3190,  3191,  3192,  3193,  3194,
-    2377,  1774,  2378,  2395,  1775,  2396,    43,  2130,  1776,  1777,
-    1778,  3993,  2426,  2432,  2445,  2462,  2495, -2299,  2490, -2299,
-   -2299,  2539,  2133,  2545,  3276,  1779,  3276,  1775,  1304,  2549,
-    2564,  2558,  4085,  1781,  2576,  2578,  2598,  2403,  3763,  1782,
-    4088,  4089,  4090,  4091,  2599,  2631,    47,  2613,  3185,  2134,
-    1094,  2627,  2634, -2299,  2630,   759, -2299, -2299, -2299,    48,
-    2653,  2635,  1784,  1783,  3651,  4196,  3652,  1785,   663,  2644,
-    3654,  2645,  2135,  2654,  2136,  1228,  1228,  4851,  4852,  2655,
-      49,  2656,  2672,  2682,  2666,  2681,  2684,  2696,  1786,  1787,
-    4033,  2694,  2455,  2695,    50, -1230,  2713, -1230,  2720,  2716,
-    2718,  2727,  2721,  1788,  3276,  2732,  2737,  2130,  2738,  2740,
-    2747,  2743,  2759,  2751,  2760,  2763,  2776,  1236,  2781,  1240,
-    2795,  2808,  2813,  2814,  3685,  2841,  2835,  2840,  2849,  2852,
-    4601,  2853,  2854,  2869,  1789,   753,  2908,  2911,  3744,  2922,
-    2929,  4601,  2930,  2933,  2934,  2935,  2941,  1790,  2942,  4298,
-    2945,  2943,  2952,   753,  2944,  2949,  2954,  2991,  2959,  2977,
-    2995,  3300,  2966,  3002,  3008,  2993,  3016,  3018,  1784,  3019,
-    3030,  3031,  3011,  1785,  4514,  4516,  3017,  3028,  4508,  3034,
-    1766,  3771,  3772,  3773,  3774,  3035,  3048,  3049,  3051,  2611,
-    3052,  3053,  3055,  3058,  1786,  1787,  3778,  3882,  3781,  2626,
-    4194,  3060,  1610,  4922,  4923,  3077,  3061,  3079,  3062,  1788,
-    3088,  3090,  3063,  3093,  3094,  3064,  3069,  4659,  3097,  3078,
-    3098,  3102,  3105,  3106,  3107,  3186,  3187,  3188,  1792,  3189,
-    3190,  3191,  3192,  3193,  3194,  2643,  3117,  1654,  3110,  3119,
-    1789,  3108,  2463,  3120,  3121,  3128,  3131,  3136,  1091,  3138,
-    3142,  3145,  3143,  1790,  3146,  3148,  1791,  3164,  3175,  4226,
-    3161,  3162,  3163,  3168,  3169,  3171, -1910,  3213,  3225,  3174,
-    3230,  3247,  3197,  3252,  3238,  1125,  3203,  2401,  3179,  3210,
-    1709,  3308,  3180,  3181,  3182,  3224,  3248,  3316,  3278,  3250,
-    3251,  4244,  4245,  3283,  3959,  4235,  3302,  3962,  3306,  3747,
-    3254,  3329,  3312,  3310,  3323,  3344,  3339,  3337,  3340,  3348,
-    4316,  3351,  3353,  3345,  3376,  2637,  3387,  2640,  4591,  4727,
-    3360,  1793,  3388,  3377,  1794,  1795,  1796,  3392,  1797,  1798,
-    1799,  1800,  1801,  1802,  1792,  3403,  3393,  3402,  3523,  3405,
-     968,  3411,  3876,  3877,  3878,  3879,  3413,   663,  3412,  3421,
-    3452,  3448,  4269,  3450,  1228,  3458,  3453,  1768,  3456,  3459,
-    3460,  3468,  3470,  3469,  3471,  4282,  4283,  3940,  3472,  3473,
-    3941,  3486,  3942,  3040,  3474,   663,  3475,  3478,  3480,  3482,
-    4454,  3490,  4429,  4505,  4665,  2200,  3501,  3476,  3477,  4444,
-    3507,  3939,  1346,  3488,  4038,  3479,  3481,  3483,  3492,  3525,
-    4227,  3508,  3510,  4647,  3562, -2301,  4650,  3494,  3513,  3556,
-    3528,  3555,  3571,  3573,  3575,  2940,  3577,  3585,  3586,  3594,
-    3599,  2940,  2940,  3596,  2940,  1347,  2254,  1793,  3603,  4243,
-    1794,  1795,  1796,  3600,  1797,  1798,  1799,  1800,  1801,  1802,
-    1079,  1080,  2632,  3604,  4655,  3607,  4657,  3608,  2633,  4258,
-    3620,  3631,  3639,  1603,  3646,  3648,  3658,  3669,  3659,  3640,
-    3672, -2315,  3642,  3660,  3661,  3671,  3673,  3681,  3184,  3684,
-    3686,  3690,  4375,  3179,  3200,  4376,  4377, -1909,  1728,  3199,
-    3751,  3664,  1348,  3740,  3724,  3752,  3699,  3725,  3116,   760,
-    3780,  4381,  3726, -2301,  3764,  3807,  3827,  3732,  3802,  3830,
-    3835,  3804,  2815,  4281,  3845,   672,  3851,   674,  3872,  4011,
-    3874,   680,  3755,  3822,  3770,  1349,   694,   702,   672,  4719,
-     709,  4068,  2842,   702,   702,  3788,   738,  3185,   741,  3887,
-    3880,  4728,  3888,  3889,  4064,   177,  4730,  3890,  4732,  3817,
-    3819, -2301,  3821,  3875,  3892,  3041,  3904,  4508,  3276, -2315,
-    1350,  3901,  3276, -2301,  3915,  4882,  4543,  3916, -2301,   845,
-    3917,  3928,  3918, -2301,  2522,  3929,  3930,  3931, -2301,  3932,
-    3933, -2301,  3936,  4396, -2301,  3937,  3934,  3946,  3954,  3947,
-    3970,  3972,  1351,  3982,  3896,  3975,  3984,   663,  3985,  3981,
-    3988,  4018,  4462,  4010,  3622,  4107,  4021, -2315,  4107,  4026,
-    4107,  4028, -2301,  4034,  2414,  4367,  4042,  4050,  4596, -2315,
-    4041,  4061,  4044,  4045, -2315,  4062,  4074,  4882,  4077, -2315,
-    4080,  4075, -2301,  4078, -2315,  4083,  4081, -2315,  4092,  4084,
-   -2315,  4097,  4101,  4103,  4104,  4484,  4882,  4108,  4109,  4111,
-    4128,  4114,   968,  4119,  4124,  4123,  4129,  4130,    34,  4131,
-    4132,  1709,  1354,  4479,  4151,  4163,  4168,  2994, -2315,  1355,
-    4136, -2301,  4164, -2301, -1911,  4166,  1356,  4169,  4176, -2301,
-     796,   801,   801,   804,  2091,   801,  4177,   810, -2315,   796,
-    4181,   738,  4182,  4184,   847,  4185,  1358,  4202,  4195,  4209,
-     738,  4205,  4187,   738,  1359,  4188,  4189,   801,  4207,   738,
-    4214,  4246,  4215,  4223,  3186,  3187,  3188,  4239,  3189,  3190,
-    3191,  3192,  3193,  3194,  3043,  4240,  4247, -2315, -2301, -2315,
-    3267,  4248,  4266,  4268,  3267, -2315,  4259,  4262,  4271,  4277,
-    4272,  4191,  4310,  4193,  4284,  4309,  4322,  4253,  4317,  4326,
-    4869,  4327,  4328,  4330,  4333,  4336,  4338,  4357,  1360,  4263,
-    4358,  4348,  3044,  3622,  4359,  4368,  4373,  4360,  4355,  4379,
-    4380,  4389,  4399,  4197,   177,  4397,  4408,   677,  4390,  4208,
-    4392,  4586,  4400,  4422, -2315,  4401,  4442,  4448,  4451,  4402,
-    4415,  4319,  4446,  4426,  4452,  4456,  4472,  4468,  4471,  4481,
-    4502,  4506,  4513, -2301,  4520,  4486,  4017,  4487,  4491,  4527,
-    4529,  4530,  4532,  4534,  4533,  4555,  4548,  4554,  4553,  4563,
-    4558,  4560,  1774,  4564,  4575,  1775,  4577, -2301,  4578, -2301,
-   -2301,   663,  4599,   677,  4579,  4592,  4595,  4604,  4607,  4616,
-    4611,  4612,  4639,  4614,  2522,  3133,  4675,  4241,  4641,  4620,
-    4631,  4654,  4256,  4257,  1781,  4679,  4628,  4260,  4261, -2315,
-   -2392,  4670,  4680, -2301,  4682,  4693, -2301, -2301, -2301,  4699,
-    4687,  4700,  4701,  4708,  4709,  4710,  4717,  4735,  4725,  4731,
-    4711,  4738,  4739, -2315,  1783, -2315, -2315,  4750,  4718,  4754,
-    4734,  4648,  4763,  4764,  4741,  4767,  4769,  4279,  4280,  4772,
-    4775,  4777,  4660,  4778,  4785,  4786,  2940,  4787,  2940,  2940,
-    4793,  3765,  2940,  4794,  4821,  4802,  4814,   967,  4816, -2315,
-    4825,  4300, -2315, -2315, -2315,  4765,   663,  4766,  1709,  4833,
-    4860,  4854,  4872,  3276,  3116,  4832,  4746,  4893,  3276,  4837,
-    4897,  4903,  4275,  3276,  4894,  4904,  3276,  4424,  3756,  4907,
-    4911,  4891,  4912,  4892,  4916,  4918,  4278,  4917,  4919,  4920,
-    3040,   845,  2213,  1412,  1437,  2997,  3485,  3293,  1436,  4340,
-    3276,  1368,  3399,  1276,  3907,  2921,  3512,  3990,  2839,  1346,
-    1843,  4661,  4507,  3276,  4762,  4557,  4030,  4559,  4314, -2392,
-    4542,  4342,   177,  3300, -2392,  3260,  3342,  3104,  4361,  4817,
-    4460,  4867,  4770,  4768,   845,  4831,  3347,  4065,  4049,  4025,
-    2975,  3905,  1347,  3415,  2976,  2293,  4037,  2967,  4331,  4743,
-    1709,   968,  3581,  4871,  1709,  1709,  4483,  4921,  4107,  4531,
-   -2392,  4908,  4107,  4107,  3529,  4107,   882,  4343,  3116,  3526,
-    3116,   738,  4835,   796,  4485,  4756,   801,   679,   804,  4822,
-     801,  4488,  4098,  4626,  1713,  1774,  4071,   847,  1775,  4706,
-    2687,   943,  3330,  1042,   969,  2456,  1703,  3489,   801,  1348,
-    2457,  4845,  2275,  1125,  1790,  2458,  3179,   814,  4910,  2018,
-    3180,  3181,  3182,  2638,  2405,  2639,  3297,  1781,  4053,  4198,
-    4811,   796,  3839, -2392,  1249,  2665,   804,  4145,  3298,  1970,
-    1969,   796,  1349,  1774,  3818,   847,  1775,  1941,  3307,  1816,
-    3267,  3305,  4807,  4707,  4733,  3267,  4192,  1783,  3267,  2664,
-    3309,  4162,   801,  3783,  4174,  4606,  3779,  4724,  4723,  3840,
-    3276,  1974,  3041,  3641,  4590,  1781,  3734,  1350,  4809,  1979,
-    4445, -2392,  4810,  2350,  4453,  4801,  3301,  2603,  3245,  3156,
-    3243,  2612,     0,     0,     0, -2392,     0,     0,     0,  4447,
-       0,     0,     0,     0,     0,  1783,     0,     0,     0,  1351,
-    3523,   738,     0,     0,     0,     0,     0,     0,     0,   663,
-       0,  3759,     0,     0,   738,     0,  1108,     0,     0,     0,
-       0,     0,  3276,     0,     0,     0,     0,     0,     0,     0,
-       0,  4463,  4465,  4465,     0,     0,  1221,  1221,  2940,   738,
-     702,  4864,     0,     0,   702,     0,     0,     0,     0,   967,
-       0,     0, -2392,  4511,     0,  4512,     0, -2392,   738,  4517,
-    4518,     0,   738,     0,     0,    34,     0,     0,  1221,  3042,
-       0,     0,     0,  3447,     0,     0,  1355,     0, -2392,     0,
-     738,     0,     0,  1356,     0,  1797,  1798,  1799,  1800,  1801,
-    1802,  2091,   738, -2392,     0,     0,  3184,     0,     0,     0,
-   -2392,  4547,   177,  1358,     0, -2392,  1774,     0,     0,  1775,
-       0,  1359,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  4568,   177,
-       0,  3043,  4681,     0,     0,   738,     0,  1790,  1781,     0,
-       0, -2392,     0,     0, -2392,     0,     0,     0,     0,     0,
-       0,   738,     0,     0,     0,  3185,   801,   801,     0,     0,
-     753,     0,     0,     0,     0,  1360,     0,     0,  1783,  3044,
-       0,     0,     0,     0,  4569,     0,     0,     0,     0,   753,
-       0,   702,   702,     0,     0,  1790,     0,     0,     0,     0,
-       0,     0,     0,     0,  3267,     0,  3553,  3554,  3276,     0,
-       0,     0,     0,     0,     0,  1766,   796,     0,   845,     0,
-       0,     0,  3563,     0,     0,     0,     0,   796, -2392,     0,
-       0,   847,     0,  3276,  1766,     0,     0,     0,  3580,     0,
-       0,     0,  3760,     0,     0,     0,   801,  3589,  3591,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   738,     0,  2052,  3609,     0,     0,     0,   801,   801,
-    4662,     0,     0,     0,     0,     0, -2392,     0,     0,     0,
-       0,     0,     0, -2392,     0,   738,   738,   738, -2392,   801,
-    4632,   796,  1125,     0,     0,  3179,  2053,     0,     0,  3180,
-    3181,  3182,     0,  4781,     0,     0,     0,     0,     0,  2054,
-       0,     0,     0,     0,     0,     0,  4146,     0,     0,     0,
-       0, -2392,     0,  2055, -2392,  4656,     0,  4658,  1797,  1798,
-    1799,  1800,  1801,  1802,     0,     0,  4694,   177,     0,     0,
-       0,     0,  3186,  3187,  3188,     0,  3189,  3190,  3191,  3192,
-    3193,  3194,     0,     0,     0,     0,     0,   801,     0,   801,
-     801,  4820,  2056,     0,     0,  1228,     0,     0,  1790, -2392,
-       0,     0,     0,  2057,     0,     0,  1797,  1798,  1799,  1800,
-    1801,  1802,     0,     0,     0,     0,     0,  1221,     0,     0,
-       0,     0,     0,  2058,     0,     0,     0,  3276,  2059,     0,
+     597,   176,   177,   171,   181,   172,   174,   705,   845,   676,
+    1621,  1228,   753,   549,   663,   969,  1296,  1666,  1302,   537,
+     663,   739,   177,  1035,   181,  1929,   587,  1087,  1088,  1089,
+     938,  1224,   763,  1093,  1050,  1944,  1466,  1305,  2626,  1594,
+    1436,   967,   800,   802,   664,  1625,   806,  1631,   808,  2035,
+     664,  2985,   752,  1258,  1617,  1064,  1527,   736,  1478,  2230,
+    2430,  1934,   579,  2098,  1584,  1585,  1508,  1548,   866,  1722,
+    2854,  1242,  3384,  1600,  1593,   628,  2692,  2694,  1030,  1929,
+    3295,  3005,  3143,  3629,   670,  1686,  3420,  2317,  3422,  1515,
+    2106,   795,  2183,  1520,   638,   819,  3829,   706,  1524,  3558,
+     814,  2116,   852,  2133,  2494,  3599,  2915,  1531,  3401,  1934,
+    2647,  2953,  1947,   870,  3899,  1431,   851,  1550,    67,  2957,
+    1572,  2959,  3530,   923,  3536,  3124,  3863,   869,  3325,  3530,
+    3858,  3864,  1396,  3288,  3286,  3287,  1058,  4082,  1047,  4065,
+     969,  2335,  4073,  2631,   765,   699,  4076,  4066,  3228,   766,
+    2557,   757,   733,  3584,    76,  3788,    77,  2105,    78,  2091,
+      79,    80,  2008,   104,  2197,  2198,  1235,   124,  2193,   129,
+     147,   977,  3805,   151,   169,   175,   725,   751,  4223,  1364,
+    4355,  3331,  3612,   764,  3596,  1289,  1430,  3803,  3727,  2400,
+    3842,  4431,  1445,  4433,   593,  1292, -2154,  3185,  1777,  4480,
+    4577,  2998,  1471, -1682, -2087,  4473,  3759,  3279,  4221, -2189,
+    4026,  1659,   547,   646,   646, -1682,  1547,  1605,  2691,  1340,
+    2204,  1581,  1582, -1649,   862,  1584,  1585,  1783,  4506,  4507,
+    1069,  2209,  1592,  4499,  3618,  1331,   593, -2210, -1920,  1573,
+   -2238,  1935,  2314,  2108,  1593, -1920,  2565,  1117,  1600,  4654,
+   -2060,  3161,   588, -2032,  2600,  2108, -2061,  1785, -2060, -2060,
+    3279,  2601, -2393,  1511, -2061, -2061,  1707,  2937, -1939,  2041,
+   -2393, -2393, -1682, -1677,   742, -1939,  1812,  1503,  2565,  1573,
+    3330, -1662,  2270,     3,     4,  2770,  2832,  2427, -1689,   593,
+    2117,  3182,  3183,  3281,  3380,   593,  3202,   593,  1232,  2108,
+   -2031,  3090,   593,  3092, -1692,  4528,  2108,  1608,  2191,   593,
+    4230,  3385,  1475,  2585,   646,  3470,  2770,  3141,  2325,   826,
+   -1692,  4205,   874,  1341,  2108,  1827,  1393,   593,   856,   767,
+   -1677,   646,  4057,  3232,  3233,  4696,  2833,   872,   646,  1332,
+    1450,  2325,  1573, -2157,  1573,  4587,  3281, -2209,  1084,  1770,
+    1968,  2619,   646,  4879,   652,  -131,  2038,   545,  4326,  2771,
+    -131,  -825,   652,  4859,  1285,  1494,  2289,   652,  1668,  1073,
+    1091,   845,  1393,  1581,  1582,  1609,   653,   646,  1566,  -614,
+    1451,  4116,  1383,  4118,   653,  3396,  4022,  4483,  2460,   653,
+    2771,  2504,  1433,   593,  2874,   652,  4541,   184,   652,  1592,
+    2861,  4726,  4796,  2315,  2108,   874,  3185,   921,   768,  2716,
+    1259,   924,  1260,   542,   875,  1411,  1777,   653,  1602,   845,
+     653,  1478,  2834,  1590,  1591,  4509,  1434,  2756,  4727,   949,
+    1567,  1828,  2728,  1287,  1610,  1771,  1412,  1611,  4615,  1632,
+     185,  2290,  2586,  4650,  4542,  1783,   184,  2587,  2029,  2874,
+    3397,  1092,  4543,  2425,   918,   876,  1639,  2431,  2741,  2433,
+     933,  4911,  2436,  1817,  1649,   933,  4327,  2862,  1936,  1623,
+    1657,  4568,   969,  1476,   932,  1785,   933,  1309,  2238,   941,
+    4544,  3552,  4788,  2588,   969,  1333,  2729,  2717,  2469,   185,
+     951,  3900,  2505,  4880,   811,  -391,  1574,   875,  1654,  1704,
+    4771,   652,   972,  4588,   594,   589,   877,  4639,  4640,  1085,
+    1714,  2242,  1021,  4206,  2326,  4672,  3385,  2774,  2428,  1334,
+     991,  2031,  1568,   653,  4023,  1723,  3381,  1435,  4058,   915,
+    1612,  1813,  4226,  2491,  2496,  1452,  1574,  4340,   876,  2032,
+    1708,   969,  1829,  1092,  2779,  1831,  1403,  1777,  2774,  1335,
+    1843,  1843,  2563,  2186,  4545,  1512,  2849,   590, -1920,  2316,
+    2506,  2042, -2209,  2210,  3619,   743,  2566,  1726,  1670,  4797,
+    2118,  1244,  1569,  2835,  2602,  1934,  1783,  2938,   968,   597,
+    2205,  2119,  3914,  2120,  2257,  2258,  1254,  3530, -1939,   877,
+    1255,  1342,   591,  2179,   592,  2181,   753,  4231,  3248,  1574,
+    2192,  1574,   913,  1579,  4356,  1606,  1785,  3471,  2589,   769,
+    4767,  1708,  1336,  1092,    50,  1579,  4832,  4746,  1297,  2507,
+    2188,  1934,  2508,  1065,  4882,  3890,  2264,  4846, -2209,  1453,
+    2233,  1512,  3200,  1804,  1613,   177,   752,   181,  1601,  2121,
+     663, -2209,   663,  3349,   663,   658,   659,  3327, -1682, -2154,
+     663,  1080,  1081,  2079,  3072,  1570,  2229, -2087,   969,  1261,
+   -1682,  2085, -2189,  3868,   881,  1099,   969,   969,  1583,   916,
+    1066,  2033,  1071,  1082,  1075,  2404,  2077,  4173,  1656,  3805,
+    1079,  4177,  1057,  4122,  1825,  2418,  4321,  1401,  1402,  4072,
+   -2210,  1118,  1095, -2238,  4167, -2060,  1254,  2372, -2032,  1225,
+    1255, -2061,  1234,   968,  1236,  3918,   845, -2393,  1060,  3185,
+    4053,  4824,  2426,  4210,  4041,  2509,  1595,   765, -1677,  1979,
+    4148,  2437,   766,  4829,  2169,  4546,  1587,  2172,  2173,  1980,
+    2149,  2094,  1595, -1689,  1773,  1596,  2445,  4809,  2742,  2350,
+    1815,  1623,  2634,  3673,  4372, -2031,   658,   659,  1477,  1597,
+     928,  1596,  3553,  1095,   812,  2656,   764,   176,   177,   171,
+     181,   172,   174,  1394,  1395,  1599,  1411, -1649,  1502,  3902,
+     658,   659,  3333,  2034,  3334,  4295,  2043,  4635,  1623,  1929,
+    4772,  4819,  4874,  1300,   658,   659,  1245,  1412,  1482,  4057,
+    1525,  1526,  -131,  -131,  1018,  2239, -2157,  3580,  3128,  1489,
+    2780,  4389,  3822,  4833,  1573,  4390,  4391,  3504,  4392,  1394,
+    1395,  1559,  1107,  2528,  3508,  3509,  4789,  1264,  3512,  2510,
+     663,  2546,   593,  3596,  2961,  3517,  1346,   829,  3850,  2353,
+    2354,  2019,  3571,   593,   830,   831,   832,  1229,  3197,  3198,
+    3199,  3200, -1649,  4012,  2626,  2626,  2626,   685,  1801,  1802,
+    1803,  1804,  1246,  1231,  2308,  2446,  1252,  1239,  3279,  1487,
+    3279,  2977,  2706,  1562,  1539,  1113,  2754,  2439,  3510,  3511,
+    3961,  2156,  2850,  4834,    67,  1271,  4476,  1608,  1278,  3631,
+    4465,  1627,  1629,  4630,  2490,  4567,  2493,  4475,  2796,   711,
+    4479,  3680,  2500,   561,  2091,  3079,  4498,  4835,  2514,  2515,
+    2516,   593,  2839,  2724,  1540,  4845,  1623,  3468,  2532,  2534,
+      76,  3903,    77,  2544,    78,  3840,    79,    80,  2328,   104,
+    3572,  1324,  2770,   124,  1340,   129,   147,   686,  3538,   151,
+     169,   175,  4619,  2309,  3430,  4088,  1314,  4376,  3279,  2842,
+    2607,   959,   673,  3132,  3281,  1609,  3281,  3431,   760,  1400,
+    4419,   563,  2043,  3707,  3708,  3709,  3710,  -988,  3632,  3715,
+    3716,  3717,  3718,  3719,  3720,  3721,  3722,  3723,  3724,   699,
+    1440,  4532,  3469,  3541,  3130,  3603,  2714,  1799,  1800,  1801,
+    1802,  1803,  1804,  2183,   712,  4785,   760,  3864,  2696,  2346,
+     758,  1612,   544,  2434,  2435,  3863,  2771, -1649,  3129,  3573,
+    3864,  1641,  4599, -2029,  1610,   593,  3328,  1611,  1623,  1771,
+     929,  3298,  2246,  1315,  1623,  3763,  3764,  3133,  3443,  3904,
+    2029,  1565,  3905,  2272,  3281,  3962,  2772,  2978,  1341,  2422,
+    2377,  3681,  4631,  3044,  1594,   968,  2447,  2030,  2376,  2962,
+    2699,  1642,  2380,  2390,  2975,  1743,  3527,   968,  2386,  2387,
+    1523,   759,  2247,  3527,  1019,  2448,   663,  4423,  2399,  1541,
+    2773,  1574,  4427,  1316,  4420,  4429,  2944,   177,   687,   181,
+    2608,  2403,  3372,  2674,  1553,  1556,  1557,  3460,   685,  3305,
+    1672,  1710,  1674,  1064,  1676,  4690,  1678,  2044,  1680,  1681,
+    1682,  4397,  4711,  2031,  3633,  1684,  2385,   571,  4704,   572,
+    1612,  4701,  2352,   960,   968,   688,   689,  4709,  4319,  4702,
+    2979,  2032,  3373,  3545,  3629,  4636,  4649,  2132,   760,  1488,
+    4678,  2310,  3444,  1528,  1126,  4642,  2755,  3185,  2843,  3625,
+    1731,  3186,  3187,  3188,  2311,  3574,   874,  4351,  3292,  3195,
+    3196,  3197,  3198,  3199,  3200,  4111,  2348,  3864,  3237,  1740,
+    3238,  3546,  4377,  1542,  2774,   753,  1317,   961,   686,  3634,
+    4556,  2398,  4244,   962,  2410,  3547,  3930,  2045,  2132,  4216,
+    4673,   677, -1649,  3239,  3131,  2697,  3815,  3564,  2698,  1772,
+    1756, -1649,  3925,  1583, -1649,  1309,  1543, -1649,  1774,   632,
+    3115,  4557,  4600,  1254,   690,  1768,  1643,  1255,  4347,  2423,
+    3575,  2086,  1816,  4861,  1613,  2018,  1544,  2248,  3402,    14,
+   -1463,  1229,   845,  1408,  4357,  2520,  3076,  1957,  2283,  3871,
+    3916,   968, -1463,  1614,  1833,  1834,  4358, -1463,   875,   968,
+     968,  2424,  3284,   663,  1623,  4679,  2127,  1229,   663,   663,
+    4790,    19,   761,  2033,  1948,  1949,  4633,  1953,  2783,   766,
+     766,  1940,   766,  3548,  1958,   561,   835,   836,   837,  2244,
+     838,   839,   840,   841,   842,   843,  3931,  3374,  3445,   876,
+    4571, -1463,  2666,  1279,  3327,  3077,  3240,  3979,  4572,  2441,
+    4703,  3241,  3926,   764,   764,  3917,   764,  1954,  2087,  3830,
+    1644, -1463,  4209,    39,  2667,  3872,  3189,  3980,  1321,   687,
+    1322,  2249,  3446,  4680,  2199,  2200,  2201,  2202,  4019,  2652,
+    4674,  4611,  1300,   563,  2866,  3218,  2245,  3190,  2909,  4844,
+     877,  3225,  -520,  4189,  4847,  3822,    43,  2284,  3565,  3852,
+   -1463,  4196,  3447,  4862,  1455,  2784,   688,   689, -1463, -2051,
+    1456,   663,  2174,  -153,  1383,  2034,  2240,  2241,  3831,   663,
+    3873,  1960,  3874,  2047,  2642,  2253,  1545,  4126,  4594,  4127,
+    2442,  3375,  2216,  2048,  3087,  2267,    47,  4108,  1280,  -153,
+    1241,  1612,  1847,  4795,  3989,  4889,  3191,  3927,  1955,    48,
+    3992,  3993,  3279,  3995,  4359,  4419,  3279,  1080,  1081,  2668,
+    2653,  2867,  3403,  2303,  2304,  2305,  2306,  2810,  1777,  3088,
+      49,  2072,  3093,    31,  4484,  4743,  1961,  3242,   684,  3530,
+    3864,  3026,   663,  2037,  2675,   663,   663,  3243,  3404,  2187,
+    1983,  3010,  3011,  3012,  3013,  2964,  4562,  2881,  4750,  4751,
+      39,  2288,  2795,  3018,  4573,  2301,  4915,   845,  1457,   952,
+    1819,  2038,  2868,   969,  3711,  2154,  3712,  2216,  1411,   683,
+    4652,  1245,  4330,  2811,  4657,  4658,  2190,  1785,  4555,   571,
+    2900,   572, -1463,    43,  2134,  2112,  2901,  2113,  3281,  1412,
+     953,  2175,  3281,  2176,   707,  2345,  2882,  3301,  2812,  2906,
+    2134,  3344,  3669,   663,  2885,   577,  2887,  3395,  2389,  2260,
+    4128,  2392,  2102,  3060,  4052,  4331,  2869,  3847,  2880,  3853,
+    2123,  2397,   954,    47,  1820,  3062,  2049,  4758,  2792,  2155,
+    2405,  3527,   710,  2907,  2910,  2626,    48,  1246,  4020,  2298,
+    2893,  2378,  1254,  2114,  2375,  1275,  1255,  1324,  2158,  2760,
+    1113,  3854,  1324,  3693,  2813,  2912,  2165,    49,  1126,  2168,
+    2050,  3185,  2183,  2908,  2911, -2394, -2394, -2394,   955,  2216,
+    2932,    50,  3855,  3192,  3193,  3194,   845,  3195,  3196,  3197,
+    3198,  3199,  3200,   184,  2902,  2913,  2926,  3713,  4227,  4759,
+    1835,  4092,  1456,  4093,  3864,  2203,  2039,  3714,  2180,  1446,
+    2351,  1324,  4021,  2711,  1458,  1324,  2528,  2528,  2870,  2220,
+    2359,  2528,  2360,  2728,  2023,  1285,  4308,  1314,   814,  2365,
+      39,  4309,  2232,  2135,  2024,  3795,   185,  2371,  4871,  1777,
+    1836,  3796,  2573,  1447,  2574,  1416,  3472,  1448,  1459,  2135,
+    1306,  2025,  2225,     3,     4,   734,  1311,  4530,  2528,  2528,
+    2136,  2108,  4228,    43,  2226,   745,   652,  2575,  1783,  2568,
+    2109,  3797,  3662,  1449,  2223,  4310,  2136,  3352,  1460,  1417,
+     858,  2285,  4708,  2137,  1307,  2138,  4179,  1512,   653,  2227,
+    1312,  3672,  1957,   177,  1287,   181,  3799,  4692,  1785,  2137,
+    1457,  2138,  2319,    47,  1315,  3796,   859,  4586,  2224,  2331,
+    2124,   632,  3184,  2412,  1308,  2413,    48,  2414,  2132,  2415,
+    1313,  2416,  3038,  2466,  3212,  2417,  4695,  2142,  2871,  1958,
+    3673,    14,   646,  1288,  2132,  3797,  2872,    49,  4719,  2873,
+    2903,  2125,   755,  3795,  2459,   177,  2456,   181,  2457,  2458,
+    3798,    50,  2450,  4388,  1316,  2513,  3235,  2864,  3332,  3355,
+    3799,  2502,  2503,    19,  2699,  2576,  1060,  3117,  2517,  2518,
+    2577,  2270,  3871,  3629,  2904,  2578,  4646,  3604,  2663,  2664,
+    3608,  1126,  1959,  1595,  3185,  3800,  2026,  3279,  3186,  3187,
+    3188,   969,  3279,  4313,  3261,   805,  2556,  3279,  3801,  3065,
+    3279,  4505,  1596,  3702,  2905,  3752,  1651,  3371,  2174,  2372,
+     770,  2409,  2465,  3796,  4675,  2488,  4643,  3056,   756,  2571,
+    3191,  3086,  1661,  4314,  3279,  1662,  1960,  1652,  1285,  4234,
+    4235,  2002,  3728,  1286,  4329,  3538,  3095,  3279,    34,  3097,
+    3098,  3539,   807,  3797,  3101,  3102,  2635,  1317,  3872,  1229,
+    1229,  3106,  3540,   969,  4582,  4502,  3440,  4461,  3798,  4463,
+    4350,  2124,  3801,   561,  2160,  2003,  2461,  4338,  3799,  2143,
+    2161,    39,   827,  3281,   646,  2164,  4503,  1237,  3281,  3105,
+    3541,  1961,  3542,  3281,  4794,  4291,  3281,  4292,  4293,   828,
+    3441,  4294,  2125,  3800,  2649,  2004,  1318,  1287,  1823,  2286,
+     845,  2579,    39,  3873,    43,  3874,  3668,   864,  4502,  3293,
+    3281,  2580,  4424,  1595, -1499,   920,  4718,  3145,  2318, -1499,
+    3442,   563,  4394,  3281,  2213,    31,  3363,   873,  2219,  4503,
+    1319,   952,  1596,  2703,    34,    43,  1288,  2175,  2707,  2176,
+    2750,  2751,  2710,   917,    47,  3963,  1597,  2649,  1595,  2762,
+    2108,  2764,    39,   922,  1414,  2768,  4502,    48,  3543,  2115,
+    1320,  1254,   953,  2617,  3869,  1255,  3964,  1596,  2734,  1463,
+    3801,  1843,  1467,  2632,  3190,    47,   925,  4503,    49,   663,
+     661,  1599,  4753, -1499,  3279,    43,   661,  4881,  2748,  1321,
+    3386,  1322,    50,  2550,  3582,   814,  2553, -2394, -2394, -2394,
+    -414,  3195,  3196,  3197,  3198,  3199,  3200, -1523, -1523,  2658,
+    2785,  3296,  3406,  2677,   177,  3544,  3078,  3080,  3081,  3015,
+    3545,  3739, -1499,    50,  3016,    47,  2718,   933,  2721,   633,
+    3337,  1716,   939,  3191,  1717,  1583,   968,  2009,    48,  1323,
+     955,  2791,  3849,  1264,  3585,   663,  3279,  1583,   947,  2009,
+    4425,  3157,   930,  3594,   931,  1419,  2407,  2830,  3546,    49,
+    -519,  2883,  2491,  2626,  4906, -1463,   218,   571,  2626,   572,
+    3281,   546,  3547,   634,  2626,  2715,  3158, -1463,  3246,   630,
+    3537,  3159, -1463,   956,   934,  3016,   935,   969,  4821,  2643,
+     933,  2646,  1938,  1528,  2876,  1939,  1254,   708, -2032,  1583,
+    1255,  1309,  1236,  1420,  2865,  3290,  3291,  4742,  3211,  -414,
+    3213,  3214,  2888,  1126,  1941,   957,  3185,  1942,  2778,  2943,
+    3186,  3187,  3188,  2898,   958,  3683, -1463,  2952,  1229,  2954,
+    2406,   974,  3281,  2407,  1017,  2956,  2922,  3753,  3389,  1025,
+    2419,  2421,  3891,  2420,  2420,   933, -1463,  1026,  2453,  3901,
+    3906,  2454,  1031,    28,  3341,  3342,  1730,  1051,    50,  2929,
+    3548,   646,  2648,  2789,  2491,  2649,  2790,  2856,  2966,  3688,
+    2857,  2967,  3554,  3643,  3644,  4305,  1055,  4307,  2341,  3358,
+    2342,  4311,  1042,  4312,  1421, -1463,  1086,  4510,  2970,  3919,
+    1090,  2971,  4593, -1463,   663,  3063,  3109,   969,  2407,  2420,
+    1097,  1094,   663,  3156,   663,  1583,  2407,  2009,  3436,  3028,
+    3192,  3193,  3194,  4902,  3195,  3196,  3197,  3198,  3199,  3200,
+    1100,  1102,  3279,  3362,  4075,  3165,  1103,  3171,  2407,  2839,
+    2407,  3915,  1422,  1104,  1423,  3172,    39,  3173,  2407,  3204,
+    2407,  3031,  2407,  3032,  2182,  3217,  3222,  3279,  2407,  3223,
+    2946,  3262,  3423,  3263,  3410,  3424,  3412,  3428,  2946,  3616,
+    3429,  3641,  3617,  1110,  2407,  3089,  2946,  3091,  2946,    43,
+    1111,  3734,  3744,  1425,  3735,  3745,  2821,  1112,  2528,  2528,
+    2528,  2528,  1113,  4551,  2528,  2528,  2528,  2528,  2528,  2528,
+    2528,  2528,  2528,  2528,  1116,  3755,  4869,  2848,  2407,  2134,
+    3455,  3838,  3843,  1119,  3839,  3844,  3190,  1114,  3281,    47,
+    3463,  3737,  3848,  1427, -2301,  2698,  3009, -1463,  1002,  3999,
+    3870,  1115,    48,  2420,  3686,  4054,  4891,  4105,  2420,  4013,
+    1708,  4014,  4123,  3281,  4368,  2407,  2134,  1120,  1122,  1002,
+    2528,  2528,  4149,    49,  3044,  2454,  3039,  4161,  4063,  3264,
+    2407,  3265,  1429,  1247,   968,  3027,   177,    50, -1232,  1243,
+   -1232,  4212,  3490,  3527,  2698,  3191,  3122,  3704,  3497,  3007,
+    1240,  4218,  4224,  3155,  4219,  2420,  4225,  4298,  1248,  2420,
+    4299,  3866,  3867,  1249,  4352,  3071,  3073,  4353,  3136,  4818,
+    4399,  3570,  3082,  4400,  4921,  1253,  3122,  2194,  1070,  1072,
+    1074,  3733, -2301,  1076,  1077,  1078,  3146,  4401, -1462,  1265,
+    2407,  3279,  3150,  1083,  4409,  4481,   968,  2454,  4482,   845,
+   -1462,  4552,  1272,  4579,  2420, -1462,  4580,  1273,   969,  3563,
+     969,  3566,  1275,  1276,  2222,  3000,   554,  4595,  2135,  1283,
+    2454, -2303,  2372,  4907,  1776,  4908,  3775,  1777,  3887,  1298,
+   -2301, -2394, -2394, -2394,  3555,   663,  3557,  4099,  4100,  4101,
+    4603,  4608, -2301,  4604,  2649,  2136,  1299, -2301,  4614, -1462,
+    3676,  3592, -2301,  1303,  1309,  2135,  1783, -2301,  4616,  4578,
+   -2301,  3592,  1784, -2301,  4628,  1339,  3689,  4629,  2137, -1462,
+    2138,  3306,  4669,  4691,  1344,  4670,  1822,  3281,   969,  1275,
+    4710, -1451,  2136,  4629,   758,  1478,  1785,  3639,  1368,  4720,
+    4721, -2301,  2454,  3223,  1366,  1370, -1500,   561,   753,  4722,
+    1371, -1500,  2407,  2132,  3622,  2137,  1403,  2138, -1462, -2303,
+    4732, -2301,  1406,  2649,  3650,  3651, -1462,  3653,  -982,  3655,
+    3656,  1405,  3192,  3193,  3194,  1407,  3195,  3196,  3197,  3198,
+    3199,  3200,  3663,  3282,  3811,  1282,  1408,  1284,  1768,  4178,
+    2132,  4181,   753,  4735,  1410,   759,  3592,  3816,  3817,  3818,
+   -2301,  4757, -2301,  4763,  2454,   563,  2454, -2303, -2301,  3682,
+    2134,  4764, -2317,  4779,  2454, -1500,  4780,  4350,  4810, -2303,
+    3684,  2649,  4811,  2134, -2303,  2407,  1415,  4812,  4814, -2303,
+    2407,  2407,  1768,  1418, -2303,  1485,  3282, -2303,  1441,  4865,
+   -2303,  1786,  3592,  3139,  4868,  1442,  1787,  4622,  3006,  2571,
+    3267,  3268,  3269,  4890, -1500,  1500,  4629, -2301,  3338,  1454,
+    1464,  1465,   760,  2528,  1510,  3255,  1468,  4904, -2303,  3367,
+    4905,  3368,  3369,  3370,  4930,  1934,  1473,  4905,  1474,  1479,
+     968,  3273,  1790,  1481,  1483,  1486,  1490,  3297, -2303,   663,
+   -1462,  1498,  1491,  1497,  1501,  1504,  1506,   753,  1509,  1516,
+   -2317,  3360,  1512,  1519,  2491,  1521,   677,  2134,  2781,  1530,
+    1533,  2459,   177,  2456,   181,  2457,  2458,  1532,  -174,  1535,
+    1537,  2851,  1549,  1551,  4848,    28,  1792, -2303,  1558, -2303,
+    1560,  4000, -2301,  1564,  3273, -2303,   203,   752,  1571,  4525,
+    1576,  1577,  3984,  1579,  1578,  1583,  1586,  1589, -2317,  2135,
+    1587,   571,  1603,   572,  1619,  1620, -2301,  1622, -2301, -2301,
+   -2317,  1630,  2135,   574,  1623, -2317,  1633,  1634,  1635,  1636,
+   -2317,  1637,  1638,  4001,   576, -2317,  2136,  1528, -2317,  1640,
+    1646, -2317,  4279,  4280, -2303,  4282,   761,  1647,  1645,  2136,
+     968,  2134, -2301,  3266,  1660, -2301, -2301, -2301,  4002,  2137,
+    1648,  2138,  1650,  1655,  3432,  3467,  4085,  1794,    39, -2317,
+    1685,  1713,  2137,  4003,  2138,  1718,  3451,  4004,  1720,  1727,
+    1721,  1728, -1653, -1660,  1735,  1736,  1737,  1738,  2134, -2317,
+    1739,    50,  3306,   677,  2132, -1650,  1741,  4005,  1742,  3306,
+    4006,    43,  1743, -1651,  1711,  1671,  2135,  2132,  1673,  1744,
+    1675,  4144,  1677,  4007,  1679,  1745,  3506,  1746,  1683, -2303,
+    1748,  1749,  2134,  4368,  1750,  1751, -1654, -1652, -2317,  1752,
+   -2317,  1808,  3426,  2136,  1372,  1826, -2317,  1753,  1754,  1755,
+    1373,    47,  1810, -2303,  1757, -2303, -2303,  1758,  1759,  3473,
+    1760,  1761,  2134,  3502,    48,  1762,  2137,  1763,  2138,  1764,
+    1795,  1812,  1838, -2394, -2394, -2394,  1813,  1799,  1800,  1801,
+    1802,  1803,  1804,  1846,  3461,    49,  1822,  1946,  1286, -2303,
+    1374,  1975, -2303, -2303, -2303, -2317,  3501,  2866,  1288,  4849,
+    2135,  2132,  4008,  1977,  1986,  2005,  2006,  2009,  2013,  2007,
+    4009,  2010,  2012,  2011,  2014,  1776,  2015,  2991,  1777,  2021,
+    2040,  4133,  1778,  1779,  1780,  2046,  2052,  2136,  2078,  2081,
+    3892,  2074,  3493,  2082,  1347,  2080,  2083,  2135,  2084,  1781,
+    2100,  1375,  2101,  2111,   677,  2122,  4010,  1783,  1376,  2126,
+    2137,  1377,  2138,  1784,  2946,  2128,  2131,  2132,  2140,  2144,
+    3920,  2946,  2946,  2141,  2136,  2946,  2099,  1348,  2146,  2129,
+   -2317,  2135,  2946,  2130,  2867,  2145,  1378,  1785,  3657,  3529,
+    3658,  2159,  2170,  4302,  3660,  2132,  3529,  2137,   663,  2138,
+    2150,   968,  2162,   968, -2317,   663, -2317, -2317,  2136,  2151,
+    2166,  2135,  4037,  4038,  2177,  4102,  2167,  1379,  2206,  1383,
+    2189,  3453,  2178,  2184,  2185,  4042,  2207,  3567,  2211,  2212,
+    2195,  2137,  2132,  2138,  1349,  2868,  2235,  2196,  2136,  2208,
+   -2317,  3590,  2216, -2317, -2317, -2317,  2217,  2221,  3691,  2236,
+    2237,  2252,  2243,  2251,  2254,  2255,  2266,  3671,  2271,  2265,
+     814,  2137,  2274,  2138,  2275,  2278,  2132,  1350,   556,  2287,
+    3621,   968,  2279,  2282,  1380,  1435,  1381,  2307,  3611,   177,
+    4335,  2302,  3685,  2320,  2992,  2324,  1382,  2323,  2332,  2869,
+    1776,  2338,  1786,  1777,  1383,  2344,  2132,  1787,  2340,  3642,
+    3638,   177,  1351,  2355,  1384,  2357,  4091,  2358,  2336,  3999,
+    2349,  4063,  2364,  2362,  4094,  4095,  4096,  4097,  1788,  1789,
+    2363,  2369,  1783,  2366,  2367,  2368,  2370,  2153, -2394,  2379,
+    2381,  2382,  2383,  1790,  1352,  2384,  2401,  1776,  1385,  2402,
+    1777,  1386,  1387,  2496,  3559,  3560,  1305,  1126,  2432,  3769,
+    3185,  2451,  1785,  2438,  3186,  3187,  3188,  2468,  2501,  1777,
+    3569,  2545,  1353,  2551,  1791,  2555,  2570,  2564,  1388,  1783,
+    2582,  4151,  2584,  2604,  2605, -2394,  3586,  1792,  2619,  2636,
+    1095,  2870,  2633,  2640,   663,  3595,  3597,  2641,  2637,   759,
+    2650,  2659,  2651,  4202,  2678,  2660,  1354,  2661,  2662,  1785,
+      34,  2688,  3615,  2687,  1355,  4857,  4858,  2234,  2672,  2690,
+    2702,  1356,  2722,  2700,  3282,  2724,  3282,  2701,  1357,  2733,
+    2719,  2993,  2250,  4607,  2726,  2738,  1358,  2528,  2727,  2743,
+    2744,  1389,  2746,  2749,  4607,  2757,  4402,  2765,  1359,  2753,
+    2766,  2273,  2769,  2782,  2787,  1237,  1360,  1241,  2801,  2820,
+    2841,  2814,  1126,  2819,  3750,  3185,   753, -2394,  1794,  3186,
+    3187,  3188, -2394,  3234,  2994,  2846,  3882,  3883,  3884,  3885,
+    2847,  2855,  2858,  2859,   753,  2860,  4152,  3306,  2875,  3777,
+    3778,  3779,  3780,  2917,  1776,  2914,  2928,  1777,  2339,  2935,
+    2940,  2871,  2936,  2941,  3282,  4514,  1768,  2939, -2394,  2872,
+    1361,  2347,  2873,  1229, -2394,  2947,  2948,  2951,  2949, -2394,
+    4665,  2950,  3784,  1002,  3787,  2955,  1783,  2958,  2960,  2965,
+    3888,  2972, -2394,  2983,  2997,  2361,  2999,  3001,  3008,  3014,
+    3022,  4928,  4929,  4232,  4200,  3017,  3024,  3025,  3036,  3023,
+    3190,  3034,  1792,  4241,  4304, -2394,  1785,  3037,  3041,  4520,
+    4522,  1795,  3055,  3054,  1796,  1797,  1798,  3040,  1799,  1800,
+    1801,  1802,  1803,  1804,  3057,  4250,  4251,  3059,  3058,  2395,
+    3061,  3064,  1002,  3069,  3067,  3068,  1612,  3083,  3066,  3085,
+    3094,  3096,  3070,  3075,  3084,  3099,  3100,  3103,  3104,  1792,
+    3108,  3111,  3112,  3113,  3114,  3123,  2469,  2649,  1656,  3191,
+    4275,  3116,  3125,  3127,  3126,  3134,  1092,  3144,  3142,  3148,
+    3245,  3137,  4733,  3149,  3151,  3154,  3152,  3965,  3167,  3168,
+    3968,  3170,  3169, -2394,  3174,  3175,  4322, -1912,  3781,  3782,
+    3783,  3177,  3180,  4017,  3181,  3236,  2407,  3231,  3203,  4288,
+    4289,  3219,  3284,  3253,  3258,  3190,  3312,  3308,  3314,  3316,
+    3244, -2394,  3209,   672,  3529,   674, -2394,  3216,  3322,   680,
+     969,  3318,  3230,   663,   694,   702,   672,  3289,   709,  3335,
+   -2394,   702,   702,  3343,   738,  3346,   741,  3254,  3256,  3329,
+    4435,  3345,  3257,  3946,  3354,  3357,  3947,  4450,  3948,  3260,
+    3359,   663, -2394,  3350,  3351,  3366,  4460,  2528,  3382,  3383,
+    3393,  2558,  4511,  3394,  3191,  3398,  3409,  3408,  3399,  3411,
+    3419,  3417,  3418,  3427,  3454,  3456, -2394,  4044,  4653,  3458,
+    3459,  3945,  3481,  1799,  1800,  1801,  1802,  1803,  1804,  3462,
+    3464,  2946,  3476,  3465,  3477,  3466,  1792,  2946,  2946,  3474,
+    2946,  3475,  2260,  3478,  3492,  3484,  4381,  4656,  3479,  4382,
+    4383,  3486,  3488,  3480,  3482,  3494,  1080,  1081,  3483,  4671,
+    3485,  3487,  3489, -2394,  4661,  4387,  4663,  3496,  2204,  3531,
+    1799,  1800,  1801,  1802,  1803,  1804,  3192,  3193,  3194,  3498,
+    3195,  3196,  3197,  3198,  3199,  3200,  3507,  3513,  3514,  3500,
+    3516,  3534,  3519,  3568,  3579,  3561,  4597,  3577,  3581,  3583,
+    3605,  3562,  3591,  3600,  3606,  3602,  3592,  3609,  3610,  3613,
+    3614,  3122,  3626,  3637,  3648,  1605,  3645, -2394,   796,   801,
+     801,   804,  3652,   801,  3664,   810,  3646,   796,  3665,   738,
+    3654,  3675,   847,  3678,  3666,  1770,  3677,  4074,   738,  3667,
+    3670,   738,  3679,  3687,  3690,   801,  3696,   738,  3692,  1126,
+    4070,   177,  3185,  4888,  3206,  1730,  3186,  3187,  3188,  3185,
+   -1911,  3205,  3746,  3705,  4514,  3757,   760,  4549,  3770,  3730,
+    3786,  3813,  3833,  3731,  3836,   845,  3732,  3841,  3808,  3851,
+    3738,  3192,  3193,  3194,  3761,  3195,  3196,  3197,  3198,  3199,
+    3200,  3758,  3857,  3776,  3794,  3878,  3886,  3810,  4015,  3823,
+    3825,  4485,  3827,   663,  3880,  3893,  4602,  3828,  4025,  3881,
+   -2394,  4113,  3894,  3895,  4113,  4888,  4113,  1799,  1800,  1801,
+    1802,  1803,  1804,  3896,  3898,  3907,  4468,  3910,  3924,  3921,
+    3922,  3936,  3923,  3934,  4888,  3935,  3937,  3938,  3282,  3939,
+    3940,  3942,  3282,  4046,  3943,  3952,  3953,  3960,  3976,  3978,
+    3981,  3902,  3988,  4024,  3628,  3990,  3991,  1776,  3994,  4027,
+    1777,  4016,   969,  4034,  4047,  3987,  4048,  4032,  4040,  4490,
+    4056,  2331,  4050,  2420,  4051,  4067,  4068,  4080,  4081,  4083,
+    4084,  4086,  2752,  4087,  4098,  4089,  4090,  4103,  4107,  1783,
+    4109,  4110,  4114,  4115,  2767, -2394,  4117,  4725,  4120,  4129,
+    4125,  4130,  4134,  1126,  4135,  4136,  3185,  4137,  4142,  4734,
+    3186,  3187,  3188, -1913,  4736,  4138,  4738,  4157,  4174,  1785,
+    4170,  4169,  4182,  4172,  4183,  2409,  4175,  4187,  4188,  4190,
+    4193,  2797,  4191,  4194,  4195,  4201,  3273,  4208,  4211,  4213,
+    3273,  4215,  3190,  4220,  4221,  4592,  4245,  4197,  4246,  4199,
+    4229,  4252,  4253,  4254,  4265,  4875,  4281,  4268,  4272,  4277,
+    4259,  4274,  4283,  4278,  4315,  4290,  4316,  4323,  1776,  4214,
+    4284,  1777,  4269,  4332,  4328,  1778,  1779,  1780,  4333,  4203,
+     177,  4336,  4339,  3762,  4342,  1776,  4344,  4334,  1777,  4354,
+    4363,  4361,  4364,  4365,  4366,  4374,  4386,  4379,  4385,  4395,
+    1783,  3191,  4396,  4398,  4403,  4405,  1784,  4406,  4407,  4408,
+    4428,  4414,  4421,  4432,  4448,  1347,  4452,  1783,  4454,  4478,
+    4634,  4457,  4458, -2394, -2394,  4462,  4474,  4512,  4477, -2394,
+    1785,  4492,  4493,  4487,  4497,  4508,  4519,   663,  4163,  4164,
+    4165,  4166,  4526,  4533,  4023,  4535,  4538,  1785,  1348,  4536,
+    4554,  4349,  4540,  4560,  4561,  4569,  4539,  4581,  4262,  4263,
+    4559,  4566,  4564,  4266,  4267, -2394,  4666,  4247,  4570,  4583,
+    4584,  4325,  4598,  4585,   883,  4601,  4605,  4617,  4610,   738,
+    4613,   796,  4618,  4620,   801,  4622,   804,  4626,   801,  4647,
+    2969,  4637,  4645,  4660,  4681,   847, -2394,  4676,  4685,   944,
+    4686,  4688,  4699,  4285,  4286,  1349,   801,  4705,  4706,  1792,
+    4693,  3765,  2946,  4707,  2946,  2946,  4714,  4715,  2946,  4717,
+    4716,  4724,  4723,   968,  4740,  4731,  4737,  4306,  4741,   796,
+    4745,  4756,   663,  4747,   804,  1786,  4760,  4744,  1350,   796,
+    1787,  4654,  4752,   847,  4769,  4773,  4775,  3122,  4783,  4770,
+    4778,  4781, -2394,  4784,  4791,  3191,  4793, -2394,  4799,  4792,
+     801,  1788,  1789,  4800,  4827,  4831,  4808,   845,  4822,  4771,
+    4772,  4839,  4866,  1351,  4860,  4346,  1790,  4838,  3192,  3193,
+    3194,  3771,  3195,  3196,  3197,  3198,  3199,  3200,  4878,  4820,
+   -2394,  4899,  4903, -2394,  4843,  4900,  4909,  4348,   177,  3306,
+    4897,  4913,  4910,  4917,  4367,  1352,  4898,  1791,  4918,   738,
+     845,  4922,  4924,  3282,  4925,  4469,  4471,  4471,  3282,  4926,
+    1792,  3003,   738,  3282,  1109,  4923,  3282,  4430,  2218,  1439,
+    1277,   969,  3405,  1438,  4113,  3299,  2845,  1792,  4113,  4113,
+    1845,  4113,  3913,  4749,  1222,  1222,  1369,   738,   702,  2927,
+    3282,  3122,   702,  3122,  3518,  3996,  4667,  4513,  4768,  4563,
+    4036,  4565,  4320,  3282,  4548,  3348,   738,  4823,  3110,  4466,
+     738,    34,  4873,  2092,  4776,  1355,  1222,  4774,  3135,  4837,
+    3353,  4071,  1356, -2394,  4055,  4031,  2981,  2982,   738,  1357,
+    1799,  1800,  1801,  1802,  1803,  1804,  3911,  2093,  4043,  3147,
+     738,  1794,  3421,  2299,  2973,  4337,  4489,  4877,  3587,  1359,
+    3153,  4927,  4914,  4537,  3535,  4841,  3273,  1360, -2394,  3532,
+    4491,  3273,  1776,  4762,  3273,  1777,  4828,  2281,  4494,  1778,
+    1779,  1780,  3192,  3193,  3194,   679,  3195,  3196,  3197,  3198,
+    3199,  3200,  4104,   738,  4632,  2693,  4077,  4375,  1705,  4712,
+    4459,  3336,   970,  4453,  1783,  2462,  2463,   814,  4575,   738,
+    1784,  2464,  3495,  1043,   801,   801,  4851,  1715,  4916,  1250,
+    2644,  1361,  2020,  2645,  3303,  4870,  3529,  4059,  4204,  4817,
+    3845,  1943,  2411,  1818,  1785,   663,  3304,  2671,  3313,   702,
+     702,  4813,  2472,  1971,  1795,  3824,  1972,  1796,  1797,  1798,
+    4739,  1799,  1800,  1801,  1802,  1803,  1804,  3311,  4198,  2670,
+    3282, -2394,  3315,  3789,  2946,   796,  4168,  1976,  1799,  1800,
+    1801,  1802,  1803,  1804,  4180,   968,   796,  4612,  3785,  4517,
+     847,  4518,  4730,  4729,  3846,  4523,  4524,  2356,  3647,  2473,
+    1981,  1776,  3740,  4596,  1777,   801,  4451,  4815,  1778,  1779,
+    1780,  4816,  4807,  3162,  3251,  3307,  2609,  3249,     0,     0,
+     738,     0,     0,     0,  4638,  1781,     0,   801,   801,  2618,
+    2474,     0,  3282,  1783,     0,     0,     0,  4553,   177,  1784,
+       0,     0,     0,     0,   738,   738,   738,     0,   801,  1786,
+     796,  2475,     0,     0,  1787,     0,     0,     0,     0,  4662,
+       0,  4664,  2476,  1785,  4574,   177,     0,     0,     0,     0,
+       0,     0,     0,     0,     0, -2394, -2394,     0,     0,     0,
+       0,     0,  2477,     0,     0,     0,     0,  2478,     0,     0,
+    1790,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   753,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   801,     0,   801,   801,
+     753, -2394,     0,     0,     0,     0,     0,     0,     0,     0,
+    3273,     0,     0,  3364,  1792,  2479,     0,  4529,     0,     0,
+       0,  1768,  4687,     0,   845,     0,  1222,     0,     0,     0,
+    3376,     0,     0,  1229,     0,     0,  2480,     0,     0,     0,
+    1768,     0,     0,     0,     0,     0,     0,     0,  1786,     0,
+       0,     0,     0,  1787,     0,     0,  1688,  1688,     0,     0,
+       0,   738,     0,   672,     0,     0,  4576,     0,     0,  4471,
+       0,     0,     0,     0,  1788,  1789,  4668,     0,     0,     0,
+       0,     0,     0,     0,  1719,     0,     0,   738,  3282,  1790,
+    1725,     0,     0,     0,     0,  1794,     0,   203,     0,     0,
+       0,     0,     0,  1222,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3282,     0,     0,     0,     0,     0,  3448,
+    1791,  3450,     0,     0,  2481,  1776,     0,  4782,  1777,     0,
+       0,  2482,  1222,  1792,     0,     0,  1793,  2483,     0,     0,
+       0,     0,  4700,   177,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1783,     0,     0,
+    1222,  1222,  1222, -2394,  1222,     0,     0,     0,     0,  2484,
+       0,     0,  2485,     0,     0,  4641,     0,     0,     0,     0,
+    3491,     0,     0,  4787,  1222,     0,     0,  1785,  1795,     0,
+    2486,  1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,
+    1804,  4830,     0,     0,     0,  3505,     0,     0,     0,     0,
+       0,     0,     0,     0,  1794,  2487,     0,     0,     0,     0,
+       0,     0,   738,  3122,     0,  1222,     0,     0,     0,     0,
+       0,     0,     0,     0,   968,     0,     0,     0,     0,     0,
+       0,  4826,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  3766,     0,     0,  1222,  4697,     0,     0,  1222,  1222,
+       0,  4876,     0,     0,     0,     0,     0,     0,     0,   738,
+     738,  1985,     0,     0,     0,     0,     0,  3282,     0,     0,
        0,     0,     0,   814,   814,     0,     0,     0,     0,     0,
-    3116,     0,     0,     0,     0,     0,     0,  1686,  1686,     0,
-       0,     0,   738,     0,   672,     0,     0,     0,   967,     0,
+       0,   702, -2394,     0,  2797,     0,     0, -2394,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1795,     0,     0,
+    1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,
+       0,     0,  2638,     0,     0,  3640,     0,     0,  2639,   702,
+       0,     0,     0, -2394,     0,     0,     0,     0,     0,     0,
+       0,     0,   738,  2107,     0,     0,     0,     0,     0,     0,
+     738,     0,     0,   801,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  4842,   177,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   847,  1792,   738,  4856,
+     177,  4853,   181,  4854,  4855,     0,   738,     0,     0,   738,
+       0,  4896,     0,     0,     0,     0,     0,  4920,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  4887,     0,   814,
+     814,     0,     0,   738,     0,     0,  4886,     0,     0,     0,
+       0,   801,   801,   801,   801,   738,     0,     0,  3697,     0,
+    4856,  4895,  4853,   181,  4854,  4855,     0,     0,     0,   738,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  3706,
+    2231,     0,   738,     0,     0,     0,     0,     0, -2394,     0,
+       0,     0,     0,   801,   801,     0,     0,     0,     0,  4887,
+       0,     0,   801,     0,  3729,     0,     0,     0,  4886,     0,
+       0,     0,   801,     0,     0,     0,     0,     0,  4887,  4856,
+     177,  4853,   181,  4854,  4855,     0,     0,  4886,     0,     0,
+       0,   738,     0,     0,     0,     0,     0,     0,  1711,     0,
+     801,   801,   801,   801,     0,     0,     0,     0,     0,     0,
+       0,     0,   738,     0,     0,     0,     0,     0,     0,   738,
+       0,     0,  2231,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   796,     0,     0,  1776,     0,     0,  1777,   804,
+       0, -2394,     0,     0,  1222,     0,     0,     0,  1799,  1800,
+    1801,  1802,  1803,  1804,     0,     0,     0,     0,     0,     0,
+       0,     0,  1776,     0,     0,  1777,     0,  1783,     0,  1778,
+    1779,  1780,     0, -2394,     0,     0,     0,     0,     0,     0,
+       0,   796,     0,     0,     0,     0,  1781,     0,     0,     0,
+       0,   847,     0,     0,  1783,   801,     0,  1785,   801,     0,
+    1784,     0,     0,     0,     0,     0,     0,     0,   801,     0,
+       0,     0,     0,     0,     0,     0,   801,   801,     0,     0,
+       0,   738,     0,     0,  1785,     0,     0,     0,     0,     0,
+       0,     0,  1776,     0,     0,  1777,     0,     0,     0,  1778,
+    1779,  1780,     0,     0,     0,     0,  1688,     0,     0,     0,
+       0,     0,     0,   801,     0,   796,  1781,     0,     0,   738,
+     738,  4155,   801,     0,  1783,     0,     0,     0,     0,   738,
+    1784,     0,     0,     0,     0,     0,   738,     0,     0,     0,
+       0,   672,   672,     0,     0,  2471,     0,     0,     0,  1222,
+       0,  1222,     0,     0,  1785,     0,  1222,  1222,     0,     0,
+       0,     0, -2394,  1222,  1222,  1222,     0, -2394,     0,  1222,
+     847,  1222,  1222,  1222,  1222,  1222,  1222,     0,  1222,     0,
+    1222,  1222,     0,     0,  1222,     0,     0,     0,     0,  1786,
+       0,     0,     0,     0,  1787,     0,     0,     0,     0,  1222,
+    1222,  1222,  1222, -2394,     0,     0,   801,  1222,     0,     0,
+       0,  1222,     0,     0,  1222,  1788,  1789,  1222,  1222,  1222,
+    1222,  1222,  1222,  1222,  1222,  1222,     0,  1222,     0,     0,
+    1790,     0,     0,   738,  1222,     0,  1222,     0,     0,     0,
+       0,     0,     0,   738,     0,     0,  2054,  1792,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1786,
+       0,  1791,     0,     0,  1787,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1792,     0,     0,  1793,     0,  2055,
+       0,     0,  4039,     0,     0,  1788,  1789,     0,     0,     0,
+       0,     0,  2056,     0,     0,     0,     0,     0,     0,     0,
+    1790,     0,     0,     0,     0,     0,  2057,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1774,     0,     0,  1775,  1717,     0,     0,   738, -2392,
-       0,  1723,     0,     0,     0,  4465,     0,     0,     0,     0,
-       0,     0,     0,     0,  1221,     0,     0,  2060,     0,     0,
-       0,     0,     0,  1781,     0,     0,     0,     0,     0, -2392,
-       0,     0,     0,     0,     0,  3184,     0,     0,     0,     0,
-    3775,  3776,  3777,  1221,     0,     0,     0,     0,  2061,     0,
-       0,     0,  1774,  1783,     0,  1775,     0,     0,     0,  1776,
-    1777,  1778,     0,  4776,     0,     0,     0,  4914,     0,     0,
-       0,  1221,  1221,  1221,     0,  1221,  1779,     0,   203,   814,
-     814,     0,     0,     0,  1781,     0,     0,     0,     0,     0,
-    1782,     0, -2392,     0,  3185,  1221,     0,     0,     0,  1797,
-    1798,  1799,  1800,  1801,  1802,     0,     0,     0,     0,  4836,
-     177,     0,  2062,     0,  1783,     0,     0,  4149,  2063,     0,
-       0,  2064,     0,  4850,   177,  4847,   181,  4848,  4849,     0,
-    4890,     0,     0,   738,     0,     0,  1221,  4824,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2065,  4881,  1014,     0,     0,     0,     0,  2066, -2392,     0,
-    4880,     0,     0, -2392,  2067,  1221,     0,     0,     0,  1221,
-    1221,  2068,     0,  1014,  4850,  4889,  4847,   181,  4848,  4849,
-     738,   738,  1983,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2069,  4870,     0, -2392,
-       0,     0,   702,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  4881,     0,     0,     0,     0,     0,  1784,
-       0,  1371,  4880,     0,  1785,     0,     0,  1372,     0,     0,
-       0,     0,  4881,  4850,   177,  4847,   181,  4848,  4849,     0,
-     702,  4880,     0,  1790,     0,  1786,  1787,     0,     0,     0,
-       0,     0,     0,   738,  2105,     0,     0,     0,     0,     0,
-    1788,   738,     0,     0,   801,     0,     0,  1373,     0,     0,
-       0,  3186,  3187,  3188,     0,  3189,  3190,  3191,  3192,  3193,
-    3194,     0,     0,     0,     0,     0,   847,     0,   738,     0,
-       0,  1789,     0,     0,     0,     0,   738,     0,     0,   738,
-       0,     0,     0,     0,  1790,     0,     0,  1791,     0,     0,
-    4009,     0,     0,     0,     0,     0,     0,     0,  1374,     0,
-    4019,     0,     0,   738, -2392,  1375,     0,     0,  1376,     0,
-       0,   801,   801,   801,   801,   738,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   702,     0,     0,   738,
-       0,     0,     0,  1377,     0,  4040,     0,     0,     0,     0,
-    2225,     0,   738,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   801,   801,     0,     0,     0,     0,     0,
-       0,     0,   801,  2325,  1378,  1792,     0,     0,     0,     0,
-       0,     0,   801,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   738,     0,     0,     0,     0,     0, -2392,     0,     0,
-     801,   801,   801,   801,  1797,  1798,  1799,  1800,  1801,  1802,
-       0,     0,   738,     0,     0,     0,     0,  2403,  1014,   738,
-       0,  1379,  2225,  1380,     0,     0,     0,     0,     0,     0,
-       0,     0,   796,  1381,     0,     0,     0,     0,  1014,   804,
-       0,  1382,     0,     0,  1221,     0,     0,  1014,     0,     0,
-       0,  1383,     0,     0,     0,     0,     0,     0,  1793,     0,
-       0,  1794,  1795,  1796,     0,  1797,  1798,  1799,  1800,  1801,
-    1802,     0,     0,     0,     0,     0,     0,     0,  3170,     0,
-       0,   796,     0,     0,     0,  1384,     0,     0,  1385,  1386,
-       0,   847,     0,     0,     0,   801,     0,     0,   801,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   801,     0,
-       0,     0,     0,     0,     0,  1387,   801,   801,     0,     0,
-       0,   738,     0,  1014,     0,     0,     0,     0,     0,     0,
-    4157,  4158,  4159,  4160,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1686,     0,     0,     0,
-       0,     0,     0,   801,     0,   796,     0,     0,  1773,   738,
-     738,     0,   801,  1774,     0,     0,  1775,     0,     0,   738,
-    1776,  1777,  1778,     0,     0,     0,   738,     0,  1388,     0,
-       0,   672,   672,     0,     0,  2465,     0,  1779,     0,  1221,
-    1780,  1221,     0,     0,     0,  1781,  1221,  1221,     0,     0,
-       0,  1782,     0,  1221,  1221,  1221,     0,     0,     0,  1221,
-     847,  1221,  1221,  1221,  1221,  1221,  1221,     0,  1221,     0,
-    1221,  1221,     0,     0,  1221,  1783,     0,  1014,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1221,
-    1221,  1221,  1221,     0,     0,     0,   801,  1221,     0,     0,
-       0,  1221,     0,     0,  1221,     0,     0,  1221,  1221,  1221,
-    1221,  1221,  1221,  1221,  1221,  1221,     0,  1221,     0,     0,
-       0,     0,     0,   738,  1221,     0,  1221,     0,     0,     0,
-       0,     0,  3040,   738,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1346,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1784,     0,     0,     0,  1347,  1785,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1786,  1787,     0,     0,
-       0,     0,     0,     0,     0,     0,  1774,     0,     0,  1775,
-       0,  1788,     0,  1776,  1777,  1778,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1779,  1348,     0,     0,     0,     0,     0,     0,  1781,   738,
-       0,   738,  1789,  1221,  1782,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1790,     0,     0,  1791,     0,
-       0,     0,     0,     0,  1349,     0,     0,     0,  1783,     0,
-    1999,     0,     0,     0,     0,     0,     0,     0,   738,  4369,
-       0,     0,     0,     0,     0,  2673,     0,  2680,     0,     0,
-       0,     0,     0,     0,  3041,     0,     0,     0,     0,  1350,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   804,     0,     0,     0,
-       0,     0,     0,     0,     0,   672,     0,   672,     0,     0,
-       0,  1351,     0,  1999,     0,     0,  1792,     0,     0,     0,
-       0,     0,     0,     0,  1221,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   796,     0,   801,   801,     0,
-       0,     0,   796,     0,   847,     0,   801,     0,   801,  1014,
-       0,     0,   801,  1784,     0,   738,     0,     0,  1785,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   702,     0,     0,    34,     0,  1786,
-    1787,  1354,     0,     0,  2105,     0,     0,     0,  1355,     0,
-       0,  2793,     0,     0,  1788,  1356,     0,  2803,     0,     0,
-       0,     0,     0,  2091,     0,     0,   738,     0,     0,  1793,
-       0,     0,  1794,  1795,  1796,  1358,  1797,  1798,  1799,  1800,
-    1801,  1802,     0,  1359,     0,  1789,   738,     0,     0,  1014,
-    2847,  2847,     0,     0,     0,     0,     0,     0,  1790,   804,
-       0,  1791,     0,  3043,  1014,     0,  1774,     0,     0,  1775,
-       0,     0,  1999,  1776,  1777,  1778,   801,     0,     0,     0,
-       0,     0,     0,  1014,     0,     0,     0,     0,     0,     0,
-    1779,     0,     0,     0,     0,     0,     0,  1360,  1781,     0,
-       0,  3044,     0,  2910,  1782,  2913,  2915,     0,     0,  4523,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1228,     0,     0,  1783,     0,
-    1014,     0,   801,     0,     0,     0,     0,     0,     0,  1792,
-     801,     0,   801,  1014,     0,     0,     0,     0,   801,     0,
-       0,     0,     0,     0,     0,  1014,  1774,     0,  4570,  1775,
-       0,     0,  1221,  1776,  1777,  1778,     0,  1014,     0,     0,
-       0,     0,     0,     0,     0,     0,  2105,     0,     0,  2847,
-    1779,   738,     0,     0,  2998,     0,     0,   672,  1781,     0,
-       0,     0,     0,     0,  1782,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1014,     0,  2910,  1014,     0,     0,     0,  1783,     0,
-       0,     0,   801,  3024,     0,     0,     0,     0,     0,     0,
-       0,     0,  1793,  1784,     0,  1794,  1795,  1796,  1785,  1797,
-    1798,  1799,  1800,  1801,  1802,     0,  1221,     0,     0,     0,
-       0,     0,  3220,     0,     0,     0,     0,     0,     0,  1786,
-    1787,  3068,     0,     0,     0,     0,     0,  4635,     0,     0,
-       0,     0,     0,     0,  1788,     0,   801,     0,   801,  2847,
-     801,  2847,  1774,     0,     0,  1775,     0,     0,     0,  1776,
-    1777,  1778,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1221,  1789,  1779,     0,     0,     0,
-       0,     0,     0,     0,  1781,     0,     0,  1686,  1790,     0,
-    1782,  1791,     0,  1784,     0,     0,     0,     0,  1785,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1014,  1783,     0,     0,  4691,     0,  1786,
-    1787,     0,     0,     0,     0,     0,     0,     0,  1774,   738,
-       0,  1775,     0,     0,  1788,  1776,  1777,  1778,     0,   796,
-       0,     0,     0,     0,     0,   796,     0,     0,     0,     0,
-       0,  2624,  1779,     0,     0,     0,   801,     0,     0,     0,
-    1781,     0,     0,  1221,     0,  1789,  1782,     0,  1221,  1792,
-       0,     0,     0,     0,     0,     0,     0,     0,  1790,     0,
+       0,     0,     0,     0,     0,     0,     0,     0, -2394,     0,
        0,  1791,     0,     0,     0,     0,     0,     0,     0,     0,
-    1783,  1221,  1221,  1221,     0,     0,  1221,     0,     0,     0,
-       0,     0,     0,     0,  1221,  1221,  1221,  1221,     0,     0,
-       0,     0,  1371,     0,     0,     0,     0,  1221,  1372,  1784,
-    1221,     0,  1221,     0,  1785,     0,     0,     0,     0,     0,
-       0,     0,     0,  1221,  1221,     0,     0,  1221,     0,     0,
-       0,     0,     0,     0,     0,  1786,  1787,     0,     0,   847,
-       0,  1221,     0,  1221,     0,  1221,     0,     0,  1373,  1792,
-    1788,     0,  1793,     0,     0,  1794,  1795,  1796,     0,  1797,
-    1798,  1799,  1800,  1801,  1802,  1221,     0,  3820,     0,   738,
-       0,     0,     0,     0,     0,     0,  3277,     0,  1221,  1221,
-    1221,  1789,     0,     0,     0,  1784,     0,     0,     0,     0,
-    1785,     0,     0,     0,  1790,     0,  1221,  1791,     0,  1374,
-       0,     0,     0,     0,     0,     0,  1375,     0,  1221,  1376,
-       0,  1786,  1787,  1221,     0,     0,     0,  2683,     0,  1221,
-       0,  1999,  2689,     0,     0,     0,  1788,     0,     0,  3277,
-       0,     0,  3315,     0,  1377,  3318,     0,  2680,     0,     0,
-       0,     0,  1793,     0,     0,  1794,  1795,  1796,     0,  1797,
-    1798,  1799,  1800,  1801,  1802,     0,     0,  1789,     0,  2548,
-    1371,     0,     0,     0,     0,  1378,  1372,     0,     0,     0,
-    1790,     0,     0,  1791,     0,  1792,     0,     0,     0,  1221,
-       0,  2847,     0,     0,  1014,     0,  1686,     0,     0,     0,
-       0,  1417,     0,     0,     0,     0,  1014,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1373,     0,     0,     0,
-       0,     0,   801,     0,   801,   801,   801,     0,     0,     0,
-       0,     0,  1379,     0,  1380,     0,     0,     0,     0,     0,
-       0,     0,     0,  1014,  1381,     0,     0,     0,     0,  1418,
-       0,     0,  1382,     0,     0,     0,     0,     0,     0,     0,
-       0,  1792,  1383,     0,     0,     0,     0,  1374,     0,     0,
-       0,     0,     0,     0,  1375,     0,     0,  1376,  1793,     0,
-       0,  1794,  1795,  1796,     0,  1797,  1798,  1799,  1800,  1801,
-    1802,     0,     0,     0,     0,  3527,  1441,     0,     0,  1385,
-    1386,     0,  1377,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1442,   738,     0,     0,
-    1419,     0,     0,  1378,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1774,     0,     0,  1775,     0,     0,     0,
-    1776,  1777,  1778,     0,  1793,     0,     0,  1794,  1795,  1796,
-       0,  1797,  1798,  1799,  1800,  1801,  1802,  1779,     0,     0,
-       0,  3692,     0,     0,     0,  1781,     0,     0,  1420,     0,
-    1421,  1782,     0,     0,     0,     0,     0,     0,     0,  1388,
-    1422,     0,  1380,     0,     0,     0,     0,     0,  1014,     0,
-       0,     0,  1381,     0,     0,  1783,     0,     0,     0,   801,
-    1382,     0,     0,     0,     0,     0,  2847,  2847,     0,  1423,
-    1383,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1774,     0,     0,  1775,     0,     0,     0,  1776,
-    1777,  1778,     0,     0,     0,     0,     0,     0,     0,     0,
-     738,   738,     0,     0,  1424,     0,  1779,  1385,  1386,  1425,
-       0,     0,     0,     0,  1781,     0,   738,     0,  1999,     0,
-    1782,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1686,   738,     0,  1426,     0,     0,     0,     0,     0,
-    1686,   738,   738,     0,  1783,     0,     0,     0,  1427,     0,
-       0,     0,     0,     0,     0,     0,     0,   586,   738,     0,
-    1784,     0,     0,   631,     0,  1785,     0,     0,     0,     0,
-       0,     0,     0,   682,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1786,  1787,     0,     0,
-       0,  1774,   750,   750,  1775,     0,     0,  1388, -2392, -2392,
-   -2392,  1788,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   801,     0,   801,     0,     0,     0,   801,     0,     0,
-       0,     0,     0,  1781,     0,     0,     0,     0,     0,  1782,
-       0,     0,  1789,   796,     0,     0,  1014,     0,     0,     0,
-       0,     0,     0,   738,     0,  1790,     0,     0,  1791,  1784,
-       0,     0,     0,  1783,  1785,     0,     0,  1014,     0,   738,
-       0,     0,     0,     0,     0,     0,     0,     0,  1014,     0,
-       0,   801,     0,     0,     0,  1786,  1787,     0,  1221,     0,
-       0,     0,     0,     0,     0,     0,     0,  1221,     0,     0,
-    1788,     0,     0,  1221,     0,  1221,     0,     0,  1221,     0,
-       0,     0,     0,  1221,  1221,  1221,  1221,     0,     0,  1221,
-    1221,  1221,  1221,  1221,  1221,  1221,  1221,  1221,  1221,     0,
-       0,  1789,  1221,  1221,     0,     0,  1792,     0,     0,     0,
-       0,     0,  1221,     0,  1790,     0,  1221,  1791,   809,     0,
-    1221,     0,     0,     0,     0,     0,   849,     0,  1221,   853,
-     854,  1221,   857,  1221,     0,   863,     0,   865,  1784,     0,
-       0,     0,  1221,  1785,     0,  1221,  1221,     0,     0,     0,
-    1221,  1221,     0,     0,     0,  3767,     0,  1221,     0,     0,
-       0,     0,     0,     0,   738,   738,   738,   796,     0,  3277,
-    3787,     0,     0,     0,  3787,  3801,     0,     0,     0,  1788,
-       0,  1221,     0,  2624,  2624,  2624,     0,  1221,  1221,  1221,
-       0,     0,     0,     0,     0,  1792,     0,     0,     0,  1793,
-       0,     0,  1794,  1795,  1796,     0,  1797,  1798,  1799,  1800,
-    1801,  1802,     0,  1221,     0,     0,  3743,     0,     0,     0,
-       0,     0,     0,  1790,  2680,     0,  1221,     0,     0,     0,
-       0,     0,  1371,     0,     0,     0,     0,     0,  1372,     0,
-       0,     0,     0,     0,     0,     0,     0,  3859,  1686,  1686,
-    1999,  2225,     0,  2689,     0,  2689,     0,     0,     0,     0,
-    1999,     0,     0,     0,     0,     0,     0,     0,     0,   801,
-     801,   801,   801,     0,     0,     0,     0,     0,  1373,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1793,     0,
-       0,  1794,  1795,  1796,     0,  1797,  1798,  1799,  1800,  1801,
-    1802,     0,     0,     0,  1792,  3826,     0,     0,  3903,     0,
-       0,  1014,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1014,  1374,
-       0,     0,     0,     0,     0,     0,  1375,     0,  1371,  1376,
-       0,     0,     0,     0,  1372,     0,     0,     0,     0,     0,
-       0,     0,  1999,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1377,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1373,     0,     0,     0,     0,     0,
-       0,     0,     0,  3976,     0,  1378,     0,  1793,     0,     0,
-   -2392, -2392, -2392,     0,  1797,  1798,  1799,  1800,  1801,  1802,
-       0,     0,     0,     0,     0,     0,     0,  1014,     0,  1014,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   738,  1374,   801,     0,  1221,     0,
-       0,     0,  1375,     0,   738,  1376,     0,     0,     0,     0,
-    4024,     0,  1379,     0,  1380,     0,     0,     0,     0,  2105,
-       0,     0,     0,     0,  1381,     0,     0,     0,     0,     0,
-    1377,     0,  1382,     0,     0,   918,     0,     0,  1014,   738,
-       0,     0,  1383,   926,     0,     0,     0,     0,     0,  2910,
-     939,     0,     0,   944,   945,     0,     0,  4058,   947,     0,
-       0,  1378,     0,  1014,     0,     0,     0,   738,     0,   964,
-       0,  2225,     0,     0,     0,  1221,  1221,     0,     0,  1385,
-    1386,     0,     0,   972,     0,     0,     0,  2689,     0,     0,
-       0,     0,     0,     0,  2689,     0,     0,     0,  1032,     0,
-    1036,     0,     0,  1038,     0,  1040,  1387,     0,  1044,  2847,
-       0,  2847,     0,     0,     0,     0,     0,     0,  1379,     0,
-    1380,   738,     0,     0,     0,  1774,     0,     0,  1775,     0,
-    1381,     0,  1776,  1777,  1778,     0,     0,     0,  1382,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1383,  1779,
-       0,  1221,  1014,     0,     0,     0,     0,  1781,     0,     0,
-       0,     0,  1221,  1782,     0,     0,     0,     0,     0,  1388,
-    2689,     0,  1371,     0,     0,     0,  1107,     0,  1372,     0,
-       0,     0,  1467,  1014,     0,  1385,  1386,  1783,     0,     0,
-       0,     0,  1221,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1221,  1221,     0,     0,     0,     0,     0,  1221,
-    1221,     0,  1468,     0,  1221,     0,     0,     0,  1373,  1221,
-       0,     0,  1221,  1221,     0,     0,     0,  1221,  4154,     0,
-       0,   750,     0,  1221,   738,   738,   738,   738,     0,     0,
-       0,  3787,  3801,  1371,  3787,     0,     0,  4165,     0,  1372,
-       0,  3277,     0,     0,     0,  3277,     0,     0,     0,     0,
-       0,  4180,     0,     0,     0,     0,     0,  1221,     0,  1374,
-       0,     0,  1221,     0,  1774,  1388,  1375,  1775,  1221,  1376,
-       0,  1776,  1777,  1778,     0,   847,  1014,     0,     0,  1373,
-       0,  1337,  1784,  1221,     0,     0,  3315,  1785,  1779,     0,
-       0,  2680,     0,     0,  1377,     0,  1781,  1014,     0,     0,
-       0,     0,  1782,     0,   672,     0,     0,  1221,  1786,  1787,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1014,  1788,     0,  1378,  1783,  2847,  2847,     0,
-    1374,     0,     0,     0,     0,     0,     0,  1375,     0,     0,
-    1376,     0,     0,     0,     0,     0,  1470,     0,     0,     0,
-       0,     0,  4242,     0,  1789,     0,  1014,     0,     0,     0,
-       0,  1482,     0,     0,     0,  1377,     0,  1790,     0,     0,
-    1791,     0,     0,  1493,     0,  1494,     0,     0,     0,     0,
-       0,     0,  1379,  1497,  1380,     0,     0,     0,     0,  1221,
-       0,     0,     0,     0,  1381,  1512,  1378,     0,  1516,     0,
-       0,     0,  1382,     0,  2624,     0,     0,     0,     0,   801,
-       0,     0,  1383,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1792,  2058,     0,  1793,     0,     0,
+       0,     0,     0,     0,     0,  1794,  2059,     0,     0,   738,
+       0,   738,     0,  1222,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2060,     0,     0,     0,
+    1776,  2061,     0,  1777,     0,     0,     0,  1778,  1779,  1780,
+       0,     0,     0,     0,     0,     0,     0,     0,   738,     0,
+       0,     0,     0,     0,  1781,  2679,     0,  2686,     0,     0,
+       0,     0,  1783,     0,     0,     0,     0,     0,  1784,     0,
+       0, -2394,     0,     0,     0,  1794,     0,     0,  1799,  1800,
+    1801,  1802,  1803,  1804,     0,     0,   804,     0,     0,     0,
+       0,     0,  1785,     0,     0,   672,     0,   672,  1795,     0,
+    2062,  1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,
+    1804,     0,     0,     0,  1222,     0,     0,     0,  3176,     0,
+       0,     0,  1711,     0,     0,   796,     0,   801,   801,     0,
+       0,  2063,   796,     0,   847,     0,   801,     0,   801,     0,
+       0,     0,   801,     0,     0,   738,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   203,     0,     0,   702,     0,     0,     0,  1795,     0,
+       0,  1796,  1797,  1798,  2107,  1799,  1800,  1801,  1802,  1803,
+    1804,  2799,     0,     0,     0,     0,     0,  2809,  3226,     0,
+       0,     0,     0,     0,     0,  2064,   738,  1786,     0,     0,
+       0,  2065,  1787,     0,  2066,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   738,     0,     0,
+       0,  2853,  2853,  1788,  1789,     0,     0,     0,     0,     0,
+     804,   702,     0,  2067,     0,     0,     0,     0,  1790,     0,
+    2068,     0,  4233,     0,     0,     0,     0,  2069,   801,     0,
+       0,     0,     0,     0,  2070,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3046,     0,     0,     0,  1791,
+       0,  4249,     0,     0,     0,  2916,     0,  2919,  2921,  2071,
+       0,     0,  1792,     0,  1347,  1793,     0,     0,     0,     0,
+       0,  4264,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   801,     0,     0,     0,
+       0,     0,     0,     0,   801,     0,   801,  1348,     0,     0,
+       0,     0,   801,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1222,     0,     0,     0,
+       0,     0,     0,     0,     0,  4287,     0,     0,     0,     0,
+    2107,     0,     0,  2853,     0,   738,     0,     0,  3004,     0,
+       0,   672,     0,  1794,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1349,     0,  1775,     0,     0,     0,
+       0,  1776,     0,     0,  1777,     0,     0,  2916,  1778,  1779,
+    1780,     0,     0,     0,     0,     0,   801,  3030,     0,     0,
+       0,     0,     0,     0,     0,  1781,     0,  1350,  1782,     0,
+       0,     0,     0,  1783,     0,     0,     0,     0,     0,  1784,
+    1222,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3074,     0,  3047,     0,     0,
+       0,     0,  1351,  1785,     0,     0,     0,  4373,     0,     0,
+     801,  -127,   801,  2853,   801,  2853,  1795,     0,     0,  1796,
+    1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,     1,
+       0,     0,     0,  2554,  1352,     0,     0,     0,  1222,     2,
+       0,     3,     4,     0,     0,     0,     0,     0,     0,     0,
+       0,  1688,     0,  1711,     0,     0,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     6,     0,     7,     8,
+       0,     0,     0,     0,     9,     0,    10,     0,     0,     0,
+       0,     0,     0,   738,     0,     0,     0,    11,     0,    12,
+      34,     0,     0,   796,  1355,     0,     0,     0,  1786,   796,
+       0,  1356,     0,  1787,     0,     0,    13,     0,  1357,    14,
+     801,     0,     0,     0,     0,     0,  2093,  1222,     0,     0,
+       0,    15,  1222,    16,  1788,  1789,     0,    17,  1359,     0,
+       0,     0,     0,    18,     0,     0,  1360,     0,     0,  1790,
+       0,    19,     0,    20,     0,  1222,  1222,  1222,     0,    21,
+    1222,     0,     0,     0,     0,     0,  3049,     0,  1222,  1222,
+    1222,  1222,     0,     0,    22,     0,     0,     0,     0,     0,
+    1791,  1222,     0,     0,  1222,     0,  1222,     0,     0,     0,
+      23,     0,     0,  1792,     0,     0,  1793,  1222,  1222,     0,
+    1361,  1222,     0,     0,  3050,  3628,     0,     0,     0,     0,
+       0,     0,     0,   847,     0,  1222,     0,  1222,     0,  1222,
+    1372,     0,     0,     0,     0,     0,  1373,     0,     0,    24,
+      25,     0,     0,     0,     0,    26,     0,     0,     0,  1222,
+       0,     0,     0,   738,     0,     0,    27,     0,     0,     0,
+    3283,  1419,  1222,  1222,  1222,     0,     0,    28,     0,     0,
+    1776,     0,     0,  1777,     0,     0,  1374,  1778,  1779,  1780,
+    1222,     0,     0,     0,  1794,     0,     0,     0,     0,     0,
+       0,     0,  1222,     0,  1781,     0,     0,  1222,     0,     0,
+       0,     0,  1783,  1222,     0,     0,    29,     0,  1784,  1420,
+       0,     0,     0,  3283,     0,     0,  3321,     0,    30,  3324,
+       0,  2686,     0,    31,    32,     0,    33,  1375,     0,     0,
+    1711,    34,  1785,     0,  1376,     0,    35,  1377,     0,    36,
+       0,     0,     0,     0,    37,     0,     0,     0,     0,    38,
+      39,     0,     0,     0,     0,     0,     0,    40,     0,     0,
+       0,    41,  1378,  1222,     0,  2853,     0,     0,  3491,     0,
+    1688,    42,     0,     0,     0,     0,     0,  1795,     0,     0,
+    1796,  1797,  1798,    43,  1799,  1800,  1801,  1802,  1803,  1804,
+    1421,     0,     0,  1379,     0,     0,   801,     0,   801,   801,
+     801,  3046,    44,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    45,     0,     0,     0,     0,     0,    46,     0,
+    1347,     0,  1711,    47,     0,     0,  1711,  1711,     0,  1372,
+       0,     0,     0,     0,     0,  1373,    48,  1786,  1422,     0,
+    1423,     0,  1787,     0,     0,     0,     0,     0,     0,     0,
+    1424,     0,  1381,  1348,     0,     0,     0,    49,     0,     0,
+       0,     0,  1382,  1788,  1789,     0,     0,     0,     0,     0,
+    1383,    50,     0,     0,  -127,  1374,     0,     0,  1790,  1425,
+    1384,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   738,     0,     0,     0,     0,     0,     0,     0,  1791,
+    1349,     0,     0,     0,  1426,  4713,     0,  1386,  1387,  1427,
+       0,     0,  1792,     0,     0,  1793,  1375,     0,     0,     0,
+       0,     0,     0,  1376,     0,     0,  1377,     0,     0,     0,
+       0,     0,     0,  1350,  1428,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1429,     0,
+       0,  1378,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3047,     0,     0,     0,     0,  1351,     0,
        0,     0,     0,   801,     0,     0,     0,     0,     0,     0,
-       0,  1784,     0,  1561,     0,     0,  1785,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2073,  1999,  1792,  1385,
-    1386,     0,     0,  1379,     0,  1380,     0,  1786,  1787,     0,
-       0,     0,     0,  1221,  1371,  1381,     0,     0,     0,     0,
-    1372,     0,  1788,  1382,   796,     0,  2074,     0,     0,  2105,
-       0,     0,     0,  1383,     0,     0,     0,  1686,     0,     0,
-       0,     0,     0,     0,     0,  1417,     0,     0,     0,     0,
-       0,     0,     0,  1789,   801,  3024,     0,     0,     0,     0,
-    1373,     0,     0,     0,     0,     0,  1790,  2144,     0,  1791,
-    1385,  1386,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   738,     0,     0,     0,     0,     0,  1388,
-       0,  1793,  2689,  1418,  1794,  1795,  1796,  2145,  1797,  1798,
-    1799,  1800,  1801,  1802,     0,     0,     0,     0,  3853,     0,
-       0,  1374,     0,     0,     0,     0,     0,  1704,  1375,     0,
-       0,  1376,  1221,     0,     0,     0,     0,     0,     0,     0,
-       0,  1221,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1377,  1792,  1221,  1221,
-       0,     0,  1221,     0,     0,     0,     0,     0,     0,     0,
-    1388,     0,     0,     0,     0,     0,   796,  3787,     0,     0,
-       0,  3277,     0,     0,  1419,     0,  3277,  1378,     0,  3277,
-     796,     0,  2910,     0,  4428,     0,     0,  1221,  1221,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  3859,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  3859,   847,   801,   801,
-     801,     0,  1420,     0,  1421,     0,     0,     0,     0,     0,
-    1014,     0,     0,     0,  1422,     0,  1380,     0,     0,     0,
-    1793,     0,     0,  1794,  1795,  1796,  1381,  1797,  1798,  1799,
-    1800,  1801,  1802,     0,  1382,     0,     0,  4115,     0,   796,
-     847,     0,     0,  1423,  1383,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1999,
-       0,     0,     0,     0,     0,     0,  1371,     0,     0,     0,
-       0,     0,  1372,     0,     0,   750,  1943,     0,  2872,     0,
-       0,  1385,  1386,  1425,     0,     0,  1686,  1686,     0,     0,
-     796,     0,     0,   738,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  4024,     0,     0,     0,     0,  2873,   738,
-       0,  2847,  1373,     0,     0,     0,     0,  2105,     0,     0,
-    1774,     0,  1427,  1775,     0,     0,     0,  1776,  1777,  1778,
-    4058,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   801,   738,  3859,  1779,     0,     0,  2071,     0,     0,
-       0,     0,  1781,     0,     0,     0,     0,     0,  1782,     0,
+    2853,  2853,  1379,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1794,     0,     0,  1776,  1389,     0,  1777,
+    1352,     0,     0,  1778,  1779,  1780,     0,     0,     0,     0,
+       0,     0,     0,     0,   738,   738,     0,     0,     0,     0,
+    1781,     0,     0,     0,     0,     0,     0,     0,  1783,     0,
+     738,     0,     0,     0,  1784,     0,     0,     0,     0,  1380,
+       0,  1381,     0,     0,     0,  1688,   738,     0,     0,     0,
+       0,  1382,     0,     0,  1688,   738,   738,     0,  1785,  1383,
+       0,     0,     0,     0,     0,     0,    34,     0,     0,  1384,
+    3048,     0,   738,     0,     0,     0,     0,  1356,     0,     0,
+       0,     0,     0,     0,  1357,     0,  1795,     0,     0,  1796,
+    1797,  1798,  2093,  1799,  1800,  1801,  1802,  1803,  1804,     0,
+       0,     0,  1776,  3533,  1359,  1777,  1386,  1387,     0,  1778,
+    1779,  1780,  1360,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   801,  1781,   801,     0,     0,
+       0,   801,  3049,  1388,  1783,  3046,     0,     0,     0,     0,
+    1784,     0,     0,     0,     0,     0,     0,   796,     0,     0,
+       0,     0,     0,     0,  1347,     0,     0,   738,     0,     0,
+       0,     0,     0,  1786,  1785,     0,  1361,     0,  1787,     0,
+    3050,     0,     0,   738,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   801,     0,  1348,     0,  1788,
+    1789,     0,  1222,     0,     0,     0,  1389,     0,     0,     0,
+       0,  1222,     0,     0,  1790,     0,     0,  1222,     0,  1222,
+       0,     0,  1222,     0,     0,     0,     0,  1222,  1222,  1222,
+    1222,     0,     0,  1222,  1222,  1222,  1222,  1222,  1222,  1222,
+    1222,  1222,  1222,     0,     0,  1791,  1222,  1222,     0,     0,
+       0,     0,     0,     0,  1349,     0,  1222,     0,  1792,     0,
+    1222,  1793,     0,     0,  1222,     0,     0,     0,     0,     0,
+       0,     0,  1222,     0,     0,  1222,     0,  1222,     0,  1786,
+       0,     0,     0,     0,  1787,     0,  1222,  1350,     0,  1222,
+    1222,     0,     0,     0,  1222,  1222,     0,     0,     0,  3773,
+       0,  1222,     0,     0,     0,  1788,  1789,     0,   738,   738,
+     738,   796,     0,  3283,  3793,     0,     0,  3047,  3793,  3807,
+    1790,  1776,  1351,     0,  1777,  1222,     0,     0,  1778,  1779,
+    1780,  1222,  1222,  1222,     0,     0,     0,     0,     0,  1794,
+       0,     0,     0,     0,     0,  1781,     0,     0,     0,     0,
+       0,  1791,     0,  1783,  1352,     0,     0,  1222,     0,  1784,
+       0,     0,     0,     0,  1792,     0,     0,  1793,  2686,     0,
+    1222,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1785,     0,     0,     0,     0,     0,     0,
+       0,  3865,  1688,  1688,     0,  2231,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   586,   801,   801,   801,   801,     0,   631,     0,
+      34,     0,     0,     0,  1355,     0,     0,     0,   682,     0,
+       0,  1356,  1795,     0,     0,  1796,  1797,  1798,  1357,  1799,
+    1800,  1801,  1802,  1803,  1804,  1794,  2093,   750,   750,  3698,
+       0,     0,  3909,     0,     0,     0,     0,     0,  1359,     0,
+       0,     0,     0,     0,     0,     0,  1360,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  3049,     0,  1786,     0,
+       0,     0,     0,  1787,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1788,  1789,     0,     0,     0,     0,
+    1361,     0,     0,     0,  3050,     0,     0,     0,     0,  1790,
+       0,     0,     0,     0,     0,     0,     0,  3982,  1795,     0,
+       0,  1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,
+    1804,     0,     0,     0,     0,  3749,     0,     0,     0,     0,
+    1791,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1792,     0,     0,  1793,     0,   738,   187,
+     801,     0,  1222,     0,     0,     0,     0,     0,   738,     0,
+       0,     0,     0,   809,  4030,     0,     0,     0,     0,     0,
+       0,   849,     0,  2107,   853,   854,     0,   857,  1776,     0,
+     863,  1777,   865,     0,     0,  1778,  1779,  1780,     0,     0,
+       0,     0,     0,   738,     0,   188,     0,     0,     0,     0,
+       0,     0,  1781,  2916,     0,     0,     0,     0,     0,   189,
+    1783,  4064,     0,     0,     0,     0,  1784,     0,     0,     0,
+       0,   738,     0,     0,  1794,  2231,     0,   190,     0,  1222,
+    1222,     0,     0,   191,     0,     0,     0,     0,     0,     0,
+    1785,     0,     0,     0,  1776,     0,     0,  1777,   192,     0,
+       0,  1778,  1779,  1780,     0,     0,     0,     0,     0,   193,
+       0,     0,     0,  2853,     0,  2853,     0,   194,  1781,     0,
+       0,     0,     0,     0,     0,   738,  1783,     0,     0,   195,
+       0,     0,  1784,     0,   196,     0,     0,     0,     0,     0,
+     197,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1222,  1785,   198,     0,     0,
+       0,     0,     0,     0,     0,     0,  1222,  1795,     0,     0,
+    1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,
+       0,     0,   199,     0,  3832,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1786,  1222,     0,     0,     0,
+    1787,     0,     0,   200,     0,     0,  1222,  1222,     0,     0,
+       0,     0,     0,  1222,  1222,     0,     0,     0,  1222,     0,
+       0,  1788,  1789,  1222,     0,     0,  1222,  1222,     0,     0,
+       0,  1222,  4160,     0,   201,     0,  1790,  1222,   738,   738,
+     738,   738,     0,     0,     0,  3793,  3807,     0,  3793,     0,
+       0,  4171,     0,     0,   202,  3283,     0,     0,     0,  3283,
+       0,  1786,     0,     0,   203,  4186,  1787,  1791,     0,     0,
+       0,  1222,     0,     0,     0,     0,  1222,     0,     0,     0,
+    1792,     0,  1222,  1793,     0,     0,     0,  1788,  1789,   847,
+       0,   204,     0,     0,     0,     0,   205,  1222,   206,     0,
+    3321,     0,  1790,     0,   207,  2686,     0,   208,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   672,     0,
+       0,  1222,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1791,     0,   209,   210,     0,     0,   211,
+       0,  2853,  2853,   212,     0,     0,  1792,     0,     0,  1793,
+       0,     0,   213,     0,     0,     0,     0,   214,     0,     0,
+       0,  1794,     0,     0,     0,     0,  4248,     0,     0,   215,
+     919,     0,     0,     0,     0,     0,     0,     0,   927,     0,
+       0,     0,   216,     0,     0,   940,     0,     0,   945,   946,
+       0,     0,     0,   948,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1222,   965,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1776,   973,     0,
+    1777,     0,     0,   801,  1778,  1779,  1780,  1794,     0,     0,
+       0,     0,     0,  1033,     0,  1037,     0,   801,  1039,     0,
+    1041,  1781,     0,  1045,     0,     0,     0,     0,     0,  1783,
+       0,     0,     0,     0,  1795,  1784,     0,  1796,  1797,  1798,
+       0,  1799,  1800,  1801,  1802,  1803,  1804,     0,     0,     0,
+       0,  3859,     0,     0,     0,     0,     0,  1222,     0,  1785,
+       0,     0,     0,     0,     0,     0,     0,     0,   796,     0,
+       0,     0,     0,  2107,     0,     0,     0,     0,     0,     0,
+       0,  1688,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1108,     0,     0,     0,     0,     0,     0,   801,  3030,
+    1795,     0,     0,  1796,  1797,  1798,     0,  1799,  1800,  1801,
+    1802,  1803,  1804,     0,     0,     0,     0,  4121,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   738,     0,     0,
+       0,     0,     0,  1776,     0,     0,  1777,     0,     0,     0,
+    1778,  1779,  1780,     0,     0,     0,   750,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1781,     0,     0,
+       0,     0,     0,     0,  1786,  1783,  1222,     0,     0,  1787,
+       0,  1784,     0,     0,     0,  1222,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1788,  1789,  1222,  1222,     0,  1785,  1222,     0,     0,     0,
+       0,     0,     0,     0,     0,  1790,  1338,     0,     0,     0,
+     796,  3793,     0,     0,     0,  3283,     0,     0,     0,     0,
+    3283,     0,     0,  3283,   796,     0,  2916,     0,  4434,     0,
+       0,  1222,  1222,     0,     0,     0,  1791,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  3865,     0,  1792,
+       0,     0,  1793,     0,     0,     0,     0,     0,     0,     0,
+    3865,   847,   801,   801,   801,     0,     0,     0,     0,     0,
+    1776,     0,  1472,  1777,     0,     0,     0,  1778,  1779,  1780,
+       0,     0,     0,     0,     0,     0,     0,  1484,     0,     0,
+       0,     0,     0,     0,  1781,     0,     0,     0,     0,  1495,
+    1786,  1496,  1783,   796,   847,  1787,     0,     0,  1784,  1499,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1514,     0,     0,  1518,     0,  1788,  1789,     0,     0,
+    1794,     0,  1785,     0,     0,     0,     0,     0,     0,     0,
+       0,  1790,     0,     0,     0,     0,     0,     0,     0,     0,
+    1688,  1688,     0,     0,   796,     0,     0,   738,     0,  1563,
+       0,     0,     0,     0,     0,     0,     0,  4030,     0,     0,
+       0,     0,  1791,   738,     0,  2853,     0,     0,     0,     0,
+       0,  2107,     0,     0,  1776,  1792,     0,  1777,  1793,     0,
+       0,  1778,  1779,  1780,  4064,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   801,   738,  3865,  1781,     0,
+       0,     0,     0,     0,     0,     0,  1783,     0,     0,     0,
+       0,     0,  1784,  1795,     0,     0,  1796,  1797,  1798,     0,
+    1799,  1800,  1801,  1802,  1803,  1804,  1222,  1786,     0,  1222,
+    4156,  1222,  1787,     0,     0,     0,  1785,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1788,  1789,  1222,  1794,     0,     0,  3283,
+       0,     0,     0,  4434,     0,     0,     0,     0,  1790,     0,
+    1222,     0,     0,     0,     0,     0,     0,     0,     0,  4625,
+       0,     0,     0,  1706,     0,     0,     0,     0,     0,  1222,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1791,
+       0,   801,     0,     0,     0,   738,     0,     0,     0,     0,
+       0,     0,  1792,     0,     0,  1793,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1222,     0,
+       0,     0,     0,     0,     0,   801,   801,   801,   801,     0,
+       0,  1786,     0,     0,     0,     0,  1787,     0,     0,  1795,
+    1688,     0,  1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,
+    1803,  1804,     0,     0,     0,     0,  4393,  1788,  1789,   796,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1790,     0,     0,   738,     0,     0,     0,     0,
+    1222,     0,     0,  1794,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1791,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1792,     0,     0,  1793,
+       0,     0,  1222,     0,     0,   796,     0,     0,     0,     0,
+       0,     0,     0,     0,  1222,     0,     0,     0,     0,  1222,
+       0,  1222,     0,  1222,     0,     0,     0,     0,     0,     0,
+    3865,   750,  1945,     0,     0,     0,   801,     0,   847,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1222,     0,
+       0,     0,     0,     0,     0,     0,  1795,     0,     0,  1796,
+    1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,     0,
+       0,     0,     0,  4404,     0,     0,     0,  1794,  1776,     0,
+       0,  1777,     0,     0,     0,  1778,  1779,  1780,     0,     0,
+       0,     0,     0,     0,   801,     0,     0,     0,  1776,     0,
+     796,  1777,  1781,  2073,     0,  1778,  1779,  1780,     0,     0,
+    1783,     0,     0,     0,     0,     0,  1784,     0,     0,     0,
+       0,     0,  1781,     0,     0,     0,     0,  1222,  1222,     0,
+    1783,     0,  2916,     0,     0,     0,  1784,     0,  1222,     0,
+    1785,  4625,     0,     0,     0,  2686,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   796,     0,
+    1785,     0,     0,     0,     0,  2157,     0,     0,   801,     0,
+    1795,     0,     0,  1796,  1797,  1798,     0,  1799,  1800,  1801,
+    1802,  1803,  1804,     0,     0,     0,  2107,  4413,     0,     0,
+       0,     0,     0,     0,  3865,     0,     0,     0,     0,     0,
+     796,   796,  1222,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1372,     0,     0,     0,  1776,     0,  1373,  1777,
+       0,  1222,     0,  1778,  1779,  1780,     0,     0,   801,     0,
+       0,     0,     0,     0,     0,  1776,     0,     0,  1777,     0,
+    1781,     0,  1778,  1779,  1780,  1786,     0,     0,  1783,     0,
+    1787,     0,     0,     0,  1784,     0,     0,     0,  1374,  1781,
+       0,     0,     0,     0,     0,  1786,     0,  1783,     0,     0,
+    1787,  1788,  1789,  1784,     0,     0,     0,     0,  1785,     0,
+    2277,     0,     0,     0,     0,     0,  1790,     0,     0,     0,
+       0,  1788,  1789,     0,     0,     0,     0,  1785,     0,     0,
+    1222,  1222,     0,     0,     0,     0,  1790,     0,     0,  1375,
+       0,     0,     0,     0,   796,     0,  1376,  1791,     0,  1377,
+       0,     0,     0,     0,     0,     0,   796,   796,     0,     0,
+    1792,     0,     0,  1793,     0,     0,     0,  1791,     0,     0,
+       0,     0,     0,     0,  1378,     0,     0,     0,     0,     0,
+    1792,     0,     0,  1793,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1379,     0,     0,  2374,     0,
+       0,     0,     0,  1786,     0,     0,     0,     0,  1787,     0,
+       0,     0,  2388,     0,     0,  2391,     0,  2393,     0,  2394,
+       0,     0,  1786,     0,     0,  2396,     0,  1787,     0,  1788,
+    1789,  1794,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1790,     0,     0,     0,  1788,  1789,
+       0,  1794,  1380,     0,  1381,     0,     0,     0,     0,     0,
+       0,     0,     0,  1790,  1382,     0,     0,     0,     0,     0,
+    1945,     0,  1383,     0,  1945,  1791,  1945,     0,     0,  1945,
+       0,     0,  1384,     0,     0,     0,     0,     0,  1792,     0,
+       0,  1793,     0,     0,  1791,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1792,     0,     0,
+    1793,     0,     0,     0,     0,     0,  1443,     0,     0,  1386,
+    1387,     0,     0,     0,  1795,     0,     0,  1796,  1797,  1798,
+       0,  1799,  1800,  1801,  1802,  1803,  1804,     0,     0,     0,
+       0,  4416,     0,     0,  1795,     0,  1444,  1796,  1797,  1798,
+       0,  1799,  1800,  1801,  1802,  1803,  1804,     0,     0,     0,
+       0,  4464,     0,     0,     0,     0,     0,     0,     0,  1794,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1794,     0,
+       0,     0,     0,     0,     0,     0,     0,  1372,     0,     0,
+       0,     0,     0,  1373,     0,     0,     0,     0,     0,  1389,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1419,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,  1374,     0,     0,     0,     0,     0,     0,
-    1375,  1388,  1221,  1376,     0,  1221,     0,  1221,     0,     0,
-       0,     0,  1783,     0,     0,     0,     0,     0,     0,     0,
-    1014,     0,     0,     0,     0,     0,     0,  1371,  1377,     0,
-    1014,  1221,     0,  1372,     0,  3277,     0,     0,  2154,  4428,
-    1774,     0,     0,  1775,     0,     0,  1221,  1776,  1777,  1778,
-       0,     0,     0,     0,     0,  4619,     0,     0,     0,  1378,
-       0,     0,     0,     0,  1779,  1221,     0,     0,     0,     0,
-       0,     0,  1781,  1373,     0,     0,     0,   801,  1782,     0,
-       0,   738,  2624,     0,     0,     0,     0,  2624,     0,     0,
-       0,     0,     0,  2624,     0,     0,     0,     0,     0,     0,
-       0,     0,  1783,     0,  1221,     0,     0,     0,     0,     0,
-       0,   801,   801,   801,   801,     0,  1379,  1784,  1380,     0,
-       0,     0,  1785,     0,  1374,     0,  1686,     0,  1381,     0,
-       0,  1375,     0,     0,  1376,     0,  1382,     0,     0,     0,
-       0,     0,     0,  1786,  1787,   796,  1383,     0,     0,     0,
-    1014,     0,     0,  2271,     0,     0,     0,     0,  1788,  1377,
-       0,   738,     0,     0,     0,     0,  1221,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1014,
-    2788,     0,     0,  1385,  1386,     0,     0,     0,     0,  1789,
-    1378,     0,     0,     0,     0,     0,     0,     0,     0,  1014,
-       0,     0,  1790,     0,     0,  1791,     0,  1784,  1221,     0,
-    1387,   796,  1785,     0,     0,     0,     0,     0,     0,     0,
-    1221,     0,     0,     0,     0,  1221,     0,  1221,     0,  1221,
-       0,     0,     0,  1786,  1787,     0,  3859,     0,     0,     0,
-       0,     0,   801,     0,   847,     0,     0,  1379,  1788,  1380,
-       0,  2368,     0,  1014,  1221,     0,     0,     0,     0,  1381,
-       0,     0,     0,     0,     0,  2382,     0,  1382,  2385,     0,
-    2387,     0,  2388,  1388,     0,     0,     0,  1383,  2390,  1789,
-       0,     0,     0,  1792,     0,     0,     0,     0,     0,     0,
-       0,     0,  1790,     0,     0,  1791,     0,     0,     0,     0,
-     801,     0,     0,     0,     0,     0,   796,     0,     0,     0,
-       0,  2885,     0,     0,  1385,  1386,     0,     0,     0,     0,
-       0,  1013,     0,  1943,     0,     0,     0,  1943,     0,  1943,
-       0,     0,  1943,  1221,  1221,     0,     0,     0,  2910,     0,
-       0,  2886,  1013,     0,  1221,     0,     0,  4619,     0,     0,
-       0,  2680,     0,  4365,     0,  1014,     0,     0,  1774,     0,
-       0,  1775,     0,     0,   796,  1776,  1777,  1778,     0,     0,
-       0,     0,     0,  1792,   801,     0,  1793,     0,     0,  1794,
-    1795,  1796,  1779,  1797,  1798,  1799,  1800,  1801,  1802,     0,
-    1781,     0,  2105,  4150,     0,     0,  1782,     0,     0,     0,
-    3859,  1014,     0,     0,  1388,     0,   796,   796,  1221,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1783,     0,     0,     0,     0,     0,     0,  1221,     0,     0,
-       0,     0,     0,     0,   801,     0,     0,     0,     0,     0,
-       0,     0,     0,  1371,     0,     0,     0,     0,     0,  1372,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1793,     0,     0,  1794,
-    1795,  1796,     0,  1797,  1798,  1799,  1800,  1801,  1802,     0,
-       0,     0,     0,  4387,     0,     0,     0,     0,     0,  1373,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1221,  1221,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     796,     0,     0,     0,  2689,  1784,     0,     0,     0,     0,
-    1785,     0,   796,   796,     0,     0,     0,     0,     0,     0,
-    1374,     0,     0,     0,     0,     0,     0,  1375,     0,     0,
-    1376,  1786,  1787,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1788,     0,     0,     0,
-       0,     0,     0,     0,     0,  1377,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1789,     0,     0,
-       0,     0,     0,     0,     0,     0,  1378,  1013,     0,     0,
-    1790,     0,     0,  1791,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1013,     0,     0,
-       0,     0,     0,     0,     0,     0,  1013,     0,  2698,  2699,
-    2689,     0,     0,  2702,  2703,     0,     0,     0,  2706,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2717,  1379,     0,  1380,     0,     0,  1014,  2726,
-       0,     0,     0,  2729,  2730,  1381,     0,  2733,  2734,     0,
-       0,     0,     0,  1382,  2739,     0,     0,     0,     0,     0,
-       0,  1792,     0,  1383,     0,     0,  2755,     0,  2757,     0,
-       0,     0,     0,     0,     0,     0,  1014,     0,     0,     0,
-       0,     0,  1013,     0,     0,  2780,     0,     0,     0,     0,
-    2782,     0,     0,     0,     0,     0,     0,  2924,     0,     0,
-    1385,  1386,     0,  2787,     0,     0,     0,     0,     0,     0,
-       0,  2792,     0,  2794,     0,  2796,  2799,  2801,     0,     0,
-       0,     0,  2809,  2812,     0,     0,     0,  2925,     0,     0,
-    1014,     0,  2825,     0,  1014,  1014,     0,  2834,     0,     0,
-       0,     0,  2838,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1793,     0,     0,  1794,  1795,  1796,
-       0,  1797,  1798,  1799,  1800,  1801,  1802,  2871,     0,  -127,
-       0,  4398,     0,     0,     0,     0,     0,     0,  2878,     0,
-    2880,     0,     0,     0,     0,  2883,  1013,     1,     0,  2884,
-    1388,  2888,  2889,  2890,  2891,     0,  2893,     2,     0,     3,
-       4,     0,     0,     0,     0,     0,     0,     0,     0,  2917,
-    2918,  2919,     0,     0,     5,     0,     0,     0,     0,  2927,
-    2928,     0,  4365,  1014,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     6,     0,     7,     8,     0,     0,
-       0,     0,     9,     0,    10,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    11,     0,    12,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2970,    13,  1774,     0,    14,  1775,     0,
-       0,     0,  1776,  1777,  1778,     0,     0,     0,     0,    15,
-       0,    16,     0,     0,     0,    17,     0,     0,     0,  1779,
-       0,    18,     0,     0,     0,     0,     0,  1781,     0,    19,
-       0,    20,     0,  1782,     0,     0,     0,    21,     0,     0,
-       0,     0,     0,     0,     0,     0,  1830,     0,     0,     0,
-       0,     0,    22,     0,     0,     0,     0,  1783,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    23,     0,
-       0,     0,     0,     0,  1774,     0,     0,  1775,     0,     0,
-       0,  1776,  1777,  1778,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1779,     0,
-       0,     0,     0,     0,     0,     0,  1781,    24,    25,  1013,
-       0,     0,  1782,    26,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1774,    27,     0,  1775,     0,     0,     0,
-    1776,  1777,  1778,     0,     0,    28,  1783,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1943,  1779,     0,     0,
+       0,     0,  1795,     0,     0,  1796,  1797,  1798,     0,  1799,
+    1800,  1801,  1802,  1803,  1804,     0,  1420,     0,     0,  4496,
+       0,  1795,     0,     0,  1796,  1797,  1798,     0,  1799,  1800,
+    1801,  1802,  1803,  1804,  1375,     0,     0,     0,  4531,     0,
+       0,  1376,     0,     0,  1377,     0,     0,     0,     0,     0,
+    1776,     0,     0,  1777,     0,     0,     0,  1778,  1779,  1780,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1378,
+    1776,     0,     0,  1777,  1781,     0,     0,  1778,  1779,  1780,
+       0,     0,  1783,     0,     0,     0,     0,     0,  1784,     0,
+       0,     0,     0,     0,  1781,     0,     0,  1421,     0,     0,
+    1379,     0,  1783,     0,     0,     0,     0,     0,  1784,     0,
+       0,     0,  1785,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2704,  2705,     0,     0,     0,
+    2708,  2709,  1785,     0,     0,  2712,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1422,     0,  1423,     0,  2723,
+       0,     0,     0,     0,     0,     0,  2732,  1424,     0,  1381,
+    2735,  2736,     0,     0,  2739,  2740,     0,     0,     0,  1382,
+       0,  2745,     0,     0,     0,     0,     0,  1383,     0,     0,
+       0,     0,     0,  2761,     0,  2763,  1425,  1384,     0,     0,
+       0,  1776,     0,     0,  1777,     0,     0,     0,  1778,  1779,
+    1780,     0,  2786,     0,     0,     0,     0,  2788,     0,     0,
+       0,     0,     0,     0,     0,  1781,     0,  1786,     0,     0,
+    2793,  2878,  1787,  1783,  1386,  1387,  1427,     0,  2798,  1784,
+    2800,     0,  2802,  2805,  2807,     0,     0,  1786,     0,  2815,
+    2818,     0,  1787,  1788,  1789,     0,     0,     0,     0,  2831,
+       0,  2879,     0,  1785,  2840,     0,     0,     0,  1790,  2844,
+       0,     0,     0,  1788,  1789,  1429,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1790,     0,
+       0,     0,     0,     0,     0,     0,  2877,     0,     0,  1791,
+       0,     0,     0,     0,     0,     0,     0,  2884,     0,  2886,
+       0,     0,  1792,     0,  2889,  1793,     0,     0,  2890,  1791,
+    2894,  2895,  2896,  2897,  1389,  2899,     0,     0,     0,     0,
+       0,     0,  1792,     0,     0,  1793,     0,     0,  2923,  2924,
+    2925,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    2933,  2934,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1786,   798,
+       0,     0,     0,  1787,     0,     0,     0,     0,   798,   821,
+       0,     0,     0,     0,     0,     0,   821,     0,     0,     0,
+       0,     0,     0,  1794,  1788,  1789,     0,   821,     0,     0,
+       0,     0,     0,  1776,  2976,     0,  1777,     0,     0,  1790,
+    1778,  1779,  1780,  1794,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1781,     0,     0,
+       0,     0,     0,     0,     0,  1783,     0,     0,     0,     0,
+    1791,  1784,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1792,     0,     0,  1793,     0,  1372,     0,
+       0,     0,     0,     0,  1373,  1785,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1795,     0,     0,  1796,
+    1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,     0,
+       0,     0,     0,  4765,  1374,     0,  1795,     0,     0,  1796,
+    1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,     0,
+       0,     0,  1776,  4786,     0,  1777,     0,     0,     0,  1778,
+    1779,  1780,     0,     0,  1794,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1781,     0,     0,     0,
+       0,     0,     0,     0,  1783,  1375,     0,  1945,     0,     0,
+    1784,     0,  1376,     0,     0,  1377,     0,     0,     0,     0,
+    1786,  1776,     0,     0,  1777,  1787,     0,     0,  1778,  1779,
+    1780,     0,     0,     0,  1785,     0,     0,     0,     0,     0,
+    1378,     0,  3140,     0,     0,  1781,  1788,  1789,  3164,     0,
+       0,     0,     0,  1783,     0,     0,     0,     0,     0,  1784,
+       0,  1790,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1379,     0,     0,     0,     0,     0,  1795,     0,     0,
+    1796,  1797,  1798,  1785,  1799,  1800,  1801,  1802,  1803,  1804,
+       0,     0,  1791,     0,  4901,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1792,     0,     0,  1793,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1380,     0,
+    1381,     0,     0,     0,     0,     0,     0,     0,     0,  1786,
+    1382,     0,     0,     0,  1787,     0,     0,     0,  1383,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1384,     0,
+       0,     0,     0,     0,     0,  1788,  1789,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1790,     0,   798,     0,     0,     0,  1794,     0,  1786,     0,
+       0,     0,  1469,  1787,   821,  1386,  1387,     0,     0,   821,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     821,  1791,     0,     0,  1788,  1789,     0,     0,     0,     0,
+       0,     0,  1470,     0,  1792,     0,   821,  1793,  3302,  1790,
+     798,     0,     0,     0,     0,     0,  1016,     0,     0,     0,
+     798,   821,     0,     0,     0,     0,     0,   821,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1016,   821,     0,
+    1791,     0,     0,     0,     0,     0,   821,     0,     0,     0,
+       0,     0,     0,  1792,     0,     0,  1793,     0,     0,  1795,
+    3339,  3340,  1796,  1797,  1798,  1389,  1799,  1800,  1801,  1802,
+    1803,  1804,     0,     0,     0,     0,  4919,     0,  1945,     0,
+       0,     0,     0,     0,     0,  1794,     0,     0,     0,  1776,
+       0,     0,  1777,     0,     0,     0,  1778,  1779,  1780,     0,
+       0,     0,     0,  3361,     0,     0,     0,     0,     0,     0,
+       0,     0,  3365,  1781,     0,     0,     0,  2652,     0,     0,
+       0,  1783,     0,     0,     0,   798,   798,  1784,  3377,  3379,
+       0,   821,     0,  3379,  1794,     0,     0,     0,  3390,  3391,
+    3392,  1776,     0,     0,  1777,     0,     0,     0,  1778,  1779,
+    1780,  1785,     0,     0,     0,     0,     0,   798,     0,     0,
+       0,     0,     0,     0,     0,  1781,     0,     0,     0,  3413,
+    3414,  3415,  3416,  1783,     0,     0,     0,     0,  1795,  1784,
+       0,  1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,
+    1804,     0,     0,  3826,     0,     0,     0,     0,  2653,     0,
+       0,     0,     0,  1785,     0,     0,  3433,     0,  3437,  3438,
+    3439,     0,     0,     0,     0,     0,     0,  1776,  3452,     0,
+    1777,     0,     0,     0,  1778,  1779,  1780,  1795,     0,     0,
+    1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,
+       0,  1781,     0,     0,     0,     0,  1372,     0,     0,  1783,
+       0,     0,  1373,     0,     0,  1784,  1786,     0,     0,     0,
+       0,  1787,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1785,
+       0,     0,  1788,  1789,     0,     0,  3205,  3499,     0,     0,
+       0,  3206,  1374,     0,     0,  3503,   798,  1790,     0,     0,
+       0,     0,     0,  1016,     0,     0,     0,   798,  1786,     0,
+       0,     0,     0,  1787,  3515,     0,     0,     0,     0,     0,
+       0,     0,     0,  1016,     0,     0,     0,     0,  1791,     0,
+       0,     0,  1016,     0,  1788,  1789,     0,  3556,     0,     0,
+       0,  1792,     0,  1375,  1793,     0,     0,     0,     0,  1790,
+    1376,     0,     0,  1377,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   798,     0,     0,     0,     0,     0,     0,  1378,     0,
+    1791,  3593,     0,     0,  1786,  3598,     0,     0,     0,  1787,
+       0,     0,     0,  1792,     0,     0,  1793,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1016,  1379,
+    1788,  1789,     0,     0,  3636,     0,     0,     0,     0,     0,
+       0,     0,  1794,     0,     0,  1790,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   821,  3649,     0,     0,     0,     0,     0,
+       0,  1372,     0,     0,     0,     0,  1791,  1373,  3659,     0,
+       0,     0,  3661,   821,     0,     0,  1380,   798,  1381,  1792,
+       0,     0,  1793,  1945,  1794,   821,     0,  2654,  1382,     0,
+       0,     0,     0,     0,     0,     0,  1383,     0,     0,     0,
+       0,     0,     0,  3741,     0,     0,  1384,  1374,     0,     0,
+       0,     0,     0,   821,     0,     0,     0,     0,     0,     0,
+       0,     0,  1016,     0,   821,  1795,     0,     0,  1796,  1797,
+    1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,     0,   821,
+    2075,     0,   821,  1386,  1387,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   798,     0,     0,     0,  1375,     0,
+    1794,     0,     0,     0,     0,  1376,     0,     0,  1377,     0,
+    2076,     0,     0,     0,     0,     0,  3742,  1795,     0,     0,
+    1796,  1797,  1798,   798,  1799,  1800,  1801,  1802,  1803,  1804,
+       0,     0,     0,  1378,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   798,   798,   798,     0,   798,     0,     0,     0,     0,
+       0,     0,     0,     0,  1379,     0,     0,     0,     0,     0,
+       0,     0,     0,  1389,     0,   798,     0,     0,     0,  1372,
+       0,     0,     0,     0,     0,  1373,     0,     0,     0,     0,
+       0,     0,     0,  1795,     0,     0,  1796,  1797,  1798,   821,
+    1799,  1800,  1801,  1802,  1803,  1804,     0,   821,   821,     0,
+       0,     0,     0,     0,     0,     0,   798,  1930,     0,     0,
+       0,  1380,     0,  1381,     0,  1374,     0,     0,     0,     0,
+       0,     0,     0,  1382,     0,     0,     0,     0,     0,     0,
+       0,  1383,     0,     0,     0,   798,     0,     0,     0,   798,
+     798,  1384,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1016,  3876,     0,  3877,     0,
+       0,  1930,     0,     0,     0,  3879,  1375,     0,     0,     0,
+       0,     0,     0,  1376,     0,  2147,  1377,     0,  1386,  1387,
+       0,     0,  3889,     0,     0,     0,     0,  1776,     0,     0,
+    1777,     0,     0,     0,  1778,  1779,  1780,  3897,  1372,     0,
+       0,  1378,     0,     0,  1373,  2148,     0,     0,  3908,     0,
+       0,  1781,     0,     0,     0,     0,     0,     0,  1016,  1783,
+       0,     0,     0,     0,     0,  1784,  3912,     0,     0,     0,
+       0,     0,  1379,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1374,     0,     0,     0,     0,  1785,
+       0,     0,     0,  3941,     0,  1016,     0,     0,     0,     0,
+       0,     0,     0,     0,  3949,  3950,  3951,     0,  1389,  3954,
+    3955,  3956,  3957,  3958,  3959,     0,     0,     0,     0,  3966,
+    3967,     0,  3969,  3970,  3971,  3972,  3973,  3974,  3975,  1380,
+       0,  1381,     0,     0,     0,  1375,     0,  3983,     0,  3985,
+    3986,  1382,  1376,     0,     0,  1377,     0,     0,     0,  1383,
+       0,     0,     0,     0,     0,     0,   821,     0,     0,  1384,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1378,  4863,     0,     0,     0,  1016,     0,     0,     0,  4018,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1016,     0,     0,  2794,  1786,     0,  1386,  1387,  1016,  1787,
+       0,  1379,     0,     0,  1930,     0,     0,     0,     0,  1016,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1788,  1789,     0,  1388,     0,   821,     0,     0,     0,   821,
+       0,     0,     0,     0,     0,  1790,     0,     0,     0,     0,
+       0,   821,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1016,     0,  1380,     0,
+    1381,     0,     0,   798,     0,     0,  1791,     0,     0,  1016,
+    1382,     0,     0,     0,     0,   798,  3379,     0,  1383,  1792,
+       0,  1016,  1793,     0,     0,     0,  1389,     0,  1384,     0,
+       0,     0,     0,  1016,     0,     0,     0,     0,     0,     0,
+       0,  4864,     0,     0,  1945,  1945,  1945,     0,     0,     0,
+       0,     0,   798,     0,   821,   821,  4106,     0,     0,     0,
+       0,     0,  2891,     0,     0,  1386,  1387,   821,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1016,     0,     0,
+    1016,     0,   821,   821,     0,     0,     0,     0,     0,     0,
+       0,     0,  2892,     0,   821,     0,     0,     0,     0,     0,
+    1794,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1776,     0,     0,  1777,     0,     0,     0,  1778,  1779,
+    1780,     0,     0,     0,     0,     0,   798,     0,     0,     0,
        0,     0,     0,     0,     0,  1781,     0,     0,     0,     0,
-       0,  1782,  1784,     0,     0,     0,     0,  1785,     0,     0,
-       0,     0,  1013,     0,    29,     0,     0,     0,     0,     0,
-       0,  3134,     0,     0,     0,  1783,    30,     0,  1786,  1787,
-       0,    31,    32,     0,    33,     0,     0,     0,     0,    34,
-       0,     0,     0,  1788,    35,     0,     0,    36,  1013,     0,
-       0,     0,    37,     0,     0,     0,     0,    38,    39,     0,
-       0,     0,     0,     0,     0,    40,     0,     0,     0,    41,
-       0,     0,     0,     0,  1789,     0,     0,     0,     0,    42,
-       0,  1784,     0,     0,     0,     0,  1785,  1790,     0,     0,
-    1791,    43,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1786,  1787,     0,
-      44,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      45,     0,  1788,     0,     0,     0,    46,     0,  1013,     0,
-    1784,    47,     0,     0,     0,  1785,     0,     0,     0,     0,
-       0,     0,     0,  1013,    48,     0,     0,     0,     0,     0,
-       0,  1013,     0,  1789,     0,     0,  1786,  1787,     0,     0,
-       0,     0,  1013,     0,     0,    49,  1790,     0,  1792,  1791,
-       0,  1788,     0,     0,     0,     0,     0,     0,     0,    50,
-       0,     0,  -127,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1783,     0,     0,     0,     0,     0,  1784,
+       0,     0,     0,     0,     0,  1389,     0,     0,     0,     0,
+     798,     0,   798,     0,     0,     0,     0,   798,   798,     0,
+       0,     0,     0,  1785,   798,   798,   798,     0,     0,     0,
+     798,     0,   798,   798,   798,   798,   798,   798,     0,   798,
+       0,   798,   798,  1795,     0,   798,  1796,  1797,  1798,     0,
+    1799,  1800,  1801,  1802,  1803,  1804,     0,     0,     0,  1016,
+     798,   798,   798,   798,  1930,     0,     0,     0,   798,     0,
+       0,     0,   798,     0,     0,   798,     0,     0,   798,   798,
+     798,   798,   798,   798,   798,   798,   798,     0,   798,     0,
+       0,     0,     0,     0,     0,   798,     0,   798,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  4236,     0,     0,     0,  4237,
+    4238,  4239,  4240,     0,     0,  4242,     0,     0,  1786,     0,
+       0,     0,     0,  1787,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  4255,  4256,  4257,
+    4258,     0,  4260,  4261,  1788,  1789,     0,     0,     0,     0,
+       0,     0,     0,     0,  4270,  4271,     0,  1776,     0,  1790,
+    1777,     0,     0,     0,  1778,  1779,  1780,     0,     0,     0,
+       0,     0,  4276,     0,     0,     0,     0,     0,     0,  1945,
+    1945,  1781,  1945,     0,  3210,     0,     0,     0,     0,  1783,
+    1791,     0,     0,     0,     0,  1784,     0,     0,     0,     0,
+       0,     0,     0,  1792,     0,     0,  1793,     0,     0,     0,
+       0,     0,     0,     0,   798,     0,     0,     0,     0,  1785,
+       0,  3178,     0,  1776,     0,     0,  1777,     0,     0,     0,
+    1778,  1779,  1780,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1781,     0,     0,
+       0,     0,     0,     0,     0,  1783,     0,     0,     0,     0,
+       0,  1784,     0,  1016,     0,     0,  4341,  1016,  1016,     0,
+       0,     0,     0,     0,     0,     0,     0,   821,     0,     0,
+       0,  1930,   821,     0,  1794,  1785,   821,  4360,     0,     0,
+       0,     0,     0,     0,   821,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1789,     0,     0,     0,     0,  3296,     0,  1013,
-       0,     0,     0,     0,     0,  1790,     0,     0,  1791,     0,
-       0,     0,  1013,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1013,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1013,  1792,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3333,
-    3334,  1793,     0,     0,  1794,  1795,  1796,     0,  1797,  1798,
-    1799,  1800,  1801,  1802,     0,     0,     0,  1943,  4407,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1013,  1774,     0,  1013,  1775,     0,  1792,     0,  1776,  1777,
-    1778,     0,  3355,     0,     0,     0,     0,     0,     0,     0,
-       0,  3359,     0,     0,     0,  1779,     0,     0,     0,     0,
-       0,     0,     0,  1781,     0,     0,     0,  3371,  3373,  1782,
-       0,     0,  3373,     0,     0,     0,     0,  3384,  3385,  3386,
-    1793,     0,     0,  1794,  1795,  1796,     0,  1797,  1798,  1799,
-    1800,  1801,  1802,  1783,     0,     0,     0,  4410,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3407,  3408,
-    3409,  3410,     0,     0,     0,     0,     0,     0,  1774,     0,
-       0,  1775,     0,     0,     0,  1776,  1777,  1778,     0,  1793,
-       0,     0,  1794,  1795,  1796,     0,  1797,  1798,  1799,  1800,
-    1801,  1802,  1779,     0,     0,  3427,  4458,  3431,  3432,  3433,
-    1781,  1774,     0,     0,  1775,     0,  1782,  3446,  1776,  1777,
-    1778,     0,  1013,     0,     0,     0,     0,     0,     0,  1774,
-       0,     0,  1775,     0,     0,  1779,  1776,  1777,  1778,     0,
-    1783,     0,     0,  1781,     0,     0,     0,     0,     0,  1782,
-       0,     0,     0,  1779,     0,     0,     0,     0,  1784,     0,
-       0,  1781,     0,  1785,     0,     0,     0,  1782,     0,     0,
-       0,     0,     0,  1783,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1786,  1787,  3493,     0,     0,     0,
-       0,  1783,     0,     0,  3497,     0,     0,     0,     0,  1788,
-       0,     0,  1774,     0,     0,  1775,     0,     0,     0,  1776,
-    1777,  1778,     0,  3509,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1779,     0,     0,     0,
-    1789,     0,     0,     0,  1781,     0,  3550,     0,     0,     0,
-    1782,     0,     0,  1790,     0,  1784,  1791,     0,     0,     0,
-    1785,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1783,     0,     0,     0,     0,     0,
-       0,  1786,  1787,     0,     0,     0,     0,     0,  1784,     0,
-    3587,     0,     0,  1785,  3592,     0,  1788,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1784,     0,     0,     0,
-       0,  1785,     0,     0,  1786,  1787,     0,     0,     0,     0,
-       0,     0,     0,  3630,     0,     0,     0,  1789,     0,  1788,
-       0,     0,  1786,  1787,  1792,     0,     0,     0,     0,     0,
-    1790,     0,     0,  1791,     0,     0,  1013,  1788,     0,     0,
-    1013,  1013,     0,  3643,     0,     0,     0,     0,     0,     0,
-    1789,     0,     0,     0,     0,     0,     0,  3653,     0,  1371,
-       0,  3655,     0,  1790,     0,  1372,  1791,     0,  1789,  1784,
-       0,     0,  1943,  1371,  1785,     0,     0,     0,     0,  1372,
-       0,  1790,     0,     0,  1791,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1786,  1787,     0,     0,     0,
-       0,     0,     0,  1013,     0,  1373,     0,     0,     0,     0,
-    1788,  1792,     0,     0,     0,  1013,     0,  1793,     0,  1373,
-    1794,  1795,  1796,     0,  1797,  1798,  1799,  1800,  1801,  1802,
-       0,     0,     0,   798,  4490,     0,     0,     0,     0,     0,
-       0,  1789,   798,   821,  1792,     0,     0,     0,     0,     0,
-     821,     0,  1013,     0,  1790,     0,  1374,  1791,     0,     0,
-       0,   821,  1792,  1375,     0,     0,  1376,     0,     0,     0,
-    1374,     0,     0,     0,     0,     0,     0,  1375,     0,     0,
-    1376,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   821,     0,     0,   798,     0,  4384,     0,     0,
+       0,     0,     0,     0,  1786,     0,   798,     0,     0,  1787,
+    1016,     0,     0,   798,     0,     0,     0,     0,     0,     0,
+       0,     0,  1016,     0,     0,     0,     0,     0,     0,     0,
+    1788,  1789,     0,     0,   821,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1790,     0,     0,     0,     0,
+       0,   821,   821,  3215,     0,     0,     0,  1795,     0,  1016,
+    1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,
+    1786,  1945,     0,     0,     0,  1787,  1791,     0,     0,     0,
+    1930,   821,     0,     0,  1930,     0,  1945,     0,     0,  1792,
+       0,     0,  1793,     0,     0,     0,  1788,  1789,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1790,     0,     0,   821,     0,     0,     0,   821,  1776,
+       0,     0,  1777,     0,     0,     0,  1778,  1779,  1780,     0,
+       0,     0,     0,     0,     0,     0,   821,     0,     0,     0,
+       0,     0,  1791,  1781,  1372,     0,  3221,   821,     0,     0,
+    1373,  1783,     0,  4486,     0,  1792,     0,  1784,  1793,     0,
+     821,     0,     0,     0,     0,     0,     0,     0,     0,   821,
+    1794,  4495,     0,     0,     0,     0,  4500,  4501,     0,     0,
+       0,  1785,     0,     0,     0,     0,     0,     0,     0,     0,
+    1374,     0,     0,     0,     0,     0,     0,   822,     0,     0,
+       0,     0,     0,     0,   822,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   822,     0,   798,  1016,     0,
+       0,     0,     0,     0,     0,     0,  1930,     0,     0,     0,
+       0,     0,  4550,     0,     0,     0,  1794,     0,     0,     0,
+       0,  1375,     0,     0,     0,     0,     0,     0,  1376,     0,
        0,  1377,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1793,  1377,     0,  1794,  1795,  1796,
-       0,  1797,  1798,  1799,  1800,  1801,  1802,     0,     0,     0,
-       0,  4525,  1378,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1792,  1378,  1793,     0,     0,
-    1794,  1795,  1796,     0,  1797,  1798,  1799,  1800,  1801,  1802,
-       0,     0,     0,     0,  4759,  1793,     0,     0,  1794,  1795,
-    1796,     0,  1797,  1798,  1799,  1800,  1801,  1802,  1774,     0,
-       0,  1775,  4780,     0,     0,  1776,  1777,  1778,     0,  1379,
-       0,  1380,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1381,  1779,  1379,     0,  1380,     0,     0,     0,  1382,
-    1781,     0,     0,     0,     0,  1381,  1782,  1013,     0,  1383,
-       0,     0,     0,  1382,     0,  3870,     0,  3871,     0,     0,
-       0,     0,     0,  1383,  3873,     0,     0,     0,  1793,     0,
-    1783,  1794,  1795,  1796,     0,  1797,  1798,  1799,  1800,  1801,
-    1802,  3883,     0,  3381,     0,  4895,  1385,  1386,     0,     0,
-       0,     0,     0,     0,     0,     0,  3891,  3428,     0,     0,
-    1385,  1386,     0,     0,     0,     0,     0,  3902,     0,     0,
-       0,     0,     0,  3382,     0,  1774,     0,  1013,  1775,     0,
-       0,     0,  1776,  1777,  1778,  3906,     0,  3429,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1779,
-       0,     0,     0,  2646,     0,     0,     0,  1781,     0,     0,
-       0,     0,  3935,  1782,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  3943,  3944,  3945,     0,     0,  3948,  3949,
-    3950,  3951,  3952,  3953,     0,  1784,  1388,  1783,  3960,  3961,
-    1785,  3963,  3964,  3965,  3966,  3967,  3968,  3969,     0,     0,
-    1388,     0,     0,     0,     0,     0,  3977,     0,  3979,  3980,
-       0,  1786,  1787,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1788,     0,     0,     0,
-       0,     0,     0,     0,  2647,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1013,   798,     0,  4012,     0,
-       0,     0,     0,     0,     0,     0,     0,  1789,   821,     0,
-       0,     0,     0,   821,     0,     0,  1013,     0,     0,     0,
-    1790,     0,     0,  1791,   821,     0,     0,  1013,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     821,     0,  1784,     0,   798,     0,     0,  1785,     0,     0,
-    1015,     0,     0,     0,   798,   821,     0,     0,     0,     0,
-       0,   821,     0,     0,     0,     0,     0,     0,  1786,  1787,
-       0,  1015,   821,     0,     0,     0,     0,     0,     0,     0,
-     821,     0,     0,  1788,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  3373,     0,     0,     0,     0,
-       0,  1792,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1789,     0,     0,     0,     0,     0,
-       0,     0,     0,  1943,  1943,  1943,     0,  1790,     0,     0,
-    1791,     0,     0,     0,     0,  4100,     0,     0,     0,     0,
+       0,     0,     0,  1795,     0,     0,  1796,  1797,  1798,     0,
+    1799,  1800,  1801,  1802,  1803,  1804,  1378,     0,  3379,     0,
+       0,     0,     0,     0,     0,  4591,  1786,     0,  1016,     0,
+       0,  1787,   821,     0,     0,     0,     0,     0,     0,     0,
+       0,   798,     0,     0,     0,     0,     0,  1379,     0,     0,
+       0,     0,  1788,  1789,     0,     0,     0,     0,     0,     0,
+    1945,     0,     0,     0,     0,     0,     0,  1790,     0,  1795,
+       0,  1945,  1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,
+    1803,  1804,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  4627,   821,     0,     0,     0,  1791,   798,
+       0,     0,     0,     0,  1380,     0,  1381,     0,     0,     0,
+       0,  1792,     0,     0,  1793,     0,  1382,  4644,     0,     0,
+       0,     0,     0,     0,  1383,     0,  4651,     0,     0,     0,
+     821,     0,     0,     0,  1384,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1016,  1945,     0,  1372,
+       0,     0,   821,     0,     0,  1373,     0,     0,     0,     0,
+     821,     0,     0,     0,   798,     0,     0,  1016,  2930,     0,
+     798,  1386,  1387,     0,     0,     0,     0,     0,  1016,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   798,     0,
+       0,     0,  1794,   798,     0,  1374,     0,     0,  2931,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   798,
-     798,     0,     0,     0,     0,   821,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   798,   798,   798,     0,
+       0,   798,     0,     0,     0,     0,     0,  3379,     0,   798,
+     798,   798,   798,     0,     0,     0,     0,  1930,     0,     0,
+       0,     0,   798,  1930,     0,   798,  1375,   798,     0,  1945,
+       0,     0,     0,  1376,     0,     0,  1377,     0,   798,   798,
+       0,  1389,   798,     0,     0,     0,     0,     0,     0,     0,
+       0,  1372,     0,     0,     0,     0,   798,  1373,   798,     0,
+     798,  1378,     0,     0,  4754,  1795,     0,     0,  1796,  1797,
+    1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,     0,  4766,
+     798,     0,   822,     0,     0,     0,     0,   822,     0,     0,
+       0,   798,  1379,   798,   798,   798,     0,  1374,   822,     0,
+       0,     0,     0,     0,  4777,     0,     0,     0,   821,  1776,
+       0,   798,  1777,     0,   822,     0,  1778,  1779,  1780,     0,
+       0,     0,     0,   798,     0,     0,     0,     0,   798,   822,
+       0,     0,     0,  1781,   798,   822,     0,     0,     0,     0,
+       0,  1783,     0,     0,   798,     0,   822,  1784,  1375,  1380,
+       0,  1381,     0,     0,   822,  1376,     0,     0,  1377,     0,
+    1016,  1382,     0,  1016,     0,  1016,     0,     0,     0,  1383,
+    1016,  1785,   821,     0,     0,  4825,     0,     0,     0,  1384,
+       0,     0,     0,  1378,     0,     0,     0,     0,   821,   821,
+       0,     0,     0,     0,   798,     0,     0,     0,     0,     0,
+    4840,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3387,  1379,   821,  1386,  1387,   821,     0,
+       0,  1016,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1016,   822,
+       0,     0,     0,  3388,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1016,     0,     0,     0,     0,     0,     0,     0,
+       0,  1380,     0,  1381,     0,     0,  1786,     0,     0,     0,
+       0,  1787,     0,  1382,     0,     0,     0,     0,     0,     0,
+       0,  1383,     0,     0,  1930,  1930,  1930,     0,     0,     0,
+       0,  1384,  1788,  1789,     0,     0,  1389,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1790,   821,     0,
+       0,     0,     0,     0,     0,     0,     0,  1016,     0,  1016,
+     821,     0,     0,     0,   821,  3434,     0,     0,  1386,  1387,
+       0,     0,     0,     0,   821,     0,     0,     0,  1791,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1792,     0,     0,  1793,  3435,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   798,     0,     0,  1793,     0,     0,  1794,  1795,  1796,
-       0,  1797,  1798,  1799,  1800,  1801,  1802,     0,  1792,     0,
-       0,  4913,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1013,
-       0,     0,  1013,     0,  1013,  1774,     0,     0,  1775,  1013,
-       0,     0,  1776,  1777,  1778,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1779,
-       0,     0,     0,  2648,     0,     0,     0,  1781,     0,     0,
-       0,     0,     0,  1782,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1013,     0,     0,     0,     0,     0,     0,  1783,     0,     0,
-       0,  1793,     0,     0,  1794,  1795,  1796,  1013,  1797,  1798,
-    1799,  1800,  1801,  1802,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   798,
-       0,  1013,     0,     0,     0,     0,  1015,     0,     0,     0,
-     798,     0,     0,     0,  4230,     0,     0,     0,  4231,  4232,
-    4233,  4234,     0,     0,  4236,     0,  1015,     0,     0,     0,
-       0,     0,     0,     0,     0,  1015,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  4249,  4250,  4251,  4252,
-    3199,  4254,  4255,     0,     0,  3200,     0,     0,     0,     0,
-       0,     0,     0,  4264,  4265,     0,  1013,     0,  1013,     0,
-       0,     0,  1784,     0,   798,     0,     0,  1785,     0,     0,
-       0,  4270,     0,     0,     0,     0,     0,     0,  1943,  1943,
-       0,  1943,     0,     0,  1774,     0,     0,  1775,  1786,  1787,
-       0,  1776,  1777,  1778,     0,     0,     0,     0,     0,     0,
-       0,  1015,     0,  1788,     0,     0,     0,     0,  1779,     0,
-       0,  3158,     0,     0,     0,     0,  1781,  1013,     0,     0,
-       0,     0,  1782,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1789,     0,   821,     0,     0,     0,
-       0,     0,  1013,     0,     0,     0,  1783,  1790,     0,     0,
-    1791,     0,     0,     0,     0,  1774,   821,     0,  1775,     0,
-     798,     0,  1776,  1777,  1778,  4335,  1013,     0,   821,     0,
-       0,     0,     0,  1013,     0,     0,     0,     0,     0,  1779,
-       0,     0,     0,     0,     0,     0,  4354,  1781,     0,     0,
-       0,     0,     0,  1782,     0,     0,   821,     0,     0,     0,
-       0,     0,     0,     0,     0,  1015,     0,   821,     0,     0,
-       0,     0,     0,     0,     0,     0,  4378,  1783,     0,     0,
-       0,     0,   821,     0,     0,   821,     0,     0,  1792,     0,
-       0,  1013,     0,     0,     0,     0,     0,   798,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1013,
-       0,  1784,     0,     0,     0,     0,  1785,     0,     0,     0,
-       0,     0,  1013,     0,     0,     0,   798,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1786,  1787,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1016,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1943,     0,  1788,     0,   798,   798,   798,     0,   798,  4857,
-       0,     0,     0,     0,     0,  1943,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   798,     0,
-       0,  1793,  1784,  1789,  1794,  1795,  1796,  1785,  1797,  1798,
-    1799,  1800,  1801,  1802,     0,     0,  1790,     0,     0,  1791,
-       0,     0,   821,     0,     0,     0,     0,     0,  1786,  1787,
-     821,   821,     0,     0,     0,     0,     0,     0,     0,   798,
-    1928,     0,     0,  1788,     0,  1013,     0,     0,     0,     0,
-       0,     0,  4480,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1013,     0,   798,     0,
-    4489,     0,   798,   798,  1789,  4494,  4495,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1790,  1015,     0,
-    1791,  1013,     0,     0,  1928,     0,     0,  1792,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  4858,
+       0,     0,     0,     0,     0,     0,     0,   821,     0,     0,
+       0,     0,     0,  1016,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1389,     0,
+       0,     0,     0,     0,     0,     0,     0,  1016,     0,     0,
+       0,     0,  1794,  1930,  1016,     0,     0,     0,     0,   821,
+       0,   821,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   821,     0,   821,     0,     0,     0,     0,
+       0,  3694,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1013,     0,     0,     0,     0,
-       0,  4544,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1015,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1016,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   821,
+    1016,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1016,     0,  1795,     0,     0,  1796,  1797,
+    1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,     0,     0,
+       0,   822,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1776,     0,     0,  1777,
+       0,   822,     0,  1778,  1779,  1780,   821,     0,     0,     0,
+       0,     0,     0,   822,     0,     0,     0,     0,   798,     0,
+    1781,   821,     0,  3748,     0,     0,     0,     0,  1783,     0,
+       0,     0,     0,     0,  1784,     0,     0,     0,     0,     0,
+       0,   822,     0,   821,     0,     0,   821,     0,     0,     0,
+       0,     0,   822,     0,     0,     0,     0,     0,  1785,     0,
+       0,     0,     0,   798,     0,     0,  1016,   822,     0,     0,
+     822,     0,   798,     0,     0,     0,     0,     0,   798,     0,
+     798,     0,     0,   798,     0,     0,     0,  1016,   798,   798,
+     798,   798,     0,     0,   798,   798,   798,   798,   798,   798,
+     798,   798,   798,   798,     0,     0,     0,   798,   798,     0,
+       0,  1776,  1016,     0,  1777,     0,     0,   798,  1778,  1779,
+    1780,   798,     0,  1930,     0,   798,     0,     0,     0,     0,
+       0,     0,     0,   798,     0,  1781,   798,     0,   798,     0,
+       0,     0,     0,  1783,     0,     0,  1016,   798,     0,  1784,
+     798,   798,     0,     0,     0,   798,   798,     0,     0,     0,
+       0,     0,   798,  1786,     0,     0,     0,     0,  1787,     0,
+       0,     0,   798,  1785,   798,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   798,   822,     0,  1788,
+    1789,     0,   798,   798,   798,   822,   822,     0,     0,     0,
+       0,     0,     0,     0,  1790,  1931,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   798,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   798,     0,     0,     0,  1791,     0,  1016,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,  1792,     0,
-       0,     0,  1774,     0,     0,  1775,     0,  3373,     0,  1776,
-    1777,  1778,     0,     0,  4585,     0,     0,  1015,     0,     0,
-    1793,     0,     0,  1794,  1795,  1796,  1779,  1797,  1798,  1799,
-    1800,  1801,  1802,     0,  1781,     0,     0,     0,     0,     0,
-    1782,     0,     0,     0,     0,     0,  1013,     0,     0,  1943,
+       0,  1793,   798,     0,     0,     0,     0,     0,     0,  1931,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1943,     0,     0,     0,  1783,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   821,     0,     0,
-       0,     0,  4621,     0,     0,     0,     0,     0,     0,     0,
-       0,  1793,     0,     0,  1794,  1795,  1796,  1015,  1797,  1798,
-    1799,  1800,  1801,  1802,     0,     0,  4638,     0,     0,     0,
-       0,     0,  1015,     0,     0,  4645,     0,     0,     0,     0,
-    1015,     0,     0,     0,     0,     0,  1928,     0,     0,     0,
-       0,  1015,     0,     0,     0,     0,  1943,     0,     0,     0,
-       0,  1013,     0,     0,     0,     0,     0,   821,     0,     0,
-       0,   821,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   821,     0,     0,     0,     0,     0,  1784,
-       0,     0,     0,     0,  1785,     0,     0,     0,  1015,     0,
-       0,     0,     0,     0,     0,   798,     0,     0,     0,     0,
-       0,  1015,     0,     0,     0,  1786,  1787,   798,     0,     0,
-       0,     0,     0,  1015,     0,     0,     0,     0,     0,     0,
-    1788,     0,     0,     0,     0,  1015,  3373,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1786,     0,
+       0,     0,     0,  1787,   821,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   798,     0,   821,   821,  1943,     0,
-       0,  1789,     0,     0,     0,     0,     0,     0,     0,   821,
-       0,     0,     0,     0,  1790,     0,     0,  1791,     0,  1015,
-       0,     0,  1015,     0,   821,   821,     0,     0,     0,     0,
-       0,     0,     0,  4748,  1774,     0,   821,  1775,  3735,  1013,
-       0,  1776,  1777,  1778,     0,     0,     0,     0,  4760,     0,
-       0,     0,     0,  1774,     0,     0,  1775,     0,  1779,     0,
-    1776,  1777,  1778,     0,     0,     0,  1781,     0,   798,     0,
-       0,     0,  1782,  4771,     0,     0,     0,  1779,     0,     0,
-    3204,     0,     0,     0,     0,  1781,     0,     0,  1013,     0,
-       0,  1782,     0,     0,     0,  1792,  1783,     0,     0,     0,
-       0,     0,   798,     0,   798,     0,     0,     0,     0,   798,
-     798,  3736,     0,     0,     0,  1783,   798,   798,   798,     0,
-       0,     0,   798,     0,   798,   798,   798,   798,   798,   798,
-       0,   798,     0,   798,   798,     0,     0,   798,     0,     0,
-       0,     0,     0,     0,  4819,     0,     0,     0,     0,     0,
-       0,  1015,   798,   798,   798,   798,  1928,     0,     0,     0,
-     798,     0,     0,     0,   798,     0,     0,   798,     0,  4834,
-     798,   798,   798,   798,   798,   798,   798,   798,   798,     0,
-     798,     0,     0,     0,     0,     0,     0,   798,  1793,   798,
-       0,  1794,  1795,  1796,     0,  1797,  1798,  1799,  1800,  1801,
-    1802,  1784,     0,     0,     0,     0,  1785,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1013,
-    1784,     0,     0,     0,     0,  1785,     0,  1786,  1787,  1013,
+       0,     0,     0,     0,  1788,  1789,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   823,     0,     0,  1790,
+       0,     0,     0,   823,     0,     0,  1930,     0,     0,  1794,
+       0,  1930,  1016,  1930,   823,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1788,     0,     0,     0,  1786,  1787,     0,     0,
+    1791,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1792,     0,     0,  1793,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1788,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1789,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1790,     0,     0,  1791,
-       0,     0,  1789,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3172,  1790,     0,     0,  1791,     0,
-       0,     0,     0,     0,     0,     0,   798,     0,     0,     0,
+       0,   821,     0,     0,   821,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1013,
+       0,     0,     0,     0,   822,     0,     0,     0,     0,     0,
+       0,  1930,  1795,     0,     0,  1796,  1797,  1798,     0,  1799,
+    1800,  1801,  1802,  1803,  1804,     0,     0,     0,     0,     0,
+       0,     0,     0,   798,  1794,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1015,     0,  1792,  1774,  1015,
-    1015,  1775,     0,     0,     0,  1776,  1777,  1778,  1013,   821,
-       0,     0,     0,  1928,   821,     0,  1792,     0,   821,     0,
-       0,     0,  1779,     0,     0,     0,   821,     0,  1013,     0,
-    1781,     0,     0,     0,     0,     0,  1782,     0,     0,     0,
-       0,     0,     0,     0,   821,     0,     0,   798,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   798,     0,
-    1783,     0,  1015,     0,     0,   798,     0,     0,     0,     0,
-       0,     0,     0,     0,  1015,     0,     0,     0,     0,     0,
-       0,     0,  1013,     0,     0,     0,   821,     0,     0,     0,
-    1793,     0,     0,  1794,  1795,  1796,     0,  1797,  1798,  1799,
-    1800,  1801,  1802,   821,   821,     0,     0,     0,     0,  1793,
-       0,  1015,  1794,  1795,  1796,     0,  1797,  1798,  1799,  1800,
-    1801,  1802,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1928,   821,     0,     0,  1928,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3209,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   821,  1784,     0,     0,   821,     0,
-    1785,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1013,     0,   821,     0,     0,     0,
-       0,  1786,  1787,     0,     0,     0,     0,   821,     0,     0,
-       0,     0,     0,     0,     0,     0,  1788,     0,     0,     0,
-     821,     0,     0,     0,     0,     0,     0,     0,   821,     0,
-     822,     0,     0,     0,     0,     0,     0,   822,     0,     0,
-    1013,     0,     0,     0,     0,     0,     0,  1789,   822,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1790,     0,     0,  1791,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   798,  1015,     0,     0,     0,
-       0,     0,     0,     0,  1928,     0,     0,     0,     0,     0,
+       0,     0,  1931,     0,     0,     0,   821,   821,     0,     0,
+    1016,     0,     0,     0,     0,     0,     0,     0,     0,   821,
+       0,   821,     0,   822,     0,     0,     0,   822,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   822,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1016,
+     798,   798,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1795,     0,     0,
+    1796,  1797,  1798,     0,  1799,  1800,  1801,  1802,  1803,  1804,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   822,   822,     0,   821,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   822,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   798,     0,     0,     0,
+     822,   822,     0,     0,     0,     0,     0,   798,     0,     0,
+       0,     0,   822,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   798,   884,     0,
+       0,     0,     0,     0,     0,     0,     0,   798,   798,     0,
+    1016,     0,     0,     0,   798,   798,     0,     0,     0,   798,
+    1016,     0,     0,     0,   798,     0,     0,   798,   798,     0,
+       0,   885,   798,     0,     0,     0,     0,     0,   798,     0,
+       0,   823,     0,     0,   886,   887,   823,     0,     0,     0,
+       0,     0,     0,     0,   888,     0,   798,   823,   889,     0,
+     798,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   798,   823,     0,     0,   890,   798,     0,     0,
+       0,     0,     0,   798,     0,     0,     0,     0,   823,     0,
+       0,     0,  1931,     0,   823,     0,     0,   891,   798,     0,
+       0,     0,     0,     0,     0,   823,     0,     0,   892,     0,
+       0,     0,     0,   823,     0,     0,   893,     0,     0,     0,
+       0,     0,   798,     0,     0,     0,     0,     0,   894,     0,
+       0,     0,     0,   895,     0,     0,     0,     0,     0,     0,
+    1016,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   896,   821,     0,     0,
+    1930,     0,     0,     0,     0,     0,     0,  1205,  1205,  1016,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   897,     0,     0,   821,     0,     0,     0,     0,  1016,
+       0,     0,     0,     0,     0,     0,   821,     0,   823,  1268,
+       0,     0,   898,     0,   798,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   821,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   899,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1016,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   900,     0,     0,     0,     0,     0,     0,
+       0,   821,     0,   203,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   798,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   798,
+     901,     0,     0,     0,     0,   902,     0,   903,     0,     0,
+       0,     0,     0,   904,     0,     0,   905,     0,     0,     0,
+       0,     0,     0,     0,     0,   822,     0,     0,     0,  1931,
+     822,     0,     0,     0,   822,     0,     0,     0,     0,     0,
+       0,     0,   822,     0,     0,   906,     0,     0,   907,     0,
+       0,     0,   908,  1016,     0,  1016,     0,     0,     0,   909,
+     822,   910,     0,     0,     0,     0,   911,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1792,     0,     0,     0,     0,  1015,     0,     0,     0,
-     821,     0,     0,     0,     0,     0,     0,     0,  1774,   798,
-       0,  1775,     0,  1013,     0,  1776,  1777,  1778,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1779,     0,     0,  3215,     0,     0,     0,     0,
-    1781,     0,     0,     0,     0,     0,  1782,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   821,     0,     0,     0,     0,   798,     0,     0,
-    1783,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1793,     0,     0,  1794,  1795,  1796,
-       0,  1797,  1798,  1799,  1800,  1801,  1802,     0,   821,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1015,     0,     0,     0,     0,     0,
-     821,     0,     0,     0,     0,     0,     0,     0,   821,  1013,
-       0,     0,   798,     0,     0,  1015,     0,     0,   798,     0,
-       0,     0,     0,     0,     0,     0,  1015,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   798,  1013,     0,     0,
+       0,   821,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   912,     0,     0,     0,     0,     0,   798,     0,     0,
+       0,  1016,   822,     0,     0,     0,   798,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   822,
+     822,     0,     0,   798,   798,     0,     0,   798,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   798,     0,     0,     0,     0,   798,     0,  1931,   822,
+       0,   798,  1931,     0,   798,   798,     0,     0,     0,     0,
+       0,     0,   798,   798,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   798,     0,
+       0,     0,   822,     0,     0,   821,   822,   821,     0,     0,
        0,   798,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1784,     0,     0,     0,     0,
-    1785,     0,     0,     0,   798,   798,   798,     0,     0,   798,
-       0,     0,     0,     0,     0,  1013,   883,   798,   798,   798,
-     798,  1786,  1787,     0,     0,  1928,     0,     0,     0,     0,
-     798,  1928,     0,   798,     0,   798,  1788,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   798,   798,     0,   884,
-     798,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   885,   886,   798,   822,   798,  1789,   798,  1013,
-     822,     0,   887,  1013,  1013,     0,   888,     0,     0,     0,
-    1790,   822,     0,  1791,     0,     0,     0,     0,   798,     0,
-       0,     0,     0,     0,   889,     0,     0,   822,     0,   798,
-       0,   798,   798,   798,     0,     0,     0,   823,     0,     0,
-       0,     0,   822,     0,   823,   890,   821,     0,   822,   798,
-       0,     0,     0,     0,     0,   823,   891,     0,     0,   822,
-       0,   798,     0,     0,   892,     0,   798,   822,     0,     0,
-       0,     0,   798,     0,     0,     0,   893,     0,     0,     0,
-       0,   894,   798,     0,     0,     0,     0,     0,     0,     0,
-       0,  1792,  1013,     0,     0,     0,     0,     0,  1015,     0,
-       0,  1015,     0,  1015,   895,     0,     0,     0,  1015,     0,
-     821,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   821,   821,     0,   896,
-       0,     0,   798,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     897,     0,   822,   821,     0,     0,   821,     0,     0,  1015,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1015,     0,     0,     0,
-       0,   898,     0,     0,  1793,     0,     0,  1794,  1795,  1796,
-       0,  1797,  1798,  1799,  1800,  1801,  1802,     0,     0,     0,
-    1015,   899,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   203,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1928,  1928,  1928,     0,     0,     0,   900,     0,
-       0,     0,     0,   901,     0,   902,     0,     0,     0,     0,
-       0,   903,     0,     0,   904,     0,   821,     0,     0,     0,
-       0,     0,     0,     0,     0,  1015,     0,  1015,   821,     0,
+       0,     0,     0,     0,   822,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   822,     0,     0,     0,     0,
+     823,     0,     0,     0,  1016,   821,     0,     0,   822,     0,
+       0,     0,     0,     0,   798,     0,     0,   822,     0,     0,
+     823,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   598,   823,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   599,     0,     0,     0,     0,     0,     0,
+       0,  1930,     0,   821,     0,     0,     0,     0,     0,     0,
+     823,     0,     0,     0,   600,   798,     0,     0,     0,     0,
+       0,   823,     0,     0,  1931,     0,  1733,   601,     0,     0,
+       0,     0,     0,     0,     0,     0,   823,     0,     0,   823,
+       0,   602,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1747,     0,     0,     0,   603,
+       0,     0,     0,     0,     0,     0,     0,     0,   798,     0,
+    1016,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     604,     0,     0,  1765,  1766,  1767,     0,  1769,     0,     0,
+     822,   605,     0,     0,     0,     0,     0,   798,  1016,   606,
+     798,     0,   798,     0,     0,     0,     0,  1811,     0,     0,
+       0,   607,     0,     0,     0,     0,   608,     0,     0,     0,
+       0,     0,   609,     0,     0,     0,   798,     0,     0,     0,
+     798,     0,     0,     0,     0,     0,  1016,     0,     0,   610,
+       0,   798,     0,     0,     0,     0,     0,     0,  1848,     0,
+       0,     0,   822,     0,     0,     0,   823,     0,     0,     0,
+     798,     0,     0,     0,   823,   823,     0,     0,     0,     0,
+       0,     0,     0,     0,  1932,     0,     0,  1952,     0,     0,
+       0,  1964,  1967,     0,  1930,   611,     0,     0,   822,     0,
+    1016,     0,     0,     0,  1016,  1016,     0,     0,     0,   798,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     822,     0,     0,     0,     0,     0,   612,     0,   822,     0,
+       0,     0,     0,     0,     0,     0,     0,   613,  1932,     0,
+       0,     0,     0,     0,     0,     0,   614,     0,     0,     0,
+     798,  1015,     0,     0,     0,     0,   203,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   798,  1015,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   615,     0,     0,     0,     0,   616,     0,
+     617,     0,  1016,  1016,     0,     0,   618,     0,     0,   619,
+       0,     0,     0,     0,     0,  1931,     0,     0,     0,     0,
+       0,  1931,     0,   798,     0,     0,   798,     0,     0,     0,
+       0,     0,     0,     0,     0,   798,     0,     0,   620,     0,
+     798,   621,   798,     0,   798,   622,     0,     0,     0,     0,
+       0,   798,   623,     0,   624,     0,     0,     0,     0,   625,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   798,
+       0,   626,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1014,   627,     0,     0,     0,     0,     0,
        0,     0,   821,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   821,   905,     0,     0,   906,     0,     0,     0,
-     907,     0,     0,     0,     0,     0,     0,   908,     0,   909,
-       0,     0,     0,     0,   910,     0,     0,     0,     0,     0,
+       0,     0,     0,   823,  1014,     0,   822,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1015,     0,     0,   911,
+       0,   798,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   821,     0,     0,     0,     0,
-       0,  1015,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   798,   798,
+       0,  1932,     0,     0,     0,     0,     0,     0,     0,   798,
+       0,     0,     0,     0,     0,     0,     0,   821,   550,     0,
+     822,     0,   823,     0,     0,     0,   823,     0,     0,   798,
+     551,     0,     0,     0,     0,     0,   822,   822,   823,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   552,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   822,   553,   798,   822,     0,     0,     0,
+       0,   798,   798,   798,   554,     0,     0,     0,  -779,     0,
+       0,     0,     0,     0,     0,     0,     0,  1005,     0,     0,
+       0,     0,   798,     0,     0,     0,   555,     0,  1015,     0,
+       0,     0,   556,     0,     0,     0,     0,     0,  1005,     0,
+       0,   823,   823,     0,     0,  1930,     0,   557,  1015,     0,
+       0,     0,     0,     0,   823,     0,     0,  1015,   558,     0,
+       0,     0,     0,     0,     0,     0,   559,     0,     0,   823,
+     823,     0,  1931,  1931,  1931,     0,     0,     0,   560,     0,
+       0,   823,     0,     0,     0,   561,     0,     0,     0,   562,
+       0,     0,     0,     0,     0,     0,   822,     0,     0,     0,
+       0,   798,   798,     0,     0,     0,  -982,  1930,   822,     0,
+       0,     0,   822,     0,     0,   798,     0,     0,     0,     0,
+       0,     0,   822,     0,     0,     0,  1930,   798,   798,  2499,
+       0,     0,     0,  1015,     0,     0,     0,     0,     0,     0,
+       0,     0,  2519,   563,  2521,     0,     0,  2533,  2536,  2541,
+    1014,     0,  -520,     0,  2547,     0,     0,  2552,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1015,     0,     0,     0,     0,
-       0,  1928,  1015,     0,     0,     0,     0,   821,     0,   821,
+    1014,     0,  2559,  2560,  2561,  2562,     0,     0,     0,  1014,
+    2569,     0,     0,   564,  2581,   822,   565,  2583,     0,     0,
+    2590,  2591,  2592,  2593,  2594,  2595,  2596,  2597,  2598,     0,
+    2599,  1932,     0,   566,     0,     0,     0,  1205,     0,  2627,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   821,   823,   821,     0,     0,     0,   823,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   823,     0,
-       0,     0,     0,     0,     0,     0,   598,     0,     0,     0,
-       0,     0,     0,     0,   823,     0,     0,     0,   599,     0,
-    1015,     0,     0,     0,     0,     0,     0,     0,     0,   823,
-       0,     0,     0,     0,     0,   823,     0,   821,  1015,   600,
-       0,     0,     0,   822,     0,     0,   823,     0,     0,     0,
-       0,  1015,   601,     0,   823,     0,     0,     0,     0,     0,
-       0,  1774,     0,   822,  1775,     0,   602,     0,  1776,  1777,
-    1778,     0,     0,     0,     0,   822,     0,     0,     0,     0,
-       0,     0,     0,     0,   603,  1779,     0,     0,     0,     0,
-       0,     0,     0,  1781,   821,     0,     0,     0,     0,  1782,
-       0,     0,     0,   822,     0,   604,   798,     0,     0,   821,
-       0,     0,     0,     0,   822,     0,   605,     0,     0,     0,
-       0,     0,     0,  1783,   606,     0,     0,     0,     0,   822,
-       0,   821,   822,     0,   821,     0,   607,     0,     0,   823,
-       0,   608,     0,     0,     0,     0,     0,   609,     0,     0,
-       0,   798,     0,     0,  1015,     0,     0,     0,     0,     0,
-     798,     0,     0,     0,   610,     0,   798,     0,   798,     0,
-       0,   798,     0,     0,     0,  1015,   798,   798,   798,   798,
-       0,     0,   798,   798,   798,   798,   798,   798,   798,   798,
-     798,   798,     0,     0,     0,   798,   798,     0,     0,     0,
-    1015,     0,     0,     0,     0,   798,     0,     0,     0,   798,
-     611,  1928,     0,   798,     0,     0,     0,     0,     0,     0,
-       0,   798,     0,     0,   798,     0,   798,     0,  1784,     0,
-       0,     0,     0,  1785,  1015,   798,     0,     0,   798,   798,
-       0,   612,     0,   798,   798,     0,     0,     0,     0,   822,
-     798,     0,   613,     0,  1786,  1787,     0,   822,   822,     0,
-     798,   614,   798,     0,     0,     0,     0,  1929,     0,  1788,
-       0,   203,     0,     0,   798,     0,     0,     0,     0,     0,
-     798,   798,   798,     0,     0,  1774,     0,     0,  1775,     0,
-       0,     0,  1776,  1777,  1778,     0,     0,     0,   615,     0,
-    1789,     0,     0,   616,     0,   617,   798,     0,     0,  1779,
-       0,   618,  3742,  1790,   619,     0,  1791,  1781,     0,   798,
-       0,  1929,     0,  1782,     0,  1015,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     798,     0,     0,   620,     0,     0,   621,  1783,     0,     0,
-     622,     0,     0,     0,     0,     0,     0,   623,     0,   624,
-       0,     0,     0,     0,   625,     0,     0,     0,     0,     0,
-       0,     0,   821,     0,     0,     0,   626,     0,     0,     0,
-       0,     0,     0,     0,  1774,     0,     0,  1775,     0,   627,
-       0,  1776,  1777,  1778,  1792,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1779,     0,
-       0,     0,     0,     0,  1928,     0,  1781,     0,     0,  1928,
-    1015,  1928,  1782,  3688,     0,     0,     0,     0,     0,     0,
+       0,  1931,  -414,     0,     0,     0,     0,   822,     0,   822,
+       0,     0,     0,     0,     0,     0,     0,  1015,     0,     0,
+     567,   822,     0,   822,     0,     0,     0,   568,     0,     0,
+       0,     0,     0,  -414,     0,  1014,   569,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1783,     0,     0,     0,
-     823,     0,  1784,     0,     0,     0,     0,  1785,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   821,
-     823,     0,   821,     0,   822,     0,     0,     0,  1786,  1787,
-       0,     0,   823,     0,     0,     0,     0,  1793,     0,     0,
-    1794,  1795,  1796,  1788,  1797,  1798,  1799,  1800,  1801,  1802,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1928,
-     823,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   823,     0,  1929,  1789,     0,     0,     0,     0,     0,
-       0,   798,     0,     0,     0,     0,   823,  1790,     0,   823,
-    1791,     0,     0,     0,   822,     0,     0,     0,   822,     0,
-       0,  1784,     0,     0,   821,   821,  1785,     0,  1015,     0,
-     822,     0,     0,     0,     0,     0,     0,   821,     0,   821,
-       0,     0,     0,     0,     0,     0,     0,  1786,  1787,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1788,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1015,   798,   798,
-       0,     0,     0,     0,     0,     0,     0,     0,  1792,     0,
-       0,     0,     0,  1789,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   822,   822,     0,  1790,     0,     0,  1791,
-       0,     0,     0,     0,     0,     0,   822,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   823,     0,     0,     0,
-       0,   822,   822,   821,   823,   823,     0,     0,     0,     0,
-       0,     0,     0,   822,  1930,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   798,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   798,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  -414,     0,     0,   570,   571,
+       0,   572,   573,     0,     0,     0,     0,   822,     0,     0,
+       0,   574,     0,     0,  1005,     0,   575,     0,     0,     0,
+       0,     0,   576,     0,     0,   577,     0,     0,   578,     0,
+       0,     0,     0,     0,  1005,     0,     0,     0,     0,     0,
+       0,  -414,     0,  1005,     0,     0,  1268,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1793,     0,     0,  1794,  1795,  1796,  1792,  1797,  1798,
-    1799,  1800,  1801,  1802,     0,   798,     0,     0,  1930,     0,
-       0,     0,     0,     0,     0,   798,   798,     0,  1015,     0,
-       0,     0,   798,   798,     0,     0,     0,   798,  1015,     0,
-       0,     0,   798,     0,     0,   798,   798,     0,     0,     0,
-     798,     0,     0,     0,     0,     0,   798,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   798,     0,     0,     0,   798,     0,
-       0,     0,     0,  1929,     0,     0,     0,     0,     0,     0,
-     798,     0,     0,     0,     0,   798,     0,     0,     0,     0,
-    1793,   798,     0,  1794,  1795,  1796,     0,  1797,  1798,  1799,
-    1800,  1801,  1802,     0,     0,     0,   798,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1774,     0,     0,
-    1775,     0,     0,     0,  1776,  1777,  1778,     0,     0,     0,
-     798,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1779,     0,     0,     0,     0,     0,     0,  1015,  1781,
-       0,     0,     0,     0,     0,  1782,     0,     0,     0,     0,
-       0,   823,     0,     0,     0,   821,     0,     0,  1928,     0,
-       0,     0,     0,     0,     0,     0,     0,  1015,     0,  1783,
+       0,     0,     0,     0,   822,     0,     0,     0,     0,  1014,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   822,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   821,     0,     0,     0,     0,  1015,     0,     0,
-       0,     0,     0,     0,   821,     0,     0,     0,     0,     0,
-    1930,     0,   798,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   821,     0,     0,     0,     0,     0,     0,     0,
-       0,   823,     0,     0,     0,   823,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   823,     0,     0,
-       0,  1015,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   821,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1784,     0,   798,     0,     0,  1785,
-       0,     0,     0,     0,     0,     0,   822,   798,     0,     0,
-    1929,   822,     0,     0,     0,   822,     0,     0,     0,     0,
-    1786,  1787,     0,   822,     0,     0,     0,     0,     0,     0,
-     823,   823,     0,     0,     0,  1788,     0,     0,     0,     0,
-       0,   822,     0,   823,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   823,   823,
-       0,  1015,     0,  1015,     0,     0,  1789,     0,     0,     0,
-     823,     0,     0,     0,     0,     0,     0,     0,     0,  1790,
-       0,     0,     0,   822,     0,     0,     0,     0,     0,   821,
+       0,   822,     0,     0,   822,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1005,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     822,   822,     0,     0,     0,   798,     0,     0,     0,  1015,
-       0,     0,     0,     0,   798,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1929,
-     822,   798,   798,  1929,     0,   798,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   798,
-       0,     0,     0,     0,   798,     0,     0,     0,     0,   798,
-    1792,   822,   798,   798,     0,   822,     0,     0,     0,     0,
-     798,   798,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   822,     0,     0,   798,     0,     0,     0,
-    1930,     0,     0,   821,   822,   821,     0,     0,     0,   798,
-       0,     0,     0,     0,     0,     0,     0,   822,     0,     0,
-       0,     0,     0,     0,     0,   822,     0,     0,     0,     0,
+       0,     0,     0,     0,   823,     0,     0,     0,  1932,   823,
+       0,     0,     0,   823,     0,     0,     0,  2737,     0,     0,
+    2001,   823,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   823,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1015,   821,     0,     0,     0,     0,     0,     0,
-       0,     0,   798,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1793,     0,     0,  1794,  1795,  1796,     0,
-    1797,  1798,  1799,  1800,  1801,  1802,     0,     0,     0,     0,
-       0,  1929,     0,     0,     0,     0,     0,     0,     0,  1928,
-       0,   821,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   798,     0,     0,     0,     0,     0,     0,
+       0,  1931,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1774,
-       0,     0,  1775,     0,     0,     0,  1776,  1777,  1778,     0,
-       0,     0,     0,     0,     0,     0,     0,   822,     0,     0,
-       0,     0,     0,     0,     0,     0,   798,     0,  1015,     0,
-       0,  1781,     0,     0,     0,     0,     0,  1782,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   798,  1015,     0,   798,     0,
-     798,  1783,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1004,     0,     0,     0,   822,
-       0,     0,     0,     0,   798,     0,     0,     0,   798,     0,
-       0,     0,     0,   823,  1015,     0,  1004,  1930,   823,   798,
-       0,     0,   823,     0,     0,     0,     0,     0,     0,     0,
-     823,     0,     0,     0,     0,   822,     0,     0,   798,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   823,  1204,
-    1204,     0,     0,     0,     0,     0,     0,   822,     0,     0,
-       0,     0,  1928,     0,     0,   822,     0,     0,  1015,     0,
-       0,     0,  1015,  1015,     0,     0,     0,   798,     0,     0,
-       0,  1267,     0,     0,     0,     0,  1784,     0,     0,     0,
-     823,  1785,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   823,   823,     0,
-       0,     0, -2392, -2392,     0,     0,     0,     0,   798,     0,
-       0,     0,     0,     0,     0,     0,     0,  1788,     0,     0,
-       0,     0,     0,     0,     0,     0,  1930,   823,     0,   798,
-    1930,     0,  1929,     0,     0,     0,     0,     0,  1929,     0,
-       0,     0,     0,     0,     0,     0,     0,     0, -2392,     0,
-    1015,  1015,     0,     0,     0,     0,     0,     0,   823,     0,
-       0,  1790,   823,     0,     0,     0,     0,     0,     0,     0,
-       0,   798,     0,     0,   798,     0,     0,     0,     0,     0,
-     823,     0,     0,   798,     0,     0,     0,     0,   798,     0,
-     798,   823,   798,     0,     0,     0,     0,     0,     0,   798,
-       0,     0,     0,     0,   823,     0,     0,     0,     0,     0,
-       0,     0,   823,     0,     0,     0,     0,   798,     0,     0,
-       0,     0,     0,   822,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1832,
+       0,   823,     0,  2001,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1005,     0,     0,     0,     0,   823,   823,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     821,     0,  1792,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1930,   798,
-       0,  1004,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   822,     0,     0,
-       0,  1004,     0,     0,     0,     0,   798,   798,     0,     0,
-    1004,     0,     0,   822,   822,     0,     0,   798,     0,     0,
-       0,     0,     0,     0,     0,   821,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   798,     0,     0,
-     822,     0,     0,   822,   823,  1793,     0,     0,  1794,  1795,
-    1796,     0,  1797,  1798,  1799,  1800,  1801,  1802,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   798,     0,     0,     0,     0,     0,   798,
-     798,   798,     0,     0,     0,     0,  1004,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     798,     0,     0,     0,     0,     0,   823,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1929,
-    1929,  1929,     0,  1928,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   823,   822,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   822,     0,     0,     0,   822,
-       0,     0,   187,     0,   823,     0,     0,  1731,     0,   822,
-       0,     0,   823,     0,     0,     0,     0,     0,     0,   798,
-     798,     0,     0,     0,     0,  1928,     0,     0,     0,     0,
-    1004,     0,     0,   798,     0,     0,  1745,     0,     0,     0,
-       0,     0,     0,     0,  1928,   798,   798,     0,   188,     0,
+    1015,     0,     0,     0,     0,     0,     0,  1932,   823,     0,
+       0,  1932,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1014,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   189,     0,  1763,  1764,  1765,     0,  1767,     0,
-       0,     0,   822,     0,     0,     0,     0,     0,     0,     0,
-     190,     0,     0,     0,     0,     0,   191,     0,  1809,  1930,
-       0,     0,     0,     0,     0,  1930,     0,     0,     0,     0,
-       0,   192,     0,     0,     0,     0,     0,     0,  1929,     0,
-       0,     0,   193,     0,   822,     0,   822,     0,     0,     0,
-     194,     0,     0,     0,     0,     0,     0,     0,   822,  1846,
-     822,     0,   195,     0,     0,     0,     0,   196,     0,     0,
-       0,     0,     0,   197,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1950,     0,
-     198,     0,  1962,  1965,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1006,     0,     0,     0,     0,     0,
-     823,     0,     0,     0,   822,   199,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1006,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   200,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1004,     0,     0,     0,   201,     0,     0,
-       0,   822,     0,     0,   823,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   822,   202,     0,     0,
-     823,   823,     0,     0,     0,     0,     0,   203,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   822,     0,
-       0,   822,     0,     0,     0,     0,     0,   823,     0,     0,
-     823,     0,     0,     0,   204,     0,  1004,     0,     0,   205,
-       0,   206,     0,     0,     0,     0,     0,   207,     0,     0,
-     208,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1004,     0,     0,     0,     0,     0,   209,   210,
-       0,     0,   211,     0,     0,     0,   212,     0,     0,     0,
-       0,     0,     0,     0,     0,   213,     0,     0,  1929,     0,
-     214,     0,     0,     0,     0,     0,  1930,  1930,  1930,     0,
-       0,     0,   215,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   216,     0,     0,     0,     0,
-     823,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   823,     0,  1007,     0,   823,     0,     0,     0,
-       0,     0,  1004,     0,     0,     0,   823,     0,     0,     0,
-       0,     0,     0,     0,     0,  1007,     0,  1004,     0,     0,
-       0,     0,     0,     0,     0,  1004,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1004,     0,     0,     0,
+       0,   823,     0,     0,     0,   823,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1006,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   823,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   823,     0,     0,     0,     0,     0,
+    1015,     0,     0,     0,     0,  1014,     0,   823,     0,     0,
+       0,     0,   822,     0,     0,  1015,   823,     0,     0,     0,
+       0,     0,     0,  2001,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1015,     0,     0,     0,     0,  2968,
+       0,     0,  1014,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1931,     0,     0,     0,     0,  1931,
+       0,  1931,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1932,     0,     0,     0,     0,     0,     0,
+       0,  1015,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1015,     0,  1005,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1015,     0,     0,   822,
+       0,     0,   822,     0,     0,     0,     0,     0,  1015,     0,
+       0,     0,  1014,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1014,     0,   823,
+       0,     0,     0,     0,     0,  1014,     0,     0,     0,  1931,
+       0,     0,     0,     0,     0,     0,  1014,     0,     0,  1005,
+       0,     0,  1015,     0,     0,  1015,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  3107,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   822,   822,  1005,     0,     0,     0,
+       0,   823,     0,  1014,     0,     0,     0,   822,     0,   822,
+       0,     0,     0,     0,     0,     0,  1014,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1014,     0,
+       0,     0,     0,     0,     0,     0,     0,   823,     0,     0,
+    1014,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,   823,
-    1006,     0,     0,     0,     0,     0,     0,     0,     0,  1006,
-       0,     0,     0,  1004,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1004,     0,     0,     0,
-       0,     0,     0,     0,     0,  1930,     0,     0,  1004,   822,
-       0,   823,     0,   823,     0,     0,     0,     0,     0,     0,
-    1004,     0,     0,     0,     0,   823,     0,   823,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   823,     0,     0,
+    3160,     0,     0,     0,     0,  3166,  1005,     0,     0,     0,
+       0,     0,     0,     0,  1014,     0,     0,  1014,     0,     0,
+       0,  1005,     0,     0,  1015,     0,     0,     0,     0,  1005,
+    1769,     0,     0,   822,     0,     0,     0,     0,     0,     0,
+    1005,  2541,     0,  2541,  2541,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  3224,     0,     0,  3227,     0,  3229,
+       0,     0,  2630,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1932,     0,     0,     0,     0,     0,
+    1932,     0,     0,     0,     0,     0,     0,  1005,  3247,     0,
+    3250,     0,  3252,     0,     0,     0,     0,     0,     0,     0,
+    1005,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1005,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1005,  2627,  2627,  2627,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3300,     0,     0,  1014,     0,     0,     0,
+       0,     0,     0,     0,     0,  1952,     0,     0,     0,     0,
+    3310,     0,     0,     0,     0,   823,  1967,     0,  1005,     0,
+       0,  1005,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1929,     0,     0,     0,  1006,  1929,     0,  1929,     0,
-       0,     0,     0,     0,  1004,     0,     0,  1004,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   823,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  2493,
-       0,     0,     0,     0,     0,     0,   822,     0,     0,   822,
-       0,     0,  2513,     0,  2515,     0,     0,  2527,  2530,  2535,
-       0,     0,     0,     0,  2541,     0,     0,  2546,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   823,     0,
-       0,     0,  2553,  2554,  2555,  2556,  1929,     0,     0,     0,
-    2563,     0,     0,   823,  2575,     0,     0,  2577,     0,  1006,
-    2584,  2585,  2586,  2587,  2588,  2589,  2590,  2591,  2592,     0,
-    2593,     0,     0,     0,     0,   823,     0,  1204,   823,  2621,
-    1007,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   822,   822,     0,     0,     0,  1004,     0,     0,     0,
-    1007,     0,     0,     0,   822,     0,   822,     0,     0,  1007,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  3347,     0,     0,   823,
+       0,     0,     0,     0,     0,     0,     0,     0,  2689,     0,
+       0,     0,  2001,  2695,     0,   823,   823,     0,     0,     0,
+       0,     0,     0,     0,     0,   822,     0,     0,  1931,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   823,     0,     0,   823,     0,     0,     0,     0,
+       0,     0,   822,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   822,     0,     0,     0,     0,     0,
+    1005,     0,     0,     0,     0,  1015,     0,     0,     0,     0,
+       0,     0,   822,     0,     0,     0,     0,  1015,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1930,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1932,  1932,  1932,  1015,     0,     0,     0,     0,   822,
+    1014,     0,     0,     0,  1014,  1014,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   823,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   823,     0,     0,
+       0,   823,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   823,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1009,     0,     0,     0,     0,  1007,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1014,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1014,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     822,  1009,     0,     0,     0,     0,  1267,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   823,     0,     0,     0,     0,   822,
+       0,     0,     0,     0,     0,     0,  1014,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1932,     0,     0,     0,     0,     0,   823,     0,   823,     0,
+       0,     0,     0,  1015,  1005,     0,     0,     0,  1005,  1005,
+     823,     0,   823,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1006,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1007,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2731,     0,     0,
-    1004,     0,     0,     0,  1004,  1004,   823,     0,     0,     0,
-       0,     0,     0,     0,     0,  1006,     0,     0,     0,     0,
+       0,     0,     0,   822,     0,   822,   823,     0,     0,     0,
+       0,  1005,     0,  2001,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1005,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1007,     0,     0,     0,     0,
+       0,     0,     0,   822,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1007,     0,     0,     0,
+    1005,     0,  1008,   823,     0,  1014,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   823,     0,
+       0,     0,     0,  1008,     0,     0,     0,     0,     0,  1931,
+       0,   822,     0,     0,     0,  3695,     0,     0,     0,     0,
+     823,     0,     0,   823,  3699,     0,     0,     0,     0,     0,
+    3700,     0,  3701,     0,     0,     0,     0,  1010,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1015,     0,     0,     0,  1014,     0,     0,  1010,  3725,
+    3726,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1015,     0,     0,     0,     0,  2547,     0,     0,
+       0,     0,     0,  1015,     0,  3751,     0,     0,  3754,     0,
+    3756,     0,     0,     0,     0,     0,     0,     0,     0,  3760,
+    1932,     0,     0,     0,     0,     0,     0,  3767,  3768,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  3812,  1005,
+       0,     0,     0,     0,  3819,  3820,  2627,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3835,     0,     0,  1014,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1268,     0,     0,     0,     0,     0,     0,
+       0,     0,  1931,     0,  1014,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1014,     0,     0,     0,  1005,
+       0,     0,     0,     0,     0,     0,     0,     0,  2630,  2630,
+    2630,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1010,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1930,     0,
-       0,  1006,     0,  1930,     0,  1930,     0,     0,     0,  1010,
-       0,     0,     0,     0,     0,     0,     0,  1004,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1004,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   823,     0,     0,   823,     0,     0,     0,
-       0,     0,   822,     0,     0,  1929,  1004,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1006,     0,     0,     0,     0,     0,     0,     0,   822,
-       0,     0,     0,  1930,     0,     0,  1006,     0,     0,     0,
-       0,   822,     0,     0,  1006,     0,  1009,     0,     0,     0,
-       0,     0,     0,     0,     0,  1006,     0,     0,     0,   822,
-       0,     0,     0,     0,     0,     0,  1009,     0,     0,     0,
-       0,     0,  1007,     0,     0,  1009,     0,     0,   823,   823,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   823,     0,   823,     0,     0,     0,     0,     0,     0,
-       0,     0,  1006,     0,     0,  2962,   822,     0,     0,     0,
-       0,     0,     0,     0,     0,  1006,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1006,     0,     0,
-       0,     0,     0,     0,     0,  1007,     0,     0,     0,  1006,
+       0,     0,  1007,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1009,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1004,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   823,  1007,     0,     0,     0,     0,     0,     0,  1008,
        0,  1007,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1006,     0,     0,  1006,   823,     0,     0,
+       0,     0,     0,     0,     0,  2001,     0,     0,  2695,  1008,
+    2695,     0,     0,     0,     0,  2001,     0,     0,  1008,     0,
+       0,     0,     0,  1932,     0,     0,     0,     0,  1932,     0,
+    1932,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1010,     0,     0,  1005,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1010,     0,  1015,  1007,  1005,     0,
+       0,     0,     0,  1010,     0,     0,     0,     0,   823,  1005,
+       0,   823,     0,  1015,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1008,     0,     0,     0,     0,     0,
+     822,     0,     0,     0,     0,     0,     0,  2001,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1932,     0,
+       0,     0,     0,     0,     0,     0,     0,  1014,     0,     0,
+    1014,     0,  1014,     0,     0,     0,     0,  1014,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1010,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   823,   823,     0,     0,     0,     0,     0,
+       0,  1007,  1015,     0,  1015,   822,   823,     0,   823,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1014,     0,
+       0,     0,  4078,  4079,     0,     0,     0,     0,  1008,     0,
+       0,     0,     0,     0,     0,  1014,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1010,     0,   822,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1014,
+       0,     0,     0,  1015,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1004,     0,     0,  1010,     0,     0,     0,     0,     0,
-       0,     0,     0,  1010,     0,     0,     0,  3101,     0,     0,
-       0,  1007,     0,     0,     0,  1009,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1007,     0,     0,     0,
+       0,     0,     0,  1010,     0,     0,     0,     0,  1015,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  4119,     0,
+       0,     0,   823,  1931,     0,     0,     0,     0,     0,  4124,
+       0,  1005,  2695,     0,  1005,     0,  1005,     0,     0,  2695,
+       0,  1005,     0,     0,  1014,     0,  1014,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  4139,
+    4141,     0,     0,     0,     0,     0,  4145,  4146,     0,     0,
+       0,  4147,     0,     0,     0,  1931,  4150,     0,     0,  4153,
+    4154,     0,  1005,     0,  4158,     0,     0,  1015,     0,     0,
+    4162,     0,     0,     0,  1931,  1014,     0,     0,     0,  1005,
+       0,     0,     0,     0,     0,  2695,     0,     0,     0,     0,
+       0,     0,     0,     0,  1007,     0,     0,     0,  1015,     0,
+    1014,     0,     0,  1005,  2627,     0,     0,     0,     0,  2627,
+       0,     0,     0,     0,     0,  2627,     0,     0,     0,     0,
+       0,  1008,     0,     0,  1014,     0,     0,     0,     0,     0,
+    1205,  1014,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  4217,     0,     0,  1007,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1005,     0,
+    1005,     0,     0,     0,     0,     0,  1010,     0,     0,     0,
+       0,     0,     0,     0,  1008,     0,     0,     0,     0,  1014,
        0,     0,     0,     0,  1007,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1007,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1015,     0,     0,     0,     0,     0,  1014,     0,     0,
+    1011,     0,     0,     0,   823,     0,     0,  1932,     0,     0,
+    1014,  1008,  1015,     0,     0,     0,     0,     0,     0,  1005,
+       0,  1011,     0,     0,     0,     0,  4273,     0,     0,  1010,
+       0,   823,     0,     0,     0,     0,     0,  1015,     0,     0,
+       0,     0,     0,   823,  1005,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1006,     0,     0,     0,  1010,
-     822,     0,   822,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1007,     0,     0,     0,  3154,     0,     0,     0,
-       0,  3160,     0,     0,     0,  1007,     0,     0,     0,  1004,
+       0,   823,     0,     0,  1007,     0,  1010,     0,  1005,     0,
+       0,  1015,     0,     0,     0,  1005,     0,     0,     0,  1007,
        0,     0,     0,     0,     0,     0,     0,  1007,     0,     0,
-     822,     0,     0,     0,     0,     0,  1767,     0,     0,  1007,
-    1004,     0,     0,     0,     0,     0,     0,  2535,     0,  2535,
-    2535,  1004,     0,     0,     0,     0,     0,     0,     0,     0,
-    3218,     0,     0,  3221,     0,  3223,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1929,     0,   822,   823,
-       0,     0,  1930,  1007,     0,     0,  1007,     0,     0,     0,
-       0,     0,     0,  1010,  3241,     0,  3244,     0,  3246,     0,
-       0,     0,     0,     0,     0,     0,   823,     0,     0,     0,
+       0,  1008,     0,     0,     0,     0,     0,     0,  1007,     0,
+    4318,     0,     0,     0,     0,     0,  1008,     0,   823,     0,
+       0,     0,     0,  1014,  1008,     0,     0,     0,     0,  2630,
+       0,     0,     0,     0,     0,  1008,     0,     0,     0,     0,
+       0,     0,     0,  1005,  1014,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1007,  1010,     0,     0,     0,
+       0,  1005,     0,     0,     0,     0,     0,     0,  1007,  1014,
+       0,  1010,  2001,     0,  1005,     0,     0,     0,     0,  1010,
+    1007,     0,  1008,     0,     0,     0,     0,     0,     0,     0,
+    1010,     0,  1007,     0,     0,  1008,     0,     0,     0,     0,
+       0,     0,     0,  1014,     0,     0,     0,  1008,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1008,
        0,     0,     0,     0,     0,     0,     0,     0,   823,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1009,     0,
-       0,  2621,  2621,  2621,     0,     0,   823,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3294,
+       0,     0,     0,     0,     0,     0,  1007,  1010,     0,  1007,
+       0,     0,     0,     0,     0,  4410,  4411,     0,     0,  4412,
+    1010,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1010,  1008,     0,     0,  1008,  2695,     0,     0,
+       0,     0,     0,     0,  1010,     0,     0,  1005,     0,     0,
+       0,     0,     0,     0,  4446,  4447,     0,     0,     0,     0,
+       0,     0,     0,     0,  1014,     0,     0,  1011,  1005,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1011,  1010,     0,
+       0,  1010,     0,  1005,     0,     0,  1011,     0,     0,     0,
+       0,     0,   823,     0,   823,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1950,     0,     0,     0,     0,  3304,     0,     0,     0,
-       0,     0,  1965,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   823,     0,     0,     0,     0,     0,     0,
-       0,  1009,     0,     0,     0,     0,     0,     0,     0,  1006,
-       0,     0,     0,  1006,  1006,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1007,     0,     0,     0,  1012,
-       0,     0,     0,     0,     0,     0,     0,  1009,     0,     0,
-       0,     0,  3341,     0,     0,     0,     0,     0,     0,     0,
-    1012,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1004,     0,     0,  1004,     0,  1004,  1929,
-       0,     0,     0,  1004,     0,     0,  1006,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1006,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   823,     0,     0,  1010,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1009,     0,     0,
-       0,     0,     0,     0,  1004,  1006,     0,     0,     0,     0,
-       0,     0,  1009,     0,     0,     0,     0,     0,     0,     0,
-    1009,  1004,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1009,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1004,     0,     0,     0,  1010,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1009,     0,
-       0,     0,     0,     0,     0,  1010,     0,   823,     0,   823,
-       0,  1009,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1009,     0,     0,     0,     0,     0,     0,
-    1004,     0,  1004,     0,     0,  1009,     0,     0,     0,  1007,
-       0,     0,     0,  1007,  1007,     0,     0,   823,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   822,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1009,
-    1006,     0,  1009,     0,     0,  1010,     0,     0,     0,     0,
-       0,  1004,     0,  1930,     0,   823,     0,     0,     0,     0,
-    1010,     0,     0,     0,     0,     0,  1007,     0,  1010,     0,
-       0,     0,     0,     0,     0,  1012,  1004,     0,  1007,  1010,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   822,     0,     0,  1012,     0,     0,     0,     0,
-    1004,     0,     0,     0,  1012,     0,     0,  1004,     0,     0,
-    1006,     0,     0,     0,     0,  1007,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1010,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1010,
+       0,     0,     0,     0,     0,     0,     0,  1005,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1007,     0,
+       0,     0,   823,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1014,
+       0,     0,     0,     0,     0,  1008,     0,     0,     0,     0,
+       0,     0,  1011,     0,     0,  1015,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1932,     0,
+     823,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1010,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1010,     0,  1004,     0,     0,     0,     0,
-       0,  1009,     0,     0,     0,     0,     0,     0,     0,     0,
-    1012,     0,     0,  1004,     0,     0,     0,     0,     0,     0,
-    1929,     0,     0,     0,     0,     0,  1004,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1010,     0,     0,
-    1010,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1006,     0,
-       0,     0,     0,     0,     0,     0,  1930,     0,     0,     0,
-       0,  3689,     0,     0,     0,     0,     0,     0,     0,  1006,
-    3693,     0,  1929,     0,     0,     0,  3694,     0,  3695,     0,
-    1006,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1007,  1929,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   550,     0,  1012,  3719,  3720,     0,     0,     0,
-       0,     0,     0,     0,   551,     0,     0,     0,     0,  1004,
-       0,     0,     0,  2541,     0,     0,     0,     0,     0,     0,
-       0,  3745,     0,     0,  3748,   552,  3750,     0,     0,     0,
-    1004,     0,     0,     0,     0,  3754,     0,     0,   553,     0,
-       0,     0,     0,  3761,  3762,     0,     0,     0,   554,  1010,
-    1007,     0,  -777,     0,     0,  1004,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     555,     0,     0,     0,  3806,     0,   556,     0,     0,     0,
-    3813,  3814,  2621,     0,     0,     0,     0,     0,     0,  1004,
-       0,   557,     0,     0,     0,  1009,     0,     0,     0,  1009,
-    1009,     0,   558,     0,     0,     0,  3829,     0,     0,     0,
-     559,     0,     0,     0,     0,     0,     0,     0,     0,  1267,
-       0,     0,   560,     0,     0,     0,     0,     0,     0,   561,
-       0,     0,     0,   562,   823,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    -980,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1009,     0,     0,     0,     0,     0,  1007,     0,
-       0,     0,  1006,     0,  1009,  1006,     0,  1006,     0,     0,
-    1004,     0,  1006,     0,     0,     0,     0,   563,     0,  1007,
-       0,     0,     0,     0,     0,     0,  -519,  1012,     0,     0,
-    1007,     0,     0,     0,     0,     0,     0,     0,     0,   823,
-       0,  1009,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   564,     0,     0,
-     565,     0,     0,  1006,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   566,     0,     0,
-    1006,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1012,     0,     0,  1010,     0,     0,  -413,  1010,  1010,     0,
-       0,     0,     0,     0,  1006,  1004,     0,     0,     0,     0,
-       0,     0,     0,     0,   567,     0,     0,     0,     0,     0,
-       0,   568,     0,     0,     0,     0,  1012,  -413,     0,     0,
-     569,     0,     0,     0,     0,     0,     0,  1930,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  -413,
-    1010,     0,   570,   571,     0,   572,   573,     0,     0,  1006,
-       0,  1006,  1010,     0,     0,   574,     0,     0,     0,     0,
-     575,     0,     0,     0,     0,     0,   576,     0,     0,   577,
-       0,     0,   578,     0,     0,     0,  1009,     0,     0,  1930,
-       0,     0,     0,     0,     0,  -413,  1012,     0,     0,  1010,
-       0,     0,     0,     0,     0,     0,     0,     0,  1930,     0,
-       0,  1012,     0,     0,     0,     0,     0,     0,     0,  1012,
-    1006,     0,  1007,     0,     0,  1007,     0,  1007,  4072,  4073,
-    1012,     0,  1007,  1004,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1006,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1009,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1006,
-       0,     0,     0,     0,     0,     0,  1006,  1012,     0,     0,
-       0,     0,  1004,  1007,     0,     0,     0,     0,     0,     0,
-    1012,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1007,     0,  1012,     0,  4113,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1012,  4118,     0,     0,     0,     0,
-       0,     0,     0,     0,  1007,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1006,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1013,  1005,     0,
+    1010,     0,     0,     0,  2001,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1013,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1006,     0,  1010,  4133,  4135,     0,  1012,     0,
-       0,  1012,  4139,  4140,     0,  1006,     0,  4141,     0,     0,
-       0,     0,  4144,     0,  1009,  4147,  4148,     0,     0,     0,
-    4152,     0,     0,     0,     0,     0,  4156,     0,     0,  1007,
-       0,  1007,     0,     0,     0,  1009,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1009,     0,     0,     0,
-       0,     0,     0,  1004,     0,     0,     0,     0,     0,     0,
-    2621,     0,     0,  1004,  1010,  2621,     0,     0,     0,     0,
-       0,  2621,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1204,     0,     0,     0,
-    1007,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1006,     0,
-    4211,     0,     0,     0,     0,  1007,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1006,
-    1012,     0,     0,     0,     0,     0,     0,     0,     0,  1007,
-       0,     0,     0,     0,     0,     0,  1007,     0,     0,     0,
-       0,     0,     0,     0,  1006,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  2547,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1011,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  4609,     0,
+       0,     0,     0,     0,     0,     0,     0,  1014,     0,     0,
+       0,     0,     0,  1769,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1005,     0,     0,     0,     0,     0,     0,
+       0,     0,  1268,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1010,  1004,     0,     0,     0,     0,  1006,     0,
-       0,     0,  4267,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1010,  1007,     0,     0,     0,     0,     0,
-       0,     0,  1004,     0,  1010,     0,     0,     0,     0,     0,
-       0,     0,  1007,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1004,     0,     0,  1007,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1009,     0,
-       0,  1009,     0,  1009,     0,     0,     0,     0,  1009,     0,
-       0,     0,     0,     0,     0,     0,  4312,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1006,
-       0,     0,     0,     0,     0,     0,  1004,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1014,     0,     0,     0,
+       0,     0,  1007,     0,     0,  1015,  1007,  1007,     0,     0,
+       0,  4659,     0,     0,     0,  1015,     0,     0,     0,     0,
+       0,  1932,     0,     0,     0,     0,     0,     0,     0,  1008,
+       0,     0,     0,  1008,  1008,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1009,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1009,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2630,     0,  1007,
+       0,     0,  2630,  4698,     0,     0,     0,     0,  2630,     0,
+       0,  1007,     0,     0,  1010,     0,     0,     0,  1010,  1010,
+       0,     0,     0,     0,     0,     0,  1008,     0,     0,     0,
+       0,  1005,     0,     0,     0,     0,     0,     0,  1008,     0,
        0,     0,     0,     0,     0,     0,     0,     0,  1007,     0,
-       0,     0,     0,     0,  1012,     0,     0,     0,  1012,  1012,
-    1009,     0,     0,     0,     0,     0,     0,     0,     0,  1007,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1006,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1007,     0,     0,     0,  1004,     0,
+       0,     0,     0,     0,     0,     0,     0,  1014,     0,  1011,
+       0,     0,     0,     0,     0,  1015,  4446,  1014,     0,     0,
+       0,     0,     0,     0,     0,  1008,     0,     0,     0,     0,
+    1005,  1010,     0,     0,  1013,     0,     0,     0,     0,     0,
+       0,  4755,     0,  1010,  1015,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1013,     0,     0,     0,     0,     0,
+       0,     0,     0,  1013,  1015,     0,     0,     0,     0,     0,
+       0,     0,  1011,     0,     0,     0,     0,     0,     0,     0,
+    1010,     0,     0,     0,     0,     0,     0,     0,     0,   823,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1011,
+       0,     0,     0,     0,     0,     0,     0,     0,  1015,     0,
+    4804,  4804,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  4446,     0,     0,     0,     0,     0,  1014,     0,  1013,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  4404,  4405,     0,     0,  4406,     0,  1804,     0,     0,
-       0,  1012,     0,     0,     0,  1009,  1010,  1009,  1007,  1010,
-       0,  1010,     0,  1012,     0,     0,  1010,     0,     0,     0,
-       0,     0,     0,     0,  1004,     0,     0,     0,     0,     0,
-    4440,  4441,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1007,     0,     0,
+       0,  1005,     0,     0,   823,     0,  1014,     0,     0,     0,
+       0,  1005,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1008,     0,  1014,     0,     0,  1011,
+       0,     0,     0,     0,     0,  4804,     0,     0,     0,     0,
+       0,     0,     0,     0,  1011,     0,     0,     0,     0,     0,
+       0,     0,  1011,     0,  4872,     0,     0,     0,  4371,     0,
+    1015,     0,     0,  1011,     0,     0,     0,  1007,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1010,
+    1014,     0,     0,  1013,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1008,     0,     0,     0,     0,     0,
+       0,     0,  1932,     0,     0,     0,  1015,     0,     0,     0,
+    1011,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1011,     0,     0,     0,     0,     0,     0,
+       0,  1005,     0,  4804,  4912,  1011,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1011,     0,  1010,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1012,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1804,     0,     0,     0,     0,     0,  1009,  1010,     0,     0,
+    1005,     0,     0,     0,  1932,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1010,     0,     0,     0,     0,     0,
-       0,  1009,     0,     0,     0,     0,     0,     0,     0,  1007,
-       0,     0,  1006,     0,     0,     0,     0,     0,  1010,     0,
-       0,     0,     0,     0,     0,  1009,     0,     0,     0,     0,
-       0,     0,  1009,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1004,     0,     0,
-       0,  1006,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1010,     0,  1010,     0,     0,     0,     0,
-    1009,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1007,     0,     0,     0,  1009,     0,
-       0,     0,     0,     0,     0,  1012,     0,     0,     0,     0,
-       0,  1009,     0,     0,     0,     0,     0,     0,     0,     0,
+    1005,     0,  1014,  1932,     0,  1007,     0,     0,     0,     0,
+       0,  1011,     0,     0,  1011,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1007,     0,     0,     0,
+       0,     0,  1008,     0,     0,     0,     0,  1007,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1014,  2695,
+       0,     0,     0,  1008,  1005,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1008,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1010,     0,     0,     0,  2541,     0,
+       0,     0,     0,     0,     0,     0,     0,  1010,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1013,     0,  1010,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,  1010,
-       0,     0,     0,  1004,  4603,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1012,     0,     0,     0,  1767,
-       0,     0,  1006,  1010,     0,     0,     0,     0,     0,     0,
-    1010,  1004,  1006,     0,     0,     0,     0,     0,  1267,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1009,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1004,
-       0,     0,  1007,     0,     0,  1009,     0,  4653,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1010,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1009,     0,     0,     0,     0,     0,  1010,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1010,
-       0,  1007,     0,  1004,     0,     0,     0,  1004,  1004,     0,
-       0,     0,     0,  1012,  1009,     0,     0,     0,     0,  4692,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1006,     0,  1012,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1012,     0,     0,     0,     0,
+       0,     0,     0,  1011,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1005,     0,     0,     0,
+       0,     0,     0,     0,     0,  2695,     0,     0,     0,  1013,
+       0,  1014,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1015,     0,     0,     0,     0,     0,     0,
+       0,     0,  1005,     0,     0,     0,  1013,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1006,     0,     0,     0,     0,     0,     0,     0,  1804,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1006,  4440,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1004,     0,     0,     0,
-       0,     0,  1010,     0,     0,  1009,     0,  4749,     0,     0,
+       0,  1015,     0,     0,     0,     0,     0,     0,     0,  1007,
+       0,     0,  1007,     0,  1007,     0,     0,     0,     0,  1007,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1008,     0,     0,  1008,
+       0,  1008,     0,     0,     0,     0,  1008,     0,     0,     0,
+       0,     0,     0,     0,     0,  1015,  1013,  1014,     0,  1015,
+    1015,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1007,  1013,     0,     0,     0,     0,     0,     0,     0,  1013,
+       0,     0,     0,     0,     0,  1014,     0,  1007,     0,     0,
+    1013,  1010,     0,     0,  1010,  1005,  1010,  1008,     0,     0,
+       0,  1010,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1007,     0,     0,  1008,     0,     0,     0,     0,     0,
+       0,     0,     0,  1014,     0,     0,     0,  1011,     0,     0,
+       0,  1011,  1011,     0,     0,     0,     0,  1013,  1008,     0,
+       0,     0,     0,     0,     0,     0,     0,  4371,  1015,     0,
+    1013,     0,  1010,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1013,     0,     0,     0,     0,     0,     0,  1010,
+       0,     0,     0,     0,  1013,     0,  1007,  1014,  1007,     0,
+       0,  1014,  1014,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1010,  1011,     0,     0,     0,     0,     0,
+       0,     0,     0,  1008,     0,  1008,  1011,     0,     0,     0,
+       0,  1005,     0,     0,     0,     0,     0,     0,  1013,     0,
+       0,  1013,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1007,     0,  1005,
+       0,     0,     0,  1011,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1806,     0,     0,  1010,     0,
+    1010,     0,  1007,     0,  1008,     0,     0,     0,     0,     0,
+    1014,     0,     0,     0,     0,     0,     0,  1005,     0,     0,
+       0,     0,     0,     0,     0,     0,  1007,     0,     0,  1008,
+       0,     0,     0,  1007,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1008,     0,     0,     0,     0,  1806,  1010,
+    1008,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1005,     0,     0,     0,  1005,  1005,     0,     0,     0,
+       0,     0,     0,     0,  1010,     0,     0,     0,     0,     0,
+    1013,  1007,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1010,  1007,
+       0,     0,     0,     0,     0,  1010,     0,     0,  1008,     0,
+       0,     0,  1007,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1008,     0,     0,     0,
+       0,     0,  1011,     0,     0,     0,     0,     0,     0,  1008,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1005,     0,     0,     0,     0,     0,
        0,     0,     0,  1010,     0,     0,     0,     0,     0,     0,
-       0,     0,  1007,     0,     0,  1006,     0,     0,     0,     0,
-       0,     0,  1007,     0,  1804,     0,     0,     0,  1010,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1804,     0,
-       0,     0,  2523,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1804,  1804,  1804,     0,
-    1804,     0,  1010,     0,     0,     0,  4798,  4798,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  4440,     0,     0,
-    1009,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1804,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1006,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1012,     0,     0,
-    1012,     0,  1012,     0,     0,     0,     0,  1012,     0,  1804,
-       0,  4798,  1007,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1010,     0,     0,     0,     0,     0,     0,
-    4866,     0,     0,  1006,     0,     0,     0,     0,     0,     0,
-       0,  1007,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1012,     0,
-       0,  1007,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1012,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1009,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1012,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  4798,
-    4906,     0,     0,  1804,     0,  1007,     0,     0,  1010,     0,
-       0,     0,     0,     0,     0,  1804,     0,     0,  1804,     0,
-       0,     0,     0,     0,     0,     0,     0,  1009,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1006,     0,     0,     0,
-       0,     0,     0,     0,  1012,     0,  1012,     0,     0,     0,
+       0,  1010,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1010,     0,     0,     0,     0,     0,
+       0,     0,  1011,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1007,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1007,     0,     0,     0,
+       0,     0,  1008,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1007,     0,  1008,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1008,     0,
+       0,     0,     0,     0,  1013,  1007,     0,  1010,  1013,  1013,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1007,     0,     0,
-       0,     0,     0,     0,     0,  1012,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1010,     0,
+    1011,     0,  1008,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1011,     0,  1010,     0,     0,     0,     0,     0,     0,
+       0,     0,  1011,     0,     0,     0,     0,     0,     0,     0,
+       0,  1013,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1013,     0,     0,     0,  1010,     0,     0,
+       0,     0,     0,     0,     0,     0,  1007,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1012,     0,     0,     0,     0,     0,  1010,     0,     0,     0,
-       0,     0,     0,  1007,     0,     0,     0,     0,  1009,     0,
-       0,     0,  1006,     0,  1012,     0,     0,     0,  1009,     0,
-       0,  1012,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1006,     0,     0,     0,     0,  1010,     0,     0,     0,     0,
+    1013,     0,     0,  1008,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1806,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1006,  1012,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1012,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1010,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1012,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1007,     0,     0,     0,
-       0,     0,  1006,     0,     0,     0,  1006,  1006,  1009,     0,
+       0,  1007,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1008,     0,
+       0,     0,     0,  1806,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1806,     0,     0,
+       0,  2529,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1806,  1806,  1806,     0,  1806,
+       0,     0,     0,     0,  1011,     0,     0,  1011,     0,  1011,
+       0,     0,     0,  1010,  1011,     0,     0,     0,     0,  1013,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1806,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1011,     0,     0,     0,  1007,
+       0,     0,     0,     0,     0,     0,     0,     0,  1806,     0,
+       0,     0,  1011,     0,     0,     0,     0,     0,     0,  1013,
+       0,     0,     0,     0,     0,     0,  1008,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1011,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1007,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1009,     0,     0,
-       0,     0,     0,     0,     0,     0,  1010,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1010,  1009,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1008,     0,     0,     0,     0,
+       0,  1010,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1012,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1006,     0,     0,     0,     0,
-       0,     0,     0,     0,  1012,     0,     0,     0,     0,     0,
-       0,  1009,  1007,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1012,
+       0,  1011,     0,  1011,     0,     0,     0,     0,     0,     0,
+       0,     0,  1806,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1806,     0,     0,  1806,     0,     0,
+    1010,     0,     0,     0,     0,     0,     0,  1013,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1007,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1013,     0,
+       0,     0,  1011,     0,     0,     0,     0,     0,     0,  1013,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1007,
+       0,     0,     0,     0,     0,     0,     0,  1011,     0,  1007,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1012,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1010,     0,  1007,     0,
+       0,     0,     0,     0,     0,     0,  1008,     0,     0,     0,
+       0,  1011,     0,     0,     0,     0,  1008,     0,  1011,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1010,     0,     0,     0,     0,
-       0,     0,     0,  1009,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1010,     0,     0,     0,     0,
-       0,     0,  1007,     0,     0,     0,  1007,  1007,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1012,     0,     0,     0,     0,  1009,
-       0,     0,     0,     0,     0,     0,  1804,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1010,
-       0,     0,     0,     0,     0,     0,  1804,     0,  1804,     0,
-       0,  2523,  2523,     0,  3195,     0,  2523,     0,     0,     0,
-    1804,     0,     0,  1804,     0,     0,     0,     0,  1804,     0,
-       0,     0,     0,     0,  1804,     0,     0,     0,     0,  1804,
-       0,     0,     0,     0,     0,  1007,  1804,  1804,  1804,  1804,
-       0,     0,     0,  2523,  2523,     0,  1804,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1804,  1012,
-    1804,     0,     0,     0,     0,     0,     0,  1804,  1804,  1804,
-    1804,  1804,  1804,  1804,  1804,  1804,  1804,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1010,  1009,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1804,     0,     0,     0,     0,     0,
+       0,  1010,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1010,     0,     0,     0,     0,  1011,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1011,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1011,     0,  1007,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1010,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1008,     0,  1007,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1007,     0,
+       0,     0,     0,     0,     0,  1008,     0,     0,     0,     0,
+       0,  1013,     0,     0,  1013,     0,  1013,     0,     0,     0,
+       0,  1013,     0,     0,     0,  1008,     0,     0,     0,     0,
+       0,  1010,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1011,     0,  1007,     0,     0,     0,     0,     0,     0,     0,
+    1010,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1011,  1013,     0,     0,     0,     0,     0,     0,  1008,
+    1010,     0,     0,     0,     0,     0,     0,     0,     0,  1013,
+       0,     0,     0,     0,     0,     0,  1011,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1013,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1012,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1009,     0,
-       0,     0,     0,     0,  1804,     0,     0,     0,     0,     0,
+    1011,     0,     0,     0,  1010,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1009,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1012,     0,     0,     0,
+       0,     0,     0,     0,  1007,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1010,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1009,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1013,     0,
+    1013,  1008,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1007,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1011,     0,     0,     0,     0,     0,  1008,     0,     0,
+       0,     0,     0,     0,     0,     0,  1010,     0,     0,  1013,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1009,     0,
-       0,     0,  1009,  1009,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1013,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1010,     0,     0,     0,     0,     0,  1013,     0,
+       0,     0,     0,     0,     0,  1013,     0,     0,     0,  1806,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1011,     0,     0,  1806,
+       0,  1806,     0,  1007,  2529,  2529,     0,  3201,     0,  2529,
+       0,     0,     0,  1806,     0,     0,  1806,     0,     0,     0,
+       0,  1806,     0,     0,     0,     0,     0,  1806,     0,     0,
+    1008,     0,  1806,  1013,     0,     0,     0,     0,     0,  1806,
+    1806,  1806,  1806,     0,     0,     0,  2529,  2529,     0,  1806,
+       0,  1013,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1806,     0,  1806,  1013,     0,     0,     0,     0,     0,
+    1806,  1806,  1806,  1806,  1806,  1806,  1806,  1806,  1806,  1806,
+       0,     0,     0,     0,     0,  1010,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1010,  1012,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1012,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1806,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1007,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1010,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1011,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1008,  1007,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1009,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1013,     0,     0,
+       0,     0,     0,     0,  1008,     0,     0,     0,     0,     0,
+       0,     0,     0,  1011,     0,  1007,     0,     0,  1013,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1010,     0,     0,  1804,     0,     0,     0,     0,
+       0,  1010,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1008,  1013,     0,     0,     0,  1806,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1010,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1007,
+       0,     0,     0,  1007,  1007,     0,     0,  1013,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1008,  1010,     0,     0,
+    1008,  1008,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1010,     0,     0,     0,
-    1010,  1010,     0,     0,     0,     0,     0,  1012,     0,     0,
+       0,     0,     0,     0,  1011,     0,     0,     0,     0,     0,
+       0,  1010,     0,     0,  1011,  1010,  1010,     0,     0,     0,
+       0,     0,  1007,     0,     0,     0,     0,     0,  1013,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1008,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1012,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1012,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1804,     0,     0,     0,     0,  1010,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1010,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1012,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1013,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1011,     0,     0,     0,  1806,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1804,     0,     0,
-       0,     0,     0,  1804,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3195,
-    3195,     0,     0,  2523,  2523,  2523,  2523,     0,     0,  2523,
-    2523,  2523,  2523,  2523,  2523,  2523,  2523,  2523,  2523,  3195,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1011,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1804,     0,     0,  1804,     0,  1804,     0,     0,  3195,
-    3195,     0,  1012,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1804,  2523,  2523,  1804,     0,  1804,
+       0,     0,     0,  1011,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1012,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1804,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1804,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1011,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1804,     0,     0,     0,     0,     0,
+       0,  1013,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1806,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1013,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1806,     0,     0,     0,     0,     0,  1806,     0,     0,  1011,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1012,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  3201,  3201,     0,     0,  2529,  2529,  2529,  2529,
+       0,     0,  2529,  2529,  2529,  2529,  2529,  2529,  2529,  2529,
+    2529,  2529,  3201,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1011,     0,     0,     0,     0,
+       0,     0,     0,     0,  1806,     0,     0,  1806,     0,  1806,
+       0,     0,  3201,  3201,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1806,  2529,  2529,
+    1806,     0,  1806,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1013,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1013,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1806,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1806,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1011,     0,
+       0,     0,     0,     0,     0,     0,     0,  1806,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1013,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1012,     0,     0,
+    1013,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  2523,     0,
-       0,     0,     0,     0,     0,  1012,     0,     0,     0,     0,
+    1013,     0,     0,     0,  1011,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1011,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1012,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1013,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1011,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2529,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1012,     0,     0,
-       0,  1012,  1012,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1011,     0,     0,     0,  1011,  1011,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1013,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1804,     0,     0,     0,  1804,  1804,  1804,     0,
-       0,     0,     0,     0,  3195,  3195,  3195,  3195,     0,     0,
-       0,     0,  3195,  3195,  3195,  3195,  3195,  3195,  3195,  3195,
-    3195,  3195,  1804,  1804,     0,     0,     0,     0,     0,     0,
-    1012,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1804,     0,
-       0,  1804,     0,  1804,     0,     0,     0,  1804,     0,     0,
-    3195,  3195,     0,     0,  1804,  1804,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1013,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1011,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1804,
-       0,     0,     0,     0,     0,     0,  1804,  1804,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1804,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1806,     0,     0,     0,  1806,
+    1806,  1806,     0,     0,     0,     0,     0,  3201,  3201,  3201,
+    3201,     0,     0,     0,     0,  3201,  3201,  3201,  3201,  3201,
+    3201,  3201,  3201,  3201,  3201,  1806,  1806,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1806,     0,     0,  1806,     0,  1806,     0,     0,     0,
+    1806,     0,     0,  3201,  3201,     0,     0,  1806,  1806,     0,
+       0,     0,     0,     0,     0,  1013,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1806,     0,     0,     0,     0,     0,     0,  1806,
+    1806,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1806,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1013,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1013,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1013,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  3195,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1013,     0,     0,     0,  1013,  1013,     0,     0,  3201,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1804,  1804,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1806,  1806,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1804,     0,     0,     0,
-       0,  1804,  2523,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1804,     0,  1804,     0,
-       0,     0,  1804,  1804,  1804,     0,     0,  1804,     0,     0,
-    1804,  1804,     0,     0,     0,  1804,     0,     0,     0,  1804,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1013,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1806,
+       0,     0,     0,     0,  1806,  2529,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1806,
+       0,  1806,     0,     0,     0,  1806,  1806,  1806,     0,     0,
+    1806,     0,     0,  1806,  1806,     0,     0,     0,  1806,     0,
+       0,     0,  1806,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1804,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1806,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1804,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1806,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1804,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1806,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -4911,12 +4910,12 @@
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  3195,  2523,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1804,  1804,  1804,
+       0,     0,     0,     0,  3201,  2529,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1806,  1806,  1806,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1804,  1804,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1806,  1806,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -4931,1582 +4930,1539 @@
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    3195,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1804,     0,     0,     0,
+       0,     0,     0,  3201,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1806,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1804,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1806,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1804,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1806,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1804,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1806,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1804,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1806,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     771,  1122,   593,  1123,  1124,  1125,   646,  1126,     0,     0,
+       0,     0,     0,   771,  1123,   593,  1124,  1125,  1126,   646,
+    1127,     0,     0,     0,     0,     0,     0,     0,   220,   221,
+     222,   223,   224,   225,   226,   227,  2621,   229,   230,   231,
+       0,     0,  1806,     0,  1128,     0,     0,   232,   233,     0,
+     234,   235,   772,   236,   237,   238,   239,  1129,   773,  1130,
+    1131,     0,   243,   244,   245,   246,   247,  1132,  1133,   248,
+     249,  1134,  1135,   252,     0,   253,   254,   255,   256,  1136,
+       0,  1137,  1806,   258,   259,   260,   261,   775,   262,   263,
+     264,     0,   265,   266,   267,   268,   269,   270,     0,   776,
+     271,   272,   273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,
+     274,   275,   276,   277,   278,   279,  1145,  1146,   282,     0,
+     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
+     291,  2622,     0,   292,   293,   986,   295,   296,     0,   297,
+     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
+     306,  1147,   308,   309,   310,  1148,  1149,   312,     0,   313,
+     314,  1150,   316,     0,   317,     0,   318,   778,     0,   779,
+     319,   320,   321,     0,   322,  1151,     0,  1152,   325,     0,
+     326,   327,   328,   329,   330,   780,   331,   332,   333,   334,
+       0,   335,   336,   337,   338,   339,   340,     0,   341,   781,
+     342,   343,   344,   345,   346,  1153,  1154,     0,  1155,     0,
+     350,   782,   783,   351,   784,   352,   353,   354,   355,   356,
+       0,     0,   357,  1156,   785,   359,   786,     0,   360,   361,
+     362,  1157,  1158,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,  1159,   787,
+    1160,   380,   381,   382,  1161,   383,   384,   788,   385,  1162,
+    1163,   387,  1164,   389,   390,   391,     0,   392,     0,     0,
+    1165,   394,   395,     0,     0,   396,   397,   789,   398,   790,
+    1166,   400,   401,   402,   403,   404,   405,   406,     0,   407,
+     408,  1167,   410,   411,   412,   413,   414,     0,   415,   416,
+     417,   418,   419,   420,   421,   422,  1168,   424,   425,   426,
+     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
+    1169,   445,   446,   447,   448,   449,   450,   451,   452,     0,
+     453,   454,   455,   456,   457,  1170,   458,   459,   460,   461,
+     462,   792,   463,   464,  1171,   466,     0,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,  1172,     0,
+     479,   480,     0,   481,   793,   482,   483,   484,   485,   486,
+       0,  1173,  1174,     0,     0,   489,   490,  1175,   492,  1176,
+    1177,   494,   495,   496,   497,   498,   499,   500,     0,  1178,
+     501,   502,   503,   504,   505,  1179,     0,   506,   507,   508,
+     509,   510,   511,  1180,  2623,   513,   794,   514,   515,   516,
+     517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
+     523,   524,   525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,
+    1188,   534,   535,   536,  1189,     0,     0,     0,     0,     0,
+       0,  1190,  1191,  2624,     0,     0,     0,     0,     0,     0,
+    1193,  2625,   771,  1123,   593,  1124,  1125,  1126,   646,  1127,
+       0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
+     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
+       0,     0,     0,  1128,     0,     0,   232,   233,     0,   234,
+     235,   772,   236,   237,   238,   239,  1129,   773,  1130,  1131,
+       0,   243,   244,   245,   246,   247,  1132,  1133,   248,   249,
+    1134,  1135,   252,     0,   253,   254,   255,   256,  1136,     0,
+    1137,     0,   258,   259,   260,   261,   775,   262,   263,   264,
+       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
+     272,   273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,
+     275,   276,   277,   278,   279,  1145,  1146,   282,     0,   283,
+       0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
+       0,     0,   292,   293,   986,   295,   296,     0,   297,   298,
+     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
+    1147,   308,   309,   310,  1148,  1149,   312,     0,   313,   314,
+    1150,   316,     0,   317,     0,   318,   778,     0,   779,   319,
+     320,   321,     0,   322,  1151,     0,  1152,   325,     0,   326,
+     327,   328,   329,   330,   780,   331,   332,   333,   334,     0,
+     335,   336,   337,   338,   339,   340,     0,   341,   781,   342,
+     343,   344,   345,   346,  1153,  1154,     0,  1155,     0,   350,
+     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
+       0,   357,  1156,   785,   359,   786,     0,   360,   361,   362,
+    1157,  1158,   363,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,   377,  1159,   787,  1160,
+     380,   381,   382,  1161,   383,   384,   788,   385,  1162,  1163,
+     387,  1164,   389,   390,   391,     0,   392,     0,     0,  1165,
+     394,   395,     0,     0,   396,   397,   789,   398,   790,  1166,
+     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
+    1167,   410,   411,   412,   413,   414,     0,   415,   416,   417,
+     418,   419,   420,   421,   422,  1168,   424,   425,   426,   427,
+       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
+     437,   438,     0,   439,   440,   791,   441,   442,   443,  1169,
+     445,   446,   447,   448,   449,   450,   451,   452,    39,   453,
+     454,   455,   456,   457,  1170,   458,   459,   460,   461,   462,
+     792,   463,   464,  1171,   466,     0,   467,   468,   469,   470,
+     471,   472,   473,   474,   475,   476,   477,  1172,     0,   479,
+     480,    43,   481,   793,   482,   483,   484,   485,   486,     0,
+    1173,  1174,     0,     0,   489,   490,  1175,   492,  1176,  1177,
+     494,   495,   496,   497,   498,   499,   500,     0,  1178,   501,
+     502,   503,   504,   505,  1179,     0,   506,   507,   508,   509,
+     510,  1059,  1180,     0,   513,   794,   514,   515,   516,   517,
+       0,     0,   518,     0,    48,   519,   520,   521,   522,   523,
+     524,   525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,
+     534,   535,   536,  1189,     0,    49,     0,     0,     0,     0,
+    1190,  1191,     0,     0,     0,     0,     0,     0,     0,  1193,
+    4621,   771,  1123,   593,  1124,  1125,  1126,   646,  1127,     0,
+       0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
+     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
+       0,     0,  1128,     0,     0,   232,   233,     0,   234,   235,
+     772,   236,   237,   238,   239,  1129,   773,  1130,  1131,     0,
+     243,   244,   245,   246,   247,  1132,  1133,   248,   249,  1134,
+    1135,   252,     0,   253,   254,   255,   256,  1136,     0,  1137,
+       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
+     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
+     273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,   275,
+     276,   277,   278,   279,  1145,  1146,   282,     0,   283,     0,
+     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
+       0,   292,   293,   986,   295,   296,     0,   297,   298,   299,
+       0,   300,   301,   302,     0,   303,   304,   305,   306,  1147,
+     308,   309,   310,  1148,  1149,   312,     0,   313,   314,  1150,
+     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
+     321,     0,   322,  1151,     0,  1152,   325,     0,   326,   327,
+     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
+     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
+     344,   345,   346,  1153,  1154,     0,  1155,     0,   350,   782,
+     783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
+     357,  1156,   785,   359,   786,     0,   360,   361,   362,  1157,
+    1158,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,  1159,   787,  1160,   380,
+     381,   382,  1161,   383,   384,   788,   385,  1162,  1163,   387,
+    1164,   389,   390,   391,     0,   392,     0,     0,  1165,   394,
+     395,     0,     0,   396,   397,   789,   398,   790,  1166,   400,
+     401,   402,   403,   404,   405,   406,     0,   407,   408,  1167,
+     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
+     419,   420,   421,   422,  1168,   424,   425,   426,   427,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,     0,   439,   440,   791,   441,   442,   443,  1169,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,  1170,   458,   459,   460,   461,   462,   792,
+     463,   464,  1171,   466,     0,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,  1172,     0,   479,   480,
+       0,   481,   793,   482,   483,   484,   485,   486,     0,  1173,
+    1174,     0,     0,   489,   490,  1175,   492,  1176,  1177,   494,
+     495,   496,   497,   498,   499,   500,     0,  1178,   501,   502,
+     503,   504,   505,  1179,     0,   506,   507,   508,   509,   510,
+     511,  1180,     0,   513,   794,   514,   515,   516,   517,     0,
+       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
+     525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,
+     535,   536,  1189,     0,     0,     0,     0,     0,     0,  1190,
+    1191,     0,     0,     0,     0,     0,     0,     0,  1193,  2531,
+     771,  1123,   593,  1124,  1125,  1126,   646,  1127,     0,     0,
        0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,  2615,   229,   230,   231,     0,     0,  1804,
-       0,  1127,     0,     0,   232,   233,     0,   234,   235,   772,
-     236,   237,   238,   239,  1128,   773,  1129,  1130,     0,   243,
-     244,   245,   246,   247,  1131,  1132,   248,   249,  1133,  1134,
-     252,     0,   253,   254,   255,   256,  1135,     0,  1136,  1804,
+     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
+       0,  1128,     0,     0,   232,   233,     0,   234,   235,   772,
+     236,   237,   238,   239,  1129,   773,  1130,  1131,     0,   243,
+     244,   245,   246,   247,  1132,  1133,   248,   249,  1134,  1135,
+     252,     0,   253,   254,   255,   256,  1136,     0,  1137,     0,
      258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
      266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
-    1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,   275,   276,
-     277,   278,   279,  1144,  1145,   282,     0,   283,     0,   284,
-     285,   286,   287,   288,     0,   289,   290,   291,  2616,     0,
-     292,   293,   985,   295,   296,     0,   297,   298,   299,     0,
-     300,   301,   302,     0,   303,   304,   305,   306,  1146,   308,
-     309,   310,  1147,  1148,   312,     0,   313,   314,  1149,   316,
+    1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,   275,   276,
+     277,   278,   279,  1145,  1146,   282,     0,   283,     0,   284,
+     285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
+     292,   293,   986,   295,   296,     0,   297,   298,   299,     0,
+     300,   301,   302,     0,   303,   304,   305,   306,  1147,   308,
+     309,   310,  1148,  1149,   312,     0,   313,   314,  1150,   316,
        0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
-       0,   322,  1150,     0,  1151,   325,     0,   326,   327,   328,
+       0,   322,  1151,     0,  1152,   325,     0,   326,   327,   328,
      329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
      337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
-     345,   346,  1152,  1153,     0,  1154,     0,   350,   782,   783,
+     345,   346,  1153,  1154,     0,  1155,     0,   350,   782,   783,
      351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
-    1155,   785,   359,   786,     0,   360,   361,   362,  1156,  1157,
+    1156,   785,   359,   786,     0,   360,   361,   362,  1157,  1158,
      363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,  1158,   787,  1159,   380,   381,
-     382,  1160,   383,   384,   788,   385,  1161,  1162,   387,  1163,
-     389,   390,   391,     0,   392,     0,     0,  1164,   394,   395,
-       0,     0,   396,   397,   789,   398,   790,  1165,   400,   401,
-     402,   403,   404,   405,   406,     0,   407,   408,  1166,   410,
+     373,   374,   375,   376,   377,  1159,   787,  1160,   380,   381,
+     382,  1161,   383,   384,   788,   385,  1162,  1163,   387,  1164,
+     389,   390,   391,     0,   392,     0,     0,  1165,   394,   395,
+       0,     0,   396,   397,   789,   398,   790,  1166,   400,   401,
+     402,   403,   404,   405,   406,     0,   407,   408,  1167,   410,
      411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
-     420,   421,   422,  1167,   424,   425,   426,   427,     0,   428,
+     420,   421,   422,  1168,   424,   425,   426,   427,     0,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,   791,   441,   442,   443,  1168,   445,   446,
+       0,   439,   440,   791,   441,   442,   443,  1169,   445,   446,
      447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,  1169,   458,   459,   460,   461,   462,   792,   463,
-     464,  1170,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,  1171,     0,   479,   480,     0,
-     481,   793,   482,   483,   484,   485,   486,     0,  1172,  1173,
-       0,     0,   489,   490,  1174,   492,  1175,  1176,   494,   495,
-     496,   497,   498,   499,   500,     0,  1177,   501,   502,   503,
-     504,   505,  1178,     0,   506,   507,   508,   509,   510,   511,
-    1179,  2617,   513,   794,   514,   515,   516,   517,     0,     0,
+     456,   457,  1170,   458,   459,   460,   461,   462,   792,   463,
+     464,  1171,   466,     0,   467,   468,   469,   470,   471,   472,
+     473,   474,   475,   476,   477,  1172,     0,   479,   480,     0,
+     481,   793,   482,   483,   484,   485,   486,     0,  1173,  1174,
+       0,     0,   489,   490,  1175,   492,  1176,  1177,   494,   495,
+     496,   497,   498,   499,   500,     0,  1178,   501,   502,   503,
+     504,   505,  1179,     0,   506,   507,   508,   509,   510,   511,
+    1180,     0,   513,   794,   514,   515,   516,   517,     0,     0,
      518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
-    1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,   534,   535,
-     536,  1188,     0,     0,     0,     0,     0,     0,  1189,  1190,
-    2618,     0,     0,     0,     0,     0,     0,  1192,  2619,   771,
-    1122,   593,  1123,  1124,  1125,   646,  1126,     0,     0,     0,
+    1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,   535,
+     536,  1189,     0,     0,     0,     0,     0,     0,  1190,  1191,
+       0,     0,     0,     0,     0,     0,     0,  1193,  3703,   771,
+    1123,   593,  1124,  1125,  1126,   646,  1127,     0,     0,     0,
        0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
      226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
-    1127,     0,     0,   232,   233,     0,   234,   235,   772,   236,
-     237,   238,   239,  1128,   773,  1129,  1130,     0,   243,   244,
-     245,   246,   247,  1131,  1132,   248,   249,  1133,  1134,   252,
-       0,   253,   254,   255,   256,  1135,     0,  1136,     0,   258,
+    1128,     0,     0,   232,   233,     0,   234,   235,   772,   236,
+     237,   238,   239,  1129,   773,  1130,  1131,     0,   243,   244,
+     245,   246,   247,  1132,  1133,   248,   249,  1134,  1135,   252,
+       0,   253,   254,   255,   256,  1136,     0,  1137,     0,   258,
      259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
-     267,   268,   269,   270,     0,   776,   271,   272,   273,  1137,
-    1138,  1139,  1140,  1141,  1142,  1143,   274,   275,   276,   277,
-     278,   279,  1144,  1145,   282,     0,   283,     0,   284,   285,
+     267,   268,   269,   270,     0,   776,   271,   272,   273,  1138,
+    1139,  1140,  1141,  1142,  1143,  1144,   274,   275,   276,   277,
+     278,   279,  1145,  1146,   282,     0,   283,     0,   284,   285,
      286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
-     293,   985,   295,   296,     0,   297,   298,   299,     0,   300,
-     301,   302,     0,   303,   304,   305,   306,  1146,   308,   309,
-     310,  1147,  1148,   312,     0,   313,   314,  1149,   316,     0,
+     293,   986,   295,   296,     0,   297,   298,   299,     0,   300,
+     301,   302,     0,   303,   304,   305,   306,  1147,   308,   309,
+     310,  1148,  1149,   312,     0,   313,   314,  1150,   316,     0,
      317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
-     322,  1150,     0,  1151,   325,     0,   326,   327,   328,   329,
+     322,  1151,     0,  1152,   325,     0,   326,   327,   328,   329,
      330,   780,   331,   332,   333,   334,     0,   335,   336,   337,
      338,   339,   340,     0,   341,   781,   342,   343,   344,   345,
-     346,  1152,  1153,     0,  1154,     0,   350,   782,   783,   351,
-     784,   352,   353,   354,   355,   356,     0,     0,   357,  1155,
-     785,   359,   786,     0,   360,   361,   362,  1156,  1157,   363,
+     346,  1153,  1154,     0,  1155,     0,   350,   782,   783,   351,
+     784,   352,   353,   354,   355,   356,     0,     0,   357,  1156,
+     785,   359,   786,     0,   360,   361,   362,  1157,  1158,   363,
      364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,  1158,   787,  1159,   380,   381,   382,
-    1160,   383,   384,   788,   385,  1161,  1162,   387,  1163,   389,
-     390,   391,     0,   392,     0,     0,  1164,   394,   395,     0,
-       0,   396,   397,   789,   398,   790,  1165,   400,   401,   402,
-     403,   404,   405,   406,     0,   407,   408,  1166,   410,   411,
+     374,   375,   376,   377,  1159,   787,  1160,   380,   381,   382,
+    1161,   383,   384,   788,   385,  1162,  1163,   387,  1164,   389,
+     390,   391,     0,   392,     0,     0,  1165,   394,   395,     0,
+       0,   396,   397,   789,   398,   790,  1166,   400,   401,   402,
+     403,   404,   405,   406,     0,   407,   408,  1167,   410,   411,
      412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
-     421,   422,  1167,   424,   425,   426,   427,     0,   428,   429,
+     421,   422,  1168,   424,   425,   426,   427,     0,   428,   429,
      430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
-     439,   440,   791,   441,   442,   443,  1168,   445,   446,   447,
-     448,   449,   450,   451,   452,    39,   453,   454,   455,   456,
-     457,  1169,   458,   459,   460,   461,   462,   792,   463,   464,
-    1170,   466,     0,   467,   468,   469,   470,   471,   472,   473,
-     474,   475,   476,   477,  1171,     0,   479,   480,    43,   481,
-     793,   482,   483,   484,   485,   486,     0,  1172,  1173,     0,
-       0,   489,   490,  1174,   492,  1175,  1176,   494,   495,   496,
-     497,   498,   499,   500,     0,  1177,   501,   502,   503,   504,
-     505,  1178,     0,   506,   507,   508,   509,   510,  1058,  1179,
+     439,   440,   791,   441,   442,   443,  1169,   445,   446,   447,
+     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
+     457,  1170,   458,   459,   460,   461,   462,   792,   463,   464,
+    1171,   466,     0,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,  1172,     0,   479,   480,     0,   481,
+     793,   482,   483,   484,   485,   486,     0,  1173,  1174,     0,
+       0,   489,   490,  1175,   492,  1176,  1177,   494,   495,   496,
+     497,   498,   499,   500,     0,  1178,   501,   502,   503,   504,
+     505,  1179,     0,   506,   507,   508,   509,   510,   511,  1180,
        0,   513,   794,   514,   515,   516,   517,     0,     0,   518,
-       0,    48,   519,   520,   521,   522,   523,   524,   525,  1180,
-    1181,  1182,  1183,  1184,  1185,  1186,  1187,   534,   535,   536,
-    1188,     0,    49,     0,     0,     0,     0,  1189,  1190,     0,
-       0,     0,     0,     0,     0,     0,  1192,  4615,   771,  1122,
-     593,  1123,  1124,  1125,   646,  1126,     0,     0,     0,     0,
-       0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,     0,   229,   230,   231,     0,     0,     0,     0,  1127,
-       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
-     238,   239,  1128,   773,  1129,  1130,     0,   243,   244,   245,
-     246,   247,  1131,  1132,   248,   249,  1133,  1134,   252,     0,
-     253,   254,   255,   256,  1135,     0,  1136,     0,   258,   259,
-     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
-     268,   269,   270,     0,   776,   271,   272,   273,  1137,  1138,
-    1139,  1140,  1141,  1142,  1143,   274,   275,   276,   277,   278,
-     279,  1144,  1145,   282,     0,   283,     0,   284,   285,   286,
-     287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
-     985,   295,   296,     0,   297,   298,   299,     0,   300,   301,
-     302,     0,   303,   304,   305,   306,  1146,   308,   309,   310,
-    1147,  1148,   312,     0,   313,   314,  1149,   316,     0,   317,
-       0,   318,   778,     0,   779,   319,   320,   321,     0,   322,
-    1150,     0,  1151,   325,     0,   326,   327,   328,   329,   330,
-     780,   331,   332,   333,   334,     0,   335,   336,   337,   338,
-     339,   340,     0,   341,   781,   342,   343,   344,   345,   346,
-    1152,  1153,     0,  1154,     0,   350,   782,   783,   351,   784,
-     352,   353,   354,   355,   356,     0,     0,   357,  1155,   785,
-     359,   786,     0,   360,   361,   362,  1156,  1157,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,  1158,   787,  1159,   380,   381,   382,  1160,
-     383,   384,   788,   385,  1161,  1162,   387,  1163,   389,   390,
-     391,     0,   392,     0,     0,  1164,   394,   395,     0,     0,
-     396,   397,   789,   398,   790,  1165,   400,   401,   402,   403,
-     404,   405,   406,     0,   407,   408,  1166,   410,   411,   412,
-     413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
-     422,  1167,   424,   425,   426,   427,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,   791,   441,   442,   443,  1168,   445,   446,   447,   448,
-     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
-    1169,   458,   459,   460,   461,   462,   792,   463,   464,  1170,
-     466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,  1171,     0,   479,   480,     0,   481,   793,
-     482,   483,   484,   485,   486,     0,  1172,  1173,     0,     0,
-     489,   490,  1174,   492,  1175,  1176,   494,   495,   496,   497,
-     498,   499,   500,     0,  1177,   501,   502,   503,   504,   505,
-    1178,     0,   506,   507,   508,   509,   510,   511,  1179,     0,
-     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
-       0,   519,   520,   521,   522,   523,   524,   525,  1180,  1181,
-    1182,  1183,  1184,  1185,  1186,  1187,   534,   535,   536,  1188,
-       0,     0,     0,     0,     0,     0,  1189,  1190,     0,     0,
-       0,     0,     0,     0,     0,  1192,  2525,   771,  1122,   593,
-    1123,  1124,  1125,   646,  1126,     0,     0,     0,     0,     0,
-       0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
-       0,   229,   230,   231,     0,     0,     0,     0,  1127,     0,
-       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
-     239,  1128,   773,  1129,  1130,     0,   243,   244,   245,   246,
-     247,  1131,  1132,   248,   249,  1133,  1134,   252,     0,   253,
-     254,   255,   256,  1135,     0,  1136,     0,   258,   259,   260,
-     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
-     269,   270,     0,   776,   271,   272,   273,  1137,  1138,  1139,
-    1140,  1141,  1142,  1143,   274,   275,   276,   277,   278,   279,
-    1144,  1145,   282,     0,   283,     0,   284,   285,   286,   287,
-     288,     0,   289,   290,   291,     0,     0,   292,   293,   985,
-     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
-       0,   303,   304,   305,   306,  1146,   308,   309,   310,  1147,
-    1148,   312,     0,   313,   314,  1149,   316,     0,   317,     0,
-     318,   778,     0,   779,   319,   320,   321,     0,   322,  1150,
-       0,  1151,   325,     0,   326,   327,   328,   329,   330,   780,
-     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
-     340,     0,   341,   781,   342,   343,   344,   345,   346,  1152,
-    1153,     0,  1154,     0,   350,   782,   783,   351,   784,   352,
-     353,   354,   355,   356,     0,     0,   357,  1155,   785,   359,
-     786,     0,   360,   361,   362,  1156,  1157,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,  1158,   787,  1159,   380,   381,   382,  1160,   383,
-     384,   788,   385,  1161,  1162,   387,  1163,   389,   390,   391,
-       0,   392,     0,     0,  1164,   394,   395,     0,     0,   396,
-     397,   789,   398,   790,  1165,   400,   401,   402,   403,   404,
-     405,   406,     0,   407,   408,  1166,   410,   411,   412,   413,
-     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
-    1167,   424,   425,   426,   427,     0,   428,   429,   430,   431,
+       0,     0,   519,   520,   521,   522,   523,   524,   525,  1181,
+    1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,   535,   536,
+    1189,     0,     0,   219,     0,     0,     0,  1190,  1191,     0,
+       0,     0,     0,     0,     0,     0,  1193,  3774,   220,   221,
+     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
+       0,     0,     0,     0,     0,  3790,     0,   232,   233,     0,
+     234,   235,     0,   236,   237,   238,   239,   240,     0,   241,
+     242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
+     249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
+       0,     0,     0,   258,   259,   260,   261,     0,   262,   263,
+     264,     0,   265,   266,   267,   268,   269,   270,     0, -1581,
+     271,   272,   273,     0,     0,     0,     0,     0,     0,     0,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
+     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
+     291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
+     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
+     314,   315,   316,     0,   317,     0,   318,     0,     0, -1581,
+     319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
+     326,   327,   328,   329,   330,     0,   331,   332,   333,   334,
+       0,   335,   336,   337,   338,   339,   340,     0,   341, -1581,
+     342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
+     350,     0,     0,   351, -1581,   352,   353,   354,   355,   356,
+       0,     0,   357,   358, -1581,   359,     0,     0,   360,   361,
+     362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378, -1581,
+     379,   380,   381,   382,     0,   383,   384,     0,   385,     0,
+     386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
+     393,   394,   395,     0,     0,   396,   397,     0,   398,     0,
+     399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
+     408,   409,   410,   411,   412,   413,   414,     0,   415,   416,
+     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
+     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,     0,   439,   440, -1581,   441,   442,   443,
+     444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
+     453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
+     462,     0,   463,   464,   465,   466,     0,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
+     479,   480,     0,   481,     0,   482,   483,   484,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
+     501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
+     509,   510,   511,   512,     0,   513,     0,   514,   515,   516,
+     517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
+     523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
+     533,   534,   535,   536,     0,     0,     0,   978,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1275,   220,   221,   222,   223,   224,   225,   226,   227,
+       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
+       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
+       0,   979,   773,   980,   981,     0,   243,   244,   245,   246,
+     247,     0,     0,   248,   249,   982,   983,   252,     0,   253,
+     254,   255,   256,     0,     0,   774,     0,   258,   259,   260,
+     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
+     269,   270,     0,   776,   271,   272,   273,     0,     0,     0,
+     777,     0,     0,     0,   274,   275,   276,   277,   278,   279,
+     984,   985,   282,     0,   283,     0,   284,   285,   286,   287,
+     288,     0,   289,   290,   291,     0,     0,   292,   293,   986,
+     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
+       0,   303,   304,   305,   306,     0,   308,   309,   310,     0,
+       0,   312,     0,   313,   314,   987,   316,     0,   317,     0,
+     318,   778,     0,   779,   319,   320,   321,     0,   322,     0,
+       0,     0,   325,     0,   326,   327,   328,   329,   330,   780,
+     331,   332,   333,   334,  1987,   335,   336,   337,   338,   339,
+     340,     0,   341,   781,  1988,   343,   344,   345,   346,   989,
+     990,     0,   991,     0,   350,   782,   783,   351,   784,   352,
+     353,   354,   355,   356,     0,     0,   357,     0,   785,   359,
+     786,     0,   360,   361,   362,     0,     0,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   992,   787,   993,   380,   381,     0,     0,   383,
+     384,   788,   385,     0,     0,   387,   994,   389,   390,   391,
+       0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
+    1990,   789,   398,   790,     0,   400,   401,   402,   403,   404,
+     405,   406,     0,   407,   408,     0,   410,     0,   412,   413,
+     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
+     995,   424,   425,   426,   427,     0,   428,   429,   430,   431,
      432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
-     791,   441,   442,   443,  1168,   445,   446,   447,   448,   449,
-     450,   451,   452,     0,   453,   454,   455,   456,   457,  1169,
-     458,   459,   460,   461,   462,   792,   463,   464,  1170,   466,
+     791,   441,   442,   443,     0,   445,   446,   447,   448,   449,
+     450,   451,   452,     0,   453,   454,   455,   456,   457,     0,
+     458,   459,  1991,   461,   462,   792,   463,   464,   997,   466,
        0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,  1171,     0,   479,   480,     0,   481,   793,   482,
-     483,   484,   485,   486,     0,  1172,  1173,     0,     0,   489,
-     490,  1174,   492,  1175,  1176,   494,   495,   496,   497,   498,
-     499,   500,     0,  1177,   501,   502,   503,   504,   505,  1178,
-       0,   506,   507,   508,   509,   510,   511,  1179,     0,   513,
+     476,   477,     0,     0,   479,   480,     0,   481,   793,   482,
+     483,   484,   485,   486,     0,   998,   999,     0,     0,   489,
+     490,     0,   492,     0,     0,   494,   495,   496,   497,   498,
+     499,   500,     0,     0,   501,   502,   503,   504,   505,     0,
+       0,   506,   507,   508,   509,   510,     0,  1000,  1992,   513,
      794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
-     519,   520,   521,   522,   523,   524,   525,  1180,  1181,  1182,
-    1183,  1184,  1185,  1186,  1187,   534,   535,   536,  1188,     0,
-       0,     0,     0,     0,     0,  1189,  1190,     0,     0,     0,
-       0,     0,     0,     0,  1192,  3697,   771,  1122,   593,  1123,
-    1124,  1125,   646,  1126,     0,     0,     0,     0,     0,     0,
+     519,   520,   521,   522,   523,   524,   978,     0,     0,     0,
+       0,     0,     0,     0,     0,   534,   535,   536,     0,     0,
        0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
-     229,   230,   231,     0,     0,     0,     0,  1127,     0,     0,
-     232,   233,     0,   234,   235,   772,   236,   237,   238,   239,
-    1128,   773,  1129,  1130,     0,   243,   244,   245,   246,   247,
-    1131,  1132,   248,   249,  1133,  1134,   252,     0,   253,   254,
-     255,   256,  1135,     0,  1136,     0,   258,   259,   260,   261,
+     229,   230,   231,     0,     0,  2096,     0,     0,     0,     0,
+     232,   233,     0,   234,   235,   772,   236,   237,   238,     0,
+     979,   773,   980,   981,     0,   243,   244,   245,   246,   247,
+       0,     0,   248,   249,   982,   983,   252,     0,   253,   254,
+     255,   256,     0,     0,   774,     0,   258,   259,   260,   261,
      775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
-     270,     0,   776,   271,   272,   273,  1137,  1138,  1139,  1140,
-    1141,  1142,  1143,   274,   275,   276,   277,   278,   279,  1144,
-    1145,   282,     0,   283,     0,   284,   285,   286,   287,   288,
-       0,   289,   290,   291,     0,     0,   292,   293,   985,   295,
+     270,     0,   776,   271,   272,   273,     0,     0,     0,   777,
+       0,     0,     0,   274,   275,   276,   277,   278,   279,   984,
+     985,   282,     0,   283,     0,   284,   285,   286,   287,   288,
+       0,   289,   290,   291,     0,     0,   292,   293,   986,   295,
      296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
-     303,   304,   305,   306,  1146,   308,   309,   310,  1147,  1148,
-     312,     0,   313,   314,  1149,   316,     0,   317,     0,   318,
-     778,     0,   779,   319,   320,   321,     0,   322,  1150,     0,
-    1151,   325,     0,   326,   327,   328,   329,   330,   780,   331,
-     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
-       0,   341,   781,   342,   343,   344,   345,   346,  1152,  1153,
-       0,  1154,     0,   350,   782,   783,   351,   784,   352,   353,
-     354,   355,   356,     0,     0,   357,  1155,   785,   359,   786,
-       0,   360,   361,   362,  1156,  1157,   363,   364,   365,   366,
+     303,   304,   305,   306,     0,   308,   309,   310,     0,     0,
+     312,     0,   313,   314,   987,   316,     0,   317,     0,   318,
+     778,     0,   779,   319,   320,   321,     0,   322,     0,     0,
+       0,   325,     0,   326,   327,   328,   329,   330,   780,   331,
+     332,   333,   334,  1987,   335,   336,   337,   338,   339,   340,
+       0,   341,   781,  1988,   343,   344,   345,   346,   989,   990,
+       0,   991,     0,   350,   782,   783,   351,   784,   352,   353,
+     354,   355,   356,     0,     0,   357,     0,   785,   359,   786,
+       0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
      367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,  1158,   787,  1159,   380,   381,   382,  1160,   383,   384,
-     788,   385,  1161,  1162,   387,  1163,   389,   390,   391,     0,
-     392,     0,     0,  1164,   394,   395,     0,     0,   396,   397,
-     789,   398,   790,  1165,   400,   401,   402,   403,   404,   405,
-     406,     0,   407,   408,  1166,   410,   411,   412,   413,   414,
-       0,   415,   416,   417,   418,   419,   420,   421,   422,  1167,
+     377,   992,   787,   993,   380,   381,     0,     0,   383,   384,
+     788,   385,     0,     0,   387,   994,   389,   390,   391,     0,
+     392,     0,     0,   393,   394,   395,     0,     0,   396,  1990,
+     789,   398,   790,     0,   400,   401,   402,   403,   404,   405,
+     406,     0,   407,   408,     0,   410,     0,   412,   413,   414,
+       0,   415,   416,   417,   418,   419,   420,   421,   422,   995,
      424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
      433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
-     441,   442,   443,  1168,   445,   446,   447,   448,   449,   450,
-     451,   452,     0,   453,   454,   455,   456,   457,  1169,   458,
-     459,   460,   461,   462,   792,   463,   464,  1170,   466,     0,
+     441,   442,   443,     0,   445,   446,   447,   448,   449,   450,
+     451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
+     459,  1991,   461,   462,   792,   463,   464,   997,   466,     0,
      467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,  1171,     0,   479,   480,     0,   481,   793,   482,   483,
-     484,   485,   486,     0,  1172,  1173,     0,     0,   489,   490,
-    1174,   492,  1175,  1176,   494,   495,   496,   497,   498,   499,
-     500,     0,  1177,   501,   502,   503,   504,   505,  1178,     0,
-     506,   507,   508,   509,   510,   511,  1179,     0,   513,   794,
+     477,     0,     0,   479,   480,     0,   481,   793,   482,   483,
+     484,   485,   486,     0,   998,   999,     0,     0,   489,   490,
+       0,   492,     0,     0,   494,   495,   496,   497,   498,   499,
+     500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
+     506,   507,   508,   509,   510,     0,  1000,  1992,   513,   794,
      514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
-     520,   521,   522,   523,   524,   525,  1180,  1181,  1182,  1183,
-    1184,  1185,  1186,  1187,   534,   535,   536,  1188,     0,     0,
-     219,     0,     0,     0,  1189,  1190,     0,     0,     0,     0,
-       0,     0,     0,  1192,  3768,   220,   221,   222,   223,   224,
-     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
-       0,     0,  3784,     0,   232,   233,     0,   234,   235,     0,
-     236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
-     244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
-     252,     0,   253,   254,   255,   256,   257,     0,     0,     0,
-     258,   259,   260,   261,     0,   262,   263,   264,     0,   265,
-     266,   267,   268,   269,   270,     0, -1579,   271,   272,   273,
-       0,     0,     0,     0,     0,     0,     0,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
-     285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
-     292,   293,   294,   295,   296,     0,   297,   298,   299,     0,
-     300,   301,   302,     0,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
-       0,   317,     0,   318,     0,     0, -1579,   319,   320,   321,
-       0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
-     329,   330,     0,   331,   332,   333,   334,     0,   335,   336,
-     337,   338,   339,   340,     0,   341, -1579,   342,   343,   344,
-     345,   346,   347,   348,     0,   349,     0,   350,     0,     0,
-     351, -1579,   352,   353,   354,   355,   356,     0,     0,   357,
-     358, -1579,   359,     0,     0,   360,   361,   362,     0,     0,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378, -1579,   379,   380,   381,
-     382,     0,   383,   384,     0,   385,     0,   386,   387,   388,
-     389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
-       0,     0,   396,   397,     0,   398,     0,   399,   400,   401,
-     402,   403,   404,   405,   406,     0,   407,   408,   409,   410,
-     411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
-     420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440, -1579,   441,   442,   443,   444,   445,   446,
-     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,     0,   458,   459,   460,   461,   462,     0,   463,
-     464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
-     481,     0,   482,   483,   484,   485,   486,     0,   487,   488,
-       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
-     496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
-     504,   505,     0,     0,   506,   507,   508,   509,   510,   511,
-     512,     0,   513,     0,   514,   515,   516,   517,     0,     0,
-     518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
-     526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
-     536,     0,     0,     0,   977,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1274,   220,
-     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
-     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
-       0,   234,   235,   772,   236,   237,   238,     0,   978,   773,
-     979,   980,     0,   243,   244,   245,   246,   247,     0,     0,
-     248,   249,   981,   982,   252,     0,   253,   254,   255,   256,
-       0,     0,   774,     0,   258,   259,   260,   261,   775,   262,
-     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
-     776,   271,   272,   273,     0,     0,     0,   777,     0,     0,
-       0,   274,   275,   276,   277,   278,   279,   983,   984,   282,
-       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
-     290,   291,     0,     0,   292,   293,   985,   295,   296,     0,
-     297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
-     305,   306,     0,   308,   309,   310,     0,     0,   312,     0,
-     313,   314,   986,   316,     0,   317,     0,   318,   778,     0,
-     779,   319,   320,   321,     0,   322,     0,     0,     0,   325,
-       0,   326,   327,   328,   329,   330,   780,   331,   332,   333,
-     334,  1985,   335,   336,   337,   338,   339,   340,     0,   341,
-     781,  1986,   343,   344,   345,   346,   988,   989,     0,   990,
-       0,   350,   782,   783,   351,   784,   352,   353,   354,   355,
-     356,     0,     0,   357,     0,   785,   359,   786,     0,   360,
-     361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   991,
-     787,   992,   380,   381,     0,     0,   383,   384,   788,   385,
-       0,     0,   387,   993,   389,   390,   391,     0,   392,     0,
-       0,   393,   394,   395,     0,     0,   396,  1988,   789,   398,
-     790,     0,   400,   401,   402,   403,   404,   405,   406,     0,
-     407,   408,     0,   410,     0,   412,   413,   414,     0,   415,
-     416,   417,   418,   419,   420,   421,   422,   994,   424,   425,
-     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,     0,   439,   440,   791,   441,   442,
-     443,     0,   445,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,     0,   458,   459,  1989,
-     461,   462,   792,   463,   464,   996,   466,     0,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,     0,
-       0,   479,   480,     0,   481,   793,   482,   483,   484,   485,
-     486,     0,   997,   998,     0,     0,   489,   490,     0,   492,
-       0,     0,   494,   495,   496,   497,   498,   499,   500,     0,
-       0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
-     508,   509,   510,     0,   999,  1990,   513,   794,   514,   515,
-     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
-     522,   523,   524,   977,     0,     0,     0,     0,     0,     0,
-       0,     0,   534,   535,   536,     0,     0,     0,   220,   221,
+     520,   521,   522,   523,   524,   771,  1123,   593,  1124,  1125,
+    1126,   646,  1127,     0,   534,   535,   536,     0,     0,     0,
+     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
+     230,   231,     0,     0,  3042,     0,  1128,     0,     0,   232,
+     233,     0,   234,   235,   772,   236,   237,   238,   239,  1129,
+     773,  1130,  1131,     0,   243,   244,   245,   246,   247,  1132,
+    1133,   248,   249,  1134,  1135,   252,     0,   253,   254,   255,
+     256,  1136,     0,  1137,     0,   258,   259,   260,   261,   775,
+     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
+       0,   776,   271,   272,   273,  1138,  1139,  1140,  1141,  1142,
+    1143,  1144,   274,   275,   276,   277,   278,   279,  1145,  1146,
+     282,  1267,   283,     0,   284,   285,   286,   287,   288,     0,
+     289,   290,   291,     0,     0,   292,   293,   986,   295,   296,
+       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
+     304,   305,   306,  1147,   308,   309,   310,  1148,  1149,   312,
+       0,   313,   314,  1150,   316,     0,   317,     0,   318,   778,
+       0,   779,   319,   320,   321,     0,   322,  1151,     0,  1152,
+     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
+     333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
+     341,   781,   342,   343,   344,   345,   346,  1153,  1154,     0,
+    1155,     0,   350,   782,   783,   351,   784,   352,   353,   354,
+     355,   356,     0,     0,   357,  1156,   785,   359,   786,     0,
+     360,   361,   362,  1157,  1158,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+    1159,   787,  1160,   380,   381,   382,  1161,   383,   384,   788,
+     385,  1162,  1163,   387,  1164,   389,   390,   391,     0,   392,
+       0,     0,  1165,   394,   395,     0,     0,   396,   397,   789,
+     398,   790,  1166,   400,   401,   402,   403,   404,   405,   406,
+       0,   407,   408,  1167,   410,   411,   412,   413,   414,     0,
+     415,   416,   417,   418,   419,   420,   421,   422,  1168,   424,
+     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
+     442,   443,  1169,   445,   446,   447,   448,   449,   450,   451,
+     452,    39,   453,   454,   455,   456,   457,  1170,   458,   459,
+     460,   461,   462,   792,   463,   464,  1171,   466,     0,   467,
+     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
+    1172,     0,   479,   480,    43,   481,   793,   482,   483,   484,
+     485,   486,     0,  1173,  1174,     0,     0,   489,   490,  1175,
+     492,  1176,  1177,   494,   495,   496,   497,   498,   499,   500,
+       0,  1178,   501,   502,   503,   504,   505,  1179,     0,   506,
+     507,   508,   509,   510,  1059,  1180,     0,   513,   794,   514,
+     515,   516,   517,     0,     0,   518,     0,    48,   519,   520,
+     521,   522,   523,   524,   525,  1181,  1182,  1183,  1184,  1185,
+    1186,  1187,  1188,   534,   535,   536,  1189,     0,    49,     0,
+       0,     0,     0,  1190,  1191,     0,     0,     0,     0,     0,
+       0,     0,  1193,   771,  1123,   593,  1124,  1125,  1126,   646,
+    1127,     0,     0,     0,     0,     0,     0,     0,   220,   221,
      222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
-       0,     0,  2094,     0,     0,     0,     0,   232,   233,     0,
-     234,   235,   772,   236,   237,   238,     0,   978,   773,   979,
-     980,     0,   243,   244,   245,   246,   247,     0,     0,   248,
-     249,   981,   982,   252,     0,   253,   254,   255,   256,     0,
-       0,   774,     0,   258,   259,   260,   261,   775,   262,   263,
+       0,     0,     0,     0,  1128,     0,     0,   232,   233,     0,
+     234,   235,   772,   236,   237,   238,   239,  1129,   773,  1130,
+    1131,     0,   243,   244,   245,   246,   247,  1132,  1133,   248,
+     249,  1134,  1135,   252,     0,   253,   254,   255,   256,  1136,
+       0,  1137,     0,   258,   259,   260,   261,   775,   262,   263,
      264,     0,   265,   266,   267,   268,   269,   270,     0,   776,
-     271,   272,   273,     0,     0,     0,   777,     0,     0,     0,
-     274,   275,   276,   277,   278,   279,   983,   984,   282,     0,
+     271,   272,   273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,
+     274,   275,   276,   277,   278,   279,  1145,  1146,   282,     0,
      283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
-     291,     0,     0,   292,   293,   985,   295,   296,     0,   297,
+     291,     0,     0,   292,   293,   986,   295,   296,     0,   297,
      298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
-     306,     0,   308,   309,   310,     0,     0,   312,     0,   313,
-     314,   986,   316,     0,   317,     0,   318,   778,     0,   779,
-     319,   320,   321,     0,   322,     0,     0,     0,   325,     0,
+     306,  1147,   308,   309,   310,  1148,  1149,   312,     0,   313,
+     314,  1150,   316,     0,   317,     0,   318,   778,     0,   779,
+     319,   320,   321,     0,   322,  1151,     0,  1152,   325,     0,
      326,   327,   328,   329,   330,   780,   331,   332,   333,   334,
-    1985,   335,   336,   337,   338,   339,   340,     0,   341,   781,
-    1986,   343,   344,   345,   346,   988,   989,     0,   990,     0,
+       0,   335,   336,   337,   338,   339,   340,     0,   341,   781,
+     342,   343,   344,   345,   346,  1153,  1154,     0,  1155,     0,
      350,   782,   783,   351,   784,   352,   353,   354,   355,   356,
-       0,     0,   357,     0,   785,   359,   786,     0,   360,   361,
-     362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   991,   787,
-     992,   380,   381,     0,     0,   383,   384,   788,   385,     0,
-       0,   387,   993,   389,   390,   391,     0,   392,     0,     0,
-     393,   394,   395,     0,     0,   396,  1988,   789,   398,   790,
-       0,   400,   401,   402,   403,   404,   405,   406,     0,   407,
-     408,     0,   410,     0,   412,   413,   414,     0,   415,   416,
-     417,   418,   419,   420,   421,   422,   994,   424,   425,   426,
+       0,     0,   357,  1156,   785,   359,   786,     0,   360,   361,
+     362,  1157,  1158,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,  1159,   787,
+    1160,   380,   381,   382,  1161,   383,   384,   788,   385,  1162,
+    1163,   387,  1164,   389,   390,   391,     0,   392,     0,     0,
+    1165,   394,   395,     0,     0,   396,   397,   789,   398,   790,
+    1166,   400,   401,   402,   403,   404,   405,   406,     0,   407,
+     408,  1167,   410,   411,   412,   413,   414,     0,   415,   416,
+     417,   418,   419,   420,   421,   422,  1168,   424,   425,   426,
      427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
      436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
-       0,   445,   446,   447,   448,   449,   450,   451,   452,     0,
-     453,   454,   455,   456,   457,     0,   458,   459,  1989,   461,
-     462,   792,   463,   464,   996,   466,     0,   467,   468,   469,
-     470,   471,   472,   473,   474,   475,   476,   477,     0,     0,
+    1169,   445,   446,   447,   448,   449,   450,   451,   452,    39,
+     453,   454,   455,   456,   457,  1170,   458,   459,   460,   461,
+     462,   792,   463,   464,  1171,   466,     0,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,  1172,     0,
+     479,   480,    43,   481,   793,   482,   483,   484,   485,   486,
+       0,  1173,  1174,     0,     0,   489,   490,  1175,   492,  1176,
+    1177,   494,   495,   496,   497,   498,   499,   500,     0,  1178,
+     501,   502,   503,   504,   505,  1179,     0,   506,   507,   508,
+     509,   510,  1059,  1180,     0,   513,   794,   514,   515,   516,
+     517,     0,     0,   518,     0,    48,   519,   520,   521,   522,
+     523,   524,   525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,
+    1188,   534,   535,   536,  1189,     0,    49,     0,     0,     0,
+       0,  1190,  1191,     0,     0,     0,     0,     0,     0,     0,
+    1193,   771,  1123,   593,  1124,  1125,  1126,   646,  1127,     0,
+       0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
+     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
+       0,     0,  1128,     0,     0,   232,   233,     0,   234,   235,
+     772,   236,   237,   238,   239,  1129,   773,  1130,  1131,  2537,
+     243,   244,   245,   246,   247,  1132,  1133,   248,   249,  1134,
+    1135,   252,     0,   253,   254,   255,   256,  1136,     0,  1137,
+       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
+     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
+     273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,   275,
+     276,   277,   278,   279,  1145,  1146,   282,     0,   283,     0,
+     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
+       0,   292,   293,   986,   295,   296,     0,   297,   298,   299,
+       0,   300,   301,   302,     0,   303,   304,   305,   306,  1147,
+     308,   309,   310,  1148,  1149,   312,     0,   313,   314,  1150,
+     316,     0,   317,     0,   318,   778,  2538,   779,   319,   320,
+     321,     0,   322,  1151,     0,  1152,   325,     0,   326,   327,
+     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
+     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
+     344,   345,   346,  1153,  1154,     0,  1155,     0,   350,   782,
+     783,   351,   784,   352,   353,   354,   355,   356,     0,  2539,
+     357,  1156,   785,   359,   786,     0,   360,   361,   362,  1157,
+    1158,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,  1159,   787,  1160,   380,
+     381,   382,  1161,   383,   384,   788,   385,  1162,  1163,   387,
+    1164,   389,   390,   391,     0,   392,     0,     0,  1165,   394,
+     395,     0,     0,   396,   397,   789,   398,   790,  1166,   400,
+     401,   402,   403,   404,   405,   406,     0,   407,   408,  1167,
+     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
+     419,   420,   421,   422,  1168,   424,   425,   426,   427,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,     0,   439,   440,   791,   441,   442,   443,  1169,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,  1170,   458,   459,   460,   461,   462,   792,
+     463,   464,  1171,   466,     0,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,  1172,     0,   479,   480,
+       0,   481,   793,   482,   483,   484,   485,   486,     0,  1173,
+    1174,     0,  2540,   489,   490,  1175,   492,  1176,  1177,   494,
+     495,   496,   497,   498,   499,   500,     0,  1178,   501,   502,
+     503,   504,   505,  1179,     0,   506,   507,   508,   509,   510,
+     511,  1180,     0,   513,   794,   514,   515,   516,   517,     0,
+       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
+     525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,
+     535,   536,  1189,     0,     0,     0,     0,     0,     0,  1190,
+    1191,     0,     0,     0,     0,     0,     0,     0,  1193,   771,
+    1123,   593,  1124,  1125,  1126,   646,  1127,     0,     0,     0,
+       0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
+     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
+    1128,     0,     0,   232,   233,     0,   234,   235,   772,   236,
+     237,   238,   239,  1129,   773,  1130,  1131,     0,   243,   244,
+     245,   246,   247,  1132,  1133,   248,   249,  1134,  1135,   252,
+       0,   253,   254,   255,   256,  1136,     0,  1137,     0,   258,
+     259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
+     267,   268,   269,   270,     0,   776,   271,   272,   273,  1138,
+    1139,  1140,  1141,  1142,  1143,  1144,   274,   275,   276,   277,
+     278,   279,  1145,  1146,   282,     0,   283,     0,   284,   285,
+     286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
+     293,   986,   295,   296,     0,   297,   298,   299,     0,   300,
+     301,   302,     0,   303,   304,   305,   306,  1147,   308,   309,
+     310,  1148,  1149,   312,     0,   313,   314,  1150,   316,     0,
+     317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
+     322,  1151,     0,  1152,   325,     0,   326,   327,   328,   329,
+     330,   780,   331,   332,   333,   334,     0,   335,   336,   337,
+     338,   339,   340,     0,   341,   781,   342,   343,   344,   345,
+     346,  1153,  1154,     0,  1155,     0,   350,   782,   783,   351,
+     784,   352,   353,   354,   355,   356,     0,     0,   357,  1156,
+     785,   359,   786,     0,   360,   361,   362,  1157,  1158,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,  1159,   787,  1160,   380,   381,   382,
+    1161,   383,   384,   788,   385,  1162,  1163,   387,  1164,   389,
+     390,   391,     0,   392,     0,     0,  1165,   394,   395,     0,
+       0,   396,   397,   789,   398,   790,  1166,   400,   401,   402,
+     403,   404,   405,   406,     0,   407,   408,  1167,   410,   411,
+     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
+     421,   422,  1168,   424,   425,   426,   427,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
+     439,   440,   791,   441,   442,   443,  1169,   445,   446,   447,
+     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
+     457,  1170,   458,   459,   460,   461,   462,   792,   463,   464,
+    1171,   466,     0,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,  1172,     0,   479,   480,     0,   481,
+     793,   482,   483,   484,   485,   486,     0,  1173,  1174,     0,
+       0,   489,   490,  1175,   492,  1176,  1177,   494,   495,   496,
+     497,   498,   499,   500,     0,  1178,   501,   502,   503,   504,
+     505,  1179,     0,   506,   507,   508,   509,   510,   511,  1180,
+       0,   513,   794,   514,   515,   516,   517,     0,     0,   518,
+       0,     0,   519,   520,   521,   522,   523,   524,   525,  1181,
+    1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,   535,   536,
+    1189,     0,     0,     0,     0,     0,     0,  1190,  1191,     0,
+       0,     0,     0,     0,  1730,  2492,  1193,   771,  1123,   593,
+    1124,  1125,  1126,   646,  1127,     0,     0,     0,     0,     0,
+       0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
+       0,   229,   230,   231,     0,     0,     0,     0,  1128,     0,
+       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
+     239,  1129,   773,  1130,  1131,     0,   243,   244,   245,   246,
+     247,  1132,  1133,   248,   249,  1134,  1135,   252,     0,   253,
+     254,   255,   256,  1136,     0,  1137,     0,   258,   259,   260,
+     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
+     269,   270,     0,   776,   271,   272,   273,  1138,  1139,  1140,
+    1141,  1142,  1143,  1144,   274,   275,   276,   277,   278,   279,
+    1145,  1146,   282,     0,   283,     0,   284,   285,   286,   287,
+     288,     0,   289,   290,   291,     0,     0,   292,   293,   986,
+     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
+       0,   303,   304,   305,   306,  1147,   308,   309,   310,  1148,
+    1149,   312,     0,   313,   314,  1150,   316,     0,   317,     0,
+     318,   778,     0,   779,   319,   320,   321,     0,   322,  1151,
+       0,  1152,   325,     0,   326,   327,   328,   329,   330,   780,
+     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
+     340,     0,   341,   781,   342,   343,   344,   345,   346,  1153,
+    1154,     0,  1155,     0,   350,   782,   783,   351,   784,   352,
+     353,   354,   355,   356,     0,     0,   357,  1156,   785,   359,
+     786,     0,   360,   361,   362,  1157,  1158,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,  1159,   787,  1160,   380,   381,   382,  1161,   383,
+     384,   788,   385,  1162,  1163,   387,  1164,   389,   390,   391,
+       0,   392,     0,     0,  1165,   394,   395,     0,     0,   396,
+     397,   789,   398,   790,  1166,   400,   401,   402,   403,   404,
+     405,   406,     0,   407,   408,  1167,   410,   411,   412,   413,
+     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
+    1168,   424,   425,   426,   427,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
+     791,   441,   442,   443,  1169,   445,   446,   447,   448,   449,
+     450,   451,   452,     0,   453,   454,   455,   456,   457,  1170,
+     458,   459,   460,   461,   462,   792,   463,   464,  1171,   466,
+       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
+     476,   477,  1172,     0,   479,   480,     0,   481,   793,   482,
+     483,   484,   485,   486,     0,  1173,  1174,     0,     0,   489,
+     490,  1175,   492,  1176,  1177,   494,   495,   496,   497,   498,
+     499,   500,     0,  1178,   501,   502,   503,   504,   505,  1179,
+       0,   506,   507,   508,   509,   510,   511,  1180,     0,   513,
+     794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
+     519,   520,   521,   522,   523,   524,   525,  1181,  1182,  1183,
+    1184,  1185,  1186,  1187,  1188,   534,   535,   536,  1189,     0,
+       0,     0,     0,     0,     0,  1190,  1191,  1192,     0,     0,
+       0,     0,     0,     0,  1193,   771,  1123,   593,  1124,  1125,
+    1126,   646,  1127,     0,     0,     0,     0,     0,     0,     0,
+     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
+     230,   231,     0,     0,     0,     0,  1128,     0,     0,   232,
+     233,     0,   234,   235,   772,   236,   237,   238,   239,  1129,
+     773,  1130,  1131,     0,   243,   244,   245,   246,   247,  1132,
+    1133,   248,   249,  1134,  1135,   252,     0,   253,   254,   255,
+     256,  1136,     0,  1137,     0,   258,   259,   260,   261,   775,
+     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
+       0,   776,   271,   272,   273,  1138,  1139,  1140,  1141,  1142,
+    1143,  1144,   274,   275,   276,   277,   278,   279,  1145,  1146,
+     282,  1267,   283,     0,   284,   285,   286,   287,   288,     0,
+     289,   290,   291,     0,     0,   292,   293,   986,   295,   296,
+       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
+     304,   305,   306,  1147,   308,   309,   310,  1148,  1149,   312,
+       0,   313,   314,  1150,   316,     0,   317,     0,   318,   778,
+       0,   779,   319,   320,   321,     0,   322,  1151,     0,  1152,
+     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
+     333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
+     341,   781,   342,   343,   344,   345,   346,  1153,  1154,     0,
+    1155,     0,   350,   782,   783,   351,   784,   352,   353,   354,
+     355,   356,     0,     0,   357,  1156,   785,   359,   786,     0,
+     360,   361,   362,  1157,  1158,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+    1159,   787,  1160,   380,   381,   382,  1161,   383,   384,   788,
+     385,  1162,  1163,   387,  1164,   389,   390,   391,     0,   392,
+       0,     0,  1165,   394,   395,     0,     0,   396,   397,   789,
+     398,   790,  1166,   400,   401,   402,   403,   404,   405,   406,
+       0,   407,   408,  1167,   410,   411,   412,   413,   414,     0,
+     415,   416,   417,   418,   419,   420,   421,   422,  1168,   424,
+     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
+     442,   443,  1169,   445,   446,   447,   448,   449,   450,   451,
+     452,     0,   453,   454,   455,   456,   457,  1170,   458,   459,
+     460,   461,   462,   792,   463,   464,  1171,   466,     0,   467,
+     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
+    1172,     0,   479,   480,     0,   481,   793,   482,   483,   484,
+     485,   486,     0,  1173,  1174,     0,     0,   489,   490,  1175,
+     492,  1176,  1177,   494,   495,   496,   497,   498,   499,   500,
+       0,  1178,   501,   502,   503,   504,   505,  1179,     0,   506,
+     507,   508,   509,   510,   511,  1180,     0,   513,   794,   514,
+     515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
+     521,   522,   523,   524,   525,  1181,  1182,  1183,  1184,  1185,
+    1186,  1187,  1188,   534,   535,   536,  1189,     0,     0,     0,
+       0,     0,     0,  1190,  1191,     0,     0,     0,     0,     0,
+       0,     0,  1193,   771,  1123,   593,  1124,  1125,  1126,   646,
+    1127,     0,     0,     0,     0,     0,     0,     0,   220,   221,
+     222,   223,   224,   225,   226,   227,  1962,   229,   230,   231,
+       0,     0,     0,     0,  1128,     0,     0,   232,   233,     0,
+     234,   235,   772,   236,   237,   238,   239,  1129,   773,  1130,
+    1131,     0,   243,   244,   245,   246,   247,  1132,  1133,   248,
+     249,  1134,  1135,   252,     0,   253,   254,   255,   256,  1136,
+       0,  1137,     0,   258,   259,   260,   261,   775,   262,   263,
+     264,     0,   265,   266,   267,   268,   269,   270,     0,   776,
+     271,   272,   273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,
+     274,   275,   276,   277,   278,   279,  1145,  1146,   282,     0,
+     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
+     291,     0,     0,   292,   293,   986,   295,   296,     0,   297,
+     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
+     306,  1147,   308,   309,   310,  1148,  1149,   312,     0,   313,
+     314,  1150,   316,     0,   317,     0,   318,   778,     0,   779,
+     319,   320,   321,     0,   322,  1151,     0,  1152,   325,     0,
+     326,   327,   328,   329,   330,   780,   331,   332,   333,   334,
+       0,   335,   336,   337,   338,   339,   340,     0,   341,   781,
+     342,   343,   344,   345,   346,  1153,  1154,     0,  1155,     0,
+     350,   782,   783,   351,   784,   352,   353,   354,   355,   356,
+       0,     0,   357,  1156,   785,   359,   786,     0,   360,   361,
+     362,  1157,  1158,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,  1159,   787,
+    1160,   380,   381,   382,  1161,   383,   384,   788,   385,  1162,
+    1163,   387,  1164,   389,   390,   391,     0,   392,     0,     0,
+    1165,   394,   395,     0,     0,   396,   397,   789,   398,   790,
+    1166,   400,   401,   402,   403,   404,   405,   406,     0,   407,
+     408,  1167,   410,   411,   412,   413,   414,     0,   415,   416,
+     417,   418,   419,   420,   421,   422,  1168,   424,   425,   426,
+     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
+    1169,   445,   446,   447,   448,   449,   450,   451,   452,     0,
+     453,   454,   455,   456,   457,  1170,   458,   459,   460,   461,
+     462,   792,   463,   464,  1171,   466,     0,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,  1172,     0,
      479,   480,     0,   481,   793,   482,   483,   484,   485,   486,
-       0,   997,   998,     0,     0,   489,   490,     0,   492,     0,
-       0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
-     501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
-     509,   510,     0,   999,  1990,   513,   794,   514,   515,   516,
+       0,  1173,  1174,     0,     0,   489,   490,  1175,   492,  1176,
+    1177,   494,   495,   496,   497,   498,   499,   500,     0,  1178,
+     501,   502,   503,   504,   505,  1179,     0,   506,   507,   508,
+     509,   510,   511,  1180,     0,   513,   794,   514,   515,   516,
      517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
-     523,   524,   771,  1122,   593,  1123,  1124,  1125,   646,  1126,
-       0,   534,   535,   536,     0,     0,     0,   220,   221,   222,
-     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
-       0,  3036,     0,  1127,     0,     0,   232,   233,     0,   234,
-     235,   772,   236,   237,   238,   239,  1128,   773,  1129,  1130,
-       0,   243,   244,   245,   246,   247,  1131,  1132,   248,   249,
-    1133,  1134,   252,     0,   253,   254,   255,   256,  1135,     0,
-    1136,     0,   258,   259,   260,   261,   775,   262,   263,   264,
-       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
-     272,   273,  1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,
-     275,   276,   277,   278,   279,  1144,  1145,   282,  1266,   283,
-       0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
-       0,     0,   292,   293,   985,   295,   296,     0,   297,   298,
-     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
-    1146,   308,   309,   310,  1147,  1148,   312,     0,   313,   314,
-    1149,   316,     0,   317,     0,   318,   778,     0,   779,   319,
-     320,   321,     0,   322,  1150,     0,  1151,   325,     0,   326,
-     327,   328,   329,   330,   780,   331,   332,   333,   334,     0,
-     335,   336,   337,   338,   339,   340,     0,   341,   781,   342,
-     343,   344,   345,   346,  1152,  1153,     0,  1154,     0,   350,
-     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
-       0,   357,  1155,   785,   359,   786,     0,   360,   361,   362,
-    1156,  1157,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,  1158,   787,  1159,
-     380,   381,   382,  1160,   383,   384,   788,   385,  1161,  1162,
-     387,  1163,   389,   390,   391,     0,   392,     0,     0,  1164,
-     394,   395,     0,     0,   396,   397,   789,   398,   790,  1165,
-     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
-    1166,   410,   411,   412,   413,   414,     0,   415,   416,   417,
-     418,   419,   420,   421,   422,  1167,   424,   425,   426,   427,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,     0,   439,   440,   791,   441,   442,   443,  1168,
-     445,   446,   447,   448,   449,   450,   451,   452,    39,   453,
-     454,   455,   456,   457,  1169,   458,   459,   460,   461,   462,
-     792,   463,   464,  1170,   466,     0,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,  1171,     0,   479,
-     480,    43,   481,   793,   482,   483,   484,   485,   486,     0,
-    1172,  1173,     0,     0,   489,   490,  1174,   492,  1175,  1176,
-     494,   495,   496,   497,   498,   499,   500,     0,  1177,   501,
-     502,   503,   504,   505,  1178,     0,   506,   507,   508,   509,
-     510,  1058,  1179,     0,   513,   794,   514,   515,   516,   517,
-       0,     0,   518,     0,    48,   519,   520,   521,   522,   523,
-     524,   525,  1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,
-     534,   535,   536,  1188,     0,    49,     0,     0,     0,     0,
-    1189,  1190,     0,     0,     0,     0,     0,     0,     0,  1192,
-     771,  1122,   593,  1123,  1124,  1125,   646,  1126,     0,     0,
-       0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
-       0,  1127,     0,     0,   232,   233,     0,   234,   235,   772,
-     236,   237,   238,   239,  1128,   773,  1129,  1130,     0,   243,
-     244,   245,   246,   247,  1131,  1132,   248,   249,  1133,  1134,
-     252,     0,   253,   254,   255,   256,  1135,     0,  1136,     0,
-     258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
-     266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
-    1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,   275,   276,
-     277,   278,   279,  1144,  1145,   282,     0,   283,     0,   284,
-     285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
-     292,   293,   985,   295,   296,     0,   297,   298,   299,     0,
-     300,   301,   302,     0,   303,   304,   305,   306,  1146,   308,
-     309,   310,  1147,  1148,   312,     0,   313,   314,  1149,   316,
-       0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
-       0,   322,  1150,     0,  1151,   325,     0,   326,   327,   328,
-     329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
-     337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
-     345,   346,  1152,  1153,     0,  1154,     0,   350,   782,   783,
-     351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
-    1155,   785,   359,   786,     0,   360,   361,   362,  1156,  1157,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,  1158,   787,  1159,   380,   381,
-     382,  1160,   383,   384,   788,   385,  1161,  1162,   387,  1163,
-     389,   390,   391,     0,   392,     0,     0,  1164,   394,   395,
-       0,     0,   396,   397,   789,   398,   790,  1165,   400,   401,
-     402,   403,   404,   405,   406,     0,   407,   408,  1166,   410,
-     411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
-     420,   421,   422,  1167,   424,   425,   426,   427,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,   791,   441,   442,   443,  1168,   445,   446,
-     447,   448,   449,   450,   451,   452,    39,   453,   454,   455,
-     456,   457,  1169,   458,   459,   460,   461,   462,   792,   463,
-     464,  1170,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,  1171,     0,   479,   480,    43,
-     481,   793,   482,   483,   484,   485,   486,     0,  1172,  1173,
-       0,     0,   489,   490,  1174,   492,  1175,  1176,   494,   495,
-     496,   497,   498,   499,   500,     0,  1177,   501,   502,   503,
-     504,   505,  1178,     0,   506,   507,   508,   509,   510,  1058,
-    1179,     0,   513,   794,   514,   515,   516,   517,     0,     0,
-     518,     0,    48,   519,   520,   521,   522,   523,   524,   525,
-    1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,   534,   535,
-     536,  1188,     0,    49,     0,     0,     0,     0,  1189,  1190,
-       0,     0,     0,     0,     0,     0,     0,  1192,   771,  1122,
-     593,  1123,  1124,  1125,   646,  1126,     0,     0,     0,     0,
-       0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,     0,   229,   230,   231,     0,     0,     0,     0,  1127,
-       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
-     238,   239,  1128,   773,  1129,  1130,  2531,   243,   244,   245,
-     246,   247,  1131,  1132,   248,   249,  1133,  1134,   252,     0,
-     253,   254,   255,   256,  1135,     0,  1136,     0,   258,   259,
-     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
-     268,   269,   270,     0,   776,   271,   272,   273,  1137,  1138,
-    1139,  1140,  1141,  1142,  1143,   274,   275,   276,   277,   278,
-     279,  1144,  1145,   282,     0,   283,     0,   284,   285,   286,
-     287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
-     985,   295,   296,     0,   297,   298,   299,     0,   300,   301,
-     302,     0,   303,   304,   305,   306,  1146,   308,   309,   310,
-    1147,  1148,   312,     0,   313,   314,  1149,   316,     0,   317,
-       0,   318,   778,  2532,   779,   319,   320,   321,     0,   322,
-    1150,     0,  1151,   325,     0,   326,   327,   328,   329,   330,
-     780,   331,   332,   333,   334,     0,   335,   336,   337,   338,
-     339,   340,     0,   341,   781,   342,   343,   344,   345,   346,
-    1152,  1153,     0,  1154,     0,   350,   782,   783,   351,   784,
-     352,   353,   354,   355,   356,     0,  2533,   357,  1155,   785,
-     359,   786,     0,   360,   361,   362,  1156,  1157,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,  1158,   787,  1159,   380,   381,   382,  1160,
-     383,   384,   788,   385,  1161,  1162,   387,  1163,   389,   390,
-     391,     0,   392,     0,     0,  1164,   394,   395,     0,     0,
-     396,   397,   789,   398,   790,  1165,   400,   401,   402,   403,
-     404,   405,   406,     0,   407,   408,  1166,   410,   411,   412,
-     413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
-     422,  1167,   424,   425,   426,   427,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,   791,   441,   442,   443,  1168,   445,   446,   447,   448,
-     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
-    1169,   458,   459,   460,   461,   462,   792,   463,   464,  1170,
-     466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,  1171,     0,   479,   480,     0,   481,   793,
-     482,   483,   484,   485,   486,     0,  1172,  1173,     0,  2534,
-     489,   490,  1174,   492,  1175,  1176,   494,   495,   496,   497,
-     498,   499,   500,     0,  1177,   501,   502,   503,   504,   505,
-    1178,     0,   506,   507,   508,   509,   510,   511,  1179,     0,
-     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
-       0,   519,   520,   521,   522,   523,   524,   525,  1180,  1181,
-    1182,  1183,  1184,  1185,  1186,  1187,   534,   535,   536,  1188,
-       0,     0,     0,     0,     0,     0,  1189,  1190,     0,     0,
-       0,     0,     0,     0,     0,  1192,   771,  1122,   593,  1123,
-    1124,  1125,   646,  1126,     0,     0,     0,     0,     0,     0,
-       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
-     229,   230,   231,     0,     0,     0,     0,  1127,     0,     0,
-     232,   233,     0,   234,   235,   772,   236,   237,   238,   239,
-    1128,   773,  1129,  1130,     0,   243,   244,   245,   246,   247,
-    1131,  1132,   248,   249,  1133,  1134,   252,     0,   253,   254,
-     255,   256,  1135,     0,  1136,     0,   258,   259,   260,   261,
-     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
-     270,     0,   776,   271,   272,   273,  1137,  1138,  1139,  1140,
-    1141,  1142,  1143,   274,   275,   276,   277,   278,   279,  1144,
-    1145,   282,     0,   283,     0,   284,   285,   286,   287,   288,
-       0,   289,   290,   291,     0,     0,   292,   293,   985,   295,
-     296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
-     303,   304,   305,   306,  1146,   308,   309,   310,  1147,  1148,
-     312,     0,   313,   314,  1149,   316,     0,   317,     0,   318,
-     778,     0,   779,   319,   320,   321,     0,   322,  1150,     0,
-    1151,   325,     0,   326,   327,   328,   329,   330,   780,   331,
-     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
-       0,   341,   781,   342,   343,   344,   345,   346,  1152,  1153,
-       0,  1154,     0,   350,   782,   783,   351,   784,   352,   353,
-     354,   355,   356,     0,     0,   357,  1155,   785,   359,   786,
-       0,   360,   361,   362,  1156,  1157,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,  1158,   787,  1159,   380,   381,   382,  1160,   383,   384,
-     788,   385,  1161,  1162,   387,  1163,   389,   390,   391,     0,
-     392,     0,     0,  1164,   394,   395,     0,     0,   396,   397,
-     789,   398,   790,  1165,   400,   401,   402,   403,   404,   405,
-     406,     0,   407,   408,  1166,   410,   411,   412,   413,   414,
-       0,   415,   416,   417,   418,   419,   420,   421,   422,  1167,
-     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
-     441,   442,   443,  1168,   445,   446,   447,   448,   449,   450,
-     451,   452,     0,   453,   454,   455,   456,   457,  1169,   458,
-     459,   460,   461,   462,   792,   463,   464,  1170,   466,     0,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,  1171,     0,   479,   480,     0,   481,   793,   482,   483,
-     484,   485,   486,     0,  1172,  1173,     0,     0,   489,   490,
-    1174,   492,  1175,  1176,   494,   495,   496,   497,   498,   499,
-     500,     0,  1177,   501,   502,   503,   504,   505,  1178,     0,
-     506,   507,   508,   509,   510,   511,  1179,     0,   513,   794,
-     514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
-     520,   521,   522,   523,   524,   525,  1180,  1181,  1182,  1183,
-    1184,  1185,  1186,  1187,   534,   535,   536,  1188,     0,     0,
-       0,     0,     0,     0,  1189,  1190,     0,     0,     0,     0,
-       0,  1728,  2486,  1192,   771,  1122,   593,  1123,  1124,  1125,
-     646,  1126,     0,     0,     0,     0,     0,     0,     0,   220,
-     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
-     231,     0,     0,     0,     0,  1127,     0,     0,   232,   233,
-       0,   234,   235,   772,   236,   237,   238,   239,  1128,   773,
-    1129,  1130,     0,   243,   244,   245,   246,   247,  1131,  1132,
-     248,   249,  1133,  1134,   252,     0,   253,   254,   255,   256,
-    1135,     0,  1136,     0,   258,   259,   260,   261,   775,   262,
-     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
-     776,   271,   272,   273,  1137,  1138,  1139,  1140,  1141,  1142,
-    1143,   274,   275,   276,   277,   278,   279,  1144,  1145,   282,
+     523,   524,   525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,
+    1188,   534,   535,   536,  1189,     0,     0,     0,     0,     0,
+       0,  1190,  1191,     0,     0,     0,     0,     0,     0,     0,
+    1193,   771,  1123,   593,  1124,  1125,  1126,   646,  1127,     0,
+       0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
+     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
+       0,     0,  1128,     0,     0,   232,   233,     0,   234,   235,
+     772,   236,   237,   238,   239,  1129,   773,  1130,  1131,     0,
+     243,   244,   245,   246,   247,  1132,  1133,   248,   249,  1134,
+    1135,   252,     0,   253,   254,   255,   256,  1136,     0,  1137,
+       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
+     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
+     273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,   275,
+     276,   277,   278,   279,  1145,  1146,   282,     0,   283,     0,
+     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
+       0,   292,   293,   986,   295,   296,     0,   297,   298,   299,
+       0,   300,   301,   302,     0,   303,   304,   305,   306,  1147,
+     308,   309,   310,  1148,  1149,   312,     0,   313,   314,  1150,
+     316,     0,   317,     0,   318,   778,  2538,   779,   319,   320,
+     321,     0,   322,  1151,     0,  1152,   325,     0,   326,   327,
+     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
+     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
+     344,   345,   346,  1153,  1154,     0,  1155,     0,   350,   782,
+     783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
+     357,  1156,   785,   359,   786,     0,   360,   361,   362,  1157,
+    1158,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,  1159,   787,  1160,   380,
+     381,   382,  1161,   383,   384,   788,   385,  1162,  1163,   387,
+    1164,   389,   390,   391,     0,   392,     0,     0,  1165,   394,
+     395,     0,     0,   396,   397,   789,   398,   790,  1166,   400,
+     401,   402,   403,   404,   405,   406,     0,   407,   408,  1167,
+     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
+     419,   420,   421,   422,  1168,   424,   425,   426,   427,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,     0,   439,   440,   791,   441,   442,   443,  1169,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,  1170,   458,   459,   460,   461,   462,   792,
+     463,   464,  1171,   466,     0,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,  1172,     0,   479,   480,
+       0,   481,   793,   482,   483,   484,   485,   486,     0,  1173,
+    1174,     0,     0,   489,   490,  1175,   492,  1176,  1177,   494,
+     495,   496,   497,   498,   499,   500,     0,  1178,   501,   502,
+     503,   504,   505,  1179,     0,   506,   507,   508,   509,   510,
+     511,  1180,     0,   513,   794,   514,   515,   516,   517,     0,
+       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
+     525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,
+     535,   536,  1189,     0,     0,     0,     0,     0,     0,  1190,
+    1191,     0,     0,     0,     0,     0,     0,     0,  1193,   771,
+    1123,   593,  1124,  1125,  1126,   646,  1127,     0,     0,     0,
+       0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
+     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
+    1128,     0,     0,   232,   233,     0,   234,   235,   772,   236,
+     237,   238,   239,  1129,   773,  1130,  1131,     0,   243,   244,
+     245,   246,   247,  1132,  1133,   248,   249,  1134,  1135,   252,
+       0,   253,   254,   255,   256,  1136,     0,  1137,     0,   258,
+     259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
+     267,   268,   269,   270,     0,   776,   271,   272,   273,  1138,
+    1139,  1140,  1141,  1142,  1143,  1144,   274,   275,   276,   277,
+     278,   279,  1145,  1146,   282,     0,   283,     0,   284,   285,
+     286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
+     293,   986,   295,   296,     0,   297,   298,   299,     0,   300,
+     301,   302,     0,   303,   304,   305,   306,  1147,   308,   309,
+     310,  1148,  1149,   312,     0,   313,   314,  1150,   316,     0,
+     317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
+     322,  1151,     0,  1152,   325,     0,   326,   327,   328,   329,
+     330,   780,   331,   332,   333,   334,     0,   335,   336,   337,
+     338,   339,   340,     0,   341,   781,   342,   343,   344,   345,
+     346,  1153,  1154,     0,  1155,     0,   350,   782,   783,   351,
+     784,   352,   353,   354,   355,   356,     0,     0,   357,  1156,
+     785,   359,   786,     0,   360,   361,   362,  1157,  1158,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,  1159,   787,  1160,   380,   381,   382,
+    1161,   383,   384,   788,   385,  1162,  1163,   387,  1164,   389,
+     390,   391,     0,   392,     0,     0,  1165,   394,   395,     0,
+       0,   396,   397,   789,   398,   790,  1166,   400,   401,   402,
+     403,   404,   405,   406,     0,   407,   408,  1167,   410,   411,
+     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
+     421,   422,  1168,   424,   425,   426,   427,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
+     439,   440,   791,   441,   442,   443,  1169,   445,   446,   447,
+     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
+     457,  1170,   458,   459,   460,   461,   462,   792,   463,   464,
+    1171,   466,     0,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,  1172,     0,   479,   480,     0,   481,
+     793,   482,   483,   484,   485,   486,     0,  1173,  1174,     0,
+       0,   489,   490,  1175,   492,  1176,  1177,   494,   495,   496,
+     497,   498,   499,   500,     0,  1178,   501,   502,   503,   504,
+     505,  1179,     0,   506,   507,   508,   509,   510,   511,  1180,
+    3821,   513,   794,   514,   515,   516,   517,     0,     0,   518,
+       0,     0,   519,   520,   521,   522,   523,   524,   525,  1181,
+    1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,   535,   536,
+    1189,     0,     0,     0,     0,     0,     0,  1190,  1191,     0,
+       0,     0,     0,     0,     0,     0,  1193,   771,  1123,   593,
+    1124,  1125,  1126,   646,  1127,     0,     0,     0,     0,     0,
+       0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
+       0,   229,   230,   231,     0,     0,     0,     0,  1128,     0,
+       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
+     239,  1129,   773,  1130,  1131,     0,   243,   244,   245,   246,
+     247,  1132,  1133,   248,   249,  1134,  1135,   252,     0,   253,
+     254,   255,   256,  1136,     0,  1137,     0,   258,   259,   260,
+     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
+     269,   270,     0,   776,   271,   272,   273,  1138,  1139,  1140,
+    1141,  1142,  1143,  1144,   274,   275,   276,   277,   278,   279,
+    1145,  1146,   282,     0,   283,     0,   284,   285,   286,   287,
+     288,     0,   289,   290,   291,     0,     0,   292,   293,   986,
+     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
+       0,   303,   304,   305,   306,  1147,   308,   309,   310,  1148,
+    1149,   312,     0,   313,   314,  1150,   316,     0,   317,     0,
+     318,   778,     0,   779,   319,   320,   321,     0,   322,  1151,
+       0,  1152,   325,     0,   326,   327,   328,   329,   330,   780,
+     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
+     340,     0,   341,   781,   342,   343,   344,   345,   346,  1153,
+    1154,     0,  1155,     0,   350,   782,   783,   351,   784,   352,
+     353,   354,   355,   356,     0,     0,   357,  1156,   785,   359,
+     786,     0,   360,   361,   362,  1157,  1158,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,  1159,   787,  1160,   380,   381,   382,  1161,   383,
+     384,   788,   385,  1162,  1163,   387,  1164,   389,   390,   391,
+       0,   392,     0,     0,  1165,   394,   395,     0,     0,   396,
+     397,   789,   398,   790,  1166,   400,   401,   402,   403,   404,
+     405,   406,     0,   407,   408,  1167,   410,   411,   412,   413,
+     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
+    1168,   424,   425,   426,   427,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
+     791,   441,   442,   443,  1169,   445,   446,   447,   448,   449,
+     450,   451,   452,     0,   453,   454,   455,   456,   457,  1170,
+     458,   459,   460,   461,   462,   792,   463,   464,  1171,   466,
+       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
+     476,   477,  1172,     0,   479,   480,     0,   481,   793,   482,
+     483,   484,   485,   486,     0,  1173,  1174,     0,     0,   489,
+     490,  1175,   492,  1176,  1177,   494,   495,   496,   497,   498,
+     499,   500,     0,  1178,   501,   502,   503,   504,   505,  1179,
+       0,   506,   507,   508,   509,   510,   511,  1180,     0,   513,
+     794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
+     519,   520,   521,   522,   523,   524,   525,  1181,  1182,  1183,
+    1184,  1185,  1186,  1187,  1188,   534,   535,   536,  1189,     0,
+       0,     0,     0,     0,     0,  1190,  1191,     0,     0,     0,
+       0,     0,     0,     0,  1193,   771,  1123,   593,  1124,  1125,
+    1126,   646,  1127,     0,     0,     0,     0,     0,     0,     0,
+     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
+     230,   231,     0,     0,     0,     0,  1128,     0,     0,   232,
+     233,     0,   234,   235,   772,   236,   237,   238,   239,  1129,
+     773,  1130,  1131,     0,   243,   244,   245,   246,   247,  1132,
+    1133,   248,   249,  1134,  1135,   252,     0,   253,   254,   255,
+     256,  1136,     0,  1137,     0,   258,   259,   260,   261,   775,
+     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
+       0,   776,   271,   272,  3834,  1138,  1139,  1140,  1141,  1142,
+    1143,  1144,   274,   275,   276,   277,   278,   279,  1145,  1146,
+     282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
+     289,   290,   291,     0,     0,   292,   293,   986,   295,   296,
+       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
+     304,   305,   306,  1147,   308,   309,   310,  1148,  1149,   312,
+       0,   313,   314,  1150,   316,     0,   317,     0,   318,   778,
+       0,   779,   319,   320,   321,     0,   322,  1151,     0,  1152,
+     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
+     333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
+     341,   781,   342,   343,   344,   345,   346,  1153,  1154,     0,
+    1155,     0,   350,   782,   783,   351,   784,   352,   353,   354,
+     355,   356,     0,     0,   357,  1156,   785,   359,   786,     0,
+     360,   361,   362,  1157,  1158,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+    1159,   787,  1160,   380,   381,   382,  1161,   383,   384,   788,
+     385,  1162,  1163,   387,  1164,   389,   390,   391,     0,   392,
+       0,     0,  1165,   394,   395,     0,     0,   396,   397,   789,
+     398,   790,  1166,   400,   401,   402,   403,   404,   405,   406,
+       0,   407,   408,  1167,   410,   411,   412,   413,   414,     0,
+     415,   416,   417,   418,   419,   420,   421,   422,  1168,   424,
+     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
+     442,   443,  1169,   445,   446,   447,   448,   449,   450,   451,
+     452,     0,   453,   454,   455,   456,   457,  1170,   458,   459,
+     460,   461,   462,   792,   463,   464,  1171,   466,     0,   467,
+     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
+    1172,     0,   479,   480,     0,   481,   793,   482,   483,   484,
+     485,   486,     0,  1173,  1174,     0,     0,   489,   490,  1175,
+     492,  1176,  1177,   494,   495,   496,   497,   498,   499,   500,
+       0,  1178,   501,   502,   503,   504,   505,  1179,     0,   506,
+     507,   508,   509,   510,   511,  1180,     0,   513,   794,   514,
+     515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
+     521,   522,   523,   524,   525,  1181,  1182,  1183,  1184,  1185,
+    1186,  1187,  1188,   534,   535,   536,  1189,     0,     0,     0,
+       0,     0,     0,  1190,  1191,     0,     0,     0,     0,     0,
+       0,     0,  1193,   771,  1123,   593,  1124,  1125,  1126,   646,
+    1127,     0,     0,     0,     0,     0,     0,     0,   220,   221,
+     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
+       0,     0,     0,     0,  1128,     0,     0,   232,   233,     0,
+     234,   235,   772,   236,   237,   238,   239,  1129,   773,  1130,
+    1131,     0,   243,   244,   245,   246,   247,  1132,  1133,   248,
+     249,  1134,  1135,   252,     0,   253,   254,   255,   256,  1136,
+       0,  1137,     0,   258,   259,   260,   261,   775,   262,   263,
+     264,     0,   265,   266,   267,   268,   269,   270,     0,   776,
+     271,   272,   273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,
+     274,   275,   276,   277,   278,   279,  1145,  1146,   282,     0,
+     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
+     291,     0,     0,   292,   293,   986,   295,   296,     0,   297,
+     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
+     306,  1147,   308,   309,   310,  1148,  1149,   312,     0,   313,
+     314,  1150,   316,     0,   317,     0,   318,   778,     0,   779,
+     319,   320,   321,     0,   322,  1151,     0,  1152,   325,     0,
+     326,   327,   328,   329,   330,   780,   331,   332,   333,   334,
+       0,   335,   336,   337,   338,   339,   340,     0,   341,   781,
+     342,   343,   344,   345,   346,  1153,  1154,     0,  1155,     0,
+     350,   782,   783,   351,   784,   352,   353,   354,   355,   356,
+       0,     0,   357,  1156,   785,   359,   786,     0,   360,   361,
+     362,  1157,  1158,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,  1159,   787,
+    1160,   380,   381,   382,  1161,   383,   384,   788,   385,  1162,
+    1163,   387,  1164,   389,   390,   391,     0,   392,     0,     0,
+    1165,   394,   395,     0,     0,   396,   397,   789,   398,   790,
+    1166,   400,   401,   402,   403,   404,   405,   406,     0,   407,
+     408,  1167,   410,   411,   412,   413,   414,     0,   415,   416,
+     417,   418,   419,   420,   421,   422,  1168,   424,   425,   426,
+     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
+    1169,   445,   446,   447,   448,   449,   450,   451,   452,     0,
+     453,   454,   455,   456,   457,  1170,   458,   459,   460,   461,
+     462,   792,   463,   464,  1171,   466,     0,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,  1172,     0,
+     479,   480,     0,   481,   793,   482,   483,   484,   485,   486,
+       0,  1173,  1174,     0,     0,   489,   490,  1175,   492,  1176,
+    1177,   494,   495,   496,   497,   498,   499,   500,     0,  1178,
+     501,   502,   503,   504,   505,  1179,     0,   506,   507,   508,
+     509,   510,   511,  1180,     0,   513,   794,   514,   515,   516,
+     517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
+     523,   524,  4131,  1181,  1182,  1183,  1184,  1185,  1186,  1187,
+    1188,   534,   535,   536,  1189,     0,     0,     0,     0,     0,
+       0,  1190,  1191,     0,     0,     0,     0,     0,     0,     0,
+    1193,   771,  1123,   593,  1124,  1125,  1126,   646,  1127,     0,
+       0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
+     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
+       0,     0,  1128,     0,     0,   232,   233,     0,   234,   235,
+     772,   236,   237,   238,   239,  1129,   773,  1130,  1131,     0,
+     243,   244,   245,   246,   247,  1132,  1133,   248,   249,  1134,
+    1135,   252,     0,   253,   254,   255,   256,  1136,     0,  1137,
+       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
+     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
+     273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,   275,
+     276,   277,   278,   279,  1145,  1146,   282,     0,   283,     0,
+     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
+       0,   292,   293,   986,   295,   296,     0,   297,   298,   299,
+       0,   300,   301,   302,     0,   303,   304,   305,   306,  1147,
+     308,   309,   310,  1148,  1149,   312,     0,   313,   314,  1150,
+     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
+     321,     0,   322,  1151,     0,  1152,   325,     0,   326,   327,
+     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
+     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
+     344,   345,   346,  1153,  1154,     0,  1155,     0,   350,   782,
+     783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
+     357,  1156,   785,   359,   786,     0,   360,   361,   362,  1157,
+    1158,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,  1159,   787,  1160,   380,
+    4140,   382,  1161,   383,   384,   788,   385,  1162,  1163,   387,
+    1164,   389,   390,   391,     0,   392,     0,     0,  1165,   394,
+     395,     0,     0,   396,   397,   789,   398,   790,  1166,   400,
+     401,   402,   403,   404,   405,   406,     0,   407,   408,  1167,
+     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
+     419,   420,   421,   422,  1168,   424,   425,   426,   427,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,     0,   439,   440,   791,   441,   442,   443,  1169,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,  1170,   458,   459,   460,   461,   462,   792,
+     463,   464,  1171,   466,     0,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,  1172,     0,   479,   480,
+       0,   481,   793,   482,   483,   484,   485,   486,     0,  1173,
+    1174,     0,     0,   489,   490,  1175,   492,  1176,  1177,   494,
+     495,   496,   497,   498,   499,   500,     0,  1178,   501,   502,
+     503,   504,   505,  1179,     0,   506,   507,   508,   509,   510,
+     511,  1180,     0,   513,   794,   514,   515,   516,   517,     0,
+       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
+     525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,
+     535,   536,  1189,     0,     0,     0,     0,     0,     0,  1190,
+    1191,     0,     0,     0,     0,     0,     0,     0,  1193,   771,
+    1123,   593,  1124,  1125,  1126,   646,  1127,     0,     0,     0,
+       0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
+     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
+    1128,     0,     0,   232,   233,     0,   234,   235,   772,   236,
+     237,   238,   239,  1129,   773,  1130,  1131,     0,   243,   244,
+     245,   246,   247,  1132,  1133,   248,   249,  1134,  1135,   252,
+       0,   253,   254,   255,   256,  1136,     0,  1137,     0,   258,
+     259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
+     267,   268,   269,   270,     0,   776,   271,  4436,   273,  1138,
+    1139,  1140,  1141,  1142,  1143,  1144,   274,   275,   276,   277,
+     278,   279,  1145,  1146,   282,     0,   283,     0,   284,   285,
+     286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
+     293,   986,   295,   296,     0,   297,   298,   299,     0,   300,
+     301,   302,     0,   303,   304,   305,   306,  1147,   308,   309,
+     310,  1148,  1149,   312,     0,   313,   314,  1150,   316,     0,
+     317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
+     322,  1151,     0,  4437,   325,     0,   326,   327,   328,   329,
+     330,   780,   331,   332,   333,   334,     0,   335,   336,   337,
+     338,   339,   340,     0,   341,   781,   342,   343,   344,   345,
+     346,  1153,  1154,     0,  1155,     0,   350,   782,   783,   351,
+     784,   352,   353,   354,   355,   356,     0,     0,   357,  1156,
+     785,   359,   786,     0,   360,   361,   362,  1157,  1158,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,  1159,   787,  1160,   380,   381,   382,
+    1161,   383,   384,   788,   385,  1162,  1163,   387,  1164,   389,
+     390,   391,     0,   392,     0,     0,  1165,   394,   395,     0,
+       0,   396,   397,   789,   398,   790,  1166,   400,   401,   402,
+     403,   404,   405,   406,     0,   407,   408,  1167,   410,   411,
+     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
+     421,   422,  1168,   424,   425,   426,   427,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
+     439,   440,   791,   441,   442,  4438,  1169,   445,   446,   447,
+     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
+     457,  1170,   458,   459,   460,   461,   462,   792,   463,   464,
+    1171,   466,     0,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,  1172,     0,   479,   480,     0,   481,
+     793,   482,   483,   484,   485,   486,     0,  1173,  1174,     0,
+       0,   489,   490,  1175,   492,  1176,  1177,   494,   495,   496,
+     497,   498,   499,   500,     0,  1178,   501,   502,   503,   504,
+     505,  1179,     0,   506,   507,   508,   509,   510,   511,  1180,
+       0,   513,   794,   514,   515,   516,   517,     0,     0,   518,
+       0,     0,   519,   520,   521,   522,   523,   524,   525,  1181,
+    1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,   535,   536,
+    1189,     0,     0,     0,     0,     0,     0,  1190,  1191,     0,
+       0,     0,     0,     0,     0,     0,  4439,   771,  1123,   593,
+    1124,  1125,  1126,   646,  1127,     0,     0,     0,     0,     0,
+       0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
+       0,   229,   230,   231,     0,     0,     0,     0,  1128,     0,
+       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
+    4801,  1129,   773,  1130,  1131,     0,   243,   244,   245,   246,
+     247,  1132,  1133,   248,   249,  1134,  1135,   252,     0,   253,
+     254,   255,   256,  1136,     0,  1137,     0,   258,   259,   260,
+     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
+     269,   270,     0,   776,   271,   272,  4802,  1138,  1139,  1140,
+    1141,  1142,  1143,  1144,   274,   275,   276,   277,   278,   279,
+    1145,  1146,   282,     0,   283,     0,   284,   285,   286,   287,
+     288,     0,   289,   290,   291,     0,     0,   292,   293,   986,
+     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
+       0,   303,   304,   305,   306,  1147,   308,   309,   310,  1148,
+    1149,   312,     0,   313,   314,  1150,   316,     0,   317,     0,
+     318,   778,     0,   779,   319,   320,   321,     0,   322,  1151,
+       0,  1152,   325,     0,   326,   327,   328,   329,   330,   780,
+     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
+     340,     0,   341,   781,   342,   343,   344,   345,   346,  1153,
+    1154,     0,  1155,     0,   350,   782,   783,   351,   784,   352,
+     353,   354,   355,   356,     0,     0,   357,  1156,   785,   359,
+     786,     0,   360,   361,   362,  1157,  1158,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,  1159,   787,  1160,   380,   381,   382,  1161,   383,
+     384,   788,   385,  1162,  1163,   387,  1164,   389,   390,   391,
+       0,   392,     0,     0,  1165,   394,   395,     0,     0,   396,
+     397,   789,   398,   790,  1166,   400,   401,   402,   403,   404,
+     405,   406,     0,   407,   408,  1167,   410,   411,   412,   413,
+     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
+    1168,   424,   425,   426,   427,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
+     791,   441,   442,   443,  1169,   445,   446,   447,   448,   449,
+     450,   451,   452,     0,   453,   454,   455,   456,   457,  1170,
+     458,   459,   460,   461,   462,   792,   463,   464,  1171,   466,
+       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
+     476,   477,  1172,     0,   479,   480,     0,   481,   793,   482,
+     483,   484,   485,   486,     0,  1173,  1174,     0,     0,   489,
+     490,  1175,   492,  1176,  1177,   494,   495,   496,   497,  4803,
+     499,   500,     0,  1178,   501,   502,   503,   504,   505,  1179,
+       0,   506,   507,   508,   509,   510,   511,  1180,     0,   513,
+     794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
+     519,   520,   521,   522,   523,   524,   525,  1181,  1182,  1183,
+    1184,  1185,  1186,  1187,  1188,   534,   535,   536,  1189,     0,
+       0,     0,     0,     0,     0,  1190,  1191,     0,     0,     0,
+       0,     0,     0,     0,  1193,   771,  1123,   593,  1124,  1125,
+    1126,   646,  1127,     0,     0,     0,     0,     0,     0,     0,
+     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
+     230,   231,     0,     0,     0,     0,  1128,     0,     0,   232,
+     233,     0,   234,   235,   772,   236,   237,   238,   239,  1129,
+     773,  1130,  1131,     0,   243,   244,   245,   246,   247,  1132,
+    1133,   248,   249,  1134,  1135,   252,     0,   253,   254,   255,
+     256,  1136,     0,  1137,     0,   258,   259,   260,   261,   775,
+     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
+       0,   776,   271,   272,  4802,  1138,  1139,  1140,  1141,  1142,
+    1143,  1144,   274,   275,   276,   277,   278,   279,  1145,  1146,
+     282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
+     289,   290,   291,     0,     0,   292,   293,   986,   295,   296,
+       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
+     304,   305,   306,  1147,   308,   309,   310,  1148,  1149,   312,
+       0,   313,   314,  1150,   316,     0,   317,     0,   318,   778,
+       0,   779,   319,   320,   321,     0,   322,  1151,     0,  1152,
+     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
+     333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
+     341,   781,   342,   343,   344,   345,   346,  1153,  1154,     0,
+    1155,     0,   350,   782,   783,   351,   784,   352,   353,   354,
+     355,   356,     0,     0,   357,  1156,   785,   359,   786,     0,
+     360,   361,   362,  1157,  1158,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+    1159,   787,  1160,   380,   381,   382,  1161,   383,   384,   788,
+     385,  1162,  1163,   387,  1164,   389,   390,   391,     0,   392,
+       0,     0,  1165,   394,   395,     0,     0,   396,   397,   789,
+     398,   790,  1166,   400,   401,   402,   403,   404,   405,   406,
+       0,   407,   408,  1167,   410,   411,   412,   413,   414,     0,
+     415,   416,   417,   418,   419,   420,   421,   422,  1168,   424,
+     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
+     442,   443,  1169,   445,   446,   447,   448,   449,   450,   451,
+     452,     0,   453,   454,   455,   456,   457,  1170,   458,   459,
+     460,   461,   462,   792,   463,   464,  1171,   466,     0,   467,
+     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
+    1172,     0,   479,   480,     0,   481,   793,   482,   483,   484,
+     485,   486,     0,  1173,  1174,     0,     0,   489,   490,  1175,
+     492,  1176,  1177,   494,   495,   496,   497,  4803,   499,   500,
+       0,  1178,   501,   502,   503,   504,   505,  1179,     0,   506,
+     507,   508,   509,   510,   511,  1180,     0,   513,   794,   514,
+     515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
+     521,   522,   523,   524,   525,  1181,  1182,  1183,  1184,  1185,
+    1186,  1187,  1188,   534,   535,   536,  1189,     0,     0,     0,
+       0,     0,     0,  1190,  1191,     0,     0,     0,     0,     0,
+       0,     0,  1193,   771,  1123,   593,  1124,  1125,  1126,   646,
+    1127,     0,     0,     0,     0,     0,     0,     0,   220,   221,
+     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
+       0,     0,     0,     0,  1128,     0,     0,   232,   233,     0,
+     234,   235,   772,   236,   237,   238,   239,  1129,   773,  1130,
+    1131,     0,   243,   244,   245,   246,   247,  1132,  1133,   248,
+     249,  1134,  1135,   252,     0,   253,   254,   255,   256,  1136,
+       0,  1137,     0,   258,   259,   260,   261,   775,   262,   263,
+     264,     0,   265,   266,   267,   268,   269,   270,     0,   776,
+     271,   272,   273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,
+     274,   275,   276,   277,   278,   279,  1145,  1146,   282,     0,
+     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
+     291,     0,     0,   292,   293,   986,   295,   296,     0,   297,
+     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
+     306,  1147,   308,   309,   310,  1148,  1149,   312,     0,   313,
+     314,  1150,   316,     0,   317,     0,   318,   778,     0,   779,
+     319,   320,   321,     0,   322,  1151,     0,  1152,   325,     0,
+     326,   327,   328,   329,   330,   780,   331,   332,   333,   334,
+       0,   335,   336,   337,   338,   339,   340,     0,   341,   781,
+     342,   343,   344,   345,   346,  1153,  1154,     0,  1155,     0,
+     350,   782,   783,   351,   784,   352,   353,   354,   355,   356,
+       0,     0,   357,  1156,   785,   359,   786,     0,   360,   361,
+     362,  1157,  1158,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,  1159,   787,
+    1160,   380,   381,   382,     0,   383,   384,   788,   385,  1162,
+    1163,   387,  1164,   389,   390,   391,     0,   392,     0,     0,
+    1165,   394,   395,     0,     0,   396,   397,   789,   398,   790,
+    1166,   400,   401,   402,   403,   404,   405,   406,     0,   407,
+     408,  1167,   410,   411,   412,   413,   414,     0,   415,   416,
+     417,   418,   419,   420,   421,   422,  1168,   424,   425,   426,
+     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
+    2523,   445,   446,   447,   448,   449,   450,   451,   452,     0,
+     453,   454,   455,   456,   457,  1170,   458,   459,   460,   461,
+     462,   792,   463,   464,  1171,   466,     0,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,  1172,     0,
+     479,   480,     0,   481,   793,   482,   483,   484,   485,   486,
+       0,  1173,  1174,     0,     0,   489,   490,  1175,   492,  1176,
+    1177,   494,   495,   496,   497,   498,   499,   500,     0,     0,
+     501,   502,   503,   504,   505,  1179,     0,   506,   507,   508,
+     509,   510,   511,  1180,     0,   513,   794,   514,   515,   516,
+     517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
+     523,   524,   525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,
+    1188,   534,   535,   536,     0,     0,     0,     0,     0,     0,
+       0,  2524,  2525,     0,     0,     0,     0,     0,     0,     0,
+    2526,   771,  1123,   593,  1124,  1125,  1126,   646,  1127,     0,
+       0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
+     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
+       0,     0,  1128,     0,     0,   232,   233,     0,   234,   235,
+     772,   236,   237,   238, -2394,  1129,   773,  1130,  1131,     0,
+     243,   244,   245,   246,   247,  1132,  1133,   248,   249,  1134,
+    1135,   252,     0,   253,   254,   255,   256,  1136,     0,  1137,
+       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
+     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
+    4802,  1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,   275,
+     276,   277,   278,   279,  1145,  1146,   282,     0,   283,     0,
+     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
+       0,   292,   293,   986,   295,   296,     0,   297,   298,   299,
+       0,   300,   301,   302,     0,   303,   304,   305,   306,  1147,
+     308,   309,   310,  1148,  1149,   312,     0,   313,   314,  1150,
+     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
+     321,     0,   322,  1151,     0,  1152,   325,     0,   326,   327,
+     328,   329,   330, -2394,   331,   332,   333,   334,     0,   335,
+     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
+     344,   345,   346,  1153,  1154,     0,  1155,     0,   350,     0,
+       0,   351,   784,   352,   353,   354,   355,   356,     0,     0,
+     357,  1156,   785,   359, -2394,     0,   360,   361,   362,  1157,
+    1158,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,  1159,   787,  1160,   380,
+     381,   382,  1161,   383,   384,     0,   385,  1162,  1163,   387,
+    1164,   389,   390,   391,     0,   392,     0,     0,  1165,   394,
+     395,     0,     0,   396,   397,   789,   398,   790,  1166,   400,
+     401,   402,   403,   404,   405,   406,     0,   407,   408,  1167,
+     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
+     419,   420,   421,   422,  1168,   424,   425,   426,   427,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,     0,   439,   440,   791,   441,   442,   443,  1169,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,  1170,   458,   459,   460,   461,   462, -2394,
+     463,   464,  1171,   466,     0,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,  1172,     0,   479,   480,
+       0,   481,   793,   482,   483,   484,   485,   486,     0,  1173,
+    1174,     0,     0,   489,   490,  1175,   492,  1176,  1177,   494,
+     495,   496,   497,  4803,   499,   500,     0,  1178,   501,   502,
+     503,   504,   505,  1179,     0,   506,   507,   508,   509,   510,
+     511,  1180,     0,   513,   794,   514,   515,   516,   517,     0,
+       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
+     525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,
+     535,   536, -2394,     0,     0,     0,     0,     0,     0,  1190,
+    1191,     0,     0,     0,     0,     0,     0,     0,  1193,   771,
+    1123,   593,  1124,  1125,  1126,   646,  1127,     0,     0,     0,
+       0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
+     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
+    1128,     0,     0,   232,   233,     0,   234,   235,   772,   236,
+     237,   238,   239,  1129,   773,  1130,  1131,     0,   243,   244,
+     245,   246,   247,  1132,  1133,   248,   249,  1134,  1135,   252,
+       0,   253,   254,   255,   256,  1136,     0,  1137,     0,   258,
+     259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
+     267,   268,   269,   270,     0,   776,   271,   272,   273,  1138,
+    1139,  1140,  1141,  1142,  1143,  1144,   274,   275,   276,   277,
+     278,   279,  1145,  1146,   282,     0,   283,     0,   284,   285,
+     286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
+     293,   986,   295,   296,     0,   297,   298,   299,     0,   300,
+     301,   302,     0,   303,   304,   305,   306,  1147,   308,   309,
+     310,  1148,  1149,   312,     0,   313,   314,  1150,   316,     0,
+     317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
+     322,  1151,     0,  1152,   325,     0,   326,   327,   328,   329,
+     330,   780,   331,   332,   333,   334,     0,   335,   336,   337,
+     338,   339,   340,     0,   341,   781,   342,   343,   344,   345,
+     346,  1153,  1154,     0,  1155,     0,   350,     0,   783,   351,
+     784,   352,   353,   354,   355,   356,     0,     0,   357,  1156,
+     785,   359,   786,     0,   360,   361,   362,  1157,  1158,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,  1159,   787,  1160,   380,   381,   382,
+       0,   383,   384,   788,   385,  1162,  1163,   387,  1164,   389,
+     390,   391,     0,   392,     0,     0,  1165,   394,   395,     0,
+       0,   396,   397,   789,   398,   790,  1166,   400,   401,   402,
+     403,   404,   405,   406,     0,   407,   408,  1167,   410,   411,
+     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
+     421,   422,  1168,   424,   425,   426,   427,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
+     439,   440,   791,   441,   442,   443,  2523,   445,   446,   447,
+     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
+     457,  1170,   458,   459,   460,   461,   462,   792,   463,   464,
+    1171,   466,     0,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,  1172,     0,   479,   480,     0,   481,
+     793,   482,   483,   484,   485,   486,     0,  1173,  1174,     0,
+       0,   489,   490,  1175,   492,  1176,  1177,   494,   495,   496,
+     497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
+     505,  1179,     0,   506,   507,   508,   509,   510,   511,  1180,
+       0,   513,   794,   514,   515,   516,   517,     0,     0,   518,
+       0,     0,   519,   520,   521,   522,   523,   524,   525,  1181,
+    1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,   535,   536,
+       0,     0,     0,     0,     0,     0,     0,  2524,  2525,     0,
+       0,   771,  1123,   593,  1124,  1125,  2526,   646,  1127,     0,
+       0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
+     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
+       0,     0,  1128,     0,     0,   232,   233,     0,   234,   235,
+     772,   236,   237,   238,   239,  1129,   773,  1130,  1131,     0,
+     243,   244,   245,   246,   247,  1132,  1133,   248,   249,  1134,
+    1135,   252,     0,   253,   254,   255,   256,  1136,     0,  1137,
+       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
+     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
+     273,  1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,   275,
+     276,   277,   278,   279,  1145,  1146,   282,     0,   283,     0,
+     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
+       0,   292,   293,   986,   295,   296,     0,   297,   298,   299,
+       0,   300,   301,   302,     0,   303,   304,   305,   306,  1147,
+     308,   309,   310,  1148,  1149,   312,     0,   313,   314,  1150,
+     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
+     321,     0,   322,  1151,     0,  1152,   325,     0,   326,   327,
+     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
+     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
+     344,   345,   346,  1153,  1154,     0,  1155,     0,   350,   782,
+     783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
+     357,  1156,   785,   359,   786,     0,   360,   361,   362,  1157,
+    1158,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,  1159,   787,  1160,   380,
+     381,   382,     0,   383,   384,   788,   385,  1162,  1163,   387,
+    1164,   389,   390,   391,     0,   392,     0,     0,   393,   394,
+     395,     0,     0,   396,   397,   789,   398,   790,  1166,   400,
+     401,   402,   403,   404,   405,   406,     0,   407,   408,  1167,
+     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
+     419,   420,   421,   422,  1168,   424,   425,   426,   427,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,     0,   439,   440,   791,   441,   442,   443,  2523,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,  1170,   458,   459,   460,   461,   462,   792,
+     463,   464,  1171,   466,     0,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,  1172,     0,   479,   480,
+       0,   481,   793,   482,   483,   484,   485,   486,     0,  1173,
+    1174,     0,     0,   489,   490,  1175,   492,  1176,  1177,   494,
+     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
+     503,   504,   505,  1179,     0,   506,   507,   508,   509,   510,
+     511,  1180,     0,   513,   794,   514,   515,   516,   517,     0,
+       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
+     525,  1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,
+     535,   536,     0,     0,   771,  1123,   593,  1124,  1125,     0,
+     646,  1127,     0,     0,     0,     0,     0,     0,  2526,   220,
+     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
+     231,     0,     0,     0,     0,  1128,     0,     0,   232,   233,
+       0,   234,   235,   772,   236,   237,   238,   239,  1129,   773,
+    1130,  1131,     0,  3736,   244,   245,   246,   247,  1132,  1133,
+     248,   249,  1134,  1135,   252,     0,   253,   254,   255,   256,
+    1136,     0,  1137,     0,   258,   259,   260,   261,   775,   262,
+     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
+     776,   271,   272,   273,  1138,  1139,  1140,  1141,  1142,  1143,
+    1144,   274,   275,   276,   277,   278,   279,  1145,  1146,   282,
        0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
-     290,   291,     0,     0,   292,   293,   985,   295,   296,     0,
+     290,   291,     0,     0,   292,   293,   986,   295,   296,     0,
      297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
-     305,   306,  1146,   308,   309,   310,  1147,  1148,   312,     0,
-     313,   314,  1149,   316,     0,   317,     0,   318,   778,     0,
-     779,   319,   320,   321,     0,   322,  1150,     0,  1151,   325,
+     305,   306,  1147,   308,   309,   310,  1148,  1149,   312,     0,
+     313,   314,  1150,   316,     0,   317,     0,   318,   778,     0,
+     779,   319,   320,   321,     0,   322,  1151,     0,  1152,   325,
        0,   326,   327,   328,   329,   330,   780,   331,   332,   333,
      334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
-     781,   342,   343,   344,   345,   346,  1152,  1153,     0,  1154,
+     781,   342,   343,   344,   345,   346,  1153,  1154,     0,  1155,
        0,   350,   782,   783,   351,   784,   352,   353,   354,   355,
-     356,     0,     0,   357,  1155,   785,   359,   786,     0,   360,
-     361,   362,  1156,  1157,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,  1158,
-     787,  1159,   380,   381,   382,  1160,   383,   384,   788,   385,
-    1161,  1162,   387,  1163,   389,   390,   391,     0,   392,     0,
-       0,  1164,   394,   395,     0,     0,   396,   397,   789,   398,
-     790,  1165,   400,   401,   402,   403,   404,   405,   406,     0,
-     407,   408,  1166,   410,   411,   412,   413,   414,     0,   415,
-     416,   417,   418,   419,   420,   421,   422,  1167,   424,   425,
+     356,     0,     0,   357,  1156,   785,   359,   786,     0,   360,
+     361,   362,  1157,  1158,   363,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,  1159,
+     787,  1160,   380,   381,   382,     0,   383,   384,   788,   385,
+    1162,  1163,   387,  1164,   389,   390,   391,     0,   392,     0,
+       0,   393,   394,   395,     0,     0,   396,   397,   789,   398,
+     790,  1166,   400,   401,   402,   403,   404,   405,   406,     0,
+     407,   408,  1167,   410,   411,   412,   413,   414,     0,   415,
+     416,   417,   418,   419,   420,   421,   422,  1168,   424,   425,
      426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
      435,   436,   437,   438,     0,   439,   440,   791,   441,   442,
-     443,  1168,   445,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,  1169,   458,   459,   460,
-     461,   462,   792,   463,   464,  1170,   466,     0,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,  1171,
+     443,  2523,   445,   446,   447,   448,   449,   450,   451,   452,
+       0,   453,   454,   455,   456,   457,  1170,   458,   459,   460,
+     461,   462,   792,   463,   464,  1171,   466,     0,   467,   468,
+     469,   470,   471,   472,   473,   474,   475,   476,   477,  1172,
        0,   479,   480,     0,   481,   793,   482,   483,   484,   485,
-     486,     0,  1172,  1173,     0,     0,   489,   490,  1174,   492,
-    1175,  1176,   494,   495,   496,   497,   498,   499,   500,     0,
-    1177,   501,   502,   503,   504,   505,  1178,     0,   506,   507,
-     508,   509,   510,   511,  1179,     0,   513,   794,   514,   515,
+     486,     0,  1173,  1174,     0,     0,   489,   490,  1175,   492,
+    1176,  1177,   494,   495,   496,   497,   498,   499,   500,     0,
+       0,   501,   502,   503,   504,   505,  1179,     0,   506,   507,
+     508,   509,   510,   511,  1180,     0,   513,   794,   514,   515,
      516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
-     522,   523,   524,   525,  1180,  1181,  1182,  1183,  1184,  1185,
-    1186,  1187,   534,   535,   536,  1188,     0,     0,     0,     0,
-       0,     0,  1189,  1190,  1191,     0,     0,     0,     0,     0,
-       0,  1192,   771,  1122,   593,  1123,  1124,  1125,   646,  1126,
-       0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
-     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
-       0,     0,     0,  1127,     0,     0,   232,   233,     0,   234,
-     235,   772,   236,   237,   238,   239,  1128,   773,  1129,  1130,
-       0,   243,   244,   245,   246,   247,  1131,  1132,   248,   249,
-    1133,  1134,   252,     0,   253,   254,   255,   256,  1135,     0,
-    1136,     0,   258,   259,   260,   261,   775,   262,   263,   264,
-       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
-     272,   273,  1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,
-     275,   276,   277,   278,   279,  1144,  1145,   282,  1266,   283,
-       0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
-       0,     0,   292,   293,   985,   295,   296,     0,   297,   298,
-     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
-    1146,   308,   309,   310,  1147,  1148,   312,     0,   313,   314,
-    1149,   316,     0,   317,     0,   318,   778,     0,   779,   319,
-     320,   321,     0,   322,  1150,     0,  1151,   325,     0,   326,
-     327,   328,   329,   330,   780,   331,   332,   333,   334,     0,
-     335,   336,   337,   338,   339,   340,     0,   341,   781,   342,
-     343,   344,   345,   346,  1152,  1153,     0,  1154,     0,   350,
-     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
-       0,   357,  1155,   785,   359,   786,     0,   360,   361,   362,
-    1156,  1157,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,  1158,   787,  1159,
-     380,   381,   382,  1160,   383,   384,   788,   385,  1161,  1162,
-     387,  1163,   389,   390,   391,     0,   392,     0,     0,  1164,
-     394,   395,     0,     0,   396,   397,   789,   398,   790,  1165,
-     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
-    1166,   410,   411,   412,   413,   414,     0,   415,   416,   417,
-     418,   419,   420,   421,   422,  1167,   424,   425,   426,   427,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,     0,   439,   440,   791,   441,   442,   443,  1168,
-     445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
-     454,   455,   456,   457,  1169,   458,   459,   460,   461,   462,
-     792,   463,   464,  1170,   466,     0,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,  1171,     0,   479,
-     480,     0,   481,   793,   482,   483,   484,   485,   486,     0,
-    1172,  1173,     0,     0,   489,   490,  1174,   492,  1175,  1176,
-     494,   495,   496,   497,   498,   499,   500,     0,  1177,   501,
-     502,   503,   504,   505,  1178,     0,   506,   507,   508,   509,
-     510,   511,  1179,     0,   513,   794,   514,   515,   516,   517,
-       0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
-     524,   525,  1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,
-     534,   535,   536,  1188,     0,     0,     0,     0,     0,     0,
-    1189,  1190,     0,     0,     0,     0,     0,     0,     0,  1192,
-     771,  1122,   593,  1123,  1124,  1125,   646,  1126,     0,     0,
-       0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,  1960,   229,   230,   231,     0,     0,     0,
-       0,  1127,     0,     0,   232,   233,     0,   234,   235,   772,
-     236,   237,   238,   239,  1128,   773,  1129,  1130,     0,   243,
-     244,   245,   246,   247,  1131,  1132,   248,   249,  1133,  1134,
-     252,     0,   253,   254,   255,   256,  1135,     0,  1136,     0,
+     522,   523,   524,   525,  1181,  1182,  1183,  1184,  1185,  1186,
+    1187,  1188,   534,   535,   536,     0,     0,   771,  1123,   593,
+    1124,  1125,  1126,   646,  1127,     0,     0,     0,     0,     0,
+       0,  2526,   220,   221,   222,   223,   224,   225,   226,   227,
+       0,   229,   230,   231,     0,     0,     0,     0,  1128,     0,
+       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
+       0,  1129,   773,  1130,  1131,     0,   243,   244,   245,   246,
+     247,  1132,  1133,   248,   249,  1134,  1135,   252,     0,   253,
+     254,   255,   256,  1136,     0,  1137,     0,   258,   259,   260,
+     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
+     269,   270,     0,   776,   271,   272,   273,  1138,  1139,  1140,
+    1141,  1142,  1143,  1144,   274,   275,   276,   277,   278,   279,
+    1145,  1146,   282,     0,   283,     0,   284,   285,   286,   287,
+     288,     0,   289,   290,   291,     0,     0,   292,   293,   986,
+     295,   296,     0,   297,   298,   299,     0,   300,     0,   302,
+       0,   303,   304,   305,   306,  1147,   308,   309,   310,  1148,
+    1149,   312,     0,   313,   314,  1150,   316,     0,   317,     0,
+     318,   778,     0,   779,   319,   320,   321,     0,   322,  1151,
+       0,  1152,   325,     0,   326,   327,   328,   329,   330,     0,
+     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
+     340,     0,   341,   781,   342,   343,   344,   345,   346,  1153,
+    1154,     0,  1155,     0,   350,     0,     0,   351,   784,   352,
+     353,   354,   355,   356,     0,     0,   357,  1156,   785,   359,
+       0,     0,   360,   361,   362,  1157,  1158,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,  1159,   787,  1160,   380,   381,   382,  1161,   383,
+     384,     0,   385,  1162,  1163,   387,  1164,   389,   390,   391,
+       0,   392,     0,     0,  1165,   394,   395,     0,     0,   396,
+     397,   789,   398,   790,  1166,   400,   401,   402,   403,   404,
+     405,   406,     0,   407,   408,  1167,   410,   411,   412,   413,
+     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
+    1168,   424,   425,   426,   427,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
+     791,   441,   442,   443,  1169,   445,   446,   447,   448,   449,
+     450,   451,   452,     0,   453,   454,   455,   456,   457,  1170,
+     458,   459,   460,   461,   462,     0,   463,   464,  1171,   466,
+       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
+     476,   477,  1172,     0,   479,   480,     0,   481,   793,   482,
+     483,   484,   485,   486,     0,  1173,  1174,     0,     0,   489,
+     490,  1175,   492,  1176,  1177,   494,   495,   496,   497,   498,
+     499,   500,     0,  1178,   501,   502,   503,   504,   505,  1179,
+       0,   506,   507,   508,   509,   510,   511,  1180,     0,   513,
+     794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
+     519,   520,   521,   522,   523,   524,   525,  1181,  1182,  1183,
+    1184,  1185,  1186,  1187,  1188,   534,   535,   536,     0,     0,
+     771,     0,     0,     0,     0,  1190,  1191,     0,     0,     0,
+       0,     0,     0,     0,  1193,   220,   221,   222,   223,   224,
+     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
+       0,     0,     0,     0,   232,   233,     0,   234,   235,   772,
+     236,   237,   238,   239,   240,   773,   241,   242,     0,   243,
+     244,   245,   246,   247,     0,  1133,   248,   249,   250,   251,
+     252,     0,   253,   254,   255,   256,  1136,     0,  1137,     0,
      258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
      266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
-    1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,   275,   276,
-     277,   278,   279,  1144,  1145,   282,     0,   283,     0,   284,
+    1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
      285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
-     292,   293,   985,   295,   296,     0,   297,   298,   299,     0,
-     300,   301,   302,     0,   303,   304,   305,   306,  1146,   308,
-     309,   310,  1147,  1148,   312,     0,   313,   314,  1149,   316,
+     292,   293,   294,   295,   296,     0,   297,   298,   299,     0,
+     300,   301,   302,     0,   303,   304,   305,   306,   307,   308,
+     309,   310,  1148,     0,   312,     0,   313,   314,   315,   316,
        0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
-       0,   322,  1150,     0,  1151,   325,     0,   326,   327,   328,
+       0,   322,  1151,     0,   324,   325,     0,   326,   327,   328,
      329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
      337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
-     345,   346,  1152,  1153,     0,  1154,     0,   350,   782,   783,
-     351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
-    1155,   785,   359,   786,     0,   360,   361,   362,  1156,  1157,
+     345,   346,   347,   348,     0,   349,     0,   350,   782,   783,
+     351,   784,   352,   353,   354,   355,   356,  3270,     0,   357,
+    1156,   785,   359,   786,     0,   360,   361,   362,  1157,  1158,
      363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,  1158,   787,  1159,   380,   381,
-     382,  1160,   383,   384,   788,   385,  1161,  1162,   387,  1163,
-     389,   390,   391,     0,   392,     0,     0,  1164,   394,   395,
-       0,     0,   396,   397,   789,   398,   790,  1165,   400,   401,
-     402,   403,   404,   405,   406,     0,   407,   408,  1166,   410,
+     373,   374,   375,   376,   377,   378,   787,   379,   380,   381,
+     382,     0,   383,   384,   788,   385,     0,  1163,   387,   388,
+     389,   390,   391,     0,   392,     0,   735,   393,   394,   395,
+       0,     0,   396,   397,   789,   398,   790,  1166,   400,   401,
+     402,   403,   404,   405,   406,     0,   407,   408,  1167,   410,
      411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
-     420,   421,   422,  1167,   424,   425,   426,   427,     0,   428,
+     420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,   791,   441,   442,   443,  1168,   445,   446,
-     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,  1169,   458,   459,   460,   461,   462,   792,   463,
-     464,  1170,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,  1171,     0,   479,   480,     0,
-     481,   793,   482,   483,   484,   485,   486,     0,  1172,  1173,
-       0,     0,   489,   490,  1174,   492,  1175,  1176,   494,   495,
-     496,   497,   498,   499,   500,     0,  1177,   501,   502,   503,
-     504,   505,  1178,     0,   506,   507,   508,   509,   510,   511,
-    1179,     0,   513,   794,   514,   515,   516,   517,     0,     0,
-     518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
-    1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,   534,   535,
-     536,  1188,     0,     0,     0,     0,     0,     0,  1189,  1190,
-       0,     0,     0,     0,     0,     0,     0,  1192,   771,  1122,
-     593,  1123,  1124,  1125,   646,  1126,     0,     0,     0,     0,
-       0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,     0,   229,   230,   231,     0,     0,     0,     0,  1127,
-       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
-     238,   239,  1128,   773,  1129,  1130,     0,   243,   244,   245,
-     246,   247,  1131,  1132,   248,   249,  1133,  1134,   252,     0,
-     253,   254,   255,   256,  1135,     0,  1136,     0,   258,   259,
-     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
-     268,   269,   270,     0,   776,   271,   272,   273,  1137,  1138,
-    1139,  1140,  1141,  1142,  1143,   274,   275,   276,   277,   278,
-     279,  1144,  1145,   282,     0,   283,     0,   284,   285,   286,
-     287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
-     985,   295,   296,     0,   297,   298,   299,     0,   300,   301,
-     302,     0,   303,   304,   305,   306,  1146,   308,   309,   310,
-    1147,  1148,   312,     0,   313,   314,  1149,   316,     0,   317,
-       0,   318,   778,  2532,   779,   319,   320,   321,     0,   322,
-    1150,     0,  1151,   325,     0,   326,   327,   328,   329,   330,
-     780,   331,   332,   333,   334,     0,   335,   336,   337,   338,
-     339,   340,     0,   341,   781,   342,   343,   344,   345,   346,
-    1152,  1153,     0,  1154,     0,   350,   782,   783,   351,   784,
-     352,   353,   354,   355,   356,     0,     0,   357,  1155,   785,
-     359,   786,     0,   360,   361,   362,  1156,  1157,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,  1158,   787,  1159,   380,   381,   382,  1160,
-     383,   384,   788,   385,  1161,  1162,   387,  1163,   389,   390,
-     391,     0,   392,     0,     0,  1164,   394,   395,     0,     0,
-     396,   397,   789,   398,   790,  1165,   400,   401,   402,   403,
-     404,   405,   406,     0,   407,   408,  1166,   410,   411,   412,
-     413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
-     422,  1167,   424,   425,   426,   427,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,   791,   441,   442,   443,  1168,   445,   446,   447,   448,
-     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
-    1169,   458,   459,   460,   461,   462,   792,   463,   464,  1170,
-     466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,  1171,     0,   479,   480,     0,   481,   793,
-     482,   483,   484,   485,   486,     0,  1172,  1173,     0,     0,
-     489,   490,  1174,   492,  1175,  1176,   494,   495,   496,   497,
-     498,   499,   500,     0,  1177,   501,   502,   503,   504,   505,
-    1178,     0,   506,   507,   508,   509,   510,   511,  1179,     0,
-     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
-       0,   519,   520,   521,   522,   523,   524,   525,  1180,  1181,
-    1182,  1183,  1184,  1185,  1186,  1187,   534,   535,   536,  1188,
-       0,     0,     0,     0,     0,     0,  1189,  1190,     0,     0,
-       0,     0,     0,     0,     0,  1192,   771,  1122,   593,  1123,
-    1124,  1125,   646,  1126,     0,     0,     0,     0,     0,     0,
-       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
-     229,   230,   231,     0,     0,     0,     0,  1127,     0,     0,
-     232,   233,     0,   234,   235,   772,   236,   237,   238,   239,
-    1128,   773,  1129,  1130,     0,   243,   244,   245,   246,   247,
-    1131,  1132,   248,   249,  1133,  1134,   252,     0,   253,   254,
-     255,   256,  1135,     0,  1136,     0,   258,   259,   260,   261,
-     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
-     270,     0,   776,   271,   272,   273,  1137,  1138,  1139,  1140,
-    1141,  1142,  1143,   274,   275,   276,   277,   278,   279,  1144,
-    1145,   282,     0,   283,     0,   284,   285,   286,   287,   288,
-       0,   289,   290,   291,     0,     0,   292,   293,   985,   295,
-     296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
-     303,   304,   305,   306,  1146,   308,   309,   310,  1147,  1148,
-     312,     0,   313,   314,  1149,   316,     0,   317,     0,   318,
-     778,     0,   779,   319,   320,   321,     0,   322,  1150,     0,
-    1151,   325,     0,   326,   327,   328,   329,   330,   780,   331,
-     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
-       0,   341,   781,   342,   343,   344,   345,   346,  1152,  1153,
-       0,  1154,     0,   350,   782,   783,   351,   784,   352,   353,
-     354,   355,   356,     0,     0,   357,  1155,   785,   359,   786,
-       0,   360,   361,   362,  1156,  1157,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,  1158,   787,  1159,   380,   381,   382,  1160,   383,   384,
-     788,   385,  1161,  1162,   387,  1163,   389,   390,   391,     0,
-     392,     0,     0,  1164,   394,   395,     0,     0,   396,   397,
-     789,   398,   790,  1165,   400,   401,   402,   403,   404,   405,
-     406,     0,   407,   408,  1166,   410,   411,   412,   413,   414,
-       0,   415,   416,   417,   418,   419,   420,   421,   422,  1167,
-     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
-     441,   442,   443,  1168,   445,   446,   447,   448,   449,   450,
-     451,   452,     0,   453,   454,   455,   456,   457,  1169,   458,
-     459,   460,   461,   462,   792,   463,   464,  1170,   466,     0,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,  1171,     0,   479,   480,     0,   481,   793,   482,   483,
-     484,   485,   486,     0,  1172,  1173,     0,     0,   489,   490,
-    1174,   492,  1175,  1176,   494,   495,   496,   497,   498,   499,
-     500,     0,  1177,   501,   502,   503,   504,   505,  1178,     0,
-     506,   507,   508,   509,   510,   511,  1179,  3815,   513,   794,
-     514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
-     520,   521,   522,   523,   524,   525,  1180,  1181,  1182,  1183,
-    1184,  1185,  1186,  1187,   534,   535,   536,  1188,     0,     0,
-       0,     0,     0,     0,  1189,  1190,     0,     0,     0,     0,
-       0,     0,     0,  1192,   771,  1122,   593,  1123,  1124,  1125,
-     646,  1126,     0,     0,     0,     0,     0,     0,     0,   220,
+       0,   439,   440,   791,   441,   442,   443,   444,  3271,   446,
+     447,   448,   449,   450,   451,   452,    39,   453,   454,   455,
+     456,   457,  1170,   458,   459,   460,   461,   462,   792,   463,
+     464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
+     473,   474,   475,   476,   477,  1172,     0,   479,   480,    43,
+     481,   793,   482,   483,   484,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,  1175,   492,  1176,     0,   494,   495,
+     496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
+     504,   505,  1179,     0,   506,   507,   508,   509,   510,  1059,
+     512,     0,   513,   794,   514,   515,   516,   517,     0,     0,
+     518,     0,    48,   519,   520,   521,   522,   523,   524,   525,
+    1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,   535,
+     536,     0,     0,    49,   771,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  3272,     0,   220,
      221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
-     231,     0,     0,     0,     0,  1127,     0,     0,   232,   233,
-       0,   234,   235,   772,   236,   237,   238,   239,  1128,   773,
-    1129,  1130,     0,   243,   244,   245,   246,   247,  1131,  1132,
-     248,   249,  1133,  1134,   252,     0,   253,   254,   255,   256,
-    1135,     0,  1136,     0,   258,   259,   260,   261,   775,   262,
+     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
+       0,   234,   235,   772,   236,   237,   238,   239,   240,   773,
+     241,   242,     0,   243,   244,   245,   246,   247,     0,  1133,
+     248,   249,   250,   251,   252,     0,   253,   254,   255,   256,
+    1136,     0,  1137,     0,   258,   259,   260,   261,   775,   262,
      263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
-     776,   271,   272,   273,  1137,  1138,  1139,  1140,  1141,  1142,
-    1143,   274,   275,   276,   277,   278,   279,  1144,  1145,   282,
+     776,   271,   272,   273,  1138,  1139,  1140,  1141,  1142,  1143,
+    1144,   274,   275,   276,   277,   278,   279,   280,   281,   282,
        0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
-     290,   291,     0,     0,   292,   293,   985,   295,   296,     0,
+     290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
      297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
-     305,   306,  1146,   308,   309,   310,  1147,  1148,   312,     0,
-     313,   314,  1149,   316,     0,   317,     0,   318,   778,     0,
-     779,   319,   320,   321,     0,   322,  1150,     0,  1151,   325,
+     305,   306,   307,   308,   309,   310,  1148,     0,   312,     0,
+     313,   314,   315,   316,     0,   317,     0,   318,   778,     0,
+     779,   319,   320,   321,     0,   322,  1151,     0,   324,   325,
        0,   326,   327,   328,   329,   330,   780,   331,   332,   333,
      334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
-     781,   342,   343,   344,   345,   346,  1152,  1153,     0,  1154,
+     781,   342,   343,   344,   345,   346,   347,   348,     0,   349,
        0,   350,   782,   783,   351,   784,   352,   353,   354,   355,
-     356,     0,     0,   357,  1155,   785,   359,   786,     0,   360,
-     361,   362,  1156,  1157,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,  1158,
-     787,  1159,   380,   381,   382,  1160,   383,   384,   788,   385,
-    1161,  1162,   387,  1163,   389,   390,   391,     0,   392,     0,
-       0,  1164,   394,   395,     0,     0,   396,   397,   789,   398,
-     790,  1165,   400,   401,   402,   403,   404,   405,   406,     0,
-     407,   408,  1166,   410,   411,   412,   413,   414,     0,   415,
-     416,   417,   418,   419,   420,   421,   422,  1167,   424,   425,
+     356,  3270,     0,   357,  1156,   785,   359,   786,     0,   360,
+     361,   362,  1157,  1158,   363,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
+     787,   379,   380,   381,   382,     0,   383,   384,   788,   385,
+       0,  1163,   387,   388,   389,   390,   391,     0,   392,     0,
+     735,   393,   394,   395,     0,     0,   396,   397,   789,   398,
+     790,  1166,   400,   401,   402,   403,   404,   405,   406,     0,
+     407,   408,  1167,   410,   411,   412,   413,   414,     0,   415,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
      426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
      435,   436,   437,   438,     0,   439,   440,   791,   441,   442,
-     443,  1168,   445,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,  1169,   458,   459,   460,
-     461,   462,   792,   463,   464,  1170,   466,     0,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,  1171,
+     443,   444,  3271,   446,   447,   448,   449,   450,   451,   452,
+       0,   453,   454,   455,   456,   457,  1170,   458,   459,   460,
+     461,   462,   792,   463,   464,   465,   466,     0,   467,   468,
+     469,   470,   471,   472,   473,   474,   475,   476,   477,  1172,
        0,   479,   480,     0,   481,   793,   482,   483,   484,   485,
-     486,     0,  1172,  1173,     0,     0,   489,   490,  1174,   492,
-    1175,  1176,   494,   495,   496,   497,   498,   499,   500,     0,
-    1177,   501,   502,   503,   504,   505,  1178,     0,   506,   507,
-     508,   509,   510,   511,  1179,     0,   513,   794,   514,   515,
+     486,     0,   487,   488,     0,     0,   489,   490,  1175,   492,
+    1176,     0,   494,   495,   496,   497,   498,   499,   500,     0,
+       0,   501,   502,   503,   504,   505,  1179,     0,   506,   507,
+     508,   509,   510,   511,   512,     0,   513,   794,   514,   515,
      516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
-     522,   523,   524,   525,  1180,  1181,  1182,  1183,  1184,  1185,
-    1186,  1187,   534,   535,   536,  1188,     0,     0,     0,     0,
-       0,     0,  1189,  1190,     0,     0,     0,     0,     0,     0,
-       0,  1192,   771,  1122,   593,  1123,  1124,  1125,   646,  1126,
-       0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
-     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
-       0,     0,     0,  1127,     0,     0,   232,   233,     0,   234,
-     235,   772,   236,   237,   238,   239,  1128,   773,  1129,  1130,
-       0,   243,   244,   245,   246,   247,  1131,  1132,   248,   249,
-    1133,  1134,   252,     0,   253,   254,   255,   256,  1135,     0,
-    1136,     0,   258,   259,   260,   261,   775,   262,   263,   264,
-       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
-     272,  3828,  1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,
-     275,   276,   277,   278,   279,  1144,  1145,   282,     0,   283,
-       0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
-       0,     0,   292,   293,   985,   295,   296,     0,   297,   298,
-     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
-    1146,   308,   309,   310,  1147,  1148,   312,     0,   313,   314,
-    1149,   316,     0,   317,     0,   318,   778,     0,   779,   319,
-     320,   321,     0,   322,  1150,     0,  1151,   325,     0,   326,
-     327,   328,   329,   330,   780,   331,   332,   333,   334,     0,
-     335,   336,   337,   338,   339,   340,     0,   341,   781,   342,
-     343,   344,   345,   346,  1152,  1153,     0,  1154,     0,   350,
-     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
-       0,   357,  1155,   785,   359,   786,     0,   360,   361,   362,
-    1156,  1157,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,  1158,   787,  1159,
-     380,   381,   382,  1160,   383,   384,   788,   385,  1161,  1162,
-     387,  1163,   389,   390,   391,     0,   392,     0,     0,  1164,
-     394,   395,     0,     0,   396,   397,   789,   398,   790,  1165,
-     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
-    1166,   410,   411,   412,   413,   414,     0,   415,   416,   417,
-     418,   419,   420,   421,   422,  1167,   424,   425,   426,   427,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,     0,   439,   440,   791,   441,   442,   443,  1168,
-     445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
-     454,   455,   456,   457,  1169,   458,   459,   460,   461,   462,
-     792,   463,   464,  1170,   466,     0,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,  1171,     0,   479,
-     480,     0,   481,   793,   482,   483,   484,   485,   486,     0,
-    1172,  1173,     0,     0,   489,   490,  1174,   492,  1175,  1176,
-     494,   495,   496,   497,   498,   499,   500,     0,  1177,   501,
-     502,   503,   504,   505,  1178,     0,   506,   507,   508,   509,
-     510,   511,  1179,     0,   513,   794,   514,   515,   516,   517,
-       0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
-     524,   525,  1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,
-     534,   535,   536,  1188,     0,     0,     0,     0,     0,     0,
-    1189,  1190,     0,     0,     0,     0,     0,     0,     0,  1192,
-     771,  1122,   593,  1123,  1124,  1125,   646,  1126,     0,     0,
-       0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
-       0,  1127,     0,     0,   232,   233,     0,   234,   235,   772,
-     236,   237,   238,   239,  1128,   773,  1129,  1130,     0,   243,
-     244,   245,   246,   247,  1131,  1132,   248,   249,  1133,  1134,
-     252,     0,   253,   254,   255,   256,  1135,     0,  1136,     0,
-     258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
-     266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
-    1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,   275,   276,
-     277,   278,   279,  1144,  1145,   282,     0,   283,     0,   284,
-     285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
-     292,   293,   985,   295,   296,     0,   297,   298,   299,     0,
-     300,   301,   302,     0,   303,   304,   305,   306,  1146,   308,
-     309,   310,  1147,  1148,   312,     0,   313,   314,  1149,   316,
-       0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
-       0,   322,  1150,     0,  1151,   325,     0,   326,   327,   328,
-     329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
-     337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
-     345,   346,  1152,  1153,     0,  1154,     0,   350,   782,   783,
-     351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
-    1155,   785,   359,   786,     0,   360,   361,   362,  1156,  1157,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,  1158,   787,  1159,   380,   381,
-     382,  1160,   383,   384,   788,   385,  1161,  1162,   387,  1163,
-     389,   390,   391,     0,   392,     0,     0,  1164,   394,   395,
-       0,     0,   396,   397,   789,   398,   790,  1165,   400,   401,
-     402,   403,   404,   405,   406,     0,   407,   408,  1166,   410,
-     411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
-     420,   421,   422,  1167,   424,   425,   426,   427,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,   791,   441,   442,   443,  1168,   445,   446,
-     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,  1169,   458,   459,   460,   461,   462,   792,   463,
-     464,  1170,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,  1171,     0,   479,   480,     0,
-     481,   793,   482,   483,   484,   485,   486,     0,  1172,  1173,
-       0,     0,   489,   490,  1174,   492,  1175,  1176,   494,   495,
-     496,   497,   498,   499,   500,     0,  1177,   501,   502,   503,
-     504,   505,  1178,     0,   506,   507,   508,   509,   510,   511,
-    1179,     0,   513,   794,   514,   515,   516,   517,     0,     0,
-     518,     0,     0,   519,   520,   521,   522,   523,   524,  4125,
-    1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,   534,   535,
-     536,  1188,     0,     0,     0,     0,     0,     0,  1189,  1190,
-       0,     0,     0,     0,     0,     0,     0,  1192,   771,  1122,
-     593,  1123,  1124,  1125,   646,  1126,     0,     0,     0,     0,
-       0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,     0,   229,   230,   231,     0,     0,     0,     0,  1127,
-       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
-     238,   239,  1128,   773,  1129,  1130,     0,   243,   244,   245,
-     246,   247,  1131,  1132,   248,   249,  1133,  1134,   252,     0,
-     253,   254,   255,   256,  1135,     0,  1136,     0,   258,   259,
-     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
-     268,   269,   270,     0,   776,   271,   272,   273,  1137,  1138,
-    1139,  1140,  1141,  1142,  1143,   274,   275,   276,   277,   278,
-     279,  1144,  1145,   282,     0,   283,     0,   284,   285,   286,
-     287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
-     985,   295,   296,     0,   297,   298,   299,     0,   300,   301,
-     302,     0,   303,   304,   305,   306,  1146,   308,   309,   310,
-    1147,  1148,   312,     0,   313,   314,  1149,   316,     0,   317,
-       0,   318,   778,     0,   779,   319,   320,   321,     0,   322,
-    1150,     0,  1151,   325,     0,   326,   327,   328,   329,   330,
-     780,   331,   332,   333,   334,     0,   335,   336,   337,   338,
-     339,   340,     0,   341,   781,   342,   343,   344,   345,   346,
-    1152,  1153,     0,  1154,     0,   350,   782,   783,   351,   784,
-     352,   353,   354,   355,   356,     0,     0,   357,  1155,   785,
-     359,   786,     0,   360,   361,   362,  1156,  1157,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,  1158,   787,  1159,   380,  4134,   382,  1160,
-     383,   384,   788,   385,  1161,  1162,   387,  1163,   389,   390,
-     391,     0,   392,     0,     0,  1164,   394,   395,     0,     0,
-     396,   397,   789,   398,   790,  1165,   400,   401,   402,   403,
-     404,   405,   406,     0,   407,   408,  1166,   410,   411,   412,
-     413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
-     422,  1167,   424,   425,   426,   427,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,   791,   441,   442,   443,  1168,   445,   446,   447,   448,
-     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
-    1169,   458,   459,   460,   461,   462,   792,   463,   464,  1170,
-     466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,  1171,     0,   479,   480,     0,   481,   793,
-     482,   483,   484,   485,   486,     0,  1172,  1173,     0,     0,
-     489,   490,  1174,   492,  1175,  1176,   494,   495,   496,   497,
-     498,   499,   500,     0,  1177,   501,   502,   503,   504,   505,
-    1178,     0,   506,   507,   508,   509,   510,   511,  1179,     0,
-     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
-       0,   519,   520,   521,   522,   523,   524,   525,  1180,  1181,
-    1182,  1183,  1184,  1185,  1186,  1187,   534,   535,   536,  1188,
-       0,     0,     0,     0,     0,     0,  1189,  1190,     0,     0,
-       0,     0,     0,     0,     0,  1192,   771,  1122,   593,  1123,
-    1124,  1125,   646,  1126,     0,     0,     0,     0,     0,     0,
-       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
-     229,   230,   231,     0,     0,     0,     0,  1127,     0,     0,
-     232,   233,     0,   234,   235,   772,   236,   237,   238,   239,
-    1128,   773,  1129,  1130,     0,   243,   244,   245,   246,   247,
-    1131,  1132,   248,   249,  1133,  1134,   252,     0,   253,   254,
-     255,   256,  1135,     0,  1136,     0,   258,   259,   260,   261,
-     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
-     270,     0,   776,   271,  4430,   273,  1137,  1138,  1139,  1140,
-    1141,  1142,  1143,   274,   275,   276,   277,   278,   279,  1144,
-    1145,   282,     0,   283,     0,   284,   285,   286,   287,   288,
-       0,   289,   290,   291,     0,     0,   292,   293,   985,   295,
-     296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
-     303,   304,   305,   306,  1146,   308,   309,   310,  1147,  1148,
-     312,     0,   313,   314,  1149,   316,     0,   317,     0,   318,
-     778,     0,   779,   319,   320,   321,     0,   322,  1150,     0,
-    4431,   325,     0,   326,   327,   328,   329,   330,   780,   331,
-     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
-       0,   341,   781,   342,   343,   344,   345,   346,  1152,  1153,
-       0,  1154,     0,   350,   782,   783,   351,   784,   352,   353,
-     354,   355,   356,     0,     0,   357,  1155,   785,   359,   786,
-       0,   360,   361,   362,  1156,  1157,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,  1158,   787,  1159,   380,   381,   382,  1160,   383,   384,
-     788,   385,  1161,  1162,   387,  1163,   389,   390,   391,     0,
-     392,     0,     0,  1164,   394,   395,     0,     0,   396,   397,
-     789,   398,   790,  1165,   400,   401,   402,   403,   404,   405,
-     406,     0,   407,   408,  1166,   410,   411,   412,   413,   414,
-       0,   415,   416,   417,   418,   419,   420,   421,   422,  1167,
-     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
-     441,   442,  4432,  1168,   445,   446,   447,   448,   449,   450,
-     451,   452,     0,   453,   454,   455,   456,   457,  1169,   458,
-     459,   460,   461,   462,   792,   463,   464,  1170,   466,     0,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,  1171,     0,   479,   480,     0,   481,   793,   482,   483,
-     484,   485,   486,     0,  1172,  1173,     0,     0,   489,   490,
-    1174,   492,  1175,  1176,   494,   495,   496,   497,   498,   499,
-     500,     0,  1177,   501,   502,   503,   504,   505,  1178,     0,
-     506,   507,   508,   509,   510,   511,  1179,     0,   513,   794,
-     514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
-     520,   521,   522,   523,   524,   525,  1180,  1181,  1182,  1183,
-    1184,  1185,  1186,  1187,   534,   535,   536,  1188,     0,     0,
-       0,     0,     0,     0,  1189,  1190,     0,     0,     0,     0,
-       0,     0,     0,  4433,   771,  1122,   593,  1123,  1124,  1125,
-     646,  1126,     0,     0,     0,     0,     0,     0,     0,   220,
-     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
-     231,     0,     0,     0,     0,  1127,     0,     0,   232,   233,
-       0,   234,   235,   772,   236,   237,   238,  4795,  1128,   773,
-    1129,  1130,     0,   243,   244,   245,   246,   247,  1131,  1132,
-     248,   249,  1133,  1134,   252,     0,   253,   254,   255,   256,
-    1135,     0,  1136,     0,   258,   259,   260,   261,   775,   262,
-     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
-     776,   271,   272,  4796,  1137,  1138,  1139,  1140,  1141,  1142,
-    1143,   274,   275,   276,   277,   278,   279,  1144,  1145,   282,
-       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
-     290,   291,     0,     0,   292,   293,   985,   295,   296,     0,
-     297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
-     305,   306,  1146,   308,   309,   310,  1147,  1148,   312,     0,
-     313,   314,  1149,   316,     0,   317,     0,   318,   778,     0,
-     779,   319,   320,   321,     0,   322,  1150,     0,  1151,   325,
-       0,   326,   327,   328,   329,   330,   780,   331,   332,   333,
-     334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
-     781,   342,   343,   344,   345,   346,  1152,  1153,     0,  1154,
-       0,   350,   782,   783,   351,   784,   352,   353,   354,   355,
-     356,     0,     0,   357,  1155,   785,   359,   786,     0,   360,
-     361,   362,  1156,  1157,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,  1158,
-     787,  1159,   380,   381,   382,  1160,   383,   384,   788,   385,
-    1161,  1162,   387,  1163,   389,   390,   391,     0,   392,     0,
-       0,  1164,   394,   395,     0,     0,   396,   397,   789,   398,
-     790,  1165,   400,   401,   402,   403,   404,   405,   406,     0,
-     407,   408,  1166,   410,   411,   412,   413,   414,     0,   415,
-     416,   417,   418,   419,   420,   421,   422,  1167,   424,   425,
-     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,     0,   439,   440,   791,   441,   442,
-     443,  1168,   445,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,  1169,   458,   459,   460,
-     461,   462,   792,   463,   464,  1170,   466,     0,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,  1171,
-       0,   479,   480,     0,   481,   793,   482,   483,   484,   485,
-     486,     0,  1172,  1173,     0,     0,   489,   490,  1174,   492,
-    1175,  1176,   494,   495,   496,   497,  4797,   499,   500,     0,
-    1177,   501,   502,   503,   504,   505,  1178,     0,   506,   507,
-     508,   509,   510,   511,  1179,     0,   513,   794,   514,   515,
-     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
-     522,   523,   524,   525,  1180,  1181,  1182,  1183,  1184,  1185,
-    1186,  1187,   534,   535,   536,  1188,     0,     0,     0,     0,
-       0,     0,  1189,  1190,     0,     0,     0,     0,     0,     0,
-       0,  1192,   771,  1122,   593,  1123,  1124,  1125,   646,  1126,
-       0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
-     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
-       0,     0,     0,  1127,     0,     0,   232,   233,     0,   234,
-     235,   772,   236,   237,   238,   239,  1128,   773,  1129,  1130,
-       0,   243,   244,   245,   246,   247,  1131,  1132,   248,   249,
-    1133,  1134,   252,     0,   253,   254,   255,   256,  1135,     0,
-    1136,     0,   258,   259,   260,   261,   775,   262,   263,   264,
-       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
-     272,  4796,  1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,
-     275,   276,   277,   278,   279,  1144,  1145,   282,     0,   283,
-       0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
-       0,     0,   292,   293,   985,   295,   296,     0,   297,   298,
-     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
-    1146,   308,   309,   310,  1147,  1148,   312,     0,   313,   314,
-    1149,   316,     0,   317,     0,   318,   778,     0,   779,   319,
-     320,   321,     0,   322,  1150,     0,  1151,   325,     0,   326,
-     327,   328,   329,   330,   780,   331,   332,   333,   334,     0,
-     335,   336,   337,   338,   339,   340,     0,   341,   781,   342,
-     343,   344,   345,   346,  1152,  1153,     0,  1154,     0,   350,
-     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
-       0,   357,  1155,   785,   359,   786,     0,   360,   361,   362,
-    1156,  1157,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,  1158,   787,  1159,
-     380,   381,   382,  1160,   383,   384,   788,   385,  1161,  1162,
-     387,  1163,   389,   390,   391,     0,   392,     0,     0,  1164,
-     394,   395,     0,     0,   396,   397,   789,   398,   790,  1165,
-     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
-    1166,   410,   411,   412,   413,   414,     0,   415,   416,   417,
-     418,   419,   420,   421,   422,  1167,   424,   425,   426,   427,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,     0,   439,   440,   791,   441,   442,   443,  1168,
-     445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
-     454,   455,   456,   457,  1169,   458,   459,   460,   461,   462,
-     792,   463,   464,  1170,   466,     0,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,  1171,     0,   479,
-     480,     0,   481,   793,   482,   483,   484,   485,   486,     0,
-    1172,  1173,     0,     0,   489,   490,  1174,   492,  1175,  1176,
-     494,   495,   496,   497,  4797,   499,   500,     0,  1177,   501,
-     502,   503,   504,   505,  1178,     0,   506,   507,   508,   509,
-     510,   511,  1179,     0,   513,   794,   514,   515,   516,   517,
-       0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
-     524,   525,  1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,
-     534,   535,   536,  1188,     0,     0,     0,     0,     0,     0,
-    1189,  1190,     0,     0,     0,     0,     0,     0,     0,  1192,
-     771,  1122,   593,  1123,  1124,  1125,   646,  1126,     0,     0,
-       0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
-       0,  1127,     0,     0,   232,   233,     0,   234,   235,   772,
-     236,   237,   238,   239,  1128,   773,  1129,  1130,     0,   243,
-     244,   245,   246,   247,  1131,  1132,   248,   249,  1133,  1134,
-     252,     0,   253,   254,   255,   256,  1135,     0,  1136,     0,
-     258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
-     266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
-    1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,   275,   276,
-     277,   278,   279,  1144,  1145,   282,     0,   283,     0,   284,
-     285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
-     292,   293,   985,   295,   296,     0,   297,   298,   299,     0,
-     300,   301,   302,     0,   303,   304,   305,   306,  1146,   308,
-     309,   310,  1147,  1148,   312,     0,   313,   314,  1149,   316,
-       0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
-       0,   322,  1150,     0,  1151,   325,     0,   326,   327,   328,
-     329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
-     337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
-     345,   346,  1152,  1153,     0,  1154,     0,   350,   782,   783,
-     351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
-    1155,   785,   359,   786,     0,   360,   361,   362,  1156,  1157,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,  1158,   787,  1159,   380,   381,
-     382,     0,   383,   384,   788,   385,  1161,  1162,   387,  1163,
-     389,   390,   391,     0,   392,     0,     0,  1164,   394,   395,
-       0,     0,   396,   397,   789,   398,   790,  1165,   400,   401,
-     402,   403,   404,   405,   406,     0,   407,   408,  1166,   410,
-     411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
-     420,   421,   422,  1167,   424,   425,   426,   427,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,   791,   441,   442,   443,  2517,   445,   446,
-     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,  1169,   458,   459,   460,   461,   462,   792,   463,
-     464,  1170,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,  1171,     0,   479,   480,     0,
-     481,   793,   482,   483,   484,   485,   486,     0,  1172,  1173,
-       0,     0,   489,   490,  1174,   492,  1175,  1176,   494,   495,
-     496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
-     504,   505,  1178,     0,   506,   507,   508,   509,   510,   511,
-    1179,     0,   513,   794,   514,   515,   516,   517,     0,     0,
-     518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
-    1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,   534,   535,
-     536,     0,     0,     0,     0,     0,     0,     0,  2518,  2519,
-       0,     0,     0,     0,     0,     0,     0,  2520,   771,  1122,
-     593,  1123,  1124,  1125,   646,  1126,     0,     0,     0,     0,
-       0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,     0,   229,   230,   231,     0,     0,     0,     0,  1127,
-       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
-     238, -2392,  1128,   773,  1129,  1130,     0,   243,   244,   245,
-     246,   247,  1131,  1132,   248,   249,  1133,  1134,   252,     0,
-     253,   254,   255,   256,  1135,     0,  1136,     0,   258,   259,
-     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
-     268,   269,   270,     0,   776,   271,   272,  4796,  1137,  1138,
-    1139,  1140,  1141,  1142,  1143,   274,   275,   276,   277,   278,
-     279,  1144,  1145,   282,     0,   283,     0,   284,   285,   286,
-     287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
-     985,   295,   296,     0,   297,   298,   299,     0,   300,   301,
-     302,     0,   303,   304,   305,   306,  1146,   308,   309,   310,
-    1147,  1148,   312,     0,   313,   314,  1149,   316,     0,   317,
-       0,   318,   778,     0,   779,   319,   320,   321,     0,   322,
-    1150,     0,  1151,   325,     0,   326,   327,   328,   329,   330,
-   -2392,   331,   332,   333,   334,     0,   335,   336,   337,   338,
-     339,   340,     0,   341,   781,   342,   343,   344,   345,   346,
-    1152,  1153,     0,  1154,     0,   350,     0,     0,   351,   784,
-     352,   353,   354,   355,   356,     0,     0,   357,  1155,   785,
-     359, -2392,     0,   360,   361,   362,  1156,  1157,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,  1158,   787,  1159,   380,   381,   382,  1160,
-     383,   384,     0,   385,  1161,  1162,   387,  1163,   389,   390,
-     391,     0,   392,     0,     0,  1164,   394,   395,     0,     0,
-     396,   397,   789,   398,   790,  1165,   400,   401,   402,   403,
-     404,   405,   406,     0,   407,   408,  1166,   410,   411,   412,
-     413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
-     422,  1167,   424,   425,   426,   427,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,   791,   441,   442,   443,  1168,   445,   446,   447,   448,
-     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
-    1169,   458,   459,   460,   461,   462, -2392,   463,   464,  1170,
-     466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,  1171,     0,   479,   480,     0,   481,   793,
-     482,   483,   484,   485,   486,     0,  1172,  1173,     0,     0,
-     489,   490,  1174,   492,  1175,  1176,   494,   495,   496,   497,
-    4797,   499,   500,     0,  1177,   501,   502,   503,   504,   505,
-    1178,     0,   506,   507,   508,   509,   510,   511,  1179,     0,
-     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
-       0,   519,   520,   521,   522,   523,   524,   525,  1180,  1181,
-    1182,  1183,  1184,  1185,  1186,  1187,   534,   535,   536, -2392,
-       0,     0,     0,     0,     0,     0,  1189,  1190,     0,     0,
-       0,     0,     0,     0,     0,  1192,   771,  1122,   593,  1123,
-    1124,  1125,   646,  1126,     0,     0,     0,     0,     0,     0,
-       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
-     229,   230,   231,     0,     0,     0,     0,  1127,     0,     0,
-     232,   233,     0,   234,   235,   772,   236,   237,   238,   239,
-    1128,   773,  1129,  1130,     0,   243,   244,   245,   246,   247,
-    1131,  1132,   248,   249,  1133,  1134,   252,     0,   253,   254,
-     255,   256,  1135,     0,  1136,     0,   258,   259,   260,   261,
-     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
-     270,     0,   776,   271,   272,   273,  1137,  1138,  1139,  1140,
-    1141,  1142,  1143,   274,   275,   276,   277,   278,   279,  1144,
-    1145,   282,     0,   283,     0,   284,   285,   286,   287,   288,
-       0,   289,   290,   291,     0,     0,   292,   293,   985,   295,
-     296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
-     303,   304,   305,   306,  1146,   308,   309,   310,  1147,  1148,
-     312,     0,   313,   314,  1149,   316,     0,   317,     0,   318,
-     778,     0,   779,   319,   320,   321,     0,   322,  1150,     0,
-    1151,   325,     0,   326,   327,   328,   329,   330,   780,   331,
-     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
-       0,   341,   781,   342,   343,   344,   345,   346,  1152,  1153,
-       0,  1154,     0,   350,     0,   783,   351,   784,   352,   353,
-     354,   355,   356,     0,     0,   357,  1155,   785,   359,   786,
-       0,   360,   361,   362,  1156,  1157,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,  1158,   787,  1159,   380,   381,   382,     0,   383,   384,
-     788,   385,  1161,  1162,   387,  1163,   389,   390,   391,     0,
-     392,     0,     0,  1164,   394,   395,     0,     0,   396,   397,
-     789,   398,   790,  1165,   400,   401,   402,   403,   404,   405,
-     406,     0,   407,   408,  1166,   410,   411,   412,   413,   414,
-       0,   415,   416,   417,   418,   419,   420,   421,   422,  1167,
-     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
-     441,   442,   443,  2517,   445,   446,   447,   448,   449,   450,
-     451,   452,     0,   453,   454,   455,   456,   457,  1169,   458,
-     459,   460,   461,   462,   792,   463,   464,  1170,   466,     0,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,  1171,     0,   479,   480,     0,   481,   793,   482,   483,
-     484,   485,   486,     0,  1172,  1173,     0,     0,   489,   490,
-    1174,   492,  1175,  1176,   494,   495,   496,   497,   498,   499,
-     500,     0,     0,   501,   502,   503,   504,   505,  1178,     0,
-     506,   507,   508,   509,   510,   511,  1179,     0,   513,   794,
-     514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
-     520,   521,   522,   523,   524,   525,  1180,  1181,  1182,  1183,
-    1184,  1185,  1186,  1187,   534,   535,   536,     0,     0,     0,
-       0,     0,     0,     0,  2518,  2519,     0,     0,   771,  1122,
-     593,  1123,  1124,  2520,   646,  1126,     0,     0,     0,     0,
-       0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,     0,   229,   230,   231,     0,     0,     0,     0,  1127,
-       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
-     238,   239,  1128,   773,  1129,  1130,     0,   243,   244,   245,
-     246,   247,  1131,  1132,   248,   249,  1133,  1134,   252,     0,
-     253,   254,   255,   256,  1135,     0,  1136,     0,   258,   259,
-     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
-     268,   269,   270,     0,   776,   271,   272,   273,  1137,  1138,
-    1139,  1140,  1141,  1142,  1143,   274,   275,   276,   277,   278,
-     279,  1144,  1145,   282,     0,   283,     0,   284,   285,   286,
-     287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
-     985,   295,   296,     0,   297,   298,   299,     0,   300,   301,
-     302,     0,   303,   304,   305,   306,  1146,   308,   309,   310,
-    1147,  1148,   312,     0,   313,   314,  1149,   316,     0,   317,
-       0,   318,   778,     0,   779,   319,   320,   321,     0,   322,
-    1150,     0,  1151,   325,     0,   326,   327,   328,   329,   330,
-     780,   331,   332,   333,   334,     0,   335,   336,   337,   338,
-     339,   340,     0,   341,   781,   342,   343,   344,   345,   346,
-    1152,  1153,     0,  1154,     0,   350,   782,   783,   351,   784,
-     352,   353,   354,   355,   356,     0,     0,   357,  1155,   785,
-     359,   786,     0,   360,   361,   362,  1156,  1157,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,  1158,   787,  1159,   380,   381,   382,     0,
-     383,   384,   788,   385,  1161,  1162,   387,  1163,   389,   390,
-     391,     0,   392,     0,     0,   393,   394,   395,     0,     0,
-     396,   397,   789,   398,   790,  1165,   400,   401,   402,   403,
-     404,   405,   406,     0,   407,   408,  1166,   410,   411,   412,
-     413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
-     422,  1167,   424,   425,   426,   427,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,   791,   441,   442,   443,  2517,   445,   446,   447,   448,
-     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
-    1169,   458,   459,   460,   461,   462,   792,   463,   464,  1170,
-     466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,  1171,     0,   479,   480,     0,   481,   793,
-     482,   483,   484,   485,   486,     0,  1172,  1173,     0,     0,
-     489,   490,  1174,   492,  1175,  1176,   494,   495,   496,   497,
-     498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
-    1178,     0,   506,   507,   508,   509,   510,   511,  1179,     0,
-     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
-       0,   519,   520,   521,   522,   523,   524,   525,  1180,  1181,
-    1182,  1183,  1184,  1185,  1186,  1187,   534,   535,   536,     0,
-       0,   771,  1122,   593,  1123,  1124,     0,   646,  1126,     0,
-       0,     0,     0,     0,     0,  2520,   220,   221,   222,   223,
-     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
-       0,     0,  1127,     0,     0,   232,   233,     0,   234,   235,
-     772,   236,   237,   238,   239,  1128,   773,  1129,  1130,     0,
-    3730,   244,   245,   246,   247,  1131,  1132,   248,   249,  1133,
-    1134,   252,     0,   253,   254,   255,   256,  1135,     0,  1136,
-       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
-     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
-     273,  1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,   275,
-     276,   277,   278,   279,  1144,  1145,   282,     0,   283,     0,
-     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
-       0,   292,   293,   985,   295,   296,     0,   297,   298,   299,
-       0,   300,   301,   302,     0,   303,   304,   305,   306,  1146,
-     308,   309,   310,  1147,  1148,   312,     0,   313,   314,  1149,
-     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
-     321,     0,   322,  1150,     0,  1151,   325,     0,   326,   327,
-     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
-     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
-     344,   345,   346,  1152,  1153,     0,  1154,     0,   350,   782,
-     783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
-     357,  1155,   785,   359,   786,     0,   360,   361,   362,  1156,
-    1157,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,  1158,   787,  1159,   380,
-     381,   382,     0,   383,   384,   788,   385,  1161,  1162,   387,
-    1163,   389,   390,   391,     0,   392,     0,     0,   393,   394,
-     395,     0,     0,   396,   397,   789,   398,   790,  1165,   400,
-     401,   402,   403,   404,   405,   406,     0,   407,   408,  1166,
-     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
-     419,   420,   421,   422,  1167,   424,   425,   426,   427,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,   791,   441,   442,   443,  2517,   445,
-     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
-     455,   456,   457,  1169,   458,   459,   460,   461,   462,   792,
-     463,   464,  1170,   466,     0,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,   477,  1171,     0,   479,   480,
-       0,   481,   793,   482,   483,   484,   485,   486,     0,  1172,
-    1173,     0,     0,   489,   490,  1174,   492,  1175,  1176,   494,
-     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
-     503,   504,   505,  1178,     0,   506,   507,   508,   509,   510,
-     511,  1179,     0,   513,   794,   514,   515,   516,   517,     0,
-       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
-     525,  1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,   534,
-     535,   536,     0,     0,   771,  1122,   593,  1123,  1124,  1125,
-     646,  1126,     0,     0,     0,     0,     0,     0,  2520,   220,
-     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
-     231,     0,     0,     0,     0,  1127,     0,     0,   232,   233,
-       0,   234,   235,   772,   236,   237,   238,     0,  1128,   773,
-    1129,  1130,     0,   243,   244,   245,   246,   247,  1131,  1132,
-     248,   249,  1133,  1134,   252,     0,   253,   254,   255,   256,
-    1135,     0,  1136,     0,   258,   259,   260,   261,   775,   262,
-     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
-     776,   271,   272,   273,  1137,  1138,  1139,  1140,  1141,  1142,
-    1143,   274,   275,   276,   277,   278,   279,  1144,  1145,   282,
-       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
-     290,   291,     0,     0,   292,   293,   985,   295,   296,     0,
-     297,   298,   299,     0,   300,     0,   302,     0,   303,   304,
-     305,   306,  1146,   308,   309,   310,  1147,  1148,   312,     0,
-     313,   314,  1149,   316,     0,   317,     0,   318,   778,     0,
-     779,   319,   320,   321,     0,   322,  1150,     0,  1151,   325,
-       0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
-     334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
-     781,   342,   343,   344,   345,   346,  1152,  1153,     0,  1154,
-       0,   350,     0,     0,   351,   784,   352,   353,   354,   355,
-     356,     0,     0,   357,  1155,   785,   359,     0,     0,   360,
-     361,   362,  1156,  1157,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,  1158,
-     787,  1159,   380,   381,   382,  1160,   383,   384,     0,   385,
-    1161,  1162,   387,  1163,   389,   390,   391,     0,   392,     0,
-       0,  1164,   394,   395,     0,     0,   396,   397,   789,   398,
-     790,  1165,   400,   401,   402,   403,   404,   405,   406,     0,
-     407,   408,  1166,   410,   411,   412,   413,   414,     0,   415,
-     416,   417,   418,   419,   420,   421,   422,  1167,   424,   425,
-     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,     0,   439,   440,   791,   441,   442,
-     443,  1168,   445,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,  1169,   458,   459,   460,
-     461,   462,     0,   463,   464,  1170,   466,     0,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,  1171,
-       0,   479,   480,     0,   481,   793,   482,   483,   484,   485,
-     486,     0,  1172,  1173,     0,     0,   489,   490,  1174,   492,
-    1175,  1176,   494,   495,   496,   497,   498,   499,   500,     0,
-    1177,   501,   502,   503,   504,   505,  1178,     0,   506,   507,
-     508,   509,   510,   511,  1179,     0,   513,   794,   514,   515,
-     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
-     522,   523,   524,   525,  1180,  1181,  1182,  1183,  1184,  1185,
-    1186,  1187,   534,   535,   536,     0,     0,   771,     0,     0,
-       0,     0,  1189,  1190,     0,     0,     0,     0,     0,     0,
-       0,  1192,   220,   221,   222,   223,   224,   225,   226,   227,
-       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
-       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
-     239,   240,   773,   241,   242,     0,   243,   244,   245,   246,
-     247,     0,  1132,   248,   249,   250,   251,   252,     0,   253,
-     254,   255,   256,  1135,     0,  1136,     0,   258,   259,   260,
-     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
-     269,   270,     0,   776,   271,   272,   273,  1137,  1138,  1139,
-    1140,  1141,  1142,  1143,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,     0,   283,     0,   284,   285,   286,   287,
-     288,     0,   289,   290,   291,     0,     0,   292,   293,   294,
-     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
-       0,   303,   304,   305,   306,   307,   308,   309,   310,  1147,
-       0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
-     318,   778,     0,   779,   319,   320,   321,     0,   322,  1150,
-       0,   324,   325,     0,   326,   327,   328,   329,   330,   780,
-     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
-     340,     0,   341,   781,   342,   343,   344,   345,   346,   347,
-     348,     0,   349,     0,   350,   782,   783,   351,   784,   352,
-     353,   354,   355,   356,  3264,     0,   357,  1155,   785,   359,
-     786,     0,   360,   361,   362,  1156,  1157,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   787,   379,   380,   381,   382,     0,   383,
-     384,   788,   385,     0,  1162,   387,   388,   389,   390,   391,
-       0,   392,     0,   735,   393,   394,   395,     0,     0,   396,
-     397,   789,   398,   790,  1165,   400,   401,   402,   403,   404,
-     405,   406,     0,   407,   408,  1166,   410,   411,   412,   413,
-     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
-     791,   441,   442,   443,   444,  3265,   446,   447,   448,   449,
-     450,   451,   452,    39,   453,   454,   455,   456,   457,  1169,
-     458,   459,   460,   461,   462,   792,   463,   464,   465,   466,
-       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,  1171,     0,   479,   480,    43,   481,   793,   482,
-     483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
-     490,  1174,   492,  1175,     0,   494,   495,   496,   497,   498,
-     499,   500,     0,     0,   501,   502,   503,   504,   505,  1178,
-       0,   506,   507,   508,   509,   510,  1058,   512,     0,   513,
-     794,   514,   515,   516,   517,     0,     0,   518,     0,    48,
-     519,   520,   521,   522,   523,   524,   525,  1180,  1181,  1182,
-    1183,  1184,  1185,  1186,  1187,   534,   535,   536,     0,     0,
-      49,   771,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3266,     0,   220,   221,   222,   223,
-     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
-       0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
-     772,   236,   237,   238,   239,   240,   773,   241,   242,     0,
-     243,   244,   245,   246,   247,     0,  1132,   248,   249,   250,
-     251,   252,     0,   253,   254,   255,   256,  1135,     0,  1136,
-       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
-     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
-     273,  1137,  1138,  1139,  1140,  1141,  1142,  1143,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,     0,   283,     0,
-     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
-       0,   292,   293,   294,   295,   296,     0,   297,   298,   299,
-       0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
-     308,   309,   310,  1147,     0,   312,     0,   313,   314,   315,
-     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
-     321,     0,   322,  1150,     0,   324,   325,     0,   326,   327,
-     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
-     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
-     344,   345,   346,   347,   348,     0,   349,     0,   350,   782,
-     783,   351,   784,   352,   353,   354,   355,   356,  3264,     0,
-     357,  1155,   785,   359,   786,     0,   360,   361,   362,  1156,
-    1157,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,   787,   379,   380,
-     381,   382,     0,   383,   384,   788,   385,     0,  1162,   387,
-     388,   389,   390,   391,     0,   392,     0,   735,   393,   394,
-     395,     0,     0,   396,   397,   789,   398,   790,  1165,   400,
-     401,   402,   403,   404,   405,   406,     0,   407,   408,  1166,
-     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,   791,   441,   442,   443,   444,  3265,
-     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
-     455,   456,   457,  1169,   458,   459,   460,   461,   462,   792,
-     463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,   477,  1171,     0,   479,   480,
-       0,   481,   793,   482,   483,   484,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,  1174,   492,  1175,     0,   494,
-     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
-     503,   504,   505,  1178,     0,   506,   507,   508,   509,   510,
-     511,   512,     0,   513,   794,   514,   515,   516,   517,     0,
-       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
-     525,  1180,  1181,  1182,  1183,  1184,  1185,  1186,  1187,   534,
-     535,   536,     0,     0,   771,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3266,   220,
-     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
-     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
-       0,   234,   235,   772,   236,   237,   238,   239,   240,   773,
-     241,   242,     0,   243,   244,   245,   246,   247,     0,  1132,
-     248,   249,   250,   251,   252,     0,   253,   254,   255,   256,
-    1135,     0,  1136,     0,   258,   259,   260,   261,   775,   262,
-     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
-     776,   271,   272,   273,  1137,  1138,  1139,  1140,  1141,  1142,
-    1143,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
-     290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
-     297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
-     305,   306,   307,   308,   309,   310,  1147,     0,   312,     0,
-     313,   314,   315,   316,     0,   317,     0,   318,   778,     0,
-     779,   319,   320,   321,     0,   322,  1150,     0,   324,   325,
-       0,   326,   327,   328,   329,   330,   780,   331,   332,   333,
-     334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
-     781,   342,   343,   344,   345,   346,   347,   348,     0,   349,
-       0,   350,   782,   783,   351,   784,   352,   353,   354,   355,
-     356,     0,     0,   357,  1155,   785,   359,   786,     0,   360,
-     361,   362,  1156,  1157,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     787,   379,   380,   381,   382,     0,   383,   384,   788,   385,
-       0,  1162,   387,   388,   389,   390,   391,     0,   392,     0,
-       0,   393,   394,   395,     0,     0,   396,   397,   789,   398,
-     790,  1165,   400,   401,   402,   403,   404,   405,   406,     0,
-     407,   408,  1166,   410,   411,   412,   413,   414,     0,   415,
-     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,     0,   439,   440,   791,   441,   442,
-     443,   444,  3265,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,  1169,   458,   459,   460,
-     461,   462,   792,   463,   464,   465,   466,     0,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,  1171,
-       0,   479,   480,     0,   481,   793,   482,   483,   484,   485,
-     486,     0,   487,   488,     0,     0,   489,   490,  1174,   492,
-    1175,     0,   494,   495,   496,   497,   498,   499,   500,     0,
-       0,   501,   502,   503,   504,   505,  1178,     0,   506,   507,
-     508,   509,   510,   511,   512,     0,   513,   794,   514,   515,
-     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
-     522,   523,   524,   525,  1180,  1181,  1182,  1183,  1184,  1185,
-    1186,  1187,   534,   535,   536,     0,     0,   771,     0,     0,
+     522,   523,   524,   525,  1181,  1182,  1183,  1184,  1185,  1186,
+    1187,  1188,   534,   535,   536,     0,     0,   771,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    50,   220,   221,   222,   223,   224,   225,   226,   227,
+       0,  3272,   220,   221,   222,   223,   224,   225,   226,   227,
        0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
        0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
      239,   240,   773,   241,   242,     0,   243,   244,   245,   246,
-     247,     0,  1132,   248,   249,   250,   251,   252,     0,   253,
-     254,   255,   256,  1135,     0,  1136,     0,   258,   259,   260,
+     247,     0,  1133,   248,   249,   250,   251,   252,     0,   253,
+     254,   255,   256,  1136,     0,  1137,     0,   258,   259,   260,
      261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
-     269,   270,     0,   776,   271,   272,   273,  1137,  1138,  1139,
-    1140,  1141,  1142,  1143,   274,   275,   276,   277,   278,   279,
+     269,   270,     0,   776,   271,   272,   273,  1138,  1139,  1140,
+    1141,  1142,  1143,  1144,   274,   275,   276,   277,   278,   279,
      280,   281,   282,     0,   283,     0,   284,   285,   286,   287,
      288,     0,   289,   290,   291,     0,     0,   292,   293,   294,
      295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
-       0,   303,   304,   305,   306,   307,   308,   309,   310,  1147,
+       0,   303,   304,   305,   306,   307,   308,   309,   310,  1148,
        0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
-     318,   778,     0,   779,   319,   320,   321,     0,   322,  1150,
+     318,   778,     0,   779,   319,   320,   321,     0,   322,  1151,
        0,   324,   325,     0,   326,   327,   328,   329,   330,   780,
      331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
      340,     0,   341,   781,   342,   343,   344,   345,   346,   347,
      348,     0,   349,     0,   350,   782,   783,   351,   784,   352,
-     353,   354,   355,   356,     0,     0,   357,  1155,   785,   359,
-     786,     0,   360,   361,   362,  1156,  1157,   363,   364,   365,
+     353,   354,   355,   356,     0,     0,   357,  1156,   785,   359,
+     786,     0,   360,   361,   362,  1157,  1158,   363,   364,   365,
      366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
      376,   377,   378,   787,   379,   380,   381,   382,     0,   383,
-     384,   788,   385,     0,  1162,   387,   388,   389,   390,   391,
+     384,   788,   385,     0,  1163,   387,   388,   389,   390,   391,
        0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
-     397,   789,   398,   790,  1165,   400,   401,   402,   403,   404,
-     405,   406,     0,   407,   408,  1166,   410,   411,   412,   413,
+     397,   789,   398,   790,  1166,   400,   401,   402,   403,   404,
+     405,   406,     0,   407,   408,  1167,   410,   411,   412,   413,
      414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
      423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
      432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
-     791,   441,   442,   443,   444,   445,   446,   447,   448,   449,
-     450,   451,   452,     0,   453,   454,   455,   456,   457,  1169,
+     791,   441,   442,   443,   444,  3271,   446,   447,   448,   449,
+     450,   451,   452,     0,   453,   454,   455,   456,   457,  1170,
      458,   459,   460,   461,   462,   792,   463,   464,   465,   466,
        0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,  1171,     0,   479,   480,     0,   481,   793,   482,
+     476,   477,  1172,     0,   479,   480,     0,   481,   793,   482,
      483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
-     490,  1174,   492,  1175,     0,   494,   495,   496,   497,   498,
-     499,   500,     0,     0,   501,   502,   503,   504,   505,  1178,
+     490,  1175,   492,  1176,     0,   494,   495,   496,   497,   498,
+     499,   500,     0,     0,   501,   502,   503,   504,   505,  1179,
        0,   506,   507,   508,   509,   510,   511,   512,     0,   513,
      794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
-     519,   520,   521,   522,   523,   524,   525,  1180,  1181,  1182,
-    1183,  1184,  1185,  1186,  1187,   534,   535,   536,     0,     0,
-     815,  1392,   593,     0,     0,     0,   646,     0,     0,     0,
-       0,     0,     0,     0,  3854,   220,   221,   222,   223,   224,
+     519,   520,   521,   522,   523,   524,   525,  1181,  1182,  1183,
+    1184,  1185,  1186,  1187,  1188,   534,   535,   536,     0,     0,
+     771,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    50,   220,   221,   222,   223,   224,
      225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
        0,     0,     0,     0,   232,   233,     0,   234,   235,   772,
      236,   237,   238,   239,   240,   773,   241,   242,     0,   243,
-     244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
-     252,     0,   253,   254,   255,   256,   257,     0,   774,     0,
+     244,   245,   246,   247,     0,  1133,   248,   249,   250,   251,
+     252,     0,   253,   254,   255,   256,  1136,     0,  1137,     0,
      258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
      266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
-       0,     0,     0,   777,     0,     0,     0,   274,   275,   276,
+    1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,   275,   276,
      277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
      285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
      292,   293,   294,   295,   296,     0,   297,   298,   299,     0,
      300,   301,   302,     0,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,  1661,   312,     0,   313,   314,   315,   316,
+     309,   310,  1148,     0,   312,     0,   313,   314,   315,   316,
        0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
-       0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
+       0,   322,  1151,     0,   324,   325,     0,   326,   327,   328,
      329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
      337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
      345,   346,   347,   348,     0,   349,     0,   350,   782,   783,
      351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
-     358,   785,   359,   786,     0,   360,   361,   362,     0,     0,
+    1156,   785,   359,   786,     0,   360,   361,   362,  1157,  1158,
      363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
      373,   374,   375,   376,   377,   378,   787,   379,   380,   381,
-     382,     0,   383,   384,   788,   385,     0,   386,   387,   388,
-     389,   390,   391,     0,   392,  1662,     0,   393,   394,   395,
-       0,     0,   396,   397,   789,   398,   790,   399,   400,   401,
-     402,   403,   404,   405,   406,     0,   407,   408,   409,   410,
+     382,     0,   383,   384,   788,   385,     0,  1163,   387,   388,
+     389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
+       0,     0,   396,   397,   789,   398,   790,  1166,   400,   401,
+     402,   403,   404,   405,   406,     0,   407,   408,  1167,   410,
      411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
        0,   439,   440,   791,   441,   442,   443,   444,   445,   446,
      447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,     0,   458,   459,   460,   461,   462,   792,   463,
+     456,   457,  1170,   458,   459,   460,   461,   462,   792,   463,
      464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
+     473,   474,   475,   476,   477,  1172,     0,   479,   480,     0,
      481,   793,   482,   483,   484,   485,   486,     0,   487,   488,
-       0,     0,   489,   490,   491,   492,   493,  1663,   494,   495,
+       0,     0,   489,   490,  1175,   492,  1176,     0,   494,   495,
      496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
-     504,   505,     0,     0,   506,   507,   508,   509,   510,   511,
+     504,   505,  1179,     0,   506,   507,   508,   509,   510,   511,
      512,     0,   513,   794,   514,   515,   516,   517,     0,     0,
      518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
-     526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
-     536,     0,     0,   815,     0,     0,     0,     0,   658,  1393,
-    4294,     0,     0,     0,     0,     0,     0,  4295,   220,   221,
+    1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,   535,
+     536,     0,     0,   815,  1393,   593,     0,     0,     0,   646,
+       0,     0,     0,     0,     0,     0,     0,  3860,   220,   221,
      222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
-       3,     4,     0,     0,     0,     0,     0,   232,   233,     0,
+       0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
      234,   235,   772,   236,   237,   238,   239,   240,   773,   241,
      242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
      249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
@@ -6517,7 +6473,7 @@
      283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
      291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
      298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
+     306,   307,   308,   309,   310,   311,  1663,   312,     0,   313,
      314,   315,   316,     0,   317,     0,   318,   778,     0,   779,
      319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
      326,   327,   328,   329,   330,   780,   331,   332,   333,   334,
@@ -6528,157 +6484,157 @@
      362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
      370,   371,   372,   373,   374,   375,   376,   377,   378,   787,
      379,   380,   381,   382,     0,   383,   384,   788,   385,     0,
-     386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
+     386,   387,   388,   389,   390,   391,     0,   392,  1664,     0,
      393,   394,   395,     0,     0,   396,   397,   789,   398,   790,
      399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
      408,   409,   410,   411,   412,   413,   414,     0,   415,   416,
      417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
      427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
      436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
-     444,   445,   446,   447,   448,   449,   450,   451,   452,    39,
+     444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
      453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
      462,   792,   463,   464,   465,   466,     0,   467,   468,   469,
      470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
-     479,   480,    43,   481,   793,   482,   483,   484,   485,   486,
+     479,   480,     0,   481,   793,   482,   483,   484,   485,   486,
        0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
-       0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
+    1665,   494,   495,   496,   497,   498,   499,   500,     0,     0,
      501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
-     509,   510,  1058,   512,     0,   513,   794,   514,   515,   516,
-     517,     0,     0,   518,     0,    48,   519,   520,   521,   522,
+     509,   510,   511,   512,     0,   513,   794,   514,   515,   516,
+     517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
      523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   535,   536,     0,     0,    49,   771,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      50,     0,   220,   221,   222,   223,   224,   225,   226,   227,
-       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
-       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
-     239,   240,   773,   241,   242,     0,   243,   244,   245,   246,
-     247,     0,     0,   248,   249,   250,   251,   252,     0,   253,
-     254,   255,   256,   257,     0,   774,     0,   258,   259,   260,
-     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
-     269,   270,     0,   776,   271,   272,   273,     0,     0,     0,
-     777,     0,     0,     0,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,     0,   283,     0,   284,   285,   286,   287,
-     288,     0,   289,   290,   291,     0,     0,   292,   293,   294,
-     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
-       0,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-       0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
-     318,   778,     0,   779,   319,   320,   321,     0,   322,   323,
-       0,   324,   325,     0,   326,   327,   328,   329,   330,   780,
-     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
-     340,     0,   341,   781,   342,   343,   344,   345,   346,   347,
-     348,     0,   349,     0,   350,   782,   783,   351,   784,   352,
-     353,   354,   355,   356,     0,     0,   357,   358,   785,   359,
-     786,     0,   360,   361,   362,     0,     0,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   787,   379,   380,   381,   382,     0,   383,
-     384,   788,   385,     0,   386,   387,   388,   389,   390,   391,
-       0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
-     397,   789,   398,   790,   399,   400,   401,   402,   403,   404,
-     405,   406,     0,   407,   408,   409,   410,   411,   412,   413,
-     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
-     791,   441,   442,   443,   444,   445,   446,   447,   448,   449,
-     450,   451,   452,     0,   453,   454,   455,   456,   457,     0,
-     458,   459,   460,   461,   462,   792,   463,   464,   465,   466,
-       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,   478,     0,   479,   480,     0,   481,   793,   482,
-     483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
-     490,   491,   492,   493,     0,   494,   495,   496,   497,   498,
-     499,   500,     0,     0,   501,   502,   503,   504,   505,     0,
-       0,   506,   507,   508,   509,   510,   511,   512,     0,   513,
-     794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
-     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
-     529,   530,   531,   532,   533,   534,   535,   536,     0,     0,
-     219,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  4482,   220,   221,   222,   223,   224,
-     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
-       0,     0,     0,     0,   232,   233,     0,   234,   235,     0,
-     236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
-     244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
-     252,     0,   253,   254,   255,   256,   257,     0,     0,     0,
-     258,   259,   260,   261,     0,   262,   263,   264,     0,   265,
-     266,   267,   268,   269,   270,     0,     0,   271,   272,   273,
-       0,     0,     0,     0,     0,     0,     0,   274,   275,   276,
+     533,   534,   535,   536,     0,     0,   815,     0,     0,     0,
+       0,  1394,  1395,  4300,     0,     0,     0,     0,     0,     0,
+    4301,   220,   221,   222,   223,   224,   225,   226,   227,     0,
+     229,   230,   231,     3,     4,     0,     0,     0,     0,     0,
+     232,   233,     0,   234,   235,   772,   236,   237,   238,   239,
+     240,   773,   241,   242,     0,   243,   244,   245,   246,   247,
+       0,     0,   248,   249,   250,   251,   252,     0,   253,   254,
+     255,   256,   257,     0,   774,     0,   258,   259,   260,   261,
+     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
+     270,     0,   776,   271,   272,   273,     0,     0,     0,   777,
+       0,     0,     0,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,     0,   283,     0,   284,   285,   286,   287,   288,
+       0,   289,   290,   291,     0,     0,   292,   293,   294,   295,
+     296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
+     312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
+     778,     0,   779,   319,   320,   321,     0,   322,   323,     0,
+     324,   325,     0,   326,   327,   328,   329,   330,   780,   331,
+     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
+       0,   341,   781,   342,   343,   344,   345,   346,   347,   348,
+       0,   349,     0,   350,   782,   783,   351,   784,   352,   353,
+     354,   355,   356,     0,     0,   357,   358,   785,   359,   786,
+       0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+     377,   378,   787,   379,   380,   381,   382,     0,   383,   384,
+     788,   385,     0,   386,   387,   388,   389,   390,   391,     0,
+     392,     0,     0,   393,   394,   395,     0,     0,   396,   397,
+     789,   398,   790,   399,   400,   401,   402,   403,   404,   405,
+     406,     0,   407,   408,   409,   410,   411,   412,   413,   414,
+       0,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
+     441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
+     451,   452,    39,   453,   454,   455,   456,   457,     0,   458,
+     459,   460,   461,   462,   792,   463,   464,   465,   466,     0,
+     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
+     477,   478,     0,   479,   480,    43,   481,   793,   482,   483,
+     484,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,   496,   497,   498,   499,
+     500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
+     506,   507,   508,   509,   510,  1059,   512,     0,   513,   794,
+     514,   515,   516,   517,     0,     0,   518,     0,    48,   519,
+     520,   521,   522,   523,   524,   525,   526,   527,   528,   529,
+     530,   531,   532,   533,   534,   535,   536,     0,     0,    49,
+     771,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    50,     0,   220,   221,   222,   223,   224,
+     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
+       0,     0,     0,     0,   232,   233,     0,   234,   235,   772,
+     236,   237,   238,   239,   240,   773,   241,   242,     0,   243,
+     244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
+     252,     0,   253,   254,   255,   256,   257,     0,   774,     0,
+     258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
+     266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
+       0,     0,     0,   777,     0,     0,     0,   274,   275,   276,
      277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
      285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
      292,   293,   294,   295,   296,     0,   297,   298,   299,     0,
      300,   301,   302,     0,   303,   304,   305,   306,   307,   308,
      309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
-       0,   317,     0,   318,     0,     0,     0,   319,   320,   321,
+       0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
        0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
-     329,   330,     0,   331,   332,   333,   334,     0,   335,   336,
-     337,   338,   339,   340,     0,   341,     0,   342,   343,   344,
-     345,   346,   347,   348,     0,   349,     0,   350,     0,     0,
-     351,     0,   352,   353,   354,   355,   356,     0,     0,   357,
-     358,     0,   359,     0,     0,   360,   361,   362,     0,     0,
+     329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
+     337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
+     345,   346,   347,   348,     0,   349,     0,   350,   782,   783,
+     351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
+     358,   785,   359,   786,     0,   360,   361,   362,     0,     0,
      363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,     0,   379,   380,   381,
-     382,     0,   383,   384,     0,   385,     0,   386,   387,   388,
+     373,   374,   375,   376,   377,   378,   787,   379,   380,   381,
+     382,     0,   383,   384,   788,   385,     0,   386,   387,   388,
      389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
-       0,     0,   396,   397,     0,   398,     0,   399,   400,   401,
+       0,     0,   396,   397,   789,   398,   790,   399,   400,   401,
      402,   403,   404,   405,   406,     0,   407,   408,   409,   410,
      411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,     0,   441,   442,   443,   444,   445,   446,
-     447,   448,   449,   450,   451,   452,    39,   453,   454,   455,
-     456,   457,     0,   458,   459,   460,   461,   462,     0,   463,
+       0,   439,   440,   791,   441,   442,   443,   444,   445,   446,
+     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
+     456,   457,     0,   458,   459,   460,   461,   462,   792,   463,
      464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,   478,     0,   479,   480,    43,
-     481,     0,   482,   483,   484,   485,   486,     0,   487,   488,
+     473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
+     481,   793,   482,   483,   484,   485,   486,     0,   487,   488,
        0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
      496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
-     504,   505,     0,     0,   506,   507,   508,   509,   510,  1058,
-     512,     0,   513,     0,   514,   515,   516,   517,     0,     0,
-     518,     0,    48,   519,   520,   521,   522,   523,   524,   525,
+     504,   505,     0,     0,   506,   507,   508,   509,   510,   511,
+     512,     0,   513,   794,   514,   515,   516,   517,     0,     0,
+     518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
      526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
-     536,     0,     0,    49,   219,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    50,     0,   220,
-     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
-     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
-       0,   234,   235,     0,   236,   237,   238,   239,   240,     0,
-     241,   242,     0,   243,   244,   245,   246,   247,     0,     0,
-     248,   249,   250,   251,   252,     0,   253,   254,   255,   256,
-     257,     0,     0,     0,   258,   259,   260,   261,     0,   262,
-     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
-       0,   271,   272,   273,     0,     0,     0,     0,     0,     0,
-       0,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
-     290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
-     297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
-     313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
-       0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
-       0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
-     334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
-       0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
-       0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
-     356,     0,     0,   357,   358,     0,   359,     0,     0,   360,
-     361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-       0,   379,   380,   381,   382,     0,   383,   384,     0,   385,
-       0,   386,   387,   388,   389,   390,   391,     0,   392,     0,
-       0,   393,   394,   395,     0,     0,   396,   397,     0,   398,
-       0,   399,   400,   401,   402,   403,   404,   405,   406,     0,
-     407,   408,   409,   410,   411,   412,   413,   414,     0,   415,
-     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,     0,   439,   440,     0,   441,   442,
-     443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,     0,   458,   459,   460,
-     461,   462,     0,   463,   464,   465,   466,     0,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
-       0,   479,   480,     0,   481,     0,   482,   483,   484,   485,
-     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
-     493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
-       0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
-     508,   509,   510,   511,   512,     0,   513,     0,   514,   515,
-     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
-     522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
-     532,   533,   534,   535,   536,     0,     0,   219,     0,     0,
+     536,     0,     0,   219,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  4488,   220,   221,
+     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
+       0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
+     234,   235,     0,   236,   237,   238,   239,   240,     0,   241,
+     242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
+     249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
+       0,     0,     0,   258,   259,   260,   261,     0,   262,   263,
+     264,     0,   265,   266,   267,   268,   269,   270,     0,     0,
+     271,   272,   273,     0,     0,     0,     0,     0,     0,     0,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
+     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
+     291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
+     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
+     314,   315,   316,     0,   317,     0,   318,     0,     0,     0,
+     319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
+     326,   327,   328,   329,   330,     0,   331,   332,   333,   334,
+       0,   335,   336,   337,   338,   339,   340,     0,   341,     0,
+     342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
+     350,     0,     0,   351,     0,   352,   353,   354,   355,   356,
+       0,     0,   357,   358,     0,   359,     0,     0,   360,   361,
+     362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,     0,
+     379,   380,   381,   382,     0,   383,   384,     0,   385,     0,
+     386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
+     393,   394,   395,     0,     0,   396,   397,     0,   398,     0,
+     399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
+     408,   409,   410,   411,   412,   413,   414,     0,   415,   416,
+     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
+     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,     0,   439,   440,     0,   441,   442,   443,
+     444,   445,   446,   447,   448,   449,   450,   451,   452,    39,
+     453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
+     462,     0,   463,   464,   465,   466,     0,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
+     479,   480,    43,   481,     0,   482,   483,   484,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
+     501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
+     509,   510,  1059,   512,     0,   513,     0,   514,   515,   516,
+     517,     0,     0,   518,     0,    48,   519,   520,   521,   522,
+     523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
+     533,   534,   535,   536,     0,     0,    49,   219,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1250,   220,   221,   222,   223,   224,   225,   226,   227,
+      50,     0,   220,   221,   222,   223,   224,   225,   226,   227,
        0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
        0,   232,   233,     0,   234,   235,     0,   236,   237,   238,
      239,   240,     0,   241,   242,     0,   243,   244,   245,   246,
@@ -6721,7 +6677,7 @@
      519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
      529,   530,   531,   532,   533,   534,   535,   536,     0,     0,
      219,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2674,   220,   221,   222,   223,   224,
+       0,     0,     0,     0,  1251,   220,   221,   222,   223,   224,
      225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
        0,     0,     0,     0,   232,   233,     0,   234,   235,     0,
      236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
@@ -6764,7 +6720,7 @@
      518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
      526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
      536,     0,     0,   219,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3765,   220,   221,
+       0,     0,     0,     0,     0,     0,     0,  2680,   220,   221,
      222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
        0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
      234,   235,     0,   236,   237,   238,   239,   240,     0,   241,
@@ -6806,531 +6762,187 @@
      509,   510,   511,   512,     0,   513,     0,   514,   515,   516,
      517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
      523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   535,   536,     0,     0,     0,     0,     0,   977,
-    1392,   593,     0,     0,   829,   646,     0,     0,     0,     0,
-    4179,   830,   831,   832,   220,   221,   222,   223,   224,   225,
-     226,   227,  1848,   229,   230,   231,  1849,  1850,  1851,  1852,
-    1853,  1854,  1855,   232,   233,  1856,   234,   235,   772,   236,
-     237,   238,     0,   978,   773,   979,   980,  1857,   243,   244,
-     245,   246,   247,  1858,  1859,   248,   249,   981,   982,   252,
-    1860,   253,   254,   255,   256,     0,  1861,   774,  1862,   258,
-     259,   260,   261,   775,   262,   263,   264,  1863,   265,   266,
-     267,   268,   269,   270,  1864,   776,   271,   272,   273,  1865,
-    1866,  1867,   777,  1868,  1869,  1870,   274,   275,   276,   277,
-     278,   279,   983,   984,   282,  1871,   283,  1872,   284,   285,
-     286,   287,   288,  1873,   289,   290,   291,  1874,  1875,   292,
-     293,   985,   295,   296,  1876,   297,   298,   299,  1877,   300,
-     301,   302,  1878,   303,   304,   305,   306,     0,   308,   309,
-     310,     0,  1879,   312,  1880,   313,   314,   986,   316,  1881,
-     317,  1882,   318,   778,  1883,   779,   319,   320,   321,  1884,
-     322,     0,  1885,     0,   325,  1886,   326,   327,   328,   329,
-     330,   780,   331,   332,   333,   334,  1887,   335,   336,   337,
-     338,   339,   340,  1888,   341,   781,     0,   343,   344,   345,
-     346,   988,   989,  1889,   990,  1890,   350,   782,   783,   351,
-     784,   352,   353,   354,   355,   356,  1891,  1892,   357,     0,
-     785,   359,   786,  1893,   360,   361,   362,  1894,  1895,   363,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,   991,   787,   992,   380,   381,     0,
-    1896,   383,   384,   788,   385,  1897,     0,   387,   993,   389,
-     390,   391,  1898,   392,  1899,  1900,  3516,   394,   395,  1901,
-    1902,   396,     0,   789,   398,   790,     0,   400,   401,   402,
-     403,   404,   405,   406,  1903,   407,   408,     0,   410,     0,
-     412,   413,   414,  1904,   415,   416,   417,   418,   419,   420,
-     421,   422,   994,   424,   425,   426,   427,  1905,   428,   429,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,  1906,
-     439,   440,   791,   441,   442,   443,     0,   445,   446,   447,
-     448,   449,   450,   451,   452,  1907,   453,   454,   455,   456,
-     457,  1908,   458,   459,  1989,   461,   462,   792,   463,   464,
-     996,   466,  1909,   467,   468,   469,   470,   471,   472,   473,
-     474,   475,   476,   477,     0,  1910,   479,   480,  1911,   481,
-     793,   482,   483,   484,   485,   486,  1912,   997,   998,  1913,
-    1914,   489,   490,     0,   492,     0,  1915,   494,   495,   496,
-     497,   498,   499,   500,  1916,  1917,   501,   502,   503,   504,
-     505,  1918,  1919,   506,   507,   508,   509,   510,     0,   999,
-    1920,   513,   794,   514,   515,   516,   517,  1921,  1922,   518,
-    1923,  1924,   519,   520,   521,   522,   523,   524,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   534,   535,   536,
-       0,   219,     0,   835,   836,   837,   829,  3517,  3518,   840,
-     841,   842,   843,   830,   831,   832,   220,   221,   222,   223,
-     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
-       0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
-       0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
-     243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
-     251,   252,     0,   253,   833,   255,   256,   257,     0,     0,
-       0,   258,   259,   260,   261,     0,   262,   263,   264,     0,
-     265,   266,   267,   268,   269,   270,     0,     0,   271,   272,
-     273,     0,     0,     0,     0,     0,     0,     0,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,     0,   283,     0,
-     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
-       0,   292,   293,   294,   295,   296,     0,   297,   298,   299,
-       0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,     0,   834,     0,   313,   314,   315,
-     316,     0,   317,     0,   318,     0,     0,     0,   319,   320,
-     321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
-     328,   329,   330,     0,   331,   332,   333,   334,     0,   335,
-     336,   337,   338,   339,   340,     0,   341,     0,   342,   343,
-     344,   345,   346,   347,   348,     0,   349,     0,   350,     0,
-       0,   351,     0,   352,   353,   354,   355,   356,     0,     0,
-     357,   358,     0,   359,     0,     0,   360,   361,   362,     0,
-       0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,     0,   379,   380,
-     381,   382,     0,   383,   384,     0,   385,     0,   386,   387,
-     388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
-     395,     0,     0,   396,   397,     0,   398,     0,   399,   400,
-     401,   402,   403,   404,   405,   406,     0,   407,   408,   409,
-     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,     0,   441,   442,   443,   444,   445,
-     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
-     455,   456,   457,     0,   458,   459,   460,   461,   462,     0,
-     463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
-       0,   481,     0,   482,   483,   484,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
-     503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
-     511,   512,     0,   513,     0,   514,   515,   516,   517,     0,
-       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
-     525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,     0,   219,     0,   835,   836,   837,   829,   838,
-     839,   840,   841,   842,   843,   830,   831,   832,   220,   221,
-     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
-       0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
-     234,   235,     0,   236,   237,   238,   239,   240,     0,   241,
-     242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
-     249,   250,   251,   252,     0,   253,   935,   255,   256,   257,
-       0,     0,     0,   258,   259,   260,   261,     0,   262,   263,
-     264,     0,   265,   266,   267,   268,   269,   270,     0,     0,
-     271,   272,   273,     0,     0,     0,     0,     0,     0,     0,
-     274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
-     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
-     291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
-     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,     0,   936,     0,   313,
-     314,   315,   316,     0,   317,     0,   318,     0,     0,     0,
-     319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
-     326,   327,   328,   329,   330,     0,   331,   332,   333,   334,
-       0,   335,   336,   337,   338,   339,   340,     0,   341,     0,
-     342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
-     350,     0,     0,   351,     0,   352,   353,   354,   355,   356,
-       0,     0,   357,   358,     0,   359,     0,     0,   360,   361,
-     362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   378,     0,
-     379,   380,   381,   382,     0,   383,   384,     0,   385,     0,
-     386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
-     393,   394,   395,     0,     0,   396,   397,     0,   398,     0,
-     399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
-     408,   409,   410,   411,   412,   413,   414,     0,   415,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-     436,   437,   438,     0,   439,   440,     0,   441,   442,   443,
-     444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
-     453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
-     462,     0,   463,   464,   465,   466,     0,   467,   468,   469,
-     470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
-     479,   480,     0,   481,     0,   482,   483,   484,   485,   486,
-       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
-       0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
-     501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
-     509,   510,   511,   512,     0,   513,     0,   514,   515,   516,
-     517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
-     523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   535,   536,     0,   219,     0,   835,   836,   837,
-     829,   838,   839,   840,   841,   842,   843,   830,   831,   832,
-     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
-     230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
-     233,     0,   234,   235,     0,   236,   237,   238,   239,   240,
-       0,   241,   242,     0,   243,   244,   245,   246,   247,     0,
-       0,   248,   249,   250,   251,   252,     0,   253,  1026,   255,
-     256,   257,     0,     0,     0,   258,   259,   260,   261,     0,
-     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
-       0,     0,   271,   272,   273,     0,     0,     0,     0,     0,
-       0,     0,   274,   275,   276,   277,   278,   279,   280,   281,
-     282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
-     289,   290,   291,     0,     0,   292,   293,   294,   295,   296,
-       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,     0,  1027,
-       0,   313,   314,   315,   316,     0,   317,     0,   318,     0,
-       0,     0,   319,   320,   321,     0,   322,   323,     0,   324,
-     325,     0,   326,   327,   328,   329,  1028,     0,   331,   332,
-     333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
-     341,     0,   342,   343,   344,   345,   346,   347,   348,     0,
-     349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
-     355,   356,     0,     0,   357,   358,     0,   359,     0,     0,
-     360,   361,   362,     0,     0,   363,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,     0,   379,   380,   381,   382,     0,   383,   384,     0,
-     385,     0,   386,   387,   388,   389,   390,   391,     0,   392,
-       0,     0,   393,   394,   395,     0,     0,   396,   397,     0,
-     398,     0,   399,   400,   401,   402,   403,   404,   405,   406,
-       0,   407,   408,   409,   410,   411,   412,   413,   414,     0,
-     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,   436,   437,   438,     0,   439,   440,     0,   441,
-     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
-     452,     0,   453,   454,   455,   456,   457,     0,   458,   459,
-     460,   461,   462,     0,   463,   464,   465,   466,     0,   467,
-     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
-     478,     0,   479,   480,     0,   481,     0,   482,   483,   484,
-     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
-     492,   493,     0,   494,   495,   496,   497,   498,   499,   500,
-       0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
-     507,   508,   509,   510,   511,   512,     0,   513,     0,   514,
-     515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
-     521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
-     531,   532,   533,   534,   535,   536,     0,   219,     0,   835,
-     836,   837,   829,   838,   839,   840,   841,   842,   843,   830,
-     831,   832,   220,   221,   222,   223,   224,   225,   226,   227,
-       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
-       0,   232,   233,     0,   234,   235,     0,   236,   237,   238,
-     239,   240,     0,   241,   242,     0,   243,   244,   245,   246,
-     247,     0,     0,   248,   249,   250,   251,   252,     0,   253,
-    1490,   255,   256,   257,     0,     0,     0,   258,   259,   260,
-     261,     0,   262,   263,   264,     0,   265,   266,   267,   268,
-     269,   270,     0,     0,   271,   272,   273,     0,     0,     0,
-       0,     0,     0,     0,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,     0,   283,     0,   284,   285,   286,   287,
-     288,     0,   289,   290,   291,     0,     0,   292,   293,   294,
-     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
-       0,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-       0,  1491,     0,   313,   314,   315,   316,     0,   317,     0,
-     318,     0,     0,     0,   319,   320,   321,     0,   322,   323,
-       0,   324,   325,     0,   326,   327,   328,   329,   330,     0,
-     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
-     340,     0,   341,     0,   342,   343,   344,   345,   346,   347,
-     348,     0,   349,     0,   350,     0,     0,   351,     0,   352,
-     353,   354,   355,   356,     0,     0,   357,   358,     0,   359,
-       0,     0,   360,   361,   362,     0,     0,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,     0,   379,   380,   381,   382,     0,   383,
-     384,     0,   385,     0,   386,   387,   388,   389,   390,   391,
-       0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
-     397,     0,   398,     0,   399,   400,   401,   402,   403,   404,
-     405,   406,     0,   407,   408,   409,   410,   411,   412,   413,
-     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
-       0,   441,   442,   443,   444,   445,   446,   447,   448,   449,
-     450,   451,   452,     0,   453,   454,   455,   456,   457,     0,
-     458,   459,   460,   461,   462,     0,   463,   464,   465,   466,
-       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,   478,     0,   479,   480,     0,   481,     0,   482,
-     483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
-     490,   491,   492,   493,     0,   494,   495,   496,   497,   498,
-     499,   500,     0,     0,   501,   502,   503,   504,   505,     0,
-       0,   506,   507,   508,   509,   510,   511,   512,     0,   513,
-       0,   514,   515,   516,   517,     0,     0,   518,     0,     0,
-     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
-     529,   530,   531,   532,   533,   534,   535,   536,     0,   219,
-       0,   835,   836,   837,   829,   838,   839,   840,   841,   842,
-     843,   830,   831,   832,   220,   221,   222,   223,   224,   225,
-     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
-       0,     0,     0,   232,   233,     0,   234,   235,     0,   236,
-     237,   238,   239,   240,     0,   241,   242,     0,   243,   244,
-     245,   246,   247,     0,     0,   248,   249,   250,   251,   252,
-       0,   253,   254,   255,   256,   257,     0,     0,     0,   258,
-     259,   260,   261,     0,   262,   263,   264,     0,   265,   266,
-     267,   268,   269,   270,     0,     0,   271,   272,   273,     0,
-       0,     0,     0,     0,     0,     0,   274,   275,   276,   277,
-     278,   279,   280,   281,   282,     0,   283,     0,   284,   285,
-     286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
-     293,   294,   295,   296,     0,   297,   298,   299,     0,   300,
-     301,   302,     0,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
-     317,     0,   318,     0,     0,     0,   319,   320,   321,     0,
-     322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
-     330,     0,   331,   332,   333,   334,     0,   335,   336,   337,
-     338,   339,   340,     0,   341,     0,   342,   343,   344,   345,
-     346,   347,   348,     0,   349,     0,   350,     0,     0,   351,
-       0,   352,   353,   354,   355,   356,     0,     0,   357,   358,
-       0,   359,     0,     0,   360,   361,   362,     0,     0,   363,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,   378,     0,   379,   380,   381,   382,
-       0,   383,   384,     0,   385,     0,   386,   387,   388,   389,
-     390,   391,     0,   392,     0,     0,   393,   394,   395,     0,
-       0,   396,   397,     0,   398,     0,   399,   400,   401,   402,
-     403,   404,   405,   406,     0,   407,   408,   409,   410,   411,
-     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
-     439,   440,     0,   441,   442,   443,   444,   445,   446,   447,
-     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
-     457,     0,   458,   459,   460,   461,   462,     0,   463,   464,
-     465,   466,     0,   467,   468,   469,   470,   471,   472,   473,
-     474,   475,   476,   477,   478,     0,   479,   480,     0,   481,
-       0,   482,   483,   484,   485,   486,     0,   487,   488,     0,
-       0,   489,   490,   491,   492,   493,     0,   494,   495,   496,
-     497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
-     505,     0,     0,   506,   507,   508,   509,   510,   511,   512,
-       0,   513,     0,   514,   515,   516,   517,     0,     0,   518,
-       0,     0,   519,   520,   521,   522,   523,   524,   525,   526,
-     527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
-       0,   219,     0,   835,   836,   837,   829,   838,   839,   840,
-     841,   842,   843,   830,   831,   832,   220,   221,   222,   223,
-     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
-       0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
-       0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
-     243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
-     251,   252,     0,   253,  2752,   255,   256,   257,     0,     0,
-       0,   258,   259,   260,   261,     0,   262,   263,   264,     0,
-     265,   266,   267,   268,   269,   270,     0,     0,   271,   272,
-     273,     0,     0,     0,     0,     0,     0,     0,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,     0,   283,     0,
-     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
-       0,   292,   293,   294,   295,   296,     0,   297,   298,   299,
-       0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,     0,  2753,     0,   313,   314,   315,
-     316,     0,   317,     0,   318,     0,     0,     0,   319,   320,
-     321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
-     328,   329,   330,     0,   331,   332,   333,   334,     0,   335,
-     336,   337,   338,   339,   340,     0,   341,     0,   342,   343,
-     344,   345,   346,   347,   348,     0,   349,     0,   350,     0,
-       0,   351,     0,   352,   353,   354,   355,   356,     0,     0,
-     357,   358,     0,   359,     0,     0,   360,   361,   362,     0,
-       0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,     0,   379,   380,
-     381,   382,     0,   383,   384,     0,   385,     0,   386,   387,
-     388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
-     395,     0,     0,   396,   397,     0,   398,     0,   399,   400,
-     401,   402,   403,   404,   405,   406,     0,   407,   408,   409,
-     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,     0,   441,   442,   443,   444,   445,
-     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
-     455,   456,   457,     0,   458,   459,   460,   461,   462,     0,
-     463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
-       0,   481,     0,   482,   483,   484,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
-     503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
-     511,   512,     0,   513,     0,   514,   515,   516,   517,     0,
-       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
-     525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,     0,   219,     0,   835,   836,   837,   829,   838,
-     839,   840,   841,   842,   843,   830,   831,   832,   220,   221,
-     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
-       0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
-     234,   235,     0,   236,   237,   238,   239,   240,     0,   241,
-     242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
-     249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
-       0,     0,     0,   258,   259,   260,   261,     0,   262,   263,
-     264,     0,   265,   266,   267,   268,   269,   270,     0,     0,
-     271,   272,   273,     0,     0,     0,     0,     0,     0,     0,
-     274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
-     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
-     291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
-     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
-     314,   315,   316,     0,   317,     0,   318,     0,     0,     0,
-     319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
-     326,   327,   328,   329,   330,     0,   331,   332,   333,   334,
-       0,   335,   336,   337,   338,   339,   340,     0,   341,     0,
-     342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
-     350,     0,     0,   351,     0,   352,   353,   354,   355,   356,
-       0,     0,   357,   358,     0,   359,     0,     0,   360,   361,
-     362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   378,     0,
-     379,   380,   381,   382,     0,   383,   384,     0,   385,     0,
-     386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
-    4461,   394,   395,     0,     0,   396,   397,     0,   398,     0,
-     399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
-     408,   409,   410,   411,   412,   413,   414,     0,   415,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-     436,   437,   438,     0,   439,   440,     0,   441,   442,   443,
-     444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
-     453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
-     462,     0,   463,   464,   465,   466,     0,   467,   468,   469,
-     470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
-     479,   480,     0,   481,     0,   482,   483,   484,   485,   486,
-       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
-       0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
-     501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
-     509,   510,   511,   512,     0,   513,     0,   514,   515,   516,
-     517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
-     523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   535,   536,  1847,     0,     0,   835,   836,   837,
-       0,   838,   839,   840,   841,   842,   843,     0,     0,   220,
-     221,   222,   223,   224,   225,   226,   227,  1848,   229,   230,
-     231,  1849,  1850,  1851,  1852,  1853,  1854,  1855,   232,   233,
-    1856,   234,   235,   772,   236,   237,   238,   239,   240,   773,
-     241,   242,  1857,   243,   244,   245,   246,   247,  1858,  1859,
-     248,   249,   250,   251,   252,  1860,   253,   254,   255,   256,
-     257,  1861,   774,  1862,   258,   259,   260,   261,   775,   262,
-     263,   264,  1863,   265,   266,   267,   268,   269,   270,  1864,
-     776,   271,   272,   273,  1865,  1866,  1867,   777,  1868,  1869,
-    1870,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-    1871,   283,  1872,   284,   285,   286,   287,   288,  1873,   289,
-     290,   291,  1874,  1875,   292,   293,   294,   295,   296,  1876,
-     297,   298,   299,  1877,   300,   301,   302,  1878,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,  1879,   312,  1880,
-     313,   314,   315,   316,  1881,   317,  1882,   318,   778,  1883,
-     779,   319,   320,   321,  1884,   322,   323,  1885,   324,   325,
-    1886,   326,   327,   328,   329,   330,   780,   331,   332,   333,
-     334,  1887,   335,   336,   337,   338,   339,   340,  1888,   341,
-     781,   342,   343,   344,   345,   346,   347,   348,  1889,   349,
-    1890,   350,   782,   783,   351,   784,   352,   353,   354,   355,
-     356,  1891,  1892,   357,   358,   785,   359,   786,  1893,   360,
-     361,   362,  1894,  1895,   363,   364,   365,   366,   367,   368,
+     533,   534,   535,   536,     0,     0,   219,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3771,   220,   221,   222,   223,   224,   225,   226,   227,     0,
+     229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
+     232,   233,     0,   234,   235,     0,   236,   237,   238,   239,
+     240,     0,   241,   242,     0,   243,   244,   245,   246,   247,
+       0,     0,   248,   249,   250,   251,   252,     0,   253,   254,
+     255,   256,   257,     0,     0,     0,   258,   259,   260,   261,
+       0,   262,   263,   264,     0,   265,   266,   267,   268,   269,
+     270,     0,     0,   271,   272,   273,     0,     0,     0,     0,
+       0,     0,     0,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,     0,   283,     0,   284,   285,   286,   287,   288,
+       0,   289,   290,   291,     0,     0,   292,   293,   294,   295,
+     296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
+     312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
+       0,     0,     0,   319,   320,   321,     0,   322,   323,     0,
+     324,   325,     0,   326,   327,   328,   329,   330,     0,   331,
+     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
+       0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
+       0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
+     354,   355,   356,     0,     0,   357,   358,     0,   359,     0,
+       0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+     377,   378,     0,   379,   380,   381,   382,     0,   383,   384,
+       0,   385,     0,   386,   387,   388,   389,   390,   391,     0,
+     392,     0,     0,   393,   394,   395,     0,     0,   396,   397,
+       0,   398,     0,   399,   400,   401,   402,   403,   404,   405,
+     406,     0,   407,   408,   409,   410,   411,   412,   413,   414,
+       0,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,   436,   437,   438,     0,   439,   440,     0,
+     441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
+     451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
+     459,   460,   461,   462,     0,   463,   464,   465,   466,     0,
+     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
+     477,   478,     0,   479,   480,     0,   481,     0,   482,   483,
+     484,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,   496,   497,   498,   499,
+     500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
+     506,   507,   508,   509,   510,   511,   512,     0,   513,     0,
+     514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
+     520,   521,   522,   523,   524,   525,   526,   527,   528,   529,
+     530,   531,   532,   533,   534,   535,   536,     0,     0,     0,
+       0,     0,   978,  1393,   593,     0,     0,   829,   646,     0,
+       0,     0,     0,  4185,   830,   831,   832,   220,   221,   222,
+     223,   224,   225,   226,   227,  1850,   229,   230,   231,  1851,
+    1852,  1853,  1854,  1855,  1856,  1857,   232,   233,  1858,   234,
+     235,   772,   236,   237,   238,     0,   979,   773,   980,   981,
+    1859,   243,   244,   245,   246,   247,  1860,  1861,   248,   249,
+     982,   983,   252,  1862,   253,   254,   255,   256,     0,  1863,
+     774,  1864,   258,   259,   260,   261,   775,   262,   263,   264,
+    1865,   265,   266,   267,   268,   269,   270,  1866,   776,   271,
+     272,   273,  1867,  1868,  1869,   777,  1870,  1871,  1872,   274,
+     275,   276,   277,   278,   279,   984,   985,   282,  1873,   283,
+    1874,   284,   285,   286,   287,   288,  1875,   289,   290,   291,
+    1876,  1877,   292,   293,   986,   295,   296,  1878,   297,   298,
+     299,  1879,   300,   301,   302,  1880,   303,   304,   305,   306,
+       0,   308,   309,   310,     0,  1881,   312,  1882,   313,   314,
+     987,   316,  1883,   317,  1884,   318,   778,  1885,   779,   319,
+     320,   321,  1886,   322,     0,  1887,     0,   325,  1888,   326,
+     327,   328,   329,   330,   780,   331,   332,   333,   334,  1889,
+     335,   336,   337,   338,   339,   340,  1890,   341,   781,     0,
+     343,   344,   345,   346,   989,   990,  1891,   991,  1892,   350,
+     782,   783,   351,   784,   352,   353,   354,   355,   356,  1893,
+    1894,   357,     0,   785,   359,   786,  1895,   360,   361,   362,
+    1896,  1897,   363,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,   377,   992,   787,   993,
+     380,   381,     0,  1898,   383,   384,   788,   385,  1899,     0,
+     387,   994,   389,   390,   391,  1900,   392,  1901,  1902,  3522,
+     394,   395,  1903,  1904,   396,     0,   789,   398,   790,     0,
+     400,   401,   402,   403,   404,   405,   406,  1905,   407,   408,
+       0,   410,     0,   412,   413,   414,  1906,   415,   416,   417,
+     418,   419,   420,   421,   422,   995,   424,   425,   426,   427,
+    1907,   428,   429,   430,   431,   432,   433,   434,   435,   436,
+     437,   438,  1908,   439,   440,   791,   441,   442,   443,     0,
+     445,   446,   447,   448,   449,   450,   451,   452,  1909,   453,
+     454,   455,   456,   457,  1910,   458,   459,  1991,   461,   462,
+     792,   463,   464,   997,   466,  1911,   467,   468,   469,   470,
+     471,   472,   473,   474,   475,   476,   477,     0,  1912,   479,
+     480,  1913,   481,   793,   482,   483,   484,   485,   486,  1914,
+     998,   999,  1915,  1916,   489,   490,     0,   492,     0,  1917,
+     494,   495,   496,   497,   498,   499,   500,  1918,  1919,   501,
+     502,   503,   504,   505,  1920,  1921,   506,   507,   508,   509,
+     510,     0,  1000,  1922,   513,   794,   514,   515,   516,   517,
+    1923,  1924,   518,  1925,  1926,   519,   520,   521,   522,   523,
+     524,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     534,   535,   536,     0,   219,     0,   835,   836,   837,   829,
+    3523,  3524,   840,   841,   842,   843,   830,   831,   832,   220,
+     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
+     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
+       0,   234,   235,     0,   236,   237,   238,   239,   240,     0,
+     241,   242,     0,   243,   244,   245,   246,   247,     0,     0,
+     248,   249,   250,   251,   252,     0,   253,   833,   255,   256,
+     257,     0,     0,     0,   258,   259,   260,   261,     0,   262,
+     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
+       0,   271,   272,   273,     0,     0,     0,     0,     0,     0,
+       0,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
+     290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
+     297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,     0,   834,     0,
+     313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
+       0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
+       0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
+     334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
+       0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
+       0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
+     356,     0,     0,   357,   358,     0,   359,     0,     0,   360,
+     361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
      369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     787,   379,   380,   381,   382,  1896,   383,   384,   788,   385,
-    1897,   386,   387,   388,   389,   390,   391,  1898,   392,  1899,
-    1900,   393,   394,   395,  1901,  1902,   396,   397,   789,   398,
-     790,   399,   400,   401,   402,   403,   404,   405,   406,  1903,
-     407,   408,   409,   410,   411,   412,   413,   414,  1904,   415,
+       0,   379,   380,   381,   382,     0,   383,   384,     0,   385,
+       0,   386,   387,   388,   389,   390,   391,     0,   392,     0,
+       0,   393,   394,   395,     0,     0,   396,   397,     0,   398,
+       0,   399,   400,   401,   402,   403,   404,   405,   406,     0,
+     407,   408,   409,   410,   411,   412,   413,   414,     0,   415,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,  1905,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,  1906,   439,   440,   791,   441,   442,
+     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,     0,   439,   440,     0,   441,   442,
      443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
-    1907,   453,   454,   455,   456,   457,  1908,   458,   459,   460,
-     461,   462,   792,   463,   464,   465,   466,  1909,   467,   468,
+       0,   453,   454,   455,   456,   457,     0,   458,   459,   460,
+     461,   462,     0,   463,   464,   465,   466,     0,   467,   468,
      469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
-    1910,   479,   480,  1911,   481,   793,   482,   483,   484,   485,
-     486,  1912,   487,   488,  1913,  1914,   489,   490,   491,   492,
-     493,  1915,   494,   495,   496,   497,   498,   499,   500,  1916,
-    1917,   501,   502,   503,   504,   505,  1918,  1919,   506,   507,
-     508,   509,   510,   511,   512,  1920,   513,   794,   514,   515,
-     516,   517,  1921,  1922,   518,  1923,  1924,   519,   520,   521,
+       0,   479,   480,     0,   481,     0,   482,   483,   484,   485,
+     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
+       0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
+     508,   509,   510,   511,   512,     0,   513,     0,   514,   515,
+     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
      522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
-     532,   533,   534,   535,   536,   219,     0,     0,     0,     0,
-       0,     0,     0,     0,  1925,     0,     0,     0,     0,     0,
-     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
-     230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
-     233,     0,   234,   235,     0,   236,   237,   238,   239,   240,
-       0,   241,   242,     0,   243,   244,   245,   246,   247,     0,
-       0,   248,   249,   250,   251,   252,     0,   253,   254,   255,
-     256,   257,     0,     0,     0,   258,   259,   260,   261,     0,
-     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
-       0,     0,   271,   272,   273,     0,     0,     0,     0,     0,
-       0,     0,   274,   275,   276,   277,   278,   279,   280,   281,
-     282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
-     289,   290,   291,     0,     0,   292,   293,   294,   295,   296,
-       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,     0,   312,
-       0,   313,   314,   315,   316,     0,   317,     0,   318,     0,
-       0,     0,   319,   320,   321,     0,   322,   323,     0,   324,
-     325,     0,   326,   327,   328,   329,   330,     0,   331,   332,
-     333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
-     341,     0,   342,   343,   344,   345,   346,   347,   348,     0,
-     349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
-     355,   356,     0,     0,   357,   358,     0,   359,     0,     0,
-     360,   361,   362,     0,     0,   363,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,     0,   379,   380,   381,   382,     0,   383,   384,     0,
-     385,     0,   386,   387,   388,   389,   390,   391,     0,   392,
-       0,     0,   393,   394,   395,     0,     0,   396,   397,     0,
-     398,     0,   399,   400,   401,   402,   403,   404,   405,   406,
-       0,   407,   408,   409,   410,   411,   412,   413,   414,     0,
-     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,   436,   437,   438,     0,   439,   440,     0,   441,
-     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
-     452,     0,   453,   454,   455,   456,   457,     0,   458,   459,
-     460,   461,   462,     0,   463,   464,   465,   466,     0,   467,
-     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
-     478,     0,   479,   480,     0,   481,     0,   482,   483,   484,
-     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
-     492,   493,     0,   494,   495,   496,   497,   498,   499,   500,
-       0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
-     507,   508,   509,   510,   511,   512,     0,   513,     0,   514,
-     515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
-     521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
-     531,   532,   533,   534,   535,   536,   977,     0,     0,     0,
-       0,     0,     0,     0,     0,   740,     0,     0,     0,     0,
-       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
+     532,   533,   534,   535,   536,     0,   219,     0,   835,   836,
+     837,   829,   838,   839,   840,   841,   842,   843,   830,   831,
+     832,   220,   221,   222,   223,   224,   225,   226,   227,     0,
      229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
-     232,   233,     0,   234,   235,   772,   236,   237,   238,     0,
-     978,   773,   979,   980,     0,   243,   244,   245,   246,   247,
-       0,     0,   248,   249,   981,   982,   252,     0,   253,   254,
-     255,   256,     0,     0,   774,     0,   258,   259,   260,   261,
-     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
-     270,     0,   776,   271,   272,   273,     0,     0,     0,   777,
-       0,     0,     0,   274,   275,   276,   277,   278,   279,   983,
-     984,   282,     0,   283,     0,   284,   285,   286,   287,   288,
-       0,   289,   290,   291,     0,     0,   292,   293,   985,   295,
+     232,   233,     0,   234,   235,     0,   236,   237,   238,   239,
+     240,     0,   241,   242,     0,   243,   244,   245,   246,   247,
+       0,     0,   248,   249,   250,   251,   252,     0,   253,   936,
+     255,   256,   257,     0,     0,     0,   258,   259,   260,   261,
+       0,   262,   263,   264,     0,   265,   266,   267,   268,   269,
+     270,     0,     0,   271,   272,   273,     0,     0,     0,     0,
+       0,     0,     0,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,     0,   283,     0,   284,   285,   286,   287,   288,
+       0,   289,   290,   291,     0,     0,   292,   293,   294,   295,
      296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
-     303,   304,   305,   306,     0,   308,   309,   310,     0,     0,
-     312,     0,   313,   314,   986,   316,     0,   317,     0,   318,
-     778,     0,   779,   319,   320,   321,     0,   322,     0,     0,
-       0,   325,     0,   326,   327,   328,   329,   330,   780,   331,
-     332,   333,   334,  1985,   335,   336,   337,   338,   339,   340,
-       0,   341,   781,  1986,   343,   344,   345,   346,   988,   989,
-       0,   990,     0,   350,   782,   783,   351,   784,   352,   353,
-     354,   355,   356,     0,     0,   357,     0,   785,   359,   786,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
+     937,     0,   313,   314,   315,   316,     0,   317,     0,   318,
+       0,     0,     0,   319,   320,   321,     0,   322,   323,     0,
+     324,   325,     0,   326,   327,   328,   329,   330,     0,   331,
+     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
+       0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
+       0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
+     354,   355,   356,     0,     0,   357,   358,     0,   359,     0,
        0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
      367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   991,   787,   992,   380,   381,     0,     0,   383,   384,
-     788,   385,     0,     0,   387,   993,   389,   390,   391,     0,
-     392,     0,     0,   393,   394,   395,     0,  1987,   396,  1988,
-     789,   398,   790,     0,   400,   401,   402,   403,   404,   405,
-     406,     0,   407,   408,     0,   410,     0,   412,   413,   414,
-       0,   415,   416,   417,   418,   419,   420,   421,   422,   994,
+     377,   378,     0,   379,   380,   381,   382,     0,   383,   384,
+       0,   385,     0,   386,   387,   388,   389,   390,   391,     0,
+     392,     0,     0,   393,   394,   395,     0,     0,   396,   397,
+       0,   398,     0,   399,   400,   401,   402,   403,   404,   405,
+     406,     0,   407,   408,   409,   410,   411,   412,   413,   414,
+       0,   415,   416,   417,   418,   419,   420,   421,   422,   423,
      424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
-     441,   442,   443,     0,   445,   446,   447,   448,   449,   450,
+     433,   434,   435,   436,   437,   438,     0,   439,   440,     0,
+     441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
      451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
-     459,  1989,   461,   462,   792,   463,   464,   996,   466,     0,
+     459,   460,   461,   462,     0,   463,   464,   465,   466,     0,
      467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,     0,     0,   479,   480,     0,   481,   793,   482,   483,
-     484,   485,   486,     0,   997,   998,     0,     0,   489,   490,
-       0,   492,     0,     0,   494,   495,   496,   497,   498,   499,
+     477,   478,     0,   479,   480,     0,   481,     0,   482,   483,
+     484,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,   496,   497,   498,   499,
      500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
-     506,   507,   508,   509,   510,     0,   999,  1990,   513,   794,
+     506,   507,   508,   509,   510,   511,   512,     0,   513,     0,
      514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
-     520,   521,   522,   523,   524,     0,     0,     0,     0,     0,
-       0,     0,  2255,     0,   534,   535,   536,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1991,   220,   221,   222,
-     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
-       0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
-     235,   772,   236,   237,   238,     0,   978,   773,   979,   980,
-       0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
-     981,   982,   252,     0,   253,   254,   255,   256,     0,     0,
-     774,     0,   258,   259,   260,   261,   775,   262,   263,   264,
-       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
-     272,   273,     0,     0,     0,   777,     0,     0,     0,   274,
-     275,   276,   277,   278,   279,   983,   984,   282,     0,   283,
-       0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
-       0,     0,   292,   293,   985,   295,   296,     0,   297,   298,
-     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
-       0,   308,   309,   310,     0,     0,   312,     0,   313,   314,
-     986,   316,     0,   317,     0,   318,   778,     0,   779,   319,
-     320,   321,     0,   322,     0,     0,     0,   325,     0,   326,
-     327,   328,   329,   330,   780,   331,   332,   333,   334,  1985,
-     335,   336,   337,   338,   339,   340,     0,   341,   781,  1986,
-     343,   344,   345,   346,   988,   989,     0,   990,     0,   350,
-     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
-       0,   357,     0,   785,   359,   786,     0,   360,   361,   362,
-       0,     0,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   991,   787,   992,
-     380,   381,     0,     0,   383,   384,   788,   385,     0,     0,
-     387,   993,   389,   390,   391,     0,   392,     0,     0,   393,
-     394,   395,     0,  1987,   396,  1988,   789,   398,   790,     0,
-     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
-       0,   410,     0,   412,   413,   414,     0,   415,   416,   417,
-     418,   419,   420,   421,   422,   994,   424,   425,   426,   427,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,     0,   439,   440,   791,   441,   442,   443,     0,
-     445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
-     454,   455,   456,   457,     0,   458,   459,  1989,   461,   462,
-     792,   463,   464,   996,   466,     0,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,     0,     0,   479,
-     480,     0,   481,   793,   482,   483,   484,   485,   486,     0,
-     997,   998,     0,     0,   489,   490,     0,   492,     0,     0,
-     494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
-     502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
-     510,     0,   999,  1990,   513,   794,   514,   515,   516,   517,
-       0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
-     524,     0,     0,     0,     0,     0,     0,     0,   219,     0,
-     534,   535,   536,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1991,   220,   221,   222,   223,   224,   225,   226,
+     520,   521,   522,   523,   524,   525,   526,   527,   528,   529,
+     530,   531,   532,   533,   534,   535,   536,     0,   219,     0,
+     835,   836,   837,   829,   838,   839,   840,   841,   842,   843,
+     830,   831,   832,   220,   221,   222,   223,   224,   225,   226,
      227,     0,   229,   230,   231,     0,     0,     0,     0,     0,
        0,     0,   232,   233,     0,   234,   235,     0,   236,   237,
      238,   239,   240,     0,   241,   242,     0,   243,   244,   245,
      246,   247,     0,     0,   248,   249,   250,   251,   252,     0,
-     253,   254,   255,   256,   257,     0,     0,     0,   258,   259,
+     253,  1027,   255,   256,   257,     0,     0,     0,   258,   259,
      260,   261,     0,   262,   263,   264,     0,   265,   266,   267,
      268,   269,   270,     0,     0,   271,   272,   273,     0,     0,
        0,     0,     0,     0,     0,   274,   275,   276,   277,   278,
@@ -7338,9 +6950,9 @@
      287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
      294,   295,   296,     0,   297,   298,   299,     0,   300,   301,
      302,     0,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,     0,   312,     0,   313,   314,   315,   316,     0,   317,
+     311,     0,  1028,     0,   313,   314,   315,   316,     0,   317,
        0,   318,     0,     0,     0,   319,   320,   321,     0,   322,
-     323,     0,   324,   325,     0,   326,   327,   328,   329,   330,
+     323,     0,   324,   325,     0,   326,   327,   328,   329,  1029,
        0,   331,   332,   333,   334,     0,   335,   336,   337,   338,
      339,   340,     0,   341,     0,   342,   343,   344,   345,   346,
      347,   348,     0,   349,     0,   350,     0,     0,   351,     0,
@@ -7366,569 +6978,396 @@
        0,     0,   506,   507,   508,   509,   510,   511,   512,     0,
      513,     0,   514,   515,   516,   517,     0,     0,   518,     0,
        0,   519,   520,   521,   522,   523,   524,   525,   526,   527,
-     528,   529,   530,   531,   532,   533,   534,   535,   536,   815,
-    1392,   593,     0,     0,     0,   646,     0,     0,  4515,     0,
-       0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
-     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
-       0,     0,     0,   232,   233,     0,   234,   235,   772,   236,
-     237,   238,   239,   240,   773,   241,   242,     0,   243,   244,
-     245,   246,   247,     0,     0,   248,   249,   250,   251,   252,
-       0,   253,   254,   255,   256,   257,     0,   774,     0,   258,
-     259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
-     267,   268,   269,   270,     0,   776,   271,   272,   273,     0,
-       0,     0,   777,     0,     0,     0,   274,   275,   276,   277,
-     278,   279,   280,   281,   282,  1837,   283,     0,   284,   285,
-     286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
-     293,   294,   295,   296,     0,   297,   298,   299,     0,   300,
-     301,   302,     0,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,  1661,   312,     0,   313,   314,   315,   316,     0,
-     317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
-     322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
-     330,   780,   331,   332,   333,   334,     0,   335,   336,   337,
-     338,   339,   340,     0,   341,   781,   342,   343,   344,   345,
-     346,   347,   348,     0,   349,     0,   350,   782,   783,   351,
-     784,   352,   353,   354,   355,   356,     0,     0,   357,   358,
-     785,   359,   786,     0,   360,   361,   362,     0,     0,   363,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,   378,   787,   379,   380,   381,   382,
-       0,   383,   384,   788,   385,     0,   386,   387,   388,   389,
-     390,   391,     0,   392,  1662,     0,   393,   394,   395,     0,
-       0,   396,   397,   789,   398,   790,   399,   400,   401,   402,
-     403,   404,   405,   406,     0,   407,   408,   409,   410,   411,
-     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
-     439,   440,   791,   441,   442,   443,   444,   445,   446,   447,
-     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
-     457,     0,   458,   459,   460,   461,   462,   792,   463,   464,
-     465,   466,     0,   467,   468,   469,   470,   471,   472,   473,
-     474,   475,   476,   477,   478,     0,   479,   480,     0,   481,
-     793,   482,   483,   484,   485,   486,     0,   487,   488,     0,
-       0,   489,   490,   491,   492,   493,  1663,   494,   495,   496,
-     497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
-     505,     0,     0,   506,   507,   508,   509,   510,   511,   512,
-       0,   513,   794,   514,   515,   516,   517,     0,     0,   518,
-       0,     0,   519,   520,   521,   522,   523,   524,   525,   526,
-     527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
-     815,  1392,   593,     0,     0,     0,   646,   658,  1393,     0,
-       0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
+     528,   529,   530,   531,   532,   533,   534,   535,   536,     0,
+     219,     0,   835,   836,   837,   829,   838,   839,   840,   841,
+     842,   843,   830,   831,   832,   220,   221,   222,   223,   224,
      225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
-       0,     0,     0,     0,   232,   233,     0,   234,   235,   772,
-     236,   237,   238,   239,   240,   773,   241,   242,     0,   243,
+       0,     0,     0,     0,   232,   233,     0,   234,   235,     0,
+     236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
      244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
-     252,     0,   253,   254,   255,   256,   257,     0,   774,     0,
-     258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
-     266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
-       0,     0,     0,   777,     0,     0,     0,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,  1842,   283,     0,   284,
+     252,     0,   253,  1492,   255,   256,   257,     0,     0,     0,
+     258,   259,   260,   261,     0,   262,   263,   264,     0,   265,
+     266,   267,   268,   269,   270,     0,     0,   271,   272,   273,
+       0,     0,     0,     0,     0,     0,     0,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
      285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
      292,   293,   294,   295,   296,     0,   297,   298,   299,     0,
      300,   301,   302,     0,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,  1661,   312,     0,   313,   314,   315,   316,
-       0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
+     309,   310,   311,     0,  1493,     0,   313,   314,   315,   316,
+       0,   317,     0,   318,     0,     0,     0,   319,   320,   321,
        0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
-     329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
-     337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
-     345,   346,   347,   348,     0,   349,     0,   350,   782,   783,
-     351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
-     358,   785,   359,   786,     0,   360,   361,   362,     0,     0,
+     329,   330,     0,   331,   332,   333,   334,     0,   335,   336,
+     337,   338,   339,   340,     0,   341,     0,   342,   343,   344,
+     345,   346,   347,   348,     0,   349,     0,   350,     0,     0,
+     351,     0,   352,   353,   354,   355,   356,     0,     0,   357,
+     358,     0,   359,     0,     0,   360,   361,   362,     0,     0,
      363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,   787,   379,   380,   381,
-     382,     0,   383,   384,   788,   385,     0,   386,   387,   388,
-     389,   390,   391,     0,   392,  1662,     0,   393,   394,   395,
-       0,     0,   396,   397,   789,   398,   790,   399,   400,   401,
+     373,   374,   375,   376,   377,   378,     0,   379,   380,   381,
+     382,     0,   383,   384,     0,   385,     0,   386,   387,   388,
+     389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
+       0,     0,   396,   397,     0,   398,     0,   399,   400,   401,
      402,   403,   404,   405,   406,     0,   407,   408,   409,   410,
      411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,   791,   441,   442,   443,   444,   445,   446,
+       0,   439,   440,     0,   441,   442,   443,   444,   445,   446,
      447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,     0,   458,   459,   460,   461,   462,   792,   463,
+     456,   457,     0,   458,   459,   460,   461,   462,     0,   463,
      464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
      473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
-     481,   793,   482,   483,   484,   485,   486,     0,   487,   488,
-       0,     0,   489,   490,   491,   492,   493,  1663,   494,   495,
+     481,     0,   482,   483,   484,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
      496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
      504,   505,     0,     0,   506,   507,   508,   509,   510,   511,
-     512,     0,   513,   794,   514,   515,   516,   517,     0,     0,
+     512,     0,   513,     0,   514,   515,   516,   517,     0,     0,
      518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
      526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
-     536,   815,  1392,   593,     0,     0,     0,   646,   658,  1393,
-       0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
-     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
-       0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
-     772,   236,   237,   238,   239,   240,   773,   241,   242,     0,
-     243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
-     251,   252,     0,   253,   254,   255,   256,   257,     0,   774,
-       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
-     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
-     273,     0,     0,     0,   777,     0,     0,     0,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,     0,   283,     0,
-     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
-       0,   292,   293,   294,   295,   296,     0,   297,   298,   299,
-       0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,  1661,   312,     0,   313,   314,   315,
-     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
-     321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
-     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
-     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
-     344,   345,   346,   347,   348,     0,   349,     0,   350,   782,
-     783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
-     357,   358,   785,   359,   786,     0,   360,   361,   362,     0,
-       0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,   787,   379,   380,
-     381,   382,     0,   383,   384,   788,   385,     0,   386,   387,
-     388,   389,   390,   391,     0,   392,  1662,     0,   393,   394,
-     395,     0,     0,   396,   397,   789,   398,   790,   399,   400,
-     401,   402,   403,   404,   405,   406,     0,   407,   408,   409,
-     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,   791,   441,   442,   443,   444,   445,
-     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
-     455,   456,   457,     0,   458,   459,   460,   461,   462,   792,
-     463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
-       0,   481,   793,   482,   483,   484,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,  1663,   494,
-     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
-     503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
-     511,   512,     0,   513,   794,   514,   515,   516,   517,     0,
-       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
-     525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,   815,     0,   593,     0,     0,     0,   646,   658,
-    1393,     0,     0,     0,     0,     0,     0,   220,   221,   222,
+     536,     0,   219,     0,   835,   836,   837,   829,   838,   839,
+     840,   841,   842,   843,   830,   831,   832,   220,   221,   222,
      223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
        0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
-     235,   772,   236,   237,   238,   239,   240,   773,   241,   242,
+     235,     0,   236,   237,   238,   239,   240,     0,   241,   242,
        0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
      250,   251,   252,     0,   253,   254,   255,   256,   257,     0,
-     774,     0,   258,   259,   260,   261,   775,   262,   263,   264,
-       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
-     272,   273,     0,     0,     0,   777,     0,     0,     0,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,  2707,   283,
+       0,     0,   258,   259,   260,   261,     0,   262,   263,   264,
+       0,   265,   266,   267,   268,   269,   270,     0,     0,   271,
+     272,   273,     0,     0,     0,     0,     0,     0,     0,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,     0,   283,
        0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
        0,     0,   292,   293,   294,   295,   296,     0,   297,   298,
      299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,  1661,   312,     0,   313,   314,
-     315,   316,     0,   317,     0,   318,   778,     0,   779,   319,
+     307,   308,   309,   310,   311,     0,   312,     0,   313,   314,
+     315,   316,     0,   317,     0,   318,     0,     0,     0,   319,
      320,   321,     0,   322,   323,     0,   324,   325,     0,   326,
-     327,   328,   329,   330,   780,   331,   332,   333,   334,     0,
-     335,   336,   337,   338,   339,   340,     0,   341,   781,   342,
+     327,   328,   329,   330,     0,   331,   332,   333,   334,     0,
+     335,   336,   337,   338,   339,   340,     0,   341,     0,   342,
      343,   344,   345,   346,   347,   348,     0,   349,     0,   350,
-     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
-       0,   357,   358,   785,   359,   786,     0,   360,   361,   362,
+       0,     0,   351,     0,   352,   353,   354,   355,   356,     0,
+       0,   357,   358,     0,   359,     0,     0,   360,   361,   362,
        0,     0,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   378,   787,   379,
-     380,   381,   382,     0,   383,   384,   788,   385,     0,   386,
-     387,   388,   389,   390,   391,     0,   392,  1662,     0,   393,
-     394,   395,     0,     0,   396,   397,   789,   398,   790,   399,
-     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
-     409,   410,   411,   412,   413,   414,     0,   415,   416,   417,
+     371,   372,   373,   374,   375,   376,   377,   378,     0,   379,
+     380,   381,   382,     0,   383,   384,     0,   385,     0,   386,
+     387,   388,   389,   390,   391,     0,   392,     0,     0,   393,
+     394,   395,     0,     0,   396,   397,     0,   398,     0,   399,
+     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
+     409,   410,   411,   412,   413,   414,     0,   415,   416,   417,
      418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
        0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,     0,   439,   440,   791,   441,   442,   443,   444,
+     437,   438,     0,   439,   440,     0,   441,   442,   443,   444,
      445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
      454,   455,   456,   457,     0,   458,   459,   460,   461,   462,
-     792,   463,   464,   465,   466,     0,   467,   468,   469,   470,
+       0,   463,   464,   465,   466,     0,   467,   468,   469,   470,
      471,   472,   473,   474,   475,   476,   477,   478,     0,   479,
-     480,     0,   481,   793,   482,   483,   484,   485,   486,     0,
-     487,   488,     0,     0,   489,   490,   491,   492,   493,  1663,
+     480,     0,   481,     0,   482,   483,   484,   485,   486,     0,
+     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
      494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
      502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
-     510,   511,   512,     0,   513,   794,   514,   515,   516,   517,
+     510,   511,   512,     0,   513,     0,   514,   515,   516,   517,
        0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
      524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
-     534,   535,   536,   219,     0,     0,     0,     0,     0,   646,
-     658,   659,     0,     0,     0,     0,     0,     0,   220,   647,
-     222,   223,   224,   225,   226,   227,   648,   229,   230,   231,
-       0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
-     234,   235,     0,   649,   237,   238,   239,   240,     0,   241,
-     242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
-     249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
-       0,     0,     0,   258,   259,   260,   261,     0,   262,   263,
-     264,     0,   265,   266,   267,   268,   269,   270,     0,     0,
-     271,   272,   273,     0,     0,     0,     0,     0,     0,     0,
-     274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
-     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
-     291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
-     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
-     650,   315,   316,     0,   317,     0,   651,     0,   652,     0,
-     319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
-     326,   327,   328,   329,   330,     0,   331,   332,   333,   334,
-     653,   335,   336,   337,   338,   339,   340,     0,   341,     0,
-     342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
-     350,     0,     0,   351,     0,   352,   353,   354,   355,   654,
-       0,     0,   357,   358,     0,   359,     0,     0,   360,   361,
-     362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   378,     0,
-     379,   655,   381,   382,     0,   383,   384,     0,   385,     0,
-     386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
-     393,   394,   395,     0,     0,   396,   397,     0,   398,     0,
-     399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
-     408,   409,   410,   411,   412,   413,   414,     0,   656,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,     0,   428,   429,   657,   431,   432,   433,   434,   435,
-     436,   437,   438,     0,   439,   440,     0,   441,   442,   443,
-     444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
-     453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
-     462,     0,   463,   464,   465,   466,     0,   467,   468,   469,
-     470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
-     479,   480,     0,   481,     0,   482,   483,   484,   485,   486,
-       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
-       0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
-     501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
-     509,   510,   511,   512,     0,   513,     0,   514,   515,   516,
-     517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
-     523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   535,   536,  1847,  4877,   593,     0,     0,     0,
-     646,   658,   659,     0,     0,     0,     0,     0,     0,   220,
-     221,   222,   223,   224,   225,   226,   227,  1848,   229,   230,
-     231,  1849,  1850,  1851,  1852,  1853,  1854,  1855,   232,   233,
-    1856,   234,   235,   772,   236,   237,   238,   239,   240,   773,
-     241,   242,  1857,   243,   244,   245,   246,   247,  1858,  1859,
-     248,   249,   250,   251,   252,  1860,   253,   254,   255,   256,
-     257,  1861,   774,  1862,   258,   259,   260,   261,   775,   262,
-     263,   264,  1863,   265,   266,   267,   268,   269,   270,  1864,
-     776,   271,   272,   273,  1865,  1866,  1867,   777,  1868,  1869,
-    1870,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-    1871,   283,  1872,   284,   285,   286,   287,   288,  1873,   289,
-     290,   291,  1874,  1875,   292,   293,   294,   295,   296,  1876,
-     297,   298,   299,  1877,   300,   301,   302,  1878,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,  1879,   312,  1880,
-     313,   314,   315,   316,  1881,   317,  1882,   318,   778,  1883,
-     779,   319,   320,   321,  1884,   322,   323,  1885,   324,   325,
-    1886,   326,   327,   328,   329,   330,   780,   331,   332,   333,
-     334,  1887,   335,   336,   337,   338,   339,   340,  1888,   341,
-     781,   342,   343,   344,   345,   346,   347,   348,  1889,   349,
-    1890,   350,   782,   783,   351,   784,   352,   353,   354,   355,
-     356,  1891,  1892,   357,   358,   785,   359,   786,  1893,   360,
-     361,   362,  1894,  1895,   363,   364,   365,   366,   367,   368,
+     534,   535,   536,     0,   219,     0,   835,   836,   837,   829,
+     838,   839,   840,   841,   842,   843,   830,   831,   832,   220,
+     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
+     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
+       0,   234,   235,     0,   236,   237,   238,   239,   240,     0,
+     241,   242,     0,   243,   244,   245,   246,   247,     0,     0,
+     248,   249,   250,   251,   252,     0,   253,  2758,   255,   256,
+     257,     0,     0,     0,   258,   259,   260,   261,     0,   262,
+     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
+       0,   271,   272,   273,     0,     0,     0,     0,     0,     0,
+       0,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
+     290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
+     297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,     0,  2759,     0,
+     313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
+       0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
+       0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
+     334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
+       0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
+       0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
+     356,     0,     0,   357,   358,     0,   359,     0,     0,   360,
+     361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
      369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     787,   379,   380,   381,   382,  1896,   383,   384,   788,   385,
-    1897,   386,   387,   388,   389,   390,   391,  1898,   392,  1899,
-    1900,   393,   394,   395,  1901,  1902,   396,   397,   789,   398,
-     790,   399,   400,   401,   402,   403,   404,   405,   406,  1903,
-     407,   408,   409,   410,   411,   412,   413,   414,  1904,   415,
+       0,   379,   380,   381,   382,     0,   383,   384,     0,   385,
+       0,   386,   387,   388,   389,   390,   391,     0,   392,     0,
+       0,   393,   394,   395,     0,     0,   396,   397,     0,   398,
+       0,   399,   400,   401,   402,   403,   404,   405,   406,     0,
+     407,   408,   409,   410,   411,   412,   413,   414,     0,   415,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,  1905,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,  1906,   439,   440,   791,   441,   442,
+     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,     0,   439,   440,     0,   441,   442,
      443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
-    1907,   453,   454,   455,   456,   457,  1908,   458,   459,   460,
-     461,   462,   792,   463,   464,   465,   466,  1909,   467,   468,
+       0,   453,   454,   455,   456,   457,     0,   458,   459,   460,
+     461,   462,     0,   463,   464,   465,   466,     0,   467,   468,
      469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
-    1910,   479,   480,  1911,   481,   793,   482,   483,   484,   485,
-     486,  1912,   487,   488,  1913,  1914,   489,   490,   491,   492,
-     493,  1915,   494,   495,   496,   497,   498,   499,   500,  1916,
-    1917,   501,   502,   503,   504,   505,  1918,  1919,   506,   507,
-     508,   509,   510,   511,   512,  1920,   513,   794,   514,   515,
-     516,   517,  1921,  1922,   518,  1923,  1924,   519,   520,   521,
+       0,   479,   480,     0,   481,     0,   482,   483,   484,   485,
+     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
+       0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
+     508,   509,   510,   511,   512,     0,   513,     0,   514,   515,
+     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
      522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
-     532,   533,   534,   535,   536,  1847,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     220,   221,   222,   223,   224,   225,   226,   227,  1848,   229,
-     230,   231,  1849,  1850,  1851,  1852,  1853,  1854,  1855,   232,
-     233,  1856,   234,   235,   772,   236,   237,   238,   239,   240,
-     773,   241,   242,  1857,   243,   244,   245,   246,   247,  1858,
-    1859,   248,   249,   250,   251,   252,  1860,   253,   254,   255,
-     256,   257,  1861,   774,  1862,   258,   259,   260,   261,   775,
-     262,   263,   264,  1863,   265,   266,   267,   268,   269,   270,
-    1864,   776,   271,   272,   273,  1865,  1866,  1867,   777,  1868,
-    1869,  1870,   274,   275,   276,   277,   278,   279,   280,   281,
-     282,  1871,   283,  1872,   284,   285,   286,   287,   288,  1873,
-     289,   290,   291,  1874,  1875,   292,   293,   294,   295,   296,
-    1876,   297,   298,   299,  1877,   300,   301,   302,  1878,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,  1879,   312,
-    1880,   313,   314,   315,   316,  1881,   317,  1882,   318,   778,
-    1883,   779,   319,   320,   321,  1884,   322,   323,  1885,   324,
-     325,  1886,   326,   327,   328,   329,   330,   780,   331,   332,
-     333,   334,  1887,   335,   336,   337,   338,   339,   340,  1888,
-     341,   781,   342,   343,   344,   345,   346,   347,   348,  1889,
-     349,  1890,   350,   782,   783,   351,   784,   352,   353,   354,
-     355,   356,  1891,  1892,   357,   358,   785,   359,   786,  1893,
-     360,   361,   362,  1894,  1895,   363,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,   787,   379,   380,   381,   382,  1896,   383,   384,   788,
-     385,  1897,   386,   387,   388,   389,   390,   391,  1898,   392,
-    1899,  1900,   393,   394,   395,  1901,  1902,   396,   397,   789,
-     398,   790,   399,   400,   401,   402,   403,   404,   405,   406,
-    1903,   407,   408,   409,   410,   411,   412,   413,   414,  1904,
-     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,  1905,   428,   429,   430,   431,   432,   433,
-     434,   435,   436,   437,   438,  1906,   439,   440,   791,   441,
-     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
-     452,  1907,   453,   454,   455,   456,   457,  1908,   458,   459,
-     460,   461,   462,   792,   463,   464,   465,   466,  1909,   467,
-     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
-     478,  1910,   479,   480,  1911,   481,   793,   482,   483,   484,
-     485,   486,  1912,   487,   488,  1913,  1914,   489,   490,   491,
-     492,   493,  1915,   494,   495,   496,   497,   498,   499,   500,
-    1916,  1917,   501,   502,   503,   504,   505,  1918,  1919,   506,
-     507,   508,   509,   510,   511,   512,  1920,   513,   794,   514,
-     515,   516,   517,  1921,  1922,   518,  1923,  1924,   519,   520,
-     521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
-     531,   532,   533,   534,   535,   536,  1847,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   220,   221,   222,   223,  2816,   225,   226,   227,  1848,
-     229,   230,   231,  1849,  1850,  1851,  1852,  1853,  1854,  1855,
-     232,   233,  1856,   234,   235,   772,   236,   237,   238,   239,
-     240,   773,   241,   242,  1857,   243,   244,   245,   246,   247,
-    1858,  1859,   248,   249,   250,   251,   252,  1860,   253,   254,
-     255,   256,   257,  1861,   774,  1862,   258,   259,   260,   261,
-     775,   262,   263,   264,  1863,   265,   266,   267,   268,   269,
-     270,  1864,   776,   271,   272,   273,  1865,  1866,  1867,   777,
-    1868,  1869,  1870,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,  1871,   283,  1872,   284,   285,   286,   287,   288,
-    1873,   289,   290,   291,  1874,  1875,   292,   293,   294,  2817,
-     296,  1876,   297,   298,   299,  1877,   300,   301,   302,  1878,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,  1879,
-     312,  1880,   313,   314,   315,   316,  1881,   317,  1882,   318,
-     778,  1883,   779,   319,   320,   321,  1884,   322,   323,  1885,
-     324,   325,  1886,   326,   327,   328,   329,   330,   780,   331,
-     332,   333,   334,  1887,   335,   336,   337,   338,   339,   340,
-    1888,   341,   781,   342,   343,   344,   345,   346,   347,   348,
-    1889,   349,  1890,   350,   782,   783,   351,   784,   352,   353,
-     354,   355,   356,  1891,  1892,   357,   358,   785,   359,   786,
-    1893,   360,   361,   362,  1894,  1895,   363,   364,   365,   366,
+     532,   533,   534,   535,   536,     0,   219,     0,   835,   836,
+     837,   829,   838,   839,   840,   841,   842,   843,   830,   831,
+     832,   220,   221,   222,   223,   224,   225,   226,   227,     0,
+     229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
+     232,   233,     0,   234,   235,     0,   236,   237,   238,   239,
+     240,     0,   241,   242,     0,   243,   244,   245,   246,   247,
+       0,     0,   248,   249,   250,   251,   252,     0,   253,   254,
+     255,   256,   257,     0,     0,     0,   258,   259,   260,   261,
+       0,   262,   263,   264,     0,   265,   266,   267,   268,   269,
+     270,     0,     0,   271,   272,   273,     0,     0,     0,     0,
+       0,     0,     0,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,     0,   283,     0,   284,   285,   286,   287,   288,
+       0,   289,   290,   291,     0,     0,   292,   293,   294,   295,
+     296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
+     312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
+       0,     0,     0,   319,   320,   321,     0,   322,   323,     0,
+     324,   325,     0,   326,   327,   328,   329,   330,     0,   331,
+     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
+       0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
+       0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
+     354,   355,   356,     0,     0,   357,   358,     0,   359,     0,
+       0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
      367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   787,   379,   380,   381,   382,  1896,   383,   384,
-     788,   385,  1897,   386,   387,   388,   389,   390,   391,  1898,
-     392,  1899,  1900,   393,   394,   395,  1901,  1902,   396,   397,
-     789,   398,   790,   399,   400,   401,   402,   403,   404,   405,
-     406,  1903,   407,   408,   409,   410,   411,   412,   413,   414,
-    1904,   415,   416,   417,   418,   419,   420,   421,   422,   423,
-     424,   425,   426,   427,  1905,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,  1906,   439,   440,   791,
+     377,   378,     0,   379,   380,   381,   382,     0,   383,   384,
+       0,   385,     0,   386,   387,   388,   389,   390,   391,     0,
+     392,     0,     0,  4467,   394,   395,     0,     0,   396,   397,
+       0,   398,     0,   399,   400,   401,   402,   403,   404,   405,
+     406,     0,   407,   408,   409,   410,   411,   412,   413,   414,
+       0,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,   436,   437,   438,     0,   439,   440,     0,
      441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
-     451,   452,  1907,   453,   454,   455,   456,   457,  1908,  2818,
-     459,   460,   461,   462,   792,   463,   464,   465,   466,  1909,
+     451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
+     459,   460,   461,   462,     0,   463,   464,   465,   466,     0,
      467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,   478,  1910,   479,   480,  1911,   481,   793,   482,   483,
-     484,   485,   486,  1912,   487,   488,  1913,  1914,   489,   490,
-     491,   492,   493,  1915,   494,   495,   496,   497,   498,   499,
-     500,  1916,  1917,   501,   502,   503,   504,   505,  1918,  1919,
-     506,   507,   508,   509,   510,   511,   512,  1920,   513,   794,
-     514,   515,   516,   517,  1921,  1922,   518,  1923,  1924,   519,
+     477,   478,     0,   479,   480,     0,   481,     0,   482,   483,
+     484,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,   496,   497,   498,   499,
+     500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
+     506,   507,   508,   509,   510,   511,   512,     0,   513,     0,
+     514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
      520,   521,   522,   523,   524,   525,   526,   527,   528,   529,
-     530,   531,   532,   533,   534,   535,   536,   771,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     530,   531,   532,   533,   534,   535,   536,  1849,     0,     0,
+     835,   836,   837,     0,   838,   839,   840,   841,   842,   843,
        0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
-       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
-       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
-     239,   240,   773,   241,   242,     0,   243,   244,   245,   246,
-     247,     0,  1132,   248,   249,   250,   251,   252,     0,   253,
-     254,   255,   256,  1135,     0,  1136,     0,   258,   259,   260,
-     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
-     269,   270,     0,   776,   271,   272,   273,  1137,  1138,  1139,
-    1140,  1141,  1142,  1143,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,     0,   283,     0,   284,   285,   286,   287,
-     288,     0,   289,   290,   291,     0,     0,   292,   293,   294,
-     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
-       0,   303,   304,   305,   306,   307,   308,   309,   310,  1147,
-       0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
-     318,   778,     0,   779,   319,   320,   321,     0,   322,  1150,
-       0,   324,   325,     0,   326,   327,   328,   329,   330,   780,
-     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
-     340,     0,   341,   781,   342,   343,   344,   345,   346,   347,
-     348,     0,   349,     0,   350,   782,   783,   351,   784,   352,
-     353,   354,   355,   356,     0,     0,   357,  1155,   785,   359,
-     786,     0,   360,   361,   362,  1156,  1157,   363,   364,   365,
+    1850,   229,   230,   231,  1851,  1852,  1853,  1854,  1855,  1856,
+    1857,   232,   233,  1858,   234,   235,   772,   236,   237,   238,
+     239,   240,   773,   241,   242,  1859,   243,   244,   245,   246,
+     247,  1860,  1861,   248,   249,   250,   251,   252,  1862,   253,
+     254,   255,   256,   257,  1863,   774,  1864,   258,   259,   260,
+     261,   775,   262,   263,   264,  1865,   265,   266,   267,   268,
+     269,   270,  1866,   776,   271,   272,   273,  1867,  1868,  1869,
+     777,  1870,  1871,  1872,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,  1873,   283,  1874,   284,   285,   286,   287,
+     288,  1875,   289,   290,   291,  1876,  1877,   292,   293,   294,
+     295,   296,  1878,   297,   298,   299,  1879,   300,   301,   302,
+    1880,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+    1881,   312,  1882,   313,   314,   315,   316,  1883,   317,  1884,
+     318,   778,  1885,   779,   319,   320,   321,  1886,   322,   323,
+    1887,   324,   325,  1888,   326,   327,   328,   329,   330,   780,
+     331,   332,   333,   334,  1889,   335,   336,   337,   338,   339,
+     340,  1890,   341,   781,   342,   343,   344,   345,   346,   347,
+     348,  1891,   349,  1892,   350,   782,   783,   351,   784,   352,
+     353,   354,   355,   356,  1893,  1894,   357,   358,   785,   359,
+     786,  1895,   360,   361,   362,  1896,  1897,   363,   364,   365,
      366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   787,   379,   380,   381,   382,     0,   383,
-     384,   788,   385,     0,  1162,   387,   388,   389,   390,   391,
-       0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
-     397,   789,   398,   790,  1165,   400,   401,   402,   403,   404,
-     405,   406,     0,   407,   408,  1166,   410,   411,   412,   413,
-     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
+     376,   377,   378,   787,   379,   380,   381,   382,  1898,   383,
+     384,   788,   385,  1899,   386,   387,   388,   389,   390,   391,
+    1900,   392,  1901,  1902,   393,   394,   395,  1903,  1904,   396,
+     397,   789,   398,   790,   399,   400,   401,   402,   403,   404,
+     405,   406,  1905,   407,   408,   409,   410,   411,   412,   413,
+     414,  1906,   415,   416,   417,   418,   419,   420,   421,   422,
+     423,   424,   425,   426,   427,  1907,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,  1908,   439,   440,
      791,   441,   442,   443,   444,   445,   446,   447,   448,   449,
-     450,   451,   452,     0,   453,   454,   455,   456,   457,  1169,
+     450,   451,   452,  1909,   453,   454,   455,   456,   457,  1910,
      458,   459,   460,   461,   462,   792,   463,   464,   465,   466,
-       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,  1171,     0,   479,   480,     0,   481,   793,   482,
-     483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
-     490,  1174,   492,  1175,     0,   494,   495,   496,   497,   498,
-     499,   500,     0,     0,   501,   502,   503,   504,   505,  1178,
-       0,   506,   507,   508,   509,   510,   511,   512,     0,   513,
-     794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
-     519,   520,   521,   522,   523,   524,   525,  1180,  1181,  1182,
-    1183,  1184,  1185,  1186,  1187,   534,   535,   536,   815,     0,
-     593,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1911,   467,   468,   469,   470,   471,   472,   473,   474,   475,
+     476,   477,   478,  1912,   479,   480,  1913,   481,   793,   482,
+     483,   484,   485,   486,  1914,   487,   488,  1915,  1916,   489,
+     490,   491,   492,   493,  1917,   494,   495,   496,   497,   498,
+     499,   500,  1918,  1919,   501,   502,   503,   504,   505,  1920,
+    1921,   506,   507,   508,   509,   510,   511,   512,  1922,   513,
+     794,   514,   515,   516,   517,  1923,  1924,   518,  1925,  1926,
+     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
+     529,   530,   531,   532,   533,   534,   535,   536,   219,     0,
+       0,     0,     0,     0,     0,     0,     0,  1927,     0,     0,
        0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
      227,     0,   229,   230,   231,     0,     0,     0,     0,     0,
-       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
-     238,   239,   240,   773,   241,   242,     0,   243,   244,   245,
+       0,     0,   232,   233,     0,   234,   235,     0,   236,   237,
+     238,   239,   240,     0,   241,   242,     0,   243,   244,   245,
      246,   247,     0,     0,   248,   249,   250,   251,   252,     0,
-     253,   254,   255,   256,   257,     0,   774,     0,   258,   259,
-     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
-     268,   269,   270,     0,   776,   271,   272,   273,     0,     0,
-       0,   777,     0,     0,     0,   274,   275,   276,   277,   278,
+     253,   254,   255,   256,   257,     0,     0,     0,   258,   259,
+     260,   261,     0,   262,   263,   264,     0,   265,   266,   267,
+     268,   269,   270,     0,     0,   271,   272,   273,     0,     0,
+       0,     0,     0,     0,     0,   274,   275,   276,   277,   278,
      279,   280,   281,   282,     0,   283,     0,   284,   285,   286,
      287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
      294,   295,   296,     0,   297,   298,   299,     0,   300,   301,
      302,     0,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,  1661,   312,     0,   313,   314,   315,   316,     0,   317,
-       0,   318,   778,     0,   779,   319,   320,   321,     0,   322,
+     311,     0,   312,     0,   313,   314,   315,   316,     0,   317,
+       0,   318,     0,     0,     0,   319,   320,   321,     0,   322,
      323,     0,   324,   325,     0,   326,   327,   328,   329,   330,
-     780,   331,   332,   333,   334,     0,   335,   336,   337,   338,
-     339,   340,     0,   341,   781,   342,   343,   344,   345,   346,
-     347,   348,     0,   349,     0,   350,   782,   783,   351,   784,
-     352,   353,   354,   355,   356,     0,     0,   357,   358,   785,
-     359,   786,     0,   360,   361,   362,     0,     0,   363,   364,
+       0,   331,   332,   333,   334,     0,   335,   336,   337,   338,
+     339,   340,     0,   341,     0,   342,   343,   344,   345,   346,
+     347,   348,     0,   349,     0,   350,     0,     0,   351,     0,
+     352,   353,   354,   355,   356,     0,     0,   357,   358,     0,
+     359,     0,     0,   360,   361,   362,     0,     0,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   787,   379,   380,   381,   382,     0,
-     383,   384,   788,   385,     0,   386,   387,   388,   389,   390,
-     391,     0,   392,  1662,     0,   393,   394,   395,     0,     0,
-     396,   397,   789,   398,   790,   399,   400,   401,   402,   403,
+     375,   376,   377,   378,     0,   379,   380,   381,   382,     0,
+     383,   384,     0,   385,     0,   386,   387,   388,   389,   390,
+     391,     0,   392,     0,     0,   393,   394,   395,     0,     0,
+     396,   397,     0,   398,     0,   399,   400,   401,   402,   403,
      404,   405,   406,     0,   407,   408,   409,   410,   411,   412,
      413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
      422,   423,   424,   425,   426,   427,     0,   428,   429,   430,
      431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,   791,   441,   442,   443,   444,   445,   446,   447,   448,
+     440,     0,   441,   442,   443,   444,   445,   446,   447,   448,
      449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
-       0,   458,   459,   460,   461,   462,   792,   463,   464,   465,
+       0,   458,   459,   460,   461,   462,     0,   463,   464,   465,
      466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,   478,     0,   479,   480,     0,   481,   793,
+     475,   476,   477,   478,     0,   479,   480,     0,   481,     0,
      482,   483,   484,   485,   486,     0,   487,   488,     0,     0,
-     489,   490,   491,   492,   493,  1663,   494,   495,   496,   497,
+     489,   490,   491,   492,   493,     0,   494,   495,   496,   497,
      498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
        0,     0,   506,   507,   508,   509,   510,   511,   512,     0,
-     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
+     513,     0,   514,   515,   516,   517,     0,     0,   518,     0,
        0,   519,   520,   521,   522,   523,   524,   525,   526,   527,
-     528,   529,   530,   531,   532,   533,   534,   535,   536,   815,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     528,   529,   530,   531,   532,   533,   534,   535,   536,   978,
+       0,     0,     0,     0,     0,     0,     0,     0,   740,     0,
        0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
-     226,   227,   850,   229,   230,   231,     0,     0,     0,     0,
+     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
        0,     0,     0,   232,   233,     0,   234,   235,   772,   236,
-     237,   238,   239,   240,   773,   241,   242,     0,   243,   244,
-     245,   246,   247,     0,     0,   248,   249,   250,   251,   252,
-       0,   253,   254,   255,   256,   257,     0,   774,     0,   258,
+     237,   238,     0,   979,   773,   980,   981,     0,   243,   244,
+     245,   246,   247,     0,     0,   248,   249,   982,   983,   252,
+       0,   253,   254,   255,   256,     0,     0,   774,     0,   258,
      259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
      267,   268,   269,   270,     0,   776,   271,   272,   273,     0,
-       0,     0,   777,     0,     0,   816,   274,   275,   276,   277,
-     278,   279,   280,   281,   282,     0,   283,     0,   284,   285,
+       0,     0,   777,     0,     0,     0,   274,   275,   276,   277,
+     278,   279,   984,   985,   282,     0,   283,     0,   284,   285,
      286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
-     293,   294,   295,   296,     0,   297,   298,   299,     0,   300,
-     301,   302,     0,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
+     293,   986,   295,   296,     0,   297,   298,   299,     0,   300,
+     301,   302,     0,   303,   304,   305,   306,     0,   308,   309,
+     310,     0,     0,   312,     0,   313,   314,   987,   316,     0,
      317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
-     322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
-     330,   780,   331,   332,   333,   334,     0,   335,   336,   337,
-     338,   339,   340,     0,   341,   781,   342,   343,   344,   345,
-     346,   347,   348,     0,   349,     0,   350,   782,   783,   351,
-     784,   352,   353,   354,   355,   356,     0,     0,   357,   358,
+     322,     0,     0,     0,   325,     0,   326,   327,   328,   329,
+     330,   780,   331,   332,   333,   334,  1987,   335,   336,   337,
+     338,   339,   340,     0,   341,   781,  1988,   343,   344,   345,
+     346,   989,   990,     0,   991,     0,   350,   782,   783,   351,
+     784,   352,   353,   354,   355,   356,     0,     0,   357,     0,
      785,   359,   786,     0,   360,   361,   362,     0,     0,   363,
      364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,   378,   787,   379,   380,   381,   382,
-       0,   383,   384,   788,   385,     0,   386,   387,   388,   389,
+     374,   375,   376,   377,   992,   787,   993,   380,   381,     0,
+       0,   383,   384,   788,   385,     0,     0,   387,   994,   389,
      390,   391,     0,   392,     0,     0,   393,   394,   395,     0,
-       0,   396,   397,   789,   398,   790,   399,   400,   401,   402,
-     403,   404,   405,   406,     0,   407,   408,   409,   410,   411,
+    1989,   396,  1990,   789,   398,   790,     0,   400,   401,   402,
+     403,   404,   405,   406,     0,   407,   408,     0,   410,     0,
      412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,     0,   428,   429,
+     421,   422,   995,   424,   425,   426,   427,     0,   428,   429,
      430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
-     439,   440,   791,   441,   442,   443,   444,   445,   446,   447,
+     439,   440,   791,   441,   442,   443,     0,   445,   446,   447,
      448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
-     457,   817,   458,   459,   460,   461,   462,   792,   463,   464,
-     465,   466,     0,   467,   468,   469,   470,   471,   472,   473,
-     474,   475,   476,   477,   478,     0,   479,   480,     0,   481,
-     793,   482,   483,   484,   485,   486,     0,   487,   488,     0,
-       0,   489,   490,   491,   492,   493,     0,   494,   495,   496,
+     457,     0,   458,   459,  1991,   461,   462,   792,   463,   464,
+     997,   466,     0,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,     0,     0,   479,   480,     0,   481,
+     793,   482,   483,   484,   485,   486,     0,   998,   999,     0,
+       0,   489,   490,     0,   492,     0,     0,   494,   495,   496,
      497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
-     505,     0,     0,   506,   507,   508,   509,   510,   511,   512,
-       0,   513,   794,   514,   515,   516,   517,     0,     0,   518,
-       0,     0,   519,   520,   521,   522,   523,   524,   525,   526,
-     527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
-     815,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
-       0,     0,     0,     0,   232,   233,     0,   234,   235,   772,
-     236,   237,   238,   239,   240,   773,   241,   242,     0,   243,
-     244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
-     252,     0,   253,   254,   255,   256,   257,     0,   774,     0,
-     258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
-     266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
-       0,     0,     0,   777,     0,     0,   816,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
-     285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
-     292,   293,   294,   295,   296,     0,   297,   298,   299,     0,
-     300,   301,   302,     0,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
-       0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
-       0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
-     329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
-     337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
-     345,   346,   347,   348,     0,   349,     0,   350,   782,   783,
-     351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
-     358,   785,   359,   786,     0,   360,   361,   362,     0,     0,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,   787,   379,   380,   381,
-     382,     0,   383,   384,   788,   385,     0,   386,   387,   388,
-     389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
-       0,     0,   396,   397,   789,   398,   790,   399,   400,   401,
-     402,   403,   404,   405,   406,     0,   407,   408,   409,   410,
-     411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
-     420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,   791,   441,   442,   443,   444,   445,   446,
-     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,   817,   458,   459,   460,   461,   462,   792,   463,
-     464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
-     481,   793,   482,   483,   484,   485,   486,     0,   487,   488,
-       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
-     496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
-     504,   505,  2209,     0,   506,   507,   508,   509,   510,   511,
-     512,     0,   513,   794,   514,   515,   516,   517,     0,     0,
-     518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
-     526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
-     536,   815,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
+     505,     0,     0,   506,   507,   508,   509,   510,     0,  1000,
+    1992,   513,   794,   514,   515,   516,   517,     0,     0,   518,
+       0,     0,   519,   520,   521,   522,   523,   524,     0,     0,
+       0,     0,     0,     0,     0,  2261,     0,   534,   535,   536,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1993,
+     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
+     230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
+     233,     0,   234,   235,   772,   236,   237,   238,     0,   979,
+     773,   980,   981,     0,   243,   244,   245,   246,   247,     0,
+       0,   248,   249,   982,   983,   252,     0,   253,   254,   255,
+     256,     0,     0,   774,     0,   258,   259,   260,   261,   775,
+     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
+       0,   776,   271,   272,   273,     0,     0,     0,   777,     0,
+       0,     0,   274,   275,   276,   277,   278,   279,   984,   985,
+     282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
+     289,   290,   291,     0,     0,   292,   293,   986,   295,   296,
+       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
+     304,   305,   306,     0,   308,   309,   310,     0,     0,   312,
+       0,   313,   314,   987,   316,     0,   317,     0,   318,   778,
+       0,   779,   319,   320,   321,     0,   322,     0,     0,     0,
+     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
+     333,   334,  1987,   335,   336,   337,   338,   339,   340,     0,
+     341,   781,  1988,   343,   344,   345,   346,   989,   990,     0,
+     991,     0,   350,   782,   783,   351,   784,   352,   353,   354,
+     355,   356,     0,     0,   357,     0,   785,   359,   786,     0,
+     360,   361,   362,     0,     0,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     992,   787,   993,   380,   381,     0,     0,   383,   384,   788,
+     385,     0,     0,   387,   994,   389,   390,   391,     0,   392,
+       0,     0,   393,   394,   395,     0,  1989,   396,  1990,   789,
+     398,   790,     0,   400,   401,   402,   403,   404,   405,   406,
+       0,   407,   408,     0,   410,     0,   412,   413,   414,     0,
+     415,   416,   417,   418,   419,   420,   421,   422,   995,   424,
+     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
+     442,   443,     0,   445,   446,   447,   448,   449,   450,   451,
+     452,     0,   453,   454,   455,   456,   457,     0,   458,   459,
+    1991,   461,   462,   792,   463,   464,   997,   466,     0,   467,
+     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
+       0,     0,   479,   480,     0,   481,   793,   482,   483,   484,
+     485,   486,     0,   998,   999,     0,     0,   489,   490,     0,
+     492,     0,     0,   494,   495,   496,   497,   498,   499,   500,
+       0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
+     507,   508,   509,   510,     0,  1000,  1992,   513,   794,   514,
+     515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
+     521,   522,   523,   524,     0,     0,     0,     0,     0,     0,
+       0,   219,     0,   534,   535,   536,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1993,   220,   221,   222,   223,
      224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
        0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
-     772,   236,   237,   238,   239,   240,   773,   241,   242,     0,
+       0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
      243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
-     251,   252,     0,   253,   254,   255,   256,   257,     0,   774,
-       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
-     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
-     273,     0,     0,     0,   777,     0,     0,   816,   274,   275,
+     251,   252,     0,   253,   254,   255,   256,   257,     0,     0,
+       0,   258,   259,   260,   261,     0,   262,   263,   264,     0,
+     265,   266,   267,   268,   269,   270,     0,     0,   271,   272,
+     273,     0,     0,     0,     0,     0,     0,     0,   274,   275,
      276,   277,   278,   279,   280,   281,   282,     0,   283,     0,
      284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
        0,   292,   293,   294,   295,   296,     0,   297,   298,   299,
        0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
      308,   309,   310,   311,     0,   312,     0,   313,   314,   315,
-     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
-     321,     0,   322,   323,  3113,   324,   325,     0,   326,   327,
-     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
-     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
-     344,   345,   346,   347,   348,     0,   349,     0,   350,   782,
-     783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
-     357,   358,   785,   359,   786,     0,   360,   361,   362,     0,
+     316,     0,   317,     0,   318,     0,     0,     0,   319,   320,
+     321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
+     328,   329,   330,     0,   331,   332,   333,   334,     0,   335,
+     336,   337,   338,   339,   340,     0,   341,     0,   342,   343,
+     344,   345,   346,   347,   348,     0,   349,     0,   350,     0,
+       0,   351,     0,   352,   353,   354,   355,   356,     0,     0,
+     357,   358,     0,   359,     0,     0,   360,   361,   362,     0,
        0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,   787,   379,   380,
-     381,   382,     0,   383,   384,   788,   385,     0,   386,   387,
+     372,   373,   374,   375,   376,   377,   378,     0,   379,   380,
+     381,   382,     0,   383,   384,     0,   385,     0,   386,   387,
      388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
-     395,     0,     0,   396,   397,   789,   398,   790,   399,   400,
+     395,     0,     0,   396,   397,     0,   398,     0,   399,   400,
      401,   402,   403,   404,   405,   406,     0,   407,   408,   409,
      410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
      419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
      428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,   791,   441,   442,   443,   444,   445,
+     438,     0,   439,   440,     0,   441,   442,   443,   444,   445,
      446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
-     455,   456,   457,   817,   458,   459,   460,   461,   462,   792,
+     455,   456,   457,     0,   458,   459,   460,   461,   462,     0,
      463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
      472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
-       0,   481,   793,   482,   483,   484,   485,   486,     0,   487,
+       0,   481,     0,   482,   483,   484,   485,   486,     0,   487,
      488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
      495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
      503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
-     511,   512,     0,   513,   794,   514,   515,   516,   517,     0,
+     511,   512,     0,   513,     0,   514,   515,   516,   517,     0,
        0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,   815,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
+     535,   536,   815,  1393,   593,     0,     0,     0,   646,     0,
+       0,  4521,     0,     0,     0,     0,     0,   220,   221,   222,
      223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
        0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
      235,   772,   236,   237,   238,   239,   240,   773,   241,   242,
@@ -7936,12 +7375,12 @@
      250,   251,   252,     0,   253,   254,   255,   256,   257,     0,
      774,     0,   258,   259,   260,   261,   775,   262,   263,   264,
        0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
-     272,   273,     0,     0,     0,   777,     0,     0,   816,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,     0,   283,
+     272,   273,     0,     0,     0,   777,     0,     0,     0,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,  1839,   283,
        0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
        0,     0,   292,   293,   294,   295,   296,     0,   297,   298,
      299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,     0,   312,     0,   313,   314,
+     307,   308,   309,   310,   311,  1663,   312,     0,   313,   314,
      315,   316,     0,   317,     0,   318,   778,     0,   779,   319,
      320,   321,     0,   322,   323,     0,   324,   325,     0,   326,
      327,   328,   329,   330,   780,   331,   332,   333,   334,     0,
@@ -7952,7 +7391,7 @@
        0,     0,   363,   364,   365,   366,   367,   368,   369,   370,
      371,   372,   373,   374,   375,   376,   377,   378,   787,   379,
      380,   381,   382,     0,   383,   384,   788,   385,     0,   386,
-     387,   388,   389,   390,   391,     0,   392,     0,     0,   393,
+     387,   388,   389,   390,   391,     0,   392,  1664,     0,   393,
      394,   395,     0,     0,   396,   397,   789,   398,   790,   399,
      400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
      409,   410,   411,   412,   413,   414,     0,   415,   416,   417,
@@ -7960,18 +7399,18 @@
        0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
      437,   438,     0,   439,   440,   791,   441,   442,   443,   444,
      445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
-     454,   455,   456,   457,   817,   458,   459,   460,   461,   462,
+     454,   455,   456,   457,     0,   458,   459,   460,   461,   462,
      792,   463,   464,   465,   466,     0,   467,   468,   469,   470,
      471,   472,   473,   474,   475,   476,   477,   478,     0,   479,
      480,     0,   481,   793,   482,   483,   484,   485,   486,     0,
-     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
+     487,   488,     0,     0,   489,   490,   491,   492,   493,  1665,
      494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
      502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
      510,   511,   512,     0,   513,   794,   514,   515,   516,   517,
        0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
      524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
-     534,   535,   536,   815,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   220,   221,
+     534,   535,   536,   815,  1393,   593,     0,     0,     0,   646,
+    1394,  1395,     0,     0,     0,     0,     0,     0,   220,   221,
      222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
        0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
      234,   235,   772,   236,   237,   238,   239,   240,   773,   241,
@@ -7979,12 +7418,12 @@
      249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
        0,   774,     0,   258,   259,   260,   261,   775,   262,   263,
      264,     0,   265,   266,   267,   268,   269,   270,     0,   776,
-     271,   272,   273,     0,     0,     0,   777,     0,     0,   816,
-     274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
+     271,   272,   273,     0,     0,     0,   777,     0,     0,     0,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,  1844,
      283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
      291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
      298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
+     306,   307,   308,   309,   310,   311,  1663,   312,     0,   313,
      314,   315,   316,     0,   317,     0,   318,   778,     0,   779,
      319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
      326,   327,   328,   329,   330,   780,   331,   332,   333,   334,
@@ -7992,10 +7431,10 @@
      342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
      350,   782,   783,   351,   784,   352,   353,   354,   355,   356,
        0,     0,   357,   358,   785,   359,   786,     0,   360,   361,
-     362,     0,     0,   363,   364,   365,   366,   867,   368,   369,
+     362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
      370,   371,   372,   373,   374,   375,   376,   377,   378,   787,
      379,   380,   381,   382,     0,   383,   384,   788,   385,     0,
-     386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
+     386,   387,   388,   389,   390,   391,     0,   392,  1664,     0,
      393,   394,   395,     0,     0,   396,   397,   789,   398,   790,
      399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
      408,   409,   410,   411,   412,   413,   414,     0,   415,   416,
@@ -8003,18 +7442,18 @@
      427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
      436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
      444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
-     453,   454,   455,   456,   457,   817,   458,   459,   460,   461,
+     453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
      462,   792,   463,   464,   465,   466,     0,   467,   468,   469,
      470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
      479,   480,     0,   481,   793,   482,   483,   484,   485,   486,
        0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
-       0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
+    1665,   494,   495,   496,   497,   498,   499,   500,     0,     0,
      501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
      509,   510,   511,   512,     0,   513,   794,   514,   515,   516,
      517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
      523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   535,   536,   815,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   220,
+     533,   534,   535,   536,   815,  1393,   593,     0,     0,     0,
+     646,  1394,  1395,     0,     0,     0,     0,     0,     0,   220,
      221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
      231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
        0,   234,   235,   772,   236,   237,   238,   239,   240,   773,
@@ -8023,11 +7462,11 @@
      257,     0,   774,     0,   258,   259,   260,   261,   775,   262,
      263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
      776,   271,   272,   273,     0,     0,     0,   777,     0,     0,
-     816,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+       0,   274,   275,   276,   277,   278,   279,   280,   281,   282,
        0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
      290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
      297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
+     305,   306,   307,   308,   309,   310,   311,  1663,   312,     0,
      313,   314,   315,   316,     0,   317,     0,   318,   778,     0,
      779,   319,   320,   321,     0,   322,   323,     0,   324,   325,
        0,   326,   327,   328,   329,   330,   780,   331,   332,   333,
@@ -8035,10 +7474,10 @@
      781,   342,   343,   344,   345,   346,   347,   348,     0,   349,
        0,   350,   782,   783,   351,   784,   352,   353,   354,   355,
      356,     0,     0,   357,   358,   785,   359,   786,     0,   360,
-     361,   362,     0,     0,   363,   364,   365,   366,   949,   368,
+     361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
      369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
      787,   379,   380,   381,   382,     0,   383,   384,   788,   385,
-       0,   386,   387,   388,   389,   390,   391,     0,   392,     0,
+       0,   386,   387,   388,   389,   390,   391,     0,   392,  1664,
        0,   393,   394,   395,     0,     0,   396,   397,   789,   398,
      790,   399,   400,   401,   402,   403,   404,   405,   406,     0,
      407,   408,   409,   410,   411,   412,   413,   414,     0,   415,
@@ -8046,18 +7485,18 @@
      426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
      435,   436,   437,   438,     0,   439,   440,   791,   441,   442,
      443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,   817,   458,   459,   460,
+       0,   453,   454,   455,   456,   457,     0,   458,   459,   460,
      461,   462,   792,   463,   464,   465,   466,     0,   467,   468,
      469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
        0,   479,   480,     0,   481,   793,   482,   483,   484,   485,
      486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
-     493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
+     493,  1665,   494,   495,   496,   497,   498,   499,   500,     0,
        0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
      508,   509,   510,   511,   512,     0,   513,   794,   514,   515,
      516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
      522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
-     532,   533,   534,   535,   536,   815,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     532,   533,   534,   535,   536,   815,     0,   593,     0,     0,
+       0,   646,  1394,  1395,     0,     0,     0,     0,     0,     0,
      220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
      230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
      233,     0,   234,   235,   772,   236,   237,   238,   239,   240,
@@ -8066,14 +7505,14 @@
      256,   257,     0,   774,     0,   258,   259,   260,   261,   775,
      262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
        0,   776,   271,   272,   273,     0,     0,     0,   777,     0,
-       0,   816,   274,   275,   276,   277,   278,   279,   280,   281,
-     282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
+       0,     0,   274,   275,   276,   277,   278,   279,   280,   281,
+     282,  2713,   283,     0,   284,   285,   286,   287,   288,     0,
      289,   290,   291,     0,     0,   292,   293,   294,   295,   296,
        0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,     0,   312,
+     304,   305,   306,   307,   308,   309,   310,   311,  1663,   312,
        0,   313,   314,   315,   316,     0,   317,     0,   318,   778,
        0,   779,   319,   320,   321,     0,   322,   323,     0,   324,
-     325,     0,   326,   327,   328,   329,  1021,   780,   331,   332,
+     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
      333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
      341,   781,   342,   343,   344,   345,   346,   347,   348,     0,
      349,     0,   350,   782,   783,   351,   784,   352,   353,   354,
@@ -8082,239 +7521,239 @@
      368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
      378,   787,   379,   380,   381,   382,     0,   383,   384,   788,
      385,     0,   386,   387,   388,   389,   390,   391,     0,   392,
-       0,     0,   393,   394,   395,     0,     0,   396,   397,   789,
+    1664,     0,   393,   394,   395,     0,     0,   396,   397,   789,
      398,   790,   399,   400,   401,   402,   403,   404,   405,   406,
        0,   407,   408,   409,   410,   411,   412,   413,   414,     0,
      415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
      425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
      434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
      442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
-     452,     0,   453,   454,   455,   456,   457,   817,   458,   459,
+     452,     0,   453,   454,   455,   456,   457,     0,   458,   459,
      460,   461,   462,   792,   463,   464,   465,   466,     0,   467,
      468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
      478,     0,   479,   480,     0,   481,   793,   482,   483,   484,
      485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
-     492,   493,     0,   494,   495,   496,   497,   498,   499,   500,
+     492,   493,  1665,   494,   495,   496,   497,   498,   499,   500,
        0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
      507,   508,   509,   510,   511,   512,     0,   513,   794,   514,
      515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
      521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
-     531,   532,   533,   534,   535,   536,   815,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
+     531,   532,   533,   534,   535,   536,   219,     0,     0,     0,
+       0,     0,   646,   658,   659,     0,     0,     0,     0,     0,
+       0,   220,   647,   222,   223,   224,   225,   226,   227,   648,
      229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
-     232,   233,     0,   234,   235,   772,   236,   237,   238,   239,
-     240,   773,   241,   242,     0,   243,   244,   245,   246,   247,
+     232,   233,     0,   234,   235,     0,   649,   237,   238,   239,
+     240,     0,   241,   242,     0,   243,   244,   245,   246,   247,
        0,     0,   248,   249,   250,   251,   252,     0,   253,   254,
-     255,   256,   257,     0,   774,     0,   258,   259,   260,   261,
-     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
-     270,     0,   776,   271,   272,   273,     0,     0,     0,   777,
-       0,     0,   816,   274,   275,   276,   277,   278,   279,   280,
+     255,   256,   257,     0,     0,     0,   258,   259,   260,   261,
+       0,   262,   263,   264,     0,   265,   266,   267,   268,   269,
+     270,     0,     0,   271,   272,   273,     0,     0,     0,     0,
+       0,     0,     0,   274,   275,   276,   277,   278,   279,   280,
      281,   282,     0,   283,     0,   284,   285,   286,   287,   288,
        0,   289,   290,   291,     0,     0,   292,   293,   294,   295,
      296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
      303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
-     312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
-     778,     0,   779,   319,   320,   321,     0,   322,   323,     0,
-     324,   325,     0,   326,   327,   328,   329,  1033,   780,   331,
-     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
-       0,   341,   781,   342,   343,   344,   345,   346,   347,   348,
-       0,   349,     0,   350,   782,   783,   351,   784,   352,   353,
-     354,   355,   356,     0,     0,   357,   358,   785,   359,   786,
+     312,     0,   313,   650,   315,   316,     0,   317,     0,   651,
+       0,   652,     0,   319,   320,   321,     0,   322,   323,     0,
+     324,   325,     0,   326,   327,   328,   329,   330,     0,   331,
+     332,   333,   334,   653,   335,   336,   337,   338,   339,   340,
+       0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
+       0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
+     354,   355,   654,     0,     0,   357,   358,     0,   359,     0,
        0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
      367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   787,   379,   380,   381,   382,     0,   383,   384,
-     788,   385,     0,   386,   387,   388,   389,   390,   391,     0,
+     377,   378,     0,   379,   655,   381,   382,     0,   383,   384,
+       0,   385,     0,   386,   387,   388,   389,   390,   391,     0,
      392,     0,     0,   393,   394,   395,     0,     0,   396,   397,
-     789,   398,   790,   399,   400,   401,   402,   403,   404,   405,
+       0,   398,     0,   399,   400,   401,   402,   403,   404,   405,
      406,     0,   407,   408,   409,   410,   411,   412,   413,   414,
-       0,   415,   416,   417,   418,   419,   420,   421,   422,   423,
-     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
+       0,   656,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,     0,   428,   429,   657,   431,   432,
+     433,   434,   435,   436,   437,   438,     0,   439,   440,     0,
      441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
-     451,   452,     0,   453,   454,   455,   456,   457,   817,   458,
-     459,   460,   461,   462,   792,   463,   464,   465,   466,     0,
+     451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
+     459,   460,   461,   462,     0,   463,   464,   465,   466,     0,
      467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,   478,     0,   479,   480,     0,   481,   793,   482,   483,
+     477,   478,     0,   479,   480,     0,   481,     0,   482,   483,
      484,   485,   486,     0,   487,   488,     0,     0,   489,   490,
      491,   492,   493,     0,   494,   495,   496,   497,   498,   499,
      500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
-     506,   507,   508,   509,   510,   511,   512,     0,   513,   794,
+     506,   507,   508,   509,   510,   511,   512,     0,   513,     0,
      514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
      520,   521,   522,   523,   524,   525,   526,   527,   528,   529,
-     530,   531,   532,   533,   534,   535,   536,   815,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     530,   531,   532,   533,   534,   535,   536,  1849,  4883,   593,
+       0,     0,     0,   646,   658,   659,     0,     0,     0,     0,
        0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
-       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
-       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
-     239,   240,   773,   241,   242,     0,   243,   244,   245,   246,
-     247,     0,     0,   248,   249,   250,   251,   252,     0,   253,
-     254,   255,   256,   257,     0,   774,     0,   258,   259,   260,
-     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
-     269,   270,     0,   776,   271,   272,   273,     0,     0,     0,
-     777,     0,     0,   816,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,     0,   283,     0,   284,   285,   286,   287,
-     288,     0,   289,   290,   291,     0,     0,   292,   293,   294,
-     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
-       0,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-       0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
-     318,   778,     0,   779,   319,   320,   321,     0,   322,   323,
-       0,   324,   325,     0,   326,   327,   328,   329,  1047,   780,
-     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
-     340,     0,   341,   781,   342,   343,   344,   345,   346,   347,
-     348,     0,   349,     0,   350,   782,   783,   351,   784,   352,
-     353,   354,   355,   356,     0,     0,   357,   358,   785,   359,
-     786,     0,   360,   361,   362,     0,     0,   363,   364,   365,
-     366,  1048,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   787,   379,   380,   381,   382,     0,   383,
-     384,   788,   385,     0,   386,   387,   388,   389,   390,   391,
-       0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
+    1850,   229,   230,   231,  1851,  1852,  1853,  1854,  1855,  1856,
+    1857,   232,   233,  1858,   234,   235,   772,   236,   237,   238,
+     239,   240,   773,   241,   242,  1859,   243,   244,   245,   246,
+     247,  1860,  1861,   248,   249,   250,   251,   252,  1862,   253,
+     254,   255,   256,   257,  1863,   774,  1864,   258,   259,   260,
+     261,   775,   262,   263,   264,  1865,   265,   266,   267,   268,
+     269,   270,  1866,   776,   271,   272,   273,  1867,  1868,  1869,
+     777,  1870,  1871,  1872,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,  1873,   283,  1874,   284,   285,   286,   287,
+     288,  1875,   289,   290,   291,  1876,  1877,   292,   293,   294,
+     295,   296,  1878,   297,   298,   299,  1879,   300,   301,   302,
+    1880,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+    1881,   312,  1882,   313,   314,   315,   316,  1883,   317,  1884,
+     318,   778,  1885,   779,   319,   320,   321,  1886,   322,   323,
+    1887,   324,   325,  1888,   326,   327,   328,   329,   330,   780,
+     331,   332,   333,   334,  1889,   335,   336,   337,   338,   339,
+     340,  1890,   341,   781,   342,   343,   344,   345,   346,   347,
+     348,  1891,   349,  1892,   350,   782,   783,   351,   784,   352,
+     353,   354,   355,   356,  1893,  1894,   357,   358,   785,   359,
+     786,  1895,   360,   361,   362,  1896,  1897,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,   787,   379,   380,   381,   382,  1898,   383,
+     384,   788,   385,  1899,   386,   387,   388,   389,   390,   391,
+    1900,   392,  1901,  1902,   393,   394,   395,  1903,  1904,   396,
      397,   789,   398,   790,   399,   400,   401,   402,   403,   404,
-     405,   406,     0,   407,   408,   409,   410,   411,   412,   413,
-     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
+     405,   406,  1905,   407,   408,   409,   410,   411,   412,   413,
+     414,  1906,   415,   416,   417,   418,   419,   420,   421,   422,
+     423,   424,   425,   426,   427,  1907,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,  1908,   439,   440,
      791,   441,   442,   443,   444,   445,   446,   447,   448,   449,
-     450,   451,   452,     0,   453,   454,   455,   456,   457,   817,
+     450,   451,   452,  1909,   453,   454,   455,   456,   457,  1910,
      458,   459,   460,   461,   462,   792,   463,   464,   465,   466,
-       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,   478,     0,   479,   480,     0,   481,   793,   482,
-     483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
-     490,   491,   492,   493,     0,   494,   495,   496,   497,   498,
-     499,   500,     0,     0,   501,   502,   503,   504,   505,     0,
-       0,   506,   507,   508,   509,   510,   511,   512,     0,   513,
-     794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
+    1911,   467,   468,   469,   470,   471,   472,   473,   474,   475,
+     476,   477,   478,  1912,   479,   480,  1913,   481,   793,   482,
+     483,   484,   485,   486,  1914,   487,   488,  1915,  1916,   489,
+     490,   491,   492,   493,  1917,   494,   495,   496,   497,   498,
+     499,   500,  1918,  1919,   501,   502,   503,   504,   505,  1920,
+    1921,   506,   507,   508,   509,   510,   511,   512,  1922,   513,
+     794,   514,   515,   516,   517,  1923,  1924,   518,  1925,  1926,
      519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
-     529,   530,   531,   532,   533,   534,   535,   536,   815,     0,
-     593,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     529,   530,   531,   532,   533,   534,   535,   536,  1849,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,     0,   229,   230,   231,     0,     0,     0,     0,     0,
-       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
-     238,   239,   240,   773,   241,   242,     0,   243,   244,   245,
-     246,   247,     0,     0,   248,   249,   250,   251,   252,     0,
-     253,   254,   255,   256,   257,     0,   774,     0,   258,   259,
-     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
-     268,   269,   270,     0,   776,   271,   272,   273,     0,     0,
-       0,   777,     0,     0,     0,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,  1822,   283,     0,   284,   285,   286,
-     287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
-     294,   295,   296,     0,   297,   298,   299,     0,   300,   301,
-     302,     0,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,     0,   312,     0,   313,   314,   315,   316,     0,   317,
-       0,   318,   778,     0,   779,   319,   320,   321,     0,   322,
-     323,     0,   324,   325,     0,   326,   327,   328,   329,   330,
-     780,   331,   332,   333,   334,     0,   335,   336,   337,   338,
-     339,   340,     0,   341,   781,   342,   343,   344,   345,   346,
-     347,   348,     0,   349,     0,   350,   782,   783,   351,   784,
-     352,   353,   354,   355,   356,     0,     0,   357,   358,   785,
-     359,   786,     0,   360,   361,   362,     0,     0,   363,   364,
+     227,  1850,   229,   230,   231,  1851,  1852,  1853,  1854,  1855,
+    1856,  1857,   232,   233,  1858,   234,   235,   772,   236,   237,
+     238,   239,   240,   773,   241,   242,  1859,   243,   244,   245,
+     246,   247,  1860,  1861,   248,   249,   250,   251,   252,  1862,
+     253,   254,   255,   256,   257,  1863,   774,  1864,   258,   259,
+     260,   261,   775,   262,   263,   264,  1865,   265,   266,   267,
+     268,   269,   270,  1866,   776,   271,   272,   273,  1867,  1868,
+    1869,   777,  1870,  1871,  1872,   274,   275,   276,   277,   278,
+     279,   280,   281,   282,  1873,   283,  1874,   284,   285,   286,
+     287,   288,  1875,   289,   290,   291,  1876,  1877,   292,   293,
+     294,   295,   296,  1878,   297,   298,   299,  1879,   300,   301,
+     302,  1880,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,  1881,   312,  1882,   313,   314,   315,   316,  1883,   317,
+    1884,   318,   778,  1885,   779,   319,   320,   321,  1886,   322,
+     323,  1887,   324,   325,  1888,   326,   327,   328,   329,   330,
+     780,   331,   332,   333,   334,  1889,   335,   336,   337,   338,
+     339,   340,  1890,   341,   781,   342,   343,   344,   345,   346,
+     347,   348,  1891,   349,  1892,   350,   782,   783,   351,   784,
+     352,   353,   354,   355,   356,  1893,  1894,   357,   358,   785,
+     359,   786,  1895,   360,   361,   362,  1896,  1897,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   787,   379,   380,   381,   382,     0,
-     383,   384,   788,   385,     0,   386,   387,   388,   389,   390,
-     391,     0,   392,     0,     0,   393,   394,   395,     0,     0,
+     375,   376,   377,   378,   787,   379,   380,   381,   382,  1898,
+     383,   384,   788,   385,  1899,   386,   387,   388,   389,   390,
+     391,  1900,   392,  1901,  1902,   393,   394,   395,  1903,  1904,
      396,   397,   789,   398,   790,   399,   400,   401,   402,   403,
-     404,   405,   406,     0,   407,   408,   409,   410,   411,   412,
-     413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
-     422,   423,   424,   425,   426,   427,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
+     404,   405,   406,  1905,   407,   408,   409,   410,   411,   412,
+     413,   414,  1906,   415,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,  1907,   428,   429,   430,
+     431,   432,   433,   434,   435,   436,   437,   438,  1908,   439,
      440,   791,   441,   442,   443,   444,   445,   446,   447,   448,
-     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
-       0,   458,   459,   460,   461,   462,   792,   463,   464,   465,
-     466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,   478,     0,   479,   480,     0,   481,   793,
-     482,   483,   484,   485,   486,     0,   487,   488,     0,     0,
-     489,   490,   491,   492,   493,     0,   494,   495,   496,   497,
-     498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
-       0,     0,   506,   507,   508,   509,   510,   511,   512,     0,
-     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
-       0,   519,   520,   521,   522,   523,   524,   525,   526,   527,
-     528,   529,   530,   531,   532,   533,   534,   535,   536,   815,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
-     226,   227,     0,   229,   230,   231,     3,     4,     0,     0,
-       0,     0,     0,   232,   233,     0,   234,   235,   772,   236,
-     237,   238,   239,   240,   773,   241,   242,     0,   243,   244,
-     245,   246,   247,     0,     0,   248,   249,   250,   251,   252,
-       0,   253,   254,   255,   256,   257,     0,   774,     0,   258,
-     259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
-     267,   268,   269,   270,     0,   776,   271,   272,   273,     0,
-       0,     0,   777,     0,     0,     0,   274,   275,   276,   277,
-     278,   279,   280,   281,   282,     0,   283,     0,   284,   285,
-     286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
-     293,   294,   295,   296,     0,   297,   298,   299,     0,   300,
-     301,   302,     0,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
-     317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
-     322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
-     330,   780,   331,   332,   333,   334,     0,   335,   336,   337,
-     338,   339,   340,     0,   341,   781,   342,   343,   344,   345,
-     346,   347,   348,     0,   349,     0,   350,   782,   783,   351,
-     784,   352,   353,   354,   355,   356,     0,     0,   357,   358,
-     785,   359,   786,     0,   360,   361,   362,     0,     0,   363,
+     449,   450,   451,   452,  1909,   453,   454,   455,   456,   457,
+    1910,   458,   459,   460,   461,   462,   792,   463,   464,   465,
+     466,  1911,   467,   468,   469,   470,   471,   472,   473,   474,
+     475,   476,   477,   478,  1912,   479,   480,  1913,   481,   793,
+     482,   483,   484,   485,   486,  1914,   487,   488,  1915,  1916,
+     489,   490,   491,   492,   493,  1917,   494,   495,   496,   497,
+     498,   499,   500,  1918,  1919,   501,   502,   503,   504,   505,
+    1920,  1921,   506,   507,   508,   509,   510,   511,   512,  1922,
+     513,   794,   514,   515,   516,   517,  1923,  1924,   518,  1925,
+    1926,   519,   520,   521,   522,   523,   524,   525,   526,   527,
+     528,   529,   530,   531,   532,   533,   534,   535,   536,  1849,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   220,   221,   222,   223,  2822,   225,
+     226,   227,  1850,   229,   230,   231,  1851,  1852,  1853,  1854,
+    1855,  1856,  1857,   232,   233,  1858,   234,   235,   772,   236,
+     237,   238,   239,   240,   773,   241,   242,  1859,   243,   244,
+     245,   246,   247,  1860,  1861,   248,   249,   250,   251,   252,
+    1862,   253,   254,   255,   256,   257,  1863,   774,  1864,   258,
+     259,   260,   261,   775,   262,   263,   264,  1865,   265,   266,
+     267,   268,   269,   270,  1866,   776,   271,   272,   273,  1867,
+    1868,  1869,   777,  1870,  1871,  1872,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,  1873,   283,  1874,   284,   285,
+     286,   287,   288,  1875,   289,   290,   291,  1876,  1877,   292,
+     293,   294,  2823,   296,  1878,   297,   298,   299,  1879,   300,
+     301,   302,  1880,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,  1881,   312,  1882,   313,   314,   315,   316,  1883,
+     317,  1884,   318,   778,  1885,   779,   319,   320,   321,  1886,
+     322,   323,  1887,   324,   325,  1888,   326,   327,   328,   329,
+     330,   780,   331,   332,   333,   334,  1889,   335,   336,   337,
+     338,   339,   340,  1890,   341,   781,   342,   343,   344,   345,
+     346,   347,   348,  1891,   349,  1892,   350,   782,   783,   351,
+     784,   352,   353,   354,   355,   356,  1893,  1894,   357,   358,
+     785,   359,   786,  1895,   360,   361,   362,  1896,  1897,   363,
      364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
      374,   375,   376,   377,   378,   787,   379,   380,   381,   382,
-       0,   383,   384,   788,   385,     0,   386,   387,   388,   389,
-     390,   391,     0,   392,     0,     0,   393,   394,   395,     0,
-       0,   396,   397,   789,   398,   790,   399,   400,   401,   402,
-     403,   404,   405,   406,     0,   407,   408,   409,   410,   411,
-     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
+    1898,   383,   384,   788,   385,  1899,   386,   387,   388,   389,
+     390,   391,  1900,   392,  1901,  1902,   393,   394,   395,  1903,
+    1904,   396,   397,   789,   398,   790,   399,   400,   401,   402,
+     403,   404,   405,   406,  1905,   407,   408,   409,   410,   411,
+     412,   413,   414,  1906,   415,   416,   417,   418,   419,   420,
+     421,   422,   423,   424,   425,   426,   427,  1907,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,  1908,
      439,   440,   791,   441,   442,   443,   444,   445,   446,   447,
-     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
-     457,     0,   458,   459,   460,   461,   462,   792,   463,   464,
-     465,   466,     0,   467,   468,   469,   470,   471,   472,   473,
-     474,   475,   476,   477,   478,     0,   479,   480,     0,   481,
-     793,   482,   483,   484,   485,   486,     0,   487,   488,     0,
-       0,   489,   490,   491,   492,   493,     0,   494,   495,   496,
-     497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
-     505,     0,     0,   506,   507,   508,   509,   510,   511,   512,
-       0,   513,   794,   514,   515,   516,   517,     0,     0,   518,
-       0,     0,   519,   520,   521,   522,   523,   524,   525,   526,
+     448,   449,   450,   451,   452,  1909,   453,   454,   455,   456,
+     457,  1910,  2824,   459,   460,   461,   462,   792,   463,   464,
+     465,   466,  1911,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,   478,  1912,   479,   480,  1913,   481,
+     793,   482,   483,   484,   485,   486,  1914,   487,   488,  1915,
+    1916,   489,   490,   491,   492,   493,  1917,   494,   495,   496,
+     497,   498,   499,   500,  1918,  1919,   501,   502,   503,   504,
+     505,  1920,  1921,   506,   507,   508,   509,   510,   511,   512,
+    1922,   513,   794,   514,   515,   516,   517,  1923,  1924,   518,
+    1925,  1926,   519,   520,   521,   522,   523,   524,   525,   526,
      527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
-     815,     0,   593,     0,     0,     0,     0,     0,     0,     0,
+     771,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
      225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
        0,     0,     0,     0,   232,   233,     0,   234,   235,   772,
      236,   237,   238,   239,   240,   773,   241,   242,     0,   243,
-     244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
-     252,     0,   253,   254,   255,   256,   257,     0,   774,     0,
+     244,   245,   246,   247,     0,  1133,   248,   249,   250,   251,
+     252,     0,   253,   254,   255,   256,  1136,     0,  1137,     0,
      258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
      266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
-       0,     0,     0,   777,     0,     0,     0,   274,   275,   276,
+    1138,  1139,  1140,  1141,  1142,  1143,  1144,   274,   275,   276,
      277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
      285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
      292,   293,   294,   295,   296,     0,   297,   298,   299,     0,
      300,   301,   302,     0,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
+     309,   310,  1148,     0,   312,     0,   313,   314,   315,   316,
        0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
-       0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
+       0,   322,  1151,     0,   324,   325,     0,   326,   327,   328,
      329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
      337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
      345,   346,   347,   348,     0,   349,     0,   350,   782,   783,
      351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
-     358,   785,   359,   786,     0,   360,   361,   362,     0,     0,
+    1156,   785,   359,   786,     0,   360,   361,   362,  1157,  1158,
      363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
      373,   374,   375,   376,   377,   378,   787,   379,   380,   381,
-     382,     0,   383,   384,   788,   385,     0,   386,   387,   388,
+     382,     0,   383,   384,   788,   385,     0,  1163,   387,   388,
      389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
-       0,     0,   396,   397,   789,   398,   790,   399,   400,   401,
-     402,   403,   404,   405,   406,     0,   407,   408,   409,   410,
+       0,     0,   396,   397,   789,   398,   790,  1166,   400,   401,
+     402,   403,   404,   405,   406,     0,   407,   408,  1167,   410,
      411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
        0,   439,   440,   791,   441,   442,   443,   444,   445,   446,
      447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,     0,   458,   459,   460,   461,   462,   792,   463,
+     456,   457,  1170,   458,   459,   460,   461,   462,   792,   463,
      464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
+     473,   474,   475,   476,   477,  1172,     0,   479,   480,     0,
      481,   793,   482,   483,   484,   485,   486,     0,   487,   488,
-       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
+       0,     0,   489,   490,  1175,   492,  1176,     0,   494,   495,
      496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
-     504,   505,     0,     0,   506,   507,   508,   509,   510,   511,
+     504,   505,  1179,     0,   506,   507,   508,   509,   510,   511,
      512,     0,   513,   794,   514,   515,   516,   517,     0,     0,
      518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
-     526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
+    1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,   534,   535,
      536,   815,     0,   593,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
      224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
@@ -8329,10 +7768,10 @@
      284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
        0,   292,   293,   294,   295,   296,     0,   297,   298,   299,
        0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,     0,   312,     0,   313,   314,   315,
+     308,   309,   310,   311,  1663,   312,     0,   313,   314,   315,
      316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
      321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
-     328,   329,  1651,   780,   331,   332,   333,   334,     0,   335,
+     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
      336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
      344,   345,   346,   347,   348,     0,   349,     0,   350,   782,
      783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
@@ -8340,7 +7779,7 @@
        0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
      372,   373,   374,   375,   376,   377,   378,   787,   379,   380,
      381,   382,     0,   383,   384,   788,   385,     0,   386,   387,
-     388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
+     388,   389,   390,   391,     0,   392,  1664,     0,   393,   394,
      395,     0,     0,   396,   397,   789,   398,   790,   399,   400,
      401,   402,   403,   404,   405,   406,     0,   407,   408,   409,
      410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
@@ -8352,22 +7791,22 @@
      463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
      472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
        0,   481,   793,   482,   483,   484,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     488,     0,     0,   489,   490,   491,   492,   493,  1665,   494,
      495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
      503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
      511,   512,     0,   513,   794,   514,   515,   516,   517,     0,
        0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,   771,     0,     0,     0,     0,     0,     0,     0,
+     535,   536,   815,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
-     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
+     223,   224,   225,   226,   227,   850,   229,   230,   231,     0,
        0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
      235,   772,   236,   237,   238,   239,   240,   773,   241,   242,
        0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
      250,   251,   252,     0,   253,   254,   255,   256,   257,     0,
      774,     0,   258,   259,   260,   261,   775,   262,   263,   264,
        0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
-     272,   273,     0,     0,     0,   777,     0,     0,     0,   274,
+     272,   273,     0,     0,     0,   777,     0,     0,   816,   274,
      275,   276,   277,   278,   279,   280,   281,   282,     0,   283,
        0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
        0,     0,   292,   293,   294,   295,   296,     0,   297,   298,
@@ -8391,7 +7830,7 @@
        0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
      437,   438,     0,   439,   440,   791,   441,   442,   443,   444,
      445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
-     454,   455,   456,   457,     0,   458,   459,   460,   461,   462,
+     454,   455,   456,   457,   817,   458,   459,   460,   461,   462,
      792,   463,   464,   465,   466,     0,   467,   468,   469,   470,
      471,   472,   473,   474,   475,   476,   477,   478,     0,   479,
      480,     0,   481,   793,   482,   483,   484,   485,   486,     0,
@@ -8401,16 +7840,16 @@
      510,   511,   512,     0,   513,   794,   514,   515,   516,   517,
        0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
      524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
-     534,   535,   536,   771,     0,     0,     0,     0,     0,     0,
+     534,   535,   536,   815,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   220,   221,
-     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
+     222,   223,   224,   225,   226,   227,   867,   229,   230,   231,
        0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
      234,   235,   772,   236,   237,   238,   239,   240,   773,   241,
      242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
      249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
        0,   774,     0,   258,   259,   260,   261,   775,   262,   263,
      264,     0,   265,   266,   267,   268,   269,   270,     0,   776,
-     271,   272,   273,     0,     0,     0,   777,     0,     0,     0,
+     271,   272,   273,     0,     0,     0,   777,     0,     0,   816,
      274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
      283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
      291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
@@ -8418,12 +7857,12 @@
      306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
      314,   315,   316,     0,   317,     0,   318,   778,     0,   779,
      319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
-     326,   327,   328,   329,   970,   780,   331,   332,   333,   334,
+     326,   327,   328,   329,   330,   780,   331,   332,   333,   334,
        0,   335,   336,   337,   338,   339,   340,     0,   341,   781,
      342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
      350,   782,   783,   351,   784,   352,   353,   354,   355,   356,
        0,     0,   357,   358,   785,   359,   786,     0,   360,   361,
-     362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
+     362,     0,     0,   363,   364,   365,   366,   868,   368,   369,
      370,   371,   372,   373,   374,   375,   376,   377,   378,   787,
      379,   380,   381,   382,     0,   383,   384,   788,   385,     0,
      386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
@@ -8434,7 +7873,7 @@
      427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
      436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
      444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
-     453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
+     453,   454,   455,   456,   457,   817,   458,   459,   460,   461,
      462,   792,   463,   464,   465,   466,     0,   467,   468,   469,
      470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
      479,   480,     0,   481,   793,   482,   483,   484,   485,   486,
@@ -8444,7 +7883,7 @@
      509,   510,   511,   512,     0,   513,   794,   514,   515,   516,
      517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
      523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   535,   536,   771,     0,     0,     0,     0,     0,
+     533,   534,   535,   536,   815,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,   220,
      221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
      231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
@@ -8454,14 +7893,14 @@
      257,     0,   774,     0,   258,   259,   260,   261,   775,   262,
      263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
      776,   271,   272,   273,     0,     0,     0,   777,     0,     0,
-       0,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+     816,   274,   275,   276,   277,   278,   279,   280,   281,   282,
        0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
      290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
      297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
      305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
      313,   314,   315,   316,     0,   317,     0,   318,   778,     0,
      779,   319,   320,   321,     0,   322,   323,     0,   324,   325,
-       0,   326,   327,   328,   329,  1019,   780,   331,   332,   333,
+       0,   326,   327,   328,   329,   330,   780,   331,   332,   333,
      334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
      781,   342,   343,   344,   345,   346,   347,   348,     0,   349,
        0,   350,   782,   783,   351,   784,   352,   353,   354,   355,
@@ -8477,593 +7916,593 @@
      426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
      435,   436,   437,   438,     0,   439,   440,   791,   441,   442,
      443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,     0,   458,   459,   460,
+       0,   453,   454,   455,   456,   457,   817,   458,   459,   460,
      461,   462,   792,   463,   464,   465,   466,     0,   467,   468,
      469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
        0,   479,   480,     0,   481,   793,   482,   483,   484,   485,
      486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
      493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
-       0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
+       0,   501,   502,   503,   504,   505,  2214,     0,   506,   507,
      508,   509,   510,   511,   512,     0,   513,   794,   514,   515,
      516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
      522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
-     532,   533,   534,   535,   536,   219,     0,     0,     0,     0,
+     532,   533,   534,   535,   536,   815,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
      230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
-     233,     0,   234,   235,     0,   236,   237,   238,   239,   240,
-       0,   241,   242,     0,   243,   244,   245,   246,   247,     0,
-       0,   248,   249,   250,   251,   252,  2027,   253,   254,   255,
-     256,   257,     0,     0,  2101,   258,   259,   260,   261,     0,
-     262,   263,   264,  2028,   265,   266,   267,   268,   269,   270,
-       0,     0,   271,   272,   273,     0,     0,     0,     0,     0,
-       0,     0,   274,   275,   276,   277,   278,   279,   280,   281,
+     233,     0,   234,   235,   772,   236,   237,   238,   239,   240,
+     773,   241,   242,     0,   243,   244,   245,   246,   247,     0,
+       0,   248,   249,   250,   251,   252,     0,   253,   254,   255,
+     256,   257,     0,   774,     0,   258,   259,   260,   261,   775,
+     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
+       0,   776,   271,   272,   273,     0,     0,     0,   777,     0,
+       0,   816,   274,   275,   276,   277,   278,   279,   280,   281,
      282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
      289,   290,   291,     0,     0,   292,   293,   294,   295,   296,
-       0,   297,   298,   299,     0,   300,   301,   302,     0,  2102,
+       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
      304,   305,   306,   307,   308,   309,   310,   311,     0,   312,
-       0,   313,   314,   315,   316,     0,   317,  2030,   318,     0,
-       0,     0,   319,   320,   321,     0,   322,   323,     0,   324,
-     325,     0,   326,   327,   328,   329,   330,     0,   331,   332,
+       0,   313,   314,   315,   316,     0,   317,     0,   318,   778,
+       0,   779,   319,   320,   321,     0,   322,   323,  3119,   324,
+     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
      333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
-     341,     0,   342,   343,   344,   345,   346,   347,   348,     0,
-     349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
-     355,   356,     0,     0,   357,   358,     0,   359,     0,     0,
+     341,   781,   342,   343,   344,   345,   346,   347,   348,     0,
+     349,     0,   350,   782,   783,   351,   784,   352,   353,   354,
+     355,   356,     0,     0,   357,   358,   785,   359,   786,     0,
      360,   361,   362,     0,     0,   363,   364,   365,   366,   367,
      368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,     0,   379,   380,   381,   382,     0,   383,   384,     0,
+     378,   787,   379,   380,   381,   382,     0,   383,   384,   788,
      385,     0,   386,   387,   388,   389,   390,   391,     0,   392,
-       0,     0,   393,   394,   395,     0,     0,   396,   397,     0,
-     398,     0,   399,   400,   401,   402,   403,   404,   405,   406,
-       0,   407,   408,   409,   410,   411,   412,   413,   414,  2031,
+       0,     0,   393,   394,   395,     0,     0,   396,   397,   789,
+     398,   790,   399,   400,   401,   402,   403,   404,   405,   406,
+       0,   407,   408,   409,   410,   411,   412,   413,   414,     0,
      415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
      425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,   436,   437,   438,     0,   439,   440,     0,   441,
+     434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
      442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
-     452,     0,   453,   454,   455,   456,   457,     0,   458,   459,
-     460,   461,   462,     0,   463,   464,   465,   466,     0,   467,
+     452,     0,   453,   454,   455,   456,   457,   817,   458,   459,
+     460,   461,   462,   792,   463,   464,   465,   466,     0,   467,
      468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
-     478,     0,   479,   480,     0,   481,     0,   482,   483,   484,
+     478,     0,   479,   480,     0,   481,   793,   482,   483,   484,
      485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
      492,   493,     0,   494,   495,   496,   497,   498,   499,   500,
-       0,  2032,   501,   502,   503,   504,   505,     0,     0,   506,
-     507,   508,   509,   510,   511,   512,     0,   513,     0,   514,
+       0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
+     507,   508,   509,   510,   511,   512,     0,   513,   794,   514,
      515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
      521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
-     531,   532,   533,   534,   535,   536,   219,     0,     0,     0,
+     531,   532,   533,   534,   535,   536,   815,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
      229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
-     232,   233,     0,   234,   235,     0,   236,   237,   238,   239,
-     240,     0,   241,   242,     0,   243,   244,   245,   246,   247,
-       0,     0,   248,   249,   250,   251,   252,  2027,   253,   254,
-     255,   256,   257,     0,     0,     0,   258,   259,   260,   261,
-       0,   262,   263,   264,  2028,   265,   266,   267,   268,   269,
-     270,     0,     0,   271,   272,   273,     0,     0,     0,     0,
-       0,     0,     0,   274,   275,   276,   277,   278,   279,   280,
+     232,   233,     0,   234,   235,   772,   236,   237,   238,   239,
+     240,   773,   241,   242,     0,   243,   244,   245,   246,   247,
+       0,     0,   248,   249,   250,   251,   252,     0,   253,   254,
+     255,   256,   257,     0,   774,     0,   258,   259,   260,   261,
+     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
+     270,     0,   776,   271,   272,   273,     0,     0,     0,   777,
+       0,     0,   816,   274,   275,   276,   277,   278,   279,   280,
      281,   282,     0,   283,     0,   284,   285,   286,   287,   288,
        0,   289,   290,   291,     0,     0,   292,   293,   294,   295,
      296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
-    2102,   304,   305,   306,   307,   308,   309,   310,   311,     0,
-     312,     0,   313,   314,   315,   316,     0,   317,  2030,   318,
-       0,     0,     0,   319,   320,   321,     0,   322,   323,     0,
-     324,   325,     0,   326,   327,   328,   329,   330,     0,   331,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
+     312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
+     778,     0,   779,   319,   320,   321,     0,   322,   323,     0,
+     324,   325,     0,   326,   327,   328,   329,   330,   780,   331,
      332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
-       0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
-       0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
-     354,   355,   356,     0,     0,   357,   358,     0,   359,  2978,
+       0,   341,   781,   342,   343,   344,   345,   346,   347,   348,
+       0,   349,     0,   350,   782,   783,   351,   784,   352,   353,
+     354,   355,   356,     0,     0,   357,   358,   785,   359,   786,
        0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
      367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,     0,   379,   380,   381,   382,     0,   383,   384,
-       0,   385,     0,   386,   387,   388,   389,   390,   391,     0,
+     377,   378,   787,   379,   380,   381,   382,     0,   383,   384,
+     788,   385,     0,   386,   387,   388,   389,   390,   391,     0,
      392,     0,     0,   393,   394,   395,     0,     0,   396,   397,
-       0,   398,     0,   399,   400,   401,   402,   403,   404,   405,
+     789,   398,   790,   399,   400,   401,   402,   403,   404,   405,
      406,     0,   407,   408,   409,   410,   411,   412,   413,   414,
-    2031,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+       0,   415,   416,   417,   418,   419,   420,   421,   422,   423,
      424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,     0,   439,   440,     0,
+     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
      441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
-     451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
-     459,   460,   461,   462,     0,   463,   464,   465,   466,     0,
+     451,   452,     0,   453,   454,   455,   456,   457,   817,   458,
+     459,   460,   461,   462,   792,   463,   464,   465,   466,     0,
      467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,   478,     0,   479,   480,     0,   481,     0,   482,   483,
+     477,   478,     0,   479,   480,     0,   481,   793,   482,   483,
      484,   485,   486,     0,   487,   488,     0,     0,   489,   490,
      491,   492,   493,     0,   494,   495,   496,   497,   498,   499,
-     500,     0,  2032,   501,   502,   503,   504,   505,     0,     0,
-     506,   507,   508,   509,   510,   511,   512,     0,   513,     0,
+     500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
+     506,   507,   508,   509,   510,   511,   512,     0,   513,   794,
      514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
      520,   521,   522,   523,   524,   525,   526,   527,   528,   529,
-     530,   531,   532,   533,   534,   535,   536,   219,     0,     0,
+     530,   531,   532,   533,   534,   535,   536,   815,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   220,   221,   222,   223,   224,   703,   226,   227,
-     665,   229,   230,   231,     0,     0,     0,     0,     0,     0,
-       0,   232,   233,     0,   234,   235,     0,   236,   237,   238,
-     239,   240,     0,   241,   242,     0,   243,   244,   245,   246,
+       0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
+       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
+       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
+     239,   240,   773,   241,   242,     0,   243,   244,   245,   246,
      247,     0,     0,   248,   249,   250,   251,   252,     0,   253,
-     254,   255,   256,   257,     0,     0,     0,   258,   259,   260,
-     261,     0,   262,   263,   264,     0,   265,   266,   267,   268,
-     269,   270,   666,     0,   271,   272,   273,     0,     0,     0,
-       0,     0,     0,     0,   274,   275,   276,   277,   278,   279,
+     254,   255,   256,   257,     0,   774,     0,   258,   259,   260,
+     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
+     269,   270,     0,   776,   271,   272,   273,     0,     0,     0,
+     777,     0,     0,   816,   274,   275,   276,   277,   278,   279,
      280,   281,   282,     0,   283,     0,   284,   285,   286,   287,
      288,     0,   289,   290,   291,     0,     0,   292,   293,   294,
      295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
        0,   303,   304,   305,   306,   307,   308,   309,   310,   311,
        0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
-     318,     0,     0,     0,   319,   320,   321,   704,   322,   323,
-       0,   324,   325,     0,   326,   327,   328,   329,   330,     0,
+     318,   778,     0,   779,   319,   320,   321,     0,   322,   323,
+       0,   324,   325,     0,   326,   327,   328,   329,   330,   780,
      331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
-     340,     0,   341,     0,   342,   343,   344,   345,   346,   347,
-     348,     0,   349,     0,   350,     0,     0,   351,     0,   352,
-     353,   354,   355,   356,     0,     0,   357,   358,     0,   359,
-       0,     0,   360,   361,   362,     0,     0,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,     0,   379,   380,   381,   382,     0,   383,
-     384,     0,   385,     0,   386,   387,   388,   389,   390,   391,
+     340,     0,   341,   781,   342,   343,   344,   345,   346,   347,
+     348,     0,   349,     0,   350,   782,   783,   351,   784,   352,
+     353,   354,   355,   356,     0,     0,   357,   358,   785,   359,
+     786,     0,   360,   361,   362,     0,     0,   363,   364,   365,
+     366,   950,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,   787,   379,   380,   381,   382,     0,   383,
+     384,   788,   385,     0,   386,   387,   388,   389,   390,   391,
        0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
-     397,     0,   398,     0,   399,   400,   401,   402,   403,   404,
+     397,   789,   398,   790,   399,   400,   401,   402,   403,   404,
      405,   406,     0,   407,   408,   409,   410,   411,   412,   413,
      414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   667,   428,   429,   430,   431,
+     423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
      432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
-       0,   441,   442,   443,   444,   445,   446,   447,   448,   449,
-     450,   451,   452,   668,   453,   454,   455,   456,   457,     0,
-     458,   459,   460,   461,   462,     0,   463,   464,   465,   466,
+     791,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,     0,   453,   454,   455,   456,   457,   817,
+     458,   459,   460,   461,   462,   792,   463,   464,   465,   466,
        0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,   478,     0,   479,   480,     0,   481,     0,   482,
+     476,   477,   478,     0,   479,   480,     0,   481,   793,   482,
      483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
      490,   491,   492,   493,     0,   494,   495,   496,   497,   498,
      499,   500,     0,     0,   501,   502,   503,   504,   505,     0,
        0,   506,   507,   508,   509,   510,   511,   512,     0,   513,
-       0,   514,   515,   516,   517,     0,     0,   518,     0,     0,
+     794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
      519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
-     529,   530,   531,   532,   533,   534,   535,   536,   219,     0,
+     529,   530,   531,   532,   533,   534,   535,   536,   815,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,   665,   229,   230,   231,     0,     0,     0,     0,     0,
-       0,     0,   232,   233,     0,   234,   235,     0,   236,   237,
-     238,   239,   240,     0,   241,   242,     0,   243,   244,   245,
+     227,     0,   229,   230,   231,     0,     0,     0,     0,     0,
+       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
+     238,   239,   240,   773,   241,   242,     0,   243,   244,   245,
      246,   247,     0,     0,   248,   249,   250,   251,   252,     0,
-     253,   254,   255,   256,   257,     0,     0,     0,   258,   259,
-     260,   261,     0,   262,   263,   264,     0,   265,   266,   267,
-     268,   269,   270,   666,     0,   271,   272,   273,     0,     0,
-       0,     0,     0,     0,     0,   274,   275,   276,   277,   278,
+     253,   254,   255,   256,   257,     0,   774,     0,   258,   259,
+     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
+     268,   269,   270,     0,   776,   271,   272,   273,     0,     0,
+       0,   777,     0,     0,   816,   274,   275,   276,   277,   278,
      279,   280,   281,   282,     0,   283,     0,   284,   285,   286,
      287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
      294,   295,   296,     0,   297,   298,   299,     0,   300,   301,
      302,     0,   303,   304,   305,   306,   307,   308,   309,   310,
      311,     0,   312,     0,   313,   314,   315,   316,     0,   317,
-       0,   318,     0,     0,     0,   319,   320,   321,  2714,   322,
-     323,     0,   324,   325,     0,   326,   327,   328,   329,   330,
-       0,   331,   332,   333,   334,     0,   335,   336,   337,   338,
-     339,   340,     0,   341,     0,   342,   343,   344,   345,   346,
-     347,   348,     0,   349,     0,   350,     0,     0,   351,     0,
-     352,   353,   354,   355,   356,     0,     0,   357,   358,     0,
-     359,     0,     0,   360,   361,   362,     0,     0,   363,   364,
+       0,   318,   778,     0,   779,   319,   320,   321,     0,   322,
+     323,     0,   324,   325,     0,   326,   327,   328,   329,  1022,
+     780,   331,   332,   333,   334,     0,   335,   336,   337,   338,
+     339,   340,     0,   341,   781,   342,   343,   344,   345,   346,
+     347,   348,     0,   349,     0,   350,   782,   783,   351,   784,
+     352,   353,   354,   355,   356,     0,     0,   357,   358,   785,
+     359,   786,     0,   360,   361,   362,     0,     0,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,     0,   379,   380,   381,   382,     0,
-     383,   384,     0,   385,     0,   386,   387,   388,   389,   390,
+     375,   376,   377,   378,   787,   379,   380,   381,   382,     0,
+     383,   384,   788,   385,     0,   386,   387,   388,   389,   390,
      391,     0,   392,     0,     0,   393,   394,   395,     0,     0,
-     396,   397,     0,   398,     0,   399,   400,   401,   402,   403,
+     396,   397,   789,   398,   790,   399,   400,   401,   402,   403,
      404,   405,   406,     0,   407,   408,   409,   410,   411,   412,
      413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
-     422,   423,   424,   425,   426,   427,   667,   428,   429,   430,
+     422,   423,   424,   425,   426,   427,     0,   428,   429,   430,
      431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,     0,   441,   442,   443,   444,   445,   446,   447,   448,
-     449,   450,   451,   452,   668,   453,   454,   455,   456,   457,
-       0,   458,   459,   460,   461,   462,     0,   463,   464,   465,
+     440,   791,   441,   442,   443,   444,   445,   446,   447,   448,
+     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
+     817,   458,   459,   460,   461,   462,   792,   463,   464,   465,
      466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,   478,     0,   479,   480,     0,   481,     0,
+     475,   476,   477,   478,     0,   479,   480,     0,   481,   793,
      482,   483,   484,   485,   486,     0,   487,   488,     0,     0,
      489,   490,   491,   492,   493,     0,   494,   495,   496,   497,
      498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
        0,     0,   506,   507,   508,   509,   510,   511,   512,     0,
-     513,     0,   514,   515,   516,   517,     0,     0,   518,     0,
+     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
        0,   519,   520,   521,   522,   523,   524,   525,   526,   527,
-     528,   529,   530,   531,   532,   533,   534,   535,   536,   219,
+     528,   529,   530,   531,   532,   533,   534,   535,   536,   815,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
      226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
-       0,     0,     0,   232,   233,     0,   234,   235,     0,   236,
-     237,   238,   239,   240,     0,   241,   242,     0,   243,   244,
+       0,     0,     0,   232,   233,     0,   234,   235,   772,   236,
+     237,   238,   239,   240,   773,   241,   242,     0,   243,   244,
      245,   246,   247,     0,     0,   248,   249,   250,   251,   252,
-    2027,   253,   254,   255,   256,   257,     0,     0,     0,   258,
-     259,   260,   261,     0,   262,   263,   264,  2028,   265,   266,
-     267,   268,   269,   270,     0,     0,   271,   272,   273,     0,
-       0,     0,     0,     0,     0,     0,   274,   275,   276,   277,
+       0,   253,   254,   255,   256,   257,     0,   774,     0,   258,
+     259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
+     267,   268,   269,   270,     0,   776,   271,   272,   273,     0,
+       0,     0,   777,     0,     0,   816,   274,   275,   276,   277,
      278,   279,   280,   281,   282,     0,   283,     0,   284,   285,
      286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
      293,   294,   295,   296,     0,   297,   298,   299,     0,   300,
-     301,   302,     0,  2102,   304,   305,   306,   307,   308,   309,
+     301,   302,     0,   303,   304,   305,   306,   307,   308,   309,
      310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
-     317,  2030,   318,     0,     0,     0,   319,   320,   321,     0,
+     317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
      322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
-     330,     0,   331,   332,   333,   334,     0,   335,   336,   337,
-     338,   339,   340,     0,   341,     0,   342,   343,   344,   345,
-     346,   347,   348,     0,   349,     0,   350,     0,     0,   351,
-       0,   352,   353,   354,   355,   356,     0,     0,   357,   358,
-       0,   359,     0,     0,   360,   361,   362,     0,     0,   363,
+    1034,   780,   331,   332,   333,   334,     0,   335,   336,   337,
+     338,   339,   340,     0,   341,   781,   342,   343,   344,   345,
+     346,   347,   348,     0,   349,     0,   350,   782,   783,   351,
+     784,   352,   353,   354,   355,   356,     0,     0,   357,   358,
+     785,   359,   786,     0,   360,   361,   362,     0,     0,   363,
      364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,   378,     0,   379,   380,   381,   382,
-       0,   383,   384,     0,   385,     0,   386,   387,   388,   389,
+     374,   375,   376,   377,   378,   787,   379,   380,   381,   382,
+       0,   383,   384,   788,   385,     0,   386,   387,   388,   389,
      390,   391,     0,   392,     0,     0,   393,   394,   395,     0,
-       0,   396,   397,     0,   398,     0,   399,   400,   401,   402,
+       0,   396,   397,   789,   398,   790,   399,   400,   401,   402,
      403,   404,   405,   406,     0,   407,   408,   409,   410,   411,
-     412,   413,   414,  2031,   415,   416,   417,   418,   419,   420,
+     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
      421,   422,   423,   424,   425,   426,   427,     0,   428,   429,
      430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
-     439,   440,     0,   441,   442,   443,   444,   445,   446,   447,
+     439,   440,   791,   441,   442,   443,   444,   445,   446,   447,
      448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
-     457,     0,   458,   459,   460,   461,   462,     0,   463,   464,
+     457,   817,   458,   459,   460,   461,   462,   792,   463,   464,
      465,   466,     0,   467,   468,   469,   470,   471,   472,   473,
      474,   475,   476,   477,   478,     0,   479,   480,     0,   481,
-       0,   482,   483,   484,   485,   486,     0,   487,   488,     0,
+     793,   482,   483,   484,   485,   486,     0,   487,   488,     0,
        0,   489,   490,   491,   492,   493,     0,   494,   495,   496,
-     497,   498,   499,   500,     0,  2032,   501,   502,   503,   504,
+     497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
      505,     0,     0,   506,   507,   508,   509,   510,   511,   512,
-       0,   513,     0,   514,   515,   516,   517,     0,     0,   518,
+       0,   513,   794,   514,   515,   516,   517,     0,     0,   518,
        0,     0,   519,   520,   521,   522,   523,   524,   525,   526,
      527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
-     219,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     815,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,   665,   229,   230,   231,     0,     0,     0,
-       0,     0,     0,     0,   232,   233,     0,   234,   235,     0,
-     236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
+     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
+       0,     0,     0,     0,   232,   233,     0,   234,   235,   772,
+     236,   237,   238,   239,   240,   773,   241,   242,     0,   243,
      244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
-     252,     0,   253,   254,   255,   256,   257,     0,     0,     0,
-     258,   259,   260,   261,     0,   262,   263,   264,     0,   265,
-     266,   267,   268,   269,   270,   666,     0,   271,   272,   273,
-       0,     0,     0,     0,     0,     0,     0,   274,   275,   276,
+     252,     0,   253,   254,   255,   256,   257,     0,   774,     0,
+     258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
+     266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
+       0,     0,     0,   777,     0,     0,   816,   274,   275,   276,
      277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
      285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
      292,   293,   294,   295,   296,     0,   297,   298,   299,     0,
      300,   301,   302,     0,   303,   304,   305,   306,   307,   308,
      309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
-       0,   317,     0,   318,     0,     0,     0,   319,   320,   321,
+       0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
        0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
-     329,   330,     0,   331,   332,   333,   334,     0,   335,   336,
-     337,   338,   339,   340,     0,   341,     0,   342,   343,   344,
-     345,   346,   347,   348,     0,   349,     0,   350,     0,     0,
-     351,     0,   352,   353,   354,   355,   356,     0,     0,   357,
-     358,     0,   359,     0,     0,   360,   361,   362,     0,     0,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,     0,   379,   380,   381,
-     382,     0,   383,   384,     0,   385,     0,   386,   387,   388,
+     329,  1048,   780,   331,   332,   333,   334,     0,   335,   336,
+     337,   338,   339,   340,     0,   341,   781,   342,   343,   344,
+     345,   346,   347,   348,     0,   349,     0,   350,   782,   783,
+     351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
+     358,   785,   359,   786,     0,   360,   361,   362,     0,     0,
+     363,   364,   365,   366,  1049,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,   377,   378,   787,   379,   380,   381,
+     382,     0,   383,   384,   788,   385,     0,   386,   387,   388,
      389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
-       0,     0,   396,   397,     0,   398,     0,   399,   400,   401,
+       0,     0,   396,   397,   789,   398,   790,   399,   400,   401,
      402,   403,   404,   405,   406,     0,   407,   408,   409,   410,
      411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
-     420,   421,   422,   423,   424,   425,   426,   427,   667,   428,
+     420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,     0,   441,   442,   443,   444,   445,   446,
-     447,   448,   449,   450,   451,   452,   668,   453,   454,   455,
-     456,   457,     0,   458,   459,   460,   461,   462,     0,   463,
+       0,   439,   440,   791,   441,   442,   443,   444,   445,   446,
+     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
+     456,   457,   817,   458,   459,   460,   461,   462,   792,   463,
      464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
      473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
-     481,     0,   482,   483,   484,   485,   486,     0,   487,   488,
+     481,   793,   482,   483,   484,   485,   486,     0,   487,   488,
        0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
      496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
      504,   505,     0,     0,   506,   507,   508,   509,   510,   511,
-     512,     0,   513,     0,   514,   515,   516,   517,     0,     0,
+     512,     0,   513,   794,   514,   515,   516,   517,     0,     0,
      518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
      526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
-     536,   219,     0,     0,     0,     0,     0,     0,     0,     0,
+     536,   815,     0,   593,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
-     224,   225,   226,   227,  1688,   229,   230,   231,     0,     0,
+     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
        0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
-       0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
+     772,   236,   237,   238,   239,   240,   773,   241,   242,     0,
      243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
-     251,   252,     0,   253,   254,   255,   256,   257,     0,     0,
-       0,   258,   259,   260,   261,     0,   262,   263,   264,     0,
-     265,   266,   267,   268,   269,   270,     0,     0,   271,   272,
-     273,     0,     0,     0,     0,     0,     0,     0,   274,   275,
-     276,  1689,   278,   279,   280,   281,   282,     0,   283,     0,
+     251,   252,     0,   253,   254,   255,   256,   257,     0,   774,
+       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
+     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
+     273,     0,     0,     0,   777,     0,     0,     0,   274,   275,
+     276,   277,   278,   279,   280,   281,   282,  1824,   283,     0,
      284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
-       0,   292,  1690,   294,   295,   296,     0,   297,   298,   299,
+       0,   292,   293,   294,   295,   296,     0,   297,   298,   299,
        0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
      308,   309,   310,   311,     0,   312,     0,   313,   314,   315,
-     316,     0,   317,  1691,   318,     0,     0,     0,  1692,   320,
+     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
      321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
-     328,   329,   330,     0,   331,   332,   333,   334,     0,   335,
-     336,   337,   338,   339,   340,     0,   341,     0,   342,   343,
-     344,   345,   346,   347,   348,     0,   349,     0,   350,     0,
-       0,   351,     0,   352,   353,  1693,  1694,   356,     0,     0,
-     357,   358,     0,   359,     0,     0,   360,   361,   362,     0,
+     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
+     336,   337,   338,   339,   340,     0,   341,   781,   342,   343,
+     344,   345,   346,   347,   348,     0,   349,     0,   350,   782,
+     783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
+     357,   358,   785,   359,   786,     0,   360,   361,   362,     0,
        0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,     0,   379,   380,
-     381,   382,     0,   383,   384,     0,   385,     0,   386,   387,
+     372,   373,   374,   375,   376,   377,   378,   787,   379,   380,
+     381,   382,     0,   383,   384,   788,   385,     0,   386,   387,
      388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
-     395,     0,     0,   396,   397,     0,   398,     0,   399,   400,
+     395,     0,     0,   396,   397,   789,   398,   790,   399,   400,
      401,   402,   403,   404,   405,   406,     0,   407,   408,   409,
      410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
      419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
      428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,     0,   441,   442,   443,   444,   445,
-     446,   447,  1695,   449,   450,   451,   452,     0,  1696,   454,
-     455,   456,   457,     0,   458,   459,   460,   461,   462,     0,
+     438,     0,   439,   440,   791,   441,   442,   443,   444,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,     0,   458,   459,   460,   461,   462,   792,
      463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
      472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
-    1697,   481,     0,  1698,   483,   484,   485,   486,     0,   487,
+       0,   481,   793,   482,   483,   484,   485,   486,     0,   487,
      488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,  1699,   497,   498,   499,   500,     0,     0,   501,   502,
+     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
      503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
-     511,   512,     0,   513,     0,   514,   515,   516,   517,     0,
+     511,   512,     0,   513,   794,   514,   515,   516,   517,     0,
        0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,   219,     0,     0,     0,     0,     0,     0,     0,
+     535,   536,   815,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
-     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
-       0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
-     235,     0,   236,   237,   238,   239,   240,     0,   241,   242,
+     223,   224,   225,   226,   227,     0,   229,   230,   231,     3,
+       4,     0,     0,     0,     0,     0,   232,   233,     0,   234,
+     235,   772,   236,   237,   238,   239,   240,   773,   241,   242,
        0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
      250,   251,   252,     0,   253,   254,   255,   256,   257,     0,
-       0,     0,   258,   259,   260,   261,     0,   262,   263,   264,
-       0,   265,   266,   267,   268,   269,   270,   666,     0,   271,
-     272,   273,     0,     0,     0,     0,     0,     0,     0,   274,
+     774,     0,   258,   259,   260,   261,   775,   262,   263,   264,
+       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
+     272,   273,     0,     0,     0,   777,     0,     0,     0,   274,
      275,   276,   277,   278,   279,   280,   281,   282,     0,   283,
        0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
        0,     0,   292,   293,   294,   295,   296,     0,   297,   298,
      299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
      307,   308,   309,   310,   311,     0,   312,     0,   313,   314,
-     315,   316,     0,   317,     0,   318,     0,     0,     0,   319,
+     315,   316,     0,   317,     0,   318,   778,     0,   779,   319,
      320,   321,     0,   322,   323,     0,   324,   325,     0,   326,
-     327,   328,   329,   330,     0,   331,   332,   333,   334,     0,
-     335,   336,   337,   338,   339,   340,     0,   341,     0,   342,
+     327,   328,   329,   330,   780,   331,   332,   333,   334,     0,
+     335,   336,   337,   338,   339,   340,     0,   341,   781,   342,
      343,   344,   345,   346,   347,   348,     0,   349,     0,   350,
-       0,     0,   351,     0,   352,   353,   354,   355,   356,     0,
-       0,   357,   358,     0,   359,     0,     0,   360,   361,   362,
+     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
+       0,   357,   358,   785,   359,   786,     0,   360,   361,   362,
        0,     0,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   378,     0,   379,
-     380,   381,   382,     0,   383,   384,     0,   385,     0,   386,
+     371,   372,   373,   374,   375,   376,   377,   378,   787,   379,
+     380,   381,   382,     0,   383,   384,   788,   385,     0,   386,
      387,   388,   389,   390,   391,     0,   392,     0,     0,   393,
-     394,   395,     0,     0,   396,   397,     0,   398,     0,   399,
+     394,   395,     0,     0,   396,   397,   789,   398,   790,   399,
      400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
      409,   410,   411,   412,   413,   414,     0,   415,   416,   417,
      418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
-     667,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,     0,   439,   440,     0,   441,   442,   443,   444,
-     445,   446,   447,   448,   449,   450,   451,   452,   668,   453,
+       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
+     437,   438,     0,   439,   440,   791,   441,   442,   443,   444,
+     445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
      454,   455,   456,   457,     0,   458,   459,   460,   461,   462,
-       0,   463,   464,   465,   466,     0,   467,   468,   469,   470,
+     792,   463,   464,   465,   466,     0,   467,   468,   469,   470,
      471,   472,   473,   474,   475,   476,   477,   478,     0,   479,
-     480,     0,   481,     0,   482,   483,   484,   485,   486,     0,
+     480,     0,   481,   793,   482,   483,   484,   485,   486,     0,
      487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
      494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
      502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
-     510,   511,   512,     0,   513,     0,   514,   515,   516,   517,
+     510,   511,   512,     0,   513,   794,   514,   515,   516,   517,
        0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
      524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
-     534,   535,   536,   219,     0,     0,     0,     0,     0,     0,
+     534,   535,   536,   815,     0,   593,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   220,   221,
-     222,   223,   224,   225,   226,   227,   860,   229,   230,   231,
+     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
        0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
-     234,   235,     0,   236,   237,   238,   239,   240,     0,   241,
+     234,   235,   772,   236,   237,   238,   239,   240,   773,   241,
      242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
      249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
-       0,     0,     0,   258,   259,   260,   261,     0,   262,   263,
-     264,     0,   265,   266,   267,   268,   269,   270,     0,     0,
-     271,   272,   273,     0,     0,     0,     0,     0,     0,     0,
+       0,   774,     0,   258,   259,   260,   261,   775,   262,   263,
+     264,     0,   265,   266,   267,   268,   269,   270,     0,   776,
+     271,   272,   273,     0,     0,     0,   777,     0,     0,     0,
      274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
      283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
      291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
      298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
      306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
-     314,   315,   316,     0,   317,     0,   318,     0,     0,     0,
+     314,   315,   316,     0,   317,     0,   318,   778,     0,   779,
      319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
-     326,   327,   328,   329,   861,     0,   331,   332,   333,   334,
-       0,   335,   336,   337,   338,   339,   340,     0,   341,     0,
+     326,   327,   328,   329,   330,   780,   331,   332,   333,   334,
+       0,   335,   336,   337,   338,   339,   340,     0,   341,   781,
      342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
-     350,     0,     0,   351,     0,   352,   353,   354,   355,   356,
-       0,     0,   357,   358,     0,   359,     0,     0,   360,   361,
+     350,   782,   783,   351,   784,   352,   353,   354,   355,   356,
+       0,     0,   357,   358,   785,   359,   786,     0,   360,   361,
      362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   378,     0,
-     379,   380,   381,   382,     0,   383,   384,     0,   385,     0,
-     386,   387,   388,   389,   390,   391,     0,   392,     0,   735,
-     393,   394,   395,     0,     0,   396,   397,     0,   398,     0,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,   787,
+     379,   380,   381,   382,     0,   383,   384,   788,   385,     0,
+     386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
+     393,   394,   395,     0,     0,   396,   397,   789,   398,   790,
      399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
      408,   409,   410,   411,   412,   413,   414,     0,   415,   416,
      417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
      427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-     436,   437,   438,     0,   439,   440,     0,   441,   442,   443,
+     436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
      444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
      453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
-     462,     0,   463,   464,   465,   466,     0,   467,   468,   469,
+     462,   792,   463,   464,   465,   466,     0,   467,   468,   469,
      470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
-     479,   480,     0,   481,     0,   482,   483,   484,   485,   486,
+     479,   480,     0,   481,   793,   482,   483,   484,   485,   486,
        0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
        0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
      501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
-     509,   510,   511,   512,     0,   513,     0,   514,   515,   516,
+     509,   510,   511,   512,     0,   513,   794,   514,   515,   516,
      517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
      523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   535,   536,   219,     0,     0,     0,     0,     0,
+     533,   534,   535,   536,   815,     0,   593,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,   220,
      221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
-     231,     3,     4,     0,     0,     0,     0,     0,   232,   233,
-       0,   234,   235,     0,   236,   237,   238,   239,   240,     0,
+     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
+       0,   234,   235,   772,   236,   237,   238,   239,   240,   773,
      241,   242,     0,   243,   244,   245,   246,   247,     0,     0,
      248,   249,   250,   251,   252,     0,   253,   254,   255,   256,
-     257,     0,     0,     0,   258,   259,   260,   261,     0,   262,
+     257,     0,   774,     0,   258,   259,   260,   261,   775,   262,
      263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
-       0,   271,   272,   273,     0,     0,     0,     0,     0,     0,
+     776,   271,   272,   273,     0,     0,     0,   777,     0,     0,
        0,   274,   275,   276,   277,   278,   279,   280,   281,   282,
        0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
      290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
      297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
      305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
-     313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
-       0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
-       0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
+     313,   314,   315,   316,     0,   317,     0,   318,   778,     0,
+     779,   319,   320,   321,     0,   322,   323,     0,   324,   325,
+       0,   326,   327,   328,   329,  1653,   780,   331,   332,   333,
      334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
-       0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
-       0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
-     356,     0,     0,   357,   358,     0,   359,     0,     0,   360,
+     781,   342,   343,   344,   345,   346,   347,   348,     0,   349,
+       0,   350,   782,   783,   351,   784,   352,   353,   354,   355,
+     356,     0,     0,   357,   358,   785,   359,   786,     0,   360,
      361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
      369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-       0,   379,   380,   381,   382,     0,   383,   384,     0,   385,
+     787,   379,   380,   381,   382,     0,   383,   384,   788,   385,
        0,   386,   387,   388,   389,   390,   391,     0,   392,     0,
-       0,   393,   394,   395,     0,     0,   396,   397,     0,   398,
-       0,   399,   400,   401,   402,   403,   404,   405,   406,     0,
+       0,   393,   394,   395,     0,     0,   396,   397,   789,   398,
+     790,   399,   400,   401,   402,   403,   404,   405,   406,     0,
      407,   408,   409,   410,   411,   412,   413,   414,     0,   415,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
      426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,     0,   439,   440,     0,   441,   442,
+     435,   436,   437,   438,     0,   439,   440,   791,   441,   442,
      443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
        0,   453,   454,   455,   456,   457,     0,   458,   459,   460,
-     461,   462,     0,   463,   464,   465,   466,     0,   467,   468,
+     461,   462,   792,   463,   464,   465,   466,     0,   467,   468,
      469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
-       0,   479,   480,     0,   481,     0,   482,   483,   484,   485,
+       0,   479,   480,     0,   481,   793,   482,   483,   484,   485,
      486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
      493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
        0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
-     508,   509,   510,   511,   512,     0,   513,     0,   514,   515,
+     508,   509,   510,   511,   512,     0,   513,   794,   514,   515,
      516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
      522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
-     532,   533,   534,   535,   536,   219,     0,     0,     0,     0,
+     532,   533,   534,   535,   536,   771,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     220,   221,   222,   223,   224,   225,   226,   227,  2797,   229,
+     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
      230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
-     233,     0,   234,   235,     0,   236,   237,   238,   239,   240,
-       0,   241,   242,     0,   243,   244,   245,   246,   247,     0,
+     233,     0,   234,   235,   772,   236,   237,   238,   239,   240,
+     773,   241,   242,     0,   243,   244,   245,   246,   247,     0,
        0,   248,   249,   250,   251,   252,     0,   253,   254,   255,
-     256,   257,     0,     0,     0,   258,   259,   260,   261,     0,
+     256,   257,     0,   774,     0,   258,   259,   260,   261,   775,
      262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
-       0,     0,   271,   272,   273,     0,     0,     0,     0,     0,
+       0,   776,   271,   272,   273,     0,     0,     0,   777,     0,
        0,     0,   274,   275,   276,   277,   278,   279,   280,   281,
      282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
      289,   290,   291,     0,     0,   292,   293,   294,   295,   296,
        0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
      304,   305,   306,   307,   308,   309,   310,   311,     0,   312,
-       0,   313,   314,   315,   316,     0,   317,     0,   318,     0,
-       0,     0,   319,   320,   321,     0,   322,   323,     0,   324,
-     325,     0,   326,   327,   328,   329,   330,     0,   331,   332,
+       0,   313,   314,   315,   316,     0,   317,     0,   318,   778,
+       0,   779,   319,   320,   321,     0,   322,   323,     0,   324,
+     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
      333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
-     341,     0,   342,   343,   344,   345,   346,   347,   348,     0,
-     349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
-     355,   356,     0,     0,   357,   358,     0,   359,     0,     0,
+     341,   781,   342,   343,   344,   345,   346,   347,   348,     0,
+     349,     0,   350,   782,   783,   351,   784,   352,   353,   354,
+     355,   356,     0,     0,   357,   358,   785,   359,   786,     0,
      360,   361,   362,     0,     0,   363,   364,   365,   366,   367,
      368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,     0,   379,   380,   381,   382,     0,   383,   384,     0,
+     378,   787,   379,   380,   381,   382,     0,   383,   384,   788,
      385,     0,   386,   387,   388,   389,   390,   391,     0,   392,
-       0,     0,   393,   394,   395,     0,     0,   396,   397,     0,
-     398,     0,   399,   400,   401,   402,   403,   404,   405,   406,
+       0,     0,   393,   394,   395,     0,     0,   396,   397,   789,
+     398,   790,   399,   400,   401,   402,   403,   404,   405,   406,
        0,   407,   408,   409,   410,   411,   412,   413,   414,     0,
      415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
      425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,   436,   437,   438,     0,   439,   440,     0,   441,
+     434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
      442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
      452,     0,   453,   454,   455,   456,   457,     0,   458,   459,
-     460,   461,   462,     0,   463,   464,   465,   466,     0,   467,
+     460,   461,   462,   792,   463,   464,   465,   466,     0,   467,
      468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
-     478,     0,   479,   480,     0,   481,     0,   482,   483,   484,
+     478,     0,   479,   480,     0,   481,   793,   482,   483,   484,
      485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
      492,   493,     0,   494,   495,   496,   497,   498,   499,   500,
-       0,     0,   501,   502,   503,   504,   505,  2798,     0,   506,
-     507,   508,   509,   510,   511,   512,     0,   513,     0,   514,
+       0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
+     507,   508,   509,   510,   511,   512,     0,   513,   794,   514,
      515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
      521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
-     531,   532,   533,   534,   535,   536,   219,     0,     0,     0,
+     531,   532,   533,   534,   535,   536,   771,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   220,   221,   222,   223,   224,   225,   226,   227,  2810,
+       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
      229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
-     232,   233,     0,   234,   235,     0,   236,   237,   238,   239,
-     240,     0,   241,   242,     0,   243,   244,   245,   246,   247,
+     232,   233,     0,   234,   235,   772,   236,   237,   238,   239,
+     240,   773,   241,   242,     0,   243,   244,   245,   246,   247,
        0,     0,   248,   249,   250,   251,   252,     0,   253,   254,
-     255,   256,   257,     0,     0,     0,   258,   259,   260,   261,
-       0,   262,   263,   264,     0,   265,   266,   267,   268,   269,
-     270,     0,     0,   271,   272,   273,     0,     0,     0,     0,
+     255,   256,   257,     0,   774,     0,   258,   259,   260,   261,
+     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
+     270,     0,   776,   271,   272,   273,     0,     0,     0,   777,
        0,     0,     0,   274,   275,   276,   277,   278,   279,   280,
      281,   282,     0,   283,     0,   284,   285,   286,   287,   288,
        0,   289,   290,   291,     0,     0,   292,   293,   294,   295,
      296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
      303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
      312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
-       0,     0,     0,   319,   320,   321,     0,   322,   323,     0,
-     324,   325,     0,   326,   327,   328,   329,   330,     0,   331,
+     778,     0,   779,   319,   320,   321,     0,   322,   323,     0,
+     324,   325,     0,   326,   327,   328,   329,   971,   780,   331,
      332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
-       0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
-       0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
-     354,   355,   356,     0,     0,   357,   358,     0,   359,     0,
+       0,   341,   781,   342,   343,   344,   345,   346,   347,   348,
+       0,   349,     0,   350,   782,   783,   351,   784,   352,   353,
+     354,   355,   356,     0,     0,   357,   358,   785,   359,   786,
        0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
      367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,     0,   379,   380,   381,   382,     0,   383,   384,
-       0,   385,     0,   386,   387,   388,   389,   390,   391,     0,
-     392,     0,     0,   393,   394,   395,     0,     0,   396,   397,
-       0,   398,     0,   399,   400,   401,   402,   403,   404,   405,
+     377,   378,   787,   379,   380,   381,   382,     0,   383,   384,
+     788,   385,     0,   386,   387,   388,   389,   390,   391,     0,
+     392,     0,     0,   393,   394,   395,     0,     0,   396,   397,
+     789,   398,   790,   399,   400,   401,   402,   403,   404,   405,
      406,     0,   407,   408,   409,   410,   411,   412,   413,   414,
        0,   415,   416,   417,   418,   419,   420,   421,   422,   423,
      424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,     0,   439,   440,     0,
+     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
      441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
      451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
-     459,   460,   461,   462,     0,   463,   464,   465,   466,     0,
+     459,   460,   461,   462,   792,   463,   464,   465,   466,     0,
      467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,   478,     0,   479,   480,     0,   481,     0,   482,   483,
+     477,   478,     0,   479,   480,     0,   481,   793,   482,   483,
      484,   485,   486,     0,   487,   488,     0,     0,   489,   490,
      491,   492,   493,     0,   494,   495,   496,   497,   498,   499,
-     500,     0,     0,   501,   502,   503,   504,   505,  2811,     0,
-     506,   507,   508,   509,   510,   511,   512,     0,   513,     0,
+     500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
+     506,   507,   508,   509,   510,   511,   512,     0,   513,   794,
      514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
      520,   521,   522,   523,   524,   525,   526,   527,   528,   529,
-     530,   531,   532,   533,   534,   535,   536,   219,     0,     0,
+     530,   531,   532,   533,   534,   535,   536,   771,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
-     228,   229,   230,   231,     0,     0,     0,     0,     0,     0,
-       0,   232,   233,     0,   234,   235,     0,   236,   237,   238,
-     239,   240,     0,   241,   242,     0,   243,   244,   245,   246,
+       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
+       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
+     239,   240,   773,   241,   242,     0,   243,   244,   245,   246,
      247,     0,     0,   248,   249,   250,   251,   252,     0,   253,
-     254,   255,   256,   257,     0,     0,     0,   258,   259,   260,
-     261,     0,   262,   263,   264,     0,   265,   266,   267,   268,
-     269,   270,     0,     0,   271,   272,   273,     0,     0,     0,
-       0,     0,     0,     0,   274,   275,   276,   277,   278,   279,
+     254,   255,   256,   257,     0,   774,     0,   258,   259,   260,
+     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
+     269,   270,     0,   776,   271,   272,   273,     0,     0,     0,
+     777,     0,     0,     0,   274,   275,   276,   277,   278,   279,
      280,   281,   282,     0,   283,     0,   284,   285,   286,   287,
      288,     0,   289,   290,   291,     0,     0,   292,   293,   294,
      295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
        0,   303,   304,   305,   306,   307,   308,   309,   310,   311,
        0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
-     318,     0,     0,     0,   319,   320,   321,     0,   322,   323,
-       0,   324,   325,     0,   326,   327,   328,   329,   330,     0,
+     318,   778,     0,   779,   319,   320,   321,     0,   322,   323,
+       0,   324,   325,     0,   326,   327,   328,   329,  1020,   780,
      331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
-     340,     0,   341,     0,   342,   343,   344,   345,   346,   347,
-     348,     0,   349,     0,   350,     0,     0,   351,     0,   352,
-     353,   354,   355,   356,     0,     0,   357,   358,     0,   359,
-       0,     0,   360,   361,   362,     0,     0,   363,   364,   365,
+     340,     0,   341,   781,   342,   343,   344,   345,   346,   347,
+     348,     0,   349,     0,   350,   782,   783,   351,   784,   352,
+     353,   354,   355,   356,     0,     0,   357,   358,   785,   359,
+     786,     0,   360,   361,   362,     0,     0,   363,   364,   365,
      366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,     0,   379,   380,   381,   382,     0,   383,
-     384,     0,   385,     0,   386,   387,   388,   389,   390,   391,
+     376,   377,   378,   787,   379,   380,   381,   382,     0,   383,
+     384,   788,   385,     0,   386,   387,   388,   389,   390,   391,
        0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
-     397,     0,   398,     0,   399,   400,   401,   402,   403,   404,
+     397,   789,   398,   790,   399,   400,   401,   402,   403,   404,
      405,   406,     0,   407,   408,   409,   410,   411,   412,   413,
      414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
      423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
      432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
-       0,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     791,   441,   442,   443,   444,   445,   446,   447,   448,   449,
      450,   451,   452,     0,   453,   454,   455,   456,   457,     0,
-     458,   459,   460,   461,   462,     0,   463,   464,   465,   466,
+     458,   459,   460,   461,   462,   792,   463,   464,   465,   466,
        0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,   478,     0,   479,   480,     0,   481,     0,   482,
+     476,   477,   478,     0,   479,   480,     0,   481,   793,   482,
      483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
      490,   491,   492,   493,     0,   494,   495,   496,   497,   498,
      499,   500,     0,     0,   501,   502,   503,   504,   505,     0,
        0,   506,   507,   508,   509,   510,   511,   512,     0,   513,
-       0,   514,   515,   516,   517,     0,     0,   518,     0,     0,
+     794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
      519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
      529,   530,   531,   532,   533,   534,   535,   536,   219,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,   584,   229,   230,   231,     0,     0,     0,     0,     0,
+     227,     0,   229,   230,   231,     0,     0,     0,     0,     0,
        0,     0,   232,   233,     0,   234,   235,     0,   236,   237,
      238,   239,   240,     0,   241,   242,     0,   243,   244,   245,
-     246,   247,     0,     0,   248,   249,   250,   251,   252,     0,
-     253,   254,   255,   256,   257,     0,     0,     0,   258,   259,
-     260,   261,     0,   262,   263,   264,     0,   265,   266,   267,
+     246,   247,     0,     0,   248,   249,   250,   251,   252,  2029,
+     253,   254,   255,   256,   257,     0,     0,  2103,   258,   259,
+     260,   261,     0,   262,   263,   264,  2030,   265,   266,   267,
      268,   269,   270,     0,     0,   271,   272,   273,     0,     0,
        0,     0,     0,     0,     0,   274,   275,   276,   277,   278,
      279,   280,   281,   282,     0,   283,     0,   284,   285,   286,
      287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
      294,   295,   296,     0,   297,   298,   299,     0,   300,   301,
-     302,     0,   303,   304,   305,   306,   307,   308,   309,   310,
+     302,     0,  2104,   304,   305,   306,   307,   308,   309,   310,
      311,     0,   312,     0,   313,   314,   315,   316,     0,   317,
-       0,   318,     0,     0,     0,   319,   320,   321,     0,   322,
+    2032,   318,     0,     0,     0,   319,   320,   321,     0,   322,
      323,     0,   324,   325,     0,   326,   327,   328,   329,   330,
        0,   331,   332,   333,   334,     0,   335,   336,   337,   338,
      339,   340,     0,   341,     0,   342,   343,   344,   345,   346,
@@ -9076,7 +8515,7 @@
      391,     0,   392,     0,     0,   393,   394,   395,     0,     0,
      396,   397,     0,   398,     0,   399,   400,   401,   402,   403,
      404,   405,   406,     0,   407,   408,   409,   410,   411,   412,
-     585,   414,     0,   415,   416,   417,   418,   419,   420,   421,
+     413,   414,  2033,   415,   416,   417,   418,   419,   420,   421,
      422,   423,   424,   425,   426,   427,     0,   428,   429,   430,
      431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
      440,     0,   441,   442,   443,   444,   445,   446,   447,   448,
@@ -9086,63 +8525,63 @@
      475,   476,   477,   478,     0,   479,   480,     0,   481,     0,
      482,   483,   484,   485,   486,     0,   487,   488,     0,     0,
      489,   490,   491,   492,   493,     0,   494,   495,   496,   497,
-     498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
+     498,   499,   500,     0,  2034,   501,   502,   503,   504,   505,
        0,     0,   506,   507,   508,   509,   510,   511,   512,     0,
      513,     0,   514,   515,   516,   517,     0,     0,   518,     0,
        0,   519,   520,   521,   522,   523,   524,   525,   526,   527,
      528,   529,   530,   531,   532,   533,   534,   535,   536,   219,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
-     226,   227,   695,   229,   230,   231,     0,     0,     0,     0,
+     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
        0,     0,     0,   232,   233,     0,   234,   235,     0,   236,
      237,   238,   239,   240,     0,   241,   242,     0,   243,   244,
      245,   246,   247,     0,     0,   248,   249,   250,   251,   252,
-       0,   253,   254,   255,   256,   257,     0,     0,     0,   258,
-     259,   260,   261,     0,   262,   263,   264,     0,   265,   266,
+    2029,   253,   254,   255,   256,   257,     0,     0,     0,   258,
+     259,   260,   261,     0,   262,   263,   264,  2030,   265,   266,
      267,   268,   269,   270,     0,     0,   271,   272,   273,     0,
        0,     0,     0,     0,     0,     0,   274,   275,   276,   277,
      278,   279,   280,   281,   282,     0,   283,     0,   284,   285,
      286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
      293,   294,   295,   296,     0,   297,   298,   299,     0,   300,
-     301,   302,     0,   303,   304,   305,   306,   307,   308,   309,
+     301,   302,     0,  2104,   304,   305,   306,   307,   308,   309,
      310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
-     317,     0,   318,     0,     0,     0,   319,   320,   321,     0,
+     317,  2032,   318,     0,     0,     0,   319,   320,   321,     0,
      322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
      330,     0,   331,   332,   333,   334,     0,   335,   336,   337,
      338,   339,   340,     0,   341,     0,   342,   343,   344,   345,
      346,   347,   348,     0,   349,     0,   350,     0,     0,   351,
        0,   352,   353,   354,   355,   356,     0,     0,   357,   358,
-       0,   359,     0,     0,   360,   361,   362,     0,     0,   363,
+       0,   359,  2984,     0,   360,   361,   362,     0,     0,   363,
      364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
      374,   375,   376,   377,   378,     0,   379,   380,   381,   382,
        0,   383,   384,     0,   385,     0,   386,   387,   388,   389,
      390,   391,     0,   392,     0,     0,   393,   394,   395,     0,
        0,   396,   397,     0,   398,     0,   399,   400,   401,   402,
      403,   404,   405,   406,     0,   407,   408,   409,   410,   411,
-     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
+     412,   413,   414,  2033,   415,   416,   417,   418,   419,   420,
      421,   422,   423,   424,   425,   426,   427,     0,   428,   429,
      430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
      439,   440,     0,   441,   442,   443,   444,   445,   446,   447,
      448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
-     696,     0,   458,   459,   460,   461,   462,     0,   463,   464,
+     457,     0,   458,   459,   460,   461,   462,     0,   463,   464,
      465,   466,     0,   467,   468,   469,   470,   471,   472,   473,
      474,   475,   476,   477,   478,     0,   479,   480,     0,   481,
-       0,   482,   483,   484,   485,   486,     0,   697,   488,     0,
-       0,   698,   490,   491,   492,   493,     0,   494,   495,   496,
-     497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
+       0,   482,   483,   484,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,   496,
+     497,   498,   499,   500,     0,  2034,   501,   502,   503,   504,
      505,     0,     0,   506,   507,   508,   509,   510,   511,   512,
        0,   513,     0,   514,   515,   516,   517,     0,     0,   518,
        0,     0,   519,   520,   521,   522,   523,   524,   525,   526,
      527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
      219,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,   729,   229,   230,   231,     0,     0,     0,
+     703,   226,   227,   665,   229,   230,   231,     0,     0,     0,
        0,     0,     0,     0,   232,   233,     0,   234,   235,     0,
      236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
      244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
      252,     0,   253,   254,   255,   256,   257,     0,     0,     0,
      258,   259,   260,   261,     0,   262,   263,   264,     0,   265,
-     266,   267,   268,   269,   270,     0,     0,   271,   272,   273,
+     266,   267,   268,   269,   270,   666,     0,   271,   272,   273,
        0,     0,     0,     0,     0,     0,     0,   274,   275,   276,
      277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
      285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
@@ -9150,7 +8589,7 @@
      300,   301,   302,     0,   303,   304,   305,   306,   307,   308,
      309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
        0,   317,     0,   318,     0,     0,     0,   319,   320,   321,
-       0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
+     704,   322,   323,     0,   324,   325,     0,   326,   327,   328,
      329,   330,     0,   331,   332,   333,   334,     0,   335,   336,
      337,   338,   339,   340,     0,   341,     0,   342,   343,   344,
      345,   346,   347,   348,     0,   349,     0,   350,     0,     0,
@@ -9163,15 +8602,15 @@
        0,     0,   396,   397,     0,   398,     0,   399,   400,   401,
      402,   403,   404,   405,   406,     0,   407,   408,   409,   410,
      411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
-     420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
+     420,   421,   422,   423,   424,   425,   426,   427,   667,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
        0,   439,   440,     0,   441,   442,   443,   444,   445,   446,
-     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   730,     0,   458,   459,   460,   461,   462,     0,   463,
+     447,   448,   449,   450,   451,   452,   668,   453,   454,   455,
+     456,   457,     0,   458,   459,   460,   461,   462,     0,   463,
      464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
      473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
-     481,     0,   482,   483,   484,   485,   486,     0,   731,   488,
-       0,     0,   732,   490,   491,   492,   493,     0,   494,   495,
+     481,     0,   482,   483,   484,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
      496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
      504,   505,     0,     0,   506,   507,   508,   509,   510,   511,
      512,     0,   513,     0,   514,   515,   516,   517,     0,     0,
@@ -9179,13 +8618,13 @@
      526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
      536,   219,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
-     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
+     224,   225,   226,   227,   665,   229,   230,   231,     0,     0,
        0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
        0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
      243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
      251,   252,     0,   253,   254,   255,   256,   257,     0,     0,
        0,   258,   259,   260,   261,     0,   262,   263,   264,     0,
-     265,   266,   267,   268,   269,   270,     0,     0,   271,   272,
+     265,   266,   267,   268,   269,   270,   666,     0,   271,   272,
      273,     0,     0,     0,     0,     0,     0,     0,   274,   275,
      276,   277,   278,   279,   280,   281,   282,     0,   283,     0,
      284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
@@ -9193,7 +8632,7 @@
        0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
      308,   309,   310,   311,     0,   312,     0,   313,   314,   315,
      316,     0,   317,     0,   318,     0,     0,     0,   319,   320,
-     321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
+     321,  2720,   322,   323,     0,   324,   325,     0,   326,   327,
      328,   329,   330,     0,   331,   332,   333,   334,     0,   335,
      336,   337,   338,   339,   340,     0,   341,     0,   342,   343,
      344,   345,   346,   347,   348,     0,   349,     0,   350,     0,
@@ -9202,14 +8641,14 @@
        0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
      372,   373,   374,   375,   376,   377,   378,     0,   379,   380,
      381,   382,     0,   383,   384,     0,   385,     0,   386,   387,
-     388,   389,   390,   391,     0,   392,     0,   735,   393,   394,
+     388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
      395,     0,     0,   396,   397,     0,   398,     0,   399,   400,
      401,   402,   403,   404,   405,   406,     0,   407,   408,   409,
      410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
+     419,   420,   421,   422,   423,   424,   425,   426,   427,   667,
      428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
      438,     0,   439,   440,     0,   441,   442,   443,   444,   445,
-     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     446,   447,   448,   449,   450,   451,   452,   668,   453,   454,
      455,   456,   457,     0,   458,   459,   460,   461,   462,     0,
      463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
      472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
@@ -9222,22 +8661,22 @@
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
      535,   536,   219,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
-     223,   224,   225,   226,   227,   824,   229,   230,   231,     0,
+     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
        0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
      235,     0,   236,   237,   238,   239,   240,     0,   241,   242,
        0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
-     250,   251,   252,     0,   253,   254,   255,   256,   257,     0,
+     250,   251,   252,  2029,   253,   254,   255,   256,   257,     0,
        0,     0,   258,   259,   260,   261,     0,   262,   263,   264,
-       0,   265,   266,   267,   268,   269,   270,     0,     0,   271,
+    2030,   265,   266,   267,   268,   269,   270,     0,     0,   271,
      272,   273,     0,     0,     0,     0,     0,     0,     0,   274,
      275,   276,   277,   278,   279,   280,   281,   282,     0,   283,
        0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
        0,     0,   292,   293,   294,   295,   296,     0,   297,   298,
-     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
+     299,     0,   300,   301,   302,     0,  2104,   304,   305,   306,
      307,   308,   309,   310,   311,     0,   312,     0,   313,   314,
-     315,   316,     0,   317,     0,   318,     0,     0,     0,   319,
+     315,   316,     0,   317,  2032,   318,     0,     0,     0,   319,
      320,   321,     0,   322,   323,     0,   324,   325,     0,   326,
-     327,   328,   329,   825,     0,   331,   332,   333,   334,     0,
+     327,   328,   329,   330,     0,   331,   332,   333,   334,     0,
      335,   336,   337,   338,   339,   340,     0,   341,     0,   342,
      343,   344,   345,   346,   347,   348,     0,   349,     0,   350,
        0,     0,   351,     0,   352,   353,   354,   355,   356,     0,
@@ -9248,7 +8687,7 @@
      387,   388,   389,   390,   391,     0,   392,     0,     0,   393,
      394,   395,     0,     0,   396,   397,     0,   398,     0,   399,
      400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
-     409,   410,   411,   412,   413,   414,     0,   415,   416,   417,
+     409,   410,   411,   412,   413,   414,  2033,   415,   416,   417,
      418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
        0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
      437,   438,     0,   439,   440,     0,   441,   442,   443,   444,
@@ -9258,20 +8697,20 @@
      471,   472,   473,   474,   475,   476,   477,   478,     0,   479,
      480,     0,   481,     0,   482,   483,   484,   485,   486,     0,
      487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
-     494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
+     494,   495,   496,   497,   498,   499,   500,     0,  2034,   501,
      502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
      510,   511,   512,     0,   513,     0,   514,   515,   516,   517,
        0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
      524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
      534,   535,   536,   219,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   220,   221,
-     222,   223,   224,   225,   226,   227,   963,   229,   230,   231,
+     222,   223,   224,   225,   226,   227,   665,   229,   230,   231,
        0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
      234,   235,     0,   236,   237,   238,   239,   240,     0,   241,
      242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
      249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
        0,     0,     0,   258,   259,   260,   261,     0,   262,   263,
-     264,     0,   265,   266,   267,   268,   269,   270,     0,     0,
+     264,     0,   265,   266,   267,   268,   269,   270,   666,     0,
      271,   272,   273,     0,     0,     0,     0,     0,     0,     0,
      274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
      283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
@@ -9293,9 +8732,9 @@
      399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
      408,   409,   410,   411,   412,   413,   414,     0,   415,   416,
      417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+     427,   667,   428,   429,   430,   431,   432,   433,   434,   435,
      436,   437,   438,     0,   439,   440,     0,   441,   442,   443,
-     444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
+     444,   445,   446,   447,   448,   449,   450,   451,   452,   668,
      453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
      462,     0,   463,   464,   465,   466,     0,   467,   468,   469,
      470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
@@ -9308,7 +8747,7 @@
      523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
      533,   534,   535,   536,   219,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,   220,
-     221,   222,   223,   224,   225,   226,   227,  1225,   229,   230,
+     221,   222,   223,   224,   225,   226,   227,  1690,   229,   230,
      231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
        0,   234,   235,     0,   236,   237,   238,   239,   240,     0,
      241,   242,     0,   243,   244,   245,   246,   247,     0,     0,
@@ -9316,17 +8755,17 @@
      257,     0,     0,     0,   258,   259,   260,   261,     0,   262,
      263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
        0,   271,   272,   273,     0,     0,     0,     0,     0,     0,
-       0,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+       0,   274,   275,   276,  1691,   278,   279,   280,   281,   282,
        0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
-     290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
+     290,   291,     0,     0,   292,  1692,   294,   295,   296,     0,
      297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
      305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
-     313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
-       0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
+     313,   314,   315,   316,     0,   317,  1693,   318,     0,     0,
+       0,  1694,   320,   321,     0,   322,   323,     0,   324,   325,
        0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
      334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
        0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
-       0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
+       0,   350,     0,     0,   351,     0,   352,   353,  1695,  1696,
      356,     0,     0,   357,   358,     0,   359,     0,     0,   360,
      361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
      369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
@@ -9338,13 +8777,13 @@
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
      426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
      435,   436,   437,   438,     0,   439,   440,     0,   441,   442,
-     443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,     0,   458,   459,   460,
+     443,   444,   445,   446,   447,  1697,   449,   450,   451,   452,
+       0,  1698,   454,   455,   456,   457,     0,   458,   459,   460,
      461,   462,     0,   463,   464,   465,   466,     0,   467,   468,
      469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
-       0,   479,   480,     0,   481,     0,   482,   483,   484,   485,
+       0,   479,   480,  1699,   481,     0,  1700,   483,   484,   485,
      486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
-     493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
+     493,     0,   494,   495,  1701,   497,   498,   499,   500,     0,
        0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
      508,   509,   510,   511,   512,     0,   513,     0,   514,   515,
      516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
@@ -9353,12 +8792,12 @@
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
      230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
-     233,     0,   234,   235,  1236,   236,   237,   238,   239,   240,
+     233,     0,   234,   235,     0,   236,   237,   238,   239,   240,
        0,   241,   242,     0,   243,   244,   245,   246,   247,     0,
-       0,   715,   249,   250,   251,  1237,     0,   253,   254,   255,
+       0,   248,   249,   250,   251,   252,     0,   253,   254,   255,
      256,   257,     0,     0,     0,   258,   259,   260,   261,     0,
      262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
-       0,     0,   271,   272,   273,     0,     0,     0,     0,     0,
+     666,     0,   271,   272,   273,     0,     0,     0,     0,     0,
        0,     0,   274,   275,   276,   277,   278,   279,   280,   281,
      282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
      289,   290,   291,     0,     0,   292,   293,   294,   295,   296,
@@ -9372,29 +8811,29 @@
      349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
      355,   356,     0,     0,   357,   358,     0,   359,     0,     0,
      360,   361,   362,     0,     0,   363,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,   718,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
      378,     0,   379,   380,   381,   382,     0,   383,   384,     0,
      385,     0,   386,   387,   388,   389,   390,   391,     0,   392,
        0,     0,   393,   394,   395,     0,     0,   396,   397,     0,
      398,     0,   399,   400,   401,   402,   403,   404,   405,   406,
        0,   407,   408,   409,   410,   411,   412,   413,   414,     0,
      415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,   436,   437,   438,     0,   439,   440,     0,   719,
-     442,   443,   444,   445,   446,   447,   720,   449,   450,   451,
-     452,     0,   453,   454,   455,   456,  1229,     0,   458,   459,
+     425,   426,   427,   667,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,     0,   439,   440,     0,   441,
+     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
+     452,   668,   453,   454,   455,   456,   457,     0,   458,   459,
      460,   461,   462,     0,   463,   464,   465,   466,     0,   467,
      468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
      478,     0,   479,   480,     0,   481,     0,   482,   483,   484,
-     485,   486,     0,   722,   488,     0,     0,   723,   490,   491,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
      492,   493,     0,   494,   495,   496,   497,   498,   499,   500,
        0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
      507,   508,   509,   510,   511,   512,     0,   513,     0,   514,
      515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
-     521,   522,   523,   724,   525,   526,   527,   528,   529,   530,
+     521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
      531,   532,   533,   534,   535,   536,   219,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
+       0,   220,   221,   222,   223,   224,   225,   226,   227,   860,
      229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
      232,   233,     0,   234,   235,     0,   236,   237,   238,   239,
      240,     0,   241,   242,     0,   243,   244,   245,   246,   247,
@@ -9409,7 +8848,7 @@
      303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
      312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
        0,     0,     0,   319,   320,   321,     0,   322,   323,     0,
-     324,   325,     0,   326,   327,   328,   329,  1344,     0,   331,
+     324,   325,     0,   326,   327,   328,   329,   861,     0,   331,
      332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
        0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
        0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
@@ -9438,7 +8877,7 @@
      530,   531,   532,   533,   534,   535,   536,   219,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
-    1396,   229,   230,   231,     0,     0,     0,     0,     0,     0,
+       0,   229,   230,   231,     3,     4,     0,     0,     0,     0,
        0,   232,   233,     0,   234,   235,     0,   236,   237,   238,
      239,   240,     0,   241,   242,     0,   243,   244,   245,   246,
      247,     0,     0,   248,   249,   250,   251,   252,     0,   253,
@@ -9452,7 +8891,7 @@
        0,   303,   304,   305,   306,   307,   308,   309,   310,   311,
        0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
      318,     0,     0,     0,   319,   320,   321,     0,   322,   323,
-       0,   324,   325,     0,   326,   327,   328,   329,  1397,     0,
+       0,   324,   325,     0,   326,   327,   328,   329,   330,     0,
      331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
      340,     0,   341,     0,   342,   343,   344,   345,   346,   347,
      348,     0,   349,     0,   350,     0,     0,   351,     0,   352,
@@ -9481,7 +8920,7 @@
      529,   530,   531,   532,   533,   534,   535,   536,   219,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,   695,   229,   230,   231,     0,     0,     0,     0,     0,
+     227,  2803,   229,   230,   231,     0,     0,     0,     0,     0,
        0,     0,   232,   233,     0,   234,   235,     0,   236,   237,
      238,   239,   240,     0,   241,   242,     0,   243,   244,   245,
      246,   247,     0,     0,   248,   249,   250,   251,   252,     0,
@@ -9518,13 +8957,13 @@
      482,   483,   484,   485,   486,     0,   487,   488,     0,     0,
      489,   490,   491,   492,   493,     0,   494,   495,   496,   497,
      498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
-       0,     0,   506,   507,   508,   509,   510,   511,   512,     0,
+    2804,     0,   506,   507,   508,   509,   510,   511,   512,     0,
      513,     0,   514,   515,   516,   517,     0,     0,   518,     0,
        0,   519,   520,   521,   522,   523,   524,   525,   526,   527,
      528,   529,   530,   531,   532,   533,   534,   535,   536,   219,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
-     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
+     226,   227,  2816,   229,   230,   231,     0,     0,     0,     0,
        0,     0,     0,   232,   233,     0,   234,   235,     0,   236,
      237,   238,   239,   240,     0,   241,   242,     0,   243,   244,
      245,   246,   247,     0,     0,   248,   249,   250,   251,   252,
@@ -9537,13 +8976,13 @@
      293,   294,   295,   296,     0,   297,   298,   299,     0,   300,
      301,   302,     0,   303,   304,   305,   306,   307,   308,   309,
      310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
-     317,     0,   318,     0,     0,     0,   319,   320,  2604,     0,
+     317,     0,   318,     0,     0,     0,   319,   320,   321,     0,
      322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
      330,     0,   331,   332,   333,   334,     0,   335,   336,   337,
      338,   339,   340,     0,   341,     0,   342,   343,   344,   345,
      346,   347,   348,     0,   349,     0,   350,     0,     0,   351,
        0,   352,   353,   354,   355,   356,     0,     0,   357,   358,
-       0,   359,     0,     0,   360,   361,  2605,     0,     0,   363,
+       0,   359,     0,     0,   360,   361,   362,     0,     0,   363,
      364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
      374,   375,   376,   377,   378,     0,   379,   380,   381,   382,
        0,   383,   384,     0,   385,     0,   386,   387,   388,   389,
@@ -9557,17 +8996,17 @@
      448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
      457,     0,   458,   459,   460,   461,   462,     0,   463,   464,
      465,   466,     0,   467,   468,   469,   470,   471,   472,   473,
-     474,   475,   476,   477,   478,     0,   479,   480,  2606,   481,
-       0,   482,  2607,   484,  2608,   486,     0,   487,   488,     0,
+     474,   475,   476,   477,   478,     0,   479,   480,     0,   481,
+       0,   482,   483,   484,   485,   486,     0,   487,   488,     0,
        0,   489,   490,   491,   492,   493,     0,   494,   495,   496,
-     497,   498,   499,   500,     0,     0,   501,   502,  2609,   504,
-     505,     0,     0,   506,   507,   508,   509,   510,   511,   512,
+     497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
+     505,  2817,     0,   506,   507,   508,   509,   510,   511,   512,
        0,   513,     0,   514,   515,   516,   517,     0,     0,   518,
        0,     0,   519,   520,   521,   522,   523,   524,   525,   526,
      527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
-     219,     0,   593,     0,     0,     0,     0,     0,     0,     0,
+     219,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
+     225,   226,   227,   228,   229,   230,   231,     0,     0,     0,
        0,     0,     0,     0,   232,   233,     0,   234,   235,     0,
      236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
      244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
@@ -9610,8 +9049,8 @@
      526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
      536,   219,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
-     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
-       0,     0,     0,  3784,     0,   232,   233,     0,   234,   235,
+     224,   225,   226,   227,   584,   229,   230,   231,     0,     0,
+       0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
        0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
      243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
      251,   252,     0,   253,   254,   255,   256,   257,     0,     0,
@@ -9636,7 +9075,7 @@
      388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
      395,     0,     0,   396,   397,     0,   398,     0,   399,   400,
      401,   402,   403,   404,   405,   406,     0,   407,   408,   409,
-     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
+     410,   411,   412,   585,   414,     0,   415,   416,   417,   418,
      419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
      428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
      438,     0,   439,   440,     0,   441,   442,   443,   444,   445,
@@ -9653,8 +9092,8 @@
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
      535,   536,   219,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
-     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
-       0,     0,     0,     0,  3798,     0,   232,   233,     0,   234,
+     223,   224,   225,   226,   227,   695,   229,   230,   231,     0,
+       0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
      235,     0,   236,   237,   238,   239,   240,     0,   241,   242,
        0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
      250,   251,   252,     0,   253,   254,   255,   256,   257,     0,
@@ -9684,11 +9123,11 @@
        0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
      437,   438,     0,   439,   440,     0,   441,   442,   443,   444,
      445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
-     454,   455,   456,   457,     0,   458,   459,   460,   461,   462,
+     454,   455,   456,   696,     0,   458,   459,   460,   461,   462,
        0,   463,   464,   465,   466,     0,   467,   468,   469,   470,
      471,   472,   473,   474,   475,   476,   477,   478,     0,   479,
      480,     0,   481,     0,   482,   483,   484,   485,   486,     0,
-     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
+     697,   488,     0,     0,   698,   490,   491,   492,   493,     0,
      494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
      502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
      510,   511,   512,     0,   513,     0,   514,   515,   516,   517,
@@ -9696,7 +9135,7 @@
      524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
      534,   535,   536,   219,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   220,   221,
-     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
+     222,   223,   224,   225,   226,   227,   729,   229,   230,   231,
        0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
      234,   235,     0,   236,   237,   238,   239,   240,     0,   241,
      242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
@@ -9727,13 +9166,13 @@
      427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
      436,   437,   438,     0,   439,   440,     0,   441,   442,   443,
      444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
-     453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
+     453,   454,   455,   456,   730,     0,   458,   459,   460,   461,
      462,     0,   463,   464,   465,   466,     0,   467,   468,   469,
      470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
      479,   480,     0,   481,     0,   482,   483,   484,   485,   486,
-       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   731,   488,     0,     0,   732,   490,   491,   492,   493,
        0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
-     501,   502,   503,   504,   505,     0,  4464,   506,   507,   508,
+     501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
      509,   510,   511,   512,     0,   513,     0,   514,   515,   516,
      517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
      523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
@@ -9763,7 +9202,7 @@
      369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
        0,   379,   380,   381,   382,     0,   383,   384,     0,   385,
        0,   386,   387,   388,   389,   390,   391,     0,   392,     0,
-       0,   393,   394,   395,     0,     0,   396,   397,     0,   398,
+     735,   393,   394,   395,     0,     0,   396,   397,     0,   398,
        0,   399,   400,   401,   402,   403,   404,   405,   406,     0,
      407,   408,   409,   410,   411,   412,   413,   414,     0,   415,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
@@ -9782,7 +9221,7 @@
      522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
      532,   533,   534,   535,   536,   219,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
+     220,   221,   222,   223,   224,   225,   226,   227,   824,   229,
      230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
      233,     0,   234,   235,     0,   236,   237,   238,   239,   240,
        0,   241,   242,     0,   243,   244,   245,   246,   247,     0,
@@ -9797,7 +9236,7 @@
      304,   305,   306,   307,   308,   309,   310,   311,     0,   312,
        0,   313,   314,   315,   316,     0,   317,     0,   318,     0,
        0,     0,   319,   320,   321,     0,   322,   323,     0,   324,
-     325,     0,   326,   327,   328,   329,   330,     0,   331,   332,
+     325,     0,   326,   327,   328,   329,   825,     0,   331,   332,
      333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
      341,     0,   342,   343,   344,   345,   346,   347,   348,     0,
      349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
@@ -9817,7 +9256,7 @@
      460,   461,   462,     0,   463,   464,   465,   466,     0,   467,
      468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
      478,     0,   479,   480,     0,   481,     0,   482,   483,   484,
-     485,   486,     0,   487,   488,     0,     0,   681,   490,   491,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
      492,   493,     0,   494,   495,   496,   497,   498,   499,   500,
        0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
      507,   508,   509,   510,   511,   512,     0,   513,     0,   514,
@@ -9825,7 +9264,7 @@
      521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
      531,   532,   533,   534,   535,   536,   219,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
+       0,   220,   221,   222,   223,   224,   225,   226,   227,   964,
      229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
      232,   233,     0,   234,   235,     0,   236,   237,   238,   239,
      240,     0,   241,   242,     0,   243,   244,   245,   246,   247,
@@ -9855,7 +9294,7 @@
        0,   415,   416,   417,   418,   419,   420,   421,   422,   423,
      424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
      433,   434,   435,   436,   437,   438,     0,   439,   440,     0,
-     441,   442,   443,   444,   445,   446,   693,   448,   449,   450,
+     441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
      451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
      459,   460,   461,   462,     0,   463,   464,   465,   466,     0,
      467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
@@ -9869,12 +9308,12 @@
      530,   531,   532,   533,   534,   535,   536,   219,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
-       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
+    1226,   229,   230,   231,     0,     0,     0,     0,     0,     0,
        0,   232,   233,     0,   234,   235,     0,   236,   237,   238,
      239,   240,     0,   241,   242,     0,   243,   244,   245,   246,
-     247,     0,     0,   715,   249,   250,   251,   252,     0,   253,
+     247,     0,     0,   248,   249,   250,   251,   252,     0,   253,
      254,   255,   256,   257,     0,     0,     0,   258,   259,   260,
-     261,     0,   262,   263,   264,     0,   716,   266,   267,   268,
+     261,     0,   262,   263,   264,     0,   265,   266,   267,   268,
      269,   270,     0,     0,   271,   272,   273,     0,     0,     0,
        0,     0,     0,     0,   274,   275,   276,   277,   278,   279,
      280,   281,   282,     0,   283,     0,   284,   285,   286,   287,
@@ -9888,9 +9327,9 @@
      340,     0,   341,     0,   342,   343,   344,   345,   346,   347,
      348,     0,   349,     0,   350,     0,     0,   351,     0,   352,
      353,   354,   355,   356,     0,     0,   357,   358,     0,   359,
-       0,     0,   360,   361,   717,     0,     0,   363,   364,   365,
+       0,     0,   360,   361,   362,     0,     0,   363,   364,   365,
      366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   718,   378,     0,   379,   380,   381,   382,     0,   383,
+     376,   377,   378,     0,   379,   380,   381,   382,     0,   383,
      384,     0,   385,     0,   386,   387,   388,   389,   390,   391,
        0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
      397,     0,   398,     0,   399,   400,   401,   402,   403,   404,
@@ -9898,24 +9337,24 @@
      414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
      423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
      432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
-       0,   719,   442,   443,   444,   445,   446,   447,   720,   449,
-     450,   451,   452,     0,   453,   454,   455,   456,   721,     0,
+       0,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,     0,   453,   454,   455,   456,   457,     0,
      458,   459,   460,   461,   462,     0,   463,   464,   465,   466,
        0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
      476,   477,   478,     0,   479,   480,     0,   481,     0,   482,
-     483,   484,   485,   486,     0,   722,   488,     0,     0,   723,
+     483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
      490,   491,   492,   493,     0,   494,   495,   496,   497,   498,
      499,   500,     0,     0,   501,   502,   503,   504,   505,     0,
        0,   506,   507,   508,   509,   510,   511,   512,     0,   513,
        0,   514,   515,   516,   517,     0,     0,   518,     0,     0,
-     519,   520,   521,   522,   523,   724,   525,   526,   527,   528,
+     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
      529,   530,   531,   532,   533,   534,   535,   536,   219,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
      227,     0,   229,   230,   231,     0,     0,     0,     0,     0,
-       0,     0,   232,   233,     0,   234,   235,     0,   236,   237,
+       0,     0,   232,   233,     0,   234,   235,  1237,   236,   237,
      238,   239,   240,     0,   241,   242,     0,   243,   244,   245,
-     246,   247,     0,     0,   248,   249,   250,   251,   252,     0,
+     246,   247,     0,     0,   715,   249,   250,   251,  1238,     0,
      253,   254,   255,   256,   257,     0,     0,     0,   258,   259,
      260,   261,     0,   262,   263,   264,     0,   265,   266,   267,
      268,   269,   270,     0,     0,   271,   272,   273,     0,     0,
@@ -9933,25 +9372,25 @@
      352,   353,   354,   355,   356,     0,     0,   357,   358,     0,
      359,     0,     0,   360,   361,   362,     0,     0,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,     0,   379,   380,   381,   382,     0,
+     375,   376,   718,   378,     0,   379,   380,   381,   382,     0,
      383,   384,     0,   385,     0,   386,   387,   388,   389,   390,
      391,     0,   392,     0,     0,   393,   394,   395,     0,     0,
      396,   397,     0,   398,     0,   399,   400,   401,   402,   403,
      404,   405,   406,     0,   407,   408,   409,   410,   411,   412,
      413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
-     422,   423,   424,   425,   747,   427,     0,   428,   429,   430,
+     422,   423,   424,   425,   426,   427,     0,   428,   429,   430,
      431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,     0,   441,   442,   443,   444,   445,   446,   447,   448,
-     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
+     440,     0,   719,   442,   443,   444,   445,   446,   447,   720,
+     449,   450,   451,   452,     0,   453,   454,   455,   456,  1230,
        0,   458,   459,   460,   461,   462,     0,   463,   464,   465,
      466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
      475,   476,   477,   478,     0,   479,   480,     0,   481,     0,
-     482,   483,   484,   485,   486,     0,   487,   488,     0,     0,
-     489,   490,   491,   492,   493,     0,   494,   495,   496,   497,
+     482,   483,   484,   485,   486,     0,   722,   488,     0,     0,
+     723,   490,   491,   492,   493,     0,   494,   495,   496,   497,
      498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
        0,     0,   506,   507,   508,   509,   510,   511,   512,     0,
      513,     0,   514,   515,   516,   517,     0,     0,   518,     0,
-       0,   519,   520,   521,   522,   523,   524,   525,   526,   527,
+       0,   519,   520,   521,   522,   523,   724,   525,   526,   527,
      528,   529,   530,   531,   532,   533,   534,   535,   536,   219,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
@@ -9970,7 +9409,7 @@
      310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
      317,     0,   318,     0,     0,     0,   319,   320,   321,     0,
      322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
-     848,     0,   331,   332,   333,   334,     0,   335,   336,   337,
+    1345,     0,   331,   332,   333,   334,     0,   335,   336,   337,
      338,   339,   340,     0,   341,     0,   342,   343,   344,   345,
      346,   347,   348,     0,   349,     0,   350,     0,     0,   351,
        0,   352,   353,   354,   355,   356,     0,     0,   357,   358,
@@ -9978,7 +9417,7 @@
      364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
      374,   375,   376,   377,   378,     0,   379,   380,   381,   382,
        0,   383,   384,     0,   385,     0,   386,   387,   388,   389,
-     390,   391,     0,   392,     0,     0,   393,   394,   395,     0,
+     390,   391,     0,   392,     0,   735,   393,   394,   395,     0,
        0,   396,   397,     0,   398,     0,   399,   400,   401,   402,
      403,   404,   405,   406,     0,   407,   408,   409,   410,   411,
      412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
@@ -9998,7 +9437,7 @@
      527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
      219,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
+     225,   226,   227,  1398,   229,   230,   231,     0,     0,     0,
        0,     0,     0,     0,   232,   233,     0,   234,   235,     0,
      236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
      244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
@@ -10013,7 +9452,7 @@
      309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
        0,   317,     0,   318,     0,     0,     0,   319,   320,   321,
        0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
-     329,   855,     0,   331,   332,   333,   334,     0,   335,   336,
+     329,  1399,     0,   331,   332,   333,   334,     0,   335,   336,
      337,   338,   339,   340,     0,   341,     0,   342,   343,   344,
      345,   346,   347,   348,     0,   349,     0,   350,     0,     0,
      351,     0,   352,   353,   354,   355,   356,     0,     0,   357,
@@ -10041,7 +9480,7 @@
      526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
      536,   219,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
-     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
+     224,   225,   226,   227,   695,   229,   230,   231,     0,     0,
        0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
        0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
      243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
@@ -10056,7 +9495,7 @@
      308,   309,   310,   311,     0,   312,     0,   313,   314,   315,
      316,     0,   317,     0,   318,     0,     0,     0,   319,   320,
      321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
-     328,   329,   870,     0,   331,   332,   333,   334,     0,   335,
+     328,   329,   330,     0,   331,   332,   333,   334,     0,   335,
      336,   337,   338,   339,   340,     0,   341,     0,   342,   343,
      344,   345,   346,   347,   348,     0,   349,     0,   350,     0,
        0,   351,     0,   352,   353,   354,   355,   356,     0,     0,
@@ -10098,12 +9537,12 @@
      299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
      307,   308,   309,   310,   311,     0,   312,     0,   313,   314,
      315,   316,     0,   317,     0,   318,     0,     0,     0,   319,
-     320,   321,     0,   322,   323,     0,   324,   325,     0,   326,
-     327,   328,   329,   925,     0,   331,   332,   333,   334,     0,
+     320,  2610,     0,   322,   323,     0,   324,   325,     0,   326,
+     327,   328,   329,   330,     0,   331,   332,   333,   334,     0,
      335,   336,   337,   338,   339,   340,     0,   341,     0,   342,
      343,   344,   345,   346,   347,   348,     0,   349,     0,   350,
        0,     0,   351,     0,   352,   353,   354,   355,   356,     0,
-       0,   357,   358,     0,   359,     0,     0,   360,   361,   362,
+       0,   357,   358,     0,   359,     0,     0,   360,   361,  2611,
        0,     0,   363,   364,   365,   366,   367,   368,   369,   370,
      371,   372,   373,   374,   375,   376,   377,   378,     0,   379,
      380,   381,   382,     0,   383,   384,     0,   385,     0,   386,
@@ -10118,14 +9557,14 @@
      454,   455,   456,   457,     0,   458,   459,   460,   461,   462,
        0,   463,   464,   465,   466,     0,   467,   468,   469,   470,
      471,   472,   473,   474,   475,   476,   477,   478,     0,   479,
-     480,     0,   481,     0,   482,   483,   484,   485,   486,     0,
+     480,  2612,   481,     0,   482,  2613,   484,  2614,   486,     0,
      487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
      494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
-     502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
+     502,  2615,   504,   505,     0,     0,   506,   507,   508,   509,
      510,   511,   512,     0,   513,     0,   514,   515,   516,   517,
        0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
      524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
-     534,   535,   536,   219,     0,     0,     0,     0,     0,     0,
+     534,   535,   536,   219,     0,   593,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   220,   221,
      222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
        0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
@@ -10142,7 +9581,7 @@
      306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
      314,   315,   316,     0,   317,     0,   318,     0,     0,     0,
      319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
-     326,   327,   328,   329,   941,     0,   331,   332,   333,   334,
+     326,   327,   328,   329,   330,     0,   331,   332,   333,   334,
        0,   335,   336,   337,   338,   339,   340,     0,   341,     0,
      342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
      350,     0,     0,   351,     0,   352,   353,   354,   355,   356,
@@ -10171,7 +9610,7 @@
      533,   534,   535,   536,   219,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,   220,
      221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
-     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
+     231,     0,     0,     0,     0,     0,  3790,     0,   232,   233,
        0,   234,   235,     0,   236,   237,   238,   239,   240,     0,
      241,   242,     0,   243,   244,   245,   246,   247,     0,     0,
      248,   249,   250,   251,   252,     0,   253,   254,   255,   256,
@@ -10185,7 +9624,7 @@
      305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
      313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
        0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
-       0,   326,   327,   328,   329,   975,     0,   331,   332,   333,
+       0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
      334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
        0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
        0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
@@ -10214,7 +9653,7 @@
      532,   533,   534,   535,   536,   219,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
-     230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
+     230,   231,     0,     0,     0,     0,     0,  3804,     0,   232,
      233,     0,   234,   235,     0,   236,   237,   238,   239,   240,
        0,   241,   242,     0,   243,   244,   245,   246,   247,     0,
        0,   248,   249,   250,   251,   252,     0,   253,   254,   255,
@@ -10228,7 +9667,7 @@
      304,   305,   306,   307,   308,   309,   310,   311,     0,   312,
        0,   313,   314,   315,   316,     0,   317,     0,   318,     0,
        0,     0,   319,   320,   321,     0,   322,   323,     0,   324,
-     325,     0,   326,   327,   328,   329,  1031,     0,   331,   332,
+     325,     0,   326,   327,   328,   329,   330,     0,   331,   332,
      333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
      341,     0,   342,   343,   344,   345,   346,   347,   348,     0,
      349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
@@ -10271,7 +9710,7 @@
      303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
      312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
        0,     0,     0,   319,   320,   321,     0,   322,   323,     0,
-     324,   325,     0,   326,   327,   328,   329,  1035,     0,   331,
+     324,   325,     0,   326,   327,   328,   329,   330,     0,   331,
      332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
        0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
        0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
@@ -10293,7 +9732,7 @@
      477,   478,     0,   479,   480,     0,   481,     0,   482,   483,
      484,   485,   486,     0,   487,   488,     0,     0,   489,   490,
      491,   492,   493,     0,   494,   495,   496,   497,   498,   499,
-     500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
+     500,     0,     0,   501,   502,   503,   504,   505,     0,  4470,
      506,   507,   508,   509,   510,   511,   512,     0,   513,     0,
      514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
      520,   521,   522,   523,   524,   525,   526,   527,   528,   529,
@@ -10314,7 +9753,7 @@
        0,   303,   304,   305,   306,   307,   308,   309,   310,   311,
        0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
      318,     0,     0,     0,   319,   320,   321,     0,   322,   323,
-       0,   324,   325,     0,   326,   327,   328,   329,  1037,     0,
+       0,   324,   325,     0,   326,   327,   328,   329,   330,     0,
      331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
      340,     0,   341,     0,   342,   343,   344,   345,   346,   347,
      348,     0,   349,     0,   350,     0,     0,   351,     0,   352,
@@ -10357,7 +9796,7 @@
      302,     0,   303,   304,   305,   306,   307,   308,   309,   310,
      311,     0,   312,     0,   313,   314,   315,   316,     0,   317,
        0,   318,     0,     0,     0,   319,   320,   321,     0,   322,
-     323,     0,   324,   325,     0,   326,   327,   328,   329,  1039,
+     323,     0,   324,   325,     0,   326,   327,   328,   329,   330,
        0,   331,   332,   333,   334,     0,   335,   336,   337,   338,
      339,   340,     0,   341,     0,   342,   343,   344,   345,   346,
      347,   348,     0,   349,     0,   350,     0,     0,   351,     0,
@@ -10378,7 +9817,7 @@
      466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
      475,   476,   477,   478,     0,   479,   480,     0,   481,     0,
      482,   483,   484,   485,   486,     0,   487,   488,     0,     0,
-     489,   490,   491,   492,   493,     0,   494,   495,   496,   497,
+     681,   490,   491,   492,   493,     0,   494,   495,   496,   497,
      498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
        0,     0,   506,   507,   508,   509,   510,   511,   512,     0,
      513,     0,   514,   515,   516,   517,     0,     0,   518,     0,
@@ -10401,7 +9840,7 @@
      310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
      317,     0,   318,     0,     0,     0,   319,   320,   321,     0,
      322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
-    1043,     0,   331,   332,   333,   334,     0,   335,   336,   337,
+     330,     0,   331,   332,   333,   334,     0,   335,   336,   337,
      338,   339,   340,     0,   341,     0,   342,   343,   344,   345,
      346,   347,   348,     0,   349,     0,   350,     0,     0,   351,
        0,   352,   353,   354,   355,   356,     0,     0,   357,   358,
@@ -10415,7 +9854,7 @@
      412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
      421,   422,   423,   424,   425,   426,   427,     0,   428,   429,
      430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
-     439,   440,     0,   441,   442,   443,   444,   445,   446,   447,
+     439,   440,     0,   441,   442,   443,   444,   445,   446,   693,
      448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
      457,     0,   458,   459,   460,   461,   462,     0,   463,   464,
      465,   466,     0,   467,   468,   469,   470,   471,   472,   473,
@@ -10432,9 +9871,9 @@
      225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
        0,     0,     0,     0,   232,   233,     0,   234,   235,     0,
      236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
-     244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
+     244,   245,   246,   247,     0,     0,   715,   249,   250,   251,
      252,     0,   253,   254,   255,   256,   257,     0,     0,     0,
-     258,   259,   260,   261,     0,   262,   263,   264,     0,   265,
+     258,   259,   260,   261,     0,   262,   263,   264,     0,   716,
      266,   267,   268,   269,   270,     0,     0,   271,   272,   273,
        0,     0,     0,     0,     0,     0,     0,   274,   275,   276,
      277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
@@ -10444,13 +9883,13 @@
      309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
        0,   317,     0,   318,     0,     0,     0,   319,   320,   321,
        0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
-     329,  1051,     0,   331,   332,   333,   334,     0,   335,   336,
+     329,   330,     0,   331,   332,   333,   334,     0,   335,   336,
      337,   338,   339,   340,     0,   341,     0,   342,   343,   344,
      345,   346,   347,   348,     0,   349,     0,   350,     0,     0,
      351,     0,   352,   353,   354,   355,   356,     0,     0,   357,
-     358,     0,   359,     0,     0,   360,   361,   362,     0,     0,
+     358,     0,   359,     0,     0,   360,   361,   717,     0,     0,
      363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,     0,   379,   380,   381,
+     373,   374,   375,   376,   718,   378,     0,   379,   380,   381,
      382,     0,   383,   384,     0,   385,     0,   386,   387,   388,
      389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
        0,     0,   396,   397,     0,   398,     0,   399,   400,   401,
@@ -10458,24 +9897,24 @@
      411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,     0,   441,   442,   443,   444,   445,   446,
-     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,     0,   458,   459,   460,   461,   462,     0,   463,
+       0,   439,   440,     0,   719,   442,   443,   444,   445,   446,
+     447,   720,   449,   450,   451,   452,     0,   453,   454,   455,
+     456,   721,     0,   458,   459,   460,   461,   462,     0,   463,
      464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
      473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
-     481,     0,   482,   483,   484,   485,   486,     0,   487,   488,
-       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
+     481,     0,   482,   483,   484,   485,   486,     0,   722,   488,
+       0,     0,   723,   490,   491,   492,   493,     0,   494,   495,
      496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
      504,   505,     0,     0,   506,   507,   508,   509,   510,   511,
      512,     0,   513,     0,   514,   515,   516,   517,     0,     0,
-     518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
+     518,     0,     0,   519,   520,   521,   522,   523,   724,   525,
      526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
      536,   219,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
      224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
        0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
        0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
-     243,   244,   245,   246,   247,     0,     0,   715,   249,   250,
+     243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
      251,   252,     0,   253,   254,   255,   256,   257,     0,     0,
        0,   258,   259,   260,   261,     0,   262,   263,   264,     0,
      265,   266,   267,   268,   269,   270,     0,     0,   271,   272,
@@ -10493,25 +9932,25 @@
        0,   351,     0,   352,   353,   354,   355,   356,     0,     0,
      357,   358,     0,   359,     0,     0,   360,   361,   362,     0,
        0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   718,   378,     0,   379,   380,
+     372,   373,   374,   375,   376,   377,   378,     0,   379,   380,
      381,   382,     0,   383,   384,     0,   385,     0,   386,   387,
      388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
      395,     0,     0,   396,   397,     0,   398,     0,   399,   400,
      401,   402,   403,   404,   405,   406,     0,   407,   408,   409,
      410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
+     419,   420,   421,   422,   423,   424,   425,   747,   427,     0,
      428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,     0,   719,   442,   443,   444,   445,
-     446,   447,   720,   449,   450,   451,   452,     0,   453,   454,
-     455,   456,  1229,     0,   458,   459,   460,   461,   462,     0,
+     438,     0,   439,   440,     0,   441,   442,   443,   444,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,     0,   458,   459,   460,   461,   462,     0,
      463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
      472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
-       0,   481,     0,   482,   483,   484,   485,   486,     0,   722,
-     488,     0,     0,   723,   490,   491,   492,   493,     0,   494,
+       0,   481,     0,   482,   483,   484,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
      495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
      503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
      511,   512,     0,   513,     0,   514,   515,   516,   517,     0,
-       0,   518,     0,     0,   519,   520,   521,   522,   523,   724,
+       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
      535,   536,   219,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
@@ -10530,7 +9969,7 @@
      307,   308,   309,   310,   311,     0,   312,     0,   313,   314,
      315,   316,     0,   317,     0,   318,     0,     0,     0,   319,
      320,   321,     0,   322,   323,     0,   324,   325,     0,   326,
-     327,   328,   329,  1520,     0,   331,   332,   333,   334,     0,
+     327,   328,   329,   848,     0,   331,   332,   333,   334,     0,
      335,   336,   337,   338,   339,   340,     0,   341,     0,   342,
      343,   344,   345,   346,   347,   348,     0,   349,     0,   350,
        0,     0,   351,     0,   352,   353,   354,   355,   356,     0,
@@ -10573,7 +10012,7 @@
      306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
      314,   315,   316,     0,   317,     0,   318,     0,     0,     0,
      319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
-     326,   327,   328,   329,  1550,     0,   331,   332,   333,   334,
+     326,   327,   328,   329,   855,     0,   331,   332,   333,   334,
        0,   335,   336,   337,   338,   339,   340,     0,   341,     0,
      342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
      350,     0,     0,   351,     0,   352,   353,   354,   355,   356,
@@ -10616,7 +10055,7 @@
      305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
      313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
        0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
-       0,   326,   327,   328,   329,  1552,     0,   331,   332,   333,
+       0,   326,   327,   328,   329,   871,     0,   331,   332,   333,
      334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
        0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
        0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
@@ -10659,7 +10098,7 @@
      304,   305,   306,   307,   308,   309,   310,   311,     0,   312,
        0,   313,   314,   315,   316,     0,   317,     0,   318,     0,
        0,     0,   319,   320,   321,     0,   322,   323,     0,   324,
-     325,     0,   326,   327,   328,   329,  1622,     0,   331,   332,
+     325,     0,   326,   327,   328,   329,   926,     0,   331,   332,
      333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
      341,     0,   342,   343,   344,   345,   346,   347,   348,     0,
      349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
@@ -10702,7 +10141,7 @@
      303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
      312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
        0,     0,     0,   319,   320,   321,     0,   322,   323,     0,
-     324,   325,     0,   326,   327,   328,   329,  1624,     0,   331,
+     324,   325,     0,   326,   327,   328,   329,   942,     0,   331,
      332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
        0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
        0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
@@ -10745,7 +10184,7 @@
        0,   303,   304,   305,   306,   307,   308,   309,   310,   311,
        0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
      318,     0,     0,     0,   319,   320,   321,     0,   322,   323,
-       0,   324,   325,     0,   326,   327,   328,   329,  1626,     0,
+       0,   324,   325,     0,   326,   327,   328,   329,   976,     0,
      331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
      340,     0,   341,     0,   342,   343,   344,   345,   346,   347,
      348,     0,   349,     0,   350,     0,     0,   351,     0,   352,
@@ -10788,7 +10227,7 @@
      302,     0,   303,   304,   305,   306,   307,   308,   309,   310,
      311,     0,   312,     0,   313,   314,   315,   316,     0,   317,
        0,   318,     0,     0,     0,   319,   320,   321,     0,   322,
-     323,     0,   324,   325,     0,   326,   327,   328,   329,   330,
+     323,     0,   324,   325,     0,   326,   327,   328,   329,  1032,
        0,   331,   332,   333,   334,     0,   335,   336,   337,   338,
      339,   340,     0,   341,     0,   342,   343,   344,   345,   346,
      347,   348,     0,   349,     0,   350,     0,     0,   351,     0,
@@ -10803,7 +10242,7 @@
      413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
      422,   423,   424,   425,   426,   427,     0,   428,   429,   430,
      431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,     0,   441,   442,   443,   444,   445,   446,  1722,   448,
+     440,     0,   441,   442,   443,   444,   445,   446,   447,   448,
      449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
        0,   458,   459,   460,   461,   462,     0,   463,   464,   465,
      466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
@@ -10818,7 +10257,7 @@
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
      226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
-       0,  1982,     0,   232,   233,     0,   234,   235,     0,   236,
+       0,     0,     0,   232,   233,     0,   234,   235,     0,   236,
      237,   238,   239,   240,     0,   241,   242,     0,   243,   244,
      245,   246,   247,     0,     0,   248,   249,   250,   251,   252,
        0,   253,   254,   255,   256,   257,     0,     0,     0,   258,
@@ -10832,7 +10271,7 @@
      310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
      317,     0,   318,     0,     0,     0,   319,   320,   321,     0,
      322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
-     330,     0,   331,   332,   333,   334,     0,   335,   336,   337,
+    1036,     0,   331,   332,   333,   334,     0,   335,   336,   337,
      338,   339,   340,     0,   341,     0,   342,   343,   344,   345,
      346,   347,   348,     0,   349,     0,   350,     0,     0,   351,
        0,   352,   353,   354,   355,   356,     0,     0,   357,   358,
@@ -10848,7 +10287,7 @@
      430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
      439,   440,     0,   441,   442,   443,   444,   445,   446,   447,
      448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
-     457,     0,     0,   459,   460,   461,   462,     0,   463,   464,
+     457,     0,   458,   459,   460,   461,   462,     0,   463,   464,
      465,   466,     0,   467,   468,   469,   470,   471,   472,   473,
      474,   475,   476,   477,   478,     0,   479,   480,     0,   481,
        0,   482,   483,   484,   485,   486,     0,   487,   488,     0,
@@ -10863,7 +10302,7 @@
      225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
        0,     0,     0,     0,   232,   233,     0,   234,   235,     0,
      236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
-     244,   245,   246,   247,     0,     0,   715,   249,   250,   251,
+     244,   245,   246,   247,     0,     0,   248,   249,   250,   251,
      252,     0,   253,   254,   255,   256,   257,     0,     0,     0,
      258,   259,   260,   261,     0,   262,   263,   264,     0,   265,
      266,   267,   268,   269,   270,     0,     0,   271,   272,   273,
@@ -10875,13 +10314,13 @@
      309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
        0,   317,     0,   318,     0,     0,     0,   319,   320,   321,
        0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
-     329,   330,     0,   331,   332,   333,   334,     0,   335,   336,
+     329,  1038,     0,   331,   332,   333,   334,     0,   335,   336,
      337,   338,   339,   340,     0,   341,     0,   342,   343,   344,
      345,   346,   347,   348,     0,   349,     0,   350,     0,     0,
      351,     0,   352,   353,   354,   355,   356,     0,     0,   357,
      358,     0,   359,     0,     0,   360,   361,   362,     0,     0,
      363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   718,   378,     0,   379,   380,   381,
+     373,   374,   375,   376,   377,   378,     0,   379,   380,   381,
      382,     0,   383,   384,     0,   385,     0,   386,   387,   388,
      389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
        0,     0,   396,   397,     0,   398,     0,   399,   400,   401,
@@ -10889,24 +10328,24 @@
      411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,     0,   719,   442,   443,   444,   445,   446,
-     447,   720,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,  1229,     0,   458,   459,   460,   461,   462,     0,   463,
+       0,   439,   440,     0,   441,   442,   443,   444,   445,   446,
+     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
+     456,   457,     0,   458,   459,   460,   461,   462,     0,   463,
      464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
      473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
-     481,     0,  2014,   483,   484,   485,   486,     0,   722,   488,
-       0,     0,   723,   490,   491,   492,   493,     0,   494,   495,
+     481,     0,   482,   483,   484,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
      496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
      504,   505,     0,     0,   506,   507,   508,   509,   510,   511,
      512,     0,   513,     0,   514,   515,   516,   517,     0,     0,
-     518,     0,     0,   519,   520,   521,   522,   523,   724,   525,
+     518,     0,     0,   519,   520,   521,   522,   523,   524,   525,
      526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
      536,   219,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
      224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
        0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
        0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
-     243,   244,   245,   246,   247,     0,     0,   715,   249,   250,
+     243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
      251,   252,     0,   253,   254,   255,   256,   257,     0,     0,
        0,   258,   259,   260,   261,     0,   262,   263,   264,     0,
      265,   266,   267,   268,   269,   270,     0,     0,   271,   272,
@@ -10918,13 +10357,13 @@
      308,   309,   310,   311,     0,   312,     0,   313,   314,   315,
      316,     0,   317,     0,   318,     0,     0,     0,   319,   320,
      321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
-     328,   329,   330,     0,   331,   332,   333,   334,     0,   335,
+     328,   329,  1040,     0,   331,   332,   333,   334,     0,   335,
      336,   337,   338,   339,   340,     0,   341,     0,   342,   343,
      344,   345,   346,   347,   348,     0,   349,     0,   350,     0,
        0,   351,     0,   352,   353,   354,   355,   356,     0,     0,
      357,   358,     0,   359,     0,     0,   360,   361,   362,     0,
        0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   718,   378,     0,   379,   380,
+     372,   373,   374,   375,   376,   377,   378,     0,   379,   380,
      381,   382,     0,   383,   384,     0,   385,     0,   386,   387,
      388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
      395,     0,     0,   396,   397,     0,   398,     0,   399,   400,
@@ -10932,17 +10371,17 @@
      410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
      419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
      428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,     0,   719,   442,   443,   444,   445,
-     446,   447,  2086,   449,   450,   451,   452,     0,   453,   454,
-     455,   456,  2087,     0,   458,   459,   460,   461,   462,     0,
+     438,     0,   439,   440,     0,   441,   442,   443,   444,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,     0,   458,   459,   460,   461,   462,     0,
      463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
      472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
-       0,   481,     0,   482,   483,   484,   485,   486,     0,   722,
-     488,     0,     0,  2088,   490,   491,   492,   493,     0,   494,
+       0,   481,     0,   482,   483,   484,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
      495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
      503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
      511,   512,     0,   513,     0,   514,   515,   516,   517,     0,
-       0,   518,     0,     0,   519,   520,   521,   522,   523,   724,
+       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
      535,   536,   219,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
@@ -10961,7 +10400,7 @@
      307,   308,   309,   310,   311,     0,   312,     0,   313,   314,
      315,   316,     0,   317,     0,   318,     0,     0,     0,   319,
      320,   321,     0,   322,   323,     0,   324,   325,     0,   326,
-     327,   328,   329,  2323,     0,   331,   332,   333,   334,     0,
+     327,   328,   329,  1044,     0,   331,   332,   333,   334,     0,
      335,   336,   337,   338,   339,   340,     0,   341,     0,   342,
      343,   344,   345,   346,   347,   348,     0,   349,     0,   350,
        0,     0,   351,     0,   352,   353,   354,   355,   356,     0,
@@ -11004,7 +10443,7 @@
      306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
      314,   315,   316,     0,   317,     0,   318,     0,     0,     0,
      319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
-     326,   327,   328,   329,  2327,     0,   331,   332,   333,   334,
+     326,   327,   328,   329,  1052,     0,   331,   332,   333,   334,
        0,   335,   336,   337,   338,   339,   340,     0,   341,     0,
      342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
      350,     0,     0,   351,     0,   352,   353,   354,   355,   356,
@@ -11036,7 +10475,7 @@
      231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
        0,   234,   235,     0,   236,   237,   238,   239,   240,     0,
      241,   242,     0,   243,   244,   245,   246,   247,     0,     0,
-     248,   249,   250,   251,   252,     0,   253,   254,   255,   256,
+     715,   249,   250,   251,   252,     0,   253,   254,   255,   256,
      257,     0,     0,     0,   258,   259,   260,   261,     0,   262,
      263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
        0,   271,   272,   273,     0,     0,     0,     0,     0,     0,
@@ -11047,13 +10486,13 @@
      305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
      313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
        0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
-       0,   326,   327,   328,   329,  2367,     0,   331,   332,   333,
+       0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
      334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
        0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
        0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
      356,     0,     0,   357,   358,     0,   359,     0,     0,   360,
      361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
+     369,   370,   371,   372,   373,   374,   375,   376,   718,   378,
        0,   379,   380,   381,   382,     0,   383,   384,     0,   385,
        0,   386,   387,   388,   389,   390,   391,     0,   392,     0,
        0,   393,   394,   395,     0,     0,   396,   397,     0,   398,
@@ -11061,18 +10500,18 @@
      407,   408,   409,   410,   411,   412,   413,   414,     0,   415,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
      426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,     0,   439,   440,     0,   441,   442,
-     443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
-       0,   453,   454,   455,   456,   457,     0,   458,   459,   460,
+     435,   436,   437,   438,     0,   439,   440,     0,   719,   442,
+     443,   444,   445,   446,   447,   720,   449,   450,   451,   452,
+       0,   453,   454,   455,   456,  1230,     0,   458,   459,   460,
      461,   462,     0,   463,   464,   465,   466,     0,   467,   468,
      469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
        0,   479,   480,     0,   481,     0,   482,   483,   484,   485,
-     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     486,     0,   722,   488,     0,     0,   723,   490,   491,   492,
      493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
        0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
      508,   509,   510,   511,   512,     0,   513,     0,   514,   515,
      516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
-     522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
+     522,   523,   724,   525,   526,   527,   528,   529,   530,   531,
      532,   533,   534,   535,   536,   219,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
@@ -11090,7 +10529,7 @@
      304,   305,   306,   307,   308,   309,   310,   311,     0,   312,
        0,   313,   314,   315,   316,     0,   317,     0,   318,     0,
        0,     0,   319,   320,   321,     0,   322,   323,     0,   324,
-     325,     0,   326,   327,   328,   329,  2402,     0,   331,   332,
+     325,     0,   326,   327,   328,   329,  1522,     0,   331,   332,
      333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
      341,     0,   342,   343,   344,   345,   346,   347,   348,     0,
      349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
@@ -11133,7 +10572,7 @@
      303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
      312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
        0,     0,     0,   319,   320,   321,     0,   322,   323,     0,
-     324,   325,     0,   326,   327,   328,   329,  2725,     0,   331,
+     324,   325,     0,   326,   327,   328,   329,  1552,     0,   331,
      332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
        0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
        0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
@@ -11165,7 +10604,7 @@
        0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
        0,   232,   233,     0,   234,   235,     0,   236,   237,   238,
      239,   240,     0,   241,   242,     0,   243,   244,   245,   246,
-     247,     0,     0,   715,   249,   250,   251,   252,     0,   253,
+     247,     0,     0,   248,   249,   250,   251,   252,     0,   253,
      254,   255,   256,   257,     0,     0,     0,   258,   259,   260,
      261,     0,   262,   263,   264,     0,   265,   266,   267,   268,
      269,   270,     0,     0,   271,   272,   273,     0,     0,     0,
@@ -11176,14 +10615,14 @@
        0,   303,   304,   305,   306,   307,   308,   309,   310,   311,
        0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
      318,     0,     0,     0,   319,   320,   321,     0,   322,   323,
-       0,   324,   325,     0,   326,   327,   328,   329,   330,     0,
+       0,   324,   325,     0,   326,   327,   328,   329,  1554,     0,
      331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
      340,     0,   341,     0,   342,   343,   344,   345,   346,   347,
      348,     0,   349,     0,   350,     0,     0,   351,     0,   352,
      353,   354,   355,   356,     0,     0,   357,   358,     0,   359,
        0,     0,   360,   361,   362,     0,     0,   363,   364,   365,
      366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   718,   378,     0,   379,   380,   381,   382,     0,   383,
+     376,   377,   378,     0,   379,   380,   381,   382,     0,   383,
      384,     0,   385,     0,   386,   387,   388,   389,   390,   391,
        0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
      397,     0,   398,     0,   399,   400,   401,   402,   403,   404,
@@ -11191,17 +10630,17 @@
      414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
      423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
      432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
-       0,   719,   442,   443,   444,   445,   446,   447,   720,   449,
-     450,   451,   452,     0,   453,   454,   455,   456,  2087,     0,
+       0,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,     0,   453,   454,   455,   456,   457,     0,
      458,   459,   460,   461,   462,     0,   463,   464,   465,   466,
        0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
      476,   477,   478,     0,   479,   480,     0,   481,     0,   482,
-     483,   484,   485,   486,     0,   722,   488,     0,     0,  2088,
+     483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
      490,   491,   492,   493,     0,   494,   495,   496,   497,   498,
      499,   500,     0,     0,   501,   502,   503,   504,   505,     0,
        0,   506,   507,   508,   509,   510,   511,   512,     0,   513,
        0,   514,   515,   516,   517,     0,     0,   518,     0,     0,
-     519,   520,   521,   522,   523,   724,   525,   526,   527,   528,
+     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
      529,   530,   531,   532,   533,   534,   535,   536,   219,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
@@ -11219,7 +10658,7 @@
      302,     0,   303,   304,   305,   306,   307,   308,   309,   310,
      311,     0,   312,     0,   313,   314,   315,   316,     0,   317,
        0,   318,     0,     0,     0,   319,   320,   321,     0,   322,
-     323,     0,   324,   325,     0,   326,   327,   328,   329,  2800,
+     323,     0,   324,   325,     0,   326,   327,   328,   329,  1624,
        0,   331,   332,   333,   334,     0,   335,   336,   337,   338,
      339,   340,     0,   341,     0,   342,   343,   344,   345,   346,
      347,   348,     0,   349,     0,   350,     0,     0,   351,     0,
@@ -11263,7 +10702,7 @@
      310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
      317,     0,   318,     0,     0,     0,   319,   320,   321,     0,
      322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
-    2802,     0,   331,   332,   333,   334,     0,   335,   336,   337,
+    1626,     0,   331,   332,   333,   334,     0,   335,   336,   337,
      338,   339,   340,     0,   341,     0,   342,   343,   344,   345,
      346,   347,   348,     0,   349,     0,   350,     0,     0,   351,
        0,   352,   353,   354,   355,   356,     0,     0,   357,   358,
@@ -11306,7 +10745,7 @@
      309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
        0,   317,     0,   318,     0,     0,     0,   319,   320,   321,
        0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
-     329,  2914,     0,   331,   332,   333,   334,     0,   335,   336,
+     329,  1628,     0,   331,   332,   333,   334,     0,   335,   336,
      337,   338,   339,   340,     0,   341,     0,   342,   343,   344,
      345,   346,   347,   348,     0,   349,     0,   350,     0,     0,
      351,     0,   352,   353,   354,   355,   356,     0,     0,   357,
@@ -11344,7 +10783,7 @@
      273,     0,     0,     0,     0,     0,     0,     0,   274,   275,
      276,   277,   278,   279,   280,   281,   282,     0,   283,     0,
      284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
-       0,   292,  2936,   294,   295,   296,     0,   297,   298,   299,
+       0,   292,   293,   294,   295,   296,     0,   297,   298,   299,
        0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
      308,   309,   310,   311,     0,   312,     0,   313,   314,   315,
      316,     0,   317,     0,   318,     0,     0,     0,   319,   320,
@@ -11364,7 +10803,7 @@
      419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
      428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
      438,     0,   439,   440,     0,   441,   442,   443,   444,   445,
-     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     446,  1724,   448,   449,   450,   451,   452,     0,   453,   454,
      455,   456,   457,     0,   458,   459,   460,   461,   462,     0,
      463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
      472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
@@ -11378,7 +10817,7 @@
      535,   536,   219,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
      223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
-       0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
+       0,     0,     0,     0,  1984,     0,   232,   233,     0,   234,
      235,     0,   236,   237,   238,   239,   240,     0,   241,   242,
        0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
      250,   251,   252,     0,   253,   254,   255,   256,   257,     0,
@@ -11392,7 +10831,7 @@
      307,   308,   309,   310,   311,     0,   312,     0,   313,   314,
      315,   316,     0,   317,     0,   318,     0,     0,     0,   319,
      320,   321,     0,   322,   323,     0,   324,   325,     0,   326,
-     327,   328,   329,  4039,     0,   331,   332,   333,   334,     0,
+     327,   328,   329,   330,     0,   331,   332,   333,   334,     0,
      335,   336,   337,   338,   339,   340,     0,   341,     0,   342,
      343,   344,   345,   346,   347,   348,     0,   349,     0,   350,
        0,     0,   351,     0,   352,   353,   354,   355,   356,     0,
@@ -11408,7 +10847,7 @@
        0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
      437,   438,     0,   439,   440,     0,   441,   442,   443,   444,
      445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
-     454,   455,   456,   457,     0,   458,   459,   460,   461,   462,
+     454,   455,   456,   457,     0,     0,   459,   460,   461,   462,
        0,   463,   464,   465,   466,     0,   467,   468,   469,   470,
      471,   472,   473,   474,   475,   476,   477,   478,     0,   479,
      480,     0,   481,     0,   482,   483,   484,   485,   486,     0,
@@ -11418,3606 +10857,3186 @@
      510,   511,   512,     0,   513,     0,   514,   515,   516,   517,
        0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
      524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
-     534,   535,   536,   977,     0,     0,     0,     0,     0,     0,
+     534,   535,   536,   219,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   220,   221,
      222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
        0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
-     234,   235,   772,   236,   237,   238,     0,   978,   773,   979,
-     980,     0,   243,   244,   245,   246,   247,     0,     0,   248,
-     249,   981,   982,   252,     0,   253,   254,   255,   256,     0,
-       0,   774,     0,   258,   259,   260,   261,   775,   262,   263,
-     264,     0,   265,   266,   267,   268,   269,   270,     0,   776,
-     271,   272,   273,     0,     0,     0,   777,     0,     0,     0,
-     274,   275,   276,   277,   278,   279,   983,   984,   282,     0,
+     234,   235,     0,   236,   237,   238,   239,   240,     0,   241,
+     242,     0,   243,   244,   245,   246,   247,     0,     0,   715,
+     249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
+       0,     0,     0,   258,   259,   260,   261,     0,   262,   263,
+     264,     0,   265,   266,   267,   268,   269,   270,     0,     0,
+     271,   272,   273,     0,     0,     0,     0,     0,     0,     0,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
      283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
-     291,     0,     0,   292,   293,   985,   295,   296,     0,   297,
+     291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
      298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
-     306,     0,   308,   309,   310,     0,     0,   312,     0,   313,
-     314,   986,   316,     0,   317,     0,   318,   778,     0,   779,
-     319,   320,   321,     0,   322,     0,     0,     0,   325,     0,
-     326,   327,   328,   329,   330,   780,   331,   332,   333,   334,
-    1985,   335,   336,   337,   338,   339,   340,     0,   341,   781,
-    1986,   343,   344,   345,   346,   988,   989,     0,   990,     0,
-     350,   782,   783,   351,   784,   352,   353,   354,   355,   356,
-       0,     0,   357,     0,   785,   359,   786,     0,   360,   361,
+     306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
+     314,   315,   316,     0,   317,     0,   318,     0,     0,     0,
+     319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
+     326,   327,   328,   329,   330,     0,   331,   332,   333,   334,
+       0,   335,   336,   337,   338,   339,   340,     0,   341,     0,
+     342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
+     350,     0,     0,   351,     0,   352,   353,   354,   355,   356,
+       0,     0,   357,   358,     0,   359,     0,     0,   360,   361,
      362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   991,   787,
-     992,   380,   381,     0,     0,   383,   384,   788,   385,     0,
-       0,   387,   993,   389,   390,   391,     0,   392,     0,     0,
-     393,   394,   395,     0,     0,   396,  1988,   789,   398,   790,
-       0,   400,   401,   402,   403,   404,   405,   406,     0,   407,
-     408,     0,   410,     0,   412,   413,   414,     0,   415,   416,
-     417,   418,   419,   420,   421,   422,   994,   424,   425,   426,
+     370,   371,   372,   373,   374,   375,   376,   718,   378,     0,
+     379,   380,   381,   382,     0,   383,   384,     0,   385,     0,
+     386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
+     393,   394,   395,     0,     0,   396,   397,     0,   398,     0,
+     399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
+     408,   409,   410,   411,   412,   413,   414,     0,   415,   416,
+     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
      427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-     436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
-       0,   445,   446,   447,   448,   449,   450,   451,   452,     0,
-     453,   454,   455,   456,   457,     0,   458,   459,  1989,   461,
-     462,   792,   463,   464,   996,   466,     0,   467,   468,   469,
-     470,   471,   472,   473,   474,   475,   476,   477,     0,     0,
-     479,   480,     0,   481,   793,   482,   483,   484,   485,   486,
-       0,   997,   998,     0,     0,   489,   490,     0,   492,     0,
+     436,   437,   438,     0,   439,   440,     0,   719,   442,   443,
+     444,   445,   446,   447,   720,   449,   450,   451,   452,     0,
+     453,   454,   455,   456,  1230,     0,   458,   459,   460,   461,
+     462,     0,   463,   464,   465,   466,     0,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
+     479,   480,     0,   481,     0,  2016,   483,   484,   485,   486,
+       0,   722,   488,     0,     0,   723,   490,   491,   492,   493,
        0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
      501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
-     509,   510,     0,   999,  1990,   513,   794,   514,   515,   516,
+     509,   510,   511,   512,     0,   513,     0,   514,   515,   516,
      517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
-     523,   524,   977,     0,     0,     0,     0,     0,     0,     0,
-       0,   534,   535,   536,     0,     0,     0,   220,   221,   222,
-     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
-       0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
-     235,   772,   236,   237,   238,     0,   978,   773,   979,   980,
-       0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
-     981,   982,   252,     0,   253,   254,   255,   256,     0,     0,
-     774,     0,   258,   259,   260,   261,   775,   262,   263,   264,
-       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
-     272,   273,     0,     0,     0,   777,     0,     0,     0,   274,
-     275,   276,   277,   278,   279,   983,   984,   282,     0,   283,
-       0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
-       0,     0,   292,   293,   985,   295,   296,     0,   297,   298,
-     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
-       0,   308,   309,   310,     0,     0,   312,     0,   313,   314,
-     986,   316,     0,   317,     0,   318,   778,     0,   779,   319,
-     320,   321,     0,   322,     0,     0,     0,   325,     0,   326,
-     327,   328,   329,   330,   780,   331,   332,   333,   334,     0,
-     335,   336,   337,   338,   339,   340,     0,   341,   781,     0,
-     343,   344,   345,   346,   988,   989,     0,   990,     0,   350,
-     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
-       0,   357,     0,   785,   359,   786,     0,   360,   361,   362,
-       0,     0,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   991,   787,   992,
-     380,   381,     0,     0,   383,   384,   788,   385,  2082,     0,
-     387,   993,   389,   390,   391,     0,   392,     0,     0,   393,
-     394,   395,     0,     0,   396,     0,   789,   398,   790,     0,
-     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
-       0,   410,     0,   412,   413,   414,     0,   415,   416,   417,
-     418,   419,   420,   421,   422,   994,   424,   425,   426,   427,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,     0,   439,   440,   791,   441,   442,   443,     0,
-     445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
-     454,   455,   456,   457,     0,   458,   459,  1989,   461,   462,
-     792,   463,   464,   996,   466,     0,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,     0,     0,   479,
-     480,  3617,   481,   793,   482,   483,   484,   485,   486,     0,
-     997,   998,     0,     0,   489,   490,     0,   492,     0,     0,
-     494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
-     502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
-     510,     0,   999,     0,   513,   794,   514,   515,   516,   517,
-       0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
-     524,   219,     0,     0,     0,     0,     0,     0,     0,     0,
-     534,   535,   536,     0,     0,     0,   220,   221,   222,   223,
-     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
-       0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
-       0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
-     243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
-     251,   252,     0,   253,   254,   255,   256,   257,     0,     0,
-       0,   258,   259,   260,   261,     0,   262,   263,   264,     0,
-     265,   266,   267,   268,   269,   270,     0,     0,   271,   272,
-     273,     0,     0,     0,     0,     0,     0,     0,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,     0,   283,     0,
-     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
-       0,   292,   293,   294,   295,   296,     0,   297,   298,   299,
-       0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,     0,   312,     0,   313,   314,   315,
-     316,     0,   317,     0,   318,     0,     0,     0,   319,   320,
-     321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
-     328,   329,   330,     0,   331,   332,   333,   334,     0,   335,
-     336,   337,   338,   339,   340,     0,   341,     0,   342,   343,
-     344,   345,   346,   347,   348,     0,   349,     0,   350,     0,
-       0,   351,     0,   352,   353,   354,   355,   356,     0,     0,
-     357,   358,     0,   359,     0,     0,   360,   361,   362,     0,
-       0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   378,     0,   379,   380,
-     381,   382,     0,   383,   384,     0,   385,     0,   386,   387,
-     388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
-     395,     0,     0,   396,   397,     0,   398,     0,   399,   400,
-     401,   402,   403,     0,   405,   406,     0,   407,   408,   409,
-     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
-     419,   420,     0,   422,   423,   424,   425,   426,   427,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,     0,   441,   442,   443,   444,     0,
-     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
-     455,   456,   457,     0,   458,   459,   460,   461,   462,     0,
-     463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
-       0,   481,     0,   482,   483,   484,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
-     503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
-     511,   512,     0,   513,     0,   514,   515,   516,   517,     0,
-       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
-     525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,   977,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
-     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
-       0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
-     235,   772,   236,   237,   238,     0,   978,   773,   979,   980,
-       0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
-     981,   982,   252,     0,   253,   254,   255,   256,     0,     0,
-     774,     0,   258,   259,   260,   261,   775,   262,   263,   264,
-       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
-     272,   273,     0,     0,     0,   777,     0,     0,     0,   274,
-     275,   276,   277,   278,   279,   983,   984,   282,     0,   283,
-       0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
-       0,     0,   292,   293,   985,   295,   296,     0,   297,   298,
-     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
-       0,   308,   309,   310,     0,     0,   312,     0,   313,   314,
-     986,   316,     0,   317,     0,   318,   778,     0,   779,   319,
-     320,   321,     0,   322,     0,     0,     0,   325,     0,   326,
-     327,   328,   329,   330,   780,   331,   332,   333,   334,     0,
-     335,   336,   337,   338,   339,   340,     0,   341,   781,     0,
-     343,   344,   345,   346,   988,   989,     0,   990,     0,   350,
-     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
-       0,   357,     0,   785,   359,   786,     0,   360,   361,   362,
-       0,     0,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   991,   787,   992,
-     380,   381,  2149,     0,   383,   384,   788,   385,     0,     0,
-     387,   993,   389,   390,   391,     0,   392,     0,     0,   393,
-     394,   395,     0,     0,   396,     0,   789,   398,   790,     0,
-     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
-       0,   410,     0,   412,   413,   414,     0,   415,   416,   417,
-     418,   419,   420,   421,   422,   994,   424,   425,   426,   427,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,     0,   439,   440,   791,   441,   442,   443,     0,
-     445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
-     454,   455,   456,   457,     0,   458,   459,   995,   461,   462,
-     792,   463,   464,   996,   466,     0,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,     0,     0,   479,
-     480,     0,   481,   793,   482,   483,   484,   485,   486,     0,
-     997,   998,     0,     0,   489,   490,     0,   492,     0,     0,
-     494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
-     502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
-     510,     0,   999,     0,   513,   794,   514,   515,   516,   517,
-       0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
-     524,   977,     0,     0,     0,     0,     0,     0,     0,     0,
-     534,   535,   536,     0,     0,     0,   220,   221,   222,   223,
-     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
-       0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
-     772,   236,   237,   238,     0,   978,   773,   979,   980,     0,
-     243,   244,   245,   246,   247,     0,     0,   248,   249,   981,
-     982,   252,     0,   253,   254,   255,   256,     0,     0,   774,
-       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
-     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
-     273,     0,     0,     0,   777,     0,     0,     0,   274,   275,
-     276,   277,   278,   279,   983,   984,   282,     0,   283,     0,
-     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
-       0,   292,   293,   985,   295,   296,     0,   297,   298,   299,
-       0,   300,   301,   302,     0,   303,   304,   305,   306,     0,
-     308,   309,   310,     0,     0,   312,     0,   313,   314,   986,
-     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
-     321,     0,   322,     0,     0,     0,   325,     0,   326,   327,
-     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
-     336,   337,   338,   339,   340,     0,   341,   781,     0,   343,
-     344,   345,   346,   988,   989,     0,   990,     0,   350,   782,
-     783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
-     357,     0,   785,   359,   786,     0,   360,   361,   362,     0,
-       0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,   377,   991,   787,   992,   380,
-     381,  3443,     0,   383,   384,   788,   385,     0,     0,   387,
-     993,   389,   390,   391,     0,   392,     0,     0,   393,   394,
-     395,     0,     0,   396,     0,   789,   398,   790,     0,   400,
-     401,   402,   403,   404,   405,   406,     0,   407,   408,     0,
-     410,     0,   412,   413,   414,     0,   415,   416,   417,   418,
-     419,   420,   421,   422,   994,   424,   425,   426,   427,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,     0,   439,   440,   791,   441,   442,   443,     0,   445,
-     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
-     455,   456,   457,     0,   458,   459,   995,   461,   462,   792,
-     463,   464,   996,   466,     0,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,   477,     0,     0,   479,   480,
-       0,   481,   793,   482,   483,   484,   485,   486,     0,   997,
-     998,     0,     0,   489,   490,     0,   492,     0,     0,   494,
-     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
-     503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
-       0,   999,     0,   513,   794,   514,   515,   516,   517,     0,
-       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
-     977,     0,     0,     0,     0,     0,     0,     0,     0,   534,
-     535,   536,     0,     0,     0,   220,   221,   222,   223,   224,
-     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
-       0,     0,     0,     0,   232,   233,     0,   234,   235,   772,
-     236,   237,   238,     0,   978,   773,   979,   980,     0,   243,
-     244,   245,   246,   247,     0,     0,   248,   249,   981,   982,
-     252,     0,   253,   254,   255,   256,     0,     0,   774,     0,
-     258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
-     266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
-       0,     0,     0,   777,     0,     0,     0,   274,   275,   276,
-     277,   278,   279,   983,   984,   282,     0,   283,     0,   284,
-     285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
-     292,   293,   985,   295,   296,     0,   297,   298,   299,     0,
-     300,   301,   302,     0,   303,   304,   305,   306,     0,   308,
-     309,   310,     0,     0,   312,     0,   313,   314,   986,   316,
-       0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
-       0,   322,     0,     0,     0,   325,     0,   326,   327,   328,
-     329,   987,   780,   331,   332,   333,   334,     0,   335,   336,
-     337,   338,   339,   340,     0,   341,   781,     0,   343,   344,
-     345,   346,   988,   989,     0,   990,     0,   350,   782,   783,
-     351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
-       0,   785,   359,   786,     0,   360,   361,   362,     0,     0,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   991,   787,   992,   380,   381,
-       0,     0,   383,   384,   788,   385,     0,     0,   387,   993,
-     389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
-       0,     0,   396,     0,   789,   398,   790,     0,   400,   401,
-     402,   403,   404,   405,   406,     0,   407,   408,     0,   410,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,   419,
-     420,   421,   422,   994,   424,   425,   426,   427,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-       0,   439,   440,   791,   441,   442,   443,     0,   445,   446,
-     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
-     456,   457,     0,   458,   459,   995,   461,   462,   792,   463,
-     464,   996,   466,     0,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,     0,     0,   479,   480,     0,
-     481,   793,   482,   483,   484,   485,   486,     0,   997,   998,
-       0,     0,   489,   490,     0,   492,     0,     0,   494,   495,
-     496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
-     504,   505,     0,     0,   506,   507,   508,   509,   510,     0,
-     999,     0,   513,   794,   514,   515,   516,   517,     0,     0,
-     518,     0,     0,   519,   520,   521,   522,   523,   524,   977,
-       0,     0,     0,     0,     0,     0,     0,     0,   534,   535,
-     536,     0,     0,     0,   220,   221,   222,   223,   224,   225,
-     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
-       0,     0,     0,   232,   233,     0,   234,   235,   772,   236,
-     237,   238,     0,   978,   773,   979,   980,     0,   243,   244,
-     245,   246,   247,     0,     0,   248,   249,   981,   982,   252,
-       0,   253,   254,   255,   256,     0,     0,   774,     0,   258,
-     259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
-     267,   268,   269,   270,     0,   776,   271,   272,   273,     0,
-       0,     0,   777,     0,     0,     0,   274,   275,   276,   277,
-     278,   279,   983,   984,   282,     0,   283,     0,   284,   285,
-     286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
-     293,   985,   295,   296,     0,   297,   298,   299,     0,   300,
-     301,   302,     0,   303,   304,   305,   306,     0,   308,   309,
-     310,     0,     0,   312,     0,   313,   314,   986,   316,     0,
-     317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
-     322,     0,     0,     0,   325,     0,   326,   327,   328,   329,
-    1045,   780,   331,   332,   333,   334,     0,   335,   336,   337,
-     338,   339,   340,     0,   341,   781,     0,   343,   344,   345,
-     346,   988,   989,     0,   990,     0,   350,   782,   783,   351,
-     784,   352,   353,   354,   355,   356,     0,     0,   357,     0,
-     785,   359,   786,     0,   360,   361,   362,     0,     0,   363,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,   377,   991,   787,   992,   380,   381,     0,
-       0,   383,   384,   788,   385,     0,     0,   387,   993,   389,
-     390,   391,     0,   392,     0,     0,   393,   394,   395,     0,
-       0,   396,     0,   789,   398,   790,     0,   400,   401,   402,
-     403,   404,   405,   406,     0,   407,   408,     0,   410,     0,
-     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
-     421,   422,   994,   424,   425,   426,   427,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
-     439,   440,   791,   441,   442,   443,     0,   445,   446,   447,
-     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
-     457,     0,   458,   459,   995,   461,   462,   792,   463,   464,
-     996,   466,     0,   467,   468,   469,   470,   471,   472,   473,
-     474,   475,   476,   477,     0,     0,   479,   480,     0,   481,
-     793,   482,   483,   484,   485,   486,     0,   997,   998,     0,
-       0,   489,   490,     0,   492,     0,     0,   494,   495,   496,
-     497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
-     505,     0,     0,   506,   507,   508,   509,   510,     0,   999,
-       0,   513,   794,   514,   515,   516,   517,     0,     0,   518,
-       0,     0,   519,   520,   521,   522,   523,   524,   977,     0,
-       0,     0,     0,     0,     0,     0,     0,   534,   535,   536,
-       0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
-     227,     0,   229,   230,   231,     0,     0,     0,     0,     0,
-       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
-     238,     0,   978,   773,   979,   980,     0,   243,   244,   245,
-     246,   247,     0,     0,   248,   249,   981,   982,   252,     0,
-     253,   254,   255,   256,     0,     0,   774,     0,   258,   259,
-     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
-     268,   269,   270,     0,   776,   271,   272,   273,     0,     0,
-       0,   777,     0,     0,     0,   274,   275,   276,   277,   278,
-     279,   983,   984,   282,     0,   283,     0,   284,   285,   286,
-     287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
-     985,   295,   296,     0,   297,   298,   299,     0,   300,   301,
-     302,     0,   303,   304,   305,   306,     0,   308,   309,   310,
-       0,     0,   312,     0,   313,   314,   986,   316,     0,   317,
-       0,   318,   778,     0,   779,   319,   320,   321,     0,   322,
-       0,     0,     0,   325,     0,   326,   327,   328,   329,   330,
-     780,   331,   332,   333,   334,     0,   335,   336,   337,   338,
-     339,   340,     0,   341,   781,     0,   343,   344,   345,   346,
-     988,   989,     0,   990,     0,   350,   782,   783,   351,   784,
-     352,   353,   354,   355,   356,     0,     0,   357,     0,   785,
-     359,   786,     0,   360,   361,   362,     0,     0,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   991,   787,   992,   380,   381,     0,     0,
-     383,   384,   788,   385,     0,     0,   387,   993,   389,   390,
-     391,     0,   392,     0,     0,   393,   394,   395,     0,     0,
-     396,     0,   789,   398,   790,     0,   400,   401,   402,   403,
-     404,   405,   406,     0,   407,   408,     0,   410,     0,   412,
-     413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
-     422,   994,   424,   425,   426,   427,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
-     440,   791,   441,   442,   443,     0,   445,   446,   447,   448,
-     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
-       0,   458,   459,   995,   461,   462,   792,   463,   464,   996,
-     466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,     0,     0,   479,   480,     0,   481,   793,
-     482,   483,   484,   485,   486,     0,   997,   998,     0,     0,
-     489,   490,     0,   492,     0,     0,   494,   495,   496,   497,
-     498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
-       0,     0,   506,   507,   508,   509,   510,     0,   999,     0,
-     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
-       0,   519,   520,   521,   522,   523,   524,   977,     0,     0,
-       0,     0,     0,     0,     0,     0,   534,   535,   536,     0,
-       0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
-       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
-       0,   232,   233,     0,   234,   235,   772,   236,   237,   238,
-       0,   978,   773,   979,   980,     0,   243,   244,   245,   246,
-     247,     0,     0,   248,   249,   981,   982,   252,     0,   253,
-     254,   255,   256,     0,     0,   774,     0,   258,   259,   260,
-     261,   775,   262,   263,   264,     0,   265,   266,   267,   268,
-     269,   270,     0,   776,   271,   272,   273,     0,     0,     0,
-     777,     0,     0,     0,   274,   275,   276,   277,   278,   279,
-     983,   984,   282,     0,   283,     0,   284,   285,   286,   287,
-     288,     0,   289,   290,   291,     0,     0,   292,   293,   985,
-     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
-       0,   303,   304,   305,   306,     0,   308,   309,   310,     0,
-       0,   312,     0,   313,   314,   986,   316,     0,   317,     0,
-     318,   778,     0,   779,   319,   320,   321,     0,   322,     0,
-       0,     0,   325,     0,   326,   327,   328,   329,   330,   780,
-     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
-     340,     0,   341,   781,     0,   343,   344,   345,   346,   988,
-     989,     0,   990,     0,   350,   782,   783,   351,   784,   352,
-     353,   354,   355,   356,     0,     0,   357,     0,   785,   359,
-     786,     0,   360,   361,   362,     0,     0,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   991,   787,   992,   380,   381,     0,     0,   383,
-     384,   788,   385,     0,     0,   387,   993,   389,   390,   391,
-       0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
-       0,   789,   398,   790,     0,   400,   401,   402,   403,   404,
-     405,   406,     0,   407,   408,     0,   410,     0,   412,   413,
-     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
-     994,   424,   425,   426,   427,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
-     791,   441,   442,   443,     0,   445,   446,   447,   448,   449,
-     450,   451,   452,     0,   453,   454,   455,   456,   457,     0,
-     458,   459,  1989,   461,   462,   792,   463,   464,   996,   466,
-       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,     0,     0,   479,   480,     0,   481,   793,   482,
-     483,   484,   485,   486,     0,   997,   998,     0,     0,   489,
-     490,     0,   492,     0,     0,   494,   495,   496,   497,   498,
-     499,   500,     0,     0,   501,   502,   503,   504,   505,     0,
-       0,   506,   507,   508,   509,   510,     0,   999,     0,   513,
-     794,   514,   515,   516,   517,     0,     0,   518,     0,     0,
-     519,   520,   521,   522,   523,   524,   977,     0,     0,     0,
-       0,     0,     0,     0,     0,   534,   535,   536,     0,     0,
-       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
-     229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
-     232,   233,     0,   234,   235,   772,   236,   237,   238,     0,
-     978,   773,   979,   980,     0,   243,   244,   245,   246,   247,
-       0,     0,   248,   249,   981,   982,   252,     0,   253,   254,
-     255,   256,     0,     0,   774,     0,   258,   259,   260,   261,
-     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
-     270,     0,   776,   271,   272,   273,     0,     0,     0,   777,
-       0,     0,     0,   274,   275,   276,   277,   278,   279,   983,
-     984,   282,     0,   283,     0,   284,   285,   286,   287,   288,
-       0,   289,   290,   291,     0,     0,   292,   293,   985,   295,
-     296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
-     303,   304,   305,   306,     0,   308,   309,   310,     0,     0,
-     312,     0,   313,   314,   986,   316,     0,   317,     0,   318,
-     778,     0,   779,   319,   320,   321,     0,   322,     0,     0,
-       0,   325,     0,   326,   327,   328,   329,   330,   780,   331,
-     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
-       0,   341,   781,     0,   343,   344,   345,   346,   988,   989,
-       0,   990,     0,   350,   782,   783,   351,   784,   352,   353,
-     354,   355,   356,     0,     0,   357,     0,   785,   359,   786,
-       0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   991,   787,   992,   380,   381,     0,     0,   383,   384,
-     788,   385,     0,     0,   387,   993,   389,   390,   391,     0,
-     392,     0,     0,   393,   394,   395,     0,     0,   396,     0,
-     789,   398,   790,     0,   400,   401,   402,   403,   404,   405,
-     406,     0,   407,   408,     0,   410,     0,   412,   413,   414,
-       0,   415,   416,   417,   418,   419,   420,   421,   422,   994,
-     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
-     441,   442,   443,     0,   445,   446,   447,   448,   449,   450,
-     451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
-     459,     0,   461,   462,   792,   463,   464,   996,   466,     0,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,     0,     0,   479,   480,     0,   481,   793,   482,   483,
-     484,   485,   486,     0,   997,   998,     0,     0,   489,   490,
-       0,   492,     0,     0,   494,   495,   496,   497,   498,   499,
-     500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
-     506,   507,   508,   509,   510,     0,   999,     0,   513,   794,
-     514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
-     520,   521,   522,   523,   524,   977,     0,     0,     0,     0,
-       0,     0,     0,     0,   534,   535,   536,     0,     0,     0,
+     523,   724,   525,   526,   527,   528,   529,   530,   531,   532,
+     533,   534,   535,   536,   219,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   220,
+     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
+     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
+       0,   234,   235,     0,   236,   237,   238,   239,   240,     0,
+     241,   242,     0,   243,   244,   245,   246,   247,     0,     0,
+     715,   249,   250,   251,   252,     0,   253,   254,   255,   256,
+     257,     0,     0,     0,   258,   259,   260,   261,     0,   262,
+     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
+       0,   271,   272,   273,     0,     0,     0,     0,     0,     0,
+       0,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
+     290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
+     297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
+     313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
+       0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
+       0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
+     334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
+       0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
+       0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
+     356,     0,     0,   357,   358,     0,   359,     0,     0,   360,
+     361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   718,   378,
+       0,   379,   380,   381,   382,     0,   383,   384,     0,   385,
+       0,   386,   387,   388,   389,   390,   391,     0,   392,     0,
+       0,   393,   394,   395,     0,     0,   396,   397,     0,   398,
+       0,   399,   400,   401,   402,   403,   404,   405,   406,     0,
+     407,   408,   409,   410,   411,   412,   413,   414,     0,   415,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,     0,   439,   440,     0,   719,   442,
+     443,   444,   445,   446,   447,  2088,   449,   450,   451,   452,
+       0,   453,   454,   455,   456,  2089,     0,   458,   459,   460,
+     461,   462,     0,   463,   464,   465,   466,     0,   467,   468,
+     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
+       0,   479,   480,     0,   481,     0,   482,   483,   484,   485,
+     486,     0,   722,   488,     0,     0,  2090,   490,   491,   492,
+     493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
+       0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
+     508,   509,   510,   511,   512,     0,   513,     0,   514,   515,
+     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
+     522,   523,   724,   525,   526,   527,   528,   529,   530,   531,
+     532,   533,   534,   535,   536,   219,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
      230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
-     233,     0,   234,   235,   772,   236,   237,   238,     0,     0,
-     773,     0,     0,     0,   243,   244,   245,   246,   247,     0,
-       0,   248,   249,     0,     0,   252,     0,   253,   254,   255,
-     256,     0,     0,   774,     0,   258,   259,   260,   261,   775,
+     233,     0,   234,   235,     0,   236,   237,   238,   239,   240,
+       0,   241,   242,     0,   243,   244,   245,   246,   247,     0,
+       0,   248,   249,   250,   251,   252,     0,   253,   254,   255,
+     256,   257,     0,     0,     0,   258,   259,   260,   261,     0,
      262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
-       0,   776,   271,   272,   273,     0,     0,     0,   777,     0,
-       0,     0,   274,   275,   276,   277,   278,   279,     0,     0,
+       0,     0,   271,   272,   273,     0,     0,     0,     0,     0,
+       0,     0,   274,   275,   276,   277,   278,   279,   280,   281,
      282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
      289,   290,   291,     0,     0,   292,   293,   294,   295,   296,
        0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
-     304,   305,   306,     0,   308,   309,   310,     0,     0,   312,
-       0,   313,   314,     0,   316,     0,   317,     0,   318,   778,
-       0,   779,   319,   320,   321,     0,   322,     0,     0,     0,
-     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
+     304,   305,   306,   307,   308,   309,   310,   311,     0,   312,
+       0,   313,   314,   315,   316,     0,   317,     0,   318,     0,
+       0,     0,   319,   320,   321,     0,   322,   323,     0,   324,
+     325,     0,   326,   327,   328,   329,  2329,     0,   331,   332,
      333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
-     341,   781,     0,   343,   344,   345,   346,     0,     0,     0,
-       0,     0,   350,   782,   783,   351,   784,   352,   353,   354,
-     355,   356,     0,     0,   357,     0,   785,   359,   786,     0,
+     341,     0,   342,   343,   344,   345,   346,   347,   348,     0,
+     349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
+     355,   356,     0,     0,   357,   358,     0,   359,     0,     0,
      360,   361,   362,     0,     0,   363,   364,   365,   366,   367,
      368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-       0,   787,     0,   380,   381,     0,     0,   383,   384,   788,
-     385,     0,     0,   387,     0,   389,   390,   391,     0,   392,
-       0,     0,   393,   394,   395,     0,     0,   396,     0,   789,
-     398,   790,     0,   400,   401,   402,   403,   404,   405,   406,
-       0,   407,   408,     0,   410,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,   419,   420,   421,   422,     0,   424,
+     378,     0,   379,   380,   381,   382,     0,   383,   384,     0,
+     385,     0,   386,   387,   388,   389,   390,   391,     0,   392,
+       0,     0,   393,   394,   395,     0,     0,   396,   397,     0,
+     398,     0,   399,   400,   401,   402,   403,   404,   405,   406,
+       0,   407,   408,   409,   410,   411,   412,   413,   414,     0,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
      425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
-     442,   443,     0,   445,   446,   447,   448,   449,   450,   451,
+     434,   435,   436,   437,   438,     0,   439,   440,     0,   441,
+     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
      452,     0,   453,   454,   455,   456,   457,     0,   458,   459,
-       0,   461,   462,   792,   463,   464,     0,   466,     0,   467,
+     460,   461,   462,     0,   463,   464,   465,   466,     0,   467,
      468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
-       0,     0,   479,   480,     0,   481,   793,   482,   483,   484,
-     485,   486,     0,     0,     0,     0,     0,   489,   490,     0,
-     492,     0,     0,   494,   495,   496,   497,   498,   499,   500,
+     478,     0,   479,   480,     0,   481,     0,   482,   483,   484,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,   496,   497,   498,   499,   500,
        0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
-     507,   508,   509,   510,     0,     0,     0,   513,   794,   514,
+     507,   508,   509,   510,   511,   512,     0,   513,     0,   514,
      515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
-     521,   522,   523,   524,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   534,   535,   536
-};
-
-static const yytype_int16 yycheck[] =
-{
-      16,     0,     0,     0,     0,     0,     0,    50,   201,    25,
-    1020,   594,   564,    11,    21,  1062,   716,   187,   770,   714,
-      27,  1029,    20,    35,    20,  1084,   196,   666,   667,   668,
-      21,     7,   869,   672,   765,   796,    27,   179,    14,    44,
-    1024,  1330,  1254,    43,   995,   594,  1692,   857,  1054,  1256,
-     739,   634,    50,   827,  2273,  2625,  1014,  1272,   878,    12,
-     612,  2462,  2148,   983,   984,  1365,   998,   917,  1477,   937,
-    2613,  1993,  1994,   993,   723,  1115,  2792,  1375,  3003,  1386,
-     948,   204,  1371,  2768,    20,   922,    17,  2282,   197,   926,
-    1813,   615,   215,   555,   931,   204,  1308,  1304,  2816,  2976,
-    2818,  3045,   626,   940,    22,  1728,   215,  3032,     0,  2518,
-    2519,  1547,   856,   950,  2523,  2200,  1940,    35,   862,  1429,
-    1277,   971,  3301,  2666,  3021,  2966,   856,   871,  2959,  3344,
-    3606,  2617,  2434,  2615,  2616,  2966,   719,  3394,  2674,  1446,
-    1447,   603,  3344,  1441,  3340,  3595,  3542,  3609,   166,   633,
-    1559,  2560,  2561,   181,  3596,  3266,   625,   181,  3238,  1816,
-    3618,  2548,  1772,     0,    34,     0,  3272,     0,     0,     0,
-     719,    41,  1357,     0,     0,     0,     0,     0,     0,     0,
-    1371,  2238,  4059,   181,  1308,    40,  1192,  3019,    49,  2246,
-    2276,  2248,  2682,  3859,  4179,   813,  4181,  3201,   762,   869,
-     762,     9,   604,  4217,  3317,  3271,   981,   982,    62,    48,
-     210,     0,     5,  1649,     0,     0,    84,   992,     0,    35,
-      13,    14,  4360,   625,  1144,  1145,    22,    70,    41,     5,
-       5,   109,  4274,  4275,   188,   189,     5,    20,   192,     5,
-     194,  1173,    41,  1163,    39,     5,    55,     0,     5,     5,
-     133,    29,  4236,    13,    14,   153,     9,    13,    14,    76,
-     214,   158,     5,   111,     5,   103,     5,    26,   159,    39,
-    1993,     5,     5,    26,    33,    26,   915,    26,   158,   161,
-       5,   180,    33,    11,     5,   114,  4270,    62,  1062,     5,
-    2376,   102,  2378,  2680,   166,   199,     5,    11,  1510,     5,
-     158,    55,    81,   264,   111,    62,   258,     5,   158,     3,
-       4,     5,    40,     4,   289,     9,   254,    72,     9,    81,
-     111,     9,   168,   337,   160,    30,    31,    72,    72,   257,
-     126,   320,    72,   109,    64,   336,    81,    81,  4547,   299,
-      70,    26,    70,   245,   286,   183,   898,   109,   158,    64,
-    2613,    81,     0,   299,   231,   203,   139,   320,  1133,  1134,
-     148,     9,    88,   396,   193,     9,    81,   306,    26,   158,
-     330,   564,   158,   158,  4243,   136,   158,     5,    26,   109,
-     550,   111,   158,   154,  1159,  1322,   415,    11,   160,    74,
-     417,   180,    72,   439,   180,   180,   244,    82,   180,     4,
-     406,    81,   362,  2666,     9,   158,   452,   436,   155,   436,
-      11,   294,  4281,  2059,   185,   109,    40,   450,   190,   612,
-      11,  1241,   137,    26,   260,   110,    55,   180,   598,   217,
-      33,   394,  1193,   375,   373,    11,   450,   163,   608,   562,
-     155,  4426,   249,   311,   567,   317,    70,   295,   408,   331,
-     327,   452,   157,   562,   159,   578,   217,   187,   567,  1000,
-    1221,   450,   408,   121,    40,  1239,    11,  1050,  3864,   578,
-    1244,  1245,   158,  4350,  1689,   450,   418,  1487,  1693,  1062,
-    1695,   363,   244,  1698,  1492,  4694,   324,   114,   890,    72,
-      72,   207,   394,   454,    70,    40,  4480,  1038,   450,   184,
-     329,  1050,   384,   312,   198,  1046,  1030,    29,   910,    55,
-     158,  1052,   450,    55,   244,   373,  3684,   919,  3686,   249,
-    1727,   128,   450,   361,   362,    70,   220,   164,   140,   545,
-     279,   309,   180,   649,   650,   651,  1119,   320,   654,   655,
-     656,   116,   320,   249,   322,  4466,  4467,   114,   664,   102,
-     454,   362,   450,   450,   400,   454,   339,   287,   312,   450,
-     373,   439,  1769,   373,   359,   394,  1090,   450,  1780,   386,
-    1119,   301,   287,  1347,   454,  1581,  1513,  1101,   594,   595,
-    1064,  1355,   331,  3424,   353,   354,   454,   346,  1425,   359,
-    1427,   634,  1116,  3424,   373,   346,   450,   373,   394,   553,
-     378,  1345,   401,   557,   454,   448,   454,   398,  1815,   452,
-    4060,   450,   450,   544,  4656,  4629,   102,   366,   373,   368,
-     638,   575,  4018,   765,  1683,  1435,   193,  4836,   373,   373,
-    1480,  3347,  2718,   373,   450,   633,   634,   633,  1506,  3564,
-     647,   449,   649,  1417,   651,   454,  1420,  1421,   405,  4787,
-     657,   658,   659,  1236,  1398,  1475,   647,   450,   649,   389,
-     651,  1244,  1245,   439,   453,   681,   657,   453,   453,  1653,
-     355,   453,  3752,  3779,   389,   450,   452,  3788,   678,   632,
-    4076,  3792,   448,   312,   450,   661,   452,  1236,   441,   442,
-     450,   707,  3696,   450,   450,  1615,   405,  1099,   634,   715,
-     453,   406,   718,   719,   720,   898,  1690,   450,  3605,   450,
-    3587,   450,  3778,   883,  1488,  1699,   450,   450,   446,   417,
-    1726,  3264,  1728,  3266,   894,   450,   754,  3840,  1734,   450,
-     754,  1295,   446,  1295,  1740,  1741,  1742,  1407,   436,   739,
-    4725,   450,  1412,   346,  1750,  1751,  1364,   441,   442,  1755,
-     441,   442,   450,   441,   442,     3,   754,   756,   756,   756,
-     756,   756,   756,  2685,  4748,  2687,   312,   394,   454,   769,
-     312,  3180,  3181,  3182,  3183,  2073,  4760,  3186,  3187,  3188,
-    3189,  3190,  3191,  3192,  3193,  3194,  3195,   309,   958,   417,
-     373,   373,  4458,   441,   442,  2007,     5,   441,   442,   411,
-    3286,  3344,  1287,  2998,   411,   453,   450,   743,   436,   362,
-     415,  3527,   812,  1588,  1589,  4309,  4212,   454,  4695,  4740,
-     827,   396,   450,  4219,   102,   454,  3658,   394,  2770,    64,
-       5,   436,    80,  3242,  3243,  4819,   441,   442,    46,  3329,
-     441,   442,   443,   444,   445,   446,  2144,    68,   160,    26,
-     139,  1403,   443,   444,   445,   446,   158,  2943,  2944,     3,
-     114,     5,   717,   264,   756,   160,   721,   443,   444,   445,
-     446,   159,    34,  4349,   102,    22,   362,  2934,   114,   833,
-     834,   161,   130,  2007,  2941,  2942,   747,     5,  2945,     3,
-     126,   102,  2615,  2616,  2617,  2952,   441,   442,   443,   444,
-     445,   446,   137,   415,   168,   336,  2091,  4784,   454,   152,
-    2101,   803,   454,   109,    26,   104,  1555,   317,  2130,   756,
-     155,   756,    22,   756,   756,   756,   258,   158,  3315,   756,
-     756,   756,   756,   756,   756,   756,  4104,   114,   168,   193,
-    4108,  4109,   454,  4111,   139,    64,  3631,   109,  4163,  1065,
-     272,    78,  1068,   272,  1070,    22,  1072,   254,  1074,   913,
-     104,    28,  1078,   159,     5,   260,    80,   175,   254,   242,
-      55,   322,   180,  2020,    27,   223,   362,   869,   242,   126,
-     254,   935,   936,   172,     3,  4200,   274,   306,   858,   859,
-     109,   118,   242,   109,    22,   395,  1696,  1697,  4213,  1401,
-      28,  3264,   956,  3266,    23,  1766,  2316,    78,   216,   121,
-     322,  4213,   242,   102,   336,   126,   193,   131,  2675,  2629,
-     109,   258,   324,   454,   272,  4519,   126,   378,   172,  1570,
-    2330,   962,   262,  2975,  1050,    78,   257,  2959,  1989,   282,
-     249,  1999,   231,  4123,  2966,   234,  1062,   118,   284,   245,
-     339,   331,   287,   454,   342,  1062,  2268,  4168,  4164,   126,
-     355,    80,  4173,    22,   376,  4176,  1064,    22,  1064,    28,
-     382,   185,  1026,  1027,   249,   118,  1628,  1660,  1619,  1481,
-    1096,  3344,  1623,   363,   362,   103,  4562,   231,  1629,  1630,
-     234,  1067,  4534,  1069,  1496,  1071,  1620,  1073,   126,  1075,
-    1076,  1077,   264,  1119,   264,   407,  1082,  4557,  4570,  1633,
-      48,  1652,   131,  1515,  1576,  4573,  4558,   365,  1587,   367,
-    3042,  4220,   333,  4048,  1648,   244,  3535,   381,   244,  1127,
-     249,   249,  4076,   341,   362,   104,   400,  3853,   327,   109,
-     394,   194,   373,   136,   339,  4360,   273,   271,  1146,  1192,
-     400,   262,   329,   450,   389,   244,  4053,   242,    78,   432,
-    1562,   180,   100,   277,   450,   183,   185,   126,   287,   259,
-     400,   126,   272,  1575,  3892,  1659,   450,  1646,  1194,  1177,
-     271,     8,   301,   327,    11,  1587,   308,  1203,    15,    16,
-      17,   201,   375,    78,  1192,  1747,   102,  1599,   118,   310,
-     396,  1217,   273,   172,   197,   272,   306,  2422,   439,   172,
-    1403,   448,   336,    21,    56,   452,  4315,   394,  4795,    27,
-    1236,   452,    64,  1239,  1240,   336,    38,   312,  1244,  1245,
-     273,   336,  1239,   118,   111,   418,   336,  1244,  1245,   306,
-     367,  1643,   431,   153,  1646,  3788,  4696,  1265,   258,  3792,
-      89,   336,  1280,  1281,   192,  1283,  1280,  1281,   277,  1283,
-    4456,   450,   231,   352,  1749,   234,   355,    54,   231,   336,
-     389,   264,  1757,   387,   244,  1975,   148,   439,   205,   336,
-    2159,   395,  1280,  1281,   398,  1283,   448,   431,   450,   451,
-     452,   451,   454,   415,   454,   113,   367,  1297,   317,   399,
-      87,   150,  3838,  4560,   242,    24,   324,  4783,   272,  4705,
-    4390,  4422,  4788,   272,   436,   242,  4893,   272,    61,    62,
-     159,   119,  3804,  3809,   367,    44,   203,  2539,  2196,  3815,
-     420,   129,   454,  2545,  2213,   180,   242,  2343,   162,   109,
-    1347,   360,   306,   361,   362,   217,   162,   306,  1355,   454,
-     189,   306,  1461,   273,   324,    32,  2100,   144,   327,  2369,
-    4459,   450,   168,  4839,   327,   204,   178,   244,   387,   158,
-    4469,  2379,   336,  1775,  3676,   214,   395,   336,   220,   398,
-     111,   336,   200,  4598,   256,   229,  1393,   325,   273,  2373,
-     177,   180,   241,  2167,  1935,   388,   220,   454,   308,  1569,
-     239,  2175,  4482,  2177,   220,  4246,  4486,  4487,  4623,    36,
-    1417,  1342,   339,  1420,  1421,  4246,  2253,  1433,   295,   258,
-    2164,  4623,  1531,   148,  4900,   212,  1535,  1381,   153,  2297,
-    2298,  2299,  2300,   260,  2164,  1628,   242,  2020,  1547,   109,
-    1440,  2309,  2186,   286,  3501,  4342,   153,   367,  1618,   162,
-    3507,  3508,   248,  3510,  4633,  4634,   163,   244,  4335,   262,
-     140,   306,   431,   140,  3110,   310,   272,   394,   345,   272,
-    2214,   101,   203,   180,   272,   194,   121,   316,   123,   249,
-    2637,  1488,   367,   299,  2784,   272,   450,  1503,   271,  2339,
-     117,   336,   217,   113,  1448,  1449,  1450,  1451,  2713,  3323,
-     306,  3586,  3424,   306,   412,   306,   329,   220,   306,  2061,
-     320,   321,  1621,   244,  2520,  1407,   229,  1533,   112,   306,
-    1412,     3,  1692,   310,   271,  3788,  2532,   314,     4,  3792,
-    3153,   256,   375,     9,   321,   336,  1490,  1491,   138,   362,
-    1649,   328,   366,   206,   368,  1499,   454,   343,   373,   336,
-     366,  2013,   368,   336,  1747,  1509,   375,   396,  2564,   373,
-    3646,   348,  3648,  3286,   295,  2875,    30,    31,   392,   356,
-     415,   121,  4787,   123,  2098,   418,   392,   159,  1585,   402,
-     200,   181,   176,  1537,  1538,  1539,  1540,  2885,  1595,   336,
-    1597,   436,   408,   450,   400,  4311,  2602,  1604,    80,   244,
-     230,   366,   232,   368,   407,  1612,   373,   189,   315,   254,
-     437,   438,   439,   264,   441,   442,   443,   444,   445,   446,
-    4163,  4546,   204,   410,    88,  4168,   272,   450,     8,   454,
-    4173,    11,   214,  4176,  4813,    15,    16,    17,   451,     0,
-     454,   454,    72,   121,   108,   123,   299,   198,   130,   329,
-     205,    81,  2426,   366,  2056,   368,   207,  4200,    81,   329,
-     306,  1659,  3098,  1659,  2723,   216,  2068,  4544,   146,   148,
-    4213,  4568,   439,   396,   153,   326,   140,   330,  1632,   392,
-      83,  1635,   362,   226,   150,   452,  2325,   242,  4373,   453,
-     336,  1645,   362,  1669,  2156,  1671,   322,  1673,   112,  1675,
-    1654,  1677,  4103,  2105,   254,  1681,  1706,  1719,  4585,   362,
-    4119,   112,  1711,  1711,  1711,  1711,  1711,  1711,  3025,    11,
-     123,  3028,   402,  1739,  1660,  2683,   415,   450,   111,  1736,
-    1737,  2689,   402,   306,   316,   415,  1743,  1744,   217,   162,
-     295,   223,   294,   209,   111,   415,  2754,    53,   272,   272,
-     454,  2334,   378,  2965,  4470,   408,   436,   396,  4476,   272,
-     183,  4705,   176,   336,  1771,   454,   436,   272,   289,   321,
-     450,   249,   320,  2693,   322,   176,   254,   256,    70,  4704,
-     450,   324,   306,   306,   339,  2334,   153,  1785,  3874,  3875,
-     272,   378,   310,   306,  1725,   101,    89,   220,   295,  4369,
-    1718,   306,   253,   272,   187,  2346,  4207,  4026,  4209,   408,
-     307,   450,   336,  2396,  1830,  3173,   451,  4360,   336,   454,
-     187,   201,   365,   336,   306,   101,   310,  2368,   310,  1783,
-     378,   336,   306,  4052,   326,   332,   310,   306,   302,   394,
-     263,   310,  2383,  4038,  3202,  2386,  2387,  2396,   415,   392,
-    2391,  2392,   336,   320,   336,   244,  2630,  2398,  2260,   242,
-     249,   244,   336,   320,   321,   329,   159,   336,  2061,   436,
-      24,   366,   415,   368,   417,   242,   182,   244,   154,  4422,
-     260,   258,  2052,   365,   351,   367,   263,   454,    88,  2059,
-      44,  2622,  2742,  3108,  2003,   153,   189,  4582,   362,  2008,
-    4163,     5,   380,  2012,   293,  4168,    10,   450,   108,   185,
-    4173,   204,   390,  4176,    18,   417,   174,   449,    13,    14,
-    4636,   214,   454,  2464,   230,  3982,   232,  3984,  3985,  2038,
-     449,  3988,    36,   415,   436,   454,   242,  4200,   402,  3348,
-     140,   415,   406,   366,   207,   368,   239,  1954,   450,  3008,
-    4213,   415,    42,   373,   230,   378,   232,  4834,  3017,  4884,
-     450,  2771,   436,  1954,   153,   271,   389,   245,   246,   392,
-    1529,  2080,   436,    63,  2097,   326,   417,   415,  2627,   136,
-    4389,  1980,  1980,  2793,   226,   174,   450,    54,  2097,  1548,
-     448,   148,   543,   378,   452,   436,   153,   548,   436,     8,
-     378,  1937,    11,  3215,  2020,   311,    15,    16,    17,   450,
-    2022,   451,  2024,  2020,   454,  3222,   226,   258,  2127,  3996,
-      87,  3998,   263,   316,  2576,  4002,  4742,  4004,  2772,  2020,
-     229,   308,   445,  2518,  2519,  2158,   445,   450,  2523,   452,
-     197,   450,    85,   452,   350,   451,  2448,  2630,   454,  2158,
-     229,   329,  4622,  2162,   450,  4598,   452,   437,   438,   439,
-     217,   441,   442,   443,   444,   445,   446,  2469,   183,   174,
-    2086,  2180,  2072,   378,   408,  2560,  2561,   144,  2480,   326,
-    4623,  3804,  2191,  3381,   362,  2531,  3809,  2533,  2534,  2212,
-    3397,  3398,  3815,    77,    52,  2204,  3136,  4360,  2842,   256,
-    2054,  2055,   302,  2212,   448,   207,   450,   264,   452,  2063,
-     177,  2065,     9,   451,   324,  2069,   454,  3324,   451,   451,
-     450,   454,   454,   365,   402,   451,   450,   258,   454,   329,
-    3428,  3063,  3064,  2970,  3144,   136,   451,   415,   451,   454,
-     691,   454,   366,   451,   368,   212,   454,   148,   324,   450,
-     392,  4867,   153,   451,   454,   365,   454,  2740,   436,  4422,
-    2167,   451,   362,   451,   454,   716,   454,    52,  2175,  3175,
-    2177,   180,   450,   415,    25,   417,   451,   244,   451,   454,
-     451,   454,   392,   454,   735,  2726,  2710,  2711,  2360,  2361,
-    2362,  2740,   201,   121,   451,   123,   197,   454,   451,  3608,
-     408,   454,   402,  3209,   406,   415,   757,   417,   450,  1759,
-      42,  3423,  1762,  3425,  2230,   415,   217,   451,   146,  2173,
-     454,    72,  2238,   451,   433,   451,   454,  4284,   454,   203,
-    2246,   388,  2248,   452,   451,   451,   436,   454,   454,   261,
-     450,  4811,  4328,   310,  4787,   312,   451,   314,  3254,   454,
-     450,   260,   103,   451,   321,   256,   454,   448,   258,   450,
-    2801,   328,  2803,   264,   451,   451,   261,   454,   454,   336,
-     415,  4841,   417,   124,   373,  2229,   451,   828,   153,   454,
-    2296,   348,   258,  2237,   135,  2239,  3345,  3346,    42,   356,
-    3140,  2245,   451,   433,   261,   454,  2466,   433,   203,   226,
-     451,  3513,  2472,   454,   155,  3594,   450,   157,   452,   160,
-    2326,  3611,   451,   443,   451,   454,   244,   454,  2334,  2318,
-    2318,   249,   451,  2432,  4246,   454,   254,   415,   226,   417,
-    2283,   454,  2856,   451,     8,  4598,   454,    11,  4739,  4909,
-     450,  2743,  2866,   410,   451,  2454,    52,   454,   451,  2356,
-    2357,   454,  4075,  2462,   451,  2994,  2363,   208,  2760,   451,
-    4623,   366,   454,   368,   451,  2319,    40,   454,  2909,   451,
-     451,  3145,    46,   454,  2915,   158,   451,   928,   229,   454,
-    2396,   451,   451,  2576,   454,   454,   451,   388,  2971,   454,
-    2973,   451,   451,   199,   454,   454,    70,   324,   415,   450,
-     417,   952,   953,   954,   451,   336,  3326,   454,   136,    48,
-     451,   451,   419,   454,   454,  3373,   451,   450,   453,  2426,
-     148,  2375,  2971,  2377,  2973,   153,   324,   452,   437,   438,
-     439,  3120,   441,   442,   443,   444,   445,   446,   365,   290,
-    4362,   226,   180,  2613,  3659,  3660,  3661,  2849,   451,  2851,
-     453,    90,   380,   451,   451,  2648,   454,   454,  3041,   306,
-     134,  2985,   390,  2987,   141,   392,   317,   365,   451,   197,
-    3290,   454,   759,   324,   761,     8,   115,  2520,   451,   330,
-     450,   454,    15,    16,    17,  3793,   452,  3795,   415,   217,
-     417,   130,  3041,   141,   392,   134,  2666,   451,   258,   451,
-     454,   175,   454,   306,   451,   180,   180,   454,  2910,   451,
-     258,   362,   454,  3054,   365,   154,  3277,   415,   157,   417,
-     141,  2564,  2520,   450,  4787,   180,   141,   451,   256,  2483,
-     454,   170,   383,  2935,   451,   258,   264,   454,  1089,   324,
-    3081,  3082,   216,  3084,   136,  3086,  3087,   153,   306,  3280,
-    3281,  3282,   450,   141,   215,   111,   148,   408,  3099,   451,
-    4779,   153,   454,   396,  1115,   451,  2564,   451,   454,   451,
-     454,   258,   454,   451,     8,   451,   454,    11,   454,   451,
-     365,   451,   454,  2581,   454,  2694,   260,   451,   451,   451,
-     454,   454,   454,   253,   451,   450,  3137,   454,  3805,  2597,
-     378,   408,  2607,  2608,  2609,   197,    40,   392,   329,   326,
-     249,  3135,    46,   451,  2630,  2613,   454,   451,   257,   153,
-     454,  2628,  3024,  2630,   207,   217,  2669,  3834,  2737,   292,
-     415,     8,   417,   450,    11,    64,    70,    35,    15,    16,
-      17,   362,   244,   419,   258,  2644,  2644,  2644,  2644,  2644,
-    2644,   450,    42,  3055,   293,    32,   451,   244,    42,   454,
-     388,  4307,   272,   451,   256,   450,   454,   341,  2666,   383,
-     451,  2669,   264,   454,   451,     0,   451,   454,   153,   454,
-      77,   402,   408,  3493,   408,   153,   290,   141,   141,   450,
-     141,   450,   405,   283,   415,  3180,  3181,  3182,  3183,  1250,
-     134,  3186,  3187,  3188,  3189,  3190,  3191,  3192,  3193,  3194,
-    3195,   226,    34,   450,   141,   436,   419,   141,   141,   454,
-     141,   141,   258,  3729,  2740,   141,   141,   260,  3213,   450,
-     258,  2840,   226,   141,   141,   153,   141,   258,   141,  3954,
-    3955,   175,  3957,  2852,   362,   141,   180,  1298,   141,   450,
-      35,   215,   153,   153,  3622,   258,  3158,  3242,  3243,   450,
-     434,     5,     5,    88,   450,   450,  2959,   441,   442,   443,
-     444,   445,   446,  2966,   153,     5,     5,  3179,   226,   450,
-     450,   450,   216,   450,   450,   450,   450,     5,   450,     5,
-     416,  3742,   450,   450,   450,  2749,   388,  2751,  2752,  2753,
-     450,   450,  3204,   450,   450,   450,  2822,   450,   450,   324,
-     450,   136,   450,   450,   450,   450,   450,   450,   199,  1370,
-    2929,    35,   269,   148,   201,   454,   260,  1378,   153,   454,
-     324,    92,   215,   158,    35,   153,  3238,   256,   163,   153,
-     254,   166,   373,   336,   169,   324,   373,   452,  2864,   373,
-     365,  4574,   324,   226,  1405,   373,   448,   217,   439,   451,
-     452,   373,  1413,   373,   373,  1416,     8,   324,    81,    11,
-     141,   365,   197,    15,    16,    17,   324,   392,   258,   328,
-     212,   373,   373,   260,   249,   373,   258,   395,   365,   320,
-    3664,   254,   217,   450,   173,   373,  2912,   373,   392,   450,
-     415,  1452,   417,    81,   437,   438,   439,   341,   441,   442,
-     443,   444,   445,   446,   454,  1466,   272,   365,  2934,   141,
-     180,   415,   396,   417,   103,  2941,  2942,   396,  1479,  2945,
-     373,   256,   373,   258,   373,   450,  2952,    52,    52,   264,
-    3110,   373,   262,  2959,   392,   373,  3993,   373,   365,    41,
-    2966,   324,  2959,   226,    41,  2971,   450,  2973,   324,  2966,
-     246,   373,   373,   373,   454,     8,   258,   415,    11,   417,
-     201,   373,    15,    16,    17,  4034,   258,  1528,   373,   419,
-     258,  2988,  2936,   450,   201,   415,   201,    35,   313,  3098,
-      24,   258,   365,   141,   244,  3011,   109,    40,  1549,   223,
-     434,   141,   450,    46,  3113,  1556,   450,   441,   442,   443,
-     444,   445,   446,   407,   396,   254,   244,   244,    35,   392,
-     153,    35,   207,   325,  3040,  3041,    34,    70,   450,  3138,
-     371,   371,  3031,  3031,  3558,  3559,   336,   362,   373,   373,
-     373,   450,   415,   329,   417,   373,   450,  3571,   141,   448,
-    3535,   324,   141,  3060,  3053,  3053,   448,   396,  4347,   201,
-     437,   438,   439,   388,   441,   442,   443,   444,   445,   446,
-     141,     8,   396,   141,    11,   141,   362,   450,    15,    16,
-      17,  4293,   253,   373,   248,   158,   450,   412,   411,   414,
-     415,   236,   365,   236,  3264,    32,  3266,    11,  3859,   454,
-     450,   371,  3643,    40,   450,   373,   166,  1658,  3250,    46,
-    3651,  3652,  3653,  3654,   149,   451,   402,   158,   260,   392,
-    3120,   375,   173,   448,   454,   197,   451,   452,   453,   415,
-     339,   173,   175,    70,  3088,  3830,  3090,   180,  3145,   450,
-    3094,   454,   415,   205,   417,  1696,  1697,  4793,  4794,   259,
-     436,   454,    35,    52,   396,   266,   451,   324,   201,   202,
-    3562,   373,  1713,   373,   450,   451,   324,   453,   205,   450,
-     396,   249,   205,   216,  3344,   249,   373,   450,   373,   373,
-     378,   450,   326,   408,   153,   207,   249,    42,   258,   345,
-     215,   215,   215,   320,  3148,   365,   257,   373,   454,   373,
-    4415,   324,   258,   306,   247,  3248,   306,   174,  3224,   333,
-     373,  4426,   373,   295,   201,    35,   201,   260,   201,  3993,
-     201,   396,   201,  3266,   396,   207,   257,   153,   439,   141,
-     153,  3424,   439,   155,   254,   408,   333,   141,   175,   141,
-     244,    35,   450,   180,  4303,  4304,   450,   415,  4295,   244,
-    3248,  3256,  3257,  3258,  3259,   258,   258,   207,   171,  1810,
-     171,   153,    35,   451,   201,   202,  3264,  3376,  3266,  1820,
-    3822,   448,   327,  4919,  4920,   234,   433,   141,   433,   216,
-     258,   258,   451,   207,   258,   451,   451,  4502,   333,   451,
-     153,   244,   180,   180,   180,   437,   438,   439,   341,   441,
-     442,   443,   444,   445,   446,   454,    23,   454,   454,   373,
-     247,   419,   164,   450,   158,   233,   415,   258,   454,    52,
-     378,   253,   362,   260,   408,   207,   263,   158,   450,  3870,
-     451,   451,   451,   451,   451,   451,   269,   276,   433,   451,
-     158,   373,   451,   268,   450,     8,   451,   454,    11,   451,
-    3752,   225,    15,    16,    17,   451,   450,   258,   412,   450,
-     450,  3902,  3903,   451,  3473,  3889,   435,  3476,   394,    32,
-     450,    52,   402,   412,   439,   450,   261,   258,   258,   183,
-    4019,   141,   373,   450,   373,  1936,   191,  1938,  4394,  4604,
-     419,   434,   249,   373,   437,   438,   439,   373,   441,   442,
-     443,   444,   445,   446,   341,   141,   262,   328,  3424,   141,
-    3993,   328,  3366,  3367,  3368,  3369,   215,  3424,   328,   183,
-     217,   373,  3946,   396,  1975,   393,   277,  4433,   277,   373,
-     373,   373,   227,   373,   227,  3976,  3977,  3453,   227,   373,
-    3456,   244,  3458,    35,   373,  3452,   324,   324,   324,   324,
-    4202,   141,  4183,  4290,  4513,    41,   201,   373,   373,  4190,
-     201,  3452,    54,   336,  3573,   373,   373,   373,   373,     3,
-    3872,   201,   201,  4483,   383,     0,  4484,   373,   450,   454,
-     451,   451,   373,    42,   308,  3501,   102,   451,   454,   450,
-     257,  3507,  3508,   451,  3510,    87,  3512,   434,    35,  3901,
-     437,   438,   439,   258,   441,   442,   443,   444,   445,   446,
-    3517,  3518,   449,   141,  4498,   373,  4500,   141,   455,  3921,
-     153,   168,   449,    62,   396,   396,   141,   261,   324,   449,
-     139,     0,   451,   324,   324,   333,   139,   201,   201,   201,
-     201,   132,  4083,    11,   158,  4086,  4087,   269,   448,   153,
-     158,   454,   144,   407,   451,   450,   454,   451,  3667,   264,
-     158,  4102,   451,    88,   412,   166,   259,   451,   436,   313,
-      79,   450,  2123,  3975,   383,    22,   153,    24,    35,  3533,
-     396,    28,   451,   450,   454,   177,    33,    34,    35,  4595,
-      37,  3607,  2143,    40,    41,   454,    43,   260,    45,   373,
-     207,  4607,   191,    52,  3603,  3603,  4612,   365,  4614,   451,
-     451,   136,   451,   396,   450,   207,   328,  4664,  3788,    88,
-     212,   383,  3792,   148,   373,  4837,  4326,   373,   153,  3822,
-     373,   373,   324,   158,  4119,   373,   324,   451,   163,   451,
-     451,   166,   450,  4128,   169,   415,   306,    52,   153,   365,
-      70,   141,   244,   201,   102,   383,   201,  3664,   201,   451,
-     201,   205,  4214,   450,   415,  3681,   291,   136,  3684,   450,
-    3686,   186,   197,   450,   454,  4077,   153,    35,  4409,   148,
-     419,    75,   451,   454,   153,   365,   454,  4899,   383,   158,
-     373,   450,   217,   454,   163,   451,   450,   166,   333,   449,
-     169,   163,   102,   158,   201,  4257,  4918,   201,   201,   201,
-     300,   451,  4295,   158,   451,   450,    52,   413,   310,   413,
-     451,  4123,   314,  4247,   451,   450,   204,  2278,   197,   321,
-     454,   256,   451,   258,   269,   450,   328,   267,   204,   264,
-     187,   188,   189,   190,   336,   192,   364,   194,   217,   196,
-     450,   198,   265,    52,   201,   169,   348,   439,   254,   158,
-     207,   383,   451,   210,   356,   451,   451,   214,   373,   216,
-     415,   439,    70,   185,   437,   438,   439,   249,   441,   442,
-     443,   444,   445,   446,   376,   249,    52,   256,   313,   258,
-    3788,   365,   373,    64,  3792,   264,   454,   454,   373,   141,
-     373,  3817,   158,  3819,   201,   160,   180,  3916,   396,   450,
-    4820,   333,   396,    35,   244,   127,   411,    35,   410,  3928,
-     158,   415,   414,   415,   258,   153,   188,   450,   415,   261,
-     199,   158,   401,  3832,  3832,   300,   275,   362,   450,  3851,
-     450,  4382,   349,   204,   313,   451,   414,    81,   122,   451,
-     450,  4021,   451,   450,   450,   258,   373,   301,   451,   373,
-     153,   116,   249,   388,    35,   450,   249,   450,   450,   228,
-     183,   450,   291,   451,   450,    35,   141,   140,   450,   321,
-     451,   262,     8,   321,   383,    11,   347,   412,   347,   414,
-     415,  3898,    35,   362,   451,    52,    52,   450,   450,   454,
-     451,   450,   365,   450,  4389,  2456,   258,  3898,   396,   451,
-     450,   365,  3919,  3920,    40,   365,  4457,  3924,  3925,   388,
-      46,   242,   451,   448,     5,   291,   451,   452,   453,    64,
-     147,   261,    64,   122,   415,   415,   300,    35,   450,   450,
-     400,   336,   158,   412,    70,   414,   415,   365,   401,   298,
-     454,   153,   127,   185,   412,   258,   258,  3973,  3974,   450,
-     333,    35,  4503,    35,   261,   261,  3982,   450,  3984,  3985,
-     160,   450,  3988,   160,    52,   451,   450,  3993,   451,   448,
-     320,  3997,   451,   452,   453,   114,  3993,   394,  4390,     5,
-     307,   320,    21,  4163,  4103,   451,  4635,    32,  4168,   450,
-     140,   373,  3956,  4173,   450,   158,  4176,  4177,   134,   291,
-     347,   454,   347,   454,   415,   450,  3970,   415,   160,   160,
-      35,  4214,  1464,   852,   859,  2281,  4428,  2630,   858,  4045,
-    4200,   819,  2793,   756,  3423,  2208,  2957,  3512,  2139,    54,
-    1245,  4505,  4293,  4213,  4664,  4343,  3556,  4347,  4012,   175,
-    4325,  4050,  4050,  4246,   180,  2606,  2717,  2414,  4074,  4746,
-    4213,  4817,  4678,  4677,  4257,  4766,  2721,  3604,  3589,  3548,
-    2271,  3418,    87,  2817,  2271,  1534,  3572,  2265,  4037,  4631,
-    4482,  4664,  3010,  4825,  4486,  4487,  4256,  4918,  4104,  4320,
-     216,  4899,  4108,  4109,  2965,  4111,   543,  4051,  4207,  2961,
-    4209,   548,  4777,   550,  4259,  4650,   553,    27,   555,  4756,
-     557,  4262,  3667,  4455,  1102,     8,  3611,   564,    11,  4574,
-    1994,   568,  2692,   623,   595,  1714,  1091,  2913,   575,   144,
-    1714,  4792,  1523,     8,   260,  1715,    11,  4307,  4902,  1326,
-      15,    16,    17,  1937,  1660,  1938,  2644,    40,  3592,  3833,
-    4738,   598,  3321,    46,   734,  1978,   603,    32,  2645,  1290,
-    1289,   608,   177,     8,  3289,   612,    11,  1271,  2656,  1222,
-    4168,  2651,  4731,  4575,  4616,  4173,  3818,    70,  4176,  1977,
-    2666,  3779,   629,  3266,  3794,  4423,  3264,  4598,  4597,  3322,
-    4360,  1292,   207,  3069,  4392,    40,  3217,   212,  4734,  1297,
-    4192,    46,  4735,  1592,  4202,  4721,  2648,  1808,  2581,  2491,
-    2579,  1811,    -1,    -1,    -1,   341,    -1,    -1,    -1,  4195,
-      -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,    -1,   244,
-    4246,   678,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4246,
-      -1,   134,    -1,    -1,   691,    -1,   693,    -1,    -1,    -1,
-      -1,    -1,  4422,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4215,  4216,  4217,    -1,    -1,   713,   714,  4284,   716,
-     717,  4812,    -1,    -1,   721,    -1,    -1,    -1,    -1,  4295,
-      -1,    -1,   175,  4299,    -1,  4301,    -1,   180,   735,  4305,
-    4306,    -1,   739,    -1,    -1,   310,    -1,    -1,   745,   314,
-      -1,    -1,    -1,  2854,    -1,    -1,   321,    -1,   434,    -1,
-     757,    -1,    -1,   328,    -1,   441,   442,   443,   444,   445,
-     446,   336,   769,   216,    -1,    -1,   201,    -1,    -1,    -1,
-     175,  4330,  4330,   348,    -1,   180,     8,    -1,    -1,    11,
-      -1,   356,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4357,  4357,
-      -1,   376,  4532,    -1,    -1,   812,    -1,   260,    40,    -1,
-      -1,   216,    -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,
-      -1,   828,    -1,    -1,    -1,   260,   833,   834,    -1,    -1,
-    4433,    -1,    -1,    -1,    -1,   410,    -1,    -1,    70,   414,
-      -1,    -1,    -1,    -1,  4358,    -1,    -1,    -1,    -1,  4452,
-      -1,   858,   859,    -1,    -1,   260,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4422,    -1,  2977,  2978,  4598,    -1,
-      -1,    -1,    -1,    -1,    -1,  4433,   883,    -1,  4631,    -1,
-      -1,    -1,  2993,    -1,    -1,    -1,    -1,   894,   341,    -1,
-      -1,   898,    -1,  4623,  4452,    -1,    -1,    -1,  3009,    -1,
-      -1,    -1,   134,    -1,    -1,    -1,   913,  3018,  3019,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   928,    -1,    25,  3035,    -1,    -1,    -1,   935,   936,
-    4506,    -1,    -1,    -1,    -1,    -1,   341,    -1,    -1,    -1,
-      -1,    -1,    -1,   175,    -1,   952,   953,   954,   180,   956,
-    4464,   958,     8,    -1,    -1,    11,    58,    -1,    -1,    15,
-      16,    17,    -1,  4693,    -1,    -1,    -1,    -1,    -1,    71,
-      -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,
-      -1,   434,    -1,    85,   216,  4499,    -1,  4501,   441,   442,
-     443,   444,   445,   446,    -1,    -1,  4555,  4555,    -1,    -1,
-      -1,    -1,   437,   438,   439,    -1,   441,   442,   443,   444,
-     445,   446,    -1,    -1,    -1,    -1,    -1,  1024,    -1,  1026,
-    1027,  4751,   124,    -1,    -1,  3136,    -1,    -1,   260,   434,
-      -1,    -1,    -1,   135,    -1,    -1,   441,   442,   443,   444,
-     445,   446,    -1,    -1,    -1,    -1,    -1,  1054,    -1,    -1,
-      -1,    -1,    -1,   155,    -1,    -1,    -1,  4787,   160,    -1,
-      -1,    -1,    -1,  4793,  4794,    -1,    -1,    -1,    -1,    -1,
-    4739,    -1,    -1,    -1,    -1,    -1,    -1,  1084,  1085,    -1,
-      -1,    -1,  1089,    -1,  1091,    -1,    -1,    -1,  4664,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     8,    -1,    -1,    11,  1112,    -1,    -1,  1115,   341,
-      -1,  1118,    -1,    -1,    -1,  4629,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1131,    -1,    -1,   229,    -1,    -1,
-      -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    46,
-      -1,    -1,    -1,    -1,    -1,   201,    -1,    -1,    -1,    -1,
-    3261,  3262,  3263,  1160,    -1,    -1,    -1,    -1,   260,    -1,
-      -1,    -1,     8,    70,    -1,    11,    -1,    -1,    -1,    15,
-      16,    17,    -1,  4687,    -1,    -1,    -1,  4907,    -1,    -1,
-      -1,  1188,  1189,  1190,    -1,  1192,    32,    -1,   290,  4919,
-    4920,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      46,    -1,   434,    -1,   260,  1212,    -1,    -1,    -1,   441,
-     442,   443,   444,   445,   446,    -1,    -1,    -1,    -1,  4778,
-    4778,    -1,   324,    -1,    70,    -1,    -1,   134,   330,    -1,
-      -1,   333,    -1,  4792,  4792,  4792,  4792,  4792,  4792,    -1,
-    4843,    -1,    -1,  1250,    -1,    -1,  1253,  4761,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     362,  4837,   604,    -1,    -1,    -1,    -1,   369,   175,    -1,
-    4837,    -1,    -1,   180,   376,  1282,    -1,    -1,    -1,  1286,
-    1287,   383,    -1,   625,  4843,  4843,  4843,  4843,  4843,  4843,
-    1297,  1298,  1299,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   408,  4821,    -1,   216,
-      -1,    -1,  1319,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4899,    -1,    -1,    -1,    -1,    -1,   175,
-      -1,    22,  4899,    -1,   180,    -1,    -1,    28,    -1,    -1,
-      -1,    -1,  4918,  4902,  4902,  4902,  4902,  4902,  4902,    -1,
-    1357,  4918,    -1,   260,    -1,   201,   202,    -1,    -1,    -1,
-      -1,    -1,    -1,  1370,  1371,    -1,    -1,    -1,    -1,    -1,
-     216,  1378,    -1,    -1,  1381,    -1,    -1,    68,    -1,    -1,
-      -1,   437,   438,   439,    -1,   441,   442,   443,   444,   445,
-     446,    -1,    -1,    -1,    -1,    -1,  1403,    -1,  1405,    -1,
-      -1,   247,    -1,    -1,    -1,    -1,  1413,    -1,    -1,  1416,
-      -1,    -1,    -1,    -1,   260,    -1,    -1,   263,    -1,    -1,
-    3531,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,    -1,
-    3541,    -1,    -1,  1440,   341,   126,    -1,    -1,   129,    -1,
-      -1,  1448,  1449,  1450,  1451,  1452,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1463,    -1,    -1,  1466,
-      -1,    -1,    -1,   154,    -1,  3576,    -1,    -1,    -1,    -1,
-    1477,    -1,  1479,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1490,  1491,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1499,  3604,   185,   341,    -1,    -1,    -1,    -1,
-      -1,    -1,  1509,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1528,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,
-    1537,  1538,  1539,  1540,   441,   442,   443,   444,   445,   446,
-      -1,    -1,  1549,    -1,    -1,    -1,    -1,  3658,   890,  1556,
-      -1,   242,  1559,   244,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1569,   254,    -1,    -1,    -1,    -1,   910,  1576,
-      -1,   262,    -1,    -1,  1581,    -1,    -1,   919,    -1,    -1,
-      -1,   272,    -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,
-      -1,   437,   438,   439,    -1,   441,   442,   443,   444,   445,
-     446,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   454,    -1,
-      -1,  1618,    -1,    -1,    -1,   306,    -1,    -1,   309,   310,
-      -1,  1628,    -1,    -1,    -1,  1632,    -1,    -1,  1635,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1645,    -1,
-      -1,    -1,    -1,    -1,    -1,   336,  1653,  1654,    -1,    -1,
-      -1,  1658,    -1,   995,    -1,    -1,    -1,    -1,    -1,    -1,
-    3771,  3772,  3773,  3774,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1683,    -1,    -1,    -1,
-      -1,    -1,    -1,  1690,    -1,  1692,    -1,    -1,     3,  1696,
-    1697,    -1,  1699,     8,    -1,    -1,    11,    -1,    -1,  1706,
-      15,    16,    17,    -1,    -1,    -1,  1713,    -1,   399,    -1,
-      -1,  1718,  1719,    -1,    -1,  1722,    -1,    32,    -1,  1726,
-      35,  1728,    -1,    -1,    -1,    40,  1733,  1734,    -1,    -1,
-      -1,    46,    -1,  1740,  1741,  1742,    -1,    -1,    -1,  1746,
-    1747,  1748,  1749,  1750,  1751,  1752,  1753,    -1,  1755,    -1,
-    1757,  1758,    -1,    -1,  1761,    70,    -1,  1099,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1776,
-    1777,  1778,  1779,    -1,    -1,    -1,  1783,  1784,    -1,    -1,
-      -1,  1788,    -1,    -1,  1791,    -1,    -1,  1794,  1795,  1796,
-    1797,  1798,  1799,  1800,  1801,  1802,    -1,  1804,    -1,    -1,
-      -1,    -1,    -1,  1810,  1811,    -1,  1813,    -1,    -1,    -1,
-      -1,    -1,    35,  1820,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    54,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     175,    -1,    -1,    -1,    87,   180,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   201,   202,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     8,    -1,    -1,    11,
-      -1,   216,    -1,    15,    16,    17,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      32,   144,    -1,    -1,    -1,    -1,    -1,    -1,    40,  1936,
-      -1,  1938,   247,  1940,    46,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   260,    -1,    -1,   263,    -1,
-      -1,    -1,    -1,    -1,   177,    -1,    -1,    -1,    70,    -1,
-    1302,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1975,  4080,
-      -1,    -1,    -1,    -1,    -1,  1982,    -1,  1984,    -1,    -1,
-      -1,    -1,    -1,    -1,   207,    -1,    -1,    -1,    -1,   212,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2013,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2022,    -1,  2024,    -1,    -1,
-      -1,   244,    -1,  1365,    -1,    -1,   341,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2041,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2052,    -1,  2054,  2055,    -1,
-      -1,    -1,  2059,    -1,  2061,    -1,  2063,    -1,  2065,  1401,
-      -1,    -1,  2069,   175,    -1,  2072,    -1,    -1,   180,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2091,    -1,    -1,   310,    -1,   201,
-     202,   314,    -1,    -1,  2101,    -1,    -1,    -1,   321,    -1,
-      -1,  2108,    -1,    -1,   216,   328,    -1,  2114,    -1,    -1,
-      -1,    -1,    -1,   336,    -1,    -1,  2123,    -1,    -1,   434,
-      -1,    -1,   437,   438,   439,   348,   441,   442,   443,   444,
-     445,   446,    -1,   356,    -1,   247,  2143,    -1,    -1,  1481,
-    2147,  2148,    -1,    -1,    -1,    -1,    -1,    -1,   260,  2156,
-      -1,   263,    -1,   376,  1496,    -1,     8,    -1,    -1,    11,
-      -1,    -1,  1504,    15,    16,    17,  2173,    -1,    -1,    -1,
-      -1,    -1,    -1,  1515,    -1,    -1,    -1,    -1,    -1,    -1,
-      32,    -1,    -1,    -1,    -1,    -1,    -1,   410,    40,    -1,
-      -1,   414,    -1,  2200,    46,  2202,  2203,    -1,    -1,  4310,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4326,    -1,    -1,    70,    -1,
-    1562,    -1,  2229,    -1,    -1,    -1,    -1,    -1,    -1,   341,
-    2237,    -1,  2239,  1575,    -1,    -1,    -1,    -1,  2245,    -1,
-      -1,    -1,    -1,    -1,    -1,  1587,     8,    -1,  4359,    11,
-      -1,    -1,  2259,    15,    16,    17,    -1,  1599,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2273,    -1,    -1,  2276,
-      32,  2278,    -1,    -1,  2281,    -1,    -1,  2284,    40,    -1,
-      -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1643,    -1,  2310,  1646,    -1,    -1,    -1,    70,    -1,
-      -1,    -1,  2319,  2320,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   434,   175,    -1,   437,   438,   439,   180,   441,
-     442,   443,   444,   445,   446,    -1,  2343,    -1,    -1,    -1,
-      -1,    -1,   454,    -1,    -1,    -1,    -1,    -1,    -1,   201,
-     202,  2358,    -1,    -1,    -1,    -1,    -1,  4468,    -1,    -1,
-      -1,    -1,    -1,    -1,   216,    -1,  2373,    -1,  2375,  2376,
-    2377,  2378,     8,    -1,    -1,    11,    -1,    -1,    -1,    15,
-      16,    17,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2401,   247,    32,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    40,    -1,    -1,  2414,   260,    -1,
-      46,   263,    -1,   175,    -1,    -1,    -1,    -1,   180,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1775,    70,    -1,    -1,  4548,    -1,   201,
-     202,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     8,  2456,
-      -1,    11,    -1,    -1,   216,    15,    16,    17,    -1,  2466,
-      -1,    -1,    -1,    -1,    -1,  2472,    -1,    -1,    -1,    -1,
-      -1,  1813,    32,    -1,    -1,    -1,  2483,    -1,    -1,    -1,
-      40,    -1,    -1,  2490,    -1,   247,    46,    -1,  2495,   341,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   260,    -1,
-      -1,   263,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      70,  2518,  2519,  2520,    -1,    -1,  2523,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2531,  2532,  2533,  2534,    -1,    -1,
-      -1,    -1,    22,    -1,    -1,    -1,    -1,  2544,    28,   175,
-    2547,    -1,  2549,    -1,   180,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2560,  2561,    -1,    -1,  2564,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   201,   202,    -1,    -1,  2576,
-      -1,  2578,    -1,  2580,    -1,  2582,    -1,    -1,    68,   341,
-     216,    -1,   434,    -1,    -1,   437,   438,   439,    -1,   441,
-     442,   443,   444,   445,   446,  2602,    -1,   449,    -1,  2606,
-      -1,    -1,    -1,    -1,    -1,    -1,  2613,    -1,  2615,  2616,
-    2617,   247,    -1,    -1,    -1,   175,    -1,    -1,    -1,    -1,
-     180,    -1,    -1,    -1,   260,    -1,  2633,   263,    -1,   119,
-      -1,    -1,    -1,    -1,    -1,    -1,   126,    -1,  2645,   129,
-      -1,   201,   202,  2650,    -1,    -1,    -1,  1989,    -1,  2656,
-      -1,  1993,  1994,    -1,    -1,    -1,   216,    -1,    -1,  2666,
-      -1,    -1,  2669,    -1,   154,  2672,    -1,  2674,    -1,    -1,
-      -1,    -1,   434,    -1,    -1,   437,   438,   439,    -1,   441,
-     442,   443,   444,   445,   446,    -1,    -1,   247,    -1,   451,
-      22,    -1,    -1,    -1,    -1,   185,    28,    -1,    -1,    -1,
-     260,    -1,    -1,   263,    -1,   341,    -1,    -1,    -1,  2716,
-      -1,  2718,    -1,    -1,  2056,    -1,  2723,    -1,    -1,    -1,
-      -1,    53,    -1,    -1,    -1,    -1,  2068,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    68,    -1,    -1,    -1,
-      -1,    -1,  2749,    -1,  2751,  2752,  2753,    -1,    -1,    -1,
-      -1,    -1,   242,    -1,   244,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2105,   254,    -1,    -1,    -1,    -1,   101,
-      -1,    -1,   262,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   341,   272,    -1,    -1,    -1,    -1,   119,    -1,    -1,
-      -1,    -1,    -1,    -1,   126,    -1,    -1,   129,   434,    -1,
-      -1,   437,   438,   439,    -1,   441,   442,   443,   444,   445,
-     446,    -1,    -1,    -1,    -1,   451,   306,    -1,    -1,   309,
-     310,    -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   336,  2854,    -1,    -1,
-     182,    -1,    -1,   185,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,     8,    -1,    -1,    11,    -1,    -1,    -1,
-      15,    16,    17,    -1,   434,    -1,    -1,   437,   438,   439,
-      -1,   441,   442,   443,   444,   445,   446,    32,    -1,    -1,
-      -1,   451,    -1,    -1,    -1,    40,    -1,    -1,   230,    -1,
-     232,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   399,
-     242,    -1,   244,    -1,    -1,    -1,    -1,    -1,  2260,    -1,
-      -1,    -1,   254,    -1,    -1,    70,    -1,    -1,    -1,  2936,
-     262,    -1,    -1,    -1,    -1,    -1,  2943,  2944,    -1,   271,
-     272,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     8,    -1,    -1,    11,    -1,    -1,    -1,    15,
-      16,    17,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2977,  2978,    -1,    -1,   306,    -1,    32,   309,   310,   311,
-      -1,    -1,    -1,    -1,    40,    -1,  2993,    -1,  2330,    -1,
-      46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3008,  3009,    -1,   336,    -1,    -1,    -1,    -1,    -1,
-    3017,  3018,  3019,    -1,    70,    -1,    -1,    -1,   350,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    13,  3035,    -1,
-     175,    -1,    -1,    19,    -1,   180,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   201,   202,    -1,    -1,
-      -1,     8,    48,    49,    11,    -1,    -1,   399,    15,    16,
-      17,   216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3088,    -1,  3090,    -1,    -1,    -1,  3094,    -1,    -1,
-      -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    46,
-      -1,    -1,   247,  3110,    -1,    -1,  2448,    -1,    -1,    -1,
-      -1,    -1,    -1,  3120,    -1,   260,    -1,    -1,   263,   175,
-      -1,    -1,    -1,    70,   180,    -1,    -1,  2469,    -1,  3136,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2480,    -1,
-      -1,  3148,    -1,    -1,    -1,   201,   202,    -1,  3155,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3164,    -1,    -1,
-     216,    -1,    -1,  3170,    -1,  3172,    -1,    -1,  3175,    -1,
-      -1,    -1,    -1,  3180,  3181,  3182,  3183,    -1,    -1,  3186,
-    3187,  3188,  3189,  3190,  3191,  3192,  3193,  3194,  3195,    -1,
-      -1,   247,  3199,  3200,    -1,    -1,   341,    -1,    -1,    -1,
-      -1,    -1,  3209,    -1,   260,    -1,  3213,   263,   194,    -1,
-    3217,    -1,    -1,    -1,    -1,    -1,   202,    -1,  3225,   205,
-     206,  3228,   208,  3230,    -1,   211,    -1,   213,   175,    -1,
-      -1,    -1,  3239,   180,    -1,  3242,  3243,    -1,    -1,    -1,
-    3247,  3248,    -1,    -1,    -1,  3252,    -1,  3254,    -1,    -1,
-      -1,    -1,    -1,    -1,  3261,  3262,  3263,  3264,    -1,  3266,
-    3267,    -1,    -1,    -1,  3271,  3272,    -1,    -1,    -1,   216,
-      -1,  3278,    -1,  2615,  2616,  2617,    -1,  3284,  3285,  3286,
-      -1,    -1,    -1,    -1,    -1,   341,    -1,    -1,    -1,   434,
-      -1,    -1,   437,   438,   439,    -1,   441,   442,   443,   444,
-     445,   446,    -1,  3310,    -1,    -1,   451,    -1,    -1,    -1,
-      -1,    -1,    -1,   260,  3321,    -1,  3323,    -1,    -1,    -1,
-      -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    28,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3344,  3345,  3346,
-    2682,  3348,    -1,  2685,    -1,  2687,    -1,    -1,    -1,    -1,
-    2692,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3366,
-    3367,  3368,  3369,    -1,    -1,    -1,    -1,    -1,    68,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,
-      -1,   437,   438,   439,    -1,   441,   442,   443,   444,   445,
-     446,    -1,    -1,    -1,   341,   451,    -1,    -1,  3405,    -1,
-      -1,  2743,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2760,   119,
-      -1,    -1,    -1,    -1,    -1,    -1,   126,    -1,    22,   129,
-      -1,    -1,    -1,    -1,    28,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2784,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    68,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3490,    -1,   185,    -1,   434,    -1,    -1,
-     437,   438,   439,    -1,   441,   442,   443,   444,   445,   446,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2849,    -1,  2851,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3531,   119,  3533,    -1,  3535,    -1,
-      -1,    -1,   126,    -1,  3541,   129,    -1,    -1,    -1,    -1,
-    3547,    -1,   242,    -1,   244,    -1,    -1,    -1,    -1,  3556,
-      -1,    -1,    -1,    -1,   254,    -1,    -1,    -1,    -1,    -1,
-     154,    -1,   262,    -1,    -1,   551,    -1,    -1,  2910,  3576,
-      -1,    -1,   272,   559,    -1,    -1,    -1,    -1,    -1,  3586,
-     566,    -1,    -1,   569,   570,    -1,    -1,  3594,   574,    -1,
-      -1,   185,    -1,  2935,    -1,    -1,    -1,  3604,    -1,   585,
-      -1,  3608,    -1,    -1,    -1,  3612,  3613,    -1,    -1,   309,
-     310,    -1,    -1,   599,    -1,    -1,    -1,  2959,    -1,    -1,
-      -1,    -1,    -1,    -1,  2966,    -1,    -1,    -1,   614,    -1,
-     616,    -1,    -1,   619,    -1,   621,   336,    -1,   624,  3646,
-      -1,  3648,    -1,    -1,    -1,    -1,    -1,    -1,   242,    -1,
-     244,  3658,    -1,    -1,    -1,     8,    -1,    -1,    11,    -1,
-     254,    -1,    15,    16,    17,    -1,    -1,    -1,   262,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   272,    32,
-      -1,  3688,  3024,    -1,    -1,    -1,    -1,    40,    -1,    -1,
-      -1,    -1,  3699,    46,    -1,    -1,    -1,    -1,    -1,   399,
-    3042,    -1,    22,    -1,    -1,    -1,   692,    -1,    28,    -1,
-      -1,    -1,   306,  3055,    -1,   309,   310,    70,    -1,    -1,
-      -1,    -1,  3729,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3739,  3740,    -1,    -1,    -1,    -1,    -1,  3746,
-    3747,    -1,   336,    -1,  3751,    -1,    -1,    -1,    68,  3756,
-      -1,    -1,  3759,  3760,    -1,    -1,    -1,  3764,  3765,    -1,
-      -1,   747,    -1,  3770,  3771,  3772,  3773,  3774,    -1,    -1,
-      -1,  3778,  3779,    22,  3781,    -1,    -1,  3784,    -1,    28,
-      -1,  3788,    -1,    -1,    -1,  3792,    -1,    -1,    -1,    -1,
-      -1,  3798,    -1,    -1,    -1,    -1,    -1,  3804,    -1,   119,
-      -1,    -1,  3809,    -1,     8,   399,   126,    11,  3815,   129,
-      -1,    15,    16,    17,    -1,  3822,  3158,    -1,    -1,    68,
-      -1,   807,   175,  3830,    -1,    -1,  3833,   180,    32,    -1,
-      -1,  3838,    -1,    -1,   154,    -1,    40,  3179,    -1,    -1,
-      -1,    -1,    46,    -1,  3851,    -1,    -1,  3854,   201,   202,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3204,   216,    -1,   185,    70,  3874,  3875,    -1,
-     119,    -1,    -1,    -1,    -1,    -1,    -1,   126,    -1,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   872,    -1,    -1,    -1,
-      -1,    -1,  3899,    -1,   247,    -1,  3238,    -1,    -1,    -1,
-      -1,   887,    -1,    -1,    -1,   154,    -1,   260,    -1,    -1,
-     263,    -1,    -1,   899,    -1,   901,    -1,    -1,    -1,    -1,
-      -1,    -1,   242,   909,   244,    -1,    -1,    -1,    -1,  3936,
-      -1,    -1,    -1,    -1,   254,   921,   185,    -1,   924,    -1,
-      -1,    -1,   262,    -1,  3286,    -1,    -1,    -1,    -1,  3956,
-      -1,    -1,   272,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3970,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   175,    -1,   959,    -1,    -1,   180,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   306,  3329,   341,   309,
-     310,    -1,    -1,   242,    -1,   244,    -1,   201,   202,    -1,
-      -1,    -1,    -1,  4010,    22,   254,    -1,    -1,    -1,    -1,
-      28,    -1,   216,   262,  4021,    -1,   336,    -1,    -1,  4026,
-      -1,    -1,    -1,   272,    -1,    -1,    -1,  4034,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    53,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   247,  4051,  4052,    -1,    -1,    -1,    -1,
-      68,    -1,    -1,    -1,    -1,    -1,   260,   306,    -1,   263,
-     309,   310,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4080,    -1,    -1,    -1,    -1,    -1,   399,
-      -1,   434,  3424,   101,   437,   438,   439,   336,   441,   442,
-     443,   444,   445,   446,    -1,    -1,    -1,    -1,   451,    -1,
-      -1,   119,    -1,    -1,    -1,    -1,    -1,  1093,   126,    -1,
-      -1,   129,  4119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4128,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   154,   341,  4145,  4146,
-      -1,    -1,  4149,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     399,    -1,    -1,    -1,    -1,    -1,  4163,  4164,    -1,    -1,
-      -1,  4168,    -1,    -1,   182,    -1,  4173,   185,    -1,  4176,
-    4177,    -1,  4179,    -1,  4181,    -1,    -1,  4184,  4185,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4200,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4213,  4214,  4215,  4216,
-    4217,    -1,   230,    -1,   232,    -1,    -1,    -1,    -1,    -1,
-    3562,    -1,    -1,    -1,   242,    -1,   244,    -1,    -1,    -1,
-     434,    -1,    -1,   437,   438,   439,   254,   441,   442,   443,
-     444,   445,   446,    -1,   262,    -1,    -1,   451,    -1,  4256,
-    4257,    -1,    -1,   271,   272,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3611,
-      -1,    -1,    -1,    -1,    -1,    -1,    22,    -1,    -1,    -1,
-      -1,    -1,    28,    -1,    -1,  1271,  1272,    -1,   306,    -1,
-      -1,   309,   310,   311,    -1,    -1,  4303,  4304,    -1,    -1,
-    4307,    -1,    -1,  4310,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4320,    -1,    -1,    -1,    -1,   336,  4326,
-      -1,  4328,    68,    -1,    -1,    -1,    -1,  4334,    -1,    -1,
-       8,    -1,   350,    11,    -1,    -1,    -1,    15,    16,    17,
-    4347,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4358,  4359,  4360,    32,    -1,    -1,  1343,    -1,    -1,
-      -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    46,    -1,
-      -1,    -1,    -1,   119,    -1,    -1,    -1,    -1,    -1,    -1,
-     126,   399,  4389,   129,    -1,  4392,    -1,  4394,    -1,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3742,    -1,    -1,    -1,    -1,    -1,    -1,    22,   154,    -1,
-    3752,  4418,    -1,    28,    -1,  4422,    -1,    -1,  1404,  4426,
-       8,    -1,    -1,    11,    -1,    -1,  4433,    15,    16,    17,
-      -1,    -1,    -1,    -1,    -1,  4442,    -1,    -1,    -1,   185,
-      -1,    -1,    -1,    -1,    32,  4452,    -1,    -1,    -1,    -1,
-      -1,    -1,    40,    68,    -1,    -1,    -1,  4464,    46,    -1,
-      -1,  4468,  3804,    -1,    -1,    -1,    -1,  3809,    -1,    -1,
-      -1,    -1,    -1,  3815,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    70,    -1,  4491,    -1,    -1,    -1,    -1,    -1,
-      -1,  4498,  4499,  4500,  4501,    -1,   242,   175,   244,    -1,
-      -1,    -1,   180,    -1,   119,    -1,  4513,    -1,   254,    -1,
-      -1,   126,    -1,    -1,   129,    -1,   262,    -1,    -1,    -1,
-      -1,    -1,    -1,   201,   202,  4532,   272,    -1,    -1,    -1,
-    3872,    -1,    -1,  1519,    -1,    -1,    -1,    -1,   216,   154,
-      -1,  4548,    -1,    -1,    -1,    -1,  4553,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3901,
-     306,    -1,    -1,   309,   310,    -1,    -1,    -1,    -1,   247,
-     185,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3921,
-      -1,    -1,   260,    -1,    -1,   263,    -1,   175,  4595,    -1,
-     336,  4598,   180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4607,    -1,    -1,    -1,    -1,  4612,    -1,  4614,    -1,  4616,
-      -1,    -1,    -1,   201,   202,    -1,  4623,    -1,    -1,    -1,
-      -1,    -1,  4629,    -1,  4631,    -1,    -1,   242,   216,   244,
-      -1,  1617,    -1,  3975,  4641,    -1,    -1,    -1,    -1,   254,
-      -1,    -1,    -1,    -1,    -1,  1631,    -1,   262,  1634,    -1,
-    1636,    -1,  1638,   399,    -1,    -1,    -1,   272,  1644,   247,
-      -1,    -1,    -1,   341,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   260,    -1,    -1,   263,    -1,    -1,    -1,    -1,
-    4687,    -1,    -1,    -1,    -1,    -1,  4693,    -1,    -1,    -1,
-      -1,   306,    -1,    -1,   309,   310,    -1,    -1,    -1,    -1,
-      -1,   604,    -1,  1689,    -1,    -1,    -1,  1693,    -1,  1695,
-      -1,    -1,  1698,  4720,  4721,    -1,    -1,    -1,  4725,    -1,
-      -1,   336,   625,    -1,  4731,    -1,    -1,  4734,    -1,    -1,
-      -1,  4738,    -1,  4075,    -1,  4077,    -1,    -1,     8,    -1,
-      -1,    11,    -1,    -1,  4751,    15,    16,    17,    -1,    -1,
-      -1,    -1,    -1,   341,  4761,    -1,   434,    -1,    -1,   437,
-     438,   439,    32,   441,   442,   443,   444,   445,   446,    -1,
-      40,    -1,  4779,   451,    -1,    -1,    46,    -1,    -1,    -1,
-    4787,  4123,    -1,    -1,   399,    -1,  4793,  4794,  4795,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      70,    -1,    -1,    -1,    -1,    -1,    -1,  4814,    -1,    -1,
-      -1,    -1,    -1,    -1,  4821,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    28,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,   437,
-     438,   439,    -1,   441,   442,   443,   444,   445,   446,    -1,
-      -1,    -1,    -1,   451,    -1,    -1,    -1,    -1,    -1,    68,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4893,  4894,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4907,    -1,    -1,    -1,  4246,   175,    -1,    -1,    -1,    -1,
-     180,    -1,  4919,  4920,    -1,    -1,    -1,    -1,    -1,    -1,
-     119,    -1,    -1,    -1,    -1,    -1,    -1,   126,    -1,    -1,
-     129,   201,   202,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   216,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   247,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   185,   890,    -1,    -1,
-     260,    -1,    -1,   263,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   910,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   919,    -1,  2004,  2005,
-    4362,    -1,    -1,  2009,  2010,    -1,    -1,    -1,  2014,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2028,   242,    -1,   244,    -1,    -1,  4390,  2035,
-      -1,    -1,    -1,  2039,  2040,   254,    -1,  2043,  2044,    -1,
-      -1,    -1,    -1,   262,  2050,    -1,    -1,    -1,    -1,    -1,
-      -1,   341,    -1,   272,    -1,    -1,  2062,    -1,  2064,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4428,    -1,    -1,    -1,
-      -1,    -1,   995,    -1,    -1,  2081,    -1,    -1,    -1,    -1,
-    2086,    -1,    -1,    -1,    -1,    -1,    -1,   306,    -1,    -1,
-     309,   310,    -1,  2099,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2107,    -1,  2109,    -1,  2111,  2112,  2113,    -1,    -1,
-      -1,    -1,  2118,  2119,    -1,    -1,    -1,   336,    -1,    -1,
-    4482,    -1,  2128,    -1,  4486,  4487,    -1,  2133,    -1,    -1,
-      -1,    -1,  2138,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   434,    -1,    -1,   437,   438,   439,
-      -1,   441,   442,   443,   444,   445,   446,  2163,    -1,     0,
-      -1,   451,    -1,    -1,    -1,    -1,    -1,    -1,  2174,    -1,
-    2176,    -1,    -1,    -1,    -1,  2181,  1099,    18,    -1,  2185,
-     399,  2187,  2188,  2189,  2190,    -1,  2192,    28,    -1,    30,
-      31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2205,
-    2206,  2207,    -1,    -1,    45,    -1,    -1,    -1,    -1,  2215,
-    2216,    -1,  4574,  4575,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    67,    68,    -1,    -1,
-      -1,    -1,    73,    -1,    75,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    86,    -1,    88,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2269,   105,     8,    -1,   108,    11,    -1,
-      -1,    -1,    15,    16,    17,    -1,    -1,    -1,    -1,   120,
-      -1,   122,    -1,    -1,    -1,   126,    -1,    -1,    -1,    32,
-      -1,   132,    -1,    -1,    -1,    -1,    -1,    40,    -1,   140,
-      -1,   142,    -1,    46,    -1,    -1,    -1,   148,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1239,    -1,    -1,    -1,
-      -1,    -1,   163,    -1,    -1,    -1,    -1,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   179,    -1,
-      -1,    -1,    -1,    -1,     8,    -1,    -1,    11,    -1,    -1,
-      -1,    15,    16,    17,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    40,   218,   219,  1302,
-      -1,    -1,    46,   224,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,     8,   235,    -1,    11,    -1,    -1,    -1,
-      15,    16,    17,    -1,    -1,   246,    70,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2422,    32,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,
-      -1,    46,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
-      -1,    -1,  1365,    -1,   285,    -1,    -1,    -1,    -1,    -1,
-      -1,  2457,    -1,    -1,    -1,    70,   297,    -1,   201,   202,
-      -1,   302,   303,    -1,   305,    -1,    -1,    -1,    -1,   310,
-      -1,    -1,    -1,   216,   315,    -1,    -1,   318,  1401,    -1,
-      -1,    -1,   323,    -1,    -1,    -1,    -1,   328,   329,    -1,
-      -1,    -1,    -1,    -1,    -1,   336,    -1,    -1,    -1,   340,
-      -1,    -1,    -1,    -1,   247,    -1,    -1,    -1,    -1,   350,
-      -1,   175,    -1,    -1,    -1,    -1,   180,   260,    -1,    -1,
-     263,   362,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   201,   202,    -1,
-     381,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     391,    -1,   216,    -1,    -1,    -1,   397,    -1,  1481,    -1,
-     175,   402,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1496,   415,    -1,    -1,    -1,    -1,    -1,
-      -1,  1504,    -1,   247,    -1,    -1,   201,   202,    -1,    -1,
-      -1,    -1,  1515,    -1,    -1,   436,   260,    -1,   341,   263,
-      -1,   216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,
-      -1,    -1,   453,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   247,    -1,    -1,    -1,    -1,  2643,    -1,  1562,
-      -1,    -1,    -1,    -1,    -1,   260,    -1,    -1,   263,    -1,
-      -1,    -1,  1575,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1587,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1599,   341,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2695,
-    2696,   434,    -1,    -1,   437,   438,   439,    -1,   441,   442,
-     443,   444,   445,   446,    -1,    -1,    -1,  2713,   451,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1643,     8,    -1,  1646,    11,    -1,   341,    -1,    15,    16,
-      17,    -1,  2738,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2747,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    40,    -1,    -1,    -1,  2763,  2764,    46,
-      -1,    -1,  2768,    -1,    -1,    -1,    -1,  2773,  2774,  2775,
-     434,    -1,    -1,   437,   438,   439,    -1,   441,   442,   443,
-     444,   445,   446,    70,    -1,    -1,    -1,   451,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2804,  2805,
-    2806,  2807,    -1,    -1,    -1,    -1,    -1,    -1,     8,    -1,
-      -1,    11,    -1,    -1,    -1,    15,    16,    17,    -1,   434,
-      -1,    -1,   437,   438,   439,    -1,   441,   442,   443,   444,
-     445,   446,    32,    -1,    -1,  2841,   451,  2843,  2844,  2845,
-      40,     8,    -1,    -1,    11,    -1,    46,  2853,    15,    16,
-      17,    -1,  1775,    -1,    -1,    -1,    -1,    -1,    -1,     8,
-      -1,    -1,    11,    -1,    -1,    32,    15,    16,    17,    -1,
-      70,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    46,
-      -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,   175,    -1,
-      -1,    40,    -1,   180,    -1,    -1,    -1,    46,    -1,    -1,
-      -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   201,   202,  2922,    -1,    -1,    -1,
-      -1,    70,    -1,    -1,  2930,    -1,    -1,    -1,    -1,   216,
-      -1,    -1,     8,    -1,    -1,    11,    -1,    -1,    -1,    15,
-      16,    17,    -1,  2949,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,
-     247,    -1,    -1,    -1,    40,    -1,  2972,    -1,    -1,    -1,
-      46,    -1,    -1,   260,    -1,   175,   263,    -1,    -1,    -1,
-     180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,   201,   202,    -1,    -1,    -1,    -1,    -1,   175,    -1,
-    3016,    -1,    -1,   180,  3020,    -1,   216,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   175,    -1,    -1,    -1,
-      -1,   180,    -1,    -1,   201,   202,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3049,    -1,    -1,    -1,   247,    -1,   216,
-      -1,    -1,   201,   202,   341,    -1,    -1,    -1,    -1,    -1,
-     260,    -1,    -1,   263,    -1,    -1,  1989,   216,    -1,    -1,
-    1993,  1994,    -1,  3079,    -1,    -1,    -1,    -1,    -1,    -1,
-     247,    -1,    -1,    -1,    -1,    -1,    -1,  3093,    -1,    22,
-      -1,  3097,    -1,   260,    -1,    28,   263,    -1,   247,   175,
-      -1,    -1,  3108,    22,   180,    -1,    -1,    -1,    -1,    28,
-      -1,   260,    -1,    -1,   263,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   201,   202,    -1,    -1,    -1,
-      -1,    -1,    -1,  2056,    -1,    68,    -1,    -1,    -1,    -1,
-     216,   341,    -1,    -1,    -1,  2068,    -1,   434,    -1,    68,
-     437,   438,   439,    -1,   441,   442,   443,   444,   445,   446,
-      -1,    -1,    -1,   187,   451,    -1,    -1,    -1,    -1,    -1,
-      -1,   247,   196,   197,   341,    -1,    -1,    -1,    -1,    -1,
-     204,    -1,  2105,    -1,   260,    -1,   119,   263,    -1,    -1,
-      -1,   215,   341,   126,    -1,    -1,   129,    -1,    -1,    -1,
-     119,    -1,    -1,    -1,    -1,    -1,    -1,   126,    -1,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   434,   154,    -1,   437,   438,   439,
-      -1,   441,   442,   443,   444,   445,   446,    -1,    -1,    -1,
-      -1,   451,   185,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   341,   185,   434,    -1,    -1,
-     437,   438,   439,    -1,   441,   442,   443,   444,   445,   446,
-      -1,    -1,    -1,    -1,   451,   434,    -1,    -1,   437,   438,
-     439,    -1,   441,   442,   443,   444,   445,   446,     8,    -1,
-      -1,    11,   451,    -1,    -1,    15,    16,    17,    -1,   242,
-      -1,   244,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   254,    32,   242,    -1,   244,    -1,    -1,    -1,   262,
-      40,    -1,    -1,    -1,    -1,   254,    46,  2260,    -1,   272,
-      -1,    -1,    -1,   262,    -1,  3351,    -1,  3353,    -1,    -1,
-      -1,    -1,    -1,   272,  3360,    -1,    -1,    -1,   434,    -1,
-      70,   437,   438,   439,    -1,   441,   442,   443,   444,   445,
-     446,  3377,    -1,   306,    -1,   451,   309,   310,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3392,   306,    -1,    -1,
-     309,   310,    -1,    -1,    -1,    -1,    -1,  3403,    -1,    -1,
-      -1,    -1,    -1,   336,    -1,     8,    -1,  2330,    11,    -1,
-      -1,    -1,    15,    16,    17,  3421,    -1,   336,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,
-      -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,
-      -1,    -1,  3448,    46,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3459,  3460,  3461,    -1,    -1,  3464,  3465,
-    3466,  3467,  3468,  3469,    -1,   175,   399,    70,  3474,  3475,
-     180,  3477,  3478,  3479,  3480,  3481,  3482,  3483,    -1,    -1,
-     399,    -1,    -1,    -1,    -1,    -1,  3492,    -1,  3494,  3495,
-      -1,   201,   202,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   216,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   117,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2448,   550,    -1,  3534,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   247,   562,    -1,
-      -1,    -1,    -1,   567,    -1,    -1,  2469,    -1,    -1,    -1,
-     260,    -1,    -1,   263,   578,    -1,    -1,  2480,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     594,    -1,   175,    -1,   598,    -1,    -1,   180,    -1,    -1,
-     604,    -1,    -1,    -1,   608,   609,    -1,    -1,    -1,    -1,
-      -1,   615,    -1,    -1,    -1,    -1,    -1,    -1,   201,   202,
-      -1,   625,   626,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     634,    -1,    -1,   216,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3631,    -1,    -1,    -1,    -1,
-      -1,   341,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   247,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3659,  3660,  3661,    -1,   260,    -1,    -1,
-     263,    -1,    -1,    -1,    -1,  3671,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   713,
-     714,    -1,    -1,    -1,    -1,   719,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   745,    -1,    -1,   434,    -1,    -1,   437,   438,   439,
-      -1,   441,   442,   443,   444,   445,   446,    -1,   341,    -1,
-      -1,   451,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2682,
-      -1,    -1,  2685,    -1,  2687,     8,    -1,    -1,    11,  2692,
-      -1,    -1,    15,    16,    17,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,
-      -1,    -1,    -1,   396,    -1,    -1,    -1,    40,    -1,    -1,
-      -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2743,    -1,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,
-      -1,   434,    -1,    -1,   437,   438,   439,  2760,   441,   442,
-     443,   444,   445,   446,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   883,
-      -1,  2784,    -1,    -1,    -1,    -1,   890,    -1,    -1,    -1,
-     894,    -1,    -1,    -1,  3880,    -1,    -1,    -1,  3884,  3885,
-    3886,  3887,    -1,    -1,  3890,    -1,   910,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   919,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3912,  3913,  3914,  3915,
-     153,  3917,  3918,    -1,    -1,   158,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3929,  3930,    -1,  2849,    -1,  2851,    -1,
-      -1,    -1,   175,    -1,   958,    -1,    -1,   180,    -1,    -1,
-      -1,  3947,    -1,    -1,    -1,    -1,    -1,    -1,  3954,  3955,
-      -1,  3957,    -1,    -1,     8,    -1,    -1,    11,   201,   202,
-      -1,    15,    16,    17,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   995,    -1,   216,    -1,    -1,    -1,    -1,    32,    -1,
-      -1,    35,    -1,    -1,    -1,    -1,    40,  2910,    -1,    -1,
-      -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   247,    -1,  1030,    -1,    -1,    -1,
-      -1,    -1,  2935,    -1,    -1,    -1,    70,   260,    -1,    -1,
-     263,    -1,    -1,    -1,    -1,     8,  1050,    -1,    11,    -1,
-    1054,    -1,    15,    16,    17,  4041,  2959,    -1,  1062,    -1,
-      -1,    -1,    -1,  2966,    -1,    -1,    -1,    -1,    -1,    32,
-      -1,    -1,    -1,    -1,    -1,    -1,  4062,    40,    -1,    -1,
-      -1,    -1,    -1,    46,    -1,    -1,  1090,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1099,    -1,  1101,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4092,    70,    -1,    -1,
-      -1,    -1,  1116,    -1,    -1,  1119,    -1,    -1,   341,    -1,
-      -1,  3024,    -1,    -1,    -1,    -1,    -1,  1131,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3042,
-      -1,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,
-      -1,    -1,  3055,    -1,    -1,    -1,  1160,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   201,   202,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4166,    -1,   216,    -1,  1188,  1189,  1190,    -1,  1192,   152,
-      -1,    -1,    -1,    -1,    -1,  4181,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1212,    -1,
-      -1,   434,   175,   247,   437,   438,   439,   180,   441,   442,
-     443,   444,   445,   446,    -1,    -1,   260,    -1,    -1,   263,
-      -1,    -1,  1236,    -1,    -1,    -1,    -1,    -1,   201,   202,
-    1244,  1245,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1253,
-    1254,    -1,    -1,   216,    -1,  3158,    -1,    -1,    -1,    -1,
-      -1,    -1,  4248,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3179,    -1,  1282,    -1,
-    4266,    -1,  1286,  1287,   247,  4271,  4272,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   260,  1302,    -1,
-     263,  3204,    -1,    -1,  1308,    -1,    -1,   341,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   282,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3238,    -1,    -1,    -1,    -1,
-      -1,  4327,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1365,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   341,    -1,
-      -1,    -1,     8,    -1,    -1,    11,    -1,  4373,    -1,    15,
-      16,    17,    -1,    -1,  4380,    -1,    -1,  1401,    -1,    -1,
-     434,    -1,    -1,   437,   438,   439,    32,   441,   442,   443,
-     444,   445,   446,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      46,    -1,    -1,    -1,    -1,    -1,  3329,    -1,    -1,  4415,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4426,    -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1461,    -1,    -1,
-      -1,    -1,  4448,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   434,    -1,    -1,   437,   438,   439,  1481,   441,   442,
-     443,   444,   445,   446,    -1,    -1,  4472,    -1,    -1,    -1,
-      -1,    -1,  1496,    -1,    -1,  4481,    -1,    -1,    -1,    -1,
-    1504,    -1,    -1,    -1,    -1,    -1,  1510,    -1,    -1,    -1,
-      -1,  1515,    -1,    -1,    -1,    -1,  4502,    -1,    -1,    -1,
-      -1,  3424,    -1,    -1,    -1,    -1,    -1,  1531,    -1,    -1,
-      -1,  1535,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1547,    -1,    -1,    -1,    -1,    -1,   175,
-      -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,  1562,    -1,
-      -1,    -1,    -1,    -1,    -1,  1569,    -1,    -1,    -1,    -1,
-      -1,  1575,    -1,    -1,    -1,   201,   202,  1581,    -1,    -1,
-      -1,    -1,    -1,  1587,    -1,    -1,    -1,    -1,    -1,    -1,
-     216,    -1,    -1,    -1,    -1,  1599,  4582,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1618,    -1,  1620,  1621,  4604,    -1,
-      -1,   247,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1633,
-      -1,    -1,    -1,    -1,   260,    -1,    -1,   263,    -1,  1643,
-      -1,    -1,  1646,    -1,  1648,  1649,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4639,     8,    -1,  1660,    11,   284,  3562,
-      -1,    15,    16,    17,    -1,    -1,    -1,    -1,  4654,    -1,
-      -1,    -1,    -1,     8,    -1,    -1,    11,    -1,    32,    -1,
-      15,    16,    17,    -1,    -1,    -1,    40,    -1,  1692,    -1,
-      -1,    -1,    46,  4679,    -1,    -1,    -1,    32,    -1,    -1,
-      35,    -1,    -1,    -1,    -1,    40,    -1,    -1,  3611,    -1,
-      -1,    46,    -1,    -1,    -1,   341,    70,    -1,    -1,    -1,
-      -1,    -1,  1726,    -1,  1728,    -1,    -1,    -1,    -1,  1733,
-    1734,   357,    -1,    -1,    -1,    70,  1740,  1741,  1742,    -1,
-      -1,    -1,  1746,    -1,  1748,  1749,  1750,  1751,  1752,  1753,
-      -1,  1755,    -1,  1757,  1758,    -1,    -1,  1761,    -1,    -1,
-      -1,    -1,    -1,    -1,  4750,    -1,    -1,    -1,    -1,    -1,
-      -1,  1775,  1776,  1777,  1778,  1779,  1780,    -1,    -1,    -1,
-    1784,    -1,    -1,    -1,  1788,    -1,    -1,  1791,    -1,  4775,
-    1794,  1795,  1796,  1797,  1798,  1799,  1800,  1801,  1802,    -1,
-    1804,    -1,    -1,    -1,    -1,    -1,    -1,  1811,   434,  1813,
-      -1,   437,   438,   439,    -1,   441,   442,   443,   444,   445,
-     446,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3742,
-     175,    -1,    -1,    -1,    -1,   180,    -1,   201,   202,  3752,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   216,    -1,    -1,    -1,   201,   202,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   247,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   260,    -1,    -1,   263,
-      -1,    -1,   247,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   278,   260,    -1,    -1,   263,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1940,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3872,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1989,    -1,   341,     8,  1993,
-    1994,    11,    -1,    -1,    -1,    15,    16,    17,  3901,  2003,
-      -1,    -1,    -1,  2007,  2008,    -1,   341,    -1,  2012,    -1,
-      -1,    -1,    32,    -1,    -1,    -1,  2020,    -1,  3921,    -1,
-      40,    -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2038,    -1,    -1,  2041,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2052,    -1,
-      70,    -1,  2056,    -1,    -1,  2059,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2068,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3975,    -1,    -1,    -1,  2080,    -1,    -1,    -1,
-     434,    -1,    -1,   437,   438,   439,    -1,   441,   442,   443,
-     444,   445,   446,  2097,  2098,    -1,    -1,    -1,    -1,   434,
-      -1,  2105,   437,   438,   439,    -1,   441,   442,   443,   444,
-     445,   446,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2126,  2127,    -1,    -1,  2130,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   158,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2158,   175,    -1,    -1,  2162,    -1,
-     180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4077,    -1,  2180,    -1,    -1,    -1,
-      -1,   201,   202,    -1,    -1,    -1,    -1,  2191,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   216,    -1,    -1,    -1,
-    2204,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2212,    -1,
-     197,    -1,    -1,    -1,    -1,    -1,    -1,   204,    -1,    -1,
-    4123,    -1,    -1,    -1,    -1,    -1,    -1,   247,   215,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     260,    -1,    -1,   263,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2259,  2260,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2268,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   341,    -1,    -1,    -1,    -1,  2330,    -1,    -1,    -1,
-    2334,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     8,  2343,
-      -1,    11,    -1,  4246,    -1,    15,    16,    17,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    32,    -1,    -1,    35,    -1,    -1,    -1,    -1,
-      40,    -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2396,    -1,    -1,    -1,    -1,  2401,    -1,    -1,
-      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   434,    -1,    -1,   437,   438,   439,
-      -1,   441,   442,   443,   444,   445,   446,    -1,  2432,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2448,    -1,    -1,    -1,    -1,    -1,
-    2454,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2462,  4362,
-      -1,    -1,  2466,    -1,    -1,  2469,    -1,    -1,  2472,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2480,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2490,  4390,    -1,    -1,
-      -1,  2495,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   175,    -1,    -1,    -1,    -1,
-     180,    -1,    -1,    -1,  2518,  2519,  2520,    -1,    -1,  2523,
-      -1,    -1,    -1,    -1,    -1,  4428,    25,  2531,  2532,  2533,
-    2534,   201,   202,    -1,    -1,  2539,    -1,    -1,    -1,    -1,
-    2544,  2545,    -1,  2547,    -1,  2549,   216,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2560,  2561,    -1,    58,
-    2564,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    71,    72,  2578,   562,  2580,   247,  2582,  4482,
-     567,    -1,    81,  4486,  4487,    -1,    85,    -1,    -1,    -1,
-     260,   578,    -1,   263,    -1,    -1,    -1,    -1,  2602,    -1,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   594,    -1,  2613,
-      -1,  2615,  2616,  2617,    -1,    -1,    -1,   197,    -1,    -1,
-      -1,    -1,   609,    -1,   204,   124,  2630,    -1,   615,  2633,
-      -1,    -1,    -1,    -1,    -1,   215,   135,    -1,    -1,   626,
-      -1,  2645,    -1,    -1,   143,    -1,  2650,   634,    -1,    -1,
-      -1,    -1,  2656,    -1,    -1,    -1,   155,    -1,    -1,    -1,
-      -1,   160,  2666,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   341,  4575,    -1,    -1,    -1,    -1,    -1,  2682,    -1,
-      -1,  2685,    -1,  2687,   183,    -1,    -1,    -1,  2692,    -1,
-    2694,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2710,  2711,    -1,   208,
-      -1,    -1,  2716,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     229,    -1,   719,  2737,    -1,    -1,  2740,    -1,    -1,  2743,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2760,    -1,    -1,    -1,
-      -1,   260,    -1,    -1,   434,    -1,    -1,   437,   438,   439,
-      -1,   441,   442,   443,   444,   445,   446,    -1,    -1,    -1,
-    2784,   280,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   290,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2816,  2817,  2818,    -1,    -1,    -1,   317,    -1,
-      -1,    -1,    -1,   322,    -1,   324,    -1,    -1,    -1,    -1,
-      -1,   330,    -1,    -1,   333,    -1,  2840,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2849,    -1,  2851,  2852,    -1,
-      -1,    -1,  2856,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2866,   362,    -1,    -1,   365,    -1,    -1,    -1,
-     369,    -1,    -1,    -1,    -1,    -1,    -1,   376,    -1,   378,
-      -1,    -1,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2910,    -1,    -1,   408,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2929,    -1,    -1,    -1,    -1,
-      -1,  2935,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2959,    -1,    -1,    -1,    -1,
-      -1,  2965,  2966,    -1,    -1,    -1,    -1,  2971,    -1,  2973,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2985,   562,  2987,    -1,    -1,    -1,   567,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   578,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    25,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   594,    -1,    -1,    -1,    37,    -1,
-    3024,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   609,
-      -1,    -1,    -1,    -1,    -1,   615,    -1,  3041,  3042,    58,
-      -1,    -1,    -1,  1030,    -1,    -1,   626,    -1,    -1,    -1,
-      -1,  3055,    71,    -1,   634,    -1,    -1,    -1,    -1,    -1,
-      -1,     8,    -1,  1050,    11,    -1,    85,    -1,    15,    16,
-      17,    -1,    -1,    -1,    -1,  1062,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   103,    32,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    40,  3098,    -1,    -1,    -1,    -1,    46,
-      -1,    -1,    -1,  1090,    -1,   124,  3110,    -1,    -1,  3113,
-      -1,    -1,    -1,    -1,  1101,    -1,   135,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,   143,    -1,    -1,    -1,    -1,  1116,
-      -1,  3135,  1119,    -1,  3138,    -1,   155,    -1,    -1,   719,
-      -1,   160,    -1,    -1,    -1,    -1,    -1,   166,    -1,    -1,
-      -1,  3155,    -1,    -1,  3158,    -1,    -1,    -1,    -1,    -1,
-    3164,    -1,    -1,    -1,   183,    -1,  3170,    -1,  3172,    -1,
-      -1,  3175,    -1,    -1,    -1,  3179,  3180,  3181,  3182,  3183,
-      -1,    -1,  3186,  3187,  3188,  3189,  3190,  3191,  3192,  3193,
-    3194,  3195,    -1,    -1,    -1,  3199,  3200,    -1,    -1,    -1,
-    3204,    -1,    -1,    -1,    -1,  3209,    -1,    -1,    -1,  3213,
-     229,  3215,    -1,  3217,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3225,    -1,    -1,  3228,    -1,  3230,    -1,   175,    -1,
-      -1,    -1,    -1,   180,  3238,  3239,    -1,    -1,  3242,  3243,
-      -1,   260,    -1,  3247,  3248,    -1,    -1,    -1,    -1,  1236,
-    3254,    -1,   271,    -1,   201,   202,    -1,  1244,  1245,    -1,
-    3264,   280,  3266,    -1,    -1,    -1,    -1,  1254,    -1,   216,
-      -1,   290,    -1,    -1,  3278,    -1,    -1,    -1,    -1,    -1,
-    3284,  3285,  3286,    -1,    -1,     8,    -1,    -1,    11,    -1,
-      -1,    -1,    15,    16,    17,    -1,    -1,    -1,   317,    -1,
-     247,    -1,    -1,   322,    -1,   324,  3310,    -1,    -1,    32,
-      -1,   330,    35,   260,   333,    -1,   263,    40,    -1,  3323,
-      -1,  1308,    -1,    46,    -1,  3329,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3344,    -1,    -1,   362,    -1,    -1,   365,    70,    -1,    -1,
-     369,    -1,    -1,    -1,    -1,    -1,    -1,   376,    -1,   378,
-      -1,    -1,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3376,    -1,    -1,    -1,   395,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     8,    -1,    -1,    11,    -1,   408,
-      -1,    15,    16,    17,   341,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,
-      -1,    -1,    -1,    -1,  3418,    -1,    40,    -1,    -1,  3423,
-    3424,  3425,    46,   370,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,    -1,
-    1030,    -1,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3473,
-    1050,    -1,  3476,    -1,  1461,    -1,    -1,    -1,   201,   202,
-      -1,    -1,  1062,    -1,    -1,    -1,    -1,   434,    -1,    -1,
-     437,   438,   439,   216,   441,   442,   443,   444,   445,   446,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3513,
-    1090,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1101,    -1,  1510,   247,    -1,    -1,    -1,    -1,    -1,
-      -1,  3535,    -1,    -1,    -1,    -1,  1116,   260,    -1,  1119,
-     263,    -1,    -1,    -1,  1531,    -1,    -1,    -1,  1535,    -1,
-      -1,   175,    -1,    -1,  3558,  3559,   180,    -1,  3562,    -1,
-    1547,    -1,    -1,    -1,    -1,    -1,    -1,  3571,    -1,  3573,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   201,   202,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3611,  3612,  3613,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   341,    -1,
-      -1,    -1,    -1,   247,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1620,  1621,    -1,   260,    -1,    -1,   263,
-      -1,    -1,    -1,    -1,    -1,    -1,  1633,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1236,    -1,    -1,    -1,
-      -1,  1648,  1649,  3667,  1244,  1245,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1660,  1254,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3688,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3699,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   434,    -1,    -1,   437,   438,   439,   341,   441,   442,
-     443,   444,   445,   446,    -1,  3729,    -1,    -1,  1308,    -1,
-      -1,    -1,    -1,    -1,    -1,  3739,  3740,    -1,  3742,    -1,
-      -1,    -1,  3746,  3747,    -1,    -1,    -1,  3751,  3752,    -1,
-      -1,    -1,  3756,    -1,    -1,  3759,  3760,    -1,    -1,    -1,
-    3764,    -1,    -1,    -1,    -1,    -1,  3770,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3788,    -1,    -1,    -1,  3792,    -1,
-      -1,    -1,    -1,  1780,    -1,    -1,    -1,    -1,    -1,    -1,
-    3804,    -1,    -1,    -1,    -1,  3809,    -1,    -1,    -1,    -1,
-     434,  3815,    -1,   437,   438,   439,    -1,   441,   442,   443,
-     444,   445,   446,    -1,    -1,    -1,  3830,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     8,    -1,    -1,
-      11,    -1,    -1,    -1,    15,    16,    17,    -1,    -1,    -1,
-    3854,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    32,    -1,    -1,    -1,    -1,    -1,    -1,  3872,    40,
-      -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,
-      -1,  1461,    -1,    -1,    -1,  3889,    -1,    -1,  3892,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3901,    -1,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3916,    -1,    -1,    -1,    -1,  3921,    -1,    -1,
-      -1,    -1,    -1,    -1,  3928,    -1,    -1,    -1,    -1,    -1,
-    1510,    -1,  3936,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3946,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1531,    -1,    -1,    -1,  1535,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1547,    -1,    -1,
-      -1,  3975,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3993,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   175,    -1,  4010,    -1,    -1,   180,
-      -1,    -1,    -1,    -1,    -1,    -1,  2003,  4021,    -1,    -1,
-    2007,  2008,    -1,    -1,    -1,  2012,    -1,    -1,    -1,    -1,
-     201,   202,    -1,  2020,    -1,    -1,    -1,    -1,    -1,    -1,
-    1620,  1621,    -1,    -1,    -1,   216,    -1,    -1,    -1,    -1,
-      -1,  2038,    -1,  1633,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1648,  1649,
-      -1,  4075,    -1,  4077,    -1,    -1,   247,    -1,    -1,    -1,
-    1660,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   260,
-      -1,    -1,    -1,  2080,    -1,    -1,    -1,    -1,    -1,  4103,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2097,  2098,    -1,    -1,    -1,  4119,    -1,    -1,    -1,  4123,
-      -1,    -1,    -1,    -1,  4128,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2126,
-    2127,  4145,  4146,  2130,    -1,  4149,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4163,
-      -1,    -1,    -1,    -1,  4168,    -1,    -1,    -1,    -1,  4173,
-     341,  2158,  4176,  4177,    -1,  2162,    -1,    -1,    -1,    -1,
-    4184,  4185,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2180,    -1,    -1,  4200,    -1,    -1,    -1,
-    1780,    -1,    -1,  4207,  2191,  4209,    -1,    -1,    -1,  4213,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2204,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2212,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4246,  4247,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4256,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   434,    -1,    -1,   437,   438,   439,    -1,
-     441,   442,   443,   444,   445,   446,    -1,    -1,    -1,    -1,
-      -1,  2268,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4293,
-      -1,  4295,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4307,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     8,
-      -1,    -1,    11,    -1,    -1,    -1,    15,    16,    17,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2334,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4360,    -1,  4362,    -1,
-      -1,    40,    -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4389,  4390,    -1,  4392,    -1,
-    4394,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,    -1,  2396,
-      -1,    -1,    -1,    -1,  4418,    -1,    -1,    -1,  4422,    -1,
-      -1,    -1,    -1,  2003,  4428,    -1,   625,  2007,  2008,  4433,
-      -1,    -1,  2012,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2020,    -1,    -1,    -1,    -1,  2432,    -1,    -1,  4452,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2038,   713,
-     714,    -1,    -1,    -1,    -1,    -1,    -1,  2454,    -1,    -1,
-      -1,    -1,  4476,    -1,    -1,  2462,    -1,    -1,  4482,    -1,
-      -1,    -1,  4486,  4487,    -1,    -1,    -1,  4491,    -1,    -1,
-      -1,   745,    -1,    -1,    -1,    -1,   175,    -1,    -1,    -1,
-    2080,   180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2097,  2098,    -1,
-      -1,    -1,   201,   202,    -1,    -1,    -1,    -1,  4532,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   216,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2126,  2127,    -1,  4553,
-    2130,    -1,  2539,    -1,    -1,    -1,    -1,    -1,  2545,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   247,    -1,
-    4574,  4575,    -1,    -1,    -1,    -1,    -1,    -1,  2158,    -1,
-      -1,   260,  2162,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4595,    -1,    -1,  4598,    -1,    -1,    -1,    -1,    -1,
-    2180,    -1,    -1,  4607,    -1,    -1,    -1,    -1,  4612,    -1,
-    4614,  2191,  4616,    -1,    -1,    -1,    -1,    -1,    -1,  4623,
-      -1,    -1,    -1,    -1,  2204,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2212,    -1,    -1,    -1,    -1,  4641,    -1,    -1,
-      -1,    -1,    -1,  2630,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4664,    -1,   341,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2268,  4693,
-      -1,   890,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2694,    -1,    -1,
-      -1,   910,    -1,    -1,    -1,    -1,  4720,  4721,    -1,    -1,
-     919,    -1,    -1,  2710,  2711,    -1,    -1,  4731,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4739,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4751,    -1,    -1,
-    2737,    -1,    -1,  2740,  2334,   434,    -1,    -1,   437,   438,
-     439,    -1,   441,   442,   443,   444,   445,   446,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4787,    -1,    -1,    -1,    -1,    -1,  4793,
-    4794,  4795,    -1,    -1,    -1,    -1,   995,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4814,    -1,    -1,    -1,    -1,    -1,  2396,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2816,
-    2817,  2818,    -1,  4837,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2432,  2840,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2852,    -1,    -1,    -1,  2856,
-      -1,    -1,    25,    -1,  2454,    -1,    -1,  1131,    -1,  2866,
-      -1,    -1,  2462,    -1,    -1,    -1,    -1,    -1,    -1,  4893,
-    4894,    -1,    -1,    -1,    -1,  4899,    -1,    -1,    -1,    -1,
-    1099,    -1,    -1,  4907,    -1,    -1,  1160,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4918,  4919,  4920,    -1,    71,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    85,    -1,  1188,  1189,  1190,    -1,  1192,    -1,
-      -1,    -1,  2929,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     103,    -1,    -1,    -1,    -1,    -1,   109,    -1,  1212,  2539,
-      -1,    -1,    -1,    -1,    -1,  2545,    -1,    -1,    -1,    -1,
-      -1,   124,    -1,    -1,    -1,    -1,    -1,    -1,  2965,    -1,
-      -1,    -1,   135,    -1,  2971,    -1,  2973,    -1,    -1,    -1,
-     143,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2985,  1253,
-    2987,    -1,   155,    -1,    -1,    -1,    -1,   160,    -1,    -1,
-      -1,    -1,    -1,   166,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1282,    -1,
-     183,    -1,  1286,  1287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   604,    -1,    -1,    -1,    -1,    -1,
-    2630,    -1,    -1,    -1,  3041,   208,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   625,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   229,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1302,    -1,    -1,    -1,   260,    -1,    -1,
-      -1,  3098,    -1,    -1,  2694,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3113,   280,    -1,    -1,
-    2710,  2711,    -1,    -1,    -1,    -1,    -1,   290,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3135,    -1,
-      -1,  3138,    -1,    -1,    -1,    -1,    -1,  2737,    -1,    -1,
-    2740,    -1,    -1,    -1,   317,    -1,  1365,    -1,    -1,   322,
-      -1,   324,    -1,    -1,    -1,    -1,    -1,   330,    -1,    -1,
-     333,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1401,    -1,    -1,    -1,    -1,    -1,   361,   362,
-      -1,    -1,   365,    -1,    -1,    -1,   369,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   378,    -1,    -1,  3215,    -1,
-     383,    -1,    -1,    -1,    -1,    -1,  2816,  2817,  2818,    -1,
-      -1,    -1,   395,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   408,    -1,    -1,    -1,    -1,
-    2840,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2852,    -1,   604,    -1,  2856,    -1,    -1,    -1,
-      -1,    -1,  1481,    -1,    -1,    -1,  2866,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   625,    -1,  1496,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1504,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1515,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     890,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2929,
-     910,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   919,
-      -1,    -1,    -1,  1562,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1575,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2965,    -1,    -1,  1587,  3376,
-      -1,  2971,    -1,  2973,    -1,    -1,    -1,    -1,    -1,    -1,
-    1599,    -1,    -1,    -1,    -1,  2985,    -1,  2987,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3418,    -1,    -1,    -1,   995,  3423,    -1,  3425,    -1,
-      -1,    -1,    -1,    -1,  1643,    -1,    -1,  1646,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3041,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1733,
-      -1,    -1,    -1,    -1,    -1,    -1,  3473,    -1,    -1,  3476,
-      -1,    -1,  1746,    -1,  1748,    -1,    -1,  1751,  1752,  1753,
-      -1,    -1,    -1,    -1,  1758,    -1,    -1,  1761,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3098,    -1,
-      -1,    -1,  1776,  1777,  1778,  1779,  3513,    -1,    -1,    -1,
-    1784,    -1,    -1,  3113,  1788,    -1,    -1,  1791,    -1,  1099,
-    1794,  1795,  1796,  1797,  1798,  1799,  1800,  1801,  1802,    -1,
-    1804,    -1,    -1,    -1,    -1,  3135,    -1,  1811,  3138,  1813,
-     890,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3558,  3559,    -1,    -1,    -1,  1775,    -1,    -1,    -1,
-     910,    -1,    -1,    -1,  3571,    -1,  3573,    -1,    -1,   919,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3215,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     604,    -1,    -1,    -1,    -1,   995,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3667,   625,    -1,    -1,    -1,    -1,  1940,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1302,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1099,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2041,    -1,    -1,
-    1989,    -1,    -1,    -1,  1993,  1994,  3376,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1365,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   604,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3418,    -1,
-      -1,  1401,    -1,  3423,    -1,  3425,    -1,    -1,    -1,   625,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2056,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2068,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3473,    -1,    -1,  3476,    -1,    -1,    -1,
-      -1,    -1,  3889,    -1,    -1,  3892,  2105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1481,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3916,
-      -1,    -1,    -1,  3513,    -1,    -1,  1496,    -1,    -1,    -1,
-      -1,  3928,    -1,    -1,  1504,    -1,   890,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1515,    -1,    -1,    -1,  3946,
-      -1,    -1,    -1,    -1,    -1,    -1,   910,    -1,    -1,    -1,
-      -1,    -1,  1302,    -1,    -1,   919,    -1,    -1,  3558,  3559,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3571,    -1,  3573,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1562,    -1,    -1,  2259,  3993,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1575,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1587,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1365,    -1,    -1,    -1,  1599,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   995,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2260,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1401,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1643,    -1,    -1,  1646,  3667,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   890,    -1,  4103,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2330,    -1,    -1,   910,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   919,    -1,    -1,    -1,  2401,    -1,    -1,
-      -1,  1481,    -1,    -1,    -1,  1099,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1496,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1504,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1515,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1775,    -1,    -1,    -1,   995,
-    4207,    -1,  4209,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1562,    -1,    -1,    -1,  2490,    -1,    -1,    -1,
-      -1,  2495,    -1,    -1,    -1,  1575,    -1,    -1,    -1,  2448,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1587,    -1,    -1,
-    4247,    -1,    -1,    -1,    -1,    -1,  2520,    -1,    -1,  1599,
-    2469,    -1,    -1,    -1,    -1,    -1,    -1,  2531,    -1,  2533,
-    2534,  2480,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2544,    -1,    -1,  2547,    -1,  2549,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4293,    -1,  4295,  3889,
-      -1,    -1,  3892,  1643,    -1,    -1,  1646,    -1,    -1,    -1,
-      -1,    -1,    -1,  1099,  2578,    -1,  2580,    -1,  2582,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3916,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3928,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1302,    -1,
-      -1,  2615,  2616,  2617,    -1,    -1,  3946,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2633,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2645,    -1,    -1,    -1,    -1,  2650,    -1,    -1,    -1,
-      -1,    -1,  2656,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3993,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1365,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1989,
-      -1,    -1,    -1,  1993,  1994,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1775,    -1,    -1,    -1,   604,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1401,    -1,    -1,
-      -1,    -1,  2716,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     625,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2682,    -1,    -1,  2685,    -1,  2687,  4476,
-      -1,    -1,    -1,  2692,    -1,    -1,  2056,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2068,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4103,    -1,    -1,  1302,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1481,    -1,    -1,
-      -1,    -1,    -1,    -1,  2743,  2105,    -1,    -1,    -1,    -1,
-      -1,    -1,  1496,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1504,  2760,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1515,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2784,    -1,    -1,    -1,  1365,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1562,    -1,
-      -1,    -1,    -1,    -1,    -1,  1401,    -1,  4207,    -1,  4209,
-      -1,  1575,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1587,    -1,    -1,    -1,    -1,    -1,    -1,
-    2849,    -1,  2851,    -1,    -1,  1599,    -1,    -1,    -1,  1989,
-      -1,    -1,    -1,  1993,  1994,    -1,    -1,  4247,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4664,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1643,
-    2260,    -1,  1646,    -1,    -1,  1481,    -1,    -1,    -1,    -1,
-      -1,  2910,    -1,  4293,    -1,  4295,    -1,    -1,    -1,    -1,
-    1496,    -1,    -1,    -1,    -1,    -1,  2056,    -1,  1504,    -1,
-      -1,    -1,    -1,    -1,    -1,   890,  2935,    -1,  2068,  1515,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4739,    -1,    -1,   910,    -1,    -1,    -1,    -1,
-    2959,    -1,    -1,    -1,   919,    -1,    -1,  2966,    -1,    -1,
-    2330,    -1,    -1,    -1,    -1,  2105,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1562,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1575,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1587,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1599,    -1,  3024,    -1,    -1,    -1,    -1,
-      -1,  1775,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     995,    -1,    -1,  3042,    -1,    -1,    -1,    -1,    -1,    -1,
-    4837,    -1,    -1,    -1,    -1,    -1,  3055,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1643,    -1,    -1,
-    1646,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2448,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4476,    -1,    -1,    -1,
-      -1,  3155,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2469,
-    3164,    -1,  4899,    -1,    -1,    -1,  3170,    -1,  3172,    -1,
-    2480,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2260,  4918,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    25,    -1,  1099,  3199,  3200,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,  3158,
-      -1,    -1,    -1,  3217,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3225,    -1,    -1,  3228,    58,  3230,    -1,    -1,    -1,
-    3179,    -1,    -1,    -1,    -1,  3239,    -1,    -1,    71,    -1,
-      -1,    -1,    -1,  3247,  3248,    -1,    -1,    -1,    81,  1775,
-    2330,    -1,    85,    -1,    -1,  3204,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     103,    -1,    -1,    -1,  3278,    -1,   109,    -1,    -1,    -1,
-    3284,  3285,  3286,    -1,    -1,    -1,    -1,    -1,    -1,  3238,
-      -1,   124,    -1,    -1,    -1,  1989,    -1,    -1,    -1,  1993,
-    1994,    -1,   135,    -1,    -1,    -1,  3310,    -1,    -1,    -1,
-     143,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3323,
-      -1,    -1,   155,    -1,    -1,    -1,    -1,    -1,    -1,   162,
-      -1,    -1,    -1,   166,  4664,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     183,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2056,    -1,    -1,    -1,    -1,    -1,  2448,    -1,
-      -1,    -1,  2682,    -1,  2068,  2685,    -1,  2687,    -1,    -1,
-    3329,    -1,  2692,    -1,    -1,    -1,    -1,   220,    -1,  2469,
-      -1,    -1,    -1,    -1,    -1,    -1,   229,  1302,    -1,    -1,
-    2480,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4739,
-      -1,  2105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   260,    -1,    -1,
-     263,    -1,    -1,  2743,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   280,    -1,    -1,
-    2760,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1365,    -1,    -1,  1989,    -1,    -1,   299,  1993,  1994,    -1,
-      -1,    -1,    -1,    -1,  2784,  3424,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   317,    -1,    -1,    -1,    -1,    -1,
-      -1,   324,    -1,    -1,    -1,    -1,  1401,   330,    -1,    -1,
-     333,    -1,    -1,    -1,    -1,    -1,    -1,  4837,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   362,
-    2056,    -1,   365,   366,    -1,   368,   369,    -1,    -1,  2849,
-      -1,  2851,  2068,    -1,    -1,   378,    -1,    -1,    -1,    -1,
-     383,    -1,    -1,    -1,    -1,    -1,   389,    -1,    -1,   392,
-      -1,    -1,   395,    -1,    -1,    -1,  2260,    -1,    -1,  4899,
-      -1,    -1,    -1,    -1,    -1,   408,  1481,    -1,    -1,  2105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4918,    -1,
-      -1,  1496,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1504,
-    2910,    -1,  2682,    -1,    -1,  2685,    -1,  2687,  3612,  3613,
-    1515,    -1,  2692,  3562,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2935,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2330,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2959,
-      -1,    -1,    -1,    -1,    -1,    -1,  2966,  1562,    -1,    -1,
-      -1,    -1,  3611,  2743,    -1,    -1,    -1,    -1,    -1,    -1,
-    1575,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2760,    -1,  1587,    -1,  3688,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1599,  3699,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2784,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3024,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3042,    -1,  2260,  3739,  3740,    -1,  1643,    -1,
-      -1,  1646,  3746,  3747,    -1,  3055,    -1,  3751,    -1,    -1,
-      -1,    -1,  3756,    -1,  2448,  3759,  3760,    -1,    -1,    -1,
-    3764,    -1,    -1,    -1,    -1,    -1,  3770,    -1,    -1,  2849,
-      -1,  2851,    -1,    -1,    -1,  2469,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2480,    -1,    -1,    -1,
-      -1,    -1,    -1,  3742,    -1,    -1,    -1,    -1,    -1,    -1,
-    3804,    -1,    -1,  3752,  2330,  3809,    -1,    -1,    -1,    -1,
-      -1,  3815,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3830,    -1,    -1,    -1,
-    2910,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3158,    -1,
-    3854,    -1,    -1,    -1,    -1,  2935,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3179,
-    1775,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2959,
-      -1,    -1,    -1,    -1,    -1,    -1,  2966,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3204,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2448,  3872,    -1,    -1,    -1,    -1,  3238,    -1,
-      -1,    -1,  3936,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2469,  3024,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3901,    -1,  2480,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3042,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3921,    -1,    -1,  3055,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2682,    -1,
-      -1,  2685,    -1,  2687,    -1,    -1,    -1,    -1,  2692,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4010,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3329,
-      -1,    -1,    -1,    -1,    -1,    -1,  3975,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2743,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2760,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3158,    -1,
-      -1,    -1,    -1,    -1,  1989,    -1,    -1,    -1,  1993,  1994,
-    2784,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3179,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3424,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3204,    -1,    -1,    -1,  4077,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4145,  4146,    -1,    -1,  4149,    -1,  1204,    -1,    -1,
-      -1,  2056,    -1,    -1,    -1,  2849,  2682,  2851,  3238,  2685,
-      -1,  2687,    -1,  2068,    -1,    -1,  2692,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4123,    -1,    -1,    -1,    -1,    -1,
-    4184,  4185,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1267,    -1,    -1,    -1,    -1,    -1,  2910,  2743,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2760,    -1,    -1,    -1,    -1,    -1,
-      -1,  2935,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3329,
-      -1,    -1,  3562,    -1,    -1,    -1,    -1,    -1,  2784,    -1,
-      -1,    -1,    -1,    -1,    -1,  2959,    -1,    -1,    -1,    -1,
-      -1,    -1,  2966,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4246,    -1,    -1,
-      -1,  3611,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2849,    -1,  2851,    -1,    -1,    -1,    -1,
-    3024,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3424,    -1,    -1,    -1,  3042,    -1,
-      -1,    -1,    -1,    -1,    -1,  2260,    -1,    -1,    -1,    -1,
-      -1,  3055,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2910,    -1,    -1,    -1,  4392,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2935,
-      -1,    -1,    -1,  4362,  4418,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2330,    -1,    -1,    -1,  4433,
-      -1,    -1,  3742,  2959,    -1,    -1,    -1,    -1,    -1,    -1,
-    2966,  4390,  3752,    -1,    -1,    -1,    -1,    -1,  4452,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3158,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4428,
-      -1,    -1,  3562,    -1,    -1,  3179,    -1,  4491,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3024,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3204,    -1,    -1,    -1,    -1,    -1,  3042,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3055,
-      -1,  3611,    -1,  4482,    -1,    -1,    -1,  4486,  4487,    -1,
-      -1,    -1,    -1,  2448,  3238,    -1,    -1,    -1,    -1,  4553,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3872,    -1,  2469,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2480,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3901,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1656,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3921,  4616,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4575,    -1,    -1,    -1,
-      -1,    -1,  3158,    -1,    -1,  3329,    -1,  4641,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3179,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3742,    -1,    -1,  3975,    -1,    -1,    -1,    -1,
-      -1,    -1,  3752,    -1,  1731,    -1,    -1,    -1,  3204,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1745,    -1,
-      -1,    -1,  1749,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1763,  1764,  1765,    -1,
-    1767,    -1,  3238,    -1,    -1,    -1,  4720,  4721,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4731,    -1,    -1,
-    3424,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1809,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4077,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2682,    -1,    -1,
-    2685,    -1,  2687,    -1,    -1,    -1,    -1,  2692,    -1,  1846,
-      -1,  4795,  3872,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3329,    -1,    -1,    -1,    -1,    -1,    -1,
-    4814,    -1,    -1,  4123,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3901,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2743,    -1,
-      -1,  3921,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2760,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3562,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2784,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4893,
-    4894,    -1,    -1,  1950,    -1,  3975,    -1,    -1,  3424,    -1,
-      -1,    -1,    -1,    -1,    -1,  1962,    -1,    -1,  1965,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3611,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4246,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2849,    -1,  2851,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4077,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2910,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2935,    -1,    -1,    -1,    -1,    -1,  3562,    -1,    -1,    -1,
-      -1,    -1,    -1,  4123,    -1,    -1,    -1,    -1,  3742,    -1,
-      -1,    -1,  4362,    -1,  2959,    -1,    -1,    -1,  3752,    -1,
-      -1,  2966,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4390,    -1,    -1,    -1,    -1,  3611,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4428,  3024,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3042,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3055,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4246,    -1,    -1,    -1,
-      -1,    -1,  4482,    -1,    -1,    -1,  4486,  4487,  3872,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3901,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3742,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3752,  3921,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3158,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4575,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3179,    -1,    -1,    -1,    -1,    -1,
-      -1,  3975,  4362,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3204,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4390,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3238,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3872,    -1,  4428,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3901,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4077,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3921,    -1,    -1,    -1,    -1,
-      -1,    -1,  4482,    -1,    -1,    -1,  4486,  4487,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3329,    -1,    -1,    -1,    -1,  4123,
-      -1,    -1,    -1,    -1,    -1,    -1,  2493,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3975,
-      -1,    -1,    -1,    -1,    -1,    -1,  2513,    -1,  2515,    -1,
-      -1,  2518,  2519,    -1,  2521,    -1,  2523,    -1,    -1,    -1,
-    2527,    -1,    -1,  2530,    -1,    -1,    -1,    -1,  2535,    -1,
-      -1,    -1,    -1,    -1,  2541,    -1,    -1,    -1,    -1,  2546,
-      -1,    -1,    -1,    -1,    -1,  4575,  2553,  2554,  2555,  2556,
-      -1,    -1,    -1,  2560,  2561,    -1,  2563,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2575,  3424,
-    2577,    -1,    -1,    -1,    -1,    -1,    -1,  2584,  2585,  2586,
-    2587,  2588,  2589,  2590,  2591,  2592,  2593,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4077,  4246,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2621,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4123,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3562,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4362,    -1,
-      -1,    -1,    -1,    -1,  2731,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4390,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3611,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4246,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4428,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4482,    -1,
-      -1,    -1,  4486,  4487,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4362,  3742,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3752,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4390,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4575,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4428,    -1,    -1,  2962,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4482,    -1,    -1,    -1,
-    4486,  4487,    -1,    -1,    -1,    -1,    -1,  3872,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3901,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3921,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3101,    -1,    -1,    -1,    -1,  4575,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3975,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3154,    -1,    -1,
-      -1,    -1,    -1,  3160,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3176,
-    3177,    -1,    -1,  3180,  3181,  3182,  3183,    -1,    -1,  3186,
-    3187,  3188,  3189,  3190,  3191,  3192,  3193,  3194,  3195,  3196,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3218,    -1,    -1,  3221,    -1,  3223,    -1,    -1,  3226,
-    3227,    -1,  4077,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3241,  3242,  3243,  3244,    -1,  3246,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4123,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3294,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3304,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3341,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4246,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4362,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3535,    -1,
-      -1,    -1,    -1,    -1,    -1,  4390,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4428,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4482,    -1,    -1,
-      -1,  4486,  4487,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3689,    -1,    -1,    -1,  3693,  3694,  3695,    -1,
-      -1,    -1,    -1,    -1,  3701,  3702,  3703,  3704,    -1,    -1,
-      -1,    -1,  3709,  3710,  3711,  3712,  3713,  3714,  3715,  3716,
-    3717,  3718,  3719,  3720,    -1,    -1,    -1,    -1,    -1,    -1,
-    4575,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3745,    -1,
-      -1,  3748,    -1,  3750,    -1,    -1,    -1,  3754,    -1,    -1,
-    3757,  3758,    -1,    -1,  3761,  3762,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3806,
-      -1,    -1,    -1,    -1,    -1,    -1,  3813,  3814,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3829,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4013,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4072,  4073,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4113,    -1,    -1,    -1,
-      -1,  4118,  4119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4133,    -1,  4135,    -1,
-      -1,    -1,  4139,  4140,  4141,    -1,    -1,  4144,    -1,    -1,
-    4147,  4148,    -1,    -1,    -1,  4152,    -1,    -1,    -1,  4156,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4211,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4267,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4312,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4388,  4389,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4404,  4405,  4406,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4440,  4441,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4587,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4603,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4653,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4692,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4749,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4798,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,     4,     5,     6,     7,     8,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    -1,    -1,  4866,
-      -1,    34,    -1,    -1,    37,    38,    -1,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    -1,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    -1,    65,    66,    67,    68,    69,    -1,    71,  4906,
-      73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
-      83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
-     113,   114,   115,   116,    -1,   118,   119,   120,   121,    -1,
-     123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
-     133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,    -1,   149,   150,   151,   152,
-      -1,   154,    -1,   156,   157,    -1,   159,   160,   161,   162,
-      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,    -1,   198,    -1,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,    -1,    -1,   212,
-     213,   214,   215,   216,    -1,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
-      -1,    -1,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
-     283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-      -1,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
-     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
-     353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
-     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
-      -1,    -1,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,    -1,   389,   390,   391,   392,
-     393,   394,   395,    -1,   397,   398,   399,   400,   401,   402,
-     403,   404,   405,   406,   407,   408,   409,   410,    -1,    -1,
-     413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,    -1,    -1,    -1,    -1,    -1,   441,   442,
-     443,    -1,    -1,    -1,    -1,    -1,    -1,   450,   451,     3,
-       4,     5,     6,     7,     8,     9,    10,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,    23,
-      24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,
-      34,    -1,    -1,    37,    38,    -1,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    50,    -1,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      -1,    65,    66,    67,    68,    69,    -1,    71,    -1,    73,
-      74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
-      84,    85,    86,    87,    -1,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,    -1,   110,    -1,   112,   113,
-     114,   115,   116,    -1,   118,   119,   120,    -1,    -1,   123,
-     124,   125,   126,   127,    -1,   129,   130,   131,    -1,   133,
-     134,   135,    -1,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,   147,    -1,   149,   150,   151,   152,    -1,
-     154,    -1,   156,   157,    -1,   159,   160,   161,   162,    -1,
-     164,   165,    -1,   167,   168,    -1,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,    -1,   181,   182,   183,
-     184,   185,   186,    -1,   188,   189,   190,   191,   192,   193,
-     194,   195,   196,    -1,   198,    -1,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,    -1,    -1,   212,   213,
-     214,   215,   216,    -1,   218,   219,   220,   221,   222,   223,
-     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
-     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,
-      -1,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,    -1,   279,   280,   281,   282,   283,
-     284,   285,   286,    -1,   288,   289,   290,   291,   292,   293,
-     294,   295,   296,   297,   298,   299,   300,    -1,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
-     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,   326,   327,   328,   329,   330,   331,   332,   333,
-     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
-     344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
-     354,   355,   356,   357,   358,    -1,   360,   361,   362,   363,
-     364,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
-      -1,   375,   376,   377,   378,   379,   380,   381,   382,   383,
-     384,   385,   386,   387,    -1,   389,   390,   391,   392,   393,
-     394,   395,    -1,   397,   398,   399,   400,   401,   402,   403,
-      -1,   405,   406,   407,   408,   409,   410,    -1,    -1,   413,
-      -1,   415,   416,   417,   418,   419,   420,   421,   422,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,    -1,   436,    -1,    -1,    -1,    -1,   441,   442,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   450,   451,     3,     4,
-       5,     6,     7,     8,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
-      25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,
-      -1,    -1,    37,    38,    -1,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    -1,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    -1,
-      65,    66,    67,    68,    69,    -1,    71,    -1,    73,    74,
-      75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
-      85,    86,    87,    -1,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
-     115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
-     125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
-     135,    -1,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,    -1,   149,   150,   151,   152,    -1,   154,
-      -1,   156,   157,    -1,   159,   160,   161,   162,    -1,   164,
-     165,    -1,   167,   168,    -1,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
-     185,   186,    -1,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,    -1,   198,    -1,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,    -1,    -1,   212,   213,   214,
-     215,   216,    -1,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,    -1,   279,   280,   281,   282,   283,   284,
-     285,   286,    -1,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,    -1,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,    -1,   360,   361,    -1,   363,   364,
-     365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,    -1,   389,   390,   391,   392,   393,   394,
-     395,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
-     405,   406,   407,   408,   409,   410,    -1,    -1,   413,    -1,
-      -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,    -1,    -1,    -1,    -1,    -1,   441,   442,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   450,   451,     3,     4,     5,
-       6,     7,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
-      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,    -1,
-      -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    -1,    65,
-      66,    67,    68,    69,    -1,    71,    -1,    73,    74,    75,
-      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
-      86,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,    -1,   110,    -1,   112,   113,   114,   115,
-     116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
-     126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
-      -1,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
-     156,   157,    -1,   159,   160,   161,   162,    -1,   164,   165,
-      -1,   167,   168,    -1,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
-     186,    -1,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,    -1,    -1,   212,   213,   214,   215,
-     216,    -1,   218,   219,   220,   221,   222,   223,   224,   225,
-     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
-     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
-     276,   277,    -1,   279,   280,   281,   282,   283,   284,   285,
-     286,    -1,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   300,    -1,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
-     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,    -1,   330,   331,   332,   333,   334,   335,
-     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
-      -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
-     356,   357,   358,    -1,   360,   361,    -1,   363,   364,   365,
-     366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
-     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,    -1,   389,   390,   391,   392,   393,   394,   395,
-      -1,   397,   398,   399,   400,   401,   402,   403,    -1,   405,
-     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
-     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-      -1,    -1,    -1,    -1,    -1,   441,   442,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   450,   451,     3,     4,     5,     6,
-       7,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      27,    28,    29,    -1,    -1,    -1,    -1,    34,    -1,    -1,
-      37,    38,    -1,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    -1,    65,    66,
-      67,    68,    69,    -1,    71,    -1,    73,    74,    75,    76,
-      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
-      87,    -1,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
-      -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
-     127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
-     157,    -1,   159,   160,   161,   162,    -1,   164,   165,    -1,
-     167,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
-      -1,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-      -1,   198,    -1,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,    -1,    -1,   212,   213,   214,   215,   216,
-      -1,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
-     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
-      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,    -1,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,    -1,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,    -1,
-     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,    -1,   360,   361,    -1,   363,   364,   365,   366,
-     367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,    -1,   389,   390,   391,   392,   393,   394,   395,    -1,
-     397,   398,   399,   400,   401,   402,   403,    -1,   405,   406,
-     407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,    -1,
-       3,    -1,    -1,    -1,   441,   442,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   450,   451,    18,    19,    20,    21,    22,
-      23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
-      -1,    -1,    35,    -1,    37,    38,    -1,    40,    41,    -1,
-      43,    44,    45,    46,    47,    -1,    49,    50,    -1,    52,
-      53,    54,    55,    56,    -1,    -1,    59,    60,    61,    62,
-      63,    -1,    65,    66,    67,    68,    69,    -1,    -1,    -1,
-      73,    74,    75,    76,    -1,    78,    79,    80,    -1,    82,
-      83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
-     113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
-     123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
-     133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
-      -1,   154,    -1,   156,    -1,    -1,   159,   160,   161,   162,
-      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
-     173,   174,    -1,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,    -1,   198,    -1,   200,    -1,    -1,
-     203,   204,   205,   206,   207,   208,   209,    -1,    -1,   212,
-     213,   214,   215,    -1,    -1,   218,   219,   220,    -1,    -1,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,    -1,   245,   246,    -1,   248,    -1,   250,   251,   252,
-     253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
-      -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,   272,
-     273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
-     283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-      -1,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
-     333,   334,    -1,   336,   337,   338,   339,   340,    -1,   342,
-     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
-     353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
-     363,    -1,   365,   366,   367,   368,   369,    -1,   371,   372,
-      -1,    -1,   375,   376,   377,   378,   379,    -1,   381,   382,
-     383,   384,   385,   386,   387,    -1,    -1,   390,   391,   392,
-     393,   394,    -1,    -1,   397,   398,   399,   400,   401,   402,
-     403,    -1,   405,    -1,   407,   408,   409,   410,    -1,    -1,
-     413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,    -1,    -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   451,    18,
-      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
-      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
-      -1,    40,    41,    42,    43,    44,    45,    -1,    47,    48,
-      49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
-      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
-      -1,    -1,    71,    -1,    73,    74,    75,    76,    77,    78,
-      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
-      89,    90,    91,    92,    -1,    -1,    -1,    96,    -1,    -1,
-      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
-     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
-     129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
-     139,   140,    -1,   142,   143,   144,    -1,    -1,   147,    -1,
-     149,   150,   151,   152,    -1,   154,    -1,   156,   157,    -1,
-     159,   160,   161,   162,    -1,   164,    -1,    -1,    -1,   168,
-      -1,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,    -1,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
-      -1,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,    -1,    -1,   212,    -1,   214,   215,   216,    -1,   218,
-     219,   220,    -1,    -1,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,    -1,    -1,   245,   246,   247,   248,
-      -1,    -1,   251,   252,   253,   254,   255,    -1,   257,    -1,
-      -1,   260,   261,   262,    -1,    -1,   265,   266,   267,   268,
-     269,    -1,   271,   272,   273,   274,   275,   276,   277,    -1,
-     279,   280,    -1,   282,    -1,   284,   285,   286,    -1,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,    -1,   314,   315,   316,   317,   318,
-     319,    -1,   321,   322,   323,   324,   325,   326,   327,   328,
-      -1,   330,   331,   332,   333,   334,    -1,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,    -1,   347,   348,
-     349,   350,   351,   352,   353,   354,   355,   356,   357,    -1,
-      -1,   360,   361,    -1,   363,   364,   365,   366,   367,   368,
-     369,    -1,   371,   372,    -1,    -1,   375,   376,    -1,   378,
-      -1,    -1,   381,   382,   383,   384,   385,   386,   387,    -1,
-      -1,   390,   391,   392,   393,   394,    -1,    -1,   397,   398,
-     399,   400,   401,    -1,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
-     419,   420,   421,     3,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   431,   432,   433,    -1,    -1,    -1,    18,    19,
-      20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
-      -1,    -1,   451,    -1,    -1,    -1,    -1,    37,    38,    -1,
-      40,    41,    42,    43,    44,    45,    -1,    47,    48,    49,
-      50,    -1,    52,    53,    54,    55,    56,    -1,    -1,    59,
-      60,    61,    62,    63,    -1,    65,    66,    67,    68,    -1,
-      -1,    71,    -1,    73,    74,    75,    76,    77,    78,    79,
-      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    89,
-      90,    91,    92,    -1,    -1,    -1,    96,    -1,    -1,    -1,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
-     110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
-     120,    -1,    -1,   123,   124,   125,   126,   127,    -1,   129,
-     130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
-     140,    -1,   142,   143,   144,    -1,    -1,   147,    -1,   149,
-     150,   151,   152,    -1,   154,    -1,   156,   157,    -1,   159,
-     160,   161,   162,    -1,   164,    -1,    -1,    -1,   168,    -1,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
-     190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-      -1,    -1,   212,    -1,   214,   215,   216,    -1,   218,   219,
-     220,    -1,    -1,   223,   224,   225,   226,   227,   228,   229,
-     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
-     240,   241,   242,    -1,    -1,   245,   246,   247,   248,    -1,
-      -1,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
-     260,   261,   262,    -1,    -1,   265,   266,   267,   268,   269,
-      -1,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
-     280,    -1,   282,    -1,   284,   285,   286,    -1,   288,   289,
-     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
-     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
-      -1,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
-     330,   331,   332,   333,   334,    -1,   336,   337,   338,   339,
-     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
-     350,   351,   352,   353,   354,   355,   356,   357,    -1,    -1,
-     360,   361,    -1,   363,   364,   365,   366,   367,   368,   369,
-      -1,   371,   372,    -1,    -1,   375,   376,    -1,   378,    -1,
-      -1,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
-     390,   391,   392,   393,   394,    -1,    -1,   397,   398,   399,
-     400,   401,    -1,   403,   404,   405,   406,   407,   408,   409,
-     410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
-     420,   421,     3,     4,     5,     6,     7,     8,     9,    10,
-      -1,   431,   432,   433,    -1,    -1,    -1,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
-      -1,   451,    -1,    34,    -1,    -1,    37,    38,    -1,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      -1,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    -1,    65,    66,    67,    68,    69,    -1,
-      71,    -1,    73,    74,    75,    76,    77,    78,    79,    80,
-      -1,    82,    83,    84,    85,    86,    87,    -1,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-      -1,   112,   113,   114,   115,   116,    -1,   118,   119,   120,
-      -1,    -1,   123,   124,   125,   126,   127,    -1,   129,   130,
-     131,    -1,   133,   134,   135,    -1,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,    -1,   149,   150,
-     151,   152,    -1,   154,    -1,   156,   157,    -1,   159,   160,
-     161,   162,    -1,   164,   165,    -1,   167,   168,    -1,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,    -1,
-     181,   182,   183,   184,   185,   186,    -1,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,    -1,   198,    -1,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,    -1,
-      -1,   212,   213,   214,   215,   216,    -1,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,    -1,   257,    -1,    -1,   260,
-     261,   262,    -1,    -1,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,    -1,   279,   280,
-     281,   282,   283,   284,   285,   286,    -1,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-      -1,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,    -1,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
-     351,   352,   353,   354,   355,   356,   357,   358,    -1,   360,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,    -1,
-     371,   372,    -1,    -1,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,    -1,   389,   390,
-     391,   392,   393,   394,   395,    -1,   397,   398,   399,   400,
-     401,   402,   403,    -1,   405,   406,   407,   408,   409,   410,
-      -1,    -1,   413,    -1,   415,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,    -1,    -1,    -1,    -1,
-     441,   442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,
-       3,     4,     5,     6,     7,     8,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,
-      23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
-      -1,    34,    -1,    -1,    37,    38,    -1,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    -1,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    -1,    65,    66,    67,    68,    69,    -1,    71,    -1,
-      73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
-      83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
-     113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
-     123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
-     133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,    -1,   149,   150,   151,   152,
-      -1,   154,    -1,   156,   157,    -1,   159,   160,   161,   162,
-      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,    -1,   198,    -1,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,    -1,    -1,   212,
-     213,   214,   215,   216,    -1,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
-      -1,    -1,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
-     283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-      -1,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
-     353,   354,   355,   356,   357,   358,    -1,   360,   361,   362,
-     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
-      -1,    -1,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,    -1,   389,   390,   391,   392,
-     393,   394,   395,    -1,   397,   398,   399,   400,   401,   402,
-     403,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
-     413,    -1,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,    -1,    -1,    -1,    -1,   441,   442,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,     3,     4,
-       5,     6,     7,     8,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
-      25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,
-      -1,    -1,    37,    38,    -1,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    -1,
-      65,    66,    67,    68,    69,    -1,    71,    -1,    73,    74,
-      75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
-      85,    86,    87,    -1,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
-     115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
-     125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
-     135,    -1,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,    -1,   149,   150,   151,   152,    -1,   154,
-      -1,   156,   157,   158,   159,   160,   161,   162,    -1,   164,
-     165,    -1,   167,   168,    -1,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
-     185,   186,    -1,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,    -1,   198,    -1,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,    -1,   211,   212,   213,   214,
-     215,   216,    -1,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,    -1,   279,   280,   281,   282,   283,   284,
-     285,   286,    -1,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,    -1,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,    -1,   360,   361,    -1,   363,   364,
-     365,   366,   367,   368,   369,    -1,   371,   372,    -1,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,    -1,   389,   390,   391,   392,   393,   394,
-     395,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
-     405,   406,   407,   408,   409,   410,    -1,    -1,   413,    -1,
-      -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,    -1,    -1,    -1,    -1,    -1,   441,   442,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   450,     3,     4,     5,     6,
-       7,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      27,    28,    29,    -1,    -1,    -1,    -1,    34,    -1,    -1,
-      37,    38,    -1,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    -1,    65,    66,
-      67,    68,    69,    -1,    71,    -1,    73,    74,    75,    76,
-      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
-      87,    -1,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
-      -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
-     127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
-     157,    -1,   159,   160,   161,   162,    -1,   164,   165,    -1,
-     167,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
-      -1,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-      -1,   198,    -1,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,    -1,    -1,   212,   213,   214,   215,   216,
-      -1,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
-     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
-      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,    -1,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,    -1,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,    -1,
-     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,    -1,   360,   361,    -1,   363,   364,   365,   366,
-     367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,    -1,   389,   390,   391,   392,   393,   394,   395,    -1,
-     397,   398,   399,   400,   401,   402,   403,    -1,   405,   406,
-     407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,    -1,
-      -1,    -1,    -1,    -1,   441,   442,    -1,    -1,    -1,    -1,
-      -1,   448,   449,   450,     3,     4,     5,     6,     7,     8,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,
-      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
-      29,    -1,    -1,    -1,    -1,    34,    -1,    -1,    37,    38,
-      -1,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    -1,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
-      69,    -1,    71,    -1,    73,    74,    75,    76,    77,    78,
-      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
-     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
-     129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,    -1,
-     149,   150,   151,   152,    -1,   154,    -1,   156,   157,    -1,
-     159,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
-      -1,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
-      -1,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,    -1,    -1,   212,   213,   214,   215,   216,    -1,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
-      -1,   260,   261,   262,    -1,    -1,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
-     279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,    -1,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-      -1,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,    -1,   347,   348,
-     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
-      -1,   360,   361,    -1,   363,   364,   365,   366,   367,   368,
-     369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,    -1,
-     389,   390,   391,   392,   393,   394,   395,    -1,   397,   398,
-     399,   400,   401,   402,   403,    -1,   405,   406,   407,   408,
-     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,    -1,    -1,    -1,
-      -1,    -1,   441,   442,   443,    -1,    -1,    -1,    -1,    -1,
-      -1,   450,     3,     4,     5,     6,     7,     8,     9,    10,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
-      -1,    -1,    -1,    34,    -1,    -1,    37,    38,    -1,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      -1,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    -1,    65,    66,    67,    68,    69,    -1,
-      71,    -1,    73,    74,    75,    76,    77,    78,    79,    80,
-      -1,    82,    83,    84,    85,    86,    87,    -1,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-      -1,   112,   113,   114,   115,   116,    -1,   118,   119,   120,
-      -1,    -1,   123,   124,   125,   126,   127,    -1,   129,   130,
-     131,    -1,   133,   134,   135,    -1,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,    -1,   149,   150,
-     151,   152,    -1,   154,    -1,   156,   157,    -1,   159,   160,
-     161,   162,    -1,   164,   165,    -1,   167,   168,    -1,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,    -1,
-     181,   182,   183,   184,   185,   186,    -1,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,    -1,   198,    -1,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,    -1,
-      -1,   212,   213,   214,   215,   216,    -1,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,    -1,   257,    -1,    -1,   260,
-     261,   262,    -1,    -1,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,    -1,   279,   280,
-     281,   282,   283,   284,   285,   286,    -1,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-      -1,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,    -1,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,    -1,   330,
-     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
-     351,   352,   353,   354,   355,   356,   357,   358,    -1,   360,
-     361,    -1,   363,   364,   365,   366,   367,   368,   369,    -1,
-     371,   372,    -1,    -1,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,    -1,   389,   390,
-     391,   392,   393,   394,   395,    -1,   397,   398,   399,   400,
-     401,   402,   403,    -1,   405,   406,   407,   408,   409,   410,
-      -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,    -1,    -1,    -1,    -1,    -1,
-     441,   442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,
-       3,     4,     5,     6,     7,     8,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    -1,    -1,    -1,
-      -1,    34,    -1,    -1,    37,    38,    -1,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    -1,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    -1,    65,    66,    67,    68,    69,    -1,    71,    -1,
-      73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
-      83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
-     113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
-     123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
-     133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,    -1,   149,   150,   151,   152,
-      -1,   154,    -1,   156,   157,    -1,   159,   160,   161,   162,
-      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,    -1,   198,    -1,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,    -1,    -1,   212,
-     213,   214,   215,   216,    -1,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
-      -1,    -1,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
-     283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-      -1,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
-     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
-     353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
-     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
-      -1,    -1,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,    -1,   389,   390,   391,   392,
-     393,   394,   395,    -1,   397,   398,   399,   400,   401,   402,
-     403,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
-     413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,    -1,    -1,    -1,    -1,    -1,   441,   442,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,     3,     4,
-       5,     6,     7,     8,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
-      25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,
-      -1,    -1,    37,    38,    -1,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    -1,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    -1,
-      65,    66,    67,    68,    69,    -1,    71,    -1,    73,    74,
-      75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
-      85,    86,    87,    -1,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
-     115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
-     125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
-     135,    -1,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,    -1,   149,   150,   151,   152,    -1,   154,
-      -1,   156,   157,   158,   159,   160,   161,   162,    -1,   164,
-     165,    -1,   167,   168,    -1,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
-     185,   186,    -1,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,    -1,   198,    -1,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,    -1,    -1,   212,   213,   214,
-     215,   216,    -1,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,    -1,   279,   280,   281,   282,   283,   284,
-     285,   286,    -1,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,    -1,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,    -1,   360,   361,    -1,   363,   364,
-     365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,    -1,   389,   390,   391,   392,   393,   394,
-     395,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
-     405,   406,   407,   408,   409,   410,    -1,    -1,   413,    -1,
-      -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,    -1,    -1,    -1,    -1,    -1,   441,   442,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   450,     3,     4,     5,     6,
-       7,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      27,    28,    29,    -1,    -1,    -1,    -1,    34,    -1,    -1,
-      37,    38,    -1,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    -1,    65,    66,
-      67,    68,    69,    -1,    71,    -1,    73,    74,    75,    76,
-      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
-      87,    -1,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
-      -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
-     127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
-     157,    -1,   159,   160,   161,   162,    -1,   164,   165,    -1,
-     167,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
-      -1,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-      -1,   198,    -1,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,    -1,    -1,   212,   213,   214,   215,   216,
-      -1,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
-     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
-      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,    -1,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,    -1,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,    -1,
-     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,    -1,   360,   361,    -1,   363,   364,   365,   366,
-     367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,    -1,   389,   390,   391,   392,   393,   394,   395,    -1,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,    -1,
-      -1,    -1,    -1,    -1,   441,   442,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   450,     3,     4,     5,     6,     7,     8,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,
-      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
-      29,    -1,    -1,    -1,    -1,    34,    -1,    -1,    37,    38,
-      -1,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    -1,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
-      69,    -1,    71,    -1,    73,    74,    75,    76,    77,    78,
-      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
-     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
-     129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,    -1,
-     149,   150,   151,   152,    -1,   154,    -1,   156,   157,    -1,
-     159,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
-      -1,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
-      -1,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,    -1,    -1,   212,   213,   214,   215,   216,    -1,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
-      -1,   260,   261,   262,    -1,    -1,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
-     279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,    -1,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-      -1,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,    -1,   347,   348,
-     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
-      -1,   360,   361,    -1,   363,   364,   365,   366,   367,   368,
-     369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,    -1,
-     389,   390,   391,   392,   393,   394,   395,    -1,   397,   398,
-     399,   400,   401,   402,   403,    -1,   405,   406,   407,   408,
-     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,    -1,    -1,    -1,
-      -1,    -1,   441,   442,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   450,     3,     4,     5,     6,     7,     8,     9,    10,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
-      -1,    -1,    -1,    34,    -1,    -1,    37,    38,    -1,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      -1,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    -1,    65,    66,    67,    68,    69,    -1,
-      71,    -1,    73,    74,    75,    76,    77,    78,    79,    80,
-      -1,    82,    83,    84,    85,    86,    87,    -1,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,    -1,   110,
-      -1,   112,   113,   114,   115,   116,    -1,   118,   119,   120,
-      -1,    -1,   123,   124,   125,   126,   127,    -1,   129,   130,
-     131,    -1,   133,   134,   135,    -1,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,    -1,   149,   150,
-     151,   152,    -1,   154,    -1,   156,   157,    -1,   159,   160,
-     161,   162,    -1,   164,   165,    -1,   167,   168,    -1,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,    -1,
-     181,   182,   183,   184,   185,   186,    -1,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,    -1,   198,    -1,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,    -1,
-      -1,   212,   213,   214,   215,   216,    -1,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,    -1,   257,    -1,    -1,   260,
-     261,   262,    -1,    -1,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,    -1,   279,   280,
-     281,   282,   283,   284,   285,   286,    -1,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-      -1,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,    -1,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,    -1,   330,
-     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
-     351,   352,   353,   354,   355,   356,   357,   358,    -1,   360,
-     361,    -1,   363,   364,   365,   366,   367,   368,   369,    -1,
-     371,   372,    -1,    -1,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,    -1,   389,   390,
-     391,   392,   393,   394,   395,    -1,   397,   398,   399,   400,
-     401,   402,   403,    -1,   405,   406,   407,   408,   409,   410,
-      -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,    -1,    -1,    -1,    -1,    -1,
-     441,   442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,
-       3,     4,     5,     6,     7,     8,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,
-      23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
-      -1,    34,    -1,    -1,    37,    38,    -1,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    -1,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    -1,    65,    66,    67,    68,    69,    -1,    71,    -1,
-      73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
-      83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
-     113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
-     123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
-     133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,    -1,   149,   150,   151,   152,
-      -1,   154,    -1,   156,   157,    -1,   159,   160,   161,   162,
-      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,    -1,   198,    -1,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,    -1,    -1,   212,
-     213,   214,   215,   216,    -1,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
-      -1,    -1,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
-     283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-      -1,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
-     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
-     353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
-     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
-      -1,    -1,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,    -1,   389,   390,   391,   392,
-     393,   394,   395,    -1,   397,   398,   399,   400,   401,   402,
-     403,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
-     413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,    -1,    -1,    -1,    -1,    -1,   441,   442,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,     3,     4,
-       5,     6,     7,     8,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
-      25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,
-      -1,    -1,    37,    38,    -1,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    -1,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    -1,
-      65,    66,    67,    68,    69,    -1,    71,    -1,    73,    74,
-      75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
-      85,    86,    87,    -1,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
-     115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
-     125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
-     135,    -1,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,    -1,   149,   150,   151,   152,    -1,   154,
-      -1,   156,   157,    -1,   159,   160,   161,   162,    -1,   164,
-     165,    -1,   167,   168,    -1,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
-     185,   186,    -1,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,    -1,   198,    -1,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,    -1,    -1,   212,   213,   214,
-     215,   216,    -1,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,    -1,   279,   280,   281,   282,   283,   284,
-     285,   286,    -1,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,    -1,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,    -1,   360,   361,    -1,   363,   364,
-     365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,    -1,   389,   390,   391,   392,   393,   394,
-     395,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
-     405,   406,   407,   408,   409,   410,    -1,    -1,   413,    -1,
-      -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,    -1,    -1,    -1,    -1,    -1,   441,   442,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   450,     3,     4,     5,     6,
-       7,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      27,    28,    29,    -1,    -1,    -1,    -1,    34,    -1,    -1,
-      37,    38,    -1,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    -1,    65,    66,
-      67,    68,    69,    -1,    71,    -1,    73,    74,    75,    76,
-      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
-      87,    -1,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
-      -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
-     127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
-     157,    -1,   159,   160,   161,   162,    -1,   164,   165,    -1,
-     167,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
-      -1,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-      -1,   198,    -1,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,    -1,    -1,   212,   213,   214,   215,   216,
-      -1,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
-     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
-      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,    -1,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,    -1,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,    -1,
-     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,    -1,   360,   361,    -1,   363,   364,   365,   366,
-     367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,    -1,   389,   390,   391,   392,   393,   394,   395,    -1,
-     397,   398,   399,   400,   401,   402,   403,    -1,   405,   406,
-     407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
+     521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
+     531,   532,   533,   534,   535,   536,   219,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
+     229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
+     232,   233,     0,   234,   235,     0,   236,   237,   238,   239,
+     240,     0,   241,   242,     0,   243,   244,   245,   246,   247,
+       0,     0,   248,   249,   250,   251,   252,     0,   253,   254,
+     255,   256,   257,     0,     0,     0,   258,   259,   260,   261,
+       0,   262,   263,   264,     0,   265,   266,   267,   268,   269,
+     270,     0,     0,   271,   272,   273,     0,     0,     0,     0,
+       0,     0,     0,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,     0,   283,     0,   284,   285,   286,   287,   288,
+       0,   289,   290,   291,     0,     0,   292,   293,   294,   295,
+     296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,     0,
+     312,     0,   313,   314,   315,   316,     0,   317,     0,   318,
+       0,     0,     0,   319,   320,   321,     0,   322,   323,     0,
+     324,   325,     0,   326,   327,   328,   329,  2333,     0,   331,
+     332,   333,   334,     0,   335,   336,   337,   338,   339,   340,
+       0,   341,     0,   342,   343,   344,   345,   346,   347,   348,
+       0,   349,     0,   350,     0,     0,   351,     0,   352,   353,
+     354,   355,   356,     0,     0,   357,   358,     0,   359,     0,
+       0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+     377,   378,     0,   379,   380,   381,   382,     0,   383,   384,
+       0,   385,     0,   386,   387,   388,   389,   390,   391,     0,
+     392,     0,     0,   393,   394,   395,     0,     0,   396,   397,
+       0,   398,     0,   399,   400,   401,   402,   403,   404,   405,
+     406,     0,   407,   408,   409,   410,   411,   412,   413,   414,
+       0,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,   436,   437,   438,     0,   439,   440,     0,
+     441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
+     451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
+     459,   460,   461,   462,     0,   463,   464,   465,   466,     0,
+     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
+     477,   478,     0,   479,   480,     0,   481,     0,   482,   483,
+     484,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,   496,   497,   498,   499,
+     500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
+     506,   507,   508,   509,   510,   511,   512,     0,   513,     0,
+     514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
+     520,   521,   522,   523,   524,   525,   526,   527,   528,   529,
+     530,   531,   532,   533,   534,   535,   536,   219,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   220,   221,   222,   223,   224,   225,   226,   227,
+       0,   229,   230,   231,     0,     0,     0,     0,     0,     0,
+       0,   232,   233,     0,   234,   235,     0,   236,   237,   238,
+     239,   240,     0,   241,   242,     0,   243,   244,   245,   246,
+     247,     0,     0,   248,   249,   250,   251,   252,     0,   253,
+     254,   255,   256,   257,     0,     0,     0,   258,   259,   260,
+     261,     0,   262,   263,   264,     0,   265,   266,   267,   268,
+     269,   270,     0,     0,   271,   272,   273,     0,     0,     0,
+       0,     0,     0,     0,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,     0,   283,     0,   284,   285,   286,   287,
+     288,     0,   289,   290,   291,     0,     0,   292,   293,   294,
+     295,   296,     0,   297,   298,   299,     0,   300,   301,   302,
+       0,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+       0,   312,     0,   313,   314,   315,   316,     0,   317,     0,
+     318,     0,     0,     0,   319,   320,   321,     0,   322,   323,
+       0,   324,   325,     0,   326,   327,   328,   329,  2373,     0,
+     331,   332,   333,   334,     0,   335,   336,   337,   338,   339,
+     340,     0,   341,     0,   342,   343,   344,   345,   346,   347,
+     348,     0,   349,     0,   350,     0,     0,   351,     0,   352,
+     353,   354,   355,   356,     0,     0,   357,   358,     0,   359,
+       0,     0,   360,   361,   362,     0,     0,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,     0,   379,   380,   381,   382,     0,   383,
+     384,     0,   385,     0,   386,   387,   388,   389,   390,   391,
+       0,   392,     0,     0,   393,   394,   395,     0,     0,   396,
+     397,     0,   398,     0,   399,   400,   401,   402,   403,   404,
+     405,   406,     0,   407,   408,   409,   410,   411,   412,   413,
+     414,     0,   415,   416,   417,   418,   419,   420,   421,   422,
+     423,   424,   425,   426,   427,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,     0,   439,   440,
+       0,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,     0,   453,   454,   455,   456,   457,     0,
+     458,   459,   460,   461,   462,     0,   463,   464,   465,   466,
+       0,   467,   468,   469,   470,   471,   472,   473,   474,   475,
+     476,   477,   478,     0,   479,   480,     0,   481,     0,   482,
+     483,   484,   485,   486,     0,   487,   488,     0,     0,   489,
+     490,   491,   492,   493,     0,   494,   495,   496,   497,   498,
+     499,   500,     0,     0,   501,   502,   503,   504,   505,     0,
+       0,   506,   507,   508,   509,   510,   511,   512,     0,   513,
+       0,   514,   515,   516,   517,     0,     0,   518,     0,     0,
+     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
+     529,   530,   531,   532,   533,   534,   535,   536,   219,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
+     227,     0,   229,   230,   231,     0,     0,     0,     0,     0,
+       0,     0,   232,   233,     0,   234,   235,     0,   236,   237,
+     238,   239,   240,     0,   241,   242,     0,   243,   244,   245,
+     246,   247,     0,     0,   248,   249,   250,   251,   252,     0,
+     253,   254,   255,   256,   257,     0,     0,     0,   258,   259,
+     260,   261,     0,   262,   263,   264,     0,   265,   266,   267,
+     268,   269,   270,     0,     0,   271,   272,   273,     0,     0,
+       0,     0,     0,     0,     0,   274,   275,   276,   277,   278,
+     279,   280,   281,   282,     0,   283,     0,   284,   285,   286,
+     287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
+     294,   295,   296,     0,   297,   298,   299,     0,   300,   301,
+     302,     0,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,     0,   312,     0,   313,   314,   315,   316,     0,   317,
+       0,   318,     0,     0,     0,   319,   320,   321,     0,   322,
+     323,     0,   324,   325,     0,   326,   327,   328,   329,  2408,
+       0,   331,   332,   333,   334,     0,   335,   336,   337,   338,
+     339,   340,     0,   341,     0,   342,   343,   344,   345,   346,
+     347,   348,     0,   349,     0,   350,     0,     0,   351,     0,
+     352,   353,   354,   355,   356,     0,     0,   357,   358,     0,
+     359,     0,     0,   360,   361,   362,     0,     0,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,     0,   379,   380,   381,   382,     0,
+     383,   384,     0,   385,     0,   386,   387,   388,   389,   390,
+     391,     0,   392,     0,     0,   393,   394,   395,     0,     0,
+     396,   397,     0,   398,     0,   399,   400,   401,   402,   403,
+     404,   405,   406,     0,   407,   408,   409,   410,   411,   412,
+     413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
+     440,     0,   441,   442,   443,   444,   445,   446,   447,   448,
+     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
+       0,   458,   459,   460,   461,   462,     0,   463,   464,   465,
+     466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
+     475,   476,   477,   478,     0,   479,   480,     0,   481,     0,
+     482,   483,   484,   485,   486,     0,   487,   488,     0,     0,
+     489,   490,   491,   492,   493,     0,   494,   495,   496,   497,
+     498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
+       0,     0,   506,   507,   508,   509,   510,   511,   512,     0,
+     513,     0,   514,   515,   516,   517,     0,     0,   518,     0,
+       0,   519,   520,   521,   522,   523,   524,   525,   526,   527,
+     528,   529,   530,   531,   532,   533,   534,   535,   536,   219,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   220,   221,   222,   223,   224,   225,
+     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
+       0,     0,     0,   232,   233,     0,   234,   235,     0,   236,
+     237,   238,   239,   240,     0,   241,   242,     0,   243,   244,
+     245,   246,   247,     0,     0,   248,   249,   250,   251,   252,
+       0,   253,   254,   255,   256,   257,     0,     0,     0,   258,
+     259,   260,   261,     0,   262,   263,   264,     0,   265,   266,
+     267,   268,   269,   270,     0,     0,   271,   272,   273,     0,
+       0,     0,     0,     0,     0,     0,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,     0,   283,     0,   284,   285,
+     286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
+     293,   294,   295,   296,     0,   297,   298,   299,     0,   300,
+     301,   302,     0,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,     0,   312,     0,   313,   314,   315,   316,     0,
+     317,     0,   318,     0,     0,     0,   319,   320,   321,     0,
+     322,   323,     0,   324,   325,     0,   326,   327,   328,   329,
+    2731,     0,   331,   332,   333,   334,     0,   335,   336,   337,
+     338,   339,   340,     0,   341,     0,   342,   343,   344,   345,
+     346,   347,   348,     0,   349,     0,   350,     0,     0,   351,
+       0,   352,   353,   354,   355,   356,     0,     0,   357,   358,
+       0,   359,     0,     0,   360,   361,   362,     0,     0,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,   378,     0,   379,   380,   381,   382,
+       0,   383,   384,     0,   385,     0,   386,   387,   388,   389,
+     390,   391,     0,   392,     0,     0,   393,   394,   395,     0,
+       0,   396,   397,     0,   398,     0,   399,   400,   401,   402,
+     403,   404,   405,   406,     0,   407,   408,   409,   410,   411,
+     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
+     421,   422,   423,   424,   425,   426,   427,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
+     439,   440,     0,   441,   442,   443,   444,   445,   446,   447,
+     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
+     457,     0,   458,   459,   460,   461,   462,     0,   463,   464,
+     465,   466,     0,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,   478,     0,   479,   480,     0,   481,
+       0,   482,   483,   484,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,   496,
+     497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
+     505,     0,     0,   506,   507,   508,   509,   510,   511,   512,
+       0,   513,     0,   514,   515,   516,   517,     0,     0,   518,
+       0,     0,   519,   520,   521,   522,   523,   524,   525,   526,
+     527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
+     219,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   220,   221,   222,   223,   224,
+     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
+       0,     0,     0,     0,   232,   233,     0,   234,   235,     0,
+     236,   237,   238,   239,   240,     0,   241,   242,     0,   243,
+     244,   245,   246,   247,     0,     0,   715,   249,   250,   251,
+     252,     0,   253,   254,   255,   256,   257,     0,     0,     0,
+     258,   259,   260,   261,     0,   262,   263,   264,     0,   265,
+     266,   267,   268,   269,   270,     0,     0,   271,   272,   273,
+       0,     0,     0,     0,     0,     0,     0,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,     0,   283,     0,   284,
+     285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
+     292,   293,   294,   295,   296,     0,   297,   298,   299,     0,
+     300,   301,   302,     0,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,     0,   312,     0,   313,   314,   315,   316,
+       0,   317,     0,   318,     0,     0,     0,   319,   320,   321,
+       0,   322,   323,     0,   324,   325,     0,   326,   327,   328,
+     329,   330,     0,   331,   332,   333,   334,     0,   335,   336,
+     337,   338,   339,   340,     0,   341,     0,   342,   343,   344,
+     345,   346,   347,   348,     0,   349,     0,   350,     0,     0,
+     351,     0,   352,   353,   354,   355,   356,     0,     0,   357,
+     358,     0,   359,     0,     0,   360,   361,   362,     0,     0,
+     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,   718,   378,     0,   379,   380,   381,
+     382,     0,   383,   384,     0,   385,     0,   386,   387,   388,
+     389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
+       0,     0,   396,   397,     0,   398,     0,   399,   400,   401,
+     402,   403,   404,   405,   406,     0,   407,   408,   409,   410,
+     411,   412,   413,   414,     0,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
+       0,   439,   440,     0,   719,   442,   443,   444,   445,   446,
+     447,   720,   449,   450,   451,   452,     0,   453,   454,   455,
+     456,  2089,     0,   458,   459,   460,   461,   462,     0,   463,
+     464,   465,   466,     0,   467,   468,   469,   470,   471,   472,
+     473,   474,   475,   476,   477,   478,     0,   479,   480,     0,
+     481,     0,   482,   483,   484,   485,   486,     0,   722,   488,
+       0,     0,  2090,   490,   491,   492,   493,     0,   494,   495,
+     496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
+     504,   505,     0,     0,   506,   507,   508,   509,   510,   511,
+     512,     0,   513,     0,   514,   515,   516,   517,     0,     0,
+     518,     0,     0,   519,   520,   521,   522,   523,   724,   525,
+     526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
+     536,   219,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   220,   221,   222,   223,
+     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
+       0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
+       0,   236,   237,   238,   239,   240,     0,   241,   242,     0,
+     243,   244,   245,   246,   247,     0,     0,   248,   249,   250,
+     251,   252,     0,   253,   254,   255,   256,   257,     0,     0,
+       0,   258,   259,   260,   261,     0,   262,   263,   264,     0,
+     265,   266,   267,   268,   269,   270,     0,     0,   271,   272,
+     273,     0,     0,     0,     0,     0,     0,     0,   274,   275,
+     276,   277,   278,   279,   280,   281,   282,     0,   283,     0,
+     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
+       0,   292,   293,   294,   295,   296,     0,   297,   298,   299,
+       0,   300,   301,   302,     0,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,     0,   312,     0,   313,   314,   315,
+     316,     0,   317,     0,   318,     0,     0,     0,   319,   320,
+     321,     0,   322,   323,     0,   324,   325,     0,   326,   327,
+     328,   329,  2806,     0,   331,   332,   333,   334,     0,   335,
+     336,   337,   338,   339,   340,     0,   341,     0,   342,   343,
+     344,   345,   346,   347,   348,     0,   349,     0,   350,     0,
+       0,   351,     0,   352,   353,   354,   355,   356,     0,     0,
+     357,   358,     0,   359,     0,     0,   360,   361,   362,     0,
+       0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,     0,   379,   380,
+     381,   382,     0,   383,   384,     0,   385,     0,   386,   387,
+     388,   389,   390,   391,     0,   392,     0,     0,   393,   394,
+     395,     0,     0,   396,   397,     0,   398,     0,   399,   400,
+     401,   402,   403,   404,   405,   406,     0,   407,   408,   409,
+     410,   411,   412,   413,   414,     0,   415,   416,   417,   418,
+     419,   420,   421,   422,   423,   424,   425,   426,   427,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,     0,   439,   440,     0,   441,   442,   443,   444,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,     0,   458,   459,   460,   461,   462,     0,
+     463,   464,   465,   466,     0,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,   478,     0,   479,   480,
+       0,   481,     0,   482,   483,   484,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
+     503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
+     511,   512,     0,   513,     0,   514,   515,   516,   517,     0,
+       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
+     525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
+     535,   536,   219,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   220,   221,   222,
+     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
+       0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
+     235,     0,   236,   237,   238,   239,   240,     0,   241,   242,
+       0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
+     250,   251,   252,     0,   253,   254,   255,   256,   257,     0,
+       0,     0,   258,   259,   260,   261,     0,   262,   263,   264,
+       0,   265,   266,   267,   268,   269,   270,     0,     0,   271,
+     272,   273,     0,     0,     0,     0,     0,     0,     0,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,     0,   283,
+       0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
+       0,     0,   292,   293,   294,   295,   296,     0,   297,   298,
+     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,     0,   312,     0,   313,   314,
+     315,   316,     0,   317,     0,   318,     0,     0,     0,   319,
+     320,   321,     0,   322,   323,     0,   324,   325,     0,   326,
+     327,   328,   329,  2808,     0,   331,   332,   333,   334,     0,
+     335,   336,   337,   338,   339,   340,     0,   341,     0,   342,
+     343,   344,   345,   346,   347,   348,     0,   349,     0,   350,
+       0,     0,   351,     0,   352,   353,   354,   355,   356,     0,
+       0,   357,   358,     0,   359,     0,     0,   360,   361,   362,
+       0,     0,   363,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,   377,   378,     0,   379,
+     380,   381,   382,     0,   383,   384,     0,   385,     0,   386,
+     387,   388,   389,   390,   391,     0,   392,     0,     0,   393,
+     394,   395,     0,     0,   396,   397,     0,   398,     0,   399,
+     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
+     409,   410,   411,   412,   413,   414,     0,   415,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
+     437,   438,     0,   439,   440,     0,   441,   442,   443,   444,
+     445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
+     454,   455,   456,   457,     0,   458,   459,   460,   461,   462,
+       0,   463,   464,   465,   466,     0,   467,   468,   469,   470,
+     471,   472,   473,   474,   475,   476,   477,   478,     0,   479,
+     480,     0,   481,     0,   482,   483,   484,   485,   486,     0,
+     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
+     494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
+     502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
+     510,   511,   512,     0,   513,     0,   514,   515,   516,   517,
+       0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
+     524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
+     534,   535,   536,   219,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   220,   221,
+     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
+       0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
+     234,   235,     0,   236,   237,   238,   239,   240,     0,   241,
+     242,     0,   243,   244,   245,   246,   247,     0,     0,   248,
+     249,   250,   251,   252,     0,   253,   254,   255,   256,   257,
+       0,     0,     0,   258,   259,   260,   261,     0,   262,   263,
+     264,     0,   265,   266,   267,   268,   269,   270,     0,     0,
+     271,   272,   273,     0,     0,     0,     0,     0,     0,     0,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,     0,
+     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
+     291,     0,     0,   292,   293,   294,   295,   296,     0,   297,
+     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,     0,   312,     0,   313,
+     314,   315,   316,     0,   317,     0,   318,     0,     0,     0,
+     319,   320,   321,     0,   322,   323,     0,   324,   325,     0,
+     326,   327,   328,   329,  2920,     0,   331,   332,   333,   334,
+       0,   335,   336,   337,   338,   339,   340,     0,   341,     0,
+     342,   343,   344,   345,   346,   347,   348,     0,   349,     0,
+     350,     0,     0,   351,     0,   352,   353,   354,   355,   356,
+       0,     0,   357,   358,     0,   359,     0,     0,   360,   361,
+     362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,     0,
+     379,   380,   381,   382,     0,   383,   384,     0,   385,     0,
+     386,   387,   388,   389,   390,   391,     0,   392,     0,     0,
+     393,   394,   395,     0,     0,   396,   397,     0,   398,     0,
+     399,   400,   401,   402,   403,   404,   405,   406,     0,   407,
+     408,   409,   410,   411,   412,   413,   414,     0,   415,   416,
      417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,    -1,
-      -1,    -1,    -1,    -1,   441,   442,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   450,     3,     4,     5,     6,     7,     8,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,
-      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
-      29,    -1,    -1,    -1,    -1,    34,    -1,    -1,    37,    38,
-      -1,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    -1,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
-      69,    -1,    71,    -1,    73,    74,    75,    76,    77,    78,
-      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
-     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
-     129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,    -1,
-     149,   150,   151,   152,    -1,   154,    -1,   156,   157,    -1,
-     159,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
-      -1,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
-      -1,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,    -1,    -1,   212,   213,   214,   215,   216,    -1,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
-      -1,   260,   261,   262,    -1,    -1,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
-     279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,    -1,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-      -1,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,    -1,   347,   348,
-     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
-      -1,   360,   361,    -1,   363,   364,   365,   366,   367,   368,
-     369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,    -1,
-     389,   390,   391,   392,   393,   394,   395,    -1,   397,   398,
-     399,   400,   401,   402,   403,    -1,   405,   406,   407,   408,
-     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,    -1,    -1,    -1,
-      -1,    -1,   441,   442,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   450,     3,     4,     5,     6,     7,     8,     9,    10,
+     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,     0,   439,   440,     0,   441,   442,   443,
+     444,   445,   446,   447,   448,   449,   450,   451,   452,     0,
+     453,   454,   455,   456,   457,     0,   458,   459,   460,   461,
+     462,     0,   463,   464,   465,   466,     0,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,   478,     0,
+     479,   480,     0,   481,     0,   482,   483,   484,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
+     501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
+     509,   510,   511,   512,     0,   513,     0,   514,   515,   516,
+     517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
+     523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
+     533,   534,   535,   536,   219,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   220,
+     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
+     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
+       0,   234,   235,     0,   236,   237,   238,   239,   240,     0,
+     241,   242,     0,   243,   244,   245,   246,   247,     0,     0,
+     248,   249,   250,   251,   252,     0,   253,   254,   255,   256,
+     257,     0,     0,     0,   258,   259,   260,   261,     0,   262,
+     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
+       0,   271,   272,   273,     0,     0,     0,     0,     0,     0,
+       0,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
+     290,   291,     0,     0,   292,  2942,   294,   295,   296,     0,
+     297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
+     313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
+       0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
+       0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
+     334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
+       0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
+       0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
+     356,     0,     0,   357,   358,     0,   359,     0,     0,   360,
+     361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
+       0,   379,   380,   381,   382,     0,   383,   384,     0,   385,
+       0,   386,   387,   388,   389,   390,   391,     0,   392,     0,
+       0,   393,   394,   395,     0,     0,   396,   397,     0,   398,
+       0,   399,   400,   401,   402,   403,   404,   405,   406,     0,
+     407,   408,   409,   410,   411,   412,   413,   414,     0,   415,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,     0,   439,   440,     0,   441,   442,
+     443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
+       0,   453,   454,   455,   456,   457,     0,   458,   459,   460,
+     461,   462,     0,   463,   464,   465,   466,     0,   467,   468,
+     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
+       0,   479,   480,     0,   481,     0,   482,   483,   484,   485,
+     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
+       0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
+     508,   509,   510,   511,   512,     0,   513,     0,   514,   515,
+     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
+     522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
+     532,   533,   534,   535,   536,   219,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
+     230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
+     233,     0,   234,   235,     0,   236,   237,   238,   239,   240,
+       0,   241,   242,     0,   243,   244,   245,   246,   247,     0,
+       0,   248,   249,   250,   251,   252,     0,   253,   254,   255,
+     256,   257,     0,     0,     0,   258,   259,   260,   261,     0,
+     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
+       0,     0,   271,   272,   273,     0,     0,     0,     0,     0,
+       0,     0,   274,   275,   276,   277,   278,   279,   280,   281,
+     282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
+     289,   290,   291,     0,     0,   292,   293,   294,   295,   296,
+       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,     0,   312,
+       0,   313,   314,   315,   316,     0,   317,     0,   318,     0,
+       0,     0,   319,   320,   321,     0,   322,   323,     0,   324,
+     325,     0,   326,   327,   328,   329,  4045,     0,   331,   332,
+     333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
+     341,     0,   342,   343,   344,   345,   346,   347,   348,     0,
+     349,     0,   350,     0,     0,   351,     0,   352,   353,   354,
+     355,   356,     0,     0,   357,   358,     0,   359,     0,     0,
+     360,   361,   362,     0,     0,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,     0,   379,   380,   381,   382,     0,   383,   384,     0,
+     385,     0,   386,   387,   388,   389,   390,   391,     0,   392,
+       0,     0,   393,   394,   395,     0,     0,   396,   397,     0,
+     398,     0,   399,   400,   401,   402,   403,   404,   405,   406,
+       0,   407,   408,   409,   410,   411,   412,   413,   414,     0,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,     0,   439,   440,     0,   441,
+     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
+     452,     0,   453,   454,   455,   456,   457,     0,   458,   459,
+     460,   461,   462,     0,   463,   464,   465,   466,     0,   467,
+     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
+     478,     0,   479,   480,     0,   481,     0,   482,   483,   484,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,   496,   497,   498,   499,   500,
+       0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
+     507,   508,   509,   510,   511,   512,     0,   513,     0,   514,
+     515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
+     521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
+     531,   532,   533,   534,   535,   536,   978,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   220,   221,   222,   223,   224,   225,   226,   227,     0,
+     229,   230,   231,     0,     0,     0,     0,     0,     0,     0,
+     232,   233,     0,   234,   235,   772,   236,   237,   238,     0,
+     979,   773,   980,   981,     0,   243,   244,   245,   246,   247,
+       0,     0,   248,   249,   982,   983,   252,     0,   253,   254,
+     255,   256,     0,     0,   774,     0,   258,   259,   260,   261,
+     775,   262,   263,   264,     0,   265,   266,   267,   268,   269,
+     270,     0,   776,   271,   272,   273,     0,     0,     0,   777,
+       0,     0,     0,   274,   275,   276,   277,   278,   279,   984,
+     985,   282,     0,   283,     0,   284,   285,   286,   287,   288,
+       0,   289,   290,   291,     0,     0,   292,   293,   986,   295,
+     296,     0,   297,   298,   299,     0,   300,   301,   302,     0,
+     303,   304,   305,   306,     0,   308,   309,   310,     0,     0,
+     312,     0,   313,   314,   987,   316,     0,   317,     0,   318,
+     778,     0,   779,   319,   320,   321,     0,   322,     0,     0,
+       0,   325,     0,   326,   327,   328,   329,   330,   780,   331,
+     332,   333,   334,  1987,   335,   336,   337,   338,   339,   340,
+       0,   341,   781,  1988,   343,   344,   345,   346,   989,   990,
+       0,   991,     0,   350,   782,   783,   351,   784,   352,   353,
+     354,   355,   356,     0,     0,   357,     0,   785,   359,   786,
+       0,   360,   361,   362,     0,     0,   363,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+     377,   992,   787,   993,   380,   381,     0,     0,   383,   384,
+     788,   385,     0,     0,   387,   994,   389,   390,   391,     0,
+     392,     0,     0,   393,   394,   395,     0,     0,   396,  1990,
+     789,   398,   790,     0,   400,   401,   402,   403,   404,   405,
+     406,     0,   407,   408,     0,   410,     0,   412,   413,   414,
+       0,   415,   416,   417,   418,   419,   420,   421,   422,   995,
+     424,   425,   426,   427,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,   436,   437,   438,     0,   439,   440,   791,
+     441,   442,   443,     0,   445,   446,   447,   448,   449,   450,
+     451,   452,     0,   453,   454,   455,   456,   457,     0,   458,
+     459,  1991,   461,   462,   792,   463,   464,   997,   466,     0,
+     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
+     477,     0,     0,   479,   480,     0,   481,   793,   482,   483,
+     484,   485,   486,     0,   998,   999,     0,     0,   489,   490,
+       0,   492,     0,     0,   494,   495,   496,   497,   498,   499,
+     500,     0,     0,   501,   502,   503,   504,   505,     0,     0,
+     506,   507,   508,   509,   510,     0,  1000,  1992,   513,   794,
+     514,   515,   516,   517,     0,     0,   518,     0,     0,   519,
+     520,   521,   522,   523,   524,   978,     0,     0,     0,     0,
+       0,     0,     0,     0,   534,   535,   536,     0,     0,     0,
+     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
+     230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
+     233,     0,   234,   235,   772,   236,   237,   238,     0,   979,
+     773,   980,   981,     0,   243,   244,   245,   246,   247,     0,
+       0,   248,   249,   982,   983,   252,     0,   253,   254,   255,
+     256,     0,     0,   774,     0,   258,   259,   260,   261,   775,
+     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
+       0,   776,   271,   272,   273,     0,     0,     0,   777,     0,
+       0,     0,   274,   275,   276,   277,   278,   279,   984,   985,
+     282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
+     289,   290,   291,     0,     0,   292,   293,   986,   295,   296,
+       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
+     304,   305,   306,     0,   308,   309,   310,     0,     0,   312,
+       0,   313,   314,   987,   316,     0,   317,     0,   318,   778,
+       0,   779,   319,   320,   321,     0,   322,     0,     0,     0,
+     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
+     333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
+     341,   781,     0,   343,   344,   345,   346,   989,   990,     0,
+     991,     0,   350,   782,   783,   351,   784,   352,   353,   354,
+     355,   356,     0,     0,   357,     0,   785,   359,   786,     0,
+     360,   361,   362,     0,     0,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     992,   787,   993,   380,   381,     0,     0,   383,   384,   788,
+     385,  2084,     0,   387,   994,   389,   390,   391,     0,   392,
+       0,     0,   393,   394,   395,     0,     0,   396,     0,   789,
+     398,   790,     0,   400,   401,   402,   403,   404,   405,   406,
+       0,   407,   408,     0,   410,     0,   412,   413,   414,     0,
+     415,   416,   417,   418,   419,   420,   421,   422,   995,   424,
+     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
+     442,   443,     0,   445,   446,   447,   448,   449,   450,   451,
+     452,     0,   453,   454,   455,   456,   457,     0,   458,   459,
+    1991,   461,   462,   792,   463,   464,   997,   466,     0,   467,
+     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
+       0,     0,   479,   480,  3623,   481,   793,   482,   483,   484,
+     485,   486,     0,   998,   999,     0,     0,   489,   490,     0,
+     492,     0,     0,   494,   495,   496,   497,   498,   499,   500,
+       0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
+     507,   508,   509,   510,     0,  1000,     0,   513,   794,   514,
+     515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
+     521,   522,   523,   524,   219,     0,     0,     0,     0,     0,
+       0,     0,     0,   534,   535,   536,     0,     0,     0,   220,
+     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
+     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
+       0,   234,   235,     0,   236,   237,   238,   239,   240,     0,
+     241,   242,     0,   243,   244,   245,   246,   247,     0,     0,
+     248,   249,   250,   251,   252,     0,   253,   254,   255,   256,
+     257,     0,     0,     0,   258,   259,   260,   261,     0,   262,
+     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
+       0,   271,   272,   273,     0,     0,     0,     0,     0,     0,
+       0,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
+     290,   291,     0,     0,   292,   293,   294,   295,   296,     0,
+     297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,     0,   312,     0,
+     313,   314,   315,   316,     0,   317,     0,   318,     0,     0,
+       0,   319,   320,   321,     0,   322,   323,     0,   324,   325,
+       0,   326,   327,   328,   329,   330,     0,   331,   332,   333,
+     334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
+       0,   342,   343,   344,   345,   346,   347,   348,     0,   349,
+       0,   350,     0,     0,   351,     0,   352,   353,   354,   355,
+     356,     0,     0,   357,   358,     0,   359,     0,     0,   360,
+     361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
+       0,   379,   380,   381,   382,     0,   383,   384,     0,   385,
+       0,   386,   387,   388,   389,   390,   391,     0,   392,     0,
+       0,   393,   394,   395,     0,     0,   396,   397,     0,   398,
+       0,   399,   400,   401,   402,   403,     0,   405,   406,     0,
+     407,   408,   409,   410,   411,   412,   413,   414,     0,   415,
+     416,   417,   418,   419,   420,     0,   422,   423,   424,   425,
+     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,     0,   439,   440,     0,   441,   442,
+     443,   444,     0,   446,   447,   448,   449,   450,   451,   452,
+       0,   453,   454,   455,   456,   457,     0,   458,   459,   460,
+     461,   462,     0,   463,   464,   465,   466,     0,   467,   468,
+     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
+       0,   479,   480,     0,   481,     0,   482,   483,   484,   485,
+     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     493,     0,   494,   495,   496,   497,   498,   499,   500,     0,
+       0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
+     508,   509,   510,   511,   512,     0,   513,     0,   514,   515,
+     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
+     522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
+     532,   533,   534,   535,   536,   978,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     220,   221,   222,   223,   224,   225,   226,   227,     0,   229,
+     230,   231,     0,     0,     0,     0,     0,     0,     0,   232,
+     233,     0,   234,   235,   772,   236,   237,   238,     0,   979,
+     773,   980,   981,     0,   243,   244,   245,   246,   247,     0,
+       0,   248,   249,   982,   983,   252,     0,   253,   254,   255,
+     256,     0,     0,   774,     0,   258,   259,   260,   261,   775,
+     262,   263,   264,     0,   265,   266,   267,   268,   269,   270,
+       0,   776,   271,   272,   273,     0,     0,     0,   777,     0,
+       0,     0,   274,   275,   276,   277,   278,   279,   984,   985,
+     282,     0,   283,     0,   284,   285,   286,   287,   288,     0,
+     289,   290,   291,     0,     0,   292,   293,   986,   295,   296,
+       0,   297,   298,   299,     0,   300,   301,   302,     0,   303,
+     304,   305,   306,     0,   308,   309,   310,     0,     0,   312,
+       0,   313,   314,   987,   316,     0,   317,     0,   318,   778,
+       0,   779,   319,   320,   321,     0,   322,     0,     0,     0,
+     325,     0,   326,   327,   328,   329,   330,   780,   331,   332,
+     333,   334,     0,   335,   336,   337,   338,   339,   340,     0,
+     341,   781,     0,   343,   344,   345,   346,   989,   990,     0,
+     991,     0,   350,   782,   783,   351,   784,   352,   353,   354,
+     355,   356,     0,     0,   357,     0,   785,   359,   786,     0,
+     360,   361,   362,     0,     0,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     992,   787,   993,   380,   381,  2152,     0,   383,   384,   788,
+     385,     0,     0,   387,   994,   389,   390,   391,     0,   392,
+       0,     0,   393,   394,   395,     0,     0,   396,     0,   789,
+     398,   790,     0,   400,   401,   402,   403,   404,   405,   406,
+       0,   407,   408,     0,   410,     0,   412,   413,   414,     0,
+     415,   416,   417,   418,   419,   420,   421,   422,   995,   424,
+     425,   426,   427,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,     0,   439,   440,   791,   441,
+     442,   443,     0,   445,   446,   447,   448,   449,   450,   451,
+     452,     0,   453,   454,   455,   456,   457,     0,   458,   459,
+     996,   461,   462,   792,   463,   464,   997,   466,     0,   467,
+     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
+       0,     0,   479,   480,     0,   481,   793,   482,   483,   484,
+     485,   486,     0,   998,   999,     0,     0,   489,   490,     0,
+     492,     0,     0,   494,   495,   496,   497,   498,   499,   500,
+       0,     0,   501,   502,   503,   504,   505,     0,     0,   506,
+     507,   508,   509,   510,     0,  1000,     0,   513,   794,   514,
+     515,   516,   517,     0,     0,   518,     0,     0,   519,   520,
+     521,   522,   523,   524,   978,     0,     0,     0,     0,     0,
+       0,     0,     0,   534,   535,   536,     0,     0,     0,   220,
+     221,   222,   223,   224,   225,   226,   227,     0,   229,   230,
+     231,     0,     0,     0,     0,     0,     0,     0,   232,   233,
+       0,   234,   235,   772,   236,   237,   238,     0,   979,   773,
+     980,   981,     0,   243,   244,   245,   246,   247,     0,     0,
+     248,   249,   982,   983,   252,     0,   253,   254,   255,   256,
+       0,     0,   774,     0,   258,   259,   260,   261,   775,   262,
+     263,   264,     0,   265,   266,   267,   268,   269,   270,     0,
+     776,   271,   272,   273,     0,     0,     0,   777,     0,     0,
+       0,   274,   275,   276,   277,   278,   279,   984,   985,   282,
+       0,   283,     0,   284,   285,   286,   287,   288,     0,   289,
+     290,   291,     0,     0,   292,   293,   986,   295,   296,     0,
+     297,   298,   299,     0,   300,   301,   302,     0,   303,   304,
+     305,   306,     0,   308,   309,   310,     0,     0,   312,     0,
+     313,   314,   987,   316,     0,   317,     0,   318,   778,     0,
+     779,   319,   320,   321,     0,   322,     0,     0,     0,   325,
+       0,   326,   327,   328,   329,   330,   780,   331,   332,   333,
+     334,     0,   335,   336,   337,   338,   339,   340,     0,   341,
+     781,     0,   343,   344,   345,   346,   989,   990,     0,   991,
+       0,   350,   782,   783,   351,   784,   352,   353,   354,   355,
+     356,     0,     0,   357,     0,   785,   359,   786,     0,   360,
+     361,   362,     0,     0,   363,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,   992,
+     787,   993,   380,   381,  3449,     0,   383,   384,   788,   385,
+       0,     0,   387,   994,   389,   390,   391,     0,   392,     0,
+       0,   393,   394,   395,     0,     0,   396,     0,   789,   398,
+     790,     0,   400,   401,   402,   403,   404,   405,   406,     0,
+     407,   408,     0,   410,     0,   412,   413,   414,     0,   415,
+     416,   417,   418,   419,   420,   421,   422,   995,   424,   425,
+     426,   427,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,     0,   439,   440,   791,   441,   442,
+     443,     0,   445,   446,   447,   448,   449,   450,   451,   452,
+       0,   453,   454,   455,   456,   457,     0,   458,   459,   996,
+     461,   462,   792,   463,   464,   997,   466,     0,   467,   468,
+     469,   470,   471,   472,   473,   474,   475,   476,   477,     0,
+       0,   479,   480,     0,   481,   793,   482,   483,   484,   485,
+     486,     0,   998,   999,     0,     0,   489,   490,     0,   492,
+       0,     0,   494,   495,   496,   497,   498,   499,   500,     0,
+       0,   501,   502,   503,   504,   505,     0,     0,   506,   507,
+     508,   509,   510,     0,  1000,     0,   513,   794,   514,   515,
+     516,   517,     0,     0,   518,     0,     0,   519,   520,   521,
+     522,   523,   524,   978,     0,     0,     0,     0,     0,     0,
+       0,     0,   534,   535,   536,     0,     0,     0,   220,   221,
+     222,   223,   224,   225,   226,   227,     0,   229,   230,   231,
+       0,     0,     0,     0,     0,     0,     0,   232,   233,     0,
+     234,   235,   772,   236,   237,   238,     0,   979,   773,   980,
+     981,     0,   243,   244,   245,   246,   247,     0,     0,   248,
+     249,   982,   983,   252,     0,   253,   254,   255,   256,     0,
+       0,   774,     0,   258,   259,   260,   261,   775,   262,   263,
+     264,     0,   265,   266,   267,   268,   269,   270,     0,   776,
+     271,   272,   273,     0,     0,     0,   777,     0,     0,     0,
+     274,   275,   276,   277,   278,   279,   984,   985,   282,     0,
+     283,     0,   284,   285,   286,   287,   288,     0,   289,   290,
+     291,     0,     0,   292,   293,   986,   295,   296,     0,   297,
+     298,   299,     0,   300,   301,   302,     0,   303,   304,   305,
+     306,     0,   308,   309,   310,     0,     0,   312,     0,   313,
+     314,   987,   316,     0,   317,     0,   318,   778,     0,   779,
+     319,   320,   321,     0,   322,     0,     0,     0,   325,     0,
+     326,   327,   328,   329,   988,   780,   331,   332,   333,   334,
+       0,   335,   336,   337,   338,   339,   340,     0,   341,   781,
+       0,   343,   344,   345,   346,   989,   990,     0,   991,     0,
+     350,   782,   783,   351,   784,   352,   353,   354,   355,   356,
+       0,     0,   357,     0,   785,   359,   786,     0,   360,   361,
+     362,     0,     0,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   992,   787,
+     993,   380,   381,     0,     0,   383,   384,   788,   385,     0,
+       0,   387,   994,   389,   390,   391,     0,   392,     0,     0,
+     393,   394,   395,     0,     0,   396,     0,   789,   398,   790,
+       0,   400,   401,   402,   403,   404,   405,   406,     0,   407,
+     408,     0,   410,     0,   412,   413,   414,     0,   415,   416,
+     417,   418,   419,   420,   421,   422,   995,   424,   425,   426,
+     427,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,     0,   439,   440,   791,   441,   442,   443,
+       0,   445,   446,   447,   448,   449,   450,   451,   452,     0,
+     453,   454,   455,   456,   457,     0,   458,   459,   996,   461,
+     462,   792,   463,   464,   997,   466,     0,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,     0,     0,
+     479,   480,     0,   481,   793,   482,   483,   484,   485,   486,
+       0,   998,   999,     0,     0,   489,   490,     0,   492,     0,
+       0,   494,   495,   496,   497,   498,   499,   500,     0,     0,
+     501,   502,   503,   504,   505,     0,     0,   506,   507,   508,
+     509,   510,     0,  1000,     0,   513,   794,   514,   515,   516,
+     517,     0,     0,   518,     0,     0,   519,   520,   521,   522,
+     523,   524,   978,     0,     0,     0,     0,     0,     0,     0,
+       0,   534,   535,   536,     0,     0,     0,   220,   221,   222,
+     223,   224,   225,   226,   227,     0,   229,   230,   231,     0,
+       0,     0,     0,     0,     0,     0,   232,   233,     0,   234,
+     235,   772,   236,   237,   238,     0,   979,   773,   980,   981,
+       0,   243,   244,   245,   246,   247,     0,     0,   248,   249,
+     982,   983,   252,     0,   253,   254,   255,   256,     0,     0,
+     774,     0,   258,   259,   260,   261,   775,   262,   263,   264,
+       0,   265,   266,   267,   268,   269,   270,     0,   776,   271,
+     272,   273,     0,     0,     0,   777,     0,     0,     0,   274,
+     275,   276,   277,   278,   279,   984,   985,   282,     0,   283,
+       0,   284,   285,   286,   287,   288,     0,   289,   290,   291,
+       0,     0,   292,   293,   986,   295,   296,     0,   297,   298,
+     299,     0,   300,   301,   302,     0,   303,   304,   305,   306,
+       0,   308,   309,   310,     0,     0,   312,     0,   313,   314,
+     987,   316,     0,   317,     0,   318,   778,     0,   779,   319,
+     320,   321,     0,   322,     0,     0,     0,   325,     0,   326,
+     327,   328,   329,  1046,   780,   331,   332,   333,   334,     0,
+     335,   336,   337,   338,   339,   340,     0,   341,   781,     0,
+     343,   344,   345,   346,   989,   990,     0,   991,     0,   350,
+     782,   783,   351,   784,   352,   353,   354,   355,   356,     0,
+       0,   357,     0,   785,   359,   786,     0,   360,   361,   362,
+       0,     0,   363,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,   377,   992,   787,   993,
+     380,   381,     0,     0,   383,   384,   788,   385,     0,     0,
+     387,   994,   389,   390,   391,     0,   392,     0,     0,   393,
+     394,   395,     0,     0,   396,     0,   789,   398,   790,     0,
+     400,   401,   402,   403,   404,   405,   406,     0,   407,   408,
+       0,   410,     0,   412,   413,   414,     0,   415,   416,   417,
+     418,   419,   420,   421,   422,   995,   424,   425,   426,   427,
+       0,   428,   429,   430,   431,   432,   433,   434,   435,   436,
+     437,   438,     0,   439,   440,   791,   441,   442,   443,     0,
+     445,   446,   447,   448,   449,   450,   451,   452,     0,   453,
+     454,   455,   456,   457,     0,   458,   459,   996,   461,   462,
+     792,   463,   464,   997,   466,     0,   467,   468,   469,   470,
+     471,   472,   473,   474,   475,   476,   477,     0,     0,   479,
+     480,     0,   481,   793,   482,   483,   484,   485,   486,     0,
+     998,   999,     0,     0,   489,   490,     0,   492,     0,     0,
+     494,   495,   496,   497,   498,   499,   500,     0,     0,   501,
+     502,   503,   504,   505,     0,     0,   506,   507,   508,   509,
+     510,     0,  1000,     0,   513,   794,   514,   515,   516,   517,
+       0,     0,   518,     0,     0,   519,   520,   521,   522,   523,
+     524,   978,     0,     0,     0,     0,     0,     0,     0,     0,
+     534,   535,   536,     0,     0,     0,   220,   221,   222,   223,
+     224,   225,   226,   227,     0,   229,   230,   231,     0,     0,
+       0,     0,     0,     0,     0,   232,   233,     0,   234,   235,
+     772,   236,   237,   238,     0,   979,   773,   980,   981,     0,
+     243,   244,   245,   246,   247,     0,     0,   248,   249,   982,
+     983,   252,     0,   253,   254,   255,   256,     0,     0,   774,
+       0,   258,   259,   260,   261,   775,   262,   263,   264,     0,
+     265,   266,   267,   268,   269,   270,     0,   776,   271,   272,
+     273,     0,     0,     0,   777,     0,     0,     0,   274,   275,
+     276,   277,   278,   279,   984,   985,   282,     0,   283,     0,
+     284,   285,   286,   287,   288,     0,   289,   290,   291,     0,
+       0,   292,   293,   986,   295,   296,     0,   297,   298,   299,
+       0,   300,   301,   302,     0,   303,   304,   305,   306,     0,
+     308,   309,   310,     0,     0,   312,     0,   313,   314,   987,
+     316,     0,   317,     0,   318,   778,     0,   779,   319,   320,
+     321,     0,   322,     0,     0,     0,   325,     0,   326,   327,
+     328,   329,   330,   780,   331,   332,   333,   334,     0,   335,
+     336,   337,   338,   339,   340,     0,   341,   781,     0,   343,
+     344,   345,   346,   989,   990,     0,   991,     0,   350,   782,
+     783,   351,   784,   352,   353,   354,   355,   356,     0,     0,
+     357,     0,   785,   359,   786,     0,   360,   361,   362,     0,
+       0,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   992,   787,   993,   380,
+     381,     0,     0,   383,   384,   788,   385,     0,     0,   387,
+     994,   389,   390,   391,     0,   392,     0,     0,   393,   394,
+     395,     0,     0,   396,     0,   789,   398,   790,     0,   400,
+     401,   402,   403,   404,   405,   406,     0,   407,   408,     0,
+     410,     0,   412,   413,   414,     0,   415,   416,   417,   418,
+     419,   420,   421,   422,   995,   424,   425,   426,   427,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,     0,   439,   440,   791,   441,   442,   443,     0,   445,
+     446,   447,   448,   449,   450,   451,   452,     0,   453,   454,
+     455,   456,   457,     0,   458,   459,   996,   461,   462,   792,
+     463,   464,   997,   466,     0,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,     0,     0,   479,   480,
+       0,   481,   793,   482,   483,   484,   485,   486,     0,   998,
+     999,     0,     0,   489,   490,     0,   492,     0,     0,   494,
+     495,   496,   497,   498,   499,   500,     0,     0,   501,   502,
+     503,   504,   505,     0,     0,   506,   507,   508,   509,   510,
+       0,  1000,     0,   513,   794,   514,   515,   516,   517,     0,
+       0,   518,     0,     0,   519,   520,   521,   522,   523,   524,
+     978,     0,     0,     0,     0,     0,     0,     0,     0,   534,
+     535,   536,     0,     0,     0,   220,   221,   222,   223,   224,
+     225,   226,   227,     0,   229,   230,   231,     0,     0,     0,
+       0,     0,     0,     0,   232,   233,     0,   234,   235,   772,
+     236,   237,   238,     0,   979,   773,   980,   981,     0,   243,
+     244,   245,   246,   247,     0,     0,   248,   249,   982,   983,
+     252,     0,   253,   254,   255,   256,     0,     0,   774,     0,
+     258,   259,   260,   261,   775,   262,   263,   264,     0,   265,
+     266,   267,   268,   269,   270,     0,   776,   271,   272,   273,
+       0,     0,     0,   777,     0,     0,     0,   274,   275,   276,
+     277,   278,   279,   984,   985,   282,     0,   283,     0,   284,
+     285,   286,   287,   288,     0,   289,   290,   291,     0,     0,
+     292,   293,   986,   295,   296,     0,   297,   298,   299,     0,
+     300,   301,   302,     0,   303,   304,   305,   306,     0,   308,
+     309,   310,     0,     0,   312,     0,   313,   314,   987,   316,
+       0,   317,     0,   318,   778,     0,   779,   319,   320,   321,
+       0,   322,     0,     0,     0,   325,     0,   326,   327,   328,
+     329,   330,   780,   331,   332,   333,   334,     0,   335,   336,
+     337,   338,   339,   340,     0,   341,   781,     0,   343,   344,
+     345,   346,   989,   990,     0,   991,     0,   350,   782,   783,
+     351,   784,   352,   353,   354,   355,   356,     0,     0,   357,
+       0,   785,   359,   786,     0,   360,   361,   362,     0,     0,
+     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,   377,   992,   787,   993,   380,   381,
+       0,     0,   383,   384,   788,   385,     0,     0,   387,   994,
+     389,   390,   391,     0,   392,     0,     0,   393,   394,   395,
+       0,     0,   396,     0,   789,   398,   790,     0,   400,   401,
+     402,   403,   404,   405,   406,     0,   407,   408,     0,   410,
+       0,   412,   413,   414,     0,   415,   416,   417,   418,   419,
+     420,   421,   422,   995,   424,   425,   426,   427,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
+       0,   439,   440,   791,   441,   442,   443,     0,   445,   446,
+     447,   448,   449,   450,   451,   452,     0,   453,   454,   455,
+     456,   457,     0,   458,   459,  1991,   461,   462,   792,   463,
+     464,   997,   466,     0,   467,   468,   469,   470,   471,   472,
+     473,   474,   475,   476,   477,     0,     0,   479,   480,     0,
+     481,   793,   482,   483,   484,   485,   486,     0,   998,   999,
+       0,     0,   489,   490,     0,   492,     0,     0,   494,   495,
+     496,   497,   498,   499,   500,     0,     0,   501,   502,   503,
+     504,   505,     0,     0,   506,   507,   508,   509,   510,     0,
+    1000,     0,   513,   794,   514,   515,   516,   517,     0,     0,
+     518,     0,     0,   519,   520,   521,   522,   523,   524,   978,
+       0,     0,     0,     0,     0,     0,     0,     0,   534,   535,
+     536,     0,     0,     0,   220,   221,   222,   223,   224,   225,
+     226,   227,     0,   229,   230,   231,     0,     0,     0,     0,
+       0,     0,     0,   232,   233,     0,   234,   235,   772,   236,
+     237,   238,     0,   979,   773,   980,   981,     0,   243,   244,
+     245,   246,   247,     0,     0,   248,   249,   982,   983,   252,
+       0,   253,   254,   255,   256,     0,     0,   774,     0,   258,
+     259,   260,   261,   775,   262,   263,   264,     0,   265,   266,
+     267,   268,   269,   270,     0,   776,   271,   272,   273,     0,
+       0,     0,   777,     0,     0,     0,   274,   275,   276,   277,
+     278,   279,   984,   985,   282,     0,   283,     0,   284,   285,
+     286,   287,   288,     0,   289,   290,   291,     0,     0,   292,
+     293,   986,   295,   296,     0,   297,   298,   299,     0,   300,
+     301,   302,     0,   303,   304,   305,   306,     0,   308,   309,
+     310,     0,     0,   312,     0,   313,   314,   987,   316,     0,
+     317,     0,   318,   778,     0,   779,   319,   320,   321,     0,
+     322,     0,     0,     0,   325,     0,   326,   327,   328,   329,
+     330,   780,   331,   332,   333,   334,     0,   335,   336,   337,
+     338,   339,   340,     0,   341,   781,     0,   343,   344,   345,
+     346,   989,   990,     0,   991,     0,   350,   782,   783,   351,
+     784,   352,   353,   354,   355,   356,     0,     0,   357,     0,
+     785,   359,   786,     0,   360,   361,   362,     0,     0,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,   992,   787,   993,   380,   381,     0,
+       0,   383,   384,   788,   385,     0,     0,   387,   994,   389,
+     390,   391,     0,   392,     0,     0,   393,   394,   395,     0,
+       0,   396,     0,   789,   398,   790,     0,   400,   401,   402,
+     403,   404,   405,   406,     0,   407,   408,     0,   410,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,   419,   420,
+     421,   422,   995,   424,   425,   426,   427,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
+     439,   440,   791,   441,   442,   443,     0,   445,   446,   447,
+     448,   449,   450,   451,   452,     0,   453,   454,   455,   456,
+     457,     0,   458,   459,     0,   461,   462,   792,   463,   464,
+     997,   466,     0,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,     0,     0,   479,   480,     0,   481,
+     793,   482,   483,   484,   485,   486,     0,   998,   999,     0,
+       0,   489,   490,     0,   492,     0,     0,   494,   495,   496,
+     497,   498,   499,   500,     0,     0,   501,   502,   503,   504,
+     505,     0,     0,   506,   507,   508,   509,   510,     0,  1000,
+       0,   513,   794,   514,   515,   516,   517,     0,     0,   518,
+       0,     0,   519,   520,   521,   522,   523,   524,   978,     0,
+       0,     0,     0,     0,     0,     0,     0,   534,   535,   536,
+       0,     0,     0,   220,   221,   222,   223,   224,   225,   226,
+     227,     0,   229,   230,   231,     0,     0,     0,     0,     0,
+       0,     0,   232,   233,     0,   234,   235,   772,   236,   237,
+     238,     0,     0,   773,     0,     0,     0,   243,   244,   245,
+     246,   247,     0,     0,   248,   249,     0,     0,   252,     0,
+     253,   254,   255,   256,     0,     0,   774,     0,   258,   259,
+     260,   261,   775,   262,   263,   264,     0,   265,   266,   267,
+     268,   269,   270,     0,   776,   271,   272,   273,     0,     0,
+       0,   777,     0,     0,     0,   274,   275,   276,   277,   278,
+     279,     0,     0,   282,     0,   283,     0,   284,   285,   286,
+     287,   288,     0,   289,   290,   291,     0,     0,   292,   293,
+     294,   295,   296,     0,   297,   298,   299,     0,   300,   301,
+     302,     0,   303,   304,   305,   306,     0,   308,   309,   310,
+       0,     0,   312,     0,   313,   314,     0,   316,     0,   317,
+       0,   318,   778,     0,   779,   319,   320,   321,     0,   322,
+       0,     0,     0,   325,     0,   326,   327,   328,   329,   330,
+     780,   331,   332,   333,   334,     0,   335,   336,   337,   338,
+     339,   340,     0,   341,   781,     0,   343,   344,   345,   346,
+       0,     0,     0,     0,     0,   350,   782,   783,   351,   784,
+     352,   353,   354,   355,   356,     0,     0,   357,     0,   785,
+     359,   786,     0,   360,   361,   362,     0,     0,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,     0,   787,     0,   380,   381,     0,     0,
+     383,   384,   788,   385,     0,     0,   387,     0,   389,   390,
+     391,     0,   392,     0,     0,   393,   394,   395,     0,     0,
+     396,     0,   789,   398,   790,     0,   400,   401,   402,   403,
+     404,   405,   406,     0,   407,   408,     0,   410,     0,   412,
+     413,   414,     0,   415,   416,   417,   418,   419,   420,   421,
+     422,     0,   424,   425,   426,   427,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,   436,   437,   438,     0,   439,
+     440,   791,   441,   442,   443,     0,   445,   446,   447,   448,
+     449,   450,   451,   452,     0,   453,   454,   455,   456,   457,
+       0,   458,   459,     0,   461,   462,   792,   463,   464,     0,
+     466,     0,   467,   468,   469,   470,   471,   472,   473,   474,
+     475,   476,   477,     0,     0,   479,   480,     0,   481,   793,
+     482,   483,   484,   485,   486,     0,     0,     0,     0,     0,
+     489,   490,     0,   492,     0,     0,   494,   495,   496,   497,
+     498,   499,   500,     0,     0,   501,   502,   503,   504,   505,
+       0,     0,   506,   507,   508,   509,   510,     0,     0,     0,
+     513,   794,   514,   515,   516,   517,     0,     0,   518,     0,
+       0,   519,   520,   521,   522,   523,   524,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   534,   535,   536
+};
+
+static const yytype_int16 yycheck[] =
+{
+      16,     0,     0,     0,     0,     0,     0,    35,   201,    25,
+    1021,   716,    50,    11,    21,   594,   765,  1063,   770,     7,
+      27,    44,    20,   615,    20,  1255,    14,   666,   667,   668,
+     564,   714,   179,   672,   626,  1273,   870,   796,  1815,   996,
+     857,   594,   188,   189,    21,  1025,   192,  1030,   194,  1331,
+      27,  2279,    50,   739,  1015,   634,   938,    43,   879,  1479,
+    1694,  1257,    12,  1366,   984,   985,   918,   949,   214,  1116,
+    2151,   723,  2774,   999,   994,    17,  1995,  1996,   612,  1309,
+    2631,  2288,  2468,  3051,    22,  1085,  2822,  1549,  2824,   923,
+    1372,   187,  1431,   927,    20,   197,  3307,    35,   932,  2982,
+     196,  1376,   204,  1387,  1730,  3027,  2204,   941,  2798,  1305,
+    1942,  2244,  1278,   215,  3400,   856,   204,   951,     0,  2252,
+     972,  2254,  2965,   555,  2972,  2440,  3350,   215,  2680,  2972,
+    3346,  3350,   827,  2623,  2621,  2622,   633,  3624,   625,  3601,
+     719,  1561,  3612,  1818,   181,    34,  3615,  3602,  2554,   181,
+    1774,   166,    41,  3009,     0,  3272,     0,  1372,     0,  1358,
+       0,     0,  1309,     0,  1448,  1449,   719,     0,  1443,     0,
+       0,   603,  3278,     0,     0,     0,    40,    49,  3865,   813,
+    4065,  2688,  3038,   181,  3025,   762,   856,  3277,  3207,  1651,
+    3323,  4185,   862,  4187,     5,   762,     0,    11,    11,  4242,
+    4366,  2282,   872,     5,     0,  4223,  3244,  2619,    70,     0,
+    3548,  1055,    48,     9,     9,     5,    35,    62,  1995,    22,
+      41,   982,   983,     5,   210,  1145,  1146,    40,  4280,  4281,
+      26,    41,   993,  4276,   109,    22,     5,     0,    26,    55,
+       0,    84,   133,    72,  1164,    33,    39,   158,  1174,   153,
+       5,   128,    26,     5,    26,    72,     5,    70,    13,    14,
+    2672,    33,     5,   158,    13,    14,   180,    76,    26,    81,
+      13,    14,    62,     5,   159,    33,   199,   916,    39,    55,
+    2686,     5,  1512,    30,    31,   168,   109,   102,     5,     5,
+      29,  2524,  2525,  2619,   168,     5,  2529,     5,   109,    72,
+       5,  2382,     5,  2384,     5,  4315,    72,   104,    81,     5,
+     111,  2776,   259,    46,     9,    81,   168,   158,   254,   198,
+       5,   258,   111,   126,    72,     3,     4,     5,   207,   114,
+      62,     9,   254,  2566,  2567,  4553,   159,   216,     9,   126,
+      78,   254,    55,     0,    55,   242,  2672,   158,   289,  1193,
+    1288,   158,     9,   109,   158,     4,   109,   286,    32,   242,
+       9,   336,   158,  4801,   148,   899,    88,   158,  1063,    26,
+     373,   564,     4,  1134,  1135,   172,   180,     9,    48,   262,
+     118,  3690,   262,  3692,   180,   271,   111,  4249,   373,   180,
+     242,     3,   272,     5,  2163,   158,    26,   375,   158,  1160,
+     306,   294,    27,   294,    72,   111,    11,   553,   193,   317,
+     157,   557,   159,   406,   203,   415,    11,   180,  1001,   612,
+     180,  1242,   245,    61,    62,  4287,   306,  2061,   321,   575,
+     100,   109,   396,   217,   231,  1194,   436,   234,  4432,  1031,
+     418,   163,   175,  4486,    74,    40,   375,   180,    64,  2218,
+     336,   454,    82,  1691,   550,   244,  1039,  1695,    29,  1697,
+     562,  4899,  1700,  1222,  1047,   567,   140,   373,   311,   454,
+    1053,  4356,  1051,   420,   562,    70,   578,   452,  1489,   567,
+     110,   140,  4700,   216,  1063,   272,   450,   395,   164,   418,
+     578,   244,   104,   249,   102,   116,   312,   203,  1051,  1091,
+     114,   158,   598,   400,   207,   279,   295,  4472,  4473,   450,
+    1102,  1494,   608,   450,   450,  4525,  2981,   400,   333,   306,
+     198,   137,   192,   180,   249,  1117,   400,   407,   450,   545,
+     327,   454,  3870,  1729,   411,   273,   312,   450,   244,   155,
+     454,  1120,   220,   454,   373,  1240,   450,    11,   400,   336,
+    1245,  1246,  1782,   249,   184,   450,   373,   331,   346,   450,
+     172,   373,   373,   373,   439,   450,   359,  1120,  1065,   194,
+     309,   158,   242,   396,   346,  1771,    40,   386,   594,   595,
+     401,   320,  3430,   322,   353,   354,   448,  3430,   346,   295,
+     452,   394,   366,  1427,   368,  1429,   634,   398,   359,   312,
+     373,   312,   544,   405,  4066,   450,    70,   373,   341,   394,
+    4662,   454,   399,   454,   450,   405,    55,  4635,   765,   231,
+    1437,  1817,   234,   638,  4842,   373,  1508,  4793,   439,   367,
+    1482,   450,   446,   446,   431,   633,   634,   633,   454,   378,
+     647,   452,   649,  2724,   651,   441,   442,   454,   450,   453,
+     657,   658,   659,  1348,   449,   325,  1477,   453,  1237,   406,
+     450,  1356,   453,  3353,   543,   681,  1245,  1246,   450,   548,
+     647,   287,   649,   661,   651,  1655,  1346,  3794,   454,  3785,
+     657,  3798,   632,  3702,  1237,  1685,  4024,   833,   834,  3611,
+     453,   707,   678,   453,  3784,   450,   448,  1617,   450,   715,
+     452,   450,   718,   719,   720,   373,   899,   450,   634,    11,
+    3593,  4754,  1692,  3846,  3570,   327,   417,   754,   450,  1296,
+    3758,  1701,   754,  4766,  1419,   355,   450,  1422,  1423,  1296,
+    1400,  1365,   417,   450,   450,   436,    20,  4731,   309,  1583,
+     450,   454,   450,   454,  4082,   450,   441,   442,   454,   450,
+     102,   436,   411,   739,   362,   450,   754,   756,   756,   756,
+     756,   756,   756,   441,   442,   450,   415,    34,   914,   102,
+     441,   442,  2691,   389,  2693,   396,   109,  4464,   454,  2009,
+     394,  4746,  4825,   769,   441,   442,   373,   436,   884,   254,
+     936,   937,   441,   442,   102,  1490,   453,  3004,   139,   895,
+    2075,  4110,  3292,   242,    55,  4114,  4115,  2940,  4117,   441,
+     442,   957,   691,  1751,  2947,  2948,  4701,   743,  2951,   431,
+     827,  1759,     5,  3664,   158,  2958,   812,     8,  3335,  1590,
+    1591,  1323,    26,     5,    15,    16,    17,   716,   443,   444,
+     445,   446,   109,  3533,  2621,  2622,  2623,   103,   443,   444,
+     445,   446,   439,   717,   114,   139,   735,   721,  3270,   102,
+    3272,   158,  2009,   959,    78,   452,   102,   415,  2949,  2950,
+     153,  1405,  2147,   312,   756,   747,  4226,   104,   757,   114,
+    4218,  1027,  1028,   245,  1728,  4355,  1730,  4225,  2103,    26,
+     336,   102,  1736,   162,  2093,   231,   336,   336,  1742,  1743,
+    1744,     5,  2132,   396,   118,  4790,   454,   271,  1752,  1753,
+     756,   244,   756,  1757,   756,  3321,   756,   756,  1557,   756,
+     114,   803,   168,   756,    22,   756,   756,   183,    64,   756,
+     756,   756,   337,   193,   439,  3637,     3,   158,  3350,    68,
+     320,   160,   155,   320,  3270,   172,  3272,   452,   264,   828,
+    4169,   220,   109,  3186,  3187,  3188,  3189,   450,   193,  3192,
+    3193,  3194,  3195,  3196,  3197,  3198,  3199,  3200,  3201,   858,
+     859,  4321,   336,   109,   139,   257,  2022,   441,   442,   443,
+     444,   445,   446,  2322,   121,   450,   264,  4206,   264,  1572,
+     136,   327,   258,  1698,  1699,  4219,   242,   264,   339,   193,
+    4219,    78,   242,   258,   231,     5,  2681,   234,   454,  1768,
+     362,  2635,    78,    80,   454,  3248,  3249,   394,    22,   352,
+      64,   963,   355,  1515,  3350,   308,   272,   324,   126,   161,
+    1622,   242,   394,  2336,  1991,  1051,   320,    81,  1621,   373,
+    2001,   118,  1625,  1635,  2274,   450,  2965,  1063,  1631,  1632,
+     929,   197,   118,  2972,   362,   339,  1063,  4174,  1650,   273,
+     306,   312,  4179,   130,  4170,  4182,   249,  1065,   324,  1065,
+     450,  1654,    78,   109,   953,   954,   955,   249,   103,   260,
+    1068,  1097,  1070,  1662,  1072,  4540,  1074,   244,  1076,  1077,
+    1078,  4129,  4579,   137,   329,  1083,  1630,   366,  4568,   368,
+     327,  4563,  1589,   322,  1120,   361,   362,  4576,   244,  4564,
+     407,   155,   118,   249,  4082,  4465,   336,   450,   264,   362,
+     159,   381,   126,   392,     8,  4475,   362,    11,   257,  3048,
+    1128,    15,    16,    17,   394,   329,   111,  4059,   454,   441,
+     442,   443,   444,   445,   446,   249,  1578,  4366,   121,  1147,
+     123,   287,   373,   367,   400,  1193,   223,   376,   183,   394,
+     320,  1648,  3898,   382,  1661,   301,   160,   324,   450,  3859,
+      38,   362,   439,   146,   339,   451,   454,   166,   454,  1195,
+    1178,   448,   160,   450,   451,   452,    24,   454,  1204,    88,
+    2428,   351,   432,   448,   450,  1193,   273,   452,  4054,   331,
+     394,   113,  1218,   152,   431,   272,    44,   273,   126,   108,
+     136,  1090,  1405,   180,   114,  1749,   172,   205,   299,   111,
+     271,  1237,   148,   450,  1240,  1241,   126,   153,   203,  1245,
+    1246,   363,   412,  1240,   454,   274,  1382,  1116,  1245,  1246,
+    4702,   140,   388,   287,  1281,  1282,  4462,  1284,   113,  1281,
+    1282,  1266,  1284,   389,   242,   162,   437,   438,   439,   201,
+     441,   442,   443,   444,   445,   446,   260,   273,   272,   244,
+      56,   197,  1977,    26,   454,   231,   249,    24,    64,   136,
+    4566,   254,   260,  1281,  1282,   336,  1284,   150,   200,   150,
+     367,   217,  3844,   329,   248,   187,   180,    44,   365,   324,
+     367,   367,   306,   342,  1450,  1451,  1452,  1453,  3541,    36,
+     178,  4428,  1298,   220,     3,  2545,   258,   201,  2200,  4789,
+     295,  2551,   229,  3810,  4794,  3815,   362,   408,   317,   161,
+     256,  3821,   336,   282,    22,   200,   361,   362,   264,   306,
+      28,  1348,   101,   310,   262,   389,  1492,  1493,   209,  1356,
+     242,   339,   244,   119,  1937,  1501,   194,   121,  4396,   123,
+     217,   367,  1464,   129,  2375,  1511,   402,  3682,   121,   336,
+     345,   327,  1251,  4711,  3507,  4845,   260,   355,   241,   415,
+    3513,  3514,  3794,  3516,   284,  4604,  3798,  1394,  1395,   343,
+     117,    80,   310,  1539,  1540,  1541,  1542,   322,    11,  2379,
+     436,  1343,  2385,   302,  4252,  4629,   394,   380,   229,  4252,
+    4629,   140,  1419,    81,   450,  1422,  1423,   390,   336,  1435,
+    1299,  2303,  2304,  2305,  2306,  2259,  4348,  2168,  4639,  4640,
+     329,  1533,  2102,  2315,   220,  1537,  4906,  1630,   126,   299,
+     112,   109,   131,  2022,   121,   272,   123,  1549,   415,   271,
+    4488,   373,   138,   378,  4492,  4493,  1442,    70,  4341,   366,
+      22,   368,   388,   362,   226,   320,    28,   322,  3794,   436,
+     330,   230,  3798,   232,   286,  1571,  2171,  2643,   322,   272,
+     226,  2719,  3116,  1490,  2179,   392,  2181,  2790,  1634,  1505,
+     254,  1637,  1371,  2345,  3592,   181,   185,  3329,  2168,   331,
+    1379,  1647,   362,   402,   176,  2349,   272,   264,  2100,   336,
+    1656,  3430,   206,   306,   306,  3292,   415,   439,   112,  1535,
+    2190,  1623,   448,   378,  1620,   451,   452,  1409,  1407,  2063,
+     452,   363,  1414,  3159,   378,   306,  1415,   436,     8,  1418,
+     306,    11,  2881,   336,   336,    15,    16,    17,   408,  1651,
+    2220,   450,   384,   437,   438,   439,  1749,   441,   442,   443,
+     444,   445,   446,   375,   126,   336,    22,   244,   112,   326,
+      83,  3652,    28,  3654,  4793,  1454,   244,   254,   324,   272,
+    1587,  1463,   176,  2015,   272,  1467,  2524,  2525,   277,  1468,
+    1597,  2529,  1599,   396,   153,   148,   244,     3,  1694,  1606,
+     329,   249,  1481,   365,   163,    89,   418,  1614,  4819,    11,
+     123,   159,   121,   306,   123,   272,  2891,   310,   306,   365,
+     272,   180,   295,    30,    31,   375,   272,  4317,  2566,  2567,
+     392,    72,   176,   362,   307,   450,   158,   146,    40,  1785,
+      81,   189,  3104,   336,   272,   293,   392,   450,   336,   306,
+     310,  1530,  4574,   415,   306,   417,   204,   450,   180,   332,
+     306,   415,   205,  1661,   217,  1661,   214,  4550,    70,   415,
+     126,   417,  1551,   402,    80,   159,   336,  4379,   306,  1558,
+     154,    88,  2526,  1671,   336,  1673,   415,  1675,   450,  1677,
+     336,  1679,  2331,  1721,  2538,  1683,  4552,     4,   387,   242,
+     454,   108,     9,   256,   450,   189,   395,   436,  4591,   398,
+     272,   185,     0,    89,  1713,  1713,  1713,  1713,  1713,  1713,
+     204,   450,  1708,  4109,   130,  1741,  2570,  2159,  2689,  2729,
+     214,  1738,  1739,   140,  2695,   244,  1662,  2432,  1745,  1746,
+     249,  2971,   111,  4711,   306,   254,  4482,  3031,   320,   321,
+    3034,     8,   295,   417,    11,   239,   315,  4169,    15,    16,
+      17,  2340,  4174,   160,  2608,   289,  1773,  4179,   316,  2352,
+    4182,   308,   436,  3179,   336,    32,   153,  2760,   101,  2699,
+     454,  1660,  1720,   159,   153,  1727,  4476,  2340,   453,  1787,
+     260,  2374,   451,   190,  4206,   454,   339,   174,   148,  3880,
+    3881,   272,  3208,   153,  4032,    64,  2389,  4219,   310,  2392,
+    2393,    70,   378,   189,  2397,  2398,  1832,   223,   187,  1698,
+    1699,  2404,    81,  2402,  4375,   415,   272,  4213,   204,  4215,
+    4058,   154,   316,   162,   336,   306,  1715,  4044,   214,     4,
+    1409,   329,   253,  4169,     9,  1414,   436,    42,  4174,  2402,
+     109,   394,   111,  4179,  4710,  3988,  4182,  3990,  3991,   408,
+     306,  3994,   185,   239,   454,   336,   272,   217,    63,  1531,
+    2063,   380,   329,   242,   362,   244,  3114,   326,   415,  2628,
+    4206,   390,   258,   417,   148,   450,  4588,  2470,  1550,   153,
+     336,   220,  4125,  4219,  1463,   302,  2748,   207,  1467,   436,
+     306,   299,   436,  2005,   310,   362,   256,   230,  2010,   232,
+    2056,  2057,  2014,   373,   402,   153,   450,   454,   417,  2065,
+      72,  2067,   329,   378,   852,  2071,   415,   415,   187,    81,
+     336,   448,   330,  1812,  3354,   452,   174,   436,  2040,   867,
+     316,  2636,   870,  1822,   201,   402,   378,   436,   436,  1956,
+      21,   450,  4642,   217,  4366,   362,    27,  4840,  2054,   365,
+    2777,   367,   450,  1761,   362,  2061,  1764,   437,   438,   439,
+     299,   441,   442,   443,   444,   445,   446,   320,   321,  1956,
+    2082,  2633,  2799,  1982,  1982,   244,  2366,  2367,  2368,   258,
+     249,  3221,   256,   450,   263,   402,  2024,  2099,  2026,   406,
+     445,   451,   308,   260,   454,   450,  2022,   452,   415,   415,
+     408,  2099,   445,  1939,  3014,  2022,  4428,   450,   326,   452,
+     396,   449,   366,  3023,   368,    53,   454,  2129,   287,   436,
+     229,  2177,  3228,  3810,  4890,   136,     5,   366,  3815,   368,
+    4366,    10,   301,   450,  3821,  2022,   449,   148,  2582,    18,
+     258,   454,   153,   229,   366,   263,   368,  2636,  4748,  1938,
+    2162,  1940,   451,   392,  2166,   454,   448,    36,   450,   450,
+     452,   452,  2088,   101,  2162,    13,    14,  4628,  2537,   408,
+    2539,  2540,  2184,     8,   451,    85,    11,   454,  2074,  2235,
+      15,    16,    17,  2195,   183,  3142,   197,  2243,  1977,  2245,
+     451,   174,  4428,   454,   378,  2251,  2208,    32,  2778,    77,
+     451,   451,  3387,   454,   454,  2217,   217,   408,   451,  3403,
+    3404,   454,    52,   246,  2716,  2717,   448,   207,   450,  2217,
+     389,     9,   451,   451,  3330,   454,   454,   451,   451,  3150,
+     454,   454,  2976,  3069,  3070,  4002,   450,  4004,   415,  2732,
+     417,  4008,   326,  4010,   182,   256,   450,  4290,   451,  3434,
+     258,   454,  4395,   264,  2171,   451,   451,  2746,   454,   454,
+     454,   324,  2179,   451,  2181,   450,   454,   452,  2848,  2325,
+     437,   438,   439,  4873,   441,   442,   443,   444,   445,   446,
+     450,    52,  4604,  2746,  3614,   451,   408,   451,   454,  3429,
+     454,  3431,   230,   406,   232,   451,   329,   451,   454,   451,
+     454,   415,   454,   417,   242,   451,   451,  4629,   454,   454,
+    2236,   366,   451,   368,  2807,   454,  2809,   451,  2244,   451,
+     454,   451,   454,    42,   454,  2381,  2252,  2383,  2254,   362,
+     433,   451,   451,   271,   454,   454,  2125,   203,  3186,  3187,
+    3188,  3189,   452,  4334,  3192,  3193,  3194,  3195,  3196,  3197,
+    3198,  3199,  3200,  3201,   258,   451,  4817,  2146,   454,   226,
+    2862,   451,   451,   373,   454,   454,   201,   261,  4604,   402,
+    2872,  3219,   451,   311,     0,   454,  2302,   388,   604,  3519,
+     451,   261,   415,   454,  3146,   451,  4847,   451,   454,   415,
+     454,   417,   451,  4629,  4081,   454,   226,   153,   258,   625,
+    3248,  3249,   451,   436,  3617,   454,  2332,   451,  3600,   366,
+     454,   368,   350,    42,  2340,  2324,  2324,   450,   451,   261,
+     453,   451,  2915,  4252,   454,   260,  2438,  3181,  2921,  2289,
+     433,   451,   451,  2489,   454,   454,   451,   451,   433,   454,
+     454,  3351,  3352,   203,   451,  2362,  2363,   454,  2460,  4745,
+     451,  3000,  2369,   454,  4915,   443,  2468,   324,   649,   650,
+     651,  3215,    88,   654,   655,   656,  2472,   451,   136,   157,
+     454,  4793,  2478,   664,   451,   451,  2402,   454,   454,  2582,
+     148,   451,   454,   451,   454,   153,   454,   450,  2977,  2991,
+    2979,  2993,   451,   451,   324,  2284,    81,   451,   365,    52,
+     454,     0,  3332,   451,     8,   453,  3260,    11,  3379,   158,
+     136,    15,    16,    17,  2977,  2432,  2979,  3665,  3666,  3667,
+     451,   451,   148,   454,   454,   392,   199,   153,   451,   197,
+    3126,   454,   158,   450,   452,   365,    40,   163,   451,  4368,
+     166,   454,    46,   169,   451,   336,  3151,   454,   415,   217,
+     417,  2654,   451,   451,   419,   454,   454,  4793,  3047,   451,
+     451,   453,   392,   454,   136,  3296,    70,  3060,   306,   451,
+     451,   197,   454,   454,   450,   180,   148,   162,  2526,   451,
+     141,   153,   454,   450,  3047,   415,   450,   417,   256,    88,
+     451,   217,   141,   454,  3087,  3088,   264,  3090,   183,  3092,
+    3093,   452,   437,   438,   439,   258,   441,   442,   443,   444,
+     445,   446,  3105,  2619,  3283,   759,   180,   761,  2526,  3799,
+     450,  3801,  2570,   451,   306,   197,   454,  3286,  3287,  3288,
+     256,   451,   258,   451,   454,   220,   454,   136,   264,  3141,
+     226,   451,     0,   451,   454,   217,   454,  4785,   451,   148,
+    3143,   454,   451,   226,   153,   454,   258,   451,   451,   158,
+     454,   454,  2570,   141,   163,   891,  2672,   166,   180,   451,
+     169,   175,   454,  2462,   451,   141,   180,   454,   263,  2587,
+    2613,  2614,  2615,   451,   256,   911,   454,   313,  2700,   258,
+     153,   306,   264,  3541,   920,  2603,   141,   451,   197,  2755,
+     454,  2757,  2758,  2759,   451,  3811,   215,   454,   111,   396,
+    2636,  2619,   216,   258,   450,   378,   253,  2634,   217,  2636,
+     388,   153,   408,   326,   207,   292,   450,  2675,    64,    35,
+      88,  2743,   450,   244,  3840,   419,   362,   226,   324,   258,
+      42,  2650,  2650,  2650,  2650,  2650,  2650,   244,    42,   383,
+     272,   324,   153,   408,   245,   246,   260,   256,   408,   258,
+      77,    48,   388,   153,  2672,   264,   290,  2675,   141,  4313,
+     141,   450,  3499,   405,   141,   450,   283,   141,   136,   365,
+     450,   366,    34,   368,   419,   141,   412,   141,   414,   415,
+     148,   141,   365,   378,   454,   153,   141,   258,   141,   141,
+     158,   258,   141,    90,   389,   163,   392,   392,   166,   141,
+     141,   169,  3960,  3961,   313,  3963,   388,   258,   153,   392,
+    2746,   226,   448,  2612,   362,   451,   452,   453,   115,   415,
+     141,   417,   141,   141,  2846,   324,  3628,   341,   329,   197,
+     450,    35,   415,   130,   417,   215,  2858,   134,   153,   258,
+     153,   450,     5,     5,   450,   450,   153,   450,   226,   217,
+     450,   450,  2965,   362,   450,     5,   450,   154,   450,  2972,
+     157,   362,   450,     5,  1100,  1066,   365,   450,  1069,   450,
+    1071,  3748,  1073,   170,  1075,   450,  2942,   450,  1079,   388,
+     450,   450,   226,  4580,   450,   450,     5,     5,   256,   450,
+     258,   416,  2828,   392,    22,    35,   264,   450,   450,   450,
+      28,   402,   269,   412,   450,   414,   415,   450,   450,   324,
+     450,   450,   226,  2935,   415,   450,   415,   450,   417,   450,
+     434,   199,    92,   437,   438,   439,   454,   441,   442,   443,
+     444,   445,   446,   215,  2870,   436,   454,    35,   153,   448,
+      68,   153,   451,   452,   453,   313,   324,     3,   256,   450,
+     365,   450,   249,   254,   336,   373,   373,   452,   217,   324,
+     257,   373,   324,   373,   373,     8,   373,    23,    11,   439,
+     373,  3735,    15,    16,    17,    81,   324,   392,   258,   212,
+     324,   141,  2918,   373,    54,   328,   373,   365,   249,    32,
+     395,   119,   365,   258,   362,   320,   293,    40,   126,   254,
+     415,   129,   417,    46,  2940,   450,   173,   450,    81,   272,
+     324,  2947,  2948,   454,   392,  2951,   373,    87,   141,   373,
+     388,   365,  2958,   373,    80,   180,   154,    70,  3094,  2965,
+    3096,   103,    52,  3999,  3100,   450,  2972,   415,  2965,   417,
+     396,  2977,   373,  2979,   412,  2972,   414,   415,   392,   396,
+     373,   365,  3564,  3565,    52,  3670,   373,   185,    41,   262,
+     365,  2860,   373,   373,   373,  3577,    41,  2994,   324,   454,
+     373,   415,   450,   417,   144,   131,   258,   373,   392,   373,
+     448,  3017,  3104,   451,   452,   453,   373,   373,  3154,   201,
+     419,   201,   258,   258,   201,   415,    35,  3119,    24,   450,
+    3116,   415,   258,   417,   141,   244,   450,   177,   109,   141,
+    3046,  3047,   450,   396,   242,   407,   244,   254,  3037,  3037,
+    4040,   223,  3144,   244,   180,    35,   254,   244,   153,   185,
+       8,    35,   175,    11,   262,   325,   450,   180,   207,  3066,
+    3059,  3059,   212,    34,   272,   371,  3649,   371,   450,  4299,
+     450,  4353,   336,   448,  3657,  3658,  3659,  3660,   201,   202,
+     448,   450,    40,   373,   373,   373,   373,  1403,    46,   141,
+     141,   396,   141,   216,   244,   396,   141,     8,   306,   141,
+      11,   309,   310,   411,  2983,  2984,  3865,     8,   253,  3256,
+      11,   248,    70,   373,    15,    16,    17,   158,   450,    11,
+    2999,   236,   272,   236,   247,   454,   450,   371,   336,    40,
+     450,    32,   373,   166,   149,    46,  3015,   260,   158,   454,
+    3126,   277,   375,   173,  3151,  3024,  3025,   173,   451,   197,
+     450,   339,   454,  3836,    35,   205,   306,   259,   454,    70,
+     310,    52,  3041,   266,   314,  4799,  4800,  1483,   396,   451,
+     324,   321,   450,   373,  3270,   396,  3272,   373,   328,   249,
+     324,   317,  1498,  4421,   205,   249,   336,  4125,   205,   373,
+     373,   399,   373,   450,  4432,   408,  4134,   326,   348,   378,
+     153,  1517,   207,   249,   258,    42,   356,   345,   215,   320,
+     257,   215,     8,   215,  3230,    11,  3254,   175,   341,    15,
+      16,    17,   180,   134,   360,   373,  3372,  3373,  3374,  3375,
+     365,   454,   373,   324,  3272,   258,    32,  3430,   306,  3262,
+    3263,  3264,  3265,   174,     8,   306,   333,    11,  1564,   373,
+     201,   387,   373,    35,  3350,  4301,  3254,   295,   216,   395,
+     410,  1577,   398,  3142,   175,   201,   201,   201,   396,   180,
+    4508,   396,  3270,  1589,  3272,   207,    40,   201,   257,   439,
+    3382,   439,    46,   141,   153,  1601,   408,   153,   155,   254,
+     333,  4925,  4926,  3876,  3828,   450,   141,   141,   244,   450,
+     201,   415,   260,  3895,  3999,   216,    70,    35,   258,  4309,
+    4310,   434,   207,   258,   437,   438,   439,   244,   441,   442,
+     443,   444,   445,   446,   171,  3908,  3909,   153,   171,  1645,
+      35,   451,  1648,   451,   433,   433,   327,   234,   448,   141,
+     258,   258,   451,   451,   451,   207,   258,   333,   153,   260,
+     244,   180,   180,   180,   419,    23,   164,   454,   454,   260,
+    3952,   454,   373,   158,   450,   233,   454,    52,   258,   378,
+     134,   415,  4610,   362,   253,   207,   408,  3479,   451,   451,
+    3482,   158,   451,   341,   451,   451,  4025,   269,  3267,  3268,
+    3269,   451,   451,  3539,   450,   158,   454,   433,   451,  3982,
+    3983,   276,   412,   373,   268,   201,   394,   435,   225,   412,
+     450,   175,   451,    22,  3430,    24,   180,   451,   258,    28,
+    3999,   402,   451,  3430,    33,    34,    35,   451,    37,    52,
+     341,    40,    41,   258,    43,   258,    45,   450,   450,   439,
+    4189,   261,   450,  3459,   183,   141,  3462,  4196,  3464,   450,
+     373,  3458,   216,   450,   450,   419,  4208,  4395,   373,   373,
+     191,  1777,  4296,   249,   260,   373,   141,   328,   262,   141,
+     215,   328,   328,   183,   373,   396,   434,  3579,  4489,   217,
+     277,  3458,   324,   441,   442,   443,   444,   445,   446,   277,
+     393,  3507,   227,   373,   227,   373,   260,  3513,  3514,   373,
+    3516,   373,  3518,   227,   244,   324,  4089,  4490,   373,  4092,
+    4093,   324,   324,   373,   373,   336,  3523,  3524,   373,  4519,
+     373,   373,   373,   434,  4504,  4108,  4506,   141,    41,     3,
+     441,   442,   443,   444,   445,   446,   437,   438,   439,   373,
+     441,   442,   443,   444,   445,   446,   201,   201,   201,   373,
+     201,   451,   450,   383,    42,   451,  4400,   373,   308,   102,
+     257,   454,   451,   450,   258,   451,   454,    35,   141,   373,
+     141,  3673,   153,   168,   451,    62,   449,   341,   187,   188,
+     189,   190,   396,   192,   141,   194,   449,   196,   324,   198,
+     396,   261,   201,   139,   324,  4439,   333,  3613,   207,   324,
+     454,   210,   139,   201,   201,   214,   132,   216,   201,     8,
+    3609,  3609,    11,  4843,   158,   448,    15,    16,    17,    11,
+     269,   153,   407,   454,  4670,   158,   264,  4332,   412,   451,
+     158,   166,   259,   451,   313,  3828,   451,    79,   436,   383,
+     451,   437,   438,   439,   451,   441,   442,   443,   444,   445,
+     446,   450,   153,   454,   454,    35,   207,   450,  3537,   451,
+     451,  4253,   451,  3670,   396,   373,  4415,   450,  3547,   396,
+     434,  3687,   191,    52,  3690,  4905,  3692,   441,   442,   443,
+     444,   445,   446,   365,   450,   383,  4220,   328,   324,   373,
+     373,   324,   373,   373,  4924,   373,   451,   451,  3794,   451,
+     306,   450,  3798,  3582,   415,    52,   365,   153,    70,   141,
+     383,   102,   201,   205,   415,   201,   201,     8,   201,   291,
+      11,   450,  4301,   186,   419,   451,   153,   450,   450,  4263,
+      35,  3610,   451,   454,   454,    75,   365,   454,   450,   383,
+     454,   373,  2058,   450,   333,   451,   449,   163,   102,    40,
+     158,   201,   201,   201,  2070,    46,   201,  4601,   451,   450,
+     158,   451,   300,     8,    52,   413,    11,   413,   454,  4613,
+      15,    16,    17,   269,  4618,   451,  4620,   451,   204,    70,
+     451,   450,   204,   450,   364,  3664,   267,   450,   265,    52,
+     451,  2107,   169,   451,   451,   254,  3794,   439,   383,   373,
+    3798,   158,   201,   415,    70,  4388,   249,  3823,   249,  3825,
+     185,   439,    52,   365,   454,  4826,  3962,   454,   373,   373,
+    3922,    64,   141,   373,   160,   201,   158,   396,     8,  3857,
+    3976,    11,  3934,   450,   180,    15,    16,    17,   333,  3838,
+    3838,    35,   244,   134,   127,     8,   411,   396,    11,   415,
+      35,   415,   158,   258,   450,   153,   199,   188,   261,   158,
+      40,   260,   450,   450,   300,   401,    46,   349,   451,   451,
+     204,   275,   450,   450,   414,    54,   451,    40,    81,   373,
+    4463,   122,   450,    46,   175,   258,   301,   116,   451,   180,
+      70,   450,   450,   373,   450,   153,   249,  3904,  3777,  3778,
+    3779,  3780,    35,   228,   249,   183,   291,    70,    87,   450,
+     141,  4057,   451,   140,    35,   321,   450,   383,  3925,  3926,
+     450,   262,   451,  3930,  3931,   216,  4509,  3904,   321,   347,
+     347,  4027,    52,   451,   543,    52,    35,   451,   450,   548,
+     450,   550,   450,   450,   553,   454,   555,   451,   557,   396,
+    2266,   450,   365,   365,   258,   564,   201,   242,   365,   568,
+     451,     5,   291,  3979,  3980,   144,   575,    64,   261,   260,
+     147,   134,  3988,    64,  3990,  3991,   122,   415,  3994,   400,
+     415,   401,   300,  3999,   454,   450,   450,  4003,    35,   598,
+     158,   365,  3999,   412,   603,   175,   298,   336,   177,   608,
+     180,   153,  4641,   612,   127,   258,   258,  4109,    35,   185,
+     450,   333,   175,    35,   261,   260,   450,   180,   160,   261,
+     629,   201,   202,   160,    52,   320,   451,  4220,   451,   114,
+     394,     5,   307,   212,   320,  4051,   216,   451,   437,   438,
+     439,   450,   441,   442,   443,   444,   445,   446,    21,   450,
+     341,    32,   140,   216,   450,   450,   373,  4056,  4056,  4252,
+     454,   291,   158,   347,  4080,   244,   454,   247,   347,   678,
+    4263,   415,   450,  4169,   160,  4221,  4222,  4223,  4174,   160,
+     260,  2287,   691,  4179,   693,   415,  4182,  4183,  1466,   859,
+     756,  4670,  2799,   858,  4110,  2636,  2141,   260,  4114,  4115,
+    1246,  4117,  3429,  4637,   713,   714,   819,   716,   717,  2212,
+    4206,  4213,   721,  4215,  2963,  3518,  4511,  4299,  4670,  4349,
+    3562,  4353,  4018,  4219,  4331,  2723,   735,  4752,  2420,  4219,
+     739,   310,  4823,   312,  4684,   314,   745,  4683,  2454,  4772,
+    2727,  3610,   321,   434,  3595,  3554,  2277,  2277,   757,   328,
+     441,   442,   443,   444,   445,   446,  3424,   336,  3578,  2475,
+     769,   341,  2823,  1536,  2271,  4043,  4262,  4831,  3016,   348,
+    2486,  4924,  4905,  4326,  2971,  4783,  4174,   356,   341,  2967,
+    4265,  4179,     8,  4656,  4182,    11,  4762,  1525,  4268,    15,
+      16,    17,   437,   438,   439,    27,   441,   442,   443,   444,
+     445,   446,  3673,   812,  4461,  1996,  3617,  4086,  1092,  4580,
+    4208,  2698,   595,  4201,    40,  1716,  1716,  4313,  4364,   828,
+      46,  1717,  2919,   623,   833,   834,  4798,  1103,  4908,   734,
+    1939,   410,  1327,  1940,  2650,  4818,  4252,  3598,  3839,  4744,
+    3327,  1272,  1662,  1223,    70,  4252,  2651,  1980,  2662,   858,
+     859,  4737,    25,  1290,   434,  3295,  1291,   437,   438,   439,
+    4622,   441,   442,   443,   444,   445,   446,  2657,  3824,  1979,
+    4366,   434,  2672,  3272,  4290,   884,  3785,  1293,   441,   442,
+     443,   444,   445,   446,  3800,  4301,   895,  4429,  3270,  4305,
+     899,  4307,  4604,  4603,  3328,  4311,  4312,  1594,  3075,    72,
+    1298,     8,  3223,  4398,    11,   914,  4198,  4740,    15,    16,
+      17,  4741,  4727,  2497,  2587,  2654,  1810,  2585,    -1,    -1,
+     929,    -1,    -1,    -1,  4470,    32,    -1,   936,   937,  1813,
+     103,    -1,  4428,    40,    -1,    -1,    -1,  4336,  4336,    46,
+      -1,    -1,    -1,    -1,   953,   954,   955,    -1,   957,   175,
+     959,   124,    -1,    -1,   180,    -1,    -1,    -1,    -1,  4505,
+      -1,  4507,   135,    70,  4363,  4363,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   201,   202,    -1,    -1,    -1,
+      -1,    -1,   155,    -1,    -1,    -1,    -1,   160,    -1,    -1,
+     216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4439,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1025,    -1,  1027,  1028,
+    4458,   247,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4428,    -1,    -1,  2749,   260,   208,    -1,  4316,    -1,    -1,
+      -1,  4439,  4538,    -1,  4637,    -1,  1055,    -1,    -1,    -1,
+    2766,    -1,    -1,  4332,    -1,    -1,   229,    -1,    -1,    -1,
+    4458,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   175,    -1,
+      -1,    -1,    -1,   180,    -1,    -1,  1085,  1086,    -1,    -1,
+      -1,  1090,    -1,  1092,    -1,    -1,  4365,    -1,    -1,  4635,
+      -1,    -1,    -1,    -1,   201,   202,  4512,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1113,    -1,    -1,  1116,  4604,   216,
+    1119,    -1,    -1,    -1,    -1,   341,    -1,   290,    -1,    -1,
+      -1,    -1,    -1,  1132,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4629,    -1,    -1,    -1,    -1,    -1,  2855,
+     247,  2857,    -1,    -1,   317,     8,    -1,  4693,    11,    -1,
+      -1,   324,  1161,   260,    -1,    -1,   263,   330,    -1,    -1,
+      -1,    -1,  4561,  4561,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,
+    1189,  1190,  1191,    46,  1193,    -1,    -1,    -1,    -1,   362,
+      -1,    -1,   365,    -1,    -1,  4474,    -1,    -1,    -1,    -1,
+    2916,    -1,    -1,  4699,  1213,    -1,    -1,    70,   434,    -1,
+     383,   437,   438,   439,    -1,   441,   442,   443,   444,   445,
+     446,  4767,    -1,    -1,    -1,  2941,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   341,   408,    -1,    -1,    -1,    -1,
+      -1,    -1,  1251,  4745,    -1,  1254,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4670,    -1,    -1,    -1,    -1,    -1,
+      -1,  4757,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   134,    -1,    -1,  1283,  4554,    -1,    -1,  1287,  1288,
+      -1,  4827,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1298,
+    1299,  1300,    -1,    -1,    -1,    -1,    -1,  4793,    -1,    -1,
+      -1,    -1,    -1,  4799,  4800,    -1,    -1,    -1,    -1,    -1,
+      -1,  1320,   175,    -1,  3030,    -1,    -1,   180,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,
+     437,   438,   439,    -1,   441,   442,   443,   444,   445,   446,
+      -1,    -1,   449,    -1,    -1,  3061,    -1,    -1,   455,  1358,
+      -1,    -1,    -1,   216,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1371,  1372,    -1,    -1,    -1,    -1,    -1,    -1,
+    1379,    -1,    -1,  1382,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4784,  4784,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1405,   260,  1407,  4798,
+    4798,  4798,  4798,  4798,  4798,    -1,  1415,    -1,    -1,  1418,
+      -1,  4849,    -1,    -1,    -1,    -1,    -1,  4913,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4843,    -1,  4925,
+    4926,    -1,    -1,  1442,    -1,    -1,  4843,    -1,    -1,    -1,
+      -1,  1450,  1451,  1452,  1453,  1454,    -1,    -1,  3164,    -1,
+    4849,  4849,  4849,  4849,  4849,  4849,    -1,    -1,    -1,  1468,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3185,
+    1479,    -1,  1481,    -1,    -1,    -1,    -1,    -1,   341,    -1,
+      -1,    -1,    -1,  1492,  1493,    -1,    -1,    -1,    -1,  4905,
+      -1,    -1,  1501,    -1,  3210,    -1,    -1,    -1,  4905,    -1,
+      -1,    -1,  1511,    -1,    -1,    -1,    -1,    -1,  4924,  4908,
+    4908,  4908,  4908,  4908,  4908,    -1,    -1,  4924,    -1,    -1,
+      -1,  1530,    -1,    -1,    -1,    -1,    -1,    -1,  3244,    -1,
+    1539,  1540,  1541,  1542,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1551,    -1,    -1,    -1,    -1,    -1,    -1,  1558,
+      -1,    -1,  1561,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1571,    -1,    -1,     8,    -1,    -1,    11,  1578,
+      -1,   434,    -1,    -1,  1583,    -1,    -1,    -1,   441,   442,
+     443,   444,   445,   446,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     8,    -1,    -1,    11,    -1,    40,    -1,    15,
+      16,    17,    -1,    46,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1620,    -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,
+      -1,  1630,    -1,    -1,    40,  1634,    -1,    70,  1637,    -1,
+      46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1647,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1655,  1656,    -1,    -1,
+      -1,  1660,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     8,    -1,    -1,    11,    -1,    -1,    -1,    15,
+      16,    17,    -1,    -1,    -1,    -1,  1685,    -1,    -1,    -1,
+      -1,    -1,    -1,  1692,    -1,  1694,    32,    -1,    -1,  1698,
+    1699,   134,  1701,    -1,    40,    -1,    -1,    -1,    -1,  1708,
+      46,    -1,    -1,    -1,    -1,    -1,  1715,    -1,    -1,    -1,
+      -1,  1720,  1721,    -1,    -1,  1724,    -1,    -1,    -1,  1728,
+      -1,  1730,    -1,    -1,    70,    -1,  1735,  1736,    -1,    -1,
+      -1,    -1,   175,  1742,  1743,  1744,    -1,   180,    -1,  1748,
+    1749,  1750,  1751,  1752,  1753,  1754,  1755,    -1,  1757,    -1,
+    1759,  1760,    -1,    -1,  1763,    -1,    -1,    -1,    -1,   175,
+      -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,  1778,
+    1779,  1780,  1781,   216,    -1,    -1,  1785,  1786,    -1,    -1,
+      -1,  1790,    -1,    -1,  1793,   201,   202,  1796,  1797,  1798,
+    1799,  1800,  1801,  1802,  1803,  1804,    -1,  1806,    -1,    -1,
+     216,    -1,    -1,  1812,  1813,    -1,  1815,    -1,    -1,    -1,
+      -1,    -1,    -1,  1822,    -1,    -1,    25,   260,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   175,
+      -1,   247,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   260,    -1,    -1,   263,    -1,    58,
+      -1,    -1,  3568,    -1,    -1,   201,   202,    -1,    -1,    -1,
+      -1,    -1,    71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     216,    -1,    -1,    -1,    -1,    -1,    85,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   341,    -1,
+      -1,   247,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   260,   124,    -1,   263,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   341,   135,    -1,    -1,  1938,
+      -1,  1940,    -1,  1942,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   155,    -1,    -1,    -1,
+       8,   160,    -1,    11,    -1,    -1,    -1,    15,    16,    17,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1977,    -1,
+      -1,    -1,    -1,    -1,    32,  1984,    -1,  1986,    -1,    -1,
+      -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    46,    -1,
+      -1,   434,    -1,    -1,    -1,   341,    -1,    -1,   441,   442,
+     443,   444,   445,   446,    -1,    -1,  2015,    -1,    -1,    -1,
+      -1,    -1,    70,    -1,    -1,  2024,    -1,  2026,   434,    -1,
+     229,   437,   438,   439,    -1,   441,   442,   443,   444,   445,
+     446,    -1,    -1,    -1,  2043,    -1,    -1,    -1,   454,    -1,
+      -1,    -1,  3758,    -1,    -1,  2054,    -1,  2056,  2057,    -1,
+      -1,   260,  2061,    -1,  2063,    -1,  2065,    -1,  2067,    -1,
+      -1,    -1,  2071,    -1,    -1,  2074,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   290,    -1,    -1,  2093,    -1,    -1,    -1,   434,    -1,
+      -1,   437,   438,   439,  2103,   441,   442,   443,   444,   445,
+     446,  2110,    -1,    -1,    -1,    -1,    -1,  2116,   454,    -1,
+      -1,    -1,    -1,    -1,    -1,   324,  2125,   175,    -1,    -1,
+      -1,   330,   180,    -1,   333,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2146,    -1,    -1,
+      -1,  2150,  2151,   201,   202,    -1,    -1,    -1,    -1,    -1,
+    2159,  2160,    -1,   362,    -1,    -1,    -1,    -1,   216,    -1,
+     369,    -1,  3878,    -1,    -1,    -1,    -1,   376,  2177,    -1,
+      -1,    -1,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    35,    -1,    -1,    -1,   247,
+      -1,  3907,    -1,    -1,    -1,  2204,    -1,  2206,  2207,   408,
+      -1,    -1,   260,    -1,    54,   263,    -1,    -1,    -1,    -1,
+      -1,  3927,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2235,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2243,    -1,  2245,    87,    -1,    -1,
+      -1,    -1,  2251,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2265,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3981,    -1,    -1,    -1,    -1,
+    2279,    -1,    -1,  2282,    -1,  2284,    -1,    -1,  2287,    -1,
+      -1,  2290,    -1,   341,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   144,    -1,     3,    -1,    -1,    -1,
+      -1,     8,    -1,    -1,    11,    -1,    -1,  2316,    15,    16,
+      17,    -1,    -1,    -1,    -1,    -1,  2325,  2326,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    32,    -1,   177,    35,    -1,
+      -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    46,
+    2349,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2364,    -1,   207,    -1,    -1,
+      -1,    -1,   212,    70,    -1,    -1,    -1,  4083,    -1,    -1,
+    2379,     0,  2381,  2382,  2383,  2384,   434,    -1,    -1,   437,
+     438,   439,    -1,   441,   442,   443,   444,   445,   446,    18,
+      -1,    -1,    -1,   451,   244,    -1,    -1,    -1,  2407,    28,
+      -1,    30,    31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2420,    -1,  4129,    -1,    -1,    45,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    65,    -1,    67,    68,
+      -1,    -1,    -1,    -1,    73,    -1,    75,    -1,    -1,    -1,
+      -1,    -1,    -1,  2462,    -1,    -1,    -1,    86,    -1,    88,
+     310,    -1,    -1,  2472,   314,    -1,    -1,    -1,   175,  2478,
+      -1,   321,    -1,   180,    -1,    -1,   105,    -1,   328,   108,
+    2489,    -1,    -1,    -1,    -1,    -1,   336,  2496,    -1,    -1,
+      -1,   120,  2501,   122,   201,   202,    -1,   126,   348,    -1,
+      -1,    -1,    -1,   132,    -1,    -1,   356,    -1,    -1,   216,
+      -1,   140,    -1,   142,    -1,  2524,  2525,  2526,    -1,   148,
+    2529,    -1,    -1,    -1,    -1,    -1,   376,    -1,  2537,  2538,
+    2539,  2540,    -1,    -1,   163,    -1,    -1,    -1,    -1,    -1,
+     247,  2550,    -1,    -1,  2553,    -1,  2555,    -1,    -1,    -1,
+     179,    -1,    -1,   260,    -1,    -1,   263,  2566,  2567,    -1,
+     410,  2570,    -1,    -1,   414,   415,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2582,    -1,  2584,    -1,  2586,    -1,  2588,
+      22,    -1,    -1,    -1,    -1,    -1,    28,    -1,    -1,   218,
+     219,    -1,    -1,    -1,    -1,   224,    -1,    -1,    -1,  2608,
+      -1,    -1,    -1,  2612,    -1,    -1,   235,    -1,    -1,    -1,
+    2619,    53,  2621,  2622,  2623,    -1,    -1,   246,    -1,    -1,
+       8,    -1,    -1,    11,    -1,    -1,    68,    15,    16,    17,
+    2639,    -1,    -1,    -1,   341,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2651,    -1,    32,    -1,    -1,  2656,    -1,    -1,
+      -1,    -1,    40,  2662,    -1,    -1,   285,    -1,    46,   101,
+      -1,    -1,    -1,  2672,    -1,    -1,  2675,    -1,   297,  2678,
+      -1,  2680,    -1,   302,   303,    -1,   305,   119,    -1,    -1,
+    4396,   310,    70,    -1,   126,    -1,   315,   129,    -1,   318,
+      -1,    -1,    -1,    -1,   323,    -1,    -1,    -1,    -1,   328,
+     329,    -1,    -1,    -1,    -1,    -1,    -1,   336,    -1,    -1,
+      -1,   340,   154,  2722,    -1,  2724,    -1,    -1,  4434,    -1,
+    2729,   350,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,
+     437,   438,   439,   362,   441,   442,   443,   444,   445,   446,
+     182,    -1,    -1,   185,    -1,    -1,  2755,    -1,  2757,  2758,
+    2759,    35,   381,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   391,    -1,    -1,    -1,    -1,    -1,   397,    -1,
+      54,    -1,  4488,   402,    -1,    -1,  4492,  4493,    -1,    22,
+      -1,    -1,    -1,    -1,    -1,    28,   415,   175,   230,    -1,
+     232,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     242,    -1,   244,    87,    -1,    -1,    -1,   436,    -1,    -1,
+      -1,    -1,   254,   201,   202,    -1,    -1,    -1,    -1,    -1,
+     262,   450,    -1,    -1,   453,    68,    -1,    -1,   216,   271,
+     272,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2860,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   247,
+     144,    -1,    -1,    -1,   306,  4581,    -1,   309,   310,   311,
+      -1,    -1,   260,    -1,    -1,   263,   119,    -1,    -1,    -1,
+      -1,    -1,    -1,   126,    -1,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,    -1,   177,   336,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   350,    -1,
+      -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   207,    -1,    -1,    -1,    -1,   212,    -1,
+      -1,    -1,    -1,  2942,    -1,    -1,    -1,    -1,    -1,    -1,
+    2949,  2950,   185,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   341,    -1,    -1,     8,   399,    -1,    11,
+     244,    -1,    -1,    15,    16,    17,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2983,  2984,    -1,    -1,    -1,    -1,
+      32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,
+    2999,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,   242,
+      -1,   244,    -1,    -1,    -1,  3014,  3015,    -1,    -1,    -1,
+      -1,   254,    -1,    -1,  3023,  3024,  3025,    -1,    70,   262,
+      -1,    -1,    -1,    -1,    -1,    -1,   310,    -1,    -1,   272,
+     314,    -1,  3041,    -1,    -1,    -1,    -1,   321,    -1,    -1,
+      -1,    -1,    -1,    -1,   328,    -1,   434,    -1,    -1,   437,
+     438,   439,   336,   441,   442,   443,   444,   445,   446,    -1,
+      -1,    -1,     8,   451,   348,    11,   309,   310,    -1,    15,
+      16,    17,   356,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3094,    32,  3096,    -1,    -1,
+      -1,  3100,   376,   336,    40,    35,    -1,    -1,    -1,    -1,
+      46,    -1,    -1,    -1,    -1,    -1,    -1,  3116,    -1,    -1,
+      -1,    -1,    -1,    -1,    54,    -1,    -1,  3126,    -1,    -1,
+      -1,    -1,    -1,   175,    70,    -1,   410,    -1,   180,    -1,
+     414,    -1,    -1,  3142,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3154,    -1,    87,    -1,   201,
+     202,    -1,  3161,    -1,    -1,    -1,   399,    -1,    -1,    -1,
+      -1,  3170,    -1,    -1,   216,    -1,    -1,  3176,    -1,  3178,
+      -1,    -1,  3181,    -1,    -1,    -1,    -1,  3186,  3187,  3188,
+    3189,    -1,    -1,  3192,  3193,  3194,  3195,  3196,  3197,  3198,
+    3199,  3200,  3201,    -1,    -1,   247,  3205,  3206,    -1,    -1,
+      -1,    -1,    -1,    -1,   144,    -1,  3215,    -1,   260,    -1,
+    3219,   263,    -1,    -1,  3223,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3231,    -1,    -1,  3234,    -1,  3236,    -1,   175,
+      -1,    -1,    -1,    -1,   180,    -1,  3245,   177,    -1,  3248,
+    3249,    -1,    -1,    -1,  3253,  3254,    -1,    -1,    -1,  3258,
+      -1,  3260,    -1,    -1,    -1,   201,   202,    -1,  3267,  3268,
+    3269,  3270,    -1,  3272,  3273,    -1,    -1,   207,  3277,  3278,
+     216,     8,   212,    -1,    11,  3284,    -1,    -1,    15,    16,
+      17,  3290,  3291,  3292,    -1,    -1,    -1,    -1,    -1,   341,
+      -1,    -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,
+      -1,   247,    -1,    40,   244,    -1,    -1,  3316,    -1,    46,
+      -1,    -1,    -1,    -1,   260,    -1,    -1,   263,  3327,    -1,
+    3329,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3350,  3351,  3352,    -1,  3354,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    13,  3372,  3373,  3374,  3375,    -1,    19,    -1,
+     310,    -1,    -1,    -1,   314,    -1,    -1,    -1,    29,    -1,
+      -1,   321,   434,    -1,    -1,   437,   438,   439,   328,   441,
+     442,   443,   444,   445,   446,   341,   336,    48,    49,   451,
+      -1,    -1,  3411,    -1,    -1,    -1,    -1,    -1,   348,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   356,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   376,    -1,   175,    -1,
+      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   201,   202,    -1,    -1,    -1,    -1,
+     410,    -1,    -1,    -1,   414,    -1,    -1,    -1,    -1,   216,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3496,   434,    -1,
+      -1,   437,   438,   439,    -1,   441,   442,   443,   444,   445,
+     446,    -1,    -1,    -1,    -1,   451,    -1,    -1,    -1,    -1,
+     247,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   260,    -1,    -1,   263,    -1,  3537,    25,
+    3539,    -1,  3541,    -1,    -1,    -1,    -1,    -1,  3547,    -1,
+      -1,    -1,    -1,   194,  3553,    -1,    -1,    -1,    -1,    -1,
+      -1,   202,    -1,  3562,   205,   206,    -1,   208,     8,    -1,
+     211,    11,   213,    -1,    -1,    15,    16,    17,    -1,    -1,
+      -1,    -1,    -1,  3582,    -1,    71,    -1,    -1,    -1,    -1,
+      -1,    -1,    32,  3592,    -1,    -1,    -1,    -1,    -1,    85,
+      40,  3600,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,
+      -1,  3610,    -1,    -1,   341,  3614,    -1,   103,    -1,  3618,
+    3619,    -1,    -1,   109,    -1,    -1,    -1,    -1,    -1,    -1,
+      70,    -1,    -1,    -1,     8,    -1,    -1,    11,   124,    -1,
+      -1,    15,    16,    17,    -1,    -1,    -1,    -1,    -1,   135,
+      -1,    -1,    -1,  3652,    -1,  3654,    -1,   143,    32,    -1,
+      -1,    -1,    -1,    -1,    -1,  3664,    40,    -1,    -1,   155,
+      -1,    -1,    46,    -1,   160,    -1,    -1,    -1,    -1,    -1,
+     166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3694,    70,   183,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3705,   434,    -1,    -1,
+     437,   438,   439,    -1,   441,   442,   443,   444,   445,   446,
+      -1,    -1,   208,    -1,   451,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   175,  3735,    -1,    -1,    -1,
+     180,    -1,    -1,   229,    -1,    -1,  3745,  3746,    -1,    -1,
+      -1,    -1,    -1,  3752,  3753,    -1,    -1,    -1,  3757,    -1,
+      -1,   201,   202,  3762,    -1,    -1,  3765,  3766,    -1,    -1,
+      -1,  3770,  3771,    -1,   260,    -1,   216,  3776,  3777,  3778,
+    3779,  3780,    -1,    -1,    -1,  3784,  3785,    -1,  3787,    -1,
+      -1,  3790,    -1,    -1,   280,  3794,    -1,    -1,    -1,  3798,
+      -1,   175,    -1,    -1,   290,  3804,   180,   247,    -1,    -1,
+      -1,  3810,    -1,    -1,    -1,    -1,  3815,    -1,    -1,    -1,
+     260,    -1,  3821,   263,    -1,    -1,    -1,   201,   202,  3828,
+      -1,   317,    -1,    -1,    -1,    -1,   322,  3836,   324,    -1,
+    3839,    -1,   216,    -1,   330,  3844,    -1,   333,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3857,    -1,
+      -1,  3860,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   247,    -1,   361,   362,    -1,    -1,   365,
+      -1,  3880,  3881,   369,    -1,    -1,   260,    -1,    -1,   263,
+      -1,    -1,   378,    -1,    -1,    -1,    -1,   383,    -1,    -1,
+      -1,   341,    -1,    -1,    -1,    -1,  3905,    -1,    -1,   395,
+     551,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   559,    -1,
+      -1,    -1,   408,    -1,    -1,   566,    -1,    -1,   569,   570,
+      -1,    -1,    -1,   574,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3942,   585,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     8,   599,    -1,
+      11,    -1,    -1,  3962,    15,    16,    17,   341,    -1,    -1,
+      -1,    -1,    -1,   614,    -1,   616,    -1,  3976,   619,    -1,
+     621,    32,    -1,   624,    -1,    -1,    -1,    -1,    -1,    40,
+      -1,    -1,    -1,    -1,   434,    46,    -1,   437,   438,   439,
+      -1,   441,   442,   443,   444,   445,   446,    -1,    -1,    -1,
+      -1,   451,    -1,    -1,    -1,    -1,    -1,  4016,    -1,    70,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4027,    -1,
+      -1,    -1,    -1,  4032,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4040,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   692,    -1,    -1,    -1,    -1,    -1,    -1,  4057,  4058,
+     434,    -1,    -1,   437,   438,   439,    -1,   441,   442,   443,
+     444,   445,   446,    -1,    -1,    -1,    -1,   451,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4086,    -1,    -1,
+      -1,    -1,    -1,     8,    -1,    -1,    11,    -1,    -1,    -1,
+      15,    16,    17,    -1,    -1,    -1,   747,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,    -1,
+      -1,    -1,    -1,    -1,   175,    40,  4125,    -1,    -1,   180,
+      -1,    46,    -1,    -1,    -1,  4134,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     201,   202,  4151,  4152,    -1,    70,  4155,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   216,   807,    -1,    -1,    -1,
+    4169,  4170,    -1,    -1,    -1,  4174,    -1,    -1,    -1,    -1,
+    4179,    -1,    -1,  4182,  4183,    -1,  4185,    -1,  4187,    -1,
+      -1,  4190,  4191,    -1,    -1,    -1,   247,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4206,    -1,   260,
+      -1,    -1,   263,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4219,  4220,  4221,  4222,  4223,    -1,    -1,    -1,    -1,    -1,
+       8,    -1,   873,    11,    -1,    -1,    -1,    15,    16,    17,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   888,    -1,    -1,
+      -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,   900,
+     175,   902,    40,  4262,  4263,   180,    -1,    -1,    46,   910,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   922,    -1,    -1,   925,    -1,   201,   202,    -1,    -1,
+     341,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4309,  4310,    -1,    -1,  4313,    -1,    -1,  4316,    -1,   960,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4326,    -1,    -1,
+      -1,    -1,   247,  4332,    -1,  4334,    -1,    -1,    -1,    -1,
+      -1,  4340,    -1,    -1,     8,   260,    -1,    11,   263,    -1,
+      -1,    15,    16,    17,  4353,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4364,  4365,  4366,    32,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,
+      -1,    -1,    46,   434,    -1,    -1,   437,   438,   439,    -1,
+     441,   442,   443,   444,   445,   446,  4395,   175,    -1,  4398,
+     451,  4400,   180,    -1,    -1,    -1,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   201,   202,  4424,   341,    -1,    -1,  4428,
+      -1,    -1,    -1,  4432,    -1,    -1,    -1,    -1,   216,    -1,
+    4439,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4448,
+      -1,    -1,    -1,  1094,    -1,    -1,    -1,    -1,    -1,  4458,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   247,
+      -1,  4470,    -1,    -1,    -1,  4474,    -1,    -1,    -1,    -1,
+      -1,    -1,   260,    -1,    -1,   263,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4497,    -1,
+      -1,    -1,    -1,    -1,    -1,  4504,  4505,  4506,  4507,    -1,
+      -1,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,   434,
+    4519,    -1,   437,   438,   439,    -1,   441,   442,   443,   444,
+     445,   446,    -1,    -1,    -1,    -1,   451,   201,   202,  4538,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   216,    -1,    -1,  4554,    -1,    -1,    -1,    -1,
+    4559,    -1,    -1,   341,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   247,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   260,    -1,    -1,   263,
+      -1,    -1,  4601,    -1,    -1,  4604,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4613,    -1,    -1,    -1,    -1,  4618,
+      -1,  4620,    -1,  4622,    -1,    -1,    -1,    -1,    -1,    -1,
+    4629,  1272,  1273,    -1,    -1,    -1,  4635,    -1,  4637,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4647,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,   437,
+     438,   439,    -1,   441,   442,   443,   444,   445,   446,    -1,
+      -1,    -1,    -1,   451,    -1,    -1,    -1,   341,     8,    -1,
+      -1,    11,    -1,    -1,    -1,    15,    16,    17,    -1,    -1,
+      -1,    -1,    -1,    -1,  4693,    -1,    -1,    -1,     8,    -1,
+    4699,    11,    32,  1344,    -1,    15,    16,    17,    -1,    -1,
+      40,    -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,
+      -1,    -1,    32,    -1,    -1,    -1,    -1,  4726,  4727,    -1,
+      40,    -1,  4731,    -1,    -1,    -1,    46,    -1,  4737,    -1,
+      70,  4740,    -1,    -1,    -1,  4744,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4757,    -1,
+      70,    -1,    -1,    -1,    -1,  1406,    -1,    -1,  4767,    -1,
+     434,    -1,    -1,   437,   438,   439,    -1,   441,   442,   443,
+     444,   445,   446,    -1,    -1,    -1,  4785,   451,    -1,    -1,
+      -1,    -1,    -1,    -1,  4793,    -1,    -1,    -1,    -1,    -1,
+    4799,  4800,  4801,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    22,    -1,    -1,    -1,     8,    -1,    28,    11,
+      -1,  4820,    -1,    15,    16,    17,    -1,    -1,  4827,    -1,
+      -1,    -1,    -1,    -1,    -1,     8,    -1,    -1,    11,    -1,
+      32,    -1,    15,    16,    17,   175,    -1,    -1,    40,    -1,
+     180,    -1,    -1,    -1,    46,    -1,    -1,    -1,    68,    32,
+      -1,    -1,    -1,    -1,    -1,   175,    -1,    40,    -1,    -1,
+     180,   201,   202,    46,    -1,    -1,    -1,    -1,    70,    -1,
+    1521,    -1,    -1,    -1,    -1,    -1,   216,    -1,    -1,    -1,
+      -1,   201,   202,    -1,    -1,    -1,    -1,    70,    -1,    -1,
+    4899,  4900,    -1,    -1,    -1,    -1,   216,    -1,    -1,   119,
+      -1,    -1,    -1,    -1,  4913,    -1,   126,   247,    -1,   129,
+      -1,    -1,    -1,    -1,    -1,    -1,  4925,  4926,    -1,    -1,
+     260,    -1,    -1,   263,    -1,    -1,    -1,   247,    -1,    -1,
+      -1,    -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,
+     260,    -1,    -1,   263,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   185,    -1,    -1,  1619,    -1,
+      -1,    -1,    -1,   175,    -1,    -1,    -1,    -1,   180,    -1,
+      -1,    -1,  1633,    -1,    -1,  1636,    -1,  1638,    -1,  1640,
+      -1,    -1,   175,    -1,    -1,  1646,    -1,   180,    -1,   201,
+     202,   341,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   216,    -1,    -1,    -1,   201,   202,
+      -1,   341,   242,    -1,   244,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   216,   254,    -1,    -1,    -1,    -1,    -1,
+    1691,    -1,   262,    -1,  1695,   247,  1697,    -1,    -1,  1700,
+      -1,    -1,   272,    -1,    -1,    -1,    -1,    -1,   260,    -1,
+      -1,   263,    -1,    -1,   247,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   260,    -1,    -1,
+     263,    -1,    -1,    -1,    -1,    -1,   306,    -1,    -1,   309,
+     310,    -1,    -1,    -1,   434,    -1,    -1,   437,   438,   439,
+      -1,   441,   442,   443,   444,   445,   446,    -1,    -1,    -1,
+      -1,   451,    -1,    -1,   434,    -1,   336,   437,   438,   439,
+      -1,   441,   442,   443,   444,   445,   446,    -1,    -1,    -1,
+      -1,   451,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   341,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   341,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,    -1,    -1,
+      -1,    -1,    -1,    28,    -1,    -1,    -1,    -1,    -1,   399,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    68,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   434,    -1,    -1,   437,   438,   439,    -1,   441,
+     442,   443,   444,   445,   446,    -1,   101,    -1,    -1,   451,
+      -1,   434,    -1,    -1,   437,   438,   439,    -1,   441,   442,
+     443,   444,   445,   446,   119,    -1,    -1,    -1,   451,    -1,
+      -1,   126,    -1,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+       8,    -1,    -1,    11,    -1,    -1,    -1,    15,    16,    17,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,
+       8,    -1,    -1,    11,    32,    -1,    -1,    15,    16,    17,
+      -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    46,    -1,
+      -1,    -1,    -1,    -1,    32,    -1,    -1,   182,    -1,    -1,
+     185,    -1,    40,    -1,    -1,    -1,    -1,    -1,    46,    -1,
+      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2006,  2007,    -1,    -1,    -1,
+    2011,  2012,    70,    -1,    -1,  2016,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   230,    -1,   232,    -1,  2030,
+      -1,    -1,    -1,    -1,    -1,    -1,  2037,   242,    -1,   244,
+    2041,  2042,    -1,    -1,  2045,  2046,    -1,    -1,    -1,   254,
+      -1,  2052,    -1,    -1,    -1,    -1,    -1,   262,    -1,    -1,
+      -1,    -1,    -1,  2064,    -1,  2066,   271,   272,    -1,    -1,
+      -1,     8,    -1,    -1,    11,    -1,    -1,    -1,    15,    16,
+      17,    -1,  2083,    -1,    -1,    -1,    -1,  2088,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    32,    -1,   175,    -1,    -1,
+    2101,   306,   180,    40,   309,   310,   311,    -1,  2109,    46,
+    2111,    -1,  2113,  2114,  2115,    -1,    -1,   175,    -1,  2120,
+    2121,    -1,   180,   201,   202,    -1,    -1,    -1,    -1,  2130,
+      -1,   336,    -1,    70,  2135,    -1,    -1,    -1,   216,  2140,
+      -1,    -1,    -1,   201,   202,   350,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   216,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2167,    -1,    -1,   247,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2178,    -1,  2180,
+      -1,    -1,   260,    -1,  2185,   263,    -1,    -1,  2189,   247,
+    2191,  2192,  2193,  2194,   399,  2196,    -1,    -1,    -1,    -1,
+      -1,    -1,   260,    -1,    -1,   263,    -1,    -1,  2209,  2210,
+    2211,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2221,  2222,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   175,   187,
+      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,   196,   197,
+      -1,    -1,    -1,    -1,    -1,    -1,   204,    -1,    -1,    -1,
+      -1,    -1,    -1,   341,   201,   202,    -1,   215,    -1,    -1,
+      -1,    -1,    -1,     8,  2275,    -1,    11,    -1,    -1,   216,
+      15,    16,    17,   341,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,
+     247,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   260,    -1,    -1,   263,    -1,    22,    -1,
+      -1,    -1,    -1,    -1,    28,    70,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,   437,
+     438,   439,    -1,   441,   442,   443,   444,   445,   446,    -1,
+      -1,    -1,    -1,   451,    68,    -1,   434,    -1,    -1,   437,
+     438,   439,    -1,   441,   442,   443,   444,   445,   446,    -1,
+      -1,    -1,     8,   451,    -1,    11,    -1,    -1,    -1,    15,
+      16,    17,    -1,    -1,   341,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    40,   119,    -1,  2428,    -1,    -1,
+      46,    -1,   126,    -1,    -1,   129,    -1,    -1,    -1,    -1,
+     175,     8,    -1,    -1,    11,   180,    -1,    -1,    15,    16,
+      17,    -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,
+     154,    -1,  2463,    -1,    -1,    32,   201,   202,    35,    -1,
+      -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    46,
+      -1,   216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   185,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,
+     437,   438,   439,    70,   441,   442,   443,   444,   445,   446,
+      -1,    -1,   247,    -1,   451,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   260,    -1,    -1,   263,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   242,    -1,
+     244,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   175,
+     254,    -1,    -1,    -1,   180,    -1,    -1,    -1,   262,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   272,    -1,
+      -1,    -1,    -1,    -1,    -1,   201,   202,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     216,    -1,   550,    -1,    -1,    -1,   341,    -1,   175,    -1,
+      -1,    -1,   306,   180,   562,   309,   310,    -1,    -1,   567,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     578,   247,    -1,    -1,   201,   202,    -1,    -1,    -1,    -1,
+      -1,    -1,   336,    -1,   260,    -1,   594,   263,  2649,   216,
+     598,    -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,    -1,
+     608,   609,    -1,    -1,    -1,    -1,    -1,   615,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   625,   626,    -1,
+     247,    -1,    -1,    -1,    -1,    -1,   634,    -1,    -1,    -1,
+      -1,    -1,    -1,   260,    -1,    -1,   263,    -1,    -1,   434,
+    2701,  2702,   437,   438,   439,   399,   441,   442,   443,   444,
+     445,   446,    -1,    -1,    -1,    -1,   451,    -1,  2719,    -1,
+      -1,    -1,    -1,    -1,    -1,   341,    -1,    -1,    -1,     8,
+      -1,    -1,    11,    -1,    -1,    -1,    15,    16,    17,    -1,
+      -1,    -1,    -1,  2744,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2753,    32,    -1,    -1,    -1,    36,    -1,    -1,
+      -1,    40,    -1,    -1,    -1,   713,   714,    46,  2769,  2770,
+      -1,   719,    -1,  2774,   341,    -1,    -1,    -1,  2779,  2780,
+    2781,     8,    -1,    -1,    11,    -1,    -1,    -1,    15,    16,
+      17,    70,    -1,    -1,    -1,    -1,    -1,   745,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,  2810,
+    2811,  2812,  2813,    40,    -1,    -1,    -1,    -1,   434,    46,
+      -1,   437,   438,   439,    -1,   441,   442,   443,   444,   445,
+     446,    -1,    -1,   449,    -1,    -1,    -1,    -1,   117,    -1,
+      -1,    -1,    -1,    70,    -1,    -1,  2847,    -1,  2849,  2850,
+    2851,    -1,    -1,    -1,    -1,    -1,    -1,     8,  2859,    -1,
+      11,    -1,    -1,    -1,    15,    16,    17,   434,    -1,    -1,
+     437,   438,   439,    -1,   441,   442,   443,   444,   445,   446,
+      -1,    32,    -1,    -1,    -1,    -1,    22,    -1,    -1,    40,
+      -1,    -1,    28,    -1,    -1,    46,   175,    -1,    -1,    -1,
+      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    70,
+      -1,    -1,   201,   202,    -1,    -1,   153,  2928,    -1,    -1,
+      -1,   158,    68,    -1,    -1,  2936,   884,   216,    -1,    -1,
+      -1,    -1,    -1,   891,    -1,    -1,    -1,   895,   175,    -1,
+      -1,    -1,    -1,   180,  2955,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   911,    -1,    -1,    -1,    -1,   247,    -1,
+      -1,    -1,   920,    -1,   201,   202,    -1,  2978,    -1,    -1,
+      -1,   260,    -1,   119,   263,    -1,    -1,    -1,    -1,   216,
+     126,    -1,    -1,   129,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   959,    -1,    -1,    -1,    -1,    -1,    -1,   154,    -1,
+     247,  3022,    -1,    -1,   175,  3026,    -1,    -1,    -1,   180,
+      -1,    -1,    -1,   260,    -1,    -1,   263,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   996,   185,
+     201,   202,    -1,    -1,  3055,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   341,    -1,    -1,   216,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1031,  3085,    -1,    -1,    -1,    -1,    -1,
+      -1,    22,    -1,    -1,    -1,    -1,   247,    28,  3099,    -1,
+      -1,    -1,  3103,  1051,    -1,    -1,   242,  1055,   244,   260,
+      -1,    -1,   263,  3114,   341,  1063,    -1,   396,   254,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   262,    -1,    -1,    -1,
+      -1,    -1,    -1,   284,    -1,    -1,   272,    68,    -1,    -1,
+      -1,    -1,    -1,  1091,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1100,    -1,  1102,   434,    -1,    -1,   437,   438,
+     439,    -1,   441,   442,   443,   444,   445,   446,    -1,  1117,
+     306,    -1,  1120,   309,   310,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1132,    -1,    -1,    -1,   119,    -1,
+     341,    -1,    -1,    -1,    -1,   126,    -1,    -1,   129,    -1,
+     336,    -1,    -1,    -1,    -1,    -1,   357,   434,    -1,    -1,
+     437,   438,   439,  1161,   441,   442,   443,   444,   445,   446,
+      -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1189,  1190,  1191,    -1,  1193,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   185,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   399,    -1,  1213,    -1,    -1,    -1,    22,
+      -1,    -1,    -1,    -1,    -1,    28,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   434,    -1,    -1,   437,   438,   439,  1237,
+     441,   442,   443,   444,   445,   446,    -1,  1245,  1246,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1254,  1255,    -1,    -1,
+      -1,   242,    -1,   244,    -1,    68,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   254,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   262,    -1,    -1,    -1,  1283,    -1,    -1,    -1,  1287,
+    1288,   272,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1303,  3357,    -1,  3359,    -1,
+      -1,  1309,    -1,    -1,    -1,  3366,   119,    -1,    -1,    -1,
+      -1,    -1,    -1,   126,    -1,   306,   129,    -1,   309,   310,
+      -1,    -1,  3383,    -1,    -1,    -1,    -1,     8,    -1,    -1,
+      11,    -1,    -1,    -1,    15,    16,    17,  3398,    22,    -1,
+      -1,   154,    -1,    -1,    28,   336,    -1,    -1,  3409,    -1,
+      -1,    32,    -1,    -1,    -1,    -1,    -1,    -1,  1366,    40,
+      -1,    -1,    -1,    -1,    -1,    46,  3427,    -1,    -1,    -1,
+      -1,    -1,   185,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    68,    -1,    -1,    -1,    -1,    70,
+      -1,    -1,    -1,  3454,    -1,  1403,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3465,  3466,  3467,    -1,   399,  3470,
+    3471,  3472,  3473,  3474,  3475,    -1,    -1,    -1,    -1,  3480,
+    3481,    -1,  3483,  3484,  3485,  3486,  3487,  3488,  3489,   242,
+      -1,   244,    -1,    -1,    -1,   119,    -1,  3498,    -1,  3500,
+    3501,   254,   126,    -1,    -1,   129,    -1,    -1,    -1,   262,
+      -1,    -1,    -1,    -1,    -1,    -1,  1464,    -1,    -1,   272,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     154,   152,    -1,    -1,    -1,  1483,    -1,    -1,    -1,  3540,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1498,    -1,    -1,   306,   175,    -1,   309,   310,  1506,   180,
+      -1,   185,    -1,    -1,  1512,    -1,    -1,    -1,    -1,  1517,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     201,   202,    -1,   336,    -1,  1533,    -1,    -1,    -1,  1537,
+      -1,    -1,    -1,    -1,    -1,   216,    -1,    -1,    -1,    -1,
+      -1,  1549,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1564,    -1,   242,    -1,
+     244,    -1,    -1,  1571,    -1,    -1,   247,    -1,    -1,  1577,
+     254,    -1,    -1,    -1,    -1,  1583,  3637,    -1,   262,   260,
+      -1,  1589,   263,    -1,    -1,    -1,   399,    -1,   272,    -1,
+      -1,    -1,    -1,  1601,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   282,    -1,    -1,  3665,  3666,  3667,    -1,    -1,    -1,
+      -1,    -1,  1620,    -1,  1622,  1623,  3677,    -1,    -1,    -1,
+      -1,    -1,   306,    -1,    -1,   309,   310,  1635,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1645,    -1,    -1,
+    1648,    -1,  1650,  1651,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   336,    -1,  1662,    -1,    -1,    -1,    -1,    -1,
+     341,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     8,    -1,    -1,    11,    -1,    -1,    -1,    15,    16,
+      17,    -1,    -1,    -1,    -1,    -1,  1694,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    46,
+      -1,    -1,    -1,    -1,    -1,   399,    -1,    -1,    -1,    -1,
+    1728,    -1,  1730,    -1,    -1,    -1,    -1,  1735,  1736,    -1,
+      -1,    -1,    -1,    70,  1742,  1743,  1744,    -1,    -1,    -1,
+    1748,    -1,  1750,  1751,  1752,  1753,  1754,  1755,    -1,  1757,
+      -1,  1759,  1760,   434,    -1,  1763,   437,   438,   439,    -1,
+     441,   442,   443,   444,   445,   446,    -1,    -1,    -1,  1777,
+    1778,  1779,  1780,  1781,  1782,    -1,    -1,    -1,  1786,    -1,
+      -1,    -1,  1790,    -1,    -1,  1793,    -1,    -1,  1796,  1797,
+    1798,  1799,  1800,  1801,  1802,  1803,  1804,    -1,  1806,    -1,
+      -1,    -1,    -1,    -1,    -1,  1813,    -1,  1815,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3886,    -1,    -1,    -1,  3890,
+    3891,  3892,  3893,    -1,    -1,  3896,    -1,    -1,   175,    -1,
+      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3918,  3919,  3920,
+    3921,    -1,  3923,  3924,   201,   202,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3935,  3936,    -1,     8,    -1,   216,
+      11,    -1,    -1,    -1,    15,    16,    17,    -1,    -1,    -1,
+      -1,    -1,  3953,    -1,    -1,    -1,    -1,    -1,    -1,  3960,
+    3961,    32,  3963,    -1,    35,    -1,    -1,    -1,    -1,    40,
+     247,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   260,    -1,    -1,   263,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1942,    -1,    -1,    -1,    -1,    70,
+      -1,   278,    -1,     8,    -1,    -1,    11,    -1,    -1,    -1,
+      15,    16,    17,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,
+      -1,    46,    -1,  1991,    -1,    -1,  4047,  1995,  1996,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2005,    -1,    -1,
+      -1,  2009,  2010,    -1,   341,    70,  2014,  4068,    -1,    -1,
+      -1,    -1,    -1,    -1,  2022,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2040,    -1,    -1,  2043,    -1,  4098,    -1,    -1,
+      -1,    -1,    -1,    -1,   175,    -1,  2054,    -1,    -1,   180,
+    2058,    -1,    -1,  2061,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2070,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     201,   202,    -1,    -1,  2082,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   216,    -1,    -1,    -1,    -1,
+      -1,  2099,  2100,   158,    -1,    -1,    -1,   434,    -1,  2107,
+     437,   438,   439,    -1,   441,   442,   443,   444,   445,   446,
+     175,  4172,    -1,    -1,    -1,   180,   247,    -1,    -1,    -1,
+    2128,  2129,    -1,    -1,  2132,    -1,  4187,    -1,    -1,   260,
+      -1,    -1,   263,    -1,    -1,    -1,   201,   202,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   216,    -1,    -1,  2162,    -1,    -1,    -1,  2166,     8,
+      -1,    -1,    11,    -1,    -1,    -1,    15,    16,    17,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2184,    -1,    -1,    -1,
+      -1,    -1,   247,    32,    22,    -1,    35,  2195,    -1,    -1,
+      28,    40,    -1,  4254,    -1,   260,    -1,    46,   263,    -1,
+    2208,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2217,
+     341,  4272,    -1,    -1,    -1,    -1,  4277,  4278,    -1,    -1,
+      -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      68,    -1,    -1,    -1,    -1,    -1,    -1,   197,    -1,    -1,
+      -1,    -1,    -1,    -1,   204,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   215,    -1,  2265,  2266,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2274,    -1,    -1,    -1,
+      -1,    -1,  4333,    -1,    -1,    -1,   341,    -1,    -1,    -1,
+      -1,   119,    -1,    -1,    -1,    -1,    -1,    -1,   126,    -1,
+      -1,   129,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   434,    -1,    -1,   437,   438,   439,    -1,
+     441,   442,   443,   444,   445,   446,   154,    -1,  4379,    -1,
+      -1,    -1,    -1,    -1,    -1,  4386,   175,    -1,  2336,    -1,
+      -1,   180,  2340,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2349,    -1,    -1,    -1,    -1,    -1,   185,    -1,    -1,
+      -1,    -1,   201,   202,    -1,    -1,    -1,    -1,    -1,    -1,
+    4421,    -1,    -1,    -1,    -1,    -1,    -1,   216,    -1,   434,
+      -1,  4432,   437,   438,   439,    -1,   441,   442,   443,   444,
+     445,   446,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4454,  2402,    -1,    -1,    -1,   247,  2407,
+      -1,    -1,    -1,    -1,   242,    -1,   244,    -1,    -1,    -1,
+      -1,   260,    -1,    -1,   263,    -1,   254,  4478,    -1,    -1,
+      -1,    -1,    -1,    -1,   262,    -1,  4487,    -1,    -1,    -1,
+    2438,    -1,    -1,    -1,   272,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2454,  4508,    -1,    22,
+      -1,    -1,  2460,    -1,    -1,    28,    -1,    -1,    -1,    -1,
+    2468,    -1,    -1,    -1,  2472,    -1,    -1,  2475,   306,    -1,
+    2478,   309,   310,    -1,    -1,    -1,    -1,    -1,  2486,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2496,    -1,
+      -1,    -1,   341,  2501,    -1,    68,    -1,    -1,   336,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2524,  2525,  2526,    -1,
+      -1,  2529,    -1,    -1,    -1,    -1,    -1,  4588,    -1,  2537,
+    2538,  2539,  2540,    -1,    -1,    -1,    -1,  2545,    -1,    -1,
+      -1,    -1,  2550,  2551,    -1,  2553,   119,  2555,    -1,  4610,
+      -1,    -1,    -1,   126,    -1,    -1,   129,    -1,  2566,  2567,
+      -1,   399,  2570,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    22,    -1,    -1,    -1,    -1,  2584,    28,  2586,    -1,
+    2588,   154,    -1,    -1,  4645,   434,    -1,    -1,   437,   438,
+     439,    -1,   441,   442,   443,   444,   445,   446,    -1,  4660,
+    2608,    -1,   562,    -1,    -1,    -1,    -1,   567,    -1,    -1,
+      -1,  2619,   185,  2621,  2622,  2623,    -1,    68,   578,    -1,
+      -1,    -1,    -1,    -1,  4685,    -1,    -1,    -1,  2636,     8,
+      -1,  2639,    11,    -1,   594,    -1,    15,    16,    17,    -1,
+      -1,    -1,    -1,  2651,    -1,    -1,    -1,    -1,  2656,   609,
+      -1,    -1,    -1,    32,  2662,   615,    -1,    -1,    -1,    -1,
+      -1,    40,    -1,    -1,  2672,    -1,   626,    46,   119,   242,
+      -1,   244,    -1,    -1,   634,   126,    -1,    -1,   129,    -1,
+    2688,   254,    -1,  2691,    -1,  2693,    -1,    -1,    -1,   262,
+    2698,    70,  2700,    -1,    -1,  4756,    -1,    -1,    -1,   272,
+      -1,    -1,    -1,   154,    -1,    -1,    -1,    -1,  2716,  2717,
+      -1,    -1,    -1,    -1,  2722,    -1,    -1,    -1,    -1,    -1,
+    4781,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   306,   185,  2743,   309,   310,  2746,    -1,
+      -1,  2749,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2766,   719,
+      -1,    -1,    -1,   336,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2790,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   242,    -1,   244,    -1,    -1,   175,    -1,    -1,    -1,
+      -1,   180,    -1,   254,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   262,    -1,    -1,  2822,  2823,  2824,    -1,    -1,    -1,
+      -1,   272,   201,   202,    -1,    -1,   399,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   216,  2846,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2855,    -1,  2857,
+    2858,    -1,    -1,    -1,  2862,   306,    -1,    -1,   309,   310,
+      -1,    -1,    -1,    -1,  2872,    -1,    -1,    -1,   247,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   260,    -1,    -1,   263,   336,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2916,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2935,    -1,    -1,
+      -1,    -1,    -1,  2941,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   399,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2965,    -1,    -1,
+      -1,    -1,   341,  2971,  2972,    -1,    -1,    -1,    -1,  2977,
+      -1,  2979,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2991,    -1,  2993,    -1,    -1,    -1,    -1,
+      -1,   370,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3030,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3047,
+    3048,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3061,    -1,   434,    -1,    -1,   437,   438,
+     439,    -1,   441,   442,   443,   444,   445,   446,    -1,    -1,
+      -1,  1031,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     8,    -1,    -1,    11,
+      -1,  1051,    -1,    15,    16,    17,  3104,    -1,    -1,    -1,
+      -1,    -1,    -1,  1063,    -1,    -1,    -1,    -1,  3116,    -1,
+      32,  3119,    -1,    35,    -1,    -1,    -1,    -1,    40,    -1,
+      -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,
+      -1,  1091,    -1,  3141,    -1,    -1,  3144,    -1,    -1,    -1,
+      -1,    -1,  1102,    -1,    -1,    -1,    -1,    -1,    70,    -1,
+      -1,    -1,    -1,  3161,    -1,    -1,  3164,  1117,    -1,    -1,
+    1120,    -1,  3170,    -1,    -1,    -1,    -1,    -1,  3176,    -1,
+    3178,    -1,    -1,  3181,    -1,    -1,    -1,  3185,  3186,  3187,
+    3188,  3189,    -1,    -1,  3192,  3193,  3194,  3195,  3196,  3197,
+    3198,  3199,  3200,  3201,    -1,    -1,    -1,  3205,  3206,    -1,
+      -1,     8,  3210,    -1,    11,    -1,    -1,  3215,    15,    16,
+      17,  3219,    -1,  3221,    -1,  3223,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3231,    -1,    32,  3234,    -1,  3236,    -1,
+      -1,    -1,    -1,    40,    -1,    -1,  3244,  3245,    -1,    46,
+    3248,  3249,    -1,    -1,    -1,  3253,  3254,    -1,    -1,    -1,
+      -1,    -1,  3260,   175,    -1,    -1,    -1,    -1,   180,    -1,
+      -1,    -1,  3270,    70,  3272,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3284,  1237,    -1,   201,
+     202,    -1,  3290,  3291,  3292,  1245,  1246,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   216,  1255,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3316,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3329,    -1,    -1,    -1,   247,    -1,  3335,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   260,    -1,
+      -1,   263,  3350,    -1,    -1,    -1,    -1,    -1,    -1,  1309,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   175,    -1,
+      -1,    -1,    -1,   180,  3382,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   201,   202,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   197,    -1,    -1,   216,
+      -1,    -1,    -1,   204,    -1,    -1,  3424,    -1,    -1,   341,
+      -1,  3429,  3430,  3431,   215,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     247,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   260,    -1,    -1,   263,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3479,    -1,    -1,  3482,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1464,    -1,    -1,    -1,    -1,    -1,
+      -1,  3519,   434,    -1,    -1,   437,   438,   439,    -1,   441,
+     442,   443,   444,   445,   446,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3541,   341,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1512,    -1,    -1,    -1,  3564,  3565,    -1,    -1,
+    3568,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3577,
+      -1,  3579,    -1,  1533,    -1,    -1,    -1,  1537,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1549,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3617,
+    3618,  3619,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,
+     437,   438,   439,    -1,   441,   442,   443,   444,   445,   446,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1622,  1623,    -1,  3673,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1635,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3694,    -1,    -1,    -1,
+    1650,  1651,    -1,    -1,    -1,    -1,    -1,  3705,    -1,    -1,
+      -1,    -1,  1662,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3735,    25,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3745,  3746,    -1,
+    3748,    -1,    -1,    -1,  3752,  3753,    -1,    -1,    -1,  3757,
+    3758,    -1,    -1,    -1,  3762,    -1,    -1,  3765,  3766,    -1,
+      -1,    58,  3770,    -1,    -1,    -1,    -1,    -1,  3776,    -1,
+      -1,   562,    -1,    -1,    71,    72,   567,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    81,    -1,  3794,   578,    85,    -1,
+    3798,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3810,   594,    -1,    -1,   103,  3815,    -1,    -1,
+      -1,    -1,    -1,  3821,    -1,    -1,    -1,    -1,   609,    -1,
+      -1,    -1,  1782,    -1,   615,    -1,    -1,   124,  3836,    -1,
+      -1,    -1,    -1,    -1,    -1,   626,    -1,    -1,   135,    -1,
+      -1,    -1,    -1,   634,    -1,    -1,   143,    -1,    -1,    -1,
+      -1,    -1,  3860,    -1,    -1,    -1,    -1,    -1,   155,    -1,
+      -1,    -1,    -1,   160,    -1,    -1,    -1,    -1,    -1,    -1,
+    3878,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   183,  3895,    -1,    -1,
+    3898,    -1,    -1,    -1,    -1,    -1,    -1,   713,   714,  3907,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   208,    -1,    -1,  3922,    -1,    -1,    -1,    -1,  3927,
+      -1,    -1,    -1,    -1,    -1,    -1,  3934,    -1,   719,   745,
+      -1,    -1,   229,    -1,  3942,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3952,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   260,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3981,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   280,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3999,    -1,   290,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4016,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4027,
+     317,    -1,    -1,    -1,    -1,   322,    -1,   324,    -1,    -1,
+      -1,    -1,    -1,   330,    -1,    -1,   333,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2005,    -1,    -1,    -1,  2009,
+    2010,    -1,    -1,    -1,  2014,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2022,    -1,    -1,   362,    -1,    -1,   365,    -1,
+      -1,    -1,   369,  4081,    -1,  4083,    -1,    -1,    -1,   376,
+    2040,   378,    -1,    -1,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4109,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   408,    -1,    -1,    -1,    -1,    -1,  4125,    -1,    -1,
+      -1,  4129,  2082,    -1,    -1,    -1,  4134,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2099,
+    2100,    -1,    -1,  4151,  4152,    -1,    -1,  4155,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4169,    -1,    -1,    -1,    -1,  4174,    -1,  2128,  2129,
+      -1,  4179,  2132,    -1,  4182,  4183,    -1,    -1,    -1,    -1,
+      -1,    -1,  4190,  4191,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4206,    -1,
+      -1,    -1,  2162,    -1,    -1,  4213,  2166,  4215,    -1,    -1,
+      -1,  4219,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2184,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2195,    -1,    -1,    -1,    -1,
+    1031,    -1,    -1,    -1,  4252,  4253,    -1,    -1,  2208,    -1,
+      -1,    -1,    -1,    -1,  4262,    -1,    -1,  2217,    -1,    -1,
+    1051,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    25,  1063,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4299,    -1,  4301,    -1,    -1,    -1,    -1,    -1,    -1,
+    1091,    -1,    -1,    -1,    58,  4313,    -1,    -1,    -1,    -1,
+      -1,  1102,    -1,    -1,  2274,    -1,  1132,    71,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1117,    -1,    -1,  1120,
+      -1,    85,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1161,    -1,    -1,    -1,   103,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4366,    -1,
+    4368,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,    -1,  1189,  1190,  1191,    -1,  1193,    -1,    -1,
+    2340,   135,    -1,    -1,    -1,    -1,    -1,  4395,  4396,   143,
+    4398,    -1,  4400,    -1,    -1,    -1,    -1,  1213,    -1,    -1,
+      -1,   155,    -1,    -1,    -1,    -1,   160,    -1,    -1,    -1,
+      -1,    -1,   166,    -1,    -1,    -1,  4424,    -1,    -1,    -1,
+    4428,    -1,    -1,    -1,    -1,    -1,  4434,    -1,    -1,   183,
+      -1,  4439,    -1,    -1,    -1,    -1,    -1,    -1,  1254,    -1,
+      -1,    -1,  2402,    -1,    -1,    -1,  1237,    -1,    -1,    -1,
+    4458,    -1,    -1,    -1,  1245,  1246,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1255,    -1,    -1,  1283,    -1,    -1,
+      -1,  1287,  1288,    -1,  4482,   229,    -1,    -1,  2438,    -1,
+    4488,    -1,    -1,    -1,  4492,  4493,    -1,    -1,    -1,  4497,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2460,    -1,    -1,    -1,    -1,    -1,   260,    -1,  2468,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   271,  1309,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   280,    -1,    -1,    -1,
+    4538,   604,    -1,    -1,    -1,    -1,   290,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4559,   625,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   317,    -1,    -1,    -1,    -1,   322,    -1,
+     324,    -1,  4580,  4581,    -1,    -1,   330,    -1,    -1,   333,
+      -1,    -1,    -1,    -1,    -1,  2545,    -1,    -1,    -1,    -1,
+      -1,  2551,    -1,  4601,    -1,    -1,  4604,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4613,    -1,    -1,   362,    -1,
+    4618,   365,  4620,    -1,  4622,   369,    -1,    -1,    -1,    -1,
+      -1,  4629,   376,    -1,   378,    -1,    -1,    -1,    -1,   383,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4647,
+      -1,   395,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   604,   408,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4670,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1464,   625,    -1,  2636,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4699,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4726,  4727,
+      -1,  1512,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4737,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4745,    25,    -1,
+    2700,    -1,  1533,    -1,    -1,    -1,  1537,    -1,    -1,  4757,
+      37,    -1,    -1,    -1,    -1,    -1,  2716,  2717,  1549,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    58,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2743,    71,  4793,  2746,    -1,    -1,    -1,
+      -1,  4799,  4800,  4801,    81,    -1,    -1,    -1,    85,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,
+      -1,    -1,  4820,    -1,    -1,    -1,   103,    -1,   891,    -1,
+      -1,    -1,   109,    -1,    -1,    -1,    -1,    -1,   625,    -1,
+      -1,  1622,  1623,    -1,    -1,  4843,    -1,   124,   911,    -1,
+      -1,    -1,    -1,    -1,  1635,    -1,    -1,   920,   135,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   143,    -1,    -1,  1650,
+    1651,    -1,  2822,  2823,  2824,    -1,    -1,    -1,   155,    -1,
+      -1,  1662,    -1,    -1,    -1,   162,    -1,    -1,    -1,   166,
+      -1,    -1,    -1,    -1,    -1,    -1,  2846,    -1,    -1,    -1,
+      -1,  4899,  4900,    -1,    -1,    -1,   183,  4905,  2858,    -1,
+      -1,    -1,  2862,    -1,    -1,  4913,    -1,    -1,    -1,    -1,
+      -1,    -1,  2872,    -1,    -1,    -1,  4924,  4925,  4926,  1735,
+      -1,    -1,    -1,   996,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1748,   220,  1750,    -1,    -1,  1753,  1754,  1755,
+     891,    -1,   229,    -1,  1760,    -1,    -1,  1763,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     911,    -1,  1778,  1779,  1780,  1781,    -1,    -1,    -1,   920,
+    1786,    -1,    -1,   260,  1790,  2935,   263,  1793,    -1,    -1,
+    1796,  1797,  1798,  1799,  1800,  1801,  1802,  1803,  1804,    -1,
+    1806,  1782,    -1,   280,    -1,    -1,    -1,  1813,    -1,  1815,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2971,   299,    -1,    -1,    -1,    -1,  2977,    -1,  2979,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1100,    -1,    -1,
+     317,  2991,    -1,  2993,    -1,    -1,    -1,   324,    -1,    -1,
+      -1,    -1,    -1,   330,    -1,   996,   333,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   362,    -1,    -1,   365,   366,
+      -1,   368,   369,    -1,    -1,    -1,    -1,  3047,    -1,    -1,
+      -1,   378,    -1,    -1,   891,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,   389,    -1,    -1,   392,    -1,    -1,   395,    -1,
+      -1,    -1,    -1,    -1,   911,    -1,    -1,    -1,    -1,    -1,
+      -1,   408,    -1,   920,    -1,    -1,  1942,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3104,    -1,    -1,    -1,    -1,  1100,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3119,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3141,    -1,    -1,  3144,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   996,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2005,    -1,    -1,    -1,  2009,  2010,
+      -1,    -1,    -1,  2014,    -1,    -1,    -1,  2043,    -1,    -1,
+    1303,  2022,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2040,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3221,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1240,
+      -1,  2082,    -1,  1366,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1100,    -1,    -1,    -1,    -1,  2099,  2100,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1403,    -1,    -1,    -1,    -1,    -1,    -1,  2128,  2129,    -1,
+      -1,  2132,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1303,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2162,    -1,    -1,    -1,  2166,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2184,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2195,    -1,    -1,    -1,    -1,    -1,
+    1483,    -1,    -1,    -1,    -1,  1366,    -1,  2208,    -1,    -1,
+      -1,    -1,  3382,    -1,    -1,  1498,  2217,    -1,    -1,    -1,
+      -1,    -1,    -1,  1506,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1517,    -1,    -1,    -1,    -1,  2265,
+      -1,    -1,  1403,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3424,    -1,    -1,    -1,    -1,  3429,
+      -1,  3431,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2274,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1564,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1577,    -1,  1303,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1589,    -1,    -1,  3479,
+      -1,    -1,  3482,    -1,    -1,    -1,    -1,    -1,  1601,    -1,
+      -1,    -1,  1483,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1498,    -1,  2340,
+      -1,    -1,    -1,    -1,    -1,  1506,    -1,    -1,    -1,  3519,
+      -1,    -1,    -1,    -1,    -1,    -1,  1517,    -1,    -1,  1366,
+      -1,    -1,  1645,    -1,    -1,  1648,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2407,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3564,  3565,  1403,    -1,    -1,    -1,
+      -1,  2402,    -1,  1564,    -1,    -1,    -1,  3577,    -1,  3579,
+      -1,    -1,    -1,    -1,    -1,    -1,  1577,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1589,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2438,    -1,    -1,
+    1601,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2460,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2468,    -1,    -1,
+    2496,    -1,    -1,    -1,    -1,  2501,  1483,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1645,    -1,    -1,  1648,    -1,    -1,
+      -1,  1498,    -1,    -1,  1777,    -1,    -1,    -1,    -1,  1506,
+    2526,    -1,    -1,  3673,    -1,    -1,    -1,    -1,    -1,    -1,
+    1517,  2537,    -1,  2539,  2540,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2550,    -1,    -1,  2553,    -1,  2555,
+      -1,    -1,  1815,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2545,    -1,    -1,    -1,    -1,    -1,
+    2551,    -1,    -1,    -1,    -1,    -1,    -1,  1564,  2584,    -1,
+    2586,    -1,  2588,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1577,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1589,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1601,  2621,  2622,  2623,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2639,    -1,    -1,  1777,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2651,    -1,    -1,    -1,    -1,
+    2656,    -1,    -1,    -1,    -1,  2636,  2662,    -1,  1645,    -1,
+      -1,  1648,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2722,    -1,    -1,  2700,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1991,    -1,
+      -1,    -1,  1995,  1996,    -1,  2716,  2717,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3895,    -1,    -1,  3898,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2743,    -1,    -1,  2746,    -1,    -1,    -1,    -1,
+      -1,    -1,  3922,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3934,    -1,    -1,    -1,    -1,    -1,
+    1777,    -1,    -1,    -1,    -1,  2058,    -1,    -1,    -1,    -1,
+      -1,    -1,  3952,    -1,    -1,    -1,    -1,  2070,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2822,  2823,  2824,  2107,    -1,    -1,    -1,    -1,  3999,
+    1991,    -1,    -1,    -1,  1995,  1996,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2846,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2858,    -1,    -1,
+      -1,  2862,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2872,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2058,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2070,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2935,    -1,    -1,    -1,    -1,  4109,
+      -1,    -1,    -1,    -1,    -1,    -1,  2107,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2971,    -1,    -1,    -1,    -1,    -1,  2977,    -1,  2979,    -1,
+      -1,    -1,    -1,  2266,  1991,    -1,    -1,    -1,  1995,  1996,
+    2991,    -1,  2993,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4213,    -1,  4215,  3047,    -1,    -1,    -1,
+      -1,  2058,    -1,  2336,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2070,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4253,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   625,    -1,    -1,    -1,
+    2107,    -1,   604,  3104,    -1,  2266,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3119,    -1,
+      -1,    -1,    -1,   625,    -1,    -1,    -1,    -1,    -1,  4299,
+      -1,  4301,    -1,    -1,    -1,  3161,    -1,    -1,    -1,    -1,
+    3141,    -1,    -1,  3144,  3170,    -1,    -1,    -1,    -1,    -1,
+    3176,    -1,  3178,    -1,    -1,    -1,    -1,   604,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2454,    -1,    -1,    -1,  2336,    -1,    -1,   625,  3205,
+    3206,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2475,    -1,    -1,    -1,    -1,  3223,    -1,    -1,
+      -1,    -1,    -1,  2486,    -1,  3231,    -1,    -1,  3234,    -1,
+    3236,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3245,
+    3221,    -1,    -1,    -1,    -1,    -1,    -1,  3253,  3254,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3284,  2266,
+      -1,    -1,    -1,    -1,  3290,  3291,  3292,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3316,    -1,    -1,  2454,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3329,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4482,    -1,  2475,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2486,    -1,    -1,    -1,  2336,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2621,  2622,
+    2623,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   891,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3382,   911,    -1,    -1,    -1,    -1,    -1,    -1,   891,
+      -1,   920,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2688,    -1,    -1,  2691,   911,
+    2693,    -1,    -1,    -1,    -1,  2698,    -1,    -1,   920,    -1,
+      -1,    -1,    -1,  3424,    -1,    -1,    -1,    -1,  3429,    -1,
+    3431,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   891,    -1,    -1,  2454,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   911,    -1,  2749,   996,  2475,    -1,
+      -1,    -1,    -1,   920,    -1,    -1,    -1,    -1,  3479,  2486,
+      -1,  3482,    -1,  2766,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   996,    -1,    -1,    -1,    -1,    -1,
+    4670,    -1,    -1,    -1,    -1,    -1,    -1,  2790,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3519,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2688,    -1,    -1,
+    2691,    -1,  2693,    -1,    -1,    -1,    -1,  2698,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   996,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3564,  3565,    -1,    -1,    -1,    -1,    -1,
+      -1,  1100,  2855,    -1,  2857,  4745,  3577,    -1,  3579,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2749,    -1,
+      -1,    -1,  3618,  3619,    -1,    -1,    -1,    -1,  1100,    -1,
+      -1,    -1,    -1,    -1,    -1,  2766,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2790,
+      -1,    -1,    -1,  2916,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1100,    -1,    -1,    -1,    -1,  2941,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3694,    -1,
+      -1,    -1,  3673,  4843,    -1,    -1,    -1,    -1,    -1,  3705,
+      -1,  2688,  2965,    -1,  2691,    -1,  2693,    -1,    -1,  2972,
+      -1,  2698,    -1,    -1,  2855,    -1,  2857,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3745,
+    3746,    -1,    -1,    -1,    -1,    -1,  3752,  3753,    -1,    -1,
+      -1,  3757,    -1,    -1,    -1,  4905,  3762,    -1,    -1,  3765,
+    3766,    -1,  2749,    -1,  3770,    -1,    -1,  3030,    -1,    -1,
+    3776,    -1,    -1,    -1,  4924,  2916,    -1,    -1,    -1,  2766,
+      -1,    -1,    -1,    -1,    -1,  3048,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1303,    -1,    -1,    -1,  3061,    -1,
+    2941,    -1,    -1,  2790,  3810,    -1,    -1,    -1,    -1,  3815,
+      -1,    -1,    -1,    -1,    -1,  3821,    -1,    -1,    -1,    -1,
+      -1,  1303,    -1,    -1,  2965,    -1,    -1,    -1,    -1,    -1,
+    3836,  2972,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3860,    -1,    -1,  1366,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2855,    -1,
+    2857,    -1,    -1,    -1,    -1,    -1,  1303,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1366,    -1,    -1,    -1,    -1,  3030,
+      -1,    -1,    -1,    -1,  1403,    -1,    -1,    -1,    -1,    -1,
+      -1,  3164,    -1,    -1,    -1,    -1,    -1,  3048,    -1,    -1,
+     604,    -1,    -1,    -1,  3895,    -1,    -1,  3898,    -1,    -1,
+    3061,  1403,  3185,    -1,    -1,    -1,    -1,    -1,    -1,  2916,
+      -1,   625,    -1,    -1,    -1,    -1,  3942,    -1,    -1,  1366,
+      -1,  3922,    -1,    -1,    -1,    -1,    -1,  3210,    -1,    -1,
+      -1,    -1,    -1,  3934,  2941,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3952,    -1,    -1,  1483,    -1,  1403,    -1,  2965,    -1,
+      -1,  3244,    -1,    -1,    -1,  2972,    -1,    -1,    -1,  1498,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1506,    -1,    -1,
+      -1,  1483,    -1,    -1,    -1,    -1,    -1,    -1,  1517,    -1,
+    4016,    -1,    -1,    -1,    -1,    -1,  1498,    -1,  3999,    -1,
+      -1,    -1,    -1,  3164,  1506,    -1,    -1,    -1,    -1,  3292,
+      -1,    -1,    -1,    -1,    -1,  1517,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3030,  3185,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1564,  1483,    -1,    -1,    -1,
+      -1,  3048,    -1,    -1,    -1,    -1,    -1,    -1,  1577,  3210,
+      -1,  1498,  3335,    -1,  3061,    -1,    -1,    -1,    -1,  1506,
+    1589,    -1,  1564,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1517,    -1,  1601,    -1,    -1,  1577,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3244,    -1,    -1,    -1,  1589,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1601,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4109,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1645,  1564,    -1,  1648,
+      -1,    -1,    -1,    -1,    -1,  4151,  4152,    -1,    -1,  4155,
+    1577,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1589,  1645,    -1,    -1,  1648,  3430,    -1,    -1,
+      -1,    -1,    -1,    -1,  1601,    -1,    -1,  3164,    -1,    -1,
+      -1,    -1,    -1,    -1,  4190,  4191,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3335,    -1,    -1,   891,  3185,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   911,  1645,    -1,
+      -1,  1648,    -1,  3210,    -1,    -1,   920,    -1,    -1,    -1,
+      -1,    -1,  4213,    -1,  4215,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3244,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1777,    -1,
+      -1,    -1,  4253,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3430,
+      -1,    -1,    -1,    -1,    -1,  1777,    -1,    -1,    -1,    -1,
+      -1,    -1,   996,    -1,    -1,  3568,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4299,    -1,
+    4301,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   604,  3335,    -1,
+    1777,    -1,    -1,    -1,  3617,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   625,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1100,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4424,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3568,    -1,    -1,
+      -1,    -1,    -1,  4439,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3430,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4458,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3617,    -1,    -1,    -1,
+      -1,    -1,  1991,    -1,    -1,  3748,  1995,  1996,    -1,    -1,
+      -1,  4497,    -1,    -1,    -1,  3758,    -1,    -1,    -1,    -1,
+      -1,  4482,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1991,
+      -1,    -1,    -1,  1995,  1996,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3810,    -1,  2058,
+      -1,    -1,  3815,  4559,    -1,    -1,    -1,    -1,  3821,    -1,
+      -1,  2070,    -1,    -1,  1991,    -1,    -1,    -1,  1995,  1996,
+      -1,    -1,    -1,    -1,    -1,    -1,  2058,    -1,    -1,    -1,
+      -1,  3568,    -1,    -1,    -1,    -1,    -1,    -1,  2070,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2107,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3748,    -1,  1303,
+      -1,    -1,    -1,    -1,    -1,  3878,  4622,  3758,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2107,    -1,    -1,    -1,    -1,
+    3617,  2058,    -1,    -1,   891,    -1,    -1,    -1,    -1,    -1,
+      -1,  4647,    -1,  2070,  3907,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   911,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   920,  3927,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1366,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2107,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4670,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1403,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3981,    -1,
+    4726,  4727,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4737,    -1,    -1,    -1,    -1,    -1,  3878,    -1,   996,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2266,    -1,    -1,
+      -1,  3748,    -1,    -1,  4745,    -1,  3907,    -1,    -1,    -1,
+      -1,  3758,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2266,    -1,  3927,    -1,    -1,  1483,
+      -1,    -1,    -1,    -1,    -1,  4801,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1498,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1506,    -1,  4820,    -1,    -1,    -1,  4081,    -1,
+    4083,    -1,    -1,  1517,    -1,    -1,    -1,  2336,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2266,
+    3981,    -1,    -1,  1100,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2336,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4843,    -1,    -1,    -1,  4129,    -1,    -1,    -1,
+    1564,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1577,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3878,    -1,  4899,  4900,  1589,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1601,    -1,  2336,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3907,    -1,    -1,    -1,  4905,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3927,    -1,  4083,  4924,    -1,  2454,    -1,    -1,    -1,    -1,
+      -1,  1645,    -1,    -1,  1648,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2475,    -1,    -1,    -1,
+      -1,    -1,  2454,    -1,    -1,    -1,    -1,  2486,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4129,  4252,
+      -1,    -1,    -1,  2475,  3981,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2486,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2454,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1303,    -1,  2475,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2486,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1777,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4083,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4368,    -1,    -1,    -1,  1366,
+      -1,  4252,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4396,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4129,    -1,    -1,    -1,  1403,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4434,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2688,
+      -1,    -1,  2691,    -1,  2693,    -1,    -1,    -1,    -1,  2698,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2688,    -1,    -1,  2691,
+      -1,  2693,    -1,    -1,    -1,    -1,  2698,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4488,  1483,  4368,    -1,  4492,
+    4493,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2749,  1498,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1506,
+      -1,    -1,    -1,    -1,    -1,  4396,    -1,  2766,    -1,    -1,
+    1517,  2688,    -1,    -1,  2691,  4252,  2693,  2749,    -1,    -1,
+      -1,  2698,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2790,    -1,    -1,  2766,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4434,    -1,    -1,    -1,  1991,    -1,    -1,
+      -1,  1995,  1996,    -1,    -1,    -1,    -1,  1564,  2790,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4580,  4581,    -1,
+    1577,    -1,  2749,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1589,    -1,    -1,    -1,    -1,    -1,    -1,  2766,
+      -1,    -1,    -1,    -1,  1601,    -1,  2855,  4488,  2857,    -1,
+      -1,  4492,  4493,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2790,  2058,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2855,    -1,  2857,  2070,    -1,    -1,    -1,
+      -1,  4368,    -1,    -1,    -1,    -1,    -1,    -1,  1645,    -1,
+      -1,  1648,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2916,    -1,  4396,
+      -1,    -1,    -1,  2107,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1205,    -1,    -1,  2855,    -1,
+    2857,    -1,  2941,    -1,  2916,    -1,    -1,    -1,    -1,    -1,
+    4581,    -1,    -1,    -1,    -1,    -1,    -1,  4434,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2965,    -1,    -1,  2941,
+      -1,    -1,    -1,  2972,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2965,    -1,    -1,    -1,    -1,  1268,  2916,
+    2972,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4488,    -1,    -1,    -1,  4492,  4493,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2941,    -1,    -1,    -1,    -1,    -1,
+    1777,  3030,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2965,  3048,
+      -1,    -1,    -1,    -1,    -1,  2972,    -1,    -1,  3030,    -1,
+      -1,    -1,  3061,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3048,    -1,    -1,    -1,
+      -1,    -1,  2266,    -1,    -1,    -1,    -1,    -1,    -1,  3061,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4581,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3030,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3048,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3061,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2336,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3164,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3185,    -1,    -1,    -1,
+      -1,    -1,  3164,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3210,    -1,  3185,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3210,    -1,
+      -1,    -1,    -1,    -1,  1991,  3244,    -1,  3164,  1995,  1996,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3185,    -1,
+    2454,    -1,  3244,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2475,    -1,  3210,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2486,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2058,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2070,    -1,    -1,    -1,  3244,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3335,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2107,    -1,    -1,  3335,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1658,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3335,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3430,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3430,    -1,
+      -1,    -1,    -1,  1733,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1747,    -1,    -1,
+      -1,  1751,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1765,  1766,  1767,    -1,  1769,
+      -1,    -1,    -1,    -1,  2688,    -1,    -1,  2691,    -1,  2693,
+      -1,    -1,    -1,  3430,  2698,    -1,    -1,    -1,    -1,  2266,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1811,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2749,    -1,    -1,    -1,  3568,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1848,    -1,
+      -1,    -1,  2766,    -1,    -1,    -1,    -1,    -1,    -1,  2336,
+      -1,    -1,    -1,    -1,    -1,    -1,  3568,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2790,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3617,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3617,    -1,    -1,    -1,    -1,
+      -1,  3568,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2855,    -1,  2857,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1952,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1964,    -1,    -1,  1967,    -1,    -1,
+    3617,    -1,    -1,    -1,    -1,    -1,    -1,  2454,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2475,    -1,
+      -1,    -1,  2916,    -1,    -1,    -1,    -1,    -1,    -1,  2486,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3748,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2941,    -1,  3758,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3748,    -1,    -1,    -1,
+      -1,  2965,    -1,    -1,    -1,    -1,  3758,    -1,  2972,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3748,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3758,    -1,    -1,    -1,    -1,  3030,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3048,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3061,    -1,  3878,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3878,    -1,  3907,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3927,    -1,
+      -1,    -1,    -1,    -1,    -1,  3907,    -1,    -1,    -1,    -1,
+      -1,  2688,    -1,    -1,  2691,    -1,  2693,    -1,    -1,    -1,
+      -1,  2698,    -1,    -1,    -1,  3927,    -1,    -1,    -1,    -1,
+      -1,  3878,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3164,    -1,  3981,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3907,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3185,  2749,    -1,    -1,    -1,    -1,    -1,    -1,  3981,
+    3927,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2766,
+      -1,    -1,    -1,    -1,    -1,    -1,  3210,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2790,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3244,    -1,    -1,    -1,  3981,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4083,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2855,    -1,
+    2857,  4083,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4129,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3335,    -1,    -1,    -1,    -1,    -1,  4129,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4083,    -1,    -1,  2916,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2941,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4129,    -1,    -1,    -1,    -1,    -1,  2965,    -1,
+      -1,    -1,    -1,    -1,    -1,  2972,    -1,    -1,    -1,  2499,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3430,    -1,    -1,  2519,
+      -1,  2521,    -1,  4252,  2524,  2525,    -1,  2527,    -1,  2529,
+      -1,    -1,    -1,  2533,    -1,    -1,  2536,    -1,    -1,    -1,
+      -1,  2541,    -1,    -1,    -1,    -1,    -1,  2547,    -1,    -1,
+    4252,    -1,  2552,  3030,    -1,    -1,    -1,    -1,    -1,  2559,
+    2560,  2561,  2562,    -1,    -1,    -1,  2566,  2567,    -1,  2569,
+      -1,  3048,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2581,    -1,  2583,  3061,    -1,    -1,    -1,    -1,    -1,
+    2590,  2591,  2592,  2593,  2594,  2595,  2596,  2597,  2598,  2599,
+      -1,    -1,    -1,    -1,    -1,  4252,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2627,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4368,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3568,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4368,  4396,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3164,    -1,    -1,
+      -1,    -1,    -1,    -1,  4396,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3617,    -1,  4434,    -1,    -1,  3185,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4368,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4434,  3210,    -1,    -1,    -1,  2737,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4396,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4488,
+      -1,    -1,    -1,  4492,  4493,    -1,    -1,  3244,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4488,  4434,    -1,    -1,
+    4492,  4493,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3748,    -1,    -1,    -1,    -1,    -1,
+      -1,  4488,    -1,    -1,  3758,  4492,  4493,    -1,    -1,    -1,
+      -1,    -1,  4581,    -1,    -1,    -1,    -1,    -1,  3335,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4581,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4581,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3430,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3878,    -1,    -1,    -1,  2968,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3907,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3927,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3981,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3568,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3107,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3617,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3160,    -1,    -1,    -1,    -1,    -1,  3166,    -1,    -1,  4083,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3182,  3183,    -1,    -1,  3186,  3187,  3188,  3189,
+      -1,    -1,  3192,  3193,  3194,  3195,  3196,  3197,  3198,  3199,
+    3200,  3201,  3202,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4129,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3224,    -1,    -1,  3227,    -1,  3229,
+      -1,    -1,  3232,  3233,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3247,  3248,  3249,
+    3250,    -1,  3252,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3748,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3758,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3300,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3310,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4252,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3347,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3878,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3907,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3927,    -1,    -1,    -1,  4368,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4396,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3981,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4434,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3541,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4488,    -1,    -1,    -1,  4492,  4493,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4083,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4129,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4581,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3695,    -1,    -1,    -1,  3699,
+    3700,  3701,    -1,    -1,    -1,    -1,    -1,  3707,  3708,  3709,
+    3710,    -1,    -1,    -1,    -1,  3715,  3716,  3717,  3718,  3719,
+    3720,  3721,  3722,  3723,  3724,  3725,  3726,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3751,    -1,    -1,  3754,    -1,  3756,    -1,    -1,    -1,
+    3760,    -1,    -1,  3763,  3764,    -1,    -1,  3767,  3768,    -1,
+      -1,    -1,    -1,    -1,    -1,  4252,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3812,    -1,    -1,    -1,    -1,    -1,    -1,  3819,
+    3820,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3835,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4368,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4396,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4434,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4488,    -1,    -1,    -1,  4492,  4493,    -1,    -1,  4019,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4078,  4079,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4581,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4119,
+      -1,    -1,    -1,    -1,  4124,  4125,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4139,
+      -1,  4141,    -1,    -1,    -1,  4145,  4146,  4147,    -1,    -1,
+    4150,    -1,    -1,  4153,  4154,    -1,    -1,    -1,  4158,    -1,
+      -1,    -1,  4162,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4217,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4273,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4318,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4394,  4395,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4410,  4411,  4412,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4446,  4447,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4593,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4609,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4659,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4698,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4755,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4804,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     3,     4,     5,     6,     7,     8,     9,
+      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    -1,  4872,    -1,    34,    -1,    -1,    37,    38,    -1,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    -1,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
+      -1,    71,  4912,    73,    74,    75,    76,    77,    78,    79,
+      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
+     110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
+     120,   121,    -1,   123,   124,   125,   126,   127,    -1,   129,
+     130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,    -1,   149,
+     150,   151,   152,    -1,   154,    -1,   156,   157,    -1,   159,
+     160,   161,   162,    -1,   164,   165,    -1,   167,   168,    -1,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      -1,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+      -1,    -1,   212,   213,   214,   215,   216,    -1,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
+     260,   261,   262,    -1,    -1,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
+     280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
+     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
+     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
+     360,   361,    -1,   363,   364,   365,   366,   367,   368,   369,
+      -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,    -1,   389,
+     390,   391,   392,   393,   394,   395,    -1,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,    -1,    -1,    -1,    -1,
+      -1,   441,   442,   443,    -1,    -1,    -1,    -1,    -1,    -1,
+     450,   451,     3,     4,     5,     6,     7,     8,     9,    10,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,
       21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
       -1,    -1,    -1,    34,    -1,    -1,    37,    38,    -1,    40,
@@ -15049,19 +14068,64 @@
      291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
       -1,   302,   303,   304,   305,   306,   307,   308,   309,   310,
      311,   312,    -1,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,    -1,   330,
+     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
      331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
      341,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
      351,   352,   353,   354,   355,   356,   357,   358,    -1,   360,
-     361,    -1,   363,   364,   365,   366,   367,   368,   369,    -1,
+     361,   362,   363,   364,   365,   366,   367,   368,   369,    -1,
      371,   372,    -1,    -1,   375,   376,   377,   378,   379,   380,
      381,   382,   383,   384,   385,   386,   387,    -1,   389,   390,
      391,   392,   393,   394,   395,    -1,   397,   398,   399,   400,
      401,   402,   403,    -1,   405,   406,   407,   408,   409,   410,
-      -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,   420,
+      -1,    -1,   413,    -1,   415,   416,   417,   418,   419,   420,
      421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,    -1,    -1,    -1,    -1,    -1,
+     431,   432,   433,   434,    -1,   436,    -1,    -1,    -1,    -1,
      441,   442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,
+     451,     3,     4,     5,     6,     7,     8,     9,    10,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,
+      22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
+      -1,    -1,    34,    -1,    -1,    37,    38,    -1,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    -1,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    -1,    65,    66,    67,    68,    69,    -1,    71,
+      -1,    73,    74,    75,    76,    77,    78,    79,    80,    -1,
+      82,    83,    84,    85,    86,    87,    -1,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
+     112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
+      -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
+      -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   146,   147,    -1,   149,   150,   151,
+     152,    -1,   154,    -1,   156,   157,    -1,   159,   160,   161,
+     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,    -1,   181,
+     182,   183,   184,   185,   186,    -1,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,    -1,   198,    -1,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,    -1,    -1,
+     212,   213,   214,   215,   216,    -1,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
+     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
+     262,    -1,    -1,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
+     282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,    -1,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,    -1,   314,   315,   316,   317,   318,   319,   320,   321,
+     322,   323,   324,   325,   326,   327,   328,    -1,   330,   331,
+     332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
+     342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
+     352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
+      -1,   363,   364,   365,   366,   367,   368,   369,    -1,   371,
+     372,    -1,    -1,   375,   376,   377,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,    -1,   389,   390,   391,
+     392,   393,   394,   395,    -1,   397,   398,   399,   400,   401,
+     402,   403,    -1,   405,   406,   407,   408,   409,   410,    -1,
+      -1,   413,    -1,    -1,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,    -1,    -1,    -1,    -1,    -1,   441,
+     442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,   451,
        3,     4,     5,     6,     7,     8,     9,    10,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,
       23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
@@ -15086,7 +14150,7 @@
      213,   214,   215,   216,    -1,   218,   219,   220,   221,   222,
      223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
      233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,    -1,   245,   246,   247,   248,   249,   250,   251,   252,
+     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
      253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
       -1,    -1,   265,   266,   267,   268,   269,   270,   271,   272,
      273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
@@ -15100,147 +14164,723 @@
      353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
      363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
       -1,    -1,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,    -1,    -1,   390,   391,   392,
+     383,   384,   385,   386,   387,    -1,   389,   390,   391,   392,
      393,   394,   395,    -1,   397,   398,   399,   400,   401,   402,
      403,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
      413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
      423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   441,   442,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,     3,     4,
-       5,     6,     7,     8,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
-      25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,
-      -1,    -1,    37,    38,    -1,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    -1,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    -1,
-      65,    66,    67,    68,    69,    -1,    71,    -1,    73,    74,
-      75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
-      85,    86,    87,    -1,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
-     115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
-     125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
-     135,    -1,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,    -1,   149,   150,   151,   152,    -1,   154,
-      -1,   156,   157,    -1,   159,   160,   161,   162,    -1,   164,
-     165,    -1,   167,   168,    -1,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
-     185,   186,    -1,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,    -1,   198,    -1,   200,    -1,    -1,   203,   204,
-     205,   206,   207,   208,   209,    -1,    -1,   212,   213,   214,
-     215,   216,    -1,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,    -1,   248,   249,   250,   251,   252,   253,   254,
-     255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,    -1,   279,   280,   281,   282,   283,   284,
-     285,   286,    -1,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,    -1,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,    -1,   360,   361,    -1,   363,   364,
-     365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,    -1,   389,   390,   391,   392,   393,   394,
-     395,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
-     405,   406,   407,   408,   409,   410,    -1,    -1,   413,    -1,
-      -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,    -1,    -1,    -1,    -1,    -1,   441,   442,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   450,     3,     4,     5,     6,
-       7,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
+     433,   434,    -1,    -1,    -1,    -1,    -1,    -1,   441,   442,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,   451,     3,
+       4,     5,     6,     7,     8,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,    23,
+      24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,
+      34,    -1,    -1,    37,    38,    -1,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    -1,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      -1,    65,    66,    67,    68,    69,    -1,    71,    -1,    73,
+      74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
+      84,    85,    86,    87,    -1,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,    -1,   110,    -1,   112,   113,
+     114,   115,   116,    -1,   118,   119,   120,    -1,    -1,   123,
+     124,   125,   126,   127,    -1,   129,   130,   131,    -1,   133,
+     134,   135,    -1,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,    -1,   149,   150,   151,   152,    -1,
+     154,    -1,   156,   157,    -1,   159,   160,   161,   162,    -1,
+     164,   165,    -1,   167,   168,    -1,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,    -1,   181,   182,   183,
+     184,   185,   186,    -1,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,    -1,   198,    -1,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,    -1,    -1,   212,   213,
+     214,   215,   216,    -1,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,
+      -1,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,    -1,   279,   280,   281,   282,   283,
+     284,   285,   286,    -1,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,    -1,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
+     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
+     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
+     344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
+     354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
+     364,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
+      -1,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,    -1,   389,   390,   391,   392,   393,
+     394,   395,    -1,   397,   398,   399,   400,   401,   402,   403,
+      -1,   405,   406,   407,   408,   409,   410,    -1,    -1,   413,
+      -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,    -1,     3,    -1,    -1,    -1,   441,   442,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   450,   451,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
+      -1,    -1,    -1,    -1,    -1,    35,    -1,    37,    38,    -1,
+      40,    41,    -1,    43,    44,    45,    46,    47,    -1,    49,
+      50,    -1,    52,    53,    54,    55,    56,    -1,    -1,    59,
+      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
+      -1,    -1,    -1,    73,    74,    75,    76,    -1,    78,    79,
+      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    89,
+      90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
+     110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
+     120,    -1,    -1,   123,   124,   125,   126,   127,    -1,   129,
+     130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
+     150,   151,   152,    -1,   154,    -1,   156,    -1,    -1,   159,
+     160,   161,   162,    -1,   164,   165,    -1,   167,   168,    -1,
+     170,   171,   172,   173,   174,    -1,   176,   177,   178,   179,
+      -1,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
+     200,    -1,    -1,   203,   204,   205,   206,   207,   208,   209,
+      -1,    -1,   212,   213,   214,   215,    -1,    -1,   218,   219,
+     220,    -1,    -1,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,    -1,   245,   246,    -1,   248,    -1,
+     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
+     260,   261,   262,    -1,    -1,   265,   266,    -1,   268,    -1,
+     270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
+     280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
+     330,   331,   332,   333,   334,    -1,   336,   337,   338,   339,
+     340,    -1,   342,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
+     360,   361,    -1,   363,    -1,   365,   366,   367,   368,   369,
+      -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
+      -1,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
+     390,   391,   392,   393,   394,    -1,    -1,   397,   398,   399,
+     400,   401,   402,   403,    -1,   405,    -1,   407,   408,   409,
+     410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,    -1,    -1,    -1,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   451,    18,    19,    20,    21,    22,    23,    24,    25,
+      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
+      -1,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
+      56,    -1,    -1,    59,    60,    61,    62,    63,    -1,    65,
+      66,    67,    68,    -1,    -1,    71,    -1,    73,    74,    75,
+      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
+      86,    87,    -1,    89,    90,    91,    92,    -1,    -1,    -1,
+      96,    -1,    -1,    -1,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,    -1,   110,    -1,   112,   113,   114,   115,
+     116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
+     126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
+      -1,   137,   138,   139,   140,    -1,   142,   143,   144,    -1,
+      -1,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
+     156,   157,    -1,   159,   160,   161,   162,    -1,   164,    -1,
+      -1,    -1,   168,    -1,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,    -1,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,    -1,    -1,   212,    -1,   214,   215,
+     216,    -1,   218,   219,   220,    -1,    -1,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,    -1,    -1,   245,
+     246,   247,   248,    -1,    -1,   251,   252,   253,   254,   255,
+      -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
+     266,   267,   268,   269,    -1,   271,   272,   273,   274,   275,
+     276,   277,    -1,   279,   280,    -1,   282,    -1,   284,   285,
+     286,    -1,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,    -1,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
+     316,   317,   318,   319,    -1,   321,   322,   323,   324,   325,
+     326,   327,   328,    -1,   330,   331,   332,   333,   334,    -1,
+     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
+      -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
+     356,   357,    -1,    -1,   360,   361,    -1,   363,   364,   365,
+     366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
+     376,    -1,   378,    -1,    -1,   381,   382,   383,   384,   385,
+     386,   387,    -1,    -1,   390,   391,   392,   393,   394,    -1,
+      -1,   397,   398,   399,   400,   401,    -1,   403,   404,   405,
+     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
+     416,   417,   418,   419,   420,   421,     3,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   431,   432,   433,    -1,    -1,
       -1,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      27,    28,    29,    -1,    -1,    -1,    -1,    34,    -1,    -1,
-      37,    38,    -1,    40,    41,    42,    43,    44,    45,    46,
+      27,    28,    29,    -1,    -1,   451,    -1,    -1,    -1,    -1,
+      37,    38,    -1,    40,    41,    42,    43,    44,    45,    -1,
       47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    -1,    65,    66,
-      67,    68,    69,    -1,    71,    -1,    73,    74,    75,    76,
+      -1,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    -1,    -1,    71,    -1,    73,    74,    75,    76,
       77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
-      87,    -1,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+      87,    -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,
+      -1,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
      107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
       -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
      127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     137,   138,   139,   140,    -1,   142,   143,   144,    -1,    -1,
      147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
-     157,    -1,   159,   160,   161,   162,    -1,   164,   165,    -1,
-     167,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
+     157,    -1,   159,   160,   161,   162,    -1,   164,    -1,    -1,
+      -1,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
       -1,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-      -1,   198,    -1,   200,    -1,   202,   203,   204,   205,   206,
-     207,   208,   209,    -1,    -1,   212,   213,   214,   215,   216,
-      -1,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+      -1,   198,    -1,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,    -1,    -1,   212,    -1,   214,   215,   216,
+      -1,   218,   219,   220,    -1,    -1,   223,   224,   225,   226,
      227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,    -1,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
+     237,   238,   239,   240,   241,   242,    -1,    -1,   245,   246,
+     247,   248,    -1,    -1,   251,   252,   253,   254,   255,    -1,
      257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
+     267,   268,   269,    -1,   271,   272,   273,   274,   275,   276,
+     277,    -1,   279,   280,    -1,   282,    -1,   284,   285,   286,
       -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
      297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
      307,   308,   309,   310,   311,   312,    -1,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,    -1,   330,   331,   332,   333,   334,   335,   336,
+     317,   318,   319,    -1,   321,   322,   323,   324,   325,   326,
+     327,   328,    -1,   330,   331,   332,   333,   334,    -1,   336,
      337,   338,   339,   340,   341,   342,   343,   344,   345,    -1,
      347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,    -1,   360,   361,    -1,   363,   364,   365,   366,
+     357,    -1,    -1,   360,   361,    -1,   363,   364,   365,   366,
      367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,    -1,    -1,   390,   391,   392,   393,   394,   395,    -1,
-     397,   398,   399,   400,   401,   402,   403,    -1,   405,   406,
+      -1,   378,    -1,    -1,   381,   382,   383,   384,   385,   386,
+     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
+     397,   398,   399,   400,   401,    -1,   403,   404,   405,   406,
      407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   441,   442,    -1,    -1,     3,     4,
-       5,     6,     7,   450,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
-      25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,
-      -1,    -1,    37,    38,    -1,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    -1,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    -1,
-      65,    66,    67,    68,    69,    -1,    71,    -1,    73,    74,
-      75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
-      85,    86,    87,    -1,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
-     115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
-     125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
-     135,    -1,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,    -1,   149,   150,   151,   152,    -1,   154,
-      -1,   156,   157,    -1,   159,   160,   161,   162,    -1,   164,
-     165,    -1,   167,   168,    -1,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
-     185,   186,    -1,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,    -1,   198,    -1,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,    -1,    -1,   212,   213,   214,
-     215,   216,    -1,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,    -1,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,    -1,   279,   280,   281,   282,   283,   284,
-     285,   286,    -1,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,    -1,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,    -1,   360,   361,    -1,   363,   364,
-     365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,    -1,    -1,   390,   391,   392,   393,   394,
-     395,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
-     405,   406,   407,   408,   409,   410,    -1,    -1,   413,    -1,
-      -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,    -1,
-      -1,     3,     4,     5,     6,     7,    -1,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    -1,   450,    18,    19,    20,    21,
+     417,   418,   419,   420,   421,     3,     4,     5,     6,     7,
+       8,     9,    10,    -1,   431,   432,   433,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
+      28,    29,    -1,    -1,   451,    -1,    34,    -1,    -1,    37,
+      38,    -1,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    -1,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
+      68,    69,    -1,    71,    -1,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
+      -1,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,    -1,   112,   113,   114,   115,   116,    -1,
+     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
+      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,   157,
+      -1,   159,   160,   161,   162,    -1,   164,   165,    -1,   167,
+     168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,    -1,
+     198,    -1,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,    -1,    -1,   212,   213,   214,   215,   216,    -1,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
+      -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+      -1,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,    -1,   314,   315,   316,   317,
+     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
+     328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,    -1,   347,
+     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
+     358,    -1,   360,   361,   362,   363,   364,   365,   366,   367,
+     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,   377,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+      -1,   389,   390,   391,   392,   393,   394,   395,    -1,   397,
+     398,   399,   400,   401,   402,   403,    -1,   405,   406,   407,
+     408,   409,   410,    -1,    -1,   413,    -1,   415,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,    -1,
+      -1,    -1,    -1,   441,   442,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   450,     3,     4,     5,     6,     7,     8,     9,
+      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
+      -1,    -1,    -1,    -1,    34,    -1,    -1,    37,    38,    -1,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    -1,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
+      -1,    71,    -1,    73,    74,    75,    76,    77,    78,    79,
+      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
+     110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
+     120,    -1,    -1,   123,   124,   125,   126,   127,    -1,   129,
+     130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,    -1,   149,
+     150,   151,   152,    -1,   154,    -1,   156,   157,    -1,   159,
+     160,   161,   162,    -1,   164,   165,    -1,   167,   168,    -1,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      -1,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+      -1,    -1,   212,   213,   214,   215,   216,    -1,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
+     260,   261,   262,    -1,    -1,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
+     280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
+     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
+     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
+      -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,    -1,   389,
+     390,   391,   392,   393,   394,   395,    -1,   397,   398,   399,
+     400,   401,   402,   403,    -1,   405,   406,   407,   408,   409,
+     410,    -1,    -1,   413,    -1,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,    -1,    -1,    -1,
+      -1,   441,   442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     450,     3,     4,     5,     6,     7,     8,     9,    10,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,
+      22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
+      -1,    -1,    34,    -1,    -1,    37,    38,    -1,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    -1,    65,    66,    67,    68,    69,    -1,    71,
+      -1,    73,    74,    75,    76,    77,    78,    79,    80,    -1,
+      82,    83,    84,    85,    86,    87,    -1,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
+     112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
+      -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
+      -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   146,   147,    -1,   149,   150,   151,
+     152,    -1,   154,    -1,   156,   157,   158,   159,   160,   161,
+     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,    -1,   181,
+     182,   183,   184,   185,   186,    -1,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,    -1,   198,    -1,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,    -1,   211,
+     212,   213,   214,   215,   216,    -1,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
+     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
+     262,    -1,    -1,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
+     282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,    -1,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,    -1,   314,   315,   316,   317,   318,   319,   320,   321,
+     322,   323,   324,   325,   326,   327,   328,    -1,   330,   331,
+     332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
+     342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
+     352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
+      -1,   363,   364,   365,   366,   367,   368,   369,    -1,   371,
+     372,    -1,   374,   375,   376,   377,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,    -1,   389,   390,   391,
+     392,   393,   394,   395,    -1,   397,   398,   399,   400,   401,
+     402,   403,    -1,   405,   406,   407,   408,   409,   410,    -1,
+      -1,   413,    -1,    -1,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,    -1,    -1,    -1,    -1,    -1,   441,
+     442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,     3,
+       4,     5,     6,     7,     8,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,    23,
+      24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,
+      34,    -1,    -1,    37,    38,    -1,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    -1,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      -1,    65,    66,    67,    68,    69,    -1,    71,    -1,    73,
+      74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
+      84,    85,    86,    87,    -1,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,    -1,   110,    -1,   112,   113,
+     114,   115,   116,    -1,   118,   119,   120,    -1,    -1,   123,
+     124,   125,   126,   127,    -1,   129,   130,   131,    -1,   133,
+     134,   135,    -1,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,    -1,   149,   150,   151,   152,    -1,
+     154,    -1,   156,   157,    -1,   159,   160,   161,   162,    -1,
+     164,   165,    -1,   167,   168,    -1,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,    -1,   181,   182,   183,
+     184,   185,   186,    -1,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,    -1,   198,    -1,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,    -1,    -1,   212,   213,
+     214,   215,   216,    -1,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,
+      -1,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,    -1,   279,   280,   281,   282,   283,
+     284,   285,   286,    -1,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,    -1,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
+     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
+     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
+     344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
+     354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
+     364,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
+      -1,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,    -1,   389,   390,   391,   392,   393,
+     394,   395,    -1,   397,   398,   399,   400,   401,   402,   403,
+      -1,   405,   406,   407,   408,   409,   410,    -1,    -1,   413,
+      -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,    -1,    -1,    -1,    -1,    -1,   441,   442,    -1,
+      -1,    -1,    -1,    -1,   448,   449,   450,     3,     4,     5,
+       6,     7,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
+      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,    -1,
+      -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    -1,    65,
+      66,    67,    68,    69,    -1,    71,    -1,    73,    74,    75,
+      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
+      86,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,    -1,   110,    -1,   112,   113,   114,   115,
+     116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
+     126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
+      -1,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
+     156,   157,    -1,   159,   160,   161,   162,    -1,   164,   165,
+      -1,   167,   168,    -1,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
+     186,    -1,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,    -1,    -1,   212,   213,   214,   215,
+     216,    -1,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+      -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
+     276,   277,    -1,   279,   280,   281,   282,   283,   284,   285,
+     286,    -1,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,    -1,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,    -1,   330,   331,   332,   333,   334,   335,
+     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
+      -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
+     356,   357,   358,    -1,   360,   361,    -1,   363,   364,   365,
+     366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,    -1,   389,   390,   391,   392,   393,   394,   395,
+      -1,   397,   398,   399,   400,   401,   402,   403,    -1,   405,
+     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+      -1,    -1,    -1,    -1,    -1,   441,   442,   443,    -1,    -1,
+      -1,    -1,    -1,    -1,   450,     3,     4,     5,     6,     7,
+       8,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
+      28,    29,    -1,    -1,    -1,    -1,    34,    -1,    -1,    37,
+      38,    -1,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    -1,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
+      68,    69,    -1,    71,    -1,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
+      -1,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,    -1,   112,   113,   114,   115,   116,    -1,
+     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
+      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,   157,
+      -1,   159,   160,   161,   162,    -1,   164,   165,    -1,   167,
+     168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,    -1,
+     198,    -1,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,    -1,    -1,   212,   213,   214,   215,   216,    -1,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
+      -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+      -1,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,    -1,   314,   315,   316,   317,
+     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
+     328,    -1,   330,   331,   332,   333,   334,   335,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,    -1,   347,
+     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
+     358,    -1,   360,   361,    -1,   363,   364,   365,   366,   367,
+     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,   377,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+      -1,   389,   390,   391,   392,   393,   394,   395,    -1,   397,
+     398,   399,   400,   401,   402,   403,    -1,   405,   406,   407,
+     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,    -1,    -1,
+      -1,    -1,    -1,   441,   442,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   450,     3,     4,     5,     6,     7,     8,     9,
+      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    -1,    -1,    -1,    34,    -1,    -1,    37,    38,    -1,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    -1,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
+      -1,    71,    -1,    73,    74,    75,    76,    77,    78,    79,
+      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
+     110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
+     120,    -1,    -1,   123,   124,   125,   126,   127,    -1,   129,
+     130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,    -1,   149,
+     150,   151,   152,    -1,   154,    -1,   156,   157,    -1,   159,
+     160,   161,   162,    -1,   164,   165,    -1,   167,   168,    -1,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      -1,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+      -1,    -1,   212,   213,   214,   215,   216,    -1,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
+     260,   261,   262,    -1,    -1,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
+     280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
+     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
+     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
+     360,   361,    -1,   363,   364,   365,   366,   367,   368,   369,
+      -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,    -1,   389,
+     390,   391,   392,   393,   394,   395,    -1,   397,   398,   399,
+     400,   401,   402,   403,    -1,   405,   406,   407,   408,   409,
+     410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,    -1,    -1,    -1,    -1,
+      -1,   441,   442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     450,     3,     4,     5,     6,     7,     8,     9,    10,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,
+      22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
+      -1,    -1,    34,    -1,    -1,    37,    38,    -1,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    -1,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    -1,    65,    66,    67,    68,    69,    -1,    71,
+      -1,    73,    74,    75,    76,    77,    78,    79,    80,    -1,
+      82,    83,    84,    85,    86,    87,    -1,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
+     112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
+      -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
+      -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   146,   147,    -1,   149,   150,   151,
+     152,    -1,   154,    -1,   156,   157,   158,   159,   160,   161,
+     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,    -1,   181,
+     182,   183,   184,   185,   186,    -1,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,    -1,   198,    -1,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,    -1,    -1,
+     212,   213,   214,   215,   216,    -1,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
+     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
+     262,    -1,    -1,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
+     282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,    -1,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,    -1,   314,   315,   316,   317,   318,   319,   320,   321,
+     322,   323,   324,   325,   326,   327,   328,    -1,   330,   331,
+     332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
+     342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
+     352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
+      -1,   363,   364,   365,   366,   367,   368,   369,    -1,   371,
+     372,    -1,    -1,   375,   376,   377,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,    -1,   389,   390,   391,
+     392,   393,   394,   395,    -1,   397,   398,   399,   400,   401,
+     402,   403,    -1,   405,   406,   407,   408,   409,   410,    -1,
+      -1,   413,    -1,    -1,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,    -1,    -1,    -1,    -1,    -1,   441,
+     442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,     3,
+       4,     5,     6,     7,     8,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,    23,
+      24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,
+      34,    -1,    -1,    37,    38,    -1,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    -1,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      -1,    65,    66,    67,    68,    69,    -1,    71,    -1,    73,
+      74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
+      84,    85,    86,    87,    -1,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,    -1,   110,    -1,   112,   113,
+     114,   115,   116,    -1,   118,   119,   120,    -1,    -1,   123,
+     124,   125,   126,   127,    -1,   129,   130,   131,    -1,   133,
+     134,   135,    -1,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,    -1,   149,   150,   151,   152,    -1,
+     154,    -1,   156,   157,    -1,   159,   160,   161,   162,    -1,
+     164,   165,    -1,   167,   168,    -1,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,    -1,   181,   182,   183,
+     184,   185,   186,    -1,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,    -1,   198,    -1,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,    -1,    -1,   212,   213,
+     214,   215,   216,    -1,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,
+      -1,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,    -1,   279,   280,   281,   282,   283,
+     284,   285,   286,    -1,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,    -1,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
+     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
+     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
+     344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
+     354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
+     364,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
+      -1,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,    -1,   389,   390,   391,   392,   393,
+     394,   395,    -1,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,    -1,   413,
+      -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,    -1,    -1,    -1,    -1,    -1,   441,   442,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   450,     3,     4,     5,
+       6,     7,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
+      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,    -1,
+      -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    -1,    65,
+      66,    67,    68,    69,    -1,    71,    -1,    73,    74,    75,
+      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
+      86,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,    -1,   110,    -1,   112,   113,   114,   115,
+     116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
+     126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
+      -1,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
+     156,   157,    -1,   159,   160,   161,   162,    -1,   164,   165,
+      -1,   167,   168,    -1,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
+     186,    -1,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,    -1,    -1,   212,   213,   214,   215,
+     216,    -1,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+      -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
+     276,   277,    -1,   279,   280,   281,   282,   283,   284,   285,
+     286,    -1,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,    -1,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,    -1,   330,   331,   332,   333,   334,   335,
+     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
+      -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
+     356,   357,   358,    -1,   360,   361,    -1,   363,   364,   365,
+     366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,    -1,   389,   390,   391,   392,   393,   394,   395,
+      -1,   397,   398,   399,   400,   401,   402,   403,    -1,   405,
+     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+      -1,    -1,    -1,    -1,    -1,   441,   442,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   450,     3,     4,     5,     6,     7,
+       8,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
+      28,    29,    -1,    -1,    -1,    -1,    34,    -1,    -1,    37,
+      38,    -1,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    -1,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
+      68,    69,    -1,    71,    -1,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
+      -1,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
+     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
+      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,   157,
+      -1,   159,   160,   161,   162,    -1,   164,   165,    -1,   167,
+     168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,    -1,
+     198,    -1,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,    -1,    -1,   212,   213,   214,   215,   216,    -1,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
+      -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+      -1,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,    -1,   314,   315,   316,   317,
+     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
+     328,    -1,   330,   331,   332,   333,   334,   335,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,    -1,   347,
+     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
+     358,    -1,   360,   361,    -1,   363,   364,   365,   366,   367,
+     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,   377,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+      -1,   389,   390,   391,   392,   393,   394,   395,    -1,   397,
+     398,   399,   400,   401,   402,   403,    -1,   405,   406,   407,
+     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,    -1,    -1,
+      -1,    -1,    -1,   441,   442,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   450,     3,     4,     5,     6,     7,     8,     9,
+      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
+      -1,    -1,    -1,    -1,    34,    -1,    -1,    37,    38,    -1,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    -1,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
+      -1,    71,    -1,    73,    74,    75,    76,    77,    78,    79,
+      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
+     110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
+     120,    -1,    -1,   123,   124,   125,   126,   127,    -1,   129,
+     130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,    -1,   149,
+     150,   151,   152,    -1,   154,    -1,   156,   157,    -1,   159,
+     160,   161,   162,    -1,   164,   165,    -1,   167,   168,    -1,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      -1,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+      -1,    -1,   212,   213,   214,   215,   216,    -1,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
+     260,   261,   262,    -1,    -1,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
+     280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
+     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
+     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
+     360,   361,    -1,   363,   364,   365,   366,   367,   368,   369,
+      -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,    -1,   389,
+     390,   391,   392,   393,   394,   395,    -1,   397,   398,   399,
+     400,   401,   402,   403,    -1,   405,   406,   407,   408,   409,
+     410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,    -1,    -1,    -1,    -1,
+      -1,   441,   442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     450,     3,     4,     5,     6,     7,     8,     9,    10,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,
       22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
       -1,    -1,    34,    -1,    -1,    37,    38,    -1,    40,    41,
       42,    43,    44,    45,    46,    47,    48,    49,    50,    -1,
@@ -15263,7 +14903,7 @@
      212,   213,   214,   215,   216,    -1,   218,   219,   220,   221,
      222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
      232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
-     242,   243,    -1,   245,   246,   247,   248,   249,   250,   251,
+     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
      252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
      262,    -1,    -1,   265,   266,   267,   268,   269,   270,   271,
      272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
@@ -15277,61 +14917,64 @@
      352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
       -1,   363,   364,   365,   366,   367,   368,   369,    -1,   371,
      372,    -1,    -1,   375,   376,   377,   378,   379,   380,   381,
-     382,   383,   384,   385,   386,   387,    -1,    -1,   390,   391,
+     382,   383,   384,   385,   386,   387,    -1,   389,   390,   391,
      392,   393,   394,   395,    -1,   397,   398,   399,   400,   401,
      402,   403,    -1,   405,   406,   407,   408,   409,   410,    -1,
       -1,   413,    -1,    -1,   416,   417,   418,   419,   420,   421,
      422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,    -1,    -1,     3,     4,     5,     6,     7,     8,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,   450,    18,
-      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
-      29,    -1,    -1,    -1,    -1,    34,    -1,    -1,    37,    38,
-      -1,    40,    41,    42,    43,    44,    45,    -1,    47,    48,
-      49,    50,    -1,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
-      69,    -1,    71,    -1,    73,    74,    75,    76,    77,    78,
-      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
-     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
-     129,   130,   131,    -1,   133,    -1,   135,    -1,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,    -1,
-     149,   150,   151,   152,    -1,   154,    -1,   156,   157,    -1,
-     159,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
-      -1,   170,   171,   172,   173,   174,    -1,   176,   177,   178,
-     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
-      -1,   200,    -1,    -1,   203,   204,   205,   206,   207,   208,
-     209,    -1,    -1,   212,   213,   214,   215,    -1,    -1,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,    -1,   248,
-     249,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
-      -1,   260,   261,   262,    -1,    -1,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
-     279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,    -1,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-      -1,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,    -1,   342,   343,   344,   345,    -1,   347,   348,
-     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
-      -1,   360,   361,    -1,   363,   364,   365,   366,   367,   368,
-     369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,    -1,
-     389,   390,   391,   392,   393,   394,   395,    -1,   397,   398,
-     399,   400,   401,   402,   403,    -1,   405,   406,   407,   408,
-     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,    -1,    -1,     3,    -1,    -1,
-      -1,    -1,   441,   442,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   450,    18,    19,    20,    21,    22,    23,    24,    25,
-      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
+     432,   433,   434,    -1,    -1,    -1,    -1,    -1,    -1,   441,
+     442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,     3,
+       4,     5,     6,     7,     8,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,    23,
+      24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,
+      34,    -1,    -1,    37,    38,    -1,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    -1,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      -1,    65,    66,    67,    68,    69,    -1,    71,    -1,    73,
+      74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
+      84,    85,    86,    87,    -1,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,    -1,   110,    -1,   112,   113,
+     114,   115,   116,    -1,   118,   119,   120,    -1,    -1,   123,
+     124,   125,   126,   127,    -1,   129,   130,   131,    -1,   133,
+     134,   135,    -1,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,    -1,   149,   150,   151,   152,    -1,
+     154,    -1,   156,   157,    -1,   159,   160,   161,   162,    -1,
+     164,   165,    -1,   167,   168,    -1,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,    -1,   181,   182,   183,
+     184,   185,   186,    -1,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,    -1,   198,    -1,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,    -1,    -1,   212,   213,
+     214,   215,   216,    -1,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,
+      -1,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,    -1,   279,   280,   281,   282,   283,
+     284,   285,   286,    -1,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,    -1,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
+     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
+     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
+     344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
+     354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
+     364,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
+      -1,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,    -1,   389,   390,   391,   392,   393,
+     394,   395,    -1,   397,   398,   399,   400,   401,   402,   403,
+      -1,   405,   406,   407,   408,   409,   410,    -1,    -1,   413,
+      -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,    -1,    -1,    -1,    -1,    -1,   441,   442,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   450,     3,     4,     5,
+       6,     7,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
+      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,    -1,
       -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
       46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
-      56,    -1,    58,    59,    60,    61,    62,    63,    -1,    65,
+      56,    57,    58,    59,    60,    61,    62,    63,    -1,    65,
       66,    67,    68,    69,    -1,    71,    -1,    73,    74,    75,
       76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
       86,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
@@ -15340,41 +14983,221 @@
      116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
      126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
       -1,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
+     146,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
      156,   157,    -1,   159,   160,   161,   162,    -1,   164,   165,
       -1,   167,   168,    -1,   170,   171,   172,   173,   174,   175,
      176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
      186,    -1,   188,   189,   190,   191,   192,   193,   194,   195,
      196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,   210,    -1,   212,   213,   214,   215,
+     206,   207,   208,   209,    -1,    -1,   212,   213,   214,   215,
      216,    -1,   218,   219,   220,   221,   222,   223,   224,   225,
      226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,   239,   240,   241,   242,   243,    -1,   245,
-     246,   247,   248,    -1,   250,   251,   252,   253,   254,   255,
-      -1,   257,    -1,   259,   260,   261,   262,    -1,    -1,   265,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+      -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
      266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
      276,   277,    -1,   279,   280,   281,   282,   283,   284,   285,
      286,    -1,   288,   289,   290,   291,   292,   293,   294,   295,
      296,   297,   298,   299,   300,    -1,   302,   303,   304,   305,
      306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
      316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,   332,   333,   334,   335,
+     326,   327,   328,    -1,   330,   331,   332,   333,   334,   335,
      336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
       -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
-     356,   357,   358,    -1,   360,   361,   362,   363,   364,   365,
+     356,   357,   358,    -1,   360,   361,    -1,   363,   364,   365,
      366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
-     376,   377,   378,   379,    -1,   381,   382,   383,   384,   385,
-     386,   387,    -1,    -1,   390,   391,   392,   393,   394,   395,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,    -1,   389,   390,   391,   392,   393,   394,   395,
       -1,   397,   398,   399,   400,   401,   402,   403,    -1,   405,
-     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,   415,
+     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,    -1,    -1,
-     436,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   450,    -1,    18,    19,    20,    21,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+      -1,    -1,    -1,    -1,    -1,   441,   442,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   450,     3,     4,     5,     6,     7,
+       8,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
+      28,    29,    -1,    -1,    -1,    -1,    34,    -1,    -1,    37,
+      38,    -1,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    -1,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
+      68,    69,    -1,    71,    -1,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
+      -1,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
+     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
+      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,   157,
+      -1,   159,   160,   161,   162,    -1,   164,   165,    -1,   167,
+     168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,    -1,
+     198,    -1,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,    -1,    -1,   212,   213,   214,   215,   216,    -1,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
+      -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+      -1,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,    -1,   314,   315,   316,   317,
+     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
+     328,    -1,   330,   331,   332,   333,   334,   335,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,    -1,   347,
+     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
+     358,    -1,   360,   361,    -1,   363,   364,   365,   366,   367,
+     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,   377,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+      -1,   389,   390,   391,   392,   393,   394,   395,    -1,   397,
+     398,   399,   400,   401,   402,   403,    -1,   405,   406,   407,
+     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,    -1,    -1,
+      -1,    -1,    -1,   441,   442,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   450,     3,     4,     5,     6,     7,     8,     9,
+      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
+      -1,    -1,    -1,    -1,    34,    -1,    -1,    37,    38,    -1,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    -1,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
+      -1,    71,    -1,    73,    74,    75,    76,    77,    78,    79,
+      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
+     110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
+     120,    -1,    -1,   123,   124,   125,   126,   127,    -1,   129,
+     130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,    -1,   149,
+     150,   151,   152,    -1,   154,    -1,   156,   157,    -1,   159,
+     160,   161,   162,    -1,   164,   165,    -1,   167,   168,    -1,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      -1,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+      -1,    -1,   212,   213,   214,   215,   216,    -1,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,    -1,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
+     260,   261,   262,    -1,    -1,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
+     280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
+     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
+     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
+     360,   361,    -1,   363,   364,   365,   366,   367,   368,   369,
+      -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
+     390,   391,   392,   393,   394,   395,    -1,   397,   398,   399,
+     400,   401,   402,   403,    -1,   405,   406,   407,   408,   409,
+     410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   441,   442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     450,     3,     4,     5,     6,     7,     8,     9,    10,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,
+      22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
+      -1,    -1,    34,    -1,    -1,    37,    38,    -1,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    -1,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    -1,    65,    66,    67,    68,    69,    -1,    71,
+      -1,    73,    74,    75,    76,    77,    78,    79,    80,    -1,
+      82,    83,    84,    85,    86,    87,    -1,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
+     112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
+      -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
+      -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   146,   147,    -1,   149,   150,   151,
+     152,    -1,   154,    -1,   156,   157,    -1,   159,   160,   161,
+     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,    -1,   181,
+     182,   183,   184,   185,   186,    -1,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,    -1,   198,    -1,   200,    -1,
+      -1,   203,   204,   205,   206,   207,   208,   209,    -1,    -1,
+     212,   213,   214,   215,   216,    -1,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
+     242,   243,   244,   245,   246,    -1,   248,   249,   250,   251,
+     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
+     262,    -1,    -1,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
+     282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,    -1,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,    -1,   314,   315,   316,   317,   318,   319,   320,   321,
+     322,   323,   324,   325,   326,   327,   328,    -1,   330,   331,
+     332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
+     342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
+     352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
+      -1,   363,   364,   365,   366,   367,   368,   369,    -1,   371,
+     372,    -1,    -1,   375,   376,   377,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,    -1,   389,   390,   391,
+     392,   393,   394,   395,    -1,   397,   398,   399,   400,   401,
+     402,   403,    -1,   405,   406,   407,   408,   409,   410,    -1,
+      -1,   413,    -1,    -1,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,    -1,    -1,    -1,    -1,    -1,   441,
+     442,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,     3,
+       4,     5,     6,     7,     8,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,    23,
+      24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,
+      34,    -1,    -1,    37,    38,    -1,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    -1,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      -1,    65,    66,    67,    68,    69,    -1,    71,    -1,    73,
+      74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
+      84,    85,    86,    87,    -1,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,    -1,   110,    -1,   112,   113,
+     114,   115,   116,    -1,   118,   119,   120,    -1,    -1,   123,
+     124,   125,   126,   127,    -1,   129,   130,   131,    -1,   133,
+     134,   135,    -1,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,    -1,   149,   150,   151,   152,    -1,
+     154,    -1,   156,   157,    -1,   159,   160,   161,   162,    -1,
+     164,   165,    -1,   167,   168,    -1,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,    -1,   181,   182,   183,
+     184,   185,   186,    -1,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,    -1,   198,    -1,   200,    -1,   202,   203,
+     204,   205,   206,   207,   208,   209,    -1,    -1,   212,   213,
+     214,   215,   216,    -1,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+      -1,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,
+      -1,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,    -1,   279,   280,   281,   282,   283,
+     284,   285,   286,    -1,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,    -1,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
+     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
+     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
+     344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
+     354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
+     364,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
+      -1,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,    -1,    -1,   390,   391,   392,   393,
+     394,   395,    -1,   397,   398,   399,   400,   401,   402,   403,
+      -1,   405,   406,   407,   408,   409,   410,    -1,    -1,   413,
+      -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   441,   442,    -1,
+      -1,     3,     4,     5,     6,     7,   450,     9,    10,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,
       22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,
+      -1,    -1,    34,    -1,    -1,    37,    38,    -1,    40,    41,
       42,    43,    44,    45,    46,    47,    48,    49,    50,    -1,
-      52,    53,    54,    55,    56,    -1,    58,    59,    60,    61,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
       62,    63,    -1,    65,    66,    67,    68,    69,    -1,    71,
       -1,    73,    74,    75,    76,    77,    78,    79,    80,    -1,
       82,    83,    84,    85,    86,    87,    -1,    89,    90,    91,
@@ -15383,18 +15206,18 @@
      112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
       -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
       -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
+     142,   143,   144,   145,   146,   147,    -1,   149,   150,   151,
      152,    -1,   154,    -1,   156,   157,    -1,   159,   160,   161,
      162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
      172,   173,   174,   175,   176,   177,   178,   179,    -1,   181,
      182,   183,   184,   185,   186,    -1,   188,   189,   190,   191,
      192,   193,   194,   195,   196,    -1,   198,    -1,   200,   201,
-     202,   203,   204,   205,   206,   207,   208,   209,   210,    -1,
+     202,   203,   204,   205,   206,   207,   208,   209,    -1,    -1,
      212,   213,   214,   215,   216,    -1,   218,   219,   220,   221,
      222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
      232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
-     242,   243,    -1,   245,   246,   247,   248,    -1,   250,   251,
-     252,   253,   254,   255,    -1,   257,    -1,   259,   260,   261,
+     242,   243,    -1,   245,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
      262,    -1,    -1,   265,   266,   267,   268,   269,   270,   271,
      272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
      282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
@@ -15406,18 +15229,18 @@
      342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
      352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
       -1,   363,   364,   365,   366,   367,   368,   369,    -1,   371,
-     372,    -1,    -1,   375,   376,   377,   378,   379,    -1,   381,
+     372,    -1,    -1,   375,   376,   377,   378,   379,   380,   381,
      382,   383,   384,   385,   386,   387,    -1,    -1,   390,   391,
      392,   393,   394,   395,    -1,   397,   398,   399,   400,   401,
      402,   403,    -1,   405,   406,   407,   408,   409,   410,    -1,
       -1,   413,    -1,    -1,   416,   417,   418,   419,   420,   421,
      422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,    -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,    18,
+     432,   433,    -1,    -1,     3,     4,     5,     6,     7,    -1,
+       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,   450,    18,
       19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
-      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
+      29,    -1,    -1,    -1,    -1,    34,    -1,    -1,    37,    38,
       -1,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    -1,    52,    53,    54,    55,    56,    -1,    58,
+      49,    50,    -1,    52,    53,    54,    55,    56,    57,    58,
       59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
       69,    -1,    71,    -1,    73,    74,    75,    76,    77,    78,
       79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
@@ -15426,7 +15249,7 @@
       -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
      119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
      129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     139,   140,   141,   142,   143,   144,   145,   146,   147,    -1,
      149,   150,   151,   152,    -1,   154,    -1,   156,   157,    -1,
      159,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
       -1,   170,   171,   172,   173,   174,   175,   176,   177,   178,
@@ -15437,7 +15260,7 @@
      219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
      229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
      239,   240,   241,   242,   243,    -1,   245,   246,   247,   248,
-      -1,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
+     249,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
       -1,   260,   261,   262,    -1,    -1,   265,   266,   267,   268,
      269,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
      279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
@@ -15450,37 +15273,37 @@
      349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
       -1,   360,   361,    -1,   363,   364,   365,   366,   367,   368,
      369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
-     379,    -1,   381,   382,   383,   384,   385,   386,   387,    -1,
+     379,   380,   381,   382,   383,   384,   385,   386,   387,    -1,
       -1,   390,   391,   392,   393,   394,   395,    -1,   397,   398,
      399,   400,   401,   402,   403,    -1,   405,   406,   407,   408,
      409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
      419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,    -1,    -1,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     429,   430,   431,   432,   433,    -1,    -1,     3,     4,     5,
+       6,     7,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,
       -1,   450,    18,    19,    20,    21,    22,    23,    24,    25,
-      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    34,    -1,
       -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
-      56,    -1,    58,    59,    60,    61,    62,    63,    -1,    65,
+      -1,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    -1,    65,
       66,    67,    68,    69,    -1,    71,    -1,    73,    74,    75,
       76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
       86,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
       96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
      106,   107,   108,    -1,   110,    -1,   112,   113,   114,   115,
      116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
-     126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
+     126,   127,    -1,   129,   130,   131,    -1,   133,    -1,   135,
       -1,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
+     146,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
      156,   157,    -1,   159,   160,   161,   162,    -1,   164,   165,
-      -1,   167,   168,    -1,   170,   171,   172,   173,   174,   175,
+      -1,   167,   168,    -1,   170,   171,   172,   173,   174,    -1,
      176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
      186,    -1,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
+     196,    -1,   198,    -1,   200,    -1,    -1,   203,   204,   205,
      206,   207,   208,   209,    -1,    -1,   212,   213,   214,   215,
-     216,    -1,   218,   219,   220,   221,   222,   223,   224,   225,
+      -1,    -1,   218,   219,   220,   221,   222,   223,   224,   225,
      226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,   239,   240,   241,   242,   243,    -1,   245,
-     246,   247,   248,    -1,   250,   251,   252,   253,   254,   255,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,    -1,   248,   249,   250,   251,   252,   253,   254,   255,
       -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
      266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
      276,   277,    -1,   279,   280,   281,   282,   283,   284,   285,
@@ -15489,451 +15312,321 @@
      306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
      316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
      326,   327,   328,    -1,   330,   331,   332,   333,   334,   335,
-     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
+     336,   337,   338,   339,   340,    -1,   342,   343,   344,   345,
       -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
      356,   357,   358,    -1,   360,   361,    -1,   363,   364,   365,
      366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
-     376,   377,   378,   379,    -1,   381,   382,   383,   384,   385,
-     386,   387,    -1,    -1,   390,   391,   392,   393,   394,   395,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,    -1,   389,   390,   391,   392,   393,   394,   395,
       -1,   397,   398,   399,   400,   401,   402,   403,    -1,   405,
      406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
      426,   427,   428,   429,   430,   431,   432,   433,    -1,    -1,
-       3,     4,     5,    -1,    -1,    -1,     9,    -1,    -1,    -1,
+       3,    -1,    -1,    -1,    -1,   441,   442,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   450,    18,    19,    20,    21,    22,
       23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    42,
       43,    44,    45,    46,    47,    48,    49,    50,    -1,    52,
-      53,    54,    55,    56,    -1,    -1,    59,    60,    61,    62,
+      53,    54,    55,    56,    -1,    58,    59,    60,    61,    62,
       63,    -1,    65,    66,    67,    68,    69,    -1,    71,    -1,
       73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
       83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
-      -1,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,   102,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
      103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
      113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
      123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
      133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,    -1,   149,   150,   151,   152,
+     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
       -1,   154,    -1,   156,   157,    -1,   159,   160,   161,   162,
       -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
      173,   174,   175,   176,   177,   178,   179,    -1,   181,   182,
      183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
      193,   194,   195,   196,    -1,   198,    -1,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,    -1,    -1,   212,
-     213,   214,   215,   216,    -1,   218,   219,   220,    -1,    -1,
+     203,   204,   205,   206,   207,   208,   209,   210,    -1,   212,
+     213,   214,   215,   216,    -1,   218,   219,   220,   221,   222,
      223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
      233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
      243,    -1,   245,   246,   247,   248,    -1,   250,   251,   252,
-     253,   254,   255,    -1,   257,   258,    -1,   260,   261,   262,
+     253,   254,   255,    -1,   257,    -1,   259,   260,   261,   262,
       -1,    -1,   265,   266,   267,   268,   269,   270,   271,   272,
      273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
      283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
      293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
      303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
       -1,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
-     333,   334,    -1,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
-     353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
-     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
-      -1,    -1,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,    -1,    -1,   390,   391,   392,
-     393,   394,    -1,    -1,   397,   398,   399,   400,   401,   402,
-     403,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
-     413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,    -1,    -1,     3,    -1,    -1,    -1,    -1,   441,   442,
-     443,    -1,    -1,    -1,    -1,    -1,    -1,   450,    18,    19,
-      20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
-      30,    31,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    -1,    52,    53,    54,    55,    56,    -1,    -1,    59,
-      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
-      -1,    71,    -1,    73,    74,    75,    76,    77,    78,    79,
-      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    89,
-      90,    91,    92,    -1,    -1,    -1,    96,    -1,    -1,    -1,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
-     110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
-     120,    -1,    -1,   123,   124,   125,   126,   127,    -1,   129,
-     130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
-     150,   151,   152,    -1,   154,    -1,   156,   157,    -1,   159,
-     160,   161,   162,    -1,   164,   165,    -1,   167,   168,    -1,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-      -1,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
-     190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-      -1,    -1,   212,   213,   214,   215,   216,    -1,   218,   219,
-     220,    -1,    -1,   223,   224,   225,   226,   227,   228,   229,
-     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
-     240,   241,   242,   243,    -1,   245,   246,   247,   248,    -1,
-     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
-     260,   261,   262,    -1,    -1,   265,   266,   267,   268,   269,
-     270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
-     280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
-     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
-     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
-     330,   331,   332,   333,   334,    -1,   336,   337,   338,   339,
-     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
-     350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
-     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
-      -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
-      -1,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
-     390,   391,   392,   393,   394,    -1,    -1,   397,   398,   399,
-     400,   401,   402,   403,    -1,   405,   406,   407,   408,   409,
-     410,    -1,    -1,   413,    -1,   415,   416,   417,   418,   419,
-     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,    -1,    -1,   436,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     450,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
-      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
-      56,    -1,    -1,    59,    60,    61,    62,    63,    -1,    65,
-      66,    67,    68,    69,    -1,    71,    -1,    73,    74,    75,
-      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
-      86,    87,    -1,    89,    90,    91,    92,    -1,    -1,    -1,
-      96,    -1,    -1,    -1,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,    -1,   110,    -1,   112,   113,   114,   115,
-     116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
-     126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
-      -1,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
-     156,   157,    -1,   159,   160,   161,   162,    -1,   164,   165,
-      -1,   167,   168,    -1,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
-     186,    -1,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,    -1,    -1,   212,   213,   214,   215,
-     216,    -1,   218,   219,   220,    -1,    -1,   223,   224,   225,
-     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,   239,   240,   241,   242,   243,    -1,   245,
-     246,   247,   248,    -1,   250,   251,   252,   253,   254,   255,
-      -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
-     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
-     276,   277,    -1,   279,   280,   281,   282,   283,   284,   285,
-     286,    -1,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   300,    -1,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
-     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,    -1,   330,   331,   332,   333,   334,    -1,
-     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
-      -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
-     356,   357,   358,    -1,   360,   361,    -1,   363,   364,   365,
-     366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
-     376,   377,   378,   379,    -1,   381,   382,   383,   384,   385,
-     386,   387,    -1,    -1,   390,   391,   392,   393,   394,    -1,
-      -1,   397,   398,   399,   400,   401,   402,   403,    -1,   405,
-     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
-     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,    -1,    -1,
-       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   450,    18,    19,    20,    21,    22,
-      23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    -1,
-      43,    44,    45,    46,    47,    -1,    49,    50,    -1,    52,
-      53,    54,    55,    56,    -1,    -1,    59,    60,    61,    62,
-      63,    -1,    65,    66,    67,    68,    69,    -1,    -1,    -1,
-      73,    74,    75,    76,    -1,    78,    79,    80,    -1,    82,
-      83,    84,    85,    86,    87,    -1,    -1,    90,    91,    92,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
-     113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
-     123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
-     133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
-      -1,   154,    -1,   156,    -1,    -1,    -1,   160,   161,   162,
-      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
-     173,   174,    -1,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,   185,   186,    -1,   188,    -1,   190,   191,   192,
-     193,   194,   195,   196,    -1,   198,    -1,   200,    -1,    -1,
-     203,    -1,   205,   206,   207,   208,   209,    -1,    -1,   212,
-     213,    -1,   215,    -1,    -1,   218,   219,   220,    -1,    -1,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,    -1,   240,   241,   242,
-     243,    -1,   245,   246,    -1,   248,    -1,   250,   251,   252,
-     253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
-      -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,   272,
-     273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
-     283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-      -1,   314,   315,    -1,   317,   318,   319,   320,   321,   322,
      323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,    -1,   336,   337,   338,   339,   340,    -1,   342,
+     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
      343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
      353,   354,   355,   356,   357,   358,    -1,   360,   361,   362,
-     363,    -1,   365,   366,   367,   368,   369,    -1,   371,   372,
+     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
       -1,    -1,   375,   376,   377,   378,   379,    -1,   381,   382,
      383,   384,   385,   386,   387,    -1,    -1,   390,   391,   392,
-     393,   394,    -1,    -1,   397,   398,   399,   400,   401,   402,
-     403,    -1,   405,    -1,   407,   408,   409,   410,    -1,    -1,
+     393,   394,   395,    -1,   397,   398,   399,   400,   401,   402,
+     403,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
      413,    -1,   415,   416,   417,   418,   419,   420,   421,   422,
      423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
      433,    -1,    -1,   436,     3,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,    -1,    18,
       19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
       29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
-      -1,    40,    41,    -1,    43,    44,    45,    46,    47,    -1,
-      49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
+      -1,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    -1,    52,    53,    54,    55,    56,    -1,    58,
       59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
-      69,    -1,    -1,    -1,    73,    74,    75,    76,    -1,    78,
+      69,    -1,    71,    -1,    73,    74,    75,    76,    77,    78,
       79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
-      -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
+      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
       -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
      119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
      129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
      139,   140,   141,   142,   143,   144,   145,    -1,   147,    -1,
-     149,   150,   151,   152,    -1,   154,    -1,   156,    -1,    -1,
-      -1,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
-      -1,   170,   171,   172,   173,   174,    -1,   176,   177,   178,
+     149,   150,   151,   152,    -1,   154,    -1,   156,   157,    -1,
+     159,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
+      -1,   170,   171,   172,   173,   174,   175,   176,   177,   178,
      179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
-      -1,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
-      -1,   200,    -1,    -1,   203,    -1,   205,   206,   207,   208,
-     209,    -1,    -1,   212,   213,    -1,   215,    -1,    -1,   218,
-     219,   220,    -1,    -1,   223,   224,   225,   226,   227,   228,
+     189,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
+      -1,   200,   201,   202,   203,   204,   205,   206,   207,   208,
+     209,   210,    -1,   212,   213,   214,   215,   216,    -1,   218,
+     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
      229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-      -1,   240,   241,   242,   243,    -1,   245,   246,    -1,   248,
+     239,   240,   241,   242,   243,    -1,   245,   246,   247,   248,
       -1,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
-      -1,   260,   261,   262,    -1,    -1,   265,   266,    -1,   268,
-      -1,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
+     259,   260,   261,   262,    -1,    -1,   265,   266,   267,   268,
+     269,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
      279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
      289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
      299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,    -1,   314,   315,    -1,   317,   318,
+     309,   310,   311,   312,    -1,   314,   315,   316,   317,   318,
      319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-      -1,   330,   331,   332,   333,   334,    -1,   336,   337,   338,
-     339,   340,    -1,   342,   343,   344,   345,    -1,   347,   348,
+      -1,   330,   331,   332,   333,   334,   335,   336,   337,   338,
+     339,   340,   341,   342,   343,   344,   345,    -1,   347,   348,
      349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
-      -1,   360,   361,    -1,   363,    -1,   365,   366,   367,   368,
+      -1,   360,   361,    -1,   363,   364,   365,   366,   367,   368,
      369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
      379,    -1,   381,   382,   383,   384,   385,   386,   387,    -1,
-      -1,   390,   391,   392,   393,   394,    -1,    -1,   397,   398,
-     399,   400,   401,   402,   403,    -1,   405,    -1,   407,   408,
+      -1,   390,   391,   392,   393,   394,   395,    -1,   397,   398,
+     399,   400,   401,   402,   403,    -1,   405,   406,   407,   408,
      409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
      419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
      429,   430,   431,   432,   433,    -1,    -1,     3,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,   450,    18,    19,    20,    21,    22,    23,    24,    25,
       -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    37,    38,    -1,    40,    41,    -1,    43,    44,    45,
-      46,    47,    -1,    49,    50,    -1,    52,    53,    54,    55,
-      56,    -1,    -1,    59,    60,    61,    62,    63,    -1,    65,
-      66,    67,    68,    69,    -1,    -1,    -1,    73,    74,    75,
-      76,    -1,    78,    79,    80,    -1,    82,    83,    84,    85,
-      86,    87,    -1,    -1,    90,    91,    92,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   100,   101,   102,   103,   104,   105,
+      -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
+      56,    -1,    58,    59,    60,    61,    62,    63,    -1,    65,
+      66,    67,    68,    69,    -1,    71,    -1,    73,    74,    75,
+      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
+      86,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
      106,   107,   108,    -1,   110,    -1,   112,   113,   114,   115,
      116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
      126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
       -1,   137,   138,   139,   140,   141,   142,   143,   144,   145,
       -1,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
-     156,    -1,    -1,    -1,   160,   161,   162,    -1,   164,   165,
-      -1,   167,   168,    -1,   170,   171,   172,   173,   174,    -1,
+     156,   157,    -1,   159,   160,   161,   162,    -1,   164,   165,
+      -1,   167,   168,    -1,   170,   171,   172,   173,   174,   175,
      176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
-     186,    -1,   188,    -1,   190,   191,   192,   193,   194,   195,
-     196,    -1,   198,    -1,   200,    -1,    -1,   203,    -1,   205,
-     206,   207,   208,   209,    -1,    -1,   212,   213,    -1,   215,
-      -1,    -1,   218,   219,   220,    -1,    -1,   223,   224,   225,
+     186,    -1,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,    -1,    -1,   212,   213,   214,   215,
+     216,    -1,   218,   219,   220,   221,   222,   223,   224,   225,
      226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,    -1,   240,   241,   242,   243,    -1,   245,
-     246,    -1,   248,    -1,   250,   251,   252,   253,   254,   255,
+     236,   237,   238,   239,   240,   241,   242,   243,    -1,   245,
+     246,   247,   248,    -1,   250,   251,   252,   253,   254,   255,
       -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
-     266,    -1,   268,    -1,   270,   271,   272,   273,   274,   275,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
      276,   277,    -1,   279,   280,   281,   282,   283,   284,   285,
      286,    -1,   288,   289,   290,   291,   292,   293,   294,   295,
      296,   297,   298,   299,   300,    -1,   302,   303,   304,   305,
      306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
-      -1,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,    -1,   330,   331,   332,   333,   334,    -1,
-     336,   337,   338,   339,   340,    -1,   342,   343,   344,   345,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,    -1,   330,   331,   332,   333,   334,   335,
+     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
       -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
-     356,   357,   358,    -1,   360,   361,    -1,   363,    -1,   365,
+     356,   357,   358,    -1,   360,   361,    -1,   363,   364,   365,
      366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
      376,   377,   378,   379,    -1,   381,   382,   383,   384,   385,
-     386,   387,    -1,    -1,   390,   391,   392,   393,   394,    -1,
+     386,   387,    -1,    -1,   390,   391,   392,   393,   394,   395,
       -1,   397,   398,   399,   400,   401,   402,   403,    -1,   405,
-      -1,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
+     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
      426,   427,   428,   429,   430,   431,   432,   433,    -1,    -1,
        3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   450,    18,    19,    20,    21,    22,
       23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    -1,
-      43,    44,    45,    46,    47,    -1,    49,    50,    -1,    52,
-      53,    54,    55,    56,    -1,    -1,    59,    60,    61,    62,
-      63,    -1,    65,    66,    67,    68,    69,    -1,    -1,    -1,
-      73,    74,    75,    76,    -1,    78,    79,    80,    -1,    82,
-      83,    84,    85,    86,    87,    -1,    -1,    90,    91,    92,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,   101,   102,
+      -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    -1,    52,
+      53,    54,    55,    56,    -1,    58,    59,    60,    61,    62,
+      63,    -1,    65,    66,    67,    68,    69,    -1,    71,    -1,
+      73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
+      83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
      103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
      113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
      123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
      133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
      143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
-      -1,   154,    -1,   156,    -1,    -1,    -1,   160,   161,   162,
+      -1,   154,    -1,   156,   157,    -1,   159,   160,   161,   162,
       -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
-     173,   174,    -1,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,   185,   186,    -1,   188,    -1,   190,   191,   192,
-     193,   194,   195,   196,    -1,   198,    -1,   200,    -1,    -1,
-     203,    -1,   205,   206,   207,   208,   209,    -1,    -1,   212,
-     213,    -1,   215,    -1,    -1,   218,   219,   220,    -1,    -1,
+     173,   174,   175,   176,   177,   178,   179,    -1,   181,   182,
+     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
+     193,   194,   195,   196,    -1,   198,    -1,   200,   201,   202,
+     203,   204,   205,   206,   207,   208,   209,    -1,    -1,   212,
+     213,   214,   215,   216,    -1,   218,   219,   220,   221,   222,
      223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,    -1,   240,   241,   242,
-     243,    -1,   245,   246,    -1,   248,    -1,   250,   251,   252,
+     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
+     243,    -1,   245,   246,   247,   248,    -1,   250,   251,   252,
      253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
-      -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,   272,
+      -1,    -1,   265,   266,   267,   268,   269,   270,   271,   272,
      273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
      283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
      293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
      303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-      -1,   314,   315,    -1,   317,   318,   319,   320,   321,   322,
+      -1,   314,   315,   316,   317,   318,   319,   320,   321,   322,
      323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
-     333,   334,    -1,   336,   337,   338,   339,   340,    -1,   342,
+     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
      343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
      353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
-     363,    -1,   365,   366,   367,   368,   369,    -1,   371,   372,
+     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
       -1,    -1,   375,   376,   377,   378,   379,    -1,   381,   382,
      383,   384,   385,   386,   387,    -1,    -1,   390,   391,   392,
-     393,   394,    -1,    -1,   397,   398,   399,   400,   401,   402,
-     403,    -1,   405,    -1,   407,   408,   409,   410,    -1,    -1,
+     393,   394,   395,    -1,   397,   398,   399,   400,   401,   402,
+     403,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
      413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
      423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,    -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+     433,    -1,    -1,     3,     4,     5,    -1,    -1,    -1,     9,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,    18,    19,
       20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
-      40,    41,    -1,    43,    44,    45,    46,    47,    -1,    49,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
       50,    -1,    52,    53,    54,    55,    56,    -1,    -1,    59,
       60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
-      -1,    -1,    -1,    73,    74,    75,    76,    -1,    78,    79,
-      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    -1,
-      90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    71,    -1,    73,    74,    75,    76,    77,    78,    79,
+      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    89,
+      90,    91,    92,    -1,    -1,    -1,    96,    -1,    -1,    -1,
      100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
      110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
      120,    -1,    -1,   123,   124,   125,   126,   127,    -1,   129,
      130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
-     150,   151,   152,    -1,   154,    -1,   156,    -1,    -1,    -1,
+     140,   141,   142,   143,   144,   145,   146,   147,    -1,   149,
+     150,   151,   152,    -1,   154,    -1,   156,   157,    -1,   159,
      160,   161,   162,    -1,   164,   165,    -1,   167,   168,    -1,
-     170,   171,   172,   173,   174,    -1,   176,   177,   178,   179,
-      -1,   181,   182,   183,   184,   185,   186,    -1,   188,    -1,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      -1,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
      190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
-     200,    -1,    -1,   203,    -1,   205,   206,   207,   208,   209,
-      -1,    -1,   212,   213,    -1,   215,    -1,    -1,   218,   219,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+      -1,    -1,   212,   213,   214,   215,   216,    -1,   218,   219,
      220,    -1,    -1,   223,   224,   225,   226,   227,   228,   229,
-     230,   231,   232,   233,   234,   235,   236,   237,   238,    -1,
-     240,   241,   242,   243,    -1,   245,   246,    -1,   248,    -1,
-     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
-     260,   261,   262,    -1,    -1,   265,   266,    -1,   268,    -1,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,    -1,   245,   246,   247,   248,    -1,
+     250,   251,   252,   253,   254,   255,    -1,   257,   258,    -1,
+     260,   261,   262,    -1,    -1,   265,   266,   267,   268,   269,
      270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
      280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
      290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
      300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,    -1,   314,   315,    -1,   317,   318,   319,
+     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
      320,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
      330,   331,   332,   333,   334,    -1,   336,   337,   338,   339,
-     340,    -1,   342,   343,   344,   345,    -1,   347,   348,   349,
+     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
      350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
-     360,   361,    -1,   363,    -1,   365,   366,   367,   368,   369,
+     360,   361,    -1,   363,   364,   365,   366,   367,   368,   369,
       -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
-      -1,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
+     380,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
      390,   391,   392,   393,   394,    -1,    -1,   397,   398,   399,
-     400,   401,   402,   403,    -1,   405,    -1,   407,   408,   409,
+     400,   401,   402,   403,    -1,   405,   406,   407,   408,   409,
      410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,    -1,    -1,    -1,    -1,    -1,     3,
-       4,     5,    -1,    -1,     8,     9,    -1,    -1,    -1,    -1,
-     450,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    -1,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    -1,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
-     134,   135,   136,   137,   138,   139,   140,    -1,   142,   143,
-     144,    -1,   146,   147,   148,   149,   150,   151,   152,   153,
-     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
-     164,    -1,   166,    -1,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,   185,   186,   187,   188,   189,    -1,   191,   192,   193,
-     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,   210,   211,   212,    -1,
-     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
-     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
-     234,   235,   236,   237,   238,   239,   240,   241,   242,    -1,
-     244,   245,   246,   247,   248,   249,    -1,   251,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,    -1,   267,   268,   269,    -1,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,    -1,   282,    -1,
-     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
-     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-     314,   315,   316,   317,   318,   319,    -1,   321,   322,   323,
-     324,   325,   326,   327,   328,   329,   330,   331,   332,   333,
-     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
-     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-     354,   355,   356,   357,    -1,   359,   360,   361,   362,   363,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,    -1,   378,    -1,   380,   381,   382,   383,
-     384,   385,   386,   387,   388,   389,   390,   391,   392,   393,
-     394,   395,   396,   397,   398,   399,   400,   401,    -1,   403,
-     404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
-     414,   415,   416,   417,   418,   419,   420,   421,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   431,   432,   433,
-      -1,     3,    -1,   437,   438,   439,     8,   441,   442,   443,
-     444,   445,   446,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,
-      -1,    43,    44,    45,    46,    47,    -1,    49,    50,    -1,
-      52,    53,    54,    55,    56,    -1,    -1,    59,    60,    61,
-      62,    63,    -1,    65,    66,    67,    68,    69,    -1,    -1,
-      -1,    73,    74,    75,    76,    -1,    78,    79,    80,    -1,
-      82,    83,    84,    85,    86,    87,    -1,    -1,    90,    91,
-      92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
-     112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
-      -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
-      -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
-     152,    -1,   154,    -1,   156,    -1,    -1,    -1,   160,   161,
-     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
-     172,   173,   174,    -1,   176,   177,   178,   179,    -1,   181,
-     182,   183,   184,   185,   186,    -1,   188,    -1,   190,   191,
-     192,   193,   194,   195,   196,    -1,   198,    -1,   200,    -1,
-      -1,   203,    -1,   205,   206,   207,   208,   209,    -1,    -1,
-     212,   213,    -1,   215,    -1,    -1,   218,   219,   220,    -1,
-      -1,   223,   224,   225,   226,   227,   228,   229,   230,   231,
-     232,   233,   234,   235,   236,   237,   238,    -1,   240,   241,
-     242,   243,    -1,   245,   246,    -1,   248,    -1,   250,   251,
-     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
-     262,    -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,
-     272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
-     282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
-     292,   293,   294,   295,   296,   297,   298,   299,   300,    -1,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,    -1,   314,   315,    -1,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,   328,    -1,   330,   331,
-     332,   333,   334,    -1,   336,   337,   338,   339,   340,    -1,
-     342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
-     352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
-      -1,   363,    -1,   365,   366,   367,   368,   369,    -1,   371,
-     372,    -1,    -1,   375,   376,   377,   378,   379,    -1,   381,
-     382,   383,   384,   385,   386,   387,    -1,    -1,   390,   391,
-     392,   393,   394,    -1,    -1,   397,   398,   399,   400,   401,
-     402,   403,    -1,   405,    -1,   407,   408,   409,   410,    -1,
-      -1,   413,    -1,    -1,   416,   417,   418,   419,   420,   421,
-     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,    -1,     3,    -1,   437,   438,   439,     8,   441,
-     442,   443,   444,   445,   446,    15,    16,    17,    18,    19,
+     430,   431,   432,   433,    -1,    -1,     3,    -1,    -1,    -1,
+      -1,   441,   442,   443,    -1,    -1,    -1,    -1,    -1,    -1,
+     450,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
+      27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,    -1,
+      37,    38,    -1,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
+      -1,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    69,    -1,    71,    -1,    73,    74,    75,    76,
+      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
+      87,    -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,
+      -1,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
+      -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
+     127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
+     157,    -1,   159,   160,   161,   162,    -1,   164,   165,    -1,
+     167,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
+      -1,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+      -1,   198,    -1,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,    -1,    -1,   212,   213,   214,   215,   216,
+      -1,   218,   219,   220,    -1,    -1,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,    -1,   245,   246,
+     247,   248,    -1,   250,   251,   252,   253,   254,   255,    -1,
+     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
+      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,    -1,   314,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
+     327,   328,   329,   330,   331,   332,   333,   334,    -1,   336,
+     337,   338,   339,   340,   341,   342,   343,   344,   345,    -1,
+     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
+     357,   358,    -1,   360,   361,   362,   363,   364,   365,   366,
+     367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
+     377,   378,   379,    -1,   381,   382,   383,   384,   385,   386,
+     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
+     397,   398,   399,   400,   401,   402,   403,    -1,   405,   406,
+     407,   408,   409,   410,    -1,    -1,   413,    -1,   415,   416,
+     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,    -1,    -1,   436,
+       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   450,    -1,    18,    19,    20,    21,    22,
+      23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    -1,    52,
+      53,    54,    55,    56,    -1,    -1,    59,    60,    61,    62,
+      63,    -1,    65,    66,    67,    68,    69,    -1,    71,    -1,
+      73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
+      83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
+      -1,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
+     113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
+     123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
+     133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
+     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
+      -1,   154,    -1,   156,   157,    -1,   159,   160,   161,   162,
+      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,    -1,   181,   182,
+     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
+     193,   194,   195,   196,    -1,   198,    -1,   200,   201,   202,
+     203,   204,   205,   206,   207,   208,   209,    -1,    -1,   212,
+     213,   214,   215,   216,    -1,   218,   219,   220,    -1,    -1,
+     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
+     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
+     243,    -1,   245,   246,   247,   248,    -1,   250,   251,   252,
+     253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
+      -1,    -1,   265,   266,   267,   268,   269,   270,   271,   272,
+     273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
+     283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
+     293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+      -1,   314,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
+     333,   334,    -1,   336,   337,   338,   339,   340,   341,   342,
+     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
+     353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
+     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
+      -1,    -1,   375,   376,   377,   378,   379,    -1,   381,   382,
+     383,   384,   385,   386,   387,    -1,    -1,   390,   391,   392,
+     393,   394,    -1,    -1,   397,   398,   399,   400,   401,   402,
+     403,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
+     413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
+     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
+     433,    -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,    18,    19,
       20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
       40,    41,    -1,    43,    44,    45,    46,    47,    -1,    49,
@@ -15964,63 +15657,20 @@
      290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
      300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
      310,   311,   312,    -1,   314,   315,    -1,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
      330,   331,   332,   333,   334,    -1,   336,   337,   338,   339,
      340,    -1,   342,   343,   344,   345,    -1,   347,   348,   349,
      350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
-     360,   361,    -1,   363,    -1,   365,   366,   367,   368,   369,
+     360,   361,   362,   363,    -1,   365,   366,   367,   368,   369,
       -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
       -1,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
      390,   391,   392,   393,   394,    -1,    -1,   397,   398,   399,
      400,   401,   402,   403,    -1,   405,    -1,   407,   408,   409,
-     410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
+     410,    -1,    -1,   413,    -1,   415,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,    -1,     3,    -1,   437,   438,   439,
-       8,   441,   442,   443,   444,   445,   446,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
-      28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-      38,    -1,    40,    41,    -1,    43,    44,    45,    46,    47,
-      -1,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
-      -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
-      68,    69,    -1,    -1,    -1,    73,    74,    75,    76,    -1,
-      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
-      -1,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
-     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
-      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,    -1,
-      -1,    -1,   160,   161,   162,    -1,   164,   165,    -1,   167,
-     168,    -1,   170,   171,   172,   173,   174,    -1,   176,   177,
-     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
-     188,    -1,   190,   191,   192,   193,   194,   195,   196,    -1,
-     198,    -1,   200,    -1,    -1,   203,    -1,   205,   206,   207,
-     208,   209,    -1,    -1,   212,   213,    -1,   215,    -1,    -1,
-     218,   219,   220,    -1,    -1,   223,   224,   225,   226,   227,
-     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
-     238,    -1,   240,   241,   242,   243,    -1,   245,   246,    -1,
-     248,    -1,   250,   251,   252,   253,   254,   255,    -1,   257,
-      -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,    -1,
-     268,    -1,   270,   271,   272,   273,   274,   275,   276,   277,
-      -1,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
-     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,    -1,   314,   315,    -1,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,    -1,   330,   331,   332,   333,   334,    -1,   336,   337,
-     338,   339,   340,    -1,   342,   343,   344,   345,    -1,   347,
-     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
-     358,    -1,   360,   361,    -1,   363,    -1,   365,   366,   367,
-     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,   377,
-     378,   379,    -1,   381,   382,   383,   384,   385,   386,   387,
-      -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,   397,
-     398,   399,   400,   401,   402,   403,    -1,   405,    -1,   407,
-     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
-     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,    -1,     3,    -1,   437,
-     438,   439,     8,   441,   442,   443,   444,   445,   446,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+     430,   431,   432,   433,    -1,    -1,   436,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     450,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
       -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    37,    38,    -1,    40,    41,    -1,    43,    44,    45,
       46,    47,    -1,    49,    50,    -1,    52,    53,    54,    55,
@@ -16061,95 +15711,52 @@
       -1,   397,   398,   399,   400,   401,   402,   403,    -1,   405,
       -1,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,    -1,     3,
-      -1,   437,   438,   439,     8,   441,   442,   443,   444,   445,
-     446,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    37,    38,    -1,    40,    41,    -1,    43,
-      44,    45,    46,    47,    -1,    49,    50,    -1,    52,    53,
-      54,    55,    56,    -1,    -1,    59,    60,    61,    62,    63,
-      -1,    65,    66,    67,    68,    69,    -1,    -1,    -1,    73,
-      74,    75,    76,    -1,    78,    79,    80,    -1,    82,    83,
-      84,    85,    86,    87,    -1,    -1,    90,    91,    92,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,    -1,   110,    -1,   112,   113,
-     114,   115,   116,    -1,   118,   119,   120,    -1,    -1,   123,
-     124,   125,   126,   127,    -1,   129,   130,   131,    -1,   133,
-     134,   135,    -1,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,    -1,   147,    -1,   149,   150,   151,   152,    -1,
-     154,    -1,   156,    -1,    -1,    -1,   160,   161,   162,    -1,
-     164,   165,    -1,   167,   168,    -1,   170,   171,   172,   173,
-     174,    -1,   176,   177,   178,   179,    -1,   181,   182,   183,
-     184,   185,   186,    -1,   188,    -1,   190,   191,   192,   193,
-     194,   195,   196,    -1,   198,    -1,   200,    -1,    -1,   203,
-      -1,   205,   206,   207,   208,   209,    -1,    -1,   212,   213,
-      -1,   215,    -1,    -1,   218,   219,   220,    -1,    -1,   223,
-     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
-     234,   235,   236,   237,   238,    -1,   240,   241,   242,   243,
-      -1,   245,   246,    -1,   248,    -1,   250,   251,   252,   253,
-     254,   255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,
-      -1,   265,   266,    -1,   268,    -1,   270,   271,   272,   273,
-     274,   275,   276,   277,    -1,   279,   280,   281,   282,   283,
-     284,   285,   286,    -1,   288,   289,   290,   291,   292,   293,
-     294,   295,   296,   297,   298,   299,   300,    -1,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
-     314,   315,    -1,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
-     334,    -1,   336,   337,   338,   339,   340,    -1,   342,   343,
-     344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
-     354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
-      -1,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
-      -1,   375,   376,   377,   378,   379,    -1,   381,   382,   383,
-     384,   385,   386,   387,    -1,    -1,   390,   391,   392,   393,
-     394,    -1,    -1,   397,   398,   399,   400,   401,   402,   403,
-      -1,   405,    -1,   407,   408,   409,   410,    -1,    -1,   413,
-      -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-      -1,     3,    -1,   437,   438,   439,     8,   441,   442,   443,
-     444,   445,   446,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,
-      -1,    43,    44,    45,    46,    47,    -1,    49,    50,    -1,
-      52,    53,    54,    55,    56,    -1,    -1,    59,    60,    61,
-      62,    63,    -1,    65,    66,    67,    68,    69,    -1,    -1,
-      -1,    73,    74,    75,    76,    -1,    78,    79,    80,    -1,
-      82,    83,    84,    85,    86,    87,    -1,    -1,    90,    91,
-      92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
-     112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
-      -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
-      -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
-     152,    -1,   154,    -1,   156,    -1,    -1,    -1,   160,   161,
-     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
-     172,   173,   174,    -1,   176,   177,   178,   179,    -1,   181,
-     182,   183,   184,   185,   186,    -1,   188,    -1,   190,   191,
-     192,   193,   194,   195,   196,    -1,   198,    -1,   200,    -1,
-      -1,   203,    -1,   205,   206,   207,   208,   209,    -1,    -1,
-     212,   213,    -1,   215,    -1,    -1,   218,   219,   220,    -1,
-      -1,   223,   224,   225,   226,   227,   228,   229,   230,   231,
-     232,   233,   234,   235,   236,   237,   238,    -1,   240,   241,
-     242,   243,    -1,   245,   246,    -1,   248,    -1,   250,   251,
-     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
-     262,    -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,
-     272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
-     282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
-     292,   293,   294,   295,   296,   297,   298,   299,   300,    -1,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,    -1,   314,   315,    -1,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,   328,    -1,   330,   331,
-     332,   333,   334,    -1,   336,   337,   338,   339,   340,    -1,
-     342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
-     352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
-      -1,   363,    -1,   365,   366,   367,   368,   369,    -1,   371,
-     372,    -1,    -1,   375,   376,   377,   378,   379,    -1,   381,
-     382,   383,   384,   385,   386,   387,    -1,    -1,   390,   391,
-     392,   393,   394,    -1,    -1,   397,   398,   399,   400,   401,
-     402,   403,    -1,   405,    -1,   407,   408,   409,   410,    -1,
-      -1,   413,    -1,    -1,   416,   417,   418,   419,   420,   421,
-     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,    -1,     3,    -1,   437,   438,   439,     8,   441,
-     442,   443,   444,   445,   446,    15,    16,    17,    18,    19,
+     426,   427,   428,   429,   430,   431,   432,   433,    -1,    -1,
+       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   450,    18,    19,    20,    21,    22,
+      23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    -1,
+      43,    44,    45,    46,    47,    -1,    49,    50,    -1,    52,
+      53,    54,    55,    56,    -1,    -1,    59,    60,    61,    62,
+      63,    -1,    65,    66,    67,    68,    69,    -1,    -1,    -1,
+      73,    74,    75,    76,    -1,    78,    79,    80,    -1,    82,
+      83,    84,    85,    86,    87,    -1,    -1,    90,    91,    92,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
+     113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
+     123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
+     133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
+     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
+      -1,   154,    -1,   156,    -1,    -1,    -1,   160,   161,   162,
+      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
+     173,   174,    -1,   176,   177,   178,   179,    -1,   181,   182,
+     183,   184,   185,   186,    -1,   188,    -1,   190,   191,   192,
+     193,   194,   195,   196,    -1,   198,    -1,   200,    -1,    -1,
+     203,    -1,   205,   206,   207,   208,   209,    -1,    -1,   212,
+     213,    -1,   215,    -1,    -1,   218,   219,   220,    -1,    -1,
+     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
+     233,   234,   235,   236,   237,   238,    -1,   240,   241,   242,
+     243,    -1,   245,   246,    -1,   248,    -1,   250,   251,   252,
+     253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
+      -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,   272,
+     273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
+     283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
+     293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+      -1,   314,   315,    -1,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
+     333,   334,    -1,   336,   337,   338,   339,   340,    -1,   342,
+     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
+     353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
+     363,    -1,   365,   366,   367,   368,   369,    -1,   371,   372,
+      -1,    -1,   375,   376,   377,   378,   379,    -1,   381,   382,
+     383,   384,   385,   386,   387,    -1,    -1,   390,   391,   392,
+     393,   394,    -1,    -1,   397,   398,   399,   400,   401,   402,
+     403,    -1,   405,    -1,   407,   408,   409,   410,    -1,    -1,
+     413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
+     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
+     433,    -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,    18,    19,
       20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
       40,    41,    -1,    43,    44,    45,    46,    47,    -1,    49,
@@ -16191,180 +15798,441 @@
      400,   401,   402,   403,    -1,   405,    -1,   407,   408,   409,
      410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,     3,    -1,    -1,   437,   438,   439,
-      -1,   441,   442,   443,   444,   445,   446,    -1,    -1,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
+     430,   431,   432,   433,    -1,    -1,     3,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     450,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
+      27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      37,    38,    -1,    40,    41,    -1,    43,    44,    45,    46,
+      47,    -1,    49,    50,    -1,    52,    53,    54,    55,    56,
+      -1,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    69,    -1,    -1,    -1,    73,    74,    75,    76,
+      -1,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
+      87,    -1,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
+      -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
+     127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
+      -1,    -1,    -1,   160,   161,   162,    -1,   164,   165,    -1,
+     167,   168,    -1,   170,   171,   172,   173,   174,    -1,   176,
+     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
+      -1,   188,    -1,   190,   191,   192,   193,   194,   195,   196,
+      -1,   198,    -1,   200,    -1,    -1,   203,    -1,   205,   206,
+     207,   208,   209,    -1,    -1,   212,   213,    -1,   215,    -1,
+      -1,   218,   219,   220,    -1,    -1,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,    -1,   240,   241,   242,   243,    -1,   245,   246,
+      -1,   248,    -1,   250,   251,   252,   253,   254,   255,    -1,
+     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
+      -1,   268,    -1,   270,   271,   272,   273,   274,   275,   276,
+     277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
+      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,    -1,   314,   315,    -1,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
+     327,   328,    -1,   330,   331,   332,   333,   334,    -1,   336,
+     337,   338,   339,   340,    -1,   342,   343,   344,   345,    -1,
+     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
+     357,   358,    -1,   360,   361,    -1,   363,    -1,   365,   366,
+     367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
+     377,   378,   379,    -1,   381,   382,   383,   384,   385,   386,
+     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
+     397,   398,   399,   400,   401,   402,   403,    -1,   405,    -1,
+     407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
+     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,    -1,    -1,    -1,
+      -1,    -1,     3,     4,     5,    -1,    -1,     8,     9,    -1,
+      -1,    -1,    -1,   450,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    43,    44,    45,    -1,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    -1,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
+      -1,   142,   143,   144,    -1,   146,   147,   148,   149,   150,
+     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
+     161,   162,   163,   164,    -1,   166,    -1,   168,   169,   170,
+     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+     181,   182,   183,   184,   185,   186,   187,   188,   189,    -1,
+     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
+     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
+     211,   212,    -1,   214,   215,   216,   217,   218,   219,   220,
+     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
+     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
+     241,   242,    -1,   244,   245,   246,   247,   248,   249,    -1,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,    -1,   267,   268,   269,    -1,
+     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
+      -1,   282,    -1,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,   314,   315,   316,   317,   318,   319,    -1,
+     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
+     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
+     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,   354,   355,   356,   357,    -1,   359,   360,
+     361,   362,   363,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,    -1,   378,    -1,   380,
+     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
+     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
+     401,    -1,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
+     421,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     431,   432,   433,    -1,     3,    -1,   437,   438,   439,     8,
+     441,   442,   443,   444,   445,   446,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
+      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
+      -1,    40,    41,    -1,    43,    44,    45,    46,    47,    -1,
+      49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
+      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
+      69,    -1,    -1,    -1,    73,    74,    75,    76,    -1,    78,
+      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
+      -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
+     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
+     129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
+     139,   140,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     149,   150,   151,   152,    -1,   154,    -1,   156,    -1,    -1,
+      -1,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
+      -1,   170,   171,   172,   173,   174,    -1,   176,   177,   178,
+     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
+      -1,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
+      -1,   200,    -1,    -1,   203,    -1,   205,   206,   207,   208,
+     209,    -1,    -1,   212,   213,    -1,   215,    -1,    -1,   218,
+     219,   220,    -1,    -1,   223,   224,   225,   226,   227,   228,
      229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
+      -1,   240,   241,   242,   243,    -1,   245,   246,    -1,   248,
+      -1,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
+      -1,   260,   261,   262,    -1,    -1,   265,   266,    -1,   268,
+      -1,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
+     279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
      289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,    -1,   314,   315,    -1,   317,   318,
      319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
+      -1,   330,   331,   332,   333,   334,    -1,   336,   337,   338,
+     339,   340,    -1,   342,   343,   344,   345,    -1,   347,   348,
      349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
-     359,   360,   361,   362,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,   411,   412,   413,   414,   415,   416,   417,   418,
+      -1,   360,   361,    -1,   363,    -1,   365,   366,   367,   368,
+     369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
+     379,    -1,   381,   382,   383,   384,   385,   386,   387,    -1,
+      -1,   390,   391,   392,   393,   394,    -1,    -1,   397,   398,
+     399,   400,   401,   402,   403,    -1,   405,    -1,   407,   408,
+     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
      419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   443,    -1,    -1,    -1,    -1,    -1,
-      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
-      28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-      38,    -1,    40,    41,    -1,    43,    44,    45,    46,    47,
-      -1,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
-      -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
-      68,    69,    -1,    -1,    -1,    73,    74,    75,    76,    -1,
-      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
-      -1,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
-     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
-      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,    -1,
-      -1,    -1,   160,   161,   162,    -1,   164,   165,    -1,   167,
-     168,    -1,   170,   171,   172,   173,   174,    -1,   176,   177,
-     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
-     188,    -1,   190,   191,   192,   193,   194,   195,   196,    -1,
-     198,    -1,   200,    -1,    -1,   203,    -1,   205,   206,   207,
-     208,   209,    -1,    -1,   212,   213,    -1,   215,    -1,    -1,
-     218,   219,   220,    -1,    -1,   223,   224,   225,   226,   227,
-     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
-     238,    -1,   240,   241,   242,   243,    -1,   245,   246,    -1,
-     248,    -1,   250,   251,   252,   253,   254,   255,    -1,   257,
-      -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,    -1,
-     268,    -1,   270,   271,   272,   273,   274,   275,   276,   277,
-      -1,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
-     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,    -1,   314,   315,    -1,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,    -1,   330,   331,   332,   333,   334,    -1,   336,   337,
-     338,   339,   340,    -1,   342,   343,   344,   345,    -1,   347,
-     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
-     358,    -1,   360,   361,    -1,   363,    -1,   365,   366,   367,
-     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,   377,
-     378,   379,    -1,   381,   382,   383,   384,   385,   386,   387,
-      -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,   397,
-     398,   399,   400,   401,   402,   403,    -1,   405,    -1,   407,
-     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
-     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,     3,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   443,    -1,    -1,    -1,    -1,
-      -1,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
+     429,   430,   431,   432,   433,    -1,     3,    -1,   437,   438,
+     439,     8,   441,   442,   443,   444,   445,   446,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
+      27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      37,    38,    -1,    40,    41,    -1,    43,    44,    45,    46,
+      47,    -1,    49,    50,    -1,    52,    53,    54,    55,    56,
+      -1,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    69,    -1,    -1,    -1,    73,    74,    75,    76,
+      -1,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
+      87,    -1,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
+      -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
+     127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
+      -1,    -1,    -1,   160,   161,   162,    -1,   164,   165,    -1,
+     167,   168,    -1,   170,   171,   172,   173,   174,    -1,   176,
+     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
+      -1,   188,    -1,   190,   191,   192,   193,   194,   195,   196,
+      -1,   198,    -1,   200,    -1,    -1,   203,    -1,   205,   206,
+     207,   208,   209,    -1,    -1,   212,   213,    -1,   215,    -1,
+      -1,   218,   219,   220,    -1,    -1,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,    -1,   240,   241,   242,   243,    -1,   245,   246,
+      -1,   248,    -1,   250,   251,   252,   253,   254,   255,    -1,
+     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
+      -1,   268,    -1,   270,   271,   272,   273,   274,   275,   276,
+     277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
+      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,    -1,   314,   315,    -1,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
+     327,   328,    -1,   330,   331,   332,   333,   334,    -1,   336,
+     337,   338,   339,   340,    -1,   342,   343,   344,   345,    -1,
+     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
+     357,   358,    -1,   360,   361,    -1,   363,    -1,   365,   366,
+     367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
+     377,   378,   379,    -1,   381,   382,   383,   384,   385,   386,
+     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
+     397,   398,   399,   400,   401,   402,   403,    -1,   405,    -1,
+     407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
+     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,    -1,     3,    -1,
+     437,   438,   439,     8,   441,   442,   443,   444,   445,   446,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    37,    38,    -1,    40,    41,    -1,    43,    44,
+      45,    46,    47,    -1,    49,    50,    -1,    52,    53,    54,
+      55,    56,    -1,    -1,    59,    60,    61,    62,    63,    -1,
+      65,    66,    67,    68,    69,    -1,    -1,    -1,    73,    74,
+      75,    76,    -1,    78,    79,    80,    -1,    82,    83,    84,
+      85,    86,    87,    -1,    -1,    90,    91,    92,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
+     115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
+     125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
+     135,    -1,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,    -1,   147,    -1,   149,   150,   151,   152,    -1,   154,
+      -1,   156,    -1,    -1,    -1,   160,   161,   162,    -1,   164,
+     165,    -1,   167,   168,    -1,   170,   171,   172,   173,   174,
+      -1,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
+     185,   186,    -1,   188,    -1,   190,   191,   192,   193,   194,
+     195,   196,    -1,   198,    -1,   200,    -1,    -1,   203,    -1,
+     205,   206,   207,   208,   209,    -1,    -1,   212,   213,    -1,
+     215,    -1,    -1,   218,   219,   220,    -1,    -1,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,    -1,   240,   241,   242,   243,    -1,
+     245,   246,    -1,   248,    -1,   250,   251,   252,   253,   254,
+     255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,
+     265,   266,    -1,   268,    -1,   270,   271,   272,   273,   274,
+     275,   276,   277,    -1,   279,   280,   281,   282,   283,   284,
+     285,   286,    -1,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,    -1,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
+     315,    -1,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
+      -1,   336,   337,   338,   339,   340,    -1,   342,   343,   344,
+     345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,    -1,   360,   361,    -1,   363,    -1,
+     365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
+     375,   376,   377,   378,   379,    -1,   381,   382,   383,   384,
+     385,   386,   387,    -1,    -1,   390,   391,   392,   393,   394,
+      -1,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
+     405,    -1,   407,   408,   409,   410,    -1,    -1,   413,    -1,
+      -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,    -1,
+       3,    -1,   437,   438,   439,     8,   441,   442,   443,   444,
+     445,   446,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    -1,
+      43,    44,    45,    46,    47,    -1,    49,    50,    -1,    52,
+      53,    54,    55,    56,    -1,    -1,    59,    60,    61,    62,
+      63,    -1,    65,    66,    67,    68,    69,    -1,    -1,    -1,
+      73,    74,    75,    76,    -1,    78,    79,    80,    -1,    82,
+      83,    84,    85,    86,    87,    -1,    -1,    90,    91,    92,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
+     113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
+     123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
+     133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
+     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
+      -1,   154,    -1,   156,    -1,    -1,    -1,   160,   161,   162,
+      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
+     173,   174,    -1,   176,   177,   178,   179,    -1,   181,   182,
+     183,   184,   185,   186,    -1,   188,    -1,   190,   191,   192,
+     193,   194,   195,   196,    -1,   198,    -1,   200,    -1,    -1,
+     203,    -1,   205,   206,   207,   208,   209,    -1,    -1,   212,
+     213,    -1,   215,    -1,    -1,   218,   219,   220,    -1,    -1,
+     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
+     233,   234,   235,   236,   237,   238,    -1,   240,   241,   242,
+     243,    -1,   245,   246,    -1,   248,    -1,   250,   251,   252,
+     253,   254,   255,    -1,   257,    -1,    -1,   260,   261,   262,
+      -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,   272,
+     273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
+     283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
+     293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+      -1,   314,   315,    -1,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
+     333,   334,    -1,   336,   337,   338,   339,   340,    -1,   342,
+     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
+     353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
+     363,    -1,   365,   366,   367,   368,   369,    -1,   371,   372,
+      -1,    -1,   375,   376,   377,   378,   379,    -1,   381,   382,
+     383,   384,   385,   386,   387,    -1,    -1,   390,   391,   392,
+     393,   394,    -1,    -1,   397,   398,   399,   400,   401,   402,
+     403,    -1,   405,    -1,   407,   408,   409,   410,    -1,    -1,
+     413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
+     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
+     433,    -1,     3,    -1,   437,   438,   439,     8,   441,   442,
+     443,   444,   445,   446,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
+      41,    -1,    43,    44,    45,    46,    47,    -1,    49,    50,
+      -1,    52,    53,    54,    55,    56,    -1,    -1,    59,    60,
+      61,    62,    63,    -1,    65,    66,    67,    68,    69,    -1,
+      -1,    -1,    73,    74,    75,    76,    -1,    78,    79,    80,
+      -1,    82,    83,    84,    85,    86,    87,    -1,    -1,    90,
+      91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,    -1,   110,
+      -1,   112,   113,   114,   115,   116,    -1,   118,   119,   120,
+      -1,    -1,   123,   124,   125,   126,   127,    -1,   129,   130,
+     131,    -1,   133,   134,   135,    -1,   137,   138,   139,   140,
+     141,   142,   143,   144,   145,    -1,   147,    -1,   149,   150,
+     151,   152,    -1,   154,    -1,   156,    -1,    -1,    -1,   160,
+     161,   162,    -1,   164,   165,    -1,   167,   168,    -1,   170,
+     171,   172,   173,   174,    -1,   176,   177,   178,   179,    -1,
+     181,   182,   183,   184,   185,   186,    -1,   188,    -1,   190,
+     191,   192,   193,   194,   195,   196,    -1,   198,    -1,   200,
+      -1,    -1,   203,    -1,   205,   206,   207,   208,   209,    -1,
+      -1,   212,   213,    -1,   215,    -1,    -1,   218,   219,   220,
+      -1,    -1,   223,   224,   225,   226,   227,   228,   229,   230,
+     231,   232,   233,   234,   235,   236,   237,   238,    -1,   240,
+     241,   242,   243,    -1,   245,   246,    -1,   248,    -1,   250,
+     251,   252,   253,   254,   255,    -1,   257,    -1,    -1,   260,
+     261,   262,    -1,    -1,   265,   266,    -1,   268,    -1,   270,
+     271,   272,   273,   274,   275,   276,   277,    -1,   279,   280,
+     281,   282,   283,   284,   285,   286,    -1,   288,   289,   290,
+     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
+      -1,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,    -1,   314,   315,    -1,   317,   318,   319,   320,
+     321,   322,   323,   324,   325,   326,   327,   328,    -1,   330,
+     331,   332,   333,   334,    -1,   336,   337,   338,   339,   340,
+      -1,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
+     351,   352,   353,   354,   355,   356,   357,   358,    -1,   360,
+     361,    -1,   363,    -1,   365,   366,   367,   368,   369,    -1,
+     371,   372,    -1,    -1,   375,   376,   377,   378,   379,    -1,
+     381,   382,   383,   384,   385,   386,   387,    -1,    -1,   390,
+     391,   392,   393,   394,    -1,    -1,   397,   398,   399,   400,
+     401,   402,   403,    -1,   405,    -1,   407,   408,   409,   410,
+      -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,   420,
+     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
+     431,   432,   433,    -1,     3,    -1,   437,   438,   439,     8,
+     441,   442,   443,   444,   445,   446,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
+      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
+      -1,    40,    41,    -1,    43,    44,    45,    46,    47,    -1,
+      49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
+      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
+      69,    -1,    -1,    -1,    73,    74,    75,    76,    -1,    78,
+      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
+      -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
+     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
+     129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
+     139,   140,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     149,   150,   151,   152,    -1,   154,    -1,   156,    -1,    -1,
+      -1,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
+      -1,   170,   171,   172,   173,   174,    -1,   176,   177,   178,
+     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
+      -1,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
+      -1,   200,    -1,    -1,   203,    -1,   205,   206,   207,   208,
+     209,    -1,    -1,   212,   213,    -1,   215,    -1,    -1,   218,
+     219,   220,    -1,    -1,   223,   224,   225,   226,   227,   228,
+     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
+      -1,   240,   241,   242,   243,    -1,   245,   246,    -1,   248,
+      -1,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
+      -1,   260,   261,   262,    -1,    -1,   265,   266,    -1,   268,
+      -1,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
+     279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
+     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
+     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,    -1,   314,   315,    -1,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+      -1,   330,   331,   332,   333,   334,    -1,   336,   337,   338,
+     339,   340,    -1,   342,   343,   344,   345,    -1,   347,   348,
+     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
+      -1,   360,   361,    -1,   363,    -1,   365,   366,   367,   368,
+     369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
+     379,    -1,   381,   382,   383,   384,   385,   386,   387,    -1,
+      -1,   390,   391,   392,   393,   394,    -1,    -1,   397,   398,
+     399,   400,   401,   402,   403,    -1,   405,    -1,   407,   408,
+     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
+     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
+     429,   430,   431,   432,   433,    -1,     3,    -1,   437,   438,
+     439,     8,   441,   442,   443,   444,   445,   446,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
       27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    38,    -1,    40,    41,    42,    43,    44,    45,    -1,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
+      37,    38,    -1,    40,    41,    -1,    43,    44,    45,    46,
+      47,    -1,    49,    50,    -1,    52,    53,    54,    55,    56,
       -1,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
-      67,    68,    -1,    -1,    71,    -1,    73,    74,    75,    76,
-      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
-      87,    -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,
+      67,    68,    69,    -1,    -1,    -1,    73,    74,    75,    76,
+      -1,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
+      87,    -1,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
      107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
       -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
      127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
-     137,   138,   139,   140,    -1,   142,   143,   144,    -1,    -1,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,    -1,
      147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
-     157,    -1,   159,   160,   161,   162,    -1,   164,    -1,    -1,
-      -1,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-      -1,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-      -1,   198,    -1,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,    -1,    -1,   212,    -1,   214,   215,   216,
+      -1,    -1,    -1,   160,   161,   162,    -1,   164,   165,    -1,
+     167,   168,    -1,   170,   171,   172,   173,   174,    -1,   176,
+     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
+      -1,   188,    -1,   190,   191,   192,   193,   194,   195,   196,
+      -1,   198,    -1,   200,    -1,    -1,   203,    -1,   205,   206,
+     207,   208,   209,    -1,    -1,   212,   213,    -1,   215,    -1,
       -1,   218,   219,   220,    -1,    -1,   223,   224,   225,   226,
      227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,    -1,    -1,   245,   246,
-     247,   248,    -1,    -1,   251,   252,   253,   254,   255,    -1,
-     257,    -1,    -1,   260,   261,   262,    -1,   264,   265,   266,
-     267,   268,   269,    -1,   271,   272,   273,   274,   275,   276,
-     277,    -1,   279,   280,    -1,   282,    -1,   284,   285,   286,
+     237,   238,    -1,   240,   241,   242,   243,    -1,   245,   246,
+      -1,   248,    -1,   250,   251,   252,   253,   254,   255,    -1,
+     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
+      -1,   268,    -1,   270,   271,   272,   273,   274,   275,   276,
+     277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
       -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
      297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,    -1,   314,   315,   316,
-     317,   318,   319,    -1,   321,   322,   323,   324,   325,   326,
+     307,   308,   309,   310,   311,   312,    -1,   314,   315,    -1,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
      327,   328,    -1,   330,   331,   332,   333,   334,    -1,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,    -1,
+     337,   338,   339,   340,    -1,   342,   343,   344,   345,    -1,
      347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,    -1,    -1,   360,   361,    -1,   363,   364,   365,   366,
+     357,   358,    -1,   360,   361,    -1,   363,    -1,   365,   366,
      367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
-      -1,   378,    -1,    -1,   381,   382,   383,   384,   385,   386,
+     377,   378,   379,    -1,   381,   382,   383,   384,   385,   386,
      387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
-     397,   398,   399,   400,   401,    -1,   403,   404,   405,   406,
+     397,   398,   399,   400,   401,   402,   403,    -1,   405,    -1,
      407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
-     417,   418,   419,   420,   421,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,    -1,   431,   432,   433,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   443,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
-      41,    42,    43,    44,    45,    -1,    47,    48,    49,    50,
-      -1,    52,    53,    54,    55,    56,    -1,    -1,    59,    60,
-      61,    62,    63,    -1,    65,    66,    67,    68,    -1,    -1,
-      71,    -1,    73,    74,    75,    76,    77,    78,    79,    80,
-      -1,    82,    83,    84,    85,    86,    87,    -1,    89,    90,
-      91,    92,    -1,    -1,    -1,    96,    -1,    -1,    -1,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,    -1,   110,
-      -1,   112,   113,   114,   115,   116,    -1,   118,   119,   120,
-      -1,    -1,   123,   124,   125,   126,   127,    -1,   129,   130,
-     131,    -1,   133,   134,   135,    -1,   137,   138,   139,   140,
-      -1,   142,   143,   144,    -1,    -1,   147,    -1,   149,   150,
-     151,   152,    -1,   154,    -1,   156,   157,    -1,   159,   160,
-     161,   162,    -1,   164,    -1,    -1,    -1,   168,    -1,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,    -1,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,    -1,   198,    -1,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,    -1,
-      -1,   212,    -1,   214,   215,   216,    -1,   218,   219,   220,
-      -1,    -1,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,    -1,    -1,   245,   246,   247,   248,    -1,    -1,
-     251,   252,   253,   254,   255,    -1,   257,    -1,    -1,   260,
-     261,   262,    -1,   264,   265,   266,   267,   268,   269,    -1,
-     271,   272,   273,   274,   275,   276,   277,    -1,   279,   280,
-      -1,   282,    -1,   284,   285,   286,    -1,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-      -1,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,    -1,   314,   315,   316,   317,   318,   319,    -1,
-     321,   322,   323,   324,   325,   326,   327,   328,    -1,   330,
-     331,   332,   333,   334,    -1,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
-     351,   352,   353,   354,   355,   356,   357,    -1,    -1,   360,
-     361,    -1,   363,   364,   365,   366,   367,   368,   369,    -1,
-     371,   372,    -1,    -1,   375,   376,    -1,   378,    -1,    -1,
-     381,   382,   383,   384,   385,   386,   387,    -1,    -1,   390,
-     391,   392,   393,   394,    -1,    -1,   397,   398,   399,   400,
-     401,    -1,   403,   404,   405,   406,   407,   408,   409,   410,
-      -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,   420,
-     421,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,    -1,
-     431,   432,   433,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   443,    18,    19,    20,    21,    22,    23,    24,
+     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,     3,    -1,    -1,
+     437,   438,   439,    -1,   441,   442,   443,   444,   445,   446,
+      -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
+     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,   329,   330,   331,   332,   333,   334,   335,
+     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
+     346,   347,   348,   349,   350,   351,   352,   353,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,     3,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   443,    -1,    -1,
+      -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
       25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    37,    38,    -1,    40,    41,    -1,    43,    44,
       45,    46,    47,    -1,    49,    50,    -1,    52,    53,    54,
@@ -16406,137 +16274,136 @@
      405,    -1,   407,   408,   409,   410,    -1,    -1,   413,    -1,
       -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,   433,     3,
-       4,     5,    -1,    -1,    -1,     9,    -1,    -1,   443,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   443,    -1,
       -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,    23,
       24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    37,    38,    -1,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    50,    -1,    52,    53,
+      44,    45,    -1,    47,    48,    49,    50,    -1,    52,    53,
       54,    55,    56,    -1,    -1,    59,    60,    61,    62,    63,
-      -1,    65,    66,    67,    68,    69,    -1,    71,    -1,    73,
+      -1,    65,    66,    67,    68,    -1,    -1,    71,    -1,    73,
       74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
       84,    85,    86,    87,    -1,    89,    90,    91,    92,    -1,
       -1,    -1,    96,    -1,    -1,    -1,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,   109,   110,    -1,   112,   113,
+     104,   105,   106,   107,   108,    -1,   110,    -1,   112,   113,
      114,   115,   116,    -1,   118,   119,   120,    -1,    -1,   123,
      124,   125,   126,   127,    -1,   129,   130,   131,    -1,   133,
-     134,   135,    -1,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,   147,    -1,   149,   150,   151,   152,    -1,
+     134,   135,    -1,   137,   138,   139,   140,    -1,   142,   143,
+     144,    -1,    -1,   147,    -1,   149,   150,   151,   152,    -1,
      154,    -1,   156,   157,    -1,   159,   160,   161,   162,    -1,
-     164,   165,    -1,   167,   168,    -1,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,    -1,   181,   182,   183,
+     164,    -1,    -1,    -1,   168,    -1,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
      184,   185,   186,    -1,   188,   189,   190,   191,   192,   193,
      194,   195,   196,    -1,   198,    -1,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,    -1,    -1,   212,   213,
+     204,   205,   206,   207,   208,   209,    -1,    -1,   212,    -1,
      214,   215,   216,    -1,   218,   219,   220,    -1,    -1,   223,
      224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
-     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
-      -1,   245,   246,   247,   248,    -1,   250,   251,   252,   253,
-     254,   255,    -1,   257,   258,    -1,   260,   261,   262,    -1,
-      -1,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,    -1,   279,   280,   281,   282,   283,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,    -1,
+      -1,   245,   246,   247,   248,    -1,    -1,   251,   252,   253,
+     254,   255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,
+     264,   265,   266,   267,   268,   269,    -1,   271,   272,   273,
+     274,   275,   276,   277,    -1,   279,   280,    -1,   282,    -1,
      284,   285,   286,    -1,   288,   289,   290,   291,   292,   293,
      294,   295,   296,   297,   298,   299,   300,    -1,   302,   303,
      304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
-     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     314,   315,   316,   317,   318,   319,    -1,   321,   322,   323,
      324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
      334,    -1,   336,   337,   338,   339,   340,   341,   342,   343,
      344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
-     354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
+     354,   355,   356,   357,    -1,    -1,   360,   361,    -1,   363,
      364,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
-      -1,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+      -1,   375,   376,    -1,   378,    -1,    -1,   381,   382,   383,
      384,   385,   386,   387,    -1,    -1,   390,   391,   392,   393,
-     394,    -1,    -1,   397,   398,   399,   400,   401,   402,   403,
-      -1,   405,   406,   407,   408,   409,   410,    -1,    -1,   413,
-      -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-       3,     4,     5,    -1,    -1,    -1,     9,   441,   442,    -1,
-      -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,
-      23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    -1,    52,
-      53,    54,    55,    56,    -1,    -1,    59,    60,    61,    62,
-      63,    -1,    65,    66,    67,    68,    69,    -1,    71,    -1,
-      73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
-      83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
-      -1,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,    -1,   112,
-     113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
-     123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
-     133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,    -1,   149,   150,   151,   152,
-      -1,   154,    -1,   156,   157,    -1,   159,   160,   161,   162,
-      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,    -1,   198,    -1,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,    -1,    -1,   212,
-     213,   214,   215,   216,    -1,   218,   219,   220,    -1,    -1,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,    -1,   245,   246,   247,   248,    -1,   250,   251,   252,
-     253,   254,   255,    -1,   257,   258,    -1,   260,   261,   262,
-      -1,    -1,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,    -1,   279,   280,   281,   282,
-     283,   284,   285,   286,    -1,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,    -1,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-      -1,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
-     333,   334,    -1,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
-     353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
-     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
-      -1,    -1,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,    -1,    -1,   390,   391,   392,
-     393,   394,    -1,    -1,   397,   398,   399,   400,   401,   402,
-     403,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
-     413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,     3,     4,     5,    -1,    -1,    -1,     9,   441,   442,
-      -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,
+     394,    -1,    -1,   397,   398,   399,   400,   401,    -1,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,    -1,   413,
+      -1,    -1,   416,   417,   418,   419,   420,   421,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     3,    -1,   431,   432,   433,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   443,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
+      28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+      38,    -1,    40,    41,    42,    43,    44,    45,    -1,    47,
+      48,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
+      -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
+      68,    -1,    -1,    71,    -1,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
+      -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,    -1,
+      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
+     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
+      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
+     138,   139,   140,    -1,   142,   143,   144,    -1,    -1,   147,
+      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,   157,
+      -1,   159,   160,   161,   162,    -1,   164,    -1,    -1,    -1,
+     168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,    -1,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,    -1,
+     198,    -1,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,    -1,    -1,   212,    -1,   214,   215,   216,    -1,
+     218,   219,   220,    -1,    -1,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,    -1,    -1,   245,   246,   247,
+     248,    -1,    -1,   251,   252,   253,   254,   255,    -1,   257,
+      -1,    -1,   260,   261,   262,    -1,   264,   265,   266,   267,
+     268,   269,    -1,   271,   272,   273,   274,   275,   276,   277,
+      -1,   279,   280,    -1,   282,    -1,   284,   285,   286,    -1,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,    -1,   314,   315,   316,   317,
+     318,   319,    -1,   321,   322,   323,   324,   325,   326,   327,
+     328,    -1,   330,   331,   332,   333,   334,    -1,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,    -1,   347,
+     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
+      -1,    -1,   360,   361,    -1,   363,   364,   365,   366,   367,
+     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,    -1,
+     378,    -1,    -1,   381,   382,   383,   384,   385,   386,   387,
+      -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,   397,
+     398,   399,   400,   401,    -1,   403,   404,   405,   406,   407,
+     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
+     418,   419,   420,   421,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     3,    -1,   431,   432,   433,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   443,    18,    19,    20,    21,
       22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    49,    50,    -1,
+      -1,    43,    44,    45,    46,    47,    -1,    49,    50,    -1,
       52,    53,    54,    55,    56,    -1,    -1,    59,    60,    61,
-      62,    63,    -1,    65,    66,    67,    68,    69,    -1,    71,
-      -1,    73,    74,    75,    76,    77,    78,    79,    80,    -1,
-      82,    83,    84,    85,    86,    87,    -1,    89,    90,    91,
-      92,    -1,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,
+      62,    63,    -1,    65,    66,    67,    68,    69,    -1,    -1,
+      -1,    73,    74,    75,    76,    -1,    78,    79,    80,    -1,
+      82,    83,    84,    85,    86,    87,    -1,    -1,    90,    91,
+      92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,   101,
      102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
      112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
       -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
       -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,   146,   147,    -1,   149,   150,   151,
-     152,    -1,   154,    -1,   156,   157,    -1,   159,   160,   161,
-     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,    -1,   181,
-     182,   183,   184,   185,   186,    -1,   188,   189,   190,   191,
-     192,   193,   194,   195,   196,    -1,   198,    -1,   200,   201,
-     202,   203,   204,   205,   206,   207,   208,   209,    -1,    -1,
-     212,   213,   214,   215,   216,    -1,   218,   219,   220,    -1,
+     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
+     152,    -1,   154,    -1,   156,    -1,    -1,    -1,   160,   161,
+     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
+     172,   173,   174,    -1,   176,   177,   178,   179,    -1,   181,
+     182,   183,   184,   185,   186,    -1,   188,    -1,   190,   191,
+     192,   193,   194,   195,   196,    -1,   198,    -1,   200,    -1,
+      -1,   203,    -1,   205,   206,   207,   208,   209,    -1,    -1,
+     212,   213,    -1,   215,    -1,    -1,   218,   219,   220,    -1,
       -1,   223,   224,   225,   226,   227,   228,   229,   230,   231,
-     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
-     242,   243,    -1,   245,   246,   247,   248,    -1,   250,   251,
-     252,   253,   254,   255,    -1,   257,   258,    -1,   260,   261,
-     262,    -1,    -1,   265,   266,   267,   268,   269,   270,   271,
+     232,   233,   234,   235,   236,   237,   238,    -1,   240,   241,
+     242,   243,    -1,   245,   246,    -1,   248,    -1,   250,   251,
+     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
+     262,    -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,
      272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
      282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
      292,   293,   294,   295,   296,   297,   298,   299,   300,    -1,
      302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,    -1,   314,   315,   316,   317,   318,   319,   320,   321,
+     312,    -1,   314,   315,    -1,   317,   318,   319,   320,   321,
      322,   323,   324,   325,   326,   327,   328,    -1,   330,   331,
-     332,   333,   334,    -1,   336,   337,   338,   339,   340,   341,
+     332,   333,   334,    -1,   336,   337,   338,   339,   340,    -1,
      342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
      352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
-      -1,   363,   364,   365,   366,   367,   368,   369,    -1,   371,
-     372,    -1,    -1,   375,   376,   377,   378,   379,   380,   381,
+      -1,   363,    -1,   365,   366,   367,   368,   369,    -1,   371,
+     372,    -1,    -1,   375,   376,   377,   378,   379,    -1,   381,
      382,   383,   384,   385,   386,   387,    -1,    -1,   390,   391,
      392,   393,   394,    -1,    -1,   397,   398,   399,   400,   401,
-     402,   403,    -1,   405,   406,   407,   408,   409,   410,    -1,
+     402,   403,    -1,   405,    -1,   407,   408,   409,   410,    -1,
       -1,   413,    -1,    -1,   416,   417,   418,   419,   420,   421,
      422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,     3,    -1,     5,    -1,    -1,    -1,     9,   441,
-     442,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,
+     432,   433,     3,     4,     5,    -1,    -1,    -1,     9,    -1,
+      -1,   443,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,
       21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
       41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
@@ -16578,318 +16445,318 @@
      401,   402,   403,    -1,   405,   406,   407,   408,   409,   410,
       -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,   420,
      421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,     3,    -1,    -1,    -1,    -1,    -1,     9,
+     431,   432,   433,     3,     4,     5,    -1,    -1,    -1,     9,
      441,   442,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
-      40,    41,    -1,    43,    44,    45,    46,    47,    -1,    49,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
       50,    -1,    52,    53,    54,    55,    56,    -1,    -1,    59,
       60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
-      -1,    -1,    -1,    73,    74,    75,    76,    -1,    78,    79,
-      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    -1,
-      90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
+      -1,    71,    -1,    73,    74,    75,    76,    77,    78,    79,
+      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    89,
+      90,    91,    92,    -1,    -1,    -1,    96,    -1,    -1,    -1,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
      110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
      120,    -1,    -1,   123,   124,   125,   126,   127,    -1,   129,
      130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
-     150,   151,   152,    -1,   154,    -1,   156,    -1,   158,    -1,
+     140,   141,   142,   143,   144,   145,   146,   147,    -1,   149,
+     150,   151,   152,    -1,   154,    -1,   156,   157,    -1,   159,
      160,   161,   162,    -1,   164,   165,    -1,   167,   168,    -1,
-     170,   171,   172,   173,   174,    -1,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,   185,   186,    -1,   188,    -1,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      -1,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
      190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
-     200,    -1,    -1,   203,    -1,   205,   206,   207,   208,   209,
-      -1,    -1,   212,   213,    -1,   215,    -1,    -1,   218,   219,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+      -1,    -1,   212,   213,   214,   215,   216,    -1,   218,   219,
      220,    -1,    -1,   223,   224,   225,   226,   227,   228,   229,
-     230,   231,   232,   233,   234,   235,   236,   237,   238,    -1,
-     240,   241,   242,   243,    -1,   245,   246,    -1,   248,    -1,
-     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
-     260,   261,   262,    -1,    -1,   265,   266,    -1,   268,    -1,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,    -1,   245,   246,   247,   248,    -1,
+     250,   251,   252,   253,   254,   255,    -1,   257,   258,    -1,
+     260,   261,   262,    -1,    -1,   265,   266,   267,   268,   269,
      270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
      280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
      290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
      300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,    -1,   314,   315,    -1,   317,   318,   319,
+     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
      320,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
      330,   331,   332,   333,   334,    -1,   336,   337,   338,   339,
-     340,    -1,   342,   343,   344,   345,    -1,   347,   348,   349,
+     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
      350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
-     360,   361,    -1,   363,    -1,   365,   366,   367,   368,   369,
+     360,   361,    -1,   363,   364,   365,   366,   367,   368,   369,
       -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
-      -1,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
+     380,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
      390,   391,   392,   393,   394,    -1,    -1,   397,   398,   399,
-     400,   401,   402,   403,    -1,   405,    -1,   407,   408,   409,
+     400,   401,   402,   403,    -1,   405,   406,   407,   408,   409,
      410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
      430,   431,   432,   433,     3,     4,     5,    -1,    -1,    -1,
        9,   441,   442,    -1,    -1,    -1,    -1,    -1,    -1,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
+      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
+      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
+      -1,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
+      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
+      69,    -1,    71,    -1,    73,    74,    75,    76,    77,    78,
+      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
+      89,    90,    91,    92,    -1,    -1,    -1,    96,    -1,    -1,
+      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
+     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
+     129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
+     139,   140,   141,   142,   143,   144,   145,   146,   147,    -1,
+     149,   150,   151,   152,    -1,   154,    -1,   156,   157,    -1,
+     159,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
+      -1,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
+     189,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
+      -1,   200,   201,   202,   203,   204,   205,   206,   207,   208,
+     209,    -1,    -1,   212,   213,   214,   215,   216,    -1,   218,
+     219,   220,    -1,    -1,   223,   224,   225,   226,   227,   228,
      229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
+     239,   240,   241,   242,   243,    -1,   245,   246,   247,   248,
+      -1,   250,   251,   252,   253,   254,   255,    -1,   257,   258,
+      -1,   260,   261,   262,    -1,    -1,   265,   266,   267,   268,
+     269,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
+     279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
      289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,    -1,   314,   315,   316,   317,   318,
      319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
+      -1,   330,   331,   332,   333,   334,    -1,   336,   337,   338,
+     339,   340,   341,   342,   343,   344,   345,    -1,   347,   348,
      349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
-     359,   360,   361,   362,   363,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,   411,   412,   413,   414,   415,   416,   417,   418,
+      -1,   360,   361,    -1,   363,   364,   365,   366,   367,   368,
+     369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
+     379,   380,   381,   382,   383,   384,   385,   386,   387,    -1,
+      -1,   390,   391,   392,   393,   394,    -1,    -1,   397,   398,
+     399,   400,   401,   402,   403,    -1,   405,   406,   407,   408,
+     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
      419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     429,   430,   431,   432,   433,     3,    -1,     5,    -1,    -1,
+      -1,     9,   441,   442,    -1,    -1,    -1,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
+      28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+      38,    -1,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
+      -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
+      68,    69,    -1,    71,    -1,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
+      -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,    -1,
+      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,    -1,   112,   113,   114,   115,   116,    -1,
+     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
+      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
      138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
-     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,   157,
+      -1,   159,   160,   161,   162,    -1,   164,   165,    -1,   167,
+     168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,    -1,
+     198,    -1,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,    -1,    -1,   212,   213,   214,   215,   216,    -1,
+     218,   219,   220,    -1,    -1,   223,   224,   225,   226,   227,
      228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
-     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     238,   239,   240,   241,   242,   243,    -1,   245,   246,   247,
+     248,    -1,   250,   251,   252,   253,   254,   255,    -1,   257,
+     258,    -1,   260,   261,   262,    -1,    -1,   265,   266,   267,
      268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+      -1,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
      288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
+     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,    -1,   314,   315,   316,   317,
      318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
-     338,   339,   340,   341,   342,   343,   344,   345,   346,   347,
+     328,    -1,   330,   331,   332,   333,   334,    -1,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,    -1,   347,
      348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
-     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     358,    -1,   360,   361,    -1,   363,   364,   365,   366,   367,
+     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,   377,
      378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+      -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,   397,
+     398,   399,   400,   401,   402,   403,    -1,   405,   406,   407,
+     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
      418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
      428,   429,   430,   431,   432,   433,     3,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     9,   441,   442,    -1,    -1,    -1,    -1,    -1,
       -1,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
+      27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      37,    38,    -1,    40,    41,    -1,    43,    44,    45,    46,
+      47,    -1,    49,    50,    -1,    52,    53,    54,    55,    56,
+      -1,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    69,    -1,    -1,    -1,    73,    74,    75,    76,
+      -1,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
+      87,    -1,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
+      -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
+     127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
+      -1,   158,    -1,   160,   161,   162,    -1,   164,   165,    -1,
+     167,   168,    -1,   170,   171,   172,   173,   174,    -1,   176,
      177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+      -1,   188,    -1,   190,   191,   192,   193,   194,   195,   196,
+      -1,   198,    -1,   200,    -1,    -1,   203,    -1,   205,   206,
+     207,   208,   209,    -1,    -1,   212,   213,    -1,   215,    -1,
+      -1,   218,   219,   220,    -1,    -1,   223,   224,   225,   226,
      227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     237,   238,    -1,   240,   241,   242,   243,    -1,   245,   246,
+      -1,   248,    -1,   250,   251,   252,   253,   254,   255,    -1,
+     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
+      -1,   268,    -1,   270,   271,   272,   273,   274,   275,   276,
+     277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
+      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,    -1,   314,   315,    -1,
      317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,   346,
+     327,   328,    -1,   330,   331,   332,   333,   334,    -1,   336,
+     337,   338,   339,   340,    -1,   342,   343,   344,   345,    -1,
      347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+     357,   358,    -1,   360,   361,    -1,   363,    -1,   365,   366,
+     367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
+     377,   378,   379,    -1,   381,   382,   383,   384,   385,   386,
+     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
+     397,   398,   399,   400,   401,   402,   403,    -1,   405,    -1,
+     407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
      417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     427,   428,   429,   430,   431,   432,   433,     3,     4,     5,
+      -1,    -1,    -1,     9,   441,   442,    -1,    -1,    -1,    -1,
       -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
-      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
-      56,    -1,    58,    59,    60,    61,    62,    63,    -1,    65,
-      66,    67,    68,    69,    -1,    71,    -1,    73,    74,    75,
-      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
-      86,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
       96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,    -1,   110,    -1,   112,   113,   114,   115,
-     116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
-     126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
-      -1,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
-     156,   157,    -1,   159,   160,   161,   162,    -1,   164,   165,
-      -1,   167,   168,    -1,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
-     186,    -1,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,    -1,    -1,   212,   213,   214,   215,
-     216,    -1,   218,   219,   220,   221,   222,   223,   224,   225,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
      226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,   239,   240,   241,   242,   243,    -1,   245,
-     246,   247,   248,    -1,   250,   251,   252,   253,   254,   255,
-      -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
      266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
-     276,   277,    -1,   279,   280,   281,   282,   283,   284,   285,
-     286,    -1,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   300,    -1,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
+     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
      316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,    -1,   330,   331,   332,   333,   334,   335,
+     326,   327,   328,   329,   330,   331,   332,   333,   334,   335,
      336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
-      -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
-     356,   357,   358,    -1,   360,   361,    -1,   363,   364,   365,
-     366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
-     376,   377,   378,   379,    -1,   381,   382,   383,   384,   385,
-     386,   387,    -1,    -1,   390,   391,   392,   393,   394,   395,
-      -1,   397,   398,   399,   400,   401,   402,   403,    -1,   405,
-     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
      426,   427,   428,   429,   430,   431,   432,   433,     3,    -1,
-       5,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
-      25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    37,    38,    -1,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    -1,    52,    53,    54,
-      55,    56,    -1,    -1,    59,    60,    61,    62,    63,    -1,
-      65,    66,    67,    68,    69,    -1,    71,    -1,    73,    74,
-      75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
-      85,    86,    87,    -1,    89,    90,    91,    92,    -1,    -1,
-      -1,    96,    -1,    -1,    -1,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
-     115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
-     125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
-     135,    -1,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,    -1,   149,   150,   151,   152,    -1,   154,
-      -1,   156,   157,    -1,   159,   160,   161,   162,    -1,   164,
-     165,    -1,   167,   168,    -1,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
-     185,   186,    -1,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,    -1,   198,    -1,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,    -1,    -1,   212,   213,   214,
-     215,   216,    -1,   218,   219,   220,    -1,    -1,   223,   224,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
      225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,    -1,
-     245,   246,   247,   248,    -1,   250,   251,   252,   253,   254,
-     255,    -1,   257,   258,    -1,   260,   261,   262,    -1,    -1,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,    -1,   279,   280,   281,   282,   283,   284,
-     285,   286,    -1,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,    -1,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
-      -1,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,    -1,   360,   361,    -1,   363,   364,
-     365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,    -1,    -1,   390,   391,   392,   393,   394,
-      -1,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
-     405,   406,   407,   408,   409,   410,    -1,    -1,   413,    -1,
-      -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,   433,     3,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    37,    38,    -1,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    50,    -1,    52,    53,
-      54,    55,    56,    -1,    -1,    59,    60,    61,    62,    63,
-      -1,    65,    66,    67,    68,    69,    -1,    71,    -1,    73,
-      74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
-      84,    85,    86,    87,    -1,    89,    90,    91,    92,    -1,
-      -1,    -1,    96,    -1,    -1,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,    -1,   110,    -1,   112,   113,
-     114,   115,   116,    -1,   118,   119,   120,    -1,    -1,   123,
-     124,   125,   126,   127,    -1,   129,   130,   131,    -1,   133,
-     134,   135,    -1,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,    -1,   147,    -1,   149,   150,   151,   152,    -1,
-     154,    -1,   156,   157,    -1,   159,   160,   161,   162,    -1,
-     164,   165,    -1,   167,   168,    -1,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,    -1,   181,   182,   183,
-     184,   185,   186,    -1,   188,   189,   190,   191,   192,   193,
-     194,   195,   196,    -1,   198,    -1,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,    -1,    -1,   212,   213,
-     214,   215,   216,    -1,   218,   219,   220,    -1,    -1,   223,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
      224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
      234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
-      -1,   245,   246,   247,   248,    -1,   250,   251,   252,   253,
-     254,   255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,
-      -1,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,    -1,   279,   280,   281,   282,   283,
-     284,   285,   286,    -1,   288,   289,   290,   291,   292,   293,
-     294,   295,   296,   297,   298,   299,   300,    -1,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
      314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
+     324,   325,   326,   327,   328,   329,   330,   331,   332,   333,
      334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
-     344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
-     354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
-     364,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
-      -1,   375,   376,   377,   378,   379,    -1,   381,   382,   383,
-     384,   385,   386,   387,    -1,    -1,   390,   391,   392,   393,
-     394,    -1,    -1,   397,   398,   399,   400,   401,   402,   403,
-      -1,   405,   406,   407,   408,   409,   410,    -1,    -1,   413,
-      -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
+     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+     354,   355,   356,   357,   358,   359,   360,   361,   362,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,   389,   390,   391,   392,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+     414,   415,   416,   417,   418,   419,   420,   421,   422,   423,
      424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
        3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,
       23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    42,
       43,    44,    45,    46,    47,    48,    49,    50,    -1,    52,
-      53,    54,    55,    56,    -1,    -1,    59,    60,    61,    62,
+      53,    54,    55,    56,    -1,    58,    59,    60,    61,    62,
       63,    -1,    65,    66,    67,    68,    69,    -1,    71,    -1,
       73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
       83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
-      -1,    -1,    -1,    96,    -1,    -1,    99,   100,   101,   102,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
      103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
      113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
      123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
@@ -16901,7 +16768,7 @@
      183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
      193,   194,   195,   196,    -1,   198,    -1,   200,   201,   202,
      203,   204,   205,   206,   207,   208,   209,    -1,    -1,   212,
-     213,   214,   215,   216,    -1,   218,   219,   220,    -1,    -1,
+     213,   214,   215,   216,    -1,   218,   219,   220,   221,   222,
      223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
      233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
      243,    -1,   245,   246,   247,   248,    -1,   250,   251,   252,
@@ -16923,7 +16790,7 @@
      403,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
      413,    -1,    -1,   416,   417,   418,   419,   420,   421,   422,
      423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     433,     3,    -1,     5,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,
       22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,
@@ -16932,14 +16799,14 @@
       62,    63,    -1,    65,    66,    67,    68,    69,    -1,    71,
       -1,    73,    74,    75,    76,    77,    78,    79,    80,    -1,
       82,    83,    84,    85,    86,    87,    -1,    89,    90,    91,
-      92,    -1,    -1,    -1,    96,    -1,    -1,    99,   100,   101,
+      92,    -1,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,
      102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
      112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
       -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
       -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
+     142,   143,   144,   145,   146,   147,    -1,   149,   150,   151,
      152,    -1,   154,    -1,   156,   157,    -1,   159,   160,   161,
-     162,    -1,   164,   165,   166,   167,   168,    -1,   170,   171,
+     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
      172,   173,   174,   175,   176,   177,   178,   179,    -1,   181,
      182,   183,   184,   185,   186,    -1,   188,   189,   190,   191,
      192,   193,   194,   195,   196,    -1,   198,    -1,   200,   201,
@@ -16948,7 +16815,7 @@
       -1,   223,   224,   225,   226,   227,   228,   229,   230,   231,
      232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
      242,   243,    -1,   245,   246,   247,   248,    -1,   250,   251,
-     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
+     252,   253,   254,   255,    -1,   257,   258,    -1,   260,   261,
      262,    -1,    -1,   265,   266,   267,   268,   269,   270,   271,
      272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
      282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
@@ -16956,11 +16823,11 @@
      302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
      312,    -1,   314,   315,   316,   317,   318,   319,   320,   321,
      322,   323,   324,   325,   326,   327,   328,    -1,   330,   331,
-     332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
+     332,   333,   334,    -1,   336,   337,   338,   339,   340,   341,
      342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
      352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
       -1,   363,   364,   365,   366,   367,   368,   369,    -1,   371,
-     372,    -1,    -1,   375,   376,   377,   378,   379,    -1,   381,
+     372,    -1,    -1,   375,   376,   377,   378,   379,   380,   381,
      382,   383,   384,   385,   386,   387,    -1,    -1,   390,   391,
      392,   393,   394,    -1,    -1,   397,   398,   399,   400,   401,
      402,   403,    -1,   405,   406,   407,   408,   409,   410,    -1,
@@ -16968,7 +16835,7 @@
      422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
      432,   433,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
       41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
       -1,    52,    53,    54,    55,    56,    -1,    -1,    59,    60,
@@ -17011,7 +16878,7 @@
      421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
      431,   432,   433,     3,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,
-      20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
       40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
       50,    -1,    52,    53,    54,    55,    56,    -1,    -1,    59,
@@ -17091,7 +16958,7 @@
       -1,   360,   361,    -1,   363,   364,   365,   366,   367,   368,
      369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
      379,    -1,   381,   382,   383,   384,   385,   386,   387,    -1,
-      -1,   390,   391,   392,   393,   394,    -1,    -1,   397,   398,
+      -1,   390,   391,   392,   393,   394,   395,    -1,   397,   398,
      399,   400,   401,   402,   403,    -1,   405,   406,   407,   408,
      409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
      419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
@@ -17111,7 +16978,7 @@
       -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
      138,   139,   140,   141,   142,   143,   144,   145,    -1,   147,
       -1,   149,   150,   151,   152,    -1,   154,    -1,   156,   157,
-      -1,   159,   160,   161,   162,    -1,   164,   165,    -1,   167,
+      -1,   159,   160,   161,   162,    -1,   164,   165,   166,   167,
      168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
      178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
      188,   189,   190,   191,   192,   193,   194,   195,   196,    -1,
@@ -17225,7 +17092,7 @@
      406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
      426,   427,   428,   429,   430,   431,   432,   433,     3,    -1,
-       5,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
       25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    37,    38,    -1,    40,    41,    42,    43,    44,
@@ -17234,8 +17101,8 @@
       65,    66,    67,    68,    69,    -1,    71,    -1,    73,    74,
       75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
       85,    86,    87,    -1,    89,    90,    91,    92,    -1,    -1,
-      -1,    96,    -1,    -1,    -1,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,    -1,   112,   113,   114,
+      -1,    96,    -1,    -1,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
      115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
      125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
      135,    -1,   137,   138,   139,   140,   141,   142,   143,   144,
@@ -17258,7 +17125,7 @@
      305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
      325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
-      -1,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,    -1,   360,   361,    -1,   363,   364,
      365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
@@ -17270,14 +17137,14 @@
      425,   426,   427,   428,   429,   430,   431,   432,   433,     3,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,    23,
-      24,    25,    -1,    27,    28,    29,    30,    31,    -1,    -1,
+      24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    37,    38,    -1,    40,    41,    42,    43,
       44,    45,    46,    47,    48,    49,    50,    -1,    52,    53,
       54,    55,    56,    -1,    -1,    59,    60,    61,    62,    63,
       -1,    65,    66,    67,    68,    69,    -1,    71,    -1,    73,
       74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
       84,    85,    86,    87,    -1,    89,    90,    91,    92,    -1,
-      -1,    -1,    96,    -1,    -1,    -1,   100,   101,   102,   103,
+      -1,    -1,    96,    -1,    -1,    99,   100,   101,   102,   103,
      104,   105,   106,   107,   108,    -1,   110,    -1,   112,   113,
      114,   115,   116,    -1,   118,   119,   120,    -1,    -1,   123,
      124,   125,   126,   127,    -1,   129,   130,   131,    -1,   133,
@@ -17301,7 +17168,7 @@
      304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
      314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
      324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
-     334,    -1,   336,   337,   338,   339,   340,   341,   342,   343,
+     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
      344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
      354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
      364,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
@@ -17311,7 +17178,7 @@
       -1,   405,   406,   407,   408,   409,   410,    -1,    -1,   413,
       -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
      424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-       3,    -1,     5,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,
       23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    42,
@@ -17320,7 +17187,7 @@
       63,    -1,    65,    66,    67,    68,    69,    -1,    71,    -1,
       73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
       83,    84,    85,    86,    87,    -1,    89,    90,    91,    92,
-      -1,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,   102,
+      -1,    -1,    -1,    96,    -1,    -1,    99,   100,   101,   102,
      103,   104,   105,   106,   107,   108,    -1,   110,    -1,   112,
      113,   114,   115,   116,    -1,   118,   119,   120,    -1,    -1,
      123,   124,   125,   126,   127,    -1,   129,   130,   131,    -1,
@@ -17344,7 +17211,7 @@
      303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
       -1,   314,   315,   316,   317,   318,   319,   320,   321,   322,
      323,   324,   325,   326,   327,   328,    -1,   330,   331,   332,
-     333,   334,    -1,   336,   337,   338,   339,   340,   341,   342,
+     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
      343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
      353,   354,   355,   356,   357,   358,    -1,   360,   361,    -1,
      363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
@@ -17364,7 +17231,7 @@
       -1,    73,    74,    75,    76,    77,    78,    79,    80,    -1,
       82,    83,    84,    85,    86,    87,    -1,    89,    90,    91,
       92,    -1,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,    -1,
      112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
       -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
       -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
@@ -17399,8 +17266,8 @@
      422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
      432,   433,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
+      21,    22,    23,    24,    25,    -1,    27,    28,    29,    30,
+      31,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
       41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
       -1,    52,    53,    54,    55,    56,    -1,    -1,    59,    60,
       61,    62,    63,    -1,    65,    66,    67,    68,    69,    -1,
@@ -17440,7 +17307,7 @@
      401,   402,   403,    -1,   405,   406,   407,   408,   409,   410,
       -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,   420,
      421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+     431,   432,   433,     3,    -1,     5,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,
       20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
@@ -17483,7 +17350,7 @@
      400,   401,   402,   403,    -1,   405,   406,   407,   408,   409,
      410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,    -1,
+     430,   431,   432,   433,     3,    -1,     5,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,
       19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
       29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
@@ -17530,148 +17397,148 @@
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
       28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-      38,    -1,    40,    41,    -1,    43,    44,    45,    46,    47,
-      -1,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
-      -1,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    -1,    -1,    72,    73,    74,    75,    76,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      -1,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,
+      38,    -1,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
+      -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
+      68,    69,    -1,    71,    -1,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
+      -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,    -1,
       -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
      108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
      118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
       -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
      138,   139,   140,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
-      -1,    -1,   160,   161,   162,    -1,   164,   165,    -1,   167,
-     168,    -1,   170,   171,   172,   173,   174,    -1,   176,   177,
+      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,   157,
+      -1,   159,   160,   161,   162,    -1,   164,   165,    -1,   167,
+     168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
      178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
-     188,    -1,   190,   191,   192,   193,   194,   195,   196,    -1,
-     198,    -1,   200,    -1,    -1,   203,    -1,   205,   206,   207,
-     208,   209,    -1,    -1,   212,   213,    -1,   215,    -1,    -1,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,    -1,
+     198,    -1,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,    -1,    -1,   212,   213,   214,   215,   216,    -1,
      218,   219,   220,    -1,    -1,   223,   224,   225,   226,   227,
      228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
-     238,    -1,   240,   241,   242,   243,    -1,   245,   246,    -1,
+     238,   239,   240,   241,   242,   243,    -1,   245,   246,   247,
      248,    -1,   250,   251,   252,   253,   254,   255,    -1,   257,
-      -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,    -1,
-     268,    -1,   270,   271,   272,   273,   274,   275,   276,   277,
-      -1,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+      -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+      -1,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
      288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
      298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,    -1,   314,   315,    -1,   317,
+     308,   309,   310,   311,   312,    -1,   314,   315,   316,   317,
      318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
      328,    -1,   330,   331,   332,   333,   334,    -1,   336,   337,
-     338,   339,   340,    -1,   342,   343,   344,   345,    -1,   347,
+     338,   339,   340,   341,   342,   343,   344,   345,    -1,   347,
      348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
-     358,    -1,   360,   361,    -1,   363,    -1,   365,   366,   367,
+     358,    -1,   360,   361,    -1,   363,   364,   365,   366,   367,
      368,   369,    -1,   371,   372,    -1,    -1,   375,   376,   377,
      378,   379,    -1,   381,   382,   383,   384,   385,   386,   387,
-      -1,   389,   390,   391,   392,   393,   394,    -1,    -1,   397,
-     398,   399,   400,   401,   402,   403,    -1,   405,    -1,   407,
+      -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,   397,
+     398,   399,   400,   401,   402,   403,    -1,   405,   406,   407,
      408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
      418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
      428,   429,   430,   431,   432,   433,     3,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
       27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    38,    -1,    40,    41,    -1,    43,    44,    45,    46,
-      47,    -1,    49,    50,    -1,    52,    53,    54,    55,    56,
-      -1,    -1,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    -1,    -1,    -1,    73,    74,    75,    76,
-      -1,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    -1,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,
+      37,    38,    -1,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
+      -1,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    69,    -1,    71,    -1,    73,    74,    75,    76,
+      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
+      87,    -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,
       -1,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
      107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
       -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
      127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
      137,   138,   139,   140,   141,   142,   143,   144,   145,    -1,
-     147,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,    -1,    -1,   160,   161,   162,    -1,   164,   165,    -1,
-     167,   168,    -1,   170,   171,   172,   173,   174,    -1,   176,
+     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
+     157,    -1,   159,   160,   161,   162,    -1,   164,   165,    -1,
+     167,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
      177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
-      -1,   188,    -1,   190,   191,   192,   193,   194,   195,   196,
-      -1,   198,    -1,   200,    -1,    -1,   203,    -1,   205,   206,
-     207,   208,   209,    -1,    -1,   212,   213,    -1,   215,   216,
+      -1,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+      -1,   198,    -1,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,    -1,    -1,   212,   213,   214,   215,   216,
       -1,   218,   219,   220,    -1,    -1,   223,   224,   225,   226,
      227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,    -1,   240,   241,   242,   243,    -1,   245,   246,
-      -1,   248,    -1,   250,   251,   252,   253,   254,   255,    -1,
+     237,   238,   239,   240,   241,   242,   243,    -1,   245,   246,
+     247,   248,    -1,   250,   251,   252,   253,   254,   255,    -1,
      257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
-      -1,   268,    -1,   270,   271,   272,   273,   274,   275,   276,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
      277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
      297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,    -1,   314,   315,    -1,
+     307,   308,   309,   310,   311,   312,    -1,   314,   315,   316,
      317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
      327,   328,    -1,   330,   331,   332,   333,   334,    -1,   336,
-     337,   338,   339,   340,    -1,   342,   343,   344,   345,    -1,
+     337,   338,   339,   340,   341,   342,   343,   344,   345,    -1,
      347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,    -1,   360,   361,    -1,   363,    -1,   365,   366,
+     357,   358,    -1,   360,   361,    -1,   363,   364,   365,   366,
      367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
      377,   378,   379,    -1,   381,   382,   383,   384,   385,   386,
-     387,    -1,   389,   390,   391,   392,   393,   394,    -1,    -1,
-     397,   398,   399,   400,   401,   402,   403,    -1,   405,    -1,
+     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
+     397,   398,   399,   400,   401,   402,   403,    -1,   405,   406,
      407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
      417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
      427,   428,   429,   430,   431,   432,   433,     3,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    37,    38,    -1,    40,    41,    -1,    43,    44,    45,
-      46,    47,    -1,    49,    50,    -1,    52,    53,    54,    55,
+      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
       56,    -1,    -1,    59,    60,    61,    62,    63,    -1,    65,
-      66,    67,    68,    69,    -1,    -1,    -1,    73,    74,    75,
-      76,    -1,    78,    79,    80,    -1,    82,    83,    84,    85,
-      86,    87,    88,    -1,    90,    91,    92,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   100,   101,   102,   103,   104,   105,
+      66,    67,    68,    69,    -1,    71,    -1,    73,    74,    75,
+      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
+      86,    87,    -1,    89,    90,    91,    92,    -1,    -1,    -1,
+      96,    -1,    -1,    -1,   100,   101,   102,   103,   104,   105,
      106,   107,   108,    -1,   110,    -1,   112,   113,   114,   115,
      116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
      126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
       -1,   137,   138,   139,   140,   141,   142,   143,   144,   145,
       -1,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
-     156,    -1,    -1,    -1,   160,   161,   162,   163,   164,   165,
-      -1,   167,   168,    -1,   170,   171,   172,   173,   174,    -1,
+     156,   157,    -1,   159,   160,   161,   162,    -1,   164,   165,
+      -1,   167,   168,    -1,   170,   171,   172,   173,   174,   175,
      176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
-     186,    -1,   188,    -1,   190,   191,   192,   193,   194,   195,
-     196,    -1,   198,    -1,   200,    -1,    -1,   203,    -1,   205,
-     206,   207,   208,   209,    -1,    -1,   212,   213,    -1,   215,
-      -1,    -1,   218,   219,   220,    -1,    -1,   223,   224,   225,
+     186,    -1,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,    -1,    -1,   212,   213,   214,   215,
+     216,    -1,   218,   219,   220,    -1,    -1,   223,   224,   225,
      226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,    -1,   240,   241,   242,   243,    -1,   245,
-     246,    -1,   248,    -1,   250,   251,   252,   253,   254,   255,
+     236,   237,   238,   239,   240,   241,   242,   243,    -1,   245,
+     246,   247,   248,    -1,   250,   251,   252,   253,   254,   255,
       -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
-     266,    -1,   268,    -1,   270,   271,   272,   273,   274,   275,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
      276,   277,    -1,   279,   280,   281,   282,   283,   284,   285,
      286,    -1,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     296,   297,   298,   299,   300,    -1,   302,   303,   304,   305,
      306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
-      -1,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,   332,   333,   334,    -1,
-     336,   337,   338,   339,   340,    -1,   342,   343,   344,   345,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,    -1,   330,   331,   332,   333,   334,    -1,
+     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
       -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
-     356,   357,   358,    -1,   360,   361,    -1,   363,    -1,   365,
+     356,   357,   358,    -1,   360,   361,    -1,   363,   364,   365,
      366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
      376,   377,   378,   379,    -1,   381,   382,   383,   384,   385,
      386,   387,    -1,    -1,   390,   391,   392,   393,   394,    -1,
       -1,   397,   398,   399,   400,   401,   402,   403,    -1,   405,
-      -1,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
+     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
      426,   427,   428,   429,   430,   431,   432,   433,     3,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,
+      25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    37,    38,    -1,    40,    41,    -1,    43,    44,
       45,    46,    47,    -1,    49,    50,    -1,    52,    53,    54,
-      55,    56,    -1,    -1,    59,    60,    61,    62,    63,    -1,
-      65,    66,    67,    68,    69,    -1,    -1,    -1,    73,    74,
-      75,    76,    -1,    78,    79,    80,    -1,    82,    83,    84,
-      85,    86,    87,    88,    -1,    90,    91,    92,    -1,    -1,
+      55,    56,    -1,    -1,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    -1,    -1,    72,    73,    74,
+      75,    76,    -1,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    -1,    -1,    90,    91,    92,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,   100,   101,   102,   103,   104,
      105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
      115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
      125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
      135,    -1,   137,   138,   139,   140,   141,   142,   143,   144,
      145,    -1,   147,    -1,   149,   150,   151,   152,    -1,   154,
-      -1,   156,    -1,    -1,    -1,   160,   161,   162,   163,   164,
+     155,   156,    -1,    -1,    -1,   160,   161,   162,    -1,   164,
      165,    -1,   167,   168,    -1,   170,   171,   172,   173,   174,
       -1,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
      185,   186,    -1,   188,    -1,   190,   191,   192,   193,   194,
@@ -17684,17 +17551,17 @@
      255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,
      265,   266,    -1,   268,    -1,   270,   271,   272,   273,   274,
      275,   276,   277,    -1,   279,   280,   281,   282,   283,   284,
-     285,   286,    -1,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,    -1,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
      315,    -1,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
       -1,   336,   337,   338,   339,   340,    -1,   342,   343,   344,
      345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,    -1,   360,   361,    -1,   363,    -1,
      365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
      375,   376,   377,   378,   379,    -1,   381,   382,   383,   384,
-     385,   386,   387,    -1,    -1,   390,   391,   392,   393,   394,
+     385,   386,   387,    -1,   389,   390,   391,   392,   393,   394,
       -1,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
      405,    -1,   407,   408,   409,   410,    -1,    -1,   413,    -1,
       -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
@@ -17720,7 +17587,7 @@
      184,   185,   186,    -1,   188,    -1,   190,   191,   192,   193,
      194,   195,   196,    -1,   198,    -1,   200,    -1,    -1,   203,
       -1,   205,   206,   207,   208,   209,    -1,    -1,   212,   213,
-      -1,   215,    -1,    -1,   218,   219,   220,    -1,    -1,   223,
+      -1,   215,   216,    -1,   218,   219,   220,    -1,    -1,   223,
      224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
      234,   235,   236,   237,   238,    -1,   240,   241,   242,   243,
       -1,   245,   246,    -1,   248,    -1,   250,   251,   252,   253,
@@ -17758,7 +17625,7 @@
      133,   134,   135,    -1,   137,   138,   139,   140,   141,   142,
      143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
       -1,   154,    -1,   156,    -1,    -1,    -1,   160,   161,   162,
-      -1,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
+     163,   164,   165,    -1,   167,   168,    -1,   170,   171,   172,
      173,   174,    -1,   176,   177,   178,   179,    -1,   181,   182,
      183,   184,   185,   186,    -1,   188,    -1,   190,   191,   192,
      193,   194,   195,   196,    -1,   198,    -1,   200,    -1,    -1,
@@ -17793,15 +17660,15 @@
       52,    53,    54,    55,    56,    -1,    -1,    59,    60,    61,
       62,    63,    -1,    65,    66,    67,    68,    69,    -1,    -1,
       -1,    73,    74,    75,    76,    -1,    78,    79,    80,    -1,
-      82,    83,    84,    85,    86,    87,    -1,    -1,    90,    91,
+      82,    83,    84,    85,    86,    87,    88,    -1,    90,    91,
       92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,   101,
      102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
      112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
       -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
       -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
      142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
-     152,    -1,   154,   155,   156,    -1,    -1,    -1,   160,   161,
-     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
+     152,    -1,   154,    -1,   156,    -1,    -1,    -1,   160,   161,
+     162,   163,   164,   165,    -1,   167,   168,    -1,   170,   171,
      172,   173,   174,    -1,   176,   177,   178,   179,    -1,   181,
      182,   183,   184,   185,   186,    -1,   188,    -1,   190,   191,
      192,   193,   194,   195,   196,    -1,   198,    -1,   200,    -1,
@@ -17814,14 +17681,14 @@
      262,    -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,
      272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
      282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
-     292,   293,   294,   295,   296,   297,   298,   299,   300,    -1,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,   301,
      302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
      312,    -1,   314,   315,    -1,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,   328,    -1,   330,   331,
+     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
      332,   333,   334,    -1,   336,   337,   338,   339,   340,    -1,
      342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
      352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
-     362,   363,    -1,   365,   366,   367,   368,   369,    -1,   371,
+      -1,   363,    -1,   365,   366,   367,   368,   369,    -1,   371,
      372,    -1,    -1,   375,   376,   377,   378,   379,    -1,   381,
      382,   383,   384,   385,   386,   387,    -1,    -1,   390,   391,
      392,   393,   394,    -1,    -1,   397,   398,   399,   400,   401,
@@ -17834,16 +17701,16 @@
       -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
       41,    -1,    43,    44,    45,    46,    47,    -1,    49,    50,
       -1,    52,    53,    54,    55,    56,    -1,    -1,    59,    60,
-      61,    62,    63,    -1,    65,    66,    67,    68,    69,    -1,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    -1,
       -1,    -1,    73,    74,    75,    76,    -1,    78,    79,    80,
-      -1,    82,    83,    84,    85,    86,    87,    88,    -1,    90,
+      81,    82,    83,    84,    85,    86,    87,    -1,    -1,    90,
       91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,
      101,   102,   103,   104,   105,   106,   107,   108,    -1,   110,
       -1,   112,   113,   114,   115,   116,    -1,   118,   119,   120,
       -1,    -1,   123,   124,   125,   126,   127,    -1,   129,   130,
      131,    -1,   133,   134,   135,    -1,   137,   138,   139,   140,
      141,   142,   143,   144,   145,    -1,   147,    -1,   149,   150,
-     151,   152,    -1,   154,    -1,   156,    -1,    -1,    -1,   160,
+     151,   152,    -1,   154,   155,   156,    -1,    -1,    -1,   160,
      161,   162,    -1,   164,   165,    -1,   167,   168,    -1,   170,
      171,   172,   173,   174,    -1,   176,   177,   178,   179,    -1,
      181,   182,   183,   184,   185,   186,    -1,   188,    -1,   190,
@@ -17856,17 +17723,17 @@
      251,   252,   253,   254,   255,    -1,   257,    -1,    -1,   260,
      261,   262,    -1,    -1,   265,   266,    -1,   268,    -1,   270,
      271,   272,   273,   274,   275,   276,   277,    -1,   279,   280,
-     281,   282,   283,   284,   285,   286,    -1,   288,   289,   290,
+     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
      291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+      -1,   302,   303,   304,   305,   306,   307,   308,   309,   310,
      311,   312,    -1,   314,   315,    -1,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
+     321,   322,   323,   324,   325,   326,   327,   328,    -1,   330,
      331,   332,   333,   334,    -1,   336,   337,   338,   339,   340,
       -1,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
      351,   352,   353,   354,   355,   356,   357,   358,    -1,   360,
      361,    -1,   363,    -1,   365,   366,   367,   368,   369,    -1,
      371,   372,    -1,    -1,   375,   376,   377,   378,   379,    -1,
-     381,   382,   383,   384,   385,   386,   387,    -1,    -1,   390,
+     381,   382,   383,   384,   385,   386,   387,    -1,   389,   390,
      391,   392,   393,   394,    -1,    -1,   397,   398,   399,   400,
      401,   402,   403,    -1,   405,    -1,   407,   408,   409,   410,
       -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,   420,
@@ -17879,7 +17746,7 @@
       50,    -1,    52,    53,    54,    55,    56,    -1,    -1,    59,
       60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
       -1,    -1,    -1,    73,    74,    75,    76,    -1,    78,    79,
-      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    -1,
+      80,    -1,    82,    83,    84,    85,    86,    87,    88,    -1,
       90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
      100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
      110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
@@ -17896,14 +17763,14 @@
      220,    -1,    -1,   223,   224,   225,   226,   227,   228,   229,
      230,   231,   232,   233,   234,   235,   236,   237,   238,    -1,
      240,   241,   242,   243,    -1,   245,   246,    -1,   248,    -1,
-     250,   251,   252,   253,   254,   255,    -1,   257,    -1,   259,
+     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
      260,   261,   262,    -1,    -1,   265,   266,    -1,   268,    -1,
      270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
      280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
      290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
-     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
      310,   311,   312,    -1,   314,   315,    -1,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
      330,   331,   332,   333,   334,    -1,   336,   337,   338,   339,
      340,    -1,   342,   343,   344,   345,    -1,   347,   348,   349,
      350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
@@ -17916,8 +17783,8 @@
      420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
      430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,
-      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
-      29,    30,    31,    -1,    -1,    -1,    -1,    -1,    37,    38,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
       -1,    40,    41,    -1,    43,    44,    45,    46,    47,    -1,
       49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
       59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
@@ -17929,7 +17796,7 @@
      119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
      129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
      139,   140,   141,   142,   143,   144,   145,    -1,   147,    -1,
-     149,   150,   151,   152,    -1,   154,    -1,   156,    -1,    -1,
+     149,   150,   151,   152,    -1,   154,   155,   156,    -1,    -1,
       -1,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
       -1,   170,   171,   172,   173,   174,    -1,   176,   177,   178,
      179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
@@ -17950,7 +17817,7 @@
       -1,   330,   331,   332,   333,   334,    -1,   336,   337,   338,
      339,   340,    -1,   342,   343,   344,   345,    -1,   347,   348,
      349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
-      -1,   360,   361,    -1,   363,    -1,   365,   366,   367,   368,
+      -1,   360,   361,   362,   363,    -1,   365,   366,   367,   368,
      369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
      379,    -1,   381,   382,   383,   384,   385,   386,   387,    -1,
       -1,   390,   391,   392,   393,   394,    -1,    -1,   397,   398,
@@ -17959,14 +17826,14 @@
      419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
      429,   430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
       28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
       38,    -1,    40,    41,    -1,    43,    44,    45,    46,    47,
       -1,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
       -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
       68,    69,    -1,    -1,    -1,    73,    74,    75,    76,    -1,
       78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
-      -1,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,
+      88,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
      108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
      118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
@@ -17987,16 +17854,16 @@
      268,    -1,   270,   271,   272,   273,   274,   275,   276,   277,
       -1,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
      288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
      308,   309,   310,   311,   312,    -1,   314,   315,    -1,   317,
      318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,    -1,   330,   331,   332,   333,   334,    -1,   336,   337,
+     328,   329,   330,   331,   332,   333,   334,    -1,   336,   337,
      338,   339,   340,    -1,   342,   343,   344,   345,    -1,   347,
      348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
      358,    -1,   360,   361,    -1,   363,    -1,   365,   366,   367,
      368,   369,    -1,   371,   372,    -1,    -1,   375,   376,   377,
      378,   379,    -1,   381,   382,   383,   384,   385,   386,   387,
-      -1,    -1,   390,   391,   392,   393,   394,   395,    -1,   397,
+      -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,   397,
      398,   399,   400,   401,   402,   403,    -1,   405,    -1,   407,
      408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
      418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
@@ -18026,7 +17893,7 @@
      227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
      237,   238,    -1,   240,   241,   242,   243,    -1,   245,   246,
       -1,   248,    -1,   250,   251,   252,   253,   254,   255,    -1,
-     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
+     257,    -1,   259,   260,   261,   262,    -1,    -1,   265,   266,
       -1,   268,    -1,   270,   271,   272,   273,   274,   275,   276,
      277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
       -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
@@ -18039,14 +17906,14 @@
      357,   358,    -1,   360,   361,    -1,   363,    -1,   365,   366,
      367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
      377,   378,   379,    -1,   381,   382,   383,   384,   385,   386,
-     387,    -1,    -1,   390,   391,   392,   393,   394,   395,    -1,
+     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
      397,   398,   399,   400,   401,   402,   403,    -1,   405,    -1,
      407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
      417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
      427,   428,   429,   430,   431,   432,   433,     3,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,
       -1,    37,    38,    -1,    40,    41,    -1,    43,    44,    45,
       46,    47,    -1,    49,    50,    -1,    52,    53,    54,    55,
       56,    -1,    -1,    59,    60,    61,    62,    63,    -1,    65,
@@ -18126,7 +17993,7 @@
      365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
      375,   376,   377,   378,   379,    -1,   381,   382,   383,   384,
      385,   386,   387,    -1,    -1,   390,   391,   392,   393,   394,
-      -1,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
+     395,    -1,   397,   398,   399,   400,   401,   402,   403,    -1,
      405,    -1,   407,   408,   409,   410,    -1,    -1,   413,    -1,
       -1,   416,   417,   418,   419,   420,   421,   422,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,   433,     3,
@@ -18169,7 +18036,7 @@
       -1,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
       -1,   375,   376,   377,   378,   379,    -1,   381,   382,   383,
      384,   385,   386,   387,    -1,    -1,   390,   391,   392,   393,
-     394,    -1,    -1,   397,   398,   399,   400,   401,   402,   403,
+     394,   395,    -1,   397,   398,   399,   400,   401,   402,   403,
       -1,   405,    -1,   407,   408,   409,   410,    -1,    -1,   413,
       -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
      424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
@@ -18218,7 +18085,7 @@
      423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
      433,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,
-      22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
+      22,    23,    24,    25,    26,    27,    28,    29,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,
       -1,    43,    44,    45,    46,    47,    -1,    49,    50,    -1,
       52,    53,    54,    55,    56,    -1,    -1,    59,    60,    61,
@@ -18241,7 +18108,7 @@
       -1,   223,   224,   225,   226,   227,   228,   229,   230,   231,
      232,   233,   234,   235,   236,   237,   238,    -1,   240,   241,
      242,   243,    -1,   245,   246,    -1,   248,    -1,   250,   251,
-     252,   253,   254,   255,    -1,   257,    -1,   259,   260,   261,
+     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
      262,    -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,
      272,   273,   274,   275,   276,   277,    -1,   279,   280,   281,
      282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
@@ -18347,7 +18214,7 @@
      420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
      430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
       29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
       -1,    40,    41,    -1,    43,    44,    45,    46,    47,    -1,
       49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
@@ -18371,7 +18238,7 @@
      229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
       -1,   240,   241,   242,   243,    -1,   245,   246,    -1,   248,
       -1,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
-      -1,   260,   261,   262,    -1,    -1,   265,   266,    -1,   268,
+     259,   260,   261,   262,    -1,    -1,   265,   266,    -1,   268,
       -1,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
      279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
      289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
@@ -18390,9 +18257,9 @@
      419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
      429,   430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-      38,    -1,    40,    41,    42,    43,    44,    45,    46,    47,
+      38,    -1,    40,    41,    -1,    43,    44,    45,    46,    47,
       -1,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
       -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
       68,    69,    -1,    -1,    -1,    73,    74,    75,    76,    -1,
@@ -18433,7 +18300,7 @@
      418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
      428,   429,   430,   431,   432,   433,     3,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
+      -1,    18,    19,    20,    21,    22,    23,    24,    25,    26,
       27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       37,    38,    -1,    40,    41,    -1,    43,    44,    45,    46,
       47,    -1,    49,    50,    -1,    52,    53,    54,    55,    56,
@@ -18457,7 +18324,7 @@
      227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
      237,   238,    -1,   240,   241,   242,   243,    -1,   245,   246,
       -1,   248,    -1,   250,   251,   252,   253,   254,   255,    -1,
-     257,    -1,   259,   260,   261,   262,    -1,    -1,   265,   266,
+     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
       -1,   268,    -1,   270,   271,   272,   273,   274,   275,   276,
      277,    -1,   279,   280,   281,   282,   283,   284,   285,   286,
       -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
@@ -18520,8 +18387,8 @@
      426,   427,   428,   429,   430,   431,   432,   433,     3,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    37,    38,    -1,    40,    41,    -1,    43,    44,
+      25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    37,    38,    -1,    40,    41,    42,    43,    44,
       45,    46,    47,    -1,    49,    50,    -1,    52,    53,    54,
       55,    56,    -1,    -1,    59,    60,    61,    62,    63,    -1,
       65,    66,    67,    68,    69,    -1,    -1,    -1,    73,    74,
@@ -18586,7 +18453,7 @@
      224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
      234,   235,   236,   237,   238,    -1,   240,   241,   242,   243,
       -1,   245,   246,    -1,   248,    -1,   250,   251,   252,   253,
-     254,   255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,
+     254,   255,    -1,   257,    -1,   259,   260,   261,   262,    -1,
       -1,   265,   266,    -1,   268,    -1,   270,   271,   272,   273,
      274,   275,   276,   277,    -1,   279,   280,   281,   282,   283,
      284,   285,   286,    -1,   288,   289,   290,   291,   292,   293,
@@ -18596,7 +18463,7 @@
      324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
      334,    -1,   336,   337,   338,   339,   340,    -1,   342,   343,
      344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
-     354,   355,   356,   357,   358,    -1,   360,   361,   362,   363,
+     354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
       -1,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
       -1,   375,   376,   377,   378,   379,    -1,   381,   382,   383,
      384,   385,   386,   387,    -1,    -1,   390,   391,   392,   393,
@@ -18604,9 +18471,9 @@
       -1,   405,    -1,   407,   408,   409,   410,    -1,    -1,   413,
       -1,    -1,   416,   417,   418,   419,   420,   421,   422,   423,
      424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-       3,    -1,     5,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,
-      23,    24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,
+      23,    24,    25,    26,    27,    28,    29,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,    -1,
       43,    44,    45,    46,    47,    -1,    49,    50,    -1,    52,
       53,    54,    55,    56,    -1,    -1,    59,    60,    61,    62,
@@ -18649,8 +18516,8 @@
      423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
      433,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,    21,
-      22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
-      -1,    -1,    -1,    35,    -1,    37,    38,    -1,    40,    41,
+      22,    23,    24,    25,    26,    27,    28,    29,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,
       -1,    43,    44,    45,    46,    47,    -1,    49,    50,    -1,
       52,    53,    54,    55,    56,    -1,    -1,    59,    60,    61,
       62,    63,    -1,    65,    66,    67,    68,    69,    -1,    -1,
@@ -18693,7 +18560,7 @@
      432,   433,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,
       21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
-      -1,    -1,    -1,    -1,    35,    -1,    37,    38,    -1,    40,
+      -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
       41,    -1,    43,    44,    45,    46,    47,    -1,    49,    50,
       -1,    52,    53,    54,    55,    56,    -1,    -1,    59,    60,
       61,    62,    63,    -1,    65,    66,    67,    68,    69,    -1,
@@ -18726,14 +18593,14 @@
      331,   332,   333,   334,    -1,   336,   337,   338,   339,   340,
       -1,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
      351,   352,   353,   354,   355,   356,   357,   358,    -1,   360,
-     361,    -1,   363,    -1,   365,   366,   367,   368,   369,    -1,
+     361,   362,   363,    -1,   365,   366,   367,   368,   369,    -1,
      371,   372,    -1,    -1,   375,   376,   377,   378,   379,    -1,
      381,   382,   383,   384,   385,   386,   387,    -1,    -1,   390,
      391,   392,   393,   394,    -1,    -1,   397,   398,   399,   400,
      401,   402,   403,    -1,   405,    -1,   407,   408,   409,   410,
       -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,   420,
      421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+     431,   432,   433,     3,    -1,     5,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,
       20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
@@ -18772,14 +18639,14 @@
      360,   361,    -1,   363,    -1,   365,   366,   367,   368,   369,
       -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
       -1,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
-     390,   391,   392,   393,   394,    -1,   396,   397,   398,   399,
+     390,   391,   392,   393,   394,    -1,    -1,   397,   398,   399,
      400,   401,   402,   403,    -1,   405,    -1,   407,   408,   409,
      410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
      420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
      430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,
       19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
-      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
+      29,    -1,    -1,    -1,    -1,    -1,    35,    -1,    37,    38,
       -1,    40,    41,    -1,    43,    44,    45,    46,    47,    -1,
       49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
       59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
@@ -18822,7 +18689,7 @@
      429,   430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
-      28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+      28,    29,    -1,    -1,    -1,    -1,    -1,    35,    -1,    37,
       38,    -1,    40,    41,    -1,    43,    44,    45,    46,    47,
       -1,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
       -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
@@ -18901,7 +18768,7 @@
      357,   358,    -1,   360,   361,    -1,   363,    -1,   365,   366,
      367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
      377,   378,   379,    -1,   381,   382,   383,   384,   385,   386,
-     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
+     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,   396,
      397,   398,   399,   400,   401,   402,   403,    -1,   405,    -1,
      407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
      417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
@@ -19857,7 +19724,7 @@
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    18,    19,    20,    21,    22,    23,
       24,    25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,
-      -1,    35,    -1,    37,    38,    -1,    40,    41,    -1,    43,
+      -1,    -1,    -1,    37,    38,    -1,    40,    41,    -1,    43,
       44,    45,    46,    47,    -1,    49,    50,    -1,    52,    53,
       54,    55,    56,    -1,    -1,    59,    60,    61,    62,    63,
       -1,    65,    66,    67,    68,    69,    -1,    -1,    -1,    73,
@@ -19887,7 +19754,7 @@
      304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
      314,   315,    -1,   317,   318,   319,   320,   321,   322,   323,
      324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
-     334,    -1,    -1,   337,   338,   339,   340,    -1,   342,   343,
+     334,    -1,   336,   337,   338,   339,   340,    -1,   342,   343,
      344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
      354,   355,   356,   357,   358,    -1,   360,   361,    -1,   363,
       -1,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
@@ -19986,7 +19853,7 @@
      432,   433,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,
       21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
+      -1,    -1,    -1,    -1,    35,    -1,    37,    38,    -1,    40,
       41,    -1,    43,    44,    45,    46,    47,    -1,    49,    50,
       -1,    52,    53,    54,    55,    56,    -1,    -1,    59,    60,
       61,    62,    63,    -1,    65,    66,    67,    68,    69,    -1,
@@ -20016,7 +19883,7 @@
       -1,   302,   303,   304,   305,   306,   307,   308,   309,   310,
      311,   312,    -1,   314,   315,    -1,   317,   318,   319,   320,
      321,   322,   323,   324,   325,   326,   327,   328,    -1,   330,
-     331,   332,   333,   334,    -1,   336,   337,   338,   339,   340,
+     331,   332,   333,   334,    -1,    -1,   337,   338,   339,   340,
       -1,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
      351,   352,   353,   354,   355,   356,   357,   358,    -1,   360,
      361,    -1,   363,    -1,   365,   366,   367,   368,   369,    -1,
@@ -20461,6 +20328,346 @@
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,
       20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
+      40,    41,    -1,    43,    44,    45,    46,    47,    -1,    49,
+      50,    -1,    52,    53,    54,    55,    56,    -1,    -1,    59,
+      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
+      -1,    -1,    -1,    73,    74,    75,    76,    -1,    78,    79,
+      80,    -1,    82,    83,    84,    85,    86,    87,    -1,    -1,
+      90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
+     110,    -1,   112,   113,   114,   115,   116,    -1,   118,   119,
+     120,    -1,    -1,   123,   124,   125,   126,   127,    -1,   129,
+     130,   131,    -1,   133,   134,   135,    -1,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
+     150,   151,   152,    -1,   154,    -1,   156,    -1,    -1,    -1,
+     160,   161,   162,    -1,   164,   165,    -1,   167,   168,    -1,
+     170,   171,   172,   173,   174,    -1,   176,   177,   178,   179,
+      -1,   181,   182,   183,   184,   185,   186,    -1,   188,    -1,
+     190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
+     200,    -1,    -1,   203,    -1,   205,   206,   207,   208,   209,
+      -1,    -1,   212,   213,    -1,   215,    -1,    -1,   218,   219,
+     220,    -1,    -1,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,    -1,
+     240,   241,   242,   243,    -1,   245,   246,    -1,   248,    -1,
+     250,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
+     260,   261,   262,    -1,    -1,   265,   266,    -1,   268,    -1,
+     270,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
+     280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,    -1,   314,   315,    -1,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
+     330,   331,   332,   333,   334,    -1,   336,   337,   338,   339,
+     340,    -1,   342,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,   358,    -1,
+     360,   361,    -1,   363,    -1,   365,   366,   367,   368,   369,
+      -1,   371,   372,    -1,    -1,   375,   376,   377,   378,   379,
+      -1,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
+     390,   391,   392,   393,   394,    -1,    -1,   397,   398,   399,
+     400,   401,   402,   403,    -1,   405,    -1,   407,   408,   409,
+     410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,
+      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
+      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
+      -1,    40,    41,    -1,    43,    44,    45,    46,    47,    -1,
+      49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
+      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
+      69,    -1,    -1,    -1,    73,    74,    75,    76,    -1,    78,
+      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
+      -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
+     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
+     129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
+     139,   140,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     149,   150,   151,   152,    -1,   154,    -1,   156,    -1,    -1,
+      -1,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
+      -1,   170,   171,   172,   173,   174,    -1,   176,   177,   178,
+     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
+      -1,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
+      -1,   200,    -1,    -1,   203,    -1,   205,   206,   207,   208,
+     209,    -1,    -1,   212,   213,    -1,   215,    -1,    -1,   218,
+     219,   220,    -1,    -1,   223,   224,   225,   226,   227,   228,
+     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
+      -1,   240,   241,   242,   243,    -1,   245,   246,    -1,   248,
+      -1,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
+      -1,   260,   261,   262,    -1,    -1,   265,   266,    -1,   268,
+      -1,   270,   271,   272,   273,   274,   275,   276,   277,    -1,
+     279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
+     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
+     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,    -1,   314,   315,    -1,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+      -1,   330,   331,   332,   333,   334,    -1,   336,   337,   338,
+     339,   340,    -1,   342,   343,   344,   345,    -1,   347,   348,
+     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
+      -1,   360,   361,    -1,   363,    -1,   365,   366,   367,   368,
+     369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
+     379,    -1,   381,   382,   383,   384,   385,   386,   387,    -1,
+      -1,   390,   391,   392,   393,   394,    -1,    -1,   397,   398,
+     399,   400,   401,   402,   403,    -1,   405,    -1,   407,   408,
+     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
+     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
+     429,   430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
+      28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+      38,    -1,    40,    41,    -1,    43,    44,    45,    46,    47,
+      -1,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
+      -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
+      68,    69,    -1,    -1,    -1,    73,    74,    75,    76,    -1,
+      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
+      -1,    -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
+     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
+      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,    -1,   147,
+      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,    -1,
+      -1,    -1,   160,   161,   162,    -1,   164,   165,    -1,   167,
+     168,    -1,   170,   171,   172,   173,   174,    -1,   176,   177,
+     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
+     188,    -1,   190,   191,   192,   193,   194,   195,   196,    -1,
+     198,    -1,   200,    -1,    -1,   203,    -1,   205,   206,   207,
+     208,   209,    -1,    -1,   212,   213,    -1,   215,    -1,    -1,
+     218,   219,   220,    -1,    -1,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,    -1,   240,   241,   242,   243,    -1,   245,   246,    -1,
+     248,    -1,   250,   251,   252,   253,   254,   255,    -1,   257,
+      -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,    -1,
+     268,    -1,   270,   271,   272,   273,   274,   275,   276,   277,
+      -1,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,    -1,   314,   315,    -1,   317,
+     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
+     328,    -1,   330,   331,   332,   333,   334,    -1,   336,   337,
+     338,   339,   340,    -1,   342,   343,   344,   345,    -1,   347,
+     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
+     358,    -1,   360,   361,    -1,   363,    -1,   365,   366,   367,
+     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,   377,
+     378,   379,    -1,   381,   382,   383,   384,   385,   386,   387,
+      -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,   397,
+     398,   399,   400,   401,   402,   403,    -1,   405,    -1,   407,
+     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,     3,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
+      27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      37,    38,    -1,    40,    41,    42,    43,    44,    45,    -1,
+      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
+      -1,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    -1,    -1,    71,    -1,    73,    74,    75,    76,
+      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
+      87,    -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,
+      -1,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
+      -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
+     127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
+     137,   138,   139,   140,    -1,   142,   143,   144,    -1,    -1,
+     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
+     157,    -1,   159,   160,   161,   162,    -1,   164,    -1,    -1,
+      -1,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+      -1,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+      -1,   198,    -1,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,    -1,    -1,   212,    -1,   214,   215,   216,
+      -1,   218,   219,   220,    -1,    -1,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,    -1,    -1,   245,   246,
+     247,   248,    -1,    -1,   251,   252,   253,   254,   255,    -1,
+     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,   266,
+     267,   268,   269,    -1,   271,   272,   273,   274,   275,   276,
+     277,    -1,   279,   280,    -1,   282,    -1,   284,   285,   286,
+      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,    -1,   314,   315,   316,
+     317,   318,   319,    -1,   321,   322,   323,   324,   325,   326,
+     327,   328,    -1,   330,   331,   332,   333,   334,    -1,   336,
+     337,   338,   339,   340,   341,   342,   343,   344,   345,    -1,
+     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
+     357,    -1,    -1,   360,   361,    -1,   363,   364,   365,   366,
+     367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
+      -1,   378,    -1,    -1,   381,   382,   383,   384,   385,   386,
+     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
+     397,   398,   399,   400,   401,    -1,   403,   404,   405,   406,
+     407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
+     417,   418,   419,   420,   421,     3,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   431,   432,   433,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
+      28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+      38,    -1,    40,    41,    42,    43,    44,    45,    -1,    47,
+      48,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
+      -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
+      68,    -1,    -1,    71,    -1,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
+      -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,    -1,
+      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
+     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
+      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
+     138,   139,   140,    -1,   142,   143,   144,    -1,    -1,   147,
+      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,   157,
+      -1,   159,   160,   161,   162,    -1,   164,    -1,    -1,    -1,
+     168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
+     188,   189,    -1,   191,   192,   193,   194,   195,   196,    -1,
+     198,    -1,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,    -1,    -1,   212,    -1,   214,   215,   216,    -1,
+     218,   219,   220,    -1,    -1,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,    -1,    -1,   245,   246,   247,
+     248,   249,    -1,   251,   252,   253,   254,   255,    -1,   257,
+      -1,    -1,   260,   261,   262,    -1,    -1,   265,    -1,   267,
+     268,   269,    -1,   271,   272,   273,   274,   275,   276,   277,
+      -1,   279,   280,    -1,   282,    -1,   284,   285,   286,    -1,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,    -1,   314,   315,   316,   317,
+     318,   319,    -1,   321,   322,   323,   324,   325,   326,   327,
+     328,    -1,   330,   331,   332,   333,   334,    -1,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,    -1,   347,
+     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
+      -1,    -1,   360,   361,   362,   363,   364,   365,   366,   367,
+     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,    -1,
+     378,    -1,    -1,   381,   382,   383,   384,   385,   386,   387,
+      -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,   397,
+     398,   399,   400,   401,    -1,   403,    -1,   405,   406,   407,
+     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
+     418,   419,   420,   421,     3,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   431,   432,   433,    -1,    -1,    -1,    18,
+      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
+      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
+      -1,    40,    41,    -1,    43,    44,    45,    46,    47,    -1,
+      49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
+      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
+      69,    -1,    -1,    -1,    73,    74,    75,    76,    -1,    78,
+      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
+      -1,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
+     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
+     129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
+     139,   140,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     149,   150,   151,   152,    -1,   154,    -1,   156,    -1,    -1,
+      -1,   160,   161,   162,    -1,   164,   165,    -1,   167,   168,
+      -1,   170,   171,   172,   173,   174,    -1,   176,   177,   178,
+     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
+      -1,   190,   191,   192,   193,   194,   195,   196,    -1,   198,
+      -1,   200,    -1,    -1,   203,    -1,   205,   206,   207,   208,
+     209,    -1,    -1,   212,   213,    -1,   215,    -1,    -1,   218,
+     219,   220,    -1,    -1,   223,   224,   225,   226,   227,   228,
+     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
+      -1,   240,   241,   242,   243,    -1,   245,   246,    -1,   248,
+      -1,   250,   251,   252,   253,   254,   255,    -1,   257,    -1,
+      -1,   260,   261,   262,    -1,    -1,   265,   266,    -1,   268,
+      -1,   270,   271,   272,   273,   274,    -1,   276,   277,    -1,
+     279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
+     289,   290,   291,   292,   293,    -1,   295,   296,   297,   298,
+     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,    -1,   314,   315,    -1,   317,   318,
+     319,   320,    -1,   322,   323,   324,   325,   326,   327,   328,
+      -1,   330,   331,   332,   333,   334,    -1,   336,   337,   338,
+     339,   340,    -1,   342,   343,   344,   345,    -1,   347,   348,
+     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
+      -1,   360,   361,    -1,   363,    -1,   365,   366,   367,   368,
+     369,    -1,   371,   372,    -1,    -1,   375,   376,   377,   378,
+     379,    -1,   381,   382,   383,   384,   385,   386,   387,    -1,
+      -1,   390,   391,   392,   393,   394,    -1,    -1,   397,   398,
+     399,   400,   401,   402,   403,    -1,   405,    -1,   407,   408,
+     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
+     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
+     429,   430,   431,   432,   433,     3,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
+      28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+      38,    -1,    40,    41,    42,    43,    44,    45,    -1,    47,
+      48,    49,    50,    -1,    52,    53,    54,    55,    56,    -1,
+      -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
+      68,    -1,    -1,    71,    -1,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
+      -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,    -1,
+      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
+     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
+      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
+     138,   139,   140,    -1,   142,   143,   144,    -1,    -1,   147,
+      -1,   149,   150,   151,   152,    -1,   154,    -1,   156,   157,
+      -1,   159,   160,   161,   162,    -1,   164,    -1,    -1,    -1,
+     168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
+     188,   189,    -1,   191,   192,   193,   194,   195,   196,    -1,
+     198,    -1,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,    -1,    -1,   212,    -1,   214,   215,   216,    -1,
+     218,   219,   220,    -1,    -1,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,    -1,   245,   246,   247,
+     248,    -1,    -1,   251,   252,   253,   254,   255,    -1,   257,
+      -1,    -1,   260,   261,   262,    -1,    -1,   265,    -1,   267,
+     268,   269,    -1,   271,   272,   273,   274,   275,   276,   277,
+      -1,   279,   280,    -1,   282,    -1,   284,   285,   286,    -1,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,    -1,   314,   315,   316,   317,
+     318,   319,    -1,   321,   322,   323,   324,   325,   326,   327,
+     328,    -1,   330,   331,   332,   333,   334,    -1,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,    -1,   347,
+     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
+      -1,    -1,   360,   361,    -1,   363,   364,   365,   366,   367,
+     368,   369,    -1,   371,   372,    -1,    -1,   375,   376,    -1,
+     378,    -1,    -1,   381,   382,   383,   384,   385,   386,   387,
+      -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,   397,
+     398,   399,   400,   401,    -1,   403,    -1,   405,   406,   407,
+     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
+     418,   419,   420,   421,     3,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   431,   432,   433,    -1,    -1,    -1,    18,
+      19,    20,    21,    22,    23,    24,    25,    -1,    27,    28,
+      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
+      -1,    40,    41,    42,    43,    44,    45,    -1,    47,    48,
+      49,    50,    -1,    52,    53,    54,    55,    56,    -1,    -1,
+      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
+      -1,    -1,    71,    -1,    73,    74,    75,    76,    77,    78,
+      79,    80,    -1,    82,    83,    84,    85,    86,    87,    -1,
+      89,    90,    91,    92,    -1,    -1,    -1,    96,    -1,    -1,
+      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+      -1,   110,    -1,   112,   113,   114,   115,   116,    -1,   118,
+     119,   120,    -1,    -1,   123,   124,   125,   126,   127,    -1,
+     129,   130,   131,    -1,   133,   134,   135,    -1,   137,   138,
+     139,   140,    -1,   142,   143,   144,    -1,    -1,   147,    -1,
+     149,   150,   151,   152,    -1,   154,    -1,   156,   157,    -1,
+     159,   160,   161,   162,    -1,   164,    -1,    -1,    -1,   168,
+      -1,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
+     189,    -1,   191,   192,   193,   194,   195,   196,    -1,   198,
+      -1,   200,   201,   202,   203,   204,   205,   206,   207,   208,
+     209,    -1,    -1,   212,    -1,   214,   215,   216,    -1,   218,
+     219,   220,    -1,    -1,   223,   224,   225,   226,   227,   228,
+     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
+     239,   240,   241,   242,   243,    -1,   245,   246,   247,   248,
+      -1,    -1,   251,   252,   253,   254,   255,    -1,   257,    -1,
+      -1,   260,   261,   262,    -1,    -1,   265,    -1,   267,   268,
+     269,    -1,   271,   272,   273,   274,   275,   276,   277,    -1,
+     279,   280,    -1,   282,    -1,   284,   285,   286,    -1,   288,
+     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
+     299,   300,    -1,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,    -1,   314,   315,   316,   317,   318,
+     319,    -1,   321,   322,   323,   324,   325,   326,   327,   328,
+      -1,   330,   331,   332,   333,   334,    -1,   336,   337,   338,
+     339,   340,   341,   342,   343,   344,   345,    -1,   347,   348,
+     349,   350,   351,   352,   353,   354,   355,   356,   357,    -1,
+      -1,   360,   361,    -1,   363,   364,   365,   366,   367,   368,
+     369,    -1,   371,   372,    -1,    -1,   375,   376,    -1,   378,
+      -1,    -1,   381,   382,   383,   384,   385,   386,   387,    -1,
+      -1,   390,   391,   392,   393,   394,    -1,    -1,   397,   398,
+     399,   400,   401,    -1,   403,    -1,   405,   406,   407,   408,
+     409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,
+     419,   420,   421,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   431,   432,   433,    -1,    -1,    -1,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
       40,    41,    42,    43,    44,    45,    -1,    47,    48,    49,
       50,    -1,    52,    53,    54,    55,    56,    -1,    -1,    59,
       60,    61,    62,    63,    -1,    65,    66,    67,    68,    -1,
@@ -20475,117 +20682,32 @@
      150,   151,   152,    -1,   154,    -1,   156,   157,    -1,   159,
      160,   161,   162,    -1,   164,    -1,    -1,    -1,   168,    -1,
      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
-     190,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-      -1,    -1,   212,    -1,   214,   215,   216,    -1,   218,   219,
-     220,    -1,    -1,   223,   224,   225,   226,   227,   228,   229,
-     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
-     240,   241,   242,    -1,    -1,   245,   246,   247,   248,    -1,
-      -1,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
-     260,   261,   262,    -1,    -1,   265,   266,   267,   268,   269,
-      -1,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
-     280,    -1,   282,    -1,   284,   285,   286,    -1,   288,   289,
-     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
-     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
-      -1,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
-     330,   331,   332,   333,   334,    -1,   336,   337,   338,   339,
-     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
-     350,   351,   352,   353,   354,   355,   356,   357,    -1,    -1,
-     360,   361,    -1,   363,   364,   365,   366,   367,   368,   369,
-      -1,   371,   372,    -1,    -1,   375,   376,    -1,   378,    -1,
-      -1,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
-     390,   391,   392,   393,   394,    -1,    -1,   397,   398,   399,
-     400,   401,    -1,   403,   404,   405,   406,   407,   408,   409,
-     410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
-     420,   421,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   431,   432,   433,    -1,    -1,    -1,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
-      41,    42,    43,    44,    45,    -1,    47,    48,    49,    50,
-      -1,    52,    53,    54,    55,    56,    -1,    -1,    59,    60,
-      61,    62,    63,    -1,    65,    66,    67,    68,    -1,    -1,
-      71,    -1,    73,    74,    75,    76,    77,    78,    79,    80,
-      -1,    82,    83,    84,    85,    86,    87,    -1,    89,    90,
-      91,    92,    -1,    -1,    -1,    96,    -1,    -1,    -1,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,    -1,   110,
-      -1,   112,   113,   114,   115,   116,    -1,   118,   119,   120,
-      -1,    -1,   123,   124,   125,   126,   127,    -1,   129,   130,
-     131,    -1,   133,   134,   135,    -1,   137,   138,   139,   140,
-      -1,   142,   143,   144,    -1,    -1,   147,    -1,   149,   150,
-     151,   152,    -1,   154,    -1,   156,   157,    -1,   159,   160,
-     161,   162,    -1,   164,    -1,    -1,    -1,   168,    -1,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,    -1,
-     181,   182,   183,   184,   185,   186,    -1,   188,   189,    -1,
-     191,   192,   193,   194,   195,   196,    -1,   198,    -1,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,    -1,
-      -1,   212,    -1,   214,   215,   216,    -1,   218,   219,   220,
-      -1,    -1,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,    -1,    -1,   245,   246,   247,   248,   249,    -1,
-     251,   252,   253,   254,   255,    -1,   257,    -1,    -1,   260,
-     261,   262,    -1,    -1,   265,    -1,   267,   268,   269,    -1,
-     271,   272,   273,   274,   275,   276,   277,    -1,   279,   280,
-      -1,   282,    -1,   284,   285,   286,    -1,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-      -1,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,    -1,   314,   315,   316,   317,   318,   319,    -1,
-     321,   322,   323,   324,   325,   326,   327,   328,    -1,   330,
-     331,   332,   333,   334,    -1,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
-     351,   352,   353,   354,   355,   356,   357,    -1,    -1,   360,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,    -1,
-     371,   372,    -1,    -1,   375,   376,    -1,   378,    -1,    -1,
-     381,   382,   383,   384,   385,   386,   387,    -1,    -1,   390,
-     391,   392,   393,   394,    -1,    -1,   397,   398,   399,   400,
-     401,    -1,   403,    -1,   405,   406,   407,   408,   409,   410,
-      -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,   420,
-     421,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     431,   432,   433,    -1,    -1,    -1,    18,    19,    20,    21,
-      22,    23,    24,    25,    -1,    27,    28,    29,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,    41,
-      -1,    43,    44,    45,    46,    47,    -1,    49,    50,    -1,
-      52,    53,    54,    55,    56,    -1,    -1,    59,    60,    61,
-      62,    63,    -1,    65,    66,    67,    68,    69,    -1,    -1,
-      -1,    73,    74,    75,    76,    -1,    78,    79,    80,    -1,
-      82,    83,    84,    85,    86,    87,    -1,    -1,    90,    91,
-      92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,    -1,   110,    -1,
-     112,   113,   114,   115,   116,    -1,   118,   119,   120,    -1,
-      -1,   123,   124,   125,   126,   127,    -1,   129,   130,   131,
-      -1,   133,   134,   135,    -1,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
-     152,    -1,   154,    -1,   156,    -1,    -1,    -1,   160,   161,
-     162,    -1,   164,   165,    -1,   167,   168,    -1,   170,   171,
-     172,   173,   174,    -1,   176,   177,   178,   179,    -1,   181,
-     182,   183,   184,   185,   186,    -1,   188,    -1,   190,   191,
-     192,   193,   194,   195,   196,    -1,   198,    -1,   200,    -1,
-      -1,   203,    -1,   205,   206,   207,   208,   209,    -1,    -1,
-     212,   213,    -1,   215,    -1,    -1,   218,   219,   220,    -1,
-      -1,   223,   224,   225,   226,   227,   228,   229,   230,   231,
-     232,   233,   234,   235,   236,   237,   238,    -1,   240,   241,
-     242,   243,    -1,   245,   246,    -1,   248,    -1,   250,   251,
-     252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
-     262,    -1,    -1,   265,   266,    -1,   268,    -1,   270,   271,
-     272,   273,   274,    -1,   276,   277,    -1,   279,   280,   281,
-     282,   283,   284,   285,   286,    -1,   288,   289,   290,   291,
-     292,   293,    -1,   295,   296,   297,   298,   299,   300,    -1,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,    -1,   314,   315,    -1,   317,   318,   319,   320,    -1,
-     322,   323,   324,   325,   326,   327,   328,    -1,   330,   331,
-     332,   333,   334,    -1,   336,   337,   338,   339,   340,    -1,
-     342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
-     352,   353,   354,   355,   356,   357,   358,    -1,   360,   361,
-      -1,   363,    -1,   365,   366,   367,   368,   369,    -1,   371,
-     372,    -1,    -1,   375,   376,   377,   378,   379,    -1,   381,
-     382,   383,   384,   385,   386,   387,    -1,    -1,   390,   391,
-     392,   393,   394,    -1,    -1,   397,   398,   399,   400,   401,
-     402,   403,    -1,   405,    -1,   407,   408,   409,   410,    -1,
-      -1,   413,    -1,    -1,   416,   417,   418,   419,   420,   421,
-     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    19,    20,
+      -1,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
+      -1,   191,   192,   193,   194,   195,   196,    -1,   198,    -1,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+      -1,    -1,   212,    -1,   214,   215,   216,    -1,   218,   219,
+     220,    -1,    -1,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,    -1,    -1,   245,   246,   247,   248,    -1,
+      -1,   251,   252,   253,   254,   255,    -1,   257,    -1,    -1,
+     260,   261,   262,    -1,    -1,   265,    -1,   267,   268,   269,
+      -1,   271,   272,   273,   274,   275,   276,   277,    -1,   279,
+     280,    -1,   282,    -1,   284,   285,   286,    -1,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,    -1,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,    -1,   314,   315,   316,   317,   318,   319,
+      -1,   321,   322,   323,   324,   325,   326,   327,   328,    -1,
+     330,   331,   332,   333,   334,    -1,   336,   337,   338,   339,
+     340,   341,   342,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,    -1,    -1,
+     360,   361,    -1,   363,   364,   365,   366,   367,   368,   369,
+      -1,   371,   372,    -1,    -1,   375,   376,    -1,   378,    -1,
+      -1,   381,   382,   383,   384,   385,   386,   387,    -1,    -1,
+     390,   391,   392,   393,   394,    -1,    -1,   397,   398,   399,
+     400,   401,    -1,   403,    -1,   405,   406,   407,   408,   409,
+     410,    -1,    -1,   413,    -1,    -1,   416,   417,   418,   419,
+     420,   421,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   431,   432,   433,    -1,    -1,    -1,    18,    19,    20,
       21,    22,    23,    24,    25,    -1,    27,    28,    29,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
       41,    42,    43,    44,    45,    -1,    47,    48,    49,    50,
@@ -20608,7 +20730,7 @@
       -1,   212,    -1,   214,   215,   216,    -1,   218,   219,   220,
       -1,    -1,   223,   224,   225,   226,   227,   228,   229,   230,
      231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,    -1,   245,   246,   247,   248,    -1,    -1,
+     241,   242,    -1,    -1,   245,   246,   247,   248,    -1,    -1,
      251,   252,   253,   254,   255,    -1,   257,    -1,    -1,   260,
      261,   262,    -1,    -1,   265,    -1,   267,   268,   269,    -1,
      271,   272,   273,   274,   275,   276,   277,    -1,   279,   280,
@@ -20650,7 +20772,7 @@
      212,    -1,   214,   215,   216,    -1,   218,   219,   220,    -1,
       -1,   223,   224,   225,   226,   227,   228,   229,   230,   231,
      232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
-     242,   243,    -1,   245,   246,   247,   248,    -1,    -1,   251,
+     242,    -1,    -1,   245,   246,   247,   248,    -1,    -1,   251,
      252,   253,   254,   255,    -1,   257,    -1,    -1,   260,   261,
      262,    -1,    -1,   265,    -1,   267,   268,   269,    -1,   271,
      272,   273,   274,   275,   276,   277,    -1,   279,   280,    -1,
@@ -20743,7 +20865,7 @@
      304,   305,   306,   307,   308,   309,   310,   311,   312,    -1,
      314,   315,   316,   317,   318,   319,    -1,   321,   322,   323,
      324,   325,   326,   327,   328,    -1,   330,   331,   332,   333,
-     334,    -1,   336,   337,   338,   339,   340,   341,   342,   343,
+     334,    -1,   336,   337,    -1,   339,   340,   341,   342,   343,
      344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
      354,   355,   356,   357,    -1,    -1,   360,   361,    -1,   363,
      364,   365,   366,   367,   368,   369,    -1,   371,   372,    -1,
@@ -20756,171 +20878,45 @@
       -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
       25,    -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    37,    38,    -1,    40,    41,    42,    43,    44,
-      45,    -1,    47,    48,    49,    50,    -1,    52,    53,    54,
-      55,    56,    -1,    -1,    59,    60,    61,    62,    63,    -1,
+      45,    -1,    -1,    48,    -1,    -1,    -1,    52,    53,    54,
+      55,    56,    -1,    -1,    59,    60,    -1,    -1,    63,    -1,
       65,    66,    67,    68,    -1,    -1,    71,    -1,    73,    74,
       75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
       85,    86,    87,    -1,    89,    90,    91,    92,    -1,    -1,
       -1,    96,    -1,    -1,    -1,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,    -1,   110,    -1,   112,   113,   114,
+     105,    -1,    -1,   108,    -1,   110,    -1,   112,   113,   114,
      115,   116,    -1,   118,   119,   120,    -1,    -1,   123,   124,
      125,   126,   127,    -1,   129,   130,   131,    -1,   133,   134,
      135,    -1,   137,   138,   139,   140,    -1,   142,   143,   144,
-      -1,    -1,   147,    -1,   149,   150,   151,   152,    -1,   154,
+      -1,    -1,   147,    -1,   149,   150,    -1,   152,    -1,   154,
       -1,   156,   157,    -1,   159,   160,   161,   162,    -1,   164,
       -1,    -1,    -1,   168,    -1,   170,   171,   172,   173,   174,
      175,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
      185,   186,    -1,   188,   189,    -1,   191,   192,   193,   194,
-     195,   196,    -1,   198,    -1,   200,   201,   202,   203,   204,
+      -1,    -1,    -1,    -1,    -1,   200,   201,   202,   203,   204,
      205,   206,   207,   208,   209,    -1,    -1,   212,    -1,   214,
      215,   216,    -1,   218,   219,   220,    -1,    -1,   223,   224,
      225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,    -1,    -1,
-     245,   246,   247,   248,    -1,    -1,   251,   252,   253,   254,
+     235,   236,   237,    -1,   239,    -1,   241,   242,    -1,    -1,
+     245,   246,   247,   248,    -1,    -1,   251,    -1,   253,   254,
      255,    -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,
      265,    -1,   267,   268,   269,    -1,   271,   272,   273,   274,
      275,   276,   277,    -1,   279,   280,    -1,   282,    -1,   284,
      285,   286,    -1,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,    -1,   302,   303,   304,
+     295,    -1,   297,   298,   299,   300,    -1,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,    -1,   314,
      315,   316,   317,   318,   319,    -1,   321,   322,   323,   324,
      325,   326,   327,   328,    -1,   330,   331,   332,   333,   334,
-      -1,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+      -1,   336,   337,    -1,   339,   340,   341,   342,   343,    -1,
      345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,    -1,    -1,   360,   361,    -1,   363,   364,
-     365,   366,   367,   368,   369,    -1,   371,   372,    -1,    -1,
+     365,   366,   367,   368,   369,    -1,    -1,    -1,    -1,    -1,
      375,   376,    -1,   378,    -1,    -1,   381,   382,   383,   384,
      385,   386,   387,    -1,    -1,   390,   391,   392,   393,   394,
-      -1,    -1,   397,   398,   399,   400,   401,    -1,   403,    -1,
+      -1,    -1,   397,   398,   399,   400,   401,    -1,    -1,    -1,
      405,   406,   407,   408,   409,   410,    -1,    -1,   413,    -1,
-      -1,   416,   417,   418,   419,   420,   421,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   431,   432,   433,    -1,
-      -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
-      -1,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    37,    38,    -1,    40,    41,    42,    43,    44,    45,
-      -1,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
-      56,    -1,    -1,    59,    60,    61,    62,    63,    -1,    65,
-      66,    67,    68,    -1,    -1,    71,    -1,    73,    74,    75,
-      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
-      86,    87,    -1,    89,    90,    91,    92,    -1,    -1,    -1,
-      96,    -1,    -1,    -1,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,    -1,   110,    -1,   112,   113,   114,   115,
-     116,    -1,   118,   119,   120,    -1,    -1,   123,   124,   125,
-     126,   127,    -1,   129,   130,   131,    -1,   133,   134,   135,
-      -1,   137,   138,   139,   140,    -1,   142,   143,   144,    -1,
-      -1,   147,    -1,   149,   150,   151,   152,    -1,   154,    -1,
-     156,   157,    -1,   159,   160,   161,   162,    -1,   164,    -1,
-      -1,    -1,   168,    -1,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
-     186,    -1,   188,   189,    -1,   191,   192,   193,   194,   195,
-     196,    -1,   198,    -1,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,    -1,    -1,   212,    -1,   214,   215,
-     216,    -1,   218,   219,   220,    -1,    -1,   223,   224,   225,
-     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,   239,   240,   241,   242,    -1,    -1,   245,
-     246,   247,   248,    -1,    -1,   251,   252,   253,   254,   255,
-      -1,   257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,
-      -1,   267,   268,   269,    -1,   271,   272,   273,   274,   275,
-     276,   277,    -1,   279,   280,    -1,   282,    -1,   284,   285,
-     286,    -1,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   300,    -1,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,    -1,   314,   315,
-     316,   317,   318,   319,    -1,   321,   322,   323,   324,   325,
-     326,   327,   328,    -1,   330,   331,   332,   333,   334,    -1,
-     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
-      -1,   347,   348,   349,   350,   351,   352,   353,   354,   355,
-     356,   357,    -1,    -1,   360,   361,    -1,   363,   364,   365,
-     366,   367,   368,   369,    -1,   371,   372,    -1,    -1,   375,
-     376,    -1,   378,    -1,    -1,   381,   382,   383,   384,   385,
-     386,   387,    -1,    -1,   390,   391,   392,   393,   394,    -1,
-      -1,   397,   398,   399,   400,   401,    -1,   403,    -1,   405,
-     406,   407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,
-     416,   417,   418,   419,   420,   421,     3,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   431,   432,   433,    -1,    -1,
-      -1,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    38,    -1,    40,    41,    42,    43,    44,    45,    -1,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
-      -1,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
-      67,    68,    -1,    -1,    71,    -1,    73,    74,    75,    76,
-      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
-      87,    -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,
-      -1,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,    -1,   110,    -1,   112,   113,   114,   115,   116,
-      -1,   118,   119,   120,    -1,    -1,   123,   124,   125,   126,
-     127,    -1,   129,   130,   131,    -1,   133,   134,   135,    -1,
-     137,   138,   139,   140,    -1,   142,   143,   144,    -1,    -1,
-     147,    -1,   149,   150,   151,   152,    -1,   154,    -1,   156,
-     157,    -1,   159,   160,   161,   162,    -1,   164,    -1,    -1,
-      -1,   168,    -1,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
-      -1,   188,   189,    -1,   191,   192,   193,   194,   195,   196,
-      -1,   198,    -1,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,    -1,    -1,   212,    -1,   214,   215,   216,
-      -1,   218,   219,   220,    -1,    -1,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,    -1,    -1,   245,   246,
-     247,   248,    -1,    -1,   251,   252,   253,   254,   255,    -1,
-     257,    -1,    -1,   260,   261,   262,    -1,    -1,   265,    -1,
-     267,   268,   269,    -1,   271,   272,   273,   274,   275,   276,
-     277,    -1,   279,   280,    -1,   282,    -1,   284,   285,   286,
-      -1,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,    -1,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,    -1,   314,   315,   316,
-     317,   318,   319,    -1,   321,   322,   323,   324,   325,   326,
-     327,   328,    -1,   330,   331,   332,   333,   334,    -1,   336,
-     337,    -1,   339,   340,   341,   342,   343,   344,   345,    -1,
-     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,    -1,    -1,   360,   361,    -1,   363,   364,   365,   366,
-     367,   368,   369,    -1,   371,   372,    -1,    -1,   375,   376,
-      -1,   378,    -1,    -1,   381,   382,   383,   384,   385,   386,
-     387,    -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,
-     397,   398,   399,   400,   401,    -1,   403,    -1,   405,   406,
-     407,   408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,
-     417,   418,   419,   420,   421,     3,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   431,   432,   433,    -1,    -1,    -1,
-      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
-      28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-      38,    -1,    40,    41,    42,    43,    44,    45,    -1,    -1,
-      48,    -1,    -1,    -1,    52,    53,    54,    55,    56,    -1,
-      -1,    59,    60,    -1,    -1,    63,    -1,    65,    66,    67,
-      68,    -1,    -1,    71,    -1,    73,    74,    75,    76,    77,
-      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
-      -1,    89,    90,    91,    92,    -1,    -1,    -1,    96,    -1,
-      -1,    -1,   100,   101,   102,   103,   104,   105,    -1,    -1,
-     108,    -1,   110,    -1,   112,   113,   114,   115,   116,    -1,
-     118,   119,   120,    -1,    -1,   123,   124,   125,   126,   127,
-      -1,   129,   130,   131,    -1,   133,   134,   135,    -1,   137,
-     138,   139,   140,    -1,   142,   143,   144,    -1,    -1,   147,
-      -1,   149,   150,    -1,   152,    -1,   154,    -1,   156,   157,
-      -1,   159,   160,   161,   162,    -1,   164,    -1,    -1,    -1,
-     168,    -1,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
-     188,   189,    -1,   191,   192,   193,   194,    -1,    -1,    -1,
-      -1,    -1,   200,   201,   202,   203,   204,   205,   206,   207,
-     208,   209,    -1,    -1,   212,    -1,   214,   215,   216,    -1,
-     218,   219,   220,    -1,    -1,   223,   224,   225,   226,   227,
-     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
-      -1,   239,    -1,   241,   242,    -1,    -1,   245,   246,   247,
-     248,    -1,    -1,   251,    -1,   253,   254,   255,    -1,   257,
-      -1,    -1,   260,   261,   262,    -1,    -1,   265,    -1,   267,
-     268,   269,    -1,   271,   272,   273,   274,   275,   276,   277,
-      -1,   279,   280,    -1,   282,    -1,   284,   285,   286,    -1,
-     288,   289,   290,   291,   292,   293,   294,   295,    -1,   297,
-     298,   299,   300,    -1,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,    -1,   314,   315,   316,   317,
-     318,   319,    -1,   321,   322,   323,   324,   325,   326,   327,
-     328,    -1,   330,   331,   332,   333,   334,    -1,   336,   337,
-      -1,   339,   340,   341,   342,   343,    -1,   345,    -1,   347,
-     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
-      -1,    -1,   360,   361,    -1,   363,   364,   365,   366,   367,
-     368,   369,    -1,    -1,    -1,    -1,    -1,   375,   376,    -1,
-     378,    -1,    -1,   381,   382,   383,   384,   385,   386,   387,
-      -1,    -1,   390,   391,   392,   393,   394,    -1,    -1,   397,
-     398,   399,   400,   401,    -1,    -1,    -1,   405,   406,   407,
-     408,   409,   410,    -1,    -1,   413,    -1,    -1,   416,   417,
-     418,   419,   420,   421,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   431,   432,   433
+      -1,   416,   417,   418,   419,   420,   421,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   431,   432,   433
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -21013,413 +21009,414 @@
       15,    16,    17,    66,   147,   437,   438,   439,   441,   442,
      443,   444,   445,   446,   774,  1006,  1007,  1060,   174,  1046,
       26,  1057,  1058,  1046,  1046,   174,  1044,  1046,   310,   336,
-      26,   174,   936,  1046,   326,  1046,   697,   227,  1057,  1058,
-     174,  1044,   207,   111,   203,   244,   295,   810,   811,   812,
-    1044,  1050,  1060,    25,    58,    71,    72,    81,    85,   103,
-     124,   135,   143,   155,   160,   183,   208,   229,   260,   280,
-     317,   322,   324,   330,   333,   362,   365,   369,   376,   378,
-     383,   408,   596,   703,  1055,  1044,   373,  1052,  1046,   450,
-     697,   378,  1047,   697,   378,   174,  1046,   102,   362,   366,
-     368,  1057,  1058,   366,   368,    66,   147,   774,   308,  1046,
-    1057,   174,   479,  1060,  1046,  1046,   326,  1046,   697,   227,
-    1057,   299,   330,   362,   408,   229,    85,   183,   160,   322,
-     376,   382,   590,    26,  1046,   880,   493,  1055,  1062,   777,
-     174,  1052,  1046,   174,   781,   174,  1047,     3,    47,    49,
-      50,    61,    62,   106,   107,   125,   151,   174,   195,   196,
-     198,   238,   240,   252,   296,   338,   344,   371,   372,   403,
-     699,   951,   953,   955,   957,   959,   961,   962,   963,   965,
-     966,   967,   970,   971,  1061,  1064,   378,   102,   362,   174,
-    1052,   174,  1058,  1059,    77,   408,    66,   147,   174,   774,
-      52,   174,  1046,   174,  1059,   174,  1046,   174,  1046,   174,
-    1046,   326,   781,   174,  1046,   174,   699,   174,   227,  1059,
-     207,   174,   696,   697,   450,   854,   538,   845,   402,   839,
-     846,   847,   848,  1062,   840,  1056,   711,   712,    26,   712,
-    1056,   712,    26,   712,  1056,   712,   712,   712,  1056,  1054,
-    1054,   879,   712,   289,   450,   450,   557,   557,   557,   258,
-     373,   454,   557,   324,   936,   937,   454,   805,  1055,   450,
-     851,    52,   408,   406,   788,   789,  1044,  1046,  1060,    42,
-     433,   203,   452,   261,   261,   258,   158,  1055,   373,   153,
-     706,   258,     4,     6,     7,     8,    10,    34,    47,    49,
-      50,    57,    58,    61,    62,    69,    71,    93,    94,    95,
-      96,    97,    98,    99,   106,   107,   141,   145,   146,   151,
-     165,   167,   195,   196,   198,   213,   221,   222,   238,   240,
-     244,   249,   250,   252,   260,   270,   281,   296,   320,   335,
-     344,   358,   371,   372,   377,   379,   380,   389,   395,   403,
-     423,   424,   425,   426,   427,   428,   429,   430,   434,   441,
-     442,   443,   450,   883,   954,   957,   960,   961,   962,   964,
-     965,   966,   970,   971,   975,   977,   978,   979,   981,  1002,
-    1003,  1004,  1008,  1027,  1032,  1041,  1042,  1052,  1053,  1054,
-    1055,  1060,  1040,  1041,  1055,    26,   501,  1043,  1044,   334,
-     483,   109,   492,  1055,   493,  1055,    42,    63,   483,   433,
-     345,   811,   261,   158,   373,   439,    42,   433,   203,   812,
-     450,  1044,   443,   448,   452,  1033,  1034,   937,   157,   159,
-     406,   836,   837,   839,   157,   842,   109,   975,  1037,  1038,
-     888,   454,   450,   843,   451,   451,   459,  1044,    26,   121,
-     894,   894,    52,   894,   148,   153,   217,   256,   901,   903,
-     904,   919,   921,   922,   923,   897,   898,   158,   199,   936,
-     938,  1039,   450,   757,  1034,   272,   306,   336,   452,   698,
-     272,   306,   336,     3,    80,   130,   223,   272,   306,   336,
-     365,   367,   415,   494,   497,   817,   818,   819,   820,   729,
-      22,   126,   272,   306,   336,   399,   508,  1046,   336,    22,
-     126,   394,   476,   419,   174,   936,    54,    87,   144,   177,
-     212,   244,   272,   306,   314,   321,   328,   336,   348,   356,
-     410,   494,   498,   760,   768,   450,   746,   306,   476,   180,
-     141,    22,    28,    68,   119,   126,   129,   154,   185,   242,
-     244,   254,   262,   272,   306,   309,   310,   336,   399,   506,
-     507,   615,     4,   442,   587,  1056,    26,   174,  1044,   697,
-     697,   450,   773,   452,   141,   258,   180,   468,   306,   415,
-     436,   461,   468,   258,   272,   306,   141,    53,   101,   182,
-     230,   232,   242,   271,   306,   311,   336,   350,   506,   584,
-     585,   272,   306,   407,   615,   623,   496,   484,   486,   180,
-     141,   306,   336,   506,   272,   306,   310,   336,    78,   118,
-     273,   367,   258,    22,    28,   126,   272,   306,   336,   518,
-     519,   153,   306,   336,   461,   497,   141,   306,   336,   506,
-    1046,   215,   111,   259,   420,   454,   810,   396,   834,   258,
-    1052,   450,  1046,   951,   378,   102,   362,  1052,   253,   408,
-      66,   147,   774,  1046,  1046,   326,   153,  1046,   951,   207,
-     697,   557,   292,   523,   450,   672,   757,    64,   951,   158,
-     450,   668,  1046,   461,    35,   828,  1046,   244,   461,   419,
-     174,  1044,   461,   697,   697,   668,   392,   538,   258,   461,
-     244,    42,   480,   383,   622,   272,   598,    78,   118,   273,
-     367,    24,    44,   194,   646,    35,   668,   153,   461,   408,
-     174,  1044,   174,   575,  1044,  1044,   408,   697,    77,   735,
-    1052,  1046,   153,   596,    48,   100,   192,   242,   325,   141,
-     757,    55,   312,   509,   141,   450,   141,   405,   968,   968,
-     968,   450,   956,   956,   283,   450,   958,   141,    61,    62,
-     968,   956,   953,   417,   436,   450,   972,   450,   972,   454,
-     509,    34,   952,    62,   450,   969,   104,   172,   231,   234,
-     327,   431,   450,   973,   974,   698,   956,   419,   141,   746,
-     141,   454,   174,   696,   174,   697,   174,   697,   141,   773,
-    1059,   141,   258,   141,   141,   258,   141,   509,   141,    78,
-     118,   273,   367,   153,   141,   258,   141,   509,   141,   153,
-     174,   174,   493,   141,   454,   509,   975,  1011,   362,   451,
-     454,   146,   258,   380,   490,   493,   587,   849,   845,   712,
-     879,   712,   879,   712,   879,   712,   879,   712,   879,   879,
-     879,   712,   879,   450,   558,   559,  1060,   558,    26,   103,
-     124,   155,   160,   207,   208,   324,   330,   362,   365,   383,
-     718,  1043,  1059,   717,  1046,   180,   454,   867,  1055,   951,
-    1014,    35,  1059,   735,   451,   454,   215,  1060,   153,   153,
-     718,  1059,   323,  1060,   493,   258,   450,  1035,   448,   883,
-    1015,   975,  1031,   450,   450,   153,   450,   450,   883,   450,
-     450,   450,   450,   450,   450,   975,   450,   450,   450,   450,
-     450,   450,   450,   450,   883,   450,   450,   450,   450,   450,
-     450,   450,   450,   975,   975,   975,   883,   975,  1011,  1034,
-    1055,   450,  1055,     3,     8,    11,    15,    16,    17,    32,
-      35,    40,    46,    70,   175,   180,   201,   202,   216,   247,
-     260,   263,   341,   434,   437,   438,   439,   441,   442,   443,
-     444,   445,   446,  1006,  1008,  1010,   416,   990,   269,   975,
-     199,   454,   891,   450,  1055,  1034,   891,   112,   176,   502,
-     454,    63,   109,   493,    35,     3,   109,   220,   491,   587,
-     971,  1055,  1055,    83,   123,   987,    92,   109,   487,   488,
-     490,   587,   109,   487,   215,  1044,   975,     3,    26,    30,
-      31,    32,    33,    34,    35,    36,    39,    51,    57,    58,
-      64,    70,    72,    81,    88,    93,    94,    95,    97,    98,
-      99,   109,   111,   117,   121,   122,   128,   132,   136,   146,
-     148,   153,   155,   158,   163,   166,   169,   180,   187,   197,
-     199,   210,   211,   217,   221,   222,   244,   249,   256,   258,
-     259,   263,   264,   278,   287,   301,   313,   329,   335,   346,
-     359,   362,   370,   373,   374,   380,   388,   389,   395,   396,
-     404,   411,   412,   414,   415,   443,  1049,  1063,  1064,  1065,
-    1066,  1067,  1033,    84,   311,   701,   451,   454,   840,   451,
-     454,   889,  1045,  1046,    35,   843,   885,   885,   899,   900,
-     975,   885,   150,   241,   910,   205,   242,   295,   339,   394,
-      26,   905,   975,   906,   908,   975,   977,   919,   920,   904,
-     903,   901,   902,   153,   922,   254,   924,   901,   919,   938,
-     857,  1044,    35,  1060,   336,   180,   190,   264,   266,   338,
-     404,   443,   750,   751,   752,   754,   756,   758,   951,  1061,
-     272,   306,   336,   373,   373,   324,  1049,   452,   373,   373,
-     324,   217,   373,   373,   365,   483,   272,   817,   819,   439,
-     821,   153,   163,   180,   315,   730,   731,    64,    81,   137,
-     155,   287,   389,   554,   555,    81,   109,   244,   373,    81,
-     373,   109,   244,   324,    81,   119,   129,   272,   306,   664,
-     324,   604,    25,    58,    71,    85,   124,   135,   155,   160,
-     229,   260,   324,   330,   333,   362,   369,   376,   383,   408,
-     596,  1046,   141,   306,   336,   506,   258,   587,   328,   212,
-     373,   373,   249,   587,   113,   200,   324,   334,   375,   485,
-     312,   336,   760,   769,   451,   747,   750,   373,   395,   365,
-    1044,    72,   137,   545,   554,  1060,    72,    81,   792,   258,
-     320,   322,   378,    81,   792,    29,   309,   320,   322,   378,
-     320,  1044,   154,   185,   254,   697,   450,   373,   373,   173,
-     450,   513,   226,   365,   392,   415,   417,   513,    81,   454,
-       4,   272,   180,   141,   306,   336,   506,   396,   396,   243,
-     951,   272,   336,   774,  1046,  1044,   103,   497,   373,   463,
-     497,  1044,   373,   373,  1044,   587,    52,   586,   587,   587,
-     101,   230,   232,    52,   373,   461,   324,   461,   242,   585,
-     373,   373,   249,  1055,   615,   365,   936,    81,   373,   792,
-     324,   373,   373,   513,   513,   697,   697,   697,   697,  1044,
-      41,   401,    41,    41,   373,    41,   373,   324,   454,   395,
-     633,  1058,   373,   463,  1044,   373,   324,   272,   306,   295,
-     307,   332,   489,   810,  1050,  1060,  1044,   757,   951,   258,
-     201,   419,   746,   587,   697,   697,   773,   258,   201,   258,
-      78,   118,   273,   367,   951,   258,   201,   697,   201,   415,
-     529,   353,   354,   524,  1055,     3,   673,   674,   668,   450,
-      35,   697,   669,   670,  1063,    24,   817,   951,   258,   141,
-     601,  1046,   244,   450,   462,   682,   396,   299,   408,  1044,
-     462,   141,  1058,    88,   163,   481,   537,   581,   645,   713,
-     733,   813,  1055,   623,   624,  1058,   223,   697,   697,   697,
-     697,   254,   114,   193,   381,   394,   647,   648,   133,   294,
-     450,   633,   462,  1044,   244,   583,   584,   244,    35,   254,
-     450,   557,   557,   174,   578,  1044,   153,   174,   736,  1050,
-     450,   748,    35,   951,   207,   415,   417,   881,   325,  1052,
-     509,   951,  1047,   450,  1011,  1054,   699,   968,   968,    34,
-     952,   371,   371,  1054,  1054,   951,   448,   448,   336,  1054,
-     373,   373,   373,   450,   373,  1054,   956,   174,  1046,  1052,
-     509,  1059,  1058,   141,   509,   141,   396,   141,   396,   774,
-     509,   509,  1046,   697,  1059,  1046,   697,  1046,  1046,   951,
-    1046,   697,   699,  1059,   633,   141,   141,   509,   696,   697,
-     451,   454,   174,  1044,   845,   847,   879,   879,   879,   879,
-     879,   879,   558,   451,   454,   451,   161,   331,   363,  1045,
-     696,   102,   333,   722,   723,  1045,   253,  1045,  1043,  1043,
-    1045,   696,   373,   415,   726,   136,   217,   630,   631,    20,
-     139,   320,   339,   868,   936,   248,   869,   451,   454,   852,
-     856,   864,   871,   882,   373,  1044,   786,   787,   789,   716,
-     715,   716,   158,   164,   727,  1060,    25,    72,   103,   124,
-     135,   155,   160,   208,   229,   317,   324,   330,   362,   365,
-     383,   408,   596,   707,  1011,  1033,   449,  1011,  1015,  1016,
-     411,  1028,  1029,   975,  1011,   450,  1054,  1054,     3,   104,
-     172,   231,   234,   327,   431,  1017,  1018,  1055,  1011,  1011,
-    1011,  1054,  1054,   975,   774,   975,  1019,   320,   441,   442,
-     450,   976,   977,  1008,  1021,   451,  1011,   975,  1011,  1022,
-     975,    51,   158,   211,   374,   975,  1011,  1025,  1011,   236,
-     977,   975,   985,   986,   987,   236,   975,   987,   451,   454,
-    1054,   973,   951,   975,   975,   975,   975,  1063,   371,    39,
-     359,  1036,   697,   975,   450,   883,  1026,   121,   123,   146,
-     244,   249,   254,   380,   390,   975,   450,   975,   373,    46,
-     175,   180,   216,   341,   975,   975,   975,   975,   975,   975,
-     975,   975,   975,   975,    26,    33,   346,  1005,   166,   149,
-     991,   320,   450,  1002,   162,   220,   362,   366,   368,   392,
-     892,  1044,  1042,   158,   926,    26,   121,   404,   443,   451,
-     752,   975,  1012,  1013,  1061,   926,  1044,   375,   450,  1055,
-     454,   451,   449,   455,   173,   173,   509,  1044,   837,   838,
-    1044,  1037,   451,   454,   450,   454,    36,   117,   396,   742,
-     450,   907,  1056,   339,   205,   259,   454,   320,   321,   909,
-    1043,   248,   343,   870,   920,   902,   396,   865,   109,   450,
-     858,   882,    35,  1060,   450,   872,   873,   874,   875,   876,
-    1060,   266,    52,  1061,   451,   752,   754,   751,   754,  1061,
-     264,   451,   454,   698,   373,   373,   324,  1058,  1046,  1046,
-    1049,  1058,  1046,  1046,  1058,  1047,  1046,   109,   490,  1056,
-     317,   395,   715,   324,   163,   715,   450,  1046,   396,   737,
-     205,   205,   396,   450,   573,   174,  1046,   249,  1058,  1046,
-    1046,   975,   249,  1046,  1046,    29,   309,   373,   373,  1046,
-     373,   605,  1052,   450,   697,   697,   951,   378,   102,   362,
-     723,   408,    66,   147,   774,  1046,   697,  1046,   697,   326,
-     153,   951,   697,   207,   168,   242,   272,   306,   400,   608,
-     609,   610,   936,   373,   792,   324,   249,   113,   200,  1058,
-    1046,   258,  1046,   451,   454,  1057,  1059,  1046,   306,   506,
-     545,   951,  1046,  1060,  1046,   215,  1046,    26,   395,  1046,
-     174,  1046,   174,  1060,   322,   378,   322,   378,   215,  1046,
-      26,   395,  1046,   215,   320,  1044,    22,   126,   336,   616,
-     617,   618,   619,  1063,  1058,  1046,   109,   159,   245,   396,
-     512,   515,   516,  1063,  1046,   257,    68,   257,  1046,   507,
-     373,   365,  1044,   373,   792,   324,  1048,  1060,  1048,   454,
-     451,   454,   373,   324,   258,   306,   373,   642,  1047,  1057,
-       3,    80,   131,   185,   277,   387,   395,   398,   464,   306,
-    1058,  1046,   306,   336,   506,   584,   587,   697,  1046,   587,
-    1046,   587,  1058,  1046,  1046,   306,   336,   506,  1046,  1046,
-    1046,  1046,  1058,  1046,    22,    28,   126,   272,   306,   336,
-     272,   306,   336,   668,   306,   336,   306,   336,   306,   950,
-    1060,   174,   678,  1060,   174,  1060,  1058,  1046,  1046,  1046,
-      22,   519,   333,  1057,   306,   336,   506,  1046,  1046,   373,
-     373,    76,   386,   295,   201,    35,   124,   697,   249,   704,
-    1055,   201,   201,   396,   396,   201,   697,   704,   697,   207,
-     697,   704,   201,   704,   257,   158,   373,   522,   461,   439,
-     451,   454,   975,   951,   451,   454,   439,   647,   547,  1063,
-    1046,   158,   324,   407,   602,   609,   610,   141,   216,   539,
-     541,   543,   545,   551,   554,    23,   180,   317,   360,   464,
-     465,   153,  1048,   408,  1044,   153,   643,   479,  1060,   480,
-     263,   538,   155,  1055,   668,   668,   668,   668,   254,   258,
-     263,   450,   668,   948,   949,   950,   333,   450,   141,   141,
-     140,   882,   697,   539,  1060,   415,   417,   569,   415,   514,
-     244,    35,   557,  1055,   244,   258,   451,   749,   750,   755,
-      35,   207,   314,   376,   414,   759,   760,   761,   258,   207,
-     493,   171,   171,   153,   757,    35,  1011,   451,   451,   509,
-     448,   433,   433,   451,   451,  1054,   449,  1054,  1060,   451,
-     172,   231,   974,   231,   974,   974,  1054,   234,   451,   141,
-     509,   746,   696,   697,  1048,   697,  1048,   773,   258,   509,
-     258,   509,   509,   207,   258,   509,   509,   333,   153,   493,
-     509,   975,   244,   451,   559,   180,   180,   180,   419,  1045,
-     454,   587,   588,   166,   719,   720,  1058,    23,   727,   373,
-     450,   158,   139,   339,   139,   339,   320,   394,   233,   951,
-    1058,   415,   576,  1044,  1046,   158,   258,   719,    52,   509,
-    1052,   951,   378,   362,  1052,   253,   408,   951,   207,   697,
-     451,   449,   449,   454,   975,   128,  1029,  1030,    35,   451,
-     975,   451,   451,   451,   158,   451,   451,   451,   451,   451,
-     454,   451,   278,  1020,   451,   450,   976,   976,  1011,    11,
-      15,    16,    17,   180,   201,   260,   437,   438,   439,   441,
-     442,   443,   444,   445,   446,  1008,   976,   451,   451,   153,
-     158,  1023,  1024,   451,    35,  1025,  1011,  1025,  1025,   158,
-     451,   451,  1063,   276,   989,    35,   451,   454,   975,  1063,
-     454,   975,  1035,   975,   451,   433,   976,   976,   134,  1011,
-     158,   121,   123,   146,   249,   254,   380,   390,   450,   134,
-     774,   975,   359,  1036,   975,  1026,   975,   373,   450,   883,
-     450,   450,   268,   995,   450,  1011,   366,   368,   366,   368,
-    1044,   893,   893,   893,   210,   321,   450,   883,   927,   928,
-     929,   936,   941,   978,   980,   981,  1052,  1060,   412,   946,
-    1012,  1012,  1013,   451,    13,    14,   454,   897,   898,   946,
-     811,  1054,   973,   488,   975,   843,  1046,   852,   900,   260,
-    1006,  1009,   435,   743,   975,   909,   394,   906,   225,   927,
-     412,   947,   402,   859,   860,  1060,   258,   861,  1060,   876,
-     877,   454,   926,   439,  1035,   758,   698,   754,   754,    52,
-     756,   445,  1058,  1046,  1046,  1059,  1059,   258,  1045,   261,
-     258,   975,   555,  1048,   450,   450,   450,   573,   183,   558,
-     656,   141,   509,   373,  1058,  1046,   493,   757,   951,  1046,
-     419,   697,   697,   697,   697,   773,    78,   118,   273,   367,
-     951,  1046,   591,  1046,   168,   400,   373,   373,   591,   608,
-     615,   306,   336,   506,  1046,  1046,  1046,   191,   249,   750,
-     271,   336,   373,   262,   613,   656,   126,   310,   336,   508,
-     615,   793,   328,   141,   509,   141,   509,  1046,  1046,  1046,
-    1046,   328,   328,   215,   618,   619,   618,   451,   454,   620,
-    1055,   183,   451,   454,   439,   452,  1058,  1046,   306,   336,
-     506,  1046,  1046,  1046,   272,   306,   336,    22,   126,   272,
-     306,   336,   951,   243,   951,  1058,  1046,  1044,   373,  1059,
-     396,   639,   217,   277,   249,  1055,   277,  1059,   393,   373,
-     373,   324,   271,   336,    81,   373,   792,   324,   373,   373,
-     227,   227,   227,   373,   373,   324,   373,   373,   324,   373,
-     324,   373,   324,   373,   509,   951,   244,  1055,   336,   793,
-     141,   509,   373,  1046,   373,   324,  1058,  1046,   704,   951,
-     697,   201,   704,   704,  1048,  1048,   704,   201,   201,  1046,
-     201,   704,   523,   450,   525,   526,   260,   441,   442,   587,
-     671,   754,  1009,  1055,  1067,     3,   674,   451,   451,   670,
-     671,   258,    64,    70,    81,   109,   111,   187,   244,   249,
-     287,   301,   389,   548,   549,   550,   140,   411,   461,   493,
-    1046,   493,   613,  1044,  1044,   451,   454,  1059,   166,   317,
-    1059,  1054,   383,  1044,   557,    26,   114,   193,   329,   394,
-     644,   373,   641,    42,   480,   308,   362,   102,   514,   558,
-    1044,   648,   675,   676,  1055,   451,   454,  1046,   558,  1044,
-     575,  1044,  1046,   576,   450,   540,   451,   257,   513,   257,
-     258,   570,   513,    35,   141,   882,   514,   373,   141,  1044,
-     451,   454,   109,   439,   762,  1055,   493,   362,   753,   754,
-     153,   763,   415,   761,   764,   114,   193,   329,   394,   801,
-    1046,   168,   882,   509,   951,   451,  1054,   972,   972,   449,
-     449,   969,   451,  1046,   509,   509,   396,   509,   396,   509,
-     509,   697,   697,  1046,   697,  1046,   633,   509,   141,   324,
-     324,   324,  1045,   723,   454,  1058,   415,   454,   721,   261,
-     937,   333,   139,   139,   102,   242,  1059,   718,   509,  1058,
-     757,   201,   746,   587,   201,   697,   201,  1015,   370,   975,
-     132,   951,   451,   975,   975,   975,  1023,   451,  1011,   454,
-     951,   976,   976,   976,   976,   121,   123,   244,   254,   976,
-     976,   976,   976,   976,   976,   976,   976,   976,   976,   975,
-     975,  1024,  1023,   951,   451,   451,   451,  1011,   451,   454,
-      52,   977,   451,  1063,   986,   284,   357,   988,   451,   454,
-     407,   982,    35,   451,  1055,   975,    32,    32,   975,   451,
-     975,   158,   450,  1014,   975,   451,   134,   976,   976,   134,
-     134,   975,   975,   898,   412,   450,   996,  1060,   451,  1011,
-     454,   893,   893,   893,   893,  1044,  1044,  1044,   883,   941,
-     158,   883,   928,   929,    35,   930,   931,  1060,   454,    89,
-     159,   189,   204,   214,   239,   316,   933,   931,    35,   930,
-     932,  1060,   436,   945,   450,  1034,   975,   166,   911,   454,
-     897,   897,   897,   975,   975,   404,  1013,   451,   911,   451,
-     449,   451,   450,   743,   150,   209,   451,   259,    92,   975,
-     313,   863,   451,   454,  1035,    79,   863,   451,   454,   873,
-     947,  1037,   451,   445,   758,   383,   161,   331,   363,   384,
-     732,   153,   732,   451,   450,   561,   562,   739,   980,  1060,
-     558,   558,   656,  1050,   451,   111,   187,   242,   244,   657,
-    1046,  1046,    35,  1046,   396,   396,   697,   697,   697,   697,
-     207,   698,  1058,  1046,   373,   792,   324,   373,   191,    52,
-     365,  1046,   450,   547,   244,   513,   102,   244,   352,   355,
-     513,   383,  1046,  1060,   328,   617,  1046,   516,   671,  1063,
-     271,   336,   373,   792,   324,   373,   373,   373,   324,   160,
-     260,   355,   680,   681,   160,   260,   688,   689,   373,   373,
-     324,   451,   451,   451,   306,  1046,   450,   415,   640,  1056,
-    1055,  1055,  1055,  1046,  1046,  1046,    52,   365,  1046,  1046,
-    1046,  1046,  1046,  1046,   153,   153,   308,   153,   174,  1058,
-    1046,  1046,  1058,  1046,  1046,  1046,  1046,  1046,  1046,  1046,
-      70,   510,   141,    24,    44,   383,  1060,  1046,   615,  1046,
-    1046,   451,   201,   704,   201,   201,   704,   704,   201,   704,
-     524,   532,   533,  1063,    48,    90,   115,   130,   134,   154,
-     157,   170,   249,   257,   293,   527,   656,   415,   417,  1044,
-     450,   697,  1046,   976,   112,   176,   111,   249,   205,  1044,
-     764,   291,   660,   661,  1060,   601,   450,   552,   186,   568,
-     543,  1059,  1059,   951,   450,   514,  1059,   639,  1058,   174,
-    1044,   419,   153,   649,   451,   454,   950,   613,   451,   583,
-      35,   254,   450,   854,   542,   544,   546,   554,  1060,   569,
-     568,    75,   365,   571,   882,   578,   576,   571,  1055,  1050,
-     737,   755,   975,   975,   454,   450,   759,   383,   454,   668,
-     373,   450,   591,   451,   449,   509,  1048,  1048,   509,   509,
-     509,   509,   333,  1045,  1045,  1045,   587,   163,   720,   451,
-    1046,   102,   727,   158,   201,   249,   708,  1055,   201,   201,
-     708,   201,   708,   975,   451,   451,  1024,   451,   975,   158,
-     121,   123,   254,   450,   451,   422,   984,  1011,   300,    52,
-     413,   413,   451,   975,   242,   975,   454,   983,   953,   975,
-     975,   975,  1014,   451,   975,    32,    32,   975,   975,   134,
-     451,   451,   975,   997,  1060,   451,   975,  1044,  1044,  1044,
-    1044,   931,   932,   450,   451,  1060,   450,   928,   204,   267,
-     934,   928,   934,   204,   933,   934,   204,   364,   939,   450,
-    1060,   450,   265,  1012,    52,   169,   918,   451,   451,   451,
-    1013,  1055,   918,  1055,   774,   254,  1041,   882,   860,   258,
-     450,   862,   439,   876,   863,   383,   451,   373,   715,   158,
-     656,   975,   451,   454,   415,    70,   740,   740,   451,   451,
-     764,   112,   176,   185,   111,   398,   509,   951,  1048,  1048,
-    1046,  1046,  1046,  1046,  1046,  1059,  1046,   614,   618,   249,
-     249,  1056,  1060,   951,   509,   509,   439,    52,   365,  1046,
-    1046,  1046,  1046,  1058,  1046,  1046,  1054,  1054,   951,   454,
-    1054,  1054,   454,  1058,  1046,  1046,   373,   975,    64,  1059,
-    1046,   373,   373,  1045,  1045,   697,  1045,   141,   697,  1055,
-    1055,   951,   509,   509,   201,   704,   704,   704,   704,   396,
-     530,   531,   451,   454,   443,   450,   490,   534,   587,   828,
-    1055,   828,   244,   249,   293,   828,   828,   160,   190,   160,
-     158,   655,   975,   244,   549,   764,   557,   396,   572,  1052,
-      32,   140,   180,   539,   138,   181,   450,   333,   396,   558,
-      35,   640,   480,   244,   450,  1046,   127,   650,   411,   652,
-    1055,   514,   882,   697,   539,   576,   451,   454,   415,   570,
-     569,   114,   126,   284,  1046,   415,   814,    35,   158,   258,
-     450,  1055,   752,   765,   766,  1061,   764,   951,   153,  1044,
-     158,   373,   783,   188,   592,   509,   509,   509,  1046,   261,
-     199,   509,   719,   708,   708,   708,   708,   451,   976,   158,
-     450,  1014,   450,   451,   454,   451,   977,   300,   451,   401,
-     349,   451,   451,   451,   975,   975,   975,   451,   275,   998,
-     451,   942,   943,   980,   930,   450,  1045,   928,   258,   396,
-     935,   928,   204,   928,  1052,   949,   450,   949,  1060,   897,
-      91,   167,   319,   450,   912,   913,   914,   915,   916,   917,
-     975,   975,   414,   992,   897,   992,   451,   879,    81,   738,
-     739,   122,   450,   883,  1039,   719,   258,   719,   451,   764,
-     562,   260,   774,   697,   396,   697,   741,   741,   301,   764,
-     572,   451,   373,   336,   869,   451,   454,   510,   671,  1059,
-    1046,   373,   450,  1052,   774,   681,   450,   450,   689,  1046,
-     451,   450,   336,   869,  1046,  1046,   415,   436,   831,   308,
-     831,   831,   153,   510,   704,   461,   116,   533,   490,   535,
-     536,  1055,  1055,   249,   558,   443,   558,  1055,  1055,   723,
-      35,   779,   779,  1044,   656,   451,   572,   228,   560,   183,
-     450,   661,   291,   450,   451,    26,    74,    82,   110,   184,
-     355,   553,   553,  1043,  1046,  1048,   451,   882,   141,   613,
-     320,   351,   651,   450,   140,    35,   576,   540,   451,   544,
-     262,   571,   570,   321,   321,    56,    64,   220,   882,   697,
-    1044,   738,   754,   451,   454,   383,   946,   347,   347,   451,
-     591,   242,   400,   593,   594,  1046,   509,   976,  1014,   451,
-     985,  1011,    52,   242,   432,    52,   897,   451,   454,    35,
-     944,  1045,   451,   975,   450,   928,   935,   450,   451,   949,
-     451,   451,   450,   337,   450,   451,   454,   993,   994,  1060,
-     451,  1046,   451,   454,   245,   394,   721,   732,   509,   740,
-     572,   450,   697,   742,   742,  1044,   572,   656,  1046,   365,
-     618,   396,   511,   336,   869,  1046,  1014,   746,   153,   684,
-     773,  1014,  1014,   975,   365,   696,   697,   696,   697,  1045,
-     509,   525,  1055,   451,   454,   558,   779,    38,   178,   153,
-     242,   556,   159,   274,   342,   258,   564,   565,   566,   365,
-     451,  1052,     5,   662,   568,   451,   613,   147,   683,   514,
-     814,  1044,   975,   291,   882,   569,   568,   547,   571,    64,
-     261,    64,   576,   737,   451,   759,   765,   951,   122,   415,
-     415,   400,   591,   613,   451,   451,   451,   300,   401,  1011,
-     294,   321,   999,   945,   942,   450,   451,  1045,  1011,   451,
-    1011,   450,  1011,   913,   454,    35,   946,   739,   336,   158,
-     741,   412,   563,   774,   743,   743,   557,   656,  1046,   975,
-     365,   451,   264,   326,   298,   685,   684,   451,   451,   451,
-    1046,   831,   536,   127,   185,   114,   394,   258,   566,   258,
-     565,  1046,   450,   451,   454,   333,   697,    35,    35,   450,
-     451,  1052,   814,   570,   569,   261,   261,   450,   514,   764,
-      27,   194,   802,   160,   160,    46,    92,   385,   975,  1000,
-    1001,  1000,   451,   949,   451,   451,   451,   912,   451,   994,
-     996,   872,   719,   742,   450,   656,   451,   560,   869,  1046,
-    1052,    52,   685,   869,   697,   320,    55,   242,   312,   336,
-     567,   567,   451,     5,  1046,   680,   882,   450,   571,   570,
-     738,   571,   245,   450,   797,   799,   804,   856,   864,   871,
-     882,   723,   723,  1001,   320,   152,   282,   152,   282,   451,
-     307,   940,   451,   946,   509,   743,   975,   564,   869,   746,
-     697,   652,    21,   109,   249,   613,   814,     4,   653,   654,
-    1054,  1055,  1063,   571,   451,   946,   798,   799,   800,   883,
-     884,   454,   454,    32,   450,   451,   656,   140,   451,   454,
-     514,   451,   453,   373,   158,  1001,   975,   291,   654,   571,
-     800,   347,   347,   451,  1052,   946,   415,   415,   450,   160,
-     160,   653,   723,   723,   451
+      26,   174,   936,  1046,   326,  1046,   697,    26,   227,  1057,
+    1058,   174,  1044,   207,   111,   203,   244,   295,   810,   811,
+     812,  1044,  1050,  1060,    25,    58,    71,    72,    81,    85,
+     103,   124,   135,   143,   155,   160,   183,   208,   229,   260,
+     280,   317,   322,   324,   330,   333,   362,   365,   369,   376,
+     378,   383,   408,   596,   703,  1055,  1044,   373,  1052,  1046,
+     450,   697,   378,  1047,   697,   378,   174,  1046,   102,   362,
+     366,   368,  1057,  1058,   366,   368,    66,   147,   774,   308,
+    1046,  1057,   174,   479,  1060,  1046,  1046,   326,  1046,   697,
+     227,  1057,   299,   330,   362,   408,   229,    85,   183,   160,
+     322,   376,   382,   590,    26,  1046,   880,   493,  1055,  1062,
+     777,   174,  1052,  1046,   174,   781,   174,  1047,     3,    47,
+      49,    50,    61,    62,   106,   107,   125,   151,   174,   195,
+     196,   198,   238,   240,   252,   296,   338,   344,   371,   372,
+     403,   699,   951,   953,   955,   957,   959,   961,   962,   963,
+     965,   966,   967,   970,   971,  1061,  1064,   378,   102,   362,
+     174,  1052,   174,  1058,  1059,    77,   408,    66,   147,   174,
+     774,    52,   174,  1046,   174,  1059,   174,  1046,   174,  1046,
+     174,  1046,   326,   781,   174,  1046,   174,   699,   174,   227,
+    1059,   207,   174,   696,   697,   450,   854,   538,   845,   402,
+     839,   846,   847,   848,  1062,   840,  1056,   711,   712,    26,
+     712,  1056,   712,    26,   712,  1056,   712,   712,   712,  1056,
+    1054,  1054,   879,   712,   289,   450,   450,   557,   557,   557,
+     258,   373,   454,   557,   324,   936,   937,   454,   805,  1055,
+     450,   851,    52,   408,   406,   788,   789,  1044,  1046,  1060,
+      42,   433,   203,   452,   261,   261,   258,   158,  1055,   373,
+     153,   706,   258,     4,     6,     7,     8,    10,    34,    47,
+      49,    50,    57,    58,    61,    62,    69,    71,    93,    94,
+      95,    96,    97,    98,    99,   106,   107,   141,   145,   146,
+     151,   165,   167,   195,   196,   198,   213,   221,   222,   238,
+     240,   244,   249,   250,   252,   260,   270,   281,   296,   320,
+     335,   344,   358,   371,   372,   377,   379,   380,   389,   395,
+     403,   423,   424,   425,   426,   427,   428,   429,   430,   434,
+     441,   442,   443,   450,   883,   954,   957,   960,   961,   962,
+     964,   965,   966,   970,   971,   975,   977,   978,   979,   981,
+    1002,  1003,  1004,  1008,  1027,  1032,  1041,  1042,  1052,  1053,
+    1054,  1055,  1060,  1040,  1041,  1055,    26,   501,  1043,  1044,
+     334,   483,   109,   492,  1055,   493,  1055,    42,    63,   483,
+     433,   345,   811,   261,   158,   373,   439,    42,   433,   203,
+     812,   450,  1044,   443,   448,   452,  1033,  1034,   937,   157,
+     159,   406,   836,   837,   839,   157,   842,   109,   975,  1037,
+    1038,   888,   454,   450,   843,   451,   451,   459,  1044,    26,
+     121,   894,   894,    52,   894,   148,   153,   217,   256,   901,
+     903,   904,   919,   921,   922,   923,   897,   898,   158,   199,
+     936,   938,  1039,   450,   757,  1034,   272,   306,   336,   452,
+     698,   272,   306,   336,     3,    80,   130,   223,   272,   306,
+     336,   365,   367,   415,   494,   497,   817,   818,   819,   820,
+     729,    22,   126,   272,   306,   336,   399,   508,  1046,   336,
+      22,   126,   394,   476,   419,   174,   936,    54,    87,   144,
+     177,   212,   244,   272,   306,   314,   321,   328,   336,   348,
+     356,   410,   494,   498,   760,   768,   450,   746,   306,   476,
+     180,   141,    22,    28,    68,   119,   126,   129,   154,   185,
+     242,   244,   254,   262,   272,   306,   309,   310,   336,   399,
+     506,   507,   615,     4,   441,   442,   587,  1056,    26,   174,
+    1044,   697,   697,   450,   773,   452,   141,   258,   180,   468,
+     306,   415,   436,   461,   468,   258,   272,   306,   141,    53,
+     101,   182,   230,   232,   242,   271,   306,   311,   336,   350,
+     506,   584,   585,   272,   306,   407,   615,   623,   496,   484,
+     486,   180,   141,   306,   336,   506,   272,   306,   310,   336,
+      78,   118,   273,   367,   258,    22,    28,   126,   272,   306,
+     336,   518,   519,   468,   153,   306,   461,   468,   141,   306,
+     336,   506,  1046,   215,   111,   259,   420,   454,   810,   396,
+     834,   258,  1052,   450,  1046,   951,   378,   102,   362,  1052,
+     253,   408,    66,   147,   774,  1046,  1046,   326,   153,  1046,
+     951,   207,   697,   557,   292,   523,   450,   672,   757,    64,
+     951,   158,   450,   668,  1046,   461,    35,   828,  1046,   244,
+     461,   419,   174,  1044,   461,   697,   697,   668,   392,   538,
+     258,   461,   244,    42,   480,   383,   622,   272,   598,    78,
+     118,   273,   367,    24,    44,   194,   646,    35,   668,   153,
+     461,   408,   174,  1044,   174,   575,  1044,  1044,   408,   697,
+      77,   735,  1052,  1046,   153,   596,    48,   100,   192,   242,
+     325,   141,   757,    55,   312,   509,   141,   450,   141,   405,
+     968,   968,   968,   450,   956,   956,   283,   450,   958,   141,
+      61,    62,   968,   956,   953,   417,   436,   450,   972,   450,
+     972,   454,   509,    34,   952,    62,   450,   969,   104,   172,
+     231,   234,   327,   431,   450,   973,   974,   698,   956,   419,
+     141,   746,   141,   454,   174,   696,   174,   697,   174,   697,
+     141,   773,  1059,   141,   258,   141,   141,   258,   141,   509,
+     141,    78,   118,   273,   367,   153,   141,   258,   141,   509,
+     141,   153,   174,   174,   493,   141,   454,   509,   975,  1011,
+     362,   451,   454,   146,   258,   380,   490,   493,   587,   849,
+     845,   712,   879,   712,   879,   712,   879,   712,   879,   712,
+     879,   879,   879,   712,   879,   450,   558,   559,  1060,   558,
+      26,   103,   124,   155,   160,   207,   208,   324,   330,   362,
+     365,   383,   718,  1043,  1059,   717,  1046,   180,   454,   867,
+    1055,   951,  1014,    35,  1059,   735,   451,   454,   215,  1060,
+     153,   153,   718,  1059,   323,  1060,   493,   258,   450,  1035,
+     448,   883,  1015,   975,  1031,   450,   450,   153,   450,   450,
+     883,   450,   450,   450,   450,   450,   450,   975,   450,   450,
+     450,   450,   450,   450,   450,   450,   883,   450,   450,   450,
+     450,   450,   450,   450,   450,   975,   975,   975,   883,   975,
+    1011,  1034,  1055,   450,  1055,     3,     8,    11,    15,    16,
+      17,    32,    35,    40,    46,    70,   175,   180,   201,   202,
+     216,   247,   260,   263,   341,   434,   437,   438,   439,   441,
+     442,   443,   444,   445,   446,  1006,  1008,  1010,   416,   990,
+     269,   975,   199,   454,   891,   450,  1055,  1034,   891,   112,
+     176,   502,   454,    63,   109,   493,    35,     3,   109,   220,
+     491,   587,   971,  1055,  1055,    83,   123,   987,    92,   109,
+     487,   488,   490,   587,   109,   487,   215,  1044,   975,     3,
+      26,    30,    31,    32,    33,    34,    35,    36,    39,    51,
+      57,    58,    64,    70,    72,    81,    88,    93,    94,    95,
+      97,    98,    99,   109,   111,   117,   121,   122,   128,   132,
+     136,   146,   148,   153,   155,   158,   163,   166,   169,   180,
+     187,   197,   199,   210,   211,   217,   221,   222,   244,   249,
+     256,   258,   259,   263,   264,   278,   287,   301,   313,   329,
+     335,   346,   359,   362,   370,   373,   374,   380,   388,   389,
+     395,   396,   404,   411,   412,   414,   415,   443,  1049,  1063,
+    1064,  1065,  1066,  1067,  1033,    84,   311,   701,   451,   454,
+     840,   451,   454,   889,  1045,  1046,    35,   843,   885,   885,
+     899,   900,   975,   885,   150,   241,   910,   205,   242,   295,
+     339,   394,    26,   905,   975,   906,   908,   975,   977,   919,
+     920,   904,   903,   901,   902,   153,   922,   254,   924,   901,
+     919,   938,   857,  1044,    35,  1060,   336,   180,   190,   264,
+     266,   338,   404,   443,   750,   751,   752,   754,   756,   758,
+     951,  1061,   272,   306,   336,   373,   373,   324,  1049,   452,
+     373,   373,   324,   217,   373,   373,   365,   483,   272,   817,
+     819,   439,   821,   153,   163,   180,   315,   730,   731,    64,
+      81,   137,   155,   287,   389,   554,   555,    81,   109,   244,
+     373,    81,   373,   109,   244,   324,    81,   119,   129,   272,
+     306,   664,   324,   604,    25,    58,    71,    85,   124,   135,
+     155,   160,   229,   260,   324,   330,   333,   362,   369,   376,
+     383,   408,   596,  1046,   141,   306,   336,   506,   258,   587,
+     328,   212,   373,   373,   249,   587,   113,   200,   324,   334,
+     375,   485,   312,   336,   760,   769,   451,   747,   750,   373,
+     395,   365,  1044,    72,   137,   545,   554,  1060,    72,    81,
+     792,   258,   320,   322,   378,    81,   792,    29,   309,   320,
+     322,   378,   320,  1044,   154,   185,   254,   697,   450,   373,
+     373,   173,   450,   513,   226,   365,   392,   415,   417,   513,
+      81,   454,     4,     4,   272,   180,   141,   306,   336,   506,
+     396,   396,   243,   951,   272,   336,   774,  1046,  1044,   103,
+     336,   497,   373,   463,   497,  1044,   373,   373,  1044,   587,
+      52,   586,   587,   587,   101,   230,   232,    52,   373,   461,
+     324,   461,   242,   585,   373,   373,   249,  1055,   615,   365,
+     936,    81,   373,   792,   324,   373,   373,   513,   513,   697,
+     697,   697,   697,  1044,    41,   401,    41,    41,   373,    41,
+     373,   324,   454,   497,   395,   633,  1058,   373,   463,   497,
+    1044,   373,   324,   272,   306,   295,   307,   332,   489,   810,
+    1050,  1060,  1044,   757,   951,   258,   201,   419,   746,   587,
+     697,   697,   773,   258,   201,   258,    78,   118,   273,   367,
+     951,   258,   201,   697,   201,   415,   529,   353,   354,   524,
+    1055,     3,   673,   674,   668,   450,    35,   697,   669,   670,
+    1063,    24,   817,   951,   258,   141,   601,  1046,   244,   450,
+     462,   682,   396,   299,   408,  1044,   462,   141,  1058,    88,
+     163,   481,   537,   581,   645,   713,   733,   813,  1055,   623,
+     624,  1058,   223,   697,   697,   697,   697,   254,   114,   193,
+     381,   394,   647,   648,   133,   294,   450,   633,   462,  1044,
+     244,   583,   584,   244,    35,   254,   450,   557,   557,   174,
+     578,  1044,   153,   174,   736,  1050,   450,   748,    35,   951,
+     207,   415,   417,   881,   325,  1052,   509,   951,  1047,   450,
+    1011,  1054,   699,   968,   968,    34,   952,   371,   371,  1054,
+    1054,   951,   448,   448,   336,  1054,   373,   373,   373,   450,
+     373,  1054,   956,   174,  1046,  1052,   509,  1059,  1058,   141,
+     509,   141,   396,   141,   396,   774,   509,   509,  1046,   697,
+    1059,  1046,   697,  1046,  1046,   951,  1046,   697,   699,  1059,
+     633,   141,   141,   509,   696,   697,   451,   454,   174,  1044,
+     845,   847,   879,   879,   879,   879,   879,   879,   558,   451,
+     454,   451,   161,   331,   363,  1045,   696,   102,   333,   722,
+     723,  1045,   253,  1045,  1043,  1043,  1045,   696,   373,   415,
+     726,   136,   217,   630,   631,    20,   139,   320,   339,   868,
+     936,   248,   869,   451,   454,   852,   856,   864,   871,   882,
+     373,  1044,   786,   787,   789,   716,   715,   716,   158,   164,
+     727,  1060,    25,    72,   103,   124,   135,   155,   160,   208,
+     229,   317,   324,   330,   362,   365,   383,   408,   596,   707,
+    1011,  1033,   449,  1011,  1015,  1016,   411,  1028,  1029,   975,
+    1011,   450,  1054,  1054,     3,   104,   172,   231,   234,   327,
+     431,  1017,  1018,  1055,  1011,  1011,  1011,  1054,  1054,   975,
+     774,   975,  1019,   320,   441,   442,   450,   976,   977,  1008,
+    1021,   451,  1011,   975,  1011,  1022,   975,    51,   158,   211,
+     374,   975,  1011,  1025,  1011,   236,   977,   975,   985,   986,
+     987,   236,   975,   987,   451,   454,  1054,   973,   951,   975,
+     975,   975,   975,  1063,   371,    39,   359,  1036,   697,   975,
+     450,   883,  1026,   121,   123,   146,   244,   249,   254,   380,
+     390,   975,   450,   975,   373,    46,   175,   180,   216,   341,
+     975,   975,   975,   975,   975,   975,   975,   975,   975,   975,
+      26,    33,   346,  1005,   166,   149,   991,   320,   450,  1002,
+     162,   220,   362,   366,   368,   392,   892,  1044,  1042,   158,
+     926,    26,   121,   404,   443,   451,   752,   975,  1012,  1013,
+    1061,   926,  1044,   375,   450,  1055,   454,   451,   449,   455,
+     173,   173,   509,  1044,   837,   838,  1044,  1037,   451,   454,
+     450,   454,    36,   117,   396,   742,   450,   907,  1056,   339,
+     205,   259,   454,   320,   321,   909,  1043,   248,   343,   870,
+     920,   902,   396,   865,   109,   450,   858,   882,    35,  1060,
+     450,   872,   873,   874,   875,   876,  1060,   266,    52,  1061,
+     451,   752,   754,   751,   754,  1061,   264,   451,   454,   698,
+     373,   373,   324,  1058,  1046,  1046,  1049,  1058,  1046,  1046,
+    1058,  1047,  1046,   109,   490,  1056,   317,   395,   715,   324,
+     163,   715,   450,  1046,   396,   737,   205,   205,   396,   450,
+     573,   174,  1046,   249,  1058,  1046,  1046,   975,   249,  1046,
+    1046,    29,   309,   373,   373,  1046,   373,   605,  1052,   450,
+     697,   697,   951,   378,   102,   362,   723,   408,    66,   147,
+     774,  1046,   697,  1046,   697,   326,   153,   951,   697,   207,
+     168,   242,   272,   306,   400,   608,   609,   610,   936,   373,
+     792,   324,   249,   113,   200,  1058,  1046,   258,  1046,   451,
+     454,  1057,  1059,  1046,   306,   506,   545,   951,  1046,  1060,
+    1046,   215,  1046,    26,   395,  1046,   174,  1046,   174,  1060,
+     322,   378,   322,   378,   215,  1046,    26,   395,  1046,   215,
+     320,  1044,    22,   126,   336,   616,   617,   618,   619,  1063,
+    1058,  1046,   109,   159,   245,   396,   512,   515,   516,  1063,
+    1046,   257,    68,   257,  1046,   507,   373,   365,  1044,   373,
+     792,   324,  1048,  1060,  1048,   454,   451,   454,   373,   324,
+     258,   306,   373,   642,  1047,  1057,     3,    80,   131,   185,
+     277,   387,   395,   398,   464,   306,  1058,  1046,   306,   336,
+     506,   584,   587,   697,  1046,   587,  1046,   587,  1058,  1046,
+    1046,   306,   336,   506,  1046,  1046,  1046,  1046,  1058,  1046,
+      22,    28,   126,   272,   306,   336,   272,   306,   336,   668,
+     306,   336,   306,   336,   306,   950,  1060,   174,   678,  1060,
+     174,  1060,  1058,  1046,  1046,  1046,    22,   519,   333,  1057,
+     306,   336,   506,  1046,  1046,   373,   373,    76,   386,   295,
+     201,    35,   124,   697,   249,   704,  1055,   201,   201,   396,
+     396,   201,   697,   704,   697,   207,   697,   704,   201,   704,
+     257,   158,   373,   522,   461,   439,   451,   454,   975,   951,
+     451,   454,   439,   647,   547,  1063,  1046,   158,   324,   407,
+     602,   609,   610,   141,   216,   539,   541,   543,   545,   551,
+     554,    23,   180,   317,   360,   464,   465,   153,  1048,   408,
+    1044,   153,   643,   479,  1060,   480,   263,   538,   155,  1055,
+     668,   668,   668,   668,   254,   258,   263,   450,   668,   948,
+     949,   950,   333,   450,   141,   141,   140,   882,   697,   539,
+    1060,   415,   417,   569,   415,   514,   244,    35,   557,  1055,
+     244,   258,   451,   749,   750,   755,    35,   207,   314,   376,
+     414,   759,   760,   761,   258,   207,   493,   171,   171,   153,
+     757,    35,  1011,   451,   451,   509,   448,   433,   433,   451,
+     451,  1054,   449,  1054,  1060,   451,   172,   231,   974,   231,
+     974,   974,  1054,   234,   451,   141,   509,   746,   696,   697,
+    1048,   697,  1048,   773,   258,   509,   258,   509,   509,   207,
+     258,   509,   509,   333,   153,   493,   509,   975,   244,   451,
+     559,   180,   180,   180,   419,  1045,   454,   587,   588,   166,
+     719,   720,  1058,    23,   727,   373,   450,   158,   139,   339,
+     139,   339,   320,   394,   233,   951,  1058,   415,   576,  1044,
+    1046,   158,   258,   719,    52,   509,  1052,   951,   378,   362,
+    1052,   253,   408,   951,   207,   697,   451,   449,   449,   454,
+     975,   128,  1029,  1030,    35,   451,   975,   451,   451,   451,
+     158,   451,   451,   451,   451,   451,   454,   451,   278,  1020,
+     451,   450,   976,   976,  1011,    11,    15,    16,    17,   180,
+     201,   260,   437,   438,   439,   441,   442,   443,   444,   445,
+     446,  1008,   976,   451,   451,   153,   158,  1023,  1024,   451,
+      35,  1025,  1011,  1025,  1025,   158,   451,   451,  1063,   276,
+     989,    35,   451,   454,   975,  1063,   454,   975,  1035,   975,
+     451,   433,   976,   976,   134,  1011,   158,   121,   123,   146,
+     249,   254,   380,   390,   450,   134,   774,   975,   359,  1036,
+     975,  1026,   975,   373,   450,   883,   450,   450,   268,   995,
+     450,  1011,   366,   368,   366,   368,  1044,   893,   893,   893,
+     210,   321,   450,   883,   927,   928,   929,   936,   941,   978,
+     980,   981,  1052,  1060,   412,   946,  1012,  1012,  1013,   451,
+      13,    14,   454,   897,   898,   946,   811,  1054,   973,   488,
+     975,   843,  1046,   852,   900,   260,  1006,  1009,   435,   743,
+     975,   909,   394,   906,   225,   927,   412,   947,   402,   859,
+     860,  1060,   258,   861,  1060,   876,   877,   454,   926,   439,
+    1035,   758,   698,   754,   754,    52,   756,   445,  1058,  1046,
+    1046,  1059,  1059,   258,  1045,   261,   258,   975,   555,  1048,
+     450,   450,   450,   573,   183,   558,   656,   141,   509,   373,
+    1058,  1046,   493,   757,   951,  1046,   419,   697,   697,   697,
+     697,   773,    78,   118,   273,   367,   951,  1046,   591,  1046,
+     168,   400,   373,   373,   591,   608,   615,   306,   336,   506,
+    1046,  1046,  1046,   191,   249,   750,   271,   336,   373,   262,
+     613,   656,   126,   310,   336,   508,   615,   793,   328,   141,
+     509,   141,   509,  1046,  1046,  1046,  1046,   328,   328,   215,
+     618,   619,   618,   451,   454,   620,  1055,   183,   451,   454,
+     439,   452,  1058,  1046,   306,   336,   506,  1046,  1046,  1046,
+     272,   306,   336,    22,   126,   272,   306,   336,   951,   243,
+     951,  1058,  1046,  1044,   373,  1059,   396,   639,   217,   277,
+     249,  1055,   277,  1059,   393,   373,   373,   324,   271,   336,
+      81,   373,   792,   324,   373,   373,   227,   227,   227,   373,
+     373,   324,   373,   373,   324,   373,   324,   373,   324,   373,
+     509,   951,   244,  1055,   336,   793,   141,   509,   373,  1046,
+     373,   324,  1058,  1046,   704,   951,   697,   201,   704,   704,
+    1048,  1048,   704,   201,   201,  1046,   201,   704,   523,   450,
+     525,   526,   260,   441,   442,   587,   671,   754,  1009,  1055,
+    1067,     3,   674,   451,   451,   670,   671,   258,    64,    70,
+      81,   109,   111,   187,   244,   249,   287,   301,   389,   548,
+     549,   550,   140,   411,   461,   493,  1046,   493,   613,  1044,
+    1044,   451,   454,  1059,   166,   317,  1059,  1054,   383,  1044,
+     557,    26,   114,   193,   329,   394,   644,   373,   641,    42,
+     480,   308,   362,   102,   514,   558,  1044,   648,   675,   676,
+    1055,   451,   454,  1046,   558,  1044,   575,  1044,  1046,   576,
+     450,   540,   451,   257,   513,   257,   258,   570,   513,    35,
+     141,   882,   514,   373,   141,  1044,   451,   454,   109,   439,
+     762,  1055,   493,   362,   753,   754,   153,   763,   415,   761,
+     764,   114,   193,   329,   394,   801,  1046,   168,   882,   509,
+     951,   451,  1054,   972,   972,   449,   449,   969,   451,  1046,
+     509,   509,   396,   509,   396,   509,   509,   697,   697,  1046,
+     697,  1046,   633,   509,   141,   324,   324,   324,  1045,   723,
+     454,  1058,   415,   454,   721,   261,   937,   333,   139,   139,
+     102,   242,  1059,   718,   509,  1058,   757,   201,   746,   587,
+     201,   697,   201,  1015,   370,   975,   132,   951,   451,   975,
+     975,   975,  1023,   451,  1011,   454,   951,   976,   976,   976,
+     976,   121,   123,   244,   254,   976,   976,   976,   976,   976,
+     976,   976,   976,   976,   976,   975,   975,  1024,  1023,   951,
+     451,   451,   451,  1011,   451,   454,    52,   977,   451,  1063,
+     986,   284,   357,   988,   451,   454,   407,   982,    35,   451,
+    1055,   975,    32,    32,   975,   451,   975,   158,   450,  1014,
+     975,   451,   134,   976,   976,   134,   134,   975,   975,   898,
+     412,   450,   996,  1060,   451,  1011,   454,   893,   893,   893,
+     893,  1044,  1044,  1044,   883,   941,   158,   883,   928,   929,
+      35,   930,   931,  1060,   454,    89,   159,   189,   204,   214,
+     239,   316,   933,   931,    35,   930,   932,  1060,   436,   945,
+     450,  1034,   975,   166,   911,   454,   897,   897,   897,   975,
+     975,   404,  1013,   451,   911,   451,   449,   451,   450,   743,
+     150,   209,   451,   259,    92,   975,   313,   863,   451,   454,
+    1035,    79,   863,   451,   454,   873,   947,  1037,   451,   445,
+     758,   383,   161,   331,   363,   384,   732,   153,   732,   451,
+     450,   561,   562,   739,   980,  1060,   558,   558,   656,  1050,
+     451,   111,   187,   242,   244,   657,  1046,  1046,    35,  1046,
+     396,   396,   697,   697,   697,   697,   207,   698,  1058,  1046,
+     373,   792,   324,   373,   191,    52,   365,  1046,   450,   547,
+     244,   513,   102,   244,   352,   355,   513,   383,  1046,  1060,
+     328,   617,  1046,   516,   671,  1063,   271,   336,   373,   792,
+     324,   373,   373,   373,   324,   160,   260,   355,   680,   681,
+     160,   260,   688,   689,   373,   373,   324,   451,   451,   451,
+     306,  1046,   450,   415,   640,  1056,  1055,  1055,  1055,  1046,
+    1046,  1046,    52,   365,  1046,  1046,  1046,  1046,  1046,  1046,
+     153,   153,   308,   153,   174,  1058,  1046,  1046,  1058,  1046,
+    1046,  1046,  1046,  1046,  1046,  1046,    70,   510,   141,    24,
+      44,   383,  1060,  1046,   615,  1046,  1046,   451,   201,   704,
+     201,   201,   704,   704,   201,   704,   524,   532,   533,  1063,
+      48,    90,   115,   130,   134,   154,   157,   170,   249,   257,
+     293,   527,   656,   415,   417,  1044,   450,   697,  1046,   976,
+     112,   176,   111,   249,   205,  1044,   764,   291,   660,   661,
+    1060,   601,   450,   552,   186,   568,   543,  1059,  1059,   951,
+     450,   514,  1059,   639,  1058,   174,  1044,   419,   153,   649,
+     451,   454,   950,   613,   451,   583,    35,   254,   450,   854,
+     542,   544,   546,   554,  1060,   569,   568,    75,   365,   571,
+     882,   578,   576,   571,  1055,  1050,   737,   755,   975,   975,
+     454,   450,   759,   383,   454,   668,   373,   450,   591,   451,
+     449,   509,  1048,  1048,   509,   509,   509,   509,   333,  1045,
+    1045,  1045,   587,   163,   720,   451,  1046,   102,   727,   158,
+     201,   249,   708,  1055,   201,   201,   708,   201,   708,   975,
+     451,   451,  1024,   451,   975,   158,   121,   123,   254,   450,
+     451,   422,   984,  1011,   300,    52,   413,   413,   451,   975,
+     242,   975,   454,   983,   953,   975,   975,   975,  1014,   451,
+     975,    32,    32,   975,   975,   134,   451,   451,   975,   997,
+    1060,   451,   975,  1044,  1044,  1044,  1044,   931,   932,   450,
+     451,  1060,   450,   928,   204,   267,   934,   928,   934,   204,
+     933,   934,   204,   364,   939,   450,  1060,   450,   265,  1012,
+      52,   169,   918,   451,   451,   451,  1013,  1055,   918,  1055,
+     774,   254,  1041,   882,   860,   258,   450,   862,   439,   876,
+     863,   383,   451,   373,   715,   158,   656,   975,   451,   454,
+     415,    70,   740,   740,   451,   451,   764,   112,   176,   185,
+     111,   398,   509,   951,  1048,  1048,  1046,  1046,  1046,  1046,
+    1046,  1059,  1046,   614,   618,   249,   249,  1056,  1060,   951,
+     509,   509,   439,    52,   365,  1046,  1046,  1046,  1046,  1058,
+    1046,  1046,  1054,  1054,   951,   454,  1054,  1054,   454,  1058,
+    1046,  1046,   373,   975,    64,  1059,  1046,   373,   373,  1045,
+    1045,   697,  1045,   141,   697,  1055,  1055,   951,   509,   509,
+     201,   704,   704,   704,   704,   396,   530,   531,   451,   454,
+     443,   450,   490,   534,   587,   828,  1055,   828,   244,   249,
+     293,   828,   828,   160,   190,   160,   158,   655,   975,   244,
+     549,   764,   557,   396,   572,  1052,    32,   140,   180,   539,
+     138,   181,   450,   333,   396,   558,    35,   640,   480,   244,
+     450,  1046,   127,   650,   411,   652,  1055,   514,   882,   697,
+     539,   576,   451,   454,   415,   570,   569,   114,   126,   284,
+    1046,   415,   814,    35,   158,   258,   450,  1055,   752,   765,
+     766,  1061,   764,   951,   153,  1044,   158,   373,   783,   188,
+     592,   509,   509,   509,  1046,   261,   199,   509,   719,   708,
+     708,   708,   708,   451,   976,   158,   450,  1014,   450,   451,
+     454,   451,   977,   300,   451,   401,   349,   451,   451,   451,
+     975,   975,   975,   451,   275,   998,   451,   942,   943,   980,
+     930,   450,  1045,   928,   258,   396,   935,   928,   204,   928,
+    1052,   949,   450,   949,  1060,   897,    91,   167,   319,   450,
+     912,   913,   914,   915,   916,   917,   975,   975,   414,   992,
+     897,   992,   451,   879,    81,   738,   739,   122,   450,   883,
+    1039,   719,   258,   719,   451,   764,   562,   260,   774,   697,
+     396,   697,   741,   741,   301,   764,   572,   451,   373,   336,
+     869,   451,   454,   510,   671,  1059,  1046,   373,   450,  1052,
+     774,   681,   450,   450,   689,  1046,   451,   450,   336,   869,
+    1046,  1046,   415,   436,   831,   308,   831,   831,   153,   510,
+     704,   461,   116,   533,   490,   535,   536,  1055,  1055,   249,
+     558,   443,   558,  1055,  1055,   723,    35,   779,   779,  1044,
+     656,   451,   572,   228,   560,   183,   450,   661,   291,   450,
+     451,    26,    74,    82,   110,   184,   355,   553,   553,  1043,
+    1046,  1048,   451,   882,   141,   613,   320,   351,   651,   450,
+     140,    35,   576,   540,   451,   544,   262,   571,   570,   321,
+     321,    56,    64,   220,   882,   697,  1044,   738,   754,   451,
+     454,   383,   946,   347,   347,   451,   591,   242,   400,   593,
+     594,  1046,   509,   976,  1014,   451,   985,  1011,    52,   242,
+     432,    52,   897,   451,   454,    35,   944,  1045,   451,   975,
+     450,   928,   935,   450,   451,   949,   451,   451,   450,   337,
+     450,   451,   454,   993,   994,  1060,   451,  1046,   451,   454,
+     245,   394,   721,   732,   509,   740,   572,   450,   697,   742,
+     742,  1044,   572,   656,  1046,   365,   618,   396,   511,   336,
+     869,  1046,  1014,   746,   153,   684,   773,  1014,  1014,   975,
+     365,   696,   697,   696,   697,  1045,   509,   525,  1055,   451,
+     454,   558,   779,    38,   178,   153,   242,   556,   159,   274,
+     342,   258,   564,   565,   566,   365,   451,  1052,     5,   662,
+     568,   451,   613,   147,   683,   514,   814,  1044,   975,   291,
+     882,   569,   568,   547,   571,    64,   261,    64,   576,   737,
+     451,   759,   765,   951,   122,   415,   415,   400,   591,   613,
+     451,   451,   451,   300,   401,  1011,   294,   321,   999,   945,
+     942,   450,   451,  1045,  1011,   451,  1011,   450,  1011,   913,
+     454,    35,   946,   739,   336,   158,   741,   412,   563,   774,
+     743,   743,   557,   656,  1046,   975,   365,   451,   264,   326,
+     298,   685,   684,   451,   451,   451,  1046,   831,   536,   127,
+     185,   114,   394,   258,   566,   258,   565,  1046,   450,   451,
+     454,   333,   697,    35,    35,   450,   451,  1052,   814,   570,
+     569,   261,   261,   450,   514,   764,    27,   194,   802,   160,
+     160,    46,    92,   385,   975,  1000,  1001,  1000,   451,   949,
+     451,   451,   451,   912,   451,   994,   996,   872,   719,   742,
+     450,   656,   451,   560,   869,  1046,  1052,    52,   685,   869,
+     697,   320,    55,   242,   312,   336,   567,   567,   451,     5,
+    1046,   680,   882,   450,   571,   570,   738,   571,   245,   450,
+     797,   799,   804,   856,   864,   871,   882,   723,   723,  1001,
+     320,   152,   282,   152,   282,   451,   307,   940,   451,   946,
+     509,   743,   975,   564,   869,   746,   697,   652,    21,   109,
+     249,   613,   814,     4,   653,   654,  1054,  1055,  1063,   571,
+     451,   946,   798,   799,   800,   883,   884,   454,   454,    32,
+     450,   451,   656,   140,   451,   454,   514,   451,   453,   373,
+     158,  1001,   975,   291,   654,   571,   800,   347,   347,   451,
+    1052,   946,   415,   415,   450,   160,   160,   653,   723,   723,
+     451
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
@@ -21440,198 +21437,199 @@
      459,   459,   459,   459,   459,   459,   459,   459,   460,   461,
      461,   461,   462,   462,   463,   463,   464,   464,   464,   464,
      464,   464,   464,   464,   464,   465,   465,   465,   465,   465,
-     465,   466,   467,   468,   468,   469,   469,   470,   471,   472,
-     472,   473,   473,   474,   475,   476,   476,   477,   477,   478,
-     478,   478,   478,   479,   479,   480,   480,   481,   481,   481,
-     481,   481,   481,   482,   482,   482,   483,   483,   483,   484,
-     484,   484,   484,   485,   485,   485,   485,   485,   485,   485,
-     485,   485,   485,   485,   486,   486,   487,   487,   488,   488,
-     489,   489,   489,   489,   490,   490,   490,   490,   491,   491,
-     491,   491,   491,   491,   491,   492,   492,   492,   493,   493,
-     494,   495,   495,   495,   495,   496,   496,   497,   497,   498,
-     498,   499,   499,   499,   499,   499,   500,   501,   501,   502,
-     502,   503,   504,   504,   504,   504,   504,   505,   505,   505,
+     465,   466,   467,   468,   468,   469,   469,   470,   471,   471,
+     472,   472,   473,   473,   474,   475,   476,   476,   477,   477,
+     478,   478,   478,   478,   479,   479,   480,   480,   481,   481,
+     481,   481,   481,   481,   482,   482,   482,   483,   483,   483,
+     484,   484,   484,   484,   485,   485,   485,   485,   485,   485,
+     485,   485,   485,   485,   485,   486,   486,   487,   487,   488,
+     488,   489,   489,   489,   489,   490,   490,   490,   490,   491,
+     491,   491,   491,   491,   491,   491,   492,   492,   492,   493,
+     493,   494,   495,   495,   495,   495,   496,   496,   497,   497,
+     498,   498,   499,   499,   499,   499,   499,   500,   501,   501,
+     502,   502,   503,   504,   504,   504,   504,   504,   505,   505,
      505,   505,   505,   505,   505,   505,   505,   505,   505,   505,
-     505,   505,   505,   506,   506,   507,   507,   507,   507,   507,
+     505,   505,   505,   505,   506,   506,   507,   507,   507,   507,
      507,   507,   507,   507,   507,   507,   507,   507,   507,   507,
      507,   507,   507,   507,   507,   507,   507,   507,   507,   507,
      507,   507,   507,   507,   507,   507,   507,   507,   507,   507,
      507,   507,   507,   507,   507,   507,   507,   507,   507,   507,
-     507,   507,   507,   507,   507,   508,   508,   509,   509,   509,
-     510,   510,   511,   511,   512,   512,   512,   512,   513,   514,
-     514,   515,   515,   516,   516,   516,   516,   517,   518,   518,
-     519,   519,   519,   519,   520,   520,   521,   521,   522,   522,
-     523,   523,   524,   524,   524,   525,   525,   526,   526,   527,
+     507,   507,   507,   507,   507,   507,   508,   508,   509,   509,
+     509,   510,   510,   511,   511,   512,   512,   512,   512,   513,
+     514,   514,   515,   515,   516,   516,   516,   516,   517,   518,
+     518,   519,   519,   519,   519,   520,   520,   521,   521,   522,
+     522,   523,   523,   524,   524,   524,   525,   525,   526,   526,
      527,   527,   527,   527,   527,   527,   527,   527,   527,   527,
-     527,   527,   527,   528,   528,   529,   529,   530,   530,   531,
-     531,   532,   532,   533,   534,   534,   534,   534,   534,   535,
-     535,   536,   537,   537,   537,   537,   538,   538,   538,   538,
-     538,   538,   538,   538,   539,   539,   540,   540,   541,   541,
-     542,   542,   543,   543,   543,   544,   544,   545,   546,   547,
-     547,   548,   548,   548,   548,   549,   549,   549,   549,   549,
-     549,   549,   550,   550,   550,   550,   551,   552,   552,   552,
-     553,   553,   553,   553,   553,   553,   554,   554,   555,   555,
-     555,   555,   555,   555,   555,   556,   556,   557,   557,   558,
-     558,   559,   560,   560,   560,   560,   561,   561,   562,   562,
-     563,   563,   564,   564,   564,   564,   564,   565,   566,   567,
-     567,   567,   567,   567,   568,   568,   569,   569,   569,   569,
-     570,   570,   570,   570,   571,   571,   572,   572,   573,   574,
-     574,   575,   576,   576,   576,   577,   577,   578,   579,   579,
-     580,   581,   581,   582,   582,   583,   583,   584,   584,   585,
+     527,   527,   527,   527,   528,   528,   529,   529,   530,   530,
+     531,   531,   532,   532,   533,   534,   534,   534,   534,   534,
+     535,   535,   536,   537,   537,   537,   537,   538,   538,   538,
+     538,   538,   538,   538,   538,   539,   539,   540,   540,   541,
+     541,   542,   542,   543,   543,   543,   544,   544,   545,   546,
+     547,   547,   548,   548,   548,   548,   549,   549,   549,   549,
+     549,   549,   549,   550,   550,   550,   550,   551,   552,   552,
+     552,   553,   553,   553,   553,   553,   553,   554,   554,   555,
+     555,   555,   555,   555,   555,   555,   556,   556,   557,   557,
+     558,   558,   559,   560,   560,   560,   560,   561,   561,   562,
+     562,   563,   563,   564,   564,   564,   564,   564,   565,   566,
+     567,   567,   567,   567,   567,   568,   568,   569,   569,   569,
+     569,   570,   570,   570,   570,   571,   571,   572,   572,   573,
+     574,   574,   575,   576,   576,   576,   577,   577,   578,   579,
+     579,   580,   581,   581,   582,   582,   583,   583,   584,   584,
      585,   585,   585,   585,   585,   585,   585,   585,   585,   585,
-     585,   586,   586,   587,   587,   587,   588,   588,   589,   589,
-     590,   590,   591,   591,   592,   592,   593,   593,   594,   594,
-     595,   595,   596,   596,   597,   598,   598,   599,   599,   600,
-     600,   601,   601,   602,   602,   602,   603,   604,   604,   605,
+     585,   585,   586,   586,   587,   587,   587,   587,   588,   588,
+     589,   589,   590,   590,   591,   591,   592,   592,   593,   593,
+     594,   594,   595,   595,   596,   596,   597,   598,   598,   599,
+     599,   600,   600,   601,   601,   602,   602,   602,   603,   604,
+     604,   605,   606,   606,   606,   606,   606,   606,   606,   606,
      606,   606,   606,   606,   606,   606,   606,   606,   606,   606,
-     606,   606,   606,   606,   606,   606,   606,   606,   606,   606,
-     606,   606,   606,   606,   606,   607,   608,   608,   608,   608,
-     609,   609,   610,   610,   611,   611,   612,   612,   613,   613,
-     614,   614,   615,   616,   616,   617,   617,   617,   617,   618,
-     619,   620,   621,   622,   622,   623,   623,   624,   624,   625,
-     625,   626,   626,   626,   627,   627,   628,   628,   629,   630,
-     630,   631,   631,   632,   633,   633,   634,   634,   635,   636,
-     637,   638,   638,   639,   639,   640,   640,   641,   641,   642,
-     642,   643,   643,   644,   644,   644,   644,   644,   645,   645,
-     646,   646,   646,   647,   647,   648,   648,   648,   648,   648,
-     649,   649,   650,   650,   651,   651,   652,   652,   653,   653,
-     653,   654,   654,   654,   654,   655,   655,   656,   656,   657,
-     657,   657,   657,   657,   657,   658,   658,   659,   659,   660,
-     660,   661,   662,   662,   663,   664,   664,   664,   664,   665,
-     666,   667,   667,   667,   667,   667,   667,   667,   667,   667,
-     667,   667,   667,   667,   667,   668,   669,   669,   670,   670,
-     671,   671,   671,   671,   671,   672,   673,   673,   674,   675,
-     675,   676,   676,   677,   677,   677,   678,   678,   679,   680,
-     680,   681,   681,   681,   681,   681,   682,   682,   683,   683,
-     684,   684,   684,   685,   685,   686,   687,   687,   688,   688,
-     689,   689,   690,   690,   691,   691,   692,   693,   694,   694,
-     694,   694,   694,   694,   694,   694,   695,   695,   695,   695,
+     606,   606,   606,   606,   606,   606,   606,   607,   608,   608,
+     608,   608,   609,   609,   610,   610,   611,   611,   612,   612,
+     613,   613,   614,   614,   615,   616,   616,   617,   617,   617,
+     617,   618,   619,   620,   621,   622,   622,   623,   623,   624,
+     624,   625,   625,   626,   626,   626,   627,   627,   628,   628,
+     629,   630,   630,   631,   631,   632,   633,   633,   634,   634,
+     635,   636,   637,   638,   638,   639,   639,   640,   640,   641,
+     641,   642,   642,   643,   643,   644,   644,   644,   644,   644,
+     645,   645,   646,   646,   646,   647,   647,   648,   648,   648,
+     648,   648,   649,   649,   650,   650,   651,   651,   652,   652,
+     653,   653,   653,   654,   654,   654,   654,   655,   655,   656,
+     656,   657,   657,   657,   657,   657,   657,   658,   658,   659,
+     659,   660,   660,   661,   662,   662,   663,   664,   664,   664,
+     664,   665,   666,   667,   667,   667,   667,   667,   667,   667,
+     667,   667,   667,   667,   667,   667,   667,   668,   669,   669,
+     670,   670,   671,   671,   671,   671,   671,   672,   673,   673,
+     674,   675,   675,   676,   676,   677,   677,   677,   678,   678,
+     679,   680,   680,   681,   681,   681,   681,   681,   682,   682,
+     683,   683,   684,   684,   684,   685,   685,   686,   687,   687,
+     688,   688,   689,   689,   690,   690,   691,   691,   692,   693,
+     694,   694,   694,   694,   694,   694,   694,   694,   695,   695,
      695,   695,   695,   695,   695,   695,   695,   695,   695,   695,
-     695,   696,   696,   697,   697,   698,   698,   699,   699,   700,
-     701,   701,   701,   702,   702,   702,   702,   702,   702,   702,
+     695,   695,   695,   696,   696,   697,   697,   698,   698,   699,
+     699,   700,   701,   701,   701,   702,   702,   702,   702,   702,
      702,   702,   702,   702,   702,   702,   702,   702,   702,   702,
-     702,   703,   703,   703,   703,   703,   703,   703,   703,   703,
+     702,   702,   702,   703,   703,   703,   703,   703,   703,   703,
      703,   703,   703,   703,   703,   703,   703,   703,   703,   703,
-     703,   703,   704,   704,   705,   705,   705,   705,   705,   705,
-     705,   706,   706,   707,   707,   707,   707,   707,   707,   707,
-     707,   707,   707,   707,   708,   708,   709,   709,   710,   710,
+     703,   703,   703,   703,   704,   704,   705,   705,   705,   705,
+     705,   705,   705,   706,   706,   707,   707,   707,   707,   707,
+     707,   707,   707,   707,   707,   707,   708,   708,   709,   709,
      710,   710,   710,   710,   710,   710,   710,   710,   710,   710,
-     710,   710,   710,   710,   711,   711,   712,   712,   713,   714,
-     714,   715,   715,   715,   715,   715,   716,   716,   717,   717,
-     717,   717,   718,   718,   718,   718,   718,   718,   718,   718,
-     718,   718,   718,   718,   718,   718,   718,   718,   719,   719,
-     720,   720,   721,   721,   722,   722,   723,   724,   725,   725,
-     726,   726,   727,   727,   728,   729,   729,   730,   730,   730,
-     731,   731,   731,   732,   732,   732,   732,   733,   733,   734,
-     734,   735,   735,   736,   736,   737,   737,   738,   738,   739,
-     739,   739,   740,   740,   741,   741,   741,   742,   742,   742,
-     743,   743,   743,   744,   744,   744,   745,   745,   746,   746,
-     747,   747,   748,   748,   749,   749,   750,   750,   750,   750,
-     750,   751,   751,   751,   751,   751,   752,   753,   754,   754,
-     754,   755,   755,   755,   756,   757,   757,   757,   757,   758,
-     758,   759,   759,   760,   760,   760,   760,   760,   760,   760,
-     760,   760,   760,   760,   760,   760,   760,   760,   761,   761,
-     761,   761,   761,   762,   762,   763,   763,   764,   764,   765,
-     766,   766,   767,   768,   768,   769,   769,   770,   770,   771,
-     771,   772,   772,   773,   773,   773,   773,   774,   774,   775,
-     776,   776,   777,   777,   778,   778,   778,   779,   779,   779,
-     780,   781,   781,   782,   783,   783,   783,   783,   784,   785,
-     785,   785,   785,   786,   786,   787,   787,   787,   788,   788,
-     789,   790,   790,   791,   791,   791,   791,   791,   791,   791,
+     710,   710,   710,   710,   710,   710,   711,   711,   712,   712,
+     713,   714,   714,   715,   715,   715,   715,   715,   716,   716,
+     717,   717,   717,   717,   718,   718,   718,   718,   718,   718,
+     718,   718,   718,   718,   718,   718,   718,   718,   718,   718,
+     719,   719,   720,   720,   721,   721,   722,   722,   723,   724,
+     725,   725,   726,   726,   727,   727,   728,   729,   729,   730,
+     730,   730,   731,   731,   731,   732,   732,   732,   732,   733,
+     733,   734,   734,   735,   735,   736,   736,   737,   737,   738,
+     738,   739,   739,   739,   740,   740,   741,   741,   741,   742,
+     742,   742,   743,   743,   743,   744,   744,   744,   745,   745,
+     746,   746,   747,   747,   748,   748,   749,   749,   750,   750,
+     750,   750,   750,   751,   751,   751,   751,   751,   752,   753,
+     754,   754,   754,   755,   755,   755,   756,   757,   757,   757,
+     757,   758,   758,   759,   759,   760,   760,   760,   760,   760,
+     760,   760,   760,   760,   760,   760,   760,   760,   760,   760,
+     761,   761,   761,   761,   761,   762,   762,   763,   763,   764,
+     764,   765,   766,   766,   767,   768,   768,   769,   769,   770,
+     770,   771,   771,   772,   772,   773,   773,   773,   773,   774,
+     774,   775,   776,   776,   777,   777,   778,   778,   778,   779,
+     779,   779,   780,   781,   781,   782,   783,   783,   783,   783,
+     784,   785,   785,   785,   785,   786,   786,   787,   787,   787,
+     788,   788,   789,   790,   790,   791,   791,   791,   791,   791,
      791,   791,   791,   791,   791,   791,   791,   791,   791,   791,
      791,   791,   791,   791,   791,   791,   791,   791,   791,   791,
      791,   791,   791,   791,   791,   791,   791,   791,   791,   791,
      791,   791,   791,   791,   791,   791,   791,   791,   791,   791,
-     791,   792,   792,   793,   793,   794,   794,   794,   794,   794,
+     791,   791,   791,   792,   792,   793,   793,   794,   794,   794,
+     794,   794,   794,   794,   794,   794,   794,   794,   794,   794,
      794,   794,   794,   794,   794,   794,   794,   794,   794,   794,
-     794,   794,   794,   794,   794,   794,   794,   794,   794,   795,
+     794,   795,   795,   795,   795,   795,   795,   795,   795,   795,
      795,   795,   795,   795,   795,   795,   795,   795,   795,   795,
-     795,   795,   795,   795,   795,   795,   795,   795,   796,   797,
-     797,   797,   798,   798,   799,   799,   799,   799,   799,   800,
-     800,   801,   801,   801,   801,   802,   802,   802,   803,   803,
-     804,   805,   805,   806,   807,   807,   808,   808,   808,   808,
+     796,   797,   797,   797,   798,   798,   799,   799,   799,   799,
+     799,   800,   800,   801,   801,   801,   801,   802,   802,   802,
+     803,   803,   804,   805,   805,   806,   807,   807,   808,   808,
      808,   808,   808,   808,   808,   808,   808,   808,   808,   808,
-     809,   809,   809,   810,   810,   810,   810,   810,   811,   811,
-     811,   812,   812,   813,   813,   813,   813,   814,   814,   814,
-     814,   815,   816,   817,   817,   818,   818,   819,   819,   819,
-     820,   820,   820,   820,   820,   820,   820,   821,   821,   822,
-     822,   822,   823,   824,   824,   825,   825,   826,   827,   827,
-     827,   827,   827,   827,   827,   828,   828,   829,   830,   830,
-     830,   830,   830,   830,   831,   831,   832,   833,   833,   833,
-     834,   834,   835,   835,   835,   835,   835,   836,   836,   837,
-     837,   837,   837,   838,   838,   839,   839,   840,   840,   841,
-     841,   842,   842,   843,   843,   844,   844,   844,   844,   845,
-     845,   845,   845,   845,   845,   845,   845,   845,   846,   846,
-     847,   848,   848,   849,   849,   849,   850,   851,   851,   852,
-     852,   852,   852,   853,   853,   854,   854,   855,   855,   855,
-     855,   856,   857,   857,   858,   858,   858,   859,   859,   860,
-     861,   861,   861,   862,   862,   862,   863,   863,   864,   865,
-     865,   866,   867,   867,   868,   868,   868,   868,   868,   868,
-     868,   868,   869,   869,   870,   870,   870,   871,   872,   872,
-     873,   873,   874,   875,   875,   876,   877,   877,   878,   879,
-     880,   880,   880,   880,   880,   881,   881,   881,   882,   882,
-     883,   883,   884,   884,   884,   884,   884,   884,   884,   884,
-     885,   885,   886,   886,   886,   886,   886,   886,   886,   887,
-     887,   887,   888,   888,   889,   890,   890,   891,   891,   892,
-     892,   892,   892,   892,   892,   892,   892,   892,   893,   893,
-     894,   894,   894,   895,   895,   896,   896,   897,   897,   898,
-     899,   899,   900,   900,   901,   901,   901,   901,   902,   902,
-     903,   903,   903,   904,   904,   905,   905,   906,   907,   907,
-     907,   908,   909,   909,   910,   910,   911,   911,   912,   912,
-     913,   913,   913,   913,   913,   914,   915,   916,   917,   918,
-     918,   919,   919,   920,   920,   921,   921,   922,   923,   923,
-     923,   923,   924,   924,   925,   925,   926,   926,   927,   927,
-     928,   928,   928,   928,   928,   928,   928,   928,   929,   929,
-     929,   929,   929,   929,   930,   930,   930,   930,   931,   931,
-     932,   932,   932,   932,   932,   933,   933,   933,   933,   934,
-     934,   935,   935,   936,   936,   936,   936,   937,   937,   938,
-     938,   938,   939,   940,   940,   941,   941,   942,   943,   943,
-     944,   944,   945,   945,   946,   946,   947,   947,   947,   948,
-     948,   949,   949,   950,   951,   951,   951,   951,   951,   951,
-     952,   952,   952,   953,   953,   953,   953,   953,   953,   953,
-     954,   954,   954,   954,   955,   955,   956,   956,   957,   957,
-     957,   957,   957,   957,   957,   957,   957,   957,   957,   958,
-     958,   959,   959,   960,   960,   961,   962,   963,   963,   964,
-     964,   965,   966,   967,   967,   967,   967,   967,   967,   968,
-     968,   969,   969,   970,   970,   970,   970,   971,   972,   972,
-     972,   973,   973,   973,   973,   973,   973,   973,   973,   973,
-     973,   973,   973,   973,   973,   974,   974,   975,   975,   975,
+     808,   808,   809,   809,   809,   810,   810,   810,   810,   810,
+     811,   811,   811,   812,   812,   813,   813,   813,   813,   814,
+     814,   814,   814,   815,   816,   817,   817,   818,   818,   819,
+     819,   819,   820,   820,   820,   820,   820,   820,   820,   821,
+     821,   822,   822,   822,   823,   824,   824,   825,   825,   826,
+     827,   827,   827,   827,   827,   827,   827,   828,   828,   829,
+     830,   830,   830,   830,   830,   830,   831,   831,   832,   833,
+     833,   833,   834,   834,   835,   835,   835,   835,   835,   836,
+     836,   837,   837,   837,   837,   838,   838,   839,   839,   840,
+     840,   841,   841,   842,   842,   843,   843,   844,   844,   844,
+     844,   845,   845,   845,   845,   845,   845,   845,   845,   845,
+     846,   846,   847,   848,   848,   849,   849,   849,   850,   851,
+     851,   852,   852,   852,   852,   853,   853,   854,   854,   855,
+     855,   855,   855,   856,   857,   857,   858,   858,   858,   859,
+     859,   860,   861,   861,   861,   862,   862,   862,   863,   863,
+     864,   865,   865,   866,   867,   867,   868,   868,   868,   868,
+     868,   868,   868,   868,   869,   869,   870,   870,   870,   871,
+     872,   872,   873,   873,   874,   875,   875,   876,   877,   877,
+     878,   879,   880,   880,   880,   880,   880,   881,   881,   881,
+     882,   882,   883,   883,   884,   884,   884,   884,   884,   884,
+     884,   884,   885,   885,   886,   886,   886,   886,   886,   886,
+     886,   887,   887,   887,   888,   888,   889,   890,   890,   891,
+     891,   892,   892,   892,   892,   892,   892,   892,   892,   892,
+     893,   893,   894,   894,   894,   895,   895,   896,   896,   897,
+     897,   898,   899,   899,   900,   900,   901,   901,   901,   901,
+     902,   902,   903,   903,   903,   904,   904,   905,   905,   906,
+     907,   907,   907,   908,   909,   909,   910,   910,   911,   911,
+     912,   912,   913,   913,   913,   913,   913,   914,   915,   916,
+     917,   918,   918,   919,   919,   920,   920,   921,   921,   922,
+     923,   923,   923,   923,   924,   924,   925,   925,   926,   926,
+     927,   927,   928,   928,   928,   928,   928,   928,   928,   928,
+     929,   929,   929,   929,   929,   929,   930,   930,   930,   930,
+     931,   931,   932,   932,   932,   932,   932,   933,   933,   933,
+     933,   934,   934,   935,   935,   936,   936,   936,   936,   937,
+     937,   938,   938,   938,   939,   940,   940,   941,   941,   942,
+     943,   943,   944,   944,   945,   945,   946,   946,   947,   947,
+     947,   948,   948,   949,   949,   950,   951,   951,   951,   951,
+     951,   951,   952,   952,   952,   953,   953,   953,   953,   953,
+     953,   953,   954,   954,   954,   954,   955,   955,   956,   956,
+     957,   957,   957,   957,   957,   957,   957,   957,   957,   957,
+     957,   958,   958,   959,   959,   960,   960,   961,   962,   963,
+     963,   964,   964,   965,   966,   967,   967,   967,   967,   967,
+     967,   968,   968,   969,   969,   970,   970,   970,   970,   971,
+     972,   972,   972,   973,   973,   973,   973,   973,   973,   973,
+     973,   973,   973,   973,   973,   973,   973,   974,   974,   975,
      975,   975,   975,   975,   975,   975,   975,   975,   975,   975,
      975,   975,   975,   975,   975,   975,   975,   975,   975,   975,
      975,   975,   975,   975,   975,   975,   975,   975,   975,   975,
      975,   975,   975,   975,   975,   975,   975,   975,   975,   975,
      975,   975,   975,   975,   975,   975,   975,   975,   975,   975,
      975,   975,   975,   975,   975,   975,   975,   975,   975,   975,
+     975,   975,   976,   976,   976,   976,   976,   976,   976,   976,
      976,   976,   976,   976,   976,   976,   976,   976,   976,   976,
-     976,   976,   976,   976,   976,   976,   976,   976,   976,   976,
-     976,   976,   976,   976,   976,   977,   977,   977,   977,   977,
-     977,   977,   977,   977,   977,   977,   977,   977,   977,   978,
-     978,   978,   978,   978,   978,   978,   979,   979,   980,   980,
-     981,   981,   981,   981,   981,   981,   981,   981,   981,   981,
+     976,   976,   976,   976,   976,   976,   976,   977,   977,   977,
+     977,   977,   977,   977,   977,   977,   977,   977,   977,   977,
+     977,   978,   978,   978,   978,   978,   978,   978,   979,   979,
+     980,   980,   981,   981,   981,   981,   981,   981,   981,   981,
      981,   981,   981,   981,   981,   981,   981,   981,   981,   981,
      981,   981,   981,   981,   981,   981,   981,   981,   981,   981,
      981,   981,   981,   981,   981,   981,   981,   981,   981,   981,
-     981,   981,   982,   982,   983,   983,   983,   983,   984,   985,
-     985,   986,   986,   987,   987,   988,   988,   988,   989,   989,
-     989,   989,   990,   990,   991,   991,   992,   992,   993,   993,
-     994,   995,   995,   995,   996,   997,   997,   998,   998,   999,
-     999,   999,  1000,  1000,  1001,  1001,  1001,  1001,  1001,  1002,
-    1002,  1002,  1003,  1003,  1004,  1005,  1005,  1005,  1006,  1006,
-    1007,  1007,  1007,  1007,  1007,  1007,  1007,  1007,  1007,  1007,
-    1007,  1007,  1008,  1008,  1009,  1009,  1010,  1010,  1010,  1010,
-    1010,  1010,  1011,  1011,  1012,  1012,  1013,  1013,  1013,  1014,
-    1014,  1015,  1015,  1015,  1016,  1016,  1017,  1017,  1018,  1018,
-    1018,  1018,  1018,  1018,  1018,  1018,  1019,  1019,  1020,  1021,
-    1021,  1022,  1022,  1022,  1022,  1022,  1022,  1023,  1024,  1025,
-    1025,  1025,  1026,  1026,  1027,  1028,  1028,  1029,  1030,  1030,
-    1031,  1031,  1032,  1032,  1033,  1033,  1033,  1033,  1034,  1034,
-    1035,  1035,  1036,  1036,  1037,  1037,  1038,  1038,  1039,  1040,
-    1040,  1041,  1041,  1042,  1042,  1042,  1042,  1043,  1043,  1044,
-    1044,  1045,  1045,  1046,  1047,  1048,  1049,  1050,  1051,  1052,
-    1052,  1053,  1053,  1053,  1053,  1053,  1053,  1053,  1053,  1053,
-    1053,  1053,  1053,  1053,  1054,  1055,  1056,  1056,  1056,  1057,
-    1058,  1058,  1058,  1059,  1059,  1060,  1060,  1060,  1061,  1061,
-    1061,  1062,  1062,  1062,  1062,  1063,  1063,  1063,  1063,  1063,
+     981,   981,   981,   981,   982,   982,   983,   983,   983,   983,
+     984,   985,   985,   986,   986,   987,   987,   988,   988,   988,
+     989,   989,   989,   989,   990,   990,   991,   991,   992,   992,
+     993,   993,   994,   995,   995,   995,   996,   997,   997,   998,
+     998,   999,   999,   999,  1000,  1000,  1001,  1001,  1001,  1001,
+    1001,  1002,  1002,  1002,  1003,  1003,  1004,  1005,  1005,  1005,
+    1006,  1006,  1007,  1007,  1007,  1007,  1007,  1007,  1007,  1007,
+    1007,  1007,  1007,  1007,  1008,  1008,  1009,  1009,  1010,  1010,
+    1010,  1010,  1010,  1010,  1011,  1011,  1012,  1012,  1013,  1013,
+    1013,  1014,  1014,  1015,  1015,  1015,  1016,  1016,  1017,  1017,
+    1018,  1018,  1018,  1018,  1018,  1018,  1018,  1018,  1019,  1019,
+    1020,  1021,  1021,  1022,  1022,  1022,  1022,  1022,  1022,  1023,
+    1024,  1025,  1025,  1025,  1026,  1026,  1027,  1028,  1028,  1029,
+    1030,  1030,  1031,  1031,  1032,  1032,  1033,  1033,  1033,  1033,
+    1034,  1034,  1035,  1035,  1036,  1036,  1037,  1037,  1038,  1038,
+    1039,  1040,  1040,  1041,  1041,  1042,  1042,  1042,  1042,  1043,
+    1043,  1044,  1044,  1045,  1045,  1046,  1047,  1048,  1049,  1050,
+    1051,  1052,  1052,  1053,  1053,  1053,  1053,  1053,  1053,  1053,
+    1053,  1053,  1053,  1053,  1053,  1053,  1054,  1055,  1056,  1056,
+    1056,  1057,  1058,  1058,  1058,  1059,  1059,  1060,  1060,  1060,
+    1061,  1061,  1061,  1062,  1062,  1062,  1062,  1063,  1063,  1063,
+    1063,  1063,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,
     1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,
     1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,
     1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,
@@ -21658,22 +21656,21 @@
     1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,
     1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,
     1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,
-    1064,  1064,  1064,  1064,  1064,  1064,  1064,  1064,  1065,  1065,
     1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,
     1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,
     1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,
     1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,
-    1065,  1065,  1065,  1065,  1065,  1065,  1066,  1066,  1066,  1066,
+    1065,  1065,  1065,  1065,  1065,  1065,  1065,  1065,  1066,  1066,
     1066,  1066,  1066,  1066,  1066,  1066,  1066,  1066,  1066,  1066,
-    1066,  1066,  1066,  1066,  1066,  1066,  1066,  1066,  1066,  1067,
-    1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,
+    1066,  1066,  1066,  1066,  1066,  1066,  1066,  1066,  1066,  1066,
+    1066,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,
     1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,
     1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,
     1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,
     1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,
     1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,
     1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067,
-    1067,  1067,  1067,  1067,  1067,  1067
+    1067,  1067,  1067,  1067,  1067,  1067,  1067,  1067
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -21694,197 +21691,197 @@
        1,     1,     1,     1,     1,     1,     1,     0,     5,     1,
        1,     0,     2,     0,     2,     0,     2,     2,     3,     3,
        1,     3,     3,     2,     1,     1,     2,     2,     2,     3,
-       3,     5,     5,     0,     3,     5,     5,     5,     4,     3,
-       5,     3,     5,     5,     6,     1,     1,     3,     5,     6,
-       4,     9,     7,     1,     0,     2,     0,     1,     1,     1,
-       1,     1,     1,     2,     3,     3,     2,     5,     1,     3,
-       3,     3,     3,     1,     3,     3,     2,     2,     2,     2,
-       3,     3,     3,     3,     1,     3,     1,     3,     1,     1,
-       2,     2,     2,     1,     1,     1,     1,     1,     1,     1,
-       3,     5,     1,     1,     1,     1,     1,     0,     1,     1,
-       2,     1,     2,     3,     2,     1,     1,     2,     1,     2,
-       1,     2,     3,     4,     3,     2,     4,     1,     1,     1,
-       1,     1,     2,     2,     2,     2,     2,     4,     6,    10,
-      13,     4,     6,    10,    13,     4,     6,     4,     6,     5,
-       7,    11,    14,     1,     3,     2,     3,     4,     6,     6,
-       6,     5,     5,     6,     6,     4,     8,     4,     2,     4,
-       3,     6,     4,     3,     3,     3,     3,     2,     2,     3,
-       4,     4,     3,     3,     3,     3,     3,     3,     4,     4,
-       3,     2,     3,     2,     2,     3,     3,     2,     2,     3,
-       4,     4,     4,     5,     1,     3,     2,     1,     1,     0,
-       2,     0,     2,     0,     1,     1,     1,     3,     3,     2,
-       0,     1,     3,     3,     1,     5,     3,     4,     1,     3,
-       4,     6,     4,     8,     2,     2,    11,     7,     1,     1,
-       1,     0,     1,     1,     1,     1,     3,     2,     0,     1,
-       1,     1,     3,     3,     1,     1,     3,     3,     3,     3,
-       4,     3,     2,     1,     0,     2,     0,     3,     0,     1,
-       0,     1,     3,     2,     1,     1,     1,     3,     0,     1,
-       3,     1,    11,    14,    10,    13,     1,     1,     2,     2,
-       2,     2,     1,     0,     1,     0,     3,     0,     1,     3,
-       1,     3,     1,     1,     1,     1,     1,     4,     4,     2,
-       0,     3,     1,     1,     2,     2,     1,     3,     4,     5,
-       2,     5,     1,     2,     2,     2,     3,     3,     3,     0,
-       1,     1,     1,     1,     1,     1,     3,     1,     5,     7,
-       3,     8,     4,     9,    11,     2,     0,     3,     0,     1,
-       3,     1,     2,     2,     2,     0,     1,     3,     3,     6,
-       4,     0,     1,     1,     2,     2,     0,     3,     3,     2,
-       1,     1,     2,     2,     4,     0,     2,     2,     2,     0,
-       3,     4,     4,     0,     2,     0,     4,     0,     3,     7,
-      10,     5,     2,     3,     0,     8,    11,     4,     1,     0,
-       6,     5,     8,     4,     6,     1,     0,     1,     2,     2,
-       1,     2,     3,     2,     2,     2,     2,     3,     3,     1,
-       3,     1,     0,     1,     2,     1,     1,     3,     6,    10,
-       1,     0,     1,     2,     2,     0,     2,     2,     1,     0,
-       5,     7,     1,     0,     7,     2,     0,     3,     5,     5,
-       8,     2,     0,     2,     2,     2,     5,     2,     0,     2,
-       7,    10,     6,     6,     6,     6,     7,     7,     9,     9,
-       6,     7,     6,     8,     8,     8,     8,     6,     6,     7,
-       7,     8,     6,     9,     6,     7,     2,     2,     2,     2,
-       1,     2,     1,     0,     6,     8,     7,     6,     4,     0,
-       1,     3,     4,     1,     3,     1,     2,     2,     2,     2,
-       1,     1,    10,     2,     0,     2,     2,     1,     0,     4,
-       6,     5,     4,     4,    11,    14,     5,     7,    11,     2,
-       1,     4,     0,     8,     1,     1,     7,     9,     8,     9,
-       8,     6,     8,     4,     0,     5,     0,     2,     0,     2,
-       0,     2,     0,     1,     1,     1,     1,     1,    15,    20,
-       1,     1,     2,     1,     3,     1,     1,     1,     3,     1,
-       3,     0,     1,     0,     1,     1,     4,     0,     1,     3,
-       0,     1,     1,     1,     1,     2,     0,     0,     2,     2,
-       1,     2,     2,     2,     2,     6,     8,    11,    13,     1,
-       3,     5,     1,     3,     5,     1,     2,     2,     1,     8,
-       4,     5,     4,     4,     4,     3,     7,     8,     6,     6,
-       6,     6,     6,     4,     5,     3,     1,     3,     3,     1,
-       1,     1,     1,     1,     1,     3,     1,     3,     3,     1,
-       0,     1,     3,     7,     9,     9,     3,     0,    13,     1,
-       3,     5,     6,     4,     7,     2,     1,     0,     2,     0,
-       2,     4,     0,     1,     0,     6,     8,     8,     1,     3,
-       5,     5,     7,     9,     7,     9,     5,     6,     6,     4,
-       4,     6,     4,     6,     5,     7,     1,     1,     1,     2,
-       1,     2,     2,     1,     1,     1,     1,     3,     3,     3,
-       3,     1,     3,     1,     2,     2,     3,     1,     3,     5,
-       2,     2,     0,     6,     6,     6,     7,     7,     7,     8,
-       9,     8,     8,     6,     9,     8,     9,     9,     7,    10,
-       7,     1,     1,     1,     1,     1,     1,     1,     2,     1,
-       1,     1,     1,     1,     2,     1,     3,     2,     3,     3,
-       3,     3,     1,     1,     8,     8,     8,     9,     9,     9,
-       9,     2,     0,     1,     1,     2,     2,     1,     1,     1,
-       1,     1,     1,     2,     1,     1,     2,     2,     1,     2,
-       3,     3,     3,     3,     4,     4,     3,     3,     3,     4,
-       4,     3,     4,     4,     1,     1,     1,     0,     7,     7,
-      10,     1,     1,     2,     4,     5,     1,     3,     2,     2,
-       2,     2,     1,     2,     2,     4,     3,     2,     2,     2,
-       2,     3,     2,     2,     2,     5,     5,     5,     1,     3,
-       1,     2,     3,     0,     1,     3,     2,     6,     6,     9,
-       3,     0,     3,     0,     5,     2,     0,     3,     3,     3,
-       7,     7,    10,     1,     1,     1,     1,    14,    17,     1,
-       0,     1,     0,     1,     0,     2,     0,     1,     3,     5,
-       5,     7,     2,     0,     1,     2,     0,     1,     1,     0,
-       2,     2,     0,     9,    12,     7,     2,     0,     3,     2,
-       1,     3,     3,     2,     1,     3,     3,     3,     2,     2,
-       1,     1,     1,     1,     2,     1,     1,     1,     1,     4,
-       5,     1,     3,     3,     1,     3,     3,     5,     6,     1,
-       3,     1,     2,     4,     5,     1,     1,     1,     1,     3,
-       3,     2,     2,     1,     2,     2,     2,     1,     2,     2,
-       2,     1,     1,     1,     3,     3,     5,     2,     0,     2,
-       1,     3,     5,     1,     2,     1,     0,     5,     7,     5,
-       7,     5,     7,     3,     5,     5,     5,     1,     3,     2,
-       1,     2,     1,     2,    11,    10,    10,     2,     2,     0,
-       9,     2,     0,    10,    11,    11,     5,     5,     8,     3,
-       3,     6,     6,     1,     1,     1,     1,     1,     1,     3,
-       1,     5,     5,     7,     6,     6,     6,     6,     8,     8,
-       6,     6,     7,     9,     9,     8,    10,     6,     6,     6,
-       8,     6,     8,     6,     8,     7,     9,     6,     8,     7,
-       9,     8,    10,     9,    11,     8,    10,     9,    11,     8,
-       8,     7,     6,     6,     6,     8,     8,     8,     8,     6,
-       9,     1,     0,     2,     0,     7,     6,     6,     6,     6,
-       6,     7,     9,     9,     6,     8,     8,     8,     8,     8,
-       6,     8,     6,     8,     7,     9,     7,     9,     6,     7,
-       6,     6,     6,     6,     6,     7,     7,     7,     9,     9,
-       6,     6,     6,     8,     8,     8,     6,     7,    13,     1,
-       1,     3,     3,     1,     1,     1,     1,     1,     1,     1,
-       0,     1,     1,     1,     1,     1,     1,     0,     6,     8,
-       3,     2,     0,     2,     2,     2,     2,     3,     3,     2,
-       2,     2,     2,     3,     2,     5,     4,     3,     3,     3,
-       1,     1,     0,     3,     2,     2,     1,     2,     1,     3,
-       2,     1,     0,     9,    11,    12,    14,     3,     4,     4,
-       0,     2,     5,     1,     0,     1,     2,     3,     3,     3,
-       1,     2,     1,     1,     1,     1,     1,     1,     0,     5,
-       4,     6,     4,     3,     5,     4,     4,     6,     4,     6,
-       6,     5,     7,     9,     6,     1,     0,     6,    11,    11,
-      11,    13,     9,    11,     1,     1,    10,     4,     2,     5,
-       2,     0,     4,     5,     5,     4,     6,     1,     3,     1,
-       1,     1,     1,     2,     4,     1,     1,     1,     0,     1,
-       0,     1,     0,     3,     0,     2,     4,     3,     5,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
-       2,     1,     1,     1,     1,     0,     5,     3,     0,     1,
-       1,     1,     1,     3,     9,     3,     0,     2,     3,     2,
-       3,     7,     1,     3,     1,     4,     2,     1,     3,     2,
-       8,     5,     0,     4,     3,     0,     2,     0,     7,     2,
-       0,     5,     3,     0,     2,     2,     2,     3,     1,     3,
-       1,     2,     1,     0,     1,     2,     0,     8,     1,     3,
-       1,     1,     3,     5,     5,     2,     1,     3,     7,     1,
-       0,     3,     2,     2,     2,     0,     2,     2,     1,     1,
-       3,     3,     1,     2,     4,     4,     2,     3,     5,     5,
-       1,     1,     9,     9,     1,     2,     4,     4,     4,     2,
-       2,     3,     1,     3,     6,     1,     0,     2,     0,     3,
-       3,     4,     4,     4,     4,     3,     2,     1,     1,     0,
-       1,     1,     0,     1,     5,     1,     0,     1,     0,     3,
-       1,     3,     4,     3,     2,     2,     1,     1,     1,     0,
-       2,     4,     5,     2,     3,     1,     1,     1,     1,     3,
-       0,     1,     1,     1,     1,     1,     3,     0,     1,     3,
-       1,     1,     1,     1,     1,     2,     4,     4,     5,     2,
-       0,     1,     3,     1,     0,     1,     2,     3,     2,     4,
-       2,     3,     2,     0,     2,     3,     2,     0,     1,     3,
-       2,     3,     2,     3,     2,     3,     1,     4,     3,     4,
-       5,     4,     5,     4,     5,     2,     4,     1,     1,     0,
-       1,     4,     5,     4,     0,     2,     2,     2,     1,     1,
-       0,     4,     2,     1,     2,     2,     4,     1,     3,     1,
-       2,     3,     6,     4,     0,     2,     6,     2,     1,     3,
-       4,     0,     2,     0,     2,     0,     2,     4,     0,     1,
-       0,     1,     3,     3,     2,     3,     5,     6,     2,     3,
-       3,     4,     0,     1,     1,     1,     1,     1,     2,     4,
-       1,     1,     1,     1,     2,     3,     3,     0,     1,     1,
-       1,     1,     1,     2,     2,     2,     2,     2,     1,     3,
-       0,     1,     1,     1,     1,     5,     2,     1,     1,     1,
-       1,     5,     2,     2,     2,     1,     3,     3,     2,     1,
-       0,     3,     0,     5,     2,     5,     2,     1,     3,     3,
-       0,     1,     1,     1,     1,     1,     1,     3,     3,     3,
-       3,     3,     3,     3,     0,     1,     4,     1,     3,     3,
-       5,     2,     2,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     2,     2,     3,     3,
-       2,     2,     3,     5,     4,     6,     3,     5,     4,     6,
-       4,     6,     5,     7,     3,     2,     4,     2,     3,     3,
-       4,     3,     4,     3,     4,     5,     6,     6,     7,     6,
-       7,     6,     7,     3,     4,     4,     6,     2,     3,     4,
-       1,     3,     2,     2,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     2,     2,     5,
-       6,     6,     7,     3,     4,     1,     1,     2,     4,     1,
-       1,     1,     2,     2,     2,     2,     1,     1,     4,     3,
-       5,     6,     8,     6,     6,     4,     4,     1,     1,     1,
-       5,     1,     1,     4,     1,     4,     1,     4,     1,     4,
-       1,     1,     1,     1,     1,     1,     6,     4,     4,     4,
-       4,     6,     5,     5,     5,     4,     6,     4,     4,     4,
-       4,     5,     7,     7,     9,     5,     4,     6,     5,     7,
-       7,     7,     2,     3,     3,     3,     4,     0,     4,     1,
-       3,     3,     1,     1,     1,     2,     2,     0,     2,     4,
-       4,     6,     5,     0,     5,     0,     2,     0,     1,     3,
-       3,     2,     2,     0,     6,     1,     0,     3,     0,     2,
-       2,     0,     1,     4,     2,     2,     2,     2,     2,     4,
-       3,     5,     4,     3,     5,     1,     1,     1,     1,     1,
+       3,     5,     5,     0,     3,     5,     5,     5,     5,     5,
+       3,     5,     3,     5,     5,     6,     1,     1,     3,     5,
+       6,     4,     9,     7,     1,     0,     2,     0,     1,     1,
+       1,     1,     1,     1,     2,     3,     3,     2,     5,     1,
+       3,     3,     3,     3,     1,     3,     3,     2,     2,     2,
+       2,     3,     3,     3,     3,     1,     3,     1,     3,     1,
+       1,     2,     2,     2,     1,     1,     1,     1,     1,     1,
+       1,     3,     5,     1,     1,     1,     1,     1,     0,     1,
+       1,     2,     1,     2,     3,     2,     1,     1,     2,     1,
+       2,     1,     2,     3,     4,     3,     2,     4,     1,     1,
+       1,     1,     1,     2,     2,     2,     2,     2,     4,     6,
+      10,    13,     4,     6,    10,    13,     4,     6,     4,     6,
+       5,     7,    11,    14,     1,     3,     2,     3,     4,     6,
+       6,     6,     5,     5,     6,     6,     4,     8,     4,     2,
+       4,     3,     6,     4,     3,     3,     3,     3,     2,     2,
+       3,     4,     4,     3,     3,     3,     3,     3,     3,     4,
+       4,     3,     2,     3,     2,     2,     3,     3,     2,     2,
+       3,     4,     4,     4,     5,     1,     3,     2,     1,     1,
+       0,     2,     0,     2,     0,     1,     1,     1,     3,     3,
+       2,     0,     1,     3,     3,     1,     5,     3,     4,     1,
+       3,     4,     6,     4,     8,     2,     2,    11,     7,     1,
+       1,     1,     0,     1,     1,     1,     1,     3,     2,     0,
+       1,     1,     1,     3,     3,     1,     1,     3,     3,     3,
+       3,     4,     3,     2,     1,     0,     2,     0,     3,     0,
+       1,     0,     1,     3,     2,     1,     1,     1,     3,     0,
+       1,     3,     1,    11,    14,    10,    13,     1,     1,     2,
+       2,     2,     2,     1,     0,     1,     0,     3,     0,     1,
+       3,     1,     3,     1,     1,     1,     1,     1,     4,     4,
+       2,     0,     3,     1,     1,     2,     2,     1,     3,     4,
+       5,     2,     5,     1,     2,     2,     2,     3,     3,     3,
+       0,     1,     1,     1,     1,     1,     1,     3,     1,     5,
+       7,     3,     8,     4,     9,    11,     2,     0,     3,     0,
+       1,     3,     1,     2,     2,     2,     0,     1,     3,     3,
+       6,     4,     0,     1,     1,     2,     2,     0,     3,     3,
+       2,     1,     1,     2,     2,     4,     0,     2,     2,     2,
+       0,     3,     4,     4,     0,     2,     0,     4,     0,     3,
+       7,    10,     5,     2,     3,     0,     8,    11,     4,     1,
+       0,     6,     5,     8,     4,     6,     1,     0,     1,     2,
+       2,     1,     2,     3,     2,     2,     2,     2,     3,     3,
+       1,     3,     1,     0,     1,     2,     2,     1,     1,     3,
+       6,    10,     1,     0,     1,     2,     2,     0,     2,     2,
+       1,     0,     5,     7,     1,     0,     7,     2,     0,     3,
+       5,     5,     8,     2,     0,     2,     2,     2,     5,     2,
+       0,     2,     7,    10,     6,     6,     6,     6,     7,     7,
+       9,     9,     6,     7,     6,     8,     8,     8,     8,     6,
+       6,     7,     7,     8,     6,     9,     6,     7,     2,     2,
+       2,     2,     1,     2,     1,     0,     6,     8,     7,     6,
+       4,     0,     1,     3,     4,     1,     3,     1,     2,     2,
+       2,     2,     1,     1,    10,     2,     0,     2,     2,     1,
+       0,     4,     6,     5,     4,     4,    11,    14,     5,     7,
+      11,     2,     1,     4,     0,     8,     1,     1,     7,     9,
+       8,     9,     8,     6,     8,     4,     0,     5,     0,     2,
+       0,     2,     0,     2,     0,     1,     1,     1,     1,     1,
+      15,    20,     1,     1,     2,     1,     3,     1,     1,     1,
+       3,     1,     3,     0,     1,     0,     1,     1,     4,     0,
+       1,     3,     0,     1,     1,     1,     1,     2,     0,     0,
+       2,     2,     1,     2,     2,     2,     2,     6,     8,    11,
+      13,     1,     3,     5,     1,     3,     5,     1,     2,     2,
+       1,     8,     4,     5,     4,     4,     4,     3,     7,     8,
+       6,     6,     6,     6,     6,     4,     5,     3,     1,     3,
+       3,     1,     1,     1,     1,     1,     1,     3,     1,     3,
+       3,     1,     0,     1,     3,     7,     9,     9,     3,     0,
+      13,     1,     3,     5,     6,     4,     7,     2,     1,     0,
+       2,     0,     2,     4,     0,     1,     0,     6,     8,     8,
+       1,     3,     5,     5,     7,     9,     7,     9,     5,     6,
+       6,     4,     4,     6,     4,     6,     5,     7,     1,     1,
+       1,     2,     1,     2,     2,     1,     1,     1,     1,     3,
+       3,     3,     3,     1,     3,     1,     2,     2,     3,     1,
+       3,     5,     2,     2,     0,     6,     6,     6,     7,     7,
+       7,     8,     9,     8,     8,     6,     9,     8,     9,     9,
+       7,    10,     7,     1,     1,     1,     1,     1,     1,     1,
+       2,     1,     1,     1,     1,     1,     2,     1,     3,     2,
+       3,     3,     3,     3,     1,     1,     8,     8,     8,     9,
+       9,     9,     9,     2,     0,     1,     1,     2,     2,     1,
+       1,     1,     1,     1,     1,     2,     1,     1,     2,     2,
+       1,     2,     3,     3,     3,     3,     4,     4,     3,     3,
+       3,     4,     4,     3,     4,     4,     1,     1,     1,     0,
+       7,     7,    10,     1,     1,     2,     4,     5,     1,     3,
+       2,     2,     2,     2,     1,     2,     2,     4,     3,     2,
+       2,     2,     2,     3,     2,     2,     2,     5,     5,     5,
+       1,     3,     1,     2,     3,     0,     1,     3,     2,     6,
+       6,     9,     3,     0,     3,     0,     5,     2,     0,     3,
+       3,     3,     7,     7,    10,     1,     1,     1,     1,    14,
+      17,     1,     0,     1,     0,     1,     0,     2,     0,     1,
+       3,     5,     5,     7,     2,     0,     1,     2,     0,     1,
+       1,     0,     2,     2,     0,     9,    12,     7,     2,     0,
+       3,     2,     1,     3,     3,     2,     1,     3,     3,     3,
+       2,     2,     1,     1,     1,     1,     2,     1,     1,     1,
+       1,     4,     5,     1,     3,     3,     1,     3,     3,     5,
+       6,     1,     3,     1,     2,     4,     5,     1,     1,     1,
+       1,     3,     3,     2,     2,     1,     2,     2,     2,     1,
+       2,     2,     2,     1,     1,     1,     3,     3,     5,     2,
+       0,     2,     1,     3,     5,     1,     2,     1,     0,     5,
+       7,     5,     7,     5,     7,     3,     5,     5,     5,     1,
+       3,     2,     1,     2,     1,     2,    11,    10,    10,     2,
+       2,     0,     9,     2,     0,    10,    11,    11,     5,     5,
+       8,     3,     3,     6,     6,     1,     1,     1,     1,     1,
+       1,     3,     1,     5,     5,     7,     6,     6,     6,     6,
+       8,     8,     6,     6,     7,     9,     9,     8,    10,     6,
+       6,     6,     8,     6,     8,     6,     8,     7,     9,     6,
+       8,     7,     9,     8,    10,     9,    11,     8,    10,     9,
+      11,     8,     8,     7,     6,     6,     6,     8,     8,     8,
+       8,     6,     9,     1,     0,     2,     0,     7,     6,     6,
+       6,     6,     6,     7,     9,     9,     6,     8,     8,     8,
+       8,     8,     6,     8,     6,     8,     7,     9,     7,     9,
+       6,     7,     6,     6,     6,     6,     6,     7,     7,     7,
+       9,     9,     6,     6,     6,     8,     8,     8,     6,     7,
+      13,     1,     1,     3,     3,     1,     1,     1,     1,     1,
+       1,     1,     0,     1,     1,     1,     1,     1,     1,     0,
+       6,     8,     3,     2,     0,     2,     2,     2,     2,     3,
+       3,     2,     2,     2,     2,     3,     2,     5,     4,     3,
+       3,     3,     1,     1,     0,     3,     2,     2,     1,     2,
+       1,     3,     2,     1,     0,     9,    11,    12,    14,     3,
+       4,     4,     0,     2,     5,     1,     0,     1,     2,     3,
+       3,     3,     1,     2,     1,     1,     1,     1,     1,     1,
+       0,     5,     4,     6,     4,     3,     5,     4,     4,     6,
+       4,     6,     6,     5,     7,     9,     6,     1,     0,     6,
+      11,    11,    11,    13,     9,    11,     1,     1,    10,     4,
+       2,     5,     2,     0,     4,     5,     5,     4,     6,     1,
+       3,     1,     1,     1,     1,     2,     4,     1,     1,     1,
+       0,     1,     0,     1,     0,     3,     0,     2,     4,     3,
+       5,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     3,     2,     1,     1,     1,     1,     0,     5,     3,
+       0,     1,     1,     1,     1,     3,     9,     3,     0,     2,
+       3,     2,     3,     7,     1,     3,     1,     4,     2,     1,
+       3,     2,     8,     5,     0,     4,     3,     0,     2,     0,
+       7,     2,     0,     5,     3,     0,     2,     2,     2,     3,
+       1,     3,     1,     2,     1,     0,     1,     2,     0,     8,
+       1,     3,     1,     1,     3,     5,     5,     2,     1,     3,
+       7,     1,     0,     3,     2,     2,     2,     0,     2,     2,
+       1,     1,     3,     3,     1,     2,     4,     4,     2,     3,
+       5,     5,     1,     1,     9,     9,     1,     2,     4,     4,
+       4,     2,     2,     3,     1,     3,     6,     1,     0,     2,
+       0,     3,     3,     4,     4,     4,     4,     3,     2,     1,
+       1,     0,     1,     1,     0,     1,     5,     1,     0,     1,
+       0,     3,     1,     3,     4,     3,     2,     2,     1,     1,
+       1,     0,     2,     4,     5,     2,     3,     1,     1,     1,
+       1,     3,     0,     1,     1,     1,     1,     1,     3,     0,
+       1,     3,     1,     1,     1,     1,     1,     2,     4,     4,
+       5,     2,     0,     1,     3,     1,     0,     1,     2,     3,
+       2,     4,     2,     3,     2,     0,     2,     3,     2,     0,
+       1,     3,     2,     3,     2,     3,     2,     3,     1,     4,
+       3,     4,     5,     4,     5,     4,     5,     2,     4,     1,
+       1,     0,     1,     4,     5,     4,     0,     2,     2,     2,
+       1,     1,     0,     4,     2,     1,     2,     2,     4,     1,
+       3,     1,     2,     3,     6,     4,     0,     2,     6,     2,
+       1,     3,     4,     0,     2,     0,     2,     0,     2,     4,
+       0,     1,     0,     1,     3,     3,     2,     3,     5,     6,
+       2,     3,     3,     4,     0,     1,     1,     1,     1,     1,
+       2,     4,     1,     1,     1,     1,     2,     3,     3,     0,
+       1,     1,     1,     1,     1,     2,     2,     2,     2,     2,
+       1,     3,     0,     1,     1,     1,     1,     5,     2,     1,
+       1,     1,     1,     5,     2,     2,     2,     1,     3,     3,
+       2,     1,     0,     3,     0,     5,     2,     5,     2,     1,
+       3,     3,     0,     1,     1,     1,     1,     1,     1,     3,
+       3,     3,     3,     3,     3,     3,     0,     1,     4,     1,
+       3,     3,     5,     2,     2,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     2,     2,
+       3,     3,     2,     2,     3,     5,     4,     6,     3,     5,
+       4,     6,     4,     6,     5,     7,     3,     2,     4,     2,
+       3,     3,     4,     3,     4,     3,     4,     5,     6,     6,
+       7,     6,     7,     6,     7,     3,     4,     4,     6,     2,
+       3,     4,     1,     3,     2,     2,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     2,
+       2,     5,     6,     6,     7,     3,     4,     1,     1,     2,
+       4,     1,     1,     1,     2,     2,     2,     2,     1,     1,
+       4,     3,     5,     6,     8,     6,     6,     4,     4,     1,
+       1,     1,     5,     1,     1,     4,     1,     4,     1,     4,
+       1,     4,     1,     1,     1,     1,     1,     1,     6,     4,
+       4,     4,     4,     6,     5,     5,     5,     4,     6,     4,
+       4,     4,     4,     5,     7,     7,     9,     5,     4,     6,
+       5,     7,     7,     7,     2,     3,     3,     3,     4,     0,
+       4,     1,     3,     3,     1,     1,     1,     2,     2,     0,
+       2,     4,     4,     6,     5,     0,     5,     0,     2,     0,
+       1,     3,     3,     2,     2,     0,     6,     1,     0,     3,
+       0,     2,     2,     0,     1,     4,     2,     2,     2,     2,
+       2,     4,     3,     5,     4,     3,     5,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     4,     1,     4,     1,     4,     1,     2,
-       1,     2,     1,     3,     1,     3,     1,     3,     3,     1,
-       3,     3,     3,     2,     1,     3,     3,     0,     1,     1,
-       1,     1,     1,     1,     1,     1,     4,     3,     2,     3,
-       0,     3,     3,     2,     2,     1,     0,     2,     2,     3,
-       2,     1,     1,     3,     5,     1,     2,     4,     2,     0,
-       1,     0,     1,     2,     2,     2,     3,     5,     1,     2,
-       0,     2,     1,     0,     1,     1,     1,     3,     3,     1,
-       0,     1,     3,     3,     2,     1,     1,     1,     3,     1,
-       2,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       2,     1,     1,     1,     1,     1,     2,     6,     2,     3,
-       5,     1,     1,     1,     1,     1,     1,     2,     2,     1,
-       1,     1,     1,     1,     3,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     4,     1,     4,     1,     4,
+       1,     2,     1,     2,     1,     3,     1,     3,     1,     3,
+       3,     1,     3,     3,     3,     2,     1,     3,     3,     0,
+       1,     1,     1,     1,     1,     1,     1,     1,     4,     3,
+       2,     3,     0,     3,     3,     2,     2,     1,     0,     2,
+       2,     3,     2,     1,     1,     3,     5,     1,     2,     4,
+       2,     0,     1,     0,     1,     2,     2,     2,     3,     5,
+       1,     2,     0,     2,     1,     0,     1,     1,     1,     3,
+       3,     1,     0,     1,     3,     3,     2,     1,     1,     1,
+       3,     1,     2,     1,     3,     1,     1,     1,     1,     1,
+       1,     1,     2,     1,     1,     1,     1,     1,     2,     6,
+       2,     3,     5,     1,     1,     1,     1,     1,     1,     2,
+       2,     1,     1,     1,     1,     1,     3,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -21927,7 +21924,7 @@
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1
+       1,     1,     1,     1,     1,     1,     1,     1
 };
 
 
@@ -22709,7 +22706,7 @@
     {
 				pg_yyget_extra(yyscanner)->parsetree = (yyvsp[0].list);
 			}
-#line 22713 "gram.c" /* yacc.c:1646  */
+#line 22710 "gram.c" /* yacc.c:1646  */
     break;
 
   case 3:
@@ -22720,7 +22717,7 @@
 					else
 						(yyval.list) = (yyvsp[-2].list);
 				}
-#line 22724 "gram.c" /* yacc.c:1646  */
+#line 22721 "gram.c" /* yacc.c:1646  */
     break;
 
   case 4:
@@ -22731,13 +22728,13 @@
 					else
 						(yyval.list) = NIL;
 				}
-#line 22735 "gram.c" /* yacc.c:1646  */
+#line 22732 "gram.c" /* yacc.c:1646  */
     break;
 
   case 127:
 #line 879 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 22741 "gram.c" /* yacc.c:1646  */
+#line 22738 "gram.c" /* yacc.c:1646  */
     break;
 
   case 128:
@@ -22749,49 +22746,49 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 22753 "gram.c" /* yacc.c:1646  */
+#line 22750 "gram.c" /* yacc.c:1646  */
     break;
 
   case 129:
 #line 900 "gram.y" /* yacc.c:1646  */
     {}
-#line 22759 "gram.c" /* yacc.c:1646  */
+#line 22756 "gram.c" /* yacc.c:1646  */
     break;
 
   case 130:
 #line 901 "gram.y" /* yacc.c:1646  */
     {}
-#line 22765 "gram.c" /* yacc.c:1646  */
+#line 22762 "gram.c" /* yacc.c:1646  */
     break;
 
   case 131:
 #line 902 "gram.y" /* yacc.c:1646  */
     {}
-#line 22771 "gram.c" /* yacc.c:1646  */
+#line 22768 "gram.c" /* yacc.c:1646  */
     break;
 
   case 132:
 #line 911 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 22777 "gram.c" /* yacc.c:1646  */
+#line 22774 "gram.c" /* yacc.c:1646  */
     break;
 
   case 133:
 #line 912 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 22783 "gram.c" /* yacc.c:1646  */
+#line 22780 "gram.c" /* yacc.c:1646  */
     break;
 
   case 134:
 #line 916 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 22789 "gram.c" /* yacc.c:1646  */
+#line 22786 "gram.c" /* yacc.c:1646  */
     break;
 
   case 135:
 #line 917 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 22795 "gram.c" /* yacc.c:1646  */
+#line 22792 "gram.c" /* yacc.c:1646  */
     break;
 
   case 136:
@@ -22800,7 +22797,7 @@
 					(yyval.defelt) = makeDefElem("password",
 									 (Node *)makeString((yyvsp[0].str)));
 				}
-#line 22804 "gram.c" /* yacc.c:1646  */
+#line 22801 "gram.c" /* yacc.c:1646  */
     break;
 
   case 137:
@@ -22808,7 +22805,7 @@
     {
 					(yyval.defelt) = makeDefElem("password", NULL);
 				}
-#line 22812 "gram.c" /* yacc.c:1646  */
+#line 22809 "gram.c" /* yacc.c:1646  */
     break;
 
   case 138:
@@ -22817,7 +22814,7 @@
 					(yyval.defelt) = makeDefElem("encryptedPassword",
 									 (Node *)makeString((yyvsp[0].str)));
 				}
-#line 22821 "gram.c" /* yacc.c:1646  */
+#line 22818 "gram.c" /* yacc.c:1646  */
     break;
 
   case 139:
@@ -22826,7 +22823,7 @@
 					(yyval.defelt) = makeDefElem("unencryptedPassword",
 									 (Node *)makeString((yyvsp[0].str)));
 				}
-#line 22830 "gram.c" /* yacc.c:1646  */
+#line 22827 "gram.c" /* yacc.c:1646  */
     break;
 
   case 140:
@@ -22834,7 +22831,7 @@
     {
 					(yyval.defelt) = makeDefElem("inherit", (Node *)makeInteger(TRUE));
 				}
-#line 22838 "gram.c" /* yacc.c:1646  */
+#line 22835 "gram.c" /* yacc.c:1646  */
     break;
 
   case 141:
@@ -22842,7 +22839,7 @@
     {
 					(yyval.defelt) = makeDefElem("connectionlimit", (Node *)makeInteger((yyvsp[0].ival)));
 				}
-#line 22846 "gram.c" /* yacc.c:1646  */
+#line 22843 "gram.c" /* yacc.c:1646  */
     break;
 
   case 142:
@@ -22850,7 +22847,7 @@
     {
 					(yyval.defelt) = makeDefElem("validUntil", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 22854 "gram.c" /* yacc.c:1646  */
+#line 22851 "gram.c" /* yacc.c:1646  */
     break;
 
   case 143:
@@ -22858,7 +22855,7 @@
     {
 					(yyval.defelt) = makeDefElem("rolemembers", (Node *)(yyvsp[0].list));
 				}
-#line 22862 "gram.c" /* yacc.c:1646  */
+#line 22859 "gram.c" /* yacc.c:1646  */
     break;
 
   case 144:
@@ -22917,13 +22914,13 @@
 								 errmsg("unrecognized role option \"%s\"", (yyvsp[0].str)),
 									 parser_errposition((yylsp[0]))));
 				}
-#line 22921 "gram.c" /* yacc.c:1646  */
+#line 22918 "gram.c" /* yacc.c:1646  */
     break;
 
   case 145:
 #line 1015 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = (yyvsp[0].defelt); }
-#line 22927 "gram.c" /* yacc.c:1646  */
+#line 22924 "gram.c" /* yacc.c:1646  */
     break;
 
   case 146:
@@ -22931,7 +22928,7 @@
     {
 					(yyval.defelt) = makeDefElem("sysid", (Node *)makeInteger((yyvsp[0].ival)));
 				}
-#line 22935 "gram.c" /* yacc.c:1646  */
+#line 22932 "gram.c" /* yacc.c:1646  */
     break;
 
   case 147:
@@ -22939,7 +22936,7 @@
     {
 					(yyval.defelt) = makeDefElem("adminmembers", (Node *)(yyvsp[0].list));
 				}
-#line 22943 "gram.c" /* yacc.c:1646  */
+#line 22940 "gram.c" /* yacc.c:1646  */
     break;
 
   case 148:
@@ -22947,7 +22944,7 @@
     {
 					(yyval.defelt) = makeDefElem("rolemembers", (Node *)(yyvsp[0].list));
 				}
-#line 22951 "gram.c" /* yacc.c:1646  */
+#line 22948 "gram.c" /* yacc.c:1646  */
     break;
 
   case 149:
@@ -22955,7 +22952,7 @@
     {
 					(yyval.defelt) = makeDefElem("addroleto", (Node *)(yyvsp[0].list));
 				}
-#line 22959 "gram.c" /* yacc.c:1646  */
+#line 22956 "gram.c" /* yacc.c:1646  */
     break;
 
   case 150:
@@ -22963,7 +22960,7 @@
     {
 					(yyval.defelt) = makeDefElem("addroleto", (Node *)(yyvsp[0].list));
 				}
-#line 22967 "gram.c" /* yacc.c:1646  */
+#line 22964 "gram.c" /* yacc.c:1646  */
     break;
 
   case 151:
@@ -22975,7 +22972,7 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 22979 "gram.c" /* yacc.c:1646  */
+#line 22976 "gram.c" /* yacc.c:1646  */
     break;
 
   case 152:
@@ -22987,19 +22984,19 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				 }
-#line 22991 "gram.c" /* yacc.c:1646  */
+#line 22988 "gram.c" /* yacc.c:1646  */
     break;
 
   case 153:
 #line 1076 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 22997 "gram.c" /* yacc.c:1646  */
+#line 22994 "gram.c" /* yacc.c:1646  */
     break;
 
   case 154:
 #line 1077 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 23003 "gram.c" /* yacc.c:1646  */
+#line 23000 "gram.c" /* yacc.c:1646  */
     break;
 
   case 155:
@@ -23011,7 +23008,7 @@
 					n->setstmt = (yyvsp[0].vsetstmt);
 					(yyval.node) = (Node *)n;
 				}
-#line 23015 "gram.c" /* yacc.c:1646  */
+#line 23012 "gram.c" /* yacc.c:1646  */
     break;
 
   case 156:
@@ -23023,7 +23020,7 @@
 					n->setstmt = (yyvsp[0].vsetstmt);
 					(yyval.node) = (Node *)n;
 				}
-#line 23027 "gram.c" /* yacc.c:1646  */
+#line 23024 "gram.c" /* yacc.c:1646  */
     break;
 
   case 157:
@@ -23035,67 +23032,79 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				 }
-#line 23039 "gram.c" /* yacc.c:1646  */
+#line 23036 "gram.c" /* yacc.c:1646  */
     break;
 
   case 158:
 #line 1120 "gram.y" /* yacc.c:1646  */
     {
 					AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
-					n->role = (yyvsp[-1].node);
-					n->database = NULL;
+					n->role = (yyvsp[-2].node);
+					n->database = (yyvsp[-1].str);
 					n->setstmt = (yyvsp[0].vsetstmt);
 					(yyval.node) = (Node *)n;
 				}
-#line 23051 "gram.c" /* yacc.c:1646  */
+#line 23048 "gram.c" /* yacc.c:1646  */
     break;
 
   case 159:
-#line 1141 "gram.y" /* yacc.c:1646  */
+#line 1128 "gram.y" /* yacc.c:1646  */
+    {
+					AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
+					n->role = NULL;
+					n->database = (yyvsp[-1].str);
+					n->setstmt = (yyvsp[0].vsetstmt);
+					(yyval.node) = (Node *)n;
+				}
+#line 23060 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 160:
+#line 1149 "gram.y" /* yacc.c:1646  */
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
 					n->missing_ok = FALSE;
 					n->roles = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 23062 "gram.c" /* yacc.c:1646  */
+#line 23071 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 160:
-#line 1148 "gram.y" /* yacc.c:1646  */
+  case 161:
+#line 1156 "gram.y" /* yacc.c:1646  */
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
 					n->missing_ok = TRUE;
 					n->roles = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 23073 "gram.c" /* yacc.c:1646  */
+#line 23082 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 161:
-#line 1167 "gram.y" /* yacc.c:1646  */
+  case 162:
+#line 1175 "gram.y" /* yacc.c:1646  */
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
 					n->missing_ok = FALSE;
 					n->roles = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 23084 "gram.c" /* yacc.c:1646  */
+#line 23093 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 162:
-#line 1174 "gram.y" /* yacc.c:1646  */
+  case 163:
+#line 1182 "gram.y" /* yacc.c:1646  */
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
 					n->roles = (yyvsp[0].list);
 					n->missing_ok = TRUE;
 					(yyval.node) = (Node *)n;
 				}
-#line 23095 "gram.c" /* yacc.c:1646  */
+#line 23104 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 163:
-#line 1191 "gram.y" /* yacc.c:1646  */
+  case 164:
+#line 1199 "gram.y" /* yacc.c:1646  */
     {
 					CreateRoleStmt *n = makeNode(CreateRoleStmt);
 					n->stmt_type = ROLESTMT_GROUP;
@@ -23103,11 +23112,11 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 23107 "gram.c" /* yacc.c:1646  */
+#line 23116 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 164:
-#line 1209 "gram.y" /* yacc.c:1646  */
+  case 165:
+#line 1217 "gram.y" /* yacc.c:1646  */
     {
 					AlterRoleStmt *n = makeNode(AlterRoleStmt);
 					n->role = (yyvsp[-3].node);
@@ -23116,45 +23125,45 @@
 														(Node *)(yyvsp[0].list)));
 					(yyval.node) = (Node *)n;
 				}
-#line 23120 "gram.c" /* yacc.c:1646  */
+#line 23129 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 165:
-#line 1219 "gram.y" /* yacc.c:1646  */
+  case 166:
+#line 1227 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = +1; }
-#line 23126 "gram.c" /* yacc.c:1646  */
+#line 23135 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 166:
-#line 1220 "gram.y" /* yacc.c:1646  */
+  case 167:
+#line 1228 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = -1; }
-#line 23132 "gram.c" /* yacc.c:1646  */
+#line 23141 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 167:
-#line 1233 "gram.y" /* yacc.c:1646  */
+  case 168:
+#line 1241 "gram.y" /* yacc.c:1646  */
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
 					n->missing_ok = FALSE;
 					n->roles = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 23143 "gram.c" /* yacc.c:1646  */
+#line 23152 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 168:
-#line 1240 "gram.y" /* yacc.c:1646  */
+  case 169:
+#line 1248 "gram.y" /* yacc.c:1646  */
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
 					n->missing_ok = TRUE;
 					n->roles = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 23154 "gram.c" /* yacc.c:1646  */
+#line 23163 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 169:
-#line 1257 "gram.y" /* yacc.c:1646  */
+  case 170:
+#line 1265 "gram.y" /* yacc.c:1646  */
     {
 					CreateSchemaStmt *n = makeNode(CreateSchemaStmt);
 					/* One can omit the schema name or the authorization id. */
@@ -23164,11 +23173,11 @@
 					n->if_not_exists = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 23168 "gram.c" /* yacc.c:1646  */
+#line 23177 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 170:
-#line 1267 "gram.y" /* yacc.c:1646  */
+  case 171:
+#line 1275 "gram.y" /* yacc.c:1646  */
     {
 					CreateSchemaStmt *n = makeNode(CreateSchemaStmt);
 					/* ...but not both */
@@ -23178,11 +23187,11 @@
 					n->if_not_exists = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 23182 "gram.c" /* yacc.c:1646  */
+#line 23191 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 171:
-#line 1277 "gram.y" /* yacc.c:1646  */
+  case 172:
+#line 1285 "gram.y" /* yacc.c:1646  */
     {
 					CreateSchemaStmt *n = makeNode(CreateSchemaStmt);
 					/* schema name can be omitted here, too */
@@ -23197,11 +23206,11 @@
 					n->if_not_exists = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 23201 "gram.c" /* yacc.c:1646  */
+#line 23210 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 172:
-#line 1292 "gram.y" /* yacc.c:1646  */
+  case 173:
+#line 1300 "gram.y" /* yacc.c:1646  */
     {
 					CreateSchemaStmt *n = makeNode(CreateSchemaStmt);
 					/* ...but not here */
@@ -23216,69 +23225,69 @@
 					n->if_not_exists = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 23220 "gram.c" /* yacc.c:1646  */
+#line 23229 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 173:
-#line 1309 "gram.y" /* yacc.c:1646  */
+  case 174:
+#line 1317 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 23226 "gram.c" /* yacc.c:1646  */
+#line 23235 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 174:
-#line 1310 "gram.y" /* yacc.c:1646  */
+  case 175:
+#line 1318 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 23232 "gram.c" /* yacc.c:1646  */
+#line 23241 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 175:
-#line 1315 "gram.y" /* yacc.c:1646  */
+  case 176:
+#line 1323 "gram.y" /* yacc.c:1646  */
     {
 					if ((yyloc) < 0)			/* see comments for YYLLOC_DEFAULT */
 						(yyloc) = (yylsp[0]);
 					(yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].node));
 				}
-#line 23242 "gram.c" /* yacc.c:1646  */
+#line 23251 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 176:
-#line 1321 "gram.y" /* yacc.c:1646  */
+  case 177:
+#line 1329 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 23248 "gram.c" /* yacc.c:1646  */
+#line 23257 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 183:
-#line 1349 "gram.y" /* yacc.c:1646  */
+  case 184:
+#line 1357 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = (yyvsp[0].vsetstmt);
 					n->is_local = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 23258 "gram.c" /* yacc.c:1646  */
+#line 23267 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 184:
-#line 1355 "gram.y" /* yacc.c:1646  */
+  case 185:
+#line 1363 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = (yyvsp[0].vsetstmt);
 					n->is_local = true;
 					(yyval.node) = (Node *) n;
 				}
-#line 23268 "gram.c" /* yacc.c:1646  */
+#line 23277 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 185:
-#line 1361 "gram.y" /* yacc.c:1646  */
+  case 186:
+#line 1369 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = (yyvsp[0].vsetstmt);
 					n->is_local = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 23278 "gram.c" /* yacc.c:1646  */
+#line 23287 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 186:
-#line 1370 "gram.y" /* yacc.c:1646  */
+  case 187:
+#line 1378 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_MULTI;
@@ -23286,11 +23295,11 @@
 					n->args = (yyvsp[0].list);
 					(yyval.vsetstmt) = n;
 				}
-#line 23290 "gram.c" /* yacc.c:1646  */
+#line 23299 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 187:
-#line 1378 "gram.y" /* yacc.c:1646  */
+  case 188:
+#line 1386 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_MULTI;
@@ -23298,11 +23307,11 @@
 					n->args = (yyvsp[0].list);
 					(yyval.vsetstmt) = n;
 				}
-#line 23302 "gram.c" /* yacc.c:1646  */
+#line 23311 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 189:
-#line 1390 "gram.y" /* yacc.c:1646  */
+  case 190:
+#line 1398 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_VALUE;
@@ -23310,11 +23319,11 @@
 					n->args = (yyvsp[0].list);
 					(yyval.vsetstmt) = n;
 				}
-#line 23314 "gram.c" /* yacc.c:1646  */
+#line 23323 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 190:
-#line 1398 "gram.y" /* yacc.c:1646  */
+  case 191:
+#line 1406 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_VALUE;
@@ -23322,50 +23331,50 @@
 					n->args = (yyvsp[0].list);
 					(yyval.vsetstmt) = n;
 				}
-#line 23326 "gram.c" /* yacc.c:1646  */
+#line 23335 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 191:
-#line 1406 "gram.y" /* yacc.c:1646  */
+  case 192:
+#line 1414 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_DEFAULT;
 					n->name = (yyvsp[-2].str);
 					(yyval.vsetstmt) = n;
 				}
-#line 23337 "gram.c" /* yacc.c:1646  */
+#line 23346 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 192:
-#line 1413 "gram.y" /* yacc.c:1646  */
+  case 193:
+#line 1421 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_DEFAULT;
 					n->name = (yyvsp[-2].str);
 					(yyval.vsetstmt) = n;
 				}
-#line 23348 "gram.c" /* yacc.c:1646  */
+#line 23357 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 193:
-#line 1421 "gram.y" /* yacc.c:1646  */
+  case 194:
+#line 1429 "gram.y" /* yacc.c:1646  */
     {(yyval.vsetstmt) = (yyvsp[0].vsetstmt);}
-#line 23354 "gram.c" /* yacc.c:1646  */
+#line 23363 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 194:
-#line 1423 "gram.y" /* yacc.c:1646  */
+  case 195:
+#line 1431 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_CURRENT;
 					n->name = (yyvsp[-2].str);
 					(yyval.vsetstmt) = n;
 				}
-#line 23365 "gram.c" /* yacc.c:1646  */
+#line 23374 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 195:
-#line 1431 "gram.y" /* yacc.c:1646  */
+  case 196:
+#line 1439 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_VALUE;
@@ -23376,11 +23385,11 @@
 						n->kind = VAR_SET_DEFAULT;
 					(yyval.vsetstmt) = n;
 				}
-#line 23380 "gram.c" /* yacc.c:1646  */
+#line 23389 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 196:
-#line 1442 "gram.y" /* yacc.c:1646  */
+  case 197:
+#line 1450 "gram.y" /* yacc.c:1646  */
     {
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -23388,11 +23397,11 @@
 							 parser_errposition((yylsp[0]))));
 					(yyval.vsetstmt) = NULL; /*not reached*/
 				}
-#line 23392 "gram.c" /* yacc.c:1646  */
+#line 23401 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 197:
-#line 1450 "gram.y" /* yacc.c:1646  */
+  case 198:
+#line 1458 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_VALUE;
@@ -23400,11 +23409,11 @@
 					n->args = list_make1(makeStringConst((yyvsp[0].str), (yylsp[0])));
 					(yyval.vsetstmt) = n;
 				}
-#line 23404 "gram.c" /* yacc.c:1646  */
+#line 23413 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 198:
-#line 1458 "gram.y" /* yacc.c:1646  */
+  case 199:
+#line 1466 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_VALUE;
@@ -23415,11 +23424,11 @@
 						n->kind = VAR_SET_DEFAULT;
 					(yyval.vsetstmt) = n;
 				}
-#line 23419 "gram.c" /* yacc.c:1646  */
+#line 23428 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 199:
-#line 1469 "gram.y" /* yacc.c:1646  */
+  case 200:
+#line 1477 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_VALUE;
@@ -23427,11 +23436,11 @@
 					n->args = list_make1(makeStringConst((yyvsp[0].str), (yylsp[0])));
 					(yyval.vsetstmt) = n;
 				}
-#line 23431 "gram.c" /* yacc.c:1646  */
+#line 23440 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 200:
-#line 1477 "gram.y" /* yacc.c:1646  */
+  case 201:
+#line 1485 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_VALUE;
@@ -23439,22 +23448,22 @@
 					n->args = list_make1(makeStringConst((yyvsp[0].str), (yylsp[0])));
 					(yyval.vsetstmt) = n;
 				}
-#line 23443 "gram.c" /* yacc.c:1646  */
+#line 23452 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 201:
-#line 1485 "gram.y" /* yacc.c:1646  */
+  case 202:
+#line 1493 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_DEFAULT;
 					n->name = "session_authorization";
 					(yyval.vsetstmt) = n;
 				}
-#line 23454 "gram.c" /* yacc.c:1646  */
+#line 23463 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 202:
-#line 1492 "gram.y" /* yacc.c:1646  */
+  case 203:
+#line 1500 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_VALUE;
@@ -23462,11 +23471,11 @@
 					n->args = list_make1(makeStringConst((yyvsp[0].ival) == XMLOPTION_DOCUMENT ? "DOCUMENT" : "CONTENT", (yylsp[0])));
 					(yyval.vsetstmt) = n;
 				}
-#line 23466 "gram.c" /* yacc.c:1646  */
+#line 23475 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 203:
-#line 1501 "gram.y" /* yacc.c:1646  */
+  case 204:
+#line 1509 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_SET_MULTI;
@@ -23474,111 +23483,111 @@
 					n->args = list_make1(makeStringConst((yyvsp[0].str), (yylsp[0])));
 					(yyval.vsetstmt) = n;
 				}
-#line 23478 "gram.c" /* yacc.c:1646  */
+#line 23487 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 204:
-#line 1510 "gram.y" /* yacc.c:1646  */
+  case 205:
+#line 1518 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 23484 "gram.c" /* yacc.c:1646  */
+#line 23493 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 205:
-#line 1512 "gram.y" /* yacc.c:1646  */
+  case 206:
+#line 1520 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = psprintf("%s.%s", (yyvsp[-2].str), (yyvsp[0].str)); }
-#line 23490 "gram.c" /* yacc.c:1646  */
+#line 23499 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 206:
-#line 1515 "gram.y" /* yacc.c:1646  */
+  case 207:
+#line 1523 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 23496 "gram.c" /* yacc.c:1646  */
+#line 23505 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 207:
-#line 1516 "gram.y" /* yacc.c:1646  */
+  case 208:
+#line 1524 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 23502 "gram.c" /* yacc.c:1646  */
+#line 23511 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 208:
-#line 1520 "gram.y" /* yacc.c:1646  */
+  case 209:
+#line 1528 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeStringConst((yyvsp[0].str), (yylsp[0])); }
-#line 23508 "gram.c" /* yacc.c:1646  */
+#line 23517 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 209:
-#line 1522 "gram.y" /* yacc.c:1646  */
+  case 210:
+#line 1530 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeAConst((yyvsp[0].value), (yylsp[0])); }
-#line 23514 "gram.c" /* yacc.c:1646  */
+#line 23523 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 210:
-#line 1525 "gram.y" /* yacc.c:1646  */
+  case 211:
+#line 1533 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "read uncommitted"; }
-#line 23520 "gram.c" /* yacc.c:1646  */
+#line 23529 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 211:
-#line 1526 "gram.y" /* yacc.c:1646  */
+  case 212:
+#line 1534 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "read committed"; }
-#line 23526 "gram.c" /* yacc.c:1646  */
+#line 23535 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 212:
-#line 1527 "gram.y" /* yacc.c:1646  */
+  case 213:
+#line 1535 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "repeatable read"; }
-#line 23532 "gram.c" /* yacc.c:1646  */
+#line 23541 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 213:
-#line 1528 "gram.y" /* yacc.c:1646  */
+  case 214:
+#line 1536 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "serializable"; }
-#line 23538 "gram.c" /* yacc.c:1646  */
+#line 23547 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 214:
-#line 1532 "gram.y" /* yacc.c:1646  */
+  case 215:
+#line 1540 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "true"; }
-#line 23544 "gram.c" /* yacc.c:1646  */
+#line 23553 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 215:
-#line 1533 "gram.y" /* yacc.c:1646  */
+  case 216:
+#line 1541 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "false"; }
-#line 23550 "gram.c" /* yacc.c:1646  */
+#line 23559 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 216:
-#line 1534 "gram.y" /* yacc.c:1646  */
+  case 217:
+#line 1542 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "on"; }
-#line 23556 "gram.c" /* yacc.c:1646  */
+#line 23565 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 217:
-#line 1540 "gram.y" /* yacc.c:1646  */
+  case 218:
+#line 1548 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 23562 "gram.c" /* yacc.c:1646  */
+#line 23571 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 218:
-#line 1553 "gram.y" /* yacc.c:1646  */
+  case 219:
+#line 1561 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeStringConst((yyvsp[0].str), (yylsp[0]));
 				}
-#line 23570 "gram.c" /* yacc.c:1646  */
+#line 23579 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 219:
-#line 1557 "gram.y" /* yacc.c:1646  */
+  case 220:
+#line 1565 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeStringConst((yyvsp[0].str), (yylsp[0]));
 				}
-#line 23578 "gram.c" /* yacc.c:1646  */
+#line 23587 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 220:
-#line 1561 "gram.y" /* yacc.c:1646  */
+  case 221:
+#line 1569 "gram.y" /* yacc.c:1646  */
     {
 					TypeName *t = (yyvsp[-2].typnam);
 					if ((yyvsp[0].list) != NIL)
@@ -23593,304 +23602,304 @@
 					t->typmods = (yyvsp[0].list);
 					(yyval.node) = makeStringConstCast((yyvsp[-1].str), (yylsp[-1]), t);
 				}
-#line 23597 "gram.c" /* yacc.c:1646  */
+#line 23606 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 221:
-#line 1576 "gram.y" /* yacc.c:1646  */
+  case 222:
+#line 1584 "gram.y" /* yacc.c:1646  */
     {
 					TypeName *t = (yyvsp[-4].typnam);
 					t->typmods = list_make2(makeIntConst(INTERVAL_FULL_RANGE, -1),
 											makeIntConst((yyvsp[-2].ival), (yylsp[-2])));
 					(yyval.node) = makeStringConstCast((yyvsp[0].str), (yylsp[0]), t);
 				}
-#line 23608 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 222:
-#line 1582 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = makeAConst((yyvsp[0].value), (yylsp[0])); }
-#line 23614 "gram.c" /* yacc.c:1646  */
+#line 23617 "gram.c" /* yacc.c:1646  */
     break;
 
   case 223:
-#line 1583 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = NULL; }
-#line 23620 "gram.c" /* yacc.c:1646  */
+#line 1590 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = makeAConst((yyvsp[0].value), (yylsp[0])); }
+#line 23623 "gram.c" /* yacc.c:1646  */
     break;
 
   case 224:
-#line 1584 "gram.y" /* yacc.c:1646  */
+#line 1591 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 23626 "gram.c" /* yacc.c:1646  */
+#line 23629 "gram.c" /* yacc.c:1646  */
     break;
 
   case 225:
-#line 1588 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 23632 "gram.c" /* yacc.c:1646  */
+#line 1592 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = NULL; }
+#line 23635 "gram.c" /* yacc.c:1646  */
     break;
 
   case 226:
-#line 1589 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = NULL; }
-#line 23638 "gram.c" /* yacc.c:1646  */
+#line 1596 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 23641 "gram.c" /* yacc.c:1646  */
     break;
 
   case 227:
-#line 1590 "gram.y" /* yacc.c:1646  */
+#line 1597 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 23644 "gram.c" /* yacc.c:1646  */
+#line 23647 "gram.c" /* yacc.c:1646  */
     break;
 
   case 228:
-#line 1594 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 23650 "gram.c" /* yacc.c:1646  */
+#line 1598 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = NULL; }
+#line 23653 "gram.c" /* yacc.c:1646  */
     break;
 
   case 229:
-#line 1595 "gram.y" /* yacc.c:1646  */
+#line 1602 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 23656 "gram.c" /* yacc.c:1646  */
+#line 23659 "gram.c" /* yacc.c:1646  */
     break;
 
   case 230:
-#line 1599 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = (Node *) (yyvsp[0].vsetstmt); }
-#line 23662 "gram.c" /* yacc.c:1646  */
+#line 1603 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 23665 "gram.c" /* yacc.c:1646  */
     break;
 
   case 231:
-#line 1603 "gram.y" /* yacc.c:1646  */
-    { (yyval.vsetstmt) = (yyvsp[0].vsetstmt); }
-#line 23668 "gram.c" /* yacc.c:1646  */
+#line 1607 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = (Node *) (yyvsp[0].vsetstmt); }
+#line 23671 "gram.c" /* yacc.c:1646  */
     break;
 
   case 232:
-#line 1605 "gram.y" /* yacc.c:1646  */
+#line 1611 "gram.y" /* yacc.c:1646  */
+    { (yyval.vsetstmt) = (yyvsp[0].vsetstmt); }
+#line 23677 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 233:
+#line 1613 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_RESET;
 					n->name = "timezone";
 					(yyval.vsetstmt) = n;
 				}
-#line 23679 "gram.c" /* yacc.c:1646  */
+#line 23688 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 233:
-#line 1612 "gram.y" /* yacc.c:1646  */
+  case 234:
+#line 1620 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_RESET;
 					n->name = "transaction_isolation";
 					(yyval.vsetstmt) = n;
 				}
-#line 23690 "gram.c" /* yacc.c:1646  */
+#line 23699 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 234:
-#line 1619 "gram.y" /* yacc.c:1646  */
+  case 235:
+#line 1627 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_RESET;
 					n->name = "session_authorization";
 					(yyval.vsetstmt) = n;
 				}
-#line 23701 "gram.c" /* yacc.c:1646  */
+#line 23710 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 235:
-#line 1629 "gram.y" /* yacc.c:1646  */
+  case 236:
+#line 1637 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_RESET;
 					n->name = (yyvsp[0].str);
 					(yyval.vsetstmt) = n;
 				}
-#line 23712 "gram.c" /* yacc.c:1646  */
+#line 23721 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 236:
-#line 1636 "gram.y" /* yacc.c:1646  */
+  case 237:
+#line 1644 "gram.y" /* yacc.c:1646  */
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->kind = VAR_RESET_ALL;
 					(yyval.vsetstmt) = n;
 				}
-#line 23722 "gram.c" /* yacc.c:1646  */
+#line 23731 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 237:
-#line 1645 "gram.y" /* yacc.c:1646  */
+  case 238:
+#line 1653 "gram.y" /* yacc.c:1646  */
     { (yyval.vsetstmt) = (yyvsp[0].vsetstmt); }
-#line 23728 "gram.c" /* yacc.c:1646  */
+#line 23737 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 238:
-#line 1646 "gram.y" /* yacc.c:1646  */
+  case 239:
+#line 1654 "gram.y" /* yacc.c:1646  */
     { (yyval.vsetstmt) = (VariableSetStmt *) (yyvsp[0].node); }
-#line 23734 "gram.c" /* yacc.c:1646  */
+#line 23743 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 239:
-#line 1651 "gram.y" /* yacc.c:1646  */
+  case 240:
+#line 1659 "gram.y" /* yacc.c:1646  */
     { (yyval.vsetstmt) = (yyvsp[0].vsetstmt); }
-#line 23740 "gram.c" /* yacc.c:1646  */
+#line 23749 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 240:
-#line 1652 "gram.y" /* yacc.c:1646  */
+  case 241:
+#line 1660 "gram.y" /* yacc.c:1646  */
     { (yyval.vsetstmt) = (VariableSetStmt *) (yyvsp[0].node); }
-#line 23746 "gram.c" /* yacc.c:1646  */
+#line 23755 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 241:
-#line 1658 "gram.y" /* yacc.c:1646  */
+  case 242:
+#line 1666 "gram.y" /* yacc.c:1646  */
     {
 					VariableShowStmt *n = makeNode(VariableShowStmt);
 					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 23756 "gram.c" /* yacc.c:1646  */
+#line 23765 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 242:
-#line 1664 "gram.y" /* yacc.c:1646  */
+  case 243:
+#line 1672 "gram.y" /* yacc.c:1646  */
     {
 					VariableShowStmt *n = makeNode(VariableShowStmt);
 					n->name = "timezone";
 					(yyval.node) = (Node *) n;
 				}
-#line 23766 "gram.c" /* yacc.c:1646  */
+#line 23775 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 243:
-#line 1670 "gram.y" /* yacc.c:1646  */
+  case 244:
+#line 1678 "gram.y" /* yacc.c:1646  */
     {
 					VariableShowStmt *n = makeNode(VariableShowStmt);
 					n->name = "transaction_isolation";
 					(yyval.node) = (Node *) n;
 				}
-#line 23776 "gram.c" /* yacc.c:1646  */
+#line 23785 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 244:
-#line 1676 "gram.y" /* yacc.c:1646  */
+  case 245:
+#line 1684 "gram.y" /* yacc.c:1646  */
     {
 					VariableShowStmt *n = makeNode(VariableShowStmt);
 					n->name = "session_authorization";
 					(yyval.node) = (Node *) n;
 				}
-#line 23786 "gram.c" /* yacc.c:1646  */
+#line 23795 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 245:
-#line 1682 "gram.y" /* yacc.c:1646  */
+  case 246:
+#line 1690 "gram.y" /* yacc.c:1646  */
     {
 					VariableShowStmt *n = makeNode(VariableShowStmt);
 					n->name = "all";
 					(yyval.node) = (Node *) n;
 				}
-#line 23796 "gram.c" /* yacc.c:1646  */
+#line 23805 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 246:
-#line 1692 "gram.y" /* yacc.c:1646  */
+  case 247:
+#line 1700 "gram.y" /* yacc.c:1646  */
     {
 					ConstraintsSetStmt *n = makeNode(ConstraintsSetStmt);
 					n->constraints = (yyvsp[-1].list);
 					n->deferred = (yyvsp[0].boolean);
 					(yyval.node) = (Node *) n;
 				}
-#line 23807 "gram.c" /* yacc.c:1646  */
+#line 23816 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 247:
-#line 1701 "gram.y" /* yacc.c:1646  */
+  case 248:
+#line 1709 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 23813 "gram.c" /* yacc.c:1646  */
+#line 23822 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 248:
-#line 1702 "gram.y" /* yacc.c:1646  */
+  case 249:
+#line 1710 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 23819 "gram.c" /* yacc.c:1646  */
+#line 23828 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 249:
-#line 1706 "gram.y" /* yacc.c:1646  */
+  case 250:
+#line 1714 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 23825 "gram.c" /* yacc.c:1646  */
+#line 23834 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 250:
-#line 1707 "gram.y" /* yacc.c:1646  */
+  case 251:
+#line 1715 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 23831 "gram.c" /* yacc.c:1646  */
+#line 23840 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 251:
-#line 1716 "gram.y" /* yacc.c:1646  */
+  case 252:
+#line 1724 "gram.y" /* yacc.c:1646  */
     {
 					CheckPointStmt *n = makeNode(CheckPointStmt);
 					(yyval.node) = (Node *)n;
 				}
-#line 23840 "gram.c" /* yacc.c:1646  */
+#line 23849 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 252:
-#line 1731 "gram.y" /* yacc.c:1646  */
+  case 253:
+#line 1739 "gram.y" /* yacc.c:1646  */
     {
 					DiscardStmt *n = makeNode(DiscardStmt);
 					n->target = DISCARD_ALL;
 					(yyval.node) = (Node *) n;
 				}
-#line 23850 "gram.c" /* yacc.c:1646  */
+#line 23859 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 253:
-#line 1737 "gram.y" /* yacc.c:1646  */
+  case 254:
+#line 1745 "gram.y" /* yacc.c:1646  */
     {
 					DiscardStmt *n = makeNode(DiscardStmt);
 					n->target = DISCARD_TEMP;
 					(yyval.node) = (Node *) n;
 				}
-#line 23860 "gram.c" /* yacc.c:1646  */
+#line 23869 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 254:
-#line 1743 "gram.y" /* yacc.c:1646  */
+  case 255:
+#line 1751 "gram.y" /* yacc.c:1646  */
     {
 					DiscardStmt *n = makeNode(DiscardStmt);
 					n->target = DISCARD_TEMP;
 					(yyval.node) = (Node *) n;
 				}
-#line 23870 "gram.c" /* yacc.c:1646  */
+#line 23879 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 255:
-#line 1749 "gram.y" /* yacc.c:1646  */
+  case 256:
+#line 1757 "gram.y" /* yacc.c:1646  */
     {
 					DiscardStmt *n = makeNode(DiscardStmt);
 					n->target = DISCARD_PLANS;
 					(yyval.node) = (Node *) n;
 				}
-#line 23880 "gram.c" /* yacc.c:1646  */
+#line 23889 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 256:
-#line 1755 "gram.y" /* yacc.c:1646  */
+  case 257:
+#line 1763 "gram.y" /* yacc.c:1646  */
     {
 					DiscardStmt *n = makeNode(DiscardStmt);
 					n->target = DISCARD_SEQUENCES;
 					(yyval.node) = (Node *) n;
 				}
-#line 23890 "gram.c" /* yacc.c:1646  */
+#line 23899 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 257:
-#line 1774 "gram.y" /* yacc.c:1646  */
+  case 258:
+#line 1782 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -23899,11 +23908,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 23903 "gram.c" /* yacc.c:1646  */
+#line 23912 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 258:
-#line 1783 "gram.y" /* yacc.c:1646  */
+  case 259:
+#line 1791 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -23912,11 +23921,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 23916 "gram.c" /* yacc.c:1646  */
+#line 23925 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 259:
-#line 1792 "gram.y" /* yacc.c:1646  */
+  case 260:
+#line 1800 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableMoveAllStmt *n =
 						makeNode(AlterTableMoveAllStmt);
@@ -23927,11 +23936,11 @@
 					n->nowait = (yyvsp[0].boolean);
 					(yyval.node) = (Node *)n;
 				}
-#line 23931 "gram.c" /* yacc.c:1646  */
+#line 23940 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 260:
-#line 1803 "gram.y" /* yacc.c:1646  */
+  case 261:
+#line 1811 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableMoveAllStmt *n =
 						makeNode(AlterTableMoveAllStmt);
@@ -23942,11 +23951,11 @@
 					n->nowait = (yyvsp[0].boolean);
 					(yyval.node) = (Node *)n;
 				}
-#line 23946 "gram.c" /* yacc.c:1646  */
+#line 23955 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 261:
-#line 1814 "gram.y" /* yacc.c:1646  */
+  case 262:
+#line 1822 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -23955,11 +23964,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 23959 "gram.c" /* yacc.c:1646  */
+#line 23968 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 262:
-#line 1823 "gram.y" /* yacc.c:1646  */
+  case 263:
+#line 1831 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -23968,11 +23977,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 23972 "gram.c" /* yacc.c:1646  */
+#line 23981 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 263:
-#line 1832 "gram.y" /* yacc.c:1646  */
+  case 264:
+#line 1840 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableMoveAllStmt *n =
 						makeNode(AlterTableMoveAllStmt);
@@ -23983,11 +23992,11 @@
 					n->nowait = (yyvsp[0].boolean);
 					(yyval.node) = (Node *)n;
 				}
-#line 23987 "gram.c" /* yacc.c:1646  */
+#line 23996 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 264:
-#line 1843 "gram.y" /* yacc.c:1646  */
+  case 265:
+#line 1851 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableMoveAllStmt *n =
 						makeNode(AlterTableMoveAllStmt);
@@ -23998,11 +24007,11 @@
 					n->nowait = (yyvsp[0].boolean);
 					(yyval.node) = (Node *)n;
 				}
-#line 24002 "gram.c" /* yacc.c:1646  */
+#line 24011 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 265:
-#line 1854 "gram.y" /* yacc.c:1646  */
+  case 266:
+#line 1862 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -24011,11 +24020,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 24015 "gram.c" /* yacc.c:1646  */
+#line 24024 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 266:
-#line 1863 "gram.y" /* yacc.c:1646  */
+  case 267:
+#line 1871 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -24024,11 +24033,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 24028 "gram.c" /* yacc.c:1646  */
+#line 24037 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 267:
-#line 1872 "gram.y" /* yacc.c:1646  */
+  case 268:
+#line 1880 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -24037,11 +24046,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 24041 "gram.c" /* yacc.c:1646  */
+#line 24050 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 268:
-#line 1881 "gram.y" /* yacc.c:1646  */
+  case 269:
+#line 1889 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -24050,11 +24059,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 24054 "gram.c" /* yacc.c:1646  */
+#line 24063 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 269:
-#line 1890 "gram.y" /* yacc.c:1646  */
+  case 270:
+#line 1898 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -24063,11 +24072,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 24067 "gram.c" /* yacc.c:1646  */
+#line 24076 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 270:
-#line 1899 "gram.y" /* yacc.c:1646  */
+  case 271:
+#line 1907 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -24076,11 +24085,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 24080 "gram.c" /* yacc.c:1646  */
+#line 24089 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 271:
-#line 1908 "gram.y" /* yacc.c:1646  */
+  case 272:
+#line 1916 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableMoveAllStmt *n =
 						makeNode(AlterTableMoveAllStmt);
@@ -24091,11 +24100,11 @@
 					n->nowait = (yyvsp[0].boolean);
 					(yyval.node) = (Node *)n;
 				}
-#line 24095 "gram.c" /* yacc.c:1646  */
+#line 24104 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 272:
-#line 1919 "gram.y" /* yacc.c:1646  */
+  case 273:
+#line 1927 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableMoveAllStmt *n =
 						makeNode(AlterTableMoveAllStmt);
@@ -24106,45 +24115,45 @@
 					n->nowait = (yyvsp[0].boolean);
 					(yyval.node) = (Node *)n;
 				}
-#line 24110 "gram.c" /* yacc.c:1646  */
+#line 24119 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 273:
-#line 1932 "gram.y" /* yacc.c:1646  */
+  case 274:
+#line 1940 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 24116 "gram.c" /* yacc.c:1646  */
+#line 24125 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 274:
-#line 1933 "gram.y" /* yacc.c:1646  */
+  case 275:
+#line 1941 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 24122 "gram.c" /* yacc.c:1646  */
+#line 24131 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 275:
-#line 1939 "gram.y" /* yacc.c:1646  */
+  case 276:
+#line 1947 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_AddColumn;
 					n->def = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 24133 "gram.c" /* yacc.c:1646  */
+#line 24142 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 276:
-#line 1947 "gram.y" /* yacc.c:1646  */
+  case 277:
+#line 1955 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_AddColumn;
 					n->def = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 24144 "gram.c" /* yacc.c:1646  */
+#line 24153 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 277:
-#line 1955 "gram.y" /* yacc.c:1646  */
+  case 278:
+#line 1963 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_ColumnDefault;
@@ -24152,33 +24161,33 @@
 					n->def = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 24156 "gram.c" /* yacc.c:1646  */
+#line 24165 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 278:
-#line 1964 "gram.y" /* yacc.c:1646  */
+  case 279:
+#line 1972 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DropNotNull;
 					n->name = (yyvsp[-3].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24167 "gram.c" /* yacc.c:1646  */
+#line 24176 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 279:
-#line 1972 "gram.y" /* yacc.c:1646  */
+  case 280:
+#line 1980 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_SetNotNull;
 					n->name = (yyvsp[-3].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24178 "gram.c" /* yacc.c:1646  */
+#line 24187 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 280:
-#line 1980 "gram.y" /* yacc.c:1646  */
+  case 281:
+#line 1988 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_SetStatistics;
@@ -24186,11 +24195,11 @@
 					n->def = (Node *) makeInteger((yyvsp[0].ival));
 					(yyval.node) = (Node *)n;
 				}
-#line 24190 "gram.c" /* yacc.c:1646  */
+#line 24199 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 281:
-#line 1989 "gram.y" /* yacc.c:1646  */
+  case 282:
+#line 1997 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_SetOptions;
@@ -24198,11 +24207,11 @@
 					n->def = (Node *) (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 24202 "gram.c" /* yacc.c:1646  */
+#line 24211 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 282:
-#line 1998 "gram.y" /* yacc.c:1646  */
+  case 283:
+#line 2006 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_ResetOptions;
@@ -24210,11 +24219,11 @@
 					n->def = (Node *) (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 24214 "gram.c" /* yacc.c:1646  */
+#line 24223 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 283:
-#line 2007 "gram.y" /* yacc.c:1646  */
+  case 284:
+#line 2015 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_SetStorage;
@@ -24222,11 +24231,11 @@
 					n->def = (Node *) makeString((yyvsp[0].str));
 					(yyval.node) = (Node *)n;
 				}
-#line 24226 "gram.c" /* yacc.c:1646  */
+#line 24235 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 284:
-#line 2016 "gram.y" /* yacc.c:1646  */
+  case 285:
+#line 2024 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DropColumn;
@@ -24235,11 +24244,11 @@
 					n->missing_ok = TRUE;
 					(yyval.node) = (Node *)n;
 				}
-#line 24239 "gram.c" /* yacc.c:1646  */
+#line 24248 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 285:
-#line 2026 "gram.y" /* yacc.c:1646  */
+  case 286:
+#line 2034 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DropColumn;
@@ -24248,11 +24257,11 @@
 					n->missing_ok = FALSE;
 					(yyval.node) = (Node *)n;
 				}
-#line 24252 "gram.c" /* yacc.c:1646  */
+#line 24261 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 286:
-#line 2039 "gram.y" /* yacc.c:1646  */
+  case 287:
+#line 2047 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					ColumnDef *def = makeNode(ColumnDef);
@@ -24266,11 +24275,11 @@
 					def->location = (yylsp[-5]);
 					(yyval.node) = (Node *)n;
 				}
-#line 24270 "gram.c" /* yacc.c:1646  */
+#line 24279 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 287:
-#line 2054 "gram.y" /* yacc.c:1646  */
+  case 288:
+#line 2062 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_AlterColumnGenericOptions;
@@ -24278,22 +24287,22 @@
 					n->def = (Node *) (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 24282 "gram.c" /* yacc.c:1646  */
+#line 24291 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 288:
-#line 2063 "gram.y" /* yacc.c:1646  */
+  case 289:
+#line 2071 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_AddConstraint;
 					n->def = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 24293 "gram.c" /* yacc.c:1646  */
+#line 24302 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 289:
-#line 2071 "gram.y" /* yacc.c:1646  */
+  case 290:
+#line 2079 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					Constraint *c = makeNode(Constraint);
@@ -24307,22 +24316,22 @@
 									NULL, NULL, yyscanner);
 					(yyval.node) = (Node *)n;
 				}
-#line 24311 "gram.c" /* yacc.c:1646  */
+#line 24320 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 290:
-#line 2086 "gram.y" /* yacc.c:1646  */
+  case 291:
+#line 2094 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_ValidateConstraint;
 					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24322 "gram.c" /* yacc.c:1646  */
+#line 24331 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 291:
-#line 2094 "gram.y" /* yacc.c:1646  */
+  case 292:
+#line 2102 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DropConstraint;
@@ -24331,11 +24340,11 @@
 					n->missing_ok = TRUE;
 					(yyval.node) = (Node *)n;
 				}
-#line 24335 "gram.c" /* yacc.c:1646  */
+#line 24344 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 292:
-#line 2104 "gram.y" /* yacc.c:1646  */
+  case 293:
+#line 2112 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DropConstraint;
@@ -24344,223 +24353,223 @@
 					n->missing_ok = FALSE;
 					(yyval.node) = (Node *)n;
 				}
-#line 24348 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 293:
-#line 2114 "gram.y" /* yacc.c:1646  */
-    {
-					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_AddOids;
-					(yyval.node) = (Node *)n;
-				}
-#line 24358 "gram.c" /* yacc.c:1646  */
+#line 24357 "gram.c" /* yacc.c:1646  */
     break;
 
   case 294:
-#line 2121 "gram.y" /* yacc.c:1646  */
+#line 2122 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_DropOids;
+					n->subtype = AT_AddOids;
 					(yyval.node) = (Node *)n;
 				}
-#line 24368 "gram.c" /* yacc.c:1646  */
+#line 24367 "gram.c" /* yacc.c:1646  */
     break;
 
   case 295:
-#line 2128 "gram.y" /* yacc.c:1646  */
+#line 2129 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_ClusterOn;
-					n->name = (yyvsp[0].str);
+					n->subtype = AT_DropOids;
 					(yyval.node) = (Node *)n;
 				}
-#line 24379 "gram.c" /* yacc.c:1646  */
+#line 24377 "gram.c" /* yacc.c:1646  */
     break;
 
   case 296:
 #line 2136 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_DropCluster;
-					n->name = NULL;
+					n->subtype = AT_ClusterOn;
+					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24390 "gram.c" /* yacc.c:1646  */
+#line 24388 "gram.c" /* yacc.c:1646  */
     break;
 
   case 297:
 #line 2144 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_SetLogged;
+					n->subtype = AT_DropCluster;
+					n->name = NULL;
 					(yyval.node) = (Node *)n;
 				}
-#line 24400 "gram.c" /* yacc.c:1646  */
+#line 24399 "gram.c" /* yacc.c:1646  */
     break;
 
   case 298:
-#line 2151 "gram.y" /* yacc.c:1646  */
+#line 2152 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_SetUnLogged;
+					n->subtype = AT_SetLogged;
 					(yyval.node) = (Node *)n;
 				}
-#line 24410 "gram.c" /* yacc.c:1646  */
+#line 24409 "gram.c" /* yacc.c:1646  */
     break;
 
   case 299:
-#line 2158 "gram.y" /* yacc.c:1646  */
+#line 2159 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_EnableTrig;
-					n->name = (yyvsp[0].str);
+					n->subtype = AT_SetUnLogged;
 					(yyval.node) = (Node *)n;
 				}
-#line 24421 "gram.c" /* yacc.c:1646  */
+#line 24419 "gram.c" /* yacc.c:1646  */
     break;
 
   case 300:
 #line 2166 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_EnableAlwaysTrig;
+					n->subtype = AT_EnableTrig;
 					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24432 "gram.c" /* yacc.c:1646  */
+#line 24430 "gram.c" /* yacc.c:1646  */
     break;
 
   case 301:
 #line 2174 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_EnableReplicaTrig;
+					n->subtype = AT_EnableAlwaysTrig;
 					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24443 "gram.c" /* yacc.c:1646  */
+#line 24441 "gram.c" /* yacc.c:1646  */
     break;
 
   case 302:
 #line 2182 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_EnableTrigAll;
+					n->subtype = AT_EnableReplicaTrig;
+					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24453 "gram.c" /* yacc.c:1646  */
+#line 24452 "gram.c" /* yacc.c:1646  */
     break;
 
   case 303:
-#line 2189 "gram.y" /* yacc.c:1646  */
+#line 2190 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_EnableTrigUser;
+					n->subtype = AT_EnableTrigAll;
 					(yyval.node) = (Node *)n;
 				}
-#line 24463 "gram.c" /* yacc.c:1646  */
+#line 24462 "gram.c" /* yacc.c:1646  */
     break;
 
   case 304:
-#line 2196 "gram.y" /* yacc.c:1646  */
+#line 2197 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_DisableTrig;
-					n->name = (yyvsp[0].str);
+					n->subtype = AT_EnableTrigUser;
 					(yyval.node) = (Node *)n;
 				}
-#line 24474 "gram.c" /* yacc.c:1646  */
+#line 24472 "gram.c" /* yacc.c:1646  */
     break;
 
   case 305:
 #line 2204 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_DisableTrigAll;
+					n->subtype = AT_DisableTrig;
+					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24484 "gram.c" /* yacc.c:1646  */
+#line 24483 "gram.c" /* yacc.c:1646  */
     break;
 
   case 306:
-#line 2211 "gram.y" /* yacc.c:1646  */
+#line 2212 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_DisableTrigUser;
+					n->subtype = AT_DisableTrigAll;
 					(yyval.node) = (Node *)n;
 				}
-#line 24494 "gram.c" /* yacc.c:1646  */
+#line 24493 "gram.c" /* yacc.c:1646  */
     break;
 
   case 307:
-#line 2218 "gram.y" /* yacc.c:1646  */
+#line 2219 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_EnableRule;
-					n->name = (yyvsp[0].str);
+					n->subtype = AT_DisableTrigUser;
 					(yyval.node) = (Node *)n;
 				}
-#line 24505 "gram.c" /* yacc.c:1646  */
+#line 24503 "gram.c" /* yacc.c:1646  */
     break;
 
   case 308:
 #line 2226 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_EnableAlwaysRule;
+					n->subtype = AT_EnableRule;
 					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24516 "gram.c" /* yacc.c:1646  */
+#line 24514 "gram.c" /* yacc.c:1646  */
     break;
 
   case 309:
 #line 2234 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_EnableReplicaRule;
+					n->subtype = AT_EnableAlwaysRule;
 					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24527 "gram.c" /* yacc.c:1646  */
+#line 24525 "gram.c" /* yacc.c:1646  */
     break;
 
   case 310:
 #line 2242 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_DisableRule;
+					n->subtype = AT_EnableReplicaRule;
 					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24538 "gram.c" /* yacc.c:1646  */
+#line 24536 "gram.c" /* yacc.c:1646  */
     break;
 
   case 311:
 #line 2250 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_AddInherit;
-					n->def = (Node *) (yyvsp[0].range);
+					n->subtype = AT_DisableRule;
+					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24549 "gram.c" /* yacc.c:1646  */
+#line 24547 "gram.c" /* yacc.c:1646  */
     break;
 
   case 312:
 #line 2258 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
+					n->subtype = AT_AddInherit;
+					n->def = (Node *) (yyvsp[0].range);
+					(yyval.node) = (Node *)n;
+				}
+#line 24558 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 313:
+#line 2266 "gram.y" /* yacc.c:1646  */
+    {
+					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DropInherit;
 					n->def = (Node *) (yyvsp[0].range);
 					(yyval.node) = (Node *)n;
 				}
-#line 24560 "gram.c" /* yacc.c:1646  */
+#line 24569 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 313:
-#line 2266 "gram.y" /* yacc.c:1646  */
+  case 314:
+#line 2274 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					TypeName *def = makeTypeNameFromNameList((yyvsp[0].list));
@@ -24569,157 +24578,157 @@
 					n->def = (Node *) def;
 					(yyval.node) = (Node *)n;
 				}
-#line 24573 "gram.c" /* yacc.c:1646  */
+#line 24582 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 314:
-#line 2276 "gram.y" /* yacc.c:1646  */
+  case 315:
+#line 2284 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DropOf;
 					(yyval.node) = (Node *)n;
 				}
-#line 24583 "gram.c" /* yacc.c:1646  */
+#line 24592 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 315:
-#line 2283 "gram.y" /* yacc.c:1646  */
+  case 316:
+#line 2291 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_ChangeOwner;
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 24594 "gram.c" /* yacc.c:1646  */
+#line 24603 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 316:
-#line 2291 "gram.y" /* yacc.c:1646  */
+  case 317:
+#line 2299 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_SetTableSpace;
 					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24605 "gram.c" /* yacc.c:1646  */
+#line 24614 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 317:
-#line 2299 "gram.y" /* yacc.c:1646  */
+  case 318:
+#line 2307 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_SetRelOptions;
 					n->def = (Node *)(yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 24616 "gram.c" /* yacc.c:1646  */
+#line 24625 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 318:
-#line 2307 "gram.y" /* yacc.c:1646  */
+  case 319:
+#line 2315 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_ResetRelOptions;
 					n->def = (Node *)(yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 24627 "gram.c" /* yacc.c:1646  */
+#line 24636 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 319:
-#line 2315 "gram.y" /* yacc.c:1646  */
+  case 320:
+#line 2323 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_ReplicaIdentity;
 					n->def = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 24638 "gram.c" /* yacc.c:1646  */
+#line 24647 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 320:
-#line 2323 "gram.y" /* yacc.c:1646  */
+  case 321:
+#line 2331 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_EnableRowSecurity;
 					(yyval.node) = (Node *)n;
 				}
-#line 24648 "gram.c" /* yacc.c:1646  */
+#line 24657 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 321:
-#line 2330 "gram.y" /* yacc.c:1646  */
+  case 322:
+#line 2338 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DisableRowSecurity;
 					(yyval.node) = (Node *)n;
 				}
-#line 24658 "gram.c" /* yacc.c:1646  */
+#line 24667 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 322:
-#line 2337 "gram.y" /* yacc.c:1646  */
+  case 323:
+#line 2345 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_ForceRowSecurity;
 					(yyval.node) = (Node *)n;
 				}
-#line 24668 "gram.c" /* yacc.c:1646  */
+#line 24677 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 323:
-#line 2344 "gram.y" /* yacc.c:1646  */
+  case 324:
+#line 2352 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_NoForceRowSecurity;
 					(yyval.node) = (Node *)n;
 				}
-#line 24678 "gram.c" /* yacc.c:1646  */
+#line 24687 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 324:
-#line 2350 "gram.y" /* yacc.c:1646  */
+  case 325:
+#line 2358 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_GenericOptions;
 					n->def = (Node *)(yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 24689 "gram.c" /* yacc.c:1646  */
+#line 24698 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 325:
-#line 2359 "gram.y" /* yacc.c:1646  */
+  case 326:
+#line 2367 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 24695 "gram.c" /* yacc.c:1646  */
+#line 24704 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 326:
-#line 2360 "gram.y" /* yacc.c:1646  */
+  case 327:
+#line 2368 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 24701 "gram.c" /* yacc.c:1646  */
+#line 24710 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 327:
-#line 2364 "gram.y" /* yacc.c:1646  */
+  case 328:
+#line 2372 "gram.y" /* yacc.c:1646  */
     { (yyval.dbehavior) = DROP_CASCADE; }
-#line 24707 "gram.c" /* yacc.c:1646  */
+#line 24716 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 328:
-#line 2365 "gram.y" /* yacc.c:1646  */
+  case 329:
+#line 2373 "gram.y" /* yacc.c:1646  */
     { (yyval.dbehavior) = DROP_RESTRICT; }
-#line 24713 "gram.c" /* yacc.c:1646  */
+#line 24722 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 329:
-#line 2366 "gram.y" /* yacc.c:1646  */
+  case 330:
+#line 2374 "gram.y" /* yacc.c:1646  */
     { (yyval.dbehavior) = DROP_RESTRICT; /* default */ }
-#line 24719 "gram.c" /* yacc.c:1646  */
+#line 24728 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 330:
-#line 2371 "gram.y" /* yacc.c:1646  */
+  case 331:
+#line 2379 "gram.y" /* yacc.c:1646  */
     {
 					CollateClause *n = makeNode(CollateClause);
 					n->arg = NULL;
@@ -24727,136 +24736,136 @@
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *) n;
 				}
-#line 24731 "gram.c" /* yacc.c:1646  */
+#line 24740 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 331:
-#line 2378 "gram.y" /* yacc.c:1646  */
+  case 332:
+#line 2386 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 24737 "gram.c" /* yacc.c:1646  */
+#line 24746 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 332:
-#line 2382 "gram.y" /* yacc.c:1646  */
+  case 333:
+#line 2390 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 24743 "gram.c" /* yacc.c:1646  */
+#line 24752 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 333:
-#line 2383 "gram.y" /* yacc.c:1646  */
+  case 334:
+#line 2391 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 24749 "gram.c" /* yacc.c:1646  */
+#line 24758 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 334:
-#line 2388 "gram.y" /* yacc.c:1646  */
+  case 335:
+#line 2396 "gram.y" /* yacc.c:1646  */
     {
 					ReplicaIdentityStmt *n = makeNode(ReplicaIdentityStmt);
 					n->identity_type = REPLICA_IDENTITY_NOTHING;
 					n->name = NULL;
 					(yyval.node) = (Node *) n;
 				}
-#line 24760 "gram.c" /* yacc.c:1646  */
+#line 24769 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 335:
-#line 2395 "gram.y" /* yacc.c:1646  */
+  case 336:
+#line 2403 "gram.y" /* yacc.c:1646  */
     {
 					ReplicaIdentityStmt *n = makeNode(ReplicaIdentityStmt);
 					n->identity_type = REPLICA_IDENTITY_FULL;
 					n->name = NULL;
 					(yyval.node) = (Node *) n;
 				}
-#line 24771 "gram.c" /* yacc.c:1646  */
+#line 24780 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 336:
-#line 2402 "gram.y" /* yacc.c:1646  */
+  case 337:
+#line 2410 "gram.y" /* yacc.c:1646  */
     {
 					ReplicaIdentityStmt *n = makeNode(ReplicaIdentityStmt);
 					n->identity_type = REPLICA_IDENTITY_DEFAULT;
 					n->name = NULL;
 					(yyval.node) = (Node *) n;
 				}
-#line 24782 "gram.c" /* yacc.c:1646  */
+#line 24791 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 337:
-#line 2409 "gram.y" /* yacc.c:1646  */
+  case 338:
+#line 2417 "gram.y" /* yacc.c:1646  */
     {
 					ReplicaIdentityStmt *n = makeNode(ReplicaIdentityStmt);
 					n->identity_type = REPLICA_IDENTITY_INDEX;
 					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 24793 "gram.c" /* yacc.c:1646  */
+#line 24802 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 338:
-#line 2418 "gram.y" /* yacc.c:1646  */
+  case 339:
+#line 2426 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 24799 "gram.c" /* yacc.c:1646  */
+#line 24808 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 339:
-#line 2421 "gram.y" /* yacc.c:1646  */
+  case 340:
+#line 2429 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 24805 "gram.c" /* yacc.c:1646  */
+#line 24814 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 340:
-#line 2422 "gram.y" /* yacc.c:1646  */
+  case 341:
+#line 2430 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 24811 "gram.c" /* yacc.c:1646  */
+#line 24820 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 341:
-#line 2426 "gram.y" /* yacc.c:1646  */
+  case 342:
+#line 2434 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 24817 "gram.c" /* yacc.c:1646  */
+#line 24826 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 342:
-#line 2427 "gram.y" /* yacc.c:1646  */
+  case 343:
+#line 2435 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].defelt)); }
-#line 24823 "gram.c" /* yacc.c:1646  */
+#line 24832 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 343:
-#line 2433 "gram.y" /* yacc.c:1646  */
+  case 344:
+#line 2441 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[-2].str), (Node *) (yyvsp[0].node));
 				}
-#line 24831 "gram.c" /* yacc.c:1646  */
+#line 24840 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 344:
-#line 2437 "gram.y" /* yacc.c:1646  */
+  case 345:
+#line 2445 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[0].str), NULL);
 				}
-#line 24839 "gram.c" /* yacc.c:1646  */
+#line 24848 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 345:
-#line 2441 "gram.y" /* yacc.c:1646  */
+  case 346:
+#line 2449 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElemExtended((yyvsp[-4].str), (yyvsp[-2].str), (Node *) (yyvsp[0].node),
 											 DEFELEM_UNSPEC);
 				}
-#line 24848 "gram.c" /* yacc.c:1646  */
+#line 24857 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 346:
-#line 2446 "gram.y" /* yacc.c:1646  */
+  case 347:
+#line 2454 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElemExtended((yyvsp[-2].str), (yyvsp[0].str), NULL, DEFELEM_UNSPEC);
 				}
-#line 24856 "gram.c" /* yacc.c:1646  */
+#line 24865 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 347:
-#line 2461 "gram.y" /* yacc.c:1646  */
+  case 348:
+#line 2469 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 
@@ -24866,23 +24875,23 @@
 					n->relkind = OBJECT_TYPE;
 					(yyval.node) = (Node *)n;
 				}
-#line 24870 "gram.c" /* yacc.c:1646  */
+#line 24879 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 348:
-#line 2473 "gram.y" /* yacc.c:1646  */
+  case 349:
+#line 2481 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 24876 "gram.c" /* yacc.c:1646  */
+#line 24885 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 349:
-#line 2474 "gram.y" /* yacc.c:1646  */
+  case 350:
+#line 2482 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 24882 "gram.c" /* yacc.c:1646  */
+#line 24891 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 350:
-#line 2480 "gram.y" /* yacc.c:1646  */
+  case 351:
+#line 2488 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_AddColumn;
@@ -24890,11 +24899,11 @@
 					n->behavior = (yyvsp[0].dbehavior);
 					(yyval.node) = (Node *)n;
 				}
-#line 24894 "gram.c" /* yacc.c:1646  */
+#line 24903 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 351:
-#line 2489 "gram.y" /* yacc.c:1646  */
+  case 352:
+#line 2497 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DropColumn;
@@ -24903,11 +24912,11 @@
 					n->missing_ok = TRUE;
 					(yyval.node) = (Node *)n;
 				}
-#line 24907 "gram.c" /* yacc.c:1646  */
+#line 24916 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 352:
-#line 2499 "gram.y" /* yacc.c:1646  */
+  case 353:
+#line 2507 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_DropColumn;
@@ -24916,11 +24925,11 @@
 					n->missing_ok = FALSE;
 					(yyval.node) = (Node *)n;
 				}
-#line 24920 "gram.c" /* yacc.c:1646  */
+#line 24929 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 353:
-#line 2509 "gram.y" /* yacc.c:1646  */
+  case 354:
+#line 2517 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					ColumnDef *def = makeNode(ColumnDef);
@@ -24935,31 +24944,31 @@
 					def->location = (yylsp[-5]);
 					(yyval.node) = (Node *)n;
 				}
-#line 24939 "gram.c" /* yacc.c:1646  */
+#line 24948 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 354:
-#line 2535 "gram.y" /* yacc.c:1646  */
+  case 355:
+#line 2543 "gram.y" /* yacc.c:1646  */
     {
 					ClosePortalStmt *n = makeNode(ClosePortalStmt);
 					n->portalname = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 24949 "gram.c" /* yacc.c:1646  */
+#line 24958 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 355:
-#line 2541 "gram.y" /* yacc.c:1646  */
+  case 356:
+#line 2549 "gram.y" /* yacc.c:1646  */
     {
 					ClosePortalStmt *n = makeNode(ClosePortalStmt);
 					n->portalname = NULL;
 					(yyval.node) = (Node *)n;
 				}
-#line 24959 "gram.c" /* yacc.c:1646  */
+#line 24968 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 356:
-#line 2572 "gram.y" /* yacc.c:1646  */
+  case 357:
+#line 2580 "gram.y" /* yacc.c:1646  */
     {
 					CopyStmt *n = makeNode(CopyStmt);
 					n->relation = (yyvsp[-8].range);
@@ -24987,11 +24996,11 @@
 						n->options = list_concat(n->options, (yyvsp[0].list));
 					(yyval.node) = (Node *)n;
 				}
-#line 24991 "gram.c" /* yacc.c:1646  */
+#line 25000 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 357:
-#line 2600 "gram.y" /* yacc.c:1646  */
+  case 358:
+#line 2608 "gram.y" /* yacc.c:1646  */
     {
 					CopyStmt *n = makeNode(CopyStmt);
 					n->relation = NULL;
@@ -25010,319 +25019,319 @@
 
 					(yyval.node) = (Node *)n;
 				}
-#line 25014 "gram.c" /* yacc.c:1646  */
+#line 25023 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 358:
-#line 2621 "gram.y" /* yacc.c:1646  */
+  case 359:
+#line 2629 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 25020 "gram.c" /* yacc.c:1646  */
+#line 25029 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 359:
-#line 2622 "gram.y" /* yacc.c:1646  */
+  case 360:
+#line 2630 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 25026 "gram.c" /* yacc.c:1646  */
+#line 25035 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 360:
-#line 2626 "gram.y" /* yacc.c:1646  */
+  case 361:
+#line 2634 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 25032 "gram.c" /* yacc.c:1646  */
+#line 25041 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 361:
-#line 2627 "gram.y" /* yacc.c:1646  */
+  case 362:
+#line 2635 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 25038 "gram.c" /* yacc.c:1646  */
+#line 25047 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 362:
-#line 2636 "gram.y" /* yacc.c:1646  */
+  case 363:
+#line 2644 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 25044 "gram.c" /* yacc.c:1646  */
+#line 25053 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 363:
-#line 2637 "gram.y" /* yacc.c:1646  */
+  case 364:
+#line 2645 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 25050 "gram.c" /* yacc.c:1646  */
+#line 25059 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 364:
-#line 2638 "gram.y" /* yacc.c:1646  */
+  case 365:
+#line 2646 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 25056 "gram.c" /* yacc.c:1646  */
+#line 25065 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 365:
-#line 2641 "gram.y" /* yacc.c:1646  */
+  case 366:
+#line 2649 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 25062 "gram.c" /* yacc.c:1646  */
+#line 25071 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 366:
-#line 2642 "gram.y" /* yacc.c:1646  */
+  case 367:
+#line 2650 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 25068 "gram.c" /* yacc.c:1646  */
+#line 25077 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 367:
-#line 2647 "gram.y" /* yacc.c:1646  */
+  case 368:
+#line 2655 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 25074 "gram.c" /* yacc.c:1646  */
+#line 25083 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 368:
-#line 2648 "gram.y" /* yacc.c:1646  */
+  case 369:
+#line 2656 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 25080 "gram.c" /* yacc.c:1646  */
+#line 25089 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 369:
-#line 2653 "gram.y" /* yacc.c:1646  */
+  case 370:
+#line 2661 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("format", (Node *)makeString("binary"));
 				}
-#line 25088 "gram.c" /* yacc.c:1646  */
+#line 25097 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 370:
-#line 2657 "gram.y" /* yacc.c:1646  */
+  case 371:
+#line 2665 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("oids", (Node *)makeInteger(TRUE));
 				}
-#line 25096 "gram.c" /* yacc.c:1646  */
+#line 25105 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 371:
-#line 2661 "gram.y" /* yacc.c:1646  */
+  case 372:
+#line 2669 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("freeze", (Node *)makeInteger(TRUE));
 				}
-#line 25104 "gram.c" /* yacc.c:1646  */
+#line 25113 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 372:
-#line 2665 "gram.y" /* yacc.c:1646  */
+  case 373:
+#line 2673 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("delimiter", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 25112 "gram.c" /* yacc.c:1646  */
+#line 25121 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 373:
-#line 2669 "gram.y" /* yacc.c:1646  */
+  case 374:
+#line 2677 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("null", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 25120 "gram.c" /* yacc.c:1646  */
+#line 25129 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 374:
-#line 2673 "gram.y" /* yacc.c:1646  */
+  case 375:
+#line 2681 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("format", (Node *)makeString("csv"));
 				}
-#line 25128 "gram.c" /* yacc.c:1646  */
+#line 25137 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 375:
-#line 2677 "gram.y" /* yacc.c:1646  */
+  case 376:
+#line 2685 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("header", (Node *)makeInteger(TRUE));
 				}
-#line 25136 "gram.c" /* yacc.c:1646  */
+#line 25145 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 376:
-#line 2681 "gram.y" /* yacc.c:1646  */
+  case 377:
+#line 2689 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("quote", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 25144 "gram.c" /* yacc.c:1646  */
+#line 25153 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 377:
-#line 2685 "gram.y" /* yacc.c:1646  */
+  case 378:
+#line 2693 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("escape", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 25152 "gram.c" /* yacc.c:1646  */
+#line 25161 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 378:
-#line 2689 "gram.y" /* yacc.c:1646  */
+  case 379:
+#line 2697 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("force_quote", (Node *)(yyvsp[0].list));
 				}
-#line 25160 "gram.c" /* yacc.c:1646  */
+#line 25169 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 379:
-#line 2693 "gram.y" /* yacc.c:1646  */
+  case 380:
+#line 2701 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("force_quote", (Node *)makeNode(A_Star));
 				}
-#line 25168 "gram.c" /* yacc.c:1646  */
+#line 25177 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 380:
-#line 2697 "gram.y" /* yacc.c:1646  */
+  case 381:
+#line 2705 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("force_not_null", (Node *)(yyvsp[0].list));
 				}
-#line 25176 "gram.c" /* yacc.c:1646  */
+#line 25185 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 381:
-#line 2701 "gram.y" /* yacc.c:1646  */
+  case 382:
+#line 2709 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("force_null", (Node *)(yyvsp[0].list));
 				}
-#line 25184 "gram.c" /* yacc.c:1646  */
+#line 25193 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 382:
-#line 2705 "gram.y" /* yacc.c:1646  */
+  case 383:
+#line 2713 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("encoding", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 25192 "gram.c" /* yacc.c:1646  */
+#line 25201 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 383:
-#line 2714 "gram.y" /* yacc.c:1646  */
+  case 384:
+#line 2722 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("format", (Node *)makeString("binary"));
 				}
-#line 25200 "gram.c" /* yacc.c:1646  */
+#line 25209 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 384:
-#line 2717 "gram.y" /* yacc.c:1646  */
+  case 385:
+#line 2725 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = NULL; }
-#line 25206 "gram.c" /* yacc.c:1646  */
+#line 25215 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 385:
-#line 2722 "gram.y" /* yacc.c:1646  */
+  case 386:
+#line 2730 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("oids", (Node *)makeInteger(TRUE));
 				}
-#line 25214 "gram.c" /* yacc.c:1646  */
+#line 25223 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 386:
-#line 2725 "gram.y" /* yacc.c:1646  */
+  case 387:
+#line 2733 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = NULL; }
-#line 25220 "gram.c" /* yacc.c:1646  */
+#line 25229 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 387:
-#line 2730 "gram.y" /* yacc.c:1646  */
+  case 388:
+#line 2738 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("delimiter", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 25228 "gram.c" /* yacc.c:1646  */
+#line 25237 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 388:
-#line 2733 "gram.y" /* yacc.c:1646  */
+  case 389:
+#line 2741 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = NULL; }
-#line 25234 "gram.c" /* yacc.c:1646  */
+#line 25243 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 389:
-#line 2737 "gram.y" /* yacc.c:1646  */
+  case 390:
+#line 2745 "gram.y" /* yacc.c:1646  */
     {}
-#line 25240 "gram.c" /* yacc.c:1646  */
+#line 25249 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 390:
-#line 2738 "gram.y" /* yacc.c:1646  */
+  case 391:
+#line 2746 "gram.y" /* yacc.c:1646  */
     {}
-#line 25246 "gram.c" /* yacc.c:1646  */
+#line 25255 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 391:
-#line 2744 "gram.y" /* yacc.c:1646  */
+  case 392:
+#line 2752 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].defelt));
 				}
-#line 25254 "gram.c" /* yacc.c:1646  */
+#line 25263 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 392:
-#line 2748 "gram.y" /* yacc.c:1646  */
+  case 393:
+#line 2756 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].defelt));
 				}
-#line 25262 "gram.c" /* yacc.c:1646  */
+#line 25271 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 393:
-#line 2755 "gram.y" /* yacc.c:1646  */
+  case 394:
+#line 2763 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[-1].str), (yyvsp[0].node));
 				}
-#line 25270 "gram.c" /* yacc.c:1646  */
+#line 25279 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 394:
-#line 2761 "gram.y" /* yacc.c:1646  */
+  case 395:
+#line 2769 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeString((yyvsp[0].str)); }
-#line 25276 "gram.c" /* yacc.c:1646  */
+#line 25285 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 395:
-#line 2762 "gram.y" /* yacc.c:1646  */
+  case 396:
+#line 2770 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) (yyvsp[0].value); }
-#line 25282 "gram.c" /* yacc.c:1646  */
+#line 25291 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 396:
-#line 2763 "gram.y" /* yacc.c:1646  */
+  case 397:
+#line 2771 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeNode(A_Star); }
-#line 25288 "gram.c" /* yacc.c:1646  */
+#line 25297 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 397:
-#line 2764 "gram.y" /* yacc.c:1646  */
+  case 398:
+#line 2772 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) (yyvsp[-1].list); }
-#line 25294 "gram.c" /* yacc.c:1646  */
+#line 25303 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 398:
-#line 2765 "gram.y" /* yacc.c:1646  */
+  case 399:
+#line 2773 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 25300 "gram.c" /* yacc.c:1646  */
+#line 25309 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 399:
-#line 2770 "gram.y" /* yacc.c:1646  */
+  case 400:
+#line 2778 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].node));
 				}
-#line 25308 "gram.c" /* yacc.c:1646  */
+#line 25317 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 400:
-#line 2774 "gram.y" /* yacc.c:1646  */
+  case 401:
+#line 2782 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node));
 				}
-#line 25316 "gram.c" /* yacc.c:1646  */
+#line 25325 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 401:
-#line 2781 "gram.y" /* yacc.c:1646  */
+  case 402:
+#line 2789 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeString((yyvsp[0].str)); }
-#line 25322 "gram.c" /* yacc.c:1646  */
+#line 25331 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 402:
-#line 2794 "gram.y" /* yacc.c:1646  */
+  case 403:
+#line 2802 "gram.y" /* yacc.c:1646  */
     {
 					CreateStmt *n = makeNode(CreateStmt);
 					(yyvsp[-7].range)->relpersistence = (yyvsp[-9].ival);
@@ -25337,11 +25346,11 @@
 					n->if_not_exists = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 25341 "gram.c" /* yacc.c:1646  */
+#line 25350 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 403:
-#line 2811 "gram.y" /* yacc.c:1646  */
+  case 404:
+#line 2819 "gram.y" /* yacc.c:1646  */
     {
 					CreateStmt *n = makeNode(CreateStmt);
 					(yyvsp[-7].range)->relpersistence = (yyvsp[-12].ival);
@@ -25356,11 +25365,11 @@
 					n->if_not_exists = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 25360 "gram.c" /* yacc.c:1646  */
+#line 25369 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 404:
-#line 2827 "gram.y" /* yacc.c:1646  */
+  case 405:
+#line 2835 "gram.y" /* yacc.c:1646  */
     {
 					CreateStmt *n = makeNode(CreateStmt);
 					(yyvsp[-6].range)->relpersistence = (yyvsp[-8].ival);
@@ -25376,11 +25385,11 @@
 					n->if_not_exists = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 25380 "gram.c" /* yacc.c:1646  */
+#line 25389 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 405:
-#line 2844 "gram.y" /* yacc.c:1646  */
+  case 406:
+#line 2852 "gram.y" /* yacc.c:1646  */
     {
 					CreateStmt *n = makeNode(CreateStmt);
 					(yyvsp[-6].range)->relpersistence = (yyvsp[-11].ival);
@@ -25396,155 +25405,155 @@
 					n->if_not_exists = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 25400 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 406:
-#line 2872 "gram.y" /* yacc.c:1646  */
-    { (yyval.ival) = RELPERSISTENCE_TEMP; }
-#line 25406 "gram.c" /* yacc.c:1646  */
+#line 25409 "gram.c" /* yacc.c:1646  */
     break;
 
   case 407:
-#line 2873 "gram.y" /* yacc.c:1646  */
+#line 2880 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = RELPERSISTENCE_TEMP; }
-#line 25412 "gram.c" /* yacc.c:1646  */
+#line 25415 "gram.c" /* yacc.c:1646  */
     break;
 
   case 408:
-#line 2874 "gram.y" /* yacc.c:1646  */
+#line 2881 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = RELPERSISTENCE_TEMP; }
-#line 25418 "gram.c" /* yacc.c:1646  */
+#line 25421 "gram.c" /* yacc.c:1646  */
     break;
 
   case 409:
-#line 2875 "gram.y" /* yacc.c:1646  */
+#line 2882 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = RELPERSISTENCE_TEMP; }
-#line 25424 "gram.c" /* yacc.c:1646  */
+#line 25427 "gram.c" /* yacc.c:1646  */
     break;
 
   case 410:
-#line 2877 "gram.y" /* yacc.c:1646  */
+#line 2883 "gram.y" /* yacc.c:1646  */
+    { (yyval.ival) = RELPERSISTENCE_TEMP; }
+#line 25433 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 411:
+#line 2885 "gram.y" /* yacc.c:1646  */
     {
 					ereport(WARNING,
 							(errmsg("GLOBAL is deprecated in temporary table creation"),
 							 parser_errposition((yylsp[-1]))));
 					(yyval.ival) = RELPERSISTENCE_TEMP;
 				}
-#line 25435 "gram.c" /* yacc.c:1646  */
+#line 25444 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 411:
-#line 2884 "gram.y" /* yacc.c:1646  */
+  case 412:
+#line 2892 "gram.y" /* yacc.c:1646  */
     {
 					ereport(WARNING,
 							(errmsg("GLOBAL is deprecated in temporary table creation"),
 							 parser_errposition((yylsp[-1]))));
 					(yyval.ival) = RELPERSISTENCE_TEMP;
 				}
-#line 25446 "gram.c" /* yacc.c:1646  */
+#line 25455 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 412:
-#line 2890 "gram.y" /* yacc.c:1646  */
+  case 413:
+#line 2898 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = RELPERSISTENCE_UNLOGGED; }
-#line 25452 "gram.c" /* yacc.c:1646  */
+#line 25461 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 413:
-#line 2891 "gram.y" /* yacc.c:1646  */
+  case 414:
+#line 2899 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = RELPERSISTENCE_PERMANENT; }
-#line 25458 "gram.c" /* yacc.c:1646  */
+#line 25467 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 414:
-#line 2895 "gram.y" /* yacc.c:1646  */
+  case 415:
+#line 2903 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 25464 "gram.c" /* yacc.c:1646  */
+#line 25473 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 415:
-#line 2896 "gram.y" /* yacc.c:1646  */
+  case 416:
+#line 2904 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 25470 "gram.c" /* yacc.c:1646  */
+#line 25479 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 416:
-#line 2900 "gram.y" /* yacc.c:1646  */
+  case 417:
+#line 2908 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 25476 "gram.c" /* yacc.c:1646  */
+#line 25485 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 417:
-#line 2901 "gram.y" /* yacc.c:1646  */
+  case 418:
+#line 2909 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 25482 "gram.c" /* yacc.c:1646  */
+#line 25491 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 418:
-#line 2906 "gram.y" /* yacc.c:1646  */
+  case 419:
+#line 2914 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].node));
 				}
-#line 25490 "gram.c" /* yacc.c:1646  */
+#line 25499 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 419:
-#line 2910 "gram.y" /* yacc.c:1646  */
+  case 420:
+#line 2918 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node));
 				}
-#line 25498 "gram.c" /* yacc.c:1646  */
+#line 25507 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 420:
-#line 2917 "gram.y" /* yacc.c:1646  */
+  case 421:
+#line 2925 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].node));
 				}
-#line 25506 "gram.c" /* yacc.c:1646  */
+#line 25515 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 421:
-#line 2921 "gram.y" /* yacc.c:1646  */
+  case 422:
+#line 2929 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node));
 				}
-#line 25514 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 422:
-#line 2927 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 25520 "gram.c" /* yacc.c:1646  */
+#line 25523 "gram.c" /* yacc.c:1646  */
     break;
 
   case 423:
-#line 2928 "gram.y" /* yacc.c:1646  */
+#line 2935 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 25526 "gram.c" /* yacc.c:1646  */
+#line 25529 "gram.c" /* yacc.c:1646  */
     break;
 
   case 424:
-#line 2929 "gram.y" /* yacc.c:1646  */
+#line 2936 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 25532 "gram.c" /* yacc.c:1646  */
+#line 25535 "gram.c" /* yacc.c:1646  */
     break;
 
   case 425:
-#line 2933 "gram.y" /* yacc.c:1646  */
+#line 2937 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 25538 "gram.c" /* yacc.c:1646  */
+#line 25541 "gram.c" /* yacc.c:1646  */
     break;
 
   case 426:
-#line 2934 "gram.y" /* yacc.c:1646  */
+#line 2941 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 25544 "gram.c" /* yacc.c:1646  */
+#line 25547 "gram.c" /* yacc.c:1646  */
     break;
 
   case 427:
-#line 2938 "gram.y" /* yacc.c:1646  */
+#line 2942 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = (yyvsp[0].node); }
+#line 25553 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 428:
+#line 2946 "gram.y" /* yacc.c:1646  */
     {
 					ColumnDef *n = makeNode(ColumnDef);
 					n->colname = (yyvsp[-3].str);
@@ -25563,11 +25572,11 @@
 					n->location = (yylsp[-3]);
 					(yyval.node) = (Node *)n;
 				}
-#line 25567 "gram.c" /* yacc.c:1646  */
+#line 25576 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 428:
-#line 2959 "gram.y" /* yacc.c:1646  */
+  case 429:
+#line 2967 "gram.y" /* yacc.c:1646  */
     {
 					ColumnDef *n = makeNode(ColumnDef);
 					n->colname = (yyvsp[-3].str);
@@ -25585,23 +25594,23 @@
 					n->location = (yylsp[-3]);
 					(yyval.node) = (Node *)n;
 				}
-#line 25589 "gram.c" /* yacc.c:1646  */
+#line 25598 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 429:
-#line 2979 "gram.y" /* yacc.c:1646  */
+  case 430:
+#line 2987 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].node)); }
-#line 25595 "gram.c" /* yacc.c:1646  */
+#line 25604 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 430:
-#line 2980 "gram.y" /* yacc.c:1646  */
+  case 431:
+#line 2988 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 25601 "gram.c" /* yacc.c:1646  */
+#line 25610 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 431:
-#line 2985 "gram.y" /* yacc.c:1646  */
+  case 432:
+#line 2993 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = (Constraint *) (yyvsp[0].node);
 					Assert(IsA(n, Constraint));
@@ -25609,23 +25618,23 @@
 					n->location = (yylsp[-2]);
 					(yyval.node) = (Node *) n;
 				}
-#line 25613 "gram.c" /* yacc.c:1646  */
+#line 25622 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 432:
-#line 2992 "gram.y" /* yacc.c:1646  */
+  case 433:
+#line 3000 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 25619 "gram.c" /* yacc.c:1646  */
+#line 25628 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 433:
-#line 2993 "gram.y" /* yacc.c:1646  */
+  case 434:
+#line 3001 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 25625 "gram.c" /* yacc.c:1646  */
+#line 25634 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 434:
-#line 2995 "gram.y" /* yacc.c:1646  */
+  case 435:
+#line 3003 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Note: the CollateClause is momentarily included in
@@ -25638,33 +25647,33 @@
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *) n;
 				}
-#line 25642 "gram.c" /* yacc.c:1646  */
+#line 25651 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 435:
-#line 3026 "gram.y" /* yacc.c:1646  */
+  case 436:
+#line 3034 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_NOTNULL;
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *)n;
 				}
-#line 25653 "gram.c" /* yacc.c:1646  */
+#line 25662 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 436:
-#line 3033 "gram.y" /* yacc.c:1646  */
+  case 437:
+#line 3041 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_NULL;
 					n->location = (yylsp[0]);
 					(yyval.node) = (Node *)n;
 				}
-#line 25664 "gram.c" /* yacc.c:1646  */
+#line 25673 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 437:
-#line 3040 "gram.y" /* yacc.c:1646  */
+  case 438:
+#line 3048 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_UNIQUE;
@@ -25675,11 +25684,11 @@
 					n->indexspace = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 25679 "gram.c" /* yacc.c:1646  */
+#line 25688 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 438:
-#line 3051 "gram.y" /* yacc.c:1646  */
+  case 439:
+#line 3059 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_PRIMARY;
@@ -25690,11 +25699,11 @@
 					n->indexspace = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 25694 "gram.c" /* yacc.c:1646  */
+#line 25703 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 439:
-#line 3062 "gram.y" /* yacc.c:1646  */
+  case 440:
+#line 3070 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_CHECK;
@@ -25704,11 +25713,11 @@
 					n->cooked_expr = NULL;
 					(yyval.node) = (Node *)n;
 				}
-#line 25708 "gram.c" /* yacc.c:1646  */
+#line 25717 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 440:
-#line 3072 "gram.y" /* yacc.c:1646  */
+  case 441:
+#line 3080 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_DEFAULT;
@@ -25717,11 +25726,11 @@
 					n->cooked_expr = NULL;
 					(yyval.node) = (Node *)n;
 				}
-#line 25721 "gram.c" /* yacc.c:1646  */
+#line 25730 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 441:
-#line 3081 "gram.y" /* yacc.c:1646  */
+  case 442:
+#line 3089 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_FOREIGN;
@@ -25736,120 +25745,120 @@
 					n->initially_valid  = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 25740 "gram.c" /* yacc.c:1646  */
+#line 25749 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 442:
-#line 3114 "gram.y" /* yacc.c:1646  */
+  case 443:
+#line 3122 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_ATTR_DEFERRABLE;
 					n->location = (yylsp[0]);
 					(yyval.node) = (Node *)n;
 				}
-#line 25751 "gram.c" /* yacc.c:1646  */
+#line 25760 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 443:
-#line 3121 "gram.y" /* yacc.c:1646  */
+  case 444:
+#line 3129 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_ATTR_NOT_DEFERRABLE;
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *)n;
 				}
-#line 25762 "gram.c" /* yacc.c:1646  */
+#line 25771 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 444:
-#line 3128 "gram.y" /* yacc.c:1646  */
+  case 445:
+#line 3136 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_ATTR_DEFERRED;
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *)n;
 				}
-#line 25773 "gram.c" /* yacc.c:1646  */
+#line 25782 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 445:
-#line 3135 "gram.y" /* yacc.c:1646  */
+  case 446:
+#line 3143 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_ATTR_IMMEDIATE;
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *)n;
 				}
-#line 25784 "gram.c" /* yacc.c:1646  */
+#line 25793 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 446:
-#line 3146 "gram.y" /* yacc.c:1646  */
+  case 447:
+#line 3154 "gram.y" /* yacc.c:1646  */
     {
 					TableLikeClause *n = makeNode(TableLikeClause);
 					n->relation = (yyvsp[-1].range);
 					n->options = (yyvsp[0].ival);
 					(yyval.node) = (Node *)n;
 				}
-#line 25795 "gram.c" /* yacc.c:1646  */
+#line 25804 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 447:
-#line 3155 "gram.y" /* yacc.c:1646  */
+  case 448:
+#line 3163 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[-2].ival) | (yyvsp[0].ival); }
-#line 25801 "gram.c" /* yacc.c:1646  */
+#line 25810 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 448:
-#line 3156 "gram.y" /* yacc.c:1646  */
+  case 449:
+#line 3164 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[-2].ival) & ~(yyvsp[0].ival); }
-#line 25807 "gram.c" /* yacc.c:1646  */
+#line 25816 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 449:
-#line 3157 "gram.y" /* yacc.c:1646  */
+  case 450:
+#line 3165 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = 0; }
-#line 25813 "gram.c" /* yacc.c:1646  */
+#line 25822 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 450:
-#line 3161 "gram.y" /* yacc.c:1646  */
+  case 451:
+#line 3169 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CREATE_TABLE_LIKE_DEFAULTS; }
-#line 25819 "gram.c" /* yacc.c:1646  */
+#line 25828 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 451:
-#line 3162 "gram.y" /* yacc.c:1646  */
+  case 452:
+#line 3170 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CREATE_TABLE_LIKE_CONSTRAINTS; }
-#line 25825 "gram.c" /* yacc.c:1646  */
+#line 25834 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 452:
-#line 3163 "gram.y" /* yacc.c:1646  */
+  case 453:
+#line 3171 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CREATE_TABLE_LIKE_INDEXES; }
-#line 25831 "gram.c" /* yacc.c:1646  */
+#line 25840 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 453:
-#line 3164 "gram.y" /* yacc.c:1646  */
+  case 454:
+#line 3172 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CREATE_TABLE_LIKE_STORAGE; }
-#line 25837 "gram.c" /* yacc.c:1646  */
+#line 25846 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 454:
-#line 3165 "gram.y" /* yacc.c:1646  */
+  case 455:
+#line 3173 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CREATE_TABLE_LIKE_COMMENTS; }
-#line 25843 "gram.c" /* yacc.c:1646  */
+#line 25852 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 455:
-#line 3166 "gram.y" /* yacc.c:1646  */
+  case 456:
+#line 3174 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CREATE_TABLE_LIKE_ALL; }
-#line 25849 "gram.c" /* yacc.c:1646  */
+#line 25858 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 456:
-#line 3176 "gram.y" /* yacc.c:1646  */
+  case 457:
+#line 3184 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = (Constraint *) (yyvsp[0].node);
 					Assert(IsA(n, Constraint));
@@ -25857,17 +25866,17 @@
 					n->location = (yylsp[-2]);
 					(yyval.node) = (Node *) n;
 				}
-#line 25861 "gram.c" /* yacc.c:1646  */
+#line 25870 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 457:
-#line 3183 "gram.y" /* yacc.c:1646  */
+  case 458:
+#line 3191 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 25867 "gram.c" /* yacc.c:1646  */
+#line 25876 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 458:
-#line 3188 "gram.y" /* yacc.c:1646  */
+  case 459:
+#line 3196 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_CHECK;
@@ -25880,11 +25889,11 @@
 					n->initially_valid = !n->skip_validation;
 					(yyval.node) = (Node *)n;
 				}
-#line 25884 "gram.c" /* yacc.c:1646  */
+#line 25893 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 459:
-#line 3202 "gram.y" /* yacc.c:1646  */
+  case 460:
+#line 3210 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_UNIQUE;
@@ -25898,11 +25907,11 @@
 								   NULL, yyscanner);
 					(yyval.node) = (Node *)n;
 				}
-#line 25902 "gram.c" /* yacc.c:1646  */
+#line 25911 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 460:
-#line 3216 "gram.y" /* yacc.c:1646  */
+  case 461:
+#line 3224 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_UNIQUE;
@@ -25916,11 +25925,11 @@
 								   NULL, yyscanner);
 					(yyval.node) = (Node *)n;
 				}
-#line 25920 "gram.c" /* yacc.c:1646  */
+#line 25929 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 461:
-#line 3231 "gram.y" /* yacc.c:1646  */
+  case 462:
+#line 3239 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_PRIMARY;
@@ -25934,11 +25943,11 @@
 								   NULL, yyscanner);
 					(yyval.node) = (Node *)n;
 				}
-#line 25938 "gram.c" /* yacc.c:1646  */
+#line 25947 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 462:
-#line 3245 "gram.y" /* yacc.c:1646  */
+  case 463:
+#line 3253 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_PRIMARY;
@@ -25952,11 +25961,11 @@
 								   NULL, yyscanner);
 					(yyval.node) = (Node *)n;
 				}
-#line 25956 "gram.c" /* yacc.c:1646  */
+#line 25965 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 463:
-#line 3261 "gram.y" /* yacc.c:1646  */
+  case 464:
+#line 3269 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_EXCLUSION;
@@ -25972,11 +25981,11 @@
 								   NULL, yyscanner);
 					(yyval.node) = (Node *)n;
 				}
-#line 25976 "gram.c" /* yacc.c:1646  */
+#line 25985 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 464:
-#line 3278 "gram.y" /* yacc.c:1646  */
+  case 465:
+#line 3286 "gram.y" /* yacc.c:1646  */
     {
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_FOREIGN;
@@ -25994,63 +26003,63 @@
 					n->initially_valid = !n->skip_validation;
 					(yyval.node) = (Node *)n;
 				}
-#line 25998 "gram.c" /* yacc.c:1646  */
+#line 26007 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 465:
-#line 3297 "gram.y" /* yacc.c:1646  */
+  case 466:
+#line 3305 "gram.y" /* yacc.c:1646  */
     {  (yyval.boolean) = TRUE; }
-#line 26004 "gram.c" /* yacc.c:1646  */
+#line 26013 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 466:
-#line 3298 "gram.y" /* yacc.c:1646  */
+  case 467:
+#line 3306 "gram.y" /* yacc.c:1646  */
     {  (yyval.boolean) = FALSE; }
-#line 26010 "gram.c" /* yacc.c:1646  */
+#line 26019 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 467:
-#line 3302 "gram.y" /* yacc.c:1646  */
+  case 468:
+#line 3310 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 26016 "gram.c" /* yacc.c:1646  */
+#line 26025 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 468:
-#line 3303 "gram.y" /* yacc.c:1646  */
+  case 469:
+#line 3311 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 26022 "gram.c" /* yacc.c:1646  */
+#line 26031 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 469:
-#line 3307 "gram.y" /* yacc.c:1646  */
+  case 470:
+#line 3315 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 26028 "gram.c" /* yacc.c:1646  */
+#line 26037 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 470:
-#line 3308 "gram.y" /* yacc.c:1646  */
+  case 471:
+#line 3316 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 26034 "gram.c" /* yacc.c:1646  */
+#line 26043 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 471:
-#line 3312 "gram.y" /* yacc.c:1646  */
+  case 472:
+#line 3320 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeString((yyvsp[0].str));
 				}
-#line 26042 "gram.c" /* yacc.c:1646  */
+#line 26051 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 472:
-#line 3318 "gram.y" /* yacc.c:1646  */
+  case 473:
+#line 3326 "gram.y" /* yacc.c:1646  */
     {
 				(yyval.ival) = FKCONSTR_MATCH_FULL;
 			}
-#line 26050 "gram.c" /* yacc.c:1646  */
+#line 26059 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 473:
-#line 3322 "gram.y" /* yacc.c:1646  */
+  case 474:
+#line 3330 "gram.y" /* yacc.c:1646  */
     {
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -26058,229 +26067,229 @@
 						 parser_errposition((yylsp[-1]))));
 				(yyval.ival) = FKCONSTR_MATCH_PARTIAL;
 			}
-#line 26062 "gram.c" /* yacc.c:1646  */
+#line 26071 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 474:
-#line 3330 "gram.y" /* yacc.c:1646  */
+  case 475:
+#line 3338 "gram.y" /* yacc.c:1646  */
     {
 				(yyval.ival) = FKCONSTR_MATCH_SIMPLE;
 			}
-#line 26070 "gram.c" /* yacc.c:1646  */
+#line 26079 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 475:
-#line 3334 "gram.y" /* yacc.c:1646  */
+  case 476:
+#line 3342 "gram.y" /* yacc.c:1646  */
     {
 				(yyval.ival) = FKCONSTR_MATCH_SIMPLE;
 			}
-#line 26078 "gram.c" /* yacc.c:1646  */
+#line 26087 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 476:
-#line 3340 "gram.y" /* yacc.c:1646  */
+  case 477:
+#line 3348 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].list)); }
-#line 26084 "gram.c" /* yacc.c:1646  */
+#line 26093 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 477:
-#line 3342 "gram.y" /* yacc.c:1646  */
+  case 478:
+#line 3350 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].list)); }
-#line 26090 "gram.c" /* yacc.c:1646  */
+#line 26099 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 478:
-#line 3346 "gram.y" /* yacc.c:1646  */
+  case 479:
+#line 3354 "gram.y" /* yacc.c:1646  */
     {
 				(yyval.list) = list_make2((yyvsp[-2].ielem), (yyvsp[0].list));
 			}
-#line 26098 "gram.c" /* yacc.c:1646  */
+#line 26107 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 479:
-#line 3351 "gram.y" /* yacc.c:1646  */
+  case 480:
+#line 3359 "gram.y" /* yacc.c:1646  */
     {
 				(yyval.list) = list_make2((yyvsp[-5].ielem), (yyvsp[-1].list));
 			}
-#line 26106 "gram.c" /* yacc.c:1646  */
+#line 26115 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 480:
-#line 3357 "gram.y" /* yacc.c:1646  */
+  case 481:
+#line 3365 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[-1].node); }
-#line 26112 "gram.c" /* yacc.c:1646  */
+#line 26121 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 481:
-#line 3358 "gram.y" /* yacc.c:1646  */
+  case 482:
+#line 3366 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 26118 "gram.c" /* yacc.c:1646  */
+#line 26127 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 482:
-#line 3369 "gram.y" /* yacc.c:1646  */
+  case 483:
+#line 3377 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ((yyvsp[0].ival) << 8) | (FKCONSTR_ACTION_NOACTION & 0xFF); }
-#line 26124 "gram.c" /* yacc.c:1646  */
+#line 26133 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 483:
-#line 3371 "gram.y" /* yacc.c:1646  */
+  case 484:
+#line 3379 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (FKCONSTR_ACTION_NOACTION << 8) | ((yyvsp[0].ival) & 0xFF); }
-#line 26130 "gram.c" /* yacc.c:1646  */
+#line 26139 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 484:
-#line 3373 "gram.y" /* yacc.c:1646  */
+  case 485:
+#line 3381 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ((yyvsp[-1].ival) << 8) | ((yyvsp[0].ival) & 0xFF); }
-#line 26136 "gram.c" /* yacc.c:1646  */
+#line 26145 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 485:
-#line 3375 "gram.y" /* yacc.c:1646  */
+  case 486:
+#line 3383 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ((yyvsp[0].ival) << 8) | ((yyvsp[-1].ival) & 0xFF); }
-#line 26142 "gram.c" /* yacc.c:1646  */
+#line 26151 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 486:
-#line 3377 "gram.y" /* yacc.c:1646  */
+  case 487:
+#line 3385 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (FKCONSTR_ACTION_NOACTION << 8) | (FKCONSTR_ACTION_NOACTION & 0xFF); }
-#line 26148 "gram.c" /* yacc.c:1646  */
+#line 26157 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 487:
-#line 3380 "gram.y" /* yacc.c:1646  */
+  case 488:
+#line 3388 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[0].ival); }
-#line 26154 "gram.c" /* yacc.c:1646  */
+#line 26163 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 488:
-#line 3383 "gram.y" /* yacc.c:1646  */
+  case 489:
+#line 3391 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[0].ival); }
-#line 26160 "gram.c" /* yacc.c:1646  */
+#line 26169 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 489:
-#line 3387 "gram.y" /* yacc.c:1646  */
+  case 490:
+#line 3395 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = FKCONSTR_ACTION_NOACTION; }
-#line 26166 "gram.c" /* yacc.c:1646  */
+#line 26175 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 490:
-#line 3388 "gram.y" /* yacc.c:1646  */
+  case 491:
+#line 3396 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = FKCONSTR_ACTION_RESTRICT; }
-#line 26172 "gram.c" /* yacc.c:1646  */
+#line 26181 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 491:
-#line 3389 "gram.y" /* yacc.c:1646  */
+  case 492:
+#line 3397 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = FKCONSTR_ACTION_CASCADE; }
-#line 26178 "gram.c" /* yacc.c:1646  */
+#line 26187 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 492:
-#line 3390 "gram.y" /* yacc.c:1646  */
+  case 493:
+#line 3398 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = FKCONSTR_ACTION_SETNULL; }
-#line 26184 "gram.c" /* yacc.c:1646  */
+#line 26193 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 493:
-#line 3391 "gram.y" /* yacc.c:1646  */
+  case 494:
+#line 3399 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = FKCONSTR_ACTION_SETDEFAULT; }
-#line 26190 "gram.c" /* yacc.c:1646  */
+#line 26199 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 494:
-#line 3394 "gram.y" /* yacc.c:1646  */
+  case 495:
+#line 3402 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 26196 "gram.c" /* yacc.c:1646  */
+#line 26205 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 495:
-#line 3395 "gram.y" /* yacc.c:1646  */
+  case 496:
+#line 3403 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 26202 "gram.c" /* yacc.c:1646  */
+#line 26211 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 496:
-#line 3400 "gram.y" /* yacc.c:1646  */
+  case 497:
+#line 3408 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 26208 "gram.c" /* yacc.c:1646  */
+#line 26217 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 497:
-#line 3401 "gram.y" /* yacc.c:1646  */
+  case 498:
+#line 3409 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(defWithOids(true)); }
-#line 26214 "gram.c" /* yacc.c:1646  */
+#line 26223 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 498:
-#line 3402 "gram.y" /* yacc.c:1646  */
+  case 499:
+#line 3410 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(defWithOids(false)); }
-#line 26220 "gram.c" /* yacc.c:1646  */
+#line 26229 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 499:
-#line 3403 "gram.y" /* yacc.c:1646  */
+  case 500:
+#line 3411 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 26226 "gram.c" /* yacc.c:1646  */
+#line 26235 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 500:
-#line 3406 "gram.y" /* yacc.c:1646  */
+  case 501:
+#line 3414 "gram.y" /* yacc.c:1646  */
     { (yyval.oncommit) = ONCOMMIT_DROP; }
-#line 26232 "gram.c" /* yacc.c:1646  */
+#line 26241 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 501:
-#line 3407 "gram.y" /* yacc.c:1646  */
+  case 502:
+#line 3415 "gram.y" /* yacc.c:1646  */
     { (yyval.oncommit) = ONCOMMIT_DELETE_ROWS; }
-#line 26238 "gram.c" /* yacc.c:1646  */
+#line 26247 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 502:
-#line 3408 "gram.y" /* yacc.c:1646  */
+  case 503:
+#line 3416 "gram.y" /* yacc.c:1646  */
     { (yyval.oncommit) = ONCOMMIT_PRESERVE_ROWS; }
-#line 26244 "gram.c" /* yacc.c:1646  */
+#line 26253 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 503:
-#line 3409 "gram.y" /* yacc.c:1646  */
+  case 504:
+#line 3417 "gram.y" /* yacc.c:1646  */
     { (yyval.oncommit) = ONCOMMIT_NOOP; }
-#line 26250 "gram.c" /* yacc.c:1646  */
+#line 26259 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 504:
-#line 3412 "gram.y" /* yacc.c:1646  */
+  case 505:
+#line 3420 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 26256 "gram.c" /* yacc.c:1646  */
+#line 26265 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 505:
-#line 3413 "gram.y" /* yacc.c:1646  */
+  case 506:
+#line 3421 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 26262 "gram.c" /* yacc.c:1646  */
+#line 26271 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 506:
-#line 3416 "gram.y" /* yacc.c:1646  */
+  case 507:
+#line 3424 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 26268 "gram.c" /* yacc.c:1646  */
+#line 26277 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 507:
-#line 3417 "gram.y" /* yacc.c:1646  */
+  case 508:
+#line 3425 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 26274 "gram.c" /* yacc.c:1646  */
+#line 26283 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 508:
-#line 3420 "gram.y" /* yacc.c:1646  */
+  case 509:
+#line 3428 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 26280 "gram.c" /* yacc.c:1646  */
+#line 26289 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 509:
-#line 3436 "gram.y" /* yacc.c:1646  */
+  case 510:
+#line 3444 "gram.y" /* yacc.c:1646  */
     {
 					CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
 					ctas->query = (yyvsp[-1].node);
@@ -26293,11 +26302,11 @@
 					(yyvsp[-3].into)->skipData = !((yyvsp[0].boolean));
 					(yyval.node) = (Node *) ctas;
 				}
-#line 26297 "gram.c" /* yacc.c:1646  */
+#line 26306 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 510:
-#line 3449 "gram.y" /* yacc.c:1646  */
+  case 511:
+#line 3457 "gram.y" /* yacc.c:1646  */
     {
 					CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
 					ctas->query = (yyvsp[-1].node);
@@ -26310,11 +26319,11 @@
 					(yyvsp[-3].into)->skipData = !((yyvsp[0].boolean));
 					(yyval.node) = (Node *) ctas;
 				}
-#line 26314 "gram.c" /* yacc.c:1646  */
+#line 26323 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 511:
-#line 3465 "gram.y" /* yacc.c:1646  */
+  case 512:
+#line 3473 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.into) = makeNode(IntoClause);
 					(yyval.into)->rel = (yyvsp[-4].range);
@@ -26325,29 +26334,29 @@
 					(yyval.into)->viewQuery = NULL;
 					(yyval.into)->skipData = false;		/* might get changed later */
 				}
-#line 26329 "gram.c" /* yacc.c:1646  */
+#line 26338 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 512:
-#line 3478 "gram.y" /* yacc.c:1646  */
+  case 513:
+#line 3486 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 26335 "gram.c" /* yacc.c:1646  */
+#line 26344 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 513:
-#line 3479 "gram.y" /* yacc.c:1646  */
+  case 514:
+#line 3487 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 26341 "gram.c" /* yacc.c:1646  */
+#line 26350 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 514:
-#line 3480 "gram.y" /* yacc.c:1646  */
+  case 515:
+#line 3488 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 26347 "gram.c" /* yacc.c:1646  */
+#line 26356 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 515:
-#line 3493 "gram.y" /* yacc.c:1646  */
+  case 516:
+#line 3501 "gram.y" /* yacc.c:1646  */
     {
 					CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
 					ctas->query = (yyvsp[-1].node);
@@ -26360,11 +26369,11 @@
 					(yyvsp[-3].into)->skipData = !((yyvsp[0].boolean));
 					(yyval.node) = (Node *) ctas;
 				}
-#line 26364 "gram.c" /* yacc.c:1646  */
+#line 26373 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 516:
-#line 3506 "gram.y" /* yacc.c:1646  */
+  case 517:
+#line 3514 "gram.y" /* yacc.c:1646  */
     {
 					CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
 					ctas->query = (yyvsp[-1].node);
@@ -26377,11 +26386,11 @@
 					(yyvsp[-3].into)->skipData = !((yyvsp[0].boolean));
 					(yyval.node) = (Node *) ctas;
 				}
-#line 26381 "gram.c" /* yacc.c:1646  */
+#line 26390 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 517:
-#line 3522 "gram.y" /* yacc.c:1646  */
+  case 518:
+#line 3530 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.into) = makeNode(IntoClause);
 					(yyval.into)->rel = (yyvsp[-3].range);
@@ -26392,23 +26401,23 @@
 					(yyval.into)->viewQuery = NULL;		/* filled at analysis time */
 					(yyval.into)->skipData = false;		/* might get changed later */
 				}
-#line 26396 "gram.c" /* yacc.c:1646  */
+#line 26405 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 518:
-#line 3534 "gram.y" /* yacc.c:1646  */
+  case 519:
+#line 3542 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = RELPERSISTENCE_UNLOGGED; }
-#line 26402 "gram.c" /* yacc.c:1646  */
+#line 26411 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 519:
-#line 3535 "gram.y" /* yacc.c:1646  */
+  case 520:
+#line 3543 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = RELPERSISTENCE_PERMANENT; }
-#line 26408 "gram.c" /* yacc.c:1646  */
+#line 26417 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 520:
-#line 3548 "gram.y" /* yacc.c:1646  */
+  case 521:
+#line 3556 "gram.y" /* yacc.c:1646  */
     {
 					RefreshMatViewStmt *n = makeNode(RefreshMatViewStmt);
 					n->concurrent = (yyvsp[-2].boolean);
@@ -26416,11 +26425,11 @@
 					n->skipData = !((yyvsp[0].boolean));
 					(yyval.node) = (Node *) n;
 				}
-#line 26420 "gram.c" /* yacc.c:1646  */
+#line 26429 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 521:
-#line 3568 "gram.y" /* yacc.c:1646  */
+  case 522:
+#line 3576 "gram.y" /* yacc.c:1646  */
     {
 					CreateSeqStmt *n = makeNode(CreateSeqStmt);
 					(yyvsp[-1].range)->relpersistence = (yyvsp[-3].ival);
@@ -26430,11 +26439,11 @@
 					n->if_not_exists = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 26434 "gram.c" /* yacc.c:1646  */
+#line 26443 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 522:
-#line 3578 "gram.y" /* yacc.c:1646  */
+  case 523:
+#line 3586 "gram.y" /* yacc.c:1646  */
     {
 					CreateSeqStmt *n = makeNode(CreateSeqStmt);
 					(yyvsp[-1].range)->relpersistence = (yyvsp[-6].ival);
@@ -26444,11 +26453,11 @@
 					n->if_not_exists = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 26448 "gram.c" /* yacc.c:1646  */
+#line 26457 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 523:
-#line 3591 "gram.y" /* yacc.c:1646  */
+  case 524:
+#line 3599 "gram.y" /* yacc.c:1646  */
     {
 					AlterSeqStmt *n = makeNode(AlterSeqStmt);
 					n->sequence = (yyvsp[-1].range);
@@ -26456,11 +26465,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 26460 "gram.c" /* yacc.c:1646  */
+#line 26469 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 524:
-#line 3599 "gram.y" /* yacc.c:1646  */
+  case 525:
+#line 3607 "gram.y" /* yacc.c:1646  */
     {
 					AlterSeqStmt *n = makeNode(AlterSeqStmt);
 					n->sequence = (yyvsp[-1].range);
@@ -26468,176 +26477,182 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 26472 "gram.c" /* yacc.c:1646  */
+#line 26481 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 525:
-#line 3609 "gram.y" /* yacc.c:1646  */
+  case 526:
+#line 3617 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 26478 "gram.c" /* yacc.c:1646  */
+#line 26487 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 526:
-#line 3610 "gram.y" /* yacc.c:1646  */
+  case 527:
+#line 3618 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 26484 "gram.c" /* yacc.c:1646  */
+#line 26493 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 527:
-#line 3613 "gram.y" /* yacc.c:1646  */
+  case 528:
+#line 3621 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 26490 "gram.c" /* yacc.c:1646  */
+#line 26499 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 528:
-#line 3614 "gram.y" /* yacc.c:1646  */
+  case 529:
+#line 3622 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 26496 "gram.c" /* yacc.c:1646  */
+#line 26505 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 529:
-#line 3618 "gram.y" /* yacc.c:1646  */
+  case 530:
+#line 3626 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("cache", (Node *)(yyvsp[0].value));
 				}
-#line 26504 "gram.c" /* yacc.c:1646  */
+#line 26513 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 530:
-#line 3622 "gram.y" /* yacc.c:1646  */
+  case 531:
+#line 3630 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("cycle", (Node *)makeInteger(TRUE));
 				}
-#line 26512 "gram.c" /* yacc.c:1646  */
+#line 26521 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 531:
-#line 3626 "gram.y" /* yacc.c:1646  */
+  case 532:
+#line 3634 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("cycle", (Node *)makeInteger(FALSE));
 				}
-#line 26520 "gram.c" /* yacc.c:1646  */
+#line 26529 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 532:
-#line 3630 "gram.y" /* yacc.c:1646  */
+  case 533:
+#line 3638 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("increment", (Node *)(yyvsp[0].value));
 				}
-#line 26528 "gram.c" /* yacc.c:1646  */
+#line 26537 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 533:
-#line 3634 "gram.y" /* yacc.c:1646  */
+  case 534:
+#line 3642 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("maxvalue", (Node *)(yyvsp[0].value));
 				}
-#line 26536 "gram.c" /* yacc.c:1646  */
+#line 26545 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 534:
-#line 3638 "gram.y" /* yacc.c:1646  */
+  case 535:
+#line 3646 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("minvalue", (Node *)(yyvsp[0].value));
 				}
-#line 26544 "gram.c" /* yacc.c:1646  */
+#line 26553 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 535:
-#line 3642 "gram.y" /* yacc.c:1646  */
+  case 536:
+#line 3650 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("maxvalue", NULL);
 				}
-#line 26552 "gram.c" /* yacc.c:1646  */
+#line 26561 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 536:
-#line 3646 "gram.y" /* yacc.c:1646  */
+  case 537:
+#line 3654 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("minvalue", NULL);
 				}
-#line 26560 "gram.c" /* yacc.c:1646  */
+#line 26569 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 537:
-#line 3650 "gram.y" /* yacc.c:1646  */
+  case 538:
+#line 3658 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("owned_by", (Node *)(yyvsp[0].list));
 				}
-#line 26568 "gram.c" /* yacc.c:1646  */
+#line 26577 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 538:
-#line 3654 "gram.y" /* yacc.c:1646  */
+  case 539:
+#line 3662 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("start", (Node *)(yyvsp[0].value));
 				}
-#line 26576 "gram.c" /* yacc.c:1646  */
+#line 26585 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 539:
-#line 3658 "gram.y" /* yacc.c:1646  */
+  case 540:
+#line 3666 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("restart", NULL);
 				}
-#line 26584 "gram.c" /* yacc.c:1646  */
+#line 26593 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 540:
-#line 3662 "gram.y" /* yacc.c:1646  */
+  case 541:
+#line 3670 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("restart", (Node *)(yyvsp[0].value));
 				}
-#line 26592 "gram.c" /* yacc.c:1646  */
+#line 26601 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 541:
-#line 3667 "gram.y" /* yacc.c:1646  */
+  case 542:
+#line 3675 "gram.y" /* yacc.c:1646  */
     {}
-#line 26598 "gram.c" /* yacc.c:1646  */
+#line 26607 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 542:
-#line 3668 "gram.y" /* yacc.c:1646  */
+  case 543:
+#line 3676 "gram.y" /* yacc.c:1646  */
     {}
-#line 26604 "gram.c" /* yacc.c:1646  */
+#line 26613 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 543:
-#line 3672 "gram.y" /* yacc.c:1646  */
+  case 544:
+#line 3680 "gram.y" /* yacc.c:1646  */
     { (yyval.value) = makeFloat((yyvsp[0].str)); }
-#line 26610 "gram.c" /* yacc.c:1646  */
+#line 26619 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 544:
-#line 3674 "gram.y" /* yacc.c:1646  */
+  case 545:
+#line 3681 "gram.y" /* yacc.c:1646  */
+    { (yyval.value) = makeFloat((yyvsp[0].str)); }
+#line 26625 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 546:
+#line 3683 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.value) = makeFloat((yyvsp[0].str));
 					doNegateFloat((yyval.value));
 				}
-#line 26619 "gram.c" /* yacc.c:1646  */
+#line 26634 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 545:
-#line 3678 "gram.y" /* yacc.c:1646  */
+  case 547:
+#line 3687 "gram.y" /* yacc.c:1646  */
     { (yyval.value) = makeInteger((yyvsp[0].ival)); }
-#line 26625 "gram.c" /* yacc.c:1646  */
+#line 26640 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 546:
-#line 3681 "gram.y" /* yacc.c:1646  */
+  case 548:
+#line 3690 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].value)); }
-#line 26631 "gram.c" /* yacc.c:1646  */
+#line 26646 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 547:
-#line 3682 "gram.y" /* yacc.c:1646  */
+  case 549:
+#line 3691 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].value)); }
-#line 26637 "gram.c" /* yacc.c:1646  */
+#line 26652 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 548:
-#line 3695 "gram.y" /* yacc.c:1646  */
+  case 550:
+#line 3704 "gram.y" /* yacc.c:1646  */
     {
 				CreatePLangStmt *n = makeNode(CreatePLangStmt);
 				n->replace = (yyvsp[-4].boolean);
@@ -26649,11 +26664,11 @@
 				n->pltrusted = false;
 				(yyval.node) = (Node *)n;
 			}
-#line 26653 "gram.c" /* yacc.c:1646  */
+#line 26668 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 549:
-#line 3708 "gram.y" /* yacc.c:1646  */
+  case 551:
+#line 3717 "gram.y" /* yacc.c:1646  */
     {
 				CreatePLangStmt *n = makeNode(CreatePLangStmt);
 				n->replace = (yyvsp[-8].boolean);
@@ -26664,71 +26679,71 @@
 				n->pltrusted = (yyvsp[-7].boolean);
 				(yyval.node) = (Node *)n;
 			}
-#line 26668 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 550:
-#line 3721 "gram.y" /* yacc.c:1646  */
-    { (yyval.boolean) = TRUE; }
-#line 26674 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 551:
-#line 3722 "gram.y" /* yacc.c:1646  */
-    { (yyval.boolean) = FALSE; }
-#line 26680 "gram.c" /* yacc.c:1646  */
+#line 26683 "gram.c" /* yacc.c:1646  */
     break;
 
   case 552:
 #line 3730 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 26686 "gram.c" /* yacc.c:1646  */
+    { (yyval.boolean) = TRUE; }
+#line 26689 "gram.c" /* yacc.c:1646  */
     break;
 
   case 553:
 #line 3731 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = lcons(makeString((yyvsp[-1].str)), (yyvsp[0].list)); }
-#line 26692 "gram.c" /* yacc.c:1646  */
+    { (yyval.boolean) = FALSE; }
+#line 26695 "gram.c" /* yacc.c:1646  */
     break;
 
   case 554:
-#line 3735 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = (yyvsp[0].list); }
-#line 26698 "gram.c" /* yacc.c:1646  */
+#line 3739 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
+#line 26701 "gram.c" /* yacc.c:1646  */
     break;
 
   case 555:
-#line 3736 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = NIL; }
-#line 26704 "gram.c" /* yacc.c:1646  */
+#line 3740 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = lcons(makeString((yyvsp[-1].str)), (yyvsp[0].list)); }
+#line 26707 "gram.c" /* yacc.c:1646  */
     break;
 
   case 556:
-#line 3740 "gram.y" /* yacc.c:1646  */
+#line 3744 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 26710 "gram.c" /* yacc.c:1646  */
+#line 26713 "gram.c" /* yacc.c:1646  */
     break;
 
   case 557:
-#line 3741 "gram.y" /* yacc.c:1646  */
+#line 3745 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 26716 "gram.c" /* yacc.c:1646  */
+#line 26719 "gram.c" /* yacc.c:1646  */
     break;
 
   case 558:
-#line 3745 "gram.y" /* yacc.c:1646  */
+#line 3749 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 26722 "gram.c" /* yacc.c:1646  */
+#line 26725 "gram.c" /* yacc.c:1646  */
     break;
 
   case 559:
-#line 3746 "gram.y" /* yacc.c:1646  */
+#line 3750 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 26728 "gram.c" /* yacc.c:1646  */
+#line 26731 "gram.c" /* yacc.c:1646  */
     break;
 
   case 560:
-#line 3751 "gram.y" /* yacc.c:1646  */
+#line 3754 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = (yyvsp[0].list); }
+#line 26737 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 561:
+#line 3755 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = NIL; }
+#line 26743 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 562:
+#line 3760 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_LANGUAGE;
@@ -26739,11 +26754,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 26743 "gram.c" /* yacc.c:1646  */
+#line 26758 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 561:
-#line 3762 "gram.y" /* yacc.c:1646  */
+  case 563:
+#line 3771 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_LANGUAGE;
@@ -26753,23 +26768,23 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 26757 "gram.c" /* yacc.c:1646  */
+#line 26772 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 562:
-#line 3774 "gram.y" /* yacc.c:1646  */
+  case 564:
+#line 3783 "gram.y" /* yacc.c:1646  */
     {}
-#line 26763 "gram.c" /* yacc.c:1646  */
+#line 26778 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 563:
-#line 3775 "gram.y" /* yacc.c:1646  */
+  case 565:
+#line 3784 "gram.y" /* yacc.c:1646  */
     {}
-#line 26769 "gram.c" /* yacc.c:1646  */
+#line 26784 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 564:
-#line 3786 "gram.y" /* yacc.c:1646  */
+  case 566:
+#line 3795 "gram.y" /* yacc.c:1646  */
     {
 					CreateTableSpaceStmt *n = makeNode(CreateTableSpaceStmt);
 					n->tablespacename = (yyvsp[-4].str);
@@ -26778,45 +26793,45 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 26782 "gram.c" /* yacc.c:1646  */
+#line 26797 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 565:
-#line 3796 "gram.y" /* yacc.c:1646  */
+  case 567:
+#line 3805 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 26788 "gram.c" /* yacc.c:1646  */
+#line 26803 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 566:
-#line 3797 "gram.y" /* yacc.c:1646  */
+  case 568:
+#line 3806 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 26794 "gram.c" /* yacc.c:1646  */
+#line 26809 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 567:
-#line 3811 "gram.y" /* yacc.c:1646  */
+  case 569:
+#line 3820 "gram.y" /* yacc.c:1646  */
     {
 					DropTableSpaceStmt *n = makeNode(DropTableSpaceStmt);
 					n->tablespacename = (yyvsp[0].str);
 					n->missing_ok = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 26805 "gram.c" /* yacc.c:1646  */
+#line 26820 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 568:
-#line 3818 "gram.y" /* yacc.c:1646  */
+  case 570:
+#line 3827 "gram.y" /* yacc.c:1646  */
     {
 					DropTableSpaceStmt *n = makeNode(DropTableSpaceStmt);
 					n->tablespacename = (yyvsp[0].str);
 					n->missing_ok = true;
 					(yyval.node) = (Node *) n;
 				}
-#line 26816 "gram.c" /* yacc.c:1646  */
+#line 26831 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 569:
-#line 3835 "gram.y" /* yacc.c:1646  */
+  case 571:
+#line 3844 "gram.y" /* yacc.c:1646  */
     {
 					CreateExtensionStmt *n = makeNode(CreateExtensionStmt);
 					n->extname = (yyvsp[-2].str);
@@ -26824,11 +26839,11 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 26828 "gram.c" /* yacc.c:1646  */
+#line 26843 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 570:
-#line 3843 "gram.y" /* yacc.c:1646  */
+  case 572:
+#line 3852 "gram.y" /* yacc.c:1646  */
     {
 					CreateExtensionStmt *n = makeNode(CreateExtensionStmt);
 					n->extname = (yyvsp[-2].str);
@@ -26836,78 +26851,78 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 26840 "gram.c" /* yacc.c:1646  */
+#line 26855 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 571:
-#line 3854 "gram.y" /* yacc.c:1646  */
+  case 573:
+#line 3863 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 26846 "gram.c" /* yacc.c:1646  */
+#line 26861 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 572:
-#line 3856 "gram.y" /* yacc.c:1646  */
+  case 574:
+#line 3865 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 26852 "gram.c" /* yacc.c:1646  */
+#line 26867 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 573:
-#line 3861 "gram.y" /* yacc.c:1646  */
+  case 575:
+#line 3870 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("schema", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 26860 "gram.c" /* yacc.c:1646  */
+#line 26875 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 574:
-#line 3865 "gram.y" /* yacc.c:1646  */
+  case 576:
+#line 3874 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("new_version", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 26868 "gram.c" /* yacc.c:1646  */
+#line 26883 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 575:
-#line 3869 "gram.y" /* yacc.c:1646  */
+  case 577:
+#line 3878 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("old_version", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 26876 "gram.c" /* yacc.c:1646  */
+#line 26891 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 576:
-#line 3881 "gram.y" /* yacc.c:1646  */
+  case 578:
+#line 3890 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionStmt *n = makeNode(AlterExtensionStmt);
 					n->extname = (yyvsp[-2].str);
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 26887 "gram.c" /* yacc.c:1646  */
+#line 26902 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 577:
-#line 3891 "gram.y" /* yacc.c:1646  */
+  case 579:
+#line 3900 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 26893 "gram.c" /* yacc.c:1646  */
+#line 26908 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 578:
-#line 3893 "gram.y" /* yacc.c:1646  */
+  case 580:
+#line 3902 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 26899 "gram.c" /* yacc.c:1646  */
+#line 26914 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 579:
-#line 3898 "gram.y" /* yacc.c:1646  */
+  case 581:
+#line 3907 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("new_version", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 26907 "gram.c" /* yacc.c:1646  */
+#line 26922 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 580:
-#line 3911 "gram.y" /* yacc.c:1646  */
+  case 582:
+#line 3920 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-4].str);
@@ -26917,11 +26932,11 @@
 					n->objargs = extractAggrArgTypes((yyvsp[0].list));
 					(yyval.node) = (Node *)n;
 				}
-#line 26921 "gram.c" /* yacc.c:1646  */
+#line 26936 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 581:
-#line 3921 "gram.y" /* yacc.c:1646  */
+  case 583:
+#line 3930 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-7].str);
@@ -26931,11 +26946,11 @@
 					n->objargs = list_make1((yyvsp[-1].typnam));
 					(yyval.node) = (Node *) n;
 				}
-#line 26935 "gram.c" /* yacc.c:1646  */
+#line 26950 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 582:
-#line 3931 "gram.y" /* yacc.c:1646  */
+  case 584:
+#line 3940 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-3].str);
@@ -26944,11 +26959,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 26948 "gram.c" /* yacc.c:1646  */
+#line 26963 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 583:
-#line 3940 "gram.y" /* yacc.c:1646  */
+  case 585:
+#line 3949 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-3].str);
@@ -26957,11 +26972,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 26961 "gram.c" /* yacc.c:1646  */
+#line 26976 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 584:
-#line 3949 "gram.y" /* yacc.c:1646  */
+  case 586:
+#line 3958 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-3].str);
@@ -26970,11 +26985,11 @@
 					n->objname = list_make1((yyvsp[0].typnam));
 					(yyval.node) = (Node *)n;
 				}
-#line 26974 "gram.c" /* yacc.c:1646  */
+#line 26989 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 585:
-#line 3958 "gram.y" /* yacc.c:1646  */
+  case 587:
+#line 3967 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-3].str);
@@ -26984,11 +26999,11 @@
 					n->objargs = (yyvsp[0].funwithargs)->funcargs;
 					(yyval.node) = (Node *)n;
 				}
-#line 26988 "gram.c" /* yacc.c:1646  */
+#line 27003 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 586:
-#line 3968 "gram.y" /* yacc.c:1646  */
+  case 588:
+#line 3977 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-4].str);
@@ -26997,11 +27012,11 @@
 					n->objname = list_make1(makeString((yyvsp[0].str)));
 					(yyval.node) = (Node *)n;
 				}
-#line 27001 "gram.c" /* yacc.c:1646  */
+#line 27016 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 587:
-#line 3977 "gram.y" /* yacc.c:1646  */
+  case 589:
+#line 3986 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-4].str);
@@ -27011,11 +27026,11 @@
 					n->objargs = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 27015 "gram.c" /* yacc.c:1646  */
+#line 27030 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 588:
-#line 3987 "gram.y" /* yacc.c:1646  */
+  case 590:
+#line 3996 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-6].str);
@@ -27024,11 +27039,11 @@
 					n->objname = lcons(makeString((yyvsp[0].str)), (yyvsp[-2].list));
 					(yyval.node) = (Node *)n;
 				}
-#line 27028 "gram.c" /* yacc.c:1646  */
+#line 27043 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 589:
-#line 3996 "gram.y" /* yacc.c:1646  */
+  case 591:
+#line 4005 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-6].str);
@@ -27037,11 +27052,11 @@
 					n->objname = lcons(makeString((yyvsp[0].str)), (yyvsp[-2].list));
 					(yyval.node) = (Node *)n;
 				}
-#line 27041 "gram.c" /* yacc.c:1646  */
+#line 27056 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 590:
-#line 4005 "gram.y" /* yacc.c:1646  */
+  case 592:
+#line 4014 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-3].str);
@@ -27050,11 +27065,11 @@
 					n->objname = list_make1(makeString((yyvsp[0].str)));
 					(yyval.node) = (Node *)n;
 				}
-#line 27054 "gram.c" /* yacc.c:1646  */
+#line 27069 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 591:
-#line 4014 "gram.y" /* yacc.c:1646  */
+  case 593:
+#line 4023 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-4].str);
@@ -27063,11 +27078,11 @@
 					n->objname = list_make1(makeString((yyvsp[0].str)));
 					(yyval.node) = (Node *)n;
 				}
-#line 27067 "gram.c" /* yacc.c:1646  */
+#line 27082 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 592:
-#line 4023 "gram.y" /* yacc.c:1646  */
+  case 594:
+#line 4032 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-3].str);
@@ -27076,11 +27091,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 27080 "gram.c" /* yacc.c:1646  */
+#line 27095 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 593:
-#line 4032 "gram.y" /* yacc.c:1646  */
+  case 595:
+#line 4041 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-5].str);
@@ -27089,11 +27104,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 27093 "gram.c" /* yacc.c:1646  */
+#line 27108 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 594:
-#line 4041 "gram.y" /* yacc.c:1646  */
+  case 596:
+#line 4050 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-5].str);
@@ -27102,11 +27117,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 27106 "gram.c" /* yacc.c:1646  */
+#line 27121 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 595:
-#line 4050 "gram.y" /* yacc.c:1646  */
+  case 597:
+#line 4059 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-5].str);
@@ -27115,11 +27130,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 27119 "gram.c" /* yacc.c:1646  */
+#line 27134 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 596:
-#line 4059 "gram.y" /* yacc.c:1646  */
+  case 598:
+#line 4068 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-5].str);
@@ -27128,11 +27143,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 27132 "gram.c" /* yacc.c:1646  */
+#line 27147 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 597:
-#line 4068 "gram.y" /* yacc.c:1646  */
+  case 599:
+#line 4077 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-3].str);
@@ -27141,11 +27156,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 27145 "gram.c" /* yacc.c:1646  */
+#line 27160 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 598:
-#line 4077 "gram.y" /* yacc.c:1646  */
+  case 600:
+#line 4086 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-3].str);
@@ -27154,11 +27169,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 27158 "gram.c" /* yacc.c:1646  */
+#line 27173 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 599:
-#line 4086 "gram.y" /* yacc.c:1646  */
+  case 601:
+#line 4095 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-4].str);
@@ -27167,11 +27182,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 27171 "gram.c" /* yacc.c:1646  */
+#line 27186 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 600:
-#line 4095 "gram.y" /* yacc.c:1646  */
+  case 602:
+#line 4104 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-4].str);
@@ -27180,11 +27195,11 @@
 					n->objname = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 27184 "gram.c" /* yacc.c:1646  */
+#line 27199 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 601:
-#line 4104 "gram.y" /* yacc.c:1646  */
+  case 603:
+#line 4113 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-5].str);
@@ -27193,11 +27208,11 @@
 					n->objname = list_make1(makeString((yyvsp[0].str)));
 					(yyval.node) = (Node *)n;
 				}
-#line 27197 "gram.c" /* yacc.c:1646  */
+#line 27212 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 602:
-#line 4113 "gram.y" /* yacc.c:1646  */
+  case 604:
+#line 4122 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-3].str);
@@ -27206,11 +27221,11 @@
 					n->objname = list_make1(makeString((yyvsp[0].str)));
 					(yyval.node) = (Node *)n;
 				}
-#line 27210 "gram.c" /* yacc.c:1646  */
+#line 27225 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 603:
-#line 4122 "gram.y" /* yacc.c:1646  */
+  case 605:
+#line 4131 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-6].str);
@@ -27220,11 +27235,11 @@
 					n->objargs = list_make1(makeString((yyvsp[0].str)));
 					(yyval.node) = (Node *)n;
 				}
-#line 27224 "gram.c" /* yacc.c:1646  */
+#line 27239 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 604:
-#line 4132 "gram.y" /* yacc.c:1646  */
+  case 606:
+#line 4141 "gram.y" /* yacc.c:1646  */
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
 					n->extname = (yyvsp[-3].str);
@@ -27233,11 +27248,11 @@
 					n->objname = list_make1((yyvsp[0].typnam));
 					(yyval.node) = (Node *)n;
 				}
-#line 27237 "gram.c" /* yacc.c:1646  */
+#line 27252 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 605:
-#line 4150 "gram.y" /* yacc.c:1646  */
+  case 607:
+#line 4159 "gram.y" /* yacc.c:1646  */
     {
 					CreateFdwStmt *n = makeNode(CreateFdwStmt);
 					n->fdwname = (yyvsp[-2].str);
@@ -27245,59 +27260,59 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 27249 "gram.c" /* yacc.c:1646  */
+#line 27264 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 606:
-#line 4160 "gram.y" /* yacc.c:1646  */
+  case 608:
+#line 4169 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = makeDefElem("handler", (Node *)(yyvsp[0].list)); }
-#line 27255 "gram.c" /* yacc.c:1646  */
+#line 27270 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 607:
-#line 4161 "gram.y" /* yacc.c:1646  */
+  case 609:
+#line 4170 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = makeDefElem("handler", NULL); }
-#line 27261 "gram.c" /* yacc.c:1646  */
+#line 27276 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 608:
-#line 4162 "gram.y" /* yacc.c:1646  */
+  case 610:
+#line 4171 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = makeDefElem("validator", (Node *)(yyvsp[0].list)); }
-#line 27267 "gram.c" /* yacc.c:1646  */
+#line 27282 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 609:
-#line 4163 "gram.y" /* yacc.c:1646  */
+  case 611:
+#line 4172 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = makeDefElem("validator", NULL); }
-#line 27273 "gram.c" /* yacc.c:1646  */
+#line 27288 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 610:
-#line 4167 "gram.y" /* yacc.c:1646  */
+  case 612:
+#line 4176 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 27279 "gram.c" /* yacc.c:1646  */
+#line 27294 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 611:
-#line 4168 "gram.y" /* yacc.c:1646  */
+  case 613:
+#line 4177 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 27285 "gram.c" /* yacc.c:1646  */
+#line 27300 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 612:
-#line 4172 "gram.y" /* yacc.c:1646  */
+  case 614:
+#line 4181 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 27291 "gram.c" /* yacc.c:1646  */
+#line 27306 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 613:
-#line 4173 "gram.y" /* yacc.c:1646  */
+  case 615:
+#line 4182 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 27297 "gram.c" /* yacc.c:1646  */
+#line 27312 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 614:
-#line 4184 "gram.y" /* yacc.c:1646  */
+  case 616:
+#line 4193 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_FDW;
@@ -27308,11 +27323,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 27312 "gram.c" /* yacc.c:1646  */
+#line 27327 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 615:
-#line 4195 "gram.y" /* yacc.c:1646  */
+  case 617:
+#line 4204 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_FDW;
@@ -27323,11 +27338,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 27327 "gram.c" /* yacc.c:1646  */
+#line 27342 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 616:
-#line 4215 "gram.y" /* yacc.c:1646  */
+  case 618:
+#line 4224 "gram.y" /* yacc.c:1646  */
     {
 					AlterFdwStmt *n = makeNode(AlterFdwStmt);
 					n->fdwname = (yyvsp[-2].str);
@@ -27335,11 +27350,11 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 27339 "gram.c" /* yacc.c:1646  */
+#line 27354 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 617:
-#line 4223 "gram.y" /* yacc.c:1646  */
+  case 619:
+#line 4232 "gram.y" /* yacc.c:1646  */
     {
 					AlterFdwStmt *n = makeNode(AlterFdwStmt);
 					n->fdwname = (yyvsp[-1].str);
@@ -27347,115 +27362,115 @@
 					n->options = NIL;
 					(yyval.node) = (Node *) n;
 				}
-#line 27351 "gram.c" /* yacc.c:1646  */
+#line 27366 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 618:
-#line 4234 "gram.y" /* yacc.c:1646  */
+  case 620:
+#line 4243 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 27357 "gram.c" /* yacc.c:1646  */
+#line 27372 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 619:
-#line 4235 "gram.y" /* yacc.c:1646  */
+  case 621:
+#line 4244 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 27363 "gram.c" /* yacc.c:1646  */
+#line 27378 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 620:
-#line 4240 "gram.y" /* yacc.c:1646  */
+  case 622:
+#line 4249 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].defelt));
 				}
-#line 27371 "gram.c" /* yacc.c:1646  */
+#line 27386 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 621:
-#line 4244 "gram.y" /* yacc.c:1646  */
+  case 623:
+#line 4253 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].defelt));
 				}
-#line 27379 "gram.c" /* yacc.c:1646  */
+#line 27394 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 622:
-#line 4251 "gram.y" /* yacc.c:1646  */
+  case 624:
+#line 4260 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 27385 "gram.c" /* yacc.c:1646  */
+#line 27400 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 623:
-#line 4256 "gram.y" /* yacc.c:1646  */
+  case 625:
+#line 4265 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].defelt));
 				}
-#line 27393 "gram.c" /* yacc.c:1646  */
+#line 27408 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 624:
-#line 4260 "gram.y" /* yacc.c:1646  */
+  case 626:
+#line 4269 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].defelt));
 				}
-#line 27401 "gram.c" /* yacc.c:1646  */
+#line 27416 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 625:
-#line 4267 "gram.y" /* yacc.c:1646  */
+  case 627:
+#line 4276 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = (yyvsp[0].defelt);
 				}
-#line 27409 "gram.c" /* yacc.c:1646  */
+#line 27424 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 626:
-#line 4271 "gram.y" /* yacc.c:1646  */
+  case 628:
+#line 4280 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = (yyvsp[0].defelt);
 					(yyval.defelt)->defaction = DEFELEM_SET;
 				}
-#line 27418 "gram.c" /* yacc.c:1646  */
+#line 27433 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 627:
-#line 4276 "gram.y" /* yacc.c:1646  */
+  case 629:
+#line 4285 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = (yyvsp[0].defelt);
 					(yyval.defelt)->defaction = DEFELEM_ADD;
 				}
-#line 27427 "gram.c" /* yacc.c:1646  */
+#line 27442 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 628:
-#line 4281 "gram.y" /* yacc.c:1646  */
+  case 630:
+#line 4290 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElemExtended(NULL, (yyvsp[0].str), NULL, DEFELEM_DROP);
 				}
-#line 27435 "gram.c" /* yacc.c:1646  */
+#line 27450 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 629:
-#line 4288 "gram.y" /* yacc.c:1646  */
+  case 631:
+#line 4297 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[-1].str), (yyvsp[0].node));
 				}
-#line 27443 "gram.c" /* yacc.c:1646  */
+#line 27458 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 630:
-#line 4294 "gram.y" /* yacc.c:1646  */
+  case 632:
+#line 4303 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 27449 "gram.c" /* yacc.c:1646  */
+#line 27464 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 631:
-#line 4299 "gram.y" /* yacc.c:1646  */
+  case 633:
+#line 4308 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeString((yyvsp[0].str)); }
-#line 27455 "gram.c" /* yacc.c:1646  */
+#line 27470 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 632:
-#line 4311 "gram.y" /* yacc.c:1646  */
+  case 634:
+#line 4320 "gram.y" /* yacc.c:1646  */
     {
 					CreateForeignServerStmt *n = makeNode(CreateForeignServerStmt);
 					n->servername = (yyvsp[-7].str);
@@ -27465,47 +27480,47 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 27469 "gram.c" /* yacc.c:1646  */
+#line 27484 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 633:
-#line 4323 "gram.y" /* yacc.c:1646  */
+  case 635:
+#line 4332 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 27475 "gram.c" /* yacc.c:1646  */
+#line 27490 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 634:
-#line 4324 "gram.y" /* yacc.c:1646  */
+  case 636:
+#line 4333 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 27481 "gram.c" /* yacc.c:1646  */
+#line 27496 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 635:
-#line 4329 "gram.y" /* yacc.c:1646  */
+  case 637:
+#line 4338 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 27487 "gram.c" /* yacc.c:1646  */
+#line 27502 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 636:
-#line 4330 "gram.y" /* yacc.c:1646  */
+  case 638:
+#line 4339 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 27493 "gram.c" /* yacc.c:1646  */
+#line 27508 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 637:
-#line 4334 "gram.y" /* yacc.c:1646  */
+  case 639:
+#line 4343 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 27499 "gram.c" /* yacc.c:1646  */
+#line 27514 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 638:
-#line 4335 "gram.y" /* yacc.c:1646  */
+  case 640:
+#line 4344 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 27505 "gram.c" /* yacc.c:1646  */
+#line 27520 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 639:
-#line 4346 "gram.y" /* yacc.c:1646  */
+  case 641:
+#line 4355 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_FOREIGN_SERVER;
@@ -27516,11 +27531,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 27520 "gram.c" /* yacc.c:1646  */
+#line 27535 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 640:
-#line 4357 "gram.y" /* yacc.c:1646  */
+  case 642:
+#line 4366 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_FOREIGN_SERVER;
@@ -27531,11 +27546,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 27535 "gram.c" /* yacc.c:1646  */
+#line 27550 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 641:
-#line 4377 "gram.y" /* yacc.c:1646  */
+  case 643:
+#line 4386 "gram.y" /* yacc.c:1646  */
     {
 					AlterForeignServerStmt *n = makeNode(AlterForeignServerStmt);
 					n->servername = (yyvsp[-2].str);
@@ -27544,11 +27559,11 @@
 					n->has_version = true;
 					(yyval.node) = (Node *) n;
 				}
-#line 27548 "gram.c" /* yacc.c:1646  */
+#line 27563 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 642:
-#line 4386 "gram.y" /* yacc.c:1646  */
+  case 644:
+#line 4395 "gram.y" /* yacc.c:1646  */
     {
 					AlterForeignServerStmt *n = makeNode(AlterForeignServerStmt);
 					n->servername = (yyvsp[-1].str);
@@ -27556,22 +27571,22 @@
 					n->has_version = true;
 					(yyval.node) = (Node *) n;
 				}
-#line 27560 "gram.c" /* yacc.c:1646  */
+#line 27575 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 643:
-#line 4394 "gram.y" /* yacc.c:1646  */
+  case 645:
+#line 4403 "gram.y" /* yacc.c:1646  */
     {
 					AlterForeignServerStmt *n = makeNode(AlterForeignServerStmt);
 					n->servername = (yyvsp[-1].str);
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 27571 "gram.c" /* yacc.c:1646  */
+#line 27586 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 644:
-#line 4413 "gram.y" /* yacc.c:1646  */
+  case 646:
+#line 4422 "gram.y" /* yacc.c:1646  */
     {
 					CreateForeignTableStmt *n = makeNode(CreateForeignTableStmt);
 					(yyvsp[-7].range)->relpersistence = RELPERSISTENCE_PERMANENT;
@@ -27589,11 +27604,11 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 27593 "gram.c" /* yacc.c:1646  */
+#line 27608 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 645:
-#line 4433 "gram.y" /* yacc.c:1646  */
+  case 647:
+#line 4442 "gram.y" /* yacc.c:1646  */
     {
 					CreateForeignTableStmt *n = makeNode(CreateForeignTableStmt);
 					(yyvsp[-7].range)->relpersistence = RELPERSISTENCE_PERMANENT;
@@ -27611,11 +27626,11 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 27615 "gram.c" /* yacc.c:1646  */
+#line 27630 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 646:
-#line 4461 "gram.y" /* yacc.c:1646  */
+  case 648:
+#line 4470 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -27624,11 +27639,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 27628 "gram.c" /* yacc.c:1646  */
+#line 27643 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 647:
-#line 4470 "gram.y" /* yacc.c:1646  */
+  case 649:
+#line 4479 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
 					n->relation = (yyvsp[-1].range);
@@ -27637,11 +27652,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 27641 "gram.c" /* yacc.c:1646  */
+#line 27656 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 648:
-#line 4492 "gram.y" /* yacc.c:1646  */
+  case 650:
+#line 4501 "gram.y" /* yacc.c:1646  */
     {
 				ImportForeignSchemaStmt *n = makeNode(ImportForeignSchemaStmt);
 				n->server_name = (yyvsp[-3].str);
@@ -27652,45 +27667,45 @@
 				n->options = (yyvsp[0].list);
 				(yyval.node) = (Node *) n;
 			}
-#line 27656 "gram.c" /* yacc.c:1646  */
+#line 27671 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 649:
-#line 4505 "gram.y" /* yacc.c:1646  */
+  case 651:
+#line 4514 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = FDW_IMPORT_SCHEMA_LIMIT_TO; }
-#line 27662 "gram.c" /* yacc.c:1646  */
+#line 27677 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 650:
-#line 4506 "gram.y" /* yacc.c:1646  */
+  case 652:
+#line 4515 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = FDW_IMPORT_SCHEMA_EXCEPT; }
-#line 27668 "gram.c" /* yacc.c:1646  */
+#line 27683 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 651:
-#line 4511 "gram.y" /* yacc.c:1646  */
+  case 653:
+#line 4520 "gram.y" /* yacc.c:1646  */
     {
 				ImportQual *n = (ImportQual *) palloc(sizeof(ImportQual));
 				n->type = (yyvsp[-3].ival);
 				n->table_names = (yyvsp[-1].list);
 				(yyval.importqual) = n;
 			}
-#line 27679 "gram.c" /* yacc.c:1646  */
+#line 27694 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 652:
-#line 4518 "gram.y" /* yacc.c:1646  */
+  case 654:
+#line 4527 "gram.y" /* yacc.c:1646  */
     {
 				ImportQual *n = (ImportQual *) palloc(sizeof(ImportQual));
 				n->type = FDW_IMPORT_SCHEMA_ALL;
 				n->table_names = NIL;
 				(yyval.importqual) = n;
 			}
-#line 27690 "gram.c" /* yacc.c:1646  */
+#line 27705 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 653:
-#line 4534 "gram.y" /* yacc.c:1646  */
+  case 655:
+#line 4543 "gram.y" /* yacc.c:1646  */
     {
 					CreateUserMappingStmt *n = makeNode(CreateUserMappingStmt);
 					n->user = (yyvsp[-3].node);
@@ -27698,23 +27713,23 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 27702 "gram.c" /* yacc.c:1646  */
+#line 27717 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 654:
-#line 4544 "gram.y" /* yacc.c:1646  */
+  case 656:
+#line 4553 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 27708 "gram.c" /* yacc.c:1646  */
+#line 27723 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 655:
-#line 4545 "gram.y" /* yacc.c:1646  */
+  case 657:
+#line 4554 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeRoleSpec(ROLESPEC_CURRENT_USER, (yylsp[0])); }
-#line 27714 "gram.c" /* yacc.c:1646  */
+#line 27729 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 656:
-#line 4556 "gram.y" /* yacc.c:1646  */
+  case 658:
+#line 4565 "gram.y" /* yacc.c:1646  */
     {
 					DropUserMappingStmt *n = makeNode(DropUserMappingStmt);
 					n->user = (yyvsp[-2].node);
@@ -27722,11 +27737,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 27726 "gram.c" /* yacc.c:1646  */
+#line 27741 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 657:
-#line 4564 "gram.y" /* yacc.c:1646  */
+  case 659:
+#line 4573 "gram.y" /* yacc.c:1646  */
     {
 					DropUserMappingStmt *n = makeNode(DropUserMappingStmt);
 					n->user = (yyvsp[-2].node);
@@ -27734,11 +27749,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *) n;
 				}
-#line 27738 "gram.c" /* yacc.c:1646  */
+#line 27753 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 658:
-#line 4581 "gram.y" /* yacc.c:1646  */
+  case 660:
+#line 4590 "gram.y" /* yacc.c:1646  */
     {
 					AlterUserMappingStmt *n = makeNode(AlterUserMappingStmt);
 					n->user = (yyvsp[-3].node);
@@ -27746,11 +27761,11 @@
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 27750 "gram.c" /* yacc.c:1646  */
+#line 27765 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 659:
-#line 4605 "gram.y" /* yacc.c:1646  */
+  case 661:
+#line 4614 "gram.y" /* yacc.c:1646  */
     {
 					CreatePolicyStmt *n = makeNode(CreatePolicyStmt);
 					n->policy_name = (yyvsp[-6].str);
@@ -27761,11 +27776,11 @@
 					n->with_check = (yyvsp[0].node);
 					(yyval.node) = (Node *) n;
 				}
-#line 27765 "gram.c" /* yacc.c:1646  */
+#line 27780 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 660:
-#line 4620 "gram.y" /* yacc.c:1646  */
+  case 662:
+#line 4629 "gram.y" /* yacc.c:1646  */
     {
 					AlterPolicyStmt *n = makeNode(AlterPolicyStmt);
 					n->policy_name = (yyvsp[-5].str);
@@ -27775,11 +27790,11 @@
 					n->with_check = (yyvsp[0].node);
 					(yyval.node) = (Node *) n;
 				}
-#line 27779 "gram.c" /* yacc.c:1646  */
+#line 27794 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 661:
-#line 4633 "gram.y" /* yacc.c:1646  */
+  case 663:
+#line 4642 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_POLICY;
@@ -27790,11 +27805,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 27794 "gram.c" /* yacc.c:1646  */
+#line 27809 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 662:
-#line 4644 "gram.y" /* yacc.c:1646  */
+  case 664:
+#line 4653 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_POLICY;
@@ -27805,101 +27820,101 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 27809 "gram.c" /* yacc.c:1646  */
+#line 27824 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 663:
-#line 4657 "gram.y" /* yacc.c:1646  */
+  case 665:
+#line 4666 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[-1].node); }
-#line 27815 "gram.c" /* yacc.c:1646  */
+#line 27830 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 664:
-#line 4658 "gram.y" /* yacc.c:1646  */
+  case 666:
+#line 4667 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 27821 "gram.c" /* yacc.c:1646  */
+#line 27836 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 665:
-#line 4662 "gram.y" /* yacc.c:1646  */
+  case 667:
+#line 4671 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[-1].node); }
-#line 27827 "gram.c" /* yacc.c:1646  */
+#line 27842 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 666:
-#line 4663 "gram.y" /* yacc.c:1646  */
+  case 668:
+#line 4672 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 27833 "gram.c" /* yacc.c:1646  */
+#line 27848 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 667:
-#line 4667 "gram.y" /* yacc.c:1646  */
+  case 669:
+#line 4676 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 27839 "gram.c" /* yacc.c:1646  */
+#line 27854 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 668:
-#line 4668 "gram.y" /* yacc.c:1646  */
+  case 670:
+#line 4677 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeRoleSpec(ROLESPEC_PUBLIC, -1)); }
-#line 27845 "gram.c" /* yacc.c:1646  */
+#line 27860 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 669:
-#line 4672 "gram.y" /* yacc.c:1646  */
+  case 671:
+#line 4681 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 27851 "gram.c" /* yacc.c:1646  */
+#line 27866 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 670:
-#line 4673 "gram.y" /* yacc.c:1646  */
+  case 672:
+#line 4682 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NULL; }
-#line 27857 "gram.c" /* yacc.c:1646  */
+#line 27872 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 671:
-#line 4677 "gram.y" /* yacc.c:1646  */
+  case 673:
+#line 4686 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 27863 "gram.c" /* yacc.c:1646  */
+#line 27878 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 672:
-#line 4678 "gram.y" /* yacc.c:1646  */
+  case 674:
+#line 4687 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "all"; }
-#line 27869 "gram.c" /* yacc.c:1646  */
+#line 27884 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 673:
-#line 4682 "gram.y" /* yacc.c:1646  */
+  case 675:
+#line 4691 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "all"; }
-#line 27875 "gram.c" /* yacc.c:1646  */
+#line 27890 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 674:
-#line 4683 "gram.y" /* yacc.c:1646  */
+  case 676:
+#line 4692 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "select"; }
-#line 27881 "gram.c" /* yacc.c:1646  */
+#line 27896 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 675:
-#line 4684 "gram.y" /* yacc.c:1646  */
+  case 677:
+#line 4693 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "insert"; }
-#line 27887 "gram.c" /* yacc.c:1646  */
+#line 27902 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 676:
-#line 4685 "gram.y" /* yacc.c:1646  */
+  case 678:
+#line 4694 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "update"; }
-#line 27893 "gram.c" /* yacc.c:1646  */
+#line 27908 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 677:
-#line 4686 "gram.y" /* yacc.c:1646  */
+  case 679:
+#line 4695 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "delete"; }
-#line 27899 "gram.c" /* yacc.c:1646  */
+#line 27914 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 678:
-#line 4701 "gram.y" /* yacc.c:1646  */
+  case 680:
+#line 4710 "gram.y" /* yacc.c:1646  */
     {
 					CreateTrigStmt *n = makeNode(CreateTrigStmt);
 					n->trigname = (yyvsp[-12].str);
@@ -27917,11 +27932,11 @@
 					n->constrrel = NULL;
 					(yyval.node) = (Node *)n;
 				}
-#line 27921 "gram.c" /* yacc.c:1646  */
+#line 27936 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 679:
-#line 4722 "gram.y" /* yacc.c:1646  */
+  case 681:
+#line 4731 "gram.y" /* yacc.c:1646  */
     {
 					CreateTrigStmt *n = makeNode(CreateTrigStmt);
 					n->trigname = (yyvsp[-16].str);
@@ -27940,35 +27955,35 @@
 					n->constrrel = (yyvsp[-11].range);
 					(yyval.node) = (Node *)n;
 				}
-#line 27944 "gram.c" /* yacc.c:1646  */
+#line 27959 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 680:
-#line 4743 "gram.y" /* yacc.c:1646  */
+  case 682:
+#line 4752 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = TRIGGER_TYPE_BEFORE; }
-#line 27950 "gram.c" /* yacc.c:1646  */
+#line 27965 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 681:
-#line 4744 "gram.y" /* yacc.c:1646  */
+  case 683:
+#line 4753 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = TRIGGER_TYPE_AFTER; }
-#line 27956 "gram.c" /* yacc.c:1646  */
+#line 27971 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 682:
-#line 4745 "gram.y" /* yacc.c:1646  */
+  case 684:
+#line 4754 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = TRIGGER_TYPE_INSTEAD; }
-#line 27962 "gram.c" /* yacc.c:1646  */
+#line 27977 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 683:
-#line 4750 "gram.y" /* yacc.c:1646  */
+  case 685:
+#line 4759 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 27968 "gram.c" /* yacc.c:1646  */
+#line 27983 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 684:
-#line 4752 "gram.y" /* yacc.c:1646  */
+  case 686:
+#line 4761 "gram.y" /* yacc.c:1646  */
     {
 					int		events1 = intVal(linitial((yyvsp[-2].list)));
 					int		events2 = intVal(linitial((yyvsp[0].list)));
@@ -27987,49 +28002,49 @@
 					(yyval.list) = list_make2(makeInteger(events1 | events2),
 									list_concat(columns1, columns2));
 				}
-#line 27991 "gram.c" /* yacc.c:1646  */
+#line 28006 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 685:
-#line 4774 "gram.y" /* yacc.c:1646  */
+  case 687:
+#line 4783 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2(makeInteger(TRIGGER_TYPE_INSERT), NIL); }
-#line 27997 "gram.c" /* yacc.c:1646  */
+#line 28012 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 686:
-#line 4776 "gram.y" /* yacc.c:1646  */
+  case 688:
+#line 4785 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2(makeInteger(TRIGGER_TYPE_DELETE), NIL); }
-#line 28003 "gram.c" /* yacc.c:1646  */
+#line 28018 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 687:
-#line 4778 "gram.y" /* yacc.c:1646  */
+  case 689:
+#line 4787 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2(makeInteger(TRIGGER_TYPE_UPDATE), NIL); }
-#line 28009 "gram.c" /* yacc.c:1646  */
+#line 28024 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 688:
-#line 4780 "gram.y" /* yacc.c:1646  */
+  case 690:
+#line 4789 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2(makeInteger(TRIGGER_TYPE_UPDATE), (yyvsp[0].list)); }
-#line 28015 "gram.c" /* yacc.c:1646  */
+#line 28030 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 689:
-#line 4782 "gram.y" /* yacc.c:1646  */
+  case 691:
+#line 4791 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2(makeInteger(TRIGGER_TYPE_TRUNCATE), NIL); }
-#line 28021 "gram.c" /* yacc.c:1646  */
+#line 28036 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 690:
-#line 4787 "gram.y" /* yacc.c:1646  */
+  case 692:
+#line 4796 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.boolean) = (yyvsp[0].boolean);
 				}
-#line 28029 "gram.c" /* yacc.c:1646  */
+#line 28044 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 691:
-#line 4791 "gram.y" /* yacc.c:1646  */
+  case 693:
+#line 4800 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * If ROW/STATEMENT not specified, default to
@@ -28037,109 +28052,109 @@
 					 */
 					(yyval.boolean) = FALSE;
 				}
-#line 28041 "gram.c" /* yacc.c:1646  */
+#line 28056 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 692:
-#line 4801 "gram.y" /* yacc.c:1646  */
+  case 694:
+#line 4810 "gram.y" /* yacc.c:1646  */
     {}
-#line 28047 "gram.c" /* yacc.c:1646  */
+#line 28062 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 693:
-#line 4802 "gram.y" /* yacc.c:1646  */
+  case 695:
+#line 4811 "gram.y" /* yacc.c:1646  */
     {}
-#line 28053 "gram.c" /* yacc.c:1646  */
+#line 28068 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 694:
-#line 4806 "gram.y" /* yacc.c:1646  */
+  case 696:
+#line 4815 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 28059 "gram.c" /* yacc.c:1646  */
+#line 28074 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 695:
-#line 4807 "gram.y" /* yacc.c:1646  */
+  case 697:
+#line 4816 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 28065 "gram.c" /* yacc.c:1646  */
+#line 28080 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 696:
-#line 4811 "gram.y" /* yacc.c:1646  */
+  case 698:
+#line 4820 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[-1].node); }
-#line 28071 "gram.c" /* yacc.c:1646  */
+#line 28086 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 697:
-#line 4812 "gram.y" /* yacc.c:1646  */
+  case 699:
+#line 4821 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 28077 "gram.c" /* yacc.c:1646  */
+#line 28092 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 698:
-#line 4816 "gram.y" /* yacc.c:1646  */
+  case 700:
+#line 4825 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].value)); }
-#line 28083 "gram.c" /* yacc.c:1646  */
+#line 28098 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 699:
-#line 4817 "gram.y" /* yacc.c:1646  */
+  case 701:
+#line 4826 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].value)); }
-#line 28089 "gram.c" /* yacc.c:1646  */
+#line 28104 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 700:
-#line 4818 "gram.y" /* yacc.c:1646  */
+  case 702:
+#line 4827 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 28095 "gram.c" /* yacc.c:1646  */
+#line 28110 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 701:
-#line 4823 "gram.y" /* yacc.c:1646  */
+  case 703:
+#line 4832 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.value) = makeString(psprintf("%d", (yyvsp[0].ival)));
 				}
-#line 28103 "gram.c" /* yacc.c:1646  */
+#line 28118 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 702:
-#line 4826 "gram.y" /* yacc.c:1646  */
+  case 704:
+#line 4835 "gram.y" /* yacc.c:1646  */
     { (yyval.value) = makeString((yyvsp[0].str)); }
-#line 28109 "gram.c" /* yacc.c:1646  */
+#line 28124 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 703:
-#line 4827 "gram.y" /* yacc.c:1646  */
+  case 705:
+#line 4836 "gram.y" /* yacc.c:1646  */
     { (yyval.value) = makeString((yyvsp[0].str)); }
-#line 28115 "gram.c" /* yacc.c:1646  */
+#line 28130 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 704:
-#line 4828 "gram.y" /* yacc.c:1646  */
+  case 706:
+#line 4837 "gram.y" /* yacc.c:1646  */
     { (yyval.value) = makeString((yyvsp[0].str)); }
-#line 28121 "gram.c" /* yacc.c:1646  */
+#line 28136 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 705:
-#line 4832 "gram.y" /* yacc.c:1646  */
+  case 707:
+#line 4841 "gram.y" /* yacc.c:1646  */
     { (yyval.range) = (yyvsp[0].range); }
-#line 28127 "gram.c" /* yacc.c:1646  */
+#line 28142 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 706:
-#line 4833 "gram.y" /* yacc.c:1646  */
+  case 708:
+#line 4842 "gram.y" /* yacc.c:1646  */
     { (yyval.range) = NULL; }
-#line 28133 "gram.c" /* yacc.c:1646  */
+#line 28148 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 707:
-#line 4838 "gram.y" /* yacc.c:1646  */
+  case 709:
+#line 4847 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = 0; }
-#line 28139 "gram.c" /* yacc.c:1646  */
+#line 28154 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 708:
-#line 4840 "gram.y" /* yacc.c:1646  */
+  case 710:
+#line 4849 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * We must complain about conflicting options.
@@ -28163,47 +28178,47 @@
 								 parser_errposition((yylsp[0]))));
 					(yyval.ival) = newspec;
 				}
-#line 28167 "gram.c" /* yacc.c:1646  */
+#line 28182 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 709:
-#line 4866 "gram.y" /* yacc.c:1646  */
+  case 711:
+#line 4875 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CAS_NOT_DEFERRABLE; }
-#line 28173 "gram.c" /* yacc.c:1646  */
+#line 28188 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 710:
-#line 4867 "gram.y" /* yacc.c:1646  */
+  case 712:
+#line 4876 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CAS_DEFERRABLE; }
-#line 28179 "gram.c" /* yacc.c:1646  */
+#line 28194 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 711:
-#line 4868 "gram.y" /* yacc.c:1646  */
+  case 713:
+#line 4877 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CAS_INITIALLY_IMMEDIATE; }
-#line 28185 "gram.c" /* yacc.c:1646  */
+#line 28200 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 712:
-#line 4869 "gram.y" /* yacc.c:1646  */
+  case 714:
+#line 4878 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CAS_INITIALLY_DEFERRED; }
-#line 28191 "gram.c" /* yacc.c:1646  */
+#line 28206 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 713:
-#line 4870 "gram.y" /* yacc.c:1646  */
+  case 715:
+#line 4879 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CAS_NOT_VALID; }
-#line 28197 "gram.c" /* yacc.c:1646  */
+#line 28212 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 714:
-#line 4871 "gram.y" /* yacc.c:1646  */
+  case 716:
+#line 4880 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CAS_NO_INHERIT; }
-#line 28203 "gram.c" /* yacc.c:1646  */
+#line 28218 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 715:
-#line 4877 "gram.y" /* yacc.c:1646  */
+  case 717:
+#line 4886 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_TRIGGER;
@@ -28214,11 +28229,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 28218 "gram.c" /* yacc.c:1646  */
+#line 28233 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 716:
-#line 4888 "gram.y" /* yacc.c:1646  */
+  case 718:
+#line 4897 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_TRIGGER;
@@ -28229,11 +28244,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 28233 "gram.c" /* yacc.c:1646  */
+#line 28248 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 717:
-#line 4912 "gram.y" /* yacc.c:1646  */
+  case 719:
+#line 4921 "gram.y" /* yacc.c:1646  */
     {
 					CreateEventTrigStmt *n = makeNode(CreateEventTrigStmt);
 					n->trigname = (yyvsp[-7].str);
@@ -28242,11 +28257,11 @@
 					n->funcname = (yyvsp[-2].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28246 "gram.c" /* yacc.c:1646  */
+#line 28261 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 718:
-#line 4923 "gram.y" /* yacc.c:1646  */
+  case 720:
+#line 4932 "gram.y" /* yacc.c:1646  */
     {
 					CreateEventTrigStmt *n = makeNode(CreateEventTrigStmt);
 					n->trigname = (yyvsp[-9].str);
@@ -28255,76 +28270,76 @@
 					n->funcname = (yyvsp[-2].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28259 "gram.c" /* yacc.c:1646  */
+#line 28274 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 719:
-#line 4935 "gram.y" /* yacc.c:1646  */
+  case 721:
+#line 4944 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 28265 "gram.c" /* yacc.c:1646  */
+#line 28280 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 720:
-#line 4937 "gram.y" /* yacc.c:1646  */
+  case 722:
+#line 4946 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].defelt)); }
-#line 28271 "gram.c" /* yacc.c:1646  */
+#line 28286 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 721:
-#line 4942 "gram.y" /* yacc.c:1646  */
+  case 723:
+#line 4951 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = makeDefElem((yyvsp[-4].str), (Node *) (yyvsp[-1].list)); }
-#line 28277 "gram.c" /* yacc.c:1646  */
+#line 28292 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 722:
-#line 4947 "gram.y" /* yacc.c:1646  */
+  case 724:
+#line 4956 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 28283 "gram.c" /* yacc.c:1646  */
+#line 28298 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 723:
-#line 4949 "gram.y" /* yacc.c:1646  */
+  case 725:
+#line 4958 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), makeString((yyvsp[0].str))); }
-#line 28289 "gram.c" /* yacc.c:1646  */
+#line 28304 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 724:
-#line 4954 "gram.y" /* yacc.c:1646  */
+  case 726:
+#line 4963 "gram.y" /* yacc.c:1646  */
     {
 					AlterEventTrigStmt *n = makeNode(AlterEventTrigStmt);
 					n->trigname = (yyvsp[-1].str);
 					n->tgenabled = (yyvsp[0].chr);
 					(yyval.node) = (Node *) n;
 				}
-#line 28300 "gram.c" /* yacc.c:1646  */
+#line 28315 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 725:
-#line 4963 "gram.y" /* yacc.c:1646  */
+  case 727:
+#line 4972 "gram.y" /* yacc.c:1646  */
     { (yyval.chr) = TRIGGER_FIRES_ON_ORIGIN; }
-#line 28306 "gram.c" /* yacc.c:1646  */
+#line 28321 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 726:
-#line 4964 "gram.y" /* yacc.c:1646  */
+  case 728:
+#line 4973 "gram.y" /* yacc.c:1646  */
     { (yyval.chr) = TRIGGER_FIRES_ON_REPLICA; }
-#line 28312 "gram.c" /* yacc.c:1646  */
+#line 28327 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 727:
-#line 4965 "gram.y" /* yacc.c:1646  */
+  case 729:
+#line 4974 "gram.y" /* yacc.c:1646  */
     { (yyval.chr) = TRIGGER_FIRES_ALWAYS; }
-#line 28318 "gram.c" /* yacc.c:1646  */
+#line 28333 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 728:
-#line 4966 "gram.y" /* yacc.c:1646  */
+  case 730:
+#line 4975 "gram.y" /* yacc.c:1646  */
     { (yyval.chr) = TRIGGER_DISABLED; }
-#line 28324 "gram.c" /* yacc.c:1646  */
+#line 28339 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 729:
-#line 4980 "gram.y" /* yacc.c:1646  */
+  case 731:
+#line 4989 "gram.y" /* yacc.c:1646  */
     {
 					CreateTrigStmt *n = makeNode(CreateTrigStmt);
 					n->trigname = (yyvsp[-5].str);
@@ -28340,11 +28355,11 @@
 
 					(yyval.node) = (Node *)n;
 				}
-#line 28344 "gram.c" /* yacc.c:1646  */
+#line 28359 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 730:
-#line 4999 "gram.y" /* yacc.c:1646  */
+  case 732:
+#line 5008 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->objects = NIL;
@@ -28356,11 +28371,11 @@
 							 errmsg("DROP ASSERTION is not yet implemented")));
 					(yyval.node) = (Node *) n;
 				}
-#line 28360 "gram.c" /* yacc.c:1646  */
+#line 28375 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 731:
-#line 5022 "gram.y" /* yacc.c:1646  */
+  case 733:
+#line 5031 "gram.y" /* yacc.c:1646  */
     {
 					DefineStmt *n = makeNode(DefineStmt);
 					n->kind = OBJECT_AGGREGATE;
@@ -28370,11 +28385,11 @@
 					n->definition = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28374 "gram.c" /* yacc.c:1646  */
+#line 28389 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 732:
-#line 5032 "gram.y" /* yacc.c:1646  */
+  case 734:
+#line 5041 "gram.y" /* yacc.c:1646  */
     {
 					/* old-style (pre-8.2) syntax for CREATE AGGREGATE */
 					DefineStmt *n = makeNode(DefineStmt);
@@ -28385,11 +28400,11 @@
 					n->definition = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28389 "gram.c" /* yacc.c:1646  */
+#line 28404 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 733:
-#line 5043 "gram.y" /* yacc.c:1646  */
+  case 735:
+#line 5052 "gram.y" /* yacc.c:1646  */
     {
 					DefineStmt *n = makeNode(DefineStmt);
 					n->kind = OBJECT_OPERATOR;
@@ -28399,11 +28414,11 @@
 					n->definition = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28403 "gram.c" /* yacc.c:1646  */
+#line 28418 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 734:
-#line 5053 "gram.y" /* yacc.c:1646  */
+  case 736:
+#line 5062 "gram.y" /* yacc.c:1646  */
     {
 					DefineStmt *n = makeNode(DefineStmt);
 					n->kind = OBJECT_TYPE;
@@ -28413,11 +28428,11 @@
 					n->definition = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28417 "gram.c" /* yacc.c:1646  */
+#line 28432 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 735:
-#line 5063 "gram.y" /* yacc.c:1646  */
+  case 737:
+#line 5072 "gram.y" /* yacc.c:1646  */
     {
 					/* Shell type (identified by lack of definition) */
 					DefineStmt *n = makeNode(DefineStmt);
@@ -28428,11 +28443,11 @@
 					n->definition = NIL;
 					(yyval.node) = (Node *)n;
 				}
-#line 28432 "gram.c" /* yacc.c:1646  */
+#line 28447 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 736:
-#line 5074 "gram.y" /* yacc.c:1646  */
+  case 738:
+#line 5083 "gram.y" /* yacc.c:1646  */
     {
 					CompositeTypeStmt *n = makeNode(CompositeTypeStmt);
 
@@ -28441,33 +28456,33 @@
 					n->coldeflist = (yyvsp[-1].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28445 "gram.c" /* yacc.c:1646  */
+#line 28460 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 737:
-#line 5083 "gram.y" /* yacc.c:1646  */
+  case 739:
+#line 5092 "gram.y" /* yacc.c:1646  */
     {
 					CreateEnumStmt *n = makeNode(CreateEnumStmt);
 					n->typeName = (yyvsp[-5].list);
 					n->vals = (yyvsp[-1].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28456 "gram.c" /* yacc.c:1646  */
+#line 28471 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 738:
-#line 5090 "gram.y" /* yacc.c:1646  */
+  case 740:
+#line 5099 "gram.y" /* yacc.c:1646  */
     {
 					CreateRangeStmt *n = makeNode(CreateRangeStmt);
 					n->typeName = (yyvsp[-3].list);
 					n->params	= (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28467 "gram.c" /* yacc.c:1646  */
+#line 28482 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 739:
-#line 5097 "gram.y" /* yacc.c:1646  */
+  case 741:
+#line 5106 "gram.y" /* yacc.c:1646  */
     {
 					DefineStmt *n = makeNode(DefineStmt);
 					n->kind = OBJECT_TSPARSER;
@@ -28476,11 +28491,11 @@
 					n->definition = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28480 "gram.c" /* yacc.c:1646  */
+#line 28495 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 740:
-#line 5106 "gram.y" /* yacc.c:1646  */
+  case 742:
+#line 5115 "gram.y" /* yacc.c:1646  */
     {
 					DefineStmt *n = makeNode(DefineStmt);
 					n->kind = OBJECT_TSDICTIONARY;
@@ -28489,11 +28504,11 @@
 					n->definition = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28493 "gram.c" /* yacc.c:1646  */
+#line 28508 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 741:
-#line 5115 "gram.y" /* yacc.c:1646  */
+  case 743:
+#line 5124 "gram.y" /* yacc.c:1646  */
     {
 					DefineStmt *n = makeNode(DefineStmt);
 					n->kind = OBJECT_TSTEMPLATE;
@@ -28502,11 +28517,11 @@
 					n->definition = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28506 "gram.c" /* yacc.c:1646  */
+#line 28521 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 742:
-#line 5124 "gram.y" /* yacc.c:1646  */
+  case 744:
+#line 5133 "gram.y" /* yacc.c:1646  */
     {
 					DefineStmt *n = makeNode(DefineStmt);
 					n->kind = OBJECT_TSCONFIGURATION;
@@ -28515,11 +28530,11 @@
 					n->definition = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28519 "gram.c" /* yacc.c:1646  */
+#line 28534 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 743:
-#line 5133 "gram.y" /* yacc.c:1646  */
+  case 745:
+#line 5142 "gram.y" /* yacc.c:1646  */
     {
 					DefineStmt *n = makeNode(DefineStmt);
 					n->kind = OBJECT_COLLATION;
@@ -28528,11 +28543,11 @@
 					n->definition = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 28532 "gram.c" /* yacc.c:1646  */
+#line 28547 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 744:
-#line 5142 "gram.y" /* yacc.c:1646  */
+  case 746:
+#line 5151 "gram.y" /* yacc.c:1646  */
     {
 					DefineStmt *n = makeNode(DefineStmt);
 					n->kind = OBJECT_COLLATION;
@@ -28541,125 +28556,125 @@
 					n->definition = list_make1(makeDefElem("from", (Node *) (yyvsp[0].list)));
 					(yyval.node) = (Node *)n;
 				}
-#line 28545 "gram.c" /* yacc.c:1646  */
+#line 28560 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 745:
-#line 5152 "gram.y" /* yacc.c:1646  */
+  case 747:
+#line 5161 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 28551 "gram.c" /* yacc.c:1646  */
+#line 28566 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 746:
-#line 5155 "gram.y" /* yacc.c:1646  */
+  case 748:
+#line 5164 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 28557 "gram.c" /* yacc.c:1646  */
+#line 28572 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 747:
-#line 5156 "gram.y" /* yacc.c:1646  */
+  case 749:
+#line 5165 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].defelt)); }
-#line 28563 "gram.c" /* yacc.c:1646  */
+#line 28578 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 748:
-#line 5160 "gram.y" /* yacc.c:1646  */
+  case 750:
+#line 5169 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[-2].str), (Node *) (yyvsp[0].node));
 				}
-#line 28571 "gram.c" /* yacc.c:1646  */
+#line 28586 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 749:
-#line 5164 "gram.y" /* yacc.c:1646  */
+  case 751:
+#line 5173 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[0].str), NULL);
 				}
-#line 28579 "gram.c" /* yacc.c:1646  */
+#line 28594 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 750:
-#line 5170 "gram.y" /* yacc.c:1646  */
+  case 752:
+#line 5179 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *)(yyvsp[0].typnam); }
-#line 28585 "gram.c" /* yacc.c:1646  */
+#line 28600 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 751:
-#line 5171 "gram.y" /* yacc.c:1646  */
+  case 753:
+#line 5180 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *)makeString(pstrdup((yyvsp[0].keyword))); }
-#line 28591 "gram.c" /* yacc.c:1646  */
+#line 28606 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 752:
-#line 5172 "gram.y" /* yacc.c:1646  */
+  case 754:
+#line 5181 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *)(yyvsp[0].list); }
-#line 28597 "gram.c" /* yacc.c:1646  */
+#line 28612 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 753:
-#line 5173 "gram.y" /* yacc.c:1646  */
+  case 755:
+#line 5182 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *)(yyvsp[0].value); }
-#line 28603 "gram.c" /* yacc.c:1646  */
+#line 28618 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 754:
-#line 5174 "gram.y" /* yacc.c:1646  */
+  case 756:
+#line 5183 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *)makeString((yyvsp[0].str)); }
-#line 28609 "gram.c" /* yacc.c:1646  */
+#line 28624 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 755:
-#line 5177 "gram.y" /* yacc.c:1646  */
+  case 757:
+#line 5186 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 28615 "gram.c" /* yacc.c:1646  */
+#line 28630 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 756:
-#line 5180 "gram.y" /* yacc.c:1646  */
+  case 758:
+#line 5189 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 28621 "gram.c" /* yacc.c:1646  */
+#line 28636 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 757:
-#line 5181 "gram.y" /* yacc.c:1646  */
+  case 759:
+#line 5190 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].defelt)); }
-#line 28627 "gram.c" /* yacc.c:1646  */
+#line 28642 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 758:
-#line 5190 "gram.y" /* yacc.c:1646  */
+  case 760:
+#line 5199 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[-2].str), (Node *)(yyvsp[0].node));
 				}
-#line 28635 "gram.c" /* yacc.c:1646  */
+#line 28650 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 759:
-#line 5196 "gram.y" /* yacc.c:1646  */
+  case 761:
+#line 5205 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 28641 "gram.c" /* yacc.c:1646  */
+#line 28656 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 760:
-#line 5197 "gram.y" /* yacc.c:1646  */
+  case 762:
+#line 5206 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 28647 "gram.c" /* yacc.c:1646  */
+#line 28662 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 761:
-#line 5201 "gram.y" /* yacc.c:1646  */
+  case 763:
+#line 5210 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 28653 "gram.c" /* yacc.c:1646  */
+#line 28668 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 762:
-#line 5203 "gram.y" /* yacc.c:1646  */
+  case 764:
+#line 5212 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), makeString((yyvsp[0].str))); }
-#line 28659 "gram.c" /* yacc.c:1646  */
+#line 28674 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 763:
-#line 5214 "gram.y" /* yacc.c:1646  */
+  case 765:
+#line 5223 "gram.y" /* yacc.c:1646  */
     {
 				AlterEnumStmt *n = makeNode(AlterEnumStmt);
 				n->typeName = (yyvsp[-4].list);
@@ -28669,11 +28684,11 @@
 				n->skipIfExists = (yyvsp[-1].boolean);
 				(yyval.node) = (Node *) n;
 			}
-#line 28673 "gram.c" /* yacc.c:1646  */
+#line 28688 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 764:
-#line 5224 "gram.y" /* yacc.c:1646  */
+  case 766:
+#line 5233 "gram.y" /* yacc.c:1646  */
     {
 				AlterEnumStmt *n = makeNode(AlterEnumStmt);
 				n->typeName = (yyvsp[-6].list);
@@ -28683,11 +28698,11 @@
 				n->skipIfExists = (yyvsp[-3].boolean);
 				(yyval.node) = (Node *) n;
 			}
-#line 28687 "gram.c" /* yacc.c:1646  */
+#line 28702 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 765:
-#line 5234 "gram.y" /* yacc.c:1646  */
+  case 767:
+#line 5243 "gram.y" /* yacc.c:1646  */
     {
 				AlterEnumStmt *n = makeNode(AlterEnumStmt);
 				n->typeName = (yyvsp[-6].list);
@@ -28697,23 +28712,23 @@
 				n->skipIfExists = (yyvsp[-3].boolean);
 				(yyval.node) = (Node *) n;
 			}
-#line 28701 "gram.c" /* yacc.c:1646  */
+#line 28716 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 766:
-#line 5245 "gram.y" /* yacc.c:1646  */
+  case 768:
+#line 5254 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = true; }
-#line 28707 "gram.c" /* yacc.c:1646  */
+#line 28722 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 767:
-#line 5246 "gram.y" /* yacc.c:1646  */
+  case 769:
+#line 5255 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = false; }
-#line 28713 "gram.c" /* yacc.c:1646  */
+#line 28728 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 768:
-#line 5264 "gram.y" /* yacc.c:1646  */
+  case 770:
+#line 5273 "gram.y" /* yacc.c:1646  */
     {
 					CreateOpClassStmt *n = makeNode(CreateOpClassStmt);
 					n->opclassname = (yyvsp[-9].list);
@@ -28724,23 +28739,23 @@
 					n->items = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 28728 "gram.c" /* yacc.c:1646  */
+#line 28743 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 769:
-#line 5277 "gram.y" /* yacc.c:1646  */
+  case 771:
+#line 5286 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 28734 "gram.c" /* yacc.c:1646  */
+#line 28749 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 770:
-#line 5278 "gram.y" /* yacc.c:1646  */
+  case 772:
+#line 5287 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 28740 "gram.c" /* yacc.c:1646  */
+#line 28755 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 771:
-#line 5283 "gram.y" /* yacc.c:1646  */
+  case 773:
+#line 5292 "gram.y" /* yacc.c:1646  */
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
 					n->itemtype = OPCLASS_ITEM_OPERATOR;
@@ -28750,11 +28765,11 @@
 					n->order_family = (yyvsp[-1].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 28754 "gram.c" /* yacc.c:1646  */
+#line 28769 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 772:
-#line 5294 "gram.y" /* yacc.c:1646  */
+  case 774:
+#line 5303 "gram.y" /* yacc.c:1646  */
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
 					n->itemtype = OPCLASS_ITEM_OPERATOR;
@@ -28764,11 +28779,11 @@
 					n->order_family = (yyvsp[-1].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 28768 "gram.c" /* yacc.c:1646  */
+#line 28783 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 773:
-#line 5304 "gram.y" /* yacc.c:1646  */
+  case 775:
+#line 5313 "gram.y" /* yacc.c:1646  */
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
 					n->itemtype = OPCLASS_ITEM_FUNCTION;
@@ -28777,11 +28792,11 @@
 					n->number = (yyvsp[-2].ival);
 					(yyval.node) = (Node *) n;
 				}
-#line 28781 "gram.c" /* yacc.c:1646  */
+#line 28796 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 774:
-#line 5313 "gram.y" /* yacc.c:1646  */
+  case 776:
+#line 5322 "gram.y" /* yacc.c:1646  */
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
 					n->itemtype = OPCLASS_ITEM_FUNCTION;
@@ -28791,64 +28806,64 @@
 					n->class_args = (yyvsp[-3].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 28795 "gram.c" /* yacc.c:1646  */
+#line 28810 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 775:
-#line 5323 "gram.y" /* yacc.c:1646  */
+  case 777:
+#line 5332 "gram.y" /* yacc.c:1646  */
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
 					n->itemtype = OPCLASS_ITEM_STORAGETYPE;
 					n->storedtype = (yyvsp[0].typnam);
 					(yyval.node) = (Node *) n;
 				}
-#line 28806 "gram.c" /* yacc.c:1646  */
+#line 28821 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 776:
-#line 5331 "gram.y" /* yacc.c:1646  */
+  case 778:
+#line 5340 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 28812 "gram.c" /* yacc.c:1646  */
+#line 28827 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 777:
-#line 5332 "gram.y" /* yacc.c:1646  */
+  case 779:
+#line 5341 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 28818 "gram.c" /* yacc.c:1646  */
+#line 28833 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 778:
-#line 5335 "gram.y" /* yacc.c:1646  */
+  case 780:
+#line 5344 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 28824 "gram.c" /* yacc.c:1646  */
+#line 28839 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 779:
-#line 5336 "gram.y" /* yacc.c:1646  */
+  case 781:
+#line 5345 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 28830 "gram.c" /* yacc.c:1646  */
+#line 28845 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 780:
-#line 5339 "gram.y" /* yacc.c:1646  */
+  case 782:
+#line 5348 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 28836 "gram.c" /* yacc.c:1646  */
+#line 28851 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 781:
-#line 5340 "gram.y" /* yacc.c:1646  */
+  case 783:
+#line 5349 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 28842 "gram.c" /* yacc.c:1646  */
+#line 28857 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 782:
-#line 5341 "gram.y" /* yacc.c:1646  */
+  case 784:
+#line 5350 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 28848 "gram.c" /* yacc.c:1646  */
+#line 28863 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 783:
-#line 5345 "gram.y" /* yacc.c:1646  */
+  case 785:
+#line 5354 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * RECHECK no longer does anything in opclass definitions,
@@ -28862,28 +28877,28 @@
 							 parser_errposition((yylsp[0]))));
 					(yyval.boolean) = TRUE;
 				}
-#line 28866 "gram.c" /* yacc.c:1646  */
+#line 28881 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 784:
-#line 5358 "gram.y" /* yacc.c:1646  */
+  case 786:
+#line 5367 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 28872 "gram.c" /* yacc.c:1646  */
+#line 28887 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 785:
-#line 5364 "gram.y" /* yacc.c:1646  */
+  case 787:
+#line 5373 "gram.y" /* yacc.c:1646  */
     {
 					CreateOpFamilyStmt *n = makeNode(CreateOpFamilyStmt);
 					n->opfamilyname = (yyvsp[-2].list);
 					n->amname = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 28883 "gram.c" /* yacc.c:1646  */
+#line 28898 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 786:
-#line 5374 "gram.y" /* yacc.c:1646  */
+  case 788:
+#line 5383 "gram.y" /* yacc.c:1646  */
     {
 					AlterOpFamilyStmt *n = makeNode(AlterOpFamilyStmt);
 					n->opfamilyname = (yyvsp[-4].list);
@@ -28892,11 +28907,11 @@
 					n->items = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 28896 "gram.c" /* yacc.c:1646  */
+#line 28911 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 787:
-#line 5383 "gram.y" /* yacc.c:1646  */
+  case 789:
+#line 5392 "gram.y" /* yacc.c:1646  */
     {
 					AlterOpFamilyStmt *n = makeNode(AlterOpFamilyStmt);
 					n->opfamilyname = (yyvsp[-4].list);
@@ -28905,23 +28920,23 @@
 					n->items = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 28909 "gram.c" /* yacc.c:1646  */
+#line 28924 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 788:
-#line 5394 "gram.y" /* yacc.c:1646  */
+  case 790:
+#line 5403 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 28915 "gram.c" /* yacc.c:1646  */
+#line 28930 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 789:
-#line 5395 "gram.y" /* yacc.c:1646  */
+  case 791:
+#line 5404 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 28921 "gram.c" /* yacc.c:1646  */
+#line 28936 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 790:
-#line 5400 "gram.y" /* yacc.c:1646  */
+  case 792:
+#line 5409 "gram.y" /* yacc.c:1646  */
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
 					n->itemtype = OPCLASS_ITEM_OPERATOR;
@@ -28929,11 +28944,11 @@
 					n->args = (yyvsp[-1].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 28933 "gram.c" /* yacc.c:1646  */
+#line 28948 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 791:
-#line 5408 "gram.y" /* yacc.c:1646  */
+  case 793:
+#line 5417 "gram.y" /* yacc.c:1646  */
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
 					n->itemtype = OPCLASS_ITEM_FUNCTION;
@@ -28941,11 +28956,11 @@
 					n->args = (yyvsp[-1].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 28945 "gram.c" /* yacc.c:1646  */
+#line 28960 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 792:
-#line 5420 "gram.y" /* yacc.c:1646  */
+  case 794:
+#line 5429 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->objects = list_make1(lcons(makeString((yyvsp[-1].str)), (yyvsp[-3].list)));
@@ -28955,11 +28970,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 28959 "gram.c" /* yacc.c:1646  */
+#line 28974 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 793:
-#line 5430 "gram.y" /* yacc.c:1646  */
+  case 795:
+#line 5439 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->objects = list_make1(lcons(makeString((yyvsp[-1].str)), (yyvsp[-3].list)));
@@ -28969,11 +28984,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 28973 "gram.c" /* yacc.c:1646  */
+#line 28988 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 794:
-#line 5443 "gram.y" /* yacc.c:1646  */
+  case 796:
+#line 5452 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->objects = list_make1(lcons(makeString((yyvsp[-1].str)), (yyvsp[-3].list)));
@@ -28983,11 +28998,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 28987 "gram.c" /* yacc.c:1646  */
+#line 29002 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 795:
-#line 5453 "gram.y" /* yacc.c:1646  */
+  case 797:
+#line 5462 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->objects = list_make1(lcons(makeString((yyvsp[-1].str)), (yyvsp[-3].list)));
@@ -28997,33 +29012,33 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 29001 "gram.c" /* yacc.c:1646  */
+#line 29016 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 796:
-#line 5475 "gram.y" /* yacc.c:1646  */
+  case 798:
+#line 5484 "gram.y" /* yacc.c:1646  */
     {
 					DropOwnedStmt *n = makeNode(DropOwnedStmt);
 					n->roles = (yyvsp[-1].list);
 					n->behavior = (yyvsp[0].dbehavior);
 					(yyval.node) = (Node *)n;
 				}
-#line 29012 "gram.c" /* yacc.c:1646  */
+#line 29027 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 797:
-#line 5485 "gram.y" /* yacc.c:1646  */
+  case 799:
+#line 5494 "gram.y" /* yacc.c:1646  */
     {
 					ReassignOwnedStmt *n = makeNode(ReassignOwnedStmt);
 					n->roles = (yyvsp[-2].list);
 					n->newrole = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 29023 "gram.c" /* yacc.c:1646  */
+#line 29038 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 798:
-#line 5503 "gram.y" /* yacc.c:1646  */
+  case 800:
+#line 5512 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = (yyvsp[-4].objtype);
@@ -29034,11 +29049,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 29038 "gram.c" /* yacc.c:1646  */
+#line 29053 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 799:
-#line 5514 "gram.y" /* yacc.c:1646  */
+  case 801:
+#line 5523 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = (yyvsp[-2].objtype);
@@ -29049,11 +29064,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 29053 "gram.c" /* yacc.c:1646  */
+#line 29068 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 800:
-#line 5525 "gram.y" /* yacc.c:1646  */
+  case 802:
+#line 5534 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_TYPE;
@@ -29063,11 +29078,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 29067 "gram.c" /* yacc.c:1646  */
+#line 29082 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 801:
-#line 5535 "gram.y" /* yacc.c:1646  */
+  case 803:
+#line 5544 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_TYPE;
@@ -29077,11 +29092,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 29081 "gram.c" /* yacc.c:1646  */
+#line 29096 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 802:
-#line 5545 "gram.y" /* yacc.c:1646  */
+  case 804:
+#line 5554 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_DOMAIN;
@@ -29091,11 +29106,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 29095 "gram.c" /* yacc.c:1646  */
+#line 29110 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 803:
-#line 5555 "gram.y" /* yacc.c:1646  */
+  case 805:
+#line 5564 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_DOMAIN;
@@ -29105,11 +29120,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 29109 "gram.c" /* yacc.c:1646  */
+#line 29124 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 804:
-#line 5565 "gram.y" /* yacc.c:1646  */
+  case 806:
+#line 5574 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_INDEX;
@@ -29120,11 +29135,11 @@
 					n->concurrent = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 29124 "gram.c" /* yacc.c:1646  */
+#line 29139 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 805:
-#line 5576 "gram.y" /* yacc.c:1646  */
+  case 807:
+#line 5585 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_INDEX;
@@ -29135,149 +29150,149 @@
 					n->concurrent = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 29139 "gram.c" /* yacc.c:1646  */
+#line 29154 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 806:
-#line 5589 "gram.y" /* yacc.c:1646  */
+  case 808:
+#line 5598 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TABLE; }
-#line 29145 "gram.c" /* yacc.c:1646  */
+#line 29160 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 807:
-#line 5590 "gram.y" /* yacc.c:1646  */
+  case 809:
+#line 5599 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_SEQUENCE; }
-#line 29151 "gram.c" /* yacc.c:1646  */
+#line 29166 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 808:
-#line 5591 "gram.y" /* yacc.c:1646  */
+  case 810:
+#line 5600 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_VIEW; }
-#line 29157 "gram.c" /* yacc.c:1646  */
+#line 29172 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 809:
-#line 5592 "gram.y" /* yacc.c:1646  */
+  case 811:
+#line 5601 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_MATVIEW; }
-#line 29163 "gram.c" /* yacc.c:1646  */
+#line 29178 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 810:
-#line 5593 "gram.y" /* yacc.c:1646  */
+  case 812:
+#line 5602 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_INDEX; }
-#line 29169 "gram.c" /* yacc.c:1646  */
+#line 29184 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 811:
-#line 5594 "gram.y" /* yacc.c:1646  */
+  case 813:
+#line 5603 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_FOREIGN_TABLE; }
-#line 29175 "gram.c" /* yacc.c:1646  */
+#line 29190 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 812:
-#line 5595 "gram.y" /* yacc.c:1646  */
+  case 814:
+#line 5604 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_EVENT_TRIGGER; }
-#line 29181 "gram.c" /* yacc.c:1646  */
+#line 29196 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 813:
-#line 5596 "gram.y" /* yacc.c:1646  */
+  case 815:
+#line 5605 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_COLLATION; }
-#line 29187 "gram.c" /* yacc.c:1646  */
+#line 29202 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 814:
-#line 5597 "gram.y" /* yacc.c:1646  */
+  case 816:
+#line 5606 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_CONVERSION; }
-#line 29193 "gram.c" /* yacc.c:1646  */
+#line 29208 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 815:
-#line 5598 "gram.y" /* yacc.c:1646  */
+  case 817:
+#line 5607 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_SCHEMA; }
-#line 29199 "gram.c" /* yacc.c:1646  */
+#line 29214 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 816:
-#line 5599 "gram.y" /* yacc.c:1646  */
+  case 818:
+#line 5608 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_EXTENSION; }
-#line 29205 "gram.c" /* yacc.c:1646  */
+#line 29220 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 817:
-#line 5600 "gram.y" /* yacc.c:1646  */
+  case 819:
+#line 5609 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TSPARSER; }
-#line 29211 "gram.c" /* yacc.c:1646  */
+#line 29226 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 818:
-#line 5601 "gram.y" /* yacc.c:1646  */
+  case 820:
+#line 5610 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TSDICTIONARY; }
-#line 29217 "gram.c" /* yacc.c:1646  */
+#line 29232 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 819:
-#line 5602 "gram.y" /* yacc.c:1646  */
+  case 821:
+#line 5611 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TSTEMPLATE; }
-#line 29223 "gram.c" /* yacc.c:1646  */
+#line 29238 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 820:
-#line 5603 "gram.y" /* yacc.c:1646  */
+  case 822:
+#line 5612 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TSCONFIGURATION; }
-#line 29229 "gram.c" /* yacc.c:1646  */
+#line 29244 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 821:
-#line 5607 "gram.y" /* yacc.c:1646  */
+  case 823:
+#line 5616 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].list)); }
-#line 29235 "gram.c" /* yacc.c:1646  */
+#line 29250 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 822:
-#line 5608 "gram.y" /* yacc.c:1646  */
+  case 824:
+#line 5617 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].list)); }
-#line 29241 "gram.c" /* yacc.c:1646  */
+#line 29256 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 823:
-#line 5611 "gram.y" /* yacc.c:1646  */
+  case 825:
+#line 5620 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 29247 "gram.c" /* yacc.c:1646  */
+#line 29262 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 824:
-#line 5612 "gram.y" /* yacc.c:1646  */
+  case 826:
+#line 5621 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lcons(makeString((yyvsp[-1].str)), (yyvsp[0].list)); }
-#line 29253 "gram.c" /* yacc.c:1646  */
+#line 29268 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 825:
-#line 5616 "gram.y" /* yacc.c:1646  */
+  case 827:
+#line 5625 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 29259 "gram.c" /* yacc.c:1646  */
+#line 29274 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 826:
-#line 5618 "gram.y" /* yacc.c:1646  */
+  case 828:
+#line 5627 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), makeString((yyvsp[0].str))); }
-#line 29265 "gram.c" /* yacc.c:1646  */
+#line 29280 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 827:
-#line 5622 "gram.y" /* yacc.c:1646  */
+  case 829:
+#line 5631 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(list_make1((yyvsp[0].typnam))); }
-#line 29271 "gram.c" /* yacc.c:1646  */
+#line 29286 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 828:
-#line 5623 "gram.y" /* yacc.c:1646  */
+  case 830:
+#line 5632 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), list_make1((yyvsp[0].typnam))); }
-#line 29277 "gram.c" /* yacc.c:1646  */
+#line 29292 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 829:
-#line 5634 "gram.y" /* yacc.c:1646  */
+  case 831:
+#line 5643 "gram.y" /* yacc.c:1646  */
     {
 					TruncateStmt *n = makeNode(TruncateStmt);
 					n->relations = (yyvsp[-2].list);
@@ -29285,29 +29300,29 @@
 					n->behavior = (yyvsp[0].dbehavior);
 					(yyval.node) = (Node *)n;
 				}
-#line 29289 "gram.c" /* yacc.c:1646  */
+#line 29304 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 830:
-#line 5644 "gram.y" /* yacc.c:1646  */
+  case 832:
+#line 5653 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = false; }
-#line 29295 "gram.c" /* yacc.c:1646  */
+#line 29310 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 831:
-#line 5645 "gram.y" /* yacc.c:1646  */
+  case 833:
+#line 5654 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = true; }
-#line 29301 "gram.c" /* yacc.c:1646  */
+#line 29316 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 832:
-#line 5646 "gram.y" /* yacc.c:1646  */
+  case 834:
+#line 5655 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = false; }
-#line 29307 "gram.c" /* yacc.c:1646  */
+#line 29322 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 833:
-#line 5680 "gram.y" /* yacc.c:1646  */
+  case 835:
+#line 5689 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = (yyvsp[-3].objtype);
@@ -29316,11 +29331,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29320 "gram.c" /* yacc.c:1646  */
+#line 29335 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 834:
-#line 5689 "gram.y" /* yacc.c:1646  */
+  case 836:
+#line 5698 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_TYPE;
@@ -29329,11 +29344,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29333 "gram.c" /* yacc.c:1646  */
+#line 29348 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 835:
-#line 5698 "gram.y" /* yacc.c:1646  */
+  case 837:
+#line 5707 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_DOMAIN;
@@ -29342,11 +29357,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29346 "gram.c" /* yacc.c:1646  */
+#line 29361 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 836:
-#line 5707 "gram.y" /* yacc.c:1646  */
+  case 838:
+#line 5716 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_AGGREGATE;
@@ -29355,11 +29370,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29359 "gram.c" /* yacc.c:1646  */
+#line 29374 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 837:
-#line 5716 "gram.y" /* yacc.c:1646  */
+  case 839:
+#line 5725 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_FUNCTION;
@@ -29368,11 +29383,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29372 "gram.c" /* yacc.c:1646  */
+#line 29387 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 838:
-#line 5725 "gram.y" /* yacc.c:1646  */
+  case 840:
+#line 5734 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_OPERATOR;
@@ -29381,11 +29396,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29385 "gram.c" /* yacc.c:1646  */
+#line 29400 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 839:
-#line 5734 "gram.y" /* yacc.c:1646  */
+  case 841:
+#line 5743 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_TABCONSTRAINT;
@@ -29394,11 +29409,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29398 "gram.c" /* yacc.c:1646  */
+#line 29413 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 840:
-#line 5743 "gram.y" /* yacc.c:1646  */
+  case 842:
+#line 5752 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_DOMCONSTRAINT;
@@ -29412,11 +29427,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29416 "gram.c" /* yacc.c:1646  */
+#line 29431 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 841:
-#line 5757 "gram.y" /* yacc.c:1646  */
+  case 843:
+#line 5766 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_POLICY;
@@ -29425,11 +29440,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29429 "gram.c" /* yacc.c:1646  */
+#line 29444 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 842:
-#line 5766 "gram.y" /* yacc.c:1646  */
+  case 844:
+#line 5775 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_RULE;
@@ -29438,11 +29453,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29442 "gram.c" /* yacc.c:1646  */
+#line 29457 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 843:
-#line 5775 "gram.y" /* yacc.c:1646  */
+  case 845:
+#line 5784 "gram.y" /* yacc.c:1646  */
     {
 					/* Obsolete syntax supported for awhile for compatibility */
 					CommentStmt *n = makeNode(CommentStmt);
@@ -29452,11 +29467,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29456 "gram.c" /* yacc.c:1646  */
+#line 29471 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 844:
-#line 5785 "gram.y" /* yacc.c:1646  */
+  case 846:
+#line 5794 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_TRANSFORM;
@@ -29465,11 +29480,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29469 "gram.c" /* yacc.c:1646  */
+#line 29484 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 845:
-#line 5794 "gram.y" /* yacc.c:1646  */
+  case 847:
+#line 5803 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_TRIGGER;
@@ -29478,11 +29493,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29482 "gram.c" /* yacc.c:1646  */
+#line 29497 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 846:
-#line 5803 "gram.y" /* yacc.c:1646  */
+  case 848:
+#line 5812 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_OPCLASS;
@@ -29490,11 +29505,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29494 "gram.c" /* yacc.c:1646  */
+#line 29509 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 847:
-#line 5811 "gram.y" /* yacc.c:1646  */
+  case 849:
+#line 5820 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_OPFAMILY;
@@ -29503,11 +29518,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29507 "gram.c" /* yacc.c:1646  */
+#line 29522 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 848:
-#line 5820 "gram.y" /* yacc.c:1646  */
+  case 850:
+#line 5829 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_LARGEOBJECT;
@@ -29516,11 +29531,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29520 "gram.c" /* yacc.c:1646  */
+#line 29535 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 849:
-#line 5829 "gram.y" /* yacc.c:1646  */
+  case 851:
+#line 5838 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_CAST;
@@ -29529,11 +29544,11 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29533 "gram.c" /* yacc.c:1646  */
+#line 29548 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 850:
-#line 5838 "gram.y" /* yacc.c:1646  */
+  case 852:
+#line 5847 "gram.y" /* yacc.c:1646  */
     {
 					CommentStmt *n = makeNode(CommentStmt);
 					n->objtype = OBJECT_LANGUAGE;
@@ -29542,149 +29557,149 @@
 					n->comment = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29546 "gram.c" /* yacc.c:1646  */
+#line 29561 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 851:
-#line 5849 "gram.y" /* yacc.c:1646  */
+  case 853:
+#line 5858 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_COLUMN; }
-#line 29552 "gram.c" /* yacc.c:1646  */
+#line 29567 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 852:
-#line 5850 "gram.y" /* yacc.c:1646  */
+  case 854:
+#line 5859 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_DATABASE; }
-#line 29558 "gram.c" /* yacc.c:1646  */
+#line 29573 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 853:
-#line 5851 "gram.y" /* yacc.c:1646  */
+  case 855:
+#line 5860 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_SCHEMA; }
-#line 29564 "gram.c" /* yacc.c:1646  */
+#line 29579 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 854:
-#line 5852 "gram.y" /* yacc.c:1646  */
+  case 856:
+#line 5861 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_INDEX; }
-#line 29570 "gram.c" /* yacc.c:1646  */
+#line 29585 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 855:
-#line 5853 "gram.y" /* yacc.c:1646  */
+  case 857:
+#line 5862 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_SEQUENCE; }
-#line 29576 "gram.c" /* yacc.c:1646  */
+#line 29591 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 856:
-#line 5854 "gram.y" /* yacc.c:1646  */
+  case 858:
+#line 5863 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TABLE; }
-#line 29582 "gram.c" /* yacc.c:1646  */
+#line 29597 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 857:
-#line 5855 "gram.y" /* yacc.c:1646  */
+  case 859:
+#line 5864 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_VIEW; }
-#line 29588 "gram.c" /* yacc.c:1646  */
+#line 29603 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 858:
-#line 5856 "gram.y" /* yacc.c:1646  */
+  case 860:
+#line 5865 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_MATVIEW; }
-#line 29594 "gram.c" /* yacc.c:1646  */
+#line 29609 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 859:
-#line 5857 "gram.y" /* yacc.c:1646  */
+  case 861:
+#line 5866 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_COLLATION; }
-#line 29600 "gram.c" /* yacc.c:1646  */
+#line 29615 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 860:
-#line 5858 "gram.y" /* yacc.c:1646  */
+  case 862:
+#line 5867 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_CONVERSION; }
-#line 29606 "gram.c" /* yacc.c:1646  */
+#line 29621 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 861:
-#line 5859 "gram.y" /* yacc.c:1646  */
+  case 863:
+#line 5868 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TABLESPACE; }
-#line 29612 "gram.c" /* yacc.c:1646  */
+#line 29627 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 862:
-#line 5860 "gram.y" /* yacc.c:1646  */
+  case 864:
+#line 5869 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_EXTENSION; }
-#line 29618 "gram.c" /* yacc.c:1646  */
+#line 29633 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 863:
-#line 5861 "gram.y" /* yacc.c:1646  */
+  case 865:
+#line 5870 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_ROLE; }
-#line 29624 "gram.c" /* yacc.c:1646  */
+#line 29639 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 864:
-#line 5862 "gram.y" /* yacc.c:1646  */
+  case 866:
+#line 5871 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_FOREIGN_TABLE; }
-#line 29630 "gram.c" /* yacc.c:1646  */
+#line 29645 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 865:
-#line 5863 "gram.y" /* yacc.c:1646  */
+  case 867:
+#line 5872 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_FOREIGN_SERVER; }
-#line 29636 "gram.c" /* yacc.c:1646  */
+#line 29651 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 866:
-#line 5864 "gram.y" /* yacc.c:1646  */
+  case 868:
+#line 5873 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_FDW; }
-#line 29642 "gram.c" /* yacc.c:1646  */
+#line 29657 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 867:
-#line 5865 "gram.y" /* yacc.c:1646  */
+  case 869:
+#line 5874 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_EVENT_TRIGGER; }
-#line 29648 "gram.c" /* yacc.c:1646  */
+#line 29663 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 868:
-#line 5866 "gram.y" /* yacc.c:1646  */
+  case 870:
+#line 5875 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TSCONFIGURATION; }
-#line 29654 "gram.c" /* yacc.c:1646  */
+#line 29669 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 869:
-#line 5867 "gram.y" /* yacc.c:1646  */
+  case 871:
+#line 5876 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TSDICTIONARY; }
-#line 29660 "gram.c" /* yacc.c:1646  */
+#line 29675 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 870:
-#line 5868 "gram.y" /* yacc.c:1646  */
+  case 872:
+#line 5877 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TSPARSER; }
-#line 29666 "gram.c" /* yacc.c:1646  */
+#line 29681 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 871:
-#line 5869 "gram.y" /* yacc.c:1646  */
+  case 873:
+#line 5878 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TSTEMPLATE; }
-#line 29672 "gram.c" /* yacc.c:1646  */
+#line 29687 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 872:
-#line 5873 "gram.y" /* yacc.c:1646  */
+  case 874:
+#line 5882 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 29678 "gram.c" /* yacc.c:1646  */
+#line 29693 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 873:
-#line 5874 "gram.y" /* yacc.c:1646  */
+  case 875:
+#line 5883 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 29684 "gram.c" /* yacc.c:1646  */
+#line 29699 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 874:
-#line 5890 "gram.y" /* yacc.c:1646  */
+  case 876:
+#line 5899 "gram.y" /* yacc.c:1646  */
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
 					n->provider = (yyvsp[-5].str);
@@ -29694,11 +29709,11 @@
 					n->label = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29698 "gram.c" /* yacc.c:1646  */
+#line 29713 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 875:
-#line 5901 "gram.y" /* yacc.c:1646  */
+  case 877:
+#line 5910 "gram.y" /* yacc.c:1646  */
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
 					n->provider = (yyvsp[-5].str);
@@ -29708,11 +29723,11 @@
 					n->label = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29712 "gram.c" /* yacc.c:1646  */
+#line 29727 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 876:
-#line 5912 "gram.y" /* yacc.c:1646  */
+  case 878:
+#line 5921 "gram.y" /* yacc.c:1646  */
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
 					n->provider = (yyvsp[-5].str);
@@ -29722,11 +29737,11 @@
 					n->label = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29726 "gram.c" /* yacc.c:1646  */
+#line 29741 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 877:
-#line 5923 "gram.y" /* yacc.c:1646  */
+  case 879:
+#line 5932 "gram.y" /* yacc.c:1646  */
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
 					n->provider = (yyvsp[-6].str);
@@ -29736,11 +29751,11 @@
 					n->label = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29740 "gram.c" /* yacc.c:1646  */
+#line 29755 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 878:
-#line 5934 "gram.y" /* yacc.c:1646  */
+  case 880:
+#line 5943 "gram.y" /* yacc.c:1646  */
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
 					n->provider = (yyvsp[-6].str);
@@ -29750,11 +29765,11 @@
 					n->label = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29754 "gram.c" /* yacc.c:1646  */
+#line 29769 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 879:
-#line 5945 "gram.y" /* yacc.c:1646  */
+  case 881:
+#line 5954 "gram.y" /* yacc.c:1646  */
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
 					n->provider = (yyvsp[-6].str);
@@ -29764,11 +29779,11 @@
 					n->label = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29768 "gram.c" /* yacc.c:1646  */
+#line 29783 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 880:
-#line 5956 "gram.y" /* yacc.c:1646  */
+  case 882:
+#line 5965 "gram.y" /* yacc.c:1646  */
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
 					n->provider = (yyvsp[-6].str);
@@ -29778,121 +29793,121 @@
 					n->label = (yyvsp[0].str);
 					(yyval.node) = (Node *) n;
 				}
-#line 29782 "gram.c" /* yacc.c:1646  */
+#line 29797 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 881:
-#line 5967 "gram.y" /* yacc.c:1646  */
+  case 883:
+#line 5976 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 29788 "gram.c" /* yacc.c:1646  */
+#line 29803 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 882:
-#line 5968 "gram.y" /* yacc.c:1646  */
+  case 884:
+#line 5977 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 29794 "gram.c" /* yacc.c:1646  */
+#line 29809 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 883:
-#line 5972 "gram.y" /* yacc.c:1646  */
+  case 885:
+#line 5981 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_COLUMN; }
-#line 29800 "gram.c" /* yacc.c:1646  */
+#line 29815 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 884:
-#line 5973 "gram.y" /* yacc.c:1646  */
+  case 886:
+#line 5982 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_DATABASE; }
-#line 29806 "gram.c" /* yacc.c:1646  */
+#line 29821 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 885:
-#line 5974 "gram.y" /* yacc.c:1646  */
+  case 887:
+#line 5983 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_EVENT_TRIGGER; }
-#line 29812 "gram.c" /* yacc.c:1646  */
+#line 29827 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 886:
-#line 5975 "gram.y" /* yacc.c:1646  */
+  case 888:
+#line 5984 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_FOREIGN_TABLE; }
-#line 29818 "gram.c" /* yacc.c:1646  */
+#line 29833 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 887:
-#line 5976 "gram.y" /* yacc.c:1646  */
+  case 889:
+#line 5985 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_SCHEMA; }
-#line 29824 "gram.c" /* yacc.c:1646  */
+#line 29839 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 888:
-#line 5977 "gram.y" /* yacc.c:1646  */
+  case 890:
+#line 5986 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_SEQUENCE; }
-#line 29830 "gram.c" /* yacc.c:1646  */
+#line 29845 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 889:
-#line 5978 "gram.y" /* yacc.c:1646  */
+  case 891:
+#line 5987 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TABLE; }
-#line 29836 "gram.c" /* yacc.c:1646  */
+#line 29851 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 890:
-#line 5979 "gram.y" /* yacc.c:1646  */
+  case 892:
+#line 5988 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_ROLE; }
-#line 29842 "gram.c" /* yacc.c:1646  */
+#line 29857 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 891:
-#line 5980 "gram.y" /* yacc.c:1646  */
+  case 893:
+#line 5989 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_TABLESPACE; }
-#line 29848 "gram.c" /* yacc.c:1646  */
+#line 29863 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 892:
-#line 5981 "gram.y" /* yacc.c:1646  */
+  case 894:
+#line 5990 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_VIEW; }
-#line 29854 "gram.c" /* yacc.c:1646  */
+#line 29869 "gram.c" /* yacc.c:1646  */
     break;
-
-  case 893:
-#line 5982 "gram.y" /* yacc.c:1646  */
+
+  case 895:
+#line 5991 "gram.y" /* yacc.c:1646  */
     { (yyval.objtype) = OBJECT_MATVIEW; }
-#line 29860 "gram.c" /* yacc.c:1646  */
+#line 29875 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 894:
-#line 5985 "gram.y" /* yacc.c:1646  */
+  case 896:
+#line 5994 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 29866 "gram.c" /* yacc.c:1646  */
+#line 29881 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 895:
-#line 5986 "gram.y" /* yacc.c:1646  */
+  case 897:
+#line 5995 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 29872 "gram.c" /* yacc.c:1646  */
+#line 29887 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 896:
-#line 5997 "gram.y" /* yacc.c:1646  */
+  case 898:
+#line 6006 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = (FetchStmt *) (yyvsp[0].node);
 					n->ismove = FALSE;
 					(yyval.node) = (Node *)n;
 				}
-#line 29882 "gram.c" /* yacc.c:1646  */
+#line 29897 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 897:
-#line 6003 "gram.y" /* yacc.c:1646  */
+  case 899:
+#line 6012 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = (FetchStmt *) (yyvsp[0].node);
 					n->ismove = TRUE;
 					(yyval.node) = (Node *)n;
 				}
-#line 29892 "gram.c" /* yacc.c:1646  */
+#line 29907 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 898:
-#line 6011 "gram.y" /* yacc.c:1646  */
+  case 900:
+#line 6020 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -29900,11 +29915,11 @@
 					n->howMany = 1;
 					(yyval.node) = (Node *)n;
 				}
-#line 29904 "gram.c" /* yacc.c:1646  */
+#line 29919 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 899:
-#line 6019 "gram.y" /* yacc.c:1646  */
+  case 901:
+#line 6028 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -29912,11 +29927,11 @@
 					n->howMany = 1;
 					(yyval.node) = (Node *)n;
 				}
-#line 29916 "gram.c" /* yacc.c:1646  */
+#line 29931 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 900:
-#line 6027 "gram.y" /* yacc.c:1646  */
+  case 902:
+#line 6036 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -29924,11 +29939,11 @@
 					n->howMany = 1;
 					(yyval.node) = (Node *)n;
 				}
-#line 29928 "gram.c" /* yacc.c:1646  */
+#line 29943 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 901:
-#line 6035 "gram.y" /* yacc.c:1646  */
+  case 903:
+#line 6044 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -29936,11 +29951,11 @@
 					n->howMany = 1;
 					(yyval.node) = (Node *)n;
 				}
-#line 29940 "gram.c" /* yacc.c:1646  */
+#line 29955 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 902:
-#line 6043 "gram.y" /* yacc.c:1646  */
+  case 904:
+#line 6052 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -29948,11 +29963,11 @@
 					n->howMany = 1;
 					(yyval.node) = (Node *)n;
 				}
-#line 29952 "gram.c" /* yacc.c:1646  */
+#line 29967 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 903:
-#line 6051 "gram.y" /* yacc.c:1646  */
+  case 905:
+#line 6060 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -29960,11 +29975,11 @@
 					n->howMany = -1;
 					(yyval.node) = (Node *)n;
 				}
-#line 29964 "gram.c" /* yacc.c:1646  */
+#line 29979 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 904:
-#line 6059 "gram.y" /* yacc.c:1646  */
+  case 906:
+#line 6068 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -29972,11 +29987,11 @@
 					n->howMany = (yyvsp[-2].ival);
 					(yyval.node) = (Node *)n;
 				}
-#line 29976 "gram.c" /* yacc.c:1646  */
+#line 29991 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 905:
-#line 6067 "gram.y" /* yacc.c:1646  */
+  case 907:
+#line 6076 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -29984,11 +29999,11 @@
 					n->howMany = (yyvsp[-2].ival);
 					(yyval.node) = (Node *)n;
 				}
-#line 29988 "gram.c" /* yacc.c:1646  */
+#line 30003 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 906:
-#line 6075 "gram.y" /* yacc.c:1646  */
+  case 908:
+#line 6084 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -29996,11 +30011,11 @@
 					n->howMany = (yyvsp[-2].ival);
 					(yyval.node) = (Node *)n;
 				}
-#line 30000 "gram.c" /* yacc.c:1646  */
+#line 30015 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 907:
-#line 6083 "gram.y" /* yacc.c:1646  */
+  case 909:
+#line 6092 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -30008,11 +30023,11 @@
 					n->howMany = FETCH_ALL;
 					(yyval.node) = (Node *)n;
 				}
-#line 30012 "gram.c" /* yacc.c:1646  */
+#line 30027 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 908:
-#line 6091 "gram.y" /* yacc.c:1646  */
+  case 910:
+#line 6100 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -30020,11 +30035,11 @@
 					n->howMany = 1;
 					(yyval.node) = (Node *)n;
 				}
-#line 30024 "gram.c" /* yacc.c:1646  */
+#line 30039 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 909:
-#line 6099 "gram.y" /* yacc.c:1646  */
+  case 911:
+#line 6108 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -30032,11 +30047,11 @@
 					n->howMany = (yyvsp[-2].ival);
 					(yyval.node) = (Node *)n;
 				}
-#line 30036 "gram.c" /* yacc.c:1646  */
+#line 30051 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 910:
-#line 6107 "gram.y" /* yacc.c:1646  */
+  case 912:
+#line 6116 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -30044,11 +30059,11 @@
 					n->howMany = FETCH_ALL;
 					(yyval.node) = (Node *)n;
 				}
-#line 30048 "gram.c" /* yacc.c:1646  */
+#line 30063 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 911:
-#line 6115 "gram.y" /* yacc.c:1646  */
+  case 913:
+#line 6124 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -30056,11 +30071,11 @@
 					n->howMany = 1;
 					(yyval.node) = (Node *)n;
 				}
-#line 30060 "gram.c" /* yacc.c:1646  */
+#line 30075 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 912:
-#line 6123 "gram.y" /* yacc.c:1646  */
+  case 914:
+#line 6132 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -30068,11 +30083,11 @@
 					n->howMany = (yyvsp[-2].ival);
 					(yyval.node) = (Node *)n;
 				}
-#line 30072 "gram.c" /* yacc.c:1646  */
+#line 30087 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 913:
-#line 6131 "gram.y" /* yacc.c:1646  */
+  case 915:
+#line 6140 "gram.y" /* yacc.c:1646  */
     {
 					FetchStmt *n = makeNode(FetchStmt);
 					n->portalname = (yyvsp[0].str);
@@ -30080,35 +30095,35 @@
 					n->howMany = FETCH_ALL;
 					(yyval.node) = (Node *)n;
 				}
-#line 30084 "gram.c" /* yacc.c:1646  */
+#line 30099 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 914:
-#line 6140 "gram.y" /* yacc.c:1646  */
+  case 916:
+#line 6149 "gram.y" /* yacc.c:1646  */
     {}
-#line 30090 "gram.c" /* yacc.c:1646  */
+#line 30105 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 915:
-#line 6141 "gram.y" /* yacc.c:1646  */
+  case 917:
+#line 6150 "gram.y" /* yacc.c:1646  */
     {}
-#line 30096 "gram.c" /* yacc.c:1646  */
+#line 30111 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 916:
-#line 6144 "gram.y" /* yacc.c:1646  */
+  case 918:
+#line 6153 "gram.y" /* yacc.c:1646  */
     {}
-#line 30102 "gram.c" /* yacc.c:1646  */
+#line 30117 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 917:
-#line 6145 "gram.y" /* yacc.c:1646  */
+  case 919:
+#line 6154 "gram.y" /* yacc.c:1646  */
     {}
-#line 30108 "gram.c" /* yacc.c:1646  */
+#line 30123 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 918:
-#line 6157 "gram.y" /* yacc.c:1646  */
+  case 920:
+#line 6166 "gram.y" /* yacc.c:1646  */
     {
 					GrantStmt *n = makeNode(GrantStmt);
 					n->is_grant = true;
@@ -30120,11 +30135,11 @@
 					n->grant_option = (yyvsp[0].boolean);
 					(yyval.node) = (Node*)n;
 				}
-#line 30124 "gram.c" /* yacc.c:1646  */
+#line 30139 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 919:
-#line 6173 "gram.y" /* yacc.c:1646  */
+  case 921:
+#line 6182 "gram.y" /* yacc.c:1646  */
     {
 					GrantStmt *n = makeNode(GrantStmt);
 					n->is_grant = false;
@@ -30137,11 +30152,11 @@
 					n->behavior = (yyvsp[0].dbehavior);
 					(yyval.node) = (Node *)n;
 				}
-#line 30141 "gram.c" /* yacc.c:1646  */
+#line 30156 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 920:
-#line 6187 "gram.y" /* yacc.c:1646  */
+  case 922:
+#line 6196 "gram.y" /* yacc.c:1646  */
     {
 					GrantStmt *n = makeNode(GrantStmt);
 					n->is_grant = false;
@@ -30154,107 +30169,107 @@
 					n->behavior = (yyvsp[0].dbehavior);
 					(yyval.node) = (Node *)n;
 				}
-#line 30158 "gram.c" /* yacc.c:1646  */
+#line 30173 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 921:
-#line 6212 "gram.y" /* yacc.c:1646  */
+  case 923:
+#line 6221 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 30164 "gram.c" /* yacc.c:1646  */
+#line 30179 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 922:
-#line 6214 "gram.y" /* yacc.c:1646  */
+  case 924:
+#line 6223 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 30170 "gram.c" /* yacc.c:1646  */
+#line 30185 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 923:
-#line 6216 "gram.y" /* yacc.c:1646  */
+  case 925:
+#line 6225 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 30176 "gram.c" /* yacc.c:1646  */
+#line 30191 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 924:
-#line 6218 "gram.y" /* yacc.c:1646  */
+  case 926:
+#line 6227 "gram.y" /* yacc.c:1646  */
     {
 					AccessPriv *n = makeNode(AccessPriv);
 					n->priv_name = NULL;
 					n->cols = (yyvsp[-1].list);
 					(yyval.list) = list_make1(n);
 				}
-#line 30187 "gram.c" /* yacc.c:1646  */
+#line 30202 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 925:
-#line 6225 "gram.y" /* yacc.c:1646  */
+  case 927:
+#line 6234 "gram.y" /* yacc.c:1646  */
     {
 					AccessPriv *n = makeNode(AccessPriv);
 					n->priv_name = NULL;
 					n->cols = (yyvsp[-1].list);
 					(yyval.list) = list_make1(n);
 				}
-#line 30198 "gram.c" /* yacc.c:1646  */
+#line 30213 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 926:
-#line 6233 "gram.y" /* yacc.c:1646  */
+  case 928:
+#line 6242 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].accesspriv)); }
-#line 30204 "gram.c" /* yacc.c:1646  */
+#line 30219 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 927:
-#line 6234 "gram.y" /* yacc.c:1646  */
+  case 929:
+#line 6243 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].accesspriv)); }
-#line 30210 "gram.c" /* yacc.c:1646  */
+#line 30225 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 928:
-#line 6238 "gram.y" /* yacc.c:1646  */
+  case 930:
+#line 6247 "gram.y" /* yacc.c:1646  */
     {
 				AccessPriv *n = makeNode(AccessPriv);
 				n->priv_name = pstrdup((yyvsp[-1].keyword));
 				n->cols = (yyvsp[0].list);
 				(yyval.accesspriv) = n;
 			}
-#line 30221 "gram.c" /* yacc.c:1646  */
+#line 30236 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 929:
-#line 6245 "gram.y" /* yacc.c:1646  */
+  case 931:
+#line 6254 "gram.y" /* yacc.c:1646  */
     {
 				AccessPriv *n = makeNode(AccessPriv);
 				n->priv_name = pstrdup((yyvsp[-1].keyword));
 				n->cols = (yyvsp[0].list);
 				(yyval.accesspriv) = n;
 			}
-#line 30232 "gram.c" /* yacc.c:1646  */
+#line 30247 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 930:
-#line 6252 "gram.y" /* yacc.c:1646  */
+  case 932:
+#line 6261 "gram.y" /* yacc.c:1646  */
     {
 				AccessPriv *n = makeNode(AccessPriv);
 				n->priv_name = pstrdup((yyvsp[-1].keyword));
 				n->cols = (yyvsp[0].list);
 				(yyval.accesspriv) = n;
 			}
-#line 30243 "gram.c" /* yacc.c:1646  */
+#line 30258 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 931:
-#line 6259 "gram.y" /* yacc.c:1646  */
+  case 933:
+#line 6268 "gram.y" /* yacc.c:1646  */
     {
 				AccessPriv *n = makeNode(AccessPriv);
 				n->priv_name = (yyvsp[-1].str);
 				n->cols = (yyvsp[0].list);
 				(yyval.accesspriv) = n;
 			}
-#line 30254 "gram.c" /* yacc.c:1646  */
+#line 30269 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 932:
-#line 6273 "gram.y" /* yacc.c:1646  */
+  case 934:
+#line 6282 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30262,11 +30277,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30266 "gram.c" /* yacc.c:1646  */
+#line 30281 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 933:
-#line 6281 "gram.y" /* yacc.c:1646  */
+  case 935:
+#line 6290 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30274,11 +30289,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30278 "gram.c" /* yacc.c:1646  */
+#line 30293 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 934:
-#line 6289 "gram.y" /* yacc.c:1646  */
+  case 936:
+#line 6298 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30286,11 +30301,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30290 "gram.c" /* yacc.c:1646  */
+#line 30305 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 935:
-#line 6297 "gram.y" /* yacc.c:1646  */
+  case 937:
+#line 6306 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30298,11 +30313,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30302 "gram.c" /* yacc.c:1646  */
+#line 30317 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 936:
-#line 6305 "gram.y" /* yacc.c:1646  */
+  case 938:
+#line 6314 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30310,11 +30325,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30314 "gram.c" /* yacc.c:1646  */
+#line 30329 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 937:
-#line 6313 "gram.y" /* yacc.c:1646  */
+  case 939:
+#line 6322 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30322,11 +30337,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30326 "gram.c" /* yacc.c:1646  */
+#line 30341 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 938:
-#line 6321 "gram.y" /* yacc.c:1646  */
+  case 940:
+#line 6330 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30334,11 +30349,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30338 "gram.c" /* yacc.c:1646  */
+#line 30353 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 939:
-#line 6329 "gram.y" /* yacc.c:1646  */
+  case 941:
+#line 6338 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30346,11 +30361,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30350 "gram.c" /* yacc.c:1646  */
+#line 30365 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 940:
-#line 6337 "gram.y" /* yacc.c:1646  */
+  case 942:
+#line 6346 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30358,11 +30373,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30362 "gram.c" /* yacc.c:1646  */
+#line 30377 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 941:
-#line 6345 "gram.y" /* yacc.c:1646  */
+  case 943:
+#line 6354 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30370,11 +30385,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30374 "gram.c" /* yacc.c:1646  */
+#line 30389 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 942:
-#line 6353 "gram.y" /* yacc.c:1646  */
+  case 944:
+#line 6362 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30382,11 +30397,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30386 "gram.c" /* yacc.c:1646  */
+#line 30401 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 943:
-#line 6361 "gram.y" /* yacc.c:1646  */
+  case 945:
+#line 6370 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30394,11 +30409,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30398 "gram.c" /* yacc.c:1646  */
+#line 30413 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 944:
-#line 6369 "gram.y" /* yacc.c:1646  */
+  case 946:
+#line 6378 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
@@ -30406,11 +30421,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30410 "gram.c" /* yacc.c:1646  */
+#line 30425 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 945:
-#line 6377 "gram.y" /* yacc.c:1646  */
+  case 947:
+#line 6386 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
@@ -30418,11 +30433,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30422 "gram.c" /* yacc.c:1646  */
+#line 30437 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 946:
-#line 6385 "gram.y" /* yacc.c:1646  */
+  case 948:
+#line 6394 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
@@ -30430,11 +30445,11 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30434 "gram.c" /* yacc.c:1646  */
+#line 30449 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 947:
-#line 6393 "gram.y" /* yacc.c:1646  */
+  case 949:
+#line 6402 "gram.y" /* yacc.c:1646  */
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
@@ -30442,70 +30457,70 @@
 					n->objs = (yyvsp[0].list);
 					(yyval.privtarget) = n;
 				}
-#line 30446 "gram.c" /* yacc.c:1646  */
+#line 30461 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 948:
-#line 6404 "gram.y" /* yacc.c:1646  */
+  case 950:
+#line 6413 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 30452 "gram.c" /* yacc.c:1646  */
+#line 30467 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 949:
-#line 6405 "gram.y" /* yacc.c:1646  */
+  case 951:
+#line 6414 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 30458 "gram.c" /* yacc.c:1646  */
+#line 30473 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 950:
-#line 6409 "gram.y" /* yacc.c:1646  */
+  case 952:
+#line 6418 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 30464 "gram.c" /* yacc.c:1646  */
+#line 30479 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 951:
-#line 6410 "gram.y" /* yacc.c:1646  */
+  case 953:
+#line 6419 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 30470 "gram.c" /* yacc.c:1646  */
+#line 30485 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 952:
-#line 6415 "gram.y" /* yacc.c:1646  */
+  case 954:
+#line 6424 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 30476 "gram.c" /* yacc.c:1646  */
+#line 30491 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 953:
-#line 6416 "gram.y" /* yacc.c:1646  */
+  case 955:
+#line 6425 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 30482 "gram.c" /* yacc.c:1646  */
+#line 30497 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 954:
-#line 6420 "gram.y" /* yacc.c:1646  */
+  case 956:
+#line 6429 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].funwithargs)); }
-#line 30488 "gram.c" /* yacc.c:1646  */
+#line 30503 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 955:
-#line 6422 "gram.y" /* yacc.c:1646  */
+  case 957:
+#line 6431 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].funwithargs)); }
-#line 30494 "gram.c" /* yacc.c:1646  */
+#line 30509 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 956:
-#line 6427 "gram.y" /* yacc.c:1646  */
+  case 958:
+#line 6436 "gram.y" /* yacc.c:1646  */
     {
 					FuncWithArgs *n = makeNode(FuncWithArgs);
 					n->funcname = (yyvsp[-1].list);
 					n->funcargs = extractArgTypes((yyvsp[0].list));
 					(yyval.funwithargs) = n;
 				}
-#line 30505 "gram.c" /* yacc.c:1646  */
+#line 30520 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 957:
-#line 6443 "gram.y" /* yacc.c:1646  */
+  case 959:
+#line 6452 "gram.y" /* yacc.c:1646  */
     {
 					GrantRoleStmt *n = makeNode(GrantRoleStmt);
 					n->is_grant = true;
@@ -30515,11 +30530,11 @@
 					n->grantor = (yyvsp[0].node);
 					(yyval.node) = (Node*)n;
 				}
-#line 30519 "gram.c" /* yacc.c:1646  */
+#line 30534 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 958:
-#line 6456 "gram.y" /* yacc.c:1646  */
+  case 960:
+#line 6465 "gram.y" /* yacc.c:1646  */
     {
 					GrantRoleStmt *n = makeNode(GrantRoleStmt);
 					n->is_grant = false;
@@ -30529,11 +30544,11 @@
 					n->behavior = (yyvsp[0].dbehavior);
 					(yyval.node) = (Node*)n;
 				}
-#line 30533 "gram.c" /* yacc.c:1646  */
+#line 30548 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 959:
-#line 6466 "gram.y" /* yacc.c:1646  */
+  case 961:
+#line 6475 "gram.y" /* yacc.c:1646  */
     {
 					GrantRoleStmt *n = makeNode(GrantRoleStmt);
 					n->is_grant = false;
@@ -30543,82 +30558,82 @@
 					n->behavior = (yyvsp[0].dbehavior);
 					(yyval.node) = (Node*)n;
 				}
-#line 30547 "gram.c" /* yacc.c:1646  */
+#line 30562 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 960:
-#line 6477 "gram.y" /* yacc.c:1646  */
+  case 962:
+#line 6486 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 30553 "gram.c" /* yacc.c:1646  */
+#line 30568 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 961:
-#line 6478 "gram.y" /* yacc.c:1646  */
+  case 963:
+#line 6487 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 30559 "gram.c" /* yacc.c:1646  */
+#line 30574 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 962:
-#line 6481 "gram.y" /* yacc.c:1646  */
+  case 964:
+#line 6490 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 30565 "gram.c" /* yacc.c:1646  */
+#line 30580 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 963:
-#line 6482 "gram.y" /* yacc.c:1646  */
+  case 965:
+#line 6491 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 30571 "gram.c" /* yacc.c:1646  */
+#line 30586 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 964:
-#line 6493 "gram.y" /* yacc.c:1646  */
+  case 966:
+#line 6502 "gram.y" /* yacc.c:1646  */
     {
 					AlterDefaultPrivilegesStmt *n = makeNode(AlterDefaultPrivilegesStmt);
 					n->options = (yyvsp[-1].list);
 					n->action = (GrantStmt *) (yyvsp[0].node);
 					(yyval.node) = (Node*)n;
 				}
-#line 30582 "gram.c" /* yacc.c:1646  */
+#line 30597 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 965:
-#line 6502 "gram.y" /* yacc.c:1646  */
+  case 967:
+#line 6511 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 30588 "gram.c" /* yacc.c:1646  */
+#line 30603 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 966:
-#line 6503 "gram.y" /* yacc.c:1646  */
+  case 968:
+#line 6512 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 30594 "gram.c" /* yacc.c:1646  */
+#line 30609 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 967:
-#line 6508 "gram.y" /* yacc.c:1646  */
+  case 969:
+#line 6517 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("schemas", (Node *)(yyvsp[0].list));
 				}
-#line 30602 "gram.c" /* yacc.c:1646  */
+#line 30617 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 968:
-#line 6512 "gram.y" /* yacc.c:1646  */
+  case 970:
+#line 6521 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("roles", (Node *)(yyvsp[0].list));
 				}
-#line 30610 "gram.c" /* yacc.c:1646  */
+#line 30625 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 969:
-#line 6516 "gram.y" /* yacc.c:1646  */
+  case 971:
+#line 6525 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("roles", (Node *)(yyvsp[0].list));
 				}
-#line 30618 "gram.c" /* yacc.c:1646  */
+#line 30633 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 970:
-#line 6528 "gram.y" /* yacc.c:1646  */
+  case 972:
+#line 6537 "gram.y" /* yacc.c:1646  */
     {
 					GrantStmt *n = makeNode(GrantStmt);
 					n->is_grant = true;
@@ -30630,11 +30645,11 @@
 					n->grant_option = (yyvsp[0].boolean);
 					(yyval.node) = (Node*)n;
 				}
-#line 30634 "gram.c" /* yacc.c:1646  */
+#line 30649 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 971:
-#line 6541 "gram.y" /* yacc.c:1646  */
+  case 973:
+#line 6550 "gram.y" /* yacc.c:1646  */
     {
 					GrantStmt *n = makeNode(GrantStmt);
 					n->is_grant = false;
@@ -30647,11 +30662,11 @@
 					n->behavior = (yyvsp[0].dbehavior);
 					(yyval.node) = (Node *)n;
 				}
-#line 30651 "gram.c" /* yacc.c:1646  */
+#line 30666 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 972:
-#line 6555 "gram.y" /* yacc.c:1646  */
+  case 974:
+#line 6564 "gram.y" /* yacc.c:1646  */
     {
 					GrantStmt *n = makeNode(GrantStmt);
 					n->is_grant = false;
@@ -30664,35 +30679,35 @@
 					n->behavior = (yyvsp[0].dbehavior);
 					(yyval.node) = (Node *)n;
 				}
-#line 30668 "gram.c" /* yacc.c:1646  */
+#line 30683 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 973:
-#line 6570 "gram.y" /* yacc.c:1646  */
+  case 975:
+#line 6579 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ACL_OBJECT_RELATION; }
-#line 30674 "gram.c" /* yacc.c:1646  */
+#line 30689 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 974:
-#line 6571 "gram.y" /* yacc.c:1646  */
+  case 976:
+#line 6580 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ACL_OBJECT_FUNCTION; }
-#line 30680 "gram.c" /* yacc.c:1646  */
+#line 30695 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 975:
-#line 6572 "gram.y" /* yacc.c:1646  */
+  case 977:
+#line 6581 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ACL_OBJECT_SEQUENCE; }
-#line 30686 "gram.c" /* yacc.c:1646  */
+#line 30701 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 976:
-#line 6573 "gram.y" /* yacc.c:1646  */
+  case 978:
+#line 6582 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ACL_OBJECT_TYPE; }
-#line 30692 "gram.c" /* yacc.c:1646  */
+#line 30707 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 977:
-#line 6588 "gram.y" /* yacc.c:1646  */
+  case 979:
+#line 6597 "gram.y" /* yacc.c:1646  */
     {
 					IndexStmt *n = makeNode(IndexStmt);
 					n->unique = (yyvsp[-12].boolean);
@@ -30716,11 +30731,11 @@
 					n->if_not_exists = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 30720 "gram.c" /* yacc.c:1646  */
+#line 30735 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 978:
-#line 6614 "gram.y" /* yacc.c:1646  */
+  case 980:
+#line 6623 "gram.y" /* yacc.c:1646  */
     {
 					IndexStmt *n = makeNode(IndexStmt);
 					n->unique = (yyvsp[-15].boolean);
@@ -30744,71 +30759,71 @@
 					n->if_not_exists = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 30748 "gram.c" /* yacc.c:1646  */
+#line 30763 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 979:
-#line 6640 "gram.y" /* yacc.c:1646  */
+  case 981:
+#line 6649 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 30754 "gram.c" /* yacc.c:1646  */
+#line 30769 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 980:
-#line 6641 "gram.y" /* yacc.c:1646  */
+  case 982:
+#line 6650 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 30760 "gram.c" /* yacc.c:1646  */
+#line 30775 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 981:
-#line 6645 "gram.y" /* yacc.c:1646  */
+  case 983:
+#line 6654 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 30766 "gram.c" /* yacc.c:1646  */
+#line 30781 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 982:
-#line 6646 "gram.y" /* yacc.c:1646  */
+  case 984:
+#line 6655 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 30772 "gram.c" /* yacc.c:1646  */
+#line 30787 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 983:
-#line 6650 "gram.y" /* yacc.c:1646  */
+  case 985:
+#line 6659 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 30778 "gram.c" /* yacc.c:1646  */
+#line 30793 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 984:
-#line 6651 "gram.y" /* yacc.c:1646  */
+  case 986:
+#line 6660 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 30784 "gram.c" /* yacc.c:1646  */
+#line 30799 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 985:
-#line 6655 "gram.y" /* yacc.c:1646  */
+  case 987:
+#line 6664 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 30790 "gram.c" /* yacc.c:1646  */
+#line 30805 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 986:
-#line 6656 "gram.y" /* yacc.c:1646  */
+  case 988:
+#line 6665 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = DEFAULT_INDEX_TYPE; }
-#line 30796 "gram.c" /* yacc.c:1646  */
+#line 30811 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 987:
-#line 6659 "gram.y" /* yacc.c:1646  */
+  case 989:
+#line 6668 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].ielem)); }
-#line 30802 "gram.c" /* yacc.c:1646  */
+#line 30817 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 988:
-#line 6660 "gram.y" /* yacc.c:1646  */
+  case 990:
+#line 6669 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].ielem)); }
-#line 30808 "gram.c" /* yacc.c:1646  */
+#line 30823 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 989:
-#line 6669 "gram.y" /* yacc.c:1646  */
+  case 991:
+#line 6678 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.ielem) = makeNode(IndexElem);
 					(yyval.ielem)->name = (yyvsp[-4].str);
@@ -30819,11 +30834,11 @@
 					(yyval.ielem)->ordering = (yyvsp[-1].ival);
 					(yyval.ielem)->nulls_ordering = (yyvsp[0].ival);
 				}
-#line 30823 "gram.c" /* yacc.c:1646  */
+#line 30838 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 990:
-#line 6680 "gram.y" /* yacc.c:1646  */
+  case 992:
+#line 6689 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.ielem) = makeNode(IndexElem);
 					(yyval.ielem)->name = NULL;
@@ -30834,11 +30849,11 @@
 					(yyval.ielem)->ordering = (yyvsp[-1].ival);
 					(yyval.ielem)->nulls_ordering = (yyvsp[0].ival);
 				}
-#line 30838 "gram.c" /* yacc.c:1646  */
+#line 30853 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 991:
-#line 6691 "gram.y" /* yacc.c:1646  */
+  case 993:
+#line 6700 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.ielem) = makeNode(IndexElem);
 					(yyval.ielem)->name = NULL;
@@ -30849,77 +30864,77 @@
 					(yyval.ielem)->ordering = (yyvsp[-1].ival);
 					(yyval.ielem)->nulls_ordering = (yyvsp[0].ival);
 				}
-#line 30853 "gram.c" /* yacc.c:1646  */
+#line 30868 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 992:
-#line 6703 "gram.y" /* yacc.c:1646  */
+  case 994:
+#line 6712 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 30859 "gram.c" /* yacc.c:1646  */
+#line 30874 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 993:
-#line 6704 "gram.y" /* yacc.c:1646  */
+  case 995:
+#line 6713 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 30865 "gram.c" /* yacc.c:1646  */
+#line 30880 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 994:
-#line 6707 "gram.y" /* yacc.c:1646  */
+  case 996:
+#line 6716 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 30871 "gram.c" /* yacc.c:1646  */
+#line 30886 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 995:
-#line 6708 "gram.y" /* yacc.c:1646  */
+  case 997:
+#line 6717 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 30877 "gram.c" /* yacc.c:1646  */
+#line 30892 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 996:
-#line 6709 "gram.y" /* yacc.c:1646  */
+  case 998:
+#line 6718 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 30883 "gram.c" /* yacc.c:1646  */
+#line 30898 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 997:
-#line 6712 "gram.y" /* yacc.c:1646  */
+  case 999:
+#line 6721 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = SORTBY_ASC; }
-#line 30889 "gram.c" /* yacc.c:1646  */
+#line 30904 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 998:
-#line 6713 "gram.y" /* yacc.c:1646  */
+  case 1000:
+#line 6722 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = SORTBY_DESC; }
-#line 30895 "gram.c" /* yacc.c:1646  */
+#line 30910 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 999:
-#line 6714 "gram.y" /* yacc.c:1646  */
+  case 1001:
+#line 6723 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = SORTBY_DEFAULT; }
-#line 30901 "gram.c" /* yacc.c:1646  */
+#line 30916 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1000:
-#line 6717 "gram.y" /* yacc.c:1646  */
+  case 1002:
+#line 6726 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = SORTBY_NULLS_FIRST; }
-#line 30907 "gram.c" /* yacc.c:1646  */
+#line 30922 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1001:
-#line 6718 "gram.y" /* yacc.c:1646  */
+  case 1003:
+#line 6727 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = SORTBY_NULLS_LAST; }
-#line 30913 "gram.c" /* yacc.c:1646  */
+#line 30928 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1002:
-#line 6719 "gram.y" /* yacc.c:1646  */
+  case 1004:
+#line 6728 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = SORTBY_NULLS_DEFAULT; }
-#line 30919 "gram.c" /* yacc.c:1646  */
+#line 30934 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1003:
-#line 6737 "gram.y" /* yacc.c:1646  */
+  case 1005:
+#line 6746 "gram.y" /* yacc.c:1646  */
     {
 					CreateFunctionStmt *n = makeNode(CreateFunctionStmt);
 					n->replace = (yyvsp[-7].boolean);
@@ -30930,11 +30945,11 @@
 					n->withClause = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 30934 "gram.c" /* yacc.c:1646  */
+#line 30949 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1004:
-#line 6749 "gram.y" /* yacc.c:1646  */
+  case 1006:
+#line 6758 "gram.y" /* yacc.c:1646  */
     {
 					CreateFunctionStmt *n = makeNode(CreateFunctionStmt);
 					n->replace = (yyvsp[-10].boolean);
@@ -30946,11 +30961,11 @@
 					n->withClause = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 30950 "gram.c" /* yacc.c:1646  */
+#line 30965 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1005:
-#line 6762 "gram.y" /* yacc.c:1646  */
+  case 1007:
+#line 6771 "gram.y" /* yacc.c:1646  */
     {
 					CreateFunctionStmt *n = makeNode(CreateFunctionStmt);
 					n->replace = (yyvsp[-5].boolean);
@@ -30961,71 +30976,71 @@
 					n->withClause = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 30965 "gram.c" /* yacc.c:1646  */
+#line 30980 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1006:
-#line 6775 "gram.y" /* yacc.c:1646  */
+  case 1008:
+#line 6784 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 30971 "gram.c" /* yacc.c:1646  */
+#line 30986 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1007:
-#line 6776 "gram.y" /* yacc.c:1646  */
+  case 1009:
+#line 6785 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 30977 "gram.c" /* yacc.c:1646  */
+#line 30992 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1008:
-#line 6779 "gram.y" /* yacc.c:1646  */
+  case 1010:
+#line 6788 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 30983 "gram.c" /* yacc.c:1646  */
+#line 30998 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1009:
-#line 6780 "gram.y" /* yacc.c:1646  */
+  case 1011:
+#line 6789 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 30989 "gram.c" /* yacc.c:1646  */
+#line 31004 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1010:
-#line 6784 "gram.y" /* yacc.c:1646  */
+  case 1012:
+#line 6793 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].fun_param)); }
-#line 30995 "gram.c" /* yacc.c:1646  */
+#line 31010 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1011:
-#line 6785 "gram.y" /* yacc.c:1646  */
+  case 1013:
+#line 6794 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].fun_param)); }
-#line 31001 "gram.c" /* yacc.c:1646  */
+#line 31016 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1012:
-#line 6793 "gram.y" /* yacc.c:1646  */
+  case 1014:
+#line 6802 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 31007 "gram.c" /* yacc.c:1646  */
+#line 31022 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1013:
-#line 6794 "gram.y" /* yacc.c:1646  */
+  case 1015:
+#line 6803 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 31013 "gram.c" /* yacc.c:1646  */
+#line 31028 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1014:
-#line 6798 "gram.y" /* yacc.c:1646  */
+  case 1016:
+#line 6807 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].fun_param)); }
-#line 31019 "gram.c" /* yacc.c:1646  */
+#line 31034 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1015:
-#line 6800 "gram.y" /* yacc.c:1646  */
+  case 1017:
+#line 6809 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].fun_param)); }
-#line 31025 "gram.c" /* yacc.c:1646  */
+#line 31040 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1016:
-#line 6815 "gram.y" /* yacc.c:1646  */
+  case 1018:
+#line 6824 "gram.y" /* yacc.c:1646  */
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
 					n->name = (yyvsp[-1].str);
@@ -31034,11 +31049,11 @@
 					n->defexpr = NULL;
 					(yyval.fun_param) = n;
 				}
-#line 31038 "gram.c" /* yacc.c:1646  */
+#line 31053 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1017:
-#line 6824 "gram.y" /* yacc.c:1646  */
+  case 1019:
+#line 6833 "gram.y" /* yacc.c:1646  */
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
 					n->name = (yyvsp[-2].str);
@@ -31047,11 +31062,11 @@
 					n->defexpr = NULL;
 					(yyval.fun_param) = n;
 				}
-#line 31051 "gram.c" /* yacc.c:1646  */
+#line 31066 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1018:
-#line 6833 "gram.y" /* yacc.c:1646  */
+  case 1020:
+#line 6842 "gram.y" /* yacc.c:1646  */
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
 					n->name = (yyvsp[-1].str);
@@ -31060,11 +31075,11 @@
 					n->defexpr = NULL;
 					(yyval.fun_param) = n;
 				}
-#line 31064 "gram.c" /* yacc.c:1646  */
+#line 31079 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1019:
-#line 6842 "gram.y" /* yacc.c:1646  */
+  case 1021:
+#line 6851 "gram.y" /* yacc.c:1646  */
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
 					n->name = NULL;
@@ -31073,11 +31088,11 @@
 					n->defexpr = NULL;
 					(yyval.fun_param) = n;
 				}
-#line 31077 "gram.c" /* yacc.c:1646  */
+#line 31092 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1020:
-#line 6851 "gram.y" /* yacc.c:1646  */
+  case 1022:
+#line 6860 "gram.y" /* yacc.c:1646  */
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
 					n->name = NULL;
@@ -31086,41 +31101,41 @@
 					n->defexpr = NULL;
 					(yyval.fun_param) = n;
 				}
-#line 31090 "gram.c" /* yacc.c:1646  */
+#line 31105 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1021:
-#line 6862 "gram.y" /* yacc.c:1646  */
+  case 1023:
+#line 6871 "gram.y" /* yacc.c:1646  */
     { (yyval.fun_param_mode) = FUNC_PARAM_IN; }
-#line 31096 "gram.c" /* yacc.c:1646  */
+#line 31111 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1022:
-#line 6863 "gram.y" /* yacc.c:1646  */
+  case 1024:
+#line 6872 "gram.y" /* yacc.c:1646  */
     { (yyval.fun_param_mode) = FUNC_PARAM_OUT; }
-#line 31102 "gram.c" /* yacc.c:1646  */
+#line 31117 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1023:
-#line 6864 "gram.y" /* yacc.c:1646  */
+  case 1025:
+#line 6873 "gram.y" /* yacc.c:1646  */
     { (yyval.fun_param_mode) = FUNC_PARAM_INOUT; }
-#line 31108 "gram.c" /* yacc.c:1646  */
+#line 31123 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1024:
-#line 6865 "gram.y" /* yacc.c:1646  */
+  case 1026:
+#line 6874 "gram.y" /* yacc.c:1646  */
     { (yyval.fun_param_mode) = FUNC_PARAM_INOUT; }
-#line 31114 "gram.c" /* yacc.c:1646  */
+#line 31129 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1025:
-#line 6866 "gram.y" /* yacc.c:1646  */
+  case 1027:
+#line 6875 "gram.y" /* yacc.c:1646  */
     { (yyval.fun_param_mode) = FUNC_PARAM_VARIADIC; }
-#line 31120 "gram.c" /* yacc.c:1646  */
+#line 31135 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1027:
-#line 6877 "gram.y" /* yacc.c:1646  */
+  case 1029:
+#line 6886 "gram.y" /* yacc.c:1646  */
     {
 					/* We can catch over-specified results here if we want to,
 					 * but for now better to silently swallow typmod, etc.
@@ -31128,64 +31143,64 @@
 					 */
 					(yyval.typnam) = (yyvsp[0].typnam);
 				}
-#line 31132 "gram.c" /* yacc.c:1646  */
+#line 31147 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1028:
-#line 6891 "gram.y" /* yacc.c:1646  */
+  case 1030:
+#line 6900 "gram.y" /* yacc.c:1646  */
     { (yyval.typnam) = (yyvsp[0].typnam); }
-#line 31138 "gram.c" /* yacc.c:1646  */
+#line 31153 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1029:
-#line 6893 "gram.y" /* yacc.c:1646  */
+  case 1031:
+#line 6902 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = makeTypeNameFromNameList(lcons(makeString((yyvsp[-3].str)), (yyvsp[-2].list)));
 					(yyval.typnam)->pct_type = true;
 					(yyval.typnam)->location = (yylsp[-3]);
 				}
-#line 31148 "gram.c" /* yacc.c:1646  */
+#line 31163 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1030:
-#line 6899 "gram.y" /* yacc.c:1646  */
+  case 1032:
+#line 6908 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = makeTypeNameFromNameList(lcons(makeString((yyvsp[-3].str)), (yyvsp[-2].list)));
 					(yyval.typnam)->pct_type = true;
 					(yyval.typnam)->setof = TRUE;
 					(yyval.typnam)->location = (yylsp[-3]);
 				}
-#line 31159 "gram.c" /* yacc.c:1646  */
+#line 31174 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1031:
-#line 6909 "gram.y" /* yacc.c:1646  */
+  case 1033:
+#line 6918 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.fun_param) = (yyvsp[0].fun_param);
 				}
-#line 31167 "gram.c" /* yacc.c:1646  */
+#line 31182 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1032:
-#line 6913 "gram.y" /* yacc.c:1646  */
+  case 1034:
+#line 6922 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.fun_param) = (yyvsp[-2].fun_param);
 					(yyval.fun_param)->defexpr = (yyvsp[0].node);
 				}
-#line 31176 "gram.c" /* yacc.c:1646  */
+#line 31191 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1033:
-#line 6918 "gram.y" /* yacc.c:1646  */
+  case 1035:
+#line 6927 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.fun_param) = (yyvsp[-2].fun_param);
 					(yyval.fun_param)->defexpr = (yyvsp[0].node);
 				}
-#line 31185 "gram.c" /* yacc.c:1646  */
+#line 31200 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1034:
-#line 6926 "gram.y" /* yacc.c:1646  */
+  case 1036:
+#line 6935 "gram.y" /* yacc.c:1646  */
     {
 					if (!((yyvsp[0].fun_param)->mode == FUNC_PARAM_IN ||
 						  (yyvsp[0].fun_param)->mode == FUNC_PARAM_VARIADIC))
@@ -31195,267 +31210,267 @@
 								 parser_errposition((yylsp[0]))));
 					(yyval.fun_param) = (yyvsp[0].fun_param);
 				}
-#line 31199 "gram.c" /* yacc.c:1646  */
+#line 31214 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1035:
-#line 6967 "gram.y" /* yacc.c:1646  */
+  case 1037:
+#line 6976 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2(NIL, makeInteger(-1));
 				}
-#line 31207 "gram.c" /* yacc.c:1646  */
+#line 31222 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1036:
-#line 6971 "gram.y" /* yacc.c:1646  */
+  case 1038:
+#line 6980 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2((yyvsp[-1].list), makeInteger(-1));
 				}
-#line 31215 "gram.c" /* yacc.c:1646  */
+#line 31230 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1037:
-#line 6975 "gram.y" /* yacc.c:1646  */
+  case 1039:
+#line 6984 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2((yyvsp[-1].list), makeInteger(0));
 				}
-#line 31223 "gram.c" /* yacc.c:1646  */
+#line 31238 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1038:
-#line 6979 "gram.y" /* yacc.c:1646  */
+  case 1040:
+#line 6988 "gram.y" /* yacc.c:1646  */
     {
 					/* this is the only case requiring consistency checking */
 					(yyval.list) = makeOrderedSetArgs((yyvsp[-4].list), (yyvsp[-1].list), yyscanner);
 				}
-#line 31232 "gram.c" /* yacc.c:1646  */
+#line 31247 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1039:
-#line 6986 "gram.y" /* yacc.c:1646  */
+  case 1041:
+#line 6995 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].fun_param)); }
-#line 31238 "gram.c" /* yacc.c:1646  */
+#line 31253 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1040:
-#line 6987 "gram.y" /* yacc.c:1646  */
+  case 1042:
+#line 6996 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].fun_param)); }
-#line 31244 "gram.c" /* yacc.c:1646  */
+#line 31259 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1041:
-#line 6992 "gram.y" /* yacc.c:1646  */
+  case 1043:
+#line 7001 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 31250 "gram.c" /* yacc.c:1646  */
+#line 31265 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1042:
-#line 6993 "gram.y" /* yacc.c:1646  */
+  case 1044:
+#line 7002 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 31256 "gram.c" /* yacc.c:1646  */
+#line 31271 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1043:
-#line 7001 "gram.y" /* yacc.c:1646  */
+  case 1045:
+#line 7010 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("strict", (Node *)makeInteger(FALSE));
 				}
-#line 31264 "gram.c" /* yacc.c:1646  */
+#line 31279 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1044:
-#line 7005 "gram.y" /* yacc.c:1646  */
+  case 1046:
+#line 7014 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("strict", (Node *)makeInteger(TRUE));
 				}
-#line 31272 "gram.c" /* yacc.c:1646  */
+#line 31287 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1045:
-#line 7009 "gram.y" /* yacc.c:1646  */
+  case 1047:
+#line 7018 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("strict", (Node *)makeInteger(TRUE));
 				}
-#line 31280 "gram.c" /* yacc.c:1646  */
+#line 31295 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1046:
-#line 7013 "gram.y" /* yacc.c:1646  */
+  case 1048:
+#line 7022 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("volatility", (Node *)makeString("immutable"));
 				}
-#line 31288 "gram.c" /* yacc.c:1646  */
+#line 31303 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1047:
-#line 7017 "gram.y" /* yacc.c:1646  */
+  case 1049:
+#line 7026 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("volatility", (Node *)makeString("stable"));
 				}
-#line 31296 "gram.c" /* yacc.c:1646  */
+#line 31311 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1048:
-#line 7021 "gram.y" /* yacc.c:1646  */
+  case 1050:
+#line 7030 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("volatility", (Node *)makeString("volatile"));
 				}
-#line 31304 "gram.c" /* yacc.c:1646  */
+#line 31319 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1049:
-#line 7025 "gram.y" /* yacc.c:1646  */
+  case 1051:
+#line 7034 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("security", (Node *)makeInteger(TRUE));
 				}
-#line 31312 "gram.c" /* yacc.c:1646  */
+#line 31327 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1050:
-#line 7029 "gram.y" /* yacc.c:1646  */
+  case 1052:
+#line 7038 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("security", (Node *)makeInteger(FALSE));
 				}
-#line 31320 "gram.c" /* yacc.c:1646  */
+#line 31335 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1051:
-#line 7033 "gram.y" /* yacc.c:1646  */
+  case 1053:
+#line 7042 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("security", (Node *)makeInteger(TRUE));
 				}
-#line 31328 "gram.c" /* yacc.c:1646  */
+#line 31343 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1052:
-#line 7037 "gram.y" /* yacc.c:1646  */
+  case 1054:
+#line 7046 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("security", (Node *)makeInteger(FALSE));
 				}
-#line 31336 "gram.c" /* yacc.c:1646  */
+#line 31351 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1053:
-#line 7041 "gram.y" /* yacc.c:1646  */
+  case 1055:
+#line 7050 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("leakproof", (Node *)makeInteger(TRUE));
 				}
-#line 31344 "gram.c" /* yacc.c:1646  */
+#line 31359 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1054:
-#line 7045 "gram.y" /* yacc.c:1646  */
+  case 1056:
+#line 7054 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("leakproof", (Node *)makeInteger(FALSE));
 				}
-#line 31352 "gram.c" /* yacc.c:1646  */
+#line 31367 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1055:
-#line 7049 "gram.y" /* yacc.c:1646  */
+  case 1057:
+#line 7058 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("cost", (Node *)(yyvsp[0].value));
 				}
-#line 31360 "gram.c" /* yacc.c:1646  */
+#line 31375 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1056:
-#line 7053 "gram.y" /* yacc.c:1646  */
+  case 1058:
+#line 7062 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("rows", (Node *)(yyvsp[0].value));
 				}
-#line 31368 "gram.c" /* yacc.c:1646  */
+#line 31383 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1057:
-#line 7057 "gram.y" /* yacc.c:1646  */
+  case 1059:
+#line 7066 "gram.y" /* yacc.c:1646  */
     {
 					/* we abuse the normal content of a DefElem here */
 					(yyval.defelt) = makeDefElem("set", (Node *)(yyvsp[0].vsetstmt));
 				}
-#line 31377 "gram.c" /* yacc.c:1646  */
+#line 31392 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1058:
-#line 7065 "gram.y" /* yacc.c:1646  */
+  case 1060:
+#line 7074 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("as", (Node *)(yyvsp[0].list));
 				}
-#line 31385 "gram.c" /* yacc.c:1646  */
+#line 31400 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1059:
-#line 7069 "gram.y" /* yacc.c:1646  */
+  case 1061:
+#line 7078 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("language", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 31393 "gram.c" /* yacc.c:1646  */
+#line 31408 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1060:
-#line 7073 "gram.y" /* yacc.c:1646  */
+  case 1062:
+#line 7082 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("transform", (Node *)(yyvsp[0].list));
 				}
-#line 31401 "gram.c" /* yacc.c:1646  */
+#line 31416 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1061:
-#line 7077 "gram.y" /* yacc.c:1646  */
+  case 1063:
+#line 7086 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("window", (Node *)makeInteger(TRUE));
 				}
-#line 31409 "gram.c" /* yacc.c:1646  */
+#line 31424 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1062:
-#line 7081 "gram.y" /* yacc.c:1646  */
+  case 1064:
+#line 7090 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = (yyvsp[0].defelt);
 				}
-#line 31417 "gram.c" /* yacc.c:1646  */
+#line 31432 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1063:
-#line 7086 "gram.y" /* yacc.c:1646  */
+  case 1065:
+#line 7095 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 31423 "gram.c" /* yacc.c:1646  */
+#line 31438 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1064:
-#line 7088 "gram.y" /* yacc.c:1646  */
+  case 1066:
+#line 7097 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2(makeString((yyvsp[-2].str)), makeString((yyvsp[0].str)));
 				}
-#line 31431 "gram.c" /* yacc.c:1646  */
+#line 31446 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1065:
-#line 7094 "gram.y" /* yacc.c:1646  */
+  case 1067:
+#line 7103 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].typnam)); }
-#line 31437 "gram.c" /* yacc.c:1646  */
+#line 31452 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1066:
-#line 7095 "gram.y" /* yacc.c:1646  */
+  case 1068:
+#line 7104 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-4].list), (yyvsp[0].typnam)); }
-#line 31443 "gram.c" /* yacc.c:1646  */
+#line 31458 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1067:
-#line 7099 "gram.y" /* yacc.c:1646  */
+  case 1069:
+#line 7108 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 31449 "gram.c" /* yacc.c:1646  */
+#line 31464 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1068:
-#line 7100 "gram.y" /* yacc.c:1646  */
+  case 1070:
+#line 7109 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 31455 "gram.c" /* yacc.c:1646  */
+#line 31470 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1069:
-#line 7104 "gram.y" /* yacc.c:1646  */
+  case 1071:
+#line 7113 "gram.y" /* yacc.c:1646  */
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
 					n->name = (yyvsp[-1].str);
@@ -31464,50 +31479,50 @@
 					n->defexpr = NULL;
 					(yyval.fun_param) = n;
 				}
-#line 31468 "gram.c" /* yacc.c:1646  */
+#line 31483 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1070:
-#line 7116 "gram.y" /* yacc.c:1646  */
+  case 1072:
+#line 7125 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].fun_param));
 				}
-#line 31476 "gram.c" /* yacc.c:1646  */
+#line 31491 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1071:
-#line 7120 "gram.y" /* yacc.c:1646  */
+  case 1073:
+#line 7129 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].fun_param));
 				}
-#line 31484 "gram.c" /* yacc.c:1646  */
+#line 31499 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1072:
-#line 7135 "gram.y" /* yacc.c:1646  */
+  case 1074:
+#line 7144 "gram.y" /* yacc.c:1646  */
     {
 					AlterFunctionStmt *n = makeNode(AlterFunctionStmt);
 					n->func = (yyvsp[-2].funwithargs);
 					n->actions = (yyvsp[-1].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 31495 "gram.c" /* yacc.c:1646  */
+#line 31510 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1073:
-#line 7145 "gram.y" /* yacc.c:1646  */
+  case 1075:
+#line 7154 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 31501 "gram.c" /* yacc.c:1646  */
+#line 31516 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1074:
-#line 7146 "gram.y" /* yacc.c:1646  */
+  case 1076:
+#line 7155 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 31507 "gram.c" /* yacc.c:1646  */
+#line 31522 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1077:
-#line 7168 "gram.y" /* yacc.c:1646  */
+  case 1079:
+#line 7177 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_FUNCTION;
@@ -31518,11 +31533,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31522 "gram.c" /* yacc.c:1646  */
+#line 31537 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1078:
-#line 7179 "gram.y" /* yacc.c:1646  */
+  case 1080:
+#line 7188 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_FUNCTION;
@@ -31533,11 +31548,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31537 "gram.c" /* yacc.c:1646  */
+#line 31552 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1079:
-#line 7193 "gram.y" /* yacc.c:1646  */
+  case 1081:
+#line 7202 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_AGGREGATE;
@@ -31548,11 +31563,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31552 "gram.c" /* yacc.c:1646  */
+#line 31567 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1080:
-#line 7204 "gram.y" /* yacc.c:1646  */
+  case 1082:
+#line 7213 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_AGGREGATE;
@@ -31563,11 +31578,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31567 "gram.c" /* yacc.c:1646  */
+#line 31582 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1081:
-#line 7218 "gram.y" /* yacc.c:1646  */
+  case 1083:
+#line 7227 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_OPERATOR;
@@ -31578,11 +31593,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31582 "gram.c" /* yacc.c:1646  */
+#line 31597 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1082:
-#line 7229 "gram.y" /* yacc.c:1646  */
+  case 1084:
+#line 7238 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_OPERATOR;
@@ -31593,11 +31608,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31597 "gram.c" /* yacc.c:1646  */
+#line 31612 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1083:
-#line 7243 "gram.y" /* yacc.c:1646  */
+  case 1085:
+#line 7252 "gram.y" /* yacc.c:1646  */
     {
 				   ereport(ERROR,
 						   (errcode(ERRCODE_SYNTAX_ERROR),
@@ -31605,79 +31620,79 @@
 							errhint("Use NONE to denote the missing argument of a unary operator."),
 							parser_errposition((yylsp[0]))));
 				}
-#line 31609 "gram.c" /* yacc.c:1646  */
+#line 31624 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1084:
-#line 7251 "gram.y" /* yacc.c:1646  */
+  case 1086:
+#line 7260 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2((yyvsp[-3].typnam), (yyvsp[-1].typnam)); }
-#line 31615 "gram.c" /* yacc.c:1646  */
+#line 31630 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1085:
-#line 7253 "gram.y" /* yacc.c:1646  */
+  case 1087:
+#line 7262 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2(NULL, (yyvsp[-1].typnam)); }
-#line 31621 "gram.c" /* yacc.c:1646  */
+#line 31636 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1086:
-#line 7255 "gram.y" /* yacc.c:1646  */
+  case 1088:
+#line 7264 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2((yyvsp[-3].typnam), NULL); }
-#line 31627 "gram.c" /* yacc.c:1646  */
+#line 31642 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1087:
-#line 7260 "gram.y" /* yacc.c:1646  */
+  case 1089:
+#line 7269 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 31633 "gram.c" /* yacc.c:1646  */
+#line 31648 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1088:
-#line 7262 "gram.y" /* yacc.c:1646  */
+  case 1090:
+#line 7271 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lcons(makeString((yyvsp[-2].str)), (yyvsp[0].list)); }
-#line 31639 "gram.c" /* yacc.c:1646  */
+#line 31654 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1089:
-#line 7275 "gram.y" /* yacc.c:1646  */
+  case 1091:
+#line 7284 "gram.y" /* yacc.c:1646  */
     {
 					DoStmt *n = makeNode(DoStmt);
 					n->args = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 31649 "gram.c" /* yacc.c:1646  */
+#line 31664 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1090:
-#line 7283 "gram.y" /* yacc.c:1646  */
+  case 1092:
+#line 7292 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 31655 "gram.c" /* yacc.c:1646  */
+#line 31670 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1091:
-#line 7284 "gram.y" /* yacc.c:1646  */
+  case 1093:
+#line 7293 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 31661 "gram.c" /* yacc.c:1646  */
+#line 31676 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1092:
-#line 7289 "gram.y" /* yacc.c:1646  */
+  case 1094:
+#line 7298 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("as", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 31669 "gram.c" /* yacc.c:1646  */
+#line 31684 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1093:
-#line 7293 "gram.y" /* yacc.c:1646  */
+  case 1095:
+#line 7302 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem("language", (Node *)makeString((yyvsp[0].str)));
 				}
-#line 31677 "gram.c" /* yacc.c:1646  */
+#line 31692 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1094:
-#line 7306 "gram.y" /* yacc.c:1646  */
+  case 1096:
+#line 7315 "gram.y" /* yacc.c:1646  */
     {
 					CreateCastStmt *n = makeNode(CreateCastStmt);
 					n->sourcetype = (yyvsp[-7].typnam);
@@ -31687,11 +31702,11 @@
 					n->inout = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31691 "gram.c" /* yacc.c:1646  */
+#line 31706 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1095:
-#line 7317 "gram.y" /* yacc.c:1646  */
+  case 1097:
+#line 7326 "gram.y" /* yacc.c:1646  */
     {
 					CreateCastStmt *n = makeNode(CreateCastStmt);
 					n->sourcetype = (yyvsp[-6].typnam);
@@ -31701,11 +31716,11 @@
 					n->inout = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31705 "gram.c" /* yacc.c:1646  */
+#line 31720 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1096:
-#line 7328 "gram.y" /* yacc.c:1646  */
+  case 1098:
+#line 7337 "gram.y" /* yacc.c:1646  */
     {
 					CreateCastStmt *n = makeNode(CreateCastStmt);
 					n->sourcetype = (yyvsp[-6].typnam);
@@ -31715,29 +31730,29 @@
 					n->inout = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 31719 "gram.c" /* yacc.c:1646  */
+#line 31734 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1097:
-#line 7339 "gram.y" /* yacc.c:1646  */
+  case 1099:
+#line 7348 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = COERCION_IMPLICIT; }
-#line 31725 "gram.c" /* yacc.c:1646  */
+#line 31740 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1098:
-#line 7340 "gram.y" /* yacc.c:1646  */
+  case 1100:
+#line 7349 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = COERCION_ASSIGNMENT; }
-#line 31731 "gram.c" /* yacc.c:1646  */
+#line 31746 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1099:
-#line 7341 "gram.y" /* yacc.c:1646  */
+  case 1101:
+#line 7350 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = COERCION_EXPLICIT; }
-#line 31737 "gram.c" /* yacc.c:1646  */
+#line 31752 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1100:
-#line 7346 "gram.y" /* yacc.c:1646  */
+  case 1102:
+#line 7355 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_CAST;
@@ -31748,23 +31763,23 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31752 "gram.c" /* yacc.c:1646  */
+#line 31767 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1101:
-#line 7358 "gram.y" /* yacc.c:1646  */
+  case 1103:
+#line 7367 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 31758 "gram.c" /* yacc.c:1646  */
+#line 31773 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1102:
-#line 7359 "gram.y" /* yacc.c:1646  */
+  case 1104:
+#line 7368 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 31764 "gram.c" /* yacc.c:1646  */
+#line 31779 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1103:
-#line 7370 "gram.y" /* yacc.c:1646  */
+  case 1105:
+#line 7379 "gram.y" /* yacc.c:1646  */
     {
 					CreateTransformStmt *n = makeNode(CreateTransformStmt);
 					n->replace = (yyvsp[-8].boolean);
@@ -31774,43 +31789,43 @@
 					n->tosql = lsecond((yyvsp[-1].list));
 					(yyval.node) = (Node *)n;
 				}
-#line 31778 "gram.c" /* yacc.c:1646  */
+#line 31793 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1104:
-#line 7382 "gram.y" /* yacc.c:1646  */
+  case 1106:
+#line 7391 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2((yyvsp[-6].funwithargs), (yyvsp[0].funwithargs));
 				}
-#line 31786 "gram.c" /* yacc.c:1646  */
+#line 31801 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1105:
-#line 7386 "gram.y" /* yacc.c:1646  */
+  case 1107:
+#line 7395 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2((yyvsp[0].funwithargs), (yyvsp[-6].funwithargs));
 				}
-#line 31794 "gram.c" /* yacc.c:1646  */
+#line 31809 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1106:
-#line 7390 "gram.y" /* yacc.c:1646  */
+  case 1108:
+#line 7399 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2((yyvsp[0].funwithargs), NULL);
 				}
-#line 31802 "gram.c" /* yacc.c:1646  */
+#line 31817 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1107:
-#line 7394 "gram.y" /* yacc.c:1646  */
+  case 1109:
+#line 7403 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2(NULL, (yyvsp[0].funwithargs));
 				}
-#line 31810 "gram.c" /* yacc.c:1646  */
+#line 31825 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1108:
-#line 7401 "gram.y" /* yacc.c:1646  */
+  case 1110:
+#line 7410 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_TRANSFORM;
@@ -31820,11 +31835,11 @@
 					n->missing_ok = (yyvsp[-5].boolean);
 					(yyval.node) = (Node *)n;
 				}
-#line 31824 "gram.c" /* yacc.c:1646  */
+#line 31839 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1109:
-#line 7422 "gram.y" /* yacc.c:1646  */
+  case 1111:
+#line 7431 "gram.y" /* yacc.c:1646  */
     {
 					ReindexStmt *n = makeNode(ReindexStmt);
 					n->kind = (yyvsp[-1].ival);
@@ -31833,11 +31848,11 @@
 					n->options = 0;
 					(yyval.node) = (Node *)n;
 				}
-#line 31837 "gram.c" /* yacc.c:1646  */
+#line 31852 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1110:
-#line 7431 "gram.y" /* yacc.c:1646  */
+  case 1112:
+#line 7440 "gram.y" /* yacc.c:1646  */
     {
 					ReindexStmt *n = makeNode(ReindexStmt);
 					n->kind = (yyvsp[-1].ival);
@@ -31846,11 +31861,11 @@
 					n->options = 0;
 					(yyval.node) = (Node *)n;
 				}
-#line 31850 "gram.c" /* yacc.c:1646  */
+#line 31865 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1111:
-#line 7440 "gram.y" /* yacc.c:1646  */
+  case 1113:
+#line 7449 "gram.y" /* yacc.c:1646  */
     {
 					ReindexStmt *n = makeNode(ReindexStmt);
 					n->kind = (yyvsp[-1].ival);
@@ -31859,11 +31874,11 @@
 					n->options = (yyvsp[-3].ival);
 					(yyval.node) = (Node *)n;
 				}
-#line 31863 "gram.c" /* yacc.c:1646  */
+#line 31878 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1112:
-#line 7449 "gram.y" /* yacc.c:1646  */
+  case 1114:
+#line 7458 "gram.y" /* yacc.c:1646  */
     {
 					ReindexStmt *n = makeNode(ReindexStmt);
 					n->kind = (yyvsp[-1].ival);
@@ -31872,59 +31887,59 @@
 					n->options = (yyvsp[-3].ival);
 					(yyval.node) = (Node *)n;
 				}
-#line 31876 "gram.c" /* yacc.c:1646  */
+#line 31891 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1113:
-#line 7459 "gram.y" /* yacc.c:1646  */
+  case 1115:
+#line 7468 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = REINDEX_OBJECT_INDEX; }
-#line 31882 "gram.c" /* yacc.c:1646  */
+#line 31897 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1114:
-#line 7460 "gram.y" /* yacc.c:1646  */
+  case 1116:
+#line 7469 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = REINDEX_OBJECT_TABLE; }
-#line 31888 "gram.c" /* yacc.c:1646  */
+#line 31903 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1115:
-#line 7463 "gram.y" /* yacc.c:1646  */
+  case 1117:
+#line 7472 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = REINDEX_OBJECT_SCHEMA; }
-#line 31894 "gram.c" /* yacc.c:1646  */
+#line 31909 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1116:
-#line 7464 "gram.y" /* yacc.c:1646  */
+  case 1118:
+#line 7473 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = REINDEX_OBJECT_SYSTEM; }
-#line 31900 "gram.c" /* yacc.c:1646  */
+#line 31915 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1117:
-#line 7465 "gram.y" /* yacc.c:1646  */
+  case 1119:
+#line 7474 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = REINDEX_OBJECT_DATABASE; }
-#line 31906 "gram.c" /* yacc.c:1646  */
+#line 31921 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1118:
-#line 7468 "gram.y" /* yacc.c:1646  */
+  case 1120:
+#line 7477 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[0].ival); }
-#line 31912 "gram.c" /* yacc.c:1646  */
+#line 31927 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1119:
-#line 7469 "gram.y" /* yacc.c:1646  */
+  case 1121:
+#line 7478 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[-2].ival) | (yyvsp[0].ival); }
-#line 31918 "gram.c" /* yacc.c:1646  */
+#line 31933 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1120:
-#line 7472 "gram.y" /* yacc.c:1646  */
+  case 1122:
+#line 7481 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = REINDEXOPT_VERBOSE; }
-#line 31924 "gram.c" /* yacc.c:1646  */
+#line 31939 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1121:
-#line 7483 "gram.y" /* yacc.c:1646  */
+  case 1123:
+#line 7492 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableSpaceOptionsStmt *n =
 						makeNode(AlterTableSpaceOptionsStmt);
@@ -31933,11 +31948,11 @@
 					n->isReset = FALSE;
 					(yyval.node) = (Node *)n;
 				}
-#line 31937 "gram.c" /* yacc.c:1646  */
+#line 31952 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1122:
-#line 7492 "gram.y" /* yacc.c:1646  */
+  case 1124:
+#line 7501 "gram.y" /* yacc.c:1646  */
     {
 					AlterTableSpaceOptionsStmt *n =
 						makeNode(AlterTableSpaceOptionsStmt);
@@ -31946,11 +31961,11 @@
 					n->isReset = TRUE;
 					(yyval.node) = (Node *)n;
 				}
-#line 31950 "gram.c" /* yacc.c:1646  */
+#line 31965 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1123:
-#line 7509 "gram.y" /* yacc.c:1646  */
+  case 1125:
+#line 7518 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_AGGREGATE;
@@ -31960,11 +31975,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31964 "gram.c" /* yacc.c:1646  */
+#line 31979 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1124:
-#line 7519 "gram.y" /* yacc.c:1646  */
+  case 1126:
+#line 7528 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_COLLATION;
@@ -31973,11 +31988,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31977 "gram.c" /* yacc.c:1646  */
+#line 31992 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1125:
-#line 7528 "gram.y" /* yacc.c:1646  */
+  case 1127:
+#line 7537 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_CONVERSION;
@@ -31986,11 +32001,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 31990 "gram.c" /* yacc.c:1646  */
+#line 32005 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1126:
-#line 7537 "gram.y" /* yacc.c:1646  */
+  case 1128:
+#line 7546 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_DATABASE;
@@ -31999,11 +32014,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32003 "gram.c" /* yacc.c:1646  */
+#line 32018 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1127:
-#line 7546 "gram.y" /* yacc.c:1646  */
+  case 1129:
+#line 7555 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_DOMAIN;
@@ -32012,11 +32027,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32016 "gram.c" /* yacc.c:1646  */
+#line 32031 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1128:
-#line 7555 "gram.y" /* yacc.c:1646  */
+  case 1130:
+#line 7564 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_DOMCONSTRAINT;
@@ -32025,11 +32040,11 @@
 					n->newname = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 32029 "gram.c" /* yacc.c:1646  */
+#line 32044 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1129:
-#line 7564 "gram.y" /* yacc.c:1646  */
+  case 1131:
+#line 7573 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_FDW;
@@ -32038,11 +32053,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32042 "gram.c" /* yacc.c:1646  */
+#line 32057 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1130:
-#line 7573 "gram.y" /* yacc.c:1646  */
+  case 1132:
+#line 7582 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_FUNCTION;
@@ -32052,11 +32067,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32056 "gram.c" /* yacc.c:1646  */
+#line 32071 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1131:
-#line 7583 "gram.y" /* yacc.c:1646  */
+  case 1133:
+#line 7592 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_ROLE;
@@ -32065,11 +32080,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32069 "gram.c" /* yacc.c:1646  */
+#line 32084 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1132:
-#line 7592 "gram.y" /* yacc.c:1646  */
+  case 1134:
+#line 7601 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_LANGUAGE;
@@ -32078,11 +32093,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32082 "gram.c" /* yacc.c:1646  */
+#line 32097 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1133:
-#line 7601 "gram.y" /* yacc.c:1646  */
+  case 1135:
+#line 7610 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_OPCLASS;
@@ -32091,11 +32106,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32095 "gram.c" /* yacc.c:1646  */
+#line 32110 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1134:
-#line 7610 "gram.y" /* yacc.c:1646  */
+  case 1136:
+#line 7619 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_OPFAMILY;
@@ -32104,11 +32119,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32108 "gram.c" /* yacc.c:1646  */
+#line 32123 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1135:
-#line 7619 "gram.y" /* yacc.c:1646  */
+  case 1137:
+#line 7628 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_POLICY;
@@ -32118,11 +32133,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32122 "gram.c" /* yacc.c:1646  */
+#line 32137 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1136:
-#line 7629 "gram.y" /* yacc.c:1646  */
+  case 1138:
+#line 7638 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_POLICY;
@@ -32132,11 +32147,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32136 "gram.c" /* yacc.c:1646  */
+#line 32151 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1137:
-#line 7639 "gram.y" /* yacc.c:1646  */
+  case 1139:
+#line 7648 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_SCHEMA;
@@ -32145,11 +32160,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32149 "gram.c" /* yacc.c:1646  */
+#line 32164 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1138:
-#line 7648 "gram.y" /* yacc.c:1646  */
+  case 1140:
+#line 7657 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_FOREIGN_SERVER;
@@ -32158,11 +32173,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32162 "gram.c" /* yacc.c:1646  */
+#line 32177 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1139:
-#line 7657 "gram.y" /* yacc.c:1646  */
+  case 1141:
+#line 7666 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TABLE;
@@ -32172,11 +32187,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32176 "gram.c" /* yacc.c:1646  */
+#line 32191 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1140:
-#line 7667 "gram.y" /* yacc.c:1646  */
+  case 1142:
+#line 7676 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TABLE;
@@ -32186,11 +32201,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32190 "gram.c" /* yacc.c:1646  */
+#line 32205 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1141:
-#line 7677 "gram.y" /* yacc.c:1646  */
+  case 1143:
+#line 7686 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_SEQUENCE;
@@ -32200,11 +32215,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32204 "gram.c" /* yacc.c:1646  */
+#line 32219 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1142:
-#line 7687 "gram.y" /* yacc.c:1646  */
+  case 1144:
+#line 7696 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_SEQUENCE;
@@ -32214,11 +32229,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32218 "gram.c" /* yacc.c:1646  */
+#line 32233 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1143:
-#line 7697 "gram.y" /* yacc.c:1646  */
+  case 1145:
+#line 7706 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_VIEW;
@@ -32228,11 +32243,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32232 "gram.c" /* yacc.c:1646  */
+#line 32247 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1144:
-#line 7707 "gram.y" /* yacc.c:1646  */
+  case 1146:
+#line 7716 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_VIEW;
@@ -32242,11 +32257,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32246 "gram.c" /* yacc.c:1646  */
+#line 32261 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1145:
-#line 7717 "gram.y" /* yacc.c:1646  */
+  case 1147:
+#line 7726 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_MATVIEW;
@@ -32256,11 +32271,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32260 "gram.c" /* yacc.c:1646  */
+#line 32275 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1146:
-#line 7727 "gram.y" /* yacc.c:1646  */
+  case 1148:
+#line 7736 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_MATVIEW;
@@ -32270,11 +32285,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32274 "gram.c" /* yacc.c:1646  */
+#line 32289 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1147:
-#line 7737 "gram.y" /* yacc.c:1646  */
+  case 1149:
+#line 7746 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_INDEX;
@@ -32284,11 +32299,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32288 "gram.c" /* yacc.c:1646  */
+#line 32303 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1148:
-#line 7747 "gram.y" /* yacc.c:1646  */
+  case 1150:
+#line 7756 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_INDEX;
@@ -32298,11 +32313,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32302 "gram.c" /* yacc.c:1646  */
+#line 32317 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1149:
-#line 7757 "gram.y" /* yacc.c:1646  */
+  case 1151:
+#line 7766 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_FOREIGN_TABLE;
@@ -32312,11 +32327,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32316 "gram.c" /* yacc.c:1646  */
+#line 32331 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1150:
-#line 7767 "gram.y" /* yacc.c:1646  */
+  case 1152:
+#line 7776 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_FOREIGN_TABLE;
@@ -32326,11 +32341,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32330 "gram.c" /* yacc.c:1646  */
+#line 32345 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1151:
-#line 7777 "gram.y" /* yacc.c:1646  */
+  case 1153:
+#line 7786 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_COLUMN;
@@ -32341,11 +32356,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32345 "gram.c" /* yacc.c:1646  */
+#line 32360 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1152:
-#line 7788 "gram.y" /* yacc.c:1646  */
+  case 1154:
+#line 7797 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_COLUMN;
@@ -32356,11 +32371,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32360 "gram.c" /* yacc.c:1646  */
+#line 32375 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1153:
-#line 7799 "gram.y" /* yacc.c:1646  */
+  case 1155:
+#line 7808 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_COLUMN;
@@ -32371,11 +32386,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32375 "gram.c" /* yacc.c:1646  */
+#line 32390 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1154:
-#line 7810 "gram.y" /* yacc.c:1646  */
+  case 1156:
+#line 7819 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_COLUMN;
@@ -32386,11 +32401,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32390 "gram.c" /* yacc.c:1646  */
+#line 32405 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1155:
-#line 7821 "gram.y" /* yacc.c:1646  */
+  case 1157:
+#line 7830 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TABCONSTRAINT;
@@ -32400,11 +32415,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32404 "gram.c" /* yacc.c:1646  */
+#line 32419 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1156:
-#line 7831 "gram.y" /* yacc.c:1646  */
+  case 1158:
+#line 7840 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TABCONSTRAINT;
@@ -32414,11 +32429,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32418 "gram.c" /* yacc.c:1646  */
+#line 32433 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1157:
-#line 7841 "gram.y" /* yacc.c:1646  */
+  case 1159:
+#line 7850 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_COLUMN;
@@ -32429,11 +32444,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32433 "gram.c" /* yacc.c:1646  */
+#line 32448 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1158:
-#line 7852 "gram.y" /* yacc.c:1646  */
+  case 1160:
+#line 7861 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_COLUMN;
@@ -32444,11 +32459,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32448 "gram.c" /* yacc.c:1646  */
+#line 32463 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1159:
-#line 7863 "gram.y" /* yacc.c:1646  */
+  case 1161:
+#line 7872 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_RULE;
@@ -32458,11 +32473,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32462 "gram.c" /* yacc.c:1646  */
+#line 32477 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1160:
-#line 7873 "gram.y" /* yacc.c:1646  */
+  case 1162:
+#line 7882 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TRIGGER;
@@ -32472,11 +32487,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32476 "gram.c" /* yacc.c:1646  */
+#line 32491 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1161:
-#line 7883 "gram.y" /* yacc.c:1646  */
+  case 1163:
+#line 7892 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_EVENT_TRIGGER;
@@ -32484,11 +32499,11 @@
 					n->newname = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 32488 "gram.c" /* yacc.c:1646  */
+#line 32503 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1162:
-#line 7891 "gram.y" /* yacc.c:1646  */
+  case 1164:
+#line 7900 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_ROLE;
@@ -32497,11 +32512,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32501 "gram.c" /* yacc.c:1646  */
+#line 32516 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1163:
-#line 7900 "gram.y" /* yacc.c:1646  */
+  case 1165:
+#line 7909 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_ROLE;
@@ -32510,11 +32525,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32514 "gram.c" /* yacc.c:1646  */
+#line 32529 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1164:
-#line 7909 "gram.y" /* yacc.c:1646  */
+  case 1166:
+#line 7918 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TABLESPACE;
@@ -32523,11 +32538,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32527 "gram.c" /* yacc.c:1646  */
+#line 32542 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1165:
-#line 7918 "gram.y" /* yacc.c:1646  */
+  case 1167:
+#line 7927 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TSPARSER;
@@ -32536,11 +32551,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32540 "gram.c" /* yacc.c:1646  */
+#line 32555 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1166:
-#line 7927 "gram.y" /* yacc.c:1646  */
+  case 1168:
+#line 7936 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TSDICTIONARY;
@@ -32549,11 +32564,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32553 "gram.c" /* yacc.c:1646  */
+#line 32568 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1167:
-#line 7936 "gram.y" /* yacc.c:1646  */
+  case 1169:
+#line 7945 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TSTEMPLATE;
@@ -32562,11 +32577,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32566 "gram.c" /* yacc.c:1646  */
+#line 32581 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1168:
-#line 7945 "gram.y" /* yacc.c:1646  */
+  case 1170:
+#line 7954 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TSCONFIGURATION;
@@ -32575,11 +32590,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32579 "gram.c" /* yacc.c:1646  */
+#line 32594 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1169:
-#line 7954 "gram.y" /* yacc.c:1646  */
+  case 1171:
+#line 7963 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_TYPE;
@@ -32588,11 +32603,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32592 "gram.c" /* yacc.c:1646  */
+#line 32607 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1170:
-#line 7963 "gram.y" /* yacc.c:1646  */
+  case 1172:
+#line 7972 "gram.y" /* yacc.c:1646  */
     {
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_ATTRIBUTE;
@@ -32604,35 +32619,35 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32608 "gram.c" /* yacc.c:1646  */
+#line 32623 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1171:
-#line 7976 "gram.y" /* yacc.c:1646  */
+  case 1173:
+#line 7985 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = COLUMN; }
-#line 32614 "gram.c" /* yacc.c:1646  */
+#line 32629 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1172:
-#line 7977 "gram.y" /* yacc.c:1646  */
+  case 1174:
+#line 7986 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = 0; }
-#line 32620 "gram.c" /* yacc.c:1646  */
+#line 32635 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1173:
-#line 7980 "gram.y" /* yacc.c:1646  */
+  case 1175:
+#line 7989 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = 1; }
-#line 32626 "gram.c" /* yacc.c:1646  */
+#line 32641 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1174:
-#line 7981 "gram.y" /* yacc.c:1646  */
+  case 1176:
+#line 7990 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = 0; }
-#line 32632 "gram.c" /* yacc.c:1646  */
+#line 32647 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1175:
-#line 7992 "gram.y" /* yacc.c:1646  */
+  case 1177:
+#line 8001 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_AGGREGATE;
@@ -32642,11 +32657,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32646 "gram.c" /* yacc.c:1646  */
+#line 32661 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1176:
-#line 8002 "gram.y" /* yacc.c:1646  */
+  case 1178:
+#line 8011 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_COLLATION;
@@ -32655,11 +32670,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32659 "gram.c" /* yacc.c:1646  */
+#line 32674 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1177:
-#line 8011 "gram.y" /* yacc.c:1646  */
+  case 1179:
+#line 8020 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_CONVERSION;
@@ -32668,11 +32683,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32672 "gram.c" /* yacc.c:1646  */
+#line 32687 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1178:
-#line 8020 "gram.y" /* yacc.c:1646  */
+  case 1180:
+#line 8029 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_DOMAIN;
@@ -32681,11 +32696,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32685 "gram.c" /* yacc.c:1646  */
+#line 32700 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1179:
-#line 8029 "gram.y" /* yacc.c:1646  */
+  case 1181:
+#line 8038 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_EXTENSION;
@@ -32694,11 +32709,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32698 "gram.c" /* yacc.c:1646  */
+#line 32713 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1180:
-#line 8038 "gram.y" /* yacc.c:1646  */
+  case 1182:
+#line 8047 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_FUNCTION;
@@ -32708,11 +32723,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32712 "gram.c" /* yacc.c:1646  */
+#line 32727 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1181:
-#line 8048 "gram.y" /* yacc.c:1646  */
+  case 1183:
+#line 8057 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_OPERATOR;
@@ -32722,11 +32737,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32726 "gram.c" /* yacc.c:1646  */
+#line 32741 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1182:
-#line 8058 "gram.y" /* yacc.c:1646  */
+  case 1184:
+#line 8067 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_OPCLASS;
@@ -32735,11 +32750,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32739 "gram.c" /* yacc.c:1646  */
+#line 32754 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1183:
-#line 8067 "gram.y" /* yacc.c:1646  */
+  case 1185:
+#line 8076 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_OPFAMILY;
@@ -32748,11 +32763,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32752 "gram.c" /* yacc.c:1646  */
+#line 32767 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1184:
-#line 8076 "gram.y" /* yacc.c:1646  */
+  case 1186:
+#line 8085 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_TABLE;
@@ -32761,11 +32776,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32765 "gram.c" /* yacc.c:1646  */
+#line 32780 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1185:
-#line 8085 "gram.y" /* yacc.c:1646  */
+  case 1187:
+#line 8094 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_TABLE;
@@ -32774,11 +32789,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32778 "gram.c" /* yacc.c:1646  */
+#line 32793 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1186:
-#line 8094 "gram.y" /* yacc.c:1646  */
+  case 1188:
+#line 8103 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_TSPARSER;
@@ -32787,11 +32802,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32791 "gram.c" /* yacc.c:1646  */
+#line 32806 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1187:
-#line 8103 "gram.y" /* yacc.c:1646  */
+  case 1189:
+#line 8112 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_TSDICTIONARY;
@@ -32800,11 +32815,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32804 "gram.c" /* yacc.c:1646  */
+#line 32819 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1188:
-#line 8112 "gram.y" /* yacc.c:1646  */
+  case 1190:
+#line 8121 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_TSTEMPLATE;
@@ -32813,11 +32828,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32817 "gram.c" /* yacc.c:1646  */
+#line 32832 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1189:
-#line 8121 "gram.y" /* yacc.c:1646  */
+  case 1191:
+#line 8130 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_TSCONFIGURATION;
@@ -32826,11 +32841,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32830 "gram.c" /* yacc.c:1646  */
+#line 32845 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1190:
-#line 8130 "gram.y" /* yacc.c:1646  */
+  case 1192:
+#line 8139 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_SEQUENCE;
@@ -32839,11 +32854,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32843 "gram.c" /* yacc.c:1646  */
+#line 32858 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1191:
-#line 8139 "gram.y" /* yacc.c:1646  */
+  case 1193:
+#line 8148 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_SEQUENCE;
@@ -32852,11 +32867,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32856 "gram.c" /* yacc.c:1646  */
+#line 32871 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1192:
-#line 8148 "gram.y" /* yacc.c:1646  */
+  case 1194:
+#line 8157 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_VIEW;
@@ -32865,11 +32880,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32869 "gram.c" /* yacc.c:1646  */
+#line 32884 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1193:
-#line 8157 "gram.y" /* yacc.c:1646  */
+  case 1195:
+#line 8166 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_VIEW;
@@ -32878,11 +32893,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32882 "gram.c" /* yacc.c:1646  */
+#line 32897 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1194:
-#line 8166 "gram.y" /* yacc.c:1646  */
+  case 1196:
+#line 8175 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_MATVIEW;
@@ -32891,11 +32906,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32895 "gram.c" /* yacc.c:1646  */
+#line 32910 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1195:
-#line 8175 "gram.y" /* yacc.c:1646  */
+  case 1197:
+#line 8184 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_MATVIEW;
@@ -32904,11 +32919,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32908 "gram.c" /* yacc.c:1646  */
+#line 32923 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1196:
-#line 8184 "gram.y" /* yacc.c:1646  */
+  case 1198:
+#line 8193 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_FOREIGN_TABLE;
@@ -32917,11 +32932,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32921 "gram.c" /* yacc.c:1646  */
+#line 32936 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1197:
-#line 8193 "gram.y" /* yacc.c:1646  */
+  case 1199:
+#line 8202 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_FOREIGN_TABLE;
@@ -32930,11 +32945,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 32934 "gram.c" /* yacc.c:1646  */
+#line 32949 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1198:
-#line 8202 "gram.y" /* yacc.c:1646  */
+  case 1200:
+#line 8211 "gram.y" /* yacc.c:1646  */
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_TYPE;
@@ -32943,11 +32958,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 32947 "gram.c" /* yacc.c:1646  */
+#line 32962 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1199:
-#line 8219 "gram.y" /* yacc.c:1646  */
+  case 1201:
+#line 8228 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_AGGREGATE;
@@ -32956,11 +32971,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 32960 "gram.c" /* yacc.c:1646  */
+#line 32975 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1200:
-#line 8228 "gram.y" /* yacc.c:1646  */
+  case 1202:
+#line 8237 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_COLLATION;
@@ -32968,11 +32983,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 32972 "gram.c" /* yacc.c:1646  */
+#line 32987 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1201:
-#line 8236 "gram.y" /* yacc.c:1646  */
+  case 1203:
+#line 8245 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_CONVERSION;
@@ -32980,11 +32995,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 32984 "gram.c" /* yacc.c:1646  */
+#line 32999 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1202:
-#line 8244 "gram.y" /* yacc.c:1646  */
+  case 1204:
+#line 8253 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_DATABASE;
@@ -32992,11 +33007,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 32996 "gram.c" /* yacc.c:1646  */
+#line 33011 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1203:
-#line 8252 "gram.y" /* yacc.c:1646  */
+  case 1205:
+#line 8261 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_DOMAIN;
@@ -33004,11 +33019,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33008 "gram.c" /* yacc.c:1646  */
+#line 33023 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1204:
-#line 8260 "gram.y" /* yacc.c:1646  */
+  case 1206:
+#line 8269 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_FUNCTION;
@@ -33017,11 +33032,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33021 "gram.c" /* yacc.c:1646  */
+#line 33036 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1205:
-#line 8269 "gram.y" /* yacc.c:1646  */
+  case 1207:
+#line 8278 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_LANGUAGE;
@@ -33029,11 +33044,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33033 "gram.c" /* yacc.c:1646  */
+#line 33048 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1206:
-#line 8277 "gram.y" /* yacc.c:1646  */
+  case 1208:
+#line 8286 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_LARGEOBJECT;
@@ -33041,11 +33056,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33045 "gram.c" /* yacc.c:1646  */
+#line 33060 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1207:
-#line 8285 "gram.y" /* yacc.c:1646  */
+  case 1209:
+#line 8294 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_OPERATOR;
@@ -33054,11 +33069,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33058 "gram.c" /* yacc.c:1646  */
+#line 33073 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1208:
-#line 8294 "gram.y" /* yacc.c:1646  */
+  case 1210:
+#line 8303 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_OPCLASS;
@@ -33066,11 +33081,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33070 "gram.c" /* yacc.c:1646  */
+#line 33085 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1209:
-#line 8302 "gram.y" /* yacc.c:1646  */
+  case 1211:
+#line 8311 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_OPFAMILY;
@@ -33078,11 +33093,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33082 "gram.c" /* yacc.c:1646  */
+#line 33097 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1210:
-#line 8310 "gram.y" /* yacc.c:1646  */
+  case 1212:
+#line 8319 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_SCHEMA;
@@ -33090,11 +33105,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33094 "gram.c" /* yacc.c:1646  */
+#line 33109 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1211:
-#line 8318 "gram.y" /* yacc.c:1646  */
+  case 1213:
+#line 8327 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_TYPE;
@@ -33102,11 +33117,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33106 "gram.c" /* yacc.c:1646  */
+#line 33121 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1212:
-#line 8326 "gram.y" /* yacc.c:1646  */
+  case 1214:
+#line 8335 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_TABLESPACE;
@@ -33114,11 +33129,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33118 "gram.c" /* yacc.c:1646  */
+#line 33133 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1213:
-#line 8334 "gram.y" /* yacc.c:1646  */
+  case 1215:
+#line 8343 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_TSDICTIONARY;
@@ -33126,11 +33141,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33130 "gram.c" /* yacc.c:1646  */
+#line 33145 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1214:
-#line 8342 "gram.y" /* yacc.c:1646  */
+  case 1216:
+#line 8351 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_TSCONFIGURATION;
@@ -33138,11 +33153,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33142 "gram.c" /* yacc.c:1646  */
+#line 33157 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1215:
-#line 8350 "gram.y" /* yacc.c:1646  */
+  case 1217:
+#line 8359 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_FDW;
@@ -33150,11 +33165,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33154 "gram.c" /* yacc.c:1646  */
+#line 33169 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1216:
-#line 8358 "gram.y" /* yacc.c:1646  */
+  case 1218:
+#line 8367 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_FOREIGN_SERVER;
@@ -33162,11 +33177,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33166 "gram.c" /* yacc.c:1646  */
+#line 33181 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1217:
-#line 8366 "gram.y" /* yacc.c:1646  */
+  case 1219:
+#line 8375 "gram.y" /* yacc.c:1646  */
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_EVENT_TRIGGER;
@@ -33174,11 +33189,11 @@
 					n->newowner = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33178 "gram.c" /* yacc.c:1646  */
+#line 33193 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1218:
-#line 8385 "gram.y" /* yacc.c:1646  */
+  case 1220:
+#line 8394 "gram.y" /* yacc.c:1646  */
     {
 					RuleStmt *n = makeNode(RuleStmt);
 					n->replace = (yyvsp[-11].boolean);
@@ -33190,103 +33205,103 @@
 					n->actions = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 33194 "gram.c" /* yacc.c:1646  */
+#line 33209 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1219:
-#line 8399 "gram.y" /* yacc.c:1646  */
+  case 1221:
+#line 8408 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 33200 "gram.c" /* yacc.c:1646  */
+#line 33215 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1220:
-#line 8400 "gram.y" /* yacc.c:1646  */
+  case 1222:
+#line 8409 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 33206 "gram.c" /* yacc.c:1646  */
+#line 33221 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1221:
-#line 8401 "gram.y" /* yacc.c:1646  */
+  case 1223:
+#line 8410 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 33212 "gram.c" /* yacc.c:1646  */
+#line 33227 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1222:
-#line 8407 "gram.y" /* yacc.c:1646  */
+  case 1224:
+#line 8416 "gram.y" /* yacc.c:1646  */
     { if ((yyvsp[0].node) != NULL)
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node));
 				  else
 					(yyval.list) = (yyvsp[-2].list);
 				}
-#line 33222 "gram.c" /* yacc.c:1646  */
+#line 33237 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1223:
-#line 8413 "gram.y" /* yacc.c:1646  */
+  case 1225:
+#line 8422 "gram.y" /* yacc.c:1646  */
     { if ((yyvsp[0].node) != NULL)
 					(yyval.list) = list_make1((yyvsp[0].node));
 				  else
 					(yyval.list) = NIL;
 				}
-#line 33232 "gram.c" /* yacc.c:1646  */
+#line 33247 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1229:
-#line 8429 "gram.y" /* yacc.c:1646  */
+  case 1231:
+#line 8438 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 33238 "gram.c" /* yacc.c:1646  */
+#line 33253 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1230:
-#line 8430 "gram.y" /* yacc.c:1646  */
+  case 1232:
+#line 8439 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 33244 "gram.c" /* yacc.c:1646  */
+#line 33259 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1231:
-#line 8433 "gram.y" /* yacc.c:1646  */
+  case 1233:
+#line 8442 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CMD_SELECT; }
-#line 33250 "gram.c" /* yacc.c:1646  */
+#line 33265 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1232:
-#line 8434 "gram.y" /* yacc.c:1646  */
+  case 1234:
+#line 8443 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CMD_UPDATE; }
-#line 33256 "gram.c" /* yacc.c:1646  */
+#line 33271 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1233:
-#line 8435 "gram.y" /* yacc.c:1646  */
+  case 1235:
+#line 8444 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CMD_DELETE; }
-#line 33262 "gram.c" /* yacc.c:1646  */
+#line 33277 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1234:
-#line 8436 "gram.y" /* yacc.c:1646  */
+  case 1236:
+#line 8445 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CMD_INSERT; }
-#line 33268 "gram.c" /* yacc.c:1646  */
+#line 33283 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1235:
-#line 8440 "gram.y" /* yacc.c:1646  */
+  case 1237:
+#line 8449 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 33274 "gram.c" /* yacc.c:1646  */
+#line 33289 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1236:
-#line 8441 "gram.y" /* yacc.c:1646  */
+  case 1238:
+#line 8450 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 33280 "gram.c" /* yacc.c:1646  */
+#line 33295 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1237:
-#line 8442 "gram.y" /* yacc.c:1646  */
+  case 1239:
+#line 8451 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 33286 "gram.c" /* yacc.c:1646  */
+#line 33301 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1238:
-#line 8448 "gram.y" /* yacc.c:1646  */
+  case 1240:
+#line 8457 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_RULE;
@@ -33297,11 +33312,11 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 33301 "gram.c" /* yacc.c:1646  */
+#line 33316 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1239:
-#line 8459 "gram.y" /* yacc.c:1646  */
+  case 1241:
+#line 8468 "gram.y" /* yacc.c:1646  */
     {
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_RULE;
@@ -33312,130 +33327,130 @@
 					n->concurrent = false;
 					(yyval.node) = (Node *) n;
 				}
-#line 33316 "gram.c" /* yacc.c:1646  */
+#line 33331 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1240:
-#line 8481 "gram.y" /* yacc.c:1646  */
+  case 1242:
+#line 8490 "gram.y" /* yacc.c:1646  */
     {
 					NotifyStmt *n = makeNode(NotifyStmt);
 					n->conditionname = (yyvsp[-1].str);
 					n->payload = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 33327 "gram.c" /* yacc.c:1646  */
+#line 33342 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1241:
-#line 8490 "gram.y" /* yacc.c:1646  */
+  case 1243:
+#line 8499 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 33333 "gram.c" /* yacc.c:1646  */
+#line 33348 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1242:
-#line 8491 "gram.y" /* yacc.c:1646  */
+  case 1244:
+#line 8500 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 33339 "gram.c" /* yacc.c:1646  */
+#line 33354 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1243:
-#line 8495 "gram.y" /* yacc.c:1646  */
+  case 1245:
+#line 8504 "gram.y" /* yacc.c:1646  */
     {
 					ListenStmt *n = makeNode(ListenStmt);
 					n->conditionname = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 33349 "gram.c" /* yacc.c:1646  */
+#line 33364 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1244:
-#line 8504 "gram.y" /* yacc.c:1646  */
+  case 1246:
+#line 8513 "gram.y" /* yacc.c:1646  */
     {
 					UnlistenStmt *n = makeNode(UnlistenStmt);
 					n->conditionname = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 33359 "gram.c" /* yacc.c:1646  */
+#line 33374 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1245:
-#line 8510 "gram.y" /* yacc.c:1646  */
+  case 1247:
+#line 8519 "gram.y" /* yacc.c:1646  */
     {
 					UnlistenStmt *n = makeNode(UnlistenStmt);
 					n->conditionname = NULL;
 					(yyval.node) = (Node *)n;
 				}
-#line 33369 "gram.c" /* yacc.c:1646  */
+#line 33384 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1246:
-#line 8529 "gram.y" /* yacc.c:1646  */
+  case 1248:
+#line 8538 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_ROLLBACK;
 					n->options = NIL;
 					(yyval.node) = (Node *)n;
 				}
-#line 33380 "gram.c" /* yacc.c:1646  */
+#line 33395 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1247:
-#line 8536 "gram.y" /* yacc.c:1646  */
+  case 1249:
+#line 8545 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_BEGIN;
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 33391 "gram.c" /* yacc.c:1646  */
+#line 33406 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1248:
-#line 8543 "gram.y" /* yacc.c:1646  */
+  case 1250:
+#line 8552 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_START;
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 33402 "gram.c" /* yacc.c:1646  */
+#line 33417 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1249:
-#line 8550 "gram.y" /* yacc.c:1646  */
+  case 1251:
+#line 8559 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_COMMIT;
 					n->options = NIL;
 					(yyval.node) = (Node *)n;
 				}
-#line 33413 "gram.c" /* yacc.c:1646  */
+#line 33428 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1250:
-#line 8557 "gram.y" /* yacc.c:1646  */
+  case 1252:
+#line 8566 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_COMMIT;
 					n->options = NIL;
 					(yyval.node) = (Node *)n;
 				}
-#line 33424 "gram.c" /* yacc.c:1646  */
+#line 33439 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1251:
-#line 8564 "gram.y" /* yacc.c:1646  */
+  case 1253:
+#line 8573 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_ROLLBACK;
 					n->options = NIL;
 					(yyval.node) = (Node *)n;
 				}
-#line 33435 "gram.c" /* yacc.c:1646  */
+#line 33450 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1252:
-#line 8571 "gram.y" /* yacc.c:1646  */
+  case 1254:
+#line 8580 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_SAVEPOINT;
@@ -33443,11 +33458,11 @@
 														(Node *)makeString((yyvsp[0].str))));
 					(yyval.node) = (Node *)n;
 				}
-#line 33447 "gram.c" /* yacc.c:1646  */
+#line 33462 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1253:
-#line 8579 "gram.y" /* yacc.c:1646  */
+  case 1255:
+#line 8588 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_RELEASE;
@@ -33455,11 +33470,11 @@
 														(Node *)makeString((yyvsp[0].str))));
 					(yyval.node) = (Node *)n;
 				}
-#line 33459 "gram.c" /* yacc.c:1646  */
+#line 33474 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1254:
-#line 8587 "gram.y" /* yacc.c:1646  */
+  case 1256:
+#line 8596 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_RELEASE;
@@ -33467,11 +33482,11 @@
 														(Node *)makeString((yyvsp[0].str))));
 					(yyval.node) = (Node *)n;
 				}
-#line 33471 "gram.c" /* yacc.c:1646  */
+#line 33486 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1255:
-#line 8595 "gram.y" /* yacc.c:1646  */
+  case 1257:
+#line 8604 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_ROLLBACK_TO;
@@ -33479,11 +33494,11 @@
 														(Node *)makeString((yyvsp[0].str))));
 					(yyval.node) = (Node *)n;
 				}
-#line 33483 "gram.c" /* yacc.c:1646  */
+#line 33498 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1256:
-#line 8603 "gram.y" /* yacc.c:1646  */
+  case 1258:
+#line 8612 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_ROLLBACK_TO;
@@ -33491,121 +33506,121 @@
 														(Node *)makeString((yyvsp[0].str))));
 					(yyval.node) = (Node *)n;
 				}
-#line 33495 "gram.c" /* yacc.c:1646  */
+#line 33510 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1257:
-#line 8611 "gram.y" /* yacc.c:1646  */
+  case 1259:
+#line 8620 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_PREPARE;
 					n->gid = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 33506 "gram.c" /* yacc.c:1646  */
+#line 33521 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1258:
-#line 8618 "gram.y" /* yacc.c:1646  */
+  case 1260:
+#line 8627 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_COMMIT_PREPARED;
 					n->gid = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 33517 "gram.c" /* yacc.c:1646  */
+#line 33532 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1259:
-#line 8625 "gram.y" /* yacc.c:1646  */
+  case 1261:
+#line 8634 "gram.y" /* yacc.c:1646  */
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
 					n->kind = TRANS_STMT_ROLLBACK_PREPARED;
 					n->gid = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 33528 "gram.c" /* yacc.c:1646  */
+#line 33543 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1260:
-#line 8633 "gram.y" /* yacc.c:1646  */
+  case 1262:
+#line 8642 "gram.y" /* yacc.c:1646  */
     {}
-#line 33534 "gram.c" /* yacc.c:1646  */
+#line 33549 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1261:
-#line 8634 "gram.y" /* yacc.c:1646  */
+  case 1263:
+#line 8643 "gram.y" /* yacc.c:1646  */
     {}
-#line 33540 "gram.c" /* yacc.c:1646  */
+#line 33555 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1262:
-#line 8635 "gram.y" /* yacc.c:1646  */
+  case 1264:
+#line 8644 "gram.y" /* yacc.c:1646  */
     {}
-#line 33546 "gram.c" /* yacc.c:1646  */
+#line 33561 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1263:
-#line 8640 "gram.y" /* yacc.c:1646  */
+  case 1265:
+#line 8649 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = makeDefElem("transaction_isolation",
 									   makeStringConst((yyvsp[0].str), (yylsp[0]))); }
-#line 33553 "gram.c" /* yacc.c:1646  */
+#line 33568 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1264:
-#line 8643 "gram.y" /* yacc.c:1646  */
+  case 1266:
+#line 8652 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = makeDefElem("transaction_read_only",
 									   makeIntConst(TRUE, (yylsp[-1]))); }
-#line 33560 "gram.c" /* yacc.c:1646  */
+#line 33575 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1265:
-#line 8646 "gram.y" /* yacc.c:1646  */
+  case 1267:
+#line 8655 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = makeDefElem("transaction_read_only",
 									   makeIntConst(FALSE, (yylsp[-1]))); }
-#line 33567 "gram.c" /* yacc.c:1646  */
+#line 33582 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1266:
-#line 8649 "gram.y" /* yacc.c:1646  */
+  case 1268:
+#line 8658 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = makeDefElem("transaction_deferrable",
 									   makeIntConst(TRUE, (yylsp[0]))); }
-#line 33574 "gram.c" /* yacc.c:1646  */
+#line 33589 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1267:
-#line 8652 "gram.y" /* yacc.c:1646  */
+  case 1269:
+#line 8661 "gram.y" /* yacc.c:1646  */
     { (yyval.defelt) = makeDefElem("transaction_deferrable",
 									   makeIntConst(FALSE, (yylsp[-1]))); }
-#line 33581 "gram.c" /* yacc.c:1646  */
+#line 33596 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1268:
-#line 8659 "gram.y" /* yacc.c:1646  */
+  case 1270:
+#line 8668 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 33587 "gram.c" /* yacc.c:1646  */
+#line 33602 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1269:
-#line 8661 "gram.y" /* yacc.c:1646  */
+  case 1271:
+#line 8670 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].defelt)); }
-#line 33593 "gram.c" /* yacc.c:1646  */
+#line 33608 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1270:
-#line 8663 "gram.y" /* yacc.c:1646  */
+  case 1272:
+#line 8672 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 33599 "gram.c" /* yacc.c:1646  */
+#line 33614 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1272:
-#line 8669 "gram.y" /* yacc.c:1646  */
+  case 1274:
+#line 8678 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 33605 "gram.c" /* yacc.c:1646  */
+#line 33620 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1273:
-#line 8683 "gram.y" /* yacc.c:1646  */
+  case 1275:
+#line 8692 "gram.y" /* yacc.c:1646  */
     {
 					ViewStmt *n = makeNode(ViewStmt);
 					n->view = (yyvsp[-5].range);
@@ -33617,11 +33632,11 @@
 					n->withCheckOption = (yyvsp[0].ival);
 					(yyval.node) = (Node *) n;
 				}
-#line 33621 "gram.c" /* yacc.c:1646  */
+#line 33636 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1274:
-#line 8696 "gram.y" /* yacc.c:1646  */
+  case 1276:
+#line 8705 "gram.y" /* yacc.c:1646  */
     {
 					ViewStmt *n = makeNode(ViewStmt);
 					n->view = (yyvsp[-5].range);
@@ -33633,11 +33648,11 @@
 					n->withCheckOption = (yyvsp[0].ival);
 					(yyval.node) = (Node *) n;
 				}
-#line 33637 "gram.c" /* yacc.c:1646  */
+#line 33652 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1275:
-#line 8709 "gram.y" /* yacc.c:1646  */
+  case 1277:
+#line 8718 "gram.y" /* yacc.c:1646  */
     {
 					ViewStmt *n = makeNode(ViewStmt);
 					n->view = (yyvsp[-7].range);
@@ -33654,11 +33669,11 @@
 								 parser_errposition((yylsp[0]))));
 					(yyval.node) = (Node *) n;
 				}
-#line 33658 "gram.c" /* yacc.c:1646  */
+#line 33673 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1276:
-#line 8727 "gram.y" /* yacc.c:1646  */
+  case 1278:
+#line 8736 "gram.y" /* yacc.c:1646  */
     {
 					ViewStmt *n = makeNode(ViewStmt);
 					n->view = (yyvsp[-7].range);
@@ -33675,180 +33690,180 @@
 								 parser_errposition((yylsp[0]))));
 					(yyval.node) = (Node *) n;
 				}
-#line 33679 "gram.c" /* yacc.c:1646  */
+#line 33694 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1277:
-#line 8746 "gram.y" /* yacc.c:1646  */
+  case 1279:
+#line 8755 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CASCADED_CHECK_OPTION; }
-#line 33685 "gram.c" /* yacc.c:1646  */
+#line 33700 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1278:
-#line 8747 "gram.y" /* yacc.c:1646  */
+  case 1280:
+#line 8756 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CASCADED_CHECK_OPTION; }
-#line 33691 "gram.c" /* yacc.c:1646  */
+#line 33706 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1279:
-#line 8748 "gram.y" /* yacc.c:1646  */
+  case 1281:
+#line 8757 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = LOCAL_CHECK_OPTION; }
-#line 33697 "gram.c" /* yacc.c:1646  */
+#line 33712 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1280:
-#line 8749 "gram.y" /* yacc.c:1646  */
+  case 1282:
+#line 8758 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = NO_CHECK_OPTION; }
-#line 33703 "gram.c" /* yacc.c:1646  */
+#line 33718 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1281:
-#line 8760 "gram.y" /* yacc.c:1646  */
+  case 1283:
+#line 8769 "gram.y" /* yacc.c:1646  */
     {
 					LoadStmt *n = makeNode(LoadStmt);
 					n->filename = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 33713 "gram.c" /* yacc.c:1646  */
+#line 33728 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1282:
-#line 8776 "gram.y" /* yacc.c:1646  */
+  case 1284:
+#line 8785 "gram.y" /* yacc.c:1646  */
     {
 					CreatedbStmt *n = makeNode(CreatedbStmt);
 					n->dbname = (yyvsp[-2].str);
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 33724 "gram.c" /* yacc.c:1646  */
+#line 33739 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1283:
-#line 8785 "gram.y" /* yacc.c:1646  */
+  case 1285:
+#line 8794 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 33730 "gram.c" /* yacc.c:1646  */
+#line 33745 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1284:
-#line 8786 "gram.y" /* yacc.c:1646  */
+  case 1286:
+#line 8795 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 33736 "gram.c" /* yacc.c:1646  */
+#line 33751 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1285:
-#line 8790 "gram.y" /* yacc.c:1646  */
+  case 1287:
+#line 8799 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].defelt)); }
-#line 33742 "gram.c" /* yacc.c:1646  */
+#line 33757 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1286:
-#line 8791 "gram.y" /* yacc.c:1646  */
+  case 1288:
+#line 8800 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].defelt)); }
-#line 33748 "gram.c" /* yacc.c:1646  */
+#line 33763 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1287:
-#line 8796 "gram.y" /* yacc.c:1646  */
+  case 1289:
+#line 8805 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[-2].str), (Node *)makeInteger((yyvsp[0].ival)));
 				}
-#line 33756 "gram.c" /* yacc.c:1646  */
+#line 33771 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1288:
-#line 8800 "gram.y" /* yacc.c:1646  */
+  case 1290:
+#line 8809 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[-2].str), (Node *)makeString((yyvsp[0].str)));
 				}
-#line 33764 "gram.c" /* yacc.c:1646  */
+#line 33779 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1289:
-#line 8804 "gram.y" /* yacc.c:1646  */
+  case 1291:
+#line 8813 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[-2].str), NULL);
 				}
-#line 33772 "gram.c" /* yacc.c:1646  */
+#line 33787 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1290:
-#line 8821 "gram.y" /* yacc.c:1646  */
+  case 1292:
+#line 8830 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 33778 "gram.c" /* yacc.c:1646  */
+#line 33793 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1291:
-#line 8822 "gram.y" /* yacc.c:1646  */
+  case 1293:
+#line 8831 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup("connection_limit"); }
-#line 33784 "gram.c" /* yacc.c:1646  */
+#line 33799 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1292:
-#line 8823 "gram.y" /* yacc.c:1646  */
+  case 1294:
+#line 8832 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 33790 "gram.c" /* yacc.c:1646  */
+#line 33805 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1293:
-#line 8824 "gram.y" /* yacc.c:1646  */
+  case 1295:
+#line 8833 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 33796 "gram.c" /* yacc.c:1646  */
+#line 33811 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1294:
-#line 8825 "gram.y" /* yacc.c:1646  */
+  case 1296:
+#line 8834 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 33802 "gram.c" /* yacc.c:1646  */
+#line 33817 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1295:
-#line 8826 "gram.y" /* yacc.c:1646  */
+  case 1297:
+#line 8835 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 33808 "gram.c" /* yacc.c:1646  */
+#line 33823 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1296:
-#line 8827 "gram.y" /* yacc.c:1646  */
+  case 1298:
+#line 8836 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 33814 "gram.c" /* yacc.c:1646  */
+#line 33829 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1297:
-#line 8834 "gram.y" /* yacc.c:1646  */
+  case 1299:
+#line 8843 "gram.y" /* yacc.c:1646  */
     {}
-#line 33820 "gram.c" /* yacc.c:1646  */
+#line 33835 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1298:
-#line 8835 "gram.y" /* yacc.c:1646  */
+  case 1300:
+#line 8844 "gram.y" /* yacc.c:1646  */
     {}
-#line 33826 "gram.c" /* yacc.c:1646  */
+#line 33841 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1299:
-#line 8847 "gram.y" /* yacc.c:1646  */
+  case 1301:
+#line 8856 "gram.y" /* yacc.c:1646  */
     {
 					AlterDatabaseStmt *n = makeNode(AlterDatabaseStmt);
 					n->dbname = (yyvsp[-2].str);
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				 }
-#line 33837 "gram.c" /* yacc.c:1646  */
+#line 33852 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1300:
-#line 8854 "gram.y" /* yacc.c:1646  */
+  case 1302:
+#line 8863 "gram.y" /* yacc.c:1646  */
     {
 					AlterDatabaseStmt *n = makeNode(AlterDatabaseStmt);
 					n->dbname = (yyvsp[-1].str);
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				 }
-#line 33848 "gram.c" /* yacc.c:1646  */
+#line 33863 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1301:
-#line 8861 "gram.y" /* yacc.c:1646  */
+  case 1303:
+#line 8870 "gram.y" /* yacc.c:1646  */
     {
 					AlterDatabaseStmt *n = makeNode(AlterDatabaseStmt);
 					n->dbname = (yyvsp[-3].str);
@@ -33856,64 +33871,64 @@
 													(Node *)makeString((yyvsp[0].str))));
 					(yyval.node) = (Node *)n;
 				 }
-#line 33860 "gram.c" /* yacc.c:1646  */
+#line 33875 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1302:
-#line 8872 "gram.y" /* yacc.c:1646  */
+  case 1304:
+#line 8881 "gram.y" /* yacc.c:1646  */
     {
 					AlterDatabaseSetStmt *n = makeNode(AlterDatabaseSetStmt);
 					n->dbname = (yyvsp[-1].str);
 					n->setstmt = (yyvsp[0].vsetstmt);
 					(yyval.node) = (Node *)n;
 				}
-#line 33871 "gram.c" /* yacc.c:1646  */
+#line 33886 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1303:
-#line 8889 "gram.y" /* yacc.c:1646  */
+  case 1305:
+#line 8898 "gram.y" /* yacc.c:1646  */
     {
 					DropdbStmt *n = makeNode(DropdbStmt);
 					n->dbname = (yyvsp[0].str);
 					n->missing_ok = FALSE;
 					(yyval.node) = (Node *)n;
 				}
-#line 33882 "gram.c" /* yacc.c:1646  */
+#line 33897 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1304:
-#line 8896 "gram.y" /* yacc.c:1646  */
+  case 1306:
+#line 8905 "gram.y" /* yacc.c:1646  */
     {
 					DropdbStmt *n = makeNode(DropdbStmt);
 					n->dbname = (yyvsp[0].str);
 					n->missing_ok = TRUE;
 					(yyval.node) = (Node *)n;
 				}
-#line 33893 "gram.c" /* yacc.c:1646  */
+#line 33908 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1305:
-#line 8914 "gram.y" /* yacc.c:1646  */
+  case 1307:
+#line 8923 "gram.y" /* yacc.c:1646  */
     {
 					AlterSystemStmt *n = makeNode(AlterSystemStmt);
 					n->setstmt = (yyvsp[0].vsetstmt);
 					(yyval.node) = (Node *)n;
 				}
-#line 33903 "gram.c" /* yacc.c:1646  */
+#line 33918 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1306:
-#line 8920 "gram.y" /* yacc.c:1646  */
+  case 1308:
+#line 8929 "gram.y" /* yacc.c:1646  */
     {
 					AlterSystemStmt *n = makeNode(AlterSystemStmt);
 					n->setstmt = (yyvsp[0].vsetstmt);
 					(yyval.node) = (Node *)n;
 				}
-#line 33913 "gram.c" /* yacc.c:1646  */
+#line 33928 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1307:
-#line 8936 "gram.y" /* yacc.c:1646  */
+  case 1309:
+#line 8945 "gram.y" /* yacc.c:1646  */
     {
 					CreateDomainStmt *n = makeNode(CreateDomainStmt);
 					n->domainname = (yyvsp[-3].list);
@@ -33922,11 +33937,11 @@
 									 yyscanner);
 					(yyval.node) = (Node *)n;
 				}
-#line 33926 "gram.c" /* yacc.c:1646  */
+#line 33941 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1308:
-#line 8949 "gram.y" /* yacc.c:1646  */
+  case 1310:
+#line 8958 "gram.y" /* yacc.c:1646  */
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
 					n->subtype = 'T';
@@ -33934,33 +33949,33 @@
 					n->def = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33938 "gram.c" /* yacc.c:1646  */
+#line 33953 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1309:
-#line 8958 "gram.y" /* yacc.c:1646  */
+  case 1311:
+#line 8967 "gram.y" /* yacc.c:1646  */
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
 					n->subtype = 'N';
 					n->typeName = (yyvsp[-3].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 33949 "gram.c" /* yacc.c:1646  */
+#line 33964 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1310:
-#line 8966 "gram.y" /* yacc.c:1646  */
+  case 1312:
+#line 8975 "gram.y" /* yacc.c:1646  */
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
 					n->subtype = 'O';
 					n->typeName = (yyvsp[-3].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 33960 "gram.c" /* yacc.c:1646  */
+#line 33975 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1311:
-#line 8974 "gram.y" /* yacc.c:1646  */
+  case 1313:
+#line 8983 "gram.y" /* yacc.c:1646  */
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
 					n->subtype = 'C';
@@ -33968,11 +33983,11 @@
 					n->def = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 33972 "gram.c" /* yacc.c:1646  */
+#line 33987 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1312:
-#line 8983 "gram.y" /* yacc.c:1646  */
+  case 1314:
+#line 8992 "gram.y" /* yacc.c:1646  */
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
 					n->subtype = 'X';
@@ -33982,11 +33997,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node *)n;
 				}
-#line 33986 "gram.c" /* yacc.c:1646  */
+#line 34001 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1313:
-#line 8994 "gram.y" /* yacc.c:1646  */
+  case 1315:
+#line 9003 "gram.y" /* yacc.c:1646  */
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
 					n->subtype = 'X';
@@ -33996,11 +34011,11 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node *)n;
 				}
-#line 34000 "gram.c" /* yacc.c:1646  */
+#line 34015 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1314:
-#line 9005 "gram.y" /* yacc.c:1646  */
+  case 1316:
+#line 9014 "gram.y" /* yacc.c:1646  */
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
 					n->subtype = 'V';
@@ -34008,34 +34023,34 @@
 					n->name = (yyvsp[0].str);
 					(yyval.node) = (Node *)n;
 				}
-#line 34012 "gram.c" /* yacc.c:1646  */
+#line 34027 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1315:
-#line 9014 "gram.y" /* yacc.c:1646  */
+  case 1317:
+#line 9023 "gram.y" /* yacc.c:1646  */
     {}
-#line 34018 "gram.c" /* yacc.c:1646  */
+#line 34033 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1316:
-#line 9015 "gram.y" /* yacc.c:1646  */
+  case 1318:
+#line 9024 "gram.y" /* yacc.c:1646  */
     {}
-#line 34024 "gram.c" /* yacc.c:1646  */
+#line 34039 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1317:
-#line 9027 "gram.y" /* yacc.c:1646  */
+  case 1319:
+#line 9036 "gram.y" /* yacc.c:1646  */
     {
 					AlterTSDictionaryStmt *n = makeNode(AlterTSDictionaryStmt);
 					n->dictname = (yyvsp[-1].list);
 					n->options = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 34035 "gram.c" /* yacc.c:1646  */
+#line 34050 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1318:
-#line 9037 "gram.y" /* yacc.c:1646  */
+  case 1320:
+#line 9046 "gram.y" /* yacc.c:1646  */
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
 					n->kind = ALTER_TSCONFIG_ADD_MAPPING;
@@ -34046,11 +34061,11 @@
 					n->replace = false;
 					(yyval.node) = (Node*)n;
 				}
-#line 34050 "gram.c" /* yacc.c:1646  */
+#line 34065 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1319:
-#line 9048 "gram.y" /* yacc.c:1646  */
+  case 1321:
+#line 9057 "gram.y" /* yacc.c:1646  */
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
 					n->kind = ALTER_TSCONFIG_ALTER_MAPPING_FOR_TOKEN;
@@ -34061,11 +34076,11 @@
 					n->replace = false;
 					(yyval.node) = (Node*)n;
 				}
-#line 34065 "gram.c" /* yacc.c:1646  */
+#line 34080 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1320:
-#line 9059 "gram.y" /* yacc.c:1646  */
+  case 1322:
+#line 9068 "gram.y" /* yacc.c:1646  */
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
 					n->kind = ALTER_TSCONFIG_REPLACE_DICT;
@@ -34076,11 +34091,11 @@
 					n->replace = true;
 					(yyval.node) = (Node*)n;
 				}
-#line 34080 "gram.c" /* yacc.c:1646  */
+#line 34095 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1321:
-#line 9070 "gram.y" /* yacc.c:1646  */
+  case 1323:
+#line 9079 "gram.y" /* yacc.c:1646  */
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
 					n->kind = ALTER_TSCONFIG_REPLACE_DICT_FOR_TOKEN;
@@ -34091,11 +34106,11 @@
 					n->replace = true;
 					(yyval.node) = (Node*)n;
 				}
-#line 34095 "gram.c" /* yacc.c:1646  */
+#line 34110 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1322:
-#line 9081 "gram.y" /* yacc.c:1646  */
+  case 1324:
+#line 9090 "gram.y" /* yacc.c:1646  */
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
 					n->kind = ALTER_TSCONFIG_DROP_MAPPING;
@@ -34104,11 +34119,11 @@
 					n->missing_ok = false;
 					(yyval.node) = (Node*)n;
 				}
-#line 34108 "gram.c" /* yacc.c:1646  */
+#line 34123 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1323:
-#line 9090 "gram.y" /* yacc.c:1646  */
+  case 1325:
+#line 9099 "gram.y" /* yacc.c:1646  */
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
 					n->kind = ALTER_TSCONFIG_DROP_MAPPING;
@@ -34117,23 +34132,23 @@
 					n->missing_ok = true;
 					(yyval.node) = (Node*)n;
 				}
-#line 34121 "gram.c" /* yacc.c:1646  */
+#line 34136 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1324:
-#line 9101 "gram.y" /* yacc.c:1646  */
+  case 1326:
+#line 9110 "gram.y" /* yacc.c:1646  */
     {}
-#line 34127 "gram.c" /* yacc.c:1646  */
+#line 34142 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1325:
-#line 9102 "gram.y" /* yacc.c:1646  */
+  case 1327:
+#line 9111 "gram.y" /* yacc.c:1646  */
     {}
-#line 34133 "gram.c" /* yacc.c:1646  */
+#line 34148 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1326:
-#line 9118 "gram.y" /* yacc.c:1646  */
+  case 1328:
+#line 9127 "gram.y" /* yacc.c:1646  */
     {
 				CreateConversionStmt *n = makeNode(CreateConversionStmt);
 				n->conversion_name = (yyvsp[-6].list);
@@ -34143,11 +34158,11 @@
 				n->def = (yyvsp[-8].boolean);
 				(yyval.node) = (Node *)n;
 			}
-#line 34147 "gram.c" /* yacc.c:1646  */
+#line 34162 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1327:
-#line 9140 "gram.y" /* yacc.c:1646  */
+  case 1329:
+#line 9149 "gram.y" /* yacc.c:1646  */
     {
 					ClusterStmt *n = makeNode(ClusterStmt);
 					n->relation = (yyvsp[-1].range);
@@ -34155,11 +34170,11 @@
 					n->verbose = (yyvsp[-2].boolean);
 					(yyval.node) = (Node*)n;
 				}
-#line 34159 "gram.c" /* yacc.c:1646  */
+#line 34174 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1328:
-#line 9148 "gram.y" /* yacc.c:1646  */
+  case 1330:
+#line 9157 "gram.y" /* yacc.c:1646  */
     {
 					ClusterStmt *n = makeNode(ClusterStmt);
 					n->relation = NULL;
@@ -34167,11 +34182,11 @@
 					n->verbose = (yyvsp[0].boolean);
 					(yyval.node) = (Node*)n;
 				}
-#line 34171 "gram.c" /* yacc.c:1646  */
+#line 34186 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1329:
-#line 9157 "gram.y" /* yacc.c:1646  */
+  case 1331:
+#line 9166 "gram.y" /* yacc.c:1646  */
     {
 					ClusterStmt *n = makeNode(ClusterStmt);
 					n->relation = (yyvsp[0].range);
@@ -34179,23 +34194,23 @@
 					n->verbose = (yyvsp[-3].boolean);
 					(yyval.node) = (Node*)n;
 				}
-#line 34183 "gram.c" /* yacc.c:1646  */
+#line 34198 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1330:
-#line 9167 "gram.y" /* yacc.c:1646  */
+  case 1332:
+#line 9176 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 34189 "gram.c" /* yacc.c:1646  */
+#line 34204 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1331:
-#line 9168 "gram.y" /* yacc.c:1646  */
+  case 1333:
+#line 9177 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 34195 "gram.c" /* yacc.c:1646  */
+#line 34210 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1332:
-#line 9181 "gram.y" /* yacc.c:1646  */
+  case 1334:
+#line 9190 "gram.y" /* yacc.c:1646  */
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
 					n->options = VACOPT_VACUUM;
@@ -34209,11 +34224,11 @@
 					n->va_cols = NIL;
 					(yyval.node) = (Node *)n;
 				}
-#line 34213 "gram.c" /* yacc.c:1646  */
+#line 34228 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1333:
-#line 9195 "gram.y" /* yacc.c:1646  */
+  case 1335:
+#line 9204 "gram.y" /* yacc.c:1646  */
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
 					n->options = VACOPT_VACUUM;
@@ -34227,11 +34242,11 @@
 					n->va_cols = NIL;
 					(yyval.node) = (Node *)n;
 				}
-#line 34231 "gram.c" /* yacc.c:1646  */
+#line 34246 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1334:
-#line 9209 "gram.y" /* yacc.c:1646  */
+  case 1336:
+#line 9218 "gram.y" /* yacc.c:1646  */
     {
 					VacuumStmt *n = (VacuumStmt *) (yyvsp[0].node);
 					n->options |= VACOPT_VACUUM;
@@ -34243,11 +34258,11 @@
 						n->options |= VACOPT_VERBOSE;
 					(yyval.node) = (Node *)n;
 				}
-#line 34247 "gram.c" /* yacc.c:1646  */
+#line 34262 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1335:
-#line 9221 "gram.y" /* yacc.c:1646  */
+  case 1337:
+#line 9230 "gram.y" /* yacc.c:1646  */
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
 					n->options = VACOPT_VACUUM | (yyvsp[-1].ival);
@@ -34255,11 +34270,11 @@
 					n->va_cols = NIL;
 					(yyval.node) = (Node *) n;
 				}
-#line 34259 "gram.c" /* yacc.c:1646  */
+#line 34274 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1336:
-#line 9229 "gram.y" /* yacc.c:1646  */
+  case 1338:
+#line 9238 "gram.y" /* yacc.c:1646  */
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
 					n->options = VACOPT_VACUUM | (yyvsp[-3].ival);
@@ -34269,47 +34284,47 @@
 						n->options |= VACOPT_ANALYZE;
 					(yyval.node) = (Node *) n;
 				}
-#line 34273 "gram.c" /* yacc.c:1646  */
+#line 34288 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1337:
-#line 9241 "gram.y" /* yacc.c:1646  */
+  case 1339:
+#line 9250 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[0].ival); }
-#line 34279 "gram.c" /* yacc.c:1646  */
+#line 34294 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1338:
-#line 9242 "gram.y" /* yacc.c:1646  */
+  case 1340:
+#line 9251 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[-2].ival) | (yyvsp[0].ival); }
-#line 34285 "gram.c" /* yacc.c:1646  */
+#line 34300 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1339:
-#line 9246 "gram.y" /* yacc.c:1646  */
+  case 1341:
+#line 9255 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = VACOPT_ANALYZE; }
-#line 34291 "gram.c" /* yacc.c:1646  */
+#line 34306 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1340:
-#line 9247 "gram.y" /* yacc.c:1646  */
+  case 1342:
+#line 9256 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = VACOPT_VERBOSE; }
-#line 34297 "gram.c" /* yacc.c:1646  */
+#line 34312 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1341:
-#line 9248 "gram.y" /* yacc.c:1646  */
+  case 1343:
+#line 9257 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = VACOPT_FREEZE; }
-#line 34303 "gram.c" /* yacc.c:1646  */
+#line 34318 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1342:
-#line 9249 "gram.y" /* yacc.c:1646  */
+  case 1344:
+#line 9258 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = VACOPT_FULL; }
-#line 34309 "gram.c" /* yacc.c:1646  */
+#line 34324 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1343:
-#line 9254 "gram.y" /* yacc.c:1646  */
+  case 1345:
+#line 9263 "gram.y" /* yacc.c:1646  */
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
 					n->options = VACOPT_ANALYZE;
@@ -34319,11 +34334,11 @@
 					n->va_cols = NIL;
 					(yyval.node) = (Node *)n;
 				}
-#line 34323 "gram.c" /* yacc.c:1646  */
+#line 34338 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1344:
-#line 9264 "gram.y" /* yacc.c:1646  */
+  case 1346:
+#line 9273 "gram.y" /* yacc.c:1646  */
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
 					n->options = VACOPT_ANALYZE;
@@ -34333,82 +34348,82 @@
 					n->va_cols = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 34337 "gram.c" /* yacc.c:1646  */
+#line 34352 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1345:
-#line 9276 "gram.y" /* yacc.c:1646  */
+  case 1347:
+#line 9285 "gram.y" /* yacc.c:1646  */
     {}
-#line 34343 "gram.c" /* yacc.c:1646  */
+#line 34358 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1346:
-#line 9277 "gram.y" /* yacc.c:1646  */
+  case 1348:
+#line 9286 "gram.y" /* yacc.c:1646  */
     {}
-#line 34349 "gram.c" /* yacc.c:1646  */
+#line 34364 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1347:
-#line 9281 "gram.y" /* yacc.c:1646  */
+  case 1349:
+#line 9290 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 34355 "gram.c" /* yacc.c:1646  */
+#line 34370 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1348:
-#line 9282 "gram.y" /* yacc.c:1646  */
+  case 1350:
+#line 9291 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 34361 "gram.c" /* yacc.c:1646  */
+#line 34376 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1349:
-#line 9285 "gram.y" /* yacc.c:1646  */
+  case 1351:
+#line 9294 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 34367 "gram.c" /* yacc.c:1646  */
+#line 34382 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1350:
-#line 9286 "gram.y" /* yacc.c:1646  */
+  case 1352:
+#line 9295 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 34373 "gram.c" /* yacc.c:1646  */
+#line 34388 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1351:
-#line 9289 "gram.y" /* yacc.c:1646  */
+  case 1353:
+#line 9298 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 34379 "gram.c" /* yacc.c:1646  */
+#line 34394 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1352:
-#line 9290 "gram.y" /* yacc.c:1646  */
+  case 1354:
+#line 9299 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 34385 "gram.c" /* yacc.c:1646  */
+#line 34400 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1353:
-#line 9294 "gram.y" /* yacc.c:1646  */
+  case 1355:
+#line 9303 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 34391 "gram.c" /* yacc.c:1646  */
+#line 34406 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1354:
-#line 9295 "gram.y" /* yacc.c:1646  */
+  case 1356:
+#line 9304 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 34397 "gram.c" /* yacc.c:1646  */
+#line 34412 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1355:
-#line 9309 "gram.y" /* yacc.c:1646  */
+  case 1357:
+#line 9318 "gram.y" /* yacc.c:1646  */
     {
 					ExplainStmt *n = makeNode(ExplainStmt);
 					n->query = (yyvsp[0].node);
 					n->options = NIL;
 					(yyval.node) = (Node *) n;
 				}
-#line 34408 "gram.c" /* yacc.c:1646  */
+#line 34423 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1356:
-#line 9316 "gram.y" /* yacc.c:1646  */
+  case 1358:
+#line 9325 "gram.y" /* yacc.c:1646  */
     {
 					ExplainStmt *n = makeNode(ExplainStmt);
 					n->query = (yyvsp[0].node);
@@ -34418,87 +34433,87 @@
 											 makeDefElem("verbose", NULL));
 					(yyval.node) = (Node *) n;
 				}
-#line 34422 "gram.c" /* yacc.c:1646  */
+#line 34437 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1357:
-#line 9326 "gram.y" /* yacc.c:1646  */
+  case 1359:
+#line 9335 "gram.y" /* yacc.c:1646  */
     {
 					ExplainStmt *n = makeNode(ExplainStmt);
 					n->query = (yyvsp[0].node);
 					n->options = list_make1(makeDefElem("verbose", NULL));
 					(yyval.node) = (Node *) n;
 				}
-#line 34433 "gram.c" /* yacc.c:1646  */
+#line 34448 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1358:
-#line 9333 "gram.y" /* yacc.c:1646  */
+  case 1360:
+#line 9342 "gram.y" /* yacc.c:1646  */
     {
 					ExplainStmt *n = makeNode(ExplainStmt);
 					n->query = (yyvsp[0].node);
 					n->options = (yyvsp[-2].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 34444 "gram.c" /* yacc.c:1646  */
+#line 34459 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1368:
-#line 9355 "gram.y" /* yacc.c:1646  */
+  case 1370:
+#line 9364 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].defelt));
 				}
-#line 34452 "gram.c" /* yacc.c:1646  */
+#line 34467 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1369:
-#line 9359 "gram.y" /* yacc.c:1646  */
+  case 1371:
+#line 9368 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].defelt));
 				}
-#line 34460 "gram.c" /* yacc.c:1646  */
+#line 34475 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1370:
-#line 9366 "gram.y" /* yacc.c:1646  */
+  case 1372:
+#line 9375 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.defelt) = makeDefElem((yyvsp[-1].str), (yyvsp[0].node));
 				}
-#line 34468 "gram.c" /* yacc.c:1646  */
+#line 34483 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1371:
-#line 9372 "gram.y" /* yacc.c:1646  */
+  case 1373:
+#line 9381 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 34474 "gram.c" /* yacc.c:1646  */
+#line 34489 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1372:
-#line 9373 "gram.y" /* yacc.c:1646  */
+  case 1374:
+#line 9382 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "analyze"; }
-#line 34480 "gram.c" /* yacc.c:1646  */
+#line 34495 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1373:
-#line 9377 "gram.y" /* yacc.c:1646  */
+  case 1375:
+#line 9386 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeString((yyvsp[0].str)); }
-#line 34486 "gram.c" /* yacc.c:1646  */
+#line 34501 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1374:
-#line 9378 "gram.y" /* yacc.c:1646  */
+  case 1376:
+#line 9387 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) (yyvsp[0].value); }
-#line 34492 "gram.c" /* yacc.c:1646  */
+#line 34507 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1375:
-#line 9379 "gram.y" /* yacc.c:1646  */
+  case 1377:
+#line 9388 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 34498 "gram.c" /* yacc.c:1646  */
+#line 34513 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1376:
-#line 9390 "gram.y" /* yacc.c:1646  */
+  case 1378:
+#line 9399 "gram.y" /* yacc.c:1646  */
     {
 					PrepareStmt *n = makeNode(PrepareStmt);
 					n->name = (yyvsp[-3].str);
@@ -34506,34 +34521,34 @@
 					n->query = (yyvsp[0].node);
 					(yyval.node) = (Node *) n;
 				}
-#line 34510 "gram.c" /* yacc.c:1646  */
+#line 34525 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1377:
-#line 9399 "gram.y" /* yacc.c:1646  */
+  case 1379:
+#line 9408 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 34516 "gram.c" /* yacc.c:1646  */
+#line 34531 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1378:
-#line 9400 "gram.y" /* yacc.c:1646  */
+  case 1380:
+#line 9409 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 34522 "gram.c" /* yacc.c:1646  */
+#line 34537 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1383:
-#line 9418 "gram.y" /* yacc.c:1646  */
+  case 1385:
+#line 9427 "gram.y" /* yacc.c:1646  */
     {
 					ExecuteStmt *n = makeNode(ExecuteStmt);
 					n->name = (yyvsp[-1].str);
 					n->params = (yyvsp[0].list);
 					(yyval.node) = (Node *) n;
 				}
-#line 34533 "gram.c" /* yacc.c:1646  */
+#line 34548 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1384:
-#line 9426 "gram.y" /* yacc.c:1646  */
+  case 1386:
+#line 9435 "gram.y" /* yacc.c:1646  */
     {
 					CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
 					ExecuteStmt *n = makeNode(ExecuteStmt);
@@ -34548,63 +34563,63 @@
 					(yyvsp[-5].into)->skipData = !((yyvsp[0].boolean));
 					(yyval.node) = (Node *) ctas;
 				}
-#line 34552 "gram.c" /* yacc.c:1646  */
+#line 34567 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1385:
-#line 9442 "gram.y" /* yacc.c:1646  */
+  case 1387:
+#line 9451 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 34558 "gram.c" /* yacc.c:1646  */
+#line 34573 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1386:
-#line 9443 "gram.y" /* yacc.c:1646  */
+  case 1388:
+#line 9452 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 34564 "gram.c" /* yacc.c:1646  */
+#line 34579 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1387:
-#line 9454 "gram.y" /* yacc.c:1646  */
+  case 1389:
+#line 9463 "gram.y" /* yacc.c:1646  */
     {
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 						n->name = (yyvsp[0].str);
 						(yyval.node) = (Node *) n;
 					}
-#line 34574 "gram.c" /* yacc.c:1646  */
+#line 34589 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1388:
-#line 9460 "gram.y" /* yacc.c:1646  */
+  case 1390:
+#line 9469 "gram.y" /* yacc.c:1646  */
     {
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 						n->name = (yyvsp[0].str);
 						(yyval.node) = (Node *) n;
 					}
-#line 34584 "gram.c" /* yacc.c:1646  */
+#line 34599 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1389:
-#line 9466 "gram.y" /* yacc.c:1646  */
+  case 1391:
+#line 9475 "gram.y" /* yacc.c:1646  */
     {
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 						n->name = NULL;
 						(yyval.node) = (Node *) n;
 					}
-#line 34594 "gram.c" /* yacc.c:1646  */
+#line 34609 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1390:
-#line 9472 "gram.y" /* yacc.c:1646  */
+  case 1392:
+#line 9481 "gram.y" /* yacc.c:1646  */
     {
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 						n->name = NULL;
 						(yyval.node) = (Node *) n;
 					}
-#line 34604 "gram.c" /* yacc.c:1646  */
+#line 34619 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1391:
-#line 9489 "gram.y" /* yacc.c:1646  */
+  case 1393:
+#line 9498 "gram.y" /* yacc.c:1646  */
     {
 					(yyvsp[-2].istmt)->relation = (yyvsp[-3].range);
 					(yyvsp[-2].istmt)->onConflictClause = (yyvsp[-1].onconflict);
@@ -34612,70 +34627,70 @@
 					(yyvsp[-2].istmt)->withClause = (yyvsp[-6].with);
 					(yyval.node) = (Node *) (yyvsp[-2].istmt);
 				}
-#line 34616 "gram.c" /* yacc.c:1646  */
+#line 34631 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1392:
-#line 9506 "gram.y" /* yacc.c:1646  */
+  case 1394:
+#line 9515 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.range) = (yyvsp[0].range);
 				}
-#line 34624 "gram.c" /* yacc.c:1646  */
+#line 34639 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1393:
-#line 9510 "gram.y" /* yacc.c:1646  */
+  case 1395:
+#line 9519 "gram.y" /* yacc.c:1646  */
     {
 					(yyvsp[-2].range)->alias = makeAlias((yyvsp[0].str), NIL);
 					(yyval.range) = (yyvsp[-2].range);
 				}
-#line 34633 "gram.c" /* yacc.c:1646  */
+#line 34648 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1394:
-#line 9518 "gram.y" /* yacc.c:1646  */
+  case 1396:
+#line 9527 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.istmt) = makeNode(InsertStmt);
 					(yyval.istmt)->cols = NIL;
 					(yyval.istmt)->selectStmt = (yyvsp[0].node);
 				}
-#line 34643 "gram.c" /* yacc.c:1646  */
+#line 34658 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1395:
-#line 9524 "gram.y" /* yacc.c:1646  */
+  case 1397:
+#line 9533 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.istmt) = makeNode(InsertStmt);
 					(yyval.istmt)->cols = (yyvsp[-2].list);
 					(yyval.istmt)->selectStmt = (yyvsp[0].node);
 				}
-#line 34653 "gram.c" /* yacc.c:1646  */
+#line 34668 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1396:
-#line 9530 "gram.y" /* yacc.c:1646  */
+  case 1398:
+#line 9539 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.istmt) = makeNode(InsertStmt);
 					(yyval.istmt)->cols = NIL;
 					(yyval.istmt)->selectStmt = NULL;
 				}
-#line 34663 "gram.c" /* yacc.c:1646  */
+#line 34678 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1397:
-#line 9539 "gram.y" /* yacc.c:1646  */
+  case 1399:
+#line 9548 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].target)); }
-#line 34669 "gram.c" /* yacc.c:1646  */
+#line 34684 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1398:
-#line 9541 "gram.y" /* yacc.c:1646  */
+  case 1400:
+#line 9550 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].target)); }
-#line 34675 "gram.c" /* yacc.c:1646  */
+#line 34690 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1399:
-#line 9546 "gram.y" /* yacc.c:1646  */
+  case 1401:
+#line 9555 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = (yyvsp[-1].str);
@@ -34683,11 +34698,11 @@
 					(yyval.target)->val = NULL;
 					(yyval.target)->location = (yylsp[-1]);
 				}
-#line 34687 "gram.c" /* yacc.c:1646  */
+#line 34702 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1400:
-#line 9557 "gram.y" /* yacc.c:1646  */
+  case 1402:
+#line 9566 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.onconflict) = makeNode(OnConflictClause);
 					(yyval.onconflict)->action = ONCONFLICT_UPDATE;
@@ -34696,11 +34711,11 @@
 					(yyval.onconflict)->whereClause = (yyvsp[0].node);
 					(yyval.onconflict)->location = (yylsp[-7]);
 				}
-#line 34700 "gram.c" /* yacc.c:1646  */
+#line 34715 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1401:
-#line 9567 "gram.y" /* yacc.c:1646  */
+  case 1403:
+#line 9576 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.onconflict) = makeNode(OnConflictClause);
 					(yyval.onconflict)->action = ONCONFLICT_NOTHING;
@@ -34709,19 +34724,19 @@
 					(yyval.onconflict)->whereClause = NULL;
 					(yyval.onconflict)->location = (yylsp[-4]);
 				}
-#line 34713 "gram.c" /* yacc.c:1646  */
+#line 34728 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1402:
-#line 9576 "gram.y" /* yacc.c:1646  */
+  case 1404:
+#line 9585 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.onconflict) = NULL;
 				}
-#line 34721 "gram.c" /* yacc.c:1646  */
+#line 34736 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1403:
-#line 9583 "gram.y" /* yacc.c:1646  */
+  case 1405:
+#line 9592 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.infer) = makeNode(InferClause);
 					(yyval.infer)->indexElems = (yyvsp[-2].list);
@@ -34729,11 +34744,11 @@
 					(yyval.infer)->conname = NULL;
 					(yyval.infer)->location = (yylsp[-3]);
 				}
-#line 34733 "gram.c" /* yacc.c:1646  */
+#line 34748 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1404:
-#line 9592 "gram.y" /* yacc.c:1646  */
+  case 1406:
+#line 9601 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.infer) = makeNode(InferClause);
 					(yyval.infer)->indexElems = NIL;
@@ -34741,31 +34756,31 @@
 					(yyval.infer)->conname = (yyvsp[0].str);
 					(yyval.infer)->location = (yylsp[-2]);
 				}
-#line 34745 "gram.c" /* yacc.c:1646  */
+#line 34760 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1405:
-#line 9600 "gram.y" /* yacc.c:1646  */
+  case 1407:
+#line 9609 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.infer) = NULL;
 				}
-#line 34753 "gram.c" /* yacc.c:1646  */
+#line 34768 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1406:
-#line 9606 "gram.y" /* yacc.c:1646  */
+  case 1408:
+#line 9615 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 34759 "gram.c" /* yacc.c:1646  */
+#line 34774 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1407:
-#line 9607 "gram.y" /* yacc.c:1646  */
+  case 1409:
+#line 9616 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 34765 "gram.c" /* yacc.c:1646  */
+#line 34780 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1408:
-#line 9620 "gram.y" /* yacc.c:1646  */
+  case 1410:
+#line 9629 "gram.y" /* yacc.c:1646  */
     {
 					DeleteStmt *n = makeNode(DeleteStmt);
 					n->relation = (yyvsp[-3].range);
@@ -34775,23 +34790,23 @@
 					n->withClause = (yyvsp[-6].with);
 					(yyval.node) = (Node *)n;
 				}
-#line 34779 "gram.c" /* yacc.c:1646  */
+#line 34794 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1409:
-#line 9632 "gram.y" /* yacc.c:1646  */
+  case 1411:
+#line 9641 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 34785 "gram.c" /* yacc.c:1646  */
+#line 34800 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1410:
-#line 9633 "gram.y" /* yacc.c:1646  */
+  case 1412:
+#line 9642 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 34791 "gram.c" /* yacc.c:1646  */
+#line 34806 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1411:
-#line 9645 "gram.y" /* yacc.c:1646  */
+  case 1413:
+#line 9654 "gram.y" /* yacc.c:1646  */
     {
 					LockStmt *n = makeNode(LockStmt);
 
@@ -34800,101 +34815,101 @@
 					n->nowait = (yyvsp[0].boolean);
 					(yyval.node) = (Node *)n;
 				}
-#line 34804 "gram.c" /* yacc.c:1646  */
+#line 34819 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1412:
-#line 9655 "gram.y" /* yacc.c:1646  */
+  case 1414:
+#line 9664 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[-1].ival); }
-#line 34810 "gram.c" /* yacc.c:1646  */
+#line 34825 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1413:
-#line 9656 "gram.y" /* yacc.c:1646  */
+  case 1415:
+#line 9665 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = AccessExclusiveLock; }
-#line 34816 "gram.c" /* yacc.c:1646  */
+#line 34831 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1414:
-#line 9659 "gram.y" /* yacc.c:1646  */
+  case 1416:
+#line 9668 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = AccessShareLock; }
-#line 34822 "gram.c" /* yacc.c:1646  */
+#line 34837 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1415:
-#line 9660 "gram.y" /* yacc.c:1646  */
+  case 1417:
+#line 9669 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = RowShareLock; }
-#line 34828 "gram.c" /* yacc.c:1646  */
+#line 34843 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1416:
-#line 9661 "gram.y" /* yacc.c:1646  */
+  case 1418:
+#line 9670 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = RowExclusiveLock; }
-#line 34834 "gram.c" /* yacc.c:1646  */
+#line 34849 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1417:
-#line 9662 "gram.y" /* yacc.c:1646  */
+  case 1419:
+#line 9671 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ShareUpdateExclusiveLock; }
-#line 34840 "gram.c" /* yacc.c:1646  */
+#line 34855 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1418:
-#line 9663 "gram.y" /* yacc.c:1646  */
+  case 1420:
+#line 9672 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ShareLock; }
-#line 34846 "gram.c" /* yacc.c:1646  */
+#line 34861 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1419:
-#line 9664 "gram.y" /* yacc.c:1646  */
+  case 1421:
+#line 9673 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ShareRowExclusiveLock; }
-#line 34852 "gram.c" /* yacc.c:1646  */
+#line 34867 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1420:
-#line 9665 "gram.y" /* yacc.c:1646  */
+  case 1422:
+#line 9674 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ExclusiveLock; }
-#line 34858 "gram.c" /* yacc.c:1646  */
+#line 34873 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1421:
-#line 9666 "gram.y" /* yacc.c:1646  */
+  case 1423:
+#line 9675 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = AccessExclusiveLock; }
-#line 34864 "gram.c" /* yacc.c:1646  */
+#line 34879 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1422:
-#line 9669 "gram.y" /* yacc.c:1646  */
+  case 1424:
+#line 9678 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 34870 "gram.c" /* yacc.c:1646  */
+#line 34885 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1423:
-#line 9670 "gram.y" /* yacc.c:1646  */
+  case 1425:
+#line 9679 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 34876 "gram.c" /* yacc.c:1646  */
+#line 34891 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1424:
-#line 9674 "gram.y" /* yacc.c:1646  */
+  case 1426:
+#line 9683 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = LockWaitError; }
-#line 34882 "gram.c" /* yacc.c:1646  */
+#line 34897 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1425:
-#line 9675 "gram.y" /* yacc.c:1646  */
+  case 1427:
+#line 9684 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = LockWaitSkip; }
-#line 34888 "gram.c" /* yacc.c:1646  */
+#line 34903 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1426:
-#line 9676 "gram.y" /* yacc.c:1646  */
+  case 1428:
+#line 9685 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = LockWaitBlock; }
-#line 34894 "gram.c" /* yacc.c:1646  */
+#line 34909 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1427:
-#line 9692 "gram.y" /* yacc.c:1646  */
+  case 1429:
+#line 9701 "gram.y" /* yacc.c:1646  */
     {
 					UpdateStmt *n = makeNode(UpdateStmt);
 					n->relation = (yyvsp[-5].range);
@@ -34905,44 +34920,44 @@
 					n->withClause = (yyvsp[-7].with);
 					(yyval.node) = (Node *)n;
 				}
-#line 34909 "gram.c" /* yacc.c:1646  */
+#line 34924 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1428:
-#line 9705 "gram.y" /* yacc.c:1646  */
+  case 1430:
+#line 9714 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 34915 "gram.c" /* yacc.c:1646  */
+#line 34930 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1429:
-#line 9706 "gram.y" /* yacc.c:1646  */
+  case 1431:
+#line 9715 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_concat((yyvsp[-2].list),(yyvsp[0].list)); }
-#line 34921 "gram.c" /* yacc.c:1646  */
+#line 34936 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1430:
-#line 9710 "gram.y" /* yacc.c:1646  */
+  case 1432:
+#line 9719 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].target)); }
-#line 34927 "gram.c" /* yacc.c:1646  */
+#line 34942 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1431:
-#line 9711 "gram.y" /* yacc.c:1646  */
+  case 1433:
+#line 9720 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 34933 "gram.c" /* yacc.c:1646  */
+#line 34948 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1432:
-#line 9716 "gram.y" /* yacc.c:1646  */
+  case 1434:
+#line 9725 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.target) = (yyvsp[-2].target);
 					(yyval.target)->val = (Node *) (yyvsp[0].node);
 				}
-#line 34942 "gram.c" /* yacc.c:1646  */
+#line 34957 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1433:
-#line 9732 "gram.y" /* yacc.c:1646  */
+  case 1435:
+#line 9741 "gram.y" /* yacc.c:1646  */
     {
 					ListCell *col_cell;
 					ListCell *val_cell;
@@ -34968,11 +34983,11 @@
 
 					(yyval.list) = (yyvsp[-3].list);
 				}
-#line 34972 "gram.c" /* yacc.c:1646  */
+#line 34987 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1434:
-#line 9758 "gram.y" /* yacc.c:1646  */
+  case 1436:
+#line 9767 "gram.y" /* yacc.c:1646  */
     {
 					SubLink *sl = makeNode(SubLink);
 					int ncolumns = list_length((yyvsp[-3].list));
@@ -35002,11 +35017,11 @@
 
 					(yyval.list) = (yyvsp[-3].list);
 				}
-#line 35006 "gram.c" /* yacc.c:1646  */
+#line 35021 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1435:
-#line 9791 "gram.y" /* yacc.c:1646  */
+  case 1437:
+#line 9800 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = (yyvsp[-1].str);
@@ -35014,23 +35029,23 @@
 					(yyval.target)->val = NULL;	/* upper production sets this */
 					(yyval.target)->location = (yylsp[-1]);
 				}
-#line 35018 "gram.c" /* yacc.c:1646  */
+#line 35033 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1436:
-#line 9801 "gram.y" /* yacc.c:1646  */
+  case 1438:
+#line 9810 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].target)); }
-#line 35024 "gram.c" /* yacc.c:1646  */
+#line 35039 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1437:
-#line 9802 "gram.y" /* yacc.c:1646  */
+  case 1439:
+#line 9811 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list),(yyvsp[0].target)); }
-#line 35030 "gram.c" /* yacc.c:1646  */
+#line 35045 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1438:
-#line 9813 "gram.y" /* yacc.c:1646  */
+  case 1440:
+#line 9822 "gram.y" /* yacc.c:1646  */
     {
 					DeclareCursorStmt *n = makeNode(DeclareCursorStmt);
 					n->portalname = (yyvsp[-5].str);
@@ -35039,94 +35054,94 @@
 					n->query = (yyvsp[0].node);
 					(yyval.node) = (Node *)n;
 				}
-#line 35043 "gram.c" /* yacc.c:1646  */
+#line 35058 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1439:
-#line 9823 "gram.y" /* yacc.c:1646  */
+  case 1441:
+#line 9832 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 35049 "gram.c" /* yacc.c:1646  */
+#line 35064 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1440:
-#line 9826 "gram.y" /* yacc.c:1646  */
+  case 1442:
+#line 9835 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = 0; }
-#line 35055 "gram.c" /* yacc.c:1646  */
+#line 35070 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1441:
-#line 9827 "gram.y" /* yacc.c:1646  */
+  case 1443:
+#line 9836 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[-2].ival) | CURSOR_OPT_NO_SCROLL; }
-#line 35061 "gram.c" /* yacc.c:1646  */
+#line 35076 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1442:
-#line 9828 "gram.y" /* yacc.c:1646  */
+  case 1444:
+#line 9837 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[-1].ival) | CURSOR_OPT_SCROLL; }
-#line 35067 "gram.c" /* yacc.c:1646  */
+#line 35082 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1443:
-#line 9829 "gram.y" /* yacc.c:1646  */
+  case 1445:
+#line 9838 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[-1].ival) | CURSOR_OPT_BINARY; }
-#line 35073 "gram.c" /* yacc.c:1646  */
+#line 35088 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1444:
-#line 9830 "gram.y" /* yacc.c:1646  */
+  case 1446:
+#line 9839 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[-1].ival) | CURSOR_OPT_INSENSITIVE; }
-#line 35079 "gram.c" /* yacc.c:1646  */
+#line 35094 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1445:
-#line 9833 "gram.y" /* yacc.c:1646  */
+  case 1447:
+#line 9842 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = 0; }
-#line 35085 "gram.c" /* yacc.c:1646  */
+#line 35100 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1446:
-#line 9834 "gram.y" /* yacc.c:1646  */
+  case 1448:
+#line 9843 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = CURSOR_OPT_HOLD; }
-#line 35091 "gram.c" /* yacc.c:1646  */
+#line 35106 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1447:
-#line 9835 "gram.y" /* yacc.c:1646  */
+  case 1449:
+#line 9844 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = 0; }
-#line 35097 "gram.c" /* yacc.c:1646  */
+#line 35112 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1450:
-#line 9888 "gram.y" /* yacc.c:1646  */
+  case 1452:
+#line 9897 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[-1].node); }
-#line 35103 "gram.c" /* yacc.c:1646  */
+#line 35118 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1451:
-#line 9889 "gram.y" /* yacc.c:1646  */
+  case 1453:
+#line 9898 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[-1].node); }
-#line 35109 "gram.c" /* yacc.c:1646  */
+#line 35124 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1452:
-#line 9904 "gram.y" /* yacc.c:1646  */
+  case 1454:
+#line 9913 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 35115 "gram.c" /* yacc.c:1646  */
+#line 35130 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1453:
-#line 9906 "gram.y" /* yacc.c:1646  */
+  case 1455:
+#line 9915 "gram.y" /* yacc.c:1646  */
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[-1].node), (yyvsp[0].list), NIL,
 										NULL, NULL, NULL,
 										yyscanner);
 					(yyval.node) = (yyvsp[-1].node);
 				}
-#line 35126 "gram.c" /* yacc.c:1646  */
+#line 35141 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1454:
-#line 9913 "gram.y" /* yacc.c:1646  */
+  case 1456:
+#line 9922 "gram.y" /* yacc.c:1646  */
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[-3].node), (yyvsp[-2].list), (yyvsp[-1].list),
 										list_nth((yyvsp[0].list), 0), list_nth((yyvsp[0].list), 1),
@@ -35134,11 +35149,11 @@
 										yyscanner);
 					(yyval.node) = (yyvsp[-3].node);
 				}
-#line 35138 "gram.c" /* yacc.c:1646  */
+#line 35153 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1455:
-#line 9921 "gram.y" /* yacc.c:1646  */
+  case 1457:
+#line 9930 "gram.y" /* yacc.c:1646  */
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[-3].node), (yyvsp[-2].list), (yyvsp[0].list),
 										list_nth((yyvsp[-1].list), 0), list_nth((yyvsp[-1].list), 1),
@@ -35146,11 +35161,11 @@
 										yyscanner);
 					(yyval.node) = (yyvsp[-3].node);
 				}
-#line 35150 "gram.c" /* yacc.c:1646  */
+#line 35165 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1456:
-#line 9929 "gram.y" /* yacc.c:1646  */
+  case 1458:
+#line 9938 "gram.y" /* yacc.c:1646  */
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[0].node), NULL, NIL,
 										NULL, NULL,
@@ -35158,11 +35173,11 @@
 										yyscanner);
 					(yyval.node) = (yyvsp[0].node);
 				}
-#line 35162 "gram.c" /* yacc.c:1646  */
+#line 35177 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1457:
-#line 9937 "gram.y" /* yacc.c:1646  */
+  case 1459:
+#line 9946 "gram.y" /* yacc.c:1646  */
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[-1].node), (yyvsp[0].list), NIL,
 										NULL, NULL,
@@ -35170,11 +35185,11 @@
 										yyscanner);
 					(yyval.node) = (yyvsp[-1].node);
 				}
-#line 35174 "gram.c" /* yacc.c:1646  */
+#line 35189 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1458:
-#line 9945 "gram.y" /* yacc.c:1646  */
+  case 1460:
+#line 9954 "gram.y" /* yacc.c:1646  */
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[-3].node), (yyvsp[-2].list), (yyvsp[-1].list),
 										list_nth((yyvsp[0].list), 0), list_nth((yyvsp[0].list), 1),
@@ -35182,11 +35197,11 @@
 										yyscanner);
 					(yyval.node) = (yyvsp[-3].node);
 				}
-#line 35186 "gram.c" /* yacc.c:1646  */
+#line 35201 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1459:
-#line 9953 "gram.y" /* yacc.c:1646  */
+  case 1461:
+#line 9962 "gram.y" /* yacc.c:1646  */
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[-3].node), (yyvsp[-2].list), (yyvsp[0].list),
 										list_nth((yyvsp[-1].list), 0), list_nth((yyvsp[-1].list), 1),
@@ -35194,23 +35209,23 @@
 										yyscanner);
 					(yyval.node) = (yyvsp[-3].node);
 				}
-#line 35198 "gram.c" /* yacc.c:1646  */
+#line 35213 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1460:
-#line 9963 "gram.y" /* yacc.c:1646  */
+  case 1462:
+#line 9972 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 35204 "gram.c" /* yacc.c:1646  */
+#line 35219 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1461:
-#line 9964 "gram.y" /* yacc.c:1646  */
+  case 1463:
+#line 9973 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 35210 "gram.c" /* yacc.c:1646  */
+#line 35225 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1462:
-#line 9994 "gram.y" /* yacc.c:1646  */
+  case 1464:
+#line 10003 "gram.y" /* yacc.c:1646  */
     {
 					SelectStmt *n = makeNode(SelectStmt);
 					n->targetList = (yyvsp[-6].list);
@@ -35222,11 +35237,11 @@
 					n->windowClause = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 35226 "gram.c" /* yacc.c:1646  */
+#line 35241 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1463:
-#line 10008 "gram.y" /* yacc.c:1646  */
+  case 1465:
+#line 10017 "gram.y" /* yacc.c:1646  */
     {
 					SelectStmt *n = makeNode(SelectStmt);
 					n->distinctClause = (yyvsp[-7].list);
@@ -35239,17 +35254,17 @@
 					n->windowClause = (yyvsp[0].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 35243 "gram.c" /* yacc.c:1646  */
+#line 35258 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1464:
-#line 10020 "gram.y" /* yacc.c:1646  */
+  case 1466:
+#line 10029 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 35249 "gram.c" /* yacc.c:1646  */
+#line 35264 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1465:
-#line 10022 "gram.y" /* yacc.c:1646  */
+  case 1467:
+#line 10031 "gram.y" /* yacc.c:1646  */
     {
 					/* same as SELECT * FROM relation_expr */
 					ColumnRef *cr = makeNode(ColumnRef);
@@ -35268,80 +35283,80 @@
 					n->fromClause = list_make1((yyvsp[0].range));
 					(yyval.node) = (Node *)n;
 				}
-#line 35272 "gram.c" /* yacc.c:1646  */
+#line 35287 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1466:
-#line 10041 "gram.y" /* yacc.c:1646  */
+  case 1468:
+#line 10050 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeSetOp(SETOP_UNION, (yyvsp[-1].boolean), (yyvsp[-3].node), (yyvsp[0].node));
 				}
-#line 35280 "gram.c" /* yacc.c:1646  */
+#line 35295 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1467:
-#line 10045 "gram.y" /* yacc.c:1646  */
+  case 1469:
+#line 10054 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeSetOp(SETOP_INTERSECT, (yyvsp[-1].boolean), (yyvsp[-3].node), (yyvsp[0].node));
 				}
-#line 35288 "gram.c" /* yacc.c:1646  */
+#line 35303 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1468:
-#line 10049 "gram.y" /* yacc.c:1646  */
+  case 1470:
+#line 10058 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeSetOp(SETOP_EXCEPT, (yyvsp[-1].boolean), (yyvsp[-3].node), (yyvsp[0].node));
 				}
-#line 35296 "gram.c" /* yacc.c:1646  */
+#line 35311 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1469:
-#line 10066 "gram.y" /* yacc.c:1646  */
+  case 1471:
+#line 10075 "gram.y" /* yacc.c:1646  */
     {
 				(yyval.with) = makeNode(WithClause);
 				(yyval.with)->ctes = (yyvsp[0].list);
 				(yyval.with)->recursive = false;
 				(yyval.with)->location = (yylsp[-1]);
 			}
-#line 35307 "gram.c" /* yacc.c:1646  */
+#line 35322 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1470:
-#line 10073 "gram.y" /* yacc.c:1646  */
+  case 1472:
+#line 10082 "gram.y" /* yacc.c:1646  */
     {
 				(yyval.with) = makeNode(WithClause);
 				(yyval.with)->ctes = (yyvsp[0].list);
 				(yyval.with)->recursive = false;
 				(yyval.with)->location = (yylsp[-1]);
 			}
-#line 35318 "gram.c" /* yacc.c:1646  */
+#line 35333 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1471:
-#line 10080 "gram.y" /* yacc.c:1646  */
+  case 1473:
+#line 10089 "gram.y" /* yacc.c:1646  */
     {
 				(yyval.with) = makeNode(WithClause);
 				(yyval.with)->ctes = (yyvsp[0].list);
 				(yyval.with)->recursive = true;
 				(yyval.with)->location = (yylsp[-2]);
 			}
-#line 35329 "gram.c" /* yacc.c:1646  */
+#line 35344 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1472:
-#line 10089 "gram.y" /* yacc.c:1646  */
+  case 1474:
+#line 10098 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 35335 "gram.c" /* yacc.c:1646  */
+#line 35350 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1473:
-#line 10090 "gram.y" /* yacc.c:1646  */
+  case 1475:
+#line 10099 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 35341 "gram.c" /* yacc.c:1646  */
+#line 35356 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1474:
-#line 10094 "gram.y" /* yacc.c:1646  */
+  case 1476:
+#line 10103 "gram.y" /* yacc.c:1646  */
     {
 				CommonTableExpr *n = makeNode(CommonTableExpr);
 				n->ctename = (yyvsp[-5].str);
@@ -35350,23 +35365,23 @@
 				n->location = (yylsp[-5]);
 				(yyval.node) = (Node *) n;
 			}
-#line 35354 "gram.c" /* yacc.c:1646  */
+#line 35369 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1475:
-#line 10105 "gram.y" /* yacc.c:1646  */
+  case 1477:
+#line 10114 "gram.y" /* yacc.c:1646  */
     { (yyval.with) = (yyvsp[0].with); }
-#line 35360 "gram.c" /* yacc.c:1646  */
+#line 35375 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1476:
-#line 10106 "gram.y" /* yacc.c:1646  */
+  case 1478:
+#line 10115 "gram.y" /* yacc.c:1646  */
     { (yyval.with) = NULL; }
-#line 35366 "gram.c" /* yacc.c:1646  */
+#line 35381 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1477:
-#line 10111 "gram.y" /* yacc.c:1646  */
+  case 1479:
+#line 10120 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.into) = makeNode(IntoClause);
 					(yyval.into)->rel = (yyvsp[0].range);
@@ -35377,53 +35392,53 @@
 					(yyval.into)->viewQuery = NULL;
 					(yyval.into)->skipData = false;
 				}
-#line 35381 "gram.c" /* yacc.c:1646  */
+#line 35396 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1478:
-#line 10122 "gram.y" /* yacc.c:1646  */
+  case 1480:
+#line 10131 "gram.y" /* yacc.c:1646  */
     { (yyval.into) = NULL; }
-#line 35387 "gram.c" /* yacc.c:1646  */
+#line 35402 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1479:
-#line 10131 "gram.y" /* yacc.c:1646  */
+  case 1481:
+#line 10140 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->relpersistence = RELPERSISTENCE_TEMP;
 				}
-#line 35396 "gram.c" /* yacc.c:1646  */
+#line 35411 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1480:
-#line 10136 "gram.y" /* yacc.c:1646  */
+  case 1482:
+#line 10145 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->relpersistence = RELPERSISTENCE_TEMP;
 				}
-#line 35405 "gram.c" /* yacc.c:1646  */
+#line 35420 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1481:
-#line 10141 "gram.y" /* yacc.c:1646  */
+  case 1483:
+#line 10150 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->relpersistence = RELPERSISTENCE_TEMP;
 				}
-#line 35414 "gram.c" /* yacc.c:1646  */
+#line 35429 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1482:
-#line 10146 "gram.y" /* yacc.c:1646  */
+  case 1484:
+#line 10155 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->relpersistence = RELPERSISTENCE_TEMP;
 				}
-#line 35423 "gram.c" /* yacc.c:1646  */
+#line 35438 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1483:
-#line 10151 "gram.y" /* yacc.c:1646  */
+  case 1485:
+#line 10160 "gram.y" /* yacc.c:1646  */
     {
 					ereport(WARNING,
 							(errmsg("GLOBAL is deprecated in temporary table creation"),
@@ -35431,11 +35446,11 @@
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->relpersistence = RELPERSISTENCE_TEMP;
 				}
-#line 35435 "gram.c" /* yacc.c:1646  */
+#line 35450 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1484:
-#line 10159 "gram.y" /* yacc.c:1646  */
+  case 1486:
+#line 10168 "gram.y" /* yacc.c:1646  */
     {
 					ereport(WARNING,
 							(errmsg("GLOBAL is deprecated in temporary table creation"),
@@ -35443,122 +35458,122 @@
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->relpersistence = RELPERSISTENCE_TEMP;
 				}
-#line 35447 "gram.c" /* yacc.c:1646  */
+#line 35462 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1485:
-#line 10167 "gram.y" /* yacc.c:1646  */
+  case 1487:
+#line 10176 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->relpersistence = RELPERSISTENCE_UNLOGGED;
 				}
-#line 35456 "gram.c" /* yacc.c:1646  */
+#line 35471 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1486:
-#line 10172 "gram.y" /* yacc.c:1646  */
+  case 1488:
+#line 10181 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->relpersistence = RELPERSISTENCE_PERMANENT;
 				}
-#line 35465 "gram.c" /* yacc.c:1646  */
+#line 35480 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1487:
-#line 10177 "gram.y" /* yacc.c:1646  */
+  case 1489:
+#line 10186 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->relpersistence = RELPERSISTENCE_PERMANENT;
 				}
-#line 35474 "gram.c" /* yacc.c:1646  */
+#line 35489 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1488:
-#line 10183 "gram.y" /* yacc.c:1646  */
+  case 1490:
+#line 10192 "gram.y" /* yacc.c:1646  */
     {}
-#line 35480 "gram.c" /* yacc.c:1646  */
+#line 35495 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1489:
-#line 10184 "gram.y" /* yacc.c:1646  */
+  case 1491:
+#line 10193 "gram.y" /* yacc.c:1646  */
     {}
-#line 35486 "gram.c" /* yacc.c:1646  */
+#line 35501 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1490:
-#line 10188 "gram.y" /* yacc.c:1646  */
+  case 1492:
+#line 10197 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 35492 "gram.c" /* yacc.c:1646  */
+#line 35507 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1491:
-#line 10189 "gram.y" /* yacc.c:1646  */
+  case 1493:
+#line 10198 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 35498 "gram.c" /* yacc.c:1646  */
+#line 35513 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1492:
-#line 10190 "gram.y" /* yacc.c:1646  */
+  case 1494:
+#line 10199 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 35504 "gram.c" /* yacc.c:1646  */
+#line 35519 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1493:
-#line 10197 "gram.y" /* yacc.c:1646  */
+  case 1495:
+#line 10206 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(NIL); }
-#line 35510 "gram.c" /* yacc.c:1646  */
+#line 35525 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1494:
-#line 10198 "gram.y" /* yacc.c:1646  */
+  case 1496:
+#line 10207 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 35516 "gram.c" /* yacc.c:1646  */
+#line 35531 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1495:
-#line 10202 "gram.y" /* yacc.c:1646  */
+  case 1497:
+#line 10211 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL;}
-#line 35522 "gram.c" /* yacc.c:1646  */
+#line 35537 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1496:
-#line 10203 "gram.y" /* yacc.c:1646  */
+  case 1498:
+#line 10212 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 35528 "gram.c" /* yacc.c:1646  */
+#line 35543 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1497:
-#line 10207 "gram.y" /* yacc.c:1646  */
+  case 1499:
+#line 10216 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list);}
-#line 35534 "gram.c" /* yacc.c:1646  */
+#line 35549 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1498:
-#line 10208 "gram.y" /* yacc.c:1646  */
+  case 1500:
+#line 10217 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 35540 "gram.c" /* yacc.c:1646  */
+#line 35555 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1499:
-#line 10212 "gram.y" /* yacc.c:1646  */
+  case 1501:
+#line 10221 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 35546 "gram.c" /* yacc.c:1646  */
+#line 35561 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1500:
-#line 10216 "gram.y" /* yacc.c:1646  */
+  case 1502:
+#line 10225 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].sortby)); }
-#line 35552 "gram.c" /* yacc.c:1646  */
+#line 35567 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1501:
-#line 10217 "gram.y" /* yacc.c:1646  */
+  case 1503:
+#line 10226 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].sortby)); }
-#line 35558 "gram.c" /* yacc.c:1646  */
+#line 35573 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1502:
-#line 10221 "gram.y" /* yacc.c:1646  */
+  case 1504:
+#line 10230 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.sortby) = makeNode(SortBy);
 					(yyval.sortby)->node = (yyvsp[-3].node);
@@ -35567,11 +35582,11 @@
 					(yyval.sortby)->useOp = (yyvsp[-1].list);
 					(yyval.sortby)->location = (yylsp[-1]);
 				}
-#line 35571 "gram.c" /* yacc.c:1646  */
+#line 35586 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1503:
-#line 10230 "gram.y" /* yacc.c:1646  */
+  case 1505:
+#line 10239 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.sortby) = makeNode(SortBy);
 					(yyval.sortby)->node = (yyvsp[-2].node);
@@ -35580,53 +35595,53 @@
 					(yyval.sortby)->useOp = NIL;
 					(yyval.sortby)->location = -1;		/* no operator */
 				}
-#line 35584 "gram.c" /* yacc.c:1646  */
+#line 35599 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1504:
-#line 10242 "gram.y" /* yacc.c:1646  */
+  case 1506:
+#line 10251 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2((yyvsp[0].node), (yyvsp[-1].node)); }
-#line 35590 "gram.c" /* yacc.c:1646  */
+#line 35605 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1505:
-#line 10243 "gram.y" /* yacc.c:1646  */
+  case 1507:
+#line 10252 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2((yyvsp[-1].node), (yyvsp[0].node)); }
-#line 35596 "gram.c" /* yacc.c:1646  */
+#line 35611 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1506:
-#line 10244 "gram.y" /* yacc.c:1646  */
+  case 1508:
+#line 10253 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2(NULL, (yyvsp[0].node)); }
-#line 35602 "gram.c" /* yacc.c:1646  */
+#line 35617 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1507:
-#line 10245 "gram.y" /* yacc.c:1646  */
+  case 1509:
+#line 10254 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2((yyvsp[0].node), NULL); }
-#line 35608 "gram.c" /* yacc.c:1646  */
+#line 35623 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1508:
-#line 10249 "gram.y" /* yacc.c:1646  */
+  case 1510:
+#line 10258 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 35614 "gram.c" /* yacc.c:1646  */
+#line 35629 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1509:
-#line 10250 "gram.y" /* yacc.c:1646  */
+  case 1511:
+#line 10259 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2(NULL,NULL); }
-#line 35620 "gram.c" /* yacc.c:1646  */
+#line 35635 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1510:
-#line 10255 "gram.y" /* yacc.c:1646  */
+  case 1512:
+#line 10264 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 35626 "gram.c" /* yacc.c:1646  */
+#line 35641 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1511:
-#line 10257 "gram.y" /* yacc.c:1646  */
+  case 1513:
+#line 10266 "gram.y" /* yacc.c:1646  */
     {
 					/* Disabled because it was too confusing, bjm 2002-02-18 */
 					ereport(ERROR,
@@ -35635,39 +35650,24 @@
 							 errhint("Use separate LIMIT and OFFSET clauses."),
 							 parser_errposition((yylsp[-3]))));
 				}
-#line 35639 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 1512:
-#line 10267 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[-2].node); }
-#line 35645 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 1513:
-#line 10272 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 35651 "gram.c" /* yacc.c:1646  */
+#line 35654 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1514:
-#line 10275 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[-1].node); }
-#line 35657 "gram.c" /* yacc.c:1646  */
+#line 10276 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = (yyvsp[-2].node); }
+#line 35660 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1515:
-#line 10279 "gram.y" /* yacc.c:1646  */
+#line 10281 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 35663 "gram.c" /* yacc.c:1646  */
+#line 35666 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1516:
-#line 10281 "gram.y" /* yacc.c:1646  */
-    {
-					/* LIMIT ALL is represented as a NULL constant */
-					(yyval.node) = makeNullAConst((yylsp[0]));
-				}
+#line 10284 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = (yyvsp[-1].node); }
 #line 35672 "gram.c" /* yacc.c:1646  */
     break;
 
@@ -35678,189 +35678,204 @@
     break;
 
   case 1518:
-#line 10298 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = makeIntConst((yyvsp[0].ival), (yylsp[0])); }
-#line 35684 "gram.c" /* yacc.c:1646  */
+#line 10290 "gram.y" /* yacc.c:1646  */
+    {
+					/* LIMIT ALL is represented as a NULL constant */
+					(yyval.node) = makeNullAConst((yylsp[0]));
+				}
+#line 35687 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1519:
-#line 10299 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[-1].node); }
-#line 35690 "gram.c" /* yacc.c:1646  */
+#line 10297 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = (yyvsp[0].node); }
+#line 35693 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1520:
-#line 10300 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = makeIntConst(1, -1); }
-#line 35696 "gram.c" /* yacc.c:1646  */
+#line 10307 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = makeIntConst((yyvsp[0].ival), (yylsp[0])); }
+#line 35699 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1521:
 #line 10308 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 35702 "gram.c" /* yacc.c:1646  */
+    { (yyval.node) = (yyvsp[-1].node); }
+#line 35705 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1522:
-#line 10312 "gram.y" /* yacc.c:1646  */
-    { (yyval.ival) = 0; }
-#line 35708 "gram.c" /* yacc.c:1646  */
+#line 10309 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = makeIntConst(1, -1); }
+#line 35711 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1523:
-#line 10313 "gram.y" /* yacc.c:1646  */
-    { (yyval.ival) = 0; }
-#line 35714 "gram.c" /* yacc.c:1646  */
+#line 10317 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = (yyvsp[0].node); }
+#line 35717 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1524:
-#line 10316 "gram.y" /* yacc.c:1646  */
+#line 10321 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = 0; }
-#line 35720 "gram.c" /* yacc.c:1646  */
+#line 35723 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1525:
-#line 10317 "gram.y" /* yacc.c:1646  */
+#line 10322 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = 0; }
-#line 35726 "gram.c" /* yacc.c:1646  */
+#line 35729 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1526:
-#line 10342 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = (yyvsp[0].list); }
-#line 35732 "gram.c" /* yacc.c:1646  */
+#line 10325 "gram.y" /* yacc.c:1646  */
+    { (yyval.ival) = 0; }
+#line 35735 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1527:
-#line 10343 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = NIL; }
-#line 35738 "gram.c" /* yacc.c:1646  */
+#line 10326 "gram.y" /* yacc.c:1646  */
+    { (yyval.ival) = 0; }
+#line 35741 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1528:
-#line 10347 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 35744 "gram.c" /* yacc.c:1646  */
+#line 10351 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = (yyvsp[0].list); }
+#line 35747 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1529:
-#line 10348 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = lappend((yyvsp[-2].list),(yyvsp[0].node)); }
-#line 35750 "gram.c" /* yacc.c:1646  */
+#line 10352 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = NIL; }
+#line 35753 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1530:
-#line 10352 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 35756 "gram.c" /* yacc.c:1646  */
+#line 10356 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = list_make1((yyvsp[0].node)); }
+#line 35759 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1531:
-#line 10353 "gram.y" /* yacc.c:1646  */
-    { (yyval.node) = (yyvsp[0].node); }
-#line 35762 "gram.c" /* yacc.c:1646  */
+#line 10357 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = lappend((yyvsp[-2].list),(yyvsp[0].node)); }
+#line 35765 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1532:
-#line 10354 "gram.y" /* yacc.c:1646  */
+#line 10361 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 35768 "gram.c" /* yacc.c:1646  */
+#line 35771 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1533:
-#line 10355 "gram.y" /* yacc.c:1646  */
+#line 10362 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 35774 "gram.c" /* yacc.c:1646  */
+#line 35777 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1534:
-#line 10356 "gram.y" /* yacc.c:1646  */
+#line 10363 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 35780 "gram.c" /* yacc.c:1646  */
+#line 35783 "gram.c" /* yacc.c:1646  */
     break;
 
   case 1535:
-#line 10361 "gram.y" /* yacc.c:1646  */
+#line 10364 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = (yyvsp[0].node); }
+#line 35789 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 1536:
+#line 10365 "gram.y" /* yacc.c:1646  */
+    { (yyval.node) = (yyvsp[0].node); }
+#line 35795 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 1537:
+#line 10370 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeGroupingSet(GROUPING_SET_EMPTY, NIL, (yylsp[-1]));
 				}
-#line 35788 "gram.c" /* yacc.c:1646  */
+#line 35803 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1536:
-#line 10374 "gram.y" /* yacc.c:1646  */
+  case 1538:
+#line 10383 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeGroupingSet(GROUPING_SET_ROLLUP, (yyvsp[-1].list), (yylsp[-3]));
 				}
-#line 35796 "gram.c" /* yacc.c:1646  */
+#line 35811 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1537:
-#line 10381 "gram.y" /* yacc.c:1646  */
+  case 1539:
+#line 10390 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeGroupingSet(GROUPING_SET_CUBE, (yyvsp[-1].list), (yylsp[-3]));
 				}
-#line 35804 "gram.c" /* yacc.c:1646  */
+#line 35819 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1538:
-#line 10388 "gram.y" /* yacc.c:1646  */
+  case 1540:
+#line 10397 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeGroupingSet(GROUPING_SET_SETS, (yyvsp[-1].list), (yylsp[-4]));
 				}
-#line 35812 "gram.c" /* yacc.c:1646  */
+#line 35827 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1539:
-#line 10394 "gram.y" /* yacc.c:1646  */
+  case 1541:
+#line 10403 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 35818 "gram.c" /* yacc.c:1646  */
+#line 35833 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1540:
-#line 10395 "gram.y" /* yacc.c:1646  */
+  case 1542:
+#line 10404 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 35824 "gram.c" /* yacc.c:1646  */
+#line 35839 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1541:
-#line 10399 "gram.y" /* yacc.c:1646  */
+  case 1543:
+#line 10408 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 35830 "gram.c" /* yacc.c:1646  */
+#line 35845 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1542:
-#line 10400 "gram.y" /* yacc.c:1646  */
+  case 1544:
+#line 10409 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 35836 "gram.c" /* yacc.c:1646  */
+#line 35851 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1543:
-#line 10404 "gram.y" /* yacc.c:1646  */
+  case 1545:
+#line 10413 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 35842 "gram.c" /* yacc.c:1646  */
+#line 35857 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1544:
-#line 10405 "gram.y" /* yacc.c:1646  */
+  case 1546:
+#line 10414 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 35848 "gram.c" /* yacc.c:1646  */
+#line 35863 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1545:
-#line 10409 "gram.y" /* yacc.c:1646  */
+  case 1547:
+#line 10418 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 35854 "gram.c" /* yacc.c:1646  */
+#line 35869 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1546:
-#line 10410 "gram.y" /* yacc.c:1646  */
+  case 1548:
+#line 10419 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].node)); }
-#line 35860 "gram.c" /* yacc.c:1646  */
+#line 35875 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1547:
-#line 10415 "gram.y" /* yacc.c:1646  */
+  case 1549:
+#line 10424 "gram.y" /* yacc.c:1646  */
     {
 					LockingClause *n = makeNode(LockingClause);
 					n->lockedRels = (yyvsp[-1].list);
@@ -35868,100 +35883,100 @@
 					n->waitPolicy = (yyvsp[0].ival);
 					(yyval.node) = (Node *) n;
 				}
-#line 35872 "gram.c" /* yacc.c:1646  */
+#line 35887 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1548:
-#line 10425 "gram.y" /* yacc.c:1646  */
+  case 1550:
+#line 10434 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = LCS_FORUPDATE; }
-#line 35878 "gram.c" /* yacc.c:1646  */
+#line 35893 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1549:
-#line 10426 "gram.y" /* yacc.c:1646  */
+  case 1551:
+#line 10435 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = LCS_FORNOKEYUPDATE; }
-#line 35884 "gram.c" /* yacc.c:1646  */
+#line 35899 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1550:
-#line 10427 "gram.y" /* yacc.c:1646  */
+  case 1552:
+#line 10436 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = LCS_FORSHARE; }
-#line 35890 "gram.c" /* yacc.c:1646  */
+#line 35905 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1551:
-#line 10428 "gram.y" /* yacc.c:1646  */
+  case 1553:
+#line 10437 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = LCS_FORKEYSHARE; }
-#line 35896 "gram.c" /* yacc.c:1646  */
+#line 35911 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1552:
-#line 10432 "gram.y" /* yacc.c:1646  */
+  case 1554:
+#line 10441 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 35902 "gram.c" /* yacc.c:1646  */
+#line 35917 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1553:
-#line 10433 "gram.y" /* yacc.c:1646  */
+  case 1555:
+#line 10442 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 35908 "gram.c" /* yacc.c:1646  */
+#line 35923 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1554:
-#line 10439 "gram.y" /* yacc.c:1646  */
+  case 1556:
+#line 10448 "gram.y" /* yacc.c:1646  */
     {
 					SelectStmt *n = makeNode(SelectStmt);
 					n->valuesLists = list_make1((yyvsp[0].list));
 					(yyval.node) = (Node *) n;
 				}
-#line 35918 "gram.c" /* yacc.c:1646  */
+#line 35933 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1555:
-#line 10445 "gram.y" /* yacc.c:1646  */
+  case 1557:
+#line 10454 "gram.y" /* yacc.c:1646  */
     {
 					SelectStmt *n = (SelectStmt *) (yyvsp[-2].node);
 					n->valuesLists = lappend(n->valuesLists, (yyvsp[0].list));
 					(yyval.node) = (Node *) n;
 				}
-#line 35928 "gram.c" /* yacc.c:1646  */
+#line 35943 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1556:
-#line 10462 "gram.y" /* yacc.c:1646  */
+  case 1558:
+#line 10471 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 35934 "gram.c" /* yacc.c:1646  */
+#line 35949 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1557:
-#line 10463 "gram.y" /* yacc.c:1646  */
+  case 1559:
+#line 10472 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 35940 "gram.c" /* yacc.c:1646  */
+#line 35955 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1558:
-#line 10467 "gram.y" /* yacc.c:1646  */
+  case 1560:
+#line 10476 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 35946 "gram.c" /* yacc.c:1646  */
+#line 35961 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1559:
-#line 10468 "gram.y" /* yacc.c:1646  */
+  case 1561:
+#line 10477 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 35952 "gram.c" /* yacc.c:1646  */
+#line 35967 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1560:
-#line 10475 "gram.y" /* yacc.c:1646  */
+  case 1562:
+#line 10484 "gram.y" /* yacc.c:1646  */
     {
 					(yyvsp[-1].range)->alias = (yyvsp[0].alias);
 					(yyval.node) = (Node *) (yyvsp[-1].range);
 				}
-#line 35961 "gram.c" /* yacc.c:1646  */
+#line 35976 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1561:
-#line 10480 "gram.y" /* yacc.c:1646  */
+  case 1563:
+#line 10489 "gram.y" /* yacc.c:1646  */
     {
 					RangeTableSample *n = (RangeTableSample *) (yyvsp[0].node);
 					(yyvsp[-2].range)->alias = (yyvsp[-1].alias);
@@ -35969,22 +35984,22 @@
 					n->relation = (Node *) (yyvsp[-2].range);
 					(yyval.node) = (Node *) n;
 				}
-#line 35973 "gram.c" /* yacc.c:1646  */
+#line 35988 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1562:
-#line 10488 "gram.y" /* yacc.c:1646  */
+  case 1564:
+#line 10497 "gram.y" /* yacc.c:1646  */
     {
 					RangeFunction *n = (RangeFunction *) (yyvsp[-1].node);
 					n->alias = linitial((yyvsp[0].list));
 					n->coldeflist = lsecond((yyvsp[0].list));
 					(yyval.node) = (Node *) n;
 				}
-#line 35984 "gram.c" /* yacc.c:1646  */
+#line 35999 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1563:
-#line 10495 "gram.y" /* yacc.c:1646  */
+  case 1565:
+#line 10504 "gram.y" /* yacc.c:1646  */
     {
 					RangeFunction *n = (RangeFunction *) (yyvsp[-1].node);
 					n->lateral = true;
@@ -35992,11 +36007,11 @@
 					n->coldeflist = lsecond((yyvsp[0].list));
 					(yyval.node) = (Node *) n;
 				}
-#line 35996 "gram.c" /* yacc.c:1646  */
+#line 36011 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1564:
-#line 10503 "gram.y" /* yacc.c:1646  */
+  case 1566:
+#line 10512 "gram.y" /* yacc.c:1646  */
     {
 					RangeSubselect *n = makeNode(RangeSubselect);
 					n->lateral = false;
@@ -36031,17 +36046,17 @@
 					}
 					(yyval.node) = (Node *) n;
 				}
-#line 36035 "gram.c" /* yacc.c:1646  */
+#line 36050 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1565:
-#line 10538 "gram.y" /* yacc.c:1646  */
+  case 1567:
+#line 10547 "gram.y" /* yacc.c:1646  */
     {
 					RangeSubselect *n = makeNode(RangeSubselect);
 					n->lateral = true;
 					n->subquery = (yyvsp[-1].node);
 					n->alias = (yyvsp[0].alias);
-					/* same coment as above */
+					/* same comment as above */
 					if ((yyvsp[0].alias) == NULL)
 					{
 						if (IsA((yyvsp[-1].node), SelectStmt) &&
@@ -36060,36 +36075,36 @@
 					}
 					(yyval.node) = (Node *) n;
 				}
-#line 36064 "gram.c" /* yacc.c:1646  */
+#line 36079 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1566:
-#line 10563 "gram.y" /* yacc.c:1646  */
+  case 1568:
+#line 10572 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) (yyvsp[0].jexpr);
 				}
-#line 36072 "gram.c" /* yacc.c:1646  */
+#line 36087 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1567:
-#line 10567 "gram.y" /* yacc.c:1646  */
+  case 1569:
+#line 10576 "gram.y" /* yacc.c:1646  */
     {
 					(yyvsp[-2].jexpr)->alias = (yyvsp[0].alias);
 					(yyval.node) = (Node *) (yyvsp[-2].jexpr);
 				}
-#line 36081 "gram.c" /* yacc.c:1646  */
+#line 36096 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1568:
-#line 10593 "gram.y" /* yacc.c:1646  */
+  case 1570:
+#line 10602 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.jexpr) = (yyvsp[-1].jexpr);
 				}
-#line 36089 "gram.c" /* yacc.c:1646  */
+#line 36104 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1569:
-#line 10597 "gram.y" /* yacc.c:1646  */
+  case 1571:
+#line 10606 "gram.y" /* yacc.c:1646  */
     {
 					/* CROSS JOIN is same as unqualified inner join */
 					JoinExpr *n = makeNode(JoinExpr);
@@ -36101,11 +36116,11 @@
 					n->quals = NULL;
 					(yyval.jexpr) = n;
 				}
-#line 36105 "gram.c" /* yacc.c:1646  */
+#line 36120 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1570:
-#line 10609 "gram.y" /* yacc.c:1646  */
+  case 1572:
+#line 10618 "gram.y" /* yacc.c:1646  */
     {
 					JoinExpr *n = makeNode(JoinExpr);
 					n->jointype = (yyvsp[-3].jtype);
@@ -36118,11 +36133,11 @@
 						n->quals = (yyvsp[0].node); /* ON clause */
 					(yyval.jexpr) = n;
 				}
-#line 36122 "gram.c" /* yacc.c:1646  */
+#line 36137 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1571:
-#line 10622 "gram.y" /* yacc.c:1646  */
+  case 1573:
+#line 10631 "gram.y" /* yacc.c:1646  */
     {
 					/* letting join_type reduce to empty doesn't work */
 					JoinExpr *n = makeNode(JoinExpr);
@@ -36136,11 +36151,11 @@
 						n->quals = (yyvsp[0].node); /* ON clause */
 					(yyval.jexpr) = n;
 				}
-#line 36140 "gram.c" /* yacc.c:1646  */
+#line 36155 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1572:
-#line 10636 "gram.y" /* yacc.c:1646  */
+  case 1574:
+#line 10645 "gram.y" /* yacc.c:1646  */
     {
 					JoinExpr *n = makeNode(JoinExpr);
 					n->jointype = (yyvsp[-2].jtype);
@@ -36151,11 +36166,11 @@
 					n->quals = NULL; /* fill later */
 					(yyval.jexpr) = n;
 				}
-#line 36155 "gram.c" /* yacc.c:1646  */
+#line 36170 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1573:
-#line 10647 "gram.y" /* yacc.c:1646  */
+  case 1575:
+#line 10656 "gram.y" /* yacc.c:1646  */
     {
 					/* letting join_type reduce to empty doesn't work */
 					JoinExpr *n = makeNode(JoinExpr);
@@ -36167,239 +36182,239 @@
 					n->quals = NULL; /* fill later */
 					(yyval.jexpr) = n;
 				}
-#line 36171 "gram.c" /* yacc.c:1646  */
+#line 36186 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1574:
-#line 10662 "gram.y" /* yacc.c:1646  */
+  case 1576:
+#line 10671 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.alias) = makeNode(Alias);
 					(yyval.alias)->aliasname = (yyvsp[-3].str);
 					(yyval.alias)->colnames = (yyvsp[-1].list);
 				}
-#line 36181 "gram.c" /* yacc.c:1646  */
+#line 36196 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1575:
-#line 10668 "gram.y" /* yacc.c:1646  */
+  case 1577:
+#line 10677 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.alias) = makeNode(Alias);
 					(yyval.alias)->aliasname = (yyvsp[0].str);
 				}
-#line 36190 "gram.c" /* yacc.c:1646  */
+#line 36205 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1576:
-#line 10673 "gram.y" /* yacc.c:1646  */
+  case 1578:
+#line 10682 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.alias) = makeNode(Alias);
 					(yyval.alias)->aliasname = (yyvsp[-3].str);
 					(yyval.alias)->colnames = (yyvsp[-1].list);
 				}
-#line 36200 "gram.c" /* yacc.c:1646  */
+#line 36215 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1577:
-#line 10679 "gram.y" /* yacc.c:1646  */
+  case 1579:
+#line 10688 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.alias) = makeNode(Alias);
 					(yyval.alias)->aliasname = (yyvsp[0].str);
 				}
-#line 36209 "gram.c" /* yacc.c:1646  */
+#line 36224 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1578:
-#line 10685 "gram.y" /* yacc.c:1646  */
+  case 1580:
+#line 10694 "gram.y" /* yacc.c:1646  */
     { (yyval.alias) = (yyvsp[0].alias); }
-#line 36215 "gram.c" /* yacc.c:1646  */
+#line 36230 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1579:
-#line 10686 "gram.y" /* yacc.c:1646  */
+  case 1581:
+#line 10695 "gram.y" /* yacc.c:1646  */
     { (yyval.alias) = NULL; }
-#line 36221 "gram.c" /* yacc.c:1646  */
+#line 36236 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1580:
-#line 10695 "gram.y" /* yacc.c:1646  */
+  case 1582:
+#line 10704 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2((yyvsp[0].alias), NIL);
 				}
-#line 36229 "gram.c" /* yacc.c:1646  */
+#line 36244 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1581:
-#line 10699 "gram.y" /* yacc.c:1646  */
+  case 1583:
+#line 10708 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2(NULL, (yyvsp[-1].list));
 				}
-#line 36237 "gram.c" /* yacc.c:1646  */
+#line 36252 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1582:
-#line 10703 "gram.y" /* yacc.c:1646  */
+  case 1584:
+#line 10712 "gram.y" /* yacc.c:1646  */
     {
 					Alias *a = makeNode(Alias);
 					a->aliasname = (yyvsp[-3].str);
 					(yyval.list) = list_make2(a, (yyvsp[-1].list));
 				}
-#line 36247 "gram.c" /* yacc.c:1646  */
+#line 36262 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1583:
-#line 10709 "gram.y" /* yacc.c:1646  */
+  case 1585:
+#line 10718 "gram.y" /* yacc.c:1646  */
     {
 					Alias *a = makeNode(Alias);
 					a->aliasname = (yyvsp[-3].str);
 					(yyval.list) = list_make2(a, (yyvsp[-1].list));
 				}
-#line 36257 "gram.c" /* yacc.c:1646  */
+#line 36272 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1584:
-#line 10715 "gram.y" /* yacc.c:1646  */
+  case 1586:
+#line 10724 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2(NULL, NIL);
 				}
-#line 36265 "gram.c" /* yacc.c:1646  */
+#line 36280 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1585:
-#line 10720 "gram.y" /* yacc.c:1646  */
+  case 1587:
+#line 10729 "gram.y" /* yacc.c:1646  */
     { (yyval.jtype) = JOIN_FULL; }
-#line 36271 "gram.c" /* yacc.c:1646  */
+#line 36286 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1586:
-#line 10721 "gram.y" /* yacc.c:1646  */
+  case 1588:
+#line 10730 "gram.y" /* yacc.c:1646  */
     { (yyval.jtype) = JOIN_LEFT; }
-#line 36277 "gram.c" /* yacc.c:1646  */
+#line 36292 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1587:
-#line 10722 "gram.y" /* yacc.c:1646  */
+  case 1589:
+#line 10731 "gram.y" /* yacc.c:1646  */
     { (yyval.jtype) = JOIN_RIGHT; }
-#line 36283 "gram.c" /* yacc.c:1646  */
+#line 36298 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1588:
-#line 10723 "gram.y" /* yacc.c:1646  */
+  case 1590:
+#line 10732 "gram.y" /* yacc.c:1646  */
     { (yyval.jtype) = JOIN_INNER; }
-#line 36289 "gram.c" /* yacc.c:1646  */
+#line 36304 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1589:
-#line 10727 "gram.y" /* yacc.c:1646  */
+  case 1591:
+#line 10736 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 36295 "gram.c" /* yacc.c:1646  */
+#line 36310 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1590:
-#line 10728 "gram.y" /* yacc.c:1646  */
+  case 1592:
+#line 10737 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 36301 "gram.c" /* yacc.c:1646  */
+#line 36316 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1591:
-#line 10740 "gram.y" /* yacc.c:1646  */
+  case 1593:
+#line 10749 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) (yyvsp[-1].list); }
-#line 36307 "gram.c" /* yacc.c:1646  */
+#line 36322 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1592:
-#line 10741 "gram.y" /* yacc.c:1646  */
+  case 1594:
+#line 10750 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 36313 "gram.c" /* yacc.c:1646  */
+#line 36328 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1593:
-#line 10747 "gram.y" /* yacc.c:1646  */
+  case 1595:
+#line 10756 "gram.y" /* yacc.c:1646  */
     {
 					/* default inheritance */
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->inhOpt = INH_DEFAULT;
 					(yyval.range)->alias = NULL;
 				}
-#line 36324 "gram.c" /* yacc.c:1646  */
+#line 36339 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1594:
-#line 10754 "gram.y" /* yacc.c:1646  */
+  case 1596:
+#line 10763 "gram.y" /* yacc.c:1646  */
     {
 					/* inheritance query */
 					(yyval.range) = (yyvsp[-1].range);
 					(yyval.range)->inhOpt = INH_YES;
 					(yyval.range)->alias = NULL;
 				}
-#line 36335 "gram.c" /* yacc.c:1646  */
+#line 36350 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1595:
-#line 10761 "gram.y" /* yacc.c:1646  */
+  case 1597:
+#line 10770 "gram.y" /* yacc.c:1646  */
     {
 					/* no inheritance */
 					(yyval.range) = (yyvsp[0].range);
 					(yyval.range)->inhOpt = INH_NO;
 					(yyval.range)->alias = NULL;
 				}
-#line 36346 "gram.c" /* yacc.c:1646  */
+#line 36361 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1596:
-#line 10768 "gram.y" /* yacc.c:1646  */
+  case 1598:
+#line 10777 "gram.y" /* yacc.c:1646  */
     {
 					/* no inheritance, SQL99-style syntax */
 					(yyval.range) = (yyvsp[-1].range);
 					(yyval.range)->inhOpt = INH_NO;
 					(yyval.range)->alias = NULL;
 				}
-#line 36357 "gram.c" /* yacc.c:1646  */
+#line 36372 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1597:
-#line 10778 "gram.y" /* yacc.c:1646  */
+  case 1599:
+#line 10787 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].range)); }
-#line 36363 "gram.c" /* yacc.c:1646  */
+#line 36378 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1598:
-#line 10779 "gram.y" /* yacc.c:1646  */
+  case 1600:
+#line 10788 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].range)); }
-#line 36369 "gram.c" /* yacc.c:1646  */
+#line 36384 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1599:
-#line 10793 "gram.y" /* yacc.c:1646  */
+  case 1601:
+#line 10802 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.range) = (yyvsp[0].range);
 				}
-#line 36377 "gram.c" /* yacc.c:1646  */
+#line 36392 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1600:
-#line 10797 "gram.y" /* yacc.c:1646  */
+  case 1602:
+#line 10806 "gram.y" /* yacc.c:1646  */
     {
 					Alias *alias = makeNode(Alias);
 					alias->aliasname = (yyvsp[0].str);
 					(yyvsp[-1].range)->alias = alias;
 					(yyval.range) = (yyvsp[-1].range);
 				}
-#line 36388 "gram.c" /* yacc.c:1646  */
+#line 36403 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1601:
-#line 10804 "gram.y" /* yacc.c:1646  */
+  case 1603:
+#line 10813 "gram.y" /* yacc.c:1646  */
     {
 					Alias *alias = makeNode(Alias);
 					alias->aliasname = (yyvsp[0].str);
 					(yyvsp[-2].range)->alias = alias;
 					(yyval.range) = (yyvsp[-2].range);
 				}
-#line 36399 "gram.c" /* yacc.c:1646  */
+#line 36414 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1602:
-#line 10817 "gram.y" /* yacc.c:1646  */
+  case 1604:
+#line 10826 "gram.y" /* yacc.c:1646  */
     {
 					RangeTableSample *n = makeNode(RangeTableSample);
 					/* n->relation will be filled in later */
@@ -36409,23 +36424,23 @@
 					n->location = (yylsp[-4]);
 					(yyval.node) = (Node *) n;
 				}
-#line 36413 "gram.c" /* yacc.c:1646  */
+#line 36428 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1603:
-#line 10829 "gram.y" /* yacc.c:1646  */
+  case 1605:
+#line 10838 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) (yyvsp[-1].node); }
-#line 36419 "gram.c" /* yacc.c:1646  */
+#line 36434 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1604:
-#line 10830 "gram.y" /* yacc.c:1646  */
+  case 1606:
+#line 10839 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 36425 "gram.c" /* yacc.c:1646  */
+#line 36440 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1605:
-#line 10846 "gram.y" /* yacc.c:1646  */
+  case 1607:
+#line 10855 "gram.y" /* yacc.c:1646  */
     {
 					RangeFunction *n = makeNode(RangeFunction);
 					n->lateral = false;
@@ -36435,11 +36450,11 @@
 					/* alias and coldeflist are set by table_ref production */
 					(yyval.node) = (Node *) n;
 				}
-#line 36439 "gram.c" /* yacc.c:1646  */
+#line 36454 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1606:
-#line 10856 "gram.y" /* yacc.c:1646  */
+  case 1608:
+#line 10865 "gram.y" /* yacc.c:1646  */
     {
 					RangeFunction *n = makeNode(RangeFunction);
 					n->lateral = false;
@@ -36449,71 +36464,71 @@
 					/* alias and coldeflist are set by table_ref production */
 					(yyval.node) = (Node *) n;
 				}
-#line 36453 "gram.c" /* yacc.c:1646  */
+#line 36468 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1607:
-#line 10868 "gram.y" /* yacc.c:1646  */
+  case 1609:
+#line 10877 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2((yyvsp[-1].node), (yyvsp[0].list)); }
-#line 36459 "gram.c" /* yacc.c:1646  */
+#line 36474 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1608:
-#line 10872 "gram.y" /* yacc.c:1646  */
+  case 1610:
+#line 10881 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].list)); }
-#line 36465 "gram.c" /* yacc.c:1646  */
+#line 36480 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1609:
-#line 10873 "gram.y" /* yacc.c:1646  */
+  case 1611:
+#line 10882 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].list)); }
-#line 36471 "gram.c" /* yacc.c:1646  */
+#line 36486 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1610:
-#line 10876 "gram.y" /* yacc.c:1646  */
+  case 1612:
+#line 10885 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 36477 "gram.c" /* yacc.c:1646  */
+#line 36492 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1611:
-#line 10877 "gram.y" /* yacc.c:1646  */
+  case 1613:
+#line 10886 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 36483 "gram.c" /* yacc.c:1646  */
+#line 36498 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1612:
-#line 10880 "gram.y" /* yacc.c:1646  */
+  case 1614:
+#line 10889 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = true; }
-#line 36489 "gram.c" /* yacc.c:1646  */
+#line 36504 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1613:
-#line 10881 "gram.y" /* yacc.c:1646  */
+  case 1615:
+#line 10890 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = false; }
-#line 36495 "gram.c" /* yacc.c:1646  */
+#line 36510 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1614:
-#line 10886 "gram.y" /* yacc.c:1646  */
+  case 1616:
+#line 10895 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 36501 "gram.c" /* yacc.c:1646  */
+#line 36516 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1615:
-#line 10887 "gram.y" /* yacc.c:1646  */
+  case 1617:
+#line 10896 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 36507 "gram.c" /* yacc.c:1646  */
+#line 36522 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1616:
-#line 10892 "gram.y" /* yacc.c:1646  */
+  case 1618:
+#line 10901 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 36513 "gram.c" /* yacc.c:1646  */
+#line 36528 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1617:
-#line 10894 "gram.y" /* yacc.c:1646  */
+  case 1619:
+#line 10903 "gram.y" /* yacc.c:1646  */
     {
 					CurrentOfExpr *n = makeNode(CurrentOfExpr);
 					/* cvarno is filled in by parse analysis */
@@ -36521,45 +36536,45 @@
 					n->cursor_param = 0;
 					(yyval.node) = (Node *) n;
 				}
-#line 36525 "gram.c" /* yacc.c:1646  */
+#line 36540 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1618:
-#line 10901 "gram.y" /* yacc.c:1646  */
+  case 1620:
+#line 10910 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 36531 "gram.c" /* yacc.c:1646  */
+#line 36546 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1619:
-#line 10906 "gram.y" /* yacc.c:1646  */
+  case 1621:
+#line 10915 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 36537 "gram.c" /* yacc.c:1646  */
+#line 36552 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1620:
-#line 10907 "gram.y" /* yacc.c:1646  */
+  case 1622:
+#line 10916 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 36543 "gram.c" /* yacc.c:1646  */
+#line 36558 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1621:
-#line 10912 "gram.y" /* yacc.c:1646  */
+  case 1623:
+#line 10921 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].node));
 				}
-#line 36551 "gram.c" /* yacc.c:1646  */
+#line 36566 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1622:
-#line 10916 "gram.y" /* yacc.c:1646  */
+  case 1624:
+#line 10925 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node));
 				}
-#line 36559 "gram.c" /* yacc.c:1646  */
+#line 36574 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1623:
-#line 10922 "gram.y" /* yacc.c:1646  */
+  case 1625:
+#line 10931 "gram.y" /* yacc.c:1646  */
     {
 					ColumnDef *n = makeNode(ColumnDef);
 					n->colname = (yyvsp[-2].str);
@@ -36577,293 +36592,293 @@
 					n->location = (yylsp[-2]);
 					(yyval.node) = (Node *)n;
 				}
-#line 36581 "gram.c" /* yacc.c:1646  */
+#line 36596 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1624:
-#line 10952 "gram.y" /* yacc.c:1646  */
+  case 1626:
+#line 10961 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[-1].typnam);
 					(yyval.typnam)->arrayBounds = (yyvsp[0].list);
 				}
-#line 36590 "gram.c" /* yacc.c:1646  */
+#line 36605 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1625:
-#line 10957 "gram.y" /* yacc.c:1646  */
+  case 1627:
+#line 10966 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[-1].typnam);
 					(yyval.typnam)->arrayBounds = (yyvsp[0].list);
 					(yyval.typnam)->setof = TRUE;
 				}
-#line 36600 "gram.c" /* yacc.c:1646  */
+#line 36615 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1626:
-#line 10964 "gram.y" /* yacc.c:1646  */
+  case 1628:
+#line 10973 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[-4].typnam);
 					(yyval.typnam)->arrayBounds = list_make1(makeInteger((yyvsp[-1].ival)));
 				}
-#line 36609 "gram.c" /* yacc.c:1646  */
+#line 36624 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1627:
-#line 10969 "gram.y" /* yacc.c:1646  */
+  case 1629:
+#line 10978 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[-4].typnam);
 					(yyval.typnam)->arrayBounds = list_make1(makeInteger((yyvsp[-1].ival)));
 					(yyval.typnam)->setof = TRUE;
 				}
-#line 36619 "gram.c" /* yacc.c:1646  */
+#line 36634 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1628:
-#line 10975 "gram.y" /* yacc.c:1646  */
+  case 1630:
+#line 10984 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[-1].typnam);
 					(yyval.typnam)->arrayBounds = list_make1(makeInteger(-1));
 				}
-#line 36628 "gram.c" /* yacc.c:1646  */
+#line 36643 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1629:
-#line 10980 "gram.y" /* yacc.c:1646  */
+  case 1631:
+#line 10989 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[-1].typnam);
 					(yyval.typnam)->arrayBounds = list_make1(makeInteger(-1));
 					(yyval.typnam)->setof = TRUE;
 				}
-#line 36638 "gram.c" /* yacc.c:1646  */
+#line 36653 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1630:
-#line 10989 "gram.y" /* yacc.c:1646  */
+  case 1632:
+#line 10998 "gram.y" /* yacc.c:1646  */
     {  (yyval.list) = lappend((yyvsp[-2].list), makeInteger(-1)); }
-#line 36644 "gram.c" /* yacc.c:1646  */
+#line 36659 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1631:
-#line 10991 "gram.y" /* yacc.c:1646  */
+  case 1633:
+#line 11000 "gram.y" /* yacc.c:1646  */
     {  (yyval.list) = lappend((yyvsp[-3].list), makeInteger((yyvsp[-1].ival))); }
-#line 36650 "gram.c" /* yacc.c:1646  */
+#line 36665 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1632:
-#line 10993 "gram.y" /* yacc.c:1646  */
+  case 1634:
+#line 11002 "gram.y" /* yacc.c:1646  */
     {  (yyval.list) = NIL; }
-#line 36656 "gram.c" /* yacc.c:1646  */
+#line 36671 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1633:
-#line 10997 "gram.y" /* yacc.c:1646  */
+  case 1635:
+#line 11006 "gram.y" /* yacc.c:1646  */
     { (yyval.typnam) = (yyvsp[0].typnam); }
-#line 36662 "gram.c" /* yacc.c:1646  */
+#line 36677 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1634:
-#line 10998 "gram.y" /* yacc.c:1646  */
+  case 1636:
+#line 11007 "gram.y" /* yacc.c:1646  */
     { (yyval.typnam) = (yyvsp[0].typnam); }
-#line 36668 "gram.c" /* yacc.c:1646  */
+#line 36683 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1635:
-#line 10999 "gram.y" /* yacc.c:1646  */
+  case 1637:
+#line 11008 "gram.y" /* yacc.c:1646  */
     { (yyval.typnam) = (yyvsp[0].typnam); }
-#line 36674 "gram.c" /* yacc.c:1646  */
+#line 36689 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1636:
-#line 11000 "gram.y" /* yacc.c:1646  */
+  case 1638:
+#line 11009 "gram.y" /* yacc.c:1646  */
     { (yyval.typnam) = (yyvsp[0].typnam); }
-#line 36680 "gram.c" /* yacc.c:1646  */
+#line 36695 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1637:
-#line 11001 "gram.y" /* yacc.c:1646  */
+  case 1639:
+#line 11010 "gram.y" /* yacc.c:1646  */
     { (yyval.typnam) = (yyvsp[0].typnam); }
-#line 36686 "gram.c" /* yacc.c:1646  */
+#line 36701 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1638:
-#line 11003 "gram.y" /* yacc.c:1646  */
+  case 1640:
+#line 11012 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[-1].typnam);
 					(yyval.typnam)->typmods = (yyvsp[0].list);
 				}
-#line 36695 "gram.c" /* yacc.c:1646  */
+#line 36710 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1639:
-#line 11008 "gram.y" /* yacc.c:1646  */
+  case 1641:
+#line 11017 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[-3].typnam);
 					(yyval.typnam)->typmods = list_make2(makeIntConst(INTERVAL_FULL_RANGE, -1),
 											 makeIntConst((yyvsp[-1].ival), (yylsp[-1])));
 				}
-#line 36705 "gram.c" /* yacc.c:1646  */
+#line 36720 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1640:
-#line 11027 "gram.y" /* yacc.c:1646  */
+  case 1642:
+#line 11036 "gram.y" /* yacc.c:1646  */
     { (yyval.typnam) = (yyvsp[0].typnam); }
-#line 36711 "gram.c" /* yacc.c:1646  */
+#line 36726 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1641:
-#line 11028 "gram.y" /* yacc.c:1646  */
+  case 1643:
+#line 11037 "gram.y" /* yacc.c:1646  */
     { (yyval.typnam) = (yyvsp[0].typnam); }
-#line 36717 "gram.c" /* yacc.c:1646  */
+#line 36732 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1642:
-#line 11029 "gram.y" /* yacc.c:1646  */
+  case 1644:
+#line 11038 "gram.y" /* yacc.c:1646  */
     { (yyval.typnam) = (yyvsp[0].typnam); }
-#line 36723 "gram.c" /* yacc.c:1646  */
+#line 36738 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1643:
-#line 11030 "gram.y" /* yacc.c:1646  */
+  case 1645:
+#line 11039 "gram.y" /* yacc.c:1646  */
     { (yyval.typnam) = (yyvsp[0].typnam); }
-#line 36729 "gram.c" /* yacc.c:1646  */
+#line 36744 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1644:
-#line 11042 "gram.y" /* yacc.c:1646  */
+  case 1646:
+#line 11051 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = makeTypeName((yyvsp[-1].str));
 					(yyval.typnam)->typmods = (yyvsp[0].list);
 					(yyval.typnam)->location = (yylsp[-1]);
 				}
-#line 36739 "gram.c" /* yacc.c:1646  */
+#line 36754 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1645:
-#line 11048 "gram.y" /* yacc.c:1646  */
+  case 1647:
+#line 11057 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = makeTypeNameFromNameList(lcons(makeString((yyvsp[-2].str)), (yyvsp[-1].list)));
 					(yyval.typnam)->typmods = (yyvsp[0].list);
 					(yyval.typnam)->location = (yylsp[-2]);
 				}
-#line 36749 "gram.c" /* yacc.c:1646  */
+#line 36764 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1646:
-#line 11055 "gram.y" /* yacc.c:1646  */
+  case 1648:
+#line 11064 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 36755 "gram.c" /* yacc.c:1646  */
+#line 36770 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1647:
-#line 11056 "gram.y" /* yacc.c:1646  */
+  case 1649:
+#line 11065 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 36761 "gram.c" /* yacc.c:1646  */
+#line 36776 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1648:
-#line 11063 "gram.y" /* yacc.c:1646  */
+  case 1650:
+#line 11072 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("int4");
 					(yyval.typnam)->location = (yylsp[0]);
 				}
-#line 36770 "gram.c" /* yacc.c:1646  */
+#line 36785 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1649:
-#line 11068 "gram.y" /* yacc.c:1646  */
+  case 1651:
+#line 11077 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("int4");
 					(yyval.typnam)->location = (yylsp[0]);
 				}
-#line 36779 "gram.c" /* yacc.c:1646  */
+#line 36794 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1650:
-#line 11073 "gram.y" /* yacc.c:1646  */
+  case 1652:
+#line 11082 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("int2");
 					(yyval.typnam)->location = (yylsp[0]);
 				}
-#line 36788 "gram.c" /* yacc.c:1646  */
+#line 36803 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1651:
-#line 11078 "gram.y" /* yacc.c:1646  */
+  case 1653:
+#line 11087 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("int8");
 					(yyval.typnam)->location = (yylsp[0]);
 				}
-#line 36797 "gram.c" /* yacc.c:1646  */
+#line 36812 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1652:
-#line 11083 "gram.y" /* yacc.c:1646  */
+  case 1654:
+#line 11092 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("float4");
 					(yyval.typnam)->location = (yylsp[0]);
 				}
-#line 36806 "gram.c" /* yacc.c:1646  */
+#line 36821 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1653:
-#line 11088 "gram.y" /* yacc.c:1646  */
+  case 1655:
+#line 11097 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[0].typnam);
 					(yyval.typnam)->location = (yylsp[-1]);
 				}
-#line 36815 "gram.c" /* yacc.c:1646  */
+#line 36830 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1654:
-#line 11093 "gram.y" /* yacc.c:1646  */
+  case 1656:
+#line 11102 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("float8");
 					(yyval.typnam)->location = (yylsp[-1]);
 				}
-#line 36824 "gram.c" /* yacc.c:1646  */
+#line 36839 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1655:
-#line 11098 "gram.y" /* yacc.c:1646  */
+  case 1657:
+#line 11107 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("numeric");
 					(yyval.typnam)->typmods = (yyvsp[0].list);
 					(yyval.typnam)->location = (yylsp[-1]);
 				}
-#line 36834 "gram.c" /* yacc.c:1646  */
+#line 36849 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1656:
-#line 11104 "gram.y" /* yacc.c:1646  */
+  case 1658:
+#line 11113 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("numeric");
 					(yyval.typnam)->typmods = (yyvsp[0].list);
 					(yyval.typnam)->location = (yylsp[-1]);
 				}
-#line 36844 "gram.c" /* yacc.c:1646  */
+#line 36859 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1657:
-#line 11110 "gram.y" /* yacc.c:1646  */
+  case 1659:
+#line 11119 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("numeric");
 					(yyval.typnam)->typmods = (yyvsp[0].list);
 					(yyval.typnam)->location = (yylsp[-1]);
 				}
-#line 36854 "gram.c" /* yacc.c:1646  */
+#line 36869 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1658:
-#line 11116 "gram.y" /* yacc.c:1646  */
+  case 1660:
+#line 11125 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("bool");
 					(yyval.typnam)->location = (yylsp[0]);
 				}
-#line 36863 "gram.c" /* yacc.c:1646  */
+#line 36878 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1659:
-#line 11123 "gram.y" /* yacc.c:1646  */
+  case 1661:
+#line 11132 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Check FLOAT() precision limits assuming IEEE floating
@@ -36884,52 +36899,52 @@
 								 errmsg("precision for type float must be less than 54 bits"),
 								 parser_errposition((yylsp[-1]))));
 				}
-#line 36888 "gram.c" /* yacc.c:1646  */
+#line 36903 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1660:
-#line 11144 "gram.y" /* yacc.c:1646  */
+  case 1662:
+#line 11153 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("float8");
 				}
-#line 36896 "gram.c" /* yacc.c:1646  */
+#line 36911 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1661:
-#line 11154 "gram.y" /* yacc.c:1646  */
+  case 1663:
+#line 11163 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[0].typnam);
 				}
-#line 36904 "gram.c" /* yacc.c:1646  */
+#line 36919 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1662:
-#line 11158 "gram.y" /* yacc.c:1646  */
+  case 1664:
+#line 11167 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[0].typnam);
 				}
-#line 36912 "gram.c" /* yacc.c:1646  */
+#line 36927 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1663:
-#line 11166 "gram.y" /* yacc.c:1646  */
+  case 1665:
+#line 11175 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[0].typnam);
 				}
-#line 36920 "gram.c" /* yacc.c:1646  */
+#line 36935 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1664:
-#line 11170 "gram.y" /* yacc.c:1646  */
+  case 1666:
+#line 11179 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[0].typnam);
 					(yyval.typnam)->typmods = NIL;
 				}
-#line 36929 "gram.c" /* yacc.c:1646  */
+#line 36944 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1665:
-#line 11178 "gram.y" /* yacc.c:1646  */
+  case 1667:
+#line 11187 "gram.y" /* yacc.c:1646  */
     {
 					char *typname;
 
@@ -36938,11 +36953,11 @@
 					(yyval.typnam)->typmods = (yyvsp[-1].list);
 					(yyval.typnam)->location = (yylsp[-4]);
 				}
-#line 36942 "gram.c" /* yacc.c:1646  */
+#line 36957 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1666:
-#line 11190 "gram.y" /* yacc.c:1646  */
+  case 1668:
+#line 11199 "gram.y" /* yacc.c:1646  */
     {
 					/* bit defaults to bit(1), varbit to no limit */
 					if ((yyvsp[0].boolean))
@@ -36956,35 +36971,35 @@
 					}
 					(yyval.typnam)->location = (yylsp[-1]);
 				}
-#line 36960 "gram.c" /* yacc.c:1646  */
+#line 36975 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1667:
-#line 11211 "gram.y" /* yacc.c:1646  */
+  case 1669:
+#line 11220 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[0].typnam);
 				}
-#line 36968 "gram.c" /* yacc.c:1646  */
+#line 36983 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1668:
-#line 11215 "gram.y" /* yacc.c:1646  */
+  case 1670:
+#line 11224 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[0].typnam);
 				}
-#line 36976 "gram.c" /* yacc.c:1646  */
+#line 36991 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1669:
-#line 11221 "gram.y" /* yacc.c:1646  */
+  case 1671:
+#line 11230 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = (yyvsp[0].typnam);
 				}
-#line 36984 "gram.c" /* yacc.c:1646  */
+#line 36999 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1670:
-#line 11225 "gram.y" /* yacc.c:1646  */
+  case 1672:
+#line 11234 "gram.y" /* yacc.c:1646  */
     {
 					/* Length was not specified so allow to be unrestricted.
 					 * This handles problems with fixed-length (bpchar) strings
@@ -36995,11 +37010,11 @@
 					(yyval.typnam) = (yyvsp[0].typnam);
 					(yyval.typnam)->typmods = NIL;
 				}
-#line 36999 "gram.c" /* yacc.c:1646  */
+#line 37014 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1671:
-#line 11238 "gram.y" /* yacc.c:1646  */
+  case 1673:
+#line 11247 "gram.y" /* yacc.c:1646  */
     {
 					if (((yyvsp[0].str) != NULL) && (strcmp((yyvsp[0].str), "sql_text") != 0))
 						(yyvsp[-4].str) = psprintf("%s_%s", (yyvsp[-4].str), (yyvsp[0].str));
@@ -37008,11 +37023,11 @@
 					(yyval.typnam)->typmods = list_make1(makeIntConst((yyvsp[-2].ival), (yylsp[-2])));
 					(yyval.typnam)->location = (yylsp[-4]);
 				}
-#line 37012 "gram.c" /* yacc.c:1646  */
+#line 37027 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1672:
-#line 11249 "gram.y" /* yacc.c:1646  */
+  case 1674:
+#line 11258 "gram.y" /* yacc.c:1646  */
     {
 					if (((yyvsp[0].str) != NULL) && (strcmp((yyvsp[0].str), "sql_text") != 0))
 						(yyvsp[-1].str) = psprintf("%s_%s", (yyvsp[-1].str), (yyvsp[0].str));
@@ -37025,71 +37040,71 @@
 
 					(yyval.typnam)->location = (yylsp[-1]);
 				}
-#line 37029 "gram.c" /* yacc.c:1646  */
+#line 37044 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1673:
-#line 11264 "gram.y" /* yacc.c:1646  */
+  case 1675:
+#line 11273 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].boolean) ? "varchar": "bpchar"; }
-#line 37035 "gram.c" /* yacc.c:1646  */
+#line 37050 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1674:
-#line 11266 "gram.y" /* yacc.c:1646  */
+  case 1676:
+#line 11275 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].boolean) ? "varchar": "bpchar"; }
-#line 37041 "gram.c" /* yacc.c:1646  */
+#line 37056 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1675:
-#line 11268 "gram.y" /* yacc.c:1646  */
+  case 1677:
+#line 11277 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "varchar"; }
-#line 37047 "gram.c" /* yacc.c:1646  */
+#line 37062 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1676:
-#line 11270 "gram.y" /* yacc.c:1646  */
+  case 1678:
+#line 11279 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].boolean) ? "varchar": "bpchar"; }
-#line 37053 "gram.c" /* yacc.c:1646  */
+#line 37068 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1677:
-#line 11272 "gram.y" /* yacc.c:1646  */
+  case 1679:
+#line 11281 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].boolean) ? "varchar": "bpchar"; }
-#line 37059 "gram.c" /* yacc.c:1646  */
+#line 37074 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1678:
-#line 11274 "gram.y" /* yacc.c:1646  */
+  case 1680:
+#line 11283 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].boolean) ? "varchar": "bpchar"; }
-#line 37065 "gram.c" /* yacc.c:1646  */
+#line 37080 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1679:
-#line 11278 "gram.y" /* yacc.c:1646  */
+  case 1681:
+#line 11287 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 37071 "gram.c" /* yacc.c:1646  */
+#line 37086 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1680:
-#line 11279 "gram.y" /* yacc.c:1646  */
+  case 1682:
+#line 11288 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 37077 "gram.c" /* yacc.c:1646  */
+#line 37092 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1681:
-#line 11283 "gram.y" /* yacc.c:1646  */
+  case 1683:
+#line 11292 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 37083 "gram.c" /* yacc.c:1646  */
+#line 37098 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1682:
-#line 11284 "gram.y" /* yacc.c:1646  */
+  case 1684:
+#line 11293 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 37089 "gram.c" /* yacc.c:1646  */
+#line 37104 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1683:
-#line 11292 "gram.y" /* yacc.c:1646  */
+  case 1685:
+#line 11301 "gram.y" /* yacc.c:1646  */
     {
 					if ((yyvsp[0].boolean))
 						(yyval.typnam) = SystemTypeName("timestamptz");
@@ -37098,11 +37113,11 @@
 					(yyval.typnam)->typmods = list_make1(makeIntConst((yyvsp[-2].ival), (yylsp[-2])));
 					(yyval.typnam)->location = (yylsp[-4]);
 				}
-#line 37102 "gram.c" /* yacc.c:1646  */
+#line 37117 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1684:
-#line 11301 "gram.y" /* yacc.c:1646  */
+  case 1686:
+#line 11310 "gram.y" /* yacc.c:1646  */
     {
 					if ((yyvsp[0].boolean))
 						(yyval.typnam) = SystemTypeName("timestamptz");
@@ -37110,11 +37125,11 @@
 						(yyval.typnam) = SystemTypeName("timestamp");
 					(yyval.typnam)->location = (yylsp[-1]);
 				}
-#line 37114 "gram.c" /* yacc.c:1646  */
+#line 37129 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1685:
-#line 11309 "gram.y" /* yacc.c:1646  */
+  case 1687:
+#line 11318 "gram.y" /* yacc.c:1646  */
     {
 					if ((yyvsp[0].boolean))
 						(yyval.typnam) = SystemTypeName("timetz");
@@ -37123,11 +37138,11 @@
 					(yyval.typnam)->typmods = list_make1(makeIntConst((yyvsp[-2].ival), (yylsp[-2])));
 					(yyval.typnam)->location = (yylsp[-4]);
 				}
-#line 37127 "gram.c" /* yacc.c:1646  */
+#line 37142 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1686:
-#line 11318 "gram.y" /* yacc.c:1646  */
+  case 1688:
+#line 11327 "gram.y" /* yacc.c:1646  */
     {
 					if ((yyvsp[0].boolean))
 						(yyval.typnam) = SystemTypeName("timetz");
@@ -37135,102 +37150,102 @@
 						(yyval.typnam) = SystemTypeName("time");
 					(yyval.typnam)->location = (yylsp[-1]);
 				}
-#line 37139 "gram.c" /* yacc.c:1646  */
+#line 37154 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1687:
-#line 11329 "gram.y" /* yacc.c:1646  */
+  case 1689:
+#line 11338 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.typnam) = SystemTypeName("interval");
 					(yyval.typnam)->location = (yylsp[0]);
 				}
-#line 37148 "gram.c" /* yacc.c:1646  */
+#line 37163 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1688:
-#line 11336 "gram.y" /* yacc.c:1646  */
+  case 1690:
+#line 11345 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 37154 "gram.c" /* yacc.c:1646  */
+#line 37169 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1689:
-#line 11337 "gram.y" /* yacc.c:1646  */
+  case 1691:
+#line 11346 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 37160 "gram.c" /* yacc.c:1646  */
+#line 37175 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1690:
-#line 11338 "gram.y" /* yacc.c:1646  */
+  case 1692:
+#line 11347 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 37166 "gram.c" /* yacc.c:1646  */
+#line 37181 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1691:
-#line 11343 "gram.y" /* yacc.c:1646  */
+  case 1693:
+#line 11352 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(YEAR), (yylsp[0]))); }
-#line 37172 "gram.c" /* yacc.c:1646  */
+#line 37187 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1692:
-#line 11345 "gram.y" /* yacc.c:1646  */
+  case 1694:
+#line 11354 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(MONTH), (yylsp[0]))); }
-#line 37178 "gram.c" /* yacc.c:1646  */
+#line 37193 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1693:
-#line 11347 "gram.y" /* yacc.c:1646  */
+  case 1695:
+#line 11356 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(DAY), (yylsp[0]))); }
-#line 37184 "gram.c" /* yacc.c:1646  */
+#line 37199 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1694:
-#line 11349 "gram.y" /* yacc.c:1646  */
+  case 1696:
+#line 11358 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(HOUR), (yylsp[0]))); }
-#line 37190 "gram.c" /* yacc.c:1646  */
+#line 37205 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1695:
-#line 11351 "gram.y" /* yacc.c:1646  */
+  case 1697:
+#line 11360 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(MINUTE), (yylsp[0]))); }
-#line 37196 "gram.c" /* yacc.c:1646  */
+#line 37211 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1696:
-#line 11353 "gram.y" /* yacc.c:1646  */
+  case 1698:
+#line 11362 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 37202 "gram.c" /* yacc.c:1646  */
+#line 37217 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1697:
-#line 11355 "gram.y" /* yacc.c:1646  */
+  case 1699:
+#line 11364 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(YEAR) |
 												 INTERVAL_MASK(MONTH), (yylsp[-2])));
 				}
-#line 37211 "gram.c" /* yacc.c:1646  */
+#line 37226 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1698:
-#line 11360 "gram.y" /* yacc.c:1646  */
+  case 1700:
+#line 11369 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(DAY) |
 												 INTERVAL_MASK(HOUR), (yylsp[-2])));
 				}
-#line 37220 "gram.c" /* yacc.c:1646  */
+#line 37235 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1699:
-#line 11365 "gram.y" /* yacc.c:1646  */
+  case 1701:
+#line 11374 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(DAY) |
 												 INTERVAL_MASK(HOUR) |
 												 INTERVAL_MASK(MINUTE), (yylsp[-2])));
 				}
-#line 37230 "gram.c" /* yacc.c:1646  */
+#line 37245 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1700:
-#line 11371 "gram.y" /* yacc.c:1646  */
+  case 1702:
+#line 11380 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = (yyvsp[0].list);
 					linitial((yyval.list)) = makeIntConst(INTERVAL_MASK(DAY) |
@@ -37238,76 +37253,76 @@
 												INTERVAL_MASK(MINUTE) |
 												INTERVAL_MASK(SECOND), (yylsp[-2]));
 				}
-#line 37242 "gram.c" /* yacc.c:1646  */
+#line 37257 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1701:
-#line 11379 "gram.y" /* yacc.c:1646  */
+  case 1703:
+#line 11388 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(HOUR) |
 												 INTERVAL_MASK(MINUTE), (yylsp[-2])));
 				}
-#line 37251 "gram.c" /* yacc.c:1646  */
+#line 37266 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1702:
-#line 11384 "gram.y" /* yacc.c:1646  */
+  case 1704:
+#line 11393 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = (yyvsp[0].list);
 					linitial((yyval.list)) = makeIntConst(INTERVAL_MASK(HOUR) |
 												INTERVAL_MASK(MINUTE) |
 												INTERVAL_MASK(SECOND), (yylsp[-2]));
 				}
-#line 37262 "gram.c" /* yacc.c:1646  */
+#line 37277 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1703:
-#line 11391 "gram.y" /* yacc.c:1646  */
+  case 1705:
+#line 11400 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = (yyvsp[0].list);
 					linitial((yyval.list)) = makeIntConst(INTERVAL_MASK(MINUTE) |
 												INTERVAL_MASK(SECOND), (yylsp[-2]));
 				}
-#line 37272 "gram.c" /* yacc.c:1646  */
+#line 37287 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1704:
-#line 11397 "gram.y" /* yacc.c:1646  */
+  case 1706:
+#line 11406 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 37278 "gram.c" /* yacc.c:1646  */
+#line 37293 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1705:
-#line 11402 "gram.y" /* yacc.c:1646  */
+  case 1707:
+#line 11411 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(SECOND), (yylsp[0])));
 				}
-#line 37286 "gram.c" /* yacc.c:1646  */
+#line 37301 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1706:
-#line 11406 "gram.y" /* yacc.c:1646  */
+  case 1708:
+#line 11415 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2(makeIntConst(INTERVAL_MASK(SECOND), (yylsp[-3])),
 									makeIntConst((yyvsp[-1].ival), (yylsp[-1])));
 				}
-#line 37295 "gram.c" /* yacc.c:1646  */
+#line 37310 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1707:
-#line 11441 "gram.y" /* yacc.c:1646  */
+  case 1709:
+#line 11450 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 37301 "gram.c" /* yacc.c:1646  */
+#line 37316 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1708:
-#line 11443 "gram.y" /* yacc.c:1646  */
+  case 1710:
+#line 11452 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeTypeCast((yyvsp[-2].node), (yyvsp[0].typnam), (yylsp[-1])); }
-#line 37307 "gram.c" /* yacc.c:1646  */
+#line 37322 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1709:
-#line 11445 "gram.y" /* yacc.c:1646  */
+  case 1711:
+#line 11454 "gram.y" /* yacc.c:1646  */
     {
 					CollateClause *n = makeNode(CollateClause);
 					n->arg = (yyvsp[-2].node);
@@ -37315,156 +37330,156 @@
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *) n;
 				}
-#line 37319 "gram.c" /* yacc.c:1646  */
+#line 37334 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1710:
-#line 11453 "gram.y" /* yacc.c:1646  */
+  case 1712:
+#line 11462 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("timezone"),
 											   list_make2((yyvsp[0].node), (yyvsp[-4].node)),
 											   (yylsp[-3]));
 				}
-#line 37329 "gram.c" /* yacc.c:1646  */
+#line 37344 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1711:
-#line 11468 "gram.y" /* yacc.c:1646  */
+  case 1713:
+#line 11477 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", NULL, (yyvsp[0].node), (yylsp[-1])); }
-#line 37335 "gram.c" /* yacc.c:1646  */
+#line 37350 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1712:
-#line 11470 "gram.y" /* yacc.c:1646  */
+  case 1714:
+#line 11479 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = doNegate((yyvsp[0].node), (yylsp[-1])); }
-#line 37341 "gram.c" /* yacc.c:1646  */
+#line 37356 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1713:
-#line 11472 "gram.y" /* yacc.c:1646  */
+  case 1715:
+#line 11481 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37347 "gram.c" /* yacc.c:1646  */
+#line 37362 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1714:
-#line 11474 "gram.y" /* yacc.c:1646  */
+  case 1716:
+#line 11483 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "-", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37353 "gram.c" /* yacc.c:1646  */
+#line 37368 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1715:
-#line 11476 "gram.y" /* yacc.c:1646  */
+  case 1717:
+#line 11485 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "*", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37359 "gram.c" /* yacc.c:1646  */
+#line 37374 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1716:
-#line 11478 "gram.y" /* yacc.c:1646  */
+  case 1718:
+#line 11487 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "/", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37365 "gram.c" /* yacc.c:1646  */
+#line 37380 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1717:
-#line 11480 "gram.y" /* yacc.c:1646  */
+  case 1719:
+#line 11489 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "%", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37371 "gram.c" /* yacc.c:1646  */
+#line 37386 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1718:
-#line 11482 "gram.y" /* yacc.c:1646  */
+  case 1720:
+#line 11491 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "^", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37377 "gram.c" /* yacc.c:1646  */
+#line 37392 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1719:
-#line 11484 "gram.y" /* yacc.c:1646  */
+  case 1721:
+#line 11493 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37383 "gram.c" /* yacc.c:1646  */
+#line 37398 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1720:
-#line 11486 "gram.y" /* yacc.c:1646  */
+  case 1722:
+#line 11495 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, ">", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37389 "gram.c" /* yacc.c:1646  */
+#line 37404 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1721:
-#line 11488 "gram.y" /* yacc.c:1646  */
+  case 1723:
+#line 11497 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "=", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37395 "gram.c" /* yacc.c:1646  */
+#line 37410 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1722:
-#line 11490 "gram.y" /* yacc.c:1646  */
+  case 1724:
+#line 11499 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<=", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37401 "gram.c" /* yacc.c:1646  */
+#line 37416 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1723:
-#line 11492 "gram.y" /* yacc.c:1646  */
+  case 1725:
+#line 11501 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, ">=", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37407 "gram.c" /* yacc.c:1646  */
+#line 37422 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1724:
-#line 11494 "gram.y" /* yacc.c:1646  */
+  case 1726:
+#line 11503 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<>", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37413 "gram.c" /* yacc.c:1646  */
+#line 37428 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1725:
-#line 11497 "gram.y" /* yacc.c:1646  */
+  case 1727:
+#line 11506 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[-1].list), (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37419 "gram.c" /* yacc.c:1646  */
+#line 37434 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1726:
-#line 11499 "gram.y" /* yacc.c:1646  */
+  case 1728:
+#line 11508 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[-1].list), NULL, (yyvsp[0].node), (yylsp[-1])); }
-#line 37425 "gram.c" /* yacc.c:1646  */
+#line 37440 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1727:
-#line 11501 "gram.y" /* yacc.c:1646  */
+  case 1729:
+#line 11510 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[0].list), (yyvsp[-1].node), NULL, (yylsp[0])); }
-#line 37431 "gram.c" /* yacc.c:1646  */
+#line 37446 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1728:
-#line 11504 "gram.y" /* yacc.c:1646  */
+  case 1730:
+#line 11513 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeAndExpr((yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37437 "gram.c" /* yacc.c:1646  */
+#line 37452 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1729:
-#line 11506 "gram.y" /* yacc.c:1646  */
+  case 1731:
+#line 11515 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeOrExpr((yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37443 "gram.c" /* yacc.c:1646  */
+#line 37458 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1730:
-#line 11508 "gram.y" /* yacc.c:1646  */
+  case 1732:
+#line 11517 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeNotExpr((yyvsp[0].node), (yylsp[-1])); }
-#line 37449 "gram.c" /* yacc.c:1646  */
+#line 37464 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1731:
-#line 11510 "gram.y" /* yacc.c:1646  */
+  case 1733:
+#line 11519 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeNotExpr((yyvsp[0].node), (yylsp[-1])); }
-#line 37455 "gram.c" /* yacc.c:1646  */
+#line 37470 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1732:
-#line 11513 "gram.y" /* yacc.c:1646  */
+  case 1734:
+#line 11522 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_LIKE, "~~",
 												   (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1]));
 				}
-#line 37464 "gram.c" /* yacc.c:1646  */
+#line 37479 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1733:
-#line 11518 "gram.y" /* yacc.c:1646  */
+  case 1735:
+#line 11527 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall(SystemFuncName("like_escape"),
 											   list_make2((yyvsp[-2].node), (yyvsp[0].node)),
@@ -37472,20 +37487,20 @@
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_LIKE, "~~",
 												   (yyvsp[-4].node), (Node *) n, (yylsp[-3]));
 				}
-#line 37476 "gram.c" /* yacc.c:1646  */
+#line 37491 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1734:
-#line 11526 "gram.y" /* yacc.c:1646  */
+  case 1736:
+#line 11535 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_LIKE, "!~~",
 												   (yyvsp[-3].node), (yyvsp[0].node), (yylsp[-2]));
 				}
-#line 37485 "gram.c" /* yacc.c:1646  */
+#line 37500 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1735:
-#line 11531 "gram.y" /* yacc.c:1646  */
+  case 1737:
+#line 11540 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall(SystemFuncName("like_escape"),
 											   list_make2((yyvsp[-2].node), (yyvsp[0].node)),
@@ -37493,20 +37508,20 @@
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_LIKE, "!~~",
 												   (yyvsp[-5].node), (Node *) n, (yylsp[-4]));
 				}
-#line 37497 "gram.c" /* yacc.c:1646  */
+#line 37512 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1736:
-#line 11539 "gram.y" /* yacc.c:1646  */
+  case 1738:
+#line 11548 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_ILIKE, "~~*",
 												   (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1]));
 				}
-#line 37506 "gram.c" /* yacc.c:1646  */
+#line 37521 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1737:
-#line 11544 "gram.y" /* yacc.c:1646  */
+  case 1739:
+#line 11553 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall(SystemFuncName("like_escape"),
 											   list_make2((yyvsp[-2].node), (yyvsp[0].node)),
@@ -37514,20 +37529,20 @@
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_ILIKE, "~~*",
 												   (yyvsp[-4].node), (Node *) n, (yylsp[-3]));
 				}
-#line 37518 "gram.c" /* yacc.c:1646  */
+#line 37533 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1738:
-#line 11552 "gram.y" /* yacc.c:1646  */
+  case 1740:
+#line 11561 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_ILIKE, "!~~*",
 												   (yyvsp[-3].node), (yyvsp[0].node), (yylsp[-2]));
 				}
-#line 37527 "gram.c" /* yacc.c:1646  */
+#line 37542 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1739:
-#line 11557 "gram.y" /* yacc.c:1646  */
+  case 1741:
+#line 11566 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall(SystemFuncName("like_escape"),
 											   list_make2((yyvsp[-2].node), (yyvsp[0].node)),
@@ -37535,11 +37550,11 @@
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_ILIKE, "!~~*",
 												   (yyvsp[-5].node), (Node *) n, (yylsp[-4]));
 				}
-#line 37539 "gram.c" /* yacc.c:1646  */
+#line 37554 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1740:
-#line 11566 "gram.y" /* yacc.c:1646  */
+  case 1742:
+#line 11575 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall(SystemFuncName("similar_escape"),
 											   list_make2((yyvsp[0].node), makeNullAConst(-1)),
@@ -37547,11 +37562,11 @@
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_SIMILAR, "~",
 												   (yyvsp[-3].node), (Node *) n, (yylsp[-2]));
 				}
-#line 37551 "gram.c" /* yacc.c:1646  */
+#line 37566 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1741:
-#line 11574 "gram.y" /* yacc.c:1646  */
+  case 1743:
+#line 11583 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall(SystemFuncName("similar_escape"),
 											   list_make2((yyvsp[-2].node), (yyvsp[0].node)),
@@ -37559,11 +37574,11 @@
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_SIMILAR, "~",
 												   (yyvsp[-5].node), (Node *) n, (yylsp[-4]));
 				}
-#line 37563 "gram.c" /* yacc.c:1646  */
+#line 37578 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1742:
-#line 11582 "gram.y" /* yacc.c:1646  */
+  case 1744:
+#line 11591 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall(SystemFuncName("similar_escape"),
 											   list_make2((yyvsp[0].node), makeNullAConst(-1)),
@@ -37571,11 +37586,11 @@
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_SIMILAR, "!~",
 												   (yyvsp[-4].node), (Node *) n, (yylsp[-3]));
 				}
-#line 37575 "gram.c" /* yacc.c:1646  */
+#line 37590 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1743:
-#line 11590 "gram.y" /* yacc.c:1646  */
+  case 1745:
+#line 11599 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall(SystemFuncName("similar_escape"),
 											   list_make2((yyvsp[-2].node), (yyvsp[0].node)),
@@ -37583,11 +37598,11 @@
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_SIMILAR, "!~",
 												   (yyvsp[-6].node), (Node *) n, (yylsp[-5]));
 				}
-#line 37587 "gram.c" /* yacc.c:1646  */
+#line 37602 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1744:
-#line 11608 "gram.y" /* yacc.c:1646  */
+  case 1746:
+#line 11617 "gram.y" /* yacc.c:1646  */
     {
 					NullTest *n = makeNode(NullTest);
 					n->arg = (Expr *) (yyvsp[-2].node);
@@ -37595,11 +37610,11 @@
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *)n;
 				}
-#line 37599 "gram.c" /* yacc.c:1646  */
+#line 37614 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1745:
-#line 11616 "gram.y" /* yacc.c:1646  */
+  case 1747:
+#line 11625 "gram.y" /* yacc.c:1646  */
     {
 					NullTest *n = makeNode(NullTest);
 					n->arg = (Expr *) (yyvsp[-1].node);
@@ -37607,11 +37622,11 @@
 					n->location = (yylsp[0]);
 					(yyval.node) = (Node *)n;
 				}
-#line 37611 "gram.c" /* yacc.c:1646  */
+#line 37626 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1746:
-#line 11624 "gram.y" /* yacc.c:1646  */
+  case 1748:
+#line 11633 "gram.y" /* yacc.c:1646  */
     {
 					NullTest *n = makeNode(NullTest);
 					n->arg = (Expr *) (yyvsp[-3].node);
@@ -37619,11 +37634,11 @@
 					n->location = (yylsp[-2]);
 					(yyval.node) = (Node *)n;
 				}
-#line 37623 "gram.c" /* yacc.c:1646  */
+#line 37638 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1747:
-#line 11632 "gram.y" /* yacc.c:1646  */
+  case 1749:
+#line 11641 "gram.y" /* yacc.c:1646  */
     {
 					NullTest *n = makeNode(NullTest);
 					n->arg = (Expr *) (yyvsp[-1].node);
@@ -37631,11 +37646,11 @@
 					n->location = (yylsp[0]);
 					(yyval.node) = (Node *)n;
 				}
-#line 37635 "gram.c" /* yacc.c:1646  */
+#line 37650 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1748:
-#line 11640 "gram.y" /* yacc.c:1646  */
+  case 1750:
+#line 11649 "gram.y" /* yacc.c:1646  */
     {
 					if (list_length((yyvsp[-2].list)) != 2)
 						ereport(ERROR,
@@ -37651,11 +37666,11 @@
 											   list_concat((yyvsp[-2].list), (yyvsp[0].list)),
 											   (yylsp[-1]));
 				}
-#line 37655 "gram.c" /* yacc.c:1646  */
+#line 37670 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1749:
-#line 11656 "gram.y" /* yacc.c:1646  */
+  case 1751:
+#line 11665 "gram.y" /* yacc.c:1646  */
     {
 					BooleanTest *b = makeNode(BooleanTest);
 					b->arg = (Expr *) (yyvsp[-2].node);
@@ -37663,11 +37678,11 @@
 					b->location = (yylsp[-1]);
 					(yyval.node) = (Node *)b;
 				}
-#line 37667 "gram.c" /* yacc.c:1646  */
+#line 37682 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1750:
-#line 11664 "gram.y" /* yacc.c:1646  */
+  case 1752:
+#line 11673 "gram.y" /* yacc.c:1646  */
     {
 					BooleanTest *b = makeNode(BooleanTest);
 					b->arg = (Expr *) (yyvsp[-3].node);
@@ -37675,11 +37690,11 @@
 					b->location = (yylsp[-2]);
 					(yyval.node) = (Node *)b;
 				}
-#line 37679 "gram.c" /* yacc.c:1646  */
+#line 37694 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1751:
-#line 11672 "gram.y" /* yacc.c:1646  */
+  case 1753:
+#line 11681 "gram.y" /* yacc.c:1646  */
     {
 					BooleanTest *b = makeNode(BooleanTest);
 					b->arg = (Expr *) (yyvsp[-2].node);
@@ -37687,11 +37702,11 @@
 					b->location = (yylsp[-1]);
 					(yyval.node) = (Node *)b;
 				}
-#line 37691 "gram.c" /* yacc.c:1646  */
+#line 37706 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1752:
-#line 11680 "gram.y" /* yacc.c:1646  */
+  case 1754:
+#line 11689 "gram.y" /* yacc.c:1646  */
     {
 					BooleanTest *b = makeNode(BooleanTest);
 					b->arg = (Expr *) (yyvsp[-3].node);
@@ -37699,11 +37714,11 @@
 					b->location = (yylsp[-2]);
 					(yyval.node) = (Node *)b;
 				}
-#line 37703 "gram.c" /* yacc.c:1646  */
+#line 37718 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1753:
-#line 11688 "gram.y" /* yacc.c:1646  */
+  case 1755:
+#line 11697 "gram.y" /* yacc.c:1646  */
     {
 					BooleanTest *b = makeNode(BooleanTest);
 					b->arg = (Expr *) (yyvsp[-2].node);
@@ -37711,11 +37726,11 @@
 					b->location = (yylsp[-1]);
 					(yyval.node) = (Node *)b;
 				}
-#line 37715 "gram.c" /* yacc.c:1646  */
+#line 37730 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1754:
-#line 11696 "gram.y" /* yacc.c:1646  */
+  case 1756:
+#line 11705 "gram.y" /* yacc.c:1646  */
     {
 					BooleanTest *b = makeNode(BooleanTest);
 					b->arg = (Expr *) (yyvsp[-3].node);
@@ -37723,45 +37738,45 @@
 					b->location = (yylsp[-2]);
 					(yyval.node) = (Node *)b;
 				}
-#line 37727 "gram.c" /* yacc.c:1646  */
+#line 37742 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1755:
-#line 11704 "gram.y" /* yacc.c:1646  */
+  case 1757:
+#line 11713 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_DISTINCT, "=", (yyvsp[-4].node), (yyvsp[0].node), (yylsp[-3]));
 				}
-#line 37735 "gram.c" /* yacc.c:1646  */
+#line 37750 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1756:
-#line 11708 "gram.y" /* yacc.c:1646  */
+  case 1758:
+#line 11717 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeNotExpr((Node *) makeSimpleA_Expr(AEXPR_DISTINCT,
 															   "=", (yyvsp[-5].node), (yyvsp[0].node), (yylsp[-4])),
 									 (yylsp[-4]));
 				}
-#line 37745 "gram.c" /* yacc.c:1646  */
+#line 37760 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1757:
-#line 11714 "gram.y" /* yacc.c:1646  */
+  case 1759:
+#line 11723 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OF, "=", (yyvsp[-5].node), (Node *) (yyvsp[-1].list), (yylsp[-4]));
 				}
-#line 37753 "gram.c" /* yacc.c:1646  */
+#line 37768 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1758:
-#line 11718 "gram.y" /* yacc.c:1646  */
+  case 1760:
+#line 11727 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OF, "<>", (yyvsp[-6].node), (Node *) (yyvsp[-1].list), (yylsp[-5]));
 				}
-#line 37761 "gram.c" /* yacc.c:1646  */
+#line 37776 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1759:
-#line 11722 "gram.y" /* yacc.c:1646  */
+  case 1761:
+#line 11731 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_BETWEEN,
 												   "BETWEEN",
@@ -37769,11 +37784,11 @@
 												   (Node *) list_make2((yyvsp[-2].node), (yyvsp[0].node)),
 												   (yylsp[-4]));
 				}
-#line 37773 "gram.c" /* yacc.c:1646  */
+#line 37788 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1760:
-#line 11730 "gram.y" /* yacc.c:1646  */
+  case 1762:
+#line 11739 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_NOT_BETWEEN,
 												   "NOT BETWEEN",
@@ -37781,11 +37796,11 @@
 												   (Node *) list_make2((yyvsp[-2].node), (yyvsp[0].node)),
 												   (yylsp[-5]));
 				}
-#line 37785 "gram.c" /* yacc.c:1646  */
+#line 37800 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1761:
-#line 11738 "gram.y" /* yacc.c:1646  */
+  case 1763:
+#line 11747 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_BETWEEN_SYM,
 												   "BETWEEN SYMMETRIC",
@@ -37793,11 +37808,11 @@
 												   (Node *) list_make2((yyvsp[-2].node), (yyvsp[0].node)),
 												   (yylsp[-4]));
 				}
-#line 37797 "gram.c" /* yacc.c:1646  */
+#line 37812 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1762:
-#line 11746 "gram.y" /* yacc.c:1646  */
+  case 1764:
+#line 11755 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_NOT_BETWEEN_SYM,
 												   "NOT BETWEEN SYMMETRIC",
@@ -37805,11 +37820,11 @@
 												   (Node *) list_make2((yyvsp[-2].node), (yyvsp[0].node)),
 												   (yylsp[-5]));
 				}
-#line 37809 "gram.c" /* yacc.c:1646  */
+#line 37824 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1763:
-#line 11754 "gram.y" /* yacc.c:1646  */
+  case 1765:
+#line 11763 "gram.y" /* yacc.c:1646  */
     {
 					/* in_expr returns a SubLink or a list of a_exprs */
 					if (IsA((yyvsp[0].node), SubLink))
@@ -37829,11 +37844,11 @@
 						(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_IN, "=", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1]));
 					}
 				}
-#line 37833 "gram.c" /* yacc.c:1646  */
+#line 37848 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1764:
-#line 11774 "gram.y" /* yacc.c:1646  */
+  case 1766:
+#line 11783 "gram.y" /* yacc.c:1646  */
     {
 					/* in_expr returns a SubLink or a list of a_exprs */
 					if (IsA((yyvsp[0].node), SubLink))
@@ -37855,11 +37870,11 @@
 						(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_IN, "<>", (yyvsp[-3].node), (yyvsp[0].node), (yylsp[-2]));
 					}
 				}
-#line 37859 "gram.c" /* yacc.c:1646  */
+#line 37874 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1765:
-#line 11796 "gram.y" /* yacc.c:1646  */
+  case 1767:
+#line 11805 "gram.y" /* yacc.c:1646  */
     {
 					SubLink *n = makeNode(SubLink);
 					n->subLinkType = (yyvsp[-1].ival);
@@ -37870,22 +37885,22 @@
 					n->location = (yylsp[-2]);
 					(yyval.node) = (Node *)n;
 				}
-#line 37874 "gram.c" /* yacc.c:1646  */
+#line 37889 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1766:
-#line 11807 "gram.y" /* yacc.c:1646  */
+  case 1768:
+#line 11816 "gram.y" /* yacc.c:1646  */
     {
 					if ((yyvsp[-3].ival) == ANY_SUBLINK)
 						(yyval.node) = (Node *) makeA_Expr(AEXPR_OP_ANY, (yyvsp[-4].list), (yyvsp[-5].node), (yyvsp[-1].node), (yylsp[-4]));
 					else
 						(yyval.node) = (Node *) makeA_Expr(AEXPR_OP_ALL, (yyvsp[-4].list), (yyvsp[-5].node), (yyvsp[-1].node), (yylsp[-4]));
 				}
-#line 37885 "gram.c" /* yacc.c:1646  */
+#line 37900 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1767:
-#line 11814 "gram.y" /* yacc.c:1646  */
+  case 1769:
+#line 11823 "gram.y" /* yacc.c:1646  */
     {
 					/* Not sure how to get rid of the parentheses
 					 * but there are lots of shift/reduce errors without them.
@@ -37901,209 +37916,209 @@
 							 errmsg("UNIQUE predicate is not yet implemented"),
 							 parser_errposition((yylsp[-1]))));
 				}
-#line 37905 "gram.c" /* yacc.c:1646  */
+#line 37920 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1768:
-#line 11830 "gram.y" /* yacc.c:1646  */
+  case 1770:
+#line 11839 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_DOCUMENT, NULL, NIL,
 									 list_make1((yyvsp[-2].node)), (yylsp[-1]));
 				}
-#line 37914 "gram.c" /* yacc.c:1646  */
+#line 37929 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1769:
-#line 11835 "gram.y" /* yacc.c:1646  */
+  case 1771:
+#line 11844 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeNotExpr(makeXmlExpr(IS_DOCUMENT, NULL, NIL,
 												 list_make1((yyvsp[-3].node)), (yylsp[-2])),
 									 (yylsp[-2]));
 				}
-#line 37924 "gram.c" /* yacc.c:1646  */
+#line 37939 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1770:
-#line 11852 "gram.y" /* yacc.c:1646  */
+  case 1772:
+#line 11861 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 37930 "gram.c" /* yacc.c:1646  */
+#line 37945 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1771:
-#line 11854 "gram.y" /* yacc.c:1646  */
+  case 1773:
+#line 11863 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeTypeCast((yyvsp[-2].node), (yyvsp[0].typnam), (yylsp[-1])); }
-#line 37936 "gram.c" /* yacc.c:1646  */
+#line 37951 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1772:
-#line 11856 "gram.y" /* yacc.c:1646  */
+  case 1774:
+#line 11865 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", NULL, (yyvsp[0].node), (yylsp[-1])); }
-#line 37942 "gram.c" /* yacc.c:1646  */
+#line 37957 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1773:
-#line 11858 "gram.y" /* yacc.c:1646  */
+  case 1775:
+#line 11867 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = doNegate((yyvsp[0].node), (yylsp[-1])); }
-#line 37948 "gram.c" /* yacc.c:1646  */
+#line 37963 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1774:
-#line 11860 "gram.y" /* yacc.c:1646  */
+  case 1776:
+#line 11869 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37954 "gram.c" /* yacc.c:1646  */
+#line 37969 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1775:
-#line 11862 "gram.y" /* yacc.c:1646  */
+  case 1777:
+#line 11871 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "-", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37960 "gram.c" /* yacc.c:1646  */
+#line 37975 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1776:
-#line 11864 "gram.y" /* yacc.c:1646  */
+  case 1778:
+#line 11873 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "*", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37966 "gram.c" /* yacc.c:1646  */
+#line 37981 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1777:
-#line 11866 "gram.y" /* yacc.c:1646  */
+  case 1779:
+#line 11875 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "/", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37972 "gram.c" /* yacc.c:1646  */
+#line 37987 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1778:
-#line 11868 "gram.y" /* yacc.c:1646  */
+  case 1780:
+#line 11877 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "%", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37978 "gram.c" /* yacc.c:1646  */
+#line 37993 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1779:
-#line 11870 "gram.y" /* yacc.c:1646  */
+  case 1781:
+#line 11879 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "^", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37984 "gram.c" /* yacc.c:1646  */
+#line 37999 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1780:
-#line 11872 "gram.y" /* yacc.c:1646  */
+  case 1782:
+#line 11881 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37990 "gram.c" /* yacc.c:1646  */
+#line 38005 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1781:
-#line 11874 "gram.y" /* yacc.c:1646  */
+  case 1783:
+#line 11883 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, ">", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 37996 "gram.c" /* yacc.c:1646  */
+#line 38011 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1782:
-#line 11876 "gram.y" /* yacc.c:1646  */
+  case 1784:
+#line 11885 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "=", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 38002 "gram.c" /* yacc.c:1646  */
+#line 38017 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1783:
-#line 11878 "gram.y" /* yacc.c:1646  */
+  case 1785:
+#line 11887 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<=", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 38008 "gram.c" /* yacc.c:1646  */
+#line 38023 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1784:
-#line 11880 "gram.y" /* yacc.c:1646  */
+  case 1786:
+#line 11889 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, ">=", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 38014 "gram.c" /* yacc.c:1646  */
+#line 38029 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1785:
-#line 11882 "gram.y" /* yacc.c:1646  */
+  case 1787:
+#line 11891 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<>", (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 38020 "gram.c" /* yacc.c:1646  */
+#line 38035 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1786:
-#line 11884 "gram.y" /* yacc.c:1646  */
+  case 1788:
+#line 11893 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[-1].list), (yyvsp[-2].node), (yyvsp[0].node), (yylsp[-1])); }
-#line 38026 "gram.c" /* yacc.c:1646  */
+#line 38041 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1787:
-#line 11886 "gram.y" /* yacc.c:1646  */
+  case 1789:
+#line 11895 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[-1].list), NULL, (yyvsp[0].node), (yylsp[-1])); }
-#line 38032 "gram.c" /* yacc.c:1646  */
+#line 38047 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1788:
-#line 11888 "gram.y" /* yacc.c:1646  */
+  case 1790:
+#line 11897 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[0].list), (yyvsp[-1].node), NULL, (yylsp[0])); }
-#line 38038 "gram.c" /* yacc.c:1646  */
+#line 38053 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1789:
-#line 11890 "gram.y" /* yacc.c:1646  */
+  case 1791:
+#line 11899 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_DISTINCT, "=", (yyvsp[-4].node), (yyvsp[0].node), (yylsp[-3]));
 				}
-#line 38046 "gram.c" /* yacc.c:1646  */
+#line 38061 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1790:
-#line 11894 "gram.y" /* yacc.c:1646  */
+  case 1792:
+#line 11903 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeNotExpr((Node *) makeSimpleA_Expr(AEXPR_DISTINCT,
 															   "=", (yyvsp[-5].node), (yyvsp[0].node), (yylsp[-4])),
 									 (yylsp[-4]));
 				}
-#line 38056 "gram.c" /* yacc.c:1646  */
+#line 38071 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1791:
-#line 11900 "gram.y" /* yacc.c:1646  */
+  case 1793:
+#line 11909 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OF, "=", (yyvsp[-5].node), (Node *) (yyvsp[-1].list), (yylsp[-4]));
 				}
-#line 38064 "gram.c" /* yacc.c:1646  */
+#line 38079 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1792:
-#line 11904 "gram.y" /* yacc.c:1646  */
+  case 1794:
+#line 11913 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OF, "<>", (yyvsp[-6].node), (Node *) (yyvsp[-1].list), (yylsp[-5]));
 				}
-#line 38072 "gram.c" /* yacc.c:1646  */
+#line 38087 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1793:
-#line 11908 "gram.y" /* yacc.c:1646  */
+  case 1795:
+#line 11917 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_DOCUMENT, NULL, NIL,
 									 list_make1((yyvsp[-2].node)), (yylsp[-1]));
 				}
-#line 38081 "gram.c" /* yacc.c:1646  */
+#line 38096 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1794:
-#line 11913 "gram.y" /* yacc.c:1646  */
+  case 1796:
+#line 11922 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeNotExpr(makeXmlExpr(IS_DOCUMENT, NULL, NIL,
 												 list_make1((yyvsp[-3].node)), (yylsp[-2])),
 									 (yylsp[-2]));
 				}
-#line 38091 "gram.c" /* yacc.c:1646  */
+#line 38106 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1795:
-#line 11928 "gram.y" /* yacc.c:1646  */
+  case 1797:
+#line 11937 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 38097 "gram.c" /* yacc.c:1646  */
+#line 38112 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1796:
-#line 11929 "gram.y" /* yacc.c:1646  */
+  case 1798:
+#line 11938 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 38103 "gram.c" /* yacc.c:1646  */
+#line 38118 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1797:
-#line 11931 "gram.y" /* yacc.c:1646  */
+  case 1799:
+#line 11940 "gram.y" /* yacc.c:1646  */
     {
 					ParamRef *p = makeNode(ParamRef);
 					p->number = (yyvsp[-1].ival);
@@ -38118,11 +38133,11 @@
 					else
 						(yyval.node) = (Node *) p;
 				}
-#line 38122 "gram.c" /* yacc.c:1646  */
+#line 38137 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1798:
-#line 11946 "gram.y" /* yacc.c:1646  */
+  case 1800:
+#line 11955 "gram.y" /* yacc.c:1646  */
     {
 					if ((yyvsp[0].list))
 					{
@@ -38138,7 +38153,10 @@
 						 * AEXPR_PAREN nodes wrapping all explicitly
 						 * parenthesized subexpressions; this prevents bogus
 						 * warnings from being issued when the ordering has
-						 * been forced by parentheses.
+						 * been forced by parentheses.  Take care that an
+						 * AEXPR_PAREN node has the same exprLocation as its
+						 * child, so as not to cause surprising changes in
+						 * error cursor positioning.
 						 *
 						 * In principle we should not be relying on a GUC to
 						 * decide whether to insert AEXPR_PAREN nodes.
@@ -38147,28 +38165,29 @@
 						 * we'd just as soon not waste cycles on dummy parse
 						 * nodes if we don't have to.
 						 */
-						(yyval.node) = (Node *) makeA_Expr(AEXPR_PAREN, NIL, (yyvsp[-2].node), NULL, (yylsp[-3]));
+						(yyval.node) = (Node *) makeA_Expr(AEXPR_PAREN, NIL, (yyvsp[-2].node), NULL,
+												 exprLocation((yyvsp[-2].node)));
 					}
 					else
 						(yyval.node) = (yyvsp[-2].node);
 				}
-#line 38156 "gram.c" /* yacc.c:1646  */
+#line 38175 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1799:
-#line 11976 "gram.y" /* yacc.c:1646  */
+  case 1801:
+#line 11989 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 38162 "gram.c" /* yacc.c:1646  */
+#line 38181 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1800:
-#line 11978 "gram.y" /* yacc.c:1646  */
+  case 1802:
+#line 11991 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 38168 "gram.c" /* yacc.c:1646  */
+#line 38187 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1801:
-#line 11980 "gram.y" /* yacc.c:1646  */
+  case 1803:
+#line 11993 "gram.y" /* yacc.c:1646  */
     {
 					SubLink *n = makeNode(SubLink);
 					n->subLinkType = EXPR_SUBLINK;
@@ -38179,11 +38198,11 @@
 					n->location = (yylsp[0]);
 					(yyval.node) = (Node *)n;
 				}
-#line 38183 "gram.c" /* yacc.c:1646  */
+#line 38202 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1802:
-#line 11991 "gram.y" /* yacc.c:1646  */
+  case 1804:
+#line 12004 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Because the select_with_parens nonterminal is designed
@@ -38207,11 +38226,11 @@
 					a->indirection = check_indirection((yyvsp[0].list), yyscanner);
 					(yyval.node) = (Node *)a;
 				}
-#line 38211 "gram.c" /* yacc.c:1646  */
+#line 38230 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1803:
-#line 12015 "gram.y" /* yacc.c:1646  */
+  case 1805:
+#line 12028 "gram.y" /* yacc.c:1646  */
     {
 					SubLink *n = makeNode(SubLink);
 					n->subLinkType = EXISTS_SUBLINK;
@@ -38222,11 +38241,11 @@
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *)n;
 				}
-#line 38226 "gram.c" /* yacc.c:1646  */
+#line 38245 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1804:
-#line 12026 "gram.y" /* yacc.c:1646  */
+  case 1806:
+#line 12039 "gram.y" /* yacc.c:1646  */
     {
 					SubLink *n = makeNode(SubLink);
 					n->subLinkType = ARRAY_SUBLINK;
@@ -38237,11 +38256,11 @@
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *)n;
 				}
-#line 38241 "gram.c" /* yacc.c:1646  */
+#line 38260 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1805:
-#line 12037 "gram.y" /* yacc.c:1646  */
+  case 1807:
+#line 12050 "gram.y" /* yacc.c:1646  */
     {
 					A_ArrayExpr *n = (A_ArrayExpr *) (yyvsp[0].node);
 					Assert(IsA(n, A_ArrayExpr));
@@ -38249,11 +38268,11 @@
 					n->location = (yylsp[-1]);
 					(yyval.node) = (Node *)n;
 				}
-#line 38253 "gram.c" /* yacc.c:1646  */
+#line 38272 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1806:
-#line 12045 "gram.y" /* yacc.c:1646  */
+  case 1808:
+#line 12058 "gram.y" /* yacc.c:1646  */
     {
 					RowExpr *r = makeNode(RowExpr);
 					r->args = (yyvsp[0].list);
@@ -38263,11 +38282,11 @@
 					r->location = (yylsp[0]);
 					(yyval.node) = (Node *)r;
 				}
-#line 38267 "gram.c" /* yacc.c:1646  */
+#line 38286 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1807:
-#line 12055 "gram.y" /* yacc.c:1646  */
+  case 1809:
+#line 12068 "gram.y" /* yacc.c:1646  */
     {
 					RowExpr *r = makeNode(RowExpr);
 					r->args = (yyvsp[0].list);
@@ -38277,62 +38296,62 @@
 					r->location = (yylsp[0]);
 					(yyval.node) = (Node *)r;
 				}
-#line 38281 "gram.c" /* yacc.c:1646  */
+#line 38300 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1808:
-#line 12065 "gram.y" /* yacc.c:1646  */
+  case 1810:
+#line 12078 "gram.y" /* yacc.c:1646  */
     {
 				  GroupingFunc *g = makeNode(GroupingFunc);
 				  g->args = (yyvsp[-1].list);
 				  g->location = (yylsp[-3]);
 				  (yyval.node) = (Node *)g;
 			  }
-#line 38292 "gram.c" /* yacc.c:1646  */
+#line 38311 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1809:
-#line 12074 "gram.y" /* yacc.c:1646  */
+  case 1811:
+#line 12087 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall((yyvsp[-2].list), NIL, (yylsp[-2]));
 				}
-#line 38300 "gram.c" /* yacc.c:1646  */
+#line 38319 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1810:
-#line 12078 "gram.y" /* yacc.c:1646  */
+  case 1812:
+#line 12091 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall((yyvsp[-4].list), (yyvsp[-2].list), (yylsp[-4]));
 					n->agg_order = (yyvsp[-1].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 38310 "gram.c" /* yacc.c:1646  */
+#line 38329 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1811:
-#line 12084 "gram.y" /* yacc.c:1646  */
+  case 1813:
+#line 12097 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall((yyvsp[-5].list), list_make1((yyvsp[-2].node)), (yylsp[-5]));
 					n->func_variadic = TRUE;
 					n->agg_order = (yyvsp[-1].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 38321 "gram.c" /* yacc.c:1646  */
+#line 38340 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1812:
-#line 12091 "gram.y" /* yacc.c:1646  */
+  case 1814:
+#line 12104 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall((yyvsp[-7].list), lappend((yyvsp[-5].list), (yyvsp[-2].node)), (yylsp[-7]));
 					n->func_variadic = TRUE;
 					n->agg_order = (yyvsp[-1].list);
 					(yyval.node) = (Node *)n;
 				}
-#line 38332 "gram.c" /* yacc.c:1646  */
+#line 38351 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1813:
-#line 12098 "gram.y" /* yacc.c:1646  */
+  case 1815:
+#line 12111 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall((yyvsp[-5].list), (yyvsp[-2].list), (yylsp[-5]));
 					n->agg_order = (yyvsp[-1].list);
@@ -38342,22 +38361,22 @@
 					 */
 					(yyval.node) = (Node *)n;
 				}
-#line 38346 "gram.c" /* yacc.c:1646  */
+#line 38365 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1814:
-#line 12108 "gram.y" /* yacc.c:1646  */
+  case 1816:
+#line 12121 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = makeFuncCall((yyvsp[-5].list), (yyvsp[-2].list), (yylsp[-5]));
 					n->agg_order = (yyvsp[-1].list);
 					n->agg_distinct = TRUE;
 					(yyval.node) = (Node *)n;
 				}
-#line 38357 "gram.c" /* yacc.c:1646  */
+#line 38376 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1815:
-#line 12115 "gram.y" /* yacc.c:1646  */
+  case 1817:
+#line 12128 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * We consider AGGREGATE(*) to invoke a parameterless
@@ -38373,11 +38392,11 @@
 					n->agg_star = TRUE;
 					(yyval.node) = (Node *)n;
 				}
-#line 38377 "gram.c" /* yacc.c:1646  */
+#line 38396 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1816:
-#line 12143 "gram.y" /* yacc.c:1646  */
+  case 1818:
+#line 12156 "gram.y" /* yacc.c:1646  */
     {
 					FuncCall *n = (FuncCall *) (yyvsp[-3].node);
 					/*
@@ -38412,39 +38431,39 @@
 					n->over = (yyvsp[0].windef);
 					(yyval.node) = (Node *) n;
 				}
-#line 38416 "gram.c" /* yacc.c:1646  */
+#line 38435 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1817:
-#line 12178 "gram.y" /* yacc.c:1646  */
+  case 1819:
+#line 12191 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 38422 "gram.c" /* yacc.c:1646  */
+#line 38441 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1818:
-#line 12188 "gram.y" /* yacc.c:1646  */
+  case 1820:
+#line 12201 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 38428 "gram.c" /* yacc.c:1646  */
+#line 38447 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1819:
-#line 12189 "gram.y" /* yacc.c:1646  */
+  case 1821:
+#line 12202 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 38434 "gram.c" /* yacc.c:1646  */
+#line 38453 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1820:
-#line 12197 "gram.y" /* yacc.c:1646  */
+  case 1822:
+#line 12210 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("pg_collation_for"),
 											   list_make1((yyvsp[-1].node)),
 											   (yylsp[-4]));
 				}
-#line 38444 "gram.c" /* yacc.c:1646  */
+#line 38463 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1821:
-#line 12203 "gram.y" /* yacc.c:1646  */
+  case 1823:
+#line 12216 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Translate as "'now'::text::date".
@@ -38470,11 +38489,11 @@
 					n = makeStringConstCast("now", -1, SystemTypeName("text"));
 					(yyval.node) = makeTypeCast(n, SystemTypeName("date"), (yylsp[0]));
 				}
-#line 38474 "gram.c" /* yacc.c:1646  */
+#line 38493 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1822:
-#line 12229 "gram.y" /* yacc.c:1646  */
+  case 1824:
+#line 12242 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Translate as "'now'::text::timetz".
@@ -38484,11 +38503,11 @@
 					n = makeStringConstCast("now", -1, SystemTypeName("text"));
 					(yyval.node) = makeTypeCast(n, SystemTypeName("timetz"), (yylsp[0]));
 				}
-#line 38488 "gram.c" /* yacc.c:1646  */
+#line 38507 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1823:
-#line 12239 "gram.y" /* yacc.c:1646  */
+  case 1825:
+#line 12252 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Translate as "'now'::text::timetz(n)".
@@ -38501,11 +38520,11 @@
 					d->typmods = list_make1(makeIntConst((yyvsp[-1].ival), (yylsp[-1])));
 					(yyval.node) = makeTypeCast(n, d, (yylsp[-3]));
 				}
-#line 38505 "gram.c" /* yacc.c:1646  */
+#line 38524 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1824:
-#line 12252 "gram.y" /* yacc.c:1646  */
+  case 1826:
+#line 12265 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Translate as "now()", since we have a function that
@@ -38513,11 +38532,11 @@
 					 */
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("now"), NIL, (yylsp[0]));
 				}
-#line 38517 "gram.c" /* yacc.c:1646  */
+#line 38536 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1825:
-#line 12260 "gram.y" /* yacc.c:1646  */
+  case 1827:
+#line 12273 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Translate as "'now'::text::timestamptz(n)".
@@ -38530,11 +38549,11 @@
 					d->typmods = list_make1(makeIntConst((yyvsp[-1].ival), (yylsp[-1])));
 					(yyval.node) = makeTypeCast(n, d, (yylsp[-3]));
 				}
-#line 38534 "gram.c" /* yacc.c:1646  */
+#line 38553 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1826:
-#line 12273 "gram.y" /* yacc.c:1646  */
+  case 1828:
+#line 12286 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Translate as "'now'::text::time".
@@ -38544,11 +38563,11 @@
 					n = makeStringConstCast("now", -1, SystemTypeName("text"));
 					(yyval.node) = makeTypeCast((Node *)n, SystemTypeName("time"), (yylsp[0]));
 				}
-#line 38548 "gram.c" /* yacc.c:1646  */
+#line 38567 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1827:
-#line 12283 "gram.y" /* yacc.c:1646  */
+  case 1829:
+#line 12296 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Translate as "'now'::text::time(n)".
@@ -38561,11 +38580,11 @@
 					d->typmods = list_make1(makeIntConst((yyvsp[-1].ival), (yylsp[-1])));
 					(yyval.node) = makeTypeCast((Node *)n, d, (yylsp[-3]));
 				}
-#line 38565 "gram.c" /* yacc.c:1646  */
+#line 38584 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1828:
-#line 12296 "gram.y" /* yacc.c:1646  */
+  case 1830:
+#line 12309 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Translate as "'now'::text::timestamp".
@@ -38575,11 +38594,11 @@
 					n = makeStringConstCast("now", -1, SystemTypeName("text"));
 					(yyval.node) = makeTypeCast(n, SystemTypeName("timestamp"), (yylsp[0]));
 				}
-#line 38579 "gram.c" /* yacc.c:1646  */
+#line 38598 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1829:
-#line 12306 "gram.y" /* yacc.c:1646  */
+  case 1831:
+#line 12319 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Translate as "'now'::text::timestamp(n)".
@@ -38592,73 +38611,73 @@
 					d->typmods = list_make1(makeIntConst((yyvsp[-1].ival), (yylsp[-1])));
 					(yyval.node) = makeTypeCast(n, d, (yylsp[-3]));
 				}
-#line 38596 "gram.c" /* yacc.c:1646  */
+#line 38615 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1830:
-#line 12319 "gram.y" /* yacc.c:1646  */
+  case 1832:
+#line 12332 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("current_user"), NIL, (yylsp[0]));
 				}
-#line 38604 "gram.c" /* yacc.c:1646  */
+#line 38623 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1831:
-#line 12323 "gram.y" /* yacc.c:1646  */
+  case 1833:
+#line 12336 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("current_user"), NIL, (yylsp[0]));
 				}
-#line 38612 "gram.c" /* yacc.c:1646  */
+#line 38631 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1832:
-#line 12327 "gram.y" /* yacc.c:1646  */
+  case 1834:
+#line 12340 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("session_user"), NIL, (yylsp[0]));
 				}
-#line 38620 "gram.c" /* yacc.c:1646  */
+#line 38639 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1833:
-#line 12331 "gram.y" /* yacc.c:1646  */
+  case 1835:
+#line 12344 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("current_user"), NIL, (yylsp[0]));
 				}
-#line 38628 "gram.c" /* yacc.c:1646  */
+#line 38647 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1834:
-#line 12335 "gram.y" /* yacc.c:1646  */
+  case 1836:
+#line 12348 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("current_database"), NIL, (yylsp[0]));
 				}
-#line 38636 "gram.c" /* yacc.c:1646  */
+#line 38655 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1835:
-#line 12339 "gram.y" /* yacc.c:1646  */
+  case 1837:
+#line 12352 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("current_schema"), NIL, (yylsp[0]));
 				}
-#line 38644 "gram.c" /* yacc.c:1646  */
+#line 38663 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1836:
-#line 12343 "gram.y" /* yacc.c:1646  */
+  case 1838:
+#line 12356 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeTypeCast((yyvsp[-3].node), (yyvsp[-1].typnam), (yylsp[-5])); }
-#line 38650 "gram.c" /* yacc.c:1646  */
+#line 38669 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1837:
-#line 12345 "gram.y" /* yacc.c:1646  */
+  case 1839:
+#line 12358 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("date_part"), (yyvsp[-1].list), (yylsp[-3]));
 				}
-#line 38658 "gram.c" /* yacc.c:1646  */
+#line 38677 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1838:
-#line 12349 "gram.y" /* yacc.c:1646  */
+  case 1840:
+#line 12362 "gram.y" /* yacc.c:1646  */
     {
 					/* overlay(A PLACING B FROM C FOR D) is converted to
 					 * overlay(A, B, C, D)
@@ -38667,31 +38686,31 @@
 					 */
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("overlay"), (yyvsp[-1].list), (yylsp[-3]));
 				}
-#line 38671 "gram.c" /* yacc.c:1646  */
+#line 38690 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1839:
-#line 12358 "gram.y" /* yacc.c:1646  */
+  case 1841:
+#line 12371 "gram.y" /* yacc.c:1646  */
     {
 					/* position(A in B) is converted to position(B, A) */
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("position"), (yyvsp[-1].list), (yylsp[-3]));
 				}
-#line 38680 "gram.c" /* yacc.c:1646  */
+#line 38699 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1840:
-#line 12363 "gram.y" /* yacc.c:1646  */
+  case 1842:
+#line 12376 "gram.y" /* yacc.c:1646  */
     {
 					/* substring(A from B for C) is converted to
 					 * substring(A, B, C) - thomas 2000-11-28
 					 */
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("substring"), (yyvsp[-1].list), (yylsp[-3]));
 				}
-#line 38691 "gram.c" /* yacc.c:1646  */
+#line 38710 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1841:
-#line 12370 "gram.y" /* yacc.c:1646  */
+  case 1843:
+#line 12383 "gram.y" /* yacc.c:1646  */
     {
 					/* TREAT(expr AS target) converts expr of a particular type to target,
 					 * which is defined to be a subtype of the original expression.
@@ -38706,65 +38725,65 @@
 												list_make1((yyvsp[-3].node)),
 												(yylsp[-5]));
 				}
-#line 38710 "gram.c" /* yacc.c:1646  */
+#line 38729 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1842:
-#line 12385 "gram.y" /* yacc.c:1646  */
+  case 1844:
+#line 12398 "gram.y" /* yacc.c:1646  */
     {
 					/* various trim expressions are defined in SQL
 					 * - thomas 1997-07-19
 					 */
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("btrim"), (yyvsp[-1].list), (yylsp[-4]));
 				}
-#line 38721 "gram.c" /* yacc.c:1646  */
+#line 38740 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1843:
-#line 12392 "gram.y" /* yacc.c:1646  */
+  case 1845:
+#line 12405 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("ltrim"), (yyvsp[-1].list), (yylsp[-4]));
 				}
-#line 38729 "gram.c" /* yacc.c:1646  */
+#line 38748 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1844:
-#line 12396 "gram.y" /* yacc.c:1646  */
+  case 1846:
+#line 12409 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("rtrim"), (yyvsp[-1].list), (yylsp[-4]));
 				}
-#line 38737 "gram.c" /* yacc.c:1646  */
+#line 38756 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1845:
-#line 12400 "gram.y" /* yacc.c:1646  */
+  case 1847:
+#line 12413 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("btrim"), (yyvsp[-1].list), (yylsp[-3]));
 				}
-#line 38745 "gram.c" /* yacc.c:1646  */
+#line 38764 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1846:
-#line 12404 "gram.y" /* yacc.c:1646  */
+  case 1848:
+#line 12417 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_NULLIF, "=", (yyvsp[-3].node), (yyvsp[-1].node), (yylsp[-5]));
 				}
-#line 38753 "gram.c" /* yacc.c:1646  */
+#line 38772 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1847:
-#line 12408 "gram.y" /* yacc.c:1646  */
+  case 1849:
+#line 12421 "gram.y" /* yacc.c:1646  */
     {
 					CoalesceExpr *c = makeNode(CoalesceExpr);
 					c->args = (yyvsp[-1].list);
 					c->location = (yylsp[-3]);
 					(yyval.node) = (Node *)c;
 				}
-#line 38764 "gram.c" /* yacc.c:1646  */
+#line 38783 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1848:
-#line 12415 "gram.y" /* yacc.c:1646  */
+  case 1850:
+#line 12428 "gram.y" /* yacc.c:1646  */
     {
 					MinMaxExpr *v = makeNode(MinMaxExpr);
 					v->args = (yyvsp[-1].list);
@@ -38772,11 +38791,11 @@
 					v->location = (yylsp[-3]);
 					(yyval.node) = (Node *)v;
 				}
-#line 38776 "gram.c" /* yacc.c:1646  */
+#line 38795 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1849:
-#line 12423 "gram.y" /* yacc.c:1646  */
+  case 1851:
+#line 12436 "gram.y" /* yacc.c:1646  */
     {
 					MinMaxExpr *v = makeNode(MinMaxExpr);
 					v->args = (yyvsp[-1].list);
@@ -38784,69 +38803,69 @@
 					v->location = (yylsp[-3]);
 					(yyval.node) = (Node *)v;
 				}
-#line 38788 "gram.c" /* yacc.c:1646  */
+#line 38807 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1850:
-#line 12431 "gram.y" /* yacc.c:1646  */
+  case 1852:
+#line 12444 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_XMLCONCAT, NULL, NIL, (yyvsp[-1].list), (yylsp[-3]));
 				}
-#line 38796 "gram.c" /* yacc.c:1646  */
+#line 38815 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1851:
-#line 12435 "gram.y" /* yacc.c:1646  */
+  case 1853:
+#line 12448 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[-1].str), NIL, NIL, (yylsp[-4]));
 				}
-#line 38804 "gram.c" /* yacc.c:1646  */
+#line 38823 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1852:
-#line 12439 "gram.y" /* yacc.c:1646  */
+  case 1854:
+#line 12452 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[-3].str), (yyvsp[-1].list), NIL, (yylsp[-6]));
 				}
-#line 38812 "gram.c" /* yacc.c:1646  */
+#line 38831 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1853:
-#line 12443 "gram.y" /* yacc.c:1646  */
+  case 1855:
+#line 12456 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[-3].str), NIL, (yyvsp[-1].list), (yylsp[-6]));
 				}
-#line 38820 "gram.c" /* yacc.c:1646  */
+#line 38839 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1854:
-#line 12447 "gram.y" /* yacc.c:1646  */
+  case 1856:
+#line 12460 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[-5].str), (yyvsp[-3].list), (yyvsp[-1].list), (yylsp[-8]));
 				}
-#line 38828 "gram.c" /* yacc.c:1646  */
+#line 38847 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1855:
-#line 12451 "gram.y" /* yacc.c:1646  */
+  case 1857:
+#line 12464 "gram.y" /* yacc.c:1646  */
     {
 					/* xmlexists(A PASSING [BY REF] B [BY REF]) is
 					 * converted to xmlexists(A, B)*/
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("xmlexists"), list_make2((yyvsp[-2].node), (yyvsp[-1].node)), (yylsp[-4]));
 				}
-#line 38838 "gram.c" /* yacc.c:1646  */
+#line 38857 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1856:
-#line 12457 "gram.y" /* yacc.c:1646  */
+  case 1858:
+#line 12470 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_XMLFOREST, NULL, (yyvsp[-1].list), NIL, (yylsp[-3]));
 				}
-#line 38846 "gram.c" /* yacc.c:1646  */
+#line 38865 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1857:
-#line 12461 "gram.y" /* yacc.c:1646  */
+  case 1859:
+#line 12474 "gram.y" /* yacc.c:1646  */
     {
 					XmlExpr *x = (XmlExpr *)
 						makeXmlExpr(IS_XMLPARSE, NULL, NIL,
@@ -38855,36 +38874,36 @@
 					x->xmloption = (yyvsp[-3].ival);
 					(yyval.node) = (Node *)x;
 				}
-#line 38859 "gram.c" /* yacc.c:1646  */
+#line 38878 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1858:
-#line 12470 "gram.y" /* yacc.c:1646  */
+  case 1860:
+#line 12483 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_XMLPI, (yyvsp[-1].str), NULL, NIL, (yylsp[-4]));
 				}
-#line 38867 "gram.c" /* yacc.c:1646  */
+#line 38886 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1859:
-#line 12474 "gram.y" /* yacc.c:1646  */
+  case 1861:
+#line 12487 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_XMLPI, (yyvsp[-3].str), NULL, list_make1((yyvsp[-1].node)), (yylsp[-6]));
 				}
-#line 38875 "gram.c" /* yacc.c:1646  */
+#line 38894 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1860:
-#line 12478 "gram.y" /* yacc.c:1646  */
+  case 1862:
+#line 12491 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeXmlExpr(IS_XMLROOT, NULL, NIL,
 									 list_make3((yyvsp[-4].node), (yyvsp[-2].node), (yyvsp[-1].node)), (yylsp[-6]));
 				}
-#line 38884 "gram.c" /* yacc.c:1646  */
+#line 38903 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1861:
-#line 12483 "gram.y" /* yacc.c:1646  */
+  case 1863:
+#line 12496 "gram.y" /* yacc.c:1646  */
     {
 					XmlSerialize *n = makeNode(XmlSerialize);
 					n->xmloption = (yyvsp[-4].ival);
@@ -38893,65 +38912,65 @@
 					n->location = (yylsp[-6]);
 					(yyval.node) = (Node *)n;
 				}
-#line 38897 "gram.c" /* yacc.c:1646  */
+#line 38916 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1862:
-#line 12497 "gram.y" /* yacc.c:1646  */
+  case 1864:
+#line 12510 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 38903 "gram.c" /* yacc.c:1646  */
+#line 38922 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1863:
-#line 12499 "gram.y" /* yacc.c:1646  */
+  case 1865:
+#line 12512 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeNullAConst(-1); }
-#line 38909 "gram.c" /* yacc.c:1646  */
+#line 38928 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1864:
-#line 12503 "gram.y" /* yacc.c:1646  */
+  case 1866:
+#line 12516 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeIntConst(XML_STANDALONE_YES, -1); }
-#line 38915 "gram.c" /* yacc.c:1646  */
+#line 38934 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1865:
-#line 12505 "gram.y" /* yacc.c:1646  */
+  case 1867:
+#line 12518 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeIntConst(XML_STANDALONE_NO, -1); }
-#line 38921 "gram.c" /* yacc.c:1646  */
+#line 38940 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1866:
-#line 12507 "gram.y" /* yacc.c:1646  */
+  case 1868:
+#line 12520 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeIntConst(XML_STANDALONE_NO_VALUE, -1); }
-#line 38927 "gram.c" /* yacc.c:1646  */
+#line 38946 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1867:
-#line 12509 "gram.y" /* yacc.c:1646  */
+  case 1869:
+#line 12522 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = makeIntConst(XML_STANDALONE_OMITTED, -1); }
-#line 38933 "gram.c" /* yacc.c:1646  */
+#line 38952 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1868:
-#line 12512 "gram.y" /* yacc.c:1646  */
+  case 1870:
+#line 12525 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 38939 "gram.c" /* yacc.c:1646  */
+#line 38958 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1869:
-#line 12515 "gram.y" /* yacc.c:1646  */
+  case 1871:
+#line 12528 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].target)); }
-#line 38945 "gram.c" /* yacc.c:1646  */
+#line 38964 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1870:
-#line 12516 "gram.y" /* yacc.c:1646  */
+  case 1872:
+#line 12529 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].target)); }
-#line 38951 "gram.c" /* yacc.c:1646  */
+#line 38970 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1871:
-#line 12520 "gram.y" /* yacc.c:1646  */
+  case 1873:
+#line 12533 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = (yyvsp[0].str);
@@ -38959,11 +38978,11 @@
 					(yyval.target)->val = (Node *) (yyvsp[-2].node);
 					(yyval.target)->location = (yylsp[-2]);
 				}
-#line 38963 "gram.c" /* yacc.c:1646  */
+#line 38982 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1872:
-#line 12528 "gram.y" /* yacc.c:1646  */
+  case 1874:
+#line 12541 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = NULL;
@@ -38971,137 +38990,137 @@
 					(yyval.target)->val = (Node *) (yyvsp[0].node);
 					(yyval.target)->location = (yylsp[0]);
 				}
-#line 38975 "gram.c" /* yacc.c:1646  */
+#line 38994 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1873:
-#line 12537 "gram.y" /* yacc.c:1646  */
+  case 1875:
+#line 12550 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = XMLOPTION_DOCUMENT; }
-#line 38981 "gram.c" /* yacc.c:1646  */
+#line 39000 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1874:
-#line 12538 "gram.y" /* yacc.c:1646  */
+  case 1876:
+#line 12551 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = XMLOPTION_CONTENT; }
-#line 38987 "gram.c" /* yacc.c:1646  */
+#line 39006 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1875:
-#line 12541 "gram.y" /* yacc.c:1646  */
+  case 1877:
+#line 12554 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = TRUE; }
-#line 38993 "gram.c" /* yacc.c:1646  */
+#line 39012 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1876:
-#line 12542 "gram.y" /* yacc.c:1646  */
+  case 1878:
+#line 12555 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 38999 "gram.c" /* yacc.c:1646  */
+#line 39018 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1877:
-#line 12543 "gram.y" /* yacc.c:1646  */
+  case 1879:
+#line 12556 "gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = FALSE; }
-#line 39005 "gram.c" /* yacc.c:1646  */
+#line 39024 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1878:
-#line 12549 "gram.y" /* yacc.c:1646  */
+  case 1880:
+#line 12562 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (yyvsp[0].node);
 				}
-#line 39013 "gram.c" /* yacc.c:1646  */
+#line 39032 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1879:
-#line 12553 "gram.y" /* yacc.c:1646  */
+  case 1881:
+#line 12566 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (yyvsp[-2].node);
 				}
-#line 39021 "gram.c" /* yacc.c:1646  */
+#line 39040 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1880:
-#line 12557 "gram.y" /* yacc.c:1646  */
+  case 1882:
+#line 12570 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (yyvsp[0].node);
 				}
-#line 39029 "gram.c" /* yacc.c:1646  */
+#line 39048 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1881:
-#line 12561 "gram.y" /* yacc.c:1646  */
+  case 1883:
+#line 12574 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (yyvsp[-2].node);
 				}
-#line 39037 "gram.c" /* yacc.c:1646  */
+#line 39056 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1882:
-#line 12571 "gram.y" /* yacc.c:1646  */
+  case 1884:
+#line 12584 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 39043 "gram.c" /* yacc.c:1646  */
+#line 39062 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1883:
-#line 12572 "gram.y" /* yacc.c:1646  */
+  case 1885:
+#line 12585 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 39049 "gram.c" /* yacc.c:1646  */
+#line 39068 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1884:
-#line 12576 "gram.y" /* yacc.c:1646  */
+  case 1886:
+#line 12589 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[-1].node); }
-#line 39055 "gram.c" /* yacc.c:1646  */
+#line 39074 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1885:
-#line 12577 "gram.y" /* yacc.c:1646  */
+  case 1887:
+#line 12590 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 39061 "gram.c" /* yacc.c:1646  */
+#line 39080 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1886:
-#line 12585 "gram.y" /* yacc.c:1646  */
+  case 1888:
+#line 12598 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 39067 "gram.c" /* yacc.c:1646  */
+#line 39086 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1887:
-#line 12586 "gram.y" /* yacc.c:1646  */
+  case 1889:
+#line 12599 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 39073 "gram.c" /* yacc.c:1646  */
+#line 39092 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1888:
-#line 12590 "gram.y" /* yacc.c:1646  */
+  case 1890:
+#line 12603 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].windef)); }
-#line 39079 "gram.c" /* yacc.c:1646  */
+#line 39098 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1889:
-#line 12592 "gram.y" /* yacc.c:1646  */
+  case 1891:
+#line 12605 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].windef)); }
-#line 39085 "gram.c" /* yacc.c:1646  */
+#line 39104 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1890:
-#line 12597 "gram.y" /* yacc.c:1646  */
+  case 1892:
+#line 12610 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = (yyvsp[0].windef);
 					n->name = (yyvsp[-2].str);
 					(yyval.windef) = n;
 				}
-#line 39095 "gram.c" /* yacc.c:1646  */
+#line 39114 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1891:
-#line 12605 "gram.y" /* yacc.c:1646  */
+  case 1893:
+#line 12618 "gram.y" /* yacc.c:1646  */
     { (yyval.windef) = (yyvsp[0].windef); }
-#line 39101 "gram.c" /* yacc.c:1646  */
+#line 39120 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1892:
-#line 12607 "gram.y" /* yacc.c:1646  */
+  case 1894:
+#line 12620 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = makeNode(WindowDef);
 					n->name = (yyvsp[0].str);
@@ -39114,17 +39133,17 @@
 					n->location = (yylsp[0]);
 					(yyval.windef) = n;
 				}
-#line 39118 "gram.c" /* yacc.c:1646  */
+#line 39137 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1893:
-#line 12620 "gram.y" /* yacc.c:1646  */
+  case 1895:
+#line 12633 "gram.y" /* yacc.c:1646  */
     { (yyval.windef) = NULL; }
-#line 39124 "gram.c" /* yacc.c:1646  */
+#line 39143 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1894:
-#line 12625 "gram.y" /* yacc.c:1646  */
+  case 1896:
+#line 12638 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = makeNode(WindowDef);
 					n->name = NULL;
@@ -39138,35 +39157,35 @@
 					n->location = (yylsp[-5]);
 					(yyval.windef) = n;
 				}
-#line 39142 "gram.c" /* yacc.c:1646  */
+#line 39161 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1895:
-#line 12650 "gram.y" /* yacc.c:1646  */
+  case 1897:
+#line 12663 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 39148 "gram.c" /* yacc.c:1646  */
+#line 39167 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1896:
-#line 12651 "gram.y" /* yacc.c:1646  */
+  case 1898:
+#line 12664 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 39154 "gram.c" /* yacc.c:1646  */
+#line 39173 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1897:
-#line 12654 "gram.y" /* yacc.c:1646  */
+  case 1899:
+#line 12667 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 39160 "gram.c" /* yacc.c:1646  */
+#line 39179 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1898:
-#line 12655 "gram.y" /* yacc.c:1646  */
+  case 1900:
+#line 12668 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 39166 "gram.c" /* yacc.c:1646  */
+#line 39185 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1899:
-#line 12667 "gram.y" /* yacc.c:1646  */
+  case 1901:
+#line 12680 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = (yyvsp[0].windef);
 					n->frameOptions |= FRAMEOPTION_NONDEFAULT | FRAMEOPTION_RANGE;
@@ -39184,21 +39203,21 @@
 								 parser_errposition((yylsp[-1]))));
 					(yyval.windef) = n;
 				}
-#line 39188 "gram.c" /* yacc.c:1646  */
+#line 39207 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1900:
-#line 12685 "gram.y" /* yacc.c:1646  */
+  case 1902:
+#line 12698 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = (yyvsp[0].windef);
 					n->frameOptions |= FRAMEOPTION_NONDEFAULT | FRAMEOPTION_ROWS;
 					(yyval.windef) = n;
 				}
-#line 39198 "gram.c" /* yacc.c:1646  */
+#line 39217 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1901:
-#line 12691 "gram.y" /* yacc.c:1646  */
+  case 1903:
+#line 12704 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = makeNode(WindowDef);
 					n->frameOptions = FRAMEOPTION_DEFAULTS;
@@ -39206,11 +39225,11 @@
 					n->endOffset = NULL;
 					(yyval.windef) = n;
 				}
-#line 39210 "gram.c" /* yacc.c:1646  */
+#line 39229 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1902:
-#line 12701 "gram.y" /* yacc.c:1646  */
+  case 1904:
+#line 12714 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = (yyvsp[0].windef);
 					/* reject invalid cases */
@@ -39227,11 +39246,11 @@
 					n->frameOptions |= FRAMEOPTION_END_CURRENT_ROW;
 					(yyval.windef) = n;
 				}
-#line 39231 "gram.c" /* yacc.c:1646  */
+#line 39250 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1903:
-#line 12718 "gram.y" /* yacc.c:1646  */
+  case 1905:
+#line 12731 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n1 = (yyvsp[-2].windef);
 					WindowDef *n2 = (yyvsp[0].windef);
@@ -39268,11 +39287,11 @@
 					n1->endOffset = n2->startOffset;
 					(yyval.windef) = n1;
 				}
-#line 39272 "gram.c" /* yacc.c:1646  */
+#line 39291 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1904:
-#line 12763 "gram.y" /* yacc.c:1646  */
+  case 1906:
+#line 12776 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = makeNode(WindowDef);
 					n->frameOptions = FRAMEOPTION_START_UNBOUNDED_PRECEDING;
@@ -39280,11 +39299,11 @@
 					n->endOffset = NULL;
 					(yyval.windef) = n;
 				}
-#line 39284 "gram.c" /* yacc.c:1646  */
+#line 39303 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1905:
-#line 12771 "gram.y" /* yacc.c:1646  */
+  case 1907:
+#line 12784 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = makeNode(WindowDef);
 					n->frameOptions = FRAMEOPTION_START_UNBOUNDED_FOLLOWING;
@@ -39292,11 +39311,11 @@
 					n->endOffset = NULL;
 					(yyval.windef) = n;
 				}
-#line 39296 "gram.c" /* yacc.c:1646  */
+#line 39315 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1906:
-#line 12779 "gram.y" /* yacc.c:1646  */
+  case 1908:
+#line 12792 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = makeNode(WindowDef);
 					n->frameOptions = FRAMEOPTION_START_CURRENT_ROW;
@@ -39304,11 +39323,11 @@
 					n->endOffset = NULL;
 					(yyval.windef) = n;
 				}
-#line 39308 "gram.c" /* yacc.c:1646  */
+#line 39327 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1907:
-#line 12787 "gram.y" /* yacc.c:1646  */
+  case 1909:
+#line 12800 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = makeNode(WindowDef);
 					n->frameOptions = FRAMEOPTION_START_VALUE_PRECEDING;
@@ -39316,11 +39335,11 @@
 					n->endOffset = NULL;
 					(yyval.windef) = n;
 				}
-#line 39320 "gram.c" /* yacc.c:1646  */
+#line 39339 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1908:
-#line 12795 "gram.y" /* yacc.c:1646  */
+  case 1910:
+#line 12808 "gram.y" /* yacc.c:1646  */
     {
 					WindowDef *n = makeNode(WindowDef);
 					n->frameOptions = FRAMEOPTION_START_VALUE_FOLLOWING;
@@ -39328,249 +39347,249 @@
 					n->endOffset = NULL;
 					(yyval.windef) = n;
 				}
-#line 39332 "gram.c" /* yacc.c:1646  */
+#line 39351 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1909:
-#line 12815 "gram.y" /* yacc.c:1646  */
+  case 1911:
+#line 12828 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 39338 "gram.c" /* yacc.c:1646  */
+#line 39357 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1910:
-#line 12816 "gram.y" /* yacc.c:1646  */
+  case 1912:
+#line 12829 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 39344 "gram.c" /* yacc.c:1646  */
+#line 39363 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1911:
-#line 12817 "gram.y" /* yacc.c:1646  */
+  case 1913:
+#line 12830 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-3].list), (yyvsp[-1].node)); }
-#line 39350 "gram.c" /* yacc.c:1646  */
+#line 39369 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1912:
-#line 12820 "gram.y" /* yacc.c:1646  */
+  case 1914:
+#line 12833 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 39356 "gram.c" /* yacc.c:1646  */
+#line 39375 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1913:
-#line 12821 "gram.y" /* yacc.c:1646  */
+  case 1915:
+#line 12834 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 39362 "gram.c" /* yacc.c:1646  */
+#line 39381 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1914:
-#line 12824 "gram.y" /* yacc.c:1646  */
+  case 1916:
+#line 12837 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-3].list), (yyvsp[-1].node)); }
-#line 39368 "gram.c" /* yacc.c:1646  */
+#line 39387 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1915:
-#line 12827 "gram.y" /* yacc.c:1646  */
+  case 1917:
+#line 12840 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ANY_SUBLINK; }
-#line 39374 "gram.c" /* yacc.c:1646  */
+#line 39393 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1916:
-#line 12828 "gram.y" /* yacc.c:1646  */
+  case 1918:
+#line 12841 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ANY_SUBLINK; }
-#line 39380 "gram.c" /* yacc.c:1646  */
+#line 39399 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1917:
-#line 12829 "gram.y" /* yacc.c:1646  */
+  case 1919:
+#line 12842 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = ALL_SUBLINK; }
-#line 39386 "gram.c" /* yacc.c:1646  */
+#line 39405 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1918:
-#line 12832 "gram.y" /* yacc.c:1646  */
+  case 1920:
+#line 12845 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 39392 "gram.c" /* yacc.c:1646  */
+#line 39411 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1919:
-#line 12833 "gram.y" /* yacc.c:1646  */
+  case 1921:
+#line 12846 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 39398 "gram.c" /* yacc.c:1646  */
+#line 39417 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1920:
-#line 12836 "gram.y" /* yacc.c:1646  */
+  case 1922:
+#line 12849 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "+"; }
-#line 39404 "gram.c" /* yacc.c:1646  */
+#line 39423 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1921:
-#line 12837 "gram.y" /* yacc.c:1646  */
+  case 1923:
+#line 12850 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "-"; }
-#line 39410 "gram.c" /* yacc.c:1646  */
+#line 39429 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1922:
-#line 12838 "gram.y" /* yacc.c:1646  */
+  case 1924:
+#line 12851 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "*"; }
-#line 39416 "gram.c" /* yacc.c:1646  */
+#line 39435 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1923:
-#line 12839 "gram.y" /* yacc.c:1646  */
+  case 1925:
+#line 12852 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "/"; }
-#line 39422 "gram.c" /* yacc.c:1646  */
+#line 39441 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1924:
-#line 12840 "gram.y" /* yacc.c:1646  */
+  case 1926:
+#line 12853 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "%"; }
-#line 39428 "gram.c" /* yacc.c:1646  */
+#line 39447 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1925:
-#line 12841 "gram.y" /* yacc.c:1646  */
+  case 1927:
+#line 12854 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "^"; }
-#line 39434 "gram.c" /* yacc.c:1646  */
+#line 39453 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1926:
-#line 12842 "gram.y" /* yacc.c:1646  */
+  case 1928:
+#line 12855 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "<"; }
-#line 39440 "gram.c" /* yacc.c:1646  */
+#line 39459 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1927:
-#line 12843 "gram.y" /* yacc.c:1646  */
+  case 1929:
+#line 12856 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = ">"; }
-#line 39446 "gram.c" /* yacc.c:1646  */
+#line 39465 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1928:
-#line 12844 "gram.y" /* yacc.c:1646  */
+  case 1930:
+#line 12857 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "="; }
-#line 39452 "gram.c" /* yacc.c:1646  */
+#line 39471 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1929:
-#line 12845 "gram.y" /* yacc.c:1646  */
+  case 1931:
+#line 12858 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "<="; }
-#line 39458 "gram.c" /* yacc.c:1646  */
+#line 39477 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1930:
-#line 12846 "gram.y" /* yacc.c:1646  */
+  case 1932:
+#line 12859 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = ">="; }
-#line 39464 "gram.c" /* yacc.c:1646  */
+#line 39483 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1931:
-#line 12847 "gram.y" /* yacc.c:1646  */
+  case 1933:
+#line 12860 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "<>"; }
-#line 39470 "gram.c" /* yacc.c:1646  */
+#line 39489 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1932:
-#line 12851 "gram.y" /* yacc.c:1646  */
+  case 1934:
+#line 12864 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 39476 "gram.c" /* yacc.c:1646  */
+#line 39495 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1933:
-#line 12853 "gram.y" /* yacc.c:1646  */
+  case 1935:
+#line 12866 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 39482 "gram.c" /* yacc.c:1646  */
+#line 39501 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1934:
-#line 12858 "gram.y" /* yacc.c:1646  */
+  case 1936:
+#line 12871 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 39488 "gram.c" /* yacc.c:1646  */
+#line 39507 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1935:
-#line 12860 "gram.y" /* yacc.c:1646  */
+  case 1937:
+#line 12873 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 39494 "gram.c" /* yacc.c:1646  */
+#line 39513 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1936:
-#line 12865 "gram.y" /* yacc.c:1646  */
+  case 1938:
+#line 12878 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 39500 "gram.c" /* yacc.c:1646  */
+#line 39519 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1937:
-#line 12867 "gram.y" /* yacc.c:1646  */
+  case 1939:
+#line 12880 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 39506 "gram.c" /* yacc.c:1646  */
+#line 39525 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1938:
-#line 12869 "gram.y" /* yacc.c:1646  */
+  case 1940:
+#line 12882 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString("~~")); }
-#line 39512 "gram.c" /* yacc.c:1646  */
+#line 39531 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1939:
-#line 12871 "gram.y" /* yacc.c:1646  */
+  case 1941:
+#line 12884 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString("!~~")); }
-#line 39518 "gram.c" /* yacc.c:1646  */
+#line 39537 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1940:
-#line 12873 "gram.y" /* yacc.c:1646  */
+  case 1942:
+#line 12886 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString("~~*")); }
-#line 39524 "gram.c" /* yacc.c:1646  */
+#line 39543 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1941:
-#line 12875 "gram.y" /* yacc.c:1646  */
+  case 1943:
+#line 12888 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1(makeString("!~~*")); }
-#line 39530 "gram.c" /* yacc.c:1646  */
+#line 39549 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1942:
-#line 12887 "gram.y" /* yacc.c:1646  */
+  case 1944:
+#line 12900 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].node));
 				}
-#line 39538 "gram.c" /* yacc.c:1646  */
+#line 39557 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1943:
-#line 12891 "gram.y" /* yacc.c:1646  */
+  case 1945:
+#line 12904 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node));
 				}
-#line 39546 "gram.c" /* yacc.c:1646  */
+#line 39565 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1944:
-#line 12898 "gram.y" /* yacc.c:1646  */
+  case 1946:
+#line 12911 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make1((yyvsp[0].node));
 				}
-#line 39554 "gram.c" /* yacc.c:1646  */
+#line 39573 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1945:
-#line 12902 "gram.y" /* yacc.c:1646  */
+  case 1947:
+#line 12915 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node));
 				}
-#line 39562 "gram.c" /* yacc.c:1646  */
+#line 39581 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1946:
-#line 12908 "gram.y" /* yacc.c:1646  */
+  case 1948:
+#line 12921 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (yyvsp[0].node);
 				}
-#line 39570 "gram.c" /* yacc.c:1646  */
+#line 39589 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1947:
-#line 12912 "gram.y" /* yacc.c:1646  */
+  case 1949:
+#line 12925 "gram.y" /* yacc.c:1646  */
     {
 					NamedArgExpr *na = makeNode(NamedArgExpr);
 					na->name = (yyvsp[-2].str);
@@ -39579,11 +39598,11 @@
 					na->location = (yylsp[-2]);
 					(yyval.node) = (Node *) na;
 				}
-#line 39583 "gram.c" /* yacc.c:1646  */
+#line 39602 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1948:
-#line 12921 "gram.y" /* yacc.c:1646  */
+  case 1950:
+#line 12934 "gram.y" /* yacc.c:1646  */
     {
 					NamedArgExpr *na = makeNode(NamedArgExpr);
 					na->name = (yyvsp[-2].str);
@@ -39592,180 +39611,180 @@
 					na->location = (yylsp[-2]);
 					(yyval.node) = (Node *) na;
 				}
-#line 39596 "gram.c" /* yacc.c:1646  */
+#line 39615 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1949:
-#line 12931 "gram.y" /* yacc.c:1646  */
+  case 1951:
+#line 12944 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].typnam)); }
-#line 39602 "gram.c" /* yacc.c:1646  */
+#line 39621 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1950:
-#line 12932 "gram.y" /* yacc.c:1646  */
+  case 1952:
+#line 12945 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].typnam)); }
-#line 39608 "gram.c" /* yacc.c:1646  */
+#line 39627 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1951:
-#line 12936 "gram.y" /* yacc.c:1646  */
+  case 1953:
+#line 12949 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeAArrayExpr((yyvsp[-1].list), (yylsp[-2]));
 				}
-#line 39616 "gram.c" /* yacc.c:1646  */
+#line 39635 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1952:
-#line 12940 "gram.y" /* yacc.c:1646  */
+  case 1954:
+#line 12953 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeAArrayExpr((yyvsp[-1].list), (yylsp[-2]));
 				}
-#line 39624 "gram.c" /* yacc.c:1646  */
+#line 39643 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1953:
-#line 12944 "gram.y" /* yacc.c:1646  */
+  case 1955:
+#line 12957 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeAArrayExpr(NIL, (yylsp[-1]));
 				}
-#line 39632 "gram.c" /* yacc.c:1646  */
+#line 39651 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1954:
-#line 12949 "gram.y" /* yacc.c:1646  */
+  case 1956:
+#line 12962 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 39638 "gram.c" /* yacc.c:1646  */
+#line 39657 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1955:
-#line 12950 "gram.y" /* yacc.c:1646  */
+  case 1957:
+#line 12963 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 39644 "gram.c" /* yacc.c:1646  */
+#line 39663 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1956:
-#line 12956 "gram.y" /* yacc.c:1646  */
+  case 1958:
+#line 12969 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2(makeStringConst((yyvsp[-2].str), (yylsp[-2])), (yyvsp[0].node));
 				}
-#line 39652 "gram.c" /* yacc.c:1646  */
+#line 39671 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1957:
-#line 12959 "gram.y" /* yacc.c:1646  */
+  case 1959:
+#line 12972 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 39658 "gram.c" /* yacc.c:1646  */
+#line 39677 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1958:
-#line 12966 "gram.y" /* yacc.c:1646  */
+  case 1960:
+#line 12979 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 39664 "gram.c" /* yacc.c:1646  */
+#line 39683 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1959:
-#line 12967 "gram.y" /* yacc.c:1646  */
+  case 1961:
+#line 12980 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "year"; }
-#line 39670 "gram.c" /* yacc.c:1646  */
+#line 39689 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1960:
-#line 12968 "gram.y" /* yacc.c:1646  */
+  case 1962:
+#line 12981 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "month"; }
-#line 39676 "gram.c" /* yacc.c:1646  */
+#line 39695 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1961:
-#line 12969 "gram.y" /* yacc.c:1646  */
+  case 1963:
+#line 12982 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "day"; }
-#line 39682 "gram.c" /* yacc.c:1646  */
+#line 39701 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1962:
-#line 12970 "gram.y" /* yacc.c:1646  */
+  case 1964:
+#line 12983 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "hour"; }
-#line 39688 "gram.c" /* yacc.c:1646  */
+#line 39707 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1963:
-#line 12971 "gram.y" /* yacc.c:1646  */
+  case 1965:
+#line 12984 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "minute"; }
-#line 39694 "gram.c" /* yacc.c:1646  */
+#line 39713 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1964:
-#line 12972 "gram.y" /* yacc.c:1646  */
+  case 1966:
+#line 12985 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = "second"; }
-#line 39700 "gram.c" /* yacc.c:1646  */
+#line 39719 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1965:
-#line 12973 "gram.y" /* yacc.c:1646  */
+  case 1967:
+#line 12986 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 39706 "gram.c" /* yacc.c:1646  */
+#line 39725 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1966:
-#line 12984 "gram.y" /* yacc.c:1646  */
+  case 1968:
+#line 12997 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make4((yyvsp[-3].node), (yyvsp[-2].node), (yyvsp[-1].node), (yyvsp[0].node));
 				}
-#line 39714 "gram.c" /* yacc.c:1646  */
+#line 39733 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1967:
-#line 12988 "gram.y" /* yacc.c:1646  */
+  case 1969:
+#line 13001 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make3((yyvsp[-2].node), (yyvsp[-1].node), (yyvsp[0].node));
 				}
-#line 39722 "gram.c" /* yacc.c:1646  */
+#line 39741 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1968:
-#line 12995 "gram.y" /* yacc.c:1646  */
+  case 1970:
+#line 13008 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 39728 "gram.c" /* yacc.c:1646  */
+#line 39747 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1969:
-#line 13001 "gram.y" /* yacc.c:1646  */
+  case 1971:
+#line 13014 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make2((yyvsp[0].node), (yyvsp[-2].node)); }
-#line 39734 "gram.c" /* yacc.c:1646  */
+#line 39753 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1970:
-#line 13002 "gram.y" /* yacc.c:1646  */
+  case 1972:
+#line 13015 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 39740 "gram.c" /* yacc.c:1646  */
+#line 39759 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1971:
-#line 13019 "gram.y" /* yacc.c:1646  */
+  case 1973:
+#line 13032 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make3((yyvsp[-2].node), (yyvsp[-1].node), (yyvsp[0].node));
 				}
-#line 39748 "gram.c" /* yacc.c:1646  */
+#line 39767 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1972:
-#line 13023 "gram.y" /* yacc.c:1646  */
+  case 1974:
+#line 13036 "gram.y" /* yacc.c:1646  */
     {
 					/* not legal per SQL99, but might as well allow it */
 					(yyval.list) = list_make3((yyvsp[-2].node), (yyvsp[0].node), (yyvsp[-1].node));
 				}
-#line 39757 "gram.c" /* yacc.c:1646  */
+#line 39776 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1973:
-#line 13028 "gram.y" /* yacc.c:1646  */
+  case 1975:
+#line 13041 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = list_make2((yyvsp[-1].node), (yyvsp[0].node));
 				}
-#line 39765 "gram.c" /* yacc.c:1646  */
+#line 39784 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1974:
-#line 13032 "gram.y" /* yacc.c:1646  */
+  case 1976:
+#line 13045 "gram.y" /* yacc.c:1646  */
     {
 					/*
 					 * Since there are no cases where this syntax allows
@@ -39780,72 +39799,72 @@
 									makeTypeCast((yyvsp[0].node),
 												 SystemTypeName("int4"), -1));
 				}
-#line 39784 "gram.c" /* yacc.c:1646  */
+#line 39803 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1975:
-#line 13047 "gram.y" /* yacc.c:1646  */
+  case 1977:
+#line 13060 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.list) = (yyvsp[0].list);
 				}
-#line 39792 "gram.c" /* yacc.c:1646  */
+#line 39811 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1976:
-#line 13051 "gram.y" /* yacc.c:1646  */
+  case 1978:
+#line 13064 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 39798 "gram.c" /* yacc.c:1646  */
+#line 39817 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1977:
-#line 13055 "gram.y" /* yacc.c:1646  */
+  case 1979:
+#line 13068 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 39804 "gram.c" /* yacc.c:1646  */
+#line 39823 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1978:
-#line 13058 "gram.y" /* yacc.c:1646  */
+  case 1980:
+#line 13071 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 39810 "gram.c" /* yacc.c:1646  */
+#line 39829 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1979:
-#line 13061 "gram.y" /* yacc.c:1646  */
+  case 1981:
+#line 13074 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[0].list), (yyvsp[-2].node)); }
-#line 39816 "gram.c" /* yacc.c:1646  */
+#line 39835 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1980:
-#line 13062 "gram.y" /* yacc.c:1646  */
+  case 1982:
+#line 13075 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 39822 "gram.c" /* yacc.c:1646  */
+#line 39841 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1981:
-#line 13063 "gram.y" /* yacc.c:1646  */
+  case 1983:
+#line 13076 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 39828 "gram.c" /* yacc.c:1646  */
+#line 39847 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1982:
-#line 13067 "gram.y" /* yacc.c:1646  */
+  case 1984:
+#line 13080 "gram.y" /* yacc.c:1646  */
     {
 					SubLink *n = makeNode(SubLink);
 					n->subselect = (yyvsp[0].node);
 					/* other fields will be filled later */
 					(yyval.node) = (Node *)n;
 				}
-#line 39839 "gram.c" /* yacc.c:1646  */
+#line 39858 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1983:
-#line 13073 "gram.y" /* yacc.c:1646  */
+  case 1985:
+#line 13086 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *)(yyvsp[-1].list); }
-#line 39845 "gram.c" /* yacc.c:1646  */
+#line 39864 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1984:
-#line 13084 "gram.y" /* yacc.c:1646  */
+  case 1986:
+#line 13097 "gram.y" /* yacc.c:1646  */
     {
 					CaseExpr *c = makeNode(CaseExpr);
 					c->casetype = InvalidOid; /* not analyzed yet */
@@ -39855,23 +39874,23 @@
 					c->location = (yylsp[-4]);
 					(yyval.node) = (Node *)c;
 				}
-#line 39859 "gram.c" /* yacc.c:1646  */
+#line 39878 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1985:
-#line 13097 "gram.y" /* yacc.c:1646  */
+  case 1987:
+#line 13110 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 39865 "gram.c" /* yacc.c:1646  */
+#line 39884 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1986:
-#line 13098 "gram.y" /* yacc.c:1646  */
+  case 1988:
+#line 13111 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].node)); }
-#line 39871 "gram.c" /* yacc.c:1646  */
+#line 39890 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1987:
-#line 13103 "gram.y" /* yacc.c:1646  */
+  case 1989:
+#line 13116 "gram.y" /* yacc.c:1646  */
     {
 					CaseWhen *w = makeNode(CaseWhen);
 					w->expr = (Expr *) (yyvsp[-2].node);
@@ -39879,171 +39898,171 @@
 					w->location = (yylsp[-3]);
 					(yyval.node) = (Node *)w;
 				}
-#line 39883 "gram.c" /* yacc.c:1646  */
+#line 39902 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1988:
-#line 13113 "gram.y" /* yacc.c:1646  */
+  case 1990:
+#line 13126 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 39889 "gram.c" /* yacc.c:1646  */
+#line 39908 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1989:
-#line 13114 "gram.y" /* yacc.c:1646  */
+  case 1991:
+#line 13127 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 39895 "gram.c" /* yacc.c:1646  */
+#line 39914 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1990:
-#line 13117 "gram.y" /* yacc.c:1646  */
+  case 1992:
+#line 13130 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (yyvsp[0].node); }
-#line 39901 "gram.c" /* yacc.c:1646  */
+#line 39920 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1991:
-#line 13118 "gram.y" /* yacc.c:1646  */
+  case 1993:
+#line 13131 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = NULL; }
-#line 39907 "gram.c" /* yacc.c:1646  */
+#line 39926 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1992:
-#line 13122 "gram.y" /* yacc.c:1646  */
+  case 1994:
+#line 13135 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeColumnRef((yyvsp[0].str), NIL, (yylsp[0]), yyscanner);
 				}
-#line 39915 "gram.c" /* yacc.c:1646  */
+#line 39934 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1993:
-#line 13126 "gram.y" /* yacc.c:1646  */
+  case 1995:
+#line 13139 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeColumnRef((yyvsp[-1].str), (yyvsp[0].list), (yylsp[-1]), yyscanner);
 				}
-#line 39923 "gram.c" /* yacc.c:1646  */
+#line 39942 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1994:
-#line 13133 "gram.y" /* yacc.c:1646  */
+  case 1996:
+#line 13146 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeString((yyvsp[0].str));
 				}
-#line 39931 "gram.c" /* yacc.c:1646  */
+#line 39950 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1995:
-#line 13137 "gram.y" /* yacc.c:1646  */
+  case 1997:
+#line 13150 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = (Node *) makeNode(A_Star);
 				}
-#line 39939 "gram.c" /* yacc.c:1646  */
+#line 39958 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1996:
-#line 13141 "gram.y" /* yacc.c:1646  */
+  case 1998:
+#line 13154 "gram.y" /* yacc.c:1646  */
     {
 					A_Indices *ai = makeNode(A_Indices);
 					ai->lidx = NULL;
 					ai->uidx = (yyvsp[-1].node);
 					(yyval.node) = (Node *) ai;
 				}
-#line 39950 "gram.c" /* yacc.c:1646  */
+#line 39969 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1997:
-#line 13148 "gram.y" /* yacc.c:1646  */
+  case 1999:
+#line 13161 "gram.y" /* yacc.c:1646  */
     {
 					A_Indices *ai = makeNode(A_Indices);
 					ai->lidx = (yyvsp[-3].node);
 					ai->uidx = (yyvsp[-1].node);
 					(yyval.node) = (Node *) ai;
 				}
-#line 39961 "gram.c" /* yacc.c:1646  */
+#line 39980 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1998:
-#line 13157 "gram.y" /* yacc.c:1646  */
+  case 2000:
+#line 13170 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 39967 "gram.c" /* yacc.c:1646  */
+#line 39986 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 1999:
-#line 13158 "gram.y" /* yacc.c:1646  */
+  case 2001:
+#line 13171 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].node)); }
-#line 39973 "gram.c" /* yacc.c:1646  */
+#line 39992 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2000:
-#line 13162 "gram.y" /* yacc.c:1646  */
+  case 2002:
+#line 13175 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 39979 "gram.c" /* yacc.c:1646  */
+#line 39998 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2001:
-#line 13163 "gram.y" /* yacc.c:1646  */
+  case 2003:
+#line 13176 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].node)); }
-#line 39985 "gram.c" /* yacc.c:1646  */
+#line 40004 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2004:
-#line 13178 "gram.y" /* yacc.c:1646  */
+  case 2006:
+#line 13191 "gram.y" /* yacc.c:1646  */
     { (yyval.node) = (Node *) (yyvsp[0].node); }
-#line 39991 "gram.c" /* yacc.c:1646  */
+#line 40010 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2005:
-#line 13180 "gram.y" /* yacc.c:1646  */
+  case 2007:
+#line 13193 "gram.y" /* yacc.c:1646  */
     {
 					SetToDefault *n = makeNode(SetToDefault);
 					n->location = (yylsp[0]);
 					(yyval.node) = (Node *) n;
 				}
-#line 40001 "gram.c" /* yacc.c:1646  */
+#line 40020 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2006:
-#line 13188 "gram.y" /* yacc.c:1646  */
+  case 2008:
+#line 13201 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 40007 "gram.c" /* yacc.c:1646  */
+#line 40026 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2007:
-#line 13189 "gram.y" /* yacc.c:1646  */
+  case 2009:
+#line 13202 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 40013 "gram.c" /* yacc.c:1646  */
+#line 40032 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2008:
-#line 13197 "gram.y" /* yacc.c:1646  */
+  case 2010:
+#line 13210 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[-1].list); }
-#line 40019 "gram.c" /* yacc.c:1646  */
+#line 40038 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2009:
-#line 13207 "gram.y" /* yacc.c:1646  */
+  case 2011:
+#line 13220 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = (yyvsp[0].list); }
-#line 40025 "gram.c" /* yacc.c:1646  */
+#line 40044 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2010:
-#line 13208 "gram.y" /* yacc.c:1646  */
+  case 2012:
+#line 13221 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 40031 "gram.c" /* yacc.c:1646  */
+#line 40050 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2011:
-#line 13212 "gram.y" /* yacc.c:1646  */
+  case 2013:
+#line 13225 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].target)); }
-#line 40037 "gram.c" /* yacc.c:1646  */
+#line 40056 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2012:
-#line 13213 "gram.y" /* yacc.c:1646  */
+  case 2014:
+#line 13226 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].target)); }
-#line 40043 "gram.c" /* yacc.c:1646  */
+#line 40062 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2013:
-#line 13217 "gram.y" /* yacc.c:1646  */
+  case 2015:
+#line 13230 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = (yyvsp[0].str);
@@ -40051,11 +40070,11 @@
 					(yyval.target)->val = (Node *)(yyvsp[-2].node);
 					(yyval.target)->location = (yylsp[-2]);
 				}
-#line 40055 "gram.c" /* yacc.c:1646  */
+#line 40074 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2014:
-#line 13233 "gram.y" /* yacc.c:1646  */
+  case 2016:
+#line 13246 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = (yyvsp[0].str);
@@ -40063,11 +40082,11 @@
 					(yyval.target)->val = (Node *)(yyvsp[-1].node);
 					(yyval.target)->location = (yylsp[-1]);
 				}
-#line 40067 "gram.c" /* yacc.c:1646  */
+#line 40086 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2015:
-#line 13241 "gram.y" /* yacc.c:1646  */
+  case 2017:
+#line 13254 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = NULL;
@@ -40075,11 +40094,11 @@
 					(yyval.target)->val = (Node *)(yyvsp[0].node);
 					(yyval.target)->location = (yylsp[0]);
 				}
-#line 40079 "gram.c" /* yacc.c:1646  */
+#line 40098 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2016:
-#line 13249 "gram.y" /* yacc.c:1646  */
+  case 2018:
+#line 13262 "gram.y" /* yacc.c:1646  */
     {
 					ColumnRef *n = makeNode(ColumnRef);
 					n->fields = list_make1(makeNode(A_Star));
@@ -40091,31 +40110,31 @@
 					(yyval.target)->val = (Node *)n;
 					(yyval.target)->location = (yylsp[0]);
 				}
-#line 40095 "gram.c" /* yacc.c:1646  */
+#line 40114 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2017:
-#line 13270 "gram.y" /* yacc.c:1646  */
+  case 2019:
+#line 13283 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = list_make1((yyvsp[0].range)); }
-#line 40101 "gram.c" /* yacc.c:1646  */
+#line 40120 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2018:
-#line 13271 "gram.y" /* yacc.c:1646  */
+  case 2020:
+#line 13284 "gram.y" /* yacc.c:1646  */
     { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].range)); }
-#line 40107 "gram.c" /* yacc.c:1646  */
+#line 40126 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2019:
-#line 13283 "gram.y" /* yacc.c:1646  */
+  case 2021:
+#line 13296 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.range) = makeRangeVar(NULL, (yyvsp[0].str), (yylsp[0]));
 				}
-#line 40115 "gram.c" /* yacc.c:1646  */
+#line 40134 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2020:
-#line 13287 "gram.y" /* yacc.c:1646  */
+  case 2022:
+#line 13300 "gram.y" /* yacc.c:1646  */
     {
 					check_qualified_name((yyvsp[0].list), yyscanner);
 					(yyval.range) = makeRangeVar(NULL, NULL, (yylsp[-1]));
@@ -40140,106 +40159,106 @@
 							break;
 					}
 				}
-#line 40144 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 2021:
-#line 13314 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 40150 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 2022:
-#line 13316 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = lappend((yyvsp[-2].list), makeString((yyvsp[0].str))); }
-#line 40156 "gram.c" /* yacc.c:1646  */
+#line 40163 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2023:
-#line 13320 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 40162 "gram.c" /* yacc.c:1646  */
+#line 13327 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
+#line 40169 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2024:
-#line 13323 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 40168 "gram.c" /* yacc.c:1646  */
+#line 13329 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = lappend((yyvsp[-2].list), makeString((yyvsp[0].str))); }
+#line 40175 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2025:
-#line 13326 "gram.y" /* yacc.c:1646  */
+#line 13333 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 40174 "gram.c" /* yacc.c:1646  */
+#line 40181 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2026:
-#line 13328 "gram.y" /* yacc.c:1646  */
+#line 13336 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 40180 "gram.c" /* yacc.c:1646  */
+#line 40187 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2027:
-#line 13330 "gram.y" /* yacc.c:1646  */
+#line 13339 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 40186 "gram.c" /* yacc.c:1646  */
+#line 40193 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2028:
-#line 13332 "gram.y" /* yacc.c:1646  */
+#line 13341 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 40192 "gram.c" /* yacc.c:1646  */
+#line 40199 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2029:
 #line 13343 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
-#line 40198 "gram.c" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 40205 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2030:
 #line 13345 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 40211 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 2031:
+#line 13356 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = list_make1(makeString((yyvsp[0].str))); }
+#line 40217 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 2032:
+#line 13358 "gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = check_func_name(lcons(makeString((yyvsp[-1].str)), (yyvsp[0].list)),
 											 yyscanner);
 					}
-#line 40207 "gram.c" /* yacc.c:1646  */
+#line 40226 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2031:
-#line 13356 "gram.y" /* yacc.c:1646  */
+  case 2033:
+#line 13369 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeIntConst((yyvsp[0].ival), (yylsp[0]));
 				}
-#line 40215 "gram.c" /* yacc.c:1646  */
+#line 40234 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2032:
-#line 13360 "gram.y" /* yacc.c:1646  */
+  case 2034:
+#line 13373 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeFloatConst((yyvsp[0].str), (yylsp[0]));
 				}
-#line 40223 "gram.c" /* yacc.c:1646  */
+#line 40242 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2033:
-#line 13364 "gram.y" /* yacc.c:1646  */
+  case 2035:
+#line 13377 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeStringConst((yyvsp[0].str), (yylsp[0]));
 				}
-#line 40231 "gram.c" /* yacc.c:1646  */
+#line 40250 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2034:
-#line 13368 "gram.y" /* yacc.c:1646  */
+  case 2036:
+#line 13381 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeBitStringConst((yyvsp[0].str), (yylsp[0]));
 				}
-#line 40239 "gram.c" /* yacc.c:1646  */
+#line 40258 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2035:
-#line 13372 "gram.y" /* yacc.c:1646  */
+  case 2037:
+#line 13385 "gram.y" /* yacc.c:1646  */
     {
 					/* This is a bit constant per SQL99:
 					 * Without Feature F511, "BIT data type",
@@ -40248,22 +40267,22 @@
 					 */
 					(yyval.node) = makeBitStringConst((yyvsp[0].str), (yylsp[0]));
 				}
-#line 40252 "gram.c" /* yacc.c:1646  */
+#line 40271 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2036:
-#line 13381 "gram.y" /* yacc.c:1646  */
+  case 2038:
+#line 13394 "gram.y" /* yacc.c:1646  */
     {
 					/* generic type 'literal' syntax */
 					TypeName *t = makeTypeNameFromNameList((yyvsp[-1].list));
 					t->location = (yylsp[-1]);
 					(yyval.node) = makeStringConstCast((yyvsp[0].str), (yylsp[0]), t);
 				}
-#line 40263 "gram.c" /* yacc.c:1646  */
+#line 40282 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2037:
-#line 13388 "gram.y" /* yacc.c:1646  */
+  case 2039:
+#line 13401 "gram.y" /* yacc.c:1646  */
     {
 					/* generic syntax with a type modifier */
 					TypeName *t = makeTypeNameFromNameList((yyvsp[-5].list));
@@ -40295,94 +40314,94 @@
 					t->location = (yylsp[-5]);
 					(yyval.node) = makeStringConstCast((yyvsp[0].str), (yylsp[0]), t);
 				}
-#line 40299 "gram.c" /* yacc.c:1646  */
+#line 40318 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2038:
-#line 13420 "gram.y" /* yacc.c:1646  */
+  case 2040:
+#line 13433 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeStringConstCast((yyvsp[0].str), (yylsp[0]), (yyvsp[-1].typnam));
 				}
-#line 40307 "gram.c" /* yacc.c:1646  */
+#line 40326 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2039:
-#line 13424 "gram.y" /* yacc.c:1646  */
+  case 2041:
+#line 13437 "gram.y" /* yacc.c:1646  */
     {
 					TypeName *t = (yyvsp[-2].typnam);
 					t->typmods = (yyvsp[0].list);
 					(yyval.node) = makeStringConstCast((yyvsp[-1].str), (yylsp[-1]), t);
 				}
-#line 40317 "gram.c" /* yacc.c:1646  */
+#line 40336 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2040:
-#line 13430 "gram.y" /* yacc.c:1646  */
+  case 2042:
+#line 13443 "gram.y" /* yacc.c:1646  */
     {
 					TypeName *t = (yyvsp[-4].typnam);
 					t->typmods = list_make2(makeIntConst(INTERVAL_FULL_RANGE, -1),
 											makeIntConst((yyvsp[-2].ival), (yylsp[-2])));
 					(yyval.node) = makeStringConstCast((yyvsp[0].str), (yylsp[0]), t);
 				}
-#line 40328 "gram.c" /* yacc.c:1646  */
+#line 40347 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2041:
-#line 13437 "gram.y" /* yacc.c:1646  */
+  case 2043:
+#line 13450 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeBoolAConst(TRUE, (yylsp[0]));
 				}
-#line 40336 "gram.c" /* yacc.c:1646  */
+#line 40355 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2042:
-#line 13441 "gram.y" /* yacc.c:1646  */
+  case 2044:
+#line 13454 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeBoolAConst(FALSE, (yylsp[0]));
 				}
-#line 40344 "gram.c" /* yacc.c:1646  */
+#line 40363 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2043:
-#line 13445 "gram.y" /* yacc.c:1646  */
+  case 2045:
+#line 13458 "gram.y" /* yacc.c:1646  */
     {
 					(yyval.node) = makeNullAConst((yylsp[0]));
 				}
-#line 40352 "gram.c" /* yacc.c:1646  */
+#line 40371 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2044:
-#line 13450 "gram.y" /* yacc.c:1646  */
+  case 2046:
+#line 13463 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[0].ival); }
-#line 40358 "gram.c" /* yacc.c:1646  */
+#line 40377 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2045:
-#line 13451 "gram.y" /* yacc.c:1646  */
+  case 2047:
+#line 13464 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 40364 "gram.c" /* yacc.c:1646  */
+#line 40383 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2046:
-#line 13453 "gram.y" /* yacc.c:1646  */
+  case 2048:
+#line 13466 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = (yyvsp[0].ival); }
-#line 40370 "gram.c" /* yacc.c:1646  */
+#line 40389 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2047:
-#line 13454 "gram.y" /* yacc.c:1646  */
+  case 2049:
+#line 13467 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = + (yyvsp[0].ival); }
-#line 40376 "gram.c" /* yacc.c:1646  */
+#line 40395 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2048:
-#line 13455 "gram.y" /* yacc.c:1646  */
+  case 2050:
+#line 13468 "gram.y" /* yacc.c:1646  */
     { (yyval.ival) = - (yyvsp[0].ival); }
-#line 40382 "gram.c" /* yacc.c:1646  */
+#line 40401 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2049:
-#line 13460 "gram.y" /* yacc.c:1646  */
+  case 2051:
+#line 13473 "gram.y" /* yacc.c:1646  */
     {
 					RoleSpec *spc = (RoleSpec *) (yyvsp[0].node);
 					switch (spc->roletype)
@@ -40410,11 +40429,11 @@
 									 parser_errposition((yylsp[0]))));
 					}
 				}
-#line 40414 "gram.c" /* yacc.c:1646  */
+#line 40433 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2050:
-#line 13490 "gram.y" /* yacc.c:1646  */
+  case 2052:
+#line 13503 "gram.y" /* yacc.c:1646  */
     {
 						/*
 						 * "public" and "none" are not keywords, but they must
@@ -40441,129 +40460,129 @@
 						}
 						(yyval.node) = (Node *) n;
 					}
-#line 40445 "gram.c" /* yacc.c:1646  */
+#line 40464 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2051:
-#line 13517 "gram.y" /* yacc.c:1646  */
+  case 2053:
+#line 13530 "gram.y" /* yacc.c:1646  */
     {
 						(yyval.node) = makeRoleSpec(ROLESPEC_CURRENT_USER, (yylsp[0]));
 					}
-#line 40453 "gram.c" /* yacc.c:1646  */
+#line 40472 "gram.c" /* yacc.c:1646  */
     break;
 
-  case 2052:
-#line 13521 "gram.y" /* yacc.c:1646  */
+  case 2054:
+#line 13534 "gram.y" /* yacc.c:1646  */
     {
 						(yyval.node) = makeRoleSpec(ROLESPEC_SESSION_USER, (yylsp[0]));
 					}
-#line 40461 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 2053:
-#line 13527 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = list_make1((yyvsp[0].node)); }
-#line 40467 "gram.c" /* yacc.c:1646  */
-    break;
-
-  case 2054:
-#line 13529 "gram.y" /* yacc.c:1646  */
-    { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
-#line 40473 "gram.c" /* yacc.c:1646  */
+#line 40480 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2055:
-#line 13545 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 40479 "gram.c" /* yacc.c:1646  */
+#line 13540 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = list_make1((yyvsp[0].node)); }
+#line 40486 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2056:
-#line 13546 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40485 "gram.c" /* yacc.c:1646  */
+#line 13542 "gram.y" /* yacc.c:1646  */
+    { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].node)); }
+#line 40492 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2057:
-#line 13547 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40491 "gram.c" /* yacc.c:1646  */
+#line 13558 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 40498 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2058:
-#line 13552 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 40497 "gram.c" /* yacc.c:1646  */
+#line 13559 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
+#line 40504 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2059:
-#line 13553 "gram.y" /* yacc.c:1646  */
+#line 13560 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40503 "gram.c" /* yacc.c:1646  */
+#line 40510 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2060:
-#line 13554 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40509 "gram.c" /* yacc.c:1646  */
+#line 13565 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 40516 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2061:
-#line 13559 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 40515 "gram.c" /* yacc.c:1646  */
+#line 13566 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
+#line 40522 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2062:
-#line 13560 "gram.y" /* yacc.c:1646  */
+#line 13567 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40521 "gram.c" /* yacc.c:1646  */
+#line 40528 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2063:
-#line 13561 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40527 "gram.c" /* yacc.c:1646  */
+#line 13572 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 40534 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2064:
-#line 13562 "gram.y" /* yacc.c:1646  */
+#line 13573 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40533 "gram.c" /* yacc.c:1646  */
+#line 40540 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2065:
-#line 13568 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 40539 "gram.c" /* yacc.c:1646  */
+#line 13574 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
+#line 40546 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2066:
-#line 13569 "gram.y" /* yacc.c:1646  */
+#line 13575 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40545 "gram.c" /* yacc.c:1646  */
+#line 40552 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2067:
-#line 13570 "gram.y" /* yacc.c:1646  */
-    { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40551 "gram.c" /* yacc.c:1646  */
+#line 13581 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 40558 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2068:
-#line 13571 "gram.y" /* yacc.c:1646  */
+#line 13582 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40557 "gram.c" /* yacc.c:1646  */
+#line 40564 "gram.c" /* yacc.c:1646  */
     break;
 
   case 2069:
-#line 13572 "gram.y" /* yacc.c:1646  */
+#line 13583 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
+#line 40570 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 2070:
+#line 13584 "gram.y" /* yacc.c:1646  */
+    { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
+#line 40576 "gram.c" /* yacc.c:1646  */
+    break;
+
+  case 2071:
+#line 13585 "gram.y" /* yacc.c:1646  */
     { (yyval.str) = pstrdup((yyvsp[0].keyword)); }
-#line 40563 "gram.c" /* yacc.c:1646  */
+#line 40582 "gram.c" /* yacc.c:1646  */
     break;
 
 
-#line 40567 "gram.c" /* yacc.c:1646  */
+#line 40586 "gram.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -40798,7 +40817,7 @@
 #endif
   return yyresult;
 }
-#line 14045 "gram.y" /* yacc.c:1906  */
+#line 14058 "gram.y" /* yacc.c:1906  */
 
 
 /*
@@ -41269,10 +41288,16 @@
 static Node *
 makeAndExpr(Node *lexpr, Node *rexpr, int location)
 {
+	Node	   *lexp = lexpr;
+
+	/* Look through AEXPR_PAREN nodes so they don't affect flattening */
+	while (IsA(lexp, A_Expr) &&
+		   ((A_Expr *) lexp)->kind == AEXPR_PAREN)
+		lexp = ((A_Expr *) lexp)->lexpr;
 	/* Flatten "a AND b AND c ..." to a single BoolExpr on sight */
-	if (IsA(lexpr, BoolExpr))
+	if (IsA(lexp, BoolExpr))
 	{
-		BoolExpr *blexpr = (BoolExpr *) lexpr;
+		BoolExpr *blexpr = (BoolExpr *) lexp;
 
 		if (blexpr->boolop == AND_EXPR)
 		{
@@ -41286,10 +41311,16 @@
 static Node *
 makeOrExpr(Node *lexpr, Node *rexpr, int location)
 {
+	Node	   *lexp = lexpr;
+
+	/* Look through AEXPR_PAREN nodes so they don't affect flattening */
+	while (IsA(lexp, A_Expr) &&
+		   ((A_Expr *) lexp)->kind == AEXPR_PAREN)
+		lexp = ((A_Expr *) lexp)->lexpr;
 	/* Flatten "a OR b OR c ..." to a single BoolExpr on sight */
-	if (IsA(lexpr, BoolExpr))
+	if (IsA(lexp, BoolExpr))
 	{
-		BoolExpr *blexpr = (BoolExpr *) lexpr;
+		BoolExpr *blexpr = (BoolExpr *) lexp;
 
 		if (blexpr->boolop == OR_EXPR)
 		{
@@ -41606,13 +41637,3 @@
 {
 	yyext->parsetree = NIL;		/* in case grammar forgets to set it */
 }
-
-/*
- * Must undefine this stuff before including scan.c, since it has different
- * definitions for these macros.
- */
-#undef yyerror
-#undef yylval
-#undef yylloc
-
-#include "scan.c"
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/gram.y postgresql-9.5-9.5.8/src/backend/parser/gram.y
--- postgresql-9.5-9.5.2/src/backend/parser/gram.y	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/gram.y	2017-08-07 21:13:41.000000000 +0000
@@ -1116,12 +1116,20 @@
 
 
 AlterUserSetStmt:
-			ALTER USER RoleSpec SetResetClause
+			ALTER USER RoleSpec opt_in_database SetResetClause
 				{
 					AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
 					n->role = $3;
-					n->database = NULL;
-					n->setstmt = $4;
+					n->database = $4;
+					n->setstmt = $5;
+					$$ = (Node *)n;
+				}
+			| ALTER USER ALL opt_in_database SetResetClause
+				{
+					AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
+					n->role = NULL;
+					n->database = $4;
+					n->setstmt = $5;
 					$$ = (Node *)n;
 				}
 			;
@@ -3670,6 +3678,7 @@
 
 NumericOnly:
 			FCONST								{ $$ = makeFloat($1); }
+			| '+' FCONST						{ $$ = makeFloat($2); }
 			| '-' FCONST
 				{
 					$$ = makeFloat($2);
@@ -10540,7 +10549,7 @@
 					n->lateral = true;
 					n->subquery = $2;
 					n->alias = $3;
-					/* same coment as above */
+					/* same comment as above */
 					if ($3 == NULL)
 					{
 						if (IsA($2, SelectStmt) &&
@@ -11958,7 +11967,10 @@
 						 * AEXPR_PAREN nodes wrapping all explicitly
 						 * parenthesized subexpressions; this prevents bogus
 						 * warnings from being issued when the ordering has
-						 * been forced by parentheses.
+						 * been forced by parentheses.  Take care that an
+						 * AEXPR_PAREN node has the same exprLocation as its
+						 * child, so as not to cause surprising changes in
+						 * error cursor positioning.
 						 *
 						 * In principle we should not be relying on a GUC to
 						 * decide whether to insert AEXPR_PAREN nodes.
@@ -11967,7 +11979,8 @@
 						 * we'd just as soon not waste cycles on dummy parse
 						 * nodes if we don't have to.
 						 */
-						$$ = (Node *) makeA_Expr(AEXPR_PAREN, NIL, $2, NULL, @1);
+						$$ = (Node *) makeA_Expr(AEXPR_PAREN, NIL, $2, NULL,
+												 exprLocation($2));
 					}
 					else
 						$$ = $2;
@@ -14512,10 +14525,16 @@
 static Node *
 makeAndExpr(Node *lexpr, Node *rexpr, int location)
 {
+	Node	   *lexp = lexpr;
+
+	/* Look through AEXPR_PAREN nodes so they don't affect flattening */
+	while (IsA(lexp, A_Expr) &&
+		   ((A_Expr *) lexp)->kind == AEXPR_PAREN)
+		lexp = ((A_Expr *) lexp)->lexpr;
 	/* Flatten "a AND b AND c ..." to a single BoolExpr on sight */
-	if (IsA(lexpr, BoolExpr))
+	if (IsA(lexp, BoolExpr))
 	{
-		BoolExpr *blexpr = (BoolExpr *) lexpr;
+		BoolExpr *blexpr = (BoolExpr *) lexp;
 
 		if (blexpr->boolop == AND_EXPR)
 		{
@@ -14529,10 +14548,16 @@
 static Node *
 makeOrExpr(Node *lexpr, Node *rexpr, int location)
 {
+	Node	   *lexp = lexpr;
+
+	/* Look through AEXPR_PAREN nodes so they don't affect flattening */
+	while (IsA(lexp, A_Expr) &&
+		   ((A_Expr *) lexp)->kind == AEXPR_PAREN)
+		lexp = ((A_Expr *) lexp)->lexpr;
 	/* Flatten "a OR b OR c ..." to a single BoolExpr on sight */
-	if (IsA(lexpr, BoolExpr))
+	if (IsA(lexp, BoolExpr))
 	{
-		BoolExpr *blexpr = (BoolExpr *) lexpr;
+		BoolExpr *blexpr = (BoolExpr *) lexp;
 
 		if (blexpr->boolop == OR_EXPR)
 		{
@@ -14849,13 +14874,3 @@
 {
 	yyext->parsetree = NIL;		/* in case grammar forgets to set it */
 }
-
-/*
- * Must undefine this stuff before including scan.c, since it has different
- * definitions for these macros.
- */
-#undef yyerror
-#undef yylval
-#undef yylloc
-
-#include "scan.c"
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/Makefile postgresql-9.5-9.5.8/src/backend/parser/Makefile
--- postgresql-9.5-9.5.2/src/backend/parser/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -12,7 +12,7 @@
 
 override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-OBJS= analyze.o gram.o keywords.o kwlookup.o parser.o \
+OBJS= analyze.o gram.o scan.o keywords.o kwlookup.o parser.o \
       parse_agg.o parse_clause.o parse_coerce.o parse_collate.o parse_cte.o \
       parse_expr.o parse_func.o parse_node.o parse_oper.o parse_param.o \
       parse_relation.o parse_target.o parse_type.o parse_utilcmd.o scansup.o
@@ -20,12 +20,9 @@
 include $(top_srcdir)/src/backend/common.mk
 
 
-# scan is compiled as part of gram
-gram.o: scan.c
-
 # Latest flex causes warnings in this file.
 ifeq ($(GCC),yes)
-gram.o: CFLAGS += -Wno-error
+scan.o: CFLAGS += -Wno-error
 endif
 
 
@@ -47,7 +44,7 @@
 
 
 # Force these dependencies to be known even without dependency info built:
-gram.o keywords.o parser.o: gram.h
+gram.o scan.o keywords.o parser.o: gram.h
 
 
 # gram.c, gram.h, and scan.c are in the distribution tarball, so they
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/parse_agg.c postgresql-9.5-9.5.8/src/backend/parser/parse_agg.c
--- postgresql-9.5-9.5.2/src/backend/parser/parse_agg.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/parse_agg.c	2017-08-07 21:13:41.000000000 +0000
@@ -684,7 +684,7 @@
 		/* Continue and descend into subtree */
 	}
 	/* We can throw error on sight for a window function */
-	if (IsA(node, WindowFunc))
+	if (IsA(node, WindowFunc) && context->sublevels_up == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_GROUPING_ERROR),
 				 errmsg("aggregate function calls cannot contain window function calls"),
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/parse_expr.c postgresql-9.5-9.5.8/src/backend/parser/parse_expr.c
--- postgresql-9.5-9.5.2/src/backend/parser/parse_expr.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/parse_expr.c	2017-08-07 21:13:41.000000000 +0000
@@ -857,6 +857,14 @@
 			emit_precedence_warnings(pstate, opgroup, opname,
 									 lexpr, rexpr,
 									 a->location);
+
+		/* Look through AEXPR_PAREN nodes so they don't affect tests below */
+		while (lexpr && IsA(lexpr, A_Expr) &&
+			   ((A_Expr *) lexpr)->kind == AEXPR_PAREN)
+			lexpr = ((A_Expr *) lexpr)->lexpr;
+		while (rexpr && IsA(rexpr, A_Expr) &&
+			   ((A_Expr *) rexpr)->kind == AEXPR_PAREN)
+			rexpr = ((A_Expr *) rexpr)->lexpr;
 	}
 
 	/*
@@ -1903,6 +1911,11 @@
 		Node	   *e = (Node *) lfirst(element);
 		Node	   *newe;
 
+		/* Look through AEXPR_PAREN nodes so they don't affect test below */
+		while (e && IsA(e, A_Expr) &&
+			   ((A_Expr *) e)->kind == AEXPR_PAREN)
+			e = ((A_Expr *) e)->lexpr;
+
 		/*
 		 * If an element is itself an A_ArrayExpr, recurse directly so that we
 		 * can pass down any target type we were given.
@@ -2453,29 +2466,40 @@
 /*
  * Handle an explicit CAST construct.
  *
- * Transform the argument, then look up the type name and apply any necessary
+ * Transform the argument, look up the type name, and apply any necessary
  * coercion function(s).
  */
 static Node *
 transformTypeCast(ParseState *pstate, TypeCast *tc)
 {
 	Node	   *result;
+	Node	   *arg = tc->arg;
 	Node	   *expr;
 	Oid			inputType;
 	Oid			targetType;
 	int32		targetTypmod;
 	int			location;
 
+	/* Look up the type name first */
 	typenameTypeIdAndMod(pstate, tc->typeName, &targetType, &targetTypmod);
 
 	/*
+	 * Look through any AEXPR_PAREN nodes that may have been inserted thanks
+	 * to operator_precedence_warning.  Otherwise, ARRAY[]::foo[] behaves
+	 * differently from (ARRAY[])::foo[].
+	 */
+	while (arg && IsA(arg, A_Expr) &&
+		   ((A_Expr *) arg)->kind == AEXPR_PAREN)
+		arg = ((A_Expr *) arg)->lexpr;
+
+	/*
 	 * If the subject of the typecast is an ARRAY[] construct and the target
 	 * type is an array type, we invoke transformArrayExpr() directly so that
 	 * we can pass down the type information.  This avoids some cases where
 	 * transformArrayExpr() might not infer the correct type.  Otherwise, just
 	 * transform the argument normally.
 	 */
-	if (IsA(tc->arg, A_ArrayExpr))
+	if (IsA(arg, A_ArrayExpr))
 	{
 		Oid			targetBaseType;
 		int32		targetBaseTypmod;
@@ -2493,16 +2517,16 @@
 		if (OidIsValid(elementType))
 		{
 			expr = transformArrayExpr(pstate,
-									  (A_ArrayExpr *) tc->arg,
+									  (A_ArrayExpr *) arg,
 									  targetBaseType,
 									  elementType,
 									  targetBaseTypmod);
 		}
 		else
-			expr = transformExprRecurse(pstate, tc->arg);
+			expr = transformExprRecurse(pstate, arg);
 	}
 	else
-		expr = transformExprRecurse(pstate, tc->arg);
+		expr = transformExprRecurse(pstate, arg);
 
 	inputType = exprType(expr);
 	if (inputType == InvalidOid)
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/parse_relation.c postgresql-9.5-9.5.8/src/backend/parser/parse_relation.c
--- postgresql-9.5-9.5.2/src/backend/parser/parse_relation.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/parse_relation.c	2017-08-07 21:13:41.000000000 +0000
@@ -52,6 +52,7 @@
 				int rtindex, int sublevels_up,
 				int location, bool include_dropped,
 				List **colnames, List **colvars);
+static int32 *getValuesTypmods(RangeTblEntry *rte);
 static int	specialAttNum(const char *attname);
 static bool isQueryUsingTempRelation_walker(Node *node, void *context);
 
@@ -2157,9 +2158,22 @@
 			{
 				/* Values RTE */
 				ListCell   *aliasp_item = list_head(rte->eref->colnames);
+				int32	   *coltypmods;
 				ListCell   *lcv;
 				ListCell   *lcc;
 
+				/*
+				 * It's okay to extract column types from the expressions in
+				 * the first row, since all rows will have been coerced to the
+				 * same types.  Their typmods might not be the same though, so
+				 * we potentially need to examine all rows to compute those.
+				 * Column collations are pre-computed in values_collations.
+				 */
+				if (colvars)
+					coltypmods = getValuesTypmods(rte);
+				else
+					coltypmods = NULL;
+
 				varattno = 0;
 				forboth(lcv, (List *) linitial(rte->values_lists),
 						lcc, rte->values_collations)
@@ -2184,13 +2198,15 @@
 
 						varnode = makeVar(rtindex, varattno,
 										  exprType(col),
-										  exprTypmod(col),
+										  coltypmods[varattno - 1],
 										  colcollation,
 										  sublevels_up);
 						varnode->location = location;
 						*colvars = lappend(*colvars, varnode);
 					}
 				}
+				if (coltypmods)
+					pfree(coltypmods);
 			}
 			break;
 		case RTE_JOIN:
@@ -2296,6 +2312,8 @@
 						varnode = makeVar(rtindex, varattno,
 										  coltype, coltypmod, colcoll,
 										  sublevels_up);
+						varnode->location = location;
+
 						*colvars = lappend(*colvars, varnode);
 					}
 				}
@@ -2413,6 +2431,74 @@
 }
 
 /*
+ * getValuesTypmods -- expandRTE subroutine
+ *
+ * Identify per-column typmods for the given VALUES RTE.  Returns a
+ * palloc'd array.
+ */
+static int32 *
+getValuesTypmods(RangeTblEntry *rte)
+{
+	int32	   *coltypmods;
+	List	   *firstrow;
+	int			ncolumns,
+				nvalid,
+				i;
+	ListCell   *lc;
+
+	Assert(rte->values_lists != NIL);
+	firstrow = (List *) linitial(rte->values_lists);
+	ncolumns = list_length(firstrow);
+	coltypmods = (int32 *) palloc(ncolumns * sizeof(int32));
+	nvalid = 0;
+
+	/* Collect the typmods from the first VALUES row */
+	i = 0;
+	foreach(lc, firstrow)
+	{
+		Node	   *col = (Node *) lfirst(lc);
+
+		coltypmods[i] = exprTypmod(col);
+		if (coltypmods[i] >= 0)
+			nvalid++;
+		i++;
+	}
+
+	/*
+	 * Scan remaining rows; as soon as we have a non-matching typmod for a
+	 * column, reset that typmod to -1.  We can bail out early if all typmods
+	 * become -1.
+	 */
+	if (nvalid > 0)
+	{
+		for_each_cell(lc, lnext(list_head(rte->values_lists)))
+		{
+			List	   *thisrow = (List *) lfirst(lc);
+			ListCell   *lc2;
+
+			Assert(list_length(thisrow) == ncolumns);
+			i = 0;
+			foreach(lc2, thisrow)
+			{
+				Node	   *col = (Node *) lfirst(lc2);
+
+				if (coltypmods[i] >= 0 && coltypmods[i] != exprTypmod(col))
+				{
+					coltypmods[i] = -1;
+					nvalid--;
+				}
+				i++;
+			}
+
+			if (nvalid <= 0)
+				break;
+		}
+	}
+
+	return coltypmods;
+}
+
+/*
  * expandRelAttrs -
  *	  Workhorse for "*" expansion: produce a list of targetentries
  *	  for the attributes of the RTE
@@ -2656,18 +2742,25 @@
 			break;
 		case RTE_VALUES:
 			{
-				/* Values RTE --- get type info from first sublist */
-				/* collation is stored separately, though */
+				/*
+				 * Values RTE --- we can get type info from first sublist, but
+				 * typmod may require scanning all sublists, and collation is
+				 * stored separately.  Using getValuesTypmods() is overkill,
+				 * but this path is taken so seldom for VALUES that it's not
+				 * worth writing extra code.
+				 */
 				List	   *collist = (List *) linitial(rte->values_lists);
 				Node	   *col;
+				int32	   *coltypmods = getValuesTypmods(rte);
 
 				if (attnum < 1 || attnum > list_length(collist))
 					elog(ERROR, "values list %s does not have attribute %d",
 						 rte->eref->aliasname, attnum);
 				col = (Node *) list_nth(collist, attnum - 1);
 				*vartype = exprType(col);
-				*vartypmod = exprTypmod(col);
+				*vartypmod = coltypmods[attnum - 1];
 				*varcollid = list_nth_oid(rte->values_collations, attnum - 1);
+				pfree(coltypmods);
 			}
 			break;
 		case RTE_JOIN:
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/parse_target.c postgresql-9.5-9.5.8/src/backend/parser/parse_target.c
--- postgresql-9.5-9.5.2/src/backend/parser/parse_target.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/parse_target.c	2017-08-07 21:13:41.000000000 +0000
@@ -122,11 +122,15 @@
 					ParseExprKind exprKind)
 {
 	List	   *p_target = NIL;
+	bool		expand_star;
 	ListCell   *o_target;
 
 	/* Shouldn't have any leftover multiassign items at start */
 	Assert(pstate->p_multiassign_exprs == NIL);
 
+	/* Expand "something.*" in SELECT and RETURNING, but not UPDATE */
+	expand_star = (exprKind != EXPR_KIND_UPDATE_SOURCE);
+
 	foreach(o_target, targetlist)
 	{
 		ResTarget  *res = (ResTarget *) lfirst(o_target);
@@ -136,35 +140,42 @@
 		 * "something", the star could appear as the last field in ColumnRef,
 		 * or as the last indirection item in A_Indirection.
 		 */
-		if (IsA(res->val, ColumnRef))
+		if (expand_star)
 		{
-			ColumnRef  *cref = (ColumnRef *) res->val;
-
-			if (IsA(llast(cref->fields), A_Star))
+			if (IsA(res->val, ColumnRef))
 			{
-				/* It is something.*, expand into multiple items */
-				p_target = list_concat(p_target,
-									   ExpandColumnRefStar(pstate, cref,
-														   true));
-				continue;
-			}
-		}
-		else if (IsA(res->val, A_Indirection))
-		{
-			A_Indirection *ind = (A_Indirection *) res->val;
+				ColumnRef  *cref = (ColumnRef *) res->val;
 
-			if (IsA(llast(ind->indirection), A_Star))
+				if (IsA(llast(cref->fields), A_Star))
+				{
+					/* It is something.*, expand into multiple items */
+					p_target = list_concat(p_target,
+										   ExpandColumnRefStar(pstate,
+															   cref,
+															   true));
+					continue;
+				}
+			}
+			else if (IsA(res->val, A_Indirection))
 			{
-				/* It is something.*, expand into multiple items */
-				p_target = list_concat(p_target,
-									   ExpandIndirectionStar(pstate, ind,
-															 true, exprKind));
-				continue;
+				A_Indirection *ind = (A_Indirection *) res->val;
+
+				if (IsA(llast(ind->indirection), A_Star))
+				{
+					/* It is something.*, expand into multiple items */
+					p_target = list_concat(p_target,
+										   ExpandIndirectionStar(pstate,
+																 ind,
+																 true,
+																 exprKind));
+					continue;
+				}
 			}
 		}
 
 		/*
-		 * Not "something.*", so transform as a single expression
+		 * Not "something.*", or we want to treat that as a plain whole-row
+		 * variable, so transform as a single expression
 		 */
 		p_target = lappend(p_target,
 						   transformTargetEntry(pstate,
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/parse_utilcmd.c postgresql-9.5-9.5.8/src/backend/parser/parse_utilcmd.c
--- postgresql-9.5-9.5.2/src/backend/parser/parse_utilcmd.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/parse_utilcmd.c	2017-08-07 21:13:41.000000000 +0000
@@ -1094,7 +1094,9 @@
 
 	/*
 	 * We don't try to preserve the name of the source index; instead, just
-	 * let DefineIndex() choose a reasonable name.
+	 * let DefineIndex() choose a reasonable name.  (If we tried to preserve
+	 * the name, we'd get duplicate-relation-name failures unless the source
+	 * table was in a different schema.)
 	 */
 	index->idxname = NULL;
 
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/scan.c postgresql-9.5-9.5.8/src/backend/parser/scan.c
--- postgresql-9.5-9.5.2/src/backend/parser/scan.c	2016-03-28 20:22:59.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/scan.c	2017-08-07 21:34:38.000000000 +0000
@@ -1,6 +1,48 @@
 #line 2 "scan.c"
+#line 2 "scan.l"
+/*-------------------------------------------------------------------------
+ *
+ * scan.l
+ *	  lexical scanner for PostgreSQL
+ *
+ * NOTE NOTE NOTE:
+ *
+ * The rules in this file must be kept in sync with psql's psqlscan.l!
+ *
+ * The rules are designed so that the scanner never has to backtrack,
+ * in the sense that there is always a rule that can match the input
+ * consumed so far (the rule action may internally throw back some input
+ * with yyless(), however).  As explained in the flex manual, this makes
+ * for a useful speed increase --- about a third faster than a plain -CF
+ * lexer, in simple testing.  The extra complexity is mostly in the rules
+ * for handling float numbers and continued string literals.  If you change
+ * the lexical rules, verify that you haven't broken the no-backtrack
+ * property by running flex with the "-b" option and checking that the
+ * resulting "lex.backup" file says that no backing up is needed.  (As of
+ * Postgres 9.2, this check is made automatically by the Makefile.)
+ *
+ *
+ * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/backend/parser/scan.l
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include <ctype.h>
+#include <unistd.h>
+
+#include "parser/gramparse.h"
+#include "parser/parser.h"				/* only needed for GUC variables */
+#include "parser/scansup.h"
+#include "mb/pg_wchar.h"
+
+
 
-#line 4 "scan.c"
+#line 46 "scan.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -8495,48 +8537,8 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 #line 1 "scan.l"
-#line 2 "scan.l"
-/*-------------------------------------------------------------------------
- *
- * scan.l
- *	  lexical scanner for PostgreSQL
- *
- * NOTE NOTE NOTE:
- *
- * The rules in this file must be kept in sync with psql's lexer!!!
- *
- * The rules are designed so that the scanner never has to backtrack,
- * in the sense that there is always a rule that can match the input
- * consumed so far (the rule action may internally throw back some input
- * with yyless(), however).  As explained in the flex manual, this makes
- * for a useful speed increase --- about a third faster than a plain -CF
- * lexer, in simple testing.  The extra complexity is mostly in the rules
- * for handling float numbers and continued string literals.  If you change
- * the lexical rules, verify that you haven't broken the no-backtrack
- * property by running flex with the "-b" option and checking that the
- * resulting "lex.backup" file says that no backing up is needed.  (As of
- * Postgres 9.2, this check is made automatically by the Makefile.)
- *
- *
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * IDENTIFICATION
- *	  src/backend/parser/scan.l
- *
- *-------------------------------------------------------------------------
- */
-#include "postgres.h"
-
-#include <ctype.h>
-#include <unistd.h>
-
-#include "parser/parser.h"				/* only needed for GUC variables */
-#include "parser/scanner.h"
-#include "parser/scansup.h"
-#include "mb/pg_wchar.h"
-
 
+#line 44 "scan.l"
 /* Avoid exit() on fatal scanner errors (a bit ugly -- see yy_fatal_error) */
 #undef fprintf
 #define fprintf(file, fmt, msg)  fprintf_to_ereport(fmt, msg)
@@ -8767,7 +8769,7 @@
  * Note that xcstart must appear before operator, as explained above!
  *  Also whitespace (comment) must appear before operator.
  */
-#line 8771 "scan.c"
+#line 8773 "scan.c"
 
 #define INITIAL 0
 #define xb 1
@@ -8942,7 +8944,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -8955,7 +8957,7 @@
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -9058,10 +9060,10 @@
 		}
 
 	{
-#line 392 "scan.l"
+#line 393 "scan.l"
 
 
-#line 9065 "scan.c"
+#line 9067 "scan.c"
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
@@ -9101,14 +9103,14 @@
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 394 "scan.l"
+#line 395 "scan.l"
 {
 					/* ignore */
 				}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 398 "scan.l"
+#line 399 "scan.l"
 {
 					/* Set location in case of syntax error in comment */
 					SET_YYLLOC();
@@ -9120,7 +9122,7 @@
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 407 "scan.l"
+#line 408 "scan.l"
 {
 					(yyextra->xcdepth)++;
 					/* Put back any characters past slash-star; see above */
@@ -9129,7 +9131,7 @@
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 413 "scan.l"
+#line 414 "scan.l"
 {
 					if (yyextra->xcdepth <= 0)
 						BEGIN(INITIAL);
@@ -9140,32 +9142,32 @@
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 420 "scan.l"
+#line 421 "scan.l"
 {
 					/* ignore */
 				}
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 424 "scan.l"
+#line 425 "scan.l"
 {
 					/* ignore */
 				}
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 428 "scan.l"
+#line 429 "scan.l"
 {
 					/* ignore */
 				}
 	YY_BREAK
 case YY_STATE_EOF(xc):
-#line 432 "scan.l"
+#line 433 "scan.l"
 { yyerror("unterminated /* comment"); }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 434 "scan.l"
+#line 435 "scan.l"
 {
 					/* Binary bit type.
 					 * At some point we should simply pass the string
@@ -9181,11 +9183,11 @@
 	YY_BREAK
 case 9:
 /* rule 9 can match eol */
-#line 447 "scan.l"
+#line 448 "scan.l"
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
-#line 447 "scan.l"
+#line 448 "scan.l"
 {
 					yyless(1);
 					BEGIN(INITIAL);
@@ -9195,33 +9197,33 @@
 	YY_BREAK
 case 11:
 /* rule 11 can match eol */
-#line 454 "scan.l"
+#line 455 "scan.l"
 case 12:
 /* rule 12 can match eol */
 YY_RULE_SETUP
-#line 454 "scan.l"
+#line 455 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
 	YY_BREAK
 case 13:
 /* rule 13 can match eol */
-#line 458 "scan.l"
+#line 459 "scan.l"
 case 14:
 /* rule 14 can match eol */
 YY_RULE_SETUP
-#line 458 "scan.l"
+#line 459 "scan.l"
 {
 					/* ignore */
 				}
 	YY_BREAK
 case YY_STATE_EOF(xb):
-#line 461 "scan.l"
+#line 462 "scan.l"
 { yyerror("unterminated bit string literal"); }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 463 "scan.l"
+#line 464 "scan.l"
 {
 					/* Hexadecimal bit type.
 					 * At some point we should simply pass the string
@@ -9237,11 +9239,11 @@
 	YY_BREAK
 case 16:
 /* rule 16 can match eol */
-#line 476 "scan.l"
+#line 477 "scan.l"
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 476 "scan.l"
+#line 477 "scan.l"
 {
 					yyless(1);
 					BEGIN(INITIAL);
@@ -9250,12 +9252,12 @@
 				}
 	YY_BREAK
 case YY_STATE_EOF(xh):
-#line 482 "scan.l"
+#line 483 "scan.l"
 { yyerror("unterminated hexadecimal string literal"); }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 484 "scan.l"
+#line 485 "scan.l"
 {
 					/* National character.
 					 * We will pass this along as a normal character string,
@@ -9284,7 +9286,7 @@
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 510 "scan.l"
+#line 511 "scan.l"
 {
 					yyextra->warn_on_first_escape = true;
 					yyextra->saw_non_ascii = false;
@@ -9298,7 +9300,7 @@
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 520 "scan.l"
+#line 521 "scan.l"
 {
 					yyextra->warn_on_first_escape = false;
 					yyextra->saw_non_ascii = false;
@@ -9309,7 +9311,7 @@
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 527 "scan.l"
+#line 528 "scan.l"
 {
 					SET_YYLLOC();
 					if (!yyextra->standard_conforming_strings)
@@ -9324,11 +9326,11 @@
 	YY_BREAK
 case 22:
 /* rule 22 can match eol */
-#line 539 "scan.l"
+#line 540 "scan.l"
 case 23:
 /* rule 23 can match eol */
 YY_RULE_SETUP
-#line 539 "scan.l"
+#line 540 "scan.l"
 {
 					yyless(1);
 					BEGIN(INITIAL);
@@ -9346,11 +9348,11 @@
 	YY_BREAK
 case 24:
 /* rule 24 can match eol */
-#line 554 "scan.l"
+#line 555 "scan.l"
 case 25:
 /* rule 25 can match eol */
 YY_RULE_SETUP
-#line 554 "scan.l"
+#line 555 "scan.l"
 {
 					/* throw back all but the quote */
 					yyless(1);
@@ -9361,17 +9363,17 @@
 case 26:
 /* rule 26 can match eol */
 YY_RULE_SETUP
-#line 560 "scan.l"
+#line 561 "scan.l"
 { /* stay in xusend state over whitespace */ }
 	YY_BREAK
 case 27:
-#line 562 "scan.l"
+#line 563 "scan.l"
 case 28:
 /* rule 28 can match eol */
-#line 563 "scan.l"
+#line 564 "scan.l"
 YY_RULE_SETUP
 case YY_STATE_EOF(xusend):
-#line 563 "scan.l"
+#line 564 "scan.l"
 {
 					/* no UESCAPE after the quote, throw back everything */
 					yyless(0);
@@ -9383,7 +9385,7 @@
 case 29:
 /* rule 29 can match eol */
 YY_RULE_SETUP
-#line 570 "scan.l"
+#line 571 "scan.l"
 {
 					/* found UESCAPE after the end quote */
 					BEGIN(INITIAL);
@@ -9399,7 +9401,7 @@
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 582 "scan.l"
+#line 583 "scan.l"
 {
 					addlitchar('\'', yyscanner);
 				}
@@ -9407,7 +9409,7 @@
 case 31:
 /* rule 31 can match eol */
 YY_RULE_SETUP
-#line 585 "scan.l"
+#line 586 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
@@ -9415,14 +9417,14 @@
 case 32:
 /* rule 32 can match eol */
 YY_RULE_SETUP
-#line 588 "scan.l"
+#line 589 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 591 "scan.l"
+#line 592 "scan.l"
 {
 					pg_wchar c = strtoul(yytext+2, NULL, 16);
 
@@ -9441,7 +9443,7 @@
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 606 "scan.l"
+#line 607 "scan.l"
 {
 					pg_wchar c = strtoul(yytext+2, NULL, 16);
 
@@ -9457,22 +9459,22 @@
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 618 "scan.l"
+#line 619 "scan.l"
 { yyerror("invalid Unicode surrogate pair"); }
 	YY_BREAK
 case 36:
 /* rule 36 can match eol */
 YY_RULE_SETUP
-#line 619 "scan.l"
+#line 620 "scan.l"
 { yyerror("invalid Unicode surrogate pair"); }
 	YY_BREAK
 case YY_STATE_EOF(xeu):
-#line 620 "scan.l"
+#line 621 "scan.l"
 { yyerror("invalid Unicode surrogate pair"); }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 621 "scan.l"
+#line 622 "scan.l"
 {
 						ereport(ERROR,
 								(errcode(ERRCODE_INVALID_ESCAPE_SEQUENCE),
@@ -9484,7 +9486,7 @@
 case 38:
 /* rule 38 can match eol */
 YY_RULE_SETUP
-#line 628 "scan.l"
+#line 629 "scan.l"
 {
 					if (yytext[1] == '\'')
 					{
@@ -9504,7 +9506,7 @@
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 644 "scan.l"
+#line 645 "scan.l"
 {
 					unsigned char c = strtoul(yytext+1, NULL, 8);
 
@@ -9516,7 +9518,7 @@
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 652 "scan.l"
+#line 653 "scan.l"
 {
 					unsigned char c = strtoul(yytext+2, NULL, 16);
 
@@ -9529,14 +9531,14 @@
 case 41:
 /* rule 41 can match eol */
 YY_RULE_SETUP
-#line 660 "scan.l"
+#line 661 "scan.l"
 {
 					/* ignore */
 				}
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 663 "scan.l"
+#line 664 "scan.l"
 {
 					/* This is only needed for \ just before EOF */
 					addlitchar(yytext[0], yyscanner);
@@ -9545,12 +9547,12 @@
 case YY_STATE_EOF(xq):
 case YY_STATE_EOF(xe):
 case YY_STATE_EOF(xus):
-#line 667 "scan.l"
+#line 668 "scan.l"
 { yyerror("unterminated quoted string"); }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 669 "scan.l"
+#line 670 "scan.l"
 {
 					SET_YYLLOC();
 					yyextra->dolqstart = pstrdup(yytext);
@@ -9560,7 +9562,7 @@
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 675 "scan.l"
+#line 676 "scan.l"
 {
 					SET_YYLLOC();
 					/* throw back all but the initial "$" */
@@ -9571,7 +9573,7 @@
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 682 "scan.l"
+#line 683 "scan.l"
 {
 					if (strcmp(yytext, yyextra->dolqstart) == 0)
 					{
@@ -9596,33 +9598,33 @@
 case 46:
 /* rule 46 can match eol */
 YY_RULE_SETUP
-#line 702 "scan.l"
+#line 703 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 705 "scan.l"
+#line 706 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 708 "scan.l"
+#line 709 "scan.l"
 {
 					/* This is only needed for $ inside the quoted text */
 					addlitchar(yytext[0], yyscanner);
 				}
 	YY_BREAK
 case YY_STATE_EOF(xdolq):
-#line 712 "scan.l"
+#line 713 "scan.l"
 { yyerror("unterminated dollar-quoted string"); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 714 "scan.l"
+#line 715 "scan.l"
 {
 					SET_YYLLOC();
 					BEGIN(xd);
@@ -9631,7 +9633,7 @@
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 719 "scan.l"
+#line 720 "scan.l"
 {
 					SET_YYLLOC();
 					BEGIN(xui);
@@ -9640,7 +9642,7 @@
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 724 "scan.l"
+#line 725 "scan.l"
 {
 					char		   *ident;
 
@@ -9656,7 +9658,7 @@
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 736 "scan.l"
+#line 737 "scan.l"
 {
 					yyless(1);
 					/* xuiend state looks for possible UESCAPE */
@@ -9666,17 +9668,17 @@
 case 53:
 /* rule 53 can match eol */
 YY_RULE_SETUP
-#line 741 "scan.l"
+#line 742 "scan.l"
 { /* stay in xuiend state over whitespace */ }
 	YY_BREAK
 case 54:
-#line 743 "scan.l"
+#line 744 "scan.l"
 case 55:
 /* rule 55 can match eol */
-#line 744 "scan.l"
+#line 745 "scan.l"
 YY_RULE_SETUP
 case YY_STATE_EOF(xuiend):
-#line 744 "scan.l"
+#line 745 "scan.l"
 {
 					/* no UESCAPE after the quote, throw back everything */
 					char	   *ident;
@@ -9698,7 +9700,7 @@
 case 56:
 /* rule 56 can match eol */
 YY_RULE_SETUP
-#line 761 "scan.l"
+#line 762 "scan.l"
 {
 					/* found UESCAPE after the end quote */
 					char	   *ident;
@@ -9723,7 +9725,7 @@
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 782 "scan.l"
+#line 783 "scan.l"
 {
 					addlitchar('"', yyscanner);
 				}
@@ -9731,19 +9733,19 @@
 case 58:
 /* rule 58 can match eol */
 YY_RULE_SETUP
-#line 785 "scan.l"
+#line 786 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
 	YY_BREAK
 case YY_STATE_EOF(xd):
 case YY_STATE_EOF(xui):
-#line 788 "scan.l"
+#line 789 "scan.l"
 { yyerror("unterminated quoted identifier"); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 790 "scan.l"
+#line 791 "scan.l"
 {
 					char		   *ident;
 
@@ -9758,7 +9760,7 @@
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 802 "scan.l"
+#line 803 "scan.l"
 {
 					SET_YYLLOC();
 					return TYPECAST;
@@ -9766,7 +9768,7 @@
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 807 "scan.l"
+#line 808 "scan.l"
 {
 					SET_YYLLOC();
 					return DOT_DOT;
@@ -9774,7 +9776,7 @@
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 812 "scan.l"
+#line 813 "scan.l"
 {
 					SET_YYLLOC();
 					return COLON_EQUALS;
@@ -9782,7 +9784,7 @@
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 817 "scan.l"
+#line 818 "scan.l"
 {
 					SET_YYLLOC();
 					return EQUALS_GREATER;
@@ -9790,7 +9792,7 @@
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 822 "scan.l"
+#line 823 "scan.l"
 {
 					SET_YYLLOC();
 					return LESS_EQUALS;
@@ -9798,7 +9800,7 @@
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 827 "scan.l"
+#line 828 "scan.l"
 {
 					SET_YYLLOC();
 					return GREATER_EQUALS;
@@ -9806,7 +9808,7 @@
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 832 "scan.l"
+#line 833 "scan.l"
 {
 					/* We accept both "<>" and "!=" as meaning NOT_EQUALS */
 					SET_YYLLOC();
@@ -9815,7 +9817,7 @@
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 838 "scan.l"
+#line 839 "scan.l"
 {
 					/* We accept both "<>" and "!=" as meaning NOT_EQUALS */
 					SET_YYLLOC();
@@ -9824,7 +9826,7 @@
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 844 "scan.l"
+#line 845 "scan.l"
 {
 					SET_YYLLOC();
 					return yytext[0];
@@ -9832,7 +9834,7 @@
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 849 "scan.l"
+#line 850 "scan.l"
 {
 					/*
 					 * Check for embedded slash-star or dash-dash; those
@@ -9911,7 +9913,7 @@
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 925 "scan.l"
+#line 926 "scan.l"
 {
 					SET_YYLLOC();
 					yylval->ival = atol(yytext + 1);
@@ -9920,7 +9922,7 @@
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 931 "scan.l"
+#line 932 "scan.l"
 {
 					SET_YYLLOC();
 					return process_integer_literal(yytext, yylval);
@@ -9928,7 +9930,7 @@
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 935 "scan.l"
+#line 936 "scan.l"
 {
 					SET_YYLLOC();
 					yylval->str = pstrdup(yytext);
@@ -9937,7 +9939,7 @@
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 940 "scan.l"
+#line 941 "scan.l"
 {
 					/* throw back the .., and treat as integer */
 					yyless(yyleng-2);
@@ -9947,7 +9949,7 @@
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 946 "scan.l"
+#line 947 "scan.l"
 {
 					SET_YYLLOC();
 					yylval->str = pstrdup(yytext);
@@ -9956,7 +9958,7 @@
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 951 "scan.l"
+#line 952 "scan.l"
 {
 					/*
 					 * throw back the [Ee], and treat as {decimal}.  Note
@@ -9972,7 +9974,7 @@
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 963 "scan.l"
+#line 964 "scan.l"
 {
 					/* throw back the [Ee][+-], and proceed as above */
 					yyless(yyleng-2);
@@ -9983,7 +9985,7 @@
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 972 "scan.l"
+#line 973 "scan.l"
 {
 					const ScanKeyword *keyword;
 					char		   *ident;
@@ -10011,14 +10013,14 @@
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 997 "scan.l"
+#line 998 "scan.l"
 {
 					SET_YYLLOC();
 					return yytext[0];
 				}
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1002 "scan.l"
+#line 1003 "scan.l"
 {
 					SET_YYLLOC();
 					yyterminate();
@@ -10026,10 +10028,10 @@
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 1007 "scan.l"
+#line 1008 "scan.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 10033 "scan.c"
+#line 10035 "scan.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -10215,7 +10217,7 @@
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -11123,7 +11125,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 1006 "scan.l"
+#line 1007 "scan.l"
 
 
 
@@ -11548,7 +11550,15 @@
 		}
 	}
 
+	/* unfinished surrogate pair? */
+	if (pair_first)
+	{
+		ADVANCE_YYLLOC(in - litbuf + 3);				/* 3 for U&" */
+		yyerror("invalid Unicode surrogate pair");
+	}
+
 	*out = '\0';
+
 	/*
 	 * We could skip pg_verifymbstr if we didn't process any non-7-bit-ASCII
 	 * codes; but it's probably not worth the trouble, since this isn't
diff -Nru postgresql-9.5-9.5.2/src/backend/parser/scan.l postgresql-9.5-9.5.8/src/backend/parser/scan.l
--- postgresql-9.5-9.5.2/src/backend/parser/scan.l	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/parser/scan.l	2017-08-07 21:13:41.000000000 +0000
@@ -1,4 +1,4 @@
-%{
+%top{
 /*-------------------------------------------------------------------------
  *
  * scan.l
@@ -6,7 +6,7 @@
  *
  * NOTE NOTE NOTE:
  *
- * The rules in this file must be kept in sync with psql's lexer!!!
+ * The rules in this file must be kept in sync with psql's psqlscan.l!
  *
  * The rules are designed so that the scanner never has to backtrack,
  * in the sense that there is always a rule that can match the input
@@ -34,12 +34,13 @@
 #include <ctype.h>
 #include <unistd.h>
 
+#include "parser/gramparse.h"
 #include "parser/parser.h"				/* only needed for GUC variables */
-#include "parser/scanner.h"
 #include "parser/scansup.h"
 #include "mb/pg_wchar.h"
+}
 
-
+%{
 /* Avoid exit() on fatal scanner errors (a bit ugly -- see yy_fatal_error) */
 #undef fprintf
 #define fprintf(file, fmt, msg)  fprintf_to_ereport(fmt, msg)
@@ -1427,7 +1428,15 @@
 		}
 	}
 
+	/* unfinished surrogate pair? */
+	if (pair_first)
+	{
+		ADVANCE_YYLLOC(in - litbuf + 3);				/* 3 for U&" */
+		yyerror("invalid Unicode surrogate pair");
+	}
+
 	*out = '\0';
+
 	/*
 	 * We could skip pg_verifymbstr if we didn't process any non-7-bit-ASCII
 	 * codes; but it's probably not worth the trouble, since this isn't
diff -Nru postgresql-9.5-9.5.2/src/backend/po/de.po postgresql-9.5-9.5.8/src/backend/po/de.po
--- postgresql-9.5-9.5.2/src/backend/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,14 +1,14 @@
 # German message translation file for PostgreSQL server
-# Peter Eisentraut <peter_e@gmx.net>, 2001 - 2016.
+# Peter Eisentraut <peter_e@gmx.net>, 2001 - 2017.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-03-27 21:08+0000\n"
-"PO-Revision-Date: 2016-03-28 00:25+0200\n"
+"POT-Creation-Date: 2017-05-07 21:26+0000\n"
+"PO-Revision-Date: 2017-05-08 08:34-0400\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -25,27 +25,27 @@
 #: ../common/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "ungültige Programmdatei „%s“"
+msgstr "ungültige Programmdatei »%s«"
 
 #: ../common/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "konnte Programmdatei „%s“ nicht lesen"
+msgstr "konnte Programmdatei »%s« nicht lesen"
 
 #: ../common/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "konnte kein „%s“ zum Ausführen finden"
+msgstr "konnte kein »%s« zum Ausführen finden"
 
 #: ../common/exec.c:257 ../common/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "konnte nicht in Verzeichnis „%s“ wechseln: %s"
+msgstr "konnte nicht in Verzeichnis »%s« wechseln: %s"
 
 #: ../common/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "konnte symbolische Verknüpfung „%s“ nicht lesen"
+msgstr "konnte symbolische Verknüpfung »%s« nicht lesen"
 
 #: ../common/exec.c:523
 #, c-format
@@ -53,8 +53,8 @@
 msgstr "pclose fehlgeschlagen: %s"
 
 #: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75
-#: ../common/fe_memutils.c:98 ../common/psprintf.c:181 ../port/path.c:598
-#: ../port/path.c:636 ../port/path.c:653
+#: ../common/fe_memutils.c:98 ../common/psprintf.c:181 ../port/path.c:602
+#: ../port/path.c:640 ../port/path.c:657
 #, c-format
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
@@ -67,37 +67,38 @@
 #: ../common/pgfnames.c:45
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht öffnen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht öffnen: %s\n"
 
 #: ../common/pgfnames.c:72
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht lesen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht lesen: %s\n"
 
 #: ../common/pgfnames.c:84
 #, c-format
 msgid "could not close directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht schließen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht schließen: %s\n"
 
-#: ../common/psprintf.c:179 ../port/path.c:596 ../port/path.c:634
-#: ../port/path.c:651 access/transam/xlog.c:6023 lib/stringinfo.c:258
-#: libpq/auth.c:820 libpq/auth.c:1181 libpq/auth.c:1249 libpq/auth.c:1660
-#: postmaster/bgworker.c:289 postmaster/bgworker.c:797
-#: postmaster/postmaster.c:2317 postmaster/postmaster.c:2348
-#: postmaster/postmaster.c:3867 postmaster/postmaster.c:4557
-#: postmaster/postmaster.c:4625 postmaster/postmaster.c:5315
-#: postmaster/postmaster.c:5568 replication/logical/logical.c:167
-#: storage/buffer/localbuf.c:396 storage/file/fd.c:588 storage/file/fd.c:985
-#: storage/file/fd.c:1103 storage/file/fd.c:1716 storage/ipc/procarray.c:907
+#: ../common/psprintf.c:179 ../port/path.c:600 ../port/path.c:638
+#: ../port/path.c:655 access/transam/xlog.c:6066 lib/stringinfo.c:258
+#: libpq/auth.c:823 libpq/auth.c:1186 libpq/auth.c:1254 libpq/auth.c:1665
+#: postmaster/bgworker.c:309 postmaster/bgworker.c:821
+#: postmaster/postmaster.c:2333 postmaster/postmaster.c:2364
+#: postmaster/postmaster.c:3883 postmaster/postmaster.c:4573
+#: postmaster/postmaster.c:4648 postmaster/postmaster.c:5314
+#: postmaster/postmaster.c:5608 replication/logical/logical.c:168
+#: storage/buffer/localbuf.c:396 storage/file/fd.c:595 storage/file/fd.c:1023
+#: storage/file/fd.c:1141 storage/file/fd.c:1793 storage/ipc/procarray.c:907
 #: storage/ipc/procarray.c:1393 storage/ipc/procarray.c:1400
-#: storage/ipc/procarray.c:1793 storage/ipc/procarray.c:2377
-#: utils/adt/formatting.c:1523 utils/adt/formatting.c:1643
-#: utils/adt/formatting.c:1764 utils/adt/regexp.c:219 utils/adt/varlena.c:4212
+#: storage/ipc/procarray.c:1793 storage/ipc/procarray.c:2385
+#: utils/adt/formatting.c:1522 utils/adt/formatting.c:1642
+#: utils/adt/formatting.c:1763 utils/adt/pg_locale.c:463
+#: utils/adt/pg_locale.c:647 utils/adt/regexp.c:219 utils/adt/varlena.c:4212
 #: utils/adt/varlena.c:4233 utils/fmgr/dfmgr.c:216 utils/hash/dynahash.c:411
 #: utils/hash/dynahash.c:488 utils/hash/dynahash.c:1002 utils/mb/mbutils.c:376
 #: utils/mb/mbutils.c:709 utils/misc/guc.c:3723 utils/misc/guc.c:3739
 #: utils/misc/guc.c:3752 utils/misc/guc.c:6686 utils/misc/tzparser.c:470
-#: utils/mmgr/aset.c:504 utils/mmgr/mcxt.c:688 utils/mmgr/mcxt.c:723
+#: utils/mmgr/aset.c:505 utils/mmgr/mcxt.c:688 utils/mmgr/mcxt.c:723
 #: utils/mmgr/mcxt.c:760 utils/mmgr/mcxt.c:797 utils/mmgr/mcxt.c:831
 #: utils/mmgr/mcxt.c:860 utils/mmgr/mcxt.c:894 utils/mmgr/mcxt.c:976
 #: utils/mmgr/mcxt.c:1010 utils/mmgr/mcxt.c:1059
@@ -113,7 +114,7 @@
 #: ../common/relpath.c:60
 #, c-format
 msgid "Valid fork names are \"main\", \"fsm\", \"vm\", and \"init\"."
-msgstr "Gültige Fork-Namen sind „main“, „fsm“, „vm“ und „init“."
+msgstr "Gültige Fork-Namen sind »main«, »fsm«, »vm« und »init«."
 
 #: ../common/restricted_token.c:68
 #, c-format
@@ -138,7 +139,7 @@
 #: ../common/restricted_token.c:132
 #, c-format
 msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: konnte Prozess für Befehl „%s“ nicht starten: Fehlercode %lu\n"
+msgstr "%s: konnte Prozess für Befehl »%s« nicht starten: Fehlercode %lu\n"
 
 #: ../common/restricted_token.c:170
 #, c-format
@@ -153,19 +154,19 @@
 #: ../common/rmtree.c:77
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
-msgstr "konnte „stat“ für Datei oder Verzeichnis „%s“ nicht ausführen: %s\n"
+msgstr "konnte »stat« für Datei oder Verzeichnis »%s« nicht ausführen: %s\n"
 
 #: ../common/rmtree.c:104 ../common/rmtree.c:121
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
-msgstr "konnte Datei oder Verzeichnis „%s“ nicht entfernen: %s\n"
+msgstr "konnte Datei oder Verzeichnis »%s« nicht entfernen: %s\n"
 
 #: ../common/username.c:45
 #, c-format
 msgid "could not look up effective user ID %ld: %s"
 msgstr "konnte effektive Benutzer-ID %ld nicht nachschlagen: %s"
 
-#: ../common/username.c:47 libpq/auth.c:1607
+#: ../common/username.c:47 libpq/auth.c:1612
 msgid "user does not exist"
 msgstr "Benutzer existiert nicht"
 
@@ -209,46 +210,46 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "Kindprozess hat mit unbekanntem Status %d beendet"
 
-#: ../port/chklocale.c:259
+#: ../port/chklocale.c:294
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
-msgstr "konnte Kodierung für Codeset „%s“ nicht bestimmen"
+msgstr "konnte Kodierung für Codeset »%s« nicht bestimmen"
 
-#: ../port/chklocale.c:260 ../port/chklocale.c:389
-#: postmaster/postmaster.c:4857
+#: ../port/chklocale.c:295 ../port/chklocale.c:424
+#: postmaster/postmaster.c:4852
 #, c-format
 msgid "Please report this to <pgsql-bugs@postgresql.org>."
 msgstr "Bitte berichten Sie das an <pgsql-bugs@postgresql.org>."
 
-#: ../port/chklocale.c:381 ../port/chklocale.c:387
+#: ../port/chklocale.c:416 ../port/chklocale.c:422
 #, c-format
 msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
-msgstr "konnte Kodierung für Locale „%s“ nicht bestimmen: Codeset ist „%s“"
+msgstr "konnte Kodierung für Locale »%s« nicht bestimmen: Codeset ist »%s«"
 
-#: ../port/dirmod.c:216
+#: ../port/dirmod.c:218
 #, c-format
 msgid "could not set junction for \"%s\": %s"
-msgstr "konnte Junction für „%s“ nicht erzeugen: %s"
+msgstr "konnte Junction für »%s« nicht erzeugen: %s"
 
-#: ../port/dirmod.c:219
+#: ../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
-msgstr "konnte Junction für „%s“ nicht erzeugen: %s\n"
+msgstr "konnte Junction für »%s« nicht erzeugen: %s\n"
 
-#: ../port/dirmod.c:291
+#: ../port/dirmod.c:295
 #, c-format
 msgid "could not get junction for \"%s\": %s"
-msgstr "konnte Junction für „%s“ nicht ermitteln: %s"
+msgstr "konnte Junction für »%s« nicht ermitteln: %s"
 
-#: ../port/dirmod.c:294
+#: ../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
-msgstr "konnte Junction für „%s“ nicht ermitteln: %s\n"
+msgstr "konnte Junction für »%s« nicht ermitteln: %s\n"
 
 #: ../port/open.c:112
 #, c-format
 msgid "could not open file \"%s\": %s"
-msgstr "konnte Datei „%s“ nicht öffnen: %s"
+msgstr "konnte Datei »%s« nicht öffnen: %s"
 
 #: ../port/open.c:113
 msgid "lock violation"
@@ -268,7 +269,7 @@
 msgid "You might have antivirus, backup, or similar software interfering with the database system."
 msgstr "Möglicherweise stört eine Antivirus-, Datensicherungs- oder ähnliche Software das Datenbanksystem."
 
-#: ../port/path.c:620
+#: ../port/path.c:624
 #, c-format
 msgid "could not get current working directory: %s\n"
 msgstr "konnte aktuelles Arbeitsverzeichnis nicht ermitteln: %s\n"
@@ -281,7 +282,7 @@
 #: access/brin/brin.c:814
 #, c-format
 msgid "\"%s\" is not a BRIN index"
-msgstr "„%s“ ist kein BRIN-Index"
+msgstr "»%s« ist kein BRIN-Index"
 
 #: access/brin/brin.c:830
 #, c-format
@@ -292,12 +293,12 @@
 #: access/brin/brin_pageops.c:828
 #, 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“"
+msgstr "Größe %lu der Indexzeile überschreitet Maximum %lu für Index »%s«"
 
-#: access/brin/brin_revmap.c:449
+#: access/brin/brin_revmap.c:453
 #, c-format
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
-msgstr "unerwarteter Seitentyp 0x%04X in BRIN-Index „%s“ Block %u"
+msgstr "unerwarteter Seitentyp 0x%04X in BRIN-Index »%s« Block %u"
 
 #: access/common/heaptuple.c:708 access/common/heaptuple.c:1450
 #, c-format
@@ -314,7 +315,7 @@
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "Indexzeile benötigt %zu Bytes, Maximalgröße ist %zu"
 
-#: access/common/printtup.c:294 tcop/fastpath.c:182 tcop/fastpath.c:544
+#: access/common/printtup.c:294 tcop/fastpath.c:182 tcop/fastpath.c:532
 #: tcop/postgres.c:1730
 #, c-format
 msgid "unsupported format code: %d"
@@ -333,47 +334,47 @@
 #: access/common/reloptions.c:734
 #, c-format
 msgid "unrecognized parameter namespace \"%s\""
-msgstr "unbekannter Parameter-Namensraum „%s“"
+msgstr "unbekannter Parameter-Namensraum »%s«"
 
 #: access/common/reloptions.c:974 parser/parse_clause.c:279
 #, c-format
 msgid "unrecognized parameter \"%s\""
-msgstr "unbekannter Parameter „%s“"
+msgstr "unbekannter Parameter »%s«"
 
 #: access/common/reloptions.c:1004
 #, c-format
 msgid "parameter \"%s\" specified more than once"
-msgstr "Parameter „%s“ mehrmals angegeben"
+msgstr "Parameter »%s« mehrmals angegeben"
 
 #: access/common/reloptions.c:1020
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
-msgstr "ungültiger Wert für Boole’sche Option „%s“: „%s“"
+msgstr "ungültiger Wert für Boole’sche Option »%s«: »%s«"
 
 #: access/common/reloptions.c:1032
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
-msgstr "ungültiger Wert für ganzzahlige Option „%s“: „%s“"
+msgstr "ungültiger Wert für ganzzahlige Option »%s«: »%s«"
 
 #: access/common/reloptions.c:1038 access/common/reloptions.c:1058
 #, 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“"
+msgstr "Wert %s ist außerhalb des gültigen Bereichs für Option »%s«"
 
 #: access/common/reloptions.c:1040
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
-msgstr "Gültige Werte sind zwischen „%d“ und „%d“."
+msgstr "Gültige Werte sind zwischen »%d« und »%d«."
 
 #: access/common/reloptions.c:1052
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
-msgstr "ungültiger Wert für Gleitkommaoption „%s“: „%s“"
+msgstr "ungültiger Wert für Gleitkommaoption »%s«: »%s«"
 
 #: access/common/reloptions.c:1060
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
-msgstr "Gültige Werte sind zwischen „%f“ und „%f“."
+msgstr "Gültige Werte sind zwischen »%f« und »%f«."
 
 #: access/common/tupconvert.c:108
 #, c-format
@@ -385,27 +386,27 @@
 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:241
+#: access/common/tupconvert.c:314
 #, 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."
+msgstr "Attribut »%s« von Typ %s stimmt nicht mit dem entsprechenden Attribut von Typ %s überein."
 
-#: access/common/tupconvert.c:253
+#: access/common/tupconvert.c:326
 #, 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."
+msgstr "Attribut »%s« von Typ %s existiert nicht in Typ %s."
 
-#: access/common/tupdesc.c:635 parser/parse_relation.c:1517
+#: access/common/tupdesc.c:635 parser/parse_relation.c:1518
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
-msgstr "Spalte „%s“ kann nicht als SETOF deklariert werden"
+msgstr "Spalte »%s« kann nicht als SETOF deklariert werden"
 
 #: access/gin/ginentrypage.c:109 access/gist/gist.c:1289
-#: access/nbtree/nbtinsert.c:567 access/nbtree/nbtsort.c:488
+#: access/nbtree/nbtinsert.c:575 access/nbtree/nbtsort.c:488
 #: access/spgist/spgdoinsert.c:1907
 #, c-format
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
-msgstr "Größe %zu der Indexzeile überschreitet Maximum %zu für Index „%s“"
+msgstr "Größe %zu der Indexzeile überschreitet Maximum %zu für Index »%s«"
 
 #: access/gin/ginscan.c:412
 #, c-format
@@ -420,7 +421,7 @@
 #: access/gist/gist.c:632 access/gist/gistvacuum.c:266
 #, 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"
+msgstr "Index »%s« enthält ein inneres Tupel, das als ungültig markiert ist"
 
 #: access/gist/gist.c:634 access/gist/gistvacuum.c:268
 #, c-format
@@ -439,12 +440,12 @@
 #: access/gist/gistbuild.c:252
 #, c-format
 msgid "invalid value for \"buffering\" option"
-msgstr "ungültiger Wert für Option „buffering“"
+msgstr "ungültiger Wert für Option »buffering«"
 
 #: access/gist/gistbuild.c:253
 #, c-format
 msgid "Valid values are \"on\", \"off\", and \"auto\"."
-msgstr "Gültige Werte sind „on“, „off“ und „auto“."
+msgstr "Gültige Werte sind »on«, »off« und »auto«."
 
 #: access/gist/gistbuildbuffers.c:778 utils/sort/logtape.c:209
 #, c-format
@@ -454,7 +455,7 @@
 #: access/gist/gistsplit.c:446
 #, c-format
 msgid "picksplit method for column %d of index \"%s\" failed"
-msgstr "Picksplit-Methode für Spalte %d von Index „%s“ fehlgeschlagen"
+msgstr "Picksplit-Methode für Spalte %d von Index »%s« fehlgeschlagen"
 
 #: access/gist/gistsplit.c:448
 #, c-format
@@ -465,20 +466,20 @@
 #: access/nbtree/nbtpage.c:515
 #, c-format
 msgid "index \"%s\" contains unexpected zero page at block %u"
-msgstr "Index „%s“ enthält unerwartete Nullseite bei Block %u"
+msgstr "Index »%s« enthält unerwartete Nullseite bei Block %u"
 
 #: access/gist/gistutil.c:743 access/hash/hashutil.c:180
 #: access/hash/hashutil.c:192 access/nbtree/nbtpage.c:526
 #, c-format
 msgid "index \"%s\" contains corrupted page at block %u"
-msgstr "Index „%s“ enthält korrupte Seite bei Block %u"
+msgstr "Index »%s« enthält korrupte Seite bei Block %u"
 
-#: access/hash/hashinsert.c:68
+#: access/hash/hashinsert.c:70
 #, c-format
 msgid "index row size %zu exceeds hash maximum %zu"
 msgstr "Größe der Indexzeile %zu überschreitet Maximum für Hash-Index %zu"
 
-#: access/hash/hashinsert.c:70 access/spgist/spgdoinsert.c:1911
+#: access/hash/hashinsert.c:72 access/spgist/spgdoinsert.c:1911
 #: access/spgist/spgutils.c:666
 #, c-format
 msgid "Values larger than a buffer page cannot be indexed."
@@ -487,7 +488,7 @@
 #: access/hash/hashovfl.c:546
 #, c-format
 msgid "out of overflow pages in hash index \"%s\""
-msgstr "keine Überlaufseiten in Hash-Index „%s“ mehr"
+msgstr "keine Überlaufseiten in Hash-Index »%s« mehr"
 
 #: access/hash/hashsearch.c:153
 #, c-format
@@ -497,12 +498,12 @@
 #: access/hash/hashutil.c:208
 #, c-format
 msgid "index \"%s\" is not a hash index"
-msgstr "Index „%s“ ist kein Hash-Index"
+msgstr "Index »%s« ist kein Hash-Index"
 
 #: access/hash/hashutil.c:214
 #, c-format
 msgid "index \"%s\" has wrong hash version"
-msgstr "Index „%s“ hat falsche Hash-Version"
+msgstr "Index »%s« hat falsche Hash-Version"
 
 #: access/heap/heapam.c:1074 access/heap/heapam.c:1126
 #, c-format
@@ -513,14 +514,14 @@
 #: access/heap/heapam.c:1303 catalog/aclchk.c:1733
 #, c-format
 msgid "\"%s\" is an index"
-msgstr "„%s“ ist ein Index"
+msgstr "»%s« ist ein Index"
 
 #: access/heap/heapam.c:1248 access/heap/heapam.c:1276
-#: access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:8954
-#: commands/tablecmds.c:11995
+#: access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:9052
+#: commands/tablecmds.c:12153
 #, c-format
 msgid "\"%s\" is a composite type"
-msgstr "„%s“ ist ein zusammengesetzter Typ"
+msgstr "»%s« ist ein zusammengesetzter Typ"
 
 #: access/heap/heapam.c:2344
 #, c-format
@@ -537,21 +538,21 @@
 msgid "attempted to delete invisible tuple"
 msgstr "Versuch ein unsichtbares Tupel zu löschen"
 
-#: access/heap/heapam.c:3267 access/heap/heapam.c:5818
+#: access/heap/heapam.c:3266 access/heap/heapam.c:5906
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "während einer parallelen Operation können keine Tupel aktualisiert werden"
 
-#: access/heap/heapam.c:3389
+#: access/heap/heapam.c:3388
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "Versuch ein unsichtbares Tupel zu aktualisieren"
 
-#: access/heap/heapam.c:4640 access/heap/heapam.c:4678
-#: access/heap/heapam.c:4901 executor/execMain.c:2279
+#: access/heap/heapam.c:4703 access/heap/heapam.c:4741
+#: access/heap/heapam.c:4964 executor/execMain.c:2279
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
-msgstr "konnte Sperre für Zeile in Relation „%s“ nicht setzen"
+msgstr "konnte Sperre für Zeile in Relation »%s« nicht setzen"
 
 #: access/heap/hio.c:253 access/heap/rewriteheap.c:666
 #, c-format
@@ -561,115 +562,115 @@
 #: access/heap/rewriteheap.c:925
 #, c-format
 msgid "could not write to file \"%s\", wrote %d of %d: %m"
-msgstr "konnte nicht in Datei „%s“ schreiben, %d von %d geschrieben: %m"
+msgstr "konnte nicht in Datei »%s« schreiben, %d von %d geschrieben: %m"
 
 #: access/heap/rewriteheap.c:965 access/heap/rewriteheap.c:1177
 #: access/heap/rewriteheap.c:1274 access/transam/timeline.c:407
-#: access/transam/timeline.c:483 access/transam/xlog.c:3011
-#: access/transam/xlog.c:3173 replication/logical/snapbuild.c:1588
-#: replication/slot.c:1026 replication/slot.c:1115 storage/file/fd.c:483
-#: storage/file/fd.c:2847 storage/smgr/md.c:982 storage/smgr/md.c:1213
-#: storage/smgr/md.c:1386 utils/misc/guc.c:6708
+#: access/transam/timeline.c:483 access/transam/xlog.c:3040
+#: access/transam/xlog.c:3202 replication/logical/snapbuild.c:1609
+#: replication/slot.c:1053 replication/slot.c:1142 storage/file/fd.c:490
+#: storage/file/fd.c:2924 storage/smgr/md.c:983 storage/smgr/md.c:1214
+#: storage/smgr/md.c:1387 utils/misc/guc.c:6708
 #, c-format
 msgid "could not fsync file \"%s\": %m"
-msgstr "konnte Datei „%s“ nicht fsyncen: %m"
+msgstr "konnte Datei »%s« nicht fsyncen: %m"
 
 #: access/heap/rewriteheap.c:1020 access/heap/rewriteheap.c:1140
 #: access/transam/timeline.c:315 access/transam/timeline.c:461
-#: access/transam/xlog.c:2967 access/transam/xlog.c:3116
-#: access/transam/xlog.c:10075 access/transam/xlog.c:10111
-#: access/transam/xlog.c:10433 postmaster/postmaster.c:4332
-#: replication/logical/origin.c:542 replication/slot.c:983
-#: storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1071
+#: access/transam/xlog.c:2996 access/transam/xlog.c:3145
+#: access/transam/xlog.c:10147 access/transam/xlog.c:10183
+#: access/transam/xlog.c:10561 postmaster/postmaster.c:4348
+#: replication/logical/origin.c:542 replication/slot.c:1010
+#: storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1123
 #, c-format
 msgid "could not create file \"%s\": %m"
-msgstr "konnte Datei „%s“ nicht erstellen: %m"
+msgstr "konnte Datei »%s« nicht erstellen: %m"
 
 #: access/heap/rewriteheap.c:1149
 #, c-format
 msgid "could not truncate file \"%s\" to %u: %m"
-msgstr "konnte Datei „%s“ nicht auf %u kürzen: %m"
+msgstr "konnte Datei »%s« nicht auf %u kürzen: %m"
 
 #: access/heap/rewriteheap.c:1156 replication/walsender.c:479
-#: storage/smgr/md.c:1798
+#: storage/smgr/md.c:1799
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
-msgstr "konnte Positionszeiger nicht ans Ende der Datei „%s“ setzen: %m"
+msgstr "konnte Positionszeiger nicht ans Ende der Datei »%s« setzen: %m"
 
 #: access/heap/rewriteheap.c:1167 access/transam/timeline.c:367
 #: access/transam/timeline.c:401 access/transam/timeline.c:477
-#: access/transam/xlog.c:3002 access/transam/xlog.c:3166
-#: postmaster/postmaster.c:4342 postmaster/postmaster.c:4352
-#: replication/logical/origin.c:551 replication/logical/origin.c:587
-#: replication/logical/origin.c:603 replication/logical/snapbuild.c:1572
-#: replication/slot.c:1012 storage/file/copydir.c:187
+#: access/transam/xlog.c:3031 access/transam/xlog.c:3195
+#: postmaster/postmaster.c:4358 postmaster/postmaster.c:4368
+#: replication/logical/origin.c:551 replication/logical/origin.c:590
+#: replication/logical/origin.c:606 replication/logical/snapbuild.c:1593
+#: replication/slot.c:1039 storage/file/copydir.c:187
 #: utils/init/miscinit.c:1209 utils/init/miscinit.c:1218
 #: utils/init/miscinit.c:1225 utils/misc/guc.c:6669 utils/misc/guc.c:6700
-#: utils/misc/guc.c:8494 utils/misc/guc.c:8508 utils/time/snapmgr.c:1076
-#: utils/time/snapmgr.c:1083
+#: utils/misc/guc.c:8519 utils/misc/guc.c:8533 utils/time/snapmgr.c:1128
+#: utils/time/snapmgr.c:1135
 #, c-format
 msgid "could not write to file \"%s\": %m"
-msgstr "konnte nicht in Datei „%s“ schreiben: %m"
+msgstr "konnte nicht in Datei »%s« schreiben: %m"
 
-#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10300
+#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10399
 #: access/transam/xlogarchive.c:114 access/transam/xlogarchive.c:468
-#: replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2482
-#: replication/logical/reorderbuffer.c:2539
-#: replication/logical/snapbuild.c:1516 replication/logical/snapbuild.c:1891
-#: replication/slot.c:1089 storage/ipc/dsm.c:326 storage/smgr/md.c:420
-#: storage/smgr/md.c:469 storage/smgr/md.c:1333
+#: replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2497
+#: replication/logical/reorderbuffer.c:2554
+#: replication/logical/snapbuild.c:1537 replication/logical/snapbuild.c:1912
+#: replication/slot.c:1116 storage/ipc/dsm.c:326 storage/smgr/md.c:420
+#: storage/smgr/md.c:469 storage/smgr/md.c:1334
 #, c-format
 msgid "could not remove file \"%s\": %m"
-msgstr "konnte Datei „%s“ nicht löschen: %m"
+msgstr "konnte Datei »%s« nicht löschen: %m"
 
 #: access/heap/rewriteheap.c:1264 access/transam/timeline.c:111
 #: access/transam/timeline.c:236 access/transam/timeline.c:334
-#: access/transam/xlog.c:2943 access/transam/xlog.c:3060
-#: access/transam/xlog.c:3101 access/transam/xlog.c:3374
-#: access/transam/xlog.c:3452 replication/basebackup.c:398
-#: replication/basebackup.c:1159 replication/logical/logicalfuncs.c:154
-#: replication/logical/origin.c:658 replication/logical/reorderbuffer.c:2071
-#: replication/logical/reorderbuffer.c:2284
-#: replication/logical/reorderbuffer.c:2930
-#: replication/logical/snapbuild.c:1565 replication/logical/snapbuild.c:1649
-#: replication/slot.c:1104 replication/walsender.c:472
-#: replication/walsender.c:2100 storage/file/copydir.c:155
-#: storage/file/fd.c:466 storage/file/fd.c:2760 storage/file/fd.c:2826
-#: storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1854
+#: access/transam/xlog.c:2972 access/transam/xlog.c:3089
+#: access/transam/xlog.c:3130 access/transam/xlog.c:3403
+#: access/transam/xlog.c:3481 replication/basebackup.c:400
+#: replication/basebackup.c:1147 replication/logical/logicalfuncs.c:154
+#: replication/logical/origin.c:661 replication/logical/reorderbuffer.c:2075
+#: replication/logical/reorderbuffer.c:2291
+#: replication/logical/reorderbuffer.c:2946
+#: replication/logical/snapbuild.c:1586 replication/logical/snapbuild.c:1670
+#: replication/slot.c:1131 replication/walsender.c:472
+#: replication/walsender.c:2099 storage/file/copydir.c:155
+#: storage/file/fd.c:473 storage/file/fd.c:2837 storage/file/fd.c:2903
+#: storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1863
 #: utils/init/miscinit.c:1144 utils/init/miscinit.c:1265
-#: utils/init/miscinit.c:1343 utils/misc/guc.c:6912 utils/misc/guc.c:6944
+#: utils/init/miscinit.c:1343 utils/misc/guc.c:6928 utils/misc/guc.c:6961
 #, c-format
 msgid "could not open file \"%s\": %m"
-msgstr "konnte Datei „%s“ nicht öffnen: %m"
+msgstr "konnte Datei »%s« nicht öffnen: %m"
 
 #: access/index/indexam.c:172 catalog/objectaddress.c:1144
-#: commands/indexcmds.c:1754 commands/tablecmds.c:239
-#: commands/tablecmds.c:11986
+#: commands/indexcmds.c:1755 commands/tablecmds.c:240
+#: commands/tablecmds.c:12144
 #, c-format
 msgid "\"%s\" is not an index"
-msgstr "„%s“ ist kein Index"
+msgstr "»%s« ist kein Index"
 
-#: access/nbtree/nbtinsert.c:419
+#: access/nbtree/nbtinsert.c:427
 #, c-format
 msgid "duplicate key value violates unique constraint \"%s\""
-msgstr "doppelter Schlüsselwert verletzt Unique-Constraint „%s“"
+msgstr "doppelter Schlüsselwert verletzt Unique-Constraint »%s«"
 
-#: access/nbtree/nbtinsert.c:421
+#: access/nbtree/nbtinsert.c:429
 #, c-format
 msgid "Key %s already exists."
-msgstr "Schlüssel „%s“ existiert bereits."
+msgstr "Schlüssel »%s« existiert bereits."
 
-#: access/nbtree/nbtinsert.c:488
+#: access/nbtree/nbtinsert.c:496
 #, c-format
 msgid "failed to re-find tuple within index \"%s\""
-msgstr "konnte Tupel mit Index „%s“ nicht erneut finden"
+msgstr "konnte Tupel mit Index »%s« nicht erneut finden"
 
-#: access/nbtree/nbtinsert.c:490
+#: access/nbtree/nbtinsert.c:498
 #, c-format
 msgid "This may be because of a non-immutable index expression."
-msgstr "Das kann daran liegen, dass der Indexausdruck nicht „immutable“ ist."
+msgstr "Das kann daran liegen, dass der Indexausdruck nicht »immutable« ist."
 
-#: access/nbtree/nbtinsert.c:570 access/nbtree/nbtsort.c:491
+#: access/nbtree/nbtinsert.c:578 access/nbtree/nbtsort.c:491
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -679,21 +680,21 @@
 "Erstellen Sie eventuell einen Funktionsindex auf einen MD5-Hash oder verwenden Sie Volltextindizierung."
 
 #: access/nbtree/nbtpage.c:168 access/nbtree/nbtpage.c:371
-#: access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1665
+#: access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1667
 #, c-format
 msgid "index \"%s\" is not a btree"
-msgstr "Index „%s“ ist kein B-Tree"
+msgstr "Index »%s« ist kein B-Tree"
 
 #: access/nbtree/nbtpage.c:174 access/nbtree/nbtpage.c:377
 #: access/nbtree/nbtpage.c:464
 #, 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"
+msgstr "keine Versionsübereinstimmung in Index »%s«: Dateiversion %d, Code-Version %d"
 
 #: access/nbtree/nbtpage.c:1152
 #, c-format
 msgid "index \"%s\" contains a half-dead internal page"
-msgstr "Index „%s“ enthält eine halbtote interne Seite"
+msgstr "Index »%s« enthält eine halbtote interne Seite"
 
 #: access/nbtree/nbtpage.c:1154
 #, c-format
@@ -710,30 +711,30 @@
 msgid "sample percentage must be between 0 and 100"
 msgstr "Stichprobenprozentsatz muss zwischen 0 und 100 sein"
 
-#: access/transam/commit_ts.c:295
+#: access/transam/commit_ts.c:294
 #, c-format
 msgid "cannot retrieve commit timestamp for transaction %u"
 msgstr "Commit-Timestamp von Transaktion %u kann nicht abgefragt werden"
 
-#: access/transam/commit_ts.c:385
+#: access/transam/commit_ts.c:392
 #, c-format
 msgid "could not get commit timestamp data"
 msgstr "konnte Commit-Timestamp-Daten nicht auslesen"
 
-#: access/transam/commit_ts.c:387
+#: access/transam/commit_ts.c:394
 #, c-format
 msgid "Make sure the configuration parameter \"%s\" is set on the master server."
-msgstr "Stellen Sie sicher, dass der Konfigurationsparameter „%s“ auf dem Masterserver gesetzt ist."
+msgstr "Stellen Sie sicher, dass der Konfigurationsparameter »%s« auf dem Masterserver gesetzt ist."
 
-#: access/transam/commit_ts.c:389 libpq/hba.c:1424
+#: access/transam/commit_ts.c:396 libpq/hba.c:1424
 #, c-format
 msgid "Make sure the configuration parameter \"%s\" is set."
-msgstr "Stellen Sie sicher, dass der Konfigurationsparameter „%s“ gesetzt ist."
+msgstr "Stellen Sie sicher, dass der Konfigurationsparameter »%s« gesetzt ist."
 
 #: access/transam/multixact.c:1008
 #, c-format
 msgid "database is not accepting commands that generate new MultiXactIds to avoid wraparound data loss in database \"%s\""
-msgstr "Datenbank nimmt keine Befehle an, die neue MultiXactIds erzeugen, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank „%s“ zu vermeiden"
+msgstr "Datenbank nimmt keine Befehle an, die neue MultiXactIds erzeugen, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank »%s« zu vermeiden"
 
 #: access/transam/multixact.c:1010 access/transam/multixact.c:1017
 #: access/transam/multixact.c:1041 access/transam/multixact.c:1050
@@ -750,14 +751,14 @@
 msgid "database is not accepting commands that generate new MultiXactIds to avoid wraparound data loss in database with OID %u"
 msgstr "Datenbank nimmt keine Befehle an, die neue MultiXactIds erzeugen, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank mit OID %u zu vermeiden"
 
-#: access/transam/multixact.c:1036 access/transam/multixact.c:2319
+#: access/transam/multixact.c:1036 access/transam/multixact.c:2318
 #, c-format
 msgid "database \"%s\" must be vacuumed before %u more MultiXactId is used"
 msgid_plural "database \"%s\" must be vacuumed before %u more MultiXactIds are used"
-msgstr[0] "Datenbank „%s“ muss gevacuumt werden, bevor %u weitere MultiXactId aufgebraucht ist"
-msgstr[1] "Datenbank „%s“ muss gevacuumt werden, bevor %u weitere MultiXactIds aufgebraucht sind"
+msgstr[0] "Datenbank »%s« muss gevacuumt werden, bevor %u weitere MultiXactId aufgebraucht ist"
+msgstr[1] "Datenbank »%s« muss gevacuumt werden, bevor %u weitere MultiXactIds aufgebraucht sind"
 
-#: access/transam/multixact.c:1045 access/transam/multixact.c:2328
+#: access/transam/multixact.c:1045 access/transam/multixact.c:2327
 #, c-format
 msgid "database with OID %u must be vacuumed before %u more MultiXactId is used"
 msgid_plural "database with OID %u must be vacuumed before %u more MultiXactIds are used"
@@ -767,7 +768,7 @@
 #: access/transam/multixact.c:1106
 #, c-format
 msgid "multixact \"members\" limit exceeded"
-msgstr "Grenzwert für Multixact-„Members“ überschritten"
+msgstr "Grenzwert für Multixact-»Members« überschritten"
 
 #: access/transam/multixact.c:1107
 #, c-format
@@ -793,22 +794,22 @@
 msgid "Execute a database-wide VACUUM in that database with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings."
 msgstr "Führen Sie ein datenbankweites VACUUM in dieser Datenbank aus, mit reduzierten Einstellungen für vacuum_multixact_freeze_min_age und vacuum_multixact_freeze_table_age."
 
-#: access/transam/multixact.c:1286
+#: access/transam/multixact.c:1285
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "MultiXactId %u existiert nicht mehr -- anscheinender Ãœberlauf"
 
-#: access/transam/multixact.c:1294
+#: access/transam/multixact.c:1293
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "MultiXactId %u wurde noch nicht erzeugt -- anscheinender Ãœberlauf"
 
-#: access/transam/multixact.c:2269
+#: access/transam/multixact.c:2268
 #, c-format
 msgid "MultiXactId wrap limit is %u, limited by database with OID %u"
 msgstr "Grenze für MultiXactId-Überlauf ist %u, begrenzt durch Datenbank mit OID %u"
 
-#: access/transam/multixact.c:2324 access/transam/multixact.c:2333
+#: access/transam/multixact.c:2323 access/transam/multixact.c:2332
 #: access/transam/varsup.c:146 access/transam/varsup.c:153
 #: access/transam/varsup.c:384 access/transam/varsup.c:391
 #, c-format
@@ -819,62 +820,62 @@
 "Um ein Abschalten der Datenbank zu vermeiden, führen Sie ein komplettes VACUUM über diese Datenbank aus.\n"
 "Eventuell müssen Sie auch alte vorbereitete Transaktionen committen oder zurückrollen."
 
-#: access/transam/multixact.c:2603
+#: access/transam/multixact.c:2602
 #, c-format
 msgid "oldest MultiXactId member is at offset %u"
 msgstr "ältestes MultiXactId-Mitglied ist bei Offset %u"
 
-#: access/transam/multixact.c:2607
+#: access/transam/multixact.c:2606
 #, c-format
 msgid "MultiXact member wraparound protections are disabled because oldest checkpointed MultiXact %u does not exist on disk"
 msgstr "MultiXact-Member-Wraparound-Schutz ist deaktiviert, weil die älteste gecheckpointete MultiXact %u nicht auf der Festplatte existiert"
 
-#: access/transam/multixact.c:2629
+#: access/transam/multixact.c:2628
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "MultiXact-Member-Wraparound-Schutz ist jetzt aktiviert"
 
-#: access/transam/multixact.c:2631
+#: access/transam/multixact.c:2630
 #, c-format
 msgid "MultiXact member stop limit is now %u based on MultiXact %u"
 msgstr "MultiXact-Member-Stopp-Limit ist jetzt %u, basierend auf MultiXact %u"
 
-#: access/transam/multixact.c:3011
+#: access/transam/multixact.c:3010
 #, c-format
 msgid "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
 msgstr "älteste MultiXact %u nicht gefunden, älteste ist MultiXact %u, Truncate wird ausgelassen"
 
-#: access/transam/multixact.c:3029
+#: access/transam/multixact.c:3028
 #, c-format
 msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
 msgstr "kann nicht bis MultiXact %u trunkieren, weil sie nicht auf der Festplatte existiert, Trunkierung wird ausgelassen"
 
-#: access/transam/multixact.c:3355
+#: access/transam/multixact.c:3354
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "ungültige MultiXactId: %u"
 
-#: access/transam/parallel.c:577
+#: access/transam/parallel.c:582
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "Postmaster beendete während einer parallelen Transaktion"
 
-#: access/transam/parallel.c:668
+#: access/transam/parallel.c:702
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "Verbindung mit parallelem Arbeitsprozess verloren"
 
-#: access/transam/parallel.c:845
+#: access/transam/parallel.c:883
 #, c-format
 msgid "could not map dynamic shared memory segment"
 msgstr "konnte dynamisches Shared-Memory-Segment nicht mappen"
 
-#: access/transam/parallel.c:850
+#: access/transam/parallel.c:888
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "ungültige magische Zahl in dynamischem Shared-Memory-Segment"
 
-#: access/transam/parallel.c:1001
+#: access/transam/parallel.c:1039
 #, c-format
 msgid "parallel worker, PID %d"
 msgstr "paralleler Arbeitsprozess, PID %d"
@@ -882,7 +883,7 @@
 #: access/transam/slru.c:652
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
-msgstr "Datei „%s“ existiert nicht, wird als Nullen eingelesen"
+msgstr "Datei »%s« existiert nicht, wird als Nullen eingelesen"
 
 #: access/transam/slru.c:882 access/transam/slru.c:888
 #: access/transam/slru.c:895 access/transam/slru.c:902
@@ -894,42 +895,42 @@
 #: access/transam/slru.c:883
 #, c-format
 msgid "Could not open file \"%s\": %m."
-msgstr "Konnte Datei „%s“ nicht öffnen: %m."
+msgstr "Konnte Datei »%s« nicht öffnen: %m."
 
 #: access/transam/slru.c:889
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %u: %m."
-msgstr "Konnte Positionszeiger in Datei „%s“ nicht auf %u setzen: %m."
+msgstr "Konnte Positionszeiger in Datei »%s« nicht auf %u setzen: %m."
 
 #: access/transam/slru.c:896
 #, c-format
 msgid "Could not read from file \"%s\" at offset %u: %m."
-msgstr "Konnte nicht aus Datei „%s“ bei Position %u lesen: %m."
+msgstr "Konnte nicht aus Datei »%s« bei Position %u lesen: %m."
 
 #: access/transam/slru.c:903
 #, c-format
 msgid "Could not write to file \"%s\" at offset %u: %m."
-msgstr "Konnte nicht in Datei „%s“ bei Position %u schreiben: %m."
+msgstr "Konnte nicht in Datei »%s« bei Position %u schreiben: %m."
 
 #: access/transam/slru.c:910
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
-msgstr "Konnte Datei „%s“ nicht fsyncen: %m."
+msgstr "Konnte Datei »%s« nicht fsyncen: %m."
 
 #: access/transam/slru.c:917
 #, c-format
 msgid "Could not close file \"%s\": %m."
-msgstr "Konnte Datei „%s“ nicht schließen: %m."
+msgstr "Konnte Datei »%s« nicht schließen: %m."
 
 #: access/transam/slru.c:1172
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
-msgstr "konnte Verzeichnis „%s“ nicht leeren: anscheinender Überlauf"
+msgstr "konnte Verzeichnis »%s« nicht leeren: anscheinender Überlauf"
 
 #: access/transam/slru.c:1227 access/transam/slru.c:1283
 #, c-format
 msgid "removing file \"%s\""
-msgstr "entferne Datei „%s“"
+msgstr "entferne Datei »%s«"
 
 #: access/transam/timeline.c:148 access/transam/timeline.c:153
 #, c-format
@@ -959,33 +960,33 @@
 #: access/transam/timeline.c:179
 #, c-format
 msgid "invalid data in history file \"%s\""
-msgstr "ungültige Daten in History-Datei „%s“"
+msgstr "ungültige Daten in History-Datei »%s«"
 
 #: access/transam/timeline.c:180
 #, c-format
 msgid "Timeline IDs must be less than child timeline's ID."
 msgstr "Zeitleisten-IDs müssen kleiner als die Zeitleisten-ID des Kindes sein."
 
-#: access/transam/timeline.c:346 access/transam/xlog.c:3144
-#: access/transam/xlog.c:10282 access/transam/xlog.c:10295
-#: access/transam/xlog.c:10658 access/transam/xlog.c:10701
-#: access/transam/xlog.c:10740 access/transam/xlog.c:10783
+#: access/transam/timeline.c:346 access/transam/xlog.c:3173
+#: access/transam/xlog.c:10381 access/transam/xlog.c:10394
+#: access/transam/xlog.c:10786 access/transam/xlog.c:10829
+#: access/transam/xlog.c:10868 access/transam/xlog.c:10911
 #: access/transam/xlogfuncs.c:478 access/transam/xlogfuncs.c:497
-#: commands/extension.c:3047 replication/logical/origin.c:665
-#: replication/logical/origin.c:695 replication/logical/reorderbuffer.c:2948
+#: commands/extension.c:3050 replication/logical/origin.c:668
+#: replication/logical/origin.c:698 replication/logical/reorderbuffer.c:2964
 #: replication/walsender.c:497 storage/file/copydir.c:176
 #: utils/adt/genfile.c:151
 #, c-format
 msgid "could not read file \"%s\": %m"
-msgstr "konnte Datei „%s“ nicht lesen: %m"
+msgstr "konnte Datei »%s« nicht lesen: %m"
 
 #: access/transam/timeline.c:412 access/transam/timeline.c:488
-#: access/transam/xlog.c:3017 access/transam/xlog.c:3178
-#: access/transam/xlogfuncs.c:503 commands/copy.c:1631
+#: access/transam/xlog.c:3046 access/transam/xlog.c:3207
+#: access/transam/xlogfuncs.c:503 commands/copy.c:1671
 #: storage/file/copydir.c:201
 #, c-format
 msgid "could not close file \"%s\": %m"
-msgstr "konnte Datei „%s“ nicht schließen: %m"
+msgstr "konnte Datei »%s« nicht schließen: %m"
 
 #: access/transam/timeline.c:570
 #, c-format
@@ -995,7 +996,7 @@
 #: access/transam/twophase.c:330
 #, c-format
 msgid "transaction identifier \"%s\" is too long"
-msgstr "Transaktionsbezeichner „%s“ ist zu lang"
+msgstr "Transaktionsbezeichner »%s« ist zu lang"
 
 #: access/transam/twophase.c:337
 #, c-format
@@ -1010,7 +1011,7 @@
 #: access/transam/twophase.c:357
 #, c-format
 msgid "transaction identifier \"%s\" is already in use"
-msgstr "Transaktionsbezeichner „%s“ wird bereits verwendet"
+msgstr "Transaktionsbezeichner »%s« wird bereits verwendet"
 
 #: access/transam/twophase.c:366
 #, c-format
@@ -1025,7 +1026,7 @@
 #: access/transam/twophase.c:504
 #, c-format
 msgid "prepared transaction with identifier \"%s\" is busy"
-msgstr "vorbereitete Transaktion mit Bezeichner „%s“ ist beschäftigt"
+msgstr "vorbereitete Transaktion mit Bezeichner »%s« ist beschäftigt"
 
 #: access/transam/twophase.c:510
 #, c-format
@@ -1050,7 +1051,7 @@
 #: access/transam/twophase.c:538
 #, c-format
 msgid "prepared transaction with identifier \"%s\" does not exist"
-msgstr "vorbereitete Transaktion mit Bezeichner „%s“ existiert nicht"
+msgstr "vorbereitete Transaktion mit Bezeichner »%s« existiert nicht"
 
 #: access/transam/twophase.c:1048
 #, c-format
@@ -1060,7 +1061,7 @@
 #: access/transam/twophase.c:1061
 #, c-format
 msgid "could not create two-phase state file \"%s\": %m"
-msgstr "konnte Zweiphasen-Statusdatei „%s“ nicht erstellen: %m"
+msgstr "konnte Zweiphasen-Statusdatei »%s« nicht erstellen: %m"
 
 #: access/transam/twophase.c:1075 access/transam/twophase.c:1092
 #: access/transam/twophase.c:1145 access/transam/twophase.c:1575
@@ -1082,17 +1083,17 @@
 #: access/transam/twophase.c:1239 access/transam/twophase.c:1681
 #, c-format
 msgid "could not open two-phase state file \"%s\": %m"
-msgstr "konnte Zweiphasen-Statusdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Zweiphasen-Statusdatei »%s« nicht öffnen: %m"
 
 #: access/transam/twophase.c:1256
 #, c-format
 msgid "could not stat two-phase state file \"%s\": %m"
-msgstr "konnte „stat“ für Zweiphasen-Statusdatei „%s“ nicht ausführen: %m"
+msgstr "konnte »stat« für Zweiphasen-Statusdatei »%s« nicht ausführen: %m"
 
 #: access/transam/twophase.c:1288
 #, c-format
 msgid "could not read two-phase state file \"%s\": %m"
-msgstr "konnte Zweiphasen-Statusdatei „%s“ nicht lesen: %m"
+msgstr "konnte Zweiphasen-Statusdatei »%s« nicht lesen: %m"
 
 #: access/transam/twophase.c:1384
 #, c-format
@@ -1102,12 +1103,12 @@
 #: access/transam/twophase.c:1537
 #, c-format
 msgid "could not remove two-phase state file \"%s\": %m"
-msgstr "konnte Zweiphasen-Statusdatei „%s“ nicht löschen: %m"
+msgstr "konnte Zweiphasen-Statusdatei »%s« nicht löschen: %m"
 
 #: access/transam/twophase.c:1566
 #, c-format
 msgid "could not recreate two-phase state file \"%s\": %m"
-msgstr "konnte Zweiphasen-Statusdatei „%s“ nicht wieder erstellen: %m"
+msgstr "konnte Zweiphasen-Statusdatei »%s« nicht wieder erstellen: %m"
 
 #: access/transam/twophase.c:1594
 #, c-format
@@ -1117,29 +1118,29 @@
 #: access/transam/twophase.c:1690
 #, c-format
 msgid "could not fsync two-phase state file \"%s\": %m"
-msgstr "konnte Zweiphasen-Statusdatei „%s“ nicht fsyncen: %m"
+msgstr "konnte Zweiphasen-Statusdatei »%s« nicht fsyncen: %m"
 
 #: access/transam/twophase.c:1697
 #, c-format
 msgid "could not close two-phase state file \"%s\": %m"
-msgstr "konnte Zweiphasen-Statistikdatei „%s“ nicht schließen: %m"
+msgstr "konnte Zweiphasen-Statistikdatei »%s« nicht schließen: %m"
 
 #: access/transam/twophase.c:1762
 #, c-format
 msgid "removing future two-phase state file \"%s\""
-msgstr "entferne Zweiphasen-Statusdatei aus der Zukunft „%s“"
+msgstr "entferne Zweiphasen-Statusdatei aus der Zukunft »%s«"
 
 #: access/transam/twophase.c:1778 access/transam/twophase.c:1789
 #: access/transam/twophase.c:1908 access/transam/twophase.c:1919
 #: access/transam/twophase.c:1992
 #, c-format
 msgid "removing corrupt two-phase state file \"%s\""
-msgstr "entferne verfälschte Zweiphasen-Statusdatei „%s“"
+msgstr "entferne verfälschte Zweiphasen-Statusdatei »%s«"
 
 #: access/transam/twophase.c:1897 access/transam/twophase.c:1981
 #, c-format
 msgid "removing stale two-phase state file \"%s\""
-msgstr "entferne abgelaufene Zweiphasen-Statusdatei „%s“"
+msgstr "entferne abgelaufene Zweiphasen-Statusdatei »%s«"
 
 #: access/transam/twophase.c:1999
 #, c-format
@@ -1149,7 +1150,7 @@
 #: access/transam/varsup.c:124
 #, c-format
 msgid "database is not accepting commands to avoid wraparound data loss in database \"%s\""
-msgstr "Datenbank nimmt keine Befehle an, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank „%s“ zu vermeiden"
+msgstr "Datenbank nimmt keine Befehle an, um Datenverlust wegen Transaktionsnummernüberlauf in Datenbank »%s« zu vermeiden"
 
 #: access/transam/varsup.c:126 access/transam/varsup.c:133
 #, c-format
@@ -1168,7 +1169,7 @@
 #: access/transam/varsup.c:143 access/transam/varsup.c:381
 #, c-format
 msgid "database \"%s\" must be vacuumed within %u transactions"
-msgstr "Datenbank „%s“ muss innerhalb von %u Transaktionen gevacuumt werden"
+msgstr "Datenbank »%s« muss innerhalb von %u Transaktionen gevacuumt werden"
 
 #: access/transam/varsup.c:150 access/transam/varsup.c:388
 #, c-format
@@ -1188,7 +1189,7 @@
 #: access/transam/xact.c:1453
 #, c-format
 msgid "maximum number of committed subtransactions (%d) exceeded"
-msgstr "maximale Anzahl committeter Subtransaktionen (%d) erreicht"
+msgstr "maximale Anzahl committeter Subtransaktionen (%d) überschritten"
 
 #: access/transam/xact.c:2249
 #, c-format
@@ -1281,845 +1282,850 @@
 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:2270
+#: access/transam/xlog.c:2299
 #, c-format
 msgid "could not seek in log file %s to offset %u: %m"
 msgstr "konnte Positionszeiger in Logdatei %s nicht auf %u setzen: %m"
 
-#: access/transam/xlog.c:2290
+#: access/transam/xlog.c:2319
 #, c-format
 msgid "could not write to log file %s at offset %u, length %zu: %m"
 msgstr "konnte nicht in Logdatei %s bei Position %u, Länge %zu schreiben: %m"
 
-#: access/transam/xlog.c:2553
+#: access/transam/xlog.c:2582
 #, c-format
 msgid "updated min recovery point to %X/%X on timeline %u"
 msgstr "minimaler Recovery-Punkt auf %X/%X auf Zeitleiste %u aktualisiert"
 
-#: access/transam/xlog.c:3148
+#: access/transam/xlog.c:3177
 #, c-format
 msgid "not enough data in file \"%s\""
-msgstr "nicht genug Daten in Datei „%s“"
+msgstr "nicht genug Daten in Datei »%s«"
 
-#: access/transam/xlog.c:3289
+#: access/transam/xlog.c:3318
 #, c-format
 msgid "could not open transaction log file \"%s\": %m"
-msgstr "konnte Transaktionslogdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Transaktionslogdatei »%s« nicht öffnen: %m"
 
-#: access/transam/xlog.c:3478 access/transam/xlog.c:5254
+#: access/transam/xlog.c:3507 access/transam/xlog.c:5297
 #, c-format
 msgid "could not close log file %s: %m"
 msgstr "konnte Logdatei %s nicht schließen: %m"
 
-#: access/transam/xlog.c:3535 replication/logical/logicalfuncs.c:149
-#: replication/walsender.c:2095
+#: access/transam/xlog.c:3564 replication/logical/logicalfuncs.c:149
+#: replication/walsender.c:2094
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "das angeforderte WAL-Segment %s wurde schon entfernt"
 
-#: access/transam/xlog.c:3595 access/transam/xlog.c:3670
-#: access/transam/xlog.c:3868
+#: access/transam/xlog.c:3624 access/transam/xlog.c:3699
+#: access/transam/xlog.c:3897
 #, c-format
 msgid "could not open transaction log directory \"%s\": %m"
-msgstr "konnte Transaktionslog-Verzeichnis „%s“ nicht öffnen: %m"
+msgstr "konnte Transaktionslog-Verzeichnis »%s« nicht öffnen: %m"
 
-#: access/transam/xlog.c:3751
+#: access/transam/xlog.c:3780
 #, c-format
 msgid "recycled transaction log file \"%s\""
-msgstr "Transaktionslogdatei „%s“ wird wiederverwendet"
+msgstr "Transaktionslogdatei »%s« wird wiederverwendet"
 
-#: access/transam/xlog.c:3763
+#: access/transam/xlog.c:3792
 #, c-format
 msgid "removing transaction log file \"%s\""
-msgstr "entferne Transaktionslogdatei „%s“"
+msgstr "entferne Transaktionslogdatei »%s«"
 
-#: access/transam/xlog.c:3783
+#: access/transam/xlog.c:3812
 #, c-format
 msgid "could not rename old transaction log file \"%s\": %m"
-msgstr "konnte alte Transaktionslogdatei „%s“ nicht umbenennen: %m"
+msgstr "konnte alte Transaktionslogdatei »%s« nicht umbenennen: %m"
 
-#: access/transam/xlog.c:3795
+#: access/transam/xlog.c:3824
 #, c-format
 msgid "could not remove old transaction log file \"%s\": %m"
-msgstr "konnte alte Transaktionslogdatei „%s“ nicht löschen: %m"
+msgstr "konnte alte Transaktionslogdatei »%s« nicht löschen: %m"
 
-#: access/transam/xlog.c:3828 access/transam/xlog.c:3838
+#: access/transam/xlog.c:3857 access/transam/xlog.c:3867
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
-msgstr "benötigtes WAL-Verzeichnis „%s“ existiert nicht"
+msgstr "benötigtes WAL-Verzeichnis »%s« existiert nicht"
 
-#: access/transam/xlog.c:3844
+#: access/transam/xlog.c:3873
 #, c-format
 msgid "creating missing WAL directory \"%s\""
-msgstr "erzeuge fehlendes WAL-Verzeichnis „%s“"
+msgstr "erzeuge fehlendes WAL-Verzeichnis »%s«"
 
-#: access/transam/xlog.c:3847
+#: access/transam/xlog.c:3876
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
-msgstr "konnte fehlendes Verzeichnis „%s“ nicht erzeugen: %m"
+msgstr "konnte fehlendes Verzeichnis »%s« nicht erzeugen: %m"
 
-#: access/transam/xlog.c:3878
+#: access/transam/xlog.c:3907
 #, c-format
 msgid "removing transaction log backup history file \"%s\""
-msgstr "entferne Transaktionslog-Backup-History-Datei „%s“"
+msgstr "entferne Transaktionslog-Backup-History-Datei »%s«"
 
-#: access/transam/xlog.c:3959
+#: access/transam/xlog.c:3988
 #, c-format
 msgid "unexpected timeline ID %u in log segment %s, offset %u"
 msgstr "unerwartete Zeitleisten-ID %u in Logsegment %s, Offset %u"
 
-#: access/transam/xlog.c:4081
+#: access/transam/xlog.c:4110
 #, c-format
 msgid "new timeline %u is not a child of database system timeline %u"
 msgstr "neue Zeitleiste %u ist kein Kind der Datenbanksystemzeitleiste %u"
 
-#: access/transam/xlog.c:4095
+#: access/transam/xlog.c:4124
 #, c-format
 msgid "new timeline %u forked off current database system timeline %u before current recovery point %X/%X"
 msgstr "neue Zeitleiste %u zweigte von der aktuellen Datenbanksystemzeitleiste %u vor dem aktuellen Wiederherstellungspunkt %X/%X ab"
 
-#: access/transam/xlog.c:4114
+#: access/transam/xlog.c:4143
 #, c-format
 msgid "new target timeline is %u"
 msgstr "neue Zielzeitleiste ist %u"
 
-#: access/transam/xlog.c:4194
+#: access/transam/xlog.c:4223
 #, c-format
 msgid "could not create control file \"%s\": %m"
-msgstr "konnte Kontrolldatei „%s“ nicht erzeugen: %m"
+msgstr "konnte Kontrolldatei »%s« nicht erzeugen: %m"
 
-#: access/transam/xlog.c:4205 access/transam/xlog.c:4441
+#: access/transam/xlog.c:4234 access/transam/xlog.c:4470
 #, c-format
 msgid "could not write to control file: %m"
 msgstr "konnte nicht in Kontrolldatei schreiben: %m"
 
-#: access/transam/xlog.c:4211 access/transam/xlog.c:4447
+#: access/transam/xlog.c:4240 access/transam/xlog.c:4476
 #, c-format
 msgid "could not fsync control file: %m"
 msgstr "konnte Kontrolldatei nicht fsyncen: %m"
 
-#: access/transam/xlog.c:4216 access/transam/xlog.c:4452
+#: access/transam/xlog.c:4245 access/transam/xlog.c:4481
 #, c-format
 msgid "could not close control file: %m"
 msgstr "konnte Kontrolldatei nicht schließen: %m"
 
-#: access/transam/xlog.c:4234 access/transam/xlog.c:4430
+#: access/transam/xlog.c:4263 access/transam/xlog.c:4459
 #, c-format
 msgid "could not open control file \"%s\": %m"
-msgstr "konnte Kontrolldatei „%s“ nicht öffnen: %m"
+msgstr "konnte Kontrolldatei »%s« nicht öffnen: %m"
 
-#: access/transam/xlog.c:4240
+#: access/transam/xlog.c:4269
 #, c-format
 msgid "could not read from control file: %m"
 msgstr "konnte nicht aus Kontrolldatei lesen: %m"
 
-#: access/transam/xlog.c:4253 access/transam/xlog.c:4262
-#: access/transam/xlog.c:4286 access/transam/xlog.c:4293
-#: access/transam/xlog.c:4300 access/transam/xlog.c:4305
-#: access/transam/xlog.c:4312 access/transam/xlog.c:4319
-#: access/transam/xlog.c:4326 access/transam/xlog.c:4333
-#: access/transam/xlog.c:4340 access/transam/xlog.c:4347
-#: access/transam/xlog.c:4354 access/transam/xlog.c:4363
-#: access/transam/xlog.c:4370 access/transam/xlog.c:4379
-#: access/transam/xlog.c:4386 access/transam/xlog.c:4395
-#: access/transam/xlog.c:4402 utils/init/miscinit.c:1361
+#: access/transam/xlog.c:4282 access/transam/xlog.c:4291
+#: access/transam/xlog.c:4315 access/transam/xlog.c:4322
+#: access/transam/xlog.c:4329 access/transam/xlog.c:4334
+#: access/transam/xlog.c:4341 access/transam/xlog.c:4348
+#: access/transam/xlog.c:4355 access/transam/xlog.c:4362
+#: access/transam/xlog.c:4369 access/transam/xlog.c:4376
+#: access/transam/xlog.c:4383 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 utils/init/miscinit.c:1361
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "Datenbankdateien sind inkompatibel mit Server"
 
-#: access/transam/xlog.c:4254
+#: access/transam/xlog.c:4283
 #, 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 "Der Datenbank-Cluster wurde mit PG_CONTROL_VERSION %d (0x%08x) initialisiert, aber der Server wurde mit PG_CONTROL_VERSION %d (0x%08x) kompiliert."
 
-#: access/transam/xlog.c:4258
+#: access/transam/xlog.c:4287
 #, c-format
 msgid "This could be a problem of mismatched byte ordering.  It looks like you need to initdb."
 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:4263
+#: access/transam/xlog.c:4292
 #, c-format
 msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
 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:4266 access/transam/xlog.c:4290
-#: access/transam/xlog.c:4297 access/transam/xlog.c:4302
+#: access/transam/xlog.c:4295 access/transam/xlog.c:4319
+#: access/transam/xlog.c:4326 access/transam/xlog.c:4331
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "Es sieht so aus, dass Sie initdb ausführen müssen."
 
-#: access/transam/xlog.c:4277
+#: access/transam/xlog.c:4306
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "falsche Prüfsumme in Kontrolldatei"
 
-#: access/transam/xlog.c:4287
+#: access/transam/xlog.c:4316
 #, c-format
 msgid "The database cluster was initialized with CATALOG_VERSION_NO %d, but the server was compiled with CATALOG_VERSION_NO %d."
 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:4294
+#: access/transam/xlog.c:4323
 #, c-format
 msgid "The database cluster was initialized with MAXALIGN %d, but the server was compiled with MAXALIGN %d."
 msgstr "Der Datenbank-Cluster wurde mit MAXALIGN %d initialisiert, aber der Server wurde mit MAXALIGN %d kompiliert."
 
-#: access/transam/xlog.c:4301
+#: access/transam/xlog.c:4330
 #, c-format
 msgid "The database cluster appears to use a different floating-point number format than the server executable."
 msgstr "Der Datenbank-Cluster verwendet anscheinend ein anderes Fließkommazahlenformat als das Serverprogramm."
 
-#: access/transam/xlog.c:4306
+#: access/transam/xlog.c:4335
 #, c-format
 msgid "The database cluster was initialized with BLCKSZ %d, but the server was compiled with BLCKSZ %d."
 msgstr "Der Datenbank-Cluster wurde mit BLCKSZ %d initialisiert, aber der Server wurde mit BLCKSZ %d kompiliert."
 
-#: access/transam/xlog.c:4309 access/transam/xlog.c:4316
-#: access/transam/xlog.c:4323 access/transam/xlog.c:4330
-#: access/transam/xlog.c:4337 access/transam/xlog.c:4344
-#: access/transam/xlog.c:4351 access/transam/xlog.c:4358
+#: 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:4382 access/transam/xlog.c:4389
-#: access/transam/xlog.c:4398 access/transam/xlog.c:4405
+#: access/transam/xlog.c:4380 access/transam/xlog.c:4387
+#: access/transam/xlog.c:4395 access/transam/xlog.c:4402
+#: access/transam/xlog.c:4411 access/transam/xlog.c:4418
+#: access/transam/xlog.c:4427 access/transam/xlog.c:4434
 #, c-format
 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:4313
+#: access/transam/xlog.c:4342
 #, c-format
 msgid "The database cluster was initialized with RELSEG_SIZE %d, but the server was compiled with RELSEG_SIZE %d."
 msgstr "Der Datenbank-Cluster wurde mit RELSEG_SIZE %d initialisiert, aber der Server wurde mit RELSEGSIZE %d kompiliert."
 
-#: access/transam/xlog.c:4320
+#: access/transam/xlog.c:4349
 #, c-format
 msgid "The database cluster was initialized with XLOG_BLCKSZ %d, but the server was compiled with XLOG_BLCKSZ %d."
 msgstr "Der Datenbank-Cluster wurde mit XLOG_BLCKSZ %d initialisiert, aber der Server wurde mit XLOG_BLCKSZ %d kompiliert."
 
-#: access/transam/xlog.c:4327
+#: access/transam/xlog.c:4356
 #, c-format
 msgid "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server was compiled with XLOG_SEG_SIZE %d."
 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:4334
+#: access/transam/xlog.c:4363
 #, c-format
 msgid "The database cluster was initialized with NAMEDATALEN %d, but the server was compiled with NAMEDATALEN %d."
 msgstr "Der Datenbank-Cluster wurde mit NAMEDATALEN %d initialisiert, aber der Server wurde mit NAMEDATALEN %d kompiliert."
 
-#: access/transam/xlog.c:4341
+#: access/transam/xlog.c:4370
 #, c-format
 msgid "The database cluster was initialized with INDEX_MAX_KEYS %d, but the server was compiled with INDEX_MAX_KEYS %d."
 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:4348
+#: access/transam/xlog.c:4377
 #, 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 "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:4355
+#: access/transam/xlog.c:4384
 #, c-format
 msgid "The database cluster was initialized with LOBLKSIZE %d, but the server was compiled with LOBLKSIZE %d."
 msgstr "Der Datenbank-Cluster wurde mit LOBLKSIZE %d initialisiert, aber der Server wurde mit LOBLKSIZE %d kompiliert."
 
-#: access/transam/xlog.c:4364
+#: access/transam/xlog.c:4393
 #, c-format
 msgid "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the server was compiled with HAVE_INT64_TIMESTAMP."
 msgstr "Der Datenbank-Cluster wurde ohne HAVE_INT64_TIMESTAMP initialisiert, aber der Server wurde mit HAE_INT64_TIMESTAMP kompiliert."
 
-#: access/transam/xlog.c:4371
+#: access/transam/xlog.c:4400
 #, c-format
 msgid "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the server was compiled without HAVE_INT64_TIMESTAMP."
 msgstr "Der Datenbank-Cluster wurde mit HAVE_INT64_TIMESTAMP initialisiert, aber der Server wurde ohne HAE_INT64_TIMESTAMP kompiliert."
 
-#: access/transam/xlog.c:4380
+#: access/transam/xlog.c:4409
 #, c-format
 msgid "The database cluster was initialized without USE_FLOAT4_BYVAL but the server was compiled with USE_FLOAT4_BYVAL."
 msgstr "Der Datenbank-Cluster wurde ohne USE_FLOAT4_BYVAL initialisiert, aber der Server wurde mit USE_FLOAT4_BYVAL kompiliert."
 
-#: access/transam/xlog.c:4387
+#: access/transam/xlog.c:4416
 #, c-format
 msgid "The database cluster was initialized with USE_FLOAT4_BYVAL but the server was compiled without USE_FLOAT4_BYVAL."
 msgstr "Der Datenbank-Cluster wurde mit USE_FLOAT4_BYVAL initialisiert, aber der Server wurde ohne USE_FLOAT4_BYVAL kompiliert."
 
-#: access/transam/xlog.c:4396
+#: access/transam/xlog.c:4425
 #, c-format
 msgid "The database cluster was initialized without USE_FLOAT8_BYVAL but the server was compiled with USE_FLOAT8_BYVAL."
 msgstr "Der Datenbank-Cluster wurde ohne USE_FLOAT8_BYVAL initialisiert, aber der Server wurde mit USE_FLOAT8_BYVAL kompiliert."
 
-#: access/transam/xlog.c:4403
+#: access/transam/xlog.c:4432
 #, c-format
 msgid "The database cluster was initialized with USE_FLOAT8_BYVAL but the server was compiled without USE_FLOAT8_BYVAL."
 msgstr "Der Datenbank-Cluster wurde mit USE_FLOAT8_BYVAL initialisiert, aber der Server wurde ohne USE_FLOAT8_BYVAL kompiliert."
 
-#: access/transam/xlog.c:4829
+#: access/transam/xlog.c:4858
 #, c-format
 msgid "could not write bootstrap transaction log file: %m"
 msgstr "konnte Bootstrap-Transaktionslogdatei nicht schreiben: %m"
 
-#: access/transam/xlog.c:4835
+#: access/transam/xlog.c:4864
 #, c-format
 msgid "could not fsync bootstrap transaction log file: %m"
 msgstr "konnte Bootstrap-Transaktionslogdatei nicht fsyncen: %m"
 
-#: access/transam/xlog.c:4840
+#: access/transam/xlog.c:4869
 #, c-format
 msgid "could not close bootstrap transaction log file: %m"
 msgstr "konnte Bootstrap-Transaktionslogdatei nicht schließen: %m"
 
-#: access/transam/xlog.c:4915
+#: access/transam/xlog.c:4944
 #, c-format
 msgid "could not open recovery command file \"%s\": %m"
-msgstr "konnte Recovery-Kommandodatei „%s“ nicht öffnen: %m"
+msgstr "konnte Recovery-Kommandodatei »%s« nicht öffnen: %m"
 
-#: access/transam/xlog.c:4961 access/transam/xlog.c:5044
+#: access/transam/xlog.c:4990 access/transam/xlog.c:5075
 #, c-format
 msgid "invalid value for recovery parameter \"%s\": \"%s\""
-msgstr "ungültiger Wert für Recovery-Parameter „%s“: „%s“"
+msgstr "ungültiger Wert für Recovery-Parameter »%s«: »%s«"
 
-#: access/transam/xlog.c:4964
+#: access/transam/xlog.c:4993
 #, c-format
 msgid "Valid values are \"pause\", \"promote\", and \"shutdown\"."
-msgstr "Gültige Werte sind „pause“, „promote“ und „shutdown“."
+msgstr "Gültige Werte sind »pause«, »promote« und »shutdown«."
 
-#: access/transam/xlog.c:4983
+#: access/transam/xlog.c:5013
 #, c-format
 msgid "recovery_target_timeline is not a valid number: \"%s\""
-msgstr "recovery_target_timeline ist keine gültige Zahl: „%s“"
+msgstr "recovery_target_timeline ist keine gültige Zahl: »%s«"
 
-#: access/transam/xlog.c:4999
+#: access/transam/xlog.c:5030
 #, c-format
 msgid "recovery_target_xid is not a valid number: \"%s\""
-msgstr "recovery_target_xid ist keine gültige Zahl: „%s“"
+msgstr "recovery_target_xid ist keine gültige Zahl: »%s«"
 
-#: access/transam/xlog.c:5030
+#: access/transam/xlog.c:5061
 #, 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:5047
+#: access/transam/xlog.c:5078
 #, c-format
 msgid "The only allowed value is \"immediate\"."
-msgstr "Der einzige erlaubte Wert ist „immediate“."
+msgstr "Der einzige erlaubte Wert ist »immediate«."
 
-#: access/transam/xlog.c:5060 access/transam/xlog.c:5071
+#: access/transam/xlog.c:5091 access/transam/xlog.c:5102
 #: commands/extension.c:531 commands/extension.c:539 utils/misc/guc.c:5464
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
-msgstr "Parameter „%s“ erfordert einen Boole’schen Wert"
+msgstr "Parameter »%s« erfordert einen Boole’schen Wert"
 
-#: access/transam/xlog.c:5106
+#: access/transam/xlog.c:5137
 #, c-format
 msgid "parameter \"%s\" requires a temporal value"
-msgstr "Parameter „%s“ erfordert einen Zeitwert"
+msgstr "Parameter »%s« erfordert einen Zeitwert"
 
-#: access/transam/xlog.c:5108 catalog/dependency.c:984
-#: catalog/dependency.c:985 catalog/dependency.c:991 catalog/dependency.c:992
-#: catalog/dependency.c:1003 catalog/dependency.c:1004
-#: catalog/objectaddress.c:1053 commands/tablecmds.c:791
-#: commands/tablecmds.c:9415 commands/user.c:1027 commands/view.c:482
-#: libpq/auth.c:285 port/win32/security.c:51 storage/lmgr/deadlock.c:955
+#: access/transam/xlog.c:5139 catalog/dependency.c:983
+#: catalog/dependency.c:984 catalog/dependency.c:990 catalog/dependency.c:991
+#: catalog/dependency.c:1002 catalog/dependency.c:1003
+#: catalog/objectaddress.c:1053 commands/tablecmds.c:792
+#: commands/tablecmds.c:9513 commands/user.c:1027 commands/view.c:499
+#: libpq/auth.c:288 port/win32/security.c:51 storage/lmgr/deadlock.c:955
 #: storage/lmgr/proc.c:1177 utils/misc/guc.c:5486 utils/misc/guc.c:5579
-#: utils/misc/guc.c:9465 utils/misc/guc.c:9499 utils/misc/guc.c:9533
-#: utils/misc/guc.c:9567 utils/misc/guc.c:9602
+#: utils/misc/guc.c:9500 utils/misc/guc.c:9534 utils/misc/guc.c:9568
+#: utils/misc/guc.c:9602 utils/misc/guc.c:9637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: access/transam/xlog.c:5114
+#: access/transam/xlog.c:5146
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
-msgstr "unbekannter Recovery-Parameter „%s“"
+msgstr "unbekannter Recovery-Parameter »%s«"
 
-#: access/transam/xlog.c:5125
+#: access/transam/xlog.c:5157
 #, c-format
 msgid "recovery command file \"%s\" specified neither primary_conninfo nor restore_command"
-msgstr "Recovery-Kommandodatei „%s“ hat weder primary_conninfo noch restore_command angegeben"
+msgstr "Recovery-Kommandodatei »%s« hat weder primary_conninfo noch restore_command angegeben"
 
-#: access/transam/xlog.c:5127
+#: access/transam/xlog.c:5159
 #, c-format
 msgid "The database server will regularly poll the pg_xlog subdirectory to check for files placed there."
 msgstr "Der Datenbankserver prüft das Unterverzeichnis pg_xlog regelmäßig auf dort abgelegte Dateien."
 
-#: access/transam/xlog.c:5133
+#: access/transam/xlog.c:5166
 #, c-format
 msgid "recovery command file \"%s\" must specify restore_command when standby mode is not enabled"
-msgstr "Recovery-Kommandodatei „%s“ muss restore_command angeben, wenn der Standby-Modus nicht eingeschaltet ist"
+msgstr "Recovery-Kommandodatei »%s« muss restore_command angeben, wenn der Standby-Modus nicht eingeschaltet ist"
+
+#: access/transam/xlog.c:5187
+#, c-format
+msgid "standby mode is not supported by single-user servers"
+msgstr "Standby-Modus wird von Servern im Einzelbenutzermodus nicht unterstützt"
 
-#: access/transam/xlog.c:5163
+#: access/transam/xlog.c:5206
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "recovery_target_timeline %u existiert nicht"
 
-#: access/transam/xlog.c:5284
+#: access/transam/xlog.c:5327
 #, c-format
 msgid "archive recovery complete"
 msgstr "Wiederherstellung aus Archiv abgeschlossen"
 
-#: access/transam/xlog.c:5343 access/transam/xlog.c:5571
+#: access/transam/xlog.c:5386 access/transam/xlog.c:5614
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "Wiederherstellung beendet nachdem Konsistenz erreicht wurde"
 
-#: access/transam/xlog.c:5431
+#: access/transam/xlog.c:5474
 #, 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:5438
+#: access/transam/xlog.c:5481
 #, 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:5483
+#: access/transam/xlog.c:5526
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
-msgstr "Wiederherstellung beendet bei Restore-Punkt „%s“, Zeit %s"
+msgstr "Wiederherstellung beendet bei Restore-Punkt »%s«, Zeit %s"
 
-#: access/transam/xlog.c:5551
+#: access/transam/xlog.c:5594
 #, 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:5559
+#: access/transam/xlog.c:5602
 #, 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:5598
+#: access/transam/xlog.c:5641
 #, c-format
 msgid "recovery has paused"
 msgstr "Wiederherstellung wurde pausiert"
 
-#: access/transam/xlog.c:5599
+#: access/transam/xlog.c:5642
 #, c-format
 msgid "Execute pg_xlog_replay_resume() to continue."
 msgstr "Führen Sie pg_xlog_replay_resume() aus um fortzusetzen."
 
-#: access/transam/xlog.c:5806
+#: access/transam/xlog.c:5849
 #, 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 "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:5832
+#: access/transam/xlog.c:5875
 #, c-format
 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:5833
+#: access/transam/xlog.c:5876
 #, c-format
 msgid "This happens if you temporarily set wal_level=minimal without taking a new base backup."
 msgstr "Das passiert, wenn vorübergehend wal_level=minimal gesetzt wurde, ohne ein neues Base-Backup zu erzeugen."
 
-#: access/transam/xlog.c:5844
+#: access/transam/xlog.c:5887
 #, c-format
 msgid "hot standby is not possible because wal_level was not set to \"hot_standby\" or higher on the master server"
-msgstr "Hot Standby ist nicht möglich, weil wal_level auf dem Masterserver nicht auf „hot_standby“ oder höher gesetzt wurde"
+msgstr "Hot Standby ist nicht möglich, weil wal_level auf dem Masterserver nicht auf »hot_standby« oder höher gesetzt wurde"
 
-#: access/transam/xlog.c:5845
+#: access/transam/xlog.c:5888
 #, c-format
 msgid "Either set wal_level to \"hot_standby\" on the master, or turn off hot_standby here."
-msgstr "Setzen Sie entweder wal_level auf „hot_standby“ auf dem Master oder schalten Sie hot_standby hier aus."
+msgstr "Setzen Sie entweder wal_level auf »hot_standby« auf dem Master oder schalten Sie hot_standby hier aus."
 
-#: access/transam/xlog.c:5902
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "control file contains invalid data"
 msgstr "Kontrolldatei enthält ungültige Daten"
 
-#: access/transam/xlog.c:5908
+#: access/transam/xlog.c:5951
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "Datenbanksystem wurde am %s heruntergefahren"
 
-#: access/transam/xlog.c:5913
+#: access/transam/xlog.c:5956
 #, 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:5917
+#: access/transam/xlog.c:5960
 #, 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:5921
+#: access/transam/xlog.c:5964
 #, 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:5923
+#: access/transam/xlog.c:5966
 #, c-format
 msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
 msgstr "Das bedeutet wahrscheinlich, dass einige Daten verfälscht sind und Sie die letzte Datensicherung zur Wiederherstellung verwenden müssen."
 
-#: access/transam/xlog.c:5927
+#: access/transam/xlog.c:5970
 #, 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:5929
+#: access/transam/xlog.c:5972
 #, c-format
 msgid "If this has occurred more than once some data might be corrupted and you might need to choose an earlier recovery target."
 msgstr "Wenn dies mehr als einmal vorgekommen ist, dann sind einige Daten möglicherweise verfälscht und Sie müssen ein früheres Wiederherstellungsziel wählen."
 
-#: access/transam/xlog.c:5933
+#: access/transam/xlog.c:5976
 #, 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:5989
+#: access/transam/xlog.c:6032
 #, c-format
 msgid "entering standby mode"
 msgstr "Standby-Modus eingeschaltet"
 
-#: access/transam/xlog.c:5992
+#: access/transam/xlog.c:6035
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "starte Point-in-Time-Recovery bis XID %u"
 
-#: access/transam/xlog.c:5996
+#: access/transam/xlog.c:6039
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "starte Point-in-Time-Recovery bis %s"
 
-#: access/transam/xlog.c:6000
+#: access/transam/xlog.c:6043
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
-msgstr "starte Point-in-Time-Recovery bis „%s“"
+msgstr "starte Point-in-Time-Recovery bis »%s«"
 
-#: access/transam/xlog.c:6004
+#: access/transam/xlog.c:6047
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr "starte Point-in-Time-Recovery bis zum frühesten konsistenten Punkt"
 
-#: access/transam/xlog.c:6007
+#: access/transam/xlog.c:6050
 #, c-format
 msgid "starting archive recovery"
 msgstr "starte Wiederherstellung aus Archiv"
 
-#: access/transam/xlog.c:6024
+#: access/transam/xlog.c:6067
 #, c-format
 msgid "Failed while allocating an XLog reading processor."
 msgstr "Fehlgeschlagen beim Anlegen eines XLog-Leseprozessors."
 
-#: access/transam/xlog.c:6051 access/transam/xlog.c:6179
+#: access/transam/xlog.c:6094 access/transam/xlog.c:6222
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "Checkpoint-Eintrag ist bei %X/%X"
 
-#: access/transam/xlog.c:6065
+#: access/transam/xlog.c:6108
 #, c-format
 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:6066 access/transam/xlog.c:6073
+#: access/transam/xlog.c:6109 access/transam/xlog.c:6116
 #, c-format
 msgid "If you are not restoring from a backup, try removing the file \"%s/backup_label\"."
-msgstr "Wenn Sie gerade keine Sicherung wiederherstellen, versuchen Sie, die Datei „%s/backup_label“ zu löschen."
+msgstr "Wenn Sie gerade keine Sicherung wiederherstellen, versuchen Sie, die Datei »%s/backup_label« zu löschen."
 
-#: access/transam/xlog.c:6072
+#: access/transam/xlog.c:6115
 #, c-format
 msgid "could not locate required checkpoint record"
 msgstr "konnte den nötigen Checkpoint-Datensatz nicht finden"
 
-#: access/transam/xlog.c:6098 commands/tablespace.c:641
+#: access/transam/xlog.c:6141 commands/tablespace.c:641
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
-msgstr "konnte symbolische Verknüpfung „%s“ nicht erstellen: %m"
+msgstr "konnte symbolische Verknüpfung »%s« nicht erstellen: %m"
 
-#: access/transam/xlog.c:6130
+#: access/transam/xlog.c:6173
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
-msgstr "ignoriere Datei „%s“, weil keine Datei „%s“ existiert"
+msgstr "ignoriere Datei »%s«, weil keine Datei »%s« existiert"
 
-#: access/transam/xlog.c:6132 access/transam/xlog.c:10858
+#: access/transam/xlog.c:6175 access/transam/xlog.c:10986
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
-msgstr "Datei „%s“ wurde in „%s“ umbenannt."
+msgstr "Datei »%s« wurde in »%s« umbenannt."
 
-#: access/transam/xlog.c:6136
+#: access/transam/xlog.c:6179
 #, c-format
 msgid "ignoring \"%s\" file because no \"%s\" file exists"
-msgstr "ignoriere Datei „%s“, weil keine Datei „%s“ existiert"
+msgstr "ignoriere Datei »%s«, weil keine Datei »%s« existiert"
 
-#: access/transam/xlog.c:6138
+#: access/transam/xlog.c:6181
 #, c-format
 msgid "Could not rename file \"%s\" to \"%s\": %m."
-msgstr "Konnte Datei „%s“ nicht in „%s“ umbenennen: %m."
+msgstr "Konnte Datei »%s« nicht in »%s« umbenennen: %m."
 
-#: access/transam/xlog.c:6189 access/transam/xlog.c:6204
+#: access/transam/xlog.c:6232 access/transam/xlog.c:6247
 #, c-format
 msgid "could not locate a valid checkpoint record"
 msgstr "konnte keinen gültigen Checkpoint-Datensatz finden"
 
-#: access/transam/xlog.c:6198
+#: access/transam/xlog.c:6241
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "verwende vorherigen Checkpoint-Eintrag bei %X/%X"
 
-#: access/transam/xlog.c:6242
+#: access/transam/xlog.c:6285
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "angeforderte Zeitleiste %u ist kein Kind der History dieses Servers"
 
-#: access/transam/xlog.c:6244
+#: access/transam/xlog.c:6287
 #, c-format
 msgid "Latest checkpoint is at %X/%X on timeline %u, but in the history of the requested timeline, the server forked off from that timeline at %X/%X."
 msgstr "Neuester Checkpoint ist bei %X/%X auf Zeitleiste %u, aber in der History der angeforderten Zeitleiste zweigte der Server von dieser Zeitleiste bei %X/%X ab."
 
-#: access/transam/xlog.c:6260
+#: access/transam/xlog.c:6303
 #, c-format
 msgid "requested timeline %u does not contain minimum recovery point %X/%X on timeline %u"
 msgstr "angeforderte Zeitleiste %u enthält nicht den minimalen Wiederherstellungspunkt %X/%X auf Zeitleiste %u"
 
-#: access/transam/xlog.c:6291
+#: access/transam/xlog.c:6334
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "ungültige nächste Transaktions-ID"
 
-#: access/transam/xlog.c:6374
+#: access/transam/xlog.c:6417
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "ungültiges Redo im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:6385
+#: access/transam/xlog.c:6428
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "ungültiger Redo-Datensatz im Shutdown-Checkpoint"
 
-#: access/transam/xlog.c:6413
+#: access/transam/xlog.c:6456
 #, c-format
 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:6417
+#: access/transam/xlog.c:6460
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr "Wiederherstellung nach Absturz beginnt in Zeitleiste %u und hat Zielzeitleiste %u"
 
-#: access/transam/xlog.c:6461
+#: access/transam/xlog.c:6504
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "Daten in backup_label stimmen nicht mit Kontrolldatei überein"
 
-#: access/transam/xlog.c:6462
+#: access/transam/xlog.c:6505
 #, c-format
 msgid "This means that the backup is corrupted and you will have to use another backup for recovery."
 msgstr "Das bedeutet, dass die Datensicherung verfälscht ist und Sie eine andere Datensicherung zur Wiederherstellung verwenden werden müssen."
 
-#: access/transam/xlog.c:6536
+#: access/transam/xlog.c:6579
 #, c-format
 msgid "initializing for hot standby"
 msgstr "initialisiere für Hot Standby"
 
-#: access/transam/xlog.c:6668
+#: access/transam/xlog.c:6711
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "Redo beginnt bei %X/%X"
 
-#: access/transam/xlog.c:6882
+#: access/transam/xlog.c:6925
 #, c-format
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr "angeforderter Recovery-Endpunkt ist vor konsistentem Recovery-Punkt"
 
-#: access/transam/xlog.c:6920
+#: access/transam/xlog.c:6963
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "Redo fertig bei %X/%X"
 
-#: access/transam/xlog.c:6925 access/transam/xlog.c:8855
+#: access/transam/xlog.c:6968 access/transam/xlog.c:8922
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "letzte vollständige Transaktion war bei Logzeit %s"
 
-#: access/transam/xlog.c:6934
+#: access/transam/xlog.c:6977
 #, c-format
 msgid "redo is not required"
 msgstr "Redo nicht nötig"
 
-#: access/transam/xlog.c:7009 access/transam/xlog.c:7013
+#: access/transam/xlog.c:7052 access/transam/xlog.c:7056
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "WAL endet vor dem Ende der Online-Sicherung"
 
-#: access/transam/xlog.c:7010
+#: access/transam/xlog.c:7053
 #, c-format
 msgid "All WAL generated while online backup was taken must be available at recovery."
 msgstr "Der komplette WAL, der während der Online-Sicherung erzeugt wurde, muss bei der Wiederherstellung verfügbar sein."
 
-#: access/transam/xlog.c:7014
+#: access/transam/xlog.c:7057
 #, c-format
 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 "Die mit pg_start_backup() begonnene Online-Sicherung muss mit pg_stop_backup() beendet werden und der ganze WAL bis zu diesem Punkt muss bei der Wiederherstellung verfügbar sein."
 
-#: access/transam/xlog.c:7017
+#: access/transam/xlog.c:7060
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL endet vor einem konsistenten Wiederherstellungspunkt"
 
-#: access/transam/xlog.c:7044
+#: access/transam/xlog.c:7087
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "gewählte neue Zeitleisten-ID: %u"
 
-#: access/transam/xlog.c:7455
+#: access/transam/xlog.c:7498
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "konsistenter Wiederherstellungszustand erreicht bei %X/%X"
 
-#: access/transam/xlog.c:7646
+#: access/transam/xlog.c:7689
 #, c-format
 msgid "invalid primary checkpoint link in control file"
 msgstr "ungültige primäre Checkpoint-Verknüpfung in Kontrolldatei"
 
-#: access/transam/xlog.c:7650
+#: access/transam/xlog.c:7693
 #, c-format
 msgid "invalid secondary checkpoint link in control file"
 msgstr "ungültige sekundäre Checkpoint-Verknüpfung in Kontrolldatei"
 
-#: access/transam/xlog.c:7654
+#: access/transam/xlog.c:7697
 #, c-format
 msgid "invalid checkpoint link in backup_label file"
 msgstr "ungültige Checkpoint-Verknüpfung in backup_label-Datei"
 
-#: access/transam/xlog.c:7671
+#: access/transam/xlog.c:7714
 #, c-format
 msgid "invalid primary checkpoint record"
 msgstr "ungültiger primärer Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7675
+#: access/transam/xlog.c:7718
 #, c-format
 msgid "invalid secondary checkpoint record"
 msgstr "ungültiger sekundärer Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7679
+#: access/transam/xlog.c:7722
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "ungültiger Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7690
+#: access/transam/xlog.c:7733
 #, c-format
 msgid "invalid resource manager ID in primary checkpoint record"
 msgstr "ungültige Resource-Manager-ID im primären Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7694
+#: access/transam/xlog.c:7737
 #, c-format
 msgid "invalid resource manager ID in secondary checkpoint record"
 msgstr "ungültige Resource-Manager-ID im sekundären Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7698
+#: access/transam/xlog.c:7741
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "ungültige Resource-Manager-ID im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7710
+#: access/transam/xlog.c:7753
 #, c-format
 msgid "invalid xl_info in primary checkpoint record"
 msgstr "ungültige xl_info im primären Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7714
+#: access/transam/xlog.c:7757
 #, c-format
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr "ungültige xl_info im sekundären Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7718
+#: access/transam/xlog.c:7761
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "ungültige xl_info im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7729
+#: access/transam/xlog.c:7772
 #, c-format
 msgid "invalid length of primary checkpoint record"
 msgstr "ungültige Länge des primären Checkpoint-Datensatzes"
 
-#: access/transam/xlog.c:7733
+#: access/transam/xlog.c:7776
 #, c-format
 msgid "invalid length of secondary checkpoint record"
 msgstr "ungültige Länge des sekundären Checkpoint-Datensatzes"
 
-#: access/transam/xlog.c:7737
+#: access/transam/xlog.c:7780
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "ungültige Länge des Checkpoint-Datensatzes"
 
-#: access/transam/xlog.c:7907
+#: access/transam/xlog.c:7950
 #, c-format
 msgid "shutting down"
 msgstr "fahre herunter"
 
-#: access/transam/xlog.c:7931
+#: access/transam/xlog.c:7974
 #, c-format
 msgid "database system is shut down"
 msgstr "Datenbanksystem ist heruntergefahren"
 
-#: access/transam/xlog.c:8424
+#: access/transam/xlog.c:8467
 #, c-format
 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:8675
+#: access/transam/xlog.c:8721
 #, c-format
 msgid "skipping restartpoint, recovery has already ended"
 msgstr "Restart-Punkt übersprungen, Wiederherstellung ist bereits beendet"
 
-#: access/transam/xlog.c:8698
+#: access/transam/xlog.c:8744
 #, c-format
 msgid "skipping restartpoint, already performed at %X/%X"
 msgstr "Restart-Punkt wird übersprungen, schon bei %X/%X erledigt"
 
-#: access/transam/xlog.c:8853
+#: access/transam/xlog.c:8920
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "Recovery-Restart-Punkt bei %X/%X"
 
-#: access/transam/xlog.c:8986
+#: access/transam/xlog.c:9053
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
-msgstr "Restore-Punkt „%s“ erzeugt bei %X/%X"
+msgstr "Restore-Punkt »%s« erzeugt bei %X/%X"
 
-#: access/transam/xlog.c:9116
+#: access/transam/xlog.c:9183
 #, c-format
 msgid "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record"
 msgstr "unerwartete vorherige Zeitleisten-ID %u (aktuelle Zeitleisten-ID %u) im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:9125
+#: access/transam/xlog.c:9192
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "unerwartete Zeitleisten-ID %u (nach %u) im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:9141
+#: access/transam/xlog.c:9208
 #, c-format
 msgid "unexpected timeline ID %u in checkpoint record, before reaching minimum recovery point %X/%X on timeline %u"
 msgstr "unerwartete Zeitleisten-ID %u in Checkpoint-Datensatz, bevor der minimale Wiederherstellungspunkt %X/%X auf Zeitleiste %u erreicht wurde"
 
-#: access/transam/xlog.c:9212
+#: access/transam/xlog.c:9279
 #, c-format
 msgid "online backup was canceled, recovery cannot continue"
 msgstr "Online-Sicherung wurde storniert, Wiederherstellung kann nicht fortgesetzt werden"
 
-#: access/transam/xlog.c:9268 access/transam/xlog.c:9315
-#: access/transam/xlog.c:9338
+#: access/transam/xlog.c:9335 access/transam/xlog.c:9382
+#: access/transam/xlog.c:9405
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
 msgstr "unerwartete Zeitleisten-ID %u (sollte %u sein) im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:9615
+#: access/transam/xlog.c:9682
 #, c-format
 msgid "could not fsync log segment %s: %m"
 msgstr "konnte Logsegment %s nicht fsyncen: %m"
 
-#: access/transam/xlog.c:9639
+#: access/transam/xlog.c:9706
 #, c-format
 msgid "could not fsync log file %s: %m"
 msgstr "konnte Logdatei %s nicht fsyncen: %m"
 
-#: access/transam/xlog.c:9647
+#: access/transam/xlog.c:9714
 #, c-format
 msgid "could not fsync write-through log file %s: %m"
 msgstr "konnte Write-Through-Logdatei %s nicht fsyncen: %m"
 
-#: access/transam/xlog.c:9656
+#: access/transam/xlog.c:9723
 #, c-format
 msgid "could not fdatasync log file %s: %m"
 msgstr "konnte Logdatei %s nicht fdatasyncen: %m"
 
-#: access/transam/xlog.c:9748 access/transam/xlog.c:10219
+#: access/transam/xlog.c:9815 access/transam/xlog.c:10319
 #: access/transam/xlogfuncs.c:121 access/transam/xlogfuncs.c:150
 #: access/transam/xlogfuncs.c:189 access/transam/xlogfuncs.c:210
 #: access/transam/xlogfuncs.c:280 access/transam/xlogfuncs.c:336
@@ -2127,216 +2133,221 @@
 msgid "recovery is in progress"
 msgstr "Wiederherstellung läuft"
 
-#: access/transam/xlog.c:9749 access/transam/xlog.c:10220
+#: access/transam/xlog.c:9816 access/transam/xlog.c:10320
 #: access/transam/xlogfuncs.c:122 access/transam/xlogfuncs.c:151
 #: access/transam/xlogfuncs.c:190 access/transam/xlogfuncs.c:211
 #, c-format
 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:9758 access/transam/xlog.c:10229
+#: access/transam/xlog.c:9825 access/transam/xlog.c:10329
 #, c-format
 msgid "WAL level not sufficient for making an online backup"
 msgstr "WAL-Level nicht ausreichend, um Online-Sicherung durchzuführen"
 
-#: access/transam/xlog.c:9759 access/transam/xlog.c:10230
+#: access/transam/xlog.c:9826 access/transam/xlog.c:10330
 #: access/transam/xlogfuncs.c:157
 #, c-format
 msgid "wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start."
-msgstr "wal_level muss beim Serverstart auf „archive“, „hot_standby“ oder „logical“ gesetzt werden."
+msgstr "wal_level muss beim Serverstart auf »archive«, »hot_standby« oder »logical« gesetzt werden."
 
-#: access/transam/xlog.c:9764
+#: access/transam/xlog.c:9831
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "Backup-Label zu lang (maximal %d Bytes)"
 
-#: access/transam/xlog.c:9796 access/transam/xlog.c:10066
-#: access/transam/xlog.c:10102
+#: access/transam/xlog.c:9868 access/transam/xlog.c:10138
+#: access/transam/xlog.c:10174
 #, c-format
 msgid "a backup is already in progress"
 msgstr "ein Backup läuft bereits"
 
-#: access/transam/xlog.c:9797
+#: access/transam/xlog.c:9869
 #, c-format
 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:9892
+#: access/transam/xlog.c:9964
 #, c-format
 msgid "WAL generated with full_page_writes=off was replayed since last restartpoint"
 msgstr "mit full_page_writes=off erzeugtes WAL wurde seit dem letzten Restart-Punkt zurückgespielt"
 
-#: access/transam/xlog.c:9894 access/transam/xlog.c:10384
+#: access/transam/xlog.c:9966 access/transam/xlog.c:10512
 #, c-format
 msgid "This means that the backup being taken on the standby is corrupt and should not be used. Enable full_page_writes and run CHECKPOINT on the master, and then try an online backup again."
 msgstr "Das bedeutet, dass die aktuelle Datensicherung auf dem Standby-Server verfälscht ist und nicht verwendet werden sollte. Schalten Sie full_page_writes ein, führen Sie CHECKPOINT aus und versuchen Sie dann die Online-Sicherung erneut."
 
-#: access/transam/xlog.c:9960 replication/basebackup.c:1035
+#: access/transam/xlog.c:10032 replication/basebackup.c:1023
 #: utils/adt/misc.c:378
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
-msgstr "konnte symbolische Verknüpfung „%s“ nicht lesen: %m"
+msgstr "konnte symbolische Verknüpfung »%s« nicht lesen: %m"
 
-#: access/transam/xlog.c:9967 replication/basebackup.c:1040
+#: access/transam/xlog.c:10039 replication/basebackup.c:1028
 #: utils/adt/misc.c:383
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
-msgstr "Ziel für symbolische Verknüpfung „%s“ ist zu lang"
+msgstr "Ziel für symbolische Verknüpfung »%s« ist zu lang"
 
-#: access/transam/xlog.c:10020 commands/tablespace.c:391
-#: commands/tablespace.c:553 replication/basebackup.c:1056
+#: access/transam/xlog.c:10092 commands/tablespace.c:391
+#: commands/tablespace.c:553 replication/basebackup.c:1044
 #: utils/adt/misc.c:391
 #, c-format
 msgid "tablespaces are not supported on this platform"
 msgstr "Tablespaces werden auf dieser Plattform nicht unterstützt"
 
-#: access/transam/xlog.c:10060 access/transam/xlog.c:10096
-#: access/transam/xlog.c:10270 access/transam/xlogarchive.c:106
-#: access/transam/xlogarchive.c:265 commands/copy.c:1738 commands/copy.c:2764
-#: commands/extension.c:3026 commands/tablespace.c:860 guc-file.l:1003
-#: replication/basebackup.c:404 replication/basebackup.c:472
-#: replication/logical/snapbuild.c:1474 storage/file/copydir.c:72
-#: storage/file/copydir.c:115 storage/file/fd.c:2626 storage/file/fd.c:2718
-#: utils/adt/dbsize.c:68 utils/adt/dbsize.c:218 utils/adt/dbsize.c:298
-#: utils/adt/genfile.c:114 utils/adt/genfile.c:333
+#: access/transam/xlog.c:10132 access/transam/xlog.c:10168
+#: access/transam/xlog.c:10369 access/transam/xlogarchive.c:106
+#: access/transam/xlogarchive.c:265 commands/copy.c:1778 commands/copy.c:2804
+#: commands/extension.c:3029 commands/tablespace.c:782
+#: commands/tablespace.c:873 guc-file.l:1003 replication/basebackup.c:406
+#: replication/basebackup.c:474 replication/logical/snapbuild.c:1495
+#: storage/file/copydir.c:72 storage/file/copydir.c:115 storage/file/fd.c:2703
+#: storage/file/fd.c:2795 utils/adt/dbsize.c:68 utils/adt/dbsize.c:218
+#: utils/adt/dbsize.c:298 utils/adt/genfile.c:114 utils/adt/genfile.c:333
 #, c-format
 msgid "could not stat file \"%s\": %m"
-msgstr "konnte „stat“ für Datei „%s“ nicht ausführen: %m"
+msgstr "konnte »stat« für Datei »%s« nicht ausführen: %m"
 
-#: access/transam/xlog.c:10067 access/transam/xlog.c:10103
+#: access/transam/xlog.c:10139 access/transam/xlog.c:10175
 #, c-format
 msgid "If you're sure there is no backup in progress, remove file \"%s\" and try again."
-msgstr "Wenn Sie sicher sind, dass noch kein Backup läuft, entfernen Sie die Datei „%s“ und versuchen Sie es noch einmal."
+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:10084 access/transam/xlog.c:10120
-#: access/transam/xlog.c:10445
+#: access/transam/xlog.c:10156 access/transam/xlog.c:10192
+#: access/transam/xlog.c:10573
 #, c-format
 msgid "could not write file \"%s\": %m"
-msgstr "konnte Datei „%s“ nicht schreiben: %m"
+msgstr "konnte Datei »%s« nicht schreiben: %m"
+
+#: access/transam/xlog.c:10346
+#, c-format
+msgid "exclusive backup not in progress"
+msgstr "es läuft kein exklusives Backup"
 
-#: access/transam/xlog.c:10274
+#: access/transam/xlog.c:10373
 #, c-format
 msgid "a backup is not in progress"
 msgstr "es läuft kein Backup"
 
-#: access/transam/xlog.c:10319 access/transam/xlog.c:10332
-#: access/transam/xlog.c:10672 access/transam/xlog.c:10678
-#: access/transam/xlog.c:10762 access/transam/xlogfuncs.c:508
+#: access/transam/xlog.c:10447 access/transam/xlog.c:10460
+#: access/transam/xlog.c:10800 access/transam/xlog.c:10806
+#: access/transam/xlog.c:10890 access/transam/xlogfuncs.c:508
 #, c-format
 msgid "invalid data in file \"%s\""
-msgstr "ungültige Daten in Datei „%s“"
+msgstr "ungültige Daten in Datei »%s«"
 
-#: access/transam/xlog.c:10336 replication/basebackup.c:933
+#: access/transam/xlog.c:10464 replication/basebackup.c:935
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr "der Standby-Server wurde während der Online-Sicherung zum Primärserver befördert"
 
-#: access/transam/xlog.c:10337 replication/basebackup.c:934
+#: access/transam/xlog.c:10465 replication/basebackup.c:936
 #, c-format
 msgid "This means that the backup being taken is corrupt and should not be used. Try taking another online backup."
 msgstr "Das bedeutet, dass die aktuelle Online-Sicherung verfälscht ist und nicht verwendet werden sollte. Versuchen Sie, eine neue Online-Sicherung durchzuführen."
 
-#: access/transam/xlog.c:10382
+#: access/transam/xlog.c:10510
 #, c-format
 msgid "WAL generated with full_page_writes=off was replayed during online backup"
 msgstr "mit full_page_writes=off erzeugtes WAL wurde während der Online-Sicherung zurückgespielt"
 
-#: access/transam/xlog.c:10494
+#: access/transam/xlog.c:10622
 #, c-format
 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:10504
+#: access/transam/xlog.c:10632
 #, c-format
 msgid "pg_stop_backup still waiting for all required WAL segments to be archived (%d seconds elapsed)"
 msgstr "pg_stop_backup wartet immer noch, bis alle benötigten WAL-Segmente archiviert sind (%d Sekunden abgelaufen)"
 
-#: access/transam/xlog.c:10506
+#: access/transam/xlog.c:10634
 #, c-format
 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 "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:10513
+#: access/transam/xlog.c:10641
 #, c-format
 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:10517
+#: access/transam/xlog.c:10645
 #, 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"
 msgstr "WAL-Archivierung ist nicht eingeschaltet; Sie müssen dafür sorgen, dass alle benötigten WAL-Segmente auf andere Art kopiert werden, um die Sicherung abzuschließen"
 
-#: access/transam/xlog.c:10801
+#: access/transam/xlog.c:10929
 #, c-format
 msgid "xlog redo %s"
 msgstr "xlog redo %s"
 
-#: access/transam/xlog.c:10847
+#: access/transam/xlog.c:10975
 #, c-format
 msgid "online backup mode was not canceled"
 msgstr "Online-Sicherungsmodus wurde nicht storniert"
 
-#: access/transam/xlog.c:10848
+#: access/transam/xlog.c:10976
 #, c-format
 msgid "File \"%s\" could not be renamed to \"%s\": %m."
-msgstr "Konnte Datei „%s“ nicht in „%s“ umbenennen: %m."
+msgstr "Konnte Datei »%s« nicht in »%s« umbenennen: %m."
 
-#: access/transam/xlog.c:10857 access/transam/xlog.c:10869
-#: access/transam/xlog.c:10879
+#: access/transam/xlog.c:10985 access/transam/xlog.c:10997
+#: access/transam/xlog.c:11007
 #, c-format
 msgid "online backup mode canceled"
 msgstr "Online-Sicherungsmodus storniert"
 
-#: access/transam/xlog.c:10870
+#: access/transam/xlog.c:10998
 #, c-format
 msgid "Files \"%s\" and \"%s\" were renamed to \"%s\" and \"%s\", respectively."
-msgstr "Dateien „%s“ und „%s“ wurden in „%s“ und „%s“ umbenannt."
+msgstr "Dateien »%s« und »%s« wurden in »%s« und »%s« umbenannt."
 
-#: access/transam/xlog.c:10880
+#: access/transam/xlog.c:11008
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\", but file \"%s\" could not be renamed to \"%s\": %m."
-msgstr "Datei „%s“ wurde in „%s“ umbenannt, aber Datei „%s“ konnte nicht in „%s“ umbenannt werden: %m."
+msgstr "Datei »%s« wurde in »%s« umbenannt, aber Datei »%s« konnte nicht in »%s« umbenannt werden: %m."
 
-#: access/transam/xlog.c:11002 replication/logical/logicalfuncs.c:171
-#: replication/walreceiver.c:932 replication/walsender.c:2112
+#: access/transam/xlog.c:11130 replication/logical/logicalfuncs.c:171
+#: replication/walreceiver.c:932 replication/walsender.c:2111
 #, c-format
 msgid "could not seek in log segment %s to offset %u: %m"
 msgstr "konnte Positionszeiger von Logsegment %s nicht auf %u setzen: %m"
 
-#: access/transam/xlog.c:11014
+#: access/transam/xlog.c:11142
 #, c-format
 msgid "could not read from log segment %s, offset %u: %m"
 msgstr "konnte nicht aus Logsegment %s, Position %u lesen: %m"
 
-#: access/transam/xlog.c:11488
+#: access/transam/xlog.c:11616
 #, c-format
 msgid "received promote request"
 msgstr "Anforderung zum Befördern empfangen"
 
-#: access/transam/xlog.c:11501
+#: access/transam/xlog.c:11629
 #, c-format
 msgid "trigger file found: %s"
 msgstr "Triggerdatei gefunden: %s"
 
-#: access/transam/xlog.c:11510
+#: access/transam/xlog.c:11638
 #, c-format
 msgid "could not stat trigger file \"%s\": %m"
-msgstr "konnte „stat“ für Trigger-Datei „%s“ nicht ausführen: %m"
+msgstr "konnte »stat« für Trigger-Datei »%s« nicht ausführen: %m"
 
 #: access/transam/xlogarchive.c:244
 #, c-format
 msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
-msgstr "Archivdatei „%s“ hat falsche Größe: %lu statt %lu"
+msgstr "Archivdatei »%s« hat falsche Größe: %lu statt %lu"
 
 #: access/transam/xlogarchive.c:253
 #, c-format
 msgid "restored log file \"%s\" from archive"
-msgstr "Logdatei „%s“ aus Archiv wiederhergestellt"
+msgstr "Logdatei »%s« aus Archiv wiederhergestellt"
 
 #: access/transam/xlogarchive.c:303
 #, c-format
 msgid "could not restore file \"%s\" from archive: %s"
-msgstr "konnte Datei „%s“ nicht aus Archiv wiederherstellen: %s"
+msgstr "konnte Datei »%s« nicht aus Archiv wiederherstellen: %s"
 
 #. translator: First %s represents a recovery.conf parameter name like
 #. "recovery_end_command", the 2nd is the value of that parameter, the
@@ -2344,24 +2355,24 @@
 #: access/transam/xlogarchive.c:415
 #, c-format
 msgid "%s \"%s\": %s"
-msgstr "%s „%s“: %s"
+msgstr "%s »%s«: %s"
 
-#: access/transam/xlogarchive.c:458 replication/logical/snapbuild.c:1602
-#: replication/slot.c:470 replication/slot.c:926 replication/slot.c:1038
-#: storage/file/fd.c:494 storage/file/fd.c:552 utils/time/snapmgr.c:1094
+#: access/transam/xlogarchive.c:458 replication/logical/snapbuild.c:1623
+#: replication/slot.c:496 replication/slot.c:953 replication/slot.c:1065
+#: storage/file/fd.c:501 storage/file/fd.c:559 utils/time/snapmgr.c:1146
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
-msgstr "konnte Datei „%s“ nicht in „%s“ umbenennen: %m"
+msgstr "konnte Datei »%s« nicht in »%s« umbenennen: %m"
 
 #: access/transam/xlogarchive.c:525 access/transam/xlogarchive.c:589
 #, c-format
 msgid "could not create archive status file \"%s\": %m"
-msgstr "konnte Archivstatusdatei „%s“ nicht erstellen: %m"
+msgstr "konnte Archivstatusdatei »%s« nicht erstellen: %m"
 
 #: access/transam/xlogarchive.c:533 access/transam/xlogarchive.c:597
 #, c-format
 msgid "could not write archive status file \"%s\": %m"
-msgstr "konnte Archivstatusdatei „%s“ nicht schreiben: %m"
+msgstr "konnte Archivstatusdatei »%s« nicht schreiben: %m"
 
 #: access/transam/xlogfuncs.c:61 access/transam/xlogfuncs.c:98
 #, c-format
@@ -2369,14 +2380,14 @@
 msgstr "nur Superuser und Replikationsrollen können ein Backup ausführen"
 
 #: access/transam/xlogfuncs.c:67 commands/tablespace.c:705
-#: commands/tablespace.c:715 postmaster/postmaster.c:1389
-#: replication/basebackup.c:292 replication/basebackup.c:632
-#: storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:2092
-#: storage/file/fd.c:2691 storage/ipc/dsm.c:300 utils/adt/genfile.c:439
+#: commands/tablespace.c:715 postmaster/postmaster.c:1404
+#: replication/basebackup.c:294 replication/basebackup.c:634
+#: storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:2169
+#: storage/file/fd.c:2768 storage/ipc/dsm.c:300 utils/adt/genfile.c:439
 #: utils/adt/misc.c:291 utils/misc/tzparser.c:339
 #, c-format
 msgid "could not open directory \"%s\": %m"
-msgstr "konnte Verzeichnis „%s“ nicht öffnen: %m"
+msgstr "konnte Verzeichnis »%s« nicht öffnen: %m"
 
 #: access/transam/xlogfuncs.c:116
 #, c-format
@@ -2505,76 +2516,76 @@
 msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
 msgstr "Zeitleisten-ID %u außer der Reihe (nach %u) in Logsegment %s, Offset %u"
 
-#: access/transam/xlogreader.c:1024
+#: access/transam/xlogreader.c:1061
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %u außer der Reihe bei %X/%X"
 
-#: access/transam/xlogreader.c:1046
+#: access/transam/xlogreader.c:1083
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA gesetzt, aber keine Daten enthalten bei %X/%X"
 
-#: access/transam/xlogreader.c:1053
+#: access/transam/xlogreader.c:1090
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA nicht gesetzt, aber Datenlänge ist %u bei %X/%X"
 
-#: access/transam/xlogreader.c:1086
+#: access/transam/xlogreader.c:1123
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE gesetzt, aber Loch Offset %u Länge %u Block-Abbild-Länge %u bei %X/%X"
 
-#: access/transam/xlogreader.c:1102
+#: access/transam/xlogreader.c:1139
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE nicht gesetzt, aber Loch Offset %u Länge %u bei %X/%X"
 
-#: access/transam/xlogreader.c:1117
+#: access/transam/xlogreader.c:1154
 #, c-format
 msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_IS_COMPRESSED gesetzt, aber Block-Abbild-Länge %u bei %X/%X"
 
-#: access/transam/xlogreader.c:1132
+#: access/transam/xlogreader.c:1169
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "weder BKPIMAGE_HAS_HOLE noch BKPIMAGE_IS_COMPRESSED gesetzt, aber Block-Abbild-Länge ist %u bei %X/%X"
 
-#: access/transam/xlogreader.c:1148
+#: access/transam/xlogreader.c:1185
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL gesetzt, aber keine vorangehende Relation bei %X/%X"
 
-#: access/transam/xlogreader.c:1160
+#: access/transam/xlogreader.c:1197
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "ungültige block_id %u bei %X/%X"
 
-#: access/transam/xlogreader.c:1225
+#: access/transam/xlogreader.c:1262
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "Datensatz mit ungültiger Länge bei %X/%X"
 
-#: access/transam/xlogreader.c:1314
+#: access/transam/xlogreader.c:1351
 #, c-format
 msgid "invalid compressed image at %X/%X, block %d"
 msgstr "ungültiges komprimiertes Image bei %X/%X, Block %d"
 
-#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:779 tcop/postgres.c:3485
+#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:790 tcop/postgres.c:3500
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s benötigt einen Wert"
 
-#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:784 tcop/postgres.c:3490
+#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:795 tcop/postgres.c:3505
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s benötigt einen Wert"
 
-#: bootstrap/bootstrap.c:284 postmaster/postmaster.c:796
-#: postmaster/postmaster.c:809
+#: bootstrap/bootstrap.c:284 postmaster/postmaster.c:807
+#: postmaster/postmaster.c:820
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
 #: bootstrap/bootstrap.c:293
 #, c-format
@@ -2589,42 +2600,42 @@
 #: catalog/aclchk.c:305
 #, c-format
 msgid "no privileges were granted for column \"%s\" of relation \"%s\""
-msgstr "es wurden keine Privilegien für Spalte „%s“ von Relation „%s“ gewährt"
+msgstr "es wurden keine Privilegien für Spalte »%s« von Relation »%s« gewährt"
 
 #: catalog/aclchk.c:310
 #, c-format
 msgid "no privileges were granted for \"%s\""
-msgstr "es wurden keine Privilegien für „%s“ gewährt"
+msgstr "es wurden keine Privilegien für »%s« gewährt"
 
 #: catalog/aclchk.c:318
 #, c-format
 msgid "not all privileges were granted for column \"%s\" of relation \"%s\""
-msgstr "es wurden nicht alle Priviligien für Spalte „%s“ von Relation „%s“ gewährt"
+msgstr "es wurden nicht alle Priviligien für Spalte »%s« von Relation »%s« gewährt"
 
 #: catalog/aclchk.c:323
 #, c-format
 msgid "not all privileges were granted for \"%s\""
-msgstr "es wurden nicht alle Priviligien für „%s“ gewährt"
+msgstr "es wurden nicht alle Priviligien für »%s« gewährt"
 
 #: catalog/aclchk.c:334
 #, c-format
 msgid "no privileges could be revoked for column \"%s\" of relation \"%s\""
-msgstr "es konnten keine Privilegien für Spalte „%s“ von Relation „%s“ entzogen werden"
+msgstr "es konnten keine Privilegien für Spalte »%s« von Relation »%s« entzogen werden"
 
 #: catalog/aclchk.c:339
 #, c-format
 msgid "no privileges could be revoked for \"%s\""
-msgstr "es konnten keine Privilegien für „%s“ entzogen werden"
+msgstr "es konnten keine Privilegien für »%s« entzogen werden"
 
 #: catalog/aclchk.c:347
 #, c-format
 msgid "not all privileges could be revoked for column \"%s\" of relation \"%s\""
-msgstr "es konnten nicht alle Privilegien für Spalte „%s“ von Relation „%s“ entzogen werden"
+msgstr "es konnten nicht alle Privilegien für Spalte »%s« von Relation »%s« entzogen werden"
 
 #: catalog/aclchk.c:352
 #, c-format
 msgid "not all privileges could be revoked for \"%s\""
-msgstr "es konnten nicht alle Privilegien für „%s“ entzogen werden"
+msgstr "es konnten nicht alle Privilegien für »%s« entzogen werden"
 
 #: catalog/aclchk.c:434 catalog/aclchk.c:924
 #, c-format
@@ -2691,7 +2702,7 @@
 msgid "column privileges are only valid for relations"
 msgstr "Spaltenprivilegien sind nur für Relation gültig"
 
-#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4651
+#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4656
 #: catalog/objectaddress.c:854 catalog/pg_largeobject.c:113
 #: storage/large_object/inv_api.c:291
 #, c-format
@@ -2699,19 +2710,19 @@
 msgstr "Large Object %u existiert nicht"
 
 #: catalog/aclchk.c:863 catalog/aclchk.c:871 commands/collationcmds.c:92
-#: commands/copy.c:1010 commands/copy.c:1028 commands/copy.c:1036
-#: commands/copy.c:1044 commands/copy.c:1052 commands/copy.c:1060
-#: commands/copy.c:1068 commands/copy.c:1076 commands/copy.c:1084
-#: commands/copy.c:1100 commands/copy.c:1114 commands/copy.c:1133
-#: commands/copy.c:1148 commands/dbcommands.c:155 commands/dbcommands.c:163
+#: commands/copy.c:1050 commands/copy.c:1068 commands/copy.c:1076
+#: commands/copy.c:1084 commands/copy.c:1092 commands/copy.c:1100
+#: commands/copy.c:1108 commands/copy.c:1116 commands/copy.c:1124
+#: commands/copy.c:1140 commands/copy.c:1154 commands/copy.c:1173
+#: commands/copy.c:1188 commands/dbcommands.c:155 commands/dbcommands.c:163
 #: commands/dbcommands.c:171 commands/dbcommands.c:179
 #: commands/dbcommands.c:187 commands/dbcommands.c:195
 #: commands/dbcommands.c:203 commands/dbcommands.c:211
 #: commands/dbcommands.c:219 commands/dbcommands.c:1397
 #: commands/dbcommands.c:1405 commands/dbcommands.c:1413
-#: commands/dbcommands.c:1421 commands/extension.c:1244
-#: commands/extension.c:1252 commands/extension.c:1260
-#: commands/extension.c:2677 commands/foreigncmds.c:539
+#: commands/dbcommands.c:1421 commands/extension.c:1247
+#: commands/extension.c:1255 commands/extension.c:1263
+#: commands/extension.c:2680 commands/foreigncmds.c:539
 #: commands/foreigncmds.c:548 commands/functioncmds.c:525
 #: commands/functioncmds.c:619 commands/functioncmds.c:627
 #: commands/functioncmds.c:635 commands/functioncmds.c:643
@@ -2739,31 +2750,31 @@
 msgstr "Vorgabeprivilegien können nicht für Spalten gesetzt werden"
 
 #: catalog/aclchk.c:1483 catalog/objectaddress.c:1338 commands/analyze.c:378
-#: commands/copy.c:4383 commands/sequence.c:1491 commands/tablecmds.c:5167
-#: commands/tablecmds.c:5273 commands/tablecmds.c:5333
-#: commands/tablecmds.c:5446 commands/tablecmds.c:5503
-#: commands/tablecmds.c:5597 commands/tablecmds.c:5693
-#: commands/tablecmds.c:7845 commands/tablecmds.c:8050
-#: commands/tablecmds.c:8470 commands/trigger.c:643 parser/analyze.c:2160
-#: parser/parse_relation.c:2542 parser/parse_relation.c:2604
-#: parser/parse_target.c:940 parser/parse_type.c:127 utils/adt/acl.c:2839
-#: utils/adt/ruleutils.c:1856
+#: commands/copy.c:4423 commands/sequence.c:1491 commands/tablecmds.c:5168
+#: commands/tablecmds.c:5274 commands/tablecmds.c:5334
+#: commands/tablecmds.c:5447 commands/tablecmds.c:5504
+#: commands/tablecmds.c:5598 commands/tablecmds.c:5694
+#: commands/tablecmds.c:7886 commands/tablecmds.c:8148
+#: commands/tablecmds.c:8568 commands/trigger.c:643 parser/analyze.c:2157
+#: parser/parse_relation.c:2628 parser/parse_relation.c:2690
+#: parser/parse_target.c:951 parser/parse_type.c:127 utils/adt/acl.c:2839
+#: utils/adt/ruleutils.c:1859
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
-msgstr "Spalte „%s“ von Relation „%s“ existiert nicht"
+msgstr "Spalte »%s« von Relation »%s« existiert nicht"
 
 #: catalog/aclchk.c:1748 catalog/objectaddress.c:1151 commands/sequence.c:1078
-#: commands/tablecmds.c:221 commands/tablecmds.c:11960 utils/adt/acl.c:2075
+#: commands/tablecmds.c:222 commands/tablecmds.c:12118 utils/adt/acl.c:2075
 #: utils/adt/acl.c:2105 utils/adt/acl.c:2137 utils/adt/acl.c:2169
 #: utils/adt/acl.c:2197 utils/adt/acl.c:2227
 #, c-format
 msgid "\"%s\" is not a sequence"
-msgstr "„%s“ ist keine Sequenz"
+msgstr "»%s« ist keine Sequenz"
 
 #: catalog/aclchk.c:1786
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
-msgstr "Sequenz „%s“ unterstützt nur die Privilegien USAGE, SELECT und UPDATE"
+msgstr "Sequenz »%s« unterstützt nur die Privilegien USAGE, SELECT und UPDATE"
 
 #: catalog/aclchk.c:1803
 #, c-format
@@ -2778,12 +2789,12 @@
 #: catalog/aclchk.c:1981
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
-msgstr "Sequenz „%s“ unterstützt nur den Spaltenprivilegientyp SELECT"
+msgstr "Sequenz »%s« unterstützt nur den Spaltenprivilegientyp SELECT"
 
 #: catalog/aclchk.c:2565
 #, c-format
 msgid "language \"%s\" is not trusted"
-msgstr "Sprache „%s“ ist nicht „trusted“"
+msgstr "Sprache »%s« ist nicht »trusted«"
 
 #: catalog/aclchk.c:2567
 #, c-format
@@ -2803,12 +2814,12 @@
 #: catalog/aclchk.c:3091 catalog/objectaddress.c:1471 commands/typecmds.c:3142
 #, c-format
 msgid "\"%s\" is not a domain"
-msgstr "„%s“ ist keine Domäne"
+msgstr "»%s« ist keine Domäne"
 
 #: catalog/aclchk.c:3211
 #, c-format
 msgid "unrecognized privilege type \"%s\""
-msgstr "unbekannter Privilegtyp „%s“"
+msgstr "unbekannter Privilegtyp »%s«"
 
 #: catalog/aclchk.c:3260
 #, c-format
@@ -3019,134 +3030,134 @@
 #: catalog/aclchk.c:3388
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
-msgstr "keine Berechtigung für Spalte „%s“ von Relation „%s“"
+msgstr "keine Berechtigung für Spalte »%s« von Relation »%s«"
 
 #: catalog/aclchk.c:3507 catalog/aclchk.c:3515
 #, c-format
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "Attribut %d der Relation mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:3588 catalog/aclchk.c:4502
+#: catalog/aclchk.c:3588 catalog/aclchk.c:4507
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "Relation mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:3687 catalog/aclchk.c:4920
+#: catalog/aclchk.c:3687 catalog/aclchk.c:4925
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "Datenbank mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:3741 catalog/aclchk.c:4580 tcop/fastpath.c:223
+#: catalog/aclchk.c:3741 catalog/aclchk.c:4585 tcop/fastpath.c:223
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "Funktion mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:3795 catalog/aclchk.c:4606
+#: catalog/aclchk.c:3795 catalog/aclchk.c:4611
 #, c-format
 msgid "language with OID %u does not exist"
 msgstr "Sprache mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:3959 catalog/aclchk.c:4678
+#: catalog/aclchk.c:3959 catalog/aclchk.c:4683
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "Schema mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4013 catalog/aclchk.c:4705
+#: catalog/aclchk.c:4013 catalog/aclchk.c:4710
 #, c-format
 msgid "tablespace with OID %u does not exist"
 msgstr "Tablespace mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4071 catalog/aclchk.c:4839 commands/foreigncmds.c:325
+#: catalog/aclchk.c:4072 catalog/aclchk.c:4844 commands/foreigncmds.c:325
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "Fremddaten-Wrapper mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4132 catalog/aclchk.c:4866 commands/foreigncmds.c:461
+#: catalog/aclchk.c:4134 catalog/aclchk.c:4871 commands/foreigncmds.c:461
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "Fremdserver mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4191 catalog/aclchk.c:4205 catalog/aclchk.c:4528
+#: catalog/aclchk.c:4194 catalog/aclchk.c:4533
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "Typ mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4554
+#: catalog/aclchk.c:4559
 #, c-format
 msgid "operator with OID %u does not exist"
 msgstr "Operator mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4731
+#: catalog/aclchk.c:4736
 #, c-format
 msgid "operator class with OID %u does not exist"
 msgstr "Operatorklasse mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4758
+#: catalog/aclchk.c:4763
 #, c-format
 msgid "operator family with OID %u does not exist"
 msgstr "Operatorfamilie mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4785
+#: catalog/aclchk.c:4790
 #, c-format
 msgid "text search dictionary with OID %u does not exist"
 msgstr "Textsuchewörterbuch mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4812
+#: catalog/aclchk.c:4817
 #, c-format
 msgid "text search configuration with OID %u does not exist"
 msgstr "Textsuchekonfiguration mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4893 commands/event_trigger.c:586
+#: catalog/aclchk.c:4898 commands/event_trigger.c:586
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "Ereignistrigger mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4946
+#: catalog/aclchk.c:4951
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "Sortierfolge mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:4972
+#: catalog/aclchk.c:4977
 #, c-format
 msgid "conversion with OID %u does not exist"
 msgstr "Konversion mit OID %u existiert nicht"
 
-#: catalog/aclchk.c:5013
+#: catalog/aclchk.c:5018
 #, c-format
 msgid "extension with OID %u does not exist"
 msgstr "Erweiterung mit OID %u existiert nicht"
 
-#: catalog/dependency.c:640
+#: catalog/dependency.c:639
 #, c-format
 msgid "cannot drop %s because %s requires it"
 msgstr "kann %s nicht löschen, wird von %s benötigt"
 
-#: catalog/dependency.c:643
+#: catalog/dependency.c:642
 #, c-format
 msgid "You can drop %s instead."
 msgstr "Sie können stattdessen %s löschen."
 
-#: catalog/dependency.c:804 catalog/pg_shdepend.c:576
+#: catalog/dependency.c:803 catalog/pg_shdepend.c:576
 #, 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:920
+#: catalog/dependency.c:919
 #, c-format
 msgid "drop auto-cascades to %s"
 msgstr "Löschvorgang löscht automatisch %s"
 
-#: catalog/dependency.c:932 catalog/dependency.c:941
+#: catalog/dependency.c:931 catalog/dependency.c:940
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s hängt von %s ab"
 
-#: catalog/dependency.c:953 catalog/dependency.c:962
+#: catalog/dependency.c:952 catalog/dependency.c:961
 #, c-format
 msgid "drop cascades to %s"
 msgstr "Löschvorgang löscht ebenfalls %s"
 
-#: catalog/dependency.c:970 catalog/pg_shdepend.c:687
+#: catalog/dependency.c:969 catalog/pg_shdepend.c:687
 #, c-format
 msgid ""
 "\n"
@@ -3161,193 +3172,204 @@
 "\n"
 "und %d weitere Objekte (Liste im Serverlog)"
 
-#: catalog/dependency.c:982
+#: catalog/dependency.c:981
 #, 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:986 catalog/dependency.c:993
+#: catalog/dependency.c:985 catalog/dependency.c:992
 #, c-format
 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:990
+#: catalog/dependency.c:989
 #, c-format
 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:999
+#: catalog/dependency.c:998
 #, 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:1622
+#: catalog/dependency.c:1621
 #, c-format
 msgid "constant of the type \"regrole\" cannot be used here"
-msgstr "Konstante vom Typ „regrole“ kann hier nicht verwendet werden"
+msgstr "Konstante vom Typ »regrole« kann hier nicht verwendet werden"
 
-#: catalog/heap.c:276
+#: catalog/heap.c:277
 #, c-format
 msgid "permission denied to create \"%s.%s\""
-msgstr "keine Berechtigung, um „%s.%s“ zu erzeugen"
+msgstr "keine Berechtigung, um »%s.%s« zu erzeugen"
 
-#: catalog/heap.c:278
+#: catalog/heap.c:279
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "Änderungen an Systemkatalogen sind gegenwärtig nicht erlaubt."
 
-#: catalog/heap.c:413 commands/tablecmds.c:1434 commands/tablecmds.c:1887
-#: commands/tablecmds.c:4804
+#: catalog/heap.c:414 commands/tablecmds.c:1435 commands/tablecmds.c:1888
+#: commands/tablecmds.c:4805
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "Tabellen können höchstens %d Spalten haben"
 
-#: catalog/heap.c:430 commands/tablecmds.c:5063
+#: catalog/heap.c:431 commands/tablecmds.c:5064
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
-msgstr "Spaltenname „%s“ steht im Konflikt mit dem Namen einer Systemspalte"
+msgstr "Spaltenname »%s« steht im Konflikt mit dem Namen einer Systemspalte"
 
-#: catalog/heap.c:446
+#: catalog/heap.c:447
 #, c-format
 msgid "column name \"%s\" specified more than once"
-msgstr "Spaltenname „%s“ mehrmals angegeben"
+msgstr "Spaltenname »%s« mehrmals angegeben"
 
-#: catalog/heap.c:496
+#: catalog/heap.c:497
 #, c-format
 msgid "column \"%s\" has type \"unknown\""
-msgstr "Spalte „%s“ hat Typ „unknown“"
+msgstr "Spalte »%s« hat Typ »unknown«"
 
-#: catalog/heap.c:497
+#: catalog/heap.c:498
 #, c-format
 msgid "Proceeding with relation creation anyway."
 msgstr "Relation wird trotzdem erzeugt."
 
-#: catalog/heap.c:510
+#: catalog/heap.c:511
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
-msgstr "Spalte „%s“ hat Pseudotyp %s"
+msgstr "Spalte »%s« hat Pseudotyp %s"
 
-#: catalog/heap.c:540
+#: catalog/heap.c:541
 #, 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:582 commands/createas.c:373
+#: catalog/heap.c:583 commands/createas.c:201 commands/createas.c:497
 #, 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"
+msgstr "für Spalte »%s« mit sortierbarem Typ %s wurde keine Sortierfolge abgeleitet"
 
-#: catalog/heap.c:584 commands/createas.c:375 commands/indexcmds.c:1087
-#: commands/view.c:116 regex/regc_pg_locale.c:262 utils/adt/formatting.c:1514
-#: utils/adt/formatting.c:1566 utils/adt/formatting.c:1634
-#: utils/adt/formatting.c:1686 utils/adt/formatting.c:1755
-#: utils/adt/formatting.c:1819 utils/adt/like.c:213 utils/adt/selfuncs.c:5276
-#: utils/adt/varlena.c:1411 utils/adt/varlena.c:1800
+#: catalog/heap.c:585 commands/createas.c:204 commands/createas.c:500
+#: commands/indexcmds.c:1088 commands/view.c:103 regex/regc_pg_locale.c:262
+#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1754 utils/adt/formatting.c:1818
+#: utils/adt/like.c:213 utils/adt/selfuncs.c:5280 utils/adt/varlena.c:1411
+#: utils/adt/varlena.c:1800
 #, c-format
 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:1065 catalog/index.c:793 commands/tablecmds.c:2614
+#: catalog/heap.c:1066 catalog/index.c:793 commands/tablecmds.c:2615
 #, c-format
 msgid "relation \"%s\" already exists"
-msgstr "Relation „%s“ existiert bereits"
+msgstr "Relation »%s« existiert bereits"
 
-#: catalog/heap.c:1081 catalog/pg_type.c:412 catalog/pg_type.c:722
+#: catalog/heap.c:1082 catalog/pg_type.c:412 catalog/pg_type.c:722
 #: commands/typecmds.c:235 commands/typecmds.c:782 commands/typecmds.c:1133
 #: commands/typecmds.c:1355 commands/typecmds.c:2109
 #, c-format
 msgid "type \"%s\" already exists"
-msgstr "Typ „%s“ existiert bereits"
+msgstr "Typ »%s« existiert bereits"
 
-#: catalog/heap.c:1082
+#: catalog/heap.c:1083
 #, 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 "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:1110
+#: catalog/heap.c:1111
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "Heap-OID-Wert für pg_class ist im Binary-Upgrade-Modus nicht gesetzt"
 
-#: catalog/heap.c:2290
+#: catalog/heap.c:2292
 #, c-format
 msgid "check constraint \"%s\" already exists"
-msgstr "Check-Constraint „%s“ existiert bereits"
+msgstr "Check-Constraint »%s« existiert bereits"
 
-#: catalog/heap.c:2445 catalog/pg_constraint.c:652 commands/tablecmds.c:6038
+#: catalog/heap.c:2459 catalog/pg_constraint.c:652 commands/tablecmds.c:6039
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
-msgstr "Constraint „%s“ existiert bereits für Relation „%s“"
+msgstr "Constraint »%s« existiert bereits für Relation »%s«"
 
-#: catalog/heap.c:2455
+#: catalog/heap.c:2466
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
-msgstr "Constraint „%s“ kollidiert mit nicht vererbtem Constraint für Relation „%s“"
+msgstr "Constraint »%s« kollidiert mit nicht vererbtem Constraint für Relation »%s«"
 
-#: catalog/heap.c:2469
+#: catalog/heap.c:2477
+#, c-format
+msgid "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
+msgstr "Constraint »%s« kollidiert mit vererbtem Constraint für Relation »%s«"
+
+#: catalog/heap.c:2487
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
+msgstr "Constraint »%s« kollidiert mit NOT-VALID-Constraint für Relation »%s«"
+
+#: catalog/heap.c:2492
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
-msgstr "Constraint „%s“ wird mit geerbter Definition zusammengeführt"
+msgstr "Constraint »%s« wird mit geerbter Definition zusammengeführt"
 
-#: catalog/heap.c:2562
+#: catalog/heap.c:2598
 #, c-format
 msgid "cannot use column references in default expression"
 msgstr "Spaltenverweise können nicht in Vorgabeausdrücken verwendet werden"
 
-#: catalog/heap.c:2573
+#: catalog/heap.c:2609
 #, c-format
 msgid "default expression must not return a set"
 msgstr "Vorgabeausdruck kann keine Ergebnismenge zurückgeben"
 
-#: catalog/heap.c:2592 rewrite/rewriteHandler.c:1077
+#: catalog/heap.c:2628 rewrite/rewriteHandler.c:1077
 #, 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"
+msgstr "Spalte »%s« hat Typ %s, aber der Vorgabeausdruck hat Typ %s"
 
-#: catalog/heap.c:2597 commands/prepare.c:374 parser/parse_node.c:411
-#: parser/parse_target.c:528 parser/parse_target.c:778
-#: parser/parse_target.c:788 rewrite/rewriteHandler.c:1082
+#: catalog/heap.c:2633 commands/prepare.c:374 parser/parse_node.c:411
+#: parser/parse_target.c:539 parser/parse_target.c:789
+#: parser/parse_target.c:799 rewrite/rewriteHandler.c:1082
 #, c-format
 msgid "You will need to rewrite or cast the expression."
 msgstr "Sie müssen den Ausdruck umschreiben oder eine Typumwandlung vornehmen."
 
-#: catalog/heap.c:2644
+#: catalog/heap.c:2680
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
-msgstr "nur Verweise auf Tabelle „%s“ sind im Check-Constraint zugelassen"
+msgstr "nur Verweise auf Tabelle »%s« sind im Check-Constraint zugelassen"
 
-#: catalog/heap.c:2884
+#: catalog/heap.c:2920
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "nicht unterstützte Kombination aus ON COMMIT und Fremdschlüssel"
 
-#: catalog/heap.c:2885
+#: catalog/heap.c:2921
 #, c-format
 msgid "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting."
-msgstr "Tabelle „%s“ verweist auf „%s“, aber sie haben nicht die gleiche ON-COMMIT-Einstellung."
+msgstr "Tabelle »%s« verweist auf »%s«, aber sie haben nicht die gleiche ON-COMMIT-Einstellung."
 
-#: catalog/heap.c:2890
+#: catalog/heap.c:2926
 #, c-format
 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:2891
+#: catalog/heap.c:2927
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
-msgstr "Tabelle „%s“ verweist auf „%s“."
+msgstr "Tabelle »%s« verweist auf »%s«."
 
-#: catalog/heap.c:2893
+#: catalog/heap.c:2929
 #, 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."
+msgstr "Leeren Sie die Tabelle »%s« gleichzeitig oder verwenden Sie TRUNCATE ... CASCADE."
 
-#: catalog/index.c:205 parser/parse_utilcmd.c:1436 parser/parse_utilcmd.c:1522
+#: catalog/index.c:205 parser/parse_utilcmd.c:1438 parser/parse_utilcmd.c:1524
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
-msgstr "mehrere Primärschlüssel für Tabelle „%s“ nicht erlaubt"
+msgstr "mehrere Primärschlüssel für Tabelle »%s« nicht erlaubt"
 
 #: catalog/index.c:223
 #, c-format
@@ -3369,11 +3391,11 @@
 msgid "shared indexes cannot be created after initdb"
 msgstr "Cluster-globale Indexe können nicht nach initdb erzeugt werden"
 
-#: catalog/index.c:785 commands/createas.c:100 commands/sequence.c:141
+#: catalog/index.c:785 commands/createas.c:249 commands/sequence.c:141
 #: parser/parse_utilcmd.c:185
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
-msgstr "Relation „%s“ existiert bereits, wird übersprungen"
+msgstr "Relation »%s« existiert bereits, wird übersprungen"
 
 #: catalog/index.c:821
 #, c-format
@@ -3388,7 +3410,7 @@
 #: catalog/index.c:2007
 #, c-format
 msgid "building index \"%s\" on table \"%s\""
-msgstr "baue Index „%s“ von Tabelle „%s“"
+msgstr "baue Index »%s« von Tabelle »%s«"
 
 #: catalog/index.c:3262
 #, c-format
@@ -3398,10 +3420,10 @@
 #: catalog/index.c:3387
 #, c-format
 msgid "index \"%s\" was reindexed"
-msgstr "Index „%s“ wurde neu indiziert"
+msgstr "Index »%s« wurde neu indiziert"
 
-#: catalog/index.c:3389 commands/vacuumlazy.c:1135 commands/vacuumlazy.c:1211
-#: commands/vacuumlazy.c:1378 commands/vacuumlazy.c:1550
+#: catalog/index.c:3389 commands/vacuumlazy.c:1142 commands/vacuumlazy.c:1218
+#: commands/vacuumlazy.c:1385 commands/vacuumlazy.c:1557
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -3410,7 +3432,7 @@
 #: commands/trigger.c:4528
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
-msgstr "Verweise auf andere Datenbanken sind nicht implementiert: „%s.%s.%s“"
+msgstr "Verweise auf andere Datenbanken sind nicht implementiert: »%s.%s.%s«"
 
 #: catalog/namespace.c:306
 #, c-format
@@ -3420,26 +3442,26 @@
 #: catalog/namespace.c:385
 #, c-format
 msgid "could not obtain lock on relation \"%s.%s\""
-msgstr "konnte Sperre für Relation „%s.%s“ nicht setzen"
+msgstr "konnte Sperre für Relation »%s.%s« nicht setzen"
 
 #: catalog/namespace.c:390 commands/lockcmds.c:146
 #, c-format
 msgid "could not obtain lock on relation \"%s\""
-msgstr "konnte Sperre für Relation „%s“ nicht setzen"
+msgstr "konnte Sperre für Relation »%s« nicht setzen"
 
-#: catalog/namespace.c:414 parser/parse_relation.c:1137
+#: catalog/namespace.c:414 parser/parse_relation.c:1138
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
-msgstr "Relation „%s.%s“ existiert nicht"
+msgstr "Relation »%s.%s« existiert nicht"
 
-#: catalog/namespace.c:419 parser/parse_relation.c:1150
-#: parser/parse_relation.c:1158 utils/adt/regproc.c:1034
+#: catalog/namespace.c:419 parser/parse_relation.c:1151
+#: parser/parse_relation.c:1159 utils/adt/regproc.c:1034
 #, c-format
 msgid "relation \"%s\" does not exist"
-msgstr "Relation „%s“ existiert nicht"
+msgstr "Relation »%s« existiert nicht"
 
-#: catalog/namespace.c:487 catalog/namespace.c:2852 commands/extension.c:1394
-#: commands/extension.c:1400
+#: catalog/namespace.c:487 catalog/namespace.c:2852 commands/extension.c:1397
+#: commands/extension.c:1403
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "kein Schema für die Objekterzeugung ausgewählt"
@@ -3462,31 +3484,31 @@
 #: catalog/namespace.c:2154
 #, c-format
 msgid "text search parser \"%s\" does not exist"
-msgstr "Textsucheparser „%s“ existiert nicht"
+msgstr "Textsucheparser »%s« existiert nicht"
 
 #: catalog/namespace.c:2280
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
-msgstr "Textsuchewörterbuch „%s“ existiert nicht"
+msgstr "Textsuchewörterbuch »%s« existiert nicht"
 
 #: catalog/namespace.c:2407
 #, c-format
 msgid "text search template \"%s\" does not exist"
-msgstr "Textsuchevorlage „%s“ existiert nicht"
+msgstr "Textsuchevorlage »%s« existiert nicht"
 
 #: catalog/namespace.c:2533 commands/tsearchcmds.c:1197
 #: utils/cache/ts_cache.c:613
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
-msgstr "Textsuchekonfiguration „%s“ existiert nicht"
+msgstr "Textsuchekonfiguration »%s« existiert nicht"
 
-#: catalog/namespace.c:2646 parser/parse_expr.c:789 parser/parse_target.c:1130
+#: catalog/namespace.c:2646 parser/parse_expr.c:789 parser/parse_target.c:1141
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "Verweise auf andere Datenbanken sind nicht implementiert: %s"
 
-#: catalog/namespace.c:2652 gram.y:13305 gram.y:14659 parser/parse_expr.c:796
-#: parser/parse_target.c:1137
+#: catalog/namespace.c:2652 gram.y:13309 gram.y:14675 parser/parse_expr.c:796
+#: parser/parse_target.c:1148
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "falscher qualifizierter Name (zu viele Namensteile): %s"
@@ -3494,7 +3516,7 @@
 #: catalog/namespace.c:2786
 #, c-format
 msgid "%s is already in schema \"%s\""
-msgstr "%s ist bereits in Schema „%s“"
+msgstr "%s ist bereits in Schema »%s«"
 
 #: catalog/namespace.c:2794
 #, c-format
@@ -3507,10 +3529,10 @@
 msgstr "Objekte können nicht in oder aus TOAST-Schemas verschoben werden"
 
 #: catalog/namespace.c:2873 commands/schemacmds.c:238
-#: commands/schemacmds.c:317 commands/tablecmds.c:736
+#: commands/schemacmds.c:317 commands/tablecmds.c:737
 #, c-format
 msgid "schema \"%s\" does not exist"
-msgstr "Schema „%s“ existiert nicht"
+msgstr "Schema »%s« existiert nicht"
 
 #: catalog/namespace.c:2904
 #, c-format
@@ -3520,17 +3542,17 @@
 #: catalog/namespace.c:3369
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" does not exist"
-msgstr "Sortierfolge „%s“ für Kodierung „%s“ existiert nicht"
+msgstr "Sortierfolge »%s« für Kodierung »%s« existiert nicht"
 
 #: catalog/namespace.c:3424
 #, c-format
 msgid "conversion \"%s\" does not exist"
-msgstr "Konversion „%s“ existiert nicht"
+msgstr "Konversion »%s« existiert nicht"
 
 #: catalog/namespace.c:3632
 #, c-format
 msgid "permission denied to create temporary tables in database \"%s\""
-msgstr "keine Berechtigung, um temporäre Tabellen in Datenbank „%s“ zu erzeugen"
+msgstr "keine Berechtigung, um temporäre Tabellen in Datenbank »%s« zu erzeugen"
 
 #: catalog/namespace.c:3648
 #, c-format
@@ -3542,8 +3564,8 @@
 msgid "cannot create temporary tables in parallel mode"
 msgstr "im Parallelmodus können keine temporären Tabellen erzeugt werden"
 
-#: catalog/namespace.c:3898 commands/tablespace.c:1159 commands/variable.c:63
-#: replication/syncrep.c:700 utils/misc/guc.c:9632
+#: catalog/namespace.c:3898 commands/tablespace.c:1173 commands/variable.c:63
+#: replication/syncrep.c:692 utils/misc/guc.c:9667
 #, c-format
 msgid "List syntax is invalid."
 msgstr "Die Listensyntax ist ungültig."
@@ -3552,7 +3574,7 @@
 msgid "database name cannot be qualified"
 msgstr "Datenbankname kann nicht qualifiziert werden"
 
-#: catalog/objectaddress.c:1024 commands/extension.c:2423
+#: catalog/objectaddress.c:1024 commands/extension.c:2426
 #, c-format
 msgid "extension name cannot be qualified"
 msgstr "Erweiterungsname kann nicht qualifiziert werden"
@@ -3586,30 +3608,30 @@
 msgstr "Ereignistriggername kann nicht qualifiziert werden"
 
 #: catalog/objectaddress.c:1158 commands/lockcmds.c:94 commands/policy.c:94
-#: commands/policy.c:384 commands/policy.c:473 commands/tablecmds.c:215
-#: commands/tablecmds.c:1295 commands/tablecmds.c:4338
-#: commands/tablecmds.c:7947
+#: commands/policy.c:384 commands/policy.c:473 commands/tablecmds.c:216
+#: commands/tablecmds.c:1296 commands/tablecmds.c:4339
+#: commands/tablecmds.c:7988
 #, c-format
 msgid "\"%s\" is not a table"
-msgstr "„%s“ ist keine Tabelle"
+msgstr "»%s« ist keine Tabelle"
 
-#: catalog/objectaddress.c:1165 commands/tablecmds.c:227
-#: commands/tablecmds.c:4368 commands/tablecmds.c:11965 commands/view.c:155
+#: catalog/objectaddress.c:1165 commands/tablecmds.c:228
+#: commands/tablecmds.c:4369 commands/tablecmds.c:12123 commands/view.c:141
 #, c-format
 msgid "\"%s\" is not a view"
-msgstr "„%s“ ist keine Sicht"
+msgstr "»%s« ist keine Sicht"
 
 #: catalog/objectaddress.c:1172 commands/matview.c:174
-#: commands/tablecmds.c:233 commands/tablecmds.c:11970
+#: commands/tablecmds.c:234 commands/tablecmds.c:12128
 #, c-format
 msgid "\"%s\" is not a materialized view"
-msgstr "„%s“ ist keine materialisierte Sicht"
+msgstr "»%s« ist keine materialisierte Sicht"
 
-#: catalog/objectaddress.c:1179 commands/tablecmds.c:251
-#: commands/tablecmds.c:4371 commands/tablecmds.c:11975
+#: catalog/objectaddress.c:1179 commands/tablecmds.c:252
+#: commands/tablecmds.c:4372 commands/tablecmds.c:12133
 #, c-format
 msgid "\"%s\" is not a foreign table"
-msgstr "„%s“ ist keine Fremdtabelle"
+msgstr "»%s« ist keine Fremdtabelle"
 
 #: catalog/objectaddress.c:1324 catalog/objectaddress.c:1377
 #, c-format
@@ -3619,176 +3641,176 @@
 #: catalog/objectaddress.c:1420
 #, c-format
 msgid "default value for column \"%s\" of relation \"%s\" does not exist"
-msgstr "Vorgabewert für Spalte „%s“ von Relation „%s“ existiert nicht"
+msgstr "Vorgabewert für Spalte »%s« von Relation »%s« existiert nicht"
 
 #: catalog/objectaddress.c:1460 commands/functioncmds.c:128
-#: commands/tablecmds.c:243 commands/typecmds.c:3210 parser/parse_type.c:226
+#: commands/tablecmds.c:244 commands/typecmds.c:3210 parser/parse_type.c:226
 #: parser/parse_type.c:255 parser/parse_type.c:795 utils/adt/acl.c:4373
 #: utils/adt/regproc.c:1225
 #, c-format
 msgid "type \"%s\" does not exist"
-msgstr "Typ „%s“ existiert nicht"
+msgstr "Typ »%s« existiert nicht"
 
 #: catalog/objectaddress.c:1577
 #, c-format
 msgid "operator %d (%s, %s) of %s does not exist"
 msgstr "Operator %d (%s, %s) von %s existiert nicht"
 
-#: catalog/objectaddress.c:1606
+#: catalog/objectaddress.c:1608
 #, c-format
 msgid "function %d (%s, %s) of %s does not exist"
 msgstr "Funktion %d (%s, %s) von %s existiert nicht"
 
-#: catalog/objectaddress.c:1655 catalog/objectaddress.c:1681
+#: catalog/objectaddress.c:1659 catalog/objectaddress.c:1685
 #, c-format
 msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
-msgstr "Benutzerabbildung für Benutzer „%s“ auf Server „%s“ existiert nicht"
+msgstr "Benutzerabbildung für Benutzer »%s« auf Server »%s« existiert nicht"
 
-#: catalog/objectaddress.c:1670 commands/foreigncmds.c:430
+#: catalog/objectaddress.c:1674 commands/foreigncmds.c:430
 #: commands/foreigncmds.c:997 commands/foreigncmds.c:1359
 #: foreign/foreign.c:691
 #, c-format
 msgid "server \"%s\" does not exist"
-msgstr "Server „%s“ existiert nicht"
+msgstr "Server »%s« existiert nicht"
 
-#: catalog/objectaddress.c:1742
+#: catalog/objectaddress.c:1746
 #, c-format
 msgid "unrecognized default ACL object type %c"
 msgstr "unbekannter Standard-ACL-Objekttyp %c"
 
-#: catalog/objectaddress.c:1743
+#: catalog/objectaddress.c:1747
 #, c-format
 msgid "Valid object types are \"r\", \"S\", \"f\", and \"T\"."
-msgstr "Gültige Objekttypen sind „r“, „S“, „f“ und „T“."
+msgstr "Gültige Objekttypen sind »r«, »S«, »f« und »T«."
 
-#: catalog/objectaddress.c:1789
+#: catalog/objectaddress.c:1793
 #, c-format
 msgid "default ACL for user \"%s\" in schema \"%s\" on %s does not exist"
-msgstr "Standard-ACL für Benutzer „%s“ in Schema „%s“ für %s existiert nicht"
+msgstr "Standard-ACL für Benutzer »%s« in Schema »%s« für %s existiert nicht"
 
-#: catalog/objectaddress.c:1794
+#: catalog/objectaddress.c:1798
 #, c-format
 msgid "default ACL for user \"%s\" on %s does not exist"
-msgstr "Standard-ACL für Benutzer „%s“ für %s existiert nicht"
+msgstr "Standard-ACL für Benutzer »%s« für %s existiert nicht"
 
-#: catalog/objectaddress.c:1821 catalog/objectaddress.c:1877
-#: catalog/objectaddress.c:1932
+#: catalog/objectaddress.c:1825 catalog/objectaddress.c:1881
+#: catalog/objectaddress.c:1936
 #, c-format
 msgid "name or argument lists may not contain nulls"
 msgstr "Namens- oder Argumentlisten dürfen keine NULL-Werte enthalten"
 
-#: catalog/objectaddress.c:1853
+#: catalog/objectaddress.c:1857
 #, c-format
 msgid "unsupported object type \"%s\""
-msgstr "nicht unterstützter Objekttyp „%s“"
+msgstr "nicht unterstützter Objekttyp »%s«"
 
-#: catalog/objectaddress.c:1873 catalog/objectaddress.c:1891
+#: catalog/objectaddress.c:1877 catalog/objectaddress.c:1895
 #, c-format
 msgid "name list length must be exactly %d"
 msgstr "Länge der Namensliste muss genau %d sein"
 
-#: catalog/objectaddress.c:1895
+#: catalog/objectaddress.c:1899
 #, c-format
 msgid "large object OID may not be null"
 msgstr "Large-Object-OID darf nicht NULL sein"
 
-#: catalog/objectaddress.c:1904 catalog/objectaddress.c:1964
-#: catalog/objectaddress.c:1971
+#: catalog/objectaddress.c:1908 catalog/objectaddress.c:1968
+#: catalog/objectaddress.c:1975
 #, c-format
 msgid "name list length must be at least %d"
 msgstr "Länge der Namensliste muss mindestens %d sein"
 
-#: catalog/objectaddress.c:1957 catalog/objectaddress.c:1977
+#: catalog/objectaddress.c:1961 catalog/objectaddress.c:1981
 #, c-format
 msgid "argument list length must be exactly %d"
 msgstr "Länge der Argumentliste muss genau %d sein"
 
-#: catalog/objectaddress.c:2113 libpq/be-fsstubs.c:352
+#: catalog/objectaddress.c:2117 libpq/be-fsstubs.c:352
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "Berechtigung nur für Eigentümer des Large Object %u"
 
-#: catalog/objectaddress.c:2128 commands/functioncmds.c:1386
+#: catalog/objectaddress.c:2132 commands/functioncmds.c:1386
 #, 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:2168 catalog/objectaddress.c:2184
+#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2188
 #, c-format
 msgid "must be superuser"
 msgstr "Berechtigung nur für Superuser"
 
-#: catalog/objectaddress.c:2175
+#: catalog/objectaddress.c:2179
 #, c-format
 msgid "must have CREATEROLE privilege"
 msgstr "Berechtigung nur mit CREATEROLE-Privileg"
 
-#: catalog/objectaddress.c:2254
+#: catalog/objectaddress.c:2253
 #, c-format
 msgid "unrecognized object type \"%s\""
-msgstr "unbekannter Objekttyp „%s“"
+msgstr "unbekannter Objekttyp »%s«"
 
-#: catalog/objectaddress.c:2449
+#: catalog/objectaddress.c:2448
 #, c-format
 msgid " column %s"
 msgstr " Spalte %s"
 
-#: catalog/objectaddress.c:2455
+#: catalog/objectaddress.c:2454
 #, c-format
 msgid "function %s"
 msgstr "Funktion %s"
 
-#: catalog/objectaddress.c:2460
+#: catalog/objectaddress.c:2459
 #, c-format
 msgid "type %s"
 msgstr "Typ %s"
 
-#: catalog/objectaddress.c:2490
+#: catalog/objectaddress.c:2489
 #, c-format
 msgid "cast from %s to %s"
 msgstr "Typumwandlung von %s in %s"
 
-#: catalog/objectaddress.c:2510
+#: catalog/objectaddress.c:2509
 #, c-format
 msgid "collation %s"
 msgstr "Sortierfolge %s"
 
-#: catalog/objectaddress.c:2534
+#: catalog/objectaddress.c:2533
 #, c-format
 msgid "constraint %s on %s"
 msgstr "Constraint %s für %s"
 
-#: catalog/objectaddress.c:2540
+#: catalog/objectaddress.c:2539
 #, c-format
 msgid "constraint %s"
 msgstr "Constraint %s"
 
-#: catalog/objectaddress.c:2557
+#: catalog/objectaddress.c:2556
 #, c-format
 msgid "conversion %s"
 msgstr "Konversion %s"
 
-#: catalog/objectaddress.c:2594
+#: catalog/objectaddress.c:2593
 #, c-format
 msgid "default for %s"
 msgstr "Vorgabewert für %s"
 
-#: catalog/objectaddress.c:2603
+#: catalog/objectaddress.c:2602
 #, c-format
 msgid "language %s"
 msgstr "Sprache %s"
 
-#: catalog/objectaddress.c:2608
+#: catalog/objectaddress.c:2607
 #, c-format
 msgid "large object %u"
 msgstr "Large Object %u"
 
-#: catalog/objectaddress.c:2613
+#: catalog/objectaddress.c:2612
 #, c-format
 msgid "operator %s"
 msgstr "Operator %s"
 
-#: catalog/objectaddress.c:2645
+#: catalog/objectaddress.c:2644
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "Operatorklasse %s für Zugriffsmethode %s"
@@ -3797,7 +3819,7 @@
 #. 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/objectaddress.c:2695
+#: catalog/objectaddress.c:2694
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "Operator %d (%s, %s) von %s: %s"
@@ -3806,172 +3828,172 @@
 #. 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/objectaddress.c:2745
+#: catalog/objectaddress.c:2744
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "Funktion %d (%s, %s) von %s: %s"
 
-#: catalog/objectaddress.c:2785
+#: catalog/objectaddress.c:2784
 #, c-format
 msgid "rule %s on "
 msgstr "Regel %s für "
 
-#: catalog/objectaddress.c:2807
+#: catalog/objectaddress.c:2806
 #, c-format
 msgid "transform for %s language %s"
 msgstr "Transformation %s für Sprache %s"
 
-#: catalog/objectaddress.c:2841
+#: catalog/objectaddress.c:2840
 #, c-format
 msgid "trigger %s on "
 msgstr "Trigger %s für "
 
-#: catalog/objectaddress.c:2858
+#: catalog/objectaddress.c:2857
 #, c-format
 msgid "schema %s"
 msgstr "Schema %s"
 
-#: catalog/objectaddress.c:2871
+#: catalog/objectaddress.c:2870
 #, c-format
 msgid "text search parser %s"
 msgstr "Textsucheparser %s"
 
-#: catalog/objectaddress.c:2886
+#: catalog/objectaddress.c:2885
 #, c-format
 msgid "text search dictionary %s"
 msgstr "Textsuchewörterbuch %s"
 
-#: catalog/objectaddress.c:2901
+#: catalog/objectaddress.c:2900
 #, c-format
 msgid "text search template %s"
 msgstr "Textsuchevorlage %s"
 
-#: catalog/objectaddress.c:2916
+#: catalog/objectaddress.c:2915
 #, c-format
 msgid "text search configuration %s"
 msgstr "Textsuchekonfiguration %s"
 
-#: catalog/objectaddress.c:2924
+#: catalog/objectaddress.c:2923
 #, c-format
 msgid "role %s"
 msgstr "Rolle %s"
 
-#: catalog/objectaddress.c:2937
+#: catalog/objectaddress.c:2936
 #, c-format
 msgid "database %s"
 msgstr "Datenbank %s"
 
-#: catalog/objectaddress.c:2949
+#: catalog/objectaddress.c:2948
 #, c-format
 msgid "tablespace %s"
 msgstr "Tablespace %s"
 
-#: catalog/objectaddress.c:2958
+#: catalog/objectaddress.c:2957
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "Fremddaten-Wrapper %s"
 
-#: catalog/objectaddress.c:2967
+#: catalog/objectaddress.c:2966
 #, c-format
 msgid "server %s"
 msgstr "Server %s"
 
-#: catalog/objectaddress.c:2995
+#: catalog/objectaddress.c:2994
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "Benutzerabbildung für %s auf Server %s"
 
-#: catalog/objectaddress.c:3030
+#: catalog/objectaddress.c:3029
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Relationen von Rolle %s"
 
-#: catalog/objectaddress.c:3035
+#: catalog/objectaddress.c:3034
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Sequenzen von Rolle %s"
 
-#: catalog/objectaddress.c:3040
+#: catalog/objectaddress.c:3039
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Funktionen von Rolle %s"
 
-#: catalog/objectaddress.c:3045
+#: catalog/objectaddress.c:3044
 #, c-format
 msgid "default privileges on new types belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Typen von Rolle %s"
 
-#: catalog/objectaddress.c:3051
+#: catalog/objectaddress.c:3050
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "Vorgabeprivilegien von Rolle %s"
 
-#: catalog/objectaddress.c:3059
+#: catalog/objectaddress.c:3058
 #, c-format
 msgid " in schema %s"
 msgstr " in Schema %s"
 
-#: catalog/objectaddress.c:3076
+#: catalog/objectaddress.c:3075
 #, c-format
 msgid "extension %s"
 msgstr "Erweiterung %s"
 
-#: catalog/objectaddress.c:3089
+#: catalog/objectaddress.c:3088
 #, c-format
 msgid "event trigger %s"
 msgstr "Ereignistrigger %s"
 
-#: catalog/objectaddress.c:3121
+#: catalog/objectaddress.c:3120
 #, c-format
 msgid "policy %s on "
 msgstr "Policy %s für "
 
-#: catalog/objectaddress.c:3184
+#: catalog/objectaddress.c:3183
 #, c-format
 msgid "table %s"
 msgstr "Tabelle %s"
 
-#: catalog/objectaddress.c:3188
+#: catalog/objectaddress.c:3187
 #, c-format
 msgid "index %s"
 msgstr "Index %s"
 
-#: catalog/objectaddress.c:3192
+#: catalog/objectaddress.c:3191
 #, c-format
 msgid "sequence %s"
 msgstr "Sequenz %s"
 
-#: catalog/objectaddress.c:3196
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "toast table %s"
 msgstr "TOAST-Tabelle %s"
 
-#: catalog/objectaddress.c:3200
+#: catalog/objectaddress.c:3199
 #, c-format
 msgid "view %s"
 msgstr "Sicht %s"
 
-#: catalog/objectaddress.c:3204
+#: catalog/objectaddress.c:3203
 #, c-format
 msgid "materialized view %s"
 msgstr "materialisierte Sicht %s"
 
-#: catalog/objectaddress.c:3208
+#: catalog/objectaddress.c:3207
 #, c-format
 msgid "composite type %s"
 msgstr "zusammengesetzter Typ %s"
 
-#: catalog/objectaddress.c:3212
+#: catalog/objectaddress.c:3211
 #, c-format
 msgid "foreign table %s"
 msgstr "Fremdtabelle %s"
 
-#: catalog/objectaddress.c:3217
+#: catalog/objectaddress.c:3216
 #, c-format
 msgid "relation %s"
 msgstr "Relation %s"
 
-#: catalog/objectaddress.c:3254
+#: catalog/objectaddress.c:3253
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "Operatorfamilie %s für Zugriffsmethode %s"
@@ -4018,7 +4040,7 @@
 msgid "return type of inverse transition function %s is not %s"
 msgstr "Rückgabetyp der inversen Übergangsfunktion %s ist nicht %s"
 
-#: catalog/pg_aggregate.c:344 executor/nodeWindowAgg.c:2302
+#: catalog/pg_aggregate.c:344 executor/nodeWindowAgg.c:2335
 #, c-format
 msgid "strictness of aggregate's forward and inverse transition functions must match"
 msgstr "Striktheit der vorwärtigen und inversen Übergangsfunktionen einer Aggregatfunktion müssen übereinstimmen"
@@ -4041,12 +4063,12 @@
 #: catalog/pg_aggregate.c:423 catalog/pg_proc.c:258
 #, c-format
 msgid "unsafe use of pseudo-type \"internal\""
-msgstr "unsichere Verwendung des Pseudotyps „internal“"
+msgstr "unsichere Verwendung des Pseudotyps »internal«"
 
 #: catalog/pg_aggregate.c:424 catalog/pg_proc.c:259
 #, c-format
 msgid "A function returning \"internal\" must have at least one \"internal\" argument."
-msgstr "Eine Funktion, die „internal“ zurückgibt, muss mindestens ein Argument vom Typ „internal“ haben."
+msgstr "Eine Funktion, die »internal« zurückgibt, muss mindestens ein Argument vom Typ »internal« haben."
 
 #: catalog/pg_aggregate.c:477
 #, c-format
@@ -4086,52 +4108,52 @@
 #: catalog/pg_collation.c:77
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" already exists"
-msgstr "Sortierfolge „%s“ für Kodierung „%s“ existiert bereits"
+msgstr "Sortierfolge »%s« für Kodierung »%s« existiert bereits"
 
 #: catalog/pg_collation.c:91
 #, c-format
 msgid "collation \"%s\" already exists"
-msgstr "Sortierfolge „%s“ existiert bereits"
+msgstr "Sortierfolge »%s« existiert bereits"
 
 #: catalog/pg_constraint.c:661
 #, c-format
 msgid "constraint \"%s\" for domain %s already exists"
-msgstr "Constraint „%s“ für Domäne %s existiert bereits"
+msgstr "Constraint »%s« für Domäne %s existiert bereits"
 
 #: catalog/pg_constraint.c:794
 #, c-format
 msgid "table \"%s\" has multiple constraints named \"%s\""
-msgstr "Tabelle „%s“ hat mehrere Constraints namens „%s“"
+msgstr "Tabelle »%s« hat mehrere Constraints namens »%s«"
 
 #: catalog/pg_constraint.c:806
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
-msgstr "Constraint „%s“ für Tabelle „%s“ existiert nicht"
+msgstr "Constraint »%s« für Tabelle »%s« existiert nicht"
 
 #: catalog/pg_constraint.c:852
 #, c-format
 msgid "domain \"%s\" has multiple constraints named \"%s\""
-msgstr "Domäne „%s“ hat mehrere Constraints namens „%s“"
+msgstr "Domäne »%s« hat mehrere Constraints namens »%s«"
 
 #: catalog/pg_constraint.c:864
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" does not exist"
-msgstr "Constraint „%s“ für Domäne „%s“ existiert nicht"
+msgstr "Constraint »%s« für Domäne »%s« existiert nicht"
 
 #: catalog/pg_conversion.c:66
 #, c-format
 msgid "conversion \"%s\" already exists"
-msgstr "Konversion „%s“ existiert bereits"
+msgstr "Konversion »%s« existiert bereits"
 
 #: catalog/pg_conversion.c:79
 #, c-format
 msgid "default conversion for %s to %s already exists"
 msgstr "Standardumwandlung von %s nach %s existiert bereits"
 
-#: catalog/pg_depend.c:165 commands/extension.c:2945
+#: catalog/pg_depend.c:165 commands/extension.c:2948
 #, c-format
 msgid "%s is already a member of extension \"%s\""
-msgstr "%s ist schon Mitglied der Erweiterung „%s“"
+msgstr "%s ist schon Mitglied der Erweiterung »%s«"
 
 #: catalog/pg_depend.c:324
 #, c-format
@@ -4141,7 +4163,7 @@
 #: catalog/pg_enum.c:115 catalog/pg_enum.c:202
 #, c-format
 msgid "invalid enum label \"%s\""
-msgstr "ungültiges Enum-Label „%s“"
+msgstr "ungültiges Enum-Label »%s«"
 
 #: catalog/pg_enum.c:116 catalog/pg_enum.c:203
 #, c-format
@@ -4151,17 +4173,17 @@
 #: catalog/pg_enum.c:231
 #, c-format
 msgid "enum label \"%s\" already exists, skipping"
-msgstr "Enum-Label „%s“ existiert bereits, wird übersprungen"
+msgstr "Enum-Label »%s« existiert bereits, wird übersprungen"
 
 #: catalog/pg_enum.c:238
 #, c-format
 msgid "enum label \"%s\" already exists"
-msgstr "Enum-Label „%s“ existiert bereits"
+msgstr "Enum-Label »%s« existiert bereits"
 
 #: catalog/pg_enum.c:293
 #, c-format
 msgid "\"%s\" is not an existing enum label"
-msgstr "„%s“ ist kein existierendes Enum-Label"
+msgstr "»%s« ist kein existierendes Enum-Label"
 
 #: catalog/pg_enum.c:349
 #, c-format
@@ -4176,12 +4198,12 @@
 #: catalog/pg_namespace.c:61 commands/schemacmds.c:246
 #, c-format
 msgid "schema \"%s\" already exists"
-msgstr "Schema „%s“ existiert bereits"
+msgstr "Schema »%s« existiert bereits"
 
 #: catalog/pg_operator.c:223 catalog/pg_operator.c:364
 #, c-format
 msgid "\"%s\" is not a valid operator name"
-msgstr "„%s“ ist kein gültiger Operatorname"
+msgstr "»%s« ist kein gültiger Operatorname"
 
 #: catalog/pg_operator.c:373
 #, c-format
@@ -4253,17 +4275,17 @@
 #: catalog/pg_proc.c:253
 #, c-format
 msgid "A function returning \"anyrange\" must have at least one \"anyrange\" argument."
-msgstr "Eine Funktion, die „anyrange“ zurückgibt, muss mindestens ein Argument vom Typ „anyrange“ haben."
+msgstr "Eine Funktion, die »anyrange« zurückgibt, muss mindestens ein Argument vom Typ »anyrange« haben."
 
 #: catalog/pg_proc.c:271
 #, c-format
 msgid "\"%s\" is already an attribute of type %s"
-msgstr "„%s“ ist schon ein Attribut von Typ %s"
+msgstr "»%s« ist schon ein Attribut von Typ %s"
 
 #: catalog/pg_proc.c:401
 #, c-format
 msgid "function \"%s\" already exists with same argument types"
-msgstr "Funktion „%s“ existiert bereits mit den selben Argumenttypen"
+msgstr "Funktion »%s« existiert bereits mit den selben Argumenttypen"
 
 #: catalog/pg_proc.c:415 catalog/pg_proc.c:438
 #, c-format
@@ -4284,7 +4306,7 @@
 #: catalog/pg_proc.c:481
 #, c-format
 msgid "cannot change name of input parameter \"%s\""
-msgstr "kann Name des Eingabeparameters „%s“ nicht ändern"
+msgstr "kann Name des Eingabeparameters »%s« nicht ändern"
 
 #: catalog/pg_proc.c:506
 #, c-format
@@ -4299,12 +4321,12 @@
 #: catalog/pg_proc.c:546
 #, c-format
 msgid "function \"%s\" is an aggregate function"
-msgstr "Funktion „%s“ ist eine Aggregatfunktion"
+msgstr "Funktion »%s« ist eine Aggregatfunktion"
 
 #: catalog/pg_proc.c:551
 #, c-format
 msgid "function \"%s\" is not an aggregate function"
-msgstr "Funktion „%s“ ist keine Aggregatfunktion"
+msgstr "Funktion »%s« ist keine Aggregatfunktion"
 
 #: catalog/pg_proc.c:559
 #, c-format
@@ -4314,7 +4336,7 @@
 #: catalog/pg_proc.c:564
 #, c-format
 msgid "function \"%s\" is not a window function"
-msgstr "Funktion „%s“ ist keine Fensterfunktion"
+msgstr "Funktion »%s« ist keine Fensterfunktion"
 
 #: catalog/pg_proc.c:772
 #, c-format
@@ -4324,17 +4346,17 @@
 #: catalog/pg_proc.c:870
 #, c-format
 msgid "SQL functions cannot return type %s"
-msgstr "SQL-Funktionen können keinen Rückgabetyp „%s“ haben"
+msgstr "SQL-Funktionen können keinen Rückgabetyp »%s« haben"
 
 #: catalog/pg_proc.c:885
 #, c-format
 msgid "SQL functions cannot have arguments of type %s"
-msgstr "SQL-Funktionen können keine Argumente vom Typ „%s“ haben"
+msgstr "SQL-Funktionen können keine Argumente vom Typ »%s« haben"
 
-#: catalog/pg_proc.c:971 executor/functions.c:1421
+#: catalog/pg_proc.c:971 executor/functions.c:1430
 #, c-format
 msgid "SQL function \"%s\""
-msgstr "SQL-Funktion „%s“"
+msgstr "SQL-Funktion »%s«"
 
 #: catalog/pg_shdepend.c:694
 #, c-format
@@ -4413,7 +4435,7 @@
 #: catalog/pg_type.c:294
 #, c-format
 msgid "alignment \"%c\" is invalid for passed-by-value type of size %d"
-msgstr "Ausrichtung „%c“ ist ungültig für Typen mit Wertübergabe mit Größe %d"
+msgstr "Ausrichtung »%c« ist ungültig für Typen mit Wertübergabe mit Größe %d"
 
 #: catalog/pg_type.c:301
 #, c-format
@@ -4423,7 +4445,7 @@
 #: catalog/pg_type.c:310 catalog/pg_type.c:316
 #, c-format
 msgid "alignment \"%c\" is invalid for variable-length type"
-msgstr "Ausrichtung „%c“ ist ungültig für Typen variabler Länge"
+msgstr "Ausrichtung »%c« ist ungültig für Typen variabler Länge"
 
 #: catalog/pg_type.c:324
 #, c-format
@@ -4433,13 +4455,13 @@
 #: catalog/pg_type.c:789
 #, c-format
 msgid "could not form array type name for type \"%s\""
-msgstr "konnte keinen Arraytypnamen für Datentyp „%s“ erzeugen"
+msgstr "konnte keinen Arraytypnamen für Datentyp »%s« erzeugen"
 
-#: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4350
-#: commands/tablecmds.c:11853
+#: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4351
+#: commands/tablecmds.c:12011
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
-msgstr "„%s“ ist keine Tabelle oder materialisierte Sicht"
+msgstr "»%s« ist keine Tabelle oder materialisierte Sicht"
 
 #: catalog/toasting.c:157
 #, c-format
@@ -4454,52 +4476,52 @@
 #: commands/aggregatecmds.c:171
 #, c-format
 msgid "aggregate attribute \"%s\" not recognized"
-msgstr "Attribut „%s“ für Aggregatfunktion unbekannt"
+msgstr "Attribut »%s« für Aggregatfunktion unbekannt"
 
 #: commands/aggregatecmds.c:181
 #, c-format
 msgid "aggregate stype must be specified"
-msgstr "„stype“ für Aggregatfunktion muss angegeben werden"
+msgstr "»stype« für Aggregatfunktion muss angegeben werden"
 
 #: commands/aggregatecmds.c:185
 #, c-format
 msgid "aggregate sfunc must be specified"
-msgstr "„sfunc“ für Aggregatfunktion muss angegeben werden"
+msgstr "»sfunc« für Aggregatfunktion muss angegeben werden"
 
 #: commands/aggregatecmds.c:197
 #, c-format
 msgid "aggregate msfunc must be specified when mstype is specified"
-msgstr "„msfunc“ für Aggregatfunktion muss angegeben werden, wenn „mstype“ angegeben ist"
+msgstr "»msfunc« für Aggregatfunktion muss angegeben werden, wenn »mstype« angegeben ist"
 
 #: commands/aggregatecmds.c:201
 #, c-format
 msgid "aggregate minvfunc must be specified when mstype is specified"
-msgstr "„minvfunc“ für Aggregatfunktion muss angegeben werden, wenn „mstype“ angegeben ist"
+msgstr "»minvfunc« für Aggregatfunktion muss angegeben werden, wenn »mstype« angegeben ist"
 
 #: commands/aggregatecmds.c:208
 #, c-format
 msgid "aggregate msfunc must not be specified without mstype"
-msgstr "„msfunc“ für Aggregatfunktion darf nicht angegeben werden, wenn „mstype“ nicht angegeben ist"
+msgstr "»msfunc« für Aggregatfunktion darf nicht angegeben werden, wenn »mstype« nicht angegeben ist"
 
 #: commands/aggregatecmds.c:212
 #, c-format
 msgid "aggregate minvfunc must not be specified without mstype"
-msgstr "„minvfunc“ für Aggregatfunktion darf nicht angegeben werden, wenn „mstype“ nicht angegeben ist"
+msgstr "»minvfunc« für Aggregatfunktion darf nicht angegeben werden, wenn »mstype« nicht angegeben ist"
 
 #: commands/aggregatecmds.c:216
 #, c-format
 msgid "aggregate mfinalfunc must not be specified without mstype"
-msgstr "„mfinalfunc“ für Aggregatfunktion darf nicht angegeben werden, wenn „mstype“ nicht angegeben ist"
+msgstr "»mfinalfunc« für Aggregatfunktion darf nicht angegeben werden, wenn »mstype« nicht angegeben ist"
 
 #: commands/aggregatecmds.c:220
 #, c-format
 msgid "aggregate msspace must not be specified without mstype"
-msgstr "„msspace“ für Aggregatfunktion darf nicht angegeben werden, wenn „mstype“ nicht angegeben ist"
+msgstr "»msspace« für Aggregatfunktion darf nicht angegeben werden, wenn »mstype« nicht angegeben ist"
 
 #: commands/aggregatecmds.c:224
 #, c-format
 msgid "aggregate minitcond must not be specified without mstype"
-msgstr "„minitcond“ für Aggregatfunktion darf nicht angegeben werden, wenn „mstype“ nicht angegeben ist"
+msgstr "»minitcond« für Aggregatfunktion darf nicht angegeben werden, wenn »mstype« nicht angegeben ist"
 
 #: commands/aggregatecmds.c:244
 #, c-format
@@ -4509,7 +4531,7 @@
 #: commands/aggregatecmds.c:274
 #, c-format
 msgid "basetype is redundant with aggregate input type specification"
-msgstr "Angabe „basetype“ ist überflüssig bei Angabe des Eingabetyps der Aggregatfunktion"
+msgstr "Angabe »basetype« ist überflüssig bei Angabe des Eingabetyps der Aggregatfunktion"
 
 #: commands/aggregatecmds.c:315 commands/aggregatecmds.c:335
 #, c-format
@@ -4519,47 +4541,47 @@
 #: commands/alter.c:80 commands/event_trigger.c:230
 #, c-format
 msgid "event trigger \"%s\" already exists"
-msgstr "Ereignistrigger „%s“ existiert bereits"
+msgstr "Ereignistrigger »%s« existiert bereits"
 
 #: commands/alter.c:83 commands/foreigncmds.c:597
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
-msgstr "Fremddaten-Wrapper „%s“ existiert bereits"
+msgstr "Fremddaten-Wrapper »%s« existiert bereits"
 
 #: commands/alter.c:86 commands/foreigncmds.c:890
 #, c-format
 msgid "server \"%s\" already exists"
-msgstr "Server „%s“ existiert bereits"
+msgstr "Server »%s« existiert bereits"
 
 #: commands/alter.c:89 commands/proclang.c:363
 #, c-format
 msgid "language \"%s\" already exists"
-msgstr "Sprache „%s“ existiert bereits"
+msgstr "Sprache »%s« existiert bereits"
 
 #: commands/alter.c:112
 #, c-format
 msgid "conversion \"%s\" already exists in schema \"%s\""
-msgstr "Konversion „%s“ existiert bereits in Schema „%s“"
+msgstr "Konversion »%s« existiert bereits in Schema »%s«"
 
 #: commands/alter.c:116
 #, c-format
 msgid "text search parser \"%s\" already exists in schema \"%s\""
-msgstr "Textsucheparser „%s“ existiert bereits in Schema „%s“"
+msgstr "Textsucheparser »%s« existiert bereits in Schema »%s«"
 
 #: commands/alter.c:120
 #, c-format
 msgid "text search dictionary \"%s\" already exists in schema \"%s\""
-msgstr "Textsuchewörterbuch „%s“ existiert bereits in Schema „%s“"
+msgstr "Textsuchewörterbuch »%s« existiert bereits in Schema »%s«"
 
 #: commands/alter.c:124
 #, c-format
 msgid "text search template \"%s\" already exists in schema \"%s\""
-msgstr "Textsuchevorlage „%s“ existiert bereits in Schema „%s“"
+msgstr "Textsuchevorlage »%s« existiert bereits in Schema »%s«"
 
 #: commands/alter.c:128
 #, c-format
 msgid "text search configuration \"%s\" already exists in schema \"%s\""
-msgstr "Textsuchekonfiguration „%s“ existiert bereits in Schema „%s“"
+msgstr "Textsuchekonfiguration »%s« existiert bereits in Schema »%s«"
 
 #: commands/alter.c:202
 #, c-format
@@ -4574,64 +4596,64 @@
 #: commands/analyze.c:145
 #, c-format
 msgid "skipping analyze of \"%s\" --- lock not available"
-msgstr "überspringe Analyze von „%s“ --- Sperre nicht verfügbar"
+msgstr "überspringe Analyze von »%s« --- Sperre nicht verfügbar"
 
 #: commands/analyze.c:162
 #, c-format
 msgid "skipping \"%s\" --- only superuser can analyze it"
-msgstr "überspringe „%s“ --- nur Superuser kann sie analysieren"
+msgstr "überspringe »%s« --- nur Superuser kann sie analysieren"
 
 #: commands/analyze.c:166
 #, 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"
+msgstr "überspringe »%s« --- nur Superuser oder Eigentümer der Datenbank kann sie analysieren"
 
 #: commands/analyze.c:170
 #, 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"
+msgstr "überspringe »%s« --- nur Eigentümer der Tabelle oder der Datenbank kann sie analysieren"
 
 #: commands/analyze.c:230
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze this foreign table"
-msgstr "überspringe „%s“ --- kann diese Fremdtabelle nicht analysieren"
+msgstr "überspringe »%s« --- kann diese Fremdtabelle nicht analysieren"
 
 #: commands/analyze.c:241
 #, 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:320
 #, c-format
 msgid "analyzing \"%s.%s\" inheritance tree"
-msgstr "analysiere Vererbungsbaum von „%s.%s“"
+msgstr "analysiere Vererbungsbaum von »%s.%s«"
 
 #: commands/analyze.c:325
 #, c-format
 msgid "analyzing \"%s.%s\""
-msgstr "analysiere „%s.%s“"
+msgstr "analysiere »%s.%s«"
 
-#: commands/analyze.c:645
+#: commands/analyze.c:648
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
-msgstr "automatisches Analysieren von Tabelle „%s.%s.%s“ Systembenutzung: %s"
+msgstr "automatisches Analysieren von Tabelle »%s.%s.%s« Systembenutzung: %s"
 
-#: commands/analyze.c:1201
+#: commands/analyze.c:1204
 #, 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“: %d von %u Seiten gelesen, enthalten %.0f lebende Zeilen und %.0f tote Zeilen; %d Zeilen in Stichprobe, schätzungsweise %.0f Zeilen insgesamt"
+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:1280
+#: commands/analyze.c:1283
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no child tables"
-msgstr "überspringe Analysieren des Vererbungsbaums „%s.%s“ --- dieser Vererbungsbaum enthält keine abgeleiteten Tabellen"
+msgstr "überspringe Analysieren des Vererbungsbaums »%s.%s« --- dieser Vererbungsbaum enthält keine abgeleiteten Tabellen"
 
-#: commands/analyze.c:1369
+#: commands/analyze.c:1372
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no analyzable child tables"
-msgstr "überspringe Analysieren des Vererbungsbaums „%s.%s“ --- dieser Vererbungsbaum enthält keine analysierbaren abgeleiteten Tabellen"
+msgstr "überspringe Analysieren des Vererbungsbaums »%s.%s« --- dieser Vererbungsbaum enthält keine analysierbaren abgeleiteten Tabellen"
 
-#: commands/analyze.c:1417 executor/execQual.c:2900
+#: commands/analyze.c:1420 commands/tablecmds.c:8050 executor/execQual.c:2900
 msgid "could not convert row type"
 msgstr "konnte Zeilentyp nicht umwandeln"
 
@@ -4683,12 +4705,12 @@
 #: commands/cluster.c:157
 #, c-format
 msgid "there is no previously clustered index for table \"%s\""
-msgstr "es gibt keinen bereits geclusterten Index für Tabelle „%s“"
+msgstr "es gibt keinen bereits geclusterten Index für Tabelle »%s«"
 
-#: commands/cluster.c:171 commands/tablecmds.c:9256 commands/tablecmds.c:10972
+#: commands/cluster.c:171 commands/tablecmds.c:9354 commands/tablecmds.c:11114
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
-msgstr "Index „%s“ für Tabelle „%s“ existiert nicht"
+msgstr "Index »%s« für Tabelle »%s« existiert nicht"
 
 #: commands/cluster.c:353
 #, c-format
@@ -4700,47 +4722,47 @@
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "temporäre Tabellen anderer Sitzungen können nicht gevacuumt werden"
 
-#: commands/cluster.c:431 commands/tablecmds.c:10982
+#: commands/cluster.c:431 commands/tablecmds.c:11124
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
-msgstr "„%s“ ist kein Index für Tabelle „%s“"
+msgstr "»%s« ist kein Index für Tabelle »%s«"
 
 #: commands/cluster.c:439
 #, c-format
 msgid "cannot cluster on index \"%s\" because access method does not support clustering"
-msgstr "kann nicht anhand des Index „%s“ clustern, weil die Indexmethode Clustern nicht unterstützt"
+msgstr "kann nicht anhand des Index »%s« clustern, weil die Indexmethode Clustern nicht unterstützt"
 
 #: commands/cluster.c:451
 #, c-format
 msgid "cannot cluster on partial index \"%s\""
-msgstr "kann nicht anhand des partiellen Index „%s“ clustern"
+msgstr "kann nicht anhand des partiellen Index »%s« clustern"
 
 #: commands/cluster.c:465
 #, c-format
 msgid "cannot cluster on invalid index \"%s\""
-msgstr "kann nicht anhand des ungültigen Index „%s“ clustern"
+msgstr "kann nicht anhand des ungültigen Index »%s« clustern"
 
-#: commands/cluster.c:918
+#: commands/cluster.c:920
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
-msgstr "clustere „%s.%s“ durch Index-Scan von „%s“"
+msgstr "clustere »%s.%s« durch Index-Scan von »%s«"
 
-#: commands/cluster.c:924
+#: commands/cluster.c:926
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
-msgstr "clustere „%s.%s“ durch sequenziellen Scan und Sortieren"
+msgstr "clustere »%s.%s« durch sequenziellen Scan und Sortieren"
 
-#: commands/cluster.c:929 commands/vacuumlazy.c:464
+#: commands/cluster.c:931 commands/vacuumlazy.c:469
 #, c-format
 msgid "vacuuming \"%s.%s\""
-msgstr "vacuume „%s.%s“"
+msgstr "vacuume »%s.%s«"
 
-#: commands/cluster.c:1088
+#: commands/cluster.c:1090
 #, c-format
 msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
-msgstr "„%s“: %.0f entfernbare, %.0f nicht entfernbare Zeilenversionen in %u Seiten gefunden"
+msgstr "»%s«: %.0f entfernbare, %.0f nicht entfernbare Zeilenversionen in %u Seiten gefunden"
 
-#: commands/cluster.c:1092
+#: commands/cluster.c:1094
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -4752,27 +4774,27 @@
 #: commands/collationcmds.c:80
 #, c-format
 msgid "collation attribute \"%s\" not recognized"
-msgstr "Attribut „%s“ für Sortierfolge unbekannt"
+msgstr "Attribut »%s« für Sortierfolge unbekannt"
 
 #: commands/collationcmds.c:125
 #, c-format
 msgid "parameter \"lc_collate\" must be specified"
-msgstr "Parameter „lc_collate“ muss angegeben werden"
+msgstr "Parameter »lc_collate« muss angegeben werden"
 
 #: commands/collationcmds.c:130
 #, c-format
 msgid "parameter \"lc_ctype\" must be specified"
-msgstr "Parameter „lc_ctype“ muss angegeben werden"
+msgstr "Parameter »lc_ctype« muss angegeben werden"
 
 #: commands/collationcmds.c:166
 #, 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“"
+msgstr "Sortierfolge »%s« für Kodierung »%s« existiert bereits in Schema »%s«"
 
 #: commands/collationcmds.c:177
 #, c-format
 msgid "collation \"%s\" already exists in schema \"%s\""
-msgstr "Sortierfolge „%s“ existiert bereits in Schema „%s“"
+msgstr "Sortierfolge »%s« existiert bereits in Schema »%s«"
 
 #: commands/comment.c:62 commands/dbcommands.c:797 commands/dbcommands.c:962
 #: commands/dbcommands.c:1067 commands/dbcommands.c:1257
@@ -4781,42 +4803,42 @@
 #: utils/init/postinit.c:928 utils/init/postinit.c:945
 #, c-format
 msgid "database \"%s\" does not exist"
-msgstr "Datenbank „%s“ existiert nicht"
+msgstr "Datenbank »%s« existiert nicht"
 
 #: commands/comment.c:101 commands/seclabel.c:116 parser/parse_utilcmd.c:727
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, composite type, or foreign table"
-msgstr "„%s“ ist weder Tabelle, Sicht, materialisierte Sicht, zusammengesetzter Typ noch Fremdtabelle"
+msgstr "»%s« ist weder Tabelle, Sicht, materialisierte Sicht, zusammengesetzter Typ noch Fremdtabelle"
 
-#: commands/constraint.c:60 utils/adt/ri_triggers.c:2717
+#: commands/constraint.c:60 utils/adt/ri_triggers.c:2715
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
-msgstr "Funktion „%s“ wurde nicht von Triggermanager aufgerufen"
+msgstr "Funktion »%s« wurde nicht von Triggermanager aufgerufen"
 
-#: commands/constraint.c:67 utils/adt/ri_triggers.c:2726
+#: commands/constraint.c:67 utils/adt/ri_triggers.c:2724
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
-msgstr "Funktion „%s“ muss AFTER ROW ausgelöst werden"
+msgstr "Funktion »%s« muss AFTER ROW ausgelöst werden"
 
 #: commands/constraint.c:81
 #, c-format
 msgid "function \"%s\" must be fired for INSERT or UPDATE"
-msgstr "Funktion „%s“ muss von INSERT oder UPDATE ausgelöst werden"
+msgstr "Funktion »%s« muss von INSERT oder UPDATE ausgelöst werden"
 
 #: commands/conversioncmds.c:67
 #, c-format
 msgid "source encoding \"%s\" does not exist"
-msgstr "Quellkodierung „%s“ existiert nicht"
+msgstr "Quellkodierung »%s« existiert nicht"
 
 #: commands/conversioncmds.c:74
 #, c-format
 msgid "destination encoding \"%s\" does not exist"
-msgstr "Zielkodierung „%s“ existiert nicht"
+msgstr "Zielkodierung »%s« existiert nicht"
 
 #: commands/conversioncmds.c:88
 #, c-format
 msgid "encoding conversion function %s must return type \"void\""
-msgstr "Kodierungskonversionsfunktion %s muss Typ „void“ zurückgeben"
+msgstr "Kodierungskonversionsfunktion %s muss Typ »void« zurückgeben"
 
 #: commands/copy.c:365 commands/copy.c:377 commands/copy.c:411
 #: commands/copy.c:423
@@ -4875,446 +4897,446 @@
 msgid "must be superuser to COPY to or from a file"
 msgstr "nur Superuser können COPY mit Dateien verwenden"
 
-#: commands/copy.c:880
+#: commands/copy.c:881
 #, c-format
 msgid "COPY FROM not supported with row-level security"
 msgstr "COPY FROM wird nicht unterstützt mit Sicherheit auf Zeilenebene"
 
-#: commands/copy.c:881
+#: commands/copy.c:882
 #, c-format
 msgid "Use INSERT statements instead."
 msgstr "Verwenden Sie stattdessen INSERT-Anweisungen."
 
-#: commands/copy.c:1021
+#: commands/copy.c:1061
 #, c-format
 msgid "COPY format \"%s\" not recognized"
-msgstr "COPY-Format „%s“ nicht erkannt"
+msgstr "COPY-Format »%s« nicht erkannt"
 
-#: commands/copy.c:1092 commands/copy.c:1106 commands/copy.c:1120
-#: commands/copy.c:1140
+#: commands/copy.c:1132 commands/copy.c:1146 commands/copy.c:1160
+#: commands/copy.c:1180
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
-msgstr "Argument von Option „%s“ muss eine Liste aus Spaltennamen sein"
+msgstr "Argument von Option »%s« muss eine Liste aus Spaltennamen sein"
 
-#: commands/copy.c:1153
+#: commands/copy.c:1193
 #, c-format
 msgid "argument to option \"%s\" must be a valid encoding name"
-msgstr "Argument von Option „%s“ muss ein gültiger Kodierungsname sein"
+msgstr "Argument von Option »%s« muss ein gültiger Kodierungsname sein"
 
-#: commands/copy.c:1159 commands/dbcommands.c:232 commands/dbcommands.c:1427
+#: commands/copy.c:1199 commands/dbcommands.c:232 commands/dbcommands.c:1427
 #, c-format
 msgid "option \"%s\" not recognized"
-msgstr "Option „%s“ nicht erkannt"
+msgstr "Option »%s« nicht erkannt"
 
-#: commands/copy.c:1170
+#: commands/copy.c:1210
 #, c-format
 msgid "cannot specify DELIMITER in BINARY mode"
 msgstr "DELIMITER kann nicht im BINARY-Modus angegeben werden"
 
-#: commands/copy.c:1175
+#: commands/copy.c:1215
 #, c-format
 msgid "cannot specify NULL in BINARY mode"
 msgstr "NULL kann nicht im BINARY-Modus angegeben werden"
 
-#: commands/copy.c:1197
+#: commands/copy.c:1237
 #, c-format
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "DELIMITER für COPY muss ein einzelnes Ein-Byte-Zeichen sein"
 
-#: commands/copy.c:1204
+#: commands/copy.c:1244
 #, c-format
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr "COPY-Trennzeichen kann nicht Newline oder Carriage Return sein"
 
-#: commands/copy.c:1210
+#: commands/copy.c:1250
 #, c-format
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr "COPY NULL-Darstellung kann nicht Newline oder Carriage Return enthalten"
 
-#: commands/copy.c:1227
+#: commands/copy.c:1267
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
-msgstr "DELIMITER für COPY darf nicht „%s“ sein"
+msgstr "DELIMITER für COPY darf nicht »%s« sein"
 
-#: commands/copy.c:1233
+#: commands/copy.c:1273
 #, c-format
 msgid "COPY HEADER available only in CSV mode"
 msgstr "COPY HEADER ist nur im CSV-Modus verfügbar"
 
-#: commands/copy.c:1239
+#: commands/copy.c:1279
 #, c-format
 msgid "COPY quote available only in CSV mode"
 msgstr "Quote-Zeichen für COPY ist nur im CSV-Modus verfügbar"
 
-#: commands/copy.c:1244
+#: commands/copy.c:1284
 #, c-format
 msgid "COPY quote must be a single one-byte character"
 msgstr "Quote-Zeichen für COPY muss ein einzelnes Ein-Byte-Zeichen sein"
 
-#: commands/copy.c:1249
+#: commands/copy.c:1289
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "DELIMITER und QUOTE für COPY müssen verschieden sein"
 
-#: commands/copy.c:1255
+#: commands/copy.c:1295
 #, c-format
 msgid "COPY escape available only in CSV mode"
 msgstr "Escape-Zeichen für COPY ist nur im CSV-Modus verfügbar"
 
-#: commands/copy.c:1260
+#: commands/copy.c:1300
 #, c-format
 msgid "COPY escape must be a single one-byte character"
 msgstr "Escape-Zeichen für COPY muss ein einzelnes Ein-Byte-Zeichen sein"
 
-#: commands/copy.c:1266
+#: commands/copy.c:1306
 #, c-format
 msgid "COPY force quote available only in CSV mode"
 msgstr "FORCE_QUOTE für COPY ist nur im CSV-Modus verfügbar"
 
-#: commands/copy.c:1270
+#: commands/copy.c:1310
 #, c-format
 msgid "COPY force quote only available using COPY TO"
 msgstr "FORCE_QUOTE ist nur bei COPY TO verfügbar"
 
-#: commands/copy.c:1276
+#: commands/copy.c:1316
 #, c-format
 msgid "COPY force not null available only in CSV mode"
 msgstr "FORCE_NOT_NULL für COPY ist nur im CSV-Modus verfügbar"
 
-#: commands/copy.c:1280
+#: commands/copy.c:1320
 #, c-format
 msgid "COPY force not null only available using COPY FROM"
 msgstr "FORCE_NOT_NULL ist nur bei COPY FROM verfügbar"
 
-#: commands/copy.c:1286
+#: commands/copy.c:1326
 #, c-format
 msgid "COPY force null available only in CSV mode"
 msgstr "FORCE_NULL für COPY ist nur im CSV-Modus verfügbar"
 
-#: commands/copy.c:1291
+#: commands/copy.c:1331
 #, c-format
 msgid "COPY force null only available using COPY FROM"
 msgstr "FORCE_NULL ist nur bei COPY FROM verfügbar"
 
-#: commands/copy.c:1297
+#: commands/copy.c:1337
 #, c-format
 msgid "COPY delimiter must not appear in the NULL specification"
 msgstr "Trennzeichen für COPY darf nicht in der NULL-Darstellung erscheinen"
 
-#: commands/copy.c:1304
+#: commands/copy.c:1344
 #, c-format
 msgid "CSV quote character must not appear in the NULL specification"
 msgstr "CSV-Quote-Zeichen darf nicht in der NULL-Darstellung erscheinen"
 
-#: commands/copy.c:1367
+#: commands/copy.c:1407
 #, c-format
 msgid "table \"%s\" does not have OIDs"
-msgstr "Tabelle „%s“ hat keine OIDs"
+msgstr "Tabelle »%s« hat keine OIDs"
 
-#: commands/copy.c:1384
+#: commands/copy.c:1424
 #, c-format
 msgid "COPY (SELECT) WITH OIDS is not supported"
 msgstr "COPY (SELECT) WITH OIDS wird nicht unterstützt"
 
-#: commands/copy.c:1410
+#: commands/copy.c:1450
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) wird nicht unterstützt"
 
-#: commands/copy.c:1440
+#: commands/copy.c:1480
 #, c-format
 msgid "relation referenced by COPY statement has changed"
 msgstr "die von der COPY-Anweisung verwendete Relation hat sich geändert"
 
-#: commands/copy.c:1498
+#: commands/copy.c:1538
 #, c-format
 msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
-msgstr "FORCE-QUOTE-Spalte „%s“ wird von COPY nicht verwendet"
+msgstr "FORCE-QUOTE-Spalte »%s« wird von COPY nicht verwendet"
 
-#: commands/copy.c:1520
+#: commands/copy.c:1560
 #, c-format
 msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
-msgstr "Spalte „%s“ mit FORCE NOT NULL wird von COPY nicht verwendet"
+msgstr "Spalte »%s« mit FORCE NOT NULL wird von COPY nicht verwendet"
 
-#: commands/copy.c:1542
+#: commands/copy.c:1582
 #, c-format
 msgid "FORCE NULL column \"%s\" not referenced by COPY"
-msgstr "Spalte „%s“ mit FORCE NULL wird von COPY nicht verwendet"
+msgstr "Spalte »%s« mit FORCE NULL wird von COPY nicht verwendet"
 
-#: commands/copy.c:1607
+#: commands/copy.c:1647
 #, c-format
 msgid "could not close pipe to external command: %m"
 msgstr "konnte Pipe zu externem Programm nicht schließen: %m"
 
-#: commands/copy.c:1611
+#: commands/copy.c:1651
 #, c-format
 msgid "program \"%s\" failed"
-msgstr "Programm „%s“ fehlgeschlagen"
+msgstr "Programm »%s« fehlgeschlagen"
 
-#: commands/copy.c:1661
+#: commands/copy.c:1701
 #, c-format
 msgid "cannot copy from view \"%s\""
-msgstr "kann nicht aus Sicht „%s“ kopieren"
+msgstr "kann nicht aus Sicht »%s« kopieren"
 
-#: commands/copy.c:1663 commands/copy.c:1669 commands/copy.c:1675
+#: commands/copy.c:1703 commands/copy.c:1709 commands/copy.c:1715
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Versuchen Sie die Variante COPY (SELECT ...) TO."
 
-#: commands/copy.c:1667
+#: commands/copy.c:1707
 #, c-format
 msgid "cannot copy from materialized view \"%s\""
-msgstr "kann nicht aus materialisierter Sicht „%s“ kopieren"
+msgstr "kann nicht aus materialisierter Sicht »%s« kopieren"
 
-#: commands/copy.c:1673
+#: commands/copy.c:1713
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
-msgstr "kann nicht aus Fremdtabelle „%s“ kopieren"
+msgstr "kann nicht aus Fremdtabelle »%s« kopieren"
 
-#: commands/copy.c:1679
+#: commands/copy.c:1719
 #, c-format
 msgid "cannot copy from sequence \"%s\""
-msgstr "kann nicht aus Sequenz „%s“ kopieren"
+msgstr "kann nicht aus Sequenz »%s« kopieren"
 
-#: commands/copy.c:1684
+#: commands/copy.c:1724
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
-msgstr "kann nicht aus Relation „%s“, die keine Tabelle ist, kopieren"
+msgstr "kann nicht aus Relation »%s«, die keine Tabelle ist, kopieren"
 
-#: commands/copy.c:1709 commands/copy.c:2747
+#: commands/copy.c:1749 commands/copy.c:2787
 #, c-format
 msgid "could not execute command \"%s\": %m"
-msgstr "konnte Befehl „%s“ nicht ausführen: %m"
+msgstr "konnte Befehl »%s« nicht ausführen: %m"
 
-#: commands/copy.c:1724
+#: commands/copy.c:1764
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "relativer Pfad bei COPY in Datei nicht erlaubt"
 
-#: commands/copy.c:1732
+#: commands/copy.c:1772
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
-msgstr "konnte Datei „%s“ nicht zum Schreiben öffnen: %m"
+msgstr "konnte Datei »%s« nicht zum Schreiben öffnen: %m"
 
-#: commands/copy.c:1744 commands/copy.c:2770
+#: commands/copy.c:1784 commands/copy.c:2810
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "„%s“ ist ein Verzeichnis"
+msgstr "»%s« ist ein Verzeichnis"
 
-#: commands/copy.c:2069
+#: commands/copy.c:2109
 #, c-format
 msgid "COPY %s, line %d, column %s"
 msgstr "COPY %s, Zeile %d, Spalte %s"
 
-#: commands/copy.c:2073 commands/copy.c:2120
+#: commands/copy.c:2113 commands/copy.c:2160
 #, c-format
 msgid "COPY %s, line %d"
 msgstr "COPY %s, Zeile %d"
 
-#: commands/copy.c:2084
+#: commands/copy.c:2124
 #, c-format
 msgid "COPY %s, line %d, column %s: \"%s\""
-msgstr "COPY %s, Zeile %d, Spalte %s: „%s“"
+msgstr "COPY %s, Zeile %d, Spalte %s: »%s«"
 
-#: commands/copy.c:2092
+#: commands/copy.c:2132
 #, c-format
 msgid "COPY %s, line %d, column %s: null input"
 msgstr "COPY %s, Zeile %d, Spalte %s: NULL Eingabe"
 
-#: commands/copy.c:2114
+#: commands/copy.c:2154
 #, c-format
 msgid "COPY %s, line %d: \"%s\""
-msgstr "COPY %s, Zeile %d: „%s“"
+msgstr "COPY %s, Zeile %d: »%s«"
 
-#: commands/copy.c:2198
+#: commands/copy.c:2238
 #, c-format
 msgid "cannot copy to view \"%s\""
-msgstr "kann nicht in Sicht „%s“ kopieren"
+msgstr "kann nicht in Sicht »%s« kopieren"
 
-#: commands/copy.c:2203
+#: commands/copy.c:2243
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
-msgstr "kann nicht in materialisierte Sicht „%s“ kopieren"
+msgstr "kann nicht in materialisierte Sicht »%s« kopieren"
 
-#: commands/copy.c:2208
+#: commands/copy.c:2248
 #, c-format
 msgid "cannot copy to foreign table \"%s\""
-msgstr "kann nicht in Fremdtabelle „%s“ kopieren"
+msgstr "kann nicht in Fremdtabelle »%s« kopieren"
 
-#: commands/copy.c:2213
+#: commands/copy.c:2253
 #, c-format
 msgid "cannot copy to sequence \"%s\""
-msgstr "kann nicht in Sequenz „%s“ kopieren"
+msgstr "kann nicht in Sequenz »%s« kopieren"
 
-#: commands/copy.c:2218
+#: commands/copy.c:2258
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
-msgstr "kann nicht in Relation „%s“ kopieren, die keine Tabelle ist"
+msgstr "kann nicht in Relation »%s« kopieren, die keine Tabelle ist"
 
-#: commands/copy.c:2281
+#: commands/copy.c:2321
 #, c-format
 msgid "cannot perform FREEZE because of prior transaction activity"
 msgstr "FREEZE kann nicht durchgeführt werden wegen vorheriger Aktivität in dieser Transaktion"
 
-#: commands/copy.c:2287
+#: commands/copy.c:2327
 #, c-format
 msgid "cannot perform FREEZE because the table was not created or truncated in the current subtransaction"
 msgstr "FREEZE kann nicht durchgeführt werden, weil die Tabelle nicht in der aktuellen Transaktion erzeugt oder geleert wurde"
 
-#: commands/copy.c:2758 commands/extension.c:3037 utils/adt/genfile.c:134
+#: commands/copy.c:2798 commands/extension.c:3040 utils/adt/genfile.c:134
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
-msgstr "konnte Datei „%s“ nicht zum Lesen öffnen: %m"
+msgstr "konnte Datei »%s« nicht zum Lesen öffnen: %m"
 
-#: commands/copy.c:2790
+#: commands/copy.c:2830
 #, c-format
 msgid "COPY file signature not recognized"
 msgstr "COPY-Datei-Signatur nicht erkannt"
 
-#: commands/copy.c:2795
+#: commands/copy.c:2835
 #, c-format
 msgid "invalid COPY file header (missing flags)"
 msgstr "ungültiger COPY-Dateikopf (Flags fehlen)"
 
-#: commands/copy.c:2801
+#: commands/copy.c:2841
 #, c-format
 msgid "unrecognized critical flags in COPY file header"
 msgstr "unbekannte kritische Flags im COPY-Dateikopf"
 
-#: commands/copy.c:2807
+#: commands/copy.c:2847
 #, c-format
 msgid "invalid COPY file header (missing length)"
 msgstr "ungültiger COPY-Dateikopf (Länge fehlt)"
 
-#: commands/copy.c:2814
+#: commands/copy.c:2854
 #, c-format
 msgid "invalid COPY file header (wrong length)"
 msgstr "ungültiger COPY-Dateikopf (falsche Länge)"
 
-#: commands/copy.c:2947 commands/copy.c:3654 commands/copy.c:3884
+#: commands/copy.c:2987 commands/copy.c:3694 commands/copy.c:3924
 #, c-format
 msgid "extra data after last expected column"
 msgstr "zusätzliche Daten nach letzter erwarteter Spalte"
 
-#: commands/copy.c:2957
+#: commands/copy.c:2997
 #, c-format
 msgid "missing data for OID column"
 msgstr "fehlende Daten für OID-Spalte"
 
-#: commands/copy.c:2963
+#: commands/copy.c:3003
 #, c-format
 msgid "null OID in COPY data"
 msgstr "OID ist NULL in COPY-Daten"
 
-#: commands/copy.c:2973 commands/copy.c:3096
+#: commands/copy.c:3013 commands/copy.c:3136
 #, c-format
 msgid "invalid OID in COPY data"
 msgstr "ungültige OID in COPY-Daten"
 
-#: commands/copy.c:2988
+#: commands/copy.c:3028
 #, c-format
 msgid "missing data for column \"%s\""
-msgstr "fehlende Daten für Spalte „%s“"
+msgstr "fehlende Daten für Spalte »%s«"
 
-#: commands/copy.c:3071
+#: commands/copy.c:3111
 #, c-format
 msgid "received copy data after EOF marker"
 msgstr "COPY-Daten nach EOF-Markierung empfangen"
 
-#: commands/copy.c:3078
+#: commands/copy.c:3118
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "Feldanzahl in Zeile ist %d, erwartet wurden %d"
 
-#: commands/copy.c:3418 commands/copy.c:3435
+#: commands/copy.c:3458 commands/copy.c:3475
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "Carriage-Return-Zeichen in Daten gefunden"
 
-#: commands/copy.c:3419 commands/copy.c:3436
+#: commands/copy.c:3459 commands/copy.c:3476
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "ungequotetes Carriage-Return-Zeichen in Daten gefunden"
 
-#: commands/copy.c:3421 commands/copy.c:3438
+#: commands/copy.c:3461 commands/copy.c:3478
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
-msgstr "Verwenden Sie „\\r“, um ein Carriage-Return-Zeichen darzustellen."
+msgstr "Verwenden Sie »\\r«, um ein Carriage-Return-Zeichen darzustellen."
 
-#: commands/copy.c:3422 commands/copy.c:3439
+#: commands/copy.c:3462 commands/copy.c:3479
 #, c-format
 msgid "Use quoted CSV field to represent carriage return."
 msgstr "Verwenden Sie ein gequotetes CSV-Feld, um ein Carriage-Return-Zeichen darzustellen."
 
-#: commands/copy.c:3451
+#: commands/copy.c:3491
 #, c-format
 msgid "literal newline found in data"
 msgstr "Newline-Zeichen in Daten gefunden"
 
-#: commands/copy.c:3452
+#: commands/copy.c:3492
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "ungequotetes Newline-Zeichen in Daten gefunden"
 
-#: commands/copy.c:3454
+#: commands/copy.c:3494
 #, c-format
 msgid "Use \"\\n\" to represent newline."
-msgstr "Verwenden Sie „\\n“, um ein Newline-Zeichen darzustellen."
+msgstr "Verwenden Sie »\\n«, um ein Newline-Zeichen darzustellen."
 
-#: commands/copy.c:3455
+#: commands/copy.c:3495
 #, c-format
 msgid "Use quoted CSV field to represent newline."
 msgstr "Verwenden Sie ein gequotetes CSV-Feld, um ein Newline-Zeichen darzustellen."
 
-#: commands/copy.c:3501 commands/copy.c:3537
+#: commands/copy.c:3541 commands/copy.c:3577
 #, c-format
 msgid "end-of-copy marker does not match previous newline style"
 msgstr "COPY-Ende-Markierung stimmt nicht mit vorherigem Newline-Stil überein"
 
-#: commands/copy.c:3510 commands/copy.c:3526
+#: commands/copy.c:3550 commands/copy.c:3566
 #, c-format
 msgid "end-of-copy marker corrupt"
 msgstr "COPY-Ende-Markierung verfälscht"
 
-#: commands/copy.c:3968
+#: commands/copy.c:4008
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "Quotes in CSV-Feld nicht abgeschlossen"
 
-#: commands/copy.c:4045 commands/copy.c:4064
+#: commands/copy.c:4085 commands/copy.c:4104
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "unerwartetes EOF in COPY-Daten"
 
-#: commands/copy.c:4054
+#: commands/copy.c:4094
 #, c-format
 msgid "invalid field size"
 msgstr "ungültige Feldgröße"
 
-#: commands/copy.c:4077
+#: commands/copy.c:4117
 #, c-format
 msgid "incorrect binary data format"
 msgstr "falsches Binärdatenformat"
 
-#: commands/copy.c:4388 commands/indexcmds.c:1008 commands/tablecmds.c:1459
-#: commands/tablecmds.c:2282 parser/parse_relation.c:3084
-#: parser/parse_relation.c:3104 utils/adt/tsvector_op.c:1417
+#: commands/copy.c:4428 commands/indexcmds.c:1009 commands/tablecmds.c:1460
+#: commands/tablecmds.c:2283 parser/parse_relation.c:3177
+#: parser/parse_relation.c:3197 utils/adt/tsvector_op.c:1418
 #, c-format
 msgid "column \"%s\" does not exist"
-msgstr "Spalte „%s“ existiert nicht"
+msgstr "Spalte »%s« existiert nicht"
 
-#: commands/copy.c:4395 commands/tablecmds.c:1485 commands/trigger.c:652
-#: parser/parse_target.c:956 parser/parse_target.c:967
+#: commands/copy.c:4435 commands/tablecmds.c:1486 commands/trigger.c:652
+#: parser/parse_target.c:967 parser/parse_target.c:978
 #, c-format
 msgid "column \"%s\" specified more than once"
-msgstr "Spalte „%s“ mehrmals angegeben"
+msgstr "Spalte »%s« mehrmals angegeben"
 
-#: commands/createas.c:383
+#: commands/createas.c:213 commands/createas.c:508
 #, c-format
 msgid "too many column names were specified"
 msgstr "zu viele Spaltennamen wurden angegeben"
 
-#: commands/createas.c:452
+#: commands/createas.c:549
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "Policys sind für diesen Befehl noch nicht implementiert"
@@ -5353,12 +5375,12 @@
 #: commands/dbcommands.c:321
 #, c-format
 msgid "template database \"%s\" does not exist"
-msgstr "Template-Datenbank „%s“ existiert nicht"
+msgstr "Template-Datenbank »%s« existiert nicht"
 
 #: commands/dbcommands.c:333
 #, c-format
 msgid "permission denied to copy database \"%s\""
-msgstr "keine Berechtigung, um Datenbank „%s“ zu kopieren"
+msgstr "keine Berechtigung, um Datenbank »%s« zu kopieren"
 
 #: commands/dbcommands.c:349
 #, c-format
@@ -5368,7 +5390,7 @@
 #: commands/dbcommands.c:355 commands/dbcommands.c:360
 #, c-format
 msgid "invalid locale name: \"%s\""
-msgstr "ungültiger Locale-Name: „%s“"
+msgstr "ungültiger Locale-Name: »%s«"
 
 #: commands/dbcommands.c:380
 #, c-format
@@ -5408,42 +5430,42 @@
 #: commands/dbcommands.c:445
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
-msgstr "kann neuen Standard-Tablespace „%s“ nicht setzen"
+msgstr "kann neuen Standard-Tablespace »%s« nicht setzen"
 
 #: commands/dbcommands.c:447
 #, c-format
 msgid "There is a conflict because database \"%s\" already has some tables in this tablespace."
-msgstr "Es gibt einen Konflikt, weil Datenbank „%s“ schon einige Tabellen in diesem Tablespace hat."
+msgstr "Es gibt einen Konflikt, weil Datenbank »%s« schon einige Tabellen in diesem Tablespace hat."
 
 #: commands/dbcommands.c:467 commands/dbcommands.c:982
 #, c-format
 msgid "database \"%s\" already exists"
-msgstr "Datenbank „%s“ existiert bereits"
+msgstr "Datenbank »%s« existiert bereits"
 
 #: commands/dbcommands.c:481
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
-msgstr "auf Quelldatenbank „%s“ wird gerade von anderen Benutzern zugegriffen"
+msgstr "auf Quelldatenbank »%s« wird gerade von anderen Benutzern zugegriffen"
 
 #: commands/dbcommands.c:726 commands/dbcommands.c:741
 #, c-format
 msgid "encoding \"%s\" does not match locale \"%s\""
-msgstr "Kodierung „%s“ stimmt nicht mit Locale „%s“ überein"
+msgstr "Kodierung »%s« stimmt nicht mit Locale »%s« überein"
 
 #: commands/dbcommands.c:729
 #, c-format
 msgid "The chosen LC_CTYPE setting requires encoding \"%s\"."
-msgstr "Die gewählte LC_CTYPE-Einstellung verlangt die Kodierung „%s“."
+msgstr "Die gewählte LC_CTYPE-Einstellung verlangt die Kodierung »%s«."
 
 #: commands/dbcommands.c:744
 #, c-format
 msgid "The chosen LC_COLLATE setting requires encoding \"%s\"."
-msgstr "Die gewählte LC_COLLATE-Einstellung verlangt die Kodierung „%s“."
+msgstr "Die gewählte LC_COLLATE-Einstellung verlangt die Kodierung »%s«."
 
 #: commands/dbcommands.c:804
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
-msgstr "Datenbank „%s“ existiert nicht, wird übersprungen"
+msgstr "Datenbank »%s« existiert nicht, wird übersprungen"
 
 #: commands/dbcommands.c:828
 #, c-format
@@ -5458,7 +5480,7 @@
 #: commands/dbcommands.c:844
 #, c-format
 msgid "database \"%s\" is used by a logical replication slot"
-msgstr "Datenbank „%s“ wird von einem logischen Replikations-Slot verwendet"
+msgstr "Datenbank »%s« wird von einem logischen Replikations-Slot verwendet"
 
 #: commands/dbcommands.c:846
 #, c-format
@@ -5471,7 +5493,7 @@
 #: commands/dbcommands.c:1135
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
-msgstr "auf Datenbank „%s“ wird von anderen Benutzern zugegriffen"
+msgstr "auf Datenbank »%s« wird von anderen Benutzern zugegriffen"
 
 #: commands/dbcommands.c:973
 #, c-format
@@ -5491,7 +5513,7 @@
 #: commands/dbcommands.c:1194
 #, c-format
 msgid "some relations of database \"%s\" are already in tablespace \"%s\""
-msgstr "einige Relationen von Datenbank „%s“ ist bereits in Tablespace „%s“"
+msgstr "einige Relationen von Datenbank »%s« ist bereits in Tablespace »%s«"
 
 #: commands/dbcommands.c:1196
 #, c-format
@@ -5503,12 +5525,12 @@
 #: commands/tablespace.c:606
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
-msgstr "einige nutzlose Dateien wurde möglicherweise im alten Datenbankverzeichnis „%s“ zurückgelassen"
+msgstr "einige nutzlose Dateien wurde möglicherweise im alten Datenbankverzeichnis »%s« zurückgelassen"
 
 #: commands/dbcommands.c:1440
 #, c-format
 msgid "option \"%s\" cannot be specified with other options"
-msgstr "Option „%s“ kann nicht mit anderen Optionen angegeben werden"
+msgstr "Option »%s« kann nicht mit anderen Optionen angegeben werden"
 
 #: commands/dbcommands.c:1494
 #, c-format
@@ -5574,70 +5596,70 @@
 #: commands/define.c:318
 #, c-format
 msgid "invalid argument for %s: \"%s\""
-msgstr "ungültiges Argument für %s: „%s“"
+msgstr "ungültiges Argument für %s: »%s«"
 
 #: commands/dropcmds.c:112 commands/functioncmds.c:1166
-#: utils/adt/ruleutils.c:1951
+#: utils/adt/ruleutils.c:1954
 #, c-format
 msgid "\"%s\" is an aggregate function"
-msgstr "„%s“ ist eine Aggregatfunktion"
+msgstr "»%s« ist eine Aggregatfunktion"
 
 #: commands/dropcmds.c:114
 #, c-format
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Verwenden Sie DROP AGGREGATE, um Aggregatfunktionen zu löschen."
 
-#: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2369
-#: commands/tablecmds.c:2520 commands/tablecmds.c:2562
-#: commands/tablecmds.c:11336 tcop/utility.c:1104
+#: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2370
+#: commands/tablecmds.c:2521 commands/tablecmds.c:2563
+#: commands/tablecmds.c:11494 tcop/utility.c:1104
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
-msgstr "Relation „%s“ existiert nicht, wird übersprungen"
+msgstr "Relation »%s« existiert nicht, wird übersprungen"
 
-#: commands/dropcmds.c:195 commands/dropcmds.c:292 commands/tablecmds.c:741
+#: commands/dropcmds.c:195 commands/dropcmds.c:292 commands/tablecmds.c:742
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
-msgstr "Schema „%s“ existiert nicht, wird übersprungen"
+msgstr "Schema »%s« existiert nicht, wird übersprungen"
 
-#: commands/dropcmds.c:237 commands/dropcmds.c:272 commands/tablecmds.c:244
+#: commands/dropcmds.c:237 commands/dropcmds.c:272 commands/tablecmds.c:245
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
-msgstr "Typ „%s“ existiert nicht, wird übersprungen"
+msgstr "Typ »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:280
 #, c-format
 msgid "collation \"%s\" does not exist, skipping"
-msgstr "Sortierfolge „%s“ existiert nicht, wird übersprungen"
+msgstr "Sortierfolge »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:287
 #, c-format
 msgid "conversion \"%s\" does not exist, skipping"
-msgstr "Konversion „%s“ existiert nicht, wird übersprungen"
+msgstr "Konversion »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:298
 #, c-format
 msgid "text search parser \"%s\" does not exist, skipping"
-msgstr "Textsucheparser „%s“ existiert nicht, wird übersprungen"
+msgstr "Textsucheparser »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:305
 #, c-format
 msgid "text search dictionary \"%s\" does not exist, skipping"
-msgstr "Textsuchewörterbuch „%s“ existiert nicht, wird übersprungen"
+msgstr "Textsuchewörterbuch »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:312
 #, c-format
 msgid "text search template \"%s\" does not exist, skipping"
-msgstr "Textsuchevorlage „%s“ existiert nicht, wird übersprungen"
+msgstr "Textsuchevorlage »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:319
 #, c-format
 msgid "text search configuration \"%s\" does not exist, skipping"
-msgstr "Textsuchekonfiguration „%s“ existiert nicht, wird übersprungen"
+msgstr "Textsuchekonfiguration »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:324
 #, c-format
 msgid "extension \"%s\" does not exist, skipping"
-msgstr "Erweiterung „%s“ existiert nicht, wird übersprungen"
+msgstr "Erweiterung »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:331
 #, c-format
@@ -5657,7 +5679,7 @@
 #: commands/dropcmds.c:354
 #, c-format
 msgid "language \"%s\" does not exist, skipping"
-msgstr "Sprache „%s“ existiert nicht, wird übersprungen"
+msgstr "Sprache »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:363
 #, c-format
@@ -5667,52 +5689,52 @@
 #: commands/dropcmds.c:372
 #, c-format
 msgid "transform for type %s language \"%s\" does not exist, skipping"
-msgstr "Transformation für Typ %s Sprache „%s“ existiert nicht, wird übersprungen"
+msgstr "Transformation für Typ %s Sprache »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:380
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" does not exist, skipping"
-msgstr "Trigger „%s“ für Relation „%s“ existiert nicht, wird übersprungen"
+msgstr "Trigger »%s« für Relation »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:389
 #, c-format
 msgid "policy \"%s\" for relation \"%s\" does not exist, skipping"
-msgstr "Policy „%s“ für Relation „%s“ existiert nicht, wird übersprungen"
+msgstr "Policy »%s« für Relation »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:396
 #, c-format
 msgid "event trigger \"%s\" does not exist, skipping"
-msgstr "Ereignistrigger „%s“ existiert nicht, wird übersprungen"
+msgstr "Ereignistrigger »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:402
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" does not exist, skipping"
-msgstr "Regel „%s“ für Relation „%s“ existiert nicht, wird übersprungen"
+msgstr "Regel »%s« für Relation »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:409
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
-msgstr "Fremddaten-Wrapper „%s“ existiert nicht, wird übersprungen"
+msgstr "Fremddaten-Wrapper »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:413
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
-msgstr "Server „%s“ existiert nicht, wird übersprungen"
+msgstr "Server »%s« existiert nicht, wird übersprungen"
 
 #: commands/dropcmds.c:422
 #, c-format
 msgid "operator class \"%s\" does not exist for access method \"%s\", skipping"
-msgstr "Operatorklasse „%s“ existiert nicht für Zugriffsmethode „%s“, wird übersprungen"
+msgstr "Operatorklasse »%s« existiert nicht für Zugriffsmethode »%s«, wird übersprungen"
 
 #: commands/dropcmds.c:434
 #, 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"
+msgstr "Operatorfamilie »%s« existiert nicht für Zugriffsmethode »%s«, wird übersprungen"
 
 #: commands/event_trigger.c:181
 #, c-format
 msgid "permission denied to create event trigger \"%s\""
-msgstr "keine Berechtigung, um Ereignistrigger „%s“ zu erzeugen"
+msgstr "keine Berechtigung, um Ereignistrigger »%s« zu erzeugen"
 
 #: commands/event_trigger.c:183
 #, c-format
@@ -5722,22 +5744,22 @@
 #: commands/event_trigger.c:192
 #, c-format
 msgid "unrecognized event name \"%s\""
-msgstr "unbekannter Ereignisname „%s“"
+msgstr "unbekannter Ereignisname »%s«"
 
 #: commands/event_trigger.c:209
 #, c-format
 msgid "unrecognized filter variable \"%s\""
-msgstr "unbekannte Filtervariable „%s“"
+msgstr "unbekannte Filtervariable »%s«"
 
 #: commands/event_trigger.c:239
 #, c-format
 msgid "function \"%s\" must return type \"event_trigger\""
-msgstr "Funktion „%s“ muss Typ „event_trigger“ zurückgeben"
+msgstr "Funktion »%s« muss Typ »event_trigger« zurückgeben"
 
 #: commands/event_trigger.c:264
 #, c-format
 msgid "filter value \"%s\" not recognized for filter variable \"%s\""
-msgstr "Filterwert „%s“ nicht erkannt für Filtervariable „%s“"
+msgstr "Filterwert »%s« nicht erkannt für Filtervariable »%s«"
 
 #. translator: %s represents an SQL statement name
 #: commands/event_trigger.c:270 commands/event_trigger.c:340
@@ -5748,18 +5770,18 @@
 #: commands/event_trigger.c:363
 #, c-format
 msgid "filter variable \"%s\" specified more than once"
-msgstr "Filtervariable „%s“ mehrmals angegeben"
+msgstr "Filtervariable »%s« mehrmals angegeben"
 
 #: commands/event_trigger.c:511 commands/event_trigger.c:555
 #: commands/event_trigger.c:648
 #, c-format
 msgid "event trigger \"%s\" does not exist"
-msgstr "Ereignistrigger „%s“ existiert nicht"
+msgstr "Ereignistrigger »%s« existiert nicht"
 
 #: commands/event_trigger.c:616
 #, c-format
 msgid "permission denied to change owner of event trigger \"%s\""
-msgstr "keine Berechtigung, um Eigentümer des Ereignistriggers „%s“ zu ändern"
+msgstr "keine Berechtigung, um Eigentümer des Ereignistriggers »%s« zu ändern"
 
 #: commands/event_trigger.c:618
 #, c-format
@@ -5772,26 +5794,26 @@
 msgstr "%s kann nur in einer sql_drop-Ereignistriggerfunktion aufgerufen werden"
 
 #: commands/event_trigger.c:1446 commands/event_trigger.c:1997
-#: commands/extension.c:1645 commands/extension.c:1754
-#: commands/extension.c:1947 commands/prepare.c:701 executor/execQual.c:1735
-#: executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5376
-#: executor/functions.c:1021 foreign/foreign.c:491
-#: replication/logical/logicalfuncs.c:324 replication/logical/origin.c:1391
-#: replication/slotfuncs.c:173 replication/walsender.c:2762
+#: commands/extension.c:1648 commands/extension.c:1757
+#: commands/extension.c:1950 commands/prepare.c:701 executor/execQual.c:1735
+#: executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5431
+#: executor/functions.c:1030 foreign/foreign.c:491
+#: replication/logical/logicalfuncs.c:324 replication/logical/origin.c:1394
+#: replication/slotfuncs.c:173 replication/walsender.c:2765
 #: utils/adt/jsonfuncs.c:1474 utils/adt/jsonfuncs.c:1606
 #: utils/adt/jsonfuncs.c:1796 utils/adt/jsonfuncs.c:1925
 #: utils/adt/jsonfuncs.c:2693 utils/adt/pgstatfuncs.c:547
-#: utils/fmgr/funcapi.c:61 utils/misc/guc.c:8203 utils/mmgr/portalmem.c:1052
+#: utils/fmgr/funcapi.c:61 utils/misc/guc.c:8228 utils/mmgr/portalmem.c:1052
 #, c-format
 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/event_trigger.c:1450 commands/event_trigger.c:2001
-#: commands/extension.c:1649 commands/extension.c:1758
-#: commands/extension.c:1951 commands/prepare.c:705 foreign/foreign.c:496
-#: replication/logical/logicalfuncs.c:328 replication/logical/origin.c:1395
-#: replication/slotfuncs.c:177 replication/walsender.c:2766
-#: utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8207
+#: commands/extension.c:1652 commands/extension.c:1761
+#: commands/extension.c:1954 commands/prepare.c:705 foreign/foreign.c:496
+#: replication/logical/logicalfuncs.c:328 replication/logical/origin.c:1398
+#: replication/slotfuncs.c:177 replication/walsender.c:2769
+#: utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8232
 #: utils/mmgr/portalmem.c:1056
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
@@ -5807,36 +5829,36 @@
 msgid "%s can only be called in an event trigger function"
 msgstr "%s kann nur in einer Ereignistriggerfunktion aufgerufen werden"
 
-#: commands/explain.c:184
+#: commands/explain.c:185
 #, c-format
 msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
-msgstr "unbekannter Wert für EXPLAIN-Option „%s“: „%s“"
+msgstr "unbekannter Wert für EXPLAIN-Option »%s«: »%s«"
 
-#: commands/explain.c:190
+#: commands/explain.c:191
 #, c-format
 msgid "unrecognized EXPLAIN option \"%s\""
-msgstr "unbekannte EXPLAIN-Option „%s“"
+msgstr "unbekannte EXPLAIN-Option »%s«"
 
-#: commands/explain.c:197
+#: commands/explain.c:198
 #, c-format
 msgid "EXPLAIN option BUFFERS requires ANALYZE"
 msgstr "EXPLAIN-Option BUFFERS erfordert ANALYZE"
 
-#: commands/explain.c:206
+#: commands/explain.c:207
 #, c-format
 msgid "EXPLAIN option TIMING requires ANALYZE"
 msgstr "EXPLAIN-Option TIMING erfordert ANALYZE"
 
-#: commands/extension.c:152 commands/extension.c:2635
+#: commands/extension.c:152 commands/extension.c:2638
 #, c-format
 msgid "extension \"%s\" does not exist"
-msgstr "Erweiterung „%s“ existiert nicht"
+msgstr "Erweiterung »%s« existiert nicht"
 
 #: commands/extension.c:251 commands/extension.c:260 commands/extension.c:272
 #: commands/extension.c:282
 #, c-format
 msgid "invalid extension name: \"%s\""
-msgstr "ungültiger Erweiterungsname: „%s“"
+msgstr "ungültiger Erweiterungsname: »%s«"
 
 #: commands/extension.c:252
 #, c-format
@@ -5846,12 +5868,12 @@
 #: commands/extension.c:261
 #, c-format
 msgid "Extension names must not contain \"--\"."
-msgstr "Erweiterungsnamen dürfen nicht „--“ enthalten."
+msgstr "Erweiterungsnamen dürfen nicht »--« enthalten."
 
 #: commands/extension.c:273
 #, c-format
 msgid "Extension names must not begin or end with \"-\"."
-msgstr "Erweiterungsnamen dürfen nicht mit „-“ anfangen oder aufhören."
+msgstr "Erweiterungsnamen dürfen nicht mit »-« anfangen oder aufhören."
 
 #: commands/extension.c:283
 #, c-format
@@ -5862,7 +5884,7 @@
 #: commands/extension.c:326
 #, c-format
 msgid "invalid extension version name: \"%s\""
-msgstr "ungültiger Erweiterungsversionsname: „%s“"
+msgstr "ungültiger Erweiterungsversionsname: »%s«"
 
 #: commands/extension.c:299
 #, c-format
@@ -5872,12 +5894,12 @@
 #: commands/extension.c:308
 #, c-format
 msgid "Version names must not contain \"--\"."
-msgstr "Versionsnamen dürfen nicht „--“ enthalten."
+msgstr "Versionsnamen dürfen nicht »--« enthalten."
 
 #: commands/extension.c:317
 #, c-format
 msgid "Version names must not begin or end with \"-\"."
-msgstr "Versionsnamen dürfen nicht mit „-“ anfangen oder aufhören."
+msgstr "Versionsnamen dürfen nicht mit »-« anfangen oder aufhören."
 
 #: commands/extension.c:327
 #, c-format
@@ -5887,172 +5909,172 @@
 #: commands/extension.c:477
 #, c-format
 msgid "could not open extension control file \"%s\": %m"
-msgstr "konnte Erweiterungskontrolldatei „%s“ nicht öffnen: %m"
+msgstr "konnte Erweiterungskontrolldatei »%s« nicht öffnen: %m"
 
 #: commands/extension.c:499 commands/extension.c:509
 #, c-format
 msgid "parameter \"%s\" cannot be set in a secondary extension control file"
-msgstr "Parameter „%s“ kann nicht in einer sekundären Erweitungskontrolldatei gesetzt werden"
+msgstr "Parameter »%s« kann nicht in einer sekundären Erweitungskontrolldatei gesetzt werden"
 
 #: commands/extension.c:548
 #, c-format
 msgid "\"%s\" is not a valid encoding name"
-msgstr "„%s“ ist kein gültiger Kodierungsname"
+msgstr "»%s« ist kein gültiger Kodierungsname"
 
 #: commands/extension.c:562
 #, c-format
 msgid "parameter \"%s\" must be a list of extension names"
-msgstr "Parameter „%s“ muss eine Liste von Erweiterungsnamen sein"
+msgstr "Parameter »%s« muss eine Liste von Erweiterungsnamen sein"
 
 #: commands/extension.c:569
 #, c-format
 msgid "unrecognized parameter \"%s\" in file \"%s\""
-msgstr "unbekannter Parameter „%s“ in Datei „%s“"
+msgstr "unbekannter Parameter »%s« in Datei »%s«"
 
 #: commands/extension.c:578
 #, c-format
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
-msgstr "Parameter „schema“ kann nicht angegeben werden, wenn „relocatable“ an ist"
+msgstr "Parameter »schema« kann nicht angegeben werden, wenn »relocatable« an ist"
 
-#: commands/extension.c:719
+#: commands/extension.c:722
 #, c-format
 msgid "transaction control statements are not allowed within an extension script"
 msgstr "Transaktionskontrollanweisungen sind nicht in einem Erweiterungsskript erlaubt"
 
-#: commands/extension.c:787
+#: commands/extension.c:790
 #, c-format
 msgid "permission denied to create extension \"%s\""
-msgstr "keine Berechtigung, um Erweiterung „%s“ zu erzeugen"
+msgstr "keine Berechtigung, um Erweiterung »%s« zu erzeugen"
 
-#: commands/extension.c:789
+#: commands/extension.c:792
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "Nur Superuser können diese Erweiterung anlegen."
 
-#: commands/extension.c:793
+#: commands/extension.c:796
 #, c-format
 msgid "permission denied to update extension \"%s\""
-msgstr "keine Berechtigung, um Erweiterung „%s“ zu aktualisieren"
+msgstr "keine Berechtigung, um Erweiterung »%s« zu aktualisieren"
 
-#: commands/extension.c:795
+#: commands/extension.c:798
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "Nur Superuser können diese Erweiterung aktualisieren."
 
-#: commands/extension.c:1077
+#: commands/extension.c:1080
 #, c-format
 msgid "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
-msgstr "Erweiterung „%s“ hat keinen Aktualisierungspfad von Version „%s“ auf Version „%s“"
+msgstr "Erweiterung »%s« hat keinen Aktualisierungspfad von Version »%s« auf Version »%s«"
 
-#: commands/extension.c:1205
+#: commands/extension.c:1208
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
-msgstr "Erweiterung „%s“ existiert bereits, wird übersprungen"
+msgstr "Erweiterung »%s« existiert bereits, wird übersprungen"
 
-#: commands/extension.c:1212
+#: commands/extension.c:1215
 #, c-format
 msgid "extension \"%s\" already exists"
-msgstr "Erweiterung „%s“ existiert bereits"
+msgstr "Erweiterung »%s« existiert bereits"
 
-#: commands/extension.c:1223
+#: commands/extension.c:1226
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "geschachteltes CREATE EXTENSION wird nicht unterstützt"
 
-#: commands/extension.c:1278 commands/extension.c:2695
+#: commands/extension.c:1281 commands/extension.c:2698
 #, c-format
 msgid "version to install must be specified"
 msgstr "die zu installierende Version muss angegeben werden"
 
-#: commands/extension.c:1295
+#: commands/extension.c:1298
 #, 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"
+msgstr "FROM-Version muss verschieden von der zu installierenden Version »%s« sein"
 
-#: commands/extension.c:1350
+#: commands/extension.c:1353
 #, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
-msgstr "Erweiterung „%s“ muss in Schema „%s“ installiert werden"
+msgstr "Erweiterung »%s« muss in Schema »%s« installiert werden"
 
-#: commands/extension.c:1434 commands/extension.c:2840
+#: commands/extension.c:1437 commands/extension.c:2843
 #, c-format
 msgid "required extension \"%s\" is not installed"
-msgstr "benötigte Erweiterung „%s“ ist nicht installiert"
+msgstr "benötigte Erweiterung »%s« ist nicht installiert"
 
-#: commands/extension.c:1597
+#: commands/extension.c:1600
 #, 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"
+msgstr "Erweiterung »%s« kann nicht gelöscht werden, weil sie gerade geändert wird"
 
-#: commands/extension.c:2068
+#: commands/extension.c:2071
 #, c-format
 msgid "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:2080
+#: commands/extension.c:2083
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "OID %u bezieht sich nicht auf eine Tabelle"
 
-#: commands/extension.c:2085
+#: commands/extension.c:2088
 #, c-format
 msgid "table \"%s\" is not a member of the extension being created"
-msgstr "Tabelle „%s“ ist kein Mitglied der anzulegenden Erweiterung"
+msgstr "Tabelle »%s« ist kein Mitglied der anzulegenden Erweiterung"
 
-#: commands/extension.c:2450
+#: commands/extension.c:2453
 #, c-format
 msgid "cannot move extension \"%s\" into schema \"%s\" because the extension contains the schema"
-msgstr "kann Erweiterung „%s“ nicht in Schema „%s“ verschieben, weil die Erweiterung das Schema enthält"
+msgstr "kann Erweiterung »%s« nicht in Schema »%s« verschieben, weil die Erweiterung das Schema enthält"
 
-#: commands/extension.c:2490 commands/extension.c:2553
+#: commands/extension.c:2493 commands/extension.c:2556
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
-msgstr "Erweiterung „%s“ unterstützt SET SCHEMA nicht"
+msgstr "Erweiterung »%s« unterstützt SET SCHEMA nicht"
 
-#: commands/extension.c:2555
+#: commands/extension.c:2558
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
-msgstr "%s ist nicht im Schema der Erweiterung („%s“)"
+msgstr "%s ist nicht im Schema der Erweiterung (»%s«)"
 
-#: commands/extension.c:2615
+#: commands/extension.c:2618
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "geschachteltes ALTER EXTENSION wird nicht unterstützt"
 
-#: commands/extension.c:2706
+#: commands/extension.c:2709
 #, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
-msgstr "Version „%s“ von Erweiterung „%s“ ist bereits installiert"
+msgstr "Version »%s« von Erweiterung »%s« ist bereits installiert"
 
-#: commands/extension.c:2957
+#: commands/extension.c:2960
 #, c-format
 msgid "cannot add schema \"%s\" to extension \"%s\" because the schema contains the extension"
-msgstr "kann Schema „%s“ nicht zu Erweiterung „%s“ hinzufügen, weil das Schema die Erweiterung enthält"
+msgstr "kann Schema »%s« nicht zu Erweiterung »%s« hinzufügen, weil das Schema die Erweiterung enthält"
 
-#: commands/extension.c:2975
+#: commands/extension.c:2978
 #, c-format
 msgid "%s is not a member of extension \"%s\""
-msgstr "%s ist kein Mitglied der Erweiterung „%s“"
+msgstr "%s ist kein Mitglied der Erweiterung »%s«"
 
-#: commands/extension.c:3031
+#: commands/extension.c:3034
 #, c-format
 msgid "file \"%s\" is too large"
-msgstr "Datei „%s“ ist zu groß"
+msgstr "Datei »%s« ist zu groß"
 
 #: commands/foreigncmds.c:150 commands/foreigncmds.c:159
 #, c-format
 msgid "option \"%s\" not found"
-msgstr "Option „%s“ nicht gefunden"
+msgstr "Option »%s« nicht gefunden"
 
 #: commands/foreigncmds.c:169
 #, c-format
 msgid "option \"%s\" provided more than once"
-msgstr "Option „%s“ mehrmals angegeben"
+msgstr "Option »%s« mehrmals angegeben"
 
 #: commands/foreigncmds.c:223 commands/foreigncmds.c:231
 #, 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"
+msgstr "keine Berechtigung, um Eigentümer des Fremddaten-Wrappers »%s« zu ändern"
 
 #: commands/foreigncmds.c:225
 #, c-format
@@ -6067,17 +6089,17 @@
 #: commands/foreigncmds.c:292 commands/foreigncmds.c:709 foreign/foreign.c:670
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
-msgstr "Fremddaten-Wrapper „%s“ existiert nicht"
+msgstr "Fremddaten-Wrapper »%s« existiert nicht"
 
 #: commands/foreigncmds.c:489
 #, c-format
 msgid "function %s must return type \"fdw_handler\""
-msgstr "Funktion %s muss Typ „fdw_handler“ zurückgeben"
+msgstr "Funktion %s muss Typ »fdw_handler« zurückgeben"
 
 #: commands/foreigncmds.c:584
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
-msgstr "keine Berechtigung, um Fremddaten-Wrapper „%s“ zu erzeugen"
+msgstr "keine Berechtigung, um Fremddaten-Wrapper »%s« zu erzeugen"
 
 #: commands/foreigncmds.c:586
 #, c-format
@@ -6087,7 +6109,7 @@
 #: commands/foreigncmds.c:699
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
-msgstr "keine Berechtigung, um Fremddaten-Wrapper „%s“ zu ändern"
+msgstr "keine Berechtigung, um Fremddaten-Wrapper »%s« zu ändern"
 
 #: commands/foreigncmds.c:701
 #, c-format
@@ -6107,12 +6129,12 @@
 #: commands/foreigncmds.c:1165
 #, c-format
 msgid "user mapping \"%s\" already exists for server %s"
-msgstr "Benutzerabbildung „%s“ existiert bereits für Server „%s“"
+msgstr "Benutzerabbildung »%s« existiert bereits für Server »%s«"
 
 #: commands/foreigncmds.c:1259 commands/foreigncmds.c:1375
 #, c-format
 msgid "user mapping \"%s\" does not exist for the server"
-msgstr "Benutzerabbildung „%s“ existiert für den Server nicht"
+msgstr "Benutzerabbildung »%s« existiert für den Server nicht"
 
 #: commands/foreigncmds.c:1362
 #, c-format
@@ -6122,22 +6144,22 @@
 #: commands/foreigncmds.c:1380
 #, c-format
 msgid "user mapping \"%s\" does not exist for the server, skipping"
-msgstr "Benutzerabbildung „%s“ existiert nicht für den Server, wird übersprungen"
+msgstr "Benutzerabbildung »%s« existiert nicht für den Server, wird übersprungen"
 
 #: commands/foreigncmds.c:1532 foreign/foreign.c:360
 #, c-format
 msgid "foreign-data wrapper \"%s\" has no handler"
-msgstr "Fremddaten-Wrapper „%s“ hat keinen Handler"
+msgstr "Fremddaten-Wrapper »%s« hat keinen Handler"
 
 #: commands/foreigncmds.c:1538
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not support IMPORT FOREIGN SCHEMA"
-msgstr "Fremddaten-Wrapper „%s“ unterstützt IMPORT FOREIGN SCHEMA nicht"
+msgstr "Fremddaten-Wrapper »%s« unterstützt IMPORT FOREIGN SCHEMA nicht"
 
 #: commands/foreigncmds.c:1631
 #, c-format
 msgid "importing foreign table \"%s\""
-msgstr "importiere Fremdtabelle „%s“"
+msgstr "importiere Fremdtabelle »%s«"
 
 #: commands/functioncmds.c:99
 #, c-format
@@ -6152,12 +6174,12 @@
 #: commands/functioncmds.c:134 parser/parse_type.c:337
 #, c-format
 msgid "type modifier cannot be specified for shell type \"%s\""
-msgstr "Typmodifikator kann für Hüllentyp „%s“ nicht angegeben werden"
+msgstr "Typmodifikator kann für Hüllentyp »%s« nicht angegeben werden"
 
 #: commands/functioncmds.c:140
 #, c-format
 msgid "type \"%s\" is not yet defined"
-msgstr "Typ „%s“ ist noch nicht definiert"
+msgstr "Typ »%s« ist noch nicht definiert"
 
 #: commands/functioncmds.c:141
 #, c-format
@@ -6207,7 +6229,7 @@
 #: commands/functioncmds.c:356
 #, c-format
 msgid "parameter name \"%s\" used more than once"
-msgstr "Parametername „%s“ mehrmals angegeben"
+msgstr "Parametername »%s« mehrmals angegeben"
 
 #: commands/functioncmds.c:371
 #, c-format
@@ -6247,18 +6269,18 @@
 #: commands/functioncmds.c:752
 #, c-format
 msgid "unrecognized function attribute \"%s\" ignored"
-msgstr "unbekanntes Funktionsattribut „%s“ ignoriert"
+msgstr "unbekanntes Funktionsattribut »%s« ignoriert"
 
 #: commands/functioncmds.c:803
 #, c-format
 msgid "only one AS item needed for language \"%s\""
-msgstr "nur ein AS-Element benötigt für Sprache „%s“"
+msgstr "nur ein AS-Element benötigt für Sprache »%s«"
 
 #: commands/functioncmds.c:894 commands/functioncmds.c:2079
 #: commands/proclang.c:560
 #, c-format
 msgid "language \"%s\" does not exist"
-msgstr "Sprache „%s“ existiert nicht"
+msgstr "Sprache »%s« existiert nicht"
 
 #: commands/functioncmds.c:896 commands/functioncmds.c:2081
 #, c-format
@@ -6268,7 +6290,7 @@
 #: commands/functioncmds.c:931 commands/functioncmds.c:1197
 #, c-format
 msgid "only superuser can define a leakproof function"
-msgstr "nur Superuser können eine „leakproof“-Funktion definieren"
+msgstr "nur Superuser können eine »leakproof«-Funktion definieren"
 
 #: commands/functioncmds.c:975
 #, c-format
@@ -6423,7 +6445,7 @@
 #: commands/functioncmds.c:1736
 #, c-format
 msgid "first argument of transform function must be type \"internal\""
-msgstr "erstes Argument der Transformationsfunktion muss Typ „internal“ haben"
+msgstr "erstes Argument der Transformationsfunktion muss Typ »internal« haben"
 
 #: commands/functioncmds.c:1773
 #, c-format
@@ -6438,7 +6460,7 @@
 #: commands/functioncmds.c:1819
 #, c-format
 msgid "return data type of FROM SQL function must be \"internal\""
-msgstr "Rückgabetyp der FROM-SQL-Funktion muss „internal“ sein"
+msgstr "Rückgabetyp der FROM-SQL-Funktion muss »internal« sein"
 
 #: commands/functioncmds.c:1844
 #, c-format
@@ -6448,17 +6470,17 @@
 #: commands/functioncmds.c:1871
 #, c-format
 msgid "transform for type %s language \"%s\" already exists"
-msgstr "Transformation für Typ %s Sprache „%s“ existiert bereits"
+msgstr "Transformation für Typ %s Sprache »%s« existiert bereits"
 
 #: commands/functioncmds.c:1962
 #, c-format
 msgid "transform for type %s language \"%s\" does not exist"
-msgstr "Transformation für Typ %s Sprache „%s“ existiert nicht"
+msgstr "Transformation für Typ %s Sprache »%s« existiert nicht"
 
 #: commands/functioncmds.c:2013
 #, c-format
 msgid "function %s already exists in schema \"%s\""
-msgstr "Funktion %s existiert bereits in Schema „%s“"
+msgstr "Funktion %s existiert bereits in Schema »%s«"
 
 #: commands/functioncmds.c:2066
 #, c-format
@@ -6468,14 +6490,14 @@
 #: commands/functioncmds.c:2111
 #, c-format
 msgid "language \"%s\" does not support inline code execution"
-msgstr "Sprache „%s“ unterstützt das Ausführen von Inline-Code nicht"
+msgstr "Sprache »%s« unterstützt das Ausführen von Inline-Code nicht"
 
-#: commands/indexcmds.c:159 commands/indexcmds.c:487
+#: commands/indexcmds.c:159 commands/indexcmds.c:488
 #: commands/opclasscmds.c:360 commands/opclasscmds.c:786
 #: commands/opclasscmds.c:1749
 #, c-format
 msgid "access method \"%s\" does not exist"
-msgstr "Zugriffsmethode „%s“ existiert nicht"
+msgstr "Zugriffsmethode »%s« existiert nicht"
 
 #: commands/indexcmds.c:341
 #, c-format
@@ -6490,144 +6512,144 @@
 #: commands/indexcmds.c:376
 #, c-format
 msgid "cannot create index on foreign table \"%s\""
-msgstr "kann keinen Index für Fremdtabelle „%s“ erzeugen"
+msgstr "kann keinen Index für Fremdtabelle »%s« erzeugen"
 
 #: commands/indexcmds.c:391
 #, c-format
 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:446 commands/tablecmds.c:541 commands/tablecmds.c:9567
+#: commands/indexcmds.c:447 commands/tablecmds.c:542 commands/tablecmds.c:9665
 #, c-format
 msgid "only shared relations can be placed in pg_global tablespace"
-msgstr "nur geteilte Relationen können in den Tablespace „pg_global“ gelegt werden"
+msgstr "nur geteilte Relationen können in den Tablespace »pg_global« gelegt werden"
 
-#: commands/indexcmds.c:479
+#: commands/indexcmds.c:480
 #, c-format
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
-msgstr "ersetze Zugriffsmethode „gist“ für obsolete Methode „rtree“"
+msgstr "ersetze Zugriffsmethode »gist« für obsolete Methode »rtree«"
 
-#: commands/indexcmds.c:496
+#: commands/indexcmds.c:497
 #, c-format
 msgid "hash indexes are not WAL-logged and their use is discouraged"
 msgstr "Hash-Indexe werden nicht im WAL geloggt und von ihrer Verwendung wird abgeraten."
 
-#: commands/indexcmds.c:501
+#: commands/indexcmds.c:502
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
-msgstr "Zugriffsmethode „%s“ unterstützt keine Unique Indexe"
+msgstr "Zugriffsmethode »%s« unterstützt keine Unique Indexe"
 
-#: commands/indexcmds.c:506
+#: commands/indexcmds.c:507
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
-msgstr "Zugriffsmethode „%s“ unterstützt keine mehrspaltigen Indexe"
+msgstr "Zugriffsmethode »%s« unterstützt keine mehrspaltigen Indexe"
 
-#: commands/indexcmds.c:511
+#: commands/indexcmds.c:512
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
-msgstr "Zugriffsmethode „%s“ unterstützt keine Exclusion-Constraints"
+msgstr "Zugriffsmethode »%s« unterstützt keine Exclusion-Constraints"
 
-#: commands/indexcmds.c:590
+#: commands/indexcmds.c:591
 #, 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“"
+msgstr "%s %s erstellt implizit einen Index »%s« für Tabelle »%s«"
 
-#: commands/indexcmds.c:937
+#: commands/indexcmds.c:938
 #, c-format
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "Funktionen im Indexprädikat müssen als IMMUTABLE markiert sein"
 
-#: commands/indexcmds.c:1003 parser/parse_utilcmd.c:1844
+#: commands/indexcmds.c:1004 parser/parse_utilcmd.c:1846
 #, c-format
 msgid "column \"%s\" named in key does not exist"
-msgstr "Spalte „%s“, die im Schlüssel verwendet wird, existiert nicht"
+msgstr "Spalte »%s«, die im Schlüssel verwendet wird, existiert nicht"
 
-#: commands/indexcmds.c:1063
+#: commands/indexcmds.c:1064
 #, c-format
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr "Funktionen im Indexausdruck müssen als IMMUTABLE markiert sein"
 
-#: commands/indexcmds.c:1086
+#: commands/indexcmds.c:1087
 #, c-format
 msgid "could not determine which collation to use for index expression"
 msgstr "konnte die für den Indexausdruck zu verwendende Sortierfolge nicht bestimmen"
 
-#: commands/indexcmds.c:1094 commands/typecmds.c:825 parser/parse_expr.c:2559
-#: parser/parse_type.c:550 parser/parse_utilcmd.c:2736 utils/adt/misc.c:546
+#: commands/indexcmds.c:1095 commands/typecmds.c:825 parser/parse_expr.c:2583
+#: parser/parse_type.c:550 parser/parse_utilcmd.c:2738 utils/adt/misc.c:546
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "Sortierfolgen werden von Typ %s nicht unterstützt"
 
-#: commands/indexcmds.c:1132
+#: commands/indexcmds.c:1133
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "Operator %s ist nicht kommutativ"
 
-#: commands/indexcmds.c:1134
+#: commands/indexcmds.c:1135
 #, c-format
 msgid "Only commutative operators can be used in exclusion constraints."
 msgstr "In Exclusion-Constraints können nur kommutative Operatoren verwendet werden."
 
-#: commands/indexcmds.c:1160
+#: commands/indexcmds.c:1161
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
-msgstr "Operator %s ist kein Mitglied der Operatorfamilie „%s“"
+msgstr "Operator %s ist kein Mitglied der Operatorfamilie »%s«"
 
-#: commands/indexcmds.c:1163
+#: commands/indexcmds.c:1164
 #, c-format
 msgid "The exclusion operator must be related to the index operator class for the constraint."
 msgstr "Der Exklusionsoperator muss in Beziehung zur Indexoperatorklasse des Constraints stehen."
 
-#: commands/indexcmds.c:1198
+#: commands/indexcmds.c:1199
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
-msgstr "Zugriffsmethode „%s“ unterstützt die Optionen ASC/DESC nicht"
+msgstr "Zugriffsmethode »%s« unterstützt die Optionen ASC/DESC nicht"
 
-#: commands/indexcmds.c:1203
+#: commands/indexcmds.c:1204
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
-msgstr "Zugriffsmethode „%s“ unterstützt die Optionen NULLS FIRST/LAST nicht"
+msgstr "Zugriffsmethode »%s« unterstützt die Optionen NULLS FIRST/LAST nicht"
 
-#: commands/indexcmds.c:1259 commands/typecmds.c:1932
+#: commands/indexcmds.c:1260 commands/typecmds.c:1932
 #, 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“"
+msgstr "Datentyp %s hat keine Standardoperatorklasse für Zugriffsmethode »%s«"
 
-#: commands/indexcmds.c:1261
+#: commands/indexcmds.c:1262
 #, c-format
 msgid "You must specify an operator class for the index or define a default operator class for the data type."
 msgstr "Sie müssen für den Index eine Operatorklasse angeben oder eine Standardoperatorklasse für den Datentyp definieren."
 
-#: commands/indexcmds.c:1290 commands/indexcmds.c:1298
+#: commands/indexcmds.c:1291 commands/indexcmds.c:1299
 #: commands/opclasscmds.c:204
 #, c-format
 msgid "operator class \"%s\" does not exist for access method \"%s\""
-msgstr "Operatorklasse „%s“ existiert nicht für Zugriffsmethode „%s“"
+msgstr "Operatorklasse »%s« existiert nicht für Zugriffsmethode »%s«"
 
-#: commands/indexcmds.c:1311 commands/typecmds.c:1920
+#: commands/indexcmds.c:1312 commands/typecmds.c:1920
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
-msgstr "Operatorklasse „%s“ akzeptiert Datentyp %s nicht"
+msgstr "Operatorklasse »%s« akzeptiert Datentyp %s nicht"
 
-#: commands/indexcmds.c:1401
+#: commands/indexcmds.c:1402
 #, 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:1792
+#: commands/indexcmds.c:1793
 #, c-format
 msgid "table \"%s\" has no indexes"
-msgstr "Tabelle „%s“ hat keine Indexe"
+msgstr "Tabelle »%s« hat keine Indexe"
 
-#: commands/indexcmds.c:1847
+#: commands/indexcmds.c:1848
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "aktuell geöffnete Datenbank kann nicht reindiziert werden"
 
-#: commands/indexcmds.c:1949
+#: commands/indexcmds.c:1950
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
-msgstr "Tabelle „%s.%s“ wurde neu indiziert"
+msgstr "Tabelle »%s.%s« wurde neu indiziert"
 
 #: commands/matview.c:181
 #, c-format
@@ -6642,7 +6664,7 @@
 #: commands/matview.c:611
 #, c-format
 msgid "new data for materialized view \"%s\" contains duplicate rows without any null columns"
-msgstr "neue Daten für materialisierte Sicht „%s“ enthalten doppelte Zeilen ohne Spalten mit NULL-Werten"
+msgstr "neue Daten für materialisierte Sicht »%s« enthalten doppelte Zeilen ohne Spalten mit NULL-Werten"
 
 #: commands/matview.c:613
 #, c-format
@@ -6652,7 +6674,7 @@
 #: commands/matview.c:701
 #, c-format
 msgid "cannot refresh materialized view \"%s\" concurrently"
-msgstr "kann materialisierte Sicht „%s“ nicht nebenläufig auffrischen"
+msgstr "kann materialisierte Sicht »%s« nicht nebenläufig auffrischen"
 
 #: commands/matview.c:703
 #, c-format
@@ -6662,12 +6684,12 @@
 #: commands/opclasscmds.c:125
 #, c-format
 msgid "operator family \"%s\" does not exist for access method \"%s\""
-msgstr "Operatorfamilie „%s“ existiert nicht für Zugriffsmethode „%s“"
+msgstr "Operatorfamilie »%s« existiert nicht für Zugriffsmethode »%s«"
 
 #: commands/opclasscmds.c:263
 #, c-format
 msgid "operator family \"%s\" for access method \"%s\" already exists"
-msgstr "Operatorfamilie „%s“ für Zugriffsmethode „%s“ existiert bereits"
+msgstr "Operatorfamilie »%s« für Zugriffsmethode »%s« existiert bereits"
 
 #: commands/opclasscmds.c:399
 #, c-format
@@ -6694,22 +6716,22 @@
 #: commands/opclasscmds.c:581
 #, c-format
 msgid "storage type cannot be different from data type for access method \"%s\""
-msgstr "Storage-Typ kann nicht vom Datentyp der Zugriffsmethode „%s“ verschieden sein"
+msgstr "Storage-Typ kann nicht vom Datentyp der Zugriffsmethode »%s« verschieden sein"
 
 #: commands/opclasscmds.c:597
 #, c-format
 msgid "operator class \"%s\" for access method \"%s\" already exists"
-msgstr "Operatorklasse „%s“ für Zugriffsmethode „%s“ existiert bereits"
+msgstr "Operatorklasse »%s« für Zugriffsmethode »%s« existiert bereits"
 
 #: commands/opclasscmds.c:625
 #, c-format
 msgid "could not make operator class \"%s\" be default for type %s"
-msgstr "konnte Operatorklasse „%s“ nicht zum Standard für Typ %s machen"
+msgstr "konnte Operatorklasse »%s« nicht zum Standard für Typ %s machen"
 
 #: commands/opclasscmds.c:628
 #, c-format
 msgid "Operator class \"%s\" already is the default."
-msgstr "Operatorklasse „%s“ ist bereits der Standard."
+msgstr "Operatorklasse »%s« ist bereits der Standard."
 
 #: commands/opclasscmds.c:756
 #, c-format
@@ -6744,7 +6766,7 @@
 #: commands/opclasscmds.c:1113
 #, c-format
 msgid "access method \"%s\" does not support ordering operators"
-msgstr "Zugriffsmethode „%s“ unterstützt keine Sortieroperatoren"
+msgstr "Zugriffsmethode »%s« unterstützt keine Sortieroperatoren"
 
 #: commands/opclasscmds.c:1126
 #, c-format
@@ -6764,7 +6786,7 @@
 #: commands/opclasscmds.c:1189
 #, c-format
 msgid "btree sort support procedures must accept type \"internal\""
-msgstr "btree-Sortierunterstützungsprozeduren müssen Typ „internal“ akzeptieren"
+msgstr "btree-Sortierunterstützungsprozeduren müssen Typ »internal« akzeptieren"
 
 #: commands/opclasscmds.c:1193
 #, c-format
@@ -6799,32 +6821,32 @@
 #: commands/opclasscmds.c:1314
 #, c-format
 msgid "operator %d(%s,%s) already exists in operator family \"%s\""
-msgstr "Operator %d(%s,%s) existiert bereits in Operatorfamilie „%s“"
+msgstr "Operator %d(%s,%s) existiert bereits in Operatorfamilie »%s«"
 
 #: commands/opclasscmds.c:1430
 #, c-format
 msgid "function %d(%s,%s) already exists in operator family \"%s\""
-msgstr "Funktion %d(%s,%s) existiert bereits in Operatorfamilie „%s“"
+msgstr "Funktion %d(%s,%s) existiert bereits in Operatorfamilie »%s«"
 
 #: commands/opclasscmds.c:1520
 #, c-format
 msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
-msgstr "Operator %d(%s,%s) existiert nicht in Operatorfamilie „%s“"
+msgstr "Operator %d(%s,%s) existiert nicht in Operatorfamilie »%s«"
 
 #: commands/opclasscmds.c:1560
 #, c-format
 msgid "function %d(%s,%s) does not exist in operator family \"%s\""
-msgstr "Funktion %d(%s,%s) existiert nicht in Operatorfamilie „%s“"
+msgstr "Funktion %d(%s,%s) existiert nicht in Operatorfamilie »%s«"
 
 #: commands/opclasscmds.c:1705
 #, c-format
 msgid "operator class \"%s\" for access method \"%s\" already exists in schema \"%s\""
-msgstr "Operatorklasse „%s“ für Zugriffsmethode „%s“ existiert bereits in Schema „%s“"
+msgstr "Operatorklasse »%s« für Zugriffsmethode »%s« existiert bereits in Schema »%s«"
 
 #: commands/opclasscmds.c:1728
 #, c-format
 msgid "operator family \"%s\" for access method \"%s\" already exists in schema \"%s\""
-msgstr "Operatorfamilie „%s“ für Zugriffsmethode „%s“ existiert bereits in Schema „%s“"
+msgstr "Operatorfamilie »%s« für Zugriffsmethode »%s« existiert bereits in Schema »%s«"
 
 #: commands/operatorcmds.c:110 commands/operatorcmds.c:118
 #, c-format
@@ -6834,7 +6856,7 @@
 #: commands/operatorcmds.c:146
 #, c-format
 msgid "operator attribute \"%s\" not recognized"
-msgstr "Attribut „%s“ für Operator unbekannt"
+msgstr "Attribut »%s« für Operator unbekannt"
 
 #: commands/operatorcmds.c:156
 #, c-format
@@ -6849,23 +6871,23 @@
 #: commands/operatorcmds.c:235
 #, c-format
 msgid "restriction estimator function %s must return type \"float8\""
-msgstr "Restriktionsschätzfunktion %s muss Typ „float8“ zurückgeben"
+msgstr "Restriktionsschätzfunktion %s muss Typ »float8« zurückgeben"
 
 #: commands/operatorcmds.c:274
 #, c-format
 msgid "join estimator function %s must return type \"float8\""
-msgstr "Join-Schätzfunktion %s muss Typ „float8“ zurückgeben"
+msgstr "Join-Schätzfunktion %s muss Typ »float8« zurückgeben"
 
 #: commands/policy.c:87 commands/policy.c:390 commands/policy.c:479
-#: commands/tablecmds.c:966 commands/tablecmds.c:1308
-#: commands/tablecmds.c:2176 commands/tablecmds.c:4320
-#: commands/tablecmds.c:6249 commands/tablecmds.c:11886
-#: commands/tablecmds.c:11921 commands/trigger.c:240 commands/trigger.c:1126
+#: commands/tablecmds.c:967 commands/tablecmds.c:1309
+#: commands/tablecmds.c:2177 commands/tablecmds.c:4321
+#: commands/tablecmds.c:6250 commands/tablecmds.c:12044
+#: commands/tablecmds.c:12079 commands/trigger.c:240 commands/trigger.c:1126
 #: commands/trigger.c:1234 rewrite/rewriteDefine.c:273
 #: rewrite/rewriteDefine.c:917
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
-msgstr "keine Berechtigung: „%s“ ist ein Systemkatalog"
+msgstr "keine Berechtigung: »%s« ist ein Systemkatalog"
 
 #: commands/policy.c:170
 #, c-format
@@ -6880,7 +6902,7 @@
 #: commands/policy.c:503
 #, c-format
 msgid "role \"%s\" could not be removed from policy \"%s\" on \"%s\""
-msgstr "Rolle „%s“ konnte nicht aus Policy „%s“ für „%s“ entfernt werden"
+msgstr "Rolle »%s« konnte nicht aus Policy »%s« für »%s« entfernt werden"
 
 #: commands/policy.c:712
 #, c-format
@@ -6895,12 +6917,12 @@
 #: commands/policy.c:794 commands/policy.c:1244
 #, c-format
 msgid "policy \"%s\" for table \"%s\" already exists"
-msgstr "Policy „%s“ für Tabelle „%s“ existiert bereits"
+msgstr "Policy »%s« für Tabelle »%s« existiert bereits"
 
 #: commands/policy.c:993 commands/policy.c:1272 commands/policy.c:1347
 #, c-format
 msgid "policy \"%s\" for table \"%s\" does not exist"
-msgstr "Policy „%s“ für Tabelle „%s“ existiert nicht"
+msgstr "Policy »%s« für Tabelle »%s« existiert nicht"
 
 #: commands/policy.c:1011
 #, c-format
@@ -6914,10 +6936,10 @@
 msgstr "ungültiger Cursorname: darf nicht leer sein"
 
 #: commands/portalcmds.c:168 commands/portalcmds.c:222
-#: executor/execCurrent.c:67 utils/adt/xml.c:2391 utils/adt/xml.c:2558
+#: executor/execCurrent.c:67 utils/adt/xml.c:2401 utils/adt/xml.c:2571
 #, c-format
 msgid "cursor \"%s\" does not exist"
-msgstr "Cursor „%s“ existiert nicht"
+msgstr "Cursor »%s« existiert nicht"
 
 #: commands/portalcmds.c:407
 #, c-format
@@ -6947,7 +6969,7 @@
 #: commands/prepare.c:332
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
-msgstr "falsche Anzahl Parameter für vorbereitete Anweisung „%s“"
+msgstr "falsche Anzahl Parameter für vorbereitete Anweisung »%s«"
 
 #: commands/prepare.c:334
 #, c-format
@@ -6962,12 +6984,12 @@
 #: commands/prepare.c:464
 #, c-format
 msgid "prepared statement \"%s\" already exists"
-msgstr "vorbereitete Anweisung „%s“ existiert bereits"
+msgstr "vorbereitete Anweisung »%s« existiert bereits"
 
 #: commands/prepare.c:503
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
-msgstr "vorbereitete Anweisung „%s“ existiert nicht"
+msgstr "vorbereitete Anweisung »%s« existiert nicht"
 
 #: commands/proclang.c:87
 #, c-format
@@ -6977,17 +6999,17 @@
 #: commands/proclang.c:97
 #, c-format
 msgid "must be superuser to create procedural language \"%s\""
-msgstr "nur Superuser können prozedurale Sprache „%s“ erzeugen"
+msgstr "nur Superuser können prozedurale Sprache »%s« erzeugen"
 
 #: commands/proclang.c:117 commands/proclang.c:285
 #, c-format
 msgid "function %s must return type \"language_handler\""
-msgstr "Funktion %s muss Typ „language_handler“ zurückgeben"
+msgstr "Funktion %s muss Typ »language_handler« zurückgeben"
 
 #: commands/proclang.c:249
 #, c-format
 msgid "unsupported language \"%s\""
-msgstr "nicht unterstützte Sprache „%s“"
+msgstr "nicht unterstützte Sprache »%s«"
 
 #: commands/proclang.c:251
 #, c-format
@@ -7002,22 +7024,22 @@
 #: commands/proclang.c:278
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to \"language_handler\""
-msgstr "ändere Rückgabetyp von Funktion %s von „opaque“ in „language_handler“"
+msgstr "ändere Rückgabetyp von Funktion %s von »opaque« in »language_handler«"
 
 #: commands/schemacmds.c:99 commands/schemacmds.c:262
 #, c-format
 msgid "unacceptable schema name \"%s\""
-msgstr "inakzeptabler Schemaname „%s“"
+msgstr "inakzeptabler Schemaname »%s«"
 
 #: commands/schemacmds.c:100 commands/schemacmds.c:263
 #, c-format
 msgid "The prefix \"pg_\" is reserved for system schemas."
-msgstr "Der Präfix „pg_“ ist für Systemschemas reserviert."
+msgstr "Der Präfix »pg_« ist für Systemschemas reserviert."
 
 #: commands/schemacmds.c:114
 #, c-format
 msgid "schema \"%s\" already exists, skipping"
-msgstr "Schema „%s“ existiert bereits, wird übersprungen"
+msgstr "Schema »%s« existiert bereits, wird übersprungen"
 
 #: commands/seclabel.c:60
 #, c-format
@@ -7032,7 +7054,7 @@
 #: commands/seclabel.c:82
 #, c-format
 msgid "security label provider \"%s\" is not loaded"
-msgstr "Security-Label-Provider „%s“ ist nicht geladen"
+msgstr "Security-Label-Provider »%s« ist nicht geladen"
 
 #: commands/sequence.c:127
 #, c-format
@@ -7042,17 +7064,17 @@
 #: commands/sequence.c:651
 #, c-format
 msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
-msgstr "nextval: Maximalwert von Sequenz „%s“ erreicht (%s)"
+msgstr "nextval: Maximalwert von Sequenz »%s« erreicht (%s)"
 
 #: commands/sequence.c:674
 #, c-format
 msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
-msgstr "nextval: Minimalwert von Sequenz „%s“ erreicht (%s)"
+msgstr "nextval: Minimalwert von Sequenz »%s« erreicht (%s)"
 
 #: commands/sequence.c:792
 #, c-format
 msgid "currval of sequence \"%s\" is not yet defined in this session"
-msgstr "currval von Sequenz „%s“ ist in dieser Sitzung noch nicht definiert"
+msgstr "currval von Sequenz »%s« ist in dieser Sitzung noch nicht definiert"
 
 #: commands/sequence.c:811 commands/sequence.c:817
 #, c-format
@@ -7062,7 +7084,7 @@
 #: commands/sequence.c:893
 #, c-format
 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)"
+msgstr "setval: Wert %s ist außerhalb des gültigen Bereichs von Sequenz »%s« (%s..%s)"
 
 #: commands/sequence.c:1267
 #, c-format
@@ -7112,7 +7134,7 @@
 #: commands/sequence.c:1473
 #, c-format
 msgid "referenced relation \"%s\" is not a table or foreign table"
-msgstr "Relation „%s“, auf die verwiesen wird, ist keine Tabelle oder Fremdtabelle"
+msgstr "Relation »%s«, auf die verwiesen wird, ist keine Tabelle oder Fremdtabelle"
 
 #: commands/sequence.c:1480
 #, c-format
@@ -7124,162 +7146,162 @@
 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:213
+#: commands/tablecmds.c:214
 #, c-format
 msgid "table \"%s\" does not exist"
-msgstr "Tabelle „%s“ existiert nicht"
+msgstr "Tabelle »%s« existiert nicht"
 
-#: commands/tablecmds.c:214
+#: commands/tablecmds.c:215
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
-msgstr "Tabelle „%s“ existiert nicht, wird übersprungen"
+msgstr "Tabelle »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:216
+#: commands/tablecmds.c:217
 msgid "Use DROP TABLE to remove a table."
 msgstr "Verwenden Sie DROP TABLE, um eine Tabelle zu löschen."
 
-#: commands/tablecmds.c:219
+#: commands/tablecmds.c:220
 #, c-format
 msgid "sequence \"%s\" does not exist"
-msgstr "Sequenz „%s“ existiert nicht"
+msgstr "Sequenz »%s« existiert nicht"
 
-#: commands/tablecmds.c:220
+#: commands/tablecmds.c:221
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
-msgstr "Sequenz „%s“ existiert nicht, wird übersprungen"
+msgstr "Sequenz »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:222
+#: commands/tablecmds.c:223
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Verwenden Sie DROP SEQUENCE, um eine Sequenz zu löschen."
 
-#: commands/tablecmds.c:225
+#: commands/tablecmds.c:226
 #, c-format
 msgid "view \"%s\" does not exist"
-msgstr "Sicht „%s“ existiert nicht"
+msgstr "Sicht »%s« existiert nicht"
 
-#: commands/tablecmds.c:226
+#: commands/tablecmds.c:227
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
-msgstr "Sicht „%s“ existiert nicht, wird übersprungen"
+msgstr "Sicht »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:228
+#: commands/tablecmds.c:229
 msgid "Use DROP VIEW to remove a view."
 msgstr "Verwenden Sie DROP VIEW, um eine Sicht zu löschen."
 
-#: commands/tablecmds.c:231
+#: commands/tablecmds.c:232
 #, c-format
 msgid "materialized view \"%s\" does not exist"
-msgstr "materialisierte Sicht „%s“ existiert nicht"
+msgstr "materialisierte Sicht »%s« existiert nicht"
 
-#: commands/tablecmds.c:232
+#: commands/tablecmds.c:233
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
-msgstr "materialisierte Sicht „%s“ existiert nicht, wird übersprungen"
+msgstr "materialisierte Sicht »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:234
+#: commands/tablecmds.c:235
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "Verwenden Sie DROP MATERIALIZED VIEW, um eine materialisierte Sicht zu löschen."
 
-#: commands/tablecmds.c:237 parser/parse_utilcmd.c:1593
+#: commands/tablecmds.c:238 parser/parse_utilcmd.c:1595
 #, c-format
 msgid "index \"%s\" does not exist"
-msgstr "Index „%s“ existiert nicht"
+msgstr "Index »%s« existiert nicht"
 
-#: commands/tablecmds.c:238
+#: commands/tablecmds.c:239
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
-msgstr "Index „%s“ existiert nicht, wird übersprungen"
+msgstr "Index »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:240
+#: commands/tablecmds.c:241
 msgid "Use DROP INDEX to remove an index."
 msgstr "Verwenden Sie DROP INDEX, um einen Index zu löschen."
 
-#: commands/tablecmds.c:245
+#: commands/tablecmds.c:246
 #, c-format
 msgid "\"%s\" is not a type"
-msgstr "„%s“ ist kein Typ"
+msgstr "»%s« ist kein Typ"
 
-#: commands/tablecmds.c:246
+#: commands/tablecmds.c:247
 msgid "Use DROP TYPE to remove a type."
 msgstr "Verwenden Sie DROP TYPE, um einen Typen zu löschen."
 
-#: commands/tablecmds.c:249 commands/tablecmds.c:8456
-#: commands/tablecmds.c:11153
+#: commands/tablecmds.c:250 commands/tablecmds.c:8554
+#: commands/tablecmds.c:11305
 #, c-format
 msgid "foreign table \"%s\" does not exist"
-msgstr "Fremdtabelle „%s“ existiert nicht"
+msgstr "Fremdtabelle »%s« existiert nicht"
 
-#: commands/tablecmds.c:250
+#: commands/tablecmds.c:251
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
-msgstr "Fremdtabelle „%s“ existiert nicht, wird übersprungen"
+msgstr "Fremdtabelle »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:252
+#: commands/tablecmds.c:253
 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:489
+#: commands/tablecmds.c:490
 #, c-format
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT kann nur mit temporären Tabellen verwendet werden"
 
-#: commands/tablecmds.c:509
+#: commands/tablecmds.c:510
 #, c-format
 msgid "cannot create temporary table within security-restricted operation"
 msgstr "kann temporäre Tabelle nicht in einer sicherheitsbeschränkten Operation erzeugen"
 
-#: commands/tablecmds.c:817
+#: commands/tablecmds.c:818
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support dropping multiple objects"
 msgstr "DROP INDEX CONCURRENTLY unterstützt das Löschen von mehreren Objekten nicht"
 
-#: commands/tablecmds.c:821
+#: commands/tablecmds.c:822
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY unterstützt kein CASCADE"
 
-#: commands/tablecmds.c:1080
+#: commands/tablecmds.c:1081
 #, c-format
 msgid "truncate cascades to table \"%s\""
-msgstr "Truncate-Vorgang leert ebenfalls Tabelle „%s“"
+msgstr "Truncate-Vorgang leert ebenfalls Tabelle »%s«"
 
-#: commands/tablecmds.c:1318
+#: commands/tablecmds.c:1319
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht leeren"
 
-#: commands/tablecmds.c:1524 parser/parse_utilcmd.c:1807
+#: commands/tablecmds.c:1525 parser/parse_utilcmd.c:1809
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
-msgstr "geerbte Relation „%s“ ist keine Tabelle oder Fremdtabelle"
+msgstr "geerbte Relation »%s« ist keine Tabelle oder Fremdtabelle"
 
-#: commands/tablecmds.c:1531 commands/tablecmds.c:10023
+#: commands/tablecmds.c:1532 commands/tablecmds.c:10121
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
-msgstr "von temporärer Relation „%s“ kann nicht geerbt werden"
+msgstr "von temporärer Relation »%s« kann nicht geerbt werden"
 
-#: commands/tablecmds.c:1539 commands/tablecmds.c:10031
+#: commands/tablecmds.c:1540 commands/tablecmds.c:10129
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "von temporärer Relation einer anderen Sitzung kann nicht geerbt werden"
 
-#: commands/tablecmds.c:1555 commands/tablecmds.c:10065
+#: commands/tablecmds.c:1556 commands/tablecmds.c:10163
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
-msgstr "von der Relation „%s“ würde mehrmals geerbt werden"
+msgstr "von der Relation »%s« würde mehrmals geerbt werden"
 
-#: commands/tablecmds.c:1603
+#: commands/tablecmds.c:1604
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
-msgstr "geerbte Definitionen von Spalte „%s“ werden zusammengeführt"
+msgstr "geerbte Definitionen von Spalte »%s« werden zusammengeführt"
 
-#: commands/tablecmds.c:1611
+#: commands/tablecmds.c:1612
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
-msgstr "geerbte Spalte „%s“ hat Typkonflikt"
+msgstr "geerbte Spalte »%s« hat Typkonflikt"
 
-#: commands/tablecmds.c:1613 commands/tablecmds.c:1634
-#: commands/tablecmds.c:1832 commands/tablecmds.c:1854
+#: commands/tablecmds.c:1614 commands/tablecmds.c:1635
+#: commands/tablecmds.c:1833 commands/tablecmds.c:1855
 #: parser/parse_coerce.c:1630 parser/parse_coerce.c:1650
 #: parser/parse_coerce.c:1670 parser/parse_coerce.c:1715
 #: parser/parse_coerce.c:1752 parser/parse_param.c:218
@@ -7287,763 +7309,779 @@
 msgid "%s versus %s"
 msgstr "%s gegen %s"
 
-#: commands/tablecmds.c:1620
+#: commands/tablecmds.c:1621
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
-msgstr "geerbte Spalte „%s“ hat Sortierfolgenkonflikt"
+msgstr "geerbte Spalte »%s« hat Sortierfolgenkonflikt"
 
-#: commands/tablecmds.c:1622 commands/tablecmds.c:1842
-#: commands/tablecmds.c:4757
+#: commands/tablecmds.c:1623 commands/tablecmds.c:1843
+#: commands/tablecmds.c:4758
 #, c-format
 msgid "\"%s\" versus \"%s\""
-msgstr "„%s“ gegen „%s“"
+msgstr "»%s« gegen »%s«"
 
-#: commands/tablecmds.c:1632
+#: commands/tablecmds.c:1633
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
-msgstr "geerbte Spalte „%s“ hat einen Konflikt bei einem Storage-Parameter"
+msgstr "geerbte Spalte »%s« hat einen Konflikt bei einem Storage-Parameter"
 
-#: commands/tablecmds.c:1745 parser/parse_utilcmd.c:894
-#: parser/parse_utilcmd.c:1238 parser/parse_utilcmd.c:1314
+#: commands/tablecmds.c:1746 commands/tablecmds.c:8059
+#: parser/parse_utilcmd.c:894 parser/parse_utilcmd.c:1240
+#: parser/parse_utilcmd.c:1316
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "kann Verweis auf ganze Zeile der Tabelle nicht umwandeln"
 
-#: commands/tablecmds.c:1746 parser/parse_utilcmd.c:895
+#: commands/tablecmds.c:1747 parser/parse_utilcmd.c:895
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
-msgstr "Constraint „%s“ enthält einen Verweis auf die ganze Zeile der Tabelle „%s“."
+msgstr "Constraint »%s« enthält einen Verweis auf die ganze Zeile der Tabelle »%s«."
 
-#: commands/tablecmds.c:1818
+#: commands/tablecmds.c:1819
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
-msgstr "Spalte „%s“ wird mit geerbter Definition zusammengeführt"
+msgstr "Spalte »%s« wird mit geerbter Definition zusammengeführt"
 
-#: commands/tablecmds.c:1822
+#: commands/tablecmds.c:1823
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
-msgstr "Spalte „%s“ wird verschoben und mit geerbter Definition zusammengeführt"
+msgstr "Spalte »%s« wird verschoben und mit geerbter Definition zusammengeführt"
 
-#: commands/tablecmds.c:1823
+#: commands/tablecmds.c:1824
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
 msgstr "Benutzerdefinierte Spalte wurde auf die Position der geerbten Spalte verschoben."
 
-#: commands/tablecmds.c:1830
+#: commands/tablecmds.c:1831
 #, c-format
 msgid "column \"%s\" has a type conflict"
-msgstr "für Spalte „%s“ besteht ein Typkonflikt"
+msgstr "für Spalte »%s« besteht ein Typkonflikt"
 
-#: commands/tablecmds.c:1840
+#: commands/tablecmds.c:1841
 #, c-format
 msgid "column \"%s\" has a collation conflict"
-msgstr "für Spalte „%s“ besteht ein Sortierfolgenkonflikt"
+msgstr "für Spalte »%s« besteht ein Sortierfolgenkonflikt"
 
-#: commands/tablecmds.c:1852
+#: commands/tablecmds.c:1853
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
-msgstr "für Spalte „%s“ besteht ein Konflikt bei einem Storage-Parameter"
+msgstr "für Spalte »%s« besteht ein Konflikt bei einem Storage-Parameter"
 
-#: commands/tablecmds.c:1904
+#: commands/tablecmds.c:1905
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
-msgstr "Spalte „%s“ erbt widersprüchliche Vorgabewerte"
+msgstr "Spalte »%s« erbt widersprüchliche Vorgabewerte"
 
-#: commands/tablecmds.c:1906
+#: commands/tablecmds.c:1907
 #, c-format
 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:1953
+#: commands/tablecmds.c:1954
 #, c-format
 msgid "check constraint name \"%s\" appears multiple times but with different expressions"
-msgstr "Check-Constraint-Name „%s“ erscheint mehrmals, aber mit unterschiedlichen Ausdrücken"
+msgstr "Check-Constraint-Name »%s« erscheint mehrmals, aber mit unterschiedlichen Ausdrücken"
 
-#: commands/tablecmds.c:2147
+#: commands/tablecmds.c:2148
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "Spalte einer getypten Tabelle kann nicht umbenannt werden"
 
-#: commands/tablecmds.c:2164
+#: commands/tablecmds.c:2165
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, composite type, index, or foreign table"
-msgstr "„%s“ ist weder Tabelle, Sicht, materialisierte Sicht, zusammengesetzter Typ, Index noch Fremdtabelle"
+msgstr "»%s« ist weder Tabelle, Sicht, materialisierte Sicht, zusammengesetzter Typ, Index noch Fremdtabelle"
 
-#: commands/tablecmds.c:2258
+#: commands/tablecmds.c:2259
 #, 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"
+msgstr "vererbte Spalte »%s« muss ebenso in den abgeleiteten Tabellen umbenannt werden"
 
-#: commands/tablecmds.c:2290
+#: commands/tablecmds.c:2291
 #, c-format
 msgid "cannot rename system column \"%s\""
-msgstr "Systemspalte „%s“ kann nicht umbenannt werden"
+msgstr "Systemspalte »%s« kann nicht umbenannt werden"
 
-#: commands/tablecmds.c:2305
+#: commands/tablecmds.c:2306
 #, c-format
 msgid "cannot rename inherited column \"%s\""
-msgstr "kann vererbte Spalte „%s“ nicht umbenennen"
+msgstr "kann vererbte Spalte »%s« nicht umbenennen"
 
-#: commands/tablecmds.c:2460
+#: commands/tablecmds.c:2461
 #, c-format
 msgid "inherited constraint \"%s\" must be renamed in child tables too"
-msgstr "vererbter Constraint „%s“ muss ebenso in den abgeleiteten Tabellen umbenannt werden"
+msgstr "vererbter Constraint »%s« muss ebenso in den abgeleiteten Tabellen umbenannt werden"
 
-#: commands/tablecmds.c:2467
+#: commands/tablecmds.c:2468
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
-msgstr "kann vererbten Constraint „%s“ nicht umbenennen"
+msgstr "kann vererbten Constraint »%s« nicht umbenennen"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2693
+#: commands/tablecmds.c:2694
 #, c-format
 msgid "cannot %s \"%s\" because it is being used by active queries in this session"
-msgstr "%s mit Relation „%s“ nicht möglich, weil sie von aktiven Anfragen in dieser Sitzung verwendet wird"
+msgstr "%s mit Relation »%s« nicht möglich, weil sie von aktiven Anfragen in dieser Sitzung verwendet wird"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2702
+#: commands/tablecmds.c:2703
 #, 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"
+msgstr "%s mit Relation »%s« nicht möglich, weil es anstehende Trigger-Ereignisse dafür gibt"
 
-#: commands/tablecmds.c:3776
+#: commands/tablecmds.c:3777
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
-msgstr "Systemrelation „%s“ kann nicht neu geschrieben werden"
+msgstr "Systemrelation »%s« kann nicht neu geschrieben werden"
 
-#: commands/tablecmds.c:3782
+#: commands/tablecmds.c:3783
 #, c-format
 msgid "cannot rewrite table \"%s\" used as a catalog table"
-msgstr "Tabelle „%s“, die als Katalogtabelle verwendet wird, kann nicht neu geschrieben werden"
+msgstr "Tabelle »%s«, die als Katalogtabelle verwendet wird, kann nicht neu geschrieben werden"
 
-#: commands/tablecmds.c:3792
+#: commands/tablecmds.c:3793
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht neu schreiben"
 
-#: commands/tablecmds.c:4060
+#: commands/tablecmds.c:4061
 #, c-format
 msgid "rewriting table \"%s\""
-msgstr "schreibe Tabelle „%s“ neu"
+msgstr "schreibe Tabelle »%s« neu"
 
-#: commands/tablecmds.c:4064
+#: commands/tablecmds.c:4065
 #, c-format
 msgid "verifying table \"%s\""
-msgstr "überprüfe Tabelle „%s“"
+msgstr "überprüfe Tabelle »%s«"
 
-#: commands/tablecmds.c:4178
+#: commands/tablecmds.c:4179
 #, c-format
 msgid "column \"%s\" contains null values"
-msgstr "Spalte „%s“ enthält NULL-Werte"
+msgstr "Spalte »%s« enthält NULL-Werte"
 
-#: commands/tablecmds.c:4193 commands/tablecmds.c:7336
+#: commands/tablecmds.c:4194 commands/tablecmds.c:7356
 #, c-format
 msgid "check constraint \"%s\" is violated by some row"
-msgstr "Check-Constraint „%s“ wird von irgendeiner Zeile verletzt"
+msgstr "Check-Constraint »%s« wird von irgendeiner Zeile verletzt"
 
-#: commands/tablecmds.c:4341 commands/trigger.c:234
+#: commands/tablecmds.c:4342 commands/trigger.c:234
 #: rewrite/rewriteDefine.c:267 rewrite/rewriteDefine.c:912
 #, c-format
 msgid "\"%s\" is not a table or view"
-msgstr "„%s“ ist keine Tabelle oder Sicht"
+msgstr "»%s« ist keine Tabelle oder Sicht"
 
-#: commands/tablecmds.c:4344 commands/trigger.c:1120 commands/trigger.c:1225
+#: commands/tablecmds.c:4345 commands/trigger.c:1120 commands/trigger.c:1225
 #, c-format
 msgid "\"%s\" is not a table, view, or foreign table"
-msgstr "„%s“ ist keine Tabelle, Sicht oder Fremdtabelle"
+msgstr "»%s« ist keine Tabelle, Sicht oder Fremdtabelle"
 
-#: commands/tablecmds.c:4347
+#: commands/tablecmds.c:4348
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, or index"
-msgstr "„%s“ ist weder Tabelle, Sicht, materialisierte Sicht noch Index"
+msgstr "»%s« ist weder Tabelle, Sicht, materialisierte Sicht noch Index"
 
-#: commands/tablecmds.c:4353
+#: commands/tablecmds.c:4354
 #, c-format
 msgid "\"%s\" is not a table, materialized view, or index"
-msgstr "„%s“ ist weder Tabelle, materialisierte Sicht noch Index"
+msgstr "»%s« ist weder Tabelle, materialisierte Sicht noch Index"
 
-#: commands/tablecmds.c:4356
+#: commands/tablecmds.c:4357
 #, c-format
 msgid "\"%s\" is not a table, materialized view, or foreign table"
-msgstr "„%s“ ist weder Tabelle, materialisierte Sicht noch Fremdtabelle"
+msgstr "»%s« ist weder Tabelle, materialisierte Sicht noch Fremdtabelle"
 
-#: commands/tablecmds.c:4359
+#: commands/tablecmds.c:4360
 #, c-format
 msgid "\"%s\" is not a table or foreign table"
-msgstr "„%s“ ist keine Tabelle oder Fremdtabelle"
+msgstr "»%s« ist keine Tabelle oder Fremdtabelle"
 
-#: commands/tablecmds.c:4362
+#: commands/tablecmds.c:4363
 #, c-format
 msgid "\"%s\" is not a table, composite type, or foreign table"
-msgstr "„%s“ ist weder Tabelle, Sicht, zusammengesetzter Typ noch Fremdtabelle"
+msgstr "»%s« ist weder Tabelle, Sicht, zusammengesetzter Typ noch Fremdtabelle"
 
-#: commands/tablecmds.c:4365 commands/tablecmds.c:5395
+#: commands/tablecmds.c:4366 commands/tablecmds.c:5396
 #, c-format
 msgid "\"%s\" is not a table, materialized view, index, or foreign table"
-msgstr "„%s“ ist weder Tabelle, materialisierte Sicht, Index noch Fremdtabelle"
+msgstr "»%s« ist weder Tabelle, materialisierte Sicht, Index noch Fremdtabelle"
 
-#: commands/tablecmds.c:4375
+#: commands/tablecmds.c:4376
 #, c-format
 msgid "\"%s\" is of the wrong type"
-msgstr "„%s“ hat den falschen Typ"
+msgstr "»%s« hat den falschen Typ"
 
-#: commands/tablecmds.c:4527 commands/tablecmds.c:4534
+#: commands/tablecmds.c:4528 commands/tablecmds.c:4535
 #, c-format
 msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
-msgstr "kann Typ „%s“ nicht ändern, weil Spalte „%s.%s“ ihn verwendet"
+msgstr "kann Typ »%s« nicht ändern, weil Spalte »%s.%s« ihn verwendet"
 
-#: commands/tablecmds.c:4541
+#: commands/tablecmds.c:4542
 #, c-format
 msgid "cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
-msgstr "kann Fremdtabelle „%s“ nicht ändern, weil Spalte „%s.%s“ ihren Zeilentyp verwendet"
+msgstr "kann Fremdtabelle »%s« nicht ändern, weil Spalte »%s.%s« ihren Zeilentyp verwendet"
 
-#: commands/tablecmds.c:4548
+#: commands/tablecmds.c:4549
 #, c-format
 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"
+msgstr "kann Tabelle »%s« nicht ändern, weil Spalte »%s.%s« ihren Zeilentyp verwendet"
 
-#: commands/tablecmds.c:4610
+#: commands/tablecmds.c:4611
 #, 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"
+msgstr "kann Typ »%s« nicht ändern, weil er der Typ einer getypten Tabelle ist"
 
-#: commands/tablecmds.c:4612
+#: commands/tablecmds.c:4613
 #, c-format
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
 msgstr "Verwenden Sie ALTER ... CASCADE, um die getypten Tabellen ebenfalls zu ändern."
 
-#: commands/tablecmds.c:4656
+#: commands/tablecmds.c:4657
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "Typ %s ist kein zusammengesetzter Typ"
 
-#: commands/tablecmds.c:4682
+#: commands/tablecmds.c:4683
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "zu einer getypten Tabelle kann keine Spalte hinzugefügt werden"
 
-#: commands/tablecmds.c:4749 commands/tablecmds.c:10224
+#: commands/tablecmds.c:4750 commands/tablecmds.c:10322
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
-msgstr "abgeleitete Tabelle „%s“ hat unterschiedlichen Typ für Spalte „%s“"
+msgstr "abgeleitete Tabelle »%s« hat unterschiedlichen Typ für Spalte »%s«"
 
-#: commands/tablecmds.c:4755 commands/tablecmds.c:10231
+#: commands/tablecmds.c:4756 commands/tablecmds.c:10329
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
-msgstr "abgeleitete Tabelle „%s“ hat unterschiedliche Sortierfolge für Spalte „%s“"
+msgstr "abgeleitete Tabelle »%s« hat unterschiedliche Sortierfolge für Spalte »%s«"
 
-#: commands/tablecmds.c:4765
+#: commands/tablecmds.c:4766
 #, c-format
 msgid "child table \"%s\" has a conflicting \"%s\" column"
-msgstr "abgeleitete Tabelle „%s“ hat eine widersprüchliche Spalte „%s“"
+msgstr "abgeleitete Tabelle »%s« hat eine widersprüchliche Spalte »%s«"
 
-#: commands/tablecmds.c:4777
+#: commands/tablecmds.c:4778
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
-msgstr "Definition von Spalte „%s“ für abgeleitete Tabelle „%s“ wird zusammengeführt"
+msgstr "Definition von Spalte »%s« für abgeleitete Tabelle »%s« wird zusammengeführt"
 
-#: commands/tablecmds.c:4998
+#: commands/tablecmds.c:4999
 #, c-format
 msgid "column must be added to child tables too"
 msgstr "Spalte muss ebenso in den abgeleiteten Tabellen hinzugefügt werden"
 
-#: commands/tablecmds.c:5068
+#: commands/tablecmds.c:5069
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
-msgstr "Spalte „%s“ von Relation „%s“ existiert bereits"
+msgstr "Spalte »%s« von Relation »%s« existiert bereits"
 
-#: commands/tablecmds.c:5176 commands/tablecmds.c:5282
-#: commands/tablecmds.c:5340 commands/tablecmds.c:5454
-#: commands/tablecmds.c:5511 commands/tablecmds.c:5605
-#: commands/tablecmds.c:7854 commands/tablecmds.c:8479
+#: commands/tablecmds.c:5177 commands/tablecmds.c:5283
+#: commands/tablecmds.c:5341 commands/tablecmds.c:5455
+#: commands/tablecmds.c:5512 commands/tablecmds.c:5606
+#: commands/tablecmds.c:7895 commands/tablecmds.c:8577
 #, c-format
 msgid "cannot alter system column \"%s\""
-msgstr "Systemspalte „%s“ kann nicht geändert werden"
+msgstr "Systemspalte »%s« kann nicht geändert werden"
 
-#: commands/tablecmds.c:5212
+#: commands/tablecmds.c:5213
 #, c-format
 msgid "column \"%s\" is in a primary key"
-msgstr "Spalte „%s“ ist in einem Primärschlüssel"
+msgstr "Spalte »%s« ist in einem Primärschlüssel"
 
-#: commands/tablecmds.c:5427
+#: commands/tablecmds.c:5428
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "Statistikziel %d ist zu niedrig"
 
-#: commands/tablecmds.c:5435
+#: commands/tablecmds.c:5436
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "setze Statistikziel auf %d herab"
 
-#: commands/tablecmds.c:5585
+#: commands/tablecmds.c:5586
 #, c-format
 msgid "invalid storage type \"%s\""
-msgstr "ungültiger Storage-Typ „%s“"
+msgstr "ungültiger Storage-Typ »%s«"
 
-#: commands/tablecmds.c:5617
+#: commands/tablecmds.c:5618
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "Spaltendatentyp %s kann nur Storage-Typ PLAIN"
 
-#: commands/tablecmds.c:5655
+#: commands/tablecmds.c:5656
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "aus einer getypten Tabelle können keine Spalten gelöscht werden"
 
-#: commands/tablecmds.c:5699
+#: commands/tablecmds.c:5700
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "Spalte „%s“ von Relation „%s“ existiert nicht, wird übersprungen"
+msgstr "Spalte »%s« von Relation »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:5712
+#: commands/tablecmds.c:5713
 #, c-format
 msgid "cannot drop system column \"%s\""
-msgstr "Systemspalte „%s“ kann nicht gelöscht werden"
+msgstr "Systemspalte »%s« kann nicht gelöscht werden"
 
-#: commands/tablecmds.c:5719
+#: commands/tablecmds.c:5720
 #, c-format
 msgid "cannot drop inherited column \"%s\""
-msgstr "geerbte Spalte „%s“ kann nicht gelöscht werden"
+msgstr "geerbte Spalte »%s« kann nicht gelöscht werden"
 
-#: commands/tablecmds.c:5959
+#: commands/tablecmds.c:5960
 #, 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“"
+msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX benennt Index »%s« um in »%s«"
 
-#: commands/tablecmds.c:6172
+#: commands/tablecmds.c:6173
 #, c-format
 msgid "constraint must be added to child tables too"
 msgstr "Constraint muss ebenso in den abgeleiteten Tabellen hinzugefügt werden"
 
-#: commands/tablecmds.c:6243
+#: commands/tablecmds.c:6244
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
-msgstr "Relation „%s“, auf die verwiesen wird, ist keine Tabelle"
+msgstr "Relation »%s«, auf die verwiesen wird, ist keine Tabelle"
 
-#: commands/tablecmds.c:6266
+#: commands/tablecmds.c:6267
 #, c-format
 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:6273
+#: commands/tablecmds.c:6274
 #, c-format
 msgid "constraints on unlogged tables may reference only permanent or unlogged tables"
 msgstr "Constraints für ungeloggte Tabellen dürfen nur auf permanente oder ungeloggte Tabellen verweisen"
 
-#: commands/tablecmds.c:6279
+#: commands/tablecmds.c:6280
 #, c-format
 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:6283
+#: commands/tablecmds.c:6284
 #, c-format
 msgid "constraints on temporary tables must involve temporary tables of this session"
 msgstr "Constraints für temporäre Tabellen müssen temporäre Tabellen dieser Sitzung beinhalten"
 
-#: commands/tablecmds.c:6344
+#: commands/tablecmds.c:6345
 #, c-format
 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:6451
+#: commands/tablecmds.c:6452
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
-msgstr "Fremdschlüssel-Constraint „%s“ kann nicht implementiert werden"
+msgstr "Fremdschlüssel-Constraint »%s« kann nicht implementiert werden"
 
-#: commands/tablecmds.c:6454
+#: commands/tablecmds.c:6455
 #, 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."
+msgstr "Schlüsselspalten »%s« und »%s« haben inkompatible Typen: %s und %s."
 
-#: commands/tablecmds.c:6661 commands/tablecmds.c:6811
-#: commands/tablecmds.c:7693 commands/tablecmds.c:7749
+#: commands/tablecmds.c:6662 commands/tablecmds.c:6830
+#: commands/tablecmds.c:7734 commands/tablecmds.c:7790
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
-msgstr "Constraint „%s“ von Relation „%s“ existiert nicht"
+msgstr "Constraint »%s« von Relation »%s« existiert nicht"
 
-#: commands/tablecmds.c:6667
+#: commands/tablecmds.c:6668
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
-msgstr "Constraint „%s“ von Relation „%s“ ist kein Fremdschlüssel-Constraint"
+msgstr "Constraint »%s« von Relation »%s« ist kein Fremdschlüssel-Constraint"
 
-#: commands/tablecmds.c:6818
+#: commands/tablecmds.c:6837
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key or check constraint"
-msgstr "Constraint „%s“ von Relation „%s“ ist kein Fremdschlüssel- oder Check-Constraint"
+msgstr "Constraint »%s« von Relation »%s« ist kein Fremdschlüssel- oder Check-Constraint"
 
-#: commands/tablecmds.c:6886
+#: commands/tablecmds.c:6906
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "Constraint muss ebenso in den abgeleiteten Tabellen validiert werden"
 
-#: commands/tablecmds.c:6955
+#: commands/tablecmds.c:6975
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
-msgstr "Spalte „%s“, die im Fremdschlüssel verwendet wird, existiert nicht"
+msgstr "Spalte »%s«, die im Fremdschlüssel verwendet wird, existiert nicht"
 
-#: commands/tablecmds.c:6960
+#: commands/tablecmds.c:6980
 #, 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:7025
+#: commands/tablecmds.c:7045
 #, 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"
+msgstr "aufschiebbarer Primärschlüssel kann nicht für Tabelle »%s«, auf die verwiesen wird, verwendet werden"
 
-#: commands/tablecmds.c:7042
+#: commands/tablecmds.c:7062
 #, 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"
+msgstr "in Tabelle »%s«, auf die verwiesen wird, gibt es keinen Primärschlüssel"
 
-#: commands/tablecmds.c:7107
+#: commands/tablecmds.c:7127
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr "die Liste der Spalten, auf die ein Fremdschlüssel verweist, darf keine doppelten Einträge enthalten"
 
-#: commands/tablecmds.c:7201
+#: commands/tablecmds.c:7221
 #, 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"
+msgstr "aufschiebbarer Unique-Constraint kann nicht für Tabelle »%s«, auf die verwiesen wird, verwendet werden"
 
-#: commands/tablecmds.c:7206
+#: commands/tablecmds.c:7226
 #, 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, der auf die angegebenen Schlüssel passt"
+msgstr "in Tabelle »%s«, auf die verwiesen wird, gibt es keinen Unique-Constraint, der auf die angegebenen Schlüssel passt"
 
-#: commands/tablecmds.c:7369
+#: commands/tablecmds.c:7389
 #, c-format
 msgid "validating foreign key constraint \"%s\""
-msgstr "validiere Fremdschlüssel-Constraint „%s“"
+msgstr "validiere Fremdschlüssel-Constraint »%s«"
 
-#: commands/tablecmds.c:7665
+#: commands/tablecmds.c:7688
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
-msgstr "geerbter Constraint „%s“ von Relation „%s“ kann nicht gelöscht werden"
+msgstr "geerbter Constraint »%s« von Relation »%s« kann nicht gelöscht werden"
 
-#: commands/tablecmds.c:7699
+#: commands/tablecmds.c:7740
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "Constraint „%s“ von Relation „%s“ existiert nicht, wird übersprungen"
+msgstr "Constraint »%s« von Relation »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:7838
+#: commands/tablecmds.c:7879
 #, c-format
 msgid "cannot alter column type of typed table"
 msgstr "Spaltentyp einer getypten Tabelle kann nicht geändert werden"
 
-#: commands/tablecmds.c:7861
+#: commands/tablecmds.c:7902
 #, c-format
 msgid "cannot alter inherited column \"%s\""
-msgstr "kann vererbte Spalte „%s“ nicht ändern"
+msgstr "kann vererbte Spalte »%s« nicht ändern"
 
-#: commands/tablecmds.c:7910
+#: commands/tablecmds.c:7951
 #, c-format
 msgid "result of USING clause for column \"%s\" cannot be cast automatically to type %s"
-msgstr "Ergebnis der USING-Klausel für Spalte „%s“ kann nicht automatisch in Typ %s umgewandelt werden"
+msgstr "Ergebnis der USING-Klausel für Spalte »%s« kann nicht automatisch in Typ %s umgewandelt werden"
 
-#: commands/tablecmds.c:7913
+#: commands/tablecmds.c:7954
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "Sie müssen möglicherweise eine ausdrückliche Typumwandlung hinzufügen."
 
-#: commands/tablecmds.c:7917
+#: commands/tablecmds.c:7958
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
-msgstr "Spalte „%s“ kann nicht automatisch in Typ %s umgewandelt werden"
+msgstr "Spalte »%s« kann nicht automatisch in Typ %s umgewandelt werden"
 
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:7920
+#: commands/tablecmds.c:7961
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
-msgstr "Sie müssen möglicherweise „USING %s::%s“ angeben."
+msgstr "Sie müssen möglicherweise »USING %s::%s« angeben."
 
-#: commands/tablecmds.c:7973
+#: commands/tablecmds.c:8060
+#, c-format
+msgid "USING expression contains a whole-row table reference."
+msgstr "USING-Ausdruck enthält einen Verweis auf die ganze Zeile der Tabelle."
+
+#: commands/tablecmds.c:8071
 #, 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"
+msgstr "Typ der vererbten Spalte »%s« muss ebenso in den abgeleiteten Tabellen geändert werden"
 
-#: commands/tablecmds.c:8060
+#: commands/tablecmds.c:8158
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
-msgstr "Typ der Spalte „%s“ kann nicht zweimal geändert werden"
+msgstr "Typ der Spalte »%s« kann nicht zweimal geändert werden"
 
-#: commands/tablecmds.c:8096
+#: commands/tablecmds.c:8194
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
-msgstr "Vorgabewert der Spalte „%s“ kann nicht automatisch in Typ %s umgewandelt werden"
+msgstr "Vorgabewert der Spalte »%s« kann nicht automatisch in Typ %s umgewandelt werden"
 
-#: commands/tablecmds.c:8222
+#: commands/tablecmds.c:8320
 #, c-format
 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:8223 commands/tablecmds.c:8242
-#: commands/tablecmds.c:8260
+#: commands/tablecmds.c:8321 commands/tablecmds.c:8340
+#: commands/tablecmds.c:8358
 #, c-format
 msgid "%s depends on column \"%s\""
-msgstr "%s hängt von Spalte „%s“ ab"
+msgstr "%s hängt von Spalte »%s« ab"
 
-#: commands/tablecmds.c:8241
+#: commands/tablecmds.c:8339
 #, c-format
 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:8259
+#: commands/tablecmds.c:8357
 #, c-format
 msgid "cannot alter type of a column used in a policy definition"
 msgstr "Typ einer Spalte, die in einer Policy-Definition verwendet wird, kann nicht geändert werden"
 
-#: commands/tablecmds.c:8924
+#: commands/tablecmds.c:9022
 #, c-format
 msgid "cannot change owner of index \"%s\""
-msgstr "kann Eigentümer des Index „%s“ nicht ändern"
+msgstr "kann Eigentümer des Index »%s« nicht ändern"
 
-#: commands/tablecmds.c:8926
+#: commands/tablecmds.c:9024
 #, c-format
 msgid "Change the ownership of the index's table, instead."
 msgstr "Ändern Sie stattdessen den Eigentümer der Tabelle des Index."
 
-#: commands/tablecmds.c:8942
+#: commands/tablecmds.c:9040
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
-msgstr "kann Eigentümer der Sequenz „%s“ nicht ändern"
+msgstr "kann Eigentümer der Sequenz »%s« nicht ändern"
 
-#: commands/tablecmds.c:8944 commands/tablecmds.c:11355
+#: commands/tablecmds.c:9042 commands/tablecmds.c:11513
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
-msgstr "Sequenz „%s“ ist mit Tabelle „%s“ verknüpft."
+msgstr "Sequenz »%s« ist mit Tabelle »%s« verknüpft."
 
-#: commands/tablecmds.c:8956 commands/tablecmds.c:11996
+#: commands/tablecmds.c:9054 commands/tablecmds.c:12154
 #, c-format
 msgid "Use ALTER TYPE instead."
 msgstr "Verwenden Sie stattdessen ALTER TYPE."
 
-#: commands/tablecmds.c:8965
+#: commands/tablecmds.c:9063
 #, c-format
 msgid "\"%s\" is not a table, view, sequence, or foreign table"
-msgstr "„%s“ ist keine Tabelle, Sicht, Sequenz oder Fremdtabelle"
+msgstr "»%s« ist keine Tabelle, Sicht, Sequenz oder Fremdtabelle"
 
-#: commands/tablecmds.c:9308
+#: commands/tablecmds.c:9406
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "mehrere SET TABLESPACE Unterbefehle sind ungültig"
 
-#: commands/tablecmds.c:9381
+#: commands/tablecmds.c:9479
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, index, or TOAST table"
-msgstr "„%s“ ist weder Tabelle, Sicht, materialisierte Sicht, Index noch TOAST-Tabelle"
+msgstr "»%s« ist weder Tabelle, Sicht, materialisierte Sicht, Index noch TOAST-Tabelle"
 
-#: commands/tablecmds.c:9414 commands/view.c:481
+#: commands/tablecmds.c:9512 commands/view.c:498
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr "WITH CHECK OPTION wird nur für automatisch aktualisierbare Sichten unterstützt"
 
-#: commands/tablecmds.c:9560
+#: commands/tablecmds.c:9658
 #, c-format
 msgid "cannot move system relation \"%s\""
-msgstr "Systemrelation „%s“ kann nicht verschoben werden"
+msgstr "Systemrelation »%s« kann nicht verschoben werden"
 
-#: commands/tablecmds.c:9576
+#: commands/tablecmds.c:9674
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "temporäre Tabellen anderer Sitzungen können nicht verschoben werden"
 
-#: commands/tablecmds.c:9713
+#: commands/tablecmds.c:9811
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr "nur Tabellen, Indexe und materialisierte Sichten existieren in Tablespaces"
 
-#: commands/tablecmds.c:9725
+#: commands/tablecmds.c:9823
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
-msgstr "Relationen können nicht in den oder aus dem Tablespace „pg_global“ verschoben werden"
+msgstr "Relationen können nicht in den oder aus dem Tablespace »pg_global« verschoben werden"
 
-#: commands/tablecmds.c:9816
+#: commands/tablecmds.c:9914
 #, c-format
 msgid "aborting because lock on relation \"%s.%s\" is not available"
-msgstr "Abbruch weil Sperre für Relation „%s.%s“ nicht verfügbar ist"
+msgstr "Abbruch weil Sperre für Relation »%s.%s« nicht verfügbar ist"
 
-#: commands/tablecmds.c:9832
+#: commands/tablecmds.c:9930
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
-msgstr "keine passenden Relationen in Tablespace „%s“ gefunden"
+msgstr "keine passenden Relationen in Tablespace »%s« gefunden"
 
-#: commands/tablecmds.c:9906 storage/buffer/bufmgr.c:801
+#: commands/tablecmds.c:10004 storage/buffer/bufmgr.c:801
 #, c-format
 msgid "invalid page in block %u of relation %s"
 msgstr "ungültige Seite in Block %u von Relation %s"
 
-#: commands/tablecmds.c:9988
+#: commands/tablecmds.c:10086
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "Vererbung einer getypten Tabelle kann nicht geändert werden"
 
-#: commands/tablecmds.c:10038
+#: commands/tablecmds.c:10136
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "an temporäre Relation einer anderen Sitzung kann nicht vererbt werden"
 
-#: commands/tablecmds.c:10092
+#: commands/tablecmds.c:10190
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "zirkuläre Vererbung ist nicht erlaubt"
 
-#: commands/tablecmds.c:10093
+#: commands/tablecmds.c:10191
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
-msgstr "„%s“ ist schon von „%s“ abgeleitet."
+msgstr "»%s« ist schon von »%s« abgeleitet."
 
-#: commands/tablecmds.c:10101
+#: commands/tablecmds.c:10199
 #, 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"
+msgstr "Tabelle »%s« ohne OIDs kann nicht von Tabelle »%s« mit OIDs erben"
 
-#: commands/tablecmds.c:10242
+#: commands/tablecmds.c:10340
 #, 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"
+msgstr "Spalte »%s« in abgeleiteter Tabelle muss als NOT NULL markiert sein"
 
-#: commands/tablecmds.c:10258
+#: commands/tablecmds.c:10356 commands/tablecmds.c:10389
 #, c-format
 msgid "child table is missing column \"%s\""
-msgstr "Spalte „%s“ fehlt in abgeleiteter Tabelle"
+msgstr "Spalte »%s« fehlt in abgeleiteter Tabelle"
 
-#: commands/tablecmds.c:10341
+#: commands/tablecmds.c:10472
 #, 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“"
+msgstr "abgeleitete Tabelle »%s« hat unterschiedliche Definition für Check-Constraint »%s«"
 
-#: commands/tablecmds.c:10349
+#: commands/tablecmds.c:10480
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on child table \"%s\""
-msgstr "Constraint „%s“ kollidiert mit nicht vererbtem Constraint für abgeleitete Tabelle „%s“"
+msgstr "Constraint »%s« kollidiert mit nicht vererbtem Constraint für abgeleitete Tabelle »%s«"
 
-#: commands/tablecmds.c:10373
+#: commands/tablecmds.c:10491
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
+msgstr "Constraint »%s« kollidiert mit NOT-VALID-Constraint für abgeleitete Tabelle »%s«"
+
+#: commands/tablecmds.c:10515
 #, c-format
 msgid "child table is missing constraint \"%s\""
-msgstr "Constraint „%s“ fehlt in abgeleiteter Tabelle"
+msgstr "Constraint »%s« fehlt in abgeleiteter Tabelle"
 
-#: commands/tablecmds.c:10457
+#: commands/tablecmds.c:10599
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
-msgstr "Relation „%s“ ist keine Basisrelation von Relation „%s“"
+msgstr "Relation »%s« ist keine Basisrelation von Relation »%s«"
 
-#: commands/tablecmds.c:10691
+#: commands/tablecmds.c:10833
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "getypte Tabellen können nicht erben"
 
-#: commands/tablecmds.c:10722
+#: commands/tablecmds.c:10864
 #, c-format
 msgid "table is missing column \"%s\""
-msgstr "Spalte „%s“ fehlt in Tabelle"
+msgstr "Spalte »%s« fehlt in Tabelle"
 
-#: commands/tablecmds.c:10732
+#: commands/tablecmds.c:10874
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
-msgstr "Tabelle hat Spalte „%s“, aber Typ benötigt „%s“"
+msgstr "Tabelle hat Spalte »%s«, aber Typ benötigt »%s«"
 
-#: commands/tablecmds.c:10741
+#: commands/tablecmds.c:10883
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
-msgstr "Tabelle „%s“ hat unterschiedlichen Typ für Spalte „%s“"
+msgstr "Tabelle »%s« hat unterschiedlichen Typ für Spalte »%s«"
 
-#: commands/tablecmds.c:10754
+#: commands/tablecmds.c:10896
 #, c-format
 msgid "table has extra column \"%s\""
-msgstr "Tabelle hat zusätzliche Spalte „%s“"
+msgstr "Tabelle hat zusätzliche Spalte »%s«"
 
-#: commands/tablecmds.c:10806
+#: commands/tablecmds.c:10948
 #, c-format
 msgid "\"%s\" is not a typed table"
-msgstr "„%s“ ist keine getypte Tabelle"
+msgstr "»%s« ist keine getypte Tabelle"
 
-#: commands/tablecmds.c:10989
+#: commands/tablecmds.c:11131
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
-msgstr "nicht eindeutiger Index „%s“ kann nicht als Replik-Identität verwendet werden"
+msgstr "nicht eindeutiger Index »%s« kann nicht als Replik-Identität verwendet werden"
 
-#: commands/tablecmds.c:10995
+#: commands/tablecmds.c:11137
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
-msgstr "Index „%s“ kann nicht als Replik-Identität verwendet werden, weil er nicht IMMEDIATE ist"
+msgstr "Index »%s« kann nicht als Replik-Identität verwendet werden, weil er nicht IMMEDIATE ist"
 
-#: commands/tablecmds.c:11001
+#: commands/tablecmds.c:11143
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
-msgstr "Ausdrucksindex „%s“ kann nicht als Replik-Identität verwendet werden"
+msgstr "Ausdrucksindex »%s« kann nicht als Replik-Identität verwendet werden"
 
-#: commands/tablecmds.c:11007
+#: commands/tablecmds.c:11149
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
-msgstr "partieller Index „%s“ kann nicht als Replik-Identität verwendet werden"
+msgstr "partieller Index »%s« kann nicht als Replik-Identität verwendet werden"
 
-#: commands/tablecmds.c:11013
+#: commands/tablecmds.c:11155
 #, c-format
 msgid "cannot use invalid index \"%s\" as replica identity"
-msgstr "ungültiger Index „%s“ kann nicht als Replik-Identität verwendet werden"
+msgstr "ungültiger Index »%s« kann nicht als Replik-Identität verwendet werden"
+
+#: commands/tablecmds.c:11176
+#, c-format
+msgid "index \"%s\" cannot be used as replica identity because column %d is a system column"
+msgstr "Index »%s« kann nicht als Replik-Identität verwendet werden, weil Spalte %d eine Systemspalte ist"
 
-#: commands/tablecmds.c:11031
+#: commands/tablecmds.c:11183
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
-msgstr "Index „%s“ kann nicht als Replik-Identität verwendet werden, weil Spalte „%s“ NULL-Werte akzeptiert"
+msgstr "Index »%s« kann nicht als Replik-Identität verwendet werden, weil Spalte »%s« NULL-Werte akzeptiert"
 
-#: commands/tablecmds.c:11228
+#: commands/tablecmds.c:11386
 #, c-format
 msgid "cannot change logged status of table \"%s\" because it is temporary"
-msgstr "kann den geloggten Status der Tabelle „%s“ nicht ändern, weil sie temporär ist"
+msgstr "kann den geloggten Status der Tabelle »%s« nicht ändern, weil sie temporär ist"
 
-#: commands/tablecmds.c:11287
+#: commands/tablecmds.c:11445
 #, c-format
 msgid "could not change table \"%s\" to logged because it references unlogged table \"%s\""
-msgstr "konnte Tabelle „%s“ nicht in geloggt ändern, weil sie auf die ungeloggte Tabelle „%s“ verweist"
+msgstr "konnte Tabelle »%s« nicht in geloggt ändern, weil sie auf die ungeloggte Tabelle »%s« verweist"
 
-#: commands/tablecmds.c:11297
+#: commands/tablecmds.c:11455
 #, c-format
 msgid "could not change table \"%s\" to unlogged because it references logged table \"%s\""
-msgstr "konnte Tabelle „%s“ nicht in ungeloggt ändern, weil sie auf die geloggte Tabelle „%s“ verweist"
+msgstr "konnte Tabelle »%s« nicht in ungeloggt ändern, weil sie auf die geloggte Tabelle »%s« verweist"
 
-#: commands/tablecmds.c:11354
+#: commands/tablecmds.c:11512
 #, c-format
 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:11455
+#: commands/tablecmds.c:11613
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
-msgstr "Relation „%s“ existiert bereits in Schema „%s“"
+msgstr "Relation »%s« existiert bereits in Schema »%s«"
 
-#: commands/tablecmds.c:11980
+#: commands/tablecmds.c:12138
 #, c-format
 msgid "\"%s\" is not a composite type"
-msgstr "„%s“ ist kein zusammengesetzter Typ"
+msgstr "»%s« ist kein zusammengesetzter Typ"
 
-#: commands/tablecmds.c:12010
+#: commands/tablecmds.c:12168
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, sequence, or foreign table"
-msgstr "„%s“ ist weder Tabelle, Sicht, materialisierte Sicht, Sequenz noch Fremdtabelle"
+msgstr "»%s« ist weder Tabelle, Sicht, materialisierte Sicht, Sequenz noch Fremdtabelle"
 
 #: commands/tablespace.c:162 commands/tablespace.c:179
 #: commands/tablespace.c:190 commands/tablespace.c:198
-#: commands/tablespace.c:625 replication/slot.c:914 storage/file/copydir.c:47
+#: commands/tablespace.c:625 replication/slot.c:941 storage/file/copydir.c:47
 #, c-format
 msgid "could not create directory \"%s\": %m"
-msgstr "konnte Verzeichnis „%s“ nicht erzeugen: %m"
+msgstr "konnte Verzeichnis »%s« nicht erzeugen: %m"
 
 #: commands/tablespace.c:209
 #, c-format
 msgid "could not stat directory \"%s\": %m"
-msgstr "konnte „stat“ für Verzeichnis „%s“ nicht ausführen: %m"
+msgstr "konnte »stat« für Verzeichnis »%s« nicht ausführen: %m"
 
 #: commands/tablespace.c:218
 #, c-format
 msgid "\"%s\" exists but is not a directory"
-msgstr "„%s“ existiert, ist aber kein Verzeichnis"
+msgstr "»%s« existiert, ist aber kein Verzeichnis"
 
 #: commands/tablespace.c:249
 #, c-format
 msgid "permission denied to create tablespace \"%s\""
-msgstr "keine Berechtigung, um Tablespace „%s“ zu erzeugen"
+msgstr "keine Berechtigung, um Tablespace »%s« zu erzeugen"
 
 #: commands/tablespace.c:251
 #, c-format
@@ -8063,49 +8101,49 @@
 #: commands/tablespace.c:288
 #, c-format
 msgid "tablespace location \"%s\" is too long"
-msgstr "Tablespace-Pfad „%s“ ist zu lang"
+msgstr "Tablespace-Pfad »%s« ist zu lang"
 
 #: commands/tablespace.c:295
 #, c-format
 msgid "tablespace location should not be inside the data directory"
 msgstr "Tablespace-Pfad sollte nicht innerhalb des Datenverzeichnisses sein"
 
-#: commands/tablespace.c:304 commands/tablespace.c:938
+#: commands/tablespace.c:304 commands/tablespace.c:952
 #, c-format
 msgid "unacceptable tablespace name \"%s\""
-msgstr "inakzeptabler Tablespace-Name „%s“"
+msgstr "inakzeptabler Tablespace-Name »%s«"
 
-#: commands/tablespace.c:306 commands/tablespace.c:939
+#: commands/tablespace.c:306 commands/tablespace.c:953
 #, c-format
 msgid "The prefix \"pg_\" is reserved for system tablespaces."
-msgstr "Der Präfix „pg_“ ist für System-Tablespaces reserviert."
+msgstr "Der Präfix »pg_« ist für System-Tablespaces reserviert."
 
-#: commands/tablespace.c:316 commands/tablespace.c:951
+#: commands/tablespace.c:316 commands/tablespace.c:965
 #, c-format
 msgid "tablespace \"%s\" already exists"
-msgstr "Tablespace „%s“ existiert bereits"
+msgstr "Tablespace »%s« existiert bereits"
 
-#: commands/tablespace.c:430 commands/tablespace.c:921
-#: commands/tablespace.c:1002 commands/tablespace.c:1071
-#: commands/tablespace.c:1204 commands/tablespace.c:1404
+#: commands/tablespace.c:430 commands/tablespace.c:935
+#: commands/tablespace.c:1016 commands/tablespace.c:1085
+#: commands/tablespace.c:1218 commands/tablespace.c:1418
 #, c-format
 msgid "tablespace \"%s\" does not exist"
-msgstr "Tablespace „%s“ existiert nicht"
+msgstr "Tablespace »%s« existiert nicht"
 
 #: commands/tablespace.c:436
 #, c-format
 msgid "tablespace \"%s\" does not exist, skipping"
-msgstr "Tablespace „%s“ existiert nicht, wird übersprungen"
+msgstr "Tablespace »%s« existiert nicht, wird übersprungen"
 
 #: commands/tablespace.c:512
 #, c-format
 msgid "tablespace \"%s\" is not empty"
-msgstr "Tablespace „%s“ ist nicht leer"
+msgstr "Tablespace »%s« ist nicht leer"
 
 #: commands/tablespace.c:584
 #, c-format
 msgid "directory \"%s\" does not exist"
-msgstr "Verzeichnis „%s“ existiert nicht"
+msgstr "Verzeichnis »%s« existiert nicht"
 
 #: commands/tablespace.c:585
 #, c-format
@@ -8115,40 +8153,40 @@
 #: commands/tablespace.c:590
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
-msgstr "konnte Zugriffsrechte für Verzeichnis „%s“ nicht setzen: %m"
+msgstr "konnte Zugriffsrechte für Verzeichnis »%s« nicht setzen: %m"
 
 #: commands/tablespace.c:620
 #, c-format
 msgid "directory \"%s\" already in use as a tablespace"
-msgstr "Verzeichnis „%s“ ist bereits als Tablespace in Verwendung"
+msgstr "Verzeichnis »%s« ist bereits als Tablespace in Verwendung"
 
 #: commands/tablespace.c:744 commands/tablespace.c:757
-#: commands/tablespace.c:781 commands/tablespace.c:872
+#: commands/tablespace.c:793 commands/tablespace.c:885
 #, c-format
 msgid "could not remove directory \"%s\": %m"
-msgstr "konnte Verzeichnis „%s“ nicht löschen: %m"
+msgstr "konnte Verzeichnis »%s« nicht löschen: %m"
 
-#: commands/tablespace.c:793 commands/tablespace.c:881
+#: commands/tablespace.c:806 commands/tablespace.c:894
 #, c-format
 msgid "could not remove symbolic link \"%s\": %m"
-msgstr "konnte symbolische Verknüpfung „%s“ nicht löschen: %m"
+msgstr "konnte symbolische Verknüpfung »%s« nicht löschen: %m"
 
-#: commands/tablespace.c:803 commands/tablespace.c:889
+#: commands/tablespace.c:816 commands/tablespace.c:903
 #, c-format
 msgid "\"%s\" is not a directory or symbolic link"
-msgstr "„%s“ ist kein Verzeichnis oder symbolische Verknüpfung"
+msgstr "»%s« ist kein Verzeichnis oder symbolische Verknüpfung"
 
-#: commands/tablespace.c:1076
+#: commands/tablespace.c:1090
 #, c-format
 msgid "Tablespace \"%s\" does not exist."
-msgstr "Tablespace „%s“ existiert nicht."
+msgstr "Tablespace »%s« existiert nicht."
 
-#: commands/tablespace.c:1503
+#: commands/tablespace.c:1517
 #, c-format
 msgid "directories for tablespace %u could not be removed"
 msgstr "Verzeichnisse für Tablespace %u konnten nicht entfernt werden"
 
-#: commands/tablespace.c:1505
+#: commands/tablespace.c:1519
 #, c-format
 msgid "You can remove the directories manually if necessary."
 msgstr "Sie können die Verzeichnisse falls nötig manuell entfernen."
@@ -8156,7 +8194,7 @@
 #: commands/trigger.c:183
 #, c-format
 msgid "\"%s\" is a table"
-msgstr "„%s“ ist eine Tabelle"
+msgstr "»%s« ist eine Tabelle"
 
 #: commands/trigger.c:185
 #, c-format
@@ -8166,7 +8204,7 @@
 #: commands/trigger.c:196 commands/trigger.c:203
 #, c-format
 msgid "\"%s\" is a view"
-msgstr "„%s“ ist eine Sicht"
+msgstr "»%s« ist eine Sicht"
 
 #: commands/trigger.c:198
 #, c-format
@@ -8181,7 +8219,7 @@
 #: commands/trigger.c:213 commands/trigger.c:220 commands/trigger.c:227
 #, c-format
 msgid "\"%s\" is a foreign table"
-msgstr "„%s“ ist eine Fremdtabelle"
+msgstr "»%s« ist eine Fremdtabelle"
 
 #: commands/trigger.c:215
 #, c-format
@@ -8241,17 +8279,17 @@
 #: commands/trigger.c:435
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to \"trigger\""
-msgstr "ändere Rückgabetyp von Funktion %s von „opaque“ in „trigger“"
+msgstr "ändere Rückgabetyp von Funktion %s von »opaque« in »trigger«"
 
 #: commands/trigger.c:442
 #, c-format
 msgid "function %s must return type \"trigger\""
-msgstr "Funktion %s muss Typ „trigger“ zurückgeben"
+msgstr "Funktion %s muss Typ »trigger« zurückgeben"
 
 #: commands/trigger.c:554 commands/trigger.c:1304
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
-msgstr "Trigger „%s“ für Relation „%s“ existiert bereits"
+msgstr "Trigger »%s« für Relation »%s« existiert bereits"
 
 #: commands/trigger.c:839
 msgid "Found referenced table's UPDATE trigger."
@@ -8278,12 +8316,12 @@
 #: commands/trigger.c:1191 commands/trigger.c:1352 commands/trigger.c:1470
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
-msgstr "Trigger „%s“ für Tabelle „%s“ existiert nicht"
+msgstr "Trigger »%s« für Tabelle »%s« existiert nicht"
 
 #: commands/trigger.c:1435
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
-msgstr "keine Berechtigung: „%s“ ist ein Systemtrigger"
+msgstr "keine Berechtigung: »%s« ist ein Systemtrigger"
 
 #: commands/trigger.c:1931
 #, c-format
@@ -8296,22 +8334,22 @@
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "Trigger für BEFORE STATEMENT kann keinen Wert zurückgeben"
 
-#: commands/trigger.c:2727 executor/nodeModifyTable.c:648
-#: executor/nodeModifyTable.c:942
+#: commands/trigger.c:2727 executor/nodeModifyTable.c:663
+#: executor/nodeModifyTable.c:957
 #, c-format
 msgid "tuple to be updated was already modified by an operation triggered by the current command"
 msgstr "das zu aktualisierende Tupel wurde schon durch eine vom aktuellen Befehl ausgelöste Operation verändert"
 
-#: commands/trigger.c:2728 executor/nodeModifyTable.c:649
-#: executor/nodeModifyTable.c:943
+#: commands/trigger.c:2728 executor/nodeModifyTable.c:664
+#: executor/nodeModifyTable.c:958
 #, c-format
 msgid "Consider using an AFTER trigger instead of a BEFORE trigger to propagate changes to other rows."
 msgstr "Verwenden Sie einen AFTER-Trigger anstelle eines BEFORE-Triggers, um Änderungen an andere Zeilen zu propagieren."
 
 #: commands/trigger.c:2742 executor/execMain.c:2344
-#: executor/nodeLockRows.c:216 executor/nodeModifyTable.c:183
-#: executor/nodeModifyTable.c:661 executor/nodeModifyTable.c:955
-#: executor/nodeModifyTable.c:1122
+#: executor/nodeLockRows.c:216 executor/nodeModifyTable.c:196
+#: executor/nodeModifyTable.c:676 executor/nodeModifyTable.c:970
+#: executor/nodeModifyTable.c:1137
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "kann Zugriff nicht serialisieren wegen gleichzeitiger Aktualisierung"
@@ -8319,12 +8357,12 @@
 #: commands/trigger.c:4580
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
-msgstr "Constraint „%s“ ist nicht aufschiebbar"
+msgstr "Constraint »%s« ist nicht aufschiebbar"
 
 #: commands/trigger.c:4603
 #, c-format
 msgid "constraint \"%s\" does not exist"
-msgstr "Constraint „%s“ existiert nicht"
+msgstr "Constraint »%s« existiert nicht"
 
 #: commands/tsearchcmds.c:115 commands/tsearchcmds.c:685
 #, c-format
@@ -8339,7 +8377,7 @@
 #: commands/tsearchcmds.c:240
 #, c-format
 msgid "text search parser parameter \"%s\" not recognized"
-msgstr "Textsucheparserparameter „%s“ nicht erkannt"
+msgstr "Textsucheparserparameter »%s« nicht erkannt"
 
 #: commands/tsearchcmds.c:250
 #, c-format
@@ -8364,7 +8402,7 @@
 #: commands/tsearchcmds.c:386
 #, c-format
 msgid "text search template \"%s\" does not accept options"
-msgstr "Textsuchevorlage „%s“ akzeptiert keine Optionen"
+msgstr "Textsuchevorlage »%s« akzeptiert keine Optionen"
 
 #: commands/tsearchcmds.c:460
 #, c-format
@@ -8379,7 +8417,7 @@
 #: commands/tsearchcmds.c:789
 #, c-format
 msgid "text search template parameter \"%s\" not recognized"
-msgstr "Textsuchevorlageparameter „%s“ nicht erkannt"
+msgstr "Textsuchevorlageparameter »%s« nicht erkannt"
 
 #: commands/tsearchcmds.c:799
 #, c-format
@@ -8389,7 +8427,7 @@
 #: commands/tsearchcmds.c:1008
 #, c-format
 msgid "text search configuration parameter \"%s\" not recognized"
-msgstr "Textsuchekonfigurationsparameter „%s“ nicht erkannt"
+msgstr "Textsuchekonfigurationsparameter »%s« nicht erkannt"
 
 #: commands/tsearchcmds.c:1015
 #, c-format
@@ -8404,22 +8442,22 @@
 #: commands/tsearchcmds.c:1278
 #, c-format
 msgid "token type \"%s\" does not exist"
-msgstr "Tokentyp „%s“ existiert nicht"
+msgstr "Tokentyp »%s« existiert nicht"
 
 #: commands/tsearchcmds.c:1502
 #, c-format
 msgid "mapping for token type \"%s\" does not exist"
-msgstr "Mapping für Tokentyp „%s“ existiert nicht"
+msgstr "Mapping für Tokentyp »%s« existiert nicht"
 
 #: commands/tsearchcmds.c:1508
 #, c-format
 msgid "mapping for token type \"%s\" does not exist, skipping"
-msgstr "Mapping für Tokentyp „%s“ existiert nicht, wird übersprungen"
+msgstr "Mapping für Tokentyp »%s« existiert nicht, wird übersprungen"
 
 #: commands/tsearchcmds.c:1663 commands/tsearchcmds.c:1774
 #, c-format
 msgid "invalid parameter list format: \"%s\""
-msgstr "ungültiges Parameterlistenformat: „%s“"
+msgstr "ungültiges Parameterlistenformat: »%s«"
 
 #: commands/typecmds.c:179
 #, c-format
@@ -8429,12 +8467,12 @@
 #: commands/typecmds.c:286 commands/typecmds.c:1419
 #, c-format
 msgid "type attribute \"%s\" not recognized"
-msgstr "Typ-Attribut „%s“ nicht erkannt"
+msgstr "Typ-Attribut »%s« nicht erkannt"
 
 #: commands/typecmds.c:340
 #, c-format
 msgid "invalid type category \"%s\": must be simple ASCII"
-msgstr "ungültige Typenkategorie „%s“: muss einfacher ASCII-Wert sein"
+msgstr "ungültige Typenkategorie »%s«: muss einfacher ASCII-Wert sein"
 
 #: commands/typecmds.c:359
 #, c-format
@@ -8444,12 +8482,12 @@
 #: commands/typecmds.c:391
 #, c-format
 msgid "alignment \"%s\" not recognized"
-msgstr "Ausrichtung „%s“ nicht erkannt"
+msgstr "Ausrichtung »%s« nicht erkannt"
 
 #: commands/typecmds.c:408
 #, c-format
 msgid "storage \"%s\" not recognized"
-msgstr "Storage-Typ „%s“ nicht erkannt"
+msgstr "Storage-Typ »%s« nicht erkannt"
 
 #: commands/typecmds.c:419
 #, c-format
@@ -8469,7 +8507,7 @@
 #: commands/typecmds.c:451
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to %s"
-msgstr "ändere Rückgabetyp von Funktion %s von „opaque“ in %s"
+msgstr "ändere Rückgabetyp von Funktion %s von »opaque« in %s"
 
 #: commands/typecmds.c:458
 #, c-format
@@ -8479,12 +8517,12 @@
 #: commands/typecmds.c:468
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to \"cstring\""
-msgstr "ändere Rückgabetyp von Funktion %s von „opaque“ in „cstring“"
+msgstr "ändere Rückgabetyp von Funktion %s von »opaque« in »cstring«"
 
 #: commands/typecmds.c:475
 #, c-format
 msgid "type output function %s must return type \"cstring\""
-msgstr "Typeausgabefunktion %s muss Typ „cstring“ zurückgeben"
+msgstr "Typeausgabefunktion %s muss Typ »cstring« zurückgeben"
 
 #: commands/typecmds.c:484
 #, c-format
@@ -8494,7 +8532,7 @@
 #: commands/typecmds.c:493
 #, c-format
 msgid "type send function %s must return type \"bytea\""
-msgstr "Typsendefunktion %s muss Typ „bytea“ zurückgeben"
+msgstr "Typsendefunktion %s muss Typ »bytea« zurückgeben"
 
 #: commands/typecmds.c:558
 #, c-format
@@ -8529,7 +8567,7 @@
 #: commands/typecmds.c:805
 #, c-format
 msgid "\"%s\" is not a valid base type for a domain"
-msgstr "„%s“ ist kein gültiger Basistyp für eine Domäne"
+msgstr "»%s« ist kein gültiger Basistyp für eine Domäne"
 
 #: commands/typecmds.c:891
 #, c-format
@@ -8574,12 +8612,12 @@
 #: commands/typecmds.c:1289 utils/cache/typcache.c:1633
 #, c-format
 msgid "%s is not an enum"
-msgstr "„%s“ ist kein Enum"
+msgstr "»%s« ist kein Enum"
 
 #: commands/typecmds.c:1427
 #, c-format
 msgid "type attribute \"subtype\" is required"
-msgstr "Typ-Attribut „subtype“ muss angegeben werden"
+msgstr "Typ-Attribut »subtype« muss angegeben werden"
 
 #: commands/typecmds.c:1432
 #, c-format
@@ -8594,27 +8632,27 @@
 #: commands/typecmds.c:1684
 #, c-format
 msgid "changing argument type of function %s from \"opaque\" to \"cstring\""
-msgstr "ändere Argumenttyp von Funktion %s von „opaque“ in „cstring“"
+msgstr "ändere Argumenttyp von Funktion %s von »opaque« in »cstring«"
 
 #: commands/typecmds.c:1735
 #, c-format
 msgid "changing argument type of function %s from \"opaque\" to %s"
-msgstr "ändere Argumenttyp von Funktion %s von „opaque“ in %s"
+msgstr "ändere Argumenttyp von Funktion %s von »opaque« in %s"
 
 #: commands/typecmds.c:1834
 #, c-format
 msgid "typmod_in function %s must return type \"integer\""
-msgstr "typmod_in-Funktion %s muss Typ „integer“ zurückgeben"
+msgstr "typmod_in-Funktion %s muss Typ »integer« zurückgeben"
 
 #: commands/typecmds.c:1861
 #, c-format
 msgid "typmod_out function %s must return type \"cstring\""
-msgstr "typmod_out-Funktion %s muss Typ „cstring“ zurückgeben"
+msgstr "typmod_out-Funktion %s muss Typ »cstring« zurückgeben"
 
 #: commands/typecmds.c:1888
 #, c-format
 msgid "type analyze function %s must return type \"boolean\""
-msgstr "Typanalysefunktion %s muss Typ „boolean“ zurückgeben"
+msgstr "Typanalysefunktion %s muss Typ »boolean« zurückgeben"
 
 #: commands/typecmds.c:1934
 #, c-format
@@ -8629,7 +8667,7 @@
 #: commands/typecmds.c:1971
 #, c-format
 msgid "range canonical function %s must be immutable"
-msgstr "Bereichstyp-Canonical-Funktion %s muss „immutable“ sein"
+msgstr "Bereichstyp-Canonical-Funktion %s muss »immutable« sein"
 
 #: commands/typecmds.c:2007
 #, c-format
@@ -8639,7 +8677,7 @@
 #: commands/typecmds.c:2013
 #, c-format
 msgid "range subtype diff function %s must be immutable"
-msgstr "Bereichstyp-Untertyp-Diff-Funktion %s muss „immutable“ sein"
+msgstr "Bereichstyp-Untertyp-Diff-Funktion %s muss »immutable« sein"
 
 #: commands/typecmds.c:2040
 #, c-format
@@ -8649,27 +8687,27 @@
 #: commands/typecmds.c:2344
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
-msgstr "Spalte „%s“ von Tabelle „%s“ enthält NULL-Werte"
+msgstr "Spalte »%s« von Tabelle »%s« enthält NULL-Werte"
 
 #: commands/typecmds.c:2459 commands/typecmds.c:2642
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist"
-msgstr "Constraint „%s“ von Domäne „%s“ existiert nicht"
+msgstr "Constraint »%s« von Domäne »%s« existiert nicht"
 
 #: commands/typecmds.c:2463
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" does not exist, skipping"
-msgstr "Constraint „%s“ von Domäne „%s“ existiert nicht, wird übersprungen"
+msgstr "Constraint »%s« von Domäne »%s« existiert nicht, wird übersprungen"
 
 #: commands/typecmds.c:2648
 #, c-format
 msgid "constraint \"%s\" of domain \"%s\" is not a check constraint"
-msgstr "Constraint „%s“ von Domäne „%s“ ist kein Check-Constraint"
+msgstr "Constraint »%s« von Domäne »%s« ist kein Check-Constraint"
 
 #: commands/typecmds.c:2754
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains values that violate the new constraint"
-msgstr "Spalte „%s“ von Tabelle „%s“ enthält Werte, die den neuen Constraint verletzen"
+msgstr "Spalte »%s« von Tabelle »%s« enthält Werte, die den neuen Constraint verletzen"
 
 #: commands/typecmds.c:2967 commands/typecmds.c:3224 commands/typecmds.c:3413
 #, c-format
@@ -8679,7 +8717,7 @@
 #: commands/typecmds.c:3001
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
-msgstr "Constraint „%s“ für Domäne „%s“ existiert bereits"
+msgstr "Constraint »%s« für Domäne »%s« existiert bereits"
 
 #: commands/typecmds.c:3051
 #, c-format
@@ -8709,7 +8747,7 @@
 #: commands/typecmds.c:3512
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
-msgstr "Typ %s existiert bereits in Schema „%s“"
+msgstr "Typ %s existiert bereits in Schema »%s«"
 
 #: commands/user.c:148
 #, c-format
@@ -8729,7 +8767,7 @@
 #: commands/user.c:304 commands/user.c:678
 #, c-format
 msgid "must be superuser to change bypassrls attribute"
-msgstr "nur Superuser können das Attribut „bypassrls“ ändern"
+msgstr "nur Superuser können das Attribut »bypassrls« ändern"
 
 #: commands/user.c:311
 #, c-format
@@ -8739,7 +8777,7 @@
 #: commands/user.c:324 commands/user.c:1153
 #, c-format
 msgid "role \"%s\" already exists"
-msgstr "Rolle „%s“ existiert bereits"
+msgstr "Rolle »%s« existiert bereits"
 
 #: commands/user.c:402
 #, c-format
@@ -8782,12 +8820,12 @@
 #: utils/adt/acl.c:5205 utils/adt/acl.c:5223 utils/init/miscinit.c:494
 #, c-format
 msgid "role \"%s\" does not exist"
-msgstr "Rolle „%s“ existiert nicht"
+msgstr "Rolle »%s« existiert nicht"
 
 #: commands/user.c:977
 #, c-format
 msgid "role \"%s\" does not exist, skipping"
-msgstr "Rolle „%s“ existiert nicht, wird übersprungen"
+msgstr "Rolle »%s« existiert nicht, wird übersprungen"
 
 #: commands/user.c:989 commands/user.c:993
 #, c-format
@@ -8807,7 +8845,7 @@
 #: commands/user.c:1024
 #, c-format
 msgid "role \"%s\" cannot be dropped because some objects depend on it"
-msgstr "kann Rolle „%s“ nicht löschen, weil andere Objekte davon abhängen"
+msgstr "kann Rolle »%s« nicht löschen, weil andere Objekte davon abhängen"
 
 #: commands/user.c:1143
 #, c-format
@@ -8852,7 +8890,7 @@
 #: commands/user.c:1402 commands/user.c:1548
 #, c-format
 msgid "must have admin option on role \"%s\""
-msgstr "Admin-Option für Rolle „%s“ wird benötigt"
+msgstr "Admin-Option für Rolle »%s« wird benötigt"
 
 #: commands/user.c:1419
 #, c-format
@@ -8862,17 +8900,17 @@
 #: commands/user.c:1444
 #, c-format
 msgid "role \"%s\" is a member of role \"%s\""
-msgstr "Rolle „%s“ ist ein Mitglied der Rolle „%s“"
+msgstr "Rolle »%s« ist ein Mitglied der Rolle »%s«"
 
 #: commands/user.c:1459
 #, c-format
 msgid "role \"%s\" is already a member of role \"%s\""
-msgstr "Rolle „%s“ ist schon Mitglied der Rolle „%s“"
+msgstr "Rolle »%s« ist schon Mitglied der Rolle »%s«"
 
 #: commands/user.c:1570
 #, c-format
 msgid "role \"%s\" is not a member of role \"%s\""
-msgstr "Rolle „%s“ ist kein Mitglied der Rolle „%s“"
+msgstr "Rolle »%s« ist kein Mitglied der Rolle »%s«"
 
 #: commands/vacuum.c:185
 #, c-format
@@ -8899,126 +8937,126 @@
 msgid "Close open transactions with multixacts soon to avoid wraparound problems."
 msgstr "Schließen Sie bald alle offenen Transaktionen mit Multixacts, um Überlaufprobleme zu vermeiden."
 
-#: commands/vacuum.c:1130
+#: commands/vacuum.c:1138
 #, c-format
 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:1131
+#: commands/vacuum.c:1139
 #, c-format
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr "Sie haben möglicherweise bereits Daten wegen Transaktionsnummernüberlauf verloren."
 
-#: commands/vacuum.c:1252
+#: commands/vacuum.c:1260
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
-msgstr "überspringe Vacuum von „%s“ --- Sperre nicht verfügbar"
+msgstr "überspringe Vacuum von »%s« --- Sperre nicht verfügbar"
 
-#: commands/vacuum.c:1278
+#: commands/vacuum.c:1286
 #, c-format
 msgid "skipping \"%s\" --- only superuser can vacuum it"
-msgstr "überspringe „%s“ --- nur Superuser kann sie vacuumen"
+msgstr "überspringe »%s« --- nur Superuser kann sie vacuumen"
 
-#: commands/vacuum.c:1282
+#: commands/vacuum.c:1290
 #, 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"
+msgstr "überspringe »%s« --- nur Superuser oder Eigentümer der Datenbank kann sie vacuumen"
 
-#: commands/vacuum.c:1286
+#: commands/vacuum.c:1294
 #, 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"
+msgstr "überspringe »%s« --- nur Eigentümer der Tabelle oder der Datenbank kann sie vacuumen"
 
-#: commands/vacuum.c:1304
+#: commands/vacuum.c:1312
 #, 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:358
+#: commands/vacuumlazy.c:363
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
-msgstr "automatisches Vacuum der Tabelle „%s.%s.%s“: Index-Scans: %d\n"
+msgstr "automatisches Vacuum der Tabelle »%s.%s.%s«: Index-Scans: %d\n"
 
-#: commands/vacuumlazy.c:363
+#: commands/vacuumlazy.c:368
 #, c-format
 msgid "pages: %u removed, %u remain, %u skipped due to pins\n"
 msgstr "Seiten: %u entfernt, %u verbleiben, %u übersprungen wegen Pins\n"
 
-#: commands/vacuumlazy.c:368
+#: commands/vacuumlazy.c:373
 #, c-format
 msgid "tuples: %.0f removed, %.0f remain, %.0f are dead but not yet removable\n"
 msgstr "Tupel: %.0f entfernt, %.0f verbleiben, %.0f sind tot aber noch nicht entfernbar\n"
 
-#: commands/vacuumlazy.c:373
+#: commands/vacuumlazy.c:378
 #, c-format
 msgid "buffer usage: %d hits, %d misses, %d dirtied\n"
 msgstr "Puffer-Verwendung: %d Treffer, %d Verfehlen, %d geändert\n"
 
-#: commands/vacuumlazy.c:377
+#: commands/vacuumlazy.c:382
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr "durchschn. Leserate: %.3f MB/s, durchschn. Schreibrate: %.3f MB/s\n"
 
-#: commands/vacuumlazy.c:379
+#: commands/vacuumlazy.c:384
 #, c-format
 msgid "system usage: %s"
 msgstr "Systembenutzung: %s"
 
-#: commands/vacuumlazy.c:701
+#: commands/vacuumlazy.c:708
 #, c-format
 msgid "relation \"%s\" page %u is uninitialized --- fixing"
-msgstr "Seite %2$u in Relation „%1$s“ ist nicht initialisiert --- wird repariert"
+msgstr "Seite %2$u in Relation »%1$s« ist nicht initialisiert --- wird repariert"
 
-#: commands/vacuumlazy.c:1113
+#: commands/vacuumlazy.c:1120
 #, c-format
 msgid "\"%s\": removed %.0f row versions in %u pages"
-msgstr "„%s“: %.0f Zeilenversionen in %u Seiten entfernt"
+msgstr "»%s«: %.0f Zeilenversionen in %u Seiten entfernt"
 
-#: commands/vacuumlazy.c:1123
+#: commands/vacuumlazy.c:1130
 #, c-format
 msgid "%.0f dead row versions cannot be removed yet.\n"
 msgstr "%.0f tote Zeilenversionen können noch nicht entfernt werden.\n"
 
-#: commands/vacuumlazy.c:1125
+#: commands/vacuumlazy.c:1132
 #, c-format
 msgid "There were %.0f unused item pointers.\n"
 msgstr "Es gab %.0f unbenutzte Itemzeiger.\n"
 
-#: commands/vacuumlazy.c:1127
+#: commands/vacuumlazy.c:1134
 #, c-format
 msgid "Skipped %u page due to buffer pins.\n"
 msgid_plural "Skipped %u pages due to buffer pins.\n"
 msgstr[0] "%u Seite wegen Buffer-Pins übersprungen.\n"
 msgstr[1] "%u Seiten wegen Buffer-Pins übersprungen.\n"
 
-#: commands/vacuumlazy.c:1131
+#: commands/vacuumlazy.c:1138
 #, c-format
 msgid "%u page is entirely empty.\n"
 msgid_plural "%u pages are entirely empty.\n"
 msgstr[0] "%u Seite ist vollkommen leer.\n"
 msgstr[1] "%u Seiten sind vollkommen leer.\n"
 
-#: commands/vacuumlazy.c:1139
+#: commands/vacuumlazy.c:1146
 #, c-format
 msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u pages"
-msgstr "„%s“: %.0f entfernbare, %.0f nicht entfernbare Zeilenversionen in %u von %u Seiten gefunden"
+msgstr "»%s«: %.0f entfernbare, %.0f nicht entfernbare Zeilenversionen in %u von %u Seiten gefunden"
 
-#: commands/vacuumlazy.c:1208
+#: commands/vacuumlazy.c:1215
 #, c-format
 msgid "\"%s\": removed %d row versions in %d pages"
-msgstr "„%s“: %d Zeilenversionen in %d Seiten entfernt"
+msgstr "»%s«: %d Zeilenversionen in %d Seiten entfernt"
 
-#: commands/vacuumlazy.c:1375
+#: commands/vacuumlazy.c:1382
 #, c-format
 msgid "scanned index \"%s\" to remove %d row versions"
-msgstr "Index „%s“ gelesen und %d Zeilenversionen entfernt"
+msgstr "Index »%s« gelesen und %d Zeilenversionen entfernt"
 
-#: commands/vacuumlazy.c:1421
+#: commands/vacuumlazy.c:1428
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
-msgstr "Index „%s“ enthält %.0f Zeilenversionen in %u Seiten"
+msgstr "Index »%s« enthält %.0f Zeilenversionen in %u Seiten"
 
-#: commands/vacuumlazy.c:1425
+#: commands/vacuumlazy.c:1432
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -9029,30 +9067,30 @@
 "%u Indexseiten wurden gelöscht, %u sind gegenwärtig wiederverwendbar.\n"
 "%s."
 
-#: commands/vacuumlazy.c:1482
+#: commands/vacuumlazy.c:1489
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
-msgstr "„%s“: Truncate wird gestoppt wegen Sperrkonflikt"
+msgstr "»%s«: Truncate wird gestoppt wegen Sperrkonflikt"
 
-#: commands/vacuumlazy.c:1547
+#: commands/vacuumlazy.c:1554
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
-msgstr "„%s“: von %u auf %u Seiten verkürzt"
+msgstr "»%s«: von %u auf %u Seiten verkürzt"
 
-#: commands/vacuumlazy.c:1603
+#: commands/vacuumlazy.c:1610
 #, c-format
 msgid "\"%s\": suspending truncate due to conflicting lock request"
-msgstr "„%s“: Truncate wird ausgesetzt wegen Sperrkonflikt"
+msgstr "»%s«: Truncate wird ausgesetzt wegen Sperrkonflikt"
 
-#: commands/variable.c:164 utils/misc/guc.c:9656
+#: commands/variable.c:164 utils/misc/guc.c:9691
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
-msgstr "Unbekanntes Schlüsselwort: „%s“."
+msgstr "Unbekanntes Schlüsselwort: »%s«."
 
 #: commands/variable.c:176
 #, c-format
 msgid "Conflicting \"datestyle\" specifications."
-msgstr "Widersprüchliche „datestyle“-Angaben."
+msgstr "Widersprüchliche »datestyle«-Angaben."
 
 #: commands/variable.c:298
 #, c-format
@@ -9067,7 +9105,7 @@
 #: commands/variable.c:346 commands/variable.c:428
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
-msgstr "Zeitzone „%s“ verwendet anscheinend Schaltsekunden"
+msgstr "Zeitzone »%s« verwendet anscheinend Schaltsekunden"
 
 #: commands/variable.c:348 commands/variable.c:430
 #, c-format
@@ -9132,102 +9170,102 @@
 #: commands/variable.c:716
 #, c-format
 msgid "Cannot change \"client_encoding\" now."
-msgstr "„client_encoding“ kann jetzt nicht geändert werden."
+msgstr "»client_encoding« kann jetzt nicht geändert werden."
 
 #: commands/variable.c:889
 #, c-format
 msgid "permission denied to set role \"%s\""
-msgstr "keine Berechtigung, um Rolle „%s“ zu setzen"
+msgstr "keine Berechtigung, um Rolle »%s« zu setzen"
 
 #: commands/view.c:54
 #, c-format
 msgid "invalid value for \"check_option\" option"
-msgstr "ungültiger Wert für Option „check_option“"
+msgstr "ungültiger Wert für Option »check_option«"
 
 #: commands/view.c:55
 #, c-format
 msgid "Valid values are \"local\" and \"cascaded\"."
-msgstr "Gültige Werte sind „local“ und „cascaded“."
+msgstr "Gültige Werte sind »local« und »cascaded«."
 
-#: commands/view.c:114
+#: commands/view.c:101
 #, c-format
 msgid "could not determine which collation to use for view column \"%s\""
-msgstr "konnte die für die Sichtspalte „%s“ zu verwendende Sortierfolge nicht bestimmen"
+msgstr "konnte die für die Sichtspalte »%s« zu verwendende Sortierfolge nicht bestimmen"
 
-#: commands/view.c:129
+#: commands/view.c:115
 #, c-format
 msgid "view must have at least one column"
 msgstr "Sicht muss mindestens eine Spalte haben"
 
-#: commands/view.c:263 commands/view.c:275
+#: commands/view.c:280 commands/view.c:292
 #, c-format
 msgid "cannot drop columns from view"
 msgstr "aus einer Sicht können keine Spalten gelöscht werden"
 
-#: commands/view.c:280
+#: commands/view.c:297
 #, c-format
 msgid "cannot change name of view column \"%s\" to \"%s\""
-msgstr "kann Namen der Sichtspalte „%s“ nicht in „%s“ ändern"
+msgstr "kann Namen der Sichtspalte »%s« nicht in »%s« ändern"
 
-#: commands/view.c:288
+#: commands/view.c:305
 #, 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"
+msgstr "kann Datentyp der Sichtspalte »%s« nicht von %s in %s ändern"
 
-#: commands/view.c:427
+#: commands/view.c:444
 #, c-format
 msgid "views must not contain SELECT INTO"
 msgstr "Sichten dürfen kein SELECT INTO enthalten"
 
-#: commands/view.c:440
+#: commands/view.c:457
 #, c-format
 msgid "views must not contain data-modifying statements in WITH"
 msgstr "Sichten dürfen keine datenmodifizierenden Anweisungen in WITH enthalten"
 
-#: commands/view.c:511
+#: commands/view.c:528
 #, c-format
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "CREATE VIEW gibt mehr Spaltennamen als Spalten an"
 
-#: commands/view.c:519
+#: commands/view.c:536
 #, c-format
 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:533
+#: commands/view.c:550
 #, c-format
 msgid "view \"%s\" will be a temporary view"
-msgstr "Sicht „%s“ wird eine temporäre Sicht"
+msgstr "Sicht »%s« wird eine temporäre Sicht"
 
 #: executor/execCurrent.c:76
 #, c-format
 msgid "cursor \"%s\" is not a SELECT query"
-msgstr "Cursor „%s“ ist keine SELECT-Anfrage"
+msgstr "Cursor »%s« ist keine SELECT-Anfrage"
 
 #: executor/execCurrent.c:82
 #, c-format
 msgid "cursor \"%s\" is held from a previous transaction"
-msgstr "Cursor „%s“ wurde aus einer vorherigen Transaktion beibehalten"
+msgstr "Cursor »%s« wurde aus einer vorherigen Transaktion beibehalten"
 
 #: executor/execCurrent.c:114
 #, c-format
 msgid "cursor \"%s\" has multiple FOR UPDATE/SHARE references to table \"%s\""
-msgstr "Cursor „%s“ hat mehrere FOR UPDATE/SHARE-Verweise auf Tabelle „%s“"
+msgstr "Cursor »%s« hat mehrere FOR UPDATE/SHARE-Verweise auf Tabelle »%s«"
 
 #: executor/execCurrent.c:123
 #, c-format
 msgid "cursor \"%s\" does not have a FOR UPDATE/SHARE reference to table \"%s\""
-msgstr "Cursor „%s“ hat keinen FOR UPDATE/SHARE-Verweis auf Tabelle „%s“"
+msgstr "Cursor »%s« hat keinen FOR UPDATE/SHARE-Verweis auf Tabelle »%s«"
 
 #: executor/execCurrent.c:133 executor/execCurrent.c:179
 #, c-format
 msgid "cursor \"%s\" is not positioned on a row"
-msgstr "Cursor „%s“ ist nicht auf eine Zeile positioniert"
+msgstr "Cursor »%s« ist nicht auf eine Zeile positioniert"
 
 #: executor/execCurrent.c:166
 #, c-format
 msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
-msgstr "Cursor „%s“ ist kein einfach aktualisierbarer Scan der Tabelle „%s“"
+msgstr "Cursor »%s« ist kein einfach aktualisierbarer Scan der Tabelle »%s«"
 
 #: executor/execCurrent.c:231 executor/execQual.c:1156
 #, c-format
@@ -9239,37 +9277,37 @@
 msgid "no value found for parameter %d"
 msgstr "kein Wert für Parameter %d gefunden"
 
-#: executor/execIndexing.c:539
+#: executor/execIndexing.c:544
 #, c-format
 msgid "ON CONFLICT does not support deferrable unique constraints/exclusion constraints as arbiters"
 msgstr "ON CONFLICT unterstützt keine aufschiebbaren Unique-Constraints/Exclusion-Constraints als Arbiter"
 
-#: executor/execIndexing.c:816
+#: executor/execIndexing.c:821
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
-msgstr "konnte Exclusion-Constraint „%s“ nicht erzeugen"
+msgstr "konnte Exclusion-Constraint »%s« nicht erzeugen"
 
-#: executor/execIndexing.c:819
+#: executor/execIndexing.c:824
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "Schlüssel %s kollidiert mit Schlüssel %s."
 
-#: executor/execIndexing.c:821
+#: executor/execIndexing.c:826
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Es bestehen Schlüsselkonflikte."
 
-#: executor/execIndexing.c:827
+#: executor/execIndexing.c:832
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
-msgstr "kollidierender Schlüsselwert verletzt Exclusion-Constraint „%s“"
+msgstr "kollidierender Schlüsselwert verletzt Exclusion-Constraint »%s«"
 
-#: executor/execIndexing.c:830
+#: executor/execIndexing.c:835
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "Schlüssel %s kollidiert mit vorhandenem Schlüssel %s."
 
-#: executor/execIndexing.c:832
+#: executor/execIndexing.c:837
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "Der Schlüssel kollidiert mit einem vorhandenen Schlüssel."
@@ -9277,17 +9315,17 @@
 #: executor/execMain.c:1025
 #, c-format
 msgid "cannot change sequence \"%s\""
-msgstr "kann Sequenz „%s“ nicht ändern"
+msgstr "kann Sequenz »%s« nicht ändern"
 
 #: executor/execMain.c:1031
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
-msgstr "kann TOAST-Relation „%s“ nicht ändern"
+msgstr "kann TOAST-Relation »%s« nicht ändern"
 
 #: executor/execMain.c:1049 rewrite/rewriteHandler.c:2641
 #, c-format
 msgid "cannot insert into view \"%s\""
-msgstr "kann nicht in Sicht „%s“ einfügen"
+msgstr "kann nicht in Sicht »%s« einfügen"
 
 #: executor/execMain.c:1051 rewrite/rewriteHandler.c:2644
 #, c-format
@@ -9297,7 +9335,7 @@
 #: executor/execMain.c:1057 rewrite/rewriteHandler.c:2649
 #, c-format
 msgid "cannot update view \"%s\""
-msgstr "kann Sicht „%s“ nicht aktualisieren"
+msgstr "kann Sicht »%s« nicht aktualisieren"
 
 #: executor/execMain.c:1059 rewrite/rewriteHandler.c:2652
 #, c-format
@@ -9307,7 +9345,7 @@
 #: executor/execMain.c:1065 rewrite/rewriteHandler.c:2657
 #, c-format
 msgid "cannot delete from view \"%s\""
-msgstr "kann nicht aus Sicht „%s“ löschen"
+msgstr "kann nicht aus Sicht »%s« löschen"
 
 #: executor/execMain.c:1067 rewrite/rewriteHandler.c:2660
 #, c-format
@@ -9317,78 +9355,78 @@
 #: executor/execMain.c:1078
 #, c-format
 msgid "cannot change materialized view \"%s\""
-msgstr "kann materialisierte Sicht „%s“ nicht ändern"
+msgstr "kann materialisierte Sicht »%s« nicht ändern"
 
 #: executor/execMain.c:1090
 #, c-format
 msgid "cannot insert into foreign table \"%s\""
-msgstr "kann nicht in Fremdtabelle „%s“ einfügen"
+msgstr "kann nicht in Fremdtabelle »%s« einfügen"
 
 #: executor/execMain.c:1096
 #, c-format
 msgid "foreign table \"%s\" does not allow inserts"
-msgstr "Fremdtabelle „%s“ erlaubt kein Einfügen"
+msgstr "Fremdtabelle »%s« erlaubt kein Einfügen"
 
 #: executor/execMain.c:1103
 #, c-format
 msgid "cannot update foreign table \"%s\""
-msgstr "kann Fremdtabelle „%s“ nicht aktualisieren"
+msgstr "kann Fremdtabelle »%s« nicht aktualisieren"
 
 #: executor/execMain.c:1109
 #, c-format
 msgid "foreign table \"%s\" does not allow updates"
-msgstr "Fremdtabelle „%s“ erlaubt kein Aktualisieren"
+msgstr "Fremdtabelle »%s« erlaubt kein Aktualisieren"
 
 #: executor/execMain.c:1116
 #, c-format
 msgid "cannot delete from foreign table \"%s\""
-msgstr "kann nicht aus Fremdtabelle „%s“ löschen"
+msgstr "kann nicht aus Fremdtabelle »%s« löschen"
 
 #: executor/execMain.c:1122
 #, c-format
 msgid "foreign table \"%s\" does not allow deletes"
-msgstr "Fremdtabelle „%s“ erlaubt kein Löschen"
+msgstr "Fremdtabelle »%s« erlaubt kein Löschen"
 
 #: executor/execMain.c:1133
 #, c-format
 msgid "cannot change relation \"%s\""
-msgstr "kann Relation „%s“ nicht ändern"
+msgstr "kann Relation »%s« nicht ändern"
 
 #: executor/execMain.c:1159
 #, c-format
 msgid "cannot lock rows in sequence \"%s\""
-msgstr "kann Zeilen in Sequenz „%s“ nicht sperren"
+msgstr "kann Zeilen in Sequenz »%s« nicht sperren"
 
 #: executor/execMain.c:1166
 #, c-format
 msgid "cannot lock rows in TOAST relation \"%s\""
-msgstr "kann Zeilen in TOAST-Relation „%s“ nicht sperren"
+msgstr "kann Zeilen in TOAST-Relation »%s« nicht sperren"
 
 #: executor/execMain.c:1173
 #, c-format
 msgid "cannot lock rows in view \"%s\""
-msgstr "kann Zeilen in Sicht „%s“ nicht sperren"
+msgstr "kann Zeilen in Sicht »%s« nicht sperren"
 
 #: executor/execMain.c:1181
 #, c-format
 msgid "cannot lock rows in materialized view \"%s\""
-msgstr "kann Zeilen in materialisierter Sicht „%s“ nicht sperren"
+msgstr "kann Zeilen in materialisierter Sicht »%s« nicht sperren"
 
 #: executor/execMain.c:1190 executor/execMain.c:2578
 #: executor/nodeLockRows.c:132
 #, c-format
 msgid "cannot lock rows in foreign table \"%s\""
-msgstr "kann Zeilen in Fremdtabelle „%s“ nicht sperren"
+msgstr "kann Zeilen in Fremdtabelle »%s« nicht sperren"
 
 #: executor/execMain.c:1196
 #, c-format
 msgid "cannot lock rows in relation \"%s\""
-msgstr "kann Zeilen in Relation „%s“ nicht sperren"
+msgstr "kann Zeilen in Relation »%s« nicht sperren"
 
 #: executor/execMain.c:1696
 #, c-format
 msgid "null value in column \"%s\" violates not-null constraint"
-msgstr "NULL-Wert in Spalte „%s“ verletzt Not-Null-Constraint"
+msgstr "NULL-Wert in Spalte »%s« verletzt Not-Null-Constraint"
 
 #: executor/execMain.c:1698 executor/execMain.c:1724 executor/execMain.c:1813
 #, c-format
@@ -9398,38 +9436,38 @@
 #: executor/execMain.c:1722
 #, c-format
 msgid "new row for relation \"%s\" violates check constraint \"%s\""
-msgstr "neue Zeile für Relation „%s“ verletzt Check-Constraint „%s“"
+msgstr "neue Zeile für Relation »%s« verletzt Check-Constraint »%s«"
 
 #: executor/execMain.c:1811
 #, c-format
 msgid "new row violates check option for view \"%s\""
-msgstr "neue Zeile verletzt Check-Option für Sicht „%s“"
+msgstr "neue Zeile verletzt Check-Option für Sicht »%s«"
 
 #: executor/execMain.c:1821
 #, c-format
 msgid "new row violates row-level security policy \"%s\" for table \"%s\""
-msgstr "neue Zeile verletzt Policy für Sicherheit auf Zeilenebene „%s“ für Tabelle „%s“"
+msgstr "neue Zeile verletzt Policy für Sicherheit auf Zeilenebene »%s« für Tabelle »%s«"
 
 #: executor/execMain.c:1826
 #, c-format
 msgid "new row violates row-level security policy for table \"%s\""
-msgstr "neue Zeile verletzt Policy für Sicherheit auf Zeilenebene für Tabelle „%s“"
+msgstr "neue Zeile verletzt Policy für Sicherheit auf Zeilenebene für Tabelle »%s«"
 
 #: executor/execMain.c:1833
 #, c-format
 msgid "new row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
-msgstr "neue Zeile verletzt Policy für Sicherheit auf Zeilenebene „%s“ (USING-Ausdruck) für Tabelle „%s“"
+msgstr "neue Zeile verletzt Policy für Sicherheit auf Zeilenebene »%s« (USING-Ausdruck) für Tabelle »%s«"
 
 #: executor/execMain.c:1838
 #, c-format
 msgid "new row violates row-level security policy (USING expression) for table \"%s\""
-msgstr "neue Zeile verletzt Policy für Sicherheit auf Zeilenebene (USING-Ausdruck) für Tabelle „%s“"
+msgstr "neue Zeile verletzt Policy für Sicherheit auf Zeilenebene (USING-Ausdruck) für Tabelle »%s«"
 
-#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3191
-#: utils/adt/array_userfuncs.c:472 utils/adt/arrayfuncs.c:263
+#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3209
+#: utils/adt/array_userfuncs.c:484 utils/adt/arrayfuncs.c:263
 #: utils/adt/arrayfuncs.c:561 utils/adt/arrayfuncs.c:1291
 #: utils/adt/arrayfuncs.c:3335 utils/adt/arrayfuncs.c:5219
-#: utils/adt/arrayfuncs.c:5742
+#: utils/adt/arrayfuncs.c:5736
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "Anzahl der Arraydimensionen (%d) überschreitet erlaubtes Maximum (%d)"
@@ -9439,12 +9477,12 @@
 msgid "array subscript in assignment must not be null"
 msgstr "Arrayindex in Zuweisung darf nicht NULL sein"
 
-#: executor/execQual.c:635 executor/execQual.c:4116
+#: executor/execQual.c:635 executor/execQual.c:4156
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "Attribut %d hat falschen Typ"
 
-#: executor/execQual.c:636 executor/execQual.c:4117
+#: executor/execQual.c:636 executor/execQual.c:4157
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "Tabelle hat Typ %s, aber Anfrage erwartet %s."
@@ -9538,63 +9576,63 @@
 msgid "op ANY/ALL (array) does not support set arguments"
 msgstr "op ANY/ALL (array) unterstützt keine Mengenargumente"
 
-#: executor/execQual.c:3169
+#: executor/execQual.c:3187
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "kann inkompatible Arrays nicht verschmelzen"
 
-#: executor/execQual.c:3170
+#: executor/execQual.c:3188
 #, c-format
 msgid "Array with element type %s cannot be included in ARRAY construct with element type %s."
 msgstr "Arrayelement mit Typ %s kann nicht in ARRAY-Konstrukt mit Elementtyp %s verwendet werden."
 
-#: executor/execQual.c:3211 executor/execQual.c:3238
+#: executor/execQual.c:3229 executor/execQual.c:3256
 #, c-format
 msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr "mehrdimensionale Arrays müssen Arraysausdrücke mit gleicher Anzahl Dimensionen haben"
 
-#: executor/execQual.c:3753
+#: executor/execQual.c:3771
 #, c-format
 msgid "NULLIF does not support set arguments"
 msgstr "NULLIF unterstützt keine Mengenargumente"
 
-#: executor/execQual.c:3986 utils/adt/domains.c:136
+#: executor/execQual.c:4019 utils/adt/domains.c:137
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "Domäne %s erlaubt keine NULL-Werte"
 
-#: executor/execQual.c:4016 utils/adt/domains.c:173
+#: executor/execQual.c:4056 utils/adt/domains.c:179
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
-msgstr "Wert für Domäne %s verletzt Check-Constraint „%s“"
+msgstr "Wert für Domäne %s verletzt Check-Constraint »%s«"
 
-#: executor/execQual.c:4371
+#: executor/execQual.c:4411
 #, c-format
 msgid "WHERE CURRENT OF is not supported for this table type"
 msgstr "WHERE CURRENT OF wird für diesen Tabellentyp nicht unterstützt"
 
-#: executor/execQual.c:4518 parser/parse_agg.c:596 parser/parse_agg.c:626
+#: executor/execQual.c:4558 parser/parse_agg.c:596 parser/parse_agg.c:626
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "Aufrufe von Aggregatfunktionen können nicht geschachtelt werden"
 
-#: executor/execQual.c:4580 parser/parse_agg.c:742
+#: executor/execQual.c:4620 parser/parse_agg.c:742
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "Aufrufe von Fensterfunktionen können nicht geschachtelt werden"
 
-#: executor/execQual.c:4792
+#: executor/execQual.c:4832
 #, c-format
 msgid "target type is not an array"
 msgstr "Zieltyp ist kein Array"
 
-#: executor/execQual.c:4907
+#: executor/execQual.c:4949
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "ROW()-Spalte hat Typ %s statt Typ %s"
 
-#: executor/execQual.c:5042 utils/adt/arrayfuncs.c:3777
-#: utils/adt/arrayfuncs.c:6315 utils/adt/rowtypes.c:927
+#: executor/execQual.c:5084 utils/adt/arrayfuncs.c:3777
+#: utils/adt/arrayfuncs.c:6303 utils/adt/rowtypes.c:927
 #, c-format
 msgid "could not identify a comparison function for type %s"
 msgstr "konnte keine Vergleichsfunktion für Typ %s ermitteln"
@@ -9602,7 +9640,7 @@
 #: executor/execUtils.c:831
 #, c-format
 msgid "materialized view \"%s\" has not been populated"
-msgstr "materialisierte Sicht „%s“ wurde noch nicht befüllt"
+msgstr "materialisierte Sicht »%s« wurde noch nicht befüllt"
 
 #: executor/execUtils.c:833
 #, c-format
@@ -9614,76 +9652,81 @@
 msgid "could not determine actual type of argument declared %s"
 msgstr "konnte tatsächlichen Typ von Argument mit deklarierten Typ %s nicht bestimmen"
 
+#: executor/functions.c:509
+#, c-format
+msgid "cannot COPY to/from client in a SQL function"
+msgstr "COPY vom/zum Client funktioniert in einer SQL-Funktion nicht"
+
 #. translator: %s is a SQL statement name
-#: executor/functions.c:506
+#: executor/functions.c:515
 #, c-format
 msgid "%s is not allowed in a SQL function"
 msgstr "%s ist in SQL-Funktionen nicht erlaubt"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:513 executor/spi.c:1368 executor/spi.c:2158
+#: executor/functions.c:522 executor/spi.c:1368 executor/spi.c:2158
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
-msgstr "%s ist in als nicht „volatile“ markierten Funktionen nicht erlaubt"
+msgstr "%s ist in als nicht »volatile« markierten Funktionen nicht erlaubt"
 
-#: executor/functions.c:641
+#: executor/functions.c:650
 #, c-format
 msgid "could not determine actual result type for function declared to return type %s"
 msgstr "konnte tatsächlichen Ergebnistyp von Funktion mit deklarierten Rückgabetyp %s nicht bestimmen"
 
-#: executor/functions.c:1405
+#: executor/functions.c:1414
 #, c-format
 msgid "SQL function \"%s\" statement %d"
-msgstr "SQL-Funktion „%s“ Anweisung %d"
+msgstr "SQL-Funktion »%s« Anweisung %d"
 
-#: executor/functions.c:1431
+#: executor/functions.c:1440
 #, c-format
 msgid "SQL function \"%s\" during startup"
-msgstr "SQL-Funktion „%s“ beim Start"
+msgstr "SQL-Funktion »%s« beim Start"
 
-#: executor/functions.c:1590 executor/functions.c:1627
-#: executor/functions.c:1639 executor/functions.c:1752
-#: executor/functions.c:1785 executor/functions.c:1815
+#: executor/functions.c:1599 executor/functions.c:1636
+#: executor/functions.c:1648 executor/functions.c:1761
+#: executor/functions.c:1794 executor/functions.c:1824
 #, c-format
 msgid "return type mismatch in function declared to return %s"
 msgstr "Rückgabetyp von Funktion stimmt nicht überein; deklariert als %s"
 
-#: executor/functions.c:1592
+#: executor/functions.c:1601
 #, c-format
 msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
 msgstr "Die letzte Anweisung der Funktion muss ein SELECT oder INSERT/UPDATE/DELETE RETURNING sein."
 
-#: executor/functions.c:1629
+#: executor/functions.c:1638
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "Die letzte Anweisung muss genau eine Spalte zurückgeben."
 
-#: executor/functions.c:1641
+#: executor/functions.c:1650
 #, c-format
 msgid "Actual return type is %s."
 msgstr "Eigentlicher Rückgabetyp ist %s."
 
-#: executor/functions.c:1754
+#: executor/functions.c:1763
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "Die letzte Anweisung gibt zu viele Spalten zurück."
 
-#: executor/functions.c:1787
+#: executor/functions.c:1796
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr "Die letzte Anweisung ergibt %s statt %s in Spalte %d."
 
-#: executor/functions.c:1817
+#: executor/functions.c:1826
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "Die letzte Anweisung gibt zu wenige Spalten zurück."
 
-#: executor/functions.c:1866
+#: executor/functions.c:1875
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "Rückgabetyp %s wird von SQL-Funktionen nicht unterstützt"
 
-#: executor/nodeAgg.c:2450 executor/nodeWindowAgg.c:2286
+#: executor/nodeAgg.c:2471 executor/nodeWindowAgg.c:2319
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr "Aggregatfunktion %u muss kompatiblen Eingabe- und Ãœbergangstyp haben"
@@ -9691,7 +9734,7 @@
 #: executor/nodeCustom.c:147 executor/nodeCustom.c:158
 #, c-format
 msgid "custom scan \"%s\" does not support MarkPos"
-msgstr "Custom-Scan „%s“ unterstützt MarkPos nicht"
+msgstr "Custom-Scan »%s« unterstützt MarkPos nicht"
 
 #: executor/nodeHashjoin.c:823 executor/nodeHashjoin.c:853
 #, c-format
@@ -9703,7 +9746,7 @@
 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:928 executor/nodeHashjoin.c:938
+#: executor/nodeHashjoin.c:935 executor/nodeHashjoin.c:945
 #, 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"
@@ -9748,12 +9791,12 @@
 msgid "Query has too few columns."
 msgstr "Anfrage hat zu wenige Spalten."
 
-#: executor/nodeModifyTable.c:1103
+#: executor/nodeModifyTable.c:1118
 #, c-format
 msgid "ON CONFLICT DO UPDATE command cannot affect row a second time"
 msgstr "Befehl in ON CONFLICT DO UPDATE kann eine Zeile nicht ein zweites Mal ändern"
 
-#: executor/nodeModifyTable.c:1104
+#: executor/nodeModifyTable.c:1119
 #, c-format
 msgid "Ensure that no rows proposed for insertion within the same command have duplicate constrained values."
 msgstr "Stellen Sie sicher, dass keine im selben Befehl fürs Einfügen vorgesehene Zeilen doppelte Werte haben, die einen Constraint verletzen würden."
@@ -9779,22 +9822,22 @@
 msgid "moving-aggregate transition function must not return null"
 msgstr "Moving-Aggregat-Übergangsfunktion darf nicht NULL zurückgeben"
 
-#: executor/nodeWindowAgg.c:1609
+#: executor/nodeWindowAgg.c:1642
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "Frame-Start-Offset darf nicht NULL sein"
 
-#: executor/nodeWindowAgg.c:1622
+#: executor/nodeWindowAgg.c:1655
 #, c-format
 msgid "frame starting offset must not be negative"
 msgstr "Frame-Start-Offset darf nicht negativ sein"
 
-#: executor/nodeWindowAgg.c:1635
+#: executor/nodeWindowAgg.c:1668
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "Frame-Ende-Offset darf nicht NULL sein"
 
-#: executor/nodeWindowAgg.c:1648
+#: executor/nodeWindowAgg.c:1681
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "Frame-Ende-Offset darf nicht negativ sein"
@@ -9807,7 +9850,7 @@
 #: executor/spi.c:215 executor/spi.c:279
 #, c-format
 msgid "Check for missing \"SPI_finish\" calls."
-msgstr "Prüfen Sie, ob Aufrufe von „SPI_finish“ fehlen."
+msgstr "Prüfen Sie, ob Aufrufe von »SPI_finish« fehlen."
 
 #: executor/spi.c:278
 #, c-format
@@ -9830,25 +9873,25 @@
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE wird nicht unterstützt"
 
-#: executor/spi.c:1343 parser/analyze.c:2292
+#: executor/spi.c:1343 parser/analyze.c:2289
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Scrollbare Cursor müssen READ ONLY sein."
 
-#: executor/spi.c:2450
+#: executor/spi.c:2462
 #, c-format
 msgid "SQL statement \"%s\""
-msgstr "SQL-Anweisung „%s“"
+msgstr "SQL-Anweisung »%s«"
 
 #: foreign/foreign.c:192
 #, c-format
 msgid "user mapping not found for \"%s\""
-msgstr "Benutzerabbildung für „%s“ nicht gefunden"
+msgstr "Benutzerabbildung für »%s« nicht gefunden"
 
 #: foreign/foreign.c:643
 #, c-format
 msgid "invalid option \"%s\""
-msgstr "ungültige Option „%s“"
+msgstr "ungültige Option »%s«"
 
 #: foreign/foreign.c:644
 #, c-format
@@ -9858,7 +9901,7 @@
 #: gram.y:1009
 #, c-format
 msgid "unrecognized role option \"%s\""
-msgstr "unbekannte Rollenoption „%s“"
+msgstr "unbekannte Rollenoption »%s«"
 
 #: gram.y:1285 gram.y:1300
 #, c-format
@@ -9885,13 +9928,13 @@
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "die Verwendung von GLOBAL beim Erzeugen einer temporären Tabelle ist veraltet"
 
-#: gram.y:3325 utils/adt/ri_triggers.c:316 utils/adt/ri_triggers.c:373
-#: utils/adt/ri_triggers.c:792 utils/adt/ri_triggers.c:1015
-#: utils/adt/ri_triggers.c:1171 utils/adt/ri_triggers.c:1352
-#: utils/adt/ri_triggers.c:1517 utils/adt/ri_triggers.c:1693
-#: utils/adt/ri_triggers.c:1873 utils/adt/ri_triggers.c:2064
-#: utils/adt/ri_triggers.c:2122 utils/adt/ri_triggers.c:2227
-#: utils/adt/ri_triggers.c:2404
+#: gram.y:3325 utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:371
+#: utils/adt/ri_triggers.c:790 utils/adt/ri_triggers.c:1013
+#: utils/adt/ri_triggers.c:1169 utils/adt/ri_triggers.c:1350
+#: utils/adt/ri_triggers.c:1515 utils/adt/ri_triggers.c:1691
+#: utils/adt/ri_triggers.c:1871 utils/adt/ri_triggers.c:2062
+#: utils/adt/ri_triggers.c:2120 utils/adt/ri_triggers.c:2225
+#: utils/adt/ri_triggers.c:2402
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL ist noch nicht implementiert"
@@ -9900,7 +9943,7 @@
 msgid "duplicate trigger events specified"
 msgstr "mehrere Trigger-Ereignisse angegeben"
 
-#: gram.y:4852 parser/parse_utilcmd.c:2657 parser/parse_utilcmd.c:2683
+#: gram.y:4852 parser/parse_utilcmd.c:2659 parser/parse_utilcmd.c:2685
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "Constraint, der als INITIALLY DEFERRED deklariert wurde, muss DEFERRABLE sein"
@@ -9950,7 +9993,7 @@
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION wird für rekursive Sichten nicht unterstützt"
 
-#: gram.y:9745 parser/parse_expr.c:1468
+#: gram.y:9745 parser/parse_expr.c:1476
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr "Anzahl der Spalten stimmt nicht mit der Anzahl der Werte überein"
@@ -10010,135 +10053,135 @@
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "UNIQUE-Prädikat ist noch nicht implementiert"
 
-#: gram.y:12158
+#: gram.y:12162
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "in WITHIN GROUP können nicht mehrere ORDER-BY-Klauseln verwendet werden"
 
-#: gram.y:12163
+#: gram.y:12167
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "DISTINCT kann nicht mit WITHIN GROUP verwendet werden"
 
-#: gram.y:12168
+#: gram.y:12172
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "VARIADIC kann nicht mit WITHIN GROUP verwendet werden"
 
-#: gram.y:12674
+#: gram.y:12678
 #, c-format
 msgid "RANGE PRECEDING is only supported with UNBOUNDED"
 msgstr "RANGE PRECEDING wird nur mit UNBOUNDED unterstützt"
 
-#: gram.y:12680
+#: gram.y:12684
 #, c-format
 msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
 msgstr "RANGE FOLLOWING wird nur mit UNBOUNDED unterstützt"
 
-#: gram.y:12707 gram.y:12730
+#: gram.y:12711 gram.y:12734
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "Frame-Beginn kann nicht UNBOUNDED FOLLOWING sein"
 
-#: gram.y:12712
+#: gram.y:12716
 #, c-format
 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:12735
+#: gram.y:12739
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "Frame-Ende kann nicht UNBOUNDED PRECEDING sein"
 
-#: gram.y:12741
+#: gram.y:12745
 #, c-format
 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:12748
+#: gram.y:12752
 #, c-format
 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:13406
+#: gram.y:13410
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "Typmodifikator kann keinen Parameternamen haben"
 
-#: gram.y:13412
+#: gram.y:13416
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "Typmodifikator kann kein ORDER BY haben"
 
-#: gram.y:13470 gram.y:13505
+#: gram.y:13474 gram.y:13509
 #, c-format
 msgid "role name \"%s\" is reserved"
-msgstr "Rollenname „%s“ ist reserviert"
+msgstr "Rollenname »%s« ist reserviert"
 
-#: gram.y:13476 gram.y:13482
+#: gram.y:13480 gram.y:13486
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s kann hier nicht als Rollenname verwendet werden"
 
-#: gram.y:14101 gram.y:14290
+#: gram.y:14105 gram.y:14294
 msgid "improper use of \"*\""
-msgstr "unzulässige Verwendung von „*“"
+msgstr "unzulässige Verwendung von »*«"
 
-#: gram.y:14253 gram.y:14270 tsearch/spell.c:667 tsearch/spell.c:684
+#: gram.y:14257 gram.y:14274 tsearch/spell.c:667 tsearch/spell.c:684
 #: tsearch/spell.c:701 tsearch/spell.c:718 tsearch/spell.c:740
 #, c-format
 msgid "syntax error"
 msgstr "Syntaxfehler"
 
-#: gram.y:14354
+#: gram.y:14358
 #, c-format
 msgid "an ordered-set aggregate with a VARIADIC direct argument must have one VARIADIC aggregated argument of the same data type"
 msgstr "eine Ordered-Set-Aggregatfunktion mit einem direkten VARIADIC-Argument muss ein aggregiertes VARIADIC-Argument des selben Datentyps haben"
 
-#: gram.y:14391
+#: gram.y:14395
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "mehrere ORDER-BY-Klauseln sind nicht erlaubt"
 
-#: gram.y:14402
+#: gram.y:14406
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "mehrere OFFSET-Klauseln sind nicht erlaubt"
 
-#: gram.y:14411
+#: gram.y:14415
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "mehrere LIMIT-Klauseln sind nicht erlaubt"
 
-#: gram.y:14420
+#: gram.y:14424
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "mehrere WITH-Klauseln sind nicht erlaubt"
 
-#: gram.y:14600
+#: gram.y:14616
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "OUT- und INOUT-Argumente sind in TABLE-Funktionen nicht erlaubt"
 
-#: gram.y:14701
+#: gram.y:14717
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "mehrere COLLATE-Klauseln sind nicht erlaubt"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14739 gram.y:14752
+#: gram.y:14755 gram.y:14768
 #, 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:14765
+#: gram.y:14781
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "%s-Constraints können nicht als NOT VALID markiert werden"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14778
+#: gram.y:14794
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "%s-Constraints können nicht als NO INHERIT markiert werden"
@@ -10146,554 +10189,554 @@
 #: guc-file.l:315
 #, c-format
 msgid "unrecognized configuration parameter \"%s\" in file \"%s\" line %u"
-msgstr "unbekannter Konfigurationsparameter „%s“ in Datei „%s“ Zeile %u"
+msgstr "unbekannter Konfigurationsparameter »%s« in Datei »%s« Zeile %u"
 
 #: guc-file.l:352 utils/misc/guc.c:5720 utils/misc/guc.c:5912
 #: utils/misc/guc.c:6002 utils/misc/guc.c:6092 utils/misc/guc.c:6200
 #: utils/misc/guc.c:6295
 #, 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"
+msgstr "Parameter »%s« kann nicht geändert werden, ohne den Server neu zu starten"
 
 #: guc-file.l:388
 #, c-format
 msgid "parameter \"%s\" removed from configuration file, reset to default"
-msgstr "Parameter „%s“ wurde aus Konfigurationsdatei entfernt, wird auf Standardwert zurückgesetzt"
+msgstr "Parameter »%s« wurde aus Konfigurationsdatei entfernt, wird auf Standardwert zurückgesetzt"
 
 #: guc-file.l:454
 #, c-format
 msgid "parameter \"%s\" changed to \"%s\""
-msgstr "Parameter „%s“ auf „%s“ gesetzt"
+msgstr "Parameter »%s« auf »%s« gesetzt"
 
 #: guc-file.l:496
 #, c-format
 msgid "configuration file \"%s\" contains errors"
-msgstr "Konfigurationsdatei „%s“ enthält Fehler"
+msgstr "Konfigurationsdatei »%s« enthält Fehler"
 
 #: guc-file.l:501
 #, c-format
 msgid "configuration file \"%s\" contains errors; unaffected changes were applied"
-msgstr "Konfigurationsdatei „%s“ enthält Fehler; nicht betroffene Änderungen wurden durchgeführt"
+msgstr "Konfigurationsdatei »%s« enthält Fehler; nicht betroffene Änderungen wurden durchgeführt"
 
 #: guc-file.l:506
 #, c-format
 msgid "configuration file \"%s\" contains errors; no changes were applied"
-msgstr "Konfigurationsdatei „%s“ enthält Fehler; keine Änderungen wurden durchgeführt"
+msgstr "Konfigurationsdatei »%s« enthält Fehler; keine Änderungen wurden durchgeführt"
 
 #: guc-file.l:579
 #, c-format
 msgid "could not open configuration file \"%s\": maximum nesting depth exceeded"
-msgstr "konnte Konfigurationsdatei „%s“ nicht öffnen: maximale Verschachtelungstiefe überschritten"
+msgstr "konnte Konfigurationsdatei »%s« nicht öffnen: maximale Verschachtelungstiefe überschritten"
 
 #: guc-file.l:595 libpq/hba.c:1764
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
-msgstr "konnte Konfigurationsdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Konfigurationsdatei »%s« nicht öffnen: %m"
 
 #: guc-file.l:606
 #, c-format
 msgid "skipping missing configuration file \"%s\""
-msgstr "fehlende Konfigurationsdatei „%s“ wird übersprungen"
+msgstr "fehlende Konfigurationsdatei »%s« wird übersprungen"
 
 #: guc-file.l:860
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near end of line"
-msgstr "Syntaxfehler in Datei „%s“, Zeile %u, am Ende der Zeile"
+msgstr "Syntaxfehler in Datei »%s«, Zeile %u, am Ende der Zeile"
 
 #: guc-file.l:870
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near token \"%s\""
-msgstr "Syntaxfehler in Datei „%s“, Zeile %u, bei „%s“"
+msgstr "Syntaxfehler in Datei »%s«, Zeile %u, bei »%s«"
 
 #: guc-file.l:890
 #, c-format
 msgid "too many syntax errors found, abandoning file \"%s\""
-msgstr "zu viele Syntaxfehler gefunden, Datei „%s“ wird aufgegeben"
+msgstr "zu viele Syntaxfehler gefunden, Datei »%s« wird aufgegeben"
 
 #: guc-file.l:942
 #, c-format
 msgid "could not open configuration directory \"%s\": %m"
-msgstr "konnte Konfigurationsverzeichnis „%s“ nicht öffnen: %m"
+msgstr "konnte Konfigurationsverzeichnis »%s« nicht öffnen: %m"
 
 #: lib/stringinfo.c:259
 #, c-format
 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:235
+#: libpq/auth.c:238
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
-msgstr "Authentifizierung für Benutzer „%s“ fehlgeschlagen: Host abgelehnt"
+msgstr "Authentifizierung für Benutzer »%s« fehlgeschlagen: Host abgelehnt"
 
-#: libpq/auth.c:238
+#: libpq/auth.c:241
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
-msgstr "„trust“-Authentifizierung für Benutzer „%s“ fehlgeschlagen"
+msgstr "»trust«-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:241
+#: libpq/auth.c:244
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
-msgstr "Ident-Authentifizierung für Benutzer „%s“ fehlgeschlagen"
+msgstr "Ident-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:244
+#: libpq/auth.c:247
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
-msgstr "Peer-Authentifizierung für Benutzer „%s“ fehlgeschlagen"
+msgstr "Peer-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:248
+#: libpq/auth.c:251
 #, c-format
 msgid "password authentication failed for user \"%s\""
-msgstr "Passwort-Authentifizierung für Benutzer „%s“ fehlgeschlagen"
+msgstr "Passwort-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:253
+#: libpq/auth.c:256
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
-msgstr "GSSAPI-Authentifizierung für Benutzer „%s“ fehlgeschlagen"
+msgstr "GSSAPI-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:256
+#: libpq/auth.c:259
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
-msgstr "SSPI-Authentifizierung für Benutzer „%s“ fehlgeschlagen"
+msgstr "SSPI-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:259
+#: libpq/auth.c:262
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
-msgstr "PAM-Authentifizierung für Benutzer „%s“ fehlgeschlagen"
+msgstr "PAM-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:262
+#: libpq/auth.c:265
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
-msgstr "LDAP-Authentifizierung für Benutzer „%s“ fehlgeschlagen"
+msgstr "LDAP-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:265
+#: libpq/auth.c:268
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
-msgstr "Zertifikatauthentifizierung für Benutzer „%s“ fehlgeschlagen"
+msgstr "Zertifikatauthentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:268
+#: libpq/auth.c:271
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
-msgstr "RADIUS-Authentifizierung für Benutzer „%s“ fehlgeschlagen"
+msgstr "RADIUS-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:271
+#: libpq/auth.c:274
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
-msgstr "Authentifizierung für Benutzer „%s“ fehlgeschlagen: ungültige Authentifizierungsmethode"
+msgstr "Authentifizierung für Benutzer »%s« fehlgeschlagen: ungültige Authentifizierungsmethode"
 
-#: libpq/auth.c:275
+#: libpq/auth.c:278
 #, c-format
 msgid "Connection matched pg_hba.conf line %d: \"%s\""
-msgstr "Verbindung stimmte mit pg_hba.conf-Zeile %d überein: „%s“"
+msgstr "Verbindung stimmte mit pg_hba.conf-Zeile %d überein: »%s«"
 
-#: libpq/auth.c:330
+#: libpq/auth.c:333
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "Verbindung erfordert ein gültiges Client-Zertifikat"
 
-#: libpq/auth.c:372
+#: libpq/auth.c:375
 #, 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"
+msgstr "pg_hba.conf lehnt Replikationsverbindung ab für Host »%s«, Benutzer »%s«, %s"
 
-#: libpq/auth.c:374 libpq/auth.c:390 libpq/auth.c:448 libpq/auth.c:466
+#: libpq/auth.c:377 libpq/auth.c:393 libpq/auth.c:451 libpq/auth.c:469
 msgid "SSL off"
 msgstr "SSL aus"
 
-#: libpq/auth.c:374 libpq/auth.c:390 libpq/auth.c:448 libpq/auth.c:466
+#: libpq/auth.c:377 libpq/auth.c:393 libpq/auth.c:451 libpq/auth.c:469
 msgid "SSL on"
 msgstr "SSL an"
 
-#: libpq/auth.c:378
+#: libpq/auth.c:381
 #, 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“"
+msgstr "pg_hba.conf lehnt Replikationsverbindung ab für Host »%s«, Benutzer »%s«"
 
-#: libpq/auth.c:387
+#: libpq/auth.c:390
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s"
-msgstr "pg_hba.conf lehnt Verbindung ab für Host „%s“, Benutzer „%s“, Datenbank „%s“, %s"
+msgstr "pg_hba.conf lehnt Verbindung ab für Host »%s«, Benutzer »%s«, Datenbank »%s«, %s"
 
-#: libpq/auth.c:394
+#: libpq/auth.c:397
 #, 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“"
+msgstr "pg_hba.conf lehnt Verbindung ab für Host »%s«, Benutzer »%s«, Datenbank »%s«"
 
-#: libpq/auth.c:423
+#: libpq/auth.c:426
 #, 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."
+msgstr "Auflösung der Client-IP-Adresse ergab »%s«, Vorwärtsauflösung stimmt überein."
 
-#: libpq/auth.c:426
+#: libpq/auth.c:429
 #, 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."
+msgstr "Auflösung der Client-IP-Adresse ergab »%s«, Vorwärtsauflösung nicht geprüft."
 
-#: libpq/auth.c:429
+#: libpq/auth.c:432
 #, 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."
+msgstr "Auflösung der Client-IP-Adresse ergab »%s«, Vorwärtsauflösung stimmt nicht überein."
 
-#: libpq/auth.c:432
+#: libpq/auth.c:435
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
-msgstr "Konnte Client-Hostnamen „%s“ nicht in IP-Adresse übersetzen: %s."
+msgstr "Konnte Client-Hostnamen »%s« nicht in IP-Adresse übersetzen: %s."
 
-#: libpq/auth.c:437
+#: libpq/auth.c:440
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "Konnte Client-IP-Adresse nicht in einen Hostnamen auflösen: %s."
 
-#: libpq/auth.c:446
+#: libpq/auth.c:449
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s"
-msgstr "kein pg_hba.conf-Eintrag für Replikationsverbindung von Host „%s“, Benutzer „%s“, %s"
+msgstr "kein pg_hba.conf-Eintrag für Replikationsverbindung von Host »%s«, Benutzer »%s«, %s"
 
-#: libpq/auth.c:453
+#: libpq/auth.c:456
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
-msgstr "kein pg_hba.conf-Eintrag für Replikationsverbindung von Host „%s“, Benutzer „%s“"
+msgstr "kein pg_hba.conf-Eintrag für Replikationsverbindung von Host »%s«, Benutzer »%s«"
 
-#: libpq/auth.c:463
+#: libpq/auth.c:466
 #, 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"
+msgstr "kein pg_hba.conf-Eintrag für Host »%s«, Benutzer »%s«, Datenbank »%s«, %s"
 
-#: libpq/auth.c:471
+#: libpq/auth.c:474
 #, 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“"
+msgstr "kein pg_hba.conf-Eintrag für Host »%s«, Benutzer »%s«, Datenbank »%s«"
 
-#: libpq/auth.c:514 libpq/hba.c:1180
+#: libpq/auth.c:517 libpq/hba.c:1180
 #, c-format
 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"
+msgstr "MD5-Authentifizierung wird nicht unterstützt, wenn »db_user_namespace« angeschaltet ist"
 
-#: libpq/auth.c:640
+#: libpq/auth.c:643
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "Passwort-Antwort erwartet, Message-Typ %d empfangen"
 
-#: libpq/auth.c:668
+#: libpq/auth.c:671
 #, c-format
 msgid "invalid password packet size"
 msgstr "ungültige Größe des Passwortpakets"
 
-#: libpq/auth.c:798
+#: libpq/auth.c:801
 #, c-format
 msgid "GSSAPI is not supported in protocol version 2"
 msgstr "GSSAPI wird in Protokollversion 2 nicht unterstützt"
 
-#: libpq/auth.c:858
+#: libpq/auth.c:861
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "GSS-Antwort erwartet, Message-Typ %d empfangen"
 
-#: libpq/auth.c:919
+#: libpq/auth.c:922
 msgid "accepting GSS security context failed"
 msgstr "Annahme des GSS-Sicherheitskontexts fehlgeschlagen"
 
-#: libpq/auth.c:945
+#: libpq/auth.c:948
 msgid "retrieving GSS user name failed"
 msgstr "Abfrage des GSS-Benutzernamens fehlgeschlagen"
 
-#: libpq/auth.c:1062
+#: libpq/auth.c:1067
 #, c-format
 msgid "SSPI is not supported in protocol version 2"
 msgstr "SSL wird in Protokollversion 2 nicht unterstützt"
 
-#: libpq/auth.c:1077
+#: libpq/auth.c:1082
 msgid "could not acquire SSPI credentials"
 msgstr "konnte SSPI-Credentials nicht erhalten"
 
-#: libpq/auth.c:1095
+#: libpq/auth.c:1100
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "SSPI-Antwort erwartet, Message-Typ %d empfangen"
 
-#: libpq/auth.c:1167
+#: libpq/auth.c:1172
 msgid "could not accept SSPI security context"
 msgstr "konnte SSPI-Sicherheitskontext nicht akzeptieren"
 
-#: libpq/auth.c:1229
+#: libpq/auth.c:1234
 msgid "could not get token from SSPI security context"
 msgstr "konnte kein Token vom SSPI-Sicherheitskontext erhalten"
 
-#: libpq/auth.c:1476
+#: libpq/auth.c:1481
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "konnte Socket für Ident-Verbindung nicht erzeugen: %m"
 
-#: libpq/auth.c:1491
+#: libpq/auth.c:1496
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
-msgstr "konnte nicht mit lokaler Adresse „%s“ verbinden: %m"
+msgstr "konnte nicht mit lokaler Adresse »%s« verbinden: %m"
 
-#: libpq/auth.c:1503
+#: libpq/auth.c:1508
 #, 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"
+msgstr "konnte nicht mit Ident-Server auf Adresse »%s«, Port %s verbinden: %m"
 
-#: libpq/auth.c:1525
+#: libpq/auth.c:1530
 #, 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"
+msgstr "konnte Anfrage an Ident-Server auf Adresse »%s«, Port %s nicht senden: %m"
 
-#: libpq/auth.c:1542
+#: libpq/auth.c:1547
 #, 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"
+msgstr "konnte Antwort von Ident-Server auf Adresse »%s«, Port %s nicht empfangen: %m"
 
-#: libpq/auth.c:1552
+#: libpq/auth.c:1557
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
-msgstr "ungültig formatierte Antwort vom Ident-Server: „%s“"
+msgstr "ungültig formatierte Antwort vom Ident-Server: »%s«"
 
-#: libpq/auth.c:1592
+#: libpq/auth.c:1597
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "Peer-Authentifizierung wird auf dieser Plattform nicht unterstützt"
 
-#: libpq/auth.c:1596
+#: libpq/auth.c:1601
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "konnte Credentials von Gegenstelle nicht ermitteln: %m"
 
-#: libpq/auth.c:1605
+#: libpq/auth.c:1610
 #, c-format
 msgid "could not look up local user ID %ld: %s"
 msgstr "konnte lokale Benutzer-ID %ld nicht nachschlagen: %s"
 
-#: libpq/auth.c:1689 libpq/auth.c:1960 libpq/auth.c:2316
+#: libpq/auth.c:1694 libpq/auth.c:1965 libpq/auth.c:2324
 #, c-format
 msgid "empty password returned by client"
 msgstr "Client gab leeres Passwort zurück"
 
-#: libpq/auth.c:1699
+#: libpq/auth.c:1704
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "Fehler von der unteren PAM-Ebene: %s"
 
-#: libpq/auth.c:1768
+#: libpq/auth.c:1773
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "konnte PAM-Authenticator nicht erzeugen: %s"
 
-#: libpq/auth.c:1779
+#: libpq/auth.c:1784
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) fehlgeschlagen: %s"
 
-#: libpq/auth.c:1790
+#: libpq/auth.c:1795
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) fehlgeschlagen: %s"
 
-#: libpq/auth.c:1801
+#: libpq/auth.c:1806
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate fehlgeschlagen: %s"
 
-#: libpq/auth.c:1812
+#: libpq/auth.c:1817
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt fehlgeschlagen: %s"
 
-#: libpq/auth.c:1823
+#: libpq/auth.c:1828
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "konnte PAM-Authenticator nicht freigeben: %s"
 
-#: libpq/auth.c:1856
+#: libpq/auth.c:1861
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "konnte LDAP nicht initialisieren: %m"
 
-#: libpq/auth.c:1859
+#: libpq/auth.c:1864
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "konnte LDAP nicht initialisieren: Fehlercode %d"
 
-#: libpq/auth.c:1869
+#: libpq/auth.c:1874
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "konnte LDAP-Protokollversion nicht setzen: %s"
 
-#: libpq/auth.c:1898
+#: libpq/auth.c:1903
 #, c-format
 msgid "could not load wldap32.dll"
 msgstr "konnte wldap32.dll nicht laden"
 
-#: libpq/auth.c:1906
+#: libpq/auth.c:1911
 #, c-format
 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:1907
+#: libpq/auth.c:1912
 #, c-format
 msgid "LDAP over SSL is not supported on this platform."
 msgstr "LDAP über SSL wird auf dieser Plattform nicht unterstützt."
 
-#: libpq/auth.c:1922
+#: libpq/auth.c:1927
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "konnte LDAP-TLS-Sitzung nicht starten: %s"
 
-#: libpq/auth.c:1944
+#: libpq/auth.c:1949
 #, c-format
 msgid "LDAP server not specified"
 msgstr "LDAP-Server nicht angegeben"
 
-#: libpq/auth.c:1997
+#: libpq/auth.c:2002
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "ungültiges Zeichen im Benutzernamen für LDAP-Authentifizierung"
 
-#: libpq/auth.c:2012
+#: libpq/auth.c:2017
 #, c-format
 msgid "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s"
-msgstr "erstes LDAP-Binden für ldapbinddn „%s“ auf Server „%s“ fehlgeschlagen: %s"
+msgstr "erstes LDAP-Binden für ldapbinddn »%s« auf Server »%s« fehlgeschlagen: %s"
 
-#: libpq/auth.c:2036
+#: libpq/auth.c:2041
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
-msgstr "konnte LDAP nicht mit Filter „%s“ auf Server „%s“ durchsuchen: %s"
+msgstr "konnte LDAP nicht mit Filter »%s« auf Server »%s« durchsuchen: %s"
 
-#: libpq/auth.c:2047
+#: libpq/auth.c:2052
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
-msgstr "LDAP-Benutzer „%s“ existiert nicht"
+msgstr "LDAP-Benutzer »%s« existiert nicht"
 
-#: libpq/auth.c:2048
+#: libpq/auth.c:2053
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
-msgstr "LDAP-Suche nach Filter „%s“ auf Server „%s“ gab keine Einträge zurück."
+msgstr "LDAP-Suche nach Filter »%s« auf Server »%s« gab keine Einträge zurück."
 
-#: libpq/auth.c:2052
+#: libpq/auth.c:2057
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
-msgstr "LDAP-Benutzer „%s“ ist nicht eindeutig"
+msgstr "LDAP-Benutzer »%s« ist nicht eindeutig"
 
-#: libpq/auth.c:2053
+#: libpq/auth.c:2058
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned %d entry."
 msgid_plural "LDAP search for filter \"%s\" on server \"%s\" returned %d entries."
-msgstr[0] "LDAP-Suche nach Filter „%s“ auf Server „%s“ gab %d Eintrag zurück."
-msgstr[1] "LDAP-Suche nach Filter „%s“ auf Server „%s“ gab %d Einträge zurück."
+msgstr[0] "LDAP-Suche nach Filter »%s« auf Server »%s« gab %d Eintrag zurück."
+msgstr[1] "LDAP-Suche nach Filter »%s« auf Server »%s« gab %d Einträge zurück."
 
-#: libpq/auth.c:2071
+#: libpq/auth.c:2076
 #, 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"
+msgstr "konnte DN fũr den ersten Treffer für »%s« auf Server »%s« nicht lesen: %s"
 
-#: libpq/auth.c:2091
+#: libpq/auth.c:2096
 #, 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"
+msgstr "Losbinden fehlgeschlagen nach Suche nach Benutzer »%s« auf Server »%s«: %s"
 
-#: libpq/auth.c:2121
+#: libpq/auth.c:2126
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
-msgstr "LDAP-Login fehlgeschlagen für Benutzer „%s“ auf Server „%s“: %s"
+msgstr "LDAP-Login fehlgeschlagen für Benutzer »%s« auf Server »%s«: %s"
 
-#: libpq/auth.c:2149
+#: libpq/auth.c:2154
 #, c-format
 msgid "certificate authentication failed for user \"%s\": client certificate contains no user name"
-msgstr "Zertifikatauthentifizierung für Benutzer „%s“ fehlgeschlagen: Client-Zertifikat enthält keinen Benutzernamen"
+msgstr "Zertifikatauthentifizierung für Benutzer »%s« fehlgeschlagen: Client-Zertifikat enthält keinen Benutzernamen"
 
-#: libpq/auth.c:2272
+#: libpq/auth.c:2280
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "RADIUS-Server nicht angegeben"
 
-#: libpq/auth.c:2279
+#: libpq/auth.c:2287
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "RADIUS-Geheimnis nicht angegeben"
 
-#: libpq/auth.c:2295 libpq/hba.c:1590
+#: libpq/auth.c:2303 libpq/hba.c:1590
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
-msgstr "konnte RADIUS-Servername „%s“ nicht in Adresse übersetzen: %s"
+msgstr "konnte RADIUS-Servername »%s« nicht in Adresse übersetzen: %s"
 
-#: libpq/auth.c:2323
+#: libpq/auth.c:2331
 #, c-format
 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:2334
+#: libpq/auth.c:2342
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "konnte zufälligen Verschlüsselungsvektor nicht erzeugen"
 
-#: libpq/auth.c:2357
+#: libpq/auth.c:2365
 #, c-format
 msgid "could not perform MD5 encryption of password"
 msgstr "konnte MD5-Verschlüsselung des Passworts nicht durchführen"
 
-#: libpq/auth.c:2379
+#: libpq/auth.c:2387
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "konnte RADIUS-Socket nicht erstellen: %m"
 
-#: libpq/auth.c:2400
+#: libpq/auth.c:2408
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "konnte lokales RADIUS-Socket nicht binden: %m"
 
-#: libpq/auth.c:2410
+#: libpq/auth.c:2418
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "konnte RADIUS-Paket nicht senden: %m"
 
-#: libpq/auth.c:2443 libpq/auth.c:2468
+#: libpq/auth.c:2451 libpq/auth.c:2476
 #, c-format
 msgid "timeout waiting for RADIUS response"
 msgstr "Zeitüberschreitung beim Warten auf RADIUS-Antwort"
 
-#: libpq/auth.c:2461
+#: libpq/auth.c:2469
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "konnte Status des RADIUS-Sockets nicht prüfen: %m"
 
-#: libpq/auth.c:2490
+#: libpq/auth.c:2498
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "konnte RADIUS-Antwort nicht lesen: %m"
 
-#: libpq/auth.c:2502 libpq/auth.c:2506
+#: libpq/auth.c:2510 libpq/auth.c:2514
 #, c-format
 msgid "RADIUS response was sent from incorrect port: %d"
 msgstr "RADIUS-Antwort wurde von falschem Port gesendet: %d"
 
-#: libpq/auth.c:2515
+#: libpq/auth.c:2523
 #, c-format
 msgid "RADIUS response too short: %d"
 msgstr "RADIUS-Antwort zu kurz: %d"
 
-#: libpq/auth.c:2522
+#: libpq/auth.c:2530
 #, c-format
 msgid "RADIUS response has corrupt length: %d (actual length %d)"
 msgstr "RADIUS-Antwort hat verfälschte Länge: %d (tatsächliche Länge %d)"
 
-#: libpq/auth.c:2530
+#: libpq/auth.c:2538
 #, c-format
 msgid "RADIUS response is to a different request: %d (should be %d)"
 msgstr "RADIUS-Antwort unterscheidet sich von Anfrage: %d (sollte %d sein)"
 
-#: libpq/auth.c:2555
+#: libpq/auth.c:2563
 #, c-format
 msgid "could not perform MD5 encryption of received packet"
 msgstr "konnte MD5-Verschlüsselung des empfangenen Pakets nicht durchführen"
 
-#: libpq/auth.c:2564
+#: libpq/auth.c:2572
 #, c-format
 msgid "RADIUS response has incorrect MD5 signature"
 msgstr "RADIUS-Antwort hat falsche MD5-Signatur"
 
-#: libpq/auth.c:2581
+#: libpq/auth.c:2589
 #, c-format
 msgid "RADIUS response has invalid code (%d) for user \"%s\""
-msgstr "RADIUS-Antwort hat ungültigen Code (%d) für Benutzer „%s“"
+msgstr "RADIUS-Antwort hat ungültigen Code (%d) für Benutzer »%s«"
 
 #: libpq/be-fsstubs.c:134 libpq/be-fsstubs.c:165 libpq/be-fsstubs.c:199
 #: libpq/be-fsstubs.c:239 libpq/be-fsstubs.c:264 libpq/be-fsstubs.c:312
@@ -10736,12 +10779,12 @@
 #: libpq/be-fsstubs.c:471
 #, c-format
 msgid "could not open server file \"%s\": %m"
-msgstr "konnte Serverdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Serverdatei »%s« nicht öffnen: %m"
 
 #: libpq/be-fsstubs.c:493
 #, c-format
 msgid "could not read server file \"%s\": %m"
-msgstr "konnte Serverdatei „%s“ nicht lesen: %m"
+msgstr "konnte Serverdatei »%s« nicht lesen: %m"
 
 #: libpq/be-fsstubs.c:523
 #, c-format
@@ -10756,12 +10799,12 @@
 #: libpq/be-fsstubs.c:549
 #, c-format
 msgid "could not create server file \"%s\": %m"
-msgstr "konnte Serverdatei „%s“ nicht erstellen: %m"
+msgstr "konnte Serverdatei »%s« nicht erstellen: %m"
 
 #: libpq/be-fsstubs.c:561
 #, c-format
 msgid "could not write server file \"%s\": %m"
-msgstr "konnte Serverdatei „%s“ nicht schreiben: %m"
+msgstr "konnte Serverdatei »%s« nicht schreiben: %m"
 
 #: libpq/be-fsstubs.c:815
 #, c-format
@@ -10773,122 +10816,122 @@
 msgid "requested length cannot be negative"
 msgstr "verlangte Länge darf nicht negativ sein"
 
-#: libpq/be-secure-openssl.c:184
+#: libpq/be-secure-openssl.c:189
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "konnte SSL-Kontext nicht erzeugen: %s"
 
-#: libpq/be-secure-openssl.c:200
+#: libpq/be-secure-openssl.c:205
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
-msgstr "konnte Serverzertifikatsdatei „%s“ nicht laden: %s"
+msgstr "konnte Serverzertifikatsdatei »%s« nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:206
+#: libpq/be-secure-openssl.c:211
 #, c-format
 msgid "could not access private key file \"%s\": %m"
-msgstr "konnte auf private Schlüsseldatei „%s“ nicht zugreifen: %m"
+msgstr "konnte auf private Schlüsseldatei »%s« nicht zugreifen: %m"
 
-#: libpq/be-secure-openssl.c:221
+#: libpq/be-secure-openssl.c:226
 #, c-format
 msgid "private key file \"%s\" has group or world access"
-msgstr "private Schlüsseldatei „%s“ erlaubt Zugriff von Gruppe oder Welt"
+msgstr "private Schlüsseldatei »%s« erlaubt Zugriff von Gruppe oder Welt"
 
-#: libpq/be-secure-openssl.c:223
+#: libpq/be-secure-openssl.c:228
 #, c-format
 msgid "Permissions should be u=rw (0600) or less."
 msgstr "Rechte sollten u=rw (0600) oder weniger sein."
 
-#: libpq/be-secure-openssl.c:230
+#: libpq/be-secure-openssl.c:235
 #, c-format
 msgid "could not load private key file \"%s\": %s"
-msgstr "konnte private Schlüsseldatei „%s“ nicht laden: %s"
+msgstr "konnte private Schlüsseldatei »%s« nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:235
+#: libpq/be-secure-openssl.c:240
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "Überprüfung des privaten Schlüssels fehlgeschlagen: %s"
 
-#: libpq/be-secure-openssl.c:264
+#: libpq/be-secure-openssl.c:269
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
-msgstr "konnte Root-Zertifikat-Datei „%s“ nicht laden: %s"
+msgstr "konnte Root-Zertifikat-Datei »%s« nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:288
+#: libpq/be-secure-openssl.c:293
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" ignored"
-msgstr "SSL-Certificate-Revocation-List-Datei „%s“ ignoriert"
+msgstr "SSL-Certificate-Revocation-List-Datei »%s« ignoriert"
 
-#: libpq/be-secure-openssl.c:290
+#: libpq/be-secure-openssl.c:295
 #, c-format
 msgid "SSL library does not support certificate revocation lists."
 msgstr "SSL-Bibliothek unterstützt keine Certificate-Revocation-Lists."
 
-#: libpq/be-secure-openssl.c:295
+#: libpq/be-secure-openssl.c:300
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
-msgstr "konnte SSL-Certificate-Revocation-List-Datei „%s“ nicht laden: %s"
+msgstr "konnte SSL-Certificate-Revocation-List-Datei »%s« nicht laden: %s"
 
-#: libpq/be-secure-openssl.c:341
+#: libpq/be-secure-openssl.c:347
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "konnte SSL-Verbindung nicht initialisieren: %s"
 
-#: libpq/be-secure-openssl.c:349
+#: libpq/be-secure-openssl.c:355
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "konnte SSL-Socket nicht setzen: %s"
 
-#: libpq/be-secure-openssl.c:383
+#: libpq/be-secure-openssl.c:409
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "konnte SSL-Verbindung nicht annehmen: %m"
 
-#: libpq/be-secure-openssl.c:387 libpq/be-secure-openssl.c:398
+#: libpq/be-secure-openssl.c:413 libpq/be-secure-openssl.c:424
 #, c-format
 msgid "could not accept SSL connection: EOF detected"
 msgstr "konnte SSL-Verbindung nicht annehmen: EOF entdeckt"
 
-#: libpq/be-secure-openssl.c:392
+#: libpq/be-secure-openssl.c:418
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "konnte SSL-Verbindung nicht annehmen: %s"
 
-#: libpq/be-secure-openssl.c:403 libpq/be-secure-openssl.c:541
-#: libpq/be-secure-openssl.c:598
+#: libpq/be-secure-openssl.c:429 libpq/be-secure-openssl.c:570
+#: libpq/be-secure-openssl.c:630
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "unbekannter SSL-Fehlercode: %d"
 
-#: libpq/be-secure-openssl.c:447
+#: libpq/be-secure-openssl.c:473
 #, c-format
 msgid "SSL certificate's common name contains embedded null"
 msgstr "Common-Name im SSL-Zertifikat enthält Null-Byte"
 
-#: libpq/be-secure-openssl.c:458
+#: libpq/be-secure-openssl.c:484
 #, c-format
 msgid "SSL connection from \"%s\""
-msgstr "SSL-Verbindung von „%s“"
+msgstr "SSL-Verbindung von »%s«"
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:561 libpq/be-secure-openssl.c:621
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSL-Fehler: %s"
 
-#: libpq/be-secure-openssl.c:937
+#: libpq/be-secure-openssl.c:1032
 #, c-format
 msgid "ECDH: unrecognized curve name: %s"
 msgstr "ECDH: unbekannter Kurvenname: %s"
 
-#: libpq/be-secure-openssl.c:942
+#: libpq/be-secure-openssl.c:1037
 #, c-format
 msgid "ECDH: could not create key"
 msgstr "ECDH: konnte Schlüssel nicht erzeugen"
 
-#: libpq/be-secure-openssl.c:966
+#: libpq/be-secure-openssl.c:1061
 msgid "no SSL error reported"
 msgstr "kein SSL-Fehler berichtet"
 
-#: libpq/be-secure-openssl.c:970
+#: libpq/be-secure-openssl.c:1065
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL-Fehlercode %lu"
@@ -10896,22 +10939,22 @@
 #: libpq/crypt.c:60
 #, c-format
 msgid "User \"%s\" has no password assigned."
-msgstr "Benutzer „%s“ hat kein Passwort zugewiesen."
+msgstr "Benutzer »%s« hat kein Passwort zugewiesen."
 
 #: libpq/crypt.c:150
 #, c-format
 msgid "User \"%s\" has an expired password."
-msgstr "Benutzer „%s“ hat ein abgelaufenes Passwort."
+msgstr "Benutzer »%s« hat ein abgelaufenes Passwort."
 
 #: libpq/hba.c:188
 #, c-format
 msgid "authentication file token too long, skipping: \"%s\""
-msgstr "Token in Authentifizierungsdatei zu lang, wird übersprungen: „%s“"
+msgstr "Token in Authentifizierungsdatei zu lang, wird übersprungen: »%s«"
 
 #: libpq/hba.c:332
 #, c-format
 msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
-msgstr "konnte sekundäre Authentifizierungsdatei „@%s“ nicht als „%s“ öffnen: %m"
+msgstr "konnte sekundäre Authentifizierungsdatei »@%s« nicht als »%s« öffnen: %m"
 
 #: libpq/hba.c:409
 #, c-format
@@ -10930,23 +10973,23 @@
 #: libpq/hba.c:1610 libpq/hba.c:1631 tsearch/ts_locale.c:182
 #, c-format
 msgid "line %d of configuration file \"%s\""
-msgstr "Zeile %d in Konfigurationsdatei „%s“"
+msgstr "Zeile %d in Konfigurationsdatei »%s«"
 
 #. translator: the second %s is a list of auth methods
 #: libpq/hba.c:755
 #, c-format
 msgid "authentication option \"%s\" is only valid for authentication methods %s"
-msgstr "Authentifizierungsoption „%s“ ist nur gültig für Authentifizierungsmethoden %s"
+msgstr "Authentifizierungsoption »%s« ist nur gültig für Authentifizierungsmethoden %s"
 
 #: libpq/hba.c:771
 #, c-format
 msgid "authentication method \"%s\" requires argument \"%s\" to be set"
-msgstr "Authentifizierungsmethode „%s“ benötigt Argument „%s“"
+msgstr "Authentifizierungsmethode »%s« benötigt Argument »%s«"
 
 #: libpq/hba.c:792
 #, c-format
 msgid "missing entry in file \"%s\" at end of line %d"
-msgstr "fehlender Eintrag in Datei „%s“ am Ende von Zeile %d"
+msgstr "fehlender Eintrag in Datei »%s« am Ende von Zeile %d"
 
 #: libpq/hba.c:802
 #, c-format
@@ -10991,7 +11034,7 @@
 #: libpq/hba.c:912
 #, c-format
 msgid "invalid connection type \"%s\""
-msgstr "ungültiger Verbindungstyp „%s“"
+msgstr "ungültiger Verbindungstyp »%s«"
 
 #: libpq/hba.c:925
 #, c-format
@@ -11021,17 +11064,17 @@
 #: libpq/hba.c:1030
 #, c-format
 msgid "invalid IP address \"%s\": %s"
-msgstr "ungültige IP-Adresse „%s“: %s"
+msgstr "ungültige IP-Adresse »%s«: %s"
 
 #: libpq/hba.c:1048
 #, c-format
 msgid "specifying both host name and CIDR mask is invalid: \"%s\""
-msgstr "Angabe von sowohl Hostname als auch CIDR-Maske ist ungültig: „%s“"
+msgstr "Angabe von sowohl Hostname als auch CIDR-Maske ist ungültig: »%s«"
 
 #: libpq/hba.c:1060
 #, c-format
 msgid "invalid CIDR mask in address \"%s\""
-msgstr "ungültige CIDR-Maske in Adresse „%s“"
+msgstr "ungültige CIDR-Maske in Adresse »%s«"
 
 #: libpq/hba.c:1077
 #, c-format
@@ -11051,7 +11094,7 @@
 #: libpq/hba.c:1101
 #, c-format
 msgid "invalid IP mask \"%s\": %s"
-msgstr "ungültige IP-Maske „%s“: %s"
+msgstr "ungültige IP-Maske »%s«: %s"
 
 #: libpq/hba.c:1118
 #, c-format
@@ -11076,12 +11119,12 @@
 #: libpq/hba.c:1211
 #, c-format
 msgid "invalid authentication method \"%s\""
-msgstr "ungültige Authentifizierungsmethode „%s“"
+msgstr "ungültige Authentifizierungsmethode »%s«"
 
 #: libpq/hba.c:1222
 #, c-format
 msgid "invalid authentication method \"%s\": not supported by this build"
-msgstr "ungültige Authentifizierungsmethode „%s“: von dieser Installation nicht unterstützt"
+msgstr "ungültige Authentifizierungsmethode »%s«: von dieser Installation nicht unterstützt"
 
 #: libpq/hba.c:1243
 #, c-format
@@ -11096,7 +11139,7 @@
 #: libpq/hba.c:1271
 #, c-format
 msgid "cert authentication is only supported on hostssl connections"
-msgstr "cert-Authentifizierung wird nur auf „hostssl“-Verbindungen unterstützt"
+msgstr "cert-Authentifizierung wird nur auf »hostssl«-Verbindungen unterstützt"
 
 #: libpq/hba.c:1309
 #, c-format
@@ -11111,7 +11154,7 @@
 #: libpq/hba.c:1356
 #, c-format
 msgid "authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix\", or \"ldapsuffix\" to be set"
-msgstr "Authentifizierungsmethode „ldap“ benötigt Argument „ldapbasedn“, „ldapprefix“ oder „ldapsuffix“"
+msgstr "Authentifizierungsmethode »ldap« benötigt Argument »ldapbasedn«, »ldapprefix« oder »ldapsuffix«"
 
 #: libpq/hba.c:1399
 msgid "ident, peer, gssapi, sspi, and cert"
@@ -11120,7 +11163,7 @@
 #: libpq/hba.c:1412
 #, c-format
 msgid "clientcert can only be configured for \"hostssl\" rows"
-msgstr "clientcert kann nur für „hostssl“-Zeilen konfiguriert werden"
+msgstr "clientcert kann nur für »hostssl«-Zeilen konfiguriert werden"
 
 #: libpq/hba.c:1423
 #, c-format
@@ -11130,12 +11173,12 @@
 #: libpq/hba.c:1437
 #, c-format
 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"
+msgstr "clientcert kann nicht auf 0 gesetzt sein, wenn »cert«-Authentifizierung verwendet wird"
 
 #: libpq/hba.c:1464
 #, c-format
 msgid "could not parse LDAP URL \"%s\": %s"
-msgstr "konnte LDAP-URL „%s“ nicht interpretieren: %s"
+msgstr "konnte LDAP-URL »%s« nicht interpretieren: %s"
 
 #: libpq/hba.c:1472
 #, c-format
@@ -11155,7 +11198,7 @@
 #: libpq/hba.c:1520
 #, c-format
 msgid "invalid LDAP port number: \"%s\""
-msgstr "ungültige LDAP-Portnummer: „%s“"
+msgstr "ungültige LDAP-Portnummer: »%s«"
 
 #: libpq/hba.c:1560 libpq/hba.c:1567
 msgid "gssapi and sspi"
@@ -11164,32 +11207,32 @@
 #: libpq/hba.c:1609
 #, c-format
 msgid "invalid RADIUS port number: \"%s\""
-msgstr "ungültige RADIUS-Portnummer: „%s“"
+msgstr "ungültige RADIUS-Portnummer: »%s«"
 
 #: libpq/hba.c:1629
 #, c-format
 msgid "unrecognized authentication option name: \"%s\""
-msgstr "unbekannter Authentifizierungsoptionsname: „%s“"
+msgstr "unbekannter Authentifizierungsoptionsname: »%s«"
 
 #: libpq/hba.c:1814
 #, c-format
 msgid "configuration file \"%s\" contains no entries"
-msgstr "Konfigurationsdatei „%s“ enthält keine Einträge"
+msgstr "Konfigurationsdatei »%s« enthält keine Einträge"
 
 #: libpq/hba.c:1910
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
-msgstr "ungültiger regulärer Ausdruck „%s“: %s"
+msgstr "ungültiger regulärer Ausdruck »%s«: %s"
 
 #: libpq/hba.c:1970
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
-msgstr "Suche nach regulärem Ausdruck für „%s“ fehlgeschlagen: %s"
+msgstr "Suche nach regulärem Ausdruck für »%s« fehlgeschlagen: %s"
 
 #: libpq/hba.c:1989
 #, c-format
 msgid "regular expression \"%s\" has no subexpressions as requested by backreference in \"%s\""
-msgstr "regulärer Ausdruck „%s“ hat keine Teilausdrücke wie von der Backreference in „%s“ verlangt"
+msgstr "regulärer Ausdruck »%s« hat keine Teilausdrücke wie von der Backreference in »%s« verlangt"
 
 #: libpq/hba.c:2086
 #, c-format
@@ -11199,12 +11242,12 @@
 #: libpq/hba.c:2106
 #, 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“"
+msgstr "kein passender Eintrag in Usermap »%s« für Benutzer »%s«, authentifiziert als »%s«"
 
 #: libpq/hba.c:2141
 #, c-format
 msgid "could not open usermap file \"%s\": %m"
-msgstr "konnte Usermap-Datei „%s“ nicht öffnen: %m"
+msgstr "konnte Usermap-Datei »%s« nicht öffnen: %m"
 
 #: libpq/pqcomm.c:201
 #, c-format
@@ -11214,17 +11257,17 @@
 #: libpq/pqcomm.c:348
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
-msgstr "Unix-Domain-Socket-Pfad „%s“ ist zu lang (maximal %d Bytes)"
+msgstr "Unix-Domain-Socket-Pfad »%s« ist zu lang (maximal %d Bytes)"
 
 #: libpq/pqcomm.c:369
 #, c-format
 msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
-msgstr "konnte Hostname „%s“, Dienst „%s“ nicht in Adresse übersetzen: %s"
+msgstr "konnte Hostname »%s«, Dienst »%s« nicht in Adresse übersetzen: %s"
 
 #: libpq/pqcomm.c:373
 #, c-format
 msgid "could not translate service \"%s\" to address: %s"
-msgstr "konnte Dienst „%s“ nicht in Adresse übersetzen: %s"
+msgstr "konnte Dienst »%s« nicht in Adresse übersetzen: %s"
 
 #: libpq/pqcomm.c:400
 #, c-format
@@ -11273,7 +11316,7 @@
 #: libpq/pqcomm.c:496
 #, c-format
 msgid "Is another postmaster already running on port %d? If not, remove socket file \"%s\" and retry."
-msgstr "Läuft bereits ein anderer Postmaster auf Port %d? Wenn nicht, entfernen Sie die Socketdatei „%s“ und versuchen Sie erneut."
+msgstr "Läuft bereits ein anderer Postmaster auf Port %d? Wenn nicht, entfernen Sie die Socketdatei »%s« und versuchen Sie erneut."
 
 #: libpq/pqcomm.c:499
 #, c-format
@@ -11289,17 +11332,17 @@
 #: libpq/pqcomm.c:617
 #, c-format
 msgid "group \"%s\" does not exist"
-msgstr "Gruppe „%s“ existiert nicht"
+msgstr "Gruppe »%s« existiert nicht"
 
 #: libpq/pqcomm.c:627
 #, c-format
 msgid "could not set group of file \"%s\": %m"
-msgstr "konnte Gruppe von Datei „%s“ nicht setzen: %m"
+msgstr "konnte Gruppe von Datei »%s« nicht setzen: %m"
 
 #: libpq/pqcomm.c:638
 #, c-format
 msgid "could not set permissions of file \"%s\": %m"
-msgstr "konnte Zugriffsrechte von Datei „%s“ nicht setzen: %m"
+msgstr "konnte Zugriffsrechte von Datei »%s« nicht setzen: %m"
 
 #: libpq/pqcomm.c:668
 #, c-format
@@ -11316,7 +11359,7 @@
 msgid "could not receive data from client: %m"
 msgstr "konnte Daten vom Client nicht empfangen: %m"
 
-#: libpq/pqcomm.c:1139 tcop/postgres.c:3902
+#: libpq/pqcomm.c:1139 tcop/postgres.c:3917
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "breche Verbindung ab, weil Protokollsynchronisierung verloren wurde"
@@ -11425,7 +11468,7 @@
 #: main/main.c:336
 #, c-format
 msgid "  -F                 turn fsync off\n"
-msgstr "  -F                 „fsync“ ausschalten\n"
+msgstr "  -F                 »fsync« ausschalten\n"
 
 #: main/main.c:337
 #, c-format
@@ -11455,7 +11498,7 @@
 #: main/main.c:344
 #, c-format
 msgid "  -o OPTIONS         pass \"OPTIONS\" to each server process (obsolete)\n"
-msgstr "  -o OPTIONEN        „OPTIONEN“ an jeden Serverprozess weiterreichen (obsolet)\n"
+msgstr "  -o OPTIONEN        »OPTIONEN« an jeden Serverprozess weiterreichen (obsolet)\n"
 
 #: main/main.c:345
 #, c-format
@@ -11626,7 +11669,7 @@
 "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"
+"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"
@@ -11654,7 +11697,7 @@
 
 #: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:1820
 #: parser/parse_coerce.c:1848 parser/parse_coerce.c:1924
-#: parser/parse_expr.c:1981 parser/parse_func.c:597 parser/parse_oper.c:952
+#: parser/parse_expr.c:1994 parser/parse_func.c:597 parser/parse_oper.c:952
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "konnte Arraytyp für Datentyp %s nicht finden"
@@ -11686,44 +11729,49 @@
 msgstr "%s kann nicht auf die nullbare Seite eines äußeren Verbundes angewendet werden"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1330 parser/analyze.c:1481 parser/analyze.c:1679
-#: parser/analyze.c:2460
+#: optimizer/plan/planner.c:1341 parser/analyze.c:1478 parser/analyze.c:1676
+#: parser/analyze.c:2457
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s ist nicht in UNION/INTERSECT/EXCEPT erlaubt"
 
-#: optimizer/plan/planner.c:3587
+#: optimizer/plan/planner.c:1762 optimizer/plan/planner.c:3603
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "konnte GROUP BY nicht implementieren"
 
-#: optimizer/plan/planner.c:3588 optimizer/plan/planner.c:3756
+#: optimizer/plan/planner.c:1763
+#, c-format
+msgid "Some of the datatypes do not support sorting, which is required for grouping sets."
+msgstr "Einige der Datentypen unterstützen kein Sortieren, was für Grouping-Sets benötigt wird."
+
+#: optimizer/plan/planner.c:3604 optimizer/plan/planner.c:3772
 #: optimizer/prep/prepunion.c:828
 #, c-format
 msgid "Some of the datatypes only support hashing, while others only support sorting."
 msgstr "Einige Datentypen unterstützen nur Hashing, während andere nur Sortieren unterstützen."
 
-#: optimizer/plan/planner.c:3755
+#: optimizer/plan/planner.c:3771
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "konnte DISTINCT nicht implementieren"
 
-#: optimizer/plan/planner.c:4361
+#: optimizer/plan/planner.c:4377
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "konnte PARTITION BY für Fenster nicht implementieren"
 
-#: optimizer/plan/planner.c:4362
+#: optimizer/plan/planner.c:4378
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "Fensterpartitionierungsspalten müssen sortierbare Datentypen haben."
 
-#: optimizer/plan/planner.c:4366
+#: optimizer/plan/planner.c:4382
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "konnte ORDER BY für Fenster nicht implementieren"
 
-#: optimizer/plan/planner.c:4367
+#: optimizer/plan/planner.c:4383
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "Fenstersortierspalten müssen sortierbare Datentypen haben."
@@ -11749,37 +11797,37 @@
 msgid "could not implement %s"
 msgstr "konnte %s nicht implementieren"
 
-#: optimizer/util/clauses.c:4597
+#: optimizer/util/clauses.c:4693
 #, c-format
 msgid "SQL function \"%s\" during inlining"
-msgstr "SQL-Funktion „%s“ beim Inlining"
+msgstr "SQL-Funktion »%s« beim Inlining"
 
 #: optimizer/util/plancat.c:108
 #, c-format
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr "während der Wiederherstellung kann nicht auf temporäre oder ungeloggte Tabellen zugegriffen werden"
 
-#: optimizer/util/plancat.c:498
+#: optimizer/util/plancat.c:490
 #, c-format
-msgid "system columns cannot be used in an ON CONFLICT clause"
-msgstr "Systemspalten können nicht in der ON-CONFLICT-Klausel verwendet werden"
+msgid "whole row unique index inference specifications are not supported"
+msgstr "Inferenzangaben mit Unique-Index über die gesamte Zeile werden nicht unterstützt"
 
-#: optimizer/util/plancat.c:516
+#: optimizer/util/plancat.c:507
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "Constraint in der ON-CONFLICT-Klausel hat keinen zugehörigen Index"
 
-#: optimizer/util/plancat.c:568
+#: optimizer/util/plancat.c:558
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UDPATE nicht unterstützt mit Exclusion-Constraints"
 
-#: optimizer/util/plancat.c:675
+#: optimizer/util/plancat.c:663
 #, c-format
 msgid "there is no unique or exclusion constraint matching the ON CONFLICT specification"
 msgstr "es gibt keinen Unique-Constraint oder Exclusion-Constraint, der auf die ON-CONFLICT-Angabe passt"
 
-#: parser/analyze.c:639 parser/analyze.c:1253
+#: parser/analyze.c:639 parser/analyze.c:1250
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "VALUES-Listen müssen alle die gleiche Länge haben"
@@ -11799,180 +11847,180 @@
 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:1074 parser/analyze.c:1454
+#: parser/analyze.c:1071 parser/analyze.c:1451
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO ist hier nicht erlaubt"
 
-#: parser/analyze.c:1267
+#: parser/analyze.c:1264
 #, c-format
 msgid "DEFAULT can only appear in a VALUES list within INSERT"
 msgstr "DEFAULT kann nur in VALUES-Liste innerhalb von INSERT auftreten"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1386 parser/analyze.c:2630
+#: parser/analyze.c:1383 parser/analyze.c:2627
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s kann nicht auf VALUES angewendet werden"
 
-#: parser/analyze.c:1607
+#: parser/analyze.c:1604
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "ungültige ORDER-BY-Klausel mit UNION/INTERSECT/EXCEPT"
 
-#: parser/analyze.c:1608
+#: parser/analyze.c:1605
 #, c-format
 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:1609
+#: parser/analyze.c:1606
 #, c-format
 msgid "Add the expression/function to every SELECT, or move the UNION into a FROM clause."
 msgstr "Fügen Sie den Ausdrück/die Funktion jedem SELECT hinzu oder verlegen Sie die UNION in eine FROM-Klausel."
 
-#: parser/analyze.c:1669
+#: parser/analyze.c:1666
 #, c-format
 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:1733
+#: parser/analyze.c:1730
 #, c-format
 msgid "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"
 msgstr "Teilanweisung von UNION/INTERSECT/EXCEPT kann nicht auf andere Relationen auf der selben Anfrageebene verweisen"
 
-#: parser/analyze.c:1822
+#: parser/analyze.c:1819
 #, 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:2215
+#: parser/analyze.c:2212
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "RETURNING muss mindestens eine Spalte haben"
 
-#: parser/analyze.c:2252
+#: parser/analyze.c:2249
 #, c-format
 msgid "cannot specify both SCROLL and NO SCROLL"
 msgstr "SCROLL und NO SCROLL können nicht beide angegeben werden"
 
-#: parser/analyze.c:2270
+#: parser/analyze.c:2267
 #, c-format
 msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
 msgstr "DECLARE CURSOR darf keine datenmodifizierenden Anweisungen in WITH enthalten"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2278
+#: parser/analyze.c:2275
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s wird nicht unterstützt"
 
-#: parser/analyze.c:2281
+#: parser/analyze.c:2278
 #, c-format
 msgid "Holdable cursors must be READ ONLY."
 msgstr "Haltbare Cursor müssen READ ONLY sein."
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2289
+#: parser/analyze.c:2286
 #, c-format
 msgid "DECLARE SCROLL CURSOR ... %s is not supported"
 msgstr "DECLARE SCROLL CURSOR ... %s wird nicht unterstützt"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2300
+#: parser/analyze.c:2297
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not supported"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s wird nicht unterstützt"
 
-#: parser/analyze.c:2303
+#: parser/analyze.c:2300
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "Insensitive Cursor müssen READ ONLY sein."
 
-#: parser/analyze.c:2369
+#: parser/analyze.c:2366
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr "materialisierte Sichten dürfen keine datenmodifizierenden Anweisungen in WITH verwenden"
 
-#: parser/analyze.c:2379
+#: parser/analyze.c:2376
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr "materialisierte Sichten dürfen keine temporären Tabellen oder Sichten verwenden"
 
-#: parser/analyze.c:2389
+#: parser/analyze.c:2386
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr "materialisierte Sichten können nicht unter Verwendung von gebundenen Parametern definiert werden"
 
-#: parser/analyze.c:2401
+#: parser/analyze.c:2398
 #, c-format
 msgid "materialized views cannot be UNLOGGED"
 msgstr "materialisierte Sichten können nicht UNLOGGED sein"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2467
+#: parser/analyze.c:2464
 #, c-format
 msgid "%s is not allowed with DISTINCT clause"
 msgstr "%s ist nicht mit DISTINCT-Klausel erlaubt"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2474
+#: parser/analyze.c:2471
 #, c-format
 msgid "%s is not allowed with GROUP BY clause"
 msgstr "%s ist nicht mit GROUP-BY-Klausel erlaubt"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2481
+#: parser/analyze.c:2478
 #, c-format
 msgid "%s is not allowed with HAVING clause"
 msgstr "%s ist nicht mit HAVING-Klausel erlaubt"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2488
+#: parser/analyze.c:2485
 #, c-format
 msgid "%s is not allowed with aggregate functions"
 msgstr "%s ist nicht mit Aggregatfunktionen erlaubt"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2495
+#: parser/analyze.c:2492
 #, c-format
 msgid "%s is not allowed with window functions"
 msgstr "%s ist nicht mit Fensterfunktionen erlaubt"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2502
+#: parser/analyze.c:2499
 #, c-format
 msgid "%s is not allowed with set-returning functions in the target list"
 msgstr "%s ist nicht mit Funktionen mit Ergebnismenge in der Targetliste erlaubt"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2581
+#: parser/analyze.c:2578
 #, c-format
 msgid "%s must specify unqualified relation names"
 msgstr "%s muss unqualifizierte Relationsnamen angeben"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2612
+#: parser/analyze.c:2609
 #, c-format
 msgid "%s cannot be applied to a join"
 msgstr "%s kann nicht auf einen Verbund angewendet werden"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2621
+#: parser/analyze.c:2618
 #, c-format
 msgid "%s cannot be applied to a function"
 msgstr "%s kann nicht auf eine Funktion angewendet werden"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2639
+#: parser/analyze.c:2636
 #, c-format
 msgid "%s cannot be applied to a WITH query"
 msgstr "%s kann nicht auf eine WITH-Anfrage angewendet werden"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2656
+#: parser/analyze.c:2653
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
-msgstr "Relation „%s“ in %s nicht in der FROM-Klausel gefunden"
+msgstr "Relation »%s« in %s nicht in der FROM-Klausel gefunden"
 
 #: parser/parse_agg.c:207 parser/parse_oper.c:220
 #, c-format
@@ -12168,7 +12216,7 @@
 #: parser/parse_agg.c:897 parser/parse_clause.c:2394
 #, c-format
 msgid "window \"%s\" does not exist"
-msgstr "Fenster „%s“ existiert nicht"
+msgstr "Fenster »%s« existiert nicht"
 
 #: parser/parse_agg.c:982
 #, c-format
@@ -12183,7 +12231,7 @@
 #: parser/parse_agg.c:1324
 #, c-format
 msgid "column \"%s.%s\" must appear in the GROUP BY clause or be used in an aggregate function"
-msgstr "Spalte „%s.%s“ muss in der GROUP-BY-Klausel erscheinen oder in einer Aggregatfunktion verwendet werden"
+msgstr "Spalte »%s.%s« muss in der GROUP-BY-Klausel erscheinen oder in einer Aggregatfunktion verwendet werden"
 
 #: parser/parse_agg.c:1327
 #, c-format
@@ -12193,7 +12241,7 @@
 #: parser/parse_agg.c:1332
 #, c-format
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
-msgstr "Unteranfrage verwendet nicht gruppierte Spalte „%s.%s“ aus äußerer Anfrage"
+msgstr "Unteranfrage verwendet nicht gruppierte Spalte »%s.%s« aus äußerer Anfrage"
 
 #: parser/parse_agg.c:1496
 #, c-format
@@ -12243,7 +12291,7 @@
 #: parser/parse_clause.c:759
 #, c-format
 msgid "function %s must return type \"tsm_handler\""
-msgstr "Funktion %s muss Typ „tsm_handler“ zurückgeben"
+msgstr "Funktion %s muss Typ »tsm_handler« zurückgeben"
 
 #: parser/parse_clause.c:773
 #, c-format
@@ -12265,32 +12313,32 @@
 #: parser/parse_clause.c:1108
 #, c-format
 msgid "column name \"%s\" appears more than once in USING clause"
-msgstr "Spaltenname „%s“ erscheint mehrmals in der USING-Klausel"
+msgstr "Spaltenname »%s« erscheint mehrmals in der USING-Klausel"
 
 #: parser/parse_clause.c:1123
 #, c-format
 msgid "common column name \"%s\" appears more than once in left table"
-msgstr "gemeinsamer Spaltenname „%s“ erscheint mehrmals in der linken Tabelle"
+msgstr "gemeinsamer Spaltenname »%s« erscheint mehrmals in der linken Tabelle"
 
 #: parser/parse_clause.c:1132
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in left table"
-msgstr "Spalte „%s“ aus der USING-Klausel existiert nicht in der linken Tabelle"
+msgstr "Spalte »%s« aus der USING-Klausel existiert nicht in der linken Tabelle"
 
 #: parser/parse_clause.c:1146
 #, c-format
 msgid "common column name \"%s\" appears more than once in right table"
-msgstr "gemeinsamer Spaltenname „%s“ erscheint mehrmals in der rechten Tabelle"
+msgstr "gemeinsamer Spaltenname »%s« erscheint mehrmals in der rechten Tabelle"
 
 #: parser/parse_clause.c:1155
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in right table"
-msgstr "Spalte „%s“ aus der USING-Klausel existiert nicht in der rechten Tabelle"
+msgstr "Spalte »%s« aus der USING-Klausel existiert nicht in der rechten Tabelle"
 
 #: parser/parse_clause.c:1209
 #, c-format
 msgid "column alias list for \"%s\" has too many entries"
-msgstr "Spaltenaliasliste für „%s“ hat zu viele Einträge"
+msgstr "Spaltenaliasliste für »%s« hat zu viele Einträge"
 
 #. translator: %s is name of a SQL construct, eg LIMIT
 #: parser/parse_clause.c:1518
@@ -12302,7 +12350,7 @@
 #: parser/parse_clause.c:1683
 #, c-format
 msgid "%s \"%s\" is ambiguous"
-msgstr "%s „%s“ ist nicht eindeutig"
+msgstr "%s »%s« ist nicht eindeutig"
 
 #. translator: %s is name of a SQL construct, eg ORDER BY
 #: parser/parse_clause.c:1712
@@ -12324,22 +12372,22 @@
 #: parser/parse_clause.c:2382
 #, c-format
 msgid "window \"%s\" is already defined"
-msgstr "Fenster „%s“ ist bereits definiert"
+msgstr "Fenster »%s« ist bereits definiert"
 
 #: parser/parse_clause.c:2444
 #, c-format
 msgid "cannot override PARTITION BY clause of window \"%s\""
-msgstr "PARTITION-BY-Klausel von Fenster „%s“ kann nicht aufgehoben werden"
+msgstr "PARTITION-BY-Klausel von Fenster »%s« kann nicht aufgehoben werden"
 
 #: parser/parse_clause.c:2456
 #, c-format
 msgid "cannot override ORDER BY clause of window \"%s\""
-msgstr "ORDER-BY-Klausel von Fenster „%s“ kann nicht aufgehoben werden"
+msgstr "ORDER-BY-Klausel von Fenster »%s« kann nicht aufgehoben werden"
 
 #: parser/parse_clause.c:2486 parser/parse_clause.c:2492
 #, c-format
 msgid "cannot copy window \"%s\" because it has a frame clause"
-msgstr "kann Fenster „%s“ nicht kopieren, weil es eine Frame-Klausel hat"
+msgstr "kann Fenster »%s« nicht kopieren, weil es eine Frame-Klausel hat"
 
 #: parser/parse_clause.c:2494
 #, c-format
@@ -12399,7 +12447,7 @@
 #: parser/parse_clause.c:2878
 #, c-format
 msgid "ON CONFLICT is not supported on table \"%s\" used as a catalog table"
-msgstr "ON CONFLICT wird nicht unterstützt mit Tabelle „%s“, die als Katalogtabelle verwendet wird"
+msgstr "ON CONFLICT wird nicht unterstützt mit Tabelle »%s«, die als Katalogtabelle verwendet wird"
 
 #: parser/parse_clause.c:3010
 #, c-format
@@ -12409,11 +12457,11 @@
 #: parser/parse_clause.c:3012
 #, c-format
 msgid "Ordering operators must be \"<\" or \">\" members of btree operator families."
-msgstr "Sortieroperatoren müssen die Mitglieder „<“ oder „>“ einer „btree“-Operatorfamilie sein."
+msgstr "Sortieroperatoren müssen die Mitglieder »<« oder »>« einer »btree«-Operatorfamilie sein."
 
 #: parser/parse_coerce.c:971 parser/parse_coerce.c:1001
 #: parser/parse_coerce.c:1019 parser/parse_coerce.c:1034
-#: parser/parse_expr.c:2015 parser/parse_expr.c:2528 parser/parse_target.c:874
+#: parser/parse_expr.c:2028 parser/parse_expr.c:2552 parser/parse_target.c:885
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "kann Typ %s nicht in Typ %s umwandeln"
@@ -12467,53 +12515,53 @@
 #: parser/parse_coerce.c:1629
 #, c-format
 msgid "arguments declared \"anyelement\" are not all alike"
-msgstr "als „anyelement“ deklariert Argumente sind nicht alle gleich"
+msgstr "als »anyelement« deklariert Argumente sind nicht alle gleich"
 
 #: parser/parse_coerce.c:1649
 #, c-format
 msgid "arguments declared \"anyarray\" are not all alike"
-msgstr "als „anyarray“ deklarierte Argumente sind nicht alle gleich"
+msgstr "als »anyarray« deklarierte Argumente sind nicht alle gleich"
 
 #: parser/parse_coerce.c:1669
 #, c-format
 msgid "arguments declared \"anyrange\" are not all alike"
-msgstr "als „anyrange“ deklarierte Argumente sind nicht alle gleich"
+msgstr "als »anyrange« deklarierte Argumente sind nicht alle gleich"
 
 #: parser/parse_coerce.c:1698 parser/parse_coerce.c:1909
 #: parser/parse_coerce.c:1943
 #, c-format
 msgid "argument declared \"anyarray\" is not an array but type %s"
-msgstr "als „anyarray“ deklariertes Argument ist kein Array sondern Typ %s"
+msgstr "als »anyarray« deklariertes Argument ist kein Array sondern Typ %s"
 
 #: parser/parse_coerce.c:1714
 #, c-format
 msgid "argument declared \"anyarray\" is not consistent with argument declared \"anyelement\""
-msgstr "als „anyarray“ deklariertes Argument ist nicht mit als „anyelement“ deklariertem Argument konsistent"
+msgstr "als »anyarray« deklariertes Argument ist nicht mit als »anyelement« deklariertem Argument konsistent"
 
 #: parser/parse_coerce.c:1735 parser/parse_coerce.c:1956
 #, c-format
 msgid "argument declared \"anyrange\" is not a range type but type %s"
-msgstr "als „anyrange“ deklariertes Argument ist kein Bereichstyp sondern Typ %s"
+msgstr "als »anyrange« deklariertes Argument ist kein Bereichstyp sondern Typ %s"
 
 #: parser/parse_coerce.c:1751
 #, c-format
 msgid "argument declared \"anyrange\" is not consistent with argument declared \"anyelement\""
-msgstr "als „anyrange“ deklariertes Argument ist nicht mit als „anyelement“ deklariertem Argument konsistent"
+msgstr "als »anyrange« deklariertes Argument ist nicht mit als »anyelement« deklariertem Argument konsistent"
 
 #: parser/parse_coerce.c:1771
 #, c-format
 msgid "could not determine polymorphic type because input has type \"unknown\""
-msgstr "konnte polymorphischen Typ nicht bestimmen, weil Eingabe Typ „unknown“ hat"
+msgstr "konnte polymorphischen Typ nicht bestimmen, weil Eingabe Typ »unknown« hat"
 
 #: parser/parse_coerce.c:1781
 #, c-format
 msgid "type matched to anynonarray is an array type: %s"
-msgstr "mit „anynonarray“ gepaarter Typ ist ein Array-Typ: %s"
+msgstr "mit »anynonarray« gepaarter Typ ist ein Array-Typ: %s"
 
 #: parser/parse_coerce.c:1791
 #, c-format
 msgid "type matched to anyenum is not an enum type: %s"
-msgstr "mit „anyenum“ gepaarter Typ ist kein Enum-Typ: %s"
+msgstr "mit »anyenum« gepaarter Typ ist kein Enum-Typ: %s"
 
 #: parser/parse_coerce.c:1831 parser/parse_coerce.c:1861
 #, c-format
@@ -12524,7 +12572,7 @@
 #: parser/parse_collate.c:986
 #, c-format
 msgid "collation mismatch between implicit collations \"%s\" and \"%s\""
-msgstr "implizite Sortierfolgen „%s“ und „%s“ stimmen nicht überein"
+msgstr "implizite Sortierfolgen »%s« und »%s« stimmen nicht überein"
 
 #: parser/parse_collate.c:231 parser/parse_collate.c:478
 #: parser/parse_collate.c:989
@@ -12535,37 +12583,37 @@
 #: parser/parse_collate.c:834
 #, c-format
 msgid "collation mismatch between explicit collations \"%s\" and \"%s\""
-msgstr "explizite Sortierfolgen „%s“ und „%s“ stimmen nicht überein"
+msgstr "explizite Sortierfolgen »%s« und »%s« stimmen nicht überein"
 
 #: parser/parse_cte.c:42
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear within its non-recursive term"
-msgstr "rekursiver Verweis auf Anfrage „%s“ darf nicht in ihrem nicht-rekursiven Teilausdruck erscheinen"
+msgstr "rekursiver Verweis auf Anfrage »%s« darf nicht in ihrem nicht-rekursiven Teilausdruck erscheinen"
 
 #: parser/parse_cte.c:44
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear within a subquery"
-msgstr "rekursiver Verweis auf Anfrage „%s“ darf nicht in einer Unteranfrage erscheinen"
+msgstr "rekursiver Verweis auf Anfrage »%s« darf nicht in einer Unteranfrage erscheinen"
 
 #: parser/parse_cte.c:46
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear within an outer join"
-msgstr "rekursiver Verweis auf Anfrage „%s“ darf nicht in einem äußeren Verbund erscheinen"
+msgstr "rekursiver Verweis auf Anfrage »%s« darf nicht in einem äußeren Verbund erscheinen"
 
 #: parser/parse_cte.c:48
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear within INTERSECT"
-msgstr "rekursiver Verweis auf Anfrage „%s“ darf nicht in INTERSECT erscheinen"
+msgstr "rekursiver Verweis auf Anfrage »%s« darf nicht in INTERSECT erscheinen"
 
 #: parser/parse_cte.c:50
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
-msgstr "rekursiver Verweis auf Anfrage „%s“ darf nicht in EXCEPT erscheinen"
+msgstr "rekursiver Verweis auf Anfrage »%s« darf nicht in EXCEPT erscheinen"
 
 #: parser/parse_cte.c:132
 #, c-format
 msgid "WITH query name \"%s\" specified more than once"
-msgstr "WIHT-Anfragename „%s“ mehrmals angegeben"
+msgstr "WIHT-Anfragename »%s« mehrmals angegeben"
 
 #: parser/parse_cte.c:264
 #, c-format
@@ -12575,7 +12623,7 @@
 #: parser/parse_cte.c:313
 #, c-format
 msgid "recursive query \"%s\" column %d has type %s in non-recursive term but type %s overall"
-msgstr "Spalte %2$d in rekursiver Anfrage „%1$s“ hat Typ %3$s im nicht-rekursiven Teilausdruck aber Typ %4$s insgesamt"
+msgstr "Spalte %2$d in rekursiver Anfrage »%1$s« hat Typ %3$s im nicht-rekursiven Teilausdruck aber Typ %4$s insgesamt"
 
 #: parser/parse_cte.c:319
 #, c-format
@@ -12585,7 +12633,7 @@
 #: parser/parse_cte.c:324
 #, 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 Sortierfolge %3$s im nicht-rekursiven Teilausdruck aber Sortierfolge %4$s insgesamt"
+msgstr "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:328
 #, c-format
@@ -12595,7 +12643,7 @@
 #: parser/parse_cte.c:419
 #, c-format
 msgid "WITH query \"%s\" has %d columns available but %d columns specified"
-msgstr "WITH-Anfrage „%s“ hat %d Spalten verfügbar, aber %d Spalten wurden angegeben"
+msgstr "WITH-Anfrage »%s« hat %d Spalten verfügbar, aber %d Spalten wurden angegeben"
 
 #: parser/parse_cte.c:599
 #, c-format
@@ -12605,12 +12653,12 @@
 #: parser/parse_cte.c:651
 #, c-format
 msgid "recursive query \"%s\" must not contain data-modifying statements"
-msgstr "rekursive Anfrage „%s“ darf keine datenmodifizierenden Anweisungen enthalten"
+msgstr "rekursive Anfrage »%s« darf keine datenmodifizierenden Anweisungen enthalten"
 
 #: parser/parse_cte.c:659
 #, c-format
 msgid "recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] recursive-term"
-msgstr "rekursive Anfrage „%s“ hat nicht die Form nicht-rekursiver-Ausdruck UNION [ALL] rekursiver-Ausdruck"
+msgstr "rekursive Anfrage »%s« hat nicht die Form nicht-rekursiver-Ausdruck UNION [ALL] rekursiver-Ausdruck"
 
 #: parser/parse_cte.c:703
 #, c-format
@@ -12635,10 +12683,10 @@
 #: parser/parse_cte.c:778
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear more than once"
-msgstr "rekursiver Verweis auf Anfrage „%s“ darf nicht mehrmals erscheinen"
+msgstr "rekursiver Verweis auf Anfrage »%s« darf nicht mehrmals erscheinen"
 
-#: parser/parse_expr.c:387 parser/parse_relation.c:3083
-#: parser/parse_relation.c:3103
+#: parser/parse_expr.c:387 parser/parse_relation.c:3176
+#: parser/parse_relation.c:3196
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "Spalte %s.%s existiert nicht"
@@ -12646,28 +12694,28 @@
 #: parser/parse_expr.c:399
 #, c-format
 msgid "column \"%s\" not found in data type %s"
-msgstr "Spalte „%s“ nicht gefunden im Datentyp %s"
+msgstr "Spalte »%s« nicht gefunden im Datentyp %s"
 
 #: parser/parse_expr.c:405
 #, c-format
 msgid "could not identify column \"%s\" in record data type"
-msgstr "konnte Spalte „%s“ im Record-Datentyp nicht identifizieren"
+msgstr "konnte Spalte »%s« im Record-Datentyp nicht identifizieren"
 
 #: parser/parse_expr.c:411
 #, c-format
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr "Spaltenschreibweise .%s mit Typ %s verwendet, der kein zusammengesetzter Typ ist"
 
-#: parser/parse_expr.c:441 parser/parse_target.c:660
+#: parser/parse_expr.c:441 parser/parse_target.c:671
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
-msgstr "Zeilenexpansion mit „*“ wird hier nicht unterstützt"
+msgstr "Zeilenexpansion mit »*« wird hier nicht unterstützt"
 
-#: parser/parse_expr.c:767 parser/parse_relation.c:667
-#: parser/parse_relation.c:767 parser/parse_target.c:1109
+#: parser/parse_expr.c:767 parser/parse_relation.c:668
+#: parser/parse_relation.c:768 parser/parse_target.c:1120
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
-msgstr "Spaltenverweis „%s“ ist nicht eindeutig"
+msgstr "Spaltenverweis »%s« ist nicht eindeutig"
 
 #: parser/parse_expr.c:823 parser/parse_param.c:110 parser/parse_param.c:142
 #: parser/parse_param.c:199 parser/parse_param.c:298
@@ -12675,130 +12723,130 @@
 msgid "there is no parameter $%d"
 msgstr "es gibt keinen Parameter $%d"
 
-#: parser/parse_expr.c:1034
+#: parser/parse_expr.c:1042
 #, c-format
 msgid "NULLIF requires = operator to yield boolean"
 msgstr "NULLIF erfordert, dass Operator = boolean ergibt"
 
-#: parser/parse_expr.c:1697
+#: parser/parse_expr.c:1705
 msgid "cannot use subquery in check constraint"
 msgstr "Unteranfragen können nicht in Check-Constraints verwendet werden"
 
-#: parser/parse_expr.c:1701
+#: parser/parse_expr.c:1709
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "Unteranfragen können nicht in DEFAULT-Ausdrücken verwendet werden"
 
-#: parser/parse_expr.c:1704
+#: parser/parse_expr.c:1712
 msgid "cannot use subquery in index expression"
 msgstr "Unteranfragen können nicht in Indexausdrücken verwendet werden"
 
-#: parser/parse_expr.c:1707
+#: parser/parse_expr.c:1715
 msgid "cannot use subquery in index predicate"
 msgstr "Unteranfragen können nicht im Indexprädikat verwendet werden"
 
-#: parser/parse_expr.c:1710
+#: parser/parse_expr.c:1718
 msgid "cannot use subquery in transform expression"
 msgstr "Unteranfragen können in Umwandlungsausdrücken nicht verwendet werden"
 
-#: parser/parse_expr.c:1713
+#: parser/parse_expr.c:1721
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "Unteranfragen können nicht in EXECUTE-Parameter verwendet werden"
 
-#: parser/parse_expr.c:1716
+#: parser/parse_expr.c:1724
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "Unteranfragen können nicht in der WHEN-Bedingung eines Triggers verwendet werden"
 
-#: parser/parse_expr.c:1770
+#: parser/parse_expr.c:1778
 #, c-format
 msgid "subquery must return only one column"
 msgstr "Unteranfrage darf nur eine Spalte zurückgeben"
 
-#: parser/parse_expr.c:1854
+#: parser/parse_expr.c:1862
 #, c-format
 msgid "subquery has too many columns"
 msgstr "Unteranfrage hat zu viele Spalten"
 
-#: parser/parse_expr.c:1859
+#: parser/parse_expr.c:1867
 #, c-format
 msgid "subquery has too few columns"
 msgstr "Unteranfrage hat zu wenige Spalten"
 
-#: parser/parse_expr.c:1955
+#: parser/parse_expr.c:1968
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "kann Typ eines leeren Arrays nicht bestimmen"
 
-#: parser/parse_expr.c:1956
+#: parser/parse_expr.c:1969
 #, c-format
 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:1970
+#: parser/parse_expr.c:1983
 #, 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:2193
+#: parser/parse_expr.c:2206
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "unbenannter XML-Attributwert muss ein Spaltenverweis sein"
 
-#: parser/parse_expr.c:2194
+#: parser/parse_expr.c:2207
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "unbenannter XML-Elementwert muss ein Spaltenverweis sein"
 
-#: parser/parse_expr.c:2209
+#: parser/parse_expr.c:2222
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
-msgstr "XML-Attributname „%s“ einscheint mehrmals"
+msgstr "XML-Attributname »%s« einscheint mehrmals"
 
-#: parser/parse_expr.c:2316
+#: parser/parse_expr.c:2329
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "kann das Ergebnis von XMLSERIALIZE nicht in Typ %s umwandeln"
 
-#: parser/parse_expr.c:2601 parser/parse_expr.c:2797
+#: parser/parse_expr.c:2625 parser/parse_expr.c:2821
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "ungleiche Anzahl Einträge in Zeilenausdrücken"
 
-#: parser/parse_expr.c:2611
+#: parser/parse_expr.c:2635
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "kann Zeilen mit Länge null nicht vergleichen"
 
-#: parser/parse_expr.c:2636
+#: parser/parse_expr.c:2660
 #, 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:2643
+#: parser/parse_expr.c:2667
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "Zeilenvergleichsoperator darf keine Ergebnismenge zurückgeben"
 
-#: parser/parse_expr.c:2702 parser/parse_expr.c:2743
+#: parser/parse_expr.c:2726 parser/parse_expr.c:2767
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "konnte Interpretation des Zeilenvergleichsoperators %s nicht bestimmen"
 
-#: parser/parse_expr.c:2704
+#: parser/parse_expr.c:2728
 #, c-format
 msgid "Row comparison operators must be associated with btree operator families."
-msgstr "Zeilenvergleichsoperatoren müssen einer „btree“-Operatorfamilie zugeordnet sein."
+msgstr "Zeilenvergleichsoperatoren müssen einer »btree«-Operatorfamilie zugeordnet sein."
 
-#: parser/parse_expr.c:2745
+#: parser/parse_expr.c:2769
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "Es gibt mehrere gleichermaßen plausible Kandidaten."
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2861
 #, c-format
 msgid "IS DISTINCT FROM requires = operator to yield boolean"
 msgstr "IS DISTINCT FROM erfordert, dass Operator = boolean ergibt"
 
-#: parser/parse_expr.c:3127 parser/parse_expr.c:3145
+#: parser/parse_expr.c:3151 parser/parse_expr.c:3169
 #, c-format
 msgid "operator precedence change: %s is now lower precedence than %s"
 msgstr "Änderung der Operatorrangfolge: %s hat jetzt niedrigere Priorität als %s"
@@ -12806,7 +12854,7 @@
 #: parser/parse_func.c:174
 #, c-format
 msgid "argument name \"%s\" used more than once"
-msgstr "Argumentname „%s“ mehrmals angegeben"
+msgstr "Argumentname »%s« mehrmals angegeben"
 
 #: parser/parse_func.c:185
 #, c-format
@@ -12989,9 +13037,9 @@
 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:226 utils/adt/array_userfuncs.c:782
-#: utils/adt/array_userfuncs.c:920 utils/adt/arrayfuncs.c:3613
-#: utils/adt/arrayfuncs.c:4051 utils/adt/arrayfuncs.c:6029
+#: parser/parse_oper.c:226 utils/adt/array_userfuncs.c:794
+#: utils/adt/array_userfuncs.c:933 utils/adt/arrayfuncs.c:3613
+#: utils/adt/arrayfuncs.c:4051 utils/adt/arrayfuncs.c:6017
 #: utils/adt/rowtypes.c:1167
 #, c-format
 msgid "could not identify an equality operator for type %s"
@@ -13042,158 +13090,158 @@
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "inkonsistente Typen für Parameter $%d ermittelt"
 
-#: parser/parse_relation.c:174
+#: parser/parse_relation.c:175
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
-msgstr "Tabellenbezug „%s“ ist nicht eindeutig"
+msgstr "Tabellenbezug »%s« ist nicht eindeutig"
 
-#: parser/parse_relation.c:218
+#: parser/parse_relation.c:219
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "Tabellenbezug %u ist nicht eindeutig"
 
-#: parser/parse_relation.c:397
+#: parser/parse_relation.c:398
 #, c-format
 msgid "table name \"%s\" specified more than once"
-msgstr "Tabellenname „%s“ mehrmals angegeben"
+msgstr "Tabellenname »%s« mehrmals angegeben"
 
-#: parser/parse_relation.c:424 parser/parse_relation.c:3023
+#: parser/parse_relation.c:425 parser/parse_relation.c:3116
 #, c-format
 msgid "invalid reference to FROM-clause entry for table \"%s\""
-msgstr "ungültiger Verweis auf FROM-Klausel-Eintrag für Tabelle „%s“"
+msgstr "ungültiger Verweis auf FROM-Klausel-Eintrag für Tabelle »%s«"
 
-#: parser/parse_relation.c:427 parser/parse_relation.c:3028
+#: parser/parse_relation.c:428 parser/parse_relation.c:3121
 #, c-format
 msgid "There is an entry for table \"%s\", but it cannot be referenced from this part of the query."
-msgstr "Es gibt einen Eintrag für Tabelle „%s“, aber auf ihn kann aus diesem Teil der Anfrage nicht verwiesen werden."
+msgstr "Es gibt einen Eintrag für Tabelle »%s«, aber auf ihn kann aus diesem Teil der Anfrage nicht verwiesen werden."
 
-#: parser/parse_relation.c:429
+#: parser/parse_relation.c:430
 #, c-format
 msgid "The combining JOIN type must be INNER or LEFT for a LATERAL reference."
 msgstr "Der JOIN-Typ für LATERAL muss INNER oder LEFT sein."
 
-#: parser/parse_relation.c:705
+#: parser/parse_relation.c:706
 #, c-format
 msgid "system column \"%s\" reference in check constraint is invalid"
-msgstr "Verweis auf Systemspalte „%s“ im Check-Constraint ist ungültig"
+msgstr "Verweis auf Systemspalte »%s« im Check-Constraint ist ungültig"
 
-#: parser/parse_relation.c:1065 parser/parse_relation.c:1345
-#: parser/parse_relation.c:1847
+#: parser/parse_relation.c:1066 parser/parse_relation.c:1346
+#: parser/parse_relation.c:1848
 #, c-format
 msgid "table \"%s\" has %d columns available but %d columns specified"
-msgstr "Tabelle „%s“ hat %d Spalten, aber %d Spalten wurden angegeben"
+msgstr "Tabelle »%s« hat %d Spalten, aber %d Spalten wurden angegeben"
 
-#: parser/parse_relation.c:1152
+#: parser/parse_relation.c:1153
 #, c-format
 msgid "There is a WITH item named \"%s\", but it cannot be referenced from this part of the query."
-msgstr "Es gibt ein WITH-Element namens „%s“, aber darauf kann aus diesem Teil der Anfrage kein Bezug genommen werden."
+msgstr "Es gibt ein WITH-Element namens »%s«, aber darauf kann aus diesem Teil der Anfrage kein Bezug genommen werden."
 
-#: parser/parse_relation.c:1154
+#: parser/parse_relation.c:1155
 #, c-format
 msgid "Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
 msgstr "Verwenden Sie WITH RECURSIVE oder sortieren Sie die WITH-Ausdrücke um, um Vorwärtsreferenzen zu entfernen."
 
-#: parser/parse_relation.c:1465
+#: parser/parse_relation.c:1466
 #, c-format
 msgid "a column definition list is only allowed for functions returning \"record\""
-msgstr "eine Spaltendefinitionsliste ist nur erlaubt bei Funktionen, die „record“ zurückgeben"
+msgstr "eine Spaltendefinitionsliste ist nur erlaubt bei Funktionen, die »record« zurückgeben"
 
-#: parser/parse_relation.c:1474
+#: parser/parse_relation.c:1475
 #, c-format
 msgid "a column definition list is required for functions returning \"record\""
-msgstr "eine Spaltendefinitionsliste ist erforderlich bei Funktionen, die „record“ zurückgeben"
+msgstr "eine Spaltendefinitionsliste ist erforderlich bei Funktionen, die »record« zurückgeben"
 
-#: parser/parse_relation.c:1553
+#: parser/parse_relation.c:1554
 #, c-format
 msgid "function \"%s\" in FROM has unsupported return type %s"
-msgstr "Funktion „%s“ in FROM hat nicht unterstützten Rückgabetyp %s"
+msgstr "Funktion »%s« in FROM hat nicht unterstützten Rückgabetyp %s"
 
-#: parser/parse_relation.c:1675
+#: parser/parse_relation.c:1676
 #, c-format
 msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
-msgstr "VALUES-Liste „%s“ hat %d Spalten verfügbar, aber %d Spalten wurden angegeben"
+msgstr "VALUES-Liste »%s« hat %d Spalten verfügbar, aber %d Spalten wurden angegeben"
 
-#: parser/parse_relation.c:1730
+#: parser/parse_relation.c:1731
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "Verbunde können höchstens %d Spalten haben"
 
-#: parser/parse_relation.c:1820
+#: parser/parse_relation.c:1821
 #, c-format
 msgid "WITH query \"%s\" does not have a RETURNING clause"
-msgstr "WITH-Anfrage „%s“ hat keine RETURNING-Klausel"
+msgstr "WITH-Anfrage »%s« hat keine RETURNING-Klausel"
 
-#: parser/parse_relation.c:2652 parser/parse_relation.c:2807
+#: parser/parse_relation.c:2738 parser/parse_relation.c:2900
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
-msgstr "Spalte %d von Relation „%s“ existiert nicht"
+msgstr "Spalte %d von Relation »%s« existiert nicht"
 
-#: parser/parse_relation.c:3026
+#: parser/parse_relation.c:3119
 #, c-format
 msgid "Perhaps you meant to reference the table alias \"%s\"."
-msgstr "Vielleicht wurde beabsichtigt, auf den Tabellenalias „%s“ zu verweisen."
+msgstr "Vielleicht wurde beabsichtigt, auf den Tabellenalias »%s« zu verweisen."
 
-#: parser/parse_relation.c:3034
+#: parser/parse_relation.c:3127
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
-msgstr "fehlender Eintrag in FROM-Klausel für Tabelle „%s“"
+msgstr "fehlender Eintrag in FROM-Klausel für Tabelle »%s«"
 
-#: parser/parse_relation.c:3086
+#: parser/parse_relation.c:3179
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\"."
-msgstr "Vielleicht wurde beabsichtigt, auf die Spalte „%s.%s“ zu verweisen."
+msgstr "Vielleicht wurde beabsichtigt, auf die Spalte »%s.%s« zu verweisen."
 
-#: parser/parse_relation.c:3088
+#: parser/parse_relation.c:3181
 #, c-format
 msgid "There is a column named \"%s\" in table \"%s\", but it cannot be referenced from this part of the query."
-msgstr "Es gibt eine Spalte namens „%s“ in Tabelle „%s“, aber auf sie kann aus diesem Teil der Anfrage nicht verwiesen werden."
+msgstr "Es gibt eine Spalte namens »%s« in Tabelle »%s«, aber auf sie kann aus diesem Teil der Anfrage nicht verwiesen werden."
 
-#: parser/parse_relation.c:3105
+#: parser/parse_relation.c:3198
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\" or the column \"%s.%s\"."
-msgstr "Vielleicht wurde beabsichtigt, auf die Spalte „%s.%s“ oder die Spalte „%s.%s“ zu verweisen."
+msgstr "Vielleicht wurde beabsichtigt, auf die Spalte »%s.%s« oder die Spalte »%s.%s« zu verweisen."
 
-#: parser/parse_target.c:421 parser/parse_target.c:713
+#: parser/parse_target.c:432 parser/parse_target.c:724
 #, c-format
 msgid "cannot assign to system column \"%s\""
-msgstr "kann Systemspalte „%s“ keinen Wert zuweisen"
+msgstr "kann Systemspalte »%s« keinen Wert zuweisen"
 
-#: parser/parse_target.c:449
+#: parser/parse_target.c:460
 #, c-format
 msgid "cannot set an array element to DEFAULT"
 msgstr "kann Arrayelement nicht auf DEFAULT setzen"
 
-#: parser/parse_target.c:454
+#: parser/parse_target.c:465
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "kann Subfeld nicht auf DEFAULT setzen"
 
-#: parser/parse_target.c:523
+#: parser/parse_target.c:534
 #, c-format
 msgid "column \"%s\" is of type %s but expression is of type %s"
-msgstr "Spalte „%s“ hat Typ %s, aber der Ausdruck hat Typ %s"
+msgstr "Spalte »%s« hat Typ %s, aber der Ausdruck hat Typ %s"
 
-#: parser/parse_target.c:697
+#: parser/parse_target.c:708
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a composite type"
-msgstr "kann Feld „%s“ in Spalte „%s“ nicht setzen, weil ihr Typ %s kein zusammengesetzter Typ ist"
+msgstr "kann Feld »%s« in Spalte »%s« nicht setzen, weil ihr Typ %s kein zusammengesetzter Typ ist"
 
-#: parser/parse_target.c:706
+#: parser/parse_target.c:717
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because there is no such column in data type %s"
-msgstr "kann Feld „%s“ in Spalte „%s“ nicht setzen, weil es keine solche Spalte in Datentyp %s gibt"
+msgstr "kann Feld »%s« in Spalte »%s« nicht setzen, weil es keine solche Spalte in Datentyp %s gibt"
 
-#: parser/parse_target.c:773
+#: parser/parse_target.c:784
 #, c-format
 msgid "array assignment to \"%s\" requires type %s but expression is of type %s"
-msgstr "Wertzuweisung für „%s“ erfordert Typ %s, aber Ausdruck hat Typ %s"
+msgstr "Wertzuweisung für »%s« erfordert Typ %s, aber Ausdruck hat Typ %s"
 
-#: parser/parse_target.c:783
+#: parser/parse_target.c:794
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
-msgstr "Subfeld „%s“ hat Typ %s, aber der Ausdruck hat Typ %s"
+msgstr "Subfeld »%s« hat Typ %s, aber der Ausdruck hat Typ %s"
 
-#: parser/parse_target.c:1199
+#: parser/parse_target.c:1210
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "SELECT * ist nicht gültig, wenn keine Tabellen angegeben sind"
@@ -13216,12 +13264,12 @@
 #: parser/parse_type.c:261 parser/parse_type.c:805 utils/cache/typcache.c:238
 #, c-format
 msgid "type \"%s\" is only a shell"
-msgstr "Typ „%s“ ist nur eine Hülle"
+msgstr "Typ »%s« ist nur eine Hülle"
 
 #: parser/parse_type.c:346
 #, c-format
 msgid "type modifier is not allowed for type \"%s\""
-msgstr "Typmodifikator ist für Typ „%s“ nicht erlaubt"
+msgstr "Typmodifikator ist für Typ »%s« nicht erlaubt"
 
 #: parser/parse_type.c:388
 #, c-format
@@ -13231,7 +13279,7 @@
 #: parser/parse_type.c:671 parser/parse_type.c:770
 #, c-format
 msgid "invalid type name \"%s\""
-msgstr "ungültiger Typname: „%s“"
+msgstr "ungültiger Typname: »%s«"
 
 #: parser/parse_utilcmd.c:358
 #, c-format
@@ -13241,17 +13289,17 @@
 #: parser/parse_utilcmd.c:406
 #, 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“"
+msgstr "%s erstellt implizit eine Sequenz »%s« für die »serial«-Spalte »%s.%s«"
 
 #: parser/parse_utilcmd.c:500 parser/parse_utilcmd.c:512
 #, 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“"
+msgstr "widersprüchliche NULL/NOT NULL-Deklarationen für Spalte »%s« von Tabelle »%s«"
 
 #: parser/parse_utilcmd.c:524
 #, c-format
 msgid "multiple default values specified for column \"%s\" of table \"%s\""
-msgstr "mehrere Vorgabewerte angegeben für Spalte „%s“ von Tabelle „%s“"
+msgstr "mehrere Vorgabewerte angegeben für Spalte »%s« von Tabelle »%s«"
 
 #: parser/parse_utilcmd.c:541 parser/parse_utilcmd.c:632
 #, c-format
@@ -13278,174 +13326,174 @@
 msgid "LIKE is not supported for creating foreign tables"
 msgstr "LIKE wird für das Erzeugen von Fremdtabellen nicht unterstützt"
 
-#: parser/parse_utilcmd.c:1239 parser/parse_utilcmd.c:1315
+#: parser/parse_utilcmd.c:1241 parser/parse_utilcmd.c:1317
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
-msgstr "Index „%s“ enthält einen Verweis auf die ganze Zeile der Tabelle."
+msgstr "Index »%s« enthält einen Verweis auf die ganze Zeile der Tabelle."
 
-#: parser/parse_utilcmd.c:1584
+#: parser/parse_utilcmd.c:1586
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "bestehender Index kann nicht in CREATE TABLE verwendet werden"
 
-#: parser/parse_utilcmd.c:1604
+#: parser/parse_utilcmd.c:1606
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
-msgstr "Index „%s“ gehört bereits zu einem Constraint"
+msgstr "Index »%s« gehört bereits zu einem Constraint"
 
-#: parser/parse_utilcmd.c:1612
+#: parser/parse_utilcmd.c:1614
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
-msgstr "Index „%s“ gehört nicht zu Tabelle „%s“"
+msgstr "Index »%s« gehört nicht zu Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:1619
+#: parser/parse_utilcmd.c:1621
 #, c-format
 msgid "index \"%s\" is not valid"
-msgstr "Index „%s“ ist nicht gültig"
+msgstr "Index »%s« ist nicht gültig"
 
-#: parser/parse_utilcmd.c:1625
+#: parser/parse_utilcmd.c:1627
 #, c-format
 msgid "\"%s\" is not a unique index"
-msgstr "„%s“ ist kein Unique Index"
+msgstr "»%s« ist kein Unique Index"
 
-#: parser/parse_utilcmd.c:1626 parser/parse_utilcmd.c:1633
-#: parser/parse_utilcmd.c:1640 parser/parse_utilcmd.c:1710
+#: parser/parse_utilcmd.c:1628 parser/parse_utilcmd.c:1635
+#: parser/parse_utilcmd.c:1642 parser/parse_utilcmd.c:1712
 #, c-format
 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:1632
+#: parser/parse_utilcmd.c:1634
 #, c-format
 msgid "index \"%s\" contains expressions"
-msgstr "Index „%s“ enthält Ausdrücke"
+msgstr "Index »%s« enthält Ausdrücke"
 
-#: parser/parse_utilcmd.c:1639
+#: parser/parse_utilcmd.c:1641
 #, c-format
 msgid "\"%s\" is a partial index"
-msgstr "„%s“ ist ein partieller Index"
+msgstr "»%s« ist ein partieller Index"
 
-#: parser/parse_utilcmd.c:1651
+#: parser/parse_utilcmd.c:1653
 #, c-format
 msgid "\"%s\" is a deferrable index"
-msgstr "„%s“ ist ein aufschiebbarer Index"
+msgstr "»%s« ist ein aufschiebbarer Index"
 
-#: parser/parse_utilcmd.c:1652
+#: parser/parse_utilcmd.c:1654
 #, c-format
 msgid "Cannot create a non-deferrable constraint using a deferrable index."
 msgstr "Ein nicht aufschiebbarer Constraint kann nicht mit einem aufschiebbaren Index erzeugt werden."
 
-#: parser/parse_utilcmd.c:1709
+#: parser/parse_utilcmd.c:1711
 #, c-format
 msgid "index \"%s\" does not have default sorting behavior"
-msgstr "Index „%s“ hat nicht das Standardsortierverhalten"
+msgstr "Index »%s« hat nicht das Standardsortierverhalten"
 
-#: parser/parse_utilcmd.c:1856
+#: parser/parse_utilcmd.c:1858
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
-msgstr "Spalte „%s“ erscheint zweimal im Primärschlüssel-Constraint"
+msgstr "Spalte »%s« erscheint zweimal im Primärschlüssel-Constraint"
 
-#: parser/parse_utilcmd.c:1862
+#: parser/parse_utilcmd.c:1864
 #, 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:2032
+#: parser/parse_utilcmd.c:2034
 #, c-format
 msgid "index expression cannot return a set"
 msgstr "Indexausdruck kann keine Ergebnismenge zurückgeben"
 
-#: parser/parse_utilcmd.c:2043
+#: parser/parse_utilcmd.c:2045
 #, c-format
 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:2089
+#: parser/parse_utilcmd.c:2091
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "Regeln für materialisierte Sichten werden nicht unterstützt"
 
-#: parser/parse_utilcmd.c:2150
+#: parser/parse_utilcmd.c:2152
 #, c-format
 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:2222
+#: parser/parse_utilcmd.c:2224
 #, c-format
 msgid "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr "Regeln mit WHERE-Bedingungen können als Aktion nur SELECT, INSERT, UPDATE oder DELETE haben"
 
-#: parser/parse_utilcmd.c:2240 parser/parse_utilcmd.c:2339
+#: parser/parse_utilcmd.c:2242 parser/parse_utilcmd.c:2341
 #: rewrite/rewriteHandler.c:478 rewrite/rewriteManip.c:1015
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "UNION/INTERSECTION/EXCEPT mit Bedingung sind nicht implementiert"
 
-#: parser/parse_utilcmd.c:2258
+#: parser/parse_utilcmd.c:2260
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "ON-SELECT-Regel kann nicht OLD verwenden"
 
-#: parser/parse_utilcmd.c:2262
+#: parser/parse_utilcmd.c:2264
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "ON-SELECT-Regel kann nicht NEW verwenden"
 
-#: parser/parse_utilcmd.c:2271
+#: parser/parse_utilcmd.c:2273
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "ON-INSERT-Regel kann nicht OLD verwenden"
 
-#: parser/parse_utilcmd.c:2277
+#: parser/parse_utilcmd.c:2279
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "ON-DELETE-Regel kann nicht NEW verwenden"
 
-#: parser/parse_utilcmd.c:2305
+#: parser/parse_utilcmd.c:2307
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "in WITH-Anfrage kann nicht auf OLD verweisen werden"
 
-#: parser/parse_utilcmd.c:2312
+#: parser/parse_utilcmd.c:2314
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "in WITH-Anfrage kann nicht auf NEW verwiesen werden"
 
-#: parser/parse_utilcmd.c:2515
+#: parser/parse_utilcmd.c:2517
 #, c-format
 msgid "transform expression must not return a set"
 msgstr "Umwandlungsausdruck kann keine Ergebnismenge zurückgeben"
 
-#: parser/parse_utilcmd.c:2629
+#: parser/parse_utilcmd.c:2631
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "falsch platzierte DEFERRABLE-Klausel"
 
-#: parser/parse_utilcmd.c:2634 parser/parse_utilcmd.c:2649
+#: parser/parse_utilcmd.c:2636 parser/parse_utilcmd.c:2651
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "mehrere DEFERRABLE/NOT DEFERRABLE-Klauseln sind nicht erlaubt"
 
-#: parser/parse_utilcmd.c:2644
+#: parser/parse_utilcmd.c:2646
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "falsch platzierte NOT DEFERRABLE-Klausel"
 
-#: parser/parse_utilcmd.c:2665
+#: parser/parse_utilcmd.c:2667
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "falsch platzierte INITIALLY DEFERRED-Klausel"
 
-#: parser/parse_utilcmd.c:2670 parser/parse_utilcmd.c:2696
+#: parser/parse_utilcmd.c:2672 parser/parse_utilcmd.c:2698
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "mehrere INITIALLY IMMEDIATE/DEFERRED-Klauseln sind nicht erlaubt"
 
-#: parser/parse_utilcmd.c:2691
+#: parser/parse_utilcmd.c:2693
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "falsch platzierte INITIALLY IMMEDIATE-Klausel"
 
-#: parser/parse_utilcmd.c:2882
+#: parser/parse_utilcmd.c:2884
 #, c-format
 msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
 msgstr "CREATE gibt ein Schema an (%s) welches nicht gleich dem zu erzeugenden Schema ist (%s)"
@@ -13453,7 +13501,7 @@
 #: parser/scansup.c:194
 #, c-format
 msgid "identifier \"%s\" will be truncated to \"%s\""
-msgstr "Bezeichner „%s“ wird auf „%s“ gekürzt"
+msgstr "Bezeichner »%s« wird auf »%s« gekürzt"
 
 #: port/pg_latch.c:344 port/unix_latch.c:344
 #, c-format
@@ -13482,7 +13530,7 @@
 "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 ""
-"Dieser Fehler bedeutet *nicht*, dass kein Platz mehr auf der Festplatte 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.\n"
+"Dieser Fehler bedeutet *nicht*, dass kein Platz mehr auf der Festplatte 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.\n"
 "Die PostgreSQL-Dokumentation enthält weitere Informationen, wie Sie Ihr System für PostgreSQL konfigurieren können."
 
 #: port/pg_sema.c:148 port/sysv_sema.c:148
@@ -13490,17 +13538,17 @@
 msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr "Sie müssen möglicherweise den Kernelparameter SEMVMX auf mindestens %d erhöhen.  Weitere Informationen finden Sie in der PostgreSQL-Dokumentation."
 
-#: port/pg_shmem.c:141 port/sysv_shmem.c:141
+#: port/pg_shmem.c:195 port/sysv_shmem.c:195
 #, c-format
 msgid "could not create shared memory segment: %m"
 msgstr "konnte Shared-Memory-Segment nicht erzeugen: %m"
 
-#: port/pg_shmem.c:142 port/sysv_shmem.c:142
+#: port/pg_shmem.c:196 port/sysv_shmem.c:196
 #, c-format
 msgid "Failed system call was shmget(key=%lu, size=%zu, 0%o)."
 msgstr "Fehlgeschlagener Systemaufruf war shmget(Key=%lu, Größe=%zu, 0%o)."
 
-#: port/pg_shmem.c:146 port/sysv_shmem.c:146
+#: port/pg_shmem.c:200 port/sysv_shmem.c:200
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter, or possibly that it is less than your kernel's SHMMIN parameter.\n"
@@ -13509,7 +13557,7 @@
 "Dieser Fehler bedeutet gewöhnlich, dass das von PostgreSQL angeforderte Shared-Memory-Segment den Kernel-Parameter SHMMAX überschreitet, oder eventuell, dass es kleiner als der Kernel-Parameter SHMMIN ist.\n"
 "Die PostgreSQL-Dokumentation enthält weitere Informationen über die Konfiguration von Shared Memory."
 
-#: port/pg_shmem.c:153 port/sysv_shmem.c:153
+#: port/pg_shmem.c:207 port/sysv_shmem.c:207
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMALL parameter.  You might need to reconfigure the kernel with larger SHMALL.\n"
@@ -13518,7 +13566,7 @@
 "Dieser Fehler bedeutet gewöhnlich, dass das von PostgreSQL angeforderte Shared-Memory-Segment den Kernel-Parameter SHMALL überschreitet.  Sie müssen eventuell den Kernel mit einem größeren SHMALL neu konfigurieren.\n"
 "Die PostgreSQL-Dokumentation enthält weitere Informationen über die Konfiguration von Shared Memory."
 
-#: port/pg_shmem.c:159 port/sysv_shmem.c:159
+#: port/pg_shmem.c:213 port/sysv_shmem.c:213
 #, 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.\n"
@@ -13527,57 +13575,52 @@
 "Dieser Fehler bedeutet *nicht*, dass kein Platz mehr auf der Festplatte ist.  Er tritt auf, wenn entweder alle verfügbaren Shared-Memory-IDs aufgebraucht sind, dann müssen den Kernelparameter SHMMNI erhöhen, oder weil die Systemhöchstgrenze für Shared Memory insgesamt erreicht wurde.\n"
 "Die PostgreSQL-Dokumentation enthält weitere Informationen über die Konfiguration von Shared Memory."
 
-#: port/pg_shmem.c:340 port/sysv_shmem.c:340
-#, c-format
-msgid "huge TLB pages not supported on this platform"
-msgstr "Huge TLB-Pages werden auf dieser Plattform nicht unterstützt"
-
-#: port/pg_shmem.c:390 port/sysv_shmem.c:390
+#: port/pg_shmem.c:504 port/sysv_shmem.c:504
 #, c-format
 msgid "could not map anonymous shared memory: %m"
 msgstr "konnte anonymes Shared Memory nicht mappen: %m"
 
-#: port/pg_shmem.c:392 port/sysv_shmem.c:392
+#: port/pg_shmem.c:506 port/sysv_shmem.c:506
 #, c-format
 msgid "This error usually means that PostgreSQL's request for a shared memory segment exceeded available memory, swap space, or huge pages. To reduce the request size (currently %zu bytes), reduce PostgreSQL's shared memory usage, perhaps by reducing shared_buffers or max_connections."
 msgstr ""
-"Dieser Fehler bedeutet gewöhnlich, dass das von PostgreSQL angeforderte Shared-Memory-Segment den verfügbaren Speicher, Swap-Space oder Huge Pages überschreitet.  Um die benötigte Shared-Memory-Größe zu reduzieren (aktuell %zu Bytes), reduzieren Sie den Shared-Memory-Verbrauch von PostgreSQL, beispielsweise indem Sie „shared_buffers“ oder „max_connections“ reduzieren.\n"
+"Dieser Fehler bedeutet gewöhnlich, dass das von PostgreSQL angeforderte Shared-Memory-Segment den verfügbaren Speicher, Swap-Space oder Huge Pages überschreitet.  Um die benötigte Shared-Memory-Größe zu reduzieren (aktuell %zu Bytes), reduzieren Sie den Shared-Memory-Verbrauch von PostgreSQL, beispielsweise indem Sie »shared_buffers« oder »max_connections« reduzieren.\n"
 "Die PostgreSQL-Dokumentation enthält weitere Informationen über die Konfiguration von Shared Memory."
 
-#: port/pg_shmem.c:439 port/sysv_shmem.c:439 port/win32_shmem.c:134
+#: port/pg_shmem.c:572 port/sysv_shmem.c:572 port/win32_shmem.c:134
 #, c-format
 msgid "huge pages not supported on this platform"
 msgstr "Huge Pages werden auf dieser Plattform nicht unterstützt"
 
-#: port/pg_shmem.c:553 port/sysv_shmem.c:553
+#: port/pg_shmem.c:667 port/sysv_shmem.c:667
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
-msgstr "konnte „stat“ für Datenverzeichnis „%s“ nicht ausführen: %m"
+msgstr "konnte »stat« für Datenverzeichnis »%s« nicht ausführen: %m"
 
-#: port/win32/crashdump.c:108
+#: port/win32/crashdump.c:122
 #, c-format
 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
+#: port/win32/crashdump.c:130
 #, c-format
 msgid "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
+#: port/win32/crashdump.c:161
 #, c-format
 msgid "could not open crash dump file \"%s\" for writing: error code %lu\n"
-msgstr "konnte Crash-Dump-Datei „%s“ nicht zum Schreiben öffnen: Fehlercode %lu\n"
+msgstr "konnte Crash-Dump-Datei »%s« nicht zum Schreiben öffnen: Fehlercode %lu\n"
 
-#: port/win32/crashdump.c:154
+#: port/win32/crashdump.c:168
 #, c-format
 msgid "wrote crash dump to file \"%s\"\n"
-msgstr "Crash-Dump nach Datei „%s“ geschrieben\n"
+msgstr "Crash-Dump nach Datei »%s« geschrieben\n"
 
-#: port/win32/crashdump.c:156
+#: port/win32/crashdump.c:170
 #, c-format
 msgid "could not write crash dump to file \"%s\": error code %lu\n"
-msgstr "konnte Crash-Dump nicht nach Datei „%s“ schreiben: Fehlercode %lu\n"
+msgstr "konnte Crash-Dump nicht nach Datei »%s« schreiben: Fehlercode %lu\n"
 
 #: port/win32/security.c:43
 #, c-format
@@ -13594,17 +13637,17 @@
 msgid "could not get SID for PowerUsers group: error code %lu\n"
 msgstr "konnte SID der PowerUsers-Gruppe nicht ermitteln: Fehlercode %lu\n"
 
-#: port/win32/signal.c:193
+#: port/win32/signal.c:194
 #, c-format
 msgid "could not create signal listener pipe for PID %d: error code %lu"
 msgstr "konnte Listener-Pipe für Signale für PID %d nicht erzeugen: Fehlercode %lu"
 
-#: port/win32/signal.c:273 port/win32/signal.c:305
+#: port/win32/signal.c:274 port/win32/signal.c:306
 #, c-format
 msgid "could not create signal listener pipe: error code %lu; retrying\n"
 msgstr "konnte Listener-Pipe für Signale nicht erzeugen: Fehlercode %lu; wiederhole Versuch\n"
 
-#: port/win32/signal.c:316
+#: port/win32/signal.c:317
 #, c-format
 msgid "could not create signal dispatch thread: error code %lu\n"
 msgstr "konnte Signal-Dispatch-Thread nicht erzeugen: Fehlercode %lu\n"
@@ -13659,117 +13702,117 @@
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "Fehlgeschlagener Systemaufruf war MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:377
+#: postmaster/autovacuum.c:380
 #, c-format
 msgid "could not fork autovacuum launcher process: %m"
 msgstr "konnte Autovacuum-Launcher-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/autovacuum.c:413
+#: postmaster/autovacuum.c:416
 #, c-format
 msgid "autovacuum launcher started"
 msgstr "Autovacuum-Launcher startet"
 
-#: postmaster/autovacuum.c:775
+#: postmaster/autovacuum.c:779
 #, c-format
 msgid "autovacuum launcher shutting down"
 msgstr "Autovacuum-Launcher fährt herunter"
 
-#: postmaster/autovacuum.c:1443
+#: postmaster/autovacuum.c:1447
 #, c-format
 msgid "could not fork autovacuum worker process: %m"
 msgstr "konnte Autovacuum-Worker-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/autovacuum.c:1639
+#: postmaster/autovacuum.c:1643
 #, c-format
 msgid "autovacuum: processing database \"%s\""
-msgstr "Autovacuum: bearbeite Datenbank „%s“"
+msgstr "Autovacuum: bearbeite Datenbank »%s«"
 
-#: postmaster/autovacuum.c:2051
+#: postmaster/autovacuum.c:2058
 #, 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“"
+msgstr "Autovacuum: lösche verwaiste temporäre Tabelle »%s.%s« in Datenbank »%s«"
 
-#: postmaster/autovacuum.c:2063
+#: postmaster/autovacuum.c:2070
 #, 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"
+msgstr "Autovacuum: verwaiste temporäre Tabelle »%s.%s« in Datenbank »%s« gefunden"
 
-#: postmaster/autovacuum.c:2346
+#: postmaster/autovacuum.c:2355
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
-msgstr "automatisches Vacuum der Tabelle „%s.%s.%s“"
+msgstr "automatisches Vacuum der Tabelle »%s.%s.%s«"
 
-#: postmaster/autovacuum.c:2349
+#: postmaster/autovacuum.c:2358
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
-msgstr "automatisches Analysieren der Tabelle „%s.%s.%s“"
+msgstr "automatisches Analysieren der Tabelle »%s.%s.%s«"
 
-#: postmaster/autovacuum.c:2877
+#: postmaster/autovacuum.c:2907
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "Autovacuum wegen Fehlkonfiguration nicht gestartet"
 
-#: postmaster/autovacuum.c:2878
+#: postmaster/autovacuum.c:2908
 #, c-format
 msgid "Enable the \"track_counts\" option."
-msgstr "Schalten Sie die Option „track_counts“ ein."
+msgstr "Schalten Sie die Option »track_counts« ein."
 
-#: postmaster/bgworker.c:346 postmaster/bgworker.c:746
+#: postmaster/bgworker.c:366 postmaster/bgworker.c:770
 #, c-format
 msgid "registering background worker \"%s\""
-msgstr "registriere Background-Worker „%s“"
+msgstr "registriere Background-Worker »%s«"
 
-#: postmaster/bgworker.c:375
+#: postmaster/bgworker.c:395
 #, c-format
 msgid "unregistering background worker \"%s\""
-msgstr "deregistriere Background-Worker „%s“"
+msgstr "deregistriere Background-Worker »%s«"
 
-#: postmaster/bgworker.c:484
+#: postmaster/bgworker.c:504
 #, c-format
 msgid "background worker \"%s\": must attach to shared memory in order to request a database connection"
-msgstr "Background-Worker „%s“: muss mit Shared Memory verbinden, um eine Datenbankverbindung anzufordern"
+msgstr "Background-Worker »%s«: muss mit Shared Memory verbinden, um eine Datenbankverbindung anzufordern"
 
-#: postmaster/bgworker.c:493
+#: postmaster/bgworker.c:513
 #, c-format
 msgid "background worker \"%s\": cannot request database access if starting at postmaster start"
-msgstr "Background-Worker „%s“: kann kein Datenbankzugriff anfordern, wenn er nach Postmaster-Start gestartet hat"
+msgstr "Background-Worker »%s«: kann kein Datenbankzugriff anfordern, wenn er nach Postmaster-Start gestartet hat"
 
-#: postmaster/bgworker.c:507
+#: postmaster/bgworker.c:527
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
-msgstr "Background-Worker „%s“: ungültiges Neustart-Intervall"
+msgstr "Background-Worker »%s«: ungültiges Neustart-Intervall"
 
-#: postmaster/bgworker.c:552
+#: postmaster/bgworker.c:572
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
-msgstr "breche Background-Worker „%s“ ab aufgrund von Anweisung des Administrators"
+msgstr "breche Background-Worker »%s« ab aufgrund von Anweisung des Administrators"
 
-#: postmaster/bgworker.c:753
+#: postmaster/bgworker.c:777
 #, c-format
 msgid "background worker \"%s\": must be registered in shared_preload_libraries"
-msgstr "Background-Worker „%s“: muss in shared_preload_libraries registriert sein"
+msgstr "Background-Worker »%s«: muss in shared_preload_libraries registriert sein"
 
-#: postmaster/bgworker.c:765
+#: postmaster/bgworker.c:789
 #, c-format
 msgid "background worker \"%s\": only dynamic background workers can request notification"
-msgstr "Background-Worker „%s“: nur dynamische Background-Worker können Benachrichtigung verlangen"
+msgstr "Background-Worker »%s«: nur dynamische Background-Worker können Benachrichtigung verlangen"
 
-#: postmaster/bgworker.c:780
+#: postmaster/bgworker.c:804
 #, c-format
 msgid "too many background workers"
 msgstr "zu viele Background-Worker"
 
-#: postmaster/bgworker.c:781
+#: postmaster/bgworker.c:805
 #, c-format
 msgid "Up to %d background worker can be registered with the current settings."
 msgid_plural "Up to %d background workers can be registered with the current settings."
 msgstr[0] "Mit den aktuellen Einstellungen können bis zu %d Background-Worker registriert werden."
 msgstr[1] "Mit den aktuellen Einstellungen können bis zu %d Background-Worker registriert werden."
 
-#: postmaster/bgworker.c:785
+#: postmaster/bgworker.c:809
 #, c-format
 msgid "Consider increasing the configuration parameter \"max_worker_processes\"."
-msgstr "Erhöhen Sie eventuell den Konfigurationsparameter „max_worker_processes“."
+msgstr "Erhöhen Sie eventuell den Konfigurationsparameter »max_worker_processes«."
 
 #: postmaster/checkpointer.c:470
 #, c-format
@@ -13781,7 +13824,7 @@
 #: postmaster/checkpointer.c:474
 #, c-format
 msgid "Consider increasing the configuration parameter \"max_wal_size\"."
-msgstr "Erhöhen Sie eventuell den Konfigurationsparameter „max_wal_size“."
+msgstr "Erhöhen Sie eventuell den Konfigurationsparameter »max_wal_size«."
 
 #: postmaster/checkpointer.c:621
 #, c-format
@@ -13816,7 +13859,7 @@
 #: postmaster/pgarch.c:484
 #, c-format
 msgid "archiving transaction log file \"%s\" failed too many times, will try again later"
-msgstr "Archivieren der Transaktionslogdatei „%s“ schlug zu oft fehl, wird später erneut versucht"
+msgstr "Archivieren der Transaktionslogdatei »%s« schlug zu oft fehl, wird später erneut versucht"
 
 #: postmaster/pgarch.c:587
 #, c-format
@@ -13834,10 +13877,10 @@
 msgid "archive command was terminated by exception 0x%X"
 msgstr "Archivbefehl wurde durch Ausnahme 0x%X beendet"
 
-#: postmaster/pgarch.c:598 postmaster/postmaster.c:3459
+#: postmaster/pgarch.c:598 postmaster/postmaster.c:3475
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
-msgstr "Sehen Sie die Beschreibung des Hexadezimalwerts in der C-Include-Datei „ntstatus.h“ nach."
+msgstr "Sehen Sie die Beschreibung des Hexadezimalwerts in der C-Include-Datei »ntstatus.h« nach."
 
 #: postmaster/pgarch.c:603
 #, c-format
@@ -13857,305 +13900,305 @@
 #: postmaster/pgarch.c:631
 #, c-format
 msgid "archived transaction log file \"%s\""
-msgstr "archivierte Transaktionslogdatei „%s“"
+msgstr "archivierte Transaktionslogdatei »%s«"
 
 #: postmaster/pgarch.c:680
 #, c-format
 msgid "could not open archive status directory \"%s\": %m"
-msgstr "konnte Archivstatusverzeichnis „%s“ nicht öffnen: %m"
+msgstr "konnte Archivstatusverzeichnis »%s« nicht öffnen: %m"
 
-#: postmaster/pgstat.c:356
+#: postmaster/pgstat.c:355
 #, c-format
 msgid "could not resolve \"localhost\": %s"
-msgstr "konnte „localhost“ nicht auflösen: %s"
+msgstr "konnte »localhost« nicht auflösen: %s"
 
-#: postmaster/pgstat.c:379
+#: postmaster/pgstat.c:378
 #, c-format
 msgid "trying another address for the statistics collector"
 msgstr "andere Adresse für Statistiksammelprozess wird versucht"
 
-#: postmaster/pgstat.c:388
+#: postmaster/pgstat.c:387
 #, c-format
 msgid "could not create socket for statistics collector: %m"
 msgstr "konnte Socket für Statistiksammelprozess nicht erzeugen: %m"
 
-#: postmaster/pgstat.c:400
+#: postmaster/pgstat.c:399
 #, c-format
 msgid "could not bind socket for statistics collector: %m"
 msgstr "konnte Socket für Statistiksammelprozess nicht binden: %m"
 
-#: postmaster/pgstat.c:411
+#: postmaster/pgstat.c:410
 #, c-format
 msgid "could not get address of socket for statistics collector: %m"
 msgstr "konnte Adresse für Socket für Statistiksammelprozess nicht ermitteln: %m"
 
-#: postmaster/pgstat.c:427
+#: postmaster/pgstat.c:426
 #, c-format
 msgid "could not connect socket for statistics collector: %m"
 msgstr "konnte nicht mit Socket für Statistiksammelprozess verbinden: %m"
 
-#: postmaster/pgstat.c:448
+#: postmaster/pgstat.c:447
 #, c-format
 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:474
+#: postmaster/pgstat.c:473
 #, c-format
 msgid "select() failed in statistics collector: %m"
 msgstr "select() im Statistiksammelprozess fehlgeschlagen: %m"
 
-#: postmaster/pgstat.c:489
+#: postmaster/pgstat.c:488
 #, c-format
 msgid "test message did not get through on socket for statistics collector"
 msgstr "Testnachricht auf Socket für Statistiksammelprozess kam nicht durch"
 
-#: postmaster/pgstat.c:504
+#: postmaster/pgstat.c:503
 #, c-format
 msgid "could not receive test message on socket for statistics collector: %m"
 msgstr "konnte Testnachricht auf Socket für Statistiksammelprozess nicht empfangen: %m"
 
-#: postmaster/pgstat.c:514
+#: postmaster/pgstat.c:513
 #, c-format
 msgid "incorrect test message transmission on socket for statistics collector"
 msgstr "fehlerhafte Übertragung der Testnachricht auf Socket für Statistiksammelprozess"
 
-#: postmaster/pgstat.c:537
+#: postmaster/pgstat.c:536
 #, c-format
 msgid "could not set statistics collector socket to nonblocking mode: %m"
 msgstr "konnte Socket von Statistiksammelprozess nicht auf nicht blockierenden Modus setzen: %m"
 
-#: postmaster/pgstat.c:547
+#: postmaster/pgstat.c:546
 #, c-format
 msgid "disabling statistics collector for lack of working socket"
 msgstr "Statistiksammelprozess abgeschaltet wegen nicht funkionierender Socket"
 
-#: postmaster/pgstat.c:694
+#: postmaster/pgstat.c:693
 #, c-format
 msgid "could not fork statistics collector: %m"
 msgstr "konnte Statistiksammelprozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/pgstat.c:1233 postmaster/pgstat.c:1257 postmaster/pgstat.c:1290
+#: postmaster/pgstat.c:1232 postmaster/pgstat.c:1256 postmaster/pgstat.c:1289
 #, c-format
 msgid "must be superuser to reset statistics counters"
 msgstr "nur Superuser können Statistikzähler zurücksetzen"
 
-#: postmaster/pgstat.c:1266
+#: postmaster/pgstat.c:1265
 #, c-format
 msgid "unrecognized reset target: \"%s\""
-msgstr "unbekanntes Reset-Ziel: „%s“"
+msgstr "unbekanntes Reset-Ziel: »%s«"
 
-#: postmaster/pgstat.c:1267
+#: postmaster/pgstat.c:1266
 #, c-format
 msgid "Target must be \"archiver\" or \"bgwriter\"."
-msgstr "Das Reset-Ziel muss „archiver“ oder „bgwriter“ sein."
+msgstr "Das Reset-Ziel muss »archiver« oder »bgwriter« sein."
 
-#: postmaster/pgstat.c:3425
+#: postmaster/pgstat.c:3433
 #, c-format
 msgid "could not read statistics message: %m"
 msgstr "konnte Statistiknachricht nicht lesen: %m"
 
-#: postmaster/pgstat.c:3756 postmaster/pgstat.c:3933
+#: postmaster/pgstat.c:3764 postmaster/pgstat.c:3921
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
-msgstr "konnte temporäre Statistikdatei „%s“ nicht öffnen: %m"
+msgstr "konnte temporäre Statistikdatei »%s« nicht öffnen: %m"
 
-#: postmaster/pgstat.c:3824 postmaster/pgstat.c:3978
+#: postmaster/pgstat.c:3831 postmaster/pgstat.c:3966
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
-msgstr "konnte temporäre Statistikdatei „%s“ nicht schreiben: %m"
+msgstr "konnte temporäre Statistikdatei »%s« nicht schreiben: %m"
 
-#: postmaster/pgstat.c:3833 postmaster/pgstat.c:3987
+#: postmaster/pgstat.c:3840 postmaster/pgstat.c:3975
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
-msgstr "konnte temporäre Statistikdatei „%s“ nicht schließen: %m"
+msgstr "konnte temporäre Statistikdatei »%s« nicht schließen: %m"
 
-#: postmaster/pgstat.c:3841 postmaster/pgstat.c:3995
+#: postmaster/pgstat.c:3848 postmaster/pgstat.c:3983
 #, c-format
 msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr "konnte temporäre Statistikdatei „%s“ nicht in „%s“ umbenennen: %m"
+msgstr "konnte temporäre Statistikdatei »%s« nicht in »%s« umbenennen: %m"
 
-#: postmaster/pgstat.c:4077 postmaster/pgstat.c:4260 postmaster/pgstat.c:4415
+#: postmaster/pgstat.c:4072 postmaster/pgstat.c:4257 postmaster/pgstat.c:4410
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
-msgstr "konnte Statistikdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Statistikdatei »%s« nicht öffnen: %m"
 
-#: postmaster/pgstat.c:4089 postmaster/pgstat.c:4099 postmaster/pgstat.c:4109
-#: postmaster/pgstat.c:4130 postmaster/pgstat.c:4145 postmaster/pgstat.c:4201
-#: postmaster/pgstat.c:4272 postmaster/pgstat.c:4292 postmaster/pgstat.c:4310
-#: postmaster/pgstat.c:4326 postmaster/pgstat.c:4344 postmaster/pgstat.c:4360
-#: postmaster/pgstat.c:4427 postmaster/pgstat.c:4439 postmaster/pgstat.c:4451
-#: postmaster/pgstat.c:4476 postmaster/pgstat.c:4498
+#: postmaster/pgstat.c:4084 postmaster/pgstat.c:4094 postmaster/pgstat.c:4104
+#: postmaster/pgstat.c:4125 postmaster/pgstat.c:4140 postmaster/pgstat.c:4194
+#: postmaster/pgstat.c:4269 postmaster/pgstat.c:4289 postmaster/pgstat.c:4307
+#: postmaster/pgstat.c:4323 postmaster/pgstat.c:4341 postmaster/pgstat.c:4357
+#: postmaster/pgstat.c:4422 postmaster/pgstat.c:4434 postmaster/pgstat.c:4446
+#: postmaster/pgstat.c:4471 postmaster/pgstat.c:4493
 #, c-format
 msgid "corrupted statistics file \"%s\""
-msgstr "verfälschte Statistikdatei „%s“"
+msgstr "verfälschte Statistikdatei »%s«"
 
-#: postmaster/pgstat.c:4615
+#: postmaster/pgstat.c:4622
 #, c-format
 msgid "using stale statistics instead of current ones because stats collector is not responding"
 msgstr "verwende veraltete Statistiken anstatt aktueller, weil der Statistiksammelprozess nicht antwortet"
 
-#: postmaster/pgstat.c:4933
+#: postmaster/pgstat.c:4951
 #, c-format
 msgid "database hash table corrupted during cleanup --- abort"
 msgstr "Datenbank-Hash-Tabelle beim Aufräumen verfälscht --- Abbruch"
 
-#: postmaster/postmaster.c:670
+#: postmaster/postmaster.c:681
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
-msgstr "%s: ungültiges Argument für Option -f: „%s“\n"
+msgstr "%s: ungültiges Argument für Option -f: »%s«\n"
 
-#: postmaster/postmaster.c:756
+#: postmaster/postmaster.c:767
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
-msgstr "%s: ungültiges Argument für Option -t: „%s“\n"
+msgstr "%s: ungültiges Argument für Option -t: »%s«\n"
 
-#: postmaster/postmaster.c:807
+#: postmaster/postmaster.c:818
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
-msgstr "%s: ungültiges Argument: „%s“\n"
+msgstr "%s: ungültiges Argument: »%s«\n"
 
-#: postmaster/postmaster.c:842
+#: postmaster/postmaster.c:857
 #, 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:847
+#: postmaster/postmaster.c:862
 #, c-format
 msgid "%s: max_wal_senders must be less than max_connections\n"
 msgstr "%s: max_wal_senders muss kleiner als max_connections sein\n"
 
-#: postmaster/postmaster.c:852
+#: postmaster/postmaster.c:867
 #, c-format
 msgid "WAL archival cannot be enabled when wal_level is \"minimal\""
-msgstr "WAL-Archivierung kann nicht eingeschaltet werden, wenn wal_level „minimal“ ist"
+msgstr "WAL-Archivierung kann nicht eingeschaltet werden, wenn wal_level »minimal« ist"
 
-#: postmaster/postmaster.c:855
+#: postmaster/postmaster.c:870
 #, c-format
 msgid "WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", \"hot_standby\", or \"logical\""
-msgstr "WAL-Streaming (max_wal_senders > 0) benötigt wal_level „archive“, „hot_standby“ oder „logical“"
+msgstr "WAL-Streaming (max_wal_senders > 0) benötigt wal_level »archive«, »hot_standby« oder »logical«"
 
-#: postmaster/postmaster.c:863
+#: postmaster/postmaster.c:878
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s: ungültige datetoken-Tabellen, bitte reparieren\n"
 
-#: postmaster/postmaster.c:955 postmaster/postmaster.c:1053
+#: postmaster/postmaster.c:970 postmaster/postmaster.c:1068
 #: utils/init/miscinit.c:1410
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
-msgstr "ungültige Listensyntax für Parameter „%s“"
+msgstr "ungültige Listensyntax für Parameter »%s«"
 
-#: postmaster/postmaster.c:986
+#: postmaster/postmaster.c:1001
 #, c-format
 msgid "could not create listen socket for \"%s\""
-msgstr "konnte Listen-Socket für „%s“ nicht erzeugen"
+msgstr "konnte Listen-Socket für »%s« nicht erzeugen"
 
-#: postmaster/postmaster.c:992
+#: postmaster/postmaster.c:1007
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "konnte keine TCP/IP-Sockets erstellen"
 
-#: postmaster/postmaster.c:1075
+#: postmaster/postmaster.c:1090
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
-msgstr "konnte Unix-Domain-Socket in Verzeichnis „%s“ nicht erzeugen"
+msgstr "konnte Unix-Domain-Socket in Verzeichnis »%s« nicht erzeugen"
 
-#: postmaster/postmaster.c:1081
+#: postmaster/postmaster.c:1096
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "konnte keine Unix-Domain-Sockets erzeugen"
 
-#: postmaster/postmaster.c:1093
+#: postmaster/postmaster.c:1108
 #, c-format
 msgid "no socket created for listening"
 msgstr "keine Listen-Socket erzeugt"
 
-#: postmaster/postmaster.c:1133
+#: postmaster/postmaster.c:1148
 #, c-format
 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:1162
+#: postmaster/postmaster.c:1177
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %s\n"
-msgstr "%s: konnte Rechte der externen PID-Datei „%s“ nicht ändern: %s\n"
+msgstr "%s: konnte Rechte der externen PID-Datei »%s« nicht ändern: %s\n"
 
-#: postmaster/postmaster.c:1166
+#: postmaster/postmaster.c:1181
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %s\n"
-msgstr "%s: konnte externe PID-Datei „%s“ nicht schreiben: %s\n"
+msgstr "%s: konnte externe PID-Datei »%s« nicht schreiben: %s\n"
 
-#: postmaster/postmaster.c:1217
+#: postmaster/postmaster.c:1232
 #, c-format
 msgid "ending log output to stderr"
 msgstr "Logausgabe nach stderr endet"
 
-#: postmaster/postmaster.c:1218
+#: postmaster/postmaster.c:1233
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
-msgstr "Die weitere Logausgabe geht an Logziel „%s“."
+msgstr "Die weitere Logausgabe geht an Logziel »%s«."
 
-#: postmaster/postmaster.c:1244 utils/init/postinit.c:200
+#: postmaster/postmaster.c:1259 utils/init/postinit.c:200
 #, c-format
 msgid "could not load pg_hba.conf"
 msgstr "konnte pg_hba.conf nicht laden"
 
-#: postmaster/postmaster.c:1270
+#: postmaster/postmaster.c:1285
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "Postmaster ist während des Starts multithreaded geworden"
 
-#: postmaster/postmaster.c:1271
+#: postmaster/postmaster.c:1286
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "Setzen Sie die Umgebungsvariable LC_ALL auf eine gültige Locale."
 
-#: postmaster/postmaster.c:1368
+#: postmaster/postmaster.c:1383
 #, c-format
 msgid "%s: could not locate matching postgres executable"
-msgstr "%s: konnte kein passendes Programm „postgres“ finden"
+msgstr "%s: konnte kein passendes Programm »postgres« finden"
 
-#: postmaster/postmaster.c:1391 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1406 utils/misc/tzparser.c:341
 #, c-format
 msgid "This may indicate an incomplete PostgreSQL installation, or that the file \"%s\" has been moved away from its proper location."
-msgstr "Dies kann auf eine unvollständige PostgreSQL-Installation hindeuten, oder darauf, dass die Datei „%s“ von ihrer richtigen Stelle verschoben worden ist."
+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:1419
+#: postmaster/postmaster.c:1434
 #, c-format
 msgid "data directory \"%s\" does not exist"
-msgstr "Datenverzeichnis „%s“ existiert nicht"
+msgstr "Datenverzeichnis »%s« existiert nicht"
 
-#: postmaster/postmaster.c:1424
+#: postmaster/postmaster.c:1439
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
-msgstr "konnte Zugriffsrechte von Verzeichnis „%s“ nicht lesen: %m"
+msgstr "konnte Zugriffsrechte von Verzeichnis »%s« nicht lesen: %m"
 
-#: postmaster/postmaster.c:1432
+#: postmaster/postmaster.c:1447
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
-msgstr "angegebenes Datenverzeichnis „%s“ ist kein Verzeichnis"
+msgstr "angegebenes Datenverzeichnis »%s« ist kein Verzeichnis"
 
-#: postmaster/postmaster.c:1448
+#: postmaster/postmaster.c:1463
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
-msgstr "Datenverzeichnis „%s“ hat falschen Eigentümer"
+msgstr "Datenverzeichnis »%s« hat falschen Eigentümer"
 
-#: postmaster/postmaster.c:1450
+#: postmaster/postmaster.c:1465
 #, c-format
 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:1470
+#: postmaster/postmaster.c:1485
 #, c-format
 msgid "data directory \"%s\" has group or world access"
-msgstr "Datenverzeichnis „%s“ erlaubt Zugriff von Gruppe oder Welt"
+msgstr "Datenverzeichnis »%s« erlaubt Zugriff von Gruppe oder Welt"
 
-#: postmaster/postmaster.c:1472
+#: postmaster/postmaster.c:1487
 #, c-format
 msgid "Permissions should be u=rwx (0700)."
 msgstr "Rechte sollten u=rwx (0700) sein."
 
-#: postmaster/postmaster.c:1483
+#: postmaster/postmaster.c:1498
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -14163,368 +14206,368 @@
 "but could not open file \"%s\": %s\n"
 msgstr ""
 "%s: konnte das Datenbanksystem nicht finden\n"
-"Es wurde im Verzeichnis „%s“ erwartet,\n"
-"aber die Datei „%s“ konnte nicht geöffnet werden: %s\n"
+"Es wurde im Verzeichnis »%s« erwartet,\n"
+"aber die Datei »%s« konnte nicht geöffnet werden: %s\n"
 
-#: postmaster/postmaster.c:1660
+#: postmaster/postmaster.c:1675
 #, c-format
 msgid "select() failed in postmaster: %m"
 msgstr "select() fehlgeschlagen im Postmaster: %m"
 
-#: postmaster/postmaster.c:1810
+#: postmaster/postmaster.c:1826
 #, c-format
 msgid "performing immediate shutdown because data directory lock file is invalid"
 msgstr "führe sofortiges Herunterfahren durch, weil Sperrdatei im Datenverzeichnis ungültig ist"
 
-#: postmaster/postmaster.c:1888 postmaster/postmaster.c:1919
+#: postmaster/postmaster.c:1904 postmaster/postmaster.c:1935
 #, c-format
 msgid "incomplete startup packet"
 msgstr "unvollständiges Startpaket"
 
-#: postmaster/postmaster.c:1900
+#: postmaster/postmaster.c:1916
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "ungültige Länge des Startpakets"
 
-#: postmaster/postmaster.c:1958
+#: postmaster/postmaster.c:1974
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "konnte SSL-Verhandlungsantwort nicht senden: %m"
 
-#: postmaster/postmaster.c:1987
+#: postmaster/postmaster.c:2003
 #, 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:2050 utils/misc/guc.c:5484 utils/misc/guc.c:5577
-#: utils/misc/guc.c:6869 utils/misc/guc.c:9562 utils/misc/guc.c:9596
+#: postmaster/postmaster.c:2066 utils/misc/guc.c:5484 utils/misc/guc.c:5577
+#: utils/misc/guc.c:6874 utils/misc/guc.c:9597 utils/misc/guc.c:9631
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
-msgstr "ungültiger Wert für Parameter „%s“: „%s“"
+msgstr "ungültiger Wert für Parameter »%s«: »%s«"
 
-#: postmaster/postmaster.c:2053
+#: postmaster/postmaster.c:2069
 #, c-format
 msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
-msgstr "Gültige Werte sind: „false“, 0, „true“, 1, „database“."
+msgstr "Gültige Werte sind: »false«, 0, »true«, 1, »database«."
 
-#: postmaster/postmaster.c:2073
+#: postmaster/postmaster.c:2089
 #, c-format
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr "ungültiges Layout des Startpakets: Abschluss als letztes Byte erwartet"
 
-#: postmaster/postmaster.c:2101
+#: postmaster/postmaster.c:2117
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "kein PostgreSQL-Benutzername im Startpaket angegeben"
 
-#: postmaster/postmaster.c:2160
+#: postmaster/postmaster.c:2176
 #, c-format
 msgid "the database system is starting up"
 msgstr "das Datenbanksystem startet"
 
-#: postmaster/postmaster.c:2165
+#: postmaster/postmaster.c:2181
 #, c-format
 msgid "the database system is shutting down"
 msgstr "das Datenbanksystem fährt herunter"
 
-#: postmaster/postmaster.c:2170
+#: postmaster/postmaster.c:2186
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "das Datenbanksystem ist im Wiederherstellungsmodus"
 
-#: postmaster/postmaster.c:2175 storage/ipc/procarray.c:284
+#: postmaster/postmaster.c:2191 storage/ipc/procarray.c:284
 #: storage/ipc/sinvaladt.c:298 storage/lmgr/proc.c:334
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "tut mir leid, schon zu viele Verbindungen"
 
-#: postmaster/postmaster.c:2237
+#: postmaster/postmaster.c:2253
 #, c-format
 msgid "wrong key in cancel request for process %d"
 msgstr "falscher Schlüssel in Stornierungsanfrage für Prozess %d"
 
-#: postmaster/postmaster.c:2245
+#: postmaster/postmaster.c:2261
 #, 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:2465
+#: postmaster/postmaster.c:2481
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "SIGHUP empfangen, Konfigurationsdateien werden neu geladen"
 
-#: postmaster/postmaster.c:2490
+#: postmaster/postmaster.c:2506
 #, c-format
 msgid "pg_hba.conf not reloaded"
 msgstr "pg_hba.conf nicht neu geladen"
 
-#: postmaster/postmaster.c:2494
+#: postmaster/postmaster.c:2510
 #, c-format
 msgid "pg_ident.conf not reloaded"
 msgstr "pg_ident.conf nicht neu geladen"
 
-#: postmaster/postmaster.c:2535
+#: postmaster/postmaster.c:2551
 #, c-format
 msgid "received smart shutdown request"
 msgstr "intelligentes Herunterfahren verlangt"
 
-#: postmaster/postmaster.c:2587
+#: postmaster/postmaster.c:2603
 #, c-format
 msgid "received fast shutdown request"
 msgstr "schnelles Herunterfahren verlangt"
 
-#: postmaster/postmaster.c:2613
+#: postmaster/postmaster.c:2629
 #, c-format
 msgid "aborting any active transactions"
 msgstr "etwaige aktive Transaktionen werden abgebrochen"
 
-#: postmaster/postmaster.c:2647
+#: postmaster/postmaster.c:2663
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "sofortiges Herunterfahren verlangt"
 
-#: postmaster/postmaster.c:2708
+#: postmaster/postmaster.c:2724
 #, c-format
 msgid "shutdown at recovery target"
 msgstr "Herunterfahren beim Wiederherstellungsziel"
 
-#: postmaster/postmaster.c:2724 postmaster/postmaster.c:2747
+#: postmaster/postmaster.c:2740 postmaster/postmaster.c:2763
 msgid "startup process"
 msgstr "Startprozess"
 
-#: postmaster/postmaster.c:2727
+#: postmaster/postmaster.c:2743
 #, c-format
 msgid "aborting startup due to startup process failure"
 msgstr "Serverstart abgebrochen wegen Startprozessfehler"
 
-#: postmaster/postmaster.c:2788
+#: postmaster/postmaster.c:2804
 #, c-format
 msgid "database system is ready to accept connections"
 msgstr "Datenbanksystem ist bereit, um Verbindungen anzunehmen"
 
-#: postmaster/postmaster.c:2803
+#: postmaster/postmaster.c:2819
 msgid "background writer process"
 msgstr "Background-Writer-Prozess"
 
-#: postmaster/postmaster.c:2857
+#: postmaster/postmaster.c:2873
 msgid "checkpointer process"
 msgstr "Checkpointer-Prozess"
 
-#: postmaster/postmaster.c:2873
+#: postmaster/postmaster.c:2889
 msgid "WAL writer process"
 msgstr "WAL-Schreibprozess"
 
-#: postmaster/postmaster.c:2887
+#: postmaster/postmaster.c:2903
 msgid "WAL receiver process"
 msgstr "WAL-Receiver-Prozess"
 
-#: postmaster/postmaster.c:2902
+#: postmaster/postmaster.c:2918
 msgid "autovacuum launcher process"
 msgstr "Autovacuum-Launcher-Prozess"
 
-#: postmaster/postmaster.c:2917
+#: postmaster/postmaster.c:2933
 msgid "archiver process"
 msgstr "Archivierprozess"
 
-#: postmaster/postmaster.c:2933
+#: postmaster/postmaster.c:2949
 msgid "statistics collector process"
 msgstr "Statistiksammelprozess"
 
-#: postmaster/postmaster.c:2947
+#: postmaster/postmaster.c:2963
 msgid "system logger process"
 msgstr "Systemlogger-Prozess"
 
-#: postmaster/postmaster.c:3009
+#: postmaster/postmaster.c:3025
 msgid "worker process"
 msgstr "Worker-Prozess"
 
-#: postmaster/postmaster.c:3092 postmaster/postmaster.c:3112
-#: postmaster/postmaster.c:3119 postmaster/postmaster.c:3137
+#: postmaster/postmaster.c:3108 postmaster/postmaster.c:3128
+#: postmaster/postmaster.c:3135 postmaster/postmaster.c:3153
 msgid "server process"
 msgstr "Serverprozess"
 
-#: postmaster/postmaster.c:3191
+#: postmaster/postmaster.c:3207
 #, c-format
 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:3447
+#: postmaster/postmaster.c:3463
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) beendete mit Status %d"
 
-#: postmaster/postmaster.c:3449 postmaster/postmaster.c:3460
-#: postmaster/postmaster.c:3471 postmaster/postmaster.c:3480
-#: postmaster/postmaster.c:3490
+#: postmaster/postmaster.c:3465 postmaster/postmaster.c:3476
+#: postmaster/postmaster.c:3487 postmaster/postmaster.c:3496
+#: postmaster/postmaster.c:3506
 #, c-format
 msgid "Failed process was running: %s"
 msgstr "Der fehlgeschlagene Prozess führte aus: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3457
+#: postmaster/postmaster.c:3473
 #, 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:3467
+#: postmaster/postmaster.c:3483
 #, 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:3478
+#: postmaster/postmaster.c:3494
 #, 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:3488
+#: postmaster/postmaster.c:3504
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) beendete mit unbekanntem Status %d"
 
-#: postmaster/postmaster.c:3675
+#: postmaster/postmaster.c:3691
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "abnormales Herunterfahren des Datenbanksystems"
 
-#: postmaster/postmaster.c:3715
+#: postmaster/postmaster.c:3731
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "alle Serverprozesse beendet; initialisiere neu"
 
-#: postmaster/postmaster.c:3927
+#: postmaster/postmaster.c:3943
 #, 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:3969
+#: postmaster/postmaster.c:3985
 msgid "could not fork new process for connection: "
 msgstr "konnte neuen Prozess für Verbindung nicht starten (fork-Fehler): "
 
-#: postmaster/postmaster.c:4083
+#: postmaster/postmaster.c:4099
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "Verbindung empfangen: Host=%s Port=%s"
 
-#: postmaster/postmaster.c:4088
+#: postmaster/postmaster.c:4104
 #, c-format
 msgid "connection received: host=%s"
 msgstr "Verbindung empfangen: Host=%s"
 
-#: postmaster/postmaster.c:4371
+#: postmaster/postmaster.c:4387
 #, c-format
 msgid "could not execute server process \"%s\": %m"
-msgstr "konnte Serverprozess „%s“ nicht ausführen: %m"
+msgstr "konnte Serverprozess »%s« nicht ausführen: %m"
 
-#: postmaster/postmaster.c:4931
+#: postmaster/postmaster.c:4926
 #, c-format
 msgid "database system is ready to accept read only connections"
 msgstr "Datenbanksystem ist bereit, um lesende Verbindungen anzunehmen"
 
-#: postmaster/postmaster.c:5214
+#: postmaster/postmaster.c:5213
 #, c-format
 msgid "could not fork startup process: %m"
 msgstr "konnte Startprozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:5218
+#: postmaster/postmaster.c:5217
 #, c-format
 msgid "could not fork background writer process: %m"
 msgstr "konnte Background-Writer-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:5222
+#: postmaster/postmaster.c:5221
 #, c-format
 msgid "could not fork checkpointer process: %m"
 msgstr "konnte Checkpointer-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:5226
+#: postmaster/postmaster.c:5225
 #, c-format
 msgid "could not fork WAL writer process: %m"
 msgstr "konnte WAL-Writer-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:5230
+#: postmaster/postmaster.c:5229
 #, c-format
 msgid "could not fork WAL receiver process: %m"
 msgstr "konnte WAL-Receiver-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:5234
+#: postmaster/postmaster.c:5233
 #, c-format
 msgid "could not fork process: %m"
 msgstr "konnte Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:5396 postmaster/postmaster.c:5419
+#: postmaster/postmaster.c:5395 postmaster/postmaster.c:5418
 #, c-format
 msgid "database connection requirement not indicated during registration"
 msgstr "die Notwendigkeit, Datenbankverbindungen zu erzeugen, wurde bei der Registrierung nicht angezeigt"
 
-#: postmaster/postmaster.c:5403 postmaster/postmaster.c:5426
+#: postmaster/postmaster.c:5402 postmaster/postmaster.c:5425
 #, c-format
 msgid "invalid processing mode in background worker"
 msgstr "ungültiger Verarbeitungsmodus in Background-Worker"
 
-#: postmaster/postmaster.c:5478
+#: postmaster/postmaster.c:5497
 #, c-format
 msgid "starting background worker process \"%s\""
-msgstr "starte Background-Worker-Prozess „%s“"
+msgstr "starte Background-Worker-Prozess »%s«"
 
-#: postmaster/postmaster.c:5489
+#: postmaster/postmaster.c:5509
 #, c-format
 msgid "could not fork worker process: %m"
 msgstr "konnte Worker-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:5865
+#: postmaster/postmaster.c:5909
 #, 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:5897
+#: postmaster/postmaster.c:5941
 #, c-format
 msgid "could not create inherited socket: error code %d\n"
 msgstr "konnte geerbtes Socket nicht erzeugen: Fehlercode %d\n"
 
-#: postmaster/postmaster.c:5926
+#: postmaster/postmaster.c:5970
 #, c-format
 msgid "could not open backend variables file \"%s\": %s\n"
-msgstr "konnte Servervariablendatei „%s“ nicht öffnen: %s\n"
+msgstr "konnte Servervariablendatei »%s« nicht öffnen: %s\n"
 
-#: postmaster/postmaster.c:5933
+#: postmaster/postmaster.c:5977
 #, c-format
 msgid "could not read from backend variables file \"%s\": %s\n"
-msgstr "konnte nicht aus Servervariablendatei „%s“ lesen: %s\n"
+msgstr "konnte nicht aus Servervariablendatei »%s« lesen: %s\n"
 
-#: postmaster/postmaster.c:5942
+#: postmaster/postmaster.c:5986
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
-msgstr "konnte Datei „%s“ nicht löschen: %s\n"
+msgstr "konnte Datei »%s« nicht löschen: %s\n"
 
-#: postmaster/postmaster.c:5959
+#: postmaster/postmaster.c:6003
 #, c-format
 msgid "could not map view of backend variables: error code %lu\n"
 msgstr "konnte Sicht der Backend-Variablen nicht mappen: Fehlercode %lu\n"
 
-#: postmaster/postmaster.c:5968
+#: postmaster/postmaster.c:6012
 #, c-format
 msgid "could not unmap view of backend variables: error code %lu\n"
 msgstr "konnte Sicht der Backend-Variablen nicht unmappen: Fehlercode %lu\n"
 
-#: postmaster/postmaster.c:5975
+#: postmaster/postmaster.c:6019
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %lu\n"
 msgstr "konnte Handle für Backend-Parametervariablen nicht schließen: Fehlercode %lu\n"
 
-#: postmaster/postmaster.c:6134
+#: postmaster/postmaster.c:6178
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "konnte Exitcode des Prozesses nicht lesen\n"
 
-#: postmaster/postmaster.c:6139
+#: postmaster/postmaster.c:6183
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "konnte Child-Completion-Status nicht versenden\n"
@@ -14557,7 +14600,7 @@
 #: postmaster/syslogger.c:621
 #, c-format
 msgid "Future log output will appear in directory \"%s\"."
-msgstr "Die weitere Logausgabe wird im Verzeichnis „%s“ erscheinen."
+msgstr "Die weitere Logausgabe wird im Verzeichnis »%s« erscheinen."
 
 #: postmaster/syslogger.c:629
 #, c-format
@@ -14577,7 +14620,7 @@
 #: postmaster/syslogger.c:1136
 #, c-format
 msgid "could not open log file \"%s\": %m"
-msgstr "konnte Logdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Logdatei »%s« nicht öffnen: %m"
 
 #: postmaster/syslogger.c:1198 postmaster/syslogger.c:1242
 #, c-format
@@ -14598,73 +14641,73 @@
 msgid "invalid streaming start location"
 msgstr "ungültige Streaming-Startposition"
 
-#: repl_scanner.l:170 scan.l:667
+#: repl_scanner.l:170 scan.l:668
 msgid "unterminated quoted string"
 msgstr "Zeichenkette in Anführungszeichen nicht abgeschlossen"
 
 #: repl_scanner.l:180
 #, c-format
 msgid "syntax error: unexpected character \"%s\""
-msgstr "Syntaxfehler: unerwartetes Zeichen „%s“"
+msgstr "Syntaxfehler: unerwartetes Zeichen »%s«"
 
-#: replication/basebackup.c:227
+#: replication/basebackup.c:229
 #, c-format
 msgid "could not stat control file \"%s\": %m"
-msgstr "konnte „stat“ für Kontrolldatei „%s“ nicht ausführen: %m"
+msgstr "konnte »stat« für Kontrolldatei »%s« nicht ausführen: %m"
 
-#: replication/basebackup.c:336
+#: replication/basebackup.c:338
 #, c-format
 msgid "could not find any WAL files"
 msgstr "konnte keine WAL-Dateien finden"
 
-#: replication/basebackup.c:349 replication/basebackup.c:363
-#: replication/basebackup.c:372
+#: replication/basebackup.c:351 replication/basebackup.c:365
+#: replication/basebackup.c:374
 #, c-format
 msgid "could not find WAL file \"%s\""
-msgstr "konnte WAL-Datei „%s“ nicht finden"
+msgstr "konnte WAL-Datei »%s« nicht finden"
 
-#: replication/basebackup.c:411 replication/basebackup.c:437
+#: replication/basebackup.c:413 replication/basebackup.c:439
 #, c-format
 msgid "unexpected WAL file size \"%s\""
-msgstr "unerwartete WAL-Dateigröße „%s“"
+msgstr "unerwartete WAL-Dateigröße »%s«"
 
-#: replication/basebackup.c:423 replication/basebackup.c:1169
+#: replication/basebackup.c:425 replication/basebackup.c:1157
 #, c-format
 msgid "base backup could not send data, aborting backup"
 msgstr "Basissicherung konnte keine Daten senden, Sicherung abgebrochen"
 
-#: replication/basebackup.c:525 replication/basebackup.c:534
-#: replication/basebackup.c:543 replication/basebackup.c:552
-#: replication/basebackup.c:561 replication/basebackup.c:572
-#: replication/basebackup.c:589
+#: replication/basebackup.c:527 replication/basebackup.c:536
+#: replication/basebackup.c:545 replication/basebackup.c:554
+#: replication/basebackup.c:563 replication/basebackup.c:574
+#: replication/basebackup.c:591
 #, c-format
 msgid "duplicate option \"%s\""
-msgstr "doppelte Option „%s“"
+msgstr "doppelte Option »%s«"
 
-#: replication/basebackup.c:578 utils/misc/guc.c:5494
+#: replication/basebackup.c:580 utils/misc/guc.c:5494
 #, 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)"
+msgstr "%d ist außerhalb des gültigen Bereichs für Parameter »%s« (%d ... %d)"
 
-#: replication/basebackup.c:852 replication/basebackup.c:954
+#: replication/basebackup.c:854 replication/basebackup.c:956
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
-msgstr "konnte „stat“ für Datei oder Verzeichnis „%s“ nicht ausführen: %m"
+msgstr "konnte »stat« für Datei oder Verzeichnis »%s« nicht ausführen: %m"
 
-#: replication/basebackup.c:1121
+#: replication/basebackup.c:1109
 #, c-format
 msgid "skipping special file \"%s\""
-msgstr "überspringe besondere Datei „%s“"
+msgstr "überspringe besondere Datei »%s«"
 
-#: replication/basebackup.c:1232
+#: replication/basebackup.c:1220
 #, c-format
 msgid "file name too long for tar format: \"%s\""
-msgstr "Dateiname zu lang für Tar-Format: „%s“"
+msgstr "Dateiname zu lang für Tar-Format: »%s«"
 
-#: replication/basebackup.c:1237
+#: replication/basebackup.c:1225
 #, c-format
 msgid "symbolic link target too long for tar format: file name \"%s\", target \"%s\""
-msgstr "Ziel der symbolischen Verknüpfung zu lang für Tar-Format: Dateiname „%s“, Ziel „%s“"
+msgstr "Ziel der symbolischen Verknüpfung zu lang für Tar-Format: Dateiname »%s«, Ziel »%s«"
 
 #: replication/libpqwalreceiver/libpqwalreceiver.c:116
 #, c-format
@@ -14764,42 +14807,42 @@
 msgid "logical decoding cannot be used while in recovery"
 msgstr "logische Dekodierung kann nicht während der Wiederherstellung verwendet werden"
 
-#: replication/logical/logical.c:234 replication/logical/logical.c:383
+#: replication/logical/logical.c:237 replication/logical/logical.c:395
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr "physischer Replikations-Slot kann nicht für logisches Dekodieren verwendet werden"
 
-#: replication/logical/logical.c:239 replication/logical/logical.c:388
+#: replication/logical/logical.c:242 replication/logical/logical.c:400
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
-msgstr "Replikations-Slot „%s“ wurde nicht in dieser Datenbank erzeugt"
+msgstr "Replikations-Slot »%s« wurde nicht in dieser Datenbank erzeugt"
 
-#: replication/logical/logical.c:246
+#: replication/logical/logical.c:249
 #, c-format
 msgid "cannot create logical replication slot in transaction that has performed writes"
 msgstr "logischer Replikations-Slot kann nicht in einer Transaktion erzeugt werden, die Schreibvorgänge ausgeführt hat"
 
-#: replication/logical/logical.c:425
+#: replication/logical/logical.c:437
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
-msgstr "starte logisches Dekodieren für Slot „%s“"
+msgstr "starte logisches Dekodieren für Slot »%s«"
 
-#: replication/logical/logical.c:427
+#: replication/logical/logical.c:439
 #, c-format
 msgid "streaming transactions committing after %X/%X, reading WAL from %X/%X"
 msgstr "Streaming beginnt bei Transaktionen, die nach %X/%X committen; lese WAL ab %X/%X"
 
-#: replication/logical/logical.c:562
+#: replication/logical/logical.c:574
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback, associated LSN %X/%X"
-msgstr "Slot „%s“, Ausgabe-Plugin „%s“, im Callback %s, zugehörige LSN %X/%X"
+msgstr "Slot »%s«, Ausgabe-Plugin »%s«, im Callback %s, zugehörige LSN %X/%X"
 
-#: replication/logical/logical.c:569
+#: replication/logical/logical.c:581
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
-msgstr "Slot „%s“, Ausgabe-Plugin „%s“, im Callback %s"
+msgstr "Slot »%s«, Ausgabe-Plugin »%s«, im Callback %s"
 
-#: replication/logical/logicalfuncs.c:192 replication/walsender.c:2129
+#: replication/logical/logicalfuncs.c:192 replication/walsender.c:2128
 #, c-format
 msgid "could not read from log segment %s, offset %u, length %lu: %m"
 msgstr "konnte nicht aus Logsegment %s bei Position %u, Länge %lu lesen: %m"
@@ -14838,7 +14881,7 @@
 #: replication/logical/logicalfuncs.c:412
 #, c-format
 msgid "logical decoding output plugin \"%s\" produces binary output, but function \"%s\" expects textual data"
-msgstr "Ausgabe-Plugin „%s“ erzeugt binäre Ausgabe, aber Funktion „%s“ erwartet Textdaten"
+msgstr "Ausgabe-Plugin »%s« erzeugt binäre Ausgabe, aber Funktion »%s« erwartet Textdaten"
 
 #: replication/logical/origin.c:181
 #, c-format
@@ -14865,160 +14908,160 @@
 msgid "could not drop replication origin with OID %d, in use by PID %d"
 msgstr "konnte Replication-Origin mit OID %d nicht löschen, wird von PID %d verwendet"
 
-#: replication/logical/origin.c:671
+#: replication/logical/origin.c:674
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr "Replikations-Checkpoint hat falsche magische Zahl %u statt %u"
 
-#: replication/logical/origin.c:703
+#: replication/logical/origin.c:706
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
-msgstr "konnte Datei „%s“ nicht lesen: %d von %zu gelesen"
+msgstr "konnte Datei »%s« nicht lesen: %d von %zu gelesen"
 
-#: replication/logical/origin.c:712
+#: replication/logical/origin.c:715
 #, c-format
 msgid "could not find free replication state, increase max_replication_slots"
 msgstr "konnte keinen freien Replication-State finden, erhöhen Sie max_replication_slots"
 
-#: replication/logical/origin.c:730
+#: replication/logical/origin.c:733
 #, c-format
 msgid "replication slot checkpoint has wrong checksum %u, expected %u"
 msgstr "Replikations-Slot-Checkpoint hat falsche Prüfsumme %u, erwartet wurde %u"
 
-#: replication/logical/origin.c:854
+#: replication/logical/origin.c:857
 #, c-format
 msgid "replication origin with OID %d is already active for PID %d"
 msgstr "Replication-Origin mit OID %d ist bereits aktiv für PID %d"
 
-#: replication/logical/origin.c:865 replication/logical/origin.c:1045
+#: replication/logical/origin.c:868 replication/logical/origin.c:1048
 #, c-format
 msgid "could not find free replication state slot for replication origin with OID %u"
 msgstr "konnte keinen freien Replication-State-Slot für Replication-Origin mit OID %u finden"
 
-#: replication/logical/origin.c:867 replication/logical/origin.c:1047
-#: replication/slot.c:1241
+#: replication/logical/origin.c:870 replication/logical/origin.c:1050
+#: replication/slot.c:1268
 #, c-format
 msgid "Increase max_replication_slots and try again."
 msgstr "Erhöhen Sie max_replication_slots und versuchen Sie es erneut."
 
-#: replication/logical/origin.c:1004
+#: replication/logical/origin.c:1007
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "kann Replication-Origin nicht einrichten, wenn schon einer eingerichtet ist"
 
-#: replication/logical/origin.c:1033
+#: replication/logical/origin.c:1036
 #, c-format
 msgid "replication identifier %d is already active for PID %d"
 msgstr "Replikationsidentifikator %d ist bereits aktiv für PID %d"
 
-#: replication/logical/origin.c:1079 replication/logical/origin.c:1274
-#: replication/logical/origin.c:1294
+#: replication/logical/origin.c:1082 replication/logical/origin.c:1277
+#: replication/logical/origin.c:1297
 #, c-format
 msgid "no replication origin is configured"
 msgstr "kein Replication-Origin konfiguriert"
 
-#: replication/logical/reorderbuffer.c:2212
+#: replication/logical/reorderbuffer.c:2219
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "konnte nicht in Datendatei für XID %u schreiben: %m"
 
-#: replication/logical/reorderbuffer.c:2308
-#: replication/logical/reorderbuffer.c:2328
+#: replication/logical/reorderbuffer.c:2315
+#: replication/logical/reorderbuffer.c:2335
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "konnte nicht aus Reorder-Buffer-Spill-Datei lesen: %m"
 
-#: replication/logical/reorderbuffer.c:2312
-#: replication/logical/reorderbuffer.c:2332
+#: replication/logical/reorderbuffer.c:2319
+#: replication/logical/reorderbuffer.c:2339
 #, c-format
 msgid "could not read from reorderbuffer spill file: read %d instead of %u bytes"
 msgstr "konnte nicht aus Reorder-Buffer-Spill-Datei lesen: %d statt %u Bytes gelesen"
 
-#: replication/logical/reorderbuffer.c:2955
+#: replication/logical/reorderbuffer.c:2971
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
-msgstr "konnte nicht aus Datei „%s“ lesen: %d statt %d Bytes gelesen"
+msgstr "konnte nicht aus Datei »%s« lesen: %d statt %d Bytes gelesen"
 
-#: replication/logical/snapbuild.c:600
+#: replication/logical/snapbuild.c:617
 #, c-format
 msgid "exported logical decoding snapshot: \"%s\" with %u transaction ID"
 msgid_plural "exported logical decoding snapshot: \"%s\" with %u transaction IDs"
-msgstr[0] "logischer Dekodierungs-Snapshot exportiert: „%s“ mit %u Transaktions-ID"
-msgstr[1] "logischer Dekodierungs-Snapshot exportiert: „%s“ mit %u Transaktions-IDs"
+msgstr[0] "logischer Dekodierungs-Snapshot exportiert: »%s« mit %u Transaktions-ID"
+msgstr[1] "logischer Dekodierungs-Snapshot exportiert: »%s« mit %u Transaktions-IDs"
 
-#: replication/logical/snapbuild.c:900 replication/logical/snapbuild.c:1265
-#: replication/logical/snapbuild.c:1796
+#: replication/logical/snapbuild.c:917 replication/logical/snapbuild.c:1285
+#: replication/logical/snapbuild.c:1817
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "logisches Dekodieren fand konsistenten Punkt bei %X/%X"
 
-#: replication/logical/snapbuild.c:902
+#: replication/logical/snapbuild.c:919
 #, c-format
 msgid "Transaction ID %u finished; no more running transactions."
 msgstr "Transaktions-ID %u beendet; keine laufenden Transaktionen mehr."
 
-#: replication/logical/snapbuild.c:1267
+#: replication/logical/snapbuild.c:1287
 #, c-format
 msgid "There are no running transactions."
 msgstr "Keine laufenden Transaktionen."
 
-#: replication/logical/snapbuild.c:1329
+#: replication/logical/snapbuild.c:1350
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr "logisches Dekodieren fand initialen Startpunkt bei %X/%X"
 
-#: replication/logical/snapbuild.c:1331
+#: replication/logical/snapbuild.c:1352
 #, c-format
 msgid "%u transaction needs to finish."
 msgid_plural "%u transactions need to finish."
 msgstr[0] "%u Transaktion muss noch abschließen."
 msgstr[1] "%u Transaktionen müssen noch abschließen."
 
-#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:1696
-#: replication/logical/snapbuild.c:1710 replication/logical/snapbuild.c:1724
+#: replication/logical/snapbuild.c:1691 replication/logical/snapbuild.c:1717
+#: replication/logical/snapbuild.c:1731 replication/logical/snapbuild.c:1745
 #, c-format
 msgid "could not read file \"%s\", read %d of %d: %m"
-msgstr "konnte Datei „%s“ nicht lesen, %d von %d gelesen: %m"
+msgstr "konnte Datei »%s« nicht lesen, %d von %d gelesen: %m"
 
-#: replication/logical/snapbuild.c:1676
+#: replication/logical/snapbuild.c:1697
 #, c-format
 msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
-msgstr "Scanbuild-State-Datei „%s“ hat falsche magische Zahl %u statt %u"
+msgstr "Scanbuild-State-Datei »%s« hat falsche magische Zahl %u statt %u"
 
-#: replication/logical/snapbuild.c:1681
+#: replication/logical/snapbuild.c:1702
 #, c-format
 msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
-msgstr "Snapbuild-State-Datei „%s“ hat nicht unterstützte Version: %u statt %u"
+msgstr "Snapbuild-State-Datei »%s« hat nicht unterstützte Version: %u statt %u"
 
-#: replication/logical/snapbuild.c:1737
+#: replication/logical/snapbuild.c:1758
 #, c-format
 msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
-msgstr "Prüfsummenfehler bei Snapbuild-State-Datei „%s“: ist %u, sollte %u sein"
+msgstr "Prüfsummenfehler bei Snapbuild-State-Datei »%s«: ist %u, sollte %u sein"
 
-#: replication/logical/snapbuild.c:1798
+#: replication/logical/snapbuild.c:1819
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "Logische Dekodierung beginnt mit gespeichertem Snapshot."
 
-#: replication/logical/snapbuild.c:1871
+#: replication/logical/snapbuild.c:1892
 #, c-format
 msgid "could not parse file name \"%s\""
-msgstr "konnte Dateinamen „%s“ nicht parsen"
+msgstr "konnte Dateinamen »%s« nicht parsen"
 
 #: replication/slot.c:174
 #, c-format
 msgid "replication slot name \"%s\" is too short"
-msgstr "Replikations-Slot-Name „%s“ ist zu kurz"
+msgstr "Replikations-Slot-Name »%s« ist zu kurz"
 
 #: replication/slot.c:183
 #, c-format
 msgid "replication slot name \"%s\" is too long"
-msgstr "Replikations-Slot-Name „%s“ ist zu lang"
+msgstr "Replikations-Slot-Name »%s« ist zu lang"
 
 #: replication/slot.c:196
 #, c-format
 msgid "replication slot name \"%s\" contains invalid character"
-msgstr "Replikations-Slot-Name „%s“ enthält ungültiges Zeichen"
+msgstr "Replikations-Slot-Name »%s« enthält ungültiges Zeichen"
 
 #: replication/slot.c:198
 #, c-format
@@ -15028,7 +15071,7 @@
 #: replication/slot.c:245
 #, c-format
 msgid "replication slot \"%s\" already exists"
-msgstr "Replikations-Slot „%s“ existiert bereits"
+msgstr "Replikations-Slot »%s« existiert bereits"
 
 #: replication/slot.c:255
 #, c-format
@@ -15040,85 +15083,85 @@
 msgid "Free one or increase max_replication_slots."
 msgstr "Geben Sie einen frei oder erhöhen Sie max_replication_slots."
 
-#: replication/slot.c:348
+#: replication/slot.c:358
 #, c-format
 msgid "replication slot \"%s\" does not exist"
-msgstr "Replikations-Slot „%s“ existiert nicht"
+msgstr "Replikations-Slot »%s« existiert nicht"
 
-#: replication/slot.c:352
+#: replication/slot.c:362
 #, c-format
 msgid "replication slot \"%s\" is already active for PID %d"
-msgstr "Replikations-Slot „%s“ ist bereits aktiv für PID %d"
+msgstr "Replikations-Slot »%s« ist bereits aktiv für PID %d"
 
-#: replication/slot.c:501 replication/slot.c:857 replication/slot.c:1202
+#: replication/slot.c:527 replication/slot.c:884 replication/slot.c:1229
 #, c-format
 msgid "could not remove directory \"%s\""
-msgstr "konnte Verzeichnis „%s“ nicht löschen"
+msgstr "konnte Verzeichnis »%s« nicht löschen"
 
-#: replication/slot.c:776
+#: replication/slot.c:803
 #, c-format
 msgid "replication slots can only be used if max_replication_slots > 0"
 msgstr "Replikations-Slots können nur verwendet werden, wenn max_replication_slots > 0"
 
-#: replication/slot.c:781
+#: replication/slot.c:808
 #, c-format
 msgid "replication slots can only be used if wal_level >= archive"
 msgstr "Replikations-Slots können nur verwendet werden, wenn wal_level >= archive"
 
-#: replication/slot.c:1134 replication/slot.c:1172
+#: replication/slot.c:1161 replication/slot.c:1199
 #, c-format
 msgid "could not read file \"%s\", read %d of %u: %m"
-msgstr "konnte Datei „%s“ nicht lesen, %d von %u gelesen: %m"
+msgstr "konnte Datei »%s« nicht lesen, %d von %u gelesen: %m"
 
-#: replication/slot.c:1143
+#: replication/slot.c:1170
 #, c-format
 msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
-msgstr "Replikations-Slot-Datei „%s“ hat falsche magische Zahl: %u statt %u"
+msgstr "Replikations-Slot-Datei »%s« hat falsche magische Zahl: %u statt %u"
 
-#: replication/slot.c:1150
+#: replication/slot.c:1177
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
-msgstr "Replikations-Slot-Datei „%s“ hat nicht unterstützte Version %u"
+msgstr "Replikations-Slot-Datei »%s« hat nicht unterstützte Version %u"
 
-#: replication/slot.c:1157
+#: replication/slot.c:1184
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
-msgstr "Replikations-Slot-Datei „%s“ hat falsche Länge %u"
+msgstr "Replikations-Slot-Datei »%s« hat falsche Länge %u"
 
-#: replication/slot.c:1187
+#: replication/slot.c:1214
 #, c-format
 msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
-msgstr "Prüfsummenfehler bei Replikations-Slot-Datei „%s“: ist %u, sollte %u sein"
+msgstr "Prüfsummenfehler bei Replikations-Slot-Datei »%s«: ist %u, sollte %u sein"
 
-#: replication/slot.c:1240
+#: replication/slot.c:1267
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "zu viele aktive Replikations-Slots vor dem Herunterfahren"
 
-#: replication/syncrep.c:199
+#: replication/syncrep.c:191
 #, c-format
 msgid "canceling the wait for synchronous replication and terminating connection due to administrator command"
 msgstr "storniere Warten auf synchrone Replikation and breche Verbindung ab aufgrund von Anweisung des Administrators"
 
-#: replication/syncrep.c:200 replication/syncrep.c:217
+#: replication/syncrep.c:192 replication/syncrep.c:209
 #, c-format
 msgid "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:216
+#: replication/syncrep.c:208
 #, c-format
 msgid "canceling wait for synchronous replication due to user request"
 msgstr "storniere Warten auf synchrone Replikation wegen Benutzeraufforderung"
 
-#: replication/syncrep.c:346
+#: replication/syncrep.c:338
 #, c-format
 msgid "standby \"%s\" now has synchronous standby priority %u"
-msgstr "Standby „%s“ hat jetzt synchrone Standby-Priorität %u"
+msgstr "Standby »%s« hat jetzt synchrone Standby-Priorität %u"
 
-#: replication/syncrep.c:480
+#: replication/syncrep.c:472
 #, 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"
+msgstr "Standby »%s« ist jetzt der synchrone Standby mit Priorität %u"
 
 #: replication/walreceiver.c:167
 #, c-format
@@ -15183,7 +15226,7 @@
 #: replication/walsender.c:483
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
-msgstr "konnte Positionszeiger nicht den Anfang der Datei „%s“ setzen: %m"
+msgstr "konnte Positionszeiger nicht den Anfang der Datei »%s« setzen: %m"
 
 #: replication/walsender.c:534
 #, c-format
@@ -15205,47 +15248,47 @@
 msgid "requested starting point %X/%X is ahead of the WAL flush position of this server %X/%X"
 msgstr "angeforderter Startpunkt %X/%X ist vor der WAL-Flush-Position dieses Servers %X/%X"
 
-#: replication/walsender.c:965
+#: replication/walsender.c:964
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "beende WAL-Sender-Prozess nach Beförderung"
 
-#: replication/walsender.c:1292
+#: replication/walsender.c:1291
 #, c-format
 msgid "received replication command: %s"
 msgstr "Replikationsbefehl empfangen: %s"
 
-#: replication/walsender.c:1385 replication/walsender.c:1401
+#: replication/walsender.c:1392 replication/walsender.c:1408
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "unerwartetes EOF auf Standby-Verbindung"
 
-#: replication/walsender.c:1415
+#: replication/walsender.c:1422
 #, c-format
 msgid "unexpected standby message type \"%c\", after receiving CopyDone"
-msgstr "unerwarteter Standby-Message-Typ „%c“, nach Empfang von CopyDone"
+msgstr "unerwarteter Standby-Message-Typ »%c«, nach Empfang von CopyDone"
 
-#: replication/walsender.c:1453
+#: replication/walsender.c:1460
 #, c-format
 msgid "invalid standby message type \"%c\""
-msgstr "ungültiger Standby-Message-Typ „%c“"
+msgstr "ungültiger Standby-Message-Typ »%c«"
 
-#: replication/walsender.c:1494
+#: replication/walsender.c:1501
 #, c-format
 msgid "unexpected message type \"%c\""
-msgstr "unerwarteter Message-Typ „%c“"
+msgstr "unerwarteter Message-Typ »%c«"
 
-#: replication/walsender.c:1781
+#: replication/walsender.c:1788
 #, c-format
 msgid "terminating walsender process due to replication timeout"
 msgstr "breche WAL-Sender-Prozess ab wegen Zeitüberschreitung bei der Replikation"
 
-#: replication/walsender.c:1874
+#: replication/walsender.c:1873
 #, c-format
 msgid "standby \"%s\" has now caught up with primary"
-msgstr "Standby-Server „%s“ hat jetzt den Primärserver eingeholt"
+msgstr "Standby-Server »%s« hat jetzt den Primärserver eingeholt"
 
-#: replication/walsender.c:1978
+#: replication/walsender.c:1977
 #, c-format
 msgid "number of requested standby connections exceeds max_wal_senders (currently %d)"
 msgstr "Anzahl angeforderter Standby-Verbindungen überschreitet max_wal_senders (aktuell %d)"
@@ -15253,7 +15296,7 @@
 #: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:973
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" already exists"
-msgstr "Regel „%s“ für Relation „%s“ existiert bereits"
+msgstr "Regel »%s« für Relation »%s« existiert bereits"
 
 #: rewrite/rewriteDefine.c:297
 #, c-format
@@ -15308,22 +15351,22 @@
 #: rewrite/rewriteDefine.c:379
 #, c-format
 msgid "\"%s\" is already a view"
-msgstr "„%s“ ist bereits eine Sicht"
+msgstr "»%s« ist bereits eine Sicht"
 
 #: rewrite/rewriteDefine.c:403
 #, c-format
 msgid "view rule for \"%s\" must be named \"%s\""
-msgstr "Sicht-Regel für „%s“ muss „%s“ heißen"
+msgstr "Sicht-Regel für »%s« muss »%s« heißen"
 
 #: rewrite/rewriteDefine.c:432
 #, 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"
+msgstr "konnte Tabelle »%s« nicht in Sicht umwandeln, weil sie nicht leer ist"
 
 #: rewrite/rewriteDefine.c:440
 #, 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"
+msgstr "konnte Tabelle »%s« nicht in Sicht umwandeln, weil sie Trigger hat"
 
 #: rewrite/rewriteDefine.c:442
 #, c-format
@@ -15333,22 +15376,22 @@
 #: rewrite/rewriteDefine.c:447
 #, 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"
+msgstr "konnte Tabelle »%s« nicht in Sicht umwandeln, weil sie Indexe hat"
 
 #: rewrite/rewriteDefine.c:453
 #, 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"
+msgstr "konnte Tabelle »%s« nicht in Sicht umwandeln, weil sie abgeleitete Tabellen hat"
 
 #: rewrite/rewriteDefine.c:459
 #, c-format
 msgid "could not convert table \"%s\" to a view because it has row security enabled"
-msgstr "konnte Tabelle „%s“ nicht in Sicht umwandeln, weil sie Sicherheit auf Zeilenebene eingeschaltet hat"
+msgstr "konnte Tabelle »%s« nicht in Sicht umwandeln, weil sie Sicherheit auf Zeilenebene eingeschaltet hat"
 
 #: rewrite/rewriteDefine.c:465
 #, c-format
 msgid "could not convert table \"%s\" to a view because it has row security policies"
-msgstr "konnte Tabelle „%s“ nicht in Sicht umwandeln, weil sie Policys für Sicherheit auf Zeilenebene hat"
+msgstr "konnte Tabelle »%s« nicht in Sicht umwandeln, weil sie Policys für Sicherheit auf Zeilenebene hat"
 
 #: rewrite/rewriteDefine.c:492
 #, c-format
@@ -15388,22 +15431,22 @@
 #: rewrite/rewriteDefine.c:702
 #, c-format
 msgid "SELECT rule's target entry %d has different column name from column \"%s\""
-msgstr "Spaltenname in Targeteintrag %d von SELECT-Regel unterscheidet sich von Spalte „%s“"
+msgstr "Spaltenname in Targeteintrag %d von SELECT-Regel unterscheidet sich von Spalte »%s«"
 
 #: rewrite/rewriteDefine.c:704
 #, c-format
 msgid "SELECT target entry is named \"%s\"."
-msgstr "SELECT-Targeteintrag heißt „%s“."
+msgstr "SELECT-Targeteintrag heißt »%s«."
 
 #: rewrite/rewriteDefine.c:713
 #, 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“"
+msgstr "Typ von Targeteintrag %d von SELECT-Regel unterscheidet sich von Spalte »%s«"
 
 #: rewrite/rewriteDefine.c:715
 #, 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“"
+msgstr "Eintrag %d in RETURNING-Liste hat anderen Typ als Spalte »%s«"
 
 #: rewrite/rewriteDefine.c:718 rewrite/rewriteDefine.c:742
 #, c-format
@@ -15418,12 +15461,12 @@
 #: rewrite/rewriteDefine.c:737
 #, 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“"
+msgstr "Größe von Targeteintrag %d von SELECT-Regel unterscheidet sich von Spalte »%s«"
 
 #: rewrite/rewriteDefine.c:739
 #, 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“"
+msgstr "Eintrag %d in RETURNING-Liste hat andere Größe als Spalte »%s«"
 
 #: rewrite/rewriteDefine.c:756
 #, c-format
@@ -15439,7 +15482,7 @@
 #: rewrite/rewriteSupport.c:112
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" does not exist"
-msgstr "Regel „%s“ für Relation „%s“ existiert nicht"
+msgstr "Regel »%s« für Relation »%s« existiert nicht"
 
 #: rewrite/rewriteDefine.c:983
 #, c-format
@@ -15449,7 +15492,7 @@
 #: rewrite/rewriteHandler.c:521
 #, 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"
+msgstr "WITH-Anfragename »%s« erscheint sowohl in der Regelaktion als auch in der umzuschreibenden Anfrage"
 
 #: rewrite/rewriteHandler.c:581
 #, c-format
@@ -15459,17 +15502,17 @@
 #: rewrite/rewriteHandler.c:921 rewrite/rewriteHandler.c:939
 #, c-format
 msgid "multiple assignments to same column \"%s\""
-msgstr "mehrere Zuweisungen zur selben Spalte „%s“"
+msgstr "mehrere Zuweisungen zur selben Spalte »%s«"
 
 #: rewrite/rewriteHandler.c:1714 rewrite/rewriteHandler.c:3324
 #, c-format
 msgid "infinite recursion detected in rules for relation \"%s\""
-msgstr "unendliche Rekursion entdeckt in Regeln für Relation „%s“"
+msgstr "unendliche Rekursion entdeckt in Regeln für Relation »%s«"
 
 #: rewrite/rewriteHandler.c:1799
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
-msgstr "unendliche Rekursion entdeckt in Policys für Relation „%s“"
+msgstr "unendliche Rekursion entdeckt in Policys für Relation »%s«"
 
 #: rewrite/rewriteHandler.c:2116
 msgid "Junk view columns are not updatable."
@@ -15539,12 +15582,12 @@
 #: rewrite/rewriteHandler.c:2717
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
-msgstr "kann nicht in Spalte „%s“ von Sicht „%s“ einfügen"
+msgstr "kann nicht in Spalte »%s« von Sicht »%s« einfügen"
 
 #: rewrite/rewriteHandler.c:2725
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
-msgstr "kann Spalte „%s“ von Sicht „%s“ nicht aktualisieren"
+msgstr "kann Spalte »%s« von Sicht »%s« nicht aktualisieren"
 
 #: rewrite/rewriteHandler.c:3123
 #, c-format
@@ -15569,7 +15612,7 @@
 #: rewrite/rewriteHandler.c:3361
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
-msgstr "INSERT RETURNING kann in Relation „%s“ nicht ausgeführt werden"
+msgstr "INSERT RETURNING kann in Relation »%s« nicht ausgeführt werden"
 
 #: rewrite/rewriteHandler.c:3363
 #, c-format
@@ -15579,7 +15622,7 @@
 #: rewrite/rewriteHandler.c:3368
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
-msgstr "UPDATE RETURNING kann in Relation „%s“ nicht ausgeführt werden"
+msgstr "UPDATE RETURNING kann in Relation »%s« nicht ausgeführt werden"
 
 #: rewrite/rewriteHandler.c:3370
 #, c-format
@@ -15589,7 +15632,7 @@
 #: rewrite/rewriteHandler.c:3375
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
-msgstr "DELETE RETURNING kann in Relation „%s“ nicht ausgeführt werden"
+msgstr "DELETE RETURNING kann in Relation »%s« nicht ausgeführt werden"
 
 #: rewrite/rewriteHandler.c:3377
 #, c-format
@@ -15624,131 +15667,131 @@
 #: rewrite/rewriteSupport.c:154
 #, c-format
 msgid "rule \"%s\" does not exist"
-msgstr "Regel „%s“ existiert nicht"
+msgstr "Regel »%s« existiert nicht"
 
 #: rewrite/rewriteSupport.c:167
 #, c-format
 msgid "there are multiple rules named \"%s\""
-msgstr "es gibt mehrere Regeln namens „%s“"
+msgstr "es gibt mehrere Regeln namens »%s«"
 
 #: rewrite/rewriteSupport.c:168
 #, c-format
 msgid "Specify a relation name as well as a rule name."
 msgstr "Geben Sie einen Relationsnamen und einen Regelnamen an."
 
-#: scan.l:432
+#: scan.l:433
 msgid "unterminated /* comment"
 msgstr "/*-Kommentar nicht abgeschlossen"
 
-#: scan.l:461
+#: scan.l:462
 msgid "unterminated bit string literal"
 msgstr "Bitkettenkonstante nicht abgeschlossen"
 
-#: scan.l:482
+#: scan.l:483
 msgid "unterminated hexadecimal string literal"
 msgstr "hexadezimale Zeichenkette nicht abgeschlossen"
 
-#: scan.l:532
+#: scan.l:533
 #, c-format
 msgid "unsafe use of string constant with Unicode escapes"
 msgstr "unsichere Verwendung von Zeichenkette mit Unicode-Escapes"
 
-#: scan.l:533
+#: scan.l:534
 #, c-format
 msgid "String constants with Unicode escapes cannot be used when standard_conforming_strings is off."
 msgstr "Zeichenketten mit Unicode-Escapes können nicht verwendet werden, wenn standard_conforming_strings aus ist."
 
-#: scan.l:577 scan.l:773
+#: scan.l:578 scan.l:774
 msgid "invalid Unicode escape character"
 msgstr "ungültiges Unicode-Escape-Zeichen"
 
-#: scan.l:602 scan.l:610 scan.l:618 scan.l:619 scan.l:620 scan.l:1329
-#: scan.l:1356 scan.l:1360 scan.l:1398 scan.l:1402 scan.l:1424
+#: scan.l:603 scan.l:611 scan.l:619 scan.l:620 scan.l:621 scan.l:1330
+#: scan.l:1357 scan.l:1361 scan.l:1399 scan.l:1403 scan.l:1425 scan.l:1435
 msgid "invalid Unicode surrogate pair"
 msgstr "ungültiges Unicode-Surrogatpaar"
 
-#: scan.l:624
+#: scan.l:625
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "ungültiges Unicode-Escape"
 
-#: scan.l:625
+#: scan.l:626
 #, c-format
 msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
 msgstr "Unicode-Escapes müssen \\uXXXX oder \\UXXXXXXXX sein."
 
-#: scan.l:636
+#: scan.l:637
 #, c-format
 msgid "unsafe use of \\' in a string literal"
 msgstr "unsichere Verwendung von \\' in Zeichenkettenkonstante"
 
-#: scan.l:637
+#: scan.l:638
 #, c-format
 msgid "Use '' to write quotes in strings. \\' is insecure in client-only encodings."
 msgstr "Verwenden Sie '', um Quotes in Zeichenketten zu schreiben. \\' ist in bestimmten Client-seitigen Kodierungen unsicher."
 
-#: scan.l:712
+#: scan.l:713
 msgid "unterminated dollar-quoted string"
 msgstr "Dollar-Quotes nicht abgeschlossen"
 
-#: scan.l:729 scan.l:753 scan.l:768
+#: scan.l:730 scan.l:754 scan.l:769
 msgid "zero-length delimited identifier"
 msgstr "Bezeichner in Anführungszeichen hat Länge null"
 
-#: scan.l:788
+#: scan.l:789
 msgid "unterminated quoted identifier"
 msgstr "Bezeichner in Anführungszeichen nicht abgeschlossen"
 
-#: scan.l:919
+#: scan.l:920
 msgid "operator too long"
 msgstr "Operator zu lang"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1072
+#: scan.l:1073
 #, c-format
 msgid "%s at end of input"
 msgstr "%s am Ende der Eingabe"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: scan.l:1080
+#: scan.l:1081
 #, c-format
 msgid "%s at or near \"%s\""
-msgstr "%s bei „%s“"
+msgstr "%s bei »%s«"
 
-#: scan.l:1245 scan.l:1277
+#: scan.l:1246 scan.l:1278
 msgid "Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8"
 msgstr "Unicode-Escape-Werte können nicht für Code-Punkt-Werte über 007F verwendet werden, wenn die Serverkodierung nicht UTF8 ist"
 
-#: scan.l:1273 scan.l:1416
+#: scan.l:1274 scan.l:1417
 msgid "invalid Unicode escape value"
 msgstr "ungültiger Unicode-Escape-Wert"
 
-#: scan.l:1472
+#: scan.l:1481
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "nicht standardkonforme Verwendung von \\' in Zeichenkettenkonstante"
 
-#: scan.l:1473
+#: scan.l:1482
 #, c-format
 msgid "Use '' to write quotes in strings, or use the escape string syntax (E'...')."
 msgstr "Verwenden Sie '', um Quotes in Zeichenketten zu schreiben, oder verwenden Sie die Syntax für Escape-Zeichenketten (E'...')."
 
-#: scan.l:1482
+#: scan.l:1491
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "nicht standardkonforme Verwendung  von \\\\ in Zeichenkettenkonstante"
 
-#: scan.l:1483
+#: scan.l:1492
 #, c-format
 msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
 msgstr "Verwenden Sie die Syntax für Escape-Zeichenketten für Backslashes, z.B. E'\\\\'."
 
-#: scan.l:1497
+#: scan.l:1506
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "nicht standardkonforme Verwendung von Escape in Zeichenkettenkonstante"
 
-#: scan.l:1498
+#: scan.l:1507
 #, c-format
 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'."
@@ -15756,28 +15799,28 @@
 #: snowball/dict_snowball.c:177
 #, c-format
 msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
-msgstr "kein Snowball-Stemmer für Sprache „%s“ und Kodierung „%s“ verfügbar"
+msgstr "kein Snowball-Stemmer für Sprache »%s« und Kodierung »%s« verfügbar"
 
 #: snowball/dict_snowball.c:200 tsearch/dict_ispell.c:73
 #: tsearch/dict_simple.c:48
 #, c-format
 msgid "multiple StopWords parameters"
-msgstr "mehrere „StopWords“-Parameter"
+msgstr "mehrere »StopWords«-Parameter"
 
 #: snowball/dict_snowball.c:209
 #, c-format
 msgid "multiple Language parameters"
-msgstr "mehrere „Language“-Parameter"
+msgstr "mehrere »Language«-Parameter"
 
 #: snowball/dict_snowball.c:216
 #, c-format
 msgid "unrecognized Snowball parameter: \"%s\""
-msgstr "unbekannter Snowball-Parameter: „%s“"
+msgstr "unbekannter Snowball-Parameter: »%s«"
 
 #: snowball/dict_snowball.c:224
 #, c-format
 msgid "missing Language parameter"
-msgstr "Parameter „Language“ fehlt"
+msgstr "Parameter »Language« fehlt"
 
 #: storage/buffer/bufmgr.c:442 storage/buffer/bufmgr.c:555
 #, c-format
@@ -15799,17 +15842,17 @@
 msgid "invalid page in block %u of relation %s; zeroing out page"
 msgstr "ungültige Seite in Block %u von Relation %s; fülle Seite mit Nullen"
 
-#: storage/buffer/bufmgr.c:3590
+#: storage/buffer/bufmgr.c:3595
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "konnte Block %u von %s nicht schreiben"
 
-#: storage/buffer/bufmgr.c:3592
+#: storage/buffer/bufmgr.c:3597
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Mehrere Fehlschläge --- Schreibfehler ist möglicherweise dauerhaft."
 
-#: storage/buffer/bufmgr.c:3613 storage/buffer/bufmgr.c:3632
+#: storage/buffer/bufmgr.c:3618 storage/buffer/bufmgr.c:3637
 #, c-format
 msgid "writing block %u of relation %s"
 msgstr "schreibe Block %u von Relation %s"
@@ -15819,61 +15862,61 @@
 msgid "no empty local buffer available"
 msgstr "kein leerer lokaler Puffer verfügbar"
 
-#: storage/file/fd.c:541
+#: storage/file/fd.c:548
 #, c-format
 msgid "could not link file \"%s\" to \"%s\": %m"
-msgstr "konnte Datei „%s“ nicht nach „%s“ linken: %m"
+msgstr "konnte Datei »%s« nicht nach »%s« linken: %m"
 
-#: storage/file/fd.c:635
+#: storage/file/fd.c:642
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "getrlimit fehlgeschlagen: %m"
 
-#: storage/file/fd.c:725
+#: storage/file/fd.c:732
 #, c-format
 msgid "insufficient file descriptors available to start server process"
 msgstr "nicht genug Dateideskriptoren verfügbar, um Serverprozess zu starten"
 
-#: storage/file/fd.c:726
+#: storage/file/fd.c:733
 #, c-format
 msgid "System allows %d, we need at least %d."
 msgstr "System erlaubt %d, wir benötigen mindestens %d."
 
-#: storage/file/fd.c:767 storage/file/fd.c:1801 storage/file/fd.c:1894
-#: storage/file/fd.c:2042
+#: storage/file/fd.c:774 storage/file/fd.c:1878 storage/file/fd.c:1971
+#: storage/file/fd.c:2119
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr "keine Dateideskriptoren mehr: %m; freigeben und nochmal versuchen"
 
-#: storage/file/fd.c:1341
+#: storage/file/fd.c:1379
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
-msgstr "temporäre Datei: Pfad „%s“, Größe %lu"
+msgstr "temporäre Datei: Pfad »%s«, Größe %lu"
 
-#: storage/file/fd.c:1490
+#: storage/file/fd.c:1551
 #, c-format
 msgid "temporary file size exceeds temp_file_limit (%dkB)"
 msgstr "Größe der temporären Datei überschreitet temp_file_limit (%dkB)"
 
-#: storage/file/fd.c:1777 storage/file/fd.c:1827
+#: storage/file/fd.c:1854 storage/file/fd.c:1904
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
-msgstr "maxAllocatedDescs (%d) überschritten beim Versuch, die Datei „%s“ zu öffnen"
+msgstr "maxAllocatedDescs (%d) überschritten beim Versuch, die Datei »%s« zu öffnen"
 
-#: storage/file/fd.c:1867
+#: storage/file/fd.c:1944
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
-msgstr "maxAllocatedDescs (%d) überschritten beim Versuch, den Befehl „%s“ auszuführen"
+msgstr "maxAllocatedDescs (%d) überschritten beim Versuch, den Befehl »%s« auszuführen"
 
-#: storage/file/fd.c:2018
+#: storage/file/fd.c:2095
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
-msgstr "maxAllocatedDescs (%d) überschritten beim Versuch, das Verzeichnis „%s“ zu öffnen"
+msgstr "maxAllocatedDescs (%d) überschritten beim Versuch, das Verzeichnis »%s« zu öffnen"
 
-#: storage/file/fd.c:2104
+#: storage/file/fd.c:2181
 #, c-format
 msgid "could not read directory \"%s\": %m"
-msgstr "konnte Verzeichnis „%s“ nicht lesen: %m"
+msgstr "konnte Verzeichnis »%s« nicht lesen: %m"
 
 #: storage/ipc/dsm.c:363
 #, c-format
@@ -15888,7 +15931,7 @@
 #: storage/ipc/dsm.c:411
 #, c-format
 msgid "Set dynamic_shared_memory_type to a value other than \"none\"."
-msgstr "Setzen Sie dynamic_shared_memory_type auf einen anderen Wert als „none“."
+msgstr "Setzen Sie dynamic_shared_memory_type auf einen anderen Wert als »none«."
 
 #: storage/ipc/dsm.c:431
 #, c-format
@@ -15902,55 +15945,55 @@
 
 #: storage/ipc/dsm_impl.c:261 storage/ipc/dsm_impl.c:361
 #: storage/ipc/dsm_impl.c:533 storage/ipc/dsm_impl.c:648
-#: storage/ipc/dsm_impl.c:811 storage/ipc/dsm_impl.c:953
+#: storage/ipc/dsm_impl.c:819 storage/ipc/dsm_impl.c:961
 #, c-format
 msgid "could not unmap shared memory segment \"%s\": %m"
-msgstr "konnte Shared-Memory-Segment „%s“ nicht unmappen: %m"
+msgstr "konnte Shared-Memory-Segment »%s« nicht unmappen: %m"
 
 #: storage/ipc/dsm_impl.c:271 storage/ipc/dsm_impl.c:543
-#: storage/ipc/dsm_impl.c:658 storage/ipc/dsm_impl.c:821
+#: storage/ipc/dsm_impl.c:658 storage/ipc/dsm_impl.c:829
 #, c-format
 msgid "could not remove shared memory segment \"%s\": %m"
-msgstr "konnte Shared-Memory-Segment „%s“ nicht entfernen: %m"
+msgstr "konnte Shared-Memory-Segment »%s« nicht entfernen: %m"
 
-#: storage/ipc/dsm_impl.c:292 storage/ipc/dsm_impl.c:721
-#: storage/ipc/dsm_impl.c:835
+#: storage/ipc/dsm_impl.c:292 storage/ipc/dsm_impl.c:729
+#: storage/ipc/dsm_impl.c:843
 #, c-format
 msgid "could not open shared memory segment \"%s\": %m"
-msgstr "konnte Shared-Memory-Segment „%s“ nicht öffnen: %m"
+msgstr "konnte Shared-Memory-Segment »%s« nicht öffnen: %m"
 
 #: storage/ipc/dsm_impl.c:316 storage/ipc/dsm_impl.c:559
-#: storage/ipc/dsm_impl.c:766 storage/ipc/dsm_impl.c:859
+#: storage/ipc/dsm_impl.c:774 storage/ipc/dsm_impl.c:867
 #, c-format
 msgid "could not stat shared memory segment \"%s\": %m"
-msgstr "konnte „stat“ für Shared-Memory-Segment „%s“ nicht ausführen: %m"
+msgstr "konnte »stat« für Shared-Memory-Segment »%s« nicht ausführen: %m"
 
-#: storage/ipc/dsm_impl.c:335 storage/ipc/dsm_impl.c:878
-#: storage/ipc/dsm_impl.c:926
+#: storage/ipc/dsm_impl.c:335 storage/ipc/dsm_impl.c:886
+#: storage/ipc/dsm_impl.c:934
 #, c-format
 msgid "could not resize shared memory segment \"%s\" to %zu bytes: %m"
-msgstr "konnte Größe des Shared-Memory-Segments „%s“ nicht auf %zu Bytes ändern: %m"
+msgstr "konnte Größe des Shared-Memory-Segments »%s« nicht auf %zu Bytes ändern: %m"
 
 #: storage/ipc/dsm_impl.c:385 storage/ipc/dsm_impl.c:580
-#: storage/ipc/dsm_impl.c:742 storage/ipc/dsm_impl.c:977
+#: storage/ipc/dsm_impl.c:750 storage/ipc/dsm_impl.c:985
 #, c-format
 msgid "could not map shared memory segment \"%s\": %m"
-msgstr "konnte Shared-Memory-Segment „%s“ nicht mappen: %m"
+msgstr "konnte Shared-Memory-Segment »%s« nicht mappen: %m"
 
 #: storage/ipc/dsm_impl.c:515
 #, c-format
 msgid "could not get shared memory segment: %m"
 msgstr "konnte Shared-Memory-Segment nicht finden: %m"
 
-#: storage/ipc/dsm_impl.c:694
+#: storage/ipc/dsm_impl.c:714
 #, c-format
 msgid "could not create shared memory segment \"%s\": %m"
-msgstr "konnte Shared-Memory-Segment „%s“ nicht erzeugen: %m"
+msgstr "konnte Shared-Memory-Segment »%s« nicht erzeugen: %m"
 
-#: storage/ipc/dsm_impl.c:1018
+#: storage/ipc/dsm_impl.c:1026
 #, c-format
 msgid "could not duplicate handle for \"%s\": %m"
-msgstr "konnte Handle für „%s“ nicht duplizieren: %m"
+msgstr "konnte Handle für »%s« nicht duplizieren: %m"
 
 #: storage/ipc/shm_toc.c:108 storage/ipc/shm_toc.c:189 storage/ipc/shmem.c:205
 #: storage/lmgr/lock.c:867 storage/lmgr/lock.c:901 storage/lmgr/lock.c:2598
@@ -15965,29 +16008,29 @@
 #: storage/ipc/shmem.c:361 storage/ipc/shmem.c:412
 #, c-format
 msgid "not enough shared memory for data structure \"%s\" (%zu bytes requested)"
-msgstr "nicht genug Shared-Memory für Datenstruktur „%s“ (%zu Bytes angefordert)"
+msgstr "nicht genug Shared-Memory für Datenstruktur »%s« (%zu Bytes angefordert)"
 
 #: storage/ipc/shmem.c:380
 #, c-format
 msgid "could not create ShmemIndex entry for data structure \"%s\""
-msgstr "konnte ShmemIndex-Eintrag für Datenstruktur „%s“ nicht erzeugen"
+msgstr "konnte ShmemIndex-Eintrag für Datenstruktur »%s« nicht erzeugen"
 
 #: storage/ipc/shmem.c:395
 #, c-format
 msgid "ShmemIndex entry size is wrong for data structure \"%s\": expected %zu, actual %zu"
-msgstr "ShmemIndex-Eintraggröße ist falsch für Datenstruktur „%s“: erwartet %zu, tatsächlich %zu"
+msgstr "ShmemIndex-Eintraggröße ist falsch für Datenstruktur »%s«: erwartet %zu, tatsächlich %zu"
 
 #: storage/ipc/shmem.c:440 storage/ipc/shmem.c:459
 #, c-format
 msgid "requested shared memory size overflows size_t"
 msgstr "angeforderte Shared-Memory-Größe übersteigt Kapazität von size_t"
 
-#: storage/ipc/standby.c:500 tcop/postgres.c:2974
+#: storage/ipc/standby.c:502 tcop/postgres.c:2989
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "storniere Anfrage wegen Konflikt mit der Wiederherstellung"
 
-#: storage/ipc/standby.c:501 tcop/postgres.c:2274
+#: storage/ipc/standby.c:503 tcop/postgres.c:2274
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "Benutzertransaktion hat Verklemmung (Deadlock) mit Wiederherstellung verursacht."
@@ -16005,7 +16048,7 @@
 #: storage/large_object/inv_api.c:436
 #, c-format
 msgid "invalid whence setting: %d"
-msgstr "ungültige „whence“-Angabe: %d"
+msgstr "ungültige »whence«-Angabe: %d"
 
 #: storage/large_object/inv_api.c:593
 #, c-format
@@ -16035,42 +16078,42 @@
 #: storage/lmgr/lmgr.c:684
 #, c-format
 msgid "while updating tuple (%u,%u) in relation \"%s\""
-msgstr "beim Aktualisieren von Tupel (%u,%u) in Relation „%s“"
+msgstr "beim Aktualisieren von Tupel (%u,%u) in Relation »%s«"
 
 #: storage/lmgr/lmgr.c:687
 #, c-format
 msgid "while deleting tuple (%u,%u) in relation \"%s\""
-msgstr "beim Löschen von Tupel (%u,%u) in Relation „%s“"
+msgstr "beim Löschen von Tupel (%u,%u) in Relation »%s«"
 
 #: storage/lmgr/lmgr.c:690
 #, c-format
 msgid "while locking tuple (%u,%u) in relation \"%s\""
-msgstr "beim Sperren von Tupel (%u,%u) in Relation „%s“"
+msgstr "beim Sperren von Tupel (%u,%u) in Relation »%s«"
 
 #: storage/lmgr/lmgr.c:693
 #, c-format
 msgid "while locking updated version (%u,%u) of tuple in relation \"%s\""
-msgstr "beim Sperren von aktualisierter Version (%u,%u) von Tupel in Relation „%s“"
+msgstr "beim Sperren von aktualisierter Version (%u,%u) von Tupel in Relation »%s«"
 
 #: storage/lmgr/lmgr.c:696
 #, c-format
 msgid "while inserting index tuple (%u,%u) in relation \"%s\""
-msgstr "beim Einfügen von Indextupel (%u,%u) in Relation „%s“"
+msgstr "beim Einfügen von Indextupel (%u,%u) in Relation »%s«"
 
 #: storage/lmgr/lmgr.c:699
 #, c-format
 msgid "while checking uniqueness of tuple (%u,%u) in relation \"%s\""
-msgstr "beim Prüfen der Eindeutigkeit von Tupel (%u,%u) in Relation „%s“"
+msgstr "beim Prüfen der Eindeutigkeit von Tupel (%u,%u) in Relation »%s«"
 
 #: storage/lmgr/lmgr.c:702
 #, c-format
 msgid "while rechecking updated tuple (%u,%u) in relation \"%s\""
-msgstr "beim erneuten Prüfen des aktualisierten Tupels (%u,%u) in Relation „%s“"
+msgstr "beim erneuten Prüfen des aktualisierten Tupels (%u,%u) in Relation »%s«"
 
 #: storage/lmgr/lmgr.c:705
 #, c-format
 msgid "while checking exclusion constraint on tuple (%u,%u) in relation \"%s\""
-msgstr "beim Prüfen eines Exclusion-Constraints für Tupel (%u,%u) in Relation „%s“"
+msgstr "beim Prüfen eines Exclusion-Constraints für Tupel (%u,%u) in Relation »%s«"
 
 #: storage/lmgr/lmgr.c:925
 #, c-format
@@ -16176,7 +16219,7 @@
 #: storage/lmgr/predicate.c:1189 storage/lmgr/predicate.c:1260
 #, c-format
 msgid "not enough shared memory for elements of data structure \"%s\" (%zu bytes requested)"
-msgstr "nicht genug Shared-Memory für Elemente der Datenstruktur „%s“ (%zu Bytes angefordert)"
+msgstr "nicht genug Shared-Memory für Elemente der Datenstruktur »%s« (%zu Bytes angefordert)"
 
 #: storage/lmgr/predicate.c:1548
 #, c-format
@@ -16186,25 +16229,25 @@
 #: storage/lmgr/predicate.c:1587
 #, c-format
 msgid "\"default_transaction_isolation\" is set to \"serializable\"."
-msgstr "„default_transaction_isolation“ ist auf „serializable“ gesetzt."
+msgstr "»default_transaction_isolation« ist auf »serializable« gesetzt."
 
 #: storage/lmgr/predicate.c:1588
 #, c-format
 msgid "You can use \"SET default_transaction_isolation = 'repeatable read'\" to change the default."
-msgstr "Mit „SET default_transaction_isolation = 'repeatable read'“ können Sie die Voreinstellung ändern."
+msgstr "Mit »SET default_transaction_isolation = 'repeatable read'« können Sie die Voreinstellung ändern."
 
 #: storage/lmgr/predicate.c:1627
 #, c-format
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr "eine Transaktion, die einen Snapshot importiert, must READ ONLY DEFERRABLE sein"
 
-#: storage/lmgr/predicate.c:1705 utils/time/snapmgr.c:431
-#: utils/time/snapmgr.c:437
+#: storage/lmgr/predicate.c:1705 utils/time/snapmgr.c:472
+#: utils/time/snapmgr.c:478
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "konnte den angeforderten Snapshot nicht importieren"
 
-#: storage/lmgr/predicate.c:1706 utils/time/snapmgr.c:438
+#: storage/lmgr/predicate.c:1706 utils/time/snapmgr.c:479
 #, c-format
 msgid "The source transaction %u is not running anymore."
 msgstr "Die Quelltransaktion %u läuft nicht mehr."
@@ -16278,30 +16321,30 @@
 msgid "page verification failed, calculated checksum %u but expected %u"
 msgstr "Seitenüberprüfung fehlgeschlagen, berechnete Prüfsumme %u, aber erwartet %u"
 
-#: storage/page/bufpage.c:200 storage/page/bufpage.c:490
-#: storage/page/bufpage.c:705 storage/page/bufpage.c:836
-#: storage/page/bufpage.c:936
+#: storage/page/bufpage.c:203 storage/page/bufpage.c:522
+#: storage/page/bufpage.c:737 storage/page/bufpage.c:868
+#: storage/page/bufpage.c:968
 #, c-format
 msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr "verfälschte Seitenzeiger: lower = %u, upper = %u, special = %u"
 
-#: storage/page/bufpage.c:534
+#: storage/page/bufpage.c:566
 #, c-format
 msgid "corrupted item pointer: %u"
 msgstr "verfälschter Item-Zeiger: %u"
 
-#: storage/page/bufpage.c:545 storage/page/bufpage.c:887
-#: storage/page/bufpage.c:1042
+#: storage/page/bufpage.c:577 storage/page/bufpage.c:919
+#: storage/page/bufpage.c:1074
 #, c-format
 msgid "corrupted item lengths: total %u, available space %u"
 msgstr "verfälschte Item-Längen: gesamt %u, verfügbarer Platz %u"
 
-#: storage/page/bufpage.c:724 storage/page/bufpage.c:860
+#: storage/page/bufpage.c:756 storage/page/bufpage.c:892
 #, c-format
 msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr "verfälschter Item-Zeiger: offset = %u, size = %u"
 
-#: storage/page/bufpage.c:965
+#: storage/page/bufpage.c:997
 #, c-format
 msgid "corrupted item pointer: offset = %u, length = %u"
 msgstr "verfälschter Item-Zeiger: offset = %u, length = %u"
@@ -16309,23 +16352,23 @@
 #: storage/smgr/md.c:442 storage/smgr/md.c:913
 #, c-format
 msgid "could not truncate file \"%s\": %m"
-msgstr "kann Datei „%s“ nicht kürzen: %m"
+msgstr "kann Datei »%s« nicht kürzen: %m"
 
 #: storage/smgr/md.c:509
 #, c-format
 msgid "cannot extend file \"%s\" beyond %u blocks"
-msgstr "kann Datei „%s“ nicht auf über %u Blöcke erweitern"
+msgstr "kann Datei »%s« nicht auf über %u Blöcke erweitern"
 
 # XXX
 #: storage/smgr/md.c:531 storage/smgr/md.c:692 storage/smgr/md.c:767
 #, 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"
+msgstr "konnte Positionszeiger nicht auf Block %u in Datei »%s« setzen: %m"
 
 #: storage/smgr/md.c:539
 #, c-format
 msgid "could not extend file \"%s\": %m"
-msgstr "konnte Datei „%s“ nicht erweitern: %m"
+msgstr "konnte Datei »%s« nicht erweitern: %m"
 
 #: storage/smgr/md.c:541 storage/smgr/md.c:548 storage/smgr/md.c:794
 #, c-format
@@ -16335,92 +16378,92 @@
 #: storage/smgr/md.c:545
 #, 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"
+msgstr "konnte Datei »%s« nicht erweitern: es wurden nur %d von %d Bytes bei Block %u geschrieben"
 
 #: storage/smgr/md.c:710
 #, c-format
 msgid "could not read block %u in file \"%s\": %m"
-msgstr "konnte Block %u in Datei „%s“ nicht lesen: %m"
+msgstr "konnte Block %u in Datei »%s« nicht lesen: %m"
 
 #: storage/smgr/md.c:726
 #, 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"
+msgstr "konnte Block %u in Datei »%s« nicht lesen: es wurden nur %d von %d Bytes gelesen"
 
 #: storage/smgr/md.c:785
 #, c-format
 msgid "could not write block %u in file \"%s\": %m"
-msgstr "konnte Block %u in Datei „%s“ nicht schreiben: %m"
+msgstr "konnte Block %u in Datei »%s« nicht schreiben: %m"
 
 #: storage/smgr/md.c:790
 #, 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"
+msgstr "konnte Block %u in Datei »%s« nicht schreiben: es wurden nur %d von %d Bytes geschrieben"
 
 #: storage/smgr/md.c:889
 #, 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"
+msgstr "konnte Datei »%s« nicht auf %u Blöcke kürzen: es sind jetzt nur %u Blöcke"
 
-#: storage/smgr/md.c:938
+#: storage/smgr/md.c:939
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: %m"
-msgstr "konnte Datei „%s“ nicht auf %u Blöcke kürzen: %m"
+msgstr "konnte Datei »%s« nicht auf %u Blöcke kürzen: %m"
 
-#: storage/smgr/md.c:1218
+#: storage/smgr/md.c:1219
 #, c-format
 msgid "could not fsync file \"%s\" but retrying: %m"
-msgstr "konnte Datei „%s“ nicht fsyncen, versuche erneut: %m"
+msgstr "konnte Datei »%s« nicht fsyncen, versuche erneut: %m"
 
-#: storage/smgr/md.c:1381
+#: storage/smgr/md.c:1382
 #, c-format
 msgid "could not forward fsync request because request queue is full"
 msgstr "konnte fsync-Anfrage nicht weiterleiten, weil Anfrageschlange voll ist"
 
-#: storage/smgr/md.c:1776
+#: storage/smgr/md.c:1777
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
-msgstr "konnte Datei „%s“ nicht öffnen (Zielblock %u): %m"
+msgstr "konnte Datei »%s« nicht öffnen (Zielblock %u): %m"
 
-#: tcop/fastpath.c:111 tcop/fastpath.c:475 tcop/fastpath.c:605
+#: tcop/fastpath.c:111 tcop/fastpath.c:463 tcop/fastpath.c:593
 #, c-format
 msgid "invalid argument size %d in function call message"
 msgstr "ungültige Argumentgröße %d in Funktionsaufruf-Message"
 
-#: tcop/fastpath.c:291 tcop/postgres.c:1003 tcop/postgres.c:1313
+#: tcop/fastpath.c:281 tcop/postgres.c:1003 tcop/postgres.c:1313
 #: tcop/postgres.c:1571 tcop/postgres.c:1975 tcop/postgres.c:2342
 #: tcop/postgres.c:2417
 #, c-format
 msgid "current transaction is aborted, commands ignored until end of transaction block"
 msgstr "aktuelle Transaktion wurde abgebrochen, Befehle werden bis zum Ende der Transaktion ignoriert"
 
-#: tcop/fastpath.c:319
+#: tcop/fastpath.c:309
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
-msgstr "Fastpath-Funktionsaufruf: „%s“ (OID %u)"
+msgstr "Fastpath-Funktionsaufruf: »%s« (OID %u)"
 
-#: tcop/fastpath.c:401 tcop/postgres.c:1173 tcop/postgres.c:1438
+#: tcop/fastpath.c:391 tcop/postgres.c:1173 tcop/postgres.c:1438
 #: tcop/postgres.c:1816 tcop/postgres.c:2033
 #, c-format
 msgid "duration: %s ms"
 msgstr "Dauer: %s ms"
 
-#: tcop/fastpath.c:405
+#: tcop/fastpath.c:395
 #, c-format
 msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
-msgstr "Dauer: %s ms  Fastpath-Funktionsaufruf: „%s“ (OID %u)"
+msgstr "Dauer: %s ms  Fastpath-Funktionsaufruf: »%s« (OID %u)"
 
-#: tcop/fastpath.c:443 tcop/fastpath.c:570
+#: tcop/fastpath.c:431 tcop/fastpath.c:558
 #, c-format
 msgid "function call message contains %d arguments but function requires %d"
 msgstr "Funktionsaufruf-Message enthält %d Argumente, aber Funktion benötigt %d"
 
-#: tcop/fastpath.c:451
+#: tcop/fastpath.c:439
 #, c-format
 msgid "function call message contains %d argument formats but %d arguments"
 msgstr "Funktionsaufruf-Message enthält %d Argumentformate aber %d Argumente"
 
-#: tcop/fastpath.c:538 tcop/fastpath.c:621
+#: tcop/fastpath.c:526 tcop/fastpath.c:609
 #, c-format
 msgid "incorrect binary data format in function argument %d"
 msgstr "falsches Binärdatenformat in Funktionsargument %d"
@@ -16431,7 +16474,7 @@
 msgstr "unerwartetes EOF auf Client-Verbindung"
 
 #: tcop/postgres.c:449 tcop/postgres.c:461 tcop/postgres.c:472
-#: tcop/postgres.c:484 tcop/postgres.c:4268
+#: tcop/postgres.c:484 tcop/postgres.c:4277
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "ungültiger Frontend-Message-Typ %d"
@@ -16479,7 +16522,7 @@
 #: tcop/postgres.c:1555
 #, c-format
 msgid "bind message supplies %d parameters, but prepared statement \"%s\" requires %d"
-msgstr "Binden-Nachricht enthält %d Parameter, aber vorbereitete Anweisung „%s“ erfordert %d"
+msgstr "Binden-Nachricht enthält %d Parameter, aber vorbereitete Anweisung »%s« erfordert %d"
 
 #: tcop/postgres.c:1723
 #, c-format
@@ -16494,7 +16537,7 @@
 #: tcop/postgres.c:1869 tcop/postgres.c:2403
 #, c-format
 msgid "portal \"%s\" does not exist"
-msgstr "Portal „%s“ existiert nicht"
+msgstr "Portal »%s« existiert nicht"
 
 #: tcop/postgres.c:1954
 #, c-format
@@ -16604,87 +16647,87 @@
 msgid "connection to client lost"
 msgstr "Verbindung zum Client wurde verloren"
 
-#: tcop/postgres.c:2951
+#: tcop/postgres.c:2966
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "storniere Anfrage wegen Zeitüberschreitung einer Sperre"
 
-#: tcop/postgres.c:2958
+#: tcop/postgres.c:2973
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr "storniere Anfrage wegen Zeitüberschreitung der Anfrage"
 
-#: tcop/postgres.c:2965
+#: tcop/postgres.c:2980
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "storniere Autovacuum-Aufgabe"
 
-#: tcop/postgres.c:2988
+#: tcop/postgres.c:3003
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "storniere Anfrage wegen Benutzeraufforderung"
 
-#: tcop/postgres.c:3098
+#: tcop/postgres.c:3113
 #, c-format
 msgid "stack depth limit exceeded"
 msgstr "Grenze für Stacktiefe überschritten"
 
-#: tcop/postgres.c:3099
+#: tcop/postgres.c:3114
 #, 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“ (aktuell %dkB), nachdem Sie sichergestellt haben, dass die Stacktiefenbegrenzung Ihrer Plattform ausreichend ist."
+msgstr "Erhöhen Sie den Konfigurationsparameter »max_stack_depth« (aktuell %dkB), nachdem Sie sichergestellt haben, dass die Stacktiefenbegrenzung Ihrer Plattform ausreichend ist."
 
-#: tcop/postgres.c:3162
+#: tcop/postgres.c:3177
 #, 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:3164
+#: tcop/postgres.c:3179
 #, c-format
 msgid "Increase the platform's stack depth limit via \"ulimit -s\" or local equivalent."
-msgstr "Erhöhen Sie die Stacktiefenbegrenzung Ihrer Plattform mit „ulimit -s“ oder der lokalen Entsprechung."
+msgstr "Erhöhen Sie die Stacktiefenbegrenzung Ihrer Plattform mit »ulimit -s« oder der lokalen Entsprechung."
 
-#: tcop/postgres.c:3524
+#: tcop/postgres.c:3539
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "ungültiges Kommandozeilenargument für Serverprozess: %s"
 
-#: tcop/postgres.c:3525 tcop/postgres.c:3531
+#: tcop/postgres.c:3540 tcop/postgres.c:3546
 #, c-format
 msgid "Try \"%s --help\" for more information."
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen."
+msgstr "Versuchen Sie »%s --help« für weitere Informationen."
 
-#: tcop/postgres.c:3529
+#: tcop/postgres.c:3544
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: ungültiges Kommandozeilenargument: %s"
 
-#: tcop/postgres.c:3590
+#: tcop/postgres.c:3605
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: weder Datenbankname noch Benutzername angegeben"
 
-#: tcop/postgres.c:4176
+#: tcop/postgres.c:4185
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "ungültiger Subtyp %d von CLOSE-Message"
 
-#: tcop/postgres.c:4211
+#: tcop/postgres.c:4220
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "ungültiger Subtyp %d von DESCRIBE-Message"
 
-#: tcop/postgres.c:4289
+#: tcop/postgres.c:4298
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr "Fastpath-Funktionsaufrufe werden auf einer Replikationsverbindung nicht unterstützt"
 
-#: tcop/postgres.c:4293
+#: tcop/postgres.c:4302
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr "erweitertes Anfrageprotokoll wird nicht auf einer Replikationsverbindung unterstützt"
 
-#: tcop/postgres.c:4463
+#: tcop/postgres.c:4472
 #, c-format
 msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
 msgstr "Verbindungsende: Sitzungszeit: %d:%02d:%02d.%03d Benutzer=%s Datenbank=%s Host=%s%s%s"
@@ -16746,47 +16789,47 @@
 #: tsearch/dict_ispell.c:81
 #, c-format
 msgid "unrecognized Ispell parameter: \"%s\""
-msgstr "unbekannter Ispell-Parameter: „%s“"
+msgstr "unbekannter Ispell-Parameter: »%s«"
 
 #: tsearch/dict_ispell.c:95
 #, c-format
 msgid "missing AffFile parameter"
-msgstr "Parameter „AffFile“ fehlt"
+msgstr "Parameter »AffFile« fehlt"
 
 #: tsearch/dict_ispell.c:101 tsearch/dict_thesaurus.c:647
 #, c-format
 msgid "missing DictFile parameter"
-msgstr "Parameter „DictFile“ fehlt"
+msgstr "Parameter »DictFile« fehlt"
 
 #: tsearch/dict_simple.c:57
 #, c-format
 msgid "multiple Accept parameters"
-msgstr "mehrere „Accept“-Parameter"
+msgstr "mehrere »Accept«-Parameter"
 
 #: tsearch/dict_simple.c:65
 #, c-format
 msgid "unrecognized simple dictionary parameter: \"%s\""
-msgstr "unbekannter Parameter für das einfache Wörterbuch: „%s“"
+msgstr "unbekannter Parameter für das einfache Wörterbuch: »%s«"
 
 #: tsearch/dict_synonym.c:117
 #, c-format
 msgid "unrecognized synonym parameter: \"%s\""
-msgstr "unbekannter Synonymparameter: „%s“"
+msgstr "unbekannter Synonymparameter: »%s«"
 
 #: tsearch/dict_synonym.c:124
 #, c-format
 msgid "missing Synonyms parameter"
-msgstr "Parameter „Synonyms“ fehlt"
+msgstr "Parameter »Synonyms« fehlt"
 
 #: tsearch/dict_synonym.c:131
 #, c-format
 msgid "could not open synonym file \"%s\": %m"
-msgstr "konnte Synonymdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Synonymdatei »%s« nicht öffnen: %m"
 
 #: tsearch/dict_thesaurus.c:178
 #, c-format
 msgid "could not open thesaurus file \"%s\": %m"
-msgstr "konnte Thesaurusdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Thesaurusdatei »%s« nicht öffnen: %m"
 
 #: tsearch/dict_thesaurus.c:211
 #, c-format
@@ -16811,27 +16854,27 @@
 #: tsearch/dict_thesaurus.c:420
 #, 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)"
+msgstr "Thesaurus-Beispielwort »%s« wird nicht vom Unterwörterbuch erkannt (Regel %d)"
 
 #: tsearch/dict_thesaurus.c:426
 #, c-format
 msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
-msgstr "Thesaurus-Beispielwort „%s“ ist ein Stoppwort (Regel %d)"
+msgstr "Thesaurus-Beispielwort »%s« ist ein Stoppwort (Regel %d)"
 
 #: tsearch/dict_thesaurus.c:429
 #, c-format
 msgid "Use \"?\" to represent a stop word within a sample phrase."
-msgstr "Verwenden Sie „?“, um ein Stoppwort in einem Beispielsatz darzustellen."
+msgstr "Verwenden Sie »?«, um ein Stoppwort in einem Beispielsatz darzustellen."
 
 #: tsearch/dict_thesaurus.c:575
 #, c-format
 msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
-msgstr "Thesaurus-Ersatzwort „%s“ ist ein Stoppwort (Regel %d)"
+msgstr "Thesaurus-Ersatzwort »%s« ist ein Stoppwort (Regel %d)"
 
 #: tsearch/dict_thesaurus.c:582
 #, 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)"
+msgstr "Thesaurus-Ersatzwort »%s« wird nicht vom Unterwörterbuch erkannt (Regel %d)"
 
 #: tsearch/dict_thesaurus.c:594
 #, c-format
@@ -16841,22 +16884,22 @@
 #: tsearch/dict_thesaurus.c:632
 #, c-format
 msgid "multiple Dictionary parameters"
-msgstr "mehrere „Dictionary“-Parameter"
+msgstr "mehrere »Dictionary«-Parameter"
 
 #: tsearch/dict_thesaurus.c:639
 #, c-format
 msgid "unrecognized Thesaurus parameter: \"%s\""
-msgstr "unbekannter Thesaurus-Parameter: „%s“"
+msgstr "unbekannter Thesaurus-Parameter: »%s«"
 
 #: tsearch/dict_thesaurus.c:651
 #, c-format
 msgid "missing Dictionary parameter"
-msgstr "Parameter „Dictionary“ fehlt"
+msgstr "Parameter »Dictionary« fehlt"
 
 #: tsearch/spell.c:289
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
-msgstr "konnte Wörterbuchdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Wörterbuchdatei »%s« nicht öffnen: %m"
 
 #: tsearch/spell.c:452 utils/adt/regexp.c:204
 #, c-format
@@ -16871,12 +16914,12 @@
 #: tsearch/spell.c:779 tsearch/spell.c:835 tsearch/spell.c:937
 #, c-format
 msgid "could not open affix file \"%s\": %m"
-msgstr "konnte Affixdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Affixdatei »%s« nicht öffnen: %m"
 
 #: tsearch/spell.c:825
 #, c-format
 msgid "Ispell dictionary supports only default flag value"
-msgstr "Ispell-Wörterbuch unterstützt nur den Default-Flag-Wert"
+msgstr "Ispell-Wörterbuch unterstützt nur den Flag-Wert »default«"
 
 #: tsearch/spell.c:1050
 #, c-format
@@ -16891,7 +16934,7 @@
 #: tsearch/ts_locale.c:177
 #, c-format
 msgid "line %d of configuration file \"%s\": \"%s\""
-msgstr "Zeile %d in Konfigurationsdatei „%s“: „%s“"
+msgstr "Zeile %d in Konfigurationsdatei »%s«: »%s«"
 
 #: tsearch/ts_locale.c:299
 #, c-format
@@ -16913,42 +16956,42 @@
 #: tsearch/ts_utils.c:51
 #, c-format
 msgid "invalid text search configuration file name \"%s\""
-msgstr "ungültiger Textsuchekonfigurationsdateiname „%s“"
+msgstr "ungültiger Textsuchekonfigurationsdateiname »%s«"
 
 #: tsearch/ts_utils.c:83
 #, c-format
 msgid "could not open stop-word file \"%s\": %m"
-msgstr "konnte Stoppwortdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Stoppwortdatei »%s« nicht öffnen: %m"
 
 #: tsearch/wparser.c:306
 #, c-format
 msgid "text search parser does not support headline creation"
 msgstr "Textsucheparser unterstützt das Erzeugen von Headlines nicht"
 
-#: tsearch/wparser_def.c:2557
+#: tsearch/wparser_def.c:2559
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
-msgstr "unbekannter Headline-Parameter: „%s“"
+msgstr "unbekannter Headline-Parameter: »%s«"
 
-#: tsearch/wparser_def.c:2566
+#: tsearch/wparser_def.c:2568
 #, c-format
 msgid "MinWords should be less than MaxWords"
-msgstr "„MinWords“ sollte kleiner als „MaxWords“ sein"
+msgstr "»MinWords« sollte kleiner als »MaxWords« sein"
 
-#: tsearch/wparser_def.c:2570
+#: tsearch/wparser_def.c:2572
 #, c-format
 msgid "MinWords should be positive"
-msgstr "„MinWords“ sollte positiv sein"
+msgstr "»MinWords« sollte positiv sein"
 
-#: tsearch/wparser_def.c:2574
+#: tsearch/wparser_def.c:2576
 #, c-format
 msgid "ShortWord should be >= 0"
-msgstr "„ShortWord“ sollte >= 0 sein"
+msgstr "»ShortWord« sollte >= 0 sein"
 
-#: tsearch/wparser_def.c:2578
+#: tsearch/wparser_def.c:2580
 #, c-format
 msgid "MaxFragments should be >= 0"
-msgstr "„MaxFragments“ sollte >= 0 sein"
+msgstr "»MaxFragments« sollte >= 0 sein"
 
 #: utils/adt/acl.c:169 utils/adt/name.c:91
 #, c-format
@@ -16963,12 +17006,12 @@
 #: utils/adt/acl.c:256
 #, c-format
 msgid "unrecognized key word: \"%s\""
-msgstr "unbekanntes Schlüsselwort: „%s“"
+msgstr "unbekanntes Schlüsselwort: »%s«"
 
 #: utils/adt/acl.c:257
 #, c-format
 msgid "ACL key word must be \"group\" or \"user\"."
-msgstr "ACL-Schlüsselwort muss „group“ oder „user“ sein."
+msgstr "ACL-Schlüsselwort muss »group« oder »user« sein."
 
 #: utils/adt/acl.c:262
 #, c-format
@@ -16978,22 +17021,22 @@
 #: utils/adt/acl.c:263
 #, c-format
 msgid "A name must follow the \"group\" or \"user\" key word."
-msgstr "Auf das Schlüsselwort „group“ oder „user“ muss ein Name folgen."
+msgstr "Auf das Schlüsselwort »group« oder »user« muss ein Name folgen."
 
 #: utils/adt/acl.c:269
 #, c-format
 msgid "missing \"=\" sign"
-msgstr "„=“-Zeichen fehlt"
+msgstr "»=«-Zeichen fehlt"
 
 #: utils/adt/acl.c:322
 #, c-format
 msgid "invalid mode character: must be one of \"%s\""
-msgstr "ungültiges Moduszeichen: muss eines aus „%s“ sein"
+msgstr "ungültiges Moduszeichen: muss eines aus »%s« sein"
 
 #: utils/adt/acl.c:344
 #, c-format
 msgid "a name must follow the \"/\" sign"
-msgstr "auf das „/“-Zeichen muss ein Name folgen"
+msgstr "auf das »/«-Zeichen muss ein Name folgen"
 
 #: utils/adt/acl.c:352
 #, c-format
@@ -17048,99 +17091,99 @@
 #: utils/adt/acl.c:1632 utils/adt/acl.c:1686
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
-msgstr "unbekannter Privilegtyp: „%s“"
+msgstr "unbekannter Privilegtyp: »%s«"
 
 #: utils/adt/acl.c:3426 utils/adt/regproc.c:123 utils/adt/regproc.c:144
 #: utils/adt/regproc.c:319
 #, c-format
 msgid "function \"%s\" does not exist"
-msgstr "Funktion „%s“ existiert nicht"
+msgstr "Funktion »%s« existiert nicht"
 
 #: utils/adt/acl.c:4880
 #, c-format
 msgid "must be member of role \"%s\""
-msgstr "Berechtigung nur für Mitglied von Rolle „%s“"
+msgstr "Berechtigung nur für Mitglied von Rolle »%s«"
 
 #: utils/adt/array_expanded.c:276 utils/adt/arrayfuncs.c:934
 #: utils/adt/arrayfuncs.c:1522 utils/adt/arrayfuncs.c:3225
-#: utils/adt/arrayfuncs.c:3363 utils/adt/arrayfuncs.c:5838
-#: utils/adt/arrayfuncs.c:6149 utils/adt/arrayutils.c:93
+#: utils/adt/arrayfuncs.c:3363 utils/adt/arrayfuncs.c:5826
+#: utils/adt/arrayfuncs.c:6137 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 "Arraygröße überschreitet erlaubtes Maximum (%d)"
 
-#: utils/adt/array_userfuncs.c:67 utils/adt/array_userfuncs.c:529
-#: utils/adt/array_userfuncs.c:609 utils/adt/json.c:1759 utils/adt/json.c:1854
+#: utils/adt/array_userfuncs.c:79 utils/adt/array_userfuncs.c:541
+#: utils/adt/array_userfuncs.c:621 utils/adt/json.c:1759 utils/adt/json.c:1854
 #: utils/adt/json.c:1892 utils/adt/jsonb.c:1126 utils/adt/jsonb.c:1155
 #: utils/adt/jsonb.c:1591 utils/adt/jsonb.c:1755 utils/adt/jsonb.c:1765
 #, c-format
 msgid "could not determine input data type"
 msgstr "konnte Eingabedatentypen nicht bestimmen"
 
-#: utils/adt/array_userfuncs.c:72
+#: utils/adt/array_userfuncs.c:84
 #, c-format
 msgid "input data type is not an array"
 msgstr "Eingabedatentyp ist kein Array"
 
-#: utils/adt/array_userfuncs.c:120 utils/adt/array_userfuncs.c:174
-#: utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1161 utils/adt/float.c:1220
-#: utils/adt/float.c:2771 utils/adt/float.c:2787 utils/adt/int.c:623
+#: utils/adt/array_userfuncs.c:132 utils/adt/array_userfuncs.c:186
+#: utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1158 utils/adt/float.c:1217
+#: utils/adt/float.c:2768 utils/adt/float.c:2784 utils/adt/int.c:623
 #: utils/adt/int.c:652 utils/adt/int.c:673 utils/adt/int.c:704
 #: utils/adt/int.c:737 utils/adt/int.c:759 utils/adt/int.c:907
 #: utils/adt/int.c:928 utils/adt/int.c:955 utils/adt/int.c:995
 #: utils/adt/int.c:1016 utils/adt/int.c:1043 utils/adt/int.c:1076
-#: utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2903
-#: utils/adt/numeric.c:2912 utils/adt/varbit.c:1173 utils/adt/varbit.c:1565
+#: utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2899
+#: utils/adt/numeric.c:2908 utils/adt/varbit.c:1173 utils/adt/varbit.c:1575
 #: utils/adt/varlena.c:1045 utils/adt/varlena.c:2595
 #, c-format
 msgid "integer out of range"
 msgstr "integer ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/array_userfuncs.c:127 utils/adt/array_userfuncs.c:184
+#: utils/adt/array_userfuncs.c:139 utils/adt/array_userfuncs.c:196
 #, c-format
 msgid "argument must be empty or one-dimensional array"
 msgstr "Argument muss entweder leer oder ein eindimensionales Array sein"
 
-#: utils/adt/array_userfuncs.c:266 utils/adt/array_userfuncs.c:305
-#: utils/adt/array_userfuncs.c:342 utils/adt/array_userfuncs.c:371
-#: utils/adt/array_userfuncs.c:399
+#: utils/adt/array_userfuncs.c:278 utils/adt/array_userfuncs.c:317
+#: utils/adt/array_userfuncs.c:354 utils/adt/array_userfuncs.c:383
+#: utils/adt/array_userfuncs.c:411
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "inkompatible Arrays können nicht aneinandergehängt werden"
 
-#: utils/adt/array_userfuncs.c:267
+#: utils/adt/array_userfuncs.c:279
 #, c-format
 msgid "Arrays with element types %s and %s are not compatible for concatenation."
 msgstr "Arrays mit Elementtypen %s und %s sind nicht kompatibel für Aneinanderhängen."
 
-#: utils/adt/array_userfuncs.c:306
+#: utils/adt/array_userfuncs.c:318
 #, c-format
 msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
 msgstr "Arrays mit %d und %d Dimensionen sind nicht kompatibel für Aneinanderhängen."
 
-#: utils/adt/array_userfuncs.c:343
+#: utils/adt/array_userfuncs.c:355
 #, c-format
 msgid "Arrays with differing element dimensions are not compatible for concatenation."
 msgstr "Arrays mit unterschiedlichen Elementdimensionen sind nicht kompatibel für Aneinanderhängen."
 
-#: utils/adt/array_userfuncs.c:372 utils/adt/array_userfuncs.c:400
+#: utils/adt/array_userfuncs.c:384 utils/adt/array_userfuncs.c:412
 #, c-format
 msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr "Arrays mit unterschiedlichen Dimensionen sind nicht kompatibel für Aneinanderhängen."
 
-#: utils/adt/array_userfuncs.c:468 utils/adt/arrayfuncs.c:1287
-#: utils/adt/arrayfuncs.c:3331 utils/adt/arrayfuncs.c:5738
+#: utils/adt/array_userfuncs.c:480 utils/adt/arrayfuncs.c:1287
+#: utils/adt/arrayfuncs.c:3331 utils/adt/arrayfuncs.c:5732
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "ungültige Anzahl Dimensionen: %d"
 
-#: utils/adt/array_userfuncs.c:725 utils/adt/array_userfuncs.c:876
+#: utils/adt/array_userfuncs.c:737 utils/adt/array_userfuncs.c:889
 #, c-format
 msgid "searching for elements in multidimensional arrays is not supported"
 msgstr "Suche nach Elementen in mehrdimensionalen Arrays wird nicht unterstützt"
 
-#: utils/adt/array_userfuncs.c:749
+#: utils/adt/array_userfuncs.c:761
 #, c-format
 msgid "initial position must not be null"
 msgstr "Startposition darf nicht NULL sein"
@@ -17159,12 +17202,12 @@
 #: utils/adt/arrayfuncs.c:842 utils/adt/arrayfuncs.c:895
 #, c-format
 msgid "malformed array literal: \"%s\""
-msgstr "fehlerhafte Arraykonstante: „%s“"
+msgstr "fehlerhafte Arraykonstante: »%s«"
 
 #: utils/adt/arrayfuncs.c:272
 #, c-format
 msgid "\"[\" must introduce explicitly-specified array dimensions."
-msgstr "Auf „[“ müssen explizit angegebene Array-Dimensionen folgen."
+msgstr "Auf »[« müssen explizit angegebene Array-Dimensionen folgen."
 
 #: utils/adt/arrayfuncs.c:286
 #, c-format
@@ -17174,7 +17217,7 @@
 #: utils/adt/arrayfuncs.c:297 utils/adt/arrayfuncs.c:334
 #, c-format
 msgid "Missing \"%s\" after array dimensions."
-msgstr "„%s“ fehlt nach Arraydimensionen."
+msgstr "»%s« fehlt nach Arraydimensionen."
 
 #: utils/adt/arrayfuncs.c:306 utils/adt/arrayfuncs.c:2848
 #: utils/adt/arrayfuncs.c:2876 utils/adt/arrayfuncs.c:2891
@@ -17185,12 +17228,12 @@
 #: utils/adt/arrayfuncs.c:319
 #, c-format
 msgid "Array value must start with \"{\" or dimension information."
-msgstr "Arraywert muss mit „{“ oder Dimensionsinformationen anfangen."
+msgstr "Arraywert muss mit »{« oder Dimensionsinformationen anfangen."
 
 #: utils/adt/arrayfuncs.c:348
 #, c-format
 msgid "Array contents must start with \"{\"."
-msgstr "Array-Inhalt muss mit {“ anfangen."
+msgstr "Array-Inhalt muss mit {« anfangen."
 
 #: utils/adt/arrayfuncs.c:354 utils/adt/arrayfuncs.c:361
 #, c-format
@@ -17208,7 +17251,7 @@
 #: utils/adt/arrayfuncs.c:585 utils/adt/arrayfuncs.c:634
 #, c-format
 msgid "Unexpected \"%c\" character."
-msgstr "Unerwartetes Zeichen „%c“."
+msgstr "Unerwartetes Zeichen »%c«."
 
 #: utils/adt/arrayfuncs.c:534 utils/adt/arrayfuncs.c:657
 #, c-format
@@ -17218,7 +17261,7 @@
 #: utils/adt/arrayfuncs.c:592
 #, c-format
 msgid "Unmatched \"%c\" character."
-msgstr "Zeichen „%c“ ohne Gegenstück."
+msgstr "Zeichen »%c« ohne Gegenstück."
 
 #: utils/adt/arrayfuncs.c:600
 #, c-format
@@ -17265,7 +17308,7 @@
 #: utils/adt/arrayfuncs.c:2226 utils/adt/arrayfuncs.c:2248
 #: utils/adt/arrayfuncs.c:2297 utils/adt/arrayfuncs.c:2533
 #: utils/adt/arrayfuncs.c:2830 utils/adt/arrayfuncs.c:5718
-#: utils/adt/arrayfuncs.c:5750 utils/adt/arrayfuncs.c:5767
+#: utils/adt/arrayfuncs.c:5744 utils/adt/arrayfuncs.c:5755
 #: utils/adt/json.c:2290 utils/adt/json.c:2365 utils/adt/jsonb.c:1369
 #: utils/adt/jsonb.c:1455 utils/adt/jsonfuncs.c:3528
 #: utils/adt/jsonfuncs.c:3573
@@ -17335,45 +17378,35 @@
 msgid "dimension array or low bound array cannot be null"
 msgstr "Dimensions-Array oder Untergrenzen-Array darf nicht NULL sein"
 
-#: utils/adt/arrayfuncs.c:5719 utils/adt/arrayfuncs.c:5751
+#: utils/adt/arrayfuncs.c:5719 utils/adt/arrayfuncs.c:5745
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "Dimensions-Array muss eindimensional sein."
 
-#: utils/adt/arrayfuncs.c:5724 utils/adt/arrayfuncs.c:5756
-#, c-format
-msgid "wrong range of array subscripts"
-msgstr "falscher Bereich der Arrayindizes"
-
-#: utils/adt/arrayfuncs.c:5725 utils/adt/arrayfuncs.c:5757
-#, c-format
-msgid "Lower bound of dimension array must be one."
-msgstr "Untergrenze des Dimensions-Arrays muss eins sein."
-
-#: utils/adt/arrayfuncs.c:5730 utils/adt/arrayfuncs.c:5762
+#: utils/adt/arrayfuncs.c:5724 utils/adt/arrayfuncs.c:5750
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "Dimensionswerte dürfen nicht NULL sein"
 
-#: utils/adt/arrayfuncs.c:5768
+#: utils/adt/arrayfuncs.c:5756
 #, c-format
 msgid "Low bound array has different size than dimensions array."
 msgstr "Untergrenzen-Array hat andere Größe als Dimensions-Array."
 
-#: utils/adt/arrayfuncs.c:6014
+#: utils/adt/arrayfuncs.c:6002
 #, c-format
 msgid "removing elements from multidimensional arrays is not supported"
 msgstr "Entfernen von Elementen aus mehrdimensionalen Arrays wird nicht unterstützt"
 
-#: utils/adt/arrayfuncs.c:6291
+#: utils/adt/arrayfuncs.c:6279
 #, c-format
 msgid "thresholds must be one-dimensional array"
-msgstr "Parameter „thresholds“ muss ein eindimensionales Array sein"
+msgstr "Parameter »thresholds« muss ein eindimensionales Array sein"
 
-#: utils/adt/arrayfuncs.c:6296
+#: utils/adt/arrayfuncs.c:6284
 #, c-format
 msgid "thresholds array must not contain NULLs"
-msgstr "„thresholds“-Array darf keine NULL-Werte enthalten"
+msgstr "»thresholds«-Array darf keine NULL-Werte enthalten"
 
 #: utils/adt/arrayutils.c:209
 #, c-format
@@ -17398,22 +17431,22 @@
 #: utils/adt/bool.c:153
 #, c-format
 msgid "invalid input syntax for type boolean: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ boolean: „%s“"
+msgstr "ungültige Eingabesyntax für Typ boolean: »%s«"
 
 #: utils/adt/cash.c:246
 #, c-format
 msgid "invalid input syntax for type money: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ money: „%s“"
+msgstr "ungültige Eingabesyntax für Typ money: »%s«"
 
 #: utils/adt/cash.c:607 utils/adt/cash.c:657 utils/adt/cash.c:708
 #: utils/adt/cash.c:757 utils/adt/cash.c:809 utils/adt/cash.c:859
-#: utils/adt/float.c:788 utils/adt/float.c:852 utils/adt/float.c:2530
-#: utils/adt/float.c:2593 utils/adt/geo_ops.c:4155 utils/adt/int.c:719
+#: utils/adt/float.c:785 utils/adt/float.c:849 utils/adt/float.c:2527
+#: utils/adt/float.c:2590 utils/adt/geo_ops.c:4163 utils/adt/int.c:719
 #: utils/adt/int.c:861 utils/adt/int.c:969 utils/adt/int.c:1058
 #: utils/adt/int.c:1097 utils/adt/int.c:1125 utils/adt/int8.c:597
 #: utils/adt/int8.c:657 utils/adt/int8.c:897 utils/adt/int8.c:1005
-#: utils/adt/int8.c:1094 utils/adt/int8.c:1202 utils/adt/numeric.c:5917
-#: utils/adt/numeric.c:6200 utils/adt/timestamp.c:3349
+#: utils/adt/int8.c:1094 utils/adt/int8.c:1202 utils/adt/numeric.c:5920
+#: utils/adt/numeric.c:6203 utils/adt/timestamp.c:3448
 #, c-format
 msgid "division by zero"
 msgstr "Division durch Null"
@@ -17423,7 +17456,7 @@
 msgid "\"char\" out of range"
 msgstr "\"char\" ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/date.c:67 utils/adt/timestamp.c:94 utils/adt/varbit.c:52
+#: utils/adt/date.c:67 utils/adt/timestamp.c:95 utils/adt/varbit.c:52
 #: utils/adt/varchar.c:44
 #, c-format
 msgid "invalid type modifier"
@@ -17439,27 +17472,27 @@
 msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
 msgstr "Präzision von TIME(%d)%s auf erlaubten Höchstwert %d reduziert"
 
-#: utils/adt/date.c:141 utils/adt/datetime.c:1208 utils/adt/datetime.c:2079
+#: utils/adt/date.c:141 utils/adt/datetime.c:1209 utils/adt/datetime.c:2122
 #, c-format
 msgid "date/time value \"current\" is no longer supported"
-msgstr "Datum/Zeitwert „current“ wird nicht mehr unterstützt"
+msgstr "Datum/Zeitwert »current« wird nicht mehr unterstützt"
 
-#: utils/adt/date.c:166 utils/adt/formatting.c:3527
+#: utils/adt/date.c:166 utils/adt/formatting.c:3521
 #, c-format
 msgid "date out of range: \"%s\""
-msgstr "date ist außerhalb des gültigen Bereichs: „%s“"
+msgstr "date ist außerhalb des gültigen Bereichs: »%s«"
 
-#: utils/adt/date.c:216 utils/adt/xml.c:2029
+#: utils/adt/date.c:216 utils/adt/xml.c:2033
 #, c-format
 msgid "date out of range"
 msgstr "date ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/date.c:258 utils/adt/timestamp.c:592
+#: utils/adt/date.c:258 utils/adt/timestamp.c:593
 #, c-format
 msgid "date field value out of range: %d-%02d-%02d"
 msgstr "Datum-Feldwert ist außerhalb des gültigen Bereichs: %d-%02d-%02d"
 
-#: utils/adt/date.c:264 utils/adt/timestamp.c:598
+#: utils/adt/date.c:264 utils/adt/timestamp.c:599
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "date ist außerhalb des gültigen Bereichs: %d-%02d-%02d"
@@ -17472,31 +17505,31 @@
 #: utils/adt/date.c:474 utils/adt/date.c:511
 #, c-format
 msgid "date out of range for timestamp"
-msgstr "Datum ist außerhalb des gültigen Bereichs für Typ „timestamp“"
+msgstr "Datum ist außerhalb des gültigen Bereichs für Typ »timestamp«"
 
 #: utils/adt/date.c:970 utils/adt/date.c:1016 utils/adt/date.c:1616
-#: utils/adt/date.c:1652 utils/adt/date.c:2524 utils/adt/formatting.c:3403
-#: utils/adt/formatting.c:3435 utils/adt/formatting.c:3503
-#: utils/adt/json.c:1534 utils/adt/json.c:1556 utils/adt/jsonb.c:823
-#: utils/adt/jsonb.c:847 utils/adt/nabstime.c:455 utils/adt/nabstime.c:498
-#: utils/adt/nabstime.c:528 utils/adt/nabstime.c:571 utils/adt/timestamp.c:224
-#: utils/adt/timestamp.c:267 utils/adt/timestamp.c:716
-#: utils/adt/timestamp.c:745 utils/adt/timestamp.c:784
-#: utils/adt/timestamp.c:2938 utils/adt/timestamp.c:2959
-#: utils/adt/timestamp.c:2972 utils/adt/timestamp.c:2981
-#: utils/adt/timestamp.c:3038 utils/adt/timestamp.c:3061
-#: utils/adt/timestamp.c:3074 utils/adt/timestamp.c:3085
-#: utils/adt/timestamp.c:3610 utils/adt/timestamp.c:3739
-#: utils/adt/timestamp.c:3780 utils/adt/timestamp.c:3868
-#: utils/adt/timestamp.c:3914 utils/adt/timestamp.c:4025
-#: utils/adt/timestamp.c:4349 utils/adt/timestamp.c:4465
-#: utils/adt/timestamp.c:4475 utils/adt/timestamp.c:4560
-#: utils/adt/timestamp.c:4679 utils/adt/timestamp.c:4689
-#: utils/adt/timestamp.c:5005 utils/adt/timestamp.c:5019
-#: utils/adt/timestamp.c:5144 utils/adt/timestamp.c:5151
-#: utils/adt/timestamp.c:5177 utils/adt/timestamp.c:5181
-#: utils/adt/timestamp.c:5250 utils/adt/xml.c:2051 utils/adt/xml.c:2058
-#: utils/adt/xml.c:2078 utils/adt/xml.c:2085
+#: utils/adt/date.c:1652 utils/adt/date.c:2524 utils/adt/datetime.c:1690
+#: utils/adt/formatting.c:3397 utils/adt/formatting.c:3429
+#: utils/adt/formatting.c:3497 utils/adt/json.c:1534 utils/adt/json.c:1556
+#: utils/adt/jsonb.c:823 utils/adt/jsonb.c:847 utils/adt/nabstime.c:455
+#: utils/adt/nabstime.c:498 utils/adt/nabstime.c:528 utils/adt/nabstime.c:571
+#: utils/adt/timestamp.c:225 utils/adt/timestamp.c:268
+#: utils/adt/timestamp.c:717 utils/adt/timestamp.c:746
+#: utils/adt/timestamp.c:785 utils/adt/timestamp.c:3037
+#: utils/adt/timestamp.c:3058 utils/adt/timestamp.c:3071
+#: utils/adt/timestamp.c:3080 utils/adt/timestamp.c:3137
+#: utils/adt/timestamp.c:3160 utils/adt/timestamp.c:3173
+#: utils/adt/timestamp.c:3184 utils/adt/timestamp.c:3709
+#: utils/adt/timestamp.c:3838 utils/adt/timestamp.c:3879
+#: utils/adt/timestamp.c:3967 utils/adt/timestamp.c:4013
+#: utils/adt/timestamp.c:4124 utils/adt/timestamp.c:4448
+#: utils/adt/timestamp.c:4564 utils/adt/timestamp.c:4574
+#: utils/adt/timestamp.c:4659 utils/adt/timestamp.c:4778
+#: utils/adt/timestamp.c:4788 utils/adt/timestamp.c:5035
+#: utils/adt/timestamp.c:5049 utils/adt/timestamp.c:5140
+#: utils/adt/timestamp.c:5147 utils/adt/timestamp.c:5173
+#: utils/adt/timestamp.c:5177 utils/adt/timestamp.c:5246 utils/adt/xml.c:2055
+#: utils/adt/xml.c:2062 utils/adt/xml.c:2082 utils/adt/xml.c:2089
 #, c-format
 msgid "timestamp out of range"
 msgstr "timestamp ist außerhalb des gültigen Bereichs"
@@ -17504,7 +17537,7 @@
 #: utils/adt/date.c:1042
 #, c-format
 msgid "cannot convert reserved abstime value to date"
-msgstr "kann reservierten „abstime“-Wert nicht in „date“ umwandeln"
+msgstr "kann reservierten »abstime«-Wert nicht in »date« umwandeln"
 
 #: utils/adt/date.c:1196 utils/adt/date.c:1203 utils/adt/date.c:2014
 #: utils/adt/date.c:2021
@@ -17512,7 +17545,7 @@
 msgid "time out of range"
 msgstr "time ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/date.c:1264 utils/adt/timestamp.c:617
+#: utils/adt/date.c:1264 utils/adt/timestamp.c:618
 #, c-format
 msgid "time field value out of range: %d:%02d:%02g"
 msgstr "Zeit-Feldwert ist außerhalb des gültigen Bereichs: %d:%02d:%02g"
@@ -17520,7 +17553,7 @@
 #: utils/adt/date.c:1892 utils/adt/date.c:1909
 #, c-format
 msgid "\"time\" units \"%s\" not recognized"
-msgstr "„time“-Einheit „%s“ nicht erkannt"
+msgstr "»time«-Einheit »%s« nicht erkannt"
 
 #: utils/adt/date.c:2030
 #, c-format
@@ -17530,68 +17563,63 @@
 #: utils/adt/date.c:2654 utils/adt/date.c:2671
 #, c-format
 msgid "\"time with time zone\" units \"%s\" not recognized"
-msgstr "„time with time zone“-Einheit „%s“ nicht erkannt"
+msgstr "»time with time zone«-Einheit »%s« nicht erkannt"
 
-#: utils/adt/date.c:2744 utils/adt/datetime.c:925 utils/adt/datetime.c:1805
-#: utils/adt/datetime.c:4566 utils/adt/timestamp.c:531
-#: utils/adt/timestamp.c:558 utils/adt/timestamp.c:5031
-#: utils/adt/timestamp.c:5261
+#: utils/adt/date.c:2744 utils/adt/datetime.c:926 utils/adt/datetime.c:1848
+#: utils/adt/datetime.c:4609 utils/adt/timestamp.c:532
+#: utils/adt/timestamp.c:559 utils/adt/timestamp.c:5061
+#: utils/adt/timestamp.c:5257
 #, c-format
 msgid "time zone \"%s\" not recognized"
-msgstr "Zeitzone „%s“ nicht erkannt"
+msgstr "Zeitzone »%s« nicht erkannt"
 
-#: utils/adt/date.c:2784 utils/adt/timestamp.c:5102 utils/adt/timestamp.c:5287
+#: utils/adt/date.c:2784 utils/adt/timestamp.c:5098 utils/adt/timestamp.c:5283
 #, c-format
 msgid "interval time zone \"%s\" must not include months or days"
-msgstr "Intervall-Zeitzone „%s“ darf keine Monate oder Tage enthalten"
-
-#: utils/adt/datetime.c:1680
-#, c-format
-msgid "time zone abbreviation \"%s\" is not used in time zone \"%s\""
-msgstr "Zeitzonenabkürzung „%s“ wird in Zeitzone „%s“ nicht verwendet"
+msgstr "Intervall-Zeitzone »%s« darf keine Monate oder Tage enthalten"
 
-#: utils/adt/datetime.c:3766 utils/adt/datetime.c:3773
+#: utils/adt/datetime.c:3809 utils/adt/datetime.c:3816
 #, c-format
 msgid "date/time field value out of range: \"%s\""
-msgstr "Datum/Zeit-Feldwert ist außerhalb des gültigen Bereichs: „%s“"
+msgstr "Datum/Zeit-Feldwert ist außerhalb des gültigen Bereichs: »%s«"
 
-#: utils/adt/datetime.c:3775
+#: utils/adt/datetime.c:3818
 #, c-format
 msgid "Perhaps you need a different \"datestyle\" setting."
-msgstr "Möglicherweise benötigen Sie eine andere „datestyle“-Einstellung."
+msgstr "Möglicherweise benötigen Sie eine andere »datestyle«-Einstellung."
 
-#: utils/adt/datetime.c:3780
+#: utils/adt/datetime.c:3823
 #, c-format
 msgid "interval field value out of range: \"%s\""
-msgstr "„interval“-Feldwert ist außerhalb des gültigen Bereichs: „%s“"
+msgstr "»interval«-Feldwert ist außerhalb des gültigen Bereichs: »%s«"
 
-#: utils/adt/datetime.c:3786
+#: utils/adt/datetime.c:3829
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
-msgstr "Zeitzonenunterschied ist außerhalb des gültigen Bereichs: „%s“"
+msgstr "Zeitzonenunterschied ist außerhalb des gültigen Bereichs: »%s«"
 
 #. translator: first %s is inet or cidr
-#: utils/adt/datetime.c:3793 utils/adt/network.c:58
+#: utils/adt/datetime.c:3836 utils/adt/network.c:58
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ %s: „%s“"
+msgstr "ungültige Eingabesyntax für Typ %s: »%s«"
 
-#: utils/adt/datetime.c:4568
+#: utils/adt/datetime.c:4611
 #, c-format
 msgid "This time zone name appears in the configuration file for time zone abbreviation \"%s\"."
-msgstr "Dieser Zeitzonenname erscheint in der Konfigurationsdatei für Zeitzonenabkürzung „%s“."
+msgstr "Dieser Zeitzonenname erscheint in der Konfigurationsdatei für Zeitzonenabkürzung »%s«."
 
 #: utils/adt/datum.c:86 utils/adt/datum.c:98
 #, c-format
 msgid "invalid Datum pointer"
-msgstr "ungültiger „Datum“-Zeiger"
+msgstr "ungültiger »Datum«-Zeiger"
 
 #: utils/adt/dbsize.c:108
 #, c-format
 msgid "could not open tablespace directory \"%s\": %m"
-msgstr "konnte Tablespace-Verzeichnis „%s“ nicht öffnen: %m"
+msgstr "konnte Tablespace-Verzeichnis »%s« nicht öffnen: %m"
 
-#: utils/adt/domains.c:85
+#: utils/adt/domains.c:86
 #, c-format
 msgid "type %s is not a domain"
 msgstr "Typ %s ist keine Domäne"
@@ -17599,12 +17627,12 @@
 #: utils/adt/encode.c:55 utils/adt/encode.c:91
 #, c-format
 msgid "unrecognized encoding: \"%s\""
-msgstr "unbekannte Kodierung: „%s“"
+msgstr "unbekannte Kodierung: »%s«"
 
 #: utils/adt/encode.c:150
 #, c-format
 msgid "invalid hexadecimal digit: \"%c\""
-msgstr "ungültige hexadezimale Ziffer: „%c“"
+msgstr "ungültige hexadezimale Ziffer: »%c«"
 
 #: utils/adt/encode.c:178
 #, c-format
@@ -17614,12 +17642,12 @@
 #: utils/adt/encode.c:295
 #, c-format
 msgid "unexpected \"=\" while decoding base64 sequence"
-msgstr "unerwartetes „=“ beim Dekodieren von Base64-Sequenz"
+msgstr "unerwartetes »=« beim Dekodieren von Base64-Sequenz"
 
 #: utils/adt/encode.c:307
 #, c-format
 msgid "invalid symbol \"%c\" while decoding base64 sequence"
-msgstr "ungültiges Symbol „%c“ beim Dekodieren von Base64-Sequenz"
+msgstr "ungültiges Symbol »%c« beim Dekodieren von Base64-Sequenz"
 
 #: utils/adt/encode.c:327
 #, c-format
@@ -17641,7 +17669,7 @@
 #: utils/adt/enum.c:123
 #, c-format
 msgid "invalid input value for enum %s: \"%s\""
-msgstr "ungültiger Eingabewert für Enum %s: „%s“"
+msgstr "ungültiger Eingabewert für Enum %s: »%s«"
 
 #: utils/adt/enum.c:85 utils/adt/enum.c:148 utils/adt/enum.c:198
 #, c-format
@@ -17669,83 +17697,83 @@
 msgid "value out of range: underflow"
 msgstr "Wert ist außerhalb des gültigen Bereichs: Unterlauf"
 
-#: utils/adt/float.c:218 utils/adt/float.c:292 utils/adt/float.c:316
+#: utils/adt/float.c:215 utils/adt/float.c:289 utils/adt/float.c:313
 #, c-format
 msgid "invalid input syntax for type real: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ real: „%s“"
+msgstr "ungültige Eingabesyntax für Typ real: »%s«"
 
-#: utils/adt/float.c:286
+#: utils/adt/float.c:283
 #, c-format
 msgid "\"%s\" is out of range for type real"
-msgstr "„%s“ ist außerhalb des gültigen Bereichs für Typ real"
+msgstr "»%s« ist außerhalb des gültigen Bereichs für Typ real"
 
-#: utils/adt/float.c:417 utils/adt/float.c:491 utils/adt/float.c:515
-#: utils/adt/numeric.c:5373 utils/adt/numeric.c:5399
+#: utils/adt/float.c:414 utils/adt/float.c:488 utils/adt/float.c:512
+#: utils/adt/numeric.c:5376 utils/adt/numeric.c:5402
 #, c-format
 msgid "invalid input syntax for type double precision: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ double precision: „%s“"
+msgstr "ungültige Eingabesyntax für Typ double precision: »%s«"
 
-#: utils/adt/float.c:485
+#: utils/adt/float.c:482
 #, c-format
 msgid "\"%s\" is out of range for type double precision"
-msgstr "„%s“ ist außerhalb des gültigen Bereichs für Typ double precision"
+msgstr "»%s« ist außerhalb des gültigen Bereichs für Typ double precision"
 
-#: utils/adt/float.c:1179 utils/adt/float.c:1237 utils/adt/int.c:349
+#: utils/adt/float.c:1176 utils/adt/float.c:1234 utils/adt/int.c:349
 #: utils/adt/int.c:775 utils/adt/int.c:804 utils/adt/int.c:825
 #: utils/adt/int.c:845 utils/adt/int.c:879 utils/adt/int.c:1174
-#: utils/adt/int8.c:1323 utils/adt/numeric.c:3000 utils/adt/numeric.c:3009
+#: utils/adt/int8.c:1323 utils/adt/numeric.c:2996 utils/adt/numeric.c:3005
 #, c-format
 msgid "smallint out of range"
 msgstr "smallint ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/float.c:1363 utils/adt/numeric.c:6599
+#: utils/adt/float.c:1360 utils/adt/numeric.c:6602
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "Quadratwurzel von negativer Zahl kann nicht ermittelt werden"
 
-#: utils/adt/float.c:1405 utils/adt/numeric.c:2820
+#: utils/adt/float.c:1402 utils/adt/numeric.c:2816
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "null hoch eine negative Zahl ist undefiniert"
 
-#: utils/adt/float.c:1409 utils/adt/numeric.c:2826
+#: utils/adt/float.c:1406 utils/adt/numeric.c:2822
 #, c-format
 msgid "a negative number raised to a non-integer power yields a complex result"
 msgstr "eine negative Zahl hoch eine nicht ganze Zahl ergibt ein komplexes Ergebnis"
 
-#: utils/adt/float.c:1475 utils/adt/float.c:1505 utils/adt/numeric.c:6817
+#: utils/adt/float.c:1472 utils/adt/float.c:1502 utils/adt/numeric.c:6820
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "Logarithmus von null kann nicht ermittelt werden"
 
-#: utils/adt/float.c:1479 utils/adt/float.c:1509 utils/adt/numeric.c:6821
+#: utils/adt/float.c:1476 utils/adt/float.c:1506 utils/adt/numeric.c:6824
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "Logarithmus negativer Zahlen kann nicht ermittelt werden"
 
-#: utils/adt/float.c:1536 utils/adt/float.c:1557 utils/adt/float.c:1578
-#: utils/adt/float.c:1600 utils/adt/float.c:1621 utils/adt/float.c:1642
-#: utils/adt/float.c:1664 utils/adt/float.c:1685
+#: utils/adt/float.c:1533 utils/adt/float.c:1554 utils/adt/float.c:1575
+#: utils/adt/float.c:1597 utils/adt/float.c:1618 utils/adt/float.c:1639
+#: utils/adt/float.c:1661 utils/adt/float.c:1682
 #, c-format
 msgid "input is out of range"
 msgstr "Eingabe ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/float.c:2747 utils/adt/numeric.c:1454
+#: utils/adt/float.c:2744 utils/adt/numeric.c:1450
 #, c-format
 msgid "count must be greater than zero"
 msgstr "Anzahl muss größer als null sein"
 
-#: utils/adt/float.c:2752 utils/adt/numeric.c:1461
+#: utils/adt/float.c:2749 utils/adt/numeric.c:1457
 #, c-format
 msgid "operand, lower bound, and upper bound cannot be NaN"
 msgstr "Operand, Untergrenze und Obergrenze dürfen nicht NaN sein"
 
-#: utils/adt/float.c:2758
+#: utils/adt/float.c:2755
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "Untergrenze und Obergrenze müssen endlich sein"
 
-#: utils/adt/float.c:2796 utils/adt/numeric.c:1474
+#: utils/adt/float.c:2793 utils/adt/numeric.c:1470
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "Untergrenze kann nicht gleich der Obergrenze sein"
@@ -17760,211 +17788,211 @@
 msgid "Intervals are not tied to specific calendar dates."
 msgstr "Intervalle beziehen sich nicht auf bestimmte Kalenderdaten."
 
-#: utils/adt/formatting.c:1059
+#: utils/adt/formatting.c:1058
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
-msgstr "„EEEE“ muss das letzte Muster sein"
+msgstr "»EEEE« muss das letzte Muster sein"
 
-#: utils/adt/formatting.c:1067
+#: utils/adt/formatting.c:1066
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
-msgstr "„9“ muss vor „PR“ stehen"
+msgstr "»9« muss vor »PR« stehen"
 
-#: utils/adt/formatting.c:1083
+#: utils/adt/formatting.c:1082
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
-msgstr "„0“ muss vor „PR“ stehen"
+msgstr "»0« muss vor »PR« stehen"
 
-#: utils/adt/formatting.c:1110
+#: utils/adt/formatting.c:1109
 #, c-format
 msgid "multiple decimal points"
 msgstr "mehrere Dezimalpunkte"
 
-#: utils/adt/formatting.c:1114 utils/adt/formatting.c:1197
+#: utils/adt/formatting.c:1113 utils/adt/formatting.c:1196
 #, c-format
 msgid "cannot use \"V\" and decimal point together"
-msgstr "„V“ und Dezimalpunkt können nicht zusammen verwendet werden"
+msgstr "»V« und Dezimalpunkt können nicht zusammen verwendet werden"
 
-#: utils/adt/formatting.c:1126
+#: utils/adt/formatting.c:1125
 #, c-format
 msgid "cannot use \"S\" twice"
-msgstr "„S“ kann nicht zweimal verwendet werden"
+msgstr "»S« kann nicht zweimal verwendet werden"
 
-#: utils/adt/formatting.c:1130
+#: utils/adt/formatting.c:1129
 #, c-format
 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
-msgstr "„S“ und „PL“/„MI“/„SG“/„PR“ können nicht zusammen verwendet werden"
+msgstr "»S« und »PL«/»MI«/»SG«/»PR« können nicht zusammen verwendet werden"
 
-#: utils/adt/formatting.c:1150
+#: utils/adt/formatting.c:1149
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
-msgstr "„S“ und „MI“ können nicht zusammen verwendet werden"
+msgstr "»S« und »MI« können nicht zusammen verwendet werden"
 
-#: utils/adt/formatting.c:1160
+#: utils/adt/formatting.c:1159
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
-msgstr "„S“ und „PL“ können nicht zusammen verwendet werden"
+msgstr "»S« und »PL« können nicht zusammen verwendet werden"
 
-#: utils/adt/formatting.c:1170
+#: utils/adt/formatting.c:1169
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
-msgstr "„S“ und „SG“ können nicht zusammen verwendet werden"
+msgstr "»S« und »SG« können nicht zusammen verwendet werden"
 
-#: utils/adt/formatting.c:1179
+#: utils/adt/formatting.c:1178
 #, c-format
 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
-msgstr "„PR“ und „S“/„PL“/„MI“/„SG“ können nicht zusammen verwendet werden"
+msgstr "»PR« und »S«/»PL«/»MI«/»SG« können nicht zusammen verwendet werden"
 
-#: utils/adt/formatting.c:1205
+#: utils/adt/formatting.c:1204
 #, c-format
 msgid "cannot use \"EEEE\" twice"
-msgstr "„EEEE“ kann nicht zweimal verwendet werden"
+msgstr "»EEEE« kann nicht zweimal verwendet werden"
 
-#: utils/adt/formatting.c:1211
+#: utils/adt/formatting.c:1210
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
-msgstr "„EEEE“ ist mit anderen Formaten inkompatibel"
+msgstr "»EEEE« ist mit anderen Formaten inkompatibel"
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1211
 #, c-format
 msgid "\"EEEE\" may only be used together with digit and decimal point patterns."
-msgstr "„EEEE“ kann nur zusammen mit Platzhaltern für Ziffern oder Dezimalpunkt verwendet werden."
+msgstr "»EEEE« kann nur zusammen mit Platzhaltern für Ziffern oder Dezimalpunkt verwendet werden."
 
-#: utils/adt/formatting.c:1412
+#: utils/adt/formatting.c:1411
 #, c-format
 msgid "\"%s\" is not a number"
-msgstr "„%s“ ist keine Zahl"
+msgstr "»%s« ist keine Zahl"
 
-#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1512 utils/adt/formatting.c:1564
 #, c-format
 msgid "could not determine which collation to use for lower() function"
 msgstr "konnte die für die Funktion lower() zu verwendende Sortierfolge nicht bestimmen"
 
-#: utils/adt/formatting.c:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1632 utils/adt/formatting.c:1684
 #, c-format
 msgid "could not determine which collation to use for upper() function"
 msgstr "konnte die für die Funktion upper() zu verwendende Sortierfolge nicht bestimmen"
 
-#: utils/adt/formatting.c:1754 utils/adt/formatting.c:1818
+#: utils/adt/formatting.c:1753 utils/adt/formatting.c:1817
 #, c-format
 msgid "could not determine which collation to use for initcap() function"
 msgstr "konnte die für die Funktion initcap() zu verwendende Sortierfolge nicht bestimmen"
 
-#: utils/adt/formatting.c:2122
+#: utils/adt/formatting.c:2114
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "ungültige Kombination von Datumskonventionen"
 
-#: utils/adt/formatting.c:2123
+#: utils/adt/formatting.c:2115
 #, c-format
 msgid "Do not mix Gregorian and ISO week date conventions in a formatting template."
 msgstr "Die Gregorianische und die ISO-Konvention für Wochendaten können nicht einer Formatvorlage gemischt werden."
 
-#: utils/adt/formatting.c:2140
+#: utils/adt/formatting.c:2132
 #, c-format
 msgid "conflicting values for \"%s\" field in formatting string"
-msgstr "widersprüchliche Werte für das Feld „%s“ in Formatzeichenkette"
+msgstr "widersprüchliche Werte für das Feld »%s« in Formatzeichenkette"
 
-#: utils/adt/formatting.c:2142
+#: utils/adt/formatting.c:2134
 #, c-format
 msgid "This value contradicts a previous setting for the same field type."
 msgstr "Der Wert widerspricht einer vorherigen Einstellung für den selben Feldtyp."
 
-#: utils/adt/formatting.c:2203
+#: utils/adt/formatting.c:2195
 #, c-format
 msgid "source string too short for \"%s\" formatting field"
-msgstr "Quellzeichenkette zu kurz für Formatfeld „%s„"
+msgstr "Quellzeichenkette zu kurz für Formatfeld »%s»"
 
-#: utils/adt/formatting.c:2205
+#: utils/adt/formatting.c:2197
 #, c-format
 msgid "Field requires %d characters, but only %d remain."
 msgstr "Feld benötigt %d Zeichen, aber nur %d verbleiben."
 
-#: utils/adt/formatting.c:2208 utils/adt/formatting.c:2222
+#: utils/adt/formatting.c:2200 utils/adt/formatting.c:2214
 #, c-format
 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 „FM“."
+msgstr "Wenn die Quellzeichenkette keine feste Breite hat, versuchen Sie den Modifikator »FM«."
 
-#: utils/adt/formatting.c:2218 utils/adt/formatting.c:2231
-#: utils/adt/formatting.c:2361
+#: utils/adt/formatting.c:2210 utils/adt/formatting.c:2223
+#: utils/adt/formatting.c:2353
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
-msgstr "ungültiger Wert „%s“ für „%s“"
+msgstr "ungültiger Wert »%s« für »%s«"
 
-#: utils/adt/formatting.c:2220
+#: utils/adt/formatting.c:2212
 #, c-format
 msgid "Field requires %d characters, but only %d could be parsed."
 msgstr "Feld benötigt %d Zeichen, aber nur %d konnten geparst werden."
 
-#: utils/adt/formatting.c:2233
+#: utils/adt/formatting.c:2225
 #, c-format
 msgid "Value must be an integer."
 msgstr "Der Wert muss eine ganze Zahl sein."
 
-#: utils/adt/formatting.c:2238
+#: utils/adt/formatting.c:2230
 #, c-format
 msgid "value for \"%s\" in source string is out of range"
-msgstr "Wert für „%s“ in der Eingabezeichenkette ist außerhalb des gültigen Bereichs"
+msgstr "Wert für »%s« in der Eingabezeichenkette ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/formatting.c:2240
+#: utils/adt/formatting.c:2232
 #, c-format
 msgid "Value must be in the range %d to %d."
 msgstr "Der Wert muss im Bereich %d bis %d sein."
 
-#: utils/adt/formatting.c:2363
+#: utils/adt/formatting.c:2355
 #, c-format
 msgid "The given value did not match any of the allowed values for this field."
 msgstr "Der angegebene Wert stimmte mit keinem der für dieses Feld zulässigen Werte überein."
 
-#: utils/adt/formatting.c:2555 utils/adt/formatting.c:2575
-#: utils/adt/formatting.c:2595 utils/adt/formatting.c:2615
-#: utils/adt/formatting.c:2634 utils/adt/formatting.c:2653
-#: utils/adt/formatting.c:2676 utils/adt/formatting.c:2694
-#: utils/adt/formatting.c:2712 utils/adt/formatting.c:2730
-#: utils/adt/formatting.c:2747 utils/adt/formatting.c:2764
+#: utils/adt/formatting.c:2547 utils/adt/formatting.c:2567
+#: utils/adt/formatting.c:2587 utils/adt/formatting.c:2607
+#: utils/adt/formatting.c:2626 utils/adt/formatting.c:2645
+#: utils/adt/formatting.c:2668 utils/adt/formatting.c:2686
+#: utils/adt/formatting.c:2704 utils/adt/formatting.c:2722
+#: utils/adt/formatting.c:2739 utils/adt/formatting.c:2756
 #, c-format
 msgid "localized string format value too long"
 msgstr "lokalisierter Formatwert ist zu lang"
 
-#: utils/adt/formatting.c:3048
+#: utils/adt/formatting.c:3040
 #, c-format
 msgid "\"TZ\"/\"tz\"/\"OF\" format patterns are not supported in to_date"
-msgstr "Formatmuster „TZ“/„tz“/„OF“ werden in to_date nicht unterstützt"
+msgstr "Formatmuster »TZ«/»tz«/»OF« werden in to_date nicht unterstützt"
 
-#: utils/adt/formatting.c:3156
+#: utils/adt/formatting.c:3149
 #, c-format
 msgid "invalid input string for \"Y,YYY\""
-msgstr "ungültige Eingabe für „Y,YYY“"
+msgstr "ungültige Eingabe für »Y,YYY«"
 
-#: utils/adt/formatting.c:3659
+#: utils/adt/formatting.c:3653
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
-msgstr "Stunde „%d“ ist bei einer 12-Stunden-Uhr ungültig"
+msgstr "Stunde »%d« ist bei einer 12-Stunden-Uhr ungültig"
 
-#: utils/adt/formatting.c:3661
+#: utils/adt/formatting.c:3655
 #, c-format
 msgid "Use the 24-hour clock, or give an hour between 1 and 12."
 msgstr "Verwenden Sie die 24-Stunden-Uhr oder geben Sie eine Stunde zwischen 1 und 12 an."
 
-#: utils/adt/formatting.c:3756
+#: utils/adt/formatting.c:3750
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "kann Tag des Jahres nicht berechnen ohne Jahrinformationen"
 
-#: utils/adt/formatting.c:4605
+#: utils/adt/formatting.c:4599
 #, c-format
 msgid "\"EEEE\" not supported for input"
-msgstr "„E“ wird nicht bei der Eingabe unterstützt"
+msgstr "»E« wird nicht bei der Eingabe unterstützt"
 
-#: utils/adt/formatting.c:4617
+#: utils/adt/formatting.c:4611
 #, c-format
 msgid "\"RN\" not supported for input"
-msgstr "„RN“ wird nicht bei der Eingabe unterstützt"
+msgstr "»RN« wird nicht bei der Eingabe unterstützt"
 
 #: utils/adt/genfile.c:62
 #, c-format
 msgid "reference to parent directory (\"..\") not allowed"
-msgstr "Verweis auf übergeordnetes Verzeichnis („..“) nicht erlaubt"
+msgstr "Verweis auf übergeordnetes Verzeichnis (»..«) nicht erlaubt"
 
 #: utils/adt/genfile.c:73
 #, c-format
@@ -17986,7 +18014,7 @@
 #: utils/adt/genfile.c:142
 #, c-format
 msgid "could not seek in file \"%s\": %m"
-msgstr "konnte Positionszeiger in Datei „%s“ nicht setzen: %m"
+msgstr "konnte Positionszeiger in Datei »%s« nicht setzen: %m"
 
 #: utils/adt/genfile.c:200 utils/adt/genfile.c:241
 #, c-format
@@ -18003,8 +18031,8 @@
 msgid "must be superuser to get directory listings"
 msgstr "nur Superuser können Verzeichnislisten lesen"
 
-#: utils/adt/geo_ops.c:301 utils/adt/geo_ops.c:1400 utils/adt/geo_ops.c:3498
-#: utils/adt/geo_ops.c:4315 utils/adt/geo_ops.c:5259
+#: utils/adt/geo_ops.c:301 utils/adt/geo_ops.c:1400 utils/adt/geo_ops.c:3506
+#: utils/adt/geo_ops.c:4323 utils/adt/geo_ops.c:5267
 #, c-format
 msgid "too many points requested"
 msgstr "zu viele Punkte verlangt"
@@ -18012,120 +18040,120 @@
 #: utils/adt/geo_ops.c:324
 #, c-format
 msgid "could not format \"path\" value"
-msgstr "konnte „path“-Wert nicht formatieren"
+msgstr "konnte »path«-Wert nicht formatieren"
 
 #: utils/adt/geo_ops.c:399
 #, c-format
 msgid "invalid input syntax for type box: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ box: „%s“"
+msgstr "ungültige Eingabesyntax für Typ box: »%s«"
 
 #: utils/adt/geo_ops.c:994
 #, c-format
 msgid "invalid line specification: must be two distinct points"
-msgstr "ungültige „line“-Angabe: es müssen zwei verschiedene Punkte angegeben werden"
+msgstr "ungültige »line«-Angabe: es müssen zwei verschiedene Punkte angegeben werden"
 
 #: utils/adt/geo_ops.c:1003
 #, c-format
 msgid "invalid line specification: A and B cannot both be zero"
-msgstr "ungültige „line“-Angabe: A und B können nicht beide null sein"
+msgstr "ungültige »line«-Angabe: A und B können nicht beide null sein"
 
 #: utils/adt/geo_ops.c:1008
 #, c-format
 msgid "invalid input syntax for type line: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ line: „%s“"
+msgstr "ungültige Eingabesyntax für Typ line: »%s«"
 
 #: utils/adt/geo_ops.c:1380 utils/adt/geo_ops.c:1411
 #, c-format
 msgid "invalid input syntax for type path: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ path: „%s“"
+msgstr "ungültige Eingabesyntax für Typ path: »%s«"
 
 #: utils/adt/geo_ops.c:1450
 #, c-format
 msgid "invalid number of points in external \"path\" value"
-msgstr "ungültige Anzahl Punkte in externem „path“-Wert"
+msgstr "ungültige Anzahl Punkte in externem »path«-Wert"
 
 #: utils/adt/geo_ops.c:1793
 #, c-format
 msgid "invalid input syntax for type point: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ point: „%s“"
+msgstr "ungültige Eingabesyntax für Typ point: »%s«"
 
 #: utils/adt/geo_ops.c:2021
 #, c-format
 msgid "invalid input syntax for type lseg: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ lseg: „%s“"
+msgstr "ungültige Eingabesyntax für Typ lseg: »%s«"
 
 #: utils/adt/geo_ops.c:2621
 #, c-format
 msgid "function \"dist_lb\" not implemented"
-msgstr "Funktion „dist_lb“ ist nicht implementiert"
+msgstr "Funktion »dist_lb« ist nicht implementiert"
 
-#: utils/adt/geo_ops.c:3073
+#: utils/adt/geo_ops.c:3081
 #, c-format
 msgid "function \"close_sl\" not implemented"
-msgstr "Funktion „close_sl“ ist nicht implementiert"
+msgstr "Funktion »close_sl« ist nicht implementiert"
 
-#: utils/adt/geo_ops.c:3175
+#: utils/adt/geo_ops.c:3183
 #, c-format
 msgid "function \"close_lb\" not implemented"
-msgstr "Funktion „close_lb“ ist nicht implementiert"
+msgstr "Funktion »close_lb« ist nicht implementiert"
 
-#: utils/adt/geo_ops.c:3464
+#: utils/adt/geo_ops.c:3472
 #, c-format
 msgid "cannot create bounding box for empty polygon"
 msgstr "kann kein umschließendes Rechteck für leeres Polygon berechnen"
 
-#: utils/adt/geo_ops.c:3489 utils/adt/geo_ops.c:3509
+#: utils/adt/geo_ops.c:3497 utils/adt/geo_ops.c:3517
 #, c-format
 msgid "invalid input syntax for type polygon: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ polygon: „%s“"
+msgstr "ungültige Eingabesyntax für Typ polygon: »%s«"
 
-#: utils/adt/geo_ops.c:3549
+#: utils/adt/geo_ops.c:3557
 #, c-format
 msgid "invalid number of points in external \"polygon\" value"
-msgstr "ungültige Anzahl Punkte in externem „polygon“-Wert"
+msgstr "ungültige Anzahl Punkte in externem »polygon«-Wert"
 
-#: utils/adt/geo_ops.c:4074
+#: utils/adt/geo_ops.c:4082
 #, c-format
 msgid "function \"poly_distance\" not implemented"
-msgstr "Funktion „poly_distance“ ist nicht implementiert"
+msgstr "Funktion »poly_distance« ist nicht implementiert"
 
-#: utils/adt/geo_ops.c:4427
+#: utils/adt/geo_ops.c:4435
 #, c-format
 msgid "function \"path_center\" not implemented"
-msgstr "Funktion „path_center“ ist nicht implementiert"
+msgstr "Funktion »path_center« ist nicht implementiert"
 
-#: utils/adt/geo_ops.c:4444
+#: utils/adt/geo_ops.c:4452
 #, c-format
 msgid "open path cannot be converted to polygon"
 msgstr "offener Pfad kann nicht in Polygon umgewandelt werden"
 
-#: utils/adt/geo_ops.c:4621 utils/adt/geo_ops.c:4631 utils/adt/geo_ops.c:4646
-#: utils/adt/geo_ops.c:4652
+#: utils/adt/geo_ops.c:4629 utils/adt/geo_ops.c:4639 utils/adt/geo_ops.c:4654
+#: utils/adt/geo_ops.c:4660
 #, c-format
 msgid "invalid input syntax for type circle: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ circle: „%s“"
+msgstr "ungültige Eingabesyntax für Typ circle: »%s«"
 
-#: utils/adt/geo_ops.c:4674 utils/adt/geo_ops.c:4682
+#: utils/adt/geo_ops.c:4682 utils/adt/geo_ops.c:4690
 #, c-format
 msgid "could not format \"circle\" value"
-msgstr "konnte „circle“-Wert nicht formatieren"
+msgstr "konnte »circle«-Wert nicht formatieren"
 
-#: utils/adt/geo_ops.c:4709
+#: utils/adt/geo_ops.c:4717
 #, c-format
 msgid "invalid radius in external \"circle\" value"
-msgstr "ungültiger Radius in externem „circle“-Wert"
+msgstr "ungültiger Radius in externem »circle«-Wert"
 
-#: utils/adt/geo_ops.c:5245
+#: utils/adt/geo_ops.c:5253
 #, c-format
 msgid "cannot convert circle with radius zero to polygon"
 msgstr "kann Kreis mit Radius null nicht in Polygon umwandeln"
 
-#: utils/adt/geo_ops.c:5250
+#: utils/adt/geo_ops.c:5258
 #, c-format
 msgid "must request at least 2 points"
 msgstr "mindestens 2 Punkte müssen angefordert werden"
 
-#: utils/adt/geo_ops.c:5294
+#: utils/adt/geo_ops.c:5302
 #, c-format
 msgid "cannot convert empty polygon to circle"
 msgstr "kann leeres Polygon nicht in Kreis umwandeln"
@@ -18145,8 +18173,8 @@
 msgid "oidvector has too many elements"
 msgstr "oidvector-Wert hat zu viele Elemente"
 
-#: utils/adt/int.c:1362 utils/adt/int8.c:1460 utils/adt/numeric.c:1362
-#: utils/adt/timestamp.c:5348 utils/adt/timestamp.c:5429
+#: utils/adt/int.c:1362 utils/adt/int8.c:1460 utils/adt/numeric.c:1358
+#: utils/adt/timestamp.c:5344 utils/adt/timestamp.c:5425
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "Schrittgröße kann nicht gleich null sein"
@@ -18155,12 +18183,12 @@
 #: utils/adt/numutils.c:61 utils/adt/numutils.c:103
 #, c-format
 msgid "invalid input syntax for integer: \"%s\""
-msgstr "ungültige Eingabesyntax für ganze Zahl: „%s“"
+msgstr "ungültige Eingabesyntax für ganze Zahl: »%s«"
 
 #: utils/adt/int8.c:114
 #, c-format
 msgid "value \"%s\" is out of range for type bigint"
-msgstr "Wert „%s“ ist außerhalb des gültigen Bereichs für Typ bigint"
+msgstr "Wert »%s« ist außerhalb des gültigen Bereichs für Typ bigint"
 
 #: utils/adt/int8.c:500 utils/adt/int8.c:529 utils/adt/int8.c:550
 #: utils/adt/int8.c:581 utils/adt/int8.c:615 utils/adt/int8.c:640
@@ -18170,8 +18198,8 @@
 #: utils/adt/int8.c:964 utils/adt/int8.c:991 utils/adt/int8.c:1031
 #: utils/adt/int8.c:1052 utils/adt/int8.c:1079 utils/adt/int8.c:1112
 #: utils/adt/int8.c:1140 utils/adt/int8.c:1161 utils/adt/int8.c:1188
-#: utils/adt/int8.c:1361 utils/adt/int8.c:1400 utils/adt/numeric.c:2955
-#: utils/adt/varbit.c:1645
+#: utils/adt/int8.c:1361 utils/adt/int8.c:1400 utils/adt/numeric.c:2951
+#: utils/adt/varbit.c:1655
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint ist außerhalb des gültigen Bereichs"
@@ -18200,7 +18228,7 @@
 #: utils/adt/json.c:826
 #, c-format
 msgid "\"\\u\" must be followed by four hexadecimal digits."
-msgstr "Nach „\\u“ müssen vier Hexadezimalziffern folgen."
+msgstr "Nach »\\u« müssen vier Hexadezimalziffern folgen."
 
 #: utils/adt/json.c:841
 #, c-format
@@ -18221,7 +18249,7 @@
 #: utils/adt/json.c:878
 #, c-format
 msgid "\\u0000 cannot be converted to text."
-msgstr "\\u0000 kann nicht in „text“ umgewandelt werden."
+msgstr "\\u0000 kann nicht in »text« umgewandelt werden."
 
 #: utils/adt/json.c:901
 #, c-format
@@ -18231,7 +18259,7 @@
 #: utils/adt/json.c:944 utils/adt/json.c:962
 #, c-format
 msgid "Escape sequence \"\\%s\" is invalid."
-msgstr "Escape-Sequenz „\\%s“ ist nicht gültig."
+msgstr "Escape-Sequenz »\\%s« ist nicht gültig."
 
 #: utils/adt/json.c:1131
 #, c-format
@@ -18241,47 +18269,47 @@
 #: utils/adt/json.c:1145
 #, c-format
 msgid "Expected end of input, but found \"%s\"."
-msgstr "Ende der Eingabe erwartet, aber „%s“ gefunden."
+msgstr "Ende der Eingabe erwartet, aber »%s« gefunden."
 
 #: utils/adt/json.c:1156
 #, c-format
 msgid "Expected JSON value, but found \"%s\"."
-msgstr "JSON-Wert erwartet, aber „%s“ gefunden."
+msgstr "JSON-Wert erwartet, aber »%s« gefunden."
 
 #: utils/adt/json.c:1164 utils/adt/json.c:1212
 #, c-format
 msgid "Expected string, but found \"%s\"."
-msgstr "Zeichenkette erwartet, aber „%s“ gefunden."
+msgstr "Zeichenkette erwartet, aber »%s« gefunden."
 
 #: utils/adt/json.c:1172
 #, c-format
 msgid "Expected array element or \"]\", but found \"%s\"."
-msgstr "Array-Element oder „]“ erwartet, aber „%s“ gefunden."
+msgstr "Array-Element oder »]« erwartet, aber »%s« gefunden."
 
 #: utils/adt/json.c:1180
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%s\"."
-msgstr "„,“ oder „]“ erwartet, aber „%s“ gefunden."
+msgstr "»,« oder »]« erwartet, aber »%s« gefunden."
 
 #: utils/adt/json.c:1188
 #, c-format
 msgid "Expected string or \"}\", but found \"%s\"."
-msgstr "Zeichenkette oder „}“ erwartet, aber „%s“ gefunden."
+msgstr "Zeichenkette oder »}« erwartet, aber »%s« gefunden."
 
 #: utils/adt/json.c:1196
 #, c-format
 msgid "Expected \":\", but found \"%s\"."
-msgstr "„:“ erwartet, aber „%s“ gefunden."
+msgstr "»:« erwartet, aber »%s« gefunden."
 
 #: utils/adt/json.c:1204
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%s\"."
-msgstr "„,“ oder „}“ erwartet, aber „%s“ gefunden."
+msgstr "»,« oder »}« erwartet, aber »%s« gefunden."
 
 #: utils/adt/json.c:1242
 #, c-format
 msgid "Token \"%s\" is invalid."
-msgstr "Token „%s“ ist ungültig."
+msgstr "Token »%s« ist ungültig."
 
 #: utils/adt/json.c:1314
 #, c-format
@@ -18512,14 +18540,14 @@
 #: utils/adt/jsonfuncs.c:3888
 #, c-format
 msgid "path element at position %d is not an integer: \"%s\""
-msgstr "Pfadelement auf Position %d ist keine ganze Zahl: „%s“"
+msgstr "Pfadelement auf Position %d ist keine ganze Zahl: »%s«"
 
 #: utils/adt/levenshtein.c:133
 #, c-format
 msgid "levenshtein argument exceeds maximum length of %d characters"
 msgstr "Levenshtein-Argument überschreitet die maximale Länge von %d Zeichen"
 
-#: utils/adt/like.c:212 utils/adt/selfuncs.c:5275
+#: utils/adt/like.c:212 utils/adt/selfuncs.c:5279
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "konnte die für ILIKE zu verwendende Sortierfolge nicht bestimmen"
@@ -18547,12 +18575,12 @@
 #: utils/adt/mac.c:68
 #, c-format
 msgid "invalid input syntax for type macaddr: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ macaddr: „%s“"
+msgstr "ungültige Eingabesyntax für Typ macaddr: »%s«"
 
 #: utils/adt/mac.c:75
 #, c-format
 msgid "invalid octet value in \"macaddr\" value: \"%s\""
-msgstr "ungültiger Oktettwert in „macaddr“-Wert: „%s“"
+msgstr "ungültiger Oktettwert in »macaddr«-Wert: »%s«"
 
 #: utils/adt/misc.c:116
 #, c-format
@@ -18628,32 +18656,32 @@
 #: utils/adt/nabstime.c:136
 #, c-format
 msgid "invalid time zone name: \"%s\""
-msgstr "ungültiger Zeitzonenname: „%s“"
+msgstr "ungültiger Zeitzonenname: »%s«"
 
 #: utils/adt/nabstime.c:481 utils/adt/nabstime.c:554
 #, c-format
 msgid "cannot convert abstime \"invalid\" to timestamp"
-msgstr "kann „abstime“-Wert „invalid“ nicht „timestamp“ umwandeln"
+msgstr "kann »abstime«-Wert »invalid« nicht »timestamp« umwandeln"
 
 #: utils/adt/nabstime.c:781
 #, c-format
 msgid "invalid status in external \"tinterval\" value"
-msgstr "ungültiger Status in externem „tinterval“-Wert"
+msgstr "ungültiger Status in externem »tinterval«-Wert"
 
 #: utils/adt/nabstime.c:855
 #, c-format
 msgid "cannot convert reltime \"invalid\" to interval"
-msgstr "kann „reltime“-Wert „invalid“ nicht in „interval“ umwandeln"
+msgstr "kann »reltime«-Wert »invalid« nicht in »interval« umwandeln"
 
 #: utils/adt/nabstime.c:1550
 #, c-format
 msgid "invalid input syntax for type tinterval: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ tinterval: „%s“"
+msgstr "ungültige Eingabesyntax für Typ tinterval: »%s«"
 
 #: utils/adt/network.c:69
 #, c-format
 msgid "invalid cidr value: \"%s\""
-msgstr "ungültiger cidr-Wert: „%s“"
+msgstr "ungültiger cidr-Wert: »%s«"
 
 #: utils/adt/network.c:70 utils/adt/network.c:200
 #, c-format
@@ -18670,24 +18698,24 @@
 #: utils/adt/network.c:168
 #, c-format
 msgid "invalid address family in external \"%s\" value"
-msgstr "ungültige Adressfamilie in externem „%s“-Wert"
+msgstr "ungültige Adressfamilie in externem »%s«-Wert"
 
 #. translator: %s is inet or cidr
 #: utils/adt/network.c:175
 #, c-format
 msgid "invalid bits in external \"%s\" value"
-msgstr "ungültige Bits in externem „%s“-Wert"
+msgstr "ungültige Bits in externem »%s«-Wert"
 
 #. translator: %s is inet or cidr
 #: utils/adt/network.c:184
 #, c-format
 msgid "invalid length in external \"%s\" value"
-msgstr "ungültige Länge in externem „%s“-Wert"
+msgstr "ungültige Länge in externem »%s«-Wert"
 
 #: utils/adt/network.c:199
 #, c-format
 msgid "invalid external \"cidr\" value"
-msgstr "ungültiger externer „cidr“-Wert"
+msgstr "ungültiger externer »cidr«-Wert"
 
 #: utils/adt/network.c:321 utils/adt/network.c:348
 #, c-format
@@ -18707,12 +18735,12 @@
 #: utils/adt/network.c:1343
 #, c-format
 msgid "cannot AND inet values of different sizes"
-msgstr "binäres „Und“ nicht mit „inet“-Werten unterschiedlicher Größe möglich"
+msgstr "binäres »Und« nicht mit »inet«-Werten unterschiedlicher Größe möglich"
 
 #: utils/adt/network.c:1375
 #, c-format
 msgid "cannot OR inet values of different sizes"
-msgstr "binäres „Oder“ nicht mit „inet“-Werten unterschiedlicher Größe möglich"
+msgstr "binäres »Oder« nicht mit »inet«-Werten unterschiedlicher Größe möglich"
 
 #: utils/adt/network.c:1436 utils/adt/network.c:1512
 #, c-format
@@ -18722,123 +18750,119 @@
 #: utils/adt/network.c:1477
 #, c-format
 msgid "cannot subtract inet values of different sizes"
-msgstr "Subtraktion von „inet“-Werten unterschiedlicher Größe nicht möglich"
+msgstr "Subtraktion von »inet«-Werten unterschiedlicher Größe nicht möglich"
 
-#: utils/adt/numeric.c:549 utils/adt/numeric.c:576 utils/adt/numeric.c:4604
-#: utils/adt/numeric.c:4627 utils/adt/numeric.c:4651 utils/adt/numeric.c:4658
+#: utils/adt/numeric.c:549 utils/adt/numeric.c:576 utils/adt/numeric.c:4600
+#: utils/adt/numeric.c:4623 utils/adt/numeric.c:4647
 #, c-format
 msgid "invalid input syntax for type numeric: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ numeric: „%s“"
+msgstr "ungültige Eingabesyntax für Typ numeric: »%s«"
 
-#: utils/adt/numeric.c:766
-#, c-format
-msgid "invalid length in external \"numeric\" value"
-msgstr "ungültige Länge in externem „numeric“-Wert"
-
-#: utils/adt/numeric.c:779
+#: utils/adt/numeric.c:775
 #, c-format
 msgid "invalid sign in external \"numeric\" value"
-msgstr "ungültiges Vorzeichen in externem „numeric“-Wert"
+msgstr "ungültiges Vorzeichen in externem »numeric«-Wert"
 
-#: utils/adt/numeric.c:785
+#: utils/adt/numeric.c:781
 #, c-format
 msgid "invalid scale in external \"numeric\" value"
-msgstr "ungültige Skala in externem „numeric“-Wert"
+msgstr "ungültige Skala in externem »numeric«-Wert"
 
-#: utils/adt/numeric.c:794
+#: utils/adt/numeric.c:790
 #, c-format
 msgid "invalid digit in external \"numeric\" value"
-msgstr "ungültige Ziffer in externem „numeric“-Wert"
+msgstr "ungültige Ziffer in externem »numeric«-Wert"
 
-#: utils/adt/numeric.c:985 utils/adt/numeric.c:999
+#: utils/adt/numeric.c:981 utils/adt/numeric.c:995
 #, c-format
 msgid "NUMERIC precision %d must be between 1 and %d"
 msgstr "Präzision von NUMERIC (%d) muss zwischen 1 und %d liegen"
 
-#: utils/adt/numeric.c:990
+#: utils/adt/numeric.c:986
 #, c-format
 msgid "NUMERIC scale %d must be between 0 and precision %d"
 msgstr "Skala von NUMERIC (%d) muss zwischen 0 und %d liegen"
 
-#: utils/adt/numeric.c:1008
+#: utils/adt/numeric.c:1004
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "ungültiker Modifikator für Typ NUMERIC"
 
-#: utils/adt/numeric.c:1340
+#: utils/adt/numeric.c:1336
 #, c-format
 msgid "start value cannot be NaN"
 msgstr "Startwert kann nicht NaN sein"
 
-#: utils/adt/numeric.c:1345
+#: utils/adt/numeric.c:1341
 #, c-format
 msgid "stop value cannot be NaN"
 msgstr "Stoppwert kann nicht NaN sein"
 
-#: utils/adt/numeric.c:1355
+#: utils/adt/numeric.c:1351
 #, c-format
 msgid "step size cannot be NaN"
 msgstr "Schrittgröße kann nicht NaN sein"
 
-#: utils/adt/numeric.c:2550 utils/adt/numeric.c:5104 utils/adt/numeric.c:7132
+#: utils/adt/numeric.c:2546 utils/adt/numeric.c:4662 utils/adt/numeric.c:5107
+#: utils/adt/numeric.c:7135
 #, c-format
 msgid "value overflows numeric format"
-msgstr "Wert verursacht Überlauf im „numeric“-Format"
+msgstr "Wert verursacht Überlauf im »numeric«-Format"
 
-#: utils/adt/numeric.c:2881
+#: utils/adt/numeric.c:2877
 #, c-format
 msgid "cannot convert NaN to integer"
 msgstr "kann NaN nicht in integer umwandeln"
 
-#: utils/adt/numeric.c:2947
+#: utils/adt/numeric.c:2943
 #, c-format
 msgid "cannot convert NaN to bigint"
 msgstr "kann NaN nicht in bigint umwandeln"
 
-#: utils/adt/numeric.c:2992
+#: utils/adt/numeric.c:2988
 #, c-format
 msgid "cannot convert NaN to smallint"
 msgstr "kann NaN nicht in smallint umwandeln"
 
-#: utils/adt/numeric.c:5174
+#: utils/adt/numeric.c:5177
 #, c-format
 msgid "numeric field overflow"
-msgstr "Feldüberlauf bei Typ „numeric“"
+msgstr "Feldüberlauf bei Typ »numeric«"
 
-#: utils/adt/numeric.c:5175
+#: utils/adt/numeric.c:5178
 #, c-format
 msgid "A field with precision %d, scale %d must round to an absolute value less than %s%d."
 msgstr "Ein Feld mit Präzision %d, Skala %d muss beim Runden einen Betrag von weniger als %s%d ergeben."
 
-#: utils/adt/numeric.c:6689
+#: utils/adt/numeric.c:6692
 #, c-format
 msgid "argument for function \"exp\" too big"
-msgstr "Argument für Funktion „exp“ zu groß"
+msgstr "Argument für Funktion »exp« zu groß"
 
 #: utils/adt/numutils.c:75
 #, c-format
 msgid "value \"%s\" is out of range for type integer"
-msgstr "Wert „%s“ ist außerhalb des gültigen Bereichs für Typ integer"
+msgstr "Wert »%s« ist außerhalb des gültigen Bereichs für Typ integer"
 
 #: utils/adt/numutils.c:81
 #, c-format
 msgid "value \"%s\" is out of range for type smallint"
-msgstr "Wert „%s“ ist außerhalb des gültigen Bereichs für Typ smallint"
+msgstr "Wert »%s« ist außerhalb des gültigen Bereichs für Typ smallint"
 
 #: utils/adt/numutils.c:87
 #, c-format
 msgid "value \"%s\" is out of range for 8-bit integer"
-msgstr "Wert „%s“ ist außerhalb des gültigen Bereichs für 8-Bit-Ganzzahl"
+msgstr "Wert »%s« ist außerhalb des gültigen Bereichs für 8-Bit-Ganzzahl"
 
 #: 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 "ungültige Eingabesyntax für Typ „oid“: „%s“"
+msgstr "ungültige Eingabesyntax für Typ »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 "Wert „%s“ ist außerhalb des gültigen Bereichs für Typ „oid“"
+msgstr "Wert »%s« ist außerhalb des gültigen Bereichs für Typ »oid«"
 
 #: utils/adt/oid.c:287
 #, c-format
@@ -18871,37 +18895,37 @@
 msgid "percentile value %g is not between 0 and 1"
 msgstr "Perzentilwert %g ist nicht zwischen 0 und 1"
 
-#: utils/adt/pg_locale.c:917
+#: utils/adt/pg_locale.c:1029
 #, c-format
 msgid "Apply system library package updates."
 msgstr "Aktualisieren Sie die Systembibliotheken."
 
-#: utils/adt/pg_locale.c:1122
+#: utils/adt/pg_locale.c:1234
 #, c-format
 msgid "could not create locale \"%s\": %m"
-msgstr "konnte Locale „%s“ nicht erzeugen: %m"
+msgstr "konnte Locale »%s« nicht erzeugen: %m"
 
-#: utils/adt/pg_locale.c:1125
+#: utils/adt/pg_locale.c:1237
 #, 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."
+msgstr "Das Betriebssystem konnte keine Locale-Daten für den Locale-Namen »%s« finden."
 
-#: utils/adt/pg_locale.c:1212
+#: utils/adt/pg_locale.c:1324
 #, c-format
 msgid "collations with different collate and ctype values are not supported on this platform"
-msgstr "Sortierfolgen mit unterschiedlichen „collate“- und „ctype“-Werten 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:1227
+#: utils/adt/pg_locale.c:1339
 #, c-format
 msgid "nondefault collations are not supported on this platform"
 msgstr "Sortierfolgen außer der Standardsortierfolge werden auf dieser Plattform nicht unterstützt"
 
-#: utils/adt/pg_locale.c:1398
+#: utils/adt/pg_locale.c:1510
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "ungültiges Mehrbytezeichen für Locale"
 
-#: utils/adt/pg_locale.c:1399
+#: utils/adt/pg_locale.c:1511
 #, c-format
 msgid "The server's LC_CTYPE locale is probably incompatible with the database encoding."
 msgstr "Die LC_CTYPE-Locale des Servers ist wahrscheinlich mit der Kodierung der Datenbank inkompatibel."
@@ -18909,7 +18933,7 @@
 #: utils/adt/pg_lsn.c:44 utils/adt/pg_lsn.c:49
 #, c-format
 msgid "invalid input syntax for type pg_lsn: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ pg_lsn: „%s“"
+msgstr "ungültige Eingabesyntax für Typ pg_lsn: »%s«"
 
 #: utils/adt/pg_upgrade_support.c:39
 #, c-format
@@ -19082,7 +19106,7 @@
 #: utils/adt/rangetypes.c:1954
 #, c-format
 msgid "Valid values are \"[]\", \"[)\", \"(]\", and \"()\"."
-msgstr "Gültige Werte sind „[]“, „[)“, „(]“ und „()“."
+msgstr "Gültige Werte sind »[]«, »[)«, »(]« und »()«."
 
 #: utils/adt/rangetypes.c:2019 utils/adt/rangetypes.c:2036
 #: utils/adt/rangetypes.c:2049 utils/adt/rangetypes.c:2067
@@ -19090,12 +19114,12 @@
 #: utils/adt/rangetypes.c:2130
 #, c-format
 msgid "malformed range literal: \"%s\""
-msgstr "fehlerhafte Bereichskonstante: „%s“"
+msgstr "fehlerhafte Bereichskonstante: »%s«"
 
 #: utils/adt/rangetypes.c:2021
 #, c-format
 msgid "Junk after \"empty\" key word."
-msgstr "Müll nach Schlüsselwort „empty“."
+msgstr "Müll nach Schlüsselwort »empty«."
 
 #: utils/adt/rangetypes.c:2038
 #, c-format
@@ -19125,17 +19149,17 @@
 #: utils/adt/regexp.c:422
 #, c-format
 msgid "invalid regexp option: \"%c\""
-msgstr "ungültige Option für regulären Ausdruck: „%c“"
+msgstr "ungültige Option für regulären Ausdruck: »%c«"
 
 #: utils/adt/regexp.c:948
 #, c-format
 msgid "regexp_split does not support the global option"
-msgstr "regexp_split unterstützt die „Global“-Option nicht"
+msgstr "regexp_split unterstützt die »Global«-Option nicht"
 
 #: utils/adt/regproc.c:128 utils/adt/regproc.c:148
 #, c-format
 msgid "more than one function named \"%s\""
-msgstr "es gibt mehrere Funktionen namens „%s“"
+msgstr "es gibt mehrere Funktionen namens »%s«"
 
 #: utils/adt/regproc.c:587 utils/adt/regproc.c:607
 #, c-format
@@ -19143,7 +19167,7 @@
 msgstr "es gibt mehrere Operatoren namens %s"
 
 #: utils/adt/regproc.c:779 utils/adt/regproc.c:820 utils/adt/regproc.c:2006
-#: utils/adt/ruleutils.c:8167 utils/adt/ruleutils.c:8292
+#: utils/adt/ruleutils.c:8222 utils/adt/ruleutils.c:8347
 #, c-format
 msgid "too many arguments"
 msgstr "zu viele Argumente"
@@ -19180,76 +19204,76 @@
 msgid "improper type name"
 msgstr "falscher Typname"
 
-#: utils/adt/ri_triggers.c:345 utils/adt/ri_triggers.c:2492
-#: utils/adt/ri_triggers.c:3317
+#: utils/adt/ri_triggers.c:343 utils/adt/ri_triggers.c:2490
+#: utils/adt/ri_triggers.c:3315
 #, 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“"
+msgstr "Einfügen oder Aktualisieren in Tabelle »%s« verletzt Fremdschlüssel-Constraint »%s«"
 
-#: utils/adt/ri_triggers.c:348 utils/adt/ri_triggers.c:2495
+#: utils/adt/ri_triggers.c:346 utils/adt/ri_triggers.c:2493
 #, c-format
 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:2734
+#: utils/adt/ri_triggers.c:2732
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
-msgstr "Funktion „%s“ muss von INSERT ausgelöst werden"
+msgstr "Funktion »%s« muss von INSERT ausgelöst werden"
 
-#: utils/adt/ri_triggers.c:2740
+#: utils/adt/ri_triggers.c:2738
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
-msgstr "Funktion „%s“ muss von UPDATE ausgelöst werden"
+msgstr "Funktion »%s« muss von UPDATE ausgelöst werden"
 
-#: utils/adt/ri_triggers.c:2746
+#: utils/adt/ri_triggers.c:2744
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
-msgstr "Funktion „%s“ muss von DELETE ausgelöst werden"
+msgstr "Funktion »%s« muss von DELETE ausgelöst werden"
 
-#: utils/adt/ri_triggers.c:2769
+#: utils/adt/ri_triggers.c:2767
 #, 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“"
+msgstr "kein »pg_constraint«-Eintrag für Trigger »%s« für Tabelle »%s«"
 
-#: utils/adt/ri_triggers.c:2771
+#: utils/adt/ri_triggers.c:2769
 #, c-format
 msgid "Remove this referential integrity trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."
 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:3227
+#: utils/adt/ri_triggers.c:3225
 #, c-format
 msgid "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result"
-msgstr "RI-Anfrage in Tabelle „%s“ für Constraint „%s“ von Tabelle „%s“ ergab unerwartetes Ergebnis"
+msgstr "RI-Anfrage in Tabelle »%s« für Constraint »%s« von Tabelle »%s« ergab unerwartetes Ergebnis"
 
-#: utils/adt/ri_triggers.c:3231
+#: utils/adt/ri_triggers.c:3229
 #, c-format
 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:3321
+#: utils/adt/ri_triggers.c:3319
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
-msgstr "Schlüssel (%s)=(%s) ist nicht in Tabelle „%s“ vorhanden."
+msgstr "Schlüssel (%s)=(%s) ist nicht in Tabelle »%s« vorhanden."
 
-#: utils/adt/ri_triggers.c:3324
+#: utils/adt/ri_triggers.c:3322
 #, c-format
 msgid "Key is not present in table \"%s\"."
-msgstr "Der Schlüssel ist nicht in Tabelle „%s“ vorhanden."
+msgstr "Der Schlüssel ist nicht in Tabelle »%s« vorhanden."
 
-#: utils/adt/ri_triggers.c:3330
+#: utils/adt/ri_triggers.c:3328
 #, c-format
 msgid "update or delete on table \"%s\" violates foreign key constraint \"%s\" on table \"%s\""
-msgstr "Aktualisieren oder Löschen in Tabelle „%s“ verletzt Fremdschlüssel-Constraint „%s“ von Tabelle „%s“"
+msgstr "Aktualisieren oder Löschen in Tabelle »%s« verletzt Fremdschlüssel-Constraint »%s« von Tabelle »%s«"
 
-#: utils/adt/ri_triggers.c:3335
+#: utils/adt/ri_triggers.c:3333
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
-msgstr "Auf Schlüssel (%s)=(%s) wird noch aus Tabelle „%s“ verwiesen."
+msgstr "Auf Schlüssel (%s)=(%s) wird noch aus Tabelle »%s« verwiesen."
 
-#: utils/adt/ri_triggers.c:3338
+#: utils/adt/ri_triggers.c:3336
 #, c-format
 msgid "Key is still referenced from table \"%s\"."
-msgstr "Auf den Schlüssel wird noch aus Tabelle „%s“ verwiesen."
+msgstr "Auf den Schlüssel wird noch aus Tabelle »%s« verwiesen."
 
 #: utils/adt/rowtypes.c:103 utils/adt/rowtypes.c:479
 #, c-format
@@ -19260,7 +19284,7 @@
 #: utils/adt/rowtypes.c:214 utils/adt/rowtypes.c:266 utils/adt/rowtypes.c:274
 #, c-format
 msgid "malformed record literal: \"%s\""
-msgstr "fehlerhafte Record-Konstante: „%s“"
+msgstr "fehlerhafte Record-Konstante: »%s«"
 
 #: utils/adt/rowtypes.c:156
 #, c-format
@@ -19309,17 +19333,17 @@
 msgid "cannot compare record types with different numbers of columns"
 msgstr "kann Record-Typen mit unterschiedlicher Anzahl Spalten nicht vergleichen"
 
-#: utils/adt/ruleutils.c:4147
+#: utils/adt/ruleutils.c:4150
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
-msgstr "Regel „%s“ hat nicht unterstützten Ereignistyp %d"
+msgstr "Regel »%s« hat nicht unterstützten Ereignistyp %d"
 
-#: utils/adt/selfuncs.c:5260
+#: utils/adt/selfuncs.c:5264
 #, c-format
 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:5363
+#: utils/adt/selfuncs.c:5367
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
 msgstr "Mustersuche mit regulären Ausdrücken wird für Typ bytea nicht unterstützt"
@@ -19327,138 +19351,138 @@
 #: utils/adt/tid.c:71 utils/adt/tid.c:79 utils/adt/tid.c:87
 #, c-format
 msgid "invalid input syntax for type tid: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ tid: „%s“"
+msgstr "ungültige Eingabesyntax für Typ tid: »%s«"
 
-#: utils/adt/timestamp.c:99
+#: utils/adt/timestamp.c:100
 #, c-format
 msgid "TIMESTAMP(%d)%s precision must not be negative"
 msgstr "Präzision von TIMESTAMP(%d)%s darf nicht negativ sein"
 
-#: utils/adt/timestamp.c:105
+#: utils/adt/timestamp.c:106
 #, c-format
 msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
 msgstr "Präzision von TIMESTAMP(%d)%s auf erlaubten Höchstwert %d reduziert"
 
-#: utils/adt/timestamp.c:170 utils/adt/timestamp.c:444
+#: utils/adt/timestamp.c:171 utils/adt/timestamp.c:445
 #, c-format
 msgid "timestamp out of range: \"%s\""
-msgstr "timestamp ist außerhalb des gültigen Bereichs: „%s“"
+msgstr "timestamp ist außerhalb des gültigen Bereichs: »%s«"
 
-#: utils/adt/timestamp.c:188 utils/adt/timestamp.c:462
-#: utils/adt/timestamp.c:917
+#: utils/adt/timestamp.c:189 utils/adt/timestamp.c:463
+#: utils/adt/timestamp.c:918
 #, c-format
 msgid "date/time value \"%s\" is no longer supported"
-msgstr "Datum/Zeit-Wert „%s“ wird nicht mehr unterstützt"
+msgstr "Datum/Zeit-Wert »%s« wird nicht mehr unterstützt"
 
-#: utils/adt/timestamp.c:258
+#: utils/adt/timestamp.c:259
 #, c-format
 msgid "timestamp cannot be NaN"
 msgstr "timestamp kann nicht NaN sein"
 
-#: utils/adt/timestamp.c:379
+#: utils/adt/timestamp.c:380
 #, c-format
 msgid "timestamp(%d) precision must be between %d and %d"
 msgstr "Präzision von timestamp(%d) muss zwischen %d und %d sein"
 
-#: utils/adt/timestamp.c:512
+#: utils/adt/timestamp.c:513
 #, c-format
 msgid "invalid input syntax for numeric time zone: \"%s\""
-msgstr "ungültige Eingabesyntax für numerische Zeitzone: „%s“"
+msgstr "ungültige Eingabesyntax für numerische Zeitzone: »%s«"
 
-#: utils/adt/timestamp.c:514
+#: utils/adt/timestamp.c:515
 #, c-format
 msgid "Numeric time zones must have \"-\" or \"+\" as first character."
-msgstr "Numerische Zeitzonen müssen „-“ oder „+“ als erstes Zeichen haben."
+msgstr "Numerische Zeitzonen müssen »-« oder »+« als erstes Zeichen haben."
 
-#: utils/adt/timestamp.c:527
+#: utils/adt/timestamp.c:528
 #, c-format
 msgid "numeric time zone \"%s\" out of range"
-msgstr "numerische Zeitzone „%s“ ist außerhalb des gültigen Bereichs"
+msgstr "numerische Zeitzone »%s« ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/timestamp.c:630 utils/adt/timestamp.c:640
+#: utils/adt/timestamp.c:631 utils/adt/timestamp.c:641
 #, c-format
 msgid "timestamp out of range: %d-%02d-%02d %d:%02d:%02g"
 msgstr "timestamp ist außerhalb des gültigen Bereichs: %d-%02d-%02d %d:%02d:%02g"
 
-#: utils/adt/timestamp.c:911 utils/adt/timestamp.c:1482
-#: utils/adt/timestamp.c:1985 utils/adt/timestamp.c:3125
-#: utils/adt/timestamp.c:3130 utils/adt/timestamp.c:3135
-#: utils/adt/timestamp.c:3185 utils/adt/timestamp.c:3192
-#: utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3219
-#: utils/adt/timestamp.c:3226 utils/adt/timestamp.c:3233
-#: utils/adt/timestamp.c:3262 utils/adt/timestamp.c:3269
-#: utils/adt/timestamp.c:3314 utils/adt/timestamp.c:3605
-#: utils/adt/timestamp.c:3734 utils/adt/timestamp.c:4125
+#: utils/adt/timestamp.c:912 utils/adt/timestamp.c:1536
+#: utils/adt/timestamp.c:2042 utils/adt/timestamp.c:3224
+#: utils/adt/timestamp.c:3229 utils/adt/timestamp.c:3234
+#: utils/adt/timestamp.c:3284 utils/adt/timestamp.c:3291
+#: utils/adt/timestamp.c:3298 utils/adt/timestamp.c:3318
+#: utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3332
+#: utils/adt/timestamp.c:3361 utils/adt/timestamp.c:3368
+#: utils/adt/timestamp.c:3413 utils/adt/timestamp.c:3704
+#: utils/adt/timestamp.c:3833 utils/adt/timestamp.c:4224
 #, c-format
 msgid "interval out of range"
 msgstr "interval-Wert ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/timestamp.c:1052 utils/adt/timestamp.c:1085
+#: utils/adt/timestamp.c:1053 utils/adt/timestamp.c:1086
 #, c-format
 msgid "invalid INTERVAL type modifier"
 msgstr "ungültiger Modifikator für Typ INTERVAL"
 
-#: utils/adt/timestamp.c:1068
+#: utils/adt/timestamp.c:1069
 #, c-format
 msgid "INTERVAL(%d) precision must not be negative"
 msgstr "INTERVAL(%d)-Präzision darf nicht negativ sein"
 
-#: utils/adt/timestamp.c:1074
+#: utils/adt/timestamp.c:1075
 #, c-format
 msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
 msgstr "INTERVAL(%d)-Präzision auf erlaubtes Maximum %d reduziert"
 
-#: utils/adt/timestamp.c:1426
+#: utils/adt/timestamp.c:1480
 #, c-format
 msgid "interval(%d) precision must be between %d and %d"
 msgstr "Präzision von interval(%d) muss zwischen %d und %d sein"
 
-#: utils/adt/timestamp.c:2714
+#: utils/adt/timestamp.c:2813
 #, c-format
 msgid "cannot subtract infinite timestamps"
 msgstr "kann unendliche timestamp-Werte nicht subtrahieren"
 
-#: utils/adt/timestamp.c:3860 utils/adt/timestamp.c:4486
-#: utils/adt/timestamp.c:4506
+#: utils/adt/timestamp.c:3959 utils/adt/timestamp.c:4585
+#: utils/adt/timestamp.c:4605
 #, c-format
 msgid "timestamp units \"%s\" not supported"
-msgstr "„timestamp“-Einheit „%s“ nicht unterstützt"
+msgstr "»timestamp«-Einheit »%s« nicht unterstützt"
 
-#: utils/adt/timestamp.c:3874 utils/adt/timestamp.c:4516
+#: utils/adt/timestamp.c:3973 utils/adt/timestamp.c:4615
 #, c-format
 msgid "timestamp units \"%s\" not recognized"
-msgstr "„timestamp“-Einheit „%s“ nicht erkannt"
+msgstr "»timestamp«-Einheit »%s« nicht erkannt"
 
-#: utils/adt/timestamp.c:4014 utils/adt/timestamp.c:4697
-#: utils/adt/timestamp.c:4718
+#: utils/adt/timestamp.c:4113 utils/adt/timestamp.c:4796
+#: utils/adt/timestamp.c:4817
 #, c-format
 msgid "timestamp with time zone units \"%s\" not supported"
-msgstr "„timestamp with time zone“-Einheit „%s“ nicht unterstützt"
+msgstr "»timestamp with time zone«-Einheit »%s« nicht unterstützt"
 
-#: utils/adt/timestamp.c:4031 utils/adt/timestamp.c:4727
+#: utils/adt/timestamp.c:4130 utils/adt/timestamp.c:4826
 #, c-format
 msgid "timestamp with time zone units \"%s\" not recognized"
-msgstr "„timestamp with time zone“-Einheit „%s“ nicht erkannt"
+msgstr "»timestamp with time zone«-Einheit »%s« nicht erkannt"
 
-#: utils/adt/timestamp.c:4112
+#: utils/adt/timestamp.c:4211
 #, c-format
 msgid "interval units \"%s\" not supported because months usually have fractional weeks"
-msgstr "„interval“-Einheit „%s“ wird nicht unterstützt, weil Monate gewöhnlich partielle Wochen haben"
+msgstr "»interval«-Einheit »%s« wird nicht unterstützt, weil Monate gewöhnlich partielle Wochen haben"
 
-#: utils/adt/timestamp.c:4118 utils/adt/timestamp.c:4833
+#: utils/adt/timestamp.c:4217 utils/adt/timestamp.c:4932
 #, c-format
 msgid "interval units \"%s\" not supported"
-msgstr "„interval“-Einheit „%s“ nicht unterstützt"
+msgstr "»interval«-Einheit »%s« nicht unterstützt"
 
-#: utils/adt/timestamp.c:4134 utils/adt/timestamp.c:4860
+#: utils/adt/timestamp.c:4233 utils/adt/timestamp.c:4959
 #, c-format
 msgid "interval units \"%s\" not recognized"
-msgstr "„interval“-Einheit „%s“ nicht erkannt"
+msgstr "»interval«-Einheit »%s« nicht erkannt"
 
-#: utils/adt/timestamp.c:5024 utils/adt/timestamp.c:5254
+#: utils/adt/timestamp.c:5054 utils/adt/timestamp.c:5250
 #, c-format
 msgid "could not convert to time zone \"%s\""
-msgstr "konnte nicht in Zeitzone „%s“ umwandeln"
+msgstr "konnte nicht in Zeitzone »%s« umwandeln"
 
 #: utils/adt/trigfuncs.c:42
 #, c-format
@@ -19489,34 +19513,34 @@
 #: utils/adt/tsvector_parser.c:133
 #, c-format
 msgid "syntax error in tsquery: \"%s\""
-msgstr "Syntaxfehler in tsquery: „%s“"
+msgstr "Syntaxfehler in tsquery: »%s«"
 
 #: utils/adt/tsquery.c:176
 #, c-format
 msgid "no operand in tsquery: \"%s\""
-msgstr "kein Operand in tsquery: „%s“"
+msgstr "kein Operand in tsquery: »%s«"
 
 #: utils/adt/tsquery.c:248
 #, c-format
 msgid "value is too big in tsquery: \"%s\""
-msgstr "Wert ist zu groß in tsquery: „%s“"
+msgstr "Wert ist zu groß in tsquery: »%s«"
 
 #: utils/adt/tsquery.c:253
 #, c-format
 msgid "operand is too long in tsquery: \"%s\""
-msgstr "Operator ist zu lang in tsquery: „%s“"
+msgstr "Operator ist zu lang in tsquery: »%s«"
 
 #: utils/adt/tsquery.c:281
 #, c-format
 msgid "word is too long in tsquery: \"%s\""
-msgstr "Wort ist zu lang in tsquery: „%s“"
+msgstr "Wort ist zu lang in tsquery: »%s«"
 
 #: utils/adt/tsquery.c:510
 #, c-format
 msgid "text-search query doesn't contain lexemes: \"%s\""
-msgstr "Textsucheanfrage enthält keine Lexeme: „%s“"
+msgstr "Textsucheanfrage enthält keine Lexeme: »%s«"
 
-#: utils/adt/tsquery.c:521 utils/adt/tsquery_util.c:340
+#: utils/adt/tsquery.c:521 utils/adt/tsquery_util.c:371
 #, c-format
 msgid "tsquery is too large"
 msgstr "tsquery ist zu groß"
@@ -19526,7 +19550,7 @@
 msgid "text-search query contains only stop words or doesn't contain lexemes, ignored"
 msgstr "Textsucheanfrage enthält nur Stoppwörter oder enthält keine Lexeme, ignoriert"
 
-#: utils/adt/tsquery_rewrite.c:293
+#: utils/adt/tsquery_rewrite.c:322
 #, c-format
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "ts_rewrite-Anfrage muss zwei tsquery-Spalten zurückgeben"
@@ -19561,65 +19585,65 @@
 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:1173
+#: utils/adt/tsvector_op.c:1174
 #, c-format
 msgid "ts_stat query must return one tsvector column"
 msgstr "ts_stat-Anfrage muss eine tsvector-Spalte zurückgeben"
 
-#: utils/adt/tsvector_op.c:1353
+#: utils/adt/tsvector_op.c:1354
 #, c-format
 msgid "tsvector column \"%s\" does not exist"
-msgstr "tsvector-Spalte „%s“ existiert nicht"
+msgstr "tsvector-Spalte »%s« existiert nicht"
 
-#: utils/adt/tsvector_op.c:1359
+#: utils/adt/tsvector_op.c:1360
 #, c-format
 msgid "column \"%s\" is not of tsvector type"
-msgstr "Spalte „%s“ hat nicht Typ tsvector"
+msgstr "Spalte »%s« hat nicht Typ tsvector"
 
-#: utils/adt/tsvector_op.c:1371
+#: utils/adt/tsvector_op.c:1372
 #, c-format
 msgid "configuration column \"%s\" does not exist"
-msgstr "Konfigurationsspalte „%s“ existiert nicht"
+msgstr "Konfigurationsspalte »%s« existiert nicht"
 
-#: utils/adt/tsvector_op.c:1377
+#: utils/adt/tsvector_op.c:1378
 #, c-format
 msgid "column \"%s\" is not of regconfig type"
-msgstr "Spalte „%s“ hat nicht Typ regconfig"
+msgstr "Spalte »%s« hat nicht Typ regconfig"
 
-#: utils/adt/tsvector_op.c:1384
+#: utils/adt/tsvector_op.c:1385
 #, c-format
 msgid "configuration column \"%s\" must not be null"
-msgstr "Konfigurationsspalte „%s“ darf nicht NULL sein"
+msgstr "Konfigurationsspalte »%s« darf nicht NULL sein"
 
-#: utils/adt/tsvector_op.c:1397
+#: utils/adt/tsvector_op.c:1398
 #, c-format
 msgid "text search configuration name \"%s\" must be schema-qualified"
-msgstr "Textsuchekonfigurationsname „%s“ muss Schemaqualifikation haben"
+msgstr "Textsuchekonfigurationsname »%s« muss Schemaqualifikation haben"
 
-#: utils/adt/tsvector_op.c:1422
+#: utils/adt/tsvector_op.c:1423
 #, c-format
 msgid "column \"%s\" is not of a character type"
-msgstr "Spalte „%s“ hat keinen Zeichentyp"
+msgstr "Spalte »%s« hat keinen Zeichentyp"
 
 #: utils/adt/tsvector_parser.c:134
 #, c-format
 msgid "syntax error in tsvector: \"%s\""
-msgstr "Syntaxfehler in tsvector: „%s“"
+msgstr "Syntaxfehler in tsvector: »%s«"
 
 #: utils/adt/tsvector_parser.c:199
 #, c-format
 msgid "there is no escaped character: \"%s\""
-msgstr "es gibt kein escaptes Zeichen: „%s“"
+msgstr "es gibt kein escaptes Zeichen: »%s«"
 
 #: utils/adt/tsvector_parser.c:316
 #, c-format
 msgid "wrong position info in tsvector: \"%s\""
-msgstr "falsche Positionsinformationen in tsvector: „%s“"
+msgstr "falsche Positionsinformationen in tsvector: »%s«"
 
 #: utils/adt/txid.c:339
 #, c-format
 msgid "invalid input syntax for type txid_snapshot: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ txid_snapshot: „%s“"
+msgstr "ungültige Eingabesyntax für Typ txid_snapshot: »%s«"
 
 #: utils/adt/txid.c:534
 #, c-format
@@ -19629,7 +19653,7 @@
 #: utils/adt/uuid.c:128
 #, c-format
 msgid "invalid input syntax for uuid: \"%s\""
-msgstr "ungültige Eingabesyntax für Typ uuid: „%s“"
+msgstr "ungültige Eingabesyntax für Typ uuid: »%s«"
 
 #: utils/adt/varbit.c:57 utils/adt/varchar.c:49
 #, c-format
@@ -19654,12 +19678,12 @@
 #: utils/adt/varbit.c:199 utils/adt/varbit.c:511
 #, c-format
 msgid "\"%c\" is not a valid binary digit"
-msgstr "„%c“ ist keine gültige Binärziffer"
+msgstr "»%c« ist keine gültige Binärziffer"
 
 #: utils/adt/varbit.c:224 utils/adt/varbit.c:536
 #, c-format
 msgid "\"%c\" is not a valid hexadecimal digit"
-msgstr "„%c“ ist keine gültige Hexadezimalziffer"
+msgstr "»%c« ist keine gültige Hexadezimalziffer"
 
 #: utils/adt/varbit.c:311 utils/adt/varbit.c:627
 #, c-format
@@ -19681,24 +19705,24 @@
 #: utils/adt/varbit.c:1226
 #, c-format
 msgid "cannot AND bit strings of different sizes"
-msgstr "binäres „Und“ nicht mit Bitketten unterschiedlicher Länge möglich"
+msgstr "binäres »Und« nicht mit Bitketten unterschiedlicher Länge möglich"
 
 #: utils/adt/varbit.c:1268
 #, c-format
 msgid "cannot OR bit strings of different sizes"
-msgstr "binäres „Oder“ nicht mit Bitketten unterschiedlicher Länge möglich"
+msgstr "binäres »Oder« nicht mit Bitketten unterschiedlicher Länge möglich"
 
 #: utils/adt/varbit.c:1315
 #, c-format
 msgid "cannot XOR bit strings of different sizes"
-msgstr "binäres „Exklusiv-Oder“ nicht mit Bitketten unterschiedlicher Länge möglich"
+msgstr "binäres »Exklusiv-Oder« nicht mit Bitketten unterschiedlicher Länge möglich"
 
-#: utils/adt/varbit.c:1793 utils/adt/varbit.c:1851
+#: utils/adt/varbit.c:1803 utils/adt/varbit.c:1861
 #, c-format
 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:1802 utils/adt/varlena.c:2790
+#: utils/adt/varbit.c:1812 utils/adt/varlena.c:2790
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "neues Bit muss 0 oder 1 sein"
@@ -19747,7 +19771,7 @@
 #: utils/adt/varlena.c:4708 utils/adt/varlena.c:4828
 #, c-format
 msgid "unrecognized conversion type specifier \"%c\""
-msgstr "unbekannte Konvertierungstypspezifikation „%c“"
+msgstr "unbekannte Konvertierungstypspezifikation »%c«"
 
 #: utils/adt/varlena.c:4720 utils/adt/varlena.c:4777
 #, c-format
@@ -19767,7 +19791,7 @@
 #: utils/adt/varlena.c:4956
 #, c-format
 msgid "width argument position must be ended by \"$\""
-msgstr "Argumentposition der Breitenangabe muss mit „$“ enden"
+msgstr "Argumentposition der Breitenangabe muss mit »$« enden"
 
 #: utils/adt/varlena.c:5001
 #, c-format
@@ -19784,144 +19808,144 @@
 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:171
+#: utils/adt/xml.c:175
 #, c-format
 msgid "unsupported XML feature"
 msgstr "nicht unterstützte XML-Funktionalität"
 
-#: utils/adt/xml.c:172
+#: utils/adt/xml.c:176
 #, c-format
 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:173
+#: utils/adt/xml.c:177
 #, c-format
 msgid "You need to rebuild PostgreSQL using --with-libxml."
 msgstr "Sie müssen PostgreSQL mit --with-libxml neu bauen."
 
-#: utils/adt/xml.c:192 utils/mb/mbutils.c:523
+#: utils/adt/xml.c:196 utils/mb/mbutils.c:523
 #, c-format
 msgid "invalid encoding name \"%s\""
-msgstr "ungültiger Kodierungsname „%s“"
+msgstr "ungültiger Kodierungsname »%s«"
 
-#: utils/adt/xml.c:435 utils/adt/xml.c:440
+#: utils/adt/xml.c:439 utils/adt/xml.c:444
 #, c-format
 msgid "invalid XML comment"
 msgstr "ungültiger XML-Kommentar"
 
-#: utils/adt/xml.c:569
+#: utils/adt/xml.c:573
 #, c-format
 msgid "not an XML document"
 msgstr "kein XML-Dokument"
 
-#: utils/adt/xml.c:728 utils/adt/xml.c:751
+#: utils/adt/xml.c:732 utils/adt/xml.c:755
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "ungültige XML-Verarbeitungsanweisung"
 
-#: utils/adt/xml.c:729
+#: utils/adt/xml.c:733
 #, c-format
 msgid "XML processing instruction target name cannot be \"%s\"."
-msgstr "Die Zielangabe der XML-Verarbeitungsanweisung darf nicht „%s“ sein."
+msgstr "Die Zielangabe der XML-Verarbeitungsanweisung darf nicht »%s« sein."
 
-#: utils/adt/xml.c:752
+#: utils/adt/xml.c:756
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
-msgstr "XML-Verarbeitungsanweisung darf nicht „?>“ enthalten."
+msgstr "XML-Verarbeitungsanweisung darf nicht »?>« enthalten."
 
-#: utils/adt/xml.c:831
+#: utils/adt/xml.c:835
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "xmlvalidate ist nicht implementiert"
 
-#: utils/adt/xml.c:910
+#: utils/adt/xml.c:914
 #, c-format
 msgid "could not initialize XML library"
 msgstr "konnte XML-Bibliothek nicht initialisieren"
 
-#: utils/adt/xml.c:911
+#: utils/adt/xml.c:915
 #, 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/xml.c:997
+#: utils/adt/xml.c:1001
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "konnte XML-Fehlerbehandlung nicht einrichten"
 
-#: utils/adt/xml.c:998
+#: utils/adt/xml.c:1002
 #, c-format
 msgid "This probably indicates that the version of libxml2 being used is not compatible with the libxml2 header files that PostgreSQL was built with."
 msgstr "Das deutet wahrscheinlich darauf hin, dass die verwendete Version von libxml2 nicht mit den Header-Dateien der Version, mit der PostgreSQL gebaut wurde, kompatibel ist."
 
-#: utils/adt/xml.c:1737
+#: utils/adt/xml.c:1741
 msgid "Invalid character value."
 msgstr "Ungültiger Zeichenwert."
 
-#: utils/adt/xml.c:1740
+#: utils/adt/xml.c:1744
 msgid "Space required."
 msgstr "Leerzeichen benötigt."
 
-#: utils/adt/xml.c:1743
+#: utils/adt/xml.c:1747
 msgid "standalone accepts only 'yes' or 'no'."
-msgstr "standalone akzeptiert nur „yes“ oder „no“."
+msgstr "standalone akzeptiert nur »yes« oder »no«."
 
-#: utils/adt/xml.c:1746
+#: utils/adt/xml.c:1750
 msgid "Malformed declaration: missing version."
 msgstr "Fehlerhafte Deklaration: Version fehlt."
 
-#: utils/adt/xml.c:1749
+#: utils/adt/xml.c:1753
 msgid "Missing encoding in text declaration."
 msgstr "Fehlende Kodierung in Textdeklaration."
 
-#: utils/adt/xml.c:1752
+#: utils/adt/xml.c:1756
 msgid "Parsing XML declaration: '?>' expected."
-msgstr "Beim Parsen der XML-Deklaration: „?>“ erwartet."
+msgstr "Beim Parsen der XML-Deklaration: »?>« erwartet."
 
-#: utils/adt/xml.c:1755
+#: utils/adt/xml.c:1759
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "Unbekannter Libxml-Fehlercode: %d."
 
-#: utils/adt/xml.c:2030
+#: utils/adt/xml.c:2034
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML unterstützt keine unendlichen Datumswerte."
 
-#: utils/adt/xml.c:2052 utils/adt/xml.c:2079
+#: utils/adt/xml.c:2056 utils/adt/xml.c:2083
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML unterstützt keine unendlichen timestamp-Werte."
 
-#: utils/adt/xml.c:2470
+#: utils/adt/xml.c:2483
 #, c-format
 msgid "invalid query"
 msgstr "ungültige Anfrage"
 
-#: utils/adt/xml.c:3795
+#: utils/adt/xml.c:3808
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "ungültiges Array for XML-Namensraumabbildung"
 
-#: utils/adt/xml.c:3796
+#: utils/adt/xml.c:3809
 #, c-format
 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/xml.c:3820
+#: utils/adt/xml.c:3833
 #, c-format
 msgid "empty XPath expression"
 msgstr "leerer XPath-Ausdruck"
 
-#: utils/adt/xml.c:3869
+#: utils/adt/xml.c:3882
 #, c-format
 msgid "neither namespace name nor URI may be null"
 msgstr "weder Namensraumname noch URI dürfen NULL sein"
 
-#: utils/adt/xml.c:3876
+#: utils/adt/xml.c:3889
 #, 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"
+msgstr "konnte XML-Namensraum mit Namen »%s« und URI »%s« nicht registrieren"
 
 #: utils/cache/lsyscache.c:2515 utils/cache/lsyscache.c:2548
 #: utils/cache/lsyscache.c:2581 utils/cache/lsyscache.c:2614
@@ -19939,25 +19963,25 @@
 msgid "no output function available for type %s"
 msgstr "keine Ausgabefunktion verfügbar für Typ %s"
 
-#: utils/cache/plancache.c:725
+#: utils/cache/plancache.c:731
 #, c-format
 msgid "cached plan must not change result type"
 msgstr "gecachter Plan darf den Ergebnistyp nicht ändern"
 
-#: utils/cache/relcache.c:5021
+#: utils/cache/relcache.c:5048
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
-msgstr "konnte Initialisierungsdatei für Relationscache „%s“ nicht erzeugen: %m"
+msgstr "konnte Initialisierungsdatei für Relationscache »%s« nicht erzeugen: %m"
 
-#: utils/cache/relcache.c:5023
+#: utils/cache/relcache.c:5050
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Setze trotzdem fort, aber irgendwas stimmt nicht."
 
-#: utils/cache/relcache.c:5256
+#: utils/cache/relcache.c:5283
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
-msgstr "konnte Cache-Datei „%s“ nicht löschen: %m"
+msgstr "konnte Cache-Datei »%s« nicht löschen: %m"
 
 #: utils/cache/relmapper.c:508
 #, c-format
@@ -19967,37 +19991,37 @@
 #: utils/cache/relmapper.c:651 utils/cache/relmapper.c:751
 #, c-format
 msgid "could not open relation mapping file \"%s\": %m"
-msgstr "konnte Relation-Mapping-Datei „%s“ nicht öffnen: %m"
+msgstr "konnte Relation-Mapping-Datei »%s« nicht öffnen: %m"
 
 #: utils/cache/relmapper.c:664
 #, c-format
 msgid "could not read relation mapping file \"%s\": %m"
-msgstr "konnte nicht aus Relation-Mapping-Datei „%s“ lesen: %m"
+msgstr "konnte nicht aus Relation-Mapping-Datei »%s« lesen: %m"
 
 #: utils/cache/relmapper.c:674
 #, c-format
 msgid "relation mapping file \"%s\" contains invalid data"
-msgstr "Relation-Mapping-Datei „%s“ enthält ungültige Daten"
+msgstr "Relation-Mapping-Datei »%s« enthält ungültige Daten"
 
 #: utils/cache/relmapper.c:684
 #, c-format
 msgid "relation mapping file \"%s\" contains incorrect checksum"
-msgstr "Relation-Mapping-Datei „%s“ enthält falsche Prüfsumme"
+msgstr "Relation-Mapping-Datei »%s« enthält falsche Prüfsumme"
 
 #: utils/cache/relmapper.c:784
 #, c-format
 msgid "could not write to relation mapping file \"%s\": %m"
-msgstr "konnte nicht in Relation-Mapping-Datei „%s“ schreiben: %m"
+msgstr "konnte nicht in Relation-Mapping-Datei »%s« schreiben: %m"
 
 #: utils/cache/relmapper.c:797
 #, c-format
 msgid "could not fsync relation mapping file \"%s\": %m"
-msgstr "konnte Relation-Mapping-Datei „%s“ nicht fsyncen: %m"
+msgstr "konnte Relation-Mapping-Datei »%s« nicht fsyncen: %m"
 
 #: utils/cache/relmapper.c:803
 #, c-format
 msgid "could not close relation mapping file \"%s\": %m"
-msgstr "konnte Relation-Mapping-Datei „%s“ nicht schließen: %m"
+msgstr "konnte Relation-Mapping-Datei »%s« nicht schließen: %m"
 
 #: utils/cache/typcache.c:1210
 #, c-format
@@ -20017,125 +20041,125 @@
 #: utils/error/assert.c:37
 #, c-format
 msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
-msgstr "TRAP: %s(„%s“, Datei: „%s“, Zeile: %d)\n"
+msgstr "TRAP: %s(»%s«, Datei: »%s«, Zeile: %d)\n"
 
 #: utils/error/elog.c:316 utils/error/elog.c:1297
 #, c-format
 msgid "error occurred at %s:%d before error message processing is available\n"
 msgstr "Fehler geschah bei %s:%d bevor Fehlermeldungsverarbeitung bereit war\n"
 
-#: utils/error/elog.c:1864
+#: utils/error/elog.c:1873
 #, c-format
 msgid "could not reopen file \"%s\" as stderr: %m"
-msgstr "konnte Datei „%s“ nicht als stderr neu öffnen: %m"
+msgstr "konnte Datei »%s« nicht als stderr neu öffnen: %m"
 
-#: utils/error/elog.c:1877
+#: utils/error/elog.c:1886
 #, c-format
 msgid "could not reopen file \"%s\" as stdout: %m"
-msgstr "konnte Datei „%s“ nicht als stdou neu öffnen: %m"
+msgstr "konnte Datei »%s« nicht als stdou neu öffnen: %m"
 
-#: utils/error/elog.c:2353 utils/error/elog.c:2370 utils/error/elog.c:2386
+#: utils/error/elog.c:2362 utils/error/elog.c:2379 utils/error/elog.c:2395
 msgid "[unknown]"
 msgstr "[unbekannt]"
 
-#: utils/error/elog.c:2825 utils/error/elog.c:3124 utils/error/elog.c:3232
+#: utils/error/elog.c:2834 utils/error/elog.c:3133 utils/error/elog.c:3241
 msgid "missing error text"
 msgstr "fehlender Fehlertext"
 
-#: utils/error/elog.c:2828 utils/error/elog.c:2831 utils/error/elog.c:3235
-#: utils/error/elog.c:3238
+#: utils/error/elog.c:2837 utils/error/elog.c:2840 utils/error/elog.c:3244
+#: utils/error/elog.c:3247
 #, c-format
 msgid " at character %d"
 msgstr " bei Zeichen %d"
 
-#: utils/error/elog.c:2841 utils/error/elog.c:2848
+#: utils/error/elog.c:2850 utils/error/elog.c:2857
 msgid "DETAIL:  "
 msgstr "DETAIL:  "
 
-#: utils/error/elog.c:2855
+#: utils/error/elog.c:2864
 msgid "HINT:  "
 msgstr "TIPP:  "
 
-#: utils/error/elog.c:2862
+#: utils/error/elog.c:2871
 msgid "QUERY:  "
 msgstr "ANFRAGE:  "
 
-#: utils/error/elog.c:2869
+#: utils/error/elog.c:2878
 msgid "CONTEXT:  "
 msgstr "ZUSAMMENHANG:  "
 
-#: utils/error/elog.c:2879
+#: utils/error/elog.c:2888
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "ORT:  %s, %s:%d\n"
 
-#: utils/error/elog.c:2886
+#: utils/error/elog.c:2895
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "ORT:  %s:%d\n"
 
-#: utils/error/elog.c:2900
+#: utils/error/elog.c:2909
 msgid "STATEMENT:  "
 msgstr "ANWEISUNG:  "
 
 #. translator: This string will be truncated at 47
 #. characters expanded.
-#: utils/error/elog.c:3353
+#: utils/error/elog.c:3362
 #, c-format
 msgid "operating system error %d"
 msgstr "Betriebssystemfehler %d"
 
-#: utils/error/elog.c:3548
+#: utils/error/elog.c:3557
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: utils/error/elog.c:3552
+#: utils/error/elog.c:3561
 msgid "LOG"
 msgstr "LOG"
 
-#: utils/error/elog.c:3555
+#: utils/error/elog.c:3564
 msgid "INFO"
 msgstr "INFO"
 
-#: utils/error/elog.c:3558
+#: utils/error/elog.c:3567
 msgid "NOTICE"
 msgstr "HINWEIS"
 
-#: utils/error/elog.c:3561
+#: utils/error/elog.c:3570
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: utils/error/elog.c:3564
+#: utils/error/elog.c:3573
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: utils/error/elog.c:3567
+#: utils/error/elog.c:3576
 msgid "FATAL"
 msgstr "FATAL"
 
-#: utils/error/elog.c:3570
+#: utils/error/elog.c:3579
 msgid "PANIC"
 msgstr "PANIK"
 
 #: utils/fmgr/dfmgr.c:117
 #, c-format
 msgid "could not find function \"%s\" in file \"%s\""
-msgstr "konnte Funktion „%s“ nicht in Datei „%s“ finden"
+msgstr "konnte Funktion »%s« nicht in Datei »%s« finden"
 
 #: utils/fmgr/dfmgr.c:196 utils/fmgr/dfmgr.c:405 utils/fmgr/dfmgr.c:453
 #, c-format
 msgid "could not access file \"%s\": %m"
-msgstr "konnte nicht auf Datei „%s“ zugreifen: %m"
+msgstr "konnte nicht auf Datei »%s« zugreifen: %m"
 
 #: utils/fmgr/dfmgr.c:234
 #, c-format
 msgid "could not load library \"%s\": %s"
-msgstr "konnte Bibliothek „%s“ nicht laden: %s"
+msgstr "konnte Bibliothek »%s« nicht laden: %s"
 
 #: utils/fmgr/dfmgr.c:266
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
-msgstr "inkompatible Bibliothek „%s“: magischer Block fehlt"
+msgstr "inkompatible Bibliothek »%s«: magischer Block fehlt"
 
 #: utils/fmgr/dfmgr.c:268
 #, c-format
@@ -20145,7 +20169,7 @@
 #: utils/fmgr/dfmgr.c:304
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
-msgstr "inkompatible Bibliothek „%s“: Version stimmt nicht überein"
+msgstr "inkompatible Bibliothek »%s«: Version stimmt nicht überein"
 
 #: utils/fmgr/dfmgr.c:306
 #, c-format
@@ -20184,37 +20208,37 @@
 #: utils/fmgr/dfmgr.c:371
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
-msgstr "inkompatible Bibliothek „%s“: magischer Block stimmt überein"
+msgstr "inkompatible Bibliothek »%s«: magischer Block stimmt überein"
 
 #: utils/fmgr/dfmgr.c:535
 #, c-format
 msgid "access to library \"%s\" is not allowed"
-msgstr "Zugriff auf Bibliothek „%s“ ist nicht erlaubt"
+msgstr "Zugriff auf Bibliothek »%s« ist nicht erlaubt"
 
 #: utils/fmgr/dfmgr.c:561
 #, c-format
 msgid "invalid macro name in dynamic library path: %s"
-msgstr "ungültiger Makroname in Parameter „dynamic_library_path“: %s"
+msgstr "ungültiger Makroname in Parameter »dynamic_library_path«: %s"
 
 #: utils/fmgr/dfmgr.c:601
 #, c-format
 msgid "zero-length component in parameter \"dynamic_library_path\""
-msgstr "eine Komponente im Parameter „dynamic_library_path“ hat Länge null"
+msgstr "eine Komponente im Parameter »dynamic_library_path« hat Länge null"
 
 #: utils/fmgr/dfmgr.c:620
 #, c-format
 msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
-msgstr "eine Komponente im Parameter „dynamic_library_path“ ist kein absoluter Pfad"
+msgstr "eine Komponente im Parameter »dynamic_library_path« ist kein absoluter Pfad"
 
 #: utils/fmgr/fmgr.c:272
 #, c-format
 msgid "internal function \"%s\" is not in internal lookup table"
-msgstr "interne Funktion „%s“ ist nicht in der internen Suchtabelle"
+msgstr "interne Funktion »%s« ist nicht in der internen Suchtabelle"
 
 #: utils/fmgr/fmgr.c:479
 #, c-format
 msgid "unrecognized API version %d reported by info function \"%s\""
-msgstr "Info-Funktion „%2$s“ berichtete unbekannte API-Version %1$d"
+msgstr "Info-Funktion »%2$s« berichtete unbekannte API-Version %1$d"
 
 #: utils/fmgr/fmgr.c:849 utils/fmgr/fmgr.c:2110
 #, c-format
@@ -20229,7 +20253,7 @@
 #: utils/fmgr/funcapi.c:355
 #, 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"
+msgstr "konnte tatsächlichen Ergebnistyp von Funktion »%s« mit deklarierten Rückgabetyp %s nicht bestimmen"
 
 #: utils/fmgr/funcapi.c:1342 utils/fmgr/funcapi.c:1373
 #, c-format
@@ -20244,17 +20268,17 @@
 #: utils/fmgr/funcapi.c:1391
 #, c-format
 msgid "could not determine row description for function returning record"
-msgstr "konnte Zeilenbeschreibung für Funktion, die „record“ zurückgibt, nicht ermitteln"
+msgstr "konnte Zeilenbeschreibung für Funktion, die »record« zurückgibt, nicht ermitteln"
 
 #: utils/init/miscinit.c:120
 #, c-format
 msgid "could not change directory to \"%s\": %m"
-msgstr "konnte nicht in Verzeichnis „%s“ wechseln: %m"
+msgstr "konnte nicht in Verzeichnis »%s« wechseln: %m"
 
 #: utils/init/miscinit.c:441 utils/misc/guc.c:5839
 #, c-format
 msgid "cannot set parameter \"%s\" within security-restricted operation"
-msgstr "kann Parameter „%s“ nicht in einer sicherheitsbeschränkten Operation setzen"
+msgstr "kann Parameter »%s« nicht in einer sicherheitsbeschränkten Operation setzen"
 
 #: utils/init/miscinit.c:502
 #, c-format
@@ -20264,17 +20288,17 @@
 #: utils/init/miscinit.c:532
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
-msgstr "Rolle „%s“ hat keine Berechtigung zum Einloggen"
+msgstr "Rolle »%s« hat keine Berechtigung zum Einloggen"
 
 #: utils/init/miscinit.c:550
 #, c-format
 msgid "too many connections for role \"%s\""
-msgstr "zu viele Verbindungen von Rolle „%s“"
+msgstr "zu viele Verbindungen von Rolle »%s«"
 
 #: utils/init/miscinit.c:610
 #, c-format
 msgid "permission denied to set session authorization"
-msgstr "keine Berechtigung, um Sitzungsauthorisierung zu setzen"
+msgstr "keine Berechtigung, um Sitzungsautorisierung zu setzen"
 
 #: utils/init/miscinit.c:693
 #, c-format
@@ -20284,22 +20308,22 @@
 #: utils/init/miscinit.c:823
 #, c-format
 msgid "could not create lock file \"%s\": %m"
-msgstr "konnte Sperrdatei „%s“ nicht erstellen: %m"
+msgstr "konnte Sperrdatei »%s« nicht erstellen: %m"
 
 #: utils/init/miscinit.c:837
 #, c-format
 msgid "could not open lock file \"%s\": %m"
-msgstr "konnte Sperrdatei „%s“ nicht öffnen: %m"
+msgstr "konnte Sperrdatei »%s« nicht öffnen: %m"
 
 #: utils/init/miscinit.c:843
 #, c-format
 msgid "could not read lock file \"%s\": %m"
-msgstr "konnte Sperrdatei „%s“ nicht lesen: %m"
+msgstr "konnte Sperrdatei »%s« nicht lesen: %m"
 
 #: utils/init/miscinit.c:851
 #, c-format
 msgid "lock file \"%s\" is empty"
-msgstr "Sperrdatei „%s“ ist leer"
+msgstr "Sperrdatei »%s« ist leer"
 
 #: utils/init/miscinit.c:852
 #, c-format
@@ -20309,27 +20333,27 @@
 #: utils/init/miscinit.c:899
 #, c-format
 msgid "lock file \"%s\" already exists"
-msgstr "Sperrdatei „%s“ existiert bereits"
+msgstr "Sperrdatei »%s« existiert bereits"
 
 #: utils/init/miscinit.c:903
 #, 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“?"
+msgstr "Läuft bereits ein anderer postgres-Prozess (PID %d) im Datenverzeichnis »%s«?"
 
 #: utils/init/miscinit.c:905
 #, 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“?"
+msgstr "Läuft bereits ein anderer postmaster-Prozess (PID %d) im Datenverzeichnis »%s«?"
 
 #: utils/init/miscinit.c:908
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
-msgstr "Verwendet bereits ein anderer postgres-Prozess (PID %d) die Socketdatei „%s“?"
+msgstr "Verwendet bereits ein anderer postgres-Prozess (PID %d) die Socketdatei »%s«?"
 
 #: utils/init/miscinit.c:910
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
-msgstr "Verwendet bereits ein anderer postmaster-Prozess (PID %d) die Socketdatei „%s“?"
+msgstr "Verwendet bereits ein anderer postmaster-Prozess (PID %d) die Socketdatei »%s«?"
 
 #: utils/init/miscinit.c:946
 #, c-format
@@ -20339,12 +20363,12 @@
 #: utils/init/miscinit.c:949
 #, 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“."
+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:965
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
-msgstr "konnte alte Sperrdatei „%s“ nicht löschen: %m"
+msgstr "konnte alte Sperrdatei »%s« nicht löschen: %m"
 
 #: utils/init/miscinit.c:967
 #, c-format
@@ -20355,37 +20379,37 @@
 #: utils/init/miscinit.c:1024
 #, c-format
 msgid "could not write lock file \"%s\": %m"
-msgstr "konnte Sperrdatei „%s“ nicht schreiben: %m"
+msgstr "konnte Sperrdatei »%s« nicht schreiben: %m"
 
-#: utils/init/miscinit.c:1153 utils/init/miscinit.c:1282 utils/misc/guc.c:8585
+#: utils/init/miscinit.c:1153 utils/init/miscinit.c:1282 utils/misc/guc.c:8610
 #, c-format
 msgid "could not read from file \"%s\": %m"
-msgstr "konnte nicht aus Datei „%s“ lesen: %m"
+msgstr "konnte nicht aus Datei »%s« lesen: %m"
 
 #: utils/init/miscinit.c:1272
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
-msgstr "konnte Datei „%s“ nicht öffnen: %m; setze trotzdem fort"
+msgstr "konnte Datei »%s« nicht öffnen: %m; setze trotzdem fort"
 
 #: utils/init/miscinit.c:1295
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
-msgstr "Sperrdatei „%s“ enthält falsche PID: %ld statt %ld"
+msgstr "Sperrdatei »%s« enthält falsche PID: %ld statt %ld"
 
 #: utils/init/miscinit.c:1337 utils/init/miscinit.c:1350
 #, c-format
 msgid "\"%s\" is not a valid data directory"
-msgstr "„%s“ ist kein gültiges Datenverzeichnis"
+msgstr "»%s« ist kein gültiges Datenverzeichnis"
 
 #: utils/init/miscinit.c:1339
 #, c-format
 msgid "File \"%s\" is missing."
-msgstr "Die Datei „%s“ fehlt."
+msgstr "Die Datei »%s« fehlt."
 
 #: utils/init/miscinit.c:1352
 #, c-format
 msgid "File \"%s\" does not contain valid data."
-msgstr "Die Datei „%s“ enthält keine gültigen Daten."
+msgstr "Die Datei »%s« enthält keine gültigen Daten."
 
 #: utils/init/miscinit.c:1354
 #, c-format
@@ -20400,12 +20424,12 @@
 #: utils/init/miscinit.c:1433
 #, c-format
 msgid "loaded library \"%s\""
-msgstr "Bibliothek „%s“ geladen"
+msgstr "Bibliothek »%s« geladen"
 
 #: utils/init/postinit.c:238
 #, c-format
 msgid "replication connection authorized: user=%s SSL enabled (protocol=%s, cipher=%s, compression=%s)"
-msgstr "Replikationsverbindung authorisiert: Benutzer=%s SSL an (Protokoll=%s, Verschlüsselungsmethode=%s, Komprimierung=%s)"
+msgstr "Replikationsverbindung autorisiert: Benutzer=%s SSL an (Protokoll=%s, Verschlüsselungsmethode=%s, Komprimierung=%s)"
 
 #: utils/init/postinit.c:240 utils/init/postinit.c:254
 msgid "off"
@@ -20418,37 +20442,37 @@
 #: utils/init/postinit.c:244
 #, c-format
 msgid "replication connection authorized: user=%s"
-msgstr "Replikationsverbindung authorisiert: Benutzer=%s"
+msgstr "Replikationsverbindung autorisiert: Benutzer=%s"
 
 #: utils/init/postinit.c:252
 #, c-format
 msgid "connection authorized: user=%s database=%s SSL enabled (protocol=%s, cipher=%s, compression=%s)"
-msgstr "Verbindung authorisiert: Benutzer=%s Datenbank=%s SSL an (Protokoll=%s, Verschlüsselungsmethode=%s, Komprimierung=%s)"
+msgstr "Verbindung autorisiert: Benutzer=%s Datenbank=%s SSL an (Protokoll=%s, Verschlüsselungsmethode=%s, Komprimierung=%s)"
 
 #: utils/init/postinit.c:258
 #, c-format
 msgid "connection authorized: user=%s database=%s"
-msgstr "Verbindung authorisiert: Benutzer=%s Datenbank=%s"
+msgstr "Verbindung autorisiert: Benutzer=%s Datenbank=%s"
 
 #: utils/init/postinit.c:290
 #, c-format
 msgid "database \"%s\" has disappeared from pg_database"
-msgstr "Datenbank „%s“ ist aus pg_database verschwunden"
+msgstr "Datenbank »%s« ist aus pg_database verschwunden"
 
 #: utils/init/postinit.c:292
 #, c-format
 msgid "Database OID %u now seems to belong to \"%s\"."
-msgstr "Datenbank-OID %u gehört jetzt anscheinend zu „%s“."
+msgstr "Datenbank-OID %u gehört jetzt anscheinend zu »%s«."
 
 #: utils/init/postinit.c:312
 #, c-format
 msgid "database \"%s\" is not currently accepting connections"
-msgstr "Datenbank „%s“ akzeptiert gegenwärtig keine Verbindungen"
+msgstr "Datenbank »%s« akzeptiert gegenwärtig keine Verbindungen"
 
 #: utils/init/postinit.c:325
 #, c-format
 msgid "permission denied for database \"%s\""
-msgstr "keine Berechtigung für Datenbank „%s“"
+msgstr "keine Berechtigung für Datenbank »%s«"
 
 #: utils/init/postinit.c:326
 #, c-format
@@ -20458,7 +20482,7 @@
 #: utils/init/postinit.c:343
 #, c-format
 msgid "too many connections for database \"%s\""
-msgstr "zu viele Verbindungen für Datenbank „%s“"
+msgstr "zu viele Verbindungen für Datenbank »%s«"
 
 #: utils/init/postinit.c:365 utils/init/postinit.c:372
 #, c-format
@@ -20468,7 +20492,7 @@
 #: utils/init/postinit.c:366
 #, 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."
+msgstr "Die Datenbank wurde mit LC_COLLATE »%s« initialisiert, was von setlocale() nicht erkannt wird."
 
 #: utils/init/postinit.c:368 utils/init/postinit.c:375
 #, c-format
@@ -20478,7 +20502,7 @@
 #: utils/init/postinit.c:373
 #, 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."
+msgstr "Die Datenbank wurde mit LC_CTYPE »%s« initialisiert, was von setlocale() nicht erkannt wird."
 
 #: utils/init/postinit.c:699
 #, c-format
@@ -20528,12 +20552,12 @@
 #: utils/init/postinit.c:947
 #, c-format
 msgid "The database subdirectory \"%s\" is missing."
-msgstr "Das Datenbankunterverzeichnis „%s“ fehlt."
+msgstr "Das Datenbankunterverzeichnis »%s« fehlt."
 
 #: utils/init/postinit.c:952
 #, c-format
 msgid "could not access directory \"%s\": %m"
-msgstr "konnte nicht auf Verzeichnis „%s“ zugreifen: %m"
+msgstr "konnte nicht auf Verzeichnis »%s« zugreifen: %m"
 
 #: utils/mb/conv.c:360 utils/mb/conv.c:546
 #, c-format
@@ -20565,7 +20589,7 @@
 #: utils/mb/mbutils.c:366
 #, c-format
 msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
-msgstr "Standardumwandlung von Kodierung „%s“ nach „%s“ existiert nicht"
+msgstr "Standardumwandlung von Kodierung »%s« nach »%s« existiert nicht"
 
 #: utils/mb/mbutils.c:377 utils/mb/mbutils.c:710
 #, c-format
@@ -20575,17 +20599,17 @@
 #: utils/mb/mbutils.c:464
 #, c-format
 msgid "invalid source encoding name \"%s\""
-msgstr "ungültiger Quellkodierungsname „%s“"
+msgstr "ungültiger Quellkodierungsname »%s«"
 
 #: utils/mb/mbutils.c:469
 #, c-format
 msgid "invalid destination encoding name \"%s\""
-msgstr "ungültiger Zielkodierungsname „%s“"
+msgstr "ungültiger Zielkodierungsname »%s«"
 
 #: utils/mb/mbutils.c:609
 #, c-format
 msgid "invalid byte value for encoding \"%s\": 0x%02x"
-msgstr "ungültiger Byte-Wert für Kodierung „%s“: 0x%02x"
+msgstr "ungültiger Byte-Wert für Kodierung »%s«: 0x%02x"
 
 #: utils/mb/mbutils.c:951
 #, c-format
@@ -20595,12 +20619,12 @@
 #: utils/mb/wchar.c:2015
 #, c-format
 msgid "invalid byte sequence for encoding \"%s\": %s"
-msgstr "ungültige Byte-Sequenz für Kodierung „%s“: %s"
+msgstr "ungültige Byte-Sequenz für Kodierung »%s«: %s"
 
 #: utils/mb/wchar.c:2048
 #, c-format
 msgid "character with byte sequence %s in encoding \"%s\" has no equivalent in encoding \"%s\""
-msgstr "Zeichen mit Byte-Folge %s in Kodierung „%s“ hat keine Entsprechung in Kodierung „%s“"
+msgstr "Zeichen mit Byte-Folge %s in Kodierung »%s« hat keine Entsprechung in Kodierung »%s«"
 
 #: utils/misc/guc.c:535
 msgid "Ungrouped"
@@ -20792,11 +20816,11 @@
 
 #: utils/misc/guc.c:684
 msgid "Valid units for this parameter are \"kB\", \"MB\", \"GB\", and \"TB\"."
-msgstr "Gültige Einheiten für diesen Parameter sind „kB“, „MB“, „GB“ und „TB“."
+msgstr "Gültige Einheiten für diesen Parameter sind »kB«, »MB«, »GB« und »TB«."
 
 #: utils/misc/guc.c:711
 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“."
+msgstr "Gültige Einheiten für diesen Parameter sind »ms«, »s«, »min«, »h« und »d«."
 
 #: utils/misc/guc.c:770
 msgid "Enables the planner's use of sequential-scan plans."
@@ -20884,7 +20908,7 @@
 
 #: utils/misc/guc.c:939
 msgid "Detection of a checksum failure normally causes PostgreSQL to report an error, aborting the current transaction. Setting ignore_checksum_failure to true causes the system to ignore the failure (but still report a warning), and continue processing. This behavior could cause crashes or other serious problems. Only has an effect if checksums are enabled."
-msgstr "Wenn eine fehlerhafte Prüfsumme entdeckt wird, gibt PostgreSQL normalerweise ein Fehler aus und bricht die aktuelle Transaktion ab. Wenn „ignore_checksum_failure“ an ist, dann wird der Fehler ignoriert (aber trotzdem eine Warnung ausgegeben) und die Verarbeitung geht weiter. Dieses Verhalten kann Abstürze und andere ernsthafte Probleme verursachen. Es hat keine Auswirkungen, wenn Prüfsummen nicht eingeschaltet sind."
+msgstr "Wenn eine fehlerhafte Prüfsumme entdeckt wird, gibt PostgreSQL normalerweise ein Fehler aus und bricht die aktuelle Transaktion ab. Wenn »ignore_checksum_failure« an ist, dann wird der Fehler ignoriert (aber trotzdem eine Warnung ausgegeben) und die Verarbeitung geht weiter. Dieses Verhalten kann Abstürze und andere ernsthafte Probleme verursachen. Es hat keine Auswirkungen, wenn Prüfsummen nicht eingeschaltet sind."
 
 #: utils/misc/guc.c:953
 msgid "Continues processing past damaged page headers."
@@ -20892,7 +20916,7 @@
 
 #: utils/misc/guc.c:954
 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 "Wenn ein kaputter Seitenkopf entdeckt wird, gibt PostgreSQL normalerweise einen Fehler aus und bricht die aktuelle Transaktion ab. Wenn „zero_damaged_pages“ an ist, dann wird eine Warnung ausgegeben, die kaputte Seite mit Nullen gefüllt und die Verarbeitung geht weiter. Dieses Verhalten zerstört Daten, nämlich alle Zeilen in der kaputten Seite."
+msgstr "Wenn ein kaputter Seitenkopf entdeckt wird, gibt PostgreSQL normalerweise einen Fehler aus und bricht die aktuelle Transaktion ab. Wenn »zero_damaged_pages« an ist, dann wird eine Warnung ausgegeben, die kaputte Seite 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:967
 msgid "Writes full pages to WAL when first modified after a checkpoint."
@@ -21052,7 +21076,7 @@
 
 #: utils/misc/guc.c:1311
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
-msgstr "Behandelt „ausdruck=NULL“ als „ausdruck IS NULL“."
+msgstr "Behandelt »ausdruck=NULL« als »ausdruck IS NULL«."
 
 #: utils/misc/guc.c:1312
 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)."
@@ -21480,7 +21504,7 @@
 
 #: utils/misc/guc.c:2281
 msgid "Sets the minimum concurrent open transactions before performing commit_delay."
-msgstr "Setzt die minimale Anzahl gleichzeitig offener Transaktionen bevor „commit_delay“ angewendet wird."
+msgstr "Setzt die minimale Anzahl gleichzeitig offener Transaktionen bevor »commit_delay« angewendet wird."
 
 #: utils/misc/guc.c:2292
 msgid "Sets the number of digits displayed for floating-point values."
@@ -21820,7 +21844,7 @@
 
 #: utils/misc/guc.c:3096
 msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and \"eventlog\", depending on the platform."
-msgstr "Gültige Werte sind Kombinationen von „stderr“, „syslog“, „csvlog“ und „eventlog“, je nach Plattform."
+msgstr "Gültige Werte sind Kombinationen von »stderr«, »syslog«, »csvlog« und »eventlog«, je nach Plattform."
 
 #: utils/misc/guc.c:3107
 msgid "Sets the destination directory for log files."
@@ -21880,11 +21904,11 @@
 
 #: utils/misc/guc.c:3245
 msgid "Sets the server's \"hba\" configuration file."
-msgstr "Setzt die „hba“-Konfigurationsdatei des Servers."
+msgstr "Setzt die »hba«-Konfigurationsdatei des Servers."
 
 #: utils/misc/guc.c:3256
 msgid "Sets the server's \"ident\" configuration file."
-msgstr "Setzt die „ident“-Konfigurationsdatei des Servers."
+msgstr "Setzt die »ident«-Konfigurationsdatei des Servers."
 
 #: utils/misc/guc.c:3267
 msgid "Writes the postmaster PID to the specified file."
@@ -21936,7 +21960,7 @@
 
 #: utils/misc/guc.c:3411
 msgid "Sets whether \"\\'\" is allowed in string literals."
-msgstr "Bestimmt, ob „\\'“ in Zeichenkettenkonstanten erlaubt ist."
+msgstr "Bestimmt, ob »\\'« in Zeichenkettenkonstanten erlaubt ist."
 
 #: utils/misc/guc.c:3421
 msgid "Sets the output format for bytea."
@@ -21985,7 +22009,7 @@
 
 #: utils/misc/guc.c:3516
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
-msgstr "Setzt die zu verwendende Syslog-„Facility“, wenn Syslog angeschaltet ist."
+msgstr "Setzt die zu verwendende Syslog-»Facility«, wenn Syslog angeschaltet ist."
 
 #: utils/misc/guc.c:3531
 msgid "Sets the session's behavior for triggers and rewrite rules."
@@ -22044,7 +22068,7 @@
 #: utils/misc/guc.c:4472
 #, c-format
 msgid "%s cannot access the server configuration file \"%s\": %s\n"
-msgstr "%s kann nicht auf die Serverkonfigurationsdatei „%s“ zugreifen: %s\n"
+msgstr "%s kann nicht auf die Serverkonfigurationsdatei »%s« zugreifen: %s\n"
 
 #: utils/misc/guc.c:4498
 #, c-format
@@ -22053,7 +22077,7 @@
 "This can be specified as \"data_directory\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
 msgstr ""
 "%s weiß nicht, wo die Systemdaten für das Datenbanksystem\n"
-"zu finden sind.  Sie können dies mit „data_directory“ in „%s“, mit der\n"
+"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:4546
@@ -22062,8 +22086,8 @@
 "%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 weiß nicht, wo die „hba“-Konfigurationsdatei zu finden ist.\n"
-"Sie können dies mit „hba_file“ in „%s“, mit der\n"
+"%s weiß nicht, wo die »hba«-Konfigurationsdatei zu finden ist.\n"
+"Sie können dies mit »hba_file« in »%s«, mit der\n"
 "Kommandozeilenoption -D oder der Umgebungsvariable PGDATA angeben.\n"
 
 #: utils/misc/guc.c:4569
@@ -22072,8 +22096,8 @@
 "%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 weiß nicht, wo die „ident“-Konfigurationsdatei zu finden ist.\n"
-"Sie können dies mit „ident_file“ in „%s“, mit der\n"
+"%s weiß nicht, wo die »ident«-Konfigurationsdatei zu finden ist.\n"
+"Sie können dies mit »ident_file« in »%s«, mit der\n"
 "Kommandozeilenoption -D oder der Umgebungsvariable PGDATA angeben.\n"
 
 #: utils/misc/guc.c:5243 utils/misc/guc.c:5290
@@ -22083,54 +22107,54 @@
 #: utils/misc/guc.c:5513
 #, c-format
 msgid "parameter \"%s\" requires a numeric value"
-msgstr "Parameter „%s“ erfordert einen numerischen Wert"
+msgstr "Parameter »%s« erfordert einen numerischen Wert"
 
 #: utils/misc/guc.c:5522
 #, 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)"
+msgstr "%g ist außerhalb des gültigen Bereichs für Parameter »%s« (%g ... %g)"
 
-#: utils/misc/guc.c:5675 utils/misc/guc.c:7000
+#: utils/misc/guc.c:5675 utils/misc/guc.c:7017
 #, c-format
 msgid "cannot set parameters during a parallel operation"
 msgstr "während einer parallelen Operation können keine Parameter gesetzt werden"
 
 #: utils/misc/guc.c:5682 utils/misc/guc.c:6432 utils/misc/guc.c:6484
-#: utils/misc/guc.c:6845 utils/misc/guc.c:7588 utils/misc/guc.c:7747
-#: utils/misc/guc.c:9382
+#: utils/misc/guc.c:6845 utils/misc/guc.c:7605 utils/misc/guc.c:7764
+#: utils/misc/guc.c:9417
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
-msgstr "unbekannter Konfigurationsparameter „%s“"
+msgstr "unbekannter Konfigurationsparameter »%s«"
 
 #: utils/misc/guc.c:5697 utils/misc/guc.c:6857
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
-msgstr "Parameter „%s“ kann nicht geändert werden"
+msgstr "Parameter »%s« kann nicht geändert werden"
 
 #: utils/misc/guc.c:5730
 #, c-format
 msgid "parameter \"%s\" cannot be changed now"
-msgstr "Parameter „%s“ kann jetzt nicht geändert werden"
+msgstr "Parameter »%s« kann jetzt nicht geändert werden"
 
-#: utils/misc/guc.c:5748 utils/misc/guc.c:5793 utils/misc/guc.c:9398
+#: utils/misc/guc.c:5748 utils/misc/guc.c:5793 utils/misc/guc.c:9433
 #, c-format
 msgid "permission denied to set parameter \"%s\""
-msgstr "keine Berechtigung, um Parameter „%s“ zu setzen"
+msgstr "keine Berechtigung, um Parameter »%s« zu setzen"
 
 #: utils/misc/guc.c:5783
 #, c-format
 msgid "parameter \"%s\" cannot be set after connection start"
-msgstr "Parameter „%s“ kann nach Start der Verbindung nicht geändert werden"
+msgstr "Parameter »%s« kann nach Start der Verbindung nicht geändert werden"
 
 #: utils/misc/guc.c:5831
 #, c-format
 msgid "cannot set parameter \"%s\" within security-definer function"
-msgstr "Parameter „%s“ kann nicht in einer Security-Definer-Funktion gesetzt werden"
+msgstr "Parameter »%s« kann nicht in einer Security-Definer-Funktion gesetzt werden"
 
-#: utils/misc/guc.c:6440 utils/misc/guc.c:6488 utils/misc/guc.c:7751
+#: utils/misc/guc.c:6440 utils/misc/guc.c:6488 utils/misc/guc.c:7768
 #, c-format
 msgid "must be superuser to examine \"%s\""
-msgstr "nur Superuser können „%s“ ansehen"
+msgstr "nur Superuser können »%s« ansehen"
 
 #: utils/misc/guc.c:6554
 #, c-format
@@ -22142,70 +22166,75 @@
 msgid "must be superuser to execute ALTER SYSTEM command"
 msgstr "nur Superuser können den Befehl ALTER SYSTEM ausführen"
 
-#: utils/misc/guc.c:6918
+#: utils/misc/guc.c:6890
+#, c-format
+msgid "parameter value for ALTER SYSTEM must not contain a newline"
+msgstr "Parameterwert für ALTER SYSTEM darf keine Newline enthalten"
+
+#: utils/misc/guc.c:6935
 #, c-format
 msgid "could not parse contents of file \"%s\""
-msgstr "konnte Inhalt der Datei „%s“ nicht parsen"
+msgstr "konnte Inhalt der Datei »%s« nicht parsen"
 
-#: utils/misc/guc.c:7076
+#: utils/misc/guc.c:7093
 #, c-format
 msgid "SET LOCAL TRANSACTION SNAPSHOT is not implemented"
 msgstr "SET LOCAL TRANSACTION SNAPSHOT ist nicht implementiert"
 
-#: utils/misc/guc.c:7161
+#: utils/misc/guc.c:7178
 #, c-format
 msgid "SET requires parameter name"
 msgstr "SET benötigt Parameternamen"
 
-#: utils/misc/guc.c:7285
+#: utils/misc/guc.c:7302
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
-msgstr "Versuch, den Parameter „%s“ zu redefinieren"
+msgstr "Versuch, den Parameter »%s« zu redefinieren"
 
-#: utils/misc/guc.c:9015
+#: utils/misc/guc.c:9050
 #, c-format
 msgid "parameter \"%s\" could not be set"
-msgstr "Parameter „%s“ kann nicht gesetzt werden"
+msgstr "Parameter »%s« kann nicht gesetzt werden"
 
-#: utils/misc/guc.c:9102
+#: utils/misc/guc.c:9137
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
-msgstr "konnte Wert von Parameter „%s“ nicht lesen"
+msgstr "konnte Wert von Parameter »%s« nicht lesen"
 
-#: utils/misc/guc.c:9460 utils/misc/guc.c:9494
+#: utils/misc/guc.c:9495 utils/misc/guc.c:9529
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
-msgstr "ungültiger Wert für Parameter „%s“: %d"
+msgstr "ungültiger Wert für Parameter »%s«: %d"
 
-#: utils/misc/guc.c:9528
+#: utils/misc/guc.c:9563
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
-msgstr "ungültiger Wert für Parameter „%s“: %g"
+msgstr "ungültiger Wert für Parameter »%s«: %g"
 
-#: utils/misc/guc.c:9718
+#: utils/misc/guc.c:9753
 #, c-format
 msgid "\"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."
+msgstr "»temp_buffers« kann nicht geändert werden, nachdem in der Sitzung auf temporäre Tabellen zugriffen wurde."
 
-#: utils/misc/guc.c:9730
+#: utils/misc/guc.c:9765
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour wird von dieser Installation nicht unterstützt"
 
-#: utils/misc/guc.c:9743
+#: utils/misc/guc.c:9778
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL wird von dieser Installation nicht unterstützt"
 
-#: utils/misc/guc.c:9755
+#: utils/misc/guc.c:9790
 #, c-format
 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:9767
+#: utils/misc/guc.c:9802
 #, c-format
 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."
+msgstr "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
 #, c-format
@@ -22215,7 +22244,7 @@
 #: utils/misc/rls.c:127
 #, c-format
 msgid "query would be affected by row-level security policy for table \"%s\""
-msgstr "Policy für Sicherheit auf Zeilenebene für Tabelle „%s“ würde Auswirkung auf die Anfrage haben"
+msgstr "Policy für Sicherheit auf Zeilenebene für Tabelle »%s« würde Auswirkung auf die Anfrage haben"
 
 #: utils/misc/rls.c:129
 #, c-format
@@ -22230,72 +22259,72 @@
 #: 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"
+msgstr "Zeitzonenabkürzung »%s« ist zu lang (maximal %d Zeichen) in Zeitzonendatei »%s«, Zeile %d"
 
 #: utils/misc/tzparser.c:73
 #, 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"
+msgstr "Zeitzonenabstand %d ist außerhalb des gültigen Bereichs in Zeitzonendatei »%s«, Zeile %d"
 
 #: utils/misc/tzparser.c:112
 #, c-format
 msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
-msgstr "fehlende Zeitzonenabkürzung in Zeitzonendatei „%s“, Zeile %d"
+msgstr "fehlende Zeitzonenabkürzung in Zeitzonendatei »%s«, Zeile %d"
 
 #: utils/misc/tzparser.c:121
 #, c-format
 msgid "missing time zone offset in time zone file \"%s\", line %d"
-msgstr "fehlender Zeitzonenabstand in Zeitzonendatei „%s“, Zeile %d"
+msgstr "fehlender Zeitzonenabstand in Zeitzonendatei »%s«, Zeile %d"
 
 #: utils/misc/tzparser.c:133
 #, 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"
+msgstr "ungültige Zahl für Zeitzonenabstand in Zeitzonendatei »%s«, Zeile %d"
 
 #: utils/misc/tzparser.c:169
 #, c-format
 msgid "invalid syntax in time zone file \"%s\", line %d"
-msgstr "ungültige Syntax in Zeitzonendatei „%s“, Zeile %d"
+msgstr "ungültige Syntax in Zeitzonendatei »%s«, Zeile %d"
 
 #: utils/misc/tzparser.c:237
 #, c-format
 msgid "time zone abbreviation \"%s\" is multiply defined"
-msgstr "Zeitzonenabkürzung „%s“ ist mehrfach definiert"
+msgstr "Zeitzonenabkürzung »%s« ist mehrfach definiert"
 
 #: utils/misc/tzparser.c:239
 #, 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."
+msgstr "Eintrag in Zeitzonendatei »%s«, Zeile %d, steht im Konflikt mit Eintrag in Datei »%s«, Zeile %d."
 
 #: utils/misc/tzparser.c:301
 #, c-format
 msgid "invalid time zone file name \"%s\""
-msgstr "ungültiger Zeitzonen-Dateiname „%s“"
+msgstr "ungültiger Zeitzonen-Dateiname »%s«"
 
 #: utils/misc/tzparser.c:314
 #, c-format
 msgid "time zone file recursion limit exceeded in file \"%s\""
-msgstr "Rekursionsbeschränkung für Zeitzonendatei überschritten in Datei „%s“"
+msgstr "Rekursionsbeschränkung für Zeitzonendatei überschritten in Datei »%s«"
 
 #: utils/misc/tzparser.c:353 utils/misc/tzparser.c:366
 #, c-format
 msgid "could not read time zone file \"%s\": %m"
-msgstr "konnte Zeitzonendatei „%s“ nicht lesen: %m"
+msgstr "konnte Zeitzonendatei »%s« nicht lesen: %m"
 
 #: utils/misc/tzparser.c:376
 #, c-format
 msgid "line is too long in time zone file \"%s\", line %d"
-msgstr "Zeile ist zu lang in Zeitzonendatei „%s“, Zeile %d"
+msgstr "Zeile ist zu lang in Zeitzonendatei »%s«, Zeile %d"
 
 #: utils/misc/tzparser.c:399
 #, c-format
 msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
-msgstr "@INCLUDE ohne Dateiname in Zeitzonendatei „%s“, Zeile %d"
+msgstr "@INCLUDE ohne Dateiname in Zeitzonendatei »%s«, Zeile %d"
 
-#: utils/mmgr/aset.c:505
+#: utils/mmgr/aset.c:506
 #, c-format
 msgid "Failed while creating memory context \"%s\"."
-msgstr "Fehler während der Erzeugung des Speicherkontexts „%s“."
+msgstr "Fehler während der Erzeugung des Speicherkontexts »%s«."
 
 #: utils/mmgr/mcxt.c:689 utils/mmgr/mcxt.c:724 utils/mmgr/mcxt.c:761
 #: utils/mmgr/mcxt.c:798 utils/mmgr/mcxt.c:832 utils/mmgr/mcxt.c:861
@@ -22308,22 +22337,22 @@
 #: utils/mmgr/portalmem.c:208
 #, c-format
 msgid "cursor \"%s\" already exists"
-msgstr "Cursor „%s“ existiert bereits"
+msgstr "Cursor »%s« existiert bereits"
 
 #: utils/mmgr/portalmem.c:212
 #, c-format
 msgid "closing existing cursor \"%s\""
-msgstr "bestehender Cursor „%s“ wird geschlossen"
+msgstr "bestehender Cursor »%s« wird geschlossen"
 
 #: utils/mmgr/portalmem.c:419
 #, c-format
 msgid "portal \"%s\" cannot be run"
-msgstr "Portal „%s“ kann nicht ausgeführt werden"
+msgstr "Portal »%s« kann nicht ausgeführt werden"
 
 #: utils/mmgr/portalmem.c:499
 #, c-format
 msgid "cannot drop active portal \"%s\""
-msgstr "aktives Portal „%s“ kann nicht gelöscht werden"
+msgstr "aktives Portal »%s« kann nicht gelöscht werden"
 
 #: utils/mmgr/portalmem.c:689
 #, c-format
@@ -22338,7 +22367,7 @@
 #: utils/sort/tuplesort.c:3606
 #, c-format
 msgid "could not create unique index \"%s\""
-msgstr "konnte Unique Index „%s“ nicht erstellen"
+msgstr "konnte Unique Index »%s« nicht erstellen"
 
 #: utils/sort/tuplesort.c:3608
 #, c-format
@@ -22371,51 +22400,51 @@
 msgid "could not write to tuplestore temporary file: %m"
 msgstr "konnte nicht in temporäre Datei für Tuplestore schreiben: %m"
 
-#: utils/time/snapmgr.c:432
+#: utils/time/snapmgr.c:473
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "Die Quelltransaktion läuft nicht mehr."
 
-#: utils/time/snapmgr.c:986
+#: utils/time/snapmgr.c:1038
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "aus einer Subtransaktion kann kein Snapshot exportiert werden"
 
-#: utils/time/snapmgr.c:1135 utils/time/snapmgr.c:1140
-#: utils/time/snapmgr.c:1145 utils/time/snapmgr.c:1160
-#: utils/time/snapmgr.c:1165 utils/time/snapmgr.c:1170
-#: utils/time/snapmgr.c:1269 utils/time/snapmgr.c:1285
-#: utils/time/snapmgr.c:1310
+#: utils/time/snapmgr.c:1187 utils/time/snapmgr.c:1192
+#: utils/time/snapmgr.c:1197 utils/time/snapmgr.c:1212
+#: utils/time/snapmgr.c:1217 utils/time/snapmgr.c:1222
+#: utils/time/snapmgr.c:1321 utils/time/snapmgr.c:1337
+#: utils/time/snapmgr.c:1362
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
-msgstr "ungültige Snapshot-Daten in Datei „%s“"
+msgstr "ungültige Snapshot-Daten in Datei »%s«"
 
-#: utils/time/snapmgr.c:1207
+#: utils/time/snapmgr.c:1259
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "SET TRANSACTION SNAPSHOT muss vor allen Anfragen aufgerufen werden"
 
-#: utils/time/snapmgr.c:1216
+#: utils/time/snapmgr.c:1268
 #, c-format
 msgid "a snapshot-importing transaction must have isolation level SERIALIZABLE or REPEATABLE READ"
 msgstr "eine Snapshot-importierende Transaktion muss Isolationsgrad SERIALIZABLE oder REPEATABLE READ haben"
 
-#: utils/time/snapmgr.c:1225 utils/time/snapmgr.c:1234
+#: utils/time/snapmgr.c:1277 utils/time/snapmgr.c:1286
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
-msgstr "ungültiger Snapshot-Bezeichner: „%s“"
+msgstr "ungültiger Snapshot-Bezeichner: »%s«"
 
-#: utils/time/snapmgr.c:1323
+#: utils/time/snapmgr.c:1375
 #, c-format
 msgid "a serializable transaction cannot import a snapshot from a non-serializable transaction"
 msgstr "eine serialisierbare Transaktion kann keinen Snapshot aus einer nicht-serialisierbaren Transaktion importieren"
 
-#: utils/time/snapmgr.c:1327
+#: utils/time/snapmgr.c:1379
 #, c-format
 msgid "a non-read-only serializable transaction cannot import a snapshot from a read-only transaction"
 msgstr "eine serialisierbare Transaktion, die nicht im Read-Only-Modus ist, kann keinen Snapshot aus einer Read-Only-Transaktion importieren"
 
-#: utils/time/snapmgr.c:1342
+#: utils/time/snapmgr.c:1394
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "kann keinen Snapshot aus einer anderen Datenbank importieren"
diff -Nru postgresql-9.5-9.5.2/src/backend/po/es.po postgresql-9.5-9.5.8/src/backend/po/es.po
--- postgresql-9.5-9.5.2/src/backend/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -58,8 +58,8 @@
 msgstr ""
 "Project-Id-Version: PostgreSQL server 9.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:38+0000\n"
-"PO-Revision-Date: 2015-07-06 17:44-0300\n"
+"POT-Creation-Date: 2017-05-21 17:26+0000\n"
+"PO-Revision-Date: 2017-05-22 11:42-0400\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL Español <pgsql-es-ayuda@postgresql.org>\n"
 "Language: es\n"
@@ -104,8 +104,8 @@
 msgstr "pclose falló: %s"
 
 #: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75
-#: ../common/fe_memutils.c:98 ../common/psprintf.c:181 ../port/path.c:598
-#: ../port/path.c:636 ../port/path.c:653
+#: ../common/fe_memutils.c:98 ../common/psprintf.c:181 ../port/path.c:602
+#: ../port/path.c:640 ../port/path.c:657
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
@@ -130,28 +130,29 @@
 msgid "could not close directory \"%s\": %s\n"
 msgstr "no se pudo cerrar el directorio «%s»: %s\n"
 
-#: ../common/psprintf.c:179 ../port/path.c:596 ../port/path.c:634
-#: ../port/path.c:651 access/transam/xlog.c:6038 lib/stringinfo.c:258
-#: libpq/auth.c:821 libpq/auth.c:1182 libpq/auth.c:1250 libpq/auth.c:1659
-#: postmaster/bgworker.c:289 postmaster/bgworker.c:796
-#: postmaster/postmaster.c:2284 postmaster/postmaster.c:2315
-#: postmaster/postmaster.c:3834 postmaster/postmaster.c:4522
-#: postmaster/postmaster.c:4590 postmaster/postmaster.c:5277
-#: postmaster/postmaster.c:5530 replication/logical/logical.c:167
-#: storage/buffer/localbuf.c:396 storage/file/fd.c:481 storage/file/fd.c:878
-#: storage/file/fd.c:996 storage/file/fd.c:1609 storage/ipc/procarray.c:907
+#: ../common/psprintf.c:179 ../port/path.c:600 ../port/path.c:638
+#: ../port/path.c:655 access/transam/xlog.c:6066 lib/stringinfo.c:258
+#: libpq/auth.c:823 libpq/auth.c:1186 libpq/auth.c:1254 libpq/auth.c:1665
+#: postmaster/bgworker.c:309 postmaster/bgworker.c:821
+#: postmaster/postmaster.c:2333 postmaster/postmaster.c:2364
+#: postmaster/postmaster.c:3883 postmaster/postmaster.c:4573
+#: postmaster/postmaster.c:4648 postmaster/postmaster.c:5314
+#: postmaster/postmaster.c:5608 replication/logical/logical.c:168
+#: storage/buffer/localbuf.c:396 storage/file/fd.c:595 storage/file/fd.c:1023
+#: storage/file/fd.c:1141 storage/file/fd.c:1793 storage/ipc/procarray.c:907
 #: storage/ipc/procarray.c:1393 storage/ipc/procarray.c:1400
-#: storage/ipc/procarray.c:1793 storage/ipc/procarray.c:2377
-#: utils/adt/formatting.c:1523 utils/adt/formatting.c:1643
-#: utils/adt/formatting.c:1764 utils/adt/regexp.c:219 utils/adt/varlena.c:4199
-#: utils/adt/varlena.c:4220 utils/fmgr/dfmgr.c:220 utils/hash/dynahash.c:411
+#: storage/ipc/procarray.c:1793 storage/ipc/procarray.c:2385
+#: utils/adt/formatting.c:1522 utils/adt/formatting.c:1642
+#: utils/adt/formatting.c:1763 utils/adt/pg_locale.c:463
+#: utils/adt/pg_locale.c:647 utils/adt/regexp.c:219 utils/adt/varlena.c:4212
+#: utils/adt/varlena.c:4233 utils/fmgr/dfmgr.c:216 utils/hash/dynahash.c:411
 #: utils/hash/dynahash.c:488 utils/hash/dynahash.c:1002 utils/mb/mbutils.c:376
-#: utils/mb/mbutils.c:709 utils/misc/guc.c:3702 utils/misc/guc.c:3718
-#: utils/misc/guc.c:3731 utils/misc/guc.c:6665 utils/misc/tzparser.c:470
-#: utils/mmgr/aset.c:504 utils/mmgr/mcxt.c:688 utils/mmgr/mcxt.c:723
+#: utils/mb/mbutils.c:709 utils/misc/guc.c:3723 utils/misc/guc.c:3739
+#: utils/misc/guc.c:3752 utils/misc/guc.c:6686 utils/misc/tzparser.c:470
+#: utils/mmgr/aset.c:505 utils/mmgr/mcxt.c:688 utils/mmgr/mcxt.c:723
 #: utils/mmgr/mcxt.c:760 utils/mmgr/mcxt.c:797 utils/mmgr/mcxt.c:831
-#: utils/mmgr/mcxt.c:860 utils/mmgr/mcxt.c:894 utils/mmgr/mcxt.c:974
-#: utils/mmgr/mcxt.c:1007 utils/mmgr/mcxt.c:1054
+#: utils/mmgr/mcxt.c:860 utils/mmgr/mcxt.c:894 utils/mmgr/mcxt.c:976
+#: utils/mmgr/mcxt.c:1010 utils/mmgr/mcxt.c:1059
 #, c-format
 msgid "out of memory"
 msgstr "memoria agotada"
@@ -216,7 +217,7 @@
 msgid "could not look up effective user ID %ld: %s"
 msgstr "no se pudo encontrar el ID de usuario efectivo %ld: %s"
 
-#: ../common/username.c:47 libpq/auth.c:1606
+#: ../common/username.c:47 libpq/auth.c:1612
 msgid "user does not exist"
 msgstr "usuario no existe"
 
@@ -260,38 +261,38 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
 
-#: ../port/chklocale.c:259
+#: ../port/chklocale.c:294
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
 msgstr "no se pudo determinar la codificación para el codeset «%s»"
 
-#: ../port/chklocale.c:260 ../port/chklocale.c:389
-#: postmaster/postmaster.c:4819
+#: ../port/chklocale.c:295 ../port/chklocale.c:424
+#: postmaster/postmaster.c:4852
 #, c-format
 msgid "Please report this to <pgsql-bugs@postgresql.org>."
 msgstr "Por favor reporte esto a <pgsql-bugs@postgresql.org>."
 
-#: ../port/chklocale.c:381 ../port/chklocale.c:387
+#: ../port/chklocale.c:416 ../port/chklocale.c:422
 #, 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/dirmod.c:216
+#: ../port/dirmod.c:218
 #, c-format
 msgid "could not set junction for \"%s\": %s"
 msgstr "no se pudo definir un junction para «%s»: %s"
 
-#: ../port/dirmod.c:219
+#: ../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "no se pudo definir un junction para «%s»: %s\n"
 
-#: ../port/dirmod.c:291
+#: ../port/dirmod.c:295
 #, c-format
 msgid "could not get junction for \"%s\": %s"
 msgstr "no se pudo obtener junction para «%s»: %s"
 
-#: ../port/dirmod.c:294
+#: ../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "no se pudo obtener junction para «%s»: %s\n"
@@ -319,7 +320,7 @@
 msgid "You might have antivirus, backup, or similar software interfering with the database system."
 msgstr "Es posible que tenga antivirus, sistema de respaldos, o software similar interfiriendo con el sistema de bases de datos."
 
-#: ../port/path.c:620
+#: ../port/path.c:624
 #, c-format
 msgid "could not get current working directory: %s\n"
 msgstr "no se pudo obtener el directorio de trabajo actual: %s\n"
@@ -329,25 +330,26 @@
 msgid "unrecognized error %d"
 msgstr "código de error no reconocido: %d"
 
-#: ../port/win32error.c:189
+#: access/brin/brin.c:814
 #, c-format
-msgid "mapped win32 error code %lu to %d"
-msgstr "código de error win32 %lu mapeado a %d"
+msgid "\"%s\" is not a BRIN index"
+msgstr "«%s» no es un índice BRIN"
 
-#: ../port/win32error.c:201
+#: access/brin/brin.c:830
 #, c-format
-msgid "unrecognized win32 error code: %lu"
-msgstr "código de error win32 no reconocido: %lu"
+msgid "could not open parent table of index %s"
+msgstr "no se pudo abrir la tabla padre del índice %s"
 
-#: access/brin/brin_pageops.c:647 access/brin/brin_pageops.c:805
-#, fuzzy, c-format
+#: access/brin/brin_pageops.c:76 access/brin/brin_pageops.c:362
+#: access/brin/brin_pageops.c:828
+#, c-format
 msgid "index row size %lu exceeds maximum %lu for index \"%s\""
-msgstr "el tamaño de fila de índice %zu excede el máximo %zu para el índice «%s»"
+msgstr "el tamaño de fila de índice %lu excede el máximo %lu para el índice «%s»"
 
-#: access/brin/brin_revmap.c:449
+#: access/brin/brin_revmap.c:453
 #, c-format
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
-msgstr ""
+msgstr "tipo de página 0x%04X inesperado en el índice BRIN «%s» bloque %u"
 
 #: access/common/heaptuple.c:708 access/common/heaptuple.c:1450
 #, c-format
@@ -364,7 +366,7 @@
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "fila de índice requiere %zu bytes, tamaño máximo es %zu"
 
-#: access/common/printtup.c:294 tcop/fastpath.c:182 tcop/fastpath.c:544
+#: access/common/printtup.c:294 tcop/fastpath.c:182 tcop/fastpath.c:532
 #: tcop/postgres.c:1730
 #, c-format
 msgid "unsupported format code: %d"
@@ -435,34 +437,34 @@
 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)."
 
-#: access/common/tupconvert.c:241
+#: access/common/tupconvert.c:314
 #, 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:253
+#: access/common/tupconvert.c:326
 #, 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/common/tupdesc.c:635 parser/parse_relation.c:1514
+#: access/common/tupdesc.c:635 parser/parse_relation.c:1518
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "la columna «%s» no puede ser declarada SETOF"
 
 #: access/gin/ginentrypage.c:109 access/gist/gist.c:1289
-#: access/nbtree/nbtinsert.c:567 access/nbtree/nbtsort.c:488
+#: access/nbtree/nbtinsert.c:575 access/nbtree/nbtsort.c:488
 #: access/spgist/spgdoinsert.c:1907
 #, c-format
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
 msgstr "el tamaño de fila de índice %zu excede el máximo %zu para el índice «%s»"
 
-#: access/gin/ginscan.c:410
+#: access/gin/ginscan.c:412
 #, c-format
 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:411
+#: access/gin/ginscan.c:413
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "Para corregir esto, ejecute REINDEX INDEX \"%s\"."
@@ -523,12 +525,12 @@
 msgid "index \"%s\" contains corrupted page at block %u"
 msgstr "el índice «%s» contiene una página corrupta en el bloque %u"
 
-#: access/hash/hashinsert.c:68
+#: access/hash/hashinsert.c:70
 #, c-format
 msgid "index row size %zu exceeds hash maximum %zu"
 msgstr "el tamaño de fila de índice %zu excede el máximo para hash %zu"
 
-#: access/hash/hashinsert.c:70 access/spgist/spgdoinsert.c:1911
+#: access/hash/hashinsert.c:72 access/spgist/spgdoinsert.c:1911
 #: access/spgist/spgutils.c:666
 #, c-format
 msgid "Values larger than a buffer page cannot be indexed."
@@ -555,9 +557,9 @@
 msgstr "el índice «%s» tiene una versión de hash incorrecta"
 
 #: access/heap/heapam.c:1074 access/heap/heapam.c:1126
-#, fuzzy, c-format
+#, c-format
 msgid "cannot access temporary tables during a parallel operation"
-msgstr "no se pueden crear tablas temporales durante la recuperación"
+msgstr "no se pueden acceder tablas temporales durante una operación paralela"
 
 #: access/heap/heapam.c:1243 access/heap/heapam.c:1271
 #: access/heap/heapam.c:1303 catalog/aclchk.c:1733
@@ -566,39 +568,39 @@
 msgstr "«%s» es un índice"
 
 #: access/heap/heapam.c:1248 access/heap/heapam.c:1276
-#: access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:8925
-#: commands/tablecmds.c:11925
+#: access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:9052
+#: commands/tablecmds.c:12153
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "«%s» es un tipo compuesto"
 
-#: access/heap/heapam.c:2339
-#, fuzzy, c-format
+#: access/heap/heapam.c:2344
+#, c-format
 msgid "cannot insert tuples during a parallel operation"
-msgstr "no se pueden insertar múltiples órdenes en una sentencia preparada"
+msgstr "no se pueden insertar tuplas durante una operación paralela"
 
-#: access/heap/heapam.c:2760
-#, fuzzy, c-format
+#: access/heap/heapam.c:2794
+#, c-format
 msgid "cannot delete tuples during a parallel operation"
-msgstr "no se puede ejecutar %s durante la recuperación"
+msgstr "no se pueden eliminar tuplas durante una operación paralela"
 
-#: access/heap/heapam.c:2806
+#: access/heap/heapam.c:2840
 #, c-format
 msgid "attempted to delete invisible tuple"
-msgstr ""
+msgstr "se intentó eliminar una tupla invisible"
 
-#: access/heap/heapam.c:3228 access/heap/heapam.c:5779
-#, fuzzy, c-format
+#: access/heap/heapam.c:3266 access/heap/heapam.c:5906
+#, c-format
 msgid "cannot update tuples during a parallel operation"
-msgstr "no se puede ejecutar %s durante la recuperación"
+msgstr "no se pueden actualizar tuplas durante una operación paralela"
 
-#: access/heap/heapam.c:3350
+#: access/heap/heapam.c:3388
 #, c-format
 msgid "attempted to update invisible tuple"
-msgstr ""
+msgstr "se intentó actualizar una tupla invisible"
 
-#: access/heap/heapam.c:4601 access/heap/heapam.c:4639
-#: access/heap/heapam.c:4862 executor/execMain.c:2279
+#: access/heap/heapam.c:4703 access/heap/heapam.c:4741
+#: access/heap/heapam.c:4964 executor/execMain.c:2279
 #, c-format
 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»"
@@ -615,23 +617,22 @@
 
 #: access/heap/rewriteheap.c:965 access/heap/rewriteheap.c:1177
 #: access/heap/rewriteheap.c:1274 access/transam/timeline.c:407
-#: access/transam/timeline.c:497 access/transam/xlog.c:3011
-#: access/transam/xlog.c:3173 replication/logical/origin.c:613
-#: replication/logical/snapbuild.c:1592 replication/slot.c:1026
-#: replication/slot.c:1115 storage/file/fd.c:459 storage/file/fd.c:2718
-#: storage/smgr/md.c:982 storage/smgr/md.c:1213 storage/smgr/md.c:1386
-#: utils/misc/guc.c:6687
+#: access/transam/timeline.c:483 access/transam/xlog.c:3040
+#: access/transam/xlog.c:3202 replication/logical/snapbuild.c:1588
+#: replication/slot.c:1053 replication/slot.c:1142 storage/file/fd.c:490
+#: storage/file/fd.c:2924 storage/smgr/md.c:983 storage/smgr/md.c:1214
+#: storage/smgr/md.c:1387 utils/misc/guc.c:6708
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
 
 #: access/heap/rewriteheap.c:1020 access/heap/rewriteheap.c:1140
-#: access/transam/timeline.c:315 access/transam/timeline.c:475
-#: access/transam/xlog.c:2967 access/transam/xlog.c:3116
-#: access/transam/xlog.c:10096 access/transam/xlog.c:10132
-#: access/transam/xlog.c:10454 postmaster/postmaster.c:4297
-#: replication/logical/origin.c:542 replication/slot.c:983
-#: storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1071
+#: access/transam/timeline.c:315 access/transam/timeline.c:461
+#: access/transam/xlog.c:2996 access/transam/xlog.c:3145
+#: access/transam/xlog.c:10147 access/transam/xlog.c:10183
+#: access/transam/xlog.c:10561 postmaster/postmaster.c:4348
+#: replication/logical/origin.c:542 replication/slot.c:1010
+#: storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1123
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "no se pudo crear archivo «%s»: %m"
@@ -641,86 +642,86 @@
 msgid "could not truncate file \"%s\" to %u: %m"
 msgstr "no se pudo truncar el archivo «%s» a %u: %m"
 
-#: access/heap/rewriteheap.c:1156 replication/walsender.c:465
-#: storage/smgr/md.c:1798
+#: access/heap/rewriteheap.c:1156 replication/walsender.c:479
+#: storage/smgr/md.c:1799
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "no se pudo posicionar (seek) al fin del archivo «%s»: %m"
 
 #: access/heap/rewriteheap.c:1167 access/transam/timeline.c:367
-#: access/transam/timeline.c:401 access/transam/timeline.c:491
-#: access/transam/xlog.c:3002 access/transam/xlog.c:3166
-#: postmaster/postmaster.c:4307 postmaster/postmaster.c:4317
-#: replication/logical/origin.c:551 replication/logical/origin.c:587
-#: replication/logical/origin.c:603 replication/logical/snapbuild.c:1576
-#: replication/slot.c:1012 storage/file/copydir.c:187
-#: utils/init/miscinit.c:1183 utils/init/miscinit.c:1192
-#: utils/init/miscinit.c:1199 utils/misc/guc.c:6648 utils/misc/guc.c:6679
-#: utils/misc/guc.c:8466 utils/misc/guc.c:8480 utils/time/snapmgr.c:1076
-#: utils/time/snapmgr.c:1083
+#: access/transam/timeline.c:401 access/transam/timeline.c:477
+#: access/transam/xlog.c:3031 access/transam/xlog.c:3195
+#: postmaster/postmaster.c:4358 postmaster/postmaster.c:4368
+#: replication/logical/origin.c:551 replication/logical/origin.c:590
+#: replication/logical/origin.c:606 replication/logical/snapbuild.c:1572
+#: replication/slot.c:1039 storage/file/copydir.c:187
+#: utils/init/miscinit.c:1209 utils/init/miscinit.c:1218
+#: utils/init/miscinit.c:1225 utils/misc/guc.c:6669 utils/misc/guc.c:6700
+#: utils/misc/guc.c:8519 utils/misc/guc.c:8533 utils/time/snapmgr.c:1128
+#: utils/time/snapmgr.c:1135
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "no se pudo escribir a archivo «%s»: %m"
 
-#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10321
+#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10399
 #: access/transam/xlogarchive.c:114 access/transam/xlogarchive.c:468
-#: replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2421
-#: replication/logical/reorderbuffer.c:2478
-#: replication/logical/snapbuild.c:1520 replication/logical/snapbuild.c:1895
-#: replication/slot.c:1089 storage/ipc/dsm.c:326 storage/smgr/md.c:420
-#: storage/smgr/md.c:469 storage/smgr/md.c:1333
+#: replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2497
+#: replication/logical/reorderbuffer.c:2554
+#: replication/logical/snapbuild.c:1521 replication/logical/snapbuild.c:1884
+#: replication/slot.c:1116 storage/ipc/dsm.c:326 storage/smgr/md.c:420
+#: storage/smgr/md.c:469 storage/smgr/md.c:1334
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "no se pudo eliminar el archivo «%s»: %m"
 
 #: access/heap/rewriteheap.c:1264 access/transam/timeline.c:111
 #: access/transam/timeline.c:236 access/transam/timeline.c:334
-#: access/transam/xlog.c:2943 access/transam/xlog.c:3060
-#: access/transam/xlog.c:3101 access/transam/xlog.c:3392
-#: access/transam/xlog.c:3470 replication/basebackup.c:398
-#: replication/basebackup.c:1158 replication/logical/logicalfuncs.c:154
-#: replication/logical/origin.c:677 replication/logical/reorderbuffer.c:2038
-#: replication/logical/reorderbuffer.c:2242
-#: replication/logical/reorderbuffer.c:2869
-#: replication/logical/snapbuild.c:1569 replication/logical/snapbuild.c:1653
-#: replication/slot.c:1104 replication/walsender.c:458
-#: replication/walsender.c:2080 storage/file/copydir.c:155
-#: storage/file/fd.c:445 storage/file/fd.c:2653 storage/file/fd.c:2705
-#: storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1854
-#: utils/init/miscinit.c:1118 utils/init/miscinit.c:1247 utils/misc/guc.c:6891
-#: utils/misc/guc.c:6923
+#: access/transam/xlog.c:2972 access/transam/xlog.c:3089
+#: access/transam/xlog.c:3130 access/transam/xlog.c:3403
+#: access/transam/xlog.c:3481 replication/basebackup.c:400
+#: replication/basebackup.c:1147 replication/logical/logicalfuncs.c:154
+#: replication/logical/origin.c:661 replication/logical/reorderbuffer.c:2075
+#: replication/logical/reorderbuffer.c:2291
+#: replication/logical/reorderbuffer.c:2946
+#: replication/logical/snapbuild.c:1565 replication/logical/snapbuild.c:1649
+#: replication/slot.c:1131 replication/walsender.c:472
+#: replication/walsender.c:2099 storage/file/copydir.c:155
+#: storage/file/fd.c:473 storage/file/fd.c:2837 storage/file/fd.c:2903
+#: storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1863
+#: utils/init/miscinit.c:1144 utils/init/miscinit.c:1265
+#: utils/init/miscinit.c:1343 utils/misc/guc.c:6928 utils/misc/guc.c:6961
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
 #: access/index/indexam.c:172 catalog/objectaddress.c:1144
-#: commands/indexcmds.c:1754 commands/tablecmds.c:238
-#: commands/tablecmds.c:11916
+#: commands/indexcmds.c:1755 commands/tablecmds.c:240
+#: commands/tablecmds.c:12144
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "«%s» no es un índice"
 
-#: access/nbtree/nbtinsert.c:419
+#: access/nbtree/nbtinsert.c:427
 #, c-format
 msgid "duplicate key value violates unique constraint \"%s\""
 msgstr "llave duplicada viola restricción de unicidad «%s»"
 
-#: access/nbtree/nbtinsert.c:421
+#: access/nbtree/nbtinsert.c:429
 #, c-format
 msgid "Key %s already exists."
 msgstr "Ya existe la llave %s."
 
-#: access/nbtree/nbtinsert.c:488
+#: access/nbtree/nbtinsert.c:496
 #, 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:490
+#: access/nbtree/nbtinsert.c:498
 #, c-format
 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:570 access/nbtree/nbtsort.c:491
+#: access/nbtree/nbtinsert.c:578 access/nbtree/nbtsort.c:491
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -730,7 +731,7 @@
 "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:168 access/nbtree/nbtpage.c:371
-#: access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1665
+#: access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1667
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "el índice «%s» no es un btree"
@@ -757,25 +758,29 @@
 msgstr "el tamaño de tupla interna SP-GiST %zu excede el máximo %zu"
 
 #: access/tablesample/bernoulli.c:152 access/tablesample/system.c:156
-#, fuzzy, c-format
+#, c-format
 msgid "sample percentage must be between 0 and 100"
-msgstr "la precisión de timestamp(%d) debe estar entre %d y %d"
+msgstr "el porcentaje de muestreo debe estar entre 0 y 100"
+
+#: access/transam/commit_ts.c:294
+#, c-format
+msgid "cannot retrieve commit timestamp for transaction %u"
+msgstr "no se puede obtener el timestamp de compromiso de la transacción %u"
 
-#: access/transam/commit_ts.c:290 access/transam/commit_ts.c:373
-#, fuzzy, c-format
+#: access/transam/commit_ts.c:392
+#, c-format
 msgid "could not get commit timestamp data"
-msgstr "no se pudo determinar el tipo de dato de entrada"
+msgstr "no se pudo obtener datos de compromiso de transacción"
 
-#: access/transam/commit_ts.c:291 access/transam/commit_ts.c:374
-#: libpq/hba.c:1424
-#, fuzzy, c-format
-msgid "Make sure the configuration parameter \"%s\" is set."
-msgstr "Asegúrese que el parámetro de configuración «ssl_ca_file» esté definido."
+#: access/transam/commit_ts.c:394
+#, c-format
+msgid "Make sure the configuration parameter \"%s\" is set on the master server."
+msgstr "Asegúrese que el parámetro de configuración «%s» esté definido en el servidor maestro."
 
-#: access/transam/commit_ts.c:298
-#, fuzzy, c-format
-msgid "cannot retrieve commit timestamp for transaction %u"
-msgstr "no se puede heredar de la tabla temporal «%s»"
+#: access/transam/commit_ts.c:396 libpq/hba.c:1424
+#, c-format
+msgid "Make sure the configuration parameter \"%s\" is set."
+msgstr "Asegúrese que el parámetro de configuración «%s» esté definido."
 
 #: access/transam/multixact.c:1008
 #, c-format
@@ -797,14 +802,14 @@
 msgid "database is not accepting commands that generate new MultiXactIds to avoid wraparound data loss in database with OID %u"
 msgstr "la base de datos no está aceptando órdenes que generen nuevos MultiXactIds para evitar pérdida de datos debido al problema del reciclaje de transacciones en la base con OID %u"
 
-#: access/transam/multixact.c:1036 access/transam/multixact.c:2317
+#: access/transam/multixact.c:1036 access/transam/multixact.c:2318
 #, c-format
 msgid "database \"%s\" must be vacuumed before %u more MultiXactId is used"
 msgid_plural "database \"%s\" must be vacuumed before %u more MultiXactIds are used"
 msgstr[0] "base de datos «%s» debe ser limpiada antes de que %u más MultiXactId sea usado"
 msgstr[1] "base de datos «%s» debe ser limpiada dentro de que %u más MultiXactIds sean usados"
 
-#: access/transam/multixact.c:1045 access/transam/multixact.c:2326
+#: access/transam/multixact.c:1045 access/transam/multixact.c:2327
 #, c-format
 msgid "database with OID %u must be vacuumed before %u more MultiXactId is used"
 msgid_plural "database with OID %u must be vacuumed before %u more MultiXactIds are used"
@@ -820,8 +825,8 @@
 #, c-format
 msgid "This command would create a multixact with %u members, but the remaining space is only enough for %u member."
 msgid_plural "This command would create a multixact with %u members, but the remaining space is only enough for %u members."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Esta orden crearía un multixact con %u miembros, pero sólo queda espacio para %u miembro."
+msgstr[1] "Esta orden crearía un multixact con %u miembros, pero sólo queda espacio para %u miembros."
 
 #: access/transam/multixact.c:1112
 #, c-format
@@ -830,30 +835,32 @@
 
 #: access/transam/multixact.c:1143
 #, c-format
-msgid "database with OID %u must be vacuumed before %d more multixact members are used"
-msgstr "base de datos con OID %u debe ser limpiada antes de que %d más miembros de multixact sean usados"
+msgid "database with OID %u must be vacuumed before %d more multixact member is used"
+msgid_plural "database with OID %u must be vacuumed before %d more multixact members are used"
+msgstr[0] "base de datos con OID %u debe ser limpiada antes de que %d miembro más de multixact sea usado"
+msgstr[1] "base de datos con OID %u debe ser limpiada antes de que %d más miembros de multixact sean usados"
 
-#: access/transam/multixact.c:1146
+#: access/transam/multixact.c:1148
 #, c-format
 msgid "Execute a database-wide VACUUM in that database with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings."
 msgstr "Ejecute un VACUUM de la base completa en esa base de datos con vacuum_multixact_freeze_min_age y vacuum_multixact_freeze_table_age reducidos."
 
-#: access/transam/multixact.c:1284
+#: access/transam/multixact.c:1285
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "el MultiXactId %u ya no existe -- aparente problema por reciclaje"
 
-#: access/transam/multixact.c:1292
+#: access/transam/multixact.c:1293
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "el MultiXactId %u no se ha creado aún -- aparente problema por reciclaje"
 
-#: access/transam/multixact.c:2267
+#: access/transam/multixact.c:2268
 #, c-format
 msgid "MultiXactId wrap limit is %u, limited by database with OID %u"
 msgstr "el límite para el reciclaje de MultiXactId es %u, limitado por base de datos con OID %u"
 
-#: access/transam/multixact.c:2322 access/transam/multixact.c:2331
+#: access/transam/multixact.c:2323 access/transam/multixact.c:2332
 #: access/transam/varsup.c:146 access/transam/varsup.c:153
 #: access/transam/varsup.c:384 access/transam/varsup.c:391
 #, c-format
@@ -864,70 +871,65 @@
 "Para evitar que la base de datos se desactive, ejecute VACUUM en esa base de datos.\n"
 "Puede que además necesite comprometer o abortar transacciones preparadas antiguas."
 
-#: access/transam/multixact.c:2599
+#: access/transam/multixact.c:2602
 #, c-format
 msgid "oldest MultiXactId member is at offset %u"
 msgstr "el miembro de multixact más antiguo está en la posición %u"
 
-#: access/transam/multixact.c:2603
+#: access/transam/multixact.c:2606
 #, c-format
 msgid "MultiXact member wraparound protections are disabled because oldest checkpointed MultiXact %u does not exist on disk"
 msgstr "las protecciones de reciclaje de miembros de multixact están inhabilitadas porque el multixact más antiguo %u en checkpoint no existe en disco"
 
-#: access/transam/multixact.c:2625
+#: access/transam/multixact.c:2628
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "las protecciones de reciclaje de miembros de multixact están habilitadas"
 
-#: access/transam/multixact.c:2627
+#: access/transam/multixact.c:2630
 #, c-format
 msgid "MultiXact member stop limit is now %u based on MultiXact %u"
 msgstr "el límite de detención de miembros de multixact es ahora %u basado en el multixact %u"
 
-#: access/transam/multixact.c:3005
+#: access/transam/multixact.c:3010
 #, c-format
 msgid "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
 msgstr "multixact más antiguo %u no encontrado, multixact más antiguo es %u, saltando el truncado"
 
-#: access/transam/multixact.c:3023
+#: access/transam/multixact.c:3028
 #, c-format
 msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
-msgstr ""
+msgstr "no se puede truncar hasta el MultiXact %u porque no existe en disco, omitiendo el truncado"
 
-#: access/transam/multixact.c:3349
+#: access/transam/multixact.c:3354
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "el MultiXactId no es válido: %u"
 
-#: access/transam/parallel.c:577
-#, fuzzy, c-format
+#: access/transam/parallel.c:582
+#, c-format
 msgid "postmaster exited during a parallel transaction"
-msgstr "no se puede ejecutar %s en una transacción de sólo lectura"
+msgstr "postmaster terminó durante una transacción paralela"
 
-#: access/transam/parallel.c:668
-#, fuzzy, c-format
+#: access/transam/parallel.c:702
+#, c-format
 msgid "lost connection to parallel worker"
-msgstr "se ha perdido la conexión al cliente"
-
-#: access/transam/parallel.c:838
-#, fuzzy, c-format
-msgid "unable to map dynamic shared memory segment"
-msgstr "demasiados segmentos de memoria compartida dinámica"
+msgstr "se ha perdido la conexión al proceso trabajador paralelo"
 
-#: access/transam/parallel.c:843
-#, fuzzy, c-format
-msgid "bad magic number in dynamic shared memory segment"
-msgstr "demasiados segmentos de memoria compartida dinámica"
+#: access/transam/parallel.c:883
+#, c-format
+msgid "could not map dynamic shared memory segment"
+msgstr "no se pudo mapear el segmento de memoria compartida dinámica"
 
-#: access/transam/parallel.c:856
+#: access/transam/parallel.c:888
 #, c-format
-msgid "too many parallel workers already attached"
-msgstr ""
+msgid "invalid magic number in dynamic shared memory segment"
+msgstr "número mágico no válido en segmento de memoria compartida dinámica"
 
-#: access/transam/parallel.c:996
+#: access/transam/parallel.c:1039
 #, c-format
-msgid "parallel worker, pid %d"
-msgstr ""
+msgid "parallel worker, PID %d"
+msgstr "proceso trabajador paralelo, PID %d"
 
 #: access/transam/slru.c:652
 #, c-format
@@ -1016,45 +1018,28 @@
 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/timeline.c:346 access/transam/xlog.c:3144
-#: access/transam/xlog.c:10303 access/transam/xlog.c:10316
-#: access/transam/xlog.c:10679 access/transam/xlog.c:10722
-#: access/transam/xlog.c:10761 access/transam/xlog.c:10804
+#: access/transam/timeline.c:346 access/transam/xlog.c:3173
+#: access/transam/xlog.c:10381 access/transam/xlog.c:10394
+#: access/transam/xlog.c:10786 access/transam/xlog.c:10829
+#: access/transam/xlog.c:10868 access/transam/xlog.c:10911
 #: access/transam/xlogfuncs.c:478 access/transam/xlogfuncs.c:497
-#: commands/extension.c:3047 replication/logical/origin.c:684
-#: replication/logical/origin.c:714 replication/logical/reorderbuffer.c:2887
-#: replication/walsender.c:483 storage/file/copydir.c:176
+#: commands/extension.c:3050 replication/logical/origin.c:668
+#: replication/logical/origin.c:698 replication/logical/reorderbuffer.c:2964
+#: replication/walsender.c:497 storage/file/copydir.c:176
 #: utils/adt/genfile.c:151
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "no se pudo leer el archivo «%s»: %m"
 
-#: access/transam/timeline.c:412 access/transam/timeline.c:502
-#: access/transam/xlog.c:3017 access/transam/xlog.c:3178
-#: access/transam/xlogfuncs.c:503 commands/copy.c:1631
+#: access/transam/timeline.c:412 access/transam/timeline.c:488
+#: access/transam/xlog.c:3046 access/transam/xlog.c:3207
+#: access/transam/xlogfuncs.c:503 commands/copy.c:1671
 #: storage/file/copydir.c:201
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo «%s»: %m"
 
-#: access/transam/timeline.c:429 access/transam/timeline.c:519
-#, 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/timeline.c:436 access/transam/timeline.c:526
-#: access/transam/xlog.c:5299 access/transam/xlog.c:6501
-#: access/transam/xlog.c:6518 access/transam/xlog.c:7300
-#: access/transam/xlogarchive.c:458 access/transam/xlogarchive.c:476
-#: access/transam/xlogarchive.c:586 postmaster/pgarch.c:734
-#: replication/logical/origin.c:624 replication/logical/snapbuild.c:1606
-#: replication/slot.c:470 replication/slot.c:926 replication/slot.c:1038
-#: utils/misc/guc.c:6947 utils/time/snapmgr.c:1094
-#, 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/timeline.c:598
+#: access/transam/timeline.c:570
 #, c-format
 msgid "requested timeline %u is not in this server's history"
 msgstr "el timeline %u solicitado no está en la historia de este servidor"
@@ -1257,976 +1242,941 @@
 msgid "maximum number of committed subtransactions (%d) exceeded"
 msgstr "se superó el número máximo de subtransacciones comprometidas (%d)"
 
-#: access/transam/xact.c:2247
+#: access/transam/xact.c:2249
 #, c-format
 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"
 
-#: access/transam/xact.c:2257
+#: access/transam/xact.c:2259
 #, c-format
 msgid "cannot PREPARE a transaction that has exported snapshots"
 msgstr "no se puede hacer PREPARE de una transacción que ha exportado snapshots"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3135
+#: access/transam/xact.c:3137
 #, 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:3145
+#: access/transam/xact.c:3147
 #, 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:3155
+#: access/transam/xact.c:3157
 #, c-format
 msgid "%s cannot be executed from a function or multi-command string"
 msgstr "la orden %s no puede ser ejecutada desde una función o una línea con múltiples órdenes"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3226
+#: access/transam/xact.c:3228
 #, 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:3410
+#: access/transam/xact.c:3412
 #, c-format
 msgid "there is already a transaction in progress"
 msgstr "ya hay una transacción en curso"
 
-#: access/transam/xact.c:3578 access/transam/xact.c:3681
+#: access/transam/xact.c:3580 access/transam/xact.c:3683
 #, c-format
 msgid "there is no transaction in progress"
 msgstr "no hay una transacción en curso"
 
-#: access/transam/xact.c:3589
+#: access/transam/xact.c:3591
 #, c-format
 msgid "cannot commit during a parallel operation"
-msgstr ""
+msgstr "no se puede comprometer una transacción durante una operación paralela"
 
-#: access/transam/xact.c:3692
+#: access/transam/xact.c:3694
 #, c-format
 msgid "cannot abort during a parallel operation"
-msgstr ""
+msgstr "no se puede abortar durante una operación paralela"
 
-#: access/transam/xact.c:3734
+#: access/transam/xact.c:3736
 #, c-format
 msgid "cannot define savepoints during a parallel operation"
-msgstr ""
+msgstr "no se pueden definir savepoints durante una operación paralela"
 
-#: access/transam/xact.c:3801
-#, fuzzy, c-format
+#: access/transam/xact.c:3803
+#, c-format
 msgid "cannot release savepoints during a parallel operation"
-msgstr "no se pueden crear tablas temporales durante la recuperación"
+msgstr "no se pueden liberar savepoints durante una operación paralela"
 
-#: access/transam/xact.c:3812 access/transam/xact.c:3864
-#: access/transam/xact.c:3870 access/transam/xact.c:3926
-#: access/transam/xact.c:3976 access/transam/xact.c:3982
+#: access/transam/xact.c:3814 access/transam/xact.c:3866
+#: access/transam/xact.c:3872 access/transam/xact.c:3928
+#: access/transam/xact.c:3978 access/transam/xact.c:3984
 #, c-format
 msgid "no such savepoint"
 msgstr "no hay un savepoint con ese nombre"
 
-#: access/transam/xact.c:3914
+#: access/transam/xact.c:3916
 #, c-format
 msgid "cannot rollback to savepoints during a parallel operation"
-msgstr ""
+msgstr "no se puede hacer rollback a un savepoint durante una operación paralela"
 
-#: access/transam/xact.c:4042
-#, fuzzy, c-format
+#: access/transam/xact.c:4044
+#, c-format
 msgid "cannot start subtransactions during a parallel operation"
-msgstr "no se pueden tener más de 2^32-1 subtransacciones en una transacción"
+msgstr "no se pueden iniciar subtransacciones durante una operación paralela"
 
-#: access/transam/xact.c:4109
-#, fuzzy, c-format
+#: access/transam/xact.c:4111
+#, c-format
 msgid "cannot commit subtransactions during a parallel operation"
-msgstr "no se pueden tener más de 2^32-1 subtransacciones en una transacción"
+msgstr "no se pueden comprometer subtransacciones durante una operación paralela"
 
-#: access/transam/xact.c:4715
+#: access/transam/xact.c:4717
 #, c-format
 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:2270
+#: access/transam/xlog.c:2299
 #, c-format
 msgid "could not seek in log file %s to offset %u: %m"
 msgstr "no se pudo posicionar (seek) en el archivo «%s» a la posición %u: %m"
 
-#: access/transam/xlog.c:2290
+#: access/transam/xlog.c:2319
 #, c-format
 msgid "could not write to log file %s at offset %u, length %zu: %m"
 msgstr "no se pudo escribir archivo de registro %s en la posición %u, largo %zu: %m"
 
-#: access/transam/xlog.c:2553
+#: access/transam/xlog.c:2582
 #, c-format
 msgid "updated min recovery point to %X/%X on timeline %u"
 msgstr "el punto mínimo de recuperación fue actualizado a %X/%X en el timeline %u"
 
-#: access/transam/xlog.c:3148
+#: access/transam/xlog.c:3177
 #, c-format
 msgid "not enough data in file \"%s\""
 msgstr "los datos del archivo «%s» son insuficientes"
 
-#: access/transam/xlog.c:3267
-#, c-format
-msgid "could not link file \"%s\" to \"%s\" (initialization of log file): %m"
-msgstr "no se pudo enlazar (link) el archivo «%s» a «%s» (inicialización de archivo de registro): %m"
-
-#: access/transam/xlog.c:3279
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\" (initialization of log file): %m"
-msgstr "no se pudo renombrar archivo de «%s» a «%s» (inicialización de archivo de registro): %m"
-
-#: access/transam/xlog.c:3307
+#: access/transam/xlog.c:3318
 #, c-format
 msgid "could not open transaction log file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de registro de transacciones «%s»: %m"
 
-#: access/transam/xlog.c:3496 access/transam/xlog.c:5269
+#: access/transam/xlog.c:3507 access/transam/xlog.c:5297
 #, c-format
 msgid "could not close log file %s: %m"
 msgstr "no se pudo cerrar el archivo de registro %s: %m"
 
-#: access/transam/xlog.c:3553 replication/logical/logicalfuncs.c:149
-#: replication/walsender.c:2075
+#: access/transam/xlog.c:3564 replication/logical/logicalfuncs.c:149
+#: replication/walsender.c:2094
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "el segmento de WAL solicitado %s ya ha sido eliminado"
 
-#: access/transam/xlog.c:3613 access/transam/xlog.c:3688
-#: access/transam/xlog.c:3886
+#: access/transam/xlog.c:3624 access/transam/xlog.c:3699
+#: access/transam/xlog.c:3897
 #, 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:3769
+#: access/transam/xlog.c:3780
 #, c-format
 msgid "recycled transaction log file \"%s\""
 msgstr "el archivo de registro de transacciones «%s» ha sido reciclado"
 
-#: access/transam/xlog.c:3781
+#: access/transam/xlog.c:3792
 #, c-format
 msgid "removing transaction log file \"%s\""
 msgstr "eliminando archivo de registro de transacciones «%s»"
 
-#: access/transam/xlog.c:3801
+#: access/transam/xlog.c:3812
 #, 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:3813
+#: access/transam/xlog.c:3824
 #, 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:3846 access/transam/xlog.c:3856
+#: access/transam/xlog.c:3857 access/transam/xlog.c:3867
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "no existe el directorio WAL «%s»"
 
-#: access/transam/xlog.c:3862
+#: access/transam/xlog.c:3873
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "creando el directorio WAL faltante «%s»"
 
-#: access/transam/xlog.c:3865
+#: access/transam/xlog.c:3876
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "no se pudo crear el directorio faltante «%s»: %m"
 
-#: access/transam/xlog.c:3896
+#: access/transam/xlog.c:3907
 #, 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:3977
+#: access/transam/xlog.c:3988
 #, c-format
 msgid "unexpected timeline ID %u in log segment %s, offset %u"
 msgstr "ID de timeline %u inesperado en archivo %s, posición %u"
 
-#: access/transam/xlog.c:4099
+#: access/transam/xlog.c:4110
 #, 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:4113
+#: access/transam/xlog.c:4124
 #, c-format
 msgid "new timeline %u forked off current database system timeline %u before current recovery point %X/%X"
 msgstr "el nuevo timeline %u bifurcó del timeline del sistema actual %u antes del punto re recuperación actual %X/%X"
 
-#: access/transam/xlog.c:4132
+#: access/transam/xlog.c:4143
 #, c-format
 msgid "new target timeline is %u"
 msgstr "el nuevo timeline destino es %u"
 
-#: access/transam/xlog.c:4212
+#: access/transam/xlog.c:4223
 #, c-format
 msgid "could not create control file \"%s\": %m"
 msgstr "no se pudo crear archivo de control «%s»: %m"
 
-#: access/transam/xlog.c:4223 access/transam/xlog.c:4459
+#: access/transam/xlog.c:4234 access/transam/xlog.c:4470
 #, 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:4229 access/transam/xlog.c:4465
+#: access/transam/xlog.c:4240 access/transam/xlog.c:4476
 #, c-format
 msgid "could not fsync control file: %m"
 msgstr "no se pudo sincronizar (fsync) el archivo de control: %m"
 
-#: access/transam/xlog.c:4234 access/transam/xlog.c:4470
+#: access/transam/xlog.c:4245 access/transam/xlog.c:4481
 #, c-format
 msgid "could not close control file: %m"
 msgstr "no se pudo cerrar el archivo de control: %m"
 
-#: access/transam/xlog.c:4252 access/transam/xlog.c:4448
+#: access/transam/xlog.c:4263 access/transam/xlog.c:4459
 #, 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:4258
+#: access/transam/xlog.c:4269
 #, 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:4271 access/transam/xlog.c:4280
-#: access/transam/xlog.c:4304 access/transam/xlog.c:4311
-#: access/transam/xlog.c:4318 access/transam/xlog.c:4323
-#: access/transam/xlog.c:4330 access/transam/xlog.c:4337
-#: access/transam/xlog.c:4344 access/transam/xlog.c:4351
-#: access/transam/xlog.c:4358 access/transam/xlog.c:4365
-#: access/transam/xlog.c:4372 access/transam/xlog.c:4381
-#: access/transam/xlog.c:4388 access/transam/xlog.c:4397
-#: access/transam/xlog.c:4404 access/transam/xlog.c:4413
-#: access/transam/xlog.c:4420 utils/init/miscinit.c:1265
+#: access/transam/xlog.c:4282 access/transam/xlog.c:4291
+#: access/transam/xlog.c:4315 access/transam/xlog.c:4322
+#: access/transam/xlog.c:4329 access/transam/xlog.c:4334
+#: access/transam/xlog.c:4341 access/transam/xlog.c:4348
+#: access/transam/xlog.c:4355 access/transam/xlog.c:4362
+#: access/transam/xlog.c:4369 access/transam/xlog.c:4376
+#: access/transam/xlog.c:4383 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 utils/init/miscinit.c:1361
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "los archivos de base de datos son incompatibles con el servidor"
 
-#: access/transam/xlog.c:4272
+#: access/transam/xlog.c:4283
 #, 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 "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:4276
+#: access/transam/xlog.c:4287
 #, c-format
 msgid "This could be a problem of mismatched byte ordering.  It looks like you need to initdb."
 msgstr "Este puede ser un problema de discordancia en el orden de bytes. Parece que necesitará ejecutar initdb."
 
-#: access/transam/xlog.c:4281
+#: access/transam/xlog.c:4292
 #, c-format
 msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
 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:4284 access/transam/xlog.c:4308
-#: access/transam/xlog.c:4315 access/transam/xlog.c:4320
+#: access/transam/xlog.c:4295 access/transam/xlog.c:4319
+#: access/transam/xlog.c:4326 access/transam/xlog.c:4331
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "Parece que necesita ejecutar initdb."
 
-#: access/transam/xlog.c:4295
+#: access/transam/xlog.c:4306
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "la suma de verificación es incorrecta en el archivo de control"
 
-#: access/transam/xlog.c:4305
+#: access/transam/xlog.c:4316
 #, c-format
 msgid "The database cluster was initialized with CATALOG_VERSION_NO %d, but the server was compiled with CATALOG_VERSION_NO %d."
 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:4312
+#: access/transam/xlog.c:4323
 #, c-format
 msgid "The database cluster was initialized with MAXALIGN %d, but the server was compiled with MAXALIGN %d."
 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:4319
+#: access/transam/xlog.c:4330
 #, c-format
 msgid "The database cluster appears to use a different floating-point number format than the server executable."
 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:4324
+#: access/transam/xlog.c:4335
 #, c-format
 msgid "The database cluster was initialized with BLCKSZ %d, but the server was compiled with BLCKSZ %d."
 msgstr "Los archivos de base de datos fueron inicializados con BLCKSZ %d, pero el servidor fue compilado con BLCKSZ %d."
 
-#: access/transam/xlog.c:4327 access/transam/xlog.c:4334
-#: access/transam/xlog.c:4341 access/transam/xlog.c:4348
-#: access/transam/xlog.c:4355 access/transam/xlog.c:4362
-#: access/transam/xlog.c:4369 access/transam/xlog.c:4376
-#: access/transam/xlog.c:4384 access/transam/xlog.c:4391
-#: access/transam/xlog.c:4400 access/transam/xlog.c:4407
-#: access/transam/xlog.c:4416 access/transam/xlog.c:4423
+#: 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:4387
+#: access/transam/xlog.c:4395 access/transam/xlog.c:4402
+#: access/transam/xlog.c:4411 access/transam/xlog.c:4418
+#: access/transam/xlog.c:4427 access/transam/xlog.c:4434
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr "Parece que necesita recompilar o ejecutar initdb."
 
-#: access/transam/xlog.c:4331
+#: access/transam/xlog.c:4342
 #, c-format
 msgid "The database cluster was initialized with RELSEG_SIZE %d, but the server was compiled with RELSEG_SIZE %d."
 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:4338
+#: access/transam/xlog.c:4349
 #, c-format
 msgid "The database cluster was initialized with XLOG_BLCKSZ %d, but the server was compiled with XLOG_BLCKSZ %d."
 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:4345
+#: access/transam/xlog.c:4356
 #, c-format
 msgid "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server was compiled with XLOG_SEG_SIZE %d."
 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:4352
+#: access/transam/xlog.c:4363
 #, c-format
 msgid "The database cluster was initialized with NAMEDATALEN %d, but the server was compiled with NAMEDATALEN %d."
 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:4359
+#: access/transam/xlog.c:4370
 #, c-format
 msgid "The database cluster was initialized with INDEX_MAX_KEYS %d, but the server was compiled with INDEX_MAX_KEYS %d."
 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:4366
+#: access/transam/xlog.c:4377
 #, 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 "Los archivos de la base de datos fueron inicializados con TOAST_MAX_CHUNK_SIZE %d, pero el servidor fue compilado con TOAST_MAX_CHUNK_SIZE %d."
 
-#: access/transam/xlog.c:4373
+#: access/transam/xlog.c:4384
 #, c-format
 msgid "The database cluster was initialized with LOBLKSIZE %d, but the server was compiled with LOBLKSIZE %d."
 msgstr "Los archivos de base de datos fueron inicializados con LOBLKSIZE %d, pero el servidor fue compilado con LOBLKSIZE %d."
 
-#: access/transam/xlog.c:4382
+#: access/transam/xlog.c:4393
 #, c-format
 msgid "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the server was compiled with HAVE_INT64_TIMESTAMP."
 msgstr "Los archivos de la base de datos fueron inicializados sin HAVE_INT64_TIMESTAMP, pero el servidor fue compilado con HAVE_INT64_TIMESTAMP."
 
-#: access/transam/xlog.c:4389
+#: access/transam/xlog.c:4400
 #, c-format
 msgid "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the server was compiled without HAVE_INT64_TIMESTAMP."
 msgstr "Los archivos de la base de datos fueron inicializados con HAVE_INT64_TIMESTAMP, pero el servidor fue compilado sin HAVE_INT64_TIMESTAMP."
 
-#: access/transam/xlog.c:4398
+#: access/transam/xlog.c:4409
 #, c-format
 msgid "The database cluster was initialized without USE_FLOAT4_BYVAL but the server was compiled with USE_FLOAT4_BYVAL."
 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:4405
+#: access/transam/xlog.c:4416
 #, c-format
 msgid "The database cluster was initialized with USE_FLOAT4_BYVAL but the server was compiled without USE_FLOAT4_BYVAL."
 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:4414
+#: access/transam/xlog.c:4425
 #, c-format
 msgid "The database cluster was initialized without USE_FLOAT8_BYVAL but the server was compiled with USE_FLOAT8_BYVAL."
 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:4421
+#: access/transam/xlog.c:4432
 #, c-format
 msgid "The database cluster was initialized with USE_FLOAT8_BYVAL but the server was compiled without USE_FLOAT8_BYVAL."
 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:4847
+#: access/transam/xlog.c:4858
 #, 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:4853
+#: access/transam/xlog.c:4864
 #, 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:4858
+#: access/transam/xlog.c:4869
 #, 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:4933
+#: access/transam/xlog.c:4944
 #, 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:4979
-#, fuzzy, c-format
-msgid "invalid value for recovery parameter \"%s\""
-msgstr "valor no válido para el parámetro «%s»: %d"
+#: access/transam/xlog.c:4990 access/transam/xlog.c:5075
+#, c-format
+msgid "invalid value for recovery parameter \"%s\": \"%s\""
+msgstr "valor no válido para el parámetro de recuperación «%s»: «%s»"
 
-#: access/transam/xlog.c:4981
-#, fuzzy, c-format
-msgid "The allowed values are \"pause\", \"promote\", and \"shutdown\"."
-msgstr "Los valores aceptables son «on», «off» y «auto»."
+#: access/transam/xlog.c:4993
+#, c-format
+msgid "Valid values are \"pause\", \"promote\", and \"shutdown\"."
+msgstr "Los valores aceptables son «pause», «promote» y «shutdown»."
 
-#: access/transam/xlog.c:5000
+#: access/transam/xlog.c:5013
 #, 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:5016
+#: access/transam/xlog.c:5030
 #, 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:5047
+#: access/transam/xlog.c:5061
 #, c-format
 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:5061
-#, c-format
-msgid "invalid value for recovery parameter \"recovery_target\""
-msgstr "valor no válido para el parámetro de recuperación «recovery_target»"
-
-#: access/transam/xlog.c:5062
+#: access/transam/xlog.c:5078
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "El único valor permitido es «immediate»"
 
-#: access/transam/xlog.c:5075 access/transam/xlog.c:5086
-#: commands/extension.c:531 commands/extension.c:539 utils/misc/guc.c:5443
+#: access/transam/xlog.c:5091 access/transam/xlog.c:5102
+#: commands/extension.c:531 commands/extension.c:539 utils/misc/guc.c:5464
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "el parámetro «%s» requiere un valor lógico (booleano)"
 
-#: access/transam/xlog.c:5121
+#: access/transam/xlog.c:5137
 #, c-format
 msgid "parameter \"%s\" requires a temporal value"
 msgstr "el parámetro «%s» requiere un valor de tiempo"
 
-#: access/transam/xlog.c:5123 catalog/dependency.c:984
-#: catalog/dependency.c:985 catalog/dependency.c:991 catalog/dependency.c:992
-#: catalog/dependency.c:1003 catalog/dependency.c:1004
-#: catalog/objectaddress.c:1053 commands/tablecmds.c:789
-#: commands/tablecmds.c:9387 commands/user.c:1027 commands/view.c:482
-#: libpq/auth.c:285 port/win32/security.c:51 storage/lmgr/deadlock.c:955
-#: storage/lmgr/proc.c:1177 utils/misc/guc.c:5465 utils/misc/guc.c:5558
-#: utils/misc/guc.c:9437 utils/misc/guc.c:9471 utils/misc/guc.c:9505
-#: utils/misc/guc.c:9539 utils/misc/guc.c:9574
+#: access/transam/xlog.c:5139 catalog/dependency.c:983
+#: catalog/dependency.c:984 catalog/dependency.c:990 catalog/dependency.c:991
+#: catalog/dependency.c:1002 catalog/dependency.c:1003
+#: catalog/objectaddress.c:1053 commands/tablecmds.c:792
+#: commands/tablecmds.c:9513 commands/user.c:1027 commands/view.c:499
+#: libpq/auth.c:288 port/win32/security.c:51 storage/lmgr/deadlock.c:955
+#: storage/lmgr/proc.c:1177 utils/misc/guc.c:5486 utils/misc/guc.c:5579
+#: utils/misc/guc.c:9500 utils/misc/guc.c:9534 utils/misc/guc.c:9568
+#: utils/misc/guc.c:9602 utils/misc/guc.c:9637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: access/transam/xlog.c:5129
+#: access/transam/xlog.c:5146
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
 msgstr "parámetro de recuperación no reconocido: «%s»"
 
-#: access/transam/xlog.c:5140
+#: access/transam/xlog.c:5157
 #, c-format
 msgid "recovery command file \"%s\" specified neither primary_conninfo nor restore_command"
 msgstr "el archivo de recuperación «%s» no especifica primary_conninfo ni restore_command"
 
-#: access/transam/xlog.c:5142
+#: access/transam/xlog.c:5159
 #, c-format
 msgid "The database server will regularly poll the pg_xlog subdirectory to check for files placed there."
 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:5148
+#: access/transam/xlog.c:5166
 #, c-format
 msgid "recovery command file \"%s\" must specify restore_command when standby mode is not enabled"
 msgstr "el archivo de recuperación «%s» debe especificar restore_command cuando el modo standby no está activo"
 
-#: access/transam/xlog.c:5178
+#: access/transam/xlog.c:5187
+#, c-format
+msgid "standby mode is not supported by single-user servers"
+msgstr "el modo standby no está soportado en el modo mono-usuario"
+
+#: access/transam/xlog.c:5206
 #, 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:5303
+#: access/transam/xlog.c:5327
 #, c-format
 msgid "archive recovery complete"
 msgstr "recuperación completa"
 
-#: access/transam/xlog.c:5362 access/transam/xlog.c:5590
+#: access/transam/xlog.c:5386 access/transam/xlog.c:5614
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "deteniendo recuperación al alcanzar un estado consistente"
 
-#: access/transam/xlog.c:5450
+#: access/transam/xlog.c:5474
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "deteniendo recuperación antes de comprometer la transacción %u, hora %s"
 
-#: access/transam/xlog.c:5457
+#: access/transam/xlog.c:5481
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "deteniendo recuperación antes de abortar la transacción %u, hora %s"
 
-#: access/transam/xlog.c:5502
+#: access/transam/xlog.c:5526
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "deteniendo recuperación en el punto de recuperación «%s», hora %s"
 
-#: access/transam/xlog.c:5570
+#: access/transam/xlog.c:5594
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "deteniendo recuperación de comprometer la transacción %u, hora %s"
 
-#: access/transam/xlog.c:5578
+#: access/transam/xlog.c:5602
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "deteniendo recuperación después de abortar la transacción %u, hora %s"
 
-#: access/transam/xlog.c:5617
+#: access/transam/xlog.c:5641
 #, c-format
 msgid "recovery has paused"
 msgstr "la recuperación está en pausa"
 
-#: access/transam/xlog.c:5618
+#: access/transam/xlog.c:5642
 #, c-format
 msgid "Execute pg_xlog_replay_resume() to continue."
 msgstr "Ejecute pg_xlog_replay_resume() para continuar."
 
-#: access/transam/xlog.c:5821
+#: access/transam/xlog.c:5849
 #, 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 "hot 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:5847
+#: access/transam/xlog.c:5875
 #, c-format
 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:5848
+#: access/transam/xlog.c:5876
 #, c-format
 msgid "This happens if you temporarily set wal_level=minimal without taking a new base backup."
 msgstr "Esto sucede si temporalmente define wal_level=minimal sin tomar un nuevo respaldo base."
 
-#: access/transam/xlog.c:5859
+#: access/transam/xlog.c:5887
 #, c-format
 msgid "hot standby is not possible because wal_level was not set to \"hot_standby\" or higher on the master server"
 msgstr "hot standby no es posible porque wal_level no estaba configurado como «hot_standby» o superior en el servidor maestro"
 
-#: access/transam/xlog.c:5860
+#: access/transam/xlog.c:5888
 #, c-format
 msgid "Either set wal_level to \"hot_standby\" on the master, or turn off hot_standby here."
 msgstr "Defina wal_level a «hot_standby» en el maestro, o bien desactive hot_standby en este servidor."
 
-#: access/transam/xlog.c:5917
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "control file contains invalid data"
 msgstr "el archivo de control contiene datos no válidos"
 
-#: access/transam/xlog.c:5923
+#: access/transam/xlog.c:5951
 #, 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:5928
+#: access/transam/xlog.c:5956
 #, 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:5932
+#: access/transam/xlog.c:5960
 #, 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:5936
+#: access/transam/xlog.c:5964
 #, 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:5938
+#: access/transam/xlog.c:5966
 #, c-format
 msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
 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:5942
+#: access/transam/xlog.c:5970
 #, 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:5944
+#: access/transam/xlog.c:5972
 #, c-format
 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 ser necesario escoger un punto de recuperación anterior."
 
-#: access/transam/xlog.c:5948
+#: access/transam/xlog.c:5976
 #, 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:6004
+#: access/transam/xlog.c:6032
 #, c-format
 msgid "entering standby mode"
 msgstr "entrando al modo standby"
 
-#: access/transam/xlog.c:6007
+#: access/transam/xlog.c:6035
 #, 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:6011
+#: access/transam/xlog.c:6039
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "comenzando el proceso de recuperación hasta %s"
 
-#: access/transam/xlog.c:6015
+#: access/transam/xlog.c:6043
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "comenzando el proceso de recuperación hasta «%s»"
 
-#: access/transam/xlog.c:6019
+#: access/transam/xlog.c:6047
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr "comenzando recuperación a un punto en el tiempo hasta alcanzar un estado consistente"
 
-#: access/transam/xlog.c:6022
+#: access/transam/xlog.c:6050
 #, c-format
 msgid "starting archive recovery"
 msgstr "comenzando proceso de recuperación"
 
-#: access/transam/xlog.c:6039
+#: access/transam/xlog.c:6067
 #, c-format
 msgid "Failed while allocating an XLog reading processor."
 msgstr "Falló mientras se emplazaba un procesador de lectura de XLog."
 
-#: access/transam/xlog.c:6066 access/transam/xlog.c:6194
+#: access/transam/xlog.c:6094 access/transam/xlog.c:6222
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "el registro del punto de control está en %X/%X"
 
-#: access/transam/xlog.c:6080
+#: access/transam/xlog.c:6108
 #, c-format
 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:6081 access/transam/xlog.c:6088
+#: access/transam/xlog.c:6109 access/transam/xlog.c:6116
 #, c-format
 msgid "If you are not restoring from a backup, try removing the file \"%s/backup_label\"."
 msgstr "Si no está restaurando un respaldo, intente eliminando «%s/backup_label»."
 
-#: access/transam/xlog.c:6087
+#: access/transam/xlog.c:6115
 #, c-format
 msgid "could not locate required checkpoint record"
 msgstr "no se pudo localizar el registro del punto de control requerido"
 
-#: access/transam/xlog.c:6113 commands/tablespace.c:641
+#: access/transam/xlog.c:6141 commands/tablespace.c:641
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "no se pudo crear el enlace simbólico «%s»: %m"
 
-#: access/transam/xlog.c:6145 access/transam/xlog.c:6151
-#, fuzzy, c-format
-msgid "ignoring \"%s\" file because no \"%s\" file exists"
-msgstr "la restricción «%s» para la relación «%s» ya existe"
+#: access/transam/xlog.c:6173
+#, c-format
+msgid "ignoring file \"%s\" because no file \"%s\" exists"
+msgstr "ignorando el archivo «%s» porque no existe un archivo «%s»"
 
-#: access/transam/xlog.c:6147 access/transam/xlog.c:10879
-#, fuzzy, c-format
+#: access/transam/xlog.c:6175 access/transam/xlog.c:10986
+#, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
-msgstr "«%s» fue renombrado a «%s»."
+msgstr "El archivo «%s» fue renombrado a «%s»."
 
-#: access/transam/xlog.c:6153 access/transam/xlog.c:10869
-#, fuzzy, c-format
-msgid "File \"%s\" could not be renamed to \"%s\": %m."
-msgstr "No se pudo renombrar «%s» a «%s»: %m."
+#: access/transam/xlog.c:6179
+#, c-format
+msgid "ignoring \"%s\" file because no \"%s\" file exists"
+msgstr "ignorando el archivo «%s» porque no existe un archivo «%s»"
+
+#: access/transam/xlog.c:6181
+#, 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:6204 access/transam/xlog.c:6219
+#: access/transam/xlog.c:6232 access/transam/xlog.c:6247
 #, c-format
 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:6213
+#: access/transam/xlog.c:6241
 #, 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:6257
+#: access/transam/xlog.c:6285
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "el timeline solicitado %u no es un hijo de la historia de este servidor"
 
-#: access/transam/xlog.c:6259
+#: access/transam/xlog.c:6287
 #, c-format
 msgid "Latest checkpoint is at %X/%X on timeline %u, but in the history of the requested timeline, the server forked off from that timeline at %X/%X."
 msgstr "El punto de control más reciente está en %X/%X en el timeline %u, pero en la historia del timeline solicitado, el servidor se desvió desde ese timeline en %X/%X."
 
-#: access/transam/xlog.c:6275
+#: access/transam/xlog.c:6303
 #, c-format
 msgid "requested timeline %u does not contain minimum recovery point %X/%X on timeline %u"
 msgstr "el timeline solicitado %u no contiene el punto mínimo de recuperación %X/%X en el timeline %u"
 
-#: access/transam/xlog.c:6284
-#, c-format
-msgid "redo record is at %X/%X; shutdown %s"
-msgstr "registro de redo en %X/%X; apagado %s"
-
-#: access/transam/xlog.c:6288
-#, 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:6292
-#, c-format
-msgid "next MultiXactId: %u; next MultiXactOffset: %u"
-msgstr "siguiente MultiXactId: %u; siguiente MultiXactOffset: %u"
-
-#: access/transam/xlog.c:6295
-#, 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:6298
-#, c-format
-msgid "oldest MultiXactId: %u, in database %u"
-msgstr "MultiXactId más antiguo: %u, en base de datos %u"
-
-#: access/transam/xlog.c:6301
-#, c-format
-msgid "commit timestamp Xid oldest/newest: %u/%u"
-msgstr ""
-
-#: access/transam/xlog.c:6306
+#: access/transam/xlog.c:6334
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "el siguiente ID de transacción no es válido"
 
-#: access/transam/xlog.c:6381
+#: access/transam/xlog.c:6417
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "redo no es válido en el registro de punto de control"
 
-#: access/transam/xlog.c:6392
+#: access/transam/xlog.c:6428
 #, c-format
 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:6420
+#: access/transam/xlog.c:6456
 #, c-format
 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:6424
+#: access/transam/xlog.c:6460
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr "la recuperación comienza en el timeline %u y tiene un timeline de destino %u"
 
-#: access/transam/xlog.c:6468
+#: access/transam/xlog.c:6504
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label contiene datos inconsistentes con el archivo de control"
 
-#: access/transam/xlog.c:6469
+#: access/transam/xlog.c:6505
 #, c-format
 msgid "This means that the backup is corrupted and you will have to use another backup for recovery."
 msgstr "Esto significa que el respaldo está corrupto y deberá usar otro respaldo para la recuperación."
 
-#: access/transam/xlog.c:6551
+#: access/transam/xlog.c:6579
 #, c-format
 msgid "initializing for hot standby"
 msgstr "inicializando para hot standby"
 
-#: access/transam/xlog.c:6684
+#: access/transam/xlog.c:6711
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "redo comienza en %X/%X"
 
-#: access/transam/xlog.c:6898
+#: access/transam/xlog.c:6925
 #, c-format
 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:6936
+#: access/transam/xlog.c:6963
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "redo listo en %X/%X"
 
-#: access/transam/xlog.c:6941 access/transam/xlog.c:8876
+#: access/transam/xlog.c:6968 access/transam/xlog.c:8922
 #, 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:6950
+#: access/transam/xlog.c:6977
 #, c-format
 msgid "redo is not required"
 msgstr "no se requiere redo"
 
-#: access/transam/xlog.c:7025 access/transam/xlog.c:7029
+#: access/transam/xlog.c:7052 access/transam/xlog.c:7056
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "WAL termina antes del fin del respaldo en línea"
 
-#: access/transam/xlog.c:7026
+#: access/transam/xlog.c:7053
 #, c-format
 msgid "All WAL generated while online backup was taken must be available at recovery."
 msgstr "Todo el WAL generado durante el respaldo en línea debe estar disponible durante la recuperación."
 
-#: access/transam/xlog.c:7030
+#: access/transam/xlog.c:7057
 #, c-format
 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:7033
+#: access/transam/xlog.c:7060
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL termina antes del punto de recuperación consistente"
 
-#: access/transam/xlog.c:7060
+#: access/transam/xlog.c:7087
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "seleccionado nuevo ID de timeline: %u"
 
-#: access/transam/xlog.c:7476
+#: access/transam/xlog.c:7498
 #, 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:7667
+#: access/transam/xlog.c:7689
 #, c-format
 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:7671
+#: access/transam/xlog.c:7693
 #, c-format
 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:7675
+#: access/transam/xlog.c:7697
 #, c-format
 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:7692
+#: access/transam/xlog.c:7714
 #, c-format
 msgid "invalid primary checkpoint record"
 msgstr "el registro del punto de control primario no es válido"
 
-#: access/transam/xlog.c:7696
+#: access/transam/xlog.c:7718
 #, c-format
 msgid "invalid secondary checkpoint record"
 msgstr "el registro del punto de control secundario no es válido"
 
-#: access/transam/xlog.c:7700
+#: access/transam/xlog.c:7722
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "el registro del punto de control no es válido"
 
-#: access/transam/xlog.c:7711
+#: access/transam/xlog.c:7733
 #, c-format
 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:7715
+#: access/transam/xlog.c:7737
 #, c-format
 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:7719
+#: access/transam/xlog.c:7741
 #, c-format
 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:7731
+#: access/transam/xlog.c:7753
 #, c-format
 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:7735
+#: access/transam/xlog.c:7757
 #, c-format
 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:7739
+#: access/transam/xlog.c:7761
 #, c-format
 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:7750
+#: access/transam/xlog.c:7772
 #, c-format
 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:7754
+#: access/transam/xlog.c:7776
 #, c-format
 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:7758
+#: access/transam/xlog.c:7780
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "la longitud del registro de punto de control no es válida"
 
-#: access/transam/xlog.c:7928
+#: access/transam/xlog.c:7950
 #, c-format
 msgid "shutting down"
 msgstr "apagando"
 
-#: access/transam/xlog.c:7952
+#: access/transam/xlog.c:7974
 #, c-format
 msgid "database system is shut down"
 msgstr "el sistema de bases de datos está apagado"
 
-#: access/transam/xlog.c:8445
+#: access/transam/xlog.c:8467
 #, c-format
 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:8696
+#: access/transam/xlog.c:8721
 #, c-format
 msgid "skipping restartpoint, recovery has already ended"
 msgstr "saltando el punto-de-reinicio; la recuperación ya ha terminado"
 
-#: access/transam/xlog.c:8719
+#: access/transam/xlog.c:8744
 #, 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:8874
+#: access/transam/xlog.c:8920
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "punto-de-reinicio de recuperación en %X/%X"
 
-#: access/transam/xlog.c:9007
+#: access/transam/xlog.c:9053
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "punto de recuperación «%s» creado en %X/%X"
 
-#: access/transam/xlog.c:9137
+#: access/transam/xlog.c:9183
 #, c-format
 msgid "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record"
 msgstr "ID de timeline previo %u inesperado (timeline actual %u) en el registro de punto de control"
 
-#: access/transam/xlog.c:9146
+#: access/transam/xlog.c:9192
 #, 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:9162
+#: access/transam/xlog.c:9208
 #, c-format
 msgid "unexpected timeline ID %u in checkpoint record, before reaching minimum recovery point %X/%X on timeline %u"
 msgstr "timeline ID %u inesperado en registro de checkpoint, antes de alcanzar el punto mínimo de recuperación %X/%X en el timeline %u"
 
-#: access/transam/xlog.c:9233
+#: access/transam/xlog.c:9279
 #, c-format
 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:9289 access/transam/xlog.c:9336
-#: access/transam/xlog.c:9359
+#: access/transam/xlog.c:9335 access/transam/xlog.c:9382
+#: access/transam/xlog.c:9405
 #, 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:9636
+#: access/transam/xlog.c:9682
 #, c-format
 msgid "could not fsync log segment %s: %m"
 msgstr "no se pudo sincronizar (fsync) el archivo de registro %s: %m"
 
-#: access/transam/xlog.c:9660
+#: access/transam/xlog.c:9706
 #, c-format
 msgid "could not fsync log file %s: %m"
 msgstr "no se pudo sincronizar (fsync) archivo de registro «%s»: %m"
 
-#: access/transam/xlog.c:9668
+#: access/transam/xlog.c:9714
 #, c-format
 msgid "could not fsync write-through log file %s: %m"
 msgstr "no se pudo sincronizar (fsync write-through) el archivo de registro %s: %m"
 
-#: access/transam/xlog.c:9677
+#: access/transam/xlog.c:9723
 #, c-format
 msgid "could not fdatasync log file %s: %m"
 msgstr "no se pudo sincronizar (fdatasync) el archivo de registro %s: %m"
 
-#: access/transam/xlog.c:9769 access/transam/xlog.c:10240
+#: access/transam/xlog.c:9815 access/transam/xlog.c:10319
 #: access/transam/xlogfuncs.c:121 access/transam/xlogfuncs.c:150
 #: access/transam/xlogfuncs.c:189 access/transam/xlogfuncs.c:210
 #: access/transam/xlogfuncs.c:280 access/transam/xlogfuncs.c:336
@@ -2234,195 +2184,206 @@
 msgid "recovery is in progress"
 msgstr "la recuperación está en proceso"
 
-#: access/transam/xlog.c:9770 access/transam/xlog.c:10241
+#: access/transam/xlog.c:9816 access/transam/xlog.c:10320
 #: access/transam/xlogfuncs.c:122 access/transam/xlogfuncs.c:151
 #: access/transam/xlogfuncs.c:190 access/transam/xlogfuncs.c:211
 #, c-format
 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:9779 access/transam/xlog.c:10250
+#: access/transam/xlog.c:9825 access/transam/xlog.c:10329
 #, c-format
 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:9780 access/transam/xlog.c:10251
+#: access/transam/xlog.c:9826 access/transam/xlog.c:10330
 #: access/transam/xlogfuncs.c:157
 #, c-format
 msgid "wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start."
 msgstr "wal_level debe ser definido a «archive», «hot_standby» o «logical» al inicio del servidor."
 
-#: access/transam/xlog.c:9785
+#: access/transam/xlog.c:9831
 #, 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:9817 access/transam/xlog.c:10087
-#: access/transam/xlog.c:10123
+#: access/transam/xlog.c:9868 access/transam/xlog.c:10138
+#: access/transam/xlog.c:10174
 #, c-format
 msgid "a backup is already in progress"
 msgstr "ya hay un respaldo en curso"
 
-#: access/transam/xlog.c:9818
+#: access/transam/xlog.c:9869
 #, c-format
 msgid "Run pg_stop_backup() and try again."
 msgstr "Ejecute pg_stop_backup() e intente nuevamente."
 
-#: access/transam/xlog.c:9913
+#: access/transam/xlog.c:9964
 #, c-format
 msgid "WAL generated with full_page_writes=off was replayed since last restartpoint"
 msgstr "el WAL generado con full_page_writes=off fue restaurado desde el último punto-de-reinicio"
 
-#: access/transam/xlog.c:9915 access/transam/xlog.c:10405
+#: access/transam/xlog.c:9966 access/transam/xlog.c:10512
 #, c-format
 msgid "This means that the backup being taken on the standby is corrupt and should not be used. Enable full_page_writes and run CHECKPOINT on the master, and then try an online backup again."
 msgstr "Esto significa que el respaldo que estaba siendo tomado en el standby está corrupto y no debería usarse. Active full_page_writes y ejecute CHECKPOINT en el maestro, luego trate de ejecutar un respaldo en línea nuevamente."
 
-#: access/transam/xlog.c:9981 replication/basebackup.c:1027
+#: access/transam/xlog.c:10032 replication/basebackup.c:1023
 #: utils/adt/misc.c:378
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "no se pudo leer el enlace simbólico «%s»: %m"
 
-#: access/transam/xlog.c:9988 replication/basebackup.c:1032
+#: access/transam/xlog.c:10039 replication/basebackup.c:1028
 #: utils/adt/misc.c:383
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "la ruta «%s» del enlace simbólico es demasiado larga"
 
-#: access/transam/xlog.c:10041 commands/tablespace.c:391
-#: commands/tablespace.c:553 replication/basebackup.c:1048
+#: access/transam/xlog.c:10092 commands/tablespace.c:391
+#: commands/tablespace.c:553 replication/basebackup.c:1044
 #: utils/adt/misc.c:391
 #, c-format
 msgid "tablespaces are not supported on this platform"
 msgstr "tablespaces no están soportados en esta plataforma"
 
-#: access/transam/xlog.c:10081 access/transam/xlog.c:10117
-#: access/transam/xlog.c:10291 access/transam/xlogarchive.c:106
-#: access/transam/xlogarchive.c:265 commands/copy.c:1738 commands/copy.c:2764
-#: commands/extension.c:3026 replication/basebackup.c:404
-#: replication/basebackup.c:472 replication/logical/snapbuild.c:1478
-#: storage/file/copydir.c:72 storage/file/copydir.c:115 storage/file/fd.c:2519
-#: storage/file/fd.c:2611 utils/adt/dbsize.c:68 utils/adt/dbsize.c:218
+#: access/transam/xlog.c:10132 access/transam/xlog.c:10168
+#: access/transam/xlog.c:10369 access/transam/xlogarchive.c:106
+#: access/transam/xlogarchive.c:265 commands/copy.c:1778 commands/copy.c:2804
+#: commands/extension.c:3029 commands/tablespace.c:782
+#: commands/tablespace.c:873 replication/basebackup.c:406
+#: replication/basebackup.c:474 replication/logical/snapbuild.c:1479
+#: storage/file/copydir.c:72 storage/file/copydir.c:115 storage/file/fd.c:2703
+#: storage/file/fd.c:2795 utils/adt/dbsize.c:68 utils/adt/dbsize.c:218
 #: utils/adt/dbsize.c:298 utils/adt/genfile.c:114 utils/adt/genfile.c:333
 #: guc-file.l:1003
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo «%s»: %m"
 
-#: access/transam/xlog.c:10088 access/transam/xlog.c:10124
+#: access/transam/xlog.c:10139 access/transam/xlog.c:10175
 #, c-format
 msgid "If you're sure there is no backup in progress, remove file \"%s\" and try again."
 msgstr "Si está seguro que no hay un respaldo en curso, elimine el archivo «%s» e intente nuevamente."
 
-#: access/transam/xlog.c:10105 access/transam/xlog.c:10141
-#: access/transam/xlog.c:10466
+#: access/transam/xlog.c:10156 access/transam/xlog.c:10192
+#: access/transam/xlog.c:10573
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "no se pudo escribir el archivo «%s»: %m"
 
-#: access/transam/xlog.c:10295
+#: access/transam/xlog.c:10346
+#, c-format
+msgid "exclusive backup not in progress"
+msgstr "no hay un respaldo exclusivo en curso"
+
+#: access/transam/xlog.c:10373
 #, c-format
 msgid "a backup is not in progress"
 msgstr "no hay un respaldo en curso"
 
-#: access/transam/xlog.c:10340 access/transam/xlog.c:10353
-#: access/transam/xlog.c:10693 access/transam/xlog.c:10699
-#: access/transam/xlog.c:10783 access/transam/xlogfuncs.c:508
+#: access/transam/xlog.c:10447 access/transam/xlog.c:10460
+#: access/transam/xlog.c:10800 access/transam/xlog.c:10806
+#: access/transam/xlog.c:10890 access/transam/xlogfuncs.c:508
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "datos no válidos en archivo «%s»"
 
-#: access/transam/xlog.c:10357 replication/basebackup.c:925
+#: access/transam/xlog.c:10464 replication/basebackup.c:935
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr "el standby fue promovido durante el respaldo en línea"
 
-#: access/transam/xlog.c:10358 replication/basebackup.c:926
+#: access/transam/xlog.c:10465 replication/basebackup.c:936
 #, c-format
 msgid "This means that the backup being taken is corrupt and should not be used. Try taking another online backup."
 msgstr "Esto significa que el respaldo que se estaba tomando está corrupto y no debería ser usado. Trate de ejecutar un nuevo respaldo en línea."
 
-#: access/transam/xlog.c:10403
+#: access/transam/xlog.c:10510
 #, c-format
 msgid "WAL generated with full_page_writes=off was replayed during online backup"
 msgstr "el WAL generado con full_page_writes=off fue restaurado durante el respaldo en línea"
 
-#: access/transam/xlog.c:10515
+#: access/transam/xlog.c:10622
 #, c-format
 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:10525
+#: access/transam/xlog.c:10632
 #, c-format
 msgid "pg_stop_backup still waiting for all required WAL segments to be archived (%d seconds elapsed)"
 msgstr "pg_stop_backup todavía espera que todos los segmentos WAL requeridos sean archivados (han pasado %d segundos)"
 
-#: access/transam/xlog.c:10527
+#: access/transam/xlog.c:10634
 #, c-format
 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 que su archive_command se esté ejecutando con normalidad.  pg_stop_backup puede ser abortado confiablemente, pero el respaldo de la base de datos no será utilizable a menos que disponga de todos los segmentos de WAL."
 
-#: access/transam/xlog.c:10534
+#: access/transam/xlog.c:10641
 #, c-format
 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:10538
+#: access/transam/xlog.c:10645
 #, 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"
-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"
+msgstr "el archivado de WAL no está activo; debe asegurarse que todos los segmentos WAL requeridos se copian por algún otro mecanismo para completar el respaldo"
 
-#: access/transam/xlog.c:10822
+#: access/transam/xlog.c:10929
 #, c-format
 msgid "xlog redo %s"
 msgstr "xlog redo %s"
 
-#: access/transam/xlog.c:10868
+#: access/transam/xlog.c:10975
 #, c-format
 msgid "online backup mode was not canceled"
 msgstr "el modo de respaldo en línea no fue cancelado"
 
-#: access/transam/xlog.c:10878 access/transam/xlog.c:10890
-#: access/transam/xlog.c:10900
+#: access/transam/xlog.c:10976
+#, c-format
+msgid "File \"%s\" could not be renamed to \"%s\": %m."
+msgstr "El archivo «%s» no se pudo renombrar a «%s»: %m."
+
+#: access/transam/xlog.c:10985 access/transam/xlog.c:10997
+#: access/transam/xlog.c:11007
 #, c-format
 msgid "online backup mode canceled"
 msgstr "el modo de respaldo en línea fue cancelado"
 
-#: access/transam/xlog.c:10891
+#: access/transam/xlog.c:10998
 #, c-format
 msgid "Files \"%s\" and \"%s\" were renamed to \"%s\" and \"%s\", respectively."
-msgstr ""
+msgstr "Los archivos «%s» y «%s» fueron renombrados a «%s» y «%s», respectivamente."
 
-#: access/transam/xlog.c:10901
+#: access/transam/xlog.c:11008
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\", but file \"%s\" could not be renamed to \"%s\": %m."
-msgstr ""
+msgstr "El archivo «%s» fue renombrado a «%s», pero el archivo «%s» no pudo ser renombrado a «%s»: %m."
 
 # XXX why talk about "log segment" instead of "file"?
-#: access/transam/xlog.c:11023 replication/logical/logicalfuncs.c:171
-#: replication/walreceiver.c:932 replication/walsender.c:2092
+#: access/transam/xlog.c:11130 replication/logical/logicalfuncs.c:171
+#: replication/walreceiver.c:932 replication/walsender.c:2111
 #, c-format
 msgid "could not seek in log segment %s to offset %u: %m"
 msgstr "no se pudo posicionar (seek) en segmento %s a la posición %u: %m"
 
 # XXX why talk about "log segment" instead of "file"?
-#: access/transam/xlog.c:11035
+#: access/transam/xlog.c:11142
 #, c-format
 msgid "could not read from log segment %s, offset %u: %m"
 msgstr "no se pudo leer del archivo de segmento %s, posición %u: %m"
 
-#: access/transam/xlog.c:11509
+#: access/transam/xlog.c:11616
 #, c-format
 msgid "received promote request"
 msgstr "se recibió petición de promoción"
 
-#: access/transam/xlog.c:11522
+#: access/transam/xlog.c:11629
 #, c-format
 msgid "trigger file found: %s"
 msgstr "se encontró el archivo disparador: %s"
 
-#: access/transam/xlog.c:11531
+#: access/transam/xlog.c:11638
 #, c-format
 msgid "could not stat trigger file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo disparador «%s»: %m"
@@ -2450,12 +2411,19 @@
 msgid "%s \"%s\": %s"
 msgstr "%s «%s»: %s"
 
-#: access/transam/xlogarchive.c:529 access/transam/xlogarchive.c:598
+#: access/transam/xlogarchive.c:458 replication/logical/snapbuild.c:1602
+#: replication/slot.c:496 replication/slot.c:953 replication/slot.c:1065
+#: storage/file/fd.c:501 storage/file/fd.c:559 utils/time/snapmgr.c:1146
+#, 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/xlogarchive.c:525 access/transam/xlogarchive.c:589
 #, c-format
 msgid "could not create archive status file \"%s\": %m"
 msgstr "no se pudo crear el archivo de estado «%s»: %m"
 
-#: access/transam/xlogarchive.c:537 access/transam/xlogarchive.c:606
+#: access/transam/xlogarchive.c:533 access/transam/xlogarchive.c:597
 #, c-format
 msgid "could not write archive status file \"%s\": %m"
 msgstr "no se pudo escribir el archivo de estado «%s»: %m"
@@ -2466,10 +2434,10 @@
 msgstr "debe ser superusuario o el rol de replicación para ejecutar un respaldo"
 
 #: access/transam/xlogfuncs.c:67 commands/tablespace.c:705
-#: commands/tablespace.c:715 postmaster/postmaster.c:1389
-#: replication/basebackup.c:292 replication/basebackup.c:632
-#: storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:1985
-#: storage/file/fd.c:2584 storage/ipc/dsm.c:300 utils/adt/genfile.c:439
+#: commands/tablespace.c:715 postmaster/postmaster.c:1404
+#: replication/basebackup.c:294 replication/basebackup.c:634
+#: storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:2169
+#: storage/file/fd.c:2768 storage/ipc/dsm.c:300 utils/adt/genfile.c:439
 #: utils/adt/misc.c:291 utils/misc/tzparser.c:339
 #, c-format
 msgid "could not open directory \"%s\": %m"
@@ -2602,73 +2570,73 @@
 msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
 msgstr "ID de timeline %u fuera de secuencia (después de %u) en archivo %s, posición %u"
 
-#: access/transam/xlogreader.c:1024
+#: access/transam/xlogreader.c:1061
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %u fuera de orden en %X/%X"
 
-#: access/transam/xlogreader.c:1046
+#: access/transam/xlogreader.c:1083
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA está definido, pero no hay datos en %X/%X"
 
-#: access/transam/xlogreader.c:1053
+#: access/transam/xlogreader.c:1090
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA no está definido, pero el largo de los datos es %u en %X/%X"
 
-#: access/transam/xlogreader.c:1086
+#: access/transam/xlogreader.c:1123
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE está definido, pero posición del agujero es %u largo %u largo de imagen %u en %X/%X"
 
-#: access/transam/xlogreader.c:1102
+#: access/transam/xlogreader.c:1139
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE no está definido, pero posición del agujero es %u largo %u en %X/%X"
 
-#: access/transam/xlogreader.c:1117
+#: access/transam/xlogreader.c:1154
 #, c-format
 msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_IS_COMPRESSED definido, pero largo de imagen de bloque es %u en %X/%X"
 
-#: access/transam/xlogreader.c:1132
+#: access/transam/xlogreader.c:1169
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ni BKPIMAGE_HAS_HOLE ni BKPIMAGE_IS_COMPRESSED está definido, pero largo de imagen de bloque es %u en %X/%X"
 
-#: access/transam/xlogreader.c:1148
+#: access/transam/xlogreader.c:1185
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL está definido, pero no hay «rel» anterior en %X/%X "
 
-#: access/transam/xlogreader.c:1160
-#, fuzzy, c-format
+#: access/transam/xlogreader.c:1197
+#, c-format
 msgid "invalid block_id %u at %X/%X"
-msgstr "block_id %u fuera de orden en %X/%X"
+msgstr "block_id %u no válido en %X/%X"
 
-#: access/transam/xlogreader.c:1225
-#, fuzzy, c-format
+#: access/transam/xlogreader.c:1262
+#, c-format
 msgid "record with invalid length at %X/%X"
-msgstr "registro con largo cero en %X/%X"
+msgstr "registro con largo no válido en %X/%X"
 
-#: access/transam/xlogreader.c:1314
-#, fuzzy, c-format
+#: access/transam/xlogreader.c:1351
+#, c-format
 msgid "invalid compressed image at %X/%X, block %d"
-msgstr "ID de gestor de recursos %u no válido en %X/%X"
+msgstr "imagen comprimida no válida en %X/%X, bloque %d"
 
-#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:779 tcop/postgres.c:3485
+#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:790 tcop/postgres.c:3500
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s requiere un valor"
 
-#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:784 tcop/postgres.c:3490
+#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:795 tcop/postgres.c:3505
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s requiere un valor"
 
-#: bootstrap/bootstrap.c:284 postmaster/postmaster.c:796
-#: postmaster/postmaster.c:809
+#: bootstrap/bootstrap.c:284 postmaster/postmaster.c:807
+#: postmaster/postmaster.c:820
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Pruebe «%s --help» para mayor información.\n"
@@ -2788,7 +2756,7 @@
 msgid "column privileges are only valid for relations"
 msgstr "los privilegios de columna son sólo válidos para relaciones"
 
-#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4651
+#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4656
 #: catalog/objectaddress.c:854 catalog/pg_largeobject.c:113
 #: storage/large_object/inv_api.c:291
 #, c-format
@@ -2796,19 +2764,19 @@
 msgstr "no existe el objeto grande %u"
 
 #: catalog/aclchk.c:863 catalog/aclchk.c:871 commands/collationcmds.c:92
-#: commands/copy.c:1010 commands/copy.c:1028 commands/copy.c:1036
-#: commands/copy.c:1044 commands/copy.c:1052 commands/copy.c:1060
-#: commands/copy.c:1068 commands/copy.c:1076 commands/copy.c:1084
-#: commands/copy.c:1100 commands/copy.c:1114 commands/copy.c:1133
-#: commands/copy.c:1148 commands/dbcommands.c:155 commands/dbcommands.c:163
+#: commands/copy.c:1050 commands/copy.c:1068 commands/copy.c:1076
+#: commands/copy.c:1084 commands/copy.c:1092 commands/copy.c:1100
+#: commands/copy.c:1108 commands/copy.c:1116 commands/copy.c:1124
+#: commands/copy.c:1140 commands/copy.c:1154 commands/copy.c:1173
+#: commands/copy.c:1188 commands/dbcommands.c:155 commands/dbcommands.c:163
 #: commands/dbcommands.c:171 commands/dbcommands.c:179
 #: commands/dbcommands.c:187 commands/dbcommands.c:195
 #: commands/dbcommands.c:203 commands/dbcommands.c:211
 #: commands/dbcommands.c:219 commands/dbcommands.c:1397
 #: commands/dbcommands.c:1405 commands/dbcommands.c:1413
-#: commands/dbcommands.c:1421 commands/extension.c:1244
-#: commands/extension.c:1252 commands/extension.c:1260
-#: commands/extension.c:2677 commands/foreigncmds.c:539
+#: commands/dbcommands.c:1421 commands/extension.c:1247
+#: commands/extension.c:1255 commands/extension.c:1263
+#: commands/extension.c:2680 commands/foreigncmds.c:539
 #: commands/foreigncmds.c:548 commands/functioncmds.c:525
 #: commands/functioncmds.c:619 commands/functioncmds.c:627
 #: commands/functioncmds.c:635 commands/functioncmds.c:643
@@ -2836,21 +2804,21 @@
 msgstr "los privilegios por omisión no pueden definirse para columnas"
 
 #: catalog/aclchk.c:1483 catalog/objectaddress.c:1338 commands/analyze.c:378
-#: commands/copy.c:4383 commands/sequence.c:1491 commands/tablecmds.c:5149
-#: commands/tablecmds.c:5255 commands/tablecmds.c:5315
-#: commands/tablecmds.c:5428 commands/tablecmds.c:5485
-#: commands/tablecmds.c:5579 commands/tablecmds.c:5675
-#: commands/tablecmds.c:7836 commands/tablecmds.c:8041
-#: commands/tablecmds.c:8461 commands/trigger.c:643 parser/analyze.c:2160
-#: parser/parse_relation.c:2539 parser/parse_relation.c:2601
-#: parser/parse_target.c:940 parser/parse_type.c:128 utils/adt/acl.c:2839
-#: utils/adt/ruleutils.c:1836
+#: commands/copy.c:4423 commands/sequence.c:1491 commands/tablecmds.c:5168
+#: commands/tablecmds.c:5274 commands/tablecmds.c:5334
+#: commands/tablecmds.c:5447 commands/tablecmds.c:5504
+#: commands/tablecmds.c:5598 commands/tablecmds.c:5694
+#: commands/tablecmds.c:7886 commands/tablecmds.c:8148
+#: commands/tablecmds.c:8568 commands/trigger.c:643 parser/analyze.c:2157
+#: parser/parse_relation.c:2628 parser/parse_relation.c:2690
+#: parser/parse_target.c:951 parser/parse_type.c:127 utils/adt/acl.c:2839
+#: utils/adt/ruleutils.c:1859
 #, 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:1748 catalog/objectaddress.c:1151 commands/sequence.c:1078
-#: commands/tablecmds.c:220 commands/tablecmds.c:11890 utils/adt/acl.c:2075
+#: commands/tablecmds.c:222 commands/tablecmds.c:12118 utils/adt/acl.c:2075
 #: utils/adt/acl.c:2105 utils/adt/acl.c:2137 utils/adt/acl.c:2169
 #: utils/adt/acl.c:2197 utils/adt/acl.c:2227
 #, c-format
@@ -3123,127 +3091,127 @@
 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:3588 catalog/aclchk.c:4502
+#: catalog/aclchk.c:3588 catalog/aclchk.c:4507
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "no existe la relación con OID %u"
 
-#: catalog/aclchk.c:3687 catalog/aclchk.c:4920
+#: catalog/aclchk.c:3687 catalog/aclchk.c:4925
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "no existe la base de datos con OID %u"
 
-#: catalog/aclchk.c:3741 catalog/aclchk.c:4580 tcop/fastpath.c:223
+#: catalog/aclchk.c:3741 catalog/aclchk.c:4585 tcop/fastpath.c:223
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "no existe la función con OID %u"
 
-#: catalog/aclchk.c:3795 catalog/aclchk.c:4606
+#: catalog/aclchk.c:3795 catalog/aclchk.c:4611
 #, c-format
 msgid "language with OID %u does not exist"
 msgstr "no existe el lenguaje con OID %u"
 
-#: catalog/aclchk.c:3959 catalog/aclchk.c:4678
+#: catalog/aclchk.c:3959 catalog/aclchk.c:4683
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "no existe el esquema con OID %u"
 
-#: catalog/aclchk.c:4013 catalog/aclchk.c:4705
+#: catalog/aclchk.c:4013 catalog/aclchk.c:4710
 #, c-format
 msgid "tablespace with OID %u does not exist"
 msgstr "no existe el tablespace con OID %u"
 
-#: catalog/aclchk.c:4071 catalog/aclchk.c:4839 commands/foreigncmds.c:325
+#: catalog/aclchk.c:4072 catalog/aclchk.c:4844 commands/foreigncmds.c:325
 #, 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:4132 catalog/aclchk.c:4866 commands/foreigncmds.c:461
+#: catalog/aclchk.c:4134 catalog/aclchk.c:4871 commands/foreigncmds.c:461
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "no existe el servidor foráneo con OID %u"
 
-#: catalog/aclchk.c:4191 catalog/aclchk.c:4205 catalog/aclchk.c:4528
+#: catalog/aclchk.c:4194 catalog/aclchk.c:4533
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "no existe el tipo con OID %u"
 
-#: catalog/aclchk.c:4554
+#: catalog/aclchk.c:4559
 #, c-format
 msgid "operator with OID %u does not exist"
 msgstr "no existe el operador con OID %u"
 
-#: catalog/aclchk.c:4731
+#: catalog/aclchk.c:4736
 #, c-format
 msgid "operator class with OID %u does not exist"
 msgstr "no existe la clase de operadores con OID %u"
 
-#: catalog/aclchk.c:4758
+#: catalog/aclchk.c:4763
 #, c-format
 msgid "operator family with OID %u does not exist"
 msgstr "no existe la familia de operadores con OID %u"
 
-#: catalog/aclchk.c:4785
+#: catalog/aclchk.c:4790
 #, 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:4812
+#: catalog/aclchk.c:4817
 #, 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:4893 commands/event_trigger.c:586
+#: catalog/aclchk.c:4898 commands/event_trigger.c:586
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "no existe el disparador por eventos con OID %u"
 
-#: catalog/aclchk.c:4946
+#: catalog/aclchk.c:4951
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "no existe el ordenamiento (collation) con OID %u"
 
-#: catalog/aclchk.c:4972
+#: catalog/aclchk.c:4977
 #, c-format
 msgid "conversion with OID %u does not exist"
 msgstr "no existe la conversión con OID %u"
 
-#: catalog/aclchk.c:5013
+#: catalog/aclchk.c:5018
 #, c-format
 msgid "extension with OID %u does not exist"
 msgstr "no existe la extensión con OID %u"
 
-#: catalog/dependency.c:640
+#: catalog/dependency.c:639
 #, c-format
 msgid "cannot drop %s because %s requires it"
 msgstr "no se puede eliminar %s porque %s lo requiere"
 
-#: catalog/dependency.c:643
+#: catalog/dependency.c:642
 #, c-format
 msgid "You can drop %s instead."
 msgstr "Puede eliminar %s en su lugar."
 
-#: catalog/dependency.c:804 catalog/pg_shdepend.c:574
+#: catalog/dependency.c:803 catalog/pg_shdepend.c:576
 #, 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:920
+#: catalog/dependency.c:919
 #, c-format
 msgid "drop auto-cascades to %s"
 msgstr "eliminando automáticamente %s"
 
-#: catalog/dependency.c:932 catalog/dependency.c:941
+#: catalog/dependency.c:931 catalog/dependency.c:940
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s depende de %s"
 
-#: catalog/dependency.c:953 catalog/dependency.c:962
+#: catalog/dependency.c:952 catalog/dependency.c:961
 #, c-format
 msgid "drop cascades to %s"
 msgstr "eliminando además %s"
 
-#: catalog/dependency.c:970 catalog/pg_shdepend.c:685
+#: catalog/dependency.c:969 catalog/pg_shdepend.c:687
 #, c-format
 msgid ""
 "\n"
@@ -3258,190 +3226,201 @@
 "\n"
 "y otros %d objetos (vea el registro del servidor para obtener la lista)"
 
-#: catalog/dependency.c:982
+#: catalog/dependency.c:981
 #, 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:986 catalog/dependency.c:993
+#: catalog/dependency.c:985 catalog/dependency.c:992
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
 msgstr "Use DROP ... CASCADE para eliminar además los objetos dependientes."
 
-#: catalog/dependency.c:990
+#: catalog/dependency.c:989
 #, c-format
 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:999
+#: catalog/dependency.c:998
 #, 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:1622
+#: catalog/dependency.c:1621
 #, c-format
-msgid "constant of the type 'regrole' cannot be used here"
-msgstr ""
+msgid "constant of the type \"regrole\" cannot be used here"
+msgstr "no se puede usar una constante de tipo «regrole» aquí"
 
-#: catalog/heap.c:276
+#: catalog/heap.c:277
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "se ha denegado el permiso para crear «%s.%s»"
 
-#: catalog/heap.c:278
+#: catalog/heap.c:279
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "Las modificaciones al catálogo del sistema están actualmente deshabilitadas."
 
-#: catalog/heap.c:413 commands/tablecmds.c:1432 commands/tablecmds.c:1885
-#: commands/tablecmds.c:4786
+#: catalog/heap.c:414 commands/tablecmds.c:1435 commands/tablecmds.c:1888
+#: commands/tablecmds.c:4805
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "las tablas pueden tener a lo más %d columnas"
 
-#: catalog/heap.c:430 commands/tablecmds.c:5045
+#: catalog/heap.c:431 commands/tablecmds.c:5064
 #, 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:446
+#: catalog/heap.c:447
 #, 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:496
+#: catalog/heap.c:497
 #, c-format
 msgid "column \"%s\" has type \"unknown\""
 msgstr "la columna «%s» tiene tipo «unknown» (desconocido)"
 
-#: catalog/heap.c:497
+#: catalog/heap.c:498
 #, c-format
 msgid "Proceeding with relation creation anyway."
 msgstr "Continuando con la creación de la relación de todas maneras."
 
-#: catalog/heap.c:510
+#: catalog/heap.c:511
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "la columna «%s» tiene pseudotipo %s"
 
-#: catalog/heap.c:540
+#: catalog/heap.c:541
 #, 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:582 commands/createas.c:373
+#: catalog/heap.c:583 commands/createas.c:201 commands/createas.c:497
 #, 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:584 commands/createas.c:375 commands/indexcmds.c:1087
-#: commands/view.c:116 regex/regc_pg_locale.c:262 utils/adt/formatting.c:1514
-#: utils/adt/formatting.c:1566 utils/adt/formatting.c:1634
-#: utils/adt/formatting.c:1686 utils/adt/formatting.c:1755
-#: utils/adt/formatting.c:1819 utils/adt/like.c:213 utils/adt/selfuncs.c:5276
-#: utils/adt/varlena.c:1411 utils/adt/varlena.c:1800
+#: catalog/heap.c:585 commands/createas.c:204 commands/createas.c:500
+#: commands/indexcmds.c:1088 commands/view.c:103 regex/regc_pg_locale.c:262
+#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1754 utils/adt/formatting.c:1818
+#: utils/adt/like.c:213 utils/adt/selfuncs.c:5380 utils/adt/varlena.c:1411
+#: utils/adt/varlena.c:1800
 #, c-format
 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:1064 catalog/index.c:793 commands/tablecmds.c:2612
+#: catalog/heap.c:1066 catalog/index.c:793 commands/tablecmds.c:2615
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "la relación «%s» ya existe"
 
-#: catalog/heap.c:1080 catalog/pg_type.c:412 catalog/pg_type.c:722
+#: catalog/heap.c:1082 catalog/pg_type.c:412 catalog/pg_type.c:722
 #: commands/typecmds.c:235 commands/typecmds.c:782 commands/typecmds.c:1133
 #: commands/typecmds.c:1355 commands/typecmds.c:2109
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "ya existe un tipo «%s»"
 
-#: catalog/heap.c:1081
+#: catalog/heap.c:1083
 #, 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 "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:1109
-#, fuzzy, c-format
+#: catalog/heap.c:1111
+#, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
-msgstr "debe ser superusuario para conectarse en modo de actualización binaria"
+msgstr "el valor de OID de heap de pg_class no se definió en modo de actualización binaria"
 
-#: catalog/heap.c:2289
+#: catalog/heap.c:2292
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "la restricción «check» «%s» ya existe"
 
-#: catalog/heap.c:2444 catalog/pg_constraint.c:652 commands/tablecmds.c:6020
+#: catalog/heap.c:2459 catalog/pg_constraint.c:652 commands/tablecmds.c:6039
 #, 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:2454
+#: catalog/heap.c:2466
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
 msgstr "la restricción «%s» está en conflicto con la restricción no heredada de la relación «%s»"
 
-#: catalog/heap.c:2468
+#: catalog/heap.c:2477
+#, c-format
+msgid "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
+msgstr "la restricción «%s» está en conflicto con la restricción heredada de la relación «%s»"
+
+#: catalog/heap.c:2487
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
+msgstr "la restricción «%s» está en conflicto con la restricción NOT VALID de la relación «%s»"
+
+#: catalog/heap.c:2492
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "mezclando la restricción «%s» con la definición heredada"
 
-#: catalog/heap.c:2561
+#: catalog/heap.c:2598
 #, c-format
 msgid "cannot use column references in default expression"
 msgstr "no se pueden usar referencias a columnas en una cláusula default"
 
-#: catalog/heap.c:2572
+#: catalog/heap.c:2609
 #, c-format
 msgid "default expression must not return a set"
 msgstr "expresiones default no pueden retornar conjuntos"
 
-#: catalog/heap.c:2591 rewrite/rewriteHandler.c:1077
+#: catalog/heap.c:2628 rewrite/rewriteHandler.c:1077
 #, 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:2596 commands/prepare.c:374 parser/parse_node.c:411
-#: parser/parse_target.c:528 parser/parse_target.c:778
-#: parser/parse_target.c:788 rewrite/rewriteHandler.c:1082
+#: catalog/heap.c:2633 commands/prepare.c:374 parser/parse_node.c:411
+#: parser/parse_target.c:539 parser/parse_target.c:789
+#: parser/parse_target.c:799 rewrite/rewriteHandler.c:1082
 #, c-format
 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:2643
+#: catalog/heap.c:2680
 #, 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:2883
+#: catalog/heap.c:2920
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "combinación de ON COMMIT y llaves foráneas no soportada"
 
-#: catalog/heap.c:2884
+#: catalog/heap.c:2921
 #, c-format
 msgid "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting."
 msgstr "La tabla «%s» se refiere a «%s», pero no tienen la misma expresión para ON COMMIT."
 
-#: catalog/heap.c:2889
+#: catalog/heap.c:2926
 #, c-format
 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:2890
+#: catalog/heap.c:2927
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "La tabla «%s» hace referencia a «%s»."
 
-#: catalog/heap.c:2892
+#: catalog/heap.c:2929
 #, 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:205 parser/parse_utilcmd.c:1436 parser/parse_utilcmd.c:1522
+#: catalog/index.c:205 parser/parse_utilcmd.c:1438 parser/parse_utilcmd.c:1524
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "no se permiten múltiples llaves primarias para la tabla «%s»"
@@ -3466,16 +3445,16 @@
 msgid "shared indexes cannot be created after initdb"
 msgstr "no se pueden crear índices compartidos después de initdb"
 
-#: catalog/index.c:785 commands/createas.c:100 commands/sequence.c:141
+#: catalog/index.c:785 commands/createas.c:249 commands/sequence.c:141
 #: parser/parse_utilcmd.c:185
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "la relación «%s» ya existe, ignorando"
 
 #: catalog/index.c:821
-#, fuzzy, c-format
+#, c-format
 msgid "pg_class index OID value not set when in binary upgrade mode"
-msgstr "debe ser superusuario para conectarse en modo de actualización binaria"
+msgstr "el valor de OID de índice de pg_class no se definió en modo de actualización binaria"
 
 #: catalog/index.c:1423
 #, c-format
@@ -3493,12 +3472,12 @@
 msgstr "no se puede hacer reindex de tablas temporales de otras sesiones"
 
 #: catalog/index.c:3387
-#, fuzzy, c-format
+#, c-format
 msgid "index \"%s\" was reindexed"
-msgstr "la tabla «%s.%s» fue reindexada"
+msgstr "el índice «%s» fue reindexado"
 
-#: catalog/index.c:3389 commands/vacuumlazy.c:1131 commands/vacuumlazy.c:1207
-#: commands/vacuumlazy.c:1374 commands/vacuumlazy.c:1546
+#: catalog/index.c:3389 commands/vacuumlazy.c:1142 commands/vacuumlazy.c:1218
+#: commands/vacuumlazy.c:1385 commands/vacuumlazy.c:1557
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -3524,19 +3503,19 @@
 msgid "could not obtain lock on relation \"%s\""
 msgstr "no se pudo bloquear un candado en la relación «%s»"
 
-#: catalog/namespace.c:414 parser/parse_relation.c:1134
+#: catalog/namespace.c:414 parser/parse_relation.c:1138
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "no existe la relación «%s.%s»"
 
-#: catalog/namespace.c:419 parser/parse_relation.c:1147
-#: parser/parse_relation.c:1155 utils/adt/regproc.c:1035
+#: catalog/namespace.c:419 parser/parse_relation.c:1151
+#: parser/parse_relation.c:1159 utils/adt/regproc.c:1034
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "no existe la relación «%s»"
 
-#: catalog/namespace.c:487 catalog/namespace.c:2852 commands/extension.c:1394
-#: commands/extension.c:1400
+#: catalog/namespace.c:487 catalog/namespace.c:2852 commands/extension.c:1397
+#: commands/extension.c:1403
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "no se ha seleccionado ningún esquema dentro del cual crear"
@@ -3577,13 +3556,13 @@
 msgid "text search configuration \"%s\" does not exist"
 msgstr "no existe la configuración de búsqueda en texto «%s»"
 
-#: catalog/namespace.c:2646 parser/parse_expr.c:789 parser/parse_target.c:1130
+#: catalog/namespace.c:2646 parser/parse_expr.c:789 parser/parse_target.c:1141
 #, 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:2652 parser/parse_expr.c:796 parser/parse_target.c:1137
-#: gram.y:13291 gram.y:14645
+#: catalog/namespace.c:2652 parser/parse_expr.c:796 parser/parse_target.c:1148
+#: gram.y:13309 gram.y:14675
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "el nombre no es válido (demasiados puntos): %s"
@@ -3604,7 +3583,7 @@
 msgstr "no se puede mover objetos hacia o desde el esquema TOAST"
 
 #: catalog/namespace.c:2873 commands/schemacmds.c:238
-#: commands/schemacmds.c:317 commands/tablecmds.c:734
+#: commands/schemacmds.c:317 commands/tablecmds.c:737
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "no existe el esquema «%s»"
@@ -3635,12 +3614,12 @@
 msgstr "no se pueden crear tablas temporales durante la recuperación"
 
 #: catalog/namespace.c:3654
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create temporary tables in parallel mode"
-msgstr "no se pueden crear tablas temporales durante la recuperación"
+msgstr "no se pueden crear tablas temporales en modo paralelo"
 
-#: catalog/namespace.c:3898 commands/tablespace.c:1159 commands/variable.c:62
-#: replication/syncrep.c:700 utils/misc/guc.c:9604
+#: catalog/namespace.c:3898 commands/tablespace.c:1173 commands/variable.c:63
+#: replication/syncrep.c:692 utils/misc/guc.c:9667
 #, c-format
 msgid "List syntax is invalid."
 msgstr "La sintaxis de lista no es válida."
@@ -3649,7 +3628,7 @@
 msgid "database name cannot be qualified"
 msgstr "un nombre de base de datos no puede ser calificado"
 
-#: catalog/objectaddress.c:1024 commands/extension.c:2423
+#: catalog/objectaddress.c:1024 commands/extension.c:2426
 #, c-format
 msgid "extension name cannot be qualified"
 msgstr "un nombre de extensión no puede ser calificado"
@@ -3683,26 +3662,27 @@
 msgstr "un nombre de disparador por eventos no puede ser calificado"
 
 #: catalog/objectaddress.c:1158 commands/lockcmds.c:94 commands/policy.c:94
-#: commands/policy.c:381 commands/tablecmds.c:214 commands/tablecmds.c:1293
-#: commands/tablecmds.c:4326 commands/tablecmds.c:7938
+#: commands/policy.c:384 commands/policy.c:473 commands/tablecmds.c:216
+#: commands/tablecmds.c:1296 commands/tablecmds.c:4339
+#: commands/tablecmds.c:7988
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "«%s» no es una tabla"
 
-#: catalog/objectaddress.c:1165 commands/tablecmds.c:226
-#: commands/tablecmds.c:4350 commands/tablecmds.c:11895 commands/view.c:155
+#: catalog/objectaddress.c:1165 commands/tablecmds.c:228
+#: commands/tablecmds.c:4369 commands/tablecmds.c:12123 commands/view.c:141
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "«%s» no es una vista"
 
 #: catalog/objectaddress.c:1172 commands/matview.c:174
-#: commands/tablecmds.c:232 commands/tablecmds.c:11900
+#: commands/tablecmds.c:234 commands/tablecmds.c:12128
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "«%s» no es una vista materializada"
 
-#: catalog/objectaddress.c:1179 commands/tablecmds.c:250
-#: commands/tablecmds.c:4353 commands/tablecmds.c:11905
+#: catalog/objectaddress.c:1179 commands/tablecmds.c:252
+#: commands/tablecmds.c:4372 commands/tablecmds.c:12133
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "«%s» no es una tabla foránea"
@@ -3713,182 +3693,178 @@
 msgstr "el nombre de columna debe ser calificado"
 
 #: catalog/objectaddress.c:1420
-#, fuzzy, c-format
+#, c-format
 msgid "default value for column \"%s\" of relation \"%s\" does not exist"
-msgstr "no existe la columna «%s» en la relación «%s»"
+msgstr "no existe el valor por omisión para la columna «%s» de la relación «%s»"
 
 #: catalog/objectaddress.c:1460 commands/functioncmds.c:128
-#: commands/tablecmds.c:242 commands/typecmds.c:3210 parser/parse_type.c:227
-#: parser/parse_type.c:256 parser/parse_type.c:824 utils/adt/acl.c:4373
-#: utils/adt/regproc.c:1226
+#: commands/tablecmds.c:244 commands/typecmds.c:3210 parser/parse_type.c:226
+#: parser/parse_type.c:255 parser/parse_type.c:795 utils/adt/acl.c:4373
+#: utils/adt/regproc.c:1225
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "no existe el tipo «%s»"
 
 #: catalog/objectaddress.c:1577
-#, fuzzy, c-format
+#, c-format
 msgid "operator %d (%s, %s) of %s does not exist"
-msgstr "operador %d (%s, %s) de %s: %s"
+msgstr "no existe el operador %d (%s, %s) de %s"
 
-#: catalog/objectaddress.c:1606
-#, fuzzy, c-format
+#: catalog/objectaddress.c:1608
+#, c-format
 msgid "function %d (%s, %s) of %s does not exist"
-msgstr "función %d (%s, %s) de %s: %s"
+msgstr "no existe la función %d (%s, %s) de %s"
 
-#: catalog/objectaddress.c:1655 catalog/objectaddress.c:1681
-#, fuzzy, c-format
-msgid "user mapping for user \"%s\" in server \"%s\" does not exist"
-msgstr "no existe un mapeo para el tipo de elemento «%s»"
+#: catalog/objectaddress.c:1659 catalog/objectaddress.c:1685
+#, c-format
+msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
+msgstr "no existe el mapeo para el usuario «%s» en el servidor «%s»"
 
-#: catalog/objectaddress.c:1670 commands/foreigncmds.c:430
+#: catalog/objectaddress.c:1674 commands/foreigncmds.c:430
 #: commands/foreigncmds.c:997 commands/foreigncmds.c:1359
 #: foreign/foreign.c:691
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "no existe el servidor «%s»"
 
-#: catalog/objectaddress.c:1742
-#, fuzzy, c-format
+#: catalog/objectaddress.c:1746
+#, c-format
 msgid "unrecognized default ACL object type %c"
-msgstr "tipo de locktag %d no reconocido"
+msgstr "tipo de objeto %c para ACL por omisión no reconocido"
 
-#: catalog/objectaddress.c:1743
+#: catalog/objectaddress.c:1747
 #, c-format
-msgid "Valid object types are 'r', 'S', 'f', and 'T'."
-msgstr ""
+msgid "Valid object types are \"r\", \"S\", \"f\", and \"T\"."
+msgstr "Tipos válidos de objeto son «t», «S», «f» y «T»."
 
-#: catalog/objectaddress.c:1789
-#, fuzzy, c-format
+#: catalog/objectaddress.c:1793
+#, c-format
 msgid "default ACL for user \"%s\" in schema \"%s\" on %s does not exist"
-msgstr "no existe el procedimiento por omisión de conversión desde la codificación «%s» a «%s»"
+msgstr "no existe el ACL por omisión para el usuario «%s» en el esquema «%s» en %s"
 
-#: catalog/objectaddress.c:1794
-#, fuzzy, c-format
+#: catalog/objectaddress.c:1798
+#, c-format
 msgid "default ACL for user \"%s\" on %s does not exist"
-msgstr "no existe el usuario LDAP «%s»"
+msgstr "no existe el ACL por omisión para el usuario «%s» en %s"
 
-#: catalog/objectaddress.c:1821 catalog/objectaddress.c:1877
-#: catalog/objectaddress.c:1932
-#, fuzzy, c-format
+#: catalog/objectaddress.c:1825 catalog/objectaddress.c:1881
+#: catalog/objectaddress.c:1936
+#, c-format
 msgid "name or argument lists may not contain nulls"
-msgstr "el array no debe contener nulls"
+msgstr "las listas de nombres o argumentos no pueden contener nulls"
 
-#: catalog/objectaddress.c:1853
-#, fuzzy, c-format
+#: catalog/objectaddress.c:1857
+#, c-format
 msgid "unsupported object type \"%s\""
-msgstr "lenguaje no soportado: «%s»"
+msgstr "tipo de objeto «%s» no soportado"
 
-#: catalog/objectaddress.c:1873 catalog/objectaddress.c:1891
+#: catalog/objectaddress.c:1877 catalog/objectaddress.c:1895
 #, c-format
 msgid "name list length must be exactly %d"
-msgstr ""
+msgstr "el largo de la lista de nombres debe ser exactamente %d"
 
-#: catalog/objectaddress.c:1895
-#, fuzzy, c-format
+#: catalog/objectaddress.c:1899
+#, c-format
 msgid "large object OID may not be null"
-msgstr "el argumento %d no puede ser null"
+msgstr "el OID de objeto grande no puede ser null"
 
-#: catalog/objectaddress.c:1904
+#: catalog/objectaddress.c:1908 catalog/objectaddress.c:1968
+#: catalog/objectaddress.c:1975
 #, c-format
-msgid "name list must be of length at least %d"
-msgstr ""
+msgid "name list length must be at least %d"
+msgstr "el largo de la lista de nombres debe ser al menos %d"
 
-#: catalog/objectaddress.c:1957 catalog/objectaddress.c:1977
-#, fuzzy, c-format
+#: catalog/objectaddress.c:1961 catalog/objectaddress.c:1981
+#, c-format
 msgid "argument list length must be exactly %d"
-msgstr "el argumento de %s debe ser un nombre de tipo"
-
-#: catalog/objectaddress.c:1964 catalog/objectaddress.c:1971
-#, fuzzy, c-format
-msgid "name list length must be at least %d"
-msgstr "el largo para el tipo %s debe ser al menos 1"
+msgstr "el largo de la lista de argumentos debe ser exactamente %d"
 
-#: catalog/objectaddress.c:2113 libpq/be-fsstubs.c:352
+#: catalog/objectaddress.c:2117 libpq/be-fsstubs.c:352
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "debe ser dueño del objeto grande %u"
 
-#: catalog/objectaddress.c:2128 commands/functioncmds.c:1386
+#: catalog/objectaddress.c:2132 commands/functioncmds.c:1386
 #, 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:2168 catalog/objectaddress.c:2184
+#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2188
 #, c-format
 msgid "must be superuser"
 msgstr "debe ser superusuario"
 
-#: catalog/objectaddress.c:2175
+#: catalog/objectaddress.c:2179
 #, c-format
 msgid "must have CREATEROLE privilege"
 msgstr "debe tener privilegio CREATEROLE"
 
-#: catalog/objectaddress.c:2254
-#, fuzzy, c-format
+#: catalog/objectaddress.c:2253
+#, c-format
 msgid "unrecognized object type \"%s\""
-msgstr "tipo de locktag %d no reconocido"
+msgstr "tipo de objeto «%s» no reconocido"
 
-#: catalog/objectaddress.c:2449
+#: catalog/objectaddress.c:2448
 #, c-format
 msgid " column %s"
 msgstr " columna %s"
 
-#: catalog/objectaddress.c:2455
+#: catalog/objectaddress.c:2454
 #, c-format
 msgid "function %s"
 msgstr "función %s"
 
-#: catalog/objectaddress.c:2460
+#: catalog/objectaddress.c:2459
 #, c-format
 msgid "type %s"
 msgstr "tipo %s"
 
-#: catalog/objectaddress.c:2490
+#: catalog/objectaddress.c:2489
 #, c-format
 msgid "cast from %s to %s"
 msgstr "conversión de %s a %s"
 
-#: catalog/objectaddress.c:2510
+#: catalog/objectaddress.c:2509
 #, c-format
 msgid "collation %s"
 msgstr "ordenamiento (collation) %s"
 
-#: catalog/objectaddress.c:2534
+#: catalog/objectaddress.c:2533
 #, c-format
 msgid "constraint %s on %s"
 msgstr "restricción «%s» en %s"
 
-#: catalog/objectaddress.c:2540
+#: catalog/objectaddress.c:2539
 #, c-format
 msgid "constraint %s"
 msgstr "restricción %s"
 
-#: catalog/objectaddress.c:2557
+#: catalog/objectaddress.c:2556
 #, c-format
 msgid "conversion %s"
 msgstr "conversión %s"
 
-#: catalog/objectaddress.c:2594
+#: catalog/objectaddress.c:2593
 #, c-format
 msgid "default for %s"
 msgstr "valor por omisión para %s"
 
-#: catalog/objectaddress.c:2603
+#: catalog/objectaddress.c:2602
 #, c-format
 msgid "language %s"
 msgstr "lenguaje %s"
 
-#: catalog/objectaddress.c:2608
+#: catalog/objectaddress.c:2607
 #, c-format
 msgid "large object %u"
 msgstr "objeto grande %u"
 
-#: catalog/objectaddress.c:2613
+#: catalog/objectaddress.c:2612
 #, c-format
 msgid "operator %s"
 msgstr "operador %s"
 
-#: catalog/objectaddress.c:2645
+#: catalog/objectaddress.c:2644
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "clase de operadores «%s» para el método de acceso «%s»"
@@ -3897,7 +3873,7 @@
 #. 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/objectaddress.c:2695
+#: catalog/objectaddress.c:2694
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "operador %d (%s, %s) de %s: %s"
@@ -3906,172 +3882,172 @@
 #. 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/objectaddress.c:2745
+#: catalog/objectaddress.c:2744
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "función %d (%s, %s) de %s: %s"
 
-#: catalog/objectaddress.c:2785
+#: catalog/objectaddress.c:2784
 #, c-format
 msgid "rule %s on "
 msgstr "regla «%s» en "
 
-#: catalog/objectaddress.c:2807
-#, fuzzy, c-format
+#: catalog/objectaddress.c:2806
+#, c-format
 msgid "transform for %s language %s"
-msgstr "permiso denegado al lenguaje %s"
+msgstr "transformación para %s lenguaje %s"
 
-#: catalog/objectaddress.c:2841
+#: catalog/objectaddress.c:2840
 #, c-format
 msgid "trigger %s on "
 msgstr "disparador %s en "
 
-#: catalog/objectaddress.c:2858
+#: catalog/objectaddress.c:2857
 #, c-format
 msgid "schema %s"
 msgstr "esquema %s"
 
-#: catalog/objectaddress.c:2871
+#: catalog/objectaddress.c:2870
 #, c-format
 msgid "text search parser %s"
 msgstr "analizador de búsqueda en texto %s"
 
-#: catalog/objectaddress.c:2886
+#: catalog/objectaddress.c:2885
 #, c-format
 msgid "text search dictionary %s"
 msgstr "diccionario de búsqueda en texto %s"
 
-#: catalog/objectaddress.c:2901
+#: catalog/objectaddress.c:2900
 #, c-format
 msgid "text search template %s"
 msgstr "plantilla de búsqueda en texto %s"
 
-#: catalog/objectaddress.c:2916
+#: catalog/objectaddress.c:2915
 #, c-format
 msgid "text search configuration %s"
 msgstr "configuración de búsqueda en texto %s"
 
-#: catalog/objectaddress.c:2924
+#: catalog/objectaddress.c:2923
 #, c-format
 msgid "role %s"
 msgstr "rol %s"
 
-#: catalog/objectaddress.c:2937
+#: catalog/objectaddress.c:2936
 #, c-format
 msgid "database %s"
 msgstr "base de datos %s"
 
-#: catalog/objectaddress.c:2949
+#: catalog/objectaddress.c:2948
 #, c-format
 msgid "tablespace %s"
 msgstr "tablespace %s"
 
-#: catalog/objectaddress.c:2958
+#: catalog/objectaddress.c:2957
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "conector de datos externos %s"
 
-#: catalog/objectaddress.c:2967
+#: catalog/objectaddress.c:2966
 #, c-format
 msgid "server %s"
 msgstr "servidor %s"
 
-#: catalog/objectaddress.c:2995
+#: catalog/objectaddress.c:2994
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "mapeo para el usuario %s en el servidor %s"
 
-#: catalog/objectaddress.c:3030
+#: catalog/objectaddress.c:3029
 #, 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/objectaddress.c:3035
+#: catalog/objectaddress.c:3034
 #, 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/objectaddress.c:3040
+#: catalog/objectaddress.c:3039
 #, 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/objectaddress.c:3045
+#: catalog/objectaddress.c:3044
 #, c-format
 msgid "default privileges on new types belonging to role %s"
 msgstr "privilegios por omisión en nuevos tipos pertenecientes al rol %s"
 
-#: catalog/objectaddress.c:3051
+#: catalog/objectaddress.c:3050
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "privilegios por omisión pertenecientes al rol %s"
 
-#: catalog/objectaddress.c:3059
+#: catalog/objectaddress.c:3058
 #, c-format
 msgid " in schema %s"
 msgstr " en esquema %s"
 
-#: catalog/objectaddress.c:3076
+#: catalog/objectaddress.c:3075
 #, c-format
 msgid "extension %s"
 msgstr "extensión %s"
 
-#: catalog/objectaddress.c:3089
+#: catalog/objectaddress.c:3088
 #, c-format
 msgid "event trigger %s"
 msgstr "disparador por eventos %s"
 
-#: catalog/objectaddress.c:3121
-#, fuzzy, c-format
+#: catalog/objectaddress.c:3120
+#, c-format
 msgid "policy %s on "
-msgstr "regla «%s» en "
+msgstr "política «%s» en "
 
-#: catalog/objectaddress.c:3184
+#: catalog/objectaddress.c:3183
 #, c-format
 msgid "table %s"
 msgstr "tabla %s"
 
-#: catalog/objectaddress.c:3188
+#: catalog/objectaddress.c:3187
 #, c-format
 msgid "index %s"
 msgstr "índice %s"
 
-#: catalog/objectaddress.c:3192
+#: catalog/objectaddress.c:3191
 #, c-format
 msgid "sequence %s"
 msgstr "secuencia %s"
 
-#: catalog/objectaddress.c:3196
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "toast table %s"
 msgstr "tabla toast %s"
 
-#: catalog/objectaddress.c:3200
+#: catalog/objectaddress.c:3199
 #, c-format
 msgid "view %s"
 msgstr "vista %s"
 
-#: catalog/objectaddress.c:3204
+#: catalog/objectaddress.c:3203
 #, c-format
 msgid "materialized view %s"
 msgstr "vista materializada %s"
 
-#: catalog/objectaddress.c:3208
+#: catalog/objectaddress.c:3207
 #, c-format
 msgid "composite type %s"
 msgstr "tipo compuesto %s"
 
-#: catalog/objectaddress.c:3212
+#: catalog/objectaddress.c:3211
 #, c-format
 msgid "foreign table %s"
 msgstr "tabla foránea %s"
 
-#: catalog/objectaddress.c:3217
+#: catalog/objectaddress.c:3216
 #, c-format
 msgid "relation %s"
 msgstr "relación %s"
 
-#: catalog/objectaddress.c:3254
+#: catalog/objectaddress.c:3253
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "familia de operadores %s para el método de acceso %s"
@@ -4118,7 +4094,7 @@
 msgid "return type of inverse transition function %s is not %s"
 msgstr "el tipo de retorno de la función inversa de transición %s no es %s"
 
-#: catalog/pg_aggregate.c:344 executor/nodeWindowAgg.c:2302
+#: catalog/pg_aggregate.c:344 executor/nodeWindowAgg.c:2335
 #, c-format
 msgid "strictness of aggregate's forward and inverse transition functions must match"
 msgstr "la opción «strict» de las funciones de transición directa e inversa deben coincidir exactamente en la función de agregación"
@@ -4198,22 +4174,22 @@
 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:813
+#: catalog/pg_constraint.c:794
 #, 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:825
+#: catalog/pg_constraint.c:806
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "no existe la restricción «%s» para la tabla «%s»"
 
-#: catalog/pg_constraint.c:871
+#: catalog/pg_constraint.c:852
 #, c-format
 msgid "domain \"%s\" has multiple constraints named \"%s\""
 msgstr "hay múltiples restricciones llamadas «%2$s» en el dominio «%1$s»"
 
-#: catalog/pg_constraint.c:883
+#: catalog/pg_constraint.c:864
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" does not exist"
 msgstr "no existe la restricción «%s» para el dominio «%s»"
@@ -4228,7 +4204,7 @@
 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:165 commands/extension.c:2945
+#: catalog/pg_depend.c:165 commands/extension.c:2948
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "«%s» ya es un miembro de la extensión «%s»"
@@ -4264,9 +4240,9 @@
 msgstr "«%s» no es una etiqueta de enum existente"
 
 #: catalog/pg_enum.c:349
-#, fuzzy, c-format
+#, c-format
 msgid "pg_enum OID value not set when in binary upgrade mode"
-msgstr "debe ser superusuario para conectarse en modo de actualización binaria"
+msgstr "el valor de OID de pg_enum no se definió en modo de actualización binaria"
 
 #: catalog/pg_enum.c:359
 #, c-format
@@ -4278,62 +4254,62 @@
 msgid "schema \"%s\" already exists"
 msgstr "ya existe el esquema «%s»"
 
-#: catalog/pg_operator.c:222 catalog/pg_operator.c:363
+#: catalog/pg_operator.c:223 catalog/pg_operator.c:364
 #, c-format
 msgid "\"%s\" is not a valid operator name"
 msgstr "«%s» no es un nombre válido de operador"
 
-#: catalog/pg_operator.c:372
+#: catalog/pg_operator.c:373
 #, c-format
 msgid "only binary operators can have commutators"
 msgstr "sólo los operadores binarios pueden tener conmutadores"
 
-#: catalog/pg_operator.c:376
+#: catalog/pg_operator.c:377
 #, c-format
 msgid "only binary operators can have join selectivity"
 msgstr "sólo los operadores binarios pueden tener selectividad de join"
 
-#: catalog/pg_operator.c:380
+#: catalog/pg_operator.c:381
 #, c-format
 msgid "only binary operators can merge join"
 msgstr "sólo los operadores binarios pueden ser usados en merge join"
 
-#: catalog/pg_operator.c:384
+#: catalog/pg_operator.c:385
 #, c-format
 msgid "only binary operators can hash"
 msgstr "sólo los operadores binarios pueden ser usados en hash"
 
-#: catalog/pg_operator.c:395
+#: catalog/pg_operator.c:396
 #, c-format
 msgid "only boolean operators can have negators"
 msgstr "sólo los operadores booleanos pueden tener negadores"
 
-#: catalog/pg_operator.c:399
+#: catalog/pg_operator.c:400
 #, c-format
 msgid "only boolean operators can have restriction selectivity"
 msgstr "sólo los operadores booleanos pueden tener selectividad de restricción"
 
-#: catalog/pg_operator.c:403
+#: catalog/pg_operator.c:404
 #, c-format
 msgid "only boolean operators can have join selectivity"
 msgstr "sólo los operadores booleanos pueden tener selectividad de join"
 
-#: catalog/pg_operator.c:407
+#: catalog/pg_operator.c:408
 #, c-format
 msgid "only boolean operators can merge join"
 msgstr "sólo los operadores booleanos pueden ser usados en merge join"
 
-#: catalog/pg_operator.c:411
+#: catalog/pg_operator.c:412
 #, c-format
 msgid "only boolean operators can hash"
 msgstr "sólo los operadores booleanos pueden ser usados en hash"
 
-#: catalog/pg_operator.c:423
+#: catalog/pg_operator.c:424
 #, c-format
 msgid "operator %s already exists"
 msgstr "ya existe un operador %s"
 
-#: catalog/pg_operator.c:616
+#: catalog/pg_operator.c:617
 #, c-format
 msgid "operator cannot be its own negator or sort operator"
 msgstr "un operador no puede ser su propio negador u operador de ordenamiento"
@@ -4431,12 +4407,12 @@
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "las funciones SQL no pueden tener argumentos de tipo %s"
 
-#: catalog/pg_proc.c:971 executor/functions.c:1421
+#: catalog/pg_proc.c:971 executor/functions.c:1430
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "función SQL «%s»"
 
-#: catalog/pg_shdepend.c:692
+#: catalog/pg_shdepend.c:694
 #, c-format
 msgid ""
 "\n"
@@ -4451,58 +4427,58 @@
 "\n"
 "y objetos en otras %d bases de datos (vea el registro del servidor para obtener la lista)"
 
-#: catalog/pg_shdepend.c:1004
+#: catalog/pg_shdepend.c:1006
 #, c-format
 msgid "role %u was concurrently dropped"
 msgstr "el rol %u fue eliminado por una transacción concurrente"
 
-#: catalog/pg_shdepend.c:1023
+#: catalog/pg_shdepend.c:1025
 #, c-format
 msgid "tablespace %u was concurrently dropped"
 msgstr "el tablespace %u fue eliminado por una transacción concurrente"
 
-#: catalog/pg_shdepend.c:1038
+#: catalog/pg_shdepend.c:1040
 #, 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:1083
+#: catalog/pg_shdepend.c:1085
 #, c-format
 msgid "owner of %s"
 msgstr "dueño de %s"
 
-#: catalog/pg_shdepend.c:1085
+#: catalog/pg_shdepend.c:1087
 #, c-format
 msgid "privileges for %s"
 msgstr "privilegios para %s"
 
-#: catalog/pg_shdepend.c:1087
-#, fuzzy, c-format
+#: catalog/pg_shdepend.c:1089
+#, c-format
 msgid "target of %s"
-msgstr "dueño de %s"
+msgstr "destino de %s"
 
 #. translator: %s will always be "database %s"
-#: catalog/pg_shdepend.c:1095
+#: catalog/pg_shdepend.c:1097
 #, 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:1206
+#: catalog/pg_shdepend.c:1208
 #, c-format
 msgid "cannot drop objects owned by %s because they are required by the database system"
 msgstr "no se puede eliminar objetos de propiedad de %s porque son requeridos por el sistema"
 
-#: catalog/pg_shdepend.c:1309
+#: catalog/pg_shdepend.c:1323
 #, 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:136 catalog/pg_type.c:454
-#, fuzzy, c-format
+#, c-format
 msgid "pg_type OID value not set when in binary upgrade mode"
-msgstr "debe ser superusuario para conectarse en modo de actualización binaria"
+msgstr "el valor de OID de pg_type no se definió en modo de actualización binaria"
 
 #: catalog/pg_type.c:253
 #, c-format
@@ -4535,8 +4511,8 @@
 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»"
 
-#: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4335
-#: commands/tablecmds.c:11783
+#: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4351
+#: commands/tablecmds.c:12011
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "«%s» no es una tabla o vista materializada"
@@ -4711,27 +4687,27 @@
 msgid "analyzing \"%s.%s\""
 msgstr "analizando «%s.%s»"
 
-#: commands/analyze.c:645
+#: commands/analyze.c:648
 #, 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:1201
+#: commands/analyze.c:1204
 #, 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»: 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:1280
+#: commands/analyze.c:1283
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no child tables"
-msgstr ""
+msgstr "saltando el análisis del árbol de herencia «%s.%s» --- este árbol no contiene tablas hijas"
 
-#: commands/analyze.c:1369
+#: commands/analyze.c:1372
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no analyzable child tables"
-msgstr ""
+msgstr "saltando el análisis del árbol de herencia «%s.%s» --- este árbol no contiene tablas hijas analizables"
 
-#: commands/analyze.c:1417 executor/execQual.c:2900
+#: commands/analyze.c:1420 commands/tablecmds.c:8050 executor/execQual.c:2900
 msgid "could not convert row type"
 msgstr "no se pudo convertir el tipo de registro"
 
@@ -4785,7 +4761,7 @@
 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:171 commands/tablecmds.c:9228 commands/tablecmds.c:10925
+#: commands/cluster.c:171 commands/tablecmds.c:9354 commands/tablecmds.c:11114
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "no existe el índice «%s» en la tabla «%s»"
@@ -4800,7 +4776,7 @@
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "no se puede hacer vacuum a tablas temporales de otras sesiones"
 
-#: commands/cluster.c:431 commands/tablecmds.c:10935
+#: commands/cluster.c:431 commands/tablecmds.c:11124
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "«%s» no es un índice de la tabla «%s»"
@@ -4820,27 +4796,27 @@
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "no se puede reordenar en el índice no válido «%s»"
 
-#: commands/cluster.c:918
+#: commands/cluster.c:920
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
 msgstr "reordenando «%s.%s» usando un recorrido de índice en «%s»"
 
-#: commands/cluster.c:924
+#: commands/cluster.c:926
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr "reordenando «%s.%s» usando un recorrido secuencial y ordenamiento"
 
-#: commands/cluster.c:929 commands/vacuumlazy.c:464
+#: commands/cluster.c:931 commands/vacuumlazy.c:469
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "haciendo vacuum a «%s.%s»"
 
-#: commands/cluster.c:1088
+#: commands/cluster.c:1090
 #, c-format
 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/cluster.c:1092
+#: commands/cluster.c:1094
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -4888,12 +4864,12 @@
 msgid "\"%s\" is not a table, view, materialized view, composite type, or foreign table"
 msgstr "«%s» no es una tabla, vista, vista materializada, tipo compuesto, o tabla foránea"
 
-#: commands/constraint.c:60 utils/adt/ri_triggers.c:2717
+#: commands/constraint.c:60 utils/adt/ri_triggers.c:2715
 #, 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:67 utils/adt/ri_triggers.c:2726
+#: commands/constraint.c:67 utils/adt/ri_triggers.c:2724
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "la función «%s» debe ser ejecutada AFTER ROW"
@@ -4975,449 +4951,449 @@
 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:880
+#: commands/copy.c:881
 #, c-format
-msgid "COPY FROM not supported with row level security."
-msgstr ""
+msgid "COPY FROM not supported with row-level security"
+msgstr "COPY FROM no está soportado con seguridad a nivel de registros"
 
-#: commands/copy.c:881
+#: commands/copy.c:882
 #, c-format
-msgid "Use direct INSERT statements instead."
-msgstr ""
+msgid "Use INSERT statements instead."
+msgstr "Use sentencias INSERT en su lugar."
 
-#: commands/copy.c:1021
+#: commands/copy.c:1061
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "el formato de COPY «%s» no es reconocido"
 
-#: commands/copy.c:1092 commands/copy.c:1106 commands/copy.c:1120
-#: commands/copy.c:1140
+#: commands/copy.c:1132 commands/copy.c:1146 commands/copy.c:1160
+#: commands/copy.c:1180
 #, 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:1153
+#: commands/copy.c:1193
 #, 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:1159 commands/dbcommands.c:232 commands/dbcommands.c:1427
+#: commands/copy.c:1199 commands/dbcommands.c:232 commands/dbcommands.c:1427
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "no se reconoce la opción «%s»"
 
-#: commands/copy.c:1170
+#: commands/copy.c:1210
 #, c-format
 msgid "cannot specify DELIMITER in BINARY mode"
 msgstr "no se puede especificar DELIMITER en modo BINARY"
 
-#: commands/copy.c:1175
+#: commands/copy.c:1215
 #, c-format
 msgid "cannot specify NULL in BINARY mode"
 msgstr "no se puede especificar NULL en modo BINARY"
 
-#: commands/copy.c:1197
+#: commands/copy.c:1237
 #, c-format
 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:1204
+#: commands/copy.c:1244
 #, c-format
 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:1210
+#: commands/copy.c:1250
 #, c-format
 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:1227
+#: commands/copy.c:1267
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "el delimitador de COPY no puede ser «%s»"
 
-#: commands/copy.c:1233
+#: commands/copy.c:1273
 #, c-format
 msgid "COPY HEADER available only in CSV mode"
 msgstr "el «header» de COPY está disponible sólo en modo CSV"
 
-#: commands/copy.c:1239
+#: commands/copy.c:1279
 #, c-format
 msgid "COPY quote available only in CSV mode"
 msgstr "el «quote» de COPY está disponible sólo en modo CSV"
 
-#: commands/copy.c:1244
+#: commands/copy.c:1284
 #, c-format
 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:1249
+#: commands/copy.c:1289
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "el delimitador de COPY y la comilla («quote») deben ser diferentes"
 
-#: commands/copy.c:1255
+#: commands/copy.c:1295
 #, c-format
 msgid "COPY escape available only in CSV mode"
 msgstr "escape de COPY disponible sólo en modo CSV"
 
-#: commands/copy.c:1260
+#: commands/copy.c:1300
 #, c-format
 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:1266
+#: commands/copy.c:1306
 #, c-format
 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:1270
+#: commands/copy.c:1310
 #, c-format
 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:1276
+#: commands/copy.c:1316
 #, c-format
 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:1280
+#: commands/copy.c:1320
 #, c-format
 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:1286
+#: commands/copy.c:1326
 #, c-format
 msgid "COPY force null available only in CSV mode"
 msgstr "el forzado de nulos en COPY sólo está disponible en modo CSV"
 
-#: commands/copy.c:1291
+#: commands/copy.c:1331
 #, c-format
 msgid "COPY force null only available using COPY FROM"
 msgstr "el forzado de nulos en COPY sólo está disponible usando COPY FROM"
 
-#: commands/copy.c:1297
+#: commands/copy.c:1337
 #, c-format
 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:1304
+#: commands/copy.c:1344
 #, c-format
 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:1367
+#: commands/copy.c:1407
 #, c-format
 msgid "table \"%s\" does not have OIDs"
 msgstr "la tabla «%s» no tiene OIDs"
 
-#: commands/copy.c:1384
+#: commands/copy.c:1424
 #, c-format
 msgid "COPY (SELECT) WITH OIDS is not supported"
 msgstr "COPY (SELECT) WITH OIDS no está soportado"
 
-#: commands/copy.c:1410
+#: commands/copy.c:1450
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) no está soportado"
 
-#: commands/copy.c:1440
+#: commands/copy.c:1480
 #, c-format
 msgid "relation referenced by COPY statement has changed"
-msgstr ""
+msgstr "la relación referenciada por la sentencia COPY ha cambiado"
 
-#: commands/copy.c:1498
+#: commands/copy.c:1538
 #, c-format
 msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
 msgstr "la columna «%s» con comillas forzadas no es referenciada por COPY"
 
-#: commands/copy.c:1520
+#: commands/copy.c:1560
 #, c-format
 msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
 msgstr "la columna «%s» especificada como FORCE NOT NULL no fue mencionada en COPY"
 
-#: commands/copy.c:1542
+#: commands/copy.c:1582
 #, c-format
 msgid "FORCE NULL column \"%s\" not referenced by COPY"
 msgstr "la columna «%s» especificada como FORCE NULL no fue mencionada en COPY"
 
-#: commands/copy.c:1607
+#: commands/copy.c:1647
 #, c-format
 msgid "could not close pipe to external command: %m"
 msgstr "no se pudo cerrar la tubería a la orden externa: %m"
 
-#: commands/copy.c:1611
+#: commands/copy.c:1651
 #, c-format
 msgid "program \"%s\" failed"
 msgstr "el programa «%s» falló"
 
-#: commands/copy.c:1661
+#: commands/copy.c:1701
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "no se puede copiar desde la vista «%s»"
 
-#: commands/copy.c:1663 commands/copy.c:1669 commands/copy.c:1675
+#: commands/copy.c:1703 commands/copy.c:1709 commands/copy.c:1715
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Intente la forma COPY (SELECT ...) TO."
 
-#: commands/copy.c:1667
+#: commands/copy.c:1707
 #, c-format
 msgid "cannot copy from materialized view \"%s\""
 msgstr "no se puede copiar desde la vista materializada «%s»"
 
-#: commands/copy.c:1673
+#: commands/copy.c:1713
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
 msgstr "no se puede copiar desde la tabla foránea «%s»"
 
-#: commands/copy.c:1679
+#: commands/copy.c:1719
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "no se puede copiar desde la secuencia «%s»"
 
-#: commands/copy.c:1684
+#: commands/copy.c:1724
 #, 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:1709 commands/copy.c:2747
+#: commands/copy.c:1749 commands/copy.c:2787
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "no se pudo ejecutar la orden «%s»: %m"
 
-#: commands/copy.c:1724
+#: commands/copy.c:1764
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "no se permiten rutas relativas para COPY hacia un archivo"
 
-#: commands/copy.c:1732
+#: commands/copy.c:1772
 #, 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:1744 commands/copy.c:2770
+#: commands/copy.c:1784 commands/copy.c:2810
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» es un directorio"
 
-#: commands/copy.c:2069
+#: commands/copy.c:2109
 #, c-format
 msgid "COPY %s, line %d, column %s"
 msgstr "COPY %s, línea %d, columna %s"
 
-#: commands/copy.c:2073 commands/copy.c:2120
+#: commands/copy.c:2113 commands/copy.c:2160
 #, c-format
 msgid "COPY %s, line %d"
 msgstr "COPY %s, línea %d"
 
-#: commands/copy.c:2084
+#: commands/copy.c:2124
 #, c-format
 msgid "COPY %s, line %d, column %s: \"%s\""
 msgstr "COPY %s, línea %d, columna %s: «%s»"
 
-#: commands/copy.c:2092
+#: commands/copy.c:2132
 #, c-format
 msgid "COPY %s, line %d, column %s: null input"
 msgstr "COPY %s, línea %d, columna %s: entrada nula"
 
-#: commands/copy.c:2114
+#: commands/copy.c:2154
 #, c-format
 msgid "COPY %s, line %d: \"%s\""
 msgstr "COPY %s, línea %d: «%s»"
 
-#: commands/copy.c:2198
+#: commands/copy.c:2238
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "no se puede copiar hacia la vista «%s»"
 
-#: commands/copy.c:2203
+#: commands/copy.c:2243
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
 msgstr "no se puede copiar hacia la vista materializada «%s»"
 
-#: commands/copy.c:2208
+#: commands/copy.c:2248
 #, c-format
 msgid "cannot copy to foreign table \"%s\""
 msgstr "no se puede copiar hacia la tabla foránea «%s»"
 
-#: commands/copy.c:2213
+#: commands/copy.c:2253
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "no se puede copiar hacia la secuencia «%s»"
 
-#: commands/copy.c:2218
+#: commands/copy.c:2258
 #, 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:2281
+#: commands/copy.c:2321
 #, c-format
 msgid "cannot perform FREEZE because of prior transaction activity"
 msgstr "no se puede ejecutar FREEZE debido a actividad anterior en la transacción"
 
-#: commands/copy.c:2287
+#: commands/copy.c:2327
 #, c-format
 msgid "cannot perform FREEZE because the table was not created or truncated in the current subtransaction"
 msgstr "no se puede ejecutar FREEZE porque la tabla no fue creada ni truncada en la subtransacción en curso"
 
-#: commands/copy.c:2758 commands/extension.c:3037 utils/adt/genfile.c:134
+#: commands/copy.c:2798 commands/extension.c:3040 utils/adt/genfile.c:134
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "no se pudo abrir archivo «%s» para lectura: %m"
 
-#: commands/copy.c:2790
+#: commands/copy.c:2830
 #, c-format
 msgid "COPY file signature not recognized"
 msgstr "el identificador del archivo COPY no es reconocido"
 
-#: commands/copy.c:2795
+#: commands/copy.c:2835
 #, c-format
 msgid "invalid COPY file header (missing flags)"
 msgstr "el encabezado del archivo COPY no es válido (faltan campos)"
 
-#: commands/copy.c:2801
+#: commands/copy.c:2841
 #, c-format
 msgid "unrecognized critical flags in COPY file header"
 msgstr "valores requeridos no reconocidos en encabezado de COPY"
 
-#: commands/copy.c:2807
+#: commands/copy.c:2847
 #, c-format
 msgid "invalid COPY file header (missing length)"
 msgstr "el encabezado del archivo COPY no es válido (falta el largo)"
 
-#: commands/copy.c:2814
+#: commands/copy.c:2854
 #, c-format
 msgid "invalid COPY file header (wrong length)"
 msgstr "el encabezado del archivo COPY no es válido (largo incorrecto)"
 
-#: commands/copy.c:2947 commands/copy.c:3654 commands/copy.c:3884
+#: commands/copy.c:2987 commands/copy.c:3694 commands/copy.c:3924
 #, c-format
 msgid "extra data after last expected column"
 msgstr "datos extra después de la última columna esperada"
 
-#: commands/copy.c:2957
+#: commands/copy.c:2997
 #, c-format
 msgid "missing data for OID column"
 msgstr "faltan datos para la columna OID"
 
-#: commands/copy.c:2963
+#: commands/copy.c:3003
 #, c-format
 msgid "null OID in COPY data"
 msgstr "OID nulo en datos COPY"
 
-#: commands/copy.c:2973 commands/copy.c:3096
+#: commands/copy.c:3013 commands/copy.c:3136
 #, c-format
 msgid "invalid OID in COPY data"
 msgstr "OID no válido en datos COPY"
 
-#: commands/copy.c:2988
+#: commands/copy.c:3028
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "faltan datos en la columna «%s»"
 
-#: commands/copy.c:3071
+#: commands/copy.c:3111
 #, c-format
 msgid "received copy data after EOF marker"
 msgstr "se recibieron datos de copy después del marcador EOF"
 
-#: commands/copy.c:3078
+#: commands/copy.c:3118
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "la cantidad de registros es %d, pero se esperaban %d"
 
-#: commands/copy.c:3418 commands/copy.c:3435
+#: commands/copy.c:3458 commands/copy.c:3475
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "se encontró un retorno de carro literal en los datos"
 
-#: commands/copy.c:3419 commands/copy.c:3436
+#: commands/copy.c:3459 commands/copy.c:3476
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "se encontró un retorno de carro fuera de comillas en los datos"
 
-#: commands/copy.c:3421 commands/copy.c:3438
+#: commands/copy.c:3461 commands/copy.c:3478
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Use «\\r» para representar el retorno de carro."
 
-#: commands/copy.c:3422 commands/copy.c:3439
+#: commands/copy.c:3462 commands/copy.c:3479
 #, c-format
 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:3451
+#: commands/copy.c:3491
 #, c-format
 msgid "literal newline found in data"
 msgstr "se encontró un salto de línea literal en los datos"
 
-#: commands/copy.c:3452
+#: commands/copy.c:3492
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "se encontró un salto de línea fuera de comillas en los datos"
 
-#: commands/copy.c:3454
+#: commands/copy.c:3494
 #, c-format
 msgid "Use \"\\n\" to represent newline."
 msgstr "Use «\\n» para representar un salto de línea."
 
-#: commands/copy.c:3455
+#: commands/copy.c:3495
 #, c-format
 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:3501 commands/copy.c:3537
+#: commands/copy.c:3541 commands/copy.c:3577
 #, c-format
 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:3510 commands/copy.c:3526
+#: commands/copy.c:3550 commands/copy.c:3566
 #, c-format
 msgid "end-of-copy marker corrupt"
 msgstr "marcador fin-de-copy corrupto"
 
-#: commands/copy.c:3968
+#: commands/copy.c:4008
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "un valor entre comillas está inconcluso"
 
-#: commands/copy.c:4045 commands/copy.c:4064
+#: commands/copy.c:4085 commands/copy.c:4104
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "EOF inesperado en datos de COPY"
 
-#: commands/copy.c:4054
+#: commands/copy.c:4094
 #, c-format
 msgid "invalid field size"
 msgstr "el tamaño de campo no es válido"
 
-#: commands/copy.c:4077
+#: commands/copy.c:4117
 #, c-format
 msgid "incorrect binary data format"
 msgstr "el formato de datos binarios es incorrecto"
 
-#: commands/copy.c:4388 commands/indexcmds.c:1008 commands/tablecmds.c:1457
-#: commands/tablecmds.c:2280 parser/parse_relation.c:3081
-#: parser/parse_relation.c:3101 utils/adt/tsvector_op.c:1417
+#: commands/copy.c:4428 commands/indexcmds.c:1009 commands/tablecmds.c:1460
+#: commands/tablecmds.c:2283 parser/parse_relation.c:3177
+#: parser/parse_relation.c:3197 utils/adt/tsvector_op.c:1418
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "no existe la columna «%s»"
 
-#: commands/copy.c:4395 commands/tablecmds.c:1483 commands/trigger.c:652
-#: parser/parse_target.c:956 parser/parse_target.c:967
+#: commands/copy.c:4435 commands/tablecmds.c:1486 commands/trigger.c:652
+#: parser/parse_target.c:967 parser/parse_target.c:978
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "la columna «%s» fue especificada más de una vez"
 
-#: commands/createas.c:383
+#: commands/createas.c:213 commands/createas.c:508
 #, c-format
 msgid "too many column names were specified"
 msgstr "se especificaron demasiados nombres de columna"
 
-#: commands/createas.c:452
-#, fuzzy, c-format
+#: commands/createas.c:549
+#, c-format
 msgid "policies not yet implemented for this command"
-msgstr "DISTINCT no está implementado para funciones de ventana deslizante"
+msgstr "las políticas no están implementadas para esta orden"
 
 #: commands/dbcommands.c:226
 #, c-format
@@ -5606,14 +5582,14 @@
 msgstr "algunos archivos inútiles pueden haber quedado en el directorio \"%s\""
 
 #: commands/dbcommands.c:1440
-#, fuzzy, c-format
+#, c-format
 msgid "option \"%s\" cannot be specified with other options"
-msgstr "el parámetro «%s» no se puede cambiar después de efectuar la conexión"
+msgstr "la opción «%s» no puede ser especificada con otras opciones"
 
 #: commands/dbcommands.c:1494
-#, fuzzy, c-format
+#, c-format
 msgid "cannot disallow connections for current database"
-msgstr "demasiadas conexiones para la base de datos «%s»"
+msgstr "no se pueden prohibir las conexiones para la base de datos actual"
 
 #: commands/dbcommands.c:1634
 #, c-format
@@ -5677,7 +5653,7 @@
 msgstr "argumento no válido para %s: «%s»"
 
 #: commands/dropcmds.c:112 commands/functioncmds.c:1166
-#: utils/adt/ruleutils.c:1950
+#: utils/adt/ruleutils.c:1954
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "«%s» es una función de agregación"
@@ -5687,19 +5663,19 @@
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Use DROP AGGREGATE para eliminar funciones de agregación."
 
-#: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2367
-#: commands/tablecmds.c:2518 commands/tablecmds.c:2560
-#: commands/tablecmds.c:11266 tcop/utility.c:1104
+#: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2370
+#: commands/tablecmds.c:2521 commands/tablecmds.c:2563
+#: commands/tablecmds.c:11494 tcop/utility.c:1104
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "no existe la relación «%s», ignorando"
 
-#: commands/dropcmds.c:195 commands/dropcmds.c:292 commands/tablecmds.c:739
+#: commands/dropcmds.c:195 commands/dropcmds.c:292 commands/tablecmds.c:742
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "el esquema «%s» no existe, ignorando"
 
-#: commands/dropcmds.c:237 commands/dropcmds.c:272 commands/tablecmds.c:243
+#: commands/dropcmds.c:237 commands/dropcmds.c:272 commands/tablecmds.c:245
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "el tipo «%s» no existe, ignorando"
@@ -5765,9 +5741,9 @@
 msgstr "no existe la conversión del tipo %s al tipo %s, ignorando"
 
 #: commands/dropcmds.c:372
-#, fuzzy, c-format
+#, c-format
 msgid "transform for type %s language \"%s\" does not exist, skipping"
-msgstr "el lenguaje «%s» no existe, ignorando"
+msgstr "la transformación para el tipo %s lenguaje «%s» no existe, ignorando"
 
 #: commands/dropcmds.c:380
 #, c-format
@@ -5775,9 +5751,9 @@
 msgstr "disparador «%s» para la relación «%s» no existe, ignorando"
 
 #: commands/dropcmds.c:389
-#, fuzzy, c-format
+#, c-format
 msgid "policy \"%s\" for relation \"%s\" does not exist, skipping"
-msgstr "la regla «%s» para la relación «%s» no existe, ignorando"
+msgstr "la política «%s» para la relación «%s» no existe, ignorando"
 
 #: commands/dropcmds.c:396
 #, c-format
@@ -5872,62 +5848,62 @@
 msgstr "%s sólo puede invocarse en una función de un disparador en el evento sql_drop"
 
 #: commands/event_trigger.c:1446 commands/event_trigger.c:1997
-#: commands/extension.c:1645 commands/extension.c:1754
-#: commands/extension.c:1947 commands/prepare.c:701 executor/execQual.c:1735
-#: executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5376
-#: executor/functions.c:1021 foreign/foreign.c:491
-#: replication/logical/logicalfuncs.c:312 replication/logical/origin.c:1410
-#: replication/slotfuncs.c:173 replication/walsender.c:2742
+#: commands/extension.c:1648 commands/extension.c:1757
+#: commands/extension.c:1950 commands/prepare.c:701 executor/execQual.c:1735
+#: executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5431
+#: executor/functions.c:1030 foreign/foreign.c:491
+#: replication/logical/logicalfuncs.c:324 replication/logical/origin.c:1394
+#: replication/slotfuncs.c:173 replication/walsender.c:2765
 #: utils/adt/jsonfuncs.c:1474 utils/adt/jsonfuncs.c:1606
 #: utils/adt/jsonfuncs.c:1796 utils/adt/jsonfuncs.c:1925
 #: utils/adt/jsonfuncs.c:2693 utils/adt/pgstatfuncs.c:547
-#: utils/fmgr/funcapi.c:61 utils/misc/guc.c:8175 utils/mmgr/portalmem.c:1052
+#: utils/fmgr/funcapi.c:61 utils/misc/guc.c:8228 utils/mmgr/portalmem.c:1052
 #, c-format
 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/event_trigger.c:1450 commands/event_trigger.c:2001
-#: commands/extension.c:1649 commands/extension.c:1758
-#: commands/extension.c:1951 commands/prepare.c:705 foreign/foreign.c:496
-#: replication/logical/logicalfuncs.c:316 replication/logical/origin.c:1414
-#: replication/slotfuncs.c:177 replication/walsender.c:2746
-#: utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8179
+#: commands/extension.c:1652 commands/extension.c:1761
+#: commands/extension.c:1954 commands/prepare.c:705 foreign/foreign.c:496
+#: replication/logical/logicalfuncs.c:328 replication/logical/origin.c:1398
+#: replication/slotfuncs.c:177 replication/walsender.c:2769
+#: utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8232
 #: utils/mmgr/portalmem.c:1056
 #, c-format
 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/event_trigger.c:1559 commands/event_trigger.c:1580
-#, fuzzy, c-format
+#, c-format
 msgid "%s can only be called in a table_rewrite event trigger function"
-msgstr "%s sólo puede invocarse en una función de un disparador en el evento sql_drop"
+msgstr "%s sólo puede invocarse en una función de un disparador en el evento table_rewrite"
 
 #: commands/event_trigger.c:1990
-#, fuzzy, c-format
+#, c-format
 msgid "%s can only be called in an event trigger function"
-msgstr "%s sólo puede invocarse en una función de un disparador en el evento sql_drop"
+msgstr "%s sólo puede invocarse en una función de un disparador por eventos"
 
-#: commands/explain.c:184
+#: commands/explain.c:185
 #, 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:190
+#: commands/explain.c:191
 #, c-format
 msgid "unrecognized EXPLAIN option \"%s\""
 msgstr "opción de EXPLAIN no reconocida «%s»"
 
-#: commands/explain.c:197
+#: commands/explain.c:198
 #, c-format
 msgid "EXPLAIN option BUFFERS requires ANALYZE"
 msgstr "la opción BUFFERS de EXPLAIN requiere ANALYZE"
 
-#: commands/explain.c:206
+#: commands/explain.c:207
 #, c-format
 msgid "EXPLAIN option TIMING requires ANALYZE"
 msgstr "la opción TIMING de EXPLAIN requiere ANALYZE"
 
-#: commands/extension.c:152 commands/extension.c:2635
+#: commands/extension.c:152 commands/extension.c:2638
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "no existe la extensión «%s»"
@@ -6014,130 +5990,130 @@
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
 msgstr "el parámetro «schema» no puede ser especificado cuando «relocatable» es verdadero"
 
-#: commands/extension.c:719
+#: commands/extension.c:722
 #, c-format
 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"
 
-#: commands/extension.c:787
+#: commands/extension.c:790
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "se ha denegado el permiso para crear la extensión «%s»"
 
-#: commands/extension.c:789
+#: commands/extension.c:792
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "Debe ser superusuario para crear esta extensión."
 
-#: commands/extension.c:793
+#: commands/extension.c:796
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "se ha denegado el permiso para actualizar la extensión «%s»"
 
-#: commands/extension.c:795
+#: commands/extension.c:798
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "Debe ser superusuario para actualizar esta extensión."
 
-#: commands/extension.c:1077
+#: commands/extension.c:1080
 #, c-format
 msgid "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
 msgstr "la extensión «%s» no tiene ruta de actualización desde la versión «%s» hasta la versión «%s»"
 
-#: commands/extension.c:1205
+#: commands/extension.c:1208
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "la extensión «%s» ya existe, ignorando"
 
-#: commands/extension.c:1212
+#: commands/extension.c:1215
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "la extensión «%s» ya existe"
 
-#: commands/extension.c:1223
+#: commands/extension.c:1226
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "los CREATE EXTENSION anidados no están soportados"
 
-#: commands/extension.c:1278 commands/extension.c:2695
+#: commands/extension.c:1281 commands/extension.c:2698
 #, c-format
 msgid "version to install must be specified"
 msgstr "la versión a instalar debe ser especificada"
 
-#: commands/extension.c:1295
+#: commands/extension.c:1298
 #, c-format
 msgid "FROM version must be different from installation target version \"%s\""
 msgstr "la versión FROM debe ser diferente de la versión destino de instalación «%s»"
 
-#: commands/extension.c:1350
+#: commands/extension.c:1353
 #, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
 msgstr "la extensión «%s» debe ser instalada en el esquema «%s»"
 
-#: commands/extension.c:1434 commands/extension.c:2840
+#: commands/extension.c:1437 commands/extension.c:2843
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "la extensión requerida «%s» no está instalada"
 
-#: commands/extension.c:1597
+#: commands/extension.c:1600
 #, c-format
 msgid "cannot drop extension \"%s\" because it is being modified"
 msgstr "no se puede eliminar la extensión «%s» porque está siendo modificada"
 
-#: commands/extension.c:2068
+#: commands/extension.c:2071
 #, c-format
 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"
 
-#: commands/extension.c:2080
+#: commands/extension.c:2083
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "el OID %u no hace referencia a una tabla"
 
-#: commands/extension.c:2085
+#: commands/extension.c:2088
 #, c-format
 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"
 
-#: commands/extension.c:2450
+#: commands/extension.c:2453
 #, c-format
 msgid "cannot move extension \"%s\" into schema \"%s\" because the extension contains the schema"
 msgstr "no se puede mover la extensión «%s» al esquema «%s» porque la extensión contiene al esquema"
 
-#: commands/extension.c:2490 commands/extension.c:2553
+#: commands/extension.c:2493 commands/extension.c:2556
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "la extensión «%s» no soporta SET SCHEMA"
 
-#: commands/extension.c:2555
+#: commands/extension.c:2558
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
 msgstr "%s no está en el esquema de la extensión, «%s»"
 
-#: commands/extension.c:2615
+#: commands/extension.c:2618
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "los ALTER EXTENSION anidados no están soportados"
 
-#: commands/extension.c:2706
+#: commands/extension.c:2709
 #, 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:2957
+#: commands/extension.c:2960
 #, c-format
 msgid "cannot add schema \"%s\" to extension \"%s\" because the schema contains the extension"
 msgstr "no se puede agregar el esquema «%s» a la extensión «%s» porque el esquema contiene la extensión"
 
-#: commands/extension.c:2975
+#: commands/extension.c:2978
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s no es un miembro de la extensión «%s»"
 
-#: commands/extension.c:3031
-#, fuzzy, c-format
-msgid "file too large"
-msgstr "el tsquery es demasiado grande"
+#: commands/extension.c:3034
+#, c-format
+msgid "file \"%s\" is too large"
+msgstr "el archivo «%s» es demasiado grande"
 
 #: commands/foreigncmds.c:150 commands/foreigncmds.c:159
 #, c-format
@@ -6230,14 +6206,14 @@
 msgstr "el conector de datos externos «%s» no tiene manejador"
 
 #: commands/foreigncmds.c:1538
-#, fuzzy, c-format
+#, c-format
 msgid "foreign-data wrapper \"%s\" does not support IMPORT FOREIGN SCHEMA"
-msgstr "no existe el conector de datos externos «%s»"
+msgstr "el conector de datos externos «%s» no soporta IMPORT FOREIGN SCHEMA"
 
 #: commands/foreigncmds.c:1631
-#, fuzzy, c-format
+#, c-format
 msgid "importing foreign table \"%s\""
-msgstr "no se puede insertar en la tabla foránea «%s»"
+msgstr "importando la tabla foránea «%s»"
 
 #: commands/functioncmds.c:99
 #, c-format
@@ -6249,7 +6225,7 @@
 msgid "return type %s is only a shell"
 msgstr "el tipo de retorno %s está inconcluso"
 
-#: commands/functioncmds.c:134 parser/parse_type.c:338
+#: commands/functioncmds.c:134 parser/parse_type.c:337
 #, 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»"
@@ -6496,64 +6472,64 @@
 msgstr "no existe la conversión del tipo %s al tipo %s"
 
 #: commands/functioncmds.c:1716
-#, fuzzy, c-format
+#, c-format
 msgid "transform function must not be volatile"
-msgstr "la función de conversión no debe ser volatile"
+msgstr "la función de transformación no debe ser volatile"
 
 #: commands/functioncmds.c:1720
-#, fuzzy, c-format
+#, c-format
 msgid "transform function must not be an aggregate function"
-msgstr "la función de conversión no debe ser una función de agregación"
+msgstr "la función de transformación no debe ser una función de agregación"
 
 #: commands/functioncmds.c:1724
-#, fuzzy, c-format
+#, c-format
 msgid "transform function must not be a window function"
-msgstr "la función de conversión no debe ser una función de ventana deslizante"
+msgstr "la función de transformación no debe ser una función de ventana deslizante"
 
 #: commands/functioncmds.c:1728
-#, fuzzy, c-format
+#, c-format
 msgid "transform function must not return a set"
-msgstr "la función de conversión no debe retornar un conjunto"
+msgstr "la función de transformación no debe retornar un conjunto"
 
 #: commands/functioncmds.c:1732
-#, fuzzy, c-format
+#, c-format
 msgid "transform function must take one argument"
-msgstr "la función de conversión lleva de uno a tres argumentos"
+msgstr "la función de transformación debe recibir un argumento"
 
 #: commands/functioncmds.c:1736
-#, fuzzy, c-format
+#, c-format
 msgid "first argument of transform function must be type \"internal\""
-msgstr "el segundo argumento de la función de conversión debe ser entero"
+msgstr "el primer argumento de la función de transformación debe ser «internal»"
 
 #: commands/functioncmds.c:1773
-#, fuzzy, c-format
+#, c-format
 msgid "data type %s is a pseudo-type"
-msgstr "el tipo de origen %s es un pseudotipo"
+msgstr "el tipo de dato %s es un pseudo-tipo"
 
 #: commands/functioncmds.c:1779
-#, fuzzy, c-format
+#, c-format
 msgid "data type %s is a domain"
-msgstr "tipo «%s» no es un dominio"
+msgstr "tipo de dato «%s» es un dominio"
 
 #: commands/functioncmds.c:1819
-#, fuzzy, c-format
+#, c-format
 msgid "return data type of FROM SQL function must be \"internal\""
-msgstr "el tipo de salida de la función de conversión debe coincidir o ser binario-convertible con el tipo de retorno"
+msgstr "el tipo de retorno de la función FROM SQL debe ser «internal»"
 
 #: commands/functioncmds.c:1844
-#, fuzzy, c-format
+#, c-format
 msgid "return data type of TO SQL function must be the transform data type"
-msgstr "el tipo de salida de la función de conversión debe coincidir o ser binario-convertible con el tipo de retorno"
+msgstr "el tipo de retorn de la función TO SQL debe ser el tipo de dato de la transformación"
 
 #: commands/functioncmds.c:1871
-#, fuzzy, c-format
+#, c-format
 msgid "transform for type %s language \"%s\" already exists"
-msgstr "ya existe el lenguaje «%s»"
+msgstr "la transformación para el tipo %s lenguaje «%s» ya existe"
 
 #: commands/functioncmds.c:1962
-#, fuzzy, c-format
+#, c-format
 msgid "transform for type %s language \"%s\" does not exist"
-msgstr "no existe el lenguaje «%s»"
+msgstr "la transformación para el tipo %s lenguaje «%s» no existe"
 
 #: commands/functioncmds.c:2013
 #, c-format
@@ -6570,7 +6546,7 @@
 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:159 commands/indexcmds.c:487
+#: commands/indexcmds.c:159 commands/indexcmds.c:488
 #: commands/opclasscmds.c:360 commands/opclasscmds.c:786
 #: commands/opclasscmds.c:1749
 #, c-format
@@ -6597,134 +6573,134 @@
 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:446 commands/tablecmds.c:539 commands/tablecmds.c:9539
+#: commands/indexcmds.c:447 commands/tablecmds.c:542 commands/tablecmds.c:9665
 #, c-format
 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:479
+#: commands/indexcmds.c:480
 #, c-format
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "sustituyendo el método de acceso obsoleto «rtree» por «gist»"
 
-#: commands/indexcmds.c:496
+#: commands/indexcmds.c:497
 #, c-format
 msgid "hash indexes are not WAL-logged and their use is discouraged"
-msgstr ""
+msgstr "los índices hash no son registrados en WAL y se recomienda no usarlos"
 
-#: commands/indexcmds.c:501
+#: commands/indexcmds.c:502
 #, 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:506
+#: commands/indexcmds.c:507
 #, 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:511
+#: commands/indexcmds.c:512
 #, 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:590
+#: commands/indexcmds.c:591
 #, 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:937
+#: commands/indexcmds.c:938
 #, c-format
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "las funciones utilizadas en predicados de índice deben estar marcadas IMMUTABLE"
 
-#: commands/indexcmds.c:1003 parser/parse_utilcmd.c:1844
+#: commands/indexcmds.c:1004 parser/parse_utilcmd.c:1846
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "no existe la columna «%s» en la llave"
 
-#: commands/indexcmds.c:1063
+#: commands/indexcmds.c:1064
 #, c-format
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr "las funciones utilizadas en expresiones de índice deben estar marcadas IMMUTABLE"
 
-#: commands/indexcmds.c:1086
+#: commands/indexcmds.c:1087
 #, c-format
 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:1094 commands/typecmds.c:825 parser/parse_expr.c:2559
-#: parser/parse_type.c:551 parser/parse_utilcmd.c:2736 utils/adt/misc.c:546
+#: commands/indexcmds.c:1095 commands/typecmds.c:825 parser/parse_expr.c:2583
+#: parser/parse_type.c:550 parser/parse_utilcmd.c:2738 utils/adt/misc.c:546
 #, 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:1132
+#: commands/indexcmds.c:1133
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "el operador %s no es conmutativo"
 
-#: commands/indexcmds.c:1134
+#: commands/indexcmds.c:1135
 #, c-format
 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:1160
+#: commands/indexcmds.c:1161
 #, 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:1163
+#: commands/indexcmds.c:1164
 #, c-format
 msgid "The exclusion operator must be related to the index operator class for the constraint."
 msgstr "El operador de exclusión debe estar relacionado con la clase de operadores del índice para la restricción."
 
-#: commands/indexcmds.c:1198
+#: commands/indexcmds.c:1199
 #, 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:1203
+#: commands/indexcmds.c:1204
 #, 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:1259 commands/typecmds.c:1932
+#: commands/indexcmds.c:1260 commands/typecmds.c:1932
 #, 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:1261
+#: commands/indexcmds.c:1262
 #, c-format
 msgid "You must specify an operator class for the index or define a default operator class for the data type."
 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:1290 commands/indexcmds.c:1298
+#: commands/indexcmds.c:1291 commands/indexcmds.c:1299
 #: commands/opclasscmds.c:204
 #, 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:1311 commands/typecmds.c:1920
+#: commands/indexcmds.c:1312 commands/typecmds.c:1920
 #, 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:1401
+#: commands/indexcmds.c:1402
 #, 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:1792
+#: commands/indexcmds.c:1793
 #, c-format
 msgid "table \"%s\" has no indexes"
 msgstr "la tabla «%s» no tiene índices"
 
-#: commands/indexcmds.c:1847
+#: commands/indexcmds.c:1848
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "sólo se puede reindexar la base de datos actualmente abierta"
 
-#: commands/indexcmds.c:1949
+#: commands/indexcmds.c:1950
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "la tabla «%s.%s» fue reindexada"
@@ -6741,8 +6717,8 @@
 
 #: commands/matview.c:611
 #, c-format
-msgid "new data for \"%s\" contains duplicate rows without any null columns"
-msgstr "nuevos datos para «%s» contiene filas duplicadas sin columnas nulas"
+msgid "new data for materialized view \"%s\" contains duplicate rows without any null columns"
+msgstr "nuevos datos para la vista materializada «%s» contiene filas duplicadas sin columnas nulas"
 
 #: commands/matview.c:613
 #, c-format
@@ -6926,80 +6902,86 @@
 msgid "operator family \"%s\" for access method \"%s\" already exists in schema \"%s\""
 msgstr "ya existe una familia de operadores «%s» para el método de acceso «%s» en el esquema «%s»"
 
-#: commands/operatorcmds.c:109 commands/operatorcmds.c:117
+#: commands/operatorcmds.c:110 commands/operatorcmds.c:118
 #, c-format
 msgid "SETOF type not allowed for operator argument"
 msgstr "no se permite un tipo SETOF en los argumentos de un operador"
 
-#: commands/operatorcmds.c:145
+#: commands/operatorcmds.c:146
 #, c-format
 msgid "operator attribute \"%s\" not recognized"
 msgstr "el atributo de operador «%s» no es reconocido"
 
-#: commands/operatorcmds.c:155
+#: commands/operatorcmds.c:156
 #, c-format
 msgid "operator procedure must be specified"
 msgstr "debe especificarse un procedimiento de operador"
 
-#: commands/operatorcmds.c:166
+#: commands/operatorcmds.c:167
 #, c-format
 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:234
+#: commands/operatorcmds.c:235
 #, 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:273
+#: commands/operatorcmds.c:274
 #, 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/policy.c:87 commands/policy.c:387 commands/tablecmds.c:964
-#: commands/tablecmds.c:1306 commands/tablecmds.c:2174
-#: commands/tablecmds.c:4308 commands/tablecmds.c:6240
-#: commands/tablecmds.c:11816 commands/tablecmds.c:11851
-#: commands/trigger.c:240 commands/trigger.c:1126 commands/trigger.c:1234
-#: rewrite/rewriteDefine.c:273 rewrite/rewriteDefine.c:905
+#: commands/policy.c:87 commands/policy.c:390 commands/policy.c:479
+#: commands/tablecmds.c:967 commands/tablecmds.c:1309
+#: commands/tablecmds.c:2177 commands/tablecmds.c:4321
+#: commands/tablecmds.c:6250 commands/tablecmds.c:12044
+#: commands/tablecmds.c:12079 commands/trigger.c:240 commands/trigger.c:1126
+#: commands/trigger.c:1234 rewrite/rewriteDefine.c:273
+#: rewrite/rewriteDefine.c:917
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "permiso denegado: «%s» es un catálogo de sistema"
 
 #: commands/policy.c:170
-#, fuzzy, c-format
-msgid "ignoring roles specified other than public"
-msgstr "el tipo de almacenamiento fue especificado más de una vez"
+#, c-format
+msgid "ignoring specified roles other than PUBLIC"
+msgstr "ignorando los roles especificados que no son PUBLIC"
 
 #: commands/policy.c:171
 #, c-format
-msgid "All roles are members of the public role."
-msgstr ""
+msgid "All roles are members of the PUBLIC role."
+msgstr "Todos los roles son miembros del rol PUBLIC."
+
+#: commands/policy.c:503
+#, c-format
+msgid "role \"%s\" could not be removed from policy \"%s\" on \"%s\""
+msgstr "el rol «%s» no pudo ser eliminado de la política «%s» en «%s»"
 
-#: commands/policy.c:451
-#, fuzzy, c-format
+#: commands/policy.c:712
+#, c-format
 msgid "WITH CHECK cannot be applied to SELECT or DELETE"
-msgstr "%s no puede ser aplicado a VALUES"
+msgstr "WITH CHECK no puede ser aplicado a SELECT o DELETE"
 
-#: commands/policy.c:460 commands/policy.c:760
+#: commands/policy.c:721 commands/policy.c:1021
 #, c-format
 msgid "only WITH CHECK expression allowed for INSERT"
-msgstr ""
+msgstr "sólo se permite una expresión WITH CHECK para INSERT"
 
-#: commands/policy.c:533 commands/policy.c:886
-#, fuzzy, c-format
+#: commands/policy.c:794 commands/policy.c:1244
+#, c-format
 msgid "policy \"%s\" for table \"%s\" already exists"
-msgstr "la codificación «%2$s» ya tiene un ordenamiento llamado «%1$s»"
+msgstr "la política «%s» para la tabla «%s» ya existe"
 
-#: commands/policy.c:732 commands/policy.c:914 commands/policy.c:989
-#, fuzzy, c-format
+#: commands/policy.c:993 commands/policy.c:1272 commands/policy.c:1347
+#, c-format
 msgid "policy \"%s\" for table \"%s\" does not exist"
-msgstr "no existe el índice «%s» en la tabla «%s»"
+msgstr "no existe la política «%s» para la tabla «%s»"
 
-#: commands/policy.c:750
+#: commands/policy.c:1011
 #, c-format
 msgid "only USING expression allowed for SELECT, DELETE"
-msgstr ""
+msgstr "sólo se permite una expresión USING para SELECT, DELETE"
 
 #: commands/portalcmds.c:61 commands/portalcmds.c:160
 #: commands/portalcmds.c:212
@@ -7008,7 +6990,7 @@
 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:67 utils/adt/xml.c:2391 utils/adt/xml.c:2558
+#: executor/execCurrent.c:67 utils/adt/xml.c:2401 utils/adt/xml.c:2571
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "no existe el cursor «%s»"
@@ -7218,918 +7200,924 @@
 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:212
+#: commands/tablecmds.c:214
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "no existe la tabla «%s»"
 
-#: commands/tablecmds.c:213
+#: commands/tablecmds.c:215
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "la tabla «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:215
+#: commands/tablecmds.c:217
 msgid "Use DROP TABLE to remove a table."
 msgstr "Use DROP TABLE para eliminar una tabla."
 
-#: commands/tablecmds.c:218
+#: commands/tablecmds.c:220
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "no existe la secuencia «%s»"
 
-#: commands/tablecmds.c:219
+#: commands/tablecmds.c:221
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "la secuencia «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:221
+#: commands/tablecmds.c:223
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Use DROP SEQUENCE para eliminar una secuencia."
 
-#: commands/tablecmds.c:224
+#: commands/tablecmds.c:226
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "no existe la vista «%s»"
 
-#: commands/tablecmds.c:225
+#: commands/tablecmds.c:227
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "la vista «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:227
+#: commands/tablecmds.c:229
 msgid "Use DROP VIEW to remove a view."
 msgstr "Use DROP VIEW para eliminar una vista."
 
-#: commands/tablecmds.c:230
+#: commands/tablecmds.c:232
 #, c-format
 msgid "materialized view \"%s\" does not exist"
 msgstr "no existe la vista materializada «%s»"
 
-#: commands/tablecmds.c:231
+#: commands/tablecmds.c:233
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
 msgstr "la vista materializada «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:233
+#: commands/tablecmds.c:235
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "Use DROP MATERIALIZED VIEW para eliminar una vista materializada."
 
-#: commands/tablecmds.c:236 parser/parse_utilcmd.c:1593
+#: commands/tablecmds.c:238 parser/parse_utilcmd.c:1595
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "no existe el índice «%s»"
 
-#: commands/tablecmds.c:237
+#: commands/tablecmds.c:239
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "el índice «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:239
+#: commands/tablecmds.c:241
 msgid "Use DROP INDEX to remove an index."
 msgstr "Use DROP INDEX para eliminar un índice."
 
-#: commands/tablecmds.c:244
+#: commands/tablecmds.c:246
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "«%s» no es un tipo"
 
-#: commands/tablecmds.c:245
+#: commands/tablecmds.c:247
 msgid "Use DROP TYPE to remove a type."
 msgstr "Use DROP TYPE para eliminar un tipo."
 
-#: commands/tablecmds.c:248 commands/tablecmds.c:8447
-#: commands/tablecmds.c:11077
+#: commands/tablecmds.c:250 commands/tablecmds.c:8554
+#: commands/tablecmds.c:11305
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "no existe la tabla foránea «%s»"
 
-#: commands/tablecmds.c:249
+#: commands/tablecmds.c:251
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "la tabla foránea «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:251
+#: commands/tablecmds.c:253
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "Use DROP FOREIGN TABLE para eliminar una tabla foránea."
 
-#: commands/tablecmds.c:487
+#: commands/tablecmds.c:490
 #, c-format
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT sólo puede ser usado en tablas temporales"
 
-#: commands/tablecmds.c:507
+#: commands/tablecmds.c:510
 #, c-format
 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:815
+#: commands/tablecmds.c:818
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support dropping multiple objects"
 msgstr "DROP INDEX CONCURRENTLY no soporta eliminar múltiples objetos"
 
-#: commands/tablecmds.c:819
+#: commands/tablecmds.c:822
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY no soporta CASCADE"
 
-#: commands/tablecmds.c:1078
+#: commands/tablecmds.c:1081
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "truncando además la tabla «%s»"
 
-#: commands/tablecmds.c:1316
+#: commands/tablecmds.c:1319
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "no se pueden truncar tablas temporales de otras sesiones"
 
-#: commands/tablecmds.c:1522 parser/parse_utilcmd.c:1807
-#, fuzzy, c-format
+#: commands/tablecmds.c:1525 parser/parse_utilcmd.c:1809
+#, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
-msgstr "la relación referida «%s» no es una tabla o tabla foránea"
+msgstr "la relación heredada «%s» no es una tabla o tabla foránea"
 
-#: commands/tablecmds.c:1529 commands/tablecmds.c:9976
+#: commands/tablecmds.c:1532 commands/tablecmds.c:10121
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "no se puede heredar de la tabla temporal «%s»"
 
-#: commands/tablecmds.c:1537 commands/tablecmds.c:9984
+#: commands/tablecmds.c:1540 commands/tablecmds.c:10129
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "no se puede heredar de una tabla temporal de otra sesión"
 
-#: commands/tablecmds.c:1553 commands/tablecmds.c:10018
+#: commands/tablecmds.c:1556 commands/tablecmds.c:10163
 #, 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:1601
+#: commands/tablecmds.c:1604
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "mezclando múltiples definiciones heredadas de la columna «%s»"
 
-#: commands/tablecmds.c:1609
+#: commands/tablecmds.c:1612
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "columna heredada «%s» tiene conflicto de tipos"
 
-#: commands/tablecmds.c:1611 commands/tablecmds.c:1632
-#: commands/tablecmds.c:1830 commands/tablecmds.c:1852
-#: parser/parse_coerce.c:1592 parser/parse_coerce.c:1612
-#: parser/parse_coerce.c:1632 parser/parse_coerce.c:1677
-#: parser/parse_coerce.c:1714 parser/parse_param.c:218
+#: commands/tablecmds.c:1614 commands/tablecmds.c:1635
+#: commands/tablecmds.c:1833 commands/tablecmds.c:1855
+#: parser/parse_coerce.c:1630 parser/parse_coerce.c:1650
+#: parser/parse_coerce.c:1670 parser/parse_coerce.c:1715
+#: parser/parse_coerce.c:1752 parser/parse_param.c:218
 #, c-format
 msgid "%s versus %s"
 msgstr "%s versus %s"
 
-#: commands/tablecmds.c:1618
+#: commands/tablecmds.c:1621
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "columna heredada «%s» tiene conflicto de ordenamiento (collation)"
 
-#: commands/tablecmds.c:1620 commands/tablecmds.c:1840
-#: commands/tablecmds.c:4739
+#: commands/tablecmds.c:1623 commands/tablecmds.c:1843
+#: commands/tablecmds.c:4758
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "«%s» versus «%s»"
 
-#: commands/tablecmds.c:1630
+#: commands/tablecmds.c:1633
 #, 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:1743 parser/parse_utilcmd.c:894
-#: parser/parse_utilcmd.c:1238 parser/parse_utilcmd.c:1314
+#: commands/tablecmds.c:1746 commands/tablecmds.c:8059
+#: parser/parse_utilcmd.c:894 parser/parse_utilcmd.c:1240
+#: parser/parse_utilcmd.c:1316
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "no se puede convertir una referencia a la fila completa (whole-row)"
 
-#: commands/tablecmds.c:1744 parser/parse_utilcmd.c:895
+#: commands/tablecmds.c:1747 parser/parse_utilcmd.c:895
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "La restricción «%s» contiene una referencia a la fila completa (whole-row) de la tabla «%s»."
 
-#: commands/tablecmds.c:1816
+#: commands/tablecmds.c:1819
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "mezclando la columna «%s» con la definición heredada"
 
-#: commands/tablecmds.c:1820
-#, fuzzy, c-format
+#: commands/tablecmds.c:1823
+#, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
-msgstr "mezclando la columna «%s» con la definición heredada"
+msgstr "moviendo y mezclando la columna «%s» con la definición heredada"
 
-#: commands/tablecmds.c:1821
+#: commands/tablecmds.c:1824
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
-msgstr ""
+msgstr "La columna especificada por el usuario fue movida a la posición de la columna heredada."
 
-#: commands/tablecmds.c:1828
+#: commands/tablecmds.c:1831
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "la columna «%s» tiene conflicto de tipos"
 
-#: commands/tablecmds.c:1838
+#: commands/tablecmds.c:1841
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "la columna «%s» tiene conflicto de ordenamientos (collation)"
 
-#: commands/tablecmds.c:1850
+#: commands/tablecmds.c:1853
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "la columna «%s» tiene conflicto de parámetros de almacenamiento"
 
-#: commands/tablecmds.c:1902
+#: commands/tablecmds.c:1905
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "la columna «%s» hereda valores por omisión no coincidentes"
 
-#: commands/tablecmds.c:1904
+#: commands/tablecmds.c:1907
 #, c-format
 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:1951
+#: commands/tablecmds.c:1954
 #, c-format
 msgid "check constraint name \"%s\" appears multiple times but with different expressions"
 msgstr "la restricción «check» «%s» aparece más de una vez con diferentes expresiones"
 
-#: commands/tablecmds.c:2145
+#: commands/tablecmds.c:2148
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "no se puede cambiar el nombre a una columna de una tabla tipada"
 
-#: commands/tablecmds.c:2162
+#: commands/tablecmds.c:2165
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, composite type, index, or foreign table"
 msgstr "«%s» no es una tabla, vista, vista materializada, tipo compuesto, índice o tabla foránea"
 
-#: commands/tablecmds.c:2256
+#: commands/tablecmds.c:2259
 #, 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:2288
+#: commands/tablecmds.c:2291
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "no se puede cambiar el nombre a la columna de sistema «%s»"
 
-#: commands/tablecmds.c:2303
+#: commands/tablecmds.c:2306
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "no se puede cambiar el nombre a la columna heredada «%s»"
 
-#: commands/tablecmds.c:2458
+#: commands/tablecmds.c:2461
 #, c-format
 msgid "inherited constraint \"%s\" must be renamed in child tables too"
 msgstr "debe cambiar el nombre a la restricción heredada «%s» en las tablas hijas también"
 
-#: commands/tablecmds.c:2465
+#: commands/tablecmds.c:2468
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
 msgstr "no se puede cambiar el nombre a la restricción heredada «%s»"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2691
+#: commands/tablecmds.c:2694
 #, c-format
 msgid "cannot %s \"%s\" because it is being used by active queries in this session"
 msgstr "no se puede hacer %s en «%s» porque está siendo usada por consultas activas en esta sesión"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2700
+#: commands/tablecmds.c:2703
 #, 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:3764
+#: commands/tablecmds.c:3777
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "no se puede reescribir la relación de sistema «%s»"
 
-#: commands/tablecmds.c:3770
+#: commands/tablecmds.c:3783
 #, c-format
 msgid "cannot rewrite table \"%s\" used as a catalog table"
 msgstr "no se puede reescribir la tabla «%s» que es usada como tabla de catálogo"
 
-#: commands/tablecmds.c:3780
+#: commands/tablecmds.c:3793
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "no se puede reescribir tablas temporales de otras sesiones"
 
-#: commands/tablecmds.c:4048
+#: commands/tablecmds.c:4061
 #, c-format
 msgid "rewriting table \"%s\""
 msgstr "reescribiendo tabla «%s»"
 
-#: commands/tablecmds.c:4052
+#: commands/tablecmds.c:4065
 #, c-format
 msgid "verifying table \"%s\""
 msgstr "verificando tabla «%s»"
 
-#: commands/tablecmds.c:4166
+#: commands/tablecmds.c:4179
 #, c-format
 msgid "column \"%s\" contains null values"
 msgstr "la columna «%s» contiene valores nulos"
 
-#: commands/tablecmds.c:4181 commands/tablecmds.c:7327
+#: commands/tablecmds.c:4194 commands/tablecmds.c:7356
 #, 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:4329 commands/trigger.c:234
-#: rewrite/rewriteDefine.c:267 rewrite/rewriteDefine.c:900
+#: commands/tablecmds.c:4342 commands/trigger.c:234
+#: rewrite/rewriteDefine.c:267 rewrite/rewriteDefine.c:912
 #, c-format
 msgid "\"%s\" is not a table or view"
 msgstr "«%s» no es una tabla o vista"
 
-#: commands/tablecmds.c:4332
+#: commands/tablecmds.c:4345 commands/trigger.c:1120 commands/trigger.c:1225
+#, c-format
+msgid "\"%s\" is not a table, view, or foreign table"
+msgstr "«%s» no es una tabla, vista o tabla foránea"
+
+#: commands/tablecmds.c:4348
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, or index"
 msgstr "«%s» no es una tabla, vista, vista materializada, o índice"
 
-#: commands/tablecmds.c:4338
+#: commands/tablecmds.c:4354
 #, c-format
 msgid "\"%s\" is not a table, materialized view, or index"
 msgstr "«%s» no es una tabla, vista materializada, o índice"
 
-#: commands/tablecmds.c:4341
+#: commands/tablecmds.c:4357
+#, c-format
+msgid "\"%s\" is not a table, materialized view, or foreign table"
+msgstr "«%s» no es una tabla, vista materializada o tabla foránea"
+
+#: commands/tablecmds.c:4360
 #, c-format
 msgid "\"%s\" is not a table or foreign table"
 msgstr "«%s» no es una tabla o tabla foránea"
 
-#: commands/tablecmds.c:4344
+#: commands/tablecmds.c:4363
 #, 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:4347
+#: commands/tablecmds.c:4366 commands/tablecmds.c:5396
 #, c-format
-msgid "\"%s\" is not a table, materialized view, composite type, or foreign table"
-msgstr "«%s» no es una tabla, vista materializada, tipo compuesto, o tabla foránea"
+msgid "\"%s\" is not a table, materialized view, index, or foreign table"
+msgstr "«%s» no es una tabla, vista materializada, índice o tabla foránea"
 
-#: commands/tablecmds.c:4357
+#: commands/tablecmds.c:4376
 #, c-format
 msgid "\"%s\" is of the wrong type"
 msgstr "«%s» es tipo equivocado"
 
-#: commands/tablecmds.c:4509 commands/tablecmds.c:4516
+#: commands/tablecmds.c:4528 commands/tablecmds.c:4535
 #, 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:4523
+#: commands/tablecmds.c:4542
 #, c-format
 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 de registro"
 
-#: commands/tablecmds.c:4530
+#: commands/tablecmds.c:4549
 #, 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 de registro"
 
-#: commands/tablecmds.c:4592
+#: commands/tablecmds.c:4611
 #, c-format
 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:4594
+#: commands/tablecmds.c:4613
 #, c-format
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
 msgstr "Use ALTER ... CASCADE para eliminar además las tablas tipadas."
 
-#: commands/tablecmds.c:4638
+#: commands/tablecmds.c:4657
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "el tipo %s no es un tipo compuesto"
 
-#: commands/tablecmds.c:4664
+#: commands/tablecmds.c:4683
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "no se puede agregar una columna a una tabla tipada"
 
-#: commands/tablecmds.c:4731 commands/tablecmds.c:10177
+#: commands/tablecmds.c:4750 commands/tablecmds.c:10322
 #, 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:4737 commands/tablecmds.c:10184
+#: commands/tablecmds.c:4756 commands/tablecmds.c:10329
 #, 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:4747
+#: commands/tablecmds.c:4766
 #, 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:4759
+#: commands/tablecmds.c:4778
 #, 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:4980
+#: commands/tablecmds.c:4999
 #, c-format
 msgid "column must be added to child tables too"
 msgstr "la columna debe ser agregada a las tablas hijas también"
 
-#: commands/tablecmds.c:5050
+#: commands/tablecmds.c:5069
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "ya existe la columna «%s» en la relación «%s»"
 
-#: commands/tablecmds.c:5158 commands/tablecmds.c:5264
-#: commands/tablecmds.c:5322 commands/tablecmds.c:5436
-#: commands/tablecmds.c:5493 commands/tablecmds.c:5587
-#: commands/tablecmds.c:7845 commands/tablecmds.c:8470
+#: commands/tablecmds.c:5177 commands/tablecmds.c:5283
+#: commands/tablecmds.c:5341 commands/tablecmds.c:5455
+#: commands/tablecmds.c:5512 commands/tablecmds.c:5606
+#: commands/tablecmds.c:7895 commands/tablecmds.c:8577
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "no se puede alterar columna de sistema «%s»"
 
-#: commands/tablecmds.c:5194
+#: commands/tablecmds.c:5213
 #, c-format
 msgid "column \"%s\" is in a primary key"
 msgstr "la columna «%s» está en la llave primaria"
 
-#: commands/tablecmds.c:5377
-#, c-format
-msgid "\"%s\" is not a table, materialized view, index, or foreign table"
-msgstr "«%s» no es una tabla, vista materializada, índice o tabla foránea"
-
-#: commands/tablecmds.c:5409
+#: commands/tablecmds.c:5428
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "el valor de estadísticas %d es demasiado bajo"
 
-#: commands/tablecmds.c:5417
+#: commands/tablecmds.c:5436
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "bajando el valor de estadísticas a %d"
 
-#: commands/tablecmds.c:5567
+#: commands/tablecmds.c:5586
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "tipo de almacenamiento no válido «%s»"
 
-#: commands/tablecmds.c:5599
+#: commands/tablecmds.c:5618
 #, 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:5637
+#: commands/tablecmds.c:5656
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "no se pueden eliminar columnas de una tabla tipada"
 
-#: commands/tablecmds.c:5681
+#: commands/tablecmds.c:5700
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "no existe la columna «%s» en la relación «%s», ignorando"
 
-#: commands/tablecmds.c:5694
+#: commands/tablecmds.c:5713
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "no se puede eliminar la columna de sistema «%s»"
 
-#: commands/tablecmds.c:5701
+#: commands/tablecmds.c:5720
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "no se puede eliminar la columna heredada «%s»"
 
-#: commands/tablecmds.c:5941
+#: commands/tablecmds.c:5960
 #, 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:6163
+#: commands/tablecmds.c:6173
 #, c-format
 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:6234
+#: commands/tablecmds.c:6244
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "la relación referida «%s» no es una tabla"
 
-#: commands/tablecmds.c:6257
+#: commands/tablecmds.c:6267
 #, c-format
 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:6264
+#: commands/tablecmds.c:6274
 #, c-format
 msgid "constraints on unlogged tables may reference only permanent or unlogged tables"
 msgstr "las restricciones en tablas unlogged sólo pueden hacer referencia a tablas permanentes o unlogged"
 
-#: commands/tablecmds.c:6270
+#: commands/tablecmds.c:6280
 #, c-format
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr "las restricciones en tablas temporales sólo pueden hacer referencia a tablas temporales"
 
-#: commands/tablecmds.c:6274
+#: commands/tablecmds.c:6284
 #, c-format
 msgid "constraints on temporary tables must involve temporary tables of this session"
 msgstr "las restricciones en tablas temporales sólo pueden hacer referencia a tablas temporales de esta sesión"
 
-#: commands/tablecmds.c:6335
+#: commands/tablecmds.c:6345
 #, c-format
 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:6442
+#: commands/tablecmds.c:6452
 #, 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:6445
+#: commands/tablecmds.c:6455
 #, 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:6652 commands/tablecmds.c:6802
-#: commands/tablecmds.c:7684 commands/tablecmds.c:7740
+#: commands/tablecmds.c:6662 commands/tablecmds.c:6830
+#: commands/tablecmds.c:7734 commands/tablecmds.c:7790
 #, 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:6658
+#: commands/tablecmds.c:6668
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
 msgstr "la restricción «%s» de la relación «%s» no es una restriccion de llave foránea"
 
-#: commands/tablecmds.c:6809
+#: commands/tablecmds.c:6837
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key or check constraint"
 msgstr "la restricción «%s» de la relación «%s» no es una llave foránea o restricción «check»"
 
-#: commands/tablecmds.c:6877
+#: commands/tablecmds.c:6906
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "la restricción debe ser validada en las tablas hijas también"
 
-#: commands/tablecmds.c:6946
+#: commands/tablecmds.c:6975
 #, 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:6951
+#: commands/tablecmds.c:6980
 #, 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:7016
+#: commands/tablecmds.c:7045
 #, 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:7033
+#: commands/tablecmds.c:7062
 #, 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:7098
+#: commands/tablecmds.c:7127
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr "la lista de columnas referidas en una llave foránea no debe contener duplicados"
 
-#: commands/tablecmds.c:7192
+#: commands/tablecmds.c:7221
 #, 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:7197
+#: commands/tablecmds.c:7226
 #, c-format
 msgid "there is no unique constraint matching given keys for referenced table \"%s\""
 msgstr "no hay restricción unique que coincida con las columnas dadas en la tabla referida «%s»"
 
-#: commands/tablecmds.c:7360
+#: commands/tablecmds.c:7389
 #, c-format
 msgid "validating foreign key constraint \"%s\""
 msgstr "validando restricción de llave foránea «%s»"
 
-#: commands/tablecmds.c:7656
+#: commands/tablecmds.c:7688
 #, 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:7690
+#: commands/tablecmds.c:7740
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "no existe la restricción «%s» en la relación «%s», ignorando"
 
-#: commands/tablecmds.c:7829
+#: commands/tablecmds.c:7879
 #, c-format
 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:7852
+#: commands/tablecmds.c:7902
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "no se puede alterar la columna heredada «%s»"
 
-#: commands/tablecmds.c:7901
+#: commands/tablecmds.c:7951
 #, c-format
 msgid "result of USING clause for column \"%s\" cannot be cast automatically to type %s"
 msgstr "el resultado de la cláusula USING para la columna «%s» no puede ser convertido automáticamente al tipo %s"
 
-#: commands/tablecmds.c:7904
+#: commands/tablecmds.c:7954
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "Puede ser necesario agregar un cast explícito."
 
-#: commands/tablecmds.c:7908
+#: commands/tablecmds.c:7958
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
 msgstr "la columna «%s» no puede convertirse automáticamente al tipo %s"
 
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:7911
+#: commands/tablecmds.c:7961
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "Puede ser necesario especificar «USING %s::%s»."
 
-#: commands/tablecmds.c:7964
+#: commands/tablecmds.c:8060
+#, c-format
+msgid "USING expression contains a whole-row table reference."
+msgstr "La expresión USING contiene una referencia a la fila completa (whole-row)."
+
+#: commands/tablecmds.c:8071
 #, 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:8051
+#: commands/tablecmds.c:8158
 #, 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:8087
+#: commands/tablecmds.c:8194
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
 msgstr "el valor por omisión para la columna «%s» no puede ser convertido automáticamente al tipo %s"
 
-#: commands/tablecmds.c:8213
+#: commands/tablecmds.c:8320
 #, c-format
 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:8214 commands/tablecmds.c:8233
-#: commands/tablecmds.c:8251
+#: commands/tablecmds.c:8321 commands/tablecmds.c:8340
+#: commands/tablecmds.c:8358
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s depende de la columna «%s»"
 
-#: commands/tablecmds.c:8232
+#: commands/tablecmds.c:8339
 #, c-format
 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"
 
-#: commands/tablecmds.c:8250
-#, fuzzy, c-format
+#: commands/tablecmds.c:8357
+#, c-format
 msgid "cannot alter type of a column used in a policy 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 política"
 
-#: commands/tablecmds.c:8895
+#: commands/tablecmds.c:9022
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "no se puede cambiar el dueño del índice «%s»"
 
-#: commands/tablecmds.c:8897
+#: commands/tablecmds.c:9024
 #, c-format
 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:8913
+#: commands/tablecmds.c:9040
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "no se puede cambiar el dueño de la secuencia «%s»"
 
-#: commands/tablecmds.c:8915 commands/tablecmds.c:11285
+#: commands/tablecmds.c:9042 commands/tablecmds.c:11513
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "La secuencia «%s» está enlazada a la tabla «%s»."
 
-#: commands/tablecmds.c:8927 commands/tablecmds.c:11926
+#: commands/tablecmds.c:9054 commands/tablecmds.c:12154
 #, c-format
 msgid "Use ALTER TYPE instead."
 msgstr "Considere usar ALTER TYPE."
 
-#: commands/tablecmds.c:8936
+#: commands/tablecmds.c:9063
 #, c-format
 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:9280
+#: commands/tablecmds.c:9406
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "no se pueden tener múltiples subórdenes SET TABLESPACE"
 
-#: commands/tablecmds.c:9353
+#: commands/tablecmds.c:9479
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, index, or TOAST table"
 msgstr "«%s» no es una tabla, vista, tabla materializada, índice o tabla TOAST"
 
-#: commands/tablecmds.c:9386 commands/view.c:481
+#: commands/tablecmds.c:9512 commands/view.c:498
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr "WITH CHECK OPTION sólo puede usarse en vistas automáticamente actualizables"
 
-#: commands/tablecmds.c:9532
+#: commands/tablecmds.c:9658
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "no se puede mover la relación de sistema «%s»"
 
-#: commands/tablecmds.c:9548
+#: commands/tablecmds.c:9674
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "no se pueden mover tablas temporales de otras sesiones"
 
-#: commands/tablecmds.c:9676
+#: commands/tablecmds.c:9811
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr "solamente tablas, índices y vistas materializadas existen en tablespaces"
 
-#: commands/tablecmds.c:9688
+#: commands/tablecmds.c:9823
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
 msgstr "no se puede mover objetos hacia o desde el tablespace pg_global"
 
-#: commands/tablecmds.c:9779
+#: commands/tablecmds.c:9914
 #, c-format
-msgid "aborting because lock on relation \"%s\".\"%s\" is not available"
-msgstr "cancelando porque el candado en la relación «%s».«%s» no está disponible"
+msgid "aborting because lock on relation \"%s.%s\" is not available"
+msgstr "cancelando porque el lock en la relación «%s.%s» no está disponible"
 
-#: commands/tablecmds.c:9795
+#: commands/tablecmds.c:9930
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "no se encontraron relaciones coincidentes en el tablespace «%s»"
 
-#: commands/tablecmds.c:9859 storage/buffer/bufmgr.c:801
+#: commands/tablecmds.c:10004 storage/buffer/bufmgr.c:801
 #, c-format
 msgid "invalid page in block %u of relation %s"
 msgstr "la página no es válida en el bloque %u de la relación %s"
 
-#: commands/tablecmds.c:9941
+#: commands/tablecmds.c:10086
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "no se puede cambiar la herencia de una tabla tipada"
 
-#: commands/tablecmds.c:9991
+#: commands/tablecmds.c:10136
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "no se puede agregar herencia a tablas temporales de otra sesión"
 
-#: commands/tablecmds.c:10045
+#: commands/tablecmds.c:10190
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "la herencia circular no está permitida"
 
-#: commands/tablecmds.c:10046
+#: commands/tablecmds.c:10191
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "«%s» ya es un hijo de «%s»."
 
-#: commands/tablecmds.c:10054
+#: commands/tablecmds.c:10199
 #, 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:10195
+#: commands/tablecmds.c:10340
 #, 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:10211
+#: commands/tablecmds.c:10356 commands/tablecmds.c:10389
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "tabla hija no tiene la columna «%s»"
 
-#: commands/tablecmds.c:10294
+#: commands/tablecmds.c:10472
 #, 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:10302
+#: commands/tablecmds.c:10480
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on child table \"%s\""
 msgstr "la restricción «%s» está en conflicto con la restricción no heredada en la tabla hija «%s»"
 
-#: commands/tablecmds.c:10326
+#: commands/tablecmds.c:10491
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
+msgstr "la restricción «%s» está en conflicto con la restricción NOT VALID en la tabla hija «%s»"
+
+#: commands/tablecmds.c:10515
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "tabla hija no tiene la restricción «%s»"
 
-#: commands/tablecmds.c:10410
+#: commands/tablecmds.c:10599
 #, 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:10644
+#: commands/tablecmds.c:10833
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "las tablas tipadas no pueden heredar"
 
-#: commands/tablecmds.c:10675
+#: commands/tablecmds.c:10864
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "la tabla no tiene la columna «%s»"
 
-#: commands/tablecmds.c:10685
+#: commands/tablecmds.c:10874
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
 msgstr "la tabla tiene columna «%s» en la posición en que el tipo requiere «%s»."
 
-#: commands/tablecmds.c:10694
+#: commands/tablecmds.c:10883
 #, 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:10707
+#: commands/tablecmds.c:10896
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "tabla tiene la columna extra «%s»"
 
-#: commands/tablecmds.c:10759
+#: commands/tablecmds.c:10948
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "«%s» no es una tabla tipada"
 
-#: commands/tablecmds.c:10942
+#: commands/tablecmds.c:11131
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
 msgstr "no se puede usar el índice no-único «%s» como identidad de réplica"
 
-#: commands/tablecmds.c:10948
+#: commands/tablecmds.c:11137
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
 msgstr "no puede usar el índice no-inmediato «%s» como identidad de réplica"
 
-#: commands/tablecmds.c:10954
+#: commands/tablecmds.c:11143
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr "no se puede usar el índice funcional «%s» como identidad de réplica"
 
-#: commands/tablecmds.c:10960
+#: commands/tablecmds.c:11149
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "no se puede usar el índice parcial «%s» como identidad de réplica"
 
-#: commands/tablecmds.c:10966
+#: commands/tablecmds.c:11155
 #, c-format
 msgid "cannot use invalid index \"%s\" as replica identity"
 msgstr "no se puede usar el índice no válido «%s» como identidad de réplica"
 
-#: commands/tablecmds.c:10984
+#: commands/tablecmds.c:11176
+#, c-format
+msgid "index \"%s\" cannot be used as replica identity because column %d is a system column"
+msgstr "el índice «%s» no puede usarse como identidad de réplica porque la column %d es una columna de sistema"
+
+#: commands/tablecmds.c:11183
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
 msgstr "el índice «%s» no puede usarse como identidad de réplica porque la column «%s» acepta valores nulos"
 
-#: commands/tablecmds.c:11152
-#, fuzzy, c-format
-msgid "cannot change logged status of table %s"
-msgstr "no se puede cambiar el dueño del índice «%s»"
-
-#: commands/tablecmds.c:11154
-#, fuzzy, c-format
-msgid "Table %s is temporary."
-msgstr "el tablespace «%s» no está vacío"
-
-#: commands/tablecmds.c:11213
-#, fuzzy, c-format
-msgid "cannot change status of table %s to logged"
-msgstr "no se puede cambiar la herencia de una tabla tipada"
-
-#: commands/tablecmds.c:11215
-#, fuzzy, c-format
-msgid "Table %s references unlogged table %s."
-msgstr "La tabla «%s» hace referencia a «%s»."
+#: commands/tablecmds.c:11386
+#, c-format
+msgid "cannot change logged status of table \"%s\" because it is temporary"
+msgstr "no se puede cambiar el estado «logged» de la tabla «%s» porque es temporal"
 
-#: commands/tablecmds.c:11225
-#, fuzzy, c-format
-msgid "cannot change status of table %s to unlogged"
-msgstr "no se puede cambiar la herencia de una tabla tipada"
+#: commands/tablecmds.c:11445
+#, c-format
+msgid "could not change table \"%s\" to logged because it references unlogged table \"%s\""
+msgstr "no se pudo cambiar la tabla «%s» a «logged» porque hace referencia a la tabla «unlogged» «%s»"
 
-#: commands/tablecmds.c:11227
-#, fuzzy, c-format
-msgid "Logged table %s is referenced by table %s."
-msgstr "La llave todavía es referida desde la tabla «%s»."
+#: commands/tablecmds.c:11455
+#, c-format
+msgid "could not change table \"%s\" to unlogged because it references logged table \"%s\""
+msgstr "no se pudo cambiar la tabla «%s» a «unlogged» porque hace referencia a la tabla «logged» «%s»"
 
-#: commands/tablecmds.c:11284
+#: commands/tablecmds.c:11512
 #, c-format
 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:11385
+#: commands/tablecmds.c:11613
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "ya existe una relación llamada «%s» en el esquema «%s»"
 
-#: commands/tablecmds.c:11910
+#: commands/tablecmds.c:12138
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "«%s» no es un tipo compuesto"
 
-#: commands/tablecmds.c:11940
+#: commands/tablecmds.c:12168
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, sequence, or foreign table"
 msgstr "«%s» no es una tabla, vista, vista materializada, secuencia o tabla foránea"
 
 #: commands/tablespace.c:162 commands/tablespace.c:179
 #: commands/tablespace.c:190 commands/tablespace.c:198
-#: commands/tablespace.c:625 replication/slot.c:914 storage/file/copydir.c:47
+#: commands/tablespace.c:625 replication/slot.c:941 storage/file/copydir.c:47
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "no se pudo crear el directorio «%s»: %m"
@@ -8170,28 +8158,28 @@
 msgstr "la ruta «%s» del tablespace es demasiado larga"
 
 #: commands/tablespace.c:295
-#, fuzzy, c-format
+#, c-format
 msgid "tablespace location should not be inside the data directory"
-msgstr "la ubicación del tablespace debe ser una ruta absoluta"
+msgstr "la ubicación del tablespace no debe estar dentro del directorio de datos"
 
-#: commands/tablespace.c:304 commands/tablespace.c:938
+#: commands/tablespace.c:304 commands/tablespace.c:952
 #, c-format
 msgid "unacceptable tablespace name \"%s\""
 msgstr "el nombre de tablespace «%s» es inaceptable"
 
-#: commands/tablespace.c:306 commands/tablespace.c:939
+#: commands/tablespace.c:306 commands/tablespace.c:953
 #, c-format
 msgid "The prefix \"pg_\" is reserved for system tablespaces."
 msgstr "El prefijo «pg_» está reservado para tablespaces del sistema."
 
-#: commands/tablespace.c:316 commands/tablespace.c:951
+#: commands/tablespace.c:316 commands/tablespace.c:965
 #, c-format
 msgid "tablespace \"%s\" already exists"
 msgstr "el tablespace «%s» ya existe"
 
-#: commands/tablespace.c:430 commands/tablespace.c:921
-#: commands/tablespace.c:1002 commands/tablespace.c:1071
-#: commands/tablespace.c:1204 commands/tablespace.c:1404
+#: commands/tablespace.c:430 commands/tablespace.c:935
+#: commands/tablespace.c:1016 commands/tablespace.c:1085
+#: commands/tablespace.c:1218 commands/tablespace.c:1418
 #, c-format
 msgid "tablespace \"%s\" does not exist"
 msgstr "no existe el tablespace «%s»"
@@ -8227,37 +8215,32 @@
 msgstr "el directorio «%s» ya está siendo usado como tablespace"
 
 #: commands/tablespace.c:744 commands/tablespace.c:757
-#: commands/tablespace.c:781 commands/tablespace.c:872
+#: commands/tablespace.c:793 commands/tablespace.c:885
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "no se pudo eliminar el directorio «%s»: %m"
 
-#: commands/tablespace.c:793 commands/tablespace.c:881
+#: commands/tablespace.c:806 commands/tablespace.c:894
 #, c-format
 msgid "could not remove symbolic link \"%s\": %m"
 msgstr "no se pudo eliminar el enlace simbólico «%s»: %m"
 
-#: commands/tablespace.c:803 commands/tablespace.c:889
-#, fuzzy, c-format
-msgid "not a directory or symbolic link: \"%s\""
-msgstr "no se pudo leer el enlace simbólico «%s»"
-
-#: commands/tablespace.c:860
-#, fuzzy, c-format
-msgid "could not stat \"%s\": %m"
-msgstr "no se pudo hacer stat al archivo «%s»: %m"
+#: commands/tablespace.c:816 commands/tablespace.c:903
+#, c-format
+msgid "\"%s\" is not a directory or symbolic link"
+msgstr "«%s» no es un directorio o enlace simbólico"
 
-#: commands/tablespace.c:1076
+#: commands/tablespace.c:1090
 #, c-format
 msgid "Tablespace \"%s\" does not exist."
 msgstr "No existe el tablespace «%s»."
 
-#: commands/tablespace.c:1503
+#: commands/tablespace.c:1517
 #, c-format
 msgid "directories for tablespace %u could not be removed"
 msgstr "algunos directorios para el tablespace %u no pudieron eliminarse"
 
-#: commands/tablespace.c:1505
+#: commands/tablespace.c:1519
 #, c-format
 msgid "You can remove the directories manually if necessary."
 msgstr "Puede eliminar los directorios manualmente, si es necesario."
@@ -8384,11 +8367,6 @@
 msgid "converting trigger group into constraint \"%s\" %s"
 msgstr "convirtiendo el grupo de disparadores en la restricción «%s» %s"
 
-#: commands/trigger.c:1120 commands/trigger.c:1225
-#, c-format
-msgid "\"%s\" is not a table, view, or foreign table"
-msgstr "«%s» no es una tabla, vista o tabla foránea"
-
 #: commands/trigger.c:1191 commands/trigger.c:1352 commands/trigger.c:1470
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
@@ -8410,22 +8388,22 @@
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "un trigger BEFORE STATEMENT no puede retornar un valor"
 
-#: commands/trigger.c:2727 executor/nodeModifyTable.c:631
-#: executor/nodeModifyTable.c:919
+#: commands/trigger.c:2727 executor/nodeModifyTable.c:663
+#: executor/nodeModifyTable.c:957
 #, c-format
 msgid "tuple to be updated was already modified by an operation triggered by the current command"
 msgstr "el registro a ser actualizado ya fue modificado por una operación disparada por la orden actual"
 
-#: commands/trigger.c:2728 executor/nodeModifyTable.c:632
-#: executor/nodeModifyTable.c:920
+#: commands/trigger.c:2728 executor/nodeModifyTable.c:664
+#: executor/nodeModifyTable.c:958
 #, c-format
 msgid "Consider using an AFTER trigger instead of a BEFORE trigger to propagate changes to other rows."
-msgstr "Considere usar un disparador ANTES en lugar de un disparador BEFORE para propagar cambios a otros registros."
+msgstr "Considere usar un disparador AFTER en lugar de un disparador BEFORE para propagar cambios a otros registros."
 
 #: commands/trigger.c:2742 executor/execMain.c:2344
-#: executor/nodeLockRows.c:216 executor/nodeModifyTable.c:183
-#: executor/nodeModifyTable.c:644 executor/nodeModifyTable.c:932
-#: executor/nodeModifyTable.c:1099
+#: executor/nodeLockRows.c:216 executor/nodeModifyTable.c:196
+#: executor/nodeModifyTable.c:676 executor/nodeModifyTable.c:970
+#: executor/nodeModifyTable.c:1137
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "no se pudo serializar el acceso debido a un update concurrente"
@@ -8611,34 +8589,34 @@
 msgstr "la función de envío %s del tipo debe retornar «bytea»"
 
 #: commands/typecmds.c:558
-#, fuzzy, c-format
+#, c-format
 msgid "type input function %s should not be volatile"
-msgstr "la función de conversión no debe ser volatile"
+msgstr "la función de entrada %s no debe ser volatile"
 
 #: commands/typecmds.c:563
-#, fuzzy, c-format
+#, c-format
 msgid "type output function %s should not be volatile"
-msgstr "la función de conversión no debe ser volatile"
+msgstr "la función de salida %s no debe ser volatile"
 
 #: commands/typecmds.c:568
-#, fuzzy, c-format
+#, c-format
 msgid "type receive function %s should not be volatile"
-msgstr "la función de recepción %s del tipo debe retornar %s"
+msgstr "la función «receive» %s del tipo no debe ser volatile"
 
 #: commands/typecmds.c:573
-#, fuzzy, c-format
+#, c-format
 msgid "type send function %s should not be volatile"
-msgstr "la función de conversión no debe ser volatile"
+msgstr "la función «send» %s no debe ser volatile"
 
 #: commands/typecmds.c:578
-#, fuzzy, c-format
+#, c-format
 msgid "type modifier input function %s should not be volatile"
-msgstr "la función de conversión no debe ser volatile"
+msgstr "la función de modificadores de tipo %s no debe ser volatile"
 
 #: commands/typecmds.c:583
-#, fuzzy, c-format
+#, c-format
 msgid "type modifier output function %s should not be volatile"
-msgstr "la función de salida de modificadores de tipo es inútil sin una función de entrada de modificadores de tipo"
+msgstr "la función de salida de modificadores de tipo %s no debe ser volatile"
 
 #: commands/typecmds.c:805
 #, c-format
@@ -8685,7 +8663,7 @@
 msgid "specifying constraint deferrability not supported for domains"
 msgstr "no se puede especificar la postergabilidad de las restricciones a un dominio"
 
-#: commands/typecmds.c:1289 utils/cache/typcache.c:1579
+#: commands/typecmds.c:1289 utils/cache/typcache.c:1633
 #, c-format
 msgid "%s is not an enum"
 msgstr "%s no es un enum"
@@ -8756,9 +8734,9 @@
 msgstr "la función «diff» de subtipo, %s, debe ser inmutable"
 
 #: commands/typecmds.c:2040
-#, fuzzy, c-format
+#, c-format
 msgid "pg_type array OID value not set when in binary upgrade mode"
-msgstr "debe ser superusuario para conectarse en modo de actualización binaria"
+msgstr "el valor de OID de pg_type no se definió en modo de actualización binaria"
 
 #: commands/typecmds.c:2344
 #, c-format
@@ -8785,7 +8763,7 @@
 msgid "column \"%s\" of table \"%s\" contains values that violate the new constraint"
 msgstr "la columna «%s» de la relación «%s» contiene valores que violan la nueva restricción"
 
-#: commands/typecmds.c:2967 commands/typecmds.c:3224 commands/typecmds.c:3432
+#: commands/typecmds.c:2967 commands/typecmds.c:3224 commands/typecmds.c:3413
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s no es un dominio"
@@ -8800,27 +8778,27 @@
 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:3154 commands/typecmds.c:3236 commands/typecmds.c:3545
+#: commands/typecmds.c:3154 commands/typecmds.c:3236 commands/typecmds.c:3526
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s es el tipo de registro de una tabla"
 
-#: commands/typecmds.c:3156 commands/typecmds.c:3238 commands/typecmds.c:3547
+#: commands/typecmds.c:3156 commands/typecmds.c:3238 commands/typecmds.c:3528
 #, c-format
 msgid "Use ALTER TABLE instead."
 msgstr "Considere usar ALTER TABLE."
 
-#: commands/typecmds.c:3163 commands/typecmds.c:3245 commands/typecmds.c:3464
+#: commands/typecmds.c:3163 commands/typecmds.c:3245 commands/typecmds.c:3445
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "no se puede alterar el tipo de array «%s»"
 
-#: commands/typecmds.c:3165 commands/typecmds.c:3247 commands/typecmds.c:3466
+#: commands/typecmds.c:3165 commands/typecmds.c:3247 commands/typecmds.c:3447
 #, 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:3531
+#: commands/typecmds.c:3512
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "ya existe un tipo llamado «%s» en el esquema «%s»"
@@ -8841,9 +8819,9 @@
 msgstr "debe ser superusuario para crear usuarios de replicación"
 
 #: commands/user.c:304 commands/user.c:678
-#, fuzzy, c-format
+#, c-format
 msgid "must be superuser to change bypassrls attribute"
-msgstr "debe ser superusuario para crear un tipo base"
+msgstr "debe ser superusuario para cambiar el atributo bypassrls"
 
 #: commands/user.c:311
 #, c-format
@@ -8856,9 +8834,9 @@
 msgstr "el rol «%s» ya existe"
 
 #: commands/user.c:402
-#, fuzzy, c-format
+#, c-format
 msgid "pg_authid OID value not set when in binary upgrade mode"
-msgstr "debe ser superusuario para conectarse en modo de actualización binaria"
+msgstr "el valor de OID de pg_authid no se definió en modo de actualización binaria"
 
 #: commands/user.c:664 commands/user.c:878 commands/user.c:1394
 #: commands/user.c:1540
@@ -8887,13 +8865,13 @@
 msgstr "se ha denegado el permiso para eliminar el rol"
 
 #: commands/user.c:962
-#, fuzzy, c-format
-msgid "cannot use special role specifier in \"%s\""
-msgstr "no se puede asignar el nuevo tablespace por omisión «%s»"
+#, c-format
+msgid "cannot use special role specifier in DROP ROLE"
+msgstr "no se puede usar un especificador especial de rol en DROP ROLE"
 
-#: commands/user.c:972 commands/user.c:1128 commands/variable.c:798
-#: commands/variable.c:870 utils/adt/acl.c:5120 utils/adt/acl.c:5172
-#: utils/adt/acl.c:5205 utils/adt/acl.c:5223 utils/init/miscinit.c:478
+#: commands/user.c:972 commands/user.c:1128 commands/variable.c:799
+#: commands/variable.c:871 utils/adt/acl.c:5120 utils/adt/acl.c:5172
+#: utils/adt/acl.c:5205 utils/adt/acl.c:5223 utils/init/miscinit.c:494
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "no existe el rol «%s»"
@@ -8991,7 +8969,7 @@
 #: commands/vacuum.c:185
 #, c-format
 msgid "%s cannot be executed from VACUUM or ANALYZE"
-msgstr ""
+msgstr "%s no puede ejecutarse desde VACUUM o ANALYZE"
 
 #: commands/vacuum.c:527
 #, c-format
@@ -9013,124 +8991,126 @@
 msgid "Close open transactions with multixacts soon to avoid wraparound problems."
 msgstr "Cierre transacciones con multixact pronto para prevenir problemas por reciclaje del contador."
 
-#: commands/vacuum.c:1130
+#: commands/vacuum.c:1138
 #, c-format
 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:1131
+#: commands/vacuum.c:1139
 #, c-format
 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:1252
+#: commands/vacuum.c:1260
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "omitiendo el vacuum de «%s»: el candado no está disponible"
 
-#: commands/vacuum.c:1278
+#: commands/vacuum.c:1286
 #, c-format
 msgid "skipping \"%s\" --- only superuser can vacuum it"
 msgstr "omitiendo «%s»: sólo un superusuario puede aplicarle VACUUM"
 
-#: commands/vacuum.c:1282
+#: commands/vacuum.c:1290
 #, c-format
 msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
 msgstr "omitiendo «%s»: sólo un superusuario o el dueño de la base de datos puede aplicarle VACUUM"
 
-#: commands/vacuum.c:1286
+#: commands/vacuum.c:1294
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can vacuum it"
 msgstr "omitiendo «%s»: sólo su dueño o el de la base de datos puede aplicarle VACUUM"
 
-#: commands/vacuum.c:1304
+#: commands/vacuum.c:1312
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr "omitiendo «%s»: no se puede aplicar VACUUM a objetos que no son tablas o a tablas especiales de sistema"
 
-#: commands/vacuumlazy.c:358
-#, fuzzy, c-format
+#: commands/vacuumlazy.c:363
+#, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
-msgstr "vacuum automático de la tabla «%s.%s.%s»"
+msgstr "vacuum automático de la tabla «%s.%s.%s»: recorridos de índice: %d\n"
 
-#: commands/vacuumlazy.c:363
+#: commands/vacuumlazy.c:368
 #, c-format
 msgid "pages: %u removed, %u remain, %u skipped due to pins\n"
-msgstr ""
+msgstr "páginas: %u eliminadas, %u quedan, %u saltadas debido a pins\n"
 
-#: commands/vacuumlazy.c:368
+#: commands/vacuumlazy.c:373
 #, c-format
 msgid "tuples: %.0f removed, %.0f remain, %.0f are dead but not yet removable\n"
-msgstr ""
+msgstr "tuplas: %.0f eliminadas, %.0f quedan, %.0f están muertas pero no son eliminables\n"
 
-#: commands/vacuumlazy.c:373
+#: commands/vacuumlazy.c:378
 #, c-format
 msgid "buffer usage: %d hits, %d misses, %d dirtied\n"
-msgstr ""
+msgstr "uso de búfers: %d aciertos, %d fallas, %d ensuciados\n"
 
-#: commands/vacuumlazy.c:377
+#: commands/vacuumlazy.c:382
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
-msgstr ""
+msgstr "tasa lectura promedio: %.3f MB/s, tasa escritura promedio: %.3f MB/s\n"
 
-#: commands/vacuumlazy.c:379
-#, fuzzy, c-format
+#: commands/vacuumlazy.c:384
+#, c-format
 msgid "system usage: %s"
-msgstr "sentencia: %s"
+msgstr "uso de sistema: %s"
 
-#: commands/vacuumlazy.c:701
+#: commands/vacuumlazy.c:708
 #, 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:1113
+#: commands/vacuumlazy.c:1120
 #, 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:1123
-#, fuzzy, c-format
+#: commands/vacuumlazy.c:1130
+#, c-format
 msgid "%.0f dead row versions cannot be removed yet.\n"
-msgstr ""
-"%.0f versiones muertas de filas no pueden ser eliminadas aún.\n"
-"%s."
+msgstr "%.0f versiones muertas de filas no pueden ser eliminadas aún.\n"
 
-#: commands/vacuumlazy.c:1125
+#: commands/vacuumlazy.c:1132
 #, c-format
 msgid "There were %.0f unused item pointers.\n"
-msgstr ""
+msgstr "Hubo %.0f punteros de ítem sin uso.\n"
 
-#: commands/vacuumlazy.c:1127
+#: commands/vacuumlazy.c:1134
 #, c-format
-msgid "Skipped %u pages due to buffer pins.\n"
-msgstr ""
+msgid "Skipped %u page due to buffer pins.\n"
+msgid_plural "Skipped %u pages due to buffer pins.\n"
+msgstr[0] "Saltada %u página debido a «pins» de búfers.\n"
+msgstr[1] "Saltadas %u páginas debido a «pins» de búfers.\n"
 
-#: commands/vacuumlazy.c:1129
+#: commands/vacuumlazy.c:1138
 #, c-format
-msgid "%u pages are entirely empty.\n"
-msgstr ""
+msgid "%u page is entirely empty.\n"
+msgid_plural "%u pages are entirely empty.\n"
+msgstr[0] "%u página está completamente vacía.\n"
+msgstr[1] "%u páginas están completamente vacías.\n"
 
-#: commands/vacuumlazy.c:1135
+#: commands/vacuumlazy.c:1146
 #, c-format
 msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u pages"
 msgstr "«%s»: se encontraron %.0f versiones de filas eliminables y %.0f no eliminables en %u de %u páginas"
 
-#: commands/vacuumlazy.c:1204
+#: commands/vacuumlazy.c:1215
 #, 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:1371
+#: commands/vacuumlazy.c:1382
 #, 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:1417
+#: commands/vacuumlazy.c:1428
 #, 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:1421
+#: commands/vacuumlazy.c:1432
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -9141,112 +9121,112 @@
 "%u páginas de índice han sido eliminadas, %u son reusables.\n"
 "%s."
 
-#: commands/vacuumlazy.c:1478
+#: commands/vacuumlazy.c:1489
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "«%s»: suspendiendo el truncado debido a una petición de candado en conflicto"
 
-#: commands/vacuumlazy.c:1543
+#: commands/vacuumlazy.c:1554
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
 msgstr "«%s»: truncadas %u a %u páginas"
 
-#: commands/vacuumlazy.c:1599
+#: commands/vacuumlazy.c:1610
 #, c-format
 msgid "\"%s\": suspending truncate due to conflicting lock request"
 msgstr "«%s»: suspendiendo el truncado debido a una petición de candado en conflicto"
 
-#: commands/variable.c:163 utils/misc/guc.c:9628
+#: commands/variable.c:164 utils/misc/guc.c:9691
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "Palabra clave no reconocida: «%s»."
 
-#: commands/variable.c:175
+#: commands/variable.c:176
 #, c-format
 msgid "Conflicting \"datestyle\" specifications."
 msgstr "Especificaciones contradictorias de «datestyle»."
 
-#: commands/variable.c:297
+#: commands/variable.c:298
 #, c-format
 msgid "Cannot specify months in time zone interval."
 msgstr "No se pueden especificar meses en el intervalo de huso horario."
 
-#: commands/variable.c:303
+#: commands/variable.c:304
 #, c-format
 msgid "Cannot specify days in time zone interval."
 msgstr "No se pueden especificar días en el intervalo de huso horario."
 
-#: commands/variable.c:345 commands/variable.c:427
+#: commands/variable.c:346 commands/variable.c:428
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
 msgstr "el huso horario «%s» parece usar segundos intercalares (bisiestos)"
 
-#: commands/variable.c:347 commands/variable.c:429
+#: commands/variable.c:348 commands/variable.c:430
 #, c-format
 msgid "PostgreSQL does not support leap seconds."
 msgstr "PostgreSQL no soporta segundos intercalares."
 
-#: commands/variable.c:356
+#: commands/variable.c:357
 #, c-format
 msgid "UTC timezone offset is out of range."
 msgstr "desplazamiento de huso horario UTC fuera de rango"
 
-#: commands/variable.c:494
+#: commands/variable.c:495
 #, c-format
 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:501
+#: commands/variable.c:502
 #, c-format
 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:508
+#: commands/variable.c:509
 #, c-format
 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:557
+#: commands/variable.c:558
 #, c-format
 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:564
+#: commands/variable.c:565
 #, c-format
 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:571 storage/lmgr/predicate.c:1586
+#: commands/variable.c:572 storage/lmgr/predicate.c:1586
 #, c-format
 msgid "cannot use serializable mode in a hot standby"
 msgstr "no se puede utilizar el modo serializable en un hot standby"
 
-#: commands/variable.c:572
+#: commands/variable.c:573
 #, c-format
 msgid "You can use REPEATABLE READ instead."
 msgstr "Puede utilizar REPEATABLE READ en su lugar."
 
-#: commands/variable.c:620
+#: commands/variable.c:621
 #, c-format
 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:626
+#: commands/variable.c:627
 #, c-format
 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:708
+#: commands/variable.c:709
 #, c-format
 msgid "Conversion between %s and %s is not supported."
 msgstr "La conversión entre %s y %s no está soportada."
 
-#: commands/variable.c:715
+#: commands/variable.c:716
 #, c-format
 msgid "Cannot change \"client_encoding\" now."
 msgstr "No se puede cambiar «client_encoding» ahora."
 
-#: commands/variable.c:885
+#: commands/variable.c:889
 #, c-format
 msgid "permission denied to set role \"%s\""
 msgstr "se ha denegado el permiso para definir el rol «%s»"
@@ -9261,52 +9241,52 @@
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "Los valores aceptables son «local» y «cascaded»."
 
-#: commands/view.c:114
+#: commands/view.c:101
 #, c-format
 msgid "could not determine which collation to use for view column \"%s\""
 msgstr "no se pudo determinar el ordenamiento (collation) a usar para la columna «%s» de vista"
 
-#: commands/view.c:129
+#: commands/view.c:115
 #, c-format
 msgid "view must have at least one column"
 msgstr "una vista debe tener al menos una columna"
 
-#: commands/view.c:263 commands/view.c:275
+#: commands/view.c:280 commands/view.c:292
 #, c-format
 msgid "cannot drop columns from view"
 msgstr "no se pueden eliminar columnas de una vista"
 
-#: commands/view.c:280
+#: commands/view.c:297
 #, 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:288
+#: commands/view.c:305
 #, c-format
 msgid "cannot change data type of view column \"%s\" from %s to %s"
 msgstr "no se puede cambiar el tipo de dato de la columna «%s» de la vista de %s a %s"
 
-#: commands/view.c:427
+#: commands/view.c:444
 #, c-format
 msgid "views must not contain SELECT INTO"
 msgstr "una vista no puede tener SELECT INTO"
 
-#: commands/view.c:440
+#: commands/view.c:457
 #, c-format
 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:511
+#: commands/view.c:528
 #, c-format
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "CREATE VIEW especifica más nombres de columna que columnas"
 
-#: commands/view.c:519
+#: commands/view.c:536
 #, c-format
 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:533
+#: commands/view.c:550
 #, c-format
 msgid "view \"%s\" will be a temporary view"
 msgstr "la vista «%s» será una vista temporal"
@@ -9351,37 +9331,37 @@
 msgid "no value found for parameter %d"
 msgstr "no se encontró un valor para parámetro %d"
 
-#: executor/execIndexing.c:539
+#: executor/execIndexing.c:544
 #, c-format
-msgid "ON CONFLICT does not support deferred unique constraints/exclusion constraints as arbiters"
-msgstr ""
+msgid "ON CONFLICT does not support deferrable unique constraints/exclusion constraints as arbiters"
+msgstr "ON CONFLICT no soporta las restricciones únicas/de exclusión postergables como árbitros"
 
-#: executor/execIndexing.c:814
+#: executor/execIndexing.c:821
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "no se pudo crear la restricción por exclusión «%s»"
 
-#: executor/execIndexing.c:817
+#: executor/execIndexing.c:824
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "La llave %s está en conflicto con la llave %s."
 
-#: executor/execIndexing.c:819
+#: executor/execIndexing.c:826
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Existe un conflicto de llave."
 
-#: executor/execIndexing.c:825
+#: executor/execIndexing.c:832
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "llave en conflicto viola restricción por exclusión «%s»"
 
-#: executor/execIndexing.c:828
+#: executor/execIndexing.c:835
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "La llave %s está en conflicto con la llave existente %s."
 
-#: executor/execIndexing.c:830
+#: executor/execIndexing.c:837
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "La llave está en conflicto con una llave existente."
@@ -9396,32 +9376,32 @@
 msgid "cannot change TOAST relation \"%s\""
 msgstr "no se puede cambiar la relación TOAST «%s»"
 
-#: executor/execMain.c:1049 rewrite/rewriteHandler.c:2631
+#: executor/execMain.c:1049 rewrite/rewriteHandler.c:2641
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "no se puede insertar en la vista «%s»"
 
-#: executor/execMain.c:1051 rewrite/rewriteHandler.c:2634
+#: executor/execMain.c:1051 rewrite/rewriteHandler.c:2644
 #, c-format
 msgid "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule."
 msgstr "Para activar las inserciones en la vista, provea un disparador INSTEAD OF INSERT un una regla incodicional ON INSERT DO INSTEAD."
 
-#: executor/execMain.c:1057 rewrite/rewriteHandler.c:2639
+#: executor/execMain.c:1057 rewrite/rewriteHandler.c:2649
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "no se puede actualizar la vista «%s»"
 
-#: executor/execMain.c:1059 rewrite/rewriteHandler.c:2642
+#: executor/execMain.c:1059 rewrite/rewriteHandler.c:2652
 #, c-format
 msgid "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule."
 msgstr "Para activar las actualizaciones en la vista, provea un disparador INSTEAD OF UPDATE o una regla incondicional ON UPDATE DO INSTEAD."
 
-#: executor/execMain.c:1065 rewrite/rewriteHandler.c:2647
+#: executor/execMain.c:1065 rewrite/rewriteHandler.c:2657
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "no se puede eliminar de la vista «%s»"
 
-#: executor/execMain.c:1067 rewrite/rewriteHandler.c:2650
+#: executor/execMain.c:1067 rewrite/rewriteHandler.c:2660
 #, c-format
 msgid "To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule."
 msgstr "Para activar las eliminaciones en la vista, provea un disparador INSTEAD OF DELETE o una regla incondicional ON DELETE DO INSTEAD."
@@ -9513,35 +9493,35 @@
 msgstr "el nuevo registro para la relación «%s» viola la restricción «check» «%s»"
 
 #: executor/execMain.c:1811
-#, fuzzy, c-format
-msgid "new row violates WITH CHECK OPTION for \"%s\""
-msgstr "nueva fila viola WITH CHECK OPTION de la vista «%s»"
+#, c-format
+msgid "new row violates check option for view \"%s\""
+msgstr "el nuevo registro para la vista «%s» viola la opción check"
 
 #: executor/execMain.c:1821
 #, c-format
-msgid "new row violates row level security policy \"%s\" for \"%s\""
-msgstr ""
+msgid "new row violates row-level security policy \"%s\" for table \"%s\""
+msgstr "el nuevo registro viola la política de seguridad de registros «%s» para la tabla «%s»"
 
 #: executor/execMain.c:1826
 #, c-format
-msgid "new row violates row level security policy for \"%s\""
-msgstr ""
+msgid "new row violates row-level security policy for table \"%s\""
+msgstr "el nuevo registro viola la política de seguridad de registros para la tabla «%s»"
 
 #: executor/execMain.c:1833
 #, c-format
-msgid "new row violates row level security policy \"%s\" (USING expression) for \"%s\""
-msgstr ""
+msgid "new row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
+msgstr "el nuevo registro viola la política de seguridad de registros «%s» (expresión USING) para la tabla «%s»"
 
 #: executor/execMain.c:1838
 #, c-format
-msgid "new row violates row level security policy (USING expression) for \"%s\""
-msgstr ""
+msgid "new row violates row-level security policy (USING expression) for table \"%s\""
+msgstr "el nuevo registro viola la política de seguridad de registros (expresión USING) para la tabla «%s»"
 
-#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3191
-#: utils/adt/array_userfuncs.c:472 utils/adt/arrayfuncs.c:263
+#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3209
+#: utils/adt/array_userfuncs.c:484 utils/adt/arrayfuncs.c:263
 #: utils/adt/arrayfuncs.c:561 utils/adt/arrayfuncs.c:1291
 #: utils/adt/arrayfuncs.c:3335 utils/adt/arrayfuncs.c:5219
-#: utils/adt/arrayfuncs.c:5742
+#: utils/adt/arrayfuncs.c:5736
 #, 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)"
@@ -9551,12 +9531,12 @@
 msgid "array subscript in assignment must not be null"
 msgstr "subíndice de array en asignación no puede ser nulo"
 
-#: executor/execQual.c:635 executor/execQual.c:4116
+#: executor/execQual.c:635 executor/execQual.c:4156
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "el atributo %d tiene tipo erróneo"
 
-#: executor/execQual.c:636 executor/execQual.c:4117
+#: executor/execQual.c:636 executor/execQual.c:4157
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "La tabla tiene tipo %s, pero la consulta esperaba %s."
@@ -9650,63 +9630,63 @@
 msgid "op ANY/ALL (array) does not support set arguments"
 msgstr "op ANY/ALL (array) no soporta argumentos que sean conjuntos"
 
-#: executor/execQual.c:3169
+#: executor/execQual.c:3187
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "no se puede mezclar arrays incompatibles"
 
-#: executor/execQual.c:3170
+#: executor/execQual.c:3188
 #, c-format
 msgid "Array with element type %s cannot be included in ARRAY construct with element type %s."
 msgstr "El array con tipo de elemento %s no puede ser incluido en una sentencia ARRAY con tipo de elemento %s."
 
-#: executor/execQual.c:3211 executor/execQual.c:3238
+#: executor/execQual.c:3229 executor/execQual.c:3256
 #, c-format
 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:3753
+#: executor/execQual.c:3771
 #, c-format
 msgid "NULLIF does not support set arguments"
 msgstr "NULLIF no soporta argumentos que sean conjuntos"
 
-#: executor/execQual.c:3986 utils/adt/domains.c:136
+#: executor/execQual.c:4019 utils/adt/domains.c:137
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "el dominio %s no permite valores null"
 
-#: executor/execQual.c:4016 utils/adt/domains.c:173
+#: executor/execQual.c:4056 utils/adt/domains.c:179
 #, 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:4371
+#: executor/execQual.c:4411
 #, c-format
 msgid "WHERE CURRENT OF is not supported for this table type"
 msgstr "WHERE CURRENT OF no está soportado para este tipo de tabla"
 
-#: executor/execQual.c:4518 parser/parse_agg.c:596 parser/parse_agg.c:626
+#: executor/execQual.c:4558 parser/parse_agg.c:596 parser/parse_agg.c:626
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "no se pueden anidar llamadas a funciones de agregación"
 
-#: executor/execQual.c:4580 parser/parse_agg.c:742
+#: executor/execQual.c:4620 parser/parse_agg.c:742
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "no se pueden anidar llamadas a funciones de ventana deslizante"
 
-#: executor/execQual.c:4792
+#: executor/execQual.c:4832
 #, c-format
 msgid "target type is not an array"
 msgstr "el tipo de destino no es un array"
 
-#: executor/execQual.c:4907
+#: executor/execQual.c:4949
 #, 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:5042 utils/adt/arrayfuncs.c:3777
-#: utils/adt/arrayfuncs.c:6315 utils/adt/rowtypes.c:916
+#: executor/execQual.c:5084 utils/adt/arrayfuncs.c:3777
+#: utils/adt/arrayfuncs.c:6303 utils/adt/rowtypes.c:927
 #, 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"
@@ -9726,84 +9706,89 @@
 msgid "could not determine actual type of argument declared %s"
 msgstr "no se pudo determinar el tipo de argumento declarado %s"
 
+#: executor/functions.c:509
+#, c-format
+msgid "cannot COPY to/from client in a SQL function"
+msgstr "no se puede ejecutar COPY desde/a un cliente en una función SQL"
+
 #. translator: %s is a SQL statement name
-#: executor/functions.c:506
+#: executor/functions.c:515
 #, 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:513 executor/spi.c:1368 executor/spi.c:2158
+#: executor/functions.c:522 executor/spi.c:1368 executor/spi.c:2158
 #, 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:641
+#: executor/functions.c:650
 #, c-format
 msgid "could not determine actual result type for function declared to return type %s"
 msgstr "no se pudo determinar el tipo de resultado para función declarada retornando tipo %s"
 
-#: executor/functions.c:1405
+#: executor/functions.c:1414
 #, c-format
 msgid "SQL function \"%s\" statement %d"
 msgstr "función SQL «%s» en la sentencia %d"
 
-#: executor/functions.c:1431
+#: executor/functions.c:1440
 #, c-format
 msgid "SQL function \"%s\" during startup"
 msgstr "función SQL «%s» durante el inicio"
 
-#: executor/functions.c:1590 executor/functions.c:1627
-#: executor/functions.c:1639 executor/functions.c:1752
-#: executor/functions.c:1785 executor/functions.c:1815
+#: executor/functions.c:1599 executor/functions.c:1636
+#: executor/functions.c:1648 executor/functions.c:1761
+#: executor/functions.c:1794 executor/functions.c:1824
 #, 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:1592
+#: executor/functions.c:1601
 #, c-format
 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:1629
+#: executor/functions.c:1638
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "La sentencia final debe retornar exactamente una columna."
 
-#: executor/functions.c:1641
+#: executor/functions.c:1650
 #, c-format
 msgid "Actual return type is %s."
 msgstr "El verdadero tipo de retorno es %s."
 
-#: executor/functions.c:1754
+#: executor/functions.c:1763
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "La sentencia final retorna demasiadas columnas."
 
-#: executor/functions.c:1787
+#: executor/functions.c:1796
 #, 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:1817
+#: executor/functions.c:1826
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "La sentencia final retorna muy pocas columnas."
 
-#: executor/functions.c:1866
+#: executor/functions.c:1875
 #, 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:2450 executor/nodeWindowAgg.c:2286
+#: executor/nodeAgg.c:2471 executor/nodeWindowAgg.c:2319
 #, 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/nodeCustom.c:147 executor/nodeCustom.c:158
-#, fuzzy, c-format
-msgid "custom-scan \"%s\" does not support MarkPos"
-msgstr "la extensión «%s» no soporta SET SCHEMA"
+#, c-format
+msgid "custom scan \"%s\" does not support MarkPos"
+msgstr "el scan personalizado «%s» no soporta MarkPos"
 
 #: executor/nodeHashjoin.c:823 executor/nodeHashjoin.c:853
 #, c-format
@@ -9815,13 +9800,13 @@
 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:928 executor/nodeHashjoin.c:938
+#: executor/nodeHashjoin.c:935 executor/nodeHashjoin.c:945
 #, 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/nodeIndexonlyscan.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "lossy distance functions are not supported in index-only scans"
 msgstr "no se permiten funciones de ventana deslizante en predicados de índice"
 
@@ -9860,25 +9845,25 @@
 msgid "Query has too few columns."
 msgstr "La consulta tiene muy pocas columnas."
 
-#: executor/nodeModifyTable.c:1080
+#: executor/nodeModifyTable.c:1118
 #, c-format
 msgid "ON CONFLICT DO UPDATE command cannot affect row a second time"
-msgstr ""
+msgstr "la orden ON CONFLICT DO UPDATE no puede afectar el registro una segunda vez"
 
-#: executor/nodeModifyTable.c:1081
+#: executor/nodeModifyTable.c:1119
 #, c-format
 msgid "Ensure that no rows proposed for insertion within the same command have duplicate constrained values."
-msgstr ""
+msgstr "Asegúrese de que ningún registro propuesto para inserción dentro de la misma orden tenga valores duplicados restringidos."
 
 #: executor/nodeSamplescan.c:307
-#, fuzzy, c-format
+#, c-format
 msgid "TABLESAMPLE parameter cannot be null"
-msgstr "el argumento %d no puede ser null"
+msgstr "el parámetro TABLESAMPLE no puede ser null"
 
 #: executor/nodeSamplescan.c:320
 #, c-format
 msgid "TABLESAMPLE REPEATABLE parameter cannot be null"
-msgstr ""
+msgstr "el parámetro TABLESAMPLE REPEATABLE no puede ser null"
 
 #: executor/nodeSubplan.c:345 executor/nodeSubplan.c:384
 #: executor/nodeSubplan.c:1040
@@ -9891,22 +9876,22 @@
 msgid "moving-aggregate transition function must not return null"
 msgstr "la función de transición de moving-aggregate no debe retornar valor nulo"
 
-#: executor/nodeWindowAgg.c:1609
+#: executor/nodeWindowAgg.c:1642
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "la posición inicial del marco no debe ser null"
 
-#: executor/nodeWindowAgg.c:1622
+#: executor/nodeWindowAgg.c:1655
 #, c-format
 msgid "frame starting offset must not be negative"
 msgstr "la posición inicial del marco no debe ser negativa"
 
-#: executor/nodeWindowAgg.c:1635
+#: executor/nodeWindowAgg.c:1668
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "la posición final del marco no debe ser null"
 
-#: executor/nodeWindowAgg.c:1648
+#: executor/nodeWindowAgg.c:1681
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "la posición final del marco no debe ser negativa"
@@ -9942,12 +9927,12 @@
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE no está soportado"
 
-#: executor/spi.c:1343 parser/analyze.c:2292
+#: executor/spi.c:1343 parser/analyze.c:2289
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Los cursores declarados SCROLL deben ser READ ONLY."
 
-#: executor/spi.c:2450
+#: executor/spi.c:2462
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "sentencia SQL: «%s»"
@@ -9972,482 +9957,477 @@
 msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
 msgstr "No se puede agrandar el búfer de cadena que ya tiene %d bytes en %d bytes adicionales."
 
-#: libpq/auth.c:235
+#: libpq/auth.c:238
 #, 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:238
+#: libpq/auth.c:241
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "la autentificación «trust» falló para el usuario «%s»"
 
-#: libpq/auth.c:241
+#: libpq/auth.c:244
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "la autentificación Ident falló para el usuario «%s»"
 
-#: libpq/auth.c:244
+#: libpq/auth.c:247
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "la autentificación Peer falló para el usuario «%s»"
 
-#: libpq/auth.c:248
+#: libpq/auth.c:251
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "la autentificación password falló para el usuario «%s»"
 
-#: libpq/auth.c:253
+#: libpq/auth.c:256
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "la autentificación GSSAPI falló para el usuario «%s»"
 
-#: libpq/auth.c:256
+#: libpq/auth.c:259
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "la autentificación SSPI falló para el usuario «%s»"
 
-#: libpq/auth.c:259
+#: libpq/auth.c:262
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "la autentificación PAM falló para el usuario «%s»"
 
-#: libpq/auth.c:262
+#: libpq/auth.c:265
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "la autentificación LDAP falló para el usuario «%s»"
 
-#: libpq/auth.c:265
+#: libpq/auth.c:268
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "la autentificación por certificado falló para el usuario «%s»"
 
-#: libpq/auth.c:268
+#: libpq/auth.c:271
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "la autentificación RADIUS falló para el usuario «%s»"
 
-#: libpq/auth.c:271
+#: libpq/auth.c:274
 #, 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:275
+#: libpq/auth.c:278
 #, c-format
 msgid "Connection matched pg_hba.conf line %d: \"%s\""
 msgstr "La conexión coincidió con la línea %d de pg_hba.conf: «%s»"
 
-#: libpq/auth.c:330
+#: libpq/auth.c:333
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "la conexión requiere un certificado de cliente válido"
 
-#: libpq/auth.c:372
+#: libpq/auth.c:375
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
 msgstr "pg_hba.conf rechaza la conexión de replicación para el servidor «%s», usuario «%s», %s"
 
-#: libpq/auth.c:374 libpq/auth.c:390 libpq/auth.c:448 libpq/auth.c:466
+#: libpq/auth.c:377 libpq/auth.c:393 libpq/auth.c:451 libpq/auth.c:469
 msgid "SSL off"
 msgstr "SSL inactivo"
 
-#: libpq/auth.c:374 libpq/auth.c:390 libpq/auth.c:448 libpq/auth.c:466
+#: libpq/auth.c:377 libpq/auth.c:393 libpq/auth.c:451 libpq/auth.c:469
 msgid "SSL on"
 msgstr "SSL activo"
 
-#: libpq/auth.c:378
+#: libpq/auth.c:381
 #, 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:387
+#: libpq/auth.c:390
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "pg_hba.conf rechaza la conexión para el servidor «%s», usuario «%s», base de datos «%s», %s"
 
-#: libpq/auth.c:394
+#: libpq/auth.c:397
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
 msgstr "pg_hba.conf rechaza la conexión para el servidor «%s», usuario «%s», base de datos «%s»"
 
-#: libpq/auth.c:423
+#: libpq/auth.c:426
 #, 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:426
+#: libpq/auth.c:429
 #, 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:429
+#: libpq/auth.c:432
 #, 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:432
+#: libpq/auth.c:435
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
 msgstr "No se pudo traducir el nombre de host del cliente «%s» a una dirección IP: %s."
 
-#: libpq/auth.c:437
+#: libpq/auth.c:440
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "No se pudo obtener la dirección IP del cliente a un nombre de host: %s."
 
-#: libpq/auth.c:446
+#: libpq/auth.c:449
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s"
 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:453
+#: libpq/auth.c:456
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
 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:463
+#: libpq/auth.c:466
 #, 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:471
+#: libpq/auth.c:474
 #, 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:514 libpq/hba.c:1180
+#: libpq/auth.c:517 libpq/hba.c:1180
 #, c-format
 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:640
+#: libpq/auth.c:643
 #, 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:668
+#: libpq/auth.c:671
 #, c-format
 msgid "invalid password packet size"
 msgstr "el tamaño del paquete de contraseña no es válido"
 
-#: libpq/auth.c:672
-#, c-format
-msgid "received password packet"
-msgstr "se recibió un paquete de clave"
-
-#: libpq/auth.c:799
+#: libpq/auth.c:801
 #, c-format
 msgid "GSSAPI is not supported in protocol version 2"
 msgstr "GSSAPI no está soportado por el protocolo versión 2"
 
-#: libpq/auth.c:859
+#: libpq/auth.c:861
 #, 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:920
+#: libpq/auth.c:922
 msgid "accepting GSS security context failed"
 msgstr "falló la aceptación del contexto de seguridad GSS"
 
-#: libpq/auth.c:946
+#: libpq/auth.c:948
 msgid "retrieving GSS user name failed"
 msgstr "falló la obtención del nombre de usuario GSS"
 
-#: libpq/auth.c:1063
+#: libpq/auth.c:1067
 #, c-format
 msgid "SSPI is not supported in protocol version 2"
 msgstr "SSPI no está soportado por el protocolo versión 2"
 
-#: libpq/auth.c:1078
+#: libpq/auth.c:1082
 msgid "could not acquire SSPI credentials"
 msgstr "no se pudo obtener las credenciales SSPI"
 
-#: libpq/auth.c:1096
+#: libpq/auth.c:1100
 #, 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:1168
+#: libpq/auth.c:1172
 msgid "could not accept SSPI security context"
 msgstr "no se pudo aceptar un contexto SSPI"
 
-#: libpq/auth.c:1230
+#: libpq/auth.c:1234
 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:1475
+#: libpq/auth.c:1481
 #, 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:1490
+#: libpq/auth.c:1496
 #, 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:1502
+#: libpq/auth.c:1508
 #, 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:1524
+#: libpq/auth.c:1530
 #, 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:1541
+#: libpq/auth.c:1547
 #, 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:1551
+#: libpq/auth.c:1557
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "respuesta del servidor Ident en formato no válido: «%s»"
 
-#: libpq/auth.c:1591
+#: libpq/auth.c:1597
 #, c-format
 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:1595
+#: libpq/auth.c:1601
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "no se pudo recibir credenciales: %m"
 
-#: libpq/auth.c:1604
+#: libpq/auth.c:1610
 #, c-format
 msgid "could not look up local user ID %ld: %s"
 msgstr "no se pudo encontrar el ID del usuario local %ld: %s"
 
-#: libpq/auth.c:1688 libpq/auth.c:1959 libpq/auth.c:2315
+#: libpq/auth.c:1694 libpq/auth.c:1965 libpq/auth.c:2324
 #, c-format
 msgid "empty password returned by client"
 msgstr "el cliente retornó una contraseña vacía"
 
-#: libpq/auth.c:1698
+#: libpq/auth.c:1704
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "se ha recibido un error de la biblioteca PAM: %s"
 
-#: libpq/auth.c:1767
+#: libpq/auth.c:1773
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "no se pudo crear autenticador PAM: %s"
 
-#: libpq/auth.c:1778
+#: libpq/auth.c:1784
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) falló: %s"
 
-#: libpq/auth.c:1789
+#: libpq/auth.c:1795
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) falló: %s"
 
-#: libpq/auth.c:1800
+#: libpq/auth.c:1806
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate falló: %s"
 
-#: libpq/auth.c:1811
+#: libpq/auth.c:1817
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt falló: %s"
 
-#: libpq/auth.c:1822
+#: libpq/auth.c:1828
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "no se pudo liberar autenticador PAM: %s"
 
-#: libpq/auth.c:1855
+#: libpq/auth.c:1861
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "no se pudo inicializar LDAP: %m"
 
-#: libpq/auth.c:1858
+#: libpq/auth.c:1864
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "no se pudo inicializar LDAP: código de error %d"
 
-#: libpq/auth.c:1868
+#: libpq/auth.c:1874
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "no se pudo definir la versión de protocolo LDAP: %s"
 
-#: libpq/auth.c:1897
+#: libpq/auth.c:1903
 #, c-format
 msgid "could not load wldap32.dll"
 msgstr "no se pudo cargar wldap32.dll"
 
-#: libpq/auth.c:1905
+#: libpq/auth.c:1911
 #, c-format
 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:1906
+#: libpq/auth.c:1912
 #, c-format
 msgid "LDAP over SSL is not supported on this platform."
 msgstr "LDAP sobre SSL no está soportado en esta plataforma."
 
-#: libpq/auth.c:1921
+#: libpq/auth.c:1927
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "no se pudo iniciar sesión de LDAP TLS: %s"
 
-#: libpq/auth.c:1943
+#: libpq/auth.c:1949
 #, c-format
 msgid "LDAP server not specified"
 msgstr "servidor LDAP no especificado"
 
-#: libpq/auth.c:1996
+#: libpq/auth.c:2002
 #, c-format
 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:2011
+#: libpq/auth.c:2017
 #, c-format
 msgid "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s"
 msgstr "no se pudo hacer el enlace LDAP inicial para el ldapbinddb «%s» en el servidor «%s»: %s"
 
-#: libpq/auth.c:2035
+#: libpq/auth.c:2041
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr "no se pudo hacer la búsqueda LDAP para el filtro «%s» en el servidor «%s»: %s"
 
-#: libpq/auth.c:2046
+#: libpq/auth.c:2052
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "no existe el usuario LDAP «%s»"
 
-#: libpq/auth.c:2047
+#: libpq/auth.c:2053
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "La búsqueda LDAP para el filtro «%s» en el servidor «%s» no retornó elementos."
 
-#: libpq/auth.c:2051
+#: libpq/auth.c:2057
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "el usuario LDAP «%s» no es única"
 
-#: libpq/auth.c:2052
+#: libpq/auth.c:2058
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned %d entry."
 msgid_plural "LDAP search for filter \"%s\" on server \"%s\" returned %d entries."
 msgstr[0] "La búsqueda LDAP para el filtro «%s» en el servidor «%s» retornó %d elemento."
 msgstr[1] "La búsqueda LDAP para el filtro «%s» en el servidor «%s» retornó %d elementos."
 
-#: libpq/auth.c:2070
+#: libpq/auth.c:2076
 #, c-format
 msgid "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
 msgstr "no se pudo obtener el dn para la primera entrada que coincide con «%s» en el servidor «%s»: %s"
 
-#: libpq/auth.c:2090
+#: libpq/auth.c:2096
 #, 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:2120
+#: libpq/auth.c:2126
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr "falló el inicio de sesión LDAP para el usuario «%s» en el servidor «%s»: %s"
 
-#: libpq/auth.c:2148
+#: libpq/auth.c:2154
 #, c-format
 msgid "certificate authentication failed for user \"%s\": client certificate contains no user name"
 msgstr "la autentificación con certificado falló para el usuario «%s»: el certificado de cliente no contiene un nombre de usuario"
 
-#: libpq/auth.c:2271
+#: libpq/auth.c:2280
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "servidor RADIUS no especificado"
 
-#: libpq/auth.c:2278
+#: libpq/auth.c:2287
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "secreto RADIUS no especificado"
 
-#: libpq/auth.c:2294 libpq/hba.c:1590
+#: libpq/auth.c:2303 libpq/hba.c:1590
 #, 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:2322
+#: libpq/auth.c:2331
 #, c-format
 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:2333
+#: libpq/auth.c:2342
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "no se pudo generar un vector aleatorio de encriptación"
 
-#: libpq/auth.c:2356
+#: libpq/auth.c:2365
 #, c-format
 msgid "could not perform MD5 encryption of password"
 msgstr "no se pudo efectuar cifrado MD5 de la contraseña"
 
-#: libpq/auth.c:2378
+#: libpq/auth.c:2387
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "no se pudo crear el socket RADIUS: %m"
 
-#: libpq/auth.c:2399
+#: libpq/auth.c:2408
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "no se pudo enlazar el socket RADIUS local: %m"
 
-#: libpq/auth.c:2409
+#: libpq/auth.c:2418
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "no se pudo enviar el paquete RADIUS: %m"
 
-#: libpq/auth.c:2442 libpq/auth.c:2467
+#: libpq/auth.c:2451 libpq/auth.c:2476
 #, c-format
 msgid "timeout waiting for RADIUS response"
 msgstr "se agotó el tiempo de espera de la respuesta RADIUS"
 
-#: libpq/auth.c:2460
+#: libpq/auth.c:2469
 #, 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:2489
+#: libpq/auth.c:2498
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "no se pudo leer la respuesta RADIUS: %m"
 
-#: libpq/auth.c:2501 libpq/auth.c:2505
+#: libpq/auth.c:2510 libpq/auth.c:2514
 #, c-format
 msgid "RADIUS response was sent from incorrect port: %d"
 msgstr "la respuesta RADIUS fue enviada desde el port incorrecto: %d"
 
-#: libpq/auth.c:2514
+#: libpq/auth.c:2523
 #, c-format
 msgid "RADIUS response too short: %d"
 msgstr "la respuesta RADIUS es demasiado corta: %d"
 
-#: libpq/auth.c:2521
+#: libpq/auth.c:2530
 #, c-format
 msgid "RADIUS response has corrupt length: %d (actual length %d)"
 msgstr "la respuesta RADIUS tiene largo corrupto: %d (largo real %d)"
 
-#: libpq/auth.c:2529
+#: libpq/auth.c:2538
 #, c-format
 msgid "RADIUS response is to a different request: %d (should be %d)"
 msgstr "la respuesta RADIUS es a una petición diferente: %d (debería ser %d)"
 
-#: libpq/auth.c:2554
+#: libpq/auth.c:2563
 #, c-format
 msgid "could not perform MD5 encryption of received packet"
 msgstr "no se pudo realizar cifrado MD5 del paquete recibido"
 
-#: libpq/auth.c:2563
+#: libpq/auth.c:2572
 #, c-format
 msgid "RADIUS response has incorrect MD5 signature"
 msgstr "la respuesta RADIUS tiene firma MD5 incorrecta"
 
-#: libpq/auth.c:2580
+#: libpq/auth.c:2589
 #, c-format
 msgid "RADIUS response has invalid code (%d) for user \"%s\""
 msgstr "la respuesta RADIUS tiene código no válido (%d) para el usuario «%s»"
@@ -10530,122 +10510,122 @@
 msgid "requested length cannot be negative"
 msgstr "el tamaño solicitado no puede ser negativo"
 
-#: libpq/be-secure-openssl.c:184
+#: libpq/be-secure-openssl.c:189
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "no se pudo crear un contexto SSL: %s"
 
-#: libpq/be-secure-openssl.c:200
+#: libpq/be-secure-openssl.c:205
 #, 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-openssl.c:206
+#: libpq/be-secure-openssl.c:211
 #, 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-openssl.c:221
+#: libpq/be-secure-openssl.c:226
 #, 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-openssl.c:223
+#: libpq/be-secure-openssl.c:228
 #, c-format
 msgid "Permissions should be u=rw (0600) or less."
 msgstr "Los permisos deberían ser u=rw (0500) o menos."
 
-#: libpq/be-secure-openssl.c:230
+#: libpq/be-secure-openssl.c:235
 #, 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-openssl.c:235
+#: libpq/be-secure-openssl.c:240
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "falló la revisión de la llave privada: %s"
 
-#: libpq/be-secure-openssl.c:264
+#: libpq/be-secure-openssl.c:269
 #, 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-openssl.c:288
+#: libpq/be-secure-openssl.c:293
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" ignored"
 msgstr "ignorando lista de revocación de certificados SSL «%s»"
 
-#: libpq/be-secure-openssl.c:290
+#: libpq/be-secure-openssl.c:295
 #, c-format
 msgid "SSL library does not support certificate revocation lists."
 msgstr "La libreria SSL no soporta listas de revocación de certificados."
 
-#: libpq/be-secure-openssl.c:295
+#: libpq/be-secure-openssl.c:300
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
 msgstr "no se pudo cargar el archivo de lista de revocación de certificados SSL «%s»: %s"
 
-#: libpq/be-secure-openssl.c:341
+#: libpq/be-secure-openssl.c:347
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "no se pudo inicializar la conexión SSL: %s"
 
-#: libpq/be-secure-openssl.c:349
+#: libpq/be-secure-openssl.c:355
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "no se definir un socket SSL: %s"
 
-#: libpq/be-secure-openssl.c:383
+#: libpq/be-secure-openssl.c:409
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "no se pudo aceptar una conexión SSL: %m"
 
-#: libpq/be-secure-openssl.c:387 libpq/be-secure-openssl.c:398
+#: libpq/be-secure-openssl.c:413 libpq/be-secure-openssl.c:424
 #, c-format
 msgid "could not accept SSL connection: EOF detected"
 msgstr "no se pudo aceptar una conexión SSL: se detectó EOF"
 
-#: libpq/be-secure-openssl.c:392
+#: libpq/be-secure-openssl.c:418
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "no se pudo aceptar una conexión SSL: %s"
 
-#: libpq/be-secure-openssl.c:403 libpq/be-secure-openssl.c:541
-#: libpq/be-secure-openssl.c:598
+#: libpq/be-secure-openssl.c:429 libpq/be-secure-openssl.c:570
+#: libpq/be-secure-openssl.c:630
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "código de error SSL no reconocido: %d"
 
-#: libpq/be-secure-openssl.c:447
+#: libpq/be-secure-openssl.c:473
 #, c-format
 msgid "SSL certificate's common name contains embedded null"
 msgstr "el «common name» del certificado SSL contiene un carácter null"
 
-#: libpq/be-secure-openssl.c:458
+#: libpq/be-secure-openssl.c:484
 #, c-format
 msgid "SSL connection from \"%s\""
 msgstr "conexión SSL desde «%s»"
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:561 libpq/be-secure-openssl.c:621
 #, c-format
 msgid "SSL error: %s"
 msgstr "error de SSL: %s"
 
-#: libpq/be-secure-openssl.c:937
+#: libpq/be-secure-openssl.c:1032
 #, c-format
 msgid "ECDH: unrecognized curve name: %s"
 msgstr "ECDH: nombre de curva no reconocida: %s"
 
-#: libpq/be-secure-openssl.c:942
+#: libpq/be-secure-openssl.c:1037
 #, c-format
 msgid "ECDH: could not create key"
 msgstr "ECDH: no se pudo crear la llave"
 
-#: libpq/be-secure-openssl.c:966
+#: libpq/be-secure-openssl.c:1061
 msgid "no SSL error reported"
 msgstr "código de error SSL no reportado"
 
-#: libpq/be-secure-openssl.c:970
+#: libpq/be-secure-openssl.c:1065
 #, c-format
 msgid "SSL error code %lu"
 msgstr "código de error SSL %lu"
@@ -10682,7 +10662,7 @@
 #: libpq/hba.c:1079 libpq/hba.c:1089 libpq/hba.c:1103 libpq/hba.c:1119
 #: libpq/hba.c:1134 libpq/hba.c:1145 libpq/hba.c:1181 libpq/hba.c:1213
 #: libpq/hba.c:1224 libpq/hba.c:1244 libpq/hba.c:1255 libpq/hba.c:1272
-#: libpq/hba.c:1297 libpq/hba.c:1334 libpq/hba.c:1344 libpq/hba.c:1413
+#: libpq/hba.c:1310 libpq/hba.c:1347 libpq/hba.c:1357 libpq/hba.c:1413
 #: libpq/hba.c:1425 libpq/hba.c:1438 libpq/hba.c:1521 libpq/hba.c:1592
 #: libpq/hba.c:1610 libpq/hba.c:1631 tsearch/ts_locale.c:182
 #, c-format
@@ -10855,17 +10835,17 @@
 msgid "cert authentication is only supported on hostssl connections"
 msgstr "la autentificación cert sólo está soportada en conexiones hostssl"
 
-#: libpq/hba.c:1296
+#: libpq/hba.c:1309
 #, 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:1333
+#: libpq/hba.c:1346
 #, c-format
 msgid "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, or ldapurl together with ldapprefix"
 msgstr "no se puede usar ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute o ldapurl junto con ldapprefix"
 
-#: libpq/hba.c:1343
+#: libpq/hba.c:1356
 #, c-format
 msgid "authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix\", or \"ldapsuffix\" to be set"
 msgstr "el método de autentificación «ldap» requiere que los argumento «ldapbasedn», «ldapprefix» o «ldapsuffix» estén definidos"
@@ -11069,18 +11049,18 @@
 msgstr "no se pudo aceptar una nueva conexión: %m"
 
 #: libpq/pqcomm.c:847
-#, fuzzy, c-format
+#, c-format
 msgid "there is no client connection"
-msgstr "se encontró fin de archivo inesperado en la conexión del cliente"
+msgstr "no hay conexión de cliente"
 
 #: libpq/pqcomm.c:898 libpq/pqcomm.c:994
 #, c-format
 msgid "could not receive data from client: %m"
 msgstr "no se pudo recibir datos del cliente: %m"
 
-#: libpq/pqcomm.c:1139 tcop/postgres.c:3902
+#: libpq/pqcomm.c:1139 tcop/postgres.c:3917
 #, c-format
-msgid "terminating connection because protocol sync was lost"
+msgid "terminating connection because protocol synchronization was lost"
 msgstr "terminando la conexión por pérdida de sincronía del protocolo"
 
 #: libpq/pqcomm.c:1205
@@ -11109,7 +11089,7 @@
 msgstr "no hay datos restantes en el mensaje"
 
 #: libpq/pqformat.c:556 libpq/pqformat.c:574 libpq/pqformat.c:595
-#: utils/adt/arrayfuncs.c:1460 utils/adt/rowtypes.c:556
+#: utils/adt/arrayfuncs.c:1460 utils/adt/rowtypes.c:563
 #, c-format
 msgid "insufficient data left in message"
 msgstr "los datos restantes del mensaje son insuficientes"
@@ -11124,12 +11104,12 @@
 msgid "invalid message format"
 msgstr "formato de mensaje no válido"
 
-#: main/main.c:259
+#: main/main.c:264
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: WSAStartup falló: %d\n"
 
-#: main/main.c:306
+#: main/main.c:327
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -11138,7 +11118,7 @@
 "%s es el servidor PostgreSQL.\n"
 "\n"
 
-#: main/main.c:307
+#: main/main.c:328
 #, c-format
 msgid ""
 "Usage:\n"
@@ -11149,114 +11129,114 @@
 "  %s [OPCION]...\n"
 "\n"
 
-#: main/main.c:308
+#: main/main.c:329
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: main/main.c:309
+#: main/main.c:330
 #, c-format
 msgid "  -B NBUFFERS        number of shared buffers\n"
 msgstr "  -B NBUFFERS     número de búfers de memoria compartida\n"
 
-#: main/main.c:310
+#: main/main.c:331
 #, c-format
 msgid "  -c NAME=VALUE      set run-time parameter\n"
 msgstr "  -c VAR=VALOR    definir parámetro de ejecución\n"
 
-#: main/main.c:311
+#: main/main.c:332
 #, c-format
 msgid "  -C NAME            print value of run-time parameter, then exit\n"
 msgstr "  -C NOMBRE       imprimir valor de parámetro de configuración, luego salir\n"
 
-#: main/main.c:312
+#: main/main.c:333
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5          nivel de depuración\n"
 
-#: main/main.c:313
+#: main/main.c:334
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D DATADIR      directorio de bases de datos\n"
 
-#: main/main.c:314
+#: main/main.c:335
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e              usar estilo europeo de fechas (DMY)\n"
 
-#: main/main.c:315
+#: main/main.c:336
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F              desactivar fsync\n"
 
-#: main/main.c:316
+#: main/main.c:337
 #, 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"
 
-#: main/main.c:317
+#: main/main.c:338
 #, c-format
 msgid "  -i                 enable TCP/IP connections\n"
 msgstr "  -i              activar conexiones TCP/IP\n"
 
-#: main/main.c:318
+#: main/main.c:339
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k DIRECTORIO   ubicación del socket Unix\n"
 
-#: main/main.c:320
+#: main/main.c:341
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l              activar conexiones SSL\n"
 
-#: main/main.c:322
+#: main/main.c:343
 #, c-format
 msgid "  -N MAX-CONNECT     maximum number of allowed connections\n"
 msgstr "  -N MAX-CONN     número máximo de conexiones permitidas\n"
 
-#: main/main.c:323
+#: main/main.c:344
 #, c-format
 msgid "  -o OPTIONS         pass \"OPTIONS\" to each server process (obsolete)\n"
 msgstr "  -o OPCIONES     pasar «OPCIONES» a cada proceso servidor (obsoleto)\n"
 
-#: main/main.c:324
+#: main/main.c:345
 #, c-format
 msgid "  -p PORT            port number to listen on\n"
 msgstr "  -p PUERTO       número de puerto en el cual escuchar\n"
 
-#: main/main.c:325
+#: main/main.c:346
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s              mostrar estadísticas después de cada consulta\n"
 
-#: main/main.c:326
+#: main/main.c:347
 #, c-format
 msgid "  -S WORK-MEM        set amount of memory for sorts (in kB)\n"
 msgstr "  -S WORK-MEM     definir cantidad de memoria para ordenamientos (en kB)\n"
 
-#: main/main.c:327
+#: main/main.c:348
 #, c-format
 msgid "  -V, --version      output version information, then exit\n"
 msgstr "  -V, --version   mostrar información de la versión, luego salir\n"
 
-#: main/main.c:328
+#: main/main.c:349
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --NOMBRE=VALOR  definir parámetro de ejecución\n"
 
-#: main/main.c:329
+#: main/main.c:350
 #, c-format
 msgid "  --describe-config  describe configuration parameters, then exit\n"
 msgstr ""
 "  --describe-config\n"
 "                  mostrar parámetros de configuración y salir\n"
 
-#: main/main.c:330
+#: main/main.c:351
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help      muestra esta ayuda, luego sale\n"
 
-#: main/main.c:332
+#: main/main.c:353
 #, c-format
 msgid ""
 "\n"
@@ -11265,44 +11245,44 @@
 "\n"
 "Opciones de desarrollador:\n"
 
-#: main/main.c:333
+#: main/main.c:354
 #, 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"
 
-#: main/main.c:334
+#: main/main.c:355
 #, 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"
 
-#: main/main.c:335
+#: main/main.c:356
 #, c-format
 msgid "  -O                 allow system table structure changes\n"
 msgstr "  -O              permitir cambios en estructura de tablas de sistema\n"
 
-#: main/main.c:336
+#: main/main.c:357
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P              desactivar índices de sistema\n"
 
-#: main/main.c:337
+#: main/main.c:358
 #, 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"
 
-#: main/main.c:338
+#: main/main.c:359
 #, 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"
 
-#: main/main.c:339
+#: main/main.c:360
 #, 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"
 
-#: main/main.c:341
+#: main/main.c:362
 #, c-format
 msgid ""
 "\n"
@@ -11311,37 +11291,37 @@
 "\n"
 "Opciones para modo mono-usuario:\n"
 
-#: main/main.c:342
+#: main/main.c:363
 #, 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"
 
-#: main/main.c:343
+#: main/main.c:364
 #, 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"
 
-#: main/main.c:344
+#: main/main.c:365
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5          nivel de depuración\n"
 
-#: main/main.c:345
+#: main/main.c:366
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E              mostrar las consultas antes de su ejecución\n"
 
-#: main/main.c:346
+#: main/main.c:367
 #, 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:347 main/main.c:352
+#: main/main.c:368 main/main.c:373
 #, 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:349
+#: main/main.c:370
 #, c-format
 msgid ""
 "\n"
@@ -11350,22 +11330,22 @@
 "\n"
 "Opciones para modo de inicio (bootstrapping):\n"
 
-#: main/main.c:350
+#: main/main.c:371
 #, 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:351
+#: main/main.c:372
 #, 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:353
+#: main/main.c:374
 #, c-format
 msgid "  -x NUM             internal use\n"
 msgstr "  -x NUM          uso interno\n"
 
-#: main/main.c:355
+#: main/main.c:376
 #, c-format
 msgid ""
 "\n"
@@ -11382,7 +11362,7 @@
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>\n"
 
-#: main/main.c:369
+#: main/main.c:390
 #, c-format
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
@@ -11396,12 +11376,12 @@
 "Vea la documentación para obtener más información acerca de cómo\n"
 "iniciar correctamente el servidor.\n"
 
-#: main/main.c:386
+#: main/main.c:407
 #, c-format
 msgid "%s: real and effective user IDs must match\n"
 msgstr "%s: los IDs de usuario real y efectivo deben coincidir\n"
 
-#: main/main.c:393
+#: main/main.c:414
 #, c-format
 msgid ""
 "Execution of PostgreSQL by a user with administrative permissions is not\n"
@@ -11416,78 +11396,83 @@
 "Vea la documentación para obtener más información acerca de cómo\n"
 "iniciar correctamente el servidor.\n"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:1782
-#: parser/parse_coerce.c:1810 parser/parse_coerce.c:1886
-#: parser/parse_expr.c:1981 parser/parse_func.c:597 parser/parse_oper.c:952
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:1820
+#: parser/parse_coerce.c:1848 parser/parse_coerce.c:1924
+#: parser/parse_expr.c:1994 parser/parse_func.c:597 parser/parse_oper.c:952
 #, 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/path/allpaths.c:2272
-#, fuzzy, c-format
+#, c-format
 msgid "WHERE CURRENT OF is not supported on a view with no underlying relation"
-msgstr "WHERE CURRENT OF no está soportado para este tipo de tabla"
+msgstr "WHERE CURRENT OF no está soportado en una vista sin relación subyacente"
 
 #: optimizer/path/allpaths.c:2277
-#, fuzzy, c-format
+#, c-format
 msgid "WHERE CURRENT OF is not supported on a view with more than one underlying relation"
-msgstr "WHERE CURRENT OF no está soportado para este tipo de tabla"
+msgstr "WHERE CURRENT OF no está soportado en una vista con más de una relación subyacente"
 
 #: optimizer/path/allpaths.c:2282
-#, fuzzy, c-format
+#, c-format
 msgid "WHERE CURRENT OF is not supported on a view with grouping or aggregation"
-msgstr "WHERE CURRENT OF no está soportado para este tipo de tabla"
+msgstr "WHERE CURRENT OF no está soportado en una vista con agrupamiento o agregación"
 
-#: optimizer/path/joinrels.c:740
+#: optimizer/path/joinrels.c:802
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable or hash-joinable join conditions"
 msgstr "FULL JOIN sólo está soportado con condiciones que se pueden usar con merge join o hash join"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/initsplan.c:1083
+#: optimizer/plan/initsplan.c:1104
 #, c-format
 msgid "%s cannot be applied to the nullable side of an outer join"
 msgstr "%s no puede ser aplicado al lado nulable de un outer join"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1324 parser/analyze.c:1481 parser/analyze.c:1679
-#: parser/analyze.c:2460
+#: optimizer/plan/planner.c:1341 parser/analyze.c:1478 parser/analyze.c:1676
+#: parser/analyze.c:2457
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s no está permitido con UNION/INTERSECT/EXCEPT"
 
-#: optimizer/plan/planner.c:3580
+#: optimizer/plan/planner.c:1762 optimizer/plan/planner.c:3603
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "no se pudo implementar GROUP BY"
 
-#: optimizer/plan/planner.c:3581 optimizer/plan/planner.c:3749
+#: optimizer/plan/planner.c:1763
+#, c-format
+msgid "Some of the datatypes do not support sorting, which is required for grouping sets."
+msgstr "Algunos de los tipos no soportan ordenamiento, el cual es necesario para los «grouping sets»."
+
+#: optimizer/plan/planner.c:3604 optimizer/plan/planner.c:3772
 #: optimizer/prep/prepunion.c:828
 #, c-format
 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."
 
-#: optimizer/plan/planner.c:3748
+#: optimizer/plan/planner.c:3771
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "no se pudo implementar DISTINCT"
 
-#: optimizer/plan/planner.c:4354
+#: optimizer/plan/planner.c:4377
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "No se pudo implementar PARTITION BY de ventana"
 
-#: optimizer/plan/planner.c:4355
+#: optimizer/plan/planner.c:4378
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "Las columnas de particionamiento de ventana deben de tipos que se puedan ordenar."
 
-#: optimizer/plan/planner.c:4359
+#: optimizer/plan/planner.c:4382
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "no se pudo implementar ORDER BY de ventana"
 
-#: optimizer/plan/planner.c:4360
+#: optimizer/plan/planner.c:4383
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "Las columnas de ordenamiento de ventana debe ser de tipos que se puedan ordenar."
@@ -11513,7 +11498,7 @@
 msgid "could not implement %s"
 msgstr "no se pudo implementar %s"
 
-#: optimizer/util/clauses.c:4597
+#: optimizer/util/clauses.c:4693
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "función SQL «%s», durante expansión en línea"
@@ -11523,27 +11508,27 @@
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr "no se pueden crear tablas temporales o unlogged durante la recuperación"
 
-#: optimizer/util/plancat.c:498
+#: optimizer/util/plancat.c:490
 #, c-format
-msgid "system columns cannot be used in an ON CONFLICT clause"
-msgstr ""
+msgid "whole row unique index inference specifications are not supported"
+msgstr "no están soportadas las especificaciones de inferencia de índice único de registro completo"
 
-#: optimizer/util/plancat.c:516
+#: optimizer/util/plancat.c:507
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
-msgstr ""
+msgstr "la restricción en la cláusula ON CONFLICT no tiene un índice asociado"
 
-#: optimizer/util/plancat.c:568
-#, fuzzy, c-format
+#: optimizer/util/plancat.c:558
+#, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
-msgstr "el método de acceso «%s» no soporta restricciones por exclusión"
+msgstr "ON CONFLICT DO UPDATE no está soportado con restricciones de exclusión"
 
-#: optimizer/util/plancat.c:675
-#, fuzzy, c-format
+#: optimizer/util/plancat.c:663
+#, c-format
 msgid "there is no unique or exclusion constraint matching the ON CONFLICT specification"
-msgstr "no hay restricción unique que coincida con las columnas dadas en la tabla referida «%s»"
+msgstr "no hay restricción única o de exclusión que coincida con la especificación ON CONFLICT"
 
-#: parser/analyze.c:639 parser/analyze.c:1253
+#: parser/analyze.c:639 parser/analyze.c:1250
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "las listas VALUES deben ser todas de la misma longitud"
@@ -11563,177 +11548,177 @@
 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 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/analyze.c:1074 parser/analyze.c:1454
+#: parser/analyze.c:1071 parser/analyze.c:1451
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO no está permitido aquí"
 
-#: parser/analyze.c:1267
+#: parser/analyze.c:1264
 #, c-format
 msgid "DEFAULT can only appear in a VALUES list within INSERT"
 msgstr "DEFAULT sólo puede aparecer en listas VALUES dentro de un INSERT"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1386 parser/analyze.c:2630
+#: parser/analyze.c:1383 parser/analyze.c:2627
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s no puede ser aplicado a VALUES"
 
-#: parser/analyze.c:1607
+#: parser/analyze.c:1604
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "cláusula UNION/INTERSECT/EXCEPT ORDER BY no válida"
 
-#: parser/analyze.c:1608
+#: parser/analyze.c:1605
 #, c-format
 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."
 
-#: parser/analyze.c:1609
+#: parser/analyze.c:1606
 #, c-format
 msgid "Add the expression/function to every SELECT, or move the UNION into a FROM clause."
 msgstr "Agregue la función o expresión a todos los SELECT, o mueva el UNION dentro de una cláusula FROM."
 
-#: parser/analyze.c:1669
+#: parser/analyze.c:1666
 #, c-format
 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/analyze.c:1733
+#: parser/analyze.c:1730
 #, c-format
 msgid "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"
 msgstr "una sentencia miembro de UNION/INSERT/EXCEPT no puede referirse a otras relaciones del mismo nivel de la consulta"
 
-#: parser/analyze.c:1822
+#: parser/analyze.c:1819
 #, 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:2215
+#: parser/analyze.c:2212
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "RETURNING debe tener al menos una columna"
 
-#: parser/analyze.c:2252
+#: parser/analyze.c:2249
 #, c-format
 msgid "cannot specify both SCROLL and NO SCROLL"
 msgstr "no se puede especificar SCROLL y NO SCROLL"
 
-#: parser/analyze.c:2270
+#: parser/analyze.c:2267
 #, c-format
 msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
 msgstr "DECLARE CURSOR no debe contener sentencias que modifiquen datos en WITH"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2278
+#: parser/analyze.c:2275
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s no está soportado"
 
-#: parser/analyze.c:2281
+#: parser/analyze.c:2278
 #, c-format
 msgid "Holdable cursors must be READ ONLY."
 msgstr "Los cursores declarados HOLD deben ser READ ONLY."
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2289
+#: parser/analyze.c:2286
 #, c-format
 msgid "DECLARE SCROLL CURSOR ... %s is not supported"
 msgstr "DECLARE SCROLL CURSOR ... %s no está soportado"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2300
+#: parser/analyze.c:2297
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not supported"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s no está soportado"
 
-#: parser/analyze.c:2303
+#: parser/analyze.c:2300
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "Los cursores insensitivos deben ser READ ONLY."
 
-#: parser/analyze.c:2369
+#: parser/analyze.c:2366
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr "las vistas materializadas no deben usar sentencias que modifiquen datos en WITH"
 
-#: parser/analyze.c:2379
+#: parser/analyze.c:2376
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr "las vistas materializadas no deben usar tablas temporales o vistas"
 
-#: parser/analyze.c:2389
+#: parser/analyze.c:2386
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr "las vistas materializadas no pueden definirse usando parámetros enlazados"
 
-#: parser/analyze.c:2401
+#: parser/analyze.c:2398
 #, c-format
 msgid "materialized views cannot be UNLOGGED"
 msgstr "las vistas materializadas no pueden ser UNLOGGED"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2467
+#: parser/analyze.c:2464
 #, c-format
 msgid "%s is not allowed with DISTINCT clause"
 msgstr "%s no está permitido con cláusulas DISTINCT"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2474
+#: parser/analyze.c:2471
 #, c-format
 msgid "%s is not allowed with GROUP BY clause"
 msgstr "%s no está permitido con cláusulas GROUP BY"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2481
+#: parser/analyze.c:2478
 #, c-format
 msgid "%s is not allowed with HAVING clause"
 msgstr "%s no está permitido con cláusulas HAVING"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2488
+#: parser/analyze.c:2485
 #, c-format
 msgid "%s is not allowed with aggregate functions"
 msgstr "%s no está permitido con funciones de agregación"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2495
+#: parser/analyze.c:2492
 #, c-format
 msgid "%s is not allowed with window functions"
 msgstr "%s no está permitido con funciones de ventana deslizante"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2502
+#: parser/analyze.c:2499
 #, c-format
 msgid "%s is not allowed with set-returning functions in the target list"
 msgstr "%s no está permitido con funciones que retornan conjuntos en la lista de resultados"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2581
+#: parser/analyze.c:2578
 #, c-format
 msgid "%s must specify unqualified relation names"
 msgstr "%s debe especificar nombres de relaciones sin calificar"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2612
+#: parser/analyze.c:2609
 #, c-format
 msgid "%s cannot be applied to a join"
 msgstr "%s no puede ser aplicado a un join"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2621
+#: parser/analyze.c:2618
 #, c-format
 msgid "%s cannot be applied to a function"
 msgstr "%s no puede ser aplicado a una función"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2639
+#: parser/analyze.c:2636
 #, c-format
 msgid "%s cannot be applied to a WITH query"
 msgstr "%s no puede ser aplicado a una consulta WITH"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2656
+#: parser/analyze.c:2653
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr "la relación «%s» en la cláusula %s no fue encontrada en la cláusula FROM"
@@ -11751,125 +11736,111 @@
 #: parser/parse_agg.c:244
 #, c-format
 msgid "GROUPING must have fewer than 32 arguments"
-msgstr ""
+msgstr "GROUPING debe tener menos de 32 argumentos"
 
 #: parser/parse_agg.c:347
 msgid "aggregate functions are not allowed in JOIN conditions"
 msgstr "no se permiten funciones de agregación en las condiciones de JOIN"
 
 #: parser/parse_agg.c:349
-#, fuzzy
 msgid "grouping operations are not allowed in JOIN conditions"
-msgstr "no se permiten funciones de ventana deslizante en condiciones JOIN"
+msgstr "no se permiten las operaciones «grouping» en condiciones JOIN"
 
 #: parser/parse_agg.c:361
 msgid "aggregate functions are not allowed in FROM clause of their own query level"
 msgstr "las funciones de agregación no están permitidas en la cláusula FROM de su mismo nivel de consulta"
 
 #: parser/parse_agg.c:363
-#, fuzzy
 msgid "grouping operations are not allowed in FROM clause of their own query level"
-msgstr "las funciones de agregación no están permitidas en la cláusula FROM de su mismo nivel de consulta"
+msgstr "las operaciones «grouping» no están permitidas en la cláusula FROM de su mismo nivel de consulta"
 
 #: parser/parse_agg.c:368
 msgid "aggregate functions are not allowed in functions in FROM"
 msgstr "no se permiten funciones de agregación en una función en FROM"
 
 #: parser/parse_agg.c:370
-#, fuzzy
 msgid "grouping operations are not allowed in functions in FROM"
-msgstr "no se permiten funciones de ventana deslizante en funciones en FROM"
+msgstr "no se permiten operaciones «grouping» en funciones en FROM"
 
 #: parser/parse_agg.c:378
-#, fuzzy
 msgid "aggregate functions are not allowed in policy expressions"
-msgstr "no se permiten funciones de agregación en una expresión de índice"
+msgstr "no se permiten funciones de agregación en expresiones de políticas"
 
 #: parser/parse_agg.c:380
-#, fuzzy
 msgid "grouping operations are not allowed in policy expressions"
-msgstr "no se permiten funciones de ventana deslizante en expresiones de índice"
+msgstr "no se permiten operaciones «grouping» en expresiones de políticas"
 
 #: parser/parse_agg.c:397
 msgid "aggregate functions are not allowed in window RANGE"
 msgstr "no se permiten funciones de agregación en RANGE de ventana deslizante"
 
 #: parser/parse_agg.c:399
-#, fuzzy
 msgid "grouping operations are not allowed in window RANGE"
-msgstr "no se permiten funciones de agregación en RANGE de ventana deslizante"
+msgstr "no se permiten operaciones «grouping» en RANGE de ventana deslizante"
 
 #: parser/parse_agg.c:404
 msgid "aggregate functions are not allowed in window ROWS"
 msgstr "no se permiten funciones de agregación en ROWS de ventana deslizante"
 
 #: parser/parse_agg.c:406
-#, fuzzy
 msgid "grouping operations are not allowed in window ROWS"
-msgstr "no se permiten funciones de agregación en ROWS de ventana deslizante"
+msgstr "no se permiten operaciones «grouping» en ROWS de ventana deslizante"
 
 #: parser/parse_agg.c:439
 msgid "aggregate functions are not allowed in check constraints"
 msgstr "no se permiten funciones de agregación en restricciones «check»"
 
 #: parser/parse_agg.c:441
-#, fuzzy
 msgid "grouping operations are not allowed in check constraints"
-msgstr "no se permiten funciones de ventana deslizante en restricciones «check»"
+msgstr "no se permiten operaciones «grouping» en restricciones «check»"
 
 #: parser/parse_agg.c:448
 msgid "aggregate functions are not allowed in DEFAULT expressions"
 msgstr "no se permiten funciones de agregación en expresiones DEFAULT"
 
 #: parser/parse_agg.c:450
-#, fuzzy
 msgid "grouping operations are not allowed in DEFAULT expressions"
-msgstr "no se permiten funciones de ventana deslizante en expresiones DEFAULT"
+msgstr "no se permiten operaciones «grouping» en expresiones DEFAULT"
 
 #: parser/parse_agg.c:455
 msgid "aggregate functions are not allowed in index expressions"
 msgstr "no se permiten funciones de agregación en una expresión de índice"
 
 #: parser/parse_agg.c:457
-#, fuzzy
 msgid "grouping operations are not allowed in index expressions"
-msgstr "no se permiten funciones de ventana deslizante en expresiones de índice"
+msgstr "no se permiten operaciones «grouping» en expresiones de índice"
 
 #: parser/parse_agg.c:462
 msgid "aggregate functions are not allowed in index predicates"
 msgstr "no se permiten funciones de agregación en predicados de índice"
 
 #: parser/parse_agg.c:464
-#, fuzzy
 msgid "grouping operations are not allowed in index predicates"
-msgstr "no se permiten funciones de ventana deslizante en predicados de índice"
+msgstr "no se permiten operaciones «grouping» en predicados de índice"
 
 #: parser/parse_agg.c:469
 msgid "aggregate functions are not allowed in transform expressions"
 msgstr "no se permiten funciones de agregación en una expresión de transformación"
 
 #: parser/parse_agg.c:471
-#, fuzzy
 msgid "grouping operations are not allowed in transform expressions"
-msgstr "no se permiten funciones de ventana deslizante en expresiones de transformación"
+msgstr "no se permiten operaciones «grouping» en expresiones de transformación"
 
 #: parser/parse_agg.c:476
 msgid "aggregate functions are not allowed in EXECUTE parameters"
 msgstr "no se permiten funciones de agregación en un parámetro a EXECUTE"
 
 #: parser/parse_agg.c:478
-#, fuzzy
 msgid "grouping operations are not allowed in EXECUTE parameters"
-msgstr "no se permiten funciones de ventana deslizante en parámetros a EXECUTE"
+msgstr "no se permiten operaciones «grouping» en parámetros a EXECUTE"
 
 #: parser/parse_agg.c:483
 msgid "aggregate functions are not allowed in trigger WHEN conditions"
 msgstr "no se permiten funciones de agregación en condición WHEN de un disparador"
 
 #: parser/parse_agg.c:485
-#, fuzzy
 msgid "grouping operations are not allowed in trigger WHEN conditions"
-msgstr "no se permiten funciones de ventana deslizante en condiciones WHEN de un disparador"
+msgstr "no se permiten operaciones «grouping» en condiciones WHEN de un disparador"
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
 #: parser/parse_agg.c:508 parser/parse_clause.c:1548
@@ -11879,9 +11850,9 @@
 
 #. translator: %s is name of a SQL construct, eg GROUP BY
 #: parser/parse_agg.c:511
-#, fuzzy, c-format
+#, c-format
 msgid "grouping operations are not allowed in %s"
-msgstr "no se permiten funciones de ventana deslizante en %s"
+msgstr "no se permiten operaciones «grouping» en %s"
 
 #: parser/parse_agg.c:619
 #, c-format
@@ -11902,9 +11873,8 @@
 msgstr "no se permiten funciones de ventana deslizante en funciones en FROM"
 
 #: parser/parse_agg.c:781
-#, fuzzy
 msgid "window functions are not allowed in policy expressions"
-msgstr "no se permiten funciones de ventana deslizante en expresiones de índice"
+msgstr "no se permiten funciones de ventana deslizante en expresiones de políticas"
 
 #: parser/parse_agg.c:793
 msgid "window functions are not allowed in window definitions"
@@ -11951,8 +11921,8 @@
 
 #: parser/parse_agg.c:982
 #, c-format
-msgid "too many grouping sets present (max 4096)"
-msgstr ""
+msgid "too many grouping sets present (maximum 4096)"
+msgstr "demasiados conjuntos «grouping» presentes (máximo 4096)"
 
 #: parser/parse_agg.c:1131
 #, c-format
@@ -11977,7 +11947,7 @@
 #: parser/parse_agg.c:1496
 #, c-format
 msgid "arguments to GROUPING must be grouping expressions of the associated query level"
-msgstr ""
+msgstr "los argumentos de GROUPING deben ser expresiones agrupantes del nivel de consulta asociado"
 
 #: parser/parse_clause.c:647
 #, c-format
@@ -12015,31 +11985,31 @@
 msgstr "Ponga una lista de columnas dentro de ROWS FROM()."
 
 #: parser/parse_clause.c:751
-#, fuzzy, c-format
+#, c-format
 msgid "tablesample method %s does not exist"
-msgstr "no existe el método de acceso «%s»"
+msgstr "no existe el método de tablesample «%s»"
 
 #: parser/parse_clause.c:759
-#, fuzzy, c-format
+#, c-format
 msgid "function %s must return type \"tsm_handler\""
-msgstr "la función %s debe retornar tipo «fdw_handler»"
+msgstr "la función %s debe retornar tipo «tsm_handler»"
 
 #: parser/parse_clause.c:773
-#, fuzzy, c-format
+#, c-format
 msgid "tablesample method %s requires %d argument, not %d"
 msgid_plural "tablesample method %s requires %d arguments, not %d"
-msgstr[0] "el método de autentificación «%s» requiere que el argumento «%s» esté definido"
-msgstr[1] "el método de autentificación «%s» requiere que el argumento «%s» esté definido"
+msgstr[0] "el método de tablesample «%s» requiere %d argumento, no %d"
+msgstr[1] "el método de tablesample «%s» requiere %d argumentos, no %d"
 
 #: parser/parse_clause.c:807
-#, fuzzy, c-format
+#, c-format
 msgid "tablesample method %s does not support REPEATABLE"
-msgstr "el método de acceso «%s» no soporta las opciones ASC/DESC"
+msgstr "el método de tablesample «%s» no soporta la opción REPEATABLE"
 
 #: parser/parse_clause.c:938
 #, c-format
 msgid "TABLESAMPLE clause can only be applied to tables and materialized views"
-msgstr ""
+msgstr "la cláusula TABLESAMPLE sólo puede aplicarse a tablas y vistas materializadas"
 
 #: parser/parse_clause.c:1108
 #, c-format
@@ -12098,7 +12068,7 @@
 #: parser/parse_clause.c:2176
 #, c-format
 msgid "CUBE is limited to 12 elements"
-msgstr ""
+msgstr "CUBE está limitado a 12 elementos"
 
 #: parser/parse_clause.c:2382
 #, c-format
@@ -12151,34 +12121,34 @@
 msgstr "las expresiones de SELECT DISTINCT ON deben coincidir con las expresiones iniciales de ORDER BY"
 
 #: parser/parse_clause.c:2772
-#, fuzzy, c-format
+#, c-format
 msgid "ASC/DESC is not allowed in ON CONFLICT clause"
-msgstr "%s no está permitido con cláusulas DISTINCT"
+msgstr "ASC/DESC no están permitidos en cláusulas ON CONFLICT"
 
 #: parser/parse_clause.c:2778
-#, fuzzy, c-format
+#, c-format
 msgid "NULLS FIRST/LAST is not allowed in ON CONFLICT clause"
-msgstr "%s no está permitido con cláusulas DISTINCT"
+msgstr "NULLS FIRST/LAST no están permitidos en cláusulas ON CONFLICT"
 
 #: parser/parse_clause.c:2858
 #, c-format
 msgid "ON CONFLICT DO UPDATE requires inference specification or constraint name"
-msgstr ""
+msgstr "ON CONFLICT DO UPDATE requiere una especificación de inferencia o nombre de restricción"
 
 #: parser/parse_clause.c:2859
 #, c-format
-msgid "For example, ON CONFLICT (<column>)."
-msgstr ""
+msgid "For example, ON CONFLICT (column_name)."
+msgstr "Por ejemplo, ON CONFLICT (nombre_de_columna)."
 
 #: parser/parse_clause.c:2870
 #, c-format
-msgid "ON CONFLICT not supported with system catalog tables"
-msgstr ""
+msgid "ON CONFLICT is not supported with system catalog tables"
+msgstr "ON CONFLICT no está soportado con tablas que son catálogos de sistema"
 
 #: parser/parse_clause.c:2878
-#, fuzzy, c-format
-msgid "ON CONFLICT not supported on table \"%s\" used as a catalog table"
-msgstr "no se puede reescribir la tabla «%s» que es usada como tabla de catálogo"
+#, c-format
+msgid "ON CONFLICT is not supported on table \"%s\" used as a catalog table"
+msgstr "ON CONFLICT no está soportado en la tabla «%s» usada como catálogo de sistema"
 
 #: parser/parse_clause.c:3010
 #, c-format
@@ -12190,111 +12160,111 @@
 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_coerce.c:933 parser/parse_coerce.c:963
-#: parser/parse_coerce.c:981 parser/parse_coerce.c:996
-#: parser/parse_expr.c:2015 parser/parse_expr.c:2528 parser/parse_target.c:874
+#: parser/parse_coerce.c:971 parser/parse_coerce.c:1001
+#: parser/parse_coerce.c:1019 parser/parse_coerce.c:1034
+#: parser/parse_expr.c:2028 parser/parse_expr.c:2552 parser/parse_target.c:885
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "no se puede convertir el tipo %s a %s"
 
-#: parser/parse_coerce.c:966
+#: parser/parse_coerce.c:1004
 #, c-format
 msgid "Input has too few columns."
 msgstr "La entrada tiene muy pocas columnas."
 
-#: parser/parse_coerce.c:984
+#: parser/parse_coerce.c:1022
 #, 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."
 
-#: parser/parse_coerce.c:999
+#: parser/parse_coerce.c:1037
 #, c-format
 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:1042
+#: parser/parse_coerce.c:1080
 #, 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"
 
 #. translator: %s is name of a SQL construct, eg WHERE
 #. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1052 parser/parse_coerce.c:1101
+#: parser/parse_coerce.c:1090 parser/parse_coerce.c:1139
 #, c-format
 msgid "argument of %s must not return a set"
 msgstr "el argumento de %s no debe retornar un conjunto"
 
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1089
+#: parser/parse_coerce.c:1127
 #, 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"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1222
+#: parser/parse_coerce.c:1260
 #, 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"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1289
+#: parser/parse_coerce.c:1327
 #, c-format
 msgid "%s could not convert type %s to %s"
 msgstr "%s no pudo convertir el tipo %s a %s"
 
-#: parser/parse_coerce.c:1591
+#: parser/parse_coerce.c:1629
 #, c-format
 msgid "arguments declared \"anyelement\" are not all alike"
 msgstr "los argumentos declarados «anyelement» no son de tipos compatibles"
 
-#: parser/parse_coerce.c:1611
+#: parser/parse_coerce.c:1649
 #, c-format
 msgid "arguments declared \"anyarray\" are not all alike"
 msgstr "los argumentos declarados «anyarray» no son de tipos compatibles"
 
-#: parser/parse_coerce.c:1631
+#: parser/parse_coerce.c:1669
 #, c-format
 msgid "arguments declared \"anyrange\" are not all alike"
 msgstr "los argumentos declarados «anyrange» no son de tipos compatibles"
 
-#: parser/parse_coerce.c:1660 parser/parse_coerce.c:1871
-#: parser/parse_coerce.c:1905
+#: parser/parse_coerce.c:1698 parser/parse_coerce.c:1909
+#: parser/parse_coerce.c:1943
 #, 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/parse_coerce.c:1676
+#: parser/parse_coerce.c:1714
 #, c-format
 msgid "argument declared \"anyarray\" is not consistent with argument declared \"anyelement\""
 msgstr "el argumento declarado «anyarray» no es consistente con el argumento declarado «anyelement»"
 
-#: parser/parse_coerce.c:1697 parser/parse_coerce.c:1918
+#: parser/parse_coerce.c:1735 parser/parse_coerce.c:1956
 #, c-format
 msgid "argument declared \"anyrange\" is not a range type but type %s"
 msgstr "el argumento declarado «anyrange» no es un tipo de rango sino tipo %s"
 
-#: parser/parse_coerce.c:1713
+#: parser/parse_coerce.c:1751
 #, c-format
 msgid "argument declared \"anyrange\" is not consistent with argument declared \"anyelement\""
 msgstr "el argumento declarado «anyrange» no es consistente con el argumento declarado «anyelement»"
 
-#: parser/parse_coerce.c:1733
+#: parser/parse_coerce.c:1771
 #, c-format
 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/parse_coerce.c:1743
+#: parser/parse_coerce.c:1781
 #, 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:1753
+#: parser/parse_coerce.c:1791
 #, 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/parse_coerce.c:1793 parser/parse_coerce.c:1823
+#: parser/parse_coerce.c:1831 parser/parse_coerce.c:1861
 #, c-format
 msgid "could not find range type for data type %s"
 msgstr "no se pudo encontrar un tipo de rango para el tipo de dato %s"
@@ -12416,8 +12386,8 @@
 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_expr.c:387 parser/parse_relation.c:3080
-#: parser/parse_relation.c:3100
+#: parser/parse_expr.c:387 parser/parse_relation.c:3176
+#: parser/parse_relation.c:3196
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "no existe la columna %s.%s"
@@ -12437,13 +12407,13 @@
 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/parse_expr.c:441 parser/parse_target.c:660
+#: parser/parse_expr.c:441 parser/parse_target.c:671
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr "la expansión de filas a través de «*» no está soportado aquí"
 
-#: parser/parse_expr.c:767 parser/parse_relation.c:666
-#: parser/parse_relation.c:766 parser/parse_target.c:1109
+#: parser/parse_expr.c:767 parser/parse_relation.c:668
+#: parser/parse_relation.c:768 parser/parse_target.c:1120
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "la referencia a la columna «%s» es ambigua"
@@ -12454,138 +12424,138 @@
 msgid "there is no parameter $%d"
 msgstr "no hay parámetro $%d"
 
-#: parser/parse_expr.c:1034
+#: parser/parse_expr.c:1042
 #, c-format
 msgid "NULLIF requires = operator to yield boolean"
 msgstr "NULLIF requiere que el operador = retorne boolean"
 
-#: parser/parse_expr.c:1468 gram.y:9731
+#: parser/parse_expr.c:1476 gram.y:9745
 #, c-format
 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_expr.c:1697
+#: parser/parse_expr.c:1705
 msgid "cannot use subquery in check constraint"
 msgstr "no se pueden usar subconsultas en una restricción «check»"
 
-#: parser/parse_expr.c:1701
+#: parser/parse_expr.c:1709
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "no se puede usar una subconsulta en una expresión DEFAULT"
 
-#: parser/parse_expr.c:1704
+#: parser/parse_expr.c:1712
 msgid "cannot use subquery in index expression"
 msgstr "no se puede usar una subconsulta en una expresión de índice"
 
-#: parser/parse_expr.c:1707
+#: parser/parse_expr.c:1715
 msgid "cannot use subquery in index predicate"
 msgstr "no se puede usar una subconsulta en un predicado de índice"
 
-#: parser/parse_expr.c:1710
+#: parser/parse_expr.c:1718
 msgid "cannot use subquery in transform expression"
 msgstr "no se puede usar una subconsulta en una expresión de transformación"
 
-#: parser/parse_expr.c:1713
+#: parser/parse_expr.c:1721
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "no se puede usar una subconsulta en un parámetro a EXECUTE"
 
-#: parser/parse_expr.c:1716
+#: parser/parse_expr.c:1724
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "no se puede usar una subconsulta en la condición WHEN de un disparador"
 
-#: parser/parse_expr.c:1770
+#: parser/parse_expr.c:1778
 #, c-format
 msgid "subquery must return only one column"
 msgstr "la subconsulta debe retornar sólo una columna"
 
-#: parser/parse_expr.c:1854
+#: parser/parse_expr.c:1862
 #, c-format
 msgid "subquery has too many columns"
 msgstr "la subconsulta tiene demasiadas columnas"
 
-#: parser/parse_expr.c:1859
+#: parser/parse_expr.c:1867
 #, c-format
 msgid "subquery has too few columns"
 msgstr "la subconsulta tiene muy pocas columnas"
 
-#: parser/parse_expr.c:1955
+#: parser/parse_expr.c:1968
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "no se puede determinar el tipo de un array vacío"
 
-#: parser/parse_expr.c:1956
+#: parser/parse_expr.c:1969
 #, c-format
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr "Agregue una conversión de tipo explícita al tipo deseado, por ejemplo ARRAY[]::integer[]."
 
-#: parser/parse_expr.c:1970
+#: parser/parse_expr.c:1983
 #, 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"
 
-#: parser/parse_expr.c:2193
+#: parser/parse_expr.c:2206
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "el valor del atributo XML sin nombre debe ser una referencia a una columna"
 
-#: parser/parse_expr.c:2194
+#: parser/parse_expr.c:2207
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "el valor del elemento XML sin nombre debe ser una referencia a una columna"
 
-#: parser/parse_expr.c:2209
+#: parser/parse_expr.c:2222
 #, 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_expr.c:2316
+#: parser/parse_expr.c:2329
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "no se puede convertir el resultado de XMLSERIALIZE a %s"
 
-#: parser/parse_expr.c:2601 parser/parse_expr.c:2797
+#: parser/parse_expr.c:2625 parser/parse_expr.c:2821
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "número desigual de entradas en expresiones de registro"
 
-#: parser/parse_expr.c:2611
+#: parser/parse_expr.c:2635
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "no se pueden comparar registros de largo cero"
 
-#: parser/parse_expr.c:2636
+#: parser/parse_expr.c:2660
 #, 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_expr.c:2643
+#: parser/parse_expr.c:2667
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "el operador de comparación de registros no puede retornar un conjunto"
 
-#: parser/parse_expr.c:2702 parser/parse_expr.c:2743
+#: parser/parse_expr.c:2726 parser/parse_expr.c:2767
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "no se pudo determinar la interpretación del operador de comparación de registros %s"
 
-#: parser/parse_expr.c:2704
+#: parser/parse_expr.c:2728
 #, c-format
 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."
 
-#: parser/parse_expr.c:2745
+#: parser/parse_expr.c:2769
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "Hay múltiples candidatos igualmente plausibles."
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2861
 #, c-format
 msgid "IS DISTINCT FROM requires = operator to yield boolean"
 msgstr "IS DISTINCT FROM requiere que el operador = retorne boolean"
 
-#: parser/parse_expr.c:3127 parser/parse_expr.c:3145
+#: parser/parse_expr.c:3151 parser/parse_expr.c:3169
 #, c-format
 msgid "operator precedence change: %s is now lower precedence than %s"
-msgstr ""
+msgstr "cambio de precedencia de operadores: %s es ahora de menor precedencia que %s"
 
 #: parser/parse_func.c:174
 #, c-format
@@ -12773,10 +12743,10 @@
 msgid "Use an explicit ordering operator or modify the query."
 msgstr "Use un operador de ordenamiento explícito o modifique la consulta."
 
-#: parser/parse_oper.c:226 utils/adt/array_userfuncs.c:782
-#: utils/adt/array_userfuncs.c:920 utils/adt/arrayfuncs.c:3613
-#: utils/adt/arrayfuncs.c:4051 utils/adt/arrayfuncs.c:6029
-#: utils/adt/rowtypes.c:1154
+#: parser/parse_oper.c:226 utils/adt/array_userfuncs.c:794
+#: utils/adt/array_userfuncs.c:933 utils/adt/arrayfuncs.c:3613
+#: utils/adt/arrayfuncs.c:4051 utils/adt/arrayfuncs.c:6017
+#: utils/adt/rowtypes.c:1167
 #, 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"
@@ -12826,193 +12796,193 @@
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "para el parámetro $%d se dedujeron tipos de dato inconsistentes"
 
-#: parser/parse_relation.c:174
+#: parser/parse_relation.c:175
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
 msgstr "la referencia a la tabla «%s» es ambigua"
 
-#: parser/parse_relation.c:218
+#: parser/parse_relation.c:219
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "la referencia a la tabla %u es ambigua"
 
-#: parser/parse_relation.c:397
+#: parser/parse_relation.c:398
 #, c-format
 msgid "table name \"%s\" specified more than once"
 msgstr "el nombre de tabla «%s» fue especificado más de una vez"
 
-#: parser/parse_relation.c:424 parser/parse_relation.c:3020
+#: parser/parse_relation.c:425 parser/parse_relation.c:3116
 #, c-format
 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"
 
-#: parser/parse_relation.c:427 parser/parse_relation.c:3025
+#: parser/parse_relation.c:428 parser/parse_relation.c:3121
 #, c-format
 msgid "There is an entry for table \"%s\", but it cannot be referenced from this part of the query."
 msgstr "Hay una entrada para la tabla «%s», pero no puede ser referenciada desde esta parte de la consulta."
 
-#: parser/parse_relation.c:429
+#: parser/parse_relation.c:430
 #, c-format
 msgid "The combining JOIN type must be INNER or LEFT for a LATERAL reference."
 msgstr "El tipo de JOIN debe ser INNER o LEFT para una referencia LATERAL."
 
-#: parser/parse_relation.c:704
+#: parser/parse_relation.c:706
 #, c-format
 msgid "system column \"%s\" reference in check constraint is invalid"
 msgstr "la referencia a columna a sistema «%s» en una restricción check no es válida"
 
-#: parser/parse_relation.c:1062 parser/parse_relation.c:1342
-#: parser/parse_relation.c:1844
+#: parser/parse_relation.c:1066 parser/parse_relation.c:1346
+#: parser/parse_relation.c:1848
 #, c-format
 msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr "la tabla «%s» tiene %d columnas pero se especificaron %d"
 
-#: parser/parse_relation.c:1149
+#: parser/parse_relation.c:1153
 #, 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."
 
-#: parser/parse_relation.c:1151
+#: parser/parse_relation.c:1155
 #, c-format
 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."
 
-#: parser/parse_relation.c:1462
+#: parser/parse_relation.c:1466
 #, c-format
 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:1471
+#: parser/parse_relation.c:1475
 #, c-format
 msgid "a column definition list is required for functions returning \"record\""
 msgstr "la lista de definición de columnas es obligatoria para funciones que retornan «record»"
 
-#: parser/parse_relation.c:1550
+#: parser/parse_relation.c:1554
 #, 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"
 
-#: parser/parse_relation.c:1672
+#: parser/parse_relation.c:1676
 #, 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"
 
-#: parser/parse_relation.c:1727
+#: parser/parse_relation.c:1731
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "los joins pueden tener a lo más %d columnas"
 
-#: parser/parse_relation.c:1817
+#: parser/parse_relation.c:1821
 #, c-format
 msgid "WITH query \"%s\" does not have a RETURNING clause"
 msgstr "la consulta WITH «%s» no tiene una cláusula RETURNING"
 
-#: parser/parse_relation.c:2649 parser/parse_relation.c:2804
+#: parser/parse_relation.c:2738 parser/parse_relation.c:2900
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "no existe la columna %d en la relación «%s»"
 
-#: parser/parse_relation.c:3023
+#: parser/parse_relation.c:3119
 #, 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:3031
+#: parser/parse_relation.c:3127
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "falta una entrada para la tabla «%s» en la cláusula FROM"
 
-#: parser/parse_relation.c:3083
-#, fuzzy, c-format
-msgid "Perhaps you meant to reference the column \"%s\".\"%s\"."
-msgstr "Probablemente quiera hacer referencia al alias de la tabla «%s»."
+#: parser/parse_relation.c:3179
+#, c-format
+msgid "Perhaps you meant to reference the column \"%s.%s\"."
+msgstr "Probablemente quiera hacer referencia a la columna «%s.%s»."
 
-#: parser/parse_relation.c:3085
+#: parser/parse_relation.c:3181
 #, c-format
 msgid "There is a column named \"%s\" in table \"%s\", but it cannot be referenced from this part of the query."
 msgstr "Hay una columna llamada «%s» en la tabla «%s», pero no puede ser referenciada desde esta parte de la consulta."
 
-#: parser/parse_relation.c:3102
-#, fuzzy, c-format
-msgid "Perhaps you meant to reference the column \"%s\".\"%s\" or the column \"%s\".\"%s\"."
-msgstr "Probablemente quiera hacer referencia al alias de la tabla «%s»."
+#: parser/parse_relation.c:3198
+#, c-format
+msgid "Perhaps you meant to reference the column \"%s.%s\" or the column \"%s.%s\"."
+msgstr "Probablemente quiera hacer referencia a la columna «%s.%s» o la columna «%s.%s»."
 
-#: parser/parse_target.c:421 parser/parse_target.c:713
+#: parser/parse_target.c:432 parser/parse_target.c:724
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "no se puede asignar a la columna de sistema «%s»"
 
-#: parser/parse_target.c:449
+#: parser/parse_target.c:460
 #, c-format
 msgid "cannot set an array element to DEFAULT"
 msgstr "no se puede definir un elemento de array a DEFAULT"
 
-#: parser/parse_target.c:454
+#: parser/parse_target.c:465
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "no se puede definir un subcampo a DEFAULT"
 
-#: parser/parse_target.c:523
+#: parser/parse_target.c:534
 #, 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:697
+#: parser/parse_target.c:708
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a composite type"
 msgstr "no se puede asignar al campo «%s» de la columna «%s» porque su tipo %s no es un tipo compuesto"
 
-#: parser/parse_target.c:706
+#: parser/parse_target.c:717
 #, 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"
 
-#: parser/parse_target.c:773
+#: parser/parse_target.c:784
 #, c-format
 msgid "array assignment to \"%s\" requires type %s but expression is of type %s"
 msgstr "la asignación de array a «%s» requiere tipo %s pero la expresión es de tipo %s"
 
-#: parser/parse_target.c:783
+#: parser/parse_target.c:794
 #, 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"
 
-#: parser/parse_target.c:1199
+#: parser/parse_target.c:1210
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "SELECT * sin especificar tablas no es válido"
 
-#: parser/parse_type.c:84
+#: parser/parse_type.c:83
 #, c-format
 msgid "improper %%TYPE reference (too few dotted names): %s"
 msgstr "referencia %%TYPE inapropiada (muy pocos nombres con punto): %s"
 
-#: parser/parse_type.c:106
+#: parser/parse_type.c:105
 #, c-format
 msgid "improper %%TYPE reference (too many dotted names): %s"
 msgstr "la referencia a %%TYPE es inapropiada (demasiados nombres con punto): %s"
 
-#: parser/parse_type.c:141
+#: parser/parse_type.c:140
 #, c-format
 msgid "type reference %s converted to %s"
 msgstr "la referencia al tipo %s convertida a %s"
 
-#: parser/parse_type.c:262 parser/parse_type.c:834 utils/cache/typcache.c:230
+#: parser/parse_type.c:261 parser/parse_type.c:805 utils/cache/typcache.c:238
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "el tipo «%s» está inconcluso"
 
-#: parser/parse_type.c:347
+#: parser/parse_type.c:346
 #, 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_type.c:389
+#: parser/parse_type.c:388
 #, c-format
 msgid "type modifiers must be simple constants or identifiers"
 msgstr "los modificadores de tipo deben ser constantes simples o identificadores"
 
-#: parser/parse_type.c:700 parser/parse_type.c:799
+#: parser/parse_type.c:671 parser/parse_type.c:770
 #, c-format
 msgid "invalid type name \"%s\""
 msgstr "el nombre de tipo «%s» no es válido"
@@ -13038,203 +13008,203 @@
 msgstr "múltiples valores default especificados para columna «%s» de tabla «%s»"
 
 #: parser/parse_utilcmd.c:541 parser/parse_utilcmd.c:632
-#, fuzzy, c-format
+#, c-format
 msgid "primary key constraints are not supported on foreign tables"
-msgstr "las restricciones no están soportadas en tablas foráneas"
+msgstr "las restricciones de llave primaria no están soportadas en tablas foráneas"
 
 #: parser/parse_utilcmd.c:550 parser/parse_utilcmd.c:642
-#, fuzzy, c-format
+#, c-format
 msgid "unique constraints are not supported on foreign tables"
-msgstr "las restricciones no están soportadas en tablas foráneas"
+msgstr "las restricciones unique no están soportadas en tablas foráneas"
 
 #: parser/parse_utilcmd.c:567 parser/parse_utilcmd.c:666
-#, fuzzy, c-format
+#, c-format
 msgid "foreign key constraints are not supported on foreign tables"
-msgstr "las restricciones no están soportadas en tablas foráneas"
+msgstr "las restricciones de llave foránea no están soportadas en tablas foráneas"
 
 #: parser/parse_utilcmd.c:652
-#, fuzzy, c-format
+#, c-format
 msgid "exclusion constraints are not supported on foreign tables"
-msgstr "las restricciones no están soportadas en tablas foráneas"
+msgstr "las restricciones exclusion no están soportadas en tablas foráneas"
 
 #: parser/parse_utilcmd.c:716
 #, c-format
 msgid "LIKE is not supported for creating foreign tables"
 msgstr "LIKE no está soportado para la creación de tablas foráneas"
 
-#: parser/parse_utilcmd.c:1239 parser/parse_utilcmd.c:1315
+#: parser/parse_utilcmd.c:1241 parser/parse_utilcmd.c:1317
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "El índice «%s» contiene una referencia a la fila completa (whole-row)."
 
-#: parser/parse_utilcmd.c:1584
+#: parser/parse_utilcmd.c:1586
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "no se puede usar un índice existente en CREATE TABLE"
 
-#: parser/parse_utilcmd.c:1604
+#: parser/parse_utilcmd.c:1606
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "el índice «%s» ya está asociado a una restricción"
 
-#: parser/parse_utilcmd.c:1612
+#: parser/parse_utilcmd.c:1614
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "el índice «%s» no pertenece a la tabla «%s»"
 
-#: parser/parse_utilcmd.c:1619
+#: parser/parse_utilcmd.c:1621
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "el índice «%s» no es válido"
 
-#: parser/parse_utilcmd.c:1625
+#: parser/parse_utilcmd.c:1627
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "«%s» no es un índice único"
 
-#: parser/parse_utilcmd.c:1626 parser/parse_utilcmd.c:1633
-#: parser/parse_utilcmd.c:1640 parser/parse_utilcmd.c:1710
+#: parser/parse_utilcmd.c:1628 parser/parse_utilcmd.c:1635
+#: parser/parse_utilcmd.c:1642 parser/parse_utilcmd.c:1712
 #, c-format
 msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr "No se puede crear una restricción de llave primaria o única usando un índice así."
 
-#: parser/parse_utilcmd.c:1632
+#: parser/parse_utilcmd.c:1634
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "el índice «%s» contiene expresiones"
 
-#: parser/parse_utilcmd.c:1639
+#: parser/parse_utilcmd.c:1641
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "«%s» es un índice parcial"
 
-#: parser/parse_utilcmd.c:1651
+#: parser/parse_utilcmd.c:1653
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "«%s» no es un índice postergable (deferrable)"
 
-#: parser/parse_utilcmd.c:1652
+#: parser/parse_utilcmd.c:1654
 #, c-format
 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."
 
-#: parser/parse_utilcmd.c:1709
+#: parser/parse_utilcmd.c:1711
 #, c-format
 msgid "index \"%s\" does not have default sorting behavior"
 msgstr "el índice «%s» no tiene el comportamiento de ordenamiento por omisión"
 
-#: parser/parse_utilcmd.c:1856
+#: parser/parse_utilcmd.c:1858
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "la columna «%s» aparece dos veces en llave primaria"
 
-#: parser/parse_utilcmd.c:1862
+#: parser/parse_utilcmd.c:1864
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "la columna «%s» aparece dos veces en restricción unique"
 
-#: parser/parse_utilcmd.c:2032
+#: parser/parse_utilcmd.c:2034
 #, c-format
 msgid "index expression cannot return a set"
 msgstr "las expresiones de índice no pueden retornar conjuntos"
 
-#: parser/parse_utilcmd.c:2043
+#: parser/parse_utilcmd.c:2045
 #, c-format
 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_utilcmd.c:2089
+#: parser/parse_utilcmd.c:2091
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "las reglas en vistas materializadas no están soportadas"
 
-#: parser/parse_utilcmd.c:2150
+#: parser/parse_utilcmd.c:2152
 #, c-format
 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_utilcmd.c:2222
+#: parser/parse_utilcmd.c:2224
 #, c-format
 msgid "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr "las reglas con condiciones WHERE sólo pueden tener acciones SELECT, INSERT, UPDATE o DELETE"
 
-#: parser/parse_utilcmd.c:2240 parser/parse_utilcmd.c:2339
-#: rewrite/rewriteHandler.c:478 rewrite/rewriteManip.c:1018
+#: parser/parse_utilcmd.c:2242 parser/parse_utilcmd.c:2341
+#: rewrite/rewriteHandler.c:478 rewrite/rewriteManip.c:1015
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "las sentencias UNION/INTERSECT/EXCEPT condicionales no están implementadas"
 
-#: parser/parse_utilcmd.c:2258
+#: parser/parse_utilcmd.c:2260
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "una regla ON SELECT no puede usar OLD"
 
-#: parser/parse_utilcmd.c:2262
+#: parser/parse_utilcmd.c:2264
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "una regla ON SELECT no puede usar NEW"
 
-#: parser/parse_utilcmd.c:2271
+#: parser/parse_utilcmd.c:2273
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "una regla ON INSERT no puede usar OLD"
 
-#: parser/parse_utilcmd.c:2277
+#: parser/parse_utilcmd.c:2279
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "una regla ON DELETE no puede usar NEW"
 
-#: parser/parse_utilcmd.c:2305
+#: parser/parse_utilcmd.c:2307
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "no se puede hacer referencia a OLD dentro de una consulta WITH"
 
-#: parser/parse_utilcmd.c:2312
+#: parser/parse_utilcmd.c:2314
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "no se puede hacer referencia a NEW dentro de una consulta WITH"
 
-#: parser/parse_utilcmd.c:2515
+#: parser/parse_utilcmd.c:2517
 #, c-format
 msgid "transform expression must not return a set"
 msgstr "la expresión de transformación no puede retornar conjuntos"
 
-#: parser/parse_utilcmd.c:2629
+#: parser/parse_utilcmd.c:2631
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "cláusula DEFERRABLE mal puesta"
 
-#: parser/parse_utilcmd.c:2634 parser/parse_utilcmd.c:2649
+#: parser/parse_utilcmd.c:2636 parser/parse_utilcmd.c:2651
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "no se permiten múltiples cláusulas DEFERRABLE/NOT DEFERRABLE"
 
-#: parser/parse_utilcmd.c:2644
+#: parser/parse_utilcmd.c:2646
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "la cláusula NOT DEFERRABLE está mal puesta"
 
-#: parser/parse_utilcmd.c:2657 parser/parse_utilcmd.c:2683 gram.y:4838
+#: parser/parse_utilcmd.c:2659 parser/parse_utilcmd.c:2685 gram.y:4852
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "una restricción declarada INITIALLY DEFERRED debe ser DEFERRABLE"
 
-#: parser/parse_utilcmd.c:2665
+#: parser/parse_utilcmd.c:2667
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "la cláusula INITIALLY DEFERRED está mal puesta"
 
-#: parser/parse_utilcmd.c:2670 parser/parse_utilcmd.c:2696
+#: parser/parse_utilcmd.c:2672 parser/parse_utilcmd.c:2698
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "no se permiten múltiples cláusulas INITIALLY IMMEDIATE/DEFERRED"
 
-#: parser/parse_utilcmd.c:2691
+#: parser/parse_utilcmd.c:2693
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "la cláusula INITIALLY IMMEDIATE está mal puesta"
 
-#: parser/parse_utilcmd.c:2882
+#: parser/parse_utilcmd.c:2884
 #, c-format
 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)"
@@ -13280,17 +13250,17 @@
 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."
 
-#: port/pg_shmem.c:141 port/sysv_shmem.c:141
+#: port/pg_shmem.c:195 port/sysv_shmem.c:195
 #, c-format
 msgid "could not create shared memory segment: %m"
 msgstr "no se pudo crear el segmento de memoria compartida: %m"
 
-#: port/pg_shmem.c:142 port/sysv_shmem.c:142
+#: port/pg_shmem.c:196 port/sysv_shmem.c:196
 #, c-format
 msgid "Failed system call was shmget(key=%lu, size=%zu, 0%o)."
 msgstr "La llamada a sistema fallida fue shmget(key=%lu, size=%zu, 0%o)."
 
-#: port/pg_shmem.c:146 port/sysv_shmem.c:146
+#: port/pg_shmem.c:200 port/sysv_shmem.c:200
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter, or possibly that it is less than your kernel's SHMMIN parameter.\n"
@@ -13299,7 +13269,7 @@
 "Este error normalmente significa que la petición de un segmento de memoria compartida de PostgreSQL excedió el parámetro SHMMAX del kernel, o posiblemente que es menor que el parámetro SHMMIN del kernel.\n"
 "La documentación de PostgreSQL contiene más información acerca de la configuración de memoria compartida."
 
-#: port/pg_shmem.c:153 port/sysv_shmem.c:153
+#: port/pg_shmem.c:207 port/sysv_shmem.c:207
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMALL parameter.  You might need to reconfigure the kernel with larger SHMALL.\n"
@@ -13308,7 +13278,7 @@
 "Este error normalmente significa que la petición de un segmento de memoria compartida de PostgreSQL excedió el parámetro SHMALL del kernel.  Puede ser necesario reconfigurar el kernel con un SHMALL mayor.\n"
 "La documentación de PostgreSQL contiene más información acerca de la configuración de memoria compartida."
 
-#: port/pg_shmem.c:159 port/sysv_shmem.c:159
+#: port/pg_shmem.c:213 port/sysv_shmem.c:213
 #, 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.\n"
@@ -13317,52 +13287,47 @@
 "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.\n"
 "La documentación de PostgreSQL contiene más información acerca de la configuración de memoria compartida."
 
-#: port/pg_shmem.c:340 port/sysv_shmem.c:340
-#, c-format
-msgid "huge TLB pages not supported on this platform"
-msgstr "las «huge TLB pages» no están soportadas en esta plataforma"
-
-#: port/pg_shmem.c:390 port/sysv_shmem.c:390
+#: port/pg_shmem.c:504 port/sysv_shmem.c:504
 #, c-format
 msgid "could not map anonymous shared memory: %m"
 msgstr "no se pudo mapear memoria compartida anónima: %m"
 
-#: port/pg_shmem.c:392 port/sysv_shmem.c:392
+#: port/pg_shmem.c:506 port/sysv_shmem.c:506
 #, c-format
 msgid "This error usually means that PostgreSQL's request for a shared memory segment exceeded available memory, swap space, or huge pages. To reduce the request size (currently %zu bytes), reduce PostgreSQL's shared memory usage, perhaps by reducing shared_buffers or max_connections."
 msgstr "Este error normalmente significa que la petición de un segmento de memoria compartida de PostgreSQL excedía la memoria disponible, el espacio de intercambio (swap), o las huge pages.  Para reducir el tamaño de la petición (actualmente %zu bytes), reduzca el uso de memoria compartida de PostgreSQL, quizás reduciendo el parámetro shared_buffers o el parámetro max_connections."
 
-#: port/pg_shmem.c:439 port/sysv_shmem.c:439 port/win32_shmem.c:136
+#: port/pg_shmem.c:572 port/sysv_shmem.c:572 port/win32_shmem.c:134
 #, c-format
 msgid "huge pages not supported on this platform"
 msgstr "las huge pages no están soportados en esta plataforma"
 
-#: port/pg_shmem.c:553 port/sysv_shmem.c:553
+#: port/pg_shmem.c:667 port/sysv_shmem.c:667
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "no se pudo hacer stat al directorio de datos «%s»: %m"
 
-#: port/win32/crashdump.c:108
+#: port/win32/crashdump.c:122
 #, c-format
 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"
 
-#: port/win32/crashdump.c:116
+#: port/win32/crashdump.c:130
 #, c-format
 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"
 
-#: port/win32/crashdump.c:147
+#: port/win32/crashdump.c:161
 #, c-format
 msgid "could not open crash dump file \"%s\" for writing: error code %lu\n"
 msgstr "no se pudo abrir el archivo del volcado de caída «%s» para escritura: código de error %lu\n"
 
-#: port/win32/crashdump.c:154
+#: port/win32/crashdump.c:168
 #, c-format
 msgid "wrote crash dump to file \"%s\"\n"
 msgstr "se escribió el volcado de caída en el archivo «%s».\n"
 
-#: port/win32/crashdump.c:156
+#: port/win32/crashdump.c:170
 #, c-format
 msgid "could not write crash dump to file \"%s\": error code %lu\n"
 msgstr "no se pudo escribir el volcado de caída al archivo «%s»: código de error %lu\n"
@@ -13382,17 +13347,17 @@
 msgid "could not get SID for PowerUsers group: error code %lu\n"
 msgstr "no se pudo obtener el SID del grupo PowerUsers: código de error %lu\n"
 
-#: port/win32/signal.c:193
+#: port/win32/signal.c:194
 #, c-format
 msgid "could not create signal listener pipe for PID %d: error code %lu"
 msgstr "no se pudo crear tubería para escuchar señales para el PID %d: código de error %lu"
 
-#: port/win32/signal.c:273 port/win32/signal.c:305
+#: port/win32/signal.c:274 port/win32/signal.c:306
 #, c-format
 msgid "could not create signal listener pipe: error code %lu; retrying\n"
 msgstr "no se pudo crear tubería para escuchar señales: código de error %lu; reintentando\n"
 
-#: port/win32/signal.c:316
+#: port/win32/signal.c:317
 #, c-format
 msgid "could not create signal dispatch thread: error code %lu\n"
 msgstr "no se pudo crear thread de despacho de señales: código de error %lu\n"
@@ -13417,137 +13382,137 @@
 msgid "could not try-lock semaphore: error code %lu"
 msgstr "no se pudo intentar-bloquear (try-lock) el semáforo: código de error %lu"
 
-#: port/win32_shmem.c:175 port/win32_shmem.c:210 port/win32_shmem.c:231
+#: port/win32_shmem.c:173 port/win32_shmem.c:208 port/win32_shmem.c:226
 #, c-format
 msgid "could not create shared memory segment: error code %lu"
 msgstr "no se pudo crear el segmento de memoria compartida: código de error %lu"
 
-#: port/win32_shmem.c:176
+#: port/win32_shmem.c:174
 #, c-format
 msgid "Failed system call was CreateFileMapping(size=%zu, name=%s)."
 msgstr "La llamada a sistema fallida fue CreateFileMapping(size=%zu, name=%s)."
 
-#: port/win32_shmem.c:200
+#: port/win32_shmem.c:198
 #, c-format
 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:201
+#: port/win32_shmem.c:199
 #, c-format
 msgid "Check if there are any old server processes still running, and terminate them."
 msgstr "Verifique si hay procesos de servidor antiguos aún en funcionamiento, y termínelos."
 
-#: port/win32_shmem.c:211
+#: port/win32_shmem.c:209
 #, c-format
 msgid "Failed system call was DuplicateHandle."
 msgstr "La llamada a sistema fallida fue DuplicateHandle."
 
-#: port/win32_shmem.c:232
+#: port/win32_shmem.c:227
 #, c-format
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "La llamada a sistema fallida fue MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:377
+#: postmaster/autovacuum.c:380
 #, c-format
 msgid "could not fork autovacuum launcher process: %m"
 msgstr "no se pudo iniciar el lanzador autovacuum: %m"
 
-#: postmaster/autovacuum.c:413
+#: postmaster/autovacuum.c:416
 #, c-format
 msgid "autovacuum launcher started"
 msgstr "lanzador de autovacuum iniciado"
 
-#: postmaster/autovacuum.c:775
+#: postmaster/autovacuum.c:779
 #, c-format
 msgid "autovacuum launcher shutting down"
 msgstr "apagando lanzador de autovacuum"
 
-#: postmaster/autovacuum.c:1443
+#: postmaster/autovacuum.c:1447
 #, c-format
 msgid "could not fork autovacuum worker process: %m"
 msgstr "no se pudo lanzar el proceso «autovacuum worker»: %m"
 
-#: postmaster/autovacuum.c:1639
+#: postmaster/autovacuum.c:1643
 #, c-format
 msgid "autovacuum: processing database \"%s\""
 msgstr "autovacuum: procesando la base de datos «%s»"
 
-#: postmaster/autovacuum.c:2051
+#: postmaster/autovacuum.c:2058
 #, c-format
 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/autovacuum.c:2063
+#: postmaster/autovacuum.c:2070
 #, c-format
 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/autovacuum.c:2346
+#: postmaster/autovacuum.c:2355
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "vacuum automático de la tabla «%s.%s.%s»"
 
-#: postmaster/autovacuum.c:2349
+#: postmaster/autovacuum.c:2358
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "análisis automático de la tabla «%s.%s.%s»"
 
-#: postmaster/autovacuum.c:2877
+#: postmaster/autovacuum.c:2907
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "autovacuum no fue iniciado debido a un error de configuración"
 
-#: postmaster/autovacuum.c:2878
+#: postmaster/autovacuum.c:2908
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "Active la opción «track_counts»."
 
-#: postmaster/bgworker.c:345 postmaster/bgworker.c:745
+#: postmaster/bgworker.c:366 postmaster/bgworker.c:770
 #, c-format
 msgid "registering background worker \"%s\""
 msgstr "registrando el «background worker» «%s»"
 
-#: postmaster/bgworker.c:374
+#: postmaster/bgworker.c:395
 #, c-format
 msgid "unregistering background worker \"%s\""
 msgstr "des-registrando el «background worker» «%s»"
 
-#: postmaster/bgworker.c:483
+#: postmaster/bgworker.c:504
 #, c-format
 msgid "background worker \"%s\": must attach to shared memory in order to request a database connection"
 msgstr "«background worker» «%s»: debe acoplarse a memoria compartida para poder solicitar una conexión a base de datos"
 
-#: postmaster/bgworker.c:492
+#: postmaster/bgworker.c:513
 #, c-format
 msgid "background worker \"%s\": cannot request database access if starting at postmaster start"
 msgstr "«background worker» «%s»: no se puede solicitar una conexión a base de datos si está iniciando en el momento de inicio de postmaster"
 
-#: postmaster/bgworker.c:506
+#: postmaster/bgworker.c:527
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "«background worker» «%s»: intervalo de reinicio no válido"
 
-#: postmaster/bgworker.c:551
+#: postmaster/bgworker.c:572
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "terminando el «background worker» «%s» debido a una orden del administrador"
 
-#: postmaster/bgworker.c:752
+#: postmaster/bgworker.c:777
 #, c-format
 msgid "background worker \"%s\": must be registered in shared_preload_libraries"
 msgstr "«background worker» «%s»: debe ser registrado en shared_preload_libraries"
 
-#: postmaster/bgworker.c:764
+#: postmaster/bgworker.c:789
 #, c-format
 msgid "background worker \"%s\": only dynamic background workers can request notification"
 msgstr "«background worker» «%s»: sólo los «background worker» dinámicos pueden pedir notificaciones"
 
-#: postmaster/bgworker.c:779
+#: postmaster/bgworker.c:804
 #, c-format
 msgid "too many background workers"
 msgstr "demasiados «background workers»"
 
-#: postmaster/bgworker.c:780
+#: postmaster/bgworker.c:805
 #, c-format
 msgid "Up to %d background worker can be registered with the current settings."
 msgid_plural "Up to %d background workers can be registered with the current settings."
@@ -13555,7 +13520,7 @@
 msgstr[1] "Hasta %d «background workers» pueden registrarse con la configuración actual."
 
 # FIXME a %s would be nice here
-#: postmaster/bgworker.c:784
+#: postmaster/bgworker.c:809
 #, c-format
 msgid "Consider increasing the configuration parameter \"max_worker_processes\"."
 msgstr "Considere incrementar el parámetro de configuración «max_worker_processes»."
@@ -13569,9 +13534,9 @@
 
 # FIXME a %s would be nice here
 #: postmaster/checkpointer.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "Consider increasing the configuration parameter \"max_wal_size\"."
-msgstr "Considere incrementar el parámetro de configuración «max_worker_processes»."
+msgstr "Considere incrementar el parámetro de configuración «max_wal_size»."
 
 #: postmaster/checkpointer.c:621
 #, c-format
@@ -13624,7 +13589,7 @@
 msgid "archive command was terminated by exception 0x%X"
 msgstr "la orden de archivado fue terminada por una excepción 0x%X"
 
-#: postmaster/pgarch.c:598 postmaster/postmaster.c:3426
+#: postmaster/pgarch.c:598 postmaster/postmaster.c:3475
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "Vea el archivo «ntstatus.h» para una descripción del valor hexadecimal."
@@ -13654,298 +13619,298 @@
 msgid "could not open archive status directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio de estado de archivado «%s»: %m"
 
-#: postmaster/pgstat.c:356
+#: postmaster/pgstat.c:355
 #, c-format
 msgid "could not resolve \"localhost\": %s"
 msgstr "no se pudo resolver «localhost»: %s"
 
-#: postmaster/pgstat.c:379
+#: postmaster/pgstat.c:378
 #, c-format
 msgid "trying another address for the statistics collector"
 msgstr "intentando otra dirección para el recolector de estadísticas"
 
-#: postmaster/pgstat.c:388
+#: postmaster/pgstat.c:387
 #, 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"
 
-#: postmaster/pgstat.c:400
+#: postmaster/pgstat.c:399
 #, 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"
 
-#: postmaster/pgstat.c:411
+#: postmaster/pgstat.c:410
 #, 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"
 
-#: postmaster/pgstat.c:427
+#: postmaster/pgstat.c:426
 #, 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"
 
-#: postmaster/pgstat.c:448
+#: postmaster/pgstat.c:447
 #, 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"
 
-#: postmaster/pgstat.c:474
+#: postmaster/pgstat.c:473
 #, c-format
 msgid "select() failed in statistics collector: %m"
 msgstr "select() falló en el recolector de estadísticas: %m"
 
-#: postmaster/pgstat.c:489
+#: postmaster/pgstat.c:488
 #, c-format
 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"
 
-#: postmaster/pgstat.c:504
+#: postmaster/pgstat.c:503
 #, 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"
 
-#: postmaster/pgstat.c:514
+#: postmaster/pgstat.c:513
 #, c-format
 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:537
+#: postmaster/pgstat.c:536
 #, 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"
 
-#: postmaster/pgstat.c:547
+#: postmaster/pgstat.c:546
 #, c-format
 msgid "disabling statistics collector for lack of working socket"
 msgstr "desactivando el recolector de estadísticas por falla del socket"
 
-#: postmaster/pgstat.c:694
+#: postmaster/pgstat.c:693
 #, c-format
 msgid "could not fork statistics collector: %m"
 msgstr "no se pudo crear el proceso para el recolector de estadísticas: %m"
 
-#: postmaster/pgstat.c:1233 postmaster/pgstat.c:1257 postmaster/pgstat.c:1290
+#: postmaster/pgstat.c:1232 postmaster/pgstat.c:1256 postmaster/pgstat.c:1289
 #, c-format
 msgid "must be superuser to reset statistics counters"
 msgstr "debe ser superusuario para reinicializar los contadores de estadísticas"
 
-#: postmaster/pgstat.c:1266
+#: postmaster/pgstat.c:1265
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "destino de reset no reconocido: «%s»"
 
-#: postmaster/pgstat.c:1267
+#: postmaster/pgstat.c:1266
 #, c-format
 msgid "Target must be \"archiver\" or \"bgwriter\"."
 msgstr "El destino debe ser «archiver» o «bgwriter»."
 
-#: postmaster/pgstat.c:3425
+#: postmaster/pgstat.c:3433
 #, c-format
 msgid "could not read statistics message: %m"
 msgstr "no se pudo leer un mensaje de estadísticas: %m"
 
-#: postmaster/pgstat.c:3756 postmaster/pgstat.c:3933
+#: postmaster/pgstat.c:3764 postmaster/pgstat.c:3921
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "no se pudo abrir el archivo temporal de estadísticas «%s»: %m"
 
-#: postmaster/pgstat.c:3824 postmaster/pgstat.c:3978
+#: postmaster/pgstat.c:3831 postmaster/pgstat.c:3966
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "no se pudo escribir el archivo temporal de estadísticas «%s»: %m"
 
-#: postmaster/pgstat.c:3833 postmaster/pgstat.c:3987
+#: postmaster/pgstat.c:3840 postmaster/pgstat.c:3975
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo temporal de estadísticas «%s»: %m"
 
-#: postmaster/pgstat.c:3841 postmaster/pgstat.c:3995
+#: postmaster/pgstat.c:3848 postmaster/pgstat.c:3983
 #, 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"
 
-#: postmaster/pgstat.c:4077 postmaster/pgstat.c:4260 postmaster/pgstat.c:4415
+#: postmaster/pgstat.c:4072 postmaster/pgstat.c:4257 postmaster/pgstat.c:4410
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de estadísticas «%s»: %m"
 
-#: postmaster/pgstat.c:4089 postmaster/pgstat.c:4099 postmaster/pgstat.c:4109
-#: postmaster/pgstat.c:4130 postmaster/pgstat.c:4145 postmaster/pgstat.c:4201
-#: postmaster/pgstat.c:4272 postmaster/pgstat.c:4292 postmaster/pgstat.c:4310
-#: postmaster/pgstat.c:4326 postmaster/pgstat.c:4344 postmaster/pgstat.c:4360
-#: postmaster/pgstat.c:4427 postmaster/pgstat.c:4439 postmaster/pgstat.c:4451
-#: postmaster/pgstat.c:4476 postmaster/pgstat.c:4498
+#: postmaster/pgstat.c:4084 postmaster/pgstat.c:4094 postmaster/pgstat.c:4104
+#: postmaster/pgstat.c:4125 postmaster/pgstat.c:4140 postmaster/pgstat.c:4194
+#: postmaster/pgstat.c:4269 postmaster/pgstat.c:4289 postmaster/pgstat.c:4307
+#: postmaster/pgstat.c:4323 postmaster/pgstat.c:4341 postmaster/pgstat.c:4357
+#: postmaster/pgstat.c:4422 postmaster/pgstat.c:4434 postmaster/pgstat.c:4446
+#: postmaster/pgstat.c:4471 postmaster/pgstat.c:4493
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "el archivo de estadísticas «%s» está corrupto"
 
-#: postmaster/pgstat.c:4615
+#: postmaster/pgstat.c:4622
 #, c-format
 msgid "using stale statistics instead of current ones because stats collector is not responding"
 msgstr "usando estadísticas añejas en vez de actualizadas porque el recolector de estadísticas no está respondiendo"
 
-#: postmaster/pgstat.c:4933
+#: postmaster/pgstat.c:4951
 #, c-format
 msgid "database hash table corrupted during cleanup --- abort"
 msgstr "el hash de bases de datos se corrompió durante la finalización; abortando"
 
-#: postmaster/postmaster.c:670
+#: postmaster/postmaster.c:681
 #, 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:756
+#: postmaster/postmaster.c:767
 #, 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:807
+#: postmaster/postmaster.c:818
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: argumento no válido: «%s»\n"
 
-#: postmaster/postmaster.c:842
+#: postmaster/postmaster.c:857
 #, 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"
 
-#: postmaster/postmaster.c:847
+#: postmaster/postmaster.c:862
 #, c-format
 msgid "%s: max_wal_senders must be less than max_connections\n"
 msgstr "%s: max_wal_senders debe ser menor que max_connections\n"
 
-#: postmaster/postmaster.c:852
+#: postmaster/postmaster.c:867
 #, c-format
 msgid "WAL archival cannot be enabled when wal_level is \"minimal\""
-msgstr ""
+msgstr "el archivador de WAL no puede activarse cuando wal_level es «minimal»"
 
-#: postmaster/postmaster.c:855
+#: postmaster/postmaster.c:870
 #, c-format
 msgid "WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", \"hot_standby\", or \"logical\""
 msgstr "el flujo de WAL (max_wal_senders > 0) requiere wal_level «archive» o «hot_standby» o «logical»"
 
-#: postmaster/postmaster.c:863
+#: postmaster/postmaster.c:878
 #, 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"
 
-#: postmaster/postmaster.c:955 postmaster/postmaster.c:1053
-#: utils/init/miscinit.c:1314
+#: postmaster/postmaster.c:970 postmaster/postmaster.c:1068
+#: utils/init/miscinit.c:1410
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "la sintaxis de lista no es válida para el parámetro «%s»"
 
-#: postmaster/postmaster.c:986
+#: postmaster/postmaster.c:1001
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "no se pudo crear el socket de escucha para «%s»"
 
-#: postmaster/postmaster.c:992
+#: postmaster/postmaster.c:1007
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "no se pudo crear ningún socket TCP/IP"
 
-#: postmaster/postmaster.c:1075
+#: postmaster/postmaster.c:1090
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
 msgstr "no se pudo crear el socket de dominio Unix en el directorio «%s»"
 
-#: postmaster/postmaster.c:1081
+#: postmaster/postmaster.c:1096
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "no se pudo crear ningún socket de dominio Unix"
 
-#: postmaster/postmaster.c:1093
+#: postmaster/postmaster.c:1108
 #, c-format
 msgid "no socket created for listening"
 msgstr "no se creó el socket de atención"
 
-#: postmaster/postmaster.c:1133
+#: postmaster/postmaster.c:1148
 #, c-format
 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"
 
-#: postmaster/postmaster.c:1162
+#: postmaster/postmaster.c:1177
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %s\n"
 msgstr "%s: no se pudo cambiar los permisos del archivo de PID externo «%s»: %s\n"
 
-#: postmaster/postmaster.c:1166
+#: postmaster/postmaster.c:1181
 #, 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"
 
-#: postmaster/postmaster.c:1217
+#: postmaster/postmaster.c:1232
 #, c-format
 msgid "ending log output to stderr"
 msgstr "terminando la salida de registro a stderr"
 
-#: postmaster/postmaster.c:1218
+#: postmaster/postmaster.c:1233
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
 msgstr "La salida futura del registro será enviada al destino de log «%s»."
 
-#: postmaster/postmaster.c:1244 utils/init/postinit.c:200
+#: postmaster/postmaster.c:1259 utils/init/postinit.c:200
 #, c-format
 msgid "could not load pg_hba.conf"
 msgstr "no se pudo cargar pg_hba.conf"
 
-#: postmaster/postmaster.c:1270
+#: postmaster/postmaster.c:1285
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "postmaster se volvió multi-hilo durante la partida"
 
-#: postmaster/postmaster.c:1271
+#: postmaster/postmaster.c:1286
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "Defina la variable de ambiente LC_ALL a un valor válido."
 
-#: postmaster/postmaster.c:1368
+#: postmaster/postmaster.c:1383
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: no se pudo localizar el ejecutable postgres correspondiente"
 
-#: postmaster/postmaster.c:1391 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1406 utils/misc/tzparser.c:341
 #, 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."
 
-#: postmaster/postmaster.c:1419
+#: postmaster/postmaster.c:1434
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "no existe el directorio de datos «%s»"
 
-#: postmaster/postmaster.c:1424
+#: postmaster/postmaster.c:1439
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "no se pudo obtener los permisos del directorio «%s»: %m"
 
-#: postmaster/postmaster.c:1432
+#: postmaster/postmaster.c:1447
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "el directorio de datos especificado «%s» no es un directorio"
 
-#: postmaster/postmaster.c:1448
+#: postmaster/postmaster.c:1463
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "el directorio de datos «%s» tiene dueño equivocado"
 
-#: postmaster/postmaster.c:1450
+#: postmaster/postmaster.c:1465
 #, c-format
 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:1470
+#: postmaster/postmaster.c:1485
 #, 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:1472
+#: postmaster/postmaster.c:1487
 #, c-format
 msgid "Permissions should be u=rwx (0700)."
 msgstr "Los permisos deberían ser u=rwx (0700)."
 
-#: postmaster/postmaster.c:1483
+#: postmaster/postmaster.c:1498
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -13956,359 +13921,365 @@
 "Se esperaba encontrar en el directorio PGDATA «%s»,\n"
 "pero no se pudo abrir el archivo «%s»: %s\n"
 
-#: postmaster/postmaster.c:1659
+#: postmaster/postmaster.c:1675
 #, c-format
 msgid "select() failed in postmaster: %m"
 msgstr "select() falló en postmaster: %m"
 
-#: postmaster/postmaster.c:1857 postmaster/postmaster.c:1888
+#: postmaster/postmaster.c:1826
+#, c-format
+msgid "performing immediate shutdown because data directory lock file is invalid"
+msgstr "ejecutando un apagado inmediato porque el archivo de bloqueo del directorio de datos no es válido"
+
+#: postmaster/postmaster.c:1904 postmaster/postmaster.c:1935
 #, c-format
 msgid "incomplete startup packet"
 msgstr "el paquete de inicio está incompleto"
 
-#: postmaster/postmaster.c:1869
+#: postmaster/postmaster.c:1916
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "el de paquete de inicio tiene largo incorrecto"
 
-#: postmaster/postmaster.c:1927
+#: postmaster/postmaster.c:1974
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "no se pudo enviar la respuesta de negociación SSL: %m"
 
-#: postmaster/postmaster.c:1956
+#: postmaster/postmaster.c:2003
 #, c-format
 msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr "el protocolo %u.%u no está soportado: servidor soporta %u.0 hasta %u.%u"
 
-#: postmaster/postmaster.c:2019
+#: postmaster/postmaster.c:2066 utils/misc/guc.c:5484 utils/misc/guc.c:5577
+#: utils/misc/guc.c:6874 utils/misc/guc.c:9597 utils/misc/guc.c:9631
 #, c-format
-msgid "invalid value for parameter \"replication\""
-msgstr "valor no válido para la opción «replication»"
+msgid "invalid value for parameter \"%s\": \"%s\""
+msgstr "valor no válido para el parámetro «%s»: «%s»"
 
-#: postmaster/postmaster.c:2020
+#: postmaster/postmaster.c:2069
 #, c-format
-msgid "Valid values are: false, 0, true, 1, database."
-msgstr "Los valores válidos son: false, 0, true, 1, database."
+msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
+msgstr "Los valores válidos son: «false», 0, «true», 1, «database»."
 
-#: postmaster/postmaster.c:2040
+#: postmaster/postmaster.c:2089
 #, c-format
 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"
 
-#: postmaster/postmaster.c:2068
+#: postmaster/postmaster.c:2117
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "no se especifica un nombre de usuario en el paquete de inicio"
 
-#: postmaster/postmaster.c:2127
+#: postmaster/postmaster.c:2176
 #, c-format
 msgid "the database system is starting up"
 msgstr "el sistema de base de datos está iniciándose"
 
-#: postmaster/postmaster.c:2132
+#: postmaster/postmaster.c:2181
 #, c-format
 msgid "the database system is shutting down"
 msgstr "el sistema de base de datos está apagándose"
 
-#: postmaster/postmaster.c:2137
+#: postmaster/postmaster.c:2186
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "el sistema de base de datos está en modo de recuperación"
 
-#: postmaster/postmaster.c:2142 storage/ipc/procarray.c:284
+#: postmaster/postmaster.c:2191 storage/ipc/procarray.c:284
 #: storage/ipc/sinvaladt.c:298 storage/lmgr/proc.c:334
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "lo siento, ya tenemos demasiados clientes"
 
-#: postmaster/postmaster.c:2204
+#: postmaster/postmaster.c:2253
 #, 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"
 
-#: postmaster/postmaster.c:2212
+#: postmaster/postmaster.c:2261
 #, 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:2432
+#: postmaster/postmaster.c:2481
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "se recibió SIGHUP, releyendo el archivo de configuración"
 
-#: postmaster/postmaster.c:2457
+#: postmaster/postmaster.c:2506
 #, c-format
 msgid "pg_hba.conf not reloaded"
 msgstr "pg_hba.conf no ha sido recargado"
 
-#: postmaster/postmaster.c:2461
+#: postmaster/postmaster.c:2510
 #, c-format
 msgid "pg_ident.conf not reloaded"
 msgstr "pg_ident.conf no ha sido recargado"
 
-#: postmaster/postmaster.c:2502
+#: postmaster/postmaster.c:2551
 #, c-format
 msgid "received smart shutdown request"
 msgstr "se recibió petición de apagado inteligente"
 
-#: postmaster/postmaster.c:2554
+#: postmaster/postmaster.c:2603
 #, c-format
 msgid "received fast shutdown request"
 msgstr "se recibió petición de apagado rápido"
 
-#: postmaster/postmaster.c:2580
+#: postmaster/postmaster.c:2629
 #, c-format
 msgid "aborting any active transactions"
 msgstr "abortando transacciones activas"
 
-#: postmaster/postmaster.c:2614
+#: postmaster/postmaster.c:2663
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "se recibió petición de apagado inmediato"
 
-#: postmaster/postmaster.c:2675
+#: postmaster/postmaster.c:2724
 #, c-format
 msgid "shutdown at recovery target"
-msgstr ""
+msgstr "apagándose al alcanzar el destino de recuperación"
 
-#: postmaster/postmaster.c:2691 postmaster/postmaster.c:2714
+#: postmaster/postmaster.c:2740 postmaster/postmaster.c:2763
 msgid "startup process"
 msgstr "proceso de inicio"
 
-#: postmaster/postmaster.c:2694
+#: postmaster/postmaster.c:2743
 #, c-format
 msgid "aborting startup due to startup process failure"
 msgstr "abortando el inicio debido a una falla en el procesamiento de inicio"
 
-#: postmaster/postmaster.c:2755
+#: postmaster/postmaster.c:2804
 #, c-format
 msgid "database system is ready to accept connections"
 msgstr "el sistema de bases de datos está listo para aceptar conexiones"
 
-#: postmaster/postmaster.c:2770
+#: postmaster/postmaster.c:2819
 msgid "background writer process"
 msgstr "proceso background writer"
 
-#: postmaster/postmaster.c:2824
+#: postmaster/postmaster.c:2873
 msgid "checkpointer process"
 msgstr "proceso checkpointer"
 
-#: postmaster/postmaster.c:2840
+#: postmaster/postmaster.c:2889
 msgid "WAL writer process"
 msgstr "proceso escritor de WAL"
 
-#: postmaster/postmaster.c:2854
+#: postmaster/postmaster.c:2903
 msgid "WAL receiver process"
 msgstr "proceso receptor de WAL"
 
-#: postmaster/postmaster.c:2869
+#: postmaster/postmaster.c:2918
 msgid "autovacuum launcher process"
 msgstr "proceso lanzador de autovacuum"
 
-#: postmaster/postmaster.c:2884
+#: postmaster/postmaster.c:2933
 msgid "archiver process"
 msgstr "proceso de archivado"
 
-#: postmaster/postmaster.c:2900
+#: postmaster/postmaster.c:2949
 msgid "statistics collector process"
 msgstr "recolector de estadísticas"
 
-#: postmaster/postmaster.c:2914
+#: postmaster/postmaster.c:2963
 msgid "system logger process"
 msgstr "proceso de log"
 
-#: postmaster/postmaster.c:2976
+#: postmaster/postmaster.c:3025
 msgid "worker process"
 msgstr "proceso «background worker»"
 
-#: postmaster/postmaster.c:3059 postmaster/postmaster.c:3079
-#: postmaster/postmaster.c:3086 postmaster/postmaster.c:3104
+#: postmaster/postmaster.c:3108 postmaster/postmaster.c:3128
+#: postmaster/postmaster.c:3135 postmaster/postmaster.c:3153
 msgid "server process"
 msgstr "proceso de servidor"
 
-#: postmaster/postmaster.c:3158
+#: postmaster/postmaster.c:3207
 #, c-format
 msgid "terminating any other active server processes"
 msgstr "terminando todos los otros procesos de servidor activos"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3414
+#: postmaster/postmaster.c:3463
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) terminó con código de salida %d"
 
-#: postmaster/postmaster.c:3416 postmaster/postmaster.c:3427
-#: postmaster/postmaster.c:3438 postmaster/postmaster.c:3447
-#: postmaster/postmaster.c:3457
+#: postmaster/postmaster.c:3465 postmaster/postmaster.c:3476
+#: postmaster/postmaster.c:3487 postmaster/postmaster.c:3496
+#: postmaster/postmaster.c:3506
 #, c-format
 msgid "Failed process was running: %s"
 msgstr "El proceso que falló estaba ejecutando: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3424
+#: postmaster/postmaster.c:3473
 #, c-format
 msgid "%s (PID %d) was terminated by exception 0x%X"
 msgstr "%s (PID %d) fue terminado por una excepción 0x%X"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3434
+#: postmaster/postmaster.c:3483
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d: %s"
 msgstr "%s (PID %d) fue terminado por una señal %d: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3445
+#: postmaster/postmaster.c:3494
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d"
 msgstr "%s (PID %d) fue terminado por una señal %d"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3455
+#: postmaster/postmaster.c:3504
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) terminó con código no reconocido %d"
 
-#: postmaster/postmaster.c:3642
+#: postmaster/postmaster.c:3691
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "apagado anormal del sistema de bases de datos"
 
-#: postmaster/postmaster.c:3682
+#: postmaster/postmaster.c:3731
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "todos los procesos fueron terminados; reinicializando"
 
-#: postmaster/postmaster.c:3894
+#: postmaster/postmaster.c:3943
 #, 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:3936
+#: postmaster/postmaster.c:3985
 msgid "could not fork new process for connection: "
 msgstr "no se pudo lanzar el nuevo proceso para la conexión: "
 
-#: postmaster/postmaster.c:4042
+#: postmaster/postmaster.c:4099
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "conexión recibida: host=%s port=%s"
 
-#: postmaster/postmaster.c:4047
+#: postmaster/postmaster.c:4104
 #, c-format
 msgid "connection received: host=%s"
 msgstr "conexión recibida: host=%s"
 
-#: postmaster/postmaster.c:4336
+#: postmaster/postmaster.c:4387
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "no se pudo lanzar el proceso servidor «%s»: %m"
 
-#: postmaster/postmaster.c:4893
+#: postmaster/postmaster.c:4926
 #, c-format
 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"
 
-#: postmaster/postmaster.c:5176
+#: postmaster/postmaster.c:5213
 #, c-format
 msgid "could not fork startup process: %m"
 msgstr "no se pudo lanzar el proceso de inicio: %m"
 
-#: postmaster/postmaster.c:5180
+#: postmaster/postmaster.c:5217
 #, c-format
 msgid "could not fork background writer process: %m"
 msgstr "no se pudo lanzar el background writer: %m"
 
-#: postmaster/postmaster.c:5184
+#: postmaster/postmaster.c:5221
 #, c-format
 msgid "could not fork checkpointer process: %m"
 msgstr "no se pudo lanzar el checkpointer: %m"
 
-#: postmaster/postmaster.c:5188
+#: postmaster/postmaster.c:5225
 #, c-format
 msgid "could not fork WAL writer process: %m"
 msgstr "no se pudo lanzar el proceso escritor de WAL: %m"
 
-#: postmaster/postmaster.c:5192
+#: postmaster/postmaster.c:5229
 #, c-format
 msgid "could not fork WAL receiver process: %m"
 msgstr "no se pudo lanzar el proceso receptor de WAL: %m"
 
-#: postmaster/postmaster.c:5196
+#: postmaster/postmaster.c:5233
 #, c-format
 msgid "could not fork process: %m"
 msgstr "no se pudo lanzar el proceso: %m"
 
-#: postmaster/postmaster.c:5358 postmaster/postmaster.c:5381
+#: postmaster/postmaster.c:5395 postmaster/postmaster.c:5418
 #, c-format
 msgid "database connection requirement not indicated during registration"
 msgstr "el requerimiento de conexión a base de datos no fue indicado durante el registro"
 
-#: postmaster/postmaster.c:5365 postmaster/postmaster.c:5388
+#: postmaster/postmaster.c:5402 postmaster/postmaster.c:5425
 #, c-format
 msgid "invalid processing mode in background worker"
 msgstr "modo de procesamiento no válido en «background worker»"
 
-#: postmaster/postmaster.c:5440
+#: postmaster/postmaster.c:5497
 #, c-format
 msgid "starting background worker process \"%s\""
 msgstr "iniciando el proceso «background worker» «%s»"
 
-#: postmaster/postmaster.c:5451
+#: postmaster/postmaster.c:5509
 #, c-format
 msgid "could not fork worker process: %m"
 msgstr "no se pudo lanzar el proceso «background worker»: %m"
 
-#: postmaster/postmaster.c:5827
+#: postmaster/postmaster.c:5909
 #, 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"
 
-#: postmaster/postmaster.c:5859
+#: postmaster/postmaster.c:5941
 #, 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"
 
-#: postmaster/postmaster.c:5888
+#: postmaster/postmaster.c:5970
 #, c-format
 msgid "could not open backend variables file \"%s\": %s\n"
 msgstr "no se pudo abrir el archivo de variables de servidor «%s»: %s\n"
 
-#: postmaster/postmaster.c:5895
+#: postmaster/postmaster.c:5977
 #, 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"
 
-#: postmaster/postmaster.c:5904
+#: postmaster/postmaster.c:5986
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "no se pudo eliminar el archivo «%s»: %s\n"
 
-#: postmaster/postmaster.c:5921
+#: postmaster/postmaster.c:6003
 #, c-format
 msgid "could not map view of backend variables: error code %lu\n"
 msgstr "no se pudo mapear la vista del archivo de variables: código de error %lu\n"
 
-#: postmaster/postmaster.c:5930
+#: postmaster/postmaster.c:6012
 #, c-format
 msgid "could not unmap view of backend variables: error code %lu\n"
 msgstr "no se pudo desmapear la vista del archivo de variables: código de error %lu\n"
 
-#: postmaster/postmaster.c:5937
+#: postmaster/postmaster.c:6019
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %lu\n"
 msgstr "no se pudo cerrar el archivo de variables de servidor: código de error %lu\n"
 
-#: postmaster/postmaster.c:6096
+#: postmaster/postmaster.c:6178
 #, c-format
 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:6101
+#: postmaster/postmaster.c:6183
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "no se pudo publicar el estado de completitud del proceso hijo\n"
@@ -14373,69 +14344,64 @@
 msgid "could not determine which collation to use for regular expression"
 msgstr "no se pudo determinar qué ordenamiento usar para la expresión regular"
 
-#: replication/basebackup.c:227
+#: replication/basebackup.c:229
 #, c-format
 msgid "could not stat control file \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo de control «%s»: %m"
 
-#: replication/basebackup.c:336
+#: replication/basebackup.c:338
 #, c-format
 msgid "could not find any WAL files"
 msgstr "no se pudo encontrar ningún archivo de WAL"
 
-#: replication/basebackup.c:349 replication/basebackup.c:363
-#: replication/basebackup.c:372
+#: replication/basebackup.c:351 replication/basebackup.c:365
+#: replication/basebackup.c:374
 #, c-format
 msgid "could not find WAL file \"%s\""
 msgstr "no se pudo encontrar archivo de WAL «%s»"
 
-#: replication/basebackup.c:411 replication/basebackup.c:437
+#: replication/basebackup.c:413 replication/basebackup.c:439
 #, c-format
 msgid "unexpected WAL file size \"%s\""
 msgstr "tamaño del archivo WAL «%s» inesperado"
 
-#: replication/basebackup.c:423 replication/basebackup.c:1177
+#: replication/basebackup.c:425 replication/basebackup.c:1157
 #, c-format
 msgid "base backup could not send data, aborting backup"
 msgstr "el respaldo base no pudo enviar datos, abortando el respaldo"
 
-#: replication/basebackup.c:525 replication/basebackup.c:534
-#: replication/basebackup.c:543 replication/basebackup.c:552
-#: replication/basebackup.c:561 replication/basebackup.c:572
-#: replication/basebackup.c:589
+#: replication/basebackup.c:527 replication/basebackup.c:536
+#: replication/basebackup.c:545 replication/basebackup.c:554
+#: replication/basebackup.c:563 replication/basebackup.c:574
+#: replication/basebackup.c:591
 #, c-format
 msgid "duplicate option \"%s\""
 msgstr "nombre de opción «%s» duplicada"
 
-#: replication/basebackup.c:578 utils/misc/guc.c:5473
+#: replication/basebackup.c:580 utils/misc/guc.c:5494
 #, 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)"
 
-#: replication/basebackup.c:844 replication/basebackup.c:946
+#: replication/basebackup.c:854 replication/basebackup.c:956
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "no se pudo hacer stat al archivo o directorio «%s»: %m"
 
-#: replication/basebackup.c:1113
+#: replication/basebackup.c:1109
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "ignorando el archivo especial «%s»"
 
-#: replication/basebackup.c:1167
+#: replication/basebackup.c:1220
 #, c-format
-msgid "archive member \"%s\" too large for tar format"
-msgstr "el miembro de archivador «%s» es demasiado grande para el formato tar"
-
-#: replication/basebackup.c:1240
-#, fuzzy, c-format
 msgid "file name too long for tar format: \"%s\""
-msgstr "el miembro de archivador «%s» es demasiado grande para el formato tar"
+msgstr "nombre de archivo demasiado largo para el formato tar: «%s»"
 
-#: replication/basebackup.c:1245
+#: replication/basebackup.c:1225
 #, c-format
 msgid "symbolic link target too long for tar format: file name \"%s\", target \"%s\""
-msgstr ""
+msgstr "destino de enlace simbólico demasiado largo para el formato tar: nombre de archivo «%s», destino «%s»"
 
 #: replication/libpqwalreceiver/libpqwalreceiver.c:116
 #, c-format
@@ -14536,43 +14502,43 @@
 msgid "logical decoding cannot be used while in recovery"
 msgstr "la decodificación lógica no puede ejecutarse durante la recuperación"
 
-#: replication/logical/logical.c:234 replication/logical/logical.c:383
+#: replication/logical/logical.c:237 replication/logical/logical.c:395
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr "no se puede usar un slot de replicación física para decodificación lógica"
 
-#: replication/logical/logical.c:239 replication/logical/logical.c:388
+#: replication/logical/logical.c:242 replication/logical/logical.c:400
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "el slot de replicación «%s» no fue creado en esta base de datos"
 
-#: replication/logical/logical.c:246
+#: replication/logical/logical.c:249
 #, c-format
 msgid "cannot create logical replication slot in transaction that has performed writes"
 msgstr "no se puede crear un slot de replicación lógica en una transacción que ha efectuado escrituras"
 
-#: replication/logical/logical.c:425
+#: replication/logical/logical.c:437
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "iniciando la decodificación lógica para el slot «%s»"
 
-#: replication/logical/logical.c:427
+#: replication/logical/logical.c:439
 #, c-format
 msgid "streaming transactions committing after %X/%X, reading WAL from %X/%X"
 msgstr "enviando flujo de transacciones comprometidas después de %X/%X, leyendo WAL de %X/%X"
 
-#: replication/logical/logical.c:562
+#: replication/logical/logical.c:574
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback, associated LSN %X/%X"
 msgstr "slot «%s», plugin de salida «%s», en el callback %s, LSN asociado %X/%X"
 
 # FIXME must quote callback name?  Need a translator: comment?
-#: replication/logical/logical.c:569
+#: replication/logical/logical.c:581
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr "slot «%s», plugin de salida «%s», en el callback %s"
 
-#: replication/logical/logicalfuncs.c:192 replication/walsender.c:2109
+#: replication/logical/logicalfuncs.c:192 replication/walsender.c:2128
 #, c-format
 msgid "could not read from log segment %s, offset %u, length %lu: %m"
 msgstr "no se pudo leer desde el segmento %s, posición %u, largo %lu: %m"
@@ -14582,193 +14548,205 @@
 msgid "must be superuser or replication role to use replication slots"
 msgstr "debe ser superusuario o rol de replicación para usar slots de replicación"
 
-#: replication/logical/logicalfuncs.c:341
+#: replication/logical/logicalfuncs.c:301
+#, c-format
+msgid "slot name must not be null"
+msgstr "el nombre de slot no debe ser null"
+
+#: replication/logical/logicalfuncs.c:317
+#, c-format
+msgid "options array must not be null"
+msgstr "el array de opciones no debe ser null"
+
+#: replication/logical/logicalfuncs.c:348
 #, c-format
 msgid "array must be one-dimensional"
 msgstr "el array debe ser unidimensional"
 
-#: replication/logical/logicalfuncs.c:347
+#: replication/logical/logicalfuncs.c:354
 #, c-format
 msgid "array must not contain nulls"
 msgstr "el array no debe contener nulls"
 
-#: replication/logical/logicalfuncs.c:363 utils/adt/json.c:2273
-#: utils/adt/jsonb.c:1378
+#: replication/logical/logicalfuncs.c:370 utils/adt/json.c:2277
+#: utils/adt/jsonb.c:1356
 #, c-format
 msgid "array must have even number of elements"
 msgstr "el array debe tener un número par de elementos"
 
-#: replication/logical/logicalfuncs.c:406
+#: replication/logical/logicalfuncs.c:412
 #, c-format
-msgid "logical decoding output plugin \"%s\" produces binary output, but \"%s\" expects textual data"
+msgid "logical decoding output plugin \"%s\" produces binary output, but function \"%s\" expects textual data"
 msgstr "el plugin de salida de decodificación lógica «%s» produce salida binaria, pero «%s» espera datos textuales"
 
 #: replication/logical/origin.c:181
-#, fuzzy, c-format
+#, c-format
 msgid "only superusers can query or manipulate replication origins"
-msgstr "debe ser superusuario para alterar usuarios de replicación"
+msgstr "debe ser superusuario para consultar o manipular orígenes de replicación"
 
 #: replication/logical/origin.c:186
-#, fuzzy, c-format
+#, c-format
 msgid "cannot query or manipulate replication origin when max_replication_slots = 0"
-msgstr "no se puede usar un slot de replicación lógica para replicación física"
+msgstr "no se puede consultar o manipular orígenes de replicación cuando max_replication_slots = 0"
 
 #: replication/logical/origin.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "cannot manipulate replication origins during recovery"
-msgstr "no se puede ejecutar %s durante la recuperación"
+msgstr "no se puede manipular orígenes de replicación durante la recuperación"
 
 #: replication/logical/origin.c:316
 #, c-format
-msgid "no free replication origin oid could be found"
-msgstr ""
+msgid "could not find free replication origin OID"
+msgstr "no se pudo encontrar un OID de origen de replicación libre"
 
 #: replication/logical/origin.c:353
 #, c-format
-msgid "cannot drop replication origin with oid %d, in use by pid %d"
-msgstr ""
+msgid "could not drop replication origin with OID %d, in use by PID %d"
+msgstr "no se pudo eliminar el origen de replicación con OID %d, en uso por el PID %d"
 
-#: replication/logical/origin.c:690
-#, fuzzy, c-format
+#: replication/logical/origin.c:674
+#, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
-msgstr "el archivo de slot de replicación «%s» tiene número mágico erróneo %u en lugar de %u"
+msgstr "el checkpoint de replicación tiene número mágico erróneo %u en lugar de %u"
 
-#: replication/logical/origin.c:722
-#, fuzzy, c-format
+#: replication/logical/origin.c:706
+#, c-format
 msgid "could not read file \"%s\": read %d of %zu"
-msgstr "no se pudo leer el archivo «%s», leídos %d de %u: %m"
+msgstr "no se pudo leer el archivo «%s»: leídos %d de %zu"
 
-#: replication/logical/origin.c:731
-#, fuzzy, c-format
-msgid "no free replication state could be found, increase max_replication_slots"
-msgstr "los slots de replicación sólo pueden usarse si max_replication_slots > 0"
+#: replication/logical/origin.c:715
+#, c-format
+msgid "could not find free replication state, increase max_replication_slots"
+msgstr "no se pudo encontrar una estructura de replicación libre, incremente max_replication_slots"
 
-#: replication/logical/origin.c:749
-#, fuzzy, c-format
-msgid "replication_slot_checkpoint has wrong checksum %u, expected %u"
-msgstr "el archivo de slot de replicación «%s» tiene número mágico erróneo %u en lugar de %u"
-
-#: replication/logical/origin.c:873
-#, fuzzy, c-format
-msgid "replication origin with oid %d is already active for pid %d"
-msgstr "el slot de replicación «%s» ya está activo"
-
-#: replication/logical/origin.c:884 replication/logical/origin.c:1064
-#, fuzzy, c-format
-msgid "no free replication state slot could be found for replication origin with oid %u"
-msgstr "los slots de replicación sólo pueden usarse si max_replication_slots > 0"
+#: replication/logical/origin.c:733
+#, c-format
+msgid "replication slot checkpoint has wrong checksum %u, expected %u"
+msgstr "el checkpoint del slot de replicación tiene suma de verificación errónea %u, se esperaba %u"
 
-#: replication/logical/origin.c:886 replication/logical/origin.c:1066
-#: replication/slot.c:1241
+#: replication/logical/origin.c:857
+#, c-format
+msgid "replication origin with OID %d is already active for PID %d"
+msgstr "el origen de replicación con OID %d ya está activo para el PID %d"
+
+#: replication/logical/origin.c:868 replication/logical/origin.c:1048
+#, c-format
+msgid "could not find free replication state slot for replication origin with OID %u"
+msgstr "no se pudo encontrar un slot libre para el estado del origen de replicación con OID %u"
+
+#: replication/logical/origin.c:870 replication/logical/origin.c:1050
+#: replication/slot.c:1268
 #, c-format
 msgid "Increase max_replication_slots and try again."
 msgstr "Aumente max_replication_slots y reintente."
 
-#: replication/logical/origin.c:1023
+#: replication/logical/origin.c:1007
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
-msgstr ""
+msgstr "no se puede establecer un destino de replicación cuando ya hay uno definido"
 
-#: replication/logical/origin.c:1052
-#, fuzzy, c-format
-msgid "replication identifier %d is already active for pid %d"
-msgstr "el slot de replicación «%s» ya está activo"
+#: replication/logical/origin.c:1036
+#, c-format
+msgid "replication identifier %d is already active for PID %d"
+msgstr "el identificador de replicación %d ya está activo para el PID %d"
 
-#: replication/logical/origin.c:1098 replication/logical/origin.c:1293
-#: replication/logical/origin.c:1313
+#: replication/logical/origin.c:1082 replication/logical/origin.c:1277
+#: replication/logical/origin.c:1297
 #, c-format
 msgid "no replication origin is configured"
-msgstr ""
+msgstr "no hay un destino de replicación configurado"
 
-#: replication/logical/reorderbuffer.c:2170
+#: replication/logical/reorderbuffer.c:2219
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "no se pudo escribir al archivo de datos para el XID %u: %m"
 
-#: replication/logical/reorderbuffer.c:2266
-#: replication/logical/reorderbuffer.c:2286
+#: replication/logical/reorderbuffer.c:2315
+#: replication/logical/reorderbuffer.c:2335
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "no se pudo leer desde el archivo de desborde de reorderbuffer: %m"
 
-#: replication/logical/reorderbuffer.c:2270
-#: replication/logical/reorderbuffer.c:2290
+#: replication/logical/reorderbuffer.c:2319
+#: replication/logical/reorderbuffer.c:2339
 #, c-format
 msgid "could not read from reorderbuffer spill file: read %d instead of %u bytes"
 msgstr "no se pudo leer desde el archivo de desborde de reorderbuffer: se leyeron sólo %d en ve de %u bytes"
 
 # FIXME almost duplicated again!?
-#: replication/logical/reorderbuffer.c:2894
+#: replication/logical/reorderbuffer.c:2971
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr "no se pudo leer del archivo «%s»: se leyeron %d en lugar de %d bytes"
 
 # FIXME: snapshot? instantánea?
-#: replication/logical/snapbuild.c:600
+#: replication/logical/snapbuild.c:648
 #, c-format
 msgid "exported logical decoding snapshot: \"%s\" with %u transaction ID"
 msgid_plural "exported logical decoding snapshot: \"%s\" with %u transaction IDs"
 msgstr[0] "se exportó un snapshot de decodificación lógica: «%s» con %u ID de transacción"
 msgstr[1] "se exportó un snapshot de decodificación lógica: «%s» con %u IDs de transacción"
 
-#: replication/logical/snapbuild.c:904 replication/logical/snapbuild.c:1269
-#: replication/logical/snapbuild.c:1800
+#: replication/logical/snapbuild.c:1226 replication/logical/snapbuild.c:1316
+#: replication/logical/snapbuild.c:1791
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "la decodificación lógica encontró un punto consistente en %X/%X"
 
-#: replication/logical/snapbuild.c:906
-#, c-format
-msgid "Transaction ID %u finished; no more running transactions."
-msgstr "La transacción de ID %u terminó: no hay más transacciones en ejecución."
-
-#: replication/logical/snapbuild.c:1271
+#: replication/logical/snapbuild.c:1228
 #, c-format
 msgid "There are no running transactions."
 msgstr "No hay transacciones en ejecución."
 
-#: replication/logical/snapbuild.c:1333
+#: replication/logical/snapbuild.c:1269
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr "decodificación lógica encontró punto de inicio en %X/%X"
 
-#: replication/logical/snapbuild.c:1335
+#: replication/logical/snapbuild.c:1271 replication/logical/snapbuild.c:1294
+#, c-format
+msgid "Waiting for transactions (approximately %d) older than %u to end."
+msgstr "Esperando que las (aproximadamente %d) transacciones más antiguas que %u terminen."
+
+#: replication/logical/snapbuild.c:1292
+#, c-format
+msgid "logical decoding found initial consistent point at %X/%X"
+msgstr "la decodificación lógica encontró un punto consistente inicial en %X/%X"
+
+#: replication/logical/snapbuild.c:1318
 #, c-format
-msgid "%u transaction needs to finish."
-msgid_plural "%u transactions need to finish."
-msgstr[0] "%u transacción debe terminar."
-msgstr[1] "%u transacciones deben terminar."
+msgid "There are no old transactions anymore."
+msgstr "Ya no hay transacciones antiguas en ejecución."
 
 # FIXME almost duplicated string
-#: replication/logical/snapbuild.c:1674 replication/logical/snapbuild.c:1700
-#: replication/logical/snapbuild.c:1714 replication/logical/snapbuild.c:1728
+#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:1696
+#: replication/logical/snapbuild.c:1711 replication/logical/snapbuild.c:1725
 #, c-format
 msgid "could not read file \"%s\", read %d of %d: %m"
 msgstr "no se pudo leer el archivo «%s», leídos %d de %d: %m"
 
 # FIXME "snapbuild"?
-#: replication/logical/snapbuild.c:1680
+#: replication/logical/snapbuild.c:1676
 #, c-format
-msgid "snapbuild state file \"%s\" has wrong magic %u instead of %u"
-msgstr "el archivo de estado de snapbuild «%s» tiene número mágico erróneo %u en lugar de %u"
+msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
+msgstr "el archivo de estado de snapbuild «%s» tiene número mágico erróneo: %u en lugar de %u"
 
-#: replication/logical/snapbuild.c:1685
+#: replication/logical/snapbuild.c:1681
 #, c-format
-msgid "snapbuild state file \"%s\" has unsupported version %u instead of %u"
-msgstr "el archivo de estado de snapbuild «%s» tiene versión no soportada %u en vez de %u"
+msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
+msgstr "el archivo de estado de snapbuild «%s» tiene versión no soportada: %u en vez de %u"
 
-# FIXME must quote file name
-#: replication/logical/snapbuild.c:1741
+#: replication/logical/snapbuild.c:1738
 #, c-format
-msgid "snapbuild state file %s: checksum mismatch, is %u, should be %u"
-msgstr "archivo de estado de snapbuild %s: suma de verificación no coincidente %u, debería ser %u"
+msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
+msgstr "suma de verificación no coincidente para el archivo de estado de snapbuild «%s»: es %u, debería ser %u"
 
-#: replication/logical/snapbuild.c:1802
+#: replication/logical/snapbuild.c:1793
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "La decodificación lógica comenzará usando el snapshot guardado."
 
-#: replication/logical/snapbuild.c:1875
+#: replication/logical/snapbuild.c:1864
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "no se pudo interpretar el nombre de archivo «%s»"
@@ -14808,83 +14786,83 @@
 msgid "Free one or increase max_replication_slots."
 msgstr "Libere uno o incremente max_replication_slots."
 
-#: replication/slot.c:348
+#: replication/slot.c:358
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "no existe el slot de replicación «%s»"
 
-#: replication/slot.c:352
-#, fuzzy, c-format
-msgid "replication slot \"%s\" is already active for pid %d"
-msgstr "el slot de replicación «%s» ya está activo"
+#: replication/slot.c:362
+#, c-format
+msgid "replication slot \"%s\" is already active for PID %d"
+msgstr "el slot de replicación «%s» ya está activo para el PID %d"
 
-#: replication/slot.c:501 replication/slot.c:857 replication/slot.c:1202
+#: replication/slot.c:527 replication/slot.c:884 replication/slot.c:1229
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "no se pudo eliminar el directorio «%s»"
 
-#: replication/slot.c:776
+#: replication/slot.c:803
 #, c-format
 msgid "replication slots can only be used if max_replication_slots > 0"
 msgstr "los slots de replicación sólo pueden usarse si max_replication_slots > 0"
 
 # FIXME see logical.c:81
-#: replication/slot.c:781
+#: replication/slot.c:808
 #, c-format
 msgid "replication slots can only be used if wal_level >= archive"
 msgstr "los slots de replicación sólo pueden usarse si wal_level >= archive"
 
-#: replication/slot.c:1134 replication/slot.c:1172
+#: replication/slot.c:1161 replication/slot.c:1199
 #, c-format
 msgid "could not read file \"%s\", read %d of %u: %m"
 msgstr "no se pudo leer el archivo «%s», leídos %d de %u: %m"
 
-#: replication/slot.c:1143
+#: replication/slot.c:1170
 #, c-format
-msgid "replication slot file \"%s\" has wrong magic %u instead of %u"
-msgstr "el archivo de slot de replicación «%s» tiene número mágico erróneo %u en lugar de %u"
+msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
+msgstr "el archivo de slot de replicación «%s» tiene número mágico erróneo: %u en lugar de %u"
 
-#: replication/slot.c:1150
+#: replication/slot.c:1177
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "el archivo de slot de replicación «%s» tiene versión no soportada %u"
 
-#: replication/slot.c:1157
+#: replication/slot.c:1184
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "el archivo de slot de replicación «%s» tiene largo corrupto %u"
 
-#: replication/slot.c:1187
+#: replication/slot.c:1214
 #, c-format
-msgid "replication slot file %s: checksum mismatch, is %u, should be %u"
-msgstr "archivo de slot de replicación %s: suma de control no coincidente, es %u, debería ser %u"
+msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
+msgstr "suma de verificación no coincidenete en archivo de slot de replicación «%s»: es %u, debería ser %u"
 
-#: replication/slot.c:1240
+#: replication/slot.c:1267
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "demasiados slots de replicacion activos antes del apagado"
 
-#: replication/syncrep.c:199
+#: replication/syncrep.c:191
 #, c-format
 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"
 
-#: replication/syncrep.c:200 replication/syncrep.c:217
+#: replication/syncrep.c:192 replication/syncrep.c:209
 #, c-format
 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."
 
-#: replication/syncrep.c:216
+#: replication/syncrep.c:208
 #, c-format
 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"
 
-#: replication/syncrep.c:346
+#: replication/syncrep.c:338
 #, c-format
 msgid "standby \"%s\" now has synchronous standby priority %u"
 msgstr "el standby «%s» ahora tiene prioridad sincrónica %u"
 
-#: replication/syncrep.c:480
+#: replication/syncrep.c:472
 #, c-format
 msgid "standby \"%s\" is now the synchronous standby with priority %u"
 msgstr "el standby «%s» es ahora el standby sincrónico con prioridad %u"
@@ -14949,77 +14927,77 @@
 msgid "could not write to log segment %s at offset %u, length %lu: %m"
 msgstr "no se pudo escribir al segmento de log %s en la posición %u, largo %lu: %m"
 
-#: replication/walsender.c:469
+#: replication/walsender.c:483
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
 msgstr "no se pudo posicionar (seek) al comienzo del archivo «%s»: %m"
 
-#: replication/walsender.c:520
+#: replication/walsender.c:534
 #, c-format
 msgid "cannot use a logical replication slot for physical replication"
 msgstr "no se puede usar un slot de replicación lógica para replicación física"
 
-#: replication/walsender.c:583
+#: replication/walsender.c:597
 #, c-format
 msgid "requested starting point %X/%X on timeline %u is not in this server's history"
 msgstr "el punto de inicio solicitado %X/%X del timeline %u no está en la historia de este servidor"
 
-#: replication/walsender.c:587
+#: replication/walsender.c:601
 #, c-format
 msgid "This server's history forked from timeline %u at %X/%X."
 msgstr "La historia de este servidor bifurcó desde el timeline %u en %X/%X."
 
-#: replication/walsender.c:632
+#: replication/walsender.c:646
 #, c-format
 msgid "requested starting point %X/%X is ahead of the WAL flush position of this server %X/%X"
 msgstr "el punto de inicio solicitado %X/%X está más adelante que la posición de sincronización (flush) de WAL de este servidor %X/%X"
 
-#: replication/walsender.c:948
+#: replication/walsender.c:964
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "terminando el proceso walsender luego de la promoción"
 
-#: replication/walsender.c:1275
-#, fuzzy, c-format
+#: replication/walsender.c:1291
+#, c-format
 msgid "received replication command: %s"
-msgstr "La orden fallida era: «%s»"
+msgstr "se recibió orden de replicación: %s"
 
-#: replication/walsender.c:1368 replication/walsender.c:1384
+#: replication/walsender.c:1392 replication/walsender.c:1408
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "se encontró fin de archivo inesperado en la conexión standby"
 
-#: replication/walsender.c:1398
+#: replication/walsender.c:1422
 #, c-format
 msgid "unexpected standby message type \"%c\", after receiving CopyDone"
 msgstr "mensaje de standby de tipo «%c» inesperado, después de recibir CopyDone"
 
-#: replication/walsender.c:1436
+#: replication/walsender.c:1460
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "el tipo «%c» de mensaje del standby no es válido"
 
-#: replication/walsender.c:1477
+#: replication/walsender.c:1501
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "mensaje de tipo «%c» inesperado"
 
-#: replication/walsender.c:1764
+#: replication/walsender.c:1788
 #, c-format
 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"
 
-#: replication/walsender.c:1857
+#: replication/walsender.c:1873
 #, c-format
 msgid "standby \"%s\" has now caught up with primary"
 msgstr "el standby «%s» ahora está actualizado respecto del primario"
 
-#: replication/walsender.c:1958
+#: replication/walsender.c:1977
 #, c-format
 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)"
 
-#: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:961
+#: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:973
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" already exists"
 msgstr "ya existe una regla llamada «%s» para la relación «%s»"
@@ -15110,14 +15088,14 @@
 msgstr "no se pudo convertir la tabla «%s» en vista porque tiene tablas hijas"
 
 #: rewrite/rewriteDefine.c:459
-#, fuzzy, c-format
+#, c-format
 msgid "could not convert table \"%s\" to a view because it has row security enabled"
-msgstr "no se pudo convertir la tabla «%s» en vista porque tiene tablas hijas"
+msgstr "no se pudo convertir la tabla «%s» en vista porque tiene seguridad de registros activada"
 
 #: rewrite/rewriteDefine.c:465
-#, fuzzy, c-format
+#, c-format
 msgid "could not convert table \"%s\" to a view because it has row security policies"
-msgstr "no se pudo convertir la tabla «%s» en vista porque tiene tablas hijas"
+msgstr "no se pudo convertir la tabla «%s» en vista porque tiene políticas de seguridad de registros"
 
 #: rewrite/rewriteDefine.c:492
 #, c-format
@@ -15144,68 +15122,73 @@
 msgid "RETURNING list has too many entries"
 msgstr "la lista de RETURNING tiene demasiadas entradas"
 
-#: rewrite/rewriteDefine.c:684
+#: rewrite/rewriteDefine.c:695
 #, c-format
 msgid "cannot convert relation containing dropped columns to view"
 msgstr "no se puede convertir en vista una relación que contiene columnas eliminadas"
 
-#: rewrite/rewriteDefine.c:690
+#: rewrite/rewriteDefine.c:696
+#, c-format
+msgid "cannot create a RETURNING list for a relation containing dropped columns"
+msgstr "no se puede crear una lista RETURNING para una relación que contiene columnas eliminadas"
+
+#: rewrite/rewriteDefine.c:702
 #, c-format
 msgid "SELECT rule's target entry %d has different column name from column \"%s\""
 msgstr "la entrada de destino %d de la regla de SELECT tiene un nombre de columna diferente de «%s»"
 
-#: rewrite/rewriteDefine.c:692
+#: rewrite/rewriteDefine.c:704
 #, c-format
 msgid "SELECT target entry is named \"%s\"."
 msgstr "La entrada de destino de SELECT tiene nombre «%s»."
 
-#: rewrite/rewriteDefine.c:701
+#: rewrite/rewriteDefine.c:713
 #, 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»"
 
-#: rewrite/rewriteDefine.c:703
+#: rewrite/rewriteDefine.c:715
 #, 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»"
 
-#: rewrite/rewriteDefine.c:706 rewrite/rewriteDefine.c:730
+#: rewrite/rewriteDefine.c:718 rewrite/rewriteDefine.c:742
 #, c-format
 msgid "SELECT target entry has type %s, but column has type %s."
 msgstr "La entrada de destino de SELECT tiene un tipo «%s», pero la columna tiene tipo «%s»."
 
-#: rewrite/rewriteDefine.c:709 rewrite/rewriteDefine.c:734
+#: rewrite/rewriteDefine.c:721 rewrite/rewriteDefine.c:746
 #, c-format
 msgid "RETURNING list entry has type %s, but column has type %s."
 msgstr "una entrada de la lista RETURNING tiene tipo %s, pero la columna tiene tipo %s."
 
-#: rewrite/rewriteDefine.c:725
+#: rewrite/rewriteDefine.c:737
 #, 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»"
 
-#: rewrite/rewriteDefine.c:727
+#: rewrite/rewriteDefine.c:739
 #, 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»"
 
-#: rewrite/rewriteDefine.c:744
+#: rewrite/rewriteDefine.c:756
 #, c-format
 msgid "SELECT rule's target list has too few entries"
 msgstr "la lista de destinos de regla de SELECT tiene muy pocas entradas"
 
-#: rewrite/rewriteDefine.c:745
+#: rewrite/rewriteDefine.c:757
 #, c-format
 msgid "RETURNING list has too few entries"
 msgstr "la lista de RETURNING tiene muy pocas entradas"
 
-#: rewrite/rewriteDefine.c:837 rewrite/rewriteDefine.c:952
+#: rewrite/rewriteDefine.c:849 rewrite/rewriteDefine.c:964
 #: rewrite/rewriteSupport.c:112
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" does not exist"
 msgstr "no existe la regla «%s» para la relación «%s»"
 
-#: rewrite/rewriteDefine.c:971
+#: rewrite/rewriteDefine.c:983
 #, c-format
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "no se permite cambiar el nombre de una regla ON SELECT"
@@ -15225,167 +15208,166 @@
 msgid "multiple assignments to same column \"%s\""
 msgstr "hay múltiples asignaciones a la misma columna «%s»"
 
-#: rewrite/rewriteHandler.c:1714 rewrite/rewriteHandler.c:3307
+#: rewrite/rewriteHandler.c:1714 rewrite/rewriteHandler.c:3324
 #, 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»"
 
 #: rewrite/rewriteHandler.c:1799
-#, fuzzy, c-format
+#, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
-msgstr "se detectó recursión infinita en las reglas de la relación «%s»"
+msgstr "se detectó recursión infinita en la política para la relación «%s»"
 
-#: rewrite/rewriteHandler.c:2113
+#: rewrite/rewriteHandler.c:2116
 msgid "Junk view columns are not updatable."
 msgstr "Las columnas «basura» de vistas no son actualizables."
 
-#: rewrite/rewriteHandler.c:2118
+#: rewrite/rewriteHandler.c:2121
 msgid "View columns that are not columns of their base relation are not updatable."
 msgstr "Las columnas de vistas que no son columnas de su relación base no son actualizables."
 
-#: rewrite/rewriteHandler.c:2121
+#: rewrite/rewriteHandler.c:2124
 msgid "View columns that refer to system columns are not updatable."
 msgstr "Las columnas de vistas que se refieren a columnas de sistema no son actualizables."
 
-#: rewrite/rewriteHandler.c:2124
+#: rewrite/rewriteHandler.c:2127
 msgid "View columns that return whole-row references are not updatable."
 msgstr "Las columnas de vistas que retornan referencias a la fila completa no son actualizables."
 
 # XXX a %s here would be nice ...
-#: rewrite/rewriteHandler.c:2182
+#: rewrite/rewriteHandler.c:2185
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "Las vistas que contienen DISTINCT no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2185
+#: rewrite/rewriteHandler.c:2188
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "Las vistas que contienen GROUP BY no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2188
+#: rewrite/rewriteHandler.c:2191
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "Las vistas que contienen HAVING no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2191
+#: rewrite/rewriteHandler.c:2194
 msgid "Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable."
 msgstr "Las vistas que contienen UNION, INTERSECT o EXCEPT no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2194
+#: rewrite/rewriteHandler.c:2197
 msgid "Views containing WITH are not automatically updatable."
 msgstr "Las vistas que contienen WITH no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2197
+#: rewrite/rewriteHandler.c:2200
 msgid "Views containing LIMIT or OFFSET are not automatically updatable."
 msgstr "Las vistas que contienen LIMIT u OFFSET no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2209
+#: rewrite/rewriteHandler.c:2212
 msgid "Views that return aggregate functions are not automatically updatable."
 msgstr "Las vistas que retornan funciones de agregación no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2212
+#: rewrite/rewriteHandler.c:2215
 msgid "Views that return window functions are not automatically updatable."
 msgstr "Las vistas que retornan funciones ventana no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2215
+#: rewrite/rewriteHandler.c:2218
 msgid "Views that return set-returning functions are not automatically updatable."
 msgstr "Las vistas que retornan funciones-que-retornan-conjuntos no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2222 rewrite/rewriteHandler.c:2226
-#: rewrite/rewriteHandler.c:2233
+#: rewrite/rewriteHandler.c:2225 rewrite/rewriteHandler.c:2229
+#: rewrite/rewriteHandler.c:2236
 msgid "Views that do not select from a single table or view are not automatically updatable."
 msgstr "Las vistas que no extraen desde una única tabla o vista no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2236
-#, fuzzy
+#: rewrite/rewriteHandler.c:2239
 msgid "Views containing TABLESAMPLE are not automatically updatable."
-msgstr "Las vistas que contienen WITH no son automáticamente actualizables."
+msgstr "Las vistas que contienen TABLESAMPLE no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2260
+#: rewrite/rewriteHandler.c:2263
 msgid "Views that have no updatable columns are not automatically updatable."
 msgstr "Las vistas que no tienen columnas actualizables no son automáticamente actualizables."
 
-#: rewrite/rewriteHandler.c:2707
+#: rewrite/rewriteHandler.c:2717
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
 msgstr "no se puede insertar en la columna «%s» de la vista «%s»"
 
-#: rewrite/rewriteHandler.c:2715
+#: rewrite/rewriteHandler.c:2725
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "no se puede actualizar la columna «%s» vista «%s»"
 
-#: rewrite/rewriteHandler.c:3106
+#: rewrite/rewriteHandler.c:3123
 #, c-format
 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"
 
-#: rewrite/rewriteHandler.c:3120
+#: rewrite/rewriteHandler.c:3137
 #, c-format
 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"
 
-#: rewrite/rewriteHandler.c:3124
+#: rewrite/rewriteHandler.c:3141
 #, c-format
 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:3129
+#: rewrite/rewriteHandler.c:3146
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "las reglas DO INSTEAD de múltiples sentencias no están soportadas para sentencias que modifiquen datos en WITH"
 
-#: rewrite/rewriteHandler.c:3344
+#: rewrite/rewriteHandler.c:3361
 #, 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:3346
+#: rewrite/rewriteHandler.c:3363
 #, c-format
 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."
 
-#: rewrite/rewriteHandler.c:3351
+#: rewrite/rewriteHandler.c:3368
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "no se puede hacer UPDATE RETURNING a la relación «%s»"
 
-#: rewrite/rewriteHandler.c:3353
+#: rewrite/rewriteHandler.c:3370
 #, c-format
 msgid "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr "Necesita un regla incondicional ON UPDATE DO INSTEAD con una cláusula RETURNING."
 
-#: rewrite/rewriteHandler.c:3358
+#: rewrite/rewriteHandler.c:3375
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "no se puede hacer DELETE RETURNING a la relación «%s»"
 
-#: rewrite/rewriteHandler.c:3360
+#: rewrite/rewriteHandler.c:3377
 #, c-format
 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."
 
-#: rewrite/rewriteHandler.c:3378
+#: rewrite/rewriteHandler.c:3395
 #, c-format
 msgid "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or UPDATE rules"
-msgstr ""
+msgstr "INSERT con una cláusula ON CONFLICT no puede usarse con una tabla que tiene reglas INSERT o UPDATE"
 
-#: rewrite/rewriteHandler.c:3435
+#: rewrite/rewriteHandler.c:3452
 #, c-format
 msgid "WITH cannot be used in a query that is rewritten by rules into multiple queries"
 msgstr "WITH no puede ser usado en una consulta que está siendo convertida en múltiples consultas a través de reglas"
 
-#: rewrite/rewriteManip.c:1006
+#: rewrite/rewriteManip.c:1003
 #, c-format
 msgid "conditional utility statements are not implemented"
 msgstr "las sentencias condicionales de utilidad no están implementadas"
 
-#: rewrite/rewriteManip.c:1172
+#: rewrite/rewriteManip.c:1169
 #, c-format
 msgid "WHERE CURRENT OF on a view is not implemented"
 msgstr "WHERE CURRENT OF no está implementado en una vista"
 
-#: rewrite/rewriteManip.c:1437
+#: rewrite/rewriteManip.c:1434
 #, c-format
 msgid "NEW variables in ON UPDATE rules cannot reference columns that are part of a multiple assignment in the subject UPDATE command"
-msgstr ""
+msgstr "las variables NEW en reglas ON UPDATE no pueden referenciar columnas que son parte de una asignación múltiple en la orden UPDATE"
 
 #: rewrite/rewriteSupport.c:154
 #, c-format
@@ -15448,17 +15430,17 @@
 msgid "invalid page in block %u of relation %s; zeroing out page"
 msgstr "la página no es válida en el bloque %u de la relación «%s»; reinicializando la página"
 
-#: storage/buffer/bufmgr.c:3569
+#: storage/buffer/bufmgr.c:3595
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "no se pudo escribir el bloque %u de %s"
 
-#: storage/buffer/bufmgr.c:3571
+#: storage/buffer/bufmgr.c:3597
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Múltiples fallas --- el error de escritura puede ser permanente."
 
-#: storage/buffer/bufmgr.c:3592 storage/buffer/bufmgr.c:3611
+#: storage/buffer/bufmgr.c:3618 storage/buffer/bufmgr.c:3637
 #, c-format
 msgid "writing block %u of relation %s"
 msgstr "escribiendo el bloque %u de la relación %s"
@@ -15468,53 +15450,58 @@
 msgid "no empty local buffer available"
 msgstr "no hay ningún búfer local disponible"
 
-#: storage/file/fd.c:528
+#: storage/file/fd.c:548
+#, c-format
+msgid "could not link file \"%s\" to \"%s\": %m"
+msgstr "no se pudo enlazar (link) el archivo «%s» a «%s»: %m"
+
+#: storage/file/fd.c:642
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "getrlimit falló: %m"
 
-#: storage/file/fd.c:618
+#: storage/file/fd.c:732
 #, c-format
 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:619
+#: storage/file/fd.c:733
 #, 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:660 storage/file/fd.c:1694 storage/file/fd.c:1787
-#: storage/file/fd.c:1935
+#: storage/file/fd.c:774 storage/file/fd.c:1878 storage/file/fd.c:1971
+#: storage/file/fd.c:2119
 #, 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:1234
+#: storage/file/fd.c:1379
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "archivo temporal: ruta «%s», tamaño %lu"
 
-#: storage/file/fd.c:1383
+#: storage/file/fd.c:1551
 #, c-format
 msgid "temporary file size exceeds temp_file_limit (%dkB)"
 msgstr "el tamaño del archivo temporal excede temp_file_limit permitido (%dkB)"
 
-#: storage/file/fd.c:1670 storage/file/fd.c:1720
+#: storage/file/fd.c:1854 storage/file/fd.c:1904
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
 msgstr "se excedió maxAllocatedDescs (%d) mientras se trataba de abrir el archivo «%s»"
 
-#: storage/file/fd.c:1760
+#: storage/file/fd.c:1944
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
 msgstr "se excedió maxAllocatedDescs (%d) mientras se trataba de ejecutar la orden «%s»"
 
-#: storage/file/fd.c:1911
+#: storage/file/fd.c:2095
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
 msgstr "se excedió maxAllocatedDescs (%d) mientras se trataba de abrir el directorio «%s»"
 
-#: storage/file/fd.c:1997
+#: storage/file/fd.c:2181
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
@@ -15546,37 +15533,37 @@
 
 #: storage/ipc/dsm_impl.c:261 storage/ipc/dsm_impl.c:361
 #: storage/ipc/dsm_impl.c:533 storage/ipc/dsm_impl.c:648
-#: storage/ipc/dsm_impl.c:811 storage/ipc/dsm_impl.c:953
+#: storage/ipc/dsm_impl.c:819 storage/ipc/dsm_impl.c:961
 #, c-format
 msgid "could not unmap shared memory segment \"%s\": %m"
 msgstr "no se pudo desmapear el segmento de memoria compartida «%s»: %m"
 
 #: storage/ipc/dsm_impl.c:271 storage/ipc/dsm_impl.c:543
-#: storage/ipc/dsm_impl.c:658 storage/ipc/dsm_impl.c:821
+#: storage/ipc/dsm_impl.c:658 storage/ipc/dsm_impl.c:829
 #, c-format
 msgid "could not remove shared memory segment \"%s\": %m"
 msgstr "no se pudo eliminar el segmento de memoria compartida «%s»: %m"
 
-#: storage/ipc/dsm_impl.c:292 storage/ipc/dsm_impl.c:721
-#: storage/ipc/dsm_impl.c:835
+#: storage/ipc/dsm_impl.c:292 storage/ipc/dsm_impl.c:729
+#: storage/ipc/dsm_impl.c:843
 #, c-format
 msgid "could not open shared memory segment \"%s\": %m"
 msgstr "no se pudo abrir el segmento de memoria compartida «%s»: %m"
 
 #: storage/ipc/dsm_impl.c:316 storage/ipc/dsm_impl.c:559
-#: storage/ipc/dsm_impl.c:766 storage/ipc/dsm_impl.c:859
+#: storage/ipc/dsm_impl.c:774 storage/ipc/dsm_impl.c:867
 #, c-format
 msgid "could not stat shared memory segment \"%s\": %m"
 msgstr "no se pudo hacer stat del segmento de memoria compartida «%s»: %m"
 
-#: storage/ipc/dsm_impl.c:335 storage/ipc/dsm_impl.c:878
-#: storage/ipc/dsm_impl.c:926
+#: storage/ipc/dsm_impl.c:335 storage/ipc/dsm_impl.c:886
+#: storage/ipc/dsm_impl.c:934
 #, c-format
 msgid "could not resize shared memory segment \"%s\" to %zu bytes: %m"
 msgstr "no se pudo redimensionar el segmento de memoria compartida «%s» a %zu bytes: %m"
 
 #: storage/ipc/dsm_impl.c:385 storage/ipc/dsm_impl.c:580
-#: storage/ipc/dsm_impl.c:742 storage/ipc/dsm_impl.c:977
+#: storage/ipc/dsm_impl.c:750 storage/ipc/dsm_impl.c:985
 #, c-format
 msgid "could not map shared memory segment \"%s\": %m"
 msgstr "no se pudo mapear el segmento de memoria compartida «%s»: %m"
@@ -15586,12 +15573,12 @@
 msgid "could not get shared memory segment: %m"
 msgstr "no se pudo obtener el segmento de memoria compartida: %m"
 
-#: storage/ipc/dsm_impl.c:694
+#: storage/ipc/dsm_impl.c:714
 #, c-format
 msgid "could not create shared memory segment \"%s\": %m"
 msgstr "no se pudo crear el segmento de memoria compartida «%s»: %m"
 
-#: storage/ipc/dsm_impl.c:1018
+#: storage/ipc/dsm_impl.c:1026
 #, c-format
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "no se pudo duplicar el «handle» para «%s»: %m"
@@ -15600,7 +15587,7 @@
 #: storage/lmgr/lock.c:867 storage/lmgr/lock.c:901 storage/lmgr/lock.c:2598
 #: storage/lmgr/lock.c:3714 storage/lmgr/lock.c:3779 storage/lmgr/lock.c:4069
 #: storage/lmgr/predicate.c:2328 storage/lmgr/predicate.c:2343
-#: storage/lmgr/predicate.c:3736 storage/lmgr/predicate.c:4879
+#: storage/lmgr/predicate.c:3735 storage/lmgr/predicate.c:4878
 #: storage/lmgr/proc.c:200 utils/hash/dynahash.c:998
 #, c-format
 msgid "out of shared memory"
@@ -15626,12 +15613,12 @@
 msgid "requested shared memory size overflows size_t"
 msgstr "la petición de tamaño de memoria compartida desborda size_t"
 
-#: storage/ipc/standby.c:500 tcop/postgres.c:2974
+#: storage/ipc/standby.c:502 tcop/postgres.c:2989
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "cancelando la sentencia debido a un conflicto con la recuperación"
 
-#: storage/ipc/standby.c:501 tcop/postgres.c:2274
+#: storage/ipc/standby.c:503 tcop/postgres.c:2274
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "La transacción del usuario causó un «deadlock» con la recuperación."
@@ -15747,9 +15734,9 @@
 msgstr "transacción virtual %d/%u"
 
 #: storage/lmgr/lmgr.c:963
-#, fuzzy, c-format
+#, c-format
 msgid "speculative token %u of transaction %u"
-msgstr "no se pudo encontrar el estado de la transacción %u"
+msgstr "token especulativo %u de la transacción %u"
 
 #: storage/lmgr/lmgr.c:969
 #, c-format
@@ -15793,16 +15780,6 @@
 msgid "cannot PREPARE while holding both session-level and transaction-level locks on the same object"
 msgstr "no se puede hacer PREPARE mientras se mantienen candados a nivel de sesión y transacción simultáneamente sobre el mismo objeto"
 
-#: storage/lmgr/lwlock.c:190
-#, c-format
-msgid "%d: %s(%s %d): excl %u shared %u haswaiters %u waiters %u rOK %d"
-msgstr ""
-
-#: storage/lmgr/lwlock.c:210
-#, fuzzy, c-format
-msgid "%s(%s %d): %s"
-msgstr "%s %s%s%s: %s"
-
 #: storage/lmgr/predicate.c:675
 #, c-format
 msgid "not enough elements in RWConflictPool to record a read/write conflict"
@@ -15853,37 +15830,37 @@
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr "una transacción que importa un snapshot no debe ser READ ONLY DEFERRABLE"
 
-#: storage/lmgr/predicate.c:1705 utils/time/snapmgr.c:431
-#: utils/time/snapmgr.c:437
+#: storage/lmgr/predicate.c:1705 utils/time/snapmgr.c:472
+#: utils/time/snapmgr.c:478
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "no se pudo importar el snapshot solicitado"
 
-#: storage/lmgr/predicate.c:1706 utils/time/snapmgr.c:438
+#: storage/lmgr/predicate.c:1706 utils/time/snapmgr.c:479
 #, c-format
 msgid "The source transaction %u is not running anymore."
 msgstr "La transacción de origen %u ya no está en ejecución."
 
 #: storage/lmgr/predicate.c:2329 storage/lmgr/predicate.c:2344
-#: storage/lmgr/predicate.c:3737
+#: storage/lmgr/predicate.c:3736
 #, c-format
 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:3891 storage/lmgr/predicate.c:3980
-#: storage/lmgr/predicate.c:3988 storage/lmgr/predicate.c:4027
-#: storage/lmgr/predicate.c:4266 storage/lmgr/predicate.c:4603
-#: storage/lmgr/predicate.c:4615 storage/lmgr/predicate.c:4657
-#: storage/lmgr/predicate.c:4695
+#: storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:3979
+#: storage/lmgr/predicate.c:3987 storage/lmgr/predicate.c:4026
+#: storage/lmgr/predicate.c:4265 storage/lmgr/predicate.c:4602
+#: storage/lmgr/predicate.c:4614 storage/lmgr/predicate.c:4656
+#: storage/lmgr/predicate.c:4694
 #, c-format
 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:3893 storage/lmgr/predicate.c:3982
-#: storage/lmgr/predicate.c:3990 storage/lmgr/predicate.c:4029
-#: storage/lmgr/predicate.c:4268 storage/lmgr/predicate.c:4605
-#: storage/lmgr/predicate.c:4617 storage/lmgr/predicate.c:4659
-#: storage/lmgr/predicate.c:4697
+#: storage/lmgr/predicate.c:3892 storage/lmgr/predicate.c:3981
+#: storage/lmgr/predicate.c:3989 storage/lmgr/predicate.c:4028
+#: storage/lmgr/predicate.c:4267 storage/lmgr/predicate.c:4604
+#: storage/lmgr/predicate.c:4616 storage/lmgr/predicate.c:4658
+#: storage/lmgr/predicate.c:4696
 #, c-format
 msgid "The transaction might succeed if retried."
 msgstr "La transacción podría tener éxito si es reintentada."
@@ -15933,33 +15910,33 @@
 msgid "page verification failed, calculated checksum %u but expected %u"
 msgstr "la suma de verificación falló, se calculó %u pero se esperaba %u"
 
-#: storage/page/bufpage.c:200 storage/page/bufpage.c:490
-#: storage/page/bufpage.c:705 storage/page/bufpage.c:836
-#: storage/page/bufpage.c:936
+#: storage/page/bufpage.c:203 storage/page/bufpage.c:522
+#: storage/page/bufpage.c:737 storage/page/bufpage.c:868
+#: storage/page/bufpage.c:968
 #, c-format
 msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr "los punteros de página están corruptos: inferior = %u, superior = %u, especial = %u"
 
-#: storage/page/bufpage.c:534
+#: storage/page/bufpage.c:566
 #, c-format
 msgid "corrupted item pointer: %u"
 msgstr "el puntero de item está corrupto: %u"
 
-#: storage/page/bufpage.c:545 storage/page/bufpage.c:887
-#: storage/page/bufpage.c:1042
+#: storage/page/bufpage.c:577 storage/page/bufpage.c:919
+#: storage/page/bufpage.c:1074
 #, c-format
 msgid "corrupted item lengths: total %u, available space %u"
 msgstr "los largos de ítem están corruptos: total %u, espacio disponible %u"
 
-#: storage/page/bufpage.c:724 storage/page/bufpage.c:860
+#: storage/page/bufpage.c:756 storage/page/bufpage.c:892
 #, c-format
 msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr "el puntero de ítem está corrupto: posición = %u, tamaño = %u"
 
-#: storage/page/bufpage.c:965
-#, fuzzy, c-format
+#: storage/page/bufpage.c:997
+#, c-format
 msgid "corrupted item pointer: offset = %u, length = %u"
-msgstr "el puntero de ítem está corrupto: posición = %u, tamaño = %u"
+msgstr "el puntero de ítem está corrupto: posición = %u, largo = %u"
 
 #: storage/smgr/md.c:442 storage/smgr/md.c:913
 #, c-format
@@ -16016,65 +15993,65 @@
 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:938
+#: storage/smgr/md.c:939
 #, 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:1218
+#: storage/smgr/md.c:1219
 #, 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:1381
+#: storage/smgr/md.c:1382
 #, c-format
 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:1776
+#: storage/smgr/md.c:1777
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
 msgstr "no se pudo abrir el archivo «%s» (bloque buscado %u): %m"
 
-#: tcop/fastpath.c:111 tcop/fastpath.c:475 tcop/fastpath.c:605
+#: tcop/fastpath.c:111 tcop/fastpath.c:463 tcop/fastpath.c:593
 #, 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:291 tcop/postgres.c:1003 tcop/postgres.c:1313
+#: tcop/fastpath.c:281 tcop/postgres.c:1003 tcop/postgres.c:1313
 #: tcop/postgres.c:1571 tcop/postgres.c:1975 tcop/postgres.c:2342
 #: tcop/postgres.c:2417
 #, c-format
 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:319
+#: tcop/fastpath.c:309
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "llamada a función fastpath: «%s» (OID %u)"
 
-#: tcop/fastpath.c:401 tcop/postgres.c:1173 tcop/postgres.c:1438
+#: tcop/fastpath.c:391 tcop/postgres.c:1173 tcop/postgres.c:1438
 #: tcop/postgres.c:1816 tcop/postgres.c:2033
 #, c-format
 msgid "duration: %s ms"
 msgstr "duración: %s ms"
 
-#: tcop/fastpath.c:405
+#: tcop/fastpath.c:395
 #, 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:443 tcop/fastpath.c:570
+#: tcop/fastpath.c:431 tcop/fastpath.c:558
 #, 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:451
+#: tcop/fastpath.c:439
 #, 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:538 tcop/fastpath.c:621
+#: tcop/fastpath.c:526 tcop/fastpath.c:609
 #, 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"
@@ -16085,7 +16062,7 @@
 msgstr "se encontró fin de archivo inesperado en la conexión del cliente"
 
 #: tcop/postgres.c:449 tcop/postgres.c:461 tcop/postgres.c:472
-#: tcop/postgres.c:484 tcop/postgres.c:4268
+#: tcop/postgres.c:484 tcop/postgres.c:4277
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "el tipo de mensaje de frontend %d no es válido"
@@ -16258,87 +16235,87 @@
 msgid "connection to client lost"
 msgstr "se ha perdido la conexión al cliente"
 
-#: tcop/postgres.c:2951
+#: tcop/postgres.c:2966
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "cancelando la sentencia debido a que se agotó el tiempo de espera de candados (locks)"
 
-#: tcop/postgres.c:2958
+#: tcop/postgres.c:2973
 #, c-format
 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:2965
+#: tcop/postgres.c:2980
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "cancelando tarea de autovacuum"
 
-#: tcop/postgres.c:2988
+#: tcop/postgres.c:3003
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "cancelando la sentencia debido a una petición del usuario"
 
-#: tcop/postgres.c:3098
+#: tcop/postgres.c:3113
 #, c-format
 msgid "stack depth limit exceeded"
 msgstr "límite de profundidad de stack alcanzado"
 
-#: tcop/postgres.c:3099
+#: tcop/postgres.c:3114
 #, c-format
 msgid "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» (actualmente %dkB), después de asegurarse que el límite de profundidad de stack de la plataforma es adecuado."
 
-#: tcop/postgres.c:3162
+#: tcop/postgres.c:3177
 #, c-format
 msgid "\"max_stack_depth\" must not exceed %ldkB."
 msgstr "«max_stack_depth» no debe exceder %ldkB."
 
-#: tcop/postgres.c:3164
+#: tcop/postgres.c:3179
 #, c-format
 msgid "Increase the platform's stack depth limit via \"ulimit -s\" or local equivalent."
 msgstr "Incremente el límite de profundidad del stack del sistema usando «ulimit -s» o el equivalente de su sistema."
 
-#: tcop/postgres.c:3524
+#: tcop/postgres.c:3539
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "argumentos de línea de órdenes no válidos para proceso servidor: %s"
 
-#: tcop/postgres.c:3525 tcop/postgres.c:3531
+#: tcop/postgres.c:3540 tcop/postgres.c:3546
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: tcop/postgres.c:3529
+#: tcop/postgres.c:3544
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: argumento de línea de órdenes no válido: %s"
 
-#: tcop/postgres.c:3590
+#: tcop/postgres.c:3605
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: no se ha especificado base de datos ni usuario"
 
-#: tcop/postgres.c:4176
+#: tcop/postgres.c:4185
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "subtipo %d de mensaje CLOSE no válido"
 
-#: tcop/postgres.c:4211
+#: tcop/postgres.c:4220
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "subtipo %d de mensaje DESCRIBE no válido"
 
-#: tcop/postgres.c:4289
+#: tcop/postgres.c:4298
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr "la invocación «fastpath» de funciones no está soportada en conexiones de replicación"
 
-#: tcop/postgres.c:4293
+#: tcop/postgres.c:4302
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr "el protocolo extendido de consultas no está soportado en conexiones de replicación"
 
-#: tcop/postgres.c:4463
+#: tcop/postgres.c:4472
 #, c-format
 msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
 msgstr "desconexión: duración de sesión: %d:%02d:%02d.%03d usuario=%s base=%s host=%s%s%s"
@@ -16366,9 +16343,9 @@
 
 #. translator: %s is name of a SQL command, eg CREATE
 #: tcop/utility.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "cannot execute %s during a parallel operation"
-msgstr "no se puede ejecutar %s durante la recuperación"
+msgstr "no se puede ejecutar %s durante una operación paralela"
 
 #. translator: %s is name of a SQL command, eg CREATE
 #: tcop/utility.c:270
@@ -16510,38 +16487,38 @@
 msgid "missing Dictionary parameter"
 msgstr "falta un paramétro Dictionary"
 
-#: tsearch/spell.c:276
+#: tsearch/spell.c:289
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de diccionario «%s»: %m"
 
-#: tsearch/spell.c:439 utils/adt/regexp.c:204
+#: tsearch/spell.c:452 utils/adt/regexp.c:204
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "la expresión regular no es válida: %s"
 
-#: tsearch/spell.c:518 tsearch/spell.c:535 tsearch/spell.c:552
-#: tsearch/spell.c:569 tsearch/spell.c:591 gram.y:14239 gram.y:14256
+#: tsearch/spell.c:667 tsearch/spell.c:684 tsearch/spell.c:701
+#: tsearch/spell.c:718 tsearch/spell.c:740 gram.y:14257 gram.y:14274
 #, c-format
 msgid "syntax error"
 msgstr "error de sintaxis"
 
-#: tsearch/spell.c:596
+#: tsearch/spell.c:745
 #, c-format
 msgid "multibyte flag character is not allowed"
 msgstr "los caracteres bandera multibyte no están permitidos"
 
-#: tsearch/spell.c:632 tsearch/spell.c:690 tsearch/spell.c:787
+#: tsearch/spell.c:779 tsearch/spell.c:835 tsearch/spell.c:937
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de afijos «%s»: %m"
 
-#: tsearch/spell.c:678
+#: tsearch/spell.c:825
 #, c-format
 msgid "Ispell dictionary supports only default flag value"
 msgstr "el diccionario Ispell sólo permite el valor de bandera «default»"
 
-#: tsearch/spell.c:901
+#: tsearch/spell.c:1050
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "el archivo de «affix» contiene órdenes en estilos antiguo y nuevo"
@@ -16588,27 +16565,27 @@
 msgid "text search parser does not support headline creation"
 msgstr "el analizador de búsqueda en texto no soporta creación de encabezados (headline)"
 
-#: tsearch/wparser_def.c:2557
+#: tsearch/wparser_def.c:2559
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
 msgstr "parámetro de encabezado (headline) no reconocido: «%s»"
 
-#: tsearch/wparser_def.c:2566
+#: tsearch/wparser_def.c:2568
 #, c-format
 msgid "MinWords should be less than MaxWords"
 msgstr "MinWords debería ser menor que MaxWords"
 
-#: tsearch/wparser_def.c:2570
+#: tsearch/wparser_def.c:2572
 #, c-format
 msgid "MinWords should be positive"
 msgstr "MinWords debería ser positivo"
 
-#: tsearch/wparser_def.c:2574
+#: tsearch/wparser_def.c:2576
 #, c-format
 msgid "ShortWord should be >= 0"
 msgstr "ShortWord debería ser >= 0"
 
-#: tsearch/wparser_def.c:2578
+#: tsearch/wparser_def.c:2580
 #, c-format
 msgid "MaxFragments should be >= 0"
 msgstr "MaxFragments debería ser >= 0"
@@ -16726,87 +16703,87 @@
 
 #: utils/adt/array_expanded.c:276 utils/adt/arrayfuncs.c:934
 #: utils/adt/arrayfuncs.c:1522 utils/adt/arrayfuncs.c:3225
-#: utils/adt/arrayfuncs.c:3363 utils/adt/arrayfuncs.c:5838
-#: utils/adt/arrayfuncs.c:6149 utils/adt/arrayutils.c:93
+#: utils/adt/arrayfuncs.c:3363 utils/adt/arrayfuncs.c:5826
+#: utils/adt/arrayfuncs.c:6137 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 "el tamaño del array excede el máximo permitido (%d)"
 
-#: utils/adt/array_userfuncs.c:67 utils/adt/array_userfuncs.c:529
-#: utils/adt/array_userfuncs.c:609 utils/adt/json.c:1755 utils/adt/json.c:1850
-#: utils/adt/json.c:1888 utils/adt/jsonb.c:1142 utils/adt/jsonb.c:1171
-#: utils/adt/jsonb.c:1613 utils/adt/jsonb.c:1777 utils/adt/jsonb.c:1787
+#: utils/adt/array_userfuncs.c:79 utils/adt/array_userfuncs.c:541
+#: utils/adt/array_userfuncs.c:621 utils/adt/json.c:1759 utils/adt/json.c:1854
+#: utils/adt/json.c:1892 utils/adt/jsonb.c:1126 utils/adt/jsonb.c:1155
+#: utils/adt/jsonb.c:1591 utils/adt/jsonb.c:1755 utils/adt/jsonb.c:1765
 #, c-format
 msgid "could not determine input data type"
 msgstr "no se pudo determinar el tipo de dato de entrada"
 
-#: utils/adt/array_userfuncs.c:72
-#, fuzzy, c-format
+#: utils/adt/array_userfuncs.c:84
+#, c-format
 msgid "input data type is not an array"
-msgstr "el tipo de destino no es un array"
+msgstr "el tipo de entrada no es un array"
 
-#: utils/adt/array_userfuncs.c:120 utils/adt/array_userfuncs.c:174
-#: utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1161 utils/adt/float.c:1220
-#: utils/adt/float.c:2771 utils/adt/float.c:2787 utils/adt/int.c:623
+#: utils/adt/array_userfuncs.c:132 utils/adt/array_userfuncs.c:186
+#: utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1158 utils/adt/float.c:1217
+#: utils/adt/float.c:2768 utils/adt/float.c:2784 utils/adt/int.c:623
 #: utils/adt/int.c:652 utils/adt/int.c:673 utils/adt/int.c:704
 #: utils/adt/int.c:737 utils/adt/int.c:759 utils/adt/int.c:907
 #: utils/adt/int.c:928 utils/adt/int.c:955 utils/adt/int.c:995
 #: utils/adt/int.c:1016 utils/adt/int.c:1043 utils/adt/int.c:1076
-#: utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2903
-#: utils/adt/numeric.c:2912 utils/adt/varbit.c:1173 utils/adt/varbit.c:1565
-#: utils/adt/varlena.c:1045 utils/adt/varlena.c:2582
+#: utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2899
+#: utils/adt/numeric.c:2908 utils/adt/varbit.c:1173 utils/adt/varbit.c:1575
+#: utils/adt/varlena.c:1045 utils/adt/varlena.c:2595
 #, c-format
 msgid "integer out of range"
 msgstr "el entero está fuera de rango"
 
-#: utils/adt/array_userfuncs.c:127 utils/adt/array_userfuncs.c:184
+#: utils/adt/array_userfuncs.c:139 utils/adt/array_userfuncs.c:196
 #, c-format
 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:266 utils/adt/array_userfuncs.c:305
-#: utils/adt/array_userfuncs.c:342 utils/adt/array_userfuncs.c:371
-#: utils/adt/array_userfuncs.c:399
+#: utils/adt/array_userfuncs.c:278 utils/adt/array_userfuncs.c:317
+#: utils/adt/array_userfuncs.c:354 utils/adt/array_userfuncs.c:383
+#: utils/adt/array_userfuncs.c:411
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "no se pueden concatenar arrays incompatibles"
 
-#: utils/adt/array_userfuncs.c:267
+#: utils/adt/array_userfuncs.c:279
 #, c-format
 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."
 
-#: utils/adt/array_userfuncs.c:306
+#: utils/adt/array_userfuncs.c:318
 #, c-format
 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/array_userfuncs.c:343
+#: utils/adt/array_userfuncs.c:355
 #, c-format
 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/array_userfuncs.c:372 utils/adt/array_userfuncs.c:400
+#: utils/adt/array_userfuncs.c:384 utils/adt/array_userfuncs.c:412
 #, c-format
 msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr "Los arrays con diferentes dimensiones son incompatibles para la concatenación."
 
-#: utils/adt/array_userfuncs.c:468 utils/adt/arrayfuncs.c:1287
-#: utils/adt/arrayfuncs.c:3331 utils/adt/arrayfuncs.c:5738
+#: utils/adt/array_userfuncs.c:480 utils/adt/arrayfuncs.c:1287
+#: utils/adt/arrayfuncs.c:3331 utils/adt/arrayfuncs.c:5732
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "número incorrecto de dimensiones: %d"
 
-#: utils/adt/array_userfuncs.c:725 utils/adt/array_userfuncs.c:876
-#, fuzzy, c-format
+#: utils/adt/array_userfuncs.c:737 utils/adt/array_userfuncs.c:889
+#, c-format
 msgid "searching for elements in multidimensional arrays is not supported"
-msgstr "la eliminación de elementos desde arrays multidimensionales no está soportada"
+msgstr "no está soportada la búsqueda de elementos en arrays multidimensionales"
 
-#: utils/adt/array_userfuncs.c:749
+#: utils/adt/array_userfuncs.c:761
 #, c-format
-msgid "initial position should not be NULL"
-msgstr ""
+msgid "initial position must not be null"
+msgstr "la posición inicial no debe ser null"
 
 #: utils/adt/arrayfuncs.c:271 utils/adt/arrayfuncs.c:285
 #: utils/adt/arrayfuncs.c:296 utils/adt/arrayfuncs.c:318
@@ -16861,8 +16838,8 @@
 msgstr "Las dimensiones del array especificadas no coinciden con el contenido del array."
 
 #: utils/adt/arrayfuncs.c:492 utils/adt/arrayfuncs.c:519
-#: utils/adt/rangetypes.c:2111 utils/adt/rangetypes.c:2119
-#: utils/adt/rowtypes.c:205 utils/adt/rowtypes.c:213
+#: utils/adt/rangetypes.c:2124 utils/adt/rangetypes.c:2132
+#: utils/adt/rowtypes.c:208 utils/adt/rowtypes.c:216
 #, c-format
 msgid "Unexpected end of input."
 msgstr "Fin inesperado de la entrada."
@@ -16903,7 +16880,7 @@
 msgid "wrong element type"
 msgstr "el tipo de elemento es erróneo"
 
-#: utils/adt/arrayfuncs.c:1356 utils/adt/rangetypes.c:325
+#: utils/adt/arrayfuncs.c:1356 utils/adt/rangetypes.c:334
 #: utils/cache/lsyscache.c:2586
 #, c-format
 msgid "no binary input function available for type %s"
@@ -16914,7 +16891,7 @@
 msgid "improper binary format in array element %d"
 msgstr "el formato binario no es válido en elemento %d de array"
 
-#: utils/adt/arrayfuncs.c:1577 utils/adt/rangetypes.c:330
+#: utils/adt/arrayfuncs.c:1577 utils/adt/rangetypes.c:339
 #: utils/cache/lsyscache.c:2619
 #, c-format
 msgid "no binary output function available for type %s"
@@ -16928,9 +16905,9 @@
 #: utils/adt/arrayfuncs.c:2226 utils/adt/arrayfuncs.c:2248
 #: utils/adt/arrayfuncs.c:2297 utils/adt/arrayfuncs.c:2533
 #: utils/adt/arrayfuncs.c:2830 utils/adt/arrayfuncs.c:5718
-#: utils/adt/arrayfuncs.c:5750 utils/adt/arrayfuncs.c:5767
-#: utils/adt/json.c:2286 utils/adt/json.c:2361 utils/adt/jsonb.c:1391
-#: utils/adt/jsonb.c:1477 utils/adt/jsonfuncs.c:3528
+#: utils/adt/arrayfuncs.c:5744 utils/adt/arrayfuncs.c:5755
+#: utils/adt/json.c:2290 utils/adt/json.c:2365 utils/adt/jsonb.c:1369
+#: utils/adt/jsonb.c:1455 utils/adt/jsonfuncs.c:3528
 #: utils/adt/jsonfuncs.c:3573
 #, c-format
 msgid "wrong number of array subscripts"
@@ -16968,75 +16945,65 @@
 msgid "cannot compare arrays of different element types"
 msgstr "no se pueden comparar arrays con elementos de distintos tipos"
 
-#: utils/adt/arrayfuncs.c:3936 utils/adt/rangetypes.c:1240
+#: utils/adt/arrayfuncs.c:3936 utils/adt/rangetypes.c:1253
 #, 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/arrayfuncs.c:5130
-#, fuzzy, c-format
+#, c-format
 msgid "data type %s is not an array type"
-msgstr "el tipo de destino no es un array"
+msgstr "el tipo %s no es un array"
 
 #: utils/adt/arrayfuncs.c:5187
-#, fuzzy, c-format
+#, c-format
 msgid "cannot accumulate null arrays"
-msgstr "no se pueden concatenar arrays incompatibles"
+msgstr "no se pueden acumular arrays nulos"
 
 #: utils/adt/arrayfuncs.c:5215
-#, fuzzy, c-format
+#, c-format
 msgid "cannot accumulate empty arrays"
-msgstr "no se pueden concatenar arrays incompatibles"
+msgstr "no se pueden acumular arrays vacíos"
 
 #: utils/adt/arrayfuncs.c:5244 utils/adt/arrayfuncs.c:5250
-#, fuzzy, c-format
+#, c-format
 msgid "cannot accumulate arrays of different dimensionality"
-msgstr "no se pueden comparar arrays con elementos de distintos tipos"
+msgstr "no se pueden acumular arrays de distinta dimensionalidad"
 
 #: utils/adt/arrayfuncs.c:5616 utils/adt/arrayfuncs.c:5656
 #, c-format
 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/arrayfuncs.c:5719 utils/adt/arrayfuncs.c:5751
+#: utils/adt/arrayfuncs.c:5719 utils/adt/arrayfuncs.c:5745
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "El array de dimensiones debe ser unidimensional."
 
-#: utils/adt/arrayfuncs.c:5724 utils/adt/arrayfuncs.c:5756
-#, c-format
-msgid "wrong range of array subscripts"
-msgstr "rango incorrecto en los subíndices del array"
-
-#: utils/adt/arrayfuncs.c:5725 utils/adt/arrayfuncs.c:5757
-#, c-format
-msgid "Lower bound of dimension array must be one."
-msgstr "El límite inferior del array de dimensiones debe ser uno."
-
-#: utils/adt/arrayfuncs.c:5730 utils/adt/arrayfuncs.c:5762
+#: utils/adt/arrayfuncs.c:5724 utils/adt/arrayfuncs.c:5750
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "los valores de dimensión no pueden ser null"
 
-#: utils/adt/arrayfuncs.c:5768
+#: utils/adt/arrayfuncs.c:5756
 #, c-format
 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/arrayfuncs.c:6014
+#: utils/adt/arrayfuncs.c:6002
 #, c-format
 msgid "removing elements from multidimensional arrays is not supported"
 msgstr "la eliminación de elementos desde arrays multidimensionales no está soportada"
 
-#: utils/adt/arrayfuncs.c:6291
-#, fuzzy, c-format
+#: utils/adt/arrayfuncs.c:6279
+#, c-format
 msgid "thresholds must be one-dimensional array"
-msgstr "el argumento debe ser vacío o un array unidimensional"
+msgstr "los umbrales deben ser un array unidimensional"
 
-#: utils/adt/arrayfuncs.c:6296
-#, fuzzy, c-format
+#: utils/adt/arrayfuncs.c:6284
+#, c-format
 msgid "thresholds array must not contain NULLs"
-msgstr "los arrays de typmod no deben contener valores nulos"
+msgstr "el array de umbrales no debe contener nulos"
 
 #: utils/adt/arrayutils.c:209
 #, c-format
@@ -17070,13 +17037,13 @@
 
 #: utils/adt/cash.c:607 utils/adt/cash.c:657 utils/adt/cash.c:708
 #: utils/adt/cash.c:757 utils/adt/cash.c:809 utils/adt/cash.c:859
-#: utils/adt/float.c:788 utils/adt/float.c:852 utils/adt/float.c:2530
-#: utils/adt/float.c:2593 utils/adt/geo_ops.c:4152 utils/adt/int.c:719
+#: utils/adt/float.c:785 utils/adt/float.c:849 utils/adt/float.c:2527
+#: utils/adt/float.c:2590 utils/adt/geo_ops.c:4163 utils/adt/int.c:719
 #: utils/adt/int.c:861 utils/adt/int.c:969 utils/adt/int.c:1058
 #: utils/adt/int.c:1097 utils/adt/int.c:1125 utils/adt/int8.c:597
 #: utils/adt/int8.c:657 utils/adt/int8.c:897 utils/adt/int8.c:1005
-#: utils/adt/int8.c:1094 utils/adt/int8.c:1202 utils/adt/numeric.c:5917
-#: utils/adt/numeric.c:6200 utils/adt/timestamp.c:3350
+#: utils/adt/int8.c:1094 utils/adt/int8.c:1202 utils/adt/numeric.c:5920
+#: utils/adt/numeric.c:6203 utils/adt/timestamp.c:3448
 #, c-format
 msgid "division by zero"
 msgstr "división por cero"
@@ -17086,160 +17053,155 @@
 msgid "\"char\" out of range"
 msgstr "«char» está fuera de rango"
 
-#: utils/adt/date.c:68 utils/adt/timestamp.c:95 utils/adt/varbit.c:52
+#: utils/adt/date.c:67 utils/adt/timestamp.c:95 utils/adt/varbit.c:52
 #: utils/adt/varchar.c:44
 #, c-format
 msgid "invalid type modifier"
 msgstr "el modificador de tipo no es válido"
 
-#: utils/adt/date.c:73
+#: utils/adt/date.c:72
 #, c-format
 msgid "TIME(%d)%s precision must not be negative"
 msgstr "la precisión de TIME(%d)%s no debe ser negativa"
 
-#: utils/adt/date.c:79
+#: utils/adt/date.c:78
 #, 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:1208 utils/adt/datetime.c:2079
+#: utils/adt/date.c:141 utils/adt/datetime.c:1209 utils/adt/datetime.c:2122
 #, c-format
 msgid "date/time value \"current\" is no longer supported"
 msgstr "valor de hora/fecha «current» ya no está soportado"
 
-#: utils/adt/date.c:167 utils/adt/formatting.c:3523
+#: utils/adt/date.c:166 utils/adt/formatting.c:3521
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "fecha fuera de rango: «%s»"
 
-#: utils/adt/date.c:217 utils/adt/xml.c:2029
+#: utils/adt/date.c:216 utils/adt/xml.c:2033
 #, c-format
 msgid "date out of range"
 msgstr "la fecha fuera de rango"
 
-#: utils/adt/date.c:259 utils/adt/timestamp.c:593
+#: utils/adt/date.c:258 utils/adt/timestamp.c:593
 #, c-format
 msgid "date field value out of range: %d-%02d-%02d"
 msgstr "un valor en el campo de fecha está fuera de rango: %d-%02d-%02d"
 
-#: utils/adt/date.c:265 utils/adt/timestamp.c:599
+#: utils/adt/date.c:264 utils/adt/timestamp.c:599
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "fecha fuera de rango: %d-%02d-%02d"
 
-#: utils/adt/date.c:418
+#: utils/adt/date.c:417
 #, c-format
 msgid "cannot subtract infinite dates"
 msgstr "no se pueden restar fechas infinitas"
 
-#: utils/adt/date.c:475 utils/adt/date.c:512
+#: utils/adt/date.c:474 utils/adt/date.c:511
 #, c-format
 msgid "date out of range for timestamp"
 msgstr "fecha fuera de rango para timestamp"
 
-#: utils/adt/date.c:971 utils/adt/date.c:1017 utils/adt/date.c:1617
-#: utils/adt/date.c:1653 utils/adt/date.c:2525 utils/adt/formatting.c:3399
-#: utils/adt/formatting.c:3431 utils/adt/formatting.c:3499
-#: utils/adt/json.c:1526 utils/adt/json.c:1553 utils/adt/jsonb.c:840
-#: utils/adt/jsonb.c:869 utils/adt/nabstime.c:455 utils/adt/nabstime.c:498
-#: utils/adt/nabstime.c:528 utils/adt/nabstime.c:571 utils/adt/timestamp.c:225
-#: utils/adt/timestamp.c:268 utils/adt/timestamp.c:717
-#: utils/adt/timestamp.c:746 utils/adt/timestamp.c:785
-#: utils/adt/timestamp.c:2939 utils/adt/timestamp.c:2960
-#: utils/adt/timestamp.c:2973 utils/adt/timestamp.c:2982
-#: utils/adt/timestamp.c:3039 utils/adt/timestamp.c:3062
-#: utils/adt/timestamp.c:3075 utils/adt/timestamp.c:3086
-#: utils/adt/timestamp.c:3611 utils/adt/timestamp.c:3740
-#: utils/adt/timestamp.c:3781 utils/adt/timestamp.c:3869
-#: utils/adt/timestamp.c:3915 utils/adt/timestamp.c:4026
-#: utils/adt/timestamp.c:4350 utils/adt/timestamp.c:4466
-#: utils/adt/timestamp.c:4476 utils/adt/timestamp.c:4561
-#: utils/adt/timestamp.c:4680 utils/adt/timestamp.c:4690
-#: utils/adt/timestamp.c:5006 utils/adt/timestamp.c:5020
-#: utils/adt/timestamp.c:5145 utils/adt/timestamp.c:5152
-#: utils/adt/timestamp.c:5178 utils/adt/timestamp.c:5182
-#: utils/adt/timestamp.c:5251 utils/adt/xml.c:2051 utils/adt/xml.c:2058
-#: utils/adt/xml.c:2078 utils/adt/xml.c:2085
+#: utils/adt/date.c:970 utils/adt/date.c:1016 utils/adt/date.c:1616
+#: utils/adt/date.c:1652 utils/adt/date.c:2524 utils/adt/datetime.c:1690
+#: utils/adt/formatting.c:3397 utils/adt/formatting.c:3429
+#: utils/adt/formatting.c:3497 utils/adt/json.c:1534 utils/adt/json.c:1556
+#: utils/adt/jsonb.c:823 utils/adt/jsonb.c:847 utils/adt/nabstime.c:455
+#: utils/adt/nabstime.c:498 utils/adt/nabstime.c:528 utils/adt/nabstime.c:571
+#: utils/adt/timestamp.c:225 utils/adt/timestamp.c:268
+#: utils/adt/timestamp.c:717 utils/adt/timestamp.c:746
+#: utils/adt/timestamp.c:785 utils/adt/timestamp.c:3037
+#: utils/adt/timestamp.c:3058 utils/adt/timestamp.c:3071
+#: utils/adt/timestamp.c:3080 utils/adt/timestamp.c:3137
+#: utils/adt/timestamp.c:3160 utils/adt/timestamp.c:3173
+#: utils/adt/timestamp.c:3184 utils/adt/timestamp.c:3709
+#: utils/adt/timestamp.c:3838 utils/adt/timestamp.c:3879
+#: utils/adt/timestamp.c:3967 utils/adt/timestamp.c:4013
+#: utils/adt/timestamp.c:4124 utils/adt/timestamp.c:4448
+#: utils/adt/timestamp.c:4564 utils/adt/timestamp.c:4574
+#: utils/adt/timestamp.c:4659 utils/adt/timestamp.c:4778
+#: utils/adt/timestamp.c:4788 utils/adt/timestamp.c:5035
+#: utils/adt/timestamp.c:5049 utils/adt/timestamp.c:5140
+#: utils/adt/timestamp.c:5147 utils/adt/timestamp.c:5173
+#: utils/adt/timestamp.c:5177 utils/adt/timestamp.c:5246 utils/adt/xml.c:2055
+#: utils/adt/xml.c:2062 utils/adt/xml.c:2082 utils/adt/xml.c:2089
 #, c-format
 msgid "timestamp out of range"
 msgstr "el timestamp está fuera de rango"
 
-#: utils/adt/date.c:1043
+#: utils/adt/date.c:1042
 #, c-format
 msgid "cannot convert reserved abstime value to date"
 msgstr "no se puede convertir un valor reservado de abstime a date"
 
-#: utils/adt/date.c:1197 utils/adt/date.c:1204 utils/adt/date.c:2015
-#: utils/adt/date.c:2022
+#: utils/adt/date.c:1196 utils/adt/date.c:1203 utils/adt/date.c:2014
+#: utils/adt/date.c:2021
 #, c-format
 msgid "time out of range"
 msgstr "hora fuera de rango"
 
-#: utils/adt/date.c:1265 utils/adt/timestamp.c:618
+#: utils/adt/date.c:1264 utils/adt/timestamp.c:618
 #, c-format
 msgid "time field value out of range: %d:%02d:%02g"
 msgstr "un valor en el campo de hora está fuera de rango: %d:%02d:%02g"
 
-#: utils/adt/date.c:1893 utils/adt/date.c:1910
+#: utils/adt/date.c:1892 utils/adt/date.c:1909
 #, c-format
 msgid "\"time\" units \"%s\" not recognized"
 msgstr "las unidades de «time» «%s» no son reconocidas"
 
-#: utils/adt/date.c:2031
+#: utils/adt/date.c:2030
 #, c-format
 msgid "time zone displacement out of range"
 msgstr "desplazamiento de huso horario fuera de rango"
 
-#: utils/adt/date.c:2655 utils/adt/date.c:2672
+#: utils/adt/date.c:2654 utils/adt/date.c:2671
 #, c-format
 msgid "\"time with time zone\" units \"%s\" not recognized"
 msgstr "las unidades de «timestamp with time zone» «%s» no son reconocidas"
 
-#: utils/adt/date.c:2745 utils/adt/datetime.c:925 utils/adt/datetime.c:1805
-#: utils/adt/datetime.c:4566 utils/adt/timestamp.c:532
-#: utils/adt/timestamp.c:559 utils/adt/timestamp.c:5032
-#: utils/adt/timestamp.c:5262
+#: utils/adt/date.c:2744 utils/adt/datetime.c:926 utils/adt/datetime.c:1848
+#: utils/adt/datetime.c:4609 utils/adt/timestamp.c:532
+#: utils/adt/timestamp.c:559 utils/adt/timestamp.c:5061
+#: utils/adt/timestamp.c:5257
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "el huso horario «%s» no es reconocido"
 
-#: utils/adt/date.c:2785 utils/adt/timestamp.c:5103 utils/adt/timestamp.c:5288
+#: utils/adt/date.c:2784 utils/adt/timestamp.c:5098 utils/adt/timestamp.c:5283
 #, c-format
 msgid "interval time zone \"%s\" must not include months or days"
 msgstr "el intervalo de huso horario «%s» no debe especificar meses o días"
 
-#: utils/adt/datetime.c:1680
-#, c-format
-msgid "time zone abbreviation \"%s\" is not used in time zone \"%s\""
-msgstr "abreviación de huso horario «%s» no se usa en el huso horario «%s»"
-
-#: utils/adt/datetime.c:3766 utils/adt/datetime.c:3773
+#: utils/adt/datetime.c:3809 utils/adt/datetime.c:3816
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "el valor de hora/fecha está fuera de rango: «%s»"
 
-#: utils/adt/datetime.c:3775
+#: utils/adt/datetime.c:3818
 #, c-format
 msgid "Perhaps you need a different \"datestyle\" setting."
 msgstr "Quizás necesite una configuración diferente de «datestyle»."
 
-#: utils/adt/datetime.c:3780
+#: utils/adt/datetime.c:3823
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "el valor de interval está fuera de rango: «%s»"
 
-#: utils/adt/datetime.c:3786
+#: utils/adt/datetime.c:3829
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "el desplazamiento de huso horario está fuera de rango: «%s»"
 
 #. translator: first %s is inet or cidr
-#: utils/adt/datetime.c:3793 utils/adt/network.c:58
+#: utils/adt/datetime.c:3836 utils/adt/network.c:58
 #, 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/datetime.c:4568
+#: utils/adt/datetime.c:4611
 #, c-format
 msgid "This time zone name appears in the configuration file for time zone abbreviation \"%s\"."
 msgstr "Este nombre de huso horario aparece en el archivo de configuración para abreviaciones de husos horarios «%s»."
@@ -17254,7 +17216,7 @@
 msgid "could not open tablespace directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio de tablespace «%s»: %m"
 
-#: utils/adt/domains.c:85
+#: utils/adt/domains.c:86
 #, c-format
 msgid "type %s is not a domain"
 msgstr "tipo «%s» no es un dominio"
@@ -17277,22 +17239,22 @@
 #: utils/adt/encode.c:295
 #, c-format
 msgid "unexpected \"=\" while decoding base64 sequence"
-msgstr ""
+msgstr "«=» inesperado mientras se decodificaba la secuencia base64"
 
 #: utils/adt/encode.c:307
-#, fuzzy, c-format
-msgid "invalid symbol '%c' while decoding base64 sequence"
-msgstr "la codificación de origen «%s» no es válida"
+#, c-format
+msgid "invalid symbol \"%c\" while decoding base64 sequence"
+msgstr "símbolo «%c» no válido al decodificar secuencia base64"
 
 #: utils/adt/encode.c:327
-#, fuzzy, c-format
+#, c-format
 msgid "invalid base64 end sequence"
-msgstr "secuencia de término no válida"
+msgstr "secuencia de término base64 no válida"
 
 #: utils/adt/encode.c:328
 #, c-format
-msgid "Input data is missing padding, truncated, or otherwise corrupted."
-msgstr ""
+msgid "Input data is missing padding, is truncated, or is otherwise corrupted."
+msgstr "A los datos de entrada les falta relleno, o están truncados, o están corruptos de alguna otra forma."
 
 #: utils/adt/encode.c:442 utils/adt/encode.c:507 utils/adt/varlena.c:287
 #: utils/adt/varlena.c:328
@@ -17332,83 +17294,83 @@
 msgid "value out of range: underflow"
 msgstr "valor fuera de rango: desbordamiento por abajo"
 
-#: utils/adt/float.c:218 utils/adt/float.c:292 utils/adt/float.c:316
+#: utils/adt/float.c:215 utils/adt/float.c:289 utils/adt/float.c:313
 #, c-format
 msgid "invalid input syntax for type real: \"%s\""
 msgstr "la sintaxis de entrada no es válida para tipo real: «%s»"
 
-#: utils/adt/float.c:286
+#: utils/adt/float.c:283
 #, c-format
 msgid "\"%s\" is out of range for type real"
 msgstr "«%s» está fuera de rango para el tipo real"
 
-#: utils/adt/float.c:417 utils/adt/float.c:491 utils/adt/float.c:515
-#: utils/adt/numeric.c:5373 utils/adt/numeric.c:5399
+#: utils/adt/float.c:414 utils/adt/float.c:488 utils/adt/float.c:512
+#: utils/adt/numeric.c:5376 utils/adt/numeric.c:5402
 #, 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»"
 
-#: utils/adt/float.c:485
+#: utils/adt/float.c:482
 #, 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:1179 utils/adt/float.c:1237 utils/adt/int.c:349
+#: utils/adt/float.c:1176 utils/adt/float.c:1234 utils/adt/int.c:349
 #: utils/adt/int.c:775 utils/adt/int.c:804 utils/adt/int.c:825
 #: utils/adt/int.c:845 utils/adt/int.c:879 utils/adt/int.c:1174
-#: utils/adt/int8.c:1323 utils/adt/numeric.c:3000 utils/adt/numeric.c:3009
+#: utils/adt/int8.c:1323 utils/adt/numeric.c:2996 utils/adt/numeric.c:3005
 #, c-format
 msgid "smallint out of range"
 msgstr "smallint está fuera de rango"
 
-#: utils/adt/float.c:1363 utils/adt/numeric.c:6593
+#: utils/adt/float.c:1360 utils/adt/numeric.c:6602
 #, c-format
 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:1405 utils/adt/numeric.c:2820
+#: utils/adt/float.c:1402 utils/adt/numeric.c:2816
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "cero elevado a una potencia negativa es indefinido"
 
-#: utils/adt/float.c:1409 utils/adt/numeric.c:2826
+#: utils/adt/float.c:1406 utils/adt/numeric.c:2822
 #, c-format
 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/float.c:1475 utils/adt/float.c:1505 utils/adt/numeric.c:6811
+#: utils/adt/float.c:1472 utils/adt/float.c:1502 utils/adt/numeric.c:6820
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "no se puede calcular logaritmo de cero"
 
-#: utils/adt/float.c:1479 utils/adt/float.c:1509 utils/adt/numeric.c:6815
+#: utils/adt/float.c:1476 utils/adt/float.c:1506 utils/adt/numeric.c:6824
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "no se puede calcular logaritmo de un número negativo"
 
-#: utils/adt/float.c:1536 utils/adt/float.c:1557 utils/adt/float.c:1578
-#: utils/adt/float.c:1600 utils/adt/float.c:1621 utils/adt/float.c:1642
-#: utils/adt/float.c:1664 utils/adt/float.c:1685
+#: utils/adt/float.c:1533 utils/adt/float.c:1554 utils/adt/float.c:1575
+#: utils/adt/float.c:1597 utils/adt/float.c:1618 utils/adt/float.c:1639
+#: utils/adt/float.c:1661 utils/adt/float.c:1682
 #, c-format
 msgid "input is out of range"
 msgstr "la entrada está fuera de rango"
 
-#: utils/adt/float.c:2747 utils/adt/numeric.c:1454
+#: utils/adt/float.c:2744 utils/adt/numeric.c:1450
 #, c-format
 msgid "count must be greater than zero"
 msgstr "count debe ser mayor que cero"
 
-#: utils/adt/float.c:2752 utils/adt/numeric.c:1461
+#: utils/adt/float.c:2749 utils/adt/numeric.c:1457
 #, c-format
 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/float.c:2758
+#: utils/adt/float.c:2755
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "los límites inferior y superior deben ser finitos"
 
-#: utils/adt/float.c:2796 utils/adt/numeric.c:1474
+#: utils/adt/float.c:2793 utils/adt/numeric.c:1470
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "el límite superior no puede ser igual al límite inferior"
@@ -17423,203 +17385,203 @@
 msgid "Intervals are not tied to specific calendar dates."
 msgstr "Los Interval no están ... a valores determinados de fechas de calendario."
 
-#: utils/adt/formatting.c:1059
+#: utils/adt/formatting.c:1058
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "«EEEE» debe ser el último patrón usado"
 
-#: utils/adt/formatting.c:1067
+#: utils/adt/formatting.c:1066
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "«9» debe ir antes de «PR»"
 
-#: utils/adt/formatting.c:1083
+#: utils/adt/formatting.c:1082
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "«0» debe ir antes de «PR»"
 
-#: utils/adt/formatting.c:1110
+#: utils/adt/formatting.c:1109
 #, c-format
 msgid "multiple decimal points"
 msgstr "hay múltiples puntos decimales"
 
-#: utils/adt/formatting.c:1114 utils/adt/formatting.c:1197
+#: utils/adt/formatting.c:1113 utils/adt/formatting.c:1196
 #, c-format
 msgid "cannot use \"V\" and decimal point together"
 msgstr "no se puede usar «V» y un punto decimal simultáneamente"
 
-#: utils/adt/formatting.c:1126
+#: utils/adt/formatting.c:1125
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "no se puede usar «S» dos veces"
 
-#: utils/adt/formatting.c:1130
+#: utils/adt/formatting.c:1129
 #, c-format
 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/formatting.c:1150
+#: utils/adt/formatting.c:1149
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "no se puede usar «S» y «MI» simultáneamente"
 
-#: utils/adt/formatting.c:1160
+#: utils/adt/formatting.c:1159
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "no se puede usar «S» y «PL» simultáneamente"
 
-#: utils/adt/formatting.c:1170
+#: utils/adt/formatting.c:1169
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "no se puede usar «S» y «SG» simultáneamente"
 
-#: utils/adt/formatting.c:1179
+#: utils/adt/formatting.c:1178
 #, c-format
 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/formatting.c:1205
+#: utils/adt/formatting.c:1204
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "no se puede usar «EEEE» dos veces"
 
-#: utils/adt/formatting.c:1211
+#: utils/adt/formatting.c:1210
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "«EEEE» es incompatible con otros formatos"
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1211
 #, c-format
 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/formatting.c:1412
+#: utils/adt/formatting.c:1411
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "«%s» no es un número"
 
-#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1512 utils/adt/formatting.c:1564
 #, c-format
 msgid "could not determine which collation to use for lower() function"
 msgstr "no se pudo determinar qué ordenamiento (collation) usar para la función lower()"
 
-#: utils/adt/formatting.c:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1632 utils/adt/formatting.c:1684
 #, c-format
 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/formatting.c:1754 utils/adt/formatting.c:1818
+#: utils/adt/formatting.c:1753 utils/adt/formatting.c:1817
 #, c-format
 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/formatting.c:2122
+#: utils/adt/formatting.c:2114
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "combinacion invalida de convenciones de fecha"
 
-#: utils/adt/formatting.c:2123
+#: utils/adt/formatting.c:2115
 #, c-format
 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/formatting.c:2140
+#: utils/adt/formatting.c:2132
 #, c-format
 msgid "conflicting values for \"%s\" field in formatting string"
 msgstr "valores en conflicto para le campo \"%s\" en cadena de formato"
 
-#: utils/adt/formatting.c:2142
+#: utils/adt/formatting.c:2134
 #, c-format
 msgid "This value contradicts a previous setting for the same field type."
 msgstr "Este valor se contradice con un seteo previo para el mismo tipo de campo"
 
-#: utils/adt/formatting.c:2203
+#: utils/adt/formatting.c:2195
 #, c-format
 msgid "source string too short for \"%s\" formatting field"
 msgstr "cadena de texto fuente muy corta para campo formateado \"%s\" "
 
-#: utils/adt/formatting.c:2205
+#: utils/adt/formatting.c:2197
 #, c-format
 msgid "Field requires %d characters, but only %d remain."
 msgstr "El campo requiere %d caractéres, pero solo quedan %d."
 
-#: utils/adt/formatting.c:2208 utils/adt/formatting.c:2222
+#: utils/adt/formatting.c:2200 utils/adt/formatting.c:2214
 #, c-format
 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/formatting.c:2218 utils/adt/formatting.c:2231
-#: utils/adt/formatting.c:2361
+#: utils/adt/formatting.c:2210 utils/adt/formatting.c:2223
+#: utils/adt/formatting.c:2353
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "el valor «%s» no es válido para «%s»"
 
-#: utils/adt/formatting.c:2220
+#: utils/adt/formatting.c:2212
 #, 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."
 
-#: utils/adt/formatting.c:2233
+#: utils/adt/formatting.c:2225
 #, c-format
 msgid "Value must be an integer."
 msgstr "El valor debe ser un entero."
 
-#: utils/adt/formatting.c:2238
+#: utils/adt/formatting.c:2230
 #, 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"
 
-#: utils/adt/formatting.c:2240
+#: utils/adt/formatting.c:2232
 #, c-format
 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:2363
+#: utils/adt/formatting.c:2355
 #, c-format
 msgid "The given value did not match any of the allowed values for this field."
 msgstr "El valor dado no concuerda con ninguno de los valores permitidos para este campo."
 
-#: utils/adt/formatting.c:2551 utils/adt/formatting.c:2571
-#: utils/adt/formatting.c:2591 utils/adt/formatting.c:2611
-#: utils/adt/formatting.c:2630 utils/adt/formatting.c:2649
-#: utils/adt/formatting.c:2672 utils/adt/formatting.c:2690
-#: utils/adt/formatting.c:2708 utils/adt/formatting.c:2726
-#: utils/adt/formatting.c:2743 utils/adt/formatting.c:2760
+#: utils/adt/formatting.c:2547 utils/adt/formatting.c:2567
+#: utils/adt/formatting.c:2587 utils/adt/formatting.c:2607
+#: utils/adt/formatting.c:2626 utils/adt/formatting.c:2645
+#: utils/adt/formatting.c:2668 utils/adt/formatting.c:2686
+#: utils/adt/formatting.c:2704 utils/adt/formatting.c:2722
+#: utils/adt/formatting.c:2739 utils/adt/formatting.c:2756
 #, c-format
 msgid "localized string format value too long"
 msgstr "cadena traducida en cadena de formato es demasiado larga"
 
-#: utils/adt/formatting.c:3044
+#: utils/adt/formatting.c:3040
 #, c-format
 msgid "\"TZ\"/\"tz\"/\"OF\" format patterns are not supported in to_date"
 msgstr "los patrones de formato «TZ»/«tz»/«OF» no están soportados en to_date"
 
-#: utils/adt/formatting.c:3152
+#: utils/adt/formatting.c:3149
 #, c-format
 msgid "invalid input string for \"Y,YYY\""
 msgstr "cadena de entrada no válida para «Y,YYY»"
 
-#: utils/adt/formatting.c:3655
+#: utils/adt/formatting.c:3653
 #, 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"
 
-#: utils/adt/formatting.c:3657
+#: utils/adt/formatting.c:3655
 #, c-format
 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/formatting.c:3752
+#: utils/adt/formatting.c:3750
 #, c-format
 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/formatting.c:4601
+#: utils/adt/formatting.c:4599
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "«EEEE» no está soportado en la entrada"
 
-#: utils/adt/formatting.c:4613
+#: utils/adt/formatting.c:4611
 #, c-format
 msgid "\"RN\" not supported for input"
 msgstr "«RN» no está soportado en la entrada"
@@ -17666,129 +17628,129 @@
 msgid "must be superuser to get directory listings"
 msgstr "debe ser superusuario para obtener listados de directorio"
 
-#: utils/adt/geo_ops.c:300 utils/adt/geo_ops.c:1399 utils/adt/geo_ops.c:3497
-#: utils/adt/geo_ops.c:4312 utils/adt/geo_ops.c:5256
+#: utils/adt/geo_ops.c:301 utils/adt/geo_ops.c:1400 utils/adt/geo_ops.c:3506
+#: utils/adt/geo_ops.c:4323 utils/adt/geo_ops.c:5267
 #, c-format
 msgid "too many points requested"
 msgstr "se pidieron demasiados puntos"
 
-#: utils/adt/geo_ops.c:323
+#: utils/adt/geo_ops.c:324
 #, c-format
 msgid "could not format \"path\" value"
 msgstr "no se pudo dar formato a «path»"
 
-#: utils/adt/geo_ops.c:398
+#: utils/adt/geo_ops.c:399
 #, c-format
 msgid "invalid input syntax for type box: \"%s\""
 msgstr "la sintaxis de entrada no es válida para tipo box: «%s»"
 
-#: utils/adt/geo_ops.c:993
+#: utils/adt/geo_ops.c:994
 #, c-format
 msgid "invalid line specification: must be two distinct points"
 msgstr "especificación de línea no válida: deben ser dos puntos distintos"
 
-#: utils/adt/geo_ops.c:1002
+#: utils/adt/geo_ops.c:1003
 #, c-format
 msgid "invalid line specification: A and B cannot both be zero"
 msgstr "especificación de línea no válida: A y B no pueden ser ambos cero"
 
-#: utils/adt/geo_ops.c:1007
+#: utils/adt/geo_ops.c:1008
 #, c-format
 msgid "invalid input syntax for type line: \"%s\""
 msgstr "la sintaxis de entrada no es válida para tipo line: «%s»"
 
-#: utils/adt/geo_ops.c:1379 utils/adt/geo_ops.c:1410
+#: utils/adt/geo_ops.c:1380 utils/adt/geo_ops.c:1411
 #, c-format
 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:1449
+#: utils/adt/geo_ops.c:1450
 #, c-format
 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/geo_ops.c:1792
+#: utils/adt/geo_ops.c:1793
 #, c-format
 msgid "invalid input syntax for type point: \"%s\""
 msgstr "la sintaxis de entrada no es válida para tipo point: «%s»"
 
-#: utils/adt/geo_ops.c:2020
+#: utils/adt/geo_ops.c:2021
 #, 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/geo_ops.c:2620
+#: utils/adt/geo_ops.c:2621
 #, c-format
 msgid "function \"dist_lb\" not implemented"
 msgstr "la función «dist_lb» no está implementada"
 
-#: utils/adt/geo_ops.c:3072
+#: utils/adt/geo_ops.c:3081
 #, c-format
 msgid "function \"close_sl\" not implemented"
 msgstr "la función «close_sl» no está implementada"
 
-#: utils/adt/geo_ops.c:3174
+#: utils/adt/geo_ops.c:3183
 #, c-format
 msgid "function \"close_lb\" not implemented"
 msgstr "la función «close_lb» no está implementada"
 
-#: utils/adt/geo_ops.c:3463
+#: utils/adt/geo_ops.c:3472
 #, c-format
 msgid "cannot create bounding box for empty polygon"
 msgstr "no se puede crear una caja de contorno para un polígono vacío"
 
-#: utils/adt/geo_ops.c:3488 utils/adt/geo_ops.c:3508
+#: utils/adt/geo_ops.c:3497 utils/adt/geo_ops.c:3517
 #, c-format
 msgid "invalid input syntax for type polygon: \"%s\""
 msgstr "la sintaxis de entrada no es válida para tipo polygon: «%s»"
 
-#: utils/adt/geo_ops.c:3548
+#: utils/adt/geo_ops.c:3557
 #, c-format
 msgid "invalid number of points in external \"polygon\" value"
 msgstr "el número de puntos no es válido en «polygon» externo"
 
-#: utils/adt/geo_ops.c:4071
+#: utils/adt/geo_ops.c:4082
 #, c-format
 msgid "function \"poly_distance\" not implemented"
 msgstr "la función «poly_distance» no está implementada"
 
-#: utils/adt/geo_ops.c:4424
+#: utils/adt/geo_ops.c:4435
 #, c-format
 msgid "function \"path_center\" not implemented"
 msgstr "la función «path_center» no está implementada"
 
-#: utils/adt/geo_ops.c:4441
+#: utils/adt/geo_ops.c:4452
 #, c-format
 msgid "open path cannot be converted to polygon"
 msgstr "no se puede convertir un camino abierto en polygon"
 
-#: utils/adt/geo_ops.c:4618 utils/adt/geo_ops.c:4628 utils/adt/geo_ops.c:4643
-#: utils/adt/geo_ops.c:4649
+#: utils/adt/geo_ops.c:4629 utils/adt/geo_ops.c:4639 utils/adt/geo_ops.c:4654
+#: utils/adt/geo_ops.c:4660
 #, c-format
 msgid "invalid input syntax for type circle: \"%s\""
 msgstr "la sintaxis de entrada no es válida para el tipo circle: «%s»"
 
-#: utils/adt/geo_ops.c:4671 utils/adt/geo_ops.c:4679
+#: utils/adt/geo_ops.c:4682 utils/adt/geo_ops.c:4690
 #, c-format
 msgid "could not format \"circle\" value"
 msgstr "no se pudo dar formato al valor «circle»"
 
-#: utils/adt/geo_ops.c:4706
+#: utils/adt/geo_ops.c:4717
 #, c-format
 msgid "invalid radius in external \"circle\" value"
 msgstr "el radio no es válido en el valor «circle» externo"
 
-#: utils/adt/geo_ops.c:5242
+#: utils/adt/geo_ops.c:5253
 #, c-format
 msgid "cannot convert circle with radius zero to polygon"
 msgstr "no se puede convertir un círculo de radio cero a polygon"
 
-#: utils/adt/geo_ops.c:5247
+#: utils/adt/geo_ops.c:5258
 #, c-format
 msgid "must request at least 2 points"
 msgstr "debe pedir al menos 2 puntos"
 
-#: utils/adt/geo_ops.c:5291
+#: utils/adt/geo_ops.c:5302
 #, c-format
 msgid "cannot convert empty polygon to circle"
 msgstr "no se puede convertir polígono vacío a circle"
@@ -17808,8 +17770,8 @@
 msgid "oidvector has too many elements"
 msgstr "el oidvector tiene demasiados elementos"
 
-#: utils/adt/int.c:1362 utils/adt/int8.c:1460 utils/adt/numeric.c:1362
-#: utils/adt/timestamp.c:5349 utils/adt/timestamp.c:5430
+#: utils/adt/int.c:1362 utils/adt/int8.c:1460 utils/adt/numeric.c:1358
+#: utils/adt/timestamp.c:5344 utils/adt/timestamp.c:5425
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "el tamaño de paso no puede ser cero"
@@ -17833,8 +17795,8 @@
 #: utils/adt/int8.c:964 utils/adt/int8.c:991 utils/adt/int8.c:1031
 #: utils/adt/int8.c:1052 utils/adt/int8.c:1079 utils/adt/int8.c:1112
 #: utils/adt/int8.c:1140 utils/adt/int8.c:1161 utils/adt/int8.c:1188
-#: utils/adt/int8.c:1361 utils/adt/int8.c:1400 utils/adt/numeric.c:2955
-#: utils/adt/varbit.c:1645
+#: utils/adt/int8.c:1361 utils/adt/int8.c:1400 utils/adt/numeric.c:2951
+#: utils/adt/varbit.c:1655
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint está fuera de rango"
@@ -17844,208 +17806,203 @@
 msgid "OID out of range"
 msgstr "OID está fuera de rango"
 
-#: utils/adt/json.c:776 utils/adt/json.c:816 utils/adt/json.c:831
-#: utils/adt/json.c:842 utils/adt/json.c:852 utils/adt/json.c:903
-#: utils/adt/json.c:934 utils/adt/json.c:952 utils/adt/json.c:964
-#: utils/adt/json.c:976 utils/adt/json.c:1115 utils/adt/json.c:1129
-#: utils/adt/json.c:1140 utils/adt/json.c:1148 utils/adt/json.c:1156
-#: utils/adt/json.c:1164 utils/adt/json.c:1172 utils/adt/json.c:1180
-#: utils/adt/json.c:1188 utils/adt/json.c:1196 utils/adt/json.c:1226
+#: utils/adt/json.c:785 utils/adt/json.c:825 utils/adt/json.c:840
+#: utils/adt/json.c:851 utils/adt/json.c:861 utils/adt/json.c:912
+#: utils/adt/json.c:943 utils/adt/json.c:961 utils/adt/json.c:973
+#: utils/adt/json.c:985 utils/adt/json.c:1130 utils/adt/json.c:1144
+#: utils/adt/json.c:1155 utils/adt/json.c:1163 utils/adt/json.c:1171
+#: utils/adt/json.c:1179 utils/adt/json.c:1187 utils/adt/json.c:1195
+#: utils/adt/json.c:1203 utils/adt/json.c:1211 utils/adt/json.c:1241
 #, c-format
 msgid "invalid input syntax for type json"
 msgstr "sintaxis de entrada no válida para tipo json"
 
-#: utils/adt/json.c:777
+#: utils/adt/json.c:786
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Los caracteres con valor 0x%02x deben ser escapados"
 
-#: utils/adt/json.c:817
+#: utils/adt/json.c:826
 #, c-format
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "«\\u» debe ser seguido por cuatro dígitos hexadecimales."
 
-#: utils/adt/json.c:832
+#: utils/adt/json.c:841
 #, c-format
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "Un «high-surrogate» Unicode no puede venir después de un «high-surrogate»."
 
-#: utils/adt/json.c:843 utils/adt/json.c:853 utils/adt/json.c:904
-#: utils/adt/json.c:965 utils/adt/json.c:977
+#: utils/adt/json.c:852 utils/adt/json.c:862 utils/adt/json.c:913
+#: utils/adt/json.c:974 utils/adt/json.c:986
 #, c-format
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "Un «low-surrogate» Unicode debe seguir a un «high-surrogate»."
 
-#: utils/adt/json.c:868 utils/adt/json.c:891
+#: utils/adt/json.c:877 utils/adt/json.c:900
 #, c-format
 msgid "unsupported Unicode escape sequence"
 msgstr "secuencia de escape Unicode no soportado"
 
-#: utils/adt/json.c:869
+#: utils/adt/json.c:878
 #, c-format
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 no puede ser convertido a text."
 
-#: utils/adt/json.c:892
+#: utils/adt/json.c:901
 #, c-format
 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 pueden ser usados para valores de «code point» sobre 007F cuando la codificación de servidor no es UTF8."
 
-#: utils/adt/json.c:935 utils/adt/json.c:953
+#: utils/adt/json.c:944 utils/adt/json.c:962
 #, c-format
 msgid "Escape sequence \"\\%s\" is invalid."
 msgstr "La secuencia de escape «%s» no es válida."
 
-#: utils/adt/json.c:1116
+#: utils/adt/json.c:1131
 #, c-format
 msgid "The input string ended unexpectedly."
 msgstr "La cadena de entrada terminó inesperadamente."
 
-#: utils/adt/json.c:1130
+#: utils/adt/json.c:1145
 #, c-format
 msgid "Expected end of input, but found \"%s\"."
 msgstr "Se esperaba el fin de la entrada, se encontró «%s»."
 
-#: utils/adt/json.c:1141
+#: utils/adt/json.c:1156
 #, c-format
 msgid "Expected JSON value, but found \"%s\"."
 msgstr "Se esperaba un valor JSON, se encontró «%s»."
 
-#: utils/adt/json.c:1149 utils/adt/json.c:1197
+#: utils/adt/json.c:1164 utils/adt/json.c:1212
 #, c-format
 msgid "Expected string, but found \"%s\"."
 msgstr "Se esperaba una cadena, se encontró «%s»."
 
-#: utils/adt/json.c:1157
+#: utils/adt/json.c:1172
 #, c-format
 msgid "Expected array element or \"]\", but found \"%s\"."
 msgstr "Se esperaba un elemento de array o «]», se encontró «%s»."
 
-#: utils/adt/json.c:1165
+#: utils/adt/json.c:1180
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%s\"."
 msgstr "Se esperaba «,» o «]», se encontró «%s»."
 
-#: utils/adt/json.c:1173
+#: utils/adt/json.c:1188
 #, c-format
 msgid "Expected string or \"}\", but found \"%s\"."
 msgstr "Se esperaba una cadena o «}», se encontró «%s»."
 
-#: utils/adt/json.c:1181
+#: utils/adt/json.c:1196
 #, c-format
 msgid "Expected \":\", but found \"%s\"."
 msgstr "Se esperaba «:», se encontró «%s»."
 
-#: utils/adt/json.c:1189
+#: utils/adt/json.c:1204
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%s\"."
 msgstr "Se esperaba «,» o «}», se encontró «%s»."
 
-#: utils/adt/json.c:1227
+#: utils/adt/json.c:1242
 #, c-format
 msgid "Token \"%s\" is invalid."
 msgstr "El elemento «%s» no es válido."
 
-#: utils/adt/json.c:1299
+#: utils/adt/json.c:1314
 #, c-format
 msgid "JSON data, line %d: %s%s%s"
 msgstr "Datos JSON, línea %d: %s%s%s"
 
-#: utils/adt/json.c:1452
+#: utils/adt/json.c:1469 utils/adt/jsonb.c:724
 #, c-format
 msgid "key value must be scalar, not array, composite, or json"
 msgstr "el valor de llave debe ser escalar, no array, composite o json"
 
-#: utils/adt/json.c:2002
-#, fuzzy, c-format
+#: utils/adt/json.c:2006
+#, c-format
 msgid "could not determine data type for argument 1"
-msgstr "no se pudo determinar el tipo de dato para el argumento %d"
+msgstr "no se pudo determinar el tipo de dato para el argumento 1"
 
-#: utils/adt/json.c:2012
-#, fuzzy, c-format
+#: utils/adt/json.c:2016
+#, c-format
 msgid "could not determine data type for argument 2"
-msgstr "no se pudo determinar el tipo de dato para el argumento %d"
+msgstr "no se pudo determinar el tipo de dato para el argumento 2"
 
-#: utils/adt/json.c:2036 utils/adt/jsonb.c:1803
+#: utils/adt/json.c:2040 utils/adt/jsonb.c:1781
 #, c-format
 msgid "field name must not be null"
 msgstr "el nombre de campo no debe ser null"
 
-#: utils/adt/json.c:2113
+#: utils/adt/json.c:2117
 #, c-format
 msgid "argument list must have even number of elements"
 msgstr "la lista de argumentos debe tener un número par de elementos"
 
-#: utils/adt/json.c:2114
+#: utils/adt/json.c:2118
 #, c-format
 msgid "The arguments of json_build_object() must consist of alternating keys and values."
 msgstr "Los argumentos de json_build_object() deben consistir de llaves y valores alternados."
 
-#: utils/adt/json.c:2138 utils/adt/json.c:2159 utils/adt/json.c:2218
+#: utils/adt/json.c:2142 utils/adt/json.c:2163 utils/adt/json.c:2222
 #, c-format
 msgid "could not determine data type for argument %d"
 msgstr "no se pudo determinar el tipo de dato para el argumento %d"
 
-#: utils/adt/json.c:2144
+#: utils/adt/json.c:2148
 #, c-format
 msgid "argument %d cannot be null"
 msgstr "el argumento %d no puede ser null"
 
-#: utils/adt/json.c:2145
+#: utils/adt/json.c:2149
 #, c-format
 msgid "Object keys should be text."
 msgstr "Las llaves de un objeto deben ser de texto."
 
-#: utils/adt/json.c:2280 utils/adt/jsonb.c:1385
+#: utils/adt/json.c:2284 utils/adt/jsonb.c:1363
 #, c-format
 msgid "array must have two columns"
 msgstr "un array debe tener dos columnas"
 
-#: utils/adt/json.c:2304 utils/adt/json.c:2388 utils/adt/jsonb.c:1409
-#: utils/adt/jsonb.c:1504
+#: utils/adt/json.c:2308 utils/adt/json.c:2392 utils/adt/jsonb.c:1387
+#: utils/adt/jsonb.c:1482
 #, c-format
 msgid "null value not allowed for object key"
 msgstr "no se permite el valor nulo como llave en un objeto"
 
-#: utils/adt/json.c:2377 utils/adt/jsonb.c:1493
+#: utils/adt/json.c:2381 utils/adt/jsonb.c:1471
 #, c-format
 msgid "mismatched array dimensions"
 msgstr "las dimensiones de array no coinciden"
 
-#: utils/adt/jsonb.c:265
+#: utils/adt/jsonb.c:257
 #, c-format
 msgid "string too long to represent as jsonb string"
 msgstr "la cadena es demasiado larga para representarla como cadena jsonb."
 
-#: utils/adt/jsonb.c:266
+#: utils/adt/jsonb.c:258
 #, c-format
 msgid "Due to an implementation restriction, jsonb strings cannot exceed %d bytes."
 msgstr "Debido a una restricción de la implementación, las cadenas en jsonb no pueden exceder los %d bytes."
 
-#: utils/adt/jsonb.c:729
-#, fuzzy, c-format
-msgid "key value must be scalar, not array, composite or json"
-msgstr "el valor de llave debe ser escalar, no array, composite o json"
-
-#: utils/adt/jsonb.c:1198
+#: utils/adt/jsonb.c:1182
 #, c-format
-msgid "invalid number or arguments: object must be matched key value pairs"
-msgstr ""
+msgid "invalid number of arguments: object must be matched key value pairs"
+msgstr "número no válido de argumentos: los objetos deben formar pares llave/valor"
 
-#: utils/adt/jsonb.c:1212
-#, fuzzy, c-format
-msgid "arg %d: key cannot be null"
-msgstr "el argumento %d no puede ser null"
+#: utils/adt/jsonb.c:1195
+#, c-format
+msgid "argument %d: key must not be null"
+msgstr "argumento %d: la llave no puede ser null"
 
-#: utils/adt/jsonb.c:1234 utils/adt/jsonb.c:1257 utils/adt/jsonb.c:1319
-#, fuzzy, c-format
-msgid "arg %d: could not determine data type"
-msgstr "no se pudo determinar el tipo de dato de entrada"
+#: utils/adt/jsonb.c:1214 utils/adt/jsonb.c:1237 utils/adt/jsonb.c:1297
+#, c-format
+msgid "argument %d: could not determine data type"
+msgstr "argumento %d: no se pudo determinar el tipo de dato"
 
-#: utils/adt/jsonb.c:1856
-#, fuzzy, c-format
+#: utils/adt/jsonb.c:1834
+#, c-format
 msgid "object keys must be strings"
-msgstr "Las llaves de un objeto deben ser de texto."
+msgstr "las llaves de un objeto deben ser cadenas"
 
 #: utils/adt/jsonb_util.c:656
 #, c-format
@@ -18148,36 +18105,46 @@
 msgstr "no se puede invocar %s en un objeto"
 
 #: utils/adt/jsonfuncs.c:3409 utils/adt/jsonfuncs.c:3462
-#, fuzzy, c-format
+#, c-format
 msgid "cannot delete from scalar"
-msgstr "no se puede eliminar de la vista «%s»"
+msgstr "no se puede eliminar de un escalar"
 
 #: utils/adt/jsonfuncs.c:3467
-#, fuzzy, c-format
-msgid "cannot delete from object using integer subscript"
-msgstr "no se puede eliminar desde la tabla foránea «%s»"
+#, c-format
+msgid "cannot delete from object using integer index"
+msgstr "no se puede eliminar de un objeto usando un índice numérico"
 
 #: utils/adt/jsonfuncs.c:3533
-#, fuzzy, c-format
+#, c-format
 msgid "cannot set path in scalar"
-msgstr "no se puede obtener el largo de array de un escalar"
+msgstr "no se puede definir una ruta en un escalar"
 
 #: utils/adt/jsonfuncs.c:3578
-#, fuzzy, c-format
+#, c-format
 msgid "cannot delete path in scalar"
-msgstr "no se puede desconstruir un escalar"
+msgstr "no se puede eliminar una ruta en un escalar"
 
 #: utils/adt/jsonfuncs.c:3703
-#, fuzzy, c-format
+#, c-format
 msgid "invalid concatenation of jsonb objects"
-msgstr "combinacion invalida de convenciones de fecha"
+msgstr "concatenación no válida de objetos jsonb"
 
-#: utils/adt/levenshtein.c:127
-#, fuzzy, c-format
-msgid "argument exceeds the maximum length of %d bytes"
-msgstr "el tamaño total de los elementos del array jsonb excede el máximo de %u bytes"
+#: utils/adt/jsonfuncs.c:3732
+#, c-format
+msgid "path element at position %d is null"
+msgstr "el elemento en la posición %d de la ruta es null"
+
+#: utils/adt/jsonfuncs.c:3888
+#, c-format
+msgid "path element at position %d is not an integer: \"%s\""
+msgstr "el elemento de ruta en la posición %d no es un entero: «%s»"
+
+#: utils/adt/levenshtein.c:133
+#, c-format
+msgid "levenshtein argument exceeds maximum length of %d characters"
+msgstr "el argumento levenshtein excede el largo máximo de %d caracteres"
 
-#: utils/adt/like.c:212 utils/adt/selfuncs.c:5275
+#: utils/adt/like.c:212 utils/adt/selfuncs.c:5379
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "no se pudo determinar qué ordenamiento (collation) usar para ILIKE"
@@ -18200,7 +18167,7 @@
 #: utils/adt/lockfuncs.c:422
 #, c-format
 msgid "cannot use advisory locks during a parallel operation"
-msgstr ""
+msgstr "no se pueden usar locks consultivos durante una operación paralela"
 
 #: utils/adt/mac.c:68
 #, c-format
@@ -18218,24 +18185,24 @@
 msgstr "PID %d no es un proceso servidor de PostgreSQL"
 
 #: utils/adt/misc.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "must be a superuser to cancel superuser query"
-msgstr "debe ser superusuario para crear superusuarios"
+msgstr "debe ser superusuario para cancelar una consulta de superusuario"
 
 #: utils/adt/misc.c:171
 #, c-format
-msgid "must be a member of the role whose query is being cancelled"
-msgstr ""
+msgid "must be a member of the role whose query is being canceled"
+msgstr "debe ser miembro del rol cuya consulta se está cancelando"
 
 #: utils/adt/misc.c:190
-#, fuzzy, c-format
+#, c-format
 msgid "must be a superuser to terminate superuser process"
-msgstr "debe ser superusuario para crear superusuarios"
+msgstr "debe ser superusuario para terminar proceso de superusuario"
 
 #: utils/adt/misc.c:195
-#, fuzzy, c-format
+#, c-format
 msgid "must be a member of the role whose process is being terminated"
-msgstr "el tabla «%s» no es un miembro de la extensión que se está creando"
+msgstr "debe ser miembro del rol cuyo proceso se está terminando"
 
 #: utils/adt/misc.c:209
 #, c-format
@@ -18358,9 +18325,9 @@
 msgstr "no se pudo dar formato al valor cidr: %m"
 
 #: utils/adt/network.c:917
-#, fuzzy, c-format
+#, c-format
 msgid "cannot merge addresses from different families"
-msgstr "no se puede hacer OR entre valores inet de distintos tamaños"
+msgstr "no se pueden mezclar direcciones de familias diferentes"
 
 #: utils/adt/network.c:1343
 #, c-format
@@ -18382,93 +18349,89 @@
 msgid "cannot subtract inet values of different sizes"
 msgstr "no se puede sustraer valores inet de distintos tamaños"
 
-#: utils/adt/numeric.c:549 utils/adt/numeric.c:576 utils/adt/numeric.c:4604
-#: utils/adt/numeric.c:4627 utils/adt/numeric.c:4651 utils/adt/numeric.c:4658
+#: utils/adt/numeric.c:549 utils/adt/numeric.c:576 utils/adt/numeric.c:4600
+#: utils/adt/numeric.c:4623 utils/adt/numeric.c:4647
 #, 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/numeric.c:766
-#, c-format
-msgid "invalid length in external \"numeric\" value"
-msgstr "el largo no es válido en el valor «numeric» externo"
-
-#: utils/adt/numeric.c:779
+#: utils/adt/numeric.c:775
 #, c-format
 msgid "invalid sign in external \"numeric\" value"
 msgstr "el signo no es válido en el valor «numeric» externo"
 
-#: utils/adt/numeric.c:785
+#: utils/adt/numeric.c:781
 #, c-format
 msgid "invalid scale in external \"numeric\" value"
 msgstr "la escala no es válida en el valor «numeric» externo"
 
-#: utils/adt/numeric.c:794
+#: utils/adt/numeric.c:790
 #, c-format
 msgid "invalid digit in external \"numeric\" value"
 msgstr "hay un dígito no válido en el valor «numeric» externo"
 
-#: utils/adt/numeric.c:985 utils/adt/numeric.c:999
+#: utils/adt/numeric.c:981 utils/adt/numeric.c:995
 #, 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/adt/numeric.c:990
+#: utils/adt/numeric.c:986
 #, 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/adt/numeric.c:1008
+#: utils/adt/numeric.c:1004
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "modificador de tipo NUMERIC no es válido"
 
-#: utils/adt/numeric.c:1340
-#, fuzzy, c-format
+#: utils/adt/numeric.c:1336
+#, c-format
 msgid "start value cannot be NaN"
-msgstr "el timestamp no puede ser NaN"
+msgstr "el valor de inicio no puede ser NaN"
 
-#: utils/adt/numeric.c:1345
-#, fuzzy, c-format
+#: utils/adt/numeric.c:1341
+#, c-format
 msgid "stop value cannot be NaN"
-msgstr "el timestamp no puede ser NaN"
+msgstr "el valor de término no puede ser NaN"
 
-#: utils/adt/numeric.c:1355
-#, fuzzy, c-format
+#: utils/adt/numeric.c:1351
+#, c-format
 msgid "step size cannot be NaN"
-msgstr "el tamaño de paso no puede ser cero"
+msgstr "el tamaño de paso no puede ser NaN"
 
-#: utils/adt/numeric.c:2550 utils/adt/numeric.c:5104 utils/adt/numeric.c:7126
+#: utils/adt/numeric.c:2546 utils/adt/numeric.c:4662 utils/adt/numeric.c:5107
+#: utils/adt/numeric.c:7135
 #, c-format
 msgid "value overflows numeric format"
 msgstr "el valor excede el formato numeric"
 
-#: utils/adt/numeric.c:2881
+#: utils/adt/numeric.c:2877
 #, c-format
 msgid "cannot convert NaN to integer"
 msgstr "no se puede convertir NaN a entero"
 
-#: utils/adt/numeric.c:2947
+#: utils/adt/numeric.c:2943
 #, c-format
 msgid "cannot convert NaN to bigint"
 msgstr "no se puede convertir NaN a bigint"
 
-#: utils/adt/numeric.c:2992
+#: utils/adt/numeric.c:2988
 #, c-format
 msgid "cannot convert NaN to smallint"
 msgstr "no se puede convertir NaN a smallint"
 
-#: utils/adt/numeric.c:5174
+#: utils/adt/numeric.c:5177
 #, c-format
 msgid "numeric field overflow"
 msgstr "desbordamiento de campo numeric"
 
-#: utils/adt/numeric.c:5175
+#: utils/adt/numeric.c:5178
 #, 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:6683
+#: utils/adt/numeric.c:6692
 #, c-format
 msgid "argument for function \"exp\" too big"
 msgstr "el argumento a la función «exp» es demasiado grande"
@@ -18529,37 +18492,37 @@
 msgid "percentile value %g is not between 0 and 1"
 msgstr "el valor de percentil %g no está entre 0 y 1"
 
-#: utils/adt/pg_locale.c:911
+#: utils/adt/pg_locale.c:1029
 #, c-format
 msgid "Apply system library package updates."
-msgstr ""
+msgstr "Aplique actualizaciones de paquetes de bibliotecas del sistema."
 
-#: utils/adt/pg_locale.c:1116
+#: utils/adt/pg_locale.c:1234
 #, c-format
 msgid "could not create locale \"%s\": %m"
 msgstr "no se pudo crear la configuración regional «%s»: %m"
 
-#: utils/adt/pg_locale.c:1119
+#: utils/adt/pg_locale.c:1237
 #, c-format
 msgid "The operating system could not find any locale data for the locale name \"%s\"."
 msgstr "El sistema operativo no pudo encontrar datos de configuración regional para la configuración «%s»."
 
-#: utils/adt/pg_locale.c:1206
+#: utils/adt/pg_locale.c:1324
 #, c-format
 msgid "collations with different collate and ctype values are not supported on this platform"
 msgstr "los ordenamientos (collation) con valores collate y ctype diferentes no están soportados en esta plataforma"
 
-#: utils/adt/pg_locale.c:1221
+#: utils/adt/pg_locale.c:1339
 #, c-format
 msgid "nondefault collations are not supported on this platform"
 msgstr "los ordenamientos (collation) distintos del ordenamiento por omisión no están soportados en esta plataforma"
 
-#: utils/adt/pg_locale.c:1392
+#: utils/adt/pg_locale.c:1510
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "el carácter multibyte no es válido para esta configuración regional"
 
-#: utils/adt/pg_locale.c:1393
+#: utils/adt/pg_locale.c:1511
 #, c-format
 msgid "The server's LC_CTYPE locale is probably incompatible with the database encoding."
 msgstr "La configuración regional LC_CTYPE del servidor es probablemente incompatible con la codificación de la base de datos."
@@ -18570,9 +18533,9 @@
 msgstr "la sintaxis de entrada no es válida para tipo pg_lsn: «%s»"
 
 #: utils/adt/pg_upgrade_support.c:39
-#, fuzzy, c-format
+#, c-format
 msgid "function can only be called when server is in binary upgrade mode"
-msgstr "debe ser superusuario para conectarse en modo de actualización binaria"
+msgstr "la función sólo puede invocarse cuando el servidor está en modo de actualización binaria"
 
 #: utils/adt/pseudotypes.c:95
 #, c-format
@@ -18640,14 +18603,14 @@
 msgstr "no se puede desplegar un valor de tipo fdw_handler"
 
 #: utils/adt/pseudotypes.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "cannot accept a value of type tsm_handler"
-msgstr "no se puede aceptar un valor de tipo fdw_handler"
+msgstr "no se puede aceptar un valor de tipo tsm_handler"
 
 #: utils/adt/pseudotypes.c:397
-#, fuzzy, c-format
+#, c-format
 msgid "cannot display a value of type tsm_handler"
-msgstr "no se puede desplegar un valor de tipo fdw_handler"
+msgstr "no se puede desplegar un valor de tipo tsm_handler"
 
 #: utils/adt/pseudotypes.c:411
 #, c-format
@@ -18701,81 +18664,81 @@
 
 #: utils/adt/pseudotypes.c:552 utils/adt/pseudotypes.c:577
 #: utils/adt/pseudotypes.c:605 utils/adt/pseudotypes.c:633
-#, fuzzy, c-format
+#, c-format
 msgid "cannot accept a value of type %s"
-msgstr "no se puede aceptar un valor de tipo any"
+msgstr "no se puede aceptar un valor de tipo %s"
 
 #: utils/adt/pseudotypes.c:620 utils/adt/pseudotypes.c:646
-#, fuzzy, c-format
+#, c-format
 msgid "cannot output a value of type %s"
-msgstr "no se puede aceptar un valor de tipo any"
+msgstr "no se puede desplegar un valor de tipo %s"
 
-#: utils/adt/rangetypes.c:396
+#: utils/adt/rangetypes.c:405
 #, c-format
 msgid "range constructor flags argument must not be null"
 msgstr "el argumento de opciones del constructor de rango no debe ser null"
 
-#: utils/adt/rangetypes.c:983
+#: utils/adt/rangetypes.c:992
 #, c-format
 msgid "result of range difference would not be contiguous"
 msgstr "el resultado de la diferencia de rangos no sería contiguo"
 
-#: utils/adt/rangetypes.c:1044
+#: utils/adt/rangetypes.c:1053
 #, c-format
 msgid "result of range union would not be contiguous"
 msgstr "el resultado de la unión de rangos no sería contiguo"
 
-#: utils/adt/rangetypes.c:1530
+#: utils/adt/rangetypes.c:1543
 #, c-format
 msgid "range lower bound must be less than or equal to range upper bound"
 msgstr "el límite inferior del rango debe ser menor o igual al límite superior del rango"
 
-#: utils/adt/rangetypes.c:1913 utils/adt/rangetypes.c:1926
-#: utils/adt/rangetypes.c:1940
+#: utils/adt/rangetypes.c:1926 utils/adt/rangetypes.c:1939
+#: utils/adt/rangetypes.c:1953
 #, c-format
 msgid "invalid range bound flags"
 msgstr "opciones de bordes de rango no válidas"
 
-#: utils/adt/rangetypes.c:1914 utils/adt/rangetypes.c:1927
-#: utils/adt/rangetypes.c:1941
+#: utils/adt/rangetypes.c:1927 utils/adt/rangetypes.c:1940
+#: utils/adt/rangetypes.c:1954
 #, c-format
 msgid "Valid values are \"[]\", \"[)\", \"(]\", and \"()\"."
 msgstr "Los valores aceptables son «[]», «[)», «(]» y «()»."
 
-#: utils/adt/rangetypes.c:2006 utils/adt/rangetypes.c:2023
-#: utils/adt/rangetypes.c:2036 utils/adt/rangetypes.c:2054
-#: utils/adt/rangetypes.c:2065 utils/adt/rangetypes.c:2109
-#: utils/adt/rangetypes.c:2117
+#: utils/adt/rangetypes.c:2019 utils/adt/rangetypes.c:2036
+#: utils/adt/rangetypes.c:2049 utils/adt/rangetypes.c:2067
+#: utils/adt/rangetypes.c:2078 utils/adt/rangetypes.c:2122
+#: utils/adt/rangetypes.c:2130
 #, c-format
 msgid "malformed range literal: \"%s\""
 msgstr "literal de rango mal formado: «%s»"
 
-#: utils/adt/rangetypes.c:2008
+#: utils/adt/rangetypes.c:2021
 #, c-format
 msgid "Junk after \"empty\" key word."
 msgstr "Basura a continuación de la palabra «empty»."
 
-#: utils/adt/rangetypes.c:2025
+#: utils/adt/rangetypes.c:2038
 #, c-format
 msgid "Missing left parenthesis or bracket."
 msgstr "Falta paréntesis o corchete izquierdo."
 
-#: utils/adt/rangetypes.c:2038
+#: utils/adt/rangetypes.c:2051
 #, c-format
 msgid "Missing comma after lower bound."
 msgstr "Coma faltante después del límite inferior."
 
-#: utils/adt/rangetypes.c:2056
+#: utils/adt/rangetypes.c:2069
 #, c-format
 msgid "Too many commas."
 msgstr "Demasiadas comas."
 
-#: utils/adt/rangetypes.c:2067
+#: utils/adt/rangetypes.c:2080
 #, c-format
 msgid "Junk after right parenthesis or bracket."
 msgstr "Basura después del paréntesis o corchete derecho."
 
-#: utils/adt/regexp.c:285 utils/adt/regexp.c:1288 utils/adt/varlena.c:3588
+#: utils/adt/regexp.c:285 utils/adt/regexp.c:1288 utils/adt/varlena.c:3601
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "la expresión regular falló: %s"
@@ -18800,18 +18763,18 @@
 msgid "more than one operator named %s"
 msgstr "existe más de un operador llamado %s"
 
-#: utils/adt/regproc.c:774 utils/adt/regproc.c:815 gram.y:7232
+#: utils/adt/regproc.c:774 utils/adt/regproc.c:815 gram.y:7246
 #, c-format
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: utils/adt/regproc.c:775 utils/adt/regproc.c:816 gram.y:7233
+#: utils/adt/regproc.c:775 utils/adt/regproc.c:816 gram.y:7247
 #, c-format
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr "Use NONE para denotar el argumento faltante de un operador unario."
 
-#: utils/adt/regproc.c:779 utils/adt/regproc.c:820 utils/adt/regproc.c:1962
-#: utils/adt/ruleutils.c:8060 utils/adt/ruleutils.c:8185
+#: utils/adt/regproc.c:779 utils/adt/regproc.c:820 utils/adt/regproc.c:2006
+#: utils/adt/ruleutils.c:8222 utils/adt/ruleutils.c:8347
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
@@ -18821,75 +18784,76 @@
 msgid "Provide two argument types for operator."
 msgstr "Provea dos tipos de argumento para un operador."
 
-#: utils/adt/regproc.c:1797 utils/adt/regproc.c:1802 utils/adt/varlena.c:2859
-#: utils/adt/varlena.c:2864
+#: utils/adt/regproc.c:1594 utils/adt/regproc.c:1618 utils/adt/regproc.c:1715
+#: utils/adt/regproc.c:1739 utils/adt/regproc.c:1841 utils/adt/regproc.c:1846
+#: utils/adt/varlena.c:2872 utils/adt/varlena.c:2877
 #, c-format
 msgid "invalid name syntax"
 msgstr "la sintaxis de nombre no es válida"
 
-#: utils/adt/regproc.c:1860
+#: utils/adt/regproc.c:1904
 #, c-format
 msgid "expected a left parenthesis"
 msgstr "se esperaba un paréntesis izquierdo"
 
-#: utils/adt/regproc.c:1876
+#: utils/adt/regproc.c:1920
 #, c-format
 msgid "expected a right parenthesis"
 msgstr "se esperaba un paréntesis derecho"
 
-#: utils/adt/regproc.c:1895
+#: utils/adt/regproc.c:1939
 #, c-format
 msgid "expected a type name"
 msgstr "se esperaba un nombre de tipo"
 
-#: utils/adt/regproc.c:1927
+#: utils/adt/regproc.c:1971
 #, c-format
 msgid "improper type name"
 msgstr "el nombre de tipo no es válido"
 
-#: utils/adt/ri_triggers.c:316 utils/adt/ri_triggers.c:373
-#: utils/adt/ri_triggers.c:792 utils/adt/ri_triggers.c:1015
-#: utils/adt/ri_triggers.c:1171 utils/adt/ri_triggers.c:1352
-#: utils/adt/ri_triggers.c:1517 utils/adt/ri_triggers.c:1693
-#: utils/adt/ri_triggers.c:1873 utils/adt/ri_triggers.c:2064
-#: utils/adt/ri_triggers.c:2122 utils/adt/ri_triggers.c:2227
-#: utils/adt/ri_triggers.c:2404 gram.y:3311
+#: utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:371
+#: utils/adt/ri_triggers.c:790 utils/adt/ri_triggers.c:1013
+#: utils/adt/ri_triggers.c:1169 utils/adt/ri_triggers.c:1350
+#: utils/adt/ri_triggers.c:1515 utils/adt/ri_triggers.c:1691
+#: utils/adt/ri_triggers.c:1871 utils/adt/ri_triggers.c:2062
+#: utils/adt/ri_triggers.c:2120 utils/adt/ri_triggers.c:2225
+#: utils/adt/ri_triggers.c:2402 gram.y:3325
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL no está implementada"
 
-#: utils/adt/ri_triggers.c:345 utils/adt/ri_triggers.c:2492
+#: utils/adt/ri_triggers.c:343 utils/adt/ri_triggers.c:2490
 #: utils/adt/ri_triggers.c:3315
 #, 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/adt/ri_triggers.c:348 utils/adt/ri_triggers.c:2495
+#: utils/adt/ri_triggers.c:346 utils/adt/ri_triggers.c:2493
 #, c-format
 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/ri_triggers.c:2734
+#: utils/adt/ri_triggers.c:2732
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr "la función «%s» debe ser ejecutada en INSERT"
 
-#: utils/adt/ri_triggers.c:2740
+#: utils/adt/ri_triggers.c:2738
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr "la función «%s» debe ser ejecutada en UPDATE"
 
-#: utils/adt/ri_triggers.c:2746
+#: utils/adt/ri_triggers.c:2744
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr "la función «%s» debe ser ejecutada en DELETE"
 
-#: utils/adt/ri_triggers.c:2769
+#: utils/adt/ri_triggers.c:2767
 #, 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/adt/ri_triggers.c:2771
+#: utils/adt/ri_triggers.c:2769
 #, c-format
 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."
@@ -18929,75 +18893,75 @@
 msgid "Key is still referenced from table \"%s\"."
 msgstr "La llave todavía es referida desde la tabla «%s»."
 
-#: utils/adt/rowtypes.c:100 utils/adt/rowtypes.c:472
+#: utils/adt/rowtypes.c:103 utils/adt/rowtypes.c:479
 #, c-format
 msgid "input of anonymous composite types is not implemented"
 msgstr "el ingreso de tipos compuestos anónimos no está implementado"
 
-#: utils/adt/rowtypes.c:152 utils/adt/rowtypes.c:180 utils/adt/rowtypes.c:203
-#: utils/adt/rowtypes.c:211 utils/adt/rowtypes.c:263 utils/adt/rowtypes.c:271
+#: utils/adt/rowtypes.c:155 utils/adt/rowtypes.c:183 utils/adt/rowtypes.c:206
+#: utils/adt/rowtypes.c:214 utils/adt/rowtypes.c:266 utils/adt/rowtypes.c:274
 #, c-format
 msgid "malformed record literal: \"%s\""
 msgstr "literal de record no es válido: «%s»"
 
-#: utils/adt/rowtypes.c:153
+#: utils/adt/rowtypes.c:156
 #, c-format
 msgid "Missing left parenthesis."
 msgstr "Falta paréntesis izquierdo."
 
-#: utils/adt/rowtypes.c:181
+#: utils/adt/rowtypes.c:184
 #, c-format
 msgid "Too few columns."
 msgstr "Muy pocas columnas."
 
-#: utils/adt/rowtypes.c:264
+#: utils/adt/rowtypes.c:267
 #, c-format
 msgid "Too many columns."
 msgstr "Demasiadas columnas."
 
-#: utils/adt/rowtypes.c:272
+#: utils/adt/rowtypes.c:275
 #, c-format
 msgid "Junk after right parenthesis."
 msgstr "Basura después del paréntesis derecho."
 
-#: utils/adt/rowtypes.c:521
+#: utils/adt/rowtypes.c:528
 #, 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:548
+#: utils/adt/rowtypes.c:555
 #, c-format
 msgid "wrong data type: %u, expected %u"
 msgstr "tipo de dato erróneo: %u, se esperaba %u"
 
-#: utils/adt/rowtypes.c:609
+#: utils/adt/rowtypes.c:616
 #, c-format
 msgid "improper binary format in record column %d"
 msgstr "formato binario incorrecto en la columna record %d"
 
-#: utils/adt/rowtypes.c:891 utils/adt/rowtypes.c:1129
-#: utils/adt/rowtypes.c:1383 utils/adt/rowtypes.c:1660
+#: utils/adt/rowtypes.c:902 utils/adt/rowtypes.c:1142
+#: utils/adt/rowtypes.c:1396 utils/adt/rowtypes.c:1673
 #, 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:980 utils/adt/rowtypes.c:1200
-#: utils/adt/rowtypes.c:1516 utils/adt/rowtypes.c:1756
+#: utils/adt/rowtypes.c:991 utils/adt/rowtypes.c:1213
+#: utils/adt/rowtypes.c:1529 utils/adt/rowtypes.c:1769
 #, c-format
 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:4076
+#: utils/adt/ruleutils.c:4150
 #, 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:5260
+#: utils/adt/selfuncs.c:5364
 #, c-format
 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:5363
+#: utils/adt/selfuncs.c:5467
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
 msgstr "no está soportada la comparación con expresiones regulares en bytea"
@@ -19058,15 +19022,15 @@
 msgid "timestamp out of range: %d-%02d-%02d %d:%02d:%02g"
 msgstr "timestamp fuera de rango: %d-%02d-%02d %d:%02d:%02g"
 
-#: utils/adt/timestamp.c:912 utils/adt/timestamp.c:1483
-#: utils/adt/timestamp.c:1986 utils/adt/timestamp.c:3126
-#: utils/adt/timestamp.c:3131 utils/adt/timestamp.c:3136
-#: utils/adt/timestamp.c:3186 utils/adt/timestamp.c:3193
-#: utils/adt/timestamp.c:3200 utils/adt/timestamp.c:3220
-#: utils/adt/timestamp.c:3227 utils/adt/timestamp.c:3234
-#: utils/adt/timestamp.c:3263 utils/adt/timestamp.c:3270
-#: utils/adt/timestamp.c:3315 utils/adt/timestamp.c:3606
-#: utils/adt/timestamp.c:3735 utils/adt/timestamp.c:4126
+#: utils/adt/timestamp.c:912 utils/adt/timestamp.c:1536
+#: utils/adt/timestamp.c:2042 utils/adt/timestamp.c:3224
+#: utils/adt/timestamp.c:3229 utils/adt/timestamp.c:3234
+#: utils/adt/timestamp.c:3284 utils/adt/timestamp.c:3291
+#: utils/adt/timestamp.c:3298 utils/adt/timestamp.c:3318
+#: utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3332
+#: utils/adt/timestamp.c:3361 utils/adt/timestamp.c:3368
+#: utils/adt/timestamp.c:3413 utils/adt/timestamp.c:3704
+#: utils/adt/timestamp.c:3833 utils/adt/timestamp.c:4224
 #, c-format
 msgid "interval out of range"
 msgstr "interval fuera de rango"
@@ -19086,54 +19050,54 @@
 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:1427
+#: utils/adt/timestamp.c:1480
 #, 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:2715
+#: utils/adt/timestamp.c:2813
 #, c-format
 msgid "cannot subtract infinite timestamps"
 msgstr "no se pueden restar timestamps infinitos"
 
-#: utils/adt/timestamp.c:3861 utils/adt/timestamp.c:4487
-#: utils/adt/timestamp.c:4507
+#: utils/adt/timestamp.c:3959 utils/adt/timestamp.c:4585
+#: utils/adt/timestamp.c:4605
 #, c-format
 msgid "timestamp units \"%s\" not supported"
 msgstr "las unidades de timestamp «%s» no están soportadas"
 
-#: utils/adt/timestamp.c:3875 utils/adt/timestamp.c:4517
+#: utils/adt/timestamp.c:3973 utils/adt/timestamp.c:4615
 #, c-format
 msgid "timestamp units \"%s\" not recognized"
 msgstr "las unidades de timestamp «%s» no son reconocidas"
 
-#: utils/adt/timestamp.c:4015 utils/adt/timestamp.c:4698
-#: utils/adt/timestamp.c:4719
+#: utils/adt/timestamp.c:4113 utils/adt/timestamp.c:4796
+#: utils/adt/timestamp.c:4817
 #, 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:4032 utils/adt/timestamp.c:4728
+#: utils/adt/timestamp.c:4130 utils/adt/timestamp.c:4826
 #, 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:4113
+#: utils/adt/timestamp.c:4211
 #, c-format
 msgid "interval units \"%s\" not supported because months usually have fractional weeks"
 msgstr "las unidades de intervalo «%s» no están soportadas porque los meses normalmente tienen semanas fraccionales"
 
-#: utils/adt/timestamp.c:4119 utils/adt/timestamp.c:4834
+#: utils/adt/timestamp.c:4217 utils/adt/timestamp.c:4932
 #, c-format
 msgid "interval units \"%s\" not supported"
 msgstr "las unidades de interval «%s» no están soportadas"
 
-#: utils/adt/timestamp.c:4135 utils/adt/timestamp.c:4861
+#: utils/adt/timestamp.c:4233 utils/adt/timestamp.c:4959
 #, c-format
 msgid "interval units \"%s\" not recognized"
 msgstr "las unidades de interval «%s» no son reconocidas"
 
-#: utils/adt/timestamp.c:5025 utils/adt/timestamp.c:5255
+#: utils/adt/timestamp.c:5054 utils/adt/timestamp.c:5250
 #, c-format
 msgid "could not convert to time zone \"%s\""
 msgstr "no se pudo convertir al huso horario «%s»"
@@ -19194,17 +19158,17 @@
 msgid "text-search query doesn't contain lexemes: \"%s\""
 msgstr "la consulta de búsqueda en texto no contiene lexemas: «%s»"
 
-#: utils/adt/tsquery.c:521 utils/adt/tsquery_util.c:340
+#: utils/adt/tsquery.c:521 utils/adt/tsquery_util.c:371
 #, c-format
 msgid "tsquery is too large"
 msgstr "el tsquery es demasiado grande"
 
-#: utils/adt/tsquery_cleanup.c:284
+#: utils/adt/tsquery_cleanup.c:287
 #, c-format
 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:293
+#: utils/adt/tsquery_rewrite.c:322
 #, c-format
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "consulta ts_rewrite debe retornar dos columnas tsquery"
@@ -19239,42 +19203,42 @@
 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
+#: utils/adt/tsvector_op.c:1174
 #, c-format
 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
+#: utils/adt/tsvector_op.c:1354
 #, c-format
 msgid "tsvector column \"%s\" does not exist"
 msgstr "la columna tsvector «%s» no existe"
 
-#: utils/adt/tsvector_op.c:1359
+#: utils/adt/tsvector_op.c:1360
 #, 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
+#: utils/adt/tsvector_op.c:1372
 #, c-format
 msgid "configuration column \"%s\" does not exist"
 msgstr "la columna de configuración «%s» no existe"
 
-#: utils/adt/tsvector_op.c:1377
+#: utils/adt/tsvector_op.c:1378
 #, 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
+#: utils/adt/tsvector_op.c:1385
 #, 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
+#: utils/adt/tsvector_op.c:1398
 #, 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
+#: utils/adt/tsvector_op.c:1423
 #, c-format
 msgid "column \"%s\" is not of a character type"
 msgstr "la columna «%s» no es de un tipo textual"
@@ -19295,14 +19259,14 @@
 msgstr "información posicional incorrecta en tsvector: «%s»"
 
 #: utils/adt/txid.c:339
-#, fuzzy, c-format
+#, c-format
 msgid "invalid input syntax for type txid_snapshot: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo tid: «%s»"
+msgstr "la sintaxis de entrada no es válida para tipo txid_snapshot: «%s»"
 
 #: utils/adt/txid.c:534
-#, fuzzy, c-format
+#, c-format
 msgid "invalid external txid_snapshot data"
-msgstr "valor externo «cidr» no válido"
+msgstr "valor externo txid_snapshot no válido"
 
 #: utils/adt/uuid.c:128
 #, c-format
@@ -19350,8 +19314,8 @@
 msgstr "la cadena de bits es demasiado larga para el tipo bit varying(%d)"
 
 #: utils/adt/varbit.c:1066 utils/adt/varbit.c:1168 utils/adt/varlena.c:832
-#: utils/adt/varlena.c:896 utils/adt/varlena.c:1040 utils/adt/varlena.c:2510
-#: utils/adt/varlena.c:2577
+#: utils/adt/varlena.c:896 utils/adt/varlena.c:1040 utils/adt/varlena.c:2523
+#: utils/adt/varlena.c:2590
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "no se permite un largo negativo de subcadena"
@@ -19371,12 +19335,12 @@
 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:1793 utils/adt/varbit.c:1851
+#: utils/adt/varbit.c:1803 utils/adt/varbit.c:1861
 #, 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:1802 utils/adt/varlena.c:2777
+#: utils/adt/varbit.c:1812 utils/adt/varlena.c:2790
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "el nuevo bit debe ser 0 o 1"
@@ -19406,48 +19370,48 @@
 msgid "could not compare Unicode strings: %m"
 msgstr "no se pudieron comparar las cadenas Unicode: %m"
 
-#: utils/adt/varlena.c:2655 utils/adt/varlena.c:2686 utils/adt/varlena.c:2722
-#: utils/adt/varlena.c:2765
+#: utils/adt/varlena.c:2668 utils/adt/varlena.c:2699 utils/adt/varlena.c:2735
+#: utils/adt/varlena.c:2778
 #, 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:3684
+#: utils/adt/varlena.c:3697
 #, c-format
 msgid "field position must be greater than zero"
 msgstr "la posición del campo debe ser mayor que cero"
 
-#: utils/adt/varlena.c:4563
+#: utils/adt/varlena.c:4576
 #, c-format
 msgid "unterminated format specifier"
 msgstr "especificador de formato inconcluso"
 
-#: utils/adt/varlena.c:4695 utils/adt/varlena.c:4815
+#: utils/adt/varlena.c:4708 utils/adt/varlena.c:4828
 #, c-format
 msgid "unrecognized conversion type specifier \"%c\""
 msgstr "especificador de conversión de tipo no reconocido: «%c»"
 
-#: utils/adt/varlena.c:4707 utils/adt/varlena.c:4764
+#: utils/adt/varlena.c:4720 utils/adt/varlena.c:4777
 #, c-format
 msgid "too few arguments for format"
 msgstr "muy pocos argumentos para el formato"
 
-#: utils/adt/varlena.c:4858 utils/adt/varlena.c:5041
+#: utils/adt/varlena.c:4871 utils/adt/varlena.c:5054
 #, c-format
 msgid "number is out of range"
 msgstr "el número está fuera de rango"
 
-#: utils/adt/varlena.c:4922 utils/adt/varlena.c:4950
+#: utils/adt/varlena.c:4935 utils/adt/varlena.c:4963
 #, c-format
 msgid "format 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:4943
+#: utils/adt/varlena.c:4956
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "la posición del argumento de anchura debe terminar con «$»"
 
-#: utils/adt/varlena.c:4988
+#: utils/adt/varlena.c:5001
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "los valores nulos no pueden ser formateados como un identificador SQL"
@@ -19462,141 +19426,141 @@
 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:171
+#: utils/adt/xml.c:175
 #, c-format
 msgid "unsupported XML feature"
 msgstr "característica XML no soportada"
 
-#: utils/adt/xml.c:172
+#: utils/adt/xml.c:176
 #, c-format
 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:173
+#: utils/adt/xml.c:177
 #, c-format
 msgid "You need to rebuild PostgreSQL using --with-libxml."
 msgstr "Necesita reconstruir PostgreSQL usando --with-libxml."
 
-#: utils/adt/xml.c:192 utils/mb/mbutils.c:523
+#: utils/adt/xml.c:196 utils/mb/mbutils.c:523
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "nombre de codificación «%s» no válido"
 
-#: utils/adt/xml.c:435 utils/adt/xml.c:440
+#: utils/adt/xml.c:439 utils/adt/xml.c:444
 #, c-format
 msgid "invalid XML comment"
 msgstr "comentario XML no válido"
 
-#: utils/adt/xml.c:569
+#: utils/adt/xml.c:573
 #, c-format
 msgid "not an XML document"
 msgstr "no es un documento XML"
 
-#: utils/adt/xml.c:728 utils/adt/xml.c:751
+#: utils/adt/xml.c:732 utils/adt/xml.c:755
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "instrucción de procesamiento XML no válida"
 
-#: utils/adt/xml.c:729
+#: utils/adt/xml.c:733
 #, 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:752
+#: utils/adt/xml.c:756
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "la instrucción de procesamiento XML no puede contener «?>»."
 
-#: utils/adt/xml.c:831
+#: utils/adt/xml.c:835
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "xmlvalidate no está implementado"
 
-#: utils/adt/xml.c:910
+#: utils/adt/xml.c:914
 #, c-format
 msgid "could not initialize XML library"
 msgstr "no se pudo inicializar la biblioteca XML"
 
-#: utils/adt/xml.c:911
+#: utils/adt/xml.c:915
 #, 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:997
+#: utils/adt/xml.c:1001
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "no se pudo instalar un gestor de errores XML"
 
-#: utils/adt/xml.c:998
+#: utils/adt/xml.c:1002
 #, c-format
 msgid "This probably indicates that the version of libxml2 being used is not compatible with the libxml2 header files that PostgreSQL was built with."
 msgstr "Esto probablemente indica que la versión de libxml2 en uso no es compatible con los archivos de cabecera libxml2 con los que PostgreSQL fue construido."
 
-#: utils/adt/xml.c:1737
+#: utils/adt/xml.c:1741
 msgid "Invalid character value."
 msgstr "Valor de carácter no válido."
 
-#: utils/adt/xml.c:1740
+#: utils/adt/xml.c:1744
 msgid "Space required."
 msgstr "Se requiere un espacio."
 
-#: utils/adt/xml.c:1743
+#: utils/adt/xml.c:1747
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "standalone acepta sólo 'yes' y 'no'."
 
-#: utils/adt/xml.c:1746
+#: utils/adt/xml.c:1750
 msgid "Malformed declaration: missing version."
 msgstr "Declaración mal formada: falta la versión."
 
-#: utils/adt/xml.c:1749
+#: utils/adt/xml.c:1753
 msgid "Missing encoding in text declaration."
 msgstr "Falta especificación de codificación en declaración de texto."
 
-#: utils/adt/xml.c:1752
+#: utils/adt/xml.c:1756
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "Procesando declaración XML: se esperaba '?>'."
 
-#: utils/adt/xml.c:1755
+#: utils/adt/xml.c:1759
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "Código de error libxml no reconocido: %d."
 
-#: utils/adt/xml.c:2030
+#: utils/adt/xml.c:2034
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML no soporta valores infinitos de fecha."
 
-#: utils/adt/xml.c:2052 utils/adt/xml.c:2079
+#: utils/adt/xml.c:2056 utils/adt/xml.c:2083
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML no soporta valores infinitos de timestamp."
 
-#: utils/adt/xml.c:2470
+#: utils/adt/xml.c:2483
 #, c-format
 msgid "invalid query"
 msgstr "consulta no válido"
 
-#: utils/adt/xml.c:3795
+#: utils/adt/xml.c:3808
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "array no válido para mapeo de espacio de nombres XML"
 
-#: utils/adt/xml.c:3796
+#: utils/adt/xml.c:3809
 #, c-format
 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:3820
+#: utils/adt/xml.c:3833
 #, c-format
 msgid "empty XPath expression"
 msgstr "expresion XPath vacía"
 
-#: utils/adt/xml.c:3869
+#: utils/adt/xml.c:3882
 #, c-format
 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:3876
+#: utils/adt/xml.c:3889
 #, 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»"
@@ -19617,22 +19581,22 @@
 msgid "no output function available for type %s"
 msgstr "no hay una función de salida para el tipo %s"
 
-#: utils/cache/plancache.c:725
+#: utils/cache/plancache.c:731
 #, c-format
 msgid "cached plan must not change result type"
 msgstr "el plan almacenado no debe cambiar el tipo de resultado"
 
-#: utils/cache/relcache.c:5021
+#: utils/cache/relcache.c:5048
 #, 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:5023
+#: utils/cache/relcache.c:5050
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Prosiguiendo de todas maneras, pero hay algo mal."
 
-#: utils/cache/relcache.c:5256
+#: utils/cache/relcache.c:5283
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "no se pudo eliminar el archivo de cache «%s»: %m"
@@ -19677,12 +19641,12 @@
 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:1156
+#: utils/cache/typcache.c:1210
 #, c-format
 msgid "type %s is not composite"
 msgstr "el tipo %s no es compuesto"
 
-#: utils/cache/typcache.c:1170
+#: utils/cache/typcache.c:1224
 #, c-format
 msgid "record type has not been registered"
 msgstr "el tipo record no ha sido registrado"
@@ -19702,184 +19666,184 @@
 msgid "error occurred at %s:%d before error message processing is available\n"
 msgstr "ocurrió un error en %s:%d antes de que el procesamiento de mensajes de error esté disponible\n"
 
-#: utils/error/elog.c:1864
+#: utils/error/elog.c:1873
 #, 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:1877
+#: utils/error/elog.c:1886
 #, 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:2353 utils/error/elog.c:2370 utils/error/elog.c:2386
+#: utils/error/elog.c:2362 utils/error/elog.c:2379 utils/error/elog.c:2395
 msgid "[unknown]"
 msgstr "[desconocido]"
 
-#: utils/error/elog.c:2825 utils/error/elog.c:3124 utils/error/elog.c:3232
+#: utils/error/elog.c:2834 utils/error/elog.c:3133 utils/error/elog.c:3241
 msgid "missing error text"
 msgstr "falta un texto de mensaje de error"
 
-#: utils/error/elog.c:2828 utils/error/elog.c:2831 utils/error/elog.c:3235
-#: utils/error/elog.c:3238
+#: utils/error/elog.c:2837 utils/error/elog.c:2840 utils/error/elog.c:3244
+#: utils/error/elog.c:3247
 #, c-format
 msgid " at character %d"
 msgstr " en carácter %d"
 
-#: utils/error/elog.c:2841 utils/error/elog.c:2848
+#: utils/error/elog.c:2850 utils/error/elog.c:2857
 msgid "DETAIL:  "
 msgstr "DETALLE:  "
 
-#: utils/error/elog.c:2855
+#: utils/error/elog.c:2864
 msgid "HINT:  "
 msgstr "HINT:  "
 
-#: utils/error/elog.c:2862
+#: utils/error/elog.c:2871
 msgid "QUERY:  "
 msgstr "CONSULTA:  "
 
-#: utils/error/elog.c:2869
+#: utils/error/elog.c:2878
 msgid "CONTEXT:  "
 msgstr "CONTEXTO:  "
 
-#: utils/error/elog.c:2879
+#: utils/error/elog.c:2888
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "UBICACIÓN:  %s, %s:%d\n"
 
-#: utils/error/elog.c:2886
+#: utils/error/elog.c:2895
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "UBICACIÓN:  %s:%d\n"
 
-#: utils/error/elog.c:2900
+#: utils/error/elog.c:2909
 msgid "STATEMENT:  "
 msgstr "SENTENCIA:  "
 
 #. translator: This string will be truncated at 47
 #. characters expanded.
-#: utils/error/elog.c:3353
+#: utils/error/elog.c:3362
 #, c-format
 msgid "operating system error %d"
 msgstr "error %d de sistema operativo"
 
-#: utils/error/elog.c:3548
+#: utils/error/elog.c:3557
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: utils/error/elog.c:3552
+#: utils/error/elog.c:3561
 msgid "LOG"
 msgstr "LOG"
 
-#: utils/error/elog.c:3555
+#: utils/error/elog.c:3564
 msgid "INFO"
 msgstr "INFO"
 
-#: utils/error/elog.c:3558
+#: utils/error/elog.c:3567
 msgid "NOTICE"
 msgstr "NOTICE"
 
-#: utils/error/elog.c:3561
+#: utils/error/elog.c:3570
 msgid "WARNING"
 msgstr "WARNING"
 
-#: utils/error/elog.c:3564
+#: utils/error/elog.c:3573
 msgid "ERROR"
 msgstr "ERROR"
 
-#: utils/error/elog.c:3567
+#: utils/error/elog.c:3576
 msgid "FATAL"
 msgstr "FATAL"
 
-#: utils/error/elog.c:3570
+#: utils/error/elog.c:3579
 msgid "PANIC"
 msgstr "PANIC"
 
-#: utils/fmgr/dfmgr.c:121
+#: utils/fmgr/dfmgr.c:117
 #, 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:200 utils/fmgr/dfmgr.c:409 utils/fmgr/dfmgr.c:457
+#: utils/fmgr/dfmgr.c:196 utils/fmgr/dfmgr.c:405 utils/fmgr/dfmgr.c:453
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "no se pudo acceder al archivo «%s»: %m"
 
-#: utils/fmgr/dfmgr.c:238
+#: utils/fmgr/dfmgr.c:234
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "no se pudo cargar la biblioteca «%s»: %s"
 
-#: utils/fmgr/dfmgr.c:270
+#: utils/fmgr/dfmgr.c:266
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
 msgstr "biblioteca «%s» incompatible: no se encuentra el bloque mágico"
 
-#: utils/fmgr/dfmgr.c:272
+#: utils/fmgr/dfmgr.c:268
 #, c-format
 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:308
+#: utils/fmgr/dfmgr.c:304
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
 msgstr "biblioteca «%s» incompatible: versión no coincide"
 
-#: utils/fmgr/dfmgr.c:310
+#: utils/fmgr/dfmgr.c:306
 #, 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:329
+#: utils/fmgr/dfmgr.c:325
 #, 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:338
+#: utils/fmgr/dfmgr.c:334
 #, 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:347
+#: utils/fmgr/dfmgr.c:343
 #, 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:356
+#: utils/fmgr/dfmgr.c:352
 #, 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:365
+#: utils/fmgr/dfmgr.c:361
 #, 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:372
+#: utils/fmgr/dfmgr.c:368
 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:375
+#: utils/fmgr/dfmgr.c:371
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
 msgstr "biblioteca «%s» incompatible: bloque mágico no coincide"
 
-#: utils/fmgr/dfmgr.c:539
+#: utils/fmgr/dfmgr.c:535
 #, c-format
 msgid "access to library \"%s\" is not allowed"
 msgstr "no está permitido el acceso a la biblioteca «%s»"
 
-#: utils/fmgr/dfmgr.c:565
+#: utils/fmgr/dfmgr.c:561
 #, 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:605
+#: utils/fmgr/dfmgr.c:601
 #, c-format
 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:624
+#: utils/fmgr/dfmgr.c:620
 #, c-format
 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"
@@ -19929,138 +19893,153 @@
 msgid "could not change directory to \"%s\": %m"
 msgstr "no se pudo cambiar al directorio «%s»: %m"
 
-#: utils/init/miscinit.c:425 utils/misc/guc.c:5818
+#: utils/init/miscinit.c:441 utils/misc/guc.c:5839
 #, c-format
 msgid "cannot set parameter \"%s\" within security-restricted operation"
 msgstr "no se puede definir el parámetro «%s» dentro de una operación restringida por seguridad"
 
-#: utils/init/miscinit.c:506
+#: utils/init/miscinit.c:502
+#, c-format
+msgid "role with OID %u does not exist"
+msgstr "no existe el rol con OID %u"
+
+#: utils/init/miscinit.c:532
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "al rol «%s» no se le permite conectarse"
 
-#: utils/init/miscinit.c:524
+#: utils/init/miscinit.c:550
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "demasiadas conexiones para el rol «%s»"
 
-#: utils/init/miscinit.c:584
+#: utils/init/miscinit.c:610
 #, c-format
 msgid "permission denied to set session authorization"
 msgstr "se ha denegado el permiso para cambiar el usuario actual"
 
-#: utils/init/miscinit.c:667
+#: utils/init/miscinit.c:693
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "el OID de rol no es válido: %u"
 
-#: utils/init/miscinit.c:797
+#: utils/init/miscinit.c:823
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "no se pudo crear el archivo de bloqueo «%s»: %m"
 
-#: utils/init/miscinit.c:811
+#: utils/init/miscinit.c:837
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de bloqueo «%s»: %m"
 
-#: utils/init/miscinit.c:817
+#: utils/init/miscinit.c:843
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "no se pudo leer el archivo de bloqueo «%s»: %m"
 
-#: utils/init/miscinit.c:825
+#: utils/init/miscinit.c:851
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "el archivo de bloqueo «%s» está vacío"
 
-#: utils/init/miscinit.c:826
+#: utils/init/miscinit.c:852
 #, c-format
 msgid "Either another server is starting, or the lock file is the remnant of a previous server startup crash."
 msgstr "Otro proceso servidor está iniciándose, o el archivo de bloqueo es remanente de una caída durante un inicio anterior."
 
-#: utils/init/miscinit.c:873
+#: utils/init/miscinit.c:899
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "el archivo de bloqueo «%s» ya existe"
 
-#: utils/init/miscinit.c:877
+#: utils/init/miscinit.c:903
 #, 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/init/miscinit.c:879
+#: utils/init/miscinit.c:905
 #, 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/init/miscinit.c:882
+#: utils/init/miscinit.c:908
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
 msgstr "¿Hay otro postgres (PID %d) usando el socket «%s»?"
 
-#: utils/init/miscinit.c:884
+#: utils/init/miscinit.c:910
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
 msgstr "¿Hay otro postmaster (PID %d) usando el socket «%s»?"
 
-#: utils/init/miscinit.c:920
+#: utils/init/miscinit.c:946
 #, 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"
 
-#: utils/init/miscinit.c:923
+#: utils/init/miscinit.c:949
 #, 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/init/miscinit.c:939
+#: utils/init/miscinit.c:965
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "no se pudo eliminar el archivo de bloqueo antiguo «%s»: %m"
 
-#: utils/init/miscinit.c:941
+#: utils/init/miscinit.c:967
 #, c-format
 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/init/miscinit.c:977 utils/init/miscinit.c:988
-#: utils/init/miscinit.c:998
+#: utils/init/miscinit.c:1003 utils/init/miscinit.c:1014
+#: utils/init/miscinit.c:1024
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "no se pudo escribir el archivo de bloqueo «%s»: %m"
 
-#: utils/init/miscinit.c:1127 utils/misc/guc.c:8557
+#: utils/init/miscinit.c:1153 utils/init/miscinit.c:1282 utils/misc/guc.c:8610
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "no se pudo leer el archivo «%s»: %m"
 
-#: utils/init/miscinit.c:1241 utils/init/miscinit.c:1254
+#: utils/init/miscinit.c:1272
+#, c-format
+msgid "could not open file \"%s\": %m; continuing anyway"
+msgstr "no se pudo abrir el archivo «%s»: %m; continuando de todas formas"
+
+#: utils/init/miscinit.c:1295
+#, c-format
+msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
+msgstr "el archivo de bloqueo «%s» tiene un PID erróneo: %ld en lugar de %ld"
+
+#: utils/init/miscinit.c:1337 utils/init/miscinit.c:1350
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "«%s» no es un directorio de datos válido"
 
-#: utils/init/miscinit.c:1243
+#: utils/init/miscinit.c:1339
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "Falta el archivo «%s»."
 
-#: utils/init/miscinit.c:1256
+#: utils/init/miscinit.c:1352
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "El archivo «%s» no contiene datos válidos."
 
-#: utils/init/miscinit.c:1258
+#: utils/init/miscinit.c:1354
 #, c-format
 msgid "You might need to initdb."
 msgstr "Puede ser necesario ejecutar initdb."
 
-#: utils/init/miscinit.c:1266
+#: utils/init/miscinit.c:1362
 #, 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."
 
-#: utils/init/miscinit.c:1337
+#: utils/init/miscinit.c:1433
 #, c-format
 msgid "loaded library \"%s\""
 msgstr "biblioteca «%s» cargada"
@@ -20265,1433 +20244,1436 @@
 msgid "character with byte sequence %s in encoding \"%s\" has no equivalent in encoding \"%s\""
 msgstr "carácter con secuencia de bytes %s en codificación «%s» no tiene equivalente en la codificación «%s»"
 
-#: utils/misc/guc.c:527
+#: utils/misc/guc.c:535
 msgid "Ungrouped"
 msgstr "Sin Grupo"
 
-#: utils/misc/guc.c:529
+#: utils/misc/guc.c:537
 msgid "File Locations"
 msgstr "Ubicaciones de Archivos"
 
-#: utils/misc/guc.c:531
+#: utils/misc/guc.c:539
 msgid "Connections and Authentication"
 msgstr "Conexiones y Autentificación"
 
-#: utils/misc/guc.c:533
+#: utils/misc/guc.c:541
 msgid "Connections and Authentication / Connection Settings"
 msgstr "Conexiones y Autentificación / Parámetros de Conexión"
 
-#: utils/misc/guc.c:535
+#: utils/misc/guc.c:543
 msgid "Connections and Authentication / Security and Authentication"
 msgstr "Conexiones y Autentificación / Seguridad y Autentificación"
 
-#: utils/misc/guc.c:537
+#: utils/misc/guc.c:545
 msgid "Resource Usage"
 msgstr "Uso de Recursos"
 
-#: utils/misc/guc.c:539
+#: utils/misc/guc.c:547
 msgid "Resource Usage / Memory"
 msgstr "Uso de Recursos / Memoria"
 
-#: utils/misc/guc.c:541
+#: utils/misc/guc.c:549
 msgid "Resource Usage / Disk"
 msgstr "Uso de Recursos / Disco"
 
-#: utils/misc/guc.c:543
+#: utils/misc/guc.c:551
 msgid "Resource Usage / Kernel Resources"
 msgstr "Uso de Recursos / Recursos del Kernel"
 
-#: utils/misc/guc.c:545
+#: utils/misc/guc.c:553
 msgid "Resource Usage / Cost-Based Vacuum Delay"
 msgstr "Uso de Recursos / Retardo de Vacuum por Costos"
 
-#: utils/misc/guc.c:547
+#: utils/misc/guc.c:555
 msgid "Resource Usage / Background Writer"
 msgstr "Uso de Recursos / Escritor en Segundo Plano"
 
-#: utils/misc/guc.c:549
+#: utils/misc/guc.c:557
 msgid "Resource Usage / Asynchronous Behavior"
 msgstr "Uso de Recursos / Comportamiento Asíncrono"
 
-#: utils/misc/guc.c:551
+#: utils/misc/guc.c:559
 msgid "Write-Ahead Log"
 msgstr "Write-Ahead Log"
 
-#: utils/misc/guc.c:553
+#: utils/misc/guc.c:561
 msgid "Write-Ahead Log / Settings"
 msgstr "Write-Ahead Log / Configuraciones"
 
-#: utils/misc/guc.c:555
+#: utils/misc/guc.c:563
 msgid "Write-Ahead Log / Checkpoints"
 msgstr "Write-Ahead Log / Puntos de Control (Checkpoints)"
 
-#: utils/misc/guc.c:557
+#: utils/misc/guc.c:565
 msgid "Write-Ahead Log / Archiving"
 msgstr "Write-Ahead Log / Archivado"
 
-#: utils/misc/guc.c:559
+#: utils/misc/guc.c:567
 msgid "Replication"
 msgstr "Replicación"
 
-#: utils/misc/guc.c:561
+#: utils/misc/guc.c:569
 msgid "Replication / Sending Servers"
 msgstr "Replicación / Servidores de Envío"
 
-#: utils/misc/guc.c:563
+#: utils/misc/guc.c:571
 msgid "Replication / Master Server"
 msgstr "Replicación / Servidor Maestro"
 
-#: utils/misc/guc.c:565
+#: utils/misc/guc.c:573
 msgid "Replication / Standby Servers"
 msgstr "Replicación / Servidores Standby"
 
-#: utils/misc/guc.c:567
+#: utils/misc/guc.c:575
 msgid "Query Tuning"
 msgstr "Afinamiento de Consultas"
 
-#: utils/misc/guc.c:569
+#: utils/misc/guc.c:577
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "Afinamiento de Consultas / Configuración de Métodos del Planner"
 
-#: utils/misc/guc.c:571
+#: utils/misc/guc.c:579
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "Afinamiento de Consultas / Constantes de Costo del Planner"
 
-#: utils/misc/guc.c:573
+#: utils/misc/guc.c:581
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "Afinamiento de Consultas / Optimizador Genético de Consultas"
 
-#: utils/misc/guc.c:575
+#: utils/misc/guc.c:583
 msgid "Query Tuning / Other Planner Options"
 msgstr "Afinamiento de Consultas / Otras Opciones del Planner"
 
-#: utils/misc/guc.c:577
+#: utils/misc/guc.c:585
 msgid "Reporting and Logging"
 msgstr "Reporte y Registro"
 
-#: utils/misc/guc.c:579
+#: utils/misc/guc.c:587
 msgid "Reporting and Logging / Where to Log"
 msgstr "Reporte y Registro / Cuándo Registrar"
 
-#: utils/misc/guc.c:581
+#: utils/misc/guc.c:589
 msgid "Reporting and Logging / When to Log"
 msgstr "Reporte y Registro / Cuándo Registrar"
 
-#: utils/misc/guc.c:583
+#: utils/misc/guc.c:591
 msgid "Reporting and Logging / What to Log"
 msgstr "Reporte y Registro / Qué Registrar"
 
-#: utils/misc/guc.c:585
+#: utils/misc/guc.c:593
+msgid "Process Title"
+msgstr "Título de Proceso"
+
+#: utils/misc/guc.c:595
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: utils/misc/guc.c:587
+#: utils/misc/guc.c:597
 msgid "Statistics / Monitoring"
 msgstr "Estadísticas / Monitoreo"
 
-#: utils/misc/guc.c:589
+#: utils/misc/guc.c:599
 msgid "Statistics / Query and Index Statistics Collector"
 msgstr "Estadísticas / Recolector de Estadísticas de Consultas e �ndices"
 
-#: utils/misc/guc.c:591
+#: utils/misc/guc.c:601
 msgid "Autovacuum"
 msgstr "Autovacuum"
 
-#: utils/misc/guc.c:593
+#: utils/misc/guc.c:603
 msgid "Client Connection Defaults"
 msgstr "Valores por Omisión de Conexiones"
 
-#: utils/misc/guc.c:595
+#: utils/misc/guc.c:605
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "Valores por Omisión de Conexiones / Comportamiento de Sentencias"
 
-#: utils/misc/guc.c:597
+#: utils/misc/guc.c:607
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr "Valores por Omisión de Conexiones / Configuraciones Regionales y Formateo"
 
-#: utils/misc/guc.c:599
+#: utils/misc/guc.c:609
 msgid "Client Connection Defaults / Shared Library Preloading"
 msgstr "Valores por Omisión de Conexiones / Precargado de Bibliotecas Compartidas"
 
-#: utils/misc/guc.c:601
+#: utils/misc/guc.c:611
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "Valores por Omisión de Conexiones / Otros Valores"
 
-#: utils/misc/guc.c:603
+#: utils/misc/guc.c:613
 msgid "Lock Management"
 msgstr "Manejo de Bloqueos"
 
-#: utils/misc/guc.c:605
+#: utils/misc/guc.c:615
 msgid "Version and Platform Compatibility"
 msgstr "Compatibilidad de Versión y Plataforma"
 
-#: utils/misc/guc.c:607
+#: utils/misc/guc.c:617
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "Compatibilidad de Versión y Plataforma / Versiones Anteriores de PostgreSQL"
 
-#: utils/misc/guc.c:609
+#: utils/misc/guc.c:619
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "Compatibilidad de Versión y Plataforma / Otras Plataformas y Clientes"
 
-#: utils/misc/guc.c:611
+#: utils/misc/guc.c:621
 msgid "Error Handling"
 msgstr "Gestión de Errores"
 
-#: utils/misc/guc.c:613
+#: utils/misc/guc.c:623
 msgid "Preset Options"
 msgstr "Opciones Predefinidas"
 
-#: utils/misc/guc.c:615
+#: utils/misc/guc.c:625
 msgid "Customized Options"
 msgstr "Opciones Personalizadas"
 
-#: utils/misc/guc.c:617
+#: utils/misc/guc.c:627
 msgid "Developer Options"
 msgstr "Opciones de Desarrollador"
 
-#: utils/misc/guc.c:674
+#: utils/misc/guc.c:684
 msgid "Valid units for this parameter are \"kB\", \"MB\", \"GB\", and \"TB\"."
 msgstr "Unidades válidas para este parámetro son «kB», «MB», «GB» y «TB»."
 
-#: utils/misc/guc.c:701
+#: utils/misc/guc.c:711
 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:760
+#: utils/misc/guc.c:770
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr "Permitir el uso de planes de recorrido secuencial."
 
-#: utils/misc/guc.c:769
+#: utils/misc/guc.c:779
 msgid "Enables the planner's use of index-scan plans."
 msgstr "Permitir el uso de planes de recorrido de índice."
 
-#: utils/misc/guc.c:778
+#: utils/misc/guc.c:788
 msgid "Enables the planner's use of index-only-scan plans."
 msgstr "Permitir el uso de planes de recorrido de sólo-índice."
 
-#: utils/misc/guc.c:787
+#: utils/misc/guc.c:797
 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:796
+#: utils/misc/guc.c:806
 msgid "Enables the planner's use of TID scan plans."
 msgstr "Permitir el uso de planes de recorrido por TID."
 
-#: utils/misc/guc.c:805
+#: utils/misc/guc.c:815
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "Permitir el uso de pasos explícitos de ordenamiento."
 
-#: utils/misc/guc.c:814
+#: utils/misc/guc.c:824
 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:823
+#: utils/misc/guc.c:833
 msgid "Enables the planner's use of materialization."
 msgstr "Permitir el uso de materialización de planes."
 
-#: utils/misc/guc.c:832
+#: utils/misc/guc.c:842
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr "Permitir el uso de planes «nested-loop join»."
 
-#: utils/misc/guc.c:841
+#: utils/misc/guc.c:851
 msgid "Enables the planner's use of merge join plans."
 msgstr "Permitir el uso de planes «merge join»."
 
-#: utils/misc/guc.c:850
+#: utils/misc/guc.c:860
 msgid "Enables the planner's use of hash join plans."
 msgstr "Permitir el uso de planes «hash join»."
 
-#: utils/misc/guc.c:859
+#: utils/misc/guc.c:869
 msgid "Enables genetic query optimization."
 msgstr "Permitir el uso del optimizador genético de consultas."
 
-#: utils/misc/guc.c:860
+#: utils/misc/guc.c:870
 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:870
+#: utils/misc/guc.c:880
 msgid "Shows whether the current user is a superuser."
 msgstr "Indica si el usuario actual es superusuario."
 
-#: utils/misc/guc.c:880
+#: utils/misc/guc.c:890
 msgid "Enables advertising the server via Bonjour."
 msgstr "Permitir la publicación del servidor vía Bonjour."
 
-#: utils/misc/guc.c:889
+#: utils/misc/guc.c:899
 msgid "Collects transaction commit time."
-msgstr ""
+msgstr "Recolectar tiempo de compromiso de transacciones."
 
-#: utils/misc/guc.c:898
+#: utils/misc/guc.c:908
 msgid "Enables SSL connections."
 msgstr "Permitir conexiones SSL."
 
-#: utils/misc/guc.c:907
+#: utils/misc/guc.c:917
 msgid "Give priority to server ciphersuite order."
 msgstr "Da prioridad al orden de algoritmos de cifrado especificado por el servidor."
 
-#: utils/misc/guc.c:916
+#: utils/misc/guc.c:926
 msgid "Forces synchronization of updates to disk."
 msgstr "Forzar la sincronización de escrituras a disco."
 
-#: utils/misc/guc.c:917
+#: utils/misc/guc.c:927
 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/misc/guc.c:928
+#: utils/misc/guc.c:938
 msgid "Continues processing after a checksum failure."
 msgstr "Continuar procesando después de una falla de suma de verificación."
 
-#: utils/misc/guc.c:929
+#: utils/misc/guc.c:939
 msgid "Detection of a checksum failure normally causes PostgreSQL to report an error, aborting the current transaction. Setting ignore_checksum_failure to true causes the system to ignore the failure (but still report a warning), and continue processing. This behavior could cause crashes or other serious problems. Only has an effect if checksums are enabled."
 msgstr "La detección de una suma de verificación que no coincide normalmente hace que PostgreSQL reporte un error, abortando la transacción en curso. Definiendo ignore_checksum_failure a true hace que el sistema ignore la falla (pero aún así reporta un mensaje de warning), y continúe el procesamiento. Este comportamiento podría causar caídas del sistema u otros problemas serios. Sólo tiene efecto si las sumas de verificación están activadas."
 
-#: utils/misc/guc.c:943
+#: utils/misc/guc.c:953
 msgid "Continues processing past damaged page headers."
 msgstr "Continuar procesando después de detectar encabezados de página dañados."
 
-#: utils/misc/guc.c:944
+#: utils/misc/guc.c:954
 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 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:957
+#: utils/misc/guc.c:967
 msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr "Escribe páginas completas a WAL cuando son modificadas después de un punto de control."
 
-#: utils/misc/guc.c:958
+#: utils/misc/guc.c:968
 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 "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:971
+#: utils/misc/guc.c:981
 msgid "Writes full pages to WAL when first modified after a checkpoint, even for a non-critical modifications."
 msgstr "Escribir páginas completas a WAL cuando son modificadas después de un punto de control, incluso para modificaciones no críticas."
 
-#: utils/misc/guc.c:981
+#: utils/misc/guc.c:991
 msgid "Compresses full-page writes written in WAL file."
-msgstr ""
+msgstr "Comprimir las imágenes de páginas completas al escribirlas a WAL."
 
-#: utils/misc/guc.c:991
+#: utils/misc/guc.c:1001
 msgid "Logs each checkpoint."
 msgstr "Registrar cada punto de control."
 
-#: utils/misc/guc.c:1000
+#: utils/misc/guc.c:1010
 msgid "Logs each successful connection."
 msgstr "Registrar cada conexión exitosa."
 
-#: utils/misc/guc.c:1009
+#: utils/misc/guc.c:1019
 msgid "Logs end of a session, including duration."
 msgstr "Registrar el fin de una sesión, incluyendo su duración."
 
-#: utils/misc/guc.c:1018
-#, fuzzy
+#: utils/misc/guc.c:1028
 msgid "Logs each replication command."
-msgstr "Registrar el plan de ejecución de cada consulta."
+msgstr "Registrar cada orden de replicación."
 
-#: utils/misc/guc.c:1027
-#, fuzzy
+#: utils/misc/guc.c:1037
 msgid "Shows whether the running server has assertion checks enabled."
-msgstr "Indica si el usuario actual es superusuario."
+msgstr "Indica si el servidor actual tiene activas las aseveraciones (asserts) activas."
 
-#: utils/misc/guc.c:1042
+#: utils/misc/guc.c:1052
 msgid "Terminate session on any error."
 msgstr "Terminar sesión ante cualquier error."
 
-#: utils/misc/guc.c:1051
+#: utils/misc/guc.c:1061
 msgid "Reinitialize server after backend crash."
 msgstr "Reinicializar el servidor después de una caída de un proceso servidor."
 
-#: utils/misc/guc.c:1061
+#: utils/misc/guc.c:1071
 msgid "Logs the duration of each completed SQL statement."
 msgstr "Registrar la duración de cada sentencia SQL ejecutada."
 
-#: utils/misc/guc.c:1070
+#: utils/misc/guc.c:1080
 msgid "Logs each query's parse tree."
 msgstr "Registrar cada arbol analizado de consulta "
 
-#: utils/misc/guc.c:1079
+#: utils/misc/guc.c:1089
 msgid "Logs each query's rewritten parse tree."
 msgstr "Registrar cada reescritura del arból analizado de consulta"
 
-#: utils/misc/guc.c:1088
+#: utils/misc/guc.c:1098
 msgid "Logs each query's execution plan."
 msgstr "Registrar el plan de ejecución de cada consulta."
 
-#: utils/misc/guc.c:1097
+#: utils/misc/guc.c:1107
 msgid "Indents parse and plan tree displays."
 msgstr "Indentar los árboles de parse y plan."
 
-#: utils/misc/guc.c:1106
+#: utils/misc/guc.c:1116
 msgid "Writes parser performance statistics to the server log."
 msgstr "Escribir estadísticas de parser al registro del servidor."
 
-#: utils/misc/guc.c:1115
+#: utils/misc/guc.c:1125
 msgid "Writes planner performance statistics to the server log."
 msgstr "Escribir estadísticas de planner al registro del servidor."
 
-#: utils/misc/guc.c:1124
+#: utils/misc/guc.c:1134
 msgid "Writes executor performance statistics to the server log."
 msgstr "Escribir estadísticas del executor al registro del servidor."
 
-#: utils/misc/guc.c:1133
+#: utils/misc/guc.c:1143
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "Escribir estadísticas acumulativas al registro del servidor."
 
-#: utils/misc/guc.c:1143
+#: utils/misc/guc.c:1153
 msgid "Logs system resource usage statistics (memory and CPU) on various B-tree operations."
 msgstr "Registrar uso de recursos de sistema (memoria y CPU) en varias operaciones B-tree."
 
-#: utils/misc/guc.c:1155
+#: utils/misc/guc.c:1165
 msgid "Collects information about executing commands."
 msgstr "Recolectar estadísticas sobre órdenes en ejecución."
 
-#: utils/misc/guc.c:1156
+#: utils/misc/guc.c:1166
 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/misc/guc.c:1166
+#: utils/misc/guc.c:1176
 msgid "Collects statistics on database activity."
 msgstr "Recolectar estadísticas de actividad de la base de datos."
 
-#: utils/misc/guc.c:1175
+#: utils/misc/guc.c:1185
 msgid "Collects timing statistics for database I/O activity."
 msgstr "Recolectar estadísticas de tiempos en las operaciones de I/O de la base de datos."
 
-#: utils/misc/guc.c:1185
+#: utils/misc/guc.c:1195
 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:1186
+#: utils/misc/guc.c:1196
 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:1195
+#: utils/misc/guc.c:1205
 msgid "Starts the autovacuum subprocess."
 msgstr "Iniciar el subproceso de autovacuum."
 
-#: utils/misc/guc.c:1205
+#: utils/misc/guc.c:1215
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "Generar salida de depuración para LISTEN y NOTIFY."
 
-#: utils/misc/guc.c:1217
+#: utils/misc/guc.c:1227
 msgid "Emits information about lock usage."
 msgstr "Emitir información acerca del uso de locks."
 
-#: utils/misc/guc.c:1227
+#: utils/misc/guc.c:1237
 msgid "Emits information about user lock usage."
 msgstr "Emitir información acerca del uso de locks de usuario."
 
-#: utils/misc/guc.c:1237
+#: utils/misc/guc.c:1247
 msgid "Emits information about lightweight lock usage."
 msgstr "Emitir información acerca del uso de «lightweight locks»."
 
-#: utils/misc/guc.c:1247
+#: utils/misc/guc.c:1257
 msgid "Dumps information about all current locks when a deadlock timeout occurs."
 msgstr "Volcar información acerca de los locks existentes cuando se agota el tiempo de deadlock."
 
-#: utils/misc/guc.c:1259
+#: utils/misc/guc.c:1269
 msgid "Logs long lock waits."
 msgstr "Registrar esperas largas de bloqueos."
 
-#: utils/misc/guc.c:1269
+#: utils/misc/guc.c:1279
 msgid "Logs the host name in the connection logs."
 msgstr "Registrar el nombre del host en la conexión."
 
-#: utils/misc/guc.c:1270
+#: utils/misc/guc.c:1280
 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:1281
+#: utils/misc/guc.c:1291
 msgid "Causes subtables to be included by default in various commands."
 msgstr "Incluir, por omisión, subtablas en varias órdenes."
 
-#: utils/misc/guc.c:1290
+#: utils/misc/guc.c:1300
 msgid "Encrypt passwords."
 msgstr "Cifrar contraseñas."
 
-#: utils/misc/guc.c:1291
+#: utils/misc/guc.c:1301
 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/misc/guc.c:1301
+#: utils/misc/guc.c:1311
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "Tratar expr=NULL como expr IS NULL."
 
-#: utils/misc/guc.c:1302
+#: utils/misc/guc.c:1312
 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:1314
+#: utils/misc/guc.c:1324
 msgid "Enables per-database user names."
 msgstr "Activar el uso de nombre de usuario locales a cada base de datos."
 
-#: utils/misc/guc.c:1323
+#: utils/misc/guc.c:1333
 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:1332
+#: utils/misc/guc.c:1342
 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:1342
+#: utils/misc/guc.c:1352
 msgid "Sets the default deferrable status of new transactions."
 msgstr "Estado por omisión de postergable de nuevas transacciones."
 
-#: utils/misc/guc.c:1351
+#: utils/misc/guc.c:1361
 msgid "Whether to defer a read-only serializable transaction until it can be executed with no possible serialization failures."
 msgstr "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:1361
+#: utils/misc/guc.c:1371
 msgid "Enable row security."
-msgstr ""
+msgstr "Activar seguridad de registros."
 
-#: utils/misc/guc.c:1362
+#: utils/misc/guc.c:1372
 msgid "When enabled, row security will be applied to all users."
-msgstr ""
+msgstr "Cuando está activada, la seguridad de registros se aplicará a todos los usuarios."
 
-#: utils/misc/guc.c:1370
+#: utils/misc/guc.c:1380
 msgid "Check function bodies during CREATE FUNCTION."
 msgstr "Verificar definición de funciones durante CREATE FUNCTION."
 
-#: utils/misc/guc.c:1379
+#: utils/misc/guc.c:1389
 msgid "Enable input of NULL elements in arrays."
 msgstr "Habilita el ingreso de elementos nulos en arrays."
 
-#: utils/misc/guc.c:1380
+#: utils/misc/guc.c:1390
 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/misc/guc.c:1390
+#: utils/misc/guc.c:1400
 msgid "Create new tables with OIDs by default."
 msgstr "Crea nuevas tablas con OIDs por omisión."
 
-#: utils/misc/guc.c:1399
+#: utils/misc/guc.c:1409
 msgid "Start a subprocess to capture stderr output and/or csvlogs into log files."
 msgstr "Lanzar un subproceso para capturar stderr y/o logs CSV en archivos de log."
 
-#: utils/misc/guc.c:1408
+#: utils/misc/guc.c:1418
 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:1419
+#: utils/misc/guc.c:1429
 msgid "Emit information about resource usage in sorting."
 msgstr "Emitir información acerca de uso de recursos durante los ordenamientos."
 
-#: utils/misc/guc.c:1433
+#: utils/misc/guc.c:1443
 msgid "Generate debugging output for synchronized scanning."
 msgstr "Generar salida de depuración para recorrido sincronizado."
 
-#: utils/misc/guc.c:1448
+#: utils/misc/guc.c:1458
 msgid "Enable bounded sorting using heap sort."
 msgstr "Activar ordenamiento acotado usando «heap sort»."
 
-#: utils/misc/guc.c:1461
+#: utils/misc/guc.c:1471
 msgid "Emit WAL-related debugging output."
 msgstr "Activar salida de depuración de WAL."
 
-#: utils/misc/guc.c:1473
+#: utils/misc/guc.c:1483
 msgid "Datetimes are integer based."
 msgstr "Las fechas y horas se basan en tipos enteros."
 
-#: utils/misc/guc.c:1488
+#: utils/misc/guc.c:1498
 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/misc/guc.c:1498
+#: utils/misc/guc.c:1508
 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:1508
+#: utils/misc/guc.c:1518
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr "Provoca que las cadenas '...' traten las barras inclinadas inversas (\\) en forma literal."
 
-#: utils/misc/guc.c:1519
+#: utils/misc/guc.c:1529
 msgid "Enable synchronized sequential scans."
 msgstr "Permitir la sincronización de recorridos secuenciales."
 
-#: utils/misc/guc.c:1529
+#: utils/misc/guc.c:1539
 msgid "Allows connections and queries during recovery."
 msgstr "Permite conexiones y consultas durante la recuperación."
 
-#: utils/misc/guc.c:1539
+#: utils/misc/guc.c:1549
 msgid "Allows feedback from a hot standby to the primary that will avoid query conflicts."
 msgstr "Permite retroalimentación desde un hot standby hacia el primario que evitará conflictos en consultas."
 
-#: utils/misc/guc.c:1549
+#: utils/misc/guc.c:1559
 msgid "Allows modifications of the structure of system tables."
 msgstr "Permite modificaciones de la estructura de las tablas del sistema."
 
-#: utils/misc/guc.c:1560
+#: utils/misc/guc.c:1570
 msgid "Disables reading from system indexes."
 msgstr "Deshabilita lectura de índices del sistema."
 
-#: utils/misc/guc.c:1561
+#: utils/misc/guc.c:1571
 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:1572
+#: utils/misc/guc.c:1582
 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:1573
+#: utils/misc/guc.c:1583
 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:1583
+#: utils/misc/guc.c:1593
 msgid "Emit a warning for constructs that changed meaning since PostgreSQL 9.4."
-msgstr ""
+msgstr "Emitir una advertencia en constructos que cambiaron significado desde PostgreSQL 9.4."
 
-#: utils/misc/guc.c:1593
+#: utils/misc/guc.c:1603
 msgid "When generating SQL fragments, quote all identifiers."
 msgstr "Al generar fragmentos SQL, entrecomillar todos los identificadores."
 
-#: utils/misc/guc.c:1603
+#: utils/misc/guc.c:1613
 msgid "Shows whether data checksums are turned on for this cluster."
 msgstr "Indica si las sumas de verificación están activas en este cluster."
 
-#: utils/misc/guc.c:1623
+#: utils/misc/guc.c:1633
 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:1634
+#: utils/misc/guc.c:1644
 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:1635 utils/misc/guc.c:2137
+#: utils/misc/guc.c:1645 utils/misc/guc.c:2147
 msgid "This allows attaching a debugger to the process."
 msgstr "Esto permite adjuntar un depurador al proceso."
 
-#: utils/misc/guc.c:1644
+#: utils/misc/guc.c:1654
 msgid "Sets the default statistics target."
 msgstr "Definir el valor por omisión de toma de estadísticas."
 
-#: utils/misc/guc.c:1645
+#: utils/misc/guc.c:1655
 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:1654
+#: utils/misc/guc.c:1664
 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:1656
+#: utils/misc/guc.c:1666
 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:1666
+#: utils/misc/guc.c:1676
 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:1668
+#: utils/misc/guc.c:1678
 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:1678
+#: utils/misc/guc.c:1688
 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:1687
+#: utils/misc/guc.c:1697
 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:1696
+#: utils/misc/guc.c:1706
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: número de individuos en una población."
 
-#: utils/misc/guc.c:1697 utils/misc/guc.c:1706
+#: utils/misc/guc.c:1707 utils/misc/guc.c:1716
 msgid "Zero selects a suitable default value."
 msgstr "Cero selecciona un valor por omisión razonable."
 
-#: utils/misc/guc.c:1705
+#: utils/misc/guc.c:1715
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: número de iteraciones del algoritmo."
 
-#: utils/misc/guc.c:1716
+#: utils/misc/guc.c:1726
 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:1727
+#: utils/misc/guc.c:1737
 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:1738
+#: utils/misc/guc.c:1748
 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:1749
+#: utils/misc/guc.c:1759
 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:1760
+#: utils/misc/guc.c:1770
 msgid "Sets the maximum wait time to receive data from the primary."
 msgstr "Define el máximo tiempo a esperar entre recepciones de datos desde el primario."
 
-#: utils/misc/guc.c:1771
+#: utils/misc/guc.c:1781
 msgid "Sets the maximum number of concurrent connections."
 msgstr "Número máximo de conexiones concurrentes."
 
-#: utils/misc/guc.c:1781
+#: utils/misc/guc.c:1791
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr "Número de conexiones reservadas para superusuarios."
 
-#: utils/misc/guc.c:1795
+#: utils/misc/guc.c:1805
 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:1806
+#: utils/misc/guc.c:1816
 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:1817
+#: utils/misc/guc.c:1827
 msgid "Sets the TCP port the server listens on."
 msgstr "Puerto TCP en el cual escuchará el servidor."
 
-#: utils/misc/guc.c:1827
+#: utils/misc/guc.c:1837
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "Privilegios de acceso al socket Unix."
 
-#: utils/misc/guc.c:1828
+#: utils/misc/guc.c:1838
 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:1842
+#: utils/misc/guc.c:1852
 msgid "Sets the file permissions for log files."
 msgstr "Define los privilegios para los archivos del registro del servidor."
 
-#: utils/misc/guc.c:1843
+#: utils/misc/guc.c:1853
 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 "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:1856
+#: utils/misc/guc.c:1866
 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:1857
+#: utils/misc/guc.c:1867
 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:1869
+#: utils/misc/guc.c:1879
 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:1870
+#: utils/misc/guc.c:1880
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "Esto incluye operaciones como VACUUM y CREATE INDEX."
 
-#: utils/misc/guc.c:1885
+#: utils/misc/guc.c:1895
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "Establece el tamaño máximo del stack, en kilobytes."
 
-#: utils/misc/guc.c:1896
+#: utils/misc/guc.c:1906
 msgid "Limits the total size of all temporary files used by each session."
 msgstr "Limita el tamaño total de todos los archivos temporales usados en cada sesión."
 
-#: utils/misc/guc.c:1897
+#: utils/misc/guc.c:1907
 msgid "-1 means no limit."
 msgstr "-1 significa sin límite."
 
-#: utils/misc/guc.c:1907
+#: utils/misc/guc.c:1917
 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:1917
+#: utils/misc/guc.c:1927
 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:1927
+#: utils/misc/guc.c:1937
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr "Costo de Vacuum de una página ensuciada por vacuum."
 
-#: utils/misc/guc.c:1937
+#: utils/misc/guc.c:1947
 msgid "Vacuum cost amount available before napping."
 msgstr "Costo de Vacuum disponible antes de descansar."
 
-#: utils/misc/guc.c:1947
+#: utils/misc/guc.c:1957
 msgid "Vacuum cost delay in milliseconds."
 msgstr "Tiempo de descanso de vacuum en milisegundos."
 
-#: utils/misc/guc.c:1958
+#: utils/misc/guc.c:1968
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "Tiempo de descanso de vacuum en milisegundos, para autovacuum."
 
-#: utils/misc/guc.c:1969
+#: utils/misc/guc.c:1979
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr "Costo de Vacuum disponible antes de descansar, para autovacuum."
 
-#: utils/misc/guc.c:1979
+#: utils/misc/guc.c:1989
 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:1992
+#: utils/misc/guc.c:2002
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr "Define la cantidad máxima de transacciones preparadas simultáneas."
 
-#: utils/misc/guc.c:2003
+#: utils/misc/guc.c:2013
 msgid "Sets the minimum OID of tables for tracking locks."
 msgstr "Define el OID mínimo para hacer seguimiento de locks."
 
-#: utils/misc/guc.c:2004
+#: utils/misc/guc.c:2014
 msgid "Is used to avoid output on system tables."
 msgstr "Se usa para evitar salida excesiva por tablas de sistema."
 
-#: utils/misc/guc.c:2013
+#: utils/misc/guc.c:2023
 msgid "Sets the OID of the table with unconditionally lock tracing."
 msgstr "Define el OID de una tabla con trazado incondicional de locks."
 
-#: utils/misc/guc.c:2025
+#: utils/misc/guc.c:2035
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "Define la duración máxima permitida de sentencias."
 
-#: utils/misc/guc.c:2026 utils/misc/guc.c:2037
+#: utils/misc/guc.c:2036 utils/misc/guc.c:2047
 msgid "A value of 0 turns off the timeout."
 msgstr "Un valor de 0 desactiva el máximo."
 
-#: utils/misc/guc.c:2036
+#: utils/misc/guc.c:2046
 msgid "Sets the maximum allowed duration of any wait for a lock."
 msgstr "Define la duración máxima permitida de cualquier espera por un lock."
 
-#: utils/misc/guc.c:2047
+#: utils/misc/guc.c:2057
 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:2057
+#: utils/misc/guc.c:2067
 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:2067
+#: utils/misc/guc.c:2077
 msgid "Minimum age at which VACUUM should freeze a MultiXactId in a table row."
 msgstr "Mínima edad a la cual VACUUM debería congelar (freeze) el multixact en una fila."
 
-#: utils/misc/guc.c:2077
+#: utils/misc/guc.c:2087
 msgid "Multixact age at which VACUUM should scan whole table to freeze tuples."
 msgstr "Edad de multixact a la cual VACUUM debería recorrer una tabla completa para congelar (freeze) las filas."
 
-#: utils/misc/guc.c:2087
+#: utils/misc/guc.c:2097
 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:2100
+#: utils/misc/guc.c:2110
 msgid "Sets the maximum number of locks per transaction."
 msgstr "Cantidad máxima de candados (locks) por transacción."
 
-#: utils/misc/guc.c:2101
+#: utils/misc/guc.c:2111
 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:2112
+#: utils/misc/guc.c:2122
 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:2113
+#: utils/misc/guc.c:2123
 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 "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:2124
+#: utils/misc/guc.c:2134
 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:2136
+#: utils/misc/guc.c:2146
 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:2147
+#: utils/misc/guc.c:2157
 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:2157
-#, fuzzy
+#: utils/misc/guc.c:2167
 msgid "Sets the minimum size to shrink the WAL to."
-msgstr "Define el tiempo máximo a esperar la replicación de WAL."
+msgstr "Define el tamaño mínimo al cual reducir el WAL."
 
-#: utils/misc/guc.c:2168
-#, fuzzy
+#: utils/misc/guc.c:2178
 msgid "Sets the WAL size that triggers a checkpoint."
-msgstr "Define el tiempo máximo entre puntos de control de WAL automáticos."
+msgstr "Define el tamaño de WAL que desencadena un checkpoint."
 
-#: utils/misc/guc.c:2179
+#: utils/misc/guc.c:2189
 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:2190
+#: utils/misc/guc.c:2200
 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:2192
+#: utils/misc/guc.c:2202
 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 "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:2204
+#: utils/misc/guc.c:2214
 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:2215
+#: utils/misc/guc.c:2225
 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:2227
+#: utils/misc/guc.c:2237
 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:2238
+#: utils/misc/guc.c:2248
 msgid "Sets the maximum number of simultaneously defined replication slots."
 msgstr "Define la cantidad máxima de slots de replicación definidos simultáneamente."
 
-#: utils/misc/guc.c:2248
+#: utils/misc/guc.c:2258
 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:2259
+#: utils/misc/guc.c:2269
 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:2271
+#: utils/misc/guc.c:2281
 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:2282
+#: utils/misc/guc.c:2292
 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:2283
+#: utils/misc/guc.c:2293
 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:2294
+#: utils/misc/guc.c:2304
 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:2296
+#: utils/misc/guc.c:2306
 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:2306
+#: utils/misc/guc.c:2316
 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:2308
+#: utils/misc/guc.c:2318
 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:2318
+#: utils/misc/guc.c:2328
 msgid "Background writer sleep time between rounds."
 msgstr "Tiempo de descanso entre rondas del background writer"
 
-#: utils/misc/guc.c:2329
+#: utils/misc/guc.c:2339
 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:2341
+#: utils/misc/guc.c:2351
 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:2342
+#: utils/misc/guc.c:2352
 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:2357
+#: utils/misc/guc.c:2367
 msgid "Maximum number of concurrent worker processes."
 msgstr "Número máximo de procesos trabajadores concurrentes."
 
-#: utils/misc/guc.c:2367
+#: utils/misc/guc.c:2377
 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:2378
+#: utils/misc/guc.c:2388
 msgid "Automatic log file rotation will occur after N kilobytes."
 msgstr "La rotación automática de archivos de log se efectuará después de N kilobytes."
 
-#: utils/misc/guc.c:2389
+#: utils/misc/guc.c:2399
 msgid "Shows the maximum number of function arguments."
 msgstr "Muestra la cantidad máxima de argumentos de funciones."
 
-#: utils/misc/guc.c:2400
+#: utils/misc/guc.c:2410
 msgid "Shows the maximum number of index keys."
 msgstr "Muestra la cantidad máxima de claves de índices."
 
-#: utils/misc/guc.c:2411
+#: utils/misc/guc.c:2421
 msgid "Shows the maximum identifier length."
 msgstr "Muestra el largo máximo de identificadores."
 
-#: utils/misc/guc.c:2422
+#: utils/misc/guc.c:2432
 msgid "Shows the size of a disk block."
 msgstr "Muestra el tamaño de un bloque de disco."
 
-#: utils/misc/guc.c:2433
+#: utils/misc/guc.c:2443
 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:2444
+#: utils/misc/guc.c:2454
 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:2455
-msgid "Sets the time to wait before retrying to retrieve WALafter a failed attempt."
-msgstr ""
+#: utils/misc/guc.c:2465
+msgid "Sets the time to wait before retrying to retrieve WAL after a failed attempt."
+msgstr "Define el tiempo a esperar antes de reintentar obtener WAL después de un intento fallido."
 
-#: utils/misc/guc.c:2467
+#: utils/misc/guc.c:2477
 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:2480
+#: utils/misc/guc.c:2490
 msgid "Time to sleep between autovacuum runs."
 msgstr "Tiempo de descanso entre ejecuciones de autovacuum."
 
-#: utils/misc/guc.c:2490
+#: utils/misc/guc.c:2500
 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:2499
+#: utils/misc/guc.c:2509
 msgid "Minimum number of tuple inserts, updates, or deletes prior to analyze."
 msgstr "Número mínimo de inserciones, actualizaciones y eliminaciones de tuplas antes de ejecutar analyze."
 
-#: utils/misc/guc.c:2509
+#: utils/misc/guc.c:2519
 msgid "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr "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:2520
+#: utils/misc/guc.c:2530
 msgid "Multixact age at which to autovacuum a table to prevent multixact wraparound."
 msgstr "Edad de multixact a la cual aplicar VACUUM automáticamente a una tabla para prevenir problemas por reciclaje de ID de multixacts."
 
-#: utils/misc/guc.c:2530
+#: utils/misc/guc.c:2540
 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:2540
+#: utils/misc/guc.c:2550
 msgid "Sets the maximum memory to be used by each autovacuum worker process."
 msgstr "Establece el límite de memoria que cada proceso «autovacuum worker» usará."
 
-#: utils/misc/guc.c:2551
+#: utils/misc/guc.c:2561
 msgid "Time between issuing TCP keepalives."
 msgstr "Tiempo entre cada emisión de TCP keepalive."
 
-#: utils/misc/guc.c:2552 utils/misc/guc.c:2563
+#: utils/misc/guc.c:2562 utils/misc/guc.c:2573
 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:2562
+#: utils/misc/guc.c:2572
 msgid "Time between TCP keepalive retransmits."
 msgstr "Tiempo entre retransmisiones TCP keepalive."
 
-#: utils/misc/guc.c:2573
+#: utils/misc/guc.c:2583
+msgid "SSL regenotiation is no longer supported; this can only be 0."
+msgstr "La renegociación SSL ya no está soportada; esto sólo puede ser 0."
+
+#: utils/misc/guc.c:2594
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "Cantidad máxima de retransmisiones TCP keepalive."
 
-#: utils/misc/guc.c:2574
+#: utils/misc/guc.c:2595
 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:2585
+#: utils/misc/guc.c:2606
 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:2596
+#: utils/misc/guc.c:2617
 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:2597
+#: utils/misc/guc.c:2618
 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:2610
+#: utils/misc/guc.c:2631
 msgid "Shows the server version as an integer."
 msgstr "Muestra la versión del servidor como un número entero."
 
-#: utils/misc/guc.c:2621
+#: utils/misc/guc.c:2642
 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:2622
+#: utils/misc/guc.c:2643
 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:2632
+#: utils/misc/guc.c:2653
 msgid "Sets the size reserved for pg_stat_activity.query, in bytes."
 msgstr "Tamaño reservado para pg_stat_activity.query, en bytes."
 
-#: utils/misc/guc.c:2647
-#, fuzzy
+#: utils/misc/guc.c:2668
 msgid "Sets the maximum size of the pending list for GIN index."
-msgstr "Define el tiempo máximo a esperar la replicación de WAL."
+msgstr "Define el tamaño máximo de la lista de pendientes de un índice GIN."
 
-#: utils/misc/guc.c:2667
+#: utils/misc/guc.c:2688
 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:2677
+#: utils/misc/guc.c:2698
 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:2687
+#: utils/misc/guc.c:2708
 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:2697
+#: utils/misc/guc.c:2718
 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:2707
+#: utils/misc/guc.c:2728
 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:2718
+#: utils/misc/guc.c:2739
 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:2729
+#: utils/misc/guc.c:2750
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: presión selectiva dentro de la población."
 
-#: utils/misc/guc.c:2739
+#: utils/misc/guc.c:2760
 msgid "GEQO: seed for random path selection."
 msgstr "GEQO: semilla para la selección aleatoria de caminos."
 
-#: utils/misc/guc.c:2749
+#: utils/misc/guc.c:2770
 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:2759
+#: utils/misc/guc.c:2780
 msgid "Sets the seed for random-number generation."
 msgstr "Semilla para la generación de números aleatorios."
 
-#: utils/misc/guc.c:2770
+#: utils/misc/guc.c:2791
 msgid "Number of tuple updates or deletes prior to vacuum as a fraction of reltuples."
 msgstr "Número de updates o deletes de tuplas antes de ejecutar un vacuum, como fracción de reltuples."
 
-#: utils/misc/guc.c:2779
+#: utils/misc/guc.c:2800
 msgid "Number of tuple inserts, updates, or deletes prior to analyze as a fraction of reltuples."
 msgstr "Número mínimo de inserciones, actualizaciones y eliminaciones de tuplas antes de ejecutar analyze, como fracción de reltuples."
 
-#: utils/misc/guc.c:2789
+#: utils/misc/guc.c:2810
 msgid "Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."
 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:2808
+#: utils/misc/guc.c:2829
 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/guc.c:2818
+#: utils/misc/guc.c:2839
 msgid "Sets the client's character set encoding."
 msgstr "Codificación del juego de caracteres del cliente."
 
-#: utils/misc/guc.c:2829
+#: utils/misc/guc.c:2850
 msgid "Controls information prefixed to each log line."
 msgstr "Controla el prefijo que antecede cada línea registrada."
 
-#: utils/misc/guc.c:2830
+#: utils/misc/guc.c:2851
 msgid "If blank, no prefix is used."
 msgstr "si está en blanco, no se usa prefijo."
 
-#: utils/misc/guc.c:2839
+#: utils/misc/guc.c:2860
 msgid "Sets the time zone to use in log messages."
 msgstr "Define el huso horario usando en los mensajes registrados."
 
-#: utils/misc/guc.c:2849
+#: utils/misc/guc.c:2870
 msgid "Sets the display format for date and time values."
 msgstr "Formato de salida para valores de horas y fechas."
 
-#: utils/misc/guc.c:2850
+#: utils/misc/guc.c:2871
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr "También controla la interpretación de entradas ambiguas de fechas"
 
-#: utils/misc/guc.c:2861
+#: utils/misc/guc.c:2882
 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:2862
+#: utils/misc/guc.c:2883
 msgid "An empty string selects the database's default tablespace."
 msgstr "Una cadena vacía especifica el tablespace por omisión de la base de datos."
 
-#: utils/misc/guc.c:2872
+#: utils/misc/guc.c:2893
 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."
 
-#: utils/misc/guc.c:2883
+#: utils/misc/guc.c:2904
 msgid "Sets the path for dynamically loadable modules."
 msgstr "Ruta para módulos dinámicos."
 
-#: utils/misc/guc.c:2884
+#: utils/misc/guc.c:2905
 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 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."
 
-#: utils/misc/guc.c:2897
+#: utils/misc/guc.c:2918
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Ubicación del archivo de llave del servidor Kerberos."
 
-#: utils/misc/guc.c:2908
+#: utils/misc/guc.c:2929
 msgid "Sets the Bonjour service name."
 msgstr "Nombre del servicio Bonjour."
 
-#: utils/misc/guc.c:2920
+#: utils/misc/guc.c:2941
 msgid "Shows the collation order locale."
 msgstr "Configuración regional de ordenamiento de cadenas (collation)."
 
-#: utils/misc/guc.c:2931
+#: utils/misc/guc.c:2952
 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:2942
+#: utils/misc/guc.c:2963
 msgid "Sets the language in which messages are displayed."
 msgstr "Idioma en el que se despliegan los mensajes."
 
-#: utils/misc/guc.c:2952
+#: utils/misc/guc.c:2973
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "Configuración regional para formatos de moneda."
 
-#: utils/misc/guc.c:2962
+#: utils/misc/guc.c:2983
 msgid "Sets the locale for formatting numbers."
 msgstr "Configuración regional para formatos de números."
 
-#: utils/misc/guc.c:2972
+#: utils/misc/guc.c:2993
 msgid "Sets the locale for formatting date and time values."
 msgstr "Configuración regional para formatos de horas y fechas."
 
-#: utils/misc/guc.c:2982
+#: utils/misc/guc.c:3003
 msgid "Lists shared libraries to preload into each backend."
 msgstr "Bibliotecas compartidas a precargar en cada proceso."
 
-#: utils/misc/guc.c:2993
+#: utils/misc/guc.c:3014
 msgid "Lists shared libraries to preload into server."
 msgstr "Bibliotecas compartidas a precargar en el servidor."
 
-#: utils/misc/guc.c:3004
+#: utils/misc/guc.c:3025
 msgid "Lists unprivileged shared libraries to preload into each backend."
 msgstr "Bibliotecas compartidas no privilegiadas a precargar en cada proceso."
 
-#: utils/misc/guc.c:3015
+#: utils/misc/guc.c:3036
 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:3027
+#: utils/misc/guc.c:3048
 msgid "Sets the server (database) character set encoding."
 msgstr "Codificación de caracteres del servidor (bases de datos)."
 
-#: utils/misc/guc.c:3039
+#: utils/misc/guc.c:3060
 msgid "Shows the server version."
 msgstr "Versión del servidor."
 
-#: utils/misc/guc.c:3051
+#: utils/misc/guc.c:3072
 msgid "Sets the current role."
 msgstr "Define el rol actual."
 
-#: utils/misc/guc.c:3063
+#: utils/misc/guc.c:3084
 msgid "Sets the session user name."
 msgstr "Define el nombre del usuario de sesión."
 
-#: utils/misc/guc.c:3074
+#: utils/misc/guc.c:3095
 msgid "Sets the destination for server log output."
 msgstr "Define el destino de la salida del registro del servidor."
 
-#: utils/misc/guc.c:3075
+#: utils/misc/guc.c:3096
 msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and \"eventlog\", depending on the platform."
 msgstr "Los valores aceptables son combinaciones de «stderr», «syslog», «csvlog» y «eventlog», dependiendo de la plataforma."
 
-#: utils/misc/guc.c:3086
+#: utils/misc/guc.c:3107
 msgid "Sets the destination directory for log files."
 msgstr "Define el directorio de destino de los archivos del registro del servidor."
 
-#: utils/misc/guc.c:3087
+#: utils/misc/guc.c:3108
 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/misc/guc.c:3097
+#: utils/misc/guc.c:3118
 msgid "Sets the file name pattern for log files."
 msgstr "Define el patrón para los nombres de archivo del registro del servidor."
 
-#: utils/misc/guc.c:3108
+#: utils/misc/guc.c:3129
 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:3119
+#: utils/misc/guc.c:3140
 msgid "Sets the application name used to identify PostgreSQL messages in the event log."
 msgstr "Nombre de programa para identificar PostgreSQL en mensajes del log de eventos."
 
-#: utils/misc/guc.c:3130
+#: utils/misc/guc.c:3151
 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:3140
+#: utils/misc/guc.c:3161
 msgid "Selects a file of time zone abbreviations."
 msgstr "Selecciona un archivo de abreviaciones de huso horario."
 
-#: utils/misc/guc.c:3150
+#: utils/misc/guc.c:3171
 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:3161
+#: utils/misc/guc.c:3182
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Grupo dueño del socket de dominio Unix."
 
-#: utils/misc/guc.c:3162
+#: utils/misc/guc.c:3183
 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/misc/guc.c:3172
+#: utils/misc/guc.c:3193
 msgid "Sets the directories where Unix-domain sockets will be created."
 msgstr "Directorios donde se crearán los sockets de dominio Unix."
 
-#: utils/misc/guc.c:3187
+#: utils/misc/guc.c:3208
 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:3202
+#: utils/misc/guc.c:3223
 msgid "Sets the server's data directory."
 msgstr "Define la ubicación del directorio de datos."
 
-#: utils/misc/guc.c:3213
+#: utils/misc/guc.c:3234
 msgid "Sets the server's main configuration file."
 msgstr "Define la ubicación del archivo principal de configuración del servidor."
 
-#: utils/misc/guc.c:3224
+#: utils/misc/guc.c:3245
 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:3235
+#: utils/misc/guc.c:3256
 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:3246
+#: utils/misc/guc.c:3267
 msgid "Writes the postmaster PID to the specified file."
 msgstr "Registra el PID de postmaster en el archivo especificado."
 
-#: utils/misc/guc.c:3257
+#: utils/misc/guc.c:3278
 msgid "Location of the SSL server certificate file."
 msgstr "Ubicación del archivo de certificado SSL del servidor."
 
-#: utils/misc/guc.c:3267
+#: utils/misc/guc.c:3288
 msgid "Location of the SSL server private key file."
 msgstr "Ubicación del archivo de la llave SSL privada del servidor."
 
-#: utils/misc/guc.c:3277
+#: utils/misc/guc.c:3298
 msgid "Location of the SSL certificate authority file."
 msgstr "Ubicación del archivo de autoridad certificadora SSL."
 
-#: utils/misc/guc.c:3287
+#: utils/misc/guc.c:3308
 msgid "Location of the SSL certificate revocation list file."
 msgstr "Ubicación del archivo de lista de revocación de certificados SSL"
 
-#: utils/misc/guc.c:3297
+#: utils/misc/guc.c:3318
 msgid "Writes temporary statistics files to the specified directory."
 msgstr "Escribe los archivos temporales de estadísticas al directorio especificado."
 
-#: utils/misc/guc.c:3308
+#: utils/misc/guc.c:3329
 msgid "List of names of potential synchronous standbys."
 msgstr "Lista de nombres de potenciales standbys sincrónicos."
 
-#: utils/misc/guc.c:3319
+#: utils/misc/guc.c:3340
 msgid "Sets default text search configuration."
 msgstr "Define la configuración de búsqueda en texto por omisión."
 
-#: utils/misc/guc.c:3329
+#: utils/misc/guc.c:3350
 msgid "Sets the list of allowed SSL ciphers."
 msgstr "Define la lista de cifrados SSL permitidos."
 
-#: utils/misc/guc.c:3344
+#: utils/misc/guc.c:3365
 msgid "Sets the curve to use for ECDH."
 msgstr "Define la curva a usar para ECDH."
 
-#: utils/misc/guc.c:3359
+#: utils/misc/guc.c:3380
 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:3370
-msgid "Sets the name of the cluster which is included in the process title."
-msgstr ""
+#: utils/misc/guc.c:3391
+msgid "Sets the name of the cluster, which is included in the process title."
+msgstr "Define el nombre del clúster, el cual se incluye en el título de proceso."
 
-#: utils/misc/guc.c:3390
+#: utils/misc/guc.c:3411
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "Define si «\\'» está permitido en literales de cadena."
 
-#: utils/misc/guc.c:3400
+#: utils/misc/guc.c:3421
 msgid "Sets the output format for bytea."
 msgstr "Formato de salida para bytea."
 
-#: utils/misc/guc.c:3410
+#: utils/misc/guc.c:3431
 msgid "Sets the message levels that are sent to the client."
 msgstr "Nivel de mensajes enviados al cliente."
 
-#: utils/misc/guc.c:3411 utils/misc/guc.c:3464 utils/misc/guc.c:3475
-#: utils/misc/guc.c:3541
+#: utils/misc/guc.c:3432 utils/misc/guc.c:3485 utils/misc/guc.c:3496
+#: utils/misc/guc.c:3562
 msgid "Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
 msgstr "Cada nivel incluye todos los niveles que lo siguen.  Mientras más posterior el nivel, menos mensajes se enviarán."
 
-#: utils/misc/guc.c:3421
+#: utils/misc/guc.c:3442
 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:3422
+#: utils/misc/guc.c:3443
 msgid "Table scans will be skipped if their constraints guarantee that no rows match the query."
 msgstr "Las tablas no serán recorridas si sus restricciones garantizan que ninguna fila coincidirá con la consulta."
 
-#: utils/misc/guc.c:3432
+#: utils/misc/guc.c:3453
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "Nivel de aislación (isolation level) de transacciones nuevas."
 
-#: utils/misc/guc.c:3442
+#: utils/misc/guc.c:3463
 msgid "Sets the display format for interval values."
 msgstr "Formato de salida para valores de intervalos."
 
-#: utils/misc/guc.c:3453
+#: utils/misc/guc.c:3474
 msgid "Sets the verbosity of logged messages."
 msgstr "Verbosidad de los mensajes registrados."
 
-#: utils/misc/guc.c:3463
+#: utils/misc/guc.c:3484
 msgid "Sets the message levels that are logged."
 msgstr "Nivel de mensajes registrados."
 
-#: utils/misc/guc.c:3474
+#: utils/misc/guc.c:3495
 msgid "Causes all statements generating error at or above this level to be logged."
 msgstr "Registrar sentencias que generan error de nivel superior o igual a éste."
 
-#: utils/misc/guc.c:3485
+#: utils/misc/guc.c:3506
 msgid "Sets the type of statements logged."
 msgstr "Define el tipo de sentencias que se registran."
 
-#: utils/misc/guc.c:3495
+#: utils/misc/guc.c:3516
 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:3510
+#: utils/misc/guc.c:3531
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr "Define el comportamiento de la sesión con respecto a disparadores y reglas de reescritura."
 
-#: utils/misc/guc.c:3520
+#: utils/misc/guc.c:3541
 msgid "Sets the current transaction's synchronization level."
 msgstr "Define el nivel de sincronización de la transacción en curso."
 
-#: utils/misc/guc.c:3530
+#: utils/misc/guc.c:3551
 msgid "Allows archiving of WAL files using archive_command."
 msgstr "Permite el archivado de WAL usando archive_command."
 
-#: utils/misc/guc.c:3540
+#: utils/misc/guc.c:3561
 msgid "Enables logging of recovery-related debugging information."
 msgstr "Recolectar información de depuración relacionada con la recuperación."
 
-#: utils/misc/guc.c:3556
+#: utils/misc/guc.c:3577
 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:3566
+#: utils/misc/guc.c:3587
 msgid "Set the level of information written to the WAL."
 msgstr "Nivel de información escrita a WAL."
 
-#: utils/misc/guc.c:3576
+#: utils/misc/guc.c:3597
 msgid "Selects the dynamic shared memory implementation used."
 msgstr "Escoge la implementación de memoria compartida dinámica que se usará."
 
-#: utils/misc/guc.c:3586
+#: utils/misc/guc.c:3607
 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:3596
+#: utils/misc/guc.c:3617
 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:3606
+#: utils/misc/guc.c:3627
 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/misc/guc.c:3617
+#: utils/misc/guc.c:3638
 msgid "Use of huge pages on Linux."
 msgstr "Uso de «huge pages» en Linux."
 
-#: utils/misc/guc.c:4432
+#: utils/misc/guc.c:4453
 #, c-format
 msgid ""
 "%s does not know where to find the server configuration file.\n"
@@ -21700,12 +21682,12 @@
 "%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:4451
+#: utils/misc/guc.c:4472
 #, 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"
 
-#: utils/misc/guc.c:4477
+#: utils/misc/guc.c:4498
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -21714,7 +21696,7 @@
 "%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/misc/guc.c:4525
+#: utils/misc/guc.c:4546
 #, c-format
 msgid ""
 "%s does not know where to find the \"hba\" configuration file.\n"
@@ -21723,7 +21705,7 @@
 "%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/misc/guc.c:4548
+#: utils/misc/guc.c:4569
 #, c-format
 msgid ""
 "%s does not know where to find the \"ident\" configuration file.\n"
@@ -21732,146 +21714,145 @@
 "%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:5222 utils/misc/guc.c:5269
+#: utils/misc/guc.c:5243 utils/misc/guc.c:5290
 msgid "Value exceeds integer range."
 msgstr "El valor excede el rango para enteros."
 
-#: utils/misc/guc.c:5463 utils/misc/guc.c:5556 utils/misc/guc.c:6848
-#: utils/misc/guc.c:9534 utils/misc/guc.c:9568
-#, c-format
-msgid "invalid value for parameter \"%s\": \"%s\""
-msgstr "valor no válido para el parámetro «%s»: «%s»"
-
-#: utils/misc/guc.c:5492
+#: utils/misc/guc.c:5513
 #, c-format
 msgid "parameter \"%s\" requires a numeric value"
 msgstr "el parámetro «%s» requiere un valor numérico"
 
-#: utils/misc/guc.c:5501
+#: utils/misc/guc.c:5522
 #, 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:5654 utils/misc/guc.c:6983
-#, fuzzy, c-format
+#: utils/misc/guc.c:5675 utils/misc/guc.c:7017
+#, c-format
 msgid "cannot set parameters during a parallel operation"
-msgstr "no se puede definir el parámetro «%s» dentro de una operación restringida por seguridad"
+msgstr "no se puede definir parámetros durante una operación paralela"
 
-#: utils/misc/guc.c:5661 utils/misc/guc.c:6411 utils/misc/guc.c:6463
-#: utils/misc/guc.c:6824 utils/misc/guc.c:7560 utils/misc/guc.c:7719
-#: utils/misc/guc.c:9354
+#: utils/misc/guc.c:5682 utils/misc/guc.c:6432 utils/misc/guc.c:6484
+#: utils/misc/guc.c:6845 utils/misc/guc.c:7605 utils/misc/guc.c:7764
+#: utils/misc/guc.c:9417
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "parámetro de configuración no reconocido: «%s»"
 
-#: utils/misc/guc.c:5676 utils/misc/guc.c:6836
+#: utils/misc/guc.c:5697 utils/misc/guc.c:6857
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "no se puede cambiar el parámetro «%s»"
 
-#: utils/misc/guc.c:5699 utils/misc/guc.c:5891 utils/misc/guc.c:5981
-#: utils/misc/guc.c:6071 utils/misc/guc.c:6179 utils/misc/guc.c:6274
+#: utils/misc/guc.c:5720 utils/misc/guc.c:5912 utils/misc/guc.c:6002
+#: utils/misc/guc.c:6092 utils/misc/guc.c:6200 utils/misc/guc.c:6295
 #: guc-file.l:352
 #, 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:5709
+#: utils/misc/guc.c:5730
 #, 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:5727 utils/misc/guc.c:5772 utils/misc/guc.c:9370
+#: utils/misc/guc.c:5748 utils/misc/guc.c:5793 utils/misc/guc.c:9433
 #, 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:5762
+#: utils/misc/guc.c:5783
 #, 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:5810
+#: utils/misc/guc.c:5831
 #, c-format
 msgid "cannot set parameter \"%s\" within security-definer function"
 msgstr "no se puede definir el parámetro «%s» dentro una función security-definer"
 
-#: utils/misc/guc.c:6419 utils/misc/guc.c:6467 utils/misc/guc.c:7723
+#: utils/misc/guc.c:6440 utils/misc/guc.c:6488 utils/misc/guc.c:7768
 #, c-format
 msgid "must be superuser to examine \"%s\""
 msgstr "debe ser superusuario para examinar «%s»"
 
-#: utils/misc/guc.c:6533
+#: utils/misc/guc.c:6554
 #, c-format
 msgid "SET %s takes only one argument"
 msgstr "SET %s lleva sólo un argumento"
 
-#: utils/misc/guc.c:6784
+#: utils/misc/guc.c:6805
 #, c-format
 msgid "must be superuser to execute ALTER SYSTEM command"
 msgstr "debe ser superusuario ejecutar la orden ALTER SYSTEM"
 
-#: utils/misc/guc.c:6897
+#: utils/misc/guc.c:6890
+#, c-format
+msgid "parameter value for ALTER SYSTEM must not contain a newline"
+msgstr "los valores de parámetros para ALTER SYSTEM no deben contener saltos de línea"
+
+#: utils/misc/guc.c:6935
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "no se pudo interpretar el contenido del archivo «%s»"
 
-#: utils/misc/guc.c:7059
+#: utils/misc/guc.c:7093
 #, c-format
 msgid "SET LOCAL TRANSACTION SNAPSHOT is not implemented"
 msgstr "SET LOCAL TRANSACTION SNAPSHOT no está implementado"
 
-#: utils/misc/guc.c:7144
+#: utils/misc/guc.c:7178
 #, c-format
 msgid "SET requires parameter name"
 msgstr "SET requiere el nombre de un parámetro"
 
-#: utils/misc/guc.c:7257
+#: utils/misc/guc.c:7302
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "intento de cambiar la opción «%s»"
 
-#: utils/misc/guc.c:8987
-#, fuzzy, c-format
+#: utils/misc/guc.c:9050
+#, c-format
 msgid "parameter \"%s\" could not be set"
-msgstr "no se puede cambiar el parámetro «%s»"
+msgstr "no se pudo cambiar el parámetro «%s»"
 
-#: utils/misc/guc.c:9074
+#: utils/misc/guc.c:9137
 #, 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:9432 utils/misc/guc.c:9466
+#: utils/misc/guc.c:9495 utils/misc/guc.c:9529
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "valor no válido para el parámetro «%s»: %d"
 
-#: utils/misc/guc.c:9500
+#: utils/misc/guc.c:9563
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "valor no válido para el parámetro «%s»: %g"
 
-#: utils/misc/guc.c:9690
+#: utils/misc/guc.c:9753
 #, c-format
 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/misc/guc.c:9702
+#: utils/misc/guc.c:9765
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour no está soportado en este servidor"
 
-#: utils/misc/guc.c:9715
+#: utils/misc/guc.c:9778
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL no está soportado en este servidor"
 
-#: utils/misc/guc.c:9727
+#: utils/misc/guc.c:9790
 #, c-format
 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/misc/guc.c:9739
+#: utils/misc/guc.c:9802
 #, c-format
 msgid "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr "No se puede activar «log_statement_stats» cuando «log_parser_stats», «log_planner_stats» o «log_executor_stats» están activos."
@@ -21881,10 +21862,15 @@
 msgid "internal error: unrecognized run-time parameter type\n"
 msgstr "error interno: tipo parámetro no reconocido\n"
 
-#: utils/misc/rls.c:91
+#: utils/misc/rls.c:127
 #, c-format
-msgid "insufficient privilege to bypass row security."
-msgstr ""
+msgid "query would be affected by row-level security policy for table \"%s\""
+msgstr "la consulta sería afectada por la política de seguridad de registros para la tabla «%s»"
+
+#: utils/misc/rls.c:129
+#, c-format
+msgid "To disable the policy for the table's owner, use ALTER TABLE NO FORCE ROW LEVEL SECURITY."
+msgstr "Para desactivar la política para el dueño de la tabla, use ALTER TABLE NO FORCE ROW LEVEL SECURITY."
 
 #: utils/misc/timeout.c:388
 #, c-format
@@ -21956,15 +21942,15 @@
 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/mmgr/aset.c:505
+#: utils/mmgr/aset.c:506
 #, c-format
 msgid "Failed while creating memory context \"%s\"."
 msgstr "Falla al crear el contexto de memoria «%s»."
 
 #: utils/mmgr/mcxt.c:689 utils/mmgr/mcxt.c:724 utils/mmgr/mcxt.c:761
 #: utils/mmgr/mcxt.c:798 utils/mmgr/mcxt.c:832 utils/mmgr/mcxt.c:861
-#: utils/mmgr/mcxt.c:895 utils/mmgr/mcxt.c:975 utils/mmgr/mcxt.c:1008
-#: utils/mmgr/mcxt.c:1055
+#: utils/mmgr/mcxt.c:895 utils/mmgr/mcxt.c:977 utils/mmgr/mcxt.c:1011
+#: utils/mmgr/mcxt.c:1060
 #, c-format
 msgid "Failed on request of size %zu."
 msgstr "Falla en petición de tamaño %zu."
@@ -21999,17 +21985,17 @@
 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:3591
+#: utils/sort/tuplesort.c:3606
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "no se pudo crear el índice único «%s»"
 
-#: utils/sort/tuplesort.c:3593
+#: utils/sort/tuplesort.c:3608
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "La llave %s está duplicada."
 
-#: utils/sort/tuplesort.c:3594
+#: utils/sort/tuplesort.c:3609
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "Existe una llave duplicada."
@@ -22035,51 +22021,51 @@
 msgid "could not write to tuplestore temporary file: %m"
 msgstr "no se pudo escribir el archivo temporal de tuplestore: %m"
 
-#: utils/time/snapmgr.c:432
-#, fuzzy, c-format
+#: utils/time/snapmgr.c:473
+#, c-format
 msgid "The source transaction is not running anymore."
-msgstr "La transacción de origen %u ya no está en ejecución."
+msgstr "La transacción de origen ya no está en ejecución."
 
-#: utils/time/snapmgr.c:986
+#: utils/time/snapmgr.c:1038
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "no se puede exportar snapshots desde una subtransacción"
 
-#: utils/time/snapmgr.c:1135 utils/time/snapmgr.c:1140
-#: utils/time/snapmgr.c:1145 utils/time/snapmgr.c:1160
-#: utils/time/snapmgr.c:1165 utils/time/snapmgr.c:1170
-#: utils/time/snapmgr.c:1269 utils/time/snapmgr.c:1285
-#: utils/time/snapmgr.c:1310
+#: utils/time/snapmgr.c:1187 utils/time/snapmgr.c:1192
+#: utils/time/snapmgr.c:1197 utils/time/snapmgr.c:1212
+#: utils/time/snapmgr.c:1217 utils/time/snapmgr.c:1222
+#: utils/time/snapmgr.c:1321 utils/time/snapmgr.c:1337
+#: utils/time/snapmgr.c:1362
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "datos no válidos en archivo de snapshot «%s»"
 
-#: utils/time/snapmgr.c:1207
+#: utils/time/snapmgr.c:1259
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "SET TRANSACTION SNAPSHOT debe ser llamado antes de cualquier consulta"
 
-#: utils/time/snapmgr.c:1216
+#: utils/time/snapmgr.c:1268
 #, c-format
 msgid "a snapshot-importing transaction must have isolation level SERIALIZABLE or REPEATABLE READ"
 msgstr "una transacción que importa un snapshot no debe tener nivel de aislación SERIALIZABLE o REPEATABLE READ"
 
-#: utils/time/snapmgr.c:1225 utils/time/snapmgr.c:1234
+#: utils/time/snapmgr.c:1277 utils/time/snapmgr.c:1286
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "identificador de snapshot no válido: «%s»"
 
-#: utils/time/snapmgr.c:1323
+#: utils/time/snapmgr.c:1375
 #, c-format
 msgid "a serializable transaction cannot import a snapshot from a non-serializable transaction"
 msgstr "una transacción serializable no puede importar un snapshot desde una transacción no serializable"
 
-#: utils/time/snapmgr.c:1327
+#: utils/time/snapmgr.c:1379
 #, c-format
 msgid "a non-read-only serializable transaction cannot import a snapshot from a read-only transaction"
 msgstr "una transacción serializable que no es de sólo lectura no puede importar un snapshot de una transacción de sólo lectura"
 
-#: utils/time/snapmgr.c:1342
+#: utils/time/snapmgr.c:1394
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "no se puede importar un snapshot desde una base de datos diferente"
@@ -22104,233 +22090,233 @@
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr "el intervalo de huso horario debe ser HOUR o HOUR TO MINUTE"
 
-#: gram.y:2570 gram.y:2599
+#: gram.y:2584 gram.y:2613
 #, c-format
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "STDIN/STDOUT no están permitidos con PROGRAM"
 
-#: gram.y:2865 gram.y:2872 gram.y:10139 gram.y:10147
+#: gram.y:2879 gram.y:2886 gram.y:10153 gram.y:10161
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "GLOBAL está obsoleto para la creación de tablas temporales"
 
-#: gram.y:4745
+#: gram.y:4759
 msgid "duplicate trigger events specified"
 msgstr "se han especificado eventos de disparador duplicados"
 
-#: gram.y:4845
+#: gram.y:4859
 #, c-format
 msgid "conflicting constraint properties"
 msgstr "propiedades de restricción contradictorias"
 
-#: gram.y:4977
+#: gram.y:4991
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION no está implementado"
 
-#: gram.y:4993
+#: gram.y:5007
 #, c-format
 msgid "DROP ASSERTION is not yet implemented"
 msgstr "DROP ASSERTION no está implementado"
 
-#: gram.y:5339
+#: gram.y:5353
 #, c-format
 msgid "RECHECK is no longer required"
 msgstr "RECHECK ya no es requerido"
 
-#: gram.y:5340
+#: gram.y:5354
 #, c-format
 msgid "Update your data type."
 msgstr "Actualice su tipo de datos."
 
-#: gram.y:6917
+#: gram.y:6931
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "las funciones de agregación no pueden tener argumentos de salida"
 
-#: gram.y:8707 gram.y:8725
+#: gram.y:8721 gram.y:8739
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION no está soportado con vistas recursivas"
 
-#: gram.y:10247
+#: gram.y:10261
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "la sintaxis LIMIT #,# no está soportada"
 
-#: gram.y:10248
+#: gram.y:10262
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "Use cláusulas LIMIT y OFFSET separadas."
 
-#: gram.y:10511 gram.y:10536
+#: gram.y:10525 gram.y:10550
 #, c-format
 msgid "VALUES in FROM must have an alias"
 msgstr "VALUES en FROM debe tener un alias"
 
-#: gram.y:10512 gram.y:10537
+#: gram.y:10526 gram.y:10551
 #, c-format
 msgid "For example, FROM (VALUES ...) [AS] foo."
 msgstr "Por ejemplo, FROM (VALUES ...) [AS] foo."
 
-#: gram.y:10517 gram.y:10542
+#: gram.y:10531 gram.y:10556
 #, c-format
 msgid "subquery in FROM must have an alias"
 msgstr "las subconsultas en FROM deben tener un alias"
 
-#: gram.y:10518 gram.y:10543
+#: gram.y:10532 gram.y:10557
 #, c-format
 msgid "For example, FROM (SELECT ...) [AS] foo."
 msgstr "Por ejemplo, FROM (SELECT ...) [AS] foo."
 
-#: gram.y:11117
+#: gram.y:11131
 #, c-format
 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"
 
-#: gram.y:11126
+#: gram.y:11140
 #, c-format
 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"
 
-#: gram.y:11630
+#: gram.y:11644
 #, c-format
 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"
 
-#: gram.y:11635
+#: gram.y:11649
 #, c-format
 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"
 
-#: gram.y:11812
+#: gram.y:11826
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "el predicado UNIQUE no está implementado"
 
-#: gram.y:12144
+#: gram.y:12162
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "no se permiten múltiples cláusulas ORDER BY con WITHIN GROUP"
 
-#: gram.y:12149
+#: gram.y:12167
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "no se permite DISTINCT con WITHIN GROUP"
 
-#: gram.y:12154
+#: gram.y:12172
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "no se permite VARIADIC con WITHIN GROUP"
 
-#: gram.y:12660
+#: gram.y:12678
 #, c-format
 msgid "RANGE PRECEDING is only supported with UNBOUNDED"
 msgstr "RANGE PRECEDING sólo está soportado con UNBOUNDED"
 
-#: gram.y:12666
+#: gram.y:12684
 #, c-format
 msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
 msgstr "RANGE FOLLOWING sólo está soportado con UNBOUNDED"
 
-#: gram.y:12693 gram.y:12716
+#: gram.y:12711 gram.y:12734
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "el inicio de «frame» no puede ser UNBOUNDED FOLLOWING"
 
-#: gram.y:12698
+#: gram.y:12716
 #, c-format
 msgid "frame starting from following row cannot end with current row"
 msgstr "el «frame» que se inicia desde la siguiente fila no puede terminar en la fila actual"
 
-#: gram.y:12721
+#: gram.y:12739
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "el fin de «frame» no puede ser UNBOUNDED PRECEDING"
 
-#: gram.y:12727
+#: gram.y:12745
 #, c-format
 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"
 
-#: gram.y:12734
+#: gram.y:12752
 #, c-format
 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"
 
-#: gram.y:13392
+#: gram.y:13410
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "el modificador de tipo no puede tener nombre de parámetro"
 
-#: gram.y:13398
+#: gram.y:13416
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "el modificador de tipo no puede tener ORDER BY"
 
-#: gram.y:13456 gram.y:13491
+#: gram.y:13474 gram.y:13509
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "el nombre de rol «%s» está reservado"
 
-#: gram.y:13462 gram.y:13468
-#, fuzzy, c-format
+#: gram.y:13480 gram.y:13486
+#, c-format
 msgid "%s cannot be used as a role name here"
-msgstr "%s no puede ser aplicado a un join"
+msgstr "%s no puede ser usado como nombre de rol aquí"
 
-#: gram.y:14087 gram.y:14276
+#: gram.y:14105 gram.y:14294
 msgid "improper use of \"*\""
 msgstr "uso impropio de «*»"
 
-#: gram.y:14340
+#: gram.y:14358
 #, c-format
 msgid "an ordered-set aggregate with a VARIADIC direct argument must have one VARIADIC aggregated argument of the same data type"
 msgstr "una agregación de conjunto-ordenado con un argumento directo VARIADIC debe tener al menos un argumento agregado VARIADIC del mismo tipo de datos"
 
-#: gram.y:14377
+#: gram.y:14395
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "no se permiten múltiples cláusulas ORDER BY"
 
-#: gram.y:14388
+#: gram.y:14406
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "no se permiten múltiples cláusulas OFFSET"
 
-#: gram.y:14397
+#: gram.y:14415
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "no se permiten múltiples cláusulas LIMIT"
 
-#: gram.y:14406
+#: gram.y:14424
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "no se permiten múltiples cláusulas WITH"
 
-#: gram.y:14586
+#: gram.y:14616
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "los argumentos OUT e INOUT no están permitidos en funciones TABLE"
 
-#: gram.y:14687
+#: gram.y:14717
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "no se permiten múltiples cláusulas COLLATE"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14725 gram.y:14738
+#: gram.y:14755 gram.y:14768
 #, c-format
 msgid "%s constraints cannot be marked DEFERRABLE"
 msgstr "las restricciones %s no pueden ser marcadas DEFERRABLE"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14751
+#: gram.y:14781
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "las restricciones %s no pueden ser marcadas NOT VALID"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14764
+#: gram.y:14794
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "las restricciones %s no pueden ser marcadas NO INHERIT"
@@ -22404,7 +22390,7 @@
 msgid "invalid streaming start location"
 msgstr "posición de inicio de flujo de WAL no válida"
 
-#: repl_scanner.l:170 scan.l:667
+#: repl_scanner.l:170 scan.l:668
 msgid "unterminated quoted string"
 msgstr "una cadena de caracteres entre comillas está inconclusa"
 
@@ -22413,125 +22399,222 @@
 msgid "syntax error: unexpected character \"%s\""
 msgstr "error de sintaxis: carácter «%s» inesperado"
 
-#: scan.l:432
+#: scan.l:433
 msgid "unterminated /* comment"
 msgstr "un comentario /* está inconcluso"
 
-#: scan.l:461
+#: scan.l:462
 msgid "unterminated bit string literal"
 msgstr "una cadena de bits está inconclusa"
 
-#: scan.l:482
+#: scan.l:483
 msgid "unterminated hexadecimal string literal"
 msgstr "una cadena hexadecimal está inconclusa"
 
-#: scan.l:532
+#: scan.l:533
 #, c-format
 msgid "unsafe use of string constant with Unicode escapes"
 msgstr "uso inseguro de literal de cadena con escapes Unicode"
 
-#: scan.l:533
+#: scan.l:534
 #, c-format
 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."
 
-#: scan.l:577 scan.l:773
+#: scan.l:578 scan.l:774
 msgid "invalid Unicode escape character"
 msgstr "carácter de escape Unicode no válido"
 
-#: scan.l:602 scan.l:610 scan.l:618 scan.l:619 scan.l:620 scan.l:1329
-#: scan.l:1356 scan.l:1360 scan.l:1398 scan.l:1402 scan.l:1424
+#: scan.l:603 scan.l:611 scan.l:619 scan.l:620 scan.l:621 scan.l:1330
+#: scan.l:1357 scan.l:1361 scan.l:1399 scan.l:1403 scan.l:1425 scan.l:1435
 msgid "invalid Unicode surrogate pair"
 msgstr "par sustituto (surrogate) Unicode no válido"
 
-#: scan.l:624
+#: scan.l:625
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "valor de escape Unicode no válido"
 
-#: scan.l:625
+#: scan.l:626
 #, c-format
 msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
 msgstr "Los escapes Unicode deben ser \\uXXXX o \\UXXXXXXXX."
 
-#: scan.l:636
+#: scan.l:637
 #, c-format
 msgid "unsafe use of \\' in a string literal"
 msgstr "uso inseguro de \\' en un literal de cadena"
 
-#: scan.l:637
+#: scan.l:638
 #, c-format
 msgid "Use '' to write quotes in strings. \\' is insecure in client-only encodings."
 msgstr "Use '' para escribir comillas en cadenas. \\' es inseguro en codificaciones de sólo cliente."
 
-#: scan.l:712
+#: scan.l:713
 msgid "unterminated dollar-quoted string"
 msgstr "una cadena separada por $ está inconclusa"
 
-#: scan.l:729 scan.l:753 scan.l:768
+#: scan.l:730 scan.l:754 scan.l:769
 msgid "zero-length delimited identifier"
 msgstr "un identificador delimitado tiene largo cero"
 
-#: scan.l:788
+#: scan.l:789
 msgid "unterminated quoted identifier"
 msgstr "un identificador entre comillas está inconcluso"
 
-#: scan.l:919
+#: scan.l:920
 msgid "operator too long"
 msgstr "el operador es demasiado largo"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1072
+#: scan.l:1073
 #, 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"
-#: scan.l:1080
+#: scan.l:1081
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s en o cerca de «%s»"
 
-#: scan.l:1245 scan.l:1277
+#: scan.l:1246 scan.l:1278
 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"
 
-#: scan.l:1273 scan.l:1416
+#: scan.l:1274 scan.l:1417
 msgid "invalid Unicode escape value"
 msgstr "valor de escape Unicode no válido"
 
-#: scan.l:1472
+#: scan.l:1481
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "uso no estandar de \\' en un literal de cadena"
 
-#: scan.l:1473
+#: scan.l:1482
 #, c-format
 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'...')."
 
-#: scan.l:1482
+#: scan.l:1491
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "uso no estandar de \\\\ en un literal de cadena"
 
-#: scan.l:1483
+#: scan.l:1492
 #, c-format
 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'\\\\')."
 
-#: scan.l:1497
+#: scan.l:1506
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "uso no estandar de escape en un literal de cadena"
 
-#: scan.l:1498
+#: scan.l:1507
 #, c-format
 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'."
 
-#~ msgid "role with OID %u does not exist"
-#~ msgstr "no existe el rol con OID %u"
+#~ msgid "Transaction ID %u finished; no more running transactions."
+#~ msgstr "La transacción de ID %u terminó: no hay más transacciones en ejecución."
+
+#~ msgid "%u transaction needs to finish."
+#~ msgid_plural "%u transactions need to finish."
+#~ msgstr[0] "%u transacción debe terminar."
+#~ msgstr[1] "%u transacciones deben terminar."
+
+#~ msgid "mapped win32 error code %lu to %d"
+#~ msgstr "código de error win32 %lu mapeado a %d"
+
+#~ msgid "unrecognized win32 error code: %lu"
+#~ msgstr "código de error win32 no reconocido: %lu"
+
+#~ msgid "database with OID %u must be vacuumed before %d more multixact members are used"
+#~ msgstr "base de datos con OID %u debe ser limpiada antes de que %d más miembros de multixact sean usados"
+
+#~ msgid "could not link file \"%s\" to \"%s\" (initialization of log file): %m"
+#~ msgstr "no se pudo enlazar (link) el archivo «%s» a «%s» (inicialización de archivo de registro): %m"
+
+#~ msgid "could not rename file \"%s\" to \"%s\" (initialization of log file): %m"
+#~ msgstr "no se pudo renombrar archivo de «%s» a «%s» (inicialización de archivo de registro): %m"
+
+#~ msgid "invalid value for recovery parameter \"recovery_target\""
+#~ msgstr "valor no válido para el parámetro de recuperación «recovery_target»"
+
+#~ msgid "redo record is at %X/%X; shutdown %s"
+#~ msgstr "registro de redo en %X/%X; apagado %s"
+
+#~ msgid "next transaction ID: %u/%u; next OID: %u"
+#~ msgstr "siguiente ID de transacción: %u/%u; siguiente OID: %u"
+
+#~ msgid "next MultiXactId: %u; next MultiXactOffset: %u"
+#~ msgstr "siguiente MultiXactId: %u; siguiente MultiXactOffset: %u"
+
+#~ 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"
+
+#~ msgid "oldest MultiXactId: %u, in database %u"
+#~ msgstr "MultiXactId más antiguo: %u, en base de datos %u"
+
+#~ msgid "new data for \"%s\" contains duplicate rows without any null columns"
+#~ msgstr "nuevos datos para «%s» contiene filas duplicadas sin columnas nulas"
+
+#~ msgid "\"%s\" is not a table, materialized view, composite type, or foreign table"
+#~ msgstr "«%s» no es una tabla, vista materializada, tipo compuesto, o tabla foránea"
+
+#~ msgid "aborting because lock on relation \"%s\".\"%s\" is not available"
+#~ msgstr "cancelando porque el candado en la relación «%s».«%s» no está disponible"
+
+#~ msgid "received password packet"
+#~ msgstr "se recibió un paquete de clave"
+
+#~ msgid "terminating connection because protocol sync was lost"
+#~ msgstr "terminando la conexión por pérdida de sincronía del protocolo"
+
+#~ msgid "huge TLB pages not supported on this platform"
+#~ msgstr "las «huge TLB pages» no están soportadas en esta plataforma"
+
+#~ msgid "invalid value for parameter \"replication\""
+#~ msgstr "valor no válido para la opción «replication»"
+
+#~ msgid "Valid values are: false, 0, true, 1, database."
+#~ msgstr "Los valores válidos son: false, 0, true, 1, database."
+
+#~ msgid "archive member \"%s\" too large for tar format"
+#~ msgstr "el miembro de archivador «%s» es demasiado grande para el formato tar"
+
+#~ msgid "logical decoding output plugin \"%s\" produces binary output, but \"%s\" expects textual data"
+#~ msgstr "el plugin de salida de decodificación lógica «%s» produce salida binaria, pero «%s» espera datos textuales"
+
+# FIXME "snapbuild"?
+#~ msgid "snapbuild state file \"%s\" has wrong magic %u instead of %u"
+#~ msgstr "el archivo de estado de snapbuild «%s» tiene número mágico erróneo %u en lugar de %u"
+
+#~ msgid "snapbuild state file \"%s\" has unsupported version %u instead of %u"
+#~ msgstr "el archivo de estado de snapbuild «%s» tiene versión no soportada %u en vez de %u"
+
+# FIXME must quote file name
+#~ msgid "snapbuild state file %s: checksum mismatch, is %u, should be %u"
+#~ msgstr "archivo de estado de snapbuild %s: suma de verificación no coincidente %u, debería ser %u"
+
+#~ msgid "replication slot file \"%s\" has wrong magic %u instead of %u"
+#~ msgstr "el archivo de slot de replicación «%s» tiene número mágico erróneo %u en lugar de %u"
+
+#~ msgid "replication slot file %s: checksum mismatch, is %u, should be %u"
+#~ msgstr "archivo de slot de replicación %s: suma de control no coincidente, es %u, debería ser %u"
+
+#~ msgid "wrong range of array subscripts"
+#~ msgstr "rango incorrecto en los subíndices del array"
+
+#~ msgid "Lower bound of dimension array must be one."
+#~ msgstr "El límite inferior del array de dimensiones debe ser uno."
+
+#~ msgid "time zone abbreviation \"%s\" is not used in time zone \"%s\""
+#~ msgstr "abreviación de huso horario «%s» no se usa en el huso horario «%s»"
+
+#~ msgid "invalid length in external \"numeric\" value"
+#~ msgstr "el largo no es válido en el valor «numeric» externo"
 
 #~ msgid "=> is deprecated as an operator name"
 #~ msgstr "=> es un nombre obsoleto de operador"
diff -Nru postgresql-9.5-9.5.2/src/backend/po/fr.po postgresql-9.5-9.5.8/src/backend/po/fr.po
--- postgresql-9.5-9.5.2/src/backend/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-23 23:09+0000\n"
-"PO-Revision-Date: 2016-02-28 15:10+0100\n"
+"POT-Creation-Date: 2017-07-19 17:26+0000\n"
+"PO-Revision-Date: 2017-07-20 08:18+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.12\n"
 
 #: ../common/exec.c:127 ../common/exec.c:241 ../common/exec.c:284
 #, c-format
@@ -54,7 +54,7 @@
 msgid "pclose failed: %s"
 msgstr "échec de pclose : %s"
 
-#: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75 ../common/fe_memutils.c:98 ../common/psprintf.c:181 ../port/path.c:598 ../port/path.c:636 ../port/path.c:653
+#: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75 ../common/fe_memutils.c:98 ../common/psprintf.c:181 ../port/path.c:602 ../port/path.c:640 ../port/path.c:657
 #, c-format
 msgid "out of memory\n"
 msgstr "mémoire épuisée\n"
@@ -79,10 +79,10 @@
 msgid "could not close directory \"%s\": %s\n"
 msgstr "n'a pas pu fermer le répertoire « %s » : %s\n"
 
-#: ../common/psprintf.c:179 ../port/path.c:596 ../port/path.c:634 ../port/path.c:651 access/transam/xlog.c:6041 lib/stringinfo.c:258 libpq/auth.c:820 libpq/auth.c:1181 libpq/auth.c:1249 libpq/auth.c:1660 postmaster/bgworker.c:289 postmaster/bgworker.c:797 postmaster/postmaster.c:2317 postmaster/postmaster.c:2348 postmaster/postmaster.c:3867 postmaster/postmaster.c:4557 postmaster/postmaster.c:4625 postmaster/postmaster.c:5315
-#: postmaster/postmaster.c:5568 replication/logical/logical.c:167 storage/buffer/localbuf.c:396 storage/file/fd.c:481 storage/file/fd.c:878 storage/file/fd.c:996 storage/file/fd.c:1609 storage/ipc/procarray.c:907 storage/ipc/procarray.c:1393 storage/ipc/procarray.c:1400 storage/ipc/procarray.c:1793 storage/ipc/procarray.c:2377 utils/adt/formatting.c:1523 utils/adt/formatting.c:1643 utils/adt/formatting.c:1764 utils/adt/regexp.c:219
-#: utils/adt/varlena.c:4199 utils/adt/varlena.c:4220 utils/fmgr/dfmgr.c:216 utils/hash/dynahash.c:411 utils/hash/dynahash.c:488 utils/hash/dynahash.c:1002 utils/mb/mbutils.c:376 utils/mb/mbutils.c:709 utils/misc/guc.c:3723 utils/misc/guc.c:3739 utils/misc/guc.c:3752 utils/misc/guc.c:6686 utils/misc/tzparser.c:470 utils/mmgr/aset.c:504 utils/mmgr/mcxt.c:688 utils/mmgr/mcxt.c:723 utils/mmgr/mcxt.c:760 utils/mmgr/mcxt.c:797 utils/mmgr/mcxt.c:831
-#: utils/mmgr/mcxt.c:860 utils/mmgr/mcxt.c:894 utils/mmgr/mcxt.c:974 utils/mmgr/mcxt.c:1007 utils/mmgr/mcxt.c:1054
+#: ../common/psprintf.c:179 ../port/path.c:600 ../port/path.c:638 ../port/path.c:655 access/transam/xlog.c:6066 lib/stringinfo.c:258 libpq/auth.c:823 libpq/auth.c:1186 libpq/auth.c:1254 libpq/auth.c:1665 postmaster/bgworker.c:309 postmaster/bgworker.c:821 postmaster/postmaster.c:2341 postmaster/postmaster.c:2372 postmaster/postmaster.c:3892 postmaster/postmaster.c:4590 postmaster/postmaster.c:4665 postmaster/postmaster.c:5329
+#: postmaster/postmaster.c:5641 replication/logical/logical.c:168 storage/buffer/localbuf.c:396 storage/file/fd.c:595 storage/file/fd.c:1023 storage/file/fd.c:1141 storage/file/fd.c:1793 storage/ipc/procarray.c:907 storage/ipc/procarray.c:1393 storage/ipc/procarray.c:1400 storage/ipc/procarray.c:1793 storage/ipc/procarray.c:2385 utils/adt/formatting.c:1522 utils/adt/formatting.c:1642 utils/adt/formatting.c:1763 utils/adt/pg_locale.c:463
+#: utils/adt/pg_locale.c:647 utils/adt/regexp.c:219 utils/adt/varlena.c:4212 utils/adt/varlena.c:4233 utils/fmgr/dfmgr.c:216 utils/hash/dynahash.c:411 utils/hash/dynahash.c:488 utils/hash/dynahash.c:1002 utils/mb/mbutils.c:376 utils/mb/mbutils.c:709 utils/misc/guc.c:3723 utils/misc/guc.c:3739 utils/misc/guc.c:3752 utils/misc/guc.c:6686 utils/misc/tzparser.c:470 utils/mmgr/aset.c:505 utils/mmgr/mcxt.c:688 utils/mmgr/mcxt.c:723
+#: utils/mmgr/mcxt.c:760 utils/mmgr/mcxt.c:797 utils/mmgr/mcxt.c:831 utils/mmgr/mcxt.c:860 utils/mmgr/mcxt.c:894 utils/mmgr/mcxt.c:976 utils/mmgr/mcxt.c:1010 utils/mmgr/mcxt.c:1059
 #, c-format
 msgid "out of memory"
 msgstr "mémoire épuisée"
@@ -149,7 +149,7 @@
 msgid "could not look up effective user ID %ld: %s"
 msgstr "n'a pas pu trouver l'identifiant réel %ld de l'utilisateur : %s"
 
-#: ../common/username.c:47 libpq/auth.c:1607
+#: ../common/username.c:47 libpq/auth.c:1612
 msgid "user does not exist"
 msgstr "l'utilisateur n'existe pas"
 
@@ -193,37 +193,37 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
-#: ../port/chklocale.c:259
+#: ../port/chklocale.c:294
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
 msgstr "n'a pas pu déterminer l'encodage pour le codeset « %s »"
 
-#: ../port/chklocale.c:260 ../port/chklocale.c:389 postmaster/postmaster.c:4857
+#: ../port/chklocale.c:295 ../port/chklocale.c:424 postmaster/postmaster.c:4869
 #, c-format
 msgid "Please report this to <pgsql-bugs@postgresql.org>."
 msgstr "Veuillez rapporter ceci à <pgsql-bugs@postgresql.org>."
 
-#: ../port/chklocale.c:381 ../port/chklocale.c:387
+#: ../port/chklocale.c:416 ../port/chklocale.c:422
 #, 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/dirmod.c:216
+#: ../port/dirmod.c:218
 #, c-format
 msgid "could not set junction for \"%s\": %s"
 msgstr "n'a pas pu configurer la jonction pour « %s » : %s"
 
-#: ../port/dirmod.c:219
+#: ../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "n'a pas pu configurer la jonction pour « %s » : %s\n"
 
-#: ../port/dirmod.c:291
+#: ../port/dirmod.c:295
 #, c-format
 msgid "could not get junction for \"%s\": %s"
 msgstr "n'a pas pu obtenir la jonction pour « %s » : %s"
 
-#: ../port/dirmod.c:294
+#: ../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "n'a pas pu obtenir la jonction pour « %s » : %s\n"
@@ -253,7 +253,7 @@
 "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/path.c:620
+#: ../port/path.c:624
 #, c-format
 msgid "could not get current working directory: %s\n"
 msgstr "n'a pas pu obtenir le répertoire de travail : %s\n"
@@ -273,12 +273,12 @@
 msgid "could not open parent table of index %s"
 msgstr "n'a pas pu ouvrir la table parent de l'index %s"
 
-#: access/brin/brin_pageops.c:76 access/brin/brin_pageops.c:362 access/brin/brin_pageops.c:828
+#: access/brin/brin_pageops.c:76 access/brin/brin_pageops.c:360 access/brin/brin_pageops.c:824 access/gin/ginentrypage.c:109 access/gist/gist.c:1289 access/nbtree/nbtinsert.c:575 access/nbtree/nbtsort.c:488 access/spgist/spgdoinsert.c:1907
 #, 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 »"
+msgid "index row size %zu exceeds maximum %zu for index \"%s\""
+msgstr "la taille de la ligne index, %zu, dépasse le maximum, %zu, pour l'index « %s »"
 
-#: access/brin/brin_revmap.c:449
+#: access/brin/brin_revmap.c:453
 #, c-format
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
 msgstr "type de page 0x%04X dans l'index BRIN « %s », bloc %u"
@@ -298,7 +298,7 @@
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "la ligne index requiert %zu octets, la taille maximum est %zu"
 
-#: access/common/printtup.c:294 tcop/fastpath.c:182 tcop/fastpath.c:544 tcop/postgres.c:1730
+#: access/common/printtup.c:294 tcop/fastpath.c:182 tcop/fastpath.c:532 tcop/postgres.c:1722
 #, c-format
 msgid "unsupported format code: %d"
 msgstr "code de format non supporté : %d"
@@ -370,34 +370,29 @@
 "Le nombre de colonnes renvoyées (%d) ne correspond pas au nombre de colonnes\n"
 "attendues (%d)."
 
-#: access/common/tupconvert.c:241
+#: access/common/tupconvert.c:314
 #, 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:253
+#: access/common/tupconvert.c:326
 #, 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/common/tupdesc.c:635 parser/parse_relation.c:1517
+#: access/common/tupdesc.c:635 parser/parse_relation.c:1518
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "la colonne « %s » ne peut pas être déclarée SETOF"
 
-#: access/gin/ginentrypage.c:109 access/gist/gist.c:1289 access/nbtree/nbtinsert.c:567 access/nbtree/nbtsort.c:488 access/spgist/spgdoinsert.c:1907
-#, c-format
-msgid "index row size %zu exceeds maximum %zu for index \"%s\""
-msgstr "la taille de la ligne index, %zu, dépasse le maximum, %zu, pour l'index « %s »"
-
-#: access/gin/ginscan.c:410
+#: access/gin/ginscan.c:412
 #, c-format
 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"
 
-#: access/gin/ginscan.c:411
+#: access/gin/ginscan.c:413
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "Pour corriger ceci, faites un REINDEX INDEX « %s »."
@@ -457,12 +452,12 @@
 msgid "index \"%s\" contains corrupted page at block %u"
 msgstr "l'index « %s » contient une page corrompue au bloc %u"
 
-#: access/hash/hashinsert.c:68
+#: access/hash/hashinsert.c:70
 #, c-format
 msgid "index row size %zu exceeds hash maximum %zu"
 msgstr "la taille de la ligne index, %zu, dépasse le hachage maximum, %zu"
 
-#: access/hash/hashinsert.c:70 access/spgist/spgdoinsert.c:1911 access/spgist/spgutils.c:666
+#: access/hash/hashinsert.c:72 access/spgist/spgdoinsert.c:1911 access/spgist/spgutils.c:666
 #, c-format
 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."
@@ -497,7 +492,7 @@
 msgid "\"%s\" is an index"
 msgstr "« %s » est un index"
 
-#: access/heap/heapam.c:1248 access/heap/heapam.c:1276 access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:8954 commands/tablecmds.c:11995
+#: access/heap/heapam.c:1248 access/heap/heapam.c:1276 access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:9052 commands/tablecmds.c:12153
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "« %s » est un type composite"
@@ -517,17 +512,17 @@
 msgid "attempted to delete invisible tuple"
 msgstr "a tenté de supprimer la ligne invisible"
 
-#: access/heap/heapam.c:3267 access/heap/heapam.c:5818
+#: access/heap/heapam.c:3266 access/heap/heapam.c:5906
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "ne peut pas mettre à jour les lignes lors d'une opération parallèle"
 
-#: access/heap/heapam.c:3389
+#: access/heap/heapam.c:3388
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "a tenté de mettre à jour la ligne invisible"
 
-#: access/heap/heapam.c:4640 access/heap/heapam.c:4678 access/heap/heapam.c:4901 executor/execMain.c:2279
+#: access/heap/heapam.c:4703 access/heap/heapam.c:4741 access/heap/heapam.c:4964 executor/execMain.c:2279
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "n'a pas pu obtenir un verrou sur la relation « %s »"
@@ -542,13 +537,12 @@
 msgid "could not write to file \"%s\", wrote %d of %d: %m"
 msgstr "n'a pas pu écrire le fichier « %s », a écrit %d de %d : %m"
 
-#: access/heap/rewriteheap.c:965 access/heap/rewriteheap.c:1177 access/heap/rewriteheap.c:1274 access/transam/timeline.c:407 access/transam/timeline.c:497 access/transam/xlog.c:3011 access/transam/xlog.c:3173 replication/logical/origin.c:613 replication/logical/snapbuild.c:1592 replication/slot.c:1026 replication/slot.c:1115 storage/file/fd.c:459 storage/file/fd.c:2718 storage/smgr/md.c:982 storage/smgr/md.c:1213 storage/smgr/md.c:1386
-#: utils/misc/guc.c:6708
+#: access/heap/rewriteheap.c:965 access/heap/rewriteheap.c:1177 access/heap/rewriteheap.c:1274 access/transam/timeline.c:407 access/transam/timeline.c:483 access/transam/xlog.c:3040 access/transam/xlog.c:3202 replication/logical/snapbuild.c:1588 replication/slot.c:1053 replication/slot.c:1142 storage/file/fd.c:490 storage/file/fd.c:2924 storage/smgr/md.c:983 storage/smgr/md.c:1214 storage/smgr/md.c:1387 utils/misc/guc.c:6708
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
 
-#: access/heap/rewriteheap.c:1020 access/heap/rewriteheap.c:1140 access/transam/timeline.c:315 access/transam/timeline.c:475 access/transam/xlog.c:2967 access/transam/xlog.c:3116 access/transam/xlog.c:10105 access/transam/xlog.c:10141 access/transam/xlog.c:10463 postmaster/postmaster.c:4332 replication/logical/origin.c:542 replication/slot.c:983 storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1071
+#: access/heap/rewriteheap.c:1020 access/heap/rewriteheap.c:1140 access/transam/timeline.c:315 access/transam/timeline.c:461 access/transam/xlog.c:2996 access/transam/xlog.c:3145 access/transam/xlog.c:10158 access/transam/xlog.c:10194 access/transam/xlog.c:10572 postmaster/postmaster.c:4357 replication/logical/origin.c:542 replication/slot.c:1010 storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1123
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "n'a pas pu créer le fichier « %s » : %m"
@@ -558,55 +552,55 @@
 msgid "could not truncate file \"%s\" to %u: %m"
 msgstr "n'a pas pu tronquer le fichier « %s » en %u : %m"
 
-#: access/heap/rewriteheap.c:1156 replication/walsender.c:479 storage/smgr/md.c:1798
+#: access/heap/rewriteheap.c:1156 replication/walsender.c:484 storage/smgr/md.c:1799
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "n'a pas pu trouver la fin du fichier « %s » : %m"
 
-#: access/heap/rewriteheap.c:1167 access/transam/timeline.c:367 access/transam/timeline.c:401 access/transam/timeline.c:491 access/transam/xlog.c:3002 access/transam/xlog.c:3166 postmaster/postmaster.c:4342 postmaster/postmaster.c:4352 replication/logical/origin.c:551 replication/logical/origin.c:587 replication/logical/origin.c:603 replication/logical/snapbuild.c:1576 replication/slot.c:1012 storage/file/copydir.c:187
-#: utils/init/miscinit.c:1199 utils/init/miscinit.c:1208 utils/init/miscinit.c:1215 utils/misc/guc.c:6669 utils/misc/guc.c:6700 utils/misc/guc.c:8498 utils/misc/guc.c:8512 utils/time/snapmgr.c:1076 utils/time/snapmgr.c:1083
+#: access/heap/rewriteheap.c:1167 access/transam/timeline.c:367 access/transam/timeline.c:401 access/transam/timeline.c:477 access/transam/xlog.c:3031 access/transam/xlog.c:3195 postmaster/postmaster.c:4367 postmaster/postmaster.c:4377 replication/logical/origin.c:551 replication/logical/origin.c:590 replication/logical/origin.c:606 replication/logical/snapbuild.c:1572 replication/slot.c:1039 storage/file/copydir.c:187
+#: utils/init/miscinit.c:1209 utils/init/miscinit.c:1218 utils/init/miscinit.c:1225 utils/misc/guc.c:6669 utils/misc/guc.c:6700 utils/misc/guc.c:8519 utils/misc/guc.c:8533 utils/time/snapmgr.c:1128 utils/time/snapmgr.c:1135
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "n'a pas pu écrire dans le fichier « %s » : %m"
 
-#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10330 access/transam/xlogarchive.c:114 access/transam/xlogarchive.c:468 replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2421 replication/logical/reorderbuffer.c:2478 replication/logical/snapbuild.c:1520 replication/logical/snapbuild.c:1895 replication/slot.c:1089 storage/ipc/dsm.c:326 storage/smgr/md.c:420 storage/smgr/md.c:469 storage/smgr/md.c:1333
+#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10410 access/transam/xlogarchive.c:114 access/transam/xlogarchive.c:468 replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2498 replication/logical/reorderbuffer.c:2555 replication/logical/snapbuild.c:1521 replication/logical/snapbuild.c:1884 replication/slot.c:1116 storage/ipc/dsm.c:326 storage/smgr/md.c:420 storage/smgr/md.c:469 storage/smgr/md.c:1334
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "n'a pas pu supprimer le fichier « %s » : %m"
 
-#: access/heap/rewriteheap.c:1264 access/transam/timeline.c:111 access/transam/timeline.c:236 access/transam/timeline.c:334 access/transam/xlog.c:2943 access/transam/xlog.c:3060 access/transam/xlog.c:3101 access/transam/xlog.c:3392 access/transam/xlog.c:3470 replication/basebackup.c:398 replication/basebackup.c:1159 replication/logical/logicalfuncs.c:154 replication/logical/origin.c:677 replication/logical/reorderbuffer.c:2038
-#: replication/logical/reorderbuffer.c:2242 replication/logical/reorderbuffer.c:2869 replication/logical/snapbuild.c:1569 replication/logical/snapbuild.c:1653 replication/slot.c:1104 replication/walsender.c:472 replication/walsender.c:2100 storage/file/copydir.c:155 storage/file/fd.c:445 storage/file/fd.c:2653 storage/file/fd.c:2705 storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1854 utils/init/miscinit.c:1134
-#: utils/init/miscinit.c:1255 utils/init/miscinit.c:1333 utils/misc/guc.c:6912 utils/misc/guc.c:6944
+#: access/heap/rewriteheap.c:1264 access/transam/timeline.c:111 access/transam/timeline.c:236 access/transam/timeline.c:334 access/transam/xlog.c:2972 access/transam/xlog.c:3089 access/transam/xlog.c:3130 access/transam/xlog.c:3403 access/transam/xlog.c:3481 replication/basebackup.c:400 replication/basebackup.c:1147 replication/logical/logicalfuncs.c:154 replication/logical/origin.c:661 replication/logical/reorderbuffer.c:2075
+#: replication/logical/reorderbuffer.c:2292 replication/logical/reorderbuffer.c:2947 replication/logical/snapbuild.c:1565 replication/logical/snapbuild.c:1649 replication/slot.c:1131 replication/walsender.c:477 replication/walsender.c:2142 storage/file/copydir.c:155 storage/file/fd.c:473 storage/file/fd.c:2837 storage/file/fd.c:2903 storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1863 utils/init/miscinit.c:1144
+#: utils/init/miscinit.c:1265 utils/init/miscinit.c:1343 utils/misc/guc.c:6928 utils/misc/guc.c:6961
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 
-#: access/index/indexam.c:172 catalog/objectaddress.c:1144 commands/indexcmds.c:1754 commands/tablecmds.c:239 commands/tablecmds.c:11986
+#: access/index/indexam.c:172 catalog/objectaddress.c:1144 commands/indexcmds.c:1755 commands/tablecmds.c:240 commands/tablecmds.c:12144
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "« %s » n'est pas un index"
 
-#: access/nbtree/nbtinsert.c:419
+#: access/nbtree/nbtinsert.c:427
 #, 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:421
+#: access/nbtree/nbtinsert.c:429
 #, c-format
 msgid "Key %s already exists."
 msgstr "La clé « %s » existe déjà."
 
-#: access/nbtree/nbtinsert.c:488
+#: access/nbtree/nbtinsert.c:496
 #, 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:490
+#: access/nbtree/nbtinsert.c:498
 #, c-format
 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:570 access/nbtree/nbtsort.c:491
+#: access/nbtree/nbtinsert.c:578 access/nbtree/nbtsort.c:491
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -617,7 +611,7 @@
 "Utilisez un index sur le hachage MD5 de la valeur ou passez à l'indexation\n"
 "de la recherche plein texte."
 
-#: access/nbtree/nbtpage.c:168 access/nbtree/nbtpage.c:371 access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1665
+#: access/nbtree/nbtpage.c:168 access/nbtree/nbtpage.c:371 access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1667
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "l'index « %s » n'est pas un btree"
@@ -647,22 +641,22 @@
 msgid "sample percentage must be between 0 and 100"
 msgstr "le pourcentage de l'échantillonnage doit être compris entre 0 et 100"
 
-#: access/transam/commit_ts.c:295
+#: access/transam/commit_ts.c:294
 #, c-format
 msgid "cannot retrieve commit timestamp for transaction %u"
 msgstr "ne peut pas récupérer l'horodatage de la validation pour la transaction %u"
 
-#: access/transam/commit_ts.c:385
+#: access/transam/commit_ts.c:392
 #, c-format
 msgid "could not get commit timestamp data"
 msgstr "n'a pas pu récupérer les données d'horodatage de la validation"
 
-#: access/transam/commit_ts.c:387
+#: access/transam/commit_ts.c:394
 #, c-format
 msgid "Make sure the configuration parameter \"%s\" is set on the master server."
 msgstr "Assurez-vous que le paramètre de configuration « %s » soit configuré sur le serveur primaire."
 
-#: access/transam/commit_ts.c:389 libpq/hba.c:1424
+#: access/transam/commit_ts.c:396 libpq/hba.c:1424
 #, c-format
 msgid "Make sure the configuration parameter \"%s\" is set."
 msgstr "Assurez-vous que le paramètre de configuration « %s » soit configuré."
@@ -688,14 +682,14 @@
 "la base de données n'accepte pas de commandes qui génèrent de nouveaux MultiXactId pour éviter des pertes de données à cause de la réinitialisation de l'identifiant de transaction dans\n"
 "la base de données d'OID %u"
 
-#: access/transam/multixact.c:1036 access/transam/multixact.c:2319
+#: access/transam/multixact.c:1036 access/transam/multixact.c:2318
 #, c-format
 msgid "database \"%s\" must be vacuumed before %u more MultiXactId is used"
 msgid_plural "database \"%s\" must be vacuumed before %u more MultiXactIds are used"
 msgstr[0] "un VACUUM doit être exécuté sur la base de données « %s » dans un maximum de %u MultiXactId"
 msgstr[1] "un VACUUM doit être exécuté sur la base de données « %s » dans un maximum de %u MultiXactId"
 
-#: access/transam/multixact.c:1045 access/transam/multixact.c:2328
+#: access/transam/multixact.c:1045 access/transam/multixact.c:2327
 #, c-format
 msgid "database with OID %u must be vacuumed before %u more MultiXactId is used"
 msgid_plural "database with OID %u must be vacuumed before %u more MultiXactIds are used"
@@ -731,22 +725,22 @@
 msgid "Execute a database-wide VACUUM in that database with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings."
 msgstr "Exécute un VACUUM sur la base dans cette base avec une configuration réduite pour vacuum_multixact_freeze_min_age et vacuum_multixact_freeze_table_age."
 
-#: access/transam/multixact.c:1286
+#: access/transam/multixact.c:1285
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "le MultiXactId %u n'existe plus - wraparound apparent"
 
-#: access/transam/multixact.c:1294
+#: access/transam/multixact.c:1293
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "le MultiXactId %u n'a pas encore été créer : wraparound apparent"
 
-#: access/transam/multixact.c:2269
+#: access/transam/multixact.c:2268
 #, c-format
 msgid "MultiXactId wrap limit is %u, limited by database with OID %u"
 msgstr "La limite de réinitialisation MultiXactId est %u, limité par la base de données d'OID %u"
 
-#: access/transam/multixact.c:2324 access/transam/multixact.c:2333 access/transam/varsup.c:146 access/transam/varsup.c:153 access/transam/varsup.c:384 access/transam/varsup.c:391
+#: access/transam/multixact.c:2323 access/transam/multixact.c:2332 access/transam/varsup.c:146 access/transam/varsup.c:153 access/transam/varsup.c:384 access/transam/varsup.c:391
 #, c-format
 msgid ""
 "To avoid a database shutdown, execute a database-wide VACUUM in that database.\n"
@@ -756,64 +750,62 @@
 "base. Vous pouvez avoir besoin d'enregistrer ou d'annuler les anciennes\n"
 "transactions préparées."
 
-#: access/transam/multixact.c:2603
+#: access/transam/multixact.c:2602
 #, c-format
 msgid "oldest MultiXactId member is at offset %u"
 msgstr "le membre le plus ancien du MultiXactId est au décalage %u"
 
-#: access/transam/multixact.c:2607
+#: access/transam/multixact.c:2606
 #, c-format
 msgid "MultiXact member wraparound protections are disabled because oldest checkpointed MultiXact %u does not exist on disk"
 msgstr "Les protections sur la réutilisation d'un membre MultiXact sont désactivées car le plus ancien MultiXact géré par un checkpoint, %u, n'existe pas sur disque"
 
-#: access/transam/multixact.c:2629
+#: access/transam/multixact.c:2628
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "Les protections sur la réutilisation d'un membre MultiXact sont maintenant activées"
 
-#: access/transam/multixact.c:2631
+#: access/transam/multixact.c:2630
 #, c-format
 msgid "MultiXact member stop limit is now %u based on MultiXact %u"
 msgstr "La limite d'arrêt d'un membre MultiXact est maintenant %x, base sur le MultiXact %u"
 
-#: access/transam/multixact.c:3011
+#: access/transam/multixact.c:3010
 #, c-format
 msgid "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
 msgstr "plus ancien MultiXact introuvable %u, plus récent MultiXact %u, ignore le troncage"
 
-#: access/transam/multixact.c:3029
+#: access/transam/multixact.c:3028
 #, c-format
 msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
 msgstr "ne peut pas tronquer jusqu'au MutiXact %u car il n'existe pas sur disque, ignore le troncage"
 
-#: access/transam/multixact.c:3355
+#: access/transam/multixact.c:3354
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "MultiXactId invalide : %u"
 
-#: access/transam/parallel.c:577
+#: access/transam/parallel.c:582
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "postmaster a quitté pendant une transaction parallèle"
 
-#: access/transam/parallel.c:668
+#: access/transam/parallel.c:702
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "perte de la connexion au processus parallèle"
 
-#: access/transam/parallel.c:845
-#, fuzzy, c-format
-#| msgid "too many dynamic shared memory segments"
+#: access/transam/parallel.c:883
+#, c-format
 msgid "could not map dynamic shared memory segment"
-msgstr "trop de segments de mémoire partagée dynamique"
+msgstr "n'a pas pu cartographier le segment de mémoire partagée dynamique"
 
-#: access/transam/parallel.c:850
-#, fuzzy, c-format
-#| msgid "too many dynamic shared memory segments"
+#: access/transam/parallel.c:888
+#, c-format
 msgid "invalid magic number in dynamic shared memory segment"
-msgstr "trop de segments de mémoire partagée dynamique"
+msgstr "nombre magique invalide dans le segment de mémoire partagée dynamique"
 
-#: access/transam/parallel.c:1001
+#: access/transam/parallel.c:1039
 #, c-format
 msgid "parallel worker, PID %d"
 msgstr "processus en parallèle, PID %d"
@@ -905,29 +897,18 @@
 "Les identifiants timeline doivent être plus petits que les enfants des\n"
 "identifiants timeline."
 
-#: access/transam/timeline.c:346 access/transam/xlog.c:3144 access/transam/xlog.c:10312 access/transam/xlog.c:10325 access/transam/xlog.c:10688 access/transam/xlog.c:10731 access/transam/xlog.c:10770 access/transam/xlog.c:10813 access/transam/xlogfuncs.c:478 access/transam/xlogfuncs.c:497 commands/extension.c:3047 replication/logical/origin.c:684 replication/logical/origin.c:714 replication/logical/reorderbuffer.c:2887
-#: replication/walsender.c:497 storage/file/copydir.c:176 utils/adt/genfile.c:151
+#: access/transam/timeline.c:346 access/transam/xlog.c:3173 access/transam/xlog.c:10392 access/transam/xlog.c:10405 access/transam/xlog.c:10797 access/transam/xlog.c:10840 access/transam/xlog.c:10879 access/transam/xlog.c:10922 access/transam/xlogfuncs.c:478 access/transam/xlogfuncs.c:497 commands/extension.c:3050 replication/logical/origin.c:668 replication/logical/origin.c:698 replication/logical/reorderbuffer.c:2965
+#: replication/walsender.c:502 storage/file/copydir.c:176 utils/adt/genfile.c:151
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "n'a pas pu lire le fichier « %s » : %m"
 
-#: access/transam/timeline.c:412 access/transam/timeline.c:502 access/transam/xlog.c:3017 access/transam/xlog.c:3178 access/transam/xlogfuncs.c:503 commands/copy.c:1631 storage/file/copydir.c:201
+#: access/transam/timeline.c:412 access/transam/timeline.c:488 access/transam/xlog.c:3046 access/transam/xlog.c:3207 access/transam/xlogfuncs.c:503 commands/copy.c:1671 storage/file/copydir.c:201
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "n'a pas pu fermer le fichier « %s » : %m"
 
-#: access/transam/timeline.c:429 access/transam/timeline.c:519
-#, c-format
-msgid "could not link file \"%s\" to \"%s\": %m"
-msgstr "n'a pas pu lier le fichier « %s » à « %s » : %m"
-
-#: access/transam/timeline.c:436 access/transam/timeline.c:526 access/transam/xlog.c:5302 access/transam/xlog.c:6512 access/transam/xlog.c:6529 access/transam/xlog.c:7310 access/transam/xlogarchive.c:458 access/transam/xlogarchive.c:476 access/transam/xlogarchive.c:586 postmaster/pgarch.c:734 replication/logical/origin.c:624 replication/logical/snapbuild.c:1606 replication/slot.c:470 replication/slot.c:926 replication/slot.c:1038
-#: utils/misc/guc.c:6968 utils/time/snapmgr.c:1094
-#, 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/timeline.c:598
+#: access/transam/timeline.c:570
 #, c-format
 msgid "requested timeline %u is not in this server's history"
 msgstr "la timeline %u requise n'est pas dans l'historique de ce serveur"
@@ -1260,157 +1241,147 @@
 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:2270
+#: access/transam/xlog.c:2299
 #, c-format
 msgid "could not seek in log file %s to offset %u: %m"
 msgstr "n'a pas pu se déplacer dans le fichier de transactions « %s » au décalage %u : %m"
 
-#: access/transam/xlog.c:2290
+#: access/transam/xlog.c:2319
 #, c-format
 msgid "could not write to log file %s at offset %u, length %zu: %m"
 msgstr "n'a pas pu écrire le fichier de transactions %s au décalage %u, longueur %zu : %m"
 
-#: access/transam/xlog.c:2553
+#: access/transam/xlog.c:2582
 #, c-format
 msgid "updated min recovery point to %X/%X on timeline %u"
 msgstr "mise à jour du point minimum de restauration sur %X/%X pour la timeline %u"
 
-#: access/transam/xlog.c:3148
+#: access/transam/xlog.c:3177
 #, c-format
 msgid "not enough data in file \"%s\""
 msgstr "données insuffisantes dans le fichier « %s »"
 
-#: access/transam/xlog.c:3267
-#, c-format
-msgid "could not link file \"%s\" to \"%s\" (initialization of log file): %m"
-msgstr "n'a pas pu lier le fichier « %s » à « %s » (initialisation du journal de transactions) : %m"
-
-#: access/transam/xlog.c:3279
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\" (initialization of log file): %m"
-msgstr "n'a pas pu renommer le fichier « %s » en « %s » (initialisation du journal de transactions) : %m"
-
-#: access/transam/xlog.c:3307
+#: access/transam/xlog.c:3318
 #, c-format
 msgid "could not open transaction log file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le journal des transactions « %s » : %m"
 
-#: access/transam/xlog.c:3496 access/transam/xlog.c:5272
+#: access/transam/xlog.c:3507 access/transam/xlog.c:5297
 #, c-format
 msgid "could not close log file %s: %m"
 msgstr "n'a pas pu fermer le fichier de transactions « %s » : %m"
 
-#: access/transam/xlog.c:3553 replication/logical/logicalfuncs.c:149 replication/walsender.c:2095
+#: access/transam/xlog.c:3564 replication/logical/logicalfuncs.c:149 replication/walsender.c:2137
 #, 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é"
 
-#: access/transam/xlog.c:3613 access/transam/xlog.c:3688 access/transam/xlog.c:3886
+#: access/transam/xlog.c:3624 access/transam/xlog.c:3699 access/transam/xlog.c:3897
 #, 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:3769
+#: access/transam/xlog.c:3780
 #, c-format
 msgid "recycled transaction log file \"%s\""
 msgstr "recyclage du journal de transactions « %s »"
 
-#: access/transam/xlog.c:3781
+#: access/transam/xlog.c:3792
 #, c-format
 msgid "removing transaction log file \"%s\""
 msgstr "suppression du journal de transactions « %s »"
 
-#: access/transam/xlog.c:3801
+#: access/transam/xlog.c:3812
 #, 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:3813
+#: access/transam/xlog.c:3824
 #, 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:3846 access/transam/xlog.c:3856
+#: access/transam/xlog.c:3857 access/transam/xlog.c:3867
 #, 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:3862
+#: access/transam/xlog.c:3873
 #, 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:3865
+#: access/transam/xlog.c:3876
 #, 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:3896
+#: access/transam/xlog.c:3907
 #, c-format
 msgid "removing transaction log backup history file \"%s\""
 msgstr "suppression du fichier historique des journaux de transaction « %s »"
 
-#: access/transam/xlog.c:3977
+#: access/transam/xlog.c:3988
 #, c-format
 msgid "unexpected timeline ID %u in log segment %s, offset %u"
 msgstr "identifiant timeline %u inattendu dans le journal de transactions %s, décalage %u"
 
-#: access/transam/xlog.c:4099
+#: access/transam/xlog.c:4110
 #, 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:4113
+#: access/transam/xlog.c:4124
 #, c-format
 msgid "new timeline %u forked off current database system timeline %u before current recovery point %X/%X"
 msgstr ""
 "la nouvelle timeline %u a été créée à partir de la timeline de la base de données système %u\n"
 "avant le point de restauration courant %X/%X"
 
-#: access/transam/xlog.c:4132
+#: access/transam/xlog.c:4143
 #, c-format
 msgid "new target timeline is %u"
 msgstr "la nouvelle timeline cible est %u"
 
-#: access/transam/xlog.c:4212
+#: access/transam/xlog.c:4223
 #, 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:4223 access/transam/xlog.c:4459
+#: access/transam/xlog.c:4234 access/transam/xlog.c:4470
 #, 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:4229 access/transam/xlog.c:4465
+#: access/transam/xlog.c:4240 access/transam/xlog.c:4476
 #, 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:4234 access/transam/xlog.c:4470
+#: access/transam/xlog.c:4245 access/transam/xlog.c:4481
 #, 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:4252 access/transam/xlog.c:4448
+#: access/transam/xlog.c:4263 access/transam/xlog.c:4459
 #, 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:4258
+#: access/transam/xlog.c:4269
 #, 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:4271 access/transam/xlog.c:4280 access/transam/xlog.c:4304 access/transam/xlog.c:4311 access/transam/xlog.c:4318 access/transam/xlog.c:4323 access/transam/xlog.c:4330 access/transam/xlog.c:4337 access/transam/xlog.c:4344 access/transam/xlog.c:4351 access/transam/xlog.c:4358 access/transam/xlog.c:4365 access/transam/xlog.c:4372 access/transam/xlog.c:4381 access/transam/xlog.c:4388 access/transam/xlog.c:4397
-#: access/transam/xlog.c:4404 access/transam/xlog.c:4413 access/transam/xlog.c:4420 utils/init/miscinit.c:1351
+#: access/transam/xlog.c:4282 access/transam/xlog.c:4291 access/transam/xlog.c:4315 access/transam/xlog.c:4322 access/transam/xlog.c:4329 access/transam/xlog.c:4334 access/transam/xlog.c:4341 access/transam/xlog.c:4348 access/transam/xlog.c:4355 access/transam/xlog.c:4362 access/transam/xlog.c:4369 access/transam/xlog.c:4376 access/transam/xlog.c:4383 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 utils/init/miscinit.c:1361
 #, c-format
 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:4272
+#: access/transam/xlog.c:4283
 #, 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 ""
@@ -1418,295 +1389,300 @@
 "%d (0x%08x) alors que le serveur a été compilé avec un PG_CONTROL_VERSION à\n"
 "%d (0x%08x)."
 
-#: access/transam/xlog.c:4276
+#: access/transam/xlog.c:4287
 #, c-format
 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:4281
+#: access/transam/xlog.c:4292
 #, 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:4284 access/transam/xlog.c:4308 access/transam/xlog.c:4315 access/transam/xlog.c:4320
+#: access/transam/xlog.c:4295 access/transam/xlog.c:4319 access/transam/xlog.c:4326 access/transam/xlog.c:4331
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "Il semble que vous avez besoin d'initdb."
 
-#: access/transam/xlog.c:4295
+#: access/transam/xlog.c:4306
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "somme de contrôle incorrecte dans le fichier de contrôle"
 
-#: access/transam/xlog.c:4305
+#: access/transam/xlog.c:4316
 #, 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:4312
+#: access/transam/xlog.c:4323
 #, 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:4319
+#: access/transam/xlog.c:4330
 #, c-format
 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:4324
+#: access/transam/xlog.c:4335
 #, 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:4327 access/transam/xlog.c:4334 access/transam/xlog.c:4341 access/transam/xlog.c:4348 access/transam/xlog.c:4355 access/transam/xlog.c:4362 access/transam/xlog.c:4369 access/transam/xlog.c:4376 access/transam/xlog.c:4384 access/transam/xlog.c:4391 access/transam/xlog.c:4400 access/transam/xlog.c:4407 access/transam/xlog.c:4416 access/transam/xlog.c:4423
+#: 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:4387 access/transam/xlog.c:4395 access/transam/xlog.c:4402 access/transam/xlog.c:4411 access/transam/xlog.c:4418 access/transam/xlog.c:4427 access/transam/xlog.c:4434
 #, c-format
 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:4331
+#: access/transam/xlog.c:4342
 #, 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:4338
+#: access/transam/xlog.c:4349
 #, 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:4345
+#: access/transam/xlog.c:4356
 #, 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:4352
+#: access/transam/xlog.c:4363
 #, 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:4359
+#: access/transam/xlog.c:4370
 #, 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:4366
+#: access/transam/xlog.c:4377
 #, 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:4373
+#: access/transam/xlog.c:4384
 #, c-format
 msgid "The database cluster was initialized with LOBLKSIZE %d, but the server was compiled with LOBLKSIZE %d."
 msgstr ""
 "Le cluster de base de données a été initialisé avec un LOBLKSIZE à %d alors que\n"
 "le serveur a été compilé avec un LOBLKSIZE à %d."
 
-#: access/transam/xlog.c:4382
+#: access/transam/xlog.c:4393
 #, c-format
 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:4389
+#: access/transam/xlog.c:4400
 #, c-format
 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:4398
+#: access/transam/xlog.c:4409
 #, c-format
 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:4405
+#: access/transam/xlog.c:4416
 #, c-format
 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:4414
+#: access/transam/xlog.c:4425
 #, c-format
 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:4421
+#: access/transam/xlog.c:4432
 #, c-format
 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:4847
+#: access/transam/xlog.c:4858
 #, 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:4853
+#: access/transam/xlog.c:4864
 #, 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:4858
+#: access/transam/xlog.c:4869
 #, 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:4933
+#: access/transam/xlog.c:4944
 #, 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:4979 access/transam/xlog.c:5062
+#: access/transam/xlog.c:4990 access/transam/xlog.c:5075
 #, c-format
 msgid "invalid value for recovery parameter \"%s\": \"%s\""
 msgstr "valeur invalide pour le paramètre de restauration « %s » : « %s »"
 
-#: access/transam/xlog.c:4982
+#: access/transam/xlog.c:4993
 #, c-format
 msgid "Valid values are \"pause\", \"promote\", and \"shutdown\"."
 msgstr "Les valeurs valides sont « pause », « promote » et « shutdown »."
 
-#: access/transam/xlog.c:5001
+#: access/transam/xlog.c:5013
 #, 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:5017
+#: access/transam/xlog.c:5030
 #, 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:5048
+#: access/transam/xlog.c:5061
 #, c-format
 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:5065
+#: access/transam/xlog.c:5078
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "La seule valeur autorisée est « immediate »."
 
-#: access/transam/xlog.c:5078 access/transam/xlog.c:5089 commands/extension.c:531 commands/extension.c:539 utils/misc/guc.c:5464
+#: access/transam/xlog.c:5091 access/transam/xlog.c:5102 commands/extension.c:531 commands/extension.c:539 utils/misc/guc.c:5464
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "le paramètre « %s » requiert une valeur booléenne"
 
-#: access/transam/xlog.c:5124
+#: access/transam/xlog.c:5137
 #, c-format
 msgid "parameter \"%s\" requires a temporal value"
 msgstr "le paramètre « %s » requiert une valeur temporelle"
 
-#: access/transam/xlog.c:5126 catalog/dependency.c:984 catalog/dependency.c:985 catalog/dependency.c:991 catalog/dependency.c:992 catalog/dependency.c:1003 catalog/dependency.c:1004 catalog/objectaddress.c:1053 commands/tablecmds.c:791 commands/tablecmds.c:9415 commands/user.c:1027 commands/view.c:482 libpq/auth.c:285 port/win32/security.c:51 storage/lmgr/deadlock.c:955 storage/lmgr/proc.c:1177 utils/misc/guc.c:5486 utils/misc/guc.c:5579
-#: utils/misc/guc.c:9469 utils/misc/guc.c:9503 utils/misc/guc.c:9537 utils/misc/guc.c:9571 utils/misc/guc.c:9606
+#: access/transam/xlog.c:5139 catalog/dependency.c:983 catalog/dependency.c:984 catalog/dependency.c:990 catalog/dependency.c:991 catalog/dependency.c:1002 catalog/dependency.c:1003 catalog/objectaddress.c:1053 commands/tablecmds.c:792 commands/tablecmds.c:9513 commands/user.c:1027 commands/view.c:499 libpq/auth.c:288 port/win32/security.c:51 storage/lmgr/deadlock.c:955 storage/lmgr/proc.c:1177 utils/misc/guc.c:5486 utils/misc/guc.c:5579
+#: utils/misc/guc.c:9500 utils/misc/guc.c:9534 utils/misc/guc.c:9568 utils/misc/guc.c:9602 utils/misc/guc.c:9637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: access/transam/xlog.c:5132
+#: access/transam/xlog.c:5146
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
 msgstr "paramètre de restauration « %s » non reconnu"
 
-#: access/transam/xlog.c:5143
+#: access/transam/xlog.c:5157
 #, 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:5145
+#: access/transam/xlog.c:5159
 #, c-format
 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:5151
+#: access/transam/xlog.c:5166
 #, 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:5181
+#: access/transam/xlog.c:5187
+#, c-format
+msgid "standby mode is not supported by single-user servers"
+msgstr "le mode standby n'est pas supporté par les serveurs en mode mono-utilisateur"
+
+#: access/transam/xlog.c:5206
 #, 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:5306
+#: access/transam/xlog.c:5327
 #, c-format
 msgid "archive recovery complete"
 msgstr "restauration terminée de l'archive"
 
-#: access/transam/xlog.c:5365 access/transam/xlog.c:5593
+#: access/transam/xlog.c:5386 access/transam/xlog.c:5614
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "arrêt de la restauration après avoir atteint le point de cohérence"
 
-#: access/transam/xlog.c:5453
+#: access/transam/xlog.c:5474
 #, 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:5460
+#: access/transam/xlog.c:5481
 #, 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:5505
+#: access/transam/xlog.c:5526
 #, 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:5573
+#: access/transam/xlog.c:5594
 #, 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:5581
+#: access/transam/xlog.c:5602
 #, 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:5620
+#: access/transam/xlog.c:5641
 #, c-format
 msgid "recovery has paused"
 msgstr "restauration en pause"
 
-#: access/transam/xlog.c:5621
+#: access/transam/xlog.c:5642
 #, c-format
 msgid "Execute pg_xlog_replay_resume() to continue."
 msgstr "Exécuter pg_xlog_replay_resume() pour continuer."
 
-#: access/transam/xlog.c:5824
+#: access/transam/xlog.c:5849
 #, 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 ""
@@ -1714,21 +1690,21 @@
 "paramètrage plus bas que celui du serveur maître des journaux de transactions\n"
 "(la valeur était %d)"
 
-#: access/transam/xlog.c:5850
+#: access/transam/xlog.c:5875
 #, c-format
 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:5851
+#: access/transam/xlog.c:5876
 #, c-format
 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:5862
+#: access/transam/xlog.c:5887
 #, c-format
 msgid "hot standby is not possible because wal_level was not set to \"hot_standby\" or higher on the master server"
 msgstr ""
@@ -1736,255 +1712,255 @@
 "wal_level n'a pas été configuré à « hot_standby » ou à une valeur plus importante\n"
 "sur le serveur maître"
 
-#: access/transam/xlog.c:5863
+#: access/transam/xlog.c:5888
 #, c-format
 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:5920
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "control file contains invalid data"
 msgstr "le fichier de contrôle contient des données invalides"
 
-#: access/transam/xlog.c:5926
+#: access/transam/xlog.c:5951
 #, 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:5931
+#: access/transam/xlog.c:5956
 #, 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:5935
+#: access/transam/xlog.c:5960
 #, 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:5939
+#: access/transam/xlog.c:5964
 #, 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:5941
+#: access/transam/xlog.c:5966
 #, c-format
 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:5945
+#: access/transam/xlog.c:5970
 #, 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:5947
+#: access/transam/xlog.c:5972
 #, c-format
 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:5951
+#: access/transam/xlog.c:5976
 #, 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:6007
+#: access/transam/xlog.c:6032
 #, c-format
 msgid "entering standby mode"
 msgstr "entre en mode standby"
 
-#: access/transam/xlog.c:6010
+#: access/transam/xlog.c:6035
 #, 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:6014
+#: access/transam/xlog.c:6039
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "début de la restauration de l'archive à %s"
 
-#: access/transam/xlog.c:6018
+#: access/transam/xlog.c:6043
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "début de la restauration PITR à « %s »"
 
-#: access/transam/xlog.c:6022
+#: access/transam/xlog.c:6047
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr "début de la restauration de l'archive jusqu'au point de cohérence le plus proche"
 
-#: access/transam/xlog.c:6025
+#: access/transam/xlog.c:6050
 #, c-format
 msgid "starting archive recovery"
 msgstr "début de la restauration de l'archive"
 
-#: access/transam/xlog.c:6042
+#: access/transam/xlog.c:6067
 #, c-format
 msgid "Failed while allocating an XLog reading processor."
 msgstr "Échec lors de l'allocation d'un processeur de lecture XLog"
 
-#: access/transam/xlog.c:6069 access/transam/xlog.c:6197
+#: access/transam/xlog.c:6094 access/transam/xlog.c:6222
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "l'enregistrement du point de vérification est à %X/%X"
 
-#: access/transam/xlog.c:6083
+#: access/transam/xlog.c:6108
 #, c-format
 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:6084 access/transam/xlog.c:6091
+#: access/transam/xlog.c:6109 access/transam/xlog.c:6116
 #, 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:6090
+#: access/transam/xlog.c:6115
 #, c-format
 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:6116 commands/tablespace.c:641
+#: access/transam/xlog.c:6141 commands/tablespace.c:641
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "n'a pas pu créer le lien symbolique « %s » : %m"
 
-#: access/transam/xlog.c:6148
+#: access/transam/xlog.c:6173
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "ignore le fichier « %s » car le fichier « %s » n'existe pas"
 
-#: access/transam/xlog.c:6150 access/transam/xlog.c:10888
+#: access/transam/xlog.c:6175 access/transam/xlog.c:10997
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "Le fichier « %s » a été renommé en « %s »."
 
-#: access/transam/xlog.c:6154
+#: access/transam/xlog.c:6179
 #, c-format
 msgid "ignoring \"%s\" file because no \"%s\" file exists"
 msgstr "ignore le fichier « %s » parce que le fichier « %s » n'existe pas"
 
-#: access/transam/xlog.c:6156
+#: access/transam/xlog.c:6181
 #, 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:6207 access/transam/xlog.c:6222
+#: access/transam/xlog.c:6232 access/transam/xlog.c:6247
 #, c-format
 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:6216
+#: access/transam/xlog.c:6241
 #, 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:6260
+#: access/transam/xlog.c:6285
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "la timeline requise %u n'est pas un fils de l'historique de ce serveur"
 
-#: access/transam/xlog.c:6262
+#: access/transam/xlog.c:6287
 #, c-format
 msgid "Latest checkpoint is at %X/%X on timeline %u, but in the history of the requested timeline, the server forked off from that timeline at %X/%X."
 msgstr "Le dernier checkpoint est à %X/%X sur la timeline %u, mais dans l'historique de la timeline demandée, le serveur est sorti de cette timeline à %X/%X."
 
-#: access/transam/xlog.c:6278
+#: access/transam/xlog.c:6303
 #, c-format
 msgid "requested timeline %u does not contain minimum recovery point %X/%X on timeline %u"
 msgstr "la timeline requise, %u, ne contient pas le point de restauration minimum (%X/%X) sur la timeline %u"
 
-#: access/transam/xlog.c:6309
+#: access/transam/xlog.c:6334
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "prochain ID de transaction invalide"
 
-#: access/transam/xlog.c:6392
+#: access/transam/xlog.c:6417
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "ré-exécution invalide dans l'enregistrement du point de vérification"
 
-#: access/transam/xlog.c:6403
+#: access/transam/xlog.c:6428
 #, c-format
 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:6431
+#: access/transam/xlog.c:6456
 #, c-format
 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:6435
+#: access/transam/xlog.c:6460
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr "la restauration après crash commence avec la timeline %u et a la timeline %u en cible"
 
-#: access/transam/xlog.c:6479
+#: access/transam/xlog.c:6504
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label contient des données incohérentes avec le fichier de contrôle"
 
-#: access/transam/xlog.c:6480
+#: access/transam/xlog.c:6505
 #, c-format
 msgid "This means that the backup is corrupted and you will have to use another backup for recovery."
 msgstr ""
 "Ceci signifie que la sauvegarde a été corrompue et que vous devrez utiliser\n"
 "la dernière sauvegarde pour la restauration."
 
-#: access/transam/xlog.c:6562
+#: access/transam/xlog.c:6579
 #, c-format
 msgid "initializing for hot standby"
 msgstr "initialisation pour « Hot Standby »"
 
-#: access/transam/xlog.c:6694
+#: access/transam/xlog.c:6711
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "la ré-exécution commence à %X/%X"
 
-#: access/transam/xlog.c:6908
+#: access/transam/xlog.c:6925
 #, c-format
 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:6946
+#: access/transam/xlog.c:6963
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "ré-exécution faite à %X/%X"
 
-#: access/transam/xlog.c:6951 access/transam/xlog.c:8885
+#: access/transam/xlog.c:6968 access/transam/xlog.c:8933
 #, 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:6960
+#: access/transam/xlog.c:6977
 #, c-format
 msgid "redo is not required"
 msgstr "la ré-exécution n'est pas nécessaire"
 
-#: access/transam/xlog.c:7035 access/transam/xlog.c:7039
+#: access/transam/xlog.c:7052 access/transam/xlog.c:7056
 #, c-format
 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:7036
+#: access/transam/xlog.c:7053
 #, c-format
 msgid "All WAL generated while online backup was taken must be available at recovery."
 msgstr ""
 "Tous les journaux de transactions générés pendant la sauvegarde en ligne\n"
 "doivent être disponibles pour la restauration."
 
-#: access/transam/xlog.c:7040
+#: access/transam/xlog.c:7057
 #, c-format
 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 ""
@@ -1992,229 +1968,229 @@
 "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:7043
+#: access/transam/xlog.c:7060
 #, c-format
 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:7070
+#: access/transam/xlog.c:7087
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "identifiant d'un timeline nouvellement sélectionné : %u"
 
-#: access/transam/xlog.c:7485
+#: access/transam/xlog.c:7498
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "état de restauration cohérent atteint à %X/%X"
 
-#: access/transam/xlog.c:7676
+#: access/transam/xlog.c:7689
 #, c-format
 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:7680
+#: access/transam/xlog.c:7693
 #, c-format
 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:7684
+#: access/transam/xlog.c:7697
 #, c-format
 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:7701
+#: access/transam/xlog.c:7714
 #, c-format
 msgid "invalid primary checkpoint record"
 msgstr "enregistrement du point de vérification primaire invalide"
 
-#: access/transam/xlog.c:7705
+#: access/transam/xlog.c:7718
 #, c-format
 msgid "invalid secondary checkpoint record"
 msgstr "enregistrement du point de vérification secondaire invalide"
 
-#: access/transam/xlog.c:7709
+#: access/transam/xlog.c:7722
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "enregistrement du point de vérification invalide"
 
-#: access/transam/xlog.c:7720
+#: access/transam/xlog.c:7733
 #, c-format
 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:7724
+#: access/transam/xlog.c:7737
 #, c-format
 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:7728
+#: access/transam/xlog.c:7741
 #, c-format
 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:7740
+#: access/transam/xlog.c:7753
 #, c-format
 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:7744
+#: access/transam/xlog.c:7757
 #, c-format
 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:7748
+#: access/transam/xlog.c:7761
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "xl_info invalide dans l'enregistrement du point de vérification"
 
-#: access/transam/xlog.c:7759
+#: access/transam/xlog.c:7772
 #, c-format
 msgid "invalid length of primary checkpoint record"
 msgstr "longueur invalide de l'enregistrement primaire du point de vérification"
 
-#: access/transam/xlog.c:7763
+#: access/transam/xlog.c:7776
 #, c-format
 msgid "invalid length of secondary checkpoint record"
 msgstr "longueur invalide de l'enregistrement secondaire du point de vérification"
 
-#: access/transam/xlog.c:7767
+#: access/transam/xlog.c:7780
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "longueur invalide de l'enregistrement du point de vérification"
 
-#: access/transam/xlog.c:7937
+#: access/transam/xlog.c:7950
 #, c-format
 msgid "shutting down"
 msgstr "arrêt en cours"
 
-#: access/transam/xlog.c:7961
+#: access/transam/xlog.c:7985
 #, c-format
 msgid "database system is shut down"
 msgstr "le système de base de données est arrêté"
 
-#: access/transam/xlog.c:8454
+#: access/transam/xlog.c:8478
 #, c-format
 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:8705
+#: access/transam/xlog.c:8732
 #, c-format
 msgid "skipping restartpoint, recovery has already ended"
 msgstr "restartpoint ignoré, la récupération est déjà terminée"
 
-#: access/transam/xlog.c:8728
+#: access/transam/xlog.c:8755
 #, 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:8883
+#: access/transam/xlog.c:8931
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "la ré-exécution en restauration commence à %X/%X"
 
-#: access/transam/xlog.c:9016
+#: access/transam/xlog.c:9064
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "point de restauration « %s » créé à %X/%X"
 
-#: access/transam/xlog.c:9146
+#: access/transam/xlog.c:9194
 #, c-format
 msgid "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record"
 msgstr "identifiant de timeline précédent %u inattendu (identifiant de la timeline courante %u) dans l'enregistrement du point de vérification"
 
-#: access/transam/xlog.c:9155
+#: access/transam/xlog.c:9203
 #, 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:9171
+#: access/transam/xlog.c:9219
 #, c-format
 msgid "unexpected timeline ID %u in checkpoint record, before reaching minimum recovery point %X/%X on timeline %u"
 msgstr "identifiant timeline %u inattendu dans l'enregistrement du checkpoint, avant d'atteindre le point de restauration minimum %X/%X sur la timeline %u"
 
-#: access/transam/xlog.c:9242
+#: access/transam/xlog.c:9290
 #, c-format
 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:9298 access/transam/xlog.c:9345 access/transam/xlog.c:9368
+#: access/transam/xlog.c:9346 access/transam/xlog.c:9393 access/transam/xlog.c:9416
 #, 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:9645
+#: access/transam/xlog.c:9693
 #, c-format
 msgid "could not fsync log segment %s: %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le segment du journal des transactions %s : %m"
 
-#: access/transam/xlog.c:9669
+#: access/transam/xlog.c:9717
 #, c-format
 msgid "could not fsync log file %s: %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier de transactions « %s » : %m"
 
-#: access/transam/xlog.c:9677
+#: access/transam/xlog.c:9725
 #, c-format
 msgid "could not fsync write-through log file %s: %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le journal des transactions %s : %m"
 
-#: access/transam/xlog.c:9686
+#: access/transam/xlog.c:9734
 #, c-format
 msgid "could not fdatasync log file %s: %m"
 msgstr "n'a pas pu synchroniser sur disque (fdatasync) le journal de transactions %s : %m"
 
-#: access/transam/xlog.c:9778 access/transam/xlog.c:10249 access/transam/xlogfuncs.c:121 access/transam/xlogfuncs.c:150 access/transam/xlogfuncs.c:189 access/transam/xlogfuncs.c:210 access/transam/xlogfuncs.c:280 access/transam/xlogfuncs.c:336
+#: access/transam/xlog.c:9826 access/transam/xlog.c:10330 access/transam/xlogfuncs.c:121 access/transam/xlogfuncs.c:150 access/transam/xlogfuncs.c:189 access/transam/xlogfuncs.c:210 access/transam/xlogfuncs.c:280 access/transam/xlogfuncs.c:336
 #, c-format
 msgid "recovery is in progress"
 msgstr "restauration en cours"
 
-#: access/transam/xlog.c:9779 access/transam/xlog.c:10250 access/transam/xlogfuncs.c:122 access/transam/xlogfuncs.c:151 access/transam/xlogfuncs.c:190 access/transam/xlogfuncs.c:211
+#: access/transam/xlog.c:9827 access/transam/xlog.c:10331 access/transam/xlogfuncs.c:122 access/transam/xlogfuncs.c:151 access/transam/xlogfuncs.c:190 access/transam/xlogfuncs.c:211
 #, c-format
 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:9788 access/transam/xlog.c:10259
+#: access/transam/xlog.c:9836 access/transam/xlog.c:10340
 #, c-format
 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:9789 access/transam/xlog.c:10260 access/transam/xlogfuncs.c:157
+#: access/transam/xlog.c:9837 access/transam/xlog.c:10341 access/transam/xlogfuncs.c:157
 #, c-format
 msgid "wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start."
 msgstr ""
 "wal_level doit être configuré à « archive », « hot_standby » ou « logical »\n"
 "au démarrage du serveur."
 
-#: access/transam/xlog.c:9794
+#: access/transam/xlog.c:9842
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "label de sauvegarde trop long (%d octets maximum)"
 
-#: access/transam/xlog.c:9826 access/transam/xlog.c:10096 access/transam/xlog.c:10132
+#: access/transam/xlog.c:9879 access/transam/xlog.c:10149 access/transam/xlog.c:10185
 #, c-format
 msgid "a backup is already in progress"
 msgstr "une sauvegarde est déjà en cours"
 
-#: access/transam/xlog.c:9827
+#: access/transam/xlog.c:9880
 #, c-format
 msgid "Run pg_stop_backup() and try again."
 msgstr "Exécutez pg_stop_backup() et tentez de nouveau."
 
-#: access/transam/xlog.c:9922
+#: access/transam/xlog.c:9975
 #, c-format
 msgid "WAL generated with full_page_writes=off was replayed since last restartpoint"
 msgstr "Les journaux générés avec full_page_writes=off ont été rejoués depuis le dernier restartpoint."
 
-#: access/transam/xlog.c:9924 access/transam/xlog.c:10414
+#: access/transam/xlog.c:9977 access/transam/xlog.c:10523
 #, c-format
 msgid "This means that the backup being taken on the standby is corrupt and should not be used. Enable full_page_writes and run CHECKPOINT on the master, and then try an online backup again."
 msgstr ""
@@ -2222,81 +2198,86 @@
 "corrompue et ne doit pas être utilisée. Activez full_page_writes et lancez\n"
 "CHECKPOINT sur le maître, puis recommencez la sauvegarde."
 
-#: access/transam/xlog.c:9990 replication/basebackup.c:1035 utils/adt/misc.c:378
+#: access/transam/xlog.c:10043 replication/basebackup.c:1023 utils/adt/misc.c:378
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "n'a pas pu lire le lien symbolique « %s » : %m"
 
-#: access/transam/xlog.c:9997 replication/basebackup.c:1040 utils/adt/misc.c:383
+#: access/transam/xlog.c:10050 replication/basebackup.c:1028 utils/adt/misc.c:383
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "la cible du lien symbolique « %s » est trop long"
 
-#: access/transam/xlog.c:10050 commands/tablespace.c:391 commands/tablespace.c:553 replication/basebackup.c:1056 utils/adt/misc.c:391
+#: access/transam/xlog.c:10103 commands/tablespace.c:391 commands/tablespace.c:553 replication/basebackup.c:1044 utils/adt/misc.c:391
 #, c-format
 msgid "tablespaces are not supported on this platform"
 msgstr "les tablespaces ne sont pas supportés sur cette plateforme"
 
-#: access/transam/xlog.c:10090 access/transam/xlog.c:10126 access/transam/xlog.c:10300 access/transam/xlogarchive.c:106 access/transam/xlogarchive.c:265 commands/copy.c:1738 commands/copy.c:2764 commands/extension.c:3026 commands/tablespace.c:860 guc-file.l:1003 replication/basebackup.c:404 replication/basebackup.c:472 replication/logical/snapbuild.c:1478 storage/file/copydir.c:72 storage/file/copydir.c:115 storage/file/fd.c:2519
-#: storage/file/fd.c:2611 utils/adt/dbsize.c:68 utils/adt/dbsize.c:218 utils/adt/dbsize.c:298 utils/adt/genfile.c:114 utils/adt/genfile.c:333
+#: access/transam/xlog.c:10143 access/transam/xlog.c:10179 access/transam/xlog.c:10380 access/transam/xlogarchive.c:106 access/transam/xlogarchive.c:265 commands/copy.c:1778 commands/copy.c:2804 commands/extension.c:3029 commands/tablespace.c:782 commands/tablespace.c:873 guc-file.l:1003 replication/basebackup.c:406 replication/basebackup.c:474 replication/logical/snapbuild.c:1479 storage/file/copydir.c:72 storage/file/copydir.c:115
+#: storage/file/fd.c:2703 storage/file/fd.c:2795 utils/adt/dbsize.c:68 utils/adt/dbsize.c:218 utils/adt/dbsize.c:298 utils/adt/genfile.c:114 utils/adt/genfile.c:333
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: access/transam/xlog.c:10097 access/transam/xlog.c:10133
+#: access/transam/xlog.c:10150 access/transam/xlog.c:10186
 #, 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:10114 access/transam/xlog.c:10150 access/transam/xlog.c:10475
+#: access/transam/xlog.c:10167 access/transam/xlog.c:10203 access/transam/xlog.c:10584
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "impossible d'écrire le fichier « %s » : %m"
 
-#: access/transam/xlog.c:10304
+#: access/transam/xlog.c:10357
+#, c-format
+msgid "exclusive backup not in progress"
+msgstr "une sauvegarde exclusive n'est pas en cours"
+
+#: access/transam/xlog.c:10384
 #, c-format
 msgid "a backup is not in progress"
 msgstr "une sauvegarde n'est pas en cours"
 
-#: access/transam/xlog.c:10349 access/transam/xlog.c:10362 access/transam/xlog.c:10702 access/transam/xlog.c:10708 access/transam/xlog.c:10792 access/transam/xlogfuncs.c:508
+#: access/transam/xlog.c:10458 access/transam/xlog.c:10471 access/transam/xlog.c:10811 access/transam/xlog.c:10817 access/transam/xlog.c:10901 access/transam/xlogfuncs.c:508
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "données invalides dans le fichier « %s »"
 
-#: access/transam/xlog.c:10366 replication/basebackup.c:933
+#: access/transam/xlog.c:10475 replication/basebackup.c:935
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr "le standby a été promu lors de la sauvegarde en ligne"
 
-#: access/transam/xlog.c:10367 replication/basebackup.c:934
+#: access/transam/xlog.c:10476 replication/basebackup.c:936
 #, c-format
 msgid "This means that the backup being taken is corrupt and should not be used. Try taking another online backup."
 msgstr ""
 "Cela signifie que la sauvegarde en cours de réalisation est corrompue et ne\n"
 "doit pas être utilisée. Recommencez la sauvegarde."
 
-#: access/transam/xlog.c:10412
+#: access/transam/xlog.c:10521
 #, c-format
 msgid "WAL generated with full_page_writes=off was replayed during online backup"
 msgstr ""
 "le journal de transactions généré avec full_page_writes=off a été rejoué lors\n"
 "de la sauvegarde en ligne"
 
-#: access/transam/xlog.c:10524
+#: access/transam/xlog.c:10633
 #, c-format
 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:10534
+#: access/transam/xlog.c:10643
 #, 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:10536
+#: access/transam/xlog.c:10645
 #, c-format
 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 ""
@@ -2304,12 +2285,12 @@
 "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:10543
+#: access/transam/xlog.c:10652
 #, c-format
 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:10547
+#: access/transam/xlog.c:10656
 #, 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"
 msgstr ""
@@ -2317,57 +2298,57 @@
 "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:10831
+#: access/transam/xlog.c:10940
 #, c-format
 msgid "xlog redo %s"
 msgstr "xlog redo %s"
 
-#: access/transam/xlog.c:10877
+#: access/transam/xlog.c:10986
 #, c-format
 msgid "online backup mode was not canceled"
 msgstr "le mode de sauvegarde en ligne n'a pas été annulé"
 
-#: access/transam/xlog.c:10878
+#: access/transam/xlog.c:10987
 #, c-format
 msgid "File \"%s\" could not be renamed to \"%s\": %m."
 msgstr "Le fichier « %s » n'a pas pu être renommé en « %s » : %m"
 
-#: access/transam/xlog.c:10887 access/transam/xlog.c:10899 access/transam/xlog.c:10909
+#: access/transam/xlog.c:10996 access/transam/xlog.c:11008 access/transam/xlog.c:11018
 #, c-format
 msgid "online backup mode canceled"
 msgstr "mode de sauvegarde en ligne annulé"
 
-#: access/transam/xlog.c:10900
+#: access/transam/xlog.c:11009
 #, c-format
 msgid "Files \"%s\" and \"%s\" were renamed to \"%s\" and \"%s\", respectively."
 msgstr "Les fichiers « %s » et « %s » sont renommés respectivement « %s » et « %s »."
 
-#: access/transam/xlog.c:10910
+#: access/transam/xlog.c:11019
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\", but file \"%s\" could not be renamed to \"%s\": %m."
 msgstr "Le fichier « %s » a été renommé en « %s », mais le fichier « %s » n'a pas pu être renommé en « %s » : %m"
 
-#: access/transam/xlog.c:11032 replication/logical/logicalfuncs.c:171 replication/walreceiver.c:932 replication/walsender.c:2112
+#: access/transam/xlog.c:11141 replication/logical/logicalfuncs.c:171 replication/walreceiver.c:932 replication/walsender.c:2154
 #, c-format
 msgid "could not seek in log segment %s to offset %u: %m"
 msgstr "n'a pas pu se déplacer dans le journal de transactions %s au décalage %u : %m"
 
-#: access/transam/xlog.c:11044
+#: access/transam/xlog.c:11153
 #, c-format
 msgid "could not read from log segment %s, offset %u: %m"
 msgstr "n'a pas pu lire le journal de transactions %s, décalage %u : %m"
 
-#: access/transam/xlog.c:11518
+#: access/transam/xlog.c:11627
 #, c-format
 msgid "received promote request"
 msgstr "a reçu une demande de promotion"
 
-#: access/transam/xlog.c:11531
+#: access/transam/xlog.c:11640
 #, c-format
 msgid "trigger file found: %s"
 msgstr "fichier trigger trouvé : %s"
 
-#: access/transam/xlog.c:11540
+#: access/transam/xlog.c:11649
 #, c-format
 msgid "could not stat trigger file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier trigger « %s » : %m"
@@ -2395,12 +2376,17 @@
 msgid "%s \"%s\": %s"
 msgstr "%s « %s »: %s"
 
-#: access/transam/xlogarchive.c:529 access/transam/xlogarchive.c:598
+#: access/transam/xlogarchive.c:458 replication/logical/snapbuild.c:1602 replication/slot.c:496 replication/slot.c:953 replication/slot.c:1065 storage/file/fd.c:501 storage/file/fd.c:559 utils/time/snapmgr.c:1146
+#, 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/xlogarchive.c:525 access/transam/xlogarchive.c:589
 #, 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/xlogarchive.c:537 access/transam/xlogarchive.c:606
+#: access/transam/xlogarchive.c:533 access/transam/xlogarchive.c:597
 #, 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"
@@ -2410,7 +2396,7 @@
 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/xlogfuncs.c:67 commands/tablespace.c:705 commands/tablespace.c:715 postmaster/postmaster.c:1389 replication/basebackup.c:292 replication/basebackup.c:632 storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:1985 storage/file/fd.c:2584 storage/ipc/dsm.c:300 utils/adt/genfile.c:439 utils/adt/misc.c:291 utils/misc/tzparser.c:339
+#: access/transam/xlogfuncs.c:67 commands/tablespace.c:705 commands/tablespace.c:715 postmaster/postmaster.c:1408 replication/basebackup.c:294 replication/basebackup.c:634 storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:2169 storage/file/fd.c:2768 storage/ipc/dsm.c:300 utils/adt/genfile.c:439 utils/adt/misc.c:291 utils/misc/tzparser.c:339
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
@@ -2546,72 +2532,72 @@
 msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
 msgstr "identifiant timeline %u hors de la séquence (après %u) dans le segment %s, décalage %u"
 
-#: access/transam/xlogreader.c:1024
+#: access/transam/xlogreader.c:1061
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %u désordonné à %X/%X"
 
-#: access/transam/xlogreader.c:1046
+#: access/transam/xlogreader.c:1083
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA configuré, mais aucune donnée inclus à %X/%X"
 
-#: access/transam/xlogreader.c:1053
+#: access/transam/xlogreader.c:1090
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA non configuré, mais la longueur des données est %u à %X/%X"
 
-#: access/transam/xlogreader.c:1086
+#: access/transam/xlogreader.c:1123
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE initialisé, mais décalage du trou %u longueur %u longueur de l'image du bloc %u à %X/%X"
 
-#: access/transam/xlogreader.c:1102
+#: access/transam/xlogreader.c:1139
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE non initialisé, mais décalage du trou %u longueur %u à %X/%X"
 
-#: access/transam/xlogreader.c:1117
+#: access/transam/xlogreader.c:1154
 #, c-format
 msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_IS_COMPRESSED configuré, mais la longueur de l'image du bloc est %u à %X/%X"
 
-#: access/transam/xlogreader.c:1132
+#: access/transam/xlogreader.c:1169
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ni BKPIMAGE_HAS_HOLE ni BKPIMAGE_IS_COMPRESSED configuré, mais la longueur de l'image du bloc est %u à %X/%X"
 
-#: access/transam/xlogreader.c:1148
+#: access/transam/xlogreader.c:1185
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL configuré, mais pas de relation précédente à %X/%X"
 
-#: access/transam/xlogreader.c:1160
+#: access/transam/xlogreader.c:1197
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "block_id %u invalide à %X/%X"
 
-#: access/transam/xlogreader.c:1225
+#: access/transam/xlogreader.c:1262
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "enregistrement de longueur invalide à %X/%X"
 
-#: access/transam/xlogreader.c:1314
+#: access/transam/xlogreader.c:1351
 #, c-format
 msgid "invalid compressed image at %X/%X, block %d"
 msgstr "image compressée invalide à %X/%X, bloc %d"
 
-#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:779 tcop/postgres.c:3485
+#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:794 tcop/postgres.c:3498
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s requiert une valeur"
 
-#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:784 tcop/postgres.c:3490
+#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:799 tcop/postgres.c:3503
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s requiert une valeur"
 
-#: bootstrap/bootstrap.c:284 postmaster/postmaster.c:796 postmaster/postmaster.c:809
+#: bootstrap/bootstrap.c:284 postmaster/postmaster.c:811 postmaster/postmaster.c:824
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Essayez « %s --help » pour plus d'informations.\n"
@@ -2731,14 +2717,14 @@
 msgid "column privileges are only valid for relations"
 msgstr "les droits sur la colonne sont seulement valides pour les relations"
 
-#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4651 catalog/objectaddress.c:854 catalog/pg_largeobject.c:113 storage/large_object/inv_api.c:291
+#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4656 catalog/objectaddress.c:854 catalog/pg_largeobject.c:113 storage/large_object/inv_api.c:291
 #, c-format
 msgid "large object %u does not exist"
 msgstr "le « Large Object » %u n'existe pas"
 
-#: catalog/aclchk.c:863 catalog/aclchk.c:871 commands/collationcmds.c:92 commands/copy.c:1010 commands/copy.c:1028 commands/copy.c:1036 commands/copy.c:1044 commands/copy.c:1052 commands/copy.c:1060 commands/copy.c:1068 commands/copy.c:1076 commands/copy.c:1084 commands/copy.c:1100 commands/copy.c:1114 commands/copy.c:1133 commands/copy.c:1148 commands/dbcommands.c:155 commands/dbcommands.c:163 commands/dbcommands.c:171
-#: commands/dbcommands.c:179 commands/dbcommands.c:187 commands/dbcommands.c:195 commands/dbcommands.c:203 commands/dbcommands.c:211 commands/dbcommands.c:219 commands/dbcommands.c:1397 commands/dbcommands.c:1405 commands/dbcommands.c:1413 commands/dbcommands.c:1421 commands/extension.c:1244 commands/extension.c:1252 commands/extension.c:1260 commands/extension.c:2677 commands/foreigncmds.c:539 commands/foreigncmds.c:548
-#: commands/functioncmds.c:525 commands/functioncmds.c:619 commands/functioncmds.c:627 commands/functioncmds.c:635 commands/functioncmds.c:643 commands/functioncmds.c:2045 commands/functioncmds.c:2053 commands/sequence.c:1189 commands/sequence.c:1197 commands/sequence.c:1205 commands/sequence.c:1213 commands/sequence.c:1221 commands/sequence.c:1229 commands/sequence.c:1237 commands/sequence.c:1245 commands/typecmds.c:293
+#: catalog/aclchk.c:863 catalog/aclchk.c:871 commands/collationcmds.c:92 commands/copy.c:1050 commands/copy.c:1068 commands/copy.c:1076 commands/copy.c:1084 commands/copy.c:1092 commands/copy.c:1100 commands/copy.c:1108 commands/copy.c:1116 commands/copy.c:1124 commands/copy.c:1140 commands/copy.c:1154 commands/copy.c:1173 commands/copy.c:1188 commands/dbcommands.c:155 commands/dbcommands.c:163 commands/dbcommands.c:171
+#: commands/dbcommands.c:179 commands/dbcommands.c:187 commands/dbcommands.c:195 commands/dbcommands.c:203 commands/dbcommands.c:211 commands/dbcommands.c:219 commands/dbcommands.c:1397 commands/dbcommands.c:1405 commands/dbcommands.c:1413 commands/dbcommands.c:1421 commands/extension.c:1247 commands/extension.c:1255 commands/extension.c:1263 commands/extension.c:2680 commands/foreigncmds.c:539 commands/foreigncmds.c:548
+#: commands/functioncmds.c:525 commands/functioncmds.c:619 commands/functioncmds.c:627 commands/functioncmds.c:635 commands/functioncmds.c:643 commands/functioncmds.c:2065 commands/functioncmds.c:2073 commands/sequence.c:1189 commands/sequence.c:1197 commands/sequence.c:1205 commands/sequence.c:1213 commands/sequence.c:1221 commands/sequence.c:1229 commands/sequence.c:1237 commands/sequence.c:1245 commands/typecmds.c:293
 #: commands/typecmds.c:1380 commands/typecmds.c:1389 commands/typecmds.c:1397 commands/typecmds.c:1405 commands/typecmds.c:1413 commands/user.c:138 commands/user.c:155 commands/user.c:163 commands/user.c:171 commands/user.c:179 commands/user.c:187 commands/user.c:195 commands/user.c:203 commands/user.c:211 commands/user.c:219 commands/user.c:227 commands/user.c:235 commands/user.c:243 commands/user.c:522 commands/user.c:534
 #: commands/user.c:542 commands/user.c:550 commands/user.c:558 commands/user.c:566 commands/user.c:574 commands/user.c:582 commands/user.c:591 commands/user.c:599 commands/user.c:607
 #, c-format
@@ -2750,13 +2736,13 @@
 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:1483 catalog/objectaddress.c:1338 commands/analyze.c:378 commands/copy.c:4383 commands/sequence.c:1491 commands/tablecmds.c:5167 commands/tablecmds.c:5273 commands/tablecmds.c:5333 commands/tablecmds.c:5446 commands/tablecmds.c:5503 commands/tablecmds.c:5597 commands/tablecmds.c:5693 commands/tablecmds.c:7845 commands/tablecmds.c:8050 commands/tablecmds.c:8470 commands/trigger.c:643 parser/analyze.c:2160
-#: parser/parse_relation.c:2542 parser/parse_relation.c:2604 parser/parse_target.c:940 parser/parse_type.c:127 utils/adt/acl.c:2839 utils/adt/ruleutils.c:1856
+#: catalog/aclchk.c:1483 catalog/objectaddress.c:1338 commands/analyze.c:378 commands/copy.c:4423 commands/sequence.c:1491 commands/tablecmds.c:5168 commands/tablecmds.c:5274 commands/tablecmds.c:5334 commands/tablecmds.c:5447 commands/tablecmds.c:5504 commands/tablecmds.c:5598 commands/tablecmds.c:5694 commands/tablecmds.c:7886 commands/tablecmds.c:8148 commands/tablecmds.c:8568 commands/trigger.c:643 parser/analyze.c:2157
+#: parser/parse_relation.c:2628 parser/parse_relation.c:2690 parser/parse_target.c:951 parser/parse_type.c:127 utils/adt/acl.c:2839 utils/adt/ruleutils.c:1862
 #, 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:1748 catalog/objectaddress.c:1151 commands/sequence.c:1078 commands/tablecmds.c:221 commands/tablecmds.c:11960 utils/adt/acl.c:2075 utils/adt/acl.c:2105 utils/adt/acl.c:2137 utils/adt/acl.c:2169 utils/adt/acl.c:2197 utils/adt/acl.c:2227
+#: catalog/aclchk.c:1748 catalog/objectaddress.c:1151 commands/sequence.c:1078 commands/tablecmds.c:222 commands/tablecmds.c:12118 utils/adt/acl.c:2075 utils/adt/acl.c:2105 utils/adt/acl.c:2137 utils/adt/acl.c:2169 utils/adt/acl.c:2197 utils/adt/acl.c:2227
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "« %s » n'est pas une séquence"
@@ -3028,127 +3014,127 @@
 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:3588 catalog/aclchk.c:4502
+#: catalog/aclchk.c:3588 catalog/aclchk.c:4507
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "la relation d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3687 catalog/aclchk.c:4920
+#: catalog/aclchk.c:3687 catalog/aclchk.c:4925
 #, 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:3741 catalog/aclchk.c:4580 tcop/fastpath.c:223
+#: catalog/aclchk.c:3741 catalog/aclchk.c:4585 tcop/fastpath.c:223
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "la fonction d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3795 catalog/aclchk.c:4606
+#: catalog/aclchk.c:3795 catalog/aclchk.c:4611
 #, c-format
 msgid "language with OID %u does not exist"
 msgstr "le langage d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3959 catalog/aclchk.c:4678
+#: catalog/aclchk.c:3959 catalog/aclchk.c:4683
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "le schéma d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4013 catalog/aclchk.c:4705
+#: catalog/aclchk.c:4013 catalog/aclchk.c:4710
 #, c-format
 msgid "tablespace with OID %u does not exist"
 msgstr "le tablespace d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4071 catalog/aclchk.c:4839 commands/foreigncmds.c:325
+#: catalog/aclchk.c:4072 catalog/aclchk.c:4844 commands/foreigncmds.c:325
 #, 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:4132 catalog/aclchk.c:4866 commands/foreigncmds.c:461
+#: catalog/aclchk.c:4134 catalog/aclchk.c:4871 commands/foreigncmds.c:461
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "le serveur distant d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4191 catalog/aclchk.c:4205 catalog/aclchk.c:4528
+#: catalog/aclchk.c:4194 catalog/aclchk.c:4533
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "le type d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4554
+#: catalog/aclchk.c:4559
 #, c-format
 msgid "operator with OID %u does not exist"
 msgstr "l'opérateur d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4731
+#: catalog/aclchk.c:4736
 #, 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:4758
+#: catalog/aclchk.c:4763
 #, 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:4785
+#: catalog/aclchk.c:4790
 #, 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:4812
+#: catalog/aclchk.c:4817
 #, 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:4893 commands/event_trigger.c:586
+#: catalog/aclchk.c:4898 commands/event_trigger.c:586
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "le trigger sur événement d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4946
+#: catalog/aclchk.c:4951
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "le collationnement d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4972
+#: catalog/aclchk.c:4977
 #, c-format
 msgid "conversion with OID %u does not exist"
 msgstr "la conversion d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:5013
+#: catalog/aclchk.c:5018
 #, c-format
 msgid "extension with OID %u does not exist"
 msgstr "l'extension d'OID %u n'existe pas"
 
-#: catalog/dependency.c:640
+#: catalog/dependency.c:639
 #, 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:643
+#: catalog/dependency.c:642
 #, c-format
 msgid "You can drop %s instead."
 msgstr "Vous pouvez supprimer %s à la place."
 
-#: catalog/dependency.c:804 catalog/pg_shdepend.c:576
+#: catalog/dependency.c:803 catalog/pg_shdepend.c:576
 #, 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:920
+#: catalog/dependency.c:919
 #, c-format
 msgid "drop auto-cascades to %s"
 msgstr "DROP cascade automatiquement sur %s"
 
-#: catalog/dependency.c:932 catalog/dependency.c:941
+#: catalog/dependency.c:931 catalog/dependency.c:940
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s dépend de %s"
 
-#: catalog/dependency.c:953 catalog/dependency.c:962
+#: catalog/dependency.c:952 catalog/dependency.c:961
 #, c-format
 msgid "drop cascades to %s"
 msgstr "DROP cascade sur %s"
 
-#: catalog/dependency.c:970 catalog/pg_shdepend.c:687
+#: catalog/dependency.c:969 catalog/pg_shdepend.c:687
 #, c-format
 msgid ""
 "\n"
@@ -3163,184 +3149,194 @@
 "\n"
 "et %d autres objets (voir le journal applicatif du serveur pour une liste)"
 
-#: catalog/dependency.c:982
+#: catalog/dependency.c:981
 #, 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:986 catalog/dependency.c:993
+#: catalog/dependency.c:985 catalog/dependency.c:992
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
 msgstr "Utilisez DROP ... CASCADE pour supprimer aussi les objets dépendants."
 
-#: catalog/dependency.c:990
+#: catalog/dependency.c:989
 #, c-format
 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:999
+#: catalog/dependency.c:998
 #, 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:1622
+#: catalog/dependency.c:1621
 #, c-format
 msgid "constant of the type \"regrole\" cannot be used here"
 msgstr "une constante de type « regrole » ne peut pas être utilisée ici"
 
-#: catalog/heap.c:276
+#: catalog/heap.c:277
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "droit refusé pour créer « %s.%s »"
 
-#: catalog/heap.c:278
+#: catalog/heap.c:279
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "Les modifications du catalogue système sont actuellement interdites."
 
-#: catalog/heap.c:413 commands/tablecmds.c:1434 commands/tablecmds.c:1887 commands/tablecmds.c:4804
+#: catalog/heap.c:414 commands/tablecmds.c:1435 commands/tablecmds.c:1888 commands/tablecmds.c:4805
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "les tables peuvent avoir au plus %d colonnes"
 
-#: catalog/heap.c:430 commands/tablecmds.c:5063
+#: catalog/heap.c:431 commands/tablecmds.c:5064
 #, 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:446
+#: catalog/heap.c:447
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "colonne « %s » spécifiée plus d'une fois"
 
-#: catalog/heap.c:496
+#: catalog/heap.c:497
 #, c-format
 msgid "column \"%s\" has type \"unknown\""
 msgstr "la colonne « %s » est de type « unknown »"
 
-#: catalog/heap.c:497
+#: catalog/heap.c:498
 #, c-format
 msgid "Proceeding with relation creation anyway."
 msgstr "Poursuit malgré tout la création de la relation."
 
-#: catalog/heap.c:510
+#: catalog/heap.c:511
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "la colonne « %s » a le pseudo type %s"
 
-#: catalog/heap.c:540
+#: catalog/heap.c:541
 #, 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:582 commands/createas.c:373
+#: catalog/heap.c:583 commands/createas.c:201 commands/createas.c:497
 #, 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:584 commands/createas.c:375 commands/indexcmds.c:1087 commands/view.c:116 regex/regc_pg_locale.c:262 utils/adt/formatting.c:1514 utils/adt/formatting.c:1566 utils/adt/formatting.c:1634 utils/adt/formatting.c:1686 utils/adt/formatting.c:1755 utils/adt/formatting.c:1819 utils/adt/like.c:213 utils/adt/selfuncs.c:5276 utils/adt/varlena.c:1411 utils/adt/varlena.c:1800
+#: catalog/heap.c:585 commands/createas.c:204 commands/createas.c:500 commands/indexcmds.c:1088 commands/view.c:103 regex/regc_pg_locale.c:262 utils/adt/formatting.c:1513 utils/adt/formatting.c:1565 utils/adt/formatting.c:1633 utils/adt/formatting.c:1685 utils/adt/formatting.c:1754 utils/adt/formatting.c:1818 utils/adt/like.c:213 utils/adt/selfuncs.c:5380 utils/adt/varlena.c:1411 utils/adt/varlena.c:1800
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "Utilisez la clause COLLARE pour configurer explicitement le collationnement."
 
-#: catalog/heap.c:1065 catalog/index.c:793 commands/tablecmds.c:2614
+#: catalog/heap.c:1066 catalog/index.c:793 commands/tablecmds.c:2615
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "la relation « %s » existe déjà"
 
-#: catalog/heap.c:1081 catalog/pg_type.c:412 catalog/pg_type.c:722 commands/typecmds.c:235 commands/typecmds.c:782 commands/typecmds.c:1133 commands/typecmds.c:1355 commands/typecmds.c:2109
+#: catalog/heap.c:1082 catalog/pg_type.c:412 catalog/pg_type.c:737 commands/typecmds.c:235 commands/typecmds.c:782 commands/typecmds.c:1133 commands/typecmds.c:1355 commands/typecmds.c:2109
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "le type « %s » existe déjà"
 
-#: catalog/heap.c:1082
+#: catalog/heap.c:1083
 #, 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 ""
 "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:1110
+#: catalog/heap.c:1111
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "OID du heap de pg_class non configuré en mode de mise à jour binaire"
 
-#: catalog/heap.c:2290
+#: catalog/heap.c:2292
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "la contrainte de vérification « %s » existe déjà"
 
-#: catalog/heap.c:2445 catalog/pg_constraint.c:652 commands/tablecmds.c:6038
+#: catalog/heap.c:2459 catalog/pg_constraint.c:652 commands/tablecmds.c:6039
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "la contrainte « %s » de la relation « %s » existe déjà"
 
-#: catalog/heap.c:2455
+#: catalog/heap.c:2466
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
 msgstr "la contrainte « %s » entre en conflit avec la constrainte non héritée sur la relation « %s »"
 
-#: catalog/heap.c:2469
+#: catalog/heap.c:2477
+#, c-format
+msgid "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
+msgstr "la contrainte « %s » entre en conflit avec une contrainte héritée sur la relation « %s »"
+
+#: catalog/heap.c:2487
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
+msgstr "la contrainte « %s » entre en conflit avec une contrainte NOT VALID sur la relation « %s »"
+
+#: catalog/heap.c:2492
 #, 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:2562
+#: catalog/heap.c:2598
 #, c-format
 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:2573
+#: catalog/heap.c:2609
 #, c-format
 msgid "default expression must not return a set"
 msgstr "l'expression par défaut ne doit pas renvoyer un ensemble"
 
-#: catalog/heap.c:2592 rewrite/rewriteHandler.c:1077
+#: catalog/heap.c:2628 rewrite/rewriteHandler.c:1108
 #, 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:2597 commands/prepare.c:374 parser/parse_node.c:411 parser/parse_target.c:528 parser/parse_target.c:778 parser/parse_target.c:788 rewrite/rewriteHandler.c:1082
+#: catalog/heap.c:2633 commands/prepare.c:374 parser/parse_node.c:411 parser/parse_target.c:539 parser/parse_target.c:789 parser/parse_target.c:799 rewrite/rewriteHandler.c:1113
 #, c-format
 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:2644
+#: catalog/heap.c:2680
 #, 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:2884
+#: catalog/heap.c:2920
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "combinaison ON COMMIT et clé étrangère non supportée"
 
-#: catalog/heap.c:2885
+#: catalog/heap.c:2921
 #, 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:2890
+#: catalog/heap.c:2926
 #, c-format
 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:2891
+#: catalog/heap.c:2927
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "La table « %s » référence « %s »."
 
-#: catalog/heap.c:2893
+#: catalog/heap.c:2929
 #, 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:205 parser/parse_utilcmd.c:1436 parser/parse_utilcmd.c:1522
+#: catalog/index.c:205 parser/parse_utilcmd.c:1438 parser/parse_utilcmd.c:1524
 #, 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 »"
@@ -3367,7 +3363,7 @@
 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:785 commands/createas.c:100 commands/sequence.c:141 parser/parse_utilcmd.c:185
+#: catalog/index.c:785 commands/createas.c:249 commands/sequence.c:141 parser/parse_utilcmd.c:185
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "la relation « %s » existe déjà, poursuite du traitement"
@@ -3397,11 +3393,6 @@
 msgid "index \"%s\" was reindexed"
 msgstr "l'index « %s » a été réindexée"
 
-#: catalog/index.c:3389 commands/vacuumlazy.c:1135 commands/vacuumlazy.c:1211 commands/vacuumlazy.c:1378 commands/vacuumlazy.c:1550
-#, c-format
-msgid "%s."
-msgstr "%s."
-
 #: catalog/namespace.c:249 catalog/namespace.c:447 catalog/namespace.c:541 commands/trigger.c:4528
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
@@ -3422,17 +3413,17 @@
 msgid "could not obtain lock on relation \"%s\""
 msgstr "n'a pas pu obtenir un verrou sur la relation « %s »"
 
-#: catalog/namespace.c:414 parser/parse_relation.c:1137
+#: catalog/namespace.c:414 parser/parse_relation.c:1138
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "la relation « %s.%s » n'existe pas"
 
-#: catalog/namespace.c:419 parser/parse_relation.c:1150 parser/parse_relation.c:1158 utils/adt/regproc.c:1034
+#: catalog/namespace.c:419 parser/parse_relation.c:1151 parser/parse_relation.c:1159 utils/adt/regproc.c:1035
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "la relation « %s » n'existe pas"
 
-#: catalog/namespace.c:487 catalog/namespace.c:2852 commands/extension.c:1394 commands/extension.c:1400
+#: catalog/namespace.c:487 catalog/namespace.c:2852 commands/extension.c:1397 commands/extension.c:1403
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "aucun schéma n'a été sélectionné pour cette création"
@@ -3472,12 +3463,12 @@
 msgid "text search configuration \"%s\" does not exist"
 msgstr "la configuration de recherche plein texte « %s » n'existe pas"
 
-#: catalog/namespace.c:2646 parser/parse_expr.c:789 parser/parse_target.c:1130
+#: catalog/namespace.c:2646 parser/parse_expr.c:789 parser/parse_target.c:1141
 #, 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:2652 gram.y:13305 gram.y:14659 parser/parse_expr.c:796 parser/parse_target.c:1137
+#: catalog/namespace.c:2652 gram.y:13310 gram.y:14676 parser/parse_expr.c:796 parser/parse_target.c:1148
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "mauvaise qualification du nom (trop de points entre les noms) : %s"
@@ -3497,7 +3488,7 @@
 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:2873 commands/schemacmds.c:238 commands/schemacmds.c:317 commands/tablecmds.c:736
+#: catalog/namespace.c:2873 commands/schemacmds.c:238 commands/schemacmds.c:317 commands/tablecmds.c:737
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "le schéma « %s » n'existe pas"
@@ -3529,10 +3520,10 @@
 
 #: catalog/namespace.c:3654
 #, c-format
-msgid "cannot create temporary tables in parallel mode"
-msgstr "ne peut pas créer des tables temporaires dans le mode de parallélisation"
+msgid "cannot create temporary tables during a parallel operation"
+msgstr "ne peut pas créer des tables temporaires pendant une opération parallèle"
 
-#: catalog/namespace.c:3898 commands/tablespace.c:1159 commands/variable.c:63 replication/syncrep.c:700 utils/misc/guc.c:9636
+#: catalog/namespace.c:3898 commands/tablespace.c:1173 commands/variable.c:63 replication/syncrep.c:702 utils/misc/guc.c:9667
 #, c-format
 msgid "List syntax is invalid."
 msgstr "La syntaxe de la liste est invalide."
@@ -3541,7 +3532,7 @@
 msgid "database name cannot be qualified"
 msgstr "le nom de la base de donnée ne peut être qualifié"
 
-#: catalog/objectaddress.c:1024 commands/extension.c:2423
+#: catalog/objectaddress.c:1024 commands/extension.c:2426
 #, c-format
 msgid "extension name cannot be qualified"
 msgstr "le nom de l'extension ne peut pas être qualifié"
@@ -3574,22 +3565,22 @@
 msgid "event trigger name cannot be qualified"
 msgstr "le nom du trigger sur événement ne peut pas être qualifié"
 
-#: catalog/objectaddress.c:1158 commands/lockcmds.c:94 commands/policy.c:94 commands/policy.c:384 commands/policy.c:473 commands/tablecmds.c:215 commands/tablecmds.c:1295 commands/tablecmds.c:4338 commands/tablecmds.c:7947
+#: catalog/objectaddress.c:1158 commands/lockcmds.c:94 commands/policy.c:94 commands/policy.c:384 commands/policy.c:473 commands/tablecmds.c:216 commands/tablecmds.c:1296 commands/tablecmds.c:4339 commands/tablecmds.c:7988
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "« %s » n'est pas une table"
 
-#: catalog/objectaddress.c:1165 commands/tablecmds.c:227 commands/tablecmds.c:4368 commands/tablecmds.c:11965 commands/view.c:155
+#: catalog/objectaddress.c:1165 commands/tablecmds.c:228 commands/tablecmds.c:4369 commands/tablecmds.c:12123 commands/view.c:141
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "« %s » n'est pas une vue"
 
-#: catalog/objectaddress.c:1172 commands/matview.c:174 commands/tablecmds.c:233 commands/tablecmds.c:11970
+#: catalog/objectaddress.c:1172 commands/matview.c:174 commands/tablecmds.c:234 commands/tablecmds.c:12128
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "« %s » n'est pas une vue matérialisée"
 
-#: catalog/objectaddress.c:1179 commands/tablecmds.c:251 commands/tablecmds.c:4371 commands/tablecmds.c:11975
+#: catalog/objectaddress.c:1179 commands/tablecmds.c:252 commands/tablecmds.c:4372 commands/tablecmds.c:12133
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "« %s » n'est pas une table distante"
@@ -3604,7 +3595,7 @@
 msgid "default value for column \"%s\" of relation \"%s\" does not exist"
 msgstr "la valeur par défaut de la colonne « %s » de la relation « %s » n'existe pas"
 
-#: catalog/objectaddress.c:1460 commands/functioncmds.c:128 commands/tablecmds.c:243 commands/typecmds.c:3210 parser/parse_type.c:226 parser/parse_type.c:255 parser/parse_type.c:795 utils/adt/acl.c:4373 utils/adt/regproc.c:1225
+#: catalog/objectaddress.c:1460 commands/functioncmds.c:128 commands/tablecmds.c:244 commands/typecmds.c:3210 parser/parse_type.c:226 parser/parse_type.c:255 parser/parse_type.c:795 utils/adt/acl.c:4373 utils/adt/regproc.c:1226
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "le type « %s » n'existe pas"
@@ -3614,157 +3605,157 @@
 msgid "operator %d (%s, %s) of %s does not exist"
 msgstr "l'opérateur %d (%s, %s) de %s n'existe pas"
 
-#: catalog/objectaddress.c:1606
+#: catalog/objectaddress.c:1608
 #, c-format
 msgid "function %d (%s, %s) of %s does not exist"
 msgstr "la fonction %d (%s, %s) de %s n'existe pas"
 
-#: catalog/objectaddress.c:1655 catalog/objectaddress.c:1681
+#: catalog/objectaddress.c:1659 catalog/objectaddress.c:1685
 #, c-format
 msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
 msgstr "la correspondance pour l'utilisateur « %s » sur le serveur « %s » n'existe pas"
 
-#: catalog/objectaddress.c:1670 commands/foreigncmds.c:430 commands/foreigncmds.c:997 commands/foreigncmds.c:1359 foreign/foreign.c:691
+#: catalog/objectaddress.c:1674 commands/foreigncmds.c:430 commands/foreigncmds.c:997 commands/foreigncmds.c:1359 foreign/foreign.c:691
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "le serveur « %s » n'existe pas"
 
-#: catalog/objectaddress.c:1742
+#: catalog/objectaddress.c:1746
 #, c-format
 msgid "unrecognized default ACL object type %c"
 msgstr "type d'objet de droits par défaut non reconnu %c"
 
-#: catalog/objectaddress.c:1743
+#: catalog/objectaddress.c:1747
 #, c-format
 msgid "Valid object types are \"r\", \"S\", \"f\", and \"T\"."
 msgstr "Les types d'objet valides sont « r », « S », « f » et « T »."
 
-#: catalog/objectaddress.c:1789
+#: catalog/objectaddress.c:1793
 #, c-format
 msgid "default ACL for user \"%s\" in schema \"%s\" on %s does not exist"
 msgstr "le droit par défaut pour l'utilisateur « % s» dans le schéma « %s » de %s n'existe pas"
 
-#: catalog/objectaddress.c:1794
+#: catalog/objectaddress.c:1798
 #, c-format
 msgid "default ACL for user \"%s\" on %s does not exist"
 msgstr "le droit par défaut pour l'utilisateur « %s » sur %s n'existe pas"
 
-#: catalog/objectaddress.c:1821 catalog/objectaddress.c:1877 catalog/objectaddress.c:1932
+#: catalog/objectaddress.c:1825 catalog/objectaddress.c:1881 catalog/objectaddress.c:1936
 #, c-format
 msgid "name or argument lists may not contain nulls"
 msgstr "le nom ou les listes d'arguments ne peuvent pas contenir de valeurs NULL"
 
-#: catalog/objectaddress.c:1853
+#: catalog/objectaddress.c:1857
 #, c-format
 msgid "unsupported object type \"%s\""
 msgstr "type d'objet « %s » non supporté"
 
-#: catalog/objectaddress.c:1873 catalog/objectaddress.c:1891
+#: catalog/objectaddress.c:1877 catalog/objectaddress.c:1895
 #, c-format
 msgid "name list length must be exactly %d"
 msgstr "la liste de nom doit être exactement de longueur %d"
 
-#: catalog/objectaddress.c:1895
+#: catalog/objectaddress.c:1899
 #, c-format
 msgid "large object OID may not be null"
 msgstr "l'OID du Large Object peut ne pas être NULL"
 
-#: catalog/objectaddress.c:1904 catalog/objectaddress.c:1964 catalog/objectaddress.c:1971
+#: catalog/objectaddress.c:1908 catalog/objectaddress.c:1968 catalog/objectaddress.c:1975
 #, c-format
 msgid "name list length must be at least %d"
 msgstr "la longueur de la liste de nom doit au moins être %d"
 
-#: catalog/objectaddress.c:1957 catalog/objectaddress.c:1977
+#: catalog/objectaddress.c:1961 catalog/objectaddress.c:1981
 #, c-format
 msgid "argument list length must be exactly %d"
 msgstr "la longueur de la liste d'arguments doit être %d exactement"
 
-#: catalog/objectaddress.c:2113 libpq/be-fsstubs.c:352
+#: catalog/objectaddress.c:2117 libpq/be-fsstubs.c:352
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "doit être le propriétaire du Large Object %u"
 
-#: catalog/objectaddress.c:2128 commands/functioncmds.c:1386
+#: catalog/objectaddress.c:2132 commands/functioncmds.c:1406
 #, 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:2168 catalog/objectaddress.c:2184
+#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2188
 #, c-format
 msgid "must be superuser"
 msgstr "doit être super-utilisateur"
 
-#: catalog/objectaddress.c:2175
+#: catalog/objectaddress.c:2179
 #, c-format
 msgid "must have CREATEROLE privilege"
 msgstr "doit avoir l'attribut CREATEROLE"
 
-#: catalog/objectaddress.c:2254
+#: catalog/objectaddress.c:2253
 #, c-format
 msgid "unrecognized object type \"%s\""
 msgstr "type d'objet non reconnu « %s »"
 
-#: catalog/objectaddress.c:2449
+#: catalog/objectaddress.c:2448
 #, c-format
 msgid " column %s"
 msgstr " colonne %s"
 
-#: catalog/objectaddress.c:2455
+#: catalog/objectaddress.c:2454
 #, c-format
 msgid "function %s"
 msgstr "fonction %s"
 
-#: catalog/objectaddress.c:2460
+#: catalog/objectaddress.c:2459
 #, c-format
 msgid "type %s"
 msgstr "type %s"
 
-#: catalog/objectaddress.c:2490
+#: catalog/objectaddress.c:2489
 #, c-format
 msgid "cast from %s to %s"
 msgstr "conversion de %s en %s"
 
-#: catalog/objectaddress.c:2510
+#: catalog/objectaddress.c:2509
 #, c-format
 msgid "collation %s"
 msgstr "collationnement %s"
 
-#: catalog/objectaddress.c:2534
+#: catalog/objectaddress.c:2533
 #, c-format
 msgid "constraint %s on %s"
 msgstr "contrainte %s sur %s"
 
-#: catalog/objectaddress.c:2540
+#: catalog/objectaddress.c:2539
 #, c-format
 msgid "constraint %s"
 msgstr "contrainte %s"
 
-#: catalog/objectaddress.c:2557
+#: catalog/objectaddress.c:2556
 #, c-format
 msgid "conversion %s"
 msgstr "conversion %s"
 
-#: catalog/objectaddress.c:2594
+#: catalog/objectaddress.c:2593
 #, c-format
 msgid "default for %s"
 msgstr "valeur par défaut pour %s"
 
-#: catalog/objectaddress.c:2603
+#: catalog/objectaddress.c:2602
 #, c-format
 msgid "language %s"
 msgstr "langage %s"
 
-#: catalog/objectaddress.c:2608
+#: catalog/objectaddress.c:2607
 #, c-format
 msgid "large object %u"
 msgstr "« Large Object » %u"
 
-#: catalog/objectaddress.c:2613
+#: catalog/objectaddress.c:2612
 #, c-format
 msgid "operator %s"
 msgstr "opérateur %s"
 
-#: catalog/objectaddress.c:2645
+#: catalog/objectaddress.c:2644
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "classe d'opérateur %s pour la méthode d'accès %s"
@@ -3773,7 +3764,7 @@
 #. 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/objectaddress.c:2695
+#: catalog/objectaddress.c:2694
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "opérateur %d (%s, %s) de %s : %s"
@@ -3782,172 +3773,172 @@
 #. 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/objectaddress.c:2745
+#: catalog/objectaddress.c:2744
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "fonction %d (%s, %s) de %s : %s"
 
-#: catalog/objectaddress.c:2785
+#: catalog/objectaddress.c:2784
 #, c-format
 msgid "rule %s on "
 msgstr "règle %s active "
 
-#: catalog/objectaddress.c:2807
+#: catalog/objectaddress.c:2806
 #, c-format
 msgid "transform for %s language %s"
 msgstr "transformation pour %s langage %s"
 
-#: catalog/objectaddress.c:2841
+#: catalog/objectaddress.c:2840
 #, c-format
 msgid "trigger %s on "
 msgstr "trigger %s actif "
 
-#: catalog/objectaddress.c:2858
+#: catalog/objectaddress.c:2857
 #, c-format
 msgid "schema %s"
 msgstr "schéma %s"
 
-#: catalog/objectaddress.c:2871
+#: catalog/objectaddress.c:2870
 #, c-format
 msgid "text search parser %s"
 msgstr "analyseur %s de la recherche plein texte"
 
-#: catalog/objectaddress.c:2886
+#: catalog/objectaddress.c:2885
 #, c-format
 msgid "text search dictionary %s"
 msgstr "dictionnaire %s de la recherche plein texte"
 
-#: catalog/objectaddress.c:2901
+#: catalog/objectaddress.c:2900
 #, c-format
 msgid "text search template %s"
 msgstr "modèle %s de la recherche plein texte"
 
-#: catalog/objectaddress.c:2916
+#: catalog/objectaddress.c:2915
 #, c-format
 msgid "text search configuration %s"
 msgstr "configuration %s de recherche plein texte"
 
-#: catalog/objectaddress.c:2924
+#: catalog/objectaddress.c:2923
 #, c-format
 msgid "role %s"
 msgstr "rôle %s"
 
-#: catalog/objectaddress.c:2937
+#: catalog/objectaddress.c:2936
 #, c-format
 msgid "database %s"
 msgstr "base de données %s"
 
-#: catalog/objectaddress.c:2949
+#: catalog/objectaddress.c:2948
 #, c-format
 msgid "tablespace %s"
 msgstr "tablespace %s"
 
-#: catalog/objectaddress.c:2958
+#: catalog/objectaddress.c:2957
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "wrapper de données distantes %s"
 
-#: catalog/objectaddress.c:2967
+#: catalog/objectaddress.c:2966
 #, c-format
 msgid "server %s"
 msgstr "serveur %s"
 
-#: catalog/objectaddress.c:2995
+#: catalog/objectaddress.c:2994
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "correspondance utilisateur pour %s sur le serveur %s"
 
-#: catalog/objectaddress.c:3030
+#: catalog/objectaddress.c:3029
 #, 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/objectaddress.c:3035
+#: catalog/objectaddress.c:3034
 #, 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/objectaddress.c:3040
+#: catalog/objectaddress.c:3039
 #, 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/objectaddress.c:3045
+#: catalog/objectaddress.c:3044
 #, c-format
 msgid "default privileges on new types belonging to role %s"
 msgstr "droits par défaut pour les nouveaux types appartenant au rôle %s"
 
-#: catalog/objectaddress.c:3051
+#: catalog/objectaddress.c:3050
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "droits par défaut appartenant au rôle %s"
 
-#: catalog/objectaddress.c:3059
+#: catalog/objectaddress.c:3058
 #, c-format
 msgid " in schema %s"
 msgstr " dans le schéma %s"
 
-#: catalog/objectaddress.c:3076
+#: catalog/objectaddress.c:3075
 #, c-format
 msgid "extension %s"
 msgstr "extension %s"
 
-#: catalog/objectaddress.c:3089
+#: catalog/objectaddress.c:3088
 #, c-format
 msgid "event trigger %s"
 msgstr "trigger sur événement %s"
 
-#: catalog/objectaddress.c:3121
+#: catalog/objectaddress.c:3120
 #, c-format
 msgid "policy %s on "
 msgstr "politique %s sur "
 
-#: catalog/objectaddress.c:3184
+#: catalog/objectaddress.c:3183
 #, c-format
 msgid "table %s"
 msgstr "table %s"
 
-#: catalog/objectaddress.c:3188
+#: catalog/objectaddress.c:3187
 #, c-format
 msgid "index %s"
 msgstr "index %s"
 
-#: catalog/objectaddress.c:3192
+#: catalog/objectaddress.c:3191
 #, c-format
 msgid "sequence %s"
 msgstr "séquence %s"
 
-#: catalog/objectaddress.c:3196
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "toast table %s"
 msgstr "table TOAST %s"
 
-#: catalog/objectaddress.c:3200
+#: catalog/objectaddress.c:3199
 #, c-format
 msgid "view %s"
 msgstr "vue %s"
 
-#: catalog/objectaddress.c:3204
+#: catalog/objectaddress.c:3203
 #, c-format
 msgid "materialized view %s"
 msgstr "vue matérialisée %s"
 
-#: catalog/objectaddress.c:3208
+#: catalog/objectaddress.c:3207
 #, c-format
 msgid "composite type %s"
 msgstr "type composite %s"
 
-#: catalog/objectaddress.c:3212
+#: catalog/objectaddress.c:3211
 #, c-format
 msgid "foreign table %s"
 msgstr "table distante %s"
 
-#: catalog/objectaddress.c:3217
+#: catalog/objectaddress.c:3216
 #, c-format
 msgid "relation %s"
 msgstr "relation %s"
 
-#: catalog/objectaddress.c:3254
+#: catalog/objectaddress.c:3253
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "famille d'opérateur %s pour la méthode d'accès %s"
@@ -3999,7 +3990,7 @@
 msgid "return type of inverse transition function %s is not %s"
 msgstr "le type de retour de la fonction de transition inverse %s n'est pas %s"
 
-#: catalog/pg_aggregate.c:344 executor/nodeWindowAgg.c:2302
+#: catalog/pg_aggregate.c:344 executor/nodeWindowAgg.c:2335
 #, c-format
 msgid "strictness of aggregate's forward and inverse transition functions must match"
 msgstr "la fonction de transition d'agrégat en déplacement ne doit pas renvoyer null"
@@ -4036,7 +4027,7 @@
 #: catalog/pg_aggregate.c:477
 #, c-format
 msgid "moving-aggregate implementation returns type %s, but plain implementation returns type %s"
-msgstr ""
+msgstr "l'implémentation de l'agrégat en déplacement renvoie le type %s; mais l'implémentation standard renvoie le type %s"
 
 #: catalog/pg_aggregate.c:488
 #, c-format
@@ -4108,7 +4099,7 @@
 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:165 commands/extension.c:2945
+#: catalog/pg_depend.c:165 commands/extension.c:2948
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "%s est déjà un membre de l'extension « %s »"
@@ -4316,7 +4307,7 @@
 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:971 executor/functions.c:1421
+#: catalog/pg_proc.c:971 executor/functions.c:1430
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "Fonction SQL « %s »"
@@ -4420,12 +4411,12 @@
 msgid "fixed-size types must have storage PLAIN"
 msgstr "les types de taille fixe doivent avoir un stockage de base"
 
-#: catalog/pg_type.c:789
+#: catalog/pg_type.c:809
 #, 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"
 
-#: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4350 commands/tablecmds.c:11853
+#: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4351 commands/tablecmds.c:12011
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "« %s » n'est pas une table ou une vue matérialisée"
@@ -4606,12 +4597,12 @@
 msgid "analyzing \"%s.%s\""
 msgstr "analyse « %s.%s »"
 
-#: commands/analyze.c:645
+#: commands/analyze.c:648
 #, 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:1201
+#: commands/analyze.c:1204
 #, 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 ""
@@ -4620,17 +4611,17 @@
 "  %d lignes dans l'échantillon,\n"
 "  %.0f lignes totales estimées"
 
-#: commands/analyze.c:1280
+#: commands/analyze.c:1283
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no child tables"
 msgstr "ignore l'analyse de l'arbre d'héritage « %s.%s » --- cet arbre d'héritage ne contient pas de tables enfants"
 
-#: commands/analyze.c:1369
+#: commands/analyze.c:1372
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no analyzable child tables"
 msgstr "ignore l'analyse de l'arbre d'héritage « %s.%s » --- cet arbre d'héritage ne contient pas de tables enfants analysables"
 
-#: commands/analyze.c:1417 executor/execQual.c:2900
+#: commands/analyze.c:1420 commands/tablecmds.c:8050 executor/execQual.c:2900
 msgid "could not convert row type"
 msgstr "n'a pas pu convertir le type de ligne"
 
@@ -4688,7 +4679,7 @@
 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:171 commands/tablecmds.c:9256 commands/tablecmds.c:10972
+#: commands/cluster.c:171 commands/tablecmds.c:9354 commands/tablecmds.c:11114
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "l'index « %s » pour la table « %s » n'existe pas"
@@ -4703,7 +4694,7 @@
 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:431 commands/tablecmds.c:10982
+#: commands/cluster.c:431 commands/tablecmds.c:11124
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "« %s » n'est pas un index de la table « %s »"
@@ -4725,29 +4716,29 @@
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "ne peut pas exécuter la commande CLUSTER sur l'index invalide « %s »"
 
-#: commands/cluster.c:918
+#: commands/cluster.c:920
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
 msgstr "cluster sur « %s.%s » en utilisant un parcours d'index sur « %s »"
 
-#: commands/cluster.c:924
+#: commands/cluster.c:926
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr "cluster sur « %s.%s » en utilisant un parcours séquentiel puis un tri"
 
-#: commands/cluster.c:929 commands/vacuumlazy.c:464
+#: commands/cluster.c:931 commands/vacuumlazy.c:469
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "exécution du VACUUM sur « %s.%s »"
 
-#: commands/cluster.c:1088
+#: commands/cluster.c:1090
 #, c-format
 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/cluster.c:1092
+#: commands/cluster.c:1094
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -4791,12 +4782,12 @@
 msgid "\"%s\" is not a table, view, materialized view, composite type, or foreign table"
 msgstr "« %s » n'est ni une table, ni une vue, ni une vue matérialisée, ni un type composite, ni une table distante"
 
-#: commands/constraint.c:60 utils/adt/ri_triggers.c:2717
+#: commands/constraint.c:60 utils/adt/ri_triggers.c:2715
 #, 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:67 utils/adt/ri_triggers.c:2726
+#: commands/constraint.c:67 utils/adt/ri_triggers.c:2724
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "la fonction « %s » doit être exécutée pour l'instruction AFTER ROW"
@@ -4846,7 +4837,7 @@
 msgid "could not read from COPY file: %m"
 msgstr "n'a pas pu lire le fichier COPY : %m"
 
-#: commands/copy.c:598 commands/copy.c:619 commands/copy.c:623 tcop/postgres.c:352 tcop/postgres.c:388 tcop/postgres.c:415
+#: commands/copy.c:598 commands/copy.c:619 commands/copy.c:623 tcop/postgres.c:344 tcop/postgres.c:380 tcop/postgres.c:407
 #, c-format
 msgid "unexpected EOF on client connection with an open transaction"
 msgstr ""
@@ -4880,444 +4871,444 @@
 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:880
+#: commands/copy.c:881
 #, c-format
 msgid "COPY FROM not supported with row-level security"
 msgstr "COPY FROM non supporté avec la sécurité niveau ligne"
 
-#: commands/copy.c:881
+#: commands/copy.c:882
 #, c-format
 msgid "Use INSERT statements instead."
 msgstr "Utilisez des instructions INSERT à la place."
 
-#: commands/copy.c:1021
+#: commands/copy.c:1061
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "format COPY « %s » non reconnu"
 
-#: commands/copy.c:1092 commands/copy.c:1106 commands/copy.c:1120 commands/copy.c:1140
+#: commands/copy.c:1132 commands/copy.c:1146 commands/copy.c:1160 commands/copy.c:1180
 #, 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:1153
+#: commands/copy.c:1193
 #, 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:1159 commands/dbcommands.c:232 commands/dbcommands.c:1427
+#: commands/copy.c:1199 commands/dbcommands.c:232 commands/dbcommands.c:1427
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "option « %s » non reconnu"
 
-#: commands/copy.c:1170
+#: commands/copy.c:1210
 #, c-format
 msgid "cannot specify DELIMITER in BINARY mode"
 msgstr "ne peut pas spécifier le délimiteur (DELIMITER) en mode binaire (BINARY)"
 
-#: commands/copy.c:1175
+#: commands/copy.c:1215
 #, c-format
 msgid "cannot specify NULL in BINARY mode"
 msgstr "ne peut pas spécifier NULL en mode binaire (BINARY)"
 
-#: commands/copy.c:1197
+#: commands/copy.c:1237
 #, c-format
 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:1204
+#: commands/copy.c:1244
 #, c-format
 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:1210
+#: commands/copy.c:1250
 #, c-format
 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:1227
+#: commands/copy.c:1267
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "le délimiteur de COPY ne peut pas être « %s »"
 
-#: commands/copy.c:1233
+#: commands/copy.c:1273
 #, c-format
 msgid "COPY HEADER available only in CSV mode"
 msgstr "COPY HEADER disponible uniquement en mode CSV"
 
-#: commands/copy.c:1239
+#: commands/copy.c:1279
 #, c-format
 msgid "COPY quote available only in CSV mode"
 msgstr "le guillemet COPY n'est disponible que dans le mode CSV"
 
-#: commands/copy.c:1244
+#: commands/copy.c:1284
 #, c-format
 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:1249
+#: commands/copy.c:1289
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "le délimiteur de COPY ne doit pas être un guillemet"
 
-#: commands/copy.c:1255
+#: commands/copy.c:1295
 #, c-format
 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:1260
+#: commands/copy.c:1300
 #, c-format
 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:1266
+#: commands/copy.c:1306
 #, c-format
 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:1270
+#: commands/copy.c:1310
 #, c-format
 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:1276
+#: commands/copy.c:1316
 #, c-format
 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:1280
+#: commands/copy.c:1320
 #, c-format
 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:1286
+#: commands/copy.c:1326
 #, c-format
 msgid "COPY force null available only in CSV mode"
 msgstr "« COPY force null » n'est disponible que dans le mode CSV"
 
-#: commands/copy.c:1291
+#: commands/copy.c:1331
 #, c-format
 msgid "COPY force null only available using COPY FROM"
 msgstr "« COPY force null » n'est disponible qu'en utilisant COPY FROM"
 
-#: commands/copy.c:1297
+#: commands/copy.c:1337
 #, c-format
 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:1304
+#: commands/copy.c:1344
 #, c-format
 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:1367
+#: commands/copy.c:1407
 #, c-format
 msgid "table \"%s\" does not have OIDs"
 msgstr "la table « %s » n'a pas d'OID"
 
-#: commands/copy.c:1384
+#: commands/copy.c:1424
 #, c-format
 msgid "COPY (SELECT) WITH OIDS is not supported"
 msgstr "COPY (SELECT) WITH OIDS n'est pas supporté"
 
-#: commands/copy.c:1410
+#: commands/copy.c:1450
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) n'est pas supporté"
 
-#: commands/copy.c:1440
+#: commands/copy.c:1480
 #, c-format
 msgid "relation referenced by COPY statement has changed"
 msgstr "la relation référencée par l'instruction COPY a changé"
 
-#: commands/copy.c:1498
+#: commands/copy.c:1538
 #, 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:1520
+#: commands/copy.c:1560
 #, 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:1542
+#: commands/copy.c:1582
 #, c-format
 msgid "FORCE NULL column \"%s\" not referenced by COPY"
 msgstr "colonne « %s » FORCE NULL non référencée par COPY"
 
-#: commands/copy.c:1607
+#: commands/copy.c:1647
 #, c-format
 msgid "could not close pipe to external command: %m"
 msgstr "n'a pas pu fermer le fichier pipe vers la commande externe : %m"
 
-#: commands/copy.c:1611
+#: commands/copy.c:1651
 #, c-format
 msgid "program \"%s\" failed"
 msgstr "le programme « %s » a échoué"
 
-#: commands/copy.c:1661
+#: commands/copy.c:1701
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "ne peut pas copier à partir de la vue « %s »"
 
-#: commands/copy.c:1663 commands/copy.c:1669 commands/copy.c:1675
+#: commands/copy.c:1703 commands/copy.c:1709 commands/copy.c:1715
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Tentez la variante COPY (SELECT ...) TO."
 
-#: commands/copy.c:1667
+#: commands/copy.c:1707
 #, c-format
 msgid "cannot copy from materialized view \"%s\""
 msgstr "ne peut pas copier à partir de la vue matérialisée « %s »"
 
-#: commands/copy.c:1673
+#: commands/copy.c:1713
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
 msgstr "ne peut pas copier à partir de la table distante « %s »"
 
-#: commands/copy.c:1679
+#: commands/copy.c:1719
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "ne peut pas copier à partir de la séquence « %s »"
 
-#: commands/copy.c:1684
+#: commands/copy.c:1724
 #, 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:1709 commands/copy.c:2747
+#: commands/copy.c:1749 commands/copy.c:2787
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "n'a pas pu exécuter la commande « %s » : %m"
 
-#: commands/copy.c:1724
+#: commands/copy.c:1764
 #, c-format
 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:1732
+#: commands/copy.c:1772
 #, 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:1744 commands/copy.c:2770
+#: commands/copy.c:1784 commands/copy.c:2810
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "« %s » est un répertoire"
 
-#: commands/copy.c:2069
+#: commands/copy.c:2109
 #, c-format
 msgid "COPY %s, line %d, column %s"
 msgstr "COPY %s, ligne %d, colonne %s"
 
-#: commands/copy.c:2073 commands/copy.c:2120
+#: commands/copy.c:2113 commands/copy.c:2160
 #, c-format
 msgid "COPY %s, line %d"
 msgstr "COPY %s, ligne %d"
 
-#: commands/copy.c:2084
+#: commands/copy.c:2124
 #, c-format
 msgid "COPY %s, line %d, column %s: \"%s\""
 msgstr "COPY %s, ligne %d, colonne %s : « %s »"
 
-#: commands/copy.c:2092
+#: commands/copy.c:2132
 #, 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:2114
+#: commands/copy.c:2154
 #, c-format
 msgid "COPY %s, line %d: \"%s\""
 msgstr "COPY %s, ligne %d : « %s »"
 
-#: commands/copy.c:2198
+#: commands/copy.c:2238
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "ne peut pas copier vers la vue « %s »"
 
-#: commands/copy.c:2203
+#: commands/copy.c:2243
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
 msgstr "ne peut pas copier vers la vue matérialisée « %s »"
 
-#: commands/copy.c:2208
+#: commands/copy.c:2248
 #, c-format
 msgid "cannot copy to foreign table \"%s\""
 msgstr "ne peut pas copier vers la table distante « %s »"
 
-#: commands/copy.c:2213
+#: commands/copy.c:2253
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "ne peut pas copier vers la séquence « %s »"
 
-#: commands/copy.c:2218
+#: commands/copy.c:2258
 #, 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:2281
+#: commands/copy.c:2321
 #, c-format
 msgid "cannot perform FREEZE because of prior transaction activity"
 msgstr "n'a pas pu exécuter un FREEZE à cause d'une activité transactionnelle précédente"
 
-#: commands/copy.c:2287
+#: commands/copy.c:2327
 #, c-format
 msgid "cannot perform FREEZE because the table was not created or truncated in the current subtransaction"
 msgstr "n'a pas pu exécuter un FREEZE parce que la table n'était pas créée ou tronquée dans la transaction en cours"
 
-#: commands/copy.c:2758 commands/extension.c:3037 utils/adt/genfile.c:134
+#: commands/copy.c:2798 commands/extension.c:3040 utils/adt/genfile.c:134
 #, 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:2790
+#: commands/copy.c:2830
 #, c-format
 msgid "COPY file signature not recognized"
 msgstr "la signature du fichier COPY n'est pas reconnue"
 
-#: commands/copy.c:2795
+#: commands/copy.c:2835
 #, c-format
 msgid "invalid COPY file header (missing flags)"
 msgstr "en-tête du fichier COPY invalide (options manquantes)"
 
-#: commands/copy.c:2801
+#: commands/copy.c:2841
 #, c-format
 msgid "unrecognized critical flags in COPY file header"
 msgstr "options critiques non reconnues dans l'en-tête du fichier COPY"
 
-#: commands/copy.c:2807
+#: commands/copy.c:2847
 #, c-format
 msgid "invalid COPY file header (missing length)"
 msgstr "en-tête du fichier COPY invalide (longueur manquante)"
 
-#: commands/copy.c:2814
+#: commands/copy.c:2854
 #, c-format
 msgid "invalid COPY file header (wrong length)"
 msgstr "en-tête du fichier COPY invalide (mauvaise longueur)"
 
-#: commands/copy.c:2947 commands/copy.c:3654 commands/copy.c:3884
+#: commands/copy.c:2987 commands/copy.c:3694 commands/copy.c:3924
 #, c-format
 msgid "extra data after last expected column"
 msgstr "données supplémentaires après la dernière colonne attendue"
 
-#: commands/copy.c:2957
+#: commands/copy.c:2997
 #, c-format
 msgid "missing data for OID column"
 msgstr "données manquantes pour la colonne OID"
 
-#: commands/copy.c:2963
+#: commands/copy.c:3003
 #, c-format
 msgid "null OID in COPY data"
 msgstr "OID NULL dans les données du COPY"
 
-#: commands/copy.c:2973 commands/copy.c:3096
+#: commands/copy.c:3013 commands/copy.c:3136
 #, c-format
 msgid "invalid OID in COPY data"
 msgstr "OID invalide dans les données du COPY"
 
-#: commands/copy.c:2988
+#: commands/copy.c:3028
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "données manquantes pour la colonne « %s »"
 
-#: commands/copy.c:3071
+#: commands/copy.c:3111
 #, c-format
 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:3078
+#: commands/copy.c:3118
 #, 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:3418 commands/copy.c:3435
+#: commands/copy.c:3458 commands/copy.c:3475
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "retour chariot trouvé dans les données"
 
-#: commands/copy.c:3419 commands/copy.c:3436
+#: commands/copy.c:3459 commands/copy.c:3476
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "retour chariot sans guillemet trouvé dans les données"
 
-#: commands/copy.c:3421 commands/copy.c:3438
+#: commands/copy.c:3461 commands/copy.c:3478
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Utilisez « \\r » pour représenter un retour chariot."
 
-#: commands/copy.c:3422 commands/copy.c:3439
+#: commands/copy.c:3462 commands/copy.c:3479
 #, c-format
 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:3451
+#: commands/copy.c:3491
 #, c-format
 msgid "literal newline found in data"
 msgstr "retour à la ligne trouvé dans les données"
 
-#: commands/copy.c:3452
+#: commands/copy.c:3492
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "retour à la ligne trouvé dans les données"
 
-#: commands/copy.c:3454
+#: commands/copy.c:3494
 #, c-format
 msgid "Use \"\\n\" to represent newline."
 msgstr "Utilisez « \\n » pour représenter un retour à la ligne."
 
-#: commands/copy.c:3455
+#: commands/copy.c:3495
 #, c-format
 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:3501 commands/copy.c:3537
+#: commands/copy.c:3541 commands/copy.c:3577
 #, c-format
 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:3510 commands/copy.c:3526
+#: commands/copy.c:3550 commands/copy.c:3566
 #, c-format
 msgid "end-of-copy marker corrupt"
 msgstr "marqueur fin-de-copie corrompu"
 
-#: commands/copy.c:3968
+#: commands/copy.c:4008
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "champ CSV entre guillemets non terminé"
 
-#: commands/copy.c:4045 commands/copy.c:4064
+#: commands/copy.c:4085 commands/copy.c:4104
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "fin de fichier (EOF) inattendu dans les données du COPY"
 
-#: commands/copy.c:4054
+#: commands/copy.c:4094
 #, c-format
 msgid "invalid field size"
 msgstr "taille du champ invalide"
 
-#: commands/copy.c:4077
+#: commands/copy.c:4117
 #, c-format
 msgid "incorrect binary data format"
 msgstr "format de données binaires incorrect"
 
-#: commands/copy.c:4388 commands/indexcmds.c:1008 commands/tablecmds.c:1459 commands/tablecmds.c:2282 parser/parse_relation.c:3084 parser/parse_relation.c:3104 utils/adt/tsvector_op.c:1417
+#: commands/copy.c:4428 commands/indexcmds.c:1009 commands/tablecmds.c:1460 commands/tablecmds.c:2283 parser/parse_relation.c:3177 parser/parse_relation.c:3197 utils/adt/tsvector_op.c:1418
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "la colonne « %s » n'existe pas"
 
-#: commands/copy.c:4395 commands/tablecmds.c:1485 commands/trigger.c:652 parser/parse_target.c:956 parser/parse_target.c:967
+#: commands/copy.c:4435 commands/tablecmds.c:1486 commands/trigger.c:652 parser/parse_target.c:967 parser/parse_target.c:978
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "la colonne « %s » est spécifiée plus d'une fois"
 
-#: commands/createas.c:383
+#: commands/createas.c:213 commands/createas.c:508
 #, c-format
 msgid "too many column names were specified"
 msgstr "trop de noms de colonnes ont été spécifiés"
 
-#: commands/createas.c:452
+#: commands/createas.c:549
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "politiques non encore implémentées pour cette commande"
@@ -5593,7 +5584,7 @@
 msgid "invalid argument for %s: \"%s\""
 msgstr "argument invalide pour %s : « %s »"
 
-#: commands/dropcmds.c:112 commands/functioncmds.c:1166 utils/adt/ruleutils.c:1951
+#: commands/dropcmds.c:112 commands/functioncmds.c:1166 utils/adt/ruleutils.c:1957
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "« %s » est une fonction d'agrégat"
@@ -5603,17 +5594,17 @@
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Utiliser DROP AGGREGATE pour supprimer les fonctions d'agrégat."
 
-#: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2369 commands/tablecmds.c:2520 commands/tablecmds.c:2562 commands/tablecmds.c:11336 tcop/utility.c:1104
+#: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2370 commands/tablecmds.c:2521 commands/tablecmds.c:2563 commands/tablecmds.c:11494 tcop/utility.c:1104
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "la relation « %s » n'existe pas, poursuite du traitement"
 
-#: commands/dropcmds.c:195 commands/dropcmds.c:292 commands/tablecmds.c:741
+#: commands/dropcmds.c:195 commands/dropcmds.c:292 commands/tablecmds.c:742
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "le schéma « %s » n'existe pas, poursuite du traitement"
 
-#: commands/dropcmds.c:237 commands/dropcmds.c:272 commands/tablecmds.c:244
+#: commands/dropcmds.c:237 commands/dropcmds.c:272 commands/tablecmds.c:245
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "le type « %s » n'existe pas, poursuite du traitement"
@@ -5790,15 +5781,15 @@
 msgid "%s can only be called in a sql_drop event trigger function"
 msgstr "%s peut seulement être appelé dans une fonction de trigger sur événement sql_drop"
 
-#: commands/event_trigger.c:1446 commands/event_trigger.c:1997 commands/extension.c:1645 commands/extension.c:1754 commands/extension.c:1947 commands/prepare.c:701 executor/execQual.c:1735 executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5376 executor/functions.c:1021 foreign/foreign.c:491 replication/logical/logicalfuncs.c:324 replication/logical/origin.c:1410 replication/slotfuncs.c:173 replication/walsender.c:2762
-#: utils/adt/jsonfuncs.c:1474 utils/adt/jsonfuncs.c:1606 utils/adt/jsonfuncs.c:1796 utils/adt/jsonfuncs.c:1925 utils/adt/jsonfuncs.c:2693 utils/adt/pgstatfuncs.c:547 utils/fmgr/funcapi.c:61 utils/misc/guc.c:8207 utils/mmgr/portalmem.c:1052
+#: commands/event_trigger.c:1446 commands/event_trigger.c:1997 commands/extension.c:1648 commands/extension.c:1757 commands/extension.c:1950 commands/prepare.c:701 executor/execQual.c:1735 executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5431 executor/functions.c:1030 foreign/foreign.c:491 replication/logical/logicalfuncs.c:324 replication/logical/origin.c:1394 replication/slotfuncs.c:173 replication/walsender.c:2888
+#: utils/adt/jsonfuncs.c:1474 utils/adt/jsonfuncs.c:1606 utils/adt/jsonfuncs.c:1796 utils/adt/jsonfuncs.c:1925 utils/adt/jsonfuncs.c:2693 utils/adt/pgstatfuncs.c:547 utils/fmgr/funcapi.c:61 utils/misc/guc.c:8228 utils/mmgr/portalmem.c:1052
 #, c-format
 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/event_trigger.c:1450 commands/event_trigger.c:2001 commands/extension.c:1649 commands/extension.c:1758 commands/extension.c:1951 commands/prepare.c:705 foreign/foreign.c:496 replication/logical/logicalfuncs.c:328 replication/logical/origin.c:1414 replication/slotfuncs.c:177 replication/walsender.c:2766 utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8211 utils/mmgr/portalmem.c:1056
+#: commands/event_trigger.c:1450 commands/event_trigger.c:2001 commands/extension.c:1652 commands/extension.c:1761 commands/extension.c:1954 commands/prepare.c:705 foreign/foreign.c:496 replication/logical/logicalfuncs.c:328 replication/logical/origin.c:1398 replication/slotfuncs.c:177 replication/walsender.c:2892 utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8232 utils/mmgr/portalmem.c:1056
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "mode matérialisé requis mais interdit dans ce contexte"
@@ -5813,27 +5804,27 @@
 msgid "%s can only be called in an event trigger function"
 msgstr "%s peut seulement être appelé dans une fonction de trigger sur événement"
 
-#: commands/explain.c:184
+#: commands/explain.c:185
 #, c-format
 msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
 msgstr "valeur non reconnue pour l'option EXPLAIN « %s » : %s"
 
-#: commands/explain.c:190
+#: commands/explain.c:191
 #, c-format
 msgid "unrecognized EXPLAIN option \"%s\""
 msgstr "option EXPLAIN « %s » non reconnu"
 
-#: commands/explain.c:197
+#: commands/explain.c:198
 #, c-format
 msgid "EXPLAIN option BUFFERS requires ANALYZE"
 msgstr "l'option BUFFERS d'EXPLAIN nécessite ANALYZE"
 
-#: commands/explain.c:206
+#: commands/explain.c:207
 #, c-format
 msgid "EXPLAIN option TIMING requires ANALYZE"
 msgstr "l'option TIMING d'EXPLAIN nécessite ANALYZE"
 
-#: commands/extension.c:152 commands/extension.c:2635
+#: commands/extension.c:152 commands/extension.c:2638
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "l'extension « %s » n'existe pas"
@@ -5922,135 +5913,135 @@
 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:719
+#: commands/extension.c:722
 #, c-format
 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:787
+#: commands/extension.c:790
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "droit refusé pour créer l'extension « %s »"
 
-#: commands/extension.c:789
+#: commands/extension.c:792
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "Doit être super-utilisateur pour créer cette extension."
 
-#: commands/extension.c:793
+#: commands/extension.c:796
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "droit refusé pour mettre à jour l'extension « %s »"
 
-#: commands/extension.c:795
+#: commands/extension.c:798
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "Doit être super-utilisateur pour mettre à jour cette extension."
 
-#: commands/extension.c:1077
+#: commands/extension.c:1080
 #, 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:1205
+#: commands/extension.c:1208
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "l'extension « %s » existe déjà, poursuite du traitement"
 
-#: commands/extension.c:1212
+#: commands/extension.c:1215
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "l'extension « %s » existe déjà"
 
-#: commands/extension.c:1223
+#: commands/extension.c:1226
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "CREATE EXTENSION imbriqué n'est pas supporté"
 
-#: commands/extension.c:1278 commands/extension.c:2695
+#: commands/extension.c:1281 commands/extension.c:2698
 #, c-format
 msgid "version to install must be specified"
 msgstr "la version à installer doit être précisée"
 
-#: commands/extension.c:1295
+#: commands/extension.c:1298
 #, 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:1350
+#: commands/extension.c:1353
 #, 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:2840
+#: commands/extension.c:1437 commands/extension.c:2843
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "l'extension « %s » requise n'est pas installée"
 
-#: commands/extension.c:1597
+#: commands/extension.c:1600
 #, c-format
 msgid "cannot drop extension \"%s\" because it is being modified"
 msgstr "ne peut pas supprimer l'extension « %s » car il est en cours de modification"
 
-#: commands/extension.c:2068
+#: commands/extension.c:2071
 #, c-format
 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:2080
+#: commands/extension.c:2083
 #, 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:2085
+#: commands/extension.c:2088
 #, 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:2450
+#: commands/extension.c:2453
 #, c-format
 msgid "cannot move extension \"%s\" into schema \"%s\" because the extension contains the schema"
 msgstr ""
 "ne peut pas déplacer l'extension « %s » dans le schéma « %s » car l'extension\n"
 "contient le schéma"
 
-#: commands/extension.c:2490 commands/extension.c:2553
+#: commands/extension.c:2493 commands/extension.c:2556
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "l'extension « %s » ne supporte pas SET SCHEMA"
 
-#: commands/extension.c:2555
+#: commands/extension.c:2558
 #, 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:2615
+#: commands/extension.c:2618
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "un ALTER EXTENSION imbriqué n'est pas supporté"
 
-#: commands/extension.c:2706
+#: commands/extension.c:2709
 #, 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:2957
+#: commands/extension.c:2960
 #, c-format
 msgid "cannot add schema \"%s\" to extension \"%s\" because the schema contains the extension"
 msgstr ""
 "ne peut pas ajouter le schéma « %s » à l'extension « %s » car le schéma\n"
 "contient l'extension"
 
-#: commands/extension.c:2975
+#: commands/extension.c:2978
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s n'est pas un membre de l'extension « %s »"
 
-#: commands/extension.c:3031
+#: commands/extension.c:3034
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "le fichier « %s » est trop gros"
@@ -6280,12 +6271,12 @@
 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:894 commands/functioncmds.c:2079 commands/proclang.c:560
+#: commands/functioncmds.c:894 commands/functioncmds.c:2099 commands/proclang.c:560
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "le langage « %s » n'existe pas"
 
-#: commands/functioncmds.c:896 commands/functioncmds.c:2081
+#: commands/functioncmds.c:896 commands/functioncmds.c:2101
 #, c-format
 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."
@@ -6310,196 +6301,196 @@
 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:1372
+#: commands/functioncmds.c:1392
 #, 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:1378
+#: commands/functioncmds.c:1398
 #, 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:1402
+#: commands/functioncmds.c:1422
 #, c-format
 msgid "cast will be ignored because the source data type is a domain"
 msgstr "la conversion sera ignorée car le type de données source est un domaine"
 
-#: commands/functioncmds.c:1407
+#: commands/functioncmds.c:1427
 #, c-format
 msgid "cast will be ignored because the target data type is a domain"
 msgstr "la conversion sera ignorée car le type de données cible est un domaine"
 
-#: commands/functioncmds.c:1434
+#: commands/functioncmds.c:1454
 #, c-format
 msgid "cast function must take one to three arguments"
 msgstr "la fonction de conversion doit prendre de un à trois arguments"
 
-#: commands/functioncmds.c:1438
+#: commands/functioncmds.c:1458
 #, c-format
 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:1442
+#: commands/functioncmds.c:1462
 #, c-format
 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:1446
+#: commands/functioncmds.c:1466
 #, c-format
 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:1450
+#: commands/functioncmds.c:1470
 #, c-format
 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:1461
+#: commands/functioncmds.c:1481
 #, c-format
 msgid "cast function must not be volatile"
 msgstr "la fonction de conversion ne doit pas être volatile"
 
-#: commands/functioncmds.c:1466
+#: commands/functioncmds.c:1486
 #, c-format
 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:1470
+#: commands/functioncmds.c:1490
 #, c-format
 msgid "cast function must not be a window function"
 msgstr "la fonction de conversion ne doit pas être une fonction window"
 
-#: commands/functioncmds.c:1474
+#: commands/functioncmds.c:1494
 #, c-format
 msgid "cast function must not return a set"
 msgstr "la fonction de conversion ne doit pas renvoyer un ensemble"
 
-#: commands/functioncmds.c:1500
+#: commands/functioncmds.c:1520
 #, c-format
 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:1515
+#: commands/functioncmds.c:1535
 #, c-format
 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:1530
+#: commands/functioncmds.c:1550
 #, c-format
 msgid "composite data types are not binary-compatible"
 msgstr "les types de données composites ne sont pas compatibles binairement"
 
-#: commands/functioncmds.c:1536
+#: commands/functioncmds.c:1556
 #, c-format
 msgid "enum data types are not binary-compatible"
 msgstr "les types de données enum ne sont pas compatibles binairement"
 
-#: commands/functioncmds.c:1542
+#: commands/functioncmds.c:1562
 #, c-format
 msgid "array data types are not binary-compatible"
 msgstr "les types de données tableau ne sont pas compatibles binairement"
 
-#: commands/functioncmds.c:1559
+#: commands/functioncmds.c:1579
 #, c-format
 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:1569
+#: commands/functioncmds.c:1589
 #, c-format
 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:1602
+#: commands/functioncmds.c:1622
 #, 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:1677
+#: commands/functioncmds.c:1697
 #, 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"
 
-#: commands/functioncmds.c:1716
+#: commands/functioncmds.c:1736
 #, c-format
 msgid "transform function must not be volatile"
 msgstr "la fonction de transformation ne doit pas être volatile"
 
-#: commands/functioncmds.c:1720
+#: commands/functioncmds.c:1740
 #, c-format
 msgid "transform function must not be an aggregate function"
 msgstr "la fonction de transformation ne doit pas être une fonction d'agrégat"
 
-#: commands/functioncmds.c:1724
+#: commands/functioncmds.c:1744
 #, c-format
 msgid "transform function must not be a window function"
 msgstr "la fonction de transformation ne doit pas être une fonction window"
 
-#: commands/functioncmds.c:1728
+#: commands/functioncmds.c:1748
 #, c-format
 msgid "transform function must not return a set"
 msgstr "la fonction de transformation ne doit pas renvoyer un ensemble"
 
-#: commands/functioncmds.c:1732
+#: commands/functioncmds.c:1752
 #, c-format
 msgid "transform function must take one argument"
 msgstr "la fonction de transformation doit prendre de un argument"
 
-#: commands/functioncmds.c:1736
+#: commands/functioncmds.c:1756
 #, c-format
 msgid "first argument of transform function must be type \"internal\""
 msgstr "le premier argument de la fonction de transformation doit être de type « internal »"
 
-#: commands/functioncmds.c:1773
+#: commands/functioncmds.c:1793
 #, c-format
 msgid "data type %s is a pseudo-type"
 msgstr "le type de données %s est un pseudo-type"
 
-#: commands/functioncmds.c:1779
+#: commands/functioncmds.c:1799
 #, c-format
 msgid "data type %s is a domain"
 msgstr "le type de données %s est un domaine"
 
-#: commands/functioncmds.c:1819
+#: commands/functioncmds.c:1839
 #, c-format
 msgid "return data type of FROM SQL function must be \"internal\""
 msgstr "le type de donnée en retour de la fonction FROM SQL doit être « internal »"
 
-#: commands/functioncmds.c:1844
+#: commands/functioncmds.c:1864
 #, c-format
 msgid "return data type of TO SQL function must be the transform data type"
 msgstr "le type de donnée en retour de la fonction TO SQL doit être du type de données de la transformation"
 
-#: commands/functioncmds.c:1871
+#: commands/functioncmds.c:1891
 #, c-format
 msgid "transform for type %s language \"%s\" already exists"
 msgstr "la transformation pour le type %s et le langage « %s » existe déjà"
 
-#: commands/functioncmds.c:1962
+#: commands/functioncmds.c:1982
 #, c-format
 msgid "transform for type %s language \"%s\" does not exist"
 msgstr "la transformation pour le type %s et le langage « %s » n'existe pas"
 
-#: commands/functioncmds.c:2013
+#: commands/functioncmds.c:2033
 #, 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:2066
+#: commands/functioncmds.c:2086
 #, c-format
 msgid "no inline code specified"
 msgstr "aucun code en ligne spécifié"
 
-#: commands/functioncmds.c:2111
+#: commands/functioncmds.c:2131
 #, 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:159 commands/indexcmds.c:487 commands/opclasscmds.c:360 commands/opclasscmds.c:786 commands/opclasscmds.c:1749
+#: commands/indexcmds.c:159 commands/indexcmds.c:488 commands/opclasscmds.c:360 commands/opclasscmds.c:786 commands/opclasscmds.c:1749
 #, c-format
 msgid "access method \"%s\" does not exist"
 msgstr "la méthode d'accès « %s » n'existe pas"
@@ -6524,142 +6515,142 @@
 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:446 commands/tablecmds.c:541 commands/tablecmds.c:9567
+#: commands/indexcmds.c:447 commands/tablecmds.c:542 commands/tablecmds.c:9665
 #, c-format
 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:479
+#: commands/indexcmds.c:480
 #, c-format
 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:496
+#: commands/indexcmds.c:497
 #, c-format
 msgid "hash indexes are not WAL-logged and their use is discouraged"
 msgstr "les index hash ne sont pas journalisés, leur utilisation est donc déconseillée"
 
-#: commands/indexcmds.c:501
+#: commands/indexcmds.c:502
 #, 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:506
+#: commands/indexcmds.c:507
 #, 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:511
+#: commands/indexcmds.c:512
 #, 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:590
+#: commands/indexcmds.c:591
 #, 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:937
+#: commands/indexcmds.c:938
 #, c-format
 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:1003 parser/parse_utilcmd.c:1844
+#: commands/indexcmds.c:1004 parser/parse_utilcmd.c:1846
 #, 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:1063
+#: commands/indexcmds.c:1064
 #, c-format
 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:1086
+#: commands/indexcmds.c:1087
 #, c-format
 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:1094 commands/typecmds.c:825 parser/parse_expr.c:2559 parser/parse_type.c:550 parser/parse_utilcmd.c:2736 utils/adt/misc.c:546
+#: commands/indexcmds.c:1095 commands/typecmds.c:825 parser/parse_expr.c:2583 parser/parse_type.c:550 parser/parse_utilcmd.c:2738 utils/adt/misc.c:546
 #, 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:1132
+#: commands/indexcmds.c:1133
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "l'opérateur %s n'est pas commutatif"
 
-#: commands/indexcmds.c:1134
+#: commands/indexcmds.c:1135
 #, c-format
 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:1160
+#: commands/indexcmds.c:1161
 #, 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:1163
+#: commands/indexcmds.c:1164
 #, c-format
 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:1198
+#: commands/indexcmds.c:1199
 #, 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:1203
+#: commands/indexcmds.c:1204
 #, 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:1259 commands/typecmds.c:1932
+#: commands/indexcmds.c:1260 commands/typecmds.c:1932
 #, 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:1261
+#: commands/indexcmds.c:1262
 #, c-format
 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:1290 commands/indexcmds.c:1298 commands/opclasscmds.c:204
+#: commands/indexcmds.c:1291 commands/indexcmds.c:1299 commands/opclasscmds.c:204
 #, 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:1311 commands/typecmds.c:1920
+#: commands/indexcmds.c:1312 commands/typecmds.c:1920
 #, 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:1401
+#: commands/indexcmds.c:1402
 #, 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:1792
+#: commands/indexcmds.c:1793
 #, c-format
 msgid "table \"%s\" has no indexes"
 msgstr "la table « %s » n'a pas d'index"
 
-#: commands/indexcmds.c:1847
+#: commands/indexcmds.c:1848
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "peut seulement réindexer la base de données en cours"
 
-#: commands/indexcmds.c:1949
+#: commands/indexcmds.c:1950
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "la table « %s.%s » a été réindexée"
@@ -6903,7 +6894,7 @@
 "la fonction d'estimation de la jointure, de nom %s, doit renvoyer le type\n"
 "« float8 »"
 
-#: commands/policy.c:87 commands/policy.c:390 commands/policy.c:479 commands/tablecmds.c:966 commands/tablecmds.c:1308 commands/tablecmds.c:2176 commands/tablecmds.c:4320 commands/tablecmds.c:6249 commands/tablecmds.c:11886 commands/tablecmds.c:11921 commands/trigger.c:240 commands/trigger.c:1126 commands/trigger.c:1234 rewrite/rewriteDefine.c:273 rewrite/rewriteDefine.c:905
+#: commands/policy.c:87 commands/policy.c:390 commands/policy.c:479 commands/tablecmds.c:967 commands/tablecmds.c:1309 commands/tablecmds.c:2177 commands/tablecmds.c:4321 commands/tablecmds.c:6250 commands/tablecmds.c:12044 commands/tablecmds.c:12079 commands/trigger.c:240 commands/trigger.c:1126 commands/trigger.c:1234 rewrite/rewriteDefine.c:273 rewrite/rewriteDefine.c:917
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "droit refusé : « %s » est un catalogue système"
@@ -6953,7 +6944,7 @@
 msgid "invalid cursor name: must not be empty"
 msgstr "nom de curseur invalide : il ne doit pas être vide"
 
-#: commands/portalcmds.c:168 commands/portalcmds.c:222 executor/execCurrent.c:67 utils/adt/xml.c:2391 utils/adt/xml.c:2558
+#: commands/portalcmds.c:168 commands/portalcmds.c:222 executor/execCurrent.c:67 utils/adt/xml.c:2401 utils/adt/xml.c:2571
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "le curseur « %s » n'existe pas"
@@ -6968,7 +6959,7 @@
 msgid "invalid statement name: must not be empty"
 msgstr "nom de l'instruction invalide : ne doit pas être vide"
 
-#: commands/prepare.c:129 parser/parse_param.c:304 tcop/postgres.c:1355
+#: commands/prepare.c:129 parser/parse_param.c:304 tcop/postgres.c:1347
 #, 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"
@@ -7171,275 +7162,275 @@
 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:213
+#: commands/tablecmds.c:214
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "la table « %s » n'existe pas"
 
-#: commands/tablecmds.c:214
+#: commands/tablecmds.c:215
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "la table « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:216
+#: commands/tablecmds.c:217
 msgid "Use DROP TABLE to remove a table."
 msgstr "Utilisez DROP TABLE pour supprimer une table."
 
-#: commands/tablecmds.c:219
+#: commands/tablecmds.c:220
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "la séquence « %s » n'existe pas"
 
-#: commands/tablecmds.c:220
+#: commands/tablecmds.c:221
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "la séquence « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:222
+#: commands/tablecmds.c:223
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Utilisez DROP SEQUENCE pour supprimer une séquence."
 
-#: commands/tablecmds.c:225
+#: commands/tablecmds.c:226
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "la vue « %s » n'existe pas"
 
-#: commands/tablecmds.c:226
+#: commands/tablecmds.c:227
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "la vue « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:228
+#: commands/tablecmds.c:229
 msgid "Use DROP VIEW to remove a view."
 msgstr "Utilisez DROP VIEW pour supprimer une vue."
 
-#: commands/tablecmds.c:231
+#: commands/tablecmds.c:232
 #, c-format
 msgid "materialized view \"%s\" does not exist"
 msgstr "la vue matérialisée « %s » n'existe pas"
 
-#: commands/tablecmds.c:232
+#: commands/tablecmds.c:233
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
 msgstr "la vue matérialisée « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:234
+#: commands/tablecmds.c:235
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "Utilisez DROP MATERIALIZED VIEW pour supprimer une vue matérialisée."
 
-#: commands/tablecmds.c:237 parser/parse_utilcmd.c:1593
+#: commands/tablecmds.c:238 parser/parse_utilcmd.c:1595
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "l'index « %s » n'existe pas"
 
-#: commands/tablecmds.c:238
+#: commands/tablecmds.c:239
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "l'index « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:240
+#: commands/tablecmds.c:241
 msgid "Use DROP INDEX to remove an index."
 msgstr "Utilisez DROP INDEX pour supprimer un index."
 
-#: commands/tablecmds.c:245
+#: commands/tablecmds.c:246
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "« %s » n'est pas un type"
 
-#: commands/tablecmds.c:246
+#: commands/tablecmds.c:247
 msgid "Use DROP TYPE to remove a type."
 msgstr "Utilisez DROP TYPE pour supprimer un type."
 
-#: commands/tablecmds.c:249 commands/tablecmds.c:8456 commands/tablecmds.c:11153
+#: commands/tablecmds.c:250 commands/tablecmds.c:8554 commands/tablecmds.c:11305
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "la table distante « %s » n'existe pas"
 
-#: commands/tablecmds.c:250
+#: commands/tablecmds.c:251
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "la table distante « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:252
+#: commands/tablecmds.c:253
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "Utilisez DROP FOREIGN TABLE pour supprimer une table distante."
 
-#: commands/tablecmds.c:489
+#: commands/tablecmds.c:490
 #, c-format
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT peut seulement être utilisé sur des tables temporaires"
 
-#: commands/tablecmds.c:509
+#: commands/tablecmds.c:510
 #, c-format
 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:817
+#: commands/tablecmds.c:818
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support dropping multiple objects"
 msgstr "DROP INDEX CONCURRENTLY ne permet pas de supprimer plusieurs objets"
 
-#: commands/tablecmds.c:821
+#: commands/tablecmds.c:822
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY ne permet pas la CASCADE"
 
-#: commands/tablecmds.c:1080
+#: commands/tablecmds.c:1081
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "TRUNCATE cascade sur la table « %s »"
 
-#: commands/tablecmds.c:1318
+#: commands/tablecmds.c:1319
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "ne peut pas tronquer les tables temporaires des autres sessions"
 
-#: commands/tablecmds.c:1524 parser/parse_utilcmd.c:1807
+#: commands/tablecmds.c:1525 parser/parse_utilcmd.c:1809
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr "la relation héritée « %s » n'est ni une table ni une table distante"
 
-#: commands/tablecmds.c:1531 commands/tablecmds.c:10023
+#: commands/tablecmds.c:1532 commands/tablecmds.c:10121
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "ine peut pas hériter à partir d'une relation temporaire « %s »"
 
-#: commands/tablecmds.c:1539 commands/tablecmds.c:10031
+#: commands/tablecmds.c:1540 commands/tablecmds.c:10129
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "ne peut pas hériter de la table temporaire d'une autre session"
 
-#: commands/tablecmds.c:1555 commands/tablecmds.c:10065
+#: commands/tablecmds.c:1556 commands/tablecmds.c:10163
 #, 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:1603
+#: commands/tablecmds.c:1604
 #, 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:1611
+#: commands/tablecmds.c:1612
 #, 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:1613 commands/tablecmds.c:1634 commands/tablecmds.c:1832 commands/tablecmds.c:1854 parser/parse_coerce.c:1630 parser/parse_coerce.c:1650 parser/parse_coerce.c:1670 parser/parse_coerce.c:1715 parser/parse_coerce.c:1752 parser/parse_param.c:218
+#: commands/tablecmds.c:1614 commands/tablecmds.c:1635 commands/tablecmds.c:1833 commands/tablecmds.c:1855 parser/parse_coerce.c:1630 parser/parse_coerce.c:1650 parser/parse_coerce.c:1670 parser/parse_coerce.c:1715 parser/parse_coerce.c:1752 parser/parse_param.c:218
 #, c-format
 msgid "%s versus %s"
 msgstr "%s versus %s"
 
-#: commands/tablecmds.c:1620
+#: commands/tablecmds.c:1621
 #, 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:1622 commands/tablecmds.c:1842 commands/tablecmds.c:4757
+#: commands/tablecmds.c:1623 commands/tablecmds.c:1843 commands/tablecmds.c:4758
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "« %s » versus « %s »"
 
-#: commands/tablecmds.c:1632
+#: commands/tablecmds.c:1633
 #, 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:1745 parser/parse_utilcmd.c:894 parser/parse_utilcmd.c:1238 parser/parse_utilcmd.c:1314
+#: commands/tablecmds.c:1746 commands/tablecmds.c:8059 parser/parse_utilcmd.c:894 parser/parse_utilcmd.c:1240 parser/parse_utilcmd.c:1316
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "ne peut pas convertir une référence de ligne complète de table"
 
-#: commands/tablecmds.c:1746 parser/parse_utilcmd.c:895
+#: commands/tablecmds.c:1747 parser/parse_utilcmd.c:895
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "La constrainte « %s » contient une référence de ligne complète vers la table « %s »."
 
-#: commands/tablecmds.c:1818
+#: commands/tablecmds.c:1819
 #, 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:1822
+#: commands/tablecmds.c:1823
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
 msgstr "déplacement et assemblage de la colonne « %s » avec une définition héritée"
 
-#: commands/tablecmds.c:1823
+#: commands/tablecmds.c:1824
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
 msgstr "Colonne utilisateur déplacée à la position de la colonne héritée."
 
-#: commands/tablecmds.c:1830
+#: commands/tablecmds.c:1831
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "la colonne « %s » a un conflit de type"
 
-#: commands/tablecmds.c:1840
+#: commands/tablecmds.c:1841
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "la colonne « %s » a un conflit sur le collationnement"
 
-#: commands/tablecmds.c:1852
+#: commands/tablecmds.c:1853
 #, 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:1904
+#: commands/tablecmds.c:1905
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "la colonne « %s » hérite de valeurs par défaut conflictuelles"
 
-#: commands/tablecmds.c:1906
+#: commands/tablecmds.c:1907
 #, c-format
 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:1953
+#: commands/tablecmds.c:1954
 #, 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:2147
+#: commands/tablecmds.c:2148
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "ne peut pas renommer une colonne d'une table typée"
 
-#: commands/tablecmds.c:2164
+#: commands/tablecmds.c:2165
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, composite type, index, or foreign table"
 msgstr "« %s » n'est ni une table, ni une vue, ni une vue matérialisée, ni un type composite, ni un index, ni une table distante"
 
-#: commands/tablecmds.c:2258
+#: commands/tablecmds.c:2259
 #, 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:2290
+#: commands/tablecmds.c:2291
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "ne peut pas renommer la colonne système « %s »"
 
-#: commands/tablecmds.c:2305
+#: commands/tablecmds.c:2306
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "ne peut pas renommer la colonne héritée « %s »"
 
-#: commands/tablecmds.c:2460
+#: commands/tablecmds.c:2461
 #, c-format
 msgid "inherited constraint \"%s\" must be renamed in child tables too"
 msgstr "la contrainte héritée « %s » doit aussi être renommée pour les tables enfants"
 
-#: commands/tablecmds.c:2467
+#: commands/tablecmds.c:2468
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
 msgstr "ne peut pas renommer la colonne héritée « %s »"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2693
+#: commands/tablecmds.c:2694
 #, c-format
 msgid "cannot %s \"%s\" because it is being used by active queries in this session"
 msgstr ""
@@ -7447,638 +7438,652 @@
 "des requêtes actives dans cette session"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2702
+#: commands/tablecmds.c:2703
 #, 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:3776
+#: commands/tablecmds.c:3777
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "ne peut pas ré-écrire la relation système « %s »"
 
-#: commands/tablecmds.c:3782
+#: commands/tablecmds.c:3783
 #, c-format
 msgid "cannot rewrite table \"%s\" used as a catalog table"
 msgstr "ne peut pas réécrire la table « %s » utilisée comme une table catalogue"
 
-#: commands/tablecmds.c:3792
+#: commands/tablecmds.c:3793
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "ne peut pas ré-écrire les tables temporaires des autres sessions"
 
-#: commands/tablecmds.c:4060
+#: commands/tablecmds.c:4061
 #, c-format
 msgid "rewriting table \"%s\""
 msgstr "ré-écriture de la table « %s »"
 
-#: commands/tablecmds.c:4064
+#: commands/tablecmds.c:4065
 #, c-format
 msgid "verifying table \"%s\""
 msgstr "vérification de la table « %s »"
 
-#: commands/tablecmds.c:4178
+#: commands/tablecmds.c:4179
 #, c-format
 msgid "column \"%s\" contains null values"
 msgstr "la colonne « %s » contient des valeurs NULL"
 
-#: commands/tablecmds.c:4193 commands/tablecmds.c:7336
+#: commands/tablecmds.c:4194 commands/tablecmds.c:7356
 #, 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:4341 commands/trigger.c:234 rewrite/rewriteDefine.c:267 rewrite/rewriteDefine.c:900
+#: commands/tablecmds.c:4342 commands/trigger.c:234 rewrite/rewriteDefine.c:267 rewrite/rewriteDefine.c:912
 #, c-format
 msgid "\"%s\" is not a table or view"
 msgstr "« %s » n'est pas une table ou une vue"
 
-#: commands/tablecmds.c:4344 commands/trigger.c:1120 commands/trigger.c:1225
+#: commands/tablecmds.c:4345 commands/trigger.c:1120 commands/trigger.c:1225
 #, c-format
 msgid "\"%s\" is not a table, view, or foreign table"
 msgstr "« %s » n'est pas une table, une vue ou une table distante"
 
-#: commands/tablecmds.c:4347
+#: commands/tablecmds.c:4348
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, or index"
 msgstr "« %s » n'est pas une table, une vue, une vue matérialisée, une séquence ou une table distante"
 
-#: commands/tablecmds.c:4353
+#: commands/tablecmds.c:4354
 #, c-format
 msgid "\"%s\" is not a table, materialized view, or index"
 msgstr "« %s » n'est pas une table, une vue matérialisée ou un index"
 
-#: commands/tablecmds.c:4356
+#: commands/tablecmds.c:4357
 #, c-format
 msgid "\"%s\" is not a table, materialized view, or foreign table"
 msgstr "« %s » n'est pas une table, une vue matérialisée ou une table distante"
 
-#: commands/tablecmds.c:4359
+#: commands/tablecmds.c:4360
 #, c-format
 msgid "\"%s\" is not a table or foreign table"
 msgstr "« %s » n'est pas une table ou une table distante"
 
-#: commands/tablecmds.c:4362
+#: commands/tablecmds.c:4363
 #, c-format
 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:4365 commands/tablecmds.c:5395
+#: commands/tablecmds.c:4366 commands/tablecmds.c:5396
 #, c-format
 msgid "\"%s\" is not a table, materialized view, index, or foreign table"
 msgstr "« %s » n'est pas une table, une vue matérialisée, un index ou une table distante"
 
-#: commands/tablecmds.c:4375
+#: commands/tablecmds.c:4376
 #, c-format
 msgid "\"%s\" is of the wrong type"
 msgstr "« %s » est du mauvais type"
 
-#: commands/tablecmds.c:4527 commands/tablecmds.c:4534
+#: commands/tablecmds.c:4528 commands/tablecmds.c:4535
 #, 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:4541
+#: commands/tablecmds.c:4542
 #, 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:4548
+#: commands/tablecmds.c:4549
 #, c-format
 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:4610
+#: commands/tablecmds.c:4611
 #, 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:4612
+#: commands/tablecmds.c:4613
 #, c-format
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
 msgstr "Utilisez ALTER ... CASCADE pour modifier aussi les tables de type."
 
-#: commands/tablecmds.c:4656
+#: commands/tablecmds.c:4657
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "le type %s n'est pas un type composite"
 
-#: commands/tablecmds.c:4682
+#: commands/tablecmds.c:4683
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "ne peut pas ajouter une colonne à une table typée"
 
-#: commands/tablecmds.c:4749 commands/tablecmds.c:10224
+#: commands/tablecmds.c:4750 commands/tablecmds.c:10322
 #, 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:4755 commands/tablecmds.c:10231
+#: commands/tablecmds.c:4756 commands/tablecmds.c:10329
 #, 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:4765
+#: commands/tablecmds.c:4766
 #, c-format
 msgid "child table \"%s\" has a conflicting \"%s\" column"
 msgstr "la table fille « %s » a une colonne conflictuelle, « %s »"
 
-#: commands/tablecmds.c:4777
+#: commands/tablecmds.c:4778
 #, 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:4998
+#: commands/tablecmds.c:4999
 #, c-format
 msgid "column must be added to child tables too"
 msgstr "la colonne doit aussi être ajoutée aux tables filles"
 
-#: commands/tablecmds.c:5068
+#: commands/tablecmds.c:5069
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "la colonne « %s » de la relation « %s » existe déjà"
 
-#: commands/tablecmds.c:5176 commands/tablecmds.c:5282 commands/tablecmds.c:5340 commands/tablecmds.c:5454 commands/tablecmds.c:5511 commands/tablecmds.c:5605 commands/tablecmds.c:7854 commands/tablecmds.c:8479
+#: commands/tablecmds.c:5177 commands/tablecmds.c:5283 commands/tablecmds.c:5341 commands/tablecmds.c:5455 commands/tablecmds.c:5512 commands/tablecmds.c:5606 commands/tablecmds.c:7895 commands/tablecmds.c:8577
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "n'a pas pu modifier la colonne système « %s »"
 
-#: commands/tablecmds.c:5212
+#: commands/tablecmds.c:5213
 #, c-format
 msgid "column \"%s\" is in a primary key"
 msgstr "la colonne « %s » est dans une clé primaire"
 
-#: commands/tablecmds.c:5427
+#: commands/tablecmds.c:5428
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "la cible statistique %d est trop basse"
 
-#: commands/tablecmds.c:5435
+#: commands/tablecmds.c:5436
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "abaissement de la cible statistique à %d"
 
-#: commands/tablecmds.c:5585
+#: commands/tablecmds.c:5586
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "type « %s » de stockage invalide"
 
-#: commands/tablecmds.c:5617
+#: commands/tablecmds.c:5618
 #, 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 PLAIN"
+msgstr "le type de données %s de la colonne peut seulement avoir un stockage PLAIN"
 
-#: commands/tablecmds.c:5655
+#: commands/tablecmds.c:5656
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "ne peut pas supprimer une colonne à une table typée"
 
-#: commands/tablecmds.c:5699
+#: commands/tablecmds.c:5700
 #, 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:5712
+#: commands/tablecmds.c:5713
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "ne peut pas supprimer la colonne système « %s »"
 
-#: commands/tablecmds.c:5719
+#: commands/tablecmds.c:5720
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "ne peut pas supprimer la colonne héritée « %s »"
 
-#: commands/tablecmds.c:5959
+#: commands/tablecmds.c:5960
 #, 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:6172
+#: commands/tablecmds.c:6173
 #, c-format
 msgid "constraint must be added to child tables too"
 msgstr "la contrainte doit aussi être ajoutée aux tables filles"
 
-#: commands/tablecmds.c:6243
+#: commands/tablecmds.c:6244
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "la relation référencée « %s » n'est pas une table"
 
-#: commands/tablecmds.c:6266
+#: commands/tablecmds.c:6267
 #, c-format
 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:6273
+#: commands/tablecmds.c:6274
 #, c-format
 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:6279
+#: commands/tablecmds.c:6280
 #, c-format
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr ""
 "les constraintes sur des tables temporaires ne peuvent référencer que des\n"
 "tables temporaires"
 
-#: commands/tablecmds.c:6283
+#: commands/tablecmds.c:6284
 #, c-format
 msgid "constraints on temporary tables must involve temporary tables of this session"
 msgstr ""
 "les contraintes sur des tables temporaires doivent référencer les tables\n"
 "temporaires de cette session"
 
-#: commands/tablecmds.c:6344
+#: commands/tablecmds.c:6345
 #, c-format
 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:6451
+#: commands/tablecmds.c:6452
 #, 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:6454
+#: commands/tablecmds.c:6455
 #, 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:6661 commands/tablecmds.c:6811 commands/tablecmds.c:7693 commands/tablecmds.c:7749
+#: commands/tablecmds.c:6662 commands/tablecmds.c:6830 commands/tablecmds.c:7734 commands/tablecmds.c:7790
 #, 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:6667
+#: commands/tablecmds.c:6668
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
 msgstr "la contrainte « %s » de la relation « %s » n'est pas une clé étrangère"
 
-#: commands/tablecmds.c:6818
+#: commands/tablecmds.c:6837
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key or check constraint"
 msgstr "la contrainte « %s » de la relation « %s » n'est pas une clé étrangère ou une contrainte de vérification"
 
-#: commands/tablecmds.c:6886
+#: commands/tablecmds.c:6906
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "la contrainte doit aussi être validées sur les tables enfants"
 
-#: commands/tablecmds.c:6955
+#: commands/tablecmds.c:6975
 #, 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:6960
+#: commands/tablecmds.c:6980
 #, 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:7025
+#: commands/tablecmds.c:7045
 #, 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:7042
+#: commands/tablecmds.c:7062
 #, 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:7107
+#: commands/tablecmds.c:7127
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr "la liste de colonnes référencées dans la clé étrangère ne doit pas contenir de duplicats"
 
-#: commands/tablecmds.c:7201
+#: commands/tablecmds.c:7221
 #, 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:7206
+#: commands/tablecmds.c:7226
 #, 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:7369
+#: commands/tablecmds.c:7389
 #, c-format
 msgid "validating foreign key constraint \"%s\""
 msgstr "validation de la contraintes de clé étrangère « %s »"
 
-#: commands/tablecmds.c:7665
+#: commands/tablecmds.c:7688
 #, 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:7699
+#: commands/tablecmds.c:7740
 #, 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:7838
+#: commands/tablecmds.c:7879
 #, c-format
 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:7861
+#: commands/tablecmds.c:7902
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "ne peut pas modifier la colonne héritée « %s »"
 
-#: commands/tablecmds.c:7910
+#: commands/tablecmds.c:7951
 #, c-format
 msgid "result of USING clause for column \"%s\" cannot be cast automatically to type %s"
 msgstr "le résultat de la clause USING pour la colonne « %s » ne peut pas être converti automatiquement vers le type %s"
 
-#: commands/tablecmds.c:7913
+#: commands/tablecmds.c:7954
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "Vous pouvez avoir besoin d'ajouter une conversion explicite."
 
-#: commands/tablecmds.c:7917
+#: commands/tablecmds.c:7958
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
 msgstr "la colonne « %s » ne peut pas être convertie vers le type %s"
 
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:7920
+#: commands/tablecmds.c:7961
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "Vous pouvez avoir besoin de spécifier \"USING %s::%s\"."
 
-#: commands/tablecmds.c:7973
+#: commands/tablecmds.c:8060
+#, c-format
+msgid "USING expression contains a whole-row table reference."
+msgstr "l'expression USING contient une référence de table de ligne complète"
+
+#: commands/tablecmds.c:8071
 #, 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:8060
+#: commands/tablecmds.c:8158
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "ne peut pas modifier la colonne « %s » deux fois"
 
-#: commands/tablecmds.c:8096
+#: commands/tablecmds.c:8194
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
 msgstr ""
 "la valeur par défaut de la colonne « %s » ne peut pas être convertie vers le\n"
 "type %s automatiquement"
 
-#: commands/tablecmds.c:8222
+#: commands/tablecmds.c:8320
 #, c-format
 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:8223 commands/tablecmds.c:8242 commands/tablecmds.c:8260
+#: commands/tablecmds.c:8321 commands/tablecmds.c:8340 commands/tablecmds.c:8358
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s dépend de la colonne « %s »"
 
-#: commands/tablecmds.c:8241
+#: commands/tablecmds.c:8339
 #, c-format
 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:8259
+#: commands/tablecmds.c:8357
 #, c-format
 msgid "cannot alter type of a column used in a policy definition"
 msgstr "ne peut pas modifier le type d'une colonne utilisée dans la définition d'une politique"
 
-#: commands/tablecmds.c:8924
+#: commands/tablecmds.c:9022
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "ne peut pas modifier le propriétaire de l'index « %s »"
 
-#: commands/tablecmds.c:8926
+#: commands/tablecmds.c:9024
 #, c-format
 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:8942
+#: commands/tablecmds.c:9040
 #, 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:8944 commands/tablecmds.c:11355
+#: commands/tablecmds.c:9042 commands/tablecmds.c:11513
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "La séquence « %s » est liée à la table « %s »."
 
-#: commands/tablecmds.c:8956 commands/tablecmds.c:11996
+#: commands/tablecmds.c:9054 commands/tablecmds.c:12154
 #, c-format
 msgid "Use ALTER TYPE instead."
 msgstr "Utilisez ALTER TYPE à la place."
 
-#: commands/tablecmds.c:8965
+#: commands/tablecmds.c:9063
 #, c-format
 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:9308
+#: commands/tablecmds.c:9406
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "ne peut pas avoir de nombreuses sous-commandes SET TABLESPACE"
 
-#: commands/tablecmds.c:9381
+#: commands/tablecmds.c:9479
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, index, or TOAST table"
 msgstr "« %s » n'est pas une table, une vue, une vue matérialisée, un index ou une table TOAST"
 
-#: commands/tablecmds.c:9414 commands/view.c:481
+#: commands/tablecmds.c:9512 commands/view.c:498
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr "WITH CHECK OPTION est uniquement accepté pour les vues dont la mise à jour est automatique"
 
-#: commands/tablecmds.c:9560
+#: commands/tablecmds.c:9658
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "ne peut pas déplacer la colonne système « %s »"
 
-#: commands/tablecmds.c:9576
+#: commands/tablecmds.c:9674
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "ne peut pas déplacer les tables temporaires d'autres sessions"
 
-#: commands/tablecmds.c:9713
+#: commands/tablecmds.c:9811
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr "seuls les tables, index et vues matérialisées existent dans les tablespaces"
 
-#: commands/tablecmds.c:9725
+#: commands/tablecmds.c:9823
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
 msgstr "ne peut pas déplacer les relations dans ou à partir du tablespace pg_global"
 
-#: commands/tablecmds.c:9816
+#: commands/tablecmds.c:9914
 #, c-format
 msgid "aborting because lock on relation \"%s.%s\" is not available"
 msgstr "annulation car le verrou sur la relation « %s.%s » n'est pas disponible"
 
-#: commands/tablecmds.c:9832
+#: commands/tablecmds.c:9930
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "aucune relation correspondante trouvée dans le tablespace « %s »"
 
-#: commands/tablecmds.c:9906 storage/buffer/bufmgr.c:801
+#: commands/tablecmds.c:10004 storage/buffer/bufmgr.c:801
 #, c-format
 msgid "invalid page in block %u of relation %s"
 msgstr "page invalide dans le bloc %u de la relation %s"
 
-#: commands/tablecmds.c:9988
+#: commands/tablecmds.c:10086
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "ne peut pas modifier l'héritage d'une table typée"
 
-#: commands/tablecmds.c:10038
+#: commands/tablecmds.c:10136
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "ne peut pas hériter à partir d'une relation temporaire d'une autre session"
 
-#: commands/tablecmds.c:10092
+#: commands/tablecmds.c:10190
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "héritage circulaire interdit"
 
-#: commands/tablecmds.c:10093
+#: commands/tablecmds.c:10191
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "« %s » est déjà un enfant de « %s »."
 
-#: commands/tablecmds.c:10101
+#: commands/tablecmds.c:10199
 #, 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:10242
+#: commands/tablecmds.c:10340
 #, 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:10258
+#: commands/tablecmds.c:10356 commands/tablecmds.c:10389
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "la colonne « %s » manque à la table enfant"
 
-#: commands/tablecmds.c:10341
+#: commands/tablecmds.c:10472
 #, 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:10349
+#: commands/tablecmds.c:10480
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on child table \"%s\""
 msgstr "la contrainte « %s » entre en conflit avec une contrainte non héritée sur la table fille « %s »"
 
-#: commands/tablecmds.c:10373
+#: commands/tablecmds.c:10491
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
+msgstr "la contrainte « %s » entre en conflit avec une contrainte NOT VALID sur la table fille « %s »"
+
+#: commands/tablecmds.c:10515
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "la contrainte « %s » manque à la table enfant"
 
-#: commands/tablecmds.c:10457
+#: commands/tablecmds.c:10599
 #, 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:10691
+#: commands/tablecmds.c:10833
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "les tables avec type ne peuvent pas hériter d'autres tables"
 
-#: commands/tablecmds.c:10722
+#: commands/tablecmds.c:10864
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "la colonne « %s » manque à la table"
 
-#: commands/tablecmds.c:10732
+#: commands/tablecmds.c:10874
 #, 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:10741
+#: commands/tablecmds.c:10883
 #, 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:10754
+#: commands/tablecmds.c:10896
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "la table a une colonne supplémentaire « %s »"
 
-#: commands/tablecmds.c:10806
+#: commands/tablecmds.c:10948
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "« %s » n'est pas une table typée"
 
-#: commands/tablecmds.c:10989
+#: commands/tablecmds.c:11131
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
 msgstr "ne peut pas utiliser l'index non unique « %s » comme identité de réplicat"
 
-#: commands/tablecmds.c:10995
+#: commands/tablecmds.c:11137
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
 msgstr "ne peut pas utiliser l'index « %s » immédiat comme identité de réplicat"
 
-#: commands/tablecmds.c:11001
+#: commands/tablecmds.c:11143
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr "ne peut pas utiliser un index par expression « %s » comme identité de réplicat"
 
-#: commands/tablecmds.c:11007
+#: commands/tablecmds.c:11149
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "ne peut pas utiliser l'index partiel « %s » comme identité de réplicat"
 
-#: commands/tablecmds.c:11013
+#: commands/tablecmds.c:11155
 #, c-format
 msgid "cannot use invalid index \"%s\" as replica identity"
 msgstr "ne peut pas utiliser l'index invalide « %s » comme identité de réplicat"
 
-#: commands/tablecmds.c:11031
+#: commands/tablecmds.c:11176
+#, c-format
+msgid "index \"%s\" cannot be used as replica identity because column %d is a system column"
+msgstr "l'index « %s » ne peut pas être utilisé comme identité de réplicat car la colonne %d est une colonne système"
+
+#: commands/tablecmds.c:11183
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
 msgstr "l'index « %s » ne peut pas être utilisé comme identité de réplicat car la colonne « %s » peut être NULL"
 
-#: commands/tablecmds.c:11228
+#: commands/tablecmds.c:11386
 #, c-format
 msgid "cannot change logged status of table \"%s\" because it is temporary"
 msgstr "ne peut pas modifier le statut de journalisation de la table « %s » parce qu'elle est temporaire"
 
-#: commands/tablecmds.c:11287
+#: commands/tablecmds.c:11445
 #, c-format
 msgid "could not change table \"%s\" to logged because it references unlogged table \"%s\""
 msgstr "n'a pas pu passer la table « %s » en journalisé car elle référence la table non journalisée « %s »"
 
-#: commands/tablecmds.c:11297
+#: commands/tablecmds.c:11455
 #, c-format
 msgid "could not change table \"%s\" to unlogged because it references logged table \"%s\""
 msgstr "n'a pas pu passer la table « %s » en non journalisé car elle référence la table journalisée « %s »"
 
-#: commands/tablecmds.c:11354
+#: commands/tablecmds.c:11512
 #, c-format
 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:11455
+#: commands/tablecmds.c:11613
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "la relation « %s » existe déjà dans le schéma « %s »"
 
-#: commands/tablecmds.c:11980
+#: commands/tablecmds.c:12138
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "« %s » n'est pas un type composite"
 
-#: commands/tablecmds.c:12010
+#: commands/tablecmds.c:12168
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, sequence, or foreign table"
 msgstr "« %s » n'est pas une table, une vue, une vue matérialisée, une séquence ou une table distante"
 
-#: commands/tablespace.c:162 commands/tablespace.c:179 commands/tablespace.c:190 commands/tablespace.c:198 commands/tablespace.c:625 replication/slot.c:914 storage/file/copydir.c:47
+#: commands/tablespace.c:162 commands/tablespace.c:179 commands/tablespace.c:190 commands/tablespace.c:198 commands/tablespace.c:625 replication/slot.c:941 storage/file/copydir.c:47
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "n'a pas pu créer le répertoire « %s » : %m"
@@ -8123,22 +8128,22 @@
 msgid "tablespace location should not be inside the data directory"
 msgstr "l'emplacement du tablespace ne doit pas être dans le répertoire de données"
 
-#: commands/tablespace.c:304 commands/tablespace.c:938
+#: commands/tablespace.c:304 commands/tablespace.c:952
 #, c-format
 msgid "unacceptable tablespace name \"%s\""
 msgstr "nom inacceptable pour le tablespace « %s »"
 
-#: commands/tablespace.c:306 commands/tablespace.c:939
+#: commands/tablespace.c:306 commands/tablespace.c:953
 #, c-format
 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:316 commands/tablespace.c:951
+#: commands/tablespace.c:316 commands/tablespace.c:965
 #, c-format
 msgid "tablespace \"%s\" already exists"
 msgstr "le tablespace « %s » existe déjà"
 
-#: commands/tablespace.c:430 commands/tablespace.c:921 commands/tablespace.c:1002 commands/tablespace.c:1071 commands/tablespace.c:1204 commands/tablespace.c:1404
+#: commands/tablespace.c:430 commands/tablespace.c:935 commands/tablespace.c:1016 commands/tablespace.c:1085 commands/tablespace.c:1218 commands/tablespace.c:1418
 #, c-format
 msgid "tablespace \"%s\" does not exist"
 msgstr "le tablespace « %s » n'existe pas"
@@ -8171,34 +8176,34 @@
 #: commands/tablespace.c:620
 #, c-format
 msgid "directory \"%s\" already in use as a tablespace"
-msgstr "répertoire « %s » déjà en cours d'utilisation"
+msgstr "répertoire « %s » déjà utilisé comme tablespace"
 
-#: commands/tablespace.c:744 commands/tablespace.c:757 commands/tablespace.c:781 commands/tablespace.c:872
+#: commands/tablespace.c:744 commands/tablespace.c:757 commands/tablespace.c:793 commands/tablespace.c:885
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "n'a pas pu supprimer le répertoire « %s » : %m"
 
-#: commands/tablespace.c:793 commands/tablespace.c:881
+#: commands/tablespace.c:806 commands/tablespace.c:894
 #, c-format
 msgid "could not remove symbolic link \"%s\": %m"
 msgstr "n'a pas pu supprimer le lien symbolique « %s » : %m"
 
-#: commands/tablespace.c:803 commands/tablespace.c:889
+#: commands/tablespace.c:816 commands/tablespace.c:903
 #, c-format
 msgid "\"%s\" is not a directory or symbolic link"
 msgstr "« %s » n'est pas un répertoire ou un lien symbolique"
 
-#: commands/tablespace.c:1076
+#: commands/tablespace.c:1090
 #, c-format
 msgid "Tablespace \"%s\" does not exist."
 msgstr "Le tablespace « %s » n'existe pas."
 
-#: commands/tablespace.c:1503
+#: commands/tablespace.c:1517
 #, c-format
 msgid "directories for tablespace %u could not be removed"
 msgstr "les répertoires du tablespace %u n'ont pas pu être supprimés"
 
-#: commands/tablespace.c:1505
+#: commands/tablespace.c:1519
 #, c-format
 msgid "You can remove the directories manually if necessary."
 msgstr "Vous pouvez supprimer les répertoires manuellement si nécessaire."
@@ -8349,17 +8354,17 @@
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "le trigger BEFORE STATEMENT ne peut pas renvoyer une valeur"
 
-#: commands/trigger.c:2727 executor/nodeModifyTable.c:648 executor/nodeModifyTable.c:942
+#: commands/trigger.c:2727 executor/nodeModifyTable.c:663 executor/nodeModifyTable.c:957
 #, c-format
 msgid "tuple to be updated was already modified by an operation triggered by the current command"
 msgstr "la ligne à mettre à jour était déjà modifiée par une opération déclenchée par la commande courante"
 
-#: commands/trigger.c:2728 executor/nodeModifyTable.c:649 executor/nodeModifyTable.c:943
+#: commands/trigger.c:2728 executor/nodeModifyTable.c:664 executor/nodeModifyTable.c:958
 #, c-format
 msgid "Consider using an AFTER trigger instead of a BEFORE trigger to propagate changes to other rows."
 msgstr "Considérez l'utilisation d'un trigger AFTER au lieu d'un trigger BEFORE pour propager les changements sur les autres lignes."
 
-#: commands/trigger.c:2742 executor/execMain.c:2344 executor/nodeLockRows.c:216 executor/nodeModifyTable.c:183 executor/nodeModifyTable.c:661 executor/nodeModifyTable.c:955 executor/nodeModifyTable.c:1122
+#: commands/trigger.c:2742 executor/execMain.c:2344 executor/nodeLockRows.c:216 executor/nodeModifyTable.c:196 executor/nodeModifyTable.c:676 executor/nodeModifyTable.c:970 executor/nodeModifyTable.c:1137
 #, c-format
 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"
@@ -8569,18 +8574,14 @@
 msgstr "la fonction send du type %s ne doit pas être volatile"
 
 #: commands/typecmds.c:578
-#, fuzzy, c-format
-#| msgid "cast function must not be volatile"
+#, c-format
 msgid "type modifier input function %s should not be volatile"
-msgstr "la fonction de conversion ne doit pas être volatile"
+msgstr "la fonction du modificateur de type en entrée, %s, ne doit pas être volatile"
 
 #: commands/typecmds.c:583
-#, fuzzy, c-format
-#| msgid "type modifier output function is useless without a type modifier input function"
+#, c-format
 msgid "type modifier output function %s should not be volatile"
-msgstr ""
-"la fonction en sortie du modificateur de type est inutile sans une fonction\n"
-"en entrée du modificateur de type"
+msgstr "la fonction du modificateur de type en sortie, %s, ne doit pas être volatile"
 
 #: commands/typecmds.c:805
 #, c-format
@@ -8704,10 +8705,9 @@
 "valeur doit être immutable"
 
 #: commands/typecmds.c:2040
-#, fuzzy, c-format
-#| msgid "must be superuser to connect in binary upgrade mode"
+#, c-format
 msgid "pg_type array OID value not set when in binary upgrade mode"
-msgstr "doit être super-utilisateur pour se connecter en mode de mise à jour binaire"
+msgstr "tableau d'OID de pg_type non configuré lors d'une mise à jour binaire"
 
 #: commands/typecmds.c:2344
 #, c-format
@@ -8809,10 +8809,9 @@
 msgstr "le rôle « %s » existe déjà"
 
 #: commands/user.c:402
-#, fuzzy, c-format
-#| msgid "must be superuser to connect in binary upgrade mode"
+#, c-format
 msgid "pg_authid OID value not set when in binary upgrade mode"
-msgstr "doit être super-utilisateur pour se connecter en mode de mise à jour binaire"
+msgstr "OID de pg_authid non configuré lors d'une mise à jour binaire"
 
 #: commands/user.c:664 commands/user.c:878 commands/user.c:1394 commands/user.c:1540
 #, c-format
@@ -8940,10 +8939,9 @@
 msgstr "le rôle « %s » n'est pas un membre du rôle « %s »"
 
 #: commands/vacuum.c:185
-#, fuzzy, c-format
-#| msgid "%s: cannot be executed by \"root\"\n"
+#, c-format
 msgid "%s cannot be executed from VACUUM or ANALYZE"
-msgstr "%s : ne peut pas être exécuté par « root »\n"
+msgstr "%s ne peut pas être exécuté à partir de VACUUM ou ANALYZE"
 
 #: commands/vacuum.c:527
 #, c-format
@@ -8969,138 +8967,138 @@
 "Fermez les transactions ouvertes avec multixacts rapidement pour éviter des problèmes de\n"
 "réinitialisation."
 
-#: commands/vacuum.c:1130
+#: commands/vacuum.c:1138
 #, c-format
 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:1131
+#: commands/vacuum.c:1139
 #, c-format
 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:1252
+#: commands/vacuum.c:1260
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "ignore le vacuum de « %s » --- verrou non disponible"
 
-#: commands/vacuum.c:1278
+#: commands/vacuum.c:1286
 #, 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:1282
+#: commands/vacuum.c:1290
 #, 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:1286
+#: commands/vacuum.c:1294
 #, 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:1304
+#: commands/vacuum.c:1312
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr ""
 "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:358
+#: commands/vacuumlazy.c:363
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "VACUUM automatique de la table « %s.%s.%s » : %d parcours d'index\n"
 
-#: commands/vacuumlazy.c:363
+#: commands/vacuumlazy.c:368
 #, c-format
 msgid "pages: %u removed, %u remain, %u skipped due to pins\n"
 msgstr "pages : %u supprimées, %u restants, %u ignorées à cause de verrous\n"
 
-#: commands/vacuumlazy.c:368
+#: commands/vacuumlazy.c:373
 #, c-format
 msgid "tuples: %.0f removed, %.0f remain, %.0f are dead but not yet removable\n"
 msgstr "lignes : %.0f supprimées, %.0f restantes, %.0f sont mortes mais pas encore supprimables\n"
 
-#: commands/vacuumlazy.c:373
+#: commands/vacuumlazy.c:378
 #, c-format
 msgid "buffer usage: %d hits, %d misses, %d dirtied\n"
 msgstr "utilisation du tampon : %d récupérées, %d ratées, %d modifiées\n"
 
-#: commands/vacuumlazy.c:377
+#: commands/vacuumlazy.c:382
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr "taux moyen de lecture : %.3f Mo/s, taux moyen d'écriture : %.3f Mo/s\n"
 
-#: commands/vacuumlazy.c:379
+#: commands/vacuumlazy.c:384
 #, c-format
 msgid "system usage: %s"
 msgstr "utilisation du système : %s"
 
-#: commands/vacuumlazy.c:701
+#: commands/vacuumlazy.c:708
 #, 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:1113
+#: commands/vacuumlazy.c:1120
 #, 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:1123
+#: commands/vacuumlazy.c:1130
 #, c-format
 msgid "%.0f dead row versions cannot be removed yet.\n"
 msgstr "%.0f versions de lignes mortes ne peuvent pas encore être supprimées.\n"
 
-#: commands/vacuumlazy.c:1125
+#: commands/vacuumlazy.c:1132
 #, c-format
 msgid "There were %.0f unused item pointers.\n"
 msgstr "Il y avait %.0f pointeurs d'éléments inutilisés.\n"
 
-#: commands/vacuumlazy.c:1127
+#: commands/vacuumlazy.c:1134
 #, c-format
 msgid "Skipped %u page due to buffer pins.\n"
 msgid_plural "Skipped %u pages due to buffer pins.\n"
 msgstr[0] "Ignore %u page à cause des verrous de blocs.\n"
 msgstr[1] "Ignore %u pages à cause des verrous de blocs.\n"
 
-#: commands/vacuumlazy.c:1131
+#: commands/vacuumlazy.c:1138
 #, c-format
 msgid "%u page is entirely empty.\n"
 msgid_plural "%u pages are entirely empty.\n"
 msgstr[0] "%u page est entièrement vide.\n"
 msgstr[1] "%u pages sont entièrement vides.\n"
 
-#: commands/vacuumlazy.c:1139
+#: commands/vacuumlazy.c:1145
 #, 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:1208
+#: commands/vacuumlazy.c:1214
 #, 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:1375
+#: commands/vacuumlazy.c:1380
 #, 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:1421
+#: commands/vacuumlazy.c:1426
 #, 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:1425
+#: commands/vacuumlazy.c:1430
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -9111,22 +9109,22 @@
 "%u pages d'index ont été supprimées, %u sont actuellement réutilisables.\n"
 "%s."
 
-#: commands/vacuumlazy.c:1482
+#: commands/vacuumlazy.c:1487
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "« %s » : mis en suspens du tronquage à cause d'un conflit dans la demande de verrou"
 
-#: commands/vacuumlazy.c:1547
+#: commands/vacuumlazy.c:1552
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
 msgstr "« %s » : %u pages tronqués en %u"
 
-#: commands/vacuumlazy.c:1603
+#: commands/vacuumlazy.c:1608
 #, c-format
 msgid "\"%s\": suspending truncate due to conflicting lock request"
 msgstr "« %s » : mis en suspens du tronquage à cause d'un conflit dans la demande de verrou"
 
-#: commands/variable.c:164 utils/misc/guc.c:9660
+#: commands/variable.c:164 utils/misc/guc.c:9691
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "Mot clé non reconnu : « %s »"
@@ -9241,54 +9239,54 @@
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "Les valeurs valides sont entre « local » et « cascaded »."
 
-#: commands/view.c:114
+#: commands/view.c:101
 #, c-format
 msgid "could not determine which collation to use for view column \"%s\""
 msgstr ""
 "n'a pas pu déterminer le collationnement à utiliser pour la colonne « %s »\n"
 "de la vue"
 
-#: commands/view.c:129
+#: commands/view.c:115
 #, c-format
 msgid "view must have at least one column"
 msgstr "la vue doit avoir au moins une colonne"
 
-#: commands/view.c:263 commands/view.c:275
+#: commands/view.c:280 commands/view.c:292
 #, c-format
 msgid "cannot drop columns from view"
 msgstr "ne peut pas supprimer les colonnes d'une vue"
 
-#: commands/view.c:280
+#: commands/view.c:297
 #, 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 »"
 
-#: commands/view.c:288
+#: commands/view.c:305
 #, 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:427
+#: commands/view.c:444
 #, c-format
 msgid "views must not contain SELECT INTO"
 msgstr "les vues ne peuvent pas contenir SELECT INTO"
 
-#: commands/view.c:440
+#: commands/view.c:457
 #, c-format
 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"
 
-#: commands/view.c:511
+#: commands/view.c:528
 #, c-format
 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:519
+#: commands/view.c:536
 #, c-format
 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"
 
-#: commands/view.c:533
+#: commands/view.c:550
 #, c-format
 msgid "view \"%s\" will be a temporary view"
 msgstr "la vue « %s » sera une vue temporaire"
@@ -9333,37 +9331,37 @@
 msgid "no value found for parameter %d"
 msgstr "aucune valeur trouvée pour le paramètre %d"
 
-#: executor/execIndexing.c:539
+#: executor/execIndexing.c:544
 #, c-format
 msgid "ON CONFLICT does not support deferrable unique constraints/exclusion constraints as arbiters"
 msgstr "ON CONFLICT ne supporte pas les contraintes uniques diferrables et les contraintes d'exclusion différables comme arbitres"
 
-#: executor/execIndexing.c:814
+#: executor/execIndexing.c:821
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "n'a pas pu créer la contrainte d'exclusion « %s »"
 
-#: executor/execIndexing.c:817
+#: executor/execIndexing.c:824
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "La clé %s est en conflit avec la clé %s."
 
-#: executor/execIndexing.c:819
+#: executor/execIndexing.c:826
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Un conflit de clés est présent."
 
-#: executor/execIndexing.c:825
+#: executor/execIndexing.c:832
 #, 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/execIndexing.c:828
+#: executor/execIndexing.c:835
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "La clé %s est en conflit avec la clé existante %s."
 
-#: executor/execIndexing.c:830
+#: executor/execIndexing.c:837
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "La clé est en conflit avec une clé existante."
@@ -9378,32 +9376,32 @@
 msgid "cannot change TOAST relation \"%s\""
 msgstr "ne peut pas modifier la relation TOAST « %s »"
 
-#: executor/execMain.c:1049 rewrite/rewriteHandler.c:2641
+#: executor/execMain.c:1049 rewrite/rewriteHandler.c:2672
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "ne peut pas insérer dans la vue « %s »"
 
-#: executor/execMain.c:1051 rewrite/rewriteHandler.c:2644
+#: executor/execMain.c:1051 rewrite/rewriteHandler.c:2675
 #, c-format
 msgid "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule."
 msgstr "Pour activer l'insertion dans la vue, fournissez un trigger INSTEAD OF INSERT ou une règle ON INSERT DO INSTEAD sans condition."
 
-#: executor/execMain.c:1057 rewrite/rewriteHandler.c:2649
+#: executor/execMain.c:1057 rewrite/rewriteHandler.c:2680
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "ne peut pas mettre à jour la vue « %s »"
 
-#: executor/execMain.c:1059 rewrite/rewriteHandler.c:2652
+#: executor/execMain.c:1059 rewrite/rewriteHandler.c:2683
 #, c-format
 msgid "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule."
 msgstr "Pour activer la mise à jour dans la vue, fournissez un trigger INSTEAD OF UPDATE ou une règle ON UPDATE DO INSTEAD sans condition."
 
-#: executor/execMain.c:1065 rewrite/rewriteHandler.c:2657
+#: executor/execMain.c:1065 rewrite/rewriteHandler.c:2688
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "ne peut pas supprimer à partir de la vue « %s »"
 
-#: executor/execMain.c:1067 rewrite/rewriteHandler.c:2660
+#: executor/execMain.c:1067 rewrite/rewriteHandler.c:2691
 #, c-format
 msgid "To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule."
 msgstr "Pour activer la suppression dans la vue, fournissez un trigger INSTEAD OF DELETE ou une règle ON DELETE DO INSTEAD sans condition."
@@ -9518,7 +9516,7 @@
 msgid "new row violates row-level security policy (USING expression) for table \"%s\""
 msgstr "la nouvelle ligne viole la politique de sécurité au niveau ligne (expression USING) pour la table « %s »"
 
-#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3191 utils/adt/array_userfuncs.c:472 utils/adt/arrayfuncs.c:263 utils/adt/arrayfuncs.c:561 utils/adt/arrayfuncs.c:1291 utils/adt/arrayfuncs.c:3335 utils/adt/arrayfuncs.c:5219 utils/adt/arrayfuncs.c:5742
+#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3209 utils/adt/array_userfuncs.c:484 utils/adt/arrayfuncs.c:263 utils/adt/arrayfuncs.c:561 utils/adt/arrayfuncs.c:1291 utils/adt/arrayfuncs.c:3335 utils/adt/arrayfuncs.c:5219 utils/adt/arrayfuncs.c:5736
 #, 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)"
@@ -9528,12 +9526,12 @@
 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:635 executor/execQual.c:4116
+#: executor/execQual.c:635 executor/execQual.c:4156
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "l'attribut %d a un type invalide"
 
-#: executor/execQual.c:636 executor/execQual.c:4117
+#: executor/execQual.c:636 executor/execQual.c:4157
 #, 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."
@@ -9632,64 +9630,64 @@
 "l'opérateur ANY/ALL (pour les types array) ne supporte pas les arguments\n"
 "d'ensemble"
 
-#: executor/execQual.c:3169
+#: executor/execQual.c:3187
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "ne peut pas fusionner les tableaux incompatibles"
 
-#: executor/execQual.c:3170
+#: executor/execQual.c:3188
 #, 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:3211 executor/execQual.c:3238
+#: executor/execQual.c:3229 executor/execQual.c:3256
 #, c-format
 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:3753
+#: executor/execQual.c:3771
 #, c-format
 msgid "NULLIF does not support set arguments"
 msgstr "NULLIF ne supporte pas les arguments d'ensemble"
 
-#: executor/execQual.c:3986 utils/adt/domains.c:136
+#: executor/execQual.c:4019 utils/adt/domains.c:137
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "le domaine %s n'autorise pas les valeurs NULL"
 
-#: executor/execQual.c:4016 utils/adt/domains.c:173
+#: executor/execQual.c:4056 utils/adt/domains.c:179
 #, 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:4371
+#: executor/execQual.c:4411
 #, c-format
 msgid "WHERE CURRENT OF is not supported for this table type"
 msgstr "WHERE CURRENT OF n'est pas supporté pour ce type de table"
 
-#: executor/execQual.c:4518 parser/parse_agg.c:596 parser/parse_agg.c:626
+#: executor/execQual.c:4558 parser/parse_agg.c:596 parser/parse_agg.c:626
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "les appels à la fonction d'agrégat ne peuvent pas être imbriqués"
 
-#: executor/execQual.c:4580 parser/parse_agg.c:742
+#: executor/execQual.c:4620 parser/parse_agg.c:742
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "les appels à la fonction window ne peuvent pas être imbriqués"
 
-#: executor/execQual.c:4792
+#: executor/execQual.c:4832
 #, c-format
 msgid "target type is not an array"
 msgstr "le type cible n'est pas un tableau"
 
-#: executor/execQual.c:4907
+#: executor/execQual.c:4949
 #, 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:5042 utils/adt/arrayfuncs.c:3777 utils/adt/arrayfuncs.c:6315 utils/adt/rowtypes.c:927
+#: executor/execQual.c:5084 utils/adt/arrayfuncs.c:3777 utils/adt/arrayfuncs.c:6303 utils/adt/rowtypes.c:927
 #, 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"
@@ -9709,78 +9707,83 @@
 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:509
+#, c-format
+msgid "cannot COPY to/from client in a SQL function"
+msgstr "ne peut pas utiliser COPY TO/FROM dans une fonction SQL"
+
 #. translator: %s is a SQL statement name
-#: executor/functions.c:506
+#: executor/functions.c:515
 #, 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:513 executor/spi.c:1368 executor/spi.c:2158
+#: executor/functions.c:522 executor/spi.c:1368 executor/spi.c:2158
 #, 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:641
+#: executor/functions.c:650
 #, 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:1405
+#: executor/functions.c:1414
 #, c-format
 msgid "SQL function \"%s\" statement %d"
 msgstr "fonction SQL « %s », instruction %d"
 
-#: executor/functions.c:1431
+#: executor/functions.c:1440
 #, c-format
 msgid "SQL function \"%s\" during startup"
 msgstr "fonction SQL « %s » lors du lancement"
 
-#: executor/functions.c:1590 executor/functions.c:1627 executor/functions.c:1639 executor/functions.c:1752 executor/functions.c:1785 executor/functions.c:1815
+#: executor/functions.c:1599 executor/functions.c:1636 executor/functions.c:1648 executor/functions.c:1761 executor/functions.c:1794 executor/functions.c:1824
 #, 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:1592
+#: executor/functions.c:1601
 #, c-format
 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:1629
+#: executor/functions.c:1638
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "L'instruction finale doit renvoyer exactement une colonne."
 
-#: executor/functions.c:1641
+#: executor/functions.c:1650
 #, c-format
 msgid "Actual return type is %s."
 msgstr "Le code de retour réel est %s."
 
-#: executor/functions.c:1754
+#: executor/functions.c:1763
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "L'instruction finale renvoie beaucoup trop de colonnes."
 
-#: executor/functions.c:1787
+#: executor/functions.c:1796
 #, 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:1817
+#: executor/functions.c:1826
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "L'instruction finale renvoie trop peu de colonnes."
 
-#: executor/functions.c:1866
+#: executor/functions.c:1875
 #, 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:2450 executor/nodeWindowAgg.c:2286
+#: executor/nodeAgg.c:2471 executor/nodeWindowAgg.c:2319
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr ""
@@ -9802,7 +9805,7 @@
 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:928 executor/nodeHashjoin.c:938
+#: executor/nodeHashjoin.c:935 executor/nodeHashjoin.c:945
 #, 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"
@@ -9849,12 +9852,12 @@
 msgid "Query has too few columns."
 msgstr "La requête n'a pas assez de colonnes."
 
-#: executor/nodeModifyTable.c:1103
+#: executor/nodeModifyTable.c:1118
 #, c-format
 msgid "ON CONFLICT DO UPDATE command cannot affect row a second time"
 msgstr "la commande ON CONFLICT DO UPDATE ne peut pas affecter une ligne la deuxième fois"
 
-#: executor/nodeModifyTable.c:1104
+#: executor/nodeModifyTable.c:1119
 #, c-format
 msgid "Ensure that no rows proposed for insertion within the same command have duplicate constrained values."
 msgstr "S'assure qu'aucune ligne proposée à l'insertion dans la même commande n'a de valeurs contraintes dupliquées."
@@ -9879,22 +9882,22 @@
 msgid "moving-aggregate transition function must not return null"
 msgstr "la fonction de conversion de l'agrégat en déplacement ne doit pas renvoyer null"
 
-#: executor/nodeWindowAgg.c:1609
+#: executor/nodeWindowAgg.c:1642
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "l'offset de début de frame ne doit pas être NULL"
 
-#: executor/nodeWindowAgg.c:1622
+#: executor/nodeWindowAgg.c:1655
 #, c-format
 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:1635
+#: executor/nodeWindowAgg.c:1668
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "l'offset de fin de frame ne doit pas être NULL"
 
-#: executor/nodeWindowAgg.c:1648
+#: executor/nodeWindowAgg.c:1681
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "l'offset de fin de frame ne doit pas être négatif"
@@ -9930,12 +9933,12 @@
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE n'est pas supporté"
 
-#: executor/spi.c:1343 parser/analyze.c:2292
+#: executor/spi.c:1343 parser/analyze.c:2289
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Les curseurs déplaçables doivent être en lecture seule (READ ONLY)."
 
-#: executor/spi.c:2450
+#: executor/spi.c:2462
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "instruction SQL « %s »"
@@ -9980,258 +9983,258 @@
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "STDIN/STDOUT non autorisé dans PROGRAM"
 
-#: gram.y:2879 gram.y:2886 gram.y:10153 gram.y:10161
+#: gram.y:2879 gram.y:2886 gram.y:10154 gram.y:10162
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "GLOBAL est obsolète dans la création de la table temporaire"
 
-#: gram.y:3325 utils/adt/ri_triggers.c:316 utils/adt/ri_triggers.c:373 utils/adt/ri_triggers.c:792 utils/adt/ri_triggers.c:1015 utils/adt/ri_triggers.c:1171 utils/adt/ri_triggers.c:1352 utils/adt/ri_triggers.c:1517 utils/adt/ri_triggers.c:1693 utils/adt/ri_triggers.c:1873 utils/adt/ri_triggers.c:2064 utils/adt/ri_triggers.c:2122 utils/adt/ri_triggers.c:2227 utils/adt/ri_triggers.c:2404
+#: gram.y:3325 utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:371 utils/adt/ri_triggers.c:790 utils/adt/ri_triggers.c:1013 utils/adt/ri_triggers.c:1169 utils/adt/ri_triggers.c:1350 utils/adt/ri_triggers.c:1515 utils/adt/ri_triggers.c:1691 utils/adt/ri_triggers.c:1871 utils/adt/ri_triggers.c:2062 utils/adt/ri_triggers.c:2120 utils/adt/ri_triggers.c:2225 utils/adt/ri_triggers.c:2402
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL non implémenté"
 
-#: gram.y:4759
+#: gram.y:4760
 msgid "duplicate trigger events specified"
 msgstr "événements de trigger dupliqués spécifiés"
 
-#: gram.y:4852 parser/parse_utilcmd.c:2657 parser/parse_utilcmd.c:2683
+#: gram.y:4853 parser/parse_utilcmd.c:2659 parser/parse_utilcmd.c:2685
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "la contrainte déclarée INITIALLY DEFERRED doit être DEFERRABLE"
 
-#: gram.y:4859
+#: gram.y:4860
 #, c-format
 msgid "conflicting constraint properties"
 msgstr "propriétés de contrainte en conflit"
 
-#: gram.y:4991
+#: gram.y:4992
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION n'est pas encore implémenté"
 
-#: gram.y:5007
+#: gram.y:5008
 #, c-format
 msgid "DROP ASSERTION is not yet implemented"
 msgstr "DROP ASSERTION n'est pas encore implémenté"
 
-#: gram.y:5353
+#: gram.y:5354
 #, c-format
 msgid "RECHECK is no longer required"
 msgstr "RECHECK n'est plus nécessaire"
 
-#: gram.y:5354
+#: gram.y:5355
 #, c-format
 msgid "Update your data type."
 msgstr "Mettez à jour votre type de données."
 
-#: gram.y:6931
+#: gram.y:6932
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "les agrégats ne peuvent pas avoir d'arguments en sortie"
 
-#: gram.y:7246 utils/adt/regproc.c:774 utils/adt/regproc.c:815
+#: gram.y:7247 utils/adt/regproc.c:775 utils/adt/regproc.c:816
 #, c-format
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: gram.y:7247 utils/adt/regproc.c:775 utils/adt/regproc.c:816
+#: gram.y:7248 utils/adt/regproc.c:776 utils/adt/regproc.c:817
 #, c-format
 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:8721 gram.y:8739
+#: gram.y:8722 gram.y:8740
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION non supporté sur les vues récursives"
 
-#: gram.y:9745 parser/parse_expr.c:1468
+#: gram.y:9746 parser/parse_expr.c:1476
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr "le nombre de colonnes ne correspond pas au nombre de valeurs"
 
-#: gram.y:10261
+#: gram.y:10262
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "la syntaxe LIMIT #,# n'est pas supportée"
 
-#: gram.y:10262
+#: gram.y:10263
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "Utilisez les clauses séparées LIMIT et OFFSET."
 
-#: gram.y:10525 gram.y:10550
+#: gram.y:10526 gram.y:10551
 #, c-format
 msgid "VALUES in FROM must have an alias"
 msgstr "VALUES dans FROM doit avoir un alias"
 
-#: gram.y:10526 gram.y:10551
+#: gram.y:10527 gram.y:10552
 #, c-format
 msgid "For example, FROM (VALUES ...) [AS] foo."
 msgstr "Par exemple, FROM (VALUES ...) [AS] quelquechose."
 
-#: gram.y:10531 gram.y:10556
+#: gram.y:10532 gram.y:10557
 #, c-format
 msgid "subquery in FROM must have an alias"
 msgstr "la sous-requête du FROM doit avoir un alias"
 
-#: gram.y:10532 gram.y:10557
+#: gram.y:10533 gram.y:10558
 #, c-format
 msgid "For example, FROM (SELECT ...) [AS] foo."
 msgstr "Par exemple, FROM (SELECT...) [AS] quelquechose."
 
-#: gram.y:11131
+#: gram.y:11132
 #, c-format
 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:11140
+#: gram.y:11141
 #, c-format
 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:11644
+#: gram.y:11645
 #, c-format
 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:11649
+#: gram.y:11650
 #, c-format
 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:11826
+#: gram.y:11827
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "prédicat UNIQUE non implémenté"
 
-#: gram.y:12158
+#: gram.y:12163
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "ne peut pas utiliser des clauses ORDER BY multiples dans WITHIN GROUP"
 
-#: gram.y:12163
+#: gram.y:12168
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "ne peut pas utiliser DISTINCT avec WITHIN GROUP"
 
-#: gram.y:12168
+#: gram.y:12173
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "ne peut pas utiliser VARIADIC avec WITHIN GROUP"
 
-#: gram.y:12674
+#: gram.y:12679
 #, c-format
 msgid "RANGE PRECEDING is only supported with UNBOUNDED"
 msgstr "RANGE PRECEDING est seulement supporté avec UNBOUNDED"
 
-#: gram.y:12680
+#: gram.y:12685
 #, c-format
 msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
 msgstr "RANGE FOLLOWING est seulement supporté avec UNBOUNDED"
 
-#: gram.y:12707 gram.y:12730
+#: gram.y:12712 gram.y:12735
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "la fin du frame ne peut pas être UNBOUNDED FOLLOWING"
 
-#: gram.y:12712
+#: gram.y:12717
 #, c-format
 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:12735
+#: gram.y:12740
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "la fin du frame ne peut pas être UNBOUNDED PRECEDING"
 
-#: gram.y:12741
+#: gram.y:12746
 #, c-format
 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:12748
+#: gram.y:12753
 #, c-format
 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:13406
+#: gram.y:13411
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "le modificateur de type ne peut pas avoir de nom de paramètre"
 
-#: gram.y:13412
+#: gram.y:13417
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "le modificateur de type ne peut pas avoir de clause ORDER BY"
 
-#: gram.y:13470 gram.y:13505
+#: gram.y:13475 gram.y:13510
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "le nom du rôle « %s » est réservé"
 
-#: gram.y:13476 gram.y:13482
+#: gram.y:13481 gram.y:13487
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s ne peut pas être utilisé comme nom de rôle ici"
 
-#: gram.y:14101 gram.y:14290
+#: gram.y:14106 gram.y:14295
 msgid "improper use of \"*\""
 msgstr "mauvaise utilisation de « * »"
 
-#: gram.y:14253 gram.y:14270 tsearch/spell.c:654 tsearch/spell.c:671 tsearch/spell.c:688 tsearch/spell.c:705 tsearch/spell.c:727
+#: gram.y:14258 gram.y:14275 tsearch/spell.c:667 tsearch/spell.c:684 tsearch/spell.c:701 tsearch/spell.c:718 tsearch/spell.c:740
 #, c-format
 msgid "syntax error"
 msgstr "erreur de syntaxe"
 
-#: gram.y:14354
+#: gram.y:14359
 #, c-format
 msgid "an ordered-set aggregate with a VARIADIC direct argument must have one VARIADIC aggregated argument of the same data type"
 msgstr "un agrégat par ensemble ordonné avec un argument VARIADIC direct doit avoir un argument VARIADIC agrégé du même type de données"
 
-#: gram.y:14391
+#: gram.y:14396
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "clauses ORDER BY multiples non autorisées"
 
-#: gram.y:14402
+#: gram.y:14407
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "clauses OFFSET multiples non autorisées"
 
-#: gram.y:14411
+#: gram.y:14416
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "clauses LIMIT multiples non autorisées"
 
-#: gram.y:14420
+#: gram.y:14425
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "clauses WITH multiples non autorisées"
 
-#: gram.y:14600
+#: gram.y:14617
 #, c-format
 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:14701
+#: gram.y:14718
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "clauses COLLATE multiples non autorisées"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14739 gram.y:14752
+#: gram.y:14756 gram.y:14769
 #, 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:14765
+#: gram.y:14782
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "les contraintes %s ne peuvent pas être marquées comme NOT VALID"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14778
+#: gram.y:14795
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "les contraintes %s ne peuvent pas être marquées NO INHERIT"
@@ -10315,505 +10318,505 @@
 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:235
+#: libpq/auth.c:238
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "authentification échouée pour l'utilisateur « %s » : hôte rejeté"
 
-#: libpq/auth.c:238
+#: libpq/auth.c:241
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "authentification « trust » échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:241
+#: libpq/auth.c:244
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "authentification Ident échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:244
+#: libpq/auth.c:247
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "authentification peer échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:248
+#: libpq/auth.c:251
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "authentification par mot de passe échouée pour l'utilisateur  « %s »"
 
-#: libpq/auth.c:253
+#: libpq/auth.c:256
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "authentification GSSAPI échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:256
+#: libpq/auth.c:259
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "authentification SSPI échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:259
+#: libpq/auth.c:262
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "authentification PAM échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:262
+#: libpq/auth.c:265
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "authentification LDAP échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:265
+#: libpq/auth.c:268
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "authentification par le certificat échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:268
+#: libpq/auth.c:271
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "authentification RADIUS échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:271
+#: libpq/auth.c:274
 #, 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:275
+#: libpq/auth.c:278
 #, c-format
 msgid "Connection matched pg_hba.conf line %d: \"%s\""
 msgstr "La connexion correspond à la ligne %d du pg_hba.conf : « %s »"
 
-#: libpq/auth.c:330
+#: libpq/auth.c:333
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "la connexion requiert un certificat client valide"
 
-#: libpq/auth.c:372
+#: libpq/auth.c:375
 #, 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:374 libpq/auth.c:390 libpq/auth.c:448 libpq/auth.c:466
+#: libpq/auth.c:377 libpq/auth.c:393 libpq/auth.c:451 libpq/auth.c:469
 msgid "SSL off"
 msgstr "SSL inactif"
 
-#: libpq/auth.c:374 libpq/auth.c:390 libpq/auth.c:448 libpq/auth.c:466
+#: libpq/auth.c:377 libpq/auth.c:393 libpq/auth.c:451 libpq/auth.c:469
 msgid "SSL on"
 msgstr "SSL actif"
 
-#: libpq/auth.c:378
+#: libpq/auth.c:381
 #, 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:387
+#: libpq/auth.c:390
 #, 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:394
+#: libpq/auth.c:397
 #, 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:423
+#: libpq/auth.c:426
 #, 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:426
+#: libpq/auth.c:429
 #, 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:429
+#: libpq/auth.c:432
 #, 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:432
+#: libpq/auth.c:435
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
 msgstr "N'a pas pu traduire le nom d'hôte « %s » du client en adresse IP : %s."
 
-#: libpq/auth.c:437
+#: libpq/auth.c:440
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "N'a pas pu résoudre l'adresse IP du client à partir du nom d'hôte : %s."
 
-#: libpq/auth.c:446
+#: libpq/auth.c:449
 #, 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:453
+#: libpq/auth.c:456
 #, 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:463
+#: libpq/auth.c:466
 #, 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:471
+#: libpq/auth.c:474
 #, 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:514 libpq/hba.c:1180
+#: libpq/auth.c:517 libpq/hba.c:1180
 #, c-format
 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:640
+#: libpq/auth.c:643
 #, 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:668
+#: libpq/auth.c:671
 #, c-format
 msgid "invalid password packet size"
 msgstr "taille du paquet du mot de passe invalide"
 
-#: libpq/auth.c:798
+#: libpq/auth.c:801
 #, c-format
 msgid "GSSAPI is not supported in protocol version 2"
 msgstr "GSSAPI n'est pas supporté dans le protocole de version 2"
 
-#: libpq/auth.c:858
+#: libpq/auth.c:861
 #, 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:919
+#: libpq/auth.c:922
 msgid "accepting GSS security context failed"
 msgstr "échec de l'acceptation du contexte de sécurité GSS"
 
-#: libpq/auth.c:945
+#: libpq/auth.c:948
 msgid "retrieving GSS user name failed"
 msgstr "échec lors de la récupération du nom de l'utilisateur avec GSS"
 
-#: libpq/auth.c:1062
+#: libpq/auth.c:1067
 #, c-format
 msgid "SSPI is not supported in protocol version 2"
 msgstr "SSPI n'est pas supporté dans le protocole de version 2"
 
-#: libpq/auth.c:1077
+#: libpq/auth.c:1082
 msgid "could not acquire SSPI credentials"
 msgstr "n'a pas pu obtenir les pièces d'identité SSPI"
 
-#: libpq/auth.c:1095
+#: libpq/auth.c:1100
 #, 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:1167
+#: libpq/auth.c:1172
 msgid "could not accept SSPI security context"
 msgstr "n'a pas pu accepter le contexte de sécurité SSPI"
 
-#: libpq/auth.c:1229
+#: libpq/auth.c:1234
 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:1476
+#: libpq/auth.c:1481
 #, 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:1491
+#: libpq/auth.c:1496
 #, 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:1503
+#: libpq/auth.c:1508
 #, 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:1525
+#: libpq/auth.c:1530
 #, 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:1542
+#: libpq/auth.c:1547
 #, 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:1552
+#: libpq/auth.c:1557
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "réponse mal formatée du serveur Ident : « %s »"
 
-#: libpq/auth.c:1592
+#: libpq/auth.c:1597
 #, c-format
 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:1596
+#: libpq/auth.c:1601
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "n'a pas pu obtenir l'authentification de l'autre : %m"
 
-#: libpq/auth.c:1605
+#: libpq/auth.c:1610
 #, c-format
 msgid "could not look up local user ID %ld: %s"
 msgstr "n'a pas pu rechercher l'identifiant %ld de l'utilisateur local : %s"
 
-#: libpq/auth.c:1689 libpq/auth.c:1960 libpq/auth.c:2316
+#: libpq/auth.c:1694 libpq/auth.c:1965 libpq/auth.c:2324
 #, c-format
 msgid "empty password returned by client"
 msgstr "mot de passe vide renvoyé par le client"
 
-#: libpq/auth.c:1699
+#: libpq/auth.c:1704
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "erreur provenant de la couche PAM : %s"
 
-#: libpq/auth.c:1768
+#: libpq/auth.c:1773
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "n'a pas pu créer l'authenticateur PAM : %s"
 
-#: libpq/auth.c:1779
+#: libpq/auth.c:1784
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) a échoué : %s"
 
-#: libpq/auth.c:1790
+#: libpq/auth.c:1795
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) a échoué : %s"
 
-#: libpq/auth.c:1801
+#: libpq/auth.c:1806
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate a échoué : %s"
 
-#: libpq/auth.c:1812
+#: libpq/auth.c:1817
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt a échoué : %s"
 
-#: libpq/auth.c:1823
+#: libpq/auth.c:1828
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "n'a pas pu fermer l'authenticateur PAM : %s"
 
-#: libpq/auth.c:1856
+#: libpq/auth.c:1861
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "n'a pas pu initialiser LDAP : %m"
 
-#: libpq/auth.c:1859
+#: libpq/auth.c:1864
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "n'a pas pu initialiser LDAP : code d'erreur %d"
 
-#: libpq/auth.c:1869
+#: libpq/auth.c:1874
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "n'a pas pu initialiser la version du protocole LDAP : %s"
 
-#: libpq/auth.c:1898
+#: libpq/auth.c:1903
 #, c-format
 msgid "could not load wldap32.dll"
 msgstr "n'a pas pu charger wldap32.dll"
 
-#: libpq/auth.c:1906
+#: libpq/auth.c:1911
 #, c-format
 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:1907
+#: libpq/auth.c:1912
 #, c-format
 msgid "LDAP over SSL is not supported on this platform."
 msgstr "LDAP via SSL n'est pas supporté sur cette plateforme."
 
-#: libpq/auth.c:1922
+#: libpq/auth.c:1927
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "n'a pas pu démarrer la session TLS LDAP : %s"
 
-#: libpq/auth.c:1944
+#: libpq/auth.c:1949
 #, c-format
 msgid "LDAP server not specified"
 msgstr "serveur LDAP non précisé"
 
-#: libpq/auth.c:1997
+#: libpq/auth.c:2002
 #, c-format
 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:2012
+#: libpq/auth.c:2017
 #, c-format
 msgid "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s"
 msgstr "n'a pas pu réaliser le lien LDAP initiale pour ldapbinddn « %s » sur le serveur « %s » : %s"
 
-#: libpq/auth.c:2036
+#: libpq/auth.c:2041
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr "n'a pas pu rechercher dans LDAP pour filtrer « %s » sur le serveur « %s » : %s"
 
-#: libpq/auth.c:2047
+#: libpq/auth.c:2052
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "l'utilisateur LDAP « %s » n'existe pas"
 
-#: libpq/auth.c:2048
+#: libpq/auth.c:2053
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "la recherche LDAP pour le filtre « %s » sur le serveur « %s » n'a renvoyé aucun enregistrement."
 
-#: libpq/auth.c:2052
+#: libpq/auth.c:2057
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "l'utilisateur LDAP « %s » n'est pas unique"
 
-#: libpq/auth.c:2053
+#: libpq/auth.c:2058
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned %d entry."
 msgid_plural "LDAP search for filter \"%s\" on server \"%s\" returned %d entries."
 msgstr[0] "la recherche LDAP pour le filtre « %s » sur le serveur « %s » a renvoyé %d enregistrement."
 msgstr[1] "la recherche LDAP pour le filtre « %s » sur le serveur « %s » a renvoyé %d enregistrements."
 
-#: libpq/auth.c:2071
+#: libpq/auth.c:2076
 #, 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:2091
+#: libpq/auth.c:2096
 #, 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:2121
+#: libpq/auth.c:2126
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr "échec de connexion LDAP pour l'utilisateur « %s » sur le serveur « %s » : %s"
 
-#: libpq/auth.c:2149
+#: libpq/auth.c:2154
 #, 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:2272
+#: libpq/auth.c:2280
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "serveur RADIUS non précisé"
 
-#: libpq/auth.c:2279
+#: libpq/auth.c:2287
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "secret RADIUS non précisé"
 
-#: libpq/auth.c:2295 libpq/hba.c:1590
+#: libpq/auth.c:2303 libpq/hba.c:1590
 #, 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:2323
+#: libpq/auth.c:2331
 #, c-format
 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:2334
+#: libpq/auth.c:2342
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "n'a pas pu générer le vecteur de chiffrement aléatoire"
 
-#: libpq/auth.c:2357
+#: libpq/auth.c:2365
 #, c-format
 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:2379
+#: libpq/auth.c:2387
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "n'a pas pu créer le socket RADIUS : %m"
 
-#: libpq/auth.c:2400
+#: libpq/auth.c:2408
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "n'a pas pu se lier à la socket RADIUS : %m"
 
-#: libpq/auth.c:2410
+#: libpq/auth.c:2418
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "n'a pas pu transmettre le paquet RADIUS : %m"
 
-#: libpq/auth.c:2443 libpq/auth.c:2468
+#: libpq/auth.c:2451 libpq/auth.c:2476
 #, c-format
 msgid "timeout waiting for RADIUS response"
 msgstr "dépassement du délai pour la réponse du RADIUS"
 
-#: libpq/auth.c:2461
+#: libpq/auth.c:2469
 #, 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:2490
+#: libpq/auth.c:2498
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "n'a pas pu lire la réponse RADIUS : %m"
 
-#: libpq/auth.c:2502 libpq/auth.c:2506
+#: libpq/auth.c:2510 libpq/auth.c:2514
 #, c-format
 msgid "RADIUS response was sent from incorrect port: %d"
 msgstr "la réponse RADIUS a été envoyée à partir d'un mauvais port : %d"
 
-#: libpq/auth.c:2515
+#: libpq/auth.c:2523
 #, c-format
 msgid "RADIUS response too short: %d"
 msgstr "réponse RADIUS trop courte : %d"
 
-#: libpq/auth.c:2522
+#: libpq/auth.c:2530
 #, c-format
 msgid "RADIUS response has corrupt length: %d (actual length %d)"
 msgstr "la réponse RADIUS a une longueur corrompue : %d (longueur actuelle %d)"
 
-#: libpq/auth.c:2530
+#: libpq/auth.c:2538
 #, c-format
 msgid "RADIUS response is to a different request: %d (should be %d)"
 msgstr "la réponse RADIUS correspond à une demande différente : %d (devrait être %d)"
 
-#: libpq/auth.c:2555
+#: libpq/auth.c:2563
 #, c-format
 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:2564
+#: libpq/auth.c:2572
 #, c-format
 msgid "RADIUS response has incorrect MD5 signature"
 msgstr "la réponse RADIUS a une signature MD5 erronée"
 
-#: libpq/auth.c:2581
+#: libpq/auth.c:2589
 #, c-format
 msgid "RADIUS response has invalid code (%d) for user \"%s\""
 msgstr "la réponse RADIUS a un code invalide (%d) pour l'utilisateur « %s »"
@@ -10893,123 +10896,123 @@
 msgid "requested length cannot be negative"
 msgstr "la longueur demandée ne peut pas être négative"
 
-#: libpq/be-secure-openssl.c:184
+#: libpq/be-secure-openssl.c:189
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "n'a pas pu créer le contexte SSL : %s"
 
-#: libpq/be-secure-openssl.c:200
+#: libpq/be-secure-openssl.c:205
 #, 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-openssl.c:206
+#: libpq/be-secure-openssl.c:211
 #, 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-openssl.c:221
+#: libpq/be-secure-openssl.c:226
 #, 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-openssl.c:223
+#: libpq/be-secure-openssl.c:228
 #, c-format
 msgid "Permissions should be u=rw (0600) or less."
 msgstr "Les droits devraient être u=rwx (0600) ou inférieures."
 
-#: libpq/be-secure-openssl.c:230
+#: libpq/be-secure-openssl.c:235
 #, 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-openssl.c:235
+#: libpq/be-secure-openssl.c:240
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "échec de la vérification de la clé privée : %s"
 
-#: libpq/be-secure-openssl.c:264
+#: libpq/be-secure-openssl.c:269
 #, 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-openssl.c:288
+#: libpq/be-secure-openssl.c:293
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" ignored"
 msgstr "liste de révocation des certificats SSL « %s » ignorée"
 
-#: libpq/be-secure-openssl.c:290
+#: libpq/be-secure-openssl.c:295
 #, c-format
 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-openssl.c:295
+#: libpq/be-secure-openssl.c:300
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
 msgstr "n'a pas pu charger le fichier de liste de révocation des certificats SSL (« %s ») : %s"
 
-#: libpq/be-secure-openssl.c:341
+#: libpq/be-secure-openssl.c:347
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "n'a pas pu initialiser la connexion SSL : %s"
 
-#: libpq/be-secure-openssl.c:349
+#: libpq/be-secure-openssl.c:355
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "n'a pas pu créer le socket SSL : %s"
 
-#: libpq/be-secure-openssl.c:383
+#: libpq/be-secure-openssl.c:409
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "n'a pas pu accepter la connexion SSL : %m"
 
-#: libpq/be-secure-openssl.c:387 libpq/be-secure-openssl.c:398
+#: libpq/be-secure-openssl.c:413 libpq/be-secure-openssl.c:424
 #, c-format
 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-openssl.c:392
+#: libpq/be-secure-openssl.c:418
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "n'a pas pu accepter la connexion SSL : %s"
 
-#: libpq/be-secure-openssl.c:403 libpq/be-secure-openssl.c:541 libpq/be-secure-openssl.c:598
+#: libpq/be-secure-openssl.c:429 libpq/be-secure-openssl.c:572 libpq/be-secure-openssl.c:638
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "code d'erreur SSL inconnu : %d"
 
-#: libpq/be-secure-openssl.c:447
+#: libpq/be-secure-openssl.c:473
 #, c-format
 msgid "SSL certificate's common name contains embedded null"
 msgstr "le nom commun du certificat SSL contient des NULL"
 
-#: libpq/be-secure-openssl.c:458
+#: libpq/be-secure-openssl.c:484
 #, c-format
 msgid "SSL connection from \"%s\""
 msgstr "connexion SSL de « %s »"
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:561 libpq/be-secure-openssl.c:623
 #, c-format
 msgid "SSL error: %s"
 msgstr "erreur SSL : %s"
 
-#: libpq/be-secure-openssl.c:937
+#: libpq/be-secure-openssl.c:1040
 #, c-format
 msgid "ECDH: unrecognized curve name: %s"
 msgstr "ECDH : nome de courbe non reconnu : %s"
 
-#: libpq/be-secure-openssl.c:942
+#: libpq/be-secure-openssl.c:1045
 #, c-format
 msgid "ECDH: could not create key"
 msgstr "ECDH : n'a pas pu créer la clé"
 
-#: libpq/be-secure-openssl.c:966
+#: libpq/be-secure-openssl.c:1069
 msgid "no SSL error reported"
 msgstr "aucune erreur SSL reportée"
 
-#: libpq/be-secure-openssl.c:970
+#: libpq/be-secure-openssl.c:1073
 #, c-format
 msgid "SSL error code %lu"
 msgstr "erreur SSL %lu"
@@ -11339,76 +11342,71 @@
 msgid "could not open usermap file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier usermap « %s » : %m"
 
-#: libpq/pqcomm.c:201
+#: libpq/pqcomm.c:220
 #, c-format
 msgid "could not set socket to nonblocking mode: %m"
 msgstr "n'a pas pu activer le mode non-bloquant pour la socket : %m"
 
-#: libpq/pqcomm.c:348
+#: libpq/pqcomm.c:367
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)"
 msgstr "Le chemin du socket de domaine Unix, « %s », est trop (maximum %d octets)"
 
-#: libpq/pqcomm.c:369
+#: libpq/pqcomm.c:388
 #, 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:373
+#: libpq/pqcomm.c:392
 #, 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:400
+#: libpq/pqcomm.c:419
 #, 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:409
+#: libpq/pqcomm.c:428
 msgid "IPv4"
 msgstr "IPv4"
 
-#: libpq/pqcomm.c:413
+#: libpq/pqcomm.c:432
 msgid "IPv6"
 msgstr "IPv6"
 
-#: libpq/pqcomm.c:418
+#: libpq/pqcomm.c:437
 msgid "Unix"
 msgstr "Unix"
 
-#: libpq/pqcomm.c:423
+#: libpq/pqcomm.c:442
 #, c-format
 msgid "unrecognized address family %d"
 msgstr "famille d'adresse %d non reconnue"
 
 #. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:434
+#: libpq/pqcomm.c:453
 #, c-format
 msgid "could not create %s socket: %m"
 msgstr "n'a pas pu créer le socket %s : %m"
 
-#: libpq/pqcomm.c:459
-#, c-format
-msgid "setsockopt(SO_REUSEADDR) failed: %m"
-msgstr "setsockopt(SO_REUSEADDR) a échoué : %m"
-
-#: libpq/pqcomm.c:474
+#: libpq/pqcomm.c:478 libpq/pqcomm.c:494
 #, c-format
-msgid "setsockopt(IPV6_V6ONLY) failed: %m"
-msgstr "setsockopt(IPV6_V6ONLY) a échoué : %m"
+msgid "setsockopt(%s) failed: %m"
+msgstr "setsockopt(%s) a échoué : %m"
 
 #. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:493
+#: libpq/pqcomm.c:514
 #, c-format
 msgid "could not bind %s socket: %m"
 msgstr "n'a pas pu se lier à la socket %s : %m"
 
-#: libpq/pqcomm.c:496
+#: libpq/pqcomm.c:517
 #, 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:499
+#: libpq/pqcomm.c:520
 #, c-format
 msgid "Is another postmaster already running on port %d? If not, wait a few seconds and retry."
 msgstr ""
@@ -11416,62 +11414,62 @@
 "Sinon, attendez quelques secondes et réessayez."
 
 #. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:532
+#: libpq/pqcomm.c:553
 #, c-format
 msgid "could not listen on %s socket: %m"
 msgstr "n'a pas pu écouter sur le socket %s : %m"
 
-#: libpq/pqcomm.c:617
+#: libpq/pqcomm.c:638
 #, c-format
 msgid "group \"%s\" does not exist"
 msgstr "le groupe « %s » n'existe pas"
 
-#: libpq/pqcomm.c:627
+#: libpq/pqcomm.c:648
 #, 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:638
+#: libpq/pqcomm.c:659
 #, 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:668
+#: libpq/pqcomm.c:689
 #, c-format
 msgid "could not accept new connection: %m"
 msgstr "n'a pas pu accepter la nouvelle connexion : %m"
 
-#: libpq/pqcomm.c:847
+#: libpq/pqcomm.c:868
 #, c-format
 msgid "there is no client connection"
 msgstr "il n'y a pas de connexion client"
 
-#: libpq/pqcomm.c:898 libpq/pqcomm.c:994
+#: libpq/pqcomm.c:919 libpq/pqcomm.c:1015
 #, 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:1139 tcop/postgres.c:3902
+#: libpq/pqcomm.c:1160 tcop/postgres.c:3915
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "arrêt de la connexion à cause d'une perte de synchronisation du protocole"
 
-#: libpq/pqcomm.c:1205
+#: libpq/pqcomm.c:1226
 #, c-format
 msgid "unexpected EOF within message length word"
 msgstr "fin de fichier (EOF) inattendue à l'intérieur de la longueur du message"
 
-#: libpq/pqcomm.c:1216
+#: libpq/pqcomm.c:1237
 #, c-format
 msgid "invalid message length"
 msgstr "longueur du message invalide"
 
-#: libpq/pqcomm.c:1238 libpq/pqcomm.c:1251
+#: libpq/pqcomm.c:1259 libpq/pqcomm.c:1272
 #, c-format
 msgid "incomplete message from client"
 msgstr "message incomplet du client"
 
-#: libpq/pqcomm.c:1384
+#: libpq/pqcomm.c:1405
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "n'a pas pu envoyer les données au client : %m"
@@ -11496,12 +11494,12 @@
 msgid "invalid message format"
 msgstr "format du message invalide"
 
-#: main/main.c:259
+#: main/main.c:264
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s : WSAStartup a échoué : %d\n"
 
-#: main/main.c:306
+#: main/main.c:327
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -11510,7 +11508,7 @@
 "%s est le serveur PostgreSQL.\n"
 "\n"
 
-#: main/main.c:307
+#: main/main.c:328
 #, c-format
 msgid ""
 "Usage:\n"
@@ -11521,114 +11519,114 @@
 "  %s [OPTION]...\n"
 "\n"
 
-#: main/main.c:308
+#: main/main.c:329
 #, c-format
 msgid "Options:\n"
 msgstr "Options :\n"
 
-#: main/main.c:309
+#: main/main.c:330
 #, c-format
 msgid "  -B NBUFFERS        number of shared buffers\n"
 msgstr "  -B NBUFFERS        nombre de tampons partagés\n"
 
-#: main/main.c:310
+#: main/main.c:331
 #, c-format
 msgid "  -c NAME=VALUE      set run-time parameter\n"
 msgstr "  -c NOM=VALEUR      configure un paramètre d'exécution\n"
 
-#: main/main.c:311
+#: main/main.c:332
 #, c-format
 msgid "  -C NAME            print value of run-time parameter, then exit\n"
 msgstr ""
 "  -C NOM             affiche la valeur d'un paramètre en exécution,\n"
 "                     puis quitte\n"
 
-#: main/main.c:312
+#: main/main.c:333
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5             niveau de débogage\n"
 
-#: main/main.c:313
+#: main/main.c:334
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D RÉPDONNEES      répertoire de la base de données\n"
 
-#: main/main.c:314
+#: main/main.c:335
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e                 utilise le format de saisie européen des dates (DMY)\n"
 
-#: main/main.c:315
+#: main/main.c:336
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F                 désactive fsync\n"
 
-#: main/main.c:316
+#: main/main.c:337
 #, 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"
 
-#: main/main.c:317
+#: main/main.c:338
 #, c-format
 msgid "  -i                 enable TCP/IP connections\n"
 msgstr "  -i                 active les connexions TCP/IP\n"
 
-#: main/main.c:318
+#: main/main.c:339
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k RÉPERTOIRE      emplacement des sockets de domaine Unix\n"
 
-#: main/main.c:320
+#: main/main.c:341
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l                 active les connexions SSL\n"
 
-#: main/main.c:322
+#: main/main.c:343
 #, c-format
 msgid "  -N MAX-CONNECT     maximum number of allowed connections\n"
 msgstr "  -N MAX-CONNECT     nombre maximum de connexions simultanées\n"
 
-#: main/main.c:323
+#: main/main.c:344
 #, 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:324
+#: main/main.c:345
 #, c-format
 msgid "  -p PORT            port number to listen on\n"
 msgstr "  -p PORT            numéro du port à écouter\n"
 
-#: main/main.c:325
+#: main/main.c:346
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s                 affiche les statistiques après chaque requête\n"
 
-#: main/main.c:326
+#: main/main.c:347
 #, 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:327
+#: main/main.c:348
 #, c-format
 msgid "  -V, --version      output version information, then exit\n"
 msgstr "  -V, --version  affiche la version et quitte\n"
 
-#: main/main.c:328
+#: main/main.c:349
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --NOM=VALEUR       configure un paramètre d'exécution\n"
 
-#: main/main.c:329
+#: main/main.c:350
 #, 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:330
+#: main/main.c:351
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help     affiche cette aide et quitte\n"
 
-#: main/main.c:332
+#: main/main.c:353
 #, c-format
 msgid ""
 "\n"
@@ -11637,50 +11635,50 @@
 "\n"
 "Options pour le développeur :\n"
 
-#: main/main.c:333
+#: main/main.c:354
 #, 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:334
+#: main/main.c:355
 #, 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:335
+#: main/main.c:356
 #, 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:336
+#: main/main.c:357
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P                 désactive les index systèmes\n"
 
-#: main/main.c:337
+#: main/main.c:358
 #, c-format
 msgid "  -t pa|pl|ex        show timings after each query\n"
 msgstr "  -t pa|pl|ex     affiche les horodatages pour chaque requête\n"
 
-#: main/main.c:338
+#: main/main.c:359
 #, 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:339
+#: main/main.c:360
 #, 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:341
+#: main/main.c:362
 #, c-format
 msgid ""
 "\n"
@@ -11689,41 +11687,41 @@
 "\n"
 "Options pour le mode mono-utilisateur :\n"
 
-#: main/main.c:342
+#: main/main.c:363
 #, 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:343
+#: main/main.c:364
 #, 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:344
+#: main/main.c:365
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5             surcharge le niveau de débogage\n"
 
-#: main/main.c:345
+#: main/main.c:366
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E                 affiche la requête avant de l'exécuter\n"
 
-#: main/main.c:346
+#: main/main.c:367
 #, c-format
 msgid "  -j                 do not use newline as interactive query delimiter\n"
 msgstr ""
 "  -j                 n'utilise pas le retour à la ligne comme délimiteur de\n"
 "                     requête\n"
 
-#: main/main.c:347 main/main.c:352
+#: main/main.c:368 main/main.c:373
 #, 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:349
+#: main/main.c:370
 #, c-format
 msgid ""
 "\n"
@@ -11732,26 +11730,26 @@
 "\n"
 "Options pour le mode « bootstrapping » :\n"
 
-#: main/main.c:350
+#: main/main.c:371
 #, 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:351
+#: main/main.c:372
 #, c-format
 msgid "  DBNAME             database name (mandatory argument in bootstrapping mode)\n"
 msgstr ""
 "  NOMBASE            nom de la base (argument obligatoire dans le mode\n"
 "                     « bootstrapping »)\n"
 
-#: main/main.c:353
+#: main/main.c:374
 #, c-format
 msgid "  -x NUM             internal use\n"
 msgstr "  -x NUM             utilisation interne\n"
 
-#: main/main.c:355
+#: main/main.c:376
 #, c-format
 msgid ""
 "\n"
@@ -11768,7 +11766,7 @@
 "\n"
 "Rapportez les bogues à <pgsql-bugs@postgresql.org>.\n"
 
-#: main/main.c:369
+#: main/main.c:390
 #, c-format
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
@@ -11782,12 +11780,12 @@
 "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:386
+#: main/main.c:407
 #, 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:393
+#: main/main.c:414
 #, c-format
 msgid ""
 "Execution of PostgreSQL by a user with administrative permissions is not\n"
@@ -11801,7 +11799,7 @@
 "tout problème de sécurité sur le serveur. Voir la documentation pour\n"
 "plus d'informations sur le lancement propre du serveur.\n"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:1820 parser/parse_coerce.c:1848 parser/parse_coerce.c:1924 parser/parse_expr.c:1981 parser/parse_func.c:597 parser/parse_oper.c:952
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:1820 parser/parse_coerce.c:1848 parser/parse_coerce.c:1924 parser/parse_expr.c:1994 parser/parse_func.c:597 parser/parse_oper.c:952
 #, 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"
@@ -11835,46 +11833,51 @@
 msgstr "%s ne peut être appliqué sur le côté possiblement NULL d'une jointure externe"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1330 parser/analyze.c:1481 parser/analyze.c:1679 parser/analyze.c:2460
+#: optimizer/plan/planner.c:1341 parser/analyze.c:1478 parser/analyze.c:1676 parser/analyze.c:2457
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s n'est pas autorisé avec UNION/INTERSECT/EXCEPT"
 
-#: optimizer/plan/planner.c:3587
+#: optimizer/plan/planner.c:1762 optimizer/plan/planner.c:3603
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "n'a pas pu implanté GROUP BY"
 
-#: optimizer/plan/planner.c:3588 optimizer/plan/planner.c:3756 optimizer/prep/prepunion.c:828
+#: optimizer/plan/planner.c:1763
+#, c-format
+msgid "Some of the datatypes do not support sorting, which is required for grouping sets."
+msgstr "Certains des types de données ne supportent pas le tri qui est requis pour les ensembles de regroupement."
+
+#: optimizer/plan/planner.c:3604 optimizer/plan/planner.c:3772 optimizer/prep/prepunion.c:828
 #, c-format
 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/plan/planner.c:3755
+#: optimizer/plan/planner.c:3771
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "n'a pas pu implanté DISTINCT"
 
-#: optimizer/plan/planner.c:4361
+#: optimizer/plan/planner.c:4377
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "n'a pas pu implanter PARTITION BY de window"
 
-#: optimizer/plan/planner.c:4362
+#: optimizer/plan/planner.c:4378
 #, c-format
 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:4366
+#: optimizer/plan/planner.c:4382
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "n'a pas pu implanter ORDER BY dans le window"
 
-#: optimizer/plan/planner.c:4367
+#: optimizer/plan/planner.c:4383
 #, c-format
 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."
@@ -11900,7 +11903,7 @@
 msgid "could not implement %s"
 msgstr "n'a pas pu implanté %s"
 
-#: optimizer/util/clauses.c:4597
+#: optimizer/util/clauses.c:4693
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "fonction SQL « %s » durant « inlining »"
@@ -11910,27 +11913,27 @@
 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/util/plancat.c:498
+#: optimizer/util/plancat.c:490
 #, c-format
-msgid "system columns cannot be used in an ON CONFLICT clause"
-msgstr "les colonnes systèmes ne peuvent pas être utilisées dans une clause ON CONFLICT"
+msgid "whole row unique index inference specifications are not supported"
+msgstr "les spécifications d'inférence d'index unique sur des lignes complètes ne sont pas supportées"
 
-#: optimizer/util/plancat.c:516
+#: optimizer/util/plancat.c:507
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "la contrainte de la clause ON CONFLICT n'a pas d'index associé"
 
-#: optimizer/util/plancat.c:568
+#: optimizer/util/plancat.c:558
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATE non supporté avec les contraintes d'exclusion"
 
-#: optimizer/util/plancat.c:675
+#: optimizer/util/plancat.c:663
 #, c-format
 msgid "there is no unique or exclusion constraint matching the ON CONFLICT specification"
 msgstr "il n'existe aucune contrainte unique ou contrainte d'exclusion correspondant à la spécification ON CONFLICT"
 
-#: parser/analyze.c:639 parser/analyze.c:1253
+#: parser/analyze.c:639 parser/analyze.c:1250
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "les listes VALUES doivent toutes être de la même longueur"
@@ -11953,181 +11956,181 @@
 "de colonnes que celui attendu par INSERT. Auriez-vous utilisé des parenthèses\n"
 "supplémentaires ?"
 
-#: parser/analyze.c:1074 parser/analyze.c:1454
+#: parser/analyze.c:1071 parser/analyze.c:1451
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO n'est pas autorisé ici"
 
-#: parser/analyze.c:1267
+#: parser/analyze.c:1264
 #, c-format
 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"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1386 parser/analyze.c:2630
+#: parser/analyze.c:1383 parser/analyze.c:2627
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s ne peut pas être appliqué à VALUES"
 
-#: parser/analyze.c:1607
+#: parser/analyze.c:1604
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "clause UNION/INTERSECT/EXCEPT ORDER BY invalide"
 
-#: parser/analyze.c:1608
+#: parser/analyze.c:1605
 #, c-format
 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:1609
+#: parser/analyze.c:1606
 #, c-format
 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:1669
+#: parser/analyze.c:1666
 #, c-format
 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:1733
+#: parser/analyze.c:1730
 #, c-format
 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:1822
+#: parser/analyze.c:1819
 #, 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:2215
+#: parser/analyze.c:2212
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "RETURNING doit avoir au moins une colonne"
 
-#: parser/analyze.c:2252
+#: parser/analyze.c:2249
 #, c-format
 msgid "cannot specify both SCROLL and NO SCROLL"
 msgstr "ne peut pas spécifier à la fois SCROLL et NO SCROLL"
 
-#: parser/analyze.c:2270
+#: parser/analyze.c:2267
 #, c-format
 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"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2278
+#: parser/analyze.c:2275
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s n'est pas supporté"
 
-#: parser/analyze.c:2281
+#: parser/analyze.c:2278
 #, c-format
 msgid "Holdable cursors must be READ ONLY."
 msgstr "Les curseurs détenables doivent être en lecture seule (READ ONLY)."
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2289
+#: parser/analyze.c:2286
 #, c-format
 msgid "DECLARE SCROLL CURSOR ... %s is not supported"
 msgstr "DECLARE SCROLL CURSOR ... %s n'est pas supporté"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2300
+#: parser/analyze.c:2297
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not supported"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s n'est pas supporté"
 
-#: parser/analyze.c:2303
+#: parser/analyze.c:2300
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "Les curseurs insensibles doivent être en lecture seule (READ ONLY)."
 
-#: parser/analyze.c:2369
+#: parser/analyze.c:2366
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr "les vues matérialisées ne peuvent pas contenir d'instructions de modifications de données avec WITH"
 
-#: parser/analyze.c:2379
+#: parser/analyze.c:2376
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr "les vues matérialisées ne doivent pas utiliser de tables temporaires ou de vues"
 
-#: parser/analyze.c:2389
+#: parser/analyze.c:2386
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr "les vues matérialisées ne peuvent pas être définies en utilisant des paramètres liés"
 
-#: parser/analyze.c:2401
+#: parser/analyze.c:2398
 #, c-format
 msgid "materialized views cannot be UNLOGGED"
 msgstr "les vues matérialisées ne peuvent pas être UNLOGGED"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2467
+#: parser/analyze.c:2464
 #, c-format
 msgid "%s is not allowed with DISTINCT clause"
 msgstr "%s n'est pas autorisé avec la clause DISTINCT"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2474
+#: parser/analyze.c:2471
 #, c-format
 msgid "%s is not allowed with GROUP BY clause"
 msgstr "%s n'est pas autorisé avec la clause GROUP BY"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2481
+#: parser/analyze.c:2478
 #, c-format
 msgid "%s is not allowed with HAVING clause"
 msgstr "%s n'est pas autorisé avec la clause HAVING"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2488
+#: parser/analyze.c:2485
 #, c-format
 msgid "%s is not allowed with aggregate functions"
 msgstr "%s n'est pas autorisé avec les fonctions d'agrégat"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2495
+#: parser/analyze.c:2492
 #, c-format
 msgid "%s is not allowed with window functions"
 msgstr "%s n'est pas autorisé avec les fonctions de fenêtrage"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2502
+#: parser/analyze.c:2499
 #, c-format
 msgid "%s is not allowed with set-returning functions in the target list"
 msgstr "%s n'est pas autorisé avec les fonctions renvoyant plusieurs lignes dans la liste cible"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2581
+#: parser/analyze.c:2578
 #, c-format
 msgid "%s must specify unqualified relation names"
 msgstr "%s doit indiquer les noms de relation non qualifiés"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2612
+#: parser/analyze.c:2609
 #, c-format
 msgid "%s cannot be applied to a join"
 msgstr "%s ne peut pas être appliqué à une jointure"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2621
+#: parser/analyze.c:2618
 #, c-format
 msgid "%s cannot be applied to a function"
 msgstr "%s ne peut pas être appliqué à une fonction"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2639
+#: parser/analyze.c:2636
 #, c-format
 msgid "%s cannot be applied to a WITH query"
 msgstr "%s ne peut pas être appliqué à une requête WITH"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2656
+#: parser/analyze.c:2653
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr "relation « %s » dans une clause %s introuvable dans la clause FROM"
@@ -12266,7 +12269,7 @@
 #: parser/parse_agg.c:619
 #, c-format
 msgid "outer-level aggregate cannot contain a lower-level variable in its direct arguments"
-msgstr ""
+msgstr "un agrégat de niveau externe ne peut pas contenir une variable de niveau moindre dans ses arguments directs"
 
 #: parser/parse_agg.c:690
 #, c-format
@@ -12589,7 +12592,7 @@
 "Les opérateurs de tri doivent être les membres « < » ou « > » des familles\n"
 "d'opérateurs btree."
 
-#: parser/parse_coerce.c:971 parser/parse_coerce.c:1001 parser/parse_coerce.c:1019 parser/parse_coerce.c:1034 parser/parse_expr.c:2015 parser/parse_expr.c:2528 parser/parse_target.c:874
+#: parser/parse_coerce.c:971 parser/parse_coerce.c:1001 parser/parse_coerce.c:1019 parser/parse_coerce.c:1034 parser/parse_expr.c:2028 parser/parse_expr.c:2552 parser/parse_target.c:885
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "ne peut pas convertir le type %s en %s"
@@ -12832,7 +12835,7 @@
 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:387 parser/parse_relation.c:3083 parser/parse_relation.c:3103
+#: parser/parse_expr.c:387 parser/parse_relation.c:3176 parser/parse_relation.c:3196
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "la colonne %s.%s n'existe pas"
@@ -12852,12 +12855,12 @@
 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:441 parser/parse_target.c:660
+#: parser/parse_expr.c:441 parser/parse_target.c:671
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr "l'expansion de ligne via « * » n'est pas supporté ici"
 
-#: parser/parse_expr.c:767 parser/parse_relation.c:667 parser/parse_relation.c:767 parser/parse_target.c:1109
+#: parser/parse_expr.c:767 parser/parse_relation.c:668 parser/parse_relation.c:768 parser/parse_target.c:1120
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "la référence à la colonne « %s » est ambigu"
@@ -12867,137 +12870,137 @@
 msgid "there is no parameter $%d"
 msgstr "Il n'existe pas de paramètres $%d"
 
-#: parser/parse_expr.c:1034
+#: parser/parse_expr.c:1042
 #, c-format
 msgid "NULLIF requires = operator to yield boolean"
 msgstr "NULLIF requiert l'opérateur = pour comparer des booleéns"
 
-#: parser/parse_expr.c:1697
+#: parser/parse_expr.c:1705
 msgid "cannot use subquery in check constraint"
 msgstr "ne peut pas utiliser une sous-requête dans la contrainte de vérification"
 
-#: parser/parse_expr.c:1701
+#: parser/parse_expr.c:1709
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "ne peut pas utiliser de sous-requête dans une expression DEFAULT"
 
-#: parser/parse_expr.c:1704
+#: parser/parse_expr.c:1712
 msgid "cannot use subquery in index expression"
 msgstr "ne peut pas utiliser la sous-requête dans l'expression de l'index"
 
-#: parser/parse_expr.c:1707
+#: parser/parse_expr.c:1715
 msgid "cannot use subquery in index predicate"
 msgstr "ne peut pas utiliser une sous-requête dans un prédicat d'index"
 
-#: parser/parse_expr.c:1710
+#: parser/parse_expr.c:1718
 msgid "cannot use subquery in transform expression"
 msgstr "ne peut pas utiliser une sous-requête dans l'expression de transformation"
 
-#: parser/parse_expr.c:1713
+#: parser/parse_expr.c:1721
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "ne peut pas utiliser les sous-requêtes dans le paramètre EXECUTE"
 
-#: parser/parse_expr.c:1716
+#: parser/parse_expr.c:1724
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "ne peut pas utiliser une sous-requête dans la condition WHEN d'un trigger"
 
-#: parser/parse_expr.c:1770
+#: parser/parse_expr.c:1778
 #, c-format
 msgid "subquery must return only one column"
 msgstr "la sous-requête doit renvoyer une seule colonne"
 
-#: parser/parse_expr.c:1854
+#: parser/parse_expr.c:1862
 #, c-format
 msgid "subquery has too many columns"
 msgstr "la sous-requête a trop de colonnes"
 
-#: parser/parse_expr.c:1859
+#: parser/parse_expr.c:1867
 #, c-format
 msgid "subquery has too few columns"
 msgstr "la sous-requête n'a pas assez de colonnes"
 
-#: parser/parse_expr.c:1955
+#: parser/parse_expr.c:1968
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "ne peut pas déterminer le type d'un tableau vide"
 
-#: parser/parse_expr.c:1956
+#: parser/parse_expr.c:1969
 #, c-format
 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:1970
+#: parser/parse_expr.c:1983
 #, 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:2193
+#: parser/parse_expr.c:2206
 #, c-format
 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:2194
+#: parser/parse_expr.c:2207
 #, c-format
 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:2209
+#: parser/parse_expr.c:2222
 #, 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:2316
+#: parser/parse_expr.c:2329
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "ne peut pas convertir le résultat XMLSERIALIZE en %s"
 
-#: parser/parse_expr.c:2601 parser/parse_expr.c:2797
+#: parser/parse_expr.c:2625 parser/parse_expr.c:2821
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "nombre différent d'entrées dans les expressions de ligne"
 
-#: parser/parse_expr.c:2611
+#: parser/parse_expr.c:2635
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "n'a pas pu comparer des lignes de taille zéro"
 
-#: parser/parse_expr.c:2636
+#: parser/parse_expr.c:2660
 #, 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:2643
+#: parser/parse_expr.c:2667
 #, c-format
 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:2702 parser/parse_expr.c:2743
+#: parser/parse_expr.c:2726 parser/parse_expr.c:2767
 #, 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:2704
+#: parser/parse_expr.c:2728
 #, c-format
 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:2745
+#: parser/parse_expr.c:2769
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "Il existe de nombreus candidats également plausibles."
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2861
 #, c-format
 msgid "IS DISTINCT FROM requires = operator to yield boolean"
 msgstr "IS DISTINCT FROM requiert l'opérateur = pour comparer des booléens"
 
-#: parser/parse_expr.c:3127 parser/parse_expr.c:3145
+#: parser/parse_expr.c:3151 parser/parse_expr.c:3169
 #, c-format
 msgid "operator precedence change: %s is now lower precedence than %s"
-msgstr ""
+msgstr "changement de précédence d'opérateur : %s a maintenant une précédence moindre que %s"
 
 #: parser/parse_func.c:174
 #, c-format
@@ -13181,7 +13184,7 @@
 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:125 parser/parse_oper.c:722 utils/adt/regproc.c:583 utils/adt/regproc.c:603 utils/adt/regproc.c:787
+#: parser/parse_oper.c:125 parser/parse_oper.c:722 utils/adt/regproc.c:584 utils/adt/regproc.c:604 utils/adt/regproc.c:788
 #, c-format
 msgid "operator does not exist: %s"
 msgstr "l'opérateur n'existe pas : %s"
@@ -13191,7 +13194,7 @@
 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:226 utils/adt/array_userfuncs.c:782 utils/adt/array_userfuncs.c:920 utils/adt/arrayfuncs.c:3613 utils/adt/arrayfuncs.c:4051 utils/adt/arrayfuncs.c:6029 utils/adt/rowtypes.c:1167
+#: parser/parse_oper.c:226 utils/adt/array_userfuncs.c:794 utils/adt/array_userfuncs.c:933 utils/adt/arrayfuncs.c:3613 utils/adt/arrayfuncs.c:4051 utils/adt/arrayfuncs.c:6017 utils/adt/rowtypes.c:1167
 #, 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"
@@ -13245,175 +13248,175 @@
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "types incohérents déduit pour le paramètre $%d"
 
-#: parser/parse_relation.c:174
+#: parser/parse_relation.c:175
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
 msgstr "la référence à la table « %s » est ambigu"
 
-#: parser/parse_relation.c:218
+#: parser/parse_relation.c:219
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "la référence à la table %u est ambigu"
 
-#: parser/parse_relation.c:397
+#: parser/parse_relation.c:398
 #, c-format
 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:424 parser/parse_relation.c:3023
+#: parser/parse_relation.c:425 parser/parse_relation.c:3116
 #, 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:427 parser/parse_relation.c:3028
+#: parser/parse_relation.c:428 parser/parse_relation.c:3121
 #, 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:429
+#: parser/parse_relation.c:430
 #, c-format
 msgid "The combining JOIN type must be INNER or LEFT for a LATERAL reference."
 msgstr "Le type JOIN combiné doit être INNER ou LEFT pour une référence LATERAL."
 
-#: parser/parse_relation.c:705
+#: parser/parse_relation.c:706
 #, c-format
 msgid "system column \"%s\" reference in check constraint is invalid"
 msgstr "la référence de la colonne système « %s » dans la contrainte CHECK est invalide"
 
-#: parser/parse_relation.c:1065 parser/parse_relation.c:1345 parser/parse_relation.c:1847
+#: parser/parse_relation.c:1066 parser/parse_relation.c:1346 parser/parse_relation.c:1848
 #, 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"
 
-#: parser/parse_relation.c:1152
+#: parser/parse_relation.c:1153
 #, c-format
 msgid "There is a WITH item named \"%s\", but it cannot be referenced from this part of the query."
 msgstr ""
 "Il existe un élément WITH nommé « %s » mais il ne peut pas être\n"
 "référencée de cette partie de la requête."
 
-#: parser/parse_relation.c:1154
+#: parser/parse_relation.c:1155
 #, c-format
 msgid "Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
 msgstr ""
 "Utilisez WITH RECURSIVE ou ré-ordonnez les éléments WITH pour supprimer\n"
 "les références en avant."
 
-#: parser/parse_relation.c:1465
+#: parser/parse_relation.c:1466
 #, c-format
 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:1474
+#: parser/parse_relation.c:1475
 #, c-format
 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:1553
+#: parser/parse_relation.c:1554
 #, 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:1675
+#: parser/parse_relation.c:1676
 #, 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:1730
+#: parser/parse_relation.c:1731
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "les jointures peuvent avoir au plus %d colonnes"
 
-#: parser/parse_relation.c:1820
+#: parser/parse_relation.c:1821
 #, 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:2652 parser/parse_relation.c:2807
+#: parser/parse_relation.c:2738 parser/parse_relation.c:2900
 #, 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:3026
+#: parser/parse_relation.c:3119
 #, 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:3034
+#: parser/parse_relation.c:3127
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "entrée manquante de la clause FROM pour la table « %s »"
 
-#: parser/parse_relation.c:3086
+#: parser/parse_relation.c:3179
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\"."
 msgstr "Peut-être que vous souhaitiez référencer la colonne « %s.%s »."
 
-#: parser/parse_relation.c:3088
+#: parser/parse_relation.c:3181
 #, c-format
 msgid "There is a column named \"%s\" in table \"%s\", but it cannot be referenced from this part of the query."
 msgstr "Il existe une colonne nommée « %s » pour la table « %s » mais elle ne peut pas être référencée dans cette partie de la requête."
 
-#: parser/parse_relation.c:3105
+#: parser/parse_relation.c:3198
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\" or the column \"%s.%s\"."
 msgstr "Peut-être que vous souhaitiez référencer la colonne « %s.%s » ou la colonne « %s.%s »."
 
-#: parser/parse_target.c:421 parser/parse_target.c:713
+#: parser/parse_target.c:432 parser/parse_target.c:724
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "ne peut pas affecter à une colonne système « %s »"
 
-#: parser/parse_target.c:449
+#: parser/parse_target.c:460
 #, c-format
 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:454
+#: parser/parse_target.c:465
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "ne peut pas initialiser un sous-champ avec DEFAULT"
 
-#: parser/parse_target.c:523
+#: parser/parse_target.c:534
 #, 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:697
+#: parser/parse_target.c:708
 #, 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:706
+#: parser/parse_target.c:717
 #, 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:773
+#: parser/parse_target.c:784
 #, 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:783
+#: parser/parse_target.c:794
 #, 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:1199
+#: parser/parse_target.c:1210
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "Un SELECT * sans table spécifiée n'est pas valide"
@@ -13500,178 +13503,178 @@
 msgid "LIKE is not supported for creating foreign tables"
 msgstr "LIKE n'est pas supporté pour la création de tables distantes"
 
-#: parser/parse_utilcmd.c:1239 parser/parse_utilcmd.c:1315
+#: parser/parse_utilcmd.c:1241 parser/parse_utilcmd.c:1317
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "l'index « %s » contient une référence de table de ligne complète"
 
-#: parser/parse_utilcmd.c:1584
+#: parser/parse_utilcmd.c:1586
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "ne peut pas utiliser un index existant dans CREATE TABLE"
 
-#: parser/parse_utilcmd.c:1604
+#: parser/parse_utilcmd.c:1606
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "l'index « %s » est déjà associé à une contrainte"
 
-#: parser/parse_utilcmd.c:1612
+#: parser/parse_utilcmd.c:1614
 #, 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:1619
+#: parser/parse_utilcmd.c:1621
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "l'index « %s » n'est pas valide"
 
-#: parser/parse_utilcmd.c:1625
+#: parser/parse_utilcmd.c:1627
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "« %s » n'est pas un index unique"
 
-#: parser/parse_utilcmd.c:1626 parser/parse_utilcmd.c:1633 parser/parse_utilcmd.c:1640 parser/parse_utilcmd.c:1710
+#: parser/parse_utilcmd.c:1628 parser/parse_utilcmd.c:1635 parser/parse_utilcmd.c:1642 parser/parse_utilcmd.c:1712
 #, c-format
 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:1632
+#: parser/parse_utilcmd.c:1634
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "l'index « %s » contient des expressions"
 
-#: parser/parse_utilcmd.c:1639
+#: parser/parse_utilcmd.c:1641
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "« %s » est un index partiel"
 
-#: parser/parse_utilcmd.c:1651
+#: parser/parse_utilcmd.c:1653
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "« %s » est un index déferrable"
 
-#: parser/parse_utilcmd.c:1652
+#: parser/parse_utilcmd.c:1654
 #, c-format
 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:1709
+#: parser/parse_utilcmd.c:1711
 #, 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:1856
+#: parser/parse_utilcmd.c:1858
 #, 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:1862
+#: parser/parse_utilcmd.c:1864
 #, 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:2032
+#: parser/parse_utilcmd.c:2034
 #, c-format
 msgid "index expression cannot return a set"
 msgstr "l'expression de l'index ne peut pas renvoyer un ensemble"
 
-#: parser/parse_utilcmd.c:2043
+#: parser/parse_utilcmd.c:2045
 #, c-format
 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:2089
+#: parser/parse_utilcmd.c:2091
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "les règles ne sont pas supportés sur les vues matérialisées"
 
-#: parser/parse_utilcmd.c:2150
+#: parser/parse_utilcmd.c:2152
 #, c-format
 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:2222
+#: parser/parse_utilcmd.c:2224
 #, c-format
 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:2240 parser/parse_utilcmd.c:2339 rewrite/rewriteHandler.c:478 rewrite/rewriteManip.c:1015
+#: parser/parse_utilcmd.c:2242 parser/parse_utilcmd.c:2341 rewrite/rewriteHandler.c:478 rewrite/rewriteManip.c:1015
 #, c-format
 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:2258
+#: parser/parse_utilcmd.c:2260
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "la règle ON SELECT ne peut pas utiliser OLD"
 
-#: parser/parse_utilcmd.c:2262
+#: parser/parse_utilcmd.c:2264
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "la règle ON SELECT ne peut pas utiliser NEW"
 
-#: parser/parse_utilcmd.c:2271
+#: parser/parse_utilcmd.c:2273
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "la règle ON INSERT ne peut pas utiliser OLD"
 
-#: parser/parse_utilcmd.c:2277
+#: parser/parse_utilcmd.c:2279
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "la règle ON INSERT ne peut pas utiliser NEW"
 
-#: parser/parse_utilcmd.c:2305
+#: parser/parse_utilcmd.c:2307
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "ne peut référencer OLD dans une requête WITH"
 
-#: parser/parse_utilcmd.c:2312
+#: parser/parse_utilcmd.c:2314
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "ne peut référencer NEW dans une requête WITH"
 
-#: parser/parse_utilcmd.c:2515
+#: parser/parse_utilcmd.c:2517
 #, c-format
 msgid "transform expression must not return a set"
 msgstr "l'expression de transformation ne doit pas renvoyer un ensemble"
 
-#: parser/parse_utilcmd.c:2629
+#: parser/parse_utilcmd.c:2631
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "clause DEFERRABLE mal placée"
 
-#: parser/parse_utilcmd.c:2634 parser/parse_utilcmd.c:2649
+#: parser/parse_utilcmd.c:2636 parser/parse_utilcmd.c:2651
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "clauses DEFERRABLE/NOT DEFERRABLE multiples non autorisées"
 
-#: parser/parse_utilcmd.c:2644
+#: parser/parse_utilcmd.c:2646
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "clause NOT DEFERRABLE mal placée"
 
-#: parser/parse_utilcmd.c:2665
+#: parser/parse_utilcmd.c:2667
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "clause INITIALLY DEFERRED mal placée"
 
-#: parser/parse_utilcmd.c:2670 parser/parse_utilcmd.c:2696
+#: parser/parse_utilcmd.c:2672 parser/parse_utilcmd.c:2698
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "clauses INITIALLY IMMEDIATE/DEFERRED multiples non autorisées"
 
-#: parser/parse_utilcmd.c:2691
+#: parser/parse_utilcmd.c:2693
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "clause INITIALLY IMMEDIATE mal placée"
 
-#: parser/parse_utilcmd.c:2882
+#: parser/parse_utilcmd.c:2884
 #, 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)"
@@ -13723,17 +13726,17 @@
 "Vous pouvez avoir besoin d'augmenter la valeur SEMVMX par noyau pour valoir\n"
 "au moins de %d. Regardez dans la documentation de PostgreSQL pour les détails."
 
-#: port/pg_shmem.c:141 port/sysv_shmem.c:141
+#: port/pg_shmem.c:195 port/sysv_shmem.c:195
 #, c-format
 msgid "could not create shared memory segment: %m"
 msgstr "n'a pas pu créer le segment de mémoire partagée : %m"
 
-#: port/pg_shmem.c:142 port/sysv_shmem.c:142
+#: port/pg_shmem.c:196 port/sysv_shmem.c:196
 #, c-format
 msgid "Failed system call was shmget(key=%lu, size=%zu, 0%o)."
 msgstr "L'appel système qui a échoué était shmget(clé=%lu, taille=%zu, 0%o)."
 
-#: port/pg_shmem.c:146 port/sysv_shmem.c:146
+#: port/pg_shmem.c:200 port/sysv_shmem.c:200
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter, or possibly that it is less than your kernel's SHMMIN parameter.\n"
@@ -13742,7 +13745,7 @@
 "Cette erreur signifie habituellement que la demande de PostgreSQL pour un segment de mémoire partagée dépasse la valeur du paramètre SHMMAX du noyau, ou est plus petite\n"
 "que votre paramètre SHMMIN du noyau. La documentation PostgreSQL contient plus d'information  sur la configuration de la mémoire partagée."
 
-#: port/pg_shmem.c:153 port/sysv_shmem.c:153
+#: port/pg_shmem.c:207 port/sysv_shmem.c:207
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMALL parameter.  You might need to reconfigure the kernel with larger SHMALL.\n"
@@ -13751,7 +13754,7 @@
 "Cette erreur signifie habituellement que la demande de PostgreSQL pour un segment de mémoire partagée dépasse le paramètre SHMALL du noyau.  Vous pourriez avoir besoin de reconfigurer\n"
 "le noyau avec un SHMALL plus important. La documentation PostgreSQL contient plus d'information  sur la configuration de la mémoire partagée."
 
-#: port/pg_shmem.c:159 port/sysv_shmem.c:159
+#: port/pg_shmem.c:213 port/sysv_shmem.c:213
 #, 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.\n"
@@ -13760,17 +13763,12 @@
 "Cette erreur ne signifie *pas* que vous manquez d'espace disque. Elle survient si tous les identifiants de mémoire partagé disponibles ont été pris, auquel cas vous devez augmenter le paramètre SHMMNI de votre noyau, ou parce que la limite maximum de la mémoire partagée\n"
 "de votre système a été atteinte. La documentation de PostgreSQL contient plus d'informations sur la configuration de la mémoire partagée."
 
-#: port/pg_shmem.c:340 port/sysv_shmem.c:340
-#, c-format
-msgid "huge TLB pages not supported on this platform"
-msgstr "Huge Pages TLB non supporté sur cette plateforme."
-
-#: port/pg_shmem.c:390 port/sysv_shmem.c:390
+#: port/pg_shmem.c:504 port/sysv_shmem.c:504
 #, c-format
 msgid "could not map anonymous shared memory: %m"
 msgstr "n'a pas pu créer le segment de mémoire partagée anonyme : %m"
 
-#: port/pg_shmem.c:392 port/sysv_shmem.c:392
+#: port/pg_shmem.c:506 port/sysv_shmem.c:506
 #, c-format
 msgid "This error usually means that PostgreSQL's request for a shared memory segment exceeded available memory, swap space, or huge pages. To reduce the request size (currently %zu bytes), reduce PostgreSQL's shared memory usage, perhaps by reducing shared_buffers or max_connections."
 msgstr ""
@@ -13781,37 +13779,37 @@
 "valeur du paramètre shared_buffers de PostgreSQL ou le paramètre\n"
 "max_connections."
 
-#: port/pg_shmem.c:439 port/sysv_shmem.c:439 port/win32_shmem.c:134
+#: port/pg_shmem.c:572 port/sysv_shmem.c:572 port/win32_shmem.c:134
 #, c-format
 msgid "huge pages not supported on this platform"
 msgstr "Huge Pages non supporté sur cette plateforme"
 
-#: port/pg_shmem.c:553 port/sysv_shmem.c:553
+#: port/pg_shmem.c:667 port/sysv_shmem.c:667
 #, 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/win32/crashdump.c:108
+#: port/win32/crashdump.c:122
 #, c-format
 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/crashdump.c:116
+#: port/win32/crashdump.c:130
 #, c-format
 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/crashdump.c:147
+#: port/win32/crashdump.c:161
 #, c-format
 msgid "could not open crash dump file \"%s\" for writing: error code %lu\n"
 msgstr "n'a pas pu ouvrir le fichier « crashdump » « %s » en écriture : code d'erreur %lu\n"
 
-#: port/win32/crashdump.c:154
+#: port/win32/crashdump.c:168
 #, c-format
 msgid "wrote crash dump to file \"%s\"\n"
 msgstr "a écrit le « crash dump » dans le fichier « %s »\n"
 
-#: port/win32/crashdump.c:156
+#: port/win32/crashdump.c:170
 #, c-format
 msgid "could not write crash dump to file \"%s\": error code %lu\n"
 msgstr "n'a pas pu écrire le « crashdump » dans le fichier « %s » : code d'erreur %lu\n"
@@ -13833,19 +13831,19 @@
 "n'a pas pu obtenir le SID du groupe des utilisateurs avec pouvoir :\n"
 "code d'erreur %lu\n"
 
-#: port/win32/signal.c:193
+#: port/win32/signal.c:194
 #, c-format
 msgid "could not create signal listener pipe for PID %d: error code %lu"
 msgstr ""
 "n'a pas pu créer le tube d'écoute de signal pour l'identifiant de processus %d :\n"
 "code d'erreur %lu"
 
-#: port/win32/signal.c:273 port/win32/signal.c:305
+#: port/win32/signal.c:274 port/win32/signal.c:306
 #, c-format
 msgid "could not create signal listener pipe: error code %lu; retrying\n"
 msgstr "n'a pas pu créer le tube d'écoute de signal : code d'erreur %lu ; nouvelle tentative\n"
 
-#: port/win32/signal.c:316
+#: port/win32/signal.c:317
 #, c-format
 msgid "could not create signal dispatch thread: error code %lu\n"
 msgstr "n'a pas pu créer le thread de répartition des signaux : code d'erreur %lu\n"
@@ -13902,118 +13900,118 @@
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "L'appel système qui a échoué était MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:377
+#: postmaster/autovacuum.c:380
 #, c-format
 msgid "could not fork autovacuum launcher process: %m"
 msgstr "n'a pas pu exécuter le processus autovacuum maître : %m"
 
-#: postmaster/autovacuum.c:413
+#: postmaster/autovacuum.c:416
 #, c-format
 msgid "autovacuum launcher started"
 msgstr "lancement du processus autovacuum"
 
-#: postmaster/autovacuum.c:775
+#: postmaster/autovacuum.c:779
 #, c-format
 msgid "autovacuum launcher shutting down"
 msgstr "arrêt du processus autovacuum"
 
-#: postmaster/autovacuum.c:1443
+#: postmaster/autovacuum.c:1447
 #, 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:1639
+#: postmaster/autovacuum.c:1643
 #, c-format
 msgid "autovacuum: processing database \"%s\""
 msgstr "autovacuum : traitement de la base de données « %s »"
 
-#: postmaster/autovacuum.c:2051
+#: postmaster/autovacuum.c:2058
 #, 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:2063
+#: postmaster/autovacuum.c:2070
 #, 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:2346
+#: postmaster/autovacuum.c:2355
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "VACUUM automatique de la table « %s.%s.%s »"
 
-#: postmaster/autovacuum.c:2349
+#: postmaster/autovacuum.c:2358
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "ANALYZE automatique de la table « %s.%s.%s »"
 
-#: postmaster/autovacuum.c:2877
+#: postmaster/autovacuum.c:2907
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "autovacuum non exécuté à cause d'une mauvaise configuration"
 
-#: postmaster/autovacuum.c:2878
+#: postmaster/autovacuum.c:2908
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "Activez l'option « track_counts »."
 
-#: postmaster/bgworker.c:346 postmaster/bgworker.c:746
+#: postmaster/bgworker.c:366 postmaster/bgworker.c:770
 #, c-format
 msgid "registering background worker \"%s\""
 msgstr "enregistrement du processus en tâche de fond « %s »"
 
-#: postmaster/bgworker.c:375
+#: postmaster/bgworker.c:395
 #, c-format
 msgid "unregistering background worker \"%s\""
 msgstr "désenregistrement du processus en tâche de fond « %s »"
 
-#: postmaster/bgworker.c:484
+#: postmaster/bgworker.c:504
 #, c-format
 msgid "background worker \"%s\": must attach to shared memory in order to request a database connection"
 msgstr "processus en tâche de fond « %s » : doit se lier à la mémoire partagée pour être capable de demander une connexion à une base"
 
-#: postmaster/bgworker.c:493
+#: postmaster/bgworker.c:513
 #, c-format
 msgid "background worker \"%s\": cannot request database access if starting at postmaster start"
 msgstr "processus en tâche de fond « %s » : ne peut pas réclamer un accès à la base s'il s'exécute au lancement de postmaster"
 
-#: postmaster/bgworker.c:507
+#: postmaster/bgworker.c:527
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "processus en tâche de fond « %s »: intervalle de redémarrage invalide"
 
-#: postmaster/bgworker.c:552
+#: postmaster/bgworker.c:572
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "arrêt du processus en tâche de fond « %s » suite à la demande de l'administrateur"
 
-#: postmaster/bgworker.c:753
+#: postmaster/bgworker.c:777
 #, c-format
 msgid "background worker \"%s\": must be registered in shared_preload_libraries"
 msgstr "processus en tâche de fond « %s » : doit être enregistré dans shared_preload_libraries"
 
-#: postmaster/bgworker.c:765
+#: postmaster/bgworker.c:789
 #, c-format
 msgid "background worker \"%s\": only dynamic background workers can request notification"
 msgstr "processus en tâche de fond « %s » : seuls les processus utilisateurs en tâche de fond dynamiques peuvent réclamer des notifications"
 
-#: postmaster/bgworker.c:780
+#: postmaster/bgworker.c:804
 #, c-format
 msgid "too many background workers"
 msgstr "trop de processus en tâche de fond"
 
-#: postmaster/bgworker.c:781
+#: postmaster/bgworker.c:805
 #, c-format
 msgid "Up to %d background worker can be registered with the current settings."
 msgid_plural "Up to %d background workers can be registered with the current settings."
 msgstr[0] "Un maximum de %d processus en tâche de fond peut être enregistré avec la configuration actuelle"
 msgstr[1] "Un maximum de %d processus en tâche de fond peut être enregistré avec la configuration actuelle"
 
-#: postmaster/bgworker.c:785
+#: postmaster/bgworker.c:809
 #, c-format
 msgid "Consider increasing the configuration parameter \"max_worker_processes\"."
 msgstr "Considérez l'augmentation du paramètre « max_worker_processes »."
@@ -14086,7 +14084,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:598 postmaster/postmaster.c:3459
+#: postmaster/pgarch.c:598 postmaster/postmaster.c:3484
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr ""
@@ -14118,318 +14116,318 @@
 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:356
+#: postmaster/pgstat.c:358
 #, c-format
 msgid "could not resolve \"localhost\": %s"
 msgstr "n'a pas pu résoudre « localhost » : %s"
 
-#: postmaster/pgstat.c:379
+#: postmaster/pgstat.c:381
 #, c-format
 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:388
+#: postmaster/pgstat.c:390
 #, 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:400
+#: postmaster/pgstat.c:402
 #, 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:411
+#: postmaster/pgstat.c:413
 #, 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:427
+#: postmaster/pgstat.c:429
 #, 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:448
+#: postmaster/pgstat.c:450
 #, 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:474
+#: postmaster/pgstat.c:476
 #, c-format
 msgid "select() failed in statistics collector: %m"
 msgstr "échec du select() dans le récupérateur de statistiques : %m"
 
-#: postmaster/pgstat.c:489
+#: postmaster/pgstat.c:491
 #, c-format
 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:504
+#: postmaster/pgstat.c:506
 #, 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:514
+#: postmaster/pgstat.c:516
 #, c-format
 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:537
+#: postmaster/pgstat.c:539
 #, 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:547
+#: postmaster/pgstat.c:578
 #, c-format
 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:694
+#: postmaster/pgstat.c:725
 #, 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:1233 postmaster/pgstat.c:1257 postmaster/pgstat.c:1290
+#: postmaster/pgstat.c:1264 postmaster/pgstat.c:1288 postmaster/pgstat.c:1321
 #, c-format
 msgid "must be superuser to reset statistics counters"
 msgstr "doit être super-utilisateur pour réinitialiser les compteurs statistiques"
 
-#: postmaster/pgstat.c:1266
+#: postmaster/pgstat.c:1297
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "cible reset non reconnu : « %s »"
 
-#: postmaster/pgstat.c:1267
+#: postmaster/pgstat.c:1298
 #, c-format
 msgid "Target must be \"archiver\" or \"bgwriter\"."
 msgstr "La cible doit être « archiver » ou « bgwriter »."
 
-#: postmaster/pgstat.c:3425
+#: postmaster/pgstat.c:3465
 #, c-format
 msgid "could not read statistics message: %m"
 msgstr "n'a pas pu lire le message des statistiques : %m"
 
-#: postmaster/pgstat.c:3756 postmaster/pgstat.c:3933
+#: postmaster/pgstat.c:3796 postmaster/pgstat.c:3953
 #, 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:3824 postmaster/pgstat.c:3978
+#: postmaster/pgstat.c:3863 postmaster/pgstat.c:3998
 #, 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:3833 postmaster/pgstat.c:3987
+#: postmaster/pgstat.c:3872 postmaster/pgstat.c:4007
 #, 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:3841 postmaster/pgstat.c:3995
+#: postmaster/pgstat.c:3880 postmaster/pgstat.c:4015
 #, 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:4077 postmaster/pgstat.c:4260 postmaster/pgstat.c:4415
+#: postmaster/pgstat.c:4104 postmaster/pgstat.c:4310 postmaster/pgstat.c:4463
 #, 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:4089 postmaster/pgstat.c:4099 postmaster/pgstat.c:4109 postmaster/pgstat.c:4130 postmaster/pgstat.c:4145 postmaster/pgstat.c:4201 postmaster/pgstat.c:4272 postmaster/pgstat.c:4292 postmaster/pgstat.c:4310 postmaster/pgstat.c:4326 postmaster/pgstat.c:4344 postmaster/pgstat.c:4360 postmaster/pgstat.c:4427 postmaster/pgstat.c:4439 postmaster/pgstat.c:4451 postmaster/pgstat.c:4476 postmaster/pgstat.c:4498
+#: postmaster/pgstat.c:4116 postmaster/pgstat.c:4126 postmaster/pgstat.c:4147 postmaster/pgstat.c:4169 postmaster/pgstat.c:4184 postmaster/pgstat.c:4247 postmaster/pgstat.c:4322 postmaster/pgstat.c:4342 postmaster/pgstat.c:4360 postmaster/pgstat.c:4376 postmaster/pgstat.c:4394 postmaster/pgstat.c:4410 postmaster/pgstat.c:4475 postmaster/pgstat.c:4487 postmaster/pgstat.c:4499 postmaster/pgstat.c:4524 postmaster/pgstat.c:4546
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "fichier de statistiques « %s » corrompu"
 
-#: postmaster/pgstat.c:4615
+#: postmaster/pgstat.c:4675
 #, c-format
 msgid "using stale statistics instead of current ones because stats collector is not responding"
 msgstr ""
 "utilise de vieilles statistiques à la place des actuelles car le collecteur de\n"
 "statistiques ne répond pas"
 
-#: postmaster/pgstat.c:4933
+#: postmaster/pgstat.c:5004
 #, c-format
 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:670
+#: postmaster/postmaster.c:685
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
 msgstr "%s : argument invalide pour l'option -f : « %s »\n"
 
-#: postmaster/postmaster.c:756
+#: postmaster/postmaster.c:771
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
 msgstr "%s : argument invalide pour l'option -t : « %s »\n"
 
-#: postmaster/postmaster.c:807
+#: postmaster/postmaster.c:822
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s : argument invalide : « %s »\n"
 
-#: postmaster/postmaster.c:842
+#: postmaster/postmaster.c:861
 #, 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:847
+#: postmaster/postmaster.c:866
 #, c-format
 msgid "%s: max_wal_senders must be less than max_connections\n"
 msgstr "%s : max_wal_senders doit être inférieur à max_connections\n"
 
-#: postmaster/postmaster.c:852
+#: postmaster/postmaster.c:871
 #, c-format
 msgid "WAL archival cannot be enabled when wal_level is \"minimal\""
 msgstr "L'archivage des journaux de transactions ne peut pas être activé quand wal_level vaut « minimal »"
 
-#: postmaster/postmaster.c:855
+#: postmaster/postmaster.c:874
 #, c-format
 msgid "WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", \"hot_standby\", or \"logical\""
 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 », « hot_standby » ou « logical »"
 
-#: postmaster/postmaster.c:863
+#: postmaster/postmaster.c:882
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s : tables datetoken invalide, merci de corriger\n"
 
-#: postmaster/postmaster.c:955 postmaster/postmaster.c:1053 utils/init/miscinit.c:1400
+#: postmaster/postmaster.c:974 postmaster/postmaster.c:1072 utils/init/miscinit.c:1410
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "syntaxe de liste invalide pour le paramètre « %s »"
 
-#: postmaster/postmaster.c:986
+#: postmaster/postmaster.c:1005
 #, 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:992
+#: postmaster/postmaster.c:1011
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "n'a pas pu créer de socket TCP/IP"
 
-#: postmaster/postmaster.c:1075
+#: postmaster/postmaster.c:1094
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
 msgstr "n'a pas pu créer la socket de domaine Unix dans le répertoire « %s »"
 
-#: postmaster/postmaster.c:1081
+#: postmaster/postmaster.c:1100
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "n'a pas pu créer les sockets de domaine Unix"
 
-#: postmaster/postmaster.c:1093
+#: postmaster/postmaster.c:1112
 #, c-format
 msgid "no socket created for listening"
 msgstr "pas de socket créé pour l'écoute"
 
-#: postmaster/postmaster.c:1133
+#: postmaster/postmaster.c:1152
 #, c-format
 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:1162
+#: postmaster/postmaster.c:1181
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %s\n"
 msgstr "%s : n'a pas pu modifier les droits du fichier PID externe « %s » : %s\n"
 
-#: postmaster/postmaster.c:1166
+#: postmaster/postmaster.c:1185
 #, 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:1217
+#: postmaster/postmaster.c:1236
 #, c-format
 msgid "ending log output to stderr"
 msgstr "arrêt des traces sur stderr"
 
-#: postmaster/postmaster.c:1218
+#: postmaster/postmaster.c:1237
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
 msgstr "Les traces suivantes iront sur « %s »."
 
-#: postmaster/postmaster.c:1244 utils/init/postinit.c:200
+#: postmaster/postmaster.c:1263 utils/init/postinit.c:200
 #, c-format
 msgid "could not load pg_hba.conf"
 msgstr "n'a pas pu charger pg_hba.conf"
 
-#: postmaster/postmaster.c:1270
+#: postmaster/postmaster.c:1289
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "le postmaster est devenu multithreadé lors du démarrage"
 
-#: postmaster/postmaster.c:1271
+#: postmaster/postmaster.c:1290
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "Configurez la variable d'environnement LC_ALL avec une locale valide."
 
-#: postmaster/postmaster.c:1368
+#: postmaster/postmaster.c:1387
 #, 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:1391 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1410 utils/misc/tzparser.c:341
 #, 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:1419
+#: postmaster/postmaster.c:1438
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "le répertoire des données « %s » n'existe pas"
 
-#: postmaster/postmaster.c:1424
+#: postmaster/postmaster.c:1443
 #, 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:1432
+#: postmaster/postmaster.c:1451
 #, 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:1448
+#: postmaster/postmaster.c:1467
 #, 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:1450
+#: postmaster/postmaster.c:1469
 #, c-format
 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:1470
+#: postmaster/postmaster.c:1489
 #, 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:1472
+#: postmaster/postmaster.c:1491
 #, c-format
 msgid "Permissions should be u=rwx (0700)."
 msgstr "Les droits devraient être u=rwx (0700)."
 
-#: postmaster/postmaster.c:1483
+#: postmaster/postmaster.c:1502
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -14440,376 +14438,386 @@
 "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:1660
+#: postmaster/postmaster.c:1679
 #, c-format
 msgid "select() failed in postmaster: %m"
 msgstr "échec de select() dans postmaster : %m"
 
-#: postmaster/postmaster.c:1810
+#: postmaster/postmaster.c:1834
 #, c-format
 msgid "performing immediate shutdown because data directory lock file is invalid"
-msgstr ""
+msgstr "exécution d'un arrêt immédiat car le fichier verrou du répertoire de données est invalide"
 
-#: postmaster/postmaster.c:1888 postmaster/postmaster.c:1919
+#: postmaster/postmaster.c:1912 postmaster/postmaster.c:1943
 #, c-format
 msgid "incomplete startup packet"
 msgstr "paquet de démarrage incomplet"
 
-#: postmaster/postmaster.c:1900
+#: postmaster/postmaster.c:1924
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "longueur invalide du paquet de démarrage"
 
-#: postmaster/postmaster.c:1958
+#: postmaster/postmaster.c:1982
 #, 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:1987
+#: postmaster/postmaster.c:2011
 #, 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:2050 utils/misc/guc.c:5484 utils/misc/guc.c:5577 utils/misc/guc.c:6869 utils/misc/guc.c:9566 utils/misc/guc.c:9600
+#: postmaster/postmaster.c:2074 utils/misc/guc.c:5484 utils/misc/guc.c:5577 utils/misc/guc.c:6874 utils/misc/guc.c:9597 utils/misc/guc.c:9631
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "valeur invalide pour le paramètre « %s » : « %s »"
 
-#: postmaster/postmaster.c:2053
+#: postmaster/postmaster.c:2077
 #, c-format
 msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
 msgstr "Les valeurs valides sont : « false », « 0 », « true », « 1 », « database »."
 
-#: postmaster/postmaster.c:2073
+#: postmaster/postmaster.c:2097
 #, c-format
 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:2101
+#: postmaster/postmaster.c:2125
 #, c-format
 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:2160
+#: postmaster/postmaster.c:2184
 #, c-format
 msgid "the database system is starting up"
 msgstr "le système de bases de données se lance"
 
-#: postmaster/postmaster.c:2165
+#: postmaster/postmaster.c:2189
 #, c-format
 msgid "the database system is shutting down"
 msgstr "le système de base de données s'arrête"
 
-#: postmaster/postmaster.c:2170
+#: postmaster/postmaster.c:2194
 #, c-format
 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:2175 storage/ipc/procarray.c:284 storage/ipc/sinvaladt.c:298 storage/lmgr/proc.c:334
+#: postmaster/postmaster.c:2199 storage/ipc/procarray.c:284 storage/ipc/sinvaladt.c:298 storage/lmgr/proc.c:334
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "désolé, trop de clients sont déjà connectés"
 
-#: postmaster/postmaster.c:2237
+#: postmaster/postmaster.c:2261
 #, 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:2245
+#: postmaster/postmaster.c:2269
 #, 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:2465
+#: postmaster/postmaster.c:2489
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "a reçu SIGHUP, rechargement des fichiers de configuration"
 
-#: postmaster/postmaster.c:2490
+#: postmaster/postmaster.c:2514
 #, c-format
 msgid "pg_hba.conf not reloaded"
 msgstr "pg_hba.conf non lu"
 
-#: postmaster/postmaster.c:2494
+#: postmaster/postmaster.c:2518
 #, c-format
 msgid "pg_ident.conf not reloaded"
 msgstr "pg_ident.conf non rechargé"
 
-#: postmaster/postmaster.c:2535
+#: postmaster/postmaster.c:2559
 #, c-format
 msgid "received smart shutdown request"
 msgstr "a reçu une demande d'arrêt intelligent"
 
-#: postmaster/postmaster.c:2587
+#: postmaster/postmaster.c:2611
 #, c-format
 msgid "received fast shutdown request"
 msgstr "a reçu une demande d'arrêt rapide"
 
-#: postmaster/postmaster.c:2613
+#: postmaster/postmaster.c:2637
 #, c-format
 msgid "aborting any active transactions"
 msgstr "annulation des transactions actives"
 
-#: postmaster/postmaster.c:2647
+#: postmaster/postmaster.c:2671
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "a reçu une demande d'arrêt immédiat"
 
-#: postmaster/postmaster.c:2708
+#: postmaster/postmaster.c:2732
 #, c-format
 msgid "shutdown at recovery target"
 msgstr "arrêt sur la cible de restauration"
 
-#: postmaster/postmaster.c:2724 postmaster/postmaster.c:2747
+#: postmaster/postmaster.c:2748 postmaster/postmaster.c:2771
 msgid "startup process"
 msgstr "processus de lancement"
 
-#: postmaster/postmaster.c:2727
+#: postmaster/postmaster.c:2751
 #, c-format
 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:2788
+#: postmaster/postmaster.c:2812
 #, c-format
 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:2803
+#: postmaster/postmaster.c:2827
 msgid "background writer process"
 msgstr "processus d'écriture en tâche de fond"
 
-#: postmaster/postmaster.c:2857
+#: postmaster/postmaster.c:2881
 msgid "checkpointer process"
 msgstr "processus checkpointer"
 
-#: postmaster/postmaster.c:2873
+#: postmaster/postmaster.c:2897
 msgid "WAL writer process"
 msgstr "processus d'écriture des journaux de transaction"
 
-#: postmaster/postmaster.c:2887
+#: postmaster/postmaster.c:2912
 msgid "WAL receiver process"
 msgstr "processus de réception des journaux de transaction"
 
-#: postmaster/postmaster.c:2902
+#: postmaster/postmaster.c:2927
 msgid "autovacuum launcher process"
 msgstr "processus de l'autovacuum"
 
-#: postmaster/postmaster.c:2917
+#: postmaster/postmaster.c:2942
 msgid "archiver process"
 msgstr "processus d'archivage"
 
-#: postmaster/postmaster.c:2933
+#: postmaster/postmaster.c:2958
 msgid "statistics collector process"
 msgstr "processus de récupération des statistiques"
 
-#: postmaster/postmaster.c:2947
+#: postmaster/postmaster.c:2972
 msgid "system logger process"
 msgstr "processus des journaux applicatifs"
 
-#: postmaster/postmaster.c:3009
+#: postmaster/postmaster.c:3034
 msgid "worker process"
 msgstr "processus de travail"
 
-#: postmaster/postmaster.c:3092 postmaster/postmaster.c:3112 postmaster/postmaster.c:3119 postmaster/postmaster.c:3137
+#: postmaster/postmaster.c:3117 postmaster/postmaster.c:3137 postmaster/postmaster.c:3144 postmaster/postmaster.c:3162
 msgid "server process"
 msgstr "processus serveur"
 
-#: postmaster/postmaster.c:3191
+#: postmaster/postmaster.c:3216
 #, c-format
 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:3447
+#: postmaster/postmaster.c:3472
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) quitte avec le code de sortie %d"
 
-#: postmaster/postmaster.c:3449 postmaster/postmaster.c:3460 postmaster/postmaster.c:3471 postmaster/postmaster.c:3480 postmaster/postmaster.c:3490
+#: postmaster/postmaster.c:3474 postmaster/postmaster.c:3485 postmaster/postmaster.c:3496 postmaster/postmaster.c:3505 postmaster/postmaster.c:3515
 #, c-format
 msgid "Failed process was running: %s"
 msgstr "Le processus qui a échoué exécutait : %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3457
+#: postmaster/postmaster.c:3482
 #, 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:3467
+#: postmaster/postmaster.c:3492
 #, 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:3478
+#: postmaster/postmaster.c:3503
 #, 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:3488
+#: postmaster/postmaster.c:3513
 #, 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:3675
+#: postmaster/postmaster.c:3700
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "le système de base de données a été arrêté anormalement"
 
-#: postmaster/postmaster.c:3715
+#: postmaster/postmaster.c:3740
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "tous les processus serveur se sont arrêtés, réinitialisation"
 
-#: postmaster/postmaster.c:3927
+#: postmaster/postmaster.c:3952
 #, 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:3969
+#: postmaster/postmaster.c:3994
 msgid "could not fork new process for connection: "
 msgstr "n'a pas pu lancer le nouveau processus fils pour la connexion : "
 
-#: postmaster/postmaster.c:4083
+#: postmaster/postmaster.c:4108
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "connexion reçue : hôte=%s port=%s"
 
-#: postmaster/postmaster.c:4088
+#: postmaster/postmaster.c:4113
 #, c-format
 msgid "connection received: host=%s"
 msgstr "connexion reçue : hôte=%s"
 
-#: postmaster/postmaster.c:4371
+#: postmaster/postmaster.c:4396
 #, 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:4931
+#: postmaster/postmaster.c:4549
+#, c-format
+msgid "giving up after too many tries to reserve shared memory"
+msgstr "abandon après plusieurs essais pour réserver la mémoire partagée"
+
+#: postmaster/postmaster.c:4550
+#, c-format
+msgid "This might be caused by ASLR or antivirus software."
+msgstr "Ceci pourrait être dû à un logiciel ASLR ou à un antivirus."
+
+#: postmaster/postmaster.c:4943
 #, c-format
 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:5214
+#: postmaster/postmaster.c:5228
 #, 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:5218
+#: postmaster/postmaster.c:5232
 #, 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:5222
+#: postmaster/postmaster.c:5236
 #, c-format
 msgid "could not fork checkpointer process: %m"
 msgstr "n'a pas pu créer le processus checkpointer : %m"
 
-#: postmaster/postmaster.c:5226
+#: postmaster/postmaster.c:5240
 #, 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:5230
+#: postmaster/postmaster.c:5244
 #, 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:5234
+#: postmaster/postmaster.c:5248
 #, c-format
 msgid "could not fork process: %m"
 msgstr "n'a pas pu lancer le processus fils : %m"
 
-#: postmaster/postmaster.c:5396 postmaster/postmaster.c:5419
+#: postmaster/postmaster.c:5428 postmaster/postmaster.c:5451
 #, c-format
 msgid "database connection requirement not indicated during registration"
 msgstr "pré-requis de la connexion à la base non indiqué lors de l'enregistrement"
 
-#: postmaster/postmaster.c:5403 postmaster/postmaster.c:5426
+#: postmaster/postmaster.c:5435 postmaster/postmaster.c:5458
 #, c-format
 msgid "invalid processing mode in background worker"
 msgstr "mode de traitement invalide dans le processus en tâche de fond"
 
-#: postmaster/postmaster.c:5478
+#: postmaster/postmaster.c:5530
 #, c-format
 msgid "starting background worker process \"%s\""
 msgstr "démarrage du processus d'écriture en tâche de fond « %s »"
 
-#: postmaster/postmaster.c:5489
+#: postmaster/postmaster.c:5542
 #, c-format
 msgid "could not fork worker process: %m"
 msgstr "n'a pas pu créer un processus fils du processus en tâche de fond : %m"
 
-#: postmaster/postmaster.c:5865
+#: postmaster/postmaster.c:5942
 #, 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:5897
+#: postmaster/postmaster.c:5974
 #, 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:5926
+#: postmaster/postmaster.c:6003
 #, c-format
 msgid "could not open backend variables file \"%s\": %s\n"
 msgstr "n'a pas pu ouvrir le fichier des variables moteurs « %s » : %s\n"
 
-#: postmaster/postmaster.c:5933
+#: postmaster/postmaster.c:6010
 #, 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:5942
+#: postmaster/postmaster.c:6019
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "n'a pas pu supprimer le fichier « %s » : %s\n"
 
-#: postmaster/postmaster.c:5959
+#: postmaster/postmaster.c:6036
 #, c-format
 msgid "could not map view of backend variables: error code %lu\n"
 msgstr ""
 "n'a pas pu exécuter \"map\" la vue des variables serveurs : code\n"
 "d'erreur %lu\n"
 
-#: postmaster/postmaster.c:5968
+#: postmaster/postmaster.c:6045
 #, c-format
 msgid "could not unmap view of backend variables: error code %lu\n"
 msgstr ""
 "n'a pas pu exécuter \"unmap\" sur la vue des variables serveurs : code\n"
 "d'erreur %lu\n"
 
-#: postmaster/postmaster.c:5975
+#: postmaster/postmaster.c:6052
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %lu\n"
 msgstr ""
 "n'a pas pu fermer le lien vers les variables des paramètres du serveur :\n"
 "code d'erreur %lu\n"
 
-#: postmaster/postmaster.c:6134
+#: postmaster/postmaster.c:6211
 #, c-format
 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:6139
+#: postmaster/postmaster.c:6216
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "n'a pas pu poster le statut de fin de l'enfant\n"
@@ -14883,7 +14891,7 @@
 msgid "invalid streaming start location"
 msgstr "emplacement de démarrage du flux de réplication invalide"
 
-#: repl_scanner.l:170 scan.l:667
+#: repl_scanner.l:170 scan.l:668
 msgid "unterminated quoted string"
 msgstr "chaîne entre guillemets non terminée"
 
@@ -14892,59 +14900,59 @@
 msgid "syntax error: unexpected character \"%s\""
 msgstr "erreur de syntaxe : caractère « %s » inattendu"
 
-#: replication/basebackup.c:227
+#: replication/basebackup.c:229
 #, c-format
 msgid "could not stat control file \"%s\": %m"
 msgstr "n'a pas pu récupérer des informations sur le fichier de contrôle « %s » : %m"
 
-#: replication/basebackup.c:336
+#: replication/basebackup.c:338
 #, c-format
 msgid "could not find any WAL files"
 msgstr "n'a pas pu trouver un seul fichier WAL"
 
-#: replication/basebackup.c:349 replication/basebackup.c:363 replication/basebackup.c:372
+#: replication/basebackup.c:351 replication/basebackup.c:365 replication/basebackup.c:374
 #, c-format
 msgid "could not find WAL file \"%s\""
 msgstr "n'a pas pu trouver le fichier WAL « %s »"
 
-#: replication/basebackup.c:411 replication/basebackup.c:437
+#: replication/basebackup.c:413 replication/basebackup.c:439
 #, c-format
 msgid "unexpected WAL file size \"%s\""
 msgstr "taille du fichier WAL « %s » inattendue"
 
-#: replication/basebackup.c:423 replication/basebackup.c:1169
+#: replication/basebackup.c:425 replication/basebackup.c:1157
 #, c-format
 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:525 replication/basebackup.c:534 replication/basebackup.c:543 replication/basebackup.c:552 replication/basebackup.c:561 replication/basebackup.c:572 replication/basebackup.c:589
+#: replication/basebackup.c:527 replication/basebackup.c:536 replication/basebackup.c:545 replication/basebackup.c:554 replication/basebackup.c:563 replication/basebackup.c:574 replication/basebackup.c:591
 #, c-format
 msgid "duplicate option \"%s\""
 msgstr "option « %s » dupliquée"
 
-#: replication/basebackup.c:578 utils/misc/guc.c:5494
+#: replication/basebackup.c:580 utils/misc/guc.c:5494
 #, 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)"
 
-#: replication/basebackup.c:852 replication/basebackup.c:954
+#: replication/basebackup.c:854 replication/basebackup.c:956
 #, 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:1121
+#: replication/basebackup.c:1109
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "ignore le fichier spécial « %s »"
 
-#: replication/basebackup.c:1232
+#: replication/basebackup.c:1220
 #, c-format
 msgid "file name too long for tar format: \"%s\""
 msgstr "nom du fichier trop long pour le format tar : « %s »"
 
-#: replication/basebackup.c:1237
+#: replication/basebackup.c:1225
 #, c-format
 msgid "symbolic link target too long for tar format: file name \"%s\", target \"%s\""
 msgstr "cible du lien symbolique trop long pour le format tar  : nom de fichier « %s », cible « %s »"
@@ -15027,12 +15035,12 @@
 msgid "socket not open"
 msgstr "socket non ouvert"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:507 replication/libpqwalreceiver/libpqwalreceiver.c:530 replication/libpqwalreceiver/libpqwalreceiver.c:536
+#: replication/libpqwalreceiver/libpqwalreceiver.c:513 replication/libpqwalreceiver/libpqwalreceiver.c:536 replication/libpqwalreceiver/libpqwalreceiver.c:542
 #, 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:555
+#: replication/libpqwalreceiver/libpqwalreceiver.c:561
 #, c-format
 msgid "could not send data to WAL stream: %s"
 msgstr "n'a pas pu transmettre les données au flux WAL : %s"
@@ -15052,42 +15060,42 @@
 msgid "logical decoding cannot be used while in recovery"
 msgstr "le décodage logique ne peut pas être utilisé lors de la restauration"
 
-#: replication/logical/logical.c:234 replication/logical/logical.c:383
+#: replication/logical/logical.c:237 replication/logical/logical.c:395
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr "ne peut pas utiliser un slot de réplication physique pour le décodage logique"
 
-#: replication/logical/logical.c:239 replication/logical/logical.c:388
+#: replication/logical/logical.c:242 replication/logical/logical.c:400
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "le slot de réplication « %s » n'a pas été créé dans cette base de données"
 
-#: replication/logical/logical.c:246
+#: replication/logical/logical.c:249
 #, c-format
 msgid "cannot create logical replication slot in transaction that has performed writes"
 msgstr "ne peut pas créer un slot de réplication logique dans une transaction qui a fait des écritures"
 
-#: replication/logical/logical.c:425
+#: replication/logical/logical.c:437
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "début du décodage logique pour le slot « %s »"
 
-#: replication/logical/logical.c:427
+#: replication/logical/logical.c:439
 #, c-format
 msgid "streaming transactions committing after %X/%X, reading WAL from %X/%X"
 msgstr "envoi des transactions validées après %X/%X, lecture des journaux à partir de %X/%X"
 
-#: replication/logical/logical.c:562
+#: replication/logical/logical.c:574
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback, associated LSN %X/%X"
 msgstr "slot « %s », plugin de sortie « %s », dans la fonction d'appel %s, associé au LSN %X/%X"
 
-#: replication/logical/logical.c:569
+#: replication/logical/logical.c:581
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr "slot « %s », plugin de sortie « %s », dans la fonction d'appel %s"
 
-#: replication/logical/logicalfuncs.c:192 replication/walsender.c:2129
+#: replication/logical/logicalfuncs.c:192 replication/walsender.c:2171
 #, c-format
 msgid "could not read from log segment %s, offset %u, length %lu: %m"
 msgstr "n'a pas pu lire le journal de transactions %s, décalage %u, longueur %lu : %m"
@@ -15145,157 +15153,150 @@
 msgstr "ne peut pas manipuler les origines de réplication lors d'une restauration"
 
 #: replication/logical/origin.c:316
-#, fuzzy, c-format
-#| msgid "could not find parent extension for %s\n"
+#, c-format
 msgid "could not find free replication origin OID"
-msgstr "n'a pas pu trouver l'extension parent pour %s\n"
+msgstr "n'a pas pu trouver l'OID d'une origine de réplication libre"
 
 #: replication/logical/origin.c:353
 #, c-format
 msgid "could not drop replication origin with OID %d, in use by PID %d"
 msgstr "ne peut pas supprimer l'origine de réplication d'OID %d, utilisée par le PID %d"
 
-#: replication/logical/origin.c:690
+#: replication/logical/origin.c:674
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr "le checkpoint de réplication a le mauvais nombre magique (%u au lieu de %u)"
 
-#: replication/logical/origin.c:722
+#: replication/logical/origin.c:706
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
 msgstr "n'a pas pu lire le fichier « %s » : a lu %d sur %zu"
 
-#: replication/logical/origin.c:731
-#, fuzzy, c-format
-#| msgid "Free one or increase max_replication_slots."
+#: replication/logical/origin.c:715
+#, c-format
 msgid "could not find free replication state, increase max_replication_slots"
-msgstr "Libérez un slot ou augmentez max_replication_slots."
+msgstr "n'a pas pu trouver un état de réplication libre, augmentez max_replication_slots"
 
-#: replication/logical/origin.c:749
-#, fuzzy, c-format
-#| msgid "replication slot file \"%s\" has wrong magic %u instead of %u"
+#: replication/logical/origin.c:733
+#, c-format
 msgid "replication slot checkpoint has wrong checksum %u, expected %u"
-msgstr "le fichier « %s » du slot de réplication un le nombre magique %u au lieu de %u"
+msgstr "le checkpoint du slot de réplication a un mauvais checksum (%u au lieu de %u)"
 
-#: replication/logical/origin.c:873
-#, fuzzy, c-format
-#| msgid "replication slot \"%s\" is already active"
+#: replication/logical/origin.c:857
+#, c-format
 msgid "replication origin with OID %d is already active for PID %d"
-msgstr "le slot de réplication « %s » est déjà actif"
+msgstr "l'origine de réplication d'OID %d est déjà active pour le PID %d"
 
-#: replication/logical/origin.c:884 replication/logical/origin.c:1064
-#, fuzzy, c-format
-#| msgid "could not obtain lock on relation with OID %u"
+#: replication/logical/origin.c:868 replication/logical/origin.c:1048
+#, c-format
 msgid "could not find free replication state slot for replication origin with OID %u"
-msgstr "n'a pas pu obtenir un verrou sur la relation d'OID « %u »"
+msgstr "n'a pas pu trouver l'emplacement de l'état de réplication pour l'origine de réplication d'OID %u"
 
-#: replication/logical/origin.c:886 replication/logical/origin.c:1066 replication/slot.c:1241
+#: replication/logical/origin.c:870 replication/logical/origin.c:1050 replication/slot.c:1268
 #, c-format
 msgid "Increase max_replication_slots and try again."
 msgstr "Augmentez max_replication_slots et recommencez."
 
-#: replication/logical/origin.c:1023
+#: replication/logical/origin.c:1007
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "ne peut pas configurer l'origine de réplication si une origine existe déjà"
 
-#: replication/logical/origin.c:1052
+#: replication/logical/origin.c:1036
 #, c-format
 msgid "replication identifier %d is already active for PID %d"
 msgstr "l'identificateur de réplication %d est déjà actif pour le PID %d"
 
-#: replication/logical/origin.c:1098 replication/logical/origin.c:1293 replication/logical/origin.c:1313
+#: replication/logical/origin.c:1082 replication/logical/origin.c:1277 replication/logical/origin.c:1297
 #, c-format
 msgid "no replication origin is configured"
 msgstr "aucune origine de réplication n'est configurée"
 
-#: replication/logical/reorderbuffer.c:2170
+#: replication/logical/reorderbuffer.c:2220
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "n'a pas pu écrire dans le fichier pour le XID %u : %m"
 
-#: replication/logical/reorderbuffer.c:2266 replication/logical/reorderbuffer.c:2286
+#: replication/logical/reorderbuffer.c:2316 replication/logical/reorderbuffer.c:2336
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "n'a pas pu lire le fichier « reorderbuffer spill » : %m"
 
-#: replication/logical/reorderbuffer.c:2270 replication/logical/reorderbuffer.c:2290
+#: replication/logical/reorderbuffer.c:2320 replication/logical/reorderbuffer.c:2340
 #, c-format
 msgid "could not read from reorderbuffer spill file: read %d instead of %u bytes"
 msgstr ""
 "n'a pas pu lire à partir du fichier « reorderbuffer spill » : a lu seulement %d octets\n"
 "sur %u"
 
-#: replication/logical/reorderbuffer.c:2894
+#: replication/logical/reorderbuffer.c:2972
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr "n'a pas pu lire à partir du fichier « %s » : lu %d octets au lieu de %d octets"
 
-#: replication/logical/snapbuild.c:600
+#: replication/logical/snapbuild.c:648
 #, c-format
 msgid "exported logical decoding snapshot: \"%s\" with %u transaction ID"
 msgid_plural "exported logical decoding snapshot: \"%s\" with %u transaction IDs"
 msgstr[0] "snapshot exporté pour le décodage logique : « %s » avec %u identifiant de transaction"
 msgstr[1] "snapshot exporté pour le décodage logique : « %s » avec %u identifiants de transaction"
 
-#: replication/logical/snapbuild.c:904 replication/logical/snapbuild.c:1269 replication/logical/snapbuild.c:1800
+#: replication/logical/snapbuild.c:1226 replication/logical/snapbuild.c:1316 replication/logical/snapbuild.c:1791
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "le décodage logique a trouvé le point de cohérence à %X/%X"
 
-#: replication/logical/snapbuild.c:906
-#, c-format
-msgid "Transaction ID %u finished; no more running transactions."
-msgstr "Identifiant de transaction %u terminé ; plus de transactions en cours."
-
-#: replication/logical/snapbuild.c:1271
+#: replication/logical/snapbuild.c:1228
 #, c-format
 msgid "There are no running transactions."
 msgstr "Il n'existe pas de transactions en cours."
 
-#: replication/logical/snapbuild.c:1333
+#: replication/logical/snapbuild.c:1269
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr "le décodage logique a trouvé le point de démarrage à %X/%X"
 
-#: replication/logical/snapbuild.c:1335
+#: replication/logical/snapbuild.c:1271 replication/logical/snapbuild.c:1294
+#, c-format
+msgid "Waiting for transactions (approximately %d) older than %u to end."
+msgstr "En attente de la fin des transactions (approximativement %d) plus anciennes que %u."
+
+#: replication/logical/snapbuild.c:1292
 #, c-format
-msgid "%u transaction needs to finish."
-msgid_plural "%u transactions need to finish."
-msgstr[0] "La transaction %u doit se terminer."
-msgstr[1] "Les transactions %u doivent se terminer."
+msgid "logical decoding found initial consistent point at %X/%X"
+msgstr "le décodage logique a trouvé le point initial de cohérence à %X/%X"
 
-#: replication/logical/snapbuild.c:1674 replication/logical/snapbuild.c:1700 replication/logical/snapbuild.c:1714 replication/logical/snapbuild.c:1728
+#: replication/logical/snapbuild.c:1318
+#, c-format
+msgid "There are no old transactions anymore."
+msgstr "Il n'existe plus d'anciennes transactions."
+
+#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:1696 replication/logical/snapbuild.c:1711 replication/logical/snapbuild.c:1725
 #, c-format
 msgid "could not read file \"%s\", read %d of %d: %m"
 msgstr "n'a pas pu lire le fichier « %s », lu %d sur %d : %m"
 
-#: replication/logical/snapbuild.c:1680
-#, fuzzy, c-format
-#| msgid "snapbuild state file \"%s\" has wrong magic %u instead of %u"
+#: replication/logical/snapbuild.c:1676
+#, c-format
 msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
-msgstr "le fichier d'état snapbuild « %s » a le nombre magique %u au lieu de %u"
+msgstr "le fichier d'état snapbuild « %s » a un mauvais nombre magique : %u au lieu de %u"
 
-#: replication/logical/snapbuild.c:1685
-#, fuzzy, c-format
-#| msgid "snapbuild state file \"%s\" has unsupported version %u instead of %u"
+#: replication/logical/snapbuild.c:1681
+#, c-format
 msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
-msgstr "le fichier d'état snapbuild « %s » a une version %u non supportée au lieu de %u"
+msgstr "le fichier d'état snapbuild « %s » a une version non supportée : %u au lieu de %u"
 
-#: replication/logical/snapbuild.c:1741
-#, fuzzy, c-format
-#| msgid "snapbuild state file %s: checksum mismatch, is %u, should be %u"
+#: replication/logical/snapbuild.c:1738
+#, c-format
 msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
-msgstr ""
-"fichier d'état snapbuild %s : différence de somme de contrôle,\n"
-"est %u, devrait être %u"
+msgstr "différence de checksum pour le fichier d'état snapbuild « %s » : est %u, devrait être %u"
 
-#: replication/logical/snapbuild.c:1802
+#: replication/logical/snapbuild.c:1793
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "Le décodage logique commencera en utilisant un snapshot sauvegardé."
 
-#: replication/logical/snapbuild.c:1875
+#: replication/logical/snapbuild.c:1864
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "n'a pas pu analyser le mode du fichier « %s »"
@@ -15335,88 +15336,88 @@
 msgid "Free one or increase max_replication_slots."
 msgstr "Libérez un slot ou augmentez max_replication_slots."
 
-#: replication/slot.c:348
+#: replication/slot.c:358
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "le slot de réplication « %s » n'existe pas"
 
-#: replication/slot.c:352
+#: replication/slot.c:362
 #, c-format
 msgid "replication slot \"%s\" is already active for PID %d"
 msgstr "le slot de réplication « %s » est déjà actif pour le PID %d"
 
-#: replication/slot.c:501 replication/slot.c:857 replication/slot.c:1202
+#: replication/slot.c:527 replication/slot.c:884 replication/slot.c:1229
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "n'a pas pu supprimer le répertoire « %s »"
 
-#: replication/slot.c:776
+#: replication/slot.c:803
 #, c-format
 msgid "replication slots can only be used if max_replication_slots > 0"
 msgstr "les slots de réplications peuvent seulement être utilisés si max_replication_slots > 0"
 
-#: replication/slot.c:781
+#: replication/slot.c:808
 #, c-format
 msgid "replication slots can only be used if wal_level >= archive"
 msgstr "les slots de réplication peuvent seulement être utilisés si wal_level >= archive"
 
-#: replication/slot.c:1134 replication/slot.c:1172
+#: replication/slot.c:1161 replication/slot.c:1199
 #, c-format
 msgid "could not read file \"%s\", read %d of %u: %m"
 msgstr "n'a pas pu lire le fichier « %s », a lu %d sur %u : %m"
 
-#: replication/slot.c:1143
+#: replication/slot.c:1170
 #, c-format
 msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "le fichier « %s » du slot de réplication a le nombre magique %u au lieu de %u"
 
-#: replication/slot.c:1150
+#: replication/slot.c:1177
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "le fichier « %s » du slot de réplication a une version %u non supportée"
 
-#: replication/slot.c:1157
+#: replication/slot.c:1184
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "le slot de réplication « %s » a une taille %u corrompue"
 
-#: replication/slot.c:1187
+#: replication/slot.c:1214
 #, c-format
 msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
 msgstr "différence de somme de contrôle pour le fichier de slot de réplication « %s » : est %u, devrait être %u"
 
-#: replication/slot.c:1240
+#: replication/slot.c:1267
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "trop de slots de réplication actifs avant l'arrêt"
 
-#: replication/syncrep.c:199
+#: replication/syncrep.c:191
 #, c-format
 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:200 replication/syncrep.c:217
+#: replication/syncrep.c:192 replication/syncrep.c:209
 #, c-format
 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:216
+#: replication/syncrep.c:208
 #, c-format
 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:346
+#: replication/syncrep.c:341
 #, 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:480
+#: replication/syncrep.c:475
 #, 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"
@@ -15481,79 +15482,84 @@
 msgid "could not write to log segment %s at offset %u, length %lu: %m"
 msgstr "n'a pas pu écrire le journal de transactions %s au décalage %u, longueur %lu : %m"
 
-#: replication/walsender.c:483
+#: replication/walsender.c:488
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
 msgstr "n'a pas pu se déplacer au début du fichier « %s » : %m"
 
-#: replication/walsender.c:534
+#: replication/walsender.c:539
 #, c-format
 msgid "cannot use a logical replication slot for physical replication"
 msgstr "ne peut pas utiliser un slot de réplication logique pour une réplication physique"
 
-#: replication/walsender.c:597
+#: replication/walsender.c:602
 #, c-format
 msgid "requested starting point %X/%X on timeline %u is not in this server's history"
 msgstr "le point de reprise %X/%X de la timeline %u n'est pas dans l'historique du serveur"
 
-#: replication/walsender.c:601
+#: replication/walsender.c:606
 #, c-format
 msgid "This server's history forked from timeline %u at %X/%X."
 msgstr "L'historique du serveur a changé à partir de la timeline %u à %X/%X."
 
-#: replication/walsender.c:646
+#: replication/walsender.c:651
 #, c-format
 msgid "requested starting point %X/%X is ahead of the WAL flush position of this server %X/%X"
 msgstr "le point de reprise requis %X/%X est devant la position de vidage des WAL de ce serveur %X/%X"
 
-#: replication/walsender.c:965
+#: replication/walsender.c:968
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "arrêt du processus walreceiver suite promotion"
 
-#: replication/walsender.c:1292
+#: replication/walsender.c:1325
+#, c-format
+msgid "cannot execute new commands while WAL sender is in stopping mode"
+msgstr "ne peut pas exécuter de nouvelles commandes lorsque le walsender est en mode d'arrêt"
+
+#: replication/walsender.c:1333
 #, c-format
 msgid "received replication command: %s"
 msgstr "commande de réplication reçu : %s"
 
-#: replication/walsender.c:1385 replication/walsender.c:1401
+#: replication/walsender.c:1434 replication/walsender.c:1450
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "fin de fichier (EOF) inattendue de la connexion du serveur en attente"
 
-#: replication/walsender.c:1415
+#: replication/walsender.c:1464
 #, c-format
 msgid "unexpected standby message type \"%c\", after receiving CopyDone"
 msgstr "type de message standby « %c » inattendu, après avoir reçu CopyDone"
 
-#: replication/walsender.c:1453
+#: replication/walsender.c:1502
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "type de message « %c » invalide pour le serveur en standby"
 
-#: replication/walsender.c:1494
+#: replication/walsender.c:1543
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "type de message « %c » inattendu"
 
-#: replication/walsender.c:1781
+#: replication/walsender.c:1830
 #, c-format
 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:1874
+#: replication/walsender.c:1916
 #, c-format
 msgid "standby \"%s\" has now caught up with primary"
 msgstr "le serveur standby « %s » a maintenant rattrapé le serveur primaire"
 
-#: replication/walsender.c:1978
+#: replication/walsender.c:2020
 #, 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)"
 
-#: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:961
+#: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:973
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" already exists"
 msgstr "la règle « %s » existe déjà pour la relation « %s »"
@@ -15684,67 +15690,74 @@
 msgid "RETURNING list has too many entries"
 msgstr "la liste RETURNING a trop d'entrées"
 
-#: rewrite/rewriteDefine.c:684
+#: rewrite/rewriteDefine.c:695
 #, c-format
 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:690
+#: rewrite/rewriteDefine.c:696
+#, c-format
+msgid "cannot create a RETURNING list for a relation containing dropped columns"
+msgstr ""
+"ne peut pas créer une liste RETURNING pour la relation contenant les colonnes\n"
+"supprimées"
+
+#: rewrite/rewriteDefine.c:702
 #, c-format
 msgid "SELECT rule's target entry %d has different column name from column \"%s\""
 msgstr "l'entrée cible de la règle SELECT %d a un nom de colonne différent pour la colonne « %s »"
 
-#: rewrite/rewriteDefine.c:692
+#: rewrite/rewriteDefine.c:704
 #, c-format
 msgid "SELECT target entry is named \"%s\"."
 msgstr "l'entrée cible de la règle SELECT est nommé « %s »."
 
-#: rewrite/rewriteDefine.c:701
+#: rewrite/rewriteDefine.c:713
 #, 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:703
+#: rewrite/rewriteDefine.c:715
 #, 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:706 rewrite/rewriteDefine.c:730
+#: rewrite/rewriteDefine.c:718 rewrite/rewriteDefine.c:742
 #, c-format
 msgid "SELECT target entry has type %s, but column has type %s."
 msgstr "l'entrée de la liste SELECT a le type %s alors que la colonne a le type %s."
 
-#: rewrite/rewriteDefine.c:709 rewrite/rewriteDefine.c:734
+#: rewrite/rewriteDefine.c:721 rewrite/rewriteDefine.c:746
 #, c-format
 msgid "RETURNING list entry has type %s, but column has type %s."
 msgstr "l'entrée de la liste RETURNING a le type %s alors que la colonne a le type %s."
 
-#: rewrite/rewriteDefine.c:725
+#: rewrite/rewriteDefine.c:737
 #, 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:727
+#: rewrite/rewriteDefine.c:739
 #, 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:744
+#: rewrite/rewriteDefine.c:756
 #, c-format
 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:745
+#: rewrite/rewriteDefine.c:757
 #, c-format
 msgid "RETURNING list has too few entries"
 msgstr "la liste RETURNING n'a pas assez d'entrées"
 
-#: rewrite/rewriteDefine.c:837 rewrite/rewriteDefine.c:952 rewrite/rewriteSupport.c:112
+#: rewrite/rewriteDefine.c:849 rewrite/rewriteDefine.c:964 rewrite/rewriteSupport.c:112
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" does not exist"
 msgstr "la règle « %s » de la relation « %s » n'existe pas"
 
-#: rewrite/rewriteDefine.c:971
+#: rewrite/rewriteDefine.c:983
 #, c-format
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "le renommage d'une règle ON SELECT n'est pas autorisé"
@@ -15761,165 +15774,165 @@
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr "ne peut pas avoir des listes RETURNING dans plusieurs règles"
 
-#: rewrite/rewriteHandler.c:921 rewrite/rewriteHandler.c:939
+#: rewrite/rewriteHandler.c:942 rewrite/rewriteHandler.c:960
 #, c-format
 msgid "multiple assignments to same column \"%s\""
 msgstr "affectations multiples pour la même colonne « %s »"
 
-#: rewrite/rewriteHandler.c:1714 rewrite/rewriteHandler.c:3324
+#: rewrite/rewriteHandler.c:1745 rewrite/rewriteHandler.c:3355
 #, 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:1799
+#: rewrite/rewriteHandler.c:1830
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
 msgstr "récursion infinie détectée dans la politique pour la relation « %s »"
 
-#: rewrite/rewriteHandler.c:2116
+#: rewrite/rewriteHandler.c:2147
 msgid "Junk view columns are not updatable."
 msgstr "Les colonnes « junk » des vues ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2121
+#: rewrite/rewriteHandler.c:2152
 msgid "View columns that are not columns of their base relation are not updatable."
 msgstr "Les colonnes des vues qui ne font pas référence à des colonnes de la relation de base ne sont pas automatiquement modifiables."
 
-#: rewrite/rewriteHandler.c:2124
+#: rewrite/rewriteHandler.c:2155
 msgid "View columns that refer to system columns are not updatable."
 msgstr "Les colonnes des vues qui font référence à des colonnes systèmes ne sont pas automatiquement modifiables."
 
-#: rewrite/rewriteHandler.c:2127
+#: rewrite/rewriteHandler.c:2158
 msgid "View columns that return whole-row references are not updatable."
 msgstr "Les colonnes de vue qui font références à des lignes complètes ne sont pas automatiquement modifiables."
 
-#: rewrite/rewriteHandler.c:2185
+#: rewrite/rewriteHandler.c:2216
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "Les vues contenant DISTINCT ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2188
+#: rewrite/rewriteHandler.c:2219
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "Les vues contenant GROUP BY ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2191
+#: rewrite/rewriteHandler.c:2222
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "Les vues contenant HAVING ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2194
+#: rewrite/rewriteHandler.c:2225
 msgid "Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable."
 msgstr "Les vues contenant UNION, INTERSECT ou EXCEPT ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2197
+#: rewrite/rewriteHandler.c:2228
 msgid "Views containing WITH are not automatically updatable."
 msgstr "Les vues contenant WITH ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2200
+#: rewrite/rewriteHandler.c:2231
 msgid "Views containing LIMIT or OFFSET are not automatically updatable."
 msgstr "Les vues contenant LIMIT ou OFFSET ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2212
+#: rewrite/rewriteHandler.c:2243
 msgid "Views that return aggregate functions are not automatically updatable."
 msgstr "Les vues qui renvoient des fonctions d'agrégat ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2215
+#: rewrite/rewriteHandler.c:2246
 msgid "Views that return window functions are not automatically updatable."
 msgstr "Les vues qui renvoient des fonctions de fenêtrage ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2218
+#: rewrite/rewriteHandler.c:2249
 msgid "Views that return set-returning functions are not automatically updatable."
 msgstr "Les vues qui renvoient des fonctions à plusieurs lignes ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2225 rewrite/rewriteHandler.c:2229 rewrite/rewriteHandler.c:2236
+#: rewrite/rewriteHandler.c:2256 rewrite/rewriteHandler.c:2260 rewrite/rewriteHandler.c:2267
 msgid "Views that do not select from a single table or view are not automatically updatable."
 msgstr "Les vues qui lisent plusieurs tables ou vues ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2239
+#: rewrite/rewriteHandler.c:2270
 msgid "Views containing TABLESAMPLE are not automatically updatable."
 msgstr "Les vues contenant TABLESAMPLE ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2263
+#: rewrite/rewriteHandler.c:2294
 msgid "Views that have no updatable columns are not automatically updatable."
 msgstr "Les vues qui possèdent des colonnes non modifiables ne sont pas automatiquement disponibles en écriture."
 
-#: rewrite/rewriteHandler.c:2717
+#: rewrite/rewriteHandler.c:2748
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
 msgstr "ne peut pas insérer dans la colonne « %s » de la vue « %s »"
 
-#: rewrite/rewriteHandler.c:2725
+#: rewrite/rewriteHandler.c:2756
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "ne peut pas mettre à jour la colonne « %s » de la vue « %s »"
 
-#: rewrite/rewriteHandler.c:3123
+#: rewrite/rewriteHandler.c:3154
 #, c-format
 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:3137
+#: rewrite/rewriteHandler.c:3168
 #, c-format
 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:3141
+#: rewrite/rewriteHandler.c:3172
 #, c-format
 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:3146
+#: rewrite/rewriteHandler.c:3177
 #, c-format
 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:3361
+#: rewrite/rewriteHandler.c:3392
 #, 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:3363
+#: rewrite/rewriteHandler.c:3394
 #, c-format
 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:3368
+#: rewrite/rewriteHandler.c:3399
 #, 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:3370
+#: rewrite/rewriteHandler.c:3401
 #, c-format
 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:3375
+#: rewrite/rewriteHandler.c:3406
 #, 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:3377
+#: rewrite/rewriteHandler.c:3408
 #, c-format
 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:3395
+#: rewrite/rewriteHandler.c:3426
 #, c-format
 msgid "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or UPDATE rules"
 msgstr "INSERT avec une clause ON CONFLICT ne peut pas être utilisée avec une table qui a des règles pour INSERT ou UPDATE"
 
-#: rewrite/rewriteHandler.c:3452
+#: rewrite/rewriteHandler.c:3483
 #, c-format
 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"
@@ -15954,127 +15967,127 @@
 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."
 
-#: scan.l:432
+#: scan.l:433
 msgid "unterminated /* comment"
 msgstr "commentaire /* non terminé"
 
-#: scan.l:461
+#: scan.l:462
 msgid "unterminated bit string literal"
 msgstr "chaîne littérale bit non terminée"
 
-#: scan.l:482
+#: scan.l:483
 msgid "unterminated hexadecimal string literal"
 msgstr "chaîne littérale hexadécimale non terminée"
 
-#: scan.l:532
+#: scan.l:533
 #, c-format
 msgid "unsafe use of string constant with Unicode escapes"
 msgstr "utilisation non sûre de la constante de chaîne avec des échappements Unicode"
 
-#: scan.l:533
+#: scan.l:534
 #, c-format
 msgid "String constants with Unicode escapes cannot be used when standard_conforming_strings is off."
 msgstr ""
 "Les constantes de chaîne avec des échappements Unicode ne peuvent pas être\n"
 "utilisées quand standard_conforming_strings est désactivé."
 
-#: scan.l:577 scan.l:773
+#: scan.l:578 scan.l:774
 msgid "invalid Unicode escape character"
 msgstr "chaîne d'échappement Unicode invalide"
 
-#: scan.l:602 scan.l:610 scan.l:618 scan.l:619 scan.l:620 scan.l:1329 scan.l:1356 scan.l:1360 scan.l:1398 scan.l:1402 scan.l:1424
+#: scan.l:603 scan.l:611 scan.l:619 scan.l:620 scan.l:621 scan.l:1330 scan.l:1357 scan.l:1361 scan.l:1399 scan.l:1403 scan.l:1425 scan.l:1435
 msgid "invalid Unicode surrogate pair"
 msgstr "paire surrogate Unicode invalide"
 
-#: scan.l:624
+#: scan.l:625
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "échappement Unicode invalide"
 
-#: scan.l:625
+#: scan.l:626
 #, c-format
 msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
 msgstr "Les échappements Unicode doivent être de la forme \\uXXXX ou \\UXXXXXXXX."
 
-#: scan.l:636
+#: scan.l:637
 #, c-format
 msgid "unsafe use of \\' in a string literal"
 msgstr "utilisation non sûre de \\' dans une chaîne littérale"
 
-#: scan.l:637
+#: scan.l:638
 #, c-format
 msgid "Use '' to write quotes in strings. \\' is insecure in client-only encodings."
 msgstr ""
 "Utilisez '' pour écrire des guillemets dans une chaîne. \\' n'est pas sécurisé\n"
 "pour les encodages clients."
 
-#: scan.l:712
+#: scan.l:713
 msgid "unterminated dollar-quoted string"
 msgstr "chaîne entre guillemets dollars non terminée"
 
-#: scan.l:729 scan.l:753 scan.l:768
+#: scan.l:730 scan.l:754 scan.l:769
 msgid "zero-length delimited identifier"
 msgstr "identifiant délimité de longueur nulle"
 
-#: scan.l:788
+#: scan.l:789
 msgid "unterminated quoted identifier"
 msgstr "identifiant entre guillemets non terminé"
 
-#: scan.l:919
+#: scan.l:920
 msgid "operator too long"
 msgstr "opérateur trop long"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1072
+#: scan.l:1073
 #, 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"
-#: scan.l:1080
+#: scan.l:1081
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s sur ou près de « %s »"
 
-#: scan.l:1245 scan.l:1277
+#: scan.l:1246 scan.l:1278
 msgid "Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8"
 msgstr ""
 "Les valeurs d'échappement unicode ne peuvent pas être utilisées pour les\n"
 "valeurs de point de code au-dessus de 007F quand l'encodage serveur n'est\n"
 "pas UTF8"
 
-#: scan.l:1273 scan.l:1416
+#: scan.l:1274 scan.l:1417
 msgid "invalid Unicode escape value"
 msgstr "valeur d'échappement Unicode invalide"
 
-#: scan.l:1472
+#: scan.l:1481
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "utilisation non standard de \\' dans une chaîne littérale"
 
-#: scan.l:1473
+#: scan.l:1482
 #, c-format
 msgid "Use '' to write quotes in strings, or use the escape string syntax (E'...')."
 msgstr ""
 "Utilisez '' pour écrire des guillemets dans une chaîne ou utilisez la syntaxe de\n"
 "chaîne d'échappement (E'...')."
 
-#: scan.l:1482
+#: scan.l:1491
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "utilisation non standard de \\\\ dans une chaîne littérale"
 
-#: scan.l:1483
+#: scan.l:1492
 #, c-format
 msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
 msgstr "Utilisez la syntaxe de chaîne d'échappement pour les antislashs, c'est-à-dire E'\\\\'."
 
-#: scan.l:1497
+#: scan.l:1506
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "utilisation non standard d'un échappement dans une chaîne littérale"
 
-#: scan.l:1498
+#: scan.l:1507
 #, c-format
 msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
 msgstr ""
@@ -16130,17 +16143,17 @@
 msgid "invalid page in block %u of relation %s; zeroing out page"
 msgstr "page invalide dans le bloc %u de la relation %s ; remplacement de la page par des zéros"
 
-#: storage/buffer/bufmgr.c:3590
+#: storage/buffer/bufmgr.c:3595
 #, 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:3592
+#: storage/buffer/bufmgr.c:3597
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Échecs multiples --- l'erreur d'écriture pourrait être permanent."
 
-#: storage/buffer/bufmgr.c:3613 storage/buffer/bufmgr.c:3632
+#: storage/buffer/bufmgr.c:3618 storage/buffer/bufmgr.c:3637
 #, c-format
 msgid "writing block %u of relation %s"
 msgstr "écriture du bloc %u de la relation %s"
@@ -16150,52 +16163,57 @@
 msgid "no empty local buffer available"
 msgstr "aucun tampon local vide disponible"
 
-#: storage/file/fd.c:528
+#: storage/file/fd.c:548
+#, c-format
+msgid "could not link file \"%s\" to \"%s\": %m"
+msgstr "n'a pas pu lier le fichier « %s » à « %s » : %m"
+
+#: storage/file/fd.c:642
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "échec de getrlimit : %m"
 
-#: storage/file/fd.c:618
+#: storage/file/fd.c:732
 #, c-format
 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:619
+#: storage/file/fd.c:733
 #, 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:660 storage/file/fd.c:1694 storage/file/fd.c:1787 storage/file/fd.c:1935
+#: storage/file/fd.c:774 storage/file/fd.c:1878 storage/file/fd.c:1971 storage/file/fd.c:2119
 #, 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:1234
+#: storage/file/fd.c:1379
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "fichier temporaire : chemin « %s », taille %lu"
 
-#: storage/file/fd.c:1383
+#: storage/file/fd.c:1551
 #, c-format
 msgid "temporary file size exceeds temp_file_limit (%dkB)"
 msgstr "la taille du fichier temporaire dépasse temp_file_limit (%d Ko)"
 
-#: storage/file/fd.c:1670 storage/file/fd.c:1720
+#: storage/file/fd.c:1854 storage/file/fd.c:1904
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
 msgstr "dépassement de maxAllocatedDescs (%d) lors de la tentative d'ouverture du fichier « %s »"
 
-#: storage/file/fd.c:1760
+#: storage/file/fd.c:1944
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
 msgstr "dépassement de maxAllocatedDescs (%d) lors de la tentative d'exécution de la commande « %s »"
 
-#: storage/file/fd.c:1911
+#: storage/file/fd.c:2095
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
 msgstr "dépassement de maxAllocatedDescs (%d) lors de la tentative d'ouverture du répertoire « %s »"
 
-#: storage/file/fd.c:1997
+#: storage/file/fd.c:2181
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
@@ -16225,32 +16243,32 @@
 msgid "too many dynamic shared memory segments"
 msgstr "trop de segments de mémoire partagée dynamique"
 
-#: storage/ipc/dsm_impl.c:261 storage/ipc/dsm_impl.c:361 storage/ipc/dsm_impl.c:533 storage/ipc/dsm_impl.c:648 storage/ipc/dsm_impl.c:811 storage/ipc/dsm_impl.c:953
+#: storage/ipc/dsm_impl.c:261 storage/ipc/dsm_impl.c:361 storage/ipc/dsm_impl.c:533 storage/ipc/dsm_impl.c:648 storage/ipc/dsm_impl.c:819 storage/ipc/dsm_impl.c:961
 #, c-format
 msgid "could not unmap shared memory segment \"%s\": %m"
 msgstr "n'a pas pu annuler le mappage du segment de mémoire partagée « %s » : %m"
 
-#: storage/ipc/dsm_impl.c:271 storage/ipc/dsm_impl.c:543 storage/ipc/dsm_impl.c:658 storage/ipc/dsm_impl.c:821
+#: storage/ipc/dsm_impl.c:271 storage/ipc/dsm_impl.c:543 storage/ipc/dsm_impl.c:658 storage/ipc/dsm_impl.c:829
 #, c-format
 msgid "could not remove shared memory segment \"%s\": %m"
 msgstr "n'a pas pu supprimer le segment de mémoire partagée « %s » : %m"
 
-#: storage/ipc/dsm_impl.c:292 storage/ipc/dsm_impl.c:721 storage/ipc/dsm_impl.c:835
+#: storage/ipc/dsm_impl.c:292 storage/ipc/dsm_impl.c:729 storage/ipc/dsm_impl.c:843
 #, c-format
 msgid "could not open shared memory segment \"%s\": %m"
 msgstr "n'a pas pu ouvrir le segment de mémoire partagée « %s » : %m"
 
-#: storage/ipc/dsm_impl.c:316 storage/ipc/dsm_impl.c:559 storage/ipc/dsm_impl.c:766 storage/ipc/dsm_impl.c:859
+#: storage/ipc/dsm_impl.c:316 storage/ipc/dsm_impl.c:559 storage/ipc/dsm_impl.c:774 storage/ipc/dsm_impl.c:867
 #, c-format
 msgid "could not stat shared memory segment \"%s\": %m"
 msgstr "n'a pas pu obtenir des informations sur le segment de mémoire partagée « %s » : %m"
 
-#: storage/ipc/dsm_impl.c:335 storage/ipc/dsm_impl.c:878 storage/ipc/dsm_impl.c:926
+#: storage/ipc/dsm_impl.c:335 storage/ipc/dsm_impl.c:886 storage/ipc/dsm_impl.c:934
 #, c-format
 msgid "could not resize shared memory segment \"%s\" to %zu bytes: %m"
 msgstr "n'a pas pu retailler le segment de mémoire partagée « %s » en %zu octets : %m"
 
-#: storage/ipc/dsm_impl.c:385 storage/ipc/dsm_impl.c:580 storage/ipc/dsm_impl.c:742 storage/ipc/dsm_impl.c:977
+#: storage/ipc/dsm_impl.c:385 storage/ipc/dsm_impl.c:580 storage/ipc/dsm_impl.c:750 storage/ipc/dsm_impl.c:985
 #, c-format
 msgid "could not map shared memory segment \"%s\": %m"
 msgstr "n'a pas pu mapper le segment de mémoire partagée « %s » : %m"
@@ -16260,12 +16278,12 @@
 msgid "could not get shared memory segment: %m"
 msgstr "n'a pas pu obtenir le segment de mémoire partagée : %m"
 
-#: storage/ipc/dsm_impl.c:694
+#: storage/ipc/dsm_impl.c:714
 #, c-format
 msgid "could not create shared memory segment \"%s\": %m"
 msgstr "n'a pas pu créer le segment de mémoire partagée « %s » : %m"
 
-#: storage/ipc/dsm_impl.c:1018
+#: storage/ipc/dsm_impl.c:1026
 #, c-format
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "n'a pas pu dupliquer le lien pour « %s » : %m"
@@ -16295,12 +16313,12 @@
 msgid "requested shared memory size overflows size_t"
 msgstr "la taille de la mémoire partagée demandée dépasse size_t"
 
-#: storage/ipc/standby.c:500 tcop/postgres.c:2974
+#: storage/ipc/standby.c:502 tcop/postgres.c:2987
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "annulation de la requête à cause d'un conflit avec la restauration"
 
-#: storage/ipc/standby.c:501 tcop/postgres.c:2274
+#: storage/ipc/standby.c:503 tcop/postgres.c:2266
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "La transaction de l'utilisateur causait un verrou mortel lors de la restauration."
@@ -16416,10 +16434,9 @@
 msgstr "transaction virtuelle %d/%u"
 
 #: storage/lmgr/lmgr.c:963
-#, fuzzy, c-format
-#| msgid "could not access status of transaction %u"
+#, c-format
 msgid "speculative token %u of transaction %u"
-msgstr "n'a pas pu accéder au statut de la transaction %u"
+msgstr "jeton %u spéculatif de la transaction %u"
 
 #: storage/lmgr/lmgr.c:969
 #, c-format
@@ -16523,12 +16540,12 @@
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr "une transaction important un snapshot ne doit pas être READ ONLY DEFERRABLE"
 
-#: storage/lmgr/predicate.c:1705 utils/time/snapmgr.c:431 utils/time/snapmgr.c:437
+#: storage/lmgr/predicate.c:1705 utils/time/snapmgr.c:472 utils/time/snapmgr.c:478
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "n'a pas pu importer le snapshot demandé"
 
-#: storage/lmgr/predicate.c:1706 utils/time/snapmgr.c:438
+#: storage/lmgr/predicate.c:1706 utils/time/snapmgr.c:479
 #, c-format
 msgid "The source transaction %u is not running anymore."
 msgstr "La transaction source %u n'est plus en cours d'exécution."
@@ -16599,27 +16616,27 @@
 msgid "page verification failed, calculated checksum %u but expected %u"
 msgstr "échec de la vérification de la page, somme de contrôle calculé %u, mais attendait %u"
 
-#: storage/page/bufpage.c:200 storage/page/bufpage.c:490 storage/page/bufpage.c:705 storage/page/bufpage.c:836 storage/page/bufpage.c:936
+#: storage/page/bufpage.c:203 storage/page/bufpage.c:522 storage/page/bufpage.c:737 storage/page/bufpage.c:868 storage/page/bufpage.c:968
 #, c-format
 msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr "pointeurs de page corrompus : le plus bas = %u, le plus haut = %u, spécial = %u"
 
-#: storage/page/bufpage.c:534
+#: storage/page/bufpage.c:566
 #, c-format
 msgid "corrupted item pointer: %u"
 msgstr "pointeur d'élément corrompu : %u"
 
-#: storage/page/bufpage.c:545 storage/page/bufpage.c:887 storage/page/bufpage.c:1042
+#: storage/page/bufpage.c:577 storage/page/bufpage.c:919 storage/page/bufpage.c:1074
 #, c-format
 msgid "corrupted item lengths: total %u, available space %u"
 msgstr "longueurs d'élément corrompus : total %u, espace disponible %u"
 
-#: storage/page/bufpage.c:724 storage/page/bufpage.c:860
+#: storage/page/bufpage.c:756
 #, c-format
 msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr "pointeur d'élément corrompu : décalage = %u, taille = %u"
 
-#: storage/page/bufpage.c:965
+#: storage/page/bufpage.c:892 storage/page/bufpage.c:997
 #, c-format
 msgid "corrupted item pointer: offset = %u, length = %u"
 msgstr "pointeur d'élément corrompu : décalage = %u, longueur = %u"
@@ -16685,212 +16702,212 @@
 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:938
+#: storage/smgr/md.c:939
 #, 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:1218
+#: storage/smgr/md.c:1219
 #, 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:1381
+#: storage/smgr/md.c:1382
 #, c-format
 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:1776
+#: storage/smgr/md.c:1777
 #, 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"
 
-#: tcop/fastpath.c:111 tcop/fastpath.c:475 tcop/fastpath.c:605
+#: tcop/fastpath.c:111 tcop/fastpath.c:463 tcop/fastpath.c:593
 #, 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:291 tcop/postgres.c:1003 tcop/postgres.c:1313 tcop/postgres.c:1571 tcop/postgres.c:1975 tcop/postgres.c:2342 tcop/postgres.c:2417
+#: tcop/fastpath.c:281 tcop/postgres.c:995 tcop/postgres.c:1305 tcop/postgres.c:1563 tcop/postgres.c:1967 tcop/postgres.c:2334 tcop/postgres.c:2409
 #, c-format
 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:319
+#: tcop/fastpath.c:309
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "appel de fonction fastpath : « %s » (OID %u)"
 
-#: tcop/fastpath.c:401 tcop/postgres.c:1173 tcop/postgres.c:1438 tcop/postgres.c:1816 tcop/postgres.c:2033
+#: tcop/fastpath.c:391 tcop/postgres.c:1165 tcop/postgres.c:1430 tcop/postgres.c:1808 tcop/postgres.c:2025
 #, c-format
 msgid "duration: %s ms"
 msgstr "durée : %s ms"
 
-#: tcop/fastpath.c:405
+#: tcop/fastpath.c:395
 #, 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:443 tcop/fastpath.c:570
+#: tcop/fastpath.c:431 tcop/fastpath.c:558
 #, 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:451
+#: tcop/fastpath.c:439
 #, 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:538 tcop/fastpath.c:621
+#: tcop/fastpath.c:526 tcop/fastpath.c:609
 #, 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:363 tcop/postgres.c:399 tcop/postgres.c:426
+#: tcop/postgres.c:355 tcop/postgres.c:391 tcop/postgres.c:418
 #, c-format
 msgid "unexpected EOF on client connection"
 msgstr "fin de fichier (EOF) inattendue de la connexion du client"
 
-#: tcop/postgres.c:449 tcop/postgres.c:461 tcop/postgres.c:472 tcop/postgres.c:484 tcop/postgres.c:4268
+#: tcop/postgres.c:441 tcop/postgres.c:453 tcop/postgres.c:464 tcop/postgres.c:476 tcop/postgres.c:4275
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "type %d du message de l'interface invalide"
 
-#: tcop/postgres.c:944
+#: tcop/postgres.c:936
 #, c-format
 msgid "statement: %s"
 msgstr "instruction : %s"
 
-#: tcop/postgres.c:1178
+#: tcop/postgres.c:1170
 #, c-format
 msgid "duration: %s ms  statement: %s"
 msgstr "durée : %s ms, instruction : %s"
 
-#: tcop/postgres.c:1228
+#: tcop/postgres.c:1220
 #, c-format
 msgid "parse %s: %s"
 msgstr "analyse %s : %s"
 
-#: tcop/postgres.c:1286
+#: tcop/postgres.c:1278
 #, c-format
 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:1443
+#: tcop/postgres.c:1435
 #, c-format
 msgid "duration: %s ms  parse %s: %s"
 msgstr "durée : %s ms, analyse %s : %s"
 
-#: tcop/postgres.c:1488
+#: tcop/postgres.c:1480
 #, c-format
 msgid "bind %s to %s"
 msgstr "lie %s à %s"
 
-#: tcop/postgres.c:1507 tcop/postgres.c:2323
+#: tcop/postgres.c:1499 tcop/postgres.c:2315
 #, c-format
 msgid "unnamed prepared statement does not exist"
 msgstr "l'instruction préparée non nommée n'existe pas"
 
-#: tcop/postgres.c:1549
+#: tcop/postgres.c:1541
 #, 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:1555
+#: tcop/postgres.c:1547
 #, 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:1723
+#: tcop/postgres.c:1715
 #, 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:1821
+#: tcop/postgres.c:1813
 #, c-format
 msgid "duration: %s ms  bind %s%s%s: %s"
 msgstr "durée : %s ms, lien %s%s%s : %s"
 
-#: tcop/postgres.c:1869 tcop/postgres.c:2403
+#: tcop/postgres.c:1861 tcop/postgres.c:2395
 #, c-format
 msgid "portal \"%s\" does not exist"
 msgstr "le portail « %s » n'existe pas"
 
-#: tcop/postgres.c:1954
+#: tcop/postgres.c:1946
 #, c-format
 msgid "%s %s%s%s: %s"
 msgstr "%s %s%s%s: %s"
 
-#: tcop/postgres.c:1956 tcop/postgres.c:2041
+#: tcop/postgres.c:1948 tcop/postgres.c:2033
 msgid "execute fetch from"
 msgstr "exécute fetch à partir de"
 
-#: tcop/postgres.c:1957 tcop/postgres.c:2042
+#: tcop/postgres.c:1949 tcop/postgres.c:2034
 msgid "execute"
 msgstr "exécute"
 
-#: tcop/postgres.c:2038
+#: tcop/postgres.c:2030
 #, c-format
 msgid "duration: %s ms  %s %s%s%s: %s"
 msgstr "durée : %s ms  %s %s%s%s: %s"
 
-#: tcop/postgres.c:2164
+#: tcop/postgres.c:2156
 #, c-format
 msgid "prepare: %s"
 msgstr "préparation : %s"
 
-#: tcop/postgres.c:2227
+#: tcop/postgres.c:2219
 #, c-format
 msgid "parameters: %s"
 msgstr "paramètres : %s"
 
-#: tcop/postgres.c:2246
+#: tcop/postgres.c:2238
 #, c-format
 msgid "abort reason: recovery conflict"
 msgstr "raison de l'annulation : conflit de restauration"
 
-#: tcop/postgres.c:2262
+#: tcop/postgres.c:2254
 #, c-format
 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:2265
+#: tcop/postgres.c:2257
 #, c-format
 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:2268
+#: tcop/postgres.c:2260
 #, c-format
 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:2271
+#: tcop/postgres.c:2263
 #, c-format
 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:2277
+#: tcop/postgres.c:2269
 #, c-format
 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:2606
+#: tcop/postgres.c:2598
 #, c-format
 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:2607
+#: tcop/postgres.c:2599
 #, c-format
 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 ""
@@ -16898,19 +16915,19 @@
 "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:2611 tcop/postgres.c:2917
+#: tcop/postgres.c:2603 tcop/postgres.c:2915
 #, c-format
 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:2697
+#: tcop/postgres.c:2689
 #, c-format
 msgid "floating-point exception"
 msgstr "exception dû à une virgule flottante"
 
-#: tcop/postgres.c:2698
+#: tcop/postgres.c:2690
 #, 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."
 msgstr ""
@@ -16918,57 +16935,57 @@
 "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:2862
+#: tcop/postgres.c:2860
 #, c-format
 msgid "canceling authentication due to timeout"
 msgstr "annulation de l'authentification à cause du délai écoulé"
 
-#: tcop/postgres.c:2866
+#: tcop/postgres.c:2864
 #, c-format
 msgid "terminating autovacuum process due to administrator command"
 msgstr "arrêt du processus autovacuum suite à la demande de l'administrateur"
 
-#: tcop/postgres.c:2872 tcop/postgres.c:2882 tcop/postgres.c:2915
+#: tcop/postgres.c:2870 tcop/postgres.c:2880 tcop/postgres.c:2913
 #, c-format
 msgid "terminating connection due to conflict with recovery"
 msgstr "arrêt de la connexion à cause d'un conflit avec la restauration"
 
-#: tcop/postgres.c:2888
+#: tcop/postgres.c:2886
 #, c-format
 msgid "terminating connection due to administrator command"
 msgstr "arrêt des connexions suite à la demande de l'administrateur"
 
-#: tcop/postgres.c:2898
+#: tcop/postgres.c:2896
 #, c-format
 msgid "connection to client lost"
 msgstr "connexion au client perdue"
 
-#: tcop/postgres.c:2951
+#: tcop/postgres.c:2964
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "annulation de la requête à cause du délai écoulé pour l'obtention des verrous"
 
-#: tcop/postgres.c:2958
+#: tcop/postgres.c:2971
 #, c-format
 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:2965
+#: tcop/postgres.c:2978
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "annulation de la tâche d'autovacuum"
 
-#: tcop/postgres.c:2988
+#: tcop/postgres.c:3001
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "annulation de la requête à la demande de l'utilisateur"
 
-#: tcop/postgres.c:3098
+#: tcop/postgres.c:3111
 #, c-format
 msgid "stack depth limit exceeded"
 msgstr "dépassement de limite (en profondeur) de la pile"
 
-#: tcop/postgres.c:3099
+#: tcop/postgres.c:3112
 #, c-format
 msgid "Increase the configuration parameter \"max_stack_depth\" (currently %dkB), after ensuring the platform's stack depth limit is adequate."
 msgstr ""
@@ -16976,59 +16993,59 @@
 "être assuré que la limite de profondeur de la pile de la plateforme est\n"
 "adéquate."
 
-#: tcop/postgres.c:3162
+#: tcop/postgres.c:3175
 #, c-format
 msgid "\"max_stack_depth\" must not exceed %ldkB."
 msgstr "« max_stack_depth » ne doit pas dépasser %ld Ko."
 
-#: tcop/postgres.c:3164
+#: tcop/postgres.c:3177
 #, c-format
 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:3524
+#: tcop/postgres.c:3537
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "argument invalide en ligne de commande pour le processus serveur : %s"
 
-#: tcop/postgres.c:3525 tcop/postgres.c:3531
+#: tcop/postgres.c:3538 tcop/postgres.c:3544
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: tcop/postgres.c:3529
+#: tcop/postgres.c:3542
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s : argument invalide en ligne de commande : %s"
 
-#: tcop/postgres.c:3590
+#: tcop/postgres.c:3603
 #, 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:4176
+#: tcop/postgres.c:4183
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "sous-type %d du message CLOSE invalide"
 
-#: tcop/postgres.c:4211
+#: tcop/postgres.c:4218
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "sous-type %d du message DESCRIBE invalide"
 
-#: tcop/postgres.c:4289
+#: tcop/postgres.c:4296
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr "appels à la fonction fastpath non supportés dans une connexion de réplication"
 
-#: tcop/postgres.c:4293
+#: tcop/postgres.c:4300
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr "protocole étendu de requêtes non supporté dans une connexion de réplication"
 
-#: tcop/postgres.c:4463
+#: tcop/postgres.c:4470
 #, c-format
 msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
 msgstr ""
@@ -17205,32 +17222,32 @@
 msgid "missing Dictionary parameter"
 msgstr "paramètre Dictionary manquant"
 
-#: tsearch/spell.c:276
+#: tsearch/spell.c:289
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier dictionnaire « %s » : %m"
 
-#: tsearch/spell.c:439 utils/adt/regexp.c:204
+#: tsearch/spell.c:452 utils/adt/regexp.c:204
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "expression rationnelle invalide : %s"
 
-#: tsearch/spell.c:732
+#: tsearch/spell.c:745
 #, c-format
 msgid "multibyte flag character is not allowed"
 msgstr "un caractère drapeau multi-octet n'est pas autorisé"
 
-#: tsearch/spell.c:766 tsearch/spell.c:822 tsearch/spell.c:926
+#: tsearch/spell.c:779 tsearch/spell.c:835 tsearch/spell.c:937
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier affixe « %s » : %m"
 
-#: tsearch/spell.c:812
+#: tsearch/spell.c:825
 #, c-format
 msgid "Ispell dictionary supports only default flag value"
 msgstr "le dictionnaire Ispell supporte seulement la valeur par défaut du drapeau"
 
-#: tsearch/spell.c:1041
+#: tsearch/spell.c:1050
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "le fichier d'affixes contient des commandes ancien et nouveau style"
@@ -17275,27 +17292,27 @@
 msgid "text search parser does not support headline creation"
 msgstr "l'analyseur de recherche plein texte ne supporte pas headline"
 
-#: tsearch/wparser_def.c:2557
+#: tsearch/wparser_def.c:2559
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
 msgstr "paramètre headline « %s » non reconnu"
 
-#: tsearch/wparser_def.c:2566
+#: tsearch/wparser_def.c:2568
 #, c-format
 msgid "MinWords should be less than MaxWords"
 msgstr "MinWords doit avoir une valeur plus petite que celle de MaxWords"
 
-#: tsearch/wparser_def.c:2570
+#: tsearch/wparser_def.c:2572
 #, c-format
 msgid "MinWords should be positive"
 msgstr "MinWords doit être positif"
 
-#: tsearch/wparser_def.c:2574
+#: tsearch/wparser_def.c:2576
 #, c-format
 msgid "ShortWord should be >= 0"
 msgstr "ShortWord devrait être positif ou nul"
 
-#: tsearch/wparser_def.c:2578
+#: tsearch/wparser_def.c:2580
 #, c-format
 msgid "MaxFragments should be >= 0"
 msgstr "MaxFragments devrait être positif ou nul"
@@ -17400,7 +17417,7 @@
 msgid "unrecognized privilege type: \"%s\""
 msgstr "type de droit non reconnu : « %s »"
 
-#: utils/adt/acl.c:3426 utils/adt/regproc.c:123 utils/adt/regproc.c:144 utils/adt/regproc.c:319
+#: utils/adt/acl.c:3426 utils/adt/regproc.c:124 utils/adt/regproc.c:145 utils/adt/regproc.c:320
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "la fonction « %s » n'existe pas"
@@ -17410,77 +17427,76 @@
 msgid "must be member of role \"%s\""
 msgstr "doit être un membre du rôle « %s »"
 
-#: utils/adt/array_expanded.c:276 utils/adt/arrayfuncs.c:934 utils/adt/arrayfuncs.c:1522 utils/adt/arrayfuncs.c:3225 utils/adt/arrayfuncs.c:3363 utils/adt/arrayfuncs.c:5838 utils/adt/arrayfuncs.c:6149 utils/adt/arrayutils.c:93 utils/adt/arrayutils.c:102 utils/adt/arrayutils.c:109
+#: utils/adt/array_expanded.c:276 utils/adt/arrayfuncs.c:934 utils/adt/arrayfuncs.c:1522 utils/adt/arrayfuncs.c:3225 utils/adt/arrayfuncs.c:3363 utils/adt/arrayfuncs.c:5826 utils/adt/arrayfuncs.c:6137 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 "la taille du tableau dépasse le maximum permis (%d)"
 
-#: utils/adt/array_userfuncs.c:67 utils/adt/array_userfuncs.c:529 utils/adt/array_userfuncs.c:609 utils/adt/json.c:1759 utils/adt/json.c:1854 utils/adt/json.c:1892 utils/adt/jsonb.c:1126 utils/adt/jsonb.c:1155 utils/adt/jsonb.c:1591 utils/adt/jsonb.c:1755 utils/adt/jsonb.c:1765
+#: utils/adt/array_userfuncs.c:79 utils/adt/array_userfuncs.c:541 utils/adt/array_userfuncs.c:621 utils/adt/json.c:1759 utils/adt/json.c:1854 utils/adt/json.c:1892 utils/adt/jsonb.c:1126 utils/adt/jsonb.c:1155 utils/adt/jsonb.c:1591 utils/adt/jsonb.c:1755 utils/adt/jsonb.c:1765
 #, c-format
 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/array_userfuncs.c:72
+#: utils/adt/array_userfuncs.c:84
 #, c-format
 msgid "input data type is not an array"
 msgstr "le type de données en entrée n'est pas un tableau"
 
-#: utils/adt/array_userfuncs.c:120 utils/adt/array_userfuncs.c:174 utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1161 utils/adt/float.c:1220 utils/adt/float.c:2771 utils/adt/float.c:2787 utils/adt/int.c:623 utils/adt/int.c:652 utils/adt/int.c:673 utils/adt/int.c:704 utils/adt/int.c:737 utils/adt/int.c:759 utils/adt/int.c:907 utils/adt/int.c:928 utils/adt/int.c:955 utils/adt/int.c:995 utils/adt/int.c:1016 utils/adt/int.c:1043
-#: utils/adt/int.c:1076 utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2903 utils/adt/numeric.c:2912 utils/adt/varbit.c:1173 utils/adt/varbit.c:1565 utils/adt/varlena.c:1045 utils/adt/varlena.c:2582
+#: utils/adt/array_userfuncs.c:132 utils/adt/array_userfuncs.c:186 utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1158 utils/adt/float.c:1217 utils/adt/float.c:2768 utils/adt/float.c:2784 utils/adt/int.c:623 utils/adt/int.c:652 utils/adt/int.c:673 utils/adt/int.c:704 utils/adt/int.c:737 utils/adt/int.c:759 utils/adt/int.c:907 utils/adt/int.c:928 utils/adt/int.c:955 utils/adt/int.c:995 utils/adt/int.c:1016 utils/adt/int.c:1043
+#: utils/adt/int.c:1076 utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2899 utils/adt/numeric.c:2908 utils/adt/varbit.c:1173 utils/adt/varbit.c:1575 utils/adt/varlena.c:1045 utils/adt/varlena.c:2595
 #, c-format
 msgid "integer out of range"
 msgstr "entier en dehors des limites"
 
-#: utils/adt/array_userfuncs.c:127 utils/adt/array_userfuncs.c:184
+#: utils/adt/array_userfuncs.c:139 utils/adt/array_userfuncs.c:196
 #, c-format
 msgid "argument must be empty or one-dimensional array"
 msgstr "l'argument doit être vide ou doit être un tableau à une dimension"
 
-#: utils/adt/array_userfuncs.c:266 utils/adt/array_userfuncs.c:305 utils/adt/array_userfuncs.c:342 utils/adt/array_userfuncs.c:371 utils/adt/array_userfuncs.c:399
+#: utils/adt/array_userfuncs.c:278 utils/adt/array_userfuncs.c:317 utils/adt/array_userfuncs.c:354 utils/adt/array_userfuncs.c:383 utils/adt/array_userfuncs.c:411
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "ne peut pas concaténer des tableaux non compatibles"
 
-#: utils/adt/array_userfuncs.c:267
+#: utils/adt/array_userfuncs.c:279
 #, c-format
 msgid "Arrays with element types %s and %s are not compatible for concatenation."
 msgstr ""
 "Les tableaux avec les types d'élément %s et %s ne sont pas compatibles\n"
 "pour la concaténation."
 
-#: utils/adt/array_userfuncs.c:306
+#: utils/adt/array_userfuncs.c:318
 #, c-format
 msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
 msgstr ""
 "Les tableaux de dimensions %d et %d ne sont pas compatiblee pour la\n"
 "concaténation."
 
-#: utils/adt/array_userfuncs.c:343
+#: utils/adt/array_userfuncs.c:355
 #, c-format
 msgid "Arrays with differing element dimensions are not compatible for concatenation."
 msgstr ""
 "Les tableaux de dimensions différentes ne sont pas compatibles pour\n"
 "une concaténation."
 
-#: utils/adt/array_userfuncs.c:372 utils/adt/array_userfuncs.c:400
+#: utils/adt/array_userfuncs.c:384 utils/adt/array_userfuncs.c:412
 #, c-format
 msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr ""
 "Les tableaux de dimensions différentes ne sont pas compatibles pour\n"
 "une concaténation."
 
-#: utils/adt/array_userfuncs.c:468 utils/adt/arrayfuncs.c:1287 utils/adt/arrayfuncs.c:3331 utils/adt/arrayfuncs.c:5738
+#: utils/adt/array_userfuncs.c:480 utils/adt/arrayfuncs.c:1287 utils/adt/arrayfuncs.c:3331 utils/adt/arrayfuncs.c:5732
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "nombre de dimensions invalides : %d"
 
-#: utils/adt/array_userfuncs.c:725 utils/adt/array_userfuncs.c:876
-#, fuzzy, c-format
-#| msgid "removing elements from multidimensional arrays is not supported"
+#: utils/adt/array_userfuncs.c:737 utils/adt/array_userfuncs.c:889
+#, c-format
 msgid "searching for elements in multidimensional arrays is not supported"
-msgstr "la suppression d'éléments de tableaux multidimensionnels n'est pas supportée"
+msgstr "la recherche d'éléments dans des tableaux multidimensionnels n'est pas supportée"
 
-#: utils/adt/array_userfuncs.c:749
+#: utils/adt/array_userfuncs.c:761
 #, c-format
 msgid "initial position must not be null"
 msgstr "la position initiale ne doit pas être NULL"
@@ -17590,7 +17606,7 @@
 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:2226 utils/adt/arrayfuncs.c:2248 utils/adt/arrayfuncs.c:2297 utils/adt/arrayfuncs.c:2533 utils/adt/arrayfuncs.c:2830 utils/adt/arrayfuncs.c:5718 utils/adt/arrayfuncs.c:5750 utils/adt/arrayfuncs.c:5767 utils/adt/json.c:2290 utils/adt/json.c:2365 utils/adt/jsonb.c:1369 utils/adt/jsonb.c:1455 utils/adt/jsonfuncs.c:3528 utils/adt/jsonfuncs.c:3573
+#: utils/adt/arrayfuncs.c:2226 utils/adt/arrayfuncs.c:2248 utils/adt/arrayfuncs.c:2297 utils/adt/arrayfuncs.c:2533 utils/adt/arrayfuncs.c:2830 utils/adt/arrayfuncs.c:5718 utils/adt/arrayfuncs.c:5744 utils/adt/arrayfuncs.c:5755 utils/adt/json.c:2290 utils/adt/json.c:2365 utils/adt/jsonb.c:1369 utils/adt/jsonb.c:1455 utils/adt/jsonfuncs.c:3528 utils/adt/jsonfuncs.c:3573
 #, c-format
 msgid "wrong number of array subscripts"
 msgstr "mauvais nombre d'indices du tableau"
@@ -17657,42 +17673,32 @@
 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:5719 utils/adt/arrayfuncs.c:5751
+#: utils/adt/arrayfuncs.c:5719 utils/adt/arrayfuncs.c:5745
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "le tableau doit avoir une seule dimension"
 
-#: utils/adt/arrayfuncs.c:5724 utils/adt/arrayfuncs.c:5756
-#, c-format
-msgid "wrong range of array subscripts"
-msgstr "mauvais échelle des indices du tableau"
-
-#: utils/adt/arrayfuncs.c:5725 utils/adt/arrayfuncs.c:5757
-#, c-format
-msgid "Lower bound of dimension array must be one."
-msgstr "La limite inférieure du tableau doit valoir un."
-
-#: utils/adt/arrayfuncs.c:5730 utils/adt/arrayfuncs.c:5762
+#: utils/adt/arrayfuncs.c:5724 utils/adt/arrayfuncs.c:5750
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "les valeurs de dimension ne peuvent pas être NULL"
 
-#: utils/adt/arrayfuncs.c:5768
+#: utils/adt/arrayfuncs.c:5756
 #, c-format
 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."
 
-#: utils/adt/arrayfuncs.c:6014
+#: utils/adt/arrayfuncs.c:6002
 #, c-format
 msgid "removing elements from multidimensional arrays is not supported"
 msgstr "la suppression d'éléments de tableaux multidimensionnels n'est pas supportée"
 
-#: utils/adt/arrayfuncs.c:6291
+#: utils/adt/arrayfuncs.c:6279
 #, c-format
 msgid "thresholds must be one-dimensional array"
 msgstr "les limites doivent être un tableau à une dimension"
 
-#: utils/adt/arrayfuncs.c:6296
+#: utils/adt/arrayfuncs.c:6284
 #, c-format
 msgid "thresholds array must not contain NULLs"
 msgstr "le tableau de limites ne doit pas contenir de valeurs NULL"
@@ -17727,8 +17733,8 @@
 msgid "invalid input syntax for type money: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type money : « %s »"
 
-#: utils/adt/cash.c:607 utils/adt/cash.c:657 utils/adt/cash.c:708 utils/adt/cash.c:757 utils/adt/cash.c:809 utils/adt/cash.c:859 utils/adt/float.c:788 utils/adt/float.c:852 utils/adt/float.c:2530 utils/adt/float.c:2593 utils/adt/geo_ops.c:4155 utils/adt/int.c:719 utils/adt/int.c:861 utils/adt/int.c:969 utils/adt/int.c:1058 utils/adt/int.c:1097 utils/adt/int.c:1125 utils/adt/int8.c:597 utils/adt/int8.c:657 utils/adt/int8.c:897
-#: utils/adt/int8.c:1005 utils/adt/int8.c:1094 utils/adt/int8.c:1202 utils/adt/numeric.c:5917 utils/adt/numeric.c:6200 utils/adt/timestamp.c:3349
+#: utils/adt/cash.c:607 utils/adt/cash.c:657 utils/adt/cash.c:708 utils/adt/cash.c:757 utils/adt/cash.c:809 utils/adt/cash.c:859 utils/adt/float.c:785 utils/adt/float.c:849 utils/adt/float.c:2527 utils/adt/float.c:2590 utils/adt/geo_ops.c:4163 utils/adt/int.c:719 utils/adt/int.c:861 utils/adt/int.c:969 utils/adt/int.c:1058 utils/adt/int.c:1097 utils/adt/int.c:1125 utils/adt/int8.c:597 utils/adt/int8.c:657 utils/adt/int8.c:897
+#: utils/adt/int8.c:1005 utils/adt/int8.c:1094 utils/adt/int8.c:1202 utils/adt/numeric.c:5920 utils/adt/numeric.c:6203 utils/adt/timestamp.c:3448
 #, c-format
 msgid "division by zero"
 msgstr "division par zéro"
@@ -17738,7 +17744,7 @@
 msgid "\"char\" out of range"
 msgstr "« char » hors des limites"
 
-#: utils/adt/date.c:67 utils/adt/timestamp.c:94 utils/adt/varbit.c:52 utils/adt/varchar.c:44
+#: utils/adt/date.c:67 utils/adt/timestamp.c:95 utils/adt/varbit.c:52 utils/adt/varchar.c:44
 #, c-format
 msgid "invalid type modifier"
 msgstr "modifieur de type invalide"
@@ -17753,27 +17759,27 @@
 msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
 msgstr "la précision de TIME(%d)%s a été réduit au maximum autorisée, %d"
 
-#: utils/adt/date.c:141 utils/adt/datetime.c:1208 utils/adt/datetime.c:2079
+#: utils/adt/date.c:141 utils/adt/datetime.c:1209 utils/adt/datetime.c:2122
 #, c-format
 msgid "date/time value \"current\" is no longer supported"
 msgstr "la valeur « current » pour la date et heure n'est plus supportée"
 
-#: utils/adt/date.c:166 utils/adt/formatting.c:3523
+#: utils/adt/date.c:166 utils/adt/formatting.c:3521
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "date en dehors des limites : « %s »"
 
-#: utils/adt/date.c:216 utils/adt/xml.c:2029
+#: utils/adt/date.c:216 utils/adt/xml.c:2033
 #, c-format
 msgid "date out of range"
 msgstr "date en dehors des limites"
 
-#: utils/adt/date.c:258 utils/adt/timestamp.c:592
+#: utils/adt/date.c:258 utils/adt/timestamp.c:593
 #, c-format
 msgid "date field value out of range: %d-%02d-%02d"
 msgstr "valeur du champ date en dehors des limites : %d-%02d-%02d"
 
-#: utils/adt/date.c:264 utils/adt/timestamp.c:598
+#: utils/adt/date.c:264 utils/adt/timestamp.c:599
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "date en dehors des limites : %d-%02d-%02d"
@@ -17788,10 +17794,10 @@
 msgid "date out of range for timestamp"
 msgstr "date en dehors des limites pour un timestamp"
 
-#: utils/adt/date.c:970 utils/adt/date.c:1016 utils/adt/date.c:1616 utils/adt/date.c:1652 utils/adt/date.c:2524 utils/adt/formatting.c:3399 utils/adt/formatting.c:3431 utils/adt/formatting.c:3499 utils/adt/json.c:1534 utils/adt/json.c:1556 utils/adt/jsonb.c:823 utils/adt/jsonb.c:847 utils/adt/nabstime.c:455 utils/adt/nabstime.c:498 utils/adt/nabstime.c:528 utils/adt/nabstime.c:571 utils/adt/timestamp.c:224 utils/adt/timestamp.c:267
-#: utils/adt/timestamp.c:716 utils/adt/timestamp.c:745 utils/adt/timestamp.c:784 utils/adt/timestamp.c:2938 utils/adt/timestamp.c:2959 utils/adt/timestamp.c:2972 utils/adt/timestamp.c:2981 utils/adt/timestamp.c:3038 utils/adt/timestamp.c:3061 utils/adt/timestamp.c:3074 utils/adt/timestamp.c:3085 utils/adt/timestamp.c:3610 utils/adt/timestamp.c:3739 utils/adt/timestamp.c:3780 utils/adt/timestamp.c:3868 utils/adt/timestamp.c:3914
-#: utils/adt/timestamp.c:4025 utils/adt/timestamp.c:4349 utils/adt/timestamp.c:4465 utils/adt/timestamp.c:4475 utils/adt/timestamp.c:4560 utils/adt/timestamp.c:4679 utils/adt/timestamp.c:4689 utils/adt/timestamp.c:5005 utils/adt/timestamp.c:5019 utils/adt/timestamp.c:5144 utils/adt/timestamp.c:5151 utils/adt/timestamp.c:5177 utils/adt/timestamp.c:5181 utils/adt/timestamp.c:5250 utils/adt/xml.c:2051 utils/adt/xml.c:2058 utils/adt/xml.c:2078
-#: utils/adt/xml.c:2085
+#: utils/adt/date.c:970 utils/adt/date.c:1016 utils/adt/date.c:1616 utils/adt/date.c:1652 utils/adt/date.c:2524 utils/adt/datetime.c:1690 utils/adt/formatting.c:3397 utils/adt/formatting.c:3429 utils/adt/formatting.c:3497 utils/adt/json.c:1534 utils/adt/json.c:1556 utils/adt/jsonb.c:823 utils/adt/jsonb.c:847 utils/adt/nabstime.c:455 utils/adt/nabstime.c:498 utils/adt/nabstime.c:528 utils/adt/nabstime.c:571 utils/adt/timestamp.c:225
+#: utils/adt/timestamp.c:268 utils/adt/timestamp.c:717 utils/adt/timestamp.c:746 utils/adt/timestamp.c:785 utils/adt/timestamp.c:3037 utils/adt/timestamp.c:3058 utils/adt/timestamp.c:3071 utils/adt/timestamp.c:3080 utils/adt/timestamp.c:3137 utils/adt/timestamp.c:3160 utils/adt/timestamp.c:3173 utils/adt/timestamp.c:3184 utils/adt/timestamp.c:3709 utils/adt/timestamp.c:3838 utils/adt/timestamp.c:3879 utils/adt/timestamp.c:3967
+#: utils/adt/timestamp.c:4013 utils/adt/timestamp.c:4124 utils/adt/timestamp.c:4448 utils/adt/timestamp.c:4564 utils/adt/timestamp.c:4574 utils/adt/timestamp.c:4659 utils/adt/timestamp.c:4778 utils/adt/timestamp.c:4788 utils/adt/timestamp.c:5035 utils/adt/timestamp.c:5049 utils/adt/timestamp.c:5140 utils/adt/timestamp.c:5147 utils/adt/timestamp.c:5173 utils/adt/timestamp.c:5177 utils/adt/timestamp.c:5246 utils/adt/xml.c:2055
+#: utils/adt/xml.c:2062 utils/adt/xml.c:2082 utils/adt/xml.c:2089
 #, c-format
 msgid "timestamp out of range"
 msgstr "timestamp en dehors des limites"
@@ -17806,7 +17812,7 @@
 msgid "time out of range"
 msgstr "heure en dehors des limites"
 
-#: utils/adt/date.c:1264 utils/adt/timestamp.c:617
+#: utils/adt/date.c:1264 utils/adt/timestamp.c:618
 #, c-format
 msgid "time field value out of range: %d:%02d:%02g"
 msgstr "valeur du champ time en dehors des limites : %d:%02d:%02g"
@@ -17826,48 +17832,43 @@
 msgid "\"time with time zone\" units \"%s\" not recognized"
 msgstr "L'unité « %s » n'est pas reconnu pour le type « time with time zone »"
 
-#: utils/adt/date.c:2744 utils/adt/datetime.c:925 utils/adt/datetime.c:1805 utils/adt/datetime.c:4566 utils/adt/timestamp.c:531 utils/adt/timestamp.c:558 utils/adt/timestamp.c:5031 utils/adt/timestamp.c:5261
+#: utils/adt/date.c:2744 utils/adt/datetime.c:926 utils/adt/datetime.c:1848 utils/adt/datetime.c:4609 utils/adt/timestamp.c:532 utils/adt/timestamp.c:559 utils/adt/timestamp.c:5061 utils/adt/timestamp.c:5257
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "le fuseau horaire « %s » n'est pas reconnu"
 
-#: utils/adt/date.c:2784 utils/adt/timestamp.c:5102 utils/adt/timestamp.c:5287
+#: utils/adt/date.c:2784 utils/adt/timestamp.c:5098 utils/adt/timestamp.c:5283
 #, c-format
 msgid "interval time zone \"%s\" must not include months or days"
 msgstr "l'intervalle de fuseau horaire « %s » ne doit pas spécifier de mois ou de jours"
 
-#: utils/adt/datetime.c:1680
-#, c-format
-msgid "time zone abbreviation \"%s\" is not used in time zone \"%s\""
-msgstr "l'abréviation « %s » du fuseau horaire n'est pas utilisée dans le fuseau horaire « %s »"
-
-#: utils/adt/datetime.c:3766 utils/adt/datetime.c:3773
+#: utils/adt/datetime.c:3809 utils/adt/datetime.c:3816
 #, 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:3775
+#: utils/adt/datetime.c:3818
 #, c-format
 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:3780
+#: utils/adt/datetime.c:3823
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "valeur du champ interval en dehors des limites : « %s »"
 
-#: utils/adt/datetime.c:3786
+#: utils/adt/datetime.c:3829
 #, 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:3793 utils/adt/network.c:58
+#: utils/adt/datetime.c:3836 utils/adt/network.c:58
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type %s : « %s »"
 
-#: utils/adt/datetime.c:4568
+#: utils/adt/datetime.c:4611
 #, c-format
 msgid "This time zone name appears in the configuration file for time zone abbreviation \"%s\"."
 msgstr "Ce nom du fuseau horaire apparaît dans le fichier de configuration des abréviations de fuseaux horaires « %s »."
@@ -17882,7 +17883,7 @@
 msgid "could not open tablespace directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire du tablespace « %s » : %m"
 
-#: utils/adt/domains.c:85
+#: utils/adt/domains.c:86
 #, c-format
 msgid "type %s is not a domain"
 msgstr "le type %s n'est pas un domaine"
@@ -17957,77 +17958,77 @@
 msgid "value out of range: underflow"
 msgstr "valeur en dehors des limites : trop petit"
 
-#: utils/adt/float.c:218 utils/adt/float.c:292 utils/adt/float.c:316
+#: utils/adt/float.c:215 utils/adt/float.c:289 utils/adt/float.c:313
 #, c-format
 msgid "invalid input syntax for type real: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type real : « %s »"
 
-#: utils/adt/float.c:286
+#: utils/adt/float.c:283
 #, c-format
 msgid "\"%s\" is out of range for type real"
 msgstr "« %s » est hors des limites du type real"
 
-#: utils/adt/float.c:417 utils/adt/float.c:491 utils/adt/float.c:515 utils/adt/numeric.c:5373 utils/adt/numeric.c:5399
+#: utils/adt/float.c:414 utils/adt/float.c:488 utils/adt/float.c:512 utils/adt/numeric.c:5376 utils/adt/numeric.c:5402
 #, c-format
 msgid "invalid input syntax for type double precision: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type double precision : « %s »"
 
-#: utils/adt/float.c:485
+#: utils/adt/float.c:482
 #, c-format
 msgid "\"%s\" is out of range for type double precision"
 msgstr "« %s » est en dehors des limites du type double precision"
 
-#: utils/adt/float.c:1179 utils/adt/float.c:1237 utils/adt/int.c:349 utils/adt/int.c:775 utils/adt/int.c:804 utils/adt/int.c:825 utils/adt/int.c:845 utils/adt/int.c:879 utils/adt/int.c:1174 utils/adt/int8.c:1323 utils/adt/numeric.c:3000 utils/adt/numeric.c:3009
+#: utils/adt/float.c:1176 utils/adt/float.c:1234 utils/adt/int.c:349 utils/adt/int.c:775 utils/adt/int.c:804 utils/adt/int.c:825 utils/adt/int.c:845 utils/adt/int.c:879 utils/adt/int.c:1174 utils/adt/int8.c:1323 utils/adt/numeric.c:2996 utils/adt/numeric.c:3005
 #, c-format
 msgid "smallint out of range"
 msgstr "smallint en dehors des limites"
 
-#: utils/adt/float.c:1363 utils/adt/numeric.c:6599
+#: utils/adt/float.c:1360 utils/adt/numeric.c:6602
 #, c-format
 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:1405 utils/adt/numeric.c:2820
+#: utils/adt/float.c:1402 utils/adt/numeric.c:2816
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "zéro à une puissance négative est indéfini"
 
-#: utils/adt/float.c:1409 utils/adt/numeric.c:2826
+#: utils/adt/float.c:1406 utils/adt/numeric.c:2822
 #, c-format
 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:1475 utils/adt/float.c:1505 utils/adt/numeric.c:6817
+#: utils/adt/float.c:1472 utils/adt/float.c:1502 utils/adt/numeric.c:6820
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "ne peut pas calculer le logarithme de zéro"
 
-#: utils/adt/float.c:1479 utils/adt/float.c:1509 utils/adt/numeric.c:6821
+#: utils/adt/float.c:1476 utils/adt/float.c:1506 utils/adt/numeric.c:6824
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "ne peut pas calculer le logarithme sur un nombre négatif"
 
-#: utils/adt/float.c:1536 utils/adt/float.c:1557 utils/adt/float.c:1578 utils/adt/float.c:1600 utils/adt/float.c:1621 utils/adt/float.c:1642 utils/adt/float.c:1664 utils/adt/float.c:1685
+#: utils/adt/float.c:1533 utils/adt/float.c:1554 utils/adt/float.c:1575 utils/adt/float.c:1597 utils/adt/float.c:1618 utils/adt/float.c:1639 utils/adt/float.c:1661 utils/adt/float.c:1682
 #, c-format
 msgid "input is out of range"
 msgstr "l'entrée est en dehors des limites"
 
-#: utils/adt/float.c:2747 utils/adt/numeric.c:1454
+#: utils/adt/float.c:2744 utils/adt/numeric.c:1450
 #, c-format
 msgid "count must be greater than zero"
 msgstr "le total doit être supérieur à zéro"
 
-#: utils/adt/float.c:2752 utils/adt/numeric.c:1461
+#: utils/adt/float.c:2749 utils/adt/numeric.c:1457
 #, c-format
 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"
 
-#: utils/adt/float.c:2758
+#: utils/adt/float.c:2755
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "les limites basse et haute doivent être finies"
 
-#: utils/adt/float.c:2796 utils/adt/numeric.c:1474
+#: utils/adt/float.c:2793 utils/adt/numeric.c:1470
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "la limite inférieure ne peut pas être plus égale à la limite supérieure"
@@ -18042,201 +18043,201 @@
 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:1058
 #, c-format
 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:1066
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "« 9 » doit être avant « PR »"
 
-#: utils/adt/formatting.c:1083
+#: utils/adt/formatting.c:1082
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "« 0 » doit être avant « PR »"
 
-#: utils/adt/formatting.c:1110
+#: utils/adt/formatting.c:1109
 #, c-format
 msgid "multiple decimal points"
 msgstr "multiples points décimaux"
 
-#: utils/adt/formatting.c:1114 utils/adt/formatting.c:1197
+#: utils/adt/formatting.c:1113 utils/adt/formatting.c:1196
 #, c-format
 msgid "cannot use \"V\" and decimal point together"
 msgstr "ne peut pas utiliser « V » et le point décimal ensemble"
 
-#: utils/adt/formatting.c:1126
+#: utils/adt/formatting.c:1125
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "ne peut pas utiliser « S » deux fois"
 
-#: utils/adt/formatting.c:1130
+#: utils/adt/formatting.c:1129
 #, c-format
 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:1150
+#: utils/adt/formatting.c:1149
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "ne peut pas utiliser « S » et « MI » ensemble"
 
-#: utils/adt/formatting.c:1160
+#: utils/adt/formatting.c:1159
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "ne peut pas utiliser « S » et « PL » ensemble"
 
-#: utils/adt/formatting.c:1170
+#: utils/adt/formatting.c:1169
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "ne peut pas utiliser « S » et « SG » ensemble"
 
-#: utils/adt/formatting.c:1179
+#: utils/adt/formatting.c:1178
 #, c-format
 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:1205
+#: utils/adt/formatting.c:1204
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "ne peut pas utiliser « EEEE » deux fois"
 
-#: utils/adt/formatting.c:1211
+#: utils/adt/formatting.c:1210
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "« EEEE » est incompatible avec les autres formats"
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1211
 #, c-format
 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:1412
+#: utils/adt/formatting.c:1411
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "« %s » n'est pas un nombre"
 
-#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1512 utils/adt/formatting.c:1564
 #, c-format
 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:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1632 utils/adt/formatting.c:1684
 #, c-format
 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:1754 utils/adt/formatting.c:1818
+#: utils/adt/formatting.c:1753 utils/adt/formatting.c:1817
 #, c-format
 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:2122
+#: utils/adt/formatting.c:2114
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "combinaison invalide des conventions de date"
 
-#: utils/adt/formatting.c:2123
+#: utils/adt/formatting.c:2115
 #, c-format
 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:2140
+#: utils/adt/formatting.c:2132
 #, 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:2142
+#: utils/adt/formatting.c:2134
 #, c-format
 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:2203
+#: utils/adt/formatting.c:2195
 #, 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:2205
+#: utils/adt/formatting.c:2197
 #, 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:2208 utils/adt/formatting.c:2222
+#: utils/adt/formatting.c:2200 utils/adt/formatting.c:2214
 #, c-format
 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:2218 utils/adt/formatting.c:2231 utils/adt/formatting.c:2361
+#: utils/adt/formatting.c:2210 utils/adt/formatting.c:2223 utils/adt/formatting.c:2353
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "valeur « %s » invalide pour « %s »"
 
-#: utils/adt/formatting.c:2220
+#: utils/adt/formatting.c:2212
 #, 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:2233
+#: utils/adt/formatting.c:2225
 #, c-format
 msgid "Value must be an integer."
 msgstr "La valeur doit être un entier"
 
-#: utils/adt/formatting.c:2238
+#: utils/adt/formatting.c:2230
 #, 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:2240
+#: utils/adt/formatting.c:2232
 #, 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:2363
+#: utils/adt/formatting.c:2355
 #, c-format
 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:2551 utils/adt/formatting.c:2571 utils/adt/formatting.c:2591 utils/adt/formatting.c:2611 utils/adt/formatting.c:2630 utils/adt/formatting.c:2649 utils/adt/formatting.c:2672 utils/adt/formatting.c:2690 utils/adt/formatting.c:2708 utils/adt/formatting.c:2726 utils/adt/formatting.c:2743 utils/adt/formatting.c:2760
+#: utils/adt/formatting.c:2547 utils/adt/formatting.c:2567 utils/adt/formatting.c:2587 utils/adt/formatting.c:2607 utils/adt/formatting.c:2626 utils/adt/formatting.c:2645 utils/adt/formatting.c:2668 utils/adt/formatting.c:2686 utils/adt/formatting.c:2704 utils/adt/formatting.c:2722 utils/adt/formatting.c:2739 utils/adt/formatting.c:2756
 #, c-format
 msgid "localized string format value too long"
 msgstr "chaîne localisée trop longue"
 
-#: utils/adt/formatting.c:3044
+#: utils/adt/formatting.c:3040
 #, c-format
 msgid "\"TZ\"/\"tz\"/\"OF\" format patterns are not supported in to_date"
 msgstr "les motifs de format « TZ »/« tz »/« OF » ne sont pas supportés dans to_date"
 
-#: utils/adt/formatting.c:3152
+#: utils/adt/formatting.c:3149
 #, c-format
 msgid "invalid input string for \"Y,YYY\""
 msgstr "chaîne invalide en entrée pour « Y,YYY »"
 
-#: utils/adt/formatting.c:3655
+#: utils/adt/formatting.c:3653
 #, 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:3657
+#: utils/adt/formatting.c:3655
 #, c-format
 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:3752
+#: utils/adt/formatting.c:3750
 #, c-format
 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:4601
+#: utils/adt/formatting.c:4599
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "« EEEE » non supporté en entrée"
 
-#: utils/adt/formatting.c:4613
+#: utils/adt/formatting.c:4611
 #, c-format
 msgid "\"RN\" not supported for input"
 msgstr "« RN » non supporté en entrée"
@@ -18281,7 +18282,7 @@
 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:301 utils/adt/geo_ops.c:1400 utils/adt/geo_ops.c:3498 utils/adt/geo_ops.c:4315 utils/adt/geo_ops.c:5259
+#: utils/adt/geo_ops.c:301 utils/adt/geo_ops.c:1400 utils/adt/geo_ops.c:3506 utils/adt/geo_ops.c:4323 utils/adt/geo_ops.c:5267
 #, c-format
 msgid "too many points requested"
 msgstr "trop de points demandé"
@@ -18336,72 +18337,72 @@
 msgid "function \"dist_lb\" not implemented"
 msgstr "la fonction « dist_lb » n'est pas implémentée"
 
-#: utils/adt/geo_ops.c:3073
+#: utils/adt/geo_ops.c:3081
 #, c-format
 msgid "function \"close_sl\" not implemented"
 msgstr "la fonction « close_sl » n'est pas implémentée"
 
-#: utils/adt/geo_ops.c:3175
+#: utils/adt/geo_ops.c:3183
 #, c-format
 msgid "function \"close_lb\" not implemented"
 msgstr "la fonction « close_lb » n'est pas implémentée"
 
-#: utils/adt/geo_ops.c:3464
+#: utils/adt/geo_ops.c:3472
 #, c-format
 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:3489 utils/adt/geo_ops.c:3509
+#: utils/adt/geo_ops.c:3497 utils/adt/geo_ops.c:3517
 #, 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:3549
+#: utils/adt/geo_ops.c:3557
 #, c-format
 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:4074
+#: utils/adt/geo_ops.c:4082
 #, c-format
 msgid "function \"poly_distance\" not implemented"
 msgstr "la fonction « poly_distance » n'est pas implémentée"
 
-#: utils/adt/geo_ops.c:4427
+#: utils/adt/geo_ops.c:4435
 #, c-format
 msgid "function \"path_center\" not implemented"
 msgstr "la fonction « path_center » n'est pas implémentée"
 
-#: utils/adt/geo_ops.c:4444
+#: utils/adt/geo_ops.c:4452
 #, c-format
 msgid "open path cannot be converted to polygon"
 msgstr "le chemin ouvert ne peut être converti en polygône"
 
-#: utils/adt/geo_ops.c:4621 utils/adt/geo_ops.c:4631 utils/adt/geo_ops.c:4646 utils/adt/geo_ops.c:4652
+#: utils/adt/geo_ops.c:4629 utils/adt/geo_ops.c:4639 utils/adt/geo_ops.c:4654 utils/adt/geo_ops.c:4660
 #, 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:4674 utils/adt/geo_ops.c:4682
+#: utils/adt/geo_ops.c:4682 utils/adt/geo_ops.c:4690
 #, c-format
 msgid "could not format \"circle\" value"
 msgstr "n'a pas pu formater la valeur « circle »"
 
-#: utils/adt/geo_ops.c:4709
+#: utils/adt/geo_ops.c:4717
 #, c-format
 msgid "invalid radius in external \"circle\" value"
 msgstr "diamètre invalide pour la valeur externe de « circle »"
 
-#: utils/adt/geo_ops.c:5245
+#: utils/adt/geo_ops.c:5253
 #, c-format
 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:5250
+#: utils/adt/geo_ops.c:5258
 #, c-format
 msgid "must request at least 2 points"
 msgstr "doit demander au moins deux points"
 
-#: utils/adt/geo_ops.c:5294
+#: utils/adt/geo_ops.c:5302
 #, c-format
 msgid "cannot convert empty polygon to circle"
 msgstr "ne peut pas convertir un polygône vide en cercle"
@@ -18421,7 +18422,7 @@
 msgid "oidvector has too many elements"
 msgstr "oidvector a trop d'éléments"
 
-#: utils/adt/int.c:1362 utils/adt/int8.c:1460 utils/adt/numeric.c:1362 utils/adt/timestamp.c:5348 utils/adt/timestamp.c:5429
+#: utils/adt/int.c:1362 utils/adt/int8.c:1460 utils/adt/numeric.c:1358 utils/adt/timestamp.c:5344 utils/adt/timestamp.c:5425
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "la taille du pas ne peut pas valoir zéro"
@@ -18437,7 +18438,7 @@
 msgstr "la valeur « %s » est en dehors des limites du type bigint"
 
 #: utils/adt/int8.c:500 utils/adt/int8.c:529 utils/adt/int8.c:550 utils/adt/int8.c:581 utils/adt/int8.c:615 utils/adt/int8.c:640 utils/adt/int8.c:697 utils/adt/int8.c:714 utils/adt/int8.c:741 utils/adt/int8.c:758 utils/adt/int8.c:834 utils/adt/int8.c:855 utils/adt/int8.c:882 utils/adt/int8.c:915 utils/adt/int8.c:943 utils/adt/int8.c:964 utils/adt/int8.c:991 utils/adt/int8.c:1031 utils/adt/int8.c:1052 utils/adt/int8.c:1079
-#: utils/adt/int8.c:1112 utils/adt/int8.c:1140 utils/adt/int8.c:1161 utils/adt/int8.c:1188 utils/adt/int8.c:1361 utils/adt/int8.c:1400 utils/adt/numeric.c:2955 utils/adt/varbit.c:1645
+#: utils/adt/int8.c:1112 utils/adt/int8.c:1140 utils/adt/int8.c:1161 utils/adt/int8.c:1188 utils/adt/int8.c:1361 utils/adt/int8.c:1400 utils/adt/numeric.c:2951 utils/adt/varbit.c:1655
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint en dehors des limites"
@@ -18555,15 +18556,10 @@
 msgid "key value must be scalar, not array, composite, or json"
 msgstr "la valeur clé doit être scalaire, et non pas un tableau ou une valeur composite ou un json"
 
-#: utils/adt/json.c:2006
-#, c-format
-msgid "could not determine data type for argument 1"
-msgstr "n'a pas pu déterminer le type de données pour l'argument 1"
-
-#: utils/adt/json.c:2016
+#: utils/adt/json.c:2006 utils/adt/json.c:2016 utils/adt/json.c:2142 utils/adt/json.c:2163 utils/adt/json.c:2222 utils/adt/jsonb.c:1214 utils/adt/jsonb.c:1237 utils/adt/jsonb.c:1297
 #, c-format
-msgid "could not determine data type for argument 2"
-msgstr "n'a pas pu déterminer le type de données pour l'argument 2"
+msgid "could not determine data type for argument %d"
+msgstr "n'a pas pu déterminer le type de données pour l'argument %d"
 
 #: utils/adt/json.c:2040 utils/adt/jsonb.c:1781
 #, c-format
@@ -18580,11 +18576,6 @@
 msgid "The arguments of json_build_object() must consist of alternating keys and values."
 msgstr "Les arguments de json_build_object() doivent consister en des clés et valeurs alternées"
 
-#: utils/adt/json.c:2142 utils/adt/json.c:2163 utils/adt/json.c:2222
-#, c-format
-msgid "could not determine data type for argument %d"
-msgstr "n'a pas pu déterminer le type de données pour l'argument %d"
-
 #: utils/adt/json.c:2148
 #, c-format
 msgid "argument %d cannot be null"
@@ -18630,11 +18621,6 @@
 msgid "argument %d: key must not be null"
 msgstr "argument %d : la clé ne doit pas être NULL"
 
-#: utils/adt/jsonb.c:1214 utils/adt/jsonb.c:1237 utils/adt/jsonb.c:1297
-#, c-format
-msgid "argument %d: could not determine data type"
-msgstr "argument %d : n'a pas pu déterminer le type de données"
-
 #: utils/adt/jsonb.c:1834
 #, c-format
 msgid "object keys must be strings"
@@ -18762,12 +18748,22 @@
 msgid "invalid concatenation of jsonb objects"
 msgstr "concaténation invalide d'objets jsonb"
 
+#: utils/adt/jsonfuncs.c:3732
+#, c-format
+msgid "path element at position %d is null"
+msgstr "l'élément du chemin en position %d est NULL"
+
+#: utils/adt/jsonfuncs.c:3888
+#, c-format
+msgid "path element at position %d is not an integer: \"%s\""
+msgstr "l'élément du chemin en position %d n'est pas un entier : « %s »"
+
 #: utils/adt/levenshtein.c:133
 #, c-format
 msgid "levenshtein argument exceeds maximum length of %d characters"
 msgstr "l'argument levenshtein dépasse la longueur maximale de %d caractères"
 
-#: utils/adt/like.c:212 utils/adt/selfuncs.c:5275
+#: utils/adt/like.c:212 utils/adt/selfuncs.c:5379
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "n'a pas pu déterminer le collationnement à utiliser pour ILIKE"
@@ -18975,94 +18971,89 @@
 msgid "cannot subtract inet values of different sizes"
 msgstr "ne peut pas soustraire des valeurs inet de tailles différentes"
 
-#: utils/adt/numeric.c:549 utils/adt/numeric.c:576 utils/adt/numeric.c:4604 utils/adt/numeric.c:4627 utils/adt/numeric.c:4651 utils/adt/numeric.c:4658
+#: utils/adt/numeric.c:549 utils/adt/numeric.c:576 utils/adt/numeric.c:4600 utils/adt/numeric.c:4623 utils/adt/numeric.c:4647
 #, 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:766
-#, c-format
-msgid "invalid length in external \"numeric\" value"
-msgstr "longueur invalide dans la valeur externe « numeric »"
-
-#: utils/adt/numeric.c:779
+#: utils/adt/numeric.c:775
 #, c-format
 msgid "invalid sign in external \"numeric\" value"
 msgstr "signe invalide dans la valeur externe « numeric »"
 
-#: utils/adt/numeric.c:785
+#: utils/adt/numeric.c:781
 #, c-format
 msgid "invalid scale in external \"numeric\" value"
 msgstr "échelle invalide dans la valeur externe « numeric »"
 
-#: utils/adt/numeric.c:794
+#: utils/adt/numeric.c:790
 #, c-format
 msgid "invalid digit in external \"numeric\" value"
 msgstr "chiffre invalide dans la valeur externe « numeric »"
 
-#: utils/adt/numeric.c:985 utils/adt/numeric.c:999
+#: utils/adt/numeric.c:981 utils/adt/numeric.c:995
 #, 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:990
+#: utils/adt/numeric.c:986
 #, 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:1008
+#: utils/adt/numeric.c:1004
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "modificateur de type NUMERIC invalide"
 
-#: utils/adt/numeric.c:1340
+#: utils/adt/numeric.c:1336
 #, c-format
 msgid "start value cannot be NaN"
 msgstr "la valeur de démarrage ne peut pas être NaN"
 
-#: utils/adt/numeric.c:1345
+#: utils/adt/numeric.c:1341
 #, c-format
 msgid "stop value cannot be NaN"
 msgstr "la valeur d'arrêt ne peut pas être NaN"
 
-#: utils/adt/numeric.c:1355
+#: utils/adt/numeric.c:1351
 #, c-format
 msgid "step size cannot be NaN"
 msgstr "la taille du pas ne peut pas être NaN"
 
-#: utils/adt/numeric.c:2550 utils/adt/numeric.c:5104 utils/adt/numeric.c:7132
+#: utils/adt/numeric.c:2546 utils/adt/numeric.c:4662 utils/adt/numeric.c:5107 utils/adt/numeric.c:7135
 #, c-format
 msgid "value overflows numeric format"
 msgstr "la valeur dépasse le format numeric"
 
-#: utils/adt/numeric.c:2881
+#: utils/adt/numeric.c:2877
 #, c-format
 msgid "cannot convert NaN to integer"
 msgstr "ne peut pas convertir NaN en un entier"
 
-#: utils/adt/numeric.c:2947
+#: utils/adt/numeric.c:2943
 #, c-format
 msgid "cannot convert NaN to bigint"
 msgstr "ne peut pas convertir NaN en un entier de type bigint"
 
-#: utils/adt/numeric.c:2992
+#: utils/adt/numeric.c:2988
 #, c-format
 msgid "cannot convert NaN to smallint"
 msgstr "ne peut pas convertir NaN en un entier de type smallint"
 
-#: utils/adt/numeric.c:5174
+#: utils/adt/numeric.c:5177
 #, c-format
 msgid "numeric field overflow"
 msgstr "champ numérique en dehors des limites"
 
-#: utils/adt/numeric.c:5175
+#: utils/adt/numeric.c:5178
 #, 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:6689
+#: utils/adt/numeric.c:6692
 #, c-format
 msgid "argument for function \"exp\" too big"
 msgstr "l'argument de la fonction « exp » est trop gros"
@@ -19122,39 +19113,39 @@
 msgid "percentile value %g is not between 0 and 1"
 msgstr "la valeur centile %g n'est pas entre 0 et 1"
 
-#: utils/adt/pg_locale.c:911
+#: utils/adt/pg_locale.c:1029
 #, c-format
 msgid "Apply system library package updates."
 msgstr "Applique les mises à jour du paquet de bibliothèque système."
 
-#: utils/adt/pg_locale.c:1116
+#: utils/adt/pg_locale.c:1234
 #, 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:1119
+#: utils/adt/pg_locale.c:1237
 #, 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:1206
+#: utils/adt/pg_locale.c:1324
 #, c-format
 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:1221
+#: utils/adt/pg_locale.c:1339
 #, c-format
 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:1392
+#: utils/adt/pg_locale.c:1510
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "caractère multi-octets invalide pour la locale"
 
-#: utils/adt/pg_locale.c:1393
+#: utils/adt/pg_locale.c:1511
 #, c-format
 msgid "The server's LC_CTYPE locale is probably incompatible with the database encoding."
 msgstr ""
@@ -19368,7 +19359,7 @@
 msgid "Junk after right parenthesis or bracket."
 msgstr "Problème après la parenthèse droite ou le crochet droit."
 
-#: utils/adt/regexp.c:285 utils/adt/regexp.c:1288 utils/adt/varlena.c:3588
+#: utils/adt/regexp.c:285 utils/adt/regexp.c:1288 utils/adt/varlena.c:3601
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "l'expression rationnelle a échoué : %s"
@@ -19383,125 +19374,125 @@
 msgid "regexp_split does not support the global option"
 msgstr "regexp_split ne supporte pas l'option globale"
 
-#: utils/adt/regproc.c:128 utils/adt/regproc.c:148
+#: utils/adt/regproc.c:129 utils/adt/regproc.c:149
 #, c-format
 msgid "more than one function named \"%s\""
 msgstr "il existe plus d'une fonction nommée « %s »"
 
-#: utils/adt/regproc.c:587 utils/adt/regproc.c:607
+#: utils/adt/regproc.c:588 utils/adt/regproc.c:608
 #, c-format
 msgid "more than one operator named %s"
 msgstr "il existe plus d'un opérateur nommé%s"
 
-#: utils/adt/regproc.c:779 utils/adt/regproc.c:820 utils/adt/regproc.c:2006 utils/adt/ruleutils.c:8167 utils/adt/ruleutils.c:8292
+#: utils/adt/regproc.c:780 utils/adt/regproc.c:821 utils/adt/regproc.c:2007 utils/adt/ruleutils.c:8293 utils/adt/ruleutils.c:8418
 #, c-format
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
-#: utils/adt/regproc.c:780 utils/adt/regproc.c:821
+#: utils/adt/regproc.c:781 utils/adt/regproc.c:822
 #, c-format
 msgid "Provide two argument types for operator."
 msgstr "Fournit deux types d'argument pour l'opérateur."
 
-#: utils/adt/regproc.c:1594 utils/adt/regproc.c:1618 utils/adt/regproc.c:1715 utils/adt/regproc.c:1739 utils/adt/regproc.c:1841 utils/adt/regproc.c:1846 utils/adt/varlena.c:2859 utils/adt/varlena.c:2864
+#: utils/adt/regproc.c:1595 utils/adt/regproc.c:1619 utils/adt/regproc.c:1716 utils/adt/regproc.c:1740 utils/adt/regproc.c:1842 utils/adt/regproc.c:1847 utils/adt/varlena.c:2872 utils/adt/varlena.c:2877
 #, c-format
 msgid "invalid name syntax"
 msgstr "syntaxe du nom invalide"
 
-#: utils/adt/regproc.c:1904
+#: utils/adt/regproc.c:1905
 #, c-format
 msgid "expected a left parenthesis"
 msgstr "attendait une parenthèse gauche"
 
-#: utils/adt/regproc.c:1920
+#: utils/adt/regproc.c:1921
 #, c-format
 msgid "expected a right parenthesis"
 msgstr "attendait une parenthèse droite"
 
-#: utils/adt/regproc.c:1939
+#: utils/adt/regproc.c:1940
 #, c-format
 msgid "expected a type name"
 msgstr "attendait un nom de type"
 
-#: utils/adt/regproc.c:1971
+#: utils/adt/regproc.c:1972
 #, c-format
 msgid "improper type name"
 msgstr "nom du type invalide"
 
-#: utils/adt/ri_triggers.c:345 utils/adt/ri_triggers.c:2492 utils/adt/ri_triggers.c:3317
+#: utils/adt/ri_triggers.c:343 utils/adt/ri_triggers.c:2490 utils/adt/ri_triggers.c:3315
 #, 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:348 utils/adt/ri_triggers.c:2495
+#: utils/adt/ri_triggers.c:346 utils/adt/ri_triggers.c:2493
 #, c-format
 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:2734
+#: utils/adt/ri_triggers.c:2732
 #, 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:2740
+#: utils/adt/ri_triggers.c:2738
 #, 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:2746
+#: utils/adt/ri_triggers.c:2744
 #, 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:2769
+#: utils/adt/ri_triggers.c:2767
 #, 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:2771
+#: utils/adt/ri_triggers.c:2769
 #, c-format
 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:3227
+#: utils/adt/ri_triggers.c:3225
 #, 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:3231
+#: utils/adt/ri_triggers.c:3229
 #, c-format
 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:3321
+#: utils/adt/ri_triggers.c:3319
 #, 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:3324
+#: utils/adt/ri_triggers.c:3322
 #, c-format
 msgid "Key is not present in table \"%s\"."
 msgstr "La clé n'est pas présente dans la table « %s »."
 
-#: utils/adt/ri_triggers.c:3330
+#: utils/adt/ri_triggers.c:3328
 #, 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:3335
+#: utils/adt/ri_triggers.c:3333
 #, 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 »."
 
-#: utils/adt/ri_triggers.c:3338
+#: utils/adt/ri_triggers.c:3336
 #, c-format
 msgid "Key is still referenced from table \"%s\"."
 msgstr "La clé est toujours référencée à partir de la table « %s »."
@@ -19565,17 +19556,17 @@
 "ne peut pas comparer les types d'enregistrement avec des numéros différents\n"
 "des colonnes"
 
-#: utils/adt/ruleutils.c:4147
+#: utils/adt/ruleutils.c:4153
 #, 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:5260
+#: utils/adt/selfuncs.c:5364
 #, c-format
 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:5363
+#: utils/adt/selfuncs.c:5467
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
 msgstr "la recherche par expression rationnelle n'est pas supportée sur le type bytea"
@@ -19585,127 +19576,127 @@
 msgid "invalid input syntax for type tid: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type tid : « %s »"
 
-#: utils/adt/timestamp.c:99
+#: utils/adt/timestamp.c:100
 #, c-format
 msgid "TIMESTAMP(%d)%s precision must not be negative"
 msgstr "la précision de TIMESTAMP(%d)%s ne doit pas être négative"
 
-#: utils/adt/timestamp.c:105
+#: utils/adt/timestamp.c:106
 #, c-format
 msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
 msgstr "la précision de TIMESTAMP(%d)%s est réduit au maximum autorisé, %d"
 
-#: utils/adt/timestamp.c:170 utils/adt/timestamp.c:444
+#: utils/adt/timestamp.c:171 utils/adt/timestamp.c:445
 #, c-format
 msgid "timestamp out of range: \"%s\""
 msgstr "timestamp en dehors de limites : « %s »"
 
-#: utils/adt/timestamp.c:188 utils/adt/timestamp.c:462 utils/adt/timestamp.c:917
+#: utils/adt/timestamp.c:189 utils/adt/timestamp.c:463 utils/adt/timestamp.c:918
 #, c-format
 msgid "date/time value \"%s\" is no longer supported"
 msgstr "la valeur date/time « %s » n'est plus supportée"
 
-#: utils/adt/timestamp.c:258
+#: utils/adt/timestamp.c:259
 #, c-format
 msgid "timestamp cannot be NaN"
 msgstr "timestamp ne peut pas valoir NaN"
 
-#: utils/adt/timestamp.c:379
+#: utils/adt/timestamp.c:380
 #, c-format
 msgid "timestamp(%d) precision must be between %d and %d"
 msgstr "la précision de timestamp(%d) doit être comprise entre %d et %d"
 
-#: utils/adt/timestamp.c:512
+#: utils/adt/timestamp.c:513
 #, c-format
 msgid "invalid input syntax for numeric time zone: \"%s\""
 msgstr "syntaxe en entrée invalide pour le fuseau horaire numérique : « %s »"
 
-#: utils/adt/timestamp.c:514
+#: utils/adt/timestamp.c:515
 #, c-format
 msgid "Numeric time zones must have \"-\" or \"+\" as first character."
 msgstr "Les fuseaux horaires numériques doivent avoir « - » ou « + » comme premier caractère."
 
-#: utils/adt/timestamp.c:527
+#: utils/adt/timestamp.c:528
 #, c-format
 msgid "numeric time zone \"%s\" out of range"
 msgstr "le fuseau horaire numérique « %s » est en dehors des limites"
 
-#: utils/adt/timestamp.c:630 utils/adt/timestamp.c:640
+#: utils/adt/timestamp.c:631 utils/adt/timestamp.c:641
 #, c-format
 msgid "timestamp out of range: %d-%02d-%02d %d:%02d:%02g"
 msgstr "timestamp en dehors de limites : %d-%02d-%02d %d:%02d:%02g"
 
-#: utils/adt/timestamp.c:911 utils/adt/timestamp.c:1482 utils/adt/timestamp.c:1985 utils/adt/timestamp.c:3125 utils/adt/timestamp.c:3130 utils/adt/timestamp.c:3135 utils/adt/timestamp.c:3185 utils/adt/timestamp.c:3192 utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3219 utils/adt/timestamp.c:3226 utils/adt/timestamp.c:3233 utils/adt/timestamp.c:3262 utils/adt/timestamp.c:3269 utils/adt/timestamp.c:3314 utils/adt/timestamp.c:3605
-#: utils/adt/timestamp.c:3734 utils/adt/timestamp.c:4125
+#: utils/adt/timestamp.c:912 utils/adt/timestamp.c:1536 utils/adt/timestamp.c:2042 utils/adt/timestamp.c:3224 utils/adt/timestamp.c:3229 utils/adt/timestamp.c:3234 utils/adt/timestamp.c:3284 utils/adt/timestamp.c:3291 utils/adt/timestamp.c:3298 utils/adt/timestamp.c:3318 utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3332 utils/adt/timestamp.c:3361 utils/adt/timestamp.c:3368 utils/adt/timestamp.c:3413 utils/adt/timestamp.c:3704
+#: utils/adt/timestamp.c:3833 utils/adt/timestamp.c:4224
 #, c-format
 msgid "interval out of range"
 msgstr "intervalle en dehors des limites"
 
-#: utils/adt/timestamp.c:1052 utils/adt/timestamp.c:1085
+#: utils/adt/timestamp.c:1053 utils/adt/timestamp.c:1086
 #, c-format
 msgid "invalid INTERVAL type modifier"
 msgstr "modificateur de type INTERVAL invalide"
 
-#: utils/adt/timestamp.c:1068
+#: utils/adt/timestamp.c:1069
 #, c-format
 msgid "INTERVAL(%d) precision must not be negative"
 msgstr "la précision de l'intervalle INTERVAL(%d) ne doit pas être négative"
 
-#: utils/adt/timestamp.c:1074
+#: utils/adt/timestamp.c:1075
 #, c-format
 msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
 msgstr "La précision de l'intervalle INTERVAL(%d) doit être réduit au maximum permis, %d"
 
-#: utils/adt/timestamp.c:1426
+#: utils/adt/timestamp.c:1480
 #, c-format
 msgid "interval(%d) precision must be between %d and %d"
 msgstr "La précision de interval(%d) doit être comprise entre %d et %d"
 
-#: utils/adt/timestamp.c:2714
+#: utils/adt/timestamp.c:2813
 #, c-format
 msgid "cannot subtract infinite timestamps"
 msgstr "ne peut pas soustraire les valeurs timestamps infinies"
 
-#: utils/adt/timestamp.c:3860 utils/adt/timestamp.c:4486 utils/adt/timestamp.c:4506
+#: utils/adt/timestamp.c:3959 utils/adt/timestamp.c:4585 utils/adt/timestamp.c:4605
 #, c-format
 msgid "timestamp units \"%s\" not supported"
 msgstr "les unités timestamp « %s » ne sont pas supportées"
 
-#: utils/adt/timestamp.c:3874 utils/adt/timestamp.c:4516
+#: utils/adt/timestamp.c:3973 utils/adt/timestamp.c:4615
 #, c-format
 msgid "timestamp units \"%s\" not recognized"
 msgstr "les unité « %s » ne sont pas reconnues pour le type timestamp"
 
-#: utils/adt/timestamp.c:4014 utils/adt/timestamp.c:4697 utils/adt/timestamp.c:4718
+#: utils/adt/timestamp.c:4113 utils/adt/timestamp.c:4796 utils/adt/timestamp.c:4817
 #, c-format
 msgid "timestamp with time zone units \"%s\" not supported"
 msgstr ""
 "les unités « %s » ne sont pas supportées pour le type  « timestamp with time\n"
 "zone »"
 
-#: utils/adt/timestamp.c:4031 utils/adt/timestamp.c:4727
+#: utils/adt/timestamp.c:4130 utils/adt/timestamp.c:4826
 #, c-format
 msgid "timestamp with time zone units \"%s\" not recognized"
 msgstr ""
 "Les unités « %s » ne sont pas reconnues pour le type  « timestamp with time\n"
 "zone »"
 
-#: utils/adt/timestamp.c:4112
+#: utils/adt/timestamp.c:4211
 #, c-format
 msgid "interval units \"%s\" not supported because months usually have fractional weeks"
 msgstr "unités d'intervalle « %s » non supporté car les mois ont généralement des semaines fractionnaires"
 
-#: utils/adt/timestamp.c:4118 utils/adt/timestamp.c:4833
+#: utils/adt/timestamp.c:4217 utils/adt/timestamp.c:4932
 #, c-format
 msgid "interval units \"%s\" not supported"
 msgstr "Les unités « %s » ne sont pas supportées pour le type interval"
 
-#: utils/adt/timestamp.c:4134 utils/adt/timestamp.c:4860
+#: utils/adt/timestamp.c:4233 utils/adt/timestamp.c:4959
 #, c-format
 msgid "interval units \"%s\" not recognized"
 msgstr "Les unités « %s » ne sont pas reconnues pour le type interval"
 
-#: utils/adt/timestamp.c:5024 utils/adt/timestamp.c:5254
+#: utils/adt/timestamp.c:5054 utils/adt/timestamp.c:5250
 #, c-format
 msgid "could not convert to time zone \"%s\""
 msgstr "n'a pas pu convertir vers le fuseau horaire « %s »"
@@ -19765,7 +19756,7 @@
 msgid "text-search query doesn't contain lexemes: \"%s\""
 msgstr "la requête de recherche plein texte ne contient pas de lexemes : « %s »"
 
-#: utils/adt/tsquery.c:521 utils/adt/tsquery_util.c:340
+#: utils/adt/tsquery.c:521 utils/adt/tsquery_util.c:371
 #, c-format
 msgid "tsquery is too large"
 msgstr "le champ tsquery est trop gros"
@@ -19777,7 +19768,7 @@
 "la requête de recherche plein texte ne contient que des termes courants\n"
 "ou ne contient pas de lexemes, ignoré"
 
-#: utils/adt/tsquery_rewrite.c:293
+#: utils/adt/tsquery_rewrite.c:322
 #, c-format
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "la requête ts_rewrite doit renvoyer deux colonnes tsquery"
@@ -19812,44 +19803,44 @@
 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:1173
+#: utils/adt/tsvector_op.c:1174
 #, c-format
 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:1353
+#: utils/adt/tsvector_op.c:1354
 #, c-format
 msgid "tsvector column \"%s\" does not exist"
 msgstr "la colonne tsvector « %s » n'existe pas"
 
-#: utils/adt/tsvector_op.c:1359
+#: utils/adt/tsvector_op.c:1360
 #, 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:1371
+#: utils/adt/tsvector_op.c:1372
 #, c-format
 msgid "configuration column \"%s\" does not exist"
 msgstr "la colonne de configuration « %s » n'existe pas"
 
-#: utils/adt/tsvector_op.c:1377
+#: utils/adt/tsvector_op.c:1378
 #, 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:1384
+#: utils/adt/tsvector_op.c:1385
 #, 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:1397
+#: utils/adt/tsvector_op.c:1398
 #, 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:1422
+#: utils/adt/tsvector_op.c:1423
 #, c-format
 msgid "column \"%s\" is not of a character type"
 msgstr "la colonne « %s » n'est pas de type caractère"
@@ -19924,7 +19915,7 @@
 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:1066 utils/adt/varbit.c:1168 utils/adt/varlena.c:832 utils/adt/varlena.c:896 utils/adt/varlena.c:1040 utils/adt/varlena.c:2510 utils/adt/varlena.c:2577
+#: utils/adt/varbit.c:1066 utils/adt/varbit.c:1168 utils/adt/varlena.c:832 utils/adt/varlena.c:896 utils/adt/varlena.c:1040 utils/adt/varlena.c:2523 utils/adt/varlena.c:2590
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "longueur de sous-chaîne négative non autorisée"
@@ -19944,12 +19935,12 @@
 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:1793 utils/adt/varbit.c:1851
+#: utils/adt/varbit.c:1803 utils/adt/varbit.c:1861
 #, 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:1802 utils/adt/varlena.c:2777
+#: utils/adt/varbit.c:1812 utils/adt/varlena.c:2790
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "le nouveau bit doit valoir soit 0 soit 1"
@@ -19979,47 +19970,47 @@
 msgid "could not compare Unicode strings: %m"
 msgstr "n'a pas pu comparer les chaînes unicode : %m"
 
-#: utils/adt/varlena.c:2655 utils/adt/varlena.c:2686 utils/adt/varlena.c:2722 utils/adt/varlena.c:2765
+#: utils/adt/varlena.c:2668 utils/adt/varlena.c:2699 utils/adt/varlena.c:2735 utils/adt/varlena.c:2778
 #, 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:3684
+#: utils/adt/varlena.c:3697
 #, c-format
 msgid "field position must be greater than zero"
 msgstr "la position du champ doit être plus grand que zéro"
 
-#: utils/adt/varlena.c:4563
+#: utils/adt/varlena.c:4576
 #, c-format
 msgid "unterminated format specifier"
 msgstr "spécificateur de format non terminé"
 
-#: utils/adt/varlena.c:4695 utils/adt/varlena.c:4815
+#: utils/adt/varlena.c:4708 utils/adt/varlena.c:4828
 #, c-format
 msgid "unrecognized conversion type specifier \"%c\""
 msgstr "spécificateur de type de conversion « %c » non reconnu"
 
-#: utils/adt/varlena.c:4707 utils/adt/varlena.c:4764
+#: utils/adt/varlena.c:4720 utils/adt/varlena.c:4777
 #, c-format
 msgid "too few arguments for format"
 msgstr "trop peu d'arguments pour le format"
 
-#: utils/adt/varlena.c:4858 utils/adt/varlena.c:5041
+#: utils/adt/varlena.c:4871 utils/adt/varlena.c:5054
 #, c-format
 msgid "number is out of range"
 msgstr "le nombre est en dehors des limites"
 
-#: utils/adt/varlena.c:4922 utils/adt/varlena.c:4950
+#: utils/adt/varlena.c:4935 utils/adt/varlena.c:4963
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr "le format indique l'argument 0 mais les arguments sont numérotés à partir de 1"
 
-#: utils/adt/varlena.c:4943
+#: utils/adt/varlena.c:4956
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "la position de l'argument width doit se terminer par « $ »"
 
-#: utils/adt/varlena.c:4988
+#: utils/adt/varlena.c:5001
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "les valeurs NULL ne peuvent pas être formatés comme un identifiant SQL"
@@ -20034,74 +20025,74 @@
 msgid "argument of nth_value must be greater than zero"
 msgstr "l'argument de nth_value doit être supérieur à zéro"
 
-#: utils/adt/xml.c:171
+#: utils/adt/xml.c:175
 #, c-format
 msgid "unsupported XML feature"
 msgstr "fonctionnalité XML non supportée"
 
-#: utils/adt/xml.c:172
+#: utils/adt/xml.c:176
 #, c-format
 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:173
+#: utils/adt/xml.c:177
 #, c-format
 msgid "You need to rebuild PostgreSQL using --with-libxml."
 msgstr "Vous devez recompiler PostgreSQL en utilisant --with-libxml."
 
-#: utils/adt/xml.c:192 utils/mb/mbutils.c:523
+#: utils/adt/xml.c:196 utils/mb/mbutils.c:523
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "nom d'encodage « %s » invalide"
 
-#: utils/adt/xml.c:435 utils/adt/xml.c:440
+#: utils/adt/xml.c:439 utils/adt/xml.c:444
 #, c-format
 msgid "invalid XML comment"
 msgstr "commentaire XML invalide"
 
-#: utils/adt/xml.c:569
+#: utils/adt/xml.c:573
 #, c-format
 msgid "not an XML document"
 msgstr "pas un document XML"
 
-#: utils/adt/xml.c:728 utils/adt/xml.c:751
+#: utils/adt/xml.c:732 utils/adt/xml.c:755
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "instruction de traitement XML invalide"
 
-#: utils/adt/xml.c:729
+#: utils/adt/xml.c:733
 #, 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 »."
 
-#: utils/adt/xml.c:752
+#: utils/adt/xml.c:756
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "l'instruction de traitement XML ne peut pas contenir « ?> »."
 
-#: utils/adt/xml.c:831
+#: utils/adt/xml.c:835
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "xmlvalidate n'est pas implémenté"
 
-#: utils/adt/xml.c:910
+#: utils/adt/xml.c:914
 #, c-format
 msgid "could not initialize XML library"
 msgstr "n'a pas pu initialiser la bibliothèque XML"
 
-#: utils/adt/xml.c:911
+#: utils/adt/xml.c:915
 #, 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."
 
-#: utils/adt/xml.c:997
+#: utils/adt/xml.c:1001
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "n'a pas pu configurer le gestionnaire d'erreurs XML"
 
-#: utils/adt/xml.c:998
+#: utils/adt/xml.c:1002
 #, c-format
 msgid "This probably indicates that the version of libxml2 being used is not compatible with the libxml2 header files that PostgreSQL was built with."
 msgstr ""
@@ -20109,73 +20100,73 @@
 "n'est pas compatible avec les fichiers d'en-tête de libxml2 avec lesquels\n"
 "PostgreSQL a été construit."
 
-#: utils/adt/xml.c:1737
+#: utils/adt/xml.c:1741
 msgid "Invalid character value."
 msgstr "Valeur invalide pour le caractère."
 
-#: utils/adt/xml.c:1740
+#: utils/adt/xml.c:1744
 msgid "Space required."
 msgstr "Espace requis."
 
-#: utils/adt/xml.c:1743
+#: utils/adt/xml.c:1747
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "la version autonome accepte seulement 'yes' et 'no'."
 
-#: utils/adt/xml.c:1746
+#: utils/adt/xml.c:1750
 msgid "Malformed declaration: missing version."
 msgstr "Déclaration mal formée : version manquante."
 
-#: utils/adt/xml.c:1749
+#: utils/adt/xml.c:1753
 msgid "Missing encoding in text declaration."
 msgstr "Encodage manquant dans la déclaration du texte."
 
-#: utils/adt/xml.c:1752
+#: utils/adt/xml.c:1756
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "Analyse de la déclaration XML : « ?> » attendu."
 
-#: utils/adt/xml.c:1755
+#: utils/adt/xml.c:1759
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "code d'erreur libxml inconnu : %d"
 
-#: utils/adt/xml.c:2030
+#: utils/adt/xml.c:2034
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML ne supporte pas les valeurs infinies de date."
 
-#: utils/adt/xml.c:2052 utils/adt/xml.c:2079
+#: utils/adt/xml.c:2056 utils/adt/xml.c:2083
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML ne supporte pas les valeurs infinies de timestamp."
 
-#: utils/adt/xml.c:2470
+#: utils/adt/xml.c:2483
 #, c-format
 msgid "invalid query"
 msgstr "requête invalide"
 
-#: utils/adt/xml.c:3795
+#: utils/adt/xml.c:3808
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "tableau invalide pour la correspondance de l'espace de nom XML"
 
-#: utils/adt/xml.c:3796
+#: utils/adt/xml.c:3809
 #, c-format
 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/adt/xml.c:3820
+#: utils/adt/xml.c:3833
 #, c-format
 msgid "empty XPath expression"
 msgstr "expression XPath vide"
 
-#: utils/adt/xml.c:3869
+#: utils/adt/xml.c:3882
 #, c-format
 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/adt/xml.c:3876
+#: utils/adt/xml.c:3889
 #, 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 »"
@@ -20195,22 +20186,22 @@
 msgid "no output function available for type %s"
 msgstr "aucune fonction en sortie disponible pour le type %s"
 
-#: utils/cache/plancache.c:725
+#: utils/cache/plancache.c:731
 #, c-format
 msgid "cached plan must not change result type"
 msgstr "le plan en cache ne doit pas modifier le type en résultat"
 
-#: utils/cache/relcache.c:5021
+#: utils/cache/relcache.c:5048
 #, 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:5023
+#: utils/cache/relcache.c:5050
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Continue malgré tout, mais quelque chose s'est mal passé."
 
-#: utils/cache/relcache.c:5256
+#: utils/cache/relcache.c:5283
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "n'a pas pu supprimer le fichier cache « %s » : %m"
@@ -20286,95 +20277,95 @@
 "erreur survenue à %s:%d avant que le traitement des messages d'erreurs ne\n"
 "soit disponible\n"
 
-#: utils/error/elog.c:1864
+#: utils/error/elog.c:1873
 #, 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/error/elog.c:1877
+#: utils/error/elog.c:1886
 #, 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/error/elog.c:2353 utils/error/elog.c:2370 utils/error/elog.c:2386
+#: utils/error/elog.c:2362 utils/error/elog.c:2379 utils/error/elog.c:2395
 msgid "[unknown]"
 msgstr "[inconnu]"
 
-#: utils/error/elog.c:2825 utils/error/elog.c:3124 utils/error/elog.c:3232
+#: utils/error/elog.c:2834 utils/error/elog.c:3133 utils/error/elog.c:3241
 msgid "missing error text"
 msgstr "texte d'erreur manquant"
 
-#: utils/error/elog.c:2828 utils/error/elog.c:2831 utils/error/elog.c:3235 utils/error/elog.c:3238
+#: utils/error/elog.c:2837 utils/error/elog.c:2840 utils/error/elog.c:3244 utils/error/elog.c:3247
 #, c-format
 msgid " at character %d"
 msgstr " au caractère %d"
 
-#: utils/error/elog.c:2841 utils/error/elog.c:2848
+#: utils/error/elog.c:2850 utils/error/elog.c:2857
 msgid "DETAIL:  "
 msgstr "DÉTAIL:  "
 
-#: utils/error/elog.c:2855
+#: utils/error/elog.c:2864
 msgid "HINT:  "
 msgstr "ASTUCE :  "
 
-#: utils/error/elog.c:2862
+#: utils/error/elog.c:2871
 msgid "QUERY:  "
 msgstr "REQUÊTE :  "
 
-#: utils/error/elog.c:2869
+#: utils/error/elog.c:2878
 msgid "CONTEXT:  "
 msgstr "CONTEXTE :  "
 
-#: utils/error/elog.c:2879
+#: utils/error/elog.c:2888
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "EMPLACEMENT :  %s, %s:%d\n"
 
-#: utils/error/elog.c:2886
+#: utils/error/elog.c:2895
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "EMPLACEMENT :  %s:%d\n"
 
-#: utils/error/elog.c:2900
+#: utils/error/elog.c:2909
 msgid "STATEMENT:  "
 msgstr "INSTRUCTION :  "
 
 #. translator: This string will be truncated at 47
 #. characters expanded.
-#: utils/error/elog.c:3353
+#: utils/error/elog.c:3362
 #, c-format
 msgid "operating system error %d"
 msgstr "erreur %d du système d'exploitation"
 
-#: utils/error/elog.c:3548
+#: utils/error/elog.c:3557
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: utils/error/elog.c:3552
+#: utils/error/elog.c:3561
 msgid "LOG"
 msgstr "LOG"
 
-#: utils/error/elog.c:3555
+#: utils/error/elog.c:3564
 msgid "INFO"
 msgstr "INFO"
 
-#: utils/error/elog.c:3558
+#: utils/error/elog.c:3567
 msgid "NOTICE"
 msgstr "NOTICE"
 
-#: utils/error/elog.c:3561
+#: utils/error/elog.c:3570
 msgid "WARNING"
 msgstr "ATTENTION"
 
-#: utils/error/elog.c:3564
+#: utils/error/elog.c:3573
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: utils/error/elog.c:3567
+#: utils/error/elog.c:3576
 msgid "FATAL"
 msgstr "FATAL"
 
-#: utils/error/elog.c:3570
+#: utils/error/elog.c:3579
 msgid "PANIC"
 msgstr "PANIC"
 
@@ -20525,88 +20516,93 @@
 "ne peut pas configurer le paramètre « %s » à l'intérieur d'une fonction\n"
 "restreinte pour sécurité"
 
-#: utils/init/miscinit.c:522
+#: utils/init/miscinit.c:502
+#, c-format
+msgid "role with OID %u does not exist"
+msgstr "le rôle d'OID %u n'existe pas"
+
+#: utils/init/miscinit.c:532
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "le rôle « %s » n'est pas autorisé à se connecter"
 
-#: utils/init/miscinit.c:540
+#: utils/init/miscinit.c:550
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "trop de connexions pour le rôle « %s »"
 
-#: utils/init/miscinit.c:600
+#: utils/init/miscinit.c:610
 #, c-format
 msgid "permission denied to set session authorization"
 msgstr "droit refusé pour initialiser une autorisation de session"
 
-#: utils/init/miscinit.c:683
+#: utils/init/miscinit.c:693
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "OID du rôle invalide : %u"
 
-#: utils/init/miscinit.c:813
+#: utils/init/miscinit.c:823
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "n'a pas pu créer le fichier verrou « %s » : %m"
 
-#: utils/init/miscinit.c:827
+#: utils/init/miscinit.c:837
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier verrou « %s » : %m"
 
-#: utils/init/miscinit.c:833
+#: utils/init/miscinit.c:843
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "n'a pas pu lire le fichier verrou « %s » : %m"
 
-#: utils/init/miscinit.c:841
+#: utils/init/miscinit.c:851
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "le fichier verrou « %s » est vide"
 
-#: utils/init/miscinit.c:842
+#: utils/init/miscinit.c:852
 #, c-format
 msgid "Either another server is starting, or the lock file is the remnant of a previous server startup crash."
 msgstr "Soit un autre serveur est en cours de démarrage, soit le fichier verrou est un reste d'un précédent crash au démarrage du serveur"
 
-#: utils/init/miscinit.c:889
+#: utils/init/miscinit.c:899
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "le fichier verrou « %s » existe déjà"
 
-#: utils/init/miscinit.c:893
+#: utils/init/miscinit.c:903
 #, c-format
 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/init/miscinit.c:895
+#: utils/init/miscinit.c:905
 #, c-format
 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/init/miscinit.c:898
+#: utils/init/miscinit.c:908
 #, 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 » ?"
 
-#: utils/init/miscinit.c:900
+#: utils/init/miscinit.c:910
 #, 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 » ?"
 
-#: utils/init/miscinit.c:936
+#: utils/init/miscinit.c:946
 #, c-format
 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/init/miscinit.c:939
+#: utils/init/miscinit.c:949
 #, 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 ""
@@ -20614,66 +20610,66 @@
 "d'exécution, supprimez le bloc de mémoire partagée\n"
 "ou supprimez simplement le fichier « %s »."
 
-#: utils/init/miscinit.c:955
+#: utils/init/miscinit.c:965
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "n'a pas pu supprimer le vieux fichier verrou « %s » : %m"
 
-#: utils/init/miscinit.c:957
+#: utils/init/miscinit.c:967
 #, c-format
 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/init/miscinit.c:993 utils/init/miscinit.c:1004 utils/init/miscinit.c:1014
+#: utils/init/miscinit.c:1003 utils/init/miscinit.c:1014 utils/init/miscinit.c:1024
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "n'a pas pu écrire le fichier verrou « %s » : %m"
 
-#: utils/init/miscinit.c:1143 utils/init/miscinit.c:1272 utils/misc/guc.c:8589
+#: utils/init/miscinit.c:1153 utils/init/miscinit.c:1282 utils/misc/guc.c:8610
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "n'a pas pu lire à partir du fichier « %s » : %m"
 
-#: utils/init/miscinit.c:1262
+#: utils/init/miscinit.c:1272
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m ; poursuite du traitement"
 
-#: utils/init/miscinit.c:1285
+#: utils/init/miscinit.c:1295
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
 msgstr "le fichier de verrou « %s » contient le mauvais PID : %ld au lieu de %ld"
 
-#: utils/init/miscinit.c:1327 utils/init/miscinit.c:1340
+#: utils/init/miscinit.c:1337 utils/init/miscinit.c:1350
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "« %s » n'est pas un répertoire de données valide"
 
-#: utils/init/miscinit.c:1329
+#: utils/init/miscinit.c:1339
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "le fichier « %s » est manquant."
 
-#: utils/init/miscinit.c:1342
+#: utils/init/miscinit.c:1352
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "le fichier « %s » ne contient aucune données valides."
 
-#: utils/init/miscinit.c:1344
+#: utils/init/miscinit.c:1354
 #, c-format
 msgid "You might need to initdb."
 msgstr "Vous pouvez avoir besoin d'exécuter initdb."
 
-#: utils/init/miscinit.c:1352
+#: utils/init/miscinit.c:1362
 #, 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/init/miscinit.c:1423
+#: utils/init/miscinit.c:1433
 #, c-format
 msgid "loaded library \"%s\""
 msgstr "bibliothèque « %s » chargée"
@@ -21838,18 +21834,12 @@
 msgstr "Initialise le nombre de journaux de transactions conservés tenus par les seveurs en attente."
 
 #: utils/misc/guc.c:2167
-#, fuzzy
-#| msgid "Sets the maximum time to wait for WAL replication."
 msgid "Sets the minimum size to shrink the WAL to."
-msgstr "Initialise le temps maximum à attendre pour la réplication des WAL."
+msgstr "Initialise la taille minimale des journaux de transactions."
 
 #: utils/misc/guc.c:2178
-#, fuzzy
-#| msgid "Sets the maximum time between automatic WAL checkpoints."
 msgid "Sets the WAL size that triggers a checkpoint."
-msgstr ""
-"Initialise le temps maximum entre des points de vérification (checkpoints)\n"
-"pour les journaux de transactions."
+msgstr "Initialise la taille des journaux de transactions déclenchant un checkpoint."
 
 #: utils/misc/guc.c:2189
 msgid "Sets the maximum time between automatic WAL checkpoints."
@@ -22003,6 +21993,8 @@
 #: utils/misc/guc.c:2465
 msgid "Sets the time to wait before retrying to retrieve WAL after a failed attempt."
 msgstr ""
+"Configure le temps à attendre avant d'essayer de nouveau de récupérer le WAL\n"
+"après une tentative échouée."
 
 #: utils/misc/guc.c:2477
 msgid "Shows the number of pages per write ahead log segment."
@@ -22054,7 +22046,7 @@
 
 #: utils/misc/guc.c:2583
 msgid "SSL regenotiation is no longer supported; this can only be 0."
-msgstr ""
+msgstr "la renégotiation SSL n'est plus supportée ; ce paramètre peut seulement valoir 0"
 
 #: utils/misc/guc.c:2594
 msgid "Maximum number of TCP keepalive retransmits."
@@ -22103,10 +22095,8 @@
 msgstr "Configure la taille réservée pour pg_stat_activity.query, en octets."
 
 #: utils/misc/guc.c:2668
-#, fuzzy
-#| msgid "Sets the maximum time to wait for WAL replication."
 msgid "Sets the maximum size of the pending list for GIN index."
-msgstr "Initialise le temps maximum à attendre pour la réplication des WAL."
+msgstr "Initialise la taille maximale de la liste d'attente d'un index GIN."
 
 #: utils/misc/guc.c:2688
 msgid "Sets the planner's estimate of the cost of a sequentially fetched disk page."
@@ -22419,7 +22409,7 @@
 
 #: utils/misc/guc.c:3391
 msgid "Sets the name of the cluster, which is included in the process title."
-msgstr ""
+msgstr "Configure le nom de l'instance, qui est inclus dans le titre des processus"
 
 #: utils/misc/guc.c:3411
 msgid "Sets whether \"\\'\" is allowed in string literals."
@@ -22591,12 +22581,12 @@
 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:5675 utils/misc/guc.c:7004
+#: utils/misc/guc.c:5675 utils/misc/guc.c:7017
 #, c-format
 msgid "cannot set parameters during a parallel operation"
 msgstr "ne peut pas configurer les paramètres lors d'une opération parallèle"
 
-#: utils/misc/guc.c:5682 utils/misc/guc.c:6432 utils/misc/guc.c:6484 utils/misc/guc.c:6845 utils/misc/guc.c:7592 utils/misc/guc.c:7751 utils/misc/guc.c:9386
+#: utils/misc/guc.c:5682 utils/misc/guc.c:6432 utils/misc/guc.c:6484 utils/misc/guc.c:6845 utils/misc/guc.c:7605 utils/misc/guc.c:7764 utils/misc/guc.c:9417
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "paramètre de configuration « %s » non reconnu"
@@ -22611,7 +22601,7 @@
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "le paramètre « %s » ne peut pas être modifié maintenant"
 
-#: utils/misc/guc.c:5748 utils/misc/guc.c:5793 utils/misc/guc.c:9402
+#: utils/misc/guc.c:5748 utils/misc/guc.c:5793 utils/misc/guc.c:9433
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "droit refusé pour initialiser le paramètre « %s »"
@@ -22628,7 +22618,7 @@
 "ne peut pas configurer le paramètre « %s » à l'intérieur d'une fonction\n"
 "SECURITY DEFINER"
 
-#: utils/misc/guc.c:6440 utils/misc/guc.c:6488 utils/misc/guc.c:7755
+#: utils/misc/guc.c:6440 utils/misc/guc.c:6488 utils/misc/guc.c:7768
 #, c-format
 msgid "must be superuser to examine \"%s\""
 msgstr "doit être super-utilisateur pour examiner « %s »"
@@ -22643,67 +22633,74 @@
 msgid "must be superuser to execute ALTER SYSTEM command"
 msgstr "doit être super-utilisateur pour exécuter la commande ALTER SYSTEM"
 
-#: utils/misc/guc.c:6918
+#: utils/misc/guc.c:6890
+#, c-format
+msgid "parameter value for ALTER SYSTEM must not contain a newline"
+msgstr ""
+"la valeur du paramètre pour ALTER SYSTEM ne doit pas contenir de retour à la\n"
+"ligne"
+
+#: utils/misc/guc.c:6935
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "n'a pas pu analyser le contenu du fichier « %s »"
 
-#: utils/misc/guc.c:7080
+#: utils/misc/guc.c:7093
 #, c-format
 msgid "SET LOCAL TRANSACTION SNAPSHOT is not implemented"
 msgstr "SET LOCAL TRANSACTION SNAPSHOT n'est pas implémenté"
 
-#: utils/misc/guc.c:7165
+#: utils/misc/guc.c:7178
 #, c-format
 msgid "SET requires parameter name"
 msgstr "SET requiert le nom du paramètre"
 
-#: utils/misc/guc.c:7289
+#: utils/misc/guc.c:7302
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "tentative de redéfinition du paramètre « %s »"
 
-#: utils/misc/guc.c:9019
+#: utils/misc/guc.c:9050
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "le paramètre « %s » n'a pas pu être configuré"
 
-#: utils/misc/guc.c:9106
+#: utils/misc/guc.c:9137
 #, 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:9464 utils/misc/guc.c:9498
+#: utils/misc/guc.c:9495 utils/misc/guc.c:9529
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "valeur invalide pour le paramètre « %s » : %d"
 
-#: utils/misc/guc.c:9532
+#: utils/misc/guc.c:9563
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "valeur invalide pour le paramètre « %s » : %g"
 
-#: utils/misc/guc.c:9722
+#: utils/misc/guc.c:9753
 #, c-format
 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/misc/guc.c:9734
+#: utils/misc/guc.c:9765
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour n'est pas supporté dans cette installation"
 
-#: utils/misc/guc.c:9747
+#: utils/misc/guc.c:9778
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL n'est pas supporté dans cette installation"
 
-#: utils/misc/guc.c:9759
+#: utils/misc/guc.c:9790
 #, c-format
 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:9771
+#: utils/misc/guc.c:9802
 #, c-format
 msgid "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr ""
@@ -22715,11 +22712,16 @@
 msgid "internal error: unrecognized run-time parameter type\n"
 msgstr "erreur interne : type de paramètre d'exécution non reconnu\n"
 
+#. translator: %d.%02ds is system CPU time, %d.%02du is user CPU time
+#: utils/misc/pg_rusage.c:66
+#, c-format
+msgid "CPU %d.%02ds/%d.%02du sec elapsed %d.%02d sec"
+msgstr "CPU %d.%02ds/%d.%02du sec elapsed %d.%02d sec"
+
 #: utils/misc/rls.c:127
-#, fuzzy, c-format
-#| msgid "remove a row level security policy from a table"
+#, c-format
 msgid "query would be affected by row-level security policy for table \"%s\""
-msgstr "supprimer une nouvelle politique de sécurité au niveau ligne pour une table"
+msgstr "la requête serait affectée par la politique de sécurité au niveau ligne de la table « %s »"
 
 #: utils/misc/rls.c:129
 #, c-format
@@ -22810,12 +22812,12 @@
 "@INCLUDE sans nom de fichier dans le fichier des fuseaux horaires « %s »,\n"
 "ligne %d"
 
-#: utils/mmgr/aset.c:505
+#: utils/mmgr/aset.c:506
 #, c-format
 msgid "Failed while creating memory context \"%s\"."
 msgstr "Échec lors de la création du contexte mémoire « %s »."
 
-#: utils/mmgr/mcxt.c:689 utils/mmgr/mcxt.c:724 utils/mmgr/mcxt.c:761 utils/mmgr/mcxt.c:798 utils/mmgr/mcxt.c:832 utils/mmgr/mcxt.c:861 utils/mmgr/mcxt.c:895 utils/mmgr/mcxt.c:975 utils/mmgr/mcxt.c:1008 utils/mmgr/mcxt.c:1055
+#: utils/mmgr/mcxt.c:689 utils/mmgr/mcxt.c:724 utils/mmgr/mcxt.c:761 utils/mmgr/mcxt.c:798 utils/mmgr/mcxt.c:832 utils/mmgr/mcxt.c:861 utils/mmgr/mcxt.c:895 utils/mmgr/mcxt.c:977 utils/mmgr/mcxt.c:1011 utils/mmgr/mcxt.c:1060
 #, c-format
 msgid "Failed on request of size %zu."
 msgstr "Échec d'une requête de taille %zu."
@@ -22850,17 +22852,17 @@
 msgid "could not read block %ld of temporary file: %m"
 msgstr "n'a pas pu lire le bloc %ld du fichier temporaire : %m"
 
-#: utils/sort/tuplesort.c:3606
+#: utils/sort/tuplesort.c:3611
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "n'a pas pu créer l'index unique « %s »"
 
-#: utils/sort/tuplesort.c:3608
+#: utils/sort/tuplesort.c:3613
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "La clé %s est dupliquée."
 
-#: utils/sort/tuplesort.c:3609
+#: utils/sort/tuplesort.c:3614
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "Des clés dupliquées existent."
@@ -22880,1615 +22882,1665 @@
 msgid "could not write to tuplestore temporary file: %m"
 msgstr "n'a pas pu écrire le fichier temporaire tuplestore : %m"
 
-#: utils/time/snapmgr.c:432
+#: utils/time/snapmgr.c:473
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "La transaction source n'est plus en cours d'exécution."
 
-#: utils/time/snapmgr.c:986
+#: utils/time/snapmgr.c:1038
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "ne peut pas exporter un snapshot dans un sous-transaction"
 
-#: utils/time/snapmgr.c:1135 utils/time/snapmgr.c:1140 utils/time/snapmgr.c:1145 utils/time/snapmgr.c:1160 utils/time/snapmgr.c:1165 utils/time/snapmgr.c:1170 utils/time/snapmgr.c:1269 utils/time/snapmgr.c:1285 utils/time/snapmgr.c:1310
+#: utils/time/snapmgr.c:1187 utils/time/snapmgr.c:1192 utils/time/snapmgr.c:1197 utils/time/snapmgr.c:1212 utils/time/snapmgr.c:1217 utils/time/snapmgr.c:1222 utils/time/snapmgr.c:1321 utils/time/snapmgr.c:1337 utils/time/snapmgr.c:1362
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "données invalides du snapshot dans le fichier « %s »"
 
-#: utils/time/snapmgr.c:1207
+#: utils/time/snapmgr.c:1259
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "SET TRANSACTION SNAPSHOT doit être appelé avant toute requête"
 
-#: utils/time/snapmgr.c:1216
+#: utils/time/snapmgr.c:1268
 #, c-format
 msgid "a snapshot-importing transaction must have isolation level SERIALIZABLE or REPEATABLE READ"
 msgstr "une transaction important un snapshot doit avoir le niveau d'isolation SERIALIZABLE ou REPEATABLE READ."
 
-#: utils/time/snapmgr.c:1225 utils/time/snapmgr.c:1234
+#: utils/time/snapmgr.c:1277 utils/time/snapmgr.c:1286
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "identifiant invalide du snapshot : « %s »"
 
-#: utils/time/snapmgr.c:1323
+#: utils/time/snapmgr.c:1375
 #, c-format
 msgid "a serializable transaction cannot import a snapshot from a non-serializable transaction"
 msgstr "une transaction sérialisable ne peut pas importer un snapshot provenant d'une transaction non sérialisable"
 
-#: utils/time/snapmgr.c:1327
+#: utils/time/snapmgr.c:1379
 #, c-format
 msgid "a non-read-only serializable transaction cannot import a snapshot from a read-only transaction"
 msgstr ""
 "une transaction sérialisable en écriture ne peut pas importer un snapshot\n"
 "provenant d'une transaction en lecture seule"
 
-#: utils/time/snapmgr.c:1342
+#: utils/time/snapmgr.c:1394
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "ne peut pas importer un snapshot à partir d'une base de données différente"
 
-#~ msgid "JSON does not support infinite date values."
-#~ msgstr "JSON ne supporte pas les valeurs infinies de date."
-
-#~ msgid "JSON does not support infinite timestamp values."
-#~ msgstr "JSON ne supporte pas les valeurs infinies de timestamp."
-
-#~ msgid "cannot override frame clause of window \"%s\""
-#~ msgstr "ne peut pas surcharger la frame clause du window « %s »"
+#~ 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 »"
 
-#~ msgid "window functions cannot use named arguments"
-#~ msgstr "les fonctions window ne peuvent pas renvoyer des arguments nommés"
+#~ msgid "%s."
+#~ msgstr "%s."
 
-#~ msgid "invalid list syntax for \"listen_addresses\""
-#~ msgstr "syntaxe de liste invalide pour le paramètre « listen_addresses »"
+#~ msgid "cannot create temporary tables in parallel mode"
+#~ msgstr "ne peut pas créer des tables temporaires dans le mode de parallélisation"
 
-#~ msgid "invalid list syntax for \"unix_socket_directories\""
-#~ msgstr "syntaxe de liste invalide pour le paramètre « unix_socket_directories »"
+#~ msgid "setsockopt(SO_REUSEADDR) failed: %m"
+#~ msgstr "setsockopt(SO_REUSEADDR) a échoué : %m"
 
-#~ msgid "Valid values are '[]', '[)', '(]', and '()'."
-#~ msgstr "Les valeurs valides sont « [] », « [) », « (] » et « () »."
+#~ msgid "Transaction ID %u finished; no more running transactions."
+#~ msgstr "Identifiant de transaction %u terminé ; plus de transactions en cours."
 
-#~ msgid "poll() failed in statistics collector: %m"
-#~ msgstr "échec du poll() dans le récupérateur de statistiques : %m"
+#~ msgid "%u transaction needs to finish."
+#~ msgid_plural "%u transactions need to finish."
+#~ msgstr[0] "La transaction %u doit se terminer."
+#~ msgstr[1] "Les transactions %u doivent se terminer."
 
-#~ msgid "select() failed in logger process: %m"
-#~ msgstr "échec de select() dans le processus des journaux applicatifs : %m"
+#~ msgid "could not determine data type for argument 1"
+#~ msgstr "n'a pas pu déterminer le type de données pour l'argument 1"
 
-#~ msgid "%s: could not open file \"%s\": %s\n"
-#~ msgstr "%s : n'a pas pu ouvrir le fichier « %s » : %s\n"
+#~ msgid "could not determine data type for argument 2"
+#~ msgstr "n'a pas pu déterminer le type de données pour l'argument 2"
 
-#~ 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"
+#~ msgid "argument %d: could not determine data type"
+#~ msgstr "argument %d : n'a pas pu déterminer le type de données"
 
-#~ msgid "%s: could not fork background process: %s\n"
-#~ msgstr "%s : n'a pas pu créer un processus fils : %s\n"
+#~ msgid "system columns cannot be used in an ON CONFLICT clause"
+#~ msgstr "les colonnes systèmes ne peuvent pas être utilisées dans une clause ON CONFLICT"
 
-#~ msgid "%s: could not dissociate from controlling TTY: %s\n"
-#~ msgstr "%s : n'a pas pu se dissocier du TTY contrôlant : %s\n"
+#~ msgid "huge TLB pages not supported on this platform"
+#~ msgstr "Huge Pages TLB non supporté sur cette plateforme."
 
-#~ msgid "Runs the server silently."
-#~ msgstr "Lance le serveur de manière silencieuse."
+#~ msgid "time zone abbreviation \"%s\" is not used in time zone \"%s\""
+#~ msgstr "l'abréviation « %s » du fuseau horaire n'est pas utilisée dans le fuseau horaire « %s »"
 
-#~ 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."
+#~ msgid "invalid length in external \"numeric\" value"
+#~ msgstr "longueur invalide dans la valeur externe « numeric »"
 
-#~ 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."
+#~ msgid "mapped win32 error code %lu to %d"
+#~ msgstr "correspondance du code d'erreur win32 %lu en %d"
 
-#~ msgid "Sets the list of known custom variable classes."
-#~ msgstr "Initialise la liste des classes variables personnalisées connues."
+#~ msgid "unrecognized win32 error code: %lu"
+#~ msgstr "code d'erreur win32 non reconnu : %lu"
 
-#~ msgid "foreign key constraint \"%s\" of relation \"%s\" does not exist"
-#~ msgstr "la clé étrangère « %s » de la relation « %s » n'existe pas"
+#~ msgid "invalid value for recovery parameter \"recovery_target\""
+#~ msgstr "valeur invalide pour le paramètre de restauration « recovery_target »"
 
-#~ msgid "removing built-in function \"%s\""
-#~ msgstr "suppression de la fonction interne « %s »"
+#~ msgid "redo record is at %X/%X; shutdown %s"
+#~ msgstr "l'enregistrement à ré-exécuter se trouve à %X/%X ; arrêt %s"
 
-#~ msgid "permission denied to drop foreign-data wrapper \"%s\""
-#~ msgstr "droit refusé pour supprimer le wrapper de données distantes « %s »"
+#~ msgid "next transaction ID: %u/%u; next OID: %u"
+#~ msgstr "prochain identifiant de transaction : %u/%u ; prochain OID : %u"
 
-#~ msgid "Must be superuser to drop a foreign-data wrapper."
-#~ msgstr "Doit être super-utilisateur pour supprimer un wrapper de données distantes."
+#~ msgid "next MultiXactId: %u; next MultiXactOffset: %u"
+#~ msgstr "prochain MultiXactId : %u ; prochain MultiXactOffset : %u"
 
-#~ msgid "must be superuser to drop text search parsers"
+#~ msgid "oldest unfrozen transaction ID: %u, in database %u"
 #~ msgstr ""
-#~ "doit être super-utilisateur pour supprimer des analyseurs de recherche plein\n"
-#~ "texte"
-
-#~ msgid "must be superuser to drop text search templates"
-#~ msgstr "doit être super-utilisateur pour supprimer des modèles de recherche plein texte"
+#~ "identifiant de transaction non gelé le plus ancien : %u, dans la base de\n"
+#~ "données %u"
 
-#~ 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"
+#~ msgid "invalid xlog switch record at %X/%X"
+#~ msgstr "enregistrement de basculement du journal de transaction invalide à %X/%X"
 
-#~ msgid "standby connections not allowed because wal_level=minimal"
-#~ msgstr "connexions standby non autorisées car wal_level=minimal"
+#~ msgid "record with zero length at %X/%X"
+#~ msgstr "enregistrement de longueur nulle à %X/%X"
 
-#~ msgid "could not open directory \"pg_tblspc\": %m"
-#~ msgstr "n'a pas pu ouvrir le répertoire « pg_tblspc » : %m"
+#~ msgid "invalid backup block size in record at %X/%X"
+#~ msgstr "taille du bloc de sauvegarde invalide dans l'enregistrement à %X/%X"
 
-#~ msgid "could not access root certificate file \"%s\": %m"
-#~ msgstr "n'a pas pu accéder au fichier du certificat racine « %s » : %m"
+#~ msgid "incorrect hole size in record at %X/%X"
+#~ msgstr "taille du trou incorrect à l'enregistrement %X/%X"
 
-#~ msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
-#~ msgstr "liste de révocation des certificats SSL « %s » introuvable, continue : %s"
+#~ msgid "incorrect total length in record at %X/%X"
+#~ msgstr "longueur totale incorrecte à l'enregistrement %X/%X"
 
-#~ msgid "Certificates will not be checked against revocation list."
-#~ msgstr "Les certificats ne seront pas vérifiés avec la liste de révocation."
+#~ msgid "WAL file is from different database system: 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 pg_control du système de base de données dans pg_control est %s."
 
-#~ msgid "missing or erroneous pg_hba.conf file"
-#~ msgstr "fichier pg_hba.conf manquant ou erroné"
+#~ msgid "WAL file is from different database system: Incorrect XLOG_SEG_SIZE in page header."
+#~ msgstr ""
+#~ "le journal de transactions provient d'un système de bases de données différent :\n"
+#~ "XLOG_SEG_SIZE incorrect dans l'en-tête de page."
 
-#~ msgid "See server log for details."
-#~ msgstr "Voir les journaux applicatifs du serveur pour plus de détails."
+#~ msgid "WAL file is from different database system: Incorrect XLOG_BLCKSZ in page header."
+#~ msgstr ""
+#~ "le journal de transactions provient d'un système de bases de données différent :\n"
+#~ "XLOG_BLCKSZ incorrect dans l'en-tête de page."
 
-#~ 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"
+#~ msgid "=> is deprecated as an operator name"
+#~ msgstr "=> est un nom d'opérateur obsolète"
 
-#~ msgid "  --help          show this help, then exit\n"
-#~ msgstr "  --help             affiche cette aide, puis quitte\n"
+#~ msgid "This name may be disallowed altogether in future versions of PostgreSQL."
+#~ msgstr "Ce nom pourrait être interdit dans les prochaines versions de PostgreSQL."
 
-#~ msgid "  --version       output version information, then exit\n"
-#~ msgstr "  --version          affiche la version, puis quitte\n"
+#~ msgid "inherited relation \"%s\" is not a table"
+#~ msgstr "la relation héritée « %s » n'est pas une table"
 
-#~ msgid "CREATE TABLE AS cannot specify INTO"
-#~ msgstr "CREATE TABLE AS ne peut pas spécifier INTO"
+#~ msgid "\"%s\" is not a table, materialized view, composite type, or foreign table"
+#~ msgstr "« %s » n'est ni une table, ni une vue matérialisée, ni un type composite, ni une table distante"
 
-#~ 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"
+#~ msgid "Specify a USING expression to perform the conversion."
+#~ msgstr "Donnez une expression USING pour réaliser la conversion."
 
-#~ msgid "INSERT ... SELECT cannot specify INTO"
-#~ msgstr "INSERT ... SELECT ne peut pas avoir INTO"
+#~ msgid ""
+#~ "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
+#~ "pages: %d removed, %d remain\n"
+#~ "tuples: %.0f removed, %.0f remain, %.0f are dead but not yet removable\n"
+#~ "buffer usage: %d hits, %d misses, %d dirtied\n"
+#~ "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
+#~ "system usage: %s"
+#~ msgstr ""
+#~ "VACUUM automatique de la table « %s.%s.%s » : parcours d'index : %d\n"
+#~ "pages : %d supprimées, %d restantes\n"
+#~ "lignes : %.0f supprimées, %.0f restantes, %.0f sont mortes mais non supprimables\n"
+#~ "utilisation des tampons : %d lus dans le cache, %d lus hors du cache, %d modifiés\n"
+#~ "taux moyen de lecture : %.3f Mo/s, taux moyen d'écriture : %.3f Mo/s\n"
+#~ "utilisation système : %s"
 
-#~ msgid "DECLARE CURSOR cannot specify INTO"
-#~ msgstr "DECLARE CURSOR ne peut pas spécifier INTO"
+#~ 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 versions de lignes mortes ne peuvent pas encore être supprimées.\n"
+#~ "Il y avait %.0f pointeurs d'éléments inutilisés.\n"
+#~ "%u pages sont entièrement vides.\n"
+#~ "%s."
 
-#~ msgid "subquery in FROM cannot have SELECT INTO"
-#~ msgstr "la sous-requête du FROM ne peut pas avoir de SELECT INTO"
+#~ msgid "interval precision specified twice"
+#~ msgstr "précision d'intervalle spécifiée deux fois"
 
-#~ msgid "subquery cannot have SELECT INTO"
-#~ msgstr "la sous-requête ne peut pas avoir de SELECT INTO"
+#~ msgid "received password packet"
+#~ msgstr "paquet du mot de passe reçu"
 
-#~ msgid "subquery in WITH cannot have SELECT INTO"
-#~ msgstr "la sous-requête du WITH ne peut pas avoir de SELECT INTO"
+#~ msgid "SSL failure during renegotiation start"
+#~ msgstr "échec SSL au début de la re-négotiation"
 
-#~ msgid "tablespace %u is not empty"
-#~ msgstr "le tablespace %u n'est pas vide"
+#~ msgid "SSL handshake failure on renegotiation, retrying"
+#~ msgstr "échec du handshake SSL lors de la renégotiation, nouvelle tentative"
 
-#~ msgid "consistent state delayed because recovery snapshot incomplete"
-#~ msgstr "état de cohérence pas encore atteint à cause d'un snapshot de restauration incomplet"
+#~ msgid "could not complete SSL handshake on renegotiation, too many failures"
+#~ msgstr "n'a pas pu terminer la poignée de main de renégotiation, trop d'échecs"
 
-#~ msgid "SSPI error %x"
-#~ msgstr "erreur SSPI : %x"
+#~ msgid "SSL failed to renegotiate connection before limit expired"
+#~ msgstr "SSL a échoué à renégotier la connexion avant l'expiration du délai"
 
-#~ msgid "%s (%x)"
-#~ msgstr "%s (%x)"
+#~ msgid "could not set socket to blocking mode: %m"
+#~ msgstr "n'a pas pu activer le mode bloquant pour la socket : %m"
 
-#~ msgid "resetting unlogged relations: cleanup %d init %d"
-#~ msgstr "réinitialisation des relations non tracées : nettoyage %d initialisation %d"
+#~ msgid "%s: setsysinfo failed: %s\n"
+#~ msgstr "%s : setsysinfo a échoué : %s\n"
 
-#~ msgid "ALTER TYPE USING is only supported on plain tables"
-#~ msgstr "ALTER TYPE USING est seulement supportés sur les tables standards"
+#~ 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"
 
-#~ msgid "index \"%s\" is not a b-tree"
-#~ msgstr "l'index « %s » n'est pas un btree"
+#~ msgid "subquery must return a column"
+#~ msgstr "la sous-requête doit renvoyer une colonne"
 
-#~ msgid "unable to read symbolic link %s: %m"
-#~ msgstr "incapable de lire le lien symbolique %s : %m"
+#~ msgid "Consider increasing the configuration parameter \"checkpoint_segments\"."
+#~ msgstr "Considèrez l'augmentation du paramètre « checkpoint_segments »."
 
-#~ 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 "WAL archival (archive_mode=on) requires wal_level \"archive\", \"hot_standby\", or \"logical\""
+#~ msgstr ""
+#~ "l'archivage des journaux de transactions (archive_mode=on) nécessite que\n"
+#~ "le paramètre wal_level soit initialisé avec « archive », « hot_standby » ou « logical »"
 
-#~ msgid "Lines should have the format parameter = 'value'."
-#~ msgstr "Les lignes devraient avoir le format paramètre = 'valeur'"
+#~ msgid "invalid value for parameter \"replication\""
+#~ msgstr "valeur invalide pour le paramètre « replication »"
 
-#~ 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 "postmaster became multithreaded"
+#~ msgstr "le postmaster est devenu multithreadé"
 
-#~ 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 "archive member \"%s\" too large for tar format"
+#~ msgstr "membre « %s » de l'archive trop volumineux pour le format tar"
 
-#~ 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 "could not determine input data types"
+#~ msgstr "n'a pas pu déterminer les types de données en entrée"
 
-#~ 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 "neither input type is an array"
+#~ msgstr "aucun type de données n'est un tableau"
 
-#~ msgid "EnumValuesCreate() can only set a single OID"
-#~ msgstr "EnumValuesCreate() peut seulement initialiser un seul OID"
+#~ msgid "unexpected \"=\""
+#~ msgstr "« = » inattendu"
 
-#~ msgid "clustering \"%s.%s\""
-#~ msgstr "exécution de CLUSTER sur « %s.%s »"
+#~ msgid "invalid symbol"
+#~ msgstr "symbole invalide"
 
-#~ msgid "cannot cluster on index \"%s\" because access method does not handle null values"
+#~ msgid "must be superuser or have the same role to cancel queries running in other server processes"
 #~ 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"
+#~ "doit être super-utilisateur ou avoir le même rôle pour annuler des requêtes\n"
+#~ "exécutées dans les autres processus serveur"
 
-#~ 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."
+#~ msgid "must be superuser or have the same role to terminate other server processes"
 #~ 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."
+#~ "doit être super-utilisateur ou avoir le même rôle pour fermer les connexions\n"
+#~ "exécutées dans les autres processus serveur"
 
-#~ 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 "cannot accept a value of type pg_node_tree"
+#~ msgstr "ne peut pas accepter une valeur de type pg_node_tree"
 
-#~ msgid "\"%s\" is not a table, view, or composite type"
-#~ msgstr "« %s » n'est pas une table, une vue ou un type composite"
+#~ msgid "Turns on various assertion checks."
+#~ msgstr "Active les différentes vérifications des assertions."
 
-#~ 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 "This is a debugging aid."
+#~ msgstr "C'est une aide de débogage."
 
-#~ 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 "This parameter doesn't do anything."
+#~ msgstr "Ce paramètre ne fait rien."
 
-#~ msgid "must be superuser to comment on text search template"
+#~ msgid "It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-vintage clients."
 #~ 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 »"
+#~ "C'est ici uniquement pour ne pas avoir de problèmes avec le SET AUTOCOMMIT\n"
+#~ "TO ON des clients 7.3."
 
-#~ msgid "cannot reference temporary table from permanent table constraint"
+#~ msgid "Sets the maximum distance in log segments between automatic WAL checkpoints."
 #~ msgstr ""
-#~ "ne peut pas référencer une table temporaire à partir d'une contrainte de\n"
-#~ "table permanente"
+#~ "Initialise la distance maximale dans les journaux de transaction entre chaque\n"
+#~ "point de vérification (checkpoints) des journaux."
 
-#~ msgid "cannot reference permanent table from temporary table constraint"
+#~ msgid "Set the amount of traffic to send and receive before renegotiating the encryption keys."
 #~ 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"
+#~ "Configure la quantité de trafic à envoyer et recevoir avant la renégotiation\n"
+#~ "des clés d'enchiffrement."
 
-#~ msgid "database \"%s\" not found"
-#~ msgstr "base de données « %s » non trouvée"
+#~ msgid "SET AUTOCOMMIT TO OFF is no longer supported"
+#~ msgstr "SET AUTOCOMMIT TO OFF n'est plus supporté"
 
-#~ msgid "invalid list syntax for parameter \"datestyle\""
-#~ msgstr "syntaxe de liste invalide pour le paramètre « datestyle »"
+#~ 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"
 
-#~ msgid "unrecognized \"datestyle\" key word: \"%s\""
-#~ msgstr "mot clé « datestyle » non reconnu : « %s »"
+#~ msgid "%s \"%s\": return code %d"
+#~ msgstr "%s « %s » : code de retour %d"
 
-#~ 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"
+#~ msgid "could not parse transaction log location \"%s\""
+#~ msgstr "n'a pas pu analyser l'emplacement du journal des transactions « %s »"
 
-#~ msgid "invalid interval value for time zone: day not allowed"
-#~ msgstr "valeur d'intervalle invalide pour le fuseau horaire : jour non autorisé"
+#~ msgid "invalid input syntax for transaction log location: \"%s\""
+#~ msgstr "syntaxe invalide en entrée pour l'emplacement du journal de transactions : « %s »"
 
-#~ msgid "argument to pg_get_expr() must come from system catalogs"
-#~ msgstr "l'argument de pg_get_expr() doit provenir des catalogues systèmes"
+#~ msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
+#~ msgstr "le trigger « %s » pour la table « %s » n'existe pas, poursuite du traitement"
 
-#~ msgid "could not enable credential reception: %m"
-#~ msgstr "n'a pas pu activer la réception de lettres de créance : %m"
+#~ msgid "Kerberos 5 authentication failed for user \"%s\""
+#~ msgstr "authentification Kerberos 5 échouée pour l'utilisateur « %s »"
 
-#~ 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"
+#~ msgid "Kerberos initialization returned error %d"
+#~ msgstr "l'initialisation de Kerberos a retourné l'erreur %d"
 
-#~ 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"
+#~ msgid "Kerberos keytab resolving returned error %d"
+#~ msgstr "la résolution keytab de Kerberos a renvoyé l'erreur %d"
 
-#~ msgid "could not create log file \"%s\": %m"
-#~ msgstr "n'a pas pu créer le journal applicatif « %s » : %m"
+#~ msgid "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
+#~ msgstr "sname_to_principal(« %s », « %s ») de Kerberos a renvoyé l'erreur %d"
 
-#~ msgid "could not open new log file \"%s\": %m"
-#~ msgstr "n'a pas pu ouvrir le nouveau journal applicatif « %s » : %m"
+#~ msgid "Kerberos recvauth returned error %d"
+#~ msgstr "recvauth de Kerberos a renvoyé l'erreur %d"
 
-#~ msgid "Sets immediate fsync at commit."
-#~ msgstr "Configure un fsync immédiat lors du commit."
+#~ msgid "Kerberos unparse_name returned error %d"
+#~ msgstr "unparse_name de Kerberos a renvoyé l'erreur %d"
 
-#~ msgid "invalid list syntax for parameter \"log_destination\""
-#~ msgstr "syntaxe de liste invalide pour le paramètre « log_destination »"
+#~ msgid "local user with ID %d does not exist"
+#~ msgstr "l'utilisateur local dont l'identifiant est %d n'existe pas"
 
-#~ msgid "unrecognized \"log_destination\" key word: \"%s\""
-#~ msgstr "mot clé « log_destination » non reconnu : « %s »"
+#~ msgid "SSL renegotiation failure"
+#~ msgstr "échec lors de la re-négotiation SSL"
 
-#~ msgid "cannot drop \"%s\" because it is being used by active queries in this session"
+#~ msgid "krb5 authentication is not supported on local sockets"
 #~ msgstr ""
-#~ "ne peut pas supprimer « %s » car cet objet est en cours d'utilisation par\n"
-#~ "des requêtes actives dans cette session"
+#~ "l'authentification krb5 n'est pas supportée sur les connexions locales par\n"
+#~ "socket"
 
-#~ msgid "parameter \"recovery_target_inclusive\" requires a Boolean value"
-#~ msgstr "le paramètre « recovery_target_inclusive » requiert une valeur booléenne"
+#~ msgid "%s: invalid effective UID: %d\n"
+#~ msgstr "%s : UID effectif invalide : %d\n"
 
-#~ msgid "parameter \"standby_mode\" requires a Boolean value"
-#~ msgstr "le paramètre « standby_mode » requiert une valeur booléenne"
+#~ 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"
 
-#~ msgid "access to %s"
-#~ msgstr "accès à %s"
+#~ msgid "too many column aliases specified for function %s"
+#~ msgstr "trop d'alias de colonnes spécifiées pour la fonction %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 "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."
 
-#~ msgid "Not safe to send CSV data\n"
-#~ msgstr "Envoi non sûr des données CSV\n"
+#~ msgid "Security-barrier views are not automatically updatable."
+#~ msgstr "Les vues avec barrière de sécurité ne sont pas automatiquement disponibles en écriture."
 
-#~ 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 "Views that return the same column more than once are not automatically updatable."
+#~ msgstr "Les vues qui renvoient la même colonne plus d'une fois ne sont pas automatiquement disponibles en écriture."
 
-#~ msgid "restartpoint_command = '%s'"
-#~ msgstr "restartpoint_command = '%s'"
+#~ msgid "wrong affix file format for flag"
+#~ msgstr "mauvais format de fichier affixe pour le drapeau"
 
-#~ msgid "usermap \"%s\""
-#~ msgstr "correspondance utilisateur « %s »"
+#~ msgid "missing assignment operator"
+#~ msgstr "opérateur d'affectation manquant"
 
-#~ msgid "WAL archiving is not active"
-#~ msgstr "l'archivage des journaux de transactions n'est pas actif"
+#~ msgid "cannot call json_object_keys on an array"
+#~ msgstr "ne peut pas appeler json_object_keys sur un tableau"
 
-#~ msgid "archive_mode must be enabled at server start."
-#~ msgstr "archive_mode doit être activé au lancement du serveur."
+#~ msgid "cannot call json_object_keys on a scalar"
+#~ msgstr "ne peut pas appeler json_object_keys sur un scalaire"
 
-#~ 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 "cannot call function with null path elements"
+#~ msgstr "ne peut pas appeler une fonction avec des éléments chemins NULL"
 
-#~ msgid "During recovery, allows connections and queries.  During normal running, causes additional info to be written to WAL to enable hot standby mode on WAL standby nodes."
-#~ msgstr ""
-#~ "Lors de la restauration, autorise les connexions et les requêtes. Lors d'une\n"
-#~ "exécution normale, fait que des informations supplémentaires sont écrites dans\n"
-#~ "les journaux de transactions pour activer le mode Hot Standby sur les n½uds\n"
-#~ "en attente."
+#~ msgid "cannot call function with empty path elements"
+#~ msgstr "ne peut pas appeler une fonction avec des éléments chemins vides"
 
-#~ msgid "unlogged operation performed, data may be missing"
-#~ msgstr "opération réalisée non tracée, les données pourraient manquer"
+#~ msgid "cannot extract array element from a non-array"
+#~ msgstr "ne peut pas extraire un élément du tableau à partir d'un objet qui n'est pas un tableau"
 
-#~ 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 "cannot extract field from a non-object"
+#~ msgstr "ne peut pas extraire le chemin à partir d'un non-objet"
 
-#~ 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 "cannot call json_array_elements on a non-array"
+#~ msgstr "ne peut pas appeler json_array_elements sur un objet qui n'est pas un tableau"
 
-#~ msgid "connection limit exceeded for non-superusers"
-#~ msgstr "limite de connexions dépassée pour les utilisateurs standards"
+#~ msgid "cannot call json_array_elements on a scalar"
+#~ msgstr "ne peut pas appeler json_array_elements sur un scalaire"
 
-#~ 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 "first argument of json_populate_record must be a row type"
+#~ msgstr "le premier argument de json_populate_record doit être un type ROW"
 
-#, fuzzy
-#~ msgid "couldn't put socket to non-blocking mode: %m"
-#~ msgstr "n'a pas pu activer le mode non-bloquant pour la socket : %s\n"
+#~ msgid "first argument of json_populate_recordset must be a row type"
+#~ msgstr "le premier argument de json_populate_recordset doit être un type ROW"
 
-#, 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"
+#~ msgid "cannot call json_populate_recordset on an object"
+#~ msgstr "ne peut pas appeler json_populate_recordset sur un objet"
 
-#, fuzzy
-#~ msgid "sorry, too many standbys already"
-#~ msgstr "désolé, trop de clients sont déjà connectés"
+#~ msgid "cannot call json_populate_recordset with nested objects"
+#~ msgstr "ne peut pas appeler json_populate_recordset sur des objets imbriqués"
 
-#, fuzzy
-#~ msgid "invalid WAL message received from primary"
-#~ msgstr "format du message invalide"
+#~ msgid "must call json_populate_recordset on an array of objects"
+#~ msgstr "doit appeler json_populate_recordset sur un tableau d'objets"
 
-#~ msgid "PID %d is among the slowest backends."
-#~ msgstr "Le PID %d est parmi les processus serveur les plus lents."
+#~ msgid "cannot call json_populate_recordset with nested arrays"
+#~ msgstr "ne peut pas appeler json_populate_recordset avec des tableaux imbriqués"
 
-#~ msgid "transaction is read-only"
-#~ msgstr "la transaction est en lecture seule"
+#~ msgid "cannot call json_populate_recordset on a scalar"
+#~ msgstr "ne peut pas appeler json_populate_recordset sur un scalaire"
 
-#~ msgid "binary value is out of range for type bigint"
-#~ msgstr "la valeur binaire est en dehors des limites du type bigint"
+#~ msgid "cannot call json_populate_recordset on a nested object"
+#~ msgstr "ne peut pas appeler json_populate_recordset sur un objet imbriqué"
 
-#~ 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 "No description available."
+#~ msgstr "Aucune description disponible."
 
-#~ 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 ""
-#~ "Cette erreur peut aussi survenir si la séquence d'octets ne correspond pas\n"
-#~ "au jeu de caractères attendu par le serveur, le jeu étant contrôlé par\n"
-#~ "« client_encoding »."
+#~ msgid "Sets the name of the Kerberos service."
+#~ msgstr "Initialise le nom du service Kerberos."
 
-#~ msgid "Sets the language used in DO statement if LANGUAGE is not specified."
+#~ msgid "time zone offset %d is not a multiple of 900 sec (15 min) in time zone file \"%s\", line %d"
 #~ 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"
+#~ "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"
 
-#~ 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 "Perhaps out of disk space?"
+#~ msgstr "Peut-être manquez-vous de place disque ?"
 
-#~ msgid "cannot truncate system relation \"%s\""
-#~ msgstr "ne peut pas tronquer la relation système « %s »"
+#~ msgid "could not change directory to \"%s\""
+#~ msgstr "n'a pas pu accéder au répertoire « %s »"
 
-#~ msgid "number of distinct values %g is too low"
-#~ msgstr "le nombre de valeurs distinctes %g est trop basse"
+#~ msgid "unlogged GiST indexes are not supported"
+#~ msgstr "les index GiST non tracés ne sont pas supportés"
 
-#~ msgid "directory \"%s\" is not empty"
-#~ msgstr "le répertoire « %s » n'est pas vide"
+#~ 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"
 
-#~ msgid "relation \"%s\" TID %u/%u: XMIN_COMMITTED not set for transaction %u --- cannot shrink relation"
+#~ msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
 #~ 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"
+#~ "il n'y a pas de drapeaux « contrecord » dans le journal de transactions %u,\n"
+#~ "segment %u, décalage %u"
 
-#~ msgid "relation \"%s\" TID %u/%u: dead HOT-updated tuple --- cannot shrink relation"
+#~ msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
 #~ msgstr ""
-#~ "relation « %s », TID %u/%u : ligne morte mise à jour par HOT --- n'a pas pu\n"
-#~ "diminuer la taille de la relation"
+#~ "longueur invalide du « contrecord » %u dans le journal de tranasctions %u,\n"
+#~ "segment %u, décalage %u"
 
-#~ msgid "relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- cannot shrink relation"
-#~ msgstr ""
-#~ "relation « %s », TID %u/%u : InsertTransactionInProgress %u --- n'a pas pu\n"
-#~ "diminuer la taille de la relation"
+#~ msgid "Incorrect XLOG_SEG_SIZE in page header."
+#~ msgstr "XLOG_SEG_SIZE incorrecte dans l'en-tête de page."
 
-#~ msgid "relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- cannot shrink relation"
-#~ msgstr ""
-#~ "relation « %s », TID %u/%u : DeleteTransactionInProgress %u --- n'a pas pu\n"
-#~ "diminuer la taille de la relation"
+#~ msgid "Incorrect XLOG_BLCKSZ in page header."
+#~ msgstr "XLOG_BLCKSZ incorrect dans l'en-tête de page."
 
-#~ 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 versions de lignes mortes ne peuvent pas encore être supprimées.\n"
-#~ "Les versions non supprimables de ligne vont de %lu to %lu octets.\n"
-#~ "Il existait %.0f pointeurs d'éléments inutilisés.\n"
-#~ "L'espace libre total (incluant les versions supprimables de ligne) est de\n"
-#~ "%.0f octets.\n"
-#~ "%u pages sont ou deviendront vides, ceci incluant %u pages en fin de la\n"
-#~ "table.\n"
-#~ "%u pages contenant %.0f octets libres sont des destinations de déplacement\n"
-#~ "disponibles.\n"
-#~ "%s."
+#~ msgid "xrecoff \"%X\" is out of valid range, 0..%X"
+#~ msgstr "xrecoff « %X » en dehors des limites valides, 0..%X"
 
-#~ 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 "uncataloged table %s"
+#~ msgstr "table %s sans catalogue"
 
-#~ 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 "cannot use subquery in default expression"
+#~ msgstr "ne peut pas utiliser une sous-requête dans l'expression par défaut"
 
-#~ msgid "index \"%s\" contains %.0f row versions, but table contains %.0f row versions"
-#~ msgstr ""
-#~ "l'index « %s » contient %.0f versions de ligne, mais la table contient %.0f\n"
-#~ "versions de ligne"
+#~ msgid "cannot use aggregate function in default expression"
+#~ msgstr "ne peut pas utiliser une fonction d'agrégat dans une expression par défaut"
 
-#~ msgid "Rebuild the index with REINDEX."
-#~ msgstr "Reconstruisez l'index avec REINDEX."
+#~ msgid "cannot use window function in default expression"
+#~ msgstr "ne peut pas utiliser une fonction window dans une expression par défaut"
 
-#~ msgid "frame start at CURRENT ROW is not implemented"
-#~ msgstr "début du frame à CURRENT ROW n'est pas implémenté"
+#~ msgid "cannot use window function in check constraint"
+#~ msgstr "ne peut pas utiliser une fonction window dans une contrainte de vérification"
 
-#~ 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 "A function returning ANYRANGE must have at least one ANYRANGE argument."
+#~ msgstr ""
+#~ "Une fonction renvoyant ANYRANGE doit avoir au moins un argument du type\n"
+#~ "ANYRANGE."
 
-#~ msgid "DISTINCT is supported only for single-argument aggregates"
-#~ msgstr "DISTINCT est seulement supporté pour les agrégats à un seul argument"
+#~ msgid "%s already exists in schema \"%s\""
+#~ msgstr "%s existe déjà dans le schéma « %s »"
 
-#~ 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 "CREATE TABLE AS specifies too many column names"
+#~ msgstr "CREATE TABLE AS spécifie trop de noms de colonnes"
 
-#~ msgid "Table contains duplicated values."
-#~ msgstr "La table contient des valeurs dupliquées."
+#~ 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"
 
-#~ msgid "Automatically adds missing table references to FROM clauses."
+#~ msgid "cannot use aggregate function in parameter default value"
 #~ msgstr ""
-#~ "Ajoute automatiquement les références à la table manquant dans les clauses\n"
-#~ "FROM."
+#~ "ne peut pas utiliser une fonction d'agrégat dans la valeur par défaut d'un\n"
+#~ "paramètre"
 
-#~ msgid "Sets the regular expression \"flavor\"."
-#~ msgstr "Initialise l'expression rationnelle « flavor »."
+#~ 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"
 
-#~ msgid "attempted change of parameter \"%s\" ignored"
-#~ msgstr "tentative de modification du paramètre « %s » ignoré"
+#~ msgid "Use ALTER AGGREGATE to rename aggregate functions."
+#~ msgstr "Utiliser ALTER AGGREGATE pour renommer les fonctions d'agrégat."
 
-#~ 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 "Use ALTER AGGREGATE to change owner of aggregate functions."
+#~ msgstr "Utiliser ALTER AGGREGATE pour changer le propriétaire des fonctions d'agrégat."
 
-#~ msgid "invalid database name \"%s\""
-#~ msgstr "nom de base de données « %s » invalide"
+#~ msgid "function \"%s\" already exists in schema \"%s\""
+#~ msgstr "la fonction « %s » existe déjà dans le schéma « %s »"
 
-#~ msgid "invalid role name \"%s\""
-#~ msgstr "nom de rôle « %s » invalide"
+#~ msgid "cannot use aggregate in index predicate"
+#~ msgstr "ne peut pas utiliser un agrégat dans un prédicat d'index"
 
-#~ msgid "invalid role password \"%s\""
-#~ msgstr "mot de passe « %s » de l'utilisateur invalide"
+#~ msgid "cannot use window function in EXECUTE parameter"
+#~ msgstr "ne peut pas utiliser une fonction window dans le paramètre EXECUTE"
 
-#~ msgid "cannot specify CSV in BINARY mode"
-#~ msgstr "ne peut pas spécifier CSV en mode binaire (BINARY)"
+#~ msgid "constraints on foreign tables are not supported"
+#~ msgstr "les contraintes sur les tables distantes ne sont pas supportées"
 
-#~ msgid "cannot set session authorization within security-definer function"
-#~ msgstr "ne peut pas exécuter SESSION AUTHORIZATION sur la fonction SECURITY DEFINER"
+#~ msgid "default values on foreign tables are not supported"
+#~ msgstr "les valeurs par défaut ne sont pas supportées sur les tables distantes"
 
-#~ msgid "SELECT FOR UPDATE/SHARE is not supported within a query with multiple result relations"
-#~ msgstr ""
-#~ "SELECT FOR UPDATE/SHARE n'est pas supporté dans une requête avec plusieurs\n"
-#~ "relations"
+#~ msgid "cannot use window function in transform expression"
+#~ msgstr "ne peut pas utiliser la fonction window dans l'expression de la transformation"
 
-#~ msgid "could not remove relation %s: %m"
-#~ msgstr "n'a pas pu supprimer la relation %s : %m"
+#~ msgid "Use ALTER FOREIGN TABLE instead."
+#~ msgstr "Utilisez ALTER FOREIGN TABLE à la place."
 
-#~ 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 "cannot use window function in trigger WHEN condition"
+#~ msgstr "ne peut pas utiliser la fonction window dans la condition WHEN d'un trigger"
 
-#~ 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 "must be superuser to rename text search parsers"
+#~ msgstr ""
+#~ "doit être super-utilisateur pour renommer les analyseurs de recherche plein\n"
+#~ "texte"
 
-#~ msgid "could not extend relation %s: %m"
-#~ msgstr "n'a pas pu étendre la relation %s : %m"
+#~ msgid "must be superuser to rename text search templates"
+#~ msgstr "doit être super-utilisateur pour renommer les modèles de recherche plein texte"
 
-#~ msgid "could not open relation %s: %m"
-#~ msgstr "n'a pas pu ouvrir la relation %s : %m"
+#~ msgid "automatic vacuum of table \"%s.%s.%s\": cannot (re)acquire exclusive lock for truncate scan"
+#~ msgstr "vacuum automatique de la table « %s.%s.%s » : ne peut pas acquérir le verrou exclusif pour la tronquer"
 
-#~ 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 "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."
 
-#~ 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 "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."
 
-#~ 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 "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."
 
-#~ msgid "could not fsync segment %u of relation %s: %m"
+#~ msgid "LDAP search failed for filter \"%s\" on server \"%s\": user is not unique (%ld matches)"
 #~ msgstr ""
-#~ "n'a pas pu synchroniser sur disque (fsync) le segment %u de la relation\n"
-#~ "%s : %m"
+#~ "échec de la recherche LDAP pour le filtre « %s » sur le serveur « %s » :\n"
+#~ "utilisateur non unique (%ld correspondances)"
 
-#~ 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 "VALUES must not contain table references"
+#~ msgstr "VALUES ne doit pas contenir de références de table"
 
-#~ 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 "VALUES must not contain OLD or NEW references"
+#~ msgstr "VALUES ne doit pas contenir des références à OLD et NEW"
 
-#~ msgid "unsupported PAM conversation %d/%s"
-#~ msgstr "conversation PAM %d/%s non supportée"
+#~ msgid "Use SELECT ... UNION ALL ... instead."
+#~ msgstr "Utilisez à la place SELECT ... UNION ALL ..."
 
-#~ 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 "cannot use aggregate function in VALUES"
+#~ msgstr "ne peut pas utiliser la fonction d'agrégat dans un VALUES"
 
-#~ msgid "adding missing FROM-clause entry for table \"%s\""
-#~ msgstr "ajout d'une entrée manquante dans FROM (table « %s »)"
+#~ msgid "cannot use window function in VALUES"
+#~ msgstr "ne peut pas utiliser la fonction window dans un VALUES"
 
-#~ 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 "cannot use aggregate function in UPDATE"
+#~ msgstr "ne peut pas utiliser une fonction d'agrégat dans un UPDATE"
 
-#~ 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 "cannot use window function in UPDATE"
+#~ msgstr "ne peut pas utiliser une fonction window dans un UPDATE"
 
-#~ msgid "hurrying in-progress restartpoint"
-#~ msgstr "accélération du restartpoint en cours"
+#~ msgid "cannot use aggregate function in RETURNING"
+#~ msgstr "ne peut pas utiliser une fonction d'agrégat dans RETURNING"
 
-#~ msgid "multiple DELETE events specified"
-#~ msgstr "multiples événements DELETE spécifiés"
+#~ msgid "cannot use window function in RETURNING"
+#~ msgstr "ne peut pas utiliser une fonction window dans RETURNING"
 
-#~ msgid "multiple UPDATE events specified"
-#~ msgstr "multiples événements UPDATE spécifiés"
+#~ msgid "RETURNING cannot contain references to other relations"
+#~ msgstr "RETURNING ne doit pas contenir de références à d'autres relations"
 
-#~ msgid "multiple TRUNCATE events specified"
-#~ msgstr "multiples événements TRUNCATE spécifiés"
+#~ 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"
 
-#~ msgid "could not create XPath object"
-#~ msgstr "n'a pas pu créer l'objet XPath"
+#~ msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
+#~ msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec la clause HAVING"
 
-#, fuzzy
-#~ msgid "wrong number of array_subscripts"
-#~ msgstr "mauvais nombre d'indices du tableau"
+#~ 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"
 
-#~ 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 "SELECT FOR UPDATE/SHARE is not allowed with window functions"
+#~ msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec les fonctions window"
 
-#~ 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 "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 »"
 
-#~ msgid "invalid LC_COLLATE setting"
-#~ msgstr "paramètre LC_COLLATE invalide"
+#~ msgid "aggregates not allowed in WHERE clause"
+#~ msgstr "agrégats non autorisés dans une clause WHERE"
 
-#~ msgid "invalid LC_CTYPE setting"
-#~ msgstr "paramètre LC_CTYPE invalide"
+#~ msgid "window functions not allowed in GROUP BY clause"
+#~ msgstr "fonctions window non autorisées dans une clause GROUP BY"
 
-#~ msgid "The database cluster was initialized with LOCALE_NAME_BUFLEN %d, but the server was compiled with LOCALE_NAME_BUFLEN %d."
-#~ msgstr ""
-#~ "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 "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"
 
-#~ msgid "It looks like you need to initdb or install locale support."
+#~ msgid "subquery in FROM cannot refer to other relations of same query level"
 #~ msgstr ""
-#~ "Il semble que vous avez besoin d'exécuter initdb ou d'installer le support\n"
-#~ "des locales."
+#~ "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"
 
-#~ msgid "log_restartpoints = %s"
-#~ msgstr "log_restartpoints = %s"
+#~ 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"
 
-#~ msgid "syntax error: cannot back up"
-#~ msgstr "erreur de syntaxe : n'a pas pu revenir"
+#~ 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"
 
-#~ msgid "syntax error; also virtual memory exhausted"
-#~ msgstr "erreur de syntaxe ; de plus, mémoire virtuelle saturée"
+#~ msgid "argument of %s must not contain aggregate functions"
+#~ msgstr "l'argument de %s ne doit pas contenir de fonctions d'agrégats"
 
-#~ msgid "parser stack overflow"
-#~ msgstr "saturation de la pile de l'analyseur"
+#~ msgid "argument of %s must not contain window functions"
+#~ msgstr "l'argument de %s ne doit pas contenir des fonctions window"
 
-#~ msgid "failed to drop all objects depending on %s"
-#~ msgstr "échec lors de la suppression de tous les objets dépendant de %s"
+#~ msgid "arguments of row IN must all be row expressions"
+#~ msgstr "les arguments de la ligne IN doivent tous être des expressions de ligne"
 
-#~ msgid "there are objects dependent on %s"
-#~ msgstr "des objets dépendent de %s"
+#~ 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"
 
-#~ msgid "multiple constraints named \"%s\" were dropped"
-#~ msgstr "les contraintes multiples nommées « %s » ont été supprimées"
+#~ 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"
 
-#~ msgid "constraint definition for check constraint \"%s\" does not match"
+#~ 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 ""
-#~ "la définition de la contrainte « %s » pour la contrainte de vérification ne\n"
-#~ "correspond pas"
+#~ "Cette erreur signifie habituellement que la demande de PostgreSQL pour un\n"
+#~ "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 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"
+#~ "La documentation de PostgreSQL contient plus d'informations sur la\n"
+#~ "configuration de la mémoire partagée."
 
-#~ msgid "relation \"%s.%s\" contains more than \"max_fsm_pages\" pages with useful free space"
+#~ msgid "terminating all walsender processes to force cascaded standby(s) to update timeline and reconnect"
 #~ msgstr ""
-#~ "la relation « %s.%s » contient plus de « max_fsm_pages » pages d'espace\n"
-#~ "libre utile"
+#~ "arrêt de tous les processus walsender pour forcer les serveurs standby en\n"
+#~ "cascade à mettre à jour la timeline et à se reconnecter"
 
-#~ msgid "Consider using VACUUM FULL on this relation or increasing the configuration parameter \"max_fsm_pages\"."
-#~ msgstr ""
-#~ "Pensez à compacter cette relation en utilisant VACUUM FULL ou à augmenter le\n"
-#~ "paramètre de configuration « max_fsm_pages »."
+#~ msgid "shutdown requested, aborting active base backup"
+#~ msgstr "arrêt demandé, annulation de la sauvegarde active de base"
 
-#~ msgid "cannot change number of columns in view"
-#~ msgstr "ne peut pas modifier le nombre de colonnes dans la vue"
+#~ msgid "streaming replication successfully connected to primary"
+#~ msgstr "réplication de flux connecté avec succès au serveur principal"
 
-#~ msgid "unexpected Kerberos user name received from client (received \"%s\", expected \"%s\")"
+#~ msgid "invalid standby handshake message type %d"
+#~ msgstr "type %d du message de handshake du serveur en attente invalide"
+
+#~ msgid "terminating walsender process to force cascaded standby to update timeline and reconnect"
 #~ msgstr ""
-#~ "nom d'utilisateur Kerberos inattendu reçu à partir du client (reçu « %s »,\n"
-#~ "attendu « %s »)"
+#~ "arrêt du processus walreceiver pour forcer le serveur standby en cascade à\n"
+#~ "mettre à jour la timeline et à se reconnecter"
 
-#~ msgid "Kerberos 5 not implemented on this server"
-#~ msgstr "Kerberos 5 non implémenté sur ce serveur"
+#~ msgid "invalid standby query string: %s"
+#~ msgstr "chaîne de requête invalide sur le serveur en attente : %s"
 
-#~ msgid "GSSAPI not implemented on this server"
-#~ msgstr "GSSAPI non implémenté sur ce serveur"
+#~ msgid "large object %u was not opened for writing"
+#~ msgstr "le « Large Object » %u n'a pas été ouvert en écriture"
 
-#~ 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 "large object %u was already dropped"
+#~ msgstr "le « Large Object » %u a déjà été supprimé"
 
-#~ msgid "unsafe permissions on private key file \"%s\""
-#~ msgstr "droits non sûrs sur le fichier de la clé privée « %s »"
+#~ 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."
 
-#~ msgid "File must be owned by the database user and must have no permissions for \"group\" or \"other\"."
-#~ msgstr ""
-#~ "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 "\"interval\" time zone \"%s\" not valid"
+#~ msgstr "le fuseau horaire « %s » n'est pas valide pour le type « interval »"
 
-#~ msgid "cannot use authentication method \"crypt\" because password is MD5-encrypted"
-#~ msgstr ""
-#~ "n'a pas pu utiliser la méthode d'authentification « crypt » car le mot de\n"
-#~ "passe est chiffré avec MD5"
+#~ msgid "inconsistent use of year %04d and \"BC\""
+#~ msgstr "utilisation non cohérente de l'année %04d et de « BC »"
 
-#~ 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 "No rows were found in \"%s\"."
+#~ msgstr "Aucune ligne trouvée dans « %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 "argument number is out of range"
+#~ msgstr "le nombre en argument est en dehors des limites"
 
-#~ msgid "cannot use Ident authentication without usermap field"
-#~ msgstr "n'a pas pu utiliser l'authentication Ident sans le champ usermap"
+#~ msgid "index \"%s\" is not ready"
+#~ msgstr "l'index « %s » n'est pas prêt"
 
-#~ msgid "Ident protocol identifies remote user as \"%s\""
-#~ msgstr "le protocole Ident identifie l'utilisateur distant comme « %s »"
+#~ msgid "could not remove database directory \"%s\""
+#~ msgstr "n'a pas pu supprimer le répertoire de bases de données « %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 "unexpected end of line at line %d of thesaurus file \"%s\""
+#~ msgstr "fin de ligne inattendue à la ligne %d du thésaurus « %s »"
 
-#~ 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 "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 "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 "unexpected delimiter at line %d of thesaurus file \"%s\""
+#~ msgstr "délimiteur inattendu sur la ligne %d du thesaurus « %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 "Use the @@@ operator instead."
+#~ msgstr "Utilisez à la place l'opérateur @@@."
 
-#~ msgid "could not set statistics collector timer: %m"
-#~ msgstr "n'a pas pu configurer le timer du récupérateur de statistiques : %m"
+#~ msgid "@@ operator does not support lexeme weight restrictions in GIN index searches"
+#~ msgstr ""
+#~ "l'opérateur @@ ne supporte pas les restrictions de poids de lexeme dans les\n"
+#~ "recherches par index GIN"
 
-#~ msgid "insufficient shared memory for free space map"
-#~ msgstr "mémoire partagée insuffisante pour la structure FSM"
+#~ 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 "max_fsm_pages must exceed max_fsm_relations * %d"
-#~ msgstr "max_fsm_pages doit excéder max_fsm_relations * %d"
+#~ 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 "free space map contains %d pages in %d relations"
-#~ msgstr "la structure FSM contient %d pages dans %d relations"
+#~ msgid "UTF-16 to UTF-8 translation failed: %lu"
+#~ msgstr "échec de la conversion d'UTF16 vers UTF8 : %lu"
 
-#~ 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 ""
-#~ "Un total de %.0f emplacements de pages est utilisé (ceci incluant la\n"
-#~ "surcharge).\n"
-#~ "%.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 "AM/PM hour must be between 1 and 12"
+#~ msgstr "l'heure AM/PM doit être compris entre 1 et 12"
 
-#~ msgid "max_fsm_relations(%d) equals the number of relations checked"
-#~ msgstr "max_fsm_relations(%d) équivaut au nombre de relations tracées"
+#~ msgid "Sat"
+#~ msgstr "Sam"
 
-#~ msgid "You have at least %d relations.  Consider increasing the configuration parameter \"max_fsm_relations\"."
-#~ msgstr ""
-#~ "Vous avez au moins %d relations.Considèrez l'augmentation du paramètre de\n"
-#~ "configuration « max_fsm_relations »."
+#~ msgid "Fri"
+#~ msgstr "Ven"
 
-#~ 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 "Thu"
+#~ msgstr "Jeu"
 
-#~ msgid "Consider increasing the configuration parameter \"max_fsm_pages\" to a value over %.0f."
-#~ msgstr ""
-#~ "Considérez l'augmentation du paramètre de configuration « max_fsm_pages »\n"
-#~ "à une valeur supérieure à %.0f."
+#~ msgid "Wed"
+#~ msgstr "Mer"
 
-#~ msgid "string is too long for tsvector"
-#~ msgstr "la chaîne est trop longue pour un tsvector"
+#~ msgid "Tue"
+#~ msgstr "Mar"
 
-#~ msgid "Prints the parse tree to the server log."
-#~ msgstr "Affiche l'arbre d'analyse dans les journaux applicatifs du serveur."
+#~ msgid "Mon"
+#~ msgstr "Lun"
 
-#~ 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 "Sun"
+#~ msgstr "Dim"
 
-#~ msgid "Prints the execution plan to server log."
-#~ msgstr "Affiche le plan d'exécution dans les journaux applicatifs du serveur."
+#~ msgid "Saturday"
+#~ msgstr "Samedi"
 
-#~ msgid "Uses the indented output format for EXPLAIN VERBOSE."
-#~ msgstr "Utilise le format de sortie indenté pour EXPLAIN VERBOSE."
+#~ msgid "Friday"
+#~ msgstr "Vendredi"
 
-#~ msgid "Sets the maximum number of tables and indexes for which free space is tracked."
-#~ msgstr ""
-#~ "Initialise le nombre maximum de tables et index pour lesquels l'espace libre\n"
-#~ "est tracé."
+#~ msgid "Thursday"
+#~ msgstr "Jeudi"
 
-#~ 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 "Wednesday"
+#~ msgstr "Mercredi"
 
-#~ msgid "Valid values are ON, OFF, and SAFE_ENCODING."
-#~ msgstr "Les valeurs valides sont ON, OFF et SAFE_ENCODING."
+#~ msgid "Tuesday"
+#~ msgstr "Mardi"
 
-#~ 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 ""
-#~ "Les valeurs valides sont DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, INFO,\n"
-#~ "NOTICE, WARNING, ERROR, LOG, FATAL et PANIC. Chaque niveau incut tous les\n"
-#~ "niveaux qui le suit."
+#~ msgid "Monday"
+#~ msgstr "Lundi"
 
-#~ msgid "All SQL statements that cause an error of the specified level or a higher level are logged."
-#~ msgstr ""
-#~ "Toutes les instructions SQL causant une erreur du niveau spécifié ou d'un\n"
-#~ "niveau supérieur sont tracées."
+#~ msgid "Sunday"
+#~ msgstr "Dimanche"
 
-#~ msgid "Each SQL transaction has an isolation level, which can be either \"read uncommitted\", \"read committed\", \"repeatable read\", or \"serializable\"."
-#~ msgstr ""
-#~ "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 "Dec"
+#~ msgstr "Déc"
 
-#~ msgid "Each session can be either \"origin\", \"replica\", or \"local\"."
-#~ msgstr "Chaque session peut valoir soit « origin » soit « replica » soit « local »."
+#~ msgid "Nov"
+#~ msgstr "Nov"
 
-#~ 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 "Oct"
+#~ msgstr "Oct"
 
-#~ msgid "Sets the hostname of the Kerberos server."
-#~ msgstr "Initalise le nom d'hôte du serveur Kerberos."
+#~ msgid "Sep"
+#~ msgstr "Sep"
 
-#~ 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 "Aug"
+#~ msgstr "Aoû"
 
-#~ 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 "Jul"
+#~ msgstr "Juil"
 
-#~ msgid "Valid values are DOCUMENT and CONTENT."
-#~ msgstr "Les valeurs valides sont DOCUMENT et CONTENT."
+#~ msgid "Jun"
+#~ msgstr "Juin"
 
-#~ msgid "invalid argument for power function"
-#~ msgstr "argument invalide pour la fonction puissance (power)"
+#~ msgid "S:May"
+#~ msgstr "S:Mai"
 
-#~ msgid "not unique \"S\""
-#~ msgstr "« S » non unique"
+#~ msgid "Apr"
+#~ msgstr "Avr"
 
-#~ msgid "invalid AM/PM string"
-#~ msgstr "chaîne AM/PM invalide"
+#~ msgid "Mar"
+#~ msgstr "Mar"
 
-#~ msgid "\"TZ\"/\"tz\" not supported"
-#~ msgstr "« TZ »/« tz » non supporté"
+#~ msgid "Feb"
+#~ msgstr "Fév"
 
-#~ msgid "January"
-#~ msgstr "Janvier"
+#~ msgid "Jan"
+#~ msgstr "Jan"
 
-#~ msgid "February"
-#~ msgstr "Février"
+#~ msgid "December"
+#~ msgstr "Décembre"
 
-#~ msgid "March"
-#~ msgstr "Mars"
+#~ msgid "November"
+#~ msgstr "Novembre"
 
-#~ msgid "April"
-#~ msgstr "Avril"
+#~ msgid "October"
+#~ msgstr "Octobre"
 
-#~ msgid "May"
-#~ msgstr "Mai"
+#~ msgid "September"
+#~ msgstr "Septembre"
 
-#~ msgid "June"
-#~ msgstr "Juin"
+#~ msgid "August"
+#~ msgstr "Août"
 
 #~ msgid "July"
 #~ msgstr "Juillet"
 
-#~ msgid "August"
-#~ msgstr "Août"
-
-#~ msgid "September"
-#~ msgstr "Septembre"
+#~ msgid "June"
+#~ msgstr "Juin"
 
-#~ msgid "October"
-#~ msgstr "Octobre"
+#~ msgid "May"
+#~ msgstr "Mai"
 
-#~ msgid "November"
-#~ msgstr "Novembre"
+#~ msgid "April"
+#~ msgstr "Avril"
 
-#~ msgid "December"
-#~ msgstr "Décembre"
+#~ msgid "March"
+#~ msgstr "Mars"
 
-#~ msgid "Jan"
-#~ msgstr "Jan"
+#~ msgid "February"
+#~ msgstr "Février"
 
-#~ msgid "Feb"
-#~ msgstr "Fév"
+#~ msgid "January"
+#~ msgstr "Janvier"
 
-#~ msgid "Mar"
-#~ msgstr "Mar"
+#~ msgid "\"TZ\"/\"tz\" not supported"
+#~ msgstr "« TZ »/« tz » non supporté"
 
-#~ msgid "Apr"
-#~ msgstr "Avr"
+#~ msgid "invalid AM/PM string"
+#~ msgstr "chaîne AM/PM invalide"
 
-#~ msgid "S:May"
-#~ msgstr "S:Mai"
+#~ msgid "not unique \"S\""
+#~ msgstr "« S » non unique"
 
-#~ msgid "Jun"
-#~ msgstr "Juin"
+#~ msgid "invalid argument for power function"
+#~ msgstr "argument invalide pour la fonction puissance (power)"
 
-#~ msgid "Jul"
-#~ msgstr "Juil"
+#~ msgid "Valid values are DOCUMENT and CONTENT."
+#~ msgstr "Les valeurs valides sont DOCUMENT et CONTENT."
 
-#~ msgid "Aug"
-#~ msgstr "Aoû"
+#~ 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 "Sep"
-#~ msgstr "Sep"
+#~ 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 "Oct"
-#~ msgstr "Oct"
+#~ msgid "Sets the hostname of the Kerberos server."
+#~ msgstr "Initalise le nom d'hôte du serveur Kerberos."
 
-#~ msgid "Nov"
-#~ msgstr "Nov"
+#~ 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 "Dec"
-#~ msgstr "Déc"
+#~ msgid "Each session can be either \"origin\", \"replica\", or \"local\"."
+#~ msgstr "Chaque session peut valoir soit « origin » soit « replica » soit « local »."
 
-#~ msgid "Sunday"
-#~ msgstr "Dimanche"
+#~ msgid "Each SQL transaction has an isolation level, which can be either \"read uncommitted\", \"read committed\", \"repeatable read\", or \"serializable\"."
+#~ msgstr ""
+#~ "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 "Monday"
-#~ msgstr "Lundi"
+#~ msgid "All SQL statements that cause an error of the specified level or a higher level are logged."
+#~ msgstr ""
+#~ "Toutes les instructions SQL causant une erreur du niveau spécifié ou d'un\n"
+#~ "niveau supérieur sont tracées."
 
-#~ msgid "Tuesday"
-#~ msgstr "Mardi"
+#~ 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 ""
+#~ "Les valeurs valides sont DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, INFO,\n"
+#~ "NOTICE, WARNING, ERROR, LOG, FATAL et PANIC. Chaque niveau incut tous les\n"
+#~ "niveaux qui le suit."
 
-#~ msgid "Wednesday"
-#~ msgstr "Mercredi"
+#~ msgid "Valid values are ON, OFF, and SAFE_ENCODING."
+#~ msgstr "Les valeurs valides sont ON, OFF et SAFE_ENCODING."
 
-#~ msgid "Thursday"
-#~ msgstr "Jeudi"
+#~ 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 "Friday"
-#~ msgstr "Vendredi"
+#~ msgid "Sets the maximum number of tables and indexes for which free space is tracked."
+#~ msgstr ""
+#~ "Initialise le nombre maximum de tables et index pour lesquels l'espace libre\n"
+#~ "est tracé."
 
-#~ msgid "Saturday"
-#~ msgstr "Samedi"
+#~ msgid "Uses the indented output format for EXPLAIN VERBOSE."
+#~ msgstr "Utilise le format de sortie indenté pour EXPLAIN VERBOSE."
 
-#~ msgid "Sun"
-#~ msgstr "Dim"
+#~ msgid "Prints the execution plan to server log."
+#~ msgstr "Affiche le plan d'exécution dans les journaux applicatifs du serveur."
 
-#~ msgid "Mon"
-#~ msgstr "Lun"
+#~ 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 "Tue"
-#~ msgstr "Mar"
+#~ msgid "Prints the parse tree to the server log."
+#~ msgstr "Affiche l'arbre d'analyse dans les journaux applicatifs du serveur."
 
-#~ msgid "Wed"
-#~ msgstr "Mer"
+#~ msgid "string is too long for tsvector"
+#~ msgstr "la chaîne est trop longue pour un tsvector"
 
-#~ msgid "Thu"
-#~ msgstr "Jeu"
+#~ msgid "Consider increasing the configuration parameter \"max_fsm_pages\" to a value over %.0f."
+#~ msgstr ""
+#~ "Considérez l'augmentation du paramètre de configuration « max_fsm_pages »\n"
+#~ "à une valeur supérieure à %.0f."
 
-#~ msgid "Fri"
-#~ msgstr "Ven"
+#~ 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 "Sat"
-#~ msgstr "Sam"
+#~ msgid "You have at least %d relations.  Consider increasing the configuration parameter \"max_fsm_relations\"."
+#~ msgstr ""
+#~ "Vous avez au moins %d relations.Considèrez l'augmentation du paramètre de\n"
+#~ "configuration « max_fsm_relations »."
 
-#~ msgid "AM/PM hour must be between 1 and 12"
-#~ msgstr "l'heure AM/PM doit être compris entre 1 et 12"
+#~ msgid "max_fsm_relations(%d) equals the number of relations checked"
+#~ msgstr "max_fsm_relations(%d) équivaut au nombre de relations tracées"
 
-#~ msgid "UTF-16 to UTF-8 translation failed: %lu"
-#~ msgstr "échec de la conversion d'UTF16 vers UTF8 : %lu"
+#~ 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 ""
+#~ "Un total de %.0f emplacements de pages est utilisé (ceci incluant la\n"
+#~ "surcharge).\n"
+#~ "%.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 "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 "free space map contains %d pages in %d relations"
+#~ msgstr "la structure FSM contient %d pages dans %d relations"
 
-#~ 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 "max_fsm_pages must exceed max_fsm_relations * %d"
+#~ msgstr "max_fsm_pages doit excéder max_fsm_relations * %d"
 
-#~ msgid "@@ operator does not support lexeme weight restrictions in GIN index searches"
-#~ msgstr ""
-#~ "l'opérateur @@ ne supporte pas les restrictions de poids de lexeme dans les\n"
-#~ "recherches par index GIN"
+#~ msgid "insufficient shared memory for free space map"
+#~ msgstr "mémoire partagée insuffisante pour la structure FSM"
 
-#~ msgid "Use the @@@ operator instead."
-#~ msgstr "Utilisez à la place l'opérateur @@@."
+#~ msgid "could not set statistics collector timer: %m"
+#~ msgstr "n'a pas pu configurer le timer du récupérateur de statistiques : %m"
 
-#~ msgid "unexpected delimiter at line %d of thesaurus file \"%s\""
-#~ msgstr "délimiteur inattendu sur la ligne %d du thesaurus « %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 "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 "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 "unexpected end of line at line %d of thesaurus file \"%s\""
-#~ msgstr "fin de ligne inattendue à la ligne %d du thésaurus « %s »"
+#~ 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 "could not remove database directory \"%s\""
-#~ msgstr "n'a pas pu supprimer le répertoire de bases de données « %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 "index \"%s\" is not ready"
-#~ msgstr "l'index « %s » n'est pas prêt"
+#~ msgid "Ident protocol identifies remote user as \"%s\""
+#~ msgstr "le protocole Ident identifie l'utilisateur distant comme « %s »"
 
-#~ msgid "argument number is out of range"
-#~ msgstr "le nombre en argument est en dehors des limites"
+#~ msgid "cannot use Ident authentication without usermap field"
+#~ msgstr "n'a pas pu utiliser l'authentication Ident sans le champ usermap"
 
-#~ msgid "No rows were found in \"%s\"."
-#~ msgstr "Aucune ligne trouvée dans « %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 "inconsistent use of year %04d and \"BC\""
-#~ msgstr "utilisation non cohérente de l'année %04d et de « BC »"
+#~ 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 "\"interval\" time zone \"%s\" not valid"
-#~ msgstr "le fuseau horaire « %s » n'est pas valide pour le type « interval »"
+#~ msgid "cannot use authentication method \"crypt\" because password is MD5-encrypted"
+#~ msgstr ""
+#~ "n'a pas pu utiliser la méthode d'authentification « crypt » car le mot de\n"
+#~ "passe est chiffré avec MD5"
 
-#~ 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."
+#~ msgid "File must be owned by the database user and must have no permissions for \"group\" or \"other\"."
+#~ msgstr ""
+#~ "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 "large object %u was already dropped"
-#~ msgstr "le « Large Object » %u a déjà été supprimé"
+#~ msgid "unsafe permissions on private key file \"%s\""
+#~ msgstr "droits non sûrs sur le fichier de la clé privée « %s »"
 
-#~ msgid "large object %u was not opened for writing"
-#~ msgstr "le « Large Object » %u n'a pas été ouvert en écriture"
+#~ 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 "invalid standby query string: %s"
-#~ msgstr "chaîne de requête invalide sur le serveur en attente : %s"
+#~ msgid "GSSAPI not implemented on this server"
+#~ msgstr "GSSAPI non implémenté sur ce serveur"
 
-#~ msgid "terminating walsender process to force cascaded standby to update timeline and reconnect"
-#~ msgstr ""
-#~ "arrêt du processus walreceiver pour forcer le serveur standby en cascade à\n"
-#~ "mettre à jour la timeline et à se reconnecter"
+#~ msgid "Kerberos 5 not implemented on this server"
+#~ msgstr "Kerberos 5 non implémenté sur ce serveur"
 
-#~ msgid "invalid standby handshake message type %d"
-#~ msgstr "type %d du message de handshake du serveur en attente invalide"
+#~ msgid "unexpected Kerberos user name received from client (received \"%s\", expected \"%s\")"
+#~ msgstr ""
+#~ "nom d'utilisateur Kerberos inattendu reçu à partir du client (reçu « %s »,\n"
+#~ "attendu « %s »)"
 
-#~ msgid "streaming replication successfully connected to primary"
-#~ msgstr "réplication de flux connecté avec succès au serveur principal"
+#~ msgid "cannot change number of columns in view"
+#~ msgstr "ne peut pas modifier le nombre de colonnes dans la vue"
 
-#~ msgid "shutdown requested, aborting active base backup"
-#~ msgstr "arrêt demandé, annulation de la sauvegarde active de base"
+#~ msgid "Consider using VACUUM FULL on this relation or increasing the configuration parameter \"max_fsm_pages\"."
+#~ msgstr ""
+#~ "Pensez à compacter cette relation en utilisant VACUUM FULL ou à augmenter le\n"
+#~ "paramètre de configuration « max_fsm_pages »."
 
-#~ msgid "terminating all walsender processes to force cascaded standby(s) to update timeline and reconnect"
+#~ msgid "relation \"%s.%s\" contains more than \"max_fsm_pages\" pages with useful free space"
 #~ msgstr ""
-#~ "arrêt de tous les processus walsender pour forcer les serveurs standby en\n"
-#~ "cascade à mettre à jour la timeline et à se reconnecter"
+#~ "la relation « %s.%s » contient plus de « max_fsm_pages » pages d'espace\n"
+#~ "libre utile"
 
-#~ 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."
+#~ msgid "constraint definition for check constraint \"%s\" does not match"
 #~ msgstr ""
-#~ "Cette erreur signifie habituellement que la demande de PostgreSQL pour un\n"
-#~ "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 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"
-#~ "La documentation de PostgreSQL contient plus d'informations sur la\n"
-#~ "configuration de la mémoire partagée."
+#~ "la définition de la contrainte « %s » pour la contrainte de vérification ne\n"
+#~ "correspond pas"
 
-#~ 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"
+#~ msgid "multiple constraints named \"%s\" were dropped"
+#~ msgstr "les contraintes multiples nommées « %s » ont été supprimées"
 
-#~ 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"
+#~ msgid "there are objects dependent on %s"
+#~ msgstr "des objets dépendent de %s"
 
-#~ msgid "arguments of row IN must all be row expressions"
-#~ msgstr "les arguments de la ligne IN doivent tous être des expressions de ligne"
+#~ msgid "failed to drop all objects depending on %s"
+#~ msgstr "échec lors de la suppression de tous les objets dépendant de %s"
 
-#~ msgid "argument of %s must not contain window functions"
-#~ msgstr "l'argument de %s ne doit pas contenir des fonctions window"
+#~ msgid "parser stack overflow"
+#~ msgstr "saturation de la pile de l'analyseur"
 
-#~ msgid "argument of %s must not contain aggregate functions"
-#~ msgstr "l'argument de %s ne doit pas contenir de fonctions d'agrégats"
+#~ msgid "syntax error; also virtual memory exhausted"
+#~ msgstr "erreur de syntaxe ; de plus, mémoire virtuelle saturée"
 
-#~ msgid "cannot use window function in function expression in FROM"
+#~ msgid "syntax error: cannot back up"
+#~ msgstr "erreur de syntaxe : n'a pas pu revenir"
+
+#~ msgid "log_restartpoints = %s"
+#~ msgstr "log_restartpoints = %s"
+
+#~ msgid "It looks like you need to initdb or install locale support."
 #~ msgstr ""
-#~ "ne peut pas utiliser la fonction window dans l'expression de la fonction\n"
-#~ "du FROM"
+#~ "Il semble que vous avez besoin d'exécuter initdb ou d'installer le support\n"
+#~ "des locales."
 
-#~ msgid "function expression in FROM cannot refer to other relations of same query level"
+#~ msgid "The database cluster was initialized with LOCALE_NAME_BUFLEN %d, but the server was compiled with LOCALE_NAME_BUFLEN %d."
 #~ 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"
+#~ "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 "subquery in FROM cannot refer to other relations of same query level"
+#~ msgid "invalid LC_CTYPE setting"
+#~ msgstr "paramètre LC_CTYPE invalide"
+
+#~ msgid "invalid LC_COLLATE setting"
+#~ msgstr "paramètre LC_COLLATE invalide"
+
+#~ 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 "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)"
+
+#, fuzzy
+#~ msgid "wrong number of array_subscripts"
+#~ msgstr "mauvais nombre d'indices du tableau"
+
+#~ msgid "could not create XPath object"
+#~ msgstr "n'a pas pu créer l'objet XPath"
+
+#~ msgid "multiple TRUNCATE events specified"
+#~ msgstr "multiples événements TRUNCATE spécifiés"
+
+#~ msgid "multiple UPDATE events specified"
+#~ msgstr "multiples événements UPDATE spécifiés"
+
+#~ msgid "multiple DELETE events specified"
+#~ msgstr "multiples événements DELETE spécifiés"
+
+#~ msgid "hurrying in-progress restartpoint"
+#~ msgstr "accélération du restartpoint en cours"
+
+#~ 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 "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 "adding missing FROM-clause entry for table \"%s\""
+#~ msgstr "ajout d'une entrée manquante dans FROM (table « %s »)"
+
+#~ 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 "unsupported PAM conversation %d/%s"
+#~ msgstr "conversation PAM %d/%s non supportée"
+
+#~ 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 "could not fsync segment %u of relation %s but retrying: %m"
 #~ 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"
+#~ "n'a pas pu synchroniser sur disque (fsync) le segment %u de la relation\n"
+#~ "%s, nouvelle tentative : %m"
 
-#~ 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"
+#~ 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 "window functions not allowed in GROUP BY clause"
-#~ msgstr "fonctions window non autorisées dans une clause GROUP BY"
+#~ 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 "aggregates not allowed in WHERE clause"
-#~ msgstr "agrégats non autorisés dans une clause WHERE"
+#~ 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 "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 »"
+#~ 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 "SELECT FOR UPDATE/SHARE is not allowed with window functions"
-#~ msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec les fonctions window"
+#~ msgid "could not open relation %s: %m"
+#~ msgstr "n'a pas pu ouvrir la relation %s : %m"
 
-#~ 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"
+#~ msgid "could not extend relation %s: %m"
+#~ msgstr "n'a pas pu étendre la relation %s : %m"
 
-#~ msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
-#~ msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec la clause HAVING"
+#~ 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 "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"
+#~ 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 "RETURNING cannot contain references to other relations"
-#~ msgstr "RETURNING ne doit pas contenir de références à d'autres relations"
+#~ msgid "could not remove relation %s: %m"
+#~ msgstr "n'a pas pu supprimer la relation %s : %m"
 
-#~ msgid "cannot use window function in RETURNING"
-#~ msgstr "ne peut pas utiliser une fonction window dans RETURNING"
+#~ msgid "SELECT FOR UPDATE/SHARE is not supported within a query with multiple result relations"
+#~ msgstr ""
+#~ "SELECT FOR UPDATE/SHARE n'est pas supporté dans une requête avec plusieurs\n"
+#~ "relations"
 
-#~ msgid "cannot use aggregate function in RETURNING"
-#~ msgstr "ne peut pas utiliser une fonction d'agrégat dans RETURNING"
+#~ msgid "cannot set session authorization within security-definer function"
+#~ msgstr "ne peut pas exécuter SESSION AUTHORIZATION sur la fonction SECURITY DEFINER"
 
-#~ msgid "cannot use window function in UPDATE"
-#~ msgstr "ne peut pas utiliser une fonction window dans un UPDATE"
+#~ msgid "cannot specify CSV in BINARY mode"
+#~ msgstr "ne peut pas spécifier CSV en mode binaire (BINARY)"
 
-#~ msgid "cannot use aggregate function in UPDATE"
-#~ msgstr "ne peut pas utiliser une fonction d'agrégat dans un UPDATE"
+#~ msgid "invalid role password \"%s\""
+#~ msgstr "mot de passe « %s » de l'utilisateur invalide"
 
-#~ msgid "cannot use window function in VALUES"
-#~ msgstr "ne peut pas utiliser la fonction window dans un VALUES"
+#~ msgid "invalid role name \"%s\""
+#~ msgstr "nom de rôle « %s » invalide"
 
-#~ msgid "cannot use aggregate function in VALUES"
-#~ msgstr "ne peut pas utiliser la fonction d'agrégat dans un VALUES"
+#~ msgid "invalid database name \"%s\""
+#~ msgstr "nom de base de données « %s » invalide"
 
-#~ msgid "Use SELECT ... UNION ALL ... instead."
-#~ msgstr "Utilisez à la place SELECT ... UNION ALL ..."
+#~ 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 "VALUES must not contain OLD or NEW references"
-#~ msgstr "VALUES ne doit pas contenir des références à OLD et NEW"
+#~ msgid "attempted change of parameter \"%s\" ignored"
+#~ msgstr "tentative de modification du paramètre « %s » ignoré"
 
-#~ msgid "VALUES must not contain table references"
-#~ msgstr "VALUES ne doit pas contenir de références de table"
+#~ msgid "Sets the regular expression \"flavor\"."
+#~ msgstr "Initialise l'expression rationnelle « flavor »."
 
-#~ msgid "LDAP search failed for filter \"%s\" on server \"%s\": user is not unique (%ld matches)"
+#~ msgid "Automatically adds missing table references to FROM clauses."
 #~ msgstr ""
-#~ "échec de la recherche LDAP pour le filtre « %s » sur le serveur « %s » :\n"
-#~ "utilisateur non unique (%ld correspondances)"
+#~ "Ajoute automatiquement les références à la table manquant dans les clauses\n"
+#~ "FROM."
 
-#~ 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."
+#~ msgid "Table contains duplicated values."
+#~ msgstr "La table contient des valeurs dupliquées."
 
-#~ 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."
+#~ 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 "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."
+#~ msgid "DISTINCT is supported only for single-argument aggregates"
+#~ msgstr "DISTINCT est seulement supporté pour les agrégats à un seul argument"
 
-#~ msgid "automatic vacuum of table \"%s.%s.%s\": cannot (re)acquire exclusive lock for truncate scan"
-#~ msgstr "vacuum automatique de la table « %s.%s.%s » : ne peut pas acquérir le verrou exclusif pour la tronquer"
+#~ 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 "must be superuser to rename text search templates"
-#~ msgstr "doit être super-utilisateur pour renommer les modèles de recherche plein texte"
+#~ msgid "frame start at CURRENT ROW is not implemented"
+#~ msgstr "début du frame à CURRENT ROW n'est pas implémenté"
 
-#~ msgid "must be superuser to rename text search parsers"
+#~ msgid "Rebuild the index with REINDEX."
+#~ msgstr "Reconstruisez l'index avec REINDEX."
+
+#~ msgid "index \"%s\" contains %.0f row versions, but table contains %.0f row versions"
 #~ msgstr ""
-#~ "doit être super-utilisateur pour renommer les analyseurs de recherche plein\n"
-#~ "texte"
+#~ "l'index « %s » contient %.0f versions de ligne, mais la table contient %.0f\n"
+#~ "versions de ligne"
 
-#~ msgid "cannot use window function in trigger WHEN condition"
-#~ msgstr "ne peut pas utiliser la fonction window dans la condition WHEN d'un trigger"
+#~ 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 "Use ALTER FOREIGN TABLE instead."
-#~ msgstr "Utilisez ALTER FOREIGN TABLE à la place."
+#~ 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 "cannot use window function in transform expression"
-#~ msgstr "ne peut pas utiliser la fonction window dans l'expression de la transformation"
+#~ 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 versions de lignes mortes ne peuvent pas encore être supprimées.\n"
+#~ "Les versions non supprimables de ligne vont de %lu to %lu octets.\n"
+#~ "Il existait %.0f pointeurs d'éléments inutilisés.\n"
+#~ "L'espace libre total (incluant les versions supprimables de ligne) est de\n"
+#~ "%.0f octets.\n"
+#~ "%u pages sont ou deviendront vides, ceci incluant %u pages en fin de la\n"
+#~ "table.\n"
+#~ "%u pages contenant %.0f octets libres sont des destinations de déplacement\n"
+#~ "disponibles.\n"
+#~ "%s."
 
-#~ msgid "default values on foreign tables are not supported"
-#~ msgstr "les valeurs par défaut ne sont pas supportées sur les tables distantes"
+#~ msgid "relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- cannot shrink relation"
+#~ msgstr ""
+#~ "relation « %s », TID %u/%u : DeleteTransactionInProgress %u --- n'a pas pu\n"
+#~ "diminuer la taille de la relation"
 
-#~ msgid "constraints on foreign tables are not supported"
-#~ msgstr "les contraintes sur les tables distantes ne sont pas supportées"
+#~ msgid "relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- cannot shrink relation"
+#~ msgstr ""
+#~ "relation « %s », TID %u/%u : InsertTransactionInProgress %u --- n'a pas pu\n"
+#~ "diminuer la taille de la relation"
 
-#~ msgid "cannot use window function in EXECUTE parameter"
-#~ msgstr "ne peut pas utiliser une fonction window dans le paramètre EXECUTE"
+#~ msgid "relation \"%s\" TID %u/%u: dead HOT-updated tuple --- cannot shrink relation"
+#~ msgstr ""
+#~ "relation « %s », TID %u/%u : ligne morte mise à jour par HOT --- n'a pas pu\n"
+#~ "diminuer la taille de la relation"
 
-#~ msgid "cannot use aggregate in index predicate"
-#~ msgstr "ne peut pas utiliser un agrégat dans un prédicat d'index"
+#~ 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 "function \"%s\" already exists in schema \"%s\""
-#~ msgstr "la fonction « %s » existe déjà dans le schéma « %s »"
+#~ msgid "directory \"%s\" is not empty"
+#~ msgstr "le répertoire « %s » n'est pas vide"
 
-#~ msgid "Use ALTER AGGREGATE to change owner of aggregate functions."
-#~ msgstr "Utiliser ALTER AGGREGATE pour changer le propriétaire des fonctions d'agrégat."
+#~ msgid "number of distinct values %g is too low"
+#~ msgstr "le nombre de valeurs distinctes %g est trop basse"
 
-#~ msgid "Use ALTER AGGREGATE to rename aggregate functions."
-#~ msgstr "Utiliser ALTER AGGREGATE pour renommer les fonctions d'agrégat."
+#~ msgid "cannot truncate system relation \"%s\""
+#~ msgstr "ne peut pas tronquer la relation système « %s »"
 
-#~ 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"
+#~ 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 use aggregate function in parameter default value"
+#~ msgid "\"%s\" is a system catalog"
+#~ msgstr "« %s » est un catalogue système"
+
+#~ 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 "Sets the language used in DO statement if LANGUAGE is not specified."
 #~ msgstr ""
-#~ "ne peut pas utiliser une fonction d'agrégat dans la valeur par défaut d'un\n"
-#~ "paramètre"
+#~ "Configure le langage utilisé dans une instruction DO si la clause LANGUAGE n'est\n"
+#~ "pas spécifiée."
 
-#~ 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"
+#~ 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 ""
+#~ "Cette erreur peut aussi survenir si la séquence d'octets ne correspond pas\n"
+#~ "au jeu de caractères attendu par le serveur, le jeu étant contrôlé par\n"
+#~ "« client_encoding »."
+
+#~ 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 "binary value is out of range for type bigint"
+#~ msgstr "la valeur binaire est en dehors des limites du type bigint"
+
+#~ msgid "transaction is read-only"
+#~ msgstr "la transaction est en lecture seule"
+
+#~ msgid "PID %d is among the slowest backends."
+#~ msgstr "Le PID %d est parmi les processus serveur les plus lents."
+
+#, fuzzy
+#~ msgid "invalid WAL message received from primary"
+#~ msgstr "format du message invalide"
+
+#, fuzzy
+#~ msgid "sorry, too many standbys already"
+#~ msgstr "désolé, trop de clients sont déjà connectés"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "couldn't put socket to blocking mode: %m"
+#~ msgstr "n'a pas pu activer le mode bloquant pour la socket : %s\n"
+
+#, fuzzy
+#~ msgid "couldn't put socket to non-blocking mode: %m"
+#~ msgstr "n'a pas pu activer le mode non-bloquant pour la socket : %s\n"
 
-#~ msgid "CREATE TABLE AS specifies too many column names"
-#~ msgstr "CREATE TABLE AS spécifie trop de noms de colonnes"
+#~ 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 "%s already exists in schema \"%s\""
-#~ msgstr "%s existe déjà dans le schéma « %s »"
+#~ msgid "connection limit exceeded for non-superusers"
+#~ msgstr "limite de connexions dépassée pour les utilisateurs standards"
 
-#~ msgid "A function returning ANYRANGE must have at least one ANYRANGE argument."
+#~ msgid "not enough shared memory for walreceiver"
 #~ msgstr ""
-#~ "Une fonction renvoyant ANYRANGE doit avoir au moins un argument du type\n"
-#~ "ANYRANGE."
+#~ "pas assez de mémoire partagée pour le processus de réception des journaux de\n"
+#~ "transactions"
 
-#~ msgid "cannot use window function in check constraint"
-#~ msgstr "ne peut pas utiliser une fonction window dans une contrainte de vérification"
+#~ 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 "cannot use window function in default expression"
-#~ msgstr "ne peut pas utiliser une fonction window dans une expression par défaut"
+#~ msgid "unlogged operation performed, data may be missing"
+#~ msgstr "opération réalisée non tracée, les données pourraient manquer"
 
-#~ msgid "cannot use aggregate function in default expression"
-#~ msgstr "ne peut pas utiliser une fonction d'agrégat dans une expression par défaut"
+#~ msgid "During recovery, allows connections and queries.  During normal running, causes additional info to be written to WAL to enable hot standby mode on WAL standby nodes."
+#~ msgstr ""
+#~ "Lors de la restauration, autorise les connexions et les requêtes. Lors d'une\n"
+#~ "exécution normale, fait que des informations supplémentaires sont écrites dans\n"
+#~ "les journaux de transactions pour activer le mode Hot Standby sur les n½uds\n"
+#~ "en attente."
 
-#~ msgid "cannot use subquery in default expression"
-#~ msgstr "ne peut pas utiliser une sous-requête dans l'expression par défaut"
+#~ 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 "uncataloged table %s"
-#~ msgstr "table %s sans catalogue"
+#~ msgid "archive_mode must be enabled at server start."
+#~ msgstr "archive_mode doit être activé au lancement du serveur."
 
-#~ msgid "xrecoff \"%X\" is out of valid range, 0..%X"
-#~ msgstr "xrecoff « %X » en dehors des limites valides, 0..%X"
+#~ msgid "WAL archiving is not active"
+#~ msgstr "l'archivage des journaux de transactions n'est pas actif"
 
-#~ msgid "Incorrect XLOG_BLCKSZ in page header."
-#~ msgstr "XLOG_BLCKSZ incorrect dans l'en-tête de page."
+#~ msgid "usermap \"%s\""
+#~ msgstr "correspondance utilisateur « %s »"
 
-#~ msgid "Incorrect XLOG_SEG_SIZE in page header."
-#~ msgstr "XLOG_SEG_SIZE incorrecte dans l'en-tête de page."
+#~ msgid "restartpoint_command = '%s'"
+#~ msgstr "restartpoint_command = '%s'"
 
-#~ msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
+#~ msgid "recovery restart point at %X/%X with latest known log time %s"
 #~ msgstr ""
-#~ "longueur invalide du « contrecord » %u dans le journal de tranasctions %u,\n"
-#~ "segment %u, décalage %u"
+#~ "point de relancement de la restauration sur %X/%X avec %s comme dernière\n"
+#~ "date connue du journal"
 
-#~ 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"
+#~ msgid "Not safe to send CSV data\n"
+#~ msgstr "Envoi non sûr des données CSV\n"
 
-#~ 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"
+#~ 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 "unlogged GiST indexes are not supported"
-#~ msgstr "les index GiST non tracés ne sont pas supportés"
+#~ msgid "access to %s"
+#~ msgstr "accès à %s"
 
-#~ msgid "could not change directory to \"%s\""
-#~ msgstr "n'a pas pu accéder au répertoire « %s »"
+#~ msgid "parameter \"standby_mode\" requires a Boolean value"
+#~ msgstr "le paramètre « standby_mode » requiert une valeur booléenne"
 
-#~ msgid "Perhaps out of disk space?"
-#~ msgstr "Peut-être manquez-vous de place disque ?"
+#~ msgid "parameter \"recovery_target_inclusive\" requires a Boolean value"
+#~ msgstr "le paramètre « recovery_target_inclusive » requiert une valeur booléenne"
 
-#~ msgid "time zone offset %d is not a multiple of 900 sec (15 min) in time zone file \"%s\", line %d"
+#~ msgid "cannot drop \"%s\" because it is being used by active queries in this session"
 #~ 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"
-
-#~ msgid "Sets the name of the Kerberos service."
-#~ msgstr "Initialise le nom du service Kerberos."
+#~ "ne peut pas supprimer « %s » car cet objet est en cours d'utilisation par\n"
+#~ "des requêtes actives dans cette session"
 
-#~ msgid "No description available."
-#~ msgstr "Aucune description disponible."
+#~ msgid "unrecognized \"log_destination\" key word: \"%s\""
+#~ msgstr "mot clé « log_destination » non reconnu : « %s »"
 
-#~ msgid "cannot call json_populate_recordset on a nested object"
-#~ msgstr "ne peut pas appeler json_populate_recordset sur un objet imbriqué"
+#~ msgid "invalid list syntax for parameter \"log_destination\""
+#~ msgstr "syntaxe de liste invalide pour le paramètre « log_destination »"
 
-#~ msgid "cannot call json_populate_recordset on a scalar"
-#~ msgstr "ne peut pas appeler json_populate_recordset sur un scalaire"
+#~ msgid "Sets immediate fsync at commit."
+#~ msgstr "Configure un fsync immédiat lors du commit."
 
-#~ msgid "cannot call json_populate_recordset with nested arrays"
-#~ msgstr "ne peut pas appeler json_populate_recordset avec des tableaux imbriqués"
+#~ msgid "could not open new log file \"%s\": %m"
+#~ msgstr "n'a pas pu ouvrir le nouveau journal applicatif « %s » : %m"
 
-#~ msgid "must call json_populate_recordset on an array of objects"
-#~ msgstr "doit appeler json_populate_recordset sur un tableau d'objets"
+#~ msgid "could not create log file \"%s\": %m"
+#~ msgstr "n'a pas pu créer le journal applicatif « %s » : %m"
 
-#~ msgid "cannot call json_populate_recordset with nested objects"
-#~ msgstr "ne peut pas appeler json_populate_recordset sur des objets imbriqués"
+#~ 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"
 
-#~ msgid "cannot call json_populate_recordset on an object"
-#~ msgstr "ne peut pas appeler json_populate_recordset sur un objet"
+#~ 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"
 
-#~ msgid "first argument of json_populate_recordset must be a row type"
-#~ msgstr "le premier argument de json_populate_recordset doit être un type ROW"
+#~ msgid "could not enable credential reception: %m"
+#~ msgstr "n'a pas pu activer la réception de lettres de créance : %m"
 
-#~ msgid "first argument of json_populate_record must be a row type"
-#~ msgstr "le premier argument de json_populate_record doit être un type ROW"
+#~ msgid "argument to pg_get_expr() must come from system catalogs"
+#~ msgstr "l'argument de pg_get_expr() doit provenir des catalogues systèmes"
 
-#~ msgid "cannot call json_array_elements on a scalar"
-#~ msgstr "ne peut pas appeler json_array_elements sur un scalaire"
+#~ msgid "invalid interval value for time zone: day not allowed"
+#~ msgstr "valeur d'intervalle invalide pour le fuseau horaire : jour non autorisé"
 
-#~ msgid "cannot call json_array_elements on a non-array"
-#~ msgstr "ne peut pas appeler json_array_elements sur un objet qui n'est pas un tableau"
+#~ 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"
 
-#~ msgid "cannot extract field from a non-object"
-#~ msgstr "ne peut pas extraire le chemin à partir d'un non-objet"
+#~ msgid "unrecognized \"datestyle\" key word: \"%s\""
+#~ msgstr "mot clé « datestyle » non reconnu : « %s »"
 
-#~ msgid "cannot extract array element from a non-array"
-#~ msgstr "ne peut pas extraire un élément du tableau à partir d'un objet qui n'est pas un tableau"
+#~ msgid "invalid list syntax for parameter \"datestyle\""
+#~ msgstr "syntaxe de liste invalide pour le paramètre « datestyle »"
 
-#~ msgid "cannot call function with empty path elements"
-#~ msgstr "ne peut pas appeler une fonction avec des éléments chemins vides"
+#~ msgid "database \"%s\" not found"
+#~ msgstr "base de données « %s » non trouvée"
 
-#~ msgid "cannot call function with null path elements"
-#~ msgstr "ne peut pas appeler une fonction avec des éléments chemins NULL"
+#~ msgid "composite type must have at least one attribute"
+#~ msgstr "le type composite doit avoir au moins un attribut"
 
-#~ msgid "cannot call json_object_keys on a scalar"
-#~ msgstr "ne peut pas appeler json_object_keys sur un scalaire"
+#~ 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 "cannot call json_object_keys on an array"
-#~ msgstr "ne peut pas appeler json_object_keys sur un tableau"
+#~ 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 "missing assignment operator"
-#~ msgstr "opérateur d'affectation manquant"
+#~ msgid "function \"%s\" is already in schema \"%s\""
+#~ msgstr "la fonction « %s » existe déjà dans le schéma « %s »"
 
-#~ msgid "wrong affix file format for flag"
-#~ msgstr "mauvais format de fichier affixe pour le drapeau"
+#~ 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 "Views that return the same column more than once are not automatically updatable."
-#~ msgstr "Les vues qui renvoient la même colonne plus d'une fois ne sont pas automatiquement disponibles en écriture."
+#~ 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 "Security-barrier views are not automatically updatable."
-#~ msgstr "Les vues avec barrière de sécurité ne sont pas automatiquement disponibles en écriture."
+#~ 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 "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."
+#~ msgid "\"%s\" is not a table, view, or composite type"
+#~ msgstr "« %s » n'est pas une table, une vue ou un type composite"
 
-#~ msgid "too many column aliases specified for function %s"
-#~ msgstr "trop d'alias de colonnes spécifiées pour la fonction %s"
+#~ 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: 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"
+#~ 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 "%s: invalid effective UID: %d\n"
-#~ msgstr "%s : UID effectif invalide : %d\n"
+#~ 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 "krb5 authentication is not supported on local sockets"
+#~ msgid "cannot cluster on index \"%s\" because access method does not handle null values"
 #~ msgstr ""
-#~ "l'authentification krb5 n'est pas supportée sur les connexions locales par\n"
-#~ "socket"
+#~ "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 "SSL renegotiation failure"
-#~ msgstr "échec lors de la re-négotiation SSL"
+#~ msgid "clustering \"%s.%s\""
+#~ msgstr "exécution de CLUSTER sur « %s.%s »"
 
-#~ msgid "local user with ID %d does not exist"
-#~ msgstr "l'utilisateur local dont l'identifiant est %d n'existe pas"
+#~ msgid "EnumValuesCreate() can only set a single OID"
+#~ msgstr "EnumValuesCreate() peut seulement initialiser un seul OID"
 
-#~ msgid "Kerberos unparse_name returned error %d"
-#~ msgstr "unparse_name de Kerberos a renvoyé l'erreur %d"
+#~ 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 "Kerberos recvauth returned error %d"
-#~ msgstr "recvauth de Kerberos a renvoyé l'erreur %d"
+#~ 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 "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
-#~ msgstr "sname_to_principal(« %s », « %s ») de Kerberos a renvoyé l'erreur %d"
+#~ 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 "Kerberos keytab resolving returned error %d"
-#~ msgstr "la résolution keytab de Kerberos a renvoyé l'erreur %d"
+#~ 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 "Kerberos initialization returned error %d"
-#~ msgstr "l'initialisation de Kerberos a retourné l'erreur %d"
+#~ msgid "Lines should have the format parameter = 'value'."
+#~ msgstr "Les lignes devraient avoir le format paramètre = 'valeur'"
 
-#~ msgid "Kerberos 5 authentication failed for user \"%s\""
-#~ msgstr "authentification Kerberos 5 échouée pour l'utilisateur « %s »"
+#~ msgid "syntax error in recovery command file: %s"
+#~ msgstr "erreur de syntaxe dans le fichier de restauration : %s"
 
-#~ msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
-#~ msgstr "le trigger « %s » pour la table « %s » n'existe pas, poursuite du traitement"
+#~ msgid "Write-Ahead Log / Streaming Replication"
+#~ msgstr "Write-Ahead Log / Réplication en flux"
+
+#~ msgid "unable to open directory pg_tblspc: %m"
+#~ msgstr "impossible d'ouvrir le répertoire p_tblspc : %m"
 
-#~ msgid "invalid input syntax for transaction log location: \"%s\""
-#~ msgstr "syntaxe invalide en entrée pour l'emplacement du journal de transactions : « %s »"
+#~ msgid "unable to read symbolic link %s: %m"
+#~ msgstr "incapable de lire le lien symbolique %s : %m"
 
-#~ msgid "could not parse transaction log location \"%s\""
-#~ msgstr "n'a pas pu analyser l'emplacement du journal des transactions « %s »"
+#~ msgid "index \"%s\" is not a b-tree"
+#~ msgstr "l'index « %s » n'est pas un btree"
 
-#~ msgid "%s \"%s\": return code %d"
-#~ msgstr "%s « %s » : code de retour %d"
+#~ msgid "ALTER TYPE USING is only supported on plain tables"
+#~ msgstr "ALTER TYPE USING est seulement supportés sur les tables standards"
 
-#~ 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"
+#~ msgid "resetting unlogged relations: cleanup %d init %d"
+#~ msgstr "réinitialisation des relations non tracées : nettoyage %d initialisation %d"
 
-#~ msgid "SET AUTOCOMMIT TO OFF is no longer supported"
-#~ msgstr "SET AUTOCOMMIT TO OFF n'est plus supporté"
+#~ msgid "%s (%x)"
+#~ msgstr "%s (%x)"
 
-#~ 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."
+#~ msgid "SSPI error %x"
+#~ msgstr "erreur SSPI : %x"
 
-#~ 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."
+#~ msgid "consistent state delayed because recovery snapshot incomplete"
+#~ msgstr "état de cohérence pas encore atteint à cause d'un snapshot de restauration incomplet"
 
-#~ 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."
+#~ msgid "tablespace %u is not empty"
+#~ msgstr "le tablespace %u n'est pas vide"
 
-#~ msgid "This parameter doesn't do anything."
-#~ msgstr "Ce paramètre ne fait rien."
+#~ msgid "subquery in WITH cannot have SELECT INTO"
+#~ msgstr "la sous-requête du WITH ne peut pas avoir de SELECT INTO"
 
-#~ msgid "This is a debugging aid."
-#~ msgstr "C'est une aide de débogage."
+#~ msgid "subquery cannot have SELECT INTO"
+#~ msgstr "la sous-requête ne peut pas avoir de SELECT INTO"
 
-#~ msgid "Turns on various assertion checks."
-#~ msgstr "Active les différentes vérifications des assertions."
+#~ msgid "subquery in FROM cannot have SELECT INTO"
+#~ msgstr "la sous-requête du FROM ne peut pas avoir de SELECT INTO"
 
-#~ msgid "cannot accept a value of type pg_node_tree"
-#~ msgstr "ne peut pas accepter une valeur de type pg_node_tree"
+#~ msgid "DECLARE CURSOR cannot specify INTO"
+#~ msgstr "DECLARE CURSOR ne peut pas spécifier INTO"
 
-#~ msgid "must be superuser or have the same role to terminate other server processes"
-#~ msgstr ""
-#~ "doit être super-utilisateur ou avoir le même rôle pour fermer les connexions\n"
-#~ "exécutées dans les autres processus serveur"
+#~ msgid "INSERT ... SELECT cannot specify INTO"
+#~ msgstr "INSERT ... SELECT ne peut pas avoir INTO"
 
-#~ msgid "must be superuser or have the same role to cancel queries running in other server processes"
-#~ msgstr ""
-#~ "doit être super-utilisateur ou avoir le même rôle pour annuler des requêtes\n"
-#~ "exécutées dans les autres processus serveur"
+#~ 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"
 
-#~ msgid "invalid symbol"
-#~ msgstr "symbole invalide"
+#~ msgid "CREATE TABLE AS cannot specify INTO"
+#~ msgstr "CREATE TABLE AS ne peut pas spécifier INTO"
 
-#~ msgid "unexpected \"=\""
-#~ msgstr "« = » inattendu"
+#~ msgid "  --version       output version information, then exit\n"
+#~ msgstr "  --version          affiche la version, puis quitte\n"
 
-#~ msgid "neither input type is an array"
-#~ msgstr "aucun type de données n'est un tableau"
+#~ msgid "  --help          show this help, then exit\n"
+#~ msgstr "  --help             affiche cette aide, puis quitte\n"
 
-#~ msgid "could not determine input data types"
-#~ msgstr "n'a pas pu déterminer les types de données en entrée"
+#~ 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"
 
-#~ msgid "archive member \"%s\" too large for tar format"
-#~ msgstr "membre « %s » de l'archive trop volumineux pour le format tar"
+#~ msgid "See server log for details."
+#~ msgstr "Voir les journaux applicatifs du serveur pour plus de détails."
 
-#~ msgid "postmaster became multithreaded"
-#~ msgstr "le postmaster est devenu multithreadé"
+#~ msgid "missing or erroneous pg_hba.conf file"
+#~ msgstr "fichier pg_hba.conf manquant ou erroné"
 
-#~ msgid "invalid value for parameter \"replication\""
-#~ msgstr "valeur invalide pour le paramètre « replication »"
+#~ msgid "Certificates will not be checked against revocation list."
+#~ msgstr "Les certificats ne seront pas vérifiés avec la liste de révocation."
 
-#~ msgid "WAL archival (archive_mode=on) requires wal_level \"archive\", \"hot_standby\", or \"logical\""
-#~ msgstr ""
-#~ "l'archivage des journaux de transactions (archive_mode=on) nécessite que\n"
-#~ "le paramètre wal_level soit initialisé avec « archive », « hot_standby » ou « logical »"
+#~ msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
+#~ msgstr "liste de révocation des certificats SSL « %s » introuvable, continue : %s"
 
-#~ msgid "Consider increasing the configuration parameter \"checkpoint_segments\"."
-#~ msgstr "Considèrez l'augmentation du paramètre « checkpoint_segments »."
+#~ msgid "could not access root certificate file \"%s\": %m"
+#~ msgstr "n'a pas pu accéder au fichier du certificat racine « %s » : %m"
 
-#~ msgid "subquery must return a column"
-#~ msgstr "la sous-requête doit renvoyer une colonne"
+#~ msgid "could not open directory \"pg_tblspc\": %m"
+#~ msgstr "n'a pas pu ouvrir le répertoire « pg_tblspc » : %m"
 
-#~ 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"
+#~ msgid "standby connections not allowed because wal_level=minimal"
+#~ msgstr "connexions standby non autorisées car wal_level=minimal"
 
-#~ msgid "%s: setsysinfo failed: %s\n"
-#~ msgstr "%s : setsysinfo a échoué : %s\n"
+#~ 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"
 
-#~ msgid "could not set socket to blocking mode: %m"
-#~ msgstr "n'a pas pu activer le mode bloquant pour la socket : %m"
+#~ msgid "must be superuser to drop text search templates"
+#~ msgstr "doit être super-utilisateur pour supprimer des modèles de recherche plein texte"
 
-#~ msgid "SSL failed to renegotiate connection before limit expired"
-#~ msgstr "SSL a échoué à renégotier la connexion avant l'expiration du délai"
+#~ msgid "must be superuser to drop text search parsers"
+#~ msgstr ""
+#~ "doit être super-utilisateur pour supprimer des analyseurs de recherche plein\n"
+#~ "texte"
 
-#~ msgid "could not complete SSL handshake on renegotiation, too many failures"
-#~ msgstr "n'a pas pu terminer la poignée de main de renégotiation, trop d'échecs"
+#~ msgid "Must be superuser to drop a foreign-data wrapper."
+#~ msgstr "Doit être super-utilisateur pour supprimer un wrapper de données distantes."
 
-#~ msgid "SSL handshake failure on renegotiation, retrying"
-#~ msgstr "échec du handshake SSL lors de la renégotiation, nouvelle tentative"
+#~ msgid "permission denied to drop foreign-data wrapper \"%s\""
+#~ msgstr "droit refusé pour supprimer le wrapper de données distantes « %s »"
 
-#~ msgid "SSL failure during renegotiation start"
-#~ msgstr "échec SSL au début de la re-négotiation"
+#~ msgid "removing built-in function \"%s\""
+#~ msgstr "suppression de la fonction interne « %s »"
 
-#~ msgid "received password packet"
-#~ msgstr "paquet du mot de passe reçu"
+#~ msgid "foreign key constraint \"%s\" of relation \"%s\" does not exist"
+#~ msgstr "la clé étrangère « %s » de la relation « %s » n'existe pas"
 
-#~ msgid "interval precision specified twice"
-#~ msgstr "précision d'intervalle spécifiée deux fois"
+#~ msgid "Sets the list of known custom variable classes."
+#~ msgstr "Initialise la liste des classes variables personnalisées connues."
 
-#~ msgid ""
-#~ "%.0f dead row versions cannot be removed yet.\n"
-#~ "There were %.0f unused item pointers.\n"
-#~ "%u pages are entirely empty.\n"
-#~ "%s."
+#~ msgid "WAL sender sleep time between WAL replications."
 #~ msgstr ""
-#~ "%.0f versions de lignes mortes ne peuvent pas encore être supprimées.\n"
-#~ "Il y avait %.0f pointeurs d'éléments inutilisés.\n"
-#~ "%u pages sont entièrement vides.\n"
-#~ "%s."
+#~ "Temps d'endormissement du processus d'envoi des journaux de transactions entre\n"
+#~ "les réplications des journaux de transactions."
 
-#~ msgid ""
-#~ "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
-#~ "pages: %d removed, %d remain\n"
-#~ "tuples: %.0f removed, %.0f remain, %.0f are dead but not yet removable\n"
-#~ "buffer usage: %d hits, %d misses, %d dirtied\n"
-#~ "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
-#~ "system usage: %s"
+#~ msgid "If this parameter is set, the server will automatically run in the background and any controlling terminals are dissociated."
 #~ msgstr ""
-#~ "VACUUM automatique de la table « %s.%s.%s » : parcours d'index : %d\n"
-#~ "pages : %d supprimées, %d restantes\n"
-#~ "lignes : %.0f supprimées, %.0f restantes, %.0f sont mortes mais non supprimables\n"
-#~ "utilisation des tampons : %d lus dans le cache, %d lus hors du cache, %d modifiés\n"
-#~ "taux moyen de lecture : %.3f Mo/s, taux moyen d'écriture : %.3f Mo/s\n"
-#~ "utilisation système : %s"
-
-#~ msgid "Specify a USING expression to perform the conversion."
-#~ msgstr "Donnez une expression USING pour réaliser la conversion."
-
-#~ msgid "\"%s\" is not a table, materialized view, composite type, or foreign table"
-#~ msgstr "« %s » n'est ni une table, ni une vue matérialisée, ni un type composite, ni une table distante"
-
-#~ msgid "inherited relation \"%s\" is not a table"
-#~ msgstr "la relation héritée « %s » n'est pas une table"
+#~ "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."
 
-#~ msgid "This name may be disallowed altogether in future versions of PostgreSQL."
-#~ msgstr "Ce nom pourrait être interdit dans les prochaines versions de PostgreSQL."
+#~ msgid "Runs the server silently."
+#~ msgstr "Lance le serveur de manière silencieuse."
 
-#~ msgid "=> is deprecated as an operator name"
-#~ msgstr "=> est un nom d'opérateur obsolète"
+#~ msgid "%s: could not dissociate from controlling TTY: %s\n"
+#~ msgstr "%s : n'a pas pu se dissocier du TTY contrôlant : %s\n"
 
-#~ msgid "role with OID %u does not exist"
-#~ msgstr "le rôle d'OID %u n'existe pas"
+#~ msgid "%s: could not fork background process: %s\n"
+#~ msgstr "%s : n'a pas pu créer un processus fils : %s\n"
 
-#~ msgid "WAL file is from different database system: Incorrect XLOG_BLCKSZ in page header."
-#~ msgstr ""
-#~ "le journal de transactions provient d'un système de bases de données différent :\n"
-#~ "XLOG_BLCKSZ incorrect dans l'en-tête de page."
+#~ 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"
 
-#~ msgid "WAL file is from different database system: Incorrect XLOG_SEG_SIZE in page header."
-#~ msgstr ""
-#~ "le journal de transactions provient d'un système de bases de données différent :\n"
-#~ "XLOG_SEG_SIZE incorrect dans l'en-tête de page."
+#~ msgid "%s: could not open file \"%s\": %s\n"
+#~ msgstr "%s : n'a pas pu ouvrir le fichier « %s » : %s\n"
 
-#~ msgid "WAL file is from different database system: 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 pg_control du système de base de données dans pg_control est %s."
+#~ msgid "select() failed in logger process: %m"
+#~ msgstr "échec de select() dans le processus des journaux applicatifs : %m"
 
-#~ msgid "incorrect total length in record at %X/%X"
-#~ msgstr "longueur totale incorrecte à l'enregistrement %X/%X"
+#~ msgid "poll() failed in statistics collector: %m"
+#~ msgstr "échec du poll() dans le récupérateur de statistiques : %m"
 
-#~ msgid "incorrect hole size in record at %X/%X"
-#~ msgstr "taille du trou incorrect à l'enregistrement %X/%X"
+#~ msgid "Valid values are '[]', '[)', '(]', and '()'."
+#~ msgstr "Les valeurs valides sont « [] », « [) », « (] » et « () »."
 
-#~ msgid "invalid backup block size in record at %X/%X"
-#~ msgstr "taille du bloc de sauvegarde invalide dans l'enregistrement à %X/%X"
+#~ msgid "invalid list syntax for \"unix_socket_directories\""
+#~ msgstr "syntaxe de liste invalide pour le paramètre « unix_socket_directories »"
 
-#~ msgid "record with zero length at %X/%X"
-#~ msgstr "enregistrement de longueur nulle à %X/%X"
+#~ msgid "invalid list syntax for \"listen_addresses\""
+#~ msgstr "syntaxe de liste invalide pour le paramètre « listen_addresses »"
 
-#~ msgid "invalid xlog switch record at %X/%X"
-#~ msgstr "enregistrement de basculement du journal de transaction invalide à %X/%X"
+#~ msgid "window functions cannot use named arguments"
+#~ msgstr "les fonctions window ne peuvent pas renvoyer des arguments nommés"
 
-#~ 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"
+#~ msgid "cannot override frame clause of window \"%s\""
+#~ msgstr "ne peut pas surcharger la frame clause du window « %s »"
 
-#~ msgid "next MultiXactId: %u; next MultiXactOffset: %u"
-#~ msgstr "prochain MultiXactId : %u ; prochain MultiXactOffset : %u"
+#~ msgid "JSON does not support infinite timestamp values."
+#~ msgstr "JSON ne supporte pas les valeurs infinies de timestamp."
 
-#~ msgid "next transaction ID: %u/%u; next OID: %u"
-#~ msgstr "prochain identifiant de transaction : %u/%u ; prochain OID : %u"
+#~ msgid "JSON does not support infinite date values."
+#~ msgstr "JSON ne supporte pas les valeurs infinies de date."
 
-#~ msgid "redo record is at %X/%X; shutdown %s"
-#~ msgstr "l'enregistrement à ré-exécuter se trouve à %X/%X ; arrêt %s"
+#~ msgid "could not rename file \"%s\" to \"%s\" (initialization of log file): %m"
+#~ msgstr "n'a pas pu renommer le fichier « %s » en « %s » (initialisation du journal de transactions) : %m"
 
-#~ msgid "invalid value for recovery parameter \"recovery_target\""
-#~ msgstr "valeur invalide pour le paramètre de restauration « recovery_target »"
+#~ msgid "could not link file \"%s\" to \"%s\" (initialization of log file): %m"
+#~ msgstr "n'a pas pu lier le fichier « %s » à « %s » (initialisation du journal de transactions) : %m"
 
-#~ msgid "unrecognized win32 error code: %lu"
-#~ msgstr "code d'erreur win32 non reconnu : %lu"
+#~ msgid "Lower bound of dimension array must be one."
+#~ msgstr "La limite inférieure du tableau doit valoir un."
 
-#~ msgid "mapped win32 error code %lu to %d"
-#~ msgstr "correspondance du code d'erreur win32 %lu en %d"
+#~ msgid "wrong range of array subscripts"
+#~ msgstr "mauvais échelle des indices du tableau"
diff -Nru postgresql-9.5-9.5.2/src/backend/po/it.po postgresql-9.5-9.5.8/src/backend/po/it.po
--- postgresql-9.5-9.5.2/src/backend/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -16,8 +16,8 @@
 msgstr ""
 "Project-Id-Version: postgres (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-08-15 18:38+0000\n"
-"PO-Revision-Date: 2015-08-16 10:42+0100\n"
+"POT-Creation-Date: 2017-05-22 15:46+0000\n"
+"PO-Revision-Date: 2017-06-03 01:37+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -26,7 +26,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../common/exec.c:127 ../common/exec.c:241 ../common/exec.c:284
 #, c-format
@@ -64,8 +64,8 @@
 msgstr "pclose fallita: %s"
 
 #: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75
-#: ../common/fe_memutils.c:98 ../common/psprintf.c:181 ../port/path.c:598
-#: ../port/path.c:636 ../port/path.c:653
+#: ../common/fe_memutils.c:98 ../common/psprintf.c:181 ../port/path.c:602
+#: ../port/path.c:640 ../port/path.c:657
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria esaurita\n"
@@ -90,28 +90,29 @@
 msgid "could not close directory \"%s\": %s\n"
 msgstr "chiusura della directory \"%s\" fallita: %s\n"
 
-#: ../common/psprintf.c:179 ../port/path.c:596 ../port/path.c:634
-#: ../port/path.c:651 access/transam/xlog.c:6050 lib/stringinfo.c:258
-#: libpq/auth.c:821 libpq/auth.c:1182 libpq/auth.c:1250 libpq/auth.c:1659
-#: postmaster/bgworker.c:289 postmaster/bgworker.c:796
-#: postmaster/postmaster.c:2266 postmaster/postmaster.c:2297
-#: postmaster/postmaster.c:3860 postmaster/postmaster.c:4548
-#: postmaster/postmaster.c:4616 postmaster/postmaster.c:5330
-#: postmaster/postmaster.c:5584 replication/logical/logical.c:167
-#: storage/buffer/localbuf.c:396 storage/file/fd.c:481 storage/file/fd.c:878
-#: storage/file/fd.c:996 storage/file/fd.c:1609 storage/ipc/procarray.c:1033
-#: storage/ipc/procarray.c:1519 storage/ipc/procarray.c:1526
-#: storage/ipc/procarray.c:1919 storage/ipc/procarray.c:2503
-#: utils/adt/formatting.c:1523 utils/adt/formatting.c:1643
-#: utils/adt/formatting.c:1764 utils/adt/regexp.c:219 utils/adt/varlena.c:4199
-#: utils/adt/varlena.c:4220 utils/fmgr/dfmgr.c:220 utils/hash/dynahash.c:411
+#: ../common/psprintf.c:179 ../port/path.c:600 ../port/path.c:638
+#: ../port/path.c:655 access/transam/xlog.c:6066 lib/stringinfo.c:258
+#: libpq/auth.c:823 libpq/auth.c:1186 libpq/auth.c:1254 libpq/auth.c:1665
+#: postmaster/bgworker.c:309 postmaster/bgworker.c:821
+#: postmaster/postmaster.c:2333 postmaster/postmaster.c:2364
+#: postmaster/postmaster.c:3883 postmaster/postmaster.c:4573
+#: postmaster/postmaster.c:4648 postmaster/postmaster.c:5314
+#: postmaster/postmaster.c:5608 replication/logical/logical.c:168
+#: storage/buffer/localbuf.c:396 storage/file/fd.c:595 storage/file/fd.c:1023
+#: storage/file/fd.c:1141 storage/file/fd.c:1793 storage/ipc/procarray.c:907
+#: storage/ipc/procarray.c:1393 storage/ipc/procarray.c:1400
+#: storage/ipc/procarray.c:1793 storage/ipc/procarray.c:2385
+#: utils/adt/formatting.c:1522 utils/adt/formatting.c:1642
+#: utils/adt/formatting.c:1763 utils/adt/pg_locale.c:463
+#: utils/adt/pg_locale.c:647 utils/adt/regexp.c:219 utils/adt/varlena.c:4212
+#: utils/adt/varlena.c:4233 utils/fmgr/dfmgr.c:216 utils/hash/dynahash.c:411
 #: utils/hash/dynahash.c:488 utils/hash/dynahash.c:1002 utils/mb/mbutils.c:376
-#: utils/mb/mbutils.c:709 utils/misc/guc.c:3721 utils/misc/guc.c:3737
-#: utils/misc/guc.c:3750 utils/misc/guc.c:6684 utils/misc/tzparser.c:470
-#: utils/mmgr/aset.c:504 utils/mmgr/mcxt.c:685 utils/mmgr/mcxt.c:720
-#: utils/mmgr/mcxt.c:757 utils/mmgr/mcxt.c:794 utils/mmgr/mcxt.c:828
-#: utils/mmgr/mcxt.c:857 utils/mmgr/mcxt.c:891 utils/mmgr/mcxt.c:971
-#: utils/mmgr/mcxt.c:1004 utils/mmgr/mcxt.c:1051
+#: utils/mb/mbutils.c:709 utils/misc/guc.c:3723 utils/misc/guc.c:3739
+#: utils/misc/guc.c:3752 utils/misc/guc.c:6686 utils/misc/tzparser.c:470
+#: utils/mmgr/aset.c:505 utils/mmgr/mcxt.c:688 utils/mmgr/mcxt.c:723
+#: utils/mmgr/mcxt.c:760 utils/mmgr/mcxt.c:797 utils/mmgr/mcxt.c:831
+#: utils/mmgr/mcxt.c:860 utils/mmgr/mcxt.c:894 utils/mmgr/mcxt.c:976
+#: utils/mmgr/mcxt.c:1010 utils/mmgr/mcxt.c:1059
 #, c-format
 msgid "out of memory"
 msgstr "memoria esaurita"
@@ -176,7 +177,7 @@
 msgid "could not look up effective user ID %ld: %s"
 msgstr "ID utente effettivo %ld non trovato: %s"
 
-#: ../common/username.c:47 libpq/auth.c:1606
+#: ../common/username.c:47 libpq/auth.c:1612
 msgid "user does not exist"
 msgstr "l'utente non esiste"
 
@@ -220,38 +221,37 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "processo figlio uscito con stato non riconosciuto %d"
 
-#: ../port/chklocale.c:259
+#: ../port/chklocale.c:294
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
 msgstr "determinazione della codifica per il codeset \"%s\" fallita"
 
-#: ../port/chklocale.c:260 ../port/chklocale.c:389
-#: postmaster/postmaster.c:4845
+#: ../port/chklocale.c:295 ../port/chklocale.c:424 postmaster/postmaster.c:4852
 #, c-format
 msgid "Please report this to <pgsql-bugs@postgresql.org>."
 msgstr "Per favore segnala questo problema a <pgsql-bugs@postgresql.org>."
 
-#: ../port/chklocale.c:381 ../port/chklocale.c:387
+#: ../port/chklocale.c:416 ../port/chklocale.c:422
 #, c-format
 msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
 msgstr "non è stato possibile determinare una codifica per il locale \"%s\": il codeset è \"%s\""
 
-#: ../port/dirmod.c:216
+#: ../port/dirmod.c:218
 #, c-format
 msgid "could not set junction for \"%s\": %s"
 msgstr "non è stato possibile impostare la giunzione per \"%s\": %s"
 
-#: ../port/dirmod.c:219
+#: ../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "non è stato possibile impostare la giunzione per \"%s\": %s\n"
 
-#: ../port/dirmod.c:291
+#: ../port/dirmod.c:295
 #, c-format
 msgid "could not get junction for \"%s\": %s"
 msgstr "non è stato possibile ottenere la giunzione per \"%s\": %s"
 
-#: ../port/dirmod.c:294
+#: ../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "non è stato possibile ottenere la giunzione per \"%s\": %s\n"
@@ -279,7 +279,7 @@
 msgid "You might have antivirus, backup, or similar software interfering with the database system."
 msgstr "Potrebbe esserci un programma di antivirus, backup o simili che interferisce sul sistema del database."
 
-#: ../port/path.c:620
+#: ../port/path.c:624
 #, c-format
 msgid "could not get current working directory: %s\n"
 msgstr "determinazione della directory corrente fallita: %s\n"
@@ -289,27 +289,28 @@
 msgid "unrecognized error %d"
 msgstr "errore sconosciuto %d"
 
-#: ../port/win32error.c:189
+#: access/brin/brin.c:814
 #, c-format
-msgid "mapped win32 error code %lu to %d"
-msgstr "codice di errore win32 %lu mappato su %d"
+msgid "\"%s\" is not a BRIN index"
+msgstr "\"%s\" non è un indice BRIN"
 
-#: ../port/win32error.c:201
+#: access/brin/brin.c:830
 #, c-format
-msgid "unrecognized win32 error code: %lu"
-msgstr "codice di errore win32 sconosciuto: %lu"
+msgid "could not open parent table of index %s"
+msgstr "apertura della tabella dell'indice %s non riuscita"
 
-#: access/brin/brin_pageops.c:647 access/brin/brin_pageops.c:805
+#: access/brin/brin_pageops.c:76 access/brin/brin_pageops.c:362
+#: access/brin/brin_pageops.c:828
 #, c-format
 msgid "index row size %lu exceeds maximum %lu for index \"%s\""
 msgstr "la dimensione %lu della riga dell'indice supera il massimo %lu per l'indice \"%s\""
 
-#: access/brin/brin_revmap.c:448
+#: access/brin/brin_revmap.c:453
 #, c-format
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
 msgstr "tipo di pagina inaspettato 0x%04X nell'indice BRIN \"%s\" blocco %u"
 
-#: access/common/heaptuple.c:708 access/common/heaptuple.c:1339
+#: access/common/heaptuple.c:708 access/common/heaptuple.c:1450
 #, c-format
 msgid "number of columns (%d) exceeds limit (%d)"
 msgstr "il numero di colonne (%d) eccede il limite (%d)"
@@ -324,63 +325,63 @@
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "la riga dell'indice richiede %zu byte, la dimensione massima è %zu"
 
-#: access/common/printtup.c:294 tcop/fastpath.c:182 tcop/fastpath.c:544
+#: access/common/printtup.c:294 tcop/fastpath.c:182 tcop/fastpath.c:532
 #: tcop/postgres.c:1730
 #, c-format
 msgid "unsupported format code: %d"
 msgstr "codice di formato non supportato: %d"
 
-#: access/common/reloptions.c:465
+#: access/common/reloptions.c:419
 #, c-format
 msgid "user-defined relation parameter types limit exceeded"
 msgstr "è stato superato il limite per i tipi di parametro per la relazione definita dall'utente"
 
-#: access/common/reloptions.c:747
+#: access/common/reloptions.c:701
 #, c-format
 msgid "RESET must not include values for parameters"
 msgstr "RESET non deve contenere valori per i parametri"
 
-#: access/common/reloptions.c:780
+#: access/common/reloptions.c:734
 #, c-format
 msgid "unrecognized parameter namespace \"%s\""
 msgstr "parametro del namespace \"%s\" sconosciuto"
 
-#: access/common/reloptions.c:1020 parser/parse_clause.c:279
+#: access/common/reloptions.c:974 parser/parse_clause.c:279
 #, c-format
 msgid "unrecognized parameter \"%s\""
 msgstr "parametro \"%s\" non identificato"
 
-#: access/common/reloptions.c:1050
+#: access/common/reloptions.c:1004
 #, c-format
 msgid "parameter \"%s\" specified more than once"
 msgstr "parametro \"%s\" specificato più di una volta"
 
-#: access/common/reloptions.c:1066
+#: access/common/reloptions.c:1020
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
 msgstr "valore non valido per l'opzione booleana \"%s\": %s"
 
-#: access/common/reloptions.c:1078
+#: access/common/reloptions.c:1032
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
 msgstr "valore non valido per l'opzione intera \"%s\": %s"
 
-#: access/common/reloptions.c:1084 access/common/reloptions.c:1104
+#: access/common/reloptions.c:1038 access/common/reloptions.c:1058
 #, c-format
 msgid "value %s out of bounds for option \"%s\""
 msgstr "il valore %s non rientra nei limiti previsti per l'opzione \"%s\""
 
-#: access/common/reloptions.c:1086
+#: access/common/reloptions.c:1040
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
 msgstr "I valori validi sono quelli compresi fra \"%d\" e \"%d\"."
 
-#: access/common/reloptions.c:1098
+#: access/common/reloptions.c:1052
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
 msgstr "valore non valido per l'opzione in virgola mobile \"%s\": %s"
 
-#: access/common/reloptions.c:1106
+#: access/common/reloptions.c:1060
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
 msgstr "I valori validi sono quelli compresi fra \"%f\" e \"%f\"."
@@ -395,34 +396,34 @@
 msgid "Number of returned columns (%d) does not match expected column count (%d)."
 msgstr "il numero di colonne restituito (%d) non coincide col numero di colonne atteso (%d)"
 
-#: access/common/tupconvert.c:241
+#: access/common/tupconvert.c:314
 #, c-format
 msgid "Attribute \"%s\" of type %s does not match corresponding attribute of type %s."
 msgstr "L'attributo \"%s\" di tipo %s non combacia con l'attributo corrispondente di tipo %s."
 
-#: access/common/tupconvert.c:253
+#: access/common/tupconvert.c:326
 #, c-format
 msgid "Attribute \"%s\" of type %s does not exist in type %s."
 msgstr "L'attributo \"%s\" di tipo %s non esiste nel tipo %s."
 
-#: access/common/tupdesc.c:635 parser/parse_relation.c:1511
+#: access/common/tupdesc.c:635 parser/parse_relation.c:1518
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "la colonna \"%s\" non può essere dichiarata SETOF"
 
 #: access/gin/ginentrypage.c:109 access/gist/gist.c:1289
-#: access/nbtree/nbtinsert.c:567 access/nbtree/nbtsort.c:488
+#: access/nbtree/nbtinsert.c:575 access/nbtree/nbtsort.c:488
 #: access/spgist/spgdoinsert.c:1907
 #, c-format
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
 msgstr "la dimensione %zu della riga dell'indice supera il massimo %zu per l'indice \"%s\""
 
-#: access/gin/ginscan.c:410
+#: access/gin/ginscan.c:412
 #, c-format
 msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
 msgstr "i vecchi indici GIN non supportano le scansioni sull'intero indice né le ricerche di null"
 
-#: access/gin/ginscan.c:411
+#: access/gin/ginscan.c:413
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "Per correggere questo problema esegui REINDEX INDEX \"%s\"."
@@ -437,11 +438,11 @@
 msgid "This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."
 msgstr "Ciò è causato da una separazione di pagina incompleta al ripristino del crash prima dell'aggiornamento a PostgreSQL 9.1."
 
-#: access/gist/gist.c:635 access/gist/gistutil.c:735
-#: access/gist/gistutil.c:746 access/gist/gistvacuum.c:269
-#: access/hash/hashutil.c:172 access/hash/hashutil.c:183
-#: access/hash/hashutil.c:195 access/hash/hashutil.c:216
-#: access/nbtree/nbtpage.c:518 access/nbtree/nbtpage.c:529
+#: access/gist/gist.c:635 access/gist/gistutil.c:735 access/gist/gistutil.c:746
+#: access/gist/gistvacuum.c:269 access/hash/hashutil.c:172
+#: access/hash/hashutil.c:183 access/hash/hashutil.c:195
+#: access/hash/hashutil.c:216 access/nbtree/nbtpage.c:518
+#: access/nbtree/nbtpage.c:529
 #, c-format
 msgid "Please REINDEX it."
 msgstr "Si richiede l'esecuzione di REINDEX."
@@ -483,12 +484,12 @@
 msgid "index \"%s\" contains corrupted page at block %u"
 msgstr "l'indice \"%s\" contiene una pagina corrotta al blocco %u"
 
-#: access/hash/hashinsert.c:68
+#: access/hash/hashinsert.c:70
 #, c-format
 msgid "index row size %zu exceeds hash maximum %zu"
 msgstr "la dimensione %zu della riga dell'indice supera il massimo dell'hash %zu"
 
-#: access/hash/hashinsert.c:70 access/spgist/spgdoinsert.c:1911
+#: access/hash/hashinsert.c:72 access/spgist/spgdoinsert.c:1911
 #: access/spgist/spgutils.c:666
 #, c-format
 msgid "Values larger than a buffer page cannot be indexed."
@@ -526,39 +527,39 @@
 msgstr "\"%s\" è un indice"
 
 #: access/heap/heapam.c:1248 access/heap/heapam.c:1276
-#: access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:8943
-#: commands/tablecmds.c:11943
+#: access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:9052
+#: commands/tablecmds.c:12153
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "\"%s\" è un tipo composito"
 
-#: access/heap/heapam.c:2339
+#: access/heap/heapam.c:2344
 #, c-format
 msgid "cannot insert tuples during a parallel operation"
 msgstr "non è possibile inserire tuple durante un'operazione parallela"
 
-#: access/heap/heapam.c:2760
+#: access/heap/heapam.c:2794
 #, c-format
 msgid "cannot delete tuples during a parallel operation"
 msgstr "non è possibile eliminare tuple durante un'operazione parallela"
 
-#: access/heap/heapam.c:2806
+#: access/heap/heapam.c:2840
 #, c-format
 msgid "attempted to delete invisible tuple"
 msgstr "tentativo di eliminare tuple invisibili"
 
-#: access/heap/heapam.c:3228 access/heap/heapam.c:5779
+#: access/heap/heapam.c:3266 access/heap/heapam.c:5906
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "non è possibile aggiornare tuple durante un'operazione parallela"
 
-#: access/heap/heapam.c:3350
+#: access/heap/heapam.c:3388
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "tentativo di aggiornare tuple invisibili"
 
-#: access/heap/heapam.c:4601 access/heap/heapam.c:4639
-#: access/heap/heapam.c:4862 executor/execMain.c:2267
+#: access/heap/heapam.c:4703 access/heap/heapam.c:4741
+#: access/heap/heapam.c:4964 executor/execMain.c:2279
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "lock di riga nella relazione \"%s\" fallito"
@@ -575,23 +576,22 @@
 
 #: access/heap/rewriteheap.c:965 access/heap/rewriteheap.c:1177
 #: access/heap/rewriteheap.c:1274 access/transam/timeline.c:407
-#: access/transam/timeline.c:497 access/transam/xlog.c:3011
-#: access/transam/xlog.c:3173 replication/logical/origin.c:613
-#: replication/logical/snapbuild.c:1592 replication/slot.c:1097
-#: replication/slot.c:1186 storage/file/fd.c:459 storage/file/fd.c:2718
-#: storage/smgr/md.c:982 storage/smgr/md.c:1213 storage/smgr/md.c:1386
-#: utils/misc/guc.c:6706
+#: access/transam/timeline.c:483 access/transam/xlog.c:3040
+#: access/transam/xlog.c:3202 replication/logical/snapbuild.c:1588
+#: replication/slot.c:1053 replication/slot.c:1142 storage/file/fd.c:490
+#: storage/file/fd.c:2924 storage/smgr/md.c:983 storage/smgr/md.c:1214
+#: storage/smgr/md.c:1387 utils/misc/guc.c:6708
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "fsync del file \"%s\" fallito: %m"
 
 #: access/heap/rewriteheap.c:1020 access/heap/rewriteheap.c:1140
-#: access/transam/timeline.c:315 access/transam/timeline.c:475
-#: access/transam/xlog.c:2967 access/transam/xlog.c:3116
-#: access/transam/xlog.c:10149 access/transam/xlog.c:10185
-#: access/transam/xlog.c:10507 postmaster/postmaster.c:4323
-#: replication/logical/origin.c:542 replication/slot.c:1054
-#: storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1071
+#: access/transam/timeline.c:315 access/transam/timeline.c:461
+#: access/transam/xlog.c:2996 access/transam/xlog.c:3145
+#: access/transam/xlog.c:10147 access/transam/xlog.c:10183
+#: access/transam/xlog.c:10561 postmaster/postmaster.c:4348
+#: replication/logical/origin.c:542 replication/slot.c:1010
+#: storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1123
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "creazione del file \"%s\" fallita: %m"
@@ -601,86 +601,86 @@
 msgid "could not truncate file \"%s\" to %u: %m"
 msgstr "troncamento del file \"%s\" a %u fallito: %m"
 
-#: access/heap/rewriteheap.c:1156 replication/walsender.c:465
-#: storage/smgr/md.c:1798
+#: access/heap/rewriteheap.c:1156 replication/walsender.c:479
+#: storage/smgr/md.c:1799
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "non è stato possibile spostarsi alla fine del file \"%s\": %m"
 
 #: access/heap/rewriteheap.c:1167 access/transam/timeline.c:367
-#: access/transam/timeline.c:401 access/transam/timeline.c:491
-#: access/transam/xlog.c:3002 access/transam/xlog.c:3166
-#: postmaster/postmaster.c:4333 postmaster/postmaster.c:4343
-#: replication/logical/origin.c:551 replication/logical/origin.c:587
-#: replication/logical/origin.c:603 replication/logical/snapbuild.c:1576
-#: replication/slot.c:1083 storage/file/copydir.c:187
-#: utils/init/miscinit.c:1195 utils/init/miscinit.c:1204
-#: utils/init/miscinit.c:1211 utils/misc/guc.c:6667 utils/misc/guc.c:6698
-#: utils/misc/guc.c:8516 utils/misc/guc.c:8530 utils/time/snapmgr.c:1076
-#: utils/time/snapmgr.c:1083
+#: access/transam/timeline.c:401 access/transam/timeline.c:477
+#: access/transam/xlog.c:3031 access/transam/xlog.c:3195
+#: postmaster/postmaster.c:4358 postmaster/postmaster.c:4368
+#: replication/logical/origin.c:551 replication/logical/origin.c:590
+#: replication/logical/origin.c:606 replication/logical/snapbuild.c:1572
+#: replication/slot.c:1039 storage/file/copydir.c:187
+#: utils/init/miscinit.c:1209 utils/init/miscinit.c:1218
+#: utils/init/miscinit.c:1225 utils/misc/guc.c:6669 utils/misc/guc.c:6700
+#: utils/misc/guc.c:8519 utils/misc/guc.c:8533 utils/time/snapmgr.c:1128
+#: utils/time/snapmgr.c:1135
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "scrittura nel file \"%s\" fallita: %m"
 
-#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10374
+#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10399
 #: access/transam/xlogarchive.c:114 access/transam/xlogarchive.c:468
-#: replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2421
-#: replication/logical/reorderbuffer.c:2478
-#: replication/logical/snapbuild.c:1520 replication/logical/snapbuild.c:1895
-#: replication/slot.c:1160 storage/ipc/dsm.c:326 storage/smgr/md.c:420
-#: storage/smgr/md.c:469 storage/smgr/md.c:1333
+#: replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2497
+#: replication/logical/reorderbuffer.c:2554
+#: replication/logical/snapbuild.c:1521 replication/logical/snapbuild.c:1884
+#: replication/slot.c:1116 storage/ipc/dsm.c:326 storage/smgr/md.c:420
+#: storage/smgr/md.c:469 storage/smgr/md.c:1334
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "rimozione del file \"%s\" fallita: %m"
 
 #: access/heap/rewriteheap.c:1264 access/transam/timeline.c:111
 #: access/transam/timeline.c:236 access/transam/timeline.c:334
-#: access/transam/xlog.c:2943 access/transam/xlog.c:3060
-#: access/transam/xlog.c:3101 access/transam/xlog.c:3392
-#: access/transam/xlog.c:3470 replication/basebackup.c:398
-#: replication/basebackup.c:1158 replication/logical/logicalfuncs.c:154
-#: replication/logical/origin.c:677 replication/logical/reorderbuffer.c:2038
-#: replication/logical/reorderbuffer.c:2242
-#: replication/logical/reorderbuffer.c:2869
-#: replication/logical/snapbuild.c:1569 replication/logical/snapbuild.c:1653
-#: replication/slot.c:1175 replication/walsender.c:458
-#: replication/walsender.c:2080 storage/file/copydir.c:155
-#: storage/file/fd.c:445 storage/file/fd.c:2653 storage/file/fd.c:2705
-#: storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1854
-#: utils/init/miscinit.c:1130 utils/init/miscinit.c:1259 utils/misc/guc.c:6910
-#: utils/misc/guc.c:6942
+#: access/transam/xlog.c:2972 access/transam/xlog.c:3089
+#: access/transam/xlog.c:3130 access/transam/xlog.c:3403
+#: access/transam/xlog.c:3481 replication/basebackup.c:400
+#: replication/basebackup.c:1147 replication/logical/logicalfuncs.c:154
+#: replication/logical/origin.c:661 replication/logical/reorderbuffer.c:2075
+#: replication/logical/reorderbuffer.c:2291
+#: replication/logical/reorderbuffer.c:2946
+#: replication/logical/snapbuild.c:1565 replication/logical/snapbuild.c:1649
+#: replication/slot.c:1131 replication/walsender.c:472
+#: replication/walsender.c:2099 storage/file/copydir.c:155
+#: storage/file/fd.c:473 storage/file/fd.c:2837 storage/file/fd.c:2903
+#: storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1863
+#: utils/init/miscinit.c:1144 utils/init/miscinit.c:1265
+#: utils/init/miscinit.c:1343 utils/misc/guc.c:6928 utils/misc/guc.c:6961
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "apertura del file \"%s\" fallita: %m"
 
 #: access/index/indexam.c:172 catalog/objectaddress.c:1144
-#: commands/indexcmds.c:1754 commands/tablecmds.c:238
-#: commands/tablecmds.c:11934
+#: commands/indexcmds.c:1755 commands/tablecmds.c:240
+#: commands/tablecmds.c:12144
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "\"%s\" non è un indice"
 
-#: access/nbtree/nbtinsert.c:419
+#: access/nbtree/nbtinsert.c:427
 #, c-format
 msgid "duplicate key value violates unique constraint \"%s\""
 msgstr "un valore chiave duplicato viola il vincolo univoco \"%s\""
 
-#: access/nbtree/nbtinsert.c:421
+#: access/nbtree/nbtinsert.c:429
 #, c-format
 msgid "Key %s already exists."
 msgstr "La chiave %s esiste già."
 
-#: access/nbtree/nbtinsert.c:488
+#: access/nbtree/nbtinsert.c:496
 #, c-format
 msgid "failed to re-find tuple within index \"%s\""
 msgstr "non ho ritrovato la tupla nell'indice \"%s\""
 
-#: access/nbtree/nbtinsert.c:490
+#: access/nbtree/nbtinsert.c:498
 #, c-format
 msgid "This may be because of a non-immutable index expression."
 msgstr "Ciò potrebbe essere causato da un'espressione dell'indice non immutabile."
 
-#: access/nbtree/nbtinsert.c:570 access/nbtree/nbtsort.c:491
+#: access/nbtree/nbtinsert.c:578 access/nbtree/nbtsort.c:491
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -690,7 +690,7 @@
 "Si consiglia un indice funzionale su un hash MD5 del valore o l'uso del full text indexing."
 
 #: access/nbtree/nbtpage.c:168 access/nbtree/nbtpage.c:371
-#: access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1665
+#: access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1667
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "l'indice \"%s\" non è un btree"
@@ -721,29 +721,33 @@
 msgid "sample percentage must be between 0 and 100"
 msgstr "la percentuale dei campioni dev'essere tra 0 e 100"
 
-#: access/transam/commit_ts.c:273 access/transam/commit_ts.c:359
+#: access/transam/commit_ts.c:294
+#, c-format
+msgid "cannot retrieve commit timestamp for transaction %u"
+msgstr "non è stato possibile ottenere l'ora di commit per la transazione %u"
+
+#: access/transam/commit_ts.c:392
 #, c-format
 msgid "could not get commit timestamp data"
 msgstr "non è stato possibile ottenere i dati dell'ora di commit"
 
-#: access/transam/commit_ts.c:274 access/transam/commit_ts.c:360
-#: libpq/hba.c:1424
+#: access/transam/commit_ts.c:394
 #, c-format
-msgid "Make sure the configuration parameter \"%s\" is set."
-msgstr "Assicurati che il parametro di configurazione \"%s\" sia impostato."
+msgid "Make sure the configuration parameter \"%s\" is set on the master server."
+msgstr "Assicurati che il parametro di configurazione \"%s\" sia impostato sul server master."
 
-#: access/transam/commit_ts.c:281
+#: access/transam/commit_ts.c:396 libpq/hba.c:1424
 #, c-format
-msgid "cannot retrieve commit timestamp for transaction %u"
-msgstr "non è stato possibile ottenere l'ora di commit per la transazione %u"
+msgid "Make sure the configuration parameter \"%s\" is set."
+msgstr "Assicurati che il parametro di configurazione \"%s\" sia impostato."
 
-#: access/transam/multixact.c:1013
+#: access/transam/multixact.c:1008
 #, c-format
 msgid "database is not accepting commands that generate new MultiXactIds to avoid wraparound data loss in database \"%s\""
 msgstr "il database non sta accettando comandi che generano nuovi MultiXactIds per evitare perdite di dati per wraparound nel database \"%s\""
 
-#: access/transam/multixact.c:1015 access/transam/multixact.c:1022
-#: access/transam/multixact.c:1046 access/transam/multixact.c:1055
+#: access/transam/multixact.c:1010 access/transam/multixact.c:1017
+#: access/transam/multixact.c:1041 access/transam/multixact.c:1050
 #, c-format
 msgid ""
 "Execute a database-wide VACUUM in that database.\n"
@@ -752,68 +756,70 @@
 "Esegui un VACUUM sull'intero database.\n"
 "Potresti anche dover eseguire il commit o il rollback di vecchie transazioni preparate."
 
-#: access/transam/multixact.c:1020
+#: access/transam/multixact.c:1015
 #, c-format
 msgid "database is not accepting commands that generate new MultiXactIds to avoid wraparound data loss in database with OID %u"
 msgstr "il database non sta accettando comandi che generano nuovi MultiXactIds per evitare perdite di dati per wraparound nel database con OID %u"
 
-#: access/transam/multixact.c:1041 access/transam/multixact.c:2305
+#: access/transam/multixact.c:1036 access/transam/multixact.c:2318
 #, c-format
 msgid "database \"%s\" must be vacuumed before %u more MultiXactId is used"
 msgid_plural "database \"%s\" must be vacuumed before %u more MultiXactIds are used"
 msgstr[0] "il database \"%s\" deve ricevere un vacuum prima che altri %u MultiXactIds siano usati"
 msgstr[1] "il database \"%s\" deve ricevere un vacuum prima che altri %u MultiXactIds siano usati"
 
-#: access/transam/multixact.c:1050 access/transam/multixact.c:2314
+#: access/transam/multixact.c:1045 access/transam/multixact.c:2327
 #, c-format
 msgid "database with OID %u must be vacuumed before %u more MultiXactId is used"
 msgid_plural "database with OID %u must be vacuumed before %u more MultiXactIds are used"
 msgstr[0] "il database con OID %u deve ricevere un vacuum prima che altri %u MultiXactIds siano usati"
 msgstr[1] "il database con OID %u deve ricevere un vacuum prima che altri %u MultiXactIds siano usati"
 
-#: access/transam/multixact.c:1111
+#: access/transam/multixact.c:1106
 #, c-format
 msgid "multixact \"members\" limit exceeded"
 msgstr "limite \"membri\" multixact superato"
 
-#: access/transam/multixact.c:1112
+#: access/transam/multixact.c:1107
 #, c-format
 msgid "This command would create a multixact with %u members, but the remaining space is only enough for %u member."
 msgid_plural "This command would create a multixact with %u members, but the remaining space is only enough for %u members."
 msgstr[0] "Questo comando creerebbe un multixact con %u membri, ma lo spazio restante è sufficiente solo per %u membro."
 msgstr[1] "Questo comando creerebbe un multixact con %u membri, ma lo spazio restante è sufficiente solo per %u membri."
 
-#: access/transam/multixact.c:1117
+#: access/transam/multixact.c:1112
 #, c-format
 msgid "Execute a database-wide VACUUM in database with OID %u with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings."
 msgstr "Esegui un VACUUM su tutto il database con OID %u con impostazioni di vacuum_multixact_freeze_min_age e vacuum_multixact_freeze_table_age ridotte."
 
-#: access/transam/multixact.c:1148
+#: access/transam/multixact.c:1143
 #, c-format
-msgid "database with OID %u must be vacuumed before %d more multixact members are used"
-msgstr "il database con OID %u deve ricevere un vacuum prima che altri %d membri multixact possano essere usati"
+msgid "database with OID %u must be vacuumed before %d more multixact member is used"
+msgid_plural "database with OID %u must be vacuumed before %d more multixact members are used"
+msgstr[0] "il database con OID %u deve ricevere un vacuum prima che %d altro membro multixact possa essere usato"
+msgstr[1] "il database con OID %u deve ricevere un vacuum prima che altri %d membri multixact possano essere usati"
 
-#: access/transam/multixact.c:1151
+#: access/transam/multixact.c:1148
 #, c-format
 msgid "Execute a database-wide VACUUM in that database with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings."
 msgstr "Esegui un VACUUM su quel database intero con impostazioni di vacuum_multixact_freeze_min_age e vacuum_multixact_freeze_table_age ridotte."
 
-#: access/transam/multixact.c:1289
+#: access/transam/multixact.c:1285
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "il MultiXactId %u non esiste più -- sembra ci sia stato un wraparound"
 
-#: access/transam/multixact.c:1297
+#: access/transam/multixact.c:1293
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "il MultiXactId %u non è stato ancora creato -- sembra ci sia stato un wraparound"
 
-#: access/transam/multixact.c:2267
+#: access/transam/multixact.c:2268
 #, c-format
 msgid "MultiXactId wrap limit is %u, limited by database with OID %u"
 msgstr "il limite di wrap di MultiXactId è %u, limitato dal database con OID %u"
 
-#: access/transam/multixact.c:2310 access/transam/multixact.c:2319
+#: access/transam/multixact.c:2323 access/transam/multixact.c:2332
 #: access/transam/varsup.c:146 access/transam/varsup.c:153
 #: access/transam/varsup.c:384 access/transam/varsup.c:391
 #, c-format
@@ -824,119 +830,114 @@
 "Per evitare lo spegnimento del database, si deve eseguire un VACUUM su tutto il database.\n"
 "Potrebbe essere necessario inoltre effettuare il COMMIT o il ROLLBACK di vecchie transazioni preparate."
 
-#: access/transam/multixact.c:2578
+#: access/transam/multixact.c:2602
+#, c-format
+msgid "oldest MultiXactId member is at offset %u"
+msgstr "il membro MultiXactId più vecchio è all'offset %u"
+
+#: access/transam/multixact.c:2606
 #, c-format
 msgid "MultiXact member wraparound protections are disabled because oldest checkpointed MultiXact %u does not exist on disk"
 msgstr "le protezioni di wraparound dei membri MultiXact sono disabilitate perché il il MultiXact più vecchio che abbia ricevuto un checkpoint %u non esiste sul disco"
 
-#: access/transam/multixact.c:2601
+#: access/transam/multixact.c:2628
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "le protezioni di wraparound dei membri MultiXact ora sono abilitate"
 
-#: access/transam/multixact.c:2603
+#: access/transam/multixact.c:2630
 #, c-format
 msgid "MultiXact member stop limit is now %u based on MultiXact %u"
 msgstr "il limite di arresto dei membri MultiXact è ora %u basato sul MultiXact %u"
 
-#: access/transam/multixact.c:2690
-#, c-format
-msgid "oldest MultiXactId member is at offset %u"
-msgstr "il membro MultiXactId più vecchio è all'offset %u"
-
-#: access/transam/multixact.c:2694
-#, c-format
-msgid "oldest MultiXactId member offset unknown"
-msgstr "il membro MultiXactId più vecchio è ad un offset sconosciuto"
-
-#: access/transam/multixact.c:3043
+#: access/transam/multixact.c:3010
 #, c-format
 msgid "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
 msgstr "MultiXact più vecchio %u non trovato, il primo è il MultiXact %u, troncamento non eseguito"
 
-#: access/transam/multixact.c:3275
+#: access/transam/multixact.c:3028
+#, c-format
+msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
+msgstr "impossibile troncare fino al MultiXact %u perché non esiste su disco, troncamento non eseguito"
+
+#: access/transam/multixact.c:3354
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "MultiXactId non valido: %u"
 
-#: access/transam/parallel.c:574
+#: access/transam/parallel.c:582
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "il postmaster è terminato durante una transazione parallela"
 
-#: access/transam/parallel.c:665
+#: access/transam/parallel.c:702
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "connessione al worker parallelo perduta"
 
-#: access/transam/parallel.c:835
+#: access/transam/parallel.c:883
 #, c-format
-msgid "unable to map dynamic shared memory segment"
+msgid "could not map dynamic shared memory segment"
 msgstr "mappatura del segmento di memoria dinamica condivisa non riuscito"
 
-#: access/transam/parallel.c:840
-#, c-format
-msgid "bad magic number in dynamic shared memory segment"
-msgstr "numero magico sbagliato nel segmento di memoria dinamica condivisa"
-
-#: access/transam/parallel.c:853
+#: access/transam/parallel.c:888
 #, c-format
-msgid "too many parallel workers already attached"
-msgstr "troppi lavoratori in parallelo già attaccati"
+msgid "invalid magic number in dynamic shared memory segment"
+msgstr "numero magico non valido nel segmento di memoria dinamica condivisa"
 
-#: access/transam/parallel.c:993
+#: access/transam/parallel.c:1039
 #, c-format
-msgid "parallel worker, pid %d"
-msgstr "lavoratore parallelo, pid %d"
+msgid "parallel worker, PID %d"
+msgstr "lavoratore parallelo, PID %d"
 
-#: access/transam/slru.c:651
+#: access/transam/slru.c:652
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "il file \"%s\" non esiste, interpretato come zeri"
 
-#: access/transam/slru.c:881 access/transam/slru.c:887
-#: access/transam/slru.c:894 access/transam/slru.c:901
-#: access/transam/slru.c:908 access/transam/slru.c:915
+#: access/transam/slru.c:882 access/transam/slru.c:888
+#: access/transam/slru.c:895 access/transam/slru.c:902
+#: access/transam/slru.c:909 access/transam/slru.c:916
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "non è stato possibile accedere allo stato della transazione %u"
 
-#: access/transam/slru.c:882
+#: access/transam/slru.c:883
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "Apertura del file \"%s\" fallita: %m."
 
-#: access/transam/slru.c:888
+#: access/transam/slru.c:889
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %u: %m."
 msgstr "Spostamento nel file \"%s\" all'offset %u fallito: %m."
 
-#: access/transam/slru.c:895
+#: access/transam/slru.c:896
 #, c-format
 msgid "Could not read from file \"%s\" at offset %u: %m."
 msgstr "Lettura dal file \"%s\" all'offset %u fallita: %m."
 
-#: access/transam/slru.c:902
+#: access/transam/slru.c:903
 #, c-format
 msgid "Could not write to file \"%s\" at offset %u: %m."
 msgstr "Scrittura nel file \"%s\" all'offset %u fallita: %m."
 
-#: access/transam/slru.c:909
+#: access/transam/slru.c:910
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "fsync del file \"%s\" fallito: %m."
 
-#: access/transam/slru.c:916
+#: access/transam/slru.c:917
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "Chiusura del file \"%s\" fallita: %m."
 
-#: access/transam/slru.c:1171
+#: access/transam/slru.c:1172
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr "troncamento della directory \"%s\" fallito: probabile wraparound"
 
-#: access/transam/slru.c:1220
+#: access/transam/slru.c:1227 access/transam/slru.c:1283
 #, c-format
 msgid "removing file \"%s\""
 msgstr "cancellazione del file \"%s\""
@@ -976,199 +977,182 @@
 msgid "Timeline IDs must be less than child timeline's ID."
 msgstr "Gli ID della timeline devono avere valori inferiori degli ID della timeline figlia"
 
-#: access/transam/timeline.c:346 access/transam/xlog.c:3144
-#: access/transam/xlog.c:10356 access/transam/xlog.c:10369
-#: access/transam/xlog.c:10732 access/transam/xlog.c:10775
-#: access/transam/xlog.c:10814 access/transam/xlog.c:10857
+#: access/transam/timeline.c:346 access/transam/xlog.c:3173
+#: access/transam/xlog.c:10381 access/transam/xlog.c:10394
+#: access/transam/xlog.c:10786 access/transam/xlog.c:10829
+#: access/transam/xlog.c:10868 access/transam/xlog.c:10911
 #: access/transam/xlogfuncs.c:478 access/transam/xlogfuncs.c:497
-#: commands/extension.c:3047 replication/logical/origin.c:684
-#: replication/logical/origin.c:714 replication/logical/reorderbuffer.c:2887
-#: replication/walsender.c:483 storage/file/copydir.c:176
+#: commands/extension.c:3050 replication/logical/origin.c:668
+#: replication/logical/origin.c:698 replication/logical/reorderbuffer.c:2964
+#: replication/walsender.c:497 storage/file/copydir.c:176
 #: utils/adt/genfile.c:151
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "lettura de file \"%s\" fallita: %m"
 
-#: access/transam/timeline.c:412 access/transam/timeline.c:502
-#: access/transam/xlog.c:3017 access/transam/xlog.c:3178
-#: access/transam/xlogfuncs.c:503 commands/copy.c:1631
+#: access/transam/timeline.c:412 access/transam/timeline.c:488
+#: access/transam/xlog.c:3046 access/transam/xlog.c:3207
+#: access/transam/xlogfuncs.c:503 commands/copy.c:1671
 #: storage/file/copydir.c:201
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "chiusura del file \"%s\" fallita: %m"
 
-#: access/transam/timeline.c:429 access/transam/timeline.c:519
-#, c-format
-msgid "could not link file \"%s\" to \"%s\": %m"
-msgstr "creazione del collegamento il file \"%s\" a \"%s\" fallita: %m"
-
-#: access/transam/timeline.c:436 access/transam/timeline.c:526
-#: access/transam/xlog.c:5299 access/transam/xlog.c:6516
-#: access/transam/xlog.c:6533 access/transam/xlog.c:7315
-#: access/transam/xlogarchive.c:458 access/transam/xlogarchive.c:476
-#: access/transam/xlogarchive.c:586 postmaster/pgarch.c:734
-#: replication/logical/origin.c:624 replication/logical/snapbuild.c:1606
-#: replication/slot.c:471 replication/slot.c:997 replication/slot.c:1109
-#: utils/misc/guc.c:6966 utils/time/snapmgr.c:1094
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\": %m"
-msgstr "non è stato possibile rinominare il file \"%s\" in \"%s\": %m"
-
-#: access/transam/timeline.c:598
+#: access/transam/timeline.c:570
 #, c-format
 msgid "requested timeline %u is not in this server's history"
 msgstr "la timeline richiesta %u non è nella storia di questo server"
 
-#: access/transam/twophase.c:328
+#: access/transam/twophase.c:330
 #, c-format
 msgid "transaction identifier \"%s\" is too long"
 msgstr "l'identificativo di transazione \"%s\" è troppo lungo"
 
-#: access/transam/twophase.c:335
+#: access/transam/twophase.c:337
 #, c-format
 msgid "prepared transactions are disabled"
 msgstr "le transazione preparate sono disabilitate"
 
-#: access/transam/twophase.c:336
+#: access/transam/twophase.c:338
 #, c-format
 msgid "Set max_prepared_transactions to a nonzero value."
 msgstr "Imposta max_prepared_transactions ad un valore non nullo."
 
-#: access/transam/twophase.c:355
+#: access/transam/twophase.c:357
 #, c-format
 msgid "transaction identifier \"%s\" is already in use"
 msgstr "l'identificativo di transazione \"%s\" è già in uso"
 
-#: access/transam/twophase.c:364
+#: access/transam/twophase.c:366
 #, c-format
 msgid "maximum number of prepared transactions reached"
 msgstr "è stato raggiunto il numero massimo di transazioni preparate"
 
-#: access/transam/twophase.c:365
+#: access/transam/twophase.c:367
 #, c-format
 msgid "Increase max_prepared_transactions (currently %d)."
 msgstr "Incrementa il valore di max_prepared_transactions (il valore attuale è %d)"
 
-#: access/transam/twophase.c:502
+#: access/transam/twophase.c:504
 #, c-format
 msgid "prepared transaction with identifier \"%s\" is busy"
 msgstr "la transazione preparata con identificativo \"%s\" è in uso"
 
-#: access/transam/twophase.c:508
+#: access/transam/twophase.c:510
 #, c-format
 msgid "permission denied to finish prepared transaction"
 msgstr "non è consentito portare a termine la transazione preparata"
 
-#: access/transam/twophase.c:509
+#: access/transam/twophase.c:511
 #, c-format
 msgid "Must be superuser or the user that prepared the transaction."
 msgstr "È consentito solo a un superutente o all'utente che ha preparato la transazione."
 
-#: access/transam/twophase.c:520
+#: access/transam/twophase.c:522
 #, c-format
 msgid "prepared transaction belongs to another database"
 msgstr "la transazione preparata appartiene ad un altro database"
 
-#: access/transam/twophase.c:521
+#: access/transam/twophase.c:523
 #, c-format
 msgid "Connect to the database where the transaction was prepared to finish it."
 msgstr "Connettersi al database in cui la transazione è stata preparata per portarla a termine."
 
-#: access/transam/twophase.c:536
+#: access/transam/twophase.c:538
 #, c-format
 msgid "prepared transaction with identifier \"%s\" does not exist"
 msgstr "la transazione preparata con identificativo \"%s\" non esiste"
 
-#: access/transam/twophase.c:1046
+#: access/transam/twophase.c:1048
 #, c-format
 msgid "two-phase state file maximum length exceeded"
 msgstr "è stata superata la lunghezza massima del file dello stato a due fasi"
 
-#: access/transam/twophase.c:1059
+#: access/transam/twophase.c:1061
 #, c-format
 msgid "could not create two-phase state file \"%s\": %m"
 msgstr "creazione del file dello stato a due fasi \"%s\" fallito: %m"
 
-#: access/transam/twophase.c:1073 access/transam/twophase.c:1090
-#: access/transam/twophase.c:1143 access/transam/twophase.c:1573
-#: access/transam/twophase.c:1580
+#: access/transam/twophase.c:1075 access/transam/twophase.c:1092
+#: access/transam/twophase.c:1145 access/transam/twophase.c:1575
+#: access/transam/twophase.c:1582
 #, c-format
 msgid "could not write two-phase state file: %m"
 msgstr "scrittura nel file dello stato a due fasi fallito: %m"
 
-#: access/transam/twophase.c:1099
+#: access/transam/twophase.c:1101
 #, c-format
 msgid "could not seek in two-phase state file: %m"
 msgstr "spostamento nel file dello stato a due fasi %m fallito"
 
-#: access/transam/twophase.c:1149 access/transam/twophase.c:1598
+#: access/transam/twophase.c:1151 access/transam/twophase.c:1600
 #, c-format
 msgid "could not close two-phase state file: %m"
 msgstr "chiusura del file dello stato a due fasi fallita: %m"
 
-#: access/transam/twophase.c:1237 access/transam/twophase.c:1679
+#: access/transam/twophase.c:1239 access/transam/twophase.c:1681
 #, c-format
 msgid "could not open two-phase state file \"%s\": %m"
 msgstr "apertura del file dello stato a due fasi \"%s\" fallita: %m"
 
-#: access/transam/twophase.c:1254
+#: access/transam/twophase.c:1256
 #, c-format
 msgid "could not stat two-phase state file \"%s\": %m"
 msgstr "non è stato possibile ottenere informazioni sul file dello stato a due fasi \"%s\": %m"
 
-#: access/transam/twophase.c:1286
+#: access/transam/twophase.c:1288
 #, c-format
 msgid "could not read two-phase state file \"%s\": %m"
 msgstr "lettura del file dello stato a due fasi \"%s\" fallita: %m"
 
-#: access/transam/twophase.c:1382
+#: access/transam/twophase.c:1384
 #, c-format
 msgid "two-phase state file for transaction %u is corrupt"
 msgstr "il file dello stato a due fasi per la transazione %u è corrotto"
 
-#: access/transam/twophase.c:1535
+#: access/transam/twophase.c:1537
 #, c-format
 msgid "could not remove two-phase state file \"%s\": %m"
 msgstr "rimozione del file dello stato a due fasi \"%s\" fallita: %m"
 
-#: access/transam/twophase.c:1564
+#: access/transam/twophase.c:1566
 #, c-format
 msgid "could not recreate two-phase state file \"%s\": %m"
 msgstr "ricreazione del file dello stato a due fasi \"%s\" fallita: %m"
 
-#: access/transam/twophase.c:1592
+#: access/transam/twophase.c:1594
 #, c-format
 msgid "could not fsync two-phase state file: %m"
 msgstr "fsync del file dello stato a due fasi: %m"
 
-#: access/transam/twophase.c:1688
+#: access/transam/twophase.c:1690
 #, c-format
 msgid "could not fsync two-phase state file \"%s\": %m"
 msgstr "fsync del file dello stato a due fasi \"%s\" fallito: %m"
 
-#: access/transam/twophase.c:1695
+#: access/transam/twophase.c:1697
 #, c-format
 msgid "could not close two-phase state file \"%s\": %m"
 msgstr "chiusura del file dello stato a due fasi \"%s\" fallita: %m"
 
-#: access/transam/twophase.c:1760
+#: access/transam/twophase.c:1762
 #, c-format
 msgid "removing future two-phase state file \"%s\""
 msgstr "rimozione del file dello stato a due fasi nel futuro \"%s\""
 
-#: access/transam/twophase.c:1776 access/transam/twophase.c:1787
-#: access/transam/twophase.c:1906 access/transam/twophase.c:1917
-#: access/transam/twophase.c:1990
+#: access/transam/twophase.c:1778 access/transam/twophase.c:1789
+#: access/transam/twophase.c:1908 access/transam/twophase.c:1919
+#: access/transam/twophase.c:1992
 #, c-format
 msgid "removing corrupt two-phase state file \"%s\""
 msgstr "rimozione del file dello stato a due fasi corrotto \"%s\""
 
-#: access/transam/twophase.c:1895 access/transam/twophase.c:1979
+#: access/transam/twophase.c:1897 access/transam/twophase.c:1981
 #, c-format
 msgid "removing stale two-phase state file \"%s\""
 msgstr "rimozione del file dello stato a due fasi obsoleto \"%s\""
 
-#: access/transam/twophase.c:1997
+#: access/transam/twophase.c:1999
 #, c-format
 msgid "recovering prepared transaction %u"
 msgstr "recupero della transazione preparata %u"
@@ -1212,993 +1196,951 @@
 msgid "cannot have more than 2^32-2 commands in a transaction"
 msgstr "non è possibile effettuare più di 2^32-2 comandi in una transazione"
 
-#: access/transam/xact.c:1441
+#: access/transam/xact.c:1453
 #, c-format
 msgid "maximum number of committed subtransactions (%d) exceeded"
 msgstr "il numero massimo di sottotransazioni committed (%d) è stato superato"
 
-#: access/transam/xact.c:2235
+#: access/transam/xact.c:2249
 #, c-format
 msgid "cannot PREPARE a transaction that has operated on temporary tables"
 msgstr "non è possibile eseguire PREPARE in una transazione che ha operato su tabelle temporanee"
 
-#: access/transam/xact.c:2245
+#: access/transam/xact.c:2259
 #, c-format
 msgid "cannot PREPARE a transaction that has exported snapshots"
 msgstr "non è possibile eseguire PREPARE in una transazione che ha esportato snapshot"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3123
+#: access/transam/xact.c:3137
 #, c-format
 msgid "%s cannot run inside a transaction block"
 msgstr "non è possibile eseguire %s all'interno di un blocco di transazione"
 
 #  translator: %s represents an SQL statement name
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3133
+#: access/transam/xact.c:3147
 #, c-format
 msgid "%s cannot run inside a subtransaction"
 msgstr "non è possibile eseguire %s all'interno di una sottotransazione"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3143
+#: access/transam/xact.c:3157
 #, c-format
 msgid "%s cannot be executed from a function or multi-command string"
 msgstr "una funzione o una stringa multi-comando non può eseguire %s"
 
 #  translator: %s represents an SQL statement name
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:3214
+#: access/transam/xact.c:3228
 #, c-format
 msgid "%s can only be used in transaction blocks"
 msgstr "si può usare %s solo entro blocchi di transazione"
 
-#: access/transam/xact.c:3398
+#: access/transam/xact.c:3412
 #, c-format
 msgid "there is already a transaction in progress"
 msgstr "c'è già una transazione in corso"
 
-#: access/transam/xact.c:3566 access/transam/xact.c:3669
+#: access/transam/xact.c:3580 access/transam/xact.c:3683
 #, c-format
 msgid "there is no transaction in progress"
 msgstr "non c'è alcuna transazione in corso"
 
-#: access/transam/xact.c:3577
+#: access/transam/xact.c:3591
 #, c-format
 msgid "cannot commit during a parallel operation"
 msgstr "non è possibile effettuare un commit durante un'operazione parallela"
 
-#: access/transam/xact.c:3680
+#: access/transam/xact.c:3694
 #, c-format
 msgid "cannot abort during a parallel operation"
 msgstr "non è possibile interrompere durante un'operazione parallela"
 
-#: access/transam/xact.c:3722
+#: access/transam/xact.c:3736
 #, c-format
 msgid "cannot define savepoints during a parallel operation"
 msgstr "non è possibile definire un punto di salvataggio durante un'operazione parallela"
 
-#: access/transam/xact.c:3789
+#: access/transam/xact.c:3803
 #, c-format
 msgid "cannot release savepoints during a parallel operation"
 msgstr "non è possibile rilasciare un punto di salvataggio durante un'operazione parallela"
 
-#: access/transam/xact.c:3800 access/transam/xact.c:3852
-#: access/transam/xact.c:3858 access/transam/xact.c:3914
-#: access/transam/xact.c:3964 access/transam/xact.c:3970
+#: access/transam/xact.c:3814 access/transam/xact.c:3866
+#: access/transam/xact.c:3872 access/transam/xact.c:3928
+#: access/transam/xact.c:3978 access/transam/xact.c:3984
 #, c-format
 msgid "no such savepoint"
 msgstr "punto di salvataggio inesistente"
 
-#: access/transam/xact.c:3902
+#: access/transam/xact.c:3916
 #, c-format
 msgid "cannot rollback to savepoints during a parallel operation"
 msgstr "non è possibile effettuare un rollback durante un'operazione parallela"
 
-#: access/transam/xact.c:4030
+#: access/transam/xact.c:4044
 #, c-format
 msgid "cannot start subtransactions during a parallel operation"
 msgstr "non è possibile iniziare una sub-transazione durante un'operazione parallela"
 
-#: access/transam/xact.c:4097
+#: access/transam/xact.c:4111
 #, c-format
 msgid "cannot commit subtransactions during a parallel operation"
 msgstr "non è possibile effettuare il commit di una sub-transazione durante un'operazione parallela"
 
-#: access/transam/xact.c:4702
+#: access/transam/xact.c:4717
 #, c-format
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "non è possibile avere più di 2^32-1 comandi in una sottotransazione"
 
-#: access/transam/xlog.c:2270
+#: access/transam/xlog.c:2299
 #, c-format
 msgid "could not seek in log file %s to offset %u: %m"
 msgstr "spostamento nel file di log %s alla posizione %u fallito: %m"
 
-#: access/transam/xlog.c:2290
+#: access/transam/xlog.c:2319
 #, c-format
 msgid "could not write to log file %s at offset %u, length %zu: %m"
 msgstr "scrittura nel file di log %s in posizione %u, lunghezza %zu fallita: %m"
 
-#: access/transam/xlog.c:2553
+#: access/transam/xlog.c:2582
 #, c-format
 msgid "updated min recovery point to %X/%X on timeline %u"
 msgstr "punto di recupero minimo aggiornato a %X/%X sulla timeline %u"
 
-#: access/transam/xlog.c:3148
+#: access/transam/xlog.c:3177
 #, c-format
 msgid "not enough data in file \"%s\""
 msgstr "il file \"%s\" non contiene abbastanza dati"
 
-#: access/transam/xlog.c:3267
-#, c-format
-msgid "could not link file \"%s\" to \"%s\" (initialization of log file): %m"
-msgstr "collegamento del file \"%s\" a \"%s\" (inizializzazione del file di log) fallito: %m"
-
-#: access/transam/xlog.c:3279
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\" (initialization of log file): %m"
-msgstr "non è stato possibile rinominare il file \"%s\" in \"%s\" (inizializzazione del file di log): %m"
-
-#: access/transam/xlog.c:3307
+#: access/transam/xlog.c:3318
 #, c-format
 msgid "could not open transaction log file \"%s\": %m"
 msgstr "apertura del file di log delle transazioni \"%s\" fallita: %m"
 
-#: access/transam/xlog.c:3496 access/transam/xlog.c:5269
+#: access/transam/xlog.c:3507 access/transam/xlog.c:5297
 #, c-format
 msgid "could not close log file %s: %m"
 msgstr "chiusura del file di log %s fallita: %m"
 
-#: access/transam/xlog.c:3553 replication/logical/logicalfuncs.c:149
-#: replication/walsender.c:2075
+#: access/transam/xlog.c:3564 replication/logical/logicalfuncs.c:149
+#: replication/walsender.c:2094
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "il segmento WAL richiesto %s è stato già rimosso"
 
 # da non tradursi
 # DV: perché? (trovato tradotto, tra l'altro)
-#: access/transam/xlog.c:3613 access/transam/xlog.c:3688
-#: access/transam/xlog.c:3886
+#: access/transam/xlog.c:3624 access/transam/xlog.c:3699
+#: access/transam/xlog.c:3897
 #, c-format
 msgid "could not open transaction log directory \"%s\": %m"
 msgstr "apertura della directory dei log delle transazioni \"%s\" fallita: %m"
 
-#: access/transam/xlog.c:3769
+#: access/transam/xlog.c:3780
 #, c-format
 msgid "recycled transaction log file \"%s\""
 msgstr "il file di log delle transazioni \"%s\" è stato riciclato"
 
-#: access/transam/xlog.c:3781
+#: access/transam/xlog.c:3792
 #, c-format
 msgid "removing transaction log file \"%s\""
 msgstr "eliminazione del file di log delle transazioni \"%s\""
 
-#: access/transam/xlog.c:3801
+#: access/transam/xlog.c:3812
 #, c-format
 msgid "could not rename old transaction log file \"%s\": %m"
 msgstr "non è stato possibile rinominare il vecchio file di log delle transazioni \"%s\": %m"
 
-#: access/transam/xlog.c:3813
+#: access/transam/xlog.c:3824
 #, c-format
 msgid "could not remove old transaction log file \"%s\": %m"
 msgstr "chiusura del vecchio file di log delle transazioni \"%s\" fallita: %m"
 
-#: access/transam/xlog.c:3846 access/transam/xlog.c:3856
+#: access/transam/xlog.c:3857 access/transam/xlog.c:3867
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "la directory dei file WAL \"%s\" necessaria non esiste"
 
-#: access/transam/xlog.c:3862
+#: access/transam/xlog.c:3873
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "creazione della directory dei file WAL mancante \"%s\""
 
-#: access/transam/xlog.c:3865
+#: access/transam/xlog.c:3876
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "creazione della directory mancante \"%s\" fallita: %m"
 
-#: access/transam/xlog.c:3896
+#: access/transam/xlog.c:3907
 #, c-format
 msgid "removing transaction log backup history file \"%s\""
 msgstr "rimozione del file storico di backup del log delle transazioni \"%s\""
 
-#: access/transam/xlog.c:3977
+#: access/transam/xlog.c:3988
 #, c-format
 msgid "unexpected timeline ID %u in log segment %s, offset %u"
 msgstr "ID di timeline %u inatteso nel segmento di log %s, offset %u"
 
-#: access/transam/xlog.c:4099
+#: access/transam/xlog.c:4110
 #, c-format
 msgid "new timeline %u is not a child of database system timeline %u"
 msgstr "la nuova timeline %u non è figlia della timeline %u del database"
 
-#: access/transam/xlog.c:4113
+#: access/transam/xlog.c:4124
 #, c-format
 msgid "new timeline %u forked off current database system timeline %u before current recovery point %X/%X"
 msgstr "la nuova timeline %u si è staccata dalla timeline attuale %u prima del punto di recupero corrente %X/%X"
 
-#: access/transam/xlog.c:4132
+#: access/transam/xlog.c:4143
 #, c-format
 msgid "new target timeline is %u"
 msgstr "la nuova timeline di destinazione %u"
 
-#: access/transam/xlog.c:4212
+#: access/transam/xlog.c:4223
 #, c-format
 msgid "could not create control file \"%s\": %m"
 msgstr "creazione del file di controllo \"%s\" fallita: %m"
 
-#: access/transam/xlog.c:4223 access/transam/xlog.c:4459
+#: access/transam/xlog.c:4234 access/transam/xlog.c:4470
 #, c-format
 msgid "could not write to control file: %m"
 msgstr "scrittura nel file di controllo fallita: %m"
 
-#: access/transam/xlog.c:4229 access/transam/xlog.c:4465
+#: access/transam/xlog.c:4240 access/transam/xlog.c:4476
 #, c-format
 msgid "could not fsync control file: %m"
 msgstr "fsync del file di controllo fallito: %m"
 
-#: access/transam/xlog.c:4234 access/transam/xlog.c:4470
+#: access/transam/xlog.c:4245 access/transam/xlog.c:4481
 #, c-format
 msgid "could not close control file: %m"
 msgstr "chiusura del file di controllo fallita: %m"
 
-#: access/transam/xlog.c:4252 access/transam/xlog.c:4448
+#: access/transam/xlog.c:4263 access/transam/xlog.c:4459
 #, c-format
 msgid "could not open control file \"%s\": %m"
 msgstr "apertura del file di controllo \"%s\" fallita: %m"
 
-#: access/transam/xlog.c:4258
+#: access/transam/xlog.c:4269
 #, c-format
 msgid "could not read from control file: %m"
 msgstr "lettura dal file di controllo fallita: %m"
 
-#: access/transam/xlog.c:4271 access/transam/xlog.c:4280
-#: access/transam/xlog.c:4304 access/transam/xlog.c:4311
-#: access/transam/xlog.c:4318 access/transam/xlog.c:4323
-#: access/transam/xlog.c:4330 access/transam/xlog.c:4337
-#: access/transam/xlog.c:4344 access/transam/xlog.c:4351
-#: access/transam/xlog.c:4358 access/transam/xlog.c:4365
-#: access/transam/xlog.c:4372 access/transam/xlog.c:4381
-#: access/transam/xlog.c:4388 access/transam/xlog.c:4397
-#: access/transam/xlog.c:4404 access/transam/xlog.c:4413
-#: access/transam/xlog.c:4420 utils/init/miscinit.c:1277
+#: access/transam/xlog.c:4282 access/transam/xlog.c:4291
+#: access/transam/xlog.c:4315 access/transam/xlog.c:4322
+#: access/transam/xlog.c:4329 access/transam/xlog.c:4334
+#: access/transam/xlog.c:4341 access/transam/xlog.c:4348
+#: access/transam/xlog.c:4355 access/transam/xlog.c:4362
+#: access/transam/xlog.c:4369 access/transam/xlog.c:4376
+#: access/transam/xlog.c:4383 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 utils/init/miscinit.c:1361
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "i file del database sono incompatibili col server"
 
-#: access/transam/xlog.c:4272
+#: access/transam/xlog.c:4283
 #, 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 "Il cluster di database è stato inizializzato con PG_CONTROL_VERSION %d (0x%08x), ma il server è stato compilato con PG_CONTROL_VERSION %d (0x%08x)."
 
-#: access/transam/xlog.c:4276
+#: access/transam/xlog.c:4287
 #, c-format
 msgid "This could be a problem of mismatched byte ordering.  It looks like you need to initdb."
 msgstr "Questo potrebbe essere un problema di ordinamento di byte che non combacia. Sembra sia necessario eseguire initdb."
 
-#: access/transam/xlog.c:4281
+#: access/transam/xlog.c:4292
 #, c-format
 msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
 msgstr "Il cluster di database è stato inizializzato con PG_CONTROL_VERSION %d, ma il server è stato compilato con PG_CONTROL_VERSION %d."
 
-#: access/transam/xlog.c:4284 access/transam/xlog.c:4308
-#: access/transam/xlog.c:4315 access/transam/xlog.c:4320
+#: access/transam/xlog.c:4295 access/transam/xlog.c:4319
+#: access/transam/xlog.c:4326 access/transam/xlog.c:4331
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "Sembra sia necessario eseguire initdb."
 
-#: access/transam/xlog.c:4295
+#: access/transam/xlog.c:4306
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "il checksum nel file di controllo non è corretto"
 
-#: access/transam/xlog.c:4305
+#: access/transam/xlog.c:4316
 #, c-format
 msgid "The database cluster was initialized with CATALOG_VERSION_NO %d, but the server was compiled with CATALOG_VERSION_NO %d."
 msgstr "Il cluster di database è stato inizializzato con CATALOG_VERSION_NO %d, ma il server è stato compilato con CATALOG_VERSION_NO %d."
 
-#: access/transam/xlog.c:4312
+#: access/transam/xlog.c:4323
 #, c-format
 msgid "The database cluster was initialized with MAXALIGN %d, but the server was compiled with MAXALIGN %d."
 msgstr "Il cluster di database è stato inizializzato con MAXALIGN %d, ma il server è stato compilato con MAXALIGN %d."
 
-#: access/transam/xlog.c:4319
+#: access/transam/xlog.c:4330
 #, c-format
 msgid "The database cluster appears to use a different floating-point number format than the server executable."
 msgstr "Il cluster di database sta usando un formato per i numeri in virgola mobile diverso da quello usato dall'eseguibile del server."
 
-#: access/transam/xlog.c:4324
+#: access/transam/xlog.c:4335
 #, c-format
 msgid "The database cluster was initialized with BLCKSZ %d, but the server was compiled with BLCKSZ %d."
 msgstr "Il cluster di database è stato inizializzato con BLCKSZ %d, ma il server è stato compilato con BLCKSZ %d."
 
-#: access/transam/xlog.c:4327 access/transam/xlog.c:4334
-#: access/transam/xlog.c:4341 access/transam/xlog.c:4348
-#: access/transam/xlog.c:4355 access/transam/xlog.c:4362
-#: access/transam/xlog.c:4369 access/transam/xlog.c:4376
-#: access/transam/xlog.c:4384 access/transam/xlog.c:4391
-#: access/transam/xlog.c:4400 access/transam/xlog.c:4407
-#: access/transam/xlog.c:4416 access/transam/xlog.c:4423
+#: 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:4387
+#: access/transam/xlog.c:4395 access/transam/xlog.c:4402
+#: access/transam/xlog.c:4411 access/transam/xlog.c:4418
+#: access/transam/xlog.c:4427 access/transam/xlog.c:4434
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr "Si consiglia di ricompilare il sistema o di eseguire initdb."
 
-#: access/transam/xlog.c:4331
+#: access/transam/xlog.c:4342
 #, c-format
 msgid "The database cluster was initialized with RELSEG_SIZE %d, but the server was compiled with RELSEG_SIZE %d."
 msgstr "Il cluster di database è stato inizializzato con RELSEG_SIZE %d, ma il server è stato compilato con RELSEG_SIZE %d."
 
-#: access/transam/xlog.c:4338
+#: access/transam/xlog.c:4349
 #, c-format
 msgid "The database cluster was initialized with XLOG_BLCKSZ %d, but the server was compiled with XLOG_BLCKSZ %d."
 msgstr "Il cluster di database è stato inizializzato con XLOG_BLOCKSZ %d, ma il server è stato compilato con XLOG_BLOCKSZ %d."
 
-#: access/transam/xlog.c:4345
+#: access/transam/xlog.c:4356
 #, c-format
 msgid "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server was compiled with XLOG_SEG_SIZE %d."
 msgstr "Il cluster di database è stato inizializzato con XLOG_SEG_SIZE %d, ma il server è stato compilato con XLOG_SEG_SIZE %d."
 
-#: access/transam/xlog.c:4352
+#: access/transam/xlog.c:4363
 #, c-format
 msgid "The database cluster was initialized with NAMEDATALEN %d, but the server was compiled with NAMEDATALEN %d."
 msgstr "Il cluster di database è stato inizializzato con NAMEDATALEN %d, ma il server è stato compilato con NAMEDATALEN %d."
 
-#: access/transam/xlog.c:4359
+#: access/transam/xlog.c:4370
 #, c-format
 msgid "The database cluster was initialized with INDEX_MAX_KEYS %d, but the server was compiled with INDEX_MAX_KEYS %d."
 msgstr "Il cluster di database è stato inizializzato con INDEX_MAX_KEYS %d, ma il server è stato compilato con INDEX_MAX_KEYS %d."
 
-#: access/transam/xlog.c:4366
+#: access/transam/xlog.c:4377
 #, 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 "Il cluster di database è stato inizializzato con TOAST_MAX_CHUNK_SIZE %d, ma il server è stato compilato con TOAST_MAX_CHUNK_SIZE %d."
 
-#: access/transam/xlog.c:4373
+#: access/transam/xlog.c:4384
 #, c-format
 msgid "The database cluster was initialized with LOBLKSIZE %d, but the server was compiled with LOBLKSIZE %d."
 msgstr "Il cluster di database è stato inizializzato con LOBLKSIZE %d, ma il server è stato compilato con LOBLKSIZE %d."
 
-#: access/transam/xlog.c:4382
+#: access/transam/xlog.c:4393
 #, c-format
 msgid "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the server was compiled with HAVE_INT64_TIMESTAMP."
 msgstr "Il cluster di database è stato inizializzato senza HAVE_INT64_TIMESTAMP ma il server è stato compilato con HAVE_INT64_TIMESTAMP."
 
-#: access/transam/xlog.c:4389
+#: access/transam/xlog.c:4400
 #, c-format
 msgid "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the server was compiled without HAVE_INT64_TIMESTAMP."
 msgstr "Il cluster di database è stato inizializzato con HAVE_INT64_TIMESTAMP ma il server è stato compilato senza HAVE_INT64_TIMESTAMP."
 
-#: access/transam/xlog.c:4398
+#: access/transam/xlog.c:4409
 #, c-format
 msgid "The database cluster was initialized without USE_FLOAT4_BYVAL but the server was compiled with USE_FLOAT4_BYVAL."
 msgstr "Il cluster di database è stato inizializzato senza USE_FLOAT4_BYVAL, ma il server è stato compilato con USE_FLOAT4_BYVAL."
 
-#: access/transam/xlog.c:4405
+#: access/transam/xlog.c:4416
 #, c-format
 msgid "The database cluster was initialized with USE_FLOAT4_BYVAL but the server was compiled without USE_FLOAT4_BYVAL."
 msgstr "Il cluster di database è stato inizializzato con USE_FLOAT4_BYVAL, ma il server è stato compilato senza USE_FLOAT4_BYVAL."
 
-#: access/transam/xlog.c:4414
+#: access/transam/xlog.c:4425
 #, c-format
 msgid "The database cluster was initialized without USE_FLOAT8_BYVAL but the server was compiled with USE_FLOAT8_BYVAL."
 msgstr "Il cluster di database è stato inizializzato senza USE_FLOAT8_BYVAL, ma il server è stato compilato con USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4421
+#: access/transam/xlog.c:4432
 #, c-format
 msgid "The database cluster was initialized with USE_FLOAT8_BYVAL but the server was compiled without USE_FLOAT8_BYVAL."
 msgstr "Il cluster di database è stato inizializzato con USE_FLOAT8_BYVAL, ma il server è stato compilato senza USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4847
+#: access/transam/xlog.c:4858
 #, c-format
 msgid "could not write bootstrap transaction log file: %m"
 msgstr "scrittura nel file di log della transazione di bootstrap fallita: %m"
 
-#: access/transam/xlog.c:4853
+#: access/transam/xlog.c:4864
 #, c-format
 msgid "could not fsync bootstrap transaction log file: %m"
 msgstr "fsync del file di log della transazione di bootstrap fallito: %m"
 
-#: access/transam/xlog.c:4858
+#: access/transam/xlog.c:4869
 #, c-format
 msgid "could not close bootstrap transaction log file: %m"
 msgstr "chiusura del file di log della transazione di bootstrap fallita: %m"
 
-#: access/transam/xlog.c:4933
+#: access/transam/xlog.c:4944
 #, c-format
 msgid "could not open recovery command file \"%s\": %m"
 msgstr "apertura del file di ripristino \"%s\" fallita: %m"
 
-#: access/transam/xlog.c:4979
+#: access/transam/xlog.c:4990 access/transam/xlog.c:5075
 #, c-format
-msgid "invalid value for recovery parameter \"%s\""
-msgstr "valore non valido per il parametro di ripristino \"%s\""
+msgid "invalid value for recovery parameter \"%s\": \"%s\""
+msgstr "valore non valido per il parametro di ripristino \"%s\": \"%s\""
 
-#: access/transam/xlog.c:4981
+#: access/transam/xlog.c:4993
 #, c-format
-msgid "The allowed values are \"pause\", \"promote\" and \"shutdown\"."
-msgstr "I valori ammessi sono \"pause\", \"promote\" e \"shutdown\"."
+msgid "Valid values are \"pause\", \"promote\", and \"shutdown\"."
+msgstr "I valori validi sono \"pause\", \"promote\" e \"shutdown\"."
 
 # da non tradurre
 # DV: perché (già tradotto peraltro)
-#: access/transam/xlog.c:5000
+#: access/transam/xlog.c:5013
 #, c-format
 msgid "recovery_target_timeline is not a valid number: \"%s\""
 msgstr "recovery_target_timeline non ha un valore numerico valido: \"%s\""
 
-#: access/transam/xlog.c:5016
+#: access/transam/xlog.c:5030
 #, c-format
 msgid "recovery_target_xid is not a valid number: \"%s\""
 msgstr "recovery_target_xid non ha un valore numerico valido: \"%s\""
 
-#: access/transam/xlog.c:5047
+#: access/transam/xlog.c:5061
 #, c-format
 msgid "recovery_target_name is too long (maximum %d characters)"
 msgstr "il recovery_target_name è troppo lungo (massimo %d caratteri)"
 
-#: access/transam/xlog.c:5061
-#, c-format
-msgid "invalid value for recovery parameter \"recovery_target\""
-msgstr "valore per il parametro \"recovery_target\" non valido"
-
-#: access/transam/xlog.c:5062
+#: access/transam/xlog.c:5078
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "Il solo valore permesso è \"immediate\"."
 
-#: access/transam/xlog.c:5075 access/transam/xlog.c:5086
-#: commands/extension.c:531 commands/extension.c:539 utils/misc/guc.c:5462
+#: access/transam/xlog.c:5091 access/transam/xlog.c:5102
+#: commands/extension.c:531 commands/extension.c:539 utils/misc/guc.c:5464
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "il parametro \"%s\" richiede un valore booleano"
 
-#: access/transam/xlog.c:5121
+#: access/transam/xlog.c:5137
 #, c-format
 msgid "parameter \"%s\" requires a temporal value"
 msgstr "il parametro \"%s\" richiede un valore temporale"
 
-#: access/transam/xlog.c:5123 catalog/dependency.c:984
-#: catalog/dependency.c:985 catalog/dependency.c:991 catalog/dependency.c:992
-#: catalog/dependency.c:1003 catalog/dependency.c:1004
-#: catalog/objectaddress.c:1053 commands/tablecmds.c:790
-#: commands/tablecmds.c:9405 commands/user.c:1027 commands/view.c:482
-#: libpq/auth.c:285 port/win32/security.c:51 storage/lmgr/deadlock.c:955
-#: storage/lmgr/proc.c:1179 utils/misc/guc.c:5484 utils/misc/guc.c:5577
-#: utils/misc/guc.c:9487 utils/misc/guc.c:9521 utils/misc/guc.c:9555
-#: utils/misc/guc.c:9589 utils/misc/guc.c:9624
+#: access/transam/xlog.c:5139 catalog/dependency.c:983 catalog/dependency.c:984
+#: catalog/dependency.c:990 catalog/dependency.c:991 catalog/dependency.c:1002
+#: catalog/dependency.c:1003 catalog/objectaddress.c:1053
+#: commands/tablecmds.c:792 commands/tablecmds.c:9513 commands/user.c:1027
+#: commands/view.c:499 libpq/auth.c:288 port/win32/security.c:51
+#: storage/lmgr/deadlock.c:955 storage/lmgr/proc.c:1177 utils/misc/guc.c:5486
+#: utils/misc/guc.c:5579 utils/misc/guc.c:9500 utils/misc/guc.c:9534
+#: utils/misc/guc.c:9568 utils/misc/guc.c:9602 utils/misc/guc.c:9637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: access/transam/xlog.c:5129
+#: access/transam/xlog.c:5146
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
 msgstr "parametro di ripristino \"%s\" sconosciuto"
 
-#: access/transam/xlog.c:5140
+#: access/transam/xlog.c:5157
 #, c-format
 msgid "recovery command file \"%s\" specified neither primary_conninfo nor restore_command"
 msgstr "il file dei comandi di ripristino \"%s\" non specifica né primary_conninfo né restore_command"
 
-#: access/transam/xlog.c:5142
+#: access/transam/xlog.c:5159
 #, c-format
 msgid "The database server will regularly poll the pg_xlog subdirectory to check for files placed there."
 msgstr "Il server database ispezionerà regolarmente la sottodirectory pg_xlog per controllare se vi vengono aggiunti dei file."
 
-#: access/transam/xlog.c:5148
+#: access/transam/xlog.c:5166
 #, c-format
 msgid "recovery command file \"%s\" must specify restore_command when standby mode is not enabled"
 msgstr "il file dei comandi di ripristino \"%s\" deve specificare restore_command quando la modalità standby non è abilitata"
 
-#: access/transam/xlog.c:5178
+#: access/transam/xlog.c:5187
+#, c-format
+msgid "standby mode is not supported by single-user servers"
+msgstr "la modalità di standby non è supportata per i server a utente singolo"
+
+#: access/transam/xlog.c:5206
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "la timeline destinazione di recupero %u non esiste"
 
-#: access/transam/xlog.c:5303
+#: access/transam/xlog.c:5327
 #, c-format
 msgid "archive recovery complete"
 msgstr "il ripristino dell'archivio è stato completato"
 
-#: access/transam/xlog.c:5362 access/transam/xlog.c:5590
+#: access/transam/xlog.c:5386 access/transam/xlog.c:5614
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "il ripristino è stato interrotto dopo aver raggiunto la consistenza"
 
-#: access/transam/xlog.c:5450
+#: access/transam/xlog.c:5474
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "il ripristino è stato interrotto prima del commit della transazione %u, orario %s"
 
-#: access/transam/xlog.c:5457
+#: access/transam/xlog.c:5481
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "il ripristino è stato interrotto prima dell'abort della transazione %u alle %s"
 
-#: access/transam/xlog.c:5502
+#: access/transam/xlog.c:5526
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "il ripristino è stato interrotto al punto di ripristino \"%s\" alle %s"
 
-#: access/transam/xlog.c:5570
+#: access/transam/xlog.c:5594
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "il ripristino è stato interrotto dopo il commit della transazione %u alle %s"
 
-#: access/transam/xlog.c:5578
+#: access/transam/xlog.c:5602
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "il ripristino è stato interrotto dopo l'abort della transazione %u alle %s"
 
-#: access/transam/xlog.c:5617
+#: access/transam/xlog.c:5641
 #, c-format
 msgid "recovery has paused"
 msgstr "ripristino in pausa"
 
-#: access/transam/xlog.c:5618
+#: access/transam/xlog.c:5642
 #, c-format
 msgid "Execute pg_xlog_replay_resume() to continue."
 msgstr "Esegui pg_xlog_replay_resume() per continuare."
 
-#: access/transam/xlog.c:5821
+#: access/transam/xlog.c:5849
 #, 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 "L'hot standby non è possibile perché %s = %d è un'impostazione inferiore a quella del server master (il cui valore era %d)"
+msgstr "l'hot standby non è possibile perché %s = %d è un'impostazione inferiore a quella del server master (il cui valore era %d)"
 
-#: access/transam/xlog.c:5836
-#, c-format
-msgid "hot standby is not possible because it requires \"%s\" to be same on master and standby (master has \"%s\", standby has \"%s\")"
-msgstr "l'hot standby non è possibile perché richiede che \"%s\" sia lo stesso sia sul master che sullo standby (master ha \"%s\", standby ha \"%s\")"
-
-#: access/transam/xlog.c:5856
+#: access/transam/xlog.c:5875
 #, c-format
 msgid "WAL was generated with wal_level=minimal, data may be missing"
 msgstr "il WAL è stato generato con wal_level=minimal, alcuni dati potrebbero mancare"
 
-#: access/transam/xlog.c:5857
+#: access/transam/xlog.c:5876
 #, c-format
 msgid "This happens if you temporarily set wal_level=minimal without taking a new base backup."
 msgstr "Questo avviene se imposti temporaneamente wal_level=minimal senza effettuare un nuovo backup di base."
 
-#: access/transam/xlog.c:5868
+#: access/transam/xlog.c:5887
 #, c-format
 msgid "hot standby is not possible because wal_level was not set to \"hot_standby\" or higher on the master server"
 msgstr "l'hot standby non è possibile perché il wal_level non è stato impostato a \"hot_standby\" o superiore sul server master"
 
-#: access/transam/xlog.c:5869
+#: access/transam/xlog.c:5888
 #, c-format
 msgid "Either set wal_level to \"hot_standby\" on the master, or turn off hot_standby here."
 msgstr "Puoi impostare il wal_level a \"hot_standby\" sul master, oppure disattivare hot_standby qui."
 
-#: access/transam/xlog.c:5929
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "control file contains invalid data"
 msgstr "il file di controllo contiene dati non validi"
 
-#: access/transam/xlog.c:5935
+#: access/transam/xlog.c:5951
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "il database è stato arrestato alle %s"
 
-#: access/transam/xlog.c:5940
+#: access/transam/xlog.c:5956
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr "il database è stato arrestato durante il ripristino alle %s"
 
-#: access/transam/xlog.c:5944
+#: access/transam/xlog.c:5960
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr "l'arresto del database è stato interrotto; l'ultimo segno di vita risale alle %s"
 
-#: access/transam/xlog.c:5948
+#: access/transam/xlog.c:5964
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "il database è stato interrotto alle %s mentre era in fase di ripristino"
 
-#: access/transam/xlog.c:5950
+#: access/transam/xlog.c:5966
 #, c-format
 msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
 msgstr "Questo probabilmente significa che alcuni dati sono corrotti e dovrai usare il backup più recente per il ripristino."
 
-#: access/transam/xlog.c:5954
+#: access/transam/xlog.c:5970
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr "il database è stato interrotto all'orario di log %s mentre era in fase di ripristino"
 
-#: access/transam/xlog.c:5956
+#: access/transam/xlog.c:5972
 #, c-format
 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 ciò è avvenuto più di una volta, alcuni dati potrebbero essere corrotti e potresti dover scegliere un obiettivo di ripristino precedente."
+msgstr "Se ciò è avvenuto più di una volta, alcuni dati potrebbero essere corrotti e potresti dover scegliere una destinazione di ripristino precedente."
 
-#: access/transam/xlog.c:5960
+#: access/transam/xlog.c:5976
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr "il database è stato interrotto; l'ultimo segno di vita risale alle %s"
 
-#: access/transam/xlog.c:6016
+#: access/transam/xlog.c:6032
 #, c-format
 msgid "entering standby mode"
 msgstr "inizio modalità standby"
 
-#: access/transam/xlog.c:6019
+#: access/transam/xlog.c:6035
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "avvio del ripristino point-in-time allo XID %u"
 
-#: access/transam/xlog.c:6023
+#: access/transam/xlog.c:6039
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "avvio del ripristino point-in-time alle %s"
 
-#: access/transam/xlog.c:6027
+#: access/transam/xlog.c:6043
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "avvio del ripristino point-in-time a \"%s\""
 
-#: access/transam/xlog.c:6031
+#: access/transam/xlog.c:6047
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr "avvio del ripristino point-in-time al precedente punto consistente"
 
-#: access/transam/xlog.c:6034
+#: access/transam/xlog.c:6050
 #, c-format
 msgid "starting archive recovery"
 msgstr "avvio del ripristino dell'archivio"
 
-#: access/transam/xlog.c:6051
+#: access/transam/xlog.c:6067
 #, c-format
 msgid "Failed while allocating an XLog reading processor."
 msgstr "Errore nell'alllocazione di un processore di lettura XLog."
 
-#: access/transam/xlog.c:6078 access/transam/xlog.c:6206
+#: access/transam/xlog.c:6094 access/transam/xlog.c:6222
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "il record di checkpoint si trova in %X/%X"
 
-#: access/transam/xlog.c:6092
+#: access/transam/xlog.c:6108
 #, c-format
 msgid "could not find redo location referenced by checkpoint record"
 msgstr "localizzazione della posizione di redo referenziata dal record di checkpoint fallita"
 
-#: access/transam/xlog.c:6093 access/transam/xlog.c:6100
+#: access/transam/xlog.c:6109 access/transam/xlog.c:6116
 #, c-format
 msgid "If you are not restoring from a backup, try removing the file \"%s/backup_label\"."
 msgstr "Se non si sta effettuando il ripristino da backup, prova a rimuovere il file \"%s/backup_label\"."
 
-#: access/transam/xlog.c:6099
+#: access/transam/xlog.c:6115
 #, c-format
 msgid "could not locate required checkpoint record"
 msgstr "localizzazione del record di checkpoint richiesto fallita"
 
-#: access/transam/xlog.c:6125 commands/tablespace.c:640
+#: access/transam/xlog.c:6141 commands/tablespace.c:641
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "creazione del link simbolico \"%s\" fallita: %m"
 
-#: access/transam/xlog.c:6157 access/transam/xlog.c:6163
+#: access/transam/xlog.c:6173
 #, c-format
-msgid "ignoring \"%s\" file because no \"%s\" file exists"
-msgstr "\"%s\" verrà ignorato perché il file \"%s\" non esiste"
+msgid "ignoring file \"%s\" because no file \"%s\" exists"
+msgstr "il file \"%s\" verrà ignorato perché il file \"%s\" non esiste"
 
-#: access/transam/xlog.c:6159 access/transam/xlog.c:10921
-#: access/transam/xlog.c:10944
+#: access/transam/xlog.c:6175 access/transam/xlog.c:10986
 #, c-format
-msgid "\"%s\" was renamed to \"%s\"."
-msgstr "\"%s\" è stato rinominato in \"%s\"."
+msgid "File \"%s\" was renamed to \"%s\"."
+msgstr "Il file \"%s\" è stato rinominato in \"%s\"."
 
-#: access/transam/xlog.c:6165
+#: access/transam/xlog.c:6179
+#, c-format
+msgid "ignoring \"%s\" file because no \"%s\" file exists"
+msgstr "\"%s\" verrà ignorato perché il file \"%s\" non esiste"
+
+#: access/transam/xlog.c:6181
 #, c-format
 msgid "Could not rename file \"%s\" to \"%s\": %m."
 msgstr "Cambio del nome del file da \"%s\" a \"%s\" fallito: %m."
 
-#: access/transam/xlog.c:6216 access/transam/xlog.c:6231
+#: access/transam/xlog.c:6232 access/transam/xlog.c:6247
 #, c-format
 msgid "could not locate a valid checkpoint record"
 msgstr "localizzazione di un record di checkpoint valido fallita"
 
-#: access/transam/xlog.c:6225
+#: access/transam/xlog.c:6241
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "si sta usando il precedente record di checkpoint in %X/%X"
 
-#: access/transam/xlog.c:6269
+#: access/transam/xlog.c:6285
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "la timeline richiesta %u non è figlia della storia di questo server"
 
-#: access/transam/xlog.c:6271
+#: access/transam/xlog.c:6287
 #, c-format
 msgid "Latest checkpoint is at %X/%X on timeline %u, but in the history of the requested timeline, the server forked off from that timeline at %X/%X."
 msgstr "L'ultimo checkpoint è a %X/%X sulla timeline %u, ma nella storia della timeline richiesta, il server si è separato da quella timeline a %X/%X."
 
-#: access/transam/xlog.c:6287
+#: access/transam/xlog.c:6303
 #, c-format
 msgid "requested timeline %u does not contain minimum recovery point %X/%X on timeline %u"
 msgstr "la timeline richiesta %u non contiene il punto di recupero minimo %X/%X sulla timeline %u"
 
-#: access/transam/xlog.c:6296
-#, c-format
-msgid "redo record is at %X/%X; shutdown %s"
-msgstr "il record di redo è alle %X/%X; arresto %s"
-
-#: access/transam/xlog.c:6300
-#, c-format
-msgid "next transaction ID: %u/%u; next OID: %u"
-msgstr "prossimo ID di transazione: %u/%u; prossimo OID: %u"
-
-#: access/transam/xlog.c:6304
-#, c-format
-msgid "next MultiXactId: %u; next MultiXactOffset: %u"
-msgstr "prossimo MultiXactId: %u; prossimo MultiXactOffset: %u"
-
-#: access/transam/xlog.c:6307
-#, c-format
-msgid "oldest unfrozen transaction ID: %u, in database %u"
-msgstr "ID della più vecchia transazione non congelata: %u, nel database %u"
-
-#: access/transam/xlog.c:6310
-#, c-format
-msgid "oldest MultiXactId: %u, in database %u"
-msgstr "il MultiXactId più vecchio: %u, nel database %u"
-
-#: access/transam/xlog.c:6313
-#, c-format
-msgid "commit timestamp Xid oldest/newest: %u/%u"
-msgstr "ora di commit degli Xid più vecchio/più nuovo: %u/%u"
-
-#: access/transam/xlog.c:6318
+#: access/transam/xlog.c:6334
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "l'ID della prossima transazione non è valido"
 
-#: access/transam/xlog.c:6396
+#: access/transam/xlog.c:6417
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "il redo nel record di checkpoint non è valido"
 
-#: access/transam/xlog.c:6407
+#: access/transam/xlog.c:6428
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "record di redo non valido nel checkpoint di arresto"
 
-#: access/transam/xlog.c:6435
+#: access/transam/xlog.c:6456
 #, c-format
 msgid "database system was not properly shut down; automatic recovery in progress"
 msgstr "il database non è stato arrestato correttamente; ripristino automatico in corso"
 
-#: access/transam/xlog.c:6439
+#: access/transam/xlog.c:6460
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr "il recupero dal crash comincia nella timeline %u e si conclude nella timeline %u"
 
-#: access/transam/xlog.c:6483
+#: access/transam/xlog.c:6504
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label contiene dati non consistenti col file di controllo"
 
-#: access/transam/xlog.c:6484
+#: access/transam/xlog.c:6505
 #, c-format
 msgid "This means that the backup is corrupted and you will have to use another backup for recovery."
 msgstr "Questo vuol dire che il backup è corrotto e sarà necessario usare un altro backup per il ripristino."
 
-#: access/transam/xlog.c:6566
+#: access/transam/xlog.c:6579
 #, c-format
 msgid "initializing for hot standby"
 msgstr "inizializzazione per l'hot standby"
 
-#: access/transam/xlog.c:6699
+#: access/transam/xlog.c:6711
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "il redo inizia in %X/%X"
 
-#: access/transam/xlog.c:6913
+#: access/transam/xlog.c:6925
 #, c-format
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr "lo stop point di ripristino è posto prima di un punto di ripristino consistente"
 
-#: access/transam/xlog.c:6951
+#: access/transam/xlog.c:6963
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "redo concluso in %X/%X"
 
-#: access/transam/xlog.c:6956 access/transam/xlog.c:8917
+#: access/transam/xlog.c:6968 access/transam/xlog.c:8922
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "l'ultima transazione è stata completata all'orario di log %s"
 
-#: access/transam/xlog.c:6965
+#: access/transam/xlog.c:6977
 #, c-format
 msgid "redo is not required"
 msgstr "redo non richiesto"
 
-#: access/transam/xlog.c:7040 access/transam/xlog.c:7044
+#: access/transam/xlog.c:7052 access/transam/xlog.c:7056
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "il WAL termina prima della fine del backup online"
 
-#: access/transam/xlog.c:7041
+#: access/transam/xlog.c:7053
 #, c-format
 msgid "All WAL generated while online backup was taken must be available at recovery."
 msgstr "Tutti i file WAL generati mentre il backup online veniva effettuato devono essere disponibili al momento del ripristino."
 
-#: access/transam/xlog.c:7045
+#: access/transam/xlog.c:7057
 #, c-format
 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 backup online iniziato con pg_start_backup() deve essere terminato con pg_stop_backup(), e tutti i file WAL fino a quel punto devono essere disponibili per il ripristino."
 
-#: access/transam/xlog.c:7048
+#: access/transam/xlog.c:7060
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "il WAL termina prima di un punto di ripristino consistente"
 
-#: access/transam/xlog.c:7075
+#: access/transam/xlog.c:7087
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "l'ID della nuova timeline selezionata è %u"
 
-#: access/transam/xlog.c:7491
+#: access/transam/xlog.c:7498
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "è stato raggiunto uno stato di ripristino consistente a %X/%X"
 
-#: access/transam/xlog.c:7682
+#: access/transam/xlog.c:7689
 #, c-format
 msgid "invalid primary checkpoint link in control file"
 msgstr "il link nel file di controllo al checkpoint primario non è valido"
 
-#: access/transam/xlog.c:7686
+#: access/transam/xlog.c:7693
 #, c-format
 msgid "invalid secondary checkpoint link in control file"
 msgstr "il link nel file di controllo al checkpoint secondario non è valido"
 
-#: access/transam/xlog.c:7690
+#: access/transam/xlog.c:7697
 #, c-format
 msgid "invalid checkpoint link in backup_label file"
 msgstr "il link al checkpoint nel file backup_label non è valido"
 
-#: access/transam/xlog.c:7707
+#: access/transam/xlog.c:7714
 #, c-format
 msgid "invalid primary checkpoint record"
 msgstr "il record del checkpoint primario non è valido"
 
-#: access/transam/xlog.c:7711
+#: access/transam/xlog.c:7718
 #, c-format
 msgid "invalid secondary checkpoint record"
 msgstr "il record del checkpoint secondario non è valido"
 
-#: access/transam/xlog.c:7715
+#: access/transam/xlog.c:7722
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "il record del checkpoint non è valido"
 
-#: access/transam/xlog.c:7726
+#: access/transam/xlog.c:7733
 #, c-format
 msgid "invalid resource manager ID in primary checkpoint record"
 msgstr "l'ID del resource manager nel record del checkpoint primario non è valido"
 
-#: access/transam/xlog.c:7730
+#: access/transam/xlog.c:7737
 #, c-format
 msgid "invalid resource manager ID in secondary checkpoint record"
 msgstr "l'ID del resource manager nel record del checkpoint secondario non è valido"
 
-#: access/transam/xlog.c:7734
+#: access/transam/xlog.c:7741
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "l'ID del resource manager nel record del checkpoint non è valido"
 
-#: access/transam/xlog.c:7746
+#: access/transam/xlog.c:7753
 #, c-format
 msgid "invalid xl_info in primary checkpoint record"
 msgstr "l'xl_info nel record del checkpoint primario non è valido"
 
-#: access/transam/xlog.c:7750
+#: access/transam/xlog.c:7757
 #, c-format
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr "l'xl_info nel record del checkpoint secondario non è valido"
 
-#: access/transam/xlog.c:7754
+#: access/transam/xlog.c:7761
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "l'xl_info nel record del checkpoint non è valido"
 
-#: access/transam/xlog.c:7765
+#: access/transam/xlog.c:7772
 #, c-format
 msgid "invalid length of primary checkpoint record"
 msgstr "la lunghezza del record del checkpoint primario non è valida"
 
-#: access/transam/xlog.c:7769
+#: access/transam/xlog.c:7776
 #, c-format
 msgid "invalid length of secondary checkpoint record"
 msgstr "la lunghezza del record del checkpoint secondario non è valida"
 
-#: access/transam/xlog.c:7773
+#: access/transam/xlog.c:7780
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "la lunghezza del record del checkpoint non è valida"
 
-#: access/transam/xlog.c:7943
+#: access/transam/xlog.c:7950
 #, c-format
 msgid "shutting down"
 msgstr "arresto in corso"
 
-#: access/transam/xlog.c:7967
+#: access/transam/xlog.c:7974
 #, c-format
 msgid "database system is shut down"
 msgstr "il database è stato arrestato"
 
-#: access/transam/xlog.c:8460
+#: access/transam/xlog.c:8467
 #, c-format
 msgid "concurrent transaction log activity while database system is shutting down"
 msgstr "rilevata attività concorrente sul log delle transazioni durante l'arresto del database"
 
-#: access/transam/xlog.c:8722
+#: access/transam/xlog.c:8721
 #, c-format
 msgid "skipping restartpoint, recovery has already ended"
 msgstr "si tralascia il restartpoint, il ripristino è ormai terminato"
 
-#: access/transam/xlog.c:8745
+#: access/transam/xlog.c:8744
 #, c-format
 msgid "skipping restartpoint, already performed at %X/%X"
 msgstr "si tralascia il restartpoint, già eseguito in %X/%X"
 
-#: access/transam/xlog.c:8915
+#: access/transam/xlog.c:8920
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "punto di avvio del ripristino in %X/%X"
 
-#: access/transam/xlog.c:9048
+#: access/transam/xlog.c:9053
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "punto di ripristino \"%s\" creato in %X/%X"
 
-#: access/transam/xlog.c:9178
+#: access/transam/xlog.c:9183
 #, c-format
 msgid "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record"
 msgstr "timeline precedente con ID %u non prevista (l'ID della timeline corrente è %u) nel record di checkpoint"
 
-#: access/transam/xlog.c:9187
+#: access/transam/xlog.c:9192
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "timeline ID %u imprevista (dopo %u) nel record di checkpoint"
 
-#: access/transam/xlog.c:9203
+#: access/transam/xlog.c:9208
 #, c-format
 msgid "unexpected timeline ID %u in checkpoint record, before reaching minimum recovery point %X/%X on timeline %u"
 msgstr "timeline ID %u imprevista nel record di checkpoint, prima di raggiungere il punto di recupero minimo %X/%X sulla timeline %u"
 
-#: access/transam/xlog.c:9273
+#: access/transam/xlog.c:9279
 #, c-format
 msgid "online backup was canceled, recovery cannot continue"
 msgstr "il backup online è stato annullato, il ripristino non può continuare"
 
-#: access/transam/xlog.c:9329 access/transam/xlog.c:9373
-#: access/transam/xlog.c:9396
+#: access/transam/xlog.c:9335 access/transam/xlog.c:9382
+#: access/transam/xlog.c:9405
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
 msgstr "l'ID della timeline %u (che dovrebbe essere %u) non era prevista nel record di checkpoint"
 
-#: access/transam/xlog.c:9689
+#: access/transam/xlog.c:9682
 #, c-format
 msgid "could not fsync log segment %s: %m"
 msgstr "fsync del segmento di log %s fallito: %m"
 
-#: access/transam/xlog.c:9713
+#: access/transam/xlog.c:9706
 #, c-format
 msgid "could not fsync log file %s: %m"
 msgstr "fsync del file di log %s fallito: %m"
 
-#: access/transam/xlog.c:9721
+#: access/transam/xlog.c:9714
 #, c-format
 msgid "could not fsync write-through log file %s: %m"
 msgstr "fsync write-through del file di log %s fallito: %m"
 
-#: access/transam/xlog.c:9730
+#: access/transam/xlog.c:9723
 #, c-format
 msgid "could not fdatasync log file %s: %m"
 msgstr "fdatasync del file di log %s fallito: %m"
 
-#: access/transam/xlog.c:9822 access/transam/xlog.c:10293
+#: access/transam/xlog.c:9815 access/transam/xlog.c:10319
 #: access/transam/xlogfuncs.c:121 access/transam/xlogfuncs.c:150
 #: access/transam/xlogfuncs.c:189 access/transam/xlogfuncs.c:210
 #: access/transam/xlogfuncs.c:280 access/transam/xlogfuncs.c:336
@@ -2206,187 +2148,203 @@
 msgid "recovery is in progress"
 msgstr "il ripristino è in corso"
 
-#: access/transam/xlog.c:9823 access/transam/xlog.c:10294
+#: access/transam/xlog.c:9816 access/transam/xlog.c:10320
 #: access/transam/xlogfuncs.c:122 access/transam/xlogfuncs.c:151
 #: access/transam/xlogfuncs.c:190 access/transam/xlogfuncs.c:211
 #, c-format
 msgid "WAL control functions cannot be executed during recovery."
 msgstr "le funzioni di controllo WAL non possono essere eseguite durante il ripristino."
 
-#: access/transam/xlog.c:9832 access/transam/xlog.c:10303
+#: access/transam/xlog.c:9825 access/transam/xlog.c:10329
 #, c-format
 msgid "WAL level not sufficient for making an online backup"
 msgstr "livello WAL non sufficiente per creare un backup online"
 
-#: access/transam/xlog.c:9833 access/transam/xlog.c:10304
+#: access/transam/xlog.c:9826 access/transam/xlog.c:10330
 #: access/transam/xlogfuncs.c:157
 #, c-format
 msgid "wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start."
 msgstr "Il wal_level deve essere impostato ad \"archive\", \"hot_standby\" oppure \"logical\" all'avvio del server."
 
-#: access/transam/xlog.c:9838
+#: access/transam/xlog.c:9831
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "etichetta di backup troppo lunga (massimo %d byte)"
 
-#: access/transam/xlog.c:9870 access/transam/xlog.c:10140
-#: access/transam/xlog.c:10176
+#: access/transam/xlog.c:9868 access/transam/xlog.c:10138
+#: access/transam/xlog.c:10174
 #, c-format
 msgid "a backup is already in progress"
 msgstr "c'è già un backup in corso"
 
-#: access/transam/xlog.c:9871
+#: access/transam/xlog.c:9869
 #, c-format
 msgid "Run pg_stop_backup() and try again."
 msgstr "Esegui pg_stop_backup() e prova di nuovo."
 
-#: access/transam/xlog.c:9966
+#: access/transam/xlog.c:9964
 #, c-format
 msgid "WAL generated with full_page_writes=off was replayed since last restartpoint"
 msgstr "un WAL generato con full_page_writes=off è stato riprodotto dopo l'ultimo restartpoint"
 
-#: access/transam/xlog.c:9968 access/transam/xlog.c:10458
+#: access/transam/xlog.c:9966 access/transam/xlog.c:10512
 #, c-format
 msgid "This means that the backup being taken on the standby is corrupt and should not be used. Enable full_page_writes and run CHECKPOINT on the master, and then try an online backup again."
 msgstr "Ciò vuol dire che il backup che sta venendo preso sullo standby è corrotto e non dovrebbe essere usato. Abilita full_page_writes ed esegui CHECKPOINT sul master, poi prova ad effettuare nuovamente un backup online.\""
 
-#: access/transam/xlog.c:10034 replication/basebackup.c:1027
+#: access/transam/xlog.c:10032 replication/basebackup.c:1023
 #: utils/adt/misc.c:378
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "lettura del link simbolico \"%s\" fallita: %m"
 
-#: access/transam/xlog.c:10041 replication/basebackup.c:1032
+#: access/transam/xlog.c:10039 replication/basebackup.c:1028
 #: utils/adt/misc.c:383
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "la destinazione del link simbolico \"%s\" è troppo lunga"
 
-#: access/transam/xlog.c:10094 commands/tablespace.c:389
-#: commands/tablespace.c:552 replication/basebackup.c:1048
-#: utils/adt/misc.c:391
+#: access/transam/xlog.c:10092 commands/tablespace.c:391
+#: commands/tablespace.c:553 replication/basebackup.c:1044 utils/adt/misc.c:391
 #, c-format
 msgid "tablespaces are not supported on this platform"
 msgstr "i tablespace non sono supportati su questa piattaforma"
 
-#: access/transam/xlog.c:10134 access/transam/xlog.c:10170
-#: access/transam/xlog.c:10344 access/transam/xlogarchive.c:106
-#: access/transam/xlogarchive.c:265 commands/copy.c:1738 commands/copy.c:2764
-#: commands/extension.c:3026 replication/basebackup.c:404
-#: replication/basebackup.c:472 replication/logical/snapbuild.c:1478
-#: storage/file/copydir.c:72 storage/file/copydir.c:115 storage/file/fd.c:2519
-#: storage/file/fd.c:2611 utils/adt/dbsize.c:68 utils/adt/dbsize.c:218
+#: access/transam/xlog.c:10132 access/transam/xlog.c:10168
+#: access/transam/xlog.c:10369 access/transam/xlogarchive.c:106
+#: access/transam/xlogarchive.c:265 commands/copy.c:1778 commands/copy.c:2804
+#: commands/extension.c:3029 commands/tablespace.c:782
+#: commands/tablespace.c:873 replication/basebackup.c:406
+#: replication/basebackup.c:474 replication/logical/snapbuild.c:1479
+#: storage/file/copydir.c:72 storage/file/copydir.c:115 storage/file/fd.c:2703
+#: storage/file/fd.c:2795 utils/adt/dbsize.c:68 utils/adt/dbsize.c:218
 #: utils/adt/dbsize.c:298 utils/adt/genfile.c:114 utils/adt/genfile.c:333
 #: guc-file.l:1003
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "non è stato possibile ottenere informazioni sul file \"%s\": %m"
 
-#: access/transam/xlog.c:10141 access/transam/xlog.c:10177
+#: access/transam/xlog.c:10139 access/transam/xlog.c:10175
 #, c-format
 msgid "If you're sure there is no backup in progress, remove file \"%s\" and try again."
 msgstr "Se si è certi che non ci sono backup in corso, rimuovi il file \"%s\" e prova di nuovo."
 
-#: access/transam/xlog.c:10158 access/transam/xlog.c:10194
-#: access/transam/xlog.c:10519
+#: access/transam/xlog.c:10156 access/transam/xlog.c:10192
+#: access/transam/xlog.c:10573
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "scrittura nel file \"%s\" fallita: %m"
 
-#: access/transam/xlog.c:10348
+#: access/transam/xlog.c:10346
+#, c-format
+msgid "exclusive backup not in progress"
+msgstr "non c'è un backup esclusivo in corso"
+
+#: access/transam/xlog.c:10373
 #, c-format
 msgid "a backup is not in progress"
-msgstr "nessuno backup in esecuzione"
+msgstr "non c'è un backup in esecuzione"
 
-#: access/transam/xlog.c:10393 access/transam/xlog.c:10406
-#: access/transam/xlog.c:10746 access/transam/xlog.c:10752
-#: access/transam/xlog.c:10836 access/transam/xlogfuncs.c:508
+#: access/transam/xlog.c:10447 access/transam/xlog.c:10460
+#: access/transam/xlog.c:10800 access/transam/xlog.c:10806
+#: access/transam/xlog.c:10890 access/transam/xlogfuncs.c:508
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "i dati nel file \"%s\" non sono validi"
 
-#: access/transam/xlog.c:10410 replication/basebackup.c:925
+#: access/transam/xlog.c:10464 replication/basebackup.c:935
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr "lo standby è stato promosso durante il backup online"
 
-#: access/transam/xlog.c:10411 replication/basebackup.c:926
+#: access/transam/xlog.c:10465 replication/basebackup.c:936
 #, c-format
 msgid "This means that the backup being taken is corrupt and should not be used. Try taking another online backup."
 msgstr "Ciò vuol dire che il backup che stava venendo salvato è corrotto e non dovrebbe essere usato. Prova ad effettuare un altro backup online."
 
-#: access/transam/xlog.c:10456
+#: access/transam/xlog.c:10510
 #, c-format
 msgid "WAL generated with full_page_writes=off was replayed during online backup"
 msgstr "un WAL generato con full_page_writes=off è stato riprodotto durante il backup online"
 
-#: access/transam/xlog.c:10568
+#: access/transam/xlog.c:10622
 #, c-format
 msgid "pg_stop_backup cleanup done, waiting for required WAL segments to be archived"
 msgstr "pulizia di pg_stop_backup effettuata, in attesa che i segmenti WAL richiesti vengano archiviati"
 
-#: access/transam/xlog.c:10578
+#: access/transam/xlog.c:10632
 #, c-format
 msgid "pg_stop_backup still waiting for all required WAL segments to be archived (%d seconds elapsed)"
 msgstr "pg_stop_backup è ancora in attesa che tutti i segmenti WAL richiesti siano stati archiviati (sono passati %d secondi)"
 
-#: access/transam/xlog.c:10580
+#: access/transam/xlog.c:10634
 #, c-format
 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 "Controlla che il tuo archive_command venga eseguito correttamente. pg_stop_backup può essere interrotto in sicurezza ma il backup del database non sarà utilizzabile senza tutti i segmenti WAL."
 
-#: access/transam/xlog.c:10587
+#: access/transam/xlog.c:10641
 #, c-format
 msgid "pg_stop_backup complete, all required WAL segments have been archived"
 msgstr "pg_stop_backup completo, tutti i segmenti WAL richiesti sono stati archiviati"
 
-#: access/transam/xlog.c:10591
+#: access/transam/xlog.c:10645
 #, 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"
 msgstr "l'archiviazione WAL non è abilitata; devi verificare che tutti i segmenti WAL richiesti vengano copiati in qualche altro modo per completare il backup"
 
-#: access/transam/xlog.c:10875
+#: access/transam/xlog.c:10929
 #, c-format
 msgid "xlog redo %s"
 msgstr "xlog redo %s"
 
-#: access/transam/xlog.c:10920 access/transam/xlog.c:10943
+#: access/transam/xlog.c:10975
+#, c-format
+msgid "online backup mode was not canceled"
+msgstr "la modalità di backup online non è stata annullata"
+
+#: access/transam/xlog.c:10976
+#, c-format
+msgid "File \"%s\" could not be renamed to \"%s\": %m."
+msgstr "Non è stato possibile rinominare il file \"%s\" in \"%s\": %m."
+
+#: access/transam/xlog.c:10985 access/transam/xlog.c:10997
+#: access/transam/xlog.c:11007
 #, c-format
 msgid "online backup mode canceled"
 msgstr "modalità backup online annullata"
 
-#: access/transam/xlog.c:10928 access/transam/xlog.c:10951
+#: access/transam/xlog.c:10998
 #, c-format
-msgid "online backup mode was not canceled"
-msgstr "la modalità di backup online non è stata annullata"
+msgid "Files \"%s\" and \"%s\" were renamed to \"%s\" and \"%s\", respectively."
+msgstr "File \"%s\" e \"%s\" rinominati rispettivamente in \"%s\" e \"%s\"."
 
-#: access/transam/xlog.c:10929 access/transam/xlog.c:10952
+#: access/transam/xlog.c:11008
 #, c-format
-msgid "Could not rename \"%s\" to \"%s\": %m."
-msgstr "Non è stato possibile rinominare \"%s\" in \"%s\": %m."
+msgid "File \"%s\" was renamed to \"%s\", but file \"%s\" could not be renamed to \"%s\": %m."
+msgstr "File \"%s\" rinominato in \"%s\", ma non è stato possibile rinominare il file \"%s\" in \"%s\": %m."
 
-#: access/transam/xlog.c:11072 replication/logical/logicalfuncs.c:171
-#: replication/walreceiver.c:932 replication/walsender.c:2092
+#: access/transam/xlog.c:11130 replication/logical/logicalfuncs.c:171
+#: replication/walreceiver.c:932 replication/walsender.c:2111
 #, c-format
 msgid "could not seek in log segment %s to offset %u: %m"
 msgstr "spostamento nel segmento di log %s alla posizione %u fallito: %m"
 
-#: access/transam/xlog.c:11084
+#: access/transam/xlog.c:11142
 #, c-format
 msgid "could not read from log segment %s, offset %u: %m"
 msgstr "lettura del segmento di log %s, posizione %u fallita: %m"
 
-#: access/transam/xlog.c:11558
+#: access/transam/xlog.c:11616
 #, c-format
 msgid "received promote request"
 msgstr "richiesta di promozione ricevuta"
 
-#: access/transam/xlog.c:11571
+#: access/transam/xlog.c:11629
 #, c-format
 msgid "trigger file found: %s"
 msgstr "trovato il file trigger: %s"
 
-#: access/transam/xlog.c:11580
+#: access/transam/xlog.c:11638
 #, c-format
 msgid "could not stat trigger file \"%s\": %m"
 msgstr "non è stato possibile ottenere informazioni sul file trigger \"%s\": %m"
@@ -2414,12 +2372,19 @@
 msgid "%s \"%s\": %s"
 msgstr "%s \"%s\": %s"
 
-#: access/transam/xlogarchive.c:529 access/transam/xlogarchive.c:598
+#: access/transam/xlogarchive.c:458 replication/logical/snapbuild.c:1602
+#: replication/slot.c:496 replication/slot.c:953 replication/slot.c:1065
+#: storage/file/fd.c:501 storage/file/fd.c:559 utils/time/snapmgr.c:1146
+#, c-format
+msgid "could not rename file \"%s\" to \"%s\": %m"
+msgstr "non è stato possibile rinominare il file \"%s\" in \"%s\": %m"
+
+#: access/transam/xlogarchive.c:525 access/transam/xlogarchive.c:589
 #, c-format
 msgid "could not create archive status file \"%s\": %m"
 msgstr "creazione del file di stato dell'archivio \"%s\" fallita: %m"
 
-#: access/transam/xlogarchive.c:537 access/transam/xlogarchive.c:606
+#: access/transam/xlogarchive.c:533 access/transam/xlogarchive.c:597
 #, c-format
 msgid "could not write archive status file \"%s\": %m"
 msgstr "scrittura del file di stato dell'archivio \"%s\" fallita: %m"
@@ -2429,11 +2394,11 @@
 msgid "must be superuser or replication role to run a backup"
 msgstr "solo un superutente o il ruolo di replica può eseguire un backup"
 
-#: access/transam/xlogfuncs.c:67 commands/tablespace.c:704
-#: commands/tablespace.c:714 postmaster/postmaster.c:1371
-#: replication/basebackup.c:292 replication/basebackup.c:632
-#: storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:1985
-#: storage/file/fd.c:2584 storage/ipc/dsm.c:300 utils/adt/genfile.c:439
+#: access/transam/xlogfuncs.c:67 commands/tablespace.c:705
+#: commands/tablespace.c:715 postmaster/postmaster.c:1404
+#: replication/basebackup.c:294 replication/basebackup.c:634
+#: storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:2169
+#: storage/file/fd.c:2768 storage/ipc/dsm.c:300 utils/adt/genfile.c:439
 #: utils/adt/misc.c:291 utils/misc/tzparser.c:339
 #, c-format
 msgid "could not open directory \"%s\": %m"
@@ -2543,18 +2508,18 @@
 
 #: access/transam/xlogreader.c:751
 #, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s."
-msgstr "Il file di WAL è di un database diverso: l'identificatore del file di WAL del database è %s, l'identificatore di pg_control del database è %s."
+msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s"
+msgstr "il file di WAL è di un database diverso: l'identificativo del file di WAL del database è %s, l'identificativo di pg_control del database è %s"
 
 #: access/transam/xlogreader.c:758
 #, c-format
-msgid "WAL file is from different database system: Incorrect XLOG_SEG_SIZE in page header."
-msgstr "Il file di WAL è di un database diverso: XLOG_SEG_SIZE non corretto nell'header di pagina."
+msgid "WAL file is from different database system: incorrect XLOG_SEG_SIZE in page header"
+msgstr "il file di WAL è di un database diverso: XLOG_SEG_SIZE non corretto nell'header di pagina"
 
 #: access/transam/xlogreader.c:764
 #, c-format
-msgid "WAL file is from different database system: Incorrect XLOG_BLCKSZ in page header."
-msgstr "Il file di WAL è di un database diverso: XLOG_BLCKSZ non corretto nell'header di pagina."
+msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
+msgstr "il file di WAL è di un database diverso: XLOG_BLCKSZ non corretto nell'header di pagina"
 
 #: access/transam/xlogreader.c:790
 #, c-format
@@ -2566,73 +2531,73 @@
 msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
 msgstr "ID della timeline %u (dopo %u) fuori sequenza nel segmento di log %s, offset %u"
 
-#: access/transam/xlogreader.c:1024
+#: access/transam/xlogreader.c:1061
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id fuori sequenza %u a %X/%X"
 
-#: access/transam/xlogreader.c:1046
+#: access/transam/xlogreader.c:1083
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA impostato, ma dati non inclusi a %X/%X"
 
-#: access/transam/xlogreader.c:1053
+#: access/transam/xlogreader.c:1090
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA non impostato, ma la lunghezza dei dati è %u a %X/%X"
 
-#: access/transam/xlogreader.c:1086
+#: access/transam/xlogreader.c:1123
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE impostato, ma offset buco %u lunghezza %u lunghezza dell'immagine del blocco %u a %X/%X"
 
-#: access/transam/xlogreader.c:1102
+#: access/transam/xlogreader.c:1139
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE non impostato, ma offset buco %u lunghezza %u a %X/%X"
 
-#: access/transam/xlogreader.c:1117
+#: access/transam/xlogreader.c:1154
 #, c-format
 msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_IS_COMPRESSED impostato, ma la lunghezza dell'immagine del blocco è %u a %X/%X"
 
-#: access/transam/xlogreader.c:1132
+#: access/transam/xlogreader.c:1169
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "né BKPIMAGE_HAS_HOLE né BKPIMAGE_IS_COMPRESSED impostati, ma la lunghezza dell'immagine del blocco è %u a %X/%X"
 
-#: access/transam/xlogreader.c:1148
+#: access/transam/xlogreader.c:1185
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL impostato ma non c'è un rel precedente a %X/%X"
 
-#: access/transam/xlogreader.c:1160
+#: access/transam/xlogreader.c:1197
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "block_id %u non valido a %X/%X"
 
-#: access/transam/xlogreader.c:1225
+#: access/transam/xlogreader.c:1262
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "record con lunghezza non valida a %X/%X"
 
-#: access/transam/xlogreader.c:1314
+#: access/transam/xlogreader.c:1351
 #, c-format
 msgid "invalid compressed image at %X/%X, block %d"
 msgstr "immagine compressa non valida a %X/%X, blocco %d"
 
-#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:782 tcop/postgres.c:3480
+#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:790 tcop/postgres.c:3500
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s richiede un valore"
 
-#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:787 tcop/postgres.c:3485
+#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:795 tcop/postgres.c:3505
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s richiede un valore"
 
-#: bootstrap/bootstrap.c:284 postmaster/postmaster.c:799
-#: postmaster/postmaster.c:812
+#: bootstrap/bootstrap.c:284 postmaster/postmaster.c:807
+#: postmaster/postmaster.c:820
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
@@ -2752,7 +2717,7 @@
 msgid "column privileges are only valid for relations"
 msgstr "i privilegi della colonna sono validi solo per le relazioni"
 
-#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4651
+#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4656
 #: catalog/objectaddress.c:854 catalog/pg_largeobject.c:113
 #: storage/large_object/inv_api.c:291
 #, c-format
@@ -2760,19 +2725,19 @@
 msgstr "il large object %u non esiste"
 
 #: catalog/aclchk.c:863 catalog/aclchk.c:871 commands/collationcmds.c:92
-#: commands/copy.c:1010 commands/copy.c:1028 commands/copy.c:1036
-#: commands/copy.c:1044 commands/copy.c:1052 commands/copy.c:1060
-#: commands/copy.c:1068 commands/copy.c:1076 commands/copy.c:1084
-#: commands/copy.c:1100 commands/copy.c:1114 commands/copy.c:1133
-#: commands/copy.c:1148 commands/dbcommands.c:155 commands/dbcommands.c:163
+#: commands/copy.c:1050 commands/copy.c:1068 commands/copy.c:1076
+#: commands/copy.c:1084 commands/copy.c:1092 commands/copy.c:1100
+#: commands/copy.c:1108 commands/copy.c:1116 commands/copy.c:1124
+#: commands/copy.c:1140 commands/copy.c:1154 commands/copy.c:1173
+#: commands/copy.c:1188 commands/dbcommands.c:155 commands/dbcommands.c:163
 #: commands/dbcommands.c:171 commands/dbcommands.c:179
 #: commands/dbcommands.c:187 commands/dbcommands.c:195
 #: commands/dbcommands.c:203 commands/dbcommands.c:211
 #: commands/dbcommands.c:219 commands/dbcommands.c:1397
 #: commands/dbcommands.c:1405 commands/dbcommands.c:1413
-#: commands/dbcommands.c:1421 commands/extension.c:1244
-#: commands/extension.c:1252 commands/extension.c:1260
-#: commands/extension.c:2677 commands/foreigncmds.c:539
+#: commands/dbcommands.c:1421 commands/extension.c:1247
+#: commands/extension.c:1255 commands/extension.c:1263
+#: commands/extension.c:2680 commands/foreigncmds.c:539
 #: commands/foreigncmds.c:548 commands/functioncmds.c:525
 #: commands/functioncmds.c:619 commands/functioncmds.c:627
 #: commands/functioncmds.c:635 commands/functioncmds.c:643
@@ -2800,21 +2765,21 @@
 msgstr "i privilegi predefiniti non possono essere impostati sulle colonne"
 
 #: catalog/aclchk.c:1483 catalog/objectaddress.c:1338 commands/analyze.c:378
-#: commands/copy.c:4383 commands/sequence.c:1491 commands/tablecmds.c:5167
-#: commands/tablecmds.c:5273 commands/tablecmds.c:5333
-#: commands/tablecmds.c:5446 commands/tablecmds.c:5503
-#: commands/tablecmds.c:5597 commands/tablecmds.c:5693
-#: commands/tablecmds.c:7854 commands/tablecmds.c:8059
-#: commands/tablecmds.c:8479 commands/trigger.c:643 parser/analyze.c:2112
-#: parser/parse_relation.c:2536 parser/parse_relation.c:2598
-#: parser/parse_target.c:940 parser/parse_type.c:128 utils/adt/acl.c:2839
-#: utils/adt/ruleutils.c:1836
+#: commands/copy.c:4423 commands/sequence.c:1491 commands/tablecmds.c:5168
+#: commands/tablecmds.c:5274 commands/tablecmds.c:5334
+#: commands/tablecmds.c:5447 commands/tablecmds.c:5504
+#: commands/tablecmds.c:5598 commands/tablecmds.c:5694
+#: commands/tablecmds.c:7886 commands/tablecmds.c:8148
+#: commands/tablecmds.c:8568 commands/trigger.c:643 parser/analyze.c:2157
+#: parser/parse_relation.c:2628 parser/parse_relation.c:2690
+#: parser/parse_target.c:951 parser/parse_type.c:127 utils/adt/acl.c:2839
+#: utils/adt/ruleutils.c:1859
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "la colonna \"%s\" della relazione \"%s\" non esiste"
 
 #: catalog/aclchk.c:1748 catalog/objectaddress.c:1151 commands/sequence.c:1078
-#: commands/tablecmds.c:220 commands/tablecmds.c:11908 utils/adt/acl.c:2075
+#: commands/tablecmds.c:222 commands/tablecmds.c:12118 utils/adt/acl.c:2075
 #: utils/adt/acl.c:2105 utils/adt/acl.c:2137 utils/adt/acl.c:2169
 #: utils/adt/acl.c:2197 utils/adt/acl.c:2227
 #, c-format
@@ -3087,127 +3052,127 @@
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "l'attributo %d della relazione con OID %u non esiste"
 
-#: catalog/aclchk.c:3588 catalog/aclchk.c:4502
+#: catalog/aclchk.c:3588 catalog/aclchk.c:4507
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "la relazione con OID %u non esiste"
 
-#: catalog/aclchk.c:3687 catalog/aclchk.c:4920
+#: catalog/aclchk.c:3687 catalog/aclchk.c:4925
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "il database con OID %u non esiste"
 
-#: catalog/aclchk.c:3741 catalog/aclchk.c:4580 tcop/fastpath.c:223
+#: catalog/aclchk.c:3741 catalog/aclchk.c:4585 tcop/fastpath.c:223
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "la funzione con OID %u non esiste"
 
-#: catalog/aclchk.c:3795 catalog/aclchk.c:4606
+#: catalog/aclchk.c:3795 catalog/aclchk.c:4611
 #, c-format
 msgid "language with OID %u does not exist"
 msgstr "il linguaggio con OID %u non esiste"
 
-#: catalog/aclchk.c:3959 catalog/aclchk.c:4678
+#: catalog/aclchk.c:3959 catalog/aclchk.c:4683
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "lo schema con OID %u non esiste"
 
-#: catalog/aclchk.c:4013 catalog/aclchk.c:4705
+#: catalog/aclchk.c:4013 catalog/aclchk.c:4710
 #, c-format
 msgid "tablespace with OID %u does not exist"
 msgstr "il tablespace con l'OID %u non esiste"
 
-#: catalog/aclchk.c:4071 catalog/aclchk.c:4839 commands/foreigncmds.c:325
+#: catalog/aclchk.c:4072 catalog/aclchk.c:4844 commands/foreigncmds.c:325
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "il wrapper di dati esterni con OID %u non esiste"
 
-#: catalog/aclchk.c:4132 catalog/aclchk.c:4866 commands/foreigncmds.c:461
+#: catalog/aclchk.c:4134 catalog/aclchk.c:4871 commands/foreigncmds.c:461
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "il server esterno con OID %u non esiste"
 
-#: catalog/aclchk.c:4191 catalog/aclchk.c:4205 catalog/aclchk.c:4528
+#: catalog/aclchk.c:4194 catalog/aclchk.c:4533
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "il tipo con OID %u non esiste"
 
-#: catalog/aclchk.c:4554
+#: catalog/aclchk.c:4559
 #, c-format
 msgid "operator with OID %u does not exist"
 msgstr "l'operatore con OID %u non esiste"
 
-#: catalog/aclchk.c:4731
+#: catalog/aclchk.c:4736
 #, c-format
 msgid "operator class with OID %u does not exist"
 msgstr "la classe di operatori con OID %u non esiste"
 
-#: catalog/aclchk.c:4758
+#: catalog/aclchk.c:4763
 #, c-format
 msgid "operator family with OID %u does not exist"
 msgstr "la famiglia di operatori con OID %u non esiste"
 
-#: catalog/aclchk.c:4785
+#: catalog/aclchk.c:4790
 #, c-format
 msgid "text search dictionary with OID %u does not exist"
 msgstr "il dizionario di ricerca di testo con OID %u non esiste"
 
-#: catalog/aclchk.c:4812
+#: catalog/aclchk.c:4817
 #, c-format
 msgid "text search configuration with OID %u does not exist"
 msgstr "la configurazione di ricerca di testo con OID %u non esiste"
 
-#: catalog/aclchk.c:4893 commands/event_trigger.c:586
+#: catalog/aclchk.c:4898 commands/event_trigger.c:586
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "il trigger di evento con OID %u non esiste"
 
-#: catalog/aclchk.c:4946
+#: catalog/aclchk.c:4951
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "l'ordinamento con OID %u non esiste"
 
-#: catalog/aclchk.c:4972
+#: catalog/aclchk.c:4977
 #, c-format
 msgid "conversion with OID %u does not exist"
 msgstr "la conversione con OID %u non esiste"
 
-#: catalog/aclchk.c:5013
+#: catalog/aclchk.c:5018
 #, c-format
 msgid "extension with OID %u does not exist"
 msgstr "l'estensione con OID %u non esiste"
 
-#: catalog/dependency.c:640
+#: catalog/dependency.c:639
 #, c-format
 msgid "cannot drop %s because %s requires it"
 msgstr "non è possibile eliminare %s perché %s lo richiede"
 
-#: catalog/dependency.c:643
+#: catalog/dependency.c:642
 #, c-format
 msgid "You can drop %s instead."
 msgstr "È invece possibile eliminare %s."
 
-#: catalog/dependency.c:804 catalog/pg_shdepend.c:574
+#: catalog/dependency.c:803 catalog/pg_shdepend.c:576
 #, c-format
 msgid "cannot drop %s because it is required by the database system"
 msgstr "non è possibile eliminare %s perché richiesto dal sistema database"
 
-#: catalog/dependency.c:920
+#: catalog/dependency.c:919
 #, c-format
 msgid "drop auto-cascades to %s"
 msgstr "l'eliminazione elimina anche %s in cascata automatica"
 
-#: catalog/dependency.c:932 catalog/dependency.c:941
+#: catalog/dependency.c:931 catalog/dependency.c:940
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s dipende da %s"
 
-#: catalog/dependency.c:953 catalog/dependency.c:962
+#: catalog/dependency.c:952 catalog/dependency.c:961
 #, c-format
 msgid "drop cascades to %s"
 msgstr "l'eliminazione elimina anche %s in cascata"
 
-#: catalog/dependency.c:970 catalog/pg_shdepend.c:685
+#: catalog/dependency.c:969 catalog/pg_shdepend.c:687
 #, c-format
 msgid ""
 "\n"
@@ -3222,190 +3187,200 @@
 "\n"
 "e %d altri oggetti (vedere il log del server per la lista)"
 
-#: catalog/dependency.c:982
+#: catalog/dependency.c:981
 #, c-format
 msgid "cannot drop %s because other objects depend on it"
 msgstr "non è possibile eliminare %s perché altri oggetti dipendono da esso"
 
-#: catalog/dependency.c:986 catalog/dependency.c:993
+#: catalog/dependency.c:985 catalog/dependency.c:992
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
 msgstr "Usa DROP ... CASCADE per eliminare anche gli oggetti dipendenti."
 
-#: catalog/dependency.c:990
+#: catalog/dependency.c:989
 #, c-format
 msgid "cannot drop desired object(s) because other objects depend on them"
 msgstr "non è possibile eliminare gli oggetti desiderati perché altri oggetti dipendono da essi"
 
 #. translator: %d always has a value larger than 1
-#: catalog/dependency.c:999
+#: catalog/dependency.c:998
 #, c-format
 msgid "drop cascades to %d other object"
 msgid_plural "drop cascades to %d other objects"
 msgstr[0] "l'eliminazione elimina in cascata %d altro oggetto"
 msgstr[1] "l'eliminazione elimina in cascata %d altri oggetti"
 
-#: catalog/dependency.c:1622
+#: catalog/dependency.c:1621
 #, c-format
-msgid "constant of the type 'regrole' cannot be used here"
-msgstr "le costanti di tipo 'regrole' non possono essere usate qui"
+msgid "constant of the type \"regrole\" cannot be used here"
+msgstr "le costanti di tipo \"regrole\" non possono essere usate qui"
 
-#: catalog/heap.c:276
+#: catalog/heap.c:277
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "permesso di creare \"%s.%s\" negato"
 
-#: catalog/heap.c:278
+#: catalog/heap.c:279
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "Le modifiche al catalogo di sistema non sono attualmente consentite."
 
-#: catalog/heap.c:413 commands/tablecmds.c:1433 commands/tablecmds.c:1886
-#: commands/tablecmds.c:4789
+#: catalog/heap.c:414 commands/tablecmds.c:1435 commands/tablecmds.c:1888
+#: commands/tablecmds.c:4805
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "le tabelle possono avere al massimo %d colonne"
 
-#: catalog/heap.c:430 commands/tablecmds.c:5050
+#: catalog/heap.c:431 commands/tablecmds.c:5064
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr "il nome della colonna \"%s\" è in conflitto con il nome di una colonna di sistema"
 
-#: catalog/heap.c:446
+#: catalog/heap.c:447
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "nome di colonna \"%s\" specificato più di una volta"
 
-#: catalog/heap.c:496
+#: catalog/heap.c:497
 #, c-format
 msgid "column \"%s\" has type \"unknown\""
 msgstr "la colonna \"%s\" è di tipo \"unknown\""
 
-#: catalog/heap.c:497
+#: catalog/heap.c:498
 #, c-format
 msgid "Proceeding with relation creation anyway."
 msgstr "Si procede comunque alla creazione della relazione."
 
-#: catalog/heap.c:510
+#: catalog/heap.c:511
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "la colonna \"%s\" ha pseudo-tipo %s"
 
-#: catalog/heap.c:540
+#: catalog/heap.c:541
 #, c-format
 msgid "composite type %s cannot be made a member of itself"
 msgstr "il tipo composito %s non può essere fatto membro di sé stesso"
 
-#: catalog/heap.c:582 commands/createas.c:373
+#: catalog/heap.c:583 commands/createas.c:201 commands/createas.c:497
 #, c-format
 msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr "nessun ordinamento è stato derivato per la colonna \"%s\" con tipo ordinabile %s"
 
-#: catalog/heap.c:584 commands/createas.c:375 commands/indexcmds.c:1087
-#: commands/view.c:116 regex/regc_pg_locale.c:262 utils/adt/formatting.c:1514
-#: utils/adt/formatting.c:1566 utils/adt/formatting.c:1634
-#: utils/adt/formatting.c:1686 utils/adt/formatting.c:1755
-#: utils/adt/formatting.c:1819 utils/adt/like.c:212 utils/adt/selfuncs.c:5231
-#: utils/adt/varlena.c:1411 utils/adt/varlena.c:1800
+#: catalog/heap.c:585 commands/createas.c:204 commands/createas.c:500
+#: commands/indexcmds.c:1088 commands/view.c:103 regex/regc_pg_locale.c:262
+#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1754 utils/adt/formatting.c:1818 utils/adt/like.c:213
+#: utils/adt/selfuncs.c:5380 utils/adt/varlena.c:1411 utils/adt/varlena.c:1800
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "Usa la clausola COLLATE per impostare esplicitamente l'ordinamento."
 
-#: catalog/heap.c:1064 catalog/index.c:793 commands/tablecmds.c:2613
+#: catalog/heap.c:1066 catalog/index.c:793 commands/tablecmds.c:2615
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "la relazione \"%s\" esiste già"
 
-#: catalog/heap.c:1080 catalog/pg_type.c:412 catalog/pg_type.c:722
+#: catalog/heap.c:1082 catalog/pg_type.c:412 catalog/pg_type.c:722
 #: commands/typecmds.c:235 commands/typecmds.c:782 commands/typecmds.c:1133
 #: commands/typecmds.c:1355 commands/typecmds.c:2109
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "il tipo \"%s\" esiste già"
 
-#: catalog/heap.c:1081
+#: catalog/heap.c:1083
 #, 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 "Una relazione ha un tipo associato con lo stesso nome, quindi devi usare nomi che non siano in conflitto con alcun tipo esistente."
 
-#: catalog/heap.c:1109
+#: catalog/heap.c:1111
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "valore OID heap pg_class non impostato in modalità di aggiornamento binaria"
 
-#: catalog/heap.c:2289
+#: catalog/heap.c:2292
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "il vincolo di controllo \"%s\" esiste già"
 
-#: catalog/heap.c:2444 catalog/pg_constraint.c:652 commands/tablecmds.c:6038
+#: catalog/heap.c:2459 catalog/pg_constraint.c:652 commands/tablecmds.c:6039
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "il vincolo \"%s\" per la relazione \"%s\" esiste già"
 
-#: catalog/heap.c:2454
+#: catalog/heap.c:2466
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
-msgstr "il vincolo \"%s\" è in conflitto con il vincolo non ereditato sulla relazione \"%s\""
+msgstr "il vincolo \"%s\" è in conflitto con un vincolo non ereditato sulla relazione \"%s\""
+
+#: catalog/heap.c:2477
+#, c-format
+msgid "constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
+msgstr "il vincolo \"%s\" è in conflitto con un vincolo ereditato sulla relazione \"%s\""
+
+#: catalog/heap.c:2487
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
+msgstr "il vincolo \"%s\" è in conflitto con un vincolo non valido sulla relazione \"%s\""
 
-#: catalog/heap.c:2468
+#: catalog/heap.c:2492
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "unione del vincolo \"%s\" con una definizione ereditata"
 
-#: catalog/heap.c:2561
+#: catalog/heap.c:2598
 #, c-format
 msgid "cannot use column references in default expression"
 msgstr "non si possono usare riferimenti a colonne nell'espressione predefinita"
 
-#: catalog/heap.c:2572
+#: catalog/heap.c:2609
 #, c-format
 msgid "default expression must not return a set"
 msgstr "le espressioni predefinite non devono restituire un insieme"
 
-#: catalog/heap.c:2591 rewrite/rewriteHandler.c:1077
+#: catalog/heap.c:2628 rewrite/rewriteHandler.c:1077
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "la colonna \"%s\" è di tipo %s ma l'espressione predefinita è di tipo %s"
 
-#: catalog/heap.c:2596 commands/prepare.c:374 parser/parse_node.c:411
-#: parser/parse_target.c:528 parser/parse_target.c:778
-#: parser/parse_target.c:788 rewrite/rewriteHandler.c:1082
+#: catalog/heap.c:2633 commands/prepare.c:374 parser/parse_node.c:411
+#: parser/parse_target.c:539 parser/parse_target.c:789
+#: parser/parse_target.c:799 rewrite/rewriteHandler.c:1082
 #, c-format
 msgid "You will need to rewrite or cast the expression."
 msgstr "Devi riscrivere o convertire il tipo dell'espressione"
 
-#: catalog/heap.c:2643
+#: catalog/heap.c:2680
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "solo la tabella \"%s\" può essere referenziata nel vincolo di controllo"
 
-#: catalog/heap.c:2883
+#: catalog/heap.c:2920
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "la combinazione di COMMIT con una chiave esterna non è supportata"
 
-#: catalog/heap.c:2884
+#: catalog/heap.c:2921
 #, c-format
 msgid "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting."
 msgstr "La tabella \"%s\" referenzia \"%s\", ma non hanno la stessa impostazione ON COMMIT."
 
-#: catalog/heap.c:2889
+#: catalog/heap.c:2926
 #, c-format
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr "non è possibile troncare una tabella referenziata da un vincolo di chiave esterna"
 
-#: catalog/heap.c:2890
+#: catalog/heap.c:2927
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "La tabella \"%s\" referenzia \"%s\"."
 
-#: catalog/heap.c:2892
+#: catalog/heap.c:2929
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr "Troncare la tabella \"%s\" nello stesso tempo o usare TRUNCATE ... CASCADE."
 
-#: catalog/index.c:205 parser/parse_utilcmd.c:1436 parser/parse_utilcmd.c:1522
+#: catalog/index.c:205 parser/parse_utilcmd.c:1438 parser/parse_utilcmd.c:1524
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "non è possibile avere più di una chiave primaria per la tabella \"%s\""
@@ -3430,7 +3405,7 @@
 msgid "shared indexes cannot be created after initdb"
 msgstr "indici condivisi non possono essere creati dopo initdb"
 
-#: catalog/index.c:785 commands/createas.c:100 commands/sequence.c:141
+#: catalog/index.c:785 commands/createas.c:249 commands/sequence.c:141
 #: parser/parse_utilcmd.c:185
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
@@ -3461,8 +3436,8 @@
 msgid "index \"%s\" was reindexed"
 msgstr "l'indice \"%s\" è stato reindicizzato"
 
-#: catalog/index.c:3389 commands/vacuumlazy.c:1131 commands/vacuumlazy.c:1207
-#: commands/vacuumlazy.c:1374 commands/vacuumlazy.c:1546
+#: catalog/index.c:3389 commands/vacuumlazy.c:1142 commands/vacuumlazy.c:1218
+#: commands/vacuumlazy.c:1385 commands/vacuumlazy.c:1557
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -3488,19 +3463,19 @@
 msgid "could not obtain lock on relation \"%s\""
 msgstr "lock della relazione \"%s\" fallito"
 
-#: catalog/namespace.c:414 parser/parse_relation.c:1131
+#: catalog/namespace.c:414 parser/parse_relation.c:1138
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "la relazione \"%s.%s\" non esiste"
 
-#: catalog/namespace.c:419 parser/parse_relation.c:1144
-#: parser/parse_relation.c:1152 utils/adt/regproc.c:1035
+#: catalog/namespace.c:419 parser/parse_relation.c:1151
+#: parser/parse_relation.c:1159 utils/adt/regproc.c:1034
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "la relazione \"%s\" non esiste"
 
-#: catalog/namespace.c:487 catalog/namespace.c:2852 commands/extension.c:1394
-#: commands/extension.c:1400
+#: catalog/namespace.c:487 catalog/namespace.c:2852 commands/extension.c:1397
+#: commands/extension.c:1403
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "nessuna schema selezionato per crearci dentro"
@@ -3541,13 +3516,13 @@
 msgid "text search configuration \"%s\" does not exist"
 msgstr "la configurazione di ricerca di testo \"%s\" non esiste"
 
-#: catalog/namespace.c:2646 parser/parse_expr.c:789 parser/parse_target.c:1130
+#: catalog/namespace.c:2646 parser/parse_expr.c:789 parser/parse_target.c:1141
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "i riferimenti tra database diversi non sono implementati: %s"
 
-#: catalog/namespace.c:2652 parser/parse_expr.c:796 parser/parse_target.c:1137
-#: gram.y:13339 gram.y:14693
+#: catalog/namespace.c:2652 parser/parse_expr.c:796 parser/parse_target.c:1148
+#: gram.y:13309 gram.y:14675
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "nome qualificato improprio (troppi nomi puntati): %s"
@@ -3567,8 +3542,8 @@
 msgid "cannot move objects into or out of TOAST schema"
 msgstr "non posso spostare oggetti dentro o fuori lo schema TOAST"
 
-#: catalog/namespace.c:2873 commands/schemacmds.c:238
-#: commands/schemacmds.c:317 commands/tablecmds.c:735
+#: catalog/namespace.c:2873 commands/schemacmds.c:238 commands/schemacmds.c:317
+#: commands/tablecmds.c:737
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "lo schema \"%s\" non esiste"
@@ -3603,8 +3578,8 @@
 msgid "cannot create temporary tables in parallel mode"
 msgstr "non è possibile creare tabelle temporanee in modalità parallela"
 
-#: catalog/namespace.c:3898 commands/tablespace.c:1158 commands/variable.c:62
-#: replication/syncrep.c:700 utils/misc/guc.c:9654
+#: catalog/namespace.c:3898 commands/tablespace.c:1173 commands/variable.c:63
+#: replication/syncrep.c:692 utils/misc/guc.c:9667
 #, c-format
 msgid "List syntax is invalid."
 msgstr "La sintassi della lista non è valida."
@@ -3613,7 +3588,7 @@
 msgid "database name cannot be qualified"
 msgstr "il nome del database non può essere qualificato"
 
-#: catalog/objectaddress.c:1024 commands/extension.c:2423
+#: catalog/objectaddress.c:1024 commands/extension.c:2426
 #, c-format
 msgid "extension name cannot be qualified"
 msgstr "il nome dell'estensione non può essere qualificato"
@@ -3647,26 +3622,27 @@
 msgstr "il nome del trigger di evento non può essere qualificato"
 
 #: catalog/objectaddress.c:1158 commands/lockcmds.c:94 commands/policy.c:94
-#: commands/policy.c:422 commands/tablecmds.c:214 commands/tablecmds.c:1294
-#: commands/tablecmds.c:4323 commands/tablecmds.c:7956
+#: commands/policy.c:384 commands/policy.c:473 commands/tablecmds.c:216
+#: commands/tablecmds.c:1296 commands/tablecmds.c:4339
+#: commands/tablecmds.c:7988
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "\"%s\" non è una tabella"
 
-#: catalog/objectaddress.c:1165 commands/tablecmds.c:226
-#: commands/tablecmds.c:4347 commands/tablecmds.c:11913 commands/view.c:155
+#: catalog/objectaddress.c:1165 commands/tablecmds.c:228
+#: commands/tablecmds.c:4369 commands/tablecmds.c:12123 commands/view.c:141
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "\"%s\" non è una vista"
 
-#: catalog/objectaddress.c:1172 commands/matview.c:174
-#: commands/tablecmds.c:232 commands/tablecmds.c:11918
+#: catalog/objectaddress.c:1172 commands/matview.c:174 commands/tablecmds.c:234
+#: commands/tablecmds.c:12128
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "\"%s\" non è una vista materializzata"
 
-#: catalog/objectaddress.c:1179 commands/tablecmds.c:250
-#: commands/tablecmds.c:4350 commands/tablecmds.c:11923
+#: catalog/objectaddress.c:1179 commands/tablecmds.c:252
+#: commands/tablecmds.c:4372 commands/tablecmds.c:12133
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "\"%s\" non è una tabella esterna"
@@ -3682,9 +3658,9 @@
 msgstr "il valore di default per la colonna \"%s\" della relazione \"%s\" non esiste"
 
 #: catalog/objectaddress.c:1460 commands/functioncmds.c:128
-#: commands/tablecmds.c:242 commands/typecmds.c:3210 parser/parse_type.c:227
-#: parser/parse_type.c:256 parser/parse_type.c:824 utils/adt/acl.c:4373
-#: utils/adt/regproc.c:1226
+#: commands/tablecmds.c:244 commands/typecmds.c:3210 parser/parse_type.c:226
+#: parser/parse_type.c:255 parser/parse_type.c:795 utils/adt/acl.c:4373
+#: utils/adt/regproc.c:1225
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "il tipo \"%s\" non esiste"
@@ -3694,165 +3670,160 @@
 msgid "operator %d (%s, %s) of %s does not exist"
 msgstr "l'operatore %d (%s, %s) di %s non esiste"
 
-#: catalog/objectaddress.c:1606
+#: catalog/objectaddress.c:1608
 #, c-format
 msgid "function %d (%s, %s) of %s does not exist"
 msgstr "la funzione %d (%s, %s) di %s non esiste"
 
-#: catalog/objectaddress.c:1655 catalog/objectaddress.c:1681
+#: catalog/objectaddress.c:1659 catalog/objectaddress.c:1685
 #, c-format
-msgid "user mapping for user \"%s\" in server \"%s\" does not exist"
-msgstr "la mappatura per l'utente \"%s\" nel server \"%s\" non esiste"
+msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
+msgstr "la mappatura per l'utente \"%s\" sul server \"%s\" non esiste"
 
-#: catalog/objectaddress.c:1670 commands/foreigncmds.c:430
-#: commands/foreigncmds.c:997 commands/foreigncmds.c:1359
-#: foreign/foreign.c:691
+#: catalog/objectaddress.c:1674 commands/foreigncmds.c:430
+#: commands/foreigncmds.c:997 commands/foreigncmds.c:1359 foreign/foreign.c:691
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "il server \"%s\" non esiste"
 
-#: catalog/objectaddress.c:1742
+#: catalog/objectaddress.c:1746
 #, c-format
 msgid "unrecognized default ACL object type %c"
 msgstr "tipo di oggetto ACL di default %c non riconosciuto"
 
-#: catalog/objectaddress.c:1743
+#: catalog/objectaddress.c:1747
 #, c-format
-msgid "Valid object types are 'r', 'S', 'f', and 'T'."
-msgstr "I tipi di oggetti validi sono 'r', 'S', 'f' e 'T'"
+msgid "Valid object types are \"r\", \"S\", \"f\", and \"T\"."
+msgstr "I tipi di oggetti validi sono \"r\", \"S\", \"f\" e \"T\""
 
-#: catalog/objectaddress.c:1789
+#: catalog/objectaddress.c:1793
 #, c-format
 msgid "default ACL for user \"%s\" in schema \"%s\" on %s does not exist"
 msgstr "l'ACL di default per l'utente \"%s\" nello schema \"%s\" su %s non esiste"
 
-#: catalog/objectaddress.c:1794
+#: catalog/objectaddress.c:1798
 #, c-format
 msgid "default ACL for user \"%s\" on %s does not exist"
 msgstr "l'ACL di default per l'utente \"%s\" su %s non esiste"
 
-#: catalog/objectaddress.c:1821 catalog/objectaddress.c:1877
-#: catalog/objectaddress.c:1932
+#: catalog/objectaddress.c:1825 catalog/objectaddress.c:1881
+#: catalog/objectaddress.c:1936
 #, c-format
 msgid "name or argument lists may not contain nulls"
 msgstr "il nome o la lista di argomenti non può contenere valori nulli"
 
-#: catalog/objectaddress.c:1853
+#: catalog/objectaddress.c:1857
 #, c-format
 msgid "unsupported object type \"%s\""
 msgstr "tipo di oggetto \"%s\" non supportato"
 
-#: catalog/objectaddress.c:1873 catalog/objectaddress.c:1891
+#: catalog/objectaddress.c:1877 catalog/objectaddress.c:1895
 #, c-format
 msgid "name list length must be exactly %d"
 msgstr "la lunghezza della lista dei nomi dev'essere %d"
 
-#: catalog/objectaddress.c:1895
+#: catalog/objectaddress.c:1899
 #, c-format
 msgid "large object OID may not be null"
 msgstr "l'OID di large object non può essere nullo"
 
-#: catalog/objectaddress.c:1904
+#: catalog/objectaddress.c:1908 catalog/objectaddress.c:1968
+#: catalog/objectaddress.c:1975
 #, c-format
-msgid "name list must be of length at least %d"
-msgstr "la lunghezza della lista dei nomi dev'essere almeno %d"
+msgid "name list length must be at least %d"
+msgstr "la lunghezza della lista dei nomi deve essere almeno %d"
 
-#: catalog/objectaddress.c:1957 catalog/objectaddress.c:1977
+#: catalog/objectaddress.c:1961 catalog/objectaddress.c:1981
 #, c-format
 msgid "argument list length must be exactly %d"
 msgstr "la lunghezza della lista degli argomenti deve essere %d"
 
-#: catalog/objectaddress.c:1964 catalog/objectaddress.c:1971
-#, c-format
-msgid "name list length must be at least %d"
-msgstr "la lunghezza della lista dei nomi deve essere almeno %d"
-
-#: catalog/objectaddress.c:2113 libpq/be-fsstubs.c:352
+#: catalog/objectaddress.c:2117 libpq/be-fsstubs.c:352
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "occorre essere proprietari del large object %u"
 
-#: catalog/objectaddress.c:2128 commands/functioncmds.c:1386
+#: catalog/objectaddress.c:2132 commands/functioncmds.c:1386
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr "occorre essere proprietari del tipo %s o del tipo %s"
 
-#: catalog/objectaddress.c:2168 catalog/objectaddress.c:2184
+#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2188
 #, c-format
 msgid "must be superuser"
 msgstr "occorre essere superutenti"
 
-#: catalog/objectaddress.c:2175
+#: catalog/objectaddress.c:2179
 #, c-format
 msgid "must have CREATEROLE privilege"
 msgstr "occorre avere privilegio CREATEROLE"
 
-#: catalog/objectaddress.c:2254
+#: catalog/objectaddress.c:2253
 #, c-format
 msgid "unrecognized object type \"%s\""
 msgstr "tipo di oggetto \"%s\" non riconosciuto"
 
-#: catalog/objectaddress.c:2449
+#: catalog/objectaddress.c:2448
 #, c-format
 msgid " column %s"
 msgstr " colonna %s"
 
-#: catalog/objectaddress.c:2455
+#: catalog/objectaddress.c:2454
 #, c-format
 msgid "function %s"
 msgstr "funzione %s"
 
-#: catalog/objectaddress.c:2460
+#: catalog/objectaddress.c:2459
 #, c-format
 msgid "type %s"
 msgstr "tipo %s"
 
-#: catalog/objectaddress.c:2490
+#: catalog/objectaddress.c:2489
 #, c-format
 msgid "cast from %s to %s"
 msgstr "conversione da %s a %s"
 
-#: catalog/objectaddress.c:2510
+#: catalog/objectaddress.c:2509
 #, c-format
 msgid "collation %s"
 msgstr "ordinamento %s"
 
-#: catalog/objectaddress.c:2534
+#: catalog/objectaddress.c:2533
 #, c-format
 msgid "constraint %s on %s"
 msgstr "vincolo %s su %s"
 
-#: catalog/objectaddress.c:2540
+#: catalog/objectaddress.c:2539
 #, c-format
 msgid "constraint %s"
 msgstr "vincolo %s"
 
-#: catalog/objectaddress.c:2557
+#: catalog/objectaddress.c:2556
 #, c-format
 msgid "conversion %s"
 msgstr "conversione %s"
 
-#: catalog/objectaddress.c:2594
+#: catalog/objectaddress.c:2593
 #, c-format
 msgid "default for %s"
 msgstr "predefinito per %s"
 
-#: catalog/objectaddress.c:2603
+#: catalog/objectaddress.c:2602
 #, c-format
 msgid "language %s"
 msgstr "linguaggio %s"
 
-#: catalog/objectaddress.c:2608
+#: catalog/objectaddress.c:2607
 #, c-format
 msgid "large object %u"
 msgstr "large object %u"
 
-#: catalog/objectaddress.c:2613
+#: catalog/objectaddress.c:2612
 #, c-format
 msgid "operator %s"
 msgstr "operatore %s"
 
-#: catalog/objectaddress.c:2645
+#: catalog/objectaddress.c:2644
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "classe di operatori %s per il metodo di accesso %s"
@@ -3861,7 +3832,7 @@
 #. 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/objectaddress.c:2695
+#: catalog/objectaddress.c:2694
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "operatore %d (%s, %s) della %s: %s"
@@ -3870,172 +3841,172 @@
 #. 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/objectaddress.c:2745
+#: catalog/objectaddress.c:2744
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "funzione %d (%s, %s) della %s: %s"
 
-#: catalog/objectaddress.c:2785
+#: catalog/objectaddress.c:2784
 #, c-format
 msgid "rule %s on "
 msgstr "regola %s on "
 
-#: catalog/objectaddress.c:2807
+#: catalog/objectaddress.c:2806
 #, c-format
 msgid "transform for %s language %s"
 msgstr "trasformazione per %s linguaggio %s"
 
-#: catalog/objectaddress.c:2841
+#: catalog/objectaddress.c:2840
 #, c-format
 msgid "trigger %s on "
 msgstr "trigger %s su "
 
-#: catalog/objectaddress.c:2858
+#: catalog/objectaddress.c:2857
 #, c-format
 msgid "schema %s"
 msgstr "schema %s"
 
-#: catalog/objectaddress.c:2871
+#: catalog/objectaddress.c:2870
 #, c-format
 msgid "text search parser %s"
 msgstr "analizzatore di ricerca di testo %s"
 
-#: catalog/objectaddress.c:2886
+#: catalog/objectaddress.c:2885
 #, c-format
 msgid "text search dictionary %s"
 msgstr "dizionario di ricerca di testo %s"
 
-#: catalog/objectaddress.c:2901
+#: catalog/objectaddress.c:2900
 #, c-format
 msgid "text search template %s"
 msgstr "modello di ricerca di testo %s"
 
-#: catalog/objectaddress.c:2916
+#: catalog/objectaddress.c:2915
 #, c-format
 msgid "text search configuration %s"
 msgstr "configurazione di ricerca di testo %s"
 
-#: catalog/objectaddress.c:2924
+#: catalog/objectaddress.c:2923
 #, c-format
 msgid "role %s"
 msgstr "regola %s"
 
-#: catalog/objectaddress.c:2937
+#: catalog/objectaddress.c:2936
 #, c-format
 msgid "database %s"
 msgstr "database %s"
 
-#: catalog/objectaddress.c:2949
+#: catalog/objectaddress.c:2948
 #, c-format
 msgid "tablespace %s"
 msgstr "tablespace %s"
 
-#: catalog/objectaddress.c:2958
+#: catalog/objectaddress.c:2957
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "wrapper di dati esterni %s"
 
-#: catalog/objectaddress.c:2967
+#: catalog/objectaddress.c:2966
 #, c-format
 msgid "server %s"
 msgstr "server %s"
 
-#: catalog/objectaddress.c:2995
+#: catalog/objectaddress.c:2994
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "mappatura utenti per %s sul server %s"
 
-#: catalog/objectaddress.c:3030
+#: catalog/objectaddress.c:3029
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "privilegi predefiniti sulle nuove relazioni appartenenti al ruolo %s"
 
-#: catalog/objectaddress.c:3035
+#: catalog/objectaddress.c:3034
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr "privilegi predefiniti sulle nuove sequenze appartenenti al ruolo %s"
 
-#: catalog/objectaddress.c:3040
+#: catalog/objectaddress.c:3039
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "privilegi predefiniti sulle nuove funzioni appartenenti al ruolo %s"
 
-#: catalog/objectaddress.c:3045
+#: catalog/objectaddress.c:3044
 #, c-format
 msgid "default privileges on new types belonging to role %s"
 msgstr "privilegi predefiniti sui nuovi tipi appartenenti al ruolo %s"
 
-#: catalog/objectaddress.c:3051
+#: catalog/objectaddress.c:3050
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "privilegi predefiniti appartenenti al ruolo %s"
 
-#: catalog/objectaddress.c:3059
+#: catalog/objectaddress.c:3058
 #, c-format
 msgid " in schema %s"
 msgstr " nello schema %s"
 
-#: catalog/objectaddress.c:3076
+#: catalog/objectaddress.c:3075
 #, c-format
 msgid "extension %s"
 msgstr "estensione %s"
 
-#: catalog/objectaddress.c:3089
+#: catalog/objectaddress.c:3088
 #, c-format
 msgid "event trigger %s"
 msgstr "trigger di evento %s"
 
-#: catalog/objectaddress.c:3121
+#: catalog/objectaddress.c:3120
 #, c-format
 msgid "policy %s on "
-msgstr "politica %s su "
+msgstr "regola di sicurezza %s su "
 
-#: catalog/objectaddress.c:3184
+#: catalog/objectaddress.c:3183
 #, c-format
 msgid "table %s"
 msgstr "tabella %s"
 
-#: catalog/objectaddress.c:3188
+#: catalog/objectaddress.c:3187
 #, c-format
 msgid "index %s"
 msgstr "indice %s"
 
-#: catalog/objectaddress.c:3192
+#: catalog/objectaddress.c:3191
 #, c-format
 msgid "sequence %s"
 msgstr "sequenza %s"
 
-#: catalog/objectaddress.c:3196
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "toast table %s"
 msgstr "tabella toast %s"
 
-#: catalog/objectaddress.c:3200
+#: catalog/objectaddress.c:3199
 #, c-format
 msgid "view %s"
 msgstr "vista %s"
 
-#: catalog/objectaddress.c:3204
+#: catalog/objectaddress.c:3203
 #, c-format
 msgid "materialized view %s"
 msgstr "vista materializzata %s"
 
-#: catalog/objectaddress.c:3208
+#: catalog/objectaddress.c:3207
 #, c-format
 msgid "composite type %s"
 msgstr "tipo composito %s"
 
-#: catalog/objectaddress.c:3212
+#: catalog/objectaddress.c:3211
 #, c-format
 msgid "foreign table %s"
 msgstr "tabella esterna %s"
 
-#: catalog/objectaddress.c:3217
+#: catalog/objectaddress.c:3216
 #, c-format
 msgid "relation %s"
 msgstr "relazione %s"
 
-#: catalog/objectaddress.c:3254
+#: catalog/objectaddress.c:3253
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "famiglia di operatori %s per il metodo d'accesso %s"
@@ -4082,7 +4053,7 @@
 msgid "return type of inverse transition function %s is not %s"
 msgstr "il tipo restituito dalla funzione di transizione inversa %s non è %s"
 
-#: catalog/pg_aggregate.c:344 executor/nodeWindowAgg.c:2305
+#: catalog/pg_aggregate.c:344 executor/nodeWindowAgg.c:2335
 #, c-format
 msgid "strictness of aggregate's forward and inverse transition functions must match"
 msgstr "le ristrettezze della trasformazione diretta ed inversa di un aggregato devono combaciare"
@@ -4122,12 +4093,12 @@
 msgid "sort operator can only be specified for single-argument aggregates"
 msgstr "l'operatore di ordinamento può essere specificato sono per aggregati con un solo argomento"
 
-#: catalog/pg_aggregate.c:700 commands/typecmds.c:1702
-#: commands/typecmds.c:1753 commands/typecmds.c:1784 commands/typecmds.c:1807
-#: commands/typecmds.c:1828 commands/typecmds.c:1855 commands/typecmds.c:1882
-#: commands/typecmds.c:1959 commands/typecmds.c:2001 parser/parse_func.c:364
-#: parser/parse_func.c:393 parser/parse_func.c:418 parser/parse_func.c:432
-#: parser/parse_func.c:507 parser/parse_func.c:518 parser/parse_func.c:1920
+#: catalog/pg_aggregate.c:700 commands/typecmds.c:1702 commands/typecmds.c:1753
+#: commands/typecmds.c:1784 commands/typecmds.c:1807 commands/typecmds.c:1828
+#: commands/typecmds.c:1855 commands/typecmds.c:1882 commands/typecmds.c:1959
+#: commands/typecmds.c:2001 parser/parse_func.c:364 parser/parse_func.c:393
+#: parser/parse_func.c:418 parser/parse_func.c:432 parser/parse_func.c:507
+#: parser/parse_func.c:518 parser/parse_func.c:1920
 #, c-format
 msgid "function %s does not exist"
 msgstr "la funzione %s non esiste"
@@ -4162,22 +4133,22 @@
 msgid "constraint \"%s\" for domain %s already exists"
 msgstr "il vincolo \"%s\" per il dominio %s esiste già"
 
-#: catalog/pg_constraint.c:813
+#: catalog/pg_constraint.c:794
 #, c-format
 msgid "table \"%s\" has multiple constraints named \"%s\""
 msgstr "la tabella \"%s\" ha più di un vincolo di nome \"%s\""
 
-#: catalog/pg_constraint.c:825
+#: catalog/pg_constraint.c:806
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "il vincolo \"%s\" per la tabella \"%s\" non esiste"
 
-#: catalog/pg_constraint.c:871
+#: catalog/pg_constraint.c:852
 #, c-format
 msgid "domain \"%s\" has multiple constraints named \"%s\""
 msgstr "il dominio \"%s\" ha più di un vincolo di nome \"%s\""
 
-#: catalog/pg_constraint.c:883
+#: catalog/pg_constraint.c:864
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" does not exist"
 msgstr "il vincolo \"%s\" per la il dominio \"%s\" non esiste"
@@ -4192,7 +4163,7 @@
 msgid "default conversion for %s to %s already exists"
 msgstr "la conversione predefinita da %s a %s esiste già"
 
-#: catalog/pg_depend.c:165 commands/extension.c:2945
+#: catalog/pg_depend.c:165 commands/extension.c:2948
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "%s fa già parte dell'estensione \"%s\""
@@ -4242,62 +4213,62 @@
 msgid "schema \"%s\" already exists"
 msgstr "lo schema \"%s\" esiste già"
 
-#: catalog/pg_operator.c:222 catalog/pg_operator.c:363
+#: catalog/pg_operator.c:223 catalog/pg_operator.c:364
 #, c-format
 msgid "\"%s\" is not a valid operator name"
 msgstr "\"%s\" non è un nome di operatore valido"
 
-#: catalog/pg_operator.c:372
+#: catalog/pg_operator.c:373
 #, c-format
 msgid "only binary operators can have commutators"
 msgstr "solo gli operatori binari possono avere commutatori"
 
-#: catalog/pg_operator.c:376 commands/operatorcmds.c:464
+#: catalog/pg_operator.c:377
 #, c-format
 msgid "only binary operators can have join selectivity"
 msgstr "solo gli operatori binari possono avere selettività di unione"
 
-#: catalog/pg_operator.c:380
+#: catalog/pg_operator.c:381
 #, c-format
 msgid "only binary operators can merge join"
 msgstr "solo gli operatori binari possono fare dei merge-join"
 
-#: catalog/pg_operator.c:384
+#: catalog/pg_operator.c:385
 #, c-format
 msgid "only binary operators can hash"
 msgstr "solo gli operatori binari possono supportare l'hash"
 
-#: catalog/pg_operator.c:395
+#: catalog/pg_operator.c:396
 #, c-format
 msgid "only boolean operators can have negators"
 msgstr "solo gli operatori booleani possono avere un negatore"
 
-#: catalog/pg_operator.c:399 commands/operatorcmds.c:472
+#: catalog/pg_operator.c:400
 #, c-format
 msgid "only boolean operators can have restriction selectivity"
 msgstr "solo gli operatori booleani possono avere restrizione di selettività"
 
-#: catalog/pg_operator.c:403 commands/operatorcmds.c:476
+#: catalog/pg_operator.c:404
 #, c-format
 msgid "only boolean operators can have join selectivity"
 msgstr "solo gli operatori booleani possono avere selettività di unione"
 
-#: catalog/pg_operator.c:407
+#: catalog/pg_operator.c:408
 #, c-format
 msgid "only boolean operators can merge join"
 msgstr "solo gli operatori booleani possono fare dei merge-join"
 
-#: catalog/pg_operator.c:411
+#: catalog/pg_operator.c:412
 #, c-format
 msgid "only boolean operators can hash"
 msgstr "solo gli operatori booleani possono supportare l'hash"
 
-#: catalog/pg_operator.c:423
+#: catalog/pg_operator.c:424
 #, c-format
 msgid "operator %s already exists"
 msgstr "l'operatore %s esiste già "
 
-#: catalog/pg_operator.c:616
+#: catalog/pg_operator.c:617
 #, c-format
 msgid "operator cannot be its own negator or sort operator"
 msgstr "l'operatore non può negare o ordinare se stesso"
@@ -4395,12 +4366,12 @@
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "le funzioni SQL non possono avere argomenti di tipo %s"
 
-#: catalog/pg_proc.c:971 executor/functions.c:1421
+#: catalog/pg_proc.c:971 executor/functions.c:1430
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "funzione SQL \"%s\""
 
-#: catalog/pg_shdepend.c:692
+#: catalog/pg_shdepend.c:694
 #, c-format
 msgid ""
 "\n"
@@ -4415,50 +4386,50 @@
 "\n"
 "ed oggetti in %d altri database (guarda il log per la lista)"
 
-#: catalog/pg_shdepend.c:1004
+#: catalog/pg_shdepend.c:1006
 #, c-format
 msgid "role %u was concurrently dropped"
 msgstr "la regola %u è stata eliminata concorrentemente"
 
-#: catalog/pg_shdepend.c:1023
+#: catalog/pg_shdepend.c:1025
 #, c-format
 msgid "tablespace %u was concurrently dropped"
 msgstr "Il tablespace %u è stato eliminato concorrentemente"
 
-#: catalog/pg_shdepend.c:1038
+#: catalog/pg_shdepend.c:1040
 #, c-format
 msgid "database %u was concurrently dropped"
 msgstr "Il database %u è stato eliminato concorrentemente"
 
-#: catalog/pg_shdepend.c:1083
+#: catalog/pg_shdepend.c:1085
 #, c-format
 msgid "owner of %s"
 msgstr "proprietario di %s"
 
-#: catalog/pg_shdepend.c:1085
+#: catalog/pg_shdepend.c:1087
 #, c-format
 msgid "privileges for %s"
 msgstr "privilegi per %s"
 
-#: catalog/pg_shdepend.c:1087
+#: catalog/pg_shdepend.c:1089
 #, c-format
 msgid "target of %s"
-msgstr "obiettivo di %s"
+msgstr "destinazione di %s"
 
 #. translator: %s will always be "database %s"
-#: catalog/pg_shdepend.c:1095
+#: catalog/pg_shdepend.c:1097
 #, c-format
 msgid "%d object in %s"
 msgid_plural "%d objects in %s"
 msgstr[0] "%d oggetto nel %s"
 msgstr[1] "%d oggetti nel %s"
 
-#: catalog/pg_shdepend.c:1206
+#: catalog/pg_shdepend.c:1208
 #, c-format
 msgid "cannot drop objects owned by %s because they are required by the database system"
 msgstr "non è possibile eliminare oggetti di proprietà di %s perché richiesti dal database"
 
-#: catalog/pg_shdepend.c:1309
+#: catalog/pg_shdepend.c:1323
 #, c-format
 msgid "cannot reassign ownership of objects owned by %s because they are required by the database system"
 msgstr "non è possibile modificare il proprietario degli oggetti di proprietà di %s perché richiesti dal database"
@@ -4499,8 +4470,8 @@
 msgid "could not form array type name for type \"%s\""
 msgstr "creazione del nome per il tipo array del tipo \"%s\" fallita"
 
-#: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4332
-#: commands/tablecmds.c:11801
+#: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4351
+#: commands/tablecmds.c:12011
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "\"%s\" non è una tabella né una vista materializzata"
@@ -4675,66 +4646,66 @@
 msgid "analyzing \"%s.%s\""
 msgstr "analisi di \"%s.%s\""
 
-#: commands/analyze.c:645
+#: commands/analyze.c:648
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
 msgstr "analisi automatica della tabella \"%s.%s.%s\" uso del sistema: %s"
 
-#: commands/analyze.c:1201
+#: commands/analyze.c:1204
 #, 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\": esaminate %d pagine su %u, contenenti %.0f righe vive e %.0f righe morte; %d righe nel campione, %.0f righe totali stimate"
 
-#: commands/analyze.c:1280
+#: commands/analyze.c:1283
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no child tables"
 msgstr "analyze dell'albero di ereditarietà \"%s.%s\" saltato --- questo albero non ha tabelle figlie"
 
-#: commands/analyze.c:1369
+#: commands/analyze.c:1372
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no analyzable child tables"
 msgstr "analyze dell'albero di ereditarietà \"%s.%s\" saltato --- questo albero non ha tabelle figlie analizzabili"
 
-#: commands/analyze.c:1417 executor/execQual.c:2900
+#: commands/analyze.c:1420 commands/tablecmds.c:8050 executor/execQual.c:2900
 msgid "could not convert row type"
 msgstr "conversione del tipo riga fallita"
 
-#: commands/async.c:544
+#: commands/async.c:553
 #, c-format
 msgid "channel name cannot be empty"
 msgstr "Il nome del canale non può essere vuoto"
 
-#: commands/async.c:549
+#: commands/async.c:558
 #, c-format
 msgid "channel name too long"
 msgstr "il nome del canale è troppo lungo"
 
-#: commands/async.c:556
+#: commands/async.c:565
 #, c-format
 msgid "payload string too long"
 msgstr "la stringa del carico è troppo lunga"
 
-#: commands/async.c:742
+#: commands/async.c:751
 #, c-format
 msgid "cannot PREPARE a transaction that has executed LISTEN, UNLISTEN, or NOTIFY"
 msgstr "non è possibile eseguire PREPARE in una transazione che ha eseguito LISTEN, UNLISTEN o NOTIFY"
 
-#: commands/async.c:845
+#: commands/async.c:854
 #, c-format
 msgid "too many notifications in the NOTIFY queue"
 msgstr "troppe notifiche nella coda di NOTIFY"
 
-#: commands/async.c:1445
+#: commands/async.c:1457
 #, c-format
 msgid "NOTIFY queue is %.0f%% full"
 msgstr "la coda di NOTIFY è piena al %.0f%%"
 
-#: commands/async.c:1447
+#: commands/async.c:1459
 #, c-format
 msgid "The server process with PID %d is among those with the oldest transactions."
 msgstr "Il processo server con PID %d è tra quelli con le transazioni più vecchie."
 
-#: commands/async.c:1450
+#: commands/async.c:1462
 #, c-format
 msgid "The NOTIFY queue cannot be emptied until that process ends its current transaction."
 msgstr "La coda di NOTIFY non può essere svuotata finché quel processo non avrà terminato la sua transazione corrente."
@@ -4749,7 +4720,7 @@
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "non esiste un indice già raggruppato per la tabella \"%s\""
 
-#: commands/cluster.c:171 commands/tablecmds.c:9246 commands/tablecmds.c:10943
+#: commands/cluster.c:171 commands/tablecmds.c:9354 commands/tablecmds.c:11114
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "l'indice \"%s\" per la tabella \"%s\" non esiste"
@@ -4764,7 +4735,7 @@
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "non è possibile ripulire tabelle temporanee di altre sessioni"
 
-#: commands/cluster.c:431 commands/tablecmds.c:10953
+#: commands/cluster.c:431 commands/tablecmds.c:11124
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "\"%s\" non è un indice per la tabella \"%s\""
@@ -4784,27 +4755,27 @@
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "non è possibile raggruppare sull'indice non valido \"%s\""
 
-#: commands/cluster.c:918
+#: commands/cluster.c:920
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
 msgstr "raggruppamento di \"%s.%s\" usando una scansione sull'indice \"%s\""
 
-#: commands/cluster.c:924
+#: commands/cluster.c:926
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr "raggruppamento di \"%s.%s\" usando una scansione sequenziale e ordinamento"
 
-#: commands/cluster.c:929 commands/vacuumlazy.c:464
+#: commands/cluster.c:931 commands/vacuumlazy.c:469
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "pulizia di \"%s.%s\""
 
-#: commands/cluster.c:1088
+#: commands/cluster.c:1090
 #, c-format
 msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
 msgstr "\"%s\": trovate %.0f versioni di riga removibili, %.0f non removibili in %u pagine"
 
-#: commands/cluster.c:1092
+#: commands/cluster.c:1094
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -4841,8 +4812,8 @@
 #: commands/comment.c:62 commands/dbcommands.c:797 commands/dbcommands.c:962
 #: commands/dbcommands.c:1067 commands/dbcommands.c:1257
 #: commands/dbcommands.c:1477 commands/dbcommands.c:1594
-#: commands/dbcommands.c:2011 utils/init/postinit.c:839
-#: utils/init/postinit.c:941 utils/init/postinit.c:958
+#: commands/dbcommands.c:2011 utils/init/postinit.c:826
+#: utils/init/postinit.c:928 utils/init/postinit.c:945
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "il database \"%s\" non esiste"
@@ -4852,12 +4823,12 @@
 msgid "\"%s\" is not a table, view, materialized view, composite type, or foreign table"
 msgstr "\"%s\" non è una tabella, vista, vista materializzata, tipo composito né una tabella esterna"
 
-#: commands/constraint.c:60 utils/adt/ri_triggers.c:2713
+#: commands/constraint.c:60 utils/adt/ri_triggers.c:2715
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr "la funzione \"%s\" non è stata invocata dal trigger manager"
 
-#: commands/constraint.c:67 utils/adt/ri_triggers.c:2722
+#: commands/constraint.c:67 utils/adt/ri_triggers.c:2724
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "la funzione \"%s\" deve essere eseguita AFTER ROW"
@@ -4939,449 +4910,449 @@
 msgid "must be superuser to COPY to or from a file"
 msgstr "bisogna essere un superutente per eseguire un COPY da o verso un file"
 
-#: commands/copy.c:880
+#: commands/copy.c:881
 #, c-format
-msgid "COPY FROM not supported with row level security."
-msgstr "COPY FROM non supportato con questo livello di sicurezza di righe."
+msgid "COPY FROM not supported with row-level security"
+msgstr "COPY FROM non supportato con il livello di sicurezza di righe"
 
-#: commands/copy.c:881
+#: commands/copy.c:882
 #, c-format
-msgid "Use direct INSERT statements instead."
-msgstr "Usa istruzioni INSERT dirette invece."
+msgid "Use INSERT statements instead."
+msgstr "Usa istruzioni INSERT invece."
 
-#: commands/copy.c:1021
+#: commands/copy.c:1061
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "Formato di COPY \"%s\" non riconosciuto"
 
-#: commands/copy.c:1092 commands/copy.c:1106 commands/copy.c:1120
-#: commands/copy.c:1140
+#: commands/copy.c:1132 commands/copy.c:1146 commands/copy.c:1160
+#: commands/copy.c:1180
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
 msgstr "l'argomento dell'opzione \"%s\" dev'essere una lista di nomi di colonne"
 
-#: commands/copy.c:1153
+#: commands/copy.c:1193
 #, c-format
 msgid "argument to option \"%s\" must be a valid encoding name"
 msgstr "l'argomento dell'opzione \"%s\" dev'essere un nome di codifica valido"
 
-#: commands/copy.c:1159 commands/dbcommands.c:232 commands/dbcommands.c:1427
+#: commands/copy.c:1199 commands/dbcommands.c:232 commands/dbcommands.c:1427
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "opzione \"%s\" non riconosciuta"
 
-#: commands/copy.c:1170
+#: commands/copy.c:1210
 #, c-format
 msgid "cannot specify DELIMITER in BINARY mode"
 msgstr "non è possibile specificare DELIMITER in BINARY mode"
 
-#: commands/copy.c:1175
+#: commands/copy.c:1215
 #, c-format
 msgid "cannot specify NULL in BINARY mode"
 msgstr "non è possibile specificare NULL in BINARY mode"
 
-#: commands/copy.c:1197
+#: commands/copy.c:1237
 #, c-format
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "il delimitatore di COPY deve essere un solo carattere di un solo byte"
 
-#: commands/copy.c:1204
+#: commands/copy.c:1244
 #, c-format
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr "Il delimitatore di COPY non può essere una \"nuova riga\" o un \"ritorno carrello\""
 
-#: commands/copy.c:1210
+#: commands/copy.c:1250
 #, c-format
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr "la rappresentazione dei null in COPY non può usare \"nuova riga\" o \"ritorno carrello\""
 
-#: commands/copy.c:1227
+#: commands/copy.c:1267
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "il delimitatore di COPY non può essere \"%s\""
 
-#: commands/copy.c:1233
+#: commands/copy.c:1273
 #, c-format
 msgid "COPY HEADER available only in CSV mode"
 msgstr "l'HEADER di COPY è disponibile solo in modalità CSV"
 
-#: commands/copy.c:1239
+#: commands/copy.c:1279
 #, c-format
 msgid "COPY quote available only in CSV mode"
 msgstr "il quoting di COPY è disponibile solo in modalità CSV"
 
-#: commands/copy.c:1244
+#: commands/copy.c:1284
 #, c-format
 msgid "COPY quote must be a single one-byte character"
 msgstr "il quote di COPY dev'essere un solo carattere di un byte"
 
-#: commands/copy.c:1249
+#: commands/copy.c:1289
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "il delimitatore e il quote di COPY devono essere diversi"
 
-#: commands/copy.c:1255
+#: commands/copy.c:1295
 #, c-format
 msgid "COPY escape available only in CSV mode"
 msgstr "l'escape di COPY è disponibile solo in modalità CSV"
 
-#: commands/copy.c:1260
+#: commands/copy.c:1300
 #, c-format
 msgid "COPY escape must be a single one-byte character"
 msgstr "l'escape di COPY deve essere un solo carattere di un byte"
 
-#: commands/copy.c:1266
+#: commands/copy.c:1306
 #, c-format
 msgid "COPY force quote available only in CSV mode"
 msgstr "il \"force quote\" di COPY è disponibile solo in modalità CSV"
 
-#: commands/copy.c:1270
+#: commands/copy.c:1310
 #, c-format
 msgid "COPY force quote only available using COPY TO"
 msgstr "il \"force quote\" di COPY è disponibile solo in modalità CSV"
 
-#: commands/copy.c:1276
+#: commands/copy.c:1316
 #, c-format
 msgid "COPY force not null available only in CSV mode"
 msgstr "il \"force not null\" di COPY è disponibile solo in modalità CSV"
 
-#: commands/copy.c:1280
+#: commands/copy.c:1320
 #, c-format
 msgid "COPY force not null only available using COPY FROM"
 msgstr "il \"force not null\" di COPY è disponibile solo in COPY FROM"
 
-#: commands/copy.c:1286
+#: commands/copy.c:1326
 #, c-format
 msgid "COPY force null available only in CSV mode"
 msgstr "il \"force null\" di COPY è disponibile solo in modalità CSV"
 
-#: commands/copy.c:1291
+#: commands/copy.c:1331
 #, c-format
 msgid "COPY force null only available using COPY FROM"
 msgstr "il \"force null\" di COPY è disponibile solo usando COPY FROM"
 
-#: commands/copy.c:1297
+#: commands/copy.c:1337
 #, c-format
 msgid "COPY delimiter must not appear in the NULL specification"
 msgstr "il delimitatore di COPY non deve apparire nella specificazione di NULL"
 
-#: commands/copy.c:1304
+#: commands/copy.c:1344
 #, c-format
 msgid "CSV quote character must not appear in the NULL specification"
 msgstr "Il carattere quote del CSV non deve apparire nella specificazione di NULL"
 
-#: commands/copy.c:1367
+#: commands/copy.c:1407
 #, c-format
 msgid "table \"%s\" does not have OIDs"
 msgstr "la tabella \"%s\" non ha OID"
 
-#: commands/copy.c:1384
+#: commands/copy.c:1424
 #, c-format
 msgid "COPY (SELECT) WITH OIDS is not supported"
 msgstr "COPY (SELECT) WITH OIDS non è supportata"
 
-#: commands/copy.c:1410
+#: commands/copy.c:1450
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) non è supportata"
 
-#: commands/copy.c:1440
+#: commands/copy.c:1480
 #, c-format
 msgid "relation referenced by COPY statement has changed"
 msgstr "la relazione referenziata dall'istruzione COPY è cambiata"
 
-#: commands/copy.c:1498
+#: commands/copy.c:1538
 #, c-format
 msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
 msgstr "la colonna FORCE QUOTE \"%s\" non è referenziata da COPY"
 
-#: commands/copy.c:1520
+#: commands/copy.c:1560
 #, c-format
 msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
 msgstr "la colonna FORCE NOT NULL \"%s\" non è referenziata da COPY"
 
-#: commands/copy.c:1542
+#: commands/copy.c:1582
 #, c-format
 msgid "FORCE NULL column \"%s\" not referenced by COPY"
 msgstr "la colonna FORCE NULL \"%s\" non è referenziata da COPY"
 
-#: commands/copy.c:1607
+#: commands/copy.c:1647
 #, c-format
 msgid "could not close pipe to external command: %m"
 msgstr "chiusura della pipe per verso il comando esterno fallita: %m"
 
-#: commands/copy.c:1611
+#: commands/copy.c:1651
 #, c-format
 msgid "program \"%s\" failed"
 msgstr "programma \"%s\" fallito"
 
-#: commands/copy.c:1661
+#: commands/copy.c:1701
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "non è possibile copiare dalla vista \"%s\""
 
-#: commands/copy.c:1663 commands/copy.c:1669 commands/copy.c:1675
+#: commands/copy.c:1703 commands/copy.c:1709 commands/copy.c:1715
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Prova la variante COPY (SELECT ...) TO."
 
-#: commands/copy.c:1667
+#: commands/copy.c:1707
 #, c-format
 msgid "cannot copy from materialized view \"%s\""
 msgstr "non è possibile copiare dalla vista materializzata \"%s\""
 
-#: commands/copy.c:1673
+#: commands/copy.c:1713
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
 msgstr "non è possibile copiare dalla tabella esterna \"%s\""
 
-#: commands/copy.c:1679
+#: commands/copy.c:1719
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "non è possibile copiare dalla sequenza \"%s\""
 
-#: commands/copy.c:1684
+#: commands/copy.c:1724
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
 msgstr "non è possibile copiare dalla relazione \"%s\" perché non è una tabella"
 
-#: commands/copy.c:1709 commands/copy.c:2747
+#: commands/copy.c:1749 commands/copy.c:2787
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "esecuzione del comando \"%s\" fallita: %m"
 
-#: commands/copy.c:1724
+#: commands/copy.c:1764
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "i percorsi relativi non sono consentiti per il COPY verso un file"
 
-#: commands/copy.c:1732
+#: commands/copy.c:1772
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "apertura del file \"%s\" in scrittura fallita: %m"
 
-#: commands/copy.c:1744 commands/copy.c:2770
+#: commands/copy.c:1784 commands/copy.c:2810
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" è una directory"
 
-#: commands/copy.c:2069
+#: commands/copy.c:2109
 #, c-format
 msgid "COPY %s, line %d, column %s"
 msgstr "COPY %s, riga %d, colonna %s"
 
-#: commands/copy.c:2073 commands/copy.c:2120
+#: commands/copy.c:2113 commands/copy.c:2160
 #, c-format
 msgid "COPY %s, line %d"
 msgstr "COPY %s, riga %d"
 
-#: commands/copy.c:2084
+#: commands/copy.c:2124
 #, c-format
 msgid "COPY %s, line %d, column %s: \"%s\""
 msgstr "COPY %s, riga %d, colonna %s: \"%s\""
 
-#: commands/copy.c:2092
+#: commands/copy.c:2132
 #, c-format
 msgid "COPY %s, line %d, column %s: null input"
 msgstr "COPY %s, riga %d, colonna %s: input nullo"
 
-#: commands/copy.c:2114
+#: commands/copy.c:2154
 #, c-format
 msgid "COPY %s, line %d: \"%s\""
 msgstr "COPY %s, riga %d: \"%s\""
 
-#: commands/copy.c:2198
+#: commands/copy.c:2238
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "non è possibile copiare verso la vista \"%s\""
 
-#: commands/copy.c:2203
+#: commands/copy.c:2243
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
 msgstr "non è possibile copiare verso la vista materializzata \"%s\""
 
-#: commands/copy.c:2208
+#: commands/copy.c:2248
 #, c-format
 msgid "cannot copy to foreign table \"%s\""
 msgstr "non è possibile copiare verso la tabella esterna \"%s\""
 
-#: commands/copy.c:2213
+#: commands/copy.c:2253
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "non è possibile copiare verso sequenza \"%s\""
 
-#: commands/copy.c:2218
+#: commands/copy.c:2258
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
 msgstr "non è possibile copiare verso la relazione \"%s\" perché non è una tabella"
 
-#: commands/copy.c:2281
+#: commands/copy.c:2321
 #, c-format
 msgid "cannot perform FREEZE because of prior transaction activity"
 msgstr "non è possibile eseguire FREEZE a causa di precedente attività della transazione"
 
-#: commands/copy.c:2287
+#: commands/copy.c:2327
 #, c-format
 msgid "cannot perform FREEZE because the table was not created or truncated in the current subtransaction"
 msgstr "non è possibile eseguire FREEZE perché la tabella non è stata creata o troncata nella sottotransazione corrente"
 
-#: commands/copy.c:2758 commands/extension.c:3037 utils/adt/genfile.c:134
+#: commands/copy.c:2798 commands/extension.c:3040 utils/adt/genfile.c:134
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "apertura del file \"%s\" in lettura fallita: %m"
 
-#: commands/copy.c:2790
+#: commands/copy.c:2830
 #, c-format
 msgid "COPY file signature not recognized"
 msgstr "formato del file COPY non riconosciuto"
 
-#: commands/copy.c:2795
+#: commands/copy.c:2835
 #, c-format
 msgid "invalid COPY file header (missing flags)"
 msgstr "intestazione del file COPY non valida (flag mancanti)"
 
-#: commands/copy.c:2801
+#: commands/copy.c:2841
 #, c-format
 msgid "unrecognized critical flags in COPY file header"
 msgstr "alcune flag critici non sono stati riconosciuti nell'intestazione del file COPY"
 
-#: commands/copy.c:2807
+#: commands/copy.c:2847
 #, c-format
 msgid "invalid COPY file header (missing length)"
 msgstr "intestazione del file COPY non valida (manca la lunghezza)"
 
-#: commands/copy.c:2814
+#: commands/copy.c:2854
 #, c-format
 msgid "invalid COPY file header (wrong length)"
 msgstr "intestazione del file COPY non valida (lunghezza errata)"
 
-#: commands/copy.c:2947 commands/copy.c:3654 commands/copy.c:3884
+#: commands/copy.c:2987 commands/copy.c:3694 commands/copy.c:3924
 #, c-format
 msgid "extra data after last expected column"
 msgstr "ci sono dati in eccesso dopo l'ultima colonna attesa"
 
-#: commands/copy.c:2957
+#: commands/copy.c:2997
 #, c-format
 msgid "missing data for OID column"
 msgstr "dati per la colonna OID mancanti"
 
-#: commands/copy.c:2963
+#: commands/copy.c:3003
 #, c-format
 msgid "null OID in COPY data"
 msgstr "OID nullo nei dati da COPY"
 
-#: commands/copy.c:2973 commands/copy.c:3096
+#: commands/copy.c:3013 commands/copy.c:3136
 #, c-format
 msgid "invalid OID in COPY data"
 msgstr "OID non valido nei dati da COPY"
 
-#: commands/copy.c:2988
+#: commands/copy.c:3028
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "dati mancanti per la colonna \"%s\""
 
-#: commands/copy.c:3071
+#: commands/copy.c:3111
 #, c-format
 msgid "received copy data after EOF marker"
 msgstr "dati da copiare ricevuti dopo il segnalatore di fine file"
 
-#: commands/copy.c:3078
+#: commands/copy.c:3118
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "il numero di campi è %d, ne erano attesi %d"
 
-#: commands/copy.c:3418 commands/copy.c:3435
+#: commands/copy.c:3458 commands/copy.c:3475
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "\"ritorno carrello\" trovato nei dati"
 
-#: commands/copy.c:3419 commands/copy.c:3436
+#: commands/copy.c:3459 commands/copy.c:3476
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "\"ritorno carrello\" non quotato trovato nei dati"
 
-#: commands/copy.c:3421 commands/copy.c:3438
+#: commands/copy.c:3461 commands/copy.c:3478
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Usa \"\\r\" per rappresentare i caratteri \"ritorno carrello\"."
 
-#: commands/copy.c:3422 commands/copy.c:3439
+#: commands/copy.c:3462 commands/copy.c:3479
 #, c-format
 msgid "Use quoted CSV field to represent carriage return."
 msgstr "Usa un campo CSV quotato per rappresentare i caratteri \"ritorno carrello\"."
 
-#: commands/copy.c:3451
+#: commands/copy.c:3491
 #, c-format
 msgid "literal newline found in data"
 msgstr "\"nuova riga\" letterale trovato nei dati"
 
-#: commands/copy.c:3452
+#: commands/copy.c:3492
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "\"nuova riga\" non quotato trovato nei dati"
 
-#: commands/copy.c:3454
+#: commands/copy.c:3494
 #, c-format
 msgid "Use \"\\n\" to represent newline."
 msgstr "Usa \"\\n\" per rappresentare i caratteri \"nuova riga\"."
 
-#: commands/copy.c:3455
+#: commands/copy.c:3495
 #, c-format
 msgid "Use quoted CSV field to represent newline."
 msgstr "Usa un campo CSV quotato per rappresentare i caratteri \"nuova riga\"."
 
-#: commands/copy.c:3501 commands/copy.c:3537
+#: commands/copy.c:3541 commands/copy.c:3577
 #, c-format
 msgid "end-of-copy marker does not match previous newline style"
 msgstr "il marcatore di fine copia non combacia con il precedente stile \"nuova riga\""
 
-#: commands/copy.c:3510 commands/copy.c:3526
+#: commands/copy.c:3550 commands/copy.c:3566
 #, c-format
 msgid "end-of-copy marker corrupt"
 msgstr "il marcatore di fine copia è corrotto"
 
-#: commands/copy.c:3968
+#: commands/copy.c:4008
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "campo CSV tra virgolette non terminato"
 
-#: commands/copy.c:4045 commands/copy.c:4064
+#: commands/copy.c:4085 commands/copy.c:4104
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "fine file inattesa dei dati da COPY"
 
-#: commands/copy.c:4054
+#: commands/copy.c:4094
 #, c-format
 msgid "invalid field size"
 msgstr "dimensione del campo non valida"
 
-#: commands/copy.c:4077
+#: commands/copy.c:4117
 #, c-format
 msgid "incorrect binary data format"
 msgstr "formato di dati binari non corretto"
 
-#: commands/copy.c:4388 commands/indexcmds.c:1008 commands/tablecmds.c:1458
-#: commands/tablecmds.c:2281 parser/parse_relation.c:3078
-#: parser/parse_relation.c:3098 utils/adt/tsvector_op.c:1417
+#: commands/copy.c:4428 commands/indexcmds.c:1009 commands/tablecmds.c:1460
+#: commands/tablecmds.c:2283 parser/parse_relation.c:3177
+#: parser/parse_relation.c:3197 utils/adt/tsvector_op.c:1418
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "la colonna \"%s\" non esiste"
 
-#: commands/copy.c:4395 commands/tablecmds.c:1484 commands/trigger.c:652
-#: parser/parse_target.c:956 parser/parse_target.c:967
+#: commands/copy.c:4435 commands/tablecmds.c:1486 commands/trigger.c:652
+#: parser/parse_target.c:967 parser/parse_target.c:978
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "la colonna \"%s\" è stata specificata più di una volta"
 
-#: commands/createas.c:383
+#: commands/createas.c:213 commands/createas.c:508
 #, c-format
 msgid "too many column names were specified"
 msgstr "troppi nomi di colonne specificati"
 
-#: commands/createas.c:452
+#: commands/createas.c:549
 #, c-format
 msgid "policies not yet implemented for this command"
-msgstr "politiche per questo comando non ancora implementate"
+msgstr "regole di sicurezza non ancora implementate per questo comando"
 
 #: commands/dbcommands.c:226
 #, c-format
@@ -5564,7 +5535,7 @@
 
 #: commands/dbcommands.c:1325 commands/dbcommands.c:1868
 #: commands/dbcommands.c:2072 commands/dbcommands.c:2120
-#: commands/tablespace.c:605
+#: commands/tablespace.c:606
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
 msgstr "alcuni file inutili possono essere stati lasciati nella vecchia directory del database \"%s\""
@@ -5641,7 +5612,7 @@
 msgstr "argomento non valido per %s: \"%s\""
 
 #: commands/dropcmds.c:112 commands/functioncmds.c:1166
-#: utils/adt/ruleutils.c:1950
+#: utils/adt/ruleutils.c:1954
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "\"%s\" è una funzione di aggregazione"
@@ -5651,19 +5622,19 @@
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Usa DROP AGGREGATE per rimuovere le funzioni di aggregazione."
 
-#: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2368
-#: commands/tablecmds.c:2519 commands/tablecmds.c:2561
-#: commands/tablecmds.c:11284 tcop/utility.c:1105
+#: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2370
+#: commands/tablecmds.c:2521 commands/tablecmds.c:2563
+#: commands/tablecmds.c:11494 tcop/utility.c:1104
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "la relazione \"%s\" non esiste, saltata"
 
-#: commands/dropcmds.c:195 commands/dropcmds.c:292 commands/tablecmds.c:740
+#: commands/dropcmds.c:195 commands/dropcmds.c:292 commands/tablecmds.c:742
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "lo schema \"%s\" non esiste, saltato"
 
-#: commands/dropcmds.c:237 commands/dropcmds.c:272 commands/tablecmds.c:243
+#: commands/dropcmds.c:237 commands/dropcmds.c:272 commands/tablecmds.c:245
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "il tipo \"%s\" non esiste, saltato"
@@ -5741,7 +5712,7 @@
 #: commands/dropcmds.c:389
 #, c-format
 msgid "policy \"%s\" for relation \"%s\" does not exist, skipping"
-msgstr "la politica \"%s\" per la relazione \"%s\" non esiste, saltata"
+msgstr "la regola di sicurezza \"%s\" per la relazione \"%s\" non esiste, saltata"
 
 #: commands/dropcmds.c:396
 #, c-format
@@ -5836,27 +5807,27 @@
 msgstr "%s può essere chiamata solo in una funzione trigger di evento sql_drop"
 
 #: commands/event_trigger.c:1446 commands/event_trigger.c:1997
-#: commands/extension.c:1645 commands/extension.c:1754
-#: commands/extension.c:1947 commands/prepare.c:701 executor/execQual.c:1735
-#: executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5356
-#: executor/functions.c:1021 foreign/foreign.c:491
-#: replication/logical/logicalfuncs.c:312 replication/logical/origin.c:1410
-#: replication/slotfuncs.c:189 replication/walsender.c:2742
+#: commands/extension.c:1648 commands/extension.c:1757
+#: commands/extension.c:1950 commands/prepare.c:701 executor/execQual.c:1735
+#: executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5431
+#: executor/functions.c:1030 foreign/foreign.c:491
+#: replication/logical/logicalfuncs.c:324 replication/logical/origin.c:1394
+#: replication/slotfuncs.c:173 replication/walsender.c:2765
 #: utils/adt/jsonfuncs.c:1474 utils/adt/jsonfuncs.c:1606
 #: utils/adt/jsonfuncs.c:1796 utils/adt/jsonfuncs.c:1925
 #: utils/adt/jsonfuncs.c:2693 utils/adt/pgstatfuncs.c:547
-#: utils/fmgr/funcapi.c:61 utils/misc/guc.c:8225 utils/mmgr/portalmem.c:986
+#: utils/fmgr/funcapi.c:61 utils/misc/guc.c:8228 utils/mmgr/portalmem.c:1052
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "la funzione che restituisce insiemi è chiamata in un contesto che non può accettare un insieme"
 
 #: commands/event_trigger.c:1450 commands/event_trigger.c:2001
-#: commands/extension.c:1649 commands/extension.c:1758
-#: commands/extension.c:1951 commands/prepare.c:705 foreign/foreign.c:496
-#: replication/logical/logicalfuncs.c:316 replication/logical/origin.c:1414
-#: replication/slotfuncs.c:193 replication/walsender.c:2746
-#: utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8229
-#: utils/mmgr/portalmem.c:990
+#: commands/extension.c:1652 commands/extension.c:1761
+#: commands/extension.c:1954 commands/prepare.c:705 foreign/foreign.c:496
+#: replication/logical/logicalfuncs.c:328 replication/logical/origin.c:1398
+#: replication/slotfuncs.c:177 replication/walsender.c:2769
+#: utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8232
+#: utils/mmgr/portalmem.c:1056
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "necessaria modalità materializzata, ma non ammessa in questo contesto"
@@ -5871,27 +5842,27 @@
 msgid "%s can only be called in an event trigger function"
 msgstr "%s può essere chiamata solo in una funzione trigger di evento"
 
-#: commands/explain.c:184
+#: commands/explain.c:185
 #, c-format
 msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
 msgstr "valore sconosciuto per l'opzione di EXPLAIN \"%s\": \"%s\""
 
-#: commands/explain.c:190
+#: commands/explain.c:191
 #, c-format
 msgid "unrecognized EXPLAIN option \"%s\""
 msgstr "opzione di EXPLAIN non riconosciuta \"%s\""
 
-#: commands/explain.c:197
+#: commands/explain.c:198
 #, c-format
 msgid "EXPLAIN option BUFFERS requires ANALYZE"
 msgstr "l'opzione BUFFERS di EXPLAIN richiede ANALYZE"
 
-#: commands/explain.c:206
+#: commands/explain.c:207
 #, c-format
 msgid "EXPLAIN option TIMING requires ANALYZE"
 msgstr "l'opzione TIMING di EXPLAIN richiede ANALYZE"
 
-#: commands/extension.c:152 commands/extension.c:2635
+#: commands/extension.c:152 commands/extension.c:2638
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "l'estensione \"%s\" non esiste"
@@ -5978,130 +5949,130 @@
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
 msgstr "il parametro \"schema\" non può essere specificato quando \"relocatable\" è abilitato"
 
-#: commands/extension.c:719
+#: commands/extension.c:722
 #, c-format
 msgid "transaction control statements are not allowed within an extension script"
 msgstr "le istruzioni di controllo di transazione non sono valide in uno script di estensione"
 
-#: commands/extension.c:787
+#: commands/extension.c:790
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "permesso di creare l'estensione \"%s\" negato"
 
-#: commands/extension.c:789
+#: commands/extension.c:792
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "Solo un superutente può creare questa estensione."
 
-#: commands/extension.c:793
+#: commands/extension.c:796
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "permesso di modificare l'estensione \"%s\" negato"
 
-#: commands/extension.c:795
+#: commands/extension.c:798
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "Solo un superutente può modificare questa estensione."
 
-#: commands/extension.c:1077
+#: commands/extension.c:1080
 #, c-format
 msgid "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
 msgstr "l'estensione \"%s\" non ha un percorso di aggiornamento dalla versione \"%s\" alla versione \"%s\""
 
-#: commands/extension.c:1205
+#: commands/extension.c:1208
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "l'estensione \"%s\" esiste già, saltata"
 
-#: commands/extension.c:1212
+#: commands/extension.c:1215
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "l'estensione \"%s\" esiste già"
 
-#: commands/extension.c:1223
+#: commands/extension.c:1226
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "CREATE EXTENSION annidati non sono supportati"
 
-#: commands/extension.c:1278 commands/extension.c:2695
+#: commands/extension.c:1281 commands/extension.c:2698
 #, c-format
 msgid "version to install must be specified"
 msgstr "il nome di versione da installare deve essere specificato"
 
-#: commands/extension.c:1295
+#: commands/extension.c:1298
 #, c-format
 msgid "FROM version must be different from installation target version \"%s\""
 msgstr "la versione FROM dev'essere diversa dalla versione \"%s\" oggetto dell'installazione"
 
-#: commands/extension.c:1350
+#: commands/extension.c:1353
 #, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
 msgstr "l'estensione \"%s\" dev'essere installata nello schema \"%s\""
 
-#: commands/extension.c:1434 commands/extension.c:2840
+#: commands/extension.c:1437 commands/extension.c:2843
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "l'estensione richiesta \"%s\" non è installata"
 
-#: commands/extension.c:1597
+#: commands/extension.c:1600
 #, c-format
 msgid "cannot drop extension \"%s\" because it is being modified"
 msgstr "non è possibile eliminare l'estensione \"%s\" perché sta venendo modificata"
 
-#: commands/extension.c:2068
+#: commands/extension.c:2071
 #, c-format
 msgid "pg_extension_config_dump() can only be called from an SQL script executed by CREATE EXTENSION"
 msgstr "pg_extension_config_dump() può essere richiamata solo da uno script SQL eseguito da CREATE EXTENSION"
 
-#: commands/extension.c:2080
+#: commands/extension.c:2083
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "l'OID %u non si riferisce ad una tabella"
 
-#: commands/extension.c:2085
+#: commands/extension.c:2088
 #, c-format
 msgid "table \"%s\" is not a member of the extension being created"
 msgstr "la tabella \"%s\" non è membra dell'estensione in fase di creazione"
 
-#: commands/extension.c:2450
+#: commands/extension.c:2453
 #, c-format
 msgid "cannot move extension \"%s\" into schema \"%s\" because the extension contains the schema"
 msgstr "non è possibile spostare l'estensione \"%s\" nello schema \"%s\" perché l'estensione contiene lo schema"
 
-#: commands/extension.c:2490 commands/extension.c:2553
+#: commands/extension.c:2493 commands/extension.c:2556
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "l'estensione \"%s\" non supporta SET SCHEMA"
 
-#: commands/extension.c:2555
+#: commands/extension.c:2558
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
 msgstr "%s non è nello schema dell'estensione \"%s\""
 
-#: commands/extension.c:2615
+#: commands/extension.c:2618
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "ALTER EXTENSION annidati non sono supportati"
 
-#: commands/extension.c:2706
+#: commands/extension.c:2709
 #, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
 msgstr "la versione \"%s\" dell'estensione \"%s\" è già installata"
 
-#: commands/extension.c:2957
+#: commands/extension.c:2960
 #, c-format
 msgid "cannot add schema \"%s\" to extension \"%s\" because the schema contains the extension"
 msgstr "non è possibile aggiungere lo schema \"%s\" all'estensione \"%s\" perché lo schema contiene l'estensione"
 
-#: commands/extension.c:2975
+#: commands/extension.c:2978
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s non fa parte dell'estensione \"%s\""
 
-#: commands/extension.c:3031
+#: commands/extension.c:3034
 #, c-format
-msgid "file too large"
-msgstr "file troppo largo"
+msgid "file \"%s\" is too large"
+msgstr "il file \"%s\" è troppo grande"
 
 #: commands/foreigncmds.c:150 commands/foreigncmds.c:159
 #, c-format
@@ -6213,7 +6184,7 @@
 msgid "return type %s is only a shell"
 msgstr "il tipo restituito %s non è completamente definito"
 
-#: commands/functioncmds.c:134 parser/parse_type.c:338
+#: commands/functioncmds.c:134 parser/parse_type.c:337
 #, c-format
 msgid "type modifier cannot be specified for shell type \"%s\""
 msgstr "il modificatore di tipo non può essere specificato per il tipo non completamente definito \"%s\""
@@ -6534,9 +6505,8 @@
 msgid "language \"%s\" does not support inline code execution"
 msgstr "il linguaggio \"%s\" non supporta l'esecuzione di codice inline"
 
-#: commands/indexcmds.c:159 commands/indexcmds.c:487
-#: commands/opclasscmds.c:360 commands/opclasscmds.c:786
-#: commands/opclasscmds.c:1749
+#: commands/indexcmds.c:159 commands/indexcmds.c:488 commands/opclasscmds.c:360
+#: commands/opclasscmds.c:786 commands/opclasscmds.c:1749
 #, c-format
 msgid "access method \"%s\" does not exist"
 msgstr "Il metodo di accesso \"%s\" non esiste"
@@ -6561,134 +6531,134 @@
 msgid "cannot create indexes on temporary tables of other sessions"
 msgstr "non è possibile creare indici su tabelle temporanee di altre sessioni"
 
-#: commands/indexcmds.c:446 commands/tablecmds.c:540 commands/tablecmds.c:9557
+#: commands/indexcmds.c:447 commands/tablecmds.c:542 commands/tablecmds.c:9665
 #, c-format
 msgid "only shared relations can be placed in pg_global tablespace"
 msgstr "solo le relazioni condivise possono essere poste nel tablespace pg_global"
 
-#: commands/indexcmds.c:479
+#: commands/indexcmds.c:480
 #, c-format
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "sostituzione del metodo di accesso \"gist\" per il metodo obsoleto \"rtree\""
 
-#: commands/indexcmds.c:496
+#: commands/indexcmds.c:497
 #, c-format
 msgid "hash indexes are not WAL-logged and their use is discouraged"
 msgstr "gli indici hash non sono inviati con il log WAL e il loro uso è scoraggiato"
 
-#: commands/indexcmds.c:501
+#: commands/indexcmds.c:502
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
 msgstr "il metodo di accesso \"%s\" non supporta gli indici univoci"
 
-#: commands/indexcmds.c:506
+#: commands/indexcmds.c:507
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
 msgstr "il metodo di accesso \"%s\" non supporta gli indici multicolonna"
 
-#: commands/indexcmds.c:511
+#: commands/indexcmds.c:512
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "il metodo di accesso \"%s\" non supporta i vincoli di esclusione"
 
-#: commands/indexcmds.c:590
+#: commands/indexcmds.c:591
 #, c-format
 msgid "%s %s will create implicit index \"%s\" for table \"%s\""
 msgstr "%s %s creerà un indice implicito \"%s\" per la tabella \"%s\""
 
-#: commands/indexcmds.c:937
+#: commands/indexcmds.c:938
 #, c-format
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "le funzioni nel predicato dell'indice devono essere marcate IMMUTABLE"
 
-#: commands/indexcmds.c:1003 parser/parse_utilcmd.c:1844
+#: commands/indexcmds.c:1004 parser/parse_utilcmd.c:1846
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "la colonna \"%s\" nominata nella chiave non esiste"
 
-#: commands/indexcmds.c:1063
+#: commands/indexcmds.c:1064
 #, c-format
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr "le funzioni nell'espressione dell'indice devono essere marcate IMMUTABLE"
 
-#: commands/indexcmds.c:1086
+#: commands/indexcmds.c:1087
 #, c-format
 msgid "could not determine which collation to use for index expression"
 msgstr "non è stato possibile determinare quale ordinamento usare per l'espressione dell'indice"
 
-#: commands/indexcmds.c:1094 commands/typecmds.c:825 parser/parse_expr.c:2559
-#: parser/parse_type.c:551 parser/parse_utilcmd.c:2736 utils/adt/misc.c:546
+#: commands/indexcmds.c:1095 commands/typecmds.c:825 parser/parse_expr.c:2583
+#: parser/parse_type.c:550 parser/parse_utilcmd.c:2738 utils/adt/misc.c:546
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "gli ordinamenti non sono supportati dal tipo %s"
 
-#: commands/indexcmds.c:1132
+#: commands/indexcmds.c:1133
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "l'operatore %s non è commutativo"
 
-#: commands/indexcmds.c:1134
+#: commands/indexcmds.c:1135
 #, c-format
 msgid "Only commutative operators can be used in exclusion constraints."
 msgstr "Solo operatori commutativi possono essere usati nei vincoli di esclusione."
 
-#: commands/indexcmds.c:1160
+#: commands/indexcmds.c:1161
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
 msgstr "l'operatore %s non è membro della famiglia di operatori \"%s\""
 
-#: commands/indexcmds.c:1163
+#: commands/indexcmds.c:1164
 #, c-format
 msgid "The exclusion operator must be related to the index operator class for the constraint."
 msgstr "L'operatore di esclusione dev'essere correlato alla classe di operatori dell'indice per il vincolo."
 
-#: commands/indexcmds.c:1198
+#: commands/indexcmds.c:1199
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
 msgstr "il metodo di accesso \"%s\" non supporta le opzioni ASC/DESC"
 
-#: commands/indexcmds.c:1203
+#: commands/indexcmds.c:1204
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "il metodo di accesso \"%s\" non supporta le opzioni NULLS FIRST/LAST"
 
-#: commands/indexcmds.c:1259 commands/typecmds.c:1932
+#: commands/indexcmds.c:1260 commands/typecmds.c:1932
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr "il tipo di dati %s non ha una classe di operatori predefinita per il metodo di accesso \"%s\""
 
-#: commands/indexcmds.c:1261
+#: commands/indexcmds.c:1262
 #, c-format
 msgid "You must specify an operator class for the index or define a default operator class for the data type."
 msgstr "Devi specificare una classe di operatori per l'indice o definire una classe di operatori predefinita per il tipo di dati"
 
-#: commands/indexcmds.c:1290 commands/indexcmds.c:1298
+#: commands/indexcmds.c:1291 commands/indexcmds.c:1299
 #: commands/opclasscmds.c:204
 #, c-format
 msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr "la classe di operatori \"%s\" non esiste per il metodo di accesso \"%s\""
 
-#: commands/indexcmds.c:1311 commands/typecmds.c:1920
+#: commands/indexcmds.c:1312 commands/typecmds.c:1920
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "la classe di operatori \"%s\" non accetta il tipo di dati %s"
 
-#: commands/indexcmds.c:1401
+#: commands/indexcmds.c:1402
 #, c-format
 msgid "there are multiple default operator classes for data type %s"
 msgstr "il tipo di dati %s ha più di una classe di operatori predefinita"
 
-#: commands/indexcmds.c:1792
+#: commands/indexcmds.c:1793
 #, c-format
 msgid "table \"%s\" has no indexes"
 msgstr "la tabella \"%s\" non ha indici"
 
-#: commands/indexcmds.c:1847
+#: commands/indexcmds.c:1848
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "è possibile reindicizzare solo il database corrente"
 
-#: commands/indexcmds.c:1949
+#: commands/indexcmds.c:1950
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "la tabella \"%s.%s\" è stata reindicizzata"
@@ -6705,8 +6675,8 @@
 
 #: commands/matview.c:611
 #, c-format
-msgid "new data for \"%s\" contains duplicate rows without any null columns"
-msgstr "i nuovi dati per \"%s\" contengono righe duplicate senza alcuna colonna null"
+msgid "new data for materialized view \"%s\" contains duplicate rows without any null columns"
+msgstr "i nuovi dati per la vista materializzata \"%s\" contengono righe duplicate senza alcuna colonna null"
 
 #: commands/matview.c:613
 #, c-format
@@ -6890,104 +6860,98 @@
 msgid "operator family \"%s\" for access method \"%s\" already exists in schema \"%s\""
 msgstr "la famiglia di operatori \"%s\" per il metodo di accesso \"%s\" esiste già nello schema \"%s\""
 
-#: commands/operatorcmds.c:113 commands/operatorcmds.c:121
+#: commands/operatorcmds.c:110 commands/operatorcmds.c:118
 #, c-format
 msgid "SETOF type not allowed for operator argument"
 msgstr "il tipo SETOF non è permesso come argomento dell'operatore."
 
-#: commands/operatorcmds.c:151 commands/operatorcmds.c:436
+#: commands/operatorcmds.c:146
 #, c-format
 msgid "operator attribute \"%s\" not recognized"
 msgstr "attributo dell'operatore \"%s\" non riconosciuto"
 
-#: commands/operatorcmds.c:162
+#: commands/operatorcmds.c:156
 #, c-format
 msgid "operator procedure must be specified"
 msgstr "la procedura dell'operatore deve essere specificata"
 
-#: commands/operatorcmds.c:173
+#: commands/operatorcmds.c:167
 #, c-format
 msgid "at least one of leftarg or rightarg must be specified"
 msgstr "almeno uno tra leftarg e rightarg deve essere specificato"
 
-#: commands/operatorcmds.c:277
+#: commands/operatorcmds.c:235
 #, c-format
 msgid "restriction estimator function %s must return type \"float8\""
 msgstr "la funzione di stima di restrizione %s deve restituire il tipo \"float8\""
 
-#: commands/operatorcmds.c:323
+#: commands/operatorcmds.c:274
 #, c-format
 msgid "join estimator function %s must return type \"float8\""
 msgstr "la funzione di stima del join %s deve restituire il tipo \"float8\""
 
-#: commands/operatorcmds.c:430
-#, c-format
-msgid "operator attribute \"%s\" can not be changed"
-msgstr "l'attributo dell'operatore \"%s\" non può essere cambiato"
-
-#: commands/policy.c:87 commands/policy.c:428 commands/tablecmds.c:965
-#: commands/tablecmds.c:1307 commands/tablecmds.c:2175
-#: commands/tablecmds.c:4305 commands/tablecmds.c:6258
-#: commands/tablecmds.c:11834 commands/tablecmds.c:11869
-#: commands/trigger.c:240 commands/trigger.c:1126 commands/trigger.c:1234
-#: rewrite/rewriteDefine.c:273 rewrite/rewriteDefine.c:905
+#: commands/policy.c:87 commands/policy.c:390 commands/policy.c:479
+#: commands/tablecmds.c:967 commands/tablecmds.c:1309 commands/tablecmds.c:2177
+#: commands/tablecmds.c:4321 commands/tablecmds.c:6250
+#: commands/tablecmds.c:12044 commands/tablecmds.c:12079 commands/trigger.c:240
+#: commands/trigger.c:1126 commands/trigger.c:1234 rewrite/rewriteDefine.c:273
+#: rewrite/rewriteDefine.c:917
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "permesso negato: \"%s\" è un catalogo di sistema"
 
 #: commands/policy.c:170
 #, c-format
-msgid "ignoring roles specified other than public"
-msgstr "i ruoli specificati a parte quello pubblico verranno ignorati"
+msgid "ignoring specified roles other than PUBLIC"
+msgstr "i ruoli specificati a parte PUBLIC verranno ignorati"
 
 #: commands/policy.c:171
 #, c-format
-msgid "All roles are members of the public role."
-msgstr "Tutti i ruoli sono membri del ruolo pubblico."
+msgid "All roles are members of the PUBLIC role."
+msgstr "TuttiTutti i ruoli sono membri del ruolo PUBLIC."
 
-#: commands/policy.c:492
+#: commands/policy.c:503
+#, c-format
+msgid "role \"%s\" could not be removed from policy \"%s\" on \"%s\""
+msgstr "non è stato possibile rimuovere il ruolo \"%s\" dalla regola di sicurezza \"%s\" su \"%s\""
+
+#: commands/policy.c:712
 #, c-format
 msgid "WITH CHECK cannot be applied to SELECT or DELETE"
 msgstr "WITH CHECK non può essere applicato a SELECT o a DELETE"
 
-#: commands/policy.c:501 commands/policy.c:801
+#: commands/policy.c:721 commands/policy.c:1021
 #, c-format
 msgid "only WITH CHECK expression allowed for INSERT"
 msgstr "solo le espressioni WITH CHECK sono consentite per INSERT"
 
-#: commands/policy.c:574 commands/policy.c:927
+#: commands/policy.c:794 commands/policy.c:1244
 #, c-format
 msgid "policy \"%s\" for table \"%s\" already exists"
-msgstr "la politica \"%s\" per la tabella \"%s\" esiste già"
+msgstr "la regola di sicurezza \"%s\" per la tabella \"%s\" esiste già"
 
-#: commands/policy.c:773 commands/policy.c:955 commands/policy.c:1030
+#: commands/policy.c:993 commands/policy.c:1272 commands/policy.c:1347
 #, c-format
 msgid "policy \"%s\" for table \"%s\" does not exist"
-msgstr "la politica \"%s\" per la tabella \"%s\" non esiste"
+msgstr "la regola di sicurezza \"%s\" per la tabella \"%s\" non esiste"
 
-#: commands/policy.c:791
+#: commands/policy.c:1011
 #, c-format
 msgid "only USING expression allowed for SELECT, DELETE"
 msgstr "solo le espressioni USING sono permesse per SELECT e DELETE"
 
-#: commands/portalcmds.c:61 commands/portalcmds.c:160
-#: commands/portalcmds.c:212
+#: commands/portalcmds.c:61 commands/portalcmds.c:160 commands/portalcmds.c:212
 #, c-format
 msgid "invalid cursor name: must not be empty"
 msgstr "nome di cursore non valido: non deve essere vuoto"
 
 #: commands/portalcmds.c:168 commands/portalcmds.c:222
-#: executor/execCurrent.c:67 utils/adt/xml.c:2391 utils/adt/xml.c:2558
+#: executor/execCurrent.c:67 utils/adt/xml.c:2401 utils/adt/xml.c:2571
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "il cursore \"%s\" non esiste"
 
-#: commands/portalcmds.c:341 tcop/pquery.c:740 tcop/pquery.c:1404
-#, c-format
-msgid "portal \"%s\" cannot be run"
-msgstr "il portale \"%s\" non può essere eseguito"
-
-#: commands/portalcmds.c:411
+#: commands/portalcmds.c:407
 #, c-format
 msgid "could not reposition held cursor"
 msgstr "riposizionamento del cursore held fallito"
@@ -7192,923 +7156,924 @@
 msgid "sequence must be in same schema as table it is linked to"
 msgstr "la sequenza deve essere nello stesso schema della tabella a cui è collegata"
 
-#: commands/tablecmds.c:212
+#: commands/tablecmds.c:214
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "la tabella \"%s\" non esiste"
 
-#: commands/tablecmds.c:213
+#: commands/tablecmds.c:215
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "la tabella \"%s\" non esiste, saltata"
 
-#: commands/tablecmds.c:215
+#: commands/tablecmds.c:217
 msgid "Use DROP TABLE to remove a table."
 msgstr "Usa DROP TABLE per eliminare una tabella."
 
-#: commands/tablecmds.c:218
+#: commands/tablecmds.c:220
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "la sequenza \"%s\" non esiste"
 
-#: commands/tablecmds.c:219
+#: commands/tablecmds.c:221
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "la sequenza \"%s\" non esiste, saltata"
 
-#: commands/tablecmds.c:221
+#: commands/tablecmds.c:223
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Usa DROP SEQUENCE per eliminare una sequenza."
 
-#: commands/tablecmds.c:224
+#: commands/tablecmds.c:226
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "la vista \"%s\" non esiste"
 
-#: commands/tablecmds.c:225
+#: commands/tablecmds.c:227
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "la vista \"%s\" non esiste, saltata"
 
-#: commands/tablecmds.c:227
+#: commands/tablecmds.c:229
 msgid "Use DROP VIEW to remove a view."
 msgstr "Usa DROP VIEW per eliminare una vista."
 
-#: commands/tablecmds.c:230
+#: commands/tablecmds.c:232
 #, c-format
 msgid "materialized view \"%s\" does not exist"
 msgstr "la vista materializzata \"%s\" non esiste"
 
-#: commands/tablecmds.c:231
+#: commands/tablecmds.c:233
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
 msgstr "la vista materializzata \"%s\" non esiste, saltata"
 
-#: commands/tablecmds.c:233
+#: commands/tablecmds.c:235
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "Usa DROP MATERIALIZED VIEW per rimuovere una vista materializzata."
 
-#: commands/tablecmds.c:236 parser/parse_utilcmd.c:1593
+#: commands/tablecmds.c:238 parser/parse_utilcmd.c:1595
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "l'indice \"%s\" non esiste"
 
-#: commands/tablecmds.c:237
+#: commands/tablecmds.c:239
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "l'indice \"%s\" non esiste, saltato"
 
-#: commands/tablecmds.c:239
+#: commands/tablecmds.c:241
 msgid "Use DROP INDEX to remove an index."
 msgstr "Usa DROP INDEX per eliminare un indice."
 
-#: commands/tablecmds.c:244
+#: commands/tablecmds.c:246
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "\"%s\" non è un tipo"
 
-#: commands/tablecmds.c:245
+#: commands/tablecmds.c:247
 msgid "Use DROP TYPE to remove a type."
 msgstr "Usa DROP TYPE per eliminare un tipo."
 
-#: commands/tablecmds.c:248 commands/tablecmds.c:8465
-#: commands/tablecmds.c:11095
+#: commands/tablecmds.c:250 commands/tablecmds.c:8554
+#: commands/tablecmds.c:11305
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "la tabella esterna \"%s\" non esiste"
 
-#: commands/tablecmds.c:249
+#: commands/tablecmds.c:251
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "la tabella esterna \"%s\" non esiste, saltata"
 
-#: commands/tablecmds.c:251
+#: commands/tablecmds.c:253
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "Usa DROP FOREIGN TABLE per eliminare una tabella esterna."
 
-#: commands/tablecmds.c:488
+#: commands/tablecmds.c:490
 #, c-format
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT può essere usato solo con le tabelle temporanee"
 
-#: commands/tablecmds.c:508
+#: commands/tablecmds.c:510
 #, c-format
 msgid "cannot create temporary table within security-restricted operation"
 msgstr "non è possibile creare la tabella temporanea nell'ambito di operazioni a sicurezza ristretta"
 
-#: commands/tablecmds.c:816
+#: commands/tablecmds.c:818
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support dropping multiple objects"
 msgstr "DROP INDEX CONCURRENTLY non supporta l'eliminazione di più di un oggetto"
 
-#: commands/tablecmds.c:820
+#: commands/tablecmds.c:822
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY non supporta CASCADE"
 
-#: commands/tablecmds.c:1079
+#: commands/tablecmds.c:1081
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "truncate si propaga in cascata alla tabella \"%s\""
 
-#: commands/tablecmds.c:1317
+#: commands/tablecmds.c:1319
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "non è possibile troncare tabelle temporanee di altre sessioni"
 
-#: commands/tablecmds.c:1523 parser/parse_utilcmd.c:1807
+#: commands/tablecmds.c:1525 parser/parse_utilcmd.c:1809
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr "la relazione ereditata \"%s\" non è una tabella o tabella esterna"
 
-#: commands/tablecmds.c:1530 commands/tablecmds.c:9994
+#: commands/tablecmds.c:1532 commands/tablecmds.c:10121
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "non è possibile ereditare dalla relazione temporanea \"%s\""
 
-#: commands/tablecmds.c:1538 commands/tablecmds.c:10002
+#: commands/tablecmds.c:1540 commands/tablecmds.c:10129
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "non è possibile ereditare da una relazione temporanea di un'altra sessione"
 
-#: commands/tablecmds.c:1554 commands/tablecmds.c:10036
+#: commands/tablecmds.c:1556 commands/tablecmds.c:10163
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "la relazione \"%s\" sarebbe ereditata più di una volta"
 
-#: commands/tablecmds.c:1602
+#: commands/tablecmds.c:1604
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "unione delle definizioni multiple ereditate della colonna \"%s\""
 
-#: commands/tablecmds.c:1610
+#: commands/tablecmds.c:1612
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "la colonna ereditata \"%s\" ha un conflitto di tipo"
 
-#: commands/tablecmds.c:1612 commands/tablecmds.c:1633
-#: commands/tablecmds.c:1831 commands/tablecmds.c:1853
-#: parser/parse_coerce.c:1592 parser/parse_coerce.c:1612
-#: parser/parse_coerce.c:1632 parser/parse_coerce.c:1677
-#: parser/parse_coerce.c:1714 parser/parse_param.c:218
+#: commands/tablecmds.c:1614 commands/tablecmds.c:1635
+#: commands/tablecmds.c:1833 commands/tablecmds.c:1855
+#: parser/parse_coerce.c:1630 parser/parse_coerce.c:1650
+#: parser/parse_coerce.c:1670 parser/parse_coerce.c:1715
+#: parser/parse_coerce.c:1752 parser/parse_param.c:218
 #, c-format
 msgid "%s versus %s"
 msgstr "tra %s e %s"
 
-#: commands/tablecmds.c:1619
+#: commands/tablecmds.c:1621
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "la colonna ereditata \"%s\" ha un conflitto di ordinamento"
 
-#: commands/tablecmds.c:1621 commands/tablecmds.c:1841
-#: commands/tablecmds.c:4736
+#: commands/tablecmds.c:1623 commands/tablecmds.c:1843
+#: commands/tablecmds.c:4758
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "tra \"%s\" e \"%s\""
 
-#: commands/tablecmds.c:1631
+#: commands/tablecmds.c:1633
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "la colonna ereditata \"%s\" ha un conflitto di parametro di memorizzazione"
 
-#: commands/tablecmds.c:1744 parser/parse_utilcmd.c:894
-#: parser/parse_utilcmd.c:1238 parser/parse_utilcmd.c:1314
+#: commands/tablecmds.c:1746 commands/tablecmds.c:8059
+#: parser/parse_utilcmd.c:894 parser/parse_utilcmd.c:1240
+#: parser/parse_utilcmd.c:1316
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "non è possibile convertire riferimenti ad una riga intera di tabella"
 
-#: commands/tablecmds.c:1745 parser/parse_utilcmd.c:895
+#: commands/tablecmds.c:1747 parser/parse_utilcmd.c:895
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "Il vincolo \"%s\" contiene un riferimento alla riga intera alla tabella \"%s\"."
 
-#: commands/tablecmds.c:1817
+#: commands/tablecmds.c:1819
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "unione della colonna \"%s\" con la definizione ereditata"
 
-#: commands/tablecmds.c:1821
+#: commands/tablecmds.c:1823
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
 msgstr "spostamento e unione della colonna \"%s\" con la definizione ereditata"
 
-#: commands/tablecmds.c:1822
+#: commands/tablecmds.c:1824
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
 msgstr "Colonna specificata dall'utente spostata nella posizione della colonna ereditata."
 
-#: commands/tablecmds.c:1829
+#: commands/tablecmds.c:1831
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "la colonna \"%s\" ha un conflitto di tipi"
 
-#: commands/tablecmds.c:1839
+#: commands/tablecmds.c:1841
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "la colonna \"%s\" ha un conflitto di ordinamento"
 
-#: commands/tablecmds.c:1851
+#: commands/tablecmds.c:1853
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "la colonna \"%s\" ha un conflitto di parametri di memorizzazione"
 
-#: commands/tablecmds.c:1903
+#: commands/tablecmds.c:1905
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "la colonna \"%s\" eredita valori predefiniti in conflitto tra loro"
 
-#: commands/tablecmds.c:1905
+#: commands/tablecmds.c:1907
 #, c-format
 msgid "To resolve the conflict, specify a default explicitly."
 msgstr "Per risolvere il conflitto, specificare esplicitamente un valore predefinito."
 
-#: commands/tablecmds.c:1952
+#: commands/tablecmds.c:1954
 #, c-format
 msgid "check constraint name \"%s\" appears multiple times but with different expressions"
 msgstr "il nome del vincolo di controllo \"%s\" compare più di una volta ma con espressioni diverse"
 
-#: commands/tablecmds.c:2146
+#: commands/tablecmds.c:2148
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "non è possibile rinominare la colonna di una tabella con tipo"
 
-#: commands/tablecmds.c:2163
+#: commands/tablecmds.c:2165
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, composite type, index, or foreign table"
 msgstr "\"%s\" non è una tabella, vista, vista materializzata, tipo composito, indice né una tabella esterna"
 
-#: commands/tablecmds.c:2257
+#: commands/tablecmds.c:2259
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr "la colonna ereditata \"%s\" dev'essere rinominata anche nelle tabelle figlie"
 
-#: commands/tablecmds.c:2289
+#: commands/tablecmds.c:2291
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "non è possibile rinominare la colonna di sistema \"%s\""
 
-#: commands/tablecmds.c:2304
+#: commands/tablecmds.c:2306
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "non è possibile rinominare la colonna ereditata \"%s\""
 
-#: commands/tablecmds.c:2459
+#: commands/tablecmds.c:2461
 #, c-format
 msgid "inherited constraint \"%s\" must be renamed in child tables too"
 msgstr "i vincoli ereditati \"%s\" devono essere rinominati anche nelle tabelle figlie"
 
-#: commands/tablecmds.c:2466
+#: commands/tablecmds.c:2468
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
 msgstr "non è possibile rinominare il vincolo ereditato \"%s\""
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2692
+#: commands/tablecmds.c:2694
 #, c-format
 msgid "cannot %s \"%s\" because it is being used by active queries in this session"
 msgstr "non è possibile effettuare %s \"%s\" perché è in uso da query attive in questa sessione"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2701
+#: commands/tablecmds.c:2703
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr "non è possibile effettuare %s \"%s\" perché ha eventi trigger in sospeso"
 
-#: commands/tablecmds.c:3761
+#: commands/tablecmds.c:3777
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "non è possibile riscrivere la relazione di sistema \"%s\""
 
-#: commands/tablecmds.c:3767
+#: commands/tablecmds.c:3783
 #, c-format
 msgid "cannot rewrite table \"%s\" used as a catalog table"
 msgstr "non è possibile riscrivere la tabella \"%s\" usata come tabella di catalogo"
 
-#: commands/tablecmds.c:3777
+#: commands/tablecmds.c:3793
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "non è possibile riscrivere tabelle temporanee di altre sessioni"
 
-#: commands/tablecmds.c:4045
+#: commands/tablecmds.c:4061
 #, c-format
 msgid "rewriting table \"%s\""
 msgstr "riscrittura della tabella \"%s\""
 
-#: commands/tablecmds.c:4049
+#: commands/tablecmds.c:4065
 #, c-format
 msgid "verifying table \"%s\""
 msgstr "verifica della tabella \"%s\""
 
-#: commands/tablecmds.c:4163
+#: commands/tablecmds.c:4179
 #, c-format
 msgid "column \"%s\" contains null values"
 msgstr "la colonna \"%s\" contiene valori null"
 
-#: commands/tablecmds.c:4178 commands/tablecmds.c:7345
+#: commands/tablecmds.c:4194 commands/tablecmds.c:7356
 #, c-format
 msgid "check constraint \"%s\" is violated by some row"
 msgstr "il vincolo di controllo \"%s\" è violato da alcune righe"
 
-#: commands/tablecmds.c:4326 commands/trigger.c:234
-#: rewrite/rewriteDefine.c:267 rewrite/rewriteDefine.c:900
+#: commands/tablecmds.c:4342 commands/trigger.c:234 rewrite/rewriteDefine.c:267
+#: rewrite/rewriteDefine.c:912
 #, c-format
 msgid "\"%s\" is not a table or view"
 msgstr "\"%s\" non è una tabella né una vista"
 
-#: commands/tablecmds.c:4329
+#: commands/tablecmds.c:4345 commands/trigger.c:1120 commands/trigger.c:1225
+#, c-format
+msgid "\"%s\" is not a table, view, or foreign table"
+msgstr "\"%s\" non è una tabella, una vista né una tabella esterna"
+
+#: commands/tablecmds.c:4348
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, or index"
 msgstr "\"%s\" non è una tabella, una vista, una vista materializzata né un indice"
 
-#: commands/tablecmds.c:4335
+#: commands/tablecmds.c:4354
 #, c-format
 msgid "\"%s\" is not a table, materialized view, or index"
 msgstr "\"%s\" non è una tabella, una vista materializzata né un indice"
 
-#: commands/tablecmds.c:4338
+#: commands/tablecmds.c:4357
+#, c-format
+msgid "\"%s\" is not a table, materialized view, or foreign table"
+msgstr "\"%s\" non è una tabella, una vista materializzata né una tabella esterna"
+
+#: commands/tablecmds.c:4360
 #, c-format
 msgid "\"%s\" is not a table or foreign table"
 msgstr "\"%s\" non è una tabella né una tabella esterna"
 
-#: commands/tablecmds.c:4341
+#: commands/tablecmds.c:4363
 #, c-format
 msgid "\"%s\" is not a table, composite type, or foreign table"
 msgstr "\"%s\" non è una tabella, un tipo composito né una tabella esterna"
 
-#: commands/tablecmds.c:4344
+#: commands/tablecmds.c:4366 commands/tablecmds.c:5396
 #, c-format
-msgid "\"%s\" is not a table, materialized view, composite type, or foreign table"
-msgstr "\"%s\" non è una tabella, una vista materializzata, un tipo composito né una tabella esterna"
+msgid "\"%s\" is not a table, materialized view, index, or foreign table"
+msgstr "\"%s\" non è una tabella, una vista materializzata, un indice né una tabella esterna"
 
-#: commands/tablecmds.c:4354
+#: commands/tablecmds.c:4376
 #, c-format
 msgid "\"%s\" is of the wrong type"
 msgstr "\"%s\" è del tipo sbagliato"
 
-#: commands/tablecmds.c:4506 commands/tablecmds.c:4513
+#: commands/tablecmds.c:4528 commands/tablecmds.c:4535
 #, c-format
 msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
 msgstr "non è possibile modificare il tipo \"%s\" perché la colonna \"%s.%s\" lo usa"
 
-#: commands/tablecmds.c:4520
+#: commands/tablecmds.c:4542
 #, c-format
 msgid "cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr "non è possibile modificare la tabella esterna \"%s\" perché la colonna \"%s.%s\" usa il suo tipo di riga"
 
-#: commands/tablecmds.c:4527
+#: commands/tablecmds.c:4549
 #, c-format
 msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr "non è possibile modificare la tabella \"%s\" perché la colonna \"%s.%s\" usa il suo tipo di riga"
 
-#: commands/tablecmds.c:4589
+#: commands/tablecmds.c:4611
 #, c-format
 msgid "cannot alter type \"%s\" because it is the type of a typed table"
 msgstr "non è possibile modificare il tipo \"%s\" perché è il tipo di una tabella con tipo"
 
-#: commands/tablecmds.c:4591
+#: commands/tablecmds.c:4613
 #, c-format
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
 msgstr "Usa DROP ... CASCADE per eliminare anche le tabelle con tipo."
 
-#: commands/tablecmds.c:4635
+#: commands/tablecmds.c:4657
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "il tipo %s non è un tipo composito"
 
-#: commands/tablecmds.c:4661
+#: commands/tablecmds.c:4683
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "non è possibile aggiungere una colonna ad una tabella con tipo"
 
-#: commands/tablecmds.c:4728 commands/tablecmds.c:10195
+#: commands/tablecmds.c:4750 commands/tablecmds.c:10322
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr "la tabella figlia \"%s\" ha tipo diverso per la colonna \"%s\""
 
-#: commands/tablecmds.c:4734 commands/tablecmds.c:10202
+#: commands/tablecmds.c:4756 commands/tablecmds.c:10329
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
 msgstr "la tabella figlia \"%s\" ha ordinamento diverso per la colonna \"%s\""
 
-#: commands/tablecmds.c:4744
+#: commands/tablecmds.c:4766
 #, c-format
 msgid "child table \"%s\" has a conflicting \"%s\" column"
 msgstr "la tabella figlia \"%s\" ha la colonna \"%s\" in conflitto"
 
-#: commands/tablecmds.c:4756
+#: commands/tablecmds.c:4778
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr "unione delle definizioni della colonna \"%s\" per la tabella figlia \"%s\""
 
-#: commands/tablecmds.c:4983
+#: commands/tablecmds.c:4999
 #, c-format
 msgid "column must be added to child tables too"
 msgstr "la colonna deve essere aggiunta anche alle tabelle figlie"
 
-#: commands/tablecmds.c:5058
-#, c-format
-msgid "column \"%s\" of relation \"%s\" already exists, skipping"
-msgstr "la colonna \"%s\" della relazione \"%s\" esiste già, saltata"
-
-#: commands/tablecmds.c:5065
+#: commands/tablecmds.c:5069
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "la colonna \"%s\" della relazione \"%s\" esiste già"
 
-#: commands/tablecmds.c:5176 commands/tablecmds.c:5282
-#: commands/tablecmds.c:5340 commands/tablecmds.c:5454
-#: commands/tablecmds.c:5511 commands/tablecmds.c:5605
-#: commands/tablecmds.c:7863 commands/tablecmds.c:8488
+#: commands/tablecmds.c:5177 commands/tablecmds.c:5283
+#: commands/tablecmds.c:5341 commands/tablecmds.c:5455
+#: commands/tablecmds.c:5512 commands/tablecmds.c:5606
+#: commands/tablecmds.c:7895 commands/tablecmds.c:8577
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "non è possibile modificare la colonna di sistema \"%s\""
 
-#: commands/tablecmds.c:5212
+#: commands/tablecmds.c:5213
 #, c-format
 msgid "column \"%s\" is in a primary key"
 msgstr "la colonna \"%s\" è in una chiave primaria"
 
-#: commands/tablecmds.c:5395
-#, c-format
-msgid "\"%s\" is not a table, materialized view, index, or foreign table"
-msgstr "\"%s\" non è una tabella, una vista materializzata, un indice né una tabella esterna"
-
-#: commands/tablecmds.c:5427
+#: commands/tablecmds.c:5428
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "il target delle statistiche %d è troppo basso"
 
-#: commands/tablecmds.c:5435
+#: commands/tablecmds.c:5436
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "target delle statistiche abbassato a %d"
 
-#: commands/tablecmds.c:5585
+#: commands/tablecmds.c:5586
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "tipo di immagazzinamento non valido \"%s\""
 
-#: commands/tablecmds.c:5617
+#: commands/tablecmds.c:5618
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "il tipo di dato della colonna %s può avere solo immagazzinamento PLAIN"
 
-#: commands/tablecmds.c:5655
+#: commands/tablecmds.c:5656
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "non è possibile eliminare la colonna da una tabella con tipo"
 
-#: commands/tablecmds.c:5699
+#: commands/tablecmds.c:5700
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "la colonna \"%s\" della relazione \"%s\" non esiste, saltato"
 
-#: commands/tablecmds.c:5712
+#: commands/tablecmds.c:5713
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "non è possibile eliminare la colonna di sistema \"%s\""
 
-#: commands/tablecmds.c:5719
+#: commands/tablecmds.c:5720
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "non è possibile eliminare la colonna ereditata \"%s\""
 
-#: commands/tablecmds.c:5959
+#: commands/tablecmds.c:5960
 #, c-format
 msgid "ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
 msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX rinominerà l'indice \"%s\" in \"%s\""
 
-#: commands/tablecmds.c:6181
+#: commands/tablecmds.c:6173
 #, c-format
 msgid "constraint must be added to child tables too"
 msgstr "il vincolo deve essere aggiunto anche alle tabelle figlie"
 
-#: commands/tablecmds.c:6252
+#: commands/tablecmds.c:6244
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "la relazione referenziata \"%s\" non è una tabella"
 
-#: commands/tablecmds.c:6275
+#: commands/tablecmds.c:6267
 #, c-format
 msgid "constraints on permanent tables may reference only permanent tables"
 msgstr "i vincoli su tabelle permanenti possono referenziare solo tabelle permanenti"
 
-#: commands/tablecmds.c:6282
+#: commands/tablecmds.c:6274
 #, c-format
 msgid "constraints on unlogged tables may reference only permanent or unlogged tables"
 msgstr "i vincoli su tabelle non loggate possono referenziare solo tabelle permanenti o non loggate"
 
-#: commands/tablecmds.c:6288
+#: commands/tablecmds.c:6280
 #, c-format
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr "i vincoli su tabelle temporanee possono referenziare solo tabelle temporanee"
 
-#: commands/tablecmds.c:6292
+#: commands/tablecmds.c:6284
 #, c-format
 msgid "constraints on temporary tables must involve temporary tables of this session"
 msgstr "i vincoli su tabelle temporanee devono riferirsi a tabelle temporanee di questa sessione"
 
-#: commands/tablecmds.c:6353
+#: commands/tablecmds.c:6345
 #, c-format
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr "i numeri di colonne referenzianti e referenziate per la chiave esterna non combaciano"
 
-#: commands/tablecmds.c:6460
+#: commands/tablecmds.c:6452
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "non è possibile implementare il vincolo di chiave esterna \"%s\""
 
-#: commands/tablecmds.c:6463
+#: commands/tablecmds.c:6455
 #, c-format
 msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
 msgstr "Le colonne chiave \"%s\" e \"%s\" hanno tipi incompatibili: %s e %s."
 
-#: commands/tablecmds.c:6670 commands/tablecmds.c:6820
-#: commands/tablecmds.c:7702 commands/tablecmds.c:7758
+#: commands/tablecmds.c:6662 commands/tablecmds.c:6830
+#: commands/tablecmds.c:7734 commands/tablecmds.c:7790
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "il vincolo \"%s\" della relazione \"%s\" non esiste"
 
-#: commands/tablecmds.c:6676
+#: commands/tablecmds.c:6668
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
 msgstr "il vincolo \"%s\" della relazione \"%s\" non è una chiave esterna"
 
-#: commands/tablecmds.c:6827
+#: commands/tablecmds.c:6837
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key or check constraint"
 msgstr "il vincolo \"%s\" della relazione \"%s\" non è una chiave esterna o un vincolo di controllo"
 
-#: commands/tablecmds.c:6895
+#: commands/tablecmds.c:6906
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "i vincoli devono essere validati anche sulle tabelle figlie"
 
-#: commands/tablecmds.c:6964
+#: commands/tablecmds.c:6975
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "la colonna \"%s\" referenziata dal vincolo di chiave esterna non esiste"
 
-#: commands/tablecmds.c:6969
+#: commands/tablecmds.c:6980
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "non possono esserci più di %d chiavi in una chiave esterna"
 
-#: commands/tablecmds.c:7034
+#: commands/tablecmds.c:7045
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr "non è possibile usare una chiave primaria deferita per la tabella referenziata \"%s\""
 
-#: commands/tablecmds.c:7051
+#: commands/tablecmds.c:7062
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "la tabella referenziata \"%s\" non ha una chiave primaria"
 
-#: commands/tablecmds.c:7116
+#: commands/tablecmds.c:7127
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr "la lista di colonne referenziate dalla chiave esterna non deve contenere duplicati"
 
-#: commands/tablecmds.c:7210
+#: commands/tablecmds.c:7221
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr "non è possibile usare un vincolo univoco deferito per la tabella referenziata \"%s\""
 
-#: commands/tablecmds.c:7215
+#: commands/tablecmds.c:7226
 #, c-format
 msgid "there is no unique constraint matching given keys for referenced table \"%s\""
 msgstr "non c'è alcun vincolo univoco che corrisponda alle chiavi indicate per la tabella referenziata \"%s\""
 
-#: commands/tablecmds.c:7378
+#: commands/tablecmds.c:7389
 #, c-format
 msgid "validating foreign key constraint \"%s\""
 msgstr "validazione del vincolo di chiave esterna \"%s\""
 
-#: commands/tablecmds.c:7674
+#: commands/tablecmds.c:7688
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "non è possibile eliminare il vincolo ereditato \"%s\" della relazione \"%s\""
 
-#: commands/tablecmds.c:7708
+#: commands/tablecmds.c:7740
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "il vincolo \"%s\" della relazione \"%s\" non esiste, saltato"
 
-#: commands/tablecmds.c:7847
+#: commands/tablecmds.c:7879
 #, c-format
 msgid "cannot alter column type of typed table"
 msgstr "non è possibile modificare il tipo di colonna di una tabella con tipo"
 
-#: commands/tablecmds.c:7870
+#: commands/tablecmds.c:7902
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "non è possibile modificare la colonna ereditata \"%s\""
 
-#: commands/tablecmds.c:7919
+#: commands/tablecmds.c:7951
 #, c-format
 msgid "result of USING clause for column \"%s\" cannot be cast automatically to type %s"
 msgstr "il risultato della clausola USING per la colonna \"%s\" non può essere convertito automaticamente al tipo %s"
 
-#: commands/tablecmds.c:7922
+#: commands/tablecmds.c:7954
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "Potresti dover aggiungere una conversione esplicita."
 
-#: commands/tablecmds.c:7926
+#: commands/tablecmds.c:7958
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
 msgstr "la colonna \"%s\" non può essere convertita automaticamente al tipo %s"
 
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:7929
+#: commands/tablecmds.c:7961
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "Potresti dover specificare \"USING %s::%s\"."
 
-#: commands/tablecmds.c:7982
+#: commands/tablecmds.c:8060
+#, c-format
+msgid "USING expression contains a whole-row table reference."
+msgstr "L'espressione USING contiene un riferimento alla riga completa della tabella."
+
+#: commands/tablecmds.c:8071
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr "il tipo della colonna ereditata \"%s\" deve essere cambiato anche nelle tabelle figlie"
 
-#: commands/tablecmds.c:8069
+#: commands/tablecmds.c:8158
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "non è possibile cambiare il tipo della colonna \"%s\" due volte"
 
-#: commands/tablecmds.c:8105
+#: commands/tablecmds.c:8194
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
 msgstr "il valore predefinito della colonna \"%s\" non può essere convertito automaticamente al tipo %s"
 
-#: commands/tablecmds.c:8231
+#: commands/tablecmds.c:8320
 #, c-format
 msgid "cannot alter type of a column used by a view or rule"
 msgstr "non è possibile cambiare il tipo di una colonna usata in una vista o una regola"
 
-#: commands/tablecmds.c:8232 commands/tablecmds.c:8251
-#: commands/tablecmds.c:8269
+#: commands/tablecmds.c:8321 commands/tablecmds.c:8340
+#: commands/tablecmds.c:8358
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s dipende dalla colonna \"%s\""
 
-#: commands/tablecmds.c:8250
+#: commands/tablecmds.c:8339
 #, c-format
 msgid "cannot alter type of a column used in a trigger definition"
 msgstr "non è possibile cambiare il tipo di una colonna usata nella definizione di un trigger"
 
-#: commands/tablecmds.c:8268
+#: commands/tablecmds.c:8357
 #, c-format
 msgid "cannot alter type of a column used in a policy definition"
-msgstr "non è possibile cambiare il tipo di una colonna usata nella definizione di una politica"
+msgstr "non è possibile cambiare il tipo di una colonna usata nella definizione di una regola di sicurezza"
 
-#: commands/tablecmds.c:8913
+#: commands/tablecmds.c:9022
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "non è possibile cambiare il proprietario dell'indice \"%s\""
 
-#: commands/tablecmds.c:8915
+#: commands/tablecmds.c:9024
 #, c-format
 msgid "Change the ownership of the index's table, instead."
 msgstr "Cambia il proprietario della tabella dell'indice invece."
 
-#: commands/tablecmds.c:8931
+#: commands/tablecmds.c:9040
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "non è possibile cambiare il proprietario della sequenza \"%s\""
 
-#: commands/tablecmds.c:8933 commands/tablecmds.c:11303
+#: commands/tablecmds.c:9042 commands/tablecmds.c:11513
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "La sequenza \"%s\" è collegata alla tabella \"%s\"."
 
-#: commands/tablecmds.c:8945 commands/tablecmds.c:11944
+#: commands/tablecmds.c:9054 commands/tablecmds.c:12154
 #, c-format
 msgid "Use ALTER TYPE instead."
 msgstr "È possibile usare ALTER TYPE invece."
 
-#: commands/tablecmds.c:8954
+#: commands/tablecmds.c:9063
 #, c-format
 msgid "\"%s\" is not a table, view, sequence, or foreign table"
 msgstr "\"%s\" non è una tabella, una vista, una sequenza né una tabella esterna"
 
-#: commands/tablecmds.c:9298
+#: commands/tablecmds.c:9406
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "non è possibile avere più di un sottocomando SET TABLESPACE"
 
-#: commands/tablecmds.c:9371
+#: commands/tablecmds.c:9479
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, index, or TOAST table"
 msgstr "\"%s\" non è una tabella, una vista, una vista materializzata né una tabella TOAST"
 
-#: commands/tablecmds.c:9404 commands/view.c:481
+#: commands/tablecmds.c:9512 commands/view.c:498
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr "WITH CHECK OPTION è supportato solo su viste aggiornabili automaticamente"
 
-#: commands/tablecmds.c:9550
+#: commands/tablecmds.c:9658
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "non è possibile spostare la relazione \"%s\""
 
-#: commands/tablecmds.c:9566
+#: commands/tablecmds.c:9674
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "non è possibile spostare tabelle temporanee di altre sessioni"
 
-#: commands/tablecmds.c:9694
+#: commands/tablecmds.c:9811
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr "solo tabelle, indici e viste materializzate esistono nei tablespace"
 
-#: commands/tablecmds.c:9706
+#: commands/tablecmds.c:9823
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
 msgstr "non è possibile spostare relazioni dentro o fuori il tablespace pg_global"
 
-#: commands/tablecmds.c:9797
+#: commands/tablecmds.c:9914
 #, c-format
-msgid "aborting because lock on relation \"%s\".\"%s\" is not available"
-msgstr "interruzione perché non c'è un lock disponibile sulla relazione \"%s\".\"%s\""
+msgid "aborting because lock on relation \"%s.%s\" is not available"
+msgstr "interruzione perché non c'è un lock disponibile sulla relazione \"%s.%s\""
 
-#: commands/tablecmds.c:9813
+#: commands/tablecmds.c:9930
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "nessuna relazione corrispondente trovata nel tablespace \"%s\""
 
-#: commands/tablecmds.c:9877 storage/buffer/bufmgr.c:801
+#: commands/tablecmds.c:10004 storage/buffer/bufmgr.c:801
 #, c-format
 msgid "invalid page in block %u of relation %s"
 msgstr "pagina non valida nel blocco %u della relazione %s"
 
-#: commands/tablecmds.c:9959
+#: commands/tablecmds.c:10086
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "non è possibile cambiare ereditarietà di tabelle con tipo"
 
-#: commands/tablecmds.c:10009
+#: commands/tablecmds.c:10136
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "non è possibile ereditare tabelle temporanee di un'altra sessione"
 
-#: commands/tablecmds.c:10063
+#: commands/tablecmds.c:10190
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "l'ereditarietà circolare non è consentita"
 
-#: commands/tablecmds.c:10064
+#: commands/tablecmds.c:10191
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "\"%s\" è già figlia di \"%s\"."
 
-#: commands/tablecmds.c:10072
+#: commands/tablecmds.c:10199
 #, c-format
 msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
 msgstr "la tabella \"%s\" senza OID non può ereditare dalla tabella \"%s\" con OID"
 
-#: commands/tablecmds.c:10213
+#: commands/tablecmds.c:10340
 #, c-format
 msgid "column \"%s\" in child table must be marked NOT NULL"
 msgstr "la colonna \"%s\" nella tabella figlia dev'essere marcata NOT NULL"
 
-#: commands/tablecmds.c:10229
+#: commands/tablecmds.c:10356 commands/tablecmds.c:10389
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "la tabella figlia non ha la colonna \"%s\""
 
-#: commands/tablecmds.c:10312
+#: commands/tablecmds.c:10472
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr "la tabella figlia \"%s\" ha una definizione diversa del vincolo di controllo \"%s\""
 
-#: commands/tablecmds.c:10320
+#: commands/tablecmds.c:10480
 #, c-format
 msgid "constraint \"%s\" conflicts with non-inherited constraint on child table \"%s\""
 msgstr "il vincolo \"%s\" è in conflitto con un vincolo non ereditato nella tabella figlia \"%s\""
 
-#: commands/tablecmds.c:10344
+#: commands/tablecmds.c:10491
+#, c-format
+msgid "constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
+msgstr "il vincolo \"%s\" è in conflitto con un vincolo non valido nella tabella figlia \"%s\""
+
+#: commands/tablecmds.c:10515
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "la tabella figlia non ha il vincolo \"%s\""
 
-#: commands/tablecmds.c:10428
+#: commands/tablecmds.c:10599
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "la relazione \"%s\" non è genitore della relazione \"%s\""
 
-#: commands/tablecmds.c:10662
+#: commands/tablecmds.c:10833
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "le tabelle con tipo non possono essere ereditate"
 
-#: commands/tablecmds.c:10693
+#: commands/tablecmds.c:10864
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "la tabella non ha la colonna \"%s\""
 
-#: commands/tablecmds.c:10703
+#: commands/tablecmds.c:10874
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
 msgstr "la tabella ha la colonna \"%s\" laddove il tipo richiede \"%s\""
 
-#: commands/tablecmds.c:10712
+#: commands/tablecmds.c:10883
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
 msgstr "la tabella \"%s\" ha tipo diverso per la colonna \"%s\""
 
-#: commands/tablecmds.c:10725
+#: commands/tablecmds.c:10896
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "la tabella ha la colonna \"%s\" in eccesso"
 
-#: commands/tablecmds.c:10777
+#: commands/tablecmds.c:10948
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "\"%s\" non è una tabella con tipo"
 
-#: commands/tablecmds.c:10960
+#: commands/tablecmds.c:11131
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
 msgstr "non è possibile usare l'indice non univoco \"%s\" come identità di replica"
 
-#: commands/tablecmds.c:10966
+#: commands/tablecmds.c:11137
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
 msgstr "non è possibile usare l'indice non immediato \"%s\" come identità di replica"
 
-#: commands/tablecmds.c:10972
+#: commands/tablecmds.c:11143
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr "non è possibile usare l'indice su espressione \"%s\" come identità di replica"
 
-#: commands/tablecmds.c:10978
+#: commands/tablecmds.c:11149
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "non è possibile usare l'indice parziale \"%s\" come identità di replica"
 
-#: commands/tablecmds.c:10984
+#: commands/tablecmds.c:11155
 #, c-format
 msgid "cannot use invalid index \"%s\" as replica identity"
 msgstr "non è possibile usare l'indice non valido \"%s\" come identità di replica"
 
-#: commands/tablecmds.c:11002
-#, c-format
-msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
-msgstr "l'indice \"%s\" non può essere usato come identità di replica perché la colonna \"%s\" può essere NULL"
-
-#: commands/tablecmds.c:11170
-#, c-format
-msgid "cannot change logged status of table %s"
-msgstr "non è possibile cambiare lo stato di log della tabella %s"
-
-#: commands/tablecmds.c:11172
+#: commands/tablecmds.c:11176
 #, c-format
-msgid "Table %s is temporary."
-msgstr "La tabella %s è temporanea."
+msgid "index \"%s\" cannot be used as replica identity because column %d is a system column"
+msgstr "l'indice \"%s\" non può essere usato come identità di replica perché la colonna %d è una colonna di sistema"
 
-#: commands/tablecmds.c:11231
+#: commands/tablecmds.c:11183
 #, c-format
-msgid "cannot change status of table %s to logged"
-msgstr "non è possibile cambiare lo stato della tabella %s a loggata"
+msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
+msgstr "l'indice \"%s\" non può essere usato come identità di replica perché la colonna \"%s\" può essere NULL"
 
-#: commands/tablecmds.c:11233
+#: commands/tablecmds.c:11386
 #, c-format
-msgid "Table %s references unlogged table %s."
-msgstr "La tabella %s è referenziata dalla tabella non loggata %s."
+msgid "cannot change logged status of table \"%s\" because it is temporary"
+msgstr "non è possibile cambiare lo stato di log della tabella \"%s\" perché è temporanea"
 
-#: commands/tablecmds.c:11243
+#: commands/tablecmds.c:11445
 #, c-format
-msgid "cannot change status of table %s to unlogged"
-msgstr "non è possibile cambiare lo stato della tabella %s a non loggata"
+msgid "could not change table \"%s\" to logged because it references unlogged table \"%s\""
+msgstr "non è possibile cambiare lo stato della tabella \"%s\" a loggata perché referenzia la tabella non loggata \"%s\""
 
-#: commands/tablecmds.c:11245
+#: commands/tablecmds.c:11455
 #, c-format
-msgid "Logged table %s is referenced by table %s."
-msgstr "La tabella loggata %s è referenziata dalla tabella %s."
+msgid "could not change table \"%s\" to unlogged because it references logged table \"%s\""
+msgstr "non è possibile cambiare lo stato della tabella \"%s\" a non loggata perché referenzia la tabella loggata \"%s\""
 
-#: commands/tablecmds.c:11302
+#: commands/tablecmds.c:11512
 #, c-format
 msgid "cannot move an owned sequence into another schema"
 msgstr "non è possibile spostare una sequenza con proprietario in uno schema diverso"
 
-#: commands/tablecmds.c:11403
+#: commands/tablecmds.c:11613
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "la relazione \"%s\" esiste già nello schema \"%s\""
 
-#: commands/tablecmds.c:11928
+#: commands/tablecmds.c:12138
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "\"%s\" non è un tipo composito"
 
-#: commands/tablecmds.c:11958
+#: commands/tablecmds.c:12168
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, sequence, or foreign table"
 msgstr "\"%s\" non è una tabella, una vista, una vista materializzata, una sequenza né una tabella esterna"
 
 #: commands/tablespace.c:162 commands/tablespace.c:179
 #: commands/tablespace.c:190 commands/tablespace.c:198
-#: commands/tablespace.c:624 replication/slot.c:985 storage/file/copydir.c:47
+#: commands/tablespace.c:625 replication/slot.c:941 storage/file/copydir.c:47
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "creazione della directory \"%s\" fallita: %m"
@@ -8153,90 +8118,85 @@
 msgid "tablespace location should not be inside the data directory"
 msgstr "la locazione del tablespace non dev'essere all'interno della directory dei dati"
 
-#: commands/tablespace.c:304 commands/tablespace.c:937
+#: commands/tablespace.c:304 commands/tablespace.c:952
 #, c-format
 msgid "unacceptable tablespace name \"%s\""
 msgstr "il nome del tablespace \"%s\" non è accettabile"
 
-#: commands/tablespace.c:306 commands/tablespace.c:938
+#: commands/tablespace.c:306 commands/tablespace.c:953
 #, c-format
 msgid "The prefix \"pg_\" is reserved for system tablespaces."
 msgstr "Il prefisso \"pg_\" è riservato per i tablespace di sistema."
 
-#: commands/tablespace.c:316 commands/tablespace.c:950
+#: commands/tablespace.c:316 commands/tablespace.c:965
 #, c-format
 msgid "tablespace \"%s\" already exists"
 msgstr "il tablespace \"%s\" esiste già"
 
-#: commands/tablespace.c:429 commands/tablespace.c:920
-#: commands/tablespace.c:1001 commands/tablespace.c:1070
-#: commands/tablespace.c:1203 commands/tablespace.c:1403
+#: commands/tablespace.c:430 commands/tablespace.c:935
+#: commands/tablespace.c:1016 commands/tablespace.c:1085
+#: commands/tablespace.c:1218 commands/tablespace.c:1418
 #, c-format
 msgid "tablespace \"%s\" does not exist"
 msgstr "il tablespace \"%s\" non esiste"
 
-#: commands/tablespace.c:435
+#: commands/tablespace.c:436
 #, c-format
 msgid "tablespace \"%s\" does not exist, skipping"
 msgstr "il tablespace \"%s\" non esiste, saltato"
 
-#: commands/tablespace.c:511
+#: commands/tablespace.c:512
 #, c-format
 msgid "tablespace \"%s\" is not empty"
 msgstr "il tablespace \"%s\" non è vuoto"
 
-#: commands/tablespace.c:583
+#: commands/tablespace.c:584
 #, c-format
 msgid "directory \"%s\" does not exist"
 msgstr "la directory \"%s\" non esiste"
 
-#: commands/tablespace.c:584
+#: commands/tablespace.c:585
 #, c-format
 msgid "Create this directory for the tablespace before restarting the server."
 msgstr "Crea questa directory per il tablespace prima di riavviare il server."
 
-#: commands/tablespace.c:589
+#: commands/tablespace.c:590
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
 msgstr "impostazione dei permessi sulla directory \"%s\" fallita: %m"
 
-#: commands/tablespace.c:619
+#: commands/tablespace.c:620
 #, c-format
 msgid "directory \"%s\" already in use as a tablespace"
 msgstr "la directory \"%s\" già è in uso come tablespace"
 
-#: commands/tablespace.c:743 commands/tablespace.c:756
-#: commands/tablespace.c:780 commands/tablespace.c:871
+#: commands/tablespace.c:744 commands/tablespace.c:757
+#: commands/tablespace.c:793 commands/tablespace.c:885
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "rimozione della directory \"%s\" fallita: %m"
 
-#: commands/tablespace.c:792 commands/tablespace.c:880
+#: commands/tablespace.c:806 commands/tablespace.c:894
 #, c-format
 msgid "could not remove symbolic link \"%s\": %m"
 msgstr "rimozione del link simbolico \"%s\" fallita: %m"
 
-#: commands/tablespace.c:802 commands/tablespace.c:888
+#: commands/tablespace.c:816 commands/tablespace.c:903
 #, c-format
-msgid "not a directory or symbolic link: \"%s\""
-msgstr "non è una directory o un link simbolico: \"%s\""
+msgid "\"%s\" is not a directory or symbolic link"
+msgstr "\"%s\" non è una directory o un link simbolico"
 
-#: commands/tablespace.c:859
-#, c-format
-msgid "could not stat \"%s\": %m"
-msgstr "richiesta informazioni su \"%s\" non riuscita: %m"
-
-#: commands/tablespace.c:1075
+#: commands/tablespace.c:1090
 #, c-format
 msgid "Tablespace \"%s\" does not exist."
 msgstr "Il tablespace \"%s\" non esiste."
 
-#: commands/tablespace.c:1502
+#: commands/tablespace.c:1517
 #, c-format
 msgid "directories for tablespace %u could not be removed"
 msgstr "rimozioni delle directory per il tablespace %u fallita"
 
-#: commands/tablespace.c:1504
+#: commands/tablespace.c:1519
 #, c-format
 msgid "You can remove the directories manually if necessary."
 msgstr "Puoi rimuovere le directory manualmente se necessario."
@@ -8363,11 +8323,6 @@
 msgid "converting trigger group into constraint \"%s\" %s"
 msgstr "conversione del gruppo di trigger nel vincolo \"%s\" %s"
 
-#: commands/trigger.c:1120 commands/trigger.c:1225
-#, c-format
-msgid "\"%s\" is not a table, view, or foreign table"
-msgstr "\"%s\" non è una tabella, una vista né una tabella esterna"
-
 #: commands/trigger.c:1191 commands/trigger.c:1352 commands/trigger.c:1470
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
@@ -8389,22 +8344,21 @@
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "il trigger BEFORE STATEMENT non può restituire un valore"
 
-#: commands/trigger.c:2727 executor/nodeModifyTable.c:631
-#: executor/nodeModifyTable.c:919
+#: commands/trigger.c:2727 executor/nodeModifyTable.c:663
+#: executor/nodeModifyTable.c:957
 #, c-format
 msgid "tuple to be updated was already modified by an operation triggered by the current command"
 msgstr "la tupla da aggiornare era stata già modificata da un'operazione fatta eseguire da un comando corrente"
 
-#: commands/trigger.c:2728 executor/nodeModifyTable.c:632
-#: executor/nodeModifyTable.c:920
+#: commands/trigger.c:2728 executor/nodeModifyTable.c:664
+#: executor/nodeModifyTable.c:958
 #, c-format
 msgid "Consider using an AFTER trigger instead of a BEFORE trigger to propagate changes to other rows."
 msgstr "Considera l'utilizzo di un trigger AFTER invece di un trigger BEFORE per propagare i cambiamenti ad altre righe."
 
-#: commands/trigger.c:2742 executor/execMain.c:2332
-#: executor/nodeLockRows.c:216 executor/nodeModifyTable.c:183
-#: executor/nodeModifyTable.c:644 executor/nodeModifyTable.c:932
-#: executor/nodeModifyTable.c:1099
+#: commands/trigger.c:2742 executor/execMain.c:2344 executor/nodeLockRows.c:216
+#: executor/nodeModifyTable.c:196 executor/nodeModifyTable.c:676
+#: executor/nodeModifyTable.c:970 executor/nodeModifyTable.c:1137
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "serializzazione dell'accesso fallita a causa di modifiche concorrenti"
@@ -8664,7 +8618,7 @@
 msgid "specifying constraint deferrability not supported for domains"
 msgstr "specificare la deferibilità dei vincoli non è ammesso per i domini"
 
-#: commands/typecmds.c:1289 utils/cache/typcache.c:1579
+#: commands/typecmds.c:1289 utils/cache/typcache.c:1633
 #, c-format
 msgid "%s is not an enum"
 msgstr "%s non è una enumerazione"
@@ -8764,7 +8718,7 @@
 msgid "column \"%s\" of table \"%s\" contains values that violate the new constraint"
 msgstr "la colonna \"%s\" della tabella \"%s\" contiene valori che violano il nuovo vincolo"
 
-#: commands/typecmds.c:2967 commands/typecmds.c:3224 commands/typecmds.c:3432
+#: commands/typecmds.c:2967 commands/typecmds.c:3224 commands/typecmds.c:3413
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s non è un dominio"
@@ -8779,27 +8733,27 @@
 msgid "cannot use table references in domain check constraint"
 msgstr "non è possibile usare riferimenti a tabelle nel vincolo di controllo del dominio"
 
-#: commands/typecmds.c:3154 commands/typecmds.c:3236 commands/typecmds.c:3545
+#: commands/typecmds.c:3154 commands/typecmds.c:3236 commands/typecmds.c:3526
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s è il tipo della riga di una tabella"
 
-#: commands/typecmds.c:3156 commands/typecmds.c:3238 commands/typecmds.c:3547
+#: commands/typecmds.c:3156 commands/typecmds.c:3238 commands/typecmds.c:3528
 #, c-format
 msgid "Use ALTER TABLE instead."
 msgstr "Usa ALTER TABLE invece."
 
-#: commands/typecmds.c:3163 commands/typecmds.c:3245 commands/typecmds.c:3464
+#: commands/typecmds.c:3163 commands/typecmds.c:3245 commands/typecmds.c:3445
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "non è possibile modificare il tipo di array %s"
 
-#: commands/typecmds.c:3165 commands/typecmds.c:3247 commands/typecmds.c:3466
+#: commands/typecmds.c:3165 commands/typecmds.c:3247 commands/typecmds.c:3447
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr "puoi modificare il tipo %s, il che modificherà il tipo dell'array come conseguenza."
 
-#: commands/typecmds.c:3531
+#: commands/typecmds.c:3512
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "il tipo \"%s\" esiste già nello schema \"%s\""
@@ -8867,12 +8821,12 @@
 
 #: commands/user.c:962
 #, c-format
-msgid "cannot use special role specifier in \"%s\""
-msgstr "non è possibile usare lo specificatore di ruolo speciale in \"%s\""
+msgid "cannot use special role specifier in DROP ROLE"
+msgstr "non è possibile usare lo specificatore di ruolo speciale in DROP ROLE"
 
-#: commands/user.c:972 commands/user.c:1128 commands/variable.c:798
-#: commands/variable.c:870 utils/adt/acl.c:5120 utils/adt/acl.c:5172
-#: utils/adt/acl.c:5205 utils/adt/acl.c:5223 utils/init/miscinit.c:490
+#: commands/user.c:972 commands/user.c:1128 commands/variable.c:799
+#: commands/variable.c:871 utils/adt/acl.c:5120 utils/adt/acl.c:5172
+#: utils/adt/acl.c:5205 utils/adt/acl.c:5223 utils/init/miscinit.c:494
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "il ruolo \"%s\" non esiste"
@@ -8992,122 +8946,126 @@
 msgid "Close open transactions with multixacts soon to avoid wraparound problems."
 msgstr "Chiudi presto le transazioni con multixact per evitare problemi di wraparound."
 
-#: commands/vacuum.c:1130
+#: commands/vacuum.c:1138
 #, c-format
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr "alcuni database non sono stati ripuliti per più di 2 miliardi di transazioni"
 
-#: commands/vacuum.c:1131
+#: commands/vacuum.c:1139
 #, c-format
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr "Potresti aver già subito perdita di dati dovuta al wraparound delle transazioni."
 
-#: commands/vacuum.c:1252
+#: commands/vacuum.c:1260
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "pulizia di \"%s\" saltata --- lock non disponibile"
 
-#: commands/vacuum.c:1278
+#: commands/vacuum.c:1286
 #, c-format
 msgid "skipping \"%s\" --- only superuser can vacuum it"
 msgstr "\"%s\" saltato --- solo i superutenti possono pulirla"
 
-#: commands/vacuum.c:1282
+#: commands/vacuum.c:1290
 #, c-format
 msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
 msgstr "\"%s\" saltato --- solo i superutenti o il proprietario del database possono pulirla"
 
-#: commands/vacuum.c:1286
+#: commands/vacuum.c:1294
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can vacuum it"
 msgstr "\"%s\" saltato --- solo il proprietario del database o della tabella possono pulirla"
 
-#: commands/vacuum.c:1304
+#: commands/vacuum.c:1312
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr "\"%s\" saltato --- non è possibile ripulire non-tabelle o tabelle speciali di sistema"
 
-#: commands/vacuumlazy.c:358
+#: commands/vacuumlazy.c:363
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr "vacuum automatico della tabella \"%s.%s.%s\": scan di indici: %d\n"
 
-#: commands/vacuumlazy.c:363
+#: commands/vacuumlazy.c:368
 #, c-format
 msgid "pages: %u removed, %u remain, %u skipped due to pins\n"
 msgstr "pagine: %u rimosse, %u restanti, %u saltate perché bloccate\n"
 
-#: commands/vacuumlazy.c:368
+#: commands/vacuumlazy.c:373
 #, c-format
 msgid "tuples: %.0f removed, %.0f remain, %.0f are dead but not yet removable\n"
 msgstr "tuple: %.0f rimosse, %.0f restanti, %.0f sono morte ma non ancora removibili\n"
 
-#: commands/vacuumlazy.c:373
+#: commands/vacuumlazy.c:378
 #, c-format
 msgid "buffer usage: %d hits, %d misses, %d dirtied\n"
 msgstr "uso dei buffer: %d colpiti, %d mancati, %d sporcati\n"
 
-#: commands/vacuumlazy.c:377
+#: commands/vacuumlazy.c:382
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr "velocità di lettura media: %.3f MB/s, velocità di scrittura media: %.3f MB/s\n"
 
-#: commands/vacuumlazy.c:379
+#: commands/vacuumlazy.c:384
 #, c-format
 msgid "system usage: %s"
 msgstr "utilizzo di sistema: %s"
 
-#: commands/vacuumlazy.c:701
+#: commands/vacuumlazy.c:708
 #, c-format
 msgid "relation \"%s\" page %u is uninitialized --- fixing"
 msgstr "la relazione \"%s\" pagina %u non è inizializzata --- in correzione"
 
-#: commands/vacuumlazy.c:1113
+#: commands/vacuumlazy.c:1120
 #, c-format
 msgid "\"%s\": removed %.0f row versions in %u pages"
 msgstr "\"%s\": %.0f versioni di riga rimosse in %u pagine"
 
-#: commands/vacuumlazy.c:1123
+#: commands/vacuumlazy.c:1130
 #, c-format
 msgid "%.0f dead row versions cannot be removed yet.\n"
 msgstr "%.0f versioni di righe morte non possono essere ancora rimosse.\n"
 
-#: commands/vacuumlazy.c:1125
+#: commands/vacuumlazy.c:1132
 #, c-format
 msgid "There were %.0f unused item pointers.\n"
 msgstr "C'erano %.0f puntatori ad elementi non usati.\n"
 
-#: commands/vacuumlazy.c:1127
+#: commands/vacuumlazy.c:1134
 #, c-format
-msgid "Skipped %u pages due to buffer pins.\n"
-msgstr "%u pagine saltate a causa di blocchi dei buffer.\n"
+msgid "Skipped %u page due to buffer pins.\n"
+msgid_plural "Skipped %u pages due to buffer pins.\n"
+msgstr[0] "%u pagina saltata a causa di blocchi dei buffer.\n"
+msgstr[1] "%u pagine saltate a causa di blocchi dei buffer.\n"
 
-#: commands/vacuumlazy.c:1129
+#: commands/vacuumlazy.c:1138
 #, c-format
-msgid "%u pages are entirely empty.\n"
-msgstr "%u pagine sono completamente vuote.\n"
+msgid "%u page is entirely empty.\n"
+msgid_plural "%u pages are entirely empty.\n"
+msgstr[0] "%u pagina è completamente vuota.\n"
+msgstr[1] "%u pagina sono completamente vuote.\n"
 
-#: commands/vacuumlazy.c:1135
+#: commands/vacuumlazy.c:1146
 #, c-format
 msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u pages"
 msgstr "\"%s\": trovate %.0f versioni di riga removibili, %.0f non removibili in %u pagine su %u"
 
-#: commands/vacuumlazy.c:1204
+#: commands/vacuumlazy.c:1215
 #, c-format
 msgid "\"%s\": removed %d row versions in %d pages"
 msgstr "\"%s\": %d versioni di riga rimosse in %d pagine"
 
-#: commands/vacuumlazy.c:1371
+#: commands/vacuumlazy.c:1382
 #, c-format
 msgid "scanned index \"%s\" to remove %d row versions"
 msgstr "effettuata la scansione dell'indice \"%s\" per rimuovere %d versioni di riga"
 
-#: commands/vacuumlazy.c:1417
+#: commands/vacuumlazy.c:1428
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "l'indice \"%s\" ora contiene %.0f versioni di riga in %u pagine"
 
-#: commands/vacuumlazy.c:1421
+#: commands/vacuumlazy.c:1432
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -9118,112 +9076,112 @@
 "%u pagine dell'indice sono state cancellate, %u sono attualmente riusabili.\n"
 "%s."
 
-#: commands/vacuumlazy.c:1478
+#: commands/vacuumlazy.c:1489
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "\"%s\": truncate interrotto a causa di una richiesta di lock in conflitto"
 
-#: commands/vacuumlazy.c:1543
+#: commands/vacuumlazy.c:1554
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
 msgstr "\"%s\": %u pagine ridotte a %u"
 
-#: commands/vacuumlazy.c:1599
+#: commands/vacuumlazy.c:1610
 #, c-format
 msgid "\"%s\": suspending truncate due to conflicting lock request"
 msgstr "\"%s\": annullamento del troncamento a causa di richieste di lock in conflitto"
 
-#: commands/variable.c:163 utils/misc/guc.c:9678
+#: commands/variable.c:164 utils/misc/guc.c:9691
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "Parola chiave non riconosciuta: \"%s\"."
 
-#: commands/variable.c:175
+#: commands/variable.c:176
 #, c-format
 msgid "Conflicting \"datestyle\" specifications."
 msgstr "Specifiche di \"datestyle\" in conflitto."
 
-#: commands/variable.c:297
+#: commands/variable.c:298
 #, c-format
 msgid "Cannot specify months in time zone interval."
 msgstr "Non è possibile specificare i mesi nell'intervallo del fuso orario."
 
-#: commands/variable.c:303
+#: commands/variable.c:304
 #, c-format
 msgid "Cannot specify days in time zone interval."
 msgstr "Non è possibile specificare i giorni nell'intervallo del fuso orario."
 
-#: commands/variable.c:345 commands/variable.c:427
+#: commands/variable.c:346 commands/variable.c:428
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
 msgstr "sembra che il fuso orario \"%s\" utilizzi il secondo intercalare"
 
-#: commands/variable.c:347 commands/variable.c:429
+#: commands/variable.c:348 commands/variable.c:430
 #, c-format
 msgid "PostgreSQL does not support leap seconds."
 msgstr "PostgreSQL non supporta il secondo intercalare."
 
-#: commands/variable.c:356
+#: commands/variable.c:357
 #, c-format
 msgid "UTC timezone offset is out of range."
 msgstr "L'offset del fuso orario da UTC è fuori dall'intervallo massimo."
 
-#: commands/variable.c:494
+#: commands/variable.c:495
 #, c-format
 msgid "cannot set transaction read-write mode inside a read-only transaction"
 msgstr "non è possibile impostare una transazione in lettura/scrittura dentro una in sola lettura"
 
-#: commands/variable.c:501
+#: commands/variable.c:502
 #, c-format
 msgid "transaction read-write mode must be set before any query"
 msgstr "la modalità read-write dev'essere impostata prima di qualsiasi query"
 
-#: commands/variable.c:508
+#: commands/variable.c:509
 #, c-format
 msgid "cannot set transaction read-write mode during recovery"
 msgstr "non è possibile impostare la transazione in lettura/scrittura durante il ripristino"
 
-#: commands/variable.c:557
+#: commands/variable.c:558
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr "SET TRANSACTION ISOLATION LEVEL dev'essere invocato prima di qualsiasi query"
 
-#: commands/variable.c:564
+#: commands/variable.c:565
 #, c-format
 msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
 msgstr "SET TRANSACTION ISOLATION LEVEL non può essere invocato in una sotto-transazione"
 
-#: commands/variable.c:571 storage/lmgr/predicate.c:1586
+#: commands/variable.c:572 storage/lmgr/predicate.c:1586
 #, c-format
 msgid "cannot use serializable mode in a hot standby"
 msgstr "non è possibile usare la modalità SERIALIZABLE in un hot standby"
 
-#: commands/variable.c:572
+#: commands/variable.c:573
 #, c-format
 msgid "You can use REPEATABLE READ instead."
 msgstr "Puoi utilizzare REPEATABLE READ invece."
 
-#: commands/variable.c:620
+#: commands/variable.c:621
 #, c-format
 msgid "SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
 msgstr "SET TRANSACTION [NOT] DEFERRABLE non può essere invocato in una sotto-transazione"
 
-#: commands/variable.c:626
+#: commands/variable.c:627
 #, c-format
 msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
 msgstr "SET TRANSACTION [NOT] DEFERRABLE dev'essere invocato prima di qualsiasi query"
 
-#: commands/variable.c:708
+#: commands/variable.c:709
 #, c-format
 msgid "Conversion between %s and %s is not supported."
 msgstr "La conversione fra %s e %s non è supportata."
 
-#: commands/variable.c:715
+#: commands/variable.c:716
 #, c-format
 msgid "Cannot change \"client_encoding\" now."
 msgstr "Non è possibile cambiare \"client_encoding\" ora."
 
-#: commands/variable.c:885
+#: commands/variable.c:889
 #, c-format
 msgid "permission denied to set role \"%s\""
 msgstr "permesso di impostare il ruolo \"%s\" negato"
@@ -9238,52 +9196,52 @@
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "Valori validi sono \"local\" e \"cascaded\"."
 
-#: commands/view.c:114
+#: commands/view.c:101
 #, c-format
 msgid "could not determine which collation to use for view column \"%s\""
 msgstr "non è stato possibile determinare quale ordinamento usare per la colonna \"%s\""
 
-#: commands/view.c:129
+#: commands/view.c:115
 #, c-format
 msgid "view must have at least one column"
 msgstr "la vista deve avere almeno una colonna"
 
-#: commands/view.c:263 commands/view.c:275
+#: commands/view.c:280 commands/view.c:292
 #, c-format
 msgid "cannot drop columns from view"
 msgstr "non è possibile eliminare colonne da una vista"
 
-#: commands/view.c:280
+#: commands/view.c:297
 #, c-format
 msgid "cannot change name of view column \"%s\" to \"%s\""
 msgstr "non è possibile cambiare nome della colonna di vista \"%s\" in \"%s\""
 
-#: commands/view.c:288
+#: commands/view.c:305
 #, c-format
 msgid "cannot change data type of view column \"%s\" from %s to %s"
 msgstr "non è possibile cambiare tipo di dato della colonna di vista \"%s\" da %s a %s"
 
-#: commands/view.c:427
+#: commands/view.c:444
 #, c-format
 msgid "views must not contain SELECT INTO"
 msgstr "le viste non possono contenere SELECT INTO"
 
-#: commands/view.c:440
+#: commands/view.c:457
 #, c-format
 msgid "views must not contain data-modifying statements in WITH"
 msgstr "una vista non può contenere istruzioni di modifica dei dati in un WITH"
 
-#: commands/view.c:511
+#: commands/view.c:528
 #, c-format
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "CREATE VIEW specifica più nomi di colonne che colonne"
 
-#: commands/view.c:519
+#: commands/view.c:536
 #, c-format
 msgid "views cannot be unlogged because they do not have storage"
 msgstr "le viste non possono essere non loggate perché non sono immagazzinate"
 
-#: commands/view.c:533
+#: commands/view.c:550
 #, c-format
 msgid "view \"%s\" will be a temporary view"
 msgstr "la vista \"%s\" sarà una vista temporanea"
@@ -9328,37 +9286,37 @@
 msgid "no value found for parameter %d"
 msgstr "nessun valore trovato per il parametro %d"
 
-#: executor/execIndexing.c:539
+#: executor/execIndexing.c:544
 #, c-format
-msgid "ON CONFLICT does not support deferred unique constraints/exclusion constraints as arbiters"
-msgstr "ON CONFLICT non supporta vincoli/esclusioni unici deferiti come arbitri"
+msgid "ON CONFLICT does not support deferrable unique constraints/exclusion constraints as arbiters"
+msgstr "ON CONFLICT non supporta vincoli/esclusioni unici deferibili come arbitri"
 
-#: executor/execIndexing.c:814
+#: executor/execIndexing.c:821
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "creazione del vincolo di esclusione \"%s\" fallita"
 
-#: executor/execIndexing.c:817
+#: executor/execIndexing.c:824
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "La chiave %s è in conflitto con la chiave %s."
 
-#: executor/execIndexing.c:819
+#: executor/execIndexing.c:826
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Ci sono conflitti di chiave."
 
-#: executor/execIndexing.c:825
+#: executor/execIndexing.c:832
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "le chiavi in conflitto violano il vincolo di esclusione \"%s\""
 
-#: executor/execIndexing.c:828
+#: executor/execIndexing.c:835
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "La chiave %s è in conflitto con la chiave esistente %s."
 
-#: executor/execIndexing.c:830
+#: executor/execIndexing.c:837
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "Conflitti di chiave con chiave esistente."
@@ -9373,32 +9331,32 @@
 msgid "cannot change TOAST relation \"%s\""
 msgstr "non è possibile modificare la relazione TOAST \"%s\""
 
-#: executor/execMain.c:1049 rewrite/rewriteHandler.c:2612
+#: executor/execMain.c:1049 rewrite/rewriteHandler.c:2641
 #, c-format
 msgid "cannot insert into view \"%s\""
 msgstr "non è possibile inserire nella vista \"%s\""
 
-#: executor/execMain.c:1051 rewrite/rewriteHandler.c:2615
+#: executor/execMain.c:1051 rewrite/rewriteHandler.c:2644
 #, c-format
 msgid "To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule."
 msgstr "Per consentire inserimenti nella vista occorre fornire un trigger INSTEAD OF INSERT oppure una regola ON INSERT DO INSTEAD senza condizioni."
 
-#: executor/execMain.c:1057 rewrite/rewriteHandler.c:2620
+#: executor/execMain.c:1057 rewrite/rewriteHandler.c:2649
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "non è possibile modificare la vista \"%s\""
 
-#: executor/execMain.c:1059 rewrite/rewriteHandler.c:2623
+#: executor/execMain.c:1059 rewrite/rewriteHandler.c:2652
 #, c-format
 msgid "To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule."
 msgstr "Per consentire modifiche alla vista occorre fornire un trigger INSTEAD OF UPDATE oppure una regola ON UPDATE DO INSTEAD senza condizioni."
 
-#: executor/execMain.c:1065 rewrite/rewriteHandler.c:2628
+#: executor/execMain.c:1065 rewrite/rewriteHandler.c:2657
 #, c-format
 msgid "cannot delete from view \"%s\""
 msgstr "non è possibile cancellare dalla vista \"%s\""
 
-#: executor/execMain.c:1067 rewrite/rewriteHandler.c:2631
+#: executor/execMain.c:1067 rewrite/rewriteHandler.c:2660
 #, c-format
 msgid "To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule."
 msgstr "Per consentire eliminazioni dalla vista occorre fornire un trigger INSTEAD OF DELETE oppure una regola ON DELETE DO INSTEAD senza condizioni."
@@ -9463,7 +9421,7 @@
 msgid "cannot lock rows in materialized view \"%s\""
 msgstr "non è possibile bloccare righe nella vista materializzata \"%s\""
 
-#: executor/execMain.c:1190 executor/execMain.c:2566
+#: executor/execMain.c:1190 executor/execMain.c:2578
 #: executor/nodeLockRows.c:132
 #, c-format
 msgid "cannot lock rows in foreign table \"%s\""
@@ -9491,24 +9449,34 @@
 
 #: executor/execMain.c:1811
 #, c-format
-msgid "new row violates WITH CHECK OPTION for \"%s\""
-msgstr "la nuova riga viola WITH CHECK OPTION per \"%s\""
+msgid "new row violates check option for view \"%s\""
+msgstr "la nuova riga viola l'opzione di controllo della vista \"%s\""
 
-#: executor/execMain.c:1820
+#: executor/execMain.c:1821
 #, c-format
-msgid "new row violates row level security policy for \"%s\""
-msgstr "la nuova riga viola la politica di sicurezza a livello di riga per \"%s\""
+msgid "new row violates row-level security policy \"%s\" for table \"%s\""
+msgstr "la nuova riga viola la regola di sicurezza per riga \"%s\" per la tabella \"%s\""
 
 #: executor/execMain.c:1826
 #, c-format
-msgid "new row violates row level security policy (USING expression) for \"%s\""
-msgstr "la nuova riga viola la politica di sicurezza a livello di riga (espressione USING) per \"%s\""
+msgid "new row violates row-level security policy for table \"%s\""
+msgstr "la nuova riga viola la regola di sicurezza per riga per la tabella \"%s\""
+
+#: executor/execMain.c:1833
+#, c-format
+msgid "new row violates row-level security policy \"%s\" (USING expression) for table \"%s\""
+msgstr "la nuova riga viola la regola di sicurezza per riga \"%s\" (espressione USING) per la tabella \"%s\""
 
-#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3191
-#: utils/adt/array_userfuncs.c:472 utils/adt/arrayfuncs.c:260
-#: utils/adt/arrayfuncs.c:558 utils/adt/arrayfuncs.c:1288
-#: utils/adt/arrayfuncs.c:3332 utils/adt/arrayfuncs.c:5216
-#: utils/adt/arrayfuncs.c:5739
+#: executor/execMain.c:1838
+#, c-format
+msgid "new row violates row-level security policy (USING expression) for table \"%s\""
+msgstr "la nuova riga viola la regola di sicurezza per riga (espressione USING) per la tabella \"%s\""
+
+#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3209
+#: utils/adt/array_userfuncs.c:484 utils/adt/arrayfuncs.c:263
+#: utils/adt/arrayfuncs.c:561 utils/adt/arrayfuncs.c:1291
+#: utils/adt/arrayfuncs.c:3335 utils/adt/arrayfuncs.c:5219
+#: utils/adt/arrayfuncs.c:5736
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "il numero di dimensioni dell'array (%d) eccede il massimo consentito (%d)"
@@ -9518,12 +9486,12 @@
 msgid "array subscript in assignment must not be null"
 msgstr "l'indice di un array nell'assegnamento non può essere nullo"
 
-#: executor/execQual.c:635 executor/execQual.c:4116
+#: executor/execQual.c:635 executor/execQual.c:4156
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "l'attributo %d è di tipo errato"
 
-#: executor/execQual.c:636 executor/execQual.c:4117
+#: executor/execQual.c:636 executor/execQual.c:4157
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "La tabella ha il tipo %s, ma la query prevede %s."
@@ -9617,58 +9585,63 @@
 msgid "op ANY/ALL (array) does not support set arguments"
 msgstr "l'operatore ANY/ALL (array) non supporta argomenti di tipo insieme"
 
-#: executor/execQual.c:3169
+#: executor/execQual.c:3187
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "non è possibile unire array non compatibili"
 
-#: executor/execQual.c:3170
+#: executor/execQual.c:3188
 #, c-format
 msgid "Array with element type %s cannot be included in ARRAY construct with element type %s."
 msgstr "Un array con tipo di elementi %s non può essere incluso nel costrutto ARRAY con elementi di tipo %s."
 
-#: executor/execQual.c:3211 executor/execQual.c:3238
+#: executor/execQual.c:3229 executor/execQual.c:3256
 #, c-format
 msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr "gli array multidimensionali devono avere espressioni array di dimensioni corrispondenti"
 
-#: executor/execQual.c:3753
+#: executor/execQual.c:3771
 #, c-format
 msgid "NULLIF does not support set arguments"
 msgstr "NULLIF non supporta argomenti di tipo insieme"
 
-#: executor/execQual.c:3986 utils/adt/domains.c:136
+#: executor/execQual.c:4019 utils/adt/domains.c:137
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "il DOMAIN %s non consente valori nulli"
 
-#: executor/execQual.c:4016 utils/adt/domains.c:173
+#: executor/execQual.c:4056 utils/adt/domains.c:179
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "il valore per il DOMAIN %s viola il vincolo di controllo \"%s\""
 
-#: executor/execQual.c:4371
+#: executor/execQual.c:4411
 #, c-format
 msgid "WHERE CURRENT OF is not supported for this table type"
 msgstr "WHERE CURRENT OF non è supportato per questo tipo di tabella"
 
-#: executor/execQual.c:4560 parser/parse_agg.c:742
+#: executor/execQual.c:4558 parser/parse_agg.c:596 parser/parse_agg.c:626
+#, c-format
+msgid "aggregate function calls cannot be nested"
+msgstr "le chiamate a funzioni di aggregazione non possono essere annidate"
+
+#: executor/execQual.c:4620 parser/parse_agg.c:742
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "le chiamate a funzioni finestra non possono essere annidate"
 
-#: executor/execQual.c:4772
+#: executor/execQual.c:4832
 #, c-format
 msgid "target type is not an array"
 msgstr "il tipo di destinazione non è un array"
 
-#: executor/execQual.c:4887
+#: executor/execQual.c:4949
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "la colonna ROW() è di tipo %s invece di %s"
 
-#: executor/execQual.c:5022 utils/adt/arrayfuncs.c:3774
-#: utils/adt/arrayfuncs.c:6312 utils/adt/rowtypes.c:921
+#: executor/execQual.c:5084 utils/adt/arrayfuncs.c:3777
+#: utils/adt/arrayfuncs.c:6303 utils/adt/rowtypes.c:927
 #, c-format
 msgid "could not identify a comparison function for type %s"
 msgstr "non è stato possibile trovare un operatore di confronto per il tipo %s"
@@ -9688,89 +9661,89 @@
 msgid "could not determine actual type of argument declared %s"
 msgstr "non è stato possibile determinare il tipo reale dell'argomento dichiarato %s"
 
+#: executor/functions.c:509
+#, c-format
+msgid "cannot COPY to/from client in a SQL function"
+msgstr "non è possibile usare COPY da o verso il client in una funzione SQL"
+
 #. translator: %s is a SQL statement name
-#: executor/functions.c:506
+#: executor/functions.c:515
 #, c-format
 msgid "%s is not allowed in a SQL function"
 msgstr "%s non è consentito in una funzione SQL"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:513 executor/spi.c:1368 executor/spi.c:2157
+#: executor/functions.c:522 executor/spi.c:1368 executor/spi.c:2158
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "%s non è consentito in una funzione non volatile"
 
-#: executor/functions.c:641
+#: executor/functions.c:650
 #, c-format
 msgid "could not determine actual result type for function declared to return type %s"
 msgstr "non è stato possibile determinare il tipo reale restituito dalla funzione dichiarata con tipo restituito %s"
 
-#: executor/functions.c:1405
+#: executor/functions.c:1414
 #, c-format
 msgid "SQL function \"%s\" statement %d"
 msgstr "funzione SQL \"%s\" istruzione %d"
 
-#: executor/functions.c:1431
+#: executor/functions.c:1440
 #, c-format
 msgid "SQL function \"%s\" during startup"
 msgstr "funzione SQL \"%s\" durante l'avvio"
 
-#: executor/functions.c:1590 executor/functions.c:1627
-#: executor/functions.c:1639 executor/functions.c:1752
-#: executor/functions.c:1785 executor/functions.c:1815
+#: executor/functions.c:1599 executor/functions.c:1636
+#: executor/functions.c:1648 executor/functions.c:1761
+#: executor/functions.c:1794 executor/functions.c:1824
 #, c-format
 msgid "return type mismatch in function declared to return %s"
 msgstr "il tipo restituito non combacia nella funzione dichiarata con tipo restituito %s"
 
-#: executor/functions.c:1592
+#: executor/functions.c:1601
 #, c-format
 msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
 msgstr "L'istruzione finale della funzione deve essere SELECT oppure INSERT/UPDATE/DELETE RETURNING."
 
-#: executor/functions.c:1629
+#: executor/functions.c:1638
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "L'istruzione finale deve restituire esattamente una colonna."
 
-#: executor/functions.c:1641
+#: executor/functions.c:1650
 #, c-format
 msgid "Actual return type is %s."
 msgstr "Il tipo restituito realmente è %s."
 
-#: executor/functions.c:1754
+#: executor/functions.c:1763
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "L'istruzione finale restituisce troppe colonne."
 
-#: executor/functions.c:1787
+#: executor/functions.c:1796
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr "L'istruzione finale restituisce %s invece di %s alla colonna %d."
 
-#: executor/functions.c:1817
+#: executor/functions.c:1826
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "L'istruzione finale restituisce troppe poche colonne."
 
-#: executor/functions.c:1866
+#: executor/functions.c:1875
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "il tipo di risultato %s non è supportato per le funzioni SQL"
 
-#: executor/nodeAgg.c:2622 executor/nodeWindowAgg.c:2289
+#: executor/nodeAgg.c:2471 executor/nodeWindowAgg.c:2319
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr "l'aggregato %u deve avere tipi di input e transizione compatibili"
 
-#: executor/nodeAgg.c:2658 parser/parse_agg.c:596 parser/parse_agg.c:626
-#, c-format
-msgid "aggregate function calls cannot be nested"
-msgstr "le chiamate a funzioni di aggregazione non possono essere annidate"
-
 #: executor/nodeCustom.c:147 executor/nodeCustom.c:158
 #, c-format
-msgid "custom-scan \"%s\" does not support MarkPos"
-msgstr "lo scan personalizzato \"%s\" non supporta MarkPos"
+msgid "custom scan \"%s\" does not support MarkPos"
+msgstr "-lo scan personalizzato \"%s\" non supporta MarkPos"
 
 #: executor/nodeHashjoin.c:823 executor/nodeHashjoin.c:853
 #, c-format
@@ -9782,7 +9755,7 @@
 msgid "could not write to hash-join temporary file: %m"
 msgstr "scrittura nel file temporaneo per l'hash-join fallita: %m"
 
-#: executor/nodeHashjoin.c:928 executor/nodeHashjoin.c:938
+#: executor/nodeHashjoin.c:935 executor/nodeHashjoin.c:945
 #, c-format
 msgid "could not read from hash-join temporary file: %m"
 msgstr "lettura dal file temporaneo per l'hash-join fallita: %m"
@@ -9827,12 +9800,12 @@
 msgid "Query has too few columns."
 msgstr "La query ha troppe poche colonne."
 
-#: executor/nodeModifyTable.c:1080
+#: executor/nodeModifyTable.c:1118
 #, c-format
 msgid "ON CONFLICT DO UPDATE command cannot affect row a second time"
 msgstr "il comando ON CONFLICT DO UPDATE non può toccare le righe una seconda volta"
 
-#: executor/nodeModifyTable.c:1081
+#: executor/nodeModifyTable.c:1119
 #, c-format
 msgid "Ensure that no rows proposed for insertion within the same command have duplicate constrained values."
 msgstr "Assicurati che non ci siano righe proposte per l'inserimento nello stesso comando che abbiano valori vincolati uguali."
@@ -9858,22 +9831,22 @@
 msgid "moving-aggregate transition function must not return null"
 msgstr "le funzioni di transizione per aggregati mobili non possono restituire null"
 
-#: executor/nodeWindowAgg.c:1609
+#: executor/nodeWindowAgg.c:1642
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "l'offset di inizio della finestra dev'essere non nullo"
 
-#: executor/nodeWindowAgg.c:1622
+#: executor/nodeWindowAgg.c:1655
 #, c-format
 msgid "frame starting offset must not be negative"
 msgstr "l'offset di inizio della finestra non può essere negativo"
 
-#: executor/nodeWindowAgg.c:1635
+#: executor/nodeWindowAgg.c:1668
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "l'offset di fine della finestra dev'essere non nullo"
 
-#: executor/nodeWindowAgg.c:1648
+#: executor/nodeWindowAgg.c:1681
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "l'offset di fine della finestra non può essere negativo"
@@ -9909,12 +9882,12 @@
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE non è supportato"
 
-#: executor/spi.c:1343 parser/analyze.c:2244
+#: executor/spi.c:1343 parser/analyze.c:2289
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Un cursore scorribile dev'essere READ ONLY."
 
-#: executor/spi.c:2449
+#: executor/spi.c:2462
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "istruzione SQL \"%s\""
@@ -9939,482 +9912,477 @@
 msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
 msgstr "Non è possibile aumentare il buffer della stringa contenente %d byte di altri %d byte."
 
-#: libpq/auth.c:235
+#: libpq/auth.c:238
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "autenticazione fallita per l'utente \"%s\": host rifiutato"
 
-#: libpq/auth.c:238
+#: libpq/auth.c:241
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "autenticazione \"trust\" fallita per l'utente \"%s\""
 
-#: libpq/auth.c:241
+#: libpq/auth.c:244
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "autenticazione Ident fallita per l'utente \"%s\""
 
-#: libpq/auth.c:244
+#: libpq/auth.c:247
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "autenticazione Peer fallita per l'utente \"%s\""
 
-#: libpq/auth.c:248
+#: libpq/auth.c:251
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "autenticazione con password fallita per l'utente \"%s\""
 
-#: libpq/auth.c:253
+#: libpq/auth.c:256
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "autenticazione GSSAPI fallita per l'utente \"%s\""
 
-#: libpq/auth.c:256
+#: libpq/auth.c:259
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "autenticazione SSPI fallita per l'utente \"%s\""
 
-#: libpq/auth.c:259
+#: libpq/auth.c:262
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "autenticazione PAM fallita per l'utente \"%s\""
 
-#: libpq/auth.c:262
+#: libpq/auth.c:265
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "autenticazione LDAP fallita per l'utente \"%s\""
 
-#: libpq/auth.c:265
+#: libpq/auth.c:268
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "autenticazione con certificato fallita per l'utente \"%s\""
 
-#: libpq/auth.c:268
+#: libpq/auth.c:271
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "autenticazione RADIUS fallita per l'utente \"%s\""
 
-#: libpq/auth.c:271
+#: libpq/auth.c:274
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr "autenticazione fallita per l'utente \"%s\": metodo di autenticazione non valido"
 
-#: libpq/auth.c:275
+#: libpq/auth.c:278
 #, c-format
 msgid "Connection matched pg_hba.conf line %d: \"%s\""
 msgstr "La connessione si abbina con la riga %d di pg_hba.log: \"%s\""
 
-#: libpq/auth.c:330
+#: libpq/auth.c:333
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "la connessione richiede un certificato valido per il client"
 
-#: libpq/auth.c:372
+#: libpq/auth.c:375
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
 msgstr "pg_hba.conf rifiuta connessioni di replica per l'host \"%s\", utente \"%s\", %s"
 
-#: libpq/auth.c:374 libpq/auth.c:390 libpq/auth.c:448 libpq/auth.c:466
+#: libpq/auth.c:377 libpq/auth.c:393 libpq/auth.c:451 libpq/auth.c:469
 msgid "SSL off"
 msgstr "SSL non abilitato"
 
-#: libpq/auth.c:374 libpq/auth.c:390 libpq/auth.c:448 libpq/auth.c:466
+#: libpq/auth.c:377 libpq/auth.c:393 libpq/auth.c:451 libpq/auth.c:469
 msgid "SSL on"
 msgstr "SSL abilitato"
 
-#: libpq/auth.c:378
+#: libpq/auth.c:381
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\""
 msgstr "pg_hba.conf rifiuta connessioni di replica per l'host \"%s\", utente \"%s\""
 
-#: libpq/auth.c:387
+#: libpq/auth.c:390
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "pg_hba.conf rifiuta connessioni per l'host \"%s\", utente \"%s\", database \"%s\", %s"
 
-#: libpq/auth.c:394
+#: libpq/auth.c:397
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
 msgstr "pg_hba.conf rifiuta connessioni per l'host \"%s\", user \"%s\", database \"%s\""
 
-#: libpq/auth.c:423
+#: libpq/auth.c:426
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup matches."
 msgstr "Indirizzo IP del client risolto in \"%s\", il forward lookup combacia."
 
-#: libpq/auth.c:426
+#: libpq/auth.c:429
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup not checked."
 msgstr "Indirizzo IP del client risolto in \"%s\", forward lookup non controllato."
 
-#: libpq/auth.c:429
+#: libpq/auth.c:432
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup does not match."
 msgstr "Indirizzo IP del client risolto in \"%s\", il forward lookup non combacia."
 
-#: libpq/auth.c:432
+#: libpq/auth.c:435
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
 msgstr "Conversione del nome host \"%s\" in indirizzo IP non riuscita: %s."
 
-#: libpq/auth.c:437
+#: libpq/auth.c:440
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "Risoluzione dell'indirizzo IP del client in nome host non riuscita: %s."
 
-#: libpq/auth.c:446
+#: libpq/auth.c:449
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s"
 msgstr "nessuna voce in pg_hba.conf per connessioni di replica da host \"%s\", utente \"%s\", database \"%s\""
 
-#: libpq/auth.c:453
+#: libpq/auth.c:456
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
 msgstr "nessuna voce in pg_hba.conf per connessioni di replica da host \"%s\", user \"%s\""
 
-#: libpq/auth.c:463
+#: libpq/auth.c:466
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr "nessuna voce in pg_hba.conf per l'host \"%s\", utente \"%s\", database \"%s\", %s"
 
-#: libpq/auth.c:471
+#: libpq/auth.c:474
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
 msgstr "nessuna voce in pg_hba.conf per l'host \"%s\", utente \"%s\", database \"%s\""
 
-#: libpq/auth.c:514 libpq/hba.c:1180
+#: libpq/auth.c:517 libpq/hba.c:1180
 #, c-format
 msgid "MD5 authentication is not supported when \"db_user_namespace\" is enabled"
 msgstr "l'autenticazione MD5 non è supportata quando \"db_user_namespace\" è abilitato"
 
-#: libpq/auth.c:640
+#: libpq/auth.c:643
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "era attesa una risposta password, ricevuto messaggio di tipo %d"
 
-#: libpq/auth.c:668
+#: libpq/auth.c:671
 #, c-format
 msgid "invalid password packet size"
 msgstr "dimensione del pacchetto password non valida"
 
-#: libpq/auth.c:672
-#, c-format
-msgid "received password packet"
-msgstr "pacchetto password ricevuto"
-
-#: libpq/auth.c:799
+#: libpq/auth.c:801
 #, c-format
 msgid "GSSAPI is not supported in protocol version 2"
 msgstr "GSSAPI non è supportato con la versione 2 del protocollo"
 
-#: libpq/auth.c:859
+#: libpq/auth.c:861
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "era attesa una risposta GSS, ricevuto messaggio di tipo %d"
 
-#: libpq/auth.c:920
+#: libpq/auth.c:922
 msgid "accepting GSS security context failed"
 msgstr "contesto di sicurezza accettazione GSS fallito"
 
-#: libpq/auth.c:946
+#: libpq/auth.c:948
 msgid "retrieving GSS user name failed"
 msgstr "la richiesta del GSS user name è fallita"
 
-#: libpq/auth.c:1063
+#: libpq/auth.c:1067
 #, c-format
 msgid "SSPI is not supported in protocol version 2"
 msgstr "SSPI non è supportato con la versione 2 del protocollo"
 
-#: libpq/auth.c:1078
+#: libpq/auth.c:1082
 msgid "could not acquire SSPI credentials"
 msgstr "non è stato possibile ottenere le credenziali SSPI"
 
-#: libpq/auth.c:1096
+#: libpq/auth.c:1100
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "era attesa una risposta SSPI, ricevuto messaggio di tipo %d"
 
-#: libpq/auth.c:1168
+#: libpq/auth.c:1172
 msgid "could not accept SSPI security context"
 msgstr "non è stato possibile accettare il contesto di sicurezza SSPI"
 
-#: libpq/auth.c:1230
+#: libpq/auth.c:1234
 msgid "could not get token from SSPI security context"
 msgstr "non è stato possibile ottenere il token dal contesto di sicurezza SSPI"
 
-#: libpq/auth.c:1475
+#: libpq/auth.c:1481
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "creazione del socket per la connessione Ident fallita: %m"
 
-#: libpq/auth.c:1490
+#: libpq/auth.c:1496
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "bind sull'indirizzo locale \"%s\" fallito: %m"
 
-#: libpq/auth.c:1502
+#: libpq/auth.c:1508
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "connessione al server Ident all'indirizzo \"%s\", porta %s fallita: %m"
 
-#: libpq/auth.c:1524
+#: libpq/auth.c:1530
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr "invio della query al server Ident all'indirizzo \"%s\", porta %s fallito: %m"
 
-#: libpq/auth.c:1541
+#: libpq/auth.c:1547
 #, c-format
 msgid "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr "ricezione della risposta dal server Ident all'indirizzo \"%s\", porta %s fallita: %m"
 
-#: libpq/auth.c:1551
+#: libpq/auth.c:1557
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "risposta dal server Ident formattata in maniera non corretta: \"%s\""
 
-#: libpq/auth.c:1591
+#: libpq/auth.c:1597
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "il metodo di autenticazione peer non è supportato su questa piattaforma"
 
-#: libpq/auth.c:1595
+#: libpq/auth.c:1601
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "non è stato possibile recuperare le credenziali del peer: %m"
 
-#: libpq/auth.c:1604
+#: libpq/auth.c:1610
 #, c-format
 msgid "could not look up local user ID %ld: %s"
 msgstr "ricerca dell'ID utente locale %ld fallita: %s"
 
-#: libpq/auth.c:1688 libpq/auth.c:1959 libpq/auth.c:2315
+#: libpq/auth.c:1694 libpq/auth.c:1965 libpq/auth.c:2324
 #, c-format
 msgid "empty password returned by client"
 msgstr "il client ha restituito una password vuota"
 
-#: libpq/auth.c:1698
+#: libpq/auth.c:1704
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "errore dal livello PAM sottostante: %s"
 
-#: libpq/auth.c:1767
+#: libpq/auth.c:1773
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "creazione dell'autenticatore PAM fallita: %s"
 
-#: libpq/auth.c:1778
+#: libpq/auth.c:1784
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) fallita: %s"
 
-#: libpq/auth.c:1789
+#: libpq/auth.c:1795
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) fallita: %s"
 
-#: libpq/auth.c:1800
+#: libpq/auth.c:1806
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate fallita: %s"
 
-#: libpq/auth.c:1811
+#: libpq/auth.c:1817
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt fallita: %s"
 
-#: libpq/auth.c:1822
+#: libpq/auth.c:1828
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "rilascio dell'autenticatore PAM fallito: %s"
 
-#: libpq/auth.c:1855
+#: libpq/auth.c:1861
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "inizializzazione LDAP fallita: %m"
 
-#: libpq/auth.c:1858
+#: libpq/auth.c:1864
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "inizializzazione LDAP fallita: codice errore %d"
 
-#: libpq/auth.c:1868
+#: libpq/auth.c:1874
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "impostazione della versione del protocollo LDAP fallita: %s"
 
-#: libpq/auth.c:1897
+#: libpq/auth.c:1903
 #, c-format
 msgid "could not load wldap32.dll"
 msgstr "caricamento wldap32.dll fallito"
 
-#: libpq/auth.c:1905
+#: libpq/auth.c:1911
 #, c-format
 msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
 msgstr "caricamento della funzione _ldap_start_tls_sA in wldap32.dll fallito"
 
-#: libpq/auth.c:1906
+#: libpq/auth.c:1912
 #, c-format
 msgid "LDAP over SSL is not supported on this platform."
 msgstr "LDAP su SSL non è supportato su questa piattaforma."
 
-#: libpq/auth.c:1921
+#: libpq/auth.c:1927
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "avvio della sessione TLS LDAP fallito: %s"
 
-#: libpq/auth.c:1943
+#: libpq/auth.c:1949
 #, c-format
 msgid "LDAP server not specified"
 msgstr "server LDAP non specificato"
 
-#: libpq/auth.c:1996
+#: libpq/auth.c:2002
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "carattere non valido nel nome utente per l'autenticazione LDAP"
 
-#: libpq/auth.c:2011
+#: libpq/auth.c:2017
 #, c-format
 msgid "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s"
 msgstr "bind iniziale LDAP fallito per ldapbinddn \"%s\" sul server \"%s\": %s"
 
-#: libpq/auth.c:2035
+#: libpq/auth.c:2041
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr "ricerca in LDAP del filtro \"%s\" sul server \"%s\" fallita: %s"
 
-#: libpq/auth.c:2046
+#: libpq/auth.c:2052
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "l'utente LDAP \"%s\" non esiste"
 
-#: libpq/auth.c:2047
+#: libpq/auth.c:2053
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "La ricerca LDAP del filtro \"%s\" sul server \"%s\" non ha restituito risultati."
 
-#: libpq/auth.c:2051
+#: libpq/auth.c:2057
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "L'utente LDAP \"%s\" non è unico"
 
-#: libpq/auth.c:2052
+#: libpq/auth.c:2058
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned %d entry."
 msgid_plural "LDAP search for filter \"%s\" on server \"%s\" returned %d entries."
 msgstr[0] "La ricerca LDAP del filtro \"%s\" sul server \"%s\" ha restituito %d risultato."
 msgstr[1] "La ricerca LDAP del filtro \"%s\" sul server \"%s\" ha restituito %d risultati."
 
-#: libpq/auth.c:2070
+#: libpq/auth.c:2076
 #, c-format
 msgid "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
 msgstr "dn per il primo risultato di \"%s\" non trovato sul server \"%s\": %s"
 
-#: libpq/auth.c:2090
+#: libpq/auth.c:2096
 #, c-format
 msgid "could not unbind after searching for user \"%s\" on server \"%s\": %s"
 msgstr "unbind fallito dopo aver cercato l'utente \"%s\" sul server \"%s\": %s"
 
-#: libpq/auth.c:2120
+#: libpq/auth.c:2126
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr "login LDAP fallito per l'utente \"%s\" sul server \"%s\": %s"
 
-#: libpq/auth.c:2148
+#: libpq/auth.c:2154
 #, c-format
 msgid "certificate authentication failed for user \"%s\": client certificate contains no user name"
 msgstr "autenticazione con certificato fallita per l'utente \"%s\": il certificato del client non contiene alcun nome utente"
 
-#: libpq/auth.c:2271
+#: libpq/auth.c:2280
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "server RADIUS non specificato"
 
-#: libpq/auth.c:2278
+#: libpq/auth.c:2287
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "segreto RADIUS non specificato"
 
-#: libpq/auth.c:2294 libpq/hba.c:1590
+#: libpq/auth.c:2303 libpq/hba.c:1590
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "conversione del nome del server RADIUS \"%s\" in indirizzo fallita: %s"
 
-#: libpq/auth.c:2322
+#: libpq/auth.c:2331
 #, c-format
 msgid "RADIUS authentication does not support passwords longer than 16 characters"
 msgstr "l'autenticazione RADIUS non supporta password più lunghe di 16 caratteri"
 
-#: libpq/auth.c:2333
+#: libpq/auth.c:2342
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "generazione del vettore di criptaggio casuale fallita"
 
-#: libpq/auth.c:2356
+#: libpq/auth.c:2365
 #, c-format
 msgid "could not perform MD5 encryption of password"
 msgstr "criptaggio MD5 della password fallito"
 
-#: libpq/auth.c:2378
+#: libpq/auth.c:2387
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "creazione del socket RADIUS fallita: %m"
 
-#: libpq/auth.c:2399
+#: libpq/auth.c:2408
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "bind del socket RADIUS fallito: %m"
 
-#: libpq/auth.c:2409
+#: libpq/auth.c:2418
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "invio del pacchetto RADIUS fallito: %m"
 
-#: libpq/auth.c:2442 libpq/auth.c:2467
+#: libpq/auth.c:2451 libpq/auth.c:2476
 #, c-format
 msgid "timeout waiting for RADIUS response"
 msgstr "tempo scaduto in attesa della risposta RADIUS"
 
-#: libpq/auth.c:2460
+#: libpq/auth.c:2469
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "controllo dello stato sul socket RADIUS fallito: %m"
 
-#: libpq/auth.c:2489
+#: libpq/auth.c:2498
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "lettura della risposta RADIUS fallita: %m"
 
-#: libpq/auth.c:2501 libpq/auth.c:2505
+#: libpq/auth.c:2510 libpq/auth.c:2514
 #, c-format
 msgid "RADIUS response was sent from incorrect port: %d"
 msgstr "la risposta RADIUS è stata inviata da una porta sbagliata: %d"
 
-#: libpq/auth.c:2514
+#: libpq/auth.c:2523
 #, c-format
 msgid "RADIUS response too short: %d"
 msgstr "risposta RADIUS troppo breve: %d"
 
-#: libpq/auth.c:2521
+#: libpq/auth.c:2530
 #, c-format
 msgid "RADIUS response has corrupt length: %d (actual length %d)"
 msgstr "la risposta RADIUS ha una lunghezza corrotta: %d (lunghezza reale %d)"
 
-#: libpq/auth.c:2529
+#: libpq/auth.c:2538
 #, c-format
 msgid "RADIUS response is to a different request: %d (should be %d)"
 msgstr "la risposta RADIUS è a una richiesta differente: %d (dovrebbe essere %d)"
 
-#: libpq/auth.c:2554
+#: libpq/auth.c:2563
 #, c-format
 msgid "could not perform MD5 encryption of received packet"
 msgstr "criptaggio MD5 dei pacchetti ricevuti fallito"
 
-#: libpq/auth.c:2563
+#: libpq/auth.c:2572
 #, c-format
 msgid "RADIUS response has incorrect MD5 signature"
 msgstr "la firma MD5 della risposta RADIUS non è corretta"
 
-#: libpq/auth.c:2580
+#: libpq/auth.c:2589
 #, c-format
 msgid "RADIUS response has invalid code (%d) for user \"%s\""
 msgstr "il codice della risposta RADIUS (%d) per l'utente \"%s\" non è corretto"
@@ -10497,122 +10465,122 @@
 msgid "requested length cannot be negative"
 msgstr "la lunghezza richiesta non può essere negativa"
 
-#: libpq/be-secure-openssl.c:184
+#: libpq/be-secure-openssl.c:189
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "creazione del contesto SSL fallita: %s"
 
-#: libpq/be-secure-openssl.c:200
+#: libpq/be-secure-openssl.c:205
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
 msgstr "caricamento del file di certificato del server \"%s\" fallito: %s"
 
-#: libpq/be-secure-openssl.c:206
+#: libpq/be-secure-openssl.c:211
 #, c-format
 msgid "could not access private key file \"%s\": %m"
 msgstr "accesso fallito al file della chiave privata \"%s\": %m"
 
-#: libpq/be-secure-openssl.c:221
+#: libpq/be-secure-openssl.c:226
 #, c-format
 msgid "private key file \"%s\" has group or world access"
-msgstr "il file della chiave primaria \"%s\" ha accesso al gruppo o a chiunque"
+msgstr "il file della chiave privata \"%s\" ha accesso al gruppo o a chiunque"
 
-#: libpq/be-secure-openssl.c:223
+#: libpq/be-secure-openssl.c:228
 #, c-format
 msgid "Permissions should be u=rw (0600) or less."
 msgstr "Il permesso dovrebbe essere u=rw (0600) o inferiore."
 
-#: libpq/be-secure-openssl.c:230
+#: libpq/be-secure-openssl.c:235
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "caricamento del file della chiave privata \"%s\" fallito: %s"
 
-#: libpq/be-secure-openssl.c:235
+#: libpq/be-secure-openssl.c:240
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "controllo della chiave privata fallito: %s"
 
-#: libpq/be-secure-openssl.c:264
+#: libpq/be-secure-openssl.c:269
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
 msgstr "caricamento del file del certificato radice \"%s\" fallito: %s"
 
-#: libpq/be-secure-openssl.c:288
+#: libpq/be-secure-openssl.c:293
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" ignored"
 msgstr "il file di lista di revoche di certificati SSL \"%s\" è stato ignorato"
 
-#: libpq/be-secure-openssl.c:290
+#: libpq/be-secure-openssl.c:295
 #, c-format
 msgid "SSL library does not support certificate revocation lists."
 msgstr "La libreria SSL non supporta le liste di revoca dei certificati."
 
-#: libpq/be-secure-openssl.c:295
+#: libpq/be-secure-openssl.c:300
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
 msgstr "caricamento del file di lista di revoche di certificati SSL \"%s\" fallito: %s"
 
-#: libpq/be-secure-openssl.c:341
+#: libpq/be-secure-openssl.c:347
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "inizializzazione della connessione SSL fallita: %s"
 
-#: libpq/be-secure-openssl.c:349
+#: libpq/be-secure-openssl.c:355
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "impostazione del socket SSL fallita: %s"
 
-#: libpq/be-secure-openssl.c:383
+#: libpq/be-secure-openssl.c:409
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "accettazione della connessione SSL fallita: %m"
 
-#: libpq/be-secure-openssl.c:387 libpq/be-secure-openssl.c:398
+#: libpq/be-secure-openssl.c:413 libpq/be-secure-openssl.c:424
 #, c-format
 msgid "could not accept SSL connection: EOF detected"
 msgstr "accettazione della connessione SSL fallita: fine file individuata"
 
-#: libpq/be-secure-openssl.c:392
+#: libpq/be-secure-openssl.c:418
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "accettazione della connessione SSL fallita: %s"
 
-#: libpq/be-secure-openssl.c:403 libpq/be-secure-openssl.c:541
-#: libpq/be-secure-openssl.c:598
+#: libpq/be-secure-openssl.c:429 libpq/be-secure-openssl.c:570
+#: libpq/be-secure-openssl.c:630
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "codice di errore SSL sconosciuto: %d"
 
-#: libpq/be-secure-openssl.c:447
+#: libpq/be-secure-openssl.c:473
 #, c-format
 msgid "SSL certificate's common name contains embedded null"
 msgstr "Il nome comune del certificato SSL contiene un null"
 
-#: libpq/be-secure-openssl.c:458
+#: libpq/be-secure-openssl.c:484
 #, c-format
 msgid "SSL connection from \"%s\""
 msgstr "connessione SSL da \"%s\""
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:561 libpq/be-secure-openssl.c:621
 #, c-format
 msgid "SSL error: %s"
 msgstr "errore SSL: %s"
 
-#: libpq/be-secure-openssl.c:937
+#: libpq/be-secure-openssl.c:1032
 #, c-format
 msgid "ECDH: unrecognized curve name: %s"
 msgstr "ECDH: nome della curva non riconosciuto: %s"
 
-#: libpq/be-secure-openssl.c:942
+#: libpq/be-secure-openssl.c:1037
 #, c-format
 msgid "ECDH: could not create key"
 msgstr "ECDH: chiave non creata"
 
-#: libpq/be-secure-openssl.c:966
+#: libpq/be-secure-openssl.c:1061
 msgid "no SSL error reported"
 msgstr "nessun errore SSL riportato"
 
-#: libpq/be-secure-openssl.c:970
+#: libpq/be-secure-openssl.c:1065
 #, c-format
 msgid "SSL error code %lu"
 msgstr "codice di errore SSL: %lu"
@@ -10649,7 +10617,7 @@
 #: libpq/hba.c:1079 libpq/hba.c:1089 libpq/hba.c:1103 libpq/hba.c:1119
 #: libpq/hba.c:1134 libpq/hba.c:1145 libpq/hba.c:1181 libpq/hba.c:1213
 #: libpq/hba.c:1224 libpq/hba.c:1244 libpq/hba.c:1255 libpq/hba.c:1272
-#: libpq/hba.c:1297 libpq/hba.c:1334 libpq/hba.c:1344 libpq/hba.c:1413
+#: libpq/hba.c:1310 libpq/hba.c:1347 libpq/hba.c:1357 libpq/hba.c:1413
 #: libpq/hba.c:1425 libpq/hba.c:1438 libpq/hba.c:1521 libpq/hba.c:1592
 #: libpq/hba.c:1610 libpq/hba.c:1631 tsearch/ts_locale.c:182
 #, c-format
@@ -10822,17 +10790,17 @@
 msgid "cert authentication is only supported on hostssl connections"
 msgstr "l'autenticazione cert è supportata solo su connessioni hostssl"
 
-#: libpq/hba.c:1296
+#: libpq/hba.c:1309
 #, c-format
 msgid "authentication option not in name=value format: %s"
 msgstr "opzione di autenticazione non in formato nome=valore: %s"
 
-#: libpq/hba.c:1333
+#: libpq/hba.c:1346
 #, c-format
 msgid "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, or ldapurl together with ldapprefix"
 msgstr "non si possono usare ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute né ldapurl insieme a ldapprefix"
 
-#: libpq/hba.c:1343
+#: libpq/hba.c:1356
 #, c-format
 msgid "authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix\", or \"ldapsuffix\" to be set"
 msgstr "il metodo di autenticazione \"ldap\" richiede che gli argomenti \"ldapbasedn\", \"ldapprefix\" o \"ldapsuffix\" siano impostati"
@@ -10900,37 +10868,37 @@
 msgid "could not open configuration file \"%s\": %m"
 msgstr "apertura del file di configurazione \"%s\" fallita: %m"
 
-#: libpq/hba.c:1815
+#: libpq/hba.c:1814
 #, c-format
 msgid "configuration file \"%s\" contains no entries"
 msgstr "il file di configurazione \"%s\" non contiene alcuna voce"
 
-#: libpq/hba.c:1911
+#: libpq/hba.c:1910
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
 msgstr "espressione regolare non valida \"%s\": %s"
 
-#: libpq/hba.c:1971
+#: libpq/hba.c:1970
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
 msgstr "corrispondenza dell'espressione regolare \"%s\" fallita: %s"
 
-#: libpq/hba.c:1990
+#: libpq/hba.c:1989
 #, c-format
 msgid "regular expression \"%s\" has no subexpressions as requested by backreference in \"%s\""
 msgstr "l'espressione regolare \"%s\" non ha la sottoespressione richiesta dal riferimento in \"%s\""
 
-#: libpq/hba.c:2087
+#: libpq/hba.c:2086
 #, c-format
 msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr "il nome utente fornito (%s) e il nome utente autenticato (%s) non combaciano"
 
-#: libpq/hba.c:2107
+#: libpq/hba.c:2106
 #, c-format
 msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr "nessuna corrispondenza nella mappa utenti \"%s\" per l'utente \"%s\" autenticato come \"%s\""
 
-#: libpq/hba.c:2142
+#: libpq/hba.c:2141
 #, c-format
 msgid "could not open usermap file \"%s\": %m"
 msgstr "apertura del file usermap \"%s\" fallita: %m"
@@ -11035,37 +11003,37 @@
 msgid "could not accept new connection: %m"
 msgstr "impossibile accettare la nuova connessione: %m"
 
-#: libpq/pqcomm.c:879
+#: libpq/pqcomm.c:847
 #, c-format
 msgid "there is no client connection"
 msgstr "c'è alcuna connessione client"
 
-#: libpq/pqcomm.c:930 libpq/pqcomm.c:1026
+#: libpq/pqcomm.c:898 libpq/pqcomm.c:994
 #, c-format
 msgid "could not receive data from client: %m"
 msgstr "ricezione dati dal client fallita: %m"
 
-#: libpq/pqcomm.c:1171 tcop/postgres.c:3897
+#: libpq/pqcomm.c:1139 tcop/postgres.c:3917
 #, c-format
-msgid "terminating connection because protocol sync was lost"
+msgid "terminating connection because protocol synchronization was lost"
 msgstr "la connessione verrà terminata perché la sincronizzazione del protocollo è stata persa"
 
-#: libpq/pqcomm.c:1237
+#: libpq/pqcomm.c:1205
 #, c-format
 msgid "unexpected EOF within message length word"
 msgstr "fine file inattesa nella word della lunghezza del messaggio"
 
-#: libpq/pqcomm.c:1248
+#: libpq/pqcomm.c:1216
 #, c-format
 msgid "invalid message length"
 msgstr "lunghezza del messaggio non valida"
 
-#: libpq/pqcomm.c:1270 libpq/pqcomm.c:1283
+#: libpq/pqcomm.c:1238 libpq/pqcomm.c:1251
 #, c-format
 msgid "incomplete message from client"
 msgstr "messaggio incompleto dal client"
 
-#: libpq/pqcomm.c:1416
+#: libpq/pqcomm.c:1384
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "invio dati al client fallito: %m"
@@ -11076,7 +11044,7 @@
 msgstr "nessun dato rimasto nel messaggio"
 
 #: libpq/pqformat.c:556 libpq/pqformat.c:574 libpq/pqformat.c:595
-#: utils/adt/arrayfuncs.c:1457 utils/adt/rowtypes.c:561
+#: utils/adt/arrayfuncs.c:1460 utils/adt/rowtypes.c:563
 #, c-format
 msgid "insufficient data left in message"
 msgstr "i dati rimasti nel messaggio non sono sufficienti"
@@ -11091,12 +11059,12 @@
 msgid "invalid message format"
 msgstr "formato del messaggio non valido"
 
-#: main/main.c:259
+#: main/main.c:264
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: WSAStartup fallita: %d\n"
 
-#: main/main.c:306
+#: main/main.c:327
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -11105,7 +11073,7 @@
 "%s è il server PostgreSQL.\n"
 "\n"
 
-#: main/main.c:307
+#: main/main.c:328
 #, c-format
 msgid ""
 "Usage:\n"
@@ -11116,114 +11084,114 @@
 "  %s [OPZIONE]...\n"
 "\n"
 
-#: main/main.c:308
+#: main/main.c:329
 #, c-format
 msgid "Options:\n"
 msgstr "Opzioni:\n"
 
-#: main/main.c:309
+#: main/main.c:330
 #, c-format
 msgid "  -B NBUFFERS        number of shared buffers\n"
 msgstr "  -B NBUFFERS        numero di buffer condivisi\n"
 
-#: main/main.c:310
+#: main/main.c:331
 #, c-format
 msgid "  -c NAME=VALUE      set run-time parameter\n"
 msgstr "  -c NOME=VALORE     imposta un parametro di esecuzione\n"
 
-#: main/main.c:311
+#: main/main.c:332
 #, c-format
 msgid "  -C NAME            print value of run-time parameter, then exit\n"
 msgstr "  -C NAME            stampa il valore del parametro di esecuzione ed esci\n"
 
-#: main/main.c:312
+#: main/main.c:333
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5             livello di debugging\n"
 
-#: main/main.c:313
+#: main/main.c:334
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D DATADIR         directory del database\n"
 
-#: main/main.c:314
+#: main/main.c:335
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e                 usa il formato date europeo (GMA)\n"
 
-#: main/main.c:315
+#: main/main.c:336
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F                 disabilita fsync\n"
 
-#: main/main.c:316
+#: main/main.c:337
 #, c-format
 msgid "  -h HOSTNAME        host name or IP address to listen on\n"
 msgstr "  -h HOSTNAME        nome host o indirizzo IP su cui ascoltare\n"
 
-#: main/main.c:317
+#: main/main.c:338
 #, c-format
 msgid "  -i                 enable TCP/IP connections\n"
 msgstr "  -i                 abilita le connessioni TCP/IP\n"
 
-#: main/main.c:318
+#: main/main.c:339
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k DIRECTORY       posizione dei socket di dominio Unix\n"
 
-#: main/main.c:320
+#: main/main.c:341
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l                 abilita la connessione SSL\n"
 
-#: main/main.c:322
+#: main/main.c:343
 #, c-format
 msgid "  -N MAX-CONNECT     maximum number of allowed connections\n"
 msgstr "  -N MAX-CONNECT     numero massimo di connessioni consentite\n"
 
-#: main/main.c:323
+#: main/main.c:344
 #, c-format
 msgid "  -o OPTIONS         pass \"OPTIONS\" to each server process (obsolete)\n"
 msgstr "  -o OPZIONI         passa \"OPZIONI\" ad ogni processo server (obsoleto)\n"
 
-#: main/main.c:324
+#: main/main.c:345
 #, c-format
 msgid "  -p PORT            port number to listen on\n"
 msgstr "  -p PORT            numero di porta sul quale ascoltare\n"
 
-#: main/main.c:325
+#: main/main.c:346
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s                 mostra le statistiche dopo ogni query\n"
 
-#: main/main.c:326
+#: main/main.c:347
 #, c-format
 msgid "  -S WORK-MEM        set amount of memory for sorts (in kB)\n"
 msgstr ""
 "  -S WORK-MEM        imposta la dimensione della memoria per gli ordinamenti\n"
 "                     (in kB)\n"
 
-#: main/main.c:327
+#: main/main.c:348
 #, c-format
 msgid "  -V, --version      output version information, then exit\n"
 msgstr "  -V, --version      mostra informazioni sulla versione ed esci\n"
 
-#: main/main.c:328
+#: main/main.c:349
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --NOME=VALORE      imposta un parametro di esecuzione\n"
 
-#: main/main.c:329
+#: main/main.c:350
 #, c-format
 msgid "  --describe-config  describe configuration parameters, then exit\n"
 msgstr "  --describe-config  descrivi i parametri di configurazione ed esci\n"
 
-#: main/main.c:330
+#: main/main.c:351
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help         mostra questo aiuto ed esci\n"
 
-#: main/main.c:332
+#: main/main.c:353
 #, c-format
 msgid ""
 "\n"
@@ -11232,48 +11200,48 @@
 "\n"
 "Opzioni per gli sviluppatori:\n"
 
-#: main/main.c:333
+#: main/main.c:354
 #, c-format
 msgid "  -f s|i|n|m|h       forbid use of some plan types\n"
 msgstr "  -f s|i|n|m|h       vieta l'uso di alcuni tipi di piani\n"
 
-#: main/main.c:334
+#: main/main.c:355
 #, c-format
 msgid "  -n                 do not reinitialize shared memory after abnormal exit\n"
 msgstr ""
 "  -n                 non reinizializzare la memoria condivisa dopo un'uscita\n"
 "                     anormale\n"
 
-#: main/main.c:335
+#: main/main.c:356
 #, c-format
 msgid "  -O                 allow system table structure changes\n"
 msgstr ""
 "  -O                 consenti cambiamenti alla struttura delle tabelle\n"
 "                     di sistema\n"
 
-#: main/main.c:336
+#: main/main.c:357
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P                 disabilita gli indici di sistema\n"
 
-#: main/main.c:337
+#: main/main.c:358
 #, c-format
 msgid "  -t pa|pl|ex        show timings after each query\n"
 msgstr "  -t pa|pl|ex        mostra i tempi impiegati dopo ogni query\n"
 
-#: main/main.c:338
+#: main/main.c:359
 #, c-format
 msgid "  -T                 send SIGSTOP to all backend processes if one dies\n"
 msgstr "  -T                 invia SIGSTOP a tutti i processi backend se uno muore\n"
 
-#: main/main.c:339
+#: main/main.c:360
 #, c-format
 msgid "  -W NUM             wait NUM seconds to allow attach from a debugger\n"
 msgstr ""
 "  -W NUM             attendi NUM secondi per consentire ad un debugger\n"
 "                     di collegarsi\n"
 
-#: main/main.c:341
+#: main/main.c:362
 #, c-format
 msgid ""
 "\n"
@@ -11282,41 +11250,41 @@
 "\n"
 "Opzione per la modalità a singolo utente:\n"
 
-#: main/main.c:342
+#: main/main.c:363
 #, c-format
 msgid "  --single           selects single-user mode (must be first argument)\n"
 msgstr ""
 "  --single           imposta la modalità utente singolo (deve essere il primo\n"
 "                     argomento)\n"
 
-#: main/main.c:343
+#: main/main.c:364
 #, c-format
 msgid "  DBNAME             database name (defaults to user name)\n"
 msgstr "  DBNAME             nome del database (il predefinito è il nome dell'utente)\n"
 
-#: main/main.c:344
+#: main/main.c:365
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5             scavalca il livello di debugging\n"
 
-#: main/main.c:345
+#: main/main.c:366
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E                 stampa le istruzioni prima dell'esecuzione\n"
 
-#: main/main.c:346
+#: main/main.c:367
 #, c-format
 msgid "  -j                 do not use newline as interactive query delimiter\n"
 msgstr ""
 "  -j                 non usare \"a capo\" come delimitatore delle query\n"
 "                     interattivo\n"
 
-#: main/main.c:347 main/main.c:352
+#: main/main.c:368 main/main.c:373
 #, c-format
 msgid "  -r FILENAME        send stdout and stderr to given file\n"
 msgstr "  -r NOMEFILE        invia stdout e stderr al file in argomento\n"
 
-#: main/main.c:349
+#: main/main.c:370
 #, c-format
 msgid ""
 "\n"
@@ -11325,26 +11293,26 @@
 "\n"
 "Opzioni per la modalità di inizializzazione:\n"
 
-#: main/main.c:350
+#: main/main.c:371
 #, c-format
 msgid "  --boot             selects bootstrapping mode (must be first argument)\n"
 msgstr ""
 "  --boot             seleziona la modalità di inizializzazione (dev'essere\n"
 "                     il primo argomento)\n"
 
-#: main/main.c:351
+#: main/main.c:372
 #, c-format
 msgid "  DBNAME             database name (mandatory argument in bootstrapping mode)\n"
 msgstr ""
 "  DBNAME             nome del database (obbligatorio in modalità di\n"
 "                     inizializzazione)\n"
 
-#: main/main.c:353
+#: main/main.c:374
 #, c-format
 msgid "  -x NUM             internal use\n"
 msgstr "  -x NUM             uso interno\n"
 
-#: main/main.c:355
+#: main/main.c:376
 #, c-format
 msgid ""
 "\n"
@@ -11361,7 +11329,7 @@
 "\n"
 "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: main/main.c:369
+#: main/main.c:390
 #, c-format
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
@@ -11374,12 +11342,12 @@
 "prevenire possibili problemi di sicurezza. Consulta la documentazione\n"
 "per avere maggiori informazioni su come avviare il server correttamente.\n"
 
-#: main/main.c:386
+#: main/main.c:407
 #, c-format
 msgid "%s: real and effective user IDs must match\n"
 msgstr "%s: utente gli ID reale e quello effettivo devono coincidere\n"
 
-#: main/main.c:393
+#: main/main.c:414
 #, c-format
 msgid ""
 "Execution of PostgreSQL by a user with administrative permissions is not\n"
@@ -11394,9 +11362,9 @@
 "prevenire possibili problemi di sicurezza. Consulta la documentazione\n"
 "per avere maggiori informazioni su come avviare il server correttamente.\n"
 
-#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:1782
-#: parser/parse_coerce.c:1810 parser/parse_coerce.c:1886
-#: parser/parse_expr.c:1981 parser/parse_func.c:597 parser/parse_oper.c:952
+#: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:1820
+#: parser/parse_coerce.c:1848 parser/parse_coerce.c:1924
+#: parser/parse_expr.c:1994 parser/parse_func.c:597 parser/parse_oper.c:952
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "non è stato possibile trovare il tipo di array per il tipo di dati %s"
@@ -11416,29 +11384,34 @@
 msgid "WHERE CURRENT OF is not supported on a view with grouping or aggregation"
 msgstr "WHERE CURRENT OF non è supportato per una vista con raggruppamenti o aggregazioni"
 
-#: optimizer/path/joinrels.c:740
+#: optimizer/path/joinrels.c:802
 #, c-format
 msgid "FULL JOIN is only supported with merge-joinable or hash-joinable join conditions"
 msgstr "FULL JOIN è supportato solo con condizioni di join realizzabili con merge o hash"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/initsplan.c:1083
+#: optimizer/plan/initsplan.c:1104
 #, c-format
 msgid "%s cannot be applied to the nullable side of an outer join"
 msgstr "%s non può essere applicato sul lato che può essere nullo di un join esterno"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1347 parser/analyze.c:1433 parser/analyze.c:1631
-#: parser/analyze.c:2412
+#: optimizer/plan/planner.c:1341 parser/analyze.c:1478 parser/analyze.c:1676
+#: parser/analyze.c:2457
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s non è consentito con UNION/INTERSECT/EXCEPT"
 
-#: optimizer/plan/planner.c:3603
+#: optimizer/plan/planner.c:1762 optimizer/plan/planner.c:3603
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "non è stato possibile implementare GROUP BY"
 
+#: optimizer/plan/planner.c:1763
+#, c-format
+msgid "Some of the datatypes do not support sorting, which is required for grouping sets."
+msgstr "Alcuni tipi di dati non supportano l'ordinamento, che è richiesto per il raggruppamento."
+
 #: optimizer/plan/planner.c:3604 optimizer/plan/planner.c:3772
 #: optimizer/prep/prepunion.c:828
 #, c-format
@@ -11491,7 +11464,7 @@
 msgid "could not implement %s"
 msgstr "non è stato possibile implementare %s"
 
-#: optimizer/util/clauses.c:4597
+#: optimizer/util/clauses.c:4693
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "funzione SQL \"%s\" durante l'inlining"
@@ -11501,27 +11474,27 @@
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr "non è possibile accedere a relazioni temporanee o non loggate durante il ripristino"
 
-#: optimizer/util/plancat.c:498
+#: optimizer/util/plancat.c:490
 #, c-format
-msgid "system columns cannot be used in an ON CONFLICT clause"
-msgstr "le colonne di sistema non possono essere usate in una clausola ON CONFLICT"
+msgid "whole row unique index inference specifications are not supported"
+msgstr "le specifiche di inferenza di indici unici per l'intera riga non sono supportate"
 
-#: optimizer/util/plancat.c:516
+#: optimizer/util/plancat.c:507
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "il vincolo nella clausola ON CONFLICT non ha indici associati"
 
-#: optimizer/util/plancat.c:568
+#: optimizer/util/plancat.c:558
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATE non supportato con vincoli di esclusione"
 
-#: optimizer/util/plancat.c:675
+#: optimizer/util/plancat.c:663
 #, c-format
 msgid "there is no unique or exclusion constraint matching the ON CONFLICT specification"
 msgstr "non c'è alcun vincolo di unicità o esclusione che combaci con la specifica ON CONFLICT"
 
-#: parser/analyze.c:639 parser/analyze.c:1205
+#: parser/analyze.c:639 parser/analyze.c:1250
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "le liste VALUES devono essere tutte della stessa lunghezza"
@@ -11541,177 +11514,177 @@
 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 "L'origine dell'inserimento è un'espressione riga con lo stesso numero di colonne attese da INSERT. Forse hai usato accidentalmente parentesi in eccesso?"
 
-#: parser/analyze.c:1026 parser/analyze.c:1406
+#: parser/analyze.c:1071 parser/analyze.c:1451
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO non è permesso qui"
 
-#: parser/analyze.c:1219
+#: parser/analyze.c:1264
 #, c-format
 msgid "DEFAULT can only appear in a VALUES list within INSERT"
 msgstr "DEFAULT può apparire solo nella lista di VALUES usata in un INSERT"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1338 parser/analyze.c:2582
+#: parser/analyze.c:1383 parser/analyze.c:2627
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s non è consentito con VALUES"
 
-#: parser/analyze.c:1559
+#: parser/analyze.c:1604
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "clausola UNION/INTERSECT/EXCEPT ORDER BY non valida"
 
-#: parser/analyze.c:1560
+#: parser/analyze.c:1605
 #, c-format
 msgid "Only result column names can be used, not expressions or functions."
 msgstr "Possono essere usati solo nomi di colonne risultanti, non espressioni o funzioni."
 
-#: parser/analyze.c:1561
+#: parser/analyze.c:1606
 #, c-format
 msgid "Add the expression/function to every SELECT, or move the UNION into a FROM clause."
 msgstr "Aggiungi l'espressione/funzione ad ogni SELECT, oppure sposta la UNION in una clausola FROM."
 
-#: parser/analyze.c:1621
+#: parser/analyze.c:1666
 #, c-format
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr "INTO è permesso solo nella prima SELECT di UNION/INTERSECT/EXCEPT"
 
-#: parser/analyze.c:1685
+#: parser/analyze.c:1730
 #, c-format
 msgid "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"
 msgstr "l'istruzione membro di UNION/INTERSECT/EXCEPT non può riferirsi al altre relazione allo stesso livello della query"
 
-#: parser/analyze.c:1774
+#: parser/analyze.c:1819
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "ogni query in %s deve avere lo stesso numero di colonne"
 
-#: parser/analyze.c:2167
+#: parser/analyze.c:2212
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "RETURNING deve avere almeno una colonna"
 
-#: parser/analyze.c:2204
+#: parser/analyze.c:2249
 #, c-format
 msgid "cannot specify both SCROLL and NO SCROLL"
 msgstr "non è possibile specificare sia SCROLL che NO SCROLL"
 
-#: parser/analyze.c:2222
+#: parser/analyze.c:2267
 #, c-format
 msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
 msgstr "DECLARE CURSOR non può contenere istruzioni di modifica dei dati nel WITH"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2230
+#: parser/analyze.c:2275
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s non è supportato"
 
-#: parser/analyze.c:2233
+#: parser/analyze.c:2278
 #, c-format
 msgid "Holdable cursors must be READ ONLY."
 msgstr "I cursori trattenibili devono essere READ ONLY."
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2241
+#: parser/analyze.c:2286
 #, c-format
 msgid "DECLARE SCROLL CURSOR ... %s is not supported"
 msgstr "DECLARE SCROLL CURSOR ... %s non è supportato"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2252
+#: parser/analyze.c:2297
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not supported"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s non è supportato"
 
-#: parser/analyze.c:2255
+#: parser/analyze.c:2300
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "I cursori Insensitive devono essere READ ONLY."
 
-#: parser/analyze.c:2321
+#: parser/analyze.c:2366
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr "le viste materializzate non possono usare istruzioni di modifica dei dati nel WITH"
 
-#: parser/analyze.c:2331
+#: parser/analyze.c:2376
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr "le viste materializzate non possono usare tabelle temporanee o viste"
 
-#: parser/analyze.c:2341
+#: parser/analyze.c:2386
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr "le viste materializzate non possono essere definite con parametri impostati"
 
-#: parser/analyze.c:2353
+#: parser/analyze.c:2398
 #, c-format
 msgid "materialized views cannot be UNLOGGED"
 msgstr "le viste materializzate non possono essere UNLOGGED"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2419
+#: parser/analyze.c:2464
 #, c-format
 msgid "%s is not allowed with DISTINCT clause"
 msgstr "%s non è consentito con la clausola DISTINCT"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2426
+#: parser/analyze.c:2471
 #, c-format
 msgid "%s is not allowed with GROUP BY clause"
 msgstr "%s non è consentito con la clausola GROUP BY"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2433
+#: parser/analyze.c:2478
 #, c-format
 msgid "%s is not allowed with HAVING clause"
 msgstr "%s non è consentito con la clausola HAVING"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2440
+#: parser/analyze.c:2485
 #, c-format
 msgid "%s is not allowed with aggregate functions"
 msgstr "%s non è consentito con funzioni di aggregazione"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2447
+#: parser/analyze.c:2492
 #, c-format
 msgid "%s is not allowed with window functions"
 msgstr "%s non è consentito con funzioni finestra"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2454
+#: parser/analyze.c:2499
 #, c-format
 msgid "%s is not allowed with set-returning functions in the target list"
 msgstr "%s non è consentito con la le funzioni che restituiscono insiemi nella lista di destinazione"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2533
+#: parser/analyze.c:2578
 #, c-format
 msgid "%s must specify unqualified relation names"
 msgstr "%s deve specificare nomi di tabelle non qualificati"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2564
+#: parser/analyze.c:2609
 #, c-format
 msgid "%s cannot be applied to a join"
 msgstr "%s non può essere applicato ad un join"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2573
+#: parser/analyze.c:2618
 #, c-format
 msgid "%s cannot be applied to a function"
 msgstr "%s non può essere applicato ad una funzione"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2591
+#: parser/analyze.c:2636
 #, c-format
 msgid "%s cannot be applied to a WITH query"
 msgstr "%s non può essere applicato ad una query WITH"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2608
+#: parser/analyze.c:2653
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr "la relazione \"%s\" nella clausola %s non è stata trovata nella clausola FROM"
@@ -11757,11 +11730,11 @@
 
 #: parser/parse_agg.c:378
 msgid "aggregate functions are not allowed in policy expressions"
-msgstr "le funzioni di aggregazione non sono ammesse nell'espressione di una politica"
+msgstr "le funzioni di aggregazione non sono ammesse nell'espressione di una regola di sicurezza"
 
 #: parser/parse_agg.c:380
 msgid "grouping operations are not allowed in policy expressions"
-msgstr "le funzioni di raggruppamento non sono ammesse nell'espressione di una politica"
+msgstr "le funzioni di raggruppamento non sono ammesse nell'espressione di una regola di sicurezza"
 
 #: parser/parse_agg.c:397
 msgid "aggregate functions are not allowed in window RANGE"
@@ -11867,7 +11840,7 @@
 
 #: parser/parse_agg.c:781
 msgid "window functions are not allowed in policy expressions"
-msgstr "le funzioni finestra non sono ammesse nell'espressione di una politica"
+msgstr "le funzioni finestra non sono ammesse nell'espressione di una regola di sicurezza"
 
 #: parser/parse_agg.c:793
 msgid "window functions are not allowed in window definitions"
@@ -11914,7 +11887,7 @@
 
 #: parser/parse_agg.c:982
 #, c-format
-msgid "too many grouping sets present (max 4096)"
+msgid "too many grouping sets present (maximum 4096)"
 msgstr "troppi insiemi di raggruppamento presenti (il massimo è 4096)"
 
 #: parser/parse_agg.c:1131
@@ -12131,18 +12104,18 @@
 
 #: parser/parse_clause.c:2859
 #, c-format
-msgid "For example, ON CONFLICT (<column>)."
-msgstr "Per esempio, ON CONFLICT (<colonna>)."
+msgid "For example, ON CONFLICT (column_name)."
+msgstr "Per esempio, ON CONFLICT (nome_colonna)."
 
 #: parser/parse_clause.c:2870
 #, c-format
-msgid "ON CONFLICT not supported with system catalog tables"
-msgstr "ON CONFLICT non supportato sulle tabelle del catalogo di sistema"
+msgid "ON CONFLICT is not supported with system catalog tables"
+msgstr "ON CONFLICT non è supportato sulle tabelle del catalogo di sistema"
 
 #: parser/parse_clause.c:2878
 #, c-format
-msgid "ON CONFLICT not supported on table \"%s\" used as a catalog table"
-msgstr "ON CONFLICT non supportato sulla tabella \"%s\" usata da una tabella di catalogo"
+msgid "ON CONFLICT is not supported on table \"%s\" used as a catalog table"
+msgstr "ON CONFLICT non è supportato sulla tabella \"%s\" usata da una tabella di catalogo"
 
 #: parser/parse_clause.c:3010
 #, c-format
@@ -12154,111 +12127,111 @@
 msgid "Ordering operators must be \"<\" or \">\" members of btree operator families."
 msgstr "Gli operatori di ordinamento devono essere i membri \"<\" oppure \">\" di una famiglia di operatori btree."
 
-#: parser/parse_coerce.c:933 parser/parse_coerce.c:963
-#: parser/parse_coerce.c:981 parser/parse_coerce.c:996
-#: parser/parse_expr.c:2015 parser/parse_expr.c:2528 parser/parse_target.c:874
+#: parser/parse_coerce.c:971 parser/parse_coerce.c:1001
+#: parser/parse_coerce.c:1019 parser/parse_coerce.c:1034
+#: parser/parse_expr.c:2028 parser/parse_expr.c:2552 parser/parse_target.c:885
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "non è possibile convertire il tipo %s in %s"
 
-#: parser/parse_coerce.c:966
+#: parser/parse_coerce.c:1004
 #, c-format
 msgid "Input has too few columns."
 msgstr "L'input ha troppe poche colonne."
 
-#: parser/parse_coerce.c:984
+#: parser/parse_coerce.c:1022
 #, c-format
 msgid "Cannot cast type %s to %s in column %d."
 msgstr "Non è possibile convertire il tipo %s in %s nella colonna %d."
 
-#: parser/parse_coerce.c:999
+#: parser/parse_coerce.c:1037
 #, c-format
 msgid "Input has too many columns."
 msgstr "L'input ha troppe colonne."
 
 #. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:1042
+#: parser/parse_coerce.c:1080
 #, c-format
 msgid "argument of %s must be type boolean, not type %s"
 msgstr "l'argomento di %s deve essere di tipo booleano, non %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:1052 parser/parse_coerce.c:1101
+#: parser/parse_coerce.c:1090 parser/parse_coerce.c:1139
 #, c-format
 msgid "argument of %s must not return a set"
 msgstr "l'argomento di %s non deve restituire un set"
 
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1089
+#: parser/parse_coerce.c:1127
 #, c-format
 msgid "argument of %s must be type %s, not type %s"
 msgstr "l'argomento di %s deve essere di tipo %s, non %s"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1222
+#: parser/parse_coerce.c:1260
 #, c-format
 msgid "%s types %s and %s cannot be matched"
 msgstr "in %s i tipi %s e %s non combaciano"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1289
+#: parser/parse_coerce.c:1327
 #, c-format
 msgid "%s could not convert type %s to %s"
 msgstr "in %s conversione del tipo %s in %s fallita"
 
-#: parser/parse_coerce.c:1591
+#: parser/parse_coerce.c:1629
 #, c-format
 msgid "arguments declared \"anyelement\" are not all alike"
 msgstr "gli argomenti dichiarati \"anyelement\" non sono tutti simili"
 
-#: parser/parse_coerce.c:1611
+#: parser/parse_coerce.c:1649
 #, c-format
 msgid "arguments declared \"anyarray\" are not all alike"
 msgstr "gli argomenti dichiarati \"anyarray\" non sono tutti simili"
 
-#: parser/parse_coerce.c:1631
+#: parser/parse_coerce.c:1669
 #, c-format
 msgid "arguments declared \"anyrange\" are not all alike"
 msgstr "gli argomenti dichiarati \"anyrange\" non sono tutti simili"
 
-#: parser/parse_coerce.c:1660 parser/parse_coerce.c:1871
-#: parser/parse_coerce.c:1905
+#: parser/parse_coerce.c:1698 parser/parse_coerce.c:1909
+#: parser/parse_coerce.c:1943
 #, c-format
 msgid "argument declared \"anyarray\" is not an array but type %s"
 msgstr "l'argomento dichiarato \"anyarray\" non è un array ma di tipo %s"
 
-#: parser/parse_coerce.c:1676
+#: parser/parse_coerce.c:1714
 #, c-format
 msgid "argument declared \"anyarray\" is not consistent with argument declared \"anyelement\""
 msgstr "l'argomento dichiarato \"anyarray\" non è consistente con l'argomento dichiarato \"anyelement\""
 
-#: parser/parse_coerce.c:1697 parser/parse_coerce.c:1918
+#: parser/parse_coerce.c:1735 parser/parse_coerce.c:1956
 #, c-format
 msgid "argument declared \"anyrange\" is not a range type but type %s"
 msgstr "l'argomento dichiarato \"anyrange\" non è un intervallo ma è un tipo %s"
 
-#: parser/parse_coerce.c:1713
+#: parser/parse_coerce.c:1751
 #, c-format
 msgid "argument declared \"anyrange\" is not consistent with argument declared \"anyelement\""
 msgstr "l'argomento dichiarato \"anyrange\" non è consistente con l'argomento dichiarato \"anyelement\""
 
-#: parser/parse_coerce.c:1733
+#: parser/parse_coerce.c:1771
 #, c-format
 msgid "could not determine polymorphic type because input has type \"unknown\""
 msgstr "determinazione del tipo polimorfico fallita perché l'input è di tipo \"unknown\""
 
-#: parser/parse_coerce.c:1743
+#: parser/parse_coerce.c:1781
 #, c-format
 msgid "type matched to anynonarray is an array type: %s"
 msgstr "il tipo associato ad anynonarray è di tipo array: %s"
 
-#: parser/parse_coerce.c:1753
+#: parser/parse_coerce.c:1791
 #, c-format
 msgid "type matched to anyenum is not an enum type: %s"
 msgstr "il tipo associato ad anyenum non è una enumerazione: %s"
 
-#: parser/parse_coerce.c:1793 parser/parse_coerce.c:1823
+#: parser/parse_coerce.c:1831 parser/parse_coerce.c:1861
 #, c-format
 msgid "could not find range type for data type %s"
 msgstr "tipo dell'intervallo non trovato per il tipo di dato %s"
@@ -12380,8 +12353,8 @@
 msgid "recursive reference to query \"%s\" must not appear more than once"
 msgstr "il riferimento ricorsivo alla query \"%s\" non può apparire più di una volta"
 
-#: parser/parse_expr.c:387 parser/parse_relation.c:3077
-#: parser/parse_relation.c:3097
+#: parser/parse_expr.c:387 parser/parse_relation.c:3176
+#: parser/parse_relation.c:3196
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "la colonna %s.%s non esiste"
@@ -12401,13 +12374,13 @@
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr "la notazione della colonna .%s sembra essere di tipo %s, che non è un tipo composito"
 
-#: parser/parse_expr.c:441 parser/parse_target.c:660
+#: parser/parse_expr.c:441 parser/parse_target.c:671
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr "l'espansione della riga tramite \"*\" non è supportata qui"
 
-#: parser/parse_expr.c:767 parser/parse_relation.c:666
-#: parser/parse_relation.c:763 parser/parse_target.c:1109
+#: parser/parse_expr.c:767 parser/parse_relation.c:668
+#: parser/parse_relation.c:768 parser/parse_target.c:1120
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "il riferimento alla colonna \"%s\" è ambiguo"
@@ -12418,135 +12391,135 @@
 msgid "there is no parameter $%d"
 msgstr "parametro $%d non presente"
 
-#: parser/parse_expr.c:1034
+#: parser/parse_expr.c:1042
 #, c-format
 msgid "NULLIF requires = operator to yield boolean"
 msgstr "NULLIF richiede che l'operatore = restituisca un valore booleano"
 
-#: parser/parse_expr.c:1468 gram.y:9779
+#: parser/parse_expr.c:1476 gram.y:9745
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr "il numero di colonne non corrisponde al numero di valori"
 
-#: parser/parse_expr.c:1697
+#: parser/parse_expr.c:1705
 msgid "cannot use subquery in check constraint"
 msgstr "non si può usare una sottoquery nel vincolo di controllo"
 
-#: parser/parse_expr.c:1701
+#: parser/parse_expr.c:1709
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "non si può usare una sottoquery in un'espressione DEFAULT"
 
-#: parser/parse_expr.c:1704
+#: parser/parse_expr.c:1712
 msgid "cannot use subquery in index expression"
 msgstr "non si possono usare sottoquery nell'espressione dell'indice"
 
-#: parser/parse_expr.c:1707
+#: parser/parse_expr.c:1715
 msgid "cannot use subquery in index predicate"
 msgstr "non è possibile usare sottoquery nel predicato dell'indice"
 
-#: parser/parse_expr.c:1710
+#: parser/parse_expr.c:1718
 msgid "cannot use subquery in transform expression"
 msgstr "non è possibile usare sottoquery in un'espressione di trasformazione"
 
-#: parser/parse_expr.c:1713
+#: parser/parse_expr.c:1721
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "non si possono usare sottoquery nel parametro EXECUTE"
 
-#: parser/parse_expr.c:1716
+#: parser/parse_expr.c:1724
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "non è possibile usare sottoquery nella condizione WHEN del trigger"
 
-#: parser/parse_expr.c:1770
+#: parser/parse_expr.c:1778
 #, c-format
 msgid "subquery must return only one column"
 msgstr "la sottoquery deve restituire solo una colonna"
 
-#: parser/parse_expr.c:1854
+#: parser/parse_expr.c:1862
 #, c-format
 msgid "subquery has too many columns"
 msgstr "la sottoquery ha troppe colonne"
 
-#: parser/parse_expr.c:1859
+#: parser/parse_expr.c:1867
 #, c-format
 msgid "subquery has too few columns"
 msgstr "la sottoquery ha troppe poche colonne"
 
-#: parser/parse_expr.c:1955
+#: parser/parse_expr.c:1968
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "non è possibile determinare il tipo di un array vuoto"
 
-#: parser/parse_expr.c:1956
+#: parser/parse_expr.c:1969
 #, c-format
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr "Effettua una conversione esplicita al tipo desiderato, ad esempio ARRAY[]::integer[]."
 
-#: parser/parse_expr.c:1970
+#: parser/parse_expr.c:1983
 #, c-format
 msgid "could not find element type for data type %s"
 msgstr "tipo dell'elemento non trovato per il tipo di dato %s"
 
-#: parser/parse_expr.c:2193
+#: parser/parse_expr.c:2206
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "il valore dell'attributo XML senza nome dev'essere un riferimento ad una colonna"
 
-#: parser/parse_expr.c:2194
+#: parser/parse_expr.c:2207
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "il valore dell'elemento XML senza nome dev'essere un riferimento ad una colonna"
 
-#: parser/parse_expr.c:2209
+#: parser/parse_expr.c:2222
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "l'attributo XML di nome \"%s\" compare più di una volta"
 
-#: parser/parse_expr.c:2316
+#: parser/parse_expr.c:2329
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "non è possibile convertire il risultato di XMLSERIALIZE a %s"
 
-#: parser/parse_expr.c:2601 parser/parse_expr.c:2797
+#: parser/parse_expr.c:2625 parser/parse_expr.c:2821
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "numero di elementi differente nelle espressioni di riga"
 
-#: parser/parse_expr.c:2611
+#: parser/parse_expr.c:2635
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "non possono comparire righe di lunghezza zero"
 
-#: parser/parse_expr.c:2636
+#: parser/parse_expr.c:2660
 #, c-format
 msgid "row comparison operator must yield type boolean, not type %s"
 msgstr "l'operatore di comparazione tra righe deve restituire il tipo booleano, non il tipo %s"
 
-#: parser/parse_expr.c:2643
+#: parser/parse_expr.c:2667
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "l'operatore di comparazione tra righe non può restituire un insieme"
 
-#: parser/parse_expr.c:2702 parser/parse_expr.c:2743
+#: parser/parse_expr.c:2726 parser/parse_expr.c:2767
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "non è stato possibile determinare un'interpretazione dell'operatore di comparazione tra righe %s"
 
-#: parser/parse_expr.c:2704
+#: parser/parse_expr.c:2728
 #, c-format
 msgid "Row comparison operators must be associated with btree operator families."
 msgstr "Gli operatori di comparazione tra righe devono essere associati a famiglie di operatori btree."
 
-#: parser/parse_expr.c:2745
+#: parser/parse_expr.c:2769
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "C'è più di un candidato egualmente plausibile."
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2861
 #, c-format
 msgid "IS DISTINCT FROM requires = operator to yield boolean"
 msgstr "IS DISTINCT FROM richiede che l'operatore = restituisca un valore booleano"
 
-#: parser/parse_expr.c:3127 parser/parse_expr.c:3145
+#: parser/parse_expr.c:3151 parser/parse_expr.c:3169
 #, c-format
 msgid "operator precedence change: %s is now lower precedence than %s"
 msgstr "cambio di precedenza di operatori: %s ora ha precedenza inferiore di %s"
@@ -12737,10 +12710,10 @@
 msgid "Use an explicit ordering operator or modify the query."
 msgstr "Usa un operatore di ordinamento esplicito, oppure modifica la query."
 
-#: parser/parse_oper.c:226 utils/adt/array_userfuncs.c:782
-#: utils/adt/array_userfuncs.c:920 utils/adt/arrayfuncs.c:3610
-#: utils/adt/arrayfuncs.c:4048 utils/adt/arrayfuncs.c:6026
-#: utils/adt/rowtypes.c:1159
+#: parser/parse_oper.c:226 utils/adt/array_userfuncs.c:794
+#: utils/adt/array_userfuncs.c:933 utils/adt/arrayfuncs.c:3613
+#: utils/adt/arrayfuncs.c:4051 utils/adt/arrayfuncs.c:6017
+#: utils/adt/rowtypes.c:1167
 #, c-format
 msgid "could not identify an equality operator for type %s"
 msgstr "operatore di uguaglianza per il tipo %s non trovato"
@@ -12790,193 +12763,193 @@
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "tipi di dati dedotti per il parametro $%d non consistenti"
 
-#: parser/parse_relation.c:174
+#: parser/parse_relation.c:175
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
 msgstr "il riferimento alla tabella \"%s\" è ambiguo"
 
-#: parser/parse_relation.c:218
+#: parser/parse_relation.c:219
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "il riferimento alla tabella %u è ambiguo"
 
-#: parser/parse_relation.c:397
+#: parser/parse_relation.c:398
 #, c-format
 msgid "table name \"%s\" specified more than once"
 msgstr "la tabella di nome \"%s\" è stata specificata più di una volta"
 
-#: parser/parse_relation.c:424 parser/parse_relation.c:3017
+#: parser/parse_relation.c:425 parser/parse_relation.c:3116
 #, c-format
 msgid "invalid reference to FROM-clause entry for table \"%s\""
 msgstr "riferimento non valido all'elemento della clausola FROM per la tabella \"%s\""
 
-#: parser/parse_relation.c:427 parser/parse_relation.c:3022
+#: parser/parse_relation.c:428 parser/parse_relation.c:3121
 #, c-format
 msgid "There is an entry for table \"%s\", but it cannot be referenced from this part of the query."
 msgstr "C'è un elemento per la tabella \"%s\", ma non può essere referenziato da questa parte della query."
 
-#: parser/parse_relation.c:429
+#: parser/parse_relation.c:430
 #, c-format
 msgid "The combining JOIN type must be INNER or LEFT for a LATERAL reference."
 msgstr "Il tipo del JOIN deve essere INNER oppure LEFT per un riferimento LATERAL."
 
-#: parser/parse_relation.c:701
+#: parser/parse_relation.c:706
 #, c-format
 msgid "system column \"%s\" reference in check constraint is invalid"
 msgstr "la colonna di sistema \"%s\" referenziata nel vincolo di controllo non è valida"
 
-#: parser/parse_relation.c:1059 parser/parse_relation.c:1339
-#: parser/parse_relation.c:1841
+#: parser/parse_relation.c:1066 parser/parse_relation.c:1346
+#: parser/parse_relation.c:1848
 #, c-format
 msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr "la tabella \"%s\" ha %d colonne disponibili ma %d colonne specificate"
 
-#: parser/parse_relation.c:1146
+#: parser/parse_relation.c:1153
 #, c-format
 msgid "There is a WITH item named \"%s\", but it cannot be referenced from this part of the query."
 msgstr "C'è un elemento di WITH di nome \"%s\", ma non può essere referenziato da questa parte della query."
 
-#: parser/parse_relation.c:1148
+#: parser/parse_relation.c:1155
 #, c-format
 msgid "Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
 msgstr "Usa WITH RECURSIVE, oppure riordina gli elementi di WITH per rimuovere i riferimenti in avanti."
 
-#: parser/parse_relation.c:1459
+#: parser/parse_relation.c:1466
 #, c-format
 msgid "a column definition list is only allowed for functions returning \"record\""
 msgstr "la lista di definizione di colonne è consentita solo per funzioni che restituiscono \"record\""
 
-#: parser/parse_relation.c:1468
+#: parser/parse_relation.c:1475
 #, c-format
 msgid "a column definition list is required for functions returning \"record\""
 msgstr "la lista di definizione di colonne è necessaria per funzioni che restituiscono \"record\""
 
-#: parser/parse_relation.c:1547
+#: parser/parse_relation.c:1554
 #, c-format
 msgid "function \"%s\" in FROM has unsupported return type %s"
 msgstr "la funzione \"%s\" in FROM restituisce il tipo non supportato %s"
 
-#: parser/parse_relation.c:1669
+#: parser/parse_relation.c:1676
 #, c-format
 msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
 msgstr "le liste VALUES \"%s\" hanno %d colonne disponibili ma %d colonne specificate"
 
-#: parser/parse_relation.c:1724
+#: parser/parse_relation.c:1731
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "i join possono avere al più %d colonne"
 
-#: parser/parse_relation.c:1814
+#: parser/parse_relation.c:1821
 #, c-format
 msgid "WITH query \"%s\" does not have a RETURNING clause"
 msgstr "la query WITH \"%s\" non ha una clausola RETURNING"
 
-#: parser/parse_relation.c:2646 parser/parse_relation.c:2801
+#: parser/parse_relation.c:2738 parser/parse_relation.c:2900
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "la colonna %d della relazione \"%s\" non esiste"
 
-#: parser/parse_relation.c:3020
+#: parser/parse_relation.c:3119
 #, c-format
 msgid "Perhaps you meant to reference the table alias \"%s\"."
 msgstr "Forse intendevi utilizzare l'alias \"%s\" della tabella."
 
-#: parser/parse_relation.c:3028
+#: parser/parse_relation.c:3127
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "elemento FROM per la tabella \"%s\" mancante"
 
-#: parser/parse_relation.c:3080
+#: parser/parse_relation.c:3179
 #, c-format
-msgid "Perhaps you meant to reference the column \"%s\".\"%s\"."
-msgstr "Forse intendevi referenziare la colonna \"%s\".\"%s\"."
+msgid "Perhaps you meant to reference the column \"%s.%s\"."
+msgstr "Forse intendevi referenziare la colonna \"%s.%s\"."
 
-#: parser/parse_relation.c:3082
+#: parser/parse_relation.c:3181
 #, c-format
 msgid "There is a column named \"%s\" in table \"%s\", but it cannot be referenced from this part of the query."
 msgstr "Esiste una colonna di nome \"%s\" nella tabella \"%s\", ma non può essere referenziata da questa parte della query."
 
-#: parser/parse_relation.c:3099
+#: parser/parse_relation.c:3198
 #, c-format
-msgid "Perhaps you meant to reference the column \"%s\".\"%s\" or the column \"%s\".\"%s\"."
-msgstr "Forse intendevi referenziare la colonna \"%s\".\"%s\" o la colonna \"%s\".\"%s\"."
+msgid "Perhaps you meant to reference the column \"%s.%s\" or the column \"%s.%s\"."
+msgstr "Forse intendevi referenziare la colonna \"%s.%s\" o la colonna \"%s.%s\"."
 
-#: parser/parse_target.c:421 parser/parse_target.c:713
+#: parser/parse_target.c:432 parser/parse_target.c:724
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "non è possibile assegnare alla colonna di sistema \"%s\""
 
-#: parser/parse_target.c:449
+#: parser/parse_target.c:460
 #, c-format
 msgid "cannot set an array element to DEFAULT"
 msgstr "non è possibile impostare gli elementi di un array a DEFAULT"
 
-#: parser/parse_target.c:454
+#: parser/parse_target.c:465
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "non è possibile impostare un sottocampo a DEFAULT"
 
-#: parser/parse_target.c:523
+#: parser/parse_target.c:534
 #, c-format
 msgid "column \"%s\" is of type %s but expression is of type %s"
 msgstr "la colonna \"%s\" è di tipo %s ma l'espressione è di tipo %s"
 
-#: parser/parse_target.c:697
+#: parser/parse_target.c:708
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a composite type"
 msgstr "non è possibile assegnare al campo \"%s\" della colonna \"%s\" perché il suo tipo %s non è un tipo composito"
 
-#: parser/parse_target.c:706
+#: parser/parse_target.c:717
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because there is no such column in data type %s"
 msgstr "non è possibile assegnare al campo \"%s\" della colonna \"%s\" perché non questa colonna non compare nel tipo di dato %s"
 
-#: parser/parse_target.c:773
+#: parser/parse_target.c:784
 #, c-format
 msgid "array assignment to \"%s\" requires type %s but expression is of type %s"
 msgstr "l'assegnamento array a \"%s\" richiede il tipo %s ma l'espressione è di tipo %s"
 
-#: parser/parse_target.c:783
+#: parser/parse_target.c:794
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
 msgstr "il sottocampo \"%s\" è di tipo %s ma l'espressione è di tipo %s"
 
-#: parser/parse_target.c:1199
+#: parser/parse_target.c:1210
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "SELECT * senza tabelle specificate non è consentito"
 
-#: parser/parse_type.c:84
+#: parser/parse_type.c:83
 #, c-format
 msgid "improper %%TYPE reference (too few dotted names): %s"
 msgstr "riferimento %%TYPE improprio (troppi pochi nomi puntati): %s"
 
-#: parser/parse_type.c:106
+#: parser/parse_type.c:105
 #, c-format
 msgid "improper %%TYPE reference (too many dotted names): %s"
 msgstr "riferimento %%TYPE improprio (troppi nomi puntati): %s"
 
-#: parser/parse_type.c:141
+#: parser/parse_type.c:140
 #, c-format
 msgid "type reference %s converted to %s"
 msgstr "riferimento al tipo %s convertito in %s"
 
-#: parser/parse_type.c:262 parser/parse_type.c:834 utils/cache/typcache.c:230
+#: parser/parse_type.c:261 parser/parse_type.c:805 utils/cache/typcache.c:238
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "il tipo \"%s\" non è completamente definito"
 
-#: parser/parse_type.c:347
+#: parser/parse_type.c:346
 #, c-format
 msgid "type modifier is not allowed for type \"%s\""
 msgstr "modificatore di tipo non ammesso per il tipo \"%s\""
 
-#: parser/parse_type.c:389
+#: parser/parse_type.c:388
 #, c-format
 msgid "type modifiers must be simple constants or identifiers"
 msgstr "i modificatori di tipo devono essere costanti o identificatori semplici"
 
-#: parser/parse_type.c:700 parser/parse_type.c:799
+#: parser/parse_type.c:671 parser/parse_type.c:770
 #, c-format
 msgid "invalid type name \"%s\""
 msgstr "nome di tipo \"%s\" non valido"
@@ -13026,179 +12999,179 @@
 msgid "LIKE is not supported for creating foreign tables"
 msgstr "LIKE non è supportato nella creazione di tabelle esterne"
 
-#: parser/parse_utilcmd.c:1239 parser/parse_utilcmd.c:1315
+#: parser/parse_utilcmd.c:1241 parser/parse_utilcmd.c:1317
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "L'indice \"%s\" contiene un riferimento all'intera riga della tabella."
 
-#: parser/parse_utilcmd.c:1584
+#: parser/parse_utilcmd.c:1586
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "non è possibile usare un indice preesistente in CREATE TABLE"
 
-#: parser/parse_utilcmd.c:1604
+#: parser/parse_utilcmd.c:1606
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "l'indice \"%s\" è già associato ad un vincolo"
 
-#: parser/parse_utilcmd.c:1612
+#: parser/parse_utilcmd.c:1614
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "l'indice \"%s\" non appartiene alla tabella \"%s\""
 
-#: parser/parse_utilcmd.c:1619
+#: parser/parse_utilcmd.c:1621
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "l'indice \"%s\" non è valido"
 
-#: parser/parse_utilcmd.c:1625
+#: parser/parse_utilcmd.c:1627
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "\"%s\" non è un indice univoco"
 
-#: parser/parse_utilcmd.c:1626 parser/parse_utilcmd.c:1633
-#: parser/parse_utilcmd.c:1640 parser/parse_utilcmd.c:1710
+#: parser/parse_utilcmd.c:1628 parser/parse_utilcmd.c:1635
+#: parser/parse_utilcmd.c:1642 parser/parse_utilcmd.c:1712
 #, c-format
 msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr "Non è possibile creare una chiave primaria o un vincolo univoco usando tale indice."
 
-#: parser/parse_utilcmd.c:1632
+#: parser/parse_utilcmd.c:1634
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "l'indice \"%s\" contiene espressioni"
 
-#: parser/parse_utilcmd.c:1639
+#: parser/parse_utilcmd.c:1641
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "\"%s\" è un indice parziale"
 
-#: parser/parse_utilcmd.c:1651
+#: parser/parse_utilcmd.c:1653
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "\"%s\" è un indice deferibile"
 
-#: parser/parse_utilcmd.c:1652
+#: parser/parse_utilcmd.c:1654
 #, c-format
 msgid "Cannot create a non-deferrable constraint using a deferrable index."
 msgstr "Non è possibile creare un vincolo non deferibile usando un indice deferibile."
 
-#: parser/parse_utilcmd.c:1709
+#: parser/parse_utilcmd.c:1711
 #, c-format
 msgid "index \"%s\" does not have default sorting behavior"
 msgstr "l'indice \"%s\" non ha un ordinamento predefinito"
 
-#: parser/parse_utilcmd.c:1856
+#: parser/parse_utilcmd.c:1858
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "la colonna \"%s\" appare due volte nel vincolo di chiave primaria"
 
-#: parser/parse_utilcmd.c:1862
+#: parser/parse_utilcmd.c:1864
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "la colonna \"%s\" appare due volte nel vincolo univoco"
 
-#: parser/parse_utilcmd.c:2032
+#: parser/parse_utilcmd.c:2034
 #, c-format
 msgid "index expression cannot return a set"
 msgstr "l'espressione dell'indice non può restituire un insieme"
 
-#: parser/parse_utilcmd.c:2043
+#: parser/parse_utilcmd.c:2045
 #, c-format
 msgid "index expressions and predicates can refer only to the table being indexed"
 msgstr "le espressioni e i predicati dell'indice possono riferirsi solo alla tabella indicizzata"
 
-#: parser/parse_utilcmd.c:2089
+#: parser/parse_utilcmd.c:2091
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "le regole sulle viste materializzate non sono supportate"
 
-#: parser/parse_utilcmd.c:2150
+#: parser/parse_utilcmd.c:2152
 #, c-format
 msgid "rule WHERE condition cannot contain references to other relations"
 msgstr "le condizioni WHERE delle regole non possono avere riferimenti ad altre relazioni"
 
-#: parser/parse_utilcmd.c:2222
+#: parser/parse_utilcmd.c:2224
 #, c-format
 msgid "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr "le regole con una condizione WHERE possono avere solo azione SELECT, INSERT, UPDATE o DELETE"
 
-#: parser/parse_utilcmd.c:2240 parser/parse_utilcmd.c:2339
-#: rewrite/rewriteHandler.c:478 rewrite/rewriteManip.c:1018
+#: parser/parse_utilcmd.c:2242 parser/parse_utilcmd.c:2341
+#: rewrite/rewriteHandler.c:478 rewrite/rewriteManip.c:1015
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "le istruzioni UNION/INTERSECT/EXCEPT condizionali non sono implementate"
 
-#: parser/parse_utilcmd.c:2258
+#: parser/parse_utilcmd.c:2260
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "la regola ON SELECT non può usare OLD"
 
-#: parser/parse_utilcmd.c:2262
+#: parser/parse_utilcmd.c:2264
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "la regola ON SELECT non può usare NEW"
 
-#: parser/parse_utilcmd.c:2271
+#: parser/parse_utilcmd.c:2273
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "la regola ON INSERT non può usare OLD"
 
-#: parser/parse_utilcmd.c:2277
+#: parser/parse_utilcmd.c:2279
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "La regola ON DELETE non può usare NEW"
 
-#: parser/parse_utilcmd.c:2305
+#: parser/parse_utilcmd.c:2307
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "non ci si può riferire ad OLD nella query WITH"
 
-#: parser/parse_utilcmd.c:2312
+#: parser/parse_utilcmd.c:2314
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "non ci si può riferire a NEW nella query WITH"
 
-#: parser/parse_utilcmd.c:2515
+#: parser/parse_utilcmd.c:2517
 #, c-format
 msgid "transform expression must not return a set"
 msgstr "l'espressione di trasformazione non può restituire un insieme"
 
-#: parser/parse_utilcmd.c:2629
+#: parser/parse_utilcmd.c:2631
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "clausola DEFERRABLE mal posizionata"
 
-#: parser/parse_utilcmd.c:2634 parser/parse_utilcmd.c:2649
+#: parser/parse_utilcmd.c:2636 parser/parse_utilcmd.c:2651
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "clausole DEFERRABLE/NOT DEFERRABLE multiple non consentite"
 
-#: parser/parse_utilcmd.c:2644
+#: parser/parse_utilcmd.c:2646
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "clausola NOT DEFERRABLE mal posizionata"
 
-#: parser/parse_utilcmd.c:2657 parser/parse_utilcmd.c:2683 gram.y:4859
+#: parser/parse_utilcmd.c:2659 parser/parse_utilcmd.c:2685 gram.y:4852
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "un vincolo dichiarato INITIALLY DEFERRED dev'essere DEFERRABLE"
 
-#: parser/parse_utilcmd.c:2665
+#: parser/parse_utilcmd.c:2667
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "clausola INITIALLY DEFERRED mal posizionata"
 
-#: parser/parse_utilcmd.c:2670 parser/parse_utilcmd.c:2696
+#: parser/parse_utilcmd.c:2672 parser/parse_utilcmd.c:2698
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "clausole INITIALLY IMMEDIATE/DEFERRED multiple non sono consentite"
 
-#: parser/parse_utilcmd.c:2691
+#: parser/parse_utilcmd.c:2693
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "clausola INITIALLY IMMEDIATE mal posizionata"
 
-#: parser/parse_utilcmd.c:2882
+#: parser/parse_utilcmd.c:2884
 #, c-format
 msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
 msgstr "CREATE specifica uno schema (%s) differente da quello che sta venendo creato (%s)"
@@ -13243,17 +13216,17 @@
 msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr "Potresti dover aumentare il valore SEMVMX del tuo kernel ad almeno %d. Consulta la documentazione di PostgreSQL per ulteriori dettagli."
 
-#: port/pg_shmem.c:141 port/sysv_shmem.c:141
+#: port/pg_shmem.c:195 port/sysv_shmem.c:195
 #, c-format
 msgid "could not create shared memory segment: %m"
 msgstr "creazione del segmento di memoria condivisa fallita: %m"
 
-#: port/pg_shmem.c:142 port/sysv_shmem.c:142
+#: port/pg_shmem.c:196 port/sysv_shmem.c:196
 #, c-format
 msgid "Failed system call was shmget(key=%lu, size=%zu, 0%o)."
 msgstr "La chiamata di sistema fallita era shmget(key=%lu, size=%zu, 0%o)."
 
-#: port/pg_shmem.c:146 port/sysv_shmem.c:146
+#: port/pg_shmem.c:200 port/sysv_shmem.c:200
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter, or possibly that it is less than your kernel's SHMMIN parameter.\n"
@@ -13262,7 +13235,7 @@
 "Questo errore di solito vuol dire che la richiesta di PostgreSQL di un segmento di memoria condivisa eccede il valore del parametro SHMMAX del tuo kernel, o anche che sia inferiore del parametro SHMMIN.\n"
 "La documentazione di PostgreSQL contiene ulteriori informazioni sulla configurazione della memoria condivisa."
 
-#: port/pg_shmem.c:153 port/sysv_shmem.c:153
+#: port/pg_shmem.c:207 port/sysv_shmem.c:207
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMALL parameter.  You might need to reconfigure the kernel with larger SHMALL.\n"
@@ -13271,7 +13244,7 @@
 "Questo errore di solito vuol dire che la richiesta di PostgreSQL di un segmento di memoria condivisa eccede il valore del parametro SHMALL del tuo kernel. Potresti dover riconfigurare il kernel con uno SHMALL più grande.\n"
 "La documentazione di PostgreSQL contiene ulteriori informazioni sulla configurazione della memoria condivisa."
 
-#: port/pg_shmem.c:159 port/sysv_shmem.c:159
+#: port/pg_shmem.c:213 port/sysv_shmem.c:213
 #, 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.\n"
@@ -13280,52 +13253,47 @@
 "Questo errore *non* significa che è finito lo spazio su disco. Può succedere se tutti gli ID di memoria condivisa sono stati presi, nel cui caso è necessario aumentare il parametro SHMMNI del tuo kernel, oppure perché il limite globale la memoria condivisa di sistema è stato raggiunto.\n"
 "La documentazione di PostgreSQL contiene ulteriori informazioni sulla configurazione della memoria condivisa."
 
-#: port/pg_shmem.c:340 port/sysv_shmem.c:340
-#, c-format
-msgid "huge TLB pages not supported on this platform"
-msgstr "pagine TLB huge non supportate su questa piattaforma"
-
-#: port/pg_shmem.c:390 port/sysv_shmem.c:390
+#: port/pg_shmem.c:504 port/sysv_shmem.c:504
 #, c-format
 msgid "could not map anonymous shared memory: %m"
 msgstr "mappatura della memoria condivisa anonima fallita: %m"
 
-#: port/pg_shmem.c:392 port/sysv_shmem.c:392
+#: port/pg_shmem.c:506 port/sysv_shmem.c:506
 #, c-format
 msgid "This error usually means that PostgreSQL's request for a shared memory segment exceeded available memory, swap space, or huge pages. To reduce the request size (currently %zu bytes), reduce PostgreSQL's shared memory usage, perhaps by reducing shared_buffers or max_connections."
 msgstr "Questo errore di solito vuol dire che la richiesta di PostgreSQL di un segmento di memoria condivisa supera la memoria disponibile, lo spazio di swap o le pagine huge. Per ridurre la dimensione richiesta (attualmente %zu byte), riduci l'utilizzo di memoria condivisa di PostgreSQL, ad esempio riducendo shared_buffers o max_connections."
 
-#: port/pg_shmem.c:439 port/sysv_shmem.c:439 port/win32_shmem.c:136
+#: port/pg_shmem.c:572 port/sysv_shmem.c:572 port/win32_shmem.c:134
 #, c-format
 msgid "huge pages not supported on this platform"
 msgstr "pagine huge non supportate su questa piattaforma"
 
-#: port/pg_shmem.c:553 port/sysv_shmem.c:553
+#: port/pg_shmem.c:667 port/sysv_shmem.c:667
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "non è stato possibile ottenere informazioni sulla directory dati \"%s\": %m"
 
-#: port/win32/crashdump.c:108
+#: port/win32/crashdump.c:122
 #, c-format
 msgid "could not load dbghelp.dll, cannot write crash dump\n"
 msgstr "caricamento di dbghelp.dll fallito, impossibile salvare il crash dump\n"
 
-#: port/win32/crashdump.c:116
+#: port/win32/crashdump.c:130
 #, c-format
 msgid "could not load required functions in dbghelp.dll, cannot write crash dump\n"
 msgstr "caricamento della funzione richiesta in dbghelp.dll fallito, impossibile salvare il crash dump\n"
 
-#: port/win32/crashdump.c:147
+#: port/win32/crashdump.c:161
 #, c-format
 msgid "could not open crash dump file \"%s\" for writing: error code %lu\n"
 msgstr "apertura del file del crash dump \"%s\" in scrittura fallito: codice errore %lu\n"
 
-#: port/win32/crashdump.c:154
+#: port/win32/crashdump.c:168
 #, c-format
 msgid "wrote crash dump to file \"%s\"\n"
 msgstr "crash dump salvato nel file \"%s\"\n"
 
-#: port/win32/crashdump.c:156
+#: port/win32/crashdump.c:170
 #, c-format
 msgid "could not write crash dump to file \"%s\": error code %lu\n"
 msgstr "scrittura del crash dump nel file \"%s\" fallito: codice errore %lu\n"
@@ -13333,29 +13301,29 @@
 #: port/win32/security.c:43
 #, c-format
 msgid "could not open process token: error code %lu\n"
-msgstr "apertura del token del processo fallita: codice errore %lu\n"
+msgstr "apertura del token di processo fallita: codice di errore %lu\n"
 
 #: port/win32/security.c:63
 #, c-format
 msgid "could not get SID for Administrators group: error code %lu\n"
-msgstr "non è stato possibile ottenere il SID del gruppo Amministratori: codice errore %lu\n"
+msgstr "lettura del SID del gruppo Amministratori fallita: codice di errore %lu\n"
 
 #: port/win32/security.c:72
 #, c-format
 msgid "could not get SID for PowerUsers group: error code %lu\n"
-msgstr "non è stato possibile ottenere il SID del gruppo PowerUsers: codice errore %lu\n"
+msgstr "lettura del SID del gruppo PowerUsers fallita: codice di errore %lu\n"
 
-#: port/win32/signal.c:193
+#: port/win32/signal.c:194
 #, c-format
 msgid "could not create signal listener pipe for PID %d: error code %lu"
 msgstr "creazione della pipe di ascolto dei segnali per il PID %d fallita: codice errore %lu"
 
-#: port/win32/signal.c:273 port/win32/signal.c:305
+#: port/win32/signal.c:274 port/win32/signal.c:306
 #, c-format
 msgid "could not create signal listener pipe: error code %lu; retrying\n"
 msgstr "creazione della pipe di ascolto dei segnali fallita: codice errore %lu; sto riprovando\n"
 
-#: port/win32/signal.c:316
+#: port/win32/signal.c:317
 #, c-format
 msgid "could not create signal dispatch thread: error code %lu\n"
 msgstr "creazione del thread per la distribuzione dei segnali fallita: codice errore %lu\n"
@@ -13380,144 +13348,144 @@
 msgid "could not try-lock semaphore: error code %lu"
 msgstr "try-lock del semaforo fallito: codice errore %lu"
 
-#: port/win32_shmem.c:175 port/win32_shmem.c:210 port/win32_shmem.c:231
+#: port/win32_shmem.c:173 port/win32_shmem.c:208 port/win32_shmem.c:226
 #, c-format
 msgid "could not create shared memory segment: error code %lu"
 msgstr "creazione del segmento di memoria condivisa fallito: codice errore %lu"
 
-#: port/win32_shmem.c:176
+#: port/win32_shmem.c:174
 #, c-format
 msgid "Failed system call was CreateFileMapping(size=%zu, name=%s)."
 msgstr "La funzione di sistema fallita era CreateFileMapping(size=%zu, name=%s)."
 
-#: port/win32_shmem.c:200
+#: port/win32_shmem.c:198
 #, c-format
 msgid "pre-existing shared memory block is still in use"
 msgstr "blocco di memoria condivisa preesistente ancora in uso"
 
-#: port/win32_shmem.c:201
+#: port/win32_shmem.c:199
 #, c-format
 msgid "Check if there are any old server processes still running, and terminate them."
 msgstr "Controlla se ci sono vecchi processi server ancora in esecuzione ed interrompili."
 
-#: port/win32_shmem.c:211
+#: port/win32_shmem.c:209
 #, c-format
 msgid "Failed system call was DuplicateHandle."
 msgstr "La chiamata di sistema fallita era DuplicateHandle."
 
-#: port/win32_shmem.c:232
+#: port/win32_shmem.c:227
 #, c-format
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "La chiamata di sistema fallita era MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:377
+#: postmaster/autovacuum.c:380
 #, c-format
 msgid "could not fork autovacuum launcher process: %m"
 msgstr "fork del processo di esecuzione di autovacuum fallito: %m"
 
-#: postmaster/autovacuum.c:413
+#: postmaster/autovacuum.c:416
 #, c-format
 msgid "autovacuum launcher started"
 msgstr "esecutore di autovacuum avviato"
 
-#: postmaster/autovacuum.c:775
+#: postmaster/autovacuum.c:779
 #, c-format
 msgid "autovacuum launcher shutting down"
 msgstr "arresto dell'esecutore di autovacuum"
 
-#: postmaster/autovacuum.c:1443
+#: postmaster/autovacuum.c:1447
 #, c-format
 msgid "could not fork autovacuum worker process: %m"
 msgstr "fork del processo di lavoro di autovacuum fallito: %m"
 
-#: postmaster/autovacuum.c:1639
+#: postmaster/autovacuum.c:1643
 #, c-format
 msgid "autovacuum: processing database \"%s\""
 msgstr "autovacuum: elaborazione del database \"%s\""
 
-#: postmaster/autovacuum.c:2051
+#: postmaster/autovacuum.c:2058
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
 msgstr "autovacuum: eliminazione della tabella temporanea orfana \"%s\".\"%s\" nel database \"%s\""
 
-#: postmaster/autovacuum.c:2063
+#: postmaster/autovacuum.c:2070
 #, c-format
 msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
 msgstr "autovacuum: trovata tabella temporanea orfana \"%s\".\"%s\" nel database \"%s\""
 
-#: postmaster/autovacuum.c:2346
+#: postmaster/autovacuum.c:2355
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "pulizia automatica della tabella \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2349
+#: postmaster/autovacuum.c:2358
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "analisi automatica della tabella \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2877
+#: postmaster/autovacuum.c:2907
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "autovacuum non avviato a causa di configurazione errata"
 
-#: postmaster/autovacuum.c:2878
+#: postmaster/autovacuum.c:2908
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "Abilita l'opzione \"track_counts\"."
 
-#: postmaster/bgworker.c:345 postmaster/bgworker.c:745
+#: postmaster/bgworker.c:366 postmaster/bgworker.c:770
 #, c-format
 msgid "registering background worker \"%s\""
 msgstr "registrazione del processo di lavoro in background \"%s\""
 
-#: postmaster/bgworker.c:374
+#: postmaster/bgworker.c:395
 #, c-format
 msgid "unregistering background worker \"%s\""
 msgstr "annullamento registrazione del processo di lavoro in background \"%s\""
 
-#: postmaster/bgworker.c:483
+#: postmaster/bgworker.c:504
 #, c-format
 msgid "background worker \"%s\": must attach to shared memory in order to request a database connection"
 msgstr "processo di lavoro in background \"%s\": occorre collegarsi al segmento di memoria per richiedere una connessione al database"
 
-#: postmaster/bgworker.c:492
+#: postmaster/bgworker.c:513
 #, c-format
 msgid "background worker \"%s\": cannot request database access if starting at postmaster start"
 msgstr "processo di lavoro in background \"%s\": non è possibile richiedere accesso al database se avviato all'avvio di postmaster"
 
-#: postmaster/bgworker.c:506
+#: postmaster/bgworker.c:527
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "processo di lavoro in background \"%s\": intervallo di riavvio non valido"
 
-#: postmaster/bgworker.c:551
+#: postmaster/bgworker.c:572
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "interruzione del processo di lavoro in background \"%s\" a causa di comando amministrativo"
 
-#: postmaster/bgworker.c:752
+#: postmaster/bgworker.c:777
 #, c-format
 msgid "background worker \"%s\": must be registered in shared_preload_libraries"
 msgstr "processo di lavoro in background \"%s\": deve essere registrato in shared_preload_libraries"
 
-#: postmaster/bgworker.c:764
+#: postmaster/bgworker.c:789
 #, c-format
 msgid "background worker \"%s\": only dynamic background workers can request notification"
 msgstr "processo di lavoro in background \"%s\": solo i processi dinamici possono richiedere notifiche"
 
-#: postmaster/bgworker.c:779
+#: postmaster/bgworker.c:804
 #, c-format
 msgid "too many background workers"
 msgstr "troppi processi di lavoro in background"
 
-#: postmaster/bgworker.c:780
+#: postmaster/bgworker.c:805
 #, c-format
 msgid "Up to %d background worker can be registered with the current settings."
 msgid_plural "Up to %d background workers can be registered with the current settings."
 msgstr[0] "Le impostazioni correnti consentono la registrazione di un massimo di %d processi di lavoro in background."
 msgstr[1] "Le impostazioni correnti consentono la registrazione di un massimo di %d processi di lavoro in background."
 
-#: postmaster/bgworker.c:784
+#: postmaster/bgworker.c:809
 #, c-format
 msgid "Consider increasing the configuration parameter \"max_worker_processes\"."
 msgstr "Considera di incrementare il parametro di configurazione \"max_worker_processes\"."
@@ -13585,7 +13553,7 @@
 msgid "archive command was terminated by exception 0x%X"
 msgstr "comando di archiviazione terminato da eccezione 0x%X"
 
-#: postmaster/pgarch.c:598 postmaster/postmaster.c:3417
+#: postmaster/pgarch.c:598 postmaster/postmaster.c:3475
 #, c-format
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr "Consulta il file include C \"ntstatus.h\" per una spiegazione del valore esadecimale."
@@ -13615,298 +13583,298 @@
 msgid "could not open archive status directory \"%s\": %m"
 msgstr "apertura della directory dello stato dell'archivio \"%s\" fallita: %m"
 
-#: postmaster/pgstat.c:356
+#: postmaster/pgstat.c:355
 #, c-format
 msgid "could not resolve \"localhost\": %s"
 msgstr "risoluzione di \"localhost\" fallita: %s"
 
-#: postmaster/pgstat.c:379
+#: postmaster/pgstat.c:378
 #, c-format
 msgid "trying another address for the statistics collector"
 msgstr "si sta tentando di usare un diverso indirizzo per il raccoglitore di statistiche"
 
-#: postmaster/pgstat.c:388
+#: postmaster/pgstat.c:387
 #, c-format
 msgid "could not create socket for statistics collector: %m"
 msgstr "creazione del socket per il raccoglitore di statistiche fallita: %m"
 
-#: postmaster/pgstat.c:400
+#: postmaster/pgstat.c:399
 #, c-format
 msgid "could not bind socket for statistics collector: %m"
 msgstr "bind del socket per il raccoglitore di statistiche fallito: %m"
 
-#: postmaster/pgstat.c:411
+#: postmaster/pgstat.c:410
 #, c-format
 msgid "could not get address of socket for statistics collector: %m"
 msgstr "non è stato possibile ottenere l'indirizzo del socket per il raccoglitore di statistiche: %m"
 
-#: postmaster/pgstat.c:427
+#: postmaster/pgstat.c:426
 #, c-format
 msgid "could not connect socket for statistics collector: %m"
 msgstr "connessione al socket per il raccoglitore statistiche fallita: %m"
 
-#: postmaster/pgstat.c:448
+#: postmaster/pgstat.c:447
 #, c-format
 msgid "could not send test message on socket for statistics collector: %m"
 msgstr "invio del messaggio di prova al socket per il raccoglitore di statistiche fallito: %m"
 
-#: postmaster/pgstat.c:474
+#: postmaster/pgstat.c:473
 #, c-format
 msgid "select() failed in statistics collector: %m"
 msgstr "select() fallita nel raccoglitore di statistiche: %m"
 
-#: postmaster/pgstat.c:489
+#: postmaster/pgstat.c:488
 #, c-format
 msgid "test message did not get through on socket for statistics collector"
 msgstr "il messaggio di prova non ha raggiunto il socket per il raccoglitore di statistiche"
 
-#: postmaster/pgstat.c:504
+#: postmaster/pgstat.c:503
 #, c-format
 msgid "could not receive test message on socket for statistics collector: %m"
 msgstr "ricezione del messaggio di prova sul socket per il raccoglitore di statistiche fallito: %m"
 
-#: postmaster/pgstat.c:514
+#: postmaster/pgstat.c:513
 #, c-format
 msgid "incorrect test message transmission on socket for statistics collector"
 msgstr "trasmissione errata del messaggio di prova per il raccoglitore di statistiche"
 
-#: postmaster/pgstat.c:537
+#: postmaster/pgstat.c:536
 #, c-format
 msgid "could not set statistics collector socket to nonblocking mode: %m"
 msgstr "impostazione del socket per il raccoglitore di statistiche in modalità non bloccante fallita: %m"
 
-#: postmaster/pgstat.c:547
+#: postmaster/pgstat.c:546
 #, c-format
 msgid "disabling statistics collector for lack of working socket"
 msgstr "raccoglitore di statistiche disabilitato per mancanza di un socket funzionante"
 
-#: postmaster/pgstat.c:694
+#: postmaster/pgstat.c:693
 #, c-format
 msgid "could not fork statistics collector: %m"
 msgstr "fork del raccoglitore di statistiche fallito: %m"
 
-#: postmaster/pgstat.c:1233 postmaster/pgstat.c:1257 postmaster/pgstat.c:1290
+#: postmaster/pgstat.c:1232 postmaster/pgstat.c:1256 postmaster/pgstat.c:1289
 #, c-format
 msgid "must be superuser to reset statistics counters"
 msgstr "occorre essere un superutente per resettare i contatori delle statistiche"
 
-#: postmaster/pgstat.c:1266
+#: postmaster/pgstat.c:1265
 #, c-format
 msgid "unrecognized reset target: \"%s\""
-msgstr "obiettivo del reset sconosciuto: \"%s\""
+msgstr "destinazione di reset sconosciuta: \"%s\""
 
-#: postmaster/pgstat.c:1267
+#: postmaster/pgstat.c:1266
 #, c-format
 msgid "Target must be \"archiver\" or \"bgwriter\"."
-msgstr "L'obiettivo deve essere \"archiver\" o \"bgwriter\"."
+msgstr "La destinazione deve essere \"archiver\" o \"bgwriter\"."
 
-#: postmaster/pgstat.c:3425
+#: postmaster/pgstat.c:3433
 #, c-format
 msgid "could not read statistics message: %m"
 msgstr "lettura del messaggio delle statistiche fallito: %m"
 
-#: postmaster/pgstat.c:3756 postmaster/pgstat.c:3933
+#: postmaster/pgstat.c:3764 postmaster/pgstat.c:3921
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "apertura del file temporaneo delle statistiche \"%s\" fallita: %m"
 
-#: postmaster/pgstat.c:3824 postmaster/pgstat.c:3978
+#: postmaster/pgstat.c:3831 postmaster/pgstat.c:3966
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "scrittura del file temporaneo delle statistiche \"%s\" fallita: %m"
 
-#: postmaster/pgstat.c:3833 postmaster/pgstat.c:3987
+#: postmaster/pgstat.c:3840 postmaster/pgstat.c:3975
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "chiusura del file temporaneo delle statistiche \"%s\" fallita: %m"
 
-#: postmaster/pgstat.c:3841 postmaster/pgstat.c:3995
+#: postmaster/pgstat.c:3848 postmaster/pgstat.c:3983
 #, c-format
 msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
 msgstr "non è stato possibile rinominare il file temporaneo delle statistiche \"%s\" in \"%s\": %m"
 
-#: postmaster/pgstat.c:4077 postmaster/pgstat.c:4260 postmaster/pgstat.c:4415
+#: postmaster/pgstat.c:4072 postmaster/pgstat.c:4257 postmaster/pgstat.c:4410
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "apertura del file delle statistiche \"%s\" fallita: %m"
 
-#: postmaster/pgstat.c:4089 postmaster/pgstat.c:4099 postmaster/pgstat.c:4109
-#: postmaster/pgstat.c:4130 postmaster/pgstat.c:4145 postmaster/pgstat.c:4201
-#: postmaster/pgstat.c:4272 postmaster/pgstat.c:4292 postmaster/pgstat.c:4310
-#: postmaster/pgstat.c:4326 postmaster/pgstat.c:4344 postmaster/pgstat.c:4360
-#: postmaster/pgstat.c:4427 postmaster/pgstat.c:4439 postmaster/pgstat.c:4451
-#: postmaster/pgstat.c:4476 postmaster/pgstat.c:4498
+#: postmaster/pgstat.c:4084 postmaster/pgstat.c:4094 postmaster/pgstat.c:4104
+#: postmaster/pgstat.c:4125 postmaster/pgstat.c:4140 postmaster/pgstat.c:4194
+#: postmaster/pgstat.c:4269 postmaster/pgstat.c:4289 postmaster/pgstat.c:4307
+#: postmaster/pgstat.c:4323 postmaster/pgstat.c:4341 postmaster/pgstat.c:4357
+#: postmaster/pgstat.c:4422 postmaster/pgstat.c:4434 postmaster/pgstat.c:4446
+#: postmaster/pgstat.c:4471 postmaster/pgstat.c:4493
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "file delle statistiche corrotto \"%s\""
 
-#: postmaster/pgstat.c:4615
+#: postmaster/pgstat.c:4622
 #, c-format
 msgid "using stale statistics instead of current ones because stats collector is not responding"
 msgstr "verranno utilizzate statistiche vecchie invece di quelle correnti perché il processo di raccolta statistiche non risponde"
 
-#: postmaster/pgstat.c:4933
+#: postmaster/pgstat.c:4951
 #, c-format
 msgid "database hash table corrupted during cleanup --- abort"
 msgstr "tabella hash del database corrotta durante la pulizia --- interruzione"
 
-#: postmaster/postmaster.c:673
+#: postmaster/postmaster.c:681
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
 msgstr "%s: argomento non valido per l'opzione -f: \"%s\"\n"
 
-#: postmaster/postmaster.c:759
+#: postmaster/postmaster.c:767
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
 msgstr "%s: argomento non valido per l'opzione -t: \"%s\"\n"
 
-#: postmaster/postmaster.c:810
+#: postmaster/postmaster.c:818
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: argomento non valido: \"%s\"\n"
 
-#: postmaster/postmaster.c:845
+#: postmaster/postmaster.c:857
 #, c-format
 msgid "%s: superuser_reserved_connections must be less than max_connections\n"
 msgstr "%s: superuser_reserved_connections dev'essere minore di max_connections\n"
 
-#: postmaster/postmaster.c:850
+#: postmaster/postmaster.c:862
 #, c-format
 msgid "%s: max_wal_senders must be less than max_connections\n"
 msgstr "%s: max_wal_senders dev'essere minore di max_connections\n"
 
-#: postmaster/postmaster.c:855
+#: postmaster/postmaster.c:867
 #, c-format
 msgid "WAL archival cannot be enabled when wal_level is \"minimal\""
 msgstr "l'archiviazione dei WAL non può essere attivata quando wal_level è \"minimal\""
 
-#: postmaster/postmaster.c:858
+#: postmaster/postmaster.c:870
 #, c-format
 msgid "WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", \"hot_standby\", or \"logical\""
 msgstr "lo streaming WAL (max_wal_senders > 0) richiede wal_level \"archive\", \"hot_standby\" oppure \"logical\""
 
-#: postmaster/postmaster.c:866
+#: postmaster/postmaster.c:878
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s: datetoken tables non valido, per favore correggilo\n"
 
-#: postmaster/postmaster.c:958 postmaster/postmaster.c:1056
-#: utils/init/miscinit.c:1326
+#: postmaster/postmaster.c:970 postmaster/postmaster.c:1068
+#: utils/init/miscinit.c:1410
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "sintassi di lista non valida nel parametro \"%s\""
 
-#: postmaster/postmaster.c:989
+#: postmaster/postmaster.c:1001
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "creazione del socket di ascolto per \"%s\" fallita"
 
-#: postmaster/postmaster.c:995
+#: postmaster/postmaster.c:1007
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "non è stato possibile creare alcun socket TCP/IP"
 
-#: postmaster/postmaster.c:1078
+#: postmaster/postmaster.c:1090
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
 msgstr "creazione del socket di dominio Unix fallita nella directory \"%s\""
 
-#: postmaster/postmaster.c:1084
+#: postmaster/postmaster.c:1096
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "creazione del socket di dominio Unix fallita"
 
-#: postmaster/postmaster.c:1096
+#: postmaster/postmaster.c:1108
 #, c-format
 msgid "no socket created for listening"
 msgstr "nessun socket per l'ascolto è stato creato"
 
-#: postmaster/postmaster.c:1136
+#: postmaster/postmaster.c:1148
 #, c-format
 msgid "could not create I/O completion port for child queue"
 msgstr "creazione della porta di completamento I/O per la coda dei figli fallita"
 
-#: postmaster/postmaster.c:1165
+#: postmaster/postmaster.c:1177
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %s\n"
 msgstr "%s: modifica dei permessi del file PID esterno \"%s\" fallita: %s\n"
 
-#: postmaster/postmaster.c:1169
+#: postmaster/postmaster.c:1181
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %s\n"
 msgstr "%s: scrittura del file PID esterno \"%s\" fallita: %s\n"
 
-#: postmaster/postmaster.c:1199
+#: postmaster/postmaster.c:1232
 #, c-format
 msgid "ending log output to stderr"
 msgstr "terminazione dell'output del log su stderr"
 
-#: postmaster/postmaster.c:1200
+#: postmaster/postmaster.c:1233
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
 msgstr "L'output dei prossimi log andrà su \"%s\"."
 
-#: postmaster/postmaster.c:1226 utils/init/postinit.c:213
+#: postmaster/postmaster.c:1259 utils/init/postinit.c:200
 #, c-format
 msgid "could not load pg_hba.conf"
 msgstr "caricamento di pg_hba.conf fallito"
 
-#: postmaster/postmaster.c:1252
+#: postmaster/postmaster.c:1285
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "il postmaster è diventato multithread durante l'avvio"
 
-#: postmaster/postmaster.c:1253
+#: postmaster/postmaster.c:1286
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "Imposta la variabile d'ambiente LC_ALL non corrisponde ad un locale valido."
 
-#: postmaster/postmaster.c:1350
+#: postmaster/postmaster.c:1383
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: eseguibile postgres corrispondente non trovato"
 
-#: postmaster/postmaster.c:1373 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1406 utils/misc/tzparser.c:341
 #, c-format
 msgid "This may indicate an incomplete PostgreSQL installation, or that the file \"%s\" has been moved away from its proper location."
 msgstr "Questo potrebbe indicare una installazione di PostgreSQL incompleta, o che il file \"%s\" sia stato spostato dalla sua posizione corretta."
 
-#: postmaster/postmaster.c:1401
+#: postmaster/postmaster.c:1434
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "la directory dei dati \"%s\" non esiste"
 
-#: postmaster/postmaster.c:1406
+#: postmaster/postmaster.c:1439
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "lettura dei permessi della directory \"%s\" fallita: %m"
 
-#: postmaster/postmaster.c:1414
+#: postmaster/postmaster.c:1447
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "la directory dei dati specificata \"%s\" non è una directory"
 
-#: postmaster/postmaster.c:1430
+#: postmaster/postmaster.c:1463
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "la directory dei dati \"%s\" ha il proprietario errato"
 
-#: postmaster/postmaster.c:1432
+#: postmaster/postmaster.c:1465
 #, c-format
 msgid "The server must be started by the user that owns the data directory."
 msgstr "Il server deve essere avviato dall'utente che possiede la directory dei dati."
 
-#: postmaster/postmaster.c:1452
+#: postmaster/postmaster.c:1485
 #, c-format
 msgid "data directory \"%s\" has group or world access"
 msgstr "la directory dei dati \"%s\" è accessibile dal gruppo o da tutti"
 
-#: postmaster/postmaster.c:1454
+#: postmaster/postmaster.c:1487
 #, c-format
 msgid "Permissions should be u=rwx (0700)."
 msgstr "I permessi dovrebbero essere u=rwx (0700)."
 
-#: postmaster/postmaster.c:1465
+#: postmaster/postmaster.c:1498
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -13917,359 +13885,365 @@
 "Sarebbe dovuto essere nella directory \"%s\",\n"
 "ma l'apertura del file \"%s\" è fallita: %s\n"
 
-#: postmaster/postmaster.c:1641
+#: postmaster/postmaster.c:1675
 #, c-format
 msgid "select() failed in postmaster: %m"
 msgstr "select() fallita in postmaster: %m"
 
-#: postmaster/postmaster.c:1839 postmaster/postmaster.c:1870
+#: postmaster/postmaster.c:1826
+#, c-format
+msgid "performing immediate shutdown because data directory lock file is invalid"
+msgstr "arresto immediato perché il file di lock della directory dati non è valido"
+
+#: postmaster/postmaster.c:1904 postmaster/postmaster.c:1935
 #, c-format
 msgid "incomplete startup packet"
 msgstr "pacchetto di avvio incompleto"
 
-#: postmaster/postmaster.c:1851
+#: postmaster/postmaster.c:1916
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "dimensione del pacchetto di avvio non valida"
 
-#: postmaster/postmaster.c:1909
+#: postmaster/postmaster.c:1974
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "invio della risposta di negoziazione SSL fallito: %m"
 
-#: postmaster/postmaster.c:1938
+#: postmaster/postmaster.c:2003
 #, c-format
 msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr "protocollo frontend non supportato %u.%u: il server supporta da %u.0 a %u.%u"
 
-#: postmaster/postmaster.c:2001
+#: postmaster/postmaster.c:2066 utils/misc/guc.c:5484 utils/misc/guc.c:5577
+#: utils/misc/guc.c:6874 utils/misc/guc.c:9597 utils/misc/guc.c:9631
 #, c-format
-msgid "invalid value for parameter \"replication\""
-msgstr "valore non valido per il parametro \"replication\""
+msgid "invalid value for parameter \"%s\": \"%s\""
+msgstr "valore non valido per il parametro \"%s\": \"%s\""
 
-#: postmaster/postmaster.c:2002
+#: postmaster/postmaster.c:2069
 #, c-format
-msgid "Valid values are: false, 0, true, 1, database."
-msgstr "I valori validi sono: false, 0, true, 1, database."
+msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
+msgstr "I valori validi sono: \"false\", 0, \"true\", 1, \"database\"."
 
-#: postmaster/postmaster.c:2022
+#: postmaster/postmaster.c:2089
 #, c-format
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr "formato del pacchetto di avvio non valido: atteso il terminatore all'ultimo byte"
 
-#: postmaster/postmaster.c:2050
+#: postmaster/postmaster.c:2117
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "nessun utente PostgreSQL specificato nel pacchetto di avvio"
 
-#: postmaster/postmaster.c:2109
+#: postmaster/postmaster.c:2176
 #, c-format
 msgid "the database system is starting up"
 msgstr "il database si sta avviando"
 
-#: postmaster/postmaster.c:2114
+#: postmaster/postmaster.c:2181
 #, c-format
 msgid "the database system is shutting down"
 msgstr "il database si sta spegnendo"
 
-#: postmaster/postmaster.c:2119
+#: postmaster/postmaster.c:2186
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "il database è in modalità di ripristino"
 
-#: postmaster/postmaster.c:2124 storage/ipc/procarray.c:287
-#: storage/ipc/sinvaladt.c:298 storage/lmgr/proc.c:337
+#: postmaster/postmaster.c:2191 storage/ipc/procarray.c:284
+#: storage/ipc/sinvaladt.c:298 storage/lmgr/proc.c:334
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "spiacente, troppi client già connessi"
 
-#: postmaster/postmaster.c:2186
+#: postmaster/postmaster.c:2253
 #, c-format
 msgid "wrong key in cancel request for process %d"
 msgstr "chiave sbagliata nella richiesta di annullamento per il processo %d"
 
-#: postmaster/postmaster.c:2194
+#: postmaster/postmaster.c:2261
 #, c-format
 msgid "PID %d in cancel request did not match any process"
 msgstr "il PID %d nella richiesta di annullamento non corrisponde ad alcun processo"
 
-#: postmaster/postmaster.c:2414
+#: postmaster/postmaster.c:2481
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "SIGHUP ricevuto, sto ricaricando i file di configurazione"
 
-#: postmaster/postmaster.c:2440
+#: postmaster/postmaster.c:2506
 #, c-format
 msgid "pg_hba.conf not reloaded"
 msgstr "pg_hba.conf non è stato ricaricato"
 
-#: postmaster/postmaster.c:2444
+#: postmaster/postmaster.c:2510
 #, c-format
 msgid "pg_ident.conf not reloaded"
 msgstr "pg_ident.conf non è stato ricaricato"
 
-#: postmaster/postmaster.c:2485
+#: postmaster/postmaster.c:2551
 #, c-format
 msgid "received smart shutdown request"
 msgstr "richiesta di arresto smart ricevuta"
 
-#: postmaster/postmaster.c:2538
+#: postmaster/postmaster.c:2603
 #, c-format
 msgid "received fast shutdown request"
 msgstr "richiesta di arresto fast ricevuta"
 
-#: postmaster/postmaster.c:2564
+#: postmaster/postmaster.c:2629
 #, c-format
 msgid "aborting any active transactions"
 msgstr "interruzione di tutte le transazioni attive"
 
-#: postmaster/postmaster.c:2598
+#: postmaster/postmaster.c:2663
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "richiesta di arresto immediate ricevuta"
 
-#: postmaster/postmaster.c:2659
+#: postmaster/postmaster.c:2724
 #, c-format
 msgid "shutdown at recovery target"
-msgstr "arresto all'obiettivo di recupero"
+msgstr "arresto alla destinazione di recupero"
 
-#: postmaster/postmaster.c:2675 postmaster/postmaster.c:2698
+#: postmaster/postmaster.c:2740 postmaster/postmaster.c:2763
 msgid "startup process"
 msgstr "avvio del processo"
 
-#: postmaster/postmaster.c:2678
+#: postmaster/postmaster.c:2743
 #, c-format
 msgid "aborting startup due to startup process failure"
 msgstr "avvio interrotto a causa del fallimento del processo di avvio"
 
-#: postmaster/postmaster.c:2739
+#: postmaster/postmaster.c:2804
 #, c-format
 msgid "database system is ready to accept connections"
 msgstr "il database è pronto ad accettare connessioni"
 
-#: postmaster/postmaster.c:2754
+#: postmaster/postmaster.c:2819
 msgid "background writer process"
 msgstr "processo di scrittura in background"
 
-#: postmaster/postmaster.c:2808
+#: postmaster/postmaster.c:2873
 msgid "checkpointer process"
 msgstr "processo di creazione checkpoint"
 
-#: postmaster/postmaster.c:2824
+#: postmaster/postmaster.c:2889
 msgid "WAL writer process"
 msgstr "processo di scrittura WAL"
 
-#: postmaster/postmaster.c:2838
+#: postmaster/postmaster.c:2903
 msgid "WAL receiver process"
 msgstr "processo di ricezione WAL"
 
-#: postmaster/postmaster.c:2853
+#: postmaster/postmaster.c:2918
 msgid "autovacuum launcher process"
 msgstr "processo del lanciatore di autovacuum"
 
-#: postmaster/postmaster.c:2868
+#: postmaster/postmaster.c:2933
 msgid "archiver process"
 msgstr "processo di archiviazione"
 
-#: postmaster/postmaster.c:2884
+#: postmaster/postmaster.c:2949
 msgid "statistics collector process"
 msgstr "processo del raccoglitore di statistiche"
 
-#: postmaster/postmaster.c:2898
+#: postmaster/postmaster.c:2963
 msgid "system logger process"
 msgstr "processo del logger di sistema"
 
-#: postmaster/postmaster.c:2960
+#: postmaster/postmaster.c:3025
 msgid "worker process"
 msgstr "processo di lavoro"
 
-#: postmaster/postmaster.c:3047 postmaster/postmaster.c:3067
-#: postmaster/postmaster.c:3074 postmaster/postmaster.c:3092
+#: postmaster/postmaster.c:3108 postmaster/postmaster.c:3128
+#: postmaster/postmaster.c:3135 postmaster/postmaster.c:3153
 msgid "server process"
 msgstr "processo del server"
 
-#: postmaster/postmaster.c:3146
+#: postmaster/postmaster.c:3207
 #, c-format
 msgid "terminating any other active server processes"
 msgstr "interruzione di tutti gli altri processi attivi del server"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3405
+#: postmaster/postmaster.c:3463
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) è uscito con codice di uscita %d"
 
-#: postmaster/postmaster.c:3407 postmaster/postmaster.c:3418
-#: postmaster/postmaster.c:3429 postmaster/postmaster.c:3438
-#: postmaster/postmaster.c:3448
+#: postmaster/postmaster.c:3465 postmaster/postmaster.c:3476
+#: postmaster/postmaster.c:3487 postmaster/postmaster.c:3496
+#: postmaster/postmaster.c:3506
 #, c-format
 msgid "Failed process was running: %s"
 msgstr "Il processo fallito stava eseguendo: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3415
+#: postmaster/postmaster.c:3473
 #, c-format
 msgid "%s (PID %d) was terminated by exception 0x%X"
 msgstr "%s (PID %d) è stato terminato dall'eccezione 0x%X"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3425
+#: postmaster/postmaster.c:3483
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d: %s"
 msgstr "%s (PID %d) è stato terminato dal segnale %d: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3436
+#: postmaster/postmaster.c:3494
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d"
 msgstr "%s (PID %d) è stato terminato dal segnale %d"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3446
+#: postmaster/postmaster.c:3504
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) uscito con stato sconosciuto %d"
 
-#: postmaster/postmaster.c:3634
+#: postmaster/postmaster.c:3691
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "spegnimento anormale del database"
 
-#: postmaster/postmaster.c:3674
+#: postmaster/postmaster.c:3731
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "tutti i processi server sono terminati; re-inizializzazione"
 
-#: postmaster/postmaster.c:3920
+#: postmaster/postmaster.c:3943
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "fork del nuovo processo per la connessione fallito: %m"
 
-#: postmaster/postmaster.c:3962
+#: postmaster/postmaster.c:3985
 msgid "could not fork new process for connection: "
 msgstr "fork del nuovo processo per la connessione fallito: "
 
-#: postmaster/postmaster.c:4068
+#: postmaster/postmaster.c:4099
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "connessione ricevuta: host=%s porta=%s"
 
-#: postmaster/postmaster.c:4073
+#: postmaster/postmaster.c:4104
 #, c-format
 msgid "connection received: host=%s"
 msgstr "connessione ricevuta: host=%s"
 
-#: postmaster/postmaster.c:4362
+#: postmaster/postmaster.c:4387
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "esecuzione del processo del server \"%s\" fallita: %m"
 
-#: postmaster/postmaster.c:4919
+#: postmaster/postmaster.c:4926
 #, c-format
 msgid "database system is ready to accept read only connections"
 msgstr "il database è pronto ad accettare connessioni in sola lettura"
 
-#: postmaster/postmaster.c:5229
+#: postmaster/postmaster.c:5213
 #, c-format
 msgid "could not fork startup process: %m"
 msgstr "fork del processo di avvio fallito: %m"
 
-#: postmaster/postmaster.c:5233
+#: postmaster/postmaster.c:5217
 #, c-format
 msgid "could not fork background writer process: %m"
 msgstr "fork del processo di scrittura in background fallito: %m"
 
-#: postmaster/postmaster.c:5237
+#: postmaster/postmaster.c:5221
 #, c-format
 msgid "could not fork checkpointer process: %m"
 msgstr "fork del processo di creazione dei checkpoint fallito: %m"
 
-#: postmaster/postmaster.c:5241
+#: postmaster/postmaster.c:5225
 #, c-format
 msgid "could not fork WAL writer process: %m"
 msgstr "fork del processo di scrittura dei WAL fallito: %m"
 
-#: postmaster/postmaster.c:5245
+#: postmaster/postmaster.c:5229
 #, c-format
 msgid "could not fork WAL receiver process: %m"
 msgstr "fork del processo di ricezione dei WAL fallito: %m"
 
-#: postmaster/postmaster.c:5249
+#: postmaster/postmaster.c:5233
 #, c-format
 msgid "could not fork process: %m"
 msgstr "fork del processo fallito: %m"
 
-#: postmaster/postmaster.c:5411 postmaster/postmaster.c:5434
+#: postmaster/postmaster.c:5395 postmaster/postmaster.c:5418
 #, c-format
 msgid "database connection requirement not indicated during registration"
 msgstr "requisiti di connessione a database non indicati durante la registrazione"
 
-#: postmaster/postmaster.c:5418 postmaster/postmaster.c:5441
+#: postmaster/postmaster.c:5402 postmaster/postmaster.c:5425
 #, c-format
 msgid "invalid processing mode in background worker"
 msgstr "modalità di processo non valida nel processo di lavoro in background"
 
-#: postmaster/postmaster.c:5493
+#: postmaster/postmaster.c:5497
 #, c-format
 msgid "starting background worker process \"%s\""
 msgstr "avvio del processo di lavoro in background \"%s\""
 
-#: postmaster/postmaster.c:5504
+#: postmaster/postmaster.c:5509
 #, c-format
 msgid "could not fork worker process: %m"
 msgstr "fork del processo di lavoro in background fallito: %m"
 
-#: postmaster/postmaster.c:5892
+#: postmaster/postmaster.c:5909
 #, c-format
 msgid "could not duplicate socket %d for use in backend: error code %d"
 msgstr "duplicazione del socket %d da usare nel backend fallita: codice errore %d"
 
-#: postmaster/postmaster.c:5924
+#: postmaster/postmaster.c:5941
 #, c-format
 msgid "could not create inherited socket: error code %d\n"
 msgstr "creazione del socket ereditato fallita: codice errore %d\n"
 
-#: postmaster/postmaster.c:5953
+#: postmaster/postmaster.c:5970
 #, c-format
 msgid "could not open backend variables file \"%s\": %s\n"
 msgstr "apertura del file delle variabili del backend \"%s\" fallita: %s\n"
 
-#: postmaster/postmaster.c:5960
+#: postmaster/postmaster.c:5977
 #, c-format
 msgid "could not read from backend variables file \"%s\": %s\n"
 msgstr "lettura dal file delle variabili del backend \"%s\" fallita: %s\n"
 
-#: postmaster/postmaster.c:5969
+#: postmaster/postmaster.c:5986
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "rimozione del file \"%s\" fallita: %s\n"
 
-#: postmaster/postmaster.c:5986
+#: postmaster/postmaster.c:6003
 #, c-format
 msgid "could not map view of backend variables: error code %lu\n"
 msgstr "non è stato possibile mappare la vista delle variabili del backend: codice errore %lu\n"
 
-#: postmaster/postmaster.c:5995
+#: postmaster/postmaster.c:6012
 #, c-format
 msgid "could not unmap view of backend variables: error code %lu\n"
 msgstr "non è stato possibile rimuovere la mappa della vista delle variabili del backend: codice errore %lu\n"
 
-#: postmaster/postmaster.c:6002
+#: postmaster/postmaster.c:6019
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %lu\n"
 msgstr "chiusura dell'handle dei parametri variabili del backend fallita: codice errore %lu\n"
 
-#: postmaster/postmaster.c:6161
+#: postmaster/postmaster.c:6178
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "lettura del codice di uscita del processo fallita\n"
 
-#: postmaster/postmaster.c:6166
+#: postmaster/postmaster.c:6183
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "invio dello stato di completamento del figlio fallito\n"
@@ -14334,69 +14308,64 @@
 msgid "could not determine which collation to use for regular expression"
 msgstr "non è stato possibile determinare quale ordinamento usare per le espressioni regolari"
 
-#: replication/basebackup.c:227
+#: replication/basebackup.c:229
 #, c-format
 msgid "could not stat control file \"%s\": %m"
 msgstr "non è stato possibile ottenere informazioni sul file di controllo \"%s\": %m"
 
-#: replication/basebackup.c:336
+#: replication/basebackup.c:338
 #, c-format
 msgid "could not find any WAL files"
 msgstr "nessun file WAL trovato"
 
-#: replication/basebackup.c:349 replication/basebackup.c:363
-#: replication/basebackup.c:372
+#: replication/basebackup.c:351 replication/basebackup.c:365
+#: replication/basebackup.c:374
 #, c-format
 msgid "could not find WAL file \"%s\""
 msgstr "file WAL \"%s\" non trovato"
 
-#: replication/basebackup.c:411 replication/basebackup.c:437
+#: replication/basebackup.c:413 replication/basebackup.c:439
 #, c-format
 msgid "unexpected WAL file size \"%s\""
 msgstr "dimensione inaspettata del file WAL \"%s\""
 
-#: replication/basebackup.c:423 replication/basebackup.c:1177
+#: replication/basebackup.c:425 replication/basebackup.c:1157
 #, c-format
 msgid "base backup could not send data, aborting backup"
 msgstr "invio dati da parte del backup di base fallito, backup interrotto"
 
-#: replication/basebackup.c:525 replication/basebackup.c:534
-#: replication/basebackup.c:543 replication/basebackup.c:552
-#: replication/basebackup.c:561 replication/basebackup.c:572
-#: replication/basebackup.c:589
+#: replication/basebackup.c:527 replication/basebackup.c:536
+#: replication/basebackup.c:545 replication/basebackup.c:554
+#: replication/basebackup.c:563 replication/basebackup.c:574
+#: replication/basebackup.c:591
 #, c-format
 msgid "duplicate option \"%s\""
 msgstr "opzione duplicata \"%s\""
 
-#: replication/basebackup.c:578 utils/misc/guc.c:5492
+#: replication/basebackup.c:580 utils/misc/guc.c:5494
 #, c-format
 msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
 msgstr "%d non è compreso nell'intervallo di validità del il parametro \"%s\" (%d .. %d)"
 
-#: replication/basebackup.c:844 replication/basebackup.c:946
+#: replication/basebackup.c:854 replication/basebackup.c:956
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "non è stato possibile ottenere informazioni sul file o directory \"%s\": %m"
 
-#: replication/basebackup.c:1113
+#: replication/basebackup.c:1109
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "file speciale \"%s\" saltato"
 
-#: replication/basebackup.c:1167
-#, c-format
-msgid "archive member \"%s\" too large for tar format"
-msgstr "il membro \"%s\" dell'archivio è troppo grande per il formato tar"
-
-#: replication/basebackup.c:1240
+#: replication/basebackup.c:1220
 #, c-format
 msgid "file name too long for tar format: \"%s\""
 msgstr "nome del file troppo lungo per il formato tar: \"%s\""
 
-#: replication/basebackup.c:1245
+#: replication/basebackup.c:1225
 #, c-format
 msgid "symbolic link target too long for tar format: file name \"%s\", target \"%s\""
-msgstr "obiettivo del link simbolico troppo lungo per il formato tar: nome del file \"%s\", obiettivo \"%s\""
+msgstr "destinazione del link simbolico troppo lunga per il formato tar: nome del file \"%s\", destinazione \"%s\""
 
 #: replication/libpqwalreceiver/libpqwalreceiver.c:116
 #, c-format
@@ -14496,42 +14465,42 @@
 msgid "logical decoding cannot be used while in recovery"
 msgstr "la decodifica logica non può essere usata in modalità di recupero"
 
-#: replication/logical/logical.c:234 replication/logical/logical.c:338
+#: replication/logical/logical.c:237 replication/logical/logical.c:395
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr "non si possono usare slot di replica fisica per la decodifica logica"
 
-#: replication/logical/logical.c:239 replication/logical/logical.c:343
+#: replication/logical/logical.c:242 replication/logical/logical.c:400
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "lo slot di replica \"%s\" non è stato creato in questo database"
 
-#: replication/logical/logical.c:246
+#: replication/logical/logical.c:249
 #, c-format
 msgid "cannot create logical replication slot in transaction that has performed writes"
 msgstr "non si possono creare slot di replica logica in transazioni che hanno effettuato scritture"
 
-#: replication/logical/logical.c:380
+#: replication/logical/logical.c:437
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "avvio della decodifica logica per lo slot \"%s\""
 
-#: replication/logical/logical.c:382
+#: replication/logical/logical.c:439
 #, c-format
 msgid "streaming transactions committing after %X/%X, reading WAL from %X/%X"
 msgstr "commit dello streaming delle transazioni dopo %X/%X, lettura del wal a partire da %X/%X"
 
-#: replication/logical/logical.c:517
+#: replication/logical/logical.c:574
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback, associated LSN %X/%X"
 msgstr "slot \"%s\", plugin di output \"%s\", nel callback %s, LSN associato %X/%X"
 
-#: replication/logical/logical.c:524
+#: replication/logical/logical.c:581
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr "slot \"%s\", plugin di output \"%s\", nel callback %s"
 
-#: replication/logical/logicalfuncs.c:192 replication/walsender.c:2109
+#: replication/logical/logicalfuncs.c:192 replication/walsender.c:2128
 #, c-format
 msgid "could not read from log segment %s, offset %u, length %lu: %m"
 msgstr "lettura del segmento di log %s, posizione %u, lunghezza %lu fallita: %m"
@@ -14541,26 +14510,36 @@
 msgid "must be superuser or replication role to use replication slots"
 msgstr "solo un superutente o il ruolo di replica può usare uno slot di replica"
 
-#: replication/logical/logicalfuncs.c:341
+#: replication/logical/logicalfuncs.c:301
+#, c-format
+msgid "slot name must not be null"
+msgstr "il nome dello slot non può essere nullo"
+
+#: replication/logical/logicalfuncs.c:317
+#, c-format
+msgid "options array must not be null"
+msgstr "l'array di opzioni non può essere nullo"
+
+#: replication/logical/logicalfuncs.c:348
 #, c-format
 msgid "array must be one-dimensional"
 msgstr "l'array deve essere monodimensionale"
 
-#: replication/logical/logicalfuncs.c:347
+#: replication/logical/logicalfuncs.c:354
 #, c-format
 msgid "array must not contain nulls"
 msgstr "l'array non deve contenere NULL"
 
-#: replication/logical/logicalfuncs.c:363 utils/adt/json.c:2250
-#: utils/adt/jsonb.c:1369
+#: replication/logical/logicalfuncs.c:370 utils/adt/json.c:2277
+#: utils/adt/jsonb.c:1356
 #, c-format
 msgid "array must have even number of elements"
 msgstr "l'array deve avere un numero pari di elementi"
 
-#: replication/logical/logicalfuncs.c:406
+#: replication/logical/logicalfuncs.c:412
 #, c-format
-msgid "logical decoding output plugin \"%s\" produces binary output, but \"%s\" expects textual data"
-msgstr "il plugin di output di decodifica logica \"%s\" produce dati binari, ma \"%s\" si aspetta dati testuali"
+msgid "logical decoding output plugin \"%s\" produces binary output, but function \"%s\" expects textual data"
+msgstr "il plugin di output di decodifica logica \"%s\" produce dati binari, ma la funzione \"%s\" si aspetta dati testuali"
 
 #: replication/logical/origin.c:181
 #, c-format
@@ -14579,265 +14558,268 @@
 
 #: replication/logical/origin.c:316
 #, c-format
-msgid "no free replication origin oid could be found"
-msgstr "non è stato trovato alcun oid di origine di replica libero"
+msgid "could not find free replication origin OID"
+msgstr "non è stato trovato alcun OID di origine di replica libero"
 
 #: replication/logical/origin.c:353
 #, c-format
-msgid "cannot drop replication origin with oid %d, in use by pid %d"
-msgstr "impossibile eliminare l'origine di replica con oid %d, in uso dal pid %d"
+msgid "could not drop replication origin with OID %d, in use by PID %d"
+msgstr "impossibile eliminare l'origine di replica con OID %d, in uso dal pid %d"
 
-#: replication/logical/origin.c:690
+#: replication/logical/origin.c:674
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr "il checkpoint di replica ha numero magico sbagliato %u invece di %u"
 
-#: replication/logical/origin.c:722
+#: replication/logical/origin.c:706
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
 msgstr "lettura del file \"%s\" fallita: letti %d di %zu"
 
-#: replication/logical/origin.c:731
+#: replication/logical/origin.c:715
 #, c-format
-msgid "no free replication state could be found, increase max_replication_slots"
+msgid "could not find free replication state, increase max_replication_slots"
 msgstr "nessuno stato di replica libero trovato, incrementa \"max_replication_slots\""
 
-#: replication/logical/origin.c:749
+#: replication/logical/origin.c:733
 #, c-format
-msgid "replication_slot_checkpoint has wrong checksum %u, expected %u"
-msgstr "replication_slot_checkpoint ha il checksum sbagliato %u, atteso %u"
+msgid "replication slot checkpoint has wrong checksum %u, expected %u"
+msgstr "il checkpoint dello slot di replica ha il checksum sbagliato %u, atteso %u"
 
-#: replication/logical/origin.c:873
+#: replication/logical/origin.c:857
 #, c-format
-msgid "replication origin with oid %d is already active for pid %d"
-msgstr "l'origine di replica con oid %d è già attiva per il pid %d"
+msgid "replication origin with OID %d is already active for PID %d"
+msgstr "l'origine di replica con OID %d è già attiva per il PID %d"
 
-#: replication/logical/origin.c:884 replication/logical/origin.c:1064
+#: replication/logical/origin.c:868 replication/logical/origin.c:1048
 #, c-format
-msgid "no free replication state slot could be found for replication origin with oid %u"
-msgstr "nessuno slot di stato di replica trovato per l'origine di replica con oid %u"
+msgid "could not find free replication state slot for replication origin with OID %u"
+msgstr "nessuno slot di stato di replica trovato per l'origine di replica con OID %u"
 
-#: replication/logical/origin.c:886 replication/logical/origin.c:1066
-#: replication/slot.c:1312
+#: replication/logical/origin.c:870 replication/logical/origin.c:1050
+#: replication/slot.c:1268
 #, c-format
 msgid "Increase max_replication_slots and try again."
 msgstr "Incrementa max_replication_slots e prova di nuovo."
 
-#: replication/logical/origin.c:1023
+#: replication/logical/origin.c:1007
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "non è possibile impostare l'origine di replica quando una è già impostata"
 
-#: replication/logical/origin.c:1052
+#: replication/logical/origin.c:1036
 #, c-format
-msgid "replication identiefer %d is already active for pid %d"
-msgstr "l'identificatore di replica %d è già attivo per il pid %d"
+msgid "replication identifier %d is already active for PID %d"
+msgstr "l'identificativo di replica %d è già attivo per il PID %d"
 
-#: replication/logical/origin.c:1098 replication/logical/origin.c:1293
-#: replication/logical/origin.c:1313
+#: replication/logical/origin.c:1082 replication/logical/origin.c:1277
+#: replication/logical/origin.c:1297
 #, c-format
 msgid "no replication origin is configured"
 msgstr "nessuna origine di replica configurata"
 
-#: replication/logical/reorderbuffer.c:2170
+#: replication/logical/reorderbuffer.c:2219
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "scrittura nel file di dati per lo XID %u non riuscita: %m"
 
-#: replication/logical/reorderbuffer.c:2266
-#: replication/logical/reorderbuffer.c:2286
+#: replication/logical/reorderbuffer.c:2315
+#: replication/logical/reorderbuffer.c:2335
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "lettura dal file spill reorderbuffer non riuscita: %m"
 
-#: replication/logical/reorderbuffer.c:2270
-#: replication/logical/reorderbuffer.c:2290
+#: replication/logical/reorderbuffer.c:2319
+#: replication/logical/reorderbuffer.c:2339
 #, c-format
 msgid "could not read from reorderbuffer spill file: read %d instead of %u bytes"
 msgstr "lettura dal file spill reorderbuffer non riuscita: letti %d byte invece di %u"
 
-#: replication/logical/reorderbuffer.c:2894
+#: replication/logical/reorderbuffer.c:2971
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr "lettura dal file \"%s\" non riuscita: letti %d byte invece di %d"
 
-#: replication/logical/snapbuild.c:600
+#: replication/logical/snapbuild.c:648
 #, c-format
 msgid "exported logical decoding snapshot: \"%s\" with %u transaction ID"
 msgid_plural "exported logical decoding snapshot: \"%s\" with %u transaction IDs"
 msgstr[0] "snapshot di decidifica logica esportati: \"%s\" con %u ID di transazione"
 msgstr[1] "snapshot di decidifica logica esportati: \"%s\" con %u ID di transazione"
 
-#: replication/logical/snapbuild.c:904 replication/logical/snapbuild.c:1269
-#: replication/logical/snapbuild.c:1800
+#: replication/logical/snapbuild.c:1226 replication/logical/snapbuild.c:1316
+#: replication/logical/snapbuild.c:1791
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "la decodifica logica ha trovato un punto consistente a %X/%X"
 
-#: replication/logical/snapbuild.c:906
-#, c-format
-msgid "Transaction ID %u finished; no more running transactions."
-msgstr "ID di transazione %u terminato; non ci sono altre transazioni."
-
-#: replication/logical/snapbuild.c:1271
+#: replication/logical/snapbuild.c:1228
 #, c-format
 msgid "There are no running transactions."
 msgstr "Non ci sono transazioni in corso."
 
-#: replication/logical/snapbuild.c:1333
+#: replication/logical/snapbuild.c:1269
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr "la decodifica logica ha trovato un punto di avvio iniziale a %X/%X"
 
-#: replication/logical/snapbuild.c:1335
+#: replication/logical/snapbuild.c:1271 replication/logical/snapbuild.c:1294
+#, c-format
+msgid "Waiting for transactions (approximately %d) older than %u to end."
+msgstr "In attesa che alcune transazioni (circa %d) più vecchie di %u finiscano."
+
+#: replication/logical/snapbuild.c:1292
+#, c-format
+msgid "logical decoding found initial consistent point at %X/%X"
+msgstr "la decodifica logica ha trovato il punto iniziale consistente a %X/%X"
+
+#: replication/logical/snapbuild.c:1318
 #, c-format
-msgid "%u transaction needs to finish."
-msgid_plural "%u transactions need to finish."
-msgstr[0] "%u transazione deve terminare."
-msgstr[1] "%u transazioni devono terminare."
+msgid "There are no old transactions anymore."
+msgstr "Non ci sono più vecchie transazioni."
 
-#: replication/logical/snapbuild.c:1674 replication/logical/snapbuild.c:1700
-#: replication/logical/snapbuild.c:1714 replication/logical/snapbuild.c:1728
+#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:1696
+#: replication/logical/snapbuild.c:1711 replication/logical/snapbuild.c:1725
 #, c-format
 msgid "could not read file \"%s\", read %d of %d: %m"
 msgstr "lettura del file \"%s\" non riuscita, letti %d su %d: %m"
 
-#: replication/logical/snapbuild.c:1680
+#: replication/logical/snapbuild.c:1676
 #, c-format
-msgid "snapbuild state file \"%s\" has wrong magic %u instead of %u"
-msgstr "il file di stato snapbuild \"%s\" ha il numero magico sbagliato %u invece di %u"
+msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
+msgstr "il file di stato snapbuild \"%s\" ha il numero magico sbagliato: %u invece di %u"
 
-#: replication/logical/snapbuild.c:1685
+#: replication/logical/snapbuild.c:1681
 #, c-format
-msgid "snapbuild state file \"%s\" has unsupported version %u instead of %u"
-msgstr "il file di stato snapbuild \"%s\" ha la versione non supportata %u invece di %u"
+msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
+msgstr "il file di stato snapbuild \"%s\" ha una versione non supportata: %u invece di %u"
 
-#: replication/logical/snapbuild.c:1741
+#: replication/logical/snapbuild.c:1738
 #, c-format
-msgid "snapbuild state file %s: checksum mismatch, is %u, should be %u"
-msgstr "file di stato snapbuild %s: il checksum %u non combacia, sarebbe dovuto essere %u"
+msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
+msgstr "il checksum del file di stato snapbuild \"%s\" non combacia: è %u, sarebbe dovuto essere %u"
 
-#: replication/logical/snapbuild.c:1802
+#: replication/logical/snapbuild.c:1793
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "La decodifica logica inizierà usando uno snapshot salvato."
 
-#: replication/logical/snapbuild.c:1875
+#: replication/logical/snapbuild.c:1864
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "interpretazione del nome di file \"%s\" fallita"
 
-#: replication/slot.c:175
+#: replication/slot.c:174
 #, c-format
 msgid "replication slot name \"%s\" is too short"
 msgstr "il nome dello slot di replica \"%s\" è troppo corto"
 
-#: replication/slot.c:184
+#: replication/slot.c:183
 #, c-format
 msgid "replication slot name \"%s\" is too long"
 msgstr "il nome dello slot di replica \"%s\" è troppo lungo"
 
-#: replication/slot.c:197
+#: replication/slot.c:196
 #, c-format
 msgid "replication slot name \"%s\" contains invalid character"
 msgstr "il nome dello slot di replica \"%s\" contiene caratteri non validi"
 
-#: replication/slot.c:199
+#: replication/slot.c:198
 #, c-format
-msgid "Replication slot names may only contain letters, numbers, and the underscore character."
-msgstr "I nomi degli slot di replica possono contenere solo lettere, numeri e il carattere underscore."
+msgid "Replication slot names may only contain lower case letters, numbers, and the underscore character."
+msgstr "I nomi degli slot di replica possono contenere solo lettere minuscole, numeri e il carattere underscore."
 
-#: replication/slot.c:246
+#: replication/slot.c:245
 #, c-format
 msgid "replication slot \"%s\" already exists"
 msgstr "lo slot di replica \"%s\" esiste già"
 
-#: replication/slot.c:256
+#: replication/slot.c:255
 #, c-format
 msgid "all replication slots are in use"
 msgstr "tutti gli slot di replica sono in uso"
 
-#: replication/slot.c:257
+#: replication/slot.c:256
 #, c-format
 msgid "Free one or increase max_replication_slots."
 msgstr "Liberane uno o incrementa max_replication_slots."
 
-#: replication/slot.c:349
+#: replication/slot.c:358
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "lo slot di replica \"%s\" non esiste"
 
-#: replication/slot.c:353
+#: replication/slot.c:362
 #, c-format
-msgid "replication slot \"%s\" is already active for pid %d"
-msgstr "lo slot di replica \"%s\" è già attivo per il pid %d"
+msgid "replication slot \"%s\" is already active for PID %d"
+msgstr "lo slot di replica \"%s\" è già attivo per il PID %d"
 
-#: replication/slot.c:502 replication/slot.c:928 replication/slot.c:1273
+#: replication/slot.c:527 replication/slot.c:884 replication/slot.c:1229
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "eliminazione della directory \"%s\" fallita"
 
-#: replication/slot.c:777
+#: replication/slot.c:803
 #, c-format
 msgid "replication slots can only be used if max_replication_slots > 0"
 msgstr "gli slot di replica possono essere usati solo se max_replication_slots > 0"
 
-#: replication/slot.c:782
+#: replication/slot.c:808
 #, c-format
 msgid "replication slots can only be used if wal_level >= archive"
 msgstr "gli slot di replica possono essere usati solo se wal_level >= archive"
 
-#: replication/slot.c:1205 replication/slot.c:1243
+#: replication/slot.c:1161 replication/slot.c:1199
 #, c-format
 msgid "could not read file \"%s\", read %d of %u: %m"
 msgstr "lettura del file \"%s\" fallita, letti %d su %u: %m"
 
-#: replication/slot.c:1214
+#: replication/slot.c:1170
 #, c-format
-msgid "replication slot file \"%s\" has wrong magic %u instead of %u"
-msgstr "il file dello slot di replica \"%s\" ha il numero magico sbagliato %u invece di %u"
+msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
+msgstr "il file dello slot di replica \"%s\" ha il numero magico sbagliato: %u invece di %u"
 
-#: replication/slot.c:1221
+#: replication/slot.c:1177
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "il file dello slot di replica \"%s\" ha la versione non supportata %u"
 
-#: replication/slot.c:1228
+#: replication/slot.c:1184
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "il file dello slot di replica \"%s\" ha la lunghezza corrotta %u"
 
-#: replication/slot.c:1258
+#: replication/slot.c:1214
 #, c-format
-msgid "replication slot file %s: checksum mismatch, is %u, should be %u"
-msgstr "file dello slot di replica %s: il checksum %u non combacia, sarebbe dovuto essere %u"
+msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
+msgstr "il checksum del file dello slot di replica \"%s\" non combacia: è %u, sarebbe dovuto essere %u"
 
-#: replication/slot.c:1311
+#: replication/slot.c:1267
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "troppi slot di replica attivi prima dell'arresto"
 
-#: replication/syncrep.c:199
+#: replication/syncrep.c:191
 #, c-format
 msgid "canceling the wait for synchronous replication and terminating connection due to administrator command"
 msgstr "annullamento dell'attesa di replica sincrona ed interruzione della connessione su comando dell'amministratore"
 
-#: replication/syncrep.c:200 replication/syncrep.c:217
+#: replication/syncrep.c:192 replication/syncrep.c:209
 #, c-format
 msgid "The transaction has already committed locally, but might not have been replicated to the standby."
 msgstr "La transazione ha già effettuato il commit localmente, ma potrebbe non essere stata replicata agli standby."
 
-#: replication/syncrep.c:216
+#: replication/syncrep.c:208
 #, c-format
 msgid "canceling wait for synchronous replication due to user request"
 msgstr "annullamento dell'attesa di replica sincrona su richiesta utente"
 
-#: replication/syncrep.c:346
+#: replication/syncrep.c:338
 #, c-format
 msgid "standby \"%s\" now has synchronous standby priority %u"
 msgstr "lo standby \"%s\" ha ora priorità di standby sincrono %u"
 
-#: replication/syncrep.c:480
+#: replication/syncrep.c:472
 #, c-format
 msgid "standby \"%s\" is now the synchronous standby with priority %u"
 msgstr "lo standby \"%s\" è ora in standby sincrono con priorità %u"
@@ -14902,77 +14884,77 @@
 msgid "could not write to log segment %s at offset %u, length %lu: %m"
 msgstr "scrittura nel segmento di log %s in posizione %u, lunghezza %lu fallita: %m"
 
-#: replication/walsender.c:469
+#: replication/walsender.c:483
 #, c-format
 msgid "could not seek to beginning of file \"%s\": %m"
 msgstr "spostamento all'inizio del file \"%s\" fallito: %m"
 
-#: replication/walsender.c:520
+#: replication/walsender.c:534
 #, c-format
 msgid "cannot use a logical replication slot for physical replication"
 msgstr "non si può usare una slot di replica logico per la replica fisica"
 
-#: replication/walsender.c:583
+#: replication/walsender.c:597
 #, c-format
 msgid "requested starting point %X/%X on timeline %u is not in this server's history"
 msgstr "il punto di avvio richiesto %X/%X sulla timeline %u non è nella storia di questo server"
 
-#: replication/walsender.c:587
+#: replication/walsender.c:601
 #, c-format
 msgid "This server's history forked from timeline %u at %X/%X."
 msgstr "La storia di questo server si è separata dalla timeline %u a %X/%X."
 
-#: replication/walsender.c:632
+#: replication/walsender.c:646
 #, c-format
 msgid "requested starting point %X/%X is ahead of the WAL flush position of this server %X/%X"
 msgstr "il punto di avvio richiesto %X/%X è più avanti della posizione di flush del WAL %X/%X di questo server"
 
-#: replication/walsender.c:948
+#: replication/walsender.c:964
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "interruzione del processo walsender dopo la promozione"
 
-#: replication/walsender.c:1275
+#: replication/walsender.c:1291
 #, c-format
 msgid "received replication command: %s"
 msgstr "ricevuto comando di replica: %s"
 
-#: replication/walsender.c:1368 replication/walsender.c:1384
+#: replication/walsender.c:1392 replication/walsender.c:1408
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "fine del file inaspettato sulla connessione di standby"
 
-#: replication/walsender.c:1398
+#: replication/walsender.c:1422
 #, c-format
 msgid "unexpected standby message type \"%c\", after receiving CopyDone"
 msgstr "tipo di messaggio di standby \"%c\" imprevisto, dopo la ricezione di CopyDone"
 
-#: replication/walsender.c:1436
+#: replication/walsender.c:1460
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "tipo di messaggio \"%c\" di standby non valido"
 
-#: replication/walsender.c:1477
+#: replication/walsender.c:1501
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "tipo di messaggio \"%c\" inatteso"
 
-#: replication/walsender.c:1764
+#: replication/walsender.c:1788
 #, c-format
 msgid "terminating walsender process due to replication timeout"
 msgstr "interruzione del processo walsender a causa di timeout di replica"
 
-#: replication/walsender.c:1857
+#: replication/walsender.c:1873
 #, c-format
 msgid "standby \"%s\" has now caught up with primary"
 msgstr "lo standby \"%s\" ha ora raggiunto il primario"
 
-#: replication/walsender.c:1958
+#: replication/walsender.c:1977
 #, c-format
 msgid "number of requested standby connections exceeds max_wal_senders (currently %d)"
 msgstr "il numero di richieste di connessioni di standby supera max_wal_senders (attualmente %d)"
 
-#: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:961
+#: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:973
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" already exists"
 msgstr "la regola \"%s\" per la relazione \"%s\" esiste già"
@@ -15070,7 +15052,7 @@
 #: rewrite/rewriteDefine.c:465
 #, c-format
 msgid "could not convert table \"%s\" to a view because it has row security policies"
-msgstr "conversione della tabella \"%s\" in vista fallita perché ha politiche di sicurezza delle righe"
+msgstr "conversione della tabella \"%s\" in vista fallita perché ha regole di sicurezza per riga"
 
 #: rewrite/rewriteDefine.c:492
 #, c-format
@@ -15097,68 +15079,73 @@
 msgid "RETURNING list has too many entries"
 msgstr "la lista RETURNING ha troppi elementi"
 
-#: rewrite/rewriteDefine.c:684
+#: rewrite/rewriteDefine.c:695
 #, c-format
 msgid "cannot convert relation containing dropped columns to view"
 msgstr "non è possibile convertire una relazione contenente colonne eliminate in una vista"
 
-#: rewrite/rewriteDefine.c:690
+#: rewrite/rewriteDefine.c:696
+#, c-format
+msgid "cannot create a RETURNING list for a relation containing dropped columns"
+msgstr "non è possibile creare una lista RETURNING per una relazione che contiene colonne eliminate"
+
+#: rewrite/rewriteDefine.c:702
 #, c-format
 msgid "SELECT rule's target entry %d has different column name from column \"%s\""
 msgstr "elemento di destinazione %d della regola SELECT ha nome di colonna diverso dalla colonna \"%s\""
 
-#: rewrite/rewriteDefine.c:692
+#: rewrite/rewriteDefine.c:704
 #, c-format
 msgid "SELECT target entry is named \"%s\"."
 msgstr "L'elemento di destinazione di SELECT si chiama \"%s\"."
 
-#: rewrite/rewriteDefine.c:701
+#: rewrite/rewriteDefine.c:713
 #, c-format
 msgid "SELECT rule's target entry %d has different type from column \"%s\""
 msgstr "l'elemento %d di destinazione della regola SELECT è di tipo diverso dalla colonna \"%s\""
 
-#: rewrite/rewriteDefine.c:703
+#: rewrite/rewriteDefine.c:715
 #, c-format
 msgid "RETURNING list's entry %d has different type from column \"%s\""
 msgstr "l'elemento %d della lista RETURNING è di tipo diverso dalla colonna \"%s\""
 
-#: rewrite/rewriteDefine.c:706 rewrite/rewriteDefine.c:730
+#: rewrite/rewriteDefine.c:718 rewrite/rewriteDefine.c:742
 #, c-format
 msgid "SELECT target entry has type %s, but column has type %s."
 msgstr "L'elemento di destinazione di SELECT è di tipo %s, ma la colonna è di tipo %s."
 
-#: rewrite/rewriteDefine.c:709 rewrite/rewriteDefine.c:734
+#: rewrite/rewriteDefine.c:721 rewrite/rewriteDefine.c:746
 #, c-format
 msgid "RETURNING list entry has type %s, but column has type %s."
 msgstr "la lista di elementi di RETURNING è di tipo %s, ma la colonna è di tipo %s."
 
-#: rewrite/rewriteDefine.c:725
+#: rewrite/rewriteDefine.c:737
 #, c-format
 msgid "SELECT rule's target entry %d has different size from column \"%s\""
 msgstr "l'elemento %d di destinazione della regola SELECT ha dimensione diversa dalla colonna \"%s\""
 
-#: rewrite/rewriteDefine.c:727
+#: rewrite/rewriteDefine.c:739
 #, c-format
 msgid "RETURNING list's entry %d has different size from column \"%s\""
 msgstr "l'elemento %d della lista RETURNING ha dimensione diversa dalla colonna \"%s\""
 
-#: rewrite/rewriteDefine.c:744
+#: rewrite/rewriteDefine.c:756
 #, c-format
 msgid "SELECT rule's target list has too few entries"
 msgstr "la lista di destinazione della regola SELECT ha troppi pochi elementi"
 
-#: rewrite/rewriteDefine.c:745
+#: rewrite/rewriteDefine.c:757
 #, c-format
 msgid "RETURNING list has too few entries"
 msgstr "la lista RETURNING ha troppi pochi elementi"
 
-#: rewrite/rewriteDefine.c:837 rewrite/rewriteDefine.c:952
+#: rewrite/rewriteDefine.c:849 rewrite/rewriteDefine.c:964
 #: rewrite/rewriteSupport.c:112
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" does not exist"
 msgstr "la regola \"%s\" per la relazione \"%s\" non esiste"
 
-#: rewrite/rewriteDefine.c:971
+#: rewrite/rewriteDefine.c:983
 #, c-format
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "non è consentire rinominare una regola ON SELECT"
@@ -15178,162 +15165,162 @@
 msgid "multiple assignments to same column \"%s\""
 msgstr "più di un assegnamento alla stessa colonna \"%s\""
 
-#: rewrite/rewriteHandler.c:1714 rewrite/rewriteHandler.c:3272
+#: rewrite/rewriteHandler.c:1714 rewrite/rewriteHandler.c:3324
 #, c-format
 msgid "infinite recursion detected in rules for relation \"%s\""
 msgstr "ricorsione infinita individuata nelle regole per la relazione \"%s\""
 
-#: rewrite/rewriteHandler.c:1797
+#: rewrite/rewriteHandler.c:1799
 #, c-format
 msgid "infinite recursion detected in policy for relation \"%s\""
-msgstr "ricorsione infinita individuata nella politica per la relazione \"%s\""
+msgstr "ricorsione infinita individuata nella regola di sicurezza per la relazione \"%s\""
 
-#: rewrite/rewriteHandler.c:2094
+#: rewrite/rewriteHandler.c:2116
 msgid "Junk view columns are not updatable."
 msgstr "Le colonne junk di una vista non sono aggiornabili."
 
-#: rewrite/rewriteHandler.c:2099
+#: rewrite/rewriteHandler.c:2121
 msgid "View columns that are not columns of their base relation are not updatable."
 msgstr "Le colonne di vista che non sono colonne della loro relazione di base non sono aggiornabili."
 
-#: rewrite/rewriteHandler.c:2102
+#: rewrite/rewriteHandler.c:2124
 msgid "View columns that refer to system columns are not updatable."
 msgstr "Le colonne di vista che si riferiscono a colonne di sistema non sono aggiornabili."
 
-#: rewrite/rewriteHandler.c:2105
+#: rewrite/rewriteHandler.c:2127
 msgid "View columns that return whole-row references are not updatable."
 msgstr "Le colonne di vista che restituiscono riferimenti a righe intere non sono aggiornabili."
 
-#: rewrite/rewriteHandler.c:2163
+#: rewrite/rewriteHandler.c:2185
 msgid "Views containing DISTINCT are not automatically updatable."
 msgstr "Le viste contenenti DISTINCT non sono aggiornabili automaticamente."
 
-#: rewrite/rewriteHandler.c:2166
+#: rewrite/rewriteHandler.c:2188
 msgid "Views containing GROUP BY are not automatically updatable."
 msgstr "Le viste contenenti GROUP BY non sono aggiornabili automaticamente."
 
-#: rewrite/rewriteHandler.c:2169
+#: rewrite/rewriteHandler.c:2191
 msgid "Views containing HAVING are not automatically updatable."
 msgstr "Le viste contenenti HAVING non sono aggiornabili automaticamente."
 
-#: rewrite/rewriteHandler.c:2172
+#: rewrite/rewriteHandler.c:2194
 msgid "Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable."
 msgstr "Le viste che contengono UNION, INTERSECT o EXCEPT non sono automaticamente aggiornabili."
 
-#: rewrite/rewriteHandler.c:2175
+#: rewrite/rewriteHandler.c:2197
 msgid "Views containing WITH are not automatically updatable."
 msgstr "Le viste contenenti WITH non sono aggiornabili automaticamente."
 
-#: rewrite/rewriteHandler.c:2178
+#: rewrite/rewriteHandler.c:2200
 msgid "Views containing LIMIT or OFFSET are not automatically updatable."
 msgstr "Le viste contenenti LIMIT o OFFSET non sono aggiornabili automaticamente."
 
-#: rewrite/rewriteHandler.c:2190
+#: rewrite/rewriteHandler.c:2212
 msgid "Views that return aggregate functions are not automatically updatable."
 msgstr "Le viste che restituiscono funzioni di aggregazione non sono aggiornabili automaticamente."
 
-#: rewrite/rewriteHandler.c:2193
+#: rewrite/rewriteHandler.c:2215
 msgid "Views that return window functions are not automatically updatable."
 msgstr "Le viste che restituiscono funzioni finestra non sono aggiornabili automaticamente."
 
-#: rewrite/rewriteHandler.c:2196
+#: rewrite/rewriteHandler.c:2218
 msgid "Views that return set-returning functions are not automatically updatable."
 msgstr "Le viste che restituiscono funzioni insieme non sono aggiornabili automaticamente"
 
-#: rewrite/rewriteHandler.c:2203 rewrite/rewriteHandler.c:2207
-#: rewrite/rewriteHandler.c:2214
+#: rewrite/rewriteHandler.c:2225 rewrite/rewriteHandler.c:2229
+#: rewrite/rewriteHandler.c:2236
 msgid "Views that do not select from a single table or view are not automatically updatable."
 msgstr "Le viste che non leggono da una singola tabella o vista non sono aggiornabili automaticamente."
 
-#: rewrite/rewriteHandler.c:2217
+#: rewrite/rewriteHandler.c:2239
 msgid "Views containing TABLESAMPLE are not automatically updatable."
 msgstr "Le viste che contengono TABLESAMPLE non sono automaticamente aggiornabili."
 
-#: rewrite/rewriteHandler.c:2241
+#: rewrite/rewriteHandler.c:2263
 msgid "Views that have no updatable columns are not automatically updatable."
 msgstr "Le viste che non hanno colonne aggiornabili non sono automaticamente aggiornabili."
 
-#: rewrite/rewriteHandler.c:2688
+#: rewrite/rewriteHandler.c:2717
 #, c-format
 msgid "cannot insert into column \"%s\" of view \"%s\""
 msgstr "non si può inserire nella colonna \"%s\" della vista \"%s\""
 
-#: rewrite/rewriteHandler.c:2696
+#: rewrite/rewriteHandler.c:2725
 #, c-format
 msgid "cannot update column \"%s\" of view \"%s\""
 msgstr "non si può modificare la colonna \"%s\" della vista \"%s\""
 
-#: rewrite/rewriteHandler.c:3071
+#: rewrite/rewriteHandler.c:3123
 #, c-format
 msgid "DO INSTEAD NOTHING rules are not supported for data-modifying statements in WITH"
 msgstr "le regole DO INSTEAD NOTHING non sono supportate per istruzioni di modifica dei dati nel WITH"
 
-#: rewrite/rewriteHandler.c:3085
+#: rewrite/rewriteHandler.c:3137
 #, c-format
 msgid "conditional DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "le regole DO INSTEAD NOTHING condizionali non sono supportate per istruzioni di modifica dei dati nel WITH"
 
-#: rewrite/rewriteHandler.c:3089
+#: rewrite/rewriteHandler.c:3141
 #, c-format
 msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
 msgstr "le regole DO ALSO non sono supportate per istruzioni di modifica dei dati nel WITH"
 
-#: rewrite/rewriteHandler.c:3094
+#: rewrite/rewriteHandler.c:3146
 #, c-format
 msgid "multi-statement DO INSTEAD rules are not supported for data-modifying statements in WITH"
 msgstr "le regole DO INSTEAD multi-istruzione non sono supportate per istruzioni di modifica dei dati nel WITH"
 
-#: rewrite/rewriteHandler.c:3309
+#: rewrite/rewriteHandler.c:3361
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
 msgstr "non è possibile eseguire INSERT RETURNING sulla relazione \"%s\""
 
-#: rewrite/rewriteHandler.c:3311
+#: rewrite/rewriteHandler.c:3363
 #, c-format
 msgid "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr "È necessaria una regola ON INSERT DO INSTEAD non condizionale con una clausola RETURNING."
 
-#: rewrite/rewriteHandler.c:3316
+#: rewrite/rewriteHandler.c:3368
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "non è possibile eseguire UPDATE RETURNING sulla relazione \"%s\""
 
-#: rewrite/rewriteHandler.c:3318
+#: rewrite/rewriteHandler.c:3370
 #, c-format
 msgid "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr "È necessaria una regola ON UPDATE DO INSTEAD non condizionale con una clausola RETURNING."
 
-#: rewrite/rewriteHandler.c:3323
+#: rewrite/rewriteHandler.c:3375
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "non è possibile eseguire DELETE RETURNING sulla relazione \"%s\""
 
-#: rewrite/rewriteHandler.c:3325
+#: rewrite/rewriteHandler.c:3377
 #, c-format
 msgid "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
 msgstr "È necessaria una regola ON DELETE DO INSTEAD non condizionale con una clausola RETURNING."
 
-#: rewrite/rewriteHandler.c:3343
+#: rewrite/rewriteHandler.c:3395
 #, c-format
 msgid "INSERT with ON CONFLICT clause cannot be used with table that has INSERT or UPDATE rules"
 msgstr "INSERT con clausola ON CONFLICT non può essere usato in tabelle con una regola su INSERT o UPDATE"
 
-#: rewrite/rewriteHandler.c:3400
+#: rewrite/rewriteHandler.c:3452
 #, c-format
 msgid "WITH cannot be used in a query that is rewritten by rules into multiple queries"
 msgstr "WITH non può essere usato in una query che viene riscritta da regole in più di una query"
 
-#: rewrite/rewriteManip.c:1006
+#: rewrite/rewriteManip.c:1003
 #, c-format
 msgid "conditional utility statements are not implemented"
 msgstr "i comandi di utilità condizionali non sono implementati"
 
-#: rewrite/rewriteManip.c:1172
+#: rewrite/rewriteManip.c:1169
 #, c-format
 msgid "WHERE CURRENT OF on a view is not implemented"
 msgstr "WHERE CURRENT OF su una vista non è implementato"
 
-#: rewrite/rewriteManip.c:1437
+#: rewrite/rewriteManip.c:1434
 #, c-format
 msgid "NEW variables in ON UPDATE rules cannot reference columns that are part of a multiple assignment in the subject UPDATE command"
 msgstr "la variabile NEW nelle regole ON UPDATE non può riferirsi a colonne che fanno parte di un assegnamento multiplo nel comando UPDATE soggetto"
@@ -15399,17 +15386,17 @@
 msgid "invalid page in block %u of relation %s; zeroing out page"
 msgstr "pagina non valida nel blocco %u della relazione %s; azzeramento della pagina"
 
-#: storage/buffer/bufmgr.c:3569
+#: storage/buffer/bufmgr.c:3595
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "scrittura del blocco %u di %s fallita"
 
-#: storage/buffer/bufmgr.c:3571
+#: storage/buffer/bufmgr.c:3597
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Più di un fallimento --- l'errore in scrittura potrebbe essere permanente."
 
-#: storage/buffer/bufmgr.c:3592 storage/buffer/bufmgr.c:3611
+#: storage/buffer/bufmgr.c:3618 storage/buffer/bufmgr.c:3637
 #, c-format
 msgid "writing block %u of relation %s"
 msgstr "scrittura del blocco %u della relazione %s"
@@ -15419,53 +15406,58 @@
 msgid "no empty local buffer available"
 msgstr "nessun buffer locale vuoto disponibile"
 
-#: storage/file/fd.c:528
+#: storage/file/fd.c:548
+#, c-format
+msgid "could not link file \"%s\" to \"%s\": %m"
+msgstr "creazione del collegamento il file \"%s\" a \"%s\" fallita: %m"
+
+#: storage/file/fd.c:642
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "getrlimit fallito: %m"
 
-#: storage/file/fd.c:618
+#: storage/file/fd.c:732
 #, c-format
 msgid "insufficient file descriptors available to start server process"
 msgstr "descrittori di file non sufficienti per avviare il processo server"
 
-#: storage/file/fd.c:619
+#: storage/file/fd.c:733
 #, c-format
 msgid "System allows %d, we need at least %d."
 msgstr "Il sistema ne consente %d, ne occorrono almeno %d."
 
-#: storage/file/fd.c:660 storage/file/fd.c:1694 storage/file/fd.c:1787
-#: storage/file/fd.c:1935
+#: storage/file/fd.c:774 storage/file/fd.c:1878 storage/file/fd.c:1971
+#: storage/file/fd.c:2119
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr "descrittori di file esauriti: %m; sto rilasciando e riprovando"
 
-#: storage/file/fd.c:1234
+#: storage/file/fd.c:1379
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "file temporaneo: percorso \"%s\", dimensione %lu"
 
-#: storage/file/fd.c:1383
+#: storage/file/fd.c:1551
 #, c-format
 msgid "temporary file size exceeds temp_file_limit (%dkB)"
 msgstr "la dimensione del file temporaneo supera temp_file_limit (%dkB)"
 
-#: storage/file/fd.c:1670 storage/file/fd.c:1720
+#: storage/file/fd.c:1854 storage/file/fd.c:1904
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
 msgstr "maxAllocatedDescs (%d) superato tentando di aprire il file \"%s\""
 
-#: storage/file/fd.c:1760
+#: storage/file/fd.c:1944
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
 msgstr "maxAllocatedDescs (%d) superato tentando di eseguire il comando \"%s\""
 
-#: storage/file/fd.c:1911
+#: storage/file/fd.c:2095
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
 msgstr "maxAllocatedDescs (%d) superato tentando di aprire la directory \"%s\""
 
-#: storage/file/fd.c:1997
+#: storage/file/fd.c:2181
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "lettura della directory \"%s\" fallita: %m"
@@ -15497,37 +15489,37 @@
 
 #: storage/ipc/dsm_impl.c:261 storage/ipc/dsm_impl.c:361
 #: storage/ipc/dsm_impl.c:533 storage/ipc/dsm_impl.c:648
-#: storage/ipc/dsm_impl.c:811 storage/ipc/dsm_impl.c:953
+#: storage/ipc/dsm_impl.c:819 storage/ipc/dsm_impl.c:961
 #, c-format
 msgid "could not unmap shared memory segment \"%s\": %m"
 msgstr "unmap del segmento di memoria condivisa \"%s\" fallito: %m"
 
 #: storage/ipc/dsm_impl.c:271 storage/ipc/dsm_impl.c:543
-#: storage/ipc/dsm_impl.c:658 storage/ipc/dsm_impl.c:821
+#: storage/ipc/dsm_impl.c:658 storage/ipc/dsm_impl.c:829
 #, c-format
 msgid "could not remove shared memory segment \"%s\": %m"
 msgstr "rimozione del segmento di memoria condivisa \"%s\" fallito: %m"
 
-#: storage/ipc/dsm_impl.c:292 storage/ipc/dsm_impl.c:721
-#: storage/ipc/dsm_impl.c:835
+#: storage/ipc/dsm_impl.c:292 storage/ipc/dsm_impl.c:729
+#: storage/ipc/dsm_impl.c:843
 #, c-format
 msgid "could not open shared memory segment \"%s\": %m"
 msgstr "apertura del segmento di memoria condivisa \"%s\" fallito: %m"
 
 #: storage/ipc/dsm_impl.c:316 storage/ipc/dsm_impl.c:559
-#: storage/ipc/dsm_impl.c:766 storage/ipc/dsm_impl.c:859
+#: storage/ipc/dsm_impl.c:774 storage/ipc/dsm_impl.c:867
 #, c-format
 msgid "could not stat shared memory segment \"%s\": %m"
 msgstr "lettura informazioni sul segmento di memoria condivisa \"%s\" fallito: %m"
 
-#: storage/ipc/dsm_impl.c:335 storage/ipc/dsm_impl.c:878
-#: storage/ipc/dsm_impl.c:926
+#: storage/ipc/dsm_impl.c:335 storage/ipc/dsm_impl.c:886
+#: storage/ipc/dsm_impl.c:934
 #, c-format
 msgid "could not resize shared memory segment \"%s\" to %zu bytes: %m"
 msgstr "ridimensionamento del segmento di memoria condivisa \"%s\" a %zu byte fallito: %m"
 
 #: storage/ipc/dsm_impl.c:385 storage/ipc/dsm_impl.c:580
-#: storage/ipc/dsm_impl.c:742 storage/ipc/dsm_impl.c:977
+#: storage/ipc/dsm_impl.c:750 storage/ipc/dsm_impl.c:985
 #, c-format
 msgid "could not map shared memory segment \"%s\": %m"
 msgstr "map del segmento di memoria condivisa \"%s\" fallito: %m"
@@ -15537,22 +15529,22 @@
 msgid "could not get shared memory segment: %m"
 msgstr "impossibile ottenere un segmento di memoria condivisa: %m"
 
-#: storage/ipc/dsm_impl.c:694
+#: storage/ipc/dsm_impl.c:714
 #, c-format
 msgid "could not create shared memory segment \"%s\": %m"
 msgstr "creazione del segmento di memoria condivisa \"%s\" fallito: %m"
 
-#: storage/ipc/dsm_impl.c:1018
+#: storage/ipc/dsm_impl.c:1026
 #, c-format
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "duplicazione dell'handle per \"%s\" fallita: %m"
 
 #: storage/ipc/shm_toc.c:108 storage/ipc/shm_toc.c:189 storage/ipc/shmem.c:205
-#: storage/lmgr/lock.c:867 storage/lmgr/lock.c:901 storage/lmgr/lock.c:2596
-#: storage/lmgr/lock.c:3712 storage/lmgr/lock.c:3777 storage/lmgr/lock.c:4067
+#: storage/lmgr/lock.c:867 storage/lmgr/lock.c:901 storage/lmgr/lock.c:2598
+#: storage/lmgr/lock.c:3714 storage/lmgr/lock.c:3779 storage/lmgr/lock.c:4069
 #: storage/lmgr/predicate.c:2328 storage/lmgr/predicate.c:2343
-#: storage/lmgr/predicate.c:3736 storage/lmgr/predicate.c:4879
-#: storage/lmgr/proc.c:201 utils/hash/dynahash.c:998
+#: storage/lmgr/predicate.c:3735 storage/lmgr/predicate.c:4878
+#: storage/lmgr/proc.c:200 utils/hash/dynahash.c:998
 #, c-format
 msgid "out of shared memory"
 msgstr "memoria condivisa esaurita"
@@ -15577,12 +15569,12 @@
 msgid "requested shared memory size overflows size_t"
 msgstr "la dimensione richiesta di memoria condivisa supera size_t"
 
-#: storage/ipc/standby.c:500 tcop/postgres.c:2974
+#: storage/ipc/standby.c:502 tcop/postgres.c:2989
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "annullamento dell'istruzione a causa di un conflitto con il ripristino"
 
-#: storage/ipc/standby.c:501 tcop/postgres.c:2274
+#: storage/ipc/standby.c:503 tcop/postgres.c:2274
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "La transazione utente ha causato un deadlock del buffer con il ripristino."
@@ -15732,27 +15724,17 @@
 msgid "Only RowExclusiveLock or less can be acquired on database objects during recovery."
 msgstr "Solo RowExclusiveLock o inferiore può essere acquisito sugli oggetti database durante il ripristino."
 
-#: storage/lmgr/lock.c:868 storage/lmgr/lock.c:902 storage/lmgr/lock.c:2597
-#: storage/lmgr/lock.c:3713 storage/lmgr/lock.c:3778 storage/lmgr/lock.c:4068
+#: storage/lmgr/lock.c:868 storage/lmgr/lock.c:902 storage/lmgr/lock.c:2599
+#: storage/lmgr/lock.c:3715 storage/lmgr/lock.c:3780 storage/lmgr/lock.c:4070
 #, c-format
 msgid "You might need to increase max_locks_per_transaction."
 msgstr "Potrebbe essere necessario incrementare max_locks_per_transaction."
 
-#: storage/lmgr/lock.c:3038 storage/lmgr/lock.c:3150
+#: storage/lmgr/lock.c:3040 storage/lmgr/lock.c:3152
 #, c-format
 msgid "cannot PREPARE while holding both session-level and transaction-level locks on the same object"
 msgstr "non è possibile eseguire PREPARE tenendo sia lock a livello di sessione che di transazione sullo stesso oggetto"
 
-#: storage/lmgr/lwlock.c:190
-#, c-format
-msgid "%d: %s(%s %d): excl %u shared %u haswaiters %u waiters %u rOK %d"
-msgstr "%d: %s(%s %d): excl %u shared %u haswaiters %u waiters %u rOK %d"
-
-#: storage/lmgr/lwlock.c:210
-#, c-format
-msgid "%s(%s %d): %s"
-msgstr "%s(%s %d): %s"
-
 #: storage/lmgr/predicate.c:675
 #, c-format
 msgid "not enough elements in RWConflictPool to record a read/write conflict"
@@ -15803,77 +15785,77 @@
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr "una transazione che importa uno snapshot non può essere READ ONLY DEFERRABLE"
 
-#: storage/lmgr/predicate.c:1705 utils/time/snapmgr.c:431
-#: utils/time/snapmgr.c:437
+#: storage/lmgr/predicate.c:1705 utils/time/snapmgr.c:472
+#: utils/time/snapmgr.c:478
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "non è stato possibile importare lo snapshot richiesto"
 
-#: storage/lmgr/predicate.c:1706 utils/time/snapmgr.c:438
+#: storage/lmgr/predicate.c:1706 utils/time/snapmgr.c:479
 #, c-format
 msgid "The source transaction %u is not running anymore."
 msgstr "La transazione di origine %u non è più in esecuzione."
 
 #: storage/lmgr/predicate.c:2329 storage/lmgr/predicate.c:2344
-#: storage/lmgr/predicate.c:3737
+#: storage/lmgr/predicate.c:3736
 #, c-format
 msgid "You might need to increase max_pred_locks_per_transaction."
 msgstr "Potrebbe essere necessario incrementare max_pred_locks_per_transaction."
 
-#: storage/lmgr/predicate.c:3891 storage/lmgr/predicate.c:3980
-#: storage/lmgr/predicate.c:3988 storage/lmgr/predicate.c:4027
-#: storage/lmgr/predicate.c:4266 storage/lmgr/predicate.c:4603
-#: storage/lmgr/predicate.c:4615 storage/lmgr/predicate.c:4657
-#: storage/lmgr/predicate.c:4695
+#: storage/lmgr/predicate.c:3890 storage/lmgr/predicate.c:3979
+#: storage/lmgr/predicate.c:3987 storage/lmgr/predicate.c:4026
+#: storage/lmgr/predicate.c:4265 storage/lmgr/predicate.c:4602
+#: storage/lmgr/predicate.c:4614 storage/lmgr/predicate.c:4656
+#: storage/lmgr/predicate.c:4694
 #, c-format
 msgid "could not serialize access due to read/write dependencies among transactions"
 msgstr "serializzazione dell'accesso fallita a causa di dipendenze di lettura/scrittura tra le transazioni"
 
-#: storage/lmgr/predicate.c:3893 storage/lmgr/predicate.c:3982
-#: storage/lmgr/predicate.c:3990 storage/lmgr/predicate.c:4029
-#: storage/lmgr/predicate.c:4268 storage/lmgr/predicate.c:4605
-#: storage/lmgr/predicate.c:4617 storage/lmgr/predicate.c:4659
-#: storage/lmgr/predicate.c:4697
+#: storage/lmgr/predicate.c:3892 storage/lmgr/predicate.c:3981
+#: storage/lmgr/predicate.c:3989 storage/lmgr/predicate.c:4028
+#: storage/lmgr/predicate.c:4267 storage/lmgr/predicate.c:4604
+#: storage/lmgr/predicate.c:4616 storage/lmgr/predicate.c:4658
+#: storage/lmgr/predicate.c:4696
 #, c-format
 msgid "The transaction might succeed if retried."
 msgstr "La transazione potrebbe riuscire se ritentata."
 
-#: storage/lmgr/proc.c:1166
+#: storage/lmgr/proc.c:1164
 #, c-format
 msgid "Process %d waits for %s on %s."
 msgstr "Processo %d in attesa di %s su %s."
 
-#: storage/lmgr/proc.c:1177
+#: storage/lmgr/proc.c:1175
 #, c-format
 msgid "sending cancel to blocking autovacuum PID %d"
 msgstr "invio di annullamento per bloccare l'autovacuum con PID %d"
 
-#: storage/lmgr/proc.c:1195 utils/adt/misc.c:146
+#: storage/lmgr/proc.c:1193 utils/adt/misc.c:146
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "invio del segnale al processo %d fallito: %m"
 
-#: storage/lmgr/proc.c:1297
+#: storage/lmgr/proc.c:1295
 #, c-format
 msgid "process %d avoided deadlock for %s on %s by rearranging queue order after %ld.%03d ms"
 msgstr "il processo %d ha evitato un deadlock per %s su %s modificando l'ordine della coda dopo %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1312
+#: storage/lmgr/proc.c:1310
 #, c-format
 msgid "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
 msgstr "il processo %d ha individuato un deadlock mentre era in attesa di %s su %s dopo %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1321
+#: storage/lmgr/proc.c:1319
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr "il processo %d è ancora un attesa di %s su %s dopo %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1328
+#: storage/lmgr/proc.c:1326
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "il processo %d ha acquisito %s su %s dopo %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1344
+#: storage/lmgr/proc.c:1342
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr "il processo %d ha fallito l'acquisizione di %s su %s dopo %ld.%03d ms"
@@ -15883,30 +15865,30 @@
 msgid "page verification failed, calculated checksum %u but expected %u"
 msgstr "verifica della pagina fallita, somma di controllo calcolata %u ma era attesa %u"
 
-#: storage/page/bufpage.c:200 storage/page/bufpage.c:490
-#: storage/page/bufpage.c:705 storage/page/bufpage.c:836
-#: storage/page/bufpage.c:936
+#: storage/page/bufpage.c:203 storage/page/bufpage.c:522
+#: storage/page/bufpage.c:737 storage/page/bufpage.c:868
+#: storage/page/bufpage.c:968
 #, c-format
 msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr "puntatore di pagina corrotto: lower = %u, upper = %u, special = %u"
 
-#: storage/page/bufpage.c:534
+#: storage/page/bufpage.c:566
 #, c-format
 msgid "corrupted item pointer: %u"
 msgstr "puntatore di elemento corrotto: %u"
 
-#: storage/page/bufpage.c:545 storage/page/bufpage.c:887
-#: storage/page/bufpage.c:1042
+#: storage/page/bufpage.c:577 storage/page/bufpage.c:919
+#: storage/page/bufpage.c:1074
 #, c-format
 msgid "corrupted item lengths: total %u, available space %u"
 msgstr "lunghezza dell'elemento corrotta: totale %u, spazio disponibile %u"
 
-#: storage/page/bufpage.c:724 storage/page/bufpage.c:860
+#: storage/page/bufpage.c:756 storage/page/bufpage.c:892
 #, c-format
 msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr "puntatore di elemento corrotto: offset = %u, size = %u"
 
-#: storage/page/bufpage.c:965
+#: storage/page/bufpage.c:997
 #, c-format
 msgid "corrupted item pointer: offset = %u, length = %u"
 msgstr "puntatore di elemento corrotto: offset = %u, lunghezza = %u"
@@ -15966,65 +15948,65 @@
 msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr "troncamento del file \"%s\" a %u blocchi fallito: ora è di soli %u blocchi"
 
-#: storage/smgr/md.c:938
+#: storage/smgr/md.c:939
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: %m"
 msgstr "troncamento del file \"%s\" a %u blocchi fallito: %m"
 
-#: storage/smgr/md.c:1218
+#: storage/smgr/md.c:1219
 #, c-format
 msgid "could not fsync file \"%s\" but retrying: %m"
 msgstr "fsync del file \"%s\" fallito ma sto ritentando: %m"
 
-#: storage/smgr/md.c:1381
+#: storage/smgr/md.c:1382
 #, c-format
 msgid "could not forward fsync request because request queue is full"
 msgstr "inoltro della richiesta di fsync fallito perché la coda di richieste è piena"
 
-#: storage/smgr/md.c:1776
+#: storage/smgr/md.c:1777
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
 msgstr "apertura del file \"%s\" fallita (blocco di destinazione %u): %m"
 
-#: tcop/fastpath.c:111 tcop/fastpath.c:475 tcop/fastpath.c:605
+#: tcop/fastpath.c:111 tcop/fastpath.c:463 tcop/fastpath.c:593
 #, c-format
 msgid "invalid argument size %d in function call message"
 msgstr "La dimensione dell'argomento %d non è valida nel messaggi di chiamata di funzione"
 
-#: tcop/fastpath.c:291 tcop/postgres.c:1003 tcop/postgres.c:1313
+#: tcop/fastpath.c:281 tcop/postgres.c:1003 tcop/postgres.c:1313
 #: tcop/postgres.c:1571 tcop/postgres.c:1975 tcop/postgres.c:2342
 #: tcop/postgres.c:2417
 #, c-format
 msgid "current transaction is aborted, commands ignored until end of transaction block"
 msgstr "la transazione corrente è interrotta, i comandi saranno ignorati fino alla fine del blocco della transazione"
 
-#: tcop/fastpath.c:319
+#: tcop/fastpath.c:309
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "chiamata funzione fastpath: \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:401 tcop/postgres.c:1173 tcop/postgres.c:1438
+#: tcop/fastpath.c:391 tcop/postgres.c:1173 tcop/postgres.c:1438
 #: tcop/postgres.c:1816 tcop/postgres.c:2033
 #, c-format
 msgid "duration: %s ms"
 msgstr "durata: %s ms"
 
-#: tcop/fastpath.c:405
+#: tcop/fastpath.c:395
 #, c-format
 msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
 msgstr "durata: %s ms  chiamata funzione fastpath: \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:443 tcop/fastpath.c:570
+#: tcop/fastpath.c:431 tcop/fastpath.c:558
 #, c-format
 msgid "function call message contains %d arguments but function requires %d"
 msgstr "la chiamata alla funzione contiene %d parametri ma la funzione ne richiede %d"
 
-#: tcop/fastpath.c:451
+#: tcop/fastpath.c:439
 #, c-format
 msgid "function call message contains %d argument formats but %d arguments"
 msgstr "la chiamata alla funzione contiene %d formati di parametri ma %d parametri"
 
-#: tcop/fastpath.c:538 tcop/fastpath.c:621
+#: tcop/fastpath.c:526 tcop/fastpath.c:609
 #, c-format
 msgid "incorrect binary data format in function argument %d"
 msgstr "formato dei dati binari non corretto nell'argomento %d della funzione"
@@ -16035,7 +16017,7 @@
 msgstr "fine file inaspettata nella connessione al client"
 
 #: tcop/postgres.c:449 tcop/postgres.c:461 tcop/postgres.c:472
-#: tcop/postgres.c:484 tcop/postgres.c:4263
+#: tcop/postgres.c:484 tcop/postgres.c:4277
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "messaggio frontend di tipo %d non valido"
@@ -16208,87 +16190,87 @@
 msgid "connection to client lost"
 msgstr "connessione al client persa"
 
-#: tcop/postgres.c:2951
+#: tcop/postgres.c:2966
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "annullamento dell'istruzione a causa di timeout di lock"
 
-#: tcop/postgres.c:2958
+#: tcop/postgres.c:2973
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr "annullamento dell'istruzione a causa di timeout"
 
-#: tcop/postgres.c:2965
+#: tcop/postgres.c:2980
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "annullamento del task di autovacuum"
 
-#: tcop/postgres.c:2988
+#: tcop/postgres.c:3003
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "annullamento dell'istruzione su richiesta dell'utente"
 
-#: tcop/postgres.c:3118 tcop/postgres.c:3140
+#: tcop/postgres.c:3113
 #, c-format
 msgid "stack depth limit exceeded"
 msgstr "limite di profondità dello stack superato"
 
-#: tcop/postgres.c:3119 tcop/postgres.c:3141
+#: tcop/postgres.c:3114
 #, c-format
 msgid "Increase the configuration parameter \"max_stack_depth\" (currently %dkB), after ensuring the platform's stack depth limit is adequate."
 msgstr "Incrementa il parametro di configurazione \"max_stack_depth\" (attualmente %dkB), dopo esserti assicurato che il limite dello stack della piattaforma sia adeguato."
 
-#: tcop/postgres.c:3157
+#: tcop/postgres.c:3177
 #, c-format
 msgid "\"max_stack_depth\" must not exceed %ldkB."
 msgstr "\"max_stack_depth\" non deve superare %ldkB"
 
-#: tcop/postgres.c:3159
+#: tcop/postgres.c:3179
 #, c-format
 msgid "Increase the platform's stack depth limit via \"ulimit -s\" or local equivalent."
 msgstr "Incrementa il limite dello stack della piattaforma usando \"ulimit -s\" on un comando equivalente."
 
-#: tcop/postgres.c:3519
+#: tcop/postgres.c:3539
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "argomento della riga di comando non valido per il processo server: %s"
 
-#: tcop/postgres.c:3520 tcop/postgres.c:3526
+#: tcop/postgres.c:3540 tcop/postgres.c:3546
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Prova \"%s --help\" per maggiori informazioni."
 
-#: tcop/postgres.c:3524
+#: tcop/postgres.c:3544
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: argomento della riga di comando non valido: %s"
 
-#: tcop/postgres.c:3585
+#: tcop/postgres.c:3605
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: nessun database né nome utente specificato"
 
-#: tcop/postgres.c:4171
+#: tcop/postgres.c:4185
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "sottotipo %d del messaggio CLOSE non valido"
 
-#: tcop/postgres.c:4206
+#: tcop/postgres.c:4220
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "sottotipo %d del messaggio DESCRIBE non valido"
 
-#: tcop/postgres.c:4284
+#: tcop/postgres.c:4298
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr "le chiamate di funzione fastpath non sono supportate in una connessione di replica"
 
-#: tcop/postgres.c:4288
+#: tcop/postgres.c:4302
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr "il protocollo di query esteso non è supportato in una connessione di replica"
 
-#: tcop/postgres.c:4458
+#: tcop/postgres.c:4472
 #, c-format
 msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
 msgstr "disconnessione: tempo della sessione: %d:%02d:%02d.%03d utente=%s database=%s host=%s%s%s"
@@ -16298,41 +16280,41 @@
 msgid "bind message has %d result formats but query has %d columns"
 msgstr "il messaggio di bind ha %d formati di risultato ma la query ha %d colonne"
 
-#: tcop/pquery.c:972
+#: tcop/pquery.c:968
 #, c-format
 msgid "cursor can only scan forward"
 msgstr "il cursore effettuare solo scansioni in avanti"
 
-#: tcop/pquery.c:973
+#: tcop/pquery.c:969
 #, c-format
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr "Dichiaralo con l'opzione SCROLL per abilitare le scansioni all'indietro."
 
 #. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:234
+#: tcop/utility.c:233
 #, c-format
 msgid "cannot execute %s in a read-only transaction"
 msgstr "non è possibile eseguire %s in una transazione a sola lettura"
 
 #. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:252
+#: tcop/utility.c:251
 #, c-format
 msgid "cannot execute %s during a parallel operation"
 msgstr "non è possibile eseguire %s durante un'operazione parallela"
 
 #. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:271
+#: tcop/utility.c:270
 #, c-format
 msgid "cannot execute %s during recovery"
 msgstr "non è possibile eseguire %s durante il recupero"
 
 #. translator: %s is name of a SQL command, eg PREPARE
-#: tcop/utility.c:289
+#: tcop/utility.c:288
 #, c-format
 msgid "cannot execute %s within security-restricted operation"
 msgstr "non è possibile eseguire %s nell'ambito di operazioni a sicurezza ristretta"
 
-#: tcop/utility.c:743
+#: tcop/utility.c:742
 #, c-format
 msgid "must be superuser to do CHECKPOINT"
 msgstr "solo un superutente può eseguire CHECKPOINT"
@@ -16457,38 +16439,38 @@
 msgid "missing Dictionary parameter"
 msgstr "parametro di Dictionary mancante"
 
-#: tsearch/spell.c:276
+#: tsearch/spell.c:289
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "apertura del file dictionary \"%s\" fallita: %m"
 
-#: tsearch/spell.c:439 utils/adt/regexp.c:204
+#: tsearch/spell.c:452 utils/adt/regexp.c:204
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "espressione regolare non valida: %s"
 
-#: tsearch/spell.c:518 tsearch/spell.c:535 tsearch/spell.c:552
-#: tsearch/spell.c:569 tsearch/spell.c:591 gram.y:14287 gram.y:14304
+#: tsearch/spell.c:667 tsearch/spell.c:684 tsearch/spell.c:701
+#: tsearch/spell.c:718 tsearch/spell.c:740 gram.y:14257 gram.y:14274
 #, c-format
 msgid "syntax error"
 msgstr "errore di sintassi"
 
-#: tsearch/spell.c:596
+#: tsearch/spell.c:745
 #, c-format
 msgid "multibyte flag character is not allowed"
 msgstr "il carattere flag multibyte non è consentito"
 
-#: tsearch/spell.c:632 tsearch/spell.c:690 tsearch/spell.c:787
+#: tsearch/spell.c:779 tsearch/spell.c:835 tsearch/spell.c:937
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "apertura del file affix \"%s\" fallita: %m"
 
-#: tsearch/spell.c:678
+#: tsearch/spell.c:825
 #, c-format
 msgid "Ispell dictionary supports only default flag value"
 msgstr "il dizionario Ispell supporta solo il flag di valore default"
 
-#: tsearch/spell.c:901
+#: tsearch/spell.c:1050
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "il file affix contiene comandi sia vecchio stile che nuovo stile"
@@ -16535,27 +16517,27 @@
 msgid "text search parser does not support headline creation"
 msgstr "l'analizzatore di ricerca di testo non supporta la creazione di intestazioni"
 
-#: tsearch/wparser_def.c:2557
+#: tsearch/wparser_def.c:2559
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
 msgstr "parametro di intestazione sconosciuto: \"%s\""
 
-#: tsearch/wparser_def.c:2566
+#: tsearch/wparser_def.c:2568
 #, c-format
 msgid "MinWords should be less than MaxWords"
 msgstr "MinWords dovrebbe essere minore di MaxWords"
 
-#: tsearch/wparser_def.c:2570
+#: tsearch/wparser_def.c:2572
 #, c-format
 msgid "MinWords should be positive"
 msgstr "MinWords dovrebbe essere positivo"
 
-#: tsearch/wparser_def.c:2574
+#: tsearch/wparser_def.c:2576
 #, c-format
 msgid "ShortWord should be >= 0"
 msgstr "ShortWord dovrebbe essere >= 0"
 
-#: tsearch/wparser_def.c:2578
+#: tsearch/wparser_def.c:2580
 #, c-format
 msgid "MaxFragments should be >= 0"
 msgstr "MaxFragments dovrebbe essere >= 0"
@@ -16671,316 +16653,305 @@
 msgid "must be member of role \"%s\""
 msgstr "occorre far parte del ruolo \"%s\""
 
-#: utils/adt/array_expanded.c:276 utils/adt/arrayfuncs.c:931
-#: utils/adt/arrayfuncs.c:1519 utils/adt/arrayfuncs.c:3222
-#: utils/adt/arrayfuncs.c:3360 utils/adt/arrayfuncs.c:5835
-#: utils/adt/arrayfuncs.c:6146 utils/adt/arrayutils.c:93
+#: utils/adt/array_expanded.c:276 utils/adt/arrayfuncs.c:934
+#: utils/adt/arrayfuncs.c:1522 utils/adt/arrayfuncs.c:3225
+#: utils/adt/arrayfuncs.c:3363 utils/adt/arrayfuncs.c:5826
+#: utils/adt/arrayfuncs.c:6137 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 "la dimensione dell'array supera il massimo consentito (%d)"
 
-#: utils/adt/array_userfuncs.c:67 utils/adt/array_userfuncs.c:529
-#: utils/adt/array_userfuncs.c:609 utils/adt/json.c:1746 utils/adt/json.c:1841
-#: utils/adt/json.c:1872 utils/adt/jsonb.c:1133 utils/adt/jsonb.c:1162
-#: utils/adt/jsonb.c:1593 utils/adt/jsonb.c:1754 utils/adt/jsonb.c:1777
+#: utils/adt/array_userfuncs.c:79 utils/adt/array_userfuncs.c:541
+#: utils/adt/array_userfuncs.c:621 utils/adt/json.c:1759 utils/adt/json.c:1854
+#: utils/adt/json.c:1892 utils/adt/jsonb.c:1126 utils/adt/jsonb.c:1155
+#: utils/adt/jsonb.c:1591 utils/adt/jsonb.c:1755 utils/adt/jsonb.c:1765
 #, c-format
 msgid "could not determine input data type"
 msgstr "non è stato possibile determinare il tipo di dato di input"
 
-#: utils/adt/array_userfuncs.c:72
+#: utils/adt/array_userfuncs.c:84
 #, c-format
 msgid "input data type is not an array"
 msgstr "il tipo di dati in input non è un array"
 
-#: utils/adt/array_userfuncs.c:120 utils/adt/array_userfuncs.c:174
-#: utils/adt/arrayfuncs.c:1322 utils/adt/float.c:1161 utils/adt/float.c:1220
-#: utils/adt/float.c:2771 utils/adt/float.c:2787 utils/adt/int.c:623
+#: utils/adt/array_userfuncs.c:132 utils/adt/array_userfuncs.c:186
+#: utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1158 utils/adt/float.c:1217
+#: utils/adt/float.c:2768 utils/adt/float.c:2784 utils/adt/int.c:623
 #: utils/adt/int.c:652 utils/adt/int.c:673 utils/adt/int.c:704
 #: utils/adt/int.c:737 utils/adt/int.c:759 utils/adt/int.c:907
 #: utils/adt/int.c:928 utils/adt/int.c:955 utils/adt/int.c:995
 #: utils/adt/int.c:1016 utils/adt/int.c:1043 utils/adt/int.c:1076
-#: utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2903
-#: utils/adt/numeric.c:2912 utils/adt/varbit.c:1173 utils/adt/varbit.c:1565
-#: utils/adt/varlena.c:1045 utils/adt/varlena.c:2582
+#: utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2899
+#: utils/adt/numeric.c:2908 utils/adt/varbit.c:1173 utils/adt/varbit.c:1575
+#: utils/adt/varlena.c:1045 utils/adt/varlena.c:2595
 #, c-format
 msgid "integer out of range"
 msgstr "intero fuori dall'intervallo"
 
-#: utils/adt/array_userfuncs.c:127 utils/adt/array_userfuncs.c:184
+#: utils/adt/array_userfuncs.c:139 utils/adt/array_userfuncs.c:196
 #, c-format
 msgid "argument must be empty or one-dimensional array"
 msgstr "l'argomento deve essere vuoto o un array con una sola dimensione"
 
-#: utils/adt/array_userfuncs.c:266 utils/adt/array_userfuncs.c:305
-#: utils/adt/array_userfuncs.c:342 utils/adt/array_userfuncs.c:371
-#: utils/adt/array_userfuncs.c:399
+#: utils/adt/array_userfuncs.c:278 utils/adt/array_userfuncs.c:317
+#: utils/adt/array_userfuncs.c:354 utils/adt/array_userfuncs.c:383
+#: utils/adt/array_userfuncs.c:411
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "non è possibile concatenare array non compatibili"
 
-#: utils/adt/array_userfuncs.c:267
+#: utils/adt/array_userfuncs.c:279
 #, c-format
 msgid "Arrays with element types %s and %s are not compatible for concatenation."
 msgstr "Array con elementi di tipi %s e %s non sono compatibili per il concatenamento."
 
-#: utils/adt/array_userfuncs.c:306
+#: utils/adt/array_userfuncs.c:318
 #, c-format
 msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
 msgstr "Array con dimensioni %d e %d non sono compatibili per il concatenamento."
 
-#: utils/adt/array_userfuncs.c:343
+#: utils/adt/array_userfuncs.c:355
 #, c-format
 msgid "Arrays with differing element dimensions are not compatible for concatenation."
 msgstr "Array con elementi dalle dimensioni diverse non sono compatibili per il concatenamento."
 
-#: utils/adt/array_userfuncs.c:372 utils/adt/array_userfuncs.c:400
+#: utils/adt/array_userfuncs.c:384 utils/adt/array_userfuncs.c:412
 #, c-format
 msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr "Array con dimensioni diverse non sono compatibili per il concatenamento."
 
-#: utils/adt/array_userfuncs.c:468 utils/adt/arrayfuncs.c:1284
-#: utils/adt/arrayfuncs.c:3328 utils/adt/arrayfuncs.c:5735
+#: utils/adt/array_userfuncs.c:480 utils/adt/arrayfuncs.c:1287
+#: utils/adt/arrayfuncs.c:3331 utils/adt/arrayfuncs.c:5732
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "numero di dimensioni non valido: %d"
 
-#: utils/adt/array_userfuncs.c:725 utils/adt/array_userfuncs.c:876
+#: utils/adt/array_userfuncs.c:737 utils/adt/array_userfuncs.c:889
 #, c-format
 msgid "searching for elements in multidimensional arrays is not supported"
 msgstr "la ricerca di elementi in array multidimensionali non è supportata"
 
-#: utils/adt/array_userfuncs.c:749
+#: utils/adt/array_userfuncs.c:761
 #, c-format
-msgid "initial position should not be NULL"
-msgstr "la posizione iniziale non può essere NULL"
+msgid "initial position must not be null"
+msgstr "la posizione iniziale non può essere nulla"
 
-#: utils/adt/arrayfuncs.c:268 utils/adt/arrayfuncs.c:282
-#: utils/adt/arrayfuncs.c:293 utils/adt/arrayfuncs.c:315
-#: utils/adt/arrayfuncs.c:330 utils/adt/arrayfuncs.c:344
-#: utils/adt/arrayfuncs.c:350 utils/adt/arrayfuncs.c:357
-#: utils/adt/arrayfuncs.c:488 utils/adt/arrayfuncs.c:504
-#: utils/adt/arrayfuncs.c:515 utils/adt/arrayfuncs.c:530
-#: utils/adt/arrayfuncs.c:551 utils/adt/arrayfuncs.c:581
-#: utils/adt/arrayfuncs.c:588 utils/adt/arrayfuncs.c:596
-#: utils/adt/arrayfuncs.c:630 utils/adt/arrayfuncs.c:653
-#: utils/adt/arrayfuncs.c:673 utils/adt/arrayfuncs.c:785
-#: utils/adt/arrayfuncs.c:794 utils/adt/arrayfuncs.c:824
-#: utils/adt/arrayfuncs.c:839 utils/adt/arrayfuncs.c:892
+#: utils/adt/arrayfuncs.c:271 utils/adt/arrayfuncs.c:285
+#: utils/adt/arrayfuncs.c:296 utils/adt/arrayfuncs.c:318
+#: utils/adt/arrayfuncs.c:333 utils/adt/arrayfuncs.c:347
+#: utils/adt/arrayfuncs.c:353 utils/adt/arrayfuncs.c:360
+#: utils/adt/arrayfuncs.c:491 utils/adt/arrayfuncs.c:507
+#: utils/adt/arrayfuncs.c:518 utils/adt/arrayfuncs.c:533
+#: utils/adt/arrayfuncs.c:554 utils/adt/arrayfuncs.c:584
+#: utils/adt/arrayfuncs.c:591 utils/adt/arrayfuncs.c:599
+#: utils/adt/arrayfuncs.c:633 utils/adt/arrayfuncs.c:656
+#: utils/adt/arrayfuncs.c:676 utils/adt/arrayfuncs.c:788
+#: utils/adt/arrayfuncs.c:797 utils/adt/arrayfuncs.c:827
+#: utils/adt/arrayfuncs.c:842 utils/adt/arrayfuncs.c:895
 #, c-format
 msgid "malformed array literal: \"%s\""
 msgstr "il letterale array non è definito in modo corretto: \"%s\""
 
-#: utils/adt/arrayfuncs.c:269
+#: utils/adt/arrayfuncs.c:272
 #, c-format
 msgid "\"[\" must introduce explicitly-specified array dimensions."
 msgstr "\"[\" deve introdurre un array con dimensioni specificate esplicitamente."
 
-#: utils/adt/arrayfuncs.c:283
+#: utils/adt/arrayfuncs.c:286
 #, c-format
 msgid "Missing array dimension value."
 msgstr "Valore delle dimensioni dell'array mancante."
 
-#: utils/adt/arrayfuncs.c:294 utils/adt/arrayfuncs.c:331
+#: utils/adt/arrayfuncs.c:297 utils/adt/arrayfuncs.c:334
 #, c-format
 msgid "Missing \"%s\" after array dimensions."
 msgstr "Manca \"%s\" dopo le dimensioni dell'array."
 
-#: utils/adt/arrayfuncs.c:303 utils/adt/arrayfuncs.c:2845
-#: utils/adt/arrayfuncs.c:2873 utils/adt/arrayfuncs.c:2888
+#: utils/adt/arrayfuncs.c:306 utils/adt/arrayfuncs.c:2848
+#: utils/adt/arrayfuncs.c:2876 utils/adt/arrayfuncs.c:2891
 #, c-format
 msgid "upper bound cannot be less than lower bound"
 msgstr "il limite massimo non può essere minore del limite minimo"
 
-#: utils/adt/arrayfuncs.c:316
+#: utils/adt/arrayfuncs.c:319
 #, c-format
 msgid "Array value must start with \"{\" or dimension information."
 msgstr "L'array deve iniziare con \"{\" oppure con le informazioni di dimensione."
 
-#: utils/adt/arrayfuncs.c:345
+#: utils/adt/arrayfuncs.c:348
 #, c-format
 msgid "Array contents must start with \"{\"."
 msgstr "Il contenuto dell'array deve cominciare con \"{\"."
 
-#: utils/adt/arrayfuncs.c:351 utils/adt/arrayfuncs.c:358
+#: utils/adt/arrayfuncs.c:354 utils/adt/arrayfuncs.c:361
 #, c-format
 msgid "Specified array dimensions do not match array contents."
 msgstr "Le dimensioni specificate per l'array non combaciano con il contenuto."
 
-#: utils/adt/arrayfuncs.c:489 utils/adt/arrayfuncs.c:516
-#: utils/adt/rangetypes.c:2111 utils/adt/rangetypes.c:2119
+#: utils/adt/arrayfuncs.c:492 utils/adt/arrayfuncs.c:519
+#: utils/adt/rangetypes.c:2124 utils/adt/rangetypes.c:2132
 #: utils/adt/rowtypes.c:208 utils/adt/rowtypes.c:216
 #, c-format
 msgid "Unexpected end of input."
 msgstr "L'input è terminato in modo inatteso."
 
-#: utils/adt/arrayfuncs.c:505 utils/adt/arrayfuncs.c:552
-#: utils/adt/arrayfuncs.c:582 utils/adt/arrayfuncs.c:631
+#: utils/adt/arrayfuncs.c:508 utils/adt/arrayfuncs.c:555
+#: utils/adt/arrayfuncs.c:585 utils/adt/arrayfuncs.c:634
 #, c-format
 msgid "Unexpected \"%c\" character."
 msgstr "Carattere \"%c\" inatteso."
 
-#: utils/adt/arrayfuncs.c:531 utils/adt/arrayfuncs.c:654
+#: utils/adt/arrayfuncs.c:534 utils/adt/arrayfuncs.c:657
 #, c-format
 msgid "Unexpected array element."
 msgstr "Elemento dell'array inatteso."
 
-#: utils/adt/arrayfuncs.c:589
+#: utils/adt/arrayfuncs.c:592
 #, c-format
 msgid "Unmatched \"%c\" character."
 msgstr "Il carattere \"%c\" non combacia."
 
-#: utils/adt/arrayfuncs.c:597
+#: utils/adt/arrayfuncs.c:600
 #, c-format
 msgid "Multidimensional arrays must have sub-arrays with matching dimensions."
 msgstr "Gli array multidimensionali devono avere sotto-array con dimensioni corrispondenti."
 
-#: utils/adt/arrayfuncs.c:674
+#: utils/adt/arrayfuncs.c:677
 #, c-format
 msgid "Junk after closing right brace."
 msgstr "Caratteri spuri dopo la parentesi chiusa."
 
-#: utils/adt/arrayfuncs.c:1295
+#: utils/adt/arrayfuncs.c:1298
 #, c-format
 msgid "invalid array flags"
 msgstr "i flag dell'array non sono validi"
 
-#: utils/adt/arrayfuncs.c:1303
+#: utils/adt/arrayfuncs.c:1306
 #, c-format
 msgid "wrong element type"
 msgstr "il tipo di elemento è errato"
 
-#: utils/adt/arrayfuncs.c:1353 utils/adt/rangetypes.c:325
+#: utils/adt/arrayfuncs.c:1356 utils/adt/rangetypes.c:334
 #: utils/cache/lsyscache.c:2586
 #, c-format
 msgid "no binary input function available for type %s"
 msgstr "non esiste una funzione di input binario per il tipo %s"
 
-#: utils/adt/arrayfuncs.c:1493
+#: utils/adt/arrayfuncs.c:1496
 #, c-format
 msgid "improper binary format in array element %d"
 msgstr "il formato binario nell'elemento dell'array %d non è corretto"
 
-#: utils/adt/arrayfuncs.c:1574 utils/adt/rangetypes.c:330
+#: utils/adt/arrayfuncs.c:1577 utils/adt/rangetypes.c:339
 #: utils/cache/lsyscache.c:2619
 #, c-format
 msgid "no binary output function available for type %s"
 msgstr "non esiste una funzione di output binario per il tipo %s"
 
-#: utils/adt/arrayfuncs.c:2045
+#: utils/adt/arrayfuncs.c:2048
 #, c-format
 msgid "slices of fixed-length arrays not implemented"
 msgstr "le sezioni di array a lunghezza fissa non sono implementate"
 
-#: utils/adt/arrayfuncs.c:2223 utils/adt/arrayfuncs.c:2245
-#: utils/adt/arrayfuncs.c:2294 utils/adt/arrayfuncs.c:2530
-#: utils/adt/arrayfuncs.c:2827 utils/adt/arrayfuncs.c:5715
-#: utils/adt/arrayfuncs.c:5747 utils/adt/arrayfuncs.c:5764
-#: utils/adt/json.c:2263 utils/adt/json.c:2338 utils/adt/jsonb.c:1382
-#: utils/adt/jsonb.c:1468 utils/adt/jsonfuncs.c:3522
-#: utils/adt/jsonfuncs.c:3567
+#: utils/adt/arrayfuncs.c:2226 utils/adt/arrayfuncs.c:2248
+#: utils/adt/arrayfuncs.c:2297 utils/adt/arrayfuncs.c:2533
+#: utils/adt/arrayfuncs.c:2830 utils/adt/arrayfuncs.c:5718
+#: utils/adt/arrayfuncs.c:5744 utils/adt/arrayfuncs.c:5755
+#: utils/adt/json.c:2290 utils/adt/json.c:2365 utils/adt/jsonb.c:1369
+#: utils/adt/jsonb.c:1455 utils/adt/jsonfuncs.c:3528 utils/adt/jsonfuncs.c:3573
 #, c-format
 msgid "wrong number of array subscripts"
 msgstr "il numero di indici di array è errato"
 
-#: utils/adt/arrayfuncs.c:2228 utils/adt/arrayfuncs.c:2336
-#: utils/adt/arrayfuncs.c:2594 utils/adt/arrayfuncs.c:2878
+#: utils/adt/arrayfuncs.c:2231 utils/adt/arrayfuncs.c:2339
+#: utils/adt/arrayfuncs.c:2597 utils/adt/arrayfuncs.c:2881
 #, c-format
 msgid "array subscript out of range"
 msgstr "indice dell'array fuori dall'intervallo"
 
-#: utils/adt/arrayfuncs.c:2233
+#: utils/adt/arrayfuncs.c:2236
 #, c-format
 msgid "cannot assign null value to an element of a fixed-length array"
 msgstr "non è possibile assegnare un valore nullo a un elemento di un array a dimensione fissa"
 
-#: utils/adt/arrayfuncs.c:2781
+#: utils/adt/arrayfuncs.c:2784
 #, c-format
 msgid "updates on slices of fixed-length arrays not implemented"
 msgstr "la modifica di sezioni di array a lunghezza fissa non è implementate"
 
-#: utils/adt/arrayfuncs.c:2817 utils/adt/arrayfuncs.c:2904
+#: utils/adt/arrayfuncs.c:2820 utils/adt/arrayfuncs.c:2907
 #, c-format
 msgid "source array too small"
 msgstr "l'array di origine è troppo piccolo"
 
-#: utils/adt/arrayfuncs.c:3484
+#: utils/adt/arrayfuncs.c:3487
 #, c-format
 msgid "null array element not allowed in this context"
 msgstr "in questo contesto non è consentito un elemento di array nullo"
 
-#: utils/adt/arrayfuncs.c:3586 utils/adt/arrayfuncs.c:3757
-#: utils/adt/arrayfuncs.c:4031
+#: utils/adt/arrayfuncs.c:3589 utils/adt/arrayfuncs.c:3760
+#: utils/adt/arrayfuncs.c:4034
 #, c-format
 msgid "cannot compare arrays of different element types"
 msgstr "non è possibile confrontare array con elementi di tipo diverso"
 
-#: utils/adt/arrayfuncs.c:3933 utils/adt/rangetypes.c:1240
+#: utils/adt/arrayfuncs.c:3936 utils/adt/rangetypes.c:1253
 #, c-format
 msgid "could not identify a hash function for type %s"
 msgstr "non è stato possibile trovare una funzione di hash per il tipo %s"
 
-#: utils/adt/arrayfuncs.c:5127
+#: utils/adt/arrayfuncs.c:5130
 #, c-format
 msgid "data type %s is not an array type"
 msgstr "il tipo di dati %s non è un tipo array"
 
-#: utils/adt/arrayfuncs.c:5184
+#: utils/adt/arrayfuncs.c:5187
 #, c-format
 msgid "cannot accumulate null arrays"
 msgstr "non è possibile accumulare array nulli"
 
-#: utils/adt/arrayfuncs.c:5212
+#: utils/adt/arrayfuncs.c:5215
 #, c-format
 msgid "cannot accumulate empty arrays"
 msgstr "non è possibile accumulare array vuoti"
 
-#: utils/adt/arrayfuncs.c:5241 utils/adt/arrayfuncs.c:5247
+#: utils/adt/arrayfuncs.c:5244 utils/adt/arrayfuncs.c:5250
 #, c-format
 msgid "cannot accumulate arrays of different dimensionality"
 msgstr "non è possibile accumulare array di dimensioni diverse"
 
-#: utils/adt/arrayfuncs.c:5613 utils/adt/arrayfuncs.c:5653
+#: utils/adt/arrayfuncs.c:5616 utils/adt/arrayfuncs.c:5656
 #, c-format
 msgid "dimension array or low bound array cannot be null"
 msgstr "la dimensione dell'array o il suo limite inferiore non possono essere nulli"
 
-#: utils/adt/arrayfuncs.c:5716 utils/adt/arrayfuncs.c:5748
+#: utils/adt/arrayfuncs.c:5719 utils/adt/arrayfuncs.c:5745
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "L'array delle dimensioni deve avere una sola dimensione."
 
-#: utils/adt/arrayfuncs.c:5721 utils/adt/arrayfuncs.c:5753
-#, c-format
-msgid "wrong range of array subscripts"
-msgstr "il range degli indici dell'array non è corretto"
-
-#: utils/adt/arrayfuncs.c:5722 utils/adt/arrayfuncs.c:5754
-#, c-format
-msgid "Lower bound of dimension array must be one."
-msgstr "Il valore minimo dell'array delle dimensioni deve essere uno."
-
-#: utils/adt/arrayfuncs.c:5727 utils/adt/arrayfuncs.c:5759
+#: utils/adt/arrayfuncs.c:5724 utils/adt/arrayfuncs.c:5750
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "i valori di dimensione non possono essere nulli"
 
-#: utils/adt/arrayfuncs.c:5765
+#: utils/adt/arrayfuncs.c:5756
 #, c-format
 msgid "Low bound array has different size than dimensions array."
 msgstr "L'array dei valori inferiori ha dimensione differente dal numero di dimensioni dell'array."
 
-#: utils/adt/arrayfuncs.c:6011
+#: utils/adt/arrayfuncs.c:6002
 #, c-format
 msgid "removing elements from multidimensional arrays is not supported"
 msgstr "la rimozione di elementi da array multidimensionali non è supportata"
 
-#: utils/adt/arrayfuncs.c:6288
+#: utils/adt/arrayfuncs.c:6279
 #, c-format
 msgid "thresholds must be one-dimensional array"
 msgstr "la soglia dev'essere un array monodimensionale"
 
-#: utils/adt/arrayfuncs.c:6293
+#: utils/adt/arrayfuncs.c:6284
 #, c-format
 msgid "thresholds array must not contain NULLs"
 msgstr "l'array delle soglie non può contenere NULL"
@@ -17017,13 +16988,13 @@
 
 #: utils/adt/cash.c:607 utils/adt/cash.c:657 utils/adt/cash.c:708
 #: utils/adt/cash.c:757 utils/adt/cash.c:809 utils/adt/cash.c:859
-#: utils/adt/float.c:788 utils/adt/float.c:852 utils/adt/float.c:2530
-#: utils/adt/float.c:2593 utils/adt/geo_ops.c:4152 utils/adt/int.c:719
+#: utils/adt/float.c:785 utils/adt/float.c:849 utils/adt/float.c:2527
+#: utils/adt/float.c:2590 utils/adt/geo_ops.c:4163 utils/adt/int.c:719
 #: utils/adt/int.c:861 utils/adt/int.c:969 utils/adt/int.c:1058
 #: utils/adt/int.c:1097 utils/adt/int.c:1125 utils/adt/int8.c:597
 #: utils/adt/int8.c:657 utils/adt/int8.c:897 utils/adt/int8.c:1005
-#: utils/adt/int8.c:1094 utils/adt/int8.c:1202 utils/adt/numeric.c:5911
-#: utils/adt/numeric.c:6194 utils/adt/timestamp.c:3350
+#: utils/adt/int8.c:1094 utils/adt/int8.c:1202 utils/adt/numeric.c:5920
+#: utils/adt/numeric.c:6203 utils/adt/timestamp.c:3448
 #, c-format
 msgid "division by zero"
 msgstr "divisione per zero"
@@ -17033,160 +17004,155 @@
 msgid "\"char\" out of range"
 msgstr "\"char\" fuori dall'intervallo consentito"
 
-#: utils/adt/date.c:68 utils/adt/timestamp.c:95 utils/adt/varbit.c:52
+#: utils/adt/date.c:67 utils/adt/timestamp.c:95 utils/adt/varbit.c:52
 #: utils/adt/varchar.c:44
 #, c-format
 msgid "invalid type modifier"
 msgstr "modificatore di tipo non valido"
 
-#: utils/adt/date.c:73
+#: utils/adt/date.c:72
 #, c-format
 msgid "TIME(%d)%s precision must not be negative"
 msgstr "la precisione di TIME(%d)%s non può essere negativa"
 
-#: utils/adt/date.c:79
+#: utils/adt/date.c:78
 #, c-format
 msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
 msgstr "la precisione di TIME(%d)%s è stata ridotta al massimo consentito (%d)"
 
-#: utils/adt/date.c:142 utils/adt/datetime.c:1208 utils/adt/datetime.c:2079
+#: utils/adt/date.c:141 utils/adt/datetime.c:1209 utils/adt/datetime.c:2122
 #, c-format
 msgid "date/time value \"current\" is no longer supported"
 msgstr "il valore \"current\" per i tipi date/time non è più supportato"
 
-#: utils/adt/date.c:167 utils/adt/formatting.c:3523
+#: utils/adt/date.c:166 utils/adt/formatting.c:3521
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "data fuori dall'intervallo consentito: \"%s\""
 
-#: utils/adt/date.c:217 utils/adt/xml.c:2029
+#: utils/adt/date.c:216 utils/adt/xml.c:2033
 #, c-format
 msgid "date out of range"
 msgstr "data fuori dall'intervallo consentito"
 
-#: utils/adt/date.c:259 utils/adt/timestamp.c:593
+#: utils/adt/date.c:258 utils/adt/timestamp.c:593
 #, c-format
 msgid "date field value out of range: %d-%02d-%02d"
 msgstr "valori del campo data fuori dall'intervallo consentito: %d-%02d-%02d"
 
-#: utils/adt/date.c:265 utils/adt/timestamp.c:599
+#: utils/adt/date.c:264 utils/adt/timestamp.c:599
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "data fuori dall'intervallo consentito: %d-%02d-%02d"
 
-#: utils/adt/date.c:418
+#: utils/adt/date.c:417
 #, c-format
 msgid "cannot subtract infinite dates"
 msgstr "non si possono sottrarre date infinite"
 
-#: utils/adt/date.c:475 utils/adt/date.c:512
+#: utils/adt/date.c:474 utils/adt/date.c:511
 #, c-format
 msgid "date out of range for timestamp"
 msgstr "data fuori dall'intervallo consentito per timestamp"
 
-#: utils/adt/date.c:971 utils/adt/date.c:1017 utils/adt/date.c:1617
-#: utils/adt/date.c:1653 utils/adt/date.c:2525 utils/adt/formatting.c:3399
-#: utils/adt/formatting.c:3431 utils/adt/formatting.c:3499
-#: utils/adt/json.c:1517 utils/adt/json.c:1544 utils/adt/jsonb.c:831
-#: utils/adt/jsonb.c:860 utils/adt/nabstime.c:455 utils/adt/nabstime.c:498
-#: utils/adt/nabstime.c:528 utils/adt/nabstime.c:571 utils/adt/timestamp.c:225
-#: utils/adt/timestamp.c:268 utils/adt/timestamp.c:717
-#: utils/adt/timestamp.c:746 utils/adt/timestamp.c:785
-#: utils/adt/timestamp.c:2939 utils/adt/timestamp.c:2960
-#: utils/adt/timestamp.c:2973 utils/adt/timestamp.c:2982
-#: utils/adt/timestamp.c:3039 utils/adt/timestamp.c:3062
-#: utils/adt/timestamp.c:3075 utils/adt/timestamp.c:3086
-#: utils/adt/timestamp.c:3611 utils/adt/timestamp.c:3740
-#: utils/adt/timestamp.c:3781 utils/adt/timestamp.c:3869
-#: utils/adt/timestamp.c:3915 utils/adt/timestamp.c:4026
-#: utils/adt/timestamp.c:4350 utils/adt/timestamp.c:4489
-#: utils/adt/timestamp.c:4499 utils/adt/timestamp.c:4561
-#: utils/adt/timestamp.c:4701 utils/adt/timestamp.c:4711
-#: utils/adt/timestamp.c:5006 utils/adt/timestamp.c:5020
-#: utils/adt/timestamp.c:5145 utils/adt/timestamp.c:5152
-#: utils/adt/timestamp.c:5178 utils/adt/timestamp.c:5182
-#: utils/adt/timestamp.c:5251 utils/adt/xml.c:2051 utils/adt/xml.c:2058
-#: utils/adt/xml.c:2078 utils/adt/xml.c:2085
+#: utils/adt/date.c:970 utils/adt/date.c:1016 utils/adt/date.c:1616
+#: utils/adt/date.c:1652 utils/adt/date.c:2524 utils/adt/datetime.c:1690
+#: utils/adt/formatting.c:3397 utils/adt/formatting.c:3429
+#: utils/adt/formatting.c:3497 utils/adt/json.c:1534 utils/adt/json.c:1556
+#: utils/adt/jsonb.c:823 utils/adt/jsonb.c:847 utils/adt/nabstime.c:455
+#: utils/adt/nabstime.c:498 utils/adt/nabstime.c:528 utils/adt/nabstime.c:571
+#: utils/adt/timestamp.c:225 utils/adt/timestamp.c:268
+#: utils/adt/timestamp.c:717 utils/adt/timestamp.c:746
+#: utils/adt/timestamp.c:785 utils/adt/timestamp.c:3037
+#: utils/adt/timestamp.c:3058 utils/adt/timestamp.c:3071
+#: utils/adt/timestamp.c:3080 utils/adt/timestamp.c:3137
+#: utils/adt/timestamp.c:3160 utils/adt/timestamp.c:3173
+#: utils/adt/timestamp.c:3184 utils/adt/timestamp.c:3709
+#: utils/adt/timestamp.c:3838 utils/adt/timestamp.c:3879
+#: utils/adt/timestamp.c:3967 utils/adt/timestamp.c:4013
+#: utils/adt/timestamp.c:4124 utils/adt/timestamp.c:4448
+#: utils/adt/timestamp.c:4564 utils/adt/timestamp.c:4574
+#: utils/adt/timestamp.c:4659 utils/adt/timestamp.c:4778
+#: utils/adt/timestamp.c:4788 utils/adt/timestamp.c:5035
+#: utils/adt/timestamp.c:5049 utils/adt/timestamp.c:5140
+#: utils/adt/timestamp.c:5147 utils/adt/timestamp.c:5173
+#: utils/adt/timestamp.c:5177 utils/adt/timestamp.c:5246 utils/adt/xml.c:2055
+#: utils/adt/xml.c:2062 utils/adt/xml.c:2082 utils/adt/xml.c:2089
 #, c-format
 msgid "timestamp out of range"
 msgstr "timestamp fuori dall'intervallo consentito"
 
-#: utils/adt/date.c:1043
+#: utils/adt/date.c:1042
 #, c-format
 msgid "cannot convert reserved abstime value to date"
 msgstr "non è possibile convertire un valore speciale per abstime in una data"
 
-#: utils/adt/date.c:1197 utils/adt/date.c:1204 utils/adt/date.c:2015
-#: utils/adt/date.c:2022
+#: utils/adt/date.c:1196 utils/adt/date.c:1203 utils/adt/date.c:2014
+#: utils/adt/date.c:2021
 #, c-format
 msgid "time out of range"
 msgstr "ora fuori dall'intervallo consentito"
 
-#: utils/adt/date.c:1265 utils/adt/timestamp.c:618
+#: utils/adt/date.c:1264 utils/adt/timestamp.c:618
 #, c-format
 msgid "time field value out of range: %d:%02d:%02g"
 msgstr "campo temporale fuori dall'intervallo consentito: %d:%02d:%02g"
 
-#: utils/adt/date.c:1893 utils/adt/date.c:1910
+#: utils/adt/date.c:1892 utils/adt/date.c:1909
 #, c-format
 msgid "\"time\" units \"%s\" not recognized"
 msgstr "unità \"%s\" di \"time\" non è riconosciuta"
 
-#: utils/adt/date.c:2031
+#: utils/adt/date.c:2030
 #, c-format
 msgid "time zone displacement out of range"
 msgstr "la differenza di fuso orario è fuori dall'intervallo consentito"
 
-#: utils/adt/date.c:2655 utils/adt/date.c:2672
+#: utils/adt/date.c:2654 utils/adt/date.c:2671
 #, c-format
 msgid "\"time with time zone\" units \"%s\" not recognized"
 msgstr "unità \"%s\" di \"time with time zone\" non è riconosciuta"
 
-#: utils/adt/date.c:2745 utils/adt/datetime.c:925 utils/adt/datetime.c:1805
-#: utils/adt/datetime.c:4566 utils/adt/timestamp.c:532
-#: utils/adt/timestamp.c:559 utils/adt/timestamp.c:5032
-#: utils/adt/timestamp.c:5262
+#: utils/adt/date.c:2744 utils/adt/datetime.c:926 utils/adt/datetime.c:1848
+#: utils/adt/datetime.c:4609 utils/adt/timestamp.c:532
+#: utils/adt/timestamp.c:559 utils/adt/timestamp.c:5061
+#: utils/adt/timestamp.c:5257
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "fuso orario \"%s\" non riconosciuto"
 
-#: utils/adt/date.c:2785 utils/adt/timestamp.c:5103 utils/adt/timestamp.c:5288
+#: utils/adt/date.c:2784 utils/adt/timestamp.c:5098 utils/adt/timestamp.c:5283
 #, c-format
 msgid "interval time zone \"%s\" must not include months or days"
 msgstr "l'intervallo di fusi orari \"%s\" non può contenere mesi o giorni"
 
-#: utils/adt/datetime.c:1680
-#, c-format
-msgid "time zone abbreviation \"%s\" is not used in time zone \"%s\""
-msgstr "l'abbreviazione di fuso orario \"%s\" non è usata nel fuso orario \"%s\""
-
-#: utils/adt/datetime.c:3766 utils/adt/datetime.c:3773
+#: utils/adt/datetime.c:3809 utils/adt/datetime.c:3816
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "valore del campo date/time fuori dall'intervallo consentito: \"%s\""
 
-#: utils/adt/datetime.c:3775
+#: utils/adt/datetime.c:3818
 #, c-format
 msgid "Perhaps you need a different \"datestyle\" setting."
 msgstr "Forse è necessario impostare un \"datestyle\" diverso."
 
-#: utils/adt/datetime.c:3780
+#: utils/adt/datetime.c:3823
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "valore del campo interval fuori dall'intervallo consentito: \"%s\""
 
-#: utils/adt/datetime.c:3786
+#: utils/adt/datetime.c:3829
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "la differenza di fuso orario è fuori dall'intervallo consentito: \"%s\""
 
 #. translator: first %s is inet or cidr
-#: utils/adt/datetime.c:3793 utils/adt/network.c:58
+#: utils/adt/datetime.c:3836 utils/adt/network.c:58
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
 msgstr "sintassi di input non valida per il tipo %s: \"%s\""
 
-#: utils/adt/datetime.c:4568
+#: utils/adt/datetime.c:4611
 #, c-format
 msgid "This time zone name appears in the configuration file for time zone abbreviation \"%s\"."
 msgstr "Il nome del fuso orario figura nel file di configurazione delle abbreviazioni di fuso orario \"%s\"."
@@ -17201,7 +17167,7 @@
 msgid "could not open tablespace directory \"%s\": %m"
 msgstr "apertura della directory del tablespace \"%s\" fallita: %m"
 
-#: utils/adt/domains.c:85
+#: utils/adt/domains.c:86
 #, c-format
 msgid "type %s is not a domain"
 msgstr "il tipo %s non è un dominio"
@@ -17228,8 +17194,8 @@
 
 #: utils/adt/encode.c:307
 #, c-format
-msgid "invalid symbol '%c' while decoding base64 sequence"
-msgstr "simbolo '%c' inaspettato decodificando la sequenza base64"
+msgid "invalid symbol \"%c\" while decoding base64 sequence"
+msgstr "simbolo \"%c\" inaspettato decodificando la sequenza base64"
 
 #: utils/adt/encode.c:327
 #, c-format
@@ -17238,7 +17204,7 @@
 
 #: utils/adt/encode.c:328
 #, c-format
-msgid "Input data is missing padding, truncated, or otherwise corrupted."
+msgid "Input data is missing padding, is truncated, or is otherwise corrupted."
 msgstr "I dati di input mancano di padding, sono troncati o comunque corrotti."
 
 #: utils/adt/encode.c:442 utils/adt/encode.c:507 utils/adt/varlena.c:287
@@ -17279,83 +17245,83 @@
 msgid "value out of range: underflow"
 msgstr "il valore è fuori dall'intervallo consentito: underflow"
 
-#: utils/adt/float.c:218 utils/adt/float.c:292 utils/adt/float.c:316
+#: utils/adt/float.c:215 utils/adt/float.c:289 utils/adt/float.c:313
 #, c-format
 msgid "invalid input syntax for type real: \"%s\""
 msgstr "la sintassi in input per il tipo real non è valida: \"%s\""
 
-#: utils/adt/float.c:286
+#: utils/adt/float.c:283
 #, c-format
 msgid "\"%s\" is out of range for type real"
 msgstr "\"%s\" è fuori dall'intervallo consentito per il tipo real"
 
-#: utils/adt/float.c:417 utils/adt/float.c:491 utils/adt/float.c:515
-#: utils/adt/numeric.c:5373 utils/adt/numeric.c:5399
+#: utils/adt/float.c:414 utils/adt/float.c:488 utils/adt/float.c:512
+#: utils/adt/numeric.c:5376 utils/adt/numeric.c:5402
 #, c-format
 msgid "invalid input syntax for type double precision: \"%s\""
 msgstr "la sintassi in input per il tipo double precision non è valida: \"%s\""
 
-#: utils/adt/float.c:485
+#: utils/adt/float.c:482
 #, c-format
 msgid "\"%s\" is out of range for type double precision"
 msgstr "\"%s\" è fuori dall'intervallo consentito per il tipo double precision"
 
-#: utils/adt/float.c:1179 utils/adt/float.c:1237 utils/adt/int.c:349
+#: utils/adt/float.c:1176 utils/adt/float.c:1234 utils/adt/int.c:349
 #: utils/adt/int.c:775 utils/adt/int.c:804 utils/adt/int.c:825
 #: utils/adt/int.c:845 utils/adt/int.c:879 utils/adt/int.c:1174
-#: utils/adt/int8.c:1323 utils/adt/numeric.c:3000 utils/adt/numeric.c:3009
+#: utils/adt/int8.c:1323 utils/adt/numeric.c:2996 utils/adt/numeric.c:3005
 #, c-format
 msgid "smallint out of range"
 msgstr "il valore è fuori dall'intervallo consentito per il tipo smallint"
 
-#: utils/adt/float.c:1363 utils/adt/numeric.c:6587
+#: utils/adt/float.c:1360 utils/adt/numeric.c:6602
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "non è possibile estrarre la radice quadrata di un numero negativo"
 
-#: utils/adt/float.c:1405 utils/adt/numeric.c:2820
+#: utils/adt/float.c:1402 utils/adt/numeric.c:2816
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "zero elevato a potenza negativa non è definito"
 
-#: utils/adt/float.c:1409 utils/adt/numeric.c:2826
+#: utils/adt/float.c:1406 utils/adt/numeric.c:2822
 #, c-format
 msgid "a negative number raised to a non-integer power yields a complex result"
 msgstr "un numero negativo elevato a potenza non intera è un valore di tipo complesso"
 
-#: utils/adt/float.c:1475 utils/adt/float.c:1505 utils/adt/numeric.c:6805
+#: utils/adt/float.c:1472 utils/adt/float.c:1502 utils/adt/numeric.c:6820
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "non è possibile calcolare il logaritmo di zero"
 
-#: utils/adt/float.c:1479 utils/adt/float.c:1509 utils/adt/numeric.c:6809
+#: utils/adt/float.c:1476 utils/adt/float.c:1506 utils/adt/numeric.c:6824
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "non è possibile calcolare il logaritmo di un numero negativo"
 
-#: utils/adt/float.c:1536 utils/adt/float.c:1557 utils/adt/float.c:1578
-#: utils/adt/float.c:1600 utils/adt/float.c:1621 utils/adt/float.c:1642
-#: utils/adt/float.c:1664 utils/adt/float.c:1685
+#: utils/adt/float.c:1533 utils/adt/float.c:1554 utils/adt/float.c:1575
+#: utils/adt/float.c:1597 utils/adt/float.c:1618 utils/adt/float.c:1639
+#: utils/adt/float.c:1661 utils/adt/float.c:1682
 #, c-format
 msgid "input is out of range"
 msgstr "il valore di input è fuori dall'intervallo consentito"
 
-#: utils/adt/float.c:2747 utils/adt/numeric.c:1454
+#: utils/adt/float.c:2744 utils/adt/numeric.c:1450
 #, c-format
 msgid "count must be greater than zero"
 msgstr "il valore count dev'essere maggiore di zero"
 
-#: utils/adt/float.c:2752 utils/adt/numeric.c:1461
+#: utils/adt/float.c:2749 utils/adt/numeric.c:1457
 #, c-format
 msgid "operand, lower bound, and upper bound cannot be NaN"
 msgstr "l'operando e i valori minimo e massimo non possono essere NaN"
 
-#: utils/adt/float.c:2758
+#: utils/adt/float.c:2755
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "i valori minimo e massimo devono essere finiti"
 
-#: utils/adt/float.c:2796 utils/adt/numeric.c:1474
+#: utils/adt/float.c:2793 utils/adt/numeric.c:1470
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "il valore minimo non può essere uguale a quello massimo"
@@ -17370,203 +17336,203 @@
 msgid "Intervals are not tied to specific calendar dates."
 msgstr "Gli intervalli non sono legati a specifiche date di calendario."
 
-#: utils/adt/formatting.c:1059
+#: utils/adt/formatting.c:1058
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "\"EEEE\" dev'essere l'ultimo pattern usato"
 
-#: utils/adt/formatting.c:1067
+#: utils/adt/formatting.c:1066
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "\"9\" dev'essere più avanti di \"PR\""
 
-#: utils/adt/formatting.c:1083
+#: utils/adt/formatting.c:1082
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "\"0\" dev'essere più avanti di \"PR\""
 
-#: utils/adt/formatting.c:1110
+#: utils/adt/formatting.c:1109
 #, c-format
 msgid "multiple decimal points"
 msgstr "troppi punti decimali"
 
-#: utils/adt/formatting.c:1114 utils/adt/formatting.c:1197
+#: utils/adt/formatting.c:1113 utils/adt/formatting.c:1196
 #, c-format
 msgid "cannot use \"V\" and decimal point together"
 msgstr "non è possibile usare \"V\" ed un punto decimale insieme"
 
-#: utils/adt/formatting.c:1126
+#: utils/adt/formatting.c:1125
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "non è possibile usare \"S\" due volte"
 
-#: utils/adt/formatting.c:1130
+#: utils/adt/formatting.c:1129
 #, c-format
 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
 msgstr "non è possibile usare sia \"S\" che \"PL\"/\"MI\"/\"SG\"/\"PR\" insieme"
 
-#: utils/adt/formatting.c:1150
+#: utils/adt/formatting.c:1149
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "non è possibile usare sia \"S\" che \"MI\" insieme"
 
-#: utils/adt/formatting.c:1160
+#: utils/adt/formatting.c:1159
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "non è possibile usare sia \"S\" che \"PL\" insieme"
 
-#: utils/adt/formatting.c:1170
+#: utils/adt/formatting.c:1169
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "non è possibile usare sia \"S\" che \"SG\" insieme"
 
-#: utils/adt/formatting.c:1179
+#: utils/adt/formatting.c:1178
 #, c-format
 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
 msgstr "non è possibile usare sia \"PR\" che \"S\"/\"PL\"/\"MI\"/\"SG\" insieme"
 
-#: utils/adt/formatting.c:1205
+#: utils/adt/formatting.c:1204
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "non è possibile usare \"EEEE\" due volte"
 
-#: utils/adt/formatting.c:1211
+#: utils/adt/formatting.c:1210
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "\"EEEE\" non è compatibile con altri formati"
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1211
 #, c-format
 msgid "\"EEEE\" may only be used together with digit and decimal point patterns."
 msgstr "\"EEEE\" può essere usato soltanto insieme a pattern di cifre e punti decimali."
 
-#: utils/adt/formatting.c:1412
+#: utils/adt/formatting.c:1411
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "\"%s\" non è un numero"
 
-#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1512 utils/adt/formatting.c:1564
 #, c-format
 msgid "could not determine which collation to use for lower() function"
 msgstr "non è stato possibile determinare quale ordinamento usare per la funzione lower()"
 
-#: utils/adt/formatting.c:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1632 utils/adt/formatting.c:1684
 #, c-format
 msgid "could not determine which collation to use for upper() function"
 msgstr "non è stato possibile determinare quale ordinamento usare per la funzione upper()"
 
-#: utils/adt/formatting.c:1754 utils/adt/formatting.c:1818
+#: utils/adt/formatting.c:1753 utils/adt/formatting.c:1817
 #, c-format
 msgid "could not determine which collation to use for initcap() function"
 msgstr "non è stato possibile determinare quale ordinamento usare per la funzione initcap()"
 
-#: utils/adt/formatting.c:2122
+#: utils/adt/formatting.c:2114
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "la combinazione di convenzioni di date non è valida"
 
-#: utils/adt/formatting.c:2123
+#: utils/adt/formatting.c:2115
 #, c-format
 msgid "Do not mix Gregorian and ISO week date conventions in a formatting template."
 msgstr "Non è possibile usare la convenzione gregoriana e ISO per settimane in un modello di formattazione."
 
-#: utils/adt/formatting.c:2140
+#: utils/adt/formatting.c:2132
 #, c-format
 msgid "conflicting values for \"%s\" field in formatting string"
 msgstr "sono presenti valori contraddittori per il campo \"%s\" nella stringa di formattazione"
 
-#: utils/adt/formatting.c:2142
+#: utils/adt/formatting.c:2134
 #, c-format
 msgid "This value contradicts a previous setting for the same field type."
 msgstr "Questo valore contraddice una impostazione precedente per lo stesso tipo di campo"
 
-#: utils/adt/formatting.c:2203
+#: utils/adt/formatting.c:2195
 #, c-format
 msgid "source string too short for \"%s\" formatting field"
 msgstr "la stringa di origine è troppo corta per il campo di formattazione \"%s\""
 
-#: utils/adt/formatting.c:2205
+#: utils/adt/formatting.c:2197
 #, c-format
 msgid "Field requires %d characters, but only %d remain."
 msgstr "Il campo necessita di %d caratteri ma ne restano solo %d."
 
-#: utils/adt/formatting.c:2208 utils/adt/formatting.c:2222
+#: utils/adt/formatting.c:2200 utils/adt/formatting.c:2214
 #, c-format
 msgid "If your source string is not fixed-width, try using the \"FM\" modifier."
 msgstr "Se la stringa di partenza non ha lunghezza fissa, prova ad usare il modificatore \"FM\"."
 
-#: utils/adt/formatting.c:2218 utils/adt/formatting.c:2231
-#: utils/adt/formatting.c:2361
+#: utils/adt/formatting.c:2210 utils/adt/formatting.c:2223
+#: utils/adt/formatting.c:2353
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "valore \"%s\" per \"%s\" non valido"
 
-#: utils/adt/formatting.c:2220
+#: utils/adt/formatting.c:2212
 #, c-format
 msgid "Field requires %d characters, but only %d could be parsed."
 msgstr "Il campo necessita di %d caratteri, ma è stato possibile analizzarne solo %d."
 
-#: utils/adt/formatting.c:2233
+#: utils/adt/formatting.c:2225
 #, c-format
 msgid "Value must be an integer."
 msgstr "Il valore deve essere un integer."
 
-#: utils/adt/formatting.c:2238
+#: utils/adt/formatting.c:2230
 #, c-format
 msgid "value for \"%s\" in source string is out of range"
 msgstr "il valore \"%s\" nella stringa di origine è fuori dall'intervallo consentito"
 
-#: utils/adt/formatting.c:2240
+#: utils/adt/formatting.c:2232
 #, c-format
 msgid "Value must be in the range %d to %d."
 msgstr "Il valore deve essere compreso fra %d e %d."
 
-#: utils/adt/formatting.c:2363
+#: utils/adt/formatting.c:2355
 #, c-format
 msgid "The given value did not match any of the allowed values for this field."
 msgstr "Il valore fornito non corrisponde a nessuno di quelli consentiti per questo campo."
 
-#: utils/adt/formatting.c:2551 utils/adt/formatting.c:2571
-#: utils/adt/formatting.c:2591 utils/adt/formatting.c:2611
-#: utils/adt/formatting.c:2630 utils/adt/formatting.c:2649
-#: utils/adt/formatting.c:2672 utils/adt/formatting.c:2690
-#: utils/adt/formatting.c:2708 utils/adt/formatting.c:2726
-#: utils/adt/formatting.c:2743 utils/adt/formatting.c:2760
+#: utils/adt/formatting.c:2547 utils/adt/formatting.c:2567
+#: utils/adt/formatting.c:2587 utils/adt/formatting.c:2607
+#: utils/adt/formatting.c:2626 utils/adt/formatting.c:2645
+#: utils/adt/formatting.c:2668 utils/adt/formatting.c:2686
+#: utils/adt/formatting.c:2704 utils/adt/formatting.c:2722
+#: utils/adt/formatting.c:2739 utils/adt/formatting.c:2756
 #, c-format
 msgid "localized string format value too long"
 msgstr "valore del formato della stringa localizzata troppo lungo"
 
-#: utils/adt/formatting.c:3044
+#: utils/adt/formatting.c:3040
 #, c-format
 msgid "\"TZ\"/\"tz\"/\"OF\" format patterns are not supported in to_date"
 msgstr "i pattern di formato \"TZ\"/\"tz\"/\"OF\" non sono supportati in to_date"
 
-#: utils/adt/formatting.c:3152
+#: utils/adt/formatting.c:3149
 #, c-format
 msgid "invalid input string for \"Y,YYY\""
 msgstr "stringa di input non valida per \"Y,YYY\""
 
-#: utils/adt/formatting.c:3655
+#: utils/adt/formatting.c:3653
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
 msgstr "l'ora \"%d\" non è valida su un orologio a 12 ore"
 
-#: utils/adt/formatting.c:3657
+#: utils/adt/formatting.c:3655
 #, c-format
 msgid "Use the 24-hour clock, or give an hour between 1 and 12."
 msgstr "Usa l'orologio a 24 ore o fornisci un'ora compresa fra 1 e 12."
 
-#: utils/adt/formatting.c:3752
+#: utils/adt/formatting.c:3750
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "non è possibile calcolare il giorno dell'anno senza informazioni sull'anno"
 
-#: utils/adt/formatting.c:4601
+#: utils/adt/formatting.c:4599
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "l'uso di \"EEEE\" non è supportato per l'input"
 
-#: utils/adt/formatting.c:4613
+#: utils/adt/formatting.c:4611
 #, c-format
 msgid "\"RN\" not supported for input"
 msgstr "l'uso di \"RN\" non è supportato per l'input"
@@ -17613,129 +17579,129 @@
 msgid "must be superuser to get directory listings"
 msgstr "solo un superutente può elencare il contenuto della directory"
 
-#: utils/adt/geo_ops.c:300 utils/adt/geo_ops.c:1399 utils/adt/geo_ops.c:3497
-#: utils/adt/geo_ops.c:4312 utils/adt/geo_ops.c:5256
+#: utils/adt/geo_ops.c:301 utils/adt/geo_ops.c:1400 utils/adt/geo_ops.c:3506
+#: utils/adt/geo_ops.c:4323 utils/adt/geo_ops.c:5267
 #, c-format
 msgid "too many points requested"
 msgstr "il numero di punti richiesti è eccessivo"
 
-#: utils/adt/geo_ops.c:323
+#: utils/adt/geo_ops.c:324
 #, c-format
 msgid "could not format \"path\" value"
 msgstr "formattazione del valore \"path\" fallita"
 
-#: utils/adt/geo_ops.c:398
+#: utils/adt/geo_ops.c:399
 #, c-format
 msgid "invalid input syntax for type box: \"%s\""
 msgstr "sintassi di input non valida per il tipo box: \"%s\""
 
-#: utils/adt/geo_ops.c:993
+#: utils/adt/geo_ops.c:994
 #, c-format
 msgid "invalid line specification: must be two distinct points"
 msgstr "specificazione di linea non valida: devono essere due punti distinti"
 
-#: utils/adt/geo_ops.c:1002
+#: utils/adt/geo_ops.c:1003
 #, c-format
 msgid "invalid line specification: A and B cannot both be zero"
 msgstr "specificazione di linea non valida: A e B non possono essere entrambi zero"
 
-#: utils/adt/geo_ops.c:1007
+#: utils/adt/geo_ops.c:1008
 #, c-format
 msgid "invalid input syntax for type line: \"%s\""
 msgstr "sintassi di input non valida per il tipo line: \"%s\""
 
-#: utils/adt/geo_ops.c:1379 utils/adt/geo_ops.c:1410
+#: utils/adt/geo_ops.c:1380 utils/adt/geo_ops.c:1411
 #, c-format
 msgid "invalid input syntax for type path: \"%s\""
 msgstr "sintassi di input non valida per il tipo path: \"%s\""
 
-#: utils/adt/geo_ops.c:1449
+#: utils/adt/geo_ops.c:1450
 #, c-format
 msgid "invalid number of points in external \"path\" value"
 msgstr "il numero di punti nel valore del \"path\" esterno non è valido"
 
-#: utils/adt/geo_ops.c:1792
+#: utils/adt/geo_ops.c:1793
 #, c-format
 msgid "invalid input syntax for type point: \"%s\""
 msgstr "sintassi di input non valida per il tipo point: \"%s\""
 
-#: utils/adt/geo_ops.c:2020
+#: utils/adt/geo_ops.c:2021
 #, c-format
 msgid "invalid input syntax for type lseg: \"%s\""
 msgstr "sintassi di input non valida per il tipo lseg: \"%s\""
 
-#: utils/adt/geo_ops.c:2620
+#: utils/adt/geo_ops.c:2621
 #, c-format
 msgid "function \"dist_lb\" not implemented"
 msgstr "la funzione \"dist_lb\" non è implementata"
 
-#: utils/adt/geo_ops.c:3072
+#: utils/adt/geo_ops.c:3081
 #, c-format
 msgid "function \"close_sl\" not implemented"
 msgstr "la funzione \"close_sl\" non è implementata"
 
-#: utils/adt/geo_ops.c:3174
+#: utils/adt/geo_ops.c:3183
 #, c-format
 msgid "function \"close_lb\" not implemented"
 msgstr "la funzione \"close_lb\" non è implementata"
 
-#: utils/adt/geo_ops.c:3463
+#: utils/adt/geo_ops.c:3472
 #, c-format
 msgid "cannot create bounding box for empty polygon"
 msgstr "non è possibile creare un bounding box per il poligono vuoto"
 
-#: utils/adt/geo_ops.c:3488 utils/adt/geo_ops.c:3508
+#: utils/adt/geo_ops.c:3497 utils/adt/geo_ops.c:3517
 #, c-format
 msgid "invalid input syntax for type polygon: \"%s\""
 msgstr "sintassi di input non valida per il tipo polygon: \"%s\""
 
-#: utils/adt/geo_ops.c:3548
+#: utils/adt/geo_ops.c:3557
 #, c-format
 msgid "invalid number of points in external \"polygon\" value"
 msgstr "il numero di punti nel valore \"polygon\" esterno non è valido"
 
-#: utils/adt/geo_ops.c:4071
+#: utils/adt/geo_ops.c:4082
 #, c-format
 msgid "function \"poly_distance\" not implemented"
 msgstr "la funzione \"poly_distance\" non è implementata"
 
-#: utils/adt/geo_ops.c:4424
+#: utils/adt/geo_ops.c:4435
 #, c-format
 msgid "function \"path_center\" not implemented"
 msgstr "la funzione \"path_center\" non è implementata"
 
-#: utils/adt/geo_ops.c:4441
+#: utils/adt/geo_ops.c:4452
 #, c-format
 msgid "open path cannot be converted to polygon"
 msgstr "un path aperto non può essere convertito in un poligono"
 
-#: utils/adt/geo_ops.c:4618 utils/adt/geo_ops.c:4628 utils/adt/geo_ops.c:4643
-#: utils/adt/geo_ops.c:4649
+#: utils/adt/geo_ops.c:4629 utils/adt/geo_ops.c:4639 utils/adt/geo_ops.c:4654
+#: utils/adt/geo_ops.c:4660
 #, c-format
 msgid "invalid input syntax for type circle: \"%s\""
 msgstr "sintassi di input non valida per il tipo circle: \"%s\""
 
-#: utils/adt/geo_ops.c:4671 utils/adt/geo_ops.c:4679
+#: utils/adt/geo_ops.c:4682 utils/adt/geo_ops.c:4690
 #, c-format
 msgid "could not format \"circle\" value"
 msgstr "formattazione del valore \"circle\" fallita"
 
-#: utils/adt/geo_ops.c:4706
+#: utils/adt/geo_ops.c:4717
 #, c-format
 msgid "invalid radius in external \"circle\" value"
 msgstr "il raggio nel valore esterno di \"circle\" non è valido"
 
-#: utils/adt/geo_ops.c:5242
+#: utils/adt/geo_ops.c:5253
 #, c-format
 msgid "cannot convert circle with radius zero to polygon"
 msgstr "non è possibile convertire un cerchio con raggio nullo in un poligono"
 
-#: utils/adt/geo_ops.c:5247
+#: utils/adt/geo_ops.c:5258
 #, c-format
 msgid "must request at least 2 points"
 msgstr "devono essere richiesti almeno 2 punti"
 
-#: utils/adt/geo_ops.c:5291
+#: utils/adt/geo_ops.c:5302
 #, c-format
 msgid "cannot convert empty polygon to circle"
 msgstr "non è possibile convertire un poligono vuoto in un cerchio"
@@ -17755,8 +17721,8 @@
 msgid "oidvector has too many elements"
 msgstr "ci sono troppi elementi nell'oidvector"
 
-#: utils/adt/int.c:1362 utils/adt/int8.c:1460 utils/adt/numeric.c:1362
-#: utils/adt/timestamp.c:5349 utils/adt/timestamp.c:5430
+#: utils/adt/int.c:1362 utils/adt/int8.c:1460 utils/adt/numeric.c:1358
+#: utils/adt/timestamp.c:5344 utils/adt/timestamp.c:5425
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "il valore del passo non può essere uguale a zero"
@@ -17780,8 +17746,8 @@
 #: utils/adt/int8.c:964 utils/adt/int8.c:991 utils/adt/int8.c:1031
 #: utils/adt/int8.c:1052 utils/adt/int8.c:1079 utils/adt/int8.c:1112
 #: utils/adt/int8.c:1140 utils/adt/int8.c:1161 utils/adt/int8.c:1188
-#: utils/adt/int8.c:1361 utils/adt/int8.c:1400 utils/adt/numeric.c:2955
-#: utils/adt/varbit.c:1645
+#: utils/adt/int8.c:1361 utils/adt/int8.c:1400 utils/adt/numeric.c:2951
+#: utils/adt/varbit.c:1655
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint fuori dall'intervallo consentito"
@@ -17791,196 +17757,200 @@
 msgid "OID out of range"
 msgstr "OID fuori dall'intervallo consentito"
 
-#: utils/adt/json.c:767 utils/adt/json.c:807 utils/adt/json.c:822
-#: utils/adt/json.c:833 utils/adt/json.c:843 utils/adt/json.c:894
-#: utils/adt/json.c:925 utils/adt/json.c:943 utils/adt/json.c:955
-#: utils/adt/json.c:967 utils/adt/json.c:1106 utils/adt/json.c:1120
-#: utils/adt/json.c:1131 utils/adt/json.c:1139 utils/adt/json.c:1147
+#: utils/adt/json.c:785 utils/adt/json.c:825 utils/adt/json.c:840
+#: utils/adt/json.c:851 utils/adt/json.c:861 utils/adt/json.c:912
+#: utils/adt/json.c:943 utils/adt/json.c:961 utils/adt/json.c:973
+#: utils/adt/json.c:985 utils/adt/json.c:1130 utils/adt/json.c:1144
 #: utils/adt/json.c:1155 utils/adt/json.c:1163 utils/adt/json.c:1171
-#: utils/adt/json.c:1179 utils/adt/json.c:1187 utils/adt/json.c:1217
+#: utils/adt/json.c:1179 utils/adt/json.c:1187 utils/adt/json.c:1195
+#: utils/adt/json.c:1203 utils/adt/json.c:1211 utils/adt/json.c:1241
 #, c-format
 msgid "invalid input syntax for type json"
 msgstr "sintassi di input per il tipo json non valida"
 
-#: utils/adt/json.c:768
+#: utils/adt/json.c:786
 #, c-format
 msgid "Character with value 0x%02x must be escaped."
 msgstr "Il carattere con valore 0x%02x deve essere sottoposto ad escape."
 
-#: utils/adt/json.c:808
+#: utils/adt/json.c:826
 #, c-format
 msgid "\"\\u\" must be followed by four hexadecimal digits."
 msgstr "\"\\u\" deve essere seguito da quattro cifre esadecimali."
 
-#: utils/adt/json.c:823
+#: utils/adt/json.c:841
 #, c-format
 msgid "Unicode high surrogate must not follow a high surrogate."
 msgstr "un carattere surrogato alto Unicode non può seguire un altro surrogato alto"
 
-#: utils/adt/json.c:834 utils/adt/json.c:844 utils/adt/json.c:895
-#: utils/adt/json.c:956 utils/adt/json.c:968
+#: utils/adt/json.c:852 utils/adt/json.c:862 utils/adt/json.c:913
+#: utils/adt/json.c:974 utils/adt/json.c:986
 #, c-format
 msgid "Unicode low surrogate must follow a high surrogate."
 msgstr "un carattere surrogato basso Unicode deve seguire un surrogato alto"
 
-#: utils/adt/json.c:859 utils/adt/json.c:882
+#: utils/adt/json.c:877 utils/adt/json.c:900
 #, c-format
 msgid "unsupported Unicode escape sequence"
 msgstr "sequenza di escape Unicode non supportata"
 
-#: utils/adt/json.c:860
+#: utils/adt/json.c:878
 #, c-format
 msgid "\\u0000 cannot be converted to text."
 msgstr "\\u0000 non può essere convertito in testo."
 
-#: utils/adt/json.c:883
+#: utils/adt/json.c:901
 #, c-format
 msgid "Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8."
 msgstr "i codici escape Unicode non possono essere usati per caratteri con codice superiore ad 007F quando l'encoding del server non è UTF8"
 
-#: utils/adt/json.c:926 utils/adt/json.c:944
+#: utils/adt/json.c:944 utils/adt/json.c:962
 #, c-format
 msgid "Escape sequence \"\\%s\" is invalid."
 msgstr "La sequenza di escape \"\\%s\" non è valida."
 
-#: utils/adt/json.c:1107
+#: utils/adt/json.c:1131
 #, c-format
 msgid "The input string ended unexpectedly."
 msgstr "La stringa di input è terminata inaspettatamente."
 
-#: utils/adt/json.c:1121
+#: utils/adt/json.c:1145
 #, c-format
 msgid "Expected end of input, but found \"%s\"."
 msgstr "Era prevista la fine dell'input, trovato \"%s\" invece."
 
-#: utils/adt/json.c:1132
+#: utils/adt/json.c:1156
 #, c-format
 msgid "Expected JSON value, but found \"%s\"."
 msgstr "Era previsto un valore JSON, trovato \"%s\" invece."
 
-#: utils/adt/json.c:1140 utils/adt/json.c:1188
+#: utils/adt/json.c:1164 utils/adt/json.c:1212
 #, c-format
 msgid "Expected string, but found \"%s\"."
 msgstr "Era prevista una stringa, trovato \"%s\" invece."
 
-#: utils/adt/json.c:1148
+#: utils/adt/json.c:1172
 #, c-format
 msgid "Expected array element or \"]\", but found \"%s\"."
 msgstr "Era previsto un elemento di array oppure \"]\", trovato \"%s\" invece."
 
-#: utils/adt/json.c:1156
+#: utils/adt/json.c:1180
 #, c-format
 msgid "Expected \",\" or \"]\", but found \"%s\"."
 msgstr "Era previsto \",\" oppure \"]\", trovato \"%s\" invece."
 
-#: utils/adt/json.c:1164
+#: utils/adt/json.c:1188
 #, c-format
 msgid "Expected string or \"}\", but found \"%s\"."
 msgstr "Era prevista una stringa oppure \"}\", trovato \"%s\" invece."
 
-#: utils/adt/json.c:1172
+#: utils/adt/json.c:1196
 #, c-format
 msgid "Expected \":\", but found \"%s\"."
 msgstr "Era previsto \":\", trovato \"%s\" invece."
 
-#: utils/adt/json.c:1180
+#: utils/adt/json.c:1204
 #, c-format
 msgid "Expected \",\" or \"}\", but found \"%s\"."
 msgstr "Era previsto \",\" oppure \"}\", trovato \"%s\" invece."
 
-#: utils/adt/json.c:1218
+#: utils/adt/json.c:1242
 #, c-format
 msgid "Token \"%s\" is invalid."
 msgstr "Il token \"%s\" non è valido."
 
-#: utils/adt/json.c:1290
+#: utils/adt/json.c:1314
 #, c-format
 msgid "JSON data, line %d: %s%s%s"
 msgstr "dati JSON, riga %d: %s%s%s"
 
-#: utils/adt/json.c:1443
+#: utils/adt/json.c:1469 utils/adt/jsonb.c:724
 #, c-format
 msgid "key value must be scalar, not array, composite, or json"
 msgstr "la chiave deve essere uno scalare, non array, composito né json"
 
-#: utils/adt/json.c:2003 utils/adt/json.c:2021 utils/adt/json.c:2115
-#: utils/adt/json.c:2136 utils/adt/json.c:2195
+#: utils/adt/json.c:2006
 #, c-format
-msgid "could not determine data type for argument %d"
-msgstr "impossibile determinare il tipo di dato per l'argomento %d"
+msgid "could not determine data type for argument 1"
+msgstr "impossibile determinare il tipo di dato per l'argomento 1"
+
+#: utils/adt/json.c:2016
+#, c-format
+msgid "could not determine data type for argument 2"
+msgstr "impossibile determinare il tipo di dato per l'argomento 2"
 
-#: utils/adt/json.c:2008 utils/adt/jsonb.c:1759
+#: utils/adt/json.c:2040 utils/adt/jsonb.c:1781
 #, c-format
 msgid "field name must not be null"
 msgstr "il nome del campo non può essere nullo"
 
-#: utils/adt/json.c:2090
+#: utils/adt/json.c:2117
 #, c-format
 msgid "argument list must have even number of elements"
 msgstr "la lista di argomenti deve avere un numero pari di elementi"
 
-#: utils/adt/json.c:2091
+#: utils/adt/json.c:2118
 #, c-format
 msgid "The arguments of json_build_object() must consist of alternating keys and values."
 msgstr "Gli argomenti di json_build_object() devono consistere in una serie alternata di chiavi e valori."
 
-#: utils/adt/json.c:2121
+#: utils/adt/json.c:2142 utils/adt/json.c:2163 utils/adt/json.c:2222
+#, c-format
+msgid "could not determine data type for argument %d"
+msgstr "impossibile determinare il tipo di dato per l'argomento %d"
+
+#: utils/adt/json.c:2148
 #, c-format
 msgid "argument %d cannot be null"
 msgstr "l'argomento %d non può essere nullo"
 
-#: utils/adt/json.c:2122
+#: utils/adt/json.c:2149
 #, c-format
 msgid "Object keys should be text."
 msgstr "Le chiavi degli oggetti devono essere testo."
 
-#: utils/adt/json.c:2257 utils/adt/jsonb.c:1376
+#: utils/adt/json.c:2284 utils/adt/jsonb.c:1363
 #, c-format
 msgid "array must have two columns"
 msgstr "l'array deve avere due colonne"
 
-#: utils/adt/json.c:2281 utils/adt/json.c:2365 utils/adt/jsonb.c:1400
-#: utils/adt/jsonb.c:1495
+#: utils/adt/json.c:2308 utils/adt/json.c:2392 utils/adt/jsonb.c:1387
+#: utils/adt/jsonb.c:1482
 #, c-format
 msgid "null value not allowed for object key"
 msgstr "valori null non ammessi per le chiavi di oggetti"
 
-#: utils/adt/json.c:2354 utils/adt/jsonb.c:1484
+#: utils/adt/json.c:2381 utils/adt/jsonb.c:1471
 #, c-format
 msgid "mismatched array dimensions"
 msgstr "le dimensioni degli array non combaciano"
 
-#: utils/adt/jsonb.c:256
+#: utils/adt/jsonb.c:257
 #, c-format
 msgid "string too long to represent as jsonb string"
 msgstr "la stringa è troppo lunga per essere rappresentata come stringa jsonb"
 
-#: utils/adt/jsonb.c:257
+#: utils/adt/jsonb.c:258
 #, c-format
 msgid "Due to an implementation restriction, jsonb strings cannot exceed %d bytes."
 msgstr "A causa di una restrizione nell'implementazione le stringhe jsonb non possono superare i %d byte."
 
-#: utils/adt/jsonb.c:720
+#: utils/adt/jsonb.c:1182
 #, c-format
-msgid "key value must be scalar, not array, composite or json"
-msgstr "il valore della chiave dev'essere scalare, non array, composito o json"
-
-#: utils/adt/jsonb.c:1189
-#, c-format
-msgid "invalid number or arguments: object must be matched key value pairs"
+msgid "invalid number of arguments: object must be matched key value pairs"
 msgstr "numero di argomenti non valido: gli oggetti devono essere coppie chiave-valore appaiate"
 
-#: utils/adt/jsonb.c:1203
+#: utils/adt/jsonb.c:1195
 #, c-format
-msgid "arg %d: key cannot be null"
+msgid "argument %d: key must not be null"
 msgstr "argomento %d: la chiave non può essere null"
 
-#: utils/adt/jsonb.c:1225 utils/adt/jsonb.c:1248 utils/adt/jsonb.c:1310
+#: utils/adt/jsonb.c:1214 utils/adt/jsonb.c:1237 utils/adt/jsonb.c:1297
 #, c-format
-msgid "arg %d: could not determine data type"
+msgid "argument %d: could not determine data type"
 msgstr "argomento %d: impossibile determinare il tipo di dati"
 
-#: utils/adt/jsonb.c:1837
+#: utils/adt/jsonb.c:1834
 #, c-format
 msgid "object keys must be strings"
 msgstr "le chiavi dell'oggetto devono essere stringhe"
@@ -18085,52 +18055,62 @@
 msgid "cannot call %s on an object"
 msgstr "non è possibile eseguire %s su un oggetto"
 
-#: utils/adt/jsonfuncs.c:3403 utils/adt/jsonfuncs.c:3456
+#: utils/adt/jsonfuncs.c:3409 utils/adt/jsonfuncs.c:3462
 #, c-format
 msgid "cannot delete from scalar"
 msgstr "non è possibile eliminare da uno scalare"
 
-#: utils/adt/jsonfuncs.c:3461
+#: utils/adt/jsonfuncs.c:3467
 #, c-format
-msgid "cannot delete from object using integer subscript"
+msgid "cannot delete from object using integer index"
 msgstr "non è possibile eliminare da un oggetto usando numeri interi come indici"
 
-#: utils/adt/jsonfuncs.c:3527
+#: utils/adt/jsonfuncs.c:3533
 #, c-format
 msgid "cannot set path in scalar"
 msgstr "non è possibile impostare un percorso in uno scalare"
 
-#: utils/adt/jsonfuncs.c:3572
+#: utils/adt/jsonfuncs.c:3578
 #, c-format
 msgid "cannot delete path in scalar"
 msgstr "non è possibile eliminare un percorso in uno scalare"
 
-#: utils/adt/jsonfuncs.c:3697
+#: utils/adt/jsonfuncs.c:3703
 #, c-format
 msgid "invalid concatenation of jsonb objects"
 msgstr "concatenazione invalida di oggetti jsonb"
 
-#: utils/adt/levenshtein.c:127
+#: utils/adt/jsonfuncs.c:3732
+#, c-format
+msgid "path element at position %d is null"
+msgstr "l'elemento di percorso in posizione %d è nullo"
+
+#: utils/adt/jsonfuncs.c:3888
+#, c-format
+msgid "path element at position %d is not an integer: \"%s\""
+msgstr "l'elemento di percorso in posizione %d non è un intero: \"%s\""
+
+#: utils/adt/levenshtein.c:133
 #, c-format
-msgid "argument exceeds the maximum length of %d bytes"
-msgstr "l'argomento supera la lunghezza massima di %d byte"
+msgid "levenshtein argument exceeds maximum length of %d characters"
+msgstr "L'argomento levenshtein supera la lunghezza massima di %d caratteri"
 
-#: utils/adt/like.c:211 utils/adt/selfuncs.c:5230
+#: utils/adt/like.c:212 utils/adt/selfuncs.c:5379
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "non è stato possibile determinare quale ordinamento usare per ILIKE"
 
-#: utils/adt/like_match.c:104 utils/adt/like_match.c:164
+#: utils/adt/like_match.c:107 utils/adt/like_match.c:167
 #, c-format
 msgid "LIKE pattern must not end with escape character"
 msgstr "i pattern per LIKE non possono terminare con un carattere di escape"
 
-#: utils/adt/like_match.c:289 utils/adt/regexp.c:698
+#: utils/adt/like_match.c:292 utils/adt/regexp.c:698
 #, c-format
 msgid "invalid escape string"
 msgstr "la stringa di escape non è valida"
 
-#: utils/adt/like_match.c:290 utils/adt/regexp.c:699
+#: utils/adt/like_match.c:293 utils/adt/regexp.c:699
 #, c-format
 msgid "Escape string must be empty or one character."
 msgstr "La stringa di escape deve essere vuota o contenere un solo carattere."
@@ -18158,12 +18138,12 @@
 #: utils/adt/misc.c:166
 #, c-format
 msgid "must be a superuser to cancel superuser query"
-msgstr "solo un superutente può cancellare la query di un superutente"
+msgstr "solo un superutente può annullare la query di un superutente"
 
 #: utils/adt/misc.c:171
 #, c-format
-msgid "must be a member of the role whose query is being cancelled"
-msgstr "occorre essere membro del ruolo la cui query deve essere cancellata"
+msgid "must be a member of the role whose query is being canceled"
+msgstr "occorre essere membro del ruolo la cui query deve essere annullata"
 
 #: utils/adt/misc.c:190
 #, c-format
@@ -18320,93 +18300,89 @@
 msgid "cannot subtract inet values of different sizes"
 msgstr "non è possibile sottrarre valori di tipo inet di dimensione diversa"
 
-#: utils/adt/numeric.c:549 utils/adt/numeric.c:576 utils/adt/numeric.c:4604
-#: utils/adt/numeric.c:4627 utils/adt/numeric.c:4651 utils/adt/numeric.c:4658
+#: utils/adt/numeric.c:549 utils/adt/numeric.c:576 utils/adt/numeric.c:4600
+#: utils/adt/numeric.c:4623 utils/adt/numeric.c:4647
 #, c-format
 msgid "invalid input syntax for type numeric: \"%s\""
 msgstr "la sintassi di input non è valida per il tipo numeric: \"%s\""
 
-#: utils/adt/numeric.c:766
-#, c-format
-msgid "invalid length in external \"numeric\" value"
-msgstr "la lunghezza nel valore \"numeric\" esterno non è valida"
-
-#: utils/adt/numeric.c:779
+#: utils/adt/numeric.c:775
 #, c-format
 msgid "invalid sign in external \"numeric\" value"
 msgstr "il segno nel valore \"numeric\" esterno non è valido"
 
-#: utils/adt/numeric.c:785
+#: utils/adt/numeric.c:781
 #, c-format
 msgid "invalid scale in external \"numeric\" value"
 msgstr "la scala nel valore \"numeric\" esterno non è valida"
 
-#: utils/adt/numeric.c:794
+#: utils/adt/numeric.c:790
 #, c-format
 msgid "invalid digit in external \"numeric\" value"
 msgstr "una delle cifre nel valore \"numeric\" esterno non è valida"
 
-#: utils/adt/numeric.c:985 utils/adt/numeric.c:999
+#: utils/adt/numeric.c:981 utils/adt/numeric.c:995
 #, c-format
 msgid "NUMERIC precision %d must be between 1 and %d"
 msgstr "la precisione di NUMERIC (%d) deve essere compresa fra 1 e %d"
 
-#: utils/adt/numeric.c:990
+#: utils/adt/numeric.c:986
 #, c-format
 msgid "NUMERIC scale %d must be between 0 and precision %d"
 msgstr "il numero di cifre decimali di NUMERIC (%d) deve essere compreso fra 0 e la precisione %d"
 
-#: utils/adt/numeric.c:1008
+#: utils/adt/numeric.c:1004
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "modificatore del tipo NUMERIC non valido"
 
-#: utils/adt/numeric.c:1340
+#: utils/adt/numeric.c:1336
 #, c-format
 msgid "start value cannot be NaN"
 msgstr "il valore d'inizio non può essere NaN"
 
-#: utils/adt/numeric.c:1345
+#: utils/adt/numeric.c:1341
 #, c-format
 msgid "stop value cannot be NaN"
 msgstr "il valore di fine non può essere NaN"
 
-#: utils/adt/numeric.c:1355
+#: utils/adt/numeric.c:1351
 #, c-format
 msgid "step size cannot be NaN"
 msgstr "la dimensione dell'intervallo non può essere NaN"
 
-#: utils/adt/numeric.c:2550 utils/adt/numeric.c:5104 utils/adt/numeric.c:7120
+#: utils/adt/numeric.c:2546 utils/adt/numeric.c:4662 utils/adt/numeric.c:5107
+#: utils/adt/numeric.c:7135
 #, c-format
 msgid "value overflows numeric format"
 msgstr "il valore causa un overflow nel formato numeric"
 
-#: utils/adt/numeric.c:2881
+#: utils/adt/numeric.c:2877
 #, c-format
 msgid "cannot convert NaN to integer"
 msgstr "non è possibile convertire NaN in un integer"
 
-#: utils/adt/numeric.c:2947
+#: utils/adt/numeric.c:2943
 #, c-format
 msgid "cannot convert NaN to bigint"
 msgstr "non è possibile convertire NaN in un bigint"
 
-#: utils/adt/numeric.c:2992
+#: utils/adt/numeric.c:2988
 #, c-format
 msgid "cannot convert NaN to smallint"
 msgstr "non è possibile convertire NaN in uno smallint"
 
-#: utils/adt/numeric.c:5174
+#: utils/adt/numeric.c:5177
 #, c-format
 msgid "numeric field overflow"
 msgstr "il campo numeric causa un overflow"
 
-#: utils/adt/numeric.c:5175
+#: utils/adt/numeric.c:5178
 #, c-format
 msgid "A field with precision %d, scale %d must round to an absolute value less than %s%d."
 msgstr "Un campo con precisione %d e %d cifre decimali deve arrotondarsi ad un valore assoluto inferiore a %s%d."
 
-#: utils/adt/numeric.c:6677
+#: utils/adt/numeric.c:6692
 #, c-format
 msgid "argument for function \"exp\" too big"
 msgstr "il valore dell'argomento per la funzione \"exp\" è troppo grande"
@@ -18467,37 +18443,37 @@
 msgid "percentile value %g is not between 0 and 1"
 msgstr "il valore percentile %g non è tra 0 e 1"
 
-#: utils/adt/pg_locale.c:911
+#: utils/adt/pg_locale.c:1029
 #, c-format
 msgid "Apply system library package updates."
 msgstr "Applica gli aggiornamenti ai pacchetti di sistema."
 
-#: utils/adt/pg_locale.c:1116
+#: utils/adt/pg_locale.c:1234
 #, c-format
 msgid "could not create locale \"%s\": %m"
 msgstr "creazione del locale \"%s\" fallita: %m"
 
-#: utils/adt/pg_locale.c:1119
+#: utils/adt/pg_locale.c:1237
 #, c-format
 msgid "The operating system could not find any locale data for the locale name \"%s\"."
 msgstr "Il sistema operativo non ha trovato dati di locale per il locale di nome \"%s\"."
 
-#: utils/adt/pg_locale.c:1206
+#: utils/adt/pg_locale.c:1324
 #, c-format
 msgid "collations with different collate and ctype values are not supported on this platform"
 msgstr "le collazioni con tipi diversi di ordinamento e ctype non sono supportati su questa piattaforma"
 
-#: utils/adt/pg_locale.c:1221
+#: utils/adt/pg_locale.c:1339
 #, c-format
 msgid "nondefault collations are not supported on this platform"
 msgstr "le collazioni non predefinite non sono supportate su questa piattaforma"
 
-#: utils/adt/pg_locale.c:1392
+#: utils/adt/pg_locale.c:1510
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "carattere multibyte non valido per il locale"
 
-#: utils/adt/pg_locale.c:1393
+#: utils/adt/pg_locale.c:1511
 #, c-format
 msgid "The server's LC_CTYPE locale is probably incompatible with the database encoding."
 msgstr "Il locale LC_CTYPE del server probabilmente non è compatibile con la codifica del database."
@@ -18646,74 +18622,74 @@
 #: utils/adt/pseudotypes.c:620 utils/adt/pseudotypes.c:646
 #, c-format
 msgid "cannot output a value of type %s"
-msgstr "non è possibile mostrare un valore del tipo %s"
+msgstr "non è possibile emettere un valore del tipo %s"
 
-#: utils/adt/rangetypes.c:396
+#: utils/adt/rangetypes.c:405
 #, c-format
 msgid "range constructor flags argument must not be null"
 msgstr "l'argomento flags del costruttore di un intervallo non può essere nullo"
 
-#: utils/adt/rangetypes.c:983
+#: utils/adt/rangetypes.c:992
 #, c-format
 msgid "result of range difference would not be contiguous"
 msgstr "il risultato della differenza di intervalli non sarebbe continuo"
 
-#: utils/adt/rangetypes.c:1044
+#: utils/adt/rangetypes.c:1053
 #, c-format
 msgid "result of range union would not be contiguous"
 msgstr "il risultato dell'unione di intervalli non sarebbe continuo"
 
-#: utils/adt/rangetypes.c:1530
+#: utils/adt/rangetypes.c:1543
 #, c-format
 msgid "range lower bound must be less than or equal to range upper bound"
 msgstr "il limite inferiore dell'intervallo dev'essere minore o uguale del limite superiore"
 
-#: utils/adt/rangetypes.c:1913 utils/adt/rangetypes.c:1926
-#: utils/adt/rangetypes.c:1940
+#: utils/adt/rangetypes.c:1926 utils/adt/rangetypes.c:1939
+#: utils/adt/rangetypes.c:1953
 #, c-format
 msgid "invalid range bound flags"
 msgstr "flag di limiti dell'intervallo non valido"
 
-#: utils/adt/rangetypes.c:1914 utils/adt/rangetypes.c:1927
-#: utils/adt/rangetypes.c:1941
+#: utils/adt/rangetypes.c:1927 utils/adt/rangetypes.c:1940
+#: utils/adt/rangetypes.c:1954
 #, c-format
 msgid "Valid values are \"[]\", \"[)\", \"(]\", and \"()\"."
 msgstr "I valori validi sono \"[]\", \"[)\", \"(]\" e \"()\"."
 
-#: utils/adt/rangetypes.c:2006 utils/adt/rangetypes.c:2023
-#: utils/adt/rangetypes.c:2036 utils/adt/rangetypes.c:2054
-#: utils/adt/rangetypes.c:2065 utils/adt/rangetypes.c:2109
-#: utils/adt/rangetypes.c:2117
+#: utils/adt/rangetypes.c:2019 utils/adt/rangetypes.c:2036
+#: utils/adt/rangetypes.c:2049 utils/adt/rangetypes.c:2067
+#: utils/adt/rangetypes.c:2078 utils/adt/rangetypes.c:2122
+#: utils/adt/rangetypes.c:2130
 #, c-format
 msgid "malformed range literal: \"%s\""
 msgstr "letterale di intervallo non definito correttamente: \"%s\""
 
-#: utils/adt/rangetypes.c:2008
+#: utils/adt/rangetypes.c:2021
 #, c-format
 msgid "Junk after \"empty\" key word."
 msgstr "Dati spuri dopo la parola chiave \"empty\"."
 
-#: utils/adt/rangetypes.c:2025
+#: utils/adt/rangetypes.c:2038
 #, c-format
 msgid "Missing left parenthesis or bracket."
 msgstr "Manca la parentesi aperta."
 
-#: utils/adt/rangetypes.c:2038
+#: utils/adt/rangetypes.c:2051
 #, c-format
 msgid "Missing comma after lower bound."
 msgstr "Manca la virgola dopo il limite inferiore."
 
-#: utils/adt/rangetypes.c:2056
+#: utils/adt/rangetypes.c:2069
 #, c-format
 msgid "Too many commas."
 msgstr "Troppe virgole."
 
-#: utils/adt/rangetypes.c:2067
+#: utils/adt/rangetypes.c:2080
 #, c-format
 msgid "Junk after right parenthesis or bracket."
 msgstr "Caratteri spuri dopo la parentesi chiusa."
 
-#: utils/adt/regexp.c:285 utils/adt/regexp.c:1288 utils/adt/varlena.c:3588
+#: utils/adt/regexp.c:285 utils/adt/regexp.c:1288 utils/adt/varlena.c:3601
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "l'espressione regolare %s è fallita"
@@ -18738,18 +18714,18 @@
 msgid "more than one operator named %s"
 msgstr "più di un operatore si chiama %s"
 
-#: utils/adt/regproc.c:774 utils/adt/regproc.c:815 gram.y:7253
+#: utils/adt/regproc.c:774 utils/adt/regproc.c:815 gram.y:7246
 #, c-format
 msgid "missing argument"
 msgstr "argomento mancante"
 
-#: utils/adt/regproc.c:775 utils/adt/regproc.c:816 gram.y:7254
+#: utils/adt/regproc.c:775 utils/adt/regproc.c:816 gram.y:7247
 #, c-format
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr "Usa NONE per indicare l'argomento mancante in un operatore unario."
 
-#: utils/adt/regproc.c:779 utils/adt/regproc.c:820 utils/adt/regproc.c:1962
-#: utils/adt/ruleutils.c:8060 utils/adt/ruleutils.c:8185
+#: utils/adt/regproc.c:779 utils/adt/regproc.c:820 utils/adt/regproc.c:2006
+#: utils/adt/ruleutils.c:8222 utils/adt/ruleutils.c:8347
 #, c-format
 msgid "too many arguments"
 msgstr "troppi argomenti"
@@ -18759,115 +18735,116 @@
 msgid "Provide two argument types for operator."
 msgstr "Fornisci due tipi di argomento per l'operatore."
 
-#: utils/adt/regproc.c:1797 utils/adt/regproc.c:1802 utils/adt/varlena.c:2859
-#: utils/adt/varlena.c:2864
+#: utils/adt/regproc.c:1594 utils/adt/regproc.c:1618 utils/adt/regproc.c:1715
+#: utils/adt/regproc.c:1739 utils/adt/regproc.c:1841 utils/adt/regproc.c:1846
+#: utils/adt/varlena.c:2872 utils/adt/varlena.c:2877
 #, c-format
 msgid "invalid name syntax"
 msgstr "la sintassi per il nome non è valida"
 
-#: utils/adt/regproc.c:1860
+#: utils/adt/regproc.c:1904
 #, c-format
 msgid "expected a left parenthesis"
 msgstr "era attesa un parentesi tonda aperta"
 
-#: utils/adt/regproc.c:1876
+#: utils/adt/regproc.c:1920
 #, c-format
 msgid "expected a right parenthesis"
 msgstr "era attesa un parentesi tonda chiusa"
 
-#: utils/adt/regproc.c:1895
+#: utils/adt/regproc.c:1939
 #, c-format
 msgid "expected a type name"
 msgstr "era atteso il nome di un tipo"
 
-#: utils/adt/regproc.c:1927
+#: utils/adt/regproc.c:1971
 #, c-format
 msgid "improper type name"
 msgstr "il nome del tipo non è corretto"
 
-#: utils/adt/ri_triggers.c:312 utils/adt/ri_triggers.c:369
-#: utils/adt/ri_triggers.c:788 utils/adt/ri_triggers.c:1011
-#: utils/adt/ri_triggers.c:1167 utils/adt/ri_triggers.c:1348
-#: utils/adt/ri_triggers.c:1513 utils/adt/ri_triggers.c:1689
-#: utils/adt/ri_triggers.c:1869 utils/adt/ri_triggers.c:2060
-#: utils/adt/ri_triggers.c:2118 utils/adt/ri_triggers.c:2223
-#: utils/adt/ri_triggers.c:2400 gram.y:3332
+#: utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:371
+#: utils/adt/ri_triggers.c:790 utils/adt/ri_triggers.c:1013
+#: utils/adt/ri_triggers.c:1169 utils/adt/ri_triggers.c:1350
+#: utils/adt/ri_triggers.c:1515 utils/adt/ri_triggers.c:1691
+#: utils/adt/ri_triggers.c:1871 utils/adt/ri_triggers.c:2062
+#: utils/adt/ri_triggers.c:2120 utils/adt/ri_triggers.c:2225
+#: utils/adt/ri_triggers.c:2402 gram.y:3325
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "il MATCH PARTIAL non è stato ancora implementato"
 
-#: utils/adt/ri_triggers.c:341 utils/adt/ri_triggers.c:2488
-#: utils/adt/ri_triggers.c:3299
+#: utils/adt/ri_triggers.c:343 utils/adt/ri_triggers.c:2490
+#: utils/adt/ri_triggers.c:3315
 #, c-format
 msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
 msgstr "la INSERT o l'UPDATE sulla tabella \"%s\" viola il vincolo di chiave esterna \"%s\""
 
-#: utils/adt/ri_triggers.c:344 utils/adt/ri_triggers.c:2491
+#: utils/adt/ri_triggers.c:346 utils/adt/ri_triggers.c:2493
 #, c-format
 msgid "MATCH FULL does not allow mixing of null and nonnull key values."
 msgstr "MATCH FULL non consente l'uso di valori chiave nulli e non nulli insieme."
 
-#: utils/adt/ri_triggers.c:2730
+#: utils/adt/ri_triggers.c:2732
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr "la funzione \"%s\" deve essere eseguita per un INSERT"
 
-#: utils/adt/ri_triggers.c:2736
+#: utils/adt/ri_triggers.c:2738
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr "la funzione \"%s\" deve essere eseguita per un UPDATE"
 
-#: utils/adt/ri_triggers.c:2742
+#: utils/adt/ri_triggers.c:2744
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr "la funzione \"%s\" deve essere eseguita per una DELETE"
 
-#: utils/adt/ri_triggers.c:2765
+#: utils/adt/ri_triggers.c:2767
 #, c-format
 msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
 msgstr "non ci sono elementi pg_constraint per il trigger \"%s\" sulla tabella \"%s\""
 
-#: utils/adt/ri_triggers.c:2767
+#: utils/adt/ri_triggers.c:2769
 #, c-format
 msgid "Remove this referential integrity trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."
 msgstr "Rimuovi questo trigger di integrità referenziale e relativi elementi collegati, poi esegui ALTER TABLE ADD CONSTRAINT."
 
-#: utils/adt/ri_triggers.c:3209
+#: utils/adt/ri_triggers.c:3225
 #, c-format
 msgid "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result"
 msgstr "la query di integrità referenziale su \"%s\" dal vincolo \"%s\" su \"%s\" ha restituito un risultato inatteso"
 
-#: utils/adt/ri_triggers.c:3213
+#: utils/adt/ri_triggers.c:3229
 #, c-format
 msgid "This is most likely due to a rule having rewritten the query."
 msgstr "Ciò è probabilmente dovuto ad una RULE che ha riscritto la query."
 
-#: utils/adt/ri_triggers.c:3303
+#: utils/adt/ri_triggers.c:3319
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr "La chiave (%s)=(%s) non è presente nella tabella \"%s\"."
 
-#: utils/adt/ri_triggers.c:3306
+#: utils/adt/ri_triggers.c:3322
 #, c-format
 msgid "Key is not present in table \"%s\"."
 msgstr "La chiave non è presente nella tabella \"%s\"."
 
-#: utils/adt/ri_triggers.c:3312
+#: utils/adt/ri_triggers.c:3328
 #, c-format
 msgid "update or delete on table \"%s\" violates foreign key constraint \"%s\" on table \"%s\""
 msgstr "l'istruzione UPDATE o DELETE sulla tabella \"%s\" viola il vincolo di chiave esterna \"%s\" sulla tabella \"%s\""
 
-#: utils/adt/ri_triggers.c:3317
+#: utils/adt/ri_triggers.c:3333
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr "La chiave (%s)=(%s) è ancora referenziata dalla tabella \"%s\"."
 
-#: utils/adt/ri_triggers.c:3320
+#: utils/adt/ri_triggers.c:3336
 #, c-format
 msgid "Key is still referenced from table \"%s\"."
 msgstr "La chiave è ancora referenziata dalla tabella \"%s\"."
 
-#: utils/adt/rowtypes.c:102 utils/adt/rowtypes.c:477
+#: utils/adt/rowtypes.c:103 utils/adt/rowtypes.c:479
 #, c-format
 msgid "input of anonymous composite types is not implemented"
 msgstr "l'input di un tipo composito anonimo non è implementato"
@@ -18898,44 +18875,44 @@
 msgid "Junk after right parenthesis."
 msgstr "Sono presenti caratteri spuri dopo la parentesi chiusa."
 
-#: utils/adt/rowtypes.c:526
+#: utils/adt/rowtypes.c:528
 #, c-format
 msgid "wrong number of columns: %d, expected %d"
 msgstr "il numero di colonne non è corretto, %d invece di %d"
 
-#: utils/adt/rowtypes.c:553
+#: utils/adt/rowtypes.c:555
 #, c-format
 msgid "wrong data type: %u, expected %u"
 msgstr "il tipo di dati non è corretto, %u invece di %u"
 
-#: utils/adt/rowtypes.c:614
+#: utils/adt/rowtypes.c:616
 #, c-format
 msgid "improper binary format in record column %d"
 msgstr "il formato binario nella colonna %d del record non è corretto"
 
-#: utils/adt/rowtypes.c:896 utils/adt/rowtypes.c:1134
-#: utils/adt/rowtypes.c:1388 utils/adt/rowtypes.c:1665
+#: utils/adt/rowtypes.c:902 utils/adt/rowtypes.c:1142 utils/adt/rowtypes.c:1396
+#: utils/adt/rowtypes.c:1673
 #, c-format
 msgid "cannot compare dissimilar column types %s and %s at record column %d"
 msgstr "non è possibile confrontare i tipi di colonne dissimili %s e %s alla colonna %d del record"
 
-#: utils/adt/rowtypes.c:985 utils/adt/rowtypes.c:1205
-#: utils/adt/rowtypes.c:1521 utils/adt/rowtypes.c:1761
+#: utils/adt/rowtypes.c:991 utils/adt/rowtypes.c:1213 utils/adt/rowtypes.c:1529
+#: utils/adt/rowtypes.c:1769
 #, c-format
 msgid "cannot compare record types with different numbers of columns"
 msgstr "non è possibile confrontare tipi di record con diverso numero di colonne"
 
-#: utils/adt/ruleutils.c:4076
+#: utils/adt/ruleutils.c:4150
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "la regola \"%s\" ha un tipo di evento non supportato %d"
 
-#: utils/adt/selfuncs.c:5215
+#: utils/adt/selfuncs.c:5364
 #, c-format
 msgid "case insensitive matching not supported on type bytea"
 msgstr "il confronto case insensitive sul tipo bytea non è supportato"
 
-#: utils/adt/selfuncs.c:5318
+#: utils/adt/selfuncs.c:5467
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
 msgstr "il confronto con espressioni regolari sul tipo bytea non è supportato"
@@ -18996,15 +18973,15 @@
 msgid "timestamp out of range: %d-%02d-%02d %d:%02d:%02g"
 msgstr "timestamp fuori dall'intervallo consentito: %d-%02d-%02d %d:%02d:%02g"
 
-#: utils/adt/timestamp.c:912 utils/adt/timestamp.c:1483
-#: utils/adt/timestamp.c:1986 utils/adt/timestamp.c:3126
-#: utils/adt/timestamp.c:3131 utils/adt/timestamp.c:3136
-#: utils/adt/timestamp.c:3186 utils/adt/timestamp.c:3193
-#: utils/adt/timestamp.c:3200 utils/adt/timestamp.c:3220
-#: utils/adt/timestamp.c:3227 utils/adt/timestamp.c:3234
-#: utils/adt/timestamp.c:3263 utils/adt/timestamp.c:3270
-#: utils/adt/timestamp.c:3315 utils/adt/timestamp.c:3606
-#: utils/adt/timestamp.c:3735 utils/adt/timestamp.c:4126
+#: utils/adt/timestamp.c:912 utils/adt/timestamp.c:1536
+#: utils/adt/timestamp.c:2042 utils/adt/timestamp.c:3224
+#: utils/adt/timestamp.c:3229 utils/adt/timestamp.c:3234
+#: utils/adt/timestamp.c:3284 utils/adt/timestamp.c:3291
+#: utils/adt/timestamp.c:3298 utils/adt/timestamp.c:3318
+#: utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3332
+#: utils/adt/timestamp.c:3361 utils/adt/timestamp.c:3368
+#: utils/adt/timestamp.c:3413 utils/adt/timestamp.c:3704
+#: utils/adt/timestamp.c:3833 utils/adt/timestamp.c:4224
 #, c-format
 msgid "interval out of range"
 msgstr "il valore di interval è fuori dall'intervallo consentito"
@@ -19024,54 +19001,54 @@
 msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
 msgstr "la precisione di INTERVAL(%d) è stata ridotta al massimo consentito %d"
 
-#: utils/adt/timestamp.c:1427
+#: utils/adt/timestamp.c:1480
 #, c-format
 msgid "interval(%d) precision must be between %d and %d"
 msgstr "la precisione di INTERVAL(%d) deve essere compresa fra %d e %d"
 
-#: utils/adt/timestamp.c:2715
+#: utils/adt/timestamp.c:2813
 #, c-format
 msgid "cannot subtract infinite timestamps"
 msgstr "non è possibile sottrarre valori infiniti di TIMESTAMP"
 
-#: utils/adt/timestamp.c:3861 utils/adt/timestamp.c:4467
-#: utils/adt/timestamp.c:4507
+#: utils/adt/timestamp.c:3959 utils/adt/timestamp.c:4585
+#: utils/adt/timestamp.c:4605
 #, c-format
 msgid "timestamp units \"%s\" not supported"
 msgstr "unità \"%s\" di timestamp non supportata"
 
-#: utils/adt/timestamp.c:3875 utils/adt/timestamp.c:4517
+#: utils/adt/timestamp.c:3973 utils/adt/timestamp.c:4615
 #, c-format
 msgid "timestamp units \"%s\" not recognized"
 msgstr "unità \"%s\" di timestamp non riconosciuta"
 
-#: utils/adt/timestamp.c:4015 utils/adt/timestamp.c:4678
-#: utils/adt/timestamp.c:4719
+#: utils/adt/timestamp.c:4113 utils/adt/timestamp.c:4796
+#: utils/adt/timestamp.c:4817
 #, c-format
 msgid "timestamp with time zone units \"%s\" not supported"
 msgstr "unità \"%s\" di timestamp with time zone non supportata"
 
-#: utils/adt/timestamp.c:4032 utils/adt/timestamp.c:4728
+#: utils/adt/timestamp.c:4130 utils/adt/timestamp.c:4826
 #, c-format
 msgid "timestamp with time zone units \"%s\" not recognized"
 msgstr "unità \"%s\" di timestamp with time zone non riconosciuta"
 
-#: utils/adt/timestamp.c:4113
+#: utils/adt/timestamp.c:4211
 #, c-format
 msgid "interval units \"%s\" not supported because months usually have fractional weeks"
 msgstr "le unità di intervallo \"%s\" non sono supportate perché generalmente i mesi hanno settimane frazionali"
 
-#: utils/adt/timestamp.c:4119 utils/adt/timestamp.c:4834
+#: utils/adt/timestamp.c:4217 utils/adt/timestamp.c:4932
 #, c-format
 msgid "interval units \"%s\" not supported"
 msgstr "unità \"%s\" di interval non supportata"
 
-#: utils/adt/timestamp.c:4135 utils/adt/timestamp.c:4861
+#: utils/adt/timestamp.c:4233 utils/adt/timestamp.c:4959
 #, c-format
 msgid "interval units \"%s\" not recognized"
 msgstr "unità \"%s\" di interval non riconosciuta"
 
-#: utils/adt/timestamp.c:5025 utils/adt/timestamp.c:5255
+#: utils/adt/timestamp.c:5054 utils/adt/timestamp.c:5250
 #, c-format
 msgid "could not convert to time zone \"%s\""
 msgstr "conversione al fuso orario \"%s\" fallita"
@@ -19132,17 +19109,17 @@
 msgid "text-search query doesn't contain lexemes: \"%s\""
 msgstr "la query di ricerca di testo non contiene alcun lessema: \"%s\""
 
-#: utils/adt/tsquery.c:521 utils/adt/tsquery_util.c:340
+#: utils/adt/tsquery.c:521 utils/adt/tsquery_util.c:371
 #, c-format
 msgid "tsquery is too large"
 msgstr "tsquery troppo grande"
 
-#: utils/adt/tsquery_cleanup.c:284
+#: utils/adt/tsquery_cleanup.c:287
 #, c-format
 msgid "text-search query contains only stop words or doesn't contain lexemes, ignored"
 msgstr "la query di ricerca di testo contiene solo stop word o non contiene lessemi, ignorata"
 
-#: utils/adt/tsquery_rewrite.c:293
+#: utils/adt/tsquery_rewrite.c:322
 #, c-format
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "la query ts_rewrite deve restituire due colonne tsquery"
@@ -19177,42 +19154,42 @@
 msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
 msgstr "la lunghezza della stringa (%ld byte) eccede il massimo per un tsvector (%ld byte)"
 
-#: utils/adt/tsvector_op.c:1173
+#: utils/adt/tsvector_op.c:1174
 #, c-format
 msgid "ts_stat query must return one tsvector column"
 msgstr "la query ts_stat deve restituire una colonna tsvector"
 
-#: utils/adt/tsvector_op.c:1353
+#: utils/adt/tsvector_op.c:1354
 #, c-format
 msgid "tsvector column \"%s\" does not exist"
 msgstr "la colonna tsvector \"%s\" non esiste"
 
-#: utils/adt/tsvector_op.c:1359
+#: utils/adt/tsvector_op.c:1360
 #, c-format
 msgid "column \"%s\" is not of tsvector type"
 msgstr "la colonna \"%s\" non è di tipo tsvector"
 
-#: utils/adt/tsvector_op.c:1371
+#: utils/adt/tsvector_op.c:1372
 #, c-format
 msgid "configuration column \"%s\" does not exist"
 msgstr "la configurazione della colonna \"%s\" non esiste"
 
-#: utils/adt/tsvector_op.c:1377
+#: utils/adt/tsvector_op.c:1378
 #, c-format
 msgid "column \"%s\" is not of regconfig type"
 msgstr "la colonna \"%s\" non è di tipo regconfig"
 
-#: utils/adt/tsvector_op.c:1384
+#: utils/adt/tsvector_op.c:1385
 #, c-format
 msgid "configuration column \"%s\" must not be null"
 msgstr "la colonna di configurazione \"%s\" non può essere nulla"
 
-#: utils/adt/tsvector_op.c:1397
+#: utils/adt/tsvector_op.c:1398
 #, c-format
 msgid "text search configuration name \"%s\" must be schema-qualified"
 msgstr "la configurazione di ricerca di testo \"%s\" deve avere uno schema"
 
-#: utils/adt/tsvector_op.c:1422
+#: utils/adt/tsvector_op.c:1423
 #, c-format
 msgid "column \"%s\" is not of a character type"
 msgstr "la colonna \"%s\" non è di tipo carattere"
@@ -19288,8 +19265,8 @@
 msgstr "la stringa di bit è troppo lunga per il tipo bit varying(%d)"
 
 #: utils/adt/varbit.c:1066 utils/adt/varbit.c:1168 utils/adt/varlena.c:832
-#: utils/adt/varlena.c:896 utils/adt/varlena.c:1040 utils/adt/varlena.c:2510
-#: utils/adt/varlena.c:2577
+#: utils/adt/varlena.c:896 utils/adt/varlena.c:1040 utils/adt/varlena.c:2523
+#: utils/adt/varlena.c:2590
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "non è consentita una stringa con lunghezza negativa"
@@ -19309,12 +19286,12 @@
 msgid "cannot XOR bit strings of different sizes"
 msgstr "non è possibile eseguire lo XOR fra stringhe di bit di dimensioni diverse"
 
-#: utils/adt/varbit.c:1793 utils/adt/varbit.c:1851
+#: utils/adt/varbit.c:1803 utils/adt/varbit.c:1861
 #, c-format
 msgid "bit index %d out of valid range (0..%d)"
 msgstr "l'indice %d è fuori dall'intervallo valido (0..%d)"
 
-#: utils/adt/varbit.c:1802 utils/adt/varlena.c:2777
+#: utils/adt/varbit.c:1812 utils/adt/varlena.c:2790
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "il nuovo bit deve essere 0 o 1"
@@ -19344,48 +19321,48 @@
 msgid "could not compare Unicode strings: %m"
 msgstr "comparazione delle stringhe Unicode fallita: %m"
 
-#: utils/adt/varlena.c:2655 utils/adt/varlena.c:2686 utils/adt/varlena.c:2722
-#: utils/adt/varlena.c:2765
+#: utils/adt/varlena.c:2668 utils/adt/varlena.c:2699 utils/adt/varlena.c:2735
+#: utils/adt/varlena.c:2778
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "l'indice %d è fuori dall'intervallo valido, 0..%d"
 
-#: utils/adt/varlena.c:3684
+#: utils/adt/varlena.c:3697
 #, c-format
 msgid "field position must be greater than zero"
 msgstr "il campo deve essere maggiore di zero"
 
-#: utils/adt/varlena.c:4563
+#: utils/adt/varlena.c:4576
 #, c-format
 msgid "unterminated format specifier"
 msgstr "specificatore di formato non terminato"
 
-#: utils/adt/varlena.c:4695 utils/adt/varlena.c:4815
+#: utils/adt/varlena.c:4708 utils/adt/varlena.c:4828
 #, c-format
 msgid "unrecognized conversion type specifier \"%c\""
 msgstr "specificatore di tipo \"%c\" non riconosciuto"
 
-#: utils/adt/varlena.c:4707 utils/adt/varlena.c:4764
+#: utils/adt/varlena.c:4720 utils/adt/varlena.c:4777
 #, c-format
 msgid "too few arguments for format"
 msgstr "troppi pochi argomenti per il formato"
 
-#: utils/adt/varlena.c:4858 utils/adt/varlena.c:5041
+#: utils/adt/varlena.c:4871 utils/adt/varlena.c:5054
 #, c-format
 msgid "number is out of range"
 msgstr "il numero è al di fuori dell'intervallo consentito"
 
-#: utils/adt/varlena.c:4922 utils/adt/varlena.c:4950
+#: utils/adt/varlena.c:4935 utils/adt/varlena.c:4963
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr "il formato specifica l'argomento 0, ma gli argomenti sono numerati a partire da 1"
 
-#: utils/adt/varlena.c:4943
+#: utils/adt/varlena.c:4956
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "la posizione dell'argomento di larghezza deve finire con \"$\""
 
-#: utils/adt/varlena.c:4988
+#: utils/adt/varlena.c:5001
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "i valori vuoti non possono essere formattati come un identificativo SQL"
@@ -19400,141 +19377,141 @@
 msgid "argument of nth_value must be greater than zero"
 msgstr "l'argomento della funzione nth_value deve essere maggiore di zero"
 
-#: utils/adt/xml.c:171
+#: utils/adt/xml.c:175
 #, c-format
 msgid "unsupported XML feature"
 msgstr "caratteristica XML non supportata"
 
-#: utils/adt/xml.c:172
+#: utils/adt/xml.c:176
 #, c-format
 msgid "This functionality requires the server to be built with libxml support."
 msgstr "Per questa funzionalità è necessario che il server sia compilato con il supporto a libxml."
 
-#: utils/adt/xml.c:173
+#: utils/adt/xml.c:177
 #, c-format
 msgid "You need to rebuild PostgreSQL using --with-libxml."
 msgstr "Occorre configurare PostgreSQL con l'opzione --with-libxml e ricompilarlo."
 
-#: utils/adt/xml.c:192 utils/mb/mbutils.c:523
+#: utils/adt/xml.c:196 utils/mb/mbutils.c:523
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "nome di codifica non valido \"%s\""
 
-#: utils/adt/xml.c:435 utils/adt/xml.c:440
+#: utils/adt/xml.c:439 utils/adt/xml.c:444
 #, c-format
 msgid "invalid XML comment"
 msgstr "commento XML non valido"
 
-#: utils/adt/xml.c:569
+#: utils/adt/xml.c:573
 #, c-format
 msgid "not an XML document"
 msgstr "non è un documento XML"
 
-#: utils/adt/xml.c:728 utils/adt/xml.c:751
+#: utils/adt/xml.c:732 utils/adt/xml.c:755
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "istruzione di elaborazione XML non valida"
 
-#: utils/adt/xml.c:729
+#: utils/adt/xml.c:733
 #, c-format
 msgid "XML processing instruction target name cannot be \"%s\"."
 msgstr "Il nome di destinazione di un'istruzione di elaborazione XML non può essere \"%s\"."
 
-#: utils/adt/xml.c:752
+#: utils/adt/xml.c:756
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "Un'istruzione di elaborazione XML non può contenere \"?>\"."
 
-#: utils/adt/xml.c:831
+#: utils/adt/xml.c:835
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "la funzione xmlvalidate non è implementata"
 
-#: utils/adt/xml.c:910
+#: utils/adt/xml.c:914
 #, c-format
 msgid "could not initialize XML library"
 msgstr "inizializzazione della libreria XML fallita"
 
-#: utils/adt/xml.c:911
+#: utils/adt/xml.c:915
 #, c-format
 msgid "libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
 msgstr "La libreria libxml2 ha un tipo char non compatibile: sizeof(char)=%u, sizeof(xmlChar)=%u."
 
-#: utils/adt/xml.c:997
+#: utils/adt/xml.c:1001
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "impostazione del gestore di errori XML fallita"
 
-#: utils/adt/xml.c:998
+#: utils/adt/xml.c:1002
 #, c-format
 msgid "This probably indicates that the version of libxml2 being used is not compatible with the libxml2 header files that PostgreSQL was built with."
 msgstr "Questo vuol dire probabilmente che la versione di libxml2 in uso non è compatibile con i file di header libxml2 con cui PostgreSQL è stato compilato."
 
-#: utils/adt/xml.c:1737
+#: utils/adt/xml.c:1741
 msgid "Invalid character value."
 msgstr "Valore di carattere non valido."
 
-#: utils/adt/xml.c:1740
+#: utils/adt/xml.c:1744
 msgid "Space required."
 msgstr "È necessario uno spazio."
 
-#: utils/adt/xml.c:1743
+#: utils/adt/xml.c:1747
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "Solo 'yes' o 'no' sono accettati da standalone."
 
-#: utils/adt/xml.c:1746
+#: utils/adt/xml.c:1750
 msgid "Malformed declaration: missing version."
 msgstr "La dichiarazione non è definita correttamente: manca la versione."
 
-#: utils/adt/xml.c:1749
+#: utils/adt/xml.c:1753
 msgid "Missing encoding in text declaration."
 msgstr "Manca la codifica nella dichiarazione del testo."
 
-#: utils/adt/xml.c:1752
+#: utils/adt/xml.c:1756
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "Durante l'analisi XML è stato riscontrato che manca '?>'."
 
-#: utils/adt/xml.c:1755
+#: utils/adt/xml.c:1759
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "Codice di errore di libxml sconosciuto: %d."
 
-#: utils/adt/xml.c:2030
+#: utils/adt/xml.c:2034
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML non supporta i valori infiniti per il tipo date."
 
-#: utils/adt/xml.c:2052 utils/adt/xml.c:2079
+#: utils/adt/xml.c:2056 utils/adt/xml.c:2083
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML non supporta i valori infiniti per il tipo timestamp."
 
-#: utils/adt/xml.c:2470
+#: utils/adt/xml.c:2483
 #, c-format
 msgid "invalid query"
 msgstr "query non valida"
 
-#: utils/adt/xml.c:3795
+#: utils/adt/xml.c:3808
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "l'array per il mapping del namespace XML non è valido"
 
-#: utils/adt/xml.c:3796
+#: utils/adt/xml.c:3809
 #, c-format
 msgid "The array must be two-dimensional with length of the second axis equal to 2."
 msgstr "L'array deve avere due dimensioni e la lunghezza del secondo asse deve essere pari a 2."
 
-#: utils/adt/xml.c:3820
+#: utils/adt/xml.c:3833
 #, c-format
 msgid "empty XPath expression"
 msgstr "l'espressione XPath è vuota"
 
-#: utils/adt/xml.c:3869
+#: utils/adt/xml.c:3882
 #, c-format
 msgid "neither namespace name nor URI may be null"
 msgstr "né il nome del namespace né l'URI possono essere nulli"
 
-#: utils/adt/xml.c:3876
+#: utils/adt/xml.c:3889
 #, c-format
 msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
 msgstr "registrazione del namespace XML con nome \"%s\" ed URI \"%s\" fallita"
@@ -19555,22 +19532,22 @@
 msgid "no output function available for type %s"
 msgstr "nessuna funzione di output disponibile per il tipo %s"
 
-#: utils/cache/plancache.c:733
+#: utils/cache/plancache.c:731
 #, c-format
 msgid "cached plan must not change result type"
 msgstr "il cached plan non deve cambiare il tipo del risultato"
 
-#: utils/cache/relcache.c:4994
+#: utils/cache/relcache.c:5048
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
 msgstr "creazione del file di inizializzazione della cache delle relazioni \"%s\" fallita: %m"
 
-#: utils/cache/relcache.c:4996
+#: utils/cache/relcache.c:5050
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Proseguo in ogni caso, ma c'è qualcosa che non funziona."
 
-#: utils/cache/relcache.c:5229
+#: utils/cache/relcache.c:5283
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "rimozione del file di cache \"%s\" fallita: %m"
@@ -19615,12 +19592,12 @@
 msgid "could not close relation mapping file \"%s\": %m"
 msgstr "chiusura del file della mappa delle relazioni \"%s\" fallita: %m"
 
-#: utils/cache/typcache.c:1156
+#: utils/cache/typcache.c:1210
 #, c-format
 msgid "type %s is not composite"
 msgstr "il tipo %s non è composito"
 
-#: utils/cache/typcache.c:1170
+#: utils/cache/typcache.c:1224
 #, c-format
 msgid "record type has not been registered"
 msgstr "il tipo del record non è stato registrato"
@@ -19640,184 +19617,184 @@
 msgid "error occurred at %s:%d before error message processing is available\n"
 msgstr "l'errore è avvenuto a %s:%d prima che fosse possibile processare i messaggi d'errore\n"
 
-#: utils/error/elog.c:1864
+#: utils/error/elog.c:1873
 #, c-format
 msgid "could not reopen file \"%s\" as stderr: %m"
 msgstr "riapertura del file \"%s\" come stderr fallita: %m"
 
-#: utils/error/elog.c:1877
+#: utils/error/elog.c:1886
 #, c-format
 msgid "could not reopen file \"%s\" as stdout: %m"
 msgstr "riapertura del file \"%s\" come stdout fallita: %m"
 
-#: utils/error/elog.c:2353 utils/error/elog.c:2370 utils/error/elog.c:2386
+#: utils/error/elog.c:2362 utils/error/elog.c:2379 utils/error/elog.c:2395
 msgid "[unknown]"
 msgstr "[sconosciuto]"
 
-#: utils/error/elog.c:2825 utils/error/elog.c:3124 utils/error/elog.c:3232
+#: utils/error/elog.c:2834 utils/error/elog.c:3133 utils/error/elog.c:3241
 msgid "missing error text"
 msgstr "testo dell'errore mancante"
 
-#: utils/error/elog.c:2828 utils/error/elog.c:2831 utils/error/elog.c:3235
-#: utils/error/elog.c:3238
+#: utils/error/elog.c:2837 utils/error/elog.c:2840 utils/error/elog.c:3244
+#: utils/error/elog.c:3247
 #, c-format
 msgid " at character %d"
 msgstr " al carattere %d"
 
-#: utils/error/elog.c:2841 utils/error/elog.c:2848
+#: utils/error/elog.c:2850 utils/error/elog.c:2857
 msgid "DETAIL:  "
 msgstr "DETTAGLI:  "
 
-#: utils/error/elog.c:2855
+#: utils/error/elog.c:2864
 msgid "HINT:  "
 msgstr "SUGGERIMENTO:  "
 
-#: utils/error/elog.c:2862
+#: utils/error/elog.c:2871
 msgid "QUERY:  "
 msgstr "QUERY:  "
 
-#: utils/error/elog.c:2869
+#: utils/error/elog.c:2878
 msgid "CONTEXT:  "
 msgstr "CONTESTO:  "
 
-#: utils/error/elog.c:2879
+#: utils/error/elog.c:2888
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "POSIZIONE:  %s, %s:%d\n"
 
-#: utils/error/elog.c:2886
+#: utils/error/elog.c:2895
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "POSIZIONE:  %s:%d\n"
 
-#: utils/error/elog.c:2900
+#: utils/error/elog.c:2909
 msgid "STATEMENT:  "
 msgstr "ISTRUZIONE:  "
 
 #. translator: This string will be truncated at 47
 #. characters expanded.
-#: utils/error/elog.c:3353
+#: utils/error/elog.c:3362
 #, c-format
 msgid "operating system error %d"
 msgstr "errore del sistema operativo %d"
 
-#: utils/error/elog.c:3548
+#: utils/error/elog.c:3557
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: utils/error/elog.c:3552
+#: utils/error/elog.c:3561
 msgid "LOG"
 msgstr "LOG"
 
-#: utils/error/elog.c:3555
+#: utils/error/elog.c:3564
 msgid "INFO"
 msgstr "INFO"
 
-#: utils/error/elog.c:3558
+#: utils/error/elog.c:3567
 msgid "NOTICE"
 msgstr "NOTIFICA"
 
-#: utils/error/elog.c:3561
+#: utils/error/elog.c:3570
 msgid "WARNING"
 msgstr "ATTENZIONE"
 
-#: utils/error/elog.c:3564
+#: utils/error/elog.c:3573
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: utils/error/elog.c:3567
+#: utils/error/elog.c:3576
 msgid "FATAL"
 msgstr "FATALE"
 
-#: utils/error/elog.c:3570
+#: utils/error/elog.c:3579
 msgid "PANIC"
 msgstr "PANICO"
 
-#: utils/fmgr/dfmgr.c:121
+#: utils/fmgr/dfmgr.c:117
 #, c-format
 msgid "could not find function \"%s\" in file \"%s\""
 msgstr "funzione \"%s\" non trovata nel file \"%s\""
 
-#: utils/fmgr/dfmgr.c:200 utils/fmgr/dfmgr.c:409 utils/fmgr/dfmgr.c:457
+#: utils/fmgr/dfmgr.c:196 utils/fmgr/dfmgr.c:405 utils/fmgr/dfmgr.c:453
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "accesso al file \"%s\" fallito: %m"
 
-#: utils/fmgr/dfmgr.c:238
+#: utils/fmgr/dfmgr.c:234
 #, c-format
 msgid "could not load library \"%s\": %s"
 msgstr "caricamento della libreria \"%s\" fallito: %s"
 
-#: utils/fmgr/dfmgr.c:270
+#: utils/fmgr/dfmgr.c:266
 #, c-format
 msgid "incompatible library \"%s\": missing magic block"
 msgstr "libreria \"%s\" incompatibile: manca il magic block"
 
-#: utils/fmgr/dfmgr.c:272
+#: utils/fmgr/dfmgr.c:268
 #, c-format
 msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
 msgstr "Le librerie di estensione devono usare la macro PG_MODULE_MAGIC."
 
-#: utils/fmgr/dfmgr.c:308
+#: utils/fmgr/dfmgr.c:304
 #, c-format
 msgid "incompatible library \"%s\": version mismatch"
 msgstr "libreria incompatibile \"%s\": versione non corrispondente"
 
-#: utils/fmgr/dfmgr.c:310
+#: utils/fmgr/dfmgr.c:306
 #, c-format
 msgid "Server is version %d.%d, library is version %d.%d."
 msgstr "Il server ha versione %d.%d, la libreria versione %d.%d."
 
-#: utils/fmgr/dfmgr.c:329
+#: utils/fmgr/dfmgr.c:325
 #, c-format
 msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
 msgstr "Il server ha FUNC_MAX_ARGS = %d, la libreria ha %d."
 
-#: utils/fmgr/dfmgr.c:338
+#: utils/fmgr/dfmgr.c:334
 #, c-format
 msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
 msgstr "Il server ha INDEX_MAX_KEYS = %d, la libreria ha %d."
 
-#: utils/fmgr/dfmgr.c:347
+#: utils/fmgr/dfmgr.c:343
 #, c-format
 msgid "Server has NAMEDATALEN = %d, library has %d."
 msgstr "Il server ha NAMEDATALEN = %d, la libreria %d."
 
-#: utils/fmgr/dfmgr.c:356
+#: utils/fmgr/dfmgr.c:352
 #, c-format
 msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
 msgstr "Il server ha FLOAT4PASSBYVAL = %s, la libreria %s."
 
-#: utils/fmgr/dfmgr.c:365
+#: utils/fmgr/dfmgr.c:361
 #, c-format
 msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
 msgstr "Il server ha FLOAT8PASSBYVAL = %s, la libreria %s."
 
-#: utils/fmgr/dfmgr.c:372
+#: utils/fmgr/dfmgr.c:368
 msgid "Magic block has unexpected length or padding difference."
 msgstr "Il magic block ha una lunghezza imprevista o una differenza di allineamento."
 
-#: utils/fmgr/dfmgr.c:375
+#: utils/fmgr/dfmgr.c:371
 #, c-format
 msgid "incompatible library \"%s\": magic block mismatch"
 msgstr "la libreria \"%s\" non è compatibile: magic block non corrispondente"
 
-#: utils/fmgr/dfmgr.c:539
+#: utils/fmgr/dfmgr.c:535
 #, c-format
 msgid "access to library \"%s\" is not allowed"
 msgstr "l'accesso alla libreria \"%s\" non è consentito"
 
-#: utils/fmgr/dfmgr.c:565
+#: utils/fmgr/dfmgr.c:561
 #, c-format
 msgid "invalid macro name in dynamic library path: %s"
 msgstr "nome della macro non valido nel percorso della libreria dinamica: %s"
 
-#: utils/fmgr/dfmgr.c:605
+#: utils/fmgr/dfmgr.c:601
 #, c-format
 msgid "zero-length component in parameter \"dynamic_library_path\""
 msgstr "componente di lunghezza zero nel parametro \"dynamic_library_path\""
 
-#: utils/fmgr/dfmgr.c:624
+#: utils/fmgr/dfmgr.c:620
 #, c-format
 msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
 msgstr "il componente nel parametro \"dynamic_library_path\" non è un percorso assoluto."
@@ -19867,271 +19844,286 @@
 msgid "could not change directory to \"%s\": %m"
 msgstr "spostamento nella directory \"%s\" fallito: %m"
 
-#: utils/init/miscinit.c:437 utils/misc/guc.c:5837
+#: utils/init/miscinit.c:441 utils/misc/guc.c:5839
 #, c-format
 msgid "cannot set parameter \"%s\" within security-restricted operation"
 msgstr "non è possibile impostare il parametro \"%s\" nell'ambito di operazioni a sicurezza ristretta"
 
-#: utils/init/miscinit.c:518
+#: utils/init/miscinit.c:502
+#, c-format
+msgid "role with OID %u does not exist"
+msgstr "il ruolo con OID %u non esiste"
+
+#: utils/init/miscinit.c:532
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "al ruolo \"%s\" non è consentito effettuare il login"
 
-#: utils/init/miscinit.c:536
+#: utils/init/miscinit.c:550
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "troppe connessioni per il ruolo \"%s\""
 
-#: utils/init/miscinit.c:596
+#: utils/init/miscinit.c:610
 #, c-format
 msgid "permission denied to set session authorization"
 msgstr "permesso di impostare l'autorizzazione della sessione negato"
 
-#: utils/init/miscinit.c:679
+#: utils/init/miscinit.c:693
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "OID del ruolo non valido: %u"
 
-#: utils/init/miscinit.c:809
+#: utils/init/miscinit.c:823
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "creazione del file di lock \"%s\" fallita: %m"
 
-#: utils/init/miscinit.c:823
+#: utils/init/miscinit.c:837
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "apertura del file di lock \"%s\" fallita: %m"
 
-#: utils/init/miscinit.c:829
+#: utils/init/miscinit.c:843
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "lettura dal file di lock \"%s\" fallita: %m"
 
-#: utils/init/miscinit.c:837
+#: utils/init/miscinit.c:851
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "il file di lock \"%s\" è vuoto"
 
-#: utils/init/miscinit.c:838
+#: utils/init/miscinit.c:852
 #, c-format
 msgid "Either another server is starting, or the lock file is the remnant of a previous server startup crash."
 msgstr "O c'è un altro server in avvio, oppure il file di lock è rimasto da un precedente crash in avvio del server."
 
-#: utils/init/miscinit.c:885
+#: utils/init/miscinit.c:899
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "il file di lock \"%s\" esiste già"
 
-#: utils/init/miscinit.c:889
+#: utils/init/miscinit.c:903
 #, c-format
 msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
 msgstr "C'è un altro postgres (PID %d) in esecuzione nella directory dei dati \"%s\"?"
 
-#: utils/init/miscinit.c:891
+#: utils/init/miscinit.c:905
 #, c-format
 msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
 msgstr "C'è un altro postmaster (PID %d) in esecuzione nella directory dei dati \"%s\"?"
 
-#: utils/init/miscinit.c:894
+#: utils/init/miscinit.c:908
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
 msgstr "C'è un altro postgres (PID %d) che sta usando il file socket \"%s\"?"
 
-#: utils/init/miscinit.c:896
+#: utils/init/miscinit.c:910
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
 msgstr "C'è un altro postmaster (PID %d) che sta usando il file socket \"%s\"?"
 
-#: utils/init/miscinit.c:932
+#: utils/init/miscinit.c:946
 #, c-format
 msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
 msgstr "il blocco di memoria condivisa preesistente (key %lu, ID %lu) è ancora in uso"
 
-#: utils/init/miscinit.c:935
+#: utils/init/miscinit.c:949
 #, 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 "Se sei sicuro che non ci siano vecchi processi server ancora in esecuzione, rimuovi il blocco di memoria condivisa, o semplicemente cancella il file \"%s\"."
 
-#: utils/init/miscinit.c:951
+#: utils/init/miscinit.c:965
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "rimozione del vecchio file di lock \"%s\" fallita: %m"
 
-#: utils/init/miscinit.c:953
+#: utils/init/miscinit.c:967
 #, c-format
 msgid "The file seems accidentally left over, but it could not be removed. Please remove the file by hand and try again."
 msgstr "Sembra che il file sia stato abbandonato accidentalmente, ma non può essere rimosso. Per favore rimuovilo manualmente e riprova."
 
-#: utils/init/miscinit.c:989 utils/init/miscinit.c:1000
-#: utils/init/miscinit.c:1010
+#: utils/init/miscinit.c:1003 utils/init/miscinit.c:1014
+#: utils/init/miscinit.c:1024
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "scrittura del file di lock \"%s\" fallita: %m"
 
-#: utils/init/miscinit.c:1139 utils/misc/guc.c:8607
+#: utils/init/miscinit.c:1153 utils/init/miscinit.c:1282 utils/misc/guc.c:8610
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "lettura dal file \"%s\" fallita: %m"
 
-#: utils/init/miscinit.c:1253 utils/init/miscinit.c:1266
+#: utils/init/miscinit.c:1272
+#, c-format
+msgid "could not open file \"%s\": %m; continuing anyway"
+msgstr "apertura del file \"%s\" fallita: %m; si procederà comunque"
+
+#: utils/init/miscinit.c:1295
+#, c-format
+msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
+msgstr "il file di lock \"%s\" contiene il PID sbagliato: %ld invece di %ld"
+
+#: utils/init/miscinit.c:1337 utils/init/miscinit.c:1350
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "\"%s\" non è una directory di dati valida"
 
-#: utils/init/miscinit.c:1255
+#: utils/init/miscinit.c:1339
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "Il file \"%s\" è mancante."
 
-#: utils/init/miscinit.c:1268
+#: utils/init/miscinit.c:1352
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "Il file \"%s\" non contiene dati validi."
 
-#: utils/init/miscinit.c:1270
+#: utils/init/miscinit.c:1354
 #, c-format
 msgid "You might need to initdb."
 msgstr "Potrebbe essere necessario eseguire initdb."
 
-#: utils/init/miscinit.c:1278
+#: utils/init/miscinit.c:1362
 #, c-format
 msgid "The data directory was initialized by PostgreSQL version %ld.%ld, which is not compatible with this version %s."
 msgstr "La directory dati è stata inizializzata da PostgreSQL versione %ld.%ld, che non è compatibile con questa versione %s."
 
-#: utils/init/miscinit.c:1349
+#: utils/init/miscinit.c:1433
 #, c-format
 msgid "loaded library \"%s\""
 msgstr "libreria \"%s\" caricata"
 
-#: utils/init/postinit.c:251
+#: utils/init/postinit.c:238
 #, c-format
 msgid "replication connection authorized: user=%s SSL enabled (protocol=%s, cipher=%s, compression=%s)"
 msgstr "connessione di replica autorizzata: utente=%s SSL abilitato (protocollo=%s, cifrario=%s, compressione=%s)"
 
-#: utils/init/postinit.c:253 utils/init/postinit.c:267
+#: utils/init/postinit.c:240 utils/init/postinit.c:254
 msgid "off"
 msgstr "disattivato"
 
-#: utils/init/postinit.c:253 utils/init/postinit.c:267
+#: utils/init/postinit.c:240 utils/init/postinit.c:254
 msgid "on"
 msgstr "attivato"
 
-#: utils/init/postinit.c:257
+#: utils/init/postinit.c:244
 #, c-format
 msgid "replication connection authorized: user=%s"
 msgstr "connessione di replica autorizzata: utente=%s"
 
-#: utils/init/postinit.c:265
+#: utils/init/postinit.c:252
 #, c-format
 msgid "connection authorized: user=%s database=%s SSL enabled (protocol=%s, cipher=%s, compression=%s)"
 msgstr "connessione autorizzata: utente=%s database=%s SSL abilitato (protocollo=%s, cifrario=%s, compressione=%s)"
 
-#: utils/init/postinit.c:271
+#: utils/init/postinit.c:258
 #, c-format
 msgid "connection authorized: user=%s database=%s"
 msgstr "connessione autorizzata: utente=%s database=%s"
 
-#: utils/init/postinit.c:303
+#: utils/init/postinit.c:290
 #, c-format
 msgid "database \"%s\" has disappeared from pg_database"
 msgstr "il database \"%s\" è scomparso da database pg_database"
 
-#: utils/init/postinit.c:305
+#: utils/init/postinit.c:292
 #, c-format
 msgid "Database OID %u now seems to belong to \"%s\"."
 msgstr "L'OID %u del database ora sembra appartenere a \"%s\"."
 
-#: utils/init/postinit.c:325
+#: utils/init/postinit.c:312
 #, c-format
 msgid "database \"%s\" is not currently accepting connections"
 msgstr "il database \"%s\" attualmente non accetta connessioni"
 
-#: utils/init/postinit.c:338
+#: utils/init/postinit.c:325
 #, c-format
 msgid "permission denied for database \"%s\""
 msgstr "permesso negato per il database \"%s\""
 
-#: utils/init/postinit.c:339
+#: utils/init/postinit.c:326
 #, c-format
 msgid "User does not have CONNECT privilege."
 msgstr "L'utente non ha il privilegio CONNECT."
 
-#: utils/init/postinit.c:356
+#: utils/init/postinit.c:343
 #, c-format
 msgid "too many connections for database \"%s\""
 msgstr "troppe connessioni al database \"%s\""
 
-#: utils/init/postinit.c:378 utils/init/postinit.c:385
+#: utils/init/postinit.c:365 utils/init/postinit.c:372
 #, c-format
 msgid "database locale is incompatible with operating system"
 msgstr "il locale del database è incompatibile col sistema operativo"
 
-#: utils/init/postinit.c:379
+#: utils/init/postinit.c:366
 #, c-format
 msgid "The database was initialized with LC_COLLATE \"%s\",  which is not recognized by setlocale()."
 msgstr "Il database di database è stato inizializzato con LC_COLLATE \"%s\", che non è riconosciuto da setlocale()."
 
-#: utils/init/postinit.c:381 utils/init/postinit.c:388
+#: utils/init/postinit.c:368 utils/init/postinit.c:375
 #, c-format
 msgid "Recreate the database with another locale or install the missing locale."
 msgstr "Crea di nuovo il database con un altro locale oppure installa il locale mancante."
 
-#: utils/init/postinit.c:386
+#: utils/init/postinit.c:373
 #, c-format
 msgid "The database was initialized with LC_CTYPE \"%s\",  which is not recognized by setlocale()."
 msgstr "Il database è stato inizializzato con LC_CTYPE \"%s\", che non è riconosciuto da setlocale()."
 
-#: utils/init/postinit.c:712
+#: utils/init/postinit.c:699
 #, c-format
 msgid "no roles are defined in this database system"
 msgstr "nessun ruolo definito in questo database"
 
-#: utils/init/postinit.c:713
+#: utils/init/postinit.c:700
 #, c-format
 msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
 msgstr "Dovresti eseguire immediatamente CREATE USER \"%s\" SUPERUSER;."
 
-#: utils/init/postinit.c:749
+#: utils/init/postinit.c:736
 #, c-format
 msgid "new replication connections are not allowed during database shutdown"
 msgstr "non sono accettate nuove connessioni di replica durante lo spegnimento del database"
 
-#: utils/init/postinit.c:753
+#: utils/init/postinit.c:740
 #, c-format
 msgid "must be superuser to connect during database shutdown"
 msgstr "solo un superutente può connettersi durante lo spegnimento del database"
 
-#: utils/init/postinit.c:763
+#: utils/init/postinit.c:750
 #, c-format
 msgid "must be superuser to connect in binary upgrade mode"
 msgstr "solo un superutente può connettersi in modalità di aggiornamento binario"
 
-#: utils/init/postinit.c:777
+#: utils/init/postinit.c:764
 #, c-format
 msgid "remaining connection slots are reserved for non-replication superuser connections"
 msgstr "i rimanenti slot di connessione sono riservati a connessioni di superutenti non di replica"
 
-#: utils/init/postinit.c:787
+#: utils/init/postinit.c:774
 #, c-format
 msgid "must be superuser or replication role to start walsender"
 msgstr "solo un superutente o il ruolo di replica può avviare walsender"
 
-#: utils/init/postinit.c:856
+#: utils/init/postinit.c:843
 #, c-format
 msgid "database %u does not exist"
 msgstr "il database %u non esiste"
 
-#: utils/init/postinit.c:942
+#: utils/init/postinit.c:929
 #, c-format
 msgid "It seems to have just been dropped or renamed."
 msgstr "Sembra sia stato appena eliminato o rinominato."
 
-#: utils/init/postinit.c:960
+#: utils/init/postinit.c:947
 #, c-format
 msgid "The database subdirectory \"%s\" is missing."
 msgstr "La sottodirectory del database \"%s\" risulta mancante."
 
-#: utils/init/postinit.c:965
+#: utils/init/postinit.c:952
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "accesso alla directory \"%s\" fallito: %m"
@@ -20203,1428 +20195,1436 @@
 msgid "character with byte sequence %s in encoding \"%s\" has no equivalent in encoding \"%s\""
 msgstr "il carattere con sequenza di byte %s nella codifica \"%s\" non ha un equivalente nella codifica \"%s\""
 
-#: utils/misc/guc.c:545
+#: utils/misc/guc.c:535
 msgid "Ungrouped"
 msgstr "Varie"
 
-#: utils/misc/guc.c:547
+#: utils/misc/guc.c:537
 msgid "File Locations"
 msgstr "Posizione dei File"
 
-#: utils/misc/guc.c:549
+#: utils/misc/guc.c:539
 msgid "Connections and Authentication"
 msgstr "Connessioni ed Autenticazione"
 
-#: utils/misc/guc.c:551
+#: utils/misc/guc.c:541
 msgid "Connections and Authentication / Connection Settings"
 msgstr "Connessioni ed Autenticazione / Impostazioni di Connessione"
 
-#: utils/misc/guc.c:553
+#: utils/misc/guc.c:543
 msgid "Connections and Authentication / Security and Authentication"
 msgstr "Connessioni ed Autenticazione / Sicurezza ed Autenticazione"
 
-#: utils/misc/guc.c:555
+#: utils/misc/guc.c:545
 msgid "Resource Usage"
 msgstr "Uso delle Risorse"
 
-#: utils/misc/guc.c:557
+#: utils/misc/guc.c:547
 msgid "Resource Usage / Memory"
 msgstr "Uso delle Risorse / Memoria"
 
-#: utils/misc/guc.c:559
+#: utils/misc/guc.c:549
 msgid "Resource Usage / Disk"
 msgstr "Uso delle Risorse / Disco"
 
-#: utils/misc/guc.c:561
+#: utils/misc/guc.c:551
 msgid "Resource Usage / Kernel Resources"
 msgstr "Uso delle Risorse / Risorse del Kernel"
 
-#: utils/misc/guc.c:563
+#: utils/misc/guc.c:553
 msgid "Resource Usage / Cost-Based Vacuum Delay"
 msgstr "Uso delle Risorse / Intervallo di Vacuum Basato sul Costo"
 
-#: utils/misc/guc.c:565
+#: utils/misc/guc.c:555
 msgid "Resource Usage / Background Writer"
 msgstr "Uso delle Risorse / Scrittura in Background"
 
-#: utils/misc/guc.c:567
+#: utils/misc/guc.c:557
 msgid "Resource Usage / Asynchronous Behavior"
 msgstr "Uso delle Risorse / Comportamento Asincrono"
 
-#: utils/misc/guc.c:569
+#: utils/misc/guc.c:559
 msgid "Write-Ahead Log"
 msgstr "Write-Ahead Log"
 
-#: utils/misc/guc.c:571
+#: utils/misc/guc.c:561
 msgid "Write-Ahead Log / Settings"
 msgstr "Write-Ahead Log / Impostazioni"
 
-#: utils/misc/guc.c:573
+#: utils/misc/guc.c:563
 msgid "Write-Ahead Log / Checkpoints"
 msgstr "Write-Ahead Log / Checkpoint"
 
-#: utils/misc/guc.c:575
+#: utils/misc/guc.c:565
 msgid "Write-Ahead Log / Archiving"
 msgstr "Write-Ahead Log / Archiviazione"
 
-#: utils/misc/guc.c:577
+#: utils/misc/guc.c:567
 msgid "Replication"
 msgstr "Replica"
 
-#: utils/misc/guc.c:579
+#: utils/misc/guc.c:569
 msgid "Replication / Sending Servers"
 msgstr "Replica / Server di Invio"
 
-#: utils/misc/guc.c:581
+#: utils/misc/guc.c:571
 msgid "Replication / Master Server"
 msgstr "Replica / Server Master"
 
-#: utils/misc/guc.c:583
+#: utils/misc/guc.c:573
 msgid "Replication / Standby Servers"
 msgstr "Replica / Serve in Standby"
 
-#: utils/misc/guc.c:585
+#: utils/misc/guc.c:575
 msgid "Query Tuning"
 msgstr "Tuning delle Query"
 
-#: utils/misc/guc.c:587
+#: utils/misc/guc.c:577
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "Tuning delle Query / Configurazione dei Metodi del Planner"
 
-#: utils/misc/guc.c:589
+#: utils/misc/guc.c:579
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "Tuning delle Query / Costanti di Costo del Planner"
 
-#: utils/misc/guc.c:591
+#: utils/misc/guc.c:581
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "Tuning delle Query / Ottimizzatore Genetico delle Query"
 
-#: utils/misc/guc.c:593
+#: utils/misc/guc.c:583
 msgid "Query Tuning / Other Planner Options"
 msgstr "Tuning delle Query / Altre Opzioni del Planner"
 
-#: utils/misc/guc.c:595
+#: utils/misc/guc.c:585
 msgid "Reporting and Logging"
 msgstr "Report e Log"
 
-#: utils/misc/guc.c:597
+#: utils/misc/guc.c:587
 msgid "Reporting and Logging / Where to Log"
 msgstr "Report e Log / Dove inviare i Log"
 
-#: utils/misc/guc.c:599
+#: utils/misc/guc.c:589
 msgid "Reporting and Logging / When to Log"
 msgstr "Report e Log / Quando inviare i Log"
 
-#: utils/misc/guc.c:601
+#: utils/misc/guc.c:591
 msgid "Reporting and Logging / What to Log"
 msgstr "Report e Log / Cosa indicare nei Log"
 
-#: utils/misc/guc.c:603
+#: utils/misc/guc.c:593
+msgid "Process Title"
+msgstr "Titolo del Processo"
+
+#: utils/misc/guc.c:595
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: utils/misc/guc.c:605
+#: utils/misc/guc.c:597
 msgid "Statistics / Monitoring"
 msgstr "Statistiche / Monitoring"
 
-#: utils/misc/guc.c:607
+#: utils/misc/guc.c:599
 msgid "Statistics / Query and Index Statistics Collector"
 msgstr "Statistiche / Raccolta delle Statistiche su Query e Indici"
 
-#: utils/misc/guc.c:609
+#: utils/misc/guc.c:601
 msgid "Autovacuum"
 msgstr "Autovacuum"
 
-#: utils/misc/guc.c:611
+#: utils/misc/guc.c:603
 msgid "Client Connection Defaults"
 msgstr "Valori Predefiniti Connessioni Client"
 
-#: utils/misc/guc.c:613
+#: utils/misc/guc.c:605
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "Valori Predefiniti Connessioni Client / Comportamento Istruzioni"
 
-#: utils/misc/guc.c:615
+#: utils/misc/guc.c:607
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr "Valori Predefiniti Connessioni Client / Locale e Formattazione"
 
-#: utils/misc/guc.c:617
+#: utils/misc/guc.c:609
 msgid "Client Connection Defaults / Shared Library Preloading"
 msgstr "Valori Predefiniti Connessioni Client / Precaricamento Librerie Condivise"
 
-#: utils/misc/guc.c:619
+#: utils/misc/guc.c:611
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "Valori Predefiniti Connessioni Client / Altri Default"
 
-#: utils/misc/guc.c:621
+#: utils/misc/guc.c:613
 msgid "Lock Management"
 msgstr "Gestione dei Lock"
 
-#: utils/misc/guc.c:623
+#: utils/misc/guc.c:615
 msgid "Version and Platform Compatibility"
 msgstr "Versione e Compatibilità della Piattaforma"
 
-#: utils/misc/guc.c:625
+#: utils/misc/guc.c:617
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "Versione e Compatibilità della Piattaforma / Versioni Precedenti di PostgreSQL"
 
-#: utils/misc/guc.c:627
+#: utils/misc/guc.c:619
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "Versione e Compatibilità della Piattaforma / Altre Piattaforme e Client"
 
-#: utils/misc/guc.c:629
+#: utils/misc/guc.c:621
 msgid "Error Handling"
 msgstr "Gestione degli Errori"
 
-#: utils/misc/guc.c:631
+#: utils/misc/guc.c:623
 msgid "Preset Options"
 msgstr "Opzioni Preimpostate"
 
-#: utils/misc/guc.c:633
+#: utils/misc/guc.c:625
 msgid "Customized Options"
 msgstr "Opzioni Personalizzate"
 
-#: utils/misc/guc.c:635
+#: utils/misc/guc.c:627
 msgid "Developer Options"
 msgstr "Opzioni di Sviluppo"
 
-#: utils/misc/guc.c:692
+#: utils/misc/guc.c:684
 msgid "Valid units for this parameter are \"kB\", \"MB\", \"GB\", and \"TB\"."
 msgstr "Le unità di misura valide sono \"kB\", \"MB\", \"GB\", and \"TB\"."
 
-#: utils/misc/guc.c:719
+#: utils/misc/guc.c:711
 msgid "Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
 msgstr "Le unità di misura valide sono \"ms\", \"s\", \"min\", \"h\" e \"d\"."
 
-#: utils/misc/guc.c:778
+#: utils/misc/guc.c:770
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr "Abilita l'uso da parte del planner dei piani di scansione sequenziale."
 
-#: utils/misc/guc.c:787
+#: utils/misc/guc.c:779
 msgid "Enables the planner's use of index-scan plans."
 msgstr "Abilita l'uso da parte del planner dei piani di scansione degli indici."
 
-#: utils/misc/guc.c:796
+#: utils/misc/guc.c:788
 msgid "Enables the planner's use of index-only-scan plans."
 msgstr "Abilita l'uso da parte del planner dei piani di scansione dei soli indici."
 
-#: utils/misc/guc.c:805
+#: utils/misc/guc.c:797
 msgid "Enables the planner's use of bitmap-scan plans."
 msgstr "Abilita l'uso da parte del planner dei piani di scansione bitmap."
 
-#: utils/misc/guc.c:814
+#: utils/misc/guc.c:806
 msgid "Enables the planner's use of TID scan plans."
 msgstr "Abilita l'uso da parte del planner dei piani di scansione TID."
 
-#: utils/misc/guc.c:823
+#: utils/misc/guc.c:815
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "Abilita l'uso da parte del planner di passaggi di ordinamento esplicito."
 
-#: utils/misc/guc.c:832
+#: utils/misc/guc.c:824
 msgid "Enables the planner's use of hashed aggregation plans."
 msgstr "Abilita l'uso da parte del planner di piani di aggregazione basati su hash."
 
-#: utils/misc/guc.c:841
+#: utils/misc/guc.c:833
 msgid "Enables the planner's use of materialization."
 msgstr "Abilita l'uso da parte del planner di materializzazione."
 
-#: utils/misc/guc.c:850
+#: utils/misc/guc.c:842
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr "Abilita l'uso da parte del planner di piani di join annidati."
 
-#: utils/misc/guc.c:859
+#: utils/misc/guc.c:851
 msgid "Enables the planner's use of merge join plans."
 msgstr "Abilita l'uso da parte del planner di piani di join ad unione."
 
-#: utils/misc/guc.c:868
+#: utils/misc/guc.c:860
 msgid "Enables the planner's use of hash join plans."
 msgstr "Abilita l'uso da parte del planner di piani di join basati su hash."
 
-#: utils/misc/guc.c:877
+#: utils/misc/guc.c:869
 msgid "Enables genetic query optimization."
 msgstr "Abilita l'ottimizzatore genetico di query."
 
-#: utils/misc/guc.c:878
+#: utils/misc/guc.c:870
 msgid "This algorithm attempts to do planning without exhaustive searching."
 msgstr "Questo algoritmo cerca di realizzare piani senza effettuare una ricerca esaustiva."
 
-#: utils/misc/guc.c:888
+#: utils/misc/guc.c:880
 msgid "Shows whether the current user is a superuser."
 msgstr "Mostra se l'utente attuale è un superutente o meno."
 
-#: utils/misc/guc.c:898
+#: utils/misc/guc.c:890
 msgid "Enables advertising the server via Bonjour."
 msgstr "Abilita la pubblicazione del server via Bonjour."
 
-#: utils/misc/guc.c:907
+#: utils/misc/guc.c:899
 msgid "Collects transaction commit time."
 msgstr "Raccogli l'ora di commit delle transazioni."
 
-#: utils/misc/guc.c:916
+#: utils/misc/guc.c:908
 msgid "Enables SSL connections."
 msgstr "Abilita le connessioni SSL."
 
-#: utils/misc/guc.c:925
+#: utils/misc/guc.c:917
 msgid "Give priority to server ciphersuite order."
 msgstr "Dai priorità all'ordine di cifrari del server."
 
-#: utils/misc/guc.c:934
+#: utils/misc/guc.c:926
 msgid "Forces synchronization of updates to disk."
 msgstr "Forza la sincronizzazione degli aggiornamenti sul disco."
 
-#: utils/misc/guc.c:935
+#: utils/misc/guc.c:927
 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 "Il server userà in diversi punti la chiamata di sistema fsync() per assicurarsi che gli aggiornamenti vengano scritti fisicamente sul disco. Questo assicura che un cluster di database possa essere recuperato in uno stato consistente dopo un crash di sistema o dell'hardware."
 
-#: utils/misc/guc.c:946
+#: utils/misc/guc.c:938
 msgid "Continues processing after a checksum failure."
 msgstr "Condinua l'elaborazione dopo un errore in una somma di controllo."
 
-#: utils/misc/guc.c:947
+#: utils/misc/guc.c:939
 msgid "Detection of a checksum failure normally causes PostgreSQL to report an error, aborting the current transaction. Setting ignore_checksum_failure to true causes the system to ignore the failure (but still report a warning), and continue processing. This behavior could cause crashes or other serious problems. Only has an effect if checksums are enabled."
 msgstr "La rilevazione di un errore in una somma di controllo di solito fa generare a PostgreSQL un errore che fa abortire la transazione corrente. Impostare ignore_checksum_failure a \"true\" fa sì che il sistema ignori l'errore (che viene riportato come un avviso), consentendo al processo di continuare. Questo comportamento potrebbe causare crash o altri problemi gravi. Ha effetto solo se se somme di controllo sono abilitate."
 
-#: utils/misc/guc.c:961
+#: utils/misc/guc.c:953
 msgid "Continues processing past damaged page headers."
 msgstr "Continua l'esecuzione oltre le intestazioni di pagina danneggiate."
 
-#: utils/misc/guc.c:962
+#: utils/misc/guc.c:954
 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 "Il rilevamento di una intestazione di pagina danneggiata normalmente fa sì che PostgreSQL segnali un errore, interrompendo la transazione corrente. L'attivazione di zero_damaged_pages fa sì che il sistema invece riporti un warning, azzeri la pagina danneggiata e continui l'esecuzione. Questo comportamento può distruggere dei dati, in particolare tutte quelle righe situate nella pagina danneggiata."
 
-#: utils/misc/guc.c:975
+#: utils/misc/guc.c:967
 msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr "Scrivi pagine intere nel WAL non appena modificate dopo un checkpoint."
 
-#: utils/misc/guc.c:976
+#: utils/misc/guc.c:968
 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 "La scrittura di una pagina durante un crash del sistema operativo potrebbe essere stata scritta su disco solo parzialmente. Durante il ripristino, le variazioni di riga memorizzate nel WAL non sono sufficienti al ripristino. Questa operazione scrive le pagine nel WAL appena modificate dopo un checkpoint nel WAL in maniera da rendere possibile un ripristino completo."
 
-#: utils/misc/guc.c:989
+#: utils/misc/guc.c:981
 msgid "Writes full pages to WAL when first modified after a checkpoint, even for a non-critical modifications."
 msgstr "Scrivi pagine complete nel WAL appena modificate dopo un checkpoint, anche dopo modifiche non critiche."
 
-#: utils/misc/guc.c:999
+#: utils/misc/guc.c:991
 msgid "Compresses full-page writes written in WAL file."
 msgstr "Comprimi le scritture di pagine complete scritte nel file WAL."
 
-#: utils/misc/guc.c:1009
+#: utils/misc/guc.c:1001
 msgid "Logs each checkpoint."
 msgstr "Registra nel log ogni checkpoint."
 
-#: utils/misc/guc.c:1018
+#: utils/misc/guc.c:1010
 msgid "Logs each successful connection."
 msgstr "Registra nel log tutte le connessioni avvenute con successo."
 
-#: utils/misc/guc.c:1027
+#: utils/misc/guc.c:1019
 msgid "Logs end of a session, including duration."
 msgstr "Registra nel log la fine delle sessioni, compresa la sua durata."
 
-#: utils/misc/guc.c:1036
+#: utils/misc/guc.c:1028
 msgid "Logs each replication command."
 msgstr "Registra nel log ogni comando di replica."
 
-#: utils/misc/guc.c:1045
+#: utils/misc/guc.c:1037
 msgid "Shows whether the running server has assertion checks enabled."
 msgstr "Mostra se il server in esecuzione ha i controlli di assert attivi."
 
-#: utils/misc/guc.c:1060
+#: utils/misc/guc.c:1052
 msgid "Terminate session on any error."
 msgstr "Termina la sessione su qualunque errore."
 
-#: utils/misc/guc.c:1069
+#: utils/misc/guc.c:1061
 msgid "Reinitialize server after backend crash."
 msgstr "Reinizializza il server dopo un crash del backend."
 
-#: utils/misc/guc.c:1079
+#: utils/misc/guc.c:1071
 msgid "Logs the duration of each completed SQL statement."
 msgstr "Registra nel log la durata di ogni istruzione SQL completata."
 
-#: utils/misc/guc.c:1088
+#: utils/misc/guc.c:1080
 msgid "Logs each query's parse tree."
 msgstr "Registra nel log l'albero di parsing di tutte le query."
 
-#: utils/misc/guc.c:1097
+#: utils/misc/guc.c:1089
 msgid "Logs each query's rewritten parse tree."
 msgstr "Registra nel log l'albero di parsing riscritto di tutte le query."
 
-#: utils/misc/guc.c:1106
+#: utils/misc/guc.c:1098
 msgid "Logs each query's execution plan."
 msgstr "Registra nel log il piano di esecuzione di tutte le query."
 
-#: utils/misc/guc.c:1115
+#: utils/misc/guc.c:1107
 msgid "Indents parse and plan tree displays."
 msgstr "Indenta gli alberi di parsing e dei piani di esecuzione."
 
-#: utils/misc/guc.c:1124
+#: utils/misc/guc.c:1116
 msgid "Writes parser performance statistics to the server log."
 msgstr "Registra nel log del server le statistiche sulle prestazioni del parser."
 
-#: utils/misc/guc.c:1133
+#: utils/misc/guc.c:1125
 msgid "Writes planner performance statistics to the server log."
 msgstr "Registra nel log del server le statistiche sulle prestazioni del planner."
 
-#: utils/misc/guc.c:1142
+#: utils/misc/guc.c:1134
 msgid "Writes executor performance statistics to the server log."
 msgstr "Registra nel log del server le statistiche sulle prestazioni dell'esecutore."
 
-#: utils/misc/guc.c:1151
+#: utils/misc/guc.c:1143
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "Registra nel log del server le statistiche sulle prestazioni cumulative."
 
-#: utils/misc/guc.c:1161
+#: utils/misc/guc.c:1153
 msgid "Logs system resource usage statistics (memory and CPU) on various B-tree operations."
 msgstr "Registra nel log statistiche sull'uso di risorse di sistema (memoria e CPU) su varie operazioni B-tree."
 
-#: utils/misc/guc.c:1173
+#: utils/misc/guc.c:1165
 msgid "Collects information about executing commands."
 msgstr "Raccogli informazioni sull'esecuzione dei comandi."
 
-#: utils/misc/guc.c:1174
+#: utils/misc/guc.c:1166
 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 "Abilita la raccolta di informazioni sui comandi in esecuzione per ogni sessione, insieme all'orario in cui l'esecuzione del comando è iniziata."
 
-#: utils/misc/guc.c:1184
+#: utils/misc/guc.c:1176
 msgid "Collects statistics on database activity."
 msgstr "Raccogli statistiche sull'attività del database."
 
-#: utils/misc/guc.c:1193
+#: utils/misc/guc.c:1185
 msgid "Collects timing statistics for database I/O activity."
 msgstr "Raccogli statistiche sull'attività di I/O del database."
 
-#: utils/misc/guc.c:1203
+#: utils/misc/guc.c:1195
 msgid "Updates the process title to show the active SQL command."
 msgstr "Aggiorna il titolo del processo per indicare il comando SQL in esecuzione."
 
-#: utils/misc/guc.c:1204
+#: utils/misc/guc.c:1196
 msgid "Enables updating of the process title every time a new SQL command is received by the server."
 msgstr "Abilita l'aggiornamento del titolo del processo ogni volta che un nuovo comando SQL viene ricevuto dal server."
 
-#: utils/misc/guc.c:1213
+#: utils/misc/guc.c:1205
 msgid "Starts the autovacuum subprocess."
 msgstr "Avvia il sottoprocesso autovacuum."
 
-#: utils/misc/guc.c:1223
+#: utils/misc/guc.c:1215
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "Genera un output di debug per LISTEN e NOTIFY."
 
-#: utils/misc/guc.c:1235
+#: utils/misc/guc.c:1227
 msgid "Emits information about lock usage."
 msgstr "Emette informazioni sull'uso dei lock."
 
-#: utils/misc/guc.c:1245
+#: utils/misc/guc.c:1237
 msgid "Emits information about user lock usage."
 msgstr "Emette informazioni sull'uso dei lock utente."
 
-#: utils/misc/guc.c:1255
+#: utils/misc/guc.c:1247
 msgid "Emits information about lightweight lock usage."
 msgstr "Emette informazioni sull'uso dei lock leggeri."
 
-#: utils/misc/guc.c:1265
+#: utils/misc/guc.c:1257
 msgid "Dumps information about all current locks when a deadlock timeout occurs."
 msgstr "Emette informazioni su tutti i lock attivi quando avviene un timeout di lock."
 
-#: utils/misc/guc.c:1277
+#: utils/misc/guc.c:1269
 msgid "Logs long lock waits."
 msgstr "Inserisci nel log le attese lunghe su lock."
 
-#: utils/misc/guc.c:1287
+#: utils/misc/guc.c:1279
 msgid "Logs the host name in the connection logs."
 msgstr "Inserisci nel log lo host name delle connessioni."
 
-#: utils/misc/guc.c:1288
+#: utils/misc/guc.c:1280
 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 "Normalmente, viene inserito nel log solo l'indirizzo IP dell'host connesso. Se vuoi mostrare anche il nome host puoi attivando questa parametro ma, a seconda di come è definito il sistema di risoluzione dei nomi, ciò potrebbe comportare una penalizzazione delle prestazioni non trascurabile."
 
-#: utils/misc/guc.c:1299
+#: utils/misc/guc.c:1291
 msgid "Causes subtables to be included by default in various commands."
 msgstr "Fa in modo che le sotto-tabelle vengano incluse in maniera predefinita in vari comandi."
 
-#: utils/misc/guc.c:1308
+#: utils/misc/guc.c:1300
 msgid "Encrypt passwords."
 msgstr "Cripta le password."
 
-#: utils/misc/guc.c:1309
+#: utils/misc/guc.c:1301
 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 si indica una password in CREATE USER o ALTER USER senza indicare ENCRYPTED o UNENCRYPTED, questo parametro determina se la password debba essere criptata o meno."
 
-#: utils/misc/guc.c:1319
+#: utils/misc/guc.c:1311
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "Tratta l'espressione \"expr=NULL\" come \"expr IS NULL\"."
 
-#: utils/misc/guc.c:1320
+#: utils/misc/guc.c:1312
 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 "Se abilitato, le espressioni nella forma expr = NULL (o NULL = expr) vengono trattate come expr IS NULL, in modo cioè che restituiscano TRUE se expr viene valutato con valore NULL e falso in ogni altro caso. Il comportamento corretto prevede che expr = NULL valga sempre NULL (sconosciuto)."
 
-#: utils/misc/guc.c:1332
+#: utils/misc/guc.c:1324
 msgid "Enables per-database user names."
 msgstr "Abilita nomi di utenti diversificati per ogni database."
 
-#: utils/misc/guc.c:1341
+#: utils/misc/guc.c:1333
 msgid "Sets the default read-only status of new transactions."
 msgstr "Imposta lo stato predefinito di sola lettura per le nuove transazioni."
 
-#: utils/misc/guc.c:1350
+#: utils/misc/guc.c:1342
 msgid "Sets the current transaction's read-only status."
 msgstr "Imposta lo stato di sola lettura per la transazione corrente."
 
-#: utils/misc/guc.c:1360
+#: utils/misc/guc.c:1352
 msgid "Sets the default deferrable status of new transactions."
 msgstr "Imposta lo stato predefinito deferibile per le nuove transazioni."
 
-#: utils/misc/guc.c:1369
+#: utils/misc/guc.c:1361
 msgid "Whether to defer a read-only serializable transaction until it can be executed with no possible serialization failures."
 msgstr "Indica se deferire una transazione serializzabile in sola lettura finché possa essere eseguita senza possibili fallimenti di serializzazione."
 
-#: utils/misc/guc.c:1379
+#: utils/misc/guc.c:1371
+msgid "Enable row security."
+msgstr "Abilita la sicurezza delle righe."
+
+#: utils/misc/guc.c:1372
+msgid "When enabled, row security will be applied to all users."
+msgstr "Quando abilitata, la sicurezza delle righe verrà applicata a tutti gli utenti."
+
+#: utils/misc/guc.c:1380
 msgid "Check function bodies during CREATE FUNCTION."
 msgstr "Esegui un controllo sulla definizione del corpo durante la CREATE FUNCTION."
 
-#: utils/misc/guc.c:1388
+#: utils/misc/guc.c:1389
 msgid "Enable input of NULL elements in arrays."
 msgstr "Abilita l'input di elementi NULL negli array."
 
-#: utils/misc/guc.c:1389
+#: utils/misc/guc.c:1390
 msgid "When turned on, unquoted NULL in an array input value means a null value; otherwise it is taken literally."
 msgstr "Se abilitato, un NULL senza apici come valore di input in un array indica un valore nullo; altrimenti è preso letteralmente."
 
-#: utils/misc/guc.c:1399
+#: utils/misc/guc.c:1400
 msgid "Create new tables with OIDs by default."
 msgstr "Crea le nuove tabella con gli OID in maniera predefinita."
 
-#: utils/misc/guc.c:1408
+#: utils/misc/guc.c:1409
 msgid "Start a subprocess to capture stderr output and/or csvlogs into log files."
 msgstr "Avvia un sottoprocesso per catturare in un file di log l'output di stderr e/o di csvlog."
 
-#: utils/misc/guc.c:1417
+#: utils/misc/guc.c:1418
 msgid "Truncate existing log files of same name during log rotation."
 msgstr "Tronca un file di log esistente con lo stesso nome durante la rotazione dei log."
 
-#: utils/misc/guc.c:1428
+#: utils/misc/guc.c:1429
 msgid "Emit information about resource usage in sorting."
 msgstr "Genera informazioni sull'uso delle risorse durante gli ordinamenti."
 
-#: utils/misc/guc.c:1442
+#: utils/misc/guc.c:1443
 msgid "Generate debugging output for synchronized scanning."
 msgstr "Genera output di debug per le scansioni sincronizzate."
 
-#: utils/misc/guc.c:1457
+#: utils/misc/guc.c:1458
 msgid "Enable bounded sorting using heap sort."
 msgstr "Abilita il bounded sorting usando lo heap sort."
 
-#: utils/misc/guc.c:1470
+#: utils/misc/guc.c:1471
 msgid "Emit WAL-related debugging output."
 msgstr "Genera output di debug relativo al WAL."
 
-#: utils/misc/guc.c:1482
+#: utils/misc/guc.c:1483
 msgid "Datetimes are integer based."
 msgstr "I valori di data e tempo sono basati su interi."
 
-#: utils/misc/guc.c:1497
+#: utils/misc/guc.c:1498
 msgid "Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."
 msgstr "Imposta se i nomi di utente con Kerberos e GSSAPI debbano essere trattati come case-insensitive."
 
-#: utils/misc/guc.c:1507
+#: utils/misc/guc.c:1508
 msgid "Warn about backslash escapes in ordinary string literals."
 msgstr "Avverti sull'uso degli escape con backslash nei letterali stringa ordinarie."
 
-#: utils/misc/guc.c:1517
+#: utils/misc/guc.c:1518
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr "Fa sì che le stringhe '...' trattino i backslash letteralmente."
 
-#: utils/misc/guc.c:1528
+#: utils/misc/guc.c:1529
 msgid "Enable synchronized sequential scans."
 msgstr "Abilita le scansioni sequenziali sincronizzate."
 
-#: utils/misc/guc.c:1538
+#: utils/misc/guc.c:1539
 msgid "Allows connections and queries during recovery."
 msgstr "Consente connessioni e query durante il recupero"
 
-#: utils/misc/guc.c:1548
+#: utils/misc/guc.c:1549
 msgid "Allows feedback from a hot standby to the primary that will avoid query conflicts."
 msgstr "Consente un feedback da un hot standby al primario che eviterà conflitti di query"
 
-#: utils/misc/guc.c:1558
+#: utils/misc/guc.c:1559
 msgid "Allows modifications of the structure of system tables."
 msgstr "Consente le modifiche alla struttura delle tabelle di sistema."
 
-#: utils/misc/guc.c:1569
+#: utils/misc/guc.c:1570
 msgid "Disables reading from system indexes."
 msgstr "Disabilita la lettura dagli indici di sistema."
 
-#: utils/misc/guc.c:1570
+#: utils/misc/guc.c:1571
 msgid "It does not prevent updating the indexes, so it is safe to use.  The worst consequence is slowness."
 msgstr "Non impedisce l'aggiornamento degli indici ed è perciò utilizzabile tranquillamente. Al peggio causa rallentamenti."
 
-#: utils/misc/guc.c:1581
+#: utils/misc/guc.c:1582
 msgid "Enables backward compatibility mode for privilege checks on large objects."
 msgstr "Abilita la modalità compatibile col passato del controllo dei privilegi sui large object."
 
-#: utils/misc/guc.c:1582
+#: utils/misc/guc.c:1583
 msgid "Skips privilege checks when reading or modifying large objects, for compatibility with PostgreSQL releases prior to 9.0."
 msgstr "Evita il controllo dei privilegi quando si leggono o modificano large object, per compatibilità con versioni di PostgreSQL precedenti la 9.0."
 
-#: utils/misc/guc.c:1592
+#: utils/misc/guc.c:1593
 msgid "Emit a warning for constructs that changed meaning since PostgreSQL 9.4."
 msgstr "Emetti un avviso per i costrutti che hanno cambiato significato da PostgreSQL 9.4."
 
-#: utils/misc/guc.c:1602
+#: utils/misc/guc.c:1603
 msgid "When generating SQL fragments, quote all identifiers."
 msgstr "Quando vengono generati frammenti SQL, metti tra virgolette tutti gli identificatori."
 
-#: utils/misc/guc.c:1612
+#: utils/misc/guc.c:1613
 msgid "Shows whether data checksums are turned on for this cluster."
 msgstr "Mostra se i checksum di dati sono attivi in questo cluster."
 
-#: utils/misc/guc.c:1632
+#: utils/misc/guc.c:1633
 msgid "Forces a switch to the next xlog file if a new file has not been started within N seconds."
 msgstr "Forza il passaggio al successivo file xlog se un nuovo file non è avviato entro N secondi."
 
-#: utils/misc/guc.c:1643
+#: utils/misc/guc.c:1644
 msgid "Waits N seconds on connection startup after authentication."
 msgstr "Attendi N secondi all'avvio della connessione dopo l'autenticazione."
 
-#: utils/misc/guc.c:1644 utils/misc/guc.c:2146
+#: utils/misc/guc.c:1645 utils/misc/guc.c:2147
 msgid "This allows attaching a debugger to the process."
 msgstr "Ciò consente di agganciare un debugger al processo."
 
-#: utils/misc/guc.c:1653
+#: utils/misc/guc.c:1654
 msgid "Sets the default statistics target."
 msgstr "Definisce la destinazione delle statistiche di default."
 
-#: utils/misc/guc.c:1654
+#: utils/misc/guc.c:1655
 msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS."
 msgstr "Questo vale per le colonne di tabelle che non hanno definito una destinazione specifica per colonne per mezzo di un ALTER TABLE SET STATISTICS."
 
-#: utils/misc/guc.c:1663
+#: utils/misc/guc.c:1664
 msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr "Definisce la dimensione della lista FROM oltre la quale le sottoquery non vengono ridotte."
 
-#: utils/misc/guc.c:1665
+#: utils/misc/guc.c:1666
 msgid "The planner will merge subqueries into upper queries if the resulting FROM list would have no more than this many items."
 msgstr "Il planner fonderà le sottoquery nelle query superiori se la lista FROM risultante avrebbe non più di questi elementi."
 
-#: utils/misc/guc.c:1675
+#: utils/misc/guc.c:1676
 msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr "Definisce la dimensione della lista FROM oltre la quale i costrutti JOIN non vengono più appiattiti."
 
-#: utils/misc/guc.c:1677
+#: utils/misc/guc.c:1678
 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 "Il planner appiattisce i costrutti di JOIN espliciti in liste di elementi FROM ogni volta che ne risulterebbe una lista con non più di questi elementi."
 
-#: utils/misc/guc.c:1687
+#: utils/misc/guc.c:1688
 msgid "Sets the threshold of FROM items beyond which GEQO is used."
 msgstr "Definisce la soglia di elementi FROM oltre la quale viene usato il GEQO."
 
-#: utils/misc/guc.c:1696
+#: utils/misc/guc.c:1697
 msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr "GEQO: prova a definire i default per gli altri parametri di GEQO."
 
-#: utils/misc/guc.c:1705
+#: utils/misc/guc.c:1706
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: numero di individui nella popolazione."
 
-#: utils/misc/guc.c:1706 utils/misc/guc.c:1715
+#: utils/misc/guc.c:1707 utils/misc/guc.c:1716
 msgid "Zero selects a suitable default value."
 msgstr "Lo zero selezione un valore ammissibile come default."
 
-#: utils/misc/guc.c:1714
+#: utils/misc/guc.c:1715
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: numero di iterazioni dell'algoritmo."
 
-#: utils/misc/guc.c:1725
+#: utils/misc/guc.c:1726
 msgid "Sets the time to wait on a lock before checking for deadlock."
 msgstr "Definisce il tempo di attesa su un lock prima di verificare si tratti di un deadlock."
 
-#: utils/misc/guc.c:1736
+#: utils/misc/guc.c:1737
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing archived WAL data."
 msgstr "Imposta l'intervallo massimo prima di annullare le query quando un server in hot standby sta processando dati da un WAL archiviato."
 
-#: utils/misc/guc.c:1747
+#: utils/misc/guc.c:1748
 msgid "Sets the maximum delay before canceling queries when a hot standby server is processing streamed WAL data."
 msgstr "Imposta l'intervallo massimo prima di annullare le query quando un server in hot standby sta processando dati da un WAL streamed."
 
-#: utils/misc/guc.c:1758
+#: utils/misc/guc.c:1759
 msgid "Sets the maximum interval between WAL receiver status reports to the primary."
 msgstr "Imposta l'intervallo massimo tra i rapporti di stato del ricevitore dei WAL al primario."
 
-#: utils/misc/guc.c:1769
+#: utils/misc/guc.c:1770
 msgid "Sets the maximum wait time to receive data from the primary."
 msgstr "Imposta un tempo massimo di attesa per la ricezione di dati dal primario."
 
-#: utils/misc/guc.c:1780
+#: utils/misc/guc.c:1781
 msgid "Sets the maximum number of concurrent connections."
 msgstr "Imposta il numero massimo di connessioni concorrenti."
 
-#: utils/misc/guc.c:1790
+#: utils/misc/guc.c:1791
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr "Imposta il numero di slot per connessioni riservate ai superutenti."
 
-#: utils/misc/guc.c:1804
+#: utils/misc/guc.c:1805
 msgid "Sets the number of shared memory buffers used by the server."
 msgstr "Imposta il numero di buffer di memoria condivisa usati dal server."
 
-#: utils/misc/guc.c:1815
+#: utils/misc/guc.c:1816
 msgid "Sets the maximum number of temporary buffers used by each session."
 msgstr "Definisce il numero massimo di buffer temporanei usati da ogni sessione."
 
-#: utils/misc/guc.c:1826
+#: utils/misc/guc.c:1827
 msgid "Sets the TCP port the server listens on."
 msgstr "Imposta il numero di porta TCP sulla quale il server è in ascolto."
 
-#: utils/misc/guc.c:1836
+#: utils/misc/guc.c:1837
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "Imposta i permessi di accesso del socket di dominio Unix."
 
-#: utils/misc/guc.c:1837
+#: utils/misc/guc.c:1838
 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 "I socket di dominio Unix utilizzano i normali permessi dei file system Unix. Il valore del parametro deve essere la specifica numerica dei permessi nella stessa forma accettata dalle chiamate di sistema chmod e umask. (Per usare il classico formato ottale, il valore numerico deve iniziare con 0 (zero).)"
 
-#: utils/misc/guc.c:1851
+#: utils/misc/guc.c:1852
 msgid "Sets the file permissions for log files."
 msgstr "Imposta i permessi dei file di log."
 
-#: utils/misc/guc.c:1852
+#: utils/misc/guc.c:1853
 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 "Il valore del parametro deve essere la specifica numerica dei permessi nella stessa forma accettata dalle chiamate di sistema chmod e umask. (Per usare il classico formato ottale, il valore numerico deve iniziare con 0 (zero).)"
 
-#: utils/misc/guc.c:1865
+#: utils/misc/guc.c:1866
 msgid "Sets the maximum memory to be used for query workspaces."
 msgstr "Imposta la quantità massima di memoria utilizzabile per gli spazi di lavoro delle query."
 
-#: utils/misc/guc.c:1866
+#: utils/misc/guc.c:1867
 msgid "This much memory can be used by each internal sort operation and hash table before switching to temporary disk files."
 msgstr "Questa quantità di memoria può essere utilizzata per ogni operazione di ordinamento interno e per ogni tabella hash prima di passare ai file temporanei su disco."
 
-#: utils/misc/guc.c:1878
+#: utils/misc/guc.c:1879
 msgid "Sets the maximum memory to be used for maintenance operations."
 msgstr "Imposta la quantità massima di memoria utilizzabile per le operazioni di manutenzione."
 
-#: utils/misc/guc.c:1879
+#: utils/misc/guc.c:1880
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "Queste includono operazioni quali VACUUM e CREATE INDEX."
 
-#: utils/misc/guc.c:1894
+#: utils/misc/guc.c:1895
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "Imposta la profondità massima dello stack, in kilobyte."
 
-#: utils/misc/guc.c:1905
+#: utils/misc/guc.c:1906
 msgid "Limits the total size of all temporary files used by each session."
 msgstr "Limita la dimensione totale di tutti i file temporanei usata da ogni sessione"
 
-#: utils/misc/guc.c:1906
+#: utils/misc/guc.c:1907
 msgid "-1 means no limit."
 msgstr "-1 vuol dire senza limiti."
 
-#: utils/misc/guc.c:1916
+#: utils/misc/guc.c:1917
 msgid "Vacuum cost for a page found in the buffer cache."
 msgstr "Costo del VACUUM per una pagina trovata nella cache dei buffer."
 
-#: utils/misc/guc.c:1926
+#: utils/misc/guc.c:1927
 msgid "Vacuum cost for a page not found in the buffer cache."
 msgstr "Costo del VACUUM per una pagina non trovata nella cache dei buffer."
 
-#: utils/misc/guc.c:1936
+#: utils/misc/guc.c:1937
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr "Costo del VACUUM per una pagina resa sporca dal VACUUM."
 
-#: utils/misc/guc.c:1946
+#: utils/misc/guc.c:1947
 msgid "Vacuum cost amount available before napping."
 msgstr "Costo totale del VACUUM prima della pausa."
 
-#: utils/misc/guc.c:1956
+#: utils/misc/guc.c:1957
 msgid "Vacuum cost delay in milliseconds."
 msgstr "Il costo del VACUUM come ritardo in millisecondi."
 
-#: utils/misc/guc.c:1967
+#: utils/misc/guc.c:1968
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "Il costo del VACUUM come ritardo in millisecondi, per l'autovacuum."
 
-#: utils/misc/guc.c:1978
+#: utils/misc/guc.c:1979
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr "Il costo totale del VACUUM prima della pausa, per l'autovacuum."
 
-#: utils/misc/guc.c:1988
+#: utils/misc/guc.c:1989
 msgid "Sets the maximum number of simultaneously open files for each server process."
 msgstr "Imposta il numero massimo di file aperti contemporaneamente per ogni processo server."
 
-#: utils/misc/guc.c:2001
+#: utils/misc/guc.c:2002
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr "Imposta il numero massimo di transazioni preparate contemporanee."
 
-#: utils/misc/guc.c:2012
+#: utils/misc/guc.c:2013
 msgid "Sets the minimum OID of tables for tracking locks."
 msgstr "Imposta l'OID minimo delle tabelle per tracciare i lock."
 
-#: utils/misc/guc.c:2013
+#: utils/misc/guc.c:2014
 msgid "Is used to avoid output on system tables."
 msgstr "È usato per evitare l'output su tabelle di sistema."
 
-#: utils/misc/guc.c:2022
+#: utils/misc/guc.c:2023
 msgid "Sets the OID of the table with unconditionally lock tracing."
 msgstr "Imposta l'OID delle tabelle con tracciamento dei lock non facoltativo."
 
-#: utils/misc/guc.c:2034
+#: utils/misc/guc.c:2035
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "Imposta la durata massima consentita per qualsiasi istruzione."
 
-#: utils/misc/guc.c:2035 utils/misc/guc.c:2046
+#: utils/misc/guc.c:2036 utils/misc/guc.c:2047
 msgid "A value of 0 turns off the timeout."
 msgstr "Il valore 0 disabilita il timeout."
 
-#: utils/misc/guc.c:2045
+#: utils/misc/guc.c:2046
 msgid "Sets the maximum allowed duration of any wait for a lock."
 msgstr "Imposta la durata massima consentita di qualsiasi attesa per un lock."
 
-#: utils/misc/guc.c:2056
+#: utils/misc/guc.c:2057
 msgid "Minimum age at which VACUUM should freeze a table row."
 msgstr "Anzianità minima alla quale il VACUUM deve congelare una riga di tabella."
 
-#: utils/misc/guc.c:2066
+#: utils/misc/guc.c:2067
 msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr "Anzianità alla quale il VACUUM deve scandire l'intera tabella per congelarne le tuple."
 
-#: utils/misc/guc.c:2076
+#: utils/misc/guc.c:2077
 msgid "Minimum age at which VACUUM should freeze a MultiXactId in a table row."
 msgstr "Anzianità minima alla quale VACUUM deve congelare un MultiXactId in una riga di tabella."
 
-#: utils/misc/guc.c:2086
+#: utils/misc/guc.c:2087
 msgid "Multixact age at which VACUUM should scan whole table to freeze tuples."
 msgstr "Anzianità del multixact alla quale VACUUM deve scandire tutta la tabella per congelare le tuple."
 
-#: utils/misc/guc.c:2096
+#: utils/misc/guc.c:2097
 msgid "Number of transactions by which VACUUM and HOT cleanup should be deferred, if any."
 msgstr "Numero di transazioni per cui VACUUM e pulizia HOT devono essere deferibili, se impostata."
 
-#: utils/misc/guc.c:2109
+#: utils/misc/guc.c:2110
 msgid "Sets the maximum number of locks per transaction."
 msgstr "Definisce il numero massimo di lock per transazione."
 
-#: utils/misc/guc.c:2110
+#: utils/misc/guc.c:2111
 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 tabella degli shared lock è dimensionata secondo l'assunzione che al massimo max_locks_per_transaction * max_connections distinti oggetti avranno bisogni di essere lockati in un determinato istante."
 
-#: utils/misc/guc.c:2121
+#: utils/misc/guc.c:2122
 msgid "Sets the maximum number of predicate locks per transaction."
 msgstr "Imposta il numero massimo di lock di predicato per transazione."
 
-#: utils/misc/guc.c:2122
+#: utils/misc/guc.c:2123
 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 tabella dei lock di predicato è dimensionata secondo l'assunzione che al massimo max_pred_locks_per_transaction * max_connections distinti oggetti avranno bisogni di essere lockati in un determinato istante."
 
-#: utils/misc/guc.c:2133
+#: utils/misc/guc.c:2134
 msgid "Sets the maximum allowed time to complete client authentication."
 msgstr "Imposta il tempo massimo consentito per completare l'autenticazione del client."
 
-#: utils/misc/guc.c:2145
+#: utils/misc/guc.c:2146
 msgid "Waits N seconds on connection startup before authentication."
 msgstr "Attendi N secondi all'avvio della connessione prima dell'autenticazione."
 
-#: utils/misc/guc.c:2156
+#: utils/misc/guc.c:2157
 msgid "Sets the number of WAL files held for standby servers."
 msgstr "Imposta il numero di file WAL trattenuti dai server in standby."
 
-#: utils/misc/guc.c:2166
+#: utils/misc/guc.c:2167
 msgid "Sets the minimum size to shrink the WAL to."
 msgstr "Imposta la dimensione minima a cui ridurre il file WAL."
 
-#: utils/misc/guc.c:2177
+#: utils/misc/guc.c:2178
 msgid "Sets the WAL size that triggers a checkpoint."
 msgstr "Imosta la dimensione del WAL che fa scattare un checkpoint."
 
-#: utils/misc/guc.c:2188
+#: utils/misc/guc.c:2189
 msgid "Sets the maximum time between automatic WAL checkpoints."
 msgstr "Imposta il tempo massimo intercorrente fra due checkpoint automatici del WAL."
 
-#: utils/misc/guc.c:2199
+#: utils/misc/guc.c:2200
 msgid "Enables warnings if checkpoint segments are filled more frequently than this."
 msgstr "Abilita gli avvertimenti se i segmenti dei checkpoint sono riempiti più frequentemente di questo valore."
 
-#: utils/misc/guc.c:2201
+#: utils/misc/guc.c:2202
 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 "Scrive un messaggio nel log del server se i checkpoint dovuti al riempimento dei file dei segmenti dei checkpoint avvengono più frequentemente di questo numero di secondi. Il valore 0 (zero) disabilita questi avvisi."
 
-#: utils/misc/guc.c:2213
+#: utils/misc/guc.c:2214
 msgid "Sets the number of disk-page buffers in shared memory for WAL."
 msgstr "Imposta il numero di buffer delle pagine su disco in shared memory per il WAL."
 
-#: utils/misc/guc.c:2224
+#: utils/misc/guc.c:2225
 msgid "WAL writer sleep time between WAL flushes."
 msgstr "Tempo di pausa del WAL writer tra due flush dei WAL."
 
-#: utils/misc/guc.c:2236
+#: utils/misc/guc.c:2237
 msgid "Sets the maximum number of simultaneously running WAL sender processes."
 msgstr "Imposta il numero massimo di processi WAL sender in esecuzione simultanea."
 
-#: utils/misc/guc.c:2247
+#: utils/misc/guc.c:2248
 msgid "Sets the maximum number of simultaneously defined replication slots."
 msgstr "Imposta il numero massimo di slot di replica definiti simultaneamente."
 
-#: utils/misc/guc.c:2257
+#: utils/misc/guc.c:2258
 msgid "Sets the maximum time to wait for WAL replication."
 msgstr "Imposta il tempo di attesa massimo per una replica WAL."
 
-#: utils/misc/guc.c:2268
+#: utils/misc/guc.c:2269
 msgid "Sets the delay in microseconds between transaction commit and flushing WAL to disk."
 msgstr "Imposta il ritardo in microsecondi tra il commit della transazione e il flushing del WAL su disco."
 
-#: utils/misc/guc.c:2280
+#: utils/misc/guc.c:2281
 msgid "Sets the minimum concurrent open transactions before performing commit_delay."
 msgstr "Imposta il numero minimo di transazioni concorrenti aperte prima di eseguire un commit_delay"
 
-#: utils/misc/guc.c:2291
+#: utils/misc/guc.c:2292
 msgid "Sets the number of digits displayed for floating-point values."
 msgstr "Imposta il numero di cifre visualizzate per i valori in virgola mobile."
 
-#: utils/misc/guc.c:2292
+#: utils/misc/guc.c:2293
 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 "Ciò ha effetto sui tipi di dati real, double precision e geometrici. Il valore del parametro è sommato al numero standard di cifre (FLT_DIG o DBL_DIG a seconda dei casi)."
 
-#: utils/misc/guc.c:2303
+#: utils/misc/guc.c:2304
 msgid "Sets the minimum execution time above which statements will be logged."
 msgstr "Imposta il tempo minimo di esecuzione oltre il quale le istruzioni vengono registrate nel log."
 
-#: utils/misc/guc.c:2305
+#: utils/misc/guc.c:2306
 msgid "Zero prints all queries. -1 turns this feature off."
 msgstr "Il valore 0 (zero) fa sì che tutte le query siano registrate. Il valore -1 disabilita questa caratteristica."
 
-#: utils/misc/guc.c:2315
+#: utils/misc/guc.c:2316
 msgid "Sets the minimum execution time above which autovacuum actions will be logged."
 msgstr "Imposta il tempo minimo di esecuzione oltre il quale le azioni dell'autovacuum vengono registrate nel log."
 
-#: utils/misc/guc.c:2317
+#: utils/misc/guc.c:2318
 msgid "Zero prints all actions. -1 turns autovacuum logging off."
 msgstr "Il valore 0 (zero) fa sì che tutte le azioni siano registrate. Il valore -1 disabilita il logging dell'autovacuum."
 
-#: utils/misc/guc.c:2327
+#: utils/misc/guc.c:2328
 msgid "Background writer sleep time between rounds."
 msgstr "Il tempo di pausa fra due tornate del background writer."
 
-#: utils/misc/guc.c:2338
+#: utils/misc/guc.c:2339
 msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr "Il numero massimo di pagine LRU che il background writer scarica ad ogni tornata."
 
-#: utils/misc/guc.c:2350
+#: utils/misc/guc.c:2351
 msgid "Number of simultaneous requests that can be handled efficiently by the disk subsystem."
 msgstr "Il numero di richieste simultanee che possono essere gestite con efficienza dal sottosistema a dischi."
 
-#: utils/misc/guc.c:2351
+#: utils/misc/guc.c:2352
 msgid "For RAID arrays, this should be approximately the number of drive spindles in the array."
 msgstr "Per i sistemi RAID, questo valore è pari all'incirca al numero di dischi fisici nell'array."
 
-#: utils/misc/guc.c:2366
+#: utils/misc/guc.c:2367
 msgid "Maximum number of concurrent worker processes."
 msgstr "Numero massimo di processi worker concorrenti."
 
-#: utils/misc/guc.c:2376
+#: utils/misc/guc.c:2377
 msgid "Automatic log file rotation will occur after N minutes."
 msgstr "La rotazione automatica dei log avviene dopo N minuti."
 
-#: utils/misc/guc.c:2387
+#: utils/misc/guc.c:2388
 msgid "Automatic log file rotation will occur after N kilobytes."
 msgstr "La rotazione automatica dei log avviene dopo N kilobyte."
 
-#: utils/misc/guc.c:2398
+#: utils/misc/guc.c:2399
 msgid "Shows the maximum number of function arguments."
 msgstr "Mostra il numero massimo di argomenti delle funzioni."
 
-#: utils/misc/guc.c:2409
+#: utils/misc/guc.c:2410
 msgid "Shows the maximum number of index keys."
 msgstr "Mostra il numero massimo di chiavi degli indici."
 
-#: utils/misc/guc.c:2420
+#: utils/misc/guc.c:2421
 msgid "Shows the maximum identifier length."
 msgstr "Mostra la lunghezza massima per gli identificatori."
 
-#: utils/misc/guc.c:2431
+#: utils/misc/guc.c:2432
 msgid "Shows the size of a disk block."
 msgstr "Mostra la dimensione di un blocco su disco."
 
-#: utils/misc/guc.c:2442
+#: utils/misc/guc.c:2443
 msgid "Shows the number of pages per disk file."
 msgstr "Mostra il numero di pagine per file su disco."
 
-#: utils/misc/guc.c:2453
+#: utils/misc/guc.c:2454
 msgid "Shows the block size in the write ahead log."
 msgstr "Mostra la dimensione del log di write ahead."
 
-#: utils/misc/guc.c:2464
-msgid "Sets the time to wait before retrying to retrieve WALafter a failed attempt."
+#: utils/misc/guc.c:2465
+msgid "Sets the time to wait before retrying to retrieve WAL after a failed attempt."
 msgstr "Imposta il tempo di attesa prima di riprovare a recuperare un WAL dopo un tentativo fallito."
 
-#: utils/misc/guc.c:2476
+#: utils/misc/guc.c:2477
 msgid "Shows the number of pages per write ahead log segment."
 msgstr "Mostra il numero di pagine per un segmento del log di write ahead."
 
-#: utils/misc/guc.c:2489
+#: utils/misc/guc.c:2490
 msgid "Time to sleep between autovacuum runs."
 msgstr "Tempo di pausa fra due esecuzioni di autovacuum."
 
-#: utils/misc/guc.c:2499
+#: utils/misc/guc.c:2500
 msgid "Minimum number of tuple updates or deletes prior to vacuum."
 msgstr "Numero minimo di modifiche o cancellazioni di tuple prima dell'esecuzione di un autovacuum."
 
-#: utils/misc/guc.c:2508
+#: utils/misc/guc.c:2509
 msgid "Minimum number of tuple inserts, updates, or deletes prior to analyze."
 msgstr "Numero minimo di inserimenti, modifiche o cancellazioni di tuple prima dell'esecuzione di un analyze."
 
-#: utils/misc/guc.c:2518
+#: utils/misc/guc.c:2519
 msgid "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr "Anzianità alla quale eseguire un autovacuum su una tabella per prevenire il wraparound dell'ID delle transazioni."
 
-#: utils/misc/guc.c:2529
+#: utils/misc/guc.c:2530
 msgid "Multixact age at which to autovacuum a table to prevent multixact wraparound."
 msgstr "Anzianità multixaxt a cui eseguire l'autovacuum di una tabella per prevenire il wraparound del multixact."
 
-#: utils/misc/guc.c:2539
+#: utils/misc/guc.c:2540
 msgid "Sets the maximum number of simultaneously running autovacuum worker processes."
 msgstr "Imposta il numero massimo dei processi worker dell'autovacuum in esecuzione contemporanea."
 
-#: utils/misc/guc.c:2549
+#: utils/misc/guc.c:2550
 msgid "Sets the maximum memory to be used by each autovacuum worker process."
 msgstr "Imposta la memoria massima utilizzabile da ogni processo autovacuum."
 
-#: utils/misc/guc.c:2560
+#: utils/misc/guc.c:2561
 msgid "Time between issuing TCP keepalives."
 msgstr "Tempo di attesa fra due keepalive TCP."
 
-#: utils/misc/guc.c:2561 utils/misc/guc.c:2572
+#: utils/misc/guc.c:2562 utils/misc/guc.c:2573
 msgid "A value of 0 uses the system default."
 msgstr "Il valore 0 (zero) fa sì che si applichi il valore predefinito di sistema."
 
-#: utils/misc/guc.c:2571
+#: utils/misc/guc.c:2572
 msgid "Time between TCP keepalive retransmits."
 msgstr "Tempo che intercorre fra due ritrasmissioni del keepalive TCP."
 
-#: utils/misc/guc.c:2582
+#: utils/misc/guc.c:2583
+msgid "SSL regenotiation is no longer supported; this can only be 0."
+msgstr "Il rinegoziamento SSL non è più supportato: può essere solo 0."
+
+#: utils/misc/guc.c:2594
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "Numero massimo di ritrasmissioni del keepalive TCP."
 
-#: utils/misc/guc.c:2583
+#: utils/misc/guc.c:2595
 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 "Ciò controlla il numero di ritrasmissioni consecutive del keepalive che possono andare perdute prima che una connessione sia considerata morta. Il valore 0 (zero) fa sì che si applichi il valore predefinito di sistema."
 
-#: utils/misc/guc.c:2594
+#: utils/misc/guc.c:2606
 msgid "Sets the maximum allowed result for exact search by GIN."
 msgstr "Imposta il risultato massimo consentito per le ricerche esatte tramite GIN."
 
-#: utils/misc/guc.c:2605
+#: utils/misc/guc.c:2617
 msgid "Sets the planner's assumption about the size of the disk cache."
 msgstr "Imposta le assunzioni del planner in merito alla dimensione della cache dei dischi."
 
-#: utils/misc/guc.c:2606
+#: utils/misc/guc.c:2618
 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 "Cioè la porzione della cache dei dischi nel kernel che sarà usata per i file dati di PostgreSQL. Viene misurata in pagine disco, che normalmente sono da 8 KB ciascuna."
 
-#: utils/misc/guc.c:2619
+#: utils/misc/guc.c:2631
 msgid "Shows the server version as an integer."
 msgstr "Mostra la versione del server come un intero."
 
-#: utils/misc/guc.c:2630
+#: utils/misc/guc.c:2642
 msgid "Log the use of temporary files larger than this number of kilobytes."
 msgstr "Registra nel log l'uso di file temporanei più grandi di questo numero di kilobyte."
 
-#: utils/misc/guc.c:2631
+#: utils/misc/guc.c:2643
 msgid "Zero logs all files. The default is -1 (turning this feature off)."
 msgstr "Il valore 0 (zero) fa registrare tutti i file. Il default è -1 (che disabilita la registrazione)."
 
-#: utils/misc/guc.c:2641
+#: utils/misc/guc.c:2653
 msgid "Sets the size reserved for pg_stat_activity.query, in bytes."
 msgstr "Imposta la dimensione in byte riservata a pg_stat_activity.query."
 
-#: utils/misc/guc.c:2656
+#: utils/misc/guc.c:2668
 msgid "Sets the maximum size of the pending list for GIN index."
 msgstr "Imposta la dimensione massima della lista di attesa per gli indici GIN."
 
-#: utils/misc/guc.c:2676
+#: utils/misc/guc.c:2688
 msgid "Sets the planner's estimate of the cost of a sequentially fetched disk page."
 msgstr "Imposta la stima del planner del costo di una pagina di disco letta sequenzialmente."
 
-#: utils/misc/guc.c:2686
+#: utils/misc/guc.c:2698
 msgid "Sets the planner's estimate of the cost of a nonsequentially fetched disk page."
 msgstr "Imposta la stima del planner del costo di una pagina di disco letta non sequenzialmente."
 
-#: utils/misc/guc.c:2696
+#: utils/misc/guc.c:2708
 msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
 msgstr "Imposta la stima del planner del costo di elaborazione di ogni tupla (riga)."
 
-#: utils/misc/guc.c:2706
+#: utils/misc/guc.c:2718
 msgid "Sets the planner's estimate of the cost of processing each index entry during an index scan."
 msgstr "Imposta la stima del il planner del costo di elaborazione di un singolo elemento di indice durante una scansione di indice."
 
-#: utils/misc/guc.c:2716
+#: utils/misc/guc.c:2728
 msgid "Sets the planner's estimate of the cost of processing each operator or function call."
 msgstr "Imposta la stima del planner del costo di elaborazione di un singolo operatore o chiamata di funzione."
 
-#: utils/misc/guc.c:2727
+#: utils/misc/guc.c:2739
 msgid "Sets the planner's estimate of the fraction of a cursor's rows that will be retrieved."
 msgstr "Imposta la stima del planner della frazione delle righe di un cursore che verranno lette."
 
-#: utils/misc/guc.c:2738
+#: utils/misc/guc.c:2750
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: pressione selettiva all'interno della popolazione."
 
-#: utils/misc/guc.c:2748
+#: utils/misc/guc.c:2760
 msgid "GEQO: seed for random path selection."
 msgstr "GEQO: seme per la selezione casuale dei percorsi."
 
-#: utils/misc/guc.c:2758
+#: utils/misc/guc.c:2770
 msgid "Multiple of the average buffer usage to free per round."
 msgstr "Multiplo dell'utilizzo medio dei buffer da liberarsi ad ogni giro."
 
-#: utils/misc/guc.c:2768
+#: utils/misc/guc.c:2780
 msgid "Sets the seed for random-number generation."
 msgstr "Imposta il seme per la generazione di numeri casuali."
 
-#: utils/misc/guc.c:2779
+#: utils/misc/guc.c:2791
 msgid "Number of tuple updates or deletes prior to vacuum as a fraction of reltuples."
 msgstr "Il numero di modifiche o cancellazioni di tuple prima di un VACUUM, come frazione di reltuples."
 
-#: utils/misc/guc.c:2788
+#: utils/misc/guc.c:2800
 msgid "Number of tuple inserts, updates, or deletes prior to analyze as a fraction of reltuples."
 msgstr "Numero di inserimenti, modifiche o cancellazioni di tuple prima di un ANALYZE, come frazione di reltuples."
 
-#: utils/misc/guc.c:2798
+#: utils/misc/guc.c:2810
 msgid "Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."
 msgstr "Il tempo speso nell'eseguire il flush dei buffer sporchi durante i checkpoint, come frazione dell'intervallo di checkpoint."
 
-#: utils/misc/guc.c:2817
+#: utils/misc/guc.c:2829
 msgid "Sets the shell command that will be called to archive a WAL file."
 msgstr "Imposta il comando di shell che verrà eseguito per archiviare un file WAL."
 
-#: utils/misc/guc.c:2827
+#: utils/misc/guc.c:2839
 msgid "Sets the client's character set encoding."
 msgstr "Imposta la codifica dei caratteri del client."
 
-#: utils/misc/guc.c:2838
+#: utils/misc/guc.c:2850
 msgid "Controls information prefixed to each log line."
 msgstr "Controlla l'informazione usata come prefisso per ogni riga di log."
 
-#: utils/misc/guc.c:2839
+#: utils/misc/guc.c:2851
 msgid "If blank, no prefix is used."
 msgstr "Se lasciata vuota non sarà usato alcun prefisso."
 
-#: utils/misc/guc.c:2848
+#: utils/misc/guc.c:2860
 msgid "Sets the time zone to use in log messages."
 msgstr "Imposta il fuso orario da usarsi nei messaggi di log."
 
-#: utils/misc/guc.c:2858
+#: utils/misc/guc.c:2870
 msgid "Sets the display format for date and time values."
 msgstr "Imposta il formato per la visualizzazione dei valori di data e ora."
 
-#: utils/misc/guc.c:2859
+#: utils/misc/guc.c:2871
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr "Controlla anche l'interpretazione di input ambigui per le date."
 
-#: utils/misc/guc.c:2870
+#: utils/misc/guc.c:2882
 msgid "Sets the default tablespace to create tables and indexes in."
 msgstr "Imposta il tablespace di default in cui create tabelle e indici."
 
-#: utils/misc/guc.c:2871
+#: utils/misc/guc.c:2883
 msgid "An empty string selects the database's default tablespace."
 msgstr "Una stringa vuota selezione il tablespace predefinito del database."
 
-#: utils/misc/guc.c:2881
+#: utils/misc/guc.c:2893
 msgid "Sets the tablespace(s) to use for temporary tables and sort files."
 msgstr "Definisce i(l) tablespace da usarsi per le tabelle temporanee e i file di ordinamento."
 
-#: utils/misc/guc.c:2892
+#: utils/misc/guc.c:2904
 msgid "Sets the path for dynamically loadable modules."
 msgstr "Definisce il percorso per i moduli caricabili dinamicamente."
 
-#: utils/misc/guc.c:2893
+#: utils/misc/guc.c:2905
 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 "Se si deve aprire un modulo caricabile dinamicamente e il nome specificato non contiene un percorso di directory (se non contiene uno slash) il sistema cercherà il file specificato in questo percorso."
 
-#: utils/misc/guc.c:2906
+#: utils/misc/guc.c:2918
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Imposta la posizione del key file del server Kerberos."
 
-#: utils/misc/guc.c:2917
+#: utils/misc/guc.c:2929
 msgid "Sets the Bonjour service name."
 msgstr "Imposta il nome del servizio Bonjour."
 
-#: utils/misc/guc.c:2929
+#: utils/misc/guc.c:2941
 msgid "Shows the collation order locale."
 msgstr "Mostra la localizzazione dell'ordine di collazione."
 
-#: utils/misc/guc.c:2940
+#: utils/misc/guc.c:2952
 msgid "Shows the character classification and case conversion locale."
 msgstr "Mostra la localizzazione per la classificazione dei caratteri e la conversione maiuscole/minuscole."
 
-#: utils/misc/guc.c:2951
+#: utils/misc/guc.c:2963
 msgid "Sets the language in which messages are displayed."
 msgstr "Mostra la lingua in cui i messaggi sono visualizzati."
 
-#: utils/misc/guc.c:2961
+#: utils/misc/guc.c:2973
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "Imposta la localizzazione per la formattazione delle quantità monetarie."
 
-#: utils/misc/guc.c:2971
+#: utils/misc/guc.c:2983
 msgid "Sets the locale for formatting numbers."
 msgstr "Imposta la localizzazione per la formattazione dei numeri."
 
-#: utils/misc/guc.c:2981
+#: utils/misc/guc.c:2993
 msgid "Sets the locale for formatting date and time values."
 msgstr "Imposta la localizzazione per la formattazione per i valori di tipo data e ora."
 
-#: utils/misc/guc.c:2991
+#: utils/misc/guc.c:3003
 msgid "Lists shared libraries to preload into each backend."
 msgstr "Imposta la lista delle librerie condivise da precaricare on ogni backend."
 
-#: utils/misc/guc.c:3002
+#: utils/misc/guc.c:3014
 msgid "Lists shared libraries to preload into server."
 msgstr "Imposta la lista delle librerie condivise da precaricare nel server."
 
-#: utils/misc/guc.c:3013
+#: utils/misc/guc.c:3025
 msgid "Lists unprivileged shared libraries to preload into each backend."
 msgstr "Imposta la lista delle librarie condivise non privilegiate da precaricare in ogni backend."
 
-#: utils/misc/guc.c:3024
+#: utils/misc/guc.c:3036
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr "Imposta l'ordine di ricerca degli schema per i nomi che non hanno un qualifica di schema."
 
-#: utils/misc/guc.c:3036
+#: utils/misc/guc.c:3048
 msgid "Sets the server (database) character set encoding."
 msgstr "Imposta la codifica del set di caratteri per il server (database)."
 
-#: utils/misc/guc.c:3048
+#: utils/misc/guc.c:3060
 msgid "Shows the server version."
 msgstr "Mostra la versione del server."
 
-#: utils/misc/guc.c:3060
+#: utils/misc/guc.c:3072
 msgid "Sets the current role."
 msgstr "Mostra il ruolo corrente."
 
-#: utils/misc/guc.c:3072
+#: utils/misc/guc.c:3084
 msgid "Sets the session user name."
 msgstr "Mostra il nome dell'utente della sessione."
 
-#: utils/misc/guc.c:3083
+#: utils/misc/guc.c:3095
 msgid "Sets the destination for server log output."
 msgstr "Imposta la destinazione per l'output dei log del server."
 
-#: utils/misc/guc.c:3084
+#: utils/misc/guc.c:3096
 msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and \"eventlog\", depending on the platform."
 msgstr "I valori validi sono combinazioni di \"stderr\", \"syslog\", \"csvlog\" ed \"eventlog\", a seconda delle piattaforme."
 
-#: utils/misc/guc.c:3095
+#: utils/misc/guc.c:3107
 msgid "Sets the destination directory for log files."
 msgstr "Imposta la directory di destinazione dei file di log."
 
-#: utils/misc/guc.c:3096
+#: utils/misc/guc.c:3108
 msgid "Can be specified as relative to the data directory or as absolute path."
 msgstr "Può essere specificata sia come relativa alla directory data sia come percorso assoluto."
 
-#: utils/misc/guc.c:3106
+#: utils/misc/guc.c:3118
 msgid "Sets the file name pattern for log files."
 msgstr "Imposta il pattern dei nomi dei file di log."
 
-#: utils/misc/guc.c:3117
+#: utils/misc/guc.c:3129
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr "Imposta il nome del programma da utilizzato per identificare i messaggi di PostgreSQL in syslog."
 
-#: utils/misc/guc.c:3128
+#: utils/misc/guc.c:3140
 msgid "Sets the application name used to identify PostgreSQL messages in the event log."
 msgstr "Imposta il nome del programma da usarsi per identificare i messaggi di PostgreSQL nel registro degli eventi."
 
-#: utils/misc/guc.c:3139
+#: utils/misc/guc.c:3151
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr "Imposta il fuso orario per visualizzare ed interpretare gli orari."
 
-#: utils/misc/guc.c:3149
+#: utils/misc/guc.c:3161
 msgid "Selects a file of time zone abbreviations."
 msgstr "Seleziona un file contenente le abbreviazioni dei fusi orari."
 
-#: utils/misc/guc.c:3159
+#: utils/misc/guc.c:3171
 msgid "Sets the current transaction's isolation level."
 msgstr "Imposta il livello di isolamento per la transazione in corso."
 
-#: utils/misc/guc.c:3170
+#: utils/misc/guc.c:3182
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Imposta il gruppo di appartenenza per i socket di dominio Unix."
 
-#: utils/misc/guc.c:3171
+#: utils/misc/guc.c:3183
 msgid "The owning user of the socket is always the user that starts the server."
 msgstr "L'utente che possiede il socket è sempre l'utente che ha avviato il server."
 
-#: utils/misc/guc.c:3181
+#: utils/misc/guc.c:3193
 msgid "Sets the directories where Unix-domain sockets will be created."
 msgstr "Imposta la directory dove i socket di dominio Unix verranno creati."
 
-#: utils/misc/guc.c:3196
+#: utils/misc/guc.c:3208
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr "Imposta il nome host o gli indirizzi IP su cui ascoltare."
 
-#: utils/misc/guc.c:3211
+#: utils/misc/guc.c:3223
 msgid "Sets the server's data directory."
 msgstr "Imposta la posizione della directory dati"
 
-#: utils/misc/guc.c:3222
+#: utils/misc/guc.c:3234
 msgid "Sets the server's main configuration file."
 msgstr "Imposta il file primario di configurazione del server."
 
-#: utils/misc/guc.c:3233
+#: utils/misc/guc.c:3245
 msgid "Sets the server's \"hba\" configuration file."
 msgstr "Imposta il file di configurazione \"hba\" del server."
 
-#: utils/misc/guc.c:3244
+#: utils/misc/guc.c:3256
 msgid "Sets the server's \"ident\" configuration file."
 msgstr "Imposta il file di configurazione \"ident\" del server."
 
-#: utils/misc/guc.c:3255
+#: utils/misc/guc.c:3267
 msgid "Writes the postmaster PID to the specified file."
 msgstr "Scrivi il PID del postmaster nel file specificato."
 
-#: utils/misc/guc.c:3266
+#: utils/misc/guc.c:3278
 msgid "Location of the SSL server certificate file."
 msgstr "Posizione del file di certificati del server SSL."
 
-#: utils/misc/guc.c:3276
+#: utils/misc/guc.c:3288
 msgid "Location of the SSL server private key file."
-msgstr "Posizione del file della chiave primaria del server SSL."
+msgstr "Posizione del file della chiave privata del server SSL."
 
-#: utils/misc/guc.c:3286
+#: utils/misc/guc.c:3298
 msgid "Location of the SSL certificate authority file."
 msgstr "Posizione del file di autorità dei certificati del server SSL."
 
-#: utils/misc/guc.c:3296
+#: utils/misc/guc.c:3308
 msgid "Location of the SSL certificate revocation list file."
 msgstr "Posizione del file della lista di revoche di certificati SSL."
 
-#: utils/misc/guc.c:3306
+#: utils/misc/guc.c:3318
 msgid "Writes temporary statistics files to the specified directory."
 msgstr "Scrive i file di statistiche temporanee nella directory specificata."
 
-#: utils/misc/guc.c:3317
+#: utils/misc/guc.c:3329
 msgid "List of names of potential synchronous standbys."
 msgstr "Elenco dei nomi dei potenziali standby sincroni."
 
-#: utils/misc/guc.c:3328
+#: utils/misc/guc.c:3340
 msgid "Sets default text search configuration."
 msgstr "Imposta la configurazione di ricerca di testo predefinita."
 
-#: utils/misc/guc.c:3338
+#: utils/misc/guc.c:3350
 msgid "Sets the list of allowed SSL ciphers."
 msgstr "Imposta la lista di codici SSL consentiti."
 
-#: utils/misc/guc.c:3353
+#: utils/misc/guc.c:3365
 msgid "Sets the curve to use for ECDH."
 msgstr "Imposta la curva da usare per l'ECHD."
 
-#: utils/misc/guc.c:3368
+#: utils/misc/guc.c:3380
 msgid "Sets the application name to be reported in statistics and logs."
 msgstr "Imposta il nome dell'applicazione da riportare nelle statistiche e nei log."
 
-#: utils/misc/guc.c:3379
-msgid "Sets the name of the cluster which is included in the process title."
-msgstr "Imposta il nome del cluster incluso nel titolo del processo."
+#: utils/misc/guc.c:3391
+msgid "Sets the name of the cluster, which is included in the process title."
+msgstr "Imposta il nome del cluster, che è incluso nel titolo del processo."
 
-#: utils/misc/guc.c:3399
+#: utils/misc/guc.c:3411
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "Imposta se \"\\'\" è consentito nei letterali stringa."
 
-#: utils/misc/guc.c:3409
+#: utils/misc/guc.c:3421
 msgid "Sets the output format for bytea."
 msgstr "Imposta il formato di output di bytea."
 
-#: utils/misc/guc.c:3419
+#: utils/misc/guc.c:3431
 msgid "Sets the message levels that are sent to the client."
 msgstr "Imposta quali livelli di messaggi sono inviati al client"
 
-#: utils/misc/guc.c:3420 utils/misc/guc.c:3473 utils/misc/guc.c:3484
-#: utils/misc/guc.c:3550
+#: utils/misc/guc.c:3432 utils/misc/guc.c:3485 utils/misc/guc.c:3496
+#: utils/misc/guc.c:3562
 msgid "Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
 msgstr "Ogni livello include tutti i livelli che lo seguono. Più avanti il livello, meno messaggi sono inviati."
 
-#: utils/misc/guc.c:3430
+#: utils/misc/guc.c:3442
 msgid "Enables the planner to use constraints to optimize queries."
 msgstr "Permette al planner di usare i vincoli per ottimizzare le query."
 
-#: utils/misc/guc.c:3431
+#: utils/misc/guc.c:3443
 msgid "Table scans will be skipped if their constraints guarantee that no rows match the query."
 msgstr "La scansioni delle tabelle saranno evitate se i loro vincoli garantiscono che nessuna riga corrisponda con la query."
 
-#: utils/misc/guc.c:3441
+#: utils/misc/guc.c:3453
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "Imposta il livello di isolamento predefinito per ogni nuova transazione."
 
-#: utils/misc/guc.c:3451
+#: utils/misc/guc.c:3463
 msgid "Sets the display format for interval values."
 msgstr "Imposta il formato di visualizzazione per intervalli."
 
-#: utils/misc/guc.c:3462
+#: utils/misc/guc.c:3474
 msgid "Sets the verbosity of logged messages."
 msgstr "Imposta la prolissità dei messaggi registrati."
 
-#: utils/misc/guc.c:3472
+#: utils/misc/guc.c:3484
 msgid "Sets the message levels that are logged."
 msgstr "Imposta i livelli dei messaggi registrati."
 
-#: utils/misc/guc.c:3483
+#: utils/misc/guc.c:3495
 msgid "Causes all statements generating error at or above this level to be logged."
 msgstr "Fa in modo che tutti gli eventi che generano errore a questo livello o a un livello superiore siano registrati nel log."
 
-#: utils/misc/guc.c:3494
+#: utils/misc/guc.c:3506
 msgid "Sets the type of statements logged."
 msgstr "Imposta il tipo di istruzioni registrato nel log."
 
-#: utils/misc/guc.c:3504
+#: utils/misc/guc.c:3516
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr "Imposta la \"facility\" da usare quando syslog è abilitato."
 
-#: utils/misc/guc.c:3519
+#: utils/misc/guc.c:3531
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr "Imposta il comportamento delle sessioni per i trigger e le regole di riscrittura."
 
-#: utils/misc/guc.c:3529
+#: utils/misc/guc.c:3541
 msgid "Sets the current transaction's synchronization level."
 msgstr "Imposta il livello di sincronizzazione della transazione corrente."
 
-#: utils/misc/guc.c:3539
+#: utils/misc/guc.c:3551
 msgid "Allows archiving of WAL files using archive_command."
 msgstr "Consente l'archiviazione dei file WAL con l'uso di archive_command."
 
-#: utils/misc/guc.c:3549
+#: utils/misc/guc.c:3561
 msgid "Enables logging of recovery-related debugging information."
 msgstr "Abilita il logging di informazioni di debug relative al recupero."
 
-#: utils/misc/guc.c:3565
+#: utils/misc/guc.c:3577
 msgid "Collects function-level statistics on database activity."
 msgstr "Raccogli statistiche al livello di funzioni sull'attività del database."
 
-#: utils/misc/guc.c:3575
+#: utils/misc/guc.c:3587
 msgid "Set the level of information written to the WAL."
 msgstr "Imposta il livello delle informazioni scritte nel WAL."
 
-#: utils/misc/guc.c:3585
+#: utils/misc/guc.c:3597
 msgid "Selects the dynamic shared memory implementation used."
 msgstr "Seleziona l'implementazione di memoria dinamica condivisa utilizzata."
 
-#: utils/misc/guc.c:3595
+#: utils/misc/guc.c:3607
 msgid "Selects the method used for forcing WAL updates to disk."
 msgstr "Seleziona il metodo usato per forzare aggiornamenti WAL su disco."
 
-#: utils/misc/guc.c:3605
+#: utils/misc/guc.c:3617
 msgid "Sets how binary values are to be encoded in XML."
 msgstr "imposta come i valori binari devono essere codificati nel formato XML."
 
-#: utils/misc/guc.c:3615
+#: utils/misc/guc.c:3627
 msgid "Sets whether XML data in implicit parsing and serialization operations is to be considered as documents or content fragments."
 msgstr "Imposta se qualunque dato XML nelle operazioni di parsing e serializzazione implicite debba essere considerato come un documento o frammento di un contenuto."
 
-#: utils/misc/guc.c:3626
+#: utils/misc/guc.c:3638
 msgid "Use of huge pages on Linux."
 msgstr "Uso delle pagine huge su Linux."
 
-#: utils/misc/guc.c:3636
-msgid "Enable row security."
-msgstr "Abilita la sicurezza delle righe."
-
-#: utils/misc/guc.c:3637
-msgid "When enabled, row security will be applied to all users."
-msgstr "Quando abilitata, la sicurezza delle righe verrà applicata a tutti gli utenti."
-
-#: utils/misc/guc.c:4451
+#: utils/misc/guc.c:4453
 #, c-format
 msgid ""
 "%s does not know where to find the server configuration file.\n"
@@ -21633,12 +21633,12 @@
 "%s non sa dove trovare il file di configurazione del server.\n"
 "Devi specificare le opzioni --config-file o -D, oppure impostare la variabile d'ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:4470
+#: utils/misc/guc.c:4472
 #, c-format
 msgid "%s cannot access the server configuration file \"%s\": %s\n"
 msgstr "%s non può accedere al file di configurazione del server \"%s\": %s\n"
 
-#: utils/misc/guc.c:4496
+#: utils/misc/guc.c:4498
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -21647,7 +21647,7 @@
 "%s non sa dove trovare i dati di sistema del database.\n"
 "Possono essere specificati come \"data_directory\" in \"%s\", oppure dall'opzione -D, oppure dalla variabile d'ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:4544
+#: utils/misc/guc.c:4546
 #, c-format
 msgid ""
 "%s does not know where to find the \"hba\" configuration file.\n"
@@ -21656,7 +21656,7 @@
 "%s non sa dove trovare il file di configurazione \"hba\".\n"
 "Può essere specificato come \"hba_file\" in \"%s\", oppure dall'opzione -D, oppure dalla variabile d'ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:4567
+#: utils/misc/guc.c:4569
 #, c-format
 msgid ""
 "%s does not know where to find the \"ident\" configuration file.\n"
@@ -21665,146 +21665,145 @@
 "%s non sa dove trovare il file di configurazione \"ident\".\n"
 "Può essere specificato come \"ident_file\" in \"%s\", oppure dall'opzione -D, oppure dalla variabile d'ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:5241 utils/misc/guc.c:5288
+#: utils/misc/guc.c:5243 utils/misc/guc.c:5290
 msgid "Value exceeds integer range."
 msgstr "Il valore non rientra nel limite possibile per gli interi."
 
-#: utils/misc/guc.c:5482 utils/misc/guc.c:5575 utils/misc/guc.c:6867
-#: utils/misc/guc.c:9584 utils/misc/guc.c:9618
-#, c-format
-msgid "invalid value for parameter \"%s\": \"%s\""
-msgstr "valore non valido per il parametro \"%s\": \"%s\""
-
-#: utils/misc/guc.c:5511
+#: utils/misc/guc.c:5513
 #, c-format
 msgid "parameter \"%s\" requires a numeric value"
 msgstr "il parametro \"%s\" richiede un valore numerico"
 
-#: utils/misc/guc.c:5520
+#: utils/misc/guc.c:5522
 #, c-format
 msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
 msgstr "%g non è compreso nell'intervallo di validità del il parametro \"%s\" (%g .. %g)"
 
-#: utils/misc/guc.c:5673 utils/misc/guc.c:7002
+#: utils/misc/guc.c:5675 utils/misc/guc.c:7017
 #, c-format
 msgid "cannot set parameters during a parallel operation"
 msgstr "non è possibile impostare parametri durante un'operazione parallela"
 
-#: utils/misc/guc.c:5680 utils/misc/guc.c:6430 utils/misc/guc.c:6482
-#: utils/misc/guc.c:6843 utils/misc/guc.c:7579 utils/misc/guc.c:7747
-#: utils/misc/guc.c:9404
+#: utils/misc/guc.c:5682 utils/misc/guc.c:6432 utils/misc/guc.c:6484
+#: utils/misc/guc.c:6845 utils/misc/guc.c:7605 utils/misc/guc.c:7764
+#: utils/misc/guc.c:9417
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "parametro di configurazione \"%s\" sconosciuto"
 
-#: utils/misc/guc.c:5695 utils/misc/guc.c:6855
+#: utils/misc/guc.c:5697 utils/misc/guc.c:6857
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "il parametro \"%s\" non può essere cambiato"
 
-#: utils/misc/guc.c:5718 utils/misc/guc.c:5910 utils/misc/guc.c:6000
-#: utils/misc/guc.c:6090 utils/misc/guc.c:6198 utils/misc/guc.c:6293
+#: utils/misc/guc.c:5720 utils/misc/guc.c:5912 utils/misc/guc.c:6002
+#: utils/misc/guc.c:6092 utils/misc/guc.c:6200 utils/misc/guc.c:6295
 #: guc-file.l:352
 #, c-format
 msgid "parameter \"%s\" cannot be changed without restarting the server"
 msgstr "il parametro \"%s\" non può essere cambiato senza riavviare il server"
 
-#: utils/misc/guc.c:5728
+#: utils/misc/guc.c:5730
 #, c-format
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "il parametro \"%s\" non può essere cambiato ora"
 
-#: utils/misc/guc.c:5746 utils/misc/guc.c:5791 utils/misc/guc.c:9420
+#: utils/misc/guc.c:5748 utils/misc/guc.c:5793 utils/misc/guc.c:9433
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "permesso di impostare il parametro \"%s\" negato"
 
-#: utils/misc/guc.c:5781
+#: utils/misc/guc.c:5783
 #, c-format
 msgid "parameter \"%s\" cannot be set after connection start"
 msgstr "il parametro \"%s\" non può essere impostato dopo l'avvio della connessione"
 
-#: utils/misc/guc.c:5829
+#: utils/misc/guc.c:5831
 #, c-format
 msgid "cannot set parameter \"%s\" within security-definer function"
 msgstr "il parametro \"%s\" non può essere impostato da una funzione che ha i privilegi del creatore"
 
-#: utils/misc/guc.c:6438 utils/misc/guc.c:6486 utils/misc/guc.c:7753
+#: utils/misc/guc.c:6440 utils/misc/guc.c:6488 utils/misc/guc.c:7768
 #, c-format
 msgid "must be superuser to examine \"%s\""
 msgstr "solo un superutente può esaminare \"%s\""
 
-#: utils/misc/guc.c:6552
+#: utils/misc/guc.c:6554
 #, c-format
 msgid "SET %s takes only one argument"
 msgstr "SET %s accetta un unico argomento"
 
-#: utils/misc/guc.c:6803
+#: utils/misc/guc.c:6805
 #, c-format
 msgid "must be superuser to execute ALTER SYSTEM command"
 msgstr "solo un superutente può eseguire il comando ALTER SYSTEM"
 
-#: utils/misc/guc.c:6916
+#: utils/misc/guc.c:6890
+#, c-format
+msgid "parameter value for ALTER SYSTEM must not contain a newline"
+msgstr "il valore del parametro di ALTER SYSTEM non può contenere un \"a capo\""
+
+#: utils/misc/guc.c:6935
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "non è possibile analizzare il contenuto del file \"%s\""
 
-#: utils/misc/guc.c:7078
+#: utils/misc/guc.c:7093
 #, c-format
 msgid "SET LOCAL TRANSACTION SNAPSHOT is not implemented"
 msgstr "SET LOCAL TRANSACTION SNAPSHOT non è implementato"
 
-#: utils/misc/guc.c:7163
+#: utils/misc/guc.c:7178
 #, c-format
 msgid "SET requires parameter name"
 msgstr "SET richiede il nome del parametro"
 
-#: utils/misc/guc.c:7276
+#: utils/misc/guc.c:7302
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "tentativo di ridefinire il parametro \"%s\""
 
-#: utils/misc/guc.c:9037
+#: utils/misc/guc.c:9050
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "il parametro \"%s\" non può essere impostato"
 
-#: utils/misc/guc.c:9124
+#: utils/misc/guc.c:9137
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "non è stato possibile interpretare l'impostazione del parametro \"%s\""
 
-#: utils/misc/guc.c:9482 utils/misc/guc.c:9516
+#: utils/misc/guc.c:9495 utils/misc/guc.c:9529
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "valore non valido per il parametro \"%s\": %d"
 
-#: utils/misc/guc.c:9550
+#: utils/misc/guc.c:9563
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "valore non valido per il parametro \"%s\": %g"
 
-#: utils/misc/guc.c:9740
+#: utils/misc/guc.c:9753
 #, c-format
 msgid "\"temp_buffers\" cannot be changed after any temporary tables have been accessed in the session."
 msgstr "\"temp_buffers\" non può essere modificato dopo che la sessione ha utilizzato qualsiasi tabella temporanea."
 
-#: utils/misc/guc.c:9752
+#: utils/misc/guc.c:9765
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour non è supportato in questo binario"
 
-#: utils/misc/guc.c:9765
+#: utils/misc/guc.c:9778
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL non è supportato in questo binario"
 
-#: utils/misc/guc.c:9777
+#: utils/misc/guc.c:9790
 #, c-format
 msgid "Cannot enable parameter when \"log_statement_stats\" is true."
 msgstr "Non è possibile abilitare il parametro quando \"log_statement_stats\" è abilitato."
 
-#: utils/misc/guc.c:9789
+#: utils/misc/guc.c:9802
 #, c-format
 msgid "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr "Non è possibile abilitare \"log_statement_stats\" quando \"log_parser_stats\", \"log_planner_stats\" o \"log_executor_stats\" sono abilitati."
@@ -21814,10 +21813,15 @@
 msgid "internal error: unrecognized run-time parameter type\n"
 msgstr "errore interno: tipo di parametro sconosciuto\n"
 
-#: utils/misc/rls.c:125
+#: utils/misc/rls.c:127
 #, c-format
-msgid "insufficient privilege to bypass row security."
-msgstr "privilegi insufficienti per scavalcare la sicurezza di riga."
+msgid "query would be affected by row-level security policy for table \"%s\""
+msgstr "la query sarebbe influenzata dalla regola di sicurezza per riga pre la tabella \"%s\""
+
+#: utils/misc/rls.c:129
+#, c-format
+msgid "To disable the policy for the table's owner, use ALTER TABLE NO FORCE ROW LEVEL SECURITY."
+msgstr "Per disabilitare la regola di sicurezza per il proprietario della tabella usa ALTER TABLE NO FORCE ROW LEVEL SECURITY."
 
 #: utils/misc/timeout.c:388
 #, c-format
@@ -21889,15 +21893,15 @@
 msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
 msgstr "@INCLUDE senza nome del file nel file di fusi orari \"%s\", riga %d"
 
-#: utils/mmgr/aset.c:505
+#: utils/mmgr/aset.c:506
 #, c-format
 msgid "Failed while creating memory context \"%s\"."
 msgstr "Errore durante la creazione del contesto di memoria \"%s\"."
 
-#: utils/mmgr/mcxt.c:686 utils/mmgr/mcxt.c:721 utils/mmgr/mcxt.c:758
-#: utils/mmgr/mcxt.c:795 utils/mmgr/mcxt.c:829 utils/mmgr/mcxt.c:858
-#: utils/mmgr/mcxt.c:892 utils/mmgr/mcxt.c:972 utils/mmgr/mcxt.c:1005
-#: utils/mmgr/mcxt.c:1052
+#: utils/mmgr/mcxt.c:689 utils/mmgr/mcxt.c:724 utils/mmgr/mcxt.c:761
+#: utils/mmgr/mcxt.c:798 utils/mmgr/mcxt.c:832 utils/mmgr/mcxt.c:861
+#: utils/mmgr/mcxt.c:895 utils/mmgr/mcxt.c:977 utils/mmgr/mcxt.c:1011
+#: utils/mmgr/mcxt.c:1060
 #, c-format
 msgid "Failed on request of size %zu."
 msgstr "Errore durante la richiesta di dimensione %zu."
@@ -21912,12 +21916,17 @@
 msgid "closing existing cursor \"%s\""
 msgstr "chiusura del cursore esistente \"%s\""
 
-#: utils/mmgr/portalmem.c:479
+#: utils/mmgr/portalmem.c:419
+#, c-format
+msgid "portal \"%s\" cannot be run"
+msgstr "il portale \"%s\" non può essere eseguito"
+
+#: utils/mmgr/portalmem.c:499
 #, c-format
 msgid "cannot drop active portal \"%s\""
 msgstr "non è possibile eliminare il portale attivo \"%s\""
 
-#: utils/mmgr/portalmem.c:669
+#: utils/mmgr/portalmem.c:689
 #, c-format
 msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
 msgstr "non è possibile eseguire PREPARE in una transazione che ha creato un cursore WITH HOLD"
@@ -21927,17 +21936,17 @@
 msgid "could not read block %ld of temporary file: %m"
 msgstr "lettura del blocco %ld dal file temporaneo fallita: %m"
 
-#: utils/sort/tuplesort.c:3591
+#: utils/sort/tuplesort.c:3606
 #, c-format
 msgid "could not create unique index \"%s\""
 msgstr "creazione dell'indice univoco \"%s\" fallita"
 
-#: utils/sort/tuplesort.c:3593
+#: utils/sort/tuplesort.c:3608
 #, c-format
 msgid "Key %s is duplicated."
 msgstr "La chiave %s è duplicata."
 
-#: utils/sort/tuplesort.c:3594
+#: utils/sort/tuplesort.c:3609
 #, c-format
 msgid "Duplicate keys exist."
 msgstr "Esistono chiavi duplicate."
@@ -21963,303 +21972,303 @@
 msgid "could not write to tuplestore temporary file: %m"
 msgstr "scrittura nel file temporaneo tuplestore fallita: %m"
 
-#: utils/time/snapmgr.c:432
+#: utils/time/snapmgr.c:473
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "La transazione di origine non è più in esecuzione."
 
 #  translator: %s represents an SQL statement name
-#: utils/time/snapmgr.c:986
+#: utils/time/snapmgr.c:1038
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "non è possibile esportare uno snapshot da una sotto-transazione"
 
-#: utils/time/snapmgr.c:1135 utils/time/snapmgr.c:1140
-#: utils/time/snapmgr.c:1145 utils/time/snapmgr.c:1160
-#: utils/time/snapmgr.c:1165 utils/time/snapmgr.c:1170
-#: utils/time/snapmgr.c:1269 utils/time/snapmgr.c:1285
-#: utils/time/snapmgr.c:1310
+#: utils/time/snapmgr.c:1187 utils/time/snapmgr.c:1192
+#: utils/time/snapmgr.c:1197 utils/time/snapmgr.c:1212
+#: utils/time/snapmgr.c:1217 utils/time/snapmgr.c:1222
+#: utils/time/snapmgr.c:1321 utils/time/snapmgr.c:1337
+#: utils/time/snapmgr.c:1362
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "dati dello snapshot non validi nel file \"%s\""
 
-#: utils/time/snapmgr.c:1207
+#: utils/time/snapmgr.c:1259
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "SET TRANSACTION SNAPSHOT dev'essere invocato prima di qualunque query"
 
-#: utils/time/snapmgr.c:1216
+#: utils/time/snapmgr.c:1268
 #, c-format
 msgid "a snapshot-importing transaction must have isolation level SERIALIZABLE or REPEATABLE READ"
 msgstr "una transazione che importa uno snapshot deve avere livello di isolamento SERIALIZABLE o REPEATABLE READ"
 
-#: utils/time/snapmgr.c:1225 utils/time/snapmgr.c:1234
+#: utils/time/snapmgr.c:1277 utils/time/snapmgr.c:1286
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "identificativo di snapshot non valido: \"%s\""
 
-#: utils/time/snapmgr.c:1323
+#: utils/time/snapmgr.c:1375
 #, c-format
 msgid "a serializable transaction cannot import a snapshot from a non-serializable transaction"
 msgstr "una transazione serializzabile non può importare uno snapshot da una transazione non serializzabile"
 
-#: utils/time/snapmgr.c:1327
+#: utils/time/snapmgr.c:1379
 #, c-format
 msgid "a non-read-only serializable transaction cannot import a snapshot from a read-only transaction"
 msgstr "una transazione non di sola lettura non può importare uno snapshot da una transazione di sola lettura"
 
-#: utils/time/snapmgr.c:1342
+#: utils/time/snapmgr.c:1394
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "non è possibile importare uno snapshot da un database diverso"
 
-#: gram.y:1010
+#: gram.y:1009
 #, c-format
 msgid "unrecognized role option \"%s\""
 msgstr "opzione di ruolo \"%s\" sconosciuta"
 
-#: gram.y:1286 gram.y:1301
+#: gram.y:1285 gram.y:1300
 #, c-format
 msgid "CREATE SCHEMA IF NOT EXISTS cannot include schema elements"
 msgstr "CREATE SCHEMA IF NOT EXISTS non può includere elementi dello schema"
 
-#: gram.y:1446
+#: gram.y:1445
 #, c-format
 msgid "current database cannot be changed"
 msgstr "il database corrente non può essere cambiato"
 
-#: gram.y:1570
+#: gram.y:1569
 #, c-format
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr "l'intervallo della time zone deve essere HOUR o HOUR TO MINUTE"
 
-#: gram.y:2591 gram.y:2620
+#: gram.y:2584 gram.y:2613
 #, c-format
 msgid "STDIN/STDOUT not allowed with PROGRAM"
 msgstr "STDIN/STDOUT non sono consentiti con PROGRAM"
 
-#: gram.y:2886 gram.y:2893 gram.y:10187 gram.y:10195
+#: gram.y:2879 gram.y:2886 gram.y:10153 gram.y:10161
 #, c-format
 msgid "GLOBAL is deprecated in temporary table creation"
 msgstr "GLOBAL è deprecato nella creazione di tabelle temporanee"
 
-#: gram.y:4766
+#: gram.y:4759
 msgid "duplicate trigger events specified"
 msgstr "evento del trigger specificato più volte"
 
-#: gram.y:4866
+#: gram.y:4859
 #, c-format
 msgid "conflicting constraint properties"
 msgstr "proprietà del vincolo in conflitto"
 
-#: gram.y:4998
+#: gram.y:4991
 #, c-format
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION non è stata ancora implementata"
 
-#: gram.y:5014
+#: gram.y:5007
 #, c-format
 msgid "DROP ASSERTION is not yet implemented"
 msgstr "DROP ASSERTION non è stata ancora implementata"
 
-#: gram.y:5360
+#: gram.y:5353
 #, c-format
 msgid "RECHECK is no longer required"
 msgstr "RECHECK non è più richiesto"
 
-#: gram.y:5361
+#: gram.y:5354
 #, c-format
 msgid "Update your data type."
 msgstr "Aggiorna il tuo tipo di dato."
 
-#: gram.y:6938
+#: gram.y:6931
 #, c-format
 msgid "aggregates cannot have output arguments"
 msgstr "gli aggregati non possono avere argomenti di output"
 
-#: gram.y:8755 gram.y:8773
+#: gram.y:8721 gram.y:8739
 #, c-format
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION non supportato su viste ricorsive"
 
-#: gram.y:10295
+#: gram.y:10261
 #, c-format
 msgid "LIMIT #,# syntax is not supported"
 msgstr "La sintassi LIMIT #,# non è supportata"
 
-#: gram.y:10296
+#: gram.y:10262
 #, c-format
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "Usa separatamente le clausole LIMIT ed OFFSET."
 
-#: gram.y:10559 gram.y:10584
+#: gram.y:10525 gram.y:10550
 #, c-format
 msgid "VALUES in FROM must have an alias"
 msgstr "VALUES nel FROM deve avere un alias"
 
-#: gram.y:10560 gram.y:10585
+#: gram.y:10526 gram.y:10551
 #, c-format
 msgid "For example, FROM (VALUES ...) [AS] foo."
 msgstr "Per esempio, FROM (VALUES ...) [AS] foo."
 
-#: gram.y:10565 gram.y:10590
+#: gram.y:10531 gram.y:10556
 #, c-format
 msgid "subquery in FROM must have an alias"
 msgstr "la sottoquery in FROM deve avere un alias"
 
-#: gram.y:10566 gram.y:10591
+#: gram.y:10532 gram.y:10557
 #, c-format
 msgid "For example, FROM (SELECT ...) [AS] foo."
 msgstr "Per esempio, FROM (SELECT ...) [AS] foo."
 
-#: gram.y:11165
+#: gram.y:11131
 #, c-format
 msgid "precision for type float must be at least 1 bit"
 msgstr "la precisione per il tipo float dev'essere di almeno un bit"
 
-#: gram.y:11174
+#: gram.y:11140
 #, c-format
 msgid "precision for type float must be less than 54 bits"
 msgstr "la precisione per il tipo float dev'essere inferiore a 54 bit"
 
-#: gram.y:11678
+#: gram.y:11644
 #, c-format
 msgid "wrong number of parameters on left side of OVERLAPS expression"
 msgstr "numero errato di parametri a sinistra dell'espressione OVERLAPS"
 
-#: gram.y:11683
+#: gram.y:11649
 #, c-format
 msgid "wrong number of parameters on right side of OVERLAPS expression"
 msgstr "numero errato di parametri a destra dell'espressione OVERLAPS"
 
-#: gram.y:11860
+#: gram.y:11826
 #, c-format
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "il predicato UNIQUE non è stato ancora implementato"
 
-#: gram.y:12192
+#: gram.y:12162
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "non si può usare più di una clausola ORDER BY con WITHIN GROUOP"
 
-#: gram.y:12197
+#: gram.y:12167
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "non si può usare DISTINCT con WITHIN GROUP"
 
-#: gram.y:12202
+#: gram.y:12172
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "non si può usare VARIADIC con WITHIN GROUP"
 
-#: gram.y:12708
+#: gram.y:12678
 #, c-format
 msgid "RANGE PRECEDING is only supported with UNBOUNDED"
 msgstr "RANGE PRECEDING è supportato solo con UNBOUNDED"
 
-#: gram.y:12714
+#: gram.y:12684
 #, c-format
 msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
 msgstr "RANGE FOLLOWING è supportato solo con UNBOUNDED"
 
-#: gram.y:12741 gram.y:12764
+#: gram.y:12711 gram.y:12734
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "l'inizio della finestra non può essere UNBOUNDED FOLLOWING"
 
-#: gram.y:12746
+#: gram.y:12716
 #, c-format
 msgid "frame starting from following row cannot end with current row"
 msgstr "una finestra che inizia dalla riga seguente non può terminare alla riga corrente"
 
-#: gram.y:12769
+#: gram.y:12739
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "la fine della finestra non può essere UNBOUNDED PRECEDING"
 
-#: gram.y:12775
+#: gram.y:12745
 #, c-format
 msgid "frame starting from current row cannot have preceding rows"
 msgstr "una finestra che inizia dalla riga corrente non può avere righe precedenti"
 
-#: gram.y:12782
+#: gram.y:12752
 #, c-format
 msgid "frame starting from following row cannot have preceding rows"
 msgstr "una finestra che inizia dalla riga seguente non può avere righe precedenti"
 
-#: gram.y:13440
+#: gram.y:13410
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "un modificatore di tipo non può avere un nome di parametro"
 
-#: gram.y:13446
+#: gram.y:13416
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "un modificatore di tipo non può avere ORDER BY"
 
-#: gram.y:13504 gram.y:13539
+#: gram.y:13474 gram.y:13509
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "il nome di ruolo \"%s\" è riservato"
 
-#: gram.y:13510 gram.y:13516
+#: gram.y:13480 gram.y:13486
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s non può essere usato come nome di ruolo qui"
 
-#: gram.y:14135 gram.y:14324
+#: gram.y:14105 gram.y:14294
 msgid "improper use of \"*\""
 msgstr "uso improprio di \"*\""
 
-#: gram.y:14388
+#: gram.y:14358
 #, c-format
 msgid "an ordered-set aggregate with a VARIADIC direct argument must have one VARIADIC aggregated argument of the same data type"
 msgstr "un aggregato su insiemi ordinati con un argomento diretto VARIADIC deve avere un argomento aggregato VARIADIC sullo stesso tipo"
 
-#: gram.y:14425
+#: gram.y:14395
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "non è possibile avere più di una clausola ORDER BY"
 
-#: gram.y:14436
+#: gram.y:14406
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "non è possibile avere più di una clausola OFFSET"
 
-#: gram.y:14445
+#: gram.y:14415
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "non è possibile avere più di una clausola LIMIT"
 
-#: gram.y:14454
+#: gram.y:14424
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "non è possibile avere più di una clausola WITH"
 
-#: gram.y:14634
+#: gram.y:14616
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "gli argomenti OUT e INOUT non sono permessi nelle funzioni TABLE"
 
-#: gram.y:14735
+#: gram.y:14717
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "non è possibile avere più di una clausola COLLATE"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14773 gram.y:14786
+#: gram.y:14755 gram.y:14768
 #, c-format
 msgid "%s constraints cannot be marked DEFERRABLE"
 msgstr "un vincolo %s non può essere marcato DEFERRABLE"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14799
+#: gram.y:14781
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "un vincolo %s non può essere marcato NOT VALID"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14812
+#: gram.y:14794
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "un vincolo %s non può essere marcato NO INHERIT"
@@ -22333,7 +22342,7 @@
 msgid "invalid streaming start location"
 msgstr "posizione di avvio dello streaming non valida"
 
-#: repl_scanner.l:170 scan.l:667
+#: repl_scanner.l:170 scan.l:668
 msgid "unterminated quoted string"
 msgstr "stringa tra virgolette non terminata"
 
@@ -22342,119 +22351,119 @@
 msgid "syntax error: unexpected character \"%s\""
 msgstr "errore di sintassi: carattere \"%s\" inaspettato"
 
-#: scan.l:432
+#: scan.l:433
 msgid "unterminated /* comment"
 msgstr "commento /* non terminato"
 
-#: scan.l:461
+#: scan.l:462
 msgid "unterminated bit string literal"
 msgstr "letterale di stringa di bit non terminato"
 
-#: scan.l:482
+#: scan.l:483
 msgid "unterminated hexadecimal string literal"
 msgstr "letterale di stringa esadecimale non terminato"
 
-#: scan.l:532
+#: scan.l:533
 #, c-format
 msgid "unsafe use of string constant with Unicode escapes"
 msgstr "uso non sicuro di stringa costante con gli escape Unicode"
 
-#: scan.l:533
+#: scan.l:534
 #, c-format
 msgid "String constants with Unicode escapes cannot be used when standard_conforming_strings is off."
 msgstr "Le stringhe costanti con escape Unicode non possono essere usate quando standard_conforming_strings è disabilitato."
 
-#: scan.l:577 scan.l:773
+#: scan.l:578 scan.l:774
 msgid "invalid Unicode escape character"
 msgstr "carattere escape Unicode non valido"
 
-#: scan.l:602 scan.l:610 scan.l:618 scan.l:619 scan.l:620 scan.l:1329
-#: scan.l:1356 scan.l:1360 scan.l:1398 scan.l:1402 scan.l:1424
+#: scan.l:603 scan.l:611 scan.l:619 scan.l:620 scan.l:621 scan.l:1330
+#: scan.l:1357 scan.l:1361 scan.l:1399 scan.l:1403 scan.l:1425 scan.l:1435
 msgid "invalid Unicode surrogate pair"
 msgstr "coppia surrogata Unicode non valida"
 
-#: scan.l:624
+#: scan.l:625
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "escape Unicode non valido"
 
-#: scan.l:625
+#: scan.l:626
 #, c-format
 msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
 msgstr "Gli escape Unicode devono essere \\uXXXX or \\UXXXXXXXX."
 
-#: scan.l:636
+#: scan.l:637
 #, c-format
 msgid "unsafe use of \\' in a string literal"
 msgstr "uso non sicuro di \\' in una stringa letterale"
 
-#: scan.l:637
+#: scan.l:638
 #, c-format
 msgid "Use '' to write quotes in strings. \\' is insecure in client-only encodings."
 msgstr "Usa '' per scrivere gli apici in una stringa. \\' non è sicuro in codifiche solo client."
 
-#: scan.l:712
+#: scan.l:713
 msgid "unterminated dollar-quoted string"
 msgstr "stringa delimitata da dollari non terminata"
 
-#: scan.l:729 scan.l:753 scan.l:768
+#: scan.l:730 scan.l:754 scan.l:769
 msgid "zero-length delimited identifier"
 msgstr "identificativo delimitato di lunghezza zero"
 
-#: scan.l:788
+#: scan.l:789
 msgid "unterminated quoted identifier"
 msgstr "identificativo tra virgolette non terminato"
 
-#: scan.l:919
+#: scan.l:920
 msgid "operator too long"
 msgstr "operatore troppo lungo"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1072
+#: scan.l:1073
 #, c-format
 msgid "%s at end of input"
 msgstr "%s alla fine dell'input"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: scan.l:1080
+#: scan.l:1081
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s a o presso \"%s\""
 
-#: scan.l:1245 scan.l:1277
+#: scan.l:1246 scan.l:1278
 msgid "Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8"
 msgstr "i valori escape Unicode non possono essere usati per code point superiori a 007F se la codifica del server non è UTF8"
 
-#: scan.l:1273 scan.l:1416
+#: scan.l:1274 scan.l:1417
 msgid "invalid Unicode escape value"
 msgstr "valore escape Unicode non valido"
 
-#: scan.l:1472
+#: scan.l:1481
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "uso non standard di \\' in una stringa letterale"
 
-#: scan.l:1473
+#: scan.l:1482
 #, c-format
 msgid "Use '' to write quotes in strings, or use the escape string syntax (E'...')."
 msgstr "Usa '' per scrivere gli apici nelle stringhe, oppure usa la sintassi di escape delle stringhe (E'...')."
 
-#: scan.l:1482
+#: scan.l:1491
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "uso non standard di \\\\ in una stringa letterale"
 
-#: scan.l:1483
+#: scan.l:1492
 #, c-format
 msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
 msgstr "Usa la sintassi di escape delle stringhe per i backslash, cioè E'\\\\'."
 
-#: scan.l:1497
+#: scan.l:1506
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "uso non standard dell'escape in una stringa letterale"
 
-#: scan.l:1498
+#: scan.l:1507
 #, c-format
 msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
 msgstr "Usa la sintassi di escape per le stringhe per effettuare gli escape, cioè, E'\\r\\n'."
diff -Nru postgresql-9.5-9.5.2/src/backend/po/pl.po postgresql-9.5-9.5.8/src/backend/po/pl.po
--- postgresql-9.5-9.5.2/src/backend/po/pl.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/po/pl.po	2017-08-07 21:13:41.000000000 +0000
@@ -4,8 +4,8 @@
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-13 23:10+0000\n"
-"PO-Revision-Date: 2016-02-14 01:05+0200\n"
+"POT-Creation-Date: 2016-08-08 16:48+0000\n"
+"PO-Revision-Date: 2016-08-08 21:28+0200\n"
 "Last-Translator: grzegorz <begina.felicysym@wp.eu>\n"
 "Language-Team: begina.felicysym@wp.eu\n"
 "Language: pl\n"
@@ -81,27 +81,27 @@
 msgstr "nie można zamknąć katalogu \"%s\": %s\n"
 
 #: ../common/psprintf.c:179 ../port/path.c:596 ../port/path.c:634
-#: ../port/path.c:651 access/transam/xlog.c:6041 lib/stringinfo.c:258
-#: libpq/auth.c:820 libpq/auth.c:1181 libpq/auth.c:1249 libpq/auth.c:1660
+#: ../port/path.c:651 access/transam/xlog.c:6023 lib/stringinfo.c:258
+#: libpq/auth.c:820 libpq/auth.c:1183 libpq/auth.c:1251 libpq/auth.c:1662
 #: postmaster/bgworker.c:289 postmaster/bgworker.c:797
-#: postmaster/postmaster.c:2317 postmaster/postmaster.c:2348
-#: postmaster/postmaster.c:3867 postmaster/postmaster.c:4557
-#: postmaster/postmaster.c:4625 postmaster/postmaster.c:5315
-#: postmaster/postmaster.c:5568 replication/logical/logical.c:167
-#: storage/buffer/localbuf.c:396 storage/file/fd.c:481 storage/file/fd.c:878
-#: storage/file/fd.c:996 storage/file/fd.c:1609 storage/ipc/procarray.c:907
+#: postmaster/postmaster.c:2321 postmaster/postmaster.c:2352
+#: postmaster/postmaster.c:3871 postmaster/postmaster.c:4561
+#: postmaster/postmaster.c:4629 postmaster/postmaster.c:5319
+#: postmaster/postmaster.c:5572 replication/logical/logical.c:167
+#: storage/buffer/localbuf.c:396 storage/file/fd.c:588 storage/file/fd.c:985
+#: storage/file/fd.c:1103 storage/file/fd.c:1716 storage/ipc/procarray.c:907
 #: storage/ipc/procarray.c:1393 storage/ipc/procarray.c:1400
 #: storage/ipc/procarray.c:1793 storage/ipc/procarray.c:2377
-#: utils/adt/formatting.c:1523 utils/adt/formatting.c:1643
-#: utils/adt/formatting.c:1764 utils/adt/regexp.c:219 utils/adt/varlena.c:4199
-#: utils/adt/varlena.c:4220 utils/fmgr/dfmgr.c:216 utils/hash/dynahash.c:411
+#: utils/adt/formatting.c:1522 utils/adt/formatting.c:1642
+#: utils/adt/formatting.c:1763 utils/adt/regexp.c:219 utils/adt/varlena.c:4212
+#: utils/adt/varlena.c:4233 utils/fmgr/dfmgr.c:216 utils/hash/dynahash.c:411
 #: utils/hash/dynahash.c:488 utils/hash/dynahash.c:1002 utils/mb/mbutils.c:376
 #: utils/mb/mbutils.c:709 utils/misc/guc.c:3723 utils/misc/guc.c:3739
 #: utils/misc/guc.c:3752 utils/misc/guc.c:6686 utils/misc/tzparser.c:470
 #: utils/mmgr/aset.c:504 utils/mmgr/mcxt.c:688 utils/mmgr/mcxt.c:723
 #: utils/mmgr/mcxt.c:760 utils/mmgr/mcxt.c:797 utils/mmgr/mcxt.c:831
-#: utils/mmgr/mcxt.c:860 utils/mmgr/mcxt.c:894 utils/mmgr/mcxt.c:974
-#: utils/mmgr/mcxt.c:1007 utils/mmgr/mcxt.c:1054
+#: utils/mmgr/mcxt.c:860 utils/mmgr/mcxt.c:894 utils/mmgr/mcxt.c:976
+#: utils/mmgr/mcxt.c:1010 utils/mmgr/mcxt.c:1059
 #, c-format
 msgid "out of memory"
 msgstr "brak pamięci"
@@ -166,7 +166,7 @@
 msgid "could not look up effective user ID %ld: %s"
 msgstr "nie udało się odnaleźć efektywnego ID użytkownika %ld: %s"
 
-#: ../common/username.c:47 libpq/auth.c:1607
+#: ../common/username.c:47 libpq/auth.c:1609
 msgid "user does not exist"
 msgstr "użytkownik nie istnieje"
 
@@ -210,38 +210,38 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "proces potomny zakończył działanie z nieznanym stanem %d"
 
-#: ../port/chklocale.c:259
+#: ../port/chklocale.c:294
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
 msgstr "nie udało się określić kodowania dla zestawu znaków \"%s\""
 
-#: ../port/chklocale.c:260 ../port/chklocale.c:389
-#: postmaster/postmaster.c:4857
+#: ../port/chklocale.c:295 ../port/chklocale.c:424
+#: postmaster/postmaster.c:4861
 #, c-format
 msgid "Please report this to <pgsql-bugs@postgresql.org>."
 msgstr "Proszę zgłosić to na adres <pgsql-bugs@postgresql.org>."
 
-#: ../port/chklocale.c:381 ../port/chklocale.c:387
+#: ../port/chklocale.c:416 ../port/chklocale.c:422
 #, 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/dirmod.c:216
+#: ../port/dirmod.c:218
 #, c-format
 msgid "could not set junction for \"%s\": %s"
 msgstr "nie można ustanowić złączenia dla \"%s\": %s"
 
-#: ../port/dirmod.c:219
+#: ../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "nie można ustanowić złączenia dla \"%s\": %s\n"
 
-#: ../port/dirmod.c:291
+#: ../port/dirmod.c:295
 #, c-format
 msgid "could not get junction for \"%s\": %s"
 msgstr "nie można ustanowić złączenia dla \"%s\": %s"
 
-#: ../port/dirmod.c:294
+#: ../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "nie można pobrać złączenia dla \"%s\": %s\n"
@@ -295,7 +295,7 @@
 msgid "index row size %lu exceeds maximum %lu for index \"%s\""
 msgstr "rozmiar indeksu wiersza %lu przekracza maksimum %lu dla indeksu \"%s\""
 
-#: access/brin/brin_revmap.c:449
+#: access/brin/brin_revmap.c:453
 #, c-format
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
 msgstr "nieoczekiwany typ strony 0x%04X w indeksie BRIN \"%s\" blok %u"
@@ -408,12 +408,12 @@
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
 msgstr "rozmiar indeksu wiersza %zu przekracza maksimum %zu dla indeksu \"%s\""
 
-#: access/gin/ginscan.c:410
+#: access/gin/ginscan.c:412
 #, c-format
 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:411
+#: access/gin/ginscan.c:413
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "By to naprawić, wykonaj REINDEX INDEX \"%s\"."
@@ -518,7 +518,7 @@
 
 #: access/heap/heapam.c:1248 access/heap/heapam.c:1276
 #: access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:8954
-#: commands/tablecmds.c:11995
+#: commands/tablecmds.c:12005
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "\"%s\" jest typem złożonym"
@@ -538,18 +538,18 @@
 msgid "attempted to delete invisible tuple"
 msgstr "próbowano usunąć niewidoczną krotkę"
 
-#: access/heap/heapam.c:3267 access/heap/heapam.c:5818
+#: access/heap/heapam.c:3266 access/heap/heapam.c:5889
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "nie można zmieniać krotek w czasie trwania operacji równoległej"
 
-#: access/heap/heapam.c:3389
+#: access/heap/heapam.c:3388
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "próbowano zmienić niewidoczną krotkę"
 
-#: access/heap/heapam.c:4640 access/heap/heapam.c:4678
-#: access/heap/heapam.c:4901 executor/execMain.c:2279
+#: access/heap/heapam.c:4701 access/heap/heapam.c:4739
+#: access/heap/heapam.c:4962 executor/execMain.c:2279
 #, 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\""
@@ -566,21 +566,20 @@
 
 #: access/heap/rewriteheap.c:965 access/heap/rewriteheap.c:1177
 #: access/heap/rewriteheap.c:1274 access/transam/timeline.c:407
-#: access/transam/timeline.c:497 access/transam/xlog.c:3011
-#: access/transam/xlog.c:3173 replication/logical/origin.c:613
-#: replication/logical/snapbuild.c:1592 replication/slot.c:1026
-#: replication/slot.c:1115 storage/file/fd.c:459 storage/file/fd.c:2718
-#: storage/smgr/md.c:982 storage/smgr/md.c:1213 storage/smgr/md.c:1386
-#: utils/misc/guc.c:6708
+#: access/transam/timeline.c:483 access/transam/xlog.c:3011
+#: access/transam/xlog.c:3173 replication/logical/snapbuild.c:1588
+#: replication/slot.c:1026 replication/slot.c:1115 storage/file/fd.c:483
+#: storage/file/fd.c:2847 storage/smgr/md.c:982 storage/smgr/md.c:1213
+#: storage/smgr/md.c:1386 utils/misc/guc.c:6708
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "nie udało się fsync na pliku \"%s\": %m"
 
 #: access/heap/rewriteheap.c:1020 access/heap/rewriteheap.c:1140
-#: access/transam/timeline.c:315 access/transam/timeline.c:475
+#: access/transam/timeline.c:315 access/transam/timeline.c:461
 #: access/transam/xlog.c:2967 access/transam/xlog.c:3116
-#: access/transam/xlog.c:10105 access/transam/xlog.c:10141
-#: access/transam/xlog.c:10463 postmaster/postmaster.c:4332
+#: access/transam/xlog.c:10075 access/transam/xlog.c:10111
+#: access/transam/xlog.c:10433 postmaster/postmaster.c:4336
 #: replication/logical/origin.c:542 replication/slot.c:983
 #: storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1071
 #, c-format
@@ -599,25 +598,25 @@
 msgstr "nie można pozycjonować do końca w pliku \"%s\": %m"
 
 #: access/heap/rewriteheap.c:1167 access/transam/timeline.c:367
-#: access/transam/timeline.c:401 access/transam/timeline.c:491
+#: access/transam/timeline.c:401 access/transam/timeline.c:477
 #: access/transam/xlog.c:3002 access/transam/xlog.c:3166
-#: postmaster/postmaster.c:4342 postmaster/postmaster.c:4352
+#: postmaster/postmaster.c:4346 postmaster/postmaster.c:4356
 #: replication/logical/origin.c:551 replication/logical/origin.c:587
-#: replication/logical/origin.c:603 replication/logical/snapbuild.c:1576
+#: replication/logical/origin.c:603 replication/logical/snapbuild.c:1572
 #: replication/slot.c:1012 storage/file/copydir.c:187
-#: utils/init/miscinit.c:1199 utils/init/miscinit.c:1208
-#: utils/init/miscinit.c:1215 utils/misc/guc.c:6669 utils/misc/guc.c:6700
-#: utils/misc/guc.c:8498 utils/misc/guc.c:8512 utils/time/snapmgr.c:1076
+#: utils/init/miscinit.c:1209 utils/init/miscinit.c:1218
+#: utils/init/miscinit.c:1225 utils/misc/guc.c:6669 utils/misc/guc.c:6700
+#: utils/misc/guc.c:8511 utils/misc/guc.c:8525 utils/time/snapmgr.c:1076
 #: utils/time/snapmgr.c:1083
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "nie można pisać do pliku \"%s\": %m"
 
-#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10330
+#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10300
 #: access/transam/xlogarchive.c:114 access/transam/xlogarchive.c:468
-#: replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2421
-#: replication/logical/reorderbuffer.c:2478
-#: replication/logical/snapbuild.c:1520 replication/logical/snapbuild.c:1895
+#: replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2491
+#: replication/logical/reorderbuffer.c:2548
+#: replication/logical/snapbuild.c:1516 replication/logical/snapbuild.c:1891
 #: replication/slot.c:1089 storage/ipc/dsm.c:326 storage/smgr/md.c:420
 #: storage/smgr/md.c:469 storage/smgr/md.c:1333
 #, c-format
@@ -627,26 +626,26 @@
 #: access/heap/rewriteheap.c:1264 access/transam/timeline.c:111
 #: access/transam/timeline.c:236 access/transam/timeline.c:334
 #: access/transam/xlog.c:2943 access/transam/xlog.c:3060
-#: access/transam/xlog.c:3101 access/transam/xlog.c:3392
-#: access/transam/xlog.c:3470 replication/basebackup.c:398
+#: access/transam/xlog.c:3101 access/transam/xlog.c:3374
+#: access/transam/xlog.c:3452 replication/basebackup.c:398
 #: replication/basebackup.c:1159 replication/logical/logicalfuncs.c:154
-#: replication/logical/origin.c:677 replication/logical/reorderbuffer.c:2038
-#: replication/logical/reorderbuffer.c:2242
-#: replication/logical/reorderbuffer.c:2869
-#: replication/logical/snapbuild.c:1569 replication/logical/snapbuild.c:1653
+#: replication/logical/origin.c:658 replication/logical/reorderbuffer.c:2072
+#: replication/logical/reorderbuffer.c:2285
+#: replication/logical/reorderbuffer.c:2939
+#: replication/logical/snapbuild.c:1565 replication/logical/snapbuild.c:1649
 #: replication/slot.c:1104 replication/walsender.c:472
 #: replication/walsender.c:2100 storage/file/copydir.c:155
-#: storage/file/fd.c:445 storage/file/fd.c:2653 storage/file/fd.c:2705
+#: storage/file/fd.c:466 storage/file/fd.c:2760 storage/file/fd.c:2826
 #: storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1854
-#: utils/init/miscinit.c:1134 utils/init/miscinit.c:1255
-#: utils/init/miscinit.c:1333 utils/misc/guc.c:6912 utils/misc/guc.c:6944
+#: utils/init/miscinit.c:1144 utils/init/miscinit.c:1265
+#: utils/init/miscinit.c:1343 utils/misc/guc.c:6928 utils/misc/guc.c:6961
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "nie można otworzyć pliku \"%s\": %m"
 
 #: access/index/indexam.c:172 catalog/objectaddress.c:1144
 #: commands/indexcmds.c:1754 commands/tablecmds.c:239
-#: commands/tablecmds.c:11986
+#: commands/tablecmds.c:11996
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "\"%s\" nie jest indeksem"
@@ -681,7 +680,7 @@
 "Rozważ indeks funkcji z haszem MD5 z wartości, lub użyj indeksowania pełnego indeksowania tekstowego."
 
 #: access/nbtree/nbtpage.c:168 access/nbtree/nbtpage.c:371
-#: access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1665
+#: access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1667
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "indeks \"%s\" nie jest indeksem btree"
@@ -752,7 +751,7 @@
 msgid "database is not accepting commands that generate new MultiXactIds to avoid wraparound data loss in database with OID %u"
 msgstr "baza danych nie przyjmuje poleceń generujących nowe MultiXactIds by uniknąć utraty nakładających się danych w bazie danych o OID %u"
 
-#: access/transam/multixact.c:1036 access/transam/multixact.c:2319
+#: access/transam/multixact.c:1036 access/transam/multixact.c:2318
 #, c-format
 msgid "database \"%s\" must be vacuumed before %u more MultiXactId is used"
 msgid_plural "database \"%s\" must be vacuumed before %u more MultiXactIds are used"
@@ -760,7 +759,7 @@
 msgstr[1] "baza danych \"%s\" musi być odkurzona zanim %u więcej MultiXactIdów będzie użyte"
 msgstr[2] "baza danych \"%s\" musi być odkurzona zanim %u więcej MultiXactIdów będzie użytych"
 
-#: access/transam/multixact.c:1045 access/transam/multixact.c:2328
+#: access/transam/multixact.c:1045 access/transam/multixact.c:2327
 #, c-format
 msgid "database with OID %u must be vacuumed before %u more MultiXactId is used"
 msgid_plural "database with OID %u must be vacuumed before %u more MultiXactIds are used"
@@ -799,22 +798,22 @@
 msgid "Execute a database-wide VACUUM in that database with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings."
 msgstr "Wykonaj VACUUM dla całej bazy danych na tej bazie ze zmniejszonymi ustawieniami vacuum_multixact_freeze_min_age i vacuum_multixact_freeze_table_age."
 
-#: access/transam/multixact.c:1286
+#: access/transam/multixact.c:1285
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "MultiXactId %u już nie istnieje -- pozorne zachodzenie na siebie"
 
-#: access/transam/multixact.c:1294
+#: access/transam/multixact.c:1293
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "MultiXactId %u nie został jeszcze utworzony -- pozorne zachodzenie na siebie"
 
-#: access/transam/multixact.c:2269
+#: access/transam/multixact.c:2268
 #, c-format
 msgid "MultiXactId wrap limit is %u, limited by database with OID %u"
 msgstr "limit zawijania MultiXactId to %u, ograniczone przez bazÄ™ danych o OID %u"
 
-#: access/transam/multixact.c:2324 access/transam/multixact.c:2333
+#: access/transam/multixact.c:2323 access/transam/multixact.c:2332
 #: access/transam/varsup.c:146 access/transam/varsup.c:153
 #: access/transam/varsup.c:384 access/transam/varsup.c:391
 #, c-format
@@ -825,62 +824,62 @@
 "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/multixact.c:2603
+#: access/transam/multixact.c:2602
 #, c-format
 msgid "oldest MultiXactId member is at offset %u"
 msgstr "najstarszy członek MultiXactId ma przesunięcie %u"
 
-#: access/transam/multixact.c:2607
+#: access/transam/multixact.c:2606
 #, c-format
 msgid "MultiXact member wraparound protections are disabled because oldest checkpointed MultiXact %u does not exist on disk"
 msgstr "zabezpieczenia zawijania członków MultiXact są wyłączone ponieważ najstarszy MultiXact %u z punktem kontrolnym nie istnieje na dysku"
 
-#: access/transam/multixact.c:2629
+#: access/transam/multixact.c:2628
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "abezpieczenia zawijania członków MultiXact są teraz włączone"
 
-#: access/transam/multixact.c:2631
+#: access/transam/multixact.c:2630
 #, c-format
 msgid "MultiXact member stop limit is now %u based on MultiXact %u"
 msgstr "ograniczenie zatrzymania członków MultiXact oparty na %u w MultiXact %u"
 
-#: access/transam/multixact.c:3011
+#: access/transam/multixact.c:3010
 #, c-format
 msgid "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
 msgstr "najstarszy MultiXact %u nie odnaleziony, najnowszy MultiXact %u, pominięcie obcięcia"
 
-#: access/transam/multixact.c:3029
+#: access/transam/multixact.c:3028
 #, c-format
 msgid "cannot truncate up to MultiXact %u because it does not exist on disk, skipping truncation"
 msgstr "nie można obciąć do MultiXact %u ponieważ nie istnieje na dysku, pominięto obcięcie"
 
-#: access/transam/multixact.c:3355
+#: access/transam/multixact.c:3354
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "nieprawidłowy MultiXactId: %u"
 
-#: access/transam/parallel.c:577
+#: access/transam/parallel.c:581
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "postmaster zakończył działanie podczas równoległej operacji"
 
-#: access/transam/parallel.c:668
+#: access/transam/parallel.c:681
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "brak połączenia z równoległym procesem roboczym"
 
-#: access/transam/parallel.c:845
+#: access/transam/parallel.c:857
 #, c-format
 msgid "could not map dynamic shared memory segment"
 msgstr "nie można zmapować dynamicznego segmentu pamięci współdzielonej"
 
-#: access/transam/parallel.c:850
+#: access/transam/parallel.c:862
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "niepoprawna magiczna liczba w dynamicznym segmencie pamięci współdzielonej"
 
-#: access/transam/parallel.c:1001
+#: access/transam/parallel.c:1013
 #, c-format
 msgid "parallel worker, PID %d"
 msgstr "równoległy proces roboczy, PID %d"
@@ -973,19 +972,19 @@
 msgstr "IDy linii czasu muszą być mniejsze niż ID potomnej linii czasu."
 
 #: access/transam/timeline.c:346 access/transam/xlog.c:3144
-#: access/transam/xlog.c:10312 access/transam/xlog.c:10325
-#: access/transam/xlog.c:10688 access/transam/xlog.c:10731
-#: access/transam/xlog.c:10770 access/transam/xlog.c:10813
+#: access/transam/xlog.c:10282 access/transam/xlog.c:10295
+#: access/transam/xlog.c:10658 access/transam/xlog.c:10701
+#: access/transam/xlog.c:10740 access/transam/xlog.c:10783
 #: access/transam/xlogfuncs.c:478 access/transam/xlogfuncs.c:497
-#: commands/extension.c:3047 replication/logical/origin.c:684
-#: replication/logical/origin.c:714 replication/logical/reorderbuffer.c:2887
+#: commands/extension.c:3047 replication/logical/origin.c:665
+#: replication/logical/origin.c:695 replication/logical/reorderbuffer.c:2957
 #: replication/walsender.c:497 storage/file/copydir.c:176
 #: utils/adt/genfile.c:151
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "nie można czytać z pliku \"%s\": %m"
 
-#: access/transam/timeline.c:412 access/transam/timeline.c:502
+#: access/transam/timeline.c:412 access/transam/timeline.c:488
 #: access/transam/xlog.c:3017 access/transam/xlog.c:3178
 #: access/transam/xlogfuncs.c:503 commands/copy.c:1631
 #: storage/file/copydir.c:201
@@ -993,24 +992,7 @@
 msgid "could not close file \"%s\": %m"
 msgstr "nie można zamknąć pliku \"%s\": %m"
 
-#: access/transam/timeline.c:429 access/transam/timeline.c:519
-#, c-format
-msgid "could not link file \"%s\" to \"%s\": %m"
-msgstr "nie można podlinkować pliku \"%s\" do \"%s\": %m"
-
-#: access/transam/timeline.c:436 access/transam/timeline.c:526
-#: access/transam/xlog.c:5302 access/transam/xlog.c:6512
-#: access/transam/xlog.c:6529 access/transam/xlog.c:7310
-#: access/transam/xlogarchive.c:458 access/transam/xlogarchive.c:476
-#: access/transam/xlogarchive.c:586 postmaster/pgarch.c:734
-#: replication/logical/origin.c:624 replication/logical/snapbuild.c:1606
-#: replication/slot.c:470 replication/slot.c:926 replication/slot.c:1038
-#: utils/misc/guc.c:6968 utils/time/snapmgr.c:1094
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\": %m"
-msgstr "nie można zmienić nazwy pliku \"%s\" na \"%s\": %m"
-
-#: access/transam/timeline.c:598
+#: access/transam/timeline.c:570
 #, c-format
 msgid "requested timeline %u is not in this server's history"
 msgstr "żądanej linii czasu %u nie ma w historii tego serwera"
@@ -1324,835 +1306,825 @@
 msgid "not enough data in file \"%s\""
 msgstr "niewystarczająca ilość danych w pliku \"%s\""
 
-#: access/transam/xlog.c:3267
-#, c-format
-msgid "could not link file \"%s\" to \"%s\" (initialization of log file): %m"
-msgstr "nie można podlinkować pliku \"%s\" do \"%s\" (inicjacja pliku dziennika): %m"
-
-#: access/transam/xlog.c:3279
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\" (initialization of log file): %m"
-msgstr "nie można zmienić nazwy pliku \"%s\" do \"%s\" (inicjacja pliku dziennika): %m"
-
-#: access/transam/xlog.c:3307
+#: access/transam/xlog.c:3289
 #, c-format
 msgid "could not open transaction log file \"%s\": %m"
 msgstr "nie można otworzyć pliku dziennika transakcji \"%s\": %m"
 
-#: access/transam/xlog.c:3496 access/transam/xlog.c:5272
+#: access/transam/xlog.c:3478 access/transam/xlog.c:5254
 #, c-format
 msgid "could not close log file %s: %m"
 msgstr "nie można zamknąć pliku dziennika %s: %m"
 
-#: access/transam/xlog.c:3553 replication/logical/logicalfuncs.c:149
+#: access/transam/xlog.c:3535 replication/logical/logicalfuncs.c:149
 #: replication/walsender.c:2095
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "żądany segment WAL %s został już usunięty"
 
-#: access/transam/xlog.c:3613 access/transam/xlog.c:3688
-#: access/transam/xlog.c:3886
+#: access/transam/xlog.c:3595 access/transam/xlog.c:3670
+#: access/transam/xlog.c:3868
 #, 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:3769
+#: access/transam/xlog.c:3751
 #, c-format
 msgid "recycled transaction log file \"%s\""
 msgstr "odzyskano plik dziennika transakcji \"%s\""
 
-#: access/transam/xlog.c:3781
+#: access/transam/xlog.c:3763
 #, c-format
 msgid "removing transaction log file \"%s\""
 msgstr "usuwanie pliku dziennika transakcji \"%s\""
 
-#: access/transam/xlog.c:3801
+#: access/transam/xlog.c:3783
 #, 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:3813
+#: access/transam/xlog.c:3795
 #, 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:3846 access/transam/xlog.c:3856
+#: access/transam/xlog.c:3828 access/transam/xlog.c:3838
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "wymagany folder WAL \"%s\" nie istnieje"
 
-#: access/transam/xlog.c:3862
+#: access/transam/xlog.c:3844
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "tworzenie brakujÄ…cego folderu WAL \"%s\""
 
-#: access/transam/xlog.c:3865
+#: access/transam/xlog.c:3847
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "nie można utworzyć brakującego katalogu \"%s\": %m"
 
-#: access/transam/xlog.c:3896
+#: access/transam/xlog.c:3878
 #, c-format
 msgid "removing transaction log backup history file \"%s\""
 msgstr "usunięcie pliku kopii zapasowej historii dziennika transakcji \"%s\""
 
-#: access/transam/xlog.c:3977
+#: access/transam/xlog.c:3959
 #, c-format
 msgid "unexpected timeline ID %u in log segment %s, offset %u"
 msgstr "nieoczekiwany ID linii czasu %u w segmencie dziennika %s, offset %u"
 
-#: access/transam/xlog.c:4099
+#: access/transam/xlog.c:4081
 #, 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:4113
+#: access/transam/xlog.c:4095
 #, c-format
 msgid "new timeline %u forked off current database system timeline %u before current recovery point %X/%X"
 msgstr "nowa linia czasu %u nie jest potomna dla linii czasu systemu bazy danych %u przed bieżącym punktem przywracania %X/%X"
 
-#: access/transam/xlog.c:4132
+#: access/transam/xlog.c:4114
 #, c-format
 msgid "new target timeline is %u"
 msgstr "nowa docelowa linia czasu to %u"
 
-#: access/transam/xlog.c:4212
+#: access/transam/xlog.c:4194
 #, c-format
 msgid "could not create control file \"%s\": %m"
 msgstr "nie można utworzyć pliku kontrolnego \"%s\": %m"
 
-#: access/transam/xlog.c:4223 access/transam/xlog.c:4459
+#: access/transam/xlog.c:4205 access/transam/xlog.c:4441
 #, c-format
 msgid "could not write to control file: %m"
 msgstr "nie można pisać do pliku kontrolnego: %m"
 
-#: access/transam/xlog.c:4229 access/transam/xlog.c:4465
+#: access/transam/xlog.c:4211 access/transam/xlog.c:4447
 #, c-format
 msgid "could not fsync control file: %m"
 msgstr "nie można wykonać fsync na pliku kontrolnym: %m"
 
-#: access/transam/xlog.c:4234 access/transam/xlog.c:4470
+#: access/transam/xlog.c:4216 access/transam/xlog.c:4452
 #, c-format
 msgid "could not close control file: %m"
 msgstr "nie można zamknąć pliku kontrolnego: %m"
 
-#: access/transam/xlog.c:4252 access/transam/xlog.c:4448
+#: access/transam/xlog.c:4234 access/transam/xlog.c:4430
 #, c-format
 msgid "could not open control file \"%s\": %m"
 msgstr "nie można otworzyć pliku kontrolnego \"%s\": %m"
 
-#: access/transam/xlog.c:4258
+#: access/transam/xlog.c:4240
 #, c-format
 msgid "could not read from control file: %m"
 msgstr "nie można czytać z pliku kontrolnego: %m"
 
-#: access/transam/xlog.c:4271 access/transam/xlog.c:4280
-#: access/transam/xlog.c:4304 access/transam/xlog.c:4311
-#: access/transam/xlog.c:4318 access/transam/xlog.c:4323
-#: access/transam/xlog.c:4330 access/transam/xlog.c:4337
-#: access/transam/xlog.c:4344 access/transam/xlog.c:4351
-#: access/transam/xlog.c:4358 access/transam/xlog.c:4365
-#: access/transam/xlog.c:4372 access/transam/xlog.c:4381
-#: access/transam/xlog.c:4388 access/transam/xlog.c:4397
-#: access/transam/xlog.c:4404 access/transam/xlog.c:4413
-#: access/transam/xlog.c:4420 utils/init/miscinit.c:1351
+#: access/transam/xlog.c:4253 access/transam/xlog.c:4262
+#: access/transam/xlog.c:4286 access/transam/xlog.c:4293
+#: access/transam/xlog.c:4300 access/transam/xlog.c:4305
+#: access/transam/xlog.c:4312 access/transam/xlog.c:4319
+#: access/transam/xlog.c:4326 access/transam/xlog.c:4333
+#: access/transam/xlog.c:4340 access/transam/xlog.c:4347
+#: access/transam/xlog.c:4354 access/transam/xlog.c:4363
+#: access/transam/xlog.c:4370 access/transam/xlog.c:4379
+#: access/transam/xlog.c:4386 access/transam/xlog.c:4395
+#: access/transam/xlog.c:4402 utils/init/miscinit.c:1361
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "pliki bazy danych sÄ… niezgodne z serwerem"
 
-#: access/transam/xlog.c:4272
+#: access/transam/xlog.c:4254
 #, 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:4276
+#: access/transam/xlog.c:4258
 #, c-format
 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:4281
+#: access/transam/xlog.c:4263
 #, 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:4284 access/transam/xlog.c:4308
-#: access/transam/xlog.c:4315 access/transam/xlog.c:4320
+#: access/transam/xlog.c:4266 access/transam/xlog.c:4290
+#: access/transam/xlog.c:4297 access/transam/xlog.c:4302
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "Wydaje się jakby konieczne było initdb."
 
-#: access/transam/xlog.c:4295
+#: access/transam/xlog.c:4277
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "niepoprawna suma kontrolna pliku kontrolnego"
 
-#: access/transam/xlog.c:4305
+#: access/transam/xlog.c:4287
 #, 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:4312
+#: access/transam/xlog.c:4294
 #, 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:4319
+#: access/transam/xlog.c:4301
 #, c-format
 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:4324
+#: access/transam/xlog.c:4306
 #, 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:4327 access/transam/xlog.c:4334
-#: access/transam/xlog.c:4341 access/transam/xlog.c:4348
-#: access/transam/xlog.c:4355 access/transam/xlog.c:4362
-#: access/transam/xlog.c:4369 access/transam/xlog.c:4376
-#: access/transam/xlog.c:4384 access/transam/xlog.c:4391
-#: access/transam/xlog.c:4400 access/transam/xlog.c:4407
-#: access/transam/xlog.c:4416 access/transam/xlog.c:4423
+#: access/transam/xlog.c:4309 access/transam/xlog.c:4316
+#: access/transam/xlog.c:4323 access/transam/xlog.c:4330
+#: access/transam/xlog.c:4337 access/transam/xlog.c:4344
+#: access/transam/xlog.c:4351 access/transam/xlog.c:4358
+#: access/transam/xlog.c:4366 access/transam/xlog.c:4373
+#: access/transam/xlog.c:4382 access/transam/xlog.c:4389
+#: access/transam/xlog.c:4398 access/transam/xlog.c:4405
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr "Wydaje się jakby konieczna była rekompilacja lub initdb."
 
-#: access/transam/xlog.c:4331
+#: access/transam/xlog.c:4313
 #, 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:4338
+#: access/transam/xlog.c:4320
 #, 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:4345
+#: access/transam/xlog.c:4327
 #, 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:4352
+#: access/transam/xlog.c:4334
 #, 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:4359
+#: access/transam/xlog.c:4341
 #, 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:4366
+#: access/transam/xlog.c:4348
 #, 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:4373
+#: access/transam/xlog.c:4355
 #, c-format
 msgid "The database cluster was initialized with LOBLKSIZE %d, but the server was compiled with LOBLKSIZE %d."
 msgstr "Klaster bazy danych został zainicjowany z LOBLKSIZE %d, ale serwer był skompilowany z LOBLKSIZE %d."
 
-#: access/transam/xlog.c:4382
+#: access/transam/xlog.c:4364
 #, c-format
 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:4389
+#: access/transam/xlog.c:4371
 #, c-format
 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:4398
+#: access/transam/xlog.c:4380
 #, c-format
 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:4405
+#: access/transam/xlog.c:4387
 #, c-format
 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:4414
+#: access/transam/xlog.c:4396
 #, c-format
 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:4421
+#: access/transam/xlog.c:4403
 #, c-format
 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:4847
+#: access/transam/xlog.c:4829
 #, 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:4853
+#: access/transam/xlog.c:4835
 #, 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:4858
+#: access/transam/xlog.c:4840
 #, 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:4933
+#: access/transam/xlog.c:4915
 #, 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:4979 access/transam/xlog.c:5062
+#: access/transam/xlog.c:4961 access/transam/xlog.c:5044
 #, c-format
 msgid "invalid value for recovery parameter \"%s\": \"%s\""
 msgstr "nieprawidłowa wartość dla parametru odzyskiwania \"%s\": \"%s\""
 
-#: access/transam/xlog.c:4982
+#: access/transam/xlog.c:4964
 #, c-format
 msgid "Valid values are \"pause\", \"promote\", and \"shutdown\"."
 msgstr "Poprawne wartości to \"pause\", \"promote\" i \"shutdown\"."
 
-#: access/transam/xlog.c:5001
+#: access/transam/xlog.c:4983
 #, 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:5017
+#: access/transam/xlog.c:4999
 #, 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:5048
+#: access/transam/xlog.c:5030
 #, 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:5065
+#: access/transam/xlog.c:5047
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "Jedyną dozwoloną wartością jest \"immediate\"."
 
-#: access/transam/xlog.c:5078 access/transam/xlog.c:5089
+#: access/transam/xlog.c:5060 access/transam/xlog.c:5071
 #: commands/extension.c:531 commands/extension.c:539 utils/misc/guc.c:5464
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "parametr \"%s\" wymaga wartości Boolean"
 
-#: access/transam/xlog.c:5124
+#: access/transam/xlog.c:5106
 #, c-format
 msgid "parameter \"%s\" requires a temporal value"
 msgstr "parametr \"%s\" wymaga wartości czasowej"
 
-#: access/transam/xlog.c:5126 catalog/dependency.c:984
+#: access/transam/xlog.c:5108 catalog/dependency.c:984
 #: catalog/dependency.c:985 catalog/dependency.c:991 catalog/dependency.c:992
 #: catalog/dependency.c:1003 catalog/dependency.c:1004
 #: catalog/objectaddress.c:1053 commands/tablecmds.c:791
-#: commands/tablecmds.c:9415 commands/user.c:1027 commands/view.c:482
+#: commands/tablecmds.c:9415 commands/user.c:1027 commands/view.c:470
 #: libpq/auth.c:285 port/win32/security.c:51 storage/lmgr/deadlock.c:955
 #: storage/lmgr/proc.c:1177 utils/misc/guc.c:5486 utils/misc/guc.c:5579
-#: utils/misc/guc.c:9469 utils/misc/guc.c:9503 utils/misc/guc.c:9537
-#: utils/misc/guc.c:9571 utils/misc/guc.c:9606
+#: utils/misc/guc.c:9482 utils/misc/guc.c:9516 utils/misc/guc.c:9550
+#: utils/misc/guc.c:9584 utils/misc/guc.c:9619
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: access/transam/xlog.c:5132
+#: access/transam/xlog.c:5114
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
 msgstr "nierozpoznany parametr odzyskiwania: \"%s\""
 
-#: access/transam/xlog.c:5143
+#: access/transam/xlog.c:5125
 #, 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:5145
+#: access/transam/xlog.c:5127
 #, c-format
 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:5151
+#: access/transam/xlog.c:5133
 #, 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:5181
+#: access/transam/xlog.c:5163
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "linia czasowa celu odtworzenia %u nie istnieje"
 
-#: access/transam/xlog.c:5306
+#: access/transam/xlog.c:5284
 #, c-format
 msgid "archive recovery complete"
 msgstr "wykonane odtworzenie archiwum"
 
-#: access/transam/xlog.c:5365 access/transam/xlog.c:5593
+#: access/transam/xlog.c:5343 access/transam/xlog.c:5571
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr "zatrzymanie odzyskiwania po osiągnięciu spójności"
 
-#: access/transam/xlog.c:5453
+#: access/transam/xlog.c:5431
 #, 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:5460
+#: access/transam/xlog.c:5438
 #, 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:5505
+#: access/transam/xlog.c:5483
 #, 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:5573
+#: access/transam/xlog.c:5551
 #, 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:5581
+#: access/transam/xlog.c:5559
 #, 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:5620
+#: access/transam/xlog.c:5598
 #, c-format
 msgid "recovery has paused"
 msgstr "odzyskiwanie zostało wstrzymane"
 
-#: access/transam/xlog.c:5621
+#: access/transam/xlog.c:5599
 #, c-format
 msgid "Execute pg_xlog_replay_resume() to continue."
 msgstr "Wykonaj pg_xlog_replay_resume() by kontynuować."
 
-#: access/transam/xlog.c:5824
+#: access/transam/xlog.c:5806
 #, 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:5850
+#: access/transam/xlog.c:5832
 #, c-format
 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:5851
+#: access/transam/xlog.c:5833
 #, c-format
 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:5862
+#: access/transam/xlog.c:5844
 #, c-format
 msgid "hot standby is not possible because wal_level was not set to \"hot_standby\" or higher on the master server"
 msgstr "rezerwa dynamiczna nie jest możliwa ponieważ wal_level nie był ustawiony na \"hot_standby\" lub wyżej na serwerze podstawowym"
 
-#: access/transam/xlog.c:5863
+#: access/transam/xlog.c:5845
 #, c-format
 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:5920
+#: access/transam/xlog.c:5902
 #, c-format
 msgid "control file contains invalid data"
 msgstr "plik kontrolny zawiera niepoprawne dane"
 
-#: access/transam/xlog.c:5926
+#: access/transam/xlog.c:5908
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "system bazy danych został zamknięty %s"
 
-#: access/transam/xlog.c:5931
+#: access/transam/xlog.c:5913
 #, 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:5935
+#: access/transam/xlog.c:5917
 #, 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:5939
+#: access/transam/xlog.c:5921
 #, 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:5941
+#: access/transam/xlog.c:5923
 #, c-format
 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:5945
+#: access/transam/xlog.c:5927
 #, 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:5947
+#: access/transam/xlog.c:5929
 #, c-format
 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:5951
+#: access/transam/xlog.c:5933
 #, 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:6007
+#: access/transam/xlog.c:5989
 #, c-format
 msgid "entering standby mode"
 msgstr "wejście w tryb gotowości"
 
-#: access/transam/xlog.c:6010
+#: access/transam/xlog.c:5992
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "chwila poczÄ…tkowa odzyskiwania do XID %u"
 
-#: access/transam/xlog.c:6014
+#: access/transam/xlog.c:5996
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "chwila poczÄ…tkowa odzyskiwania do %s"
 
-#: access/transam/xlog.c:6018
+#: access/transam/xlog.c:6000
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "chwila poczÄ…tkowa odzyskiwania do \"%s\""
 
-#: access/transam/xlog.c:6022
+#: access/transam/xlog.c:6004
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr "chwila początkowa odzyskiwania do najwcześniejszego punktu spójności"
 
-#: access/transam/xlog.c:6025
+#: access/transam/xlog.c:6007
 #, c-format
 msgid "starting archive recovery"
 msgstr "rozpoczęto odzyskiwanie archiwum"
 
-#: access/transam/xlog.c:6042
+#: access/transam/xlog.c:6024
 #, c-format
 msgid "Failed while allocating an XLog reading processor."
 msgstr "Niepowodzenie podczas rezerwowania pamięci na procesor czytania XLog."
 
-#: access/transam/xlog.c:6069 access/transam/xlog.c:6197
+#: access/transam/xlog.c:6051 access/transam/xlog.c:6179
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "rekord punktu kontrolnego jest w %X/%X"
 
-#: access/transam/xlog.c:6083
+#: access/transam/xlog.c:6065
 #, c-format
 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:6084 access/transam/xlog.c:6091
+#: access/transam/xlog.c:6066 access/transam/xlog.c:6073
 #, 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:6090
+#: access/transam/xlog.c:6072
 #, c-format
 msgid "could not locate required checkpoint record"
 msgstr "nie można odnaleźć wymaganego rekordu punktu kontrolnego"
 
-#: access/transam/xlog.c:6116 commands/tablespace.c:641
+#: access/transam/xlog.c:6098 commands/tablespace.c:641
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "nie można utworzyć linku symbolicznego \"%s\": %m"
 
-#: access/transam/xlog.c:6148
+#: access/transam/xlog.c:6130
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "pominięcie piku \"%s\" ponieważ plik \"%s\" nie istnieje"
 
-#: access/transam/xlog.c:6150 access/transam/xlog.c:10888
+#: access/transam/xlog.c:6132 access/transam/xlog.c:10858
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "Plik \"%s\" został przemianowany na \"%s\"."
 
-#: access/transam/xlog.c:6154
+#: access/transam/xlog.c:6136
 #, c-format
 msgid "ignoring \"%s\" file because no \"%s\" file exists"
 msgstr "pominięcie piku \"%s\" ponieważ plik \"%s\" nie istnieje"
 
-#: access/transam/xlog.c:6156
+#: access/transam/xlog.c:6138
 #, 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:6207 access/transam/xlog.c:6222
+#: access/transam/xlog.c:6189 access/transam/xlog.c:6204
 #, c-format
 msgid "could not locate a valid checkpoint record"
 msgstr "nie można odnaleźć poprawnego rekordu punktu kontrolnego"
 
-#: access/transam/xlog.c:6216
+#: access/transam/xlog.c:6198
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "użycie poprzedniego rekordu punktu kontrolnego w %X/%X"
 
-#: access/transam/xlog.c:6260
+#: access/transam/xlog.c:6242
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "żądana linia czasu %u nie jest potomna dla historii tego procesu"
 
-#: access/transam/xlog.c:6262
+#: access/transam/xlog.c:6244
 #, c-format
 msgid "Latest checkpoint is at %X/%X on timeline %u, but in the history of the requested timeline, the server forked off from that timeline at %X/%X."
 msgstr "Ostatni punkt kontrolny znajduje się na %X/%X osi czasu %u, ale w historii żądanej osi czasu serwer rozłączył się z tą osią na %X/%X."
 
-#: access/transam/xlog.c:6278
+#: access/transam/xlog.c:6260
 #, c-format
 msgid "requested timeline %u does not contain minimum recovery point %X/%X on timeline %u"
 msgstr "żądana linia czasu %u nie zawiera minimalnego punktu przywrócenia %X/%X na osi czasu %u"
 
-#: access/transam/xlog.c:6309
+#: access/transam/xlog.c:6291
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "nieprawidłowy ID następnej transakcji"
 
-#: access/transam/xlog.c:6392
+#: access/transam/xlog.c:6374
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "niepoprawne ponowienie w rekordzie punktu kontrolnego"
 
-#: access/transam/xlog.c:6403
+#: access/transam/xlog.c:6385
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "niepoprawny rekord ponowienia w punkcie kontrolnym zamknięcia"
 
-#: access/transam/xlog.c:6431
+#: access/transam/xlog.c:6413
 #, c-format
 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:6435
+#: access/transam/xlog.c:6417
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr "odtwarzanie po awarii rozpoczęto na linii czasu %u i ma docelową linię czasu %u"
 
-#: access/transam/xlog.c:6479
+#: access/transam/xlog.c:6461
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label zawiera dane niespójne z plikiem sterującym"
 
-#: access/transam/xlog.c:6480
+#: access/transam/xlog.c:6462
 #, c-format
 msgid "This means that the backup is corrupted and you will have to use another backup for recovery."
 msgstr "Oznacza to, że kopia zapasowa została uszkodzona i będzie konieczne użycie innej kopii zapasowej do odzyskania."
 
-#: access/transam/xlog.c:6562
+#: access/transam/xlog.c:6536
 #, c-format
 msgid "initializing for hot standby"
 msgstr "inicjacja dla rezerwy dynamicznej"
 
-#: access/transam/xlog.c:6694
+#: access/transam/xlog.c:6668
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "ponowienie uruchamia siÄ™ w %X/%X"
 
-#: access/transam/xlog.c:6908
+#: access/transam/xlog.c:6882
 #, c-format
 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:6946
+#: access/transam/xlog.c:6920
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "ponowienie wykonane w %X/%X"
 
-#: access/transam/xlog.c:6951 access/transam/xlog.c:8885
+#: access/transam/xlog.c:6925 access/transam/xlog.c:8855
 #, 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:6960
+#: access/transam/xlog.c:6934
 #, c-format
 msgid "redo is not required"
 msgstr "ponowienie nie jest wymagane"
 
-#: access/transam/xlog.c:7035 access/transam/xlog.c:7039
+#: access/transam/xlog.c:7009 access/transam/xlog.c:7013
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "WAL kończy się prze końcem backupu online"
 
-#: access/transam/xlog.c:7036
+#: access/transam/xlog.c:7010
 #, c-format
 msgid "All WAL generated while online backup was taken must be available at recovery."
 msgstr "Wszystkie WAL utworzone podczas wykonywania ostatniego backupu online muszą być dostępne w czasie odtworzenia."
 
-#: access/transam/xlog.c:7040
+#: access/transam/xlog.c:7014
 #, c-format
 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:7043
+#: access/transam/xlog.c:7017
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL kończy się przed punktem spójnego odzyskiwania"
 
-#: access/transam/xlog.c:7070
+#: access/transam/xlog.c:7044
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "wybrany nowy ID linii czasowej: %u"
 
-#: access/transam/xlog.c:7485
+#: access/transam/xlog.c:7455
 #, 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:7676
+#: access/transam/xlog.c:7646
 #, c-format
 msgid "invalid primary checkpoint link in control file"
 msgstr "niepoprawny link podstawowego punktu kontrolnego w pliku kontrolnym"
 
-#: access/transam/xlog.c:7680
+#: access/transam/xlog.c:7650
 #, c-format
 msgid "invalid secondary checkpoint link in control file"
 msgstr "niepoprawny link wtórnego punktu kontrolnego w pliku kontrolnym"
 
-#: access/transam/xlog.c:7684
+#: access/transam/xlog.c:7654
 #, c-format
 msgid "invalid checkpoint link in backup_label file"
 msgstr "niepoprawny link punktu kontrolnego w pliku etykiety_backupu"
 
-#: access/transam/xlog.c:7701
+#: access/transam/xlog.c:7671
 #, c-format
 msgid "invalid primary checkpoint record"
 msgstr "niepoprawny podstawowy rekord punktu kontrolnego"
 
-#: access/transam/xlog.c:7705
+#: access/transam/xlog.c:7675
 #, c-format
 msgid "invalid secondary checkpoint record"
 msgstr "niepoprawny wtórny rekord punktu kontrolnego"
 
-#: access/transam/xlog.c:7709
+#: access/transam/xlog.c:7679
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "niepoprawny rekord punktu kontrolnego"
 
-#: access/transam/xlog.c:7720
+#: access/transam/xlog.c:7690
 #, c-format
 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:7724
+#: access/transam/xlog.c:7694
 #, c-format
 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:7728
+#: access/transam/xlog.c:7698
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "niepoprawny ID menadżera zasobów w rekordzie punktu kontrolnego"
 
-#: access/transam/xlog.c:7740
+#: access/transam/xlog.c:7710
 #, c-format
 msgid "invalid xl_info in primary checkpoint record"
 msgstr "niepoprawny xl_info w podstawowym rekordzie punktu kontrolnego"
 
-#: access/transam/xlog.c:7744
+#: access/transam/xlog.c:7714
 #, c-format
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr "niepoprawny xl_info we wtórnym rekordzie punktu kontrolnego"
 
-#: access/transam/xlog.c:7748
+#: access/transam/xlog.c:7718
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "niepoprawny xl_info w rekordzie punktu kontrolnego"
 
-#: access/transam/xlog.c:7759
+#: access/transam/xlog.c:7729
 #, c-format
 msgid "invalid length of primary checkpoint record"
 msgstr "niepoprawna długość podstawowego rekordu punktu kontrolnego"
 
-#: access/transam/xlog.c:7763
+#: access/transam/xlog.c:7733
 #, c-format
 msgid "invalid length of secondary checkpoint record"
 msgstr "niepoprawna długość wtórnego rekordu punktu kontrolnego"
 
-#: access/transam/xlog.c:7767
+#: access/transam/xlog.c:7737
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "niepoprawna długość rekordu punktu kontrolnego"
 
-#: access/transam/xlog.c:7937
+#: access/transam/xlog.c:7907
 #, c-format
 msgid "shutting down"
 msgstr "zamykanie"
 
-#: access/transam/xlog.c:7961
+#: access/transam/xlog.c:7931
 #, c-format
 msgid "database system is shut down"
 msgstr "system bazy danych jest zamknięty"
 
-#: access/transam/xlog.c:8454
+#: access/transam/xlog.c:8424
 #, c-format
 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:8705
+#: access/transam/xlog.c:8675
 #, c-format
 msgid "skipping restartpoint, recovery has already ended"
 msgstr "pominięcie punktu restartu, odzyskiwanie już się zakończyło"
 
-#: access/transam/xlog.c:8728
+#: access/transam/xlog.c:8698
 #, c-format
 msgid "skipping restartpoint, already performed at %X/%X"
 msgstr "pominięcie punktu restartu, wykonano już w %X/%X"
 
-#: access/transam/xlog.c:8883
+#: access/transam/xlog.c:8853
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "punkt restartu odzyskiwania w %X/%X"
 
-#: access/transam/xlog.c:9016
+#: access/transam/xlog.c:8986
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "punkt przywrócenia \"%s\" utworzony w %X/%X"
 
-#: access/transam/xlog.c:9146
+#: access/transam/xlog.c:9116
 #, c-format
 msgid "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record"
 msgstr "nieoczekiwany ID poprzedniej linii czasu %u (obecny ID linii %u) w rekordzie punktu kontrolnego"
 
-#: access/transam/xlog.c:9155
+#: access/transam/xlog.c:9125
 #, 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:9171
+#: access/transam/xlog.c:9141
 #, c-format
 msgid "unexpected timeline ID %u in checkpoint record, before reaching minimum recovery point %X/%X on timeline %u"
 msgstr "nieoczekiwany ID linii czasu %u w rekordzie punktu kontrolnego, przed osiągnięciem minimalnego punktu przywrócenia %X/%X na linii czasu %u"
 
-#: access/transam/xlog.c:9242
+#: access/transam/xlog.c:9212
 #, c-format
 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:9298 access/transam/xlog.c:9345
-#: access/transam/xlog.c:9368
+#: access/transam/xlog.c:9268 access/transam/xlog.c:9315
+#: access/transam/xlog.c:9338
 #, 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:9645
+#: access/transam/xlog.c:9615
 #, c-format
 msgid "could not fsync log segment %s: %m"
 msgstr "nie można wykonać fsync na segmencie dziennika %s: %m"
 
-#: access/transam/xlog.c:9669
+#: access/transam/xlog.c:9639
 #, c-format
 msgid "could not fsync log file %s: %m"
 msgstr "nie udało się fsync na pliku dziennika %s: %m"
 
-#: access/transam/xlog.c:9677
+#: access/transam/xlog.c:9647
 #, c-format
 msgid "could not fsync write-through log file %s: %m"
 msgstr "nie można wykonać fsync write-through na pliku dziennika %s: %m"
 
-#: access/transam/xlog.c:9686
+#: access/transam/xlog.c:9656
 #, c-format
 msgid "could not fdatasync log file %s: %m"
 msgstr "nie można wykonać fdatasync na pliku dziennika %s: %m"
 
-#: access/transam/xlog.c:9778 access/transam/xlog.c:10249
+#: access/transam/xlog.c:9748 access/transam/xlog.c:10219
 #: access/transam/xlogfuncs.c:121 access/transam/xlogfuncs.c:150
 #: access/transam/xlogfuncs.c:189 access/transam/xlogfuncs.c:210
 #: access/transam/xlogfuncs.c:280 access/transam/xlogfuncs.c:336
@@ -2160,198 +2132,198 @@
 msgid "recovery is in progress"
 msgstr "trwa odzyskiwanie"
 
-#: access/transam/xlog.c:9779 access/transam/xlog.c:10250
+#: access/transam/xlog.c:9749 access/transam/xlog.c:10220
 #: access/transam/xlogfuncs.c:122 access/transam/xlogfuncs.c:151
 #: access/transam/xlogfuncs.c:190 access/transam/xlogfuncs.c:211
 #, c-format
 msgid "WAL control functions cannot be executed during recovery."
 msgstr "Funkcje kontroli WAL nie mogą być wykonywane w trakcie odzyskiwania."
 
-#: access/transam/xlog.c:9788 access/transam/xlog.c:10259
+#: access/transam/xlog.c:9758 access/transam/xlog.c:10229
 #, c-format
 msgid "WAL level not sufficient for making an online backup"
 msgstr "poziom WAL niewystarczajÄ…cy do wykonania kopii zapasowej online"
 
-#: access/transam/xlog.c:9789 access/transam/xlog.c:10260
+#: access/transam/xlog.c:9759 access/transam/xlog.c:10230
 #: access/transam/xlogfuncs.c:157
 #, c-format
 msgid "wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start."
 msgstr "wal_level musi być ustawiony na \"archive\" \"hot_standby\" lub \"logical\" w czasie uruchomienia serwera."
 
-#: access/transam/xlog.c:9794
+#: access/transam/xlog.c:9764
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "za długa etykieta backupu (maks %d bajtów)"
 
-#: access/transam/xlog.c:9826 access/transam/xlog.c:10096
-#: access/transam/xlog.c:10132
+#: access/transam/xlog.c:9796 access/transam/xlog.c:10066
+#: access/transam/xlog.c:10102
 #, c-format
 msgid "a backup is already in progress"
 msgstr "tworzenie kopii zapasowej jest już w toku"
 
-#: access/transam/xlog.c:9827
+#: access/transam/xlog.c:9797
 #, c-format
 msgid "Run pg_stop_backup() and try again."
 msgstr "Uruchom pg_stop_backup() i spróbuj ponownie."
 
-#: access/transam/xlog.c:9922
+#: access/transam/xlog.c:9892
 #, c-format
 msgid "WAL generated with full_page_writes=off was replayed since last restartpoint"
 msgstr "WAL wygenerowane z full_page_writes=off zostały ponownie odtworzone od ostatniego punktu restartu"
 
-#: access/transam/xlog.c:9924 access/transam/xlog.c:10414
+#: access/transam/xlog.c:9894 access/transam/xlog.c:10384
 #, c-format
 msgid "This means that the backup being taken on the standby is corrupt and should not be used. Enable full_page_writes and run CHECKPOINT on the master, and then try an online backup again."
 msgstr "Oznacza to, że kopia zapasowa wykonana w czasie gotowości jest uszkodzony i nie powinna być używana. Włącz full_page_writes i uruchom CHECKPOINT na podstawowym, a następnie spróbuj wykonać ponownie backup online."
 
-#: access/transam/xlog.c:9990 replication/basebackup.c:1035
+#: access/transam/xlog.c:9960 replication/basebackup.c:1035
 #: utils/adt/misc.c:378
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "nie można odczytać linku symbolicznego \"%s\": %m"
 
-#: access/transam/xlog.c:9997 replication/basebackup.c:1040
+#: access/transam/xlog.c:9967 replication/basebackup.c:1040
 #: utils/adt/misc.c:383
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "cel linku symbolicznego \"%s\" jest za długi"
 
-#: access/transam/xlog.c:10050 commands/tablespace.c:391
+#: access/transam/xlog.c:10020 commands/tablespace.c:391
 #: commands/tablespace.c:553 replication/basebackup.c:1056
 #: utils/adt/misc.c:391
 #, c-format
 msgid "tablespaces are not supported on this platform"
 msgstr "przestrzenie tabel nie są obsługiwane na tej platformie"
 
-#: access/transam/xlog.c:10090 access/transam/xlog.c:10126
-#: access/transam/xlog.c:10300 access/transam/xlogarchive.c:106
+#: access/transam/xlog.c:10060 access/transam/xlog.c:10096
+#: access/transam/xlog.c:10270 access/transam/xlogarchive.c:106
 #: access/transam/xlogarchive.c:265 commands/copy.c:1738 commands/copy.c:2764
-#: commands/extension.c:3026 commands/tablespace.c:860 guc-file.l:1003
-#: replication/basebackup.c:404 replication/basebackup.c:472
-#: replication/logical/snapbuild.c:1478 storage/file/copydir.c:72
-#: storage/file/copydir.c:115 storage/file/fd.c:2519 storage/file/fd.c:2611
-#: utils/adt/dbsize.c:68 utils/adt/dbsize.c:218 utils/adt/dbsize.c:298
-#: utils/adt/genfile.c:114 utils/adt/genfile.c:333
+#: commands/extension.c:3026 commands/tablespace.c:782
+#: commands/tablespace.c:873 guc-file.l:1003 replication/basebackup.c:404
+#: replication/basebackup.c:472 replication/logical/snapbuild.c:1474
+#: storage/file/copydir.c:72 storage/file/copydir.c:115 storage/file/fd.c:2626
+#: storage/file/fd.c:2718 utils/adt/dbsize.c:68 utils/adt/dbsize.c:218
+#: utils/adt/dbsize.c:298 utils/adt/genfile.c:114 utils/adt/genfile.c:333
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "nie można wykonać stat na pliku \"%s\": %m"
 
-#: access/transam/xlog.c:10097 access/transam/xlog.c:10133
+#: access/transam/xlog.c:10067 access/transam/xlog.c:10103
 #, 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:10114 access/transam/xlog.c:10150
-#: access/transam/xlog.c:10475
+#: access/transam/xlog.c:10084 access/transam/xlog.c:10120
+#: access/transam/xlog.c:10445
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "nie można pisać do pliku \"%s\": %m"
 
-#: access/transam/xlog.c:10304
+#: access/transam/xlog.c:10274
 #, c-format
 msgid "a backup is not in progress"
 msgstr "tworzenie kopii zapasowej nie jest w toku"
 
-#: access/transam/xlog.c:10349 access/transam/xlog.c:10362
-#: access/transam/xlog.c:10702 access/transam/xlog.c:10708
-#: access/transam/xlog.c:10792 access/transam/xlogfuncs.c:508
+#: access/transam/xlog.c:10319 access/transam/xlog.c:10332
+#: access/transam/xlog.c:10672 access/transam/xlog.c:10678
+#: access/transam/xlog.c:10762 access/transam/xlogfuncs.c:508
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "nieprawidłowe dane w pliku \"%s\""
 
-#: access/transam/xlog.c:10366 replication/basebackup.c:933
+#: access/transam/xlog.c:10336 replication/basebackup.c:933
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr "tryb gotowości został rozgłoszony podczas backupu online"
 
-#: access/transam/xlog.c:10367 replication/basebackup.c:934
+#: access/transam/xlog.c:10337 replication/basebackup.c:934
 #, c-format
 msgid "This means that the backup being taken is corrupt and should not be used. Try taking another online backup."
 msgstr "Oznacza to, że wykonywana właśnie kopia zapasowa jest uszkodzona i nie powinna być wykorzystana. Spróbuj wykonać kolejny backup online."
 
-#: access/transam/xlog.c:10412
+#: access/transam/xlog.c:10382
 #, c-format
 msgid "WAL generated with full_page_writes=off was replayed during online backup"
 msgstr "WAL wygenerowane z full_page_writes=off zostały ponownie odtworzone podczas ostatniego punktu restartu"
 
-#: access/transam/xlog.c:10524
+#: access/transam/xlog.c:10494
 #, c-format
 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:10534
+#: access/transam/xlog.c:10504
 #, 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:10536
+#: access/transam/xlog.c:10506
 #, c-format
 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:10543
+#: access/transam/xlog.c:10513
 #, c-format
 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:10547
+#: access/transam/xlog.c:10517
 #, 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"
 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:10831
+#: access/transam/xlog.c:10801
 #, c-format
 msgid "xlog redo %s"
 msgstr "ponowienie xlog %s"
 
-#: access/transam/xlog.c:10877
+#: access/transam/xlog.c:10847
 #, c-format
 msgid "online backup mode was not canceled"
 msgstr "tryb wykonania kopii zapasowej online nie został anulowany"
 
-#: access/transam/xlog.c:10878
+#: access/transam/xlog.c:10848
 #, c-format
 msgid "File \"%s\" could not be renamed to \"%s\": %m."
 msgstr "Nie można zmienić nazwy pliku \"%s\" na \"%s\": %m."
 
-#: access/transam/xlog.c:10887 access/transam/xlog.c:10899
-#: access/transam/xlog.c:10909
+#: access/transam/xlog.c:10857 access/transam/xlog.c:10869
+#: access/transam/xlog.c:10879
 #, c-format
 msgid "online backup mode canceled"
 msgstr "tryb wykonania kopii zapasowej online anulowany"
 
-#: access/transam/xlog.c:10900
+#: access/transam/xlog.c:10870
 #, c-format
 msgid "Files \"%s\" and \"%s\" were renamed to \"%s\" and \"%s\", respectively."
 msgstr "Pliki \"%s\" i \"%s\" zostały przemianowane odpowiednio na \"%s\" and \"%s\"."
 
-#: access/transam/xlog.c:10910
+#: access/transam/xlog.c:10880
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\", but file \"%s\" could not be renamed to \"%s\": %m."
 msgstr "Plik \"%s\" zmienił nazwę na \"%s\", jednak plik \"%s\" nie mógł zostać przemianowany na \"%s\": %m."
 
-#: access/transam/xlog.c:11032 replication/logical/logicalfuncs.c:171
+#: access/transam/xlog.c:11002 replication/logical/logicalfuncs.c:171
 #: replication/walreceiver.c:932 replication/walsender.c:2112
 #, c-format
 msgid "could not seek in log segment %s to offset %u: %m"
 msgstr "nie można pozycjonować w segmentu dziennika %s do offsetu %u: %m"
 
-#: access/transam/xlog.c:11044
+#: access/transam/xlog.c:11014
 #, c-format
 msgid "could not read from log segment %s, offset %u: %m"
 msgstr "nie można czytać z segmentu logów %s, offset %u: %m"
 
-#: access/transam/xlog.c:11518
+#: access/transam/xlog.c:11488
 #, c-format
 msgid "received promote request"
 msgstr "otrzymano żądanie rozgłoszenia"
 
-#: access/transam/xlog.c:11531
+#: access/transam/xlog.c:11501
 #, c-format
 msgid "trigger file found: %s"
 msgstr "odnaleziono plik wyzwalacza: %s"
 
-#: access/transam/xlog.c:11540
+#: access/transam/xlog.c:11510
 #, c-format
 msgid "could not stat trigger file \"%s\": %m"
 msgstr "nie można wykonać stat na pliku wyzwalacza \"%s\": %m"
@@ -2379,12 +2351,19 @@
 msgid "%s \"%s\": %s"
 msgstr "%s \"%s\": %s"
 
-#: access/transam/xlogarchive.c:529 access/transam/xlogarchive.c:598
+#: access/transam/xlogarchive.c:458 replication/logical/snapbuild.c:1602
+#: replication/slot.c:470 replication/slot.c:926 replication/slot.c:1038
+#: storage/file/fd.c:494 storage/file/fd.c:552 utils/time/snapmgr.c:1094
+#, c-format
+msgid "could not rename file \"%s\" to \"%s\": %m"
+msgstr "nie można zmienić nazwy pliku \"%s\" na \"%s\": %m"
+
+#: access/transam/xlogarchive.c:525 access/transam/xlogarchive.c:589
 #, c-format
 msgid "could not create archive status file \"%s\": %m"
 msgstr "nie można utworzyć pliku stanu archiwum \"%s\": %m"
 
-#: access/transam/xlogarchive.c:537 access/transam/xlogarchive.c:606
+#: access/transam/xlogarchive.c:533 access/transam/xlogarchive.c:597
 #, c-format
 msgid "could not write archive status file \"%s\": %m"
 msgstr "nie można zapisać pliku stanu archiwum \"%s\": %m"
@@ -2395,10 +2374,10 @@
 msgstr "musisz być superużytkownikiem lub rolą replikacji by uruchomić tworzenie kopii zapasowej"
 
 #: access/transam/xlogfuncs.c:67 commands/tablespace.c:705
-#: commands/tablespace.c:715 postmaster/postmaster.c:1389
+#: commands/tablespace.c:715 postmaster/postmaster.c:1393
 #: replication/basebackup.c:292 replication/basebackup.c:632
-#: storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:1985
-#: storage/file/fd.c:2584 storage/ipc/dsm.c:300 utils/adt/genfile.c:439
+#: storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:2092
+#: storage/file/fd.c:2691 storage/ipc/dsm.c:300 utils/adt/genfile.c:439
 #: utils/adt/misc.c:291 utils/misc/tzparser.c:339
 #, c-format
 msgid "could not open directory \"%s\": %m"
@@ -2586,12 +2565,12 @@
 msgid "invalid compressed image at %X/%X, block %d"
 msgstr "niepoprawny skompresowany obraz na %X/%X, blok %d"
 
-#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:779 tcop/postgres.c:3485
+#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:779 tcop/postgres.c:3500
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s wymaga wartości"
 
-#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:784 tcop/postgres.c:3490
+#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:784 tcop/postgres.c:3505
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s wymaga wartości"
@@ -2717,7 +2696,7 @@
 msgid "column privileges are only valid for relations"
 msgstr "uprawnienia do kolumn sÄ… poprawne tylko dla relacji"
 
-#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4651
+#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4656
 #: catalog/objectaddress.c:854 catalog/pg_largeobject.c:113
 #: storage/large_object/inv_api.c:291
 #, c-format
@@ -2779,7 +2758,7 @@
 msgstr "kolumna \"%s\" relacji \"%s\" nie istnieje"
 
 #: catalog/aclchk.c:1748 catalog/objectaddress.c:1151 commands/sequence.c:1078
-#: commands/tablecmds.c:221 commands/tablecmds.c:11960 utils/adt/acl.c:2075
+#: commands/tablecmds.c:221 commands/tablecmds.c:11970 utils/adt/acl.c:2075
 #: utils/adt/acl.c:2105 utils/adt/acl.c:2137 utils/adt/acl.c:2169
 #: utils/adt/acl.c:2197 utils/adt/acl.c:2227
 #, c-format
@@ -3052,92 +3031,92 @@
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "atrybut %d relacji o OID %u nie istnieje"
 
-#: catalog/aclchk.c:3588 catalog/aclchk.c:4502
+#: catalog/aclchk.c:3588 catalog/aclchk.c:4507
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "relacja z OID %u nie istnieje"
 
-#: catalog/aclchk.c:3687 catalog/aclchk.c:4920
+#: catalog/aclchk.c:3687 catalog/aclchk.c:4925
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "baza z OID %u nie istnieje"
 
-#: catalog/aclchk.c:3741 catalog/aclchk.c:4580 tcop/fastpath.c:223
+#: catalog/aclchk.c:3741 catalog/aclchk.c:4585 tcop/fastpath.c:223
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "funkcja z OID %u nie istnieje"
 
-#: catalog/aclchk.c:3795 catalog/aclchk.c:4606
+#: catalog/aclchk.c:3795 catalog/aclchk.c:4611
 #, c-format
 msgid "language with OID %u does not exist"
 msgstr "język z OID %u nie istnieje"
 
-#: catalog/aclchk.c:3959 catalog/aclchk.c:4678
+#: catalog/aclchk.c:3959 catalog/aclchk.c:4683
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "schemat z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4013 catalog/aclchk.c:4705
+#: catalog/aclchk.c:4013 catalog/aclchk.c:4710
 #, c-format
 msgid "tablespace with OID %u does not exist"
 msgstr "przestrzeń tabel z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4071 catalog/aclchk.c:4839 commands/foreigncmds.c:325
+#: catalog/aclchk.c:4072 catalog/aclchk.c:4844 commands/foreigncmds.c:325
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "opakowanie obcych danych z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4132 catalog/aclchk.c:4866 commands/foreigncmds.c:461
+#: catalog/aclchk.c:4134 catalog/aclchk.c:4871 commands/foreigncmds.c:461
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "serwer obcy z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4191 catalog/aclchk.c:4205 catalog/aclchk.c:4528
+#: catalog/aclchk.c:4194 catalog/aclchk.c:4533
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "typ z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4554
+#: catalog/aclchk.c:4559
 #, c-format
 msgid "operator with OID %u does not exist"
 msgstr "operator z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4731
+#: catalog/aclchk.c:4736
 #, c-format
 msgid "operator class with OID %u does not exist"
 msgstr "klasa operatora z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4758
+#: catalog/aclchk.c:4763
 #, c-format
 msgid "operator family with OID %u does not exist"
 msgstr "rodzina operatora z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4785
+#: catalog/aclchk.c:4790
 #, 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:4812
+#: catalog/aclchk.c:4817
 #, c-format
 msgid "text search configuration with OID %u does not exist"
 msgstr "konfiguracja wyszukiwania tekstowego z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4893 commands/event_trigger.c:586
+#: catalog/aclchk.c:4898 commands/event_trigger.c:586
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "wyzwalacz zdarzeniowy z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4946
+#: catalog/aclchk.c:4951
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "porównanie z OID %u nie istnieje"
 
-#: catalog/aclchk.c:4972
+#: catalog/aclchk.c:4977
 #, c-format
 msgid "conversion with OID %u does not exist"
 msgstr "konwersja z OID %u nie istnieje"
 
-#: catalog/aclchk.c:5013
+#: catalog/aclchk.c:5018
 #, c-format
 msgid "extension with OID %u does not exist"
 msgstr "rozszerzenie z OID %u nie istnieje"
@@ -3265,17 +3244,18 @@
 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:582 commands/createas.c:373
+#: catalog/heap.c:582 commands/createas.c:201 commands/createas.c:497
 #, 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:584 commands/createas.c:375 commands/indexcmds.c:1087
-#: commands/view.c:116 regex/regc_pg_locale.c:262 utils/adt/formatting.c:1514
-#: utils/adt/formatting.c:1566 utils/adt/formatting.c:1634
-#: utils/adt/formatting.c:1686 utils/adt/formatting.c:1755
-#: utils/adt/formatting.c:1819 utils/adt/like.c:213 utils/adt/selfuncs.c:5276
-#: utils/adt/varlena.c:1411 utils/adt/varlena.c:1800
+#: catalog/heap.c:584 commands/createas.c:204 commands/createas.c:500
+#: commands/indexcmds.c:1087 commands/view.c:105 regex/regc_pg_locale.c:262
+#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1754 utils/adt/formatting.c:1818
+#: utils/adt/like.c:213 utils/adt/selfuncs.c:5280 utils/adt/varlena.c:1411
+#: utils/adt/varlena.c:1800
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr "Użyj klauzuli COLLATE by ustawić jawnie porównanie."
@@ -3374,7 +3354,7 @@
 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:205 parser/parse_utilcmd.c:1436 parser/parse_utilcmd.c:1522
+#: catalog/index.c:205 parser/parse_utilcmd.c:1438 parser/parse_utilcmd.c:1524
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "wielokrotne klucze główne dla tabeli \"%s\" nie są dopuszczalne"
@@ -3399,7 +3379,7 @@
 msgid "shared indexes cannot be created after initdb"
 msgstr "indeksy współdzielone nie mogą być tworzone po initdb"
 
-#: catalog/index.c:785 commands/createas.c:100 commands/sequence.c:141
+#: catalog/index.c:785 commands/createas.c:249 commands/sequence.c:141
 #: parser/parse_utilcmd.c:185
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
@@ -3515,7 +3495,7 @@
 msgid "cross-database references are not implemented: %s"
 msgstr "międzybazodanowe referencje nie są zaimplementowane: %s"
 
-#: catalog/namespace.c:2652 gram.y:13305 gram.y:14659 parser/parse_expr.c:796
+#: catalog/namespace.c:2652 gram.y:13305 gram.y:14671 parser/parse_expr.c:796
 #: parser/parse_target.c:1137
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
@@ -3572,8 +3552,8 @@
 msgid "cannot create temporary tables in parallel mode"
 msgstr "nie można utworzyć tabel tymczasowych w czasie trwania równoległym"
 
-#: catalog/namespace.c:3898 commands/tablespace.c:1159 commands/variable.c:63
-#: replication/syncrep.c:700 utils/misc/guc.c:9636
+#: catalog/namespace.c:3898 commands/tablespace.c:1173 commands/variable.c:63
+#: replication/syncrep.c:700 utils/misc/guc.c:9649
 #, c-format
 msgid "List syntax is invalid."
 msgstr "Składnia listy jest niepoprawna."
@@ -3624,19 +3604,19 @@
 msgstr "\"%s\" nie jest tabelÄ…"
 
 #: catalog/objectaddress.c:1165 commands/tablecmds.c:227
-#: commands/tablecmds.c:4368 commands/tablecmds.c:11965 commands/view.c:155
+#: commands/tablecmds.c:4368 commands/tablecmds.c:11975 commands/view.c:143
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "\"%s\" nie jest widokiem"
 
 #: catalog/objectaddress.c:1172 commands/matview.c:174
-#: commands/tablecmds.c:233 commands/tablecmds.c:11970
+#: commands/tablecmds.c:233 commands/tablecmds.c:11980
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "\"%s\" nie jest widokiem materializowanym"
 
 #: catalog/objectaddress.c:1179 commands/tablecmds.c:251
-#: commands/tablecmds.c:4371 commands/tablecmds.c:11975
+#: commands/tablecmds.c:4371 commands/tablecmds.c:11985
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "\"%s\" nie jest tabelÄ… obcÄ…"
@@ -4472,7 +4452,7 @@
 msgstr "nie udało się utworzyć nazwy typu tablicowego dla typu \"%s\""
 
 #: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4350
-#: commands/tablecmds.c:11853
+#: commands/tablecmds.c:11863
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "\"%s\" nie jest widokiem zmaterializowanym"
@@ -4647,27 +4627,27 @@
 msgid "analyzing \"%s.%s\""
 msgstr "analiza \"%s.%s\""
 
-#: commands/analyze.c:645
+#: commands/analyze.c:648
 #, 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:1201
+#: commands/analyze.c:1204
 #, 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:1280
+#: commands/analyze.c:1283
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no child tables"
 msgstr "pominięcie analizy drzewa dziedziczenia \"%s.%s\" --- to drzewo dziedziczenia nie ma tabel potomnych"
 
-#: commands/analyze.c:1369
+#: commands/analyze.c:1372
 #, c-format
 msgid "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree contains no analyzable child tables"
 msgstr "pominięcie analizy drzewa dziedziczenia \"%s.%s\" --- to drzewo dziedziczenia nie ma tabel potomnych dostępnych do analizowania"
 
-#: commands/analyze.c:1417 executor/execQual.c:2900
+#: commands/analyze.c:1420 executor/execQual.c:2900
 msgid "could not convert row type"
 msgstr "nie można przekształcić typu wierszowego"
 
@@ -5345,12 +5325,12 @@
 msgid "column \"%s\" specified more than once"
 msgstr "kolumna \"%s\" określona więcej niż raz"
 
-#: commands/createas.c:383
+#: commands/createas.c:213 commands/createas.c:508
 #, c-format
 msgid "too many column names were specified"
 msgstr "określono zbyt wiele nazw kolumn"
 
-#: commands/createas.c:452
+#: commands/createas.c:549
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "polityki nie zostały jeszcze zaimplementowane dla tego polecenia"
@@ -5628,7 +5608,7 @@
 
 #: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2369
 #: commands/tablecmds.c:2520 commands/tablecmds.c:2562
-#: commands/tablecmds.c:11336 tcop/utility.c:1104
+#: commands/tablecmds.c:11346 tcop/utility.c:1104
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "relacja \"%s\" nie istnieje, pominięto"
@@ -5813,14 +5793,14 @@
 #: commands/event_trigger.c:1446 commands/event_trigger.c:1997
 #: commands/extension.c:1645 commands/extension.c:1754
 #: commands/extension.c:1947 commands/prepare.c:701 executor/execQual.c:1735
-#: executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5376
+#: executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5416
 #: executor/functions.c:1021 foreign/foreign.c:491
-#: replication/logical/logicalfuncs.c:324 replication/logical/origin.c:1410
-#: replication/slotfuncs.c:173 replication/walsender.c:2762
+#: replication/logical/logicalfuncs.c:324 replication/logical/origin.c:1391
+#: replication/slotfuncs.c:173 replication/walsender.c:2766
 #: utils/adt/jsonfuncs.c:1474 utils/adt/jsonfuncs.c:1606
 #: utils/adt/jsonfuncs.c:1796 utils/adt/jsonfuncs.c:1925
 #: utils/adt/jsonfuncs.c:2693 utils/adt/pgstatfuncs.c:547
-#: utils/fmgr/funcapi.c:61 utils/misc/guc.c:8207 utils/mmgr/portalmem.c:1052
+#: utils/fmgr/funcapi.c:61 utils/misc/guc.c:8220 utils/mmgr/portalmem.c:1052
 #, c-format
 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"
@@ -5828,9 +5808,9 @@
 #: commands/event_trigger.c:1450 commands/event_trigger.c:2001
 #: commands/extension.c:1649 commands/extension.c:1758
 #: commands/extension.c:1951 commands/prepare.c:705 foreign/foreign.c:496
-#: replication/logical/logicalfuncs.c:328 replication/logical/origin.c:1414
-#: replication/slotfuncs.c:177 replication/walsender.c:2766
-#: utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8211
+#: replication/logical/logicalfuncs.c:328 replication/logical/origin.c:1395
+#: replication/slotfuncs.c:177 replication/walsender.c:2770
+#: utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8224
 #: utils/mmgr/portalmem.c:1056
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
@@ -6576,7 +6556,7 @@
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "funkcje w predykacie indeksu muszą być oznaczone jako IMMUTABLE"
 
-#: commands/indexcmds.c:1003 parser/parse_utilcmd.c:1844
+#: commands/indexcmds.c:1003 parser/parse_utilcmd.c:1846
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "kolumna \"%s\" nazwana w kluczu nie istnieje"
@@ -6591,8 +6571,8 @@
 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:1094 commands/typecmds.c:825 parser/parse_expr.c:2559
-#: parser/parse_type.c:550 parser/parse_utilcmd.c:2736 utils/adt/misc.c:546
+#: commands/indexcmds.c:1094 commands/typecmds.c:825 parser/parse_expr.c:2583
+#: parser/parse_type.c:550 parser/parse_utilcmd.c:2738 utils/adt/misc.c:546
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "rzutowania nie są obsługiwane przez typ %s"
@@ -6898,10 +6878,10 @@
 #: commands/policy.c:87 commands/policy.c:390 commands/policy.c:479
 #: commands/tablecmds.c:966 commands/tablecmds.c:1308
 #: commands/tablecmds.c:2176 commands/tablecmds.c:4320
-#: commands/tablecmds.c:6249 commands/tablecmds.c:11886
-#: commands/tablecmds.c:11921 commands/trigger.c:240 commands/trigger.c:1126
+#: commands/tablecmds.c:6249 commands/tablecmds.c:11896
+#: commands/tablecmds.c:11931 commands/trigger.c:240 commands/trigger.c:1126
 #: commands/trigger.c:1234 rewrite/rewriteDefine.c:273
-#: rewrite/rewriteDefine.c:905
+#: rewrite/rewriteDefine.c:917
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "odmowa dostępu: \"%s\" jest katalogiem systemowym"
@@ -7219,7 +7199,7 @@
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr "Użyj DROP MATERIALIZED VIEW aby usunąć widok zmaterializowany."
 
-#: commands/tablecmds.c:237 parser/parse_utilcmd.c:1593
+#: commands/tablecmds.c:237 parser/parse_utilcmd.c:1595
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "indeks \"%s\" nie istnieje"
@@ -7243,7 +7223,7 @@
 msgstr "Użyj DROP TYPE aby usunąć typ."
 
 #: commands/tablecmds.c:249 commands/tablecmds.c:8456
-#: commands/tablecmds.c:11153
+#: commands/tablecmds.c:11163
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "tabela obca \"%s\" nie istnieje"
@@ -7287,7 +7267,7 @@
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "nie można obcinać tabel tymczasowych z innych sesji"
 
-#: commands/tablecmds.c:1524 parser/parse_utilcmd.c:1807
+#: commands/tablecmds.c:1524 parser/parse_utilcmd.c:1809
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr "dziedziczona relacja \"%s\" nie jest tabelą ani tabelą zewnętrzną"
@@ -7343,7 +7323,7 @@
 msgstr "kolumna dziedziczona \"%s\" jest konflikcie parametrów składowania"
 
 #: commands/tablecmds.c:1745 parser/parse_utilcmd.c:894
-#: parser/parse_utilcmd.c:1238 parser/parse_utilcmd.c:1314
+#: parser/parse_utilcmd.c:1240 parser/parse_utilcmd.c:1316
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "nie można zmienić wskazania na tabelę całowierszową"
@@ -7481,7 +7461,7 @@
 msgstr "ograniczenie sprawdzające \"%s\" jest naruszone przez kilka rekordów"
 
 #: commands/tablecmds.c:4341 commands/trigger.c:234
-#: rewrite/rewriteDefine.c:267 rewrite/rewriteDefine.c:900
+#: rewrite/rewriteDefine.c:267 rewrite/rewriteDefine.c:912
 #, c-format
 msgid "\"%s\" is not a table or view"
 msgstr "\"%s\" nie jest tabelÄ… ani widokiem"
@@ -7847,12 +7827,12 @@
 msgid "cannot change owner of sequence \"%s\""
 msgstr "nie można zmienić właściciela sekwencji \"%s\""
 
-#: commands/tablecmds.c:8944 commands/tablecmds.c:11355
+#: commands/tablecmds.c:8944 commands/tablecmds.c:11365
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "Sekwencja \"%s\" jest połączona z tabelą \"%s\"."
 
-#: commands/tablecmds.c:8956 commands/tablecmds.c:11996
+#: commands/tablecmds.c:8956 commands/tablecmds.c:12006
 #, c-format
 msgid "Use ALTER TYPE instead."
 msgstr "W zamian użyj ALTER TYPE."
@@ -7872,7 +7852,7 @@
 msgid "\"%s\" is not a table, view, materialized view, index, or TOAST table"
 msgstr "\"%s\" nie jest tabelÄ…, widokiem, zmaterializowanym widokiem, indeksem ani tabelÄ… TOAST"
 
-#: commands/tablecmds.c:9414 commands/view.c:481
+#: commands/tablecmds.c:9414 commands/view.c:469
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr "WITH CHECK OPTION jest obsługiwane tylko w automatycznie aktualizujących się widokach"
@@ -8022,42 +8002,50 @@
 msgid "cannot use invalid index \"%s\" as replica identity"
 msgstr "nie można użyć niepoprawnego indeksu \"%s\" jako identyczności repliki"
 
-#: commands/tablecmds.c:11031
+#: commands/tablecmds.c:11034
+#, c-format
+#| msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
+msgid "index \"%s\" cannot be used as replica identity because column %d is a system column"
+msgstr ""
+"indeks \"%s\" nie może być użyty jako identyczność repliki ponieważ kolumna %d "
+"jest systemowa"
+
+#: commands/tablecmds.c:11041
 #, c-format
 msgid "index \"%s\" cannot be used as replica identity because column \"%s\" is nullable"
 msgstr "indeks \"%s\" nie może być użyty jako identyczność repliki ponieważ kolumna \"%s\" dopuszcza wartości puste"
 
-#: commands/tablecmds.c:11228
+#: commands/tablecmds.c:11238
 #, c-format
 msgid "cannot change logged status of table \"%s\" because it is temporary"
 msgstr "nie można zmienić stanu logowania tabeli \"%s\" ponieważ jest ona tymczasowa"
 
-#: commands/tablecmds.c:11287
+#: commands/tablecmds.c:11297
 #, c-format
 msgid "could not change table \"%s\" to logged because it references unlogged table \"%s\""
 msgstr "nie udało zmienić tabeli \"%s\" na logowaną ponieważ wskazuje na nielogowaną tabelę \"%s\""
 
-#: commands/tablecmds.c:11297
+#: commands/tablecmds.c:11307
 #, c-format
 msgid "could not change table \"%s\" to unlogged because it references logged table \"%s\""
 msgstr "nie udało się zmienić tabeli \"%s\" na nielogowaną ponieważ wskazuje na logowaną tabelę \"%s\""
 
-#: commands/tablecmds.c:11354
+#: commands/tablecmds.c:11364
 #, c-format
 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:11455
+#: commands/tablecmds.c:11465
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "relacja \"%s\" istnieje już w schemacie \"%s\""
 
-#: commands/tablecmds.c:11980
+#: commands/tablecmds.c:11990
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "\"%s\" nie jest typem złożonym"
 
-#: commands/tablecmds.c:12010
+#: commands/tablecmds.c:12020
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, sequence, or foreign table"
 msgstr "\"%s\" nie jest tabelą, widokiem, widokiem zmaterializowanym, sekwencją ani tabelą zewnętrzną"
@@ -8109,24 +8097,24 @@
 msgid "tablespace location should not be inside the data directory"
 msgstr "położenie przestrzeni tabel nie powinno być wewnątrz folderu danych"
 
-#: commands/tablespace.c:304 commands/tablespace.c:938
+#: commands/tablespace.c:304 commands/tablespace.c:952
 #, c-format
 msgid "unacceptable tablespace name \"%s\""
 msgstr "nieprawidłowa nazwa przestrzeni tabel \"%s\""
 
-#: commands/tablespace.c:306 commands/tablespace.c:939
+#: commands/tablespace.c:306 commands/tablespace.c:953
 #, c-format
 msgid "The prefix \"pg_\" is reserved for system tablespaces."
 msgstr "Prefiks \"pg_\" jest zarezerwowany dla systemowych przestrzeni tabel."
 
-#: commands/tablespace.c:316 commands/tablespace.c:951
+#: commands/tablespace.c:316 commands/tablespace.c:965
 #, c-format
 msgid "tablespace \"%s\" already exists"
 msgstr "przestrzeń tabel \"%s\" już istnieje"
 
-#: commands/tablespace.c:430 commands/tablespace.c:921
-#: commands/tablespace.c:1002 commands/tablespace.c:1071
-#: commands/tablespace.c:1204 commands/tablespace.c:1404
+#: commands/tablespace.c:430 commands/tablespace.c:935
+#: commands/tablespace.c:1016 commands/tablespace.c:1085
+#: commands/tablespace.c:1218 commands/tablespace.c:1418
 #, c-format
 msgid "tablespace \"%s\" does not exist"
 msgstr "przestrzeń tabel \"%s\" nie istnieje"
@@ -8162,32 +8150,32 @@
 msgstr "folder \"%s\" jest już używany jako przestrzeń tabel"
 
 #: commands/tablespace.c:744 commands/tablespace.c:757
-#: commands/tablespace.c:781 commands/tablespace.c:872
+#: commands/tablespace.c:793 commands/tablespace.c:885
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "nie można usunąć folderu \"%s\": %m"
 
-#: commands/tablespace.c:793 commands/tablespace.c:881
+#: commands/tablespace.c:806 commands/tablespace.c:894
 #, c-format
 msgid "could not remove symbolic link \"%s\": %m"
 msgstr "nie można usunąć linku symbolicznego \"%s\": %m"
 
-#: commands/tablespace.c:803 commands/tablespace.c:889
+#: commands/tablespace.c:816 commands/tablespace.c:903
 #, c-format
 msgid "\"%s\" is not a directory or symbolic link"
 msgstr "\"%s\" nie jest folderem ani linkiem symbolicznym"
 
-#: commands/tablespace.c:1076
+#: commands/tablespace.c:1090
 #, c-format
 msgid "Tablespace \"%s\" does not exist."
 msgstr "Przestrzeń tabel \"%s\" nie istnieje."
 
-#: commands/tablespace.c:1503
+#: commands/tablespace.c:1517
 #, c-format
 msgid "directories for tablespace %u could not be removed"
 msgstr "katalogi przestrzeni tabel %u nie mogą zostać usunięte"
 
-#: commands/tablespace.c:1505
+#: commands/tablespace.c:1519
 #, c-format
 msgid "You can remove the directories manually if necessary."
 msgstr "Można usunąć katalogi ręcznie jeśli to konieczne."
@@ -8938,37 +8926,37 @@
 msgid "Close open transactions with multixacts soon to avoid wraparound problems."
 msgstr "Zamknij szybko otwarte transakcje z multixacts by uniknąć problemów zawijania."
 
-#: commands/vacuum.c:1130
+#: commands/vacuum.c:1138
 #, c-format
 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:1131
+#: commands/vacuum.c:1139
 #, c-format
 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:1252
+#: commands/vacuum.c:1260
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "pominięto odkurzanie \"%s\" --- blokada niedostępna"
 
-#: commands/vacuum.c:1278
+#: commands/vacuum.c:1286
 #, c-format
 msgid "skipping \"%s\" --- only superuser can vacuum it"
 msgstr "pominięto \"%s\" --- tylko superużytkownik może to odkurzyć"
 
-#: commands/vacuum.c:1282
+#: commands/vacuum.c:1290
 #, 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:1286
+#: commands/vacuum.c:1294
 #, 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:1304
+#: commands/vacuum.c:1312
 #, 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"
@@ -9085,7 +9073,7 @@
 msgid "\"%s\": suspending truncate due to conflicting lock request"
 msgstr "\"%s\": zawieszenie obcinania ze względu na sprzeczne żądania blokad"
 
-#: commands/variable.c:164 utils/misc/guc.c:9660
+#: commands/variable.c:164 utils/misc/guc.c:9673
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "Nierozpoznane słowo kluczowe: \"%s\"."
@@ -9190,52 +9178,52 @@
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "Prawidłowe wartości to \"local\" i \"cascaded\"."
 
-#: commands/view.c:114
+#: commands/view.c:103
 #, 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:129
+#: commands/view.c:117
 #, c-format
 msgid "view must have at least one column"
 msgstr "widok musi posiadać przynajmniej jedną kolumnę"
 
-#: commands/view.c:263 commands/view.c:275
+#: commands/view.c:251 commands/view.c:263
 #, c-format
 msgid "cannot drop columns from view"
 msgstr "nie można skasować kolumn z widoku"
 
-#: commands/view.c:280
+#: commands/view.c:268
 #, 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:288
+#: commands/view.c:276
 #, 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:427
+#: commands/view.c:415
 #, c-format
 msgid "views must not contain SELECT INTO"
 msgstr "widoki nie mogą zawierać SELECT INTO"
 
-#: commands/view.c:440
+#: commands/view.c:428
 #, c-format
 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:511
+#: commands/view.c:499
 #, c-format
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "CREATE VIEW określa więcej nazw kolumn niż kolumn"
 
-#: commands/view.c:519
+#: commands/view.c:507
 #, c-format
 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:533
+#: commands/view.c:521
 #, c-format
 msgid "view \"%s\" will be a temporary view"
 msgstr "widok \"%s\" będzie widokiem tymczasowym"
@@ -9280,37 +9268,37 @@
 msgid "no value found for parameter %d"
 msgstr "nie odnaleziono wartości dla parametru %d"
 
-#: executor/execIndexing.c:539
+#: executor/execIndexing.c:544
 #, c-format
 msgid "ON CONFLICT does not support deferrable unique constraints/exclusion constraints as arbiters"
 msgstr "ON CONFLICT nie obsługuje odraczalnych ograniczeń unikalnych/wykluczających jako arbitrów"
 
-#: executor/execIndexing.c:814
+#: executor/execIndexing.c:821
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "nie można utworzyć ograniczenia wykluczającego \"%s\""
 
-#: executor/execIndexing.c:817
+#: executor/execIndexing.c:824
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "Klucz %s jest sprzeczny z kluczem %s."
 
-#: executor/execIndexing.c:819
+#: executor/execIndexing.c:826
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Istnieje konflikt kluczy."
 
-#: executor/execIndexing.c:825
+#: executor/execIndexing.c:832
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "sprzeczna wartość klucza narusza ograniczenie wykluczające \"%s\""
 
-#: executor/execIndexing.c:828
+#: executor/execIndexing.c:835
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "Klucz %s jest sprzeczny z istniejÄ…cym kluczem %s."
 
-#: executor/execIndexing.c:830
+#: executor/execIndexing.c:837
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "Klucz jest sprzeczny z istniejÄ…cym kluczem."
@@ -9466,7 +9454,7 @@
 msgid "new row violates row-level security policy (USING expression) for table \"%s\""
 msgstr "nowy wiersz narusza politykę bezpieczeństwa na poziomie wierszy (wyrażenie USING) tabeli \"%s\""
 
-#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3191
+#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3203
 #: utils/adt/array_userfuncs.c:472 utils/adt/arrayfuncs.c:263
 #: utils/adt/arrayfuncs.c:561 utils/adt/arrayfuncs.c:1291
 #: utils/adt/arrayfuncs.c:3335 utils/adt/arrayfuncs.c:5219
@@ -9480,12 +9468,12 @@
 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:4116
+#: executor/execQual.c:635 executor/execQual.c:4143
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "atrybut %d posiada nieprawidłowy typ"
 
-#: executor/execQual.c:636 executor/execQual.c:4117
+#: executor/execQual.c:636 executor/execQual.c:4144
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "Tabela posiada typ %s, ale zapytanie wymaga %s."
@@ -9582,62 +9570,62 @@
 msgid "op ANY/ALL (array) does not support set arguments"
 msgstr "op ANY/ALL (array) nie obsługuje argumentów grupowych"
 
-#: executor/execQual.c:3169
+#: executor/execQual.c:3181
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "nie można scalić niekompatybilnych tablic"
 
-#: executor/execQual.c:3170
+#: executor/execQual.c:3182
 #, 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:3211 executor/execQual.c:3238
+#: executor/execQual.c:3223 executor/execQual.c:3250
 #, c-format
 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:3753
+#: executor/execQual.c:3765
 #, c-format
 msgid "NULLIF does not support set arguments"
 msgstr "NULLIF nie obsługuje argumentów grupowych"
 
-#: executor/execQual.c:3986 utils/adt/domains.c:136
+#: executor/execQual.c:4013 utils/adt/domains.c:136
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "domena %s nie zezwala na puste wartości"
 
-#: executor/execQual.c:4016 utils/adt/domains.c:173
+#: executor/execQual.c:4043 utils/adt/domains.c:173
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "wartość dla domeny %s narusza ograniczenie sprawdzające \"%s\""
 
-#: executor/execQual.c:4371
+#: executor/execQual.c:4398
 #, c-format
 msgid "WHERE CURRENT OF is not supported for this table type"
 msgstr "WHERE CURRENT OF nie jest obsługiwane dla tego typu tablicowego"
 
-#: executor/execQual.c:4518 parser/parse_agg.c:596 parser/parse_agg.c:626
+#: executor/execQual.c:4545 parser/parse_agg.c:596 parser/parse_agg.c:626
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "wywołania funkcji agregującej nie mogą być zagnieżdżone"
 
-#: executor/execQual.c:4580 parser/parse_agg.c:742
+#: executor/execQual.c:4607 parser/parse_agg.c:742
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "wywołania funkcji okna nie mogą być zagnieżdżone"
 
-#: executor/execQual.c:4792
+#: executor/execQual.c:4819
 #, c-format
 msgid "target type is not an array"
 msgstr "typ docelowy nie jest tablica"
 
-#: executor/execQual.c:4907
+#: executor/execQual.c:4934
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "kolumna ROW() posiada typ %s zamiast typu %s"
 
-#: executor/execQual.c:5042 utils/adt/arrayfuncs.c:3777
+#: executor/execQual.c:5069 utils/adt/arrayfuncs.c:3777
 #: utils/adt/arrayfuncs.c:6315 utils/adt/rowtypes.c:927
 #, c-format
 msgid "could not identify a comparison function for type %s"
@@ -9879,7 +9867,7 @@
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Kursory skrolowalne muszą być READ ONLY."
 
-#: executor/spi.c:2450
+#: executor/spi.c:2458
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "wyrażenie SQL \"%s\""
@@ -9944,7 +9932,7 @@
 msgid "duplicate trigger events specified"
 msgstr "wskazano powielone zdarzenia wyzwalacza"
 
-#: gram.y:4852 parser/parse_utilcmd.c:2657 parser/parse_utilcmd.c:2683
+#: gram.y:4852 parser/parse_utilcmd.c:2659 parser/parse_utilcmd.c:2685
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "ograniczenie zadeklarowane jako INITIALLY DEFERRED musi być DEFERRABLE"
@@ -9994,7 +9982,7 @@
 msgid "WITH CHECK OPTION not supported on recursive views"
 msgstr "WITH CHECK OPTION nie jest obsługiwane w widokach rekurencyjnych"
 
-#: gram.y:9745 parser/parse_expr.c:1468
+#: gram.y:9745 parser/parse_expr.c:1476
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr "liczba kolumn nie zgadza się z liczbą wartości"
@@ -10128,8 +10116,8 @@
 msgid "improper use of \"*\""
 msgstr "niepoprawne użycie \"*\""
 
-#: gram.y:14253 gram.y:14270 tsearch/spell.c:654 tsearch/spell.c:671
-#: tsearch/spell.c:688 tsearch/spell.c:705 tsearch/spell.c:727
+#: gram.y:14253 gram.y:14270 tsearch/spell.c:667 tsearch/spell.c:684
+#: tsearch/spell.c:701 tsearch/spell.c:718 tsearch/spell.c:740
 #, c-format
 msgid "syntax error"
 msgstr "błąd składni"
@@ -10159,30 +10147,30 @@
 msgid "multiple WITH clauses not allowed"
 msgstr "wielokrotna klauzula WITH nie jest dopuszczalna"
 
-#: gram.y:14600
+#: gram.y:14612
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "argumenty OUT i INOUT nie sÄ… dozwolone w funkcji TABLE"
 
-#: gram.y:14701
+#: gram.y:14713
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "wielokrotna klauzula COLLATE nie jest dopuszczalna"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14739 gram.y:14752
+#: gram.y:14751 gram.y:14764
 #, 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:14765
+#: gram.y:14777
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "ograniczenia %s nie mogą być oznaczone jako NOT VALID"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14778
+#: gram.y:14790
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "ograniczenia %s nie mogą być oznaczone jako NOT INHERIT"
@@ -10440,184 +10428,184 @@
 msgid "retrieving GSS user name failed"
 msgstr "nie powiodło się pobieranie nazwy użytkownika GSS"
 
-#: libpq/auth.c:1062
+#: libpq/auth.c:1064
 #, c-format
 msgid "SSPI is not supported in protocol version 2"
 msgstr "SSPI nie jest obsługiwane przez wersję 2 protokołu"
 
-#: libpq/auth.c:1077
+#: libpq/auth.c:1079
 msgid "could not acquire SSPI credentials"
 msgstr "nie można nabyć poświadczeń SSPI"
 
-#: libpq/auth.c:1095
+#: libpq/auth.c:1097
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "oczekiwano odpowiedzi SSPI, otrzymano typ komunikatu %d"
 
-#: libpq/auth.c:1167
+#: libpq/auth.c:1169
 msgid "could not accept SSPI security context"
 msgstr "nie można pobrać kontekstu zabezpieczeń SSPI"
 
-#: libpq/auth.c:1229
+#: libpq/auth.c:1231
 msgid "could not get token from SSPI security context"
 msgstr "nie można pobrać tokenu z kontekstu zabezpieczeń SSPI"
 
-#: libpq/auth.c:1476
+#: libpq/auth.c:1478
 #, 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:1491
+#: libpq/auth.c:1493
 #, 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:1503
+#: libpq/auth.c:1505
 #, 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:1525
+#: libpq/auth.c:1527
 #, 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:1542
+#: libpq/auth.c:1544
 #, 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:1552
+#: libpq/auth.c:1554
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "niepoprawnie sformatowana odpowiedź z serwera Ident: \"%s\""
 
-#: libpq/auth.c:1592
+#: libpq/auth.c:1594
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "autentykacja wzajemna nie jest obsługiwana na tej platformie"
 
-#: libpq/auth.c:1596
+#: libpq/auth.c:1598
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "nie można pobrać poświadczeń wzajemnych: %m"
 
-#: libpq/auth.c:1605
+#: libpq/auth.c:1607
 #, c-format
 msgid "could not look up local user ID %ld: %s"
 msgstr "nie udało się odnaleźć lokalnego ID użytkownika %ld: %s"
 
-#: libpq/auth.c:1689 libpq/auth.c:1960 libpq/auth.c:2316
+#: libpq/auth.c:1691 libpq/auth.c:1962 libpq/auth.c:2318
 #, c-format
 msgid "empty password returned by client"
 msgstr "puste hasło zwrócone przez klienta"
 
-#: libpq/auth.c:1699
+#: libpq/auth.c:1701
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "błąd z podstawowej warstwy PAM: %s"
 
-#: libpq/auth.c:1768
+#: libpq/auth.c:1770
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "nie można utworzyć identyfikatora PAM: %s"
 
-#: libpq/auth.c:1779
+#: libpq/auth.c:1781
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "niepowodzenie pam_set_item(PAM_USER): %s"
 
-#: libpq/auth.c:1790
+#: libpq/auth.c:1792
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "niepowodzenie pam_set_item(PAM_CONV): %s"
 
-#: libpq/auth.c:1801
+#: libpq/auth.c:1803
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "niepowodzenie pam_authenticate: %s"
 
-#: libpq/auth.c:1812
+#: libpq/auth.c:1814
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "niepowodzenie pam_acct_mgmt: %s"
 
-#: libpq/auth.c:1823
+#: libpq/auth.c:1825
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "nie można opublikować uwierzytelnienia PAM: %s"
 
-#: libpq/auth.c:1856
+#: libpq/auth.c:1858
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "nie można zainicjować LDAP: %m"
 
-#: libpq/auth.c:1859
+#: libpq/auth.c:1861
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "nie można zainicjować LDAP: kod błędu %d"
 
-#: libpq/auth.c:1869
+#: libpq/auth.c:1871
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "nie można ustawić wersji protokołu LDAP: %s"
 
-#: libpq/auth.c:1898
+#: libpq/auth.c:1900
 #, c-format
 msgid "could not load wldap32.dll"
 msgstr "nie można załadować wldap32.dll"
 
-#: libpq/auth.c:1906
+#: libpq/auth.c:1908
 #, c-format
 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:1907
+#: libpq/auth.c:1909
 #, c-format
 msgid "LDAP over SSL is not supported on this platform."
 msgstr "LDAP po SSL nie jest wspierany dla tej platformy."
 
-#: libpq/auth.c:1922
+#: libpq/auth.c:1924
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "nie można rozpocząć sesji TLS LDAP: %s"
 
-#: libpq/auth.c:1944
+#: libpq/auth.c:1946
 #, c-format
 msgid "LDAP server not specified"
 msgstr "nie określono serwera LDAP"
 
-#: libpq/auth.c:1997
+#: libpq/auth.c:1999
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "niepoprawny znak w nazwie użytkownika podczas autoryzacji LDAP"
 
-#: libpq/auth.c:2012
+#: libpq/auth.c:2014
 #, c-format
 msgid "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s"
 msgstr "nie można wykonać początkowego połączenia z LDAP dla ldapbinddn \"%s\" na serwerze \"%s\": %s"
 
-#: libpq/auth.c:2036
+#: libpq/auth.c:2038
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr "nie można wyszukać w LDAP z filtrem \"%s\" na serwerze \"%s\": %s"
 
-#: libpq/auth.c:2047
+#: libpq/auth.c:2049
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "użytkownik LDAP \"%s\" nie istnieje"
 
-#: libpq/auth.c:2048
+#: libpq/auth.c:2050
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "Wyszukiwanie LDAP z filtrem \"%s\" na serwerze \"%s\" nie zwróciło wpisów."
 
-#: libpq/auth.c:2052
+#: libpq/auth.c:2054
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "użytkownik LDAP \"%s\" nie jest unikalny"
 
-#: libpq/auth.c:2053
+#: libpq/auth.c:2055
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned %d entry."
 msgid_plural "LDAP search for filter \"%s\" on server \"%s\" returned %d entries."
@@ -10625,117 +10613,117 @@
 msgstr[1] "Wyszukiwanie LDAP z filtrem \"%s\" na serwerze \"%s\" zwróciło %d wpisy."
 msgstr[2] "Wyszukiwanie LDAP z filtrem \"%s\" na serwerze \"%s\" zwróciło %d wpisów."
 
-#: libpq/auth.c:2071
+#: libpq/auth.c:2073
 #, 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:2091
+#: libpq/auth.c:2093
 #, 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:2121
+#: libpq/auth.c:2123
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr "logowanie LDAP użytkownika \"%s\" na serwerze \"%s\" nie powiodło się: %s"
 
-#: libpq/auth.c:2149
+#: libpq/auth.c:2151
 #, 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:2272
+#: libpq/auth.c:2274
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "nie określono serwera RADIUS"
 
-#: libpq/auth.c:2279
+#: libpq/auth.c:2281
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "nie określono szyfrowanego hasła RADIUS"
 
-#: libpq/auth.c:2295 libpq/hba.c:1590
+#: libpq/auth.c:2297 libpq/hba.c:1590
 #, 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:2323
+#: libpq/auth.c:2325
 #, c-format
 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:2334
+#: libpq/auth.c:2336
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "nie można wygenerować wektora losowego szyfrowania"
 
-#: libpq/auth.c:2357
+#: libpq/auth.c:2359
 #, c-format
 msgid "could not perform MD5 encryption of password"
 msgstr "nie można wykonać szyfrowania hasła skrótem MD5"
 
-#: libpq/auth.c:2379
+#: libpq/auth.c:2381
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "nie można utworzyć gniazda RADIUS: %m"
 
-#: libpq/auth.c:2400
+#: libpq/auth.c:2402
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "nie można połączyć do gniazda RADIUS: %m"
 
-#: libpq/auth.c:2410
+#: libpq/auth.c:2412
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "nie można wysłać pakietu RADIUS: %m"
 
-#: libpq/auth.c:2443 libpq/auth.c:2468
+#: libpq/auth.c:2445 libpq/auth.c:2470
 #, c-format
 msgid "timeout waiting for RADIUS response"
 msgstr "limit czasu oczekiwania na odpowiedź RADIUS"
 
-#: libpq/auth.c:2461
+#: libpq/auth.c:2463
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "nie można sprawdzić stanu gniazda RADIUS: %m"
 
-#: libpq/auth.c:2490
+#: libpq/auth.c:2492
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "nie można odczytać odpowiedzi RADIUS: %m"
 
-#: libpq/auth.c:2502 libpq/auth.c:2506
+#: libpq/auth.c:2504 libpq/auth.c:2508
 #, c-format
 msgid "RADIUS response was sent from incorrect port: %d"
 msgstr "odpowiedź RADIUS została wysłana z niepoprawnego portu: %d"
 
-#: libpq/auth.c:2515
+#: libpq/auth.c:2517
 #, c-format
 msgid "RADIUS response too short: %d"
 msgstr "odpowiedź RADIUS zbyt krótka: %d"
 
-#: libpq/auth.c:2522
+#: libpq/auth.c:2524
 #, c-format
 msgid "RADIUS response has corrupt length: %d (actual length %d)"
 msgstr "odpowiedź RADIUS ma uszkodzoną długość: %d (aktualna długość %d)"
 
-#: libpq/auth.c:2530
+#: libpq/auth.c:2532
 #, c-format
 msgid "RADIUS response is to a different request: %d (should be %d)"
 msgstr "odpowiedź RADIUS dotyczy innego żądania: %d (powinna być %d)"
 
-#: libpq/auth.c:2555
+#: libpq/auth.c:2557
 #, c-format
 msgid "could not perform MD5 encryption of received packet"
 msgstr "nie można wykonać szyfrowania otrzymanego pakietu skrótem MD5"
 
-#: libpq/auth.c:2564
+#: libpq/auth.c:2566
 #, c-format
 msgid "RADIUS response has incorrect MD5 signature"
 msgstr "odpowiedź RADIUS ma niepoprawny podpis MD5"
 
-#: libpq/auth.c:2581
+#: libpq/auth.c:2583
 #, c-format
 msgid "RADIUS response has invalid code (%d) for user \"%s\""
 msgstr "odpowiedź RADIUS ma niepoprawny kod (%d) dla użytkownika \"%s\""
@@ -10873,67 +10861,67 @@
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
 msgstr "nie można załadować pliku z listą odwołań certyfikatów SSL \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:341
+#: libpq/be-secure-openssl.c:342
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "nie można zainicjować połączenia SSL: %s"
 
-#: libpq/be-secure-openssl.c:349
+#: libpq/be-secure-openssl.c:350
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "nie można ustawić gniazda SSL: %s"
 
-#: libpq/be-secure-openssl.c:383
+#: libpq/be-secure-openssl.c:404
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "nie można przyjąć połączenia SSL: %m"
 
-#: libpq/be-secure-openssl.c:387 libpq/be-secure-openssl.c:398
+#: libpq/be-secure-openssl.c:408 libpq/be-secure-openssl.c:419
 #, c-format
 msgid "could not accept SSL connection: EOF detected"
 msgstr "nie można przyjąć połączenia SSL: wykryto EOF"
 
-#: libpq/be-secure-openssl.c:392
+#: libpq/be-secure-openssl.c:413
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "nie można przyjąć połączenia SSL: %s"
 
-#: libpq/be-secure-openssl.c:403 libpq/be-secure-openssl.c:541
-#: libpq/be-secure-openssl.c:598
+#: libpq/be-secure-openssl.c:424 libpq/be-secure-openssl.c:565
+#: libpq/be-secure-openssl.c:625
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "nieznany kod błędu SSL: %d"
 
-#: libpq/be-secure-openssl.c:447
+#: libpq/be-secure-openssl.c:468
 #, c-format
 msgid "SSL certificate's common name contains embedded null"
 msgstr "nazwa zwyczajowa certyfikatu SSL zawiera osadzony null"
 
-#: libpq/be-secure-openssl.c:458
+#: libpq/be-secure-openssl.c:479
 #, c-format
 msgid "SSL connection from \"%s\""
 msgstr "połączenie SSL od \"%s\""
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:556 libpq/be-secure-openssl.c:616
 #, c-format
 msgid "SSL error: %s"
 msgstr "błąd SSL: %s"
 
-#: libpq/be-secure-openssl.c:937
+#: libpq/be-secure-openssl.c:965
 #, c-format
 msgid "ECDH: unrecognized curve name: %s"
 msgstr "ECDH: nierozpoznana nazwa krzywej %s"
 
-#: libpq/be-secure-openssl.c:942
+#: libpq/be-secure-openssl.c:970
 #, c-format
 msgid "ECDH: could not create key"
 msgstr "ECDH: nie można utworzyć klucza"
 
-#: libpq/be-secure-openssl.c:966
+#: libpq/be-secure-openssl.c:994
 msgid "no SSL error reported"
 msgstr "nie zgłoszono błędu SSL"
 
-#: libpq/be-secure-openssl.c:970
+#: libpq/be-secure-openssl.c:998
 #, c-format
 msgid "SSL error code %lu"
 msgstr "kod błędu SSL %lu"
@@ -11361,7 +11349,7 @@
 msgid "could not receive data from client: %m"
 msgstr "nie można otrzymać danych od klienta: %m"
 
-#: libpq/pqcomm.c:1139 tcop/postgres.c:3902
+#: libpq/pqcomm.c:1139 tcop/postgres.c:3917
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "zakończenie połączenia spowodowane zgubieniem synchronizacji protokołu"
@@ -11407,12 +11395,12 @@
 msgid "invalid message format"
 msgstr "niepoprawny format wiadomości"
 
-#: main/main.c:259
+#: main/main.c:264
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: nie powiodło się WSAStartup: %d\n"
 
-#: main/main.c:306
+#: main/main.c:327
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -11421,7 +11409,7 @@
 "%s jest serwerem PostgreSQL.\n"
 "\n"
 
-#: main/main.c:307
+#: main/main.c:328
 #, c-format
 msgid ""
 "Usage:\n"
@@ -11432,112 +11420,112 @@
 "  %s [OPCJE]...\n"
 "\n"
 
-#: main/main.c:308
+#: main/main.c:329
 #, c-format
 msgid "Options:\n"
 msgstr "Opcje:\n"
 
-#: main/main.c:309
+#: main/main.c:330
 #, c-format
 msgid "  -B NBUFFERS        number of shared buffers\n"
 msgstr "  -B NBUFFERS        liczba współdzielonych buforów\n"
 
-#: main/main.c:310
+#: main/main.c:331
 #, c-format
 msgid "  -c NAME=VALUE      set run-time parameter\n"
 msgstr "  -c NAZWA=WART      ustawia parametr czasu wykonania\n"
 
-#: main/main.c:311
+#: main/main.c:332
 #, c-format
 msgid "  -C NAME            print value of run-time parameter, then exit\n"
 msgstr "  --help             pokaż ten ekran pomocy i zakończ\n"
 
-#: main/main.c:312
+#: main/main.c:333
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5             poziom debugu\n"
 
-#: main/main.c:313
+#: main/main.c:334
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D FDRDANYCH       folder bazy danych\n"
 
-#: main/main.c:314
+#: main/main.c:335
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e                 używa europejskiego formatu wprowadzania daty (DMY)\n"
 
-#: main/main.c:315
+#: main/main.c:336
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F                 wyłącza fsync\n"
 
-#: main/main.c:316
+#: main/main.c:337
 #, 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:317
+#: main/main.c:338
 #, c-format
 msgid "  -i                 enable TCP/IP connections\n"
 msgstr "  -i                 umożliwia połączenia TCP/IP\n"
 
-#: main/main.c:318
+#: main/main.c:339
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k FOLDER          położenie gniazd domeny Unix\n"
 
-#: main/main.c:320
+#: main/main.c:341
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l                 umożliwia połączenia SSL\n"
 
-#: main/main.c:322
+#: main/main.c:343
 #, 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:323
+#: main/main.c:344
 #, 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:324
+#: main/main.c:345
 #, c-format
 msgid "  -p PORT            port number to listen on\n"
 msgstr "  -p PORT            numer portu do nasłuchiwania\n"
 
-#: main/main.c:325
+#: main/main.c:346
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s                 pokazuje statystyki po wykonaniu każdego zapytania\n"
 
-#: main/main.c:326
+#: main/main.c:347
 #, 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:327
+#: main/main.c:348
 #, c-format
 msgid "  -V, --version      output version information, then exit\n"
 msgstr "  -V, --version      wypisuje informacje o wersji i kończy\n"
 
-#: main/main.c:328
+#: main/main.c:349
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --NAZWA=WART       ustawia parametr czasu wykonania\n"
 
-#: main/main.c:329
+#: main/main.c:350
 #, c-format
 msgid "  --describe-config  describe configuration parameters, then exit\n"
 msgstr "  --describe-config  opisuje parametry konfiguracji i kończy\n"
 
-#: main/main.c:330
+#: main/main.c:351
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help         pokazuje ten ekran pomocy i kończy\n"
 
-#: main/main.c:332
+#: main/main.c:353
 #, c-format
 msgid ""
 "\n"
@@ -11546,42 +11534,42 @@
 "\n"
 "Opcje deweloperskie:\n"
 
-#: main/main.c:333
+#: main/main.c:354
 #, 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:334
+#: main/main.c:355
 #, 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:335
+#: main/main.c:356
 #, c-format
 msgid "  -O                 allow system table structure changes\n"
 msgstr "  -O                 pozwala na zmiany struktury tabel systemowych\n"
 
-#: main/main.c:336
+#: main/main.c:357
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P                 wyłącza indeksy systemowe\n"
 
-#: main/main.c:337
+#: main/main.c:358
 #, 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:338
+#: main/main.c:359
 #, 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:339
+#: main/main.c:360
 #, 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:341
+#: main/main.c:362
 #, c-format
 msgid ""
 "\n"
@@ -11590,37 +11578,37 @@
 "\n"
 "Opcje dla trybu pojedynczego użytkownika:\n"
 
-#: main/main.c:342
+#: main/main.c:363
 #, 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:343
+#: main/main.c:364
 #, 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:344
+#: main/main.c:365
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5             nadpisuje poziom debugu\n"
 
-#: main/main.c:345
+#: main/main.c:366
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E                 wypisuje na wyjście wyrażenie przed wykonaniem\n"
 
-#: main/main.c:346
+#: main/main.c:367
 #, 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:347 main/main.c:352
+#: main/main.c:368 main/main.c:373
 #, 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:349
+#: main/main.c:370
 #, c-format
 msgid ""
 "\n"
@@ -11629,22 +11617,22 @@
 "\n"
 "Opcje dla trybu Å‚adowania:\n"
 
-#: main/main.c:350
+#: main/main.c:371
 #, 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:351
+#: main/main.c:372
 #, 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:353
+#: main/main.c:374
 #, c-format
 msgid "  -x NUM             internal use\n"
 msgstr "  -x NUM             do użytku wewnętrznego\n"
 
-#: main/main.c:355
+#: main/main.c:376
 #, c-format
 msgid ""
 "\n"
@@ -11661,7 +11649,7 @@
 "\n"
 "Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
 
-#: main/main.c:369
+#: main/main.c:390
 #, c-format
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
@@ -11674,12 +11662,12 @@
 "aby zapobiec możliwemu złamaniu zabezpieczeń systemu.  Przejrzyj dokumentację\n"
 "by uzyskać więcej informacji jak poprawnie uruchomić serwer.\n"
 
-#: main/main.c:386
+#: main/main.c:407
 #, 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:393
+#: main/main.c:414
 #, c-format
 msgid ""
 "Execution of PostgreSQL by a user with administrative permissions is not\n"
@@ -11696,7 +11684,7 @@
 
 #: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:1820
 #: parser/parse_coerce.c:1848 parser/parse_coerce.c:1924
-#: parser/parse_expr.c:1981 parser/parse_func.c:597 parser/parse_oper.c:952
+#: parser/parse_expr.c:1994 parser/parse_func.c:597 parser/parse_oper.c:952
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "nie znaleziono typu tablicowego dla danej typu %s"
@@ -11728,44 +11716,44 @@
 msgstr "%s nie może być zastosowane do niewymaganej strony złączenia zewnętrznego"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1330 parser/analyze.c:1481 parser/analyze.c:1679
+#: optimizer/plan/planner.c:1341 parser/analyze.c:1481 parser/analyze.c:1679
 #: parser/analyze.c:2460
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s nie jest dopuszczalne z UNION/INTERSECT/EXCEPT"
 
-#: optimizer/plan/planner.c:3587
+#: optimizer/plan/planner.c:3598
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "nie udało się zaimplementować GROUP BY"
 
-#: optimizer/plan/planner.c:3588 optimizer/plan/planner.c:3756
+#: optimizer/plan/planner.c:3599 optimizer/plan/planner.c:3767
 #: optimizer/prep/prepunion.c:828
 #, c-format
 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/plan/planner.c:3755
+#: optimizer/plan/planner.c:3766
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "nie udało się zaimplementować DISTINCT"
 
-#: optimizer/plan/planner.c:4361
+#: optimizer/plan/planner.c:4372
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "nie udało się zaimplementować okna PARTITION BY"
 
-#: optimizer/plan/planner.c:4362
+#: optimizer/plan/planner.c:4373
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "Kolumny podziału okna muszą być typów sortowalnych."
 
-#: optimizer/plan/planner.c:4366
+#: optimizer/plan/planner.c:4377
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "nie udało się zaimplementować okna ORDER BY"
 
-#: optimizer/plan/planner.c:4367
+#: optimizer/plan/planner.c:4378
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "Kolumny porządkujące okno muszą być typów sortowalnych."
@@ -11791,7 +11779,7 @@
 msgid "could not implement %s"
 msgstr "nie udało się zaimplementować %s"
 
-#: optimizer/util/clauses.c:4597
+#: optimizer/util/clauses.c:4683
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "funkcja SQL \"%s\" w czasie wbudowywania"
@@ -11801,22 +11789,24 @@
 msgid "cannot access temporary or unlogged relations during recovery"
 msgstr "nie można uzyskać dostępu do tymczasowej lub nielogowanej relacji podczas odzyskiwania"
 
-#: optimizer/util/plancat.c:498
+#: optimizer/util/plancat.c:490
 #, c-format
-msgid "system columns cannot be used in an ON CONFLICT clause"
-msgstr "kolumny systemowe nie mogą być użyte a klauzuli ON CONFLICT"
+msgid "whole row unique index inference specifications are not supported"
+msgstr ""
+"specyfikacje interfejsu pełnowierszowych unikalnych indeksów nie są "
+"obsługiwane"
 
-#: optimizer/util/plancat.c:516
+#: optimizer/util/plancat.c:507
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "ogranicznie w klauzuli ON CONFLICT nie ma powiÄ…zanego indeksu"
 
-#: optimizer/util/plancat.c:568
+#: optimizer/util/plancat.c:558
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATE nieobsługiwane w ograniczeniach wykluczających"
 
-#: optimizer/util/plancat.c:675
+#: optimizer/util/plancat.c:663
 #, c-format
 msgid "there is no unique or exclusion constraint matching the ON CONFLICT specification"
 msgstr "brak ograniczenia unikalnego ani wykluczajÄ…cego pasujÄ…cego do specyfikacji ON CONFLICT"
@@ -12456,7 +12446,7 @@
 
 #: parser/parse_coerce.c:971 parser/parse_coerce.c:1001
 #: parser/parse_coerce.c:1019 parser/parse_coerce.c:1034
-#: parser/parse_expr.c:2015 parser/parse_expr.c:2528 parser/parse_target.c:874
+#: parser/parse_expr.c:2028 parser/parse_expr.c:2552 parser/parse_target.c:874
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "nie można rzutować typu %s na %s"
@@ -12718,130 +12708,130 @@
 msgid "there is no parameter $%d"
 msgstr "brak parametru $%d"
 
-#: parser/parse_expr.c:1034
+#: parser/parse_expr.c:1042
 #, c-format
 msgid "NULLIF requires = operator to yield boolean"
 msgstr "NULLIF wymaga operatora = w celu uzyskania typu logicznego"
 
-#: parser/parse_expr.c:1697
+#: parser/parse_expr.c:1705
 msgid "cannot use subquery in check constraint"
 msgstr "nie można używać podzapytań w ograniczeniu kontrolnym"
 
-#: parser/parse_expr.c:1701
+#: parser/parse_expr.c:1709
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "nie można użyć podzapytania w wyrażeniu DEFAULT"
 
-#: parser/parse_expr.c:1704
+#: parser/parse_expr.c:1712
 msgid "cannot use subquery in index expression"
 msgstr "nie można użyć podzapytania w wyrażeniu indeksu"
 
-#: parser/parse_expr.c:1707
+#: parser/parse_expr.c:1715
 msgid "cannot use subquery in index predicate"
 msgstr "nie można używać podzapytań w predykacie indeksu"
 
-#: parser/parse_expr.c:1710
+#: parser/parse_expr.c:1718
 msgid "cannot use subquery in transform expression"
 msgstr "nie można użyć podzapytania w wyrażeniu przekształcenia"
 
-#: parser/parse_expr.c:1713
+#: parser/parse_expr.c:1721
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "nie można używać podzapytań w parametrze EXECUTE"
 
-#: parser/parse_expr.c:1716
+#: parser/parse_expr.c:1724
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "nie można używać podzapytań w warunku WHEN wyzwalacza"
 
-#: parser/parse_expr.c:1770
+#: parser/parse_expr.c:1778
 #, c-format
 msgid "subquery must return only one column"
 msgstr "podzapytanie musi zwracać tylko jedną kolumnę"
 
-#: parser/parse_expr.c:1854
+#: parser/parse_expr.c:1862
 #, c-format
 msgid "subquery has too many columns"
 msgstr "podzapytanie posiada zbyt wiele kolumn"
 
-#: parser/parse_expr.c:1859
+#: parser/parse_expr.c:1867
 #, c-format
 msgid "subquery has too few columns"
 msgstr "podzapytanie posiada zbyt mało kolumn"
 
-#: parser/parse_expr.c:1955
+#: parser/parse_expr.c:1968
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "nie można określić typu pustej tabeli"
 
-#: parser/parse_expr.c:1956
+#: parser/parse_expr.c:1969
 #, c-format
 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:1970
+#: parser/parse_expr.c:1983
 #, 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:2193
+#: parser/parse_expr.c:2206
 #, c-format
 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:2194
+#: parser/parse_expr.c:2207
 #, c-format
 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:2209
+#: parser/parse_expr.c:2222
 #, 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:2316
+#: parser/parse_expr.c:2329
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "nie można rzutować wyniku XMLSERIALIZE na %s"
 
-#: parser/parse_expr.c:2601 parser/parse_expr.c:2797
+#: parser/parse_expr.c:2625 parser/parse_expr.c:2821
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "nierówna liczba wpisów w wyrażeniach wierszowych"
 
-#: parser/parse_expr.c:2611
+#: parser/parse_expr.c:2635
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "nie można porównywać wierszy zerowej długości"
 
-#: parser/parse_expr.c:2636
+#: parser/parse_expr.c:2660
 #, 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:2643
+#: parser/parse_expr.c:2667
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "operator porównywania wierszy nie może zwracać grupy"
 
-#: parser/parse_expr.c:2702 parser/parse_expr.c:2743
+#: parser/parse_expr.c:2726 parser/parse_expr.c:2767
 #, 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:2704
+#: parser/parse_expr.c:2728
 #, c-format
 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:2745
+#: parser/parse_expr.c:2769
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "Jest wiele równie odpowiednich kandydatów."
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2861
 #, c-format
 msgid "IS DISTINCT FROM requires = operator to yield boolean"
 msgstr "IS DISTINCT FROM wymaga operatora = w celu uzyskania typu logicznego"
 
-#: parser/parse_expr.c:3127 parser/parse_expr.c:3145
+#: parser/parse_expr.c:3151 parser/parse_expr.c:3169
 #, c-format
 msgid "operator precedence change: %s is now lower precedence than %s"
 msgstr "zmiana pierwszeństwa operatorów: %s ma teraz niższy priorytet niż %s"
@@ -13321,174 +13311,174 @@
 msgid "LIKE is not supported for creating foreign tables"
 msgstr "LIKE nie jest obsługiwane podczas tworzenia tabel zewnętrznych"
 
-#: parser/parse_utilcmd.c:1239 parser/parse_utilcmd.c:1315
+#: parser/parse_utilcmd.c:1241 parser/parse_utilcmd.c:1317
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "indeks \"%s\" zawiera wskazanie na tabelę całowierszową"
 
-#: parser/parse_utilcmd.c:1584
+#: parser/parse_utilcmd.c:1586
 #, c-format
 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:1604
+#: parser/parse_utilcmd.c:1606
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "indeks \"%s\" jest już związany z ograniczeniem"
 
-#: parser/parse_utilcmd.c:1612
+#: parser/parse_utilcmd.c:1614
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "indeks \"%s\" nie należy do tabeli \"%s\""
 
-#: parser/parse_utilcmd.c:1619
+#: parser/parse_utilcmd.c:1621
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "indeks \"%s\" nie jest poprawny"
 
-#: parser/parse_utilcmd.c:1625
+#: parser/parse_utilcmd.c:1627
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "\"%s\" nie jest indeksem unikalnym"
 
-#: parser/parse_utilcmd.c:1626 parser/parse_utilcmd.c:1633
-#: parser/parse_utilcmd.c:1640 parser/parse_utilcmd.c:1710
+#: parser/parse_utilcmd.c:1628 parser/parse_utilcmd.c:1635
+#: parser/parse_utilcmd.c:1642 parser/parse_utilcmd.c:1712
 #, c-format
 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:1632
+#: parser/parse_utilcmd.c:1634
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "indeks \"%s\" zawiera wyrażenia"
 
-#: parser/parse_utilcmd.c:1639
+#: parser/parse_utilcmd.c:1641
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "\"%s\" jest indeksem częściowym"
 
-#: parser/parse_utilcmd.c:1651
+#: parser/parse_utilcmd.c:1653
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "\"%s\" jest indeksem odraczalnym"
 
-#: parser/parse_utilcmd.c:1652
+#: parser/parse_utilcmd.c:1654
 #, c-format
 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:1709
+#: parser/parse_utilcmd.c:1711
 #, c-format
 msgid "index \"%s\" does not have default sorting behavior"
 msgstr "indeks \"%s\" nie ma domyślnego zachowania sortowania"
 
-#: parser/parse_utilcmd.c:1856
+#: parser/parse_utilcmd.c:1858
 #, 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:1862
+#: parser/parse_utilcmd.c:1864
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "kolumna \"%s\" występuje dwukrotnie w ograniczeniu unikalnym"
 
-#: parser/parse_utilcmd.c:2032
+#: parser/parse_utilcmd.c:2034
 #, c-format
 msgid "index expression cannot return a set"
 msgstr "wyrażenie indeksowe nie może zwracać zbioru"
 
-#: parser/parse_utilcmd.c:2043
+#: parser/parse_utilcmd.c:2045
 #, c-format
 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:2089
+#: parser/parse_utilcmd.c:2091
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "reguły w widokach materializowanych nie są obsługiwane"
 
-#: parser/parse_utilcmd.c:2150
+#: parser/parse_utilcmd.c:2152
 #, c-format
 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:2222
+#: parser/parse_utilcmd.c:2224
 #, c-format
 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:2240 parser/parse_utilcmd.c:2339
+#: parser/parse_utilcmd.c:2242 parser/parse_utilcmd.c:2341
 #: rewrite/rewriteHandler.c:478 rewrite/rewriteManip.c:1015
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "warunkowe wyrażenia UNION/INTERSECT/EXCEPT nie są zaimplementowane"
 
-#: parser/parse_utilcmd.c:2258
+#: parser/parse_utilcmd.c:2260
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "reguła ON SELECT nie może używać OLD"
 
-#: parser/parse_utilcmd.c:2262
+#: parser/parse_utilcmd.c:2264
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "reguła ON SELECT nie może używać NEW"
 
-#: parser/parse_utilcmd.c:2271
+#: parser/parse_utilcmd.c:2273
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "reguła ON INSERT nie może używać OLD"
 
-#: parser/parse_utilcmd.c:2277
+#: parser/parse_utilcmd.c:2279
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "reguła ON DELETE nie może używać NEW"
 
-#: parser/parse_utilcmd.c:2305
+#: parser/parse_utilcmd.c:2307
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "nie może odnosić się do OLD z kwerendy WITH"
 
-#: parser/parse_utilcmd.c:2312
+#: parser/parse_utilcmd.c:2314
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "nie może odnosić się do NEW z kwerendy WITH"
 
-#: parser/parse_utilcmd.c:2515
+#: parser/parse_utilcmd.c:2517
 #, c-format
 msgid "transform expression must not return a set"
 msgstr "wyrażenie przekształcenia nie może zwracać zbioru"
 
-#: parser/parse_utilcmd.c:2629
+#: parser/parse_utilcmd.c:2631
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "niewłaściwie położona klauzula DEFERRABLE"
 
-#: parser/parse_utilcmd.c:2634 parser/parse_utilcmd.c:2649
+#: parser/parse_utilcmd.c:2636 parser/parse_utilcmd.c:2651
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "wielokrotne klauzule DEFERRABLE/NOT DEFERRABLE niedozwolone"
 
-#: parser/parse_utilcmd.c:2644
+#: parser/parse_utilcmd.c:2646
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "niewłaściwie położona klauzula NOT DEFERRABLE"
 
-#: parser/parse_utilcmd.c:2665
+#: parser/parse_utilcmd.c:2667
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "niewłaściwie położona klauzula INITIALLY DEFERRABLE"
 
-#: parser/parse_utilcmd.c:2670 parser/parse_utilcmd.c:2696
+#: parser/parse_utilcmd.c:2672 parser/parse_utilcmd.c:2698
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "wielokrotne klauzule INITIALLY IMMEDIATE/DEFERRED niedozwolone"
 
-#: parser/parse_utilcmd.c:2691
+#: parser/parse_utilcmd.c:2693
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "niewłaściwie położona klauzula INITIALLY IMMEDIATE"
 
-#: parser/parse_utilcmd.c:2882
+#: parser/parse_utilcmd.c:2884
 #, 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)"
@@ -13595,27 +13585,27 @@
 msgid "could not stat data directory \"%s\": %m"
 msgstr "nie można wykonać stat na folderze danych \"%s\": %m"
 
-#: port/win32/crashdump.c:108
+#: port/win32/crashdump.c:122
 #, c-format
 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
+#: port/win32/crashdump.c:130
 #, c-format
 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
+#: port/win32/crashdump.c:161
 #, c-format
 msgid "could not open crash dump file \"%s\" for writing: error code %lu\n"
 msgstr "nie udało się otworzyć pliku zrzutu awaryjnego \"%s\" do zapisu: kod błędu %lu\n"
 
-#: port/win32/crashdump.c:154
+#: port/win32/crashdump.c:168
 #, c-format
 msgid "wrote crash dump to file \"%s\"\n"
 msgstr "zapisano zrzut awaryjny do pliku \"%s\"\n"
 
-#: port/win32/crashdump.c:156
+#: port/win32/crashdump.c:170
 #, c-format
 msgid "could not write crash dump to file \"%s\": error code %lu\n"
 msgstr "nie udało się zapisać zrzutu awaryjnego do pliku \"%s\": kod błędu %lu\n"
@@ -13635,17 +13625,17 @@
 msgid "could not get SID for PowerUsers group: error code %lu\n"
 msgstr "nie można pobrać SID dla grupy Użytkowników zaawansowanych: kod błędu %lu\n"
 
-#: port/win32/signal.c:193
+#: port/win32/signal.c:194
 #, c-format
 msgid "could not create signal listener pipe for PID %d: error code %lu"
 msgstr "nie można utworzyć rury nasłuchu sygnału dla PID %d: kod błędu %lu"
 
-#: port/win32/signal.c:273 port/win32/signal.c:305
+#: port/win32/signal.c:274 port/win32/signal.c:306
 #, c-format
 msgid "could not create signal listener pipe: error code %lu; retrying\n"
 msgstr "nie można utworzyć rury nasłuchu sygnału: kod błędu %lu; ponawianie\n"
 
-#: port/win32/signal.c:316
+#: port/win32/signal.c:317
 #, c-format
 msgid "could not create signal dispatch thread: error code %lu\n"
 msgstr "nie można utworzyć wątku wysyłki sygnału: kod błędu %lu\n"
@@ -13700,57 +13690,57 @@
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "Nieudanym wywołaniem systemowym było MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:377
+#: postmaster/autovacuum.c:380
 #, c-format
 msgid "could not fork autovacuum launcher process: %m"
 msgstr "nie można rozwidlić procesu uruchamiania autoodkurzania: %m"
 
-#: postmaster/autovacuum.c:413
+#: postmaster/autovacuum.c:416
 #, c-format
 msgid "autovacuum launcher started"
 msgstr "uruchomiono program wywołujący autoodkurzanie"
 
-#: postmaster/autovacuum.c:775
+#: postmaster/autovacuum.c:779
 #, c-format
 msgid "autovacuum launcher shutting down"
 msgstr "zamknięto program wywołujący autoodkurzanie"
 
-#: postmaster/autovacuum.c:1443
+#: postmaster/autovacuum.c:1447
 #, c-format
 msgid "could not fork autovacuum worker process: %m"
 msgstr "nie można rozwidlić proces roboczego autoodkurzania: %m"
 
-#: postmaster/autovacuum.c:1639
+#: postmaster/autovacuum.c:1643
 #, c-format
 msgid "autovacuum: processing database \"%s\""
 msgstr "autoodkurzanie: przetwarzanie bazy danych \"%s\""
 
-#: postmaster/autovacuum.c:2051
+#: postmaster/autovacuum.c:2056
 #, 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:2063
+#: postmaster/autovacuum.c:2068
 #, 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:2346
+#: postmaster/autovacuum.c:2352
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "automatyczne odkurzanie tabeli \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2349
+#: postmaster/autovacuum.c:2355
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "automatyczna analiza tabeli \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2877
+#: postmaster/autovacuum.c:2885
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "nie uruchomiono autoodkurzanie przez błąd konfiguracji"
 
-#: postmaster/autovacuum.c:2878
+#: postmaster/autovacuum.c:2886
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "WÅ‚Ä…cz opcjÄ™ \"track_counts\"."
@@ -13877,7 +13867,7 @@
 msgid "archive command was terminated by exception 0x%X"
 msgstr "polecenie archiwizacji zostało zatrzymane przez wyjątek 0x%X"
 
-#: postmaster/pgarch.c:598 postmaster/postmaster.c:3459
+#: postmaster/pgarch.c:598 postmaster/postmaster.c:3463
 #, c-format
 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."
@@ -13907,87 +13897,87 @@
 msgid "could not open archive status directory \"%s\": %m"
 msgstr "nie można otworzyć folderu stanu archiwum \"%s\": %m"
 
-#: postmaster/pgstat.c:356
+#: postmaster/pgstat.c:352
 #, c-format
 msgid "could not resolve \"localhost\": %s"
 msgstr "nie może rozwiązać \"localhost\": %s"
 
-#: postmaster/pgstat.c:379
+#: postmaster/pgstat.c:375
 #, c-format
 msgid "trying another address for the statistics collector"
 msgstr "próba innego adresu do kolektora statystyk"
 
-#: postmaster/pgstat.c:388
+#: postmaster/pgstat.c:384
 #, c-format
 msgid "could not create socket for statistics collector: %m"
 msgstr "nie można utworzyć gniazda dla kolektora statystyk: %m"
 
-#: postmaster/pgstat.c:400
+#: postmaster/pgstat.c:396
 #, 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:411
+#: postmaster/pgstat.c:407
 #, 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:427
+#: postmaster/pgstat.c:423
 #, 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:448
+#: postmaster/pgstat.c:444
 #, 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:474
+#: postmaster/pgstat.c:470
 #, c-format
 msgid "select() failed in statistics collector: %m"
 msgstr "nie powiodło się select() na kolektorze statystyk: %m"
 
-#: postmaster/pgstat.c:489
+#: postmaster/pgstat.c:485
 #, c-format
 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:504
+#: postmaster/pgstat.c:500
 #, 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:514
+#: postmaster/pgstat.c:510
 #, c-format
 msgid "incorrect test message transmission on socket for statistics collector"
 msgstr "niepoprawna transmisja komunikatu testowego na gnieździe dla kolektora statystyk"
 
-#: postmaster/pgstat.c:537
+#: postmaster/pgstat.c:533
 #, 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:547
+#: postmaster/pgstat.c:543
 #, c-format
 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:694
+#: postmaster/pgstat.c:690
 #, c-format
 msgid "could not fork statistics collector: %m"
 msgstr "nie można rozwidlić gniazda dla kolektora statystyk: %m"
 
-#: postmaster/pgstat.c:1233 postmaster/pgstat.c:1257 postmaster/pgstat.c:1290
+#: postmaster/pgstat.c:1229 postmaster/pgstat.c:1253 postmaster/pgstat.c:1286
 #, c-format
 msgid "must be superuser to reset statistics counters"
 msgstr "musisz być superużytkownikiem by zresetować liczniki statystyk"
 
-#: postmaster/pgstat.c:1266
+#: postmaster/pgstat.c:1262
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "nierozpoznany cel resetu \"%s\""
 
-#: postmaster/pgstat.c:1267
+#: postmaster/pgstat.c:1263
 #, c-format
 msgid "Target must be \"archiver\" or \"bgwriter\"."
 msgstr "Celem musi być \"archiver\" lub \"bgwriter\"."
@@ -13997,47 +13987,47 @@
 msgid "could not read statistics message: %m"
 msgstr "nie można odczytać komunikatu statystyk: %m"
 
-#: postmaster/pgstat.c:3756 postmaster/pgstat.c:3933
+#: postmaster/pgstat.c:3756 postmaster/pgstat.c:3913
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "nie można otworzyć tymczasowego pliku statystyk \"%s\": %m"
 
-#: postmaster/pgstat.c:3824 postmaster/pgstat.c:3978
+#: postmaster/pgstat.c:3823 postmaster/pgstat.c:3958
 #, 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:3833 postmaster/pgstat.c:3987
+#: postmaster/pgstat.c:3832 postmaster/pgstat.c:3967
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "nie można zamknąć tymczasowego pliku statystyk \"%s\": %m"
 
-#: postmaster/pgstat.c:3841 postmaster/pgstat.c:3995
+#: postmaster/pgstat.c:3840 postmaster/pgstat.c:3975
 #, 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:4077 postmaster/pgstat.c:4260 postmaster/pgstat.c:4415
+#: postmaster/pgstat.c:4064 postmaster/pgstat.c:4249 postmaster/pgstat.c:4402
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "nie można otworzyć pliku statystyk \"%s\": %m"
 
-#: postmaster/pgstat.c:4089 postmaster/pgstat.c:4099 postmaster/pgstat.c:4109
-#: postmaster/pgstat.c:4130 postmaster/pgstat.c:4145 postmaster/pgstat.c:4201
-#: postmaster/pgstat.c:4272 postmaster/pgstat.c:4292 postmaster/pgstat.c:4310
-#: postmaster/pgstat.c:4326 postmaster/pgstat.c:4344 postmaster/pgstat.c:4360
-#: postmaster/pgstat.c:4427 postmaster/pgstat.c:4439 postmaster/pgstat.c:4451
-#: postmaster/pgstat.c:4476 postmaster/pgstat.c:4498
+#: postmaster/pgstat.c:4076 postmaster/pgstat.c:4086 postmaster/pgstat.c:4096
+#: postmaster/pgstat.c:4117 postmaster/pgstat.c:4132 postmaster/pgstat.c:4186
+#: postmaster/pgstat.c:4261 postmaster/pgstat.c:4281 postmaster/pgstat.c:4299
+#: postmaster/pgstat.c:4315 postmaster/pgstat.c:4333 postmaster/pgstat.c:4349
+#: postmaster/pgstat.c:4414 postmaster/pgstat.c:4426 postmaster/pgstat.c:4438
+#: postmaster/pgstat.c:4463 postmaster/pgstat.c:4485
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "uszkodzony plik statystyk \"%s\""
 
-#: postmaster/pgstat.c:4615
+#: postmaster/pgstat.c:4614
 #, c-format
 msgid "using stale statistics instead of current ones because stats collector is not responding"
 msgstr "użycie przedawnionych statystyk zamiast bieżących gdyż kolektor statystyk nie odpowiada"
 
-#: postmaster/pgstat.c:4933
+#: postmaster/pgstat.c:4943
 #, c-format
 msgid "database hash table corrupted during cleanup --- abort"
 msgstr "tabeli haszy bazy danych uszkodzona podczas czyszczenia --- przerwano"
@@ -14057,148 +14047,148 @@
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: niepoprawny argument: \"%s\"\n"
 
-#: postmaster/postmaster.c:842
+#: postmaster/postmaster.c:846
 #, 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:847
+#: postmaster/postmaster.c:851
 #, c-format
 msgid "%s: max_wal_senders must be less than max_connections\n"
 msgstr "%s: max_wal_senders musi być mniejszy niż max_connections\n"
 
-#: postmaster/postmaster.c:852
+#: postmaster/postmaster.c:856
 #, c-format
 msgid "WAL archival cannot be enabled when wal_level is \"minimal\""
 msgstr "archiwalny WAL nie może być włączony gdy wal_level jest \"minimal\""
 
-#: postmaster/postmaster.c:855
+#: postmaster/postmaster.c:859
 #, c-format
 msgid "WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", \"hot_standby\", or \"logical\""
 msgstr "przesyłanie WAL (max_wal_senders > 0) wymaga dla wal_level wartości \"archive\", \"hot_standby\" lub \"logical\""
 
-#: postmaster/postmaster.c:863
+#: postmaster/postmaster.c:867
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s: niepoprawne tabele datetoken, proszę naprawić\n"
 
-#: postmaster/postmaster.c:955 postmaster/postmaster.c:1053
-#: utils/init/miscinit.c:1400
+#: postmaster/postmaster.c:959 postmaster/postmaster.c:1057
+#: utils/init/miscinit.c:1410
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "niepoprawna składnia listy w parametrze \"%s\""
 
-#: postmaster/postmaster.c:986
+#: postmaster/postmaster.c:990
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "nie można utworzyć gniazda nasłuchu dla \"%s\""
 
-#: postmaster/postmaster.c:992
+#: postmaster/postmaster.c:996
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "nie można stworzyć żadnego gniazda TCP/IP"
 
-#: postmaster/postmaster.c:1075
+#: postmaster/postmaster.c:1079
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
 msgstr "nie można stworzyć gniazda domeny Uniksa w folderze \"%s\""
 
-#: postmaster/postmaster.c:1081
+#: postmaster/postmaster.c:1085
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "nie można stworzyć żadnych gniazd domeny Uniksa"
 
-#: postmaster/postmaster.c:1093
+#: postmaster/postmaster.c:1097
 #, c-format
 msgid "no socket created for listening"
 msgstr "nie utworzono żadnego gniazda do nasłuchiwania"
 
-#: postmaster/postmaster.c:1133
+#: postmaster/postmaster.c:1137
 #, c-format
 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:1162
+#: postmaster/postmaster.c:1166
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %s\n"
 msgstr "%s: nie można zmienić uprawnień pliku PID zewnętrznych \"%s\": %s\n"
 
-#: postmaster/postmaster.c:1166
+#: postmaster/postmaster.c:1170
 #, 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:1217
+#: postmaster/postmaster.c:1221
 #, c-format
 msgid "ending log output to stderr"
 msgstr "zakończenie wysyłania dziennika na stderr"
 
-#: postmaster/postmaster.c:1218
+#: postmaster/postmaster.c:1222
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
 msgstr "Następne przesłania treści dziennika do celu logowania \"%s\"."
 
-#: postmaster/postmaster.c:1244 utils/init/postinit.c:200
+#: postmaster/postmaster.c:1248 utils/init/postinit.c:200
 #, c-format
 msgid "could not load pg_hba.conf"
 msgstr "nie można załadować pg_hba.conf"
 
-#: postmaster/postmaster.c:1270
+#: postmaster/postmaster.c:1274
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "postmaster stał się wielowątkowy podczas rozruchu"
 
-#: postmaster/postmaster.c:1271
+#: postmaster/postmaster.c:1275
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "Ustaw zmienną środowiskową LC_ALL na poprawną lokalizację."
 
-#: postmaster/postmaster.c:1368
+#: postmaster/postmaster.c:1372
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: nie można odnaleźć pasującego programu wykonywalnego postgres"
 
-#: postmaster/postmaster.c:1391 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1395 utils/misc/tzparser.c:341
 #, 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:1419
+#: postmaster/postmaster.c:1423
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "folder danych \"%s\" nie istnieje"
 
-#: postmaster/postmaster.c:1424
+#: postmaster/postmaster.c:1428
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "nie można odczytać uprawnień dla folderu \"%s\": %m"
 
-#: postmaster/postmaster.c:1432
+#: postmaster/postmaster.c:1436
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "wskazany folder danych \"%s\" nie jest folderem"
 
-#: postmaster/postmaster.c:1448
+#: postmaster/postmaster.c:1452
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "słownik danych \"%s\" ma niepoprawną własność"
 
-#: postmaster/postmaster.c:1450
+#: postmaster/postmaster.c:1454
 #, c-format
 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:1470
+#: postmaster/postmaster.c:1474
 #, 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:1472
+#: postmaster/postmaster.c:1476
 #, c-format
 msgid "Permissions should be u=rwx (0700)."
 msgstr "Prawa dostępu powinny być u=rwx (0700)."
 
-#: postmaster/postmaster.c:1483
+#: postmaster/postmaster.c:1487
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -14209,365 +14199,365 @@
 "Powinien był znajdować się w folderze \"%s\",\n"
 "ale nie udało się otworzyć pliku \"%s\": %s\n"
 
-#: postmaster/postmaster.c:1660
+#: postmaster/postmaster.c:1664
 #, c-format
 msgid "select() failed in postmaster: %m"
 msgstr "nie powiodło się select() w postmasterze: %m"
 
-#: postmaster/postmaster.c:1810
+#: postmaster/postmaster.c:1814
 #, c-format
 msgid "performing immediate shutdown because data directory lock file is invalid"
 msgstr "wykonanie natychmiastowego zamknięcia gdyż plik blokady folderu danych jest niepoprawny"
 
-#: postmaster/postmaster.c:1888 postmaster/postmaster.c:1919
+#: postmaster/postmaster.c:1892 postmaster/postmaster.c:1923
 #, c-format
 msgid "incomplete startup packet"
 msgstr "niekompletny pakiet uruchomieniowy"
 
-#: postmaster/postmaster.c:1900
+#: postmaster/postmaster.c:1904
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "niepoprawna długość pakietu uruchomieniowego"
 
-#: postmaster/postmaster.c:1958
+#: postmaster/postmaster.c:1962
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "nie powiodło się wysłanie odpowiedzi negocjacji SSL: %m"
 
-#: postmaster/postmaster.c:1987
+#: postmaster/postmaster.c:1991
 #, 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:2050 utils/misc/guc.c:5484 utils/misc/guc.c:5577
-#: utils/misc/guc.c:6869 utils/misc/guc.c:9566 utils/misc/guc.c:9600
+#: postmaster/postmaster.c:2054 utils/misc/guc.c:5484 utils/misc/guc.c:5577
+#: utils/misc/guc.c:6874 utils/misc/guc.c:9579 utils/misc/guc.c:9613
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "nieprawidłowa wartość dla parametru \"%s\": \"%s\""
 
-#: postmaster/postmaster.c:2053
+#: postmaster/postmaster.c:2057
 #, c-format
 msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
 msgstr "Poprawne wartości to: \"false\", 0, \"true\", 1, \"database\"."
 
-#: postmaster/postmaster.c:2073
+#: postmaster/postmaster.c:2077
 #, c-format
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr "niepoprawny układ pakietu uruchomieniowego: oczekiwano terminatora na ostatnim bajcie"
 
-#: postmaster/postmaster.c:2101
+#: postmaster/postmaster.c:2105
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "brak użytkownika PostgreSQL wskazanego w pakiecie uruchomieniowym"
 
-#: postmaster/postmaster.c:2160
+#: postmaster/postmaster.c:2164
 #, c-format
 msgid "the database system is starting up"
 msgstr "system bazy danych uruchamia siÄ™"
 
-#: postmaster/postmaster.c:2165
+#: postmaster/postmaster.c:2169
 #, c-format
 msgid "the database system is shutting down"
 msgstr "system bazy danych jest zamykany"
 
-#: postmaster/postmaster.c:2170
+#: postmaster/postmaster.c:2174
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "system bazy danych jest w trybie odzyskiwania"
 
-#: postmaster/postmaster.c:2175 storage/ipc/procarray.c:284
+#: postmaster/postmaster.c:2179 storage/ipc/procarray.c:284
 #: storage/ipc/sinvaladt.c:298 storage/lmgr/proc.c:334
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "przepraszamy, mamy już zbyt wiele klientów"
 
-#: postmaster/postmaster.c:2237
+#: postmaster/postmaster.c:2241
 #, c-format
 msgid "wrong key in cancel request for process %d"
 msgstr "niepoprawny klucz w żądaniu anulowania dla procesu %d"
 
-#: postmaster/postmaster.c:2245
+#: postmaster/postmaster.c:2249
 #, 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:2465
+#: postmaster/postmaster.c:2469
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "odebrano SIGHUP, przeładowanie plików konfiguracyjnych"
 
-#: postmaster/postmaster.c:2490
+#: postmaster/postmaster.c:2494
 #, c-format
 msgid "pg_hba.conf not reloaded"
 msgstr "pg_hba.conf nie przeładowany"
 
-#: postmaster/postmaster.c:2494
+#: postmaster/postmaster.c:2498
 #, c-format
 msgid "pg_ident.conf not reloaded"
 msgstr "pg_ident.conf nie przeładowany"
 
-#: postmaster/postmaster.c:2535
+#: postmaster/postmaster.c:2539
 #, c-format
 msgid "received smart shutdown request"
 msgstr "odebrano żądanie inteligentnego zamknięcia"
 
-#: postmaster/postmaster.c:2587
+#: postmaster/postmaster.c:2591
 #, c-format
 msgid "received fast shutdown request"
 msgstr "odebrano żądanie szybkiego zamknięcia"
 
-#: postmaster/postmaster.c:2613
+#: postmaster/postmaster.c:2617
 #, c-format
 msgid "aborting any active transactions"
 msgstr "przerywanie wszelkich aktywnych transakcji"
 
-#: postmaster/postmaster.c:2647
+#: postmaster/postmaster.c:2651
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "odebrano żądanie natychmiastowego zamknięcia"
 
-#: postmaster/postmaster.c:2708
+#: postmaster/postmaster.c:2712
 #, c-format
 msgid "shutdown at recovery target"
 msgstr "wyłączenie na celu odzyskiwania"
 
-#: postmaster/postmaster.c:2724 postmaster/postmaster.c:2747
+#: postmaster/postmaster.c:2728 postmaster/postmaster.c:2751
 msgid "startup process"
 msgstr "proces uruchomienia"
 
-#: postmaster/postmaster.c:2727
+#: postmaster/postmaster.c:2731
 #, c-format
 msgid "aborting startup due to startup process failure"
 msgstr "przerwanie uruchomienia ze względu na niepowodzenie procesu uruchomienia"
 
-#: postmaster/postmaster.c:2788
+#: postmaster/postmaster.c:2792
 #, c-format
 msgid "database system is ready to accept connections"
 msgstr "system bazy danych jest gotowy do przyjmowania połączeń"
 
-#: postmaster/postmaster.c:2803
+#: postmaster/postmaster.c:2807
 msgid "background writer process"
 msgstr "proces zapisu działający w tle"
 
-#: postmaster/postmaster.c:2857
+#: postmaster/postmaster.c:2861
 msgid "checkpointer process"
 msgstr "proces punktów kontrolnych"
 
-#: postmaster/postmaster.c:2873
+#: postmaster/postmaster.c:2877
 msgid "WAL writer process"
 msgstr "proces zapisu WAL"
 
-#: postmaster/postmaster.c:2887
+#: postmaster/postmaster.c:2891
 msgid "WAL receiver process"
 msgstr "proces odbioru WAL"
 
-#: postmaster/postmaster.c:2902
+#: postmaster/postmaster.c:2906
 msgid "autovacuum launcher process"
 msgstr "proces wywołujący autoodkurzanie"
 
-#: postmaster/postmaster.c:2917
+#: postmaster/postmaster.c:2921
 msgid "archiver process"
 msgstr "proces archiwizera"
 
-#: postmaster/postmaster.c:2933
+#: postmaster/postmaster.c:2937
 msgid "statistics collector process"
 msgstr "proces kolektora statystyk"
 
-#: postmaster/postmaster.c:2947
+#: postmaster/postmaster.c:2951
 msgid "system logger process"
 msgstr "proces rejestratora systemowego"
 
-#: postmaster/postmaster.c:3009
+#: postmaster/postmaster.c:3013
 msgid "worker process"
 msgstr "proces roboczy"
 
-#: postmaster/postmaster.c:3092 postmaster/postmaster.c:3112
-#: postmaster/postmaster.c:3119 postmaster/postmaster.c:3137
+#: postmaster/postmaster.c:3096 postmaster/postmaster.c:3116
+#: postmaster/postmaster.c:3123 postmaster/postmaster.c:3141
 msgid "server process"
 msgstr "proces serwera"
 
-#: postmaster/postmaster.c:3191
+#: postmaster/postmaster.c:3195
 #, c-format
 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:3447
+#: postmaster/postmaster.c:3451
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) wyszedł z kodem zakończenia %d"
 
-#: postmaster/postmaster.c:3449 postmaster/postmaster.c:3460
-#: postmaster/postmaster.c:3471 postmaster/postmaster.c:3480
-#: postmaster/postmaster.c:3490
+#: postmaster/postmaster.c:3453 postmaster/postmaster.c:3464
+#: postmaster/postmaster.c:3475 postmaster/postmaster.c:3484
+#: postmaster/postmaster.c:3494
 #, c-format
 msgid "Failed process was running: %s"
 msgstr "Zawiódł wykonywany proces: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3457
+#: postmaster/postmaster.c:3461
 #, 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:3467
+#: postmaster/postmaster.c:3471
 #, 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:3478
+#: postmaster/postmaster.c:3482
 #, 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:3488
+#: postmaster/postmaster.c:3492
 #, 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:3675
+#: postmaster/postmaster.c:3679
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "nieprawidłowe zamknięcie systemu bazy danych"
 
-#: postmaster/postmaster.c:3715
+#: postmaster/postmaster.c:3719
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "wszelkie procesy serwera zakończone; ponowna inicjacja"
 
-#: postmaster/postmaster.c:3927
+#: postmaster/postmaster.c:3931
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "nie można rozwidlić procesu połączenia: %m"
 
-#: postmaster/postmaster.c:3969
+#: postmaster/postmaster.c:3973
 msgid "could not fork new process for connection: "
 msgstr "nie można rozwidlić nowego procesu połączenia: "
 
-#: postmaster/postmaster.c:4083
+#: postmaster/postmaster.c:4087
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "odebrano połączenie: host=%s port=%s"
 
-#: postmaster/postmaster.c:4088
+#: postmaster/postmaster.c:4092
 #, c-format
 msgid "connection received: host=%s"
 msgstr "odebrano połączenie: host=%s"
 
-#: postmaster/postmaster.c:4371
+#: postmaster/postmaster.c:4375
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "nie można wykonać procesu serwera \"%s\": %m"
 
-#: postmaster/postmaster.c:4931
+#: postmaster/postmaster.c:4935
 #, c-format
 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:5214
+#: postmaster/postmaster.c:5218
 #, c-format
 msgid "could not fork startup process: %m"
 msgstr "nie można rozwidlić procesu uruchamiającego: %m"
 
-#: postmaster/postmaster.c:5218
+#: postmaster/postmaster.c:5222
 #, c-format
 msgid "could not fork background writer process: %m"
 msgstr "nie udało się rozwidlenie procesu zapisu w tle: %m"
 
-#: postmaster/postmaster.c:5222
+#: postmaster/postmaster.c:5226
 #, c-format
 msgid "could not fork checkpointer process: %m"
 msgstr "nie można rozwidlić procesu punktów kontrolnych %m"
 
-#: postmaster/postmaster.c:5226
+#: postmaster/postmaster.c:5230
 #, c-format
 msgid "could not fork WAL writer process: %m"
 msgstr "nie można rozwidlić procesu zapisu WAL: %m"
 
-#: postmaster/postmaster.c:5230
+#: postmaster/postmaster.c:5234
 #, c-format
 msgid "could not fork WAL receiver process: %m"
 msgstr "nie można rozwidlić procesu odbioru WAL: %m"
 
-#: postmaster/postmaster.c:5234
+#: postmaster/postmaster.c:5238
 #, c-format
 msgid "could not fork process: %m"
 msgstr "nie można rozwidlić procesu: %m"
 
-#: postmaster/postmaster.c:5396 postmaster/postmaster.c:5419
+#: postmaster/postmaster.c:5400 postmaster/postmaster.c:5423
 #, c-format
 msgid "database connection requirement not indicated during registration"
 msgstr "wymaganie połączenia do bazy danych nie wyspecyfikowane podczas rejestracji"
 
-#: postmaster/postmaster.c:5403 postmaster/postmaster.c:5426
+#: postmaster/postmaster.c:5407 postmaster/postmaster.c:5430
 #, c-format
 msgid "invalid processing mode in background worker"
 msgstr "niepoprawny tryb przetwarzania pracownika tła"
 
-#: postmaster/postmaster.c:5478
+#: postmaster/postmaster.c:5482
 #, c-format
 msgid "starting background worker process \"%s\""
 msgstr "uruchomienie pracownika w tle \"%s\""
 
-#: postmaster/postmaster.c:5489
+#: postmaster/postmaster.c:5493
 #, c-format
 msgid "could not fork worker process: %m"
 msgstr "nie można rozwidlić procesu tła: %m"
 
-#: postmaster/postmaster.c:5865
+#: postmaster/postmaster.c:5869
 #, 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:5897
+#: postmaster/postmaster.c:5901
 #, 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:5926
+#: postmaster/postmaster.c:5930
 #, c-format
 msgid "could not open backend variables file \"%s\": %s\n"
 msgstr "nie można otworzyć pliku zmiennych backendu \"%s\": %s\n"
 
-#: postmaster/postmaster.c:5933
+#: postmaster/postmaster.c:5937
 #, 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:5942
+#: postmaster/postmaster.c:5946
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "nie można usunąć pliku \"%s\": %s\n"
 
-#: postmaster/postmaster.c:5959
+#: postmaster/postmaster.c:5963
 #, c-format
 msgid "could not map view of backend variables: error code %lu\n"
 msgstr "nie można zmapować widoku zmiennych backendu: kod błędu %lu\n"
 
-#: postmaster/postmaster.c:5968
+#: postmaster/postmaster.c:5972
 #, c-format
 msgid "could not unmap view of backend variables: error code %lu\n"
 msgstr "nie można odmapować widoku zmiennych backendu: kod błędu %lu\n"
 
-#: postmaster/postmaster.c:5975
+#: postmaster/postmaster.c:5979
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %lu\n"
 msgstr "nie można zamknąć uchwytu do zmiennych parametryzujących backendu: kod błędu %lu\n"
 
-#: postmaster/postmaster.c:6134
+#: postmaster/postmaster.c:6138
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "nie można odczytać kodu wyjścia procesu\n"
 
-#: postmaster/postmaster.c:6139
+#: postmaster/postmaster.c:6143
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "nie można wysłać statusu zakończenia potomka\n"
@@ -14854,13 +14844,11 @@
 
 #: replication/logical/logicalfuncs.c:301
 #, c-format
-#| msgid "field name must not be null"
 msgid "slot name must not be null"
 msgstr "nazwa gniazda nie może być pusta"
 
 #: replication/logical/logicalfuncs.c:317
 #, c-format
-#| msgid "typmod array must not contain nulls"
 msgid "options array must not be null"
 msgstr "tablica opcji nie może być pusta"
 
@@ -14910,76 +14898,76 @@
 msgid "could not drop replication origin with OID %d, in use by PID %d"
 msgstr "nie można skasować źródła replikacji o OID %d, używane przez PID %d"
 
-#: replication/logical/origin.c:690
+#: replication/logical/origin.c:671
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr "punkt sprawdzenia replikacji ma niepoprawny magik %u zamiast %u"
 
-#: replication/logical/origin.c:722
+#: replication/logical/origin.c:703
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
 msgstr "nie można czytać z pliku \"%s\": odczyt %d z %zu"
 
-#: replication/logical/origin.c:731
+#: replication/logical/origin.c:712
 #, c-format
 msgid "could not find free replication state, increase max_replication_slots"
 msgstr "nie znaleziono wolnego gniazda replikacji, zwiększ max_replication_slots"
 
-#: replication/logical/origin.c:749
+#: replication/logical/origin.c:730
 #, c-format
 msgid "replication slot checkpoint has wrong checksum %u, expected %u"
 msgstr "punkt sprawdzenia gniazda replikacji ma niepoprawnÄ… sumÄ™ kontrolnÄ… %u, oczekiwano %u"
 
-#: replication/logical/origin.c:873
+#: replication/logical/origin.c:854
 #, c-format
 msgid "replication origin with OID %d is already active for PID %d"
 msgstr "źródło replikacji z OID %d jest już aktywne dla PID %d"
 
-#: replication/logical/origin.c:884 replication/logical/origin.c:1064
+#: replication/logical/origin.c:865 replication/logical/origin.c:1045
 #, c-format
 msgid "could not find free replication state slot for replication origin with OID %u"
 msgstr "nie udało się znaleźć gniazda stanu replikacji dla źródła replikacji o OID %u"
 
-#: replication/logical/origin.c:886 replication/logical/origin.c:1066
+#: replication/logical/origin.c:867 replication/logical/origin.c:1047
 #: replication/slot.c:1241
 #, c-format
 msgid "Increase max_replication_slots and try again."
 msgstr "Zwiększ max_replication_slots i spróbuj ponownie."
 
-#: replication/logical/origin.c:1023
+#: replication/logical/origin.c:1004
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "nie można ustawić źródła replikacji gdy jakieś jest już ustawione"
 
-#: replication/logical/origin.c:1052
+#: replication/logical/origin.c:1033
 #, c-format
 msgid "replication identifier %d is already active for PID %d"
 msgstr "identyfikator replikacji %d jest już aktywny dla PID %d"
 
-#: replication/logical/origin.c:1098 replication/logical/origin.c:1293
-#: replication/logical/origin.c:1313
+#: replication/logical/origin.c:1079 replication/logical/origin.c:1274
+#: replication/logical/origin.c:1294
 #, c-format
 msgid "no replication origin is configured"
 msgstr "nie skonfigurowano żadnego źródła replikacji"
 
-#: replication/logical/reorderbuffer.c:2170
+#: replication/logical/reorderbuffer.c:2213
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "nie można pisać do pliku danych dla XID %u: %m"
 
-#: replication/logical/reorderbuffer.c:2266
-#: replication/logical/reorderbuffer.c:2286
+#: replication/logical/reorderbuffer.c:2309
+#: replication/logical/reorderbuffer.c:2329
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "nie można czytać z pliku wycieku zmiany kolejności buforów: %m"
 
-#: replication/logical/reorderbuffer.c:2270
-#: replication/logical/reorderbuffer.c:2290
+#: replication/logical/reorderbuffer.c:2313
+#: replication/logical/reorderbuffer.c:2333
 #, c-format
 msgid "could not read from reorderbuffer spill file: read %d instead of %u bytes"
 msgstr "nie można odczytać pliku wycieku zmiany kolejności buforów: odczytano %d zamiast %u bajtów"
 
-#: replication/logical/reorderbuffer.c:2894
+#: replication/logical/reorderbuffer.c:2964
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr "nie można czytać z pliku \"%s\": odczytano %d zamiast %d bajtów"
@@ -14992,28 +14980,28 @@
 msgstr[1] "wyeksportowano logicznie dekodowanÄ… migawkÄ™: \"%s\" z %u IDami transakcji"
 msgstr[2] "wyeksportowano logicznie dekodowanÄ… migawkÄ™: \"%s\" z %u IDami transakcji"
 
-#: replication/logical/snapbuild.c:904 replication/logical/snapbuild.c:1269
-#: replication/logical/snapbuild.c:1800
+#: replication/logical/snapbuild.c:900 replication/logical/snapbuild.c:1265
+#: replication/logical/snapbuild.c:1796
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "dekodowanie logiczne napotkało punkt zgodności na %X/%X"
 
-#: replication/logical/snapbuild.c:906
+#: replication/logical/snapbuild.c:902
 #, c-format
 msgid "Transaction ID %u finished; no more running transactions."
 msgstr "Zakończono transakcję ID %u: brak już aktywnych transakcji."
 
-#: replication/logical/snapbuild.c:1271
+#: replication/logical/snapbuild.c:1267
 #, c-format
 msgid "There are no running transactions."
 msgstr "Nie ma już aktywnych transakcji."
 
-#: replication/logical/snapbuild.c:1333
+#: replication/logical/snapbuild.c:1329
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr "dekodowanie logiczne napotkało początkowy punkt wyjścia na %X/%X"
 
-#: replication/logical/snapbuild.c:1335
+#: replication/logical/snapbuild.c:1331
 #, c-format
 msgid "%u transaction needs to finish."
 msgid_plural "%u transactions need to finish."
@@ -15021,33 +15009,33 @@
 msgstr[1] "%u transakcje wymagają zakończenia."
 msgstr[2] "%u transakcji wymaga zakończenia."
 
-#: replication/logical/snapbuild.c:1674 replication/logical/snapbuild.c:1700
-#: replication/logical/snapbuild.c:1714 replication/logical/snapbuild.c:1728
+#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:1696
+#: replication/logical/snapbuild.c:1710 replication/logical/snapbuild.c:1724
 #, c-format
 msgid "could not read file \"%s\", read %d of %d: %m"
 msgstr "nie można czytać z pliku \"%s\", odczyt %d z %d: %m"
 
-#: replication/logical/snapbuild.c:1680
+#: replication/logical/snapbuild.c:1676
 #, c-format
 msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
 msgstr "plik stanu tworzenia migawek \"%s\" ma niepoprawny magiczny numer: %u zamiast %u"
 
-#: replication/logical/snapbuild.c:1685
+#: replication/logical/snapbuild.c:1681
 #, c-format
 msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
 msgstr "plik stanu tworzenia migawek \"%s\" ma nieobsługiwaną wersję: %u zamiast %u"
 
-#: replication/logical/snapbuild.c:1741
+#: replication/logical/snapbuild.c:1737
 #, c-format
 msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
 msgstr "niezgodność sumy kontrolnej pliku stanu tworzenia migawek \"%s\": jest %u, powinna być %u"
 
-#: replication/logical/snapbuild.c:1802
+#: replication/logical/snapbuild.c:1798
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "Dekodowanie logiczne rozpocznie siÄ™ korzystajÄ…c z zapisanej migawki."
 
-#: replication/logical/snapbuild.c:1875
+#: replication/logical/snapbuild.c:1871
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "nie można zanalizować nazwy pliku \"%s\""
@@ -15297,7 +15285,7 @@
 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)"
 
-#: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:961
+#: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:973
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" already exists"
 msgstr "reguła \"%s\" dla relacji \"%s\" już istnieje"
@@ -15422,68 +15410,75 @@
 msgid "RETURNING list has too many entries"
 msgstr "lista RETURNING posiada zbyt dużo wpisów"
 
-#: rewrite/rewriteDefine.c:684
+#: rewrite/rewriteDefine.c:695
 #, c-format
 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:690
+#: rewrite/rewriteDefine.c:696
+#, c-format
+#| msgid "cannot convert relation containing dropped columns to view"
+msgid "cannot create a RETURNING list for a relation containing dropped columns"
+msgstr ""
+"nie można utworzyć listy RETURNING relacji zawierającej skasowane kolumny"
+
+#: rewrite/rewriteDefine.c:702
 #, c-format
 msgid "SELECT rule's target entry %d has different column name from column \"%s\""
 msgstr "lista docelowa reguły SELECT %d posiada inną nazwę kolumny z kolumny \"%s\""
 
-#: rewrite/rewriteDefine.c:692
+#: rewrite/rewriteDefine.c:704
 #, c-format
 msgid "SELECT target entry is named \"%s\"."
 msgstr "wpis docelowy reguły SELECT nazywa się \"%s\""
 
-#: rewrite/rewriteDefine.c:701
+#: rewrite/rewriteDefine.c:713
 #, 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:703
+#: rewrite/rewriteDefine.c:715
 #, 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:706 rewrite/rewriteDefine.c:730
+#: rewrite/rewriteDefine.c:718 rewrite/rewriteDefine.c:742
 #, c-format
 msgid "SELECT target entry has type %s, but column has type %s."
-msgstr "wpis docelowy reguły SELECT posiada typ %s, gdy kolumna ma typ \"%s\""
+msgstr "wpis docelowy reguły SELECT posiada typ %s, gdy kolumna ma typ %s."
 
-#: rewrite/rewriteDefine.c:709 rewrite/rewriteDefine.c:734
+#: rewrite/rewriteDefine.c:721 rewrite/rewriteDefine.c:746
 #, c-format
 msgid "RETURNING list entry has type %s, but column has type %s."
 msgstr "wpis lity RETURNING posiada typ %s, gdy kolumna jest typu %s."
 
-#: rewrite/rewriteDefine.c:725
+#: rewrite/rewriteDefine.c:737
 #, 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:727
+#: rewrite/rewriteDefine.c:739
 #, 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:744
+#: rewrite/rewriteDefine.c:756
 #, c-format
 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:745
+#: rewrite/rewriteDefine.c:757
 #, c-format
 msgid "RETURNING list has too few entries"
 msgstr "lista RETURNING posiada za mało wpisów"
 
-#: rewrite/rewriteDefine.c:837 rewrite/rewriteDefine.c:952
+#: rewrite/rewriteDefine.c:849 rewrite/rewriteDefine.c:964
 #: rewrite/rewriteSupport.c:112
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" does not exist"
 msgstr "reguła \"%s\" dla relacji \"%s\" nie istnieje"
 
-#: rewrite/rewriteDefine.c:971
+#: rewrite/rewriteDefine.c:983
 #, c-format
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "zmiana nazwy reguły ON SELECT nie jest dopuszczalna"
@@ -15861,53 +15856,58 @@
 msgid "no empty local buffer available"
 msgstr "brak dostępnego pustego bufora lokalnego"
 
-#: storage/file/fd.c:528
+#: storage/file/fd.c:541
+#, c-format
+msgid "could not link file \"%s\" to \"%s\": %m"
+msgstr "nie można podlinkować pliku \"%s\" do \"%s\": %m"
+
+#: storage/file/fd.c:635
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "nie powiodło się getrlimit: %m"
 
-#: storage/file/fd.c:618
+#: storage/file/fd.c:725
 #, c-format
 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:619
+#: storage/file/fd.c:726
 #, c-format
 msgid "System allows %d, we need at least %d."
 msgstr "System dopuszcza %d, potrzeba nam co najmniej %d."
 
-#: storage/file/fd.c:660 storage/file/fd.c:1694 storage/file/fd.c:1787
-#: storage/file/fd.c:1935
+#: storage/file/fd.c:767 storage/file/fd.c:1801 storage/file/fd.c:1894
+#: storage/file/fd.c:2042
 #, 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:1234
+#: storage/file/fd.c:1341
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "plik tymczasowy: ścieżka \"%s\", rozmiar %lu"
 
-#: storage/file/fd.c:1383
+#: storage/file/fd.c:1490
 #, c-format
 msgid "temporary file size exceeds temp_file_limit (%dkB)"
 msgstr "rozmiar tablicy przekracza temp_file_limit (%dkB)"
 
-#: storage/file/fd.c:1670 storage/file/fd.c:1720
+#: storage/file/fd.c:1777 storage/file/fd.c:1827
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
 msgstr "przekroczono maxAllocatedDescs (%d) przy próbie otwarcia pliku \"%s\""
 
-#: storage/file/fd.c:1760
+#: storage/file/fd.c:1867
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
 msgstr "przekroczono maxAllocatedDescs (%d) przy próbie wykonania polecenia \"%s\""
 
-#: storage/file/fd.c:1911
+#: storage/file/fd.c:2018
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
 msgstr "przekroczono maxAllocatedDescs (%d) przy próbie otwarcia folderu \"%s\""
 
-#: storage/file/fd.c:1997
+#: storage/file/fd.c:2104
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "nie można czytać katalogu \"%s\": %m"
@@ -16019,7 +16019,7 @@
 msgid "requested shared memory size overflows size_t"
 msgstr "żądana ilość pamięci współdzielonej przekracza size_t"
 
-#: storage/ipc/standby.c:500 tcop/postgres.c:2974
+#: storage/ipc/standby.c:500 tcop/postgres.c:2989
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr "anulowano polecenie z powodu konfliktu podczas odzyskiwania"
@@ -16315,30 +16315,30 @@
 msgid "page verification failed, calculated checksum %u but expected %u"
 msgstr "nie powiodła się weryfikacja strony, wyliczono sumę kontrolną %u a spodziewano się %u"
 
-#: storage/page/bufpage.c:200 storage/page/bufpage.c:490
-#: storage/page/bufpage.c:705 storage/page/bufpage.c:836
-#: storage/page/bufpage.c:936
+#: storage/page/bufpage.c:203 storage/page/bufpage.c:522
+#: storage/page/bufpage.c:737 storage/page/bufpage.c:868
+#: storage/page/bufpage.c:968
 #, 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:534
+#: storage/page/bufpage.c:566
 #, c-format
 msgid "corrupted item pointer: %u"
 msgstr "uszkodzony wskaźnik do elementu: %u"
 
-#: storage/page/bufpage.c:545 storage/page/bufpage.c:887
-#: storage/page/bufpage.c:1042
+#: storage/page/bufpage.c:577 storage/page/bufpage.c:919
+#: storage/page/bufpage.c:1074
 #, 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:724 storage/page/bufpage.c:860
+#: storage/page/bufpage.c:756 storage/page/bufpage.c:892
 #, c-format
 msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr "uszkodzony wskaźnik do elementu: przesunięcie = %u, rozmiar = %u"
 
-#: storage/page/bufpage.c:965
+#: storage/page/bufpage.c:997
 #, c-format
 msgid "corrupted item pointer: offset = %u, length = %u"
 msgstr "uszkodzony wskaźnik do elementu: przesunięcie = %u, długość = %u"
@@ -16467,7 +16467,7 @@
 msgstr "nieoczekiwany EOF w połączeniu klienta"
 
 #: tcop/postgres.c:449 tcop/postgres.c:461 tcop/postgres.c:472
-#: tcop/postgres.c:484 tcop/postgres.c:4268
+#: tcop/postgres.c:484 tcop/postgres.c:4283
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "niepoprawny typ komunikatu frontendu %d"
@@ -16640,87 +16640,87 @@
 msgid "connection to client lost"
 msgstr "utracono połączenie z klientem"
 
-#: tcop/postgres.c:2951
+#: tcop/postgres.c:2966
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "anulowano polecenie z powodu przekroczenia czasu blokady"
 
-#: tcop/postgres.c:2958
+#: tcop/postgres.c:2973
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr "anulowano polecenie z powodu przekroczonego czasu wykonania"
 
-#: tcop/postgres.c:2965
+#: tcop/postgres.c:2980
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "anulowano zadanie autoodkurzania"
 
-#: tcop/postgres.c:2988
+#: tcop/postgres.c:3003
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "anulowano polecenie na skutek żądania użytkownika"
 
-#: tcop/postgres.c:3098
+#: tcop/postgres.c:3113
 #, c-format
 msgid "stack depth limit exceeded"
 msgstr "przekroczono limit głębokości stosu"
 
-#: tcop/postgres.c:3099
+#: tcop/postgres.c:3114
 #, 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:3162
+#: tcop/postgres.c:3177
 #, c-format
 msgid "\"max_stack_depth\" must not exceed %ldkB."
 msgstr "\"max_stack_depth\" nie może przekraczać %ldkB."
 
-#: tcop/postgres.c:3164
+#: tcop/postgres.c:3179
 #, c-format
 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:3524
+#: tcop/postgres.c:3539
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "niepoprawny argument wiersza poleceń dla procesu serwera: %s"
 
-#: tcop/postgres.c:3525 tcop/postgres.c:3531
+#: tcop/postgres.c:3540 tcop/postgres.c:3546
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji."
 
-#: tcop/postgres.c:3529
+#: tcop/postgres.c:3544
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: nieprawidłowy argument wiersza poleceń: %s"
 
-#: tcop/postgres.c:3590
+#: tcop/postgres.c:3605
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: nie wskazano ani bazy danych ani nazwy użytkownika"
 
-#: tcop/postgres.c:4176
+#: tcop/postgres.c:4191
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "niepoprawny podtyp %d komunikatu CLOSE"
 
-#: tcop/postgres.c:4211
+#: tcop/postgres.c:4226
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "niepoprawny podtyp %d komunikatu DESCRIBE"
 
-#: tcop/postgres.c:4289
+#: tcop/postgres.c:4304
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr "wywołania funkcji fastpath nie są obsługiwane w połączeniu replikacji"
 
-#: tcop/postgres.c:4293
+#: tcop/postgres.c:4308
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr "protokół rozszerzonych zapytań nie jest obsługiwany w połączeniu replikacji"
 
-#: tcop/postgres.c:4463
+#: tcop/postgres.c:4478
 #, 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"
@@ -16889,32 +16889,32 @@
 msgid "missing Dictionary parameter"
 msgstr "brak parametru Dictionary"
 
-#: tsearch/spell.c:276
+#: tsearch/spell.c:289
 #, 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:204
+#: tsearch/spell.c:452 utils/adt/regexp.c:204
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "nieprawidłowe wyrażenie regularne: %s"
 
-#: tsearch/spell.c:732
+#: tsearch/spell.c:745
 #, c-format
 msgid "multibyte flag character is not allowed"
 msgstr "wielobajtowy znak flagi nie jest dozwolony"
 
-#: tsearch/spell.c:766 tsearch/spell.c:822 tsearch/spell.c:926
+#: tsearch/spell.c:779 tsearch/spell.c:835 tsearch/spell.c:937
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "nie można otworzyć pliku affix \"%s\": %m"
 
-#: tsearch/spell.c:812
+#: tsearch/spell.c:825
 #, c-format
 msgid "Ispell dictionary supports only default flag value"
 msgstr "Słownik Ispell obsługuje tylko domyślną wartość flagi"
 
-#: tsearch/spell.c:1041
+#: tsearch/spell.c:1050
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "plik affix zawiera polecenia zarówno w starym i nowym stylu"
@@ -16961,27 +16961,27 @@
 msgid "text search parser does not support headline creation"
 msgstr "parser wyszukiwania tekstowego nie obsługuje tworzenia nagłówka"
 
-#: tsearch/wparser_def.c:2557
+#: tsearch/wparser_def.c:2559
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
 msgstr "nierozpoznany parametr nagłówka: \"%s\""
 
-#: tsearch/wparser_def.c:2566
+#: tsearch/wparser_def.c:2568
 #, c-format
 msgid "MinWords should be less than MaxWords"
 msgstr "MinWords musi być mniejsze niż MaxWords"
 
-#: tsearch/wparser_def.c:2570
+#: tsearch/wparser_def.c:2572
 #, c-format
 msgid "MinWords should be positive"
 msgstr "MinWords musi być dodatnie"
 
-#: tsearch/wparser_def.c:2574
+#: tsearch/wparser_def.c:2576
 #, c-format
 msgid "ShortWord should be >= 0"
 msgstr "ShortWord powinno być >= 0"
 
-#: tsearch/wparser_def.c:2578
+#: tsearch/wparser_def.c:2580
 #, c-format
 msgid "MaxFragments should be >= 0"
 msgstr "MaxFragments powinno być >= 0"
@@ -17109,7 +17109,7 @@
 #: utils/adt/array_userfuncs.c:67 utils/adt/array_userfuncs.c:529
 #: utils/adt/array_userfuncs.c:609 utils/adt/json.c:1759 utils/adt/json.c:1854
 #: utils/adt/json.c:1892 utils/adt/jsonb.c:1126 utils/adt/jsonb.c:1155
-#: utils/adt/jsonb.c:1590 utils/adt/jsonb.c:1754 utils/adt/jsonb.c:1764
+#: utils/adt/jsonb.c:1591 utils/adt/jsonb.c:1755 utils/adt/jsonb.c:1765
 #, c-format
 msgid "could not determine input data type"
 msgstr "nie można określić typu danych wejściowych"
@@ -17120,15 +17120,15 @@
 msgstr "typ danych wejściowych nie jest tablicą"
 
 #: utils/adt/array_userfuncs.c:120 utils/adt/array_userfuncs.c:174
-#: utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1161 utils/adt/float.c:1220
-#: utils/adt/float.c:2771 utils/adt/float.c:2787 utils/adt/int.c:623
+#: utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1158 utils/adt/float.c:1217
+#: utils/adt/float.c:2768 utils/adt/float.c:2784 utils/adt/int.c:623
 #: utils/adt/int.c:652 utils/adt/int.c:673 utils/adt/int.c:704
 #: utils/adt/int.c:737 utils/adt/int.c:759 utils/adt/int.c:907
 #: utils/adt/int.c:928 utils/adt/int.c:955 utils/adt/int.c:995
 #: utils/adt/int.c:1016 utils/adt/int.c:1043 utils/adt/int.c:1076
 #: utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2903
 #: utils/adt/numeric.c:2912 utils/adt/varbit.c:1173 utils/adt/varbit.c:1565
-#: utils/adt/varlena.c:1045 utils/adt/varlena.c:2582
+#: utils/adt/varlena.c:1045 utils/adt/varlena.c:2595
 #, c-format
 msgid "integer out of range"
 msgstr "liczba całkowita poza zakresem"
@@ -17443,8 +17443,8 @@
 
 #: utils/adt/cash.c:607 utils/adt/cash.c:657 utils/adt/cash.c:708
 #: utils/adt/cash.c:757 utils/adt/cash.c:809 utils/adt/cash.c:859
-#: utils/adt/float.c:788 utils/adt/float.c:852 utils/adt/float.c:2530
-#: utils/adt/float.c:2593 utils/adt/geo_ops.c:4155 utils/adt/int.c:719
+#: utils/adt/float.c:785 utils/adt/float.c:849 utils/adt/float.c:2527
+#: utils/adt/float.c:2590 utils/adt/geo_ops.c:4163 utils/adt/int.c:719
 #: utils/adt/int.c:861 utils/adt/int.c:969 utils/adt/int.c:1058
 #: utils/adt/int.c:1097 utils/adt/int.c:1125 utils/adt/int8.c:597
 #: utils/adt/int8.c:657 utils/adt/int8.c:897 utils/adt/int8.c:1005
@@ -17480,7 +17480,7 @@
 msgid "date/time value \"current\" is no longer supported"
 msgstr "wartość data/czas \"current\" nie jest już wspierana"
 
-#: utils/adt/date.c:166 utils/adt/formatting.c:3523
+#: utils/adt/date.c:166 utils/adt/formatting.c:3521
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "data poza zakresem: \"%s\""
@@ -17511,8 +17511,8 @@
 msgstr "data poza zakresem dla znacznika czasu"
 
 #: utils/adt/date.c:970 utils/adt/date.c:1016 utils/adt/date.c:1616
-#: utils/adt/date.c:1652 utils/adt/date.c:2524 utils/adt/formatting.c:3399
-#: utils/adt/formatting.c:3431 utils/adt/formatting.c:3499
+#: utils/adt/date.c:1652 utils/adt/date.c:2524 utils/adt/formatting.c:3397
+#: utils/adt/formatting.c:3429 utils/adt/formatting.c:3497
 #: utils/adt/json.c:1534 utils/adt/json.c:1556 utils/adt/jsonb.c:823
 #: utils/adt/jsonb.c:847 utils/adt/nabstime.c:455 utils/adt/nabstime.c:498
 #: utils/adt/nabstime.c:528 utils/adt/nabstime.c:571 utils/adt/timestamp.c:224
@@ -17705,28 +17705,28 @@
 msgid "value out of range: underflow"
 msgstr "wartość nie z zakresu: przed zakresem"
 
-#: utils/adt/float.c:218 utils/adt/float.c:292 utils/adt/float.c:316
+#: utils/adt/float.c:215 utils/adt/float.c:289 utils/adt/float.c:313
 #, 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:286
+#: utils/adt/float.c:283
 #, c-format
 msgid "\"%s\" is out of range for type real"
 msgstr "\"%s\" jest poza zakresem dla typu liczb rzeczywistych"
 
-#: utils/adt/float.c:417 utils/adt/float.c:491 utils/adt/float.c:515
+#: utils/adt/float.c:414 utils/adt/float.c:488 utils/adt/float.c:512
 #: utils/adt/numeric.c:5373 utils/adt/numeric.c:5399
 #, 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:485
+#: utils/adt/float.c:482
 #, 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:1179 utils/adt/float.c:1237 utils/adt/int.c:349
+#: utils/adt/float.c:1176 utils/adt/float.c:1234 utils/adt/int.c:349
 #: utils/adt/int.c:775 utils/adt/int.c:804 utils/adt/int.c:825
 #: utils/adt/int.c:845 utils/adt/int.c:879 utils/adt/int.c:1174
 #: utils/adt/int8.c:1323 utils/adt/numeric.c:3000 utils/adt/numeric.c:3009
@@ -17734,54 +17734,54 @@
 msgid "smallint out of range"
 msgstr "poza zakresem smallint"
 
-#: utils/adt/float.c:1363 utils/adt/numeric.c:6599
+#: utils/adt/float.c:1360 utils/adt/numeric.c:6599
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "nie można obliczyć pierwiastka kwadratowego z liczby ujemnej"
 
-#: utils/adt/float.c:1405 utils/adt/numeric.c:2820
+#: utils/adt/float.c:1402 utils/adt/numeric.c:2820
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "zero podniesione do potęgi ujemnej jest niezdefiniowane"
 
-#: utils/adt/float.c:1409 utils/adt/numeric.c:2826
+#: utils/adt/float.c:1406 utils/adt/numeric.c:2826
 #, c-format
 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:1475 utils/adt/float.c:1505 utils/adt/numeric.c:6817
+#: utils/adt/float.c:1472 utils/adt/float.c:1502 utils/adt/numeric.c:6817
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "nie można obliczyć logarytmu z zera"
 
-#: utils/adt/float.c:1479 utils/adt/float.c:1509 utils/adt/numeric.c:6821
+#: utils/adt/float.c:1476 utils/adt/float.c:1506 utils/adt/numeric.c:6821
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "nie można obliczyć logarytmu z liczby ujemnej"
 
-#: utils/adt/float.c:1536 utils/adt/float.c:1557 utils/adt/float.c:1578
-#: utils/adt/float.c:1600 utils/adt/float.c:1621 utils/adt/float.c:1642
-#: utils/adt/float.c:1664 utils/adt/float.c:1685
+#: utils/adt/float.c:1533 utils/adt/float.c:1554 utils/adt/float.c:1575
+#: utils/adt/float.c:1597 utils/adt/float.c:1618 utils/adt/float.c:1639
+#: utils/adt/float.c:1661 utils/adt/float.c:1682
 #, c-format
 msgid "input is out of range"
 msgstr "wejście jest poza zakresem"
 
-#: utils/adt/float.c:2747 utils/adt/numeric.c:1454
+#: utils/adt/float.c:2744 utils/adt/numeric.c:1454
 #, c-format
 msgid "count must be greater than zero"
 msgstr "ilość musi być większa niż zero"
 
-#: utils/adt/float.c:2752 utils/adt/numeric.c:1461
+#: utils/adt/float.c:2749 utils/adt/numeric.c:1461
 #, c-format
 msgid "operand, lower bound, and upper bound cannot be NaN"
 msgstr "operand, dolna granica i górna granica nie mogą być NaN"
 
-#: utils/adt/float.c:2758
+#: utils/adt/float.c:2755
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "dolna i górna granica nie musi być skończona"
 
-#: utils/adt/float.c:2796 utils/adt/numeric.c:1474
+#: utils/adt/float.c:2793 utils/adt/numeric.c:1474
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "dolna granica nie może być równa górnej granicy"
@@ -17796,203 +17796,203 @@
 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:1059
+#: utils/adt/formatting.c:1058
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "\"EEEE\" musi być ostatnim użytym wzorcem"
 
-#: utils/adt/formatting.c:1067
+#: utils/adt/formatting.c:1066
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "\"9\" musi być przed \"PR\""
 
-#: utils/adt/formatting.c:1083
+#: utils/adt/formatting.c:1082
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "\"0\" musi być przed \"PR\""
 
-#: utils/adt/formatting.c:1110
+#: utils/adt/formatting.c:1109
 #, c-format
 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
+#: utils/adt/formatting.c:1113 utils/adt/formatting.c:1196
 #, c-format
 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
+#: utils/adt/formatting.c:1125
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "nie można użyć \"S\" dwukrotnie"
 
-#: utils/adt/formatting.c:1130
+#: utils/adt/formatting.c:1129
 #, c-format
 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
+#: utils/adt/formatting.c:1149
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "nie można użyć \"S\" i \"MI\" jednocześnie"
 
-#: utils/adt/formatting.c:1160
+#: utils/adt/formatting.c:1159
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "nie można użyć \"S\" i \"PL\" jednocześnie"
 
-#: utils/adt/formatting.c:1170
+#: utils/adt/formatting.c:1169
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "nie można użyć \"S\" i \"SG\" jednocześnie"
 
-#: utils/adt/formatting.c:1179
+#: utils/adt/formatting.c:1178
 #, c-format
 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
+#: utils/adt/formatting.c:1204
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "nie można użyć \"EEEE\" dwukrotnie"
 
-#: utils/adt/formatting.c:1211
+#: utils/adt/formatting.c:1210
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "\"EEEE\" jest niezgodne z innymi formatami"
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1211
 #, c-format
 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
+#: utils/adt/formatting.c:1411
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "\"%s\" nie jest liczbÄ…"
 
-#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1512 utils/adt/formatting.c:1564
 #, c-format
 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:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1632 utils/adt/formatting.c:1684
 #, c-format
 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:1754 utils/adt/formatting.c:1818
+#: utils/adt/formatting.c:1753 utils/adt/formatting.c:1817
 #, c-format
 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:2122
+#: utils/adt/formatting.c:2114
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "nieprawidłowe połączenie konwencji daty"
 
-#: utils/adt/formatting.c:2123
+#: utils/adt/formatting.c:2115
 #, c-format
 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:2140
+#: utils/adt/formatting.c:2132
 #, 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:2142
+#: utils/adt/formatting.c:2134
 #, c-format
 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:2203
+#: utils/adt/formatting.c:2195
 #, 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:2205
+#: utils/adt/formatting.c:2197
 #, 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:2208 utils/adt/formatting.c:2222
+#: utils/adt/formatting.c:2200 utils/adt/formatting.c:2214
 #, c-format
 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:2218 utils/adt/formatting.c:2231
-#: utils/adt/formatting.c:2361
+#: utils/adt/formatting.c:2210 utils/adt/formatting.c:2223
+#: utils/adt/formatting.c:2353
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "nieprawidłowa wartość \"%s\" dla \"%s\""
 
-#: utils/adt/formatting.c:2220
+#: utils/adt/formatting.c:2212
 #, 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:2233
+#: utils/adt/formatting.c:2225
 #, c-format
 msgid "Value must be an integer."
 msgstr "Wartość musi być liczbą całkowitą."
 
-#: utils/adt/formatting.c:2238
+#: utils/adt/formatting.c:2230
 #, 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:2240
+#: utils/adt/formatting.c:2232
 #, 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:2363
+#: utils/adt/formatting.c:2355
 #, c-format
 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:2551 utils/adt/formatting.c:2571
-#: utils/adt/formatting.c:2591 utils/adt/formatting.c:2611
-#: utils/adt/formatting.c:2630 utils/adt/formatting.c:2649
-#: utils/adt/formatting.c:2672 utils/adt/formatting.c:2690
-#: utils/adt/formatting.c:2708 utils/adt/formatting.c:2726
-#: utils/adt/formatting.c:2743 utils/adt/formatting.c:2760
+#: utils/adt/formatting.c:2547 utils/adt/formatting.c:2567
+#: utils/adt/formatting.c:2587 utils/adt/formatting.c:2607
+#: utils/adt/formatting.c:2626 utils/adt/formatting.c:2645
+#: utils/adt/formatting.c:2668 utils/adt/formatting.c:2686
+#: utils/adt/formatting.c:2704 utils/adt/formatting.c:2722
+#: utils/adt/formatting.c:2739 utils/adt/formatting.c:2756
 #, c-format
 msgid "localized string format value too long"
 msgstr "wartość lokalizowanego ciągu znaków jest zbyt długa"
 
-#: utils/adt/formatting.c:3044
+#: utils/adt/formatting.c:3040
 #, c-format
 msgid "\"TZ\"/\"tz\"/\"OF\" format patterns are not supported in to_date"
 msgstr "wzorce formatów \"TZ\"/\"tz\"/\"OF\" nie są obsługiwane przez to_date"
 
-#: utils/adt/formatting.c:3152
+#: utils/adt/formatting.c:3149
 #, c-format
 msgid "invalid input string for \"Y,YYY\""
 msgstr "nieprawidłowy wejściowy ciąg znaków dla \"Y,YYY\""
 
-#: utils/adt/formatting.c:3655
+#: utils/adt/formatting.c:3653
 #, 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:3657
+#: utils/adt/formatting.c:3655
 #, c-format
 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:3752
+#: utils/adt/formatting.c:3750
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "nie można wyznaczyć dnia roku bez informacji o roku"
 
-#: utils/adt/formatting.c:4601
+#: utils/adt/formatting.c:4599
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "\"EEEE\" nie jest wspierane dla wejścia"
 
-#: utils/adt/formatting.c:4613
+#: utils/adt/formatting.c:4611
 #, c-format
 msgid "\"RN\" not supported for input"
 msgstr "\"RN\" nie jest wspierane dla wejścia"
@@ -18039,8 +18039,8 @@
 msgid "must be superuser to get directory listings"
 msgstr "musisz być superużytkownikiem by pobrać listy katalogu"
 
-#: utils/adt/geo_ops.c:301 utils/adt/geo_ops.c:1400 utils/adt/geo_ops.c:3498
-#: utils/adt/geo_ops.c:4315 utils/adt/geo_ops.c:5259
+#: utils/adt/geo_ops.c:301 utils/adt/geo_ops.c:1400 utils/adt/geo_ops.c:3506
+#: utils/adt/geo_ops.c:4323 utils/adt/geo_ops.c:5267
 #, c-format
 msgid "too many points requested"
 msgstr "żądano zbyt wielu punktów"
@@ -18095,73 +18095,73 @@
 msgid "function \"dist_lb\" not implemented"
 msgstr "funkcja \"dist_lb\" nie została jeszcze zaimplementowana"
 
-#: utils/adt/geo_ops.c:3073
+#: utils/adt/geo_ops.c:3081
 #, c-format
 msgid "function \"close_sl\" not implemented"
 msgstr "funkcja \"close_sl\" nie została zaimplementowana"
 
-#: utils/adt/geo_ops.c:3175
+#: utils/adt/geo_ops.c:3183
 #, c-format
 msgid "function \"close_lb\" not implemented"
 msgstr "funkcja \"close_lb\" nie została jeszcze zaimplementowana"
 
-#: utils/adt/geo_ops.c:3464
+#: utils/adt/geo_ops.c:3472
 #, c-format
 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:3489 utils/adt/geo_ops.c:3509
+#: utils/adt/geo_ops.c:3497 utils/adt/geo_ops.c:3517
 #, 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:3549
+#: utils/adt/geo_ops.c:3557
 #, c-format
 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:4074
+#: utils/adt/geo_ops.c:4082
 #, c-format
 msgid "function \"poly_distance\" not implemented"
 msgstr "funkcja \"poly_distance\" nie została jeszcze zaimplementowana"
 
-#: utils/adt/geo_ops.c:4427
+#: utils/adt/geo_ops.c:4435
 #, c-format
 msgid "function \"path_center\" not implemented"
 msgstr "funkcja \"path_center\" nie została jeszcze zaimplementowana"
 
-#: utils/adt/geo_ops.c:4444
+#: utils/adt/geo_ops.c:4452
 #, c-format
 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:4621 utils/adt/geo_ops.c:4631 utils/adt/geo_ops.c:4646
-#: utils/adt/geo_ops.c:4652
+#: utils/adt/geo_ops.c:4629 utils/adt/geo_ops.c:4639 utils/adt/geo_ops.c:4654
+#: utils/adt/geo_ops.c:4660
 #, 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:4674 utils/adt/geo_ops.c:4682
+#: utils/adt/geo_ops.c:4682 utils/adt/geo_ops.c:4690
 #, c-format
 msgid "could not format \"circle\" value"
 msgstr "nie można sformatować wartości \"okrąg\""
 
-#: utils/adt/geo_ops.c:4709
+#: utils/adt/geo_ops.c:4717
 #, c-format
 msgid "invalid radius in external \"circle\" value"
 msgstr "niepoprawny status w zewnętrznej wartości \"okrąg\""
 
-#: utils/adt/geo_ops.c:5245
+#: utils/adt/geo_ops.c:5253
 #, c-format
 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:5250
+#: utils/adt/geo_ops.c:5258
 #, c-format
 msgid "must request at least 2 points"
 msgstr "musi zwrócić co najmniej 2 punkty"
 
-#: utils/adt/geo_ops.c:5294
+#: utils/adt/geo_ops.c:5302
 #, c-format
 msgid "cannot convert empty polygon to circle"
 msgstr "nie można zmienić pustego wielokąta w okrąg"
@@ -18339,7 +18339,7 @@
 msgid "could not determine data type for argument 2"
 msgstr "nie można określić typu danych argumentu 2"
 
-#: utils/adt/json.c:2040 utils/adt/jsonb.c:1780
+#: utils/adt/json.c:2040 utils/adt/jsonb.c:1781
 #, c-format
 msgid "field name must not be null"
 msgstr "nazwa pola nie może być pusta"
@@ -18410,7 +18410,7 @@
 msgid "argument %d: could not determine data type"
 msgstr "argument %d: nie można określić typu danych"
 
-#: utils/adt/jsonb.c:1833
+#: utils/adt/jsonb.c:1834
 #, c-format
 msgid "object keys must be strings"
 msgstr "klucze obiektu powinny być tekstem"
@@ -18540,13 +18540,23 @@
 msgid "invalid concatenation of jsonb objects"
 msgstr "nieprawidłowe połączenie obiektów jsonb"
 
+#: utils/adt/jsonfuncs.c:3732
+#, c-format
+msgid "path element at position %d is null"
+msgstr "element ścieżki na pozycji %d jest pusty"
+
+#: utils/adt/jsonfuncs.c:3888
+#, c-format
+#| msgid "plpy.prepare: type name at ordinal position %d is not a string"
+msgid "path element at position %d is not an integer: \"%s\""
+msgstr "element ścieżki na pozycji %d nie jest liczbą całkowitą: \"%s\""
+
 #: utils/adt/levenshtein.c:133
 #, c-format
-#| msgid "argument exceeds the maximum length of %d bytes"
 msgid "levenshtein argument exceeds maximum length of %d characters"
 msgstr "argument levenshteina przekracza maksymalną długość %d znaków"
 
-#: utils/adt/like.c:212 utils/adt/selfuncs.c:5275
+#: utils/adt/like.c:212 utils/adt/selfuncs.c:5279
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "nie można określić jakiego porównania użyć do ILIKE"
@@ -18898,37 +18908,37 @@
 msgid "percentile value %g is not between 0 and 1"
 msgstr "wartość percentyla %g nie leży pomiędzy 0 i 1"
 
-#: utils/adt/pg_locale.c:911
+#: utils/adt/pg_locale.c:917
 #, c-format
 msgid "Apply system library package updates."
 msgstr "Zastosuj aktualizacje pakietu biblioteki systemowej."
 
-#: utils/adt/pg_locale.c:1116
+#: utils/adt/pg_locale.c:1122
 #, c-format
 msgid "could not create locale \"%s\": %m"
 msgstr "nie można utworzyć lokalizacji \"%s\": %m"
 
-#: utils/adt/pg_locale.c:1119
+#: utils/adt/pg_locale.c:1125
 #, 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:1206
+#: utils/adt/pg_locale.c:1212
 #, c-format
 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:1221
+#: utils/adt/pg_locale.c:1227
 #, c-format
 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:1392
+#: utils/adt/pg_locale.c:1398
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "niepoprawny wielobajtowy znak dla lokalizacji"
 
-#: utils/adt/pg_locale.c:1393
+#: utils/adt/pg_locale.c:1399
 #, c-format
 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."
@@ -19144,7 +19154,7 @@
 msgid "Junk after right parenthesis or bracket."
 msgstr "Śmieci za prawym nawiasem zwykłym lub klamrowym."
 
-#: utils/adt/regexp.c:285 utils/adt/regexp.c:1288 utils/adt/varlena.c:3588
+#: utils/adt/regexp.c:285 utils/adt/regexp.c:1288 utils/adt/varlena.c:3601
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "nie udało się wyrażenie regularne: %s"
@@ -19170,7 +19180,7 @@
 msgstr "więcej niż jeden operator o nazwie %s"
 
 #: utils/adt/regproc.c:779 utils/adt/regproc.c:820 utils/adt/regproc.c:2006
-#: utils/adt/ruleutils.c:8167 utils/adt/ruleutils.c:8292
+#: utils/adt/ruleutils.c:8219 utils/adt/ruleutils.c:8344
 #, c-format
 msgid "too many arguments"
 msgstr "zbyt wiele argumentów"
@@ -19182,7 +19192,7 @@
 
 #: utils/adt/regproc.c:1594 utils/adt/regproc.c:1618 utils/adt/regproc.c:1715
 #: utils/adt/regproc.c:1739 utils/adt/regproc.c:1841 utils/adt/regproc.c:1846
-#: utils/adt/varlena.c:2859 utils/adt/varlena.c:2864
+#: utils/adt/varlena.c:2872 utils/adt/varlena.c:2877
 #, c-format
 msgid "invalid name syntax"
 msgstr "niepoprawna składnia nazwy"
@@ -19341,12 +19351,12 @@
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "reguła \"%s\" ma nieobsługiwany typ zdarzenia %d"
 
-#: utils/adt/selfuncs.c:5260
+#: utils/adt/selfuncs.c:5264
 #, c-format
 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:5363
+#: utils/adt/selfuncs.c:5367
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
 msgstr "dopasowanie wyrażeniami regularnymi nieobsługiwane dla typu bytea"
@@ -19699,8 +19709,8 @@
 msgstr "ciąg bitów za długi dla typu bit varying(%d)"
 
 #: utils/adt/varbit.c:1066 utils/adt/varbit.c:1168 utils/adt/varlena.c:832
-#: utils/adt/varlena.c:896 utils/adt/varlena.c:1040 utils/adt/varlena.c:2510
-#: utils/adt/varlena.c:2577
+#: utils/adt/varlena.c:896 utils/adt/varlena.c:1040 utils/adt/varlena.c:2523
+#: utils/adt/varlena.c:2590
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "niedopuszczalna ujemna długość podciągu"
@@ -19725,7 +19735,7 @@
 msgid "bit index %d out of valid range (0..%d)"
 msgstr "indeks bitu %d przekracza dopuszczalny zakres (0..%d)"
 
-#: utils/adt/varbit.c:1802 utils/adt/varlena.c:2777
+#: utils/adt/varbit.c:1802 utils/adt/varlena.c:2790
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "nowy bit musi być 0 lub 1"
@@ -19755,48 +19765,48 @@
 msgid "could not compare Unicode strings: %m"
 msgstr "nie można porównać ciągów Unikodu: %m"
 
-#: utils/adt/varlena.c:2655 utils/adt/varlena.c:2686 utils/adt/varlena.c:2722
-#: utils/adt/varlena.c:2765
+#: utils/adt/varlena.c:2668 utils/adt/varlena.c:2699 utils/adt/varlena.c:2735
+#: utils/adt/varlena.c:2778
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "indeks %d przekracza dopuszczalny zakres 0..%d"
 
-#: utils/adt/varlena.c:3684
+#: utils/adt/varlena.c:3697
 #, c-format
 msgid "field position must be greater than zero"
 msgstr "pozycja pola musi być większa niż zero"
 
-#: utils/adt/varlena.c:4563
+#: utils/adt/varlena.c:4576
 #, c-format
 msgid "unterminated format specifier"
 msgstr "nierozpoznany specyfikator formatu"
 
-#: utils/adt/varlena.c:4695 utils/adt/varlena.c:4815
+#: utils/adt/varlena.c:4708 utils/adt/varlena.c:4828
 #, c-format
 msgid "unrecognized conversion type specifier \"%c\""
 msgstr "nierozpoznany specyfikator typu konwersji \"%c\""
 
-#: utils/adt/varlena.c:4707 utils/adt/varlena.c:4764
+#: utils/adt/varlena.c:4720 utils/adt/varlena.c:4777
 #, c-format
 msgid "too few arguments for format"
 msgstr "za mało argumentów do formatowania"
 
-#: utils/adt/varlena.c:4858 utils/adt/varlena.c:5041
+#: utils/adt/varlena.c:4871 utils/adt/varlena.c:5054
 #, c-format
 msgid "number is out of range"
 msgstr "liczba jest poza zakresem"
 
-#: utils/adt/varlena.c:4922 utils/adt/varlena.c:4950
+#: utils/adt/varlena.c:4935 utils/adt/varlena.c:4963
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr "format określa argument 0, ale argumenty są numerowane od 1"
 
-#: utils/adt/varlena.c:4943
+#: utils/adt/varlena.c:4956
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "pozycja argumentu szerokość musi kończyć się \"$\""
 
-#: utils/adt/varlena.c:4988
+#: utils/adt/varlena.c:5001
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "wartości puste nie mogą być formatowane jako identyfikatory SQL"
@@ -19966,7 +19976,7 @@
 msgid "no output function available for type %s"
 msgstr "brak funkcji wyjścia dostępnej dla typu %s"
 
-#: utils/cache/plancache.c:725
+#: utils/cache/plancache.c:729
 #, c-format
 msgid "cached plan must not change result type"
 msgstr "plan w pamięci podręcznej nie może zmienić typ wyniku"
@@ -20283,143 +20293,149 @@
 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:522
+#: utils/init/miscinit.c:502
+#, c-format
+#| msgid "type with OID %u does not exist"
+msgid "role with OID %u does not exist"
+msgstr "rola z OID %u nie istnieje"
+
+#: utils/init/miscinit.c:532
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "rola \"%s\" nie zezwala na logowanie"
 
-#: utils/init/miscinit.c:540
+#: utils/init/miscinit.c:550
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "zbyt wiele połączeń dla roli \"%s\""
 
-#: utils/init/miscinit.c:600
+#: utils/init/miscinit.c:610
 #, c-format
 msgid "permission denied to set session authorization"
 msgstr "odmowa dostępu do ustalenia autoryzacji sesji"
 
-#: utils/init/miscinit.c:683
+#: utils/init/miscinit.c:693
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "nieprawidłowy OID roli: %u"
 
-#: utils/init/miscinit.c:813
+#: utils/init/miscinit.c:823
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "nie można utworzyć pliku blokady \"%s\": %m"
 
-#: utils/init/miscinit.c:827
+#: utils/init/miscinit.c:837
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "nie można otworzyć pliku blokady \"%s\": %m"
 
-#: utils/init/miscinit.c:833
+#: utils/init/miscinit.c:843
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "nie można odczytać pliku blokady \"%s\": %m"
 
-#: utils/init/miscinit.c:841
+#: utils/init/miscinit.c:851
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "plik blokady \"%s\" jest pusty"
 
-#: utils/init/miscinit.c:842
+#: utils/init/miscinit.c:852
 #, c-format
 msgid "Either another server is starting, or the lock file is the remnant of a previous server startup crash."
 msgstr "Albo inny serwer jest uruchamiany, albo plik blokady jest pozostałością awarii podczas poprzedniego startu."
 
-#: utils/init/miscinit.c:889
+#: utils/init/miscinit.c:899
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "plik blokady \"%s\" już istnieje"
 
-#: utils/init/miscinit.c:893
+#: utils/init/miscinit.c:903
 #, 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:895
+#: utils/init/miscinit.c:905
 #, 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:898
+#: utils/init/miscinit.c:908
 #, 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:900
+#: utils/init/miscinit.c:910
 #, 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:936
+#: utils/init/miscinit.c:946
 #, 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:939
+#: utils/init/miscinit.c:949
 #, 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:955
+#: utils/init/miscinit.c:965
 #, 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:957
+#: utils/init/miscinit.c:967
 #, c-format
 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:993 utils/init/miscinit.c:1004
-#: utils/init/miscinit.c:1014
+#: utils/init/miscinit.c:1003 utils/init/miscinit.c:1014
+#: utils/init/miscinit.c:1024
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "nie można zapisać pliku blokady \"%s\": %m"
 
-#: utils/init/miscinit.c:1143 utils/init/miscinit.c:1272 utils/misc/guc.c:8589
+#: utils/init/miscinit.c:1153 utils/init/miscinit.c:1282 utils/misc/guc.c:8602
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "nie można czytać z pliku \"%s\": %m"
 
-#: utils/init/miscinit.c:1262
+#: utils/init/miscinit.c:1272
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
 msgstr "nie można otworzyć pliku \"%s\": %m: dalsze wykonanie mimo to"
 
-#: utils/init/miscinit.c:1285
+#: utils/init/miscinit.c:1295
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
 msgstr "plik blokady \"%s\" ma niepoprawny PID: %ld zamiast %ld"
 
-#: utils/init/miscinit.c:1327 utils/init/miscinit.c:1340
+#: utils/init/miscinit.c:1337 utils/init/miscinit.c:1350
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "\"%s\" nie jest prawidłowym folderem danych"
 
-#: utils/init/miscinit.c:1329
+#: utils/init/miscinit.c:1339
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "Brak pliku \"%s\"."
 
-#: utils/init/miscinit.c:1342
+#: utils/init/miscinit.c:1352
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "Plik \"%s\" nie zawiera poprawnych danych."
 
-#: utils/init/miscinit.c:1344
+#: utils/init/miscinit.c:1354
 #, c-format
 msgid "You might need to initdb."
 msgstr "Być może trzeba initdb."
 
-#: utils/init/miscinit.c:1352
+#: utils/init/miscinit.c:1362
 #, 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:1423
+#: utils/init/miscinit.c:1433
 #, c-format
 msgid "loaded library \"%s\""
 msgstr "wczytano bibliotekÄ™ \"%s\""
@@ -22108,14 +22124,14 @@
 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:5675 utils/misc/guc.c:7004
+#: utils/misc/guc.c:5675 utils/misc/guc.c:7017
 #, c-format
 msgid "cannot set parameters during a parallel operation"
 msgstr "nie można ustawić parametrów podczas operacji równoległej"
 
 #: utils/misc/guc.c:5682 utils/misc/guc.c:6432 utils/misc/guc.c:6484
-#: utils/misc/guc.c:6845 utils/misc/guc.c:7592 utils/misc/guc.c:7751
-#: utils/misc/guc.c:9386
+#: utils/misc/guc.c:6845 utils/misc/guc.c:7605 utils/misc/guc.c:7764
+#: utils/misc/guc.c:9399
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "nierozpoznany parametr konfiguracyjny \"%s\""
@@ -22130,7 +22146,7 @@
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "parametr \"%s\" nie może być teraz zmieniony"
 
-#: utils/misc/guc.c:5748 utils/misc/guc.c:5793 utils/misc/guc.c:9402
+#: utils/misc/guc.c:5748 utils/misc/guc.c:5793 utils/misc/guc.c:9415
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "odmowa dostępu do ustawienia parametru \"%s\""
@@ -22145,7 +22161,7 @@
 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:6440 utils/misc/guc.c:6488 utils/misc/guc.c:7755
+#: utils/misc/guc.c:6440 utils/misc/guc.c:6488 utils/misc/guc.c:7768
 #, c-format
 msgid "must be superuser to examine \"%s\""
 msgstr "musisz być superużytkownikiem by skontrolować \"%s\""
@@ -22160,67 +22176,72 @@
 msgid "must be superuser to execute ALTER SYSTEM command"
 msgstr "musisz być superużytkownikiem by wykonać polecenie ALTER SYSTEM"
 
-#: utils/misc/guc.c:6918
+#: utils/misc/guc.c:6890
+#, c-format
+msgid "parameter value for ALTER SYSTEM must not contain a newline"
+msgstr "wartość parametru dla ALTER SYSTEM nie może zawierać znaku końca linii"
+
+#: utils/misc/guc.c:6935
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "nie można zanalizować zawartości pliku \"%s\""
 
-#: utils/misc/guc.c:7080
+#: utils/misc/guc.c:7093
 #, c-format
 msgid "SET LOCAL TRANSACTION SNAPSHOT is not implemented"
 msgstr "SET LOCAL TRANSACTION SNAPSHOT jeszcze nie zaimplementowano"
 
-#: utils/misc/guc.c:7165
+#: utils/misc/guc.c:7178
 #, c-format
 msgid "SET requires parameter name"
 msgstr "SET wymaga nazwy parametru"
 
-#: utils/misc/guc.c:7289
+#: utils/misc/guc.c:7302
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "próba przedefiniowania parametru \"%s\""
 
-#: utils/misc/guc.c:9019
+#: utils/misc/guc.c:9032
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "parametr \"%s\" nie może być ustawiony"
 
-#: utils/misc/guc.c:9106
+#: utils/misc/guc.c:9119
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "nie można zanalizować ustawienia parametru \"%s\""
 
-#: utils/misc/guc.c:9464 utils/misc/guc.c:9498
+#: utils/misc/guc.c:9477 utils/misc/guc.c:9511
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "nieprawidłowa wartość dla parametru \"%s\": %d"
 
-#: utils/misc/guc.c:9532
+#: utils/misc/guc.c:9545
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "nieprawidłowa wartość dla parametru \"%s\": %g"
 
-#: utils/misc/guc.c:9722
+#: utils/misc/guc.c:9735
 #, c-format
 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:9734
+#: utils/misc/guc.c:9747
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour nie jest obsługiwany przez tą kompilację"
 
-#: utils/misc/guc.c:9747
+#: utils/misc/guc.c:9760
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL nie jest obsługiwany przez tą kompilację"
 
-#: utils/misc/guc.c:9759
+#: utils/misc/guc.c:9772
 #, c-format
 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:9771
+#: utils/misc/guc.c:9784
 #, c-format
 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ą."
@@ -22317,8 +22338,8 @@
 
 #: utils/mmgr/mcxt.c:689 utils/mmgr/mcxt.c:724 utils/mmgr/mcxt.c:761
 #: utils/mmgr/mcxt.c:798 utils/mmgr/mcxt.c:832 utils/mmgr/mcxt.c:861
-#: utils/mmgr/mcxt.c:895 utils/mmgr/mcxt.c:975 utils/mmgr/mcxt.c:1008
-#: utils/mmgr/mcxt.c:1055
+#: utils/mmgr/mcxt.c:895 utils/mmgr/mcxt.c:977 utils/mmgr/mcxt.c:1011
+#: utils/mmgr/mcxt.c:1060
 #, c-format
 msgid "Failed on request of size %zu."
 msgstr "Niepowodzenie żądania o rozmiarze %zu."
@@ -22438,47 +22459,56 @@
 msgid "cannot import a snapshot from a different database"
 msgstr "nie można importować migawki z innej bazy danych"
 
-#~ msgid "no free replication origin oid could be found"
-#~ msgstr "nie znaleziono żadnego wolnego oid źródła replikacji"
+#~ msgid "mapped win32 error code %lu to %d"
+#~ msgstr "zmapowano kod błędu win32 %lu do %d"
 
-#~ msgid "archive member \"%s\" too large for tar format"
-#~ msgstr "składnik archiwum \"%s\" za duży dla formatu tar"
+#~ msgid "unrecognized win32 error code: %lu"
+#~ msgstr "nierozpoznany kod błędu win32: %lu"
 
-#~ msgid "invalid value for parameter \"replication\""
-#~ msgstr "niepoprawna wartość dla parametru \"replication\""
+#~ msgid "too many parallel workers already attached"
+#~ msgstr "za dużo już dowiązano równoległych procesów roboczych"
 
-#~ msgid "received password packet"
-#~ msgstr "odebrano pakiet hasła"
+#~ msgid "invalid value for recovery parameter \"recovery_target\""
+#~ msgstr "nieprawidłowa wartość dla parametru naprawczego \"recovery_target\""
 
-#~ msgid "name list must be of length at least %d"
-#~ msgstr "lista nazw musi być nie krótsza niż %d"
+#~ msgid "redo record is at %X/%X; shutdown %s"
+#~ msgstr "rekord ponowienia w %X/%X; zamknięcie %s"
 
-#~ msgid "commit timestamp Xid oldest/newest: %u/%u"
-#~ msgstr "znacznik czasu zatwierdzenia Xid najstarszy/najświeższy: %u/%u"
+#~ msgid "next transaction ID: %u/%u; next OID: %u"
+#~ msgstr "ID następnej transakcji: %u/%u; następny OID: %u"
 
-#~ msgid "oldest MultiXactId: %u, in database %u"
-#~ msgstr "najstarszy MultiXactId: %u, w bazie danych %u"
+#~ msgid "next MultiXactId: %u; next MultiXactOffset: %u"
+#~ msgstr "następny MultiXactId: %u; następny MultiXactOffset: %u"
 
 #~ msgid "oldest unfrozen transaction ID: %u, in database %u"
 #~ msgstr "ID najstarszej niezamrożonej transakcji: %u; następny OID: %u"
 
-#~ msgid "next MultiXactId: %u; next MultiXactOffset: %u"
-#~ msgstr "następny MultiXactId: %u; następny MultiXactOffset: %u"
+#~ msgid "oldest MultiXactId: %u, in database %u"
+#~ msgstr "najstarszy MultiXactId: %u, w bazie danych %u"
 
-#~ msgid "next transaction ID: %u/%u; next OID: %u"
-#~ msgstr "ID następnej transakcji: %u/%u; następny OID: %u"
+#~ msgid "commit timestamp Xid oldest/newest: %u/%u"
+#~ msgstr "znacznik czasu zatwierdzenia Xid najstarszy/najświeższy: %u/%u"
 
-#~ msgid "redo record is at %X/%X; shutdown %s"
-#~ msgstr "rekord ponowienia w %X/%X; zamknięcie %s"
+#~ msgid "name list must be of length at least %d"
+#~ msgstr "lista nazw musi być nie krótsza niż %d"
 
-#~ msgid "invalid value for recovery parameter \"recovery_target\""
-#~ msgstr "nieprawidłowa wartość dla parametru naprawczego \"recovery_target\""
+#~ msgid "received password packet"
+#~ msgstr "odebrano pakiet hasła"
 
-#~ msgid "too many parallel workers already attached"
-#~ msgstr "za dużo już dowiązano równoległych procesów roboczych"
+#~ msgid "invalid value for parameter \"replication\""
+#~ msgstr "niepoprawna wartość dla parametru \"replication\""
 
-#~ msgid "unrecognized win32 error code: %lu"
-#~ msgstr "nierozpoznany kod błędu win32: %lu"
+#~ msgid "archive member \"%s\" too large for tar format"
+#~ msgstr "składnik archiwum \"%s\" za duży dla formatu tar"
 
-#~ msgid "mapped win32 error code %lu to %d"
-#~ msgstr "zmapowano kod błędu win32 %lu do %d"
+#~ msgid "no free replication origin oid could be found"
+#~ msgstr "nie znaleziono żadnego wolnego oid źródła replikacji"
+
+#~ msgid "system columns cannot be used in an ON CONFLICT clause"
+#~ msgstr "kolumny systemowe nie mogą być użyte a klauzuli ON CONFLICT"
+
+#~ msgid "could not rename file \"%s\" to \"%s\" (initialization of log file): %m"
+#~ msgstr "nie można zmienić nazwy pliku \"%s\" do \"%s\" (inicjacja pliku dziennika): %m"
+
+#~ msgid "could not link file \"%s\" to \"%s\" (initialization of log file): %m"
+#~ msgstr "nie można podlinkować pliku \"%s\" do \"%s\" (inicjacja pliku dziennika): %m"
diff -Nru postgresql-9.5-9.5.2/src/backend/po/ru.po postgresql-9.5-9.5.8/src/backend/po/ru.po
--- postgresql-9.5-9.5.2/src/backend/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,45 +1,25 @@
 # Russian message translation file for postgres
+# Copyright (C) 2001-2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Serguei A. Mokhov <mokhov@cs.concordia.ca>, 2001-2005.
+# Oleg Bartunov <oleg@sai.msu.su>, 2004-2005.
+# Dmitriy Olshevskiy <olshevskiy87@bk.ru>, 2014.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# Copyright (C) 2012 PostgreSQL Global Development Group
-# Copyright (c) 2001-2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
-# Copyright (c) 2012-2013 Alexander Lakhin, exclusion@gmail.com
-# Distributed under the same licensing terms as PostgreSQL itself.
-#
-# ChangeLog:
-#   - August 24, 2014: Updates for 9.4. Alexander Lakhin <exclusion@gmail.com>.
-#     - With corrections from Dmitriy Olshevskiy <olshevskiy87@bk.ru>
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 3, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 22, 2012: Minor fixes: Alexander Lakhin <exclusion@gmail.com>
-#   - January 3 - January 29, 2012: Fixes, completion, and updates for 9.1: Alexander Lakhin <exclusion@gmail.com>
-#   - December 10, 2004 - January 17, 2005:
-#     - Updates for 8.0; <mokhov@cs.concordia.ca>
-#     - With terminology suggestions from Oleg Bartunov
-#   - March 27 - December 10, 2004: Updates for 7.4.x/8.0 branches; <mokhov@cs.concordia.ca>
-#   - July - August 23, 2003: Updates for 7.4.x; <mokhov@cs.concordia.ca>
-#   - January 2, 2003: Fuzzy fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
-#   - October 12, 2002: Post-7.3 beta 2, Fuzzy fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
-#   - September 14, 2002: Post-7.3 beta 1, Take II, Serguei A. Mokhov <mokhov@cs.concordia.ca>
-#   - September 7, 2002: Post-7.3 beta 1 updated messages, Serguei A. Mokhov <mokhov@cs.concordia.ca>
-#   - September 2001 - August 2002: Initial translation and maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: postgres (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-08 21:38+0000\n"
-"PO-Revision-Date: 2016-02-10 14:52+0300\n"
-"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"POT-Creation-Date: 2017-05-26 20:45+0000\n"
+"PO-Revision-Date: 2017-05-27 21:25+0300\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
-"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 
 #: ../common/exec.c:127 ../common/exec.c:241 ../common/exec.c:284
 #, c-format
@@ -77,8 +57,8 @@
 msgstr "ошибка pclose: %s"
 
 #: ../common/fe_memutils.c:35 ../common/fe_memutils.c:75
-#: ../common/fe_memutils.c:98 ../common/psprintf.c:181 ../port/path.c:598
-#: ../port/path.c:636 ../port/path.c:653
+#: ../common/fe_memutils.c:98 ../common/psprintf.c:181 ../port/path.c:602
+#: ../port/path.c:640 ../port/path.c:657
 #, c-format
 msgid "out of memory\n"
 msgstr "нехватка пам�ти\n"
@@ -103,28 +83,29 @@
 msgid "could not close directory \"%s\": %s\n"
 msgstr "не удало�ь закрыть каталог \"%s\": %s\n"
 
-#: ../common/psprintf.c:179 ../port/path.c:596 ../port/path.c:634
-#: ../port/path.c:651 access/transam/xlog.c:6041 lib/stringinfo.c:258
-#: libpq/auth.c:820 libpq/auth.c:1181 libpq/auth.c:1249 libpq/auth.c:1660
-#: postmaster/bgworker.c:289 postmaster/bgworker.c:797
-#: postmaster/postmaster.c:2317 postmaster/postmaster.c:2348
-#: postmaster/postmaster.c:3867 postmaster/postmaster.c:4557
-#: postmaster/postmaster.c:4625 postmaster/postmaster.c:5315
-#: postmaster/postmaster.c:5568 replication/logical/logical.c:167
-#: storage/buffer/localbuf.c:396 storage/file/fd.c:481 storage/file/fd.c:878
-#: storage/file/fd.c:996 storage/file/fd.c:1609 storage/ipc/procarray.c:907
+#: ../common/psprintf.c:179 ../port/path.c:600 ../port/path.c:638
+#: ../port/path.c:655 access/transam/xlog.c:6066 lib/stringinfo.c:258
+#: libpq/auth.c:823 libpq/auth.c:1186 libpq/auth.c:1254 libpq/auth.c:1665
+#: postmaster/bgworker.c:309 postmaster/bgworker.c:821
+#: postmaster/postmaster.c:2333 postmaster/postmaster.c:2364
+#: postmaster/postmaster.c:3883 postmaster/postmaster.c:4573
+#: postmaster/postmaster.c:4648 postmaster/postmaster.c:5314
+#: postmaster/postmaster.c:5608 replication/logical/logical.c:168
+#: storage/buffer/localbuf.c:396 storage/file/fd.c:595 storage/file/fd.c:1023
+#: storage/file/fd.c:1141 storage/file/fd.c:1793 storage/ipc/procarray.c:907
 #: storage/ipc/procarray.c:1393 storage/ipc/procarray.c:1400
-#: storage/ipc/procarray.c:1793 storage/ipc/procarray.c:2377
-#: utils/adt/formatting.c:1523 utils/adt/formatting.c:1643
-#: utils/adt/formatting.c:1764 utils/adt/regexp.c:219 utils/adt/varlena.c:4199
-#: utils/adt/varlena.c:4220 utils/fmgr/dfmgr.c:216 utils/hash/dynahash.c:411
+#: storage/ipc/procarray.c:1793 storage/ipc/procarray.c:2385
+#: utils/adt/formatting.c:1522 utils/adt/formatting.c:1642
+#: utils/adt/formatting.c:1763 utils/adt/pg_locale.c:463
+#: utils/adt/pg_locale.c:647 utils/adt/regexp.c:219 utils/adt/varlena.c:4212
+#: utils/adt/varlena.c:4233 utils/fmgr/dfmgr.c:216 utils/hash/dynahash.c:411
 #: utils/hash/dynahash.c:488 utils/hash/dynahash.c:1002 utils/mb/mbutils.c:376
 #: utils/mb/mbutils.c:709 utils/misc/guc.c:3723 utils/misc/guc.c:3739
 #: utils/misc/guc.c:3752 utils/misc/guc.c:6686 utils/misc/tzparser.c:470
-#: utils/mmgr/aset.c:504 utils/mmgr/mcxt.c:688 utils/mmgr/mcxt.c:723
+#: utils/mmgr/aset.c:505 utils/mmgr/mcxt.c:688 utils/mmgr/mcxt.c:723
 #: utils/mmgr/mcxt.c:760 utils/mmgr/mcxt.c:797 utils/mmgr/mcxt.c:831
-#: utils/mmgr/mcxt.c:860 utils/mmgr/mcxt.c:894 utils/mmgr/mcxt.c:974
-#: utils/mmgr/mcxt.c:1007 utils/mmgr/mcxt.c:1054
+#: utils/mmgr/mcxt.c:860 utils/mmgr/mcxt.c:894 utils/mmgr/mcxt.c:976
+#: utils/mmgr/mcxt.c:1010 utils/mmgr/mcxt.c:1059
 #, c-format
 msgid "out of memory"
 msgstr "нехватка пам�ти"
@@ -191,7 +172,7 @@
 msgid "could not look up effective user ID %ld: %s"
 msgstr "вы��нить �ффективный идентификатор пользовател� (%ld) не удало�ь: %s"
 
-#: ../common/username.c:47 libpq/auth.c:1607
+#: ../common/username.c:47 libpq/auth.c:1612
 msgid "user does not exist"
 msgstr "пользователь не �уще�твует"
 
@@ -235,40 +216,39 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "дочерний проце�� завершил�� � нера�познанным �о�то�нием %d"
 
-#: ../port/chklocale.c:259
+#: ../port/chklocale.c:294
 #, c-format
 msgid "could not determine encoding for codeset \"%s\""
 msgstr "не удало�ь определить кодировку дл� набора �имволов \"%s\""
 
-#: ../port/chklocale.c:260 ../port/chklocale.c:389
-#: postmaster/postmaster.c:4857
+#: ../port/chklocale.c:295 ../port/chklocale.c:424 postmaster/postmaster.c:4852
 #, c-format
 msgid "Please report this to <pgsql-bugs@postgresql.org>."
 msgstr ""
 "Пожалуй�та, напишите об �той ошибке по адре�у <pgsql-bugs@postgresql.org>."
 
-#: ../port/chklocale.c:381 ../port/chklocale.c:387
+#: ../port/chklocale.c:416 ../port/chklocale.c:422
 #, c-format
 msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
 msgstr ""
 "не удало�ь определить кодировку дл� локали \"%s\": набор �имволов - \"%s\""
 
-#: ../port/dirmod.c:216
+#: ../port/dirmod.c:218
 #, c-format
 msgid "could not set junction for \"%s\": %s"
 msgstr "не удало�ь �оздать �в�зь дл� каталога \"%s\": %s"
 
-#: ../port/dirmod.c:219
+#: ../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "не удало�ь �оздать �в�зь дл� каталога \"%s\": %s\n"
 
-#: ../port/dirmod.c:291
+#: ../port/dirmod.c:295
 #, c-format
 msgid "could not get junction for \"%s\": %s"
 msgstr "не удало�ь получить �в�зь дл� каталога \"%s\": %s"
 
-#: ../port/dirmod.c:294
+#: ../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "не удало�ь получить �в�зь дл� каталога \"%s\": %s\n"
@@ -300,7 +280,7 @@
 "Возможно, работе СУБД мешает антивиру�, программа резервного копировани� или "
 "что-то подобное."
 
-#: ../port/path.c:620
+#: ../port/path.c:624
 #, c-format
 msgid "could not get current working directory: %s\n"
 msgstr "не удало�ь определить текущий рабочий каталог: %s\n"
@@ -327,7 +307,7 @@
 msgstr ""
 "размер �троки индек�а (%lu) больше предельного размера (%lu) (индек� \"%s\")"
 
-#: access/brin/brin_revmap.c:449
+#: access/brin/brin_revmap.c:453
 #, c-format
 msgid "unexpected page type 0x%04X in BRIN index \"%s\" block %u"
 msgstr "неожиданный тип �траницы 0x%04X в BRIN-индек�е \"%s\" (блок: %u)"
@@ -347,7 +327,7 @@
 msgid "index row requires %zu bytes, maximum size is %zu"
 msgstr "�трока индек�а требует байт: %zu, при мак�имуме: %zu"
 
-#: access/common/printtup.c:294 tcop/fastpath.c:182 tcop/fastpath.c:544
+#: access/common/printtup.c:294 tcop/fastpath.c:182 tcop/fastpath.c:532
 #: tcop/postgres.c:1730
 #, c-format
 msgid "unsupported format code: %d"
@@ -420,7 +400,7 @@
 msgstr ""
 "Чи�ло возвращённых �толбцов (%d) не �оответ�твует ожидаемому чи�лу (%d)."
 
-#: access/common/tupconvert.c:241
+#: access/common/tupconvert.c:314
 #, c-format
 msgid ""
 "Attribute \"%s\" of type %s does not match corresponding attribute of type "
@@ -428,31 +408,31 @@
 msgstr ""
 "�трибут \"%s\" типа %s не�овме�тим � �оответ�твующим атрибутом типа %s."
 
-#: access/common/tupconvert.c:253
+#: access/common/tupconvert.c:326
 #, c-format
 msgid "Attribute \"%s\" of type %s does not exist in type %s."
 msgstr "�трибут \"%s\" типа %s не �уще�твует в типе %s."
 
-#: access/common/tupdesc.c:635 parser/parse_relation.c:1517
+#: access/common/tupdesc.c:635 parser/parse_relation.c:1518
 #, c-format
 msgid "column \"%s\" cannot be declared SETOF"
 msgstr "�толбец \"%s\" не может быть объ�влен как SETOF"
 
 #: access/gin/ginentrypage.c:109 access/gist/gist.c:1289
-#: access/nbtree/nbtinsert.c:567 access/nbtree/nbtsort.c:488
+#: access/nbtree/nbtinsert.c:575 access/nbtree/nbtsort.c:488
 #: access/spgist/spgdoinsert.c:1907
 #, c-format
 msgid "index row size %zu exceeds maximum %zu for index \"%s\""
 msgstr ""
 "размер �троки индек�а (%zu) больше предельного размера (%zu) (индек� \"%s\")"
 
-#: access/gin/ginscan.c:410
+#: access/gin/ginscan.c:412
 #, c-format
 msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
 msgstr ""
 "�тарые GIN-индек�ы не поддерживают �канирование в�его индек�а и пои�к NULL"
 
-#: access/gin/ginscan.c:411
+#: access/gin/ginscan.c:413
 #, c-format
 msgid "To fix this, do REINDEX INDEX \"%s\"."
 msgstr "Дл� и�правлени� выполните REINDEX INDEX \"%s\"."
@@ -471,11 +451,11 @@
 "Это вызвано неполным разделением �траницы при во��тановлении по�ле �бо� в "
 "PostgreSQL до вер�ии 9.1."
 
-#: access/gist/gist.c:635 access/gist/gistutil.c:735
-#: access/gist/gistutil.c:746 access/gist/gistvacuum.c:269
-#: access/hash/hashutil.c:172 access/hash/hashutil.c:183
-#: access/hash/hashutil.c:195 access/hash/hashutil.c:216
-#: access/nbtree/nbtpage.c:518 access/nbtree/nbtpage.c:529
+#: access/gist/gist.c:635 access/gist/gistutil.c:735 access/gist/gistutil.c:746
+#: access/gist/gistvacuum.c:269 access/hash/hashutil.c:172
+#: access/hash/hashutil.c:183 access/hash/hashutil.c:195
+#: access/hash/hashutil.c:216 access/nbtree/nbtpage.c:518
+#: access/nbtree/nbtpage.c:529
 #, c-format
 msgid "Please REINDEX it."
 msgstr "Пожалуй�та, выполните REINDEX дл� него."
@@ -522,12 +502,12 @@
 msgid "index \"%s\" contains corrupted page at block %u"
 msgstr "индек� \"%s\" �одержит и�порченную �траницу в блоке %u"
 
-#: access/hash/hashinsert.c:68
+#: access/hash/hashinsert.c:70
 #, c-format
 msgid "index row size %zu exceeds hash maximum %zu"
 msgstr "размер �троки индек�а (%zu) больше предельного размера хеша (%zu)"
 
-#: access/hash/hashinsert.c:70 access/spgist/spgdoinsert.c:1911
+#: access/hash/hashinsert.c:72 access/spgist/spgdoinsert.c:1911
 #: access/spgist/spgutils.c:666
 #, c-format
 msgid "Values larger than a buffer page cannot be indexed."
@@ -565,8 +545,8 @@
 msgstr "\"%s\" - �то индек�"
 
 #: access/heap/heapam.c:1248 access/heap/heapam.c:1276
-#: access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:8954
-#: commands/tablecmds.c:11995
+#: access/heap/heapam.c:1308 catalog/aclchk.c:1740 commands/tablecmds.c:9052
+#: commands/tablecmds.c:12153
 #, c-format
 msgid "\"%s\" is a composite type"
 msgstr "\"%s\" - �то �о�тавной тип"
@@ -586,18 +566,18 @@
 msgid "attempted to delete invisible tuple"
 msgstr "попытка удалени� невидимого кортежа"
 
-#: access/heap/heapam.c:3267 access/heap/heapam.c:5818
+#: access/heap/heapam.c:3266 access/heap/heapam.c:5906
 #, c-format
 msgid "cannot update tuples during a parallel operation"
 msgstr "измен�ть кортежи во врем� параллельных операций нельз�"
 
-#: access/heap/heapam.c:3389
+#: access/heap/heapam.c:3388
 #, c-format
 msgid "attempted to update invisible tuple"
 msgstr "попытка изменени� невидимого кортежа"
 
-#: access/heap/heapam.c:4640 access/heap/heapam.c:4678
-#: access/heap/heapam.c:4901 executor/execMain.c:2279
+#: access/heap/heapam.c:4703 access/heap/heapam.c:4741
+#: access/heap/heapam.c:4964 executor/execMain.c:2279
 #, c-format
 msgid "could not obtain lock on row in relation \"%s\""
 msgstr "не удало�ь получить блокировку �троки в таблице \"%s\""
@@ -614,23 +594,22 @@
 
 #: access/heap/rewriteheap.c:965 access/heap/rewriteheap.c:1177
 #: access/heap/rewriteheap.c:1274 access/transam/timeline.c:407
-#: access/transam/timeline.c:497 access/transam/xlog.c:3011
-#: access/transam/xlog.c:3173 replication/logical/origin.c:613
-#: replication/logical/snapbuild.c:1592 replication/slot.c:1026
-#: replication/slot.c:1115 storage/file/fd.c:459 storage/file/fd.c:2718
-#: storage/smgr/md.c:982 storage/smgr/md.c:1213 storage/smgr/md.c:1386
-#: utils/misc/guc.c:6708
+#: access/transam/timeline.c:483 access/transam/xlog.c:3040
+#: access/transam/xlog.c:3202 replication/logical/snapbuild.c:1588
+#: replication/slot.c:1053 replication/slot.c:1142 storage/file/fd.c:490
+#: storage/file/fd.c:2924 storage/smgr/md.c:983 storage/smgr/md.c:1214
+#: storage/smgr/md.c:1387 utils/misc/guc.c:6708
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "не удало�ь �инхронизировать � ФС файл \"%s\": %m"
 
 #: access/heap/rewriteheap.c:1020 access/heap/rewriteheap.c:1140
-#: access/transam/timeline.c:315 access/transam/timeline.c:475
-#: access/transam/xlog.c:2967 access/transam/xlog.c:3116
-#: access/transam/xlog.c:10105 access/transam/xlog.c:10141
-#: access/transam/xlog.c:10463 postmaster/postmaster.c:4332
-#: replication/logical/origin.c:542 replication/slot.c:983
-#: storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1071
+#: access/transam/timeline.c:315 access/transam/timeline.c:461
+#: access/transam/xlog.c:2996 access/transam/xlog.c:3145
+#: access/transam/xlog.c:10147 access/transam/xlog.c:10183
+#: access/transam/xlog.c:10561 postmaster/postmaster.c:4348
+#: replication/logical/origin.c:542 replication/slot.c:1010
+#: storage/file/copydir.c:162 storage/smgr/md.c:320 utils/time/snapmgr.c:1123
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "�оздать файл \"%s\" не удало�ь: %m"
@@ -641,85 +620,85 @@
 msgstr "не удало�ь обрезать файл \"%s\" до нужного размера (%u): %m"
 
 #: access/heap/rewriteheap.c:1156 replication/walsender.c:479
-#: storage/smgr/md.c:1798
+#: storage/smgr/md.c:1799
 #, c-format
 msgid "could not seek to end of file \"%s\": %m"
 msgstr "не удало�ь перейти к концу файла \"%s\": %m"
 
 #: access/heap/rewriteheap.c:1167 access/transam/timeline.c:367
-#: access/transam/timeline.c:401 access/transam/timeline.c:491
-#: access/transam/xlog.c:3002 access/transam/xlog.c:3166
-#: postmaster/postmaster.c:4342 postmaster/postmaster.c:4352
-#: replication/logical/origin.c:551 replication/logical/origin.c:587
-#: replication/logical/origin.c:603 replication/logical/snapbuild.c:1576
-#: replication/slot.c:1012 storage/file/copydir.c:187
-#: utils/init/miscinit.c:1199 utils/init/miscinit.c:1208
-#: utils/init/miscinit.c:1215 utils/misc/guc.c:6669 utils/misc/guc.c:6700
-#: utils/misc/guc.c:8498 utils/misc/guc.c:8512 utils/time/snapmgr.c:1076
-#: utils/time/snapmgr.c:1083
+#: access/transam/timeline.c:401 access/transam/timeline.c:477
+#: access/transam/xlog.c:3031 access/transam/xlog.c:3195
+#: postmaster/postmaster.c:4358 postmaster/postmaster.c:4368
+#: replication/logical/origin.c:551 replication/logical/origin.c:590
+#: replication/logical/origin.c:606 replication/logical/snapbuild.c:1572
+#: replication/slot.c:1039 storage/file/copydir.c:187
+#: utils/init/miscinit.c:1209 utils/init/miscinit.c:1218
+#: utils/init/miscinit.c:1225 utils/misc/guc.c:6669 utils/misc/guc.c:6700
+#: utils/misc/guc.c:8519 utils/misc/guc.c:8533 utils/time/snapmgr.c:1128
+#: utils/time/snapmgr.c:1135
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "запи�ать в файл \"%s\" не удало�ь: %m"
 
-#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10330
+#: access/heap/rewriteheap.c:1250 access/transam/xlog.c:10399
 #: access/transam/xlogarchive.c:114 access/transam/xlogarchive.c:468
-#: replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2421
-#: replication/logical/reorderbuffer.c:2478
-#: replication/logical/snapbuild.c:1520 replication/logical/snapbuild.c:1895
-#: replication/slot.c:1089 storage/ipc/dsm.c:326 storage/smgr/md.c:420
-#: storage/smgr/md.c:469 storage/smgr/md.c:1333
+#: replication/logical/origin.c:529 replication/logical/reorderbuffer.c:2497
+#: replication/logical/reorderbuffer.c:2554
+#: replication/logical/snapbuild.c:1521 replication/logical/snapbuild.c:1884
+#: replication/slot.c:1116 storage/ipc/dsm.c:326 storage/smgr/md.c:420
+#: storage/smgr/md.c:469 storage/smgr/md.c:1334
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "не удало�ь �тереть файл \"%s\": %m"
 
 #: access/heap/rewriteheap.c:1264 access/transam/timeline.c:111
 #: access/transam/timeline.c:236 access/transam/timeline.c:334
-#: access/transam/xlog.c:2943 access/transam/xlog.c:3060
-#: access/transam/xlog.c:3101 access/transam/xlog.c:3392
-#: access/transam/xlog.c:3470 replication/basebackup.c:398
-#: replication/basebackup.c:1159 replication/logical/logicalfuncs.c:154
-#: replication/logical/origin.c:677 replication/logical/reorderbuffer.c:2038
-#: replication/logical/reorderbuffer.c:2242
-#: replication/logical/reorderbuffer.c:2869
-#: replication/logical/snapbuild.c:1569 replication/logical/snapbuild.c:1653
-#: replication/slot.c:1104 replication/walsender.c:472
-#: replication/walsender.c:2100 storage/file/copydir.c:155
-#: storage/file/fd.c:445 storage/file/fd.c:2653 storage/file/fd.c:2705
-#: storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1854
-#: utils/init/miscinit.c:1134 utils/init/miscinit.c:1255
-#: utils/init/miscinit.c:1333 utils/misc/guc.c:6912 utils/misc/guc.c:6944
+#: access/transam/xlog.c:2972 access/transam/xlog.c:3089
+#: access/transam/xlog.c:3130 access/transam/xlog.c:3403
+#: access/transam/xlog.c:3481 replication/basebackup.c:400
+#: replication/basebackup.c:1147 replication/logical/logicalfuncs.c:154
+#: replication/logical/origin.c:661 replication/logical/reorderbuffer.c:2075
+#: replication/logical/reorderbuffer.c:2291
+#: replication/logical/reorderbuffer.c:2946
+#: replication/logical/snapbuild.c:1565 replication/logical/snapbuild.c:1649
+#: replication/slot.c:1131 replication/walsender.c:472
+#: replication/walsender.c:2099 storage/file/copydir.c:155
+#: storage/file/fd.c:473 storage/file/fd.c:2837 storage/file/fd.c:2903
+#: storage/smgr/md.c:602 storage/smgr/md.c:860 utils/error/elog.c:1863
+#: utils/init/miscinit.c:1144 utils/init/miscinit.c:1265
+#: utils/init/miscinit.c:1343 utils/misc/guc.c:6928 utils/misc/guc.c:6961
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "не удало�ь открыть файл \"%s\": %m"
 
 #: access/index/indexam.c:172 catalog/objectaddress.c:1144
-#: commands/indexcmds.c:1754 commands/tablecmds.c:239
-#: commands/tablecmds.c:11986
+#: commands/indexcmds.c:1755 commands/tablecmds.c:240
+#: commands/tablecmds.c:12144
 #, c-format
 msgid "\"%s\" is not an index"
 msgstr "\"%s\" - �то не индек�"
 
-#: access/nbtree/nbtinsert.c:419
+#: access/nbtree/nbtinsert.c:427
 #, c-format
 msgid "duplicate key value violates unique constraint \"%s\""
 msgstr "повтор�ющее�� значение ключа нарушает ограничение уникально�ти \"%s\""
 
-#: access/nbtree/nbtinsert.c:421
+#: access/nbtree/nbtinsert.c:429
 #, c-format
 msgid "Key %s already exists."
 msgstr "Ключ \"%s\" уже �уще�твует."
 
-#: access/nbtree/nbtinsert.c:488
+#: access/nbtree/nbtinsert.c:496
 #, c-format
 msgid "failed to re-find tuple within index \"%s\""
 msgstr "не удало�ь повторно найти кортеж в индек�е \"%s\""
 
-#: access/nbtree/nbtinsert.c:490
+#: access/nbtree/nbtinsert.c:498
 #, c-format
 msgid "This may be because of a non-immutable index expression."
 msgstr "Возможно, �то вызвано переменной природой индек�ного выражени�."
 
-#: access/nbtree/nbtinsert.c:570 access/nbtree/nbtsort.c:491
+#: access/nbtree/nbtinsert.c:578 access/nbtree/nbtsort.c:491
 #, c-format
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
@@ -732,7 +711,7 @@
 "полнотек�товую индек�ацию."
 
 #: access/nbtree/nbtpage.c:168 access/nbtree/nbtpage.c:371
-#: access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1665
+#: access/nbtree/nbtpage.c:458 parser/parse_utilcmd.c:1667
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "индек� \"%s\" не �вл�ет�� b-деревом"
@@ -768,24 +747,24 @@
 msgid "sample percentage must be between 0 and 100"
 msgstr "процент выборки должен задавать�� чи�лом от 0 до 100"
 
-#: access/transam/commit_ts.c:295
+#: access/transam/commit_ts.c:294
 #, c-format
 msgid "cannot retrieve commit timestamp for transaction %u"
 msgstr "не удало�ь получить метку времени фик�ации транзакции %u"
 
-#: access/transam/commit_ts.c:385
+#: access/transam/commit_ts.c:392
 #, c-format
 msgid "could not get commit timestamp data"
 msgstr "не удало�ь получить отметку времени фик�ации"
 
-#: access/transam/commit_ts.c:387
+#: access/transam/commit_ts.c:394
 #, c-format
 msgid ""
 "Make sure the configuration parameter \"%s\" is set on the master server."
 msgstr ""
 "Убедите�ь, что в конфигурации главного �ервера у�тановлен параметр \"%s\"."
 
-#: access/transam/commit_ts.c:389 libpq/hba.c:1424
+#: access/transam/commit_ts.c:396 libpq/hba.c:1424
 #, c-format
 msgid "Make sure the configuration parameter \"%s\" is set."
 msgstr "Убедите�ь, что в конфигурации у�тановлен параметр \"%s\"."
@@ -819,7 +798,7 @@
 "база данных не принимает команды, �оздающие новые MultiXactId, во избежание "
 "потери данных из-за наложени� в базе данных � OID %u"
 
-#: access/transam/multixact.c:1036 access/transam/multixact.c:2319
+#: access/transam/multixact.c:1036 access/transam/multixact.c:2318
 #, c-format
 msgid "database \"%s\" must be vacuumed before %u more MultiXactId is used"
 msgid_plural ""
@@ -834,7 +813,7 @@
 "база данных \"%s\" должна быть очищена, прежде чем будут и�пользованы "
 "о�тавшие�� MultiXactId (%u)"
 
-#: access/transam/multixact.c:1045 access/transam/multixact.c:2328
+#: access/transam/multixact.c:1045 access/transam/multixact.c:2327
 #, c-format
 msgid ""
 "database with OID %u must be vacuumed before %u more MultiXactId is used"
@@ -910,24 +889,24 @@
 "Выполните очи�тку (VACUUM) в�ей �той базы данных, уменьшив значени� "
 "vacuum_multixact_freeze_min_age и vacuum_multixact_freeze_table_age."
 
-#: access/transam/multixact.c:1286
+#: access/transam/multixact.c:1285
 #, c-format
 msgid "MultiXactId %u does no longer exist -- apparent wraparound"
 msgstr "MultiXactId %u прекратил �уще�твование: видимо, произошло наложение"
 
-#: access/transam/multixact.c:1294
+#: access/transam/multixact.c:1293
 #, c-format
 msgid "MultiXactId %u has not been created yet -- apparent wraparound"
 msgstr "MultiXactId %u ещё не был �оздан: видимо, произошло наложение"
 
-#: access/transam/multixact.c:2269
+#: access/transam/multixact.c:2268
 #, c-format
 msgid "MultiXactId wrap limit is %u, limited by database with OID %u"
 msgstr ""
 "предел наложени� MultiXactId равен %u, и�точник ограничени� - база данных � "
 "OID %u"
 
-#: access/transam/multixact.c:2324 access/transam/multixact.c:2333
+#: access/transam/multixact.c:2323 access/transam/multixact.c:2332
 #: access/transam/varsup.c:146 access/transam/varsup.c:153
 #: access/transam/varsup.c:384 access/transam/varsup.c:391
 #, c-format
@@ -940,12 +919,12 @@
 "Возможно, вам также придёт�� зафик�ировать или откатить �тарые\n"
 "подготовленные транзакции."
 
-#: access/transam/multixact.c:2603
+#: access/transam/multixact.c:2602
 #, c-format
 msgid "oldest MultiXactId member is at offset %u"
 msgstr "�мещение членов �тарейшей мультитранзакции: %u"
 
-#: access/transam/multixact.c:2607
+#: access/transam/multixact.c:2606
 #, c-format
 msgid ""
 "MultiXact member wraparound protections are disabled because oldest "
@@ -954,19 +933,19 @@
 "Защита от наложени� членов мультитранзакций отключена, так как �тарейша� "
 "отмеченна� мультитранзакци� %u не найдена на ди�ке"
 
-#: access/transam/multixact.c:2629
+#: access/transam/multixact.c:2628
 #, c-format
 msgid "MultiXact member wraparound protections are now enabled"
 msgstr "Защита от наложени� мультитранзакций �ейча� включена"
 
-#: access/transam/multixact.c:2631
+#: access/transam/multixact.c:2630
 #, c-format
 msgid "MultiXact member stop limit is now %u based on MultiXact %u"
 msgstr ""
 "Граница членов мультитранзакции �ейча�: %u (при �тарейшей мультитранзакции "
 "%u)"
 
-#: access/transam/multixact.c:3011
+#: access/transam/multixact.c:3010
 #, c-format
 msgid ""
 "oldest MultiXact %u not found, earliest MultiXact %u, skipping truncation"
@@ -974,7 +953,7 @@
 "�тарейша� мультитранзакци� %u не найдена, новейша� мультитранзакци�: %u, "
 "у�ечение пропу�кает��"
 
-#: access/transam/multixact.c:3029
+#: access/transam/multixact.c:3028
 #, c-format
 msgid ""
 "cannot truncate up to MultiXact %u because it does not exist on disk, "
@@ -983,32 +962,32 @@
 "выполнить у�ечение до мультитранзакции %u нельз� ввиду её от�ут�тви� на "
 "ди�ке, у�ечение пропу�кает��"
 
-#: access/transam/multixact.c:3355
+#: access/transam/multixact.c:3354
 #, c-format
 msgid "invalid MultiXactId: %u"
 msgstr "неверный MultiXactId: %u"
 
-#: access/transam/parallel.c:577
+#: access/transam/parallel.c:582
 #, c-format
 msgid "postmaster exited during a parallel transaction"
 msgstr "postmaster завершил�� в проце��е параллельной транзакции"
 
-#: access/transam/parallel.c:668
+#: access/transam/parallel.c:702
 #, c-format
 msgid "lost connection to parallel worker"
 msgstr "потер�но подключение к параллельному и�полнителю"
 
-#: access/transam/parallel.c:845
+#: access/transam/parallel.c:883
 #, c-format
 msgid "could not map dynamic shared memory segment"
 msgstr "не удало�ь отобразить динамиче�кий �егмент раздел�емой пам�ти"
 
-#: access/transam/parallel.c:850
+#: access/transam/parallel.c:888
 #, c-format
 msgid "invalid magic number in dynamic shared memory segment"
 msgstr "неверное магиче�кое чи�ло в динамиче�ком �егменте раздел�емой пам�ти"
 
-#: access/transam/parallel.c:1001
+#: access/transam/parallel.c:1039
 #, c-format
 msgid "parallel worker, PID %d"
 msgstr "параллельный и�полнитель, PID %d"
@@ -1101,45 +1080,28 @@
 msgstr ""
 "Идентификаторы линий времени должны быть меньше идентификатора линии-потомка."
 
-#: access/transam/timeline.c:346 access/transam/xlog.c:3144
-#: access/transam/xlog.c:10312 access/transam/xlog.c:10325
-#: access/transam/xlog.c:10688 access/transam/xlog.c:10731
-#: access/transam/xlog.c:10770 access/transam/xlog.c:10813
+#: access/transam/timeline.c:346 access/transam/xlog.c:3173
+#: access/transam/xlog.c:10381 access/transam/xlog.c:10394
+#: access/transam/xlog.c:10786 access/transam/xlog.c:10829
+#: access/transam/xlog.c:10868 access/transam/xlog.c:10911
 #: access/transam/xlogfuncs.c:478 access/transam/xlogfuncs.c:497
-#: commands/extension.c:3047 replication/logical/origin.c:684
-#: replication/logical/origin.c:714 replication/logical/reorderbuffer.c:2887
+#: commands/extension.c:3050 replication/logical/origin.c:668
+#: replication/logical/origin.c:698 replication/logical/reorderbuffer.c:2964
 #: replication/walsender.c:497 storage/file/copydir.c:176
 #: utils/adt/genfile.c:151
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "не удало�ь прочитать файл \"%s\": %m"
 
-#: access/transam/timeline.c:412 access/transam/timeline.c:502
-#: access/transam/xlog.c:3017 access/transam/xlog.c:3178
-#: access/transam/xlogfuncs.c:503 commands/copy.c:1631
+#: access/transam/timeline.c:412 access/transam/timeline.c:488
+#: access/transam/xlog.c:3046 access/transam/xlog.c:3207
+#: access/transam/xlogfuncs.c:503 commands/copy.c:1671
 #: storage/file/copydir.c:201
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "не удало�ь закрыть файл \"%s\": %m"
 
-#: access/transam/timeline.c:429 access/transam/timeline.c:519
-#, c-format
-msgid "could not link file \"%s\" to \"%s\": %m"
-msgstr "дл� файла \"%s\" не удало�ь �оздать ��ылку \"%s\": %m"
-
-#: access/transam/timeline.c:436 access/transam/timeline.c:526
-#: access/transam/xlog.c:5302 access/transam/xlog.c:6512
-#: access/transam/xlog.c:6529 access/transam/xlog.c:7310
-#: access/transam/xlogarchive.c:458 access/transam/xlogarchive.c:476
-#: access/transam/xlogarchive.c:586 postmaster/pgarch.c:734
-#: replication/logical/origin.c:624 replication/logical/snapbuild.c:1606
-#: replication/slot.c:470 replication/slot.c:926 replication/slot.c:1038
-#: utils/misc/guc.c:6968 utils/time/snapmgr.c:1094
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\": %m"
-msgstr "не удало�ь переименовать файл \"%s\" в \"%s\": %m"
-
-#: access/transam/timeline.c:598
+#: access/transam/timeline.c:570
 #, c-format
 msgid "requested timeline %u is not in this server's history"
 msgstr "в и�тории �ервера нет запрошенной линии времени %u"
@@ -1182,7 +1144,7 @@
 #: access/transam/twophase.c:510
 #, c-format
 msgid "permission denied to finish prepared transaction"
-msgstr "нет до�тупа дл� завершени� подготовленной транзакции "
+msgstr "нет до�тупа дл� завершени� подготовленной транзакции"
 
 #: access/transam/twophase.c:511
 #, c-format
@@ -1456,114 +1418,100 @@
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "в одной транзакции не может быть больше 2^32-1 подтранзакций"
 
-#: access/transam/xlog.c:2270
+#: access/transam/xlog.c:2299
 #, c-format
 msgid "could not seek in log file %s to offset %u: %m"
 msgstr "не удало�ь переме�тить�� в файле журнала %s к �мещению %u: %m"
 
-#: access/transam/xlog.c:2290
+#: access/transam/xlog.c:2319
 #, c-format
 msgid "could not write to log file %s at offset %u, length %zu: %m"
 msgstr "не удало�ь запи�ать в файл журнала %s (�мещение: %u, длина: %zu): %m"
 
-#: access/transam/xlog.c:2553
+#: access/transam/xlog.c:2582
 #, c-format
 msgid "updated min recovery point to %X/%X on timeline %u"
 msgstr "минимальна� точка во��тановлени� изменена на %X/%X на линии времени %u"
 
-#: access/transam/xlog.c:3148
+#: access/transam/xlog.c:3177
 #, c-format
 msgid "not enough data in file \"%s\""
 msgstr "недо�таточно данных в файле\"%s\""
 
-#: access/transam/xlog.c:3267
-#, c-format
-msgid "could not link file \"%s\" to \"%s\" (initialization of log file): %m"
-msgstr ""
-"дл� файла \"%s\" не удало�ь �оздать ��ылку \"%s\" (при инициализации файла "
-"журнала): %m"
-
-#: access/transam/xlog.c:3279
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\" (initialization of log file): %m"
-msgstr ""
-"не удало�ь переименовать файл \"%s\" в \"%s\" (при инициализации файла "
-"журнала): %m"
-
-#: access/transam/xlog.c:3307
+#: access/transam/xlog.c:3318
 #, c-format
 msgid "could not open transaction log file \"%s\": %m"
 msgstr "не удало�ь открыть файл журнала транзакций \"%s\": %m"
 
-#: access/transam/xlog.c:3496 access/transam/xlog.c:5272
+#: access/transam/xlog.c:3507 access/transam/xlog.c:5297
 #, c-format
 msgid "could not close log file %s: %m"
 msgstr "не удало�ь закрыть файл журнала \"%s\": %m"
 
-#: access/transam/xlog.c:3553 replication/logical/logicalfuncs.c:149
-#: replication/walsender.c:2095
+#: access/transam/xlog.c:3564 replication/logical/logicalfuncs.c:149
+#: replication/walsender.c:2094
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "запрошенный �егмент WAL %s уже удалён"
 
-#: access/transam/xlog.c:3613 access/transam/xlog.c:3688
-#: access/transam/xlog.c:3886
+#: access/transam/xlog.c:3624 access/transam/xlog.c:3699
+#: access/transam/xlog.c:3897
 #, c-format
 msgid "could not open transaction log directory \"%s\": %m"
 msgstr "не удало�ь открыть каталог журнала транзакций \"%s\": %m"
 
-#: access/transam/xlog.c:3769
+#: access/transam/xlog.c:3780
 #, c-format
 msgid "recycled transaction log file \"%s\""
 msgstr "файл журнала транзакций \"%s\" и�пользует�� повторно"
 
-#: access/transam/xlog.c:3781
+#: access/transam/xlog.c:3792
 #, c-format
 msgid "removing transaction log file \"%s\""
 msgstr "файл журнала транзакций \"%s\" удал�ет��"
 
-#: access/transam/xlog.c:3801
+#: access/transam/xlog.c:3812
 #, c-format
 msgid "could not rename old transaction log file \"%s\": %m"
 msgstr "не удало�ь переименовать �тарый файл журнала транзакций \"%s\": %m"
 
-#: access/transam/xlog.c:3813
+#: access/transam/xlog.c:3824
 #, c-format
 msgid "could not remove old transaction log file \"%s\": %m"
 msgstr "не удало�ь �тереть �тарый файл журнала транзакций \"%s\": %m"
 
-#: access/transam/xlog.c:3846 access/transam/xlog.c:3856
+#: access/transam/xlog.c:3857 access/transam/xlog.c:3867
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "требуемый каталог WAL \"%s\" не �уще�твует"
 
-#: access/transam/xlog.c:3862
+#: access/transam/xlog.c:3873
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "�оздаёт�� от�ут�твующий каталог WAL \"%s\""
 
-#: access/transam/xlog.c:3865
+#: access/transam/xlog.c:3876
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "не удало�ь �оздать от�ут�твующий каталог \"%s\": %m"
 
-#: access/transam/xlog.c:3896
+#: access/transam/xlog.c:3907
 #, c-format
 msgid "removing transaction log backup history file \"%s\""
 msgstr "удал�ет�� файл и�тории копировани� журнала: \"%s\""
 
-#: access/transam/xlog.c:3977
+#: access/transam/xlog.c:3988
 #, c-format
 msgid "unexpected timeline ID %u in log segment %s, offset %u"
 msgstr "неожиданный ID линии времени %u в �егменте журнала %s, �мещение %u"
 
-#: access/transam/xlog.c:4099
+#: access/transam/xlog.c:4110
 #, c-format
 msgid "new timeline %u is not a child of database system timeline %u"
 msgstr ""
 "нова� лини� времени %u не �вл�ет�� ответвлением линии времени �и�темы БД %u"
 
-#: access/transam/xlog.c:4113
+#: access/transam/xlog.c:4124
 #, c-format
 msgid ""
 "new timeline %u forked off current database system timeline %u before "
@@ -1572,56 +1520,56 @@
 "нова� лини� времени %u ответвила�ь от текущей линии времени базы данных %u "
 "до текущей точки во��тановлени� %X/%X"
 
-#: access/transam/xlog.c:4132
+#: access/transam/xlog.c:4143
 #, c-format
 msgid "new target timeline is %u"
 msgstr "нова� целева� лини� времени %u"
 
-#: access/transam/xlog.c:4212
+#: access/transam/xlog.c:4223
 #, c-format
 msgid "could not create control file \"%s\": %m"
 msgstr "не удало�ь �оздать файл \"%s\": %m"
 
-#: access/transam/xlog.c:4223 access/transam/xlog.c:4459
+#: access/transam/xlog.c:4234 access/transam/xlog.c:4470
 #, c-format
 msgid "could not write to control file: %m"
 msgstr "не удало�ь запи�ать в файл pg_control: %m"
 
-#: access/transam/xlog.c:4229 access/transam/xlog.c:4465
+#: access/transam/xlog.c:4240 access/transam/xlog.c:4476
 #, c-format
 msgid "could not fsync control file: %m"
 msgstr "не удало�ь �инхронизировать � ФС файл pg_control: %m"
 
-#: access/transam/xlog.c:4234 access/transam/xlog.c:4470
+#: access/transam/xlog.c:4245 access/transam/xlog.c:4481
 #, c-format
 msgid "could not close control file: %m"
 msgstr "не удало�ь закрыть файл pg_control: %m"
 
-#: access/transam/xlog.c:4252 access/transam/xlog.c:4448
+#: access/transam/xlog.c:4263 access/transam/xlog.c:4459
 #, c-format
 msgid "could not open control file \"%s\": %m"
 msgstr "не удало�ь открыть файл \"%s\": %m"
 
-#: access/transam/xlog.c:4258
+#: access/transam/xlog.c:4269
 #, c-format
 msgid "could not read from control file: %m"
 msgstr "не удало�ь прочитать файл pg_control: %m"
 
-#: access/transam/xlog.c:4271 access/transam/xlog.c:4280
-#: access/transam/xlog.c:4304 access/transam/xlog.c:4311
-#: access/transam/xlog.c:4318 access/transam/xlog.c:4323
-#: access/transam/xlog.c:4330 access/transam/xlog.c:4337
-#: access/transam/xlog.c:4344 access/transam/xlog.c:4351
-#: access/transam/xlog.c:4358 access/transam/xlog.c:4365
-#: access/transam/xlog.c:4372 access/transam/xlog.c:4381
-#: access/transam/xlog.c:4388 access/transam/xlog.c:4397
-#: access/transam/xlog.c:4404 access/transam/xlog.c:4413
-#: access/transam/xlog.c:4420 utils/init/miscinit.c:1351
+#: access/transam/xlog.c:4282 access/transam/xlog.c:4291
+#: access/transam/xlog.c:4315 access/transam/xlog.c:4322
+#: access/transam/xlog.c:4329 access/transam/xlog.c:4334
+#: access/transam/xlog.c:4341 access/transam/xlog.c:4348
+#: access/transam/xlog.c:4355 access/transam/xlog.c:4362
+#: access/transam/xlog.c:4369 access/transam/xlog.c:4376
+#: access/transam/xlog.c:4383 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 utils/init/miscinit.c:1361
 #, c-format
 msgid "database files are incompatible with server"
 msgstr "файлы базы данных не �овме�тимы � �ервером"
 
-#: access/transam/xlog.c:4272
+#: access/transam/xlog.c:4283
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), "
@@ -1630,7 +1578,7 @@
 "Кла�тер баз данных был инициализирован � PG_CONTROL_VERSION %d (0x%08x), но "
 "�ервер �компилирован � PG_CONTROL_VERSION %d (0x%08x)."
 
-#: access/transam/xlog.c:4276
+#: access/transam/xlog.c:4287
 #, c-format
 msgid ""
 "This could be a problem of mismatched byte ordering.  It looks like you need "
@@ -1639,7 +1587,7 @@
 "Возможно, проблема вызвана разным пор�дком байт. Кажет��, вам надо выполнить "
 "initdb."
 
-#: access/transam/xlog.c:4281
+#: access/transam/xlog.c:4292
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
@@ -1648,18 +1596,18 @@
 "Кла�тер баз данных был инициализирован � PG_CONTROL_VERSION %d, но �ервер "
 "�компилирован � PG_CONTROL_VERSION %d."
 
-#: access/transam/xlog.c:4284 access/transam/xlog.c:4308
-#: access/transam/xlog.c:4315 access/transam/xlog.c:4320
+#: access/transam/xlog.c:4295 access/transam/xlog.c:4319
+#: access/transam/xlog.c:4326 access/transam/xlog.c:4331
 #, c-format
 msgid "It looks like you need to initdb."
 msgstr "Кажет��, вам надо выполнить initdb."
 
-#: access/transam/xlog.c:4295
+#: access/transam/xlog.c:4306
 #, c-format
 msgid "incorrect checksum in control file"
 msgstr "ошибка контрольной �уммы в файле pg_control"
 
-#: access/transam/xlog.c:4305
+#: access/transam/xlog.c:4316
 #, c-format
 msgid ""
 "The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
@@ -1668,7 +1616,7 @@
 "Кла�тер баз данных был инициализирован � CATALOG_VERSION_NO %d, но �ервер "
 "�компилирован � CATALOG_VERSION_NO %d."
 
-#: access/transam/xlog.c:4312
+#: access/transam/xlog.c:4323
 #, c-format
 msgid ""
 "The database cluster was initialized with MAXALIGN %d, but the server was "
@@ -1677,7 +1625,7 @@
 "Кла�тер баз данных был инициализирован � MAXALIGN %d, но �ервер "
 "�компилирован � MAXALIGN %d."
 
-#: access/transam/xlog.c:4319
+#: access/transam/xlog.c:4330
 #, c-format
 msgid ""
 "The database cluster appears to use a different floating-point number format "
@@ -1686,7 +1634,7 @@
 "Кажет��, в кла�тере баз данных и в программе �ервера и�пользуют�� разные "
 "форматы чи�ел � плавающей точкой."
 
-#: access/transam/xlog.c:4324
+#: access/transam/xlog.c:4335
 #, c-format
 msgid ""
 "The database cluster was initialized with BLCKSZ %d, but the server was "
@@ -1695,18 +1643,18 @@
 "Кла�тер баз данных был инициализирован � BLCKSZ %d, но �ервер �компилирован "
 "� BLCKSZ %d."
 
-#: access/transam/xlog.c:4327 access/transam/xlog.c:4334
-#: access/transam/xlog.c:4341 access/transam/xlog.c:4348
-#: access/transam/xlog.c:4355 access/transam/xlog.c:4362
-#: access/transam/xlog.c:4369 access/transam/xlog.c:4376
-#: access/transam/xlog.c:4384 access/transam/xlog.c:4391
-#: access/transam/xlog.c:4400 access/transam/xlog.c:4407
-#: access/transam/xlog.c:4416 access/transam/xlog.c:4423
+#: 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:4387
+#: access/transam/xlog.c:4395 access/transam/xlog.c:4402
+#: access/transam/xlog.c:4411 access/transam/xlog.c:4418
+#: access/transam/xlog.c:4427 access/transam/xlog.c:4434
 #, c-format
 msgid "It looks like you need to recompile or initdb."
 msgstr "Кажет��, вам надо перекомпилировать �ервер или выполнить initdb."
 
-#: access/transam/xlog.c:4331
+#: access/transam/xlog.c:4342
 #, c-format
 msgid ""
 "The database cluster was initialized with RELSEG_SIZE %d, but the server was "
@@ -1715,7 +1663,7 @@
 "Кла�тер баз данных был инициализирован � RELSEG_SIZE %d, но �ервер "
 "�компилирован � RELSEG_SIZE %d."
 
-#: access/transam/xlog.c:4338
+#: access/transam/xlog.c:4349
 #, c-format
 msgid ""
 "The database cluster was initialized with XLOG_BLCKSZ %d, but the server was "
@@ -1724,7 +1672,7 @@
 "Кла�тер баз данных был инициализирован � XLOG_BLCKSZ %d, но �ервер "
 "�компилирован � XLOG_BLCKSZ %d."
 
-#: access/transam/xlog.c:4345
+#: access/transam/xlog.c:4356
 #, c-format
 msgid ""
 "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server "
@@ -1733,7 +1681,7 @@
 "Кла�тер баз данных был инициализирован � XLOG_SEG_SIZE %d, но �ервер "
 "�компилирован � XLOG_SEG_SIZE %d."
 
-#: access/transam/xlog.c:4352
+#: access/transam/xlog.c:4363
 #, c-format
 msgid ""
 "The database cluster was initialized with NAMEDATALEN %d, but the server was "
@@ -1742,7 +1690,7 @@
 "Кла�тер баз данных был инициализирован � NAMEDATALEN %d, но �ервер "
 "�компилирован � NAMEDATALEN %d."
 
-#: access/transam/xlog.c:4359
+#: access/transam/xlog.c:4370
 #, c-format
 msgid ""
 "The database cluster was initialized with INDEX_MAX_KEYS %d, but the server "
@@ -1751,7 +1699,7 @@
 "Кла�тер баз данных был инициализирован � INDEX_MAX_KEYS %d, но �ервер "
 "�компилирован � INDEX_MAX_KEYS %d."
 
-#: access/transam/xlog.c:4366
+#: access/transam/xlog.c:4377
 #, c-format
 msgid ""
 "The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the "
@@ -1760,7 +1708,7 @@
 "Кла�тер баз данных был инициализирован � TOAST_MAX_CHUNK_SIZE %d, но �ервер "
 "�компилирован � TOAST_MAX_CHUNK_SIZE %d."
 
-#: access/transam/xlog.c:4373
+#: access/transam/xlog.c:4384
 #, c-format
 msgid ""
 "The database cluster was initialized with LOBLKSIZE %d, but the server was "
@@ -1769,7 +1717,7 @@
 "Кла�тер баз данных был инициализирован � LOBLKSIZE %d, но �ервер "
 "�компилирован � LOBLKSIZE %d."
 
-#: access/transam/xlog.c:4382
+#: access/transam/xlog.c:4393
 #, c-format
 msgid ""
 "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the "
@@ -1778,7 +1726,7 @@
 "Кла�тер баз данных был инициализирован без HAVE_INT64_TIMESTAMP, но �ервер "
 "�компилирован � HAVE_INT64_TIMESTAMP."
 
-#: access/transam/xlog.c:4389
+#: access/transam/xlog.c:4400
 #, c-format
 msgid ""
 "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the "
@@ -1787,7 +1735,7 @@
 "Кла�тер баз данных был инициализирован � HAVE_INT64_TIMESTAMP, но �ервер "
 "�компилирован без HAVE_INT64_TIMESTAMP."
 
-#: access/transam/xlog.c:4398
+#: access/transam/xlog.c:4409
 #, c-format
 msgid ""
 "The database cluster was initialized without USE_FLOAT4_BYVAL but the server "
@@ -1796,7 +1744,7 @@
 "Кла�тер баз данных был инициализирован без USE_FLOAT4_BYVAL, но �ервер "
 "�компилирован � USE_FLOAT4_BYVAL."
 
-#: access/transam/xlog.c:4405
+#: access/transam/xlog.c:4416
 #, c-format
 msgid ""
 "The database cluster was initialized with USE_FLOAT4_BYVAL but the server "
@@ -1805,7 +1753,7 @@
 "Кла�тер баз данных был инициализирован � USE_FLOAT4_BYVAL, но �ервер "
 "�компилирован без USE_FLOAT4_BYVAL."
 
-#: access/transam/xlog.c:4414
+#: access/transam/xlog.c:4425
 #, c-format
 msgid ""
 "The database cluster was initialized without USE_FLOAT8_BYVAL but the server "
@@ -1814,7 +1762,7 @@
 "Кла�тер баз данных был инициализирован без USE_FLOAT8_BYVAL, но �ервер "
 "�компилирован � USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4421
+#: access/transam/xlog.c:4432
 #, c-format
 msgid ""
 "The database cluster was initialized with USE_FLOAT8_BYVAL but the server "
@@ -1823,86 +1771,85 @@
 "Кла�тер баз данных был инициализирован � USE_FLOAT8_BYVAL, но �ервер был "
 "�компилирован без USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4847
+#: access/transam/xlog.c:4858
 #, c-format
 msgid "could not write bootstrap transaction log file: %m"
 msgstr "не удало�ь запи�ать начальный файл журнала транзакций: %m"
 
-#: access/transam/xlog.c:4853
+#: access/transam/xlog.c:4864
 #, c-format
 msgid "could not fsync bootstrap transaction log file: %m"
-msgstr "не удало�ь �инхронизировать � ФС начальный файл журнала транзакций: %m"
+msgstr "не удало�ь �бро�ить на ди�к начальный файл журнала транзакций: %m"
 
-#: access/transam/xlog.c:4858
+#: access/transam/xlog.c:4869
 #, c-format
 msgid "could not close bootstrap transaction log file: %m"
 msgstr "не удало�ь закрыть начальный файл журнала транзакций: %m"
 
-#: access/transam/xlog.c:4933
+#: access/transam/xlog.c:4944
 #, c-format
 msgid "could not open recovery command file \"%s\": %m"
 msgstr "не удало�ь открыть файл команд во��тановлени� \"%s\": %m"
 
-#: access/transam/xlog.c:4979 access/transam/xlog.c:5062
+#: access/transam/xlog.c:4990 access/transam/xlog.c:5075
 #, c-format
 msgid "invalid value for recovery parameter \"%s\": \"%s\""
 msgstr "неверное значение дл� параметра во��тановлени� \"%s\": \"%s\""
 
-#: access/transam/xlog.c:4982
+#: access/transam/xlog.c:4993
 #, c-format
 msgid "Valid values are \"pause\", \"promote\", and \"shutdown\"."
 msgstr "Допу�тимые значени�: \"pause\", \"promote\" и \"shutdown\"."
 
-#: access/transam/xlog.c:5001
+#: access/transam/xlog.c:5013
 #, c-format
 msgid "recovery_target_timeline is not a valid number: \"%s\""
 msgstr "recovery_target_timeline не �вл�ет�� допу�тимым чи�лом: \"%s\""
 
-#: access/transam/xlog.c:5017
+#: access/transam/xlog.c:5030
 #, c-format
 msgid "recovery_target_xid is not a valid number: \"%s\""
 msgstr "recovery_target_xid не �вл�ет�� допу�тимым чи�лом: \"%s\""
 
-#: access/transam/xlog.c:5048
+#: access/transam/xlog.c:5061
 #, c-format
 msgid "recovery_target_name is too long (maximum %d characters)"
 msgstr "длина recovery_target_name превышает предел (%d)"
 
-#: access/transam/xlog.c:5065
+#: access/transam/xlog.c:5078
 #, c-format
 msgid "The only allowed value is \"immediate\"."
 msgstr "Един�твенное допу�тимое значение: \"immediate\"."
 
-#: access/transam/xlog.c:5078 access/transam/xlog.c:5089
+#: access/transam/xlog.c:5091 access/transam/xlog.c:5102
 #: commands/extension.c:531 commands/extension.c:539 utils/misc/guc.c:5464
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "параметр \"%s\" требует логиче�кое значение"
 
-#: access/transam/xlog.c:5124
+#: access/transam/xlog.c:5137
 #, c-format
 msgid "parameter \"%s\" requires a temporal value"
 msgstr "параметр \"%s\" требует временное значение"
 
-#: access/transam/xlog.c:5126 catalog/dependency.c:984
-#: catalog/dependency.c:985 catalog/dependency.c:991 catalog/dependency.c:992
-#: catalog/dependency.c:1003 catalog/dependency.c:1004
-#: catalog/objectaddress.c:1053 commands/tablecmds.c:791
-#: commands/tablecmds.c:9415 commands/user.c:1027 commands/view.c:482
-#: libpq/auth.c:285 port/win32/security.c:51 storage/lmgr/deadlock.c:955
-#: storage/lmgr/proc.c:1177 utils/misc/guc.c:5486 utils/misc/guc.c:5579
-#: utils/misc/guc.c:9469 utils/misc/guc.c:9503 utils/misc/guc.c:9537
-#: utils/misc/guc.c:9571 utils/misc/guc.c:9606
+#: access/transam/xlog.c:5139 catalog/dependency.c:983 catalog/dependency.c:984
+#: catalog/dependency.c:990 catalog/dependency.c:991 catalog/dependency.c:1002
+#: catalog/dependency.c:1003 catalog/objectaddress.c:1053
+#: commands/tablecmds.c:792 commands/tablecmds.c:9513 commands/user.c:1027
+#: commands/view.c:499 libpq/auth.c:288 port/win32/security.c:51
+#: storage/lmgr/deadlock.c:955 storage/lmgr/proc.c:1177 utils/misc/guc.c:5486
+#: utils/misc/guc.c:5579 utils/misc/guc.c:9500 utils/misc/guc.c:9534
+#: utils/misc/guc.c:9568 utils/misc/guc.c:9602 utils/misc/guc.c:9637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: access/transam/xlog.c:5132
+#: access/transam/xlog.c:5146
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
 msgstr "нера�познанный параметр во��тановлени� \"%s\""
 
-#: access/transam/xlog.c:5143
+#: access/transam/xlog.c:5157
 #, c-format
 msgid ""
 "recovery command file \"%s\" specified neither primary_conninfo nor "
@@ -1911,7 +1858,7 @@
 "в файле команд во��тановлени� \"%s\" не указан параметр primary_conninfo или "
 "restore_command"
 
-#: access/transam/xlog.c:5145
+#: access/transam/xlog.c:5159
 #, c-format
 msgid ""
 "The database server will regularly poll the pg_xlog subdirectory to check "
@@ -1920,7 +1867,7 @@
 "Сервер БД будет регул�рно опрашивать подкаталог pg_xlog и провер�ть "
 "�одержащие�� в нём файлы."
 
-#: access/transam/xlog.c:5151
+#: access/transam/xlog.c:5166
 #, c-format
 msgid ""
 "recovery command file \"%s\" must specify restore_command when standby mode "
@@ -1929,62 +1876,68 @@
 "в файле команд во��тановлени� \"%s\" может от�ут�твовать restore_command, "
 "только е�ли �то резервный �ервер"
 
-#: access/transam/xlog.c:5181
+#: access/transam/xlog.c:5187
+#, c-format
+msgid "standby mode is not supported by single-user servers"
+msgstr ""
+"режим резервного �ервера не поддерживает�� однопользователь�ким �ервером"
+
+#: access/transam/xlog.c:5206
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "целева� лини� времени дл� во��тановлени� %u не �уще�твует"
 
-#: access/transam/xlog.c:5306
+#: access/transam/xlog.c:5327
 #, c-format
 msgid "archive recovery complete"
 msgstr "во��тановление архива завершено"
 
-#: access/transam/xlog.c:5365 access/transam/xlog.c:5593
+#: access/transam/xlog.c:5386 access/transam/xlog.c:5614
 #, c-format
 msgid "recovery stopping after reaching consistency"
 msgstr ""
 "во��тановление о�танавливает�� по�ле до�тижени� �огла�ованного �о�то�ни�"
 
-#: access/transam/xlog.c:5453
+#: access/transam/xlog.c:5474
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr ""
 "во��тановление о�танавливает�� перед фик�ированием транзакции %u, врем� %s"
 
-#: access/transam/xlog.c:5460
+#: access/transam/xlog.c:5481
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr ""
 "во��тановление о�танавливает�� перед прерыванием транзакции %u, врем� %s"
 
-#: access/transam/xlog.c:5505
+#: access/transam/xlog.c:5526
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "во��тановление о�танавливает�� в точке во��тановлени� \"%s\", врем� %s"
 
-#: access/transam/xlog.c:5573
+#: access/transam/xlog.c:5594
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr ""
 "во��тановление о�танавливает�� по�ле фик�ировани� транзакции %u, врем� %s"
 
-#: access/transam/xlog.c:5581
+#: access/transam/xlog.c:5602
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr ""
 "во��тановление о�танавливает�� по�ле прерывани� транзакции %u, врем� %s"
 
-#: access/transam/xlog.c:5620
+#: access/transam/xlog.c:5641
 #, c-format
 msgid "recovery has paused"
 msgstr "во��тановление прио�тановлено"
 
-#: access/transam/xlog.c:5621
+#: access/transam/xlog.c:5642
 #, c-format
 msgid "Execute pg_xlog_replay_resume() to continue."
 msgstr "Выполните pg_xlog_replay_resume() дл� продолжени�."
 
-#: access/transam/xlog.c:5824
+#: access/transam/xlog.c:5849
 #, c-format
 msgid ""
 "hot standby is not possible because %s = %d is a lower setting than on the "
@@ -1993,12 +1946,12 @@
 "режим гор�чего резерва невозможен, так как параметр %s = %d, меньше чем на "
 "главном �ервере (на нём было значение %d)"
 
-#: access/transam/xlog.c:5850
+#: access/transam/xlog.c:5875
 #, c-format
 msgid "WAL was generated with wal_level=minimal, data may be missing"
 msgstr "WAL был �оздан � параметром wal_level=minimal, возможна потер� данных"
 
-#: access/transam/xlog.c:5851
+#: access/transam/xlog.c:5876
 #, c-format
 msgid ""
 "This happens if you temporarily set wal_level=minimal without taking a new "
@@ -2007,7 +1960,7 @@
 "Это прои�ходит, е�ли вы на врем� у�тановили wal_level=minimal и не �делали "
 "резервную копию базу данных."
 
-#: access/transam/xlog.c:5862
+#: access/transam/xlog.c:5887
 #, c-format
 msgid ""
 "hot standby is not possible because wal_level was not set to \"hot_standby\" "
@@ -2016,7 +1969,7 @@
 "режим гор�чего резерва невозможен, так как на главном �ервере у�тановлен "
 "неподход�щий wal_level (должен быть \"hot_standby\" или выше)"
 
-#: access/transam/xlog.c:5863
+#: access/transam/xlog.c:5888
 #, c-format
 msgid ""
 "Either set wal_level to \"hot_standby\" on the master, or turn off "
@@ -2025,32 +1978,32 @@
 "Либо у�тановите дл� wal_level значение \"hot_standby\" на главном �ервере, "
 "либо выключите hot_standby зде�ь."
 
-#: access/transam/xlog.c:5920
+#: access/transam/xlog.c:5945
 #, c-format
 msgid "control file contains invalid data"
 msgstr "файл pg_control �одержит неверные данные"
 
-#: access/transam/xlog.c:5926
+#: access/transam/xlog.c:5951
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "�и�тема БД была выключена: %s"
 
-#: access/transam/xlog.c:5931
+#: access/transam/xlog.c:5956
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr "�и�тема БД была выключена в проце��е во��тановлени�: %s"
 
-#: access/transam/xlog.c:5935
+#: access/transam/xlog.c:5960
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr "выключение �и�темы БД было прервано; по�ледний момент работы: %s"
 
-#: access/transam/xlog.c:5939
+#: access/transam/xlog.c:5964
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "работа �и�темы БД была прервана во врем� во��тановлени�: %s"
 
-#: access/transam/xlog.c:5941
+#: access/transam/xlog.c:5966
 #, c-format
 msgid ""
 "This probably means that some data is corrupted and you will have to use the "
@@ -2059,14 +2012,14 @@
 "Это �корее в�его означает, что некоторые данные повреждены и вам придёт�� "
 "во��тановить БД из по�ледней резервной копии."
 
-#: access/transam/xlog.c:5945
+#: access/transam/xlog.c:5970
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr ""
 "работа �и�темы БД была прервана в проце��е во��тановлени�, врем� в журнале: "
 "%s"
 
-#: access/transam/xlog.c:5947
+#: access/transam/xlog.c:5972
 #, c-format
 msgid ""
 "If this has occurred more than once some data might be corrupted and you "
@@ -2075,58 +2028,58 @@
 "Е�ли �то прои�ходит по�то�нно, возможно, какие-то данные были и�порчены и "
 "дл� во��тановлени� �тоит выбрать более раннюю точку."
 
-#: access/transam/xlog.c:5951
+#: access/transam/xlog.c:5976
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr "работа �и�темы БД была прервана; по�ледний момент работы: %s"
 
-#: access/transam/xlog.c:6007
+#: access/transam/xlog.c:6032
 #, c-format
 msgid "entering standby mode"
 msgstr "переход в режим резервного �ервера"
 
-#: access/transam/xlog.c:6010
+#: access/transam/xlog.c:6035
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "начинает�� во��тановление точки во времени до XID %u"
 
-#: access/transam/xlog.c:6014
+#: access/transam/xlog.c:6039
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "начинает�� во��тановление точки во времени до %s"
 
-#: access/transam/xlog.c:6018
+#: access/transam/xlog.c:6043
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "начинает�� во��тановление точки во времени до \"%s\""
 
-#: access/transam/xlog.c:6022
+#: access/transam/xlog.c:6047
 #, c-format
 msgid "starting point-in-time recovery to earliest consistent point"
 msgstr ""
 "начинает�� во��тановление точки во времени до первой точки �огла�ованно�ти"
 
-#: access/transam/xlog.c:6025
+#: access/transam/xlog.c:6050
 #, c-format
 msgid "starting archive recovery"
 msgstr "начинает�� во��тановление архива"
 
-#: access/transam/xlog.c:6042
+#: access/transam/xlog.c:6067
 #, c-format
 msgid "Failed while allocating an XLog reading processor."
 msgstr "�е удало�ь разме�тить обработчик журнала транзакций."
 
-#: access/transam/xlog.c:6069 access/transam/xlog.c:6197
+#: access/transam/xlog.c:6094 access/transam/xlog.c:6222
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "запи�ь о контрольной точке по �мещению %X/%X"
 
-#: access/transam/xlog.c:6083
+#: access/transam/xlog.c:6108
 #, c-format
 msgid "could not find redo location referenced by checkpoint record"
 msgstr "не удало�ь найти положение REDO, указанное запи�ью контрольной точки"
 
-#: access/transam/xlog.c:6084 access/transam/xlog.c:6091
+#: access/transam/xlog.c:6109 access/transam/xlog.c:6116
 #, c-format
 msgid ""
 "If you are not restoring from a backup, try removing the file \"%s/"
@@ -2135,52 +2088,52 @@
 "Е�ли вы не во��танавливаете БД из резервной копии, попробуйте удалить файл "
 "\"%s/backup_label\"."
 
-#: access/transam/xlog.c:6090
+#: access/transam/xlog.c:6115
 #, c-format
 msgid "could not locate required checkpoint record"
 msgstr "не удало�ь �читать нужную запи�ь контрольной точки"
 
-#: access/transam/xlog.c:6116 commands/tablespace.c:641
+#: access/transam/xlog.c:6141 commands/tablespace.c:641
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "не удало�ь �оздать �имволиче�кую ��ылку \"%s\": %m"
 
-#: access/transam/xlog.c:6148
+#: access/transam/xlog.c:6173
 #, c-format
 msgid "ignoring file \"%s\" because no file \"%s\" exists"
 msgstr "файл \"%s\" игнорирует�� ввиду от�ут�тви� файла \"%s\""
 
-#: access/transam/xlog.c:6150 access/transam/xlog.c:10888
+#: access/transam/xlog.c:6175 access/transam/xlog.c:10986
 #, c-format
 msgid "File \"%s\" was renamed to \"%s\"."
 msgstr "Файл \"%s\" был переименован в \"%s\"."
 
-#: access/transam/xlog.c:6154
+#: access/transam/xlog.c:6179
 #, c-format
 msgid "ignoring \"%s\" file because no \"%s\" file exists"
 msgstr "файл \"%s\" игнорирует�� ввиду от�ут�тви� файла \"%s\""
 
-#: access/transam/xlog.c:6156
+#: access/transam/xlog.c:6181
 #, c-format
 msgid "Could not rename file \"%s\" to \"%s\": %m."
 msgstr "�е удало�ь переименовать файл \"%s\" в \"%s\" (%m)."
 
-#: access/transam/xlog.c:6207 access/transam/xlog.c:6222
+#: access/transam/xlog.c:6232 access/transam/xlog.c:6247
 #, c-format
 msgid "could not locate a valid checkpoint record"
 msgstr "не удало�ь �читать правильную запи�ь контрольной точки"
 
-#: access/transam/xlog.c:6216
+#: access/transam/xlog.c:6241
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "и�пользует�� предыдуща� запи�ь контрольной точки по �мещению %X/%X"
 
-#: access/transam/xlog.c:6260
+#: access/transam/xlog.c:6285
 #, c-format
 msgid "requested timeline %u is not a child of this server's history"
 msgstr "в и�тории �ервера нет ответвлени� запрошенной линии времени %u"
 
-#: access/transam/xlog.c:6262
+#: access/transam/xlog.c:6287
 #, c-format
 msgid ""
 "Latest checkpoint is at %X/%X on timeline %u, but in the history of the "
@@ -2189,7 +2142,7 @@
 "По�ледн�� контрольна� точка: %X/%X на линии времени %u, но в и�тории "
 "запрошенной линии времени �ервер ответвил�� � �той линии в %X/%X."
 
-#: access/transam/xlog.c:6278
+#: access/transam/xlog.c:6303
 #, c-format
 msgid ""
 "requested timeline %u does not contain minimum recovery point %X/%X on "
@@ -2198,22 +2151,22 @@
 "запрошенна� лини� времени %u не �одержит минимальную точку во��тановлени� %X/"
 "%X на линии времени %u"
 
-#: access/transam/xlog.c:6309
+#: access/transam/xlog.c:6334
 #, c-format
 msgid "invalid next transaction ID"
 msgstr "неверный ID �ледующей транзакции"
 
-#: access/transam/xlog.c:6392
+#: access/transam/xlog.c:6417
 #, c-format
 msgid "invalid redo in checkpoint record"
 msgstr "неверна� запи�ь REDO в контрольной точке"
 
-#: access/transam/xlog.c:6403
+#: access/transam/xlog.c:6428
 #, c-format
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "неверна� запи�ь REDO в контрольной точке выключени�"
 
-#: access/transam/xlog.c:6431
+#: access/transam/xlog.c:6456
 #, c-format
 msgid ""
 "database system was not properly shut down; automatic recovery in progress"
@@ -2221,19 +2174,19 @@
 "�и�тема БД была о�тановлена нештатно; производит�� автоматиче�кое "
 "во��тановление"
 
-#: access/transam/xlog.c:6435
+#: access/transam/xlog.c:6460
 #, c-format
 msgid "crash recovery starts in timeline %u and has target timeline %u"
 msgstr ""
 "во��тановление по�ле �бо� начинает�� на линии времени %u, целева� лини� "
 "времени: %u"
 
-#: access/transam/xlog.c:6479
+#: access/transam/xlog.c:6504
 #, c-format
 msgid "backup_label contains data inconsistent with control file"
 msgstr "backup_label �одержит данные, не �огла�ованные � файлом pg_control"
 
-#: access/transam/xlog.c:6480
+#: access/transam/xlog.c:6505
 #, c-format
 msgid ""
 "This means that the backup is corrupted and you will have to use another "
@@ -2242,44 +2195,44 @@
 "Это означает, что резервна� копи� повреждена и дл� во��тановлени� БД "
 "придёт�� и�пользовать другую копию."
 
-#: access/transam/xlog.c:6562
+#: access/transam/xlog.c:6579
 #, c-format
 msgid "initializing for hot standby"
 msgstr "инициализаци� дл� гор�чего резерва"
 
-#: access/transam/xlog.c:6694
+#: access/transam/xlog.c:6711
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "запи�ь REDO начинает�� �о �мещени� %X/%X"
 
-#: access/transam/xlog.c:6908
+#: access/transam/xlog.c:6925
 #, c-format
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr ""
 "запрошенна� точка о�тановки во��тановлени� предше�твует �огла�ованной точке "
 "во��тановлени�"
 
-#: access/transam/xlog.c:6946
+#: access/transam/xlog.c:6963
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "запи�и REDO обработаны до �мещени� %X/%X"
 
-#: access/transam/xlog.c:6951 access/transam/xlog.c:8885
+#: access/transam/xlog.c:6968 access/transam/xlog.c:8922
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "по�ледн�� завершённа� транзакци� была выполнена в %s"
 
-#: access/transam/xlog.c:6960
+#: access/transam/xlog.c:6977
 #, c-format
 msgid "redo is not required"
 msgstr "данные REDO не требуют��"
 
-#: access/transam/xlog.c:7035 access/transam/xlog.c:7039
+#: access/transam/xlog.c:7052 access/transam/xlog.c:7056
 #, c-format
 msgid "WAL ends before end of online backup"
 msgstr "WAL закончил�� без признака окончани� копировани�"
 
-#: access/transam/xlog.c:7036
+#: access/transam/xlog.c:7053
 #, c-format
 msgid ""
 "All WAL generated while online backup was taken must be available at "
@@ -2288,7 +2241,7 @@
 "В�е журналы WAL, �озданные во врем� резервного копировани� \"на ходу\", "
 "должны быть в наличии дл� во��тановлени�."
 
-#: access/transam/xlog.c:7040
+#: access/transam/xlog.c:7057
 #, c-format
 msgid ""
 "Online backup started with pg_start_backup() must be ended with "
@@ -2298,107 +2251,107 @@
 "должно закончить�� pg_stop_backup(), и дл� во��тановлени� должны быть "
 "до�тупны в�е журналы WAL."
 
-#: access/transam/xlog.c:7043
+#: access/transam/xlog.c:7060
 #, c-format
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL закончил�� до �огла�ованной точки во��тановлени�"
 
-#: access/transam/xlog.c:7070
+#: access/transam/xlog.c:7087
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "выбранный ID новой линии времени: %u"
 
-#: access/transam/xlog.c:7485
+#: access/transam/xlog.c:7498
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "�огла�ованное �о�то�ние во��тановлени� до�тигнуто по �мещению %X/%X"
 
-#: access/transam/xlog.c:7676
+#: access/transam/xlog.c:7689
 #, c-format
 msgid "invalid primary checkpoint link in control file"
 msgstr "неверна� ��ылка на первичную контрольную точку в файле pg_control"
 
-#: access/transam/xlog.c:7680
+#: access/transam/xlog.c:7693
 #, c-format
 msgid "invalid secondary checkpoint link in control file"
 msgstr "неверна� ��ылка на вторичную контрольную точку в файле pg_control"
 
-#: access/transam/xlog.c:7684
+#: access/transam/xlog.c:7697
 #, c-format
 msgid "invalid checkpoint link in backup_label file"
 msgstr "неверна� ��ылка на контрольную точку в файле backup_label"
 
-#: access/transam/xlog.c:7701
+#: access/transam/xlog.c:7714
 #, c-format
 msgid "invalid primary checkpoint record"
 msgstr "неверна� запи�ь первичной контрольной точки"
 
-#: access/transam/xlog.c:7705
+#: access/transam/xlog.c:7718
 #, c-format
 msgid "invalid secondary checkpoint record"
 msgstr "неверна� запи�ь вторичной контрольной точки"
 
-#: access/transam/xlog.c:7709
+#: access/transam/xlog.c:7722
 #, c-format
 msgid "invalid checkpoint record"
 msgstr "неверна� запи�ь контрольной точки"
 
-#: access/transam/xlog.c:7720
+#: access/transam/xlog.c:7733
 #, c-format
 msgid "invalid resource manager ID in primary checkpoint record"
 msgstr "неверный ID менеджера ре�ур�ов в запи�и первичной контрольной точки"
 
-#: access/transam/xlog.c:7724
+#: access/transam/xlog.c:7737
 #, c-format
 msgid "invalid resource manager ID in secondary checkpoint record"
 msgstr "неверный ID менеджера ре�ур�ов в запи�и вторичной контрольной точки"
 
-#: access/transam/xlog.c:7728
+#: access/transam/xlog.c:7741
 #, c-format
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "неверный ID менеджера ре�ур�ов в запи�и контрольной точки"
 
-#: access/transam/xlog.c:7740
+#: access/transam/xlog.c:7753
 #, c-format
 msgid "invalid xl_info in primary checkpoint record"
 msgstr "неверные флаги xl_info в запи�и первичной контрольной точки"
 
-#: access/transam/xlog.c:7744
+#: access/transam/xlog.c:7757
 #, c-format
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr "неверные флаги xl_info в запи�и вторичной контрольной точки"
 
-#: access/transam/xlog.c:7748
+#: access/transam/xlog.c:7761
 #, c-format
 msgid "invalid xl_info in checkpoint record"
 msgstr "неверные флаги xl_info в запи�и контрольной точки"
 
-#: access/transam/xlog.c:7759
+#: access/transam/xlog.c:7772
 #, c-format
 msgid "invalid length of primary checkpoint record"
 msgstr "неверна� длина запи�и первичной контрольной точки"
 
-#: access/transam/xlog.c:7763
+#: access/transam/xlog.c:7776
 #, c-format
 msgid "invalid length of secondary checkpoint record"
 msgstr "неверна� длина запи�и вторичной контрольной точки"
 
-#: access/transam/xlog.c:7767
+#: access/transam/xlog.c:7780
 #, c-format
 msgid "invalid length of checkpoint record"
 msgstr "неверна� длина запи�и контрольной точки"
 
-#: access/transam/xlog.c:7937
+#: access/transam/xlog.c:7950
 #, c-format
 msgid "shutting down"
 msgstr "выключение"
 
-#: access/transam/xlog.c:7961
+#: access/transam/xlog.c:7974
 #, c-format
 msgid "database system is shut down"
 msgstr "�и�тема БД выключена"
 
-#: access/transam/xlog.c:8454
+#: access/transam/xlog.c:8467
 #, c-format
 msgid ""
 "concurrent transaction log activity while database system is shutting down"
@@ -2406,29 +2359,29 @@
 "во врем� выключени� �и�темы баз данных отмечена активно�ть в журнале "
 "транзакций"
 
-#: access/transam/xlog.c:8705
+#: access/transam/xlog.c:8721
 #, c-format
 msgid "skipping restartpoint, recovery has already ended"
 msgstr ""
 "�оздание точки перезапу�ка пропу�кает��, во��тановление уже закончило�ь"
 
-#: access/transam/xlog.c:8728
+#: access/transam/xlog.c:8744
 #, c-format
 msgid "skipping restartpoint, already performed at %X/%X"
 msgstr ""
 "�оздание точки перезапу�ка пропу�кает��, она уже �оздана по �мещению %X/%X"
 
-#: access/transam/xlog.c:8883
+#: access/transam/xlog.c:8920
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "точка перезапу�ка во��тановлени� по �мещению %X/%X"
 
-#: access/transam/xlog.c:9016
+#: access/transam/xlog.c:9053
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "точка во��тановлени� \"%s\" �оздана по �мещению %X/%X"
 
-#: access/transam/xlog.c:9146
+#: access/transam/xlog.c:9183
 #, c-format
 msgid ""
 "unexpected previous timeline ID %u (current timeline ID %u) in checkpoint "
@@ -2437,57 +2390,58 @@
 "неожиданный ID предыдущей линии времени %u (ID текущей линии времени %u) в "
 "запи�и контрольной точки"
 
-#: access/transam/xlog.c:9155
+#: access/transam/xlog.c:9192
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "неожиданный ID линии времени %u (по�ле %u) в запи�и контрольной точки"
 
-#: access/transam/xlog.c:9171
+# skip-rule: capital-letter-first
+#: access/transam/xlog.c:9208
 #, c-format
 msgid ""
 "unexpected timeline ID %u in checkpoint record, before reaching minimum "
 "recovery point %X/%X on timeline %u"
 msgstr ""
 "неожиданный ID линии времени %u в запи�и контрольной точки, до до�тижени� "
-"минимальной к.т. %X/%X на линии времени %u"
+"минимальной к. т. %X/%X на линии времени %u"
 
-#: access/transam/xlog.c:9242
+#: access/transam/xlog.c:9279
 #, c-format
 msgid "online backup was canceled, recovery cannot continue"
 msgstr ""
 "резервное копирование \"на ходу\" было отменено, продолжить во��тановление "
 "нельз�"
 
-#: access/transam/xlog.c:9298 access/transam/xlog.c:9345
-#: access/transam/xlog.c:9368
+#: access/transam/xlog.c:9335 access/transam/xlog.c:9382
+#: access/transam/xlog.c:9405
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
 msgstr ""
 "неожиданный ID линии времени %u (должен быть %u) в запи�и точки "
 "во��тановлени�"
 
-#: access/transam/xlog.c:9645
+#: access/transam/xlog.c:9682
 #, c-format
 msgid "could not fsync log segment %s: %m"
 msgstr "не удало�ь �инхронизировать � ФС �егмент журнала %s: %m"
 
-#: access/transam/xlog.c:9669
+#: access/transam/xlog.c:9706
 #, c-format
 msgid "could not fsync log file %s: %m"
 msgstr "не удало�ь �инхронизировать � ФС файл журнала %s: %m"
 
-#: access/transam/xlog.c:9677
+#: access/transam/xlog.c:9714
 #, c-format
 msgid "could not fsync write-through log file %s: %m"
 msgstr "не удало�ь �инхронизировать � ФС файл журнала �квозной запи�и %s: %m"
 
-#: access/transam/xlog.c:9686
+#: access/transam/xlog.c:9723
 #, c-format
 msgid "could not fdatasync log file %s: %m"
 msgstr ""
 "не удало�ь �инхронизировать � ФС данные (fdatasync) файла журнала %s: %m"
 
-#: access/transam/xlog.c:9778 access/transam/xlog.c:10249
+#: access/transam/xlog.c:9815 access/transam/xlog.c:10319
 #: access/transam/xlogfuncs.c:121 access/transam/xlogfuncs.c:150
 #: access/transam/xlogfuncs.c:189 access/transam/xlogfuncs.c:210
 #: access/transam/xlogfuncs.c:280 access/transam/xlogfuncs.c:336
@@ -2495,20 +2449,20 @@
 msgid "recovery is in progress"
 msgstr "идёт проце�� во��тановлени�"
 
-#: access/transam/xlog.c:9779 access/transam/xlog.c:10250
+#: access/transam/xlog.c:9816 access/transam/xlog.c:10320
 #: access/transam/xlogfuncs.c:122 access/transam/xlogfuncs.c:151
 #: access/transam/xlogfuncs.c:190 access/transam/xlogfuncs.c:211
 #, c-format
 msgid "WAL control functions cannot be executed during recovery."
 msgstr "Функции управлени� WAL нельз� и�пользовать в проце��е во��тановлени�."
 
-#: access/transam/xlog.c:9788 access/transam/xlog.c:10259
+#: access/transam/xlog.c:9825 access/transam/xlog.c:10329
 #, c-format
 msgid "WAL level not sufficient for making an online backup"
 msgstr ""
 "Выбранный уровень WAL недо�таточен дл� резервного копировани� \"на ходу\""
 
-#: access/transam/xlog.c:9789 access/transam/xlog.c:10260
+#: access/transam/xlog.c:9826 access/transam/xlog.c:10330
 #: access/transam/xlogfuncs.c:157
 #, c-format
 msgid ""
@@ -2518,23 +2472,23 @@
 "У�тановите wal_level \"archive\", \"hot_standby\" или \"logical\" при "
 "запу�ке �ервера."
 
-#: access/transam/xlog.c:9794
+#: access/transam/xlog.c:9831
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "длина метки резервной копии превышает предел (%d байт)"
 
-#: access/transam/xlog.c:9826 access/transam/xlog.c:10096
-#: access/transam/xlog.c:10132
+#: access/transam/xlog.c:9868 access/transam/xlog.c:10138
+#: access/transam/xlog.c:10174
 #, c-format
 msgid "a backup is already in progress"
-msgstr "резервное копирование уже запущено"
+msgstr "резервное копирование уже выполн�ет��"
 
-#: access/transam/xlog.c:9827
+#: access/transam/xlog.c:9869
 #, c-format
 msgid "Run pg_stop_backup() and try again."
 msgstr "Выполните pg_stop_backup() и повторите операцию."
 
-#: access/transam/xlog.c:9922
+#: access/transam/xlog.c:9964
 #, c-format
 msgid ""
 "WAL generated with full_page_writes=off was replayed since last restartpoint"
@@ -2542,7 +2496,7 @@
 "По�ле по�ледней точки перезапу�ка был во�произведён WAL, �озданный в режиме "
 "full_page_writes=off."
 
-#: access/transam/xlog.c:9924 access/transam/xlog.c:10414
+#: access/transam/xlog.c:9966 access/transam/xlog.c:10512
 #, c-format
 msgid ""
 "This means that the backup being taken on the standby is corrupt and should "
@@ -2554,39 +2508,39 @@
 "CHECKPOINT на главном �ервере, а затем попробуйте резервное копирование \"на "
 "ходу\" ещё раз."
 
-#: access/transam/xlog.c:9990 replication/basebackup.c:1035
+#: access/transam/xlog.c:10032 replication/basebackup.c:1023
 #: utils/adt/misc.c:378
 #, c-format
 msgid "could not read symbolic link \"%s\": %m"
 msgstr "не удало�ь прочитать �имволиче�кую ��ылку \"%s\": %m"
 
-#: access/transam/xlog.c:9997 replication/basebackup.c:1040
+#: access/transam/xlog.c:10039 replication/basebackup.c:1028
 #: utils/adt/misc.c:383
 #, c-format
 msgid "symbolic link \"%s\" target is too long"
 msgstr "целевой путь �имволиче�кой ��ылки \"%s\" �лишком длинный"
 
-#: access/transam/xlog.c:10050 commands/tablespace.c:391
-#: commands/tablespace.c:553 replication/basebackup.c:1056
-#: utils/adt/misc.c:391
+#: access/transam/xlog.c:10092 commands/tablespace.c:391
+#: commands/tablespace.c:553 replication/basebackup.c:1044 utils/adt/misc.c:391
 #, c-format
 msgid "tablespaces are not supported on this platform"
 msgstr "табличные про�тран�тва не поддерживают�� на �той платформе"
 
-#: access/transam/xlog.c:10090 access/transam/xlog.c:10126
-#: access/transam/xlog.c:10300 access/transam/xlogarchive.c:106
-#: access/transam/xlogarchive.c:265 commands/copy.c:1738 commands/copy.c:2764
-#: commands/extension.c:3026 commands/tablespace.c:860
-#: replication/basebackup.c:404 replication/basebackup.c:472
-#: replication/logical/snapbuild.c:1478 storage/file/copydir.c:72
-#: storage/file/copydir.c:115 storage/file/fd.c:2519 storage/file/fd.c:2611
-#: utils/adt/dbsize.c:68 utils/adt/dbsize.c:218 utils/adt/dbsize.c:298
-#: utils/adt/genfile.c:114 utils/adt/genfile.c:333 guc-file.l:1003
+#: access/transam/xlog.c:10132 access/transam/xlog.c:10168
+#: access/transam/xlog.c:10369 access/transam/xlogarchive.c:106
+#: access/transam/xlogarchive.c:265 commands/copy.c:1778 commands/copy.c:2804
+#: commands/extension.c:3029 commands/tablespace.c:782
+#: commands/tablespace.c:873 replication/basebackup.c:406
+#: replication/basebackup.c:474 replication/logical/snapbuild.c:1479
+#: storage/file/copydir.c:72 storage/file/copydir.c:115 storage/file/fd.c:2703
+#: storage/file/fd.c:2795 utils/adt/dbsize.c:68 utils/adt/dbsize.c:218
+#: utils/adt/dbsize.c:298 utils/adt/genfile.c:114 utils/adt/genfile.c:333
+#: guc-file.l:1003
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удало�ь получить информацию о файле \"%s\": %m"
 
-#: access/transam/xlog.c:10097 access/transam/xlog.c:10133
+#: access/transam/xlog.c:10139 access/transam/xlog.c:10175
 #, c-format
 msgid ""
 "If you're sure there is no backup in progress, remove file \"%s\" and try "
@@ -2595,31 +2549,36 @@
 "Е�ли вы �читаете, что информаци� о резервном копировании неверна, удалите "
 "файл \"%s\" и попробуйте �нова."
 
-#: access/transam/xlog.c:10114 access/transam/xlog.c:10150
-#: access/transam/xlog.c:10475
+#: access/transam/xlog.c:10156 access/transam/xlog.c:10192
+#: access/transam/xlog.c:10573
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "не удало�ь запи�ать файл \"%s\": %m"
 
-#: access/transam/xlog.c:10304
+#: access/transam/xlog.c:10346
+#, c-format
+msgid "exclusive backup not in progress"
+msgstr "монопольное резервное копирование не выполн�ет��"
+
+#: access/transam/xlog.c:10373
 #, c-format
 msgid "a backup is not in progress"
-msgstr "резервное копирование не запущено"
+msgstr "резервное копирование не выполн�ет��"
 
-#: access/transam/xlog.c:10349 access/transam/xlog.c:10362
-#: access/transam/xlog.c:10702 access/transam/xlog.c:10708
-#: access/transam/xlog.c:10792 access/transam/xlogfuncs.c:508
+#: access/transam/xlog.c:10447 access/transam/xlog.c:10460
+#: access/transam/xlog.c:10800 access/transam/xlog.c:10806
+#: access/transam/xlog.c:10890 access/transam/xlogfuncs.c:508
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "неверные данные в файле \"%s\""
 
-#: access/transam/xlog.c:10366 replication/basebackup.c:933
+#: access/transam/xlog.c:10464 replication/basebackup.c:935
 #, c-format
 msgid "the standby was promoted during online backup"
 msgstr ""
 "дежурный �ервер был повышен в проце��е резервного копировани� \"на ходу\""
 
-#: access/transam/xlog.c:10367 replication/basebackup.c:934
+#: access/transam/xlog.c:10465 replication/basebackup.c:936
 #, c-format
 msgid ""
 "This means that the backup being taken is corrupt and should not be used. "
@@ -2628,7 +2587,7 @@
 "Это означает, что �оздаваема� резервна� копи� и�порчена и и�пользовать её не "
 "�ледует. Попробуйте резервное копирование \"на ходу\" ещё раз."
 
-#: access/transam/xlog.c:10412
+#: access/transam/xlog.c:10510
 #, c-format
 msgid ""
 "WAL generated with full_page_writes=off was replayed during online backup"
@@ -2636,7 +2595,7 @@
 "В проце��е резервного копировани� \"на ходу\" был во�произведён WAL, "
 "�озданный в режиме full_page_writes=off"
 
-#: access/transam/xlog.c:10524
+#: access/transam/xlog.c:10622
 #, c-format
 msgid ""
 "pg_stop_backup cleanup done, waiting for required WAL segments to be archived"
@@ -2644,7 +2603,7 @@
 "очи�тка в pg_stop_backup выполнена, ожидают�� требуемые �егменты WAL дл� "
 "архивации"
 
-#: access/transam/xlog.c:10534
+#: access/transam/xlog.c:10632
 #, c-format
 msgid ""
 "pg_stop_backup still waiting for all required WAL segments to be archived "
@@ -2653,7 +2612,7 @@
 "pg_stop_backup в�ё ещё ждёт в�е требуемые �егменты WAL дл� архивации (прошло "
 "%d �ек.)"
 
-#: access/transam/xlog.c:10536
+#: access/transam/xlog.c:10634
 #, c-format
 msgid ""
 "Check that your archive_command is executing properly.  pg_stop_backup can "
@@ -2664,13 +2623,13 @@
 "можно отменить безопа�но, но резервна� копи� базы данных будет непригодна "
 "без в�ех �егментов WAL."
 
-#: access/transam/xlog.c:10543
+#: access/transam/xlog.c:10641
 #, c-format
 msgid "pg_stop_backup complete, all required WAL segments have been archived"
 msgstr ""
 "команда pg_stop_backup завершена, в�е требуемые �егменты WAL заархивированы"
 
-#: access/transam/xlog.c:10547
+#: access/transam/xlog.c:10645
 #, c-format
 msgid ""
 "WAL archiving is not enabled; you must ensure that all required WAL segments "
@@ -2679,35 +2638,35 @@
 "архиваци� WAL не на�троена; вы должны обе�печить копирование в�ех требуемых "
 "�егментов WAL другими �ред�твами дл� получени� резервной копии"
 
-#: access/transam/xlog.c:10831
+#: access/transam/xlog.c:10929
 #, c-format
 msgid "xlog redo %s"
 msgstr "XLOG-запи�ь REDO: %s"
 
-#: access/transam/xlog.c:10877
+#: access/transam/xlog.c:10975
 #, c-format
 msgid "online backup mode was not canceled"
 msgstr "режим копировани� \"на ходу\" не был отменён"
 
-#: access/transam/xlog.c:10878
+#: access/transam/xlog.c:10976
 #, c-format
 msgid "File \"%s\" could not be renamed to \"%s\": %m."
 msgstr "�е удало�ь переименовать файл \"%s\" в \"%s\": %m."
 
-#: access/transam/xlog.c:10887 access/transam/xlog.c:10899
-#: access/transam/xlog.c:10909
+#: access/transam/xlog.c:10985 access/transam/xlog.c:10997
+#: access/transam/xlog.c:11007
 #, c-format
 msgid "online backup mode canceled"
 msgstr "режим копировани� \"на ходу\" отменён"
 
-#: access/transam/xlog.c:10900
+#: access/transam/xlog.c:10998
 #, c-format
 msgid ""
 "Files \"%s\" and \"%s\" were renamed to \"%s\" and \"%s\", respectively."
 msgstr ""
 "Файлы \"%s\" и \"%s\" были переименованы в \"%s\" и \"%s\", �оответ�твенно."
 
-#: access/transam/xlog.c:10910
+#: access/transam/xlog.c:11008
 #, c-format
 msgid ""
 "File \"%s\" was renamed to \"%s\", but file \"%s\" could not be renamed to "
@@ -2716,28 +2675,28 @@
 "Файл \"%s\" был переименован в \"%s\", но переименовать \"%s\" в \"%s\" не "
 "удало�ь: %m."
 
-#: access/transam/xlog.c:11032 replication/logical/logicalfuncs.c:171
-#: replication/walreceiver.c:932 replication/walsender.c:2112
+#: access/transam/xlog.c:11130 replication/logical/logicalfuncs.c:171
+#: replication/walreceiver.c:932 replication/walsender.c:2111
 #, c-format
 msgid "could not seek in log segment %s to offset %u: %m"
 msgstr "не удало�ь переме�тить�� в �егменте журнала %s к �мещению %u: %m"
 
-#: access/transam/xlog.c:11044
+#: access/transam/xlog.c:11142
 #, c-format
 msgid "could not read from log segment %s, offset %u: %m"
 msgstr "не удало�ь прочитать �егмент журнала %s, �мещение %u: %m"
 
-#: access/transam/xlog.c:11518
+#: access/transam/xlog.c:11616
 #, c-format
 msgid "received promote request"
 msgstr "получен запро� повышени� �тату�а"
 
-#: access/transam/xlog.c:11531
+#: access/transam/xlog.c:11629
 #, c-format
 msgid "trigger file found: %s"
 msgstr "найден файл триггера: %s"
 
-#: access/transam/xlog.c:11540
+#: access/transam/xlog.c:11638
 #, c-format
 msgid "could not stat trigger file \"%s\": %m"
 msgstr "не удало�ь получить информацию о файле триггера \"%s\": %m"
@@ -2765,12 +2724,19 @@
 msgid "%s \"%s\": %s"
 msgstr "%s \"%s\": %s"
 
-#: access/transam/xlogarchive.c:529 access/transam/xlogarchive.c:598
+#: access/transam/xlogarchive.c:458 replication/logical/snapbuild.c:1602
+#: replication/slot.c:496 replication/slot.c:953 replication/slot.c:1065
+#: storage/file/fd.c:501 storage/file/fd.c:559 utils/time/snapmgr.c:1146
+#, c-format
+msgid "could not rename file \"%s\" to \"%s\": %m"
+msgstr "не удало�ь переименовать файл \"%s\" в \"%s\": %m"
+
+#: access/transam/xlogarchive.c:525 access/transam/xlogarchive.c:589
 #, c-format
 msgid "could not create archive status file \"%s\": %m"
 msgstr "не удало�ь �оздать файл �о�то�ни� архива \"%s\": %m"
 
-#: access/transam/xlogarchive.c:537 access/transam/xlogarchive.c:606
+#: access/transam/xlogarchive.c:533 access/transam/xlogarchive.c:597
 #, c-format
 msgid "could not write archive status file \"%s\": %m"
 msgstr "не удало�ь запи�ать файл �о�то�ни� архива \"%s\": %m"
@@ -2783,10 +2749,10 @@
 "репликации"
 
 #: access/transam/xlogfuncs.c:67 commands/tablespace.c:705
-#: commands/tablespace.c:715 postmaster/postmaster.c:1389
-#: replication/basebackup.c:292 replication/basebackup.c:632
-#: storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:1985
-#: storage/file/fd.c:2584 storage/ipc/dsm.c:300 utils/adt/genfile.c:439
+#: commands/tablespace.c:715 postmaster/postmaster.c:1404
+#: replication/basebackup.c:294 replication/basebackup.c:634
+#: storage/file/copydir.c:53 storage/file/copydir.c:96 storage/file/fd.c:2169
+#: storage/file/fd.c:2768 storage/ipc/dsm.c:300 utils/adt/genfile.c:439
 #: utils/adt/misc.c:291 utils/misc/tzparser.c:339
 #, c-format
 msgid "could not open directory \"%s\": %m"
@@ -2808,6 +2774,7 @@
 msgid "WAL level not sufficient for creating a restore point"
 msgstr "Выбранный уровень WAL не до�таточен дл� �оздани� точки во��тановлени�"
 
+# well-spelled: �имв
 #: access/transam/xlogfuncs.c:164
 #, c-format
 msgid "value too long for restore point (maximum %d characters)"
@@ -2939,23 +2906,23 @@
 "нарушение по�ледовательно�ти ID линии времени %u (по�ле %u) в �егменте "
 "журнала %s, �мещение %u"
 
-#: access/transam/xlogreader.c:1024
+#: access/transam/xlogreader.c:1061
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "идентификатор блока %u идёт не по пор�дку в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1046
+#: access/transam/xlogreader.c:1083
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA у�тановлен, но данных в позиции %X/%X нет"
 
-#: access/transam/xlogreader.c:1053
+#: access/transam/xlogreader.c:1090
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr ""
 "BKPBLOCK_HAS_DATA не у�тановлен, но длина данных равна %u в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1086
+#: access/transam/xlogreader.c:1123
 #, c-format
 msgid ""
 "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at "
@@ -2964,21 +2931,21 @@
 "BKPIMAGE_HAS_HOLE у�тановлен, но дл� пропу�ка заданы �мещение %u и длина %u "
 "при длине образа блока %u в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1102
+#: access/transam/xlogreader.c:1139
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr ""
 "BKPIMAGE_HAS_HOLE не у�тановлен, но дл� пропу�ка заданы �мещение %u и длина "
 "%u в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1117
+#: access/transam/xlogreader.c:1154
 #, c-format
 msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
 msgstr ""
 "BKPIMAGE_IS_COMPRESSED у�тановлен, но длина образа блока равна %u в позиции "
 "%X/%X"
 
-#: access/transam/xlogreader.c:1132
+#: access/transam/xlogreader.c:1169
 #, c-format
 msgid ""
 "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image "
@@ -2987,40 +2954,40 @@
 "ни BKPIMAGE_HAS_HOLE, ни BKPIMAGE_IS_COMPRESSED не у�тановлены, но длина "
 "образа блока равна %u в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1148
+#: access/transam/xlogreader.c:1185
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr ""
 "BKPBLOCK_SAME_REL у�тановлен, но предыдущее значение не задано в позиции %X/"
 "%X"
 
-#: access/transam/xlogreader.c:1160
+#: access/transam/xlogreader.c:1197
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "неверный идентификатор блока %u в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1225
+#: access/transam/xlogreader.c:1262
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "запи�ь � неверной длиной в позиции %X/%X"
 
-#: access/transam/xlogreader.c:1314
+#: access/transam/xlogreader.c:1351
 #, c-format
 msgid "invalid compressed image at %X/%X, block %d"
 msgstr "неверный �жатый образ в позиции %X/%X, блок %d"
 
-#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:779 tcop/postgres.c:3485
+#: bootstrap/bootstrap.c:268 postmaster/postmaster.c:790 tcop/postgres.c:3500
 #, c-format
 msgid "--%s requires a value"
 msgstr "дл� --%s требует�� значение"
 
-#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:784 tcop/postgres.c:3490
+#: bootstrap/bootstrap.c:273 postmaster/postmaster.c:795 tcop/postgres.c:3505
 #, c-format
 msgid "-c %s requires a value"
 msgstr "дл� -c %s требует�� значение"
 
-#: bootstrap/bootstrap.c:284 postmaster/postmaster.c:796
-#: postmaster/postmaster.c:809
+#: bootstrap/bootstrap.c:284 postmaster/postmaster.c:807
+#: postmaster/postmaster.c:820
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Дл� дополнительной информации попробуйте \"%s --help\".\n"
@@ -3142,7 +3109,7 @@
 msgid "column privileges are only valid for relations"
 msgstr "права дл� �толбцов применимы только к отношени�м"
 
-#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4651
+#: catalog/aclchk.c:676 catalog/aclchk.c:3874 catalog/aclchk.c:4656
 #: catalog/objectaddress.c:854 catalog/pg_largeobject.c:113
 #: storage/large_object/inv_api.c:291
 #, c-format
@@ -3150,19 +3117,19 @@
 msgstr "большой объект %u не �уще�твует"
 
 #: catalog/aclchk.c:863 catalog/aclchk.c:871 commands/collationcmds.c:92
-#: commands/copy.c:1010 commands/copy.c:1028 commands/copy.c:1036
-#: commands/copy.c:1044 commands/copy.c:1052 commands/copy.c:1060
-#: commands/copy.c:1068 commands/copy.c:1076 commands/copy.c:1084
-#: commands/copy.c:1100 commands/copy.c:1114 commands/copy.c:1133
-#: commands/copy.c:1148 commands/dbcommands.c:155 commands/dbcommands.c:163
+#: commands/copy.c:1050 commands/copy.c:1068 commands/copy.c:1076
+#: commands/copy.c:1084 commands/copy.c:1092 commands/copy.c:1100
+#: commands/copy.c:1108 commands/copy.c:1116 commands/copy.c:1124
+#: commands/copy.c:1140 commands/copy.c:1154 commands/copy.c:1173
+#: commands/copy.c:1188 commands/dbcommands.c:155 commands/dbcommands.c:163
 #: commands/dbcommands.c:171 commands/dbcommands.c:179
 #: commands/dbcommands.c:187 commands/dbcommands.c:195
 #: commands/dbcommands.c:203 commands/dbcommands.c:211
 #: commands/dbcommands.c:219 commands/dbcommands.c:1397
 #: commands/dbcommands.c:1405 commands/dbcommands.c:1413
-#: commands/dbcommands.c:1421 commands/extension.c:1244
-#: commands/extension.c:1252 commands/extension.c:1260
-#: commands/extension.c:2677 commands/foreigncmds.c:539
+#: commands/dbcommands.c:1421 commands/extension.c:1247
+#: commands/extension.c:1255 commands/extension.c:1263
+#: commands/extension.c:2680 commands/foreigncmds.c:539
 #: commands/foreigncmds.c:548 commands/functioncmds.c:525
 #: commands/functioncmds.c:619 commands/functioncmds.c:627
 #: commands/functioncmds.c:635 commands/functioncmds.c:643
@@ -3190,21 +3157,21 @@
 msgstr "права по умолчанию нельз� определить дл� �толбцов"
 
 #: catalog/aclchk.c:1483 catalog/objectaddress.c:1338 commands/analyze.c:378
-#: commands/copy.c:4383 commands/sequence.c:1491 commands/tablecmds.c:5167
-#: commands/tablecmds.c:5273 commands/tablecmds.c:5333
-#: commands/tablecmds.c:5446 commands/tablecmds.c:5503
-#: commands/tablecmds.c:5597 commands/tablecmds.c:5693
-#: commands/tablecmds.c:7845 commands/tablecmds.c:8050
-#: commands/tablecmds.c:8470 commands/trigger.c:643 parser/analyze.c:2160
-#: parser/parse_relation.c:2542 parser/parse_relation.c:2604
-#: parser/parse_target.c:940 parser/parse_type.c:127 utils/adt/acl.c:2839
-#: utils/adt/ruleutils.c:1856
+#: commands/copy.c:4423 commands/sequence.c:1491 commands/tablecmds.c:5168
+#: commands/tablecmds.c:5274 commands/tablecmds.c:5334
+#: commands/tablecmds.c:5447 commands/tablecmds.c:5504
+#: commands/tablecmds.c:5598 commands/tablecmds.c:5694
+#: commands/tablecmds.c:7886 commands/tablecmds.c:8148
+#: commands/tablecmds.c:8568 commands/trigger.c:643 parser/analyze.c:2157
+#: parser/parse_relation.c:2628 parser/parse_relation.c:2690
+#: parser/parse_target.c:951 parser/parse_type.c:127 utils/adt/acl.c:2839
+#: utils/adt/ruleutils.c:1859
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "�толбец \"%s\" в таблице \"%s\" не �уще�твует"
 
 #: catalog/aclchk.c:1748 catalog/objectaddress.c:1151 commands/sequence.c:1078
-#: commands/tablecmds.c:221 commands/tablecmds.c:11960 utils/adt/acl.c:2075
+#: commands/tablecmds.c:222 commands/tablecmds.c:12118 utils/adt/acl.c:2075
 #: utils/adt/acl.c:2105 utils/adt/acl.c:2137 utils/adt/acl.c:2169
 #: utils/adt/acl.c:2197 utils/adt/acl.c:2227
 #, c-format
@@ -3479,127 +3446,127 @@
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "атрибут %d отношени� � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:3588 catalog/aclchk.c:4502
+#: catalog/aclchk.c:3588 catalog/aclchk.c:4507
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "отношение � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:3687 catalog/aclchk.c:4920
+#: catalog/aclchk.c:3687 catalog/aclchk.c:4925
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "база данных � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:3741 catalog/aclchk.c:4580 tcop/fastpath.c:223
+#: catalog/aclchk.c:3741 catalog/aclchk.c:4585 tcop/fastpath.c:223
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "функци� � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:3795 catalog/aclchk.c:4606
+#: catalog/aclchk.c:3795 catalog/aclchk.c:4611
 #, c-format
 msgid "language with OID %u does not exist"
 msgstr "�зык � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:3959 catalog/aclchk.c:4678
+#: catalog/aclchk.c:3959 catalog/aclchk.c:4683
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "�хема � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4013 catalog/aclchk.c:4705
+#: catalog/aclchk.c:4013 catalog/aclchk.c:4710
 #, c-format
 msgid "tablespace with OID %u does not exist"
 msgstr "табличное про�тран�тво � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4071 catalog/aclchk.c:4839 commands/foreigncmds.c:325
+#: catalog/aclchk.c:4072 catalog/aclchk.c:4844 commands/foreigncmds.c:325
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "обёртка �торонних данных � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4132 catalog/aclchk.c:4866 commands/foreigncmds.c:461
+#: catalog/aclchk.c:4134 catalog/aclchk.c:4871 commands/foreigncmds.c:461
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "�торонний �ервер � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4191 catalog/aclchk.c:4205 catalog/aclchk.c:4528
+#: catalog/aclchk.c:4194 catalog/aclchk.c:4533
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "тип � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4554
+#: catalog/aclchk.c:4559
 #, c-format
 msgid "operator with OID %u does not exist"
 msgstr "оператор � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4731
+#: catalog/aclchk.c:4736
 #, c-format
 msgid "operator class with OID %u does not exist"
 msgstr "кла�� операторов � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4758
+#: catalog/aclchk.c:4763
 #, c-format
 msgid "operator family with OID %u does not exist"
 msgstr "�емей�тво операторов � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4785
+#: catalog/aclchk.c:4790
 #, c-format
 msgid "text search dictionary with OID %u does not exist"
 msgstr "�ловарь тек�тового пои�ка � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4812
+#: catalog/aclchk.c:4817
 #, c-format
 msgid "text search configuration with OID %u does not exist"
 msgstr "конфигураци� тек�тового пои�ка � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4893 commands/event_trigger.c:586
+#: catalog/aclchk.c:4898 commands/event_trigger.c:586
 #, c-format
 msgid "event trigger with OID %u does not exist"
 msgstr "�обытийный триггер � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4946
+#: catalog/aclchk.c:4951
 #, c-format
 msgid "collation with OID %u does not exist"
 msgstr "правило �ортировки � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:4972
+#: catalog/aclchk.c:4977
 #, c-format
 msgid "conversion with OID %u does not exist"
 msgstr "преобразование � OID %u не �уще�твует"
 
-#: catalog/aclchk.c:5013
+#: catalog/aclchk.c:5018
 #, c-format
 msgid "extension with OID %u does not exist"
 msgstr "ра�ширение � OID %u не �уще�твует"
 
-#: catalog/dependency.c:640
+#: catalog/dependency.c:639
 #, c-format
 msgid "cannot drop %s because %s requires it"
 msgstr "удалить объект %s нельз�, так как он нужен объекту %s"
 
-#: catalog/dependency.c:643
+#: catalog/dependency.c:642
 #, c-format
 msgid "You can drop %s instead."
 msgstr "Однако можно удалить %s."
 
-#: catalog/dependency.c:804 catalog/pg_shdepend.c:576
+#: catalog/dependency.c:803 catalog/pg_shdepend.c:576
 #, c-format
 msgid "cannot drop %s because it is required by the database system"
 msgstr "удалить объект %s нельз�, так как он нужен �и�теме баз данных"
 
-#: catalog/dependency.c:920
+#: catalog/dependency.c:919
 #, c-format
 msgid "drop auto-cascades to %s"
 msgstr "удаление автоматиче�ки ра�про�тран�ет�� на объект %s"
 
-#: catalog/dependency.c:932 catalog/dependency.c:941
+#: catalog/dependency.c:931 catalog/dependency.c:940
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s зави�ит от объекта %s"
 
-#: catalog/dependency.c:953 catalog/dependency.c:962
+#: catalog/dependency.c:952 catalog/dependency.c:961
 #, c-format
 msgid "drop cascades to %s"
 msgstr "удаление ра�про�тран�ет�� на объект %s"
 
-#: catalog/dependency.c:970 catalog/pg_shdepend.c:687
+#: catalog/dependency.c:969 catalog/pg_shdepend.c:687
 #, c-format
 msgid ""
 "\n"
@@ -3617,24 +3584,24 @@
 "\n"
 "и ещё %d объектов (�м. �пи�ок в протоколе �ервера)"
 
-#: catalog/dependency.c:982
+#: catalog/dependency.c:981
 #, c-format
 msgid "cannot drop %s because other objects depend on it"
 msgstr "удалить объект %s нельз�, так как от него зави��т другие объекты"
 
-#: catalog/dependency.c:986 catalog/dependency.c:993
+#: catalog/dependency.c:985 catalog/dependency.c:992
 #, c-format
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
 msgstr "Дл� удалени� зави�имых объектов и�пользуйте DROP ... CASCADE."
 
-#: catalog/dependency.c:990
+#: catalog/dependency.c:989
 #, c-format
 msgid "cannot drop desired object(s) because other objects depend on them"
 msgstr ""
 "удалить запрошенные объекты нельз�, так как от них зави��т другие объекты"
 
 #. translator: %d always has a value larger than 1
-#: catalog/dependency.c:999
+#: catalog/dependency.c:998
 #, c-format
 msgid "drop cascades to %d other object"
 msgid_plural "drop cascades to %d other objects"
@@ -3642,87 +3609,87 @@
 msgstr[1] "удаление ра�про�тран�ет�� на ещё %d объекта"
 msgstr[2] "удаление ра�про�тран�ет�� на ещё %d объектов"
 
-#: catalog/dependency.c:1622
+#: catalog/dependency.c:1621
 #, c-format
 msgid "constant of the type \"regrole\" cannot be used here"
 msgstr "кон�танту типа \"regrole\" зде�ь и�пользовать нельз�"
 
-#: catalog/heap.c:276
+#: catalog/heap.c:277
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "нет прав дл� �оздани� отношени� \"%s.%s\""
 
-#: catalog/heap.c:278
+#: catalog/heap.c:279
 #, c-format
 msgid "System catalog modifications are currently disallowed."
 msgstr "Изменение �и�темного каталога в текущем �о�то�нии запрещено."
 
-#: catalog/heap.c:413 commands/tablecmds.c:1434 commands/tablecmds.c:1887
-#: commands/tablecmds.c:4804
+#: catalog/heap.c:414 commands/tablecmds.c:1435 commands/tablecmds.c:1888
+#: commands/tablecmds.c:4805
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "мак�имальное чи�ло �толбцов в таблице: %d"
 
-#: catalog/heap.c:430 commands/tablecmds.c:5063
+#: catalog/heap.c:431 commands/tablecmds.c:5064
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr "им� �толбца \"%s\" конфликтует � �и�темным �толбцом"
 
-#: catalog/heap.c:446
+#: catalog/heap.c:447
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "им� �толбца \"%s\" указано неоднократно"
 
-#: catalog/heap.c:496
+#: catalog/heap.c:497
 #, c-format
 msgid "column \"%s\" has type \"unknown\""
 msgstr "�толбец \"%s\" имеет неизве�тный тип (UNKNOWN)"
 
-#: catalog/heap.c:497
+#: catalog/heap.c:498
 #, c-format
 msgid "Proceeding with relation creation anyway."
 msgstr "�е�мотр� на �то, �оздание отношени� продолжает��."
 
-#: catalog/heap.c:510
+#: catalog/heap.c:511
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "�толбец \"%s\" имеет п�евдотип %s"
 
-#: catalog/heap.c:540
+#: catalog/heap.c:541
 #, c-format
 msgid "composite type %s cannot be made a member of itself"
 msgstr "�о�тавной тип %s не может �одержать �еб� же"
 
-#: catalog/heap.c:582 commands/createas.c:373
+#: catalog/heap.c:583 commands/createas.c:201 commands/createas.c:497
 #, c-format
 msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr ""
 "дл� �толбца \"%s\" � �ортируемым типом %s не удало�ь получить правило "
 "�ортировки"
 
-#: catalog/heap.c:584 commands/createas.c:375 commands/indexcmds.c:1087
-#: commands/view.c:116 regex/regc_pg_locale.c:262 utils/adt/formatting.c:1514
-#: utils/adt/formatting.c:1566 utils/adt/formatting.c:1634
-#: utils/adt/formatting.c:1686 utils/adt/formatting.c:1755
-#: utils/adt/formatting.c:1819 utils/adt/like.c:213 utils/adt/selfuncs.c:5276
-#: utils/adt/varlena.c:1411 utils/adt/varlena.c:1800
+#: catalog/heap.c:585 commands/createas.c:204 commands/createas.c:500
+#: commands/indexcmds.c:1088 commands/view.c:103 regex/regc_pg_locale.c:262
+#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1754 utils/adt/formatting.c:1818 utils/adt/like.c:213
+#: utils/adt/selfuncs.c:5380 utils/adt/varlena.c:1411 utils/adt/varlena.c:1800
 #, c-format
 msgid "Use the COLLATE clause to set the collation explicitly."
-msgstr "Задайте правило �равнени� �вно в предложении COLLATE."
+msgstr "Задайте правило �ортировки �вно в предложении COLLATE."
 
-#: catalog/heap.c:1065 catalog/index.c:793 commands/tablecmds.c:2614
+#: catalog/heap.c:1066 catalog/index.c:793 commands/tablecmds.c:2615
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "отношение \"%s\" уже �уще�твует"
 
-#: catalog/heap.c:1081 catalog/pg_type.c:412 catalog/pg_type.c:722
+#: catalog/heap.c:1082 catalog/pg_type.c:412 catalog/pg_type.c:737
 #: commands/typecmds.c:235 commands/typecmds.c:782 commands/typecmds.c:1133
 #: commands/typecmds.c:1355 commands/typecmds.c:2109
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "тип \"%s\" уже �уще�твует"
 
-#: catalog/heap.c:1082
+#: catalog/heap.c:1083
 #, c-format
 msgid ""
 "A relation has an associated type of the same name, so you must use a name "
@@ -3731,66 +3698,81 @@
 "С отношением уже �в�зан тип � таким же именем; выберите им�, не "
 "конфликтующее � �уще�твующими типами."
 
-#: catalog/heap.c:1110
+#: catalog/heap.c:1111
 #, c-format
 msgid "pg_class heap OID value not set when in binary upgrade mode"
 msgstr "значение OID кучи в pg_class не задано в режиме двоичного обновлени�"
 
-#: catalog/heap.c:2290
+#: catalog/heap.c:2292
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "ограничение-проверка \"%s\" уже �уще�твует"
 
-#: catalog/heap.c:2445 catalog/pg_constraint.c:652 commands/tablecmds.c:6038
+#: catalog/heap.c:2459 catalog/pg_constraint.c:652 commands/tablecmds.c:6039
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "ограничение \"%s\" дл� отношени� \"%s\" уже �уще�твует"
 
-#: catalog/heap.c:2455
+#: catalog/heap.c:2466
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with non-inherited constraint on relation \"%s\""
 msgstr ""
 "ограничение \"%s\" конфликтует � нена�ледуемым ограничением таблицы \"%s\""
 
-#: catalog/heap.c:2469
+#: catalog/heap.c:2477
+#, c-format
+msgid ""
+"constraint \"%s\" conflicts with inherited constraint on relation \"%s\""
+msgstr ""
+"ограничение \"%s\" конфликтует � на�ледуемым ограничением таблицы \"%s\""
+
+#: catalog/heap.c:2487
+#, c-format
+msgid ""
+"constraint \"%s\" conflicts with NOT VALID constraint on relation \"%s\""
+msgstr ""
+"ограничение \"%s\" конфликтует � непроверенным (NOT VALID) ограничением "
+"таблицы \"%s\""
+
+#: catalog/heap.c:2492
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "�ли�ние ограничени� \"%s\" � уна�ледованным определением"
 
-#: catalog/heap.c:2562
+#: catalog/heap.c:2598
 #, c-format
 msgid "cannot use column references in default expression"
 msgstr "в выражении по умолчанию нельз� ��ылать�� на �толбцы"
 
-#: catalog/heap.c:2573
+#: catalog/heap.c:2609
 #, c-format
 msgid "default expression must not return a set"
 msgstr "выражение по умолчанию не может возвращать множе�тво"
 
-#: catalog/heap.c:2592 rewrite/rewriteHandler.c:1077
+#: catalog/heap.c:2628 rewrite/rewriteHandler.c:1077
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "�толбец \"%s\" имеет тип %s, но тип выражени� по умолчанию %s"
 
-#: catalog/heap.c:2597 commands/prepare.c:374 parser/parse_node.c:411
-#: parser/parse_target.c:528 parser/parse_target.c:778
-#: parser/parse_target.c:788 rewrite/rewriteHandler.c:1082
+#: catalog/heap.c:2633 commands/prepare.c:374 parser/parse_node.c:411
+#: parser/parse_target.c:539 parser/parse_target.c:789
+#: parser/parse_target.c:799 rewrite/rewriteHandler.c:1082
 #, c-format
 msgid "You will need to rewrite or cast the expression."
 msgstr "Перепишите выражение или преобразуйте его тип."
 
-#: catalog/heap.c:2644
+#: catalog/heap.c:2680
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "в ограничении-проверке можно ��ылать�� только на таблицу \"%s\""
 
-#: catalog/heap.c:2884
+#: catalog/heap.c:2920
 #, c-format
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "неподдерживаемое �очетание внешнего ключа � ON COMMIT"
 
-#: catalog/heap.c:2885
+#: catalog/heap.c:2921
 #, c-format
 msgid ""
 "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT "
@@ -3798,23 +3780,23 @@
 msgstr ""
 "Таблица \"%s\" ��ылает�� на \"%s\", и дл� них задан разный режим ON COMMIT."
 
-#: catalog/heap.c:2890
+#: catalog/heap.c:2926
 #, c-format
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr "опу�тошить таблицу, на которую ��ылает�� внешний ключ, нельз�"
 
-#: catalog/heap.c:2891
+#: catalog/heap.c:2927
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "Таблица \"%s\" ��ылает�� на \"%s\"."
 
-#: catalog/heap.c:2893
+#: catalog/heap.c:2929
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr ""
 "Опу�тошите таблицу \"%s\" параллельно или и�пользуйте TRUNCATE ... CASCADE."
 
-#: catalog/index.c:205 parser/parse_utilcmd.c:1436 parser/parse_utilcmd.c:1522
+#: catalog/index.c:205 parser/parse_utilcmd.c:1438 parser/parse_utilcmd.c:1524
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "таблица \"%s\" не может иметь не�колько первичных ключей"
@@ -3842,7 +3824,7 @@
 msgid "shared indexes cannot be created after initdb"
 msgstr "нельз� �оздать раздел�емые индек�ы по�ле initdb"
 
-#: catalog/index.c:785 commands/createas.c:100 commands/sequence.c:141
+#: catalog/index.c:785 commands/createas.c:249 commands/sequence.c:141
 #: parser/parse_utilcmd.c:185
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
@@ -3874,8 +3856,8 @@
 msgid "index \"%s\" was reindexed"
 msgstr "индек� \"%s\" был пере�троен"
 
-#: catalog/index.c:3389 commands/vacuumlazy.c:1135 commands/vacuumlazy.c:1211
-#: commands/vacuumlazy.c:1378 commands/vacuumlazy.c:1550
+#: catalog/index.c:3389 commands/vacuumlazy.c:1142 commands/vacuumlazy.c:1218
+#: commands/vacuumlazy.c:1385 commands/vacuumlazy.c:1557
 #, c-format
 msgid "%s."
 msgstr "%s."
@@ -3901,19 +3883,19 @@
 msgid "could not obtain lock on relation \"%s\""
 msgstr "не удало�ь получить блокировку таблицы \"%s\""
 
-#: catalog/namespace.c:414 parser/parse_relation.c:1137
+#: catalog/namespace.c:414 parser/parse_relation.c:1138
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "отношение \"%s.%s\" не �уще�твует"
 
-#: catalog/namespace.c:419 parser/parse_relation.c:1150
-#: parser/parse_relation.c:1158 utils/adt/regproc.c:1034
+#: catalog/namespace.c:419 parser/parse_relation.c:1151
+#: parser/parse_relation.c:1159 utils/adt/regproc.c:1035
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "отношение \"%s\" не �уще�твует"
 
-#: catalog/namespace.c:487 catalog/namespace.c:2852 commands/extension.c:1394
-#: commands/extension.c:1400
+#: catalog/namespace.c:487 catalog/namespace.c:2852 commands/extension.c:1397
+#: commands/extension.c:1403
 #, c-format
 msgid "no schema has been selected to create in"
 msgstr "�хема дл� �оздани� объектов не выбрана"
@@ -3954,13 +3936,13 @@
 msgid "text search configuration \"%s\" does not exist"
 msgstr "конфигураци� тек�тового пои�ка \"%s\" не �уще�твует"
 
-#: catalog/namespace.c:2646 parser/parse_expr.c:789 parser/parse_target.c:1130
+#: catalog/namespace.c:2646 parser/parse_expr.c:789 parser/parse_target.c:1141
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "��ылки между базами не реализованы: %s"
 
-#: catalog/namespace.c:2652 parser/parse_expr.c:796 parser/parse_target.c:1137
-#: gram.y:13305 gram.y:14659
+#: catalog/namespace.c:2652 parser/parse_expr.c:796 parser/parse_target.c:1148
+#: gram.y:13309 gram.y:14675
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "неверное полное им� (�лишком много компонентов): %s"
@@ -3980,8 +3962,8 @@
 msgid "cannot move objects into or out of TOAST schema"
 msgstr "перемещать объекты в/из �хем TOAST нельз�"
 
-#: catalog/namespace.c:2873 commands/schemacmds.c:238
-#: commands/schemacmds.c:317 commands/tablecmds.c:736
+#: catalog/namespace.c:2873 commands/schemacmds.c:238 commands/schemacmds.c:317
+#: commands/tablecmds.c:737
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "�хема \"%s\" не �уще�твует"
@@ -4016,8 +3998,8 @@
 msgid "cannot create temporary tables in parallel mode"
 msgstr "�оздавать временные таблицы в параллельном режиме нельз�"
 
-#: catalog/namespace.c:3898 commands/tablespace.c:1159 commands/variable.c:63
-#: replication/syncrep.c:700 utils/misc/guc.c:9636
+#: catalog/namespace.c:3898 commands/tablespace.c:1173 commands/variable.c:63
+#: replication/syncrep.c:692 utils/misc/guc.c:9667
 #, c-format
 msgid "List syntax is invalid."
 msgstr "Ошибка �интак�и�а в �пи�ке."
@@ -4026,7 +4008,7 @@
 msgid "database name cannot be qualified"
 msgstr "им� базы данных не может быть �о�тавным"
 
-#: catalog/objectaddress.c:1024 commands/extension.c:2423
+#: catalog/objectaddress.c:1024 commands/extension.c:2426
 #, c-format
 msgid "extension name cannot be qualified"
 msgstr "им� ра�ширени� не может быть �о�тавным"
@@ -4060,27 +4042,27 @@
 msgstr "им� �обытийного триггера не может быть �о�тавным"
 
 #: catalog/objectaddress.c:1158 commands/lockcmds.c:94 commands/policy.c:94
-#: commands/policy.c:384 commands/policy.c:473 commands/tablecmds.c:215
-#: commands/tablecmds.c:1295 commands/tablecmds.c:4338
-#: commands/tablecmds.c:7947
+#: commands/policy.c:384 commands/policy.c:473 commands/tablecmds.c:216
+#: commands/tablecmds.c:1296 commands/tablecmds.c:4339
+#: commands/tablecmds.c:7988
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "\"%s\" - �то не таблица"
 
-#: catalog/objectaddress.c:1165 commands/tablecmds.c:227
-#: commands/tablecmds.c:4368 commands/tablecmds.c:11965 commands/view.c:155
+#: catalog/objectaddress.c:1165 commands/tablecmds.c:228
+#: commands/tablecmds.c:4369 commands/tablecmds.c:12123 commands/view.c:141
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "\"%s\" - �то не пред�тавление"
 
-#: catalog/objectaddress.c:1172 commands/matview.c:174
-#: commands/tablecmds.c:233 commands/tablecmds.c:11970
+#: catalog/objectaddress.c:1172 commands/matview.c:174 commands/tablecmds.c:234
+#: commands/tablecmds.c:12128
 #, c-format
 msgid "\"%s\" is not a materialized view"
 msgstr "\"%s\" - �то не материализованное пред�тавление"
 
-#: catalog/objectaddress.c:1179 commands/tablecmds.c:251
-#: commands/tablecmds.c:4371 commands/tablecmds.c:11975
+#: catalog/objectaddress.c:1179 commands/tablecmds.c:252
+#: commands/tablecmds.c:4372 commands/tablecmds.c:12133
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "\"%s\" - �то не �торонн�� таблица"
@@ -4097,9 +4079,9 @@
 "значение по умолчанию дл� �толбца \"%s\" отношени� \"%s\" не �уще�твует"
 
 #: catalog/objectaddress.c:1460 commands/functioncmds.c:128
-#: commands/tablecmds.c:243 commands/typecmds.c:3210 parser/parse_type.c:226
+#: commands/tablecmds.c:244 commands/typecmds.c:3210 parser/parse_type.c:226
 #: parser/parse_type.c:255 parser/parse_type.c:795 utils/adt/acl.c:4373
-#: utils/adt/regproc.c:1225
+#: utils/adt/regproc.c:1226
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "тип \"%s\" не �уще�твует"
@@ -4109,164 +4091,163 @@
 msgid "operator %d (%s, %s) of %s does not exist"
 msgstr "оператор %d (%s, %s) из �емей�тва %s не �уще�твует"
 
-#: catalog/objectaddress.c:1606
+#: catalog/objectaddress.c:1608
 #, c-format
 msgid "function %d (%s, %s) of %s does not exist"
 msgstr "функци� %d (%s, %s) из �емей�тва %s не �уще�твует"
 
-#: catalog/objectaddress.c:1655 catalog/objectaddress.c:1681
+#: catalog/objectaddress.c:1659 catalog/objectaddress.c:1685
 #, c-format
 msgid "user mapping for user \"%s\" on server \"%s\" does not exist"
 msgstr "�опо�тавление дл� пользовател� \"%s\" на �ервере \"%s\" не �уще�твует"
 
-#: catalog/objectaddress.c:1670 commands/foreigncmds.c:430
-#: commands/foreigncmds.c:997 commands/foreigncmds.c:1359
-#: foreign/foreign.c:691
+#: catalog/objectaddress.c:1674 commands/foreigncmds.c:430
+#: commands/foreigncmds.c:997 commands/foreigncmds.c:1359 foreign/foreign.c:691
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "�ервер \"%s\" не �уще�твует"
 
-#: catalog/objectaddress.c:1742
+#: catalog/objectaddress.c:1746
 #, c-format
 msgid "unrecognized default ACL object type %c"
 msgstr "нера�познанный тип объекта ACL по умолчанию: %c"
 
-#: catalog/objectaddress.c:1743
+#: catalog/objectaddress.c:1747
 #, c-format
 msgid "Valid object types are \"r\", \"S\", \"f\", and \"T\"."
 msgstr "Допу�тимые значени�: \"r\", \"S\", \"f\" и \"T\"."
 
-#: catalog/objectaddress.c:1789
+#: catalog/objectaddress.c:1793
 #, c-format
 msgid "default ACL for user \"%s\" in schema \"%s\" on %s does not exist"
 msgstr ""
 "ACL по умолчанию дл� пользовател� \"%s\" в �хеме \"%s\" дл� объекта %s не "
 "�уще�твует"
 
-#: catalog/objectaddress.c:1794
+#: catalog/objectaddress.c:1798
 #, c-format
 msgid "default ACL for user \"%s\" on %s does not exist"
 msgstr ""
 "ACL по умолчанию дл� пользовател� \"%s\" и дл� объекта %s не �уще�твует"
 
-#: catalog/objectaddress.c:1821 catalog/objectaddress.c:1877
-#: catalog/objectaddress.c:1932
+#: catalog/objectaddress.c:1825 catalog/objectaddress.c:1881
+#: catalog/objectaddress.c:1936
 #, c-format
 msgid "name or argument lists may not contain nulls"
 msgstr "�пи�ки имён и аргументов не должны �одержать NULL"
 
-#: catalog/objectaddress.c:1853
+#: catalog/objectaddress.c:1857
 #, c-format
 msgid "unsupported object type \"%s\""
 msgstr "неподдерживаемый тип объекта: \"%s\""
 
-#: catalog/objectaddress.c:1873 catalog/objectaddress.c:1891
+#: catalog/objectaddress.c:1877 catalog/objectaddress.c:1895
 #, c-format
 msgid "name list length must be exactly %d"
 msgstr "длина �пи�ка имён должна быть равна %d"
 
-#: catalog/objectaddress.c:1895
+#: catalog/objectaddress.c:1899
 #, c-format
 msgid "large object OID may not be null"
 msgstr "OID большого объекта не может быть NULL"
 
-#: catalog/objectaddress.c:1904 catalog/objectaddress.c:1964
-#: catalog/objectaddress.c:1971
+#: catalog/objectaddress.c:1908 catalog/objectaddress.c:1968
+#: catalog/objectaddress.c:1975
 #, c-format
 msgid "name list length must be at least %d"
 msgstr "длина �пи�ка аргументов должна быть не меньше %d"
 
-#: catalog/objectaddress.c:1957 catalog/objectaddress.c:1977
+#: catalog/objectaddress.c:1961 catalog/objectaddress.c:1981
 #, c-format
 msgid "argument list length must be exactly %d"
 msgstr "длина �пи�ка аргументов должна быть равна %d"
 
-#: catalog/objectaddress.c:2113 libpq/be-fsstubs.c:352
+#: catalog/objectaddress.c:2117 libpq/be-fsstubs.c:352
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "нужно быть владельцем большого объекта %u"
 
-#: catalog/objectaddress.c:2128 commands/functioncmds.c:1386
+#: catalog/objectaddress.c:2132 commands/functioncmds.c:1386
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr "�то разрешено только владельцу типа %s или %s"
 
-#: catalog/objectaddress.c:2168 catalog/objectaddress.c:2184
+#: catalog/objectaddress.c:2172 catalog/objectaddress.c:2188
 #, c-format
 msgid "must be superuser"
 msgstr "требуют�� права �уперпользовател�"
 
-#: catalog/objectaddress.c:2175
+#: catalog/objectaddress.c:2179
 #, c-format
 msgid "must have CREATEROLE privilege"
 msgstr "требует�� право CREATEROLE"
 
-#: catalog/objectaddress.c:2254
+#: catalog/objectaddress.c:2253
 #, c-format
 msgid "unrecognized object type \"%s\""
 msgstr "нера�познанный тип объекта \"%s\""
 
-#: catalog/objectaddress.c:2449
+#: catalog/objectaddress.c:2448
 #, c-format
 msgid " column %s"
 msgstr " �толбец %s"
 
-#: catalog/objectaddress.c:2455
+#: catalog/objectaddress.c:2454
 #, c-format
 msgid "function %s"
 msgstr "функци� %s"
 
-#: catalog/objectaddress.c:2460
+#: catalog/objectaddress.c:2459
 #, c-format
 msgid "type %s"
 msgstr "тип %s"
 
-#: catalog/objectaddress.c:2490
+#: catalog/objectaddress.c:2489
 #, c-format
 msgid "cast from %s to %s"
 msgstr "приведение %s к %s"
 
-#: catalog/objectaddress.c:2510
+#: catalog/objectaddress.c:2509
 #, c-format
 msgid "collation %s"
 msgstr "правило �ортировки %s"
 
-#: catalog/objectaddress.c:2534
+#: catalog/objectaddress.c:2533
 #, c-format
 msgid "constraint %s on %s"
 msgstr "ограничение %s в отношении %s"
 
-#: catalog/objectaddress.c:2540
+#: catalog/objectaddress.c:2539
 #, c-format
 msgid "constraint %s"
 msgstr "ограничение %s"
 
-#: catalog/objectaddress.c:2557
+#: catalog/objectaddress.c:2556
 #, c-format
 msgid "conversion %s"
 msgstr "преобразование %s"
 
-#: catalog/objectaddress.c:2594
+#: catalog/objectaddress.c:2593
 #, c-format
 msgid "default for %s"
 msgstr "значение по умолчанию, %s"
 
-#: catalog/objectaddress.c:2603
+#: catalog/objectaddress.c:2602
 #, c-format
 msgid "language %s"
 msgstr "�зык %s"
 
-#: catalog/objectaddress.c:2608
+#: catalog/objectaddress.c:2607
 #, c-format
 msgid "large object %u"
 msgstr "большой объект %u"
 
-#: catalog/objectaddress.c:2613
+#: catalog/objectaddress.c:2612
 #, c-format
 msgid "operator %s"
 msgstr "оператор %s"
 
-#: catalog/objectaddress.c:2645
+#: catalog/objectaddress.c:2644
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "кла�� операторов %s дл� метода до�тупа %s"
@@ -4275,7 +4256,7 @@
 #. 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/objectaddress.c:2695
+#: catalog/objectaddress.c:2694
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "оператор %d (%s, %s) из �емей�тва \"%s\": %s"
@@ -4284,173 +4265,173 @@
 #. 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/objectaddress.c:2745
+#: catalog/objectaddress.c:2744
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "функци� %d (%s, %s) из �емей�тва \"%s\": %s"
 
-#: catalog/objectaddress.c:2785
+#: catalog/objectaddress.c:2784
 #, c-format
 msgid "rule %s on "
 msgstr "правило %s дл� отношени�: "
 
-#: catalog/objectaddress.c:2807
+#: catalog/objectaddress.c:2806
 #, c-format
 msgid "transform for %s language %s"
 msgstr "преобразование дл� %s, �зыка %s"
 
-#: catalog/objectaddress.c:2841
+#: catalog/objectaddress.c:2840
 #, c-format
 msgid "trigger %s on "
 msgstr "триггер %s в отношении: "
 
-#: catalog/objectaddress.c:2858
+#: catalog/objectaddress.c:2857
 #, c-format
 msgid "schema %s"
 msgstr "�хема %s"
 
-#: catalog/objectaddress.c:2871
+#: catalog/objectaddress.c:2870
 #, c-format
 msgid "text search parser %s"
 msgstr "анализатор тек�тового пои�ка %s"
 
-#: catalog/objectaddress.c:2886
+#: catalog/objectaddress.c:2885
 #, c-format
 msgid "text search dictionary %s"
 msgstr "�ловарь тек�тового пои�ка %s"
 
-#: catalog/objectaddress.c:2901
+#: catalog/objectaddress.c:2900
 #, c-format
 msgid "text search template %s"
 msgstr "шаблон тек�тового пои�ка %s"
 
-#: catalog/objectaddress.c:2916
+#: catalog/objectaddress.c:2915
 #, c-format
 msgid "text search configuration %s"
 msgstr "конфигураци� тек�тового пои�ка %s"
 
-#: catalog/objectaddress.c:2924
+#: catalog/objectaddress.c:2923
 #, c-format
 msgid "role %s"
 msgstr "роль %s"
 
-#: catalog/objectaddress.c:2937
+#: catalog/objectaddress.c:2936
 #, c-format
 msgid "database %s"
 msgstr "база данных %s"
 
-#: catalog/objectaddress.c:2949
+#: catalog/objectaddress.c:2948
 #, c-format
 msgid "tablespace %s"
 msgstr "табличное про�тран�тво %s"
 
-#: catalog/objectaddress.c:2958
+#: catalog/objectaddress.c:2957
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "обёртка �торонних данных %s"
 
-#: catalog/objectaddress.c:2967
+#: catalog/objectaddress.c:2966
 #, c-format
 msgid "server %s"
 msgstr "�ервер %s"
 
-#: catalog/objectaddress.c:2995
+#: catalog/objectaddress.c:2994
 #, c-format
 msgid "user mapping for %s on server %s"
 msgstr "�опо�тавление дл� пользовател� %s на �ервере %s"
 
-#: catalog/objectaddress.c:3030
+#: catalog/objectaddress.c:3029
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "права по умолчанию дл� новых отношений, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3035
+#: catalog/objectaddress.c:3034
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr ""
 "права по умолчанию дл� новых по�ледовательно�тей, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3040
+#: catalog/objectaddress.c:3039
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "права по умолчанию дл� новых функций, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3045
+#: catalog/objectaddress.c:3044
 #, c-format
 msgid "default privileges on new types belonging to role %s"
 msgstr "права по умолчанию дл� новых типов, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3051
+#: catalog/objectaddress.c:3050
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "права по умолчанию дл� новых объектов, принадлежащих роли %s"
 
-#: catalog/objectaddress.c:3059
+#: catalog/objectaddress.c:3058
 #, c-format
 msgid " in schema %s"
 msgstr " в �хеме %s"
 
-#: catalog/objectaddress.c:3076
+#: catalog/objectaddress.c:3075
 #, c-format
 msgid "extension %s"
 msgstr "ра�ширение %s"
 
-#: catalog/objectaddress.c:3089
+#: catalog/objectaddress.c:3088
 #, c-format
 msgid "event trigger %s"
 msgstr "�обытийный триггер %s"
 
-#: catalog/objectaddress.c:3121
+#: catalog/objectaddress.c:3120
 #, c-format
 msgid "policy %s on "
 msgstr "политика %s отношени� "
 
-#: catalog/objectaddress.c:3184
+#: catalog/objectaddress.c:3183
 #, c-format
 msgid "table %s"
 msgstr "таблица %s"
 
-#: catalog/objectaddress.c:3188
+#: catalog/objectaddress.c:3187
 #, c-format
 msgid "index %s"
 msgstr "индек� %s"
 
-#: catalog/objectaddress.c:3192
+#: catalog/objectaddress.c:3191
 #, c-format
 msgid "sequence %s"
 msgstr "по�ледовательно�ть %s"
 
-#: catalog/objectaddress.c:3196
+#: catalog/objectaddress.c:3195
 #, c-format
 msgid "toast table %s"
 msgstr "TOAST-таблица %s"
 
-#: catalog/objectaddress.c:3200
+#: catalog/objectaddress.c:3199
 #, c-format
 msgid "view %s"
 msgstr "пред�тавление %s"
 
-#: catalog/objectaddress.c:3204
+#: catalog/objectaddress.c:3203
 #, c-format
 msgid "materialized view %s"
 msgstr "материализованное пред�тавление %s"
 
-#: catalog/objectaddress.c:3208
+#: catalog/objectaddress.c:3207
 #, c-format
 msgid "composite type %s"
 msgstr "�о�тавной тип %s"
 
-#: catalog/objectaddress.c:3212
+#: catalog/objectaddress.c:3211
 #, c-format
 msgid "foreign table %s"
 msgstr "�торонн�� таблица %s"
 
-#: catalog/objectaddress.c:3217
+#: catalog/objectaddress.c:3216
 #, c-format
 msgid "relation %s"
 msgstr "отношение %s"
 
-#: catalog/objectaddress.c:3254
+#: catalog/objectaddress.c:3253
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "�емей�тво операторов %s дл� метода до�тупа %s"
@@ -4512,7 +4493,7 @@
 msgid "return type of inverse transition function %s is not %s"
 msgstr "обратна� функци� перехода %s должна возвращать тип %s"
 
-#: catalog/pg_aggregate.c:344 executor/nodeWindowAgg.c:2302
+#: catalog/pg_aggregate.c:344 executor/nodeWindowAgg.c:2335
 #, c-format
 msgid ""
 "strictness of aggregate's forward and inverse transition functions must match"
@@ -4570,12 +4551,12 @@
 "оператор �ортировки можно указать только дл� агрегатных функций � одним "
 "аргументом"
 
-#: catalog/pg_aggregate.c:700 commands/typecmds.c:1702
-#: commands/typecmds.c:1753 commands/typecmds.c:1784 commands/typecmds.c:1807
-#: commands/typecmds.c:1828 commands/typecmds.c:1855 commands/typecmds.c:1882
-#: commands/typecmds.c:1959 commands/typecmds.c:2001 parser/parse_func.c:364
-#: parser/parse_func.c:393 parser/parse_func.c:418 parser/parse_func.c:432
-#: parser/parse_func.c:507 parser/parse_func.c:518 parser/parse_func.c:1920
+#: catalog/pg_aggregate.c:700 commands/typecmds.c:1702 commands/typecmds.c:1753
+#: commands/typecmds.c:1784 commands/typecmds.c:1807 commands/typecmds.c:1828
+#: commands/typecmds.c:1855 commands/typecmds.c:1882 commands/typecmds.c:1959
+#: commands/typecmds.c:2001 parser/parse_func.c:364 parser/parse_func.c:393
+#: parser/parse_func.c:418 parser/parse_func.c:432 parser/parse_func.c:507
+#: parser/parse_func.c:518 parser/parse_func.c:1920
 #, c-format
 msgid "function %s does not exist"
 msgstr "функци� %s не �уще�твует"
@@ -4642,7 +4623,7 @@
 msgid "default conversion for %s to %s already exists"
 msgstr "преобразование по умолчанию из %s в %s уже �уще�твует"
 
-#: catalog/pg_depend.c:165 commands/extension.c:2945
+#: catalog/pg_depend.c:165 commands/extension.c:2948
 #, c-format
 msgid "%s is already a member of extension \"%s\""
 msgstr "%s уже отно�ит�� к ра�ширению \"%s\""
@@ -4866,7 +4847,7 @@
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "SQL-функции не могут иметь аргументы типа %s"
 
-#: catalog/pg_proc.c:971 executor/functions.c:1421
+#: catalog/pg_proc.c:971 executor/functions.c:1430
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "SQL-функци� \"%s\""
@@ -4979,13 +4960,13 @@
 msgid "fixed-size types must have storage PLAIN"
 msgstr "дл� типов по�то�нного размера применим только режим хранени� PLAIN"
 
-#: catalog/pg_type.c:789
+#: catalog/pg_type.c:809
 #, c-format
 msgid "could not form array type name for type \"%s\""
 msgstr "не удало�ь �формировать им� типа ма��ива дл� типа \"%s\""
 
-#: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4350
-#: commands/tablecmds.c:11853
+#: catalog/toasting.c:104 commands/indexcmds.c:381 commands/tablecmds.c:4351
+#: commands/tablecmds.c:12011
 #, c-format
 msgid "\"%s\" is not a table or materialized view"
 msgstr "\"%s\" - �то не таблица и не материализованное пред�тавление"
@@ -5008,23 +4989,22 @@
 #: commands/aggregatecmds.c:181
 #, c-format
 msgid "aggregate stype must be specified"
-msgstr "в определении агрегатной функции требует�� stype"
+msgstr "в определении агрегата требует�� stype"
 
 #: commands/aggregatecmds.c:185
 #, c-format
 msgid "aggregate sfunc must be specified"
-msgstr "в определении агрегатной функции требует�� sfunc"
+msgstr "в определении агрегата требует�� sfunc"
 
 #: commands/aggregatecmds.c:197
 #, c-format
 msgid "aggregate msfunc must be specified when mstype is specified"
-msgstr "в определении агрегатной функции требует�� msfunc, е�ли указан mstype"
+msgstr "в определении агрегата требует�� msfunc, е�ли указан mstype"
 
 #: commands/aggregatecmds.c:201
 #, c-format
 msgid "aggregate minvfunc must be specified when mstype is specified"
-msgstr ""
-"в определении агрегатной функции требует�� minvfunc, е�ли указан mstype"
+msgstr "в определении агрегата требует�� minvfunc, е�ли указан mstype"
 
 #: commands/aggregatecmds.c:208
 #, c-format
@@ -5054,19 +5034,17 @@
 #: commands/aggregatecmds.c:244
 #, c-format
 msgid "aggregate input type must be specified"
-msgstr "в определении агрегатной функции требует�� входной тип"
+msgstr "в определении агрегата требует�� входной тип"
 
 #: commands/aggregatecmds.c:274
 #, c-format
 msgid "basetype is redundant with aggregate input type specification"
-msgstr ""
-"в определении агрегатной функции � указанием входного типа не нужен базовый "
-"тип"
+msgstr "в определении агрегата � указанием входного типа не нужен базовый тип"
 
 #: commands/aggregatecmds.c:315 commands/aggregatecmds.c:335
 #, c-format
 msgid "aggregate transition data type cannot be %s"
-msgstr "переходным типом агрегатной функции не может быть %s"
+msgstr "переходным типом агрегата не может быть %s"
 
 #: commands/alter.c:80 commands/event_trigger.c:230
 #, c-format
@@ -5171,12 +5149,12 @@
 msgid "analyzing \"%s.%s\""
 msgstr "анализирует�� \"%s.%s\""
 
-#: commands/analyze.c:645
+#: commands/analyze.c:648
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
 msgstr "автоматиче�кий анализ таблицы \"%s.%s.%s\"; нагрузка �и�темы: %s"
 
-#: commands/analyze.c:1201
+#: commands/analyze.c:1204
 #, c-format
 msgid ""
 "\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
@@ -5186,7 +5164,7 @@
 "%.0f, \"мёртвых\" �трок: %.0f; �трок в выборке: %d, примерное общее чи�ло "
 "�трок: %.0f"
 
-#: commands/analyze.c:1280
+#: commands/analyze.c:1283
 #, c-format
 msgid ""
 "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree "
@@ -5195,7 +5173,7 @@
 "пропу�кает�� анализ дерева на�ледовани� \"%s.%s\" --- �то дерево "
 "на�ледовани� не �одержит дочерних таблиц"
 
-#: commands/analyze.c:1369
+#: commands/analyze.c:1372
 #, c-format
 msgid ""
 "skipping analyze of \"%s.%s\" inheritance tree --- this inheritance tree "
@@ -5204,7 +5182,7 @@
 "пропу�кает�� анализ дерева на�ледовани� \"%s.%s\" --- �то дерево "
 "на�ледовани� не �одержит анализируемых дочерних таблиц"
 
-#: commands/analyze.c:1417 executor/execQual.c:2900
+#: commands/analyze.c:1420 commands/tablecmds.c:8050 executor/execQual.c:2900
 msgid "could not convert row type"
 msgstr "не удало�ь преобразовать тип �троки"
 
@@ -5268,7 +5246,7 @@
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "таблица \"%s\" ранее не кла�теризовала�ь по какому-либо индек�у"
 
-#: commands/cluster.c:171 commands/tablecmds.c:9256 commands/tablecmds.c:10972
+#: commands/cluster.c:171 commands/tablecmds.c:9354 commands/tablecmds.c:11114
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "индек� \"%s\" дл� таблицы \"%s\" не �уще�твует"
@@ -5283,7 +5261,7 @@
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "очищать временные таблицы других �еан�ов нельз�"
 
-#: commands/cluster.c:431 commands/tablecmds.c:10982
+#: commands/cluster.c:431 commands/tablecmds.c:11124
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "\"%s\" не �вл�ет�� индек�ом таблицы \"%s\""
@@ -5306,23 +5284,23 @@
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "нельз� кла�теризовать таблицу по неверному индек�у \"%s\""
 
-#: commands/cluster.c:918
+#: commands/cluster.c:920
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
 msgstr "кла�теризаци� \"%s.%s\" путём �канировани� индек�а \"%s\""
 
-#: commands/cluster.c:924
+#: commands/cluster.c:926
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr ""
 "кла�теризаци� \"%s.%s\" путём по�ледовательного �канировани� и �ортировки"
 
-#: commands/cluster.c:929 commands/vacuumlazy.c:464
+#: commands/cluster.c:931 commands/vacuumlazy.c:469
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "очи�тка \"%s.%s\""
 
-#: commands/cluster.c:1088
+#: commands/cluster.c:1090
 #, c-format
 msgid ""
 "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
@@ -5330,7 +5308,7 @@
 "\"%s\": найдено удал�емых вер�ий �трок: %.0f, неудал�емых - %.0f, "
 "про�мотрено �траниц: %u"
 
-#: commands/cluster.c:1092
+#: commands/cluster.c:1094
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -5383,12 +5361,12 @@
 "\"%s\" - �то не таблица, пред�тавление, мат. пред�тавление, �о�тавной тип "
 "или �торонн�� таблица"
 
-#: commands/constraint.c:60 utils/adt/ri_triggers.c:2717
+#: commands/constraint.c:60 utils/adt/ri_triggers.c:2715
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr "функци� \"%s\" была вызвана не менеджером триггеров"
 
-#: commands/constraint.c:67 utils/adt/ri_triggers.c:2726
+#: commands/constraint.c:67 utils/adt/ri_triggers.c:2724
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "функци� \"%s\" должна запу�кать�� в триггере AFTER дл� �трок"
@@ -5475,292 +5453,292 @@
 msgid "must be superuser to COPY to or from a file"
 msgstr "дл� и�пользовани� COPY � файлами нужно быть �уперпользователем"
 
-#: commands/copy.c:880
+#: commands/copy.c:881
 #, c-format
 msgid "COPY FROM not supported with row-level security"
 msgstr "COPY FROM не поддерживает�� � защитой на уровне �трок."
 
-#: commands/copy.c:881
+#: commands/copy.c:882
 #, c-format
 msgid "Use INSERT statements instead."
 msgstr "И�пользуйте операторы INSERT."
 
-#: commands/copy.c:1021
+#: commands/copy.c:1061
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "формат \"%s\" дл� COPY не ра�познан"
 
-#: commands/copy.c:1092 commands/copy.c:1106 commands/copy.c:1120
-#: commands/copy.c:1140
+#: commands/copy.c:1132 commands/copy.c:1146 commands/copy.c:1160
+#: commands/copy.c:1180
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
 msgstr "аргументом параметра \"%s\" должен быть �пи�ок имён �толбцов"
 
-#: commands/copy.c:1153
+#: commands/copy.c:1193
 #, c-format
 msgid "argument to option \"%s\" must be a valid encoding name"
 msgstr "аргументом параметра \"%s\" должно быть название допу�тимой кодировки"
 
-#: commands/copy.c:1159 commands/dbcommands.c:232 commands/dbcommands.c:1427
+#: commands/copy.c:1199 commands/dbcommands.c:232 commands/dbcommands.c:1427
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "параметр \"%s\" не ра�познан"
 
-#: commands/copy.c:1170
+#: commands/copy.c:1210
 #, c-format
 msgid "cannot specify DELIMITER in BINARY mode"
 msgstr "в режиме BINARY нельз� указывать DELIMITER"
 
-#: commands/copy.c:1175
+#: commands/copy.c:1215
 #, c-format
 msgid "cannot specify NULL in BINARY mode"
 msgstr "в режиме BINARY нельз� указывать NULL"
 
-#: commands/copy.c:1197
+#: commands/copy.c:1237
 #, c-format
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "разделитель дл� COPY должен быть однобайтным �имволом"
 
-#: commands/copy.c:1204
+#: commands/copy.c:1244
 #, c-format
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr ""
 "разделителем дл� COPY не может быть �имвол новой �троки или возврата каретки"
 
-#: commands/copy.c:1210
+#: commands/copy.c:1250
 #, c-format
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr ""
 "пред�тавление NULL дл� COPY не может включать �имвол новой �троки или "
 "возврата каретки"
 
-#: commands/copy.c:1227
+#: commands/copy.c:1267
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "\"%s\" не может быть разделителем дл� COPY"
 
-#: commands/copy.c:1233
+#: commands/copy.c:1273
 #, c-format
 msgid "COPY HEADER available only in CSV mode"
 msgstr "COPY HEADER можно и�пользовать только в режиме CSV"
 
-#: commands/copy.c:1239
+#: commands/copy.c:1279
 #, c-format
 msgid "COPY quote available only in CSV mode"
 msgstr "определить кавычки дл� COPY можно только в режиме CSV"
 
-#: commands/copy.c:1244
+#: commands/copy.c:1284
 #, c-format
 msgid "COPY quote must be a single one-byte character"
 msgstr "�имвол кавычек дл� COPY должен быть однобайтным"
 
-#: commands/copy.c:1249
+#: commands/copy.c:1289
 #, c-format
 msgid "COPY delimiter and quote must be different"
 msgstr "�имвол кавычек дл� COPY должен отличать�� от разделител�"
 
-#: commands/copy.c:1255
+#: commands/copy.c:1295
 #, c-format
 msgid "COPY escape available only in CSV mode"
 msgstr "определить �пец�имвол дл� COPY можно только в режиме CSV"
 
-#: commands/copy.c:1260
+#: commands/copy.c:1300
 #, c-format
 msgid "COPY escape must be a single one-byte character"
 msgstr "�пец�имвол дл� COPY должен быть однобайтным"
 
-#: commands/copy.c:1266
+#: commands/copy.c:1306
 #, c-format
 msgid "COPY force quote available only in CSV mode"
 msgstr "параметр force quote дл� COPY можно и�пользовать только в режиме CSV"
 
-#: commands/copy.c:1270
+#: commands/copy.c:1310
 #, c-format
 msgid "COPY force quote only available using COPY TO"
 msgstr "параметр force quote дл� COPY можно и�пользовать только � COPY TO"
 
-#: commands/copy.c:1276
+#: commands/copy.c:1316
 #, c-format
 msgid "COPY force not null available only in CSV mode"
 msgstr ""
 "параметр force not null дл� COPY можно и�пользовать только в режиме CSV"
 
-#: commands/copy.c:1280
+#: commands/copy.c:1320
 #, c-format
 msgid "COPY force not null only available using COPY FROM"
 msgstr "параметр force not null дл� COPY можно и�пользовать только � COPY FROM"
 
-#: commands/copy.c:1286
+#: commands/copy.c:1326
 #, c-format
 msgid "COPY force null available only in CSV mode"
 msgstr "параметр force null дл� COPY можно и�пользовать только в режиме CSV"
 
-#: commands/copy.c:1291
+#: commands/copy.c:1331
 #, c-format
 msgid "COPY force null only available using COPY FROM"
 msgstr "параметр force null дл� COPY можно и�пользовать только � COPY FROM"
 
-#: commands/copy.c:1297
+#: commands/copy.c:1337
 #, c-format
 msgid "COPY delimiter must not appear in the NULL specification"
 msgstr "разделитель дл� COPY не должен при�ут�твовать в пред�тавлении NULL"
 
-#: commands/copy.c:1304
+#: commands/copy.c:1344
 #, c-format
 msgid "CSV quote character must not appear in the NULL specification"
 msgstr "�имвол кавычек в CSV не должен при�ут�твовать в пред�тавлении NULL"
 
-#: commands/copy.c:1367
+#: commands/copy.c:1407
 #, c-format
 msgid "table \"%s\" does not have OIDs"
 msgstr "таблица \"%s\" не �одержит OID"
 
-#: commands/copy.c:1384
+#: commands/copy.c:1424
 #, c-format
 msgid "COPY (SELECT) WITH OIDS is not supported"
 msgstr "COPY (SELECT) WITH OIDS не поддерживает��"
 
-#: commands/copy.c:1410
+#: commands/copy.c:1450
 #, c-format
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) не поддерживает��"
 
-#: commands/copy.c:1440
+#: commands/copy.c:1480
 #, c-format
 msgid "relation referenced by COPY statement has changed"
 msgstr "отношение, задей�твованное в операторе COPY, изменило�ь"
 
-#: commands/copy.c:1498
+#: commands/copy.c:1538
 #, c-format
 msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
 msgstr "�толбец FORCE QUOTE \"%s\" не входит в �пи�ок �толбцов COPY"
 
-#: commands/copy.c:1520
+#: commands/copy.c:1560
 #, c-format
 msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
 msgstr "�толбец FORCE NOT NULL \"%s\" не входит в �пи�ок �толбцов COPY"
 
-#: commands/copy.c:1542
+#: commands/copy.c:1582
 #, c-format
 msgid "FORCE NULL column \"%s\" not referenced by COPY"
 msgstr "�толбец FORCE NULL \"%s\" не входит в �пи�ок �толбцов COPY"
 
-#: commands/copy.c:1607
+#: commands/copy.c:1647
 #, c-format
 msgid "could not close pipe to external command: %m"
 msgstr "не удало�ь закрыть канал �ообщений � внешней командой: %m"
 
-#: commands/copy.c:1611
+#: commands/copy.c:1651
 #, c-format
 msgid "program \"%s\" failed"
 msgstr "�бой программы \"%s\""
 
-#: commands/copy.c:1661
+#: commands/copy.c:1701
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "копировать из пред�тавлени� \"%s\" нельз�"
 
-#: commands/copy.c:1663 commands/copy.c:1669 commands/copy.c:1675
+#: commands/copy.c:1703 commands/copy.c:1709 commands/copy.c:1715
 #, c-format
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Попробуйте вариацию COPY (SELECT ...) TO."
 
-#: commands/copy.c:1667
+#: commands/copy.c:1707
 #, c-format
 msgid "cannot copy from materialized view \"%s\""
 msgstr "копировать из материализованного пред�тавлени� \"%s\" нельз�"
 
-#: commands/copy.c:1673
+#: commands/copy.c:1713
 #, c-format
 msgid "cannot copy from foreign table \"%s\""
 msgstr "копировать из �торонней таблицы \"%s\" нельз�"
 
-#: commands/copy.c:1679
+#: commands/copy.c:1719
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "копировать из по�ледовательно�ти \"%s\" нельз�"
 
-#: commands/copy.c:1684
+#: commands/copy.c:1724
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
 msgstr "копировать из отношени� \"%s\", не �вл�ющего�� таблицей, нельз�"
 
-#: commands/copy.c:1709 commands/copy.c:2747
+#: commands/copy.c:1749 commands/copy.c:2787
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не удало�ь выполнить команду \"%s\": %m"
 
-#: commands/copy.c:1724
+#: commands/copy.c:1764
 #, c-format
 msgid "relative path not allowed for COPY to file"
 msgstr "при выполнении COPY в файл нельз� указывать отно�ительный путь"
 
-#: commands/copy.c:1732
+#: commands/copy.c:1772
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "не удало�ь открыть файл \"%s\" дл� запи�и: %m"
 
-#: commands/copy.c:1744 commands/copy.c:2770
+#: commands/copy.c:1784 commands/copy.c:2810
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" - �то каталог"
 
-#: commands/copy.c:2069
+#: commands/copy.c:2109
 #, c-format
 msgid "COPY %s, line %d, column %s"
 msgstr "COPY %s, �трока %d, �толбец %s"
 
-#: commands/copy.c:2073 commands/copy.c:2120
+#: commands/copy.c:2113 commands/copy.c:2160
 #, c-format
 msgid "COPY %s, line %d"
 msgstr "COPY %s, �трока %d"
 
-#: commands/copy.c:2084
+#: commands/copy.c:2124
 #, c-format
 msgid "COPY %s, line %d, column %s: \"%s\""
 msgstr "COPY %s, �трока %d, �толбец %s: \"%s\""
 
-#: commands/copy.c:2092
+#: commands/copy.c:2132
 #, c-format
 msgid "COPY %s, line %d, column %s: null input"
 msgstr "COPY %s, �трока %d, �толбец %s: значение NULL"
 
-#: commands/copy.c:2114
+#: commands/copy.c:2154
 #, c-format
 msgid "COPY %s, line %d: \"%s\""
 msgstr "COPY %s, �трока %d: \"%s\""
 
-#: commands/copy.c:2198
+#: commands/copy.c:2238
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "копировать в пред�тавление \"%s\" нельз�"
 
-#: commands/copy.c:2203
+#: commands/copy.c:2243
 #, c-format
 msgid "cannot copy to materialized view \"%s\""
 msgstr "копировать в материализованное пред�тавление \"%s\" нельз�"
 
-#: commands/copy.c:2208
+#: commands/copy.c:2248
 #, c-format
 msgid "cannot copy to foreign table \"%s\""
 msgstr "копировать в �тороннюю таблицу \"%s\" нельз�"
 
-#: commands/copy.c:2213
+#: commands/copy.c:2253
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "копировать в по�ледовательно�ть \"%s\" нельз�"
 
-#: commands/copy.c:2218
+#: commands/copy.c:2258
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
 msgstr "копировать в отношение \"%s\", не �вл�ющее�� таблицей, нельз�"
 
-#: commands/copy.c:2281
+#: commands/copy.c:2321
 #, c-format
 msgid "cannot perform FREEZE because of prior transaction activity"
 msgstr "выполнить FREEZE нельз� из-за предыдущей активно�ти в транзакции"
 
-#: commands/copy.c:2287
+#: commands/copy.c:2327
 #, c-format
 msgid ""
 "cannot perform FREEZE because the table was not created or truncated in the "
@@ -5769,160 +5747,160 @@
 "выполнить FREEZE нельз�, так как таблица не была �оздана или у�ечена в "
 "текущей подтранзакции"
 
-#: commands/copy.c:2758 commands/extension.c:3037 utils/adt/genfile.c:134
+#: commands/copy.c:2798 commands/extension.c:3040 utils/adt/genfile.c:134
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не удало�ь открыть файл \"%s\" дл� чтени�: %m"
 
-#: commands/copy.c:2790
+#: commands/copy.c:2830
 #, c-format
 msgid "COPY file signature not recognized"
 msgstr "подпи�ь COPY-файла не ра�познана"
 
-#: commands/copy.c:2795
+#: commands/copy.c:2835
 #, c-format
 msgid "invalid COPY file header (missing flags)"
 msgstr "неверный заголовок файла COPY (от�ут�твуют флаги)"
 
-#: commands/copy.c:2801
+#: commands/copy.c:2841
 #, c-format
 msgid "unrecognized critical flags in COPY file header"
 msgstr "не ра�познаны важные флаги в заголовке файла COPY"
 
-#: commands/copy.c:2807
+#: commands/copy.c:2847
 #, c-format
 msgid "invalid COPY file header (missing length)"
 msgstr "неверный заголовок файла COPY (от�ут�твует длина)"
 
-#: commands/copy.c:2814
+#: commands/copy.c:2854
 #, c-format
 msgid "invalid COPY file header (wrong length)"
 msgstr "неверный заголовок файла COPY (неправильна� длина)"
 
-#: commands/copy.c:2947 commands/copy.c:3654 commands/copy.c:3884
+#: commands/copy.c:2987 commands/copy.c:3694 commands/copy.c:3924
 #, c-format
 msgid "extra data after last expected column"
 msgstr "лишние данные по�ле �одержимого по�леднего �толбца"
 
-#: commands/copy.c:2957
+#: commands/copy.c:2997
 #, c-format
 msgid "missing data for OID column"
 msgstr "нет данных дл� �толбца OID"
 
-#: commands/copy.c:2963
+#: commands/copy.c:3003
 #, c-format
 msgid "null OID in COPY data"
 msgstr "неверное значение OID (NULL) в данных COPY"
 
-#: commands/copy.c:2973 commands/copy.c:3096
+#: commands/copy.c:3013 commands/copy.c:3136
 #, c-format
 msgid "invalid OID in COPY data"
 msgstr "неверный OID в данных COPY"
 
-#: commands/copy.c:2988
+#: commands/copy.c:3028
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "нет данных дл� �толбца \"%s\""
 
-#: commands/copy.c:3071
+#: commands/copy.c:3111
 #, c-format
 msgid "received copy data after EOF marker"
 msgstr "по�ле маркера конца файла продолжают�� данные COPY"
 
-#: commands/copy.c:3078
+#: commands/copy.c:3118
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "количе�тво полей в �троке: %d, ожидало�ь: %d"
 
-#: commands/copy.c:3418 commands/copy.c:3435
+#: commands/copy.c:3458 commands/copy.c:3475
 #, c-format
 msgid "literal carriage return found in data"
 msgstr "в данных обнаружен �вный возврат каретки"
 
-#: commands/copy.c:3419 commands/copy.c:3436
+#: commands/copy.c:3459 commands/copy.c:3476
 #, c-format
 msgid "unquoted carriage return found in data"
 msgstr "в данных обнаружен возврат каретки не в кавычках"
 
-#: commands/copy.c:3421 commands/copy.c:3438
+#: commands/copy.c:3461 commands/copy.c:3478
 #, c-format
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Пред�тавьте возврат каретки как \"\\r\"."
 
-#: commands/copy.c:3422 commands/copy.c:3439
+#: commands/copy.c:3462 commands/copy.c:3479
 #, c-format
 msgid "Use quoted CSV field to represent carriage return."
 msgstr "Заключите возврат каретки в кавычки CSV."
 
-#: commands/copy.c:3451
+#: commands/copy.c:3491
 #, c-format
 msgid "literal newline found in data"
 msgstr "в данных обнаружен �вный �имвол новой �троки"
 
-#: commands/copy.c:3452
+#: commands/copy.c:3492
 #, c-format
 msgid "unquoted newline found in data"
 msgstr "в данных обнаружен �вный �имвол новой �троки не в кавычках"
 
-#: commands/copy.c:3454
+#: commands/copy.c:3494
 #, c-format
 msgid "Use \"\\n\" to represent newline."
 msgstr "Пред�тавьте �имвол новой �троки как \"\\n\"."
 
-#: commands/copy.c:3455
+#: commands/copy.c:3495
 #, c-format
 msgid "Use quoted CSV field to represent newline."
 msgstr "Заключите �имвол новой �троки в кавычки CSV."
 
-#: commands/copy.c:3501 commands/copy.c:3537
+#: commands/copy.c:3541 commands/copy.c:3577
 #, c-format
 msgid "end-of-copy marker does not match previous newline style"
 msgstr "маркер \"конец копии\" не �оответ�твует предыдущему �тилю новой �троки"
 
-#: commands/copy.c:3510 commands/copy.c:3526
+#: commands/copy.c:3550 commands/copy.c:3566
 #, c-format
 msgid "end-of-copy marker corrupt"
 msgstr "маркер \"конец копии\" и�порчен"
 
-#: commands/copy.c:3968
+#: commands/copy.c:4008
 #, c-format
 msgid "unterminated CSV quoted field"
 msgstr "незавершённое поле в кавычках CSV"
 
-#: commands/copy.c:4045 commands/copy.c:4064
+#: commands/copy.c:4085 commands/copy.c:4104
 #, c-format
 msgid "unexpected EOF in COPY data"
 msgstr "неожиданный конец данных COPY"
 
-#: commands/copy.c:4054
+#: commands/copy.c:4094
 #, c-format
 msgid "invalid field size"
 msgstr "неверный размер пол�"
 
-#: commands/copy.c:4077
+#: commands/copy.c:4117
 #, c-format
 msgid "incorrect binary data format"
 msgstr "неверный двоичный формат данных"
 
-#: commands/copy.c:4388 commands/indexcmds.c:1008 commands/tablecmds.c:1459
-#: commands/tablecmds.c:2282 parser/parse_relation.c:3084
-#: parser/parse_relation.c:3104 utils/adt/tsvector_op.c:1417
+#: commands/copy.c:4428 commands/indexcmds.c:1009 commands/tablecmds.c:1460
+#: commands/tablecmds.c:2283 parser/parse_relation.c:3177
+#: parser/parse_relation.c:3197 utils/adt/tsvector_op.c:1418
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "�толбец \"%s\" не �уще�твует"
 
-#: commands/copy.c:4395 commands/tablecmds.c:1485 commands/trigger.c:652
-#: parser/parse_target.c:956 parser/parse_target.c:967
+#: commands/copy.c:4435 commands/tablecmds.c:1486 commands/trigger.c:652
+#: parser/parse_target.c:967 parser/parse_target.c:978
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "�толбец \"%s\" указан неоднократно"
 
-#: commands/createas.c:383
+#: commands/createas.c:213 commands/createas.c:508
 #, c-format
 msgid "too many column names were specified"
 msgstr "указано �лишком много имён �толбцов"
 
-#: commands/createas.c:452
+#: commands/createas.c:549
 #, c-format
 msgid "policies not yet implemented for this command"
 msgstr "политики дл� �той команды ещё не реализованы"
@@ -5983,7 +5961,8 @@
 msgid ""
 "new encoding (%s) is incompatible with the encoding of the template database "
 "(%s)"
-msgstr "нова� кодировка (%s) не�овме�тима � кодировкой шаблона базы данных(%s)"
+msgstr ""
+"нова� кодировка (%s) не�овме�тима � кодировкой шаблона базы данных (%s)"
 
 #: commands/dbcommands.c:383
 #, c-format
@@ -6018,7 +5997,8 @@
 "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database "
 "(%s)"
 msgstr ""
-"новый параметр LC_CTYPE (%s) не�овме�тим � LC_CTYPE в шаблоне базы данных(%s)"
+"новый параметр LC_CTYPE (%s) не�овме�тим � LC_CTYPE в шаблоне базы данных "
+"(%s)"
 
 #: commands/dbcommands.c:397
 #, c-format
@@ -6225,7 +6205,7 @@
 msgstr "неверный аргумент дл� %s: \"%s\""
 
 #: commands/dropcmds.c:112 commands/functioncmds.c:1166
-#: utils/adt/ruleutils.c:1951
+#: utils/adt/ruleutils.c:1954
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "функци� \"%s\" �вл�ет�� агрегатной"
@@ -6235,19 +6215,19 @@
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "И�пользуйте DROP AGGREGATE дл� удалени� агрегатных функций."
 
-#: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2369
-#: commands/tablecmds.c:2520 commands/tablecmds.c:2562
-#: commands/tablecmds.c:11336 tcop/utility.c:1104
+#: commands/dropcmds.c:165 commands/sequence.c:424 commands/tablecmds.c:2370
+#: commands/tablecmds.c:2521 commands/tablecmds.c:2563
+#: commands/tablecmds.c:11494 tcop/utility.c:1104
 #, c-format
 msgid "relation \"%s\" does not exist, skipping"
 msgstr "отношение \"%s\" не �уще�твует, пропу�кает��"
 
-#: commands/dropcmds.c:195 commands/dropcmds.c:292 commands/tablecmds.c:741
+#: commands/dropcmds.c:195 commands/dropcmds.c:292 commands/tablecmds.c:742
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "�хема \"%s\" не �уще�твует, пропу�кает��"
 
-#: commands/dropcmds.c:237 commands/dropcmds.c:272 commands/tablecmds.c:244
+#: commands/dropcmds.c:237 commands/dropcmds.c:272 commands/tablecmds.c:245
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "тип \"%s\" не �уще�твует, пропу�кает��"
@@ -6275,7 +6255,7 @@
 #: commands/dropcmds.c:312
 #, c-format
 msgid "text search template \"%s\" does not exist, skipping"
-msgstr "шаблон тек�тового пои�ка \"%s\" не �уще�твует, пропу�кает�� "
+msgstr "шаблон тек�тового пои�ка \"%s\" не �уще�твует, пропу�кает��"
 
 #: commands/dropcmds.c:319
 #, c-format
@@ -6424,27 +6404,27 @@
 msgstr "%s можно вызывать только в �обытийной триггерной функции sql_drop"
 
 #: commands/event_trigger.c:1446 commands/event_trigger.c:1997
-#: commands/extension.c:1645 commands/extension.c:1754
-#: commands/extension.c:1947 commands/prepare.c:701 executor/execQual.c:1735
-#: executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5376
-#: executor/functions.c:1021 foreign/foreign.c:491
-#: replication/logical/logicalfuncs.c:324 replication/logical/origin.c:1410
-#: replication/slotfuncs.c:173 replication/walsender.c:2762
+#: commands/extension.c:1648 commands/extension.c:1757
+#: commands/extension.c:1950 commands/prepare.c:701 executor/execQual.c:1735
+#: executor/execQual.c:1760 executor/execQual.c:2135 executor/execQual.c:5431
+#: executor/functions.c:1030 foreign/foreign.c:491
+#: replication/logical/logicalfuncs.c:324 replication/logical/origin.c:1394
+#: replication/slotfuncs.c:173 replication/walsender.c:2765
 #: utils/adt/jsonfuncs.c:1474 utils/adt/jsonfuncs.c:1606
 #: utils/adt/jsonfuncs.c:1796 utils/adt/jsonfuncs.c:1925
 #: utils/adt/jsonfuncs.c:2693 utils/adt/pgstatfuncs.c:547
-#: utils/fmgr/funcapi.c:61 utils/misc/guc.c:8207 utils/mmgr/portalmem.c:1052
+#: utils/fmgr/funcapi.c:61 utils/misc/guc.c:8228 utils/mmgr/portalmem.c:1052
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "функци�, возвращающа� множе�тво, вызвана в контек�те, где ему нет ме�та"
 
 #: commands/event_trigger.c:1450 commands/event_trigger.c:2001
-#: commands/extension.c:1649 commands/extension.c:1758
-#: commands/extension.c:1951 commands/prepare.c:705 foreign/foreign.c:496
-#: replication/logical/logicalfuncs.c:328 replication/logical/origin.c:1414
-#: replication/slotfuncs.c:177 replication/walsender.c:2766
-#: utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8211
+#: commands/extension.c:1652 commands/extension.c:1761
+#: commands/extension.c:1954 commands/prepare.c:705 foreign/foreign.c:496
+#: replication/logical/logicalfuncs.c:328 replication/logical/origin.c:1398
+#: replication/slotfuncs.c:177 replication/walsender.c:2769
+#: utils/adt/pgstatfuncs.c:551 utils/misc/guc.c:8232
 #: utils/mmgr/portalmem.c:1056
 #, c-format
 msgid "materialize mode required, but it is not allowed in this context"
@@ -6460,27 +6440,27 @@
 msgid "%s can only be called in an event trigger function"
 msgstr "%s можно вызывать только в �обытийной триггерной функции"
 
-#: commands/explain.c:184
+#: commands/explain.c:185
 #, c-format
 msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
 msgstr "нера�познанное значение параметра EXPLAIN \"%s\": \"%s\""
 
-#: commands/explain.c:190
+#: commands/explain.c:191
 #, c-format
 msgid "unrecognized EXPLAIN option \"%s\""
 msgstr "нера�познанный параметр EXPLAIN: \"%s\""
 
-#: commands/explain.c:197
+#: commands/explain.c:198
 #, c-format
 msgid "EXPLAIN option BUFFERS requires ANALYZE"
 msgstr "параметр BUFFERS оператора EXPLAIN требует указани� ANALYZE"
 
-#: commands/explain.c:206
+#: commands/explain.c:207
 #, c-format
 msgid "EXPLAIN option TIMING requires ANALYZE"
 msgstr "параметр TIMING оператора EXPLAIN требует указани� ANALYZE"
 
-#: commands/extension.c:152 commands/extension.c:2635
+#: commands/extension.c:152 commands/extension.c:2638
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "ра�ширение \"%s\" не �уще�твует"
@@ -6570,33 +6550,33 @@
 msgstr ""
 "параметр \"schema\" не может быть указан вме�те � \"relocatable\" = true"
 
-#: commands/extension.c:719
+#: commands/extension.c:722
 #, c-format
 msgid ""
 "transaction control statements are not allowed within an extension script"
 msgstr "в �крипте ра�ширени� не должно быть операторов управлени� транзакци�ми"
 
-#: commands/extension.c:787
+#: commands/extension.c:790
 #, c-format
 msgid "permission denied to create extension \"%s\""
 msgstr "нет прав на �оздание ра�ширени� \"%s\""
 
-#: commands/extension.c:789
+#: commands/extension.c:792
 #, c-format
 msgid "Must be superuser to create this extension."
 msgstr "Дл� �оздани� �того ра�ширени� нужно быть �уперпользователем."
 
-#: commands/extension.c:793
+#: commands/extension.c:796
 #, c-format
 msgid "permission denied to update extension \"%s\""
 msgstr "нет прав на изменение ра�ширени� \"%s\""
 
-#: commands/extension.c:795
+#: commands/extension.c:798
 #, c-format
 msgid "Must be superuser to update this extension."
 msgstr "Дл� изменени� �того ра�ширени� нужно быть �уперпользователем."
 
-#: commands/extension.c:1077
+#: commands/extension.c:1080
 #, c-format
 msgid ""
 "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
@@ -6604,47 +6584,47 @@
 "дл� ра�ширени� \"%s\" не определён путь обновлени� � вер�ии \"%s\" до вер�ии "
 "\"%s\""
 
-#: commands/extension.c:1205
+#: commands/extension.c:1208
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "ра�ширение \"%s\" уже �уще�твует, пропу�кает��"
 
-#: commands/extension.c:1212
+#: commands/extension.c:1215
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "ра�ширение \"%s\" уже �уще�твует"
 
-#: commands/extension.c:1223
+#: commands/extension.c:1226
 #, c-format
 msgid "nested CREATE EXTENSION is not supported"
 msgstr "вложенные операторы CREATE EXTENSION не поддерживают��"
 
-#: commands/extension.c:1278 commands/extension.c:2695
+#: commands/extension.c:1281 commands/extension.c:2698
 #, c-format
 msgid "version to install must be specified"
 msgstr "нужно указать вер�ию дл� у�тановки"
 
-#: commands/extension.c:1295
+#: commands/extension.c:1298
 #, c-format
 msgid "FROM version must be different from installation target version \"%s\""
 msgstr "вер�и� FROM должна отличать�� от у�танавливаемой вер�ии \"%s\""
 
-#: commands/extension.c:1350
+#: commands/extension.c:1353
 #, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
 msgstr "ра�ширение \"%s\" должно у�танавливать�� в �хему \"%s\""
 
-#: commands/extension.c:1434 commands/extension.c:2840
+#: commands/extension.c:1437 commands/extension.c:2843
 #, c-format
 msgid "required extension \"%s\" is not installed"
 msgstr "требуемое ра�ширение \"%s\" не у�тановлено"
 
-#: commands/extension.c:1597
+#: commands/extension.c:1600
 #, c-format
 msgid "cannot drop extension \"%s\" because it is being modified"
-msgstr "удалить ра�ширение %s в проце��е на�тройки нельз�"
+msgstr "удалить ра�ширение \"%s\" нельз�, так как �то модифицируемый объект"
 
-#: commands/extension.c:2068
+#: commands/extension.c:2071
 #, c-format
 msgid ""
 "pg_extension_config_dump() can only be called from an SQL script executed by "
@@ -6653,17 +6633,17 @@
 "функцию pg_extension_config_dump() можно вызывать только из SQL-�крипта, "
 "запу�каемого в CREATE EXTENSION"
 
-#: commands/extension.c:2080
+#: commands/extension.c:2083
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "OID %u не отно�ит�� к таблице"
 
-#: commands/extension.c:2085
+#: commands/extension.c:2088
 #, c-format
 msgid "table \"%s\" is not a member of the extension being created"
 msgstr "таблица \"%s\" не отно�ит�� к �озданному ра�ширению"
 
-#: commands/extension.c:2450
+#: commands/extension.c:2453
 #, c-format
 msgid ""
 "cannot move extension \"%s\" into schema \"%s\" because the extension "
@@ -6672,27 +6652,27 @@
 "переме�тить ра�ширение \"%s\" в �хему \"%s\" нельз�, так как оно �одержит "
 "�хему"
 
-#: commands/extension.c:2490 commands/extension.c:2553
+#: commands/extension.c:2493 commands/extension.c:2556
 #, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
 msgstr "ра�ширение \"%s\" не поддерживает SET SCHEMA"
 
-#: commands/extension.c:2555
+#: commands/extension.c:2558
 #, c-format
 msgid "%s is not in the extension's schema \"%s\""
 msgstr "объект %s не принадлежит �хеме ра�ширени� \"%s\""
 
-#: commands/extension.c:2615
+#: commands/extension.c:2618
 #, c-format
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "вложенные операторы ALTER EXTENSION не поддерживают��"
 
-#: commands/extension.c:2706
+#: commands/extension.c:2709
 #, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
 msgstr "вер�и� \"%s\" ра�ширени� \"%s\" уже у�тановлена"
 
-#: commands/extension.c:2957
+#: commands/extension.c:2960
 #, c-format
 msgid ""
 "cannot add schema \"%s\" to extension \"%s\" because the schema contains the "
@@ -6701,12 +6681,12 @@
 "добавить �хему \"%s\" к ра�ширению \"%s\" нельз�, так как �хема �одержит "
 "ра�ширение"
 
-#: commands/extension.c:2975
+#: commands/extension.c:2978
 #, c-format
 msgid "%s is not a member of extension \"%s\""
 msgstr "%s не отно�ит�� к ра�ширению \"%s\""
 
-#: commands/extension.c:3031
+#: commands/extension.c:3034
 #, c-format
 msgid "file \"%s\" is too large"
 msgstr "файл \"%s\" �лишком большой"
@@ -6788,12 +6768,12 @@
 #: commands/foreigncmds.c:1165
 #, c-format
 msgid "user mapping \"%s\" already exists for server %s"
-msgstr "�опо�тавление пользователей \"%s\" дл� �ервера \"%s\" уже �уще�твует"
+msgstr "�опо�тавление пользовател� \"%s\" дл� �ервера \"%s\" уже �уще�твует"
 
 #: commands/foreigncmds.c:1259 commands/foreigncmds.c:1375
 #, c-format
 msgid "user mapping \"%s\" does not exist for the server"
-msgstr "�опо�тавление пользователей \"%s\" дл� данного �ервера не �уще�твует"
+msgstr "�опо�тавление пользовател� \"%s\" дл� данного �ервера не �уще�твует"
 
 #: commands/foreigncmds.c:1362
 #, c-format
@@ -6804,7 +6784,8 @@
 #, c-format
 msgid "user mapping \"%s\" does not exist for the server, skipping"
 msgstr ""
-"�опо�тавление пользователей \"%s\" не �уще�твует дл� �ервера, пропу�кает��"
+"�опо�тавление пользовател� \"%s\" дл� данного �ервера не �уще�твует, "
+"пропу�кает��"
 
 #: commands/foreigncmds.c:1532 foreign/foreign.c:360
 #, c-format
@@ -7166,9 +7147,8 @@
 msgid "language \"%s\" does not support inline code execution"
 msgstr "�зык \"%s\" не поддерживает выполнение внедрённого кода"
 
-#: commands/indexcmds.c:159 commands/indexcmds.c:487
-#: commands/opclasscmds.c:360 commands/opclasscmds.c:786
-#: commands/opclasscmds.c:1749
+#: commands/indexcmds.c:159 commands/indexcmds.c:488 commands/opclasscmds.c:360
+#: commands/opclasscmds.c:786 commands/opclasscmds.c:1749
 #, c-format
 msgid "access method \"%s\" does not exist"
 msgstr "метод до�тупа \"%s\" не �уще�твует"
@@ -7193,86 +7173,86 @@
 msgid "cannot create indexes on temporary tables of other sessions"
 msgstr "�оздавать индек�ы во временных таблицах других �еан�ов нельз�"
 
-#: commands/indexcmds.c:446 commands/tablecmds.c:541 commands/tablecmds.c:9567
+#: commands/indexcmds.c:447 commands/tablecmds.c:542 commands/tablecmds.c:9665
 #, c-format
 msgid "only shared relations can be placed in pg_global tablespace"
 msgstr ""
 "в табличное про�тран�тво pg_global можно поме�тить только раздел�емые таблицы"
 
-#: commands/indexcmds.c:479
+#: commands/indexcmds.c:480
 #, c-format
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "у�таревший метод до�тупа \"rtree\" подмен�ет�� методом \"gist\""
 
-#: commands/indexcmds.c:496
+#: commands/indexcmds.c:497
 #, c-format
 msgid "hash indexes are not WAL-logged and their use is discouraged"
 msgstr "хеш-индек�ы не запи�ывают�� в журнал, и�пользовать их не рекомендует��"
 
-#: commands/indexcmds.c:501
+#: commands/indexcmds.c:502
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
 msgstr "метод до�тупа \"%s\" не поддерживает уникальные индек�ы"
 
-#: commands/indexcmds.c:506
+#: commands/indexcmds.c:507
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
 msgstr "метод до�тупа \"%s\" не поддерживает индек�ы по многим �толбцам"
 
-#: commands/indexcmds.c:511
+#: commands/indexcmds.c:512
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "метод до�тупа \"%s\" не поддерживает ограничени�-и�ключени�"
 
-#: commands/indexcmds.c:590
+#: commands/indexcmds.c:591
 #, c-format
 msgid "%s %s will create implicit index \"%s\" for table \"%s\""
 msgstr "%s %s �озда�т не�вный индек� \"%s\" дл� таблицы \"%s\""
 
-#: commands/indexcmds.c:937
+#: commands/indexcmds.c:938
 #, c-format
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "функции в предикате индек�а должны быть помечены как IMMUTABLE"
 
-#: commands/indexcmds.c:1003 parser/parse_utilcmd.c:1844
+#: commands/indexcmds.c:1004 parser/parse_utilcmd.c:1846
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "указанный в ключе �толбец \"%s\" не �уще�твует"
 
-#: commands/indexcmds.c:1063
+#: commands/indexcmds.c:1064
 #, c-format
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr "функции в индек�ном выражении должны быть помечены как IMMUTABLE"
 
-#: commands/indexcmds.c:1086
+#: commands/indexcmds.c:1087
 #, c-format
 msgid "could not determine which collation to use for index expression"
-msgstr "не удало�ь определить правило �равнени� дл� индек�ного выражени�"
+msgstr "не удало�ь определить правило �ортировки дл� индек�ного выражени�"
 
-#: commands/indexcmds.c:1094 commands/typecmds.c:825 parser/parse_expr.c:2559
-#: parser/parse_type.c:550 parser/parse_utilcmd.c:2736 utils/adt/misc.c:546
+#: commands/indexcmds.c:1095 commands/typecmds.c:825 parser/parse_expr.c:2583
+#: parser/parse_type.c:550 parser/parse_utilcmd.c:2738 utils/adt/misc.c:546
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "тип %s не поддерживает �ортировку (COLLATION)"
 
-#: commands/indexcmds.c:1132
+#: commands/indexcmds.c:1133
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "оператор %s не коммутативен"
 
-#: commands/indexcmds.c:1134
+#: commands/indexcmds.c:1135
 #, c-format
 msgid "Only commutative operators can be used in exclusion constraints."
 msgstr ""
 "В ограничени�х-и�ключени�х могут и�пользовать�� только коммутативные "
 "операторы."
 
-#: commands/indexcmds.c:1160
+#: commands/indexcmds.c:1161
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
 msgstr "оператор \"%s\" не входит в �емей�тво операторов \"%s\""
 
-#: commands/indexcmds.c:1163
+#: commands/indexcmds.c:1164
 #, c-format
 msgid ""
 "The exclusion operator must be related to the index operator class for the "
@@ -7281,24 +7261,24 @@
 "Оператор и�ключени� дл� ограничени� должен отно�ить�� к кла��у операторов "
 "индек�а."
 
-#: commands/indexcmds.c:1198
+#: commands/indexcmds.c:1199
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
 msgstr "метод до�тупа \"%s\" не поддерживает �ортировку ASC/DESC"
 
-#: commands/indexcmds.c:1203
+#: commands/indexcmds.c:1204
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "метод до�тупа \"%s\" не поддерживает параметр NULLS FIRST/LAST"
 
-#: commands/indexcmds.c:1259 commands/typecmds.c:1932
+#: commands/indexcmds.c:1260 commands/typecmds.c:1932
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr ""
 "дл� типа данных %s не определён кла�� операторов по умолчанию дл� метода "
 "до�тупа \"%s\""
 
-#: commands/indexcmds.c:1261
+#: commands/indexcmds.c:1262
 #, c-format
 msgid ""
 "You must specify an operator class for the index or define a default "
@@ -7307,34 +7287,34 @@
 "Вы должны указать кла�� операторов дл� индек�а или определить кла�� "
 "операторов по умолчанию дл� �того типа данных."
 
-#: commands/indexcmds.c:1290 commands/indexcmds.c:1298
+#: commands/indexcmds.c:1291 commands/indexcmds.c:1299
 #: commands/opclasscmds.c:204
 #, c-format
 msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr "кла�� операторов \"%s\" дл� метода до�тупа \"%s\" не �уще�твует"
 
-#: commands/indexcmds.c:1311 commands/typecmds.c:1920
+#: commands/indexcmds.c:1312 commands/typecmds.c:1920
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "кла�� операторов \"%s\" не принимает тип данных %s"
 
-#: commands/indexcmds.c:1401
+#: commands/indexcmds.c:1402
 #, c-format
 msgid "there are multiple default operator classes for data type %s"
 msgstr ""
 "дл� типа данных %s определено не�колько кла��ов операторов по умолчанию"
 
-#: commands/indexcmds.c:1792
+#: commands/indexcmds.c:1793
 #, c-format
 msgid "table \"%s\" has no indexes"
 msgstr "таблица \"%s\" не имеет индек�ов"
 
-#: commands/indexcmds.c:1847
+#: commands/indexcmds.c:1848
 #, c-format
 msgid "can only reindex the currently open database"
 msgstr "переиндек�ировать можно только текущую базу данных"
 
-#: commands/indexcmds.c:1949
+#: commands/indexcmds.c:1950
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "таблица \"%s.%s\" переиндек�ирована"
@@ -7589,12 +7569,11 @@
 msgstr "функци� оценки �оединени� %s должна возвращать тип \"float8\""
 
 #: commands/policy.c:87 commands/policy.c:390 commands/policy.c:479
-#: commands/tablecmds.c:966 commands/tablecmds.c:1308
-#: commands/tablecmds.c:2176 commands/tablecmds.c:4320
-#: commands/tablecmds.c:6249 commands/tablecmds.c:11886
-#: commands/tablecmds.c:11921 commands/trigger.c:240 commands/trigger.c:1126
-#: commands/trigger.c:1234 rewrite/rewriteDefine.c:273
-#: rewrite/rewriteDefine.c:905
+#: commands/tablecmds.c:967 commands/tablecmds.c:1309 commands/tablecmds.c:2177
+#: commands/tablecmds.c:4321 commands/tablecmds.c:6250
+#: commands/tablecmds.c:12044 commands/tablecmds.c:12079 commands/trigger.c:240
+#: commands/trigger.c:1126 commands/trigger.c:1234 rewrite/rewriteDefine.c:273
+#: rewrite/rewriteDefine.c:917
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "до�туп запрещён: \"%s\" - �то �и�темный каталог"
@@ -7639,14 +7618,13 @@
 msgid "only USING expression allowed for SELECT, DELETE"
 msgstr "дл� SELECT, DELETE допу�кает�� только выражение USING"
 
-#: commands/portalcmds.c:61 commands/portalcmds.c:160
-#: commands/portalcmds.c:212
+#: commands/portalcmds.c:61 commands/portalcmds.c:160 commands/portalcmds.c:212
 #, c-format
 msgid "invalid cursor name: must not be empty"
 msgstr "им� кур�ора не может быть пу�тым"
 
 #: commands/portalcmds.c:168 commands/portalcmds.c:222
-#: executor/execCurrent.c:67 utils/adt/xml.c:2391 utils/adt/xml.c:2558
+#: executor/execCurrent.c:67 utils/adt/xml.c:2401 utils/adt/xml.c:2571
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "кур�ор \"%s\" не �уще�твует"
@@ -7849,6 +7827,7 @@
 msgid "invalid OWNED BY option"
 msgstr "неверное указание OWNED BY"
 
+# skip-rule: no-space-after-period
 #: commands/sequence.c:1450
 #, c-format
 msgid "Specify OWNED BY table.column or OWNED BY NONE."
@@ -7873,167 +7852,167 @@
 "по�ледовательно�ть должна быть в той же �хеме, что и таблица, � которой она "
 "�в�зана"
 
-#: commands/tablecmds.c:213
+#: commands/tablecmds.c:214
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "таблица \"%s\" не �уще�твует"
 
-#: commands/tablecmds.c:214
+#: commands/tablecmds.c:215
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "таблица \"%s\" не �уще�твует, пропу�кает��"
 
-#: commands/tablecmds.c:216
+#: commands/tablecmds.c:217
 msgid "Use DROP TABLE to remove a table."
 msgstr "Выполните DROP TABLE дл� удалени� таблицы."
 
-#: commands/tablecmds.c:219
+#: commands/tablecmds.c:220
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "по�ледовательно�ть \"%s\" не �уще�твует"
 
-#: commands/tablecmds.c:220
+#: commands/tablecmds.c:221
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "по�ледовательно�ть \"%s\" не �уще�твует, пропу�кает��"
 
-#: commands/tablecmds.c:222
+#: commands/tablecmds.c:223
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Выполните DROP SEQUENCE дл� удалени� по�ледовательно�ти."
 
-#: commands/tablecmds.c:225
+#: commands/tablecmds.c:226
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "пред�тавление \"%s\" не �уще�твует"
 
-#: commands/tablecmds.c:226
+#: commands/tablecmds.c:227
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "пред�тавление \"%s\" не �уще�твует, пропу�кает��"
 
-#: commands/tablecmds.c:228
+#: commands/tablecmds.c:229
 msgid "Use DROP VIEW to remove a view."
 msgstr "Выполните DROP VIEW дл� удалени� пред�тавлени�."
 
-#: commands/tablecmds.c:231
+#: commands/tablecmds.c:232
 #, c-format
 msgid "materialized view \"%s\" does not exist"
 msgstr "материализованное пред�тавление \"%s\" не �уще�твует"
 
-#: commands/tablecmds.c:232
+#: commands/tablecmds.c:233
 #, c-format
 msgid "materialized view \"%s\" does not exist, skipping"
 msgstr "материализованное пред�тавление \"%s\" не �уще�твует, пропу�кает��"
 
-#: commands/tablecmds.c:234
+#: commands/tablecmds.c:235
 msgid "Use DROP MATERIALIZED VIEW to remove a materialized view."
 msgstr ""
 "Выполните DROP MATERIALIZED VIEW дл� удалени� материализованного "
 "пред�тавлени�."
 
-#: commands/tablecmds.c:237 parser/parse_utilcmd.c:1593
+#: commands/tablecmds.c:238 parser/parse_utilcmd.c:1595
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "индек� \"%s\" не �уще�твует"
 
-#: commands/tablecmds.c:238
+#: commands/tablecmds.c:239
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "индек� \"%s\" не �уще�твует, пропу�кает��"
 
-#: commands/tablecmds.c:240
+#: commands/tablecmds.c:241
 msgid "Use DROP INDEX to remove an index."
 msgstr "Выполните DROP INDEX дл� удалени� индек�а."
 
-#: commands/tablecmds.c:245
+#: commands/tablecmds.c:246
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "\"%s\" - �то не тип"
 
-#: commands/tablecmds.c:246
+#: commands/tablecmds.c:247
 msgid "Use DROP TYPE to remove a type."
 msgstr "Выполните DROP TYPE дл� удалени� типа."
 
-#: commands/tablecmds.c:249 commands/tablecmds.c:8456
-#: commands/tablecmds.c:11153
+#: commands/tablecmds.c:250 commands/tablecmds.c:8554
+#: commands/tablecmds.c:11305
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "�торонн�� таблица \"%s\" не �уще�твует"
 
-#: commands/tablecmds.c:250
+#: commands/tablecmds.c:251
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "�торонн�� таблица \"%s\" не �уще�твует, пропу�кает��"
 
-#: commands/tablecmds.c:252
+#: commands/tablecmds.c:253
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "Выполните DROP FOREIGN TABLE дл� удалени� �торонней таблицы."
 
-#: commands/tablecmds.c:489
+#: commands/tablecmds.c:490
 #, c-format
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT можно и�пользовать только дл� временных таблиц"
 
-#: commands/tablecmds.c:509
+#: commands/tablecmds.c:510
 #, c-format
 msgid "cannot create temporary table within security-restricted operation"
 msgstr ""
 "в рамках операции � ограничени�ми по безопа�но�ти нельз� �оздать временную "
 "таблицу"
 
-#: commands/tablecmds.c:817
+#: commands/tablecmds.c:818
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support dropping multiple objects"
 msgstr "DROP INDEX CONCURRENTLY не поддерживает удаление не�кольких объектов"
 
-#: commands/tablecmds.c:821
+#: commands/tablecmds.c:822
 #, c-format
 msgid "DROP INDEX CONCURRENTLY does not support CASCADE"
 msgstr "DROP INDEX CONCURRENTLY не поддерживает режим CASCADE"
 
-#: commands/tablecmds.c:1080
+#: commands/tablecmds.c:1081
 #, c-format
 msgid "truncate cascades to table \"%s\""
-msgstr "удаление ра�про�тран�ет�� на таблицу %s"
+msgstr "опу�тошение ра�про�тран�ет�� на таблицу %s"
 
-#: commands/tablecmds.c:1318
+#: commands/tablecmds.c:1319
 #, c-format
 msgid "cannot truncate temporary tables of other sessions"
-msgstr "временные таблицы других �еан�ов нельз� очи�тить"
+msgstr "временные таблицы других �еан�ов нельз� опу�тошить"
 
-#: commands/tablecmds.c:1524 parser/parse_utilcmd.c:1807
+#: commands/tablecmds.c:1525 parser/parse_utilcmd.c:1809
 #, c-format
 msgid "inherited relation \"%s\" is not a table or foreign table"
 msgstr ""
 "на�ледуемое отношение \"%s\" не �вл�ет�� таблицей или �торонней таблицей"
 
-#: commands/tablecmds.c:1531 commands/tablecmds.c:10023
+#: commands/tablecmds.c:1532 commands/tablecmds.c:10121
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "временное отношение \"%s\" не может на�ледовать��"
 
-#: commands/tablecmds.c:1539 commands/tablecmds.c:10031
+#: commands/tablecmds.c:1540 commands/tablecmds.c:10129
 #, c-format
 msgid "cannot inherit from temporary relation of another session"
 msgstr "на�ледование от временного отношени� другого �еан�а невозможно"
 
-#: commands/tablecmds.c:1555 commands/tablecmds.c:10065
+#: commands/tablecmds.c:1556 commands/tablecmds.c:10163
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "отношение \"%s\" на�ледует�� неоднократно"
 
-#: commands/tablecmds.c:1603
+#: commands/tablecmds.c:1604
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "�ли�ние не�кольких на�ледованных определений �толбца \"%s\""
 
-#: commands/tablecmds.c:1611
+#: commands/tablecmds.c:1612
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "конфликт типов в на�ледованном �толбце \"%s\""
 
-#: commands/tablecmds.c:1613 commands/tablecmds.c:1634
-#: commands/tablecmds.c:1832 commands/tablecmds.c:1854
+#: commands/tablecmds.c:1614 commands/tablecmds.c:1635
+#: commands/tablecmds.c:1833 commands/tablecmds.c:1855
 #: parser/parse_coerce.c:1630 parser/parse_coerce.c:1650
 #: parser/parse_coerce.c:1670 parser/parse_coerce.c:1715
 #: parser/parse_coerce.c:1752 parser/parse_param.c:218
@@ -8041,75 +8020,76 @@
 msgid "%s versus %s"
 msgstr "%s и %s"
 
-#: commands/tablecmds.c:1620
+#: commands/tablecmds.c:1621
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "конфликт правил �ортировки в на�ледованном �толбце \"%s\""
 
-#: commands/tablecmds.c:1622 commands/tablecmds.c:1842
-#: commands/tablecmds.c:4757
+#: commands/tablecmds.c:1623 commands/tablecmds.c:1843
+#: commands/tablecmds.c:4758
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "\"%s\" и \"%s\""
 
-#: commands/tablecmds.c:1632
+#: commands/tablecmds.c:1633
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "конфликт параметров хранени� в на�ледованном �толбце \"%s\""
 
-#: commands/tablecmds.c:1745 parser/parse_utilcmd.c:894
-#: parser/parse_utilcmd.c:1238 parser/parse_utilcmd.c:1314
+#: commands/tablecmds.c:1746 commands/tablecmds.c:8059
+#: parser/parse_utilcmd.c:894 parser/parse_utilcmd.c:1240
+#: parser/parse_utilcmd.c:1316
 #, c-format
 msgid "cannot convert whole-row table reference"
 msgstr "преобразовать ��ылку на тип в�ей �троки таблицы нельз�"
 
-#: commands/tablecmds.c:1746 parser/parse_utilcmd.c:895
+#: commands/tablecmds.c:1747 parser/parse_utilcmd.c:895
 #, c-format
 msgid "Constraint \"%s\" contains a whole-row reference to table \"%s\"."
 msgstr "Ограничение \"%s\" ��ылает�� на тип в�ей �троки в таблице \"%s\"."
 
-#: commands/tablecmds.c:1818
+#: commands/tablecmds.c:1819
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "�ли�ние �толбца \"%s\" � на�ледованным определением"
 
-#: commands/tablecmds.c:1822
+#: commands/tablecmds.c:1823
 #, c-format
 msgid "moving and merging column \"%s\" with inherited definition"
 msgstr "перемещение и �ли�ние �толбца \"%s\" � на�ледуемым определением"
 
-#: commands/tablecmds.c:1823
+#: commands/tablecmds.c:1824
 #, c-format
 msgid "User-specified column moved to the position of the inherited column."
 msgstr ""
 "Определённый пользователем �толбец перемещён в позицию на�ледуемого �толбца."
 
-#: commands/tablecmds.c:1830
+#: commands/tablecmds.c:1831
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "конфликт типов в �толбце \"%s\""
 
-#: commands/tablecmds.c:1840
+#: commands/tablecmds.c:1841
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "конфликт правил �ортировки в �толбце \"%s\""
 
-#: commands/tablecmds.c:1852
+#: commands/tablecmds.c:1853
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "конфликт параметров хранени� в �толбце \"%s\""
 
-#: commands/tablecmds.c:1904
+#: commands/tablecmds.c:1905
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "�толбец \"%s\" на�ледует конфликтующие значени� по умолчанию"
 
-#: commands/tablecmds.c:1906
+#: commands/tablecmds.c:1907
 #, c-format
 msgid "To resolve the conflict, specify a default explicitly."
 msgstr "Дл� решени� конфликта укажите желаемое значение по умолчанию."
 
-#: commands/tablecmds.c:1953
+#: commands/tablecmds.c:1954
 #, c-format
 msgid ""
 "check constraint name \"%s\" appears multiple times but with different "
@@ -8118,12 +8098,12 @@
 "им� ограничени�-проверки \"%s\" фигурирует не�колько раз, но � разными "
 "выражени�ми"
 
-#: commands/tablecmds.c:2147
+#: commands/tablecmds.c:2148
 #, c-format
 msgid "cannot rename column of typed table"
 msgstr "переименовать �толбец типизированной таблицы нельз�"
 
-#: commands/tablecmds.c:2164
+#: commands/tablecmds.c:2165
 #, c-format
 msgid ""
 "\"%s\" is not a table, view, materialized view, composite type, index, or "
@@ -8132,37 +8112,37 @@
 "\"%s\" - �то не таблица, пред�тавление, материализованное пред�тавление, "
 "�о�тавной тип, индек� или �торонн�� таблица"
 
-#: commands/tablecmds.c:2258
+#: commands/tablecmds.c:2259
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr ""
 "на�ледованный �толбец \"%s\" должен быть также переименован в дочерних "
 "таблицах"
 
-#: commands/tablecmds.c:2290
+#: commands/tablecmds.c:2291
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "нельз� переименовать �и�темный �толбец \"%s\""
 
-#: commands/tablecmds.c:2305
+#: commands/tablecmds.c:2306
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "нельз� переименовать на�ледованный �толбец \"%s\""
 
-#: commands/tablecmds.c:2460
+#: commands/tablecmds.c:2461
 #, c-format
 msgid "inherited constraint \"%s\" must be renamed in child tables too"
 msgstr ""
 "на�ледуемое ограничение \"%s\" должно быть также переименовано в дочерних "
 "таблицах"
 
-#: commands/tablecmds.c:2467
+#: commands/tablecmds.c:2468
 #, c-format
 msgid "cannot rename inherited constraint \"%s\""
 msgstr "нельз� переименовать на�ледованное ограничение \"%s\""
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2693
+#: commands/tablecmds.c:2694
 #, c-format
 msgid ""
 "cannot %s \"%s\" because it is being used by active queries in this session"
@@ -8171,107 +8151,107 @@
 "запро�ами в данном �еан�е"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2702
+#: commands/tablecmds.c:2703
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr ""
 "нельз� выполнить %s \"%s\", так как � �тим объектом �в�заны отложенные "
 "�обыти� триггеров"
 
-#: commands/tablecmds.c:3776
+#: commands/tablecmds.c:3777
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "перезапи�ать �и�темное отношение \"%s\" нельз�"
 
-#: commands/tablecmds.c:3782
+#: commands/tablecmds.c:3783
 #, c-format
 msgid "cannot rewrite table \"%s\" used as a catalog table"
 msgstr "перезапи�ать таблицу \"%s\", и�пользуемую как таблицу каталога, нельз�"
 
-#: commands/tablecmds.c:3792
+#: commands/tablecmds.c:3793
 #, c-format
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "перезапи�ывать временные таблицы других �еан�ов нельз�"
 
-#: commands/tablecmds.c:4060
+#: commands/tablecmds.c:4061
 #, c-format
 msgid "rewriting table \"%s\""
 msgstr "перезапи�ь таблицы \"%s\""
 
-#: commands/tablecmds.c:4064
+#: commands/tablecmds.c:4065
 #, c-format
 msgid "verifying table \"%s\""
 msgstr "проверка таблицы \"%s\""
 
-#: commands/tablecmds.c:4178
+#: commands/tablecmds.c:4179
 #, c-format
 msgid "column \"%s\" contains null values"
 msgstr "�толбец \"%s\" �одержит значени� NULL"
 
-#: commands/tablecmds.c:4193 commands/tablecmds.c:7336
+#: commands/tablecmds.c:4194 commands/tablecmds.c:7356
 #, c-format
 msgid "check constraint \"%s\" is violated by some row"
 msgstr "ограничение-проверку \"%s\" нарушает некотора� �трока"
 
-#: commands/tablecmds.c:4341 commands/trigger.c:234
-#: rewrite/rewriteDefine.c:267 rewrite/rewriteDefine.c:900
+#: commands/tablecmds.c:4342 commands/trigger.c:234 rewrite/rewriteDefine.c:267
+#: rewrite/rewriteDefine.c:912
 #, c-format
 msgid "\"%s\" is not a table or view"
 msgstr "\"%s\" - �то не таблица и не пред�тавление"
 
-#: commands/tablecmds.c:4344 commands/trigger.c:1120 commands/trigger.c:1225
+#: commands/tablecmds.c:4345 commands/trigger.c:1120 commands/trigger.c:1225
 #, c-format
 msgid "\"%s\" is not a table, view, or foreign table"
 msgstr "\"%s\" - �то не таблица, пред�тавление и не �торонн�� таблица"
 
-#: commands/tablecmds.c:4347
+#: commands/tablecmds.c:4348
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, or index"
 msgstr ""
 "\"%s\" - �то не таблица, пред�тавление, материализованное пред�тавление или "
 "индек�"
 
-#: commands/tablecmds.c:4353
+#: commands/tablecmds.c:4354
 #, c-format
 msgid "\"%s\" is not a table, materialized view, or index"
 msgstr "\"%s\" - �то не таблица, материализованное пред�тавление или индек�"
 
-#: commands/tablecmds.c:4356
+#: commands/tablecmds.c:4357
 #, c-format
 msgid "\"%s\" is not a table, materialized view, or foreign table"
 msgstr ""
 "\"%s\" - �то не таблица, материализованное пред�тавление или �торонн�� "
 "таблица"
 
-#: commands/tablecmds.c:4359
+#: commands/tablecmds.c:4360
 #, c-format
 msgid "\"%s\" is not a table or foreign table"
 msgstr "\"%s\" - �то не таблица и не �торонн�� таблица"
 
-#: commands/tablecmds.c:4362
+#: commands/tablecmds.c:4363
 #, c-format
 msgid "\"%s\" is not a table, composite type, or foreign table"
 msgstr "\"%s\" - �то не таблица, �о�тавной тип или �торонн�� таблица"
 
-#: commands/tablecmds.c:4365 commands/tablecmds.c:5395
+#: commands/tablecmds.c:4366 commands/tablecmds.c:5396
 #, c-format
 msgid "\"%s\" is not a table, materialized view, index, or foreign table"
 msgstr ""
 "\"%s\" - �то не таблица, материализованное пред�тавление, индек� или "
 "�торонн�� таблица"
 
-#: commands/tablecmds.c:4375
+#: commands/tablecmds.c:4376
 #, c-format
 msgid "\"%s\" is of the wrong type"
 msgstr "неправильный тип \"%s\""
 
-#: commands/tablecmds.c:4527 commands/tablecmds.c:4534
+#: commands/tablecmds.c:4528 commands/tablecmds.c:4535
 #, c-format
 msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
 msgstr ""
 "изменить тип \"%s\" нельз�, так как он задей�твован в �толбце \"%s.%s\""
 
-#: commands/tablecmds.c:4541
+#: commands/tablecmds.c:4542
 #, c-format
 msgid ""
 "cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
@@ -8279,143 +8259,143 @@
 "изменить �тороннюю таблицу \"%s\" нельз�, так как �толбец \"%s.%s\" "
 "задей�твует тип её �троки"
 
-#: commands/tablecmds.c:4548
+#: commands/tablecmds.c:4549
 #, c-format
 msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr ""
 "изменить таблицу \"%s\" нельз�, так как �толбец \"%s.%s\" задей�твует тип её "
 "�троки"
 
-#: commands/tablecmds.c:4610
+#: commands/tablecmds.c:4611
 #, c-format
 msgid "cannot alter type \"%s\" because it is the type of a typed table"
 msgstr "изменить тип \"%s\", так как �то тип типизированной таблицы"
 
-#: commands/tablecmds.c:4612
+#: commands/tablecmds.c:4613
 #, c-format
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
 msgstr ""
 "Чтобы изменить также типизированные таблицы, выполните ALTER ... CASCADE."
 
-#: commands/tablecmds.c:4656
+#: commands/tablecmds.c:4657
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "тип %s не �вл�ет�� �о�тавным"
 
-#: commands/tablecmds.c:4682
+#: commands/tablecmds.c:4683
 #, c-format
 msgid "cannot add column to typed table"
 msgstr "добавить �толбец в типизированную таблицу нельз�"
 
-#: commands/tablecmds.c:4749 commands/tablecmds.c:10224
+#: commands/tablecmds.c:4750 commands/tablecmds.c:10322
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr "дочерн�� таблица \"%s\" имеет другой тип дл� �толбца \"%s\""
 
-#: commands/tablecmds.c:4755 commands/tablecmds.c:10231
+#: commands/tablecmds.c:4756 commands/tablecmds.c:10329
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
 msgstr ""
 "дочерн�� таблица \"%s\" имеет другое правило �ортировки дл� �толбца \"%s\""
 
-#: commands/tablecmds.c:4765
+#: commands/tablecmds.c:4766
 #, c-format
 msgid "child table \"%s\" has a conflicting \"%s\" column"
 msgstr "дочерн�� таблица \"%s\" �одержит конфликтующий �толбец \"%s\""
 
-#: commands/tablecmds.c:4777
+#: commands/tablecmds.c:4778
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr "объединение определений �толбца \"%s\" дл� потомка \"%s\""
 
-#: commands/tablecmds.c:4998
+#: commands/tablecmds.c:4999
 #, c-format
 msgid "column must be added to child tables too"
 msgstr "�толбец также должен быть добавлен к дочерним таблицам"
 
-#: commands/tablecmds.c:5068
+#: commands/tablecmds.c:5069
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "�толбец \"%s\" отношени� \"%s\" уже �уще�твует"
 
-#: commands/tablecmds.c:5176 commands/tablecmds.c:5282
-#: commands/tablecmds.c:5340 commands/tablecmds.c:5454
-#: commands/tablecmds.c:5511 commands/tablecmds.c:5605
-#: commands/tablecmds.c:7854 commands/tablecmds.c:8479
+#: commands/tablecmds.c:5177 commands/tablecmds.c:5283
+#: commands/tablecmds.c:5341 commands/tablecmds.c:5455
+#: commands/tablecmds.c:5512 commands/tablecmds.c:5606
+#: commands/tablecmds.c:7895 commands/tablecmds.c:8577
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "�и�темный �толбец \"%s\" нельз� изменить"
 
-#: commands/tablecmds.c:5212
+#: commands/tablecmds.c:5213
 #, c-format
 msgid "column \"%s\" is in a primary key"
 msgstr "�толбец \"%s\" входит в первичный ключ"
 
-#: commands/tablecmds.c:5427
+#: commands/tablecmds.c:5428
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "целевое ограничение �тати�тики �лишком мало (%d)"
 
-#: commands/tablecmds.c:5435
+#: commands/tablecmds.c:5436
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "целевое ограничение �тати�тики �нижает�� до %d"
 
-#: commands/tablecmds.c:5585
+#: commands/tablecmds.c:5586
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "неверный тип хранилища \"%s\""
 
-#: commands/tablecmds.c:5617
+#: commands/tablecmds.c:5618
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "тип данных �толбца %s �овме�тим только � хранилищем PLAIN"
 
-#: commands/tablecmds.c:5655
+#: commands/tablecmds.c:5656
 #, c-format
 msgid "cannot drop column from typed table"
 msgstr "нельз� удалить �толбец в типизированной таблице"
 
-#: commands/tablecmds.c:5699
+#: commands/tablecmds.c:5700
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "�толбец \"%s\" в таблице\"%s\" не �уще�твует, пропу�кает��"
 
-#: commands/tablecmds.c:5712
+#: commands/tablecmds.c:5713
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "нельз� удалить �и�темный �толбец \"%s\""
 
-#: commands/tablecmds.c:5719
+#: commands/tablecmds.c:5720
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "нельз� удалить на�ледованный �толбец \"%s\""
 
-#: commands/tablecmds.c:5959
+#: commands/tablecmds.c:5960
 #, c-format
 msgid ""
 "ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
 msgstr ""
 "ALTER TABLE / ADD CONSTRAINT USING INDEX переименует индек� \"%s\" в \"%s\""
 
-#: commands/tablecmds.c:6172
+#: commands/tablecmds.c:6173
 #, c-format
 msgid "constraint must be added to child tables too"
 msgstr "ограничение также должно быть добавлено к дочерним таблицам"
 
-#: commands/tablecmds.c:6243
+#: commands/tablecmds.c:6244
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "указанный объект \"%s\" не �вл�ет�� таблицей"
 
-#: commands/tablecmds.c:6266
+#: commands/tablecmds.c:6267
 #, c-format
 msgid "constraints on permanent tables may reference only permanent tables"
 msgstr ""
 "ограничени� в по�то�нных таблицах могут ��ылать�� только на по�то�нные "
 "таблицы"
 
-#: commands/tablecmds.c:6273
+#: commands/tablecmds.c:6274
 #, c-format
 msgid ""
 "constraints on unlogged tables may reference only permanent or unlogged "
@@ -8424,13 +8404,13 @@
 "ограничени� в нежурналируемых таблицах могут ��ылать�� только на по�то�нные "
 "или нежурналируемые таблицы"
 
-#: commands/tablecmds.c:6279
+#: commands/tablecmds.c:6280
 #, c-format
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr ""
 "ограничени� во временных таблицах могут ��ылать�� только на временные таблицы"
 
-#: commands/tablecmds.c:6283
+#: commands/tablecmds.c:6284
 #, c-format
 msgid ""
 "constraints on temporary tables must involve temporary tables of this session"
@@ -8438,33 +8418,33 @@
 "ограничени� во временных таблицах должны ��ылать�� только на временные "
 "таблицы текущего �еан�а"
 
-#: commands/tablecmds.c:6344
+#: commands/tablecmds.c:6345
 #, c-format
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr "чи�ло �толбцов в и�точнике и назначении внешнего ключа не �овпадает"
 
-#: commands/tablecmds.c:6451
+#: commands/tablecmds.c:6452
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "ограничение внешнего ключа \"%s\" нельз� реализовать"
 
-#: commands/tablecmds.c:6454
+#: commands/tablecmds.c:6455
 #, c-format
 msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
 msgstr "Столбцы ключа \"%s\" и \"%s\" имеют не�овме�тимые типы: %s и %s."
 
-#: commands/tablecmds.c:6661 commands/tablecmds.c:6811
-#: commands/tablecmds.c:7693 commands/tablecmds.c:7749
+#: commands/tablecmds.c:6662 commands/tablecmds.c:6830
+#: commands/tablecmds.c:7734 commands/tablecmds.c:7790
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "ограничение \"%s\" в таблице \"%s\" не �уще�твует"
 
-#: commands/tablecmds.c:6667
+#: commands/tablecmds.c:6668
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" is not a foreign key constraint"
 msgstr "ограничение \"%s\" в таблице \"%s\" не �вл�ет�� внешним ключом"
 
-#: commands/tablecmds.c:6818
+#: commands/tablecmds.c:6837
 #, c-format
 msgid ""
 "constraint \"%s\" of relation \"%s\" is not a foreign key or check constraint"
@@ -8472,46 +8452,46 @@
 "ограничение \"%s\" в таблице \"%s\" не �вл�ет�� внешним ключом или "
 "ограничением-проверкой"
 
-#: commands/tablecmds.c:6886
+#: commands/tablecmds.c:6906
 #, c-format
 msgid "constraint must be validated on child tables too"
 msgstr "ограничение также должно �облюдать�� в дочерних таблицах"
 
-#: commands/tablecmds.c:6955
+#: commands/tablecmds.c:6975
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "�толбец \"%s\", указанный в ограничении внешнего ключа, не �уще�твует"
 
-#: commands/tablecmds.c:6960
+#: commands/tablecmds.c:6980
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "во внешнем ключе не может быть больше %d �толбцов"
 
-#: commands/tablecmds.c:7025
+#: commands/tablecmds.c:7045
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr ""
 "и�пользовать откладываемый первичный ключ в целевой внешней таблице \"%s\" "
 "нельз�"
 
-#: commands/tablecmds.c:7042
+#: commands/tablecmds.c:7062
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "в целевой внешней таблице \"%s\" нет первичного ключа"
 
-#: commands/tablecmds.c:7107
+#: commands/tablecmds.c:7127
 #, c-format
 msgid "foreign key referenced-columns list must not contain duplicates"
 msgstr "в �пи�ке �толбцов внешнего ключа не должно быть повторений"
 
-#: commands/tablecmds.c:7201
+#: commands/tablecmds.c:7221
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr ""
 "и�пользовать откладываемое ограничение уникально�ти в целевой внешней "
 "таблице \"%s\" нельз�"
 
-#: commands/tablecmds.c:7206
+#: commands/tablecmds.c:7226
 #, c-format
 msgid ""
 "there is no unique constraint matching given keys for referenced table \"%s\""
@@ -8519,32 +8499,32 @@
 "в целевой внешней таблице \"%s\" нет ограничени� уникально�ти, "
 "�оответ�твующего данным ключам"
 
-#: commands/tablecmds.c:7369
+#: commands/tablecmds.c:7389
 #, c-format
 msgid "validating foreign key constraint \"%s\""
 msgstr "проверка ограничени� внешнего ключа \"%s\""
 
-#: commands/tablecmds.c:7665
+#: commands/tablecmds.c:7688
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "удалить на�ледованное ограничение \"%s\" таблицы \"%s\" нельз�"
 
-#: commands/tablecmds.c:7699
+#: commands/tablecmds.c:7740
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "ограничение \"%s\" в таблице \"%s\" не �уще�твует, пропу�кает��"
 
-#: commands/tablecmds.c:7838
+#: commands/tablecmds.c:7879
 #, c-format
 msgid "cannot alter column type of typed table"
 msgstr "изменить тип �толбца в типизированной таблице нельз�"
 
-#: commands/tablecmds.c:7861
+#: commands/tablecmds.c:7902
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "изменить на�ледованный �толбец \"%s\" нельз�"
 
-#: commands/tablecmds.c:7910
+#: commands/tablecmds.c:7951
 #, c-format
 msgid ""
 "result of USING clause for column \"%s\" cannot be cast automatically to "
@@ -8552,193 +8532,199 @@
 msgstr ""
 "результат USING дл� �толбца \"%s\" нельз� автоматиче�ки приве�ти к типу %s"
 
-#: commands/tablecmds.c:7913
+#: commands/tablecmds.c:7954
 #, c-format
 msgid "You might need to add an explicit cast."
 msgstr "Возможно, необходимо добавить �вное приведение."
 
-#: commands/tablecmds.c:7917
+#: commands/tablecmds.c:7958
 #, c-format
 msgid "column \"%s\" cannot be cast automatically to type %s"
 msgstr "�толбец \"%s\" нельз� автоматиче�ки приве�ти к типу %s"
 
+# skip-rule: double-colons
 #. translator: USING is SQL, don't translate it
-#: commands/tablecmds.c:7920
+#: commands/tablecmds.c:7961
 #, c-format
 msgid "You might need to specify \"USING %s::%s\"."
 msgstr "Возможно, необходимо указать \"USING %s::%s\"."
 
-#: commands/tablecmds.c:7973
+#: commands/tablecmds.c:8060
+#, c-format
+msgid "USING expression contains a whole-row table reference."
+msgstr "Выражение USING ��ылает�� на тип в�ей �троки таблицы."
+
+#: commands/tablecmds.c:8071
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr ""
 "тип на�ледованного �толбца \"%s\" должен быть изменён и в дочерних таблицах"
 
-#: commands/tablecmds.c:8060
+#: commands/tablecmds.c:8158
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "нельз� изменить тип �толбца \"%s\" дважды"
 
-#: commands/tablecmds.c:8096
+#: commands/tablecmds.c:8194
 #, c-format
 msgid "default for column \"%s\" cannot be cast automatically to type %s"
 msgstr ""
 "значение по умолчанию дл� �толбца \"%s\" нельз� автоматиче�ки приве�ти к "
 "типу %s"
 
-#: commands/tablecmds.c:8222
+#: commands/tablecmds.c:8320
 #, c-format
 msgid "cannot alter type of a column used by a view or rule"
 msgstr ""
 "изменить тип �толбца, задей�твованного в пред�тавлении или правиле, нельз�"
 
-#: commands/tablecmds.c:8223 commands/tablecmds.c:8242
-#: commands/tablecmds.c:8260
+#: commands/tablecmds.c:8321 commands/tablecmds.c:8340
+#: commands/tablecmds.c:8358
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s зави�ит от �толбца \"%s\""
 
-#: commands/tablecmds.c:8241
+#: commands/tablecmds.c:8339
 #, c-format
 msgid "cannot alter type of a column used in a trigger definition"
 msgstr "изменить тип �толбца, задей�твованного в определении триггера, нельз�"
 
-#: commands/tablecmds.c:8259
+#: commands/tablecmds.c:8357
 #, c-format
 msgid "cannot alter type of a column used in a policy definition"
 msgstr "изменить тип �толбца, задей�твованного в определении политики, нельз�"
 
-#: commands/tablecmds.c:8924
+#: commands/tablecmds.c:9022
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "�менить владельца индек�а \"%s\" нельз�"
 
-#: commands/tablecmds.c:8926
+#: commands/tablecmds.c:9024
 #, c-format
 msgid "Change the ownership of the index's table, instead."
 msgstr "Однако возможно �менить владельца таблицы, �одержащей �тот индек�."
 
-#: commands/tablecmds.c:8942
+#: commands/tablecmds.c:9040
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "�менить владельца по�ледовательно�ти \"%s\" нельз�"
 
-#: commands/tablecmds.c:8944 commands/tablecmds.c:11355
+#: commands/tablecmds.c:9042 commands/tablecmds.c:11513
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "По�ледовательно�ть \"%s\" �в�зана � таблицей \"%s\"."
 
-#: commands/tablecmds.c:8956 commands/tablecmds.c:11996
+#: commands/tablecmds.c:9054 commands/tablecmds.c:12154
 #, c-format
 msgid "Use ALTER TYPE instead."
 msgstr "И�пользуйте ALTER TYPE."
 
-#: commands/tablecmds.c:8965
+#: commands/tablecmds.c:9063
 #, c-format
 msgid "\"%s\" is not a table, view, sequence, or foreign table"
 msgstr ""
 "\"%s\" - �то не таблица, TOAST-таблица, индек�, пред�тавление или "
 "по�ледовательно�ть"
 
-#: commands/tablecmds.c:9308
+#: commands/tablecmds.c:9406
 #, c-format
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "в одной ин�трукции не может быть не�колько подкоманд SET TABLESPACE"
 
-#: commands/tablecmds.c:9381
+#: commands/tablecmds.c:9479
 #, c-format
 msgid "\"%s\" is not a table, view, materialized view, index, or TOAST table"
 msgstr ""
 "\"%s\" - �то не таблица, пред�тавление, материализованное пред�тавление, "
 "индек� или TOAST-таблица"
 
-#: commands/tablecmds.c:9414 commands/view.c:481
+#: commands/tablecmds.c:9512 commands/view.c:498
 #, c-format
 msgid "WITH CHECK OPTION is supported only on automatically updatable views"
 msgstr ""
 "WITH CHECK OPTION поддерживает�� только � автообновл�емыми пред�тавлени�ми"
 
-#: commands/tablecmds.c:9560
+#: commands/tablecmds.c:9658
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "переме�тить �и�темную таблицу \"%s\" нельз�"
 
-#: commands/tablecmds.c:9576
+#: commands/tablecmds.c:9674
 #, c-format
 msgid "cannot move temporary tables of other sessions"
 msgstr "перемещать временные таблицы других �еан�ов нельз�"
 
-#: commands/tablecmds.c:9713
+#: commands/tablecmds.c:9811
 #, c-format
 msgid "only tables, indexes, and materialized views exist in tablespaces"
 msgstr ""
 "в табличных про�тран�твах е�ть только таблицы, индек�ы и материализованные "
 "пред�тавлени�"
 
-#: commands/tablecmds.c:9725
+#: commands/tablecmds.c:9823
 #, c-format
 msgid "cannot move relations in to or out of pg_global tablespace"
 msgstr "перемещать объекты в/из табличного про�тран�тва pg_global нельз�"
 
-#: commands/tablecmds.c:9816
+#: commands/tablecmds.c:9914
 #, c-format
 msgid "aborting because lock on relation \"%s.%s\" is not available"
 msgstr ""
 "обработка прерывает�� из-за невозможно�ти заблокировать отношение \"%s.%s\""
 
-#: commands/tablecmds.c:9832
+#: commands/tablecmds.c:9930
 #, c-format
 msgid "no matching relations in tablespace \"%s\" found"
 msgstr "в табличном про�тран�тве \"%s\" не найдены подход�щие отношени�"
 
-#: commands/tablecmds.c:9906 storage/buffer/bufmgr.c:801
+#: commands/tablecmds.c:10004 storage/buffer/bufmgr.c:801
 #, c-format
 msgid "invalid page in block %u of relation %s"
 msgstr "неверна� �траница в блоке %u отношени� %s"
 
-#: commands/tablecmds.c:9988
+#: commands/tablecmds.c:10086
 #, c-format
 msgid "cannot change inheritance of typed table"
 msgstr "изменить на�ледование типизированной таблицы нельз�"
 
-#: commands/tablecmds.c:10038
+#: commands/tablecmds.c:10136
 #, c-format
 msgid "cannot inherit to temporary relation of another session"
 msgstr "на�ледование дл� временного отношени� другого �еан�а невозможно"
 
-#: commands/tablecmds.c:10092
+#: commands/tablecmds.c:10190
 #, c-format
 msgid "circular inheritance not allowed"
 msgstr "цикличе�кое на�ледование недопу�тимо"
 
-#: commands/tablecmds.c:10093
+#: commands/tablecmds.c:10191
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "\"%s\" уже �вл�ет�� потомком \"%s\"."
 
-#: commands/tablecmds.c:10101
+#: commands/tablecmds.c:10199
 #, c-format
 msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
 msgstr "таблица \"%s\" без OID не может на�ледовать�� от таблицы \"%s\" � OID"
 
-#: commands/tablecmds.c:10242
+#: commands/tablecmds.c:10340
 #, c-format
 msgid "column \"%s\" in child table must be marked NOT NULL"
 msgstr "�толбец \"%s\" в дочерней таблице должен быть помечен как NOT NULL"
 
-#: commands/tablecmds.c:10258
+#: commands/tablecmds.c:10356 commands/tablecmds.c:10389
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "в дочерней таблице не хватает �толбца \"%s\""
 
-#: commands/tablecmds.c:10341
+#: commands/tablecmds.c:10472
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr ""
 "дочерн�� таблица \"%s\" �одержит другое определение ограничени�-проверки \"%s"
 "\""
 
-#: commands/tablecmds.c:10349
+#: commands/tablecmds.c:10480
 #, c-format
 msgid ""
 "constraint \"%s\" conflicts with non-inherited constraint on child table \"%s"
@@ -8747,76 +8733,93 @@
 "ограничение \"%s\" конфликтует � нена�ледуемым ограничением дочерней таблицы "
 "\"%s\""
 
-#: commands/tablecmds.c:10373
+#: commands/tablecmds.c:10491
+#, c-format
+msgid ""
+"constraint \"%s\" conflicts with NOT VALID constraint on child table \"%s\""
+msgstr ""
+"ограничение \"%s\" конфликтует � непроверенным (NOT VALID) ограничением "
+"дочерней таблицы \"%s\""
+
+#: commands/tablecmds.c:10515
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "в дочерней таблице не хватает ограничени� \"%s\""
 
-#: commands/tablecmds.c:10457
+#: commands/tablecmds.c:10599
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "отношение \"%s\" не �вл�ет�� предком отношени� \"%s\""
 
-#: commands/tablecmds.c:10691
+#: commands/tablecmds.c:10833
 #, c-format
 msgid "typed tables cannot inherit"
 msgstr "типизированные таблицы не могут на�ледовать��"
 
-#: commands/tablecmds.c:10722
+#: commands/tablecmds.c:10864
 #, c-format
 msgid "table is missing column \"%s\""
 msgstr "в таблице не хватает �толбца \"%s\""
 
-#: commands/tablecmds.c:10732
+#: commands/tablecmds.c:10874
 #, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
 msgstr "таблица �одержит �толбец \"%s\", тогда как тип требует \"%s\""
 
-#: commands/tablecmds.c:10741
+#: commands/tablecmds.c:10883
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
 msgstr "таблица \"%s\" �одержит �толбец \"%s\" другого типа"
 
-#: commands/tablecmds.c:10754
+#: commands/tablecmds.c:10896
 #, c-format
 msgid "table has extra column \"%s\""
 msgstr "таблица �одержит лишний �толбец \"%s\""
 
-#: commands/tablecmds.c:10806
+#: commands/tablecmds.c:10948
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "\"%s\" - �то не типизированна� таблица"
 
-#: commands/tablecmds.c:10989
+#: commands/tablecmds.c:11131
 #, c-format
 msgid "cannot use non-unique index \"%s\" as replica identity"
 msgstr ""
 "дл� идентификации реплики нельз� и�пользовать неуникальный индек� \"%s\""
 
-#: commands/tablecmds.c:10995
+#: commands/tablecmds.c:11137
 #, c-format
 msgid "cannot use non-immediate index \"%s\" as replica identity"
 msgstr ""
 "дл� идентификации реплики нельз� и�пользовать не непо�ред�твенный индек� \"%s"
 "\""
 
-#: commands/tablecmds.c:11001
+#: commands/tablecmds.c:11143
 #, c-format
 msgid "cannot use expression index \"%s\" as replica identity"
 msgstr ""
 "дл� идентификации реплики нельз� и�пользовать индек� � выражением \"%s\""
 
-#: commands/tablecmds.c:11007
+#: commands/tablecmds.c:11149
 #, c-format
 msgid "cannot use partial index \"%s\" as replica identity"
 msgstr "дл� идентификации реплики нельз� и�пользовать ча�тичный индек� \"%s\""
 
-#: commands/tablecmds.c:11013
+#: commands/tablecmds.c:11155
 #, c-format
 msgid "cannot use invalid index \"%s\" as replica identity"
 msgstr "дл� идентификации реплики нельз� и�пользовать нерабочий индек� \"%s\""
 
-#: commands/tablecmds.c:11031
+#: commands/tablecmds.c:11176
+#, c-format
+msgid ""
+"index \"%s\" cannot be used as replica identity because column %d is a "
+"system column"
+msgstr ""
+"индек� \"%s\" нельз� и�пользовать дл� идентификации реплики, так как �толбец "
+"%d - �и�темный"
+
+#: commands/tablecmds.c:11183
 #, c-format
 msgid ""
 "index \"%s\" cannot be used as replica identity because column \"%s\" is "
@@ -8825,13 +8828,13 @@
 "индек� \"%s\" нельз� и�пользовать дл� идентификации реплики, так как �толбец "
 "\"%s\" допу�кает NULL"
 
-#: commands/tablecmds.c:11228
+#: commands/tablecmds.c:11386
 #, c-format
 msgid "cannot change logged status of table \"%s\" because it is temporary"
 msgstr ""
 "изменить �о�то�ние журналировани� таблицы %s нельз�, так как она временна�"
 
-#: commands/tablecmds.c:11287
+#: commands/tablecmds.c:11445
 #, c-format
 msgid ""
 "could not change table \"%s\" to logged because it references unlogged table "
@@ -8840,7 +8843,7 @@
 "не удало�ь �делать таблицу \"%s\" журналируемой, так как она ��ылает�� на "
 "нежурналируемую таблицу \"%s\""
 
-#: commands/tablecmds.c:11297
+#: commands/tablecmds.c:11455
 #, c-format
 msgid ""
 "could not change table \"%s\" to unlogged because it references logged table "
@@ -8849,22 +8852,22 @@
 "не удало�ь �делать таблицу \"%s\" нежурналируемой, так как она ��ылает�� на "
 "журналируемую таблицу \"%s\""
 
-#: commands/tablecmds.c:11354
+#: commands/tablecmds.c:11512
 #, c-format
 msgid "cannot move an owned sequence into another schema"
 msgstr "переме�тить по�ледовательно�ть � владельцем в другую �хему нельз�"
 
-#: commands/tablecmds.c:11455
+#: commands/tablecmds.c:11613
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "отношение \"%s\" уже �уще�твует в �хеме \"%s\""
 
-#: commands/tablecmds.c:11980
+#: commands/tablecmds.c:12138
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "\"%s\" - �то не �о�тавной тип"
 
-#: commands/tablecmds.c:12010
+#: commands/tablecmds.c:12168
 #, c-format
 msgid ""
 "\"%s\" is not a table, view, materialized view, sequence, or foreign table"
@@ -8874,7 +8877,7 @@
 
 #: commands/tablespace.c:162 commands/tablespace.c:179
 #: commands/tablespace.c:190 commands/tablespace.c:198
-#: commands/tablespace.c:625 replication/slot.c:914 storage/file/copydir.c:47
+#: commands/tablespace.c:625 replication/slot.c:941 storage/file/copydir.c:47
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не удало�ь �оздать каталог \"%s\": %m"
@@ -8919,24 +8922,24 @@
 msgid "tablespace location should not be inside the data directory"
 msgstr "табличное про�тран�тво не должно ра�полагать�� внутри каталога данных"
 
-#: commands/tablespace.c:304 commands/tablespace.c:938
+#: commands/tablespace.c:304 commands/tablespace.c:952
 #, c-format
 msgid "unacceptable tablespace name \"%s\""
 msgstr "неприемлемое им� табличного про�тран�тва: \"%s\""
 
-#: commands/tablespace.c:306 commands/tablespace.c:939
+#: commands/tablespace.c:306 commands/tablespace.c:953
 #, c-format
 msgid "The prefix \"pg_\" is reserved for system tablespaces."
 msgstr "Префик� \"pg_\" зарезервирован дл� �и�темных табличных про�тран�тв."
 
-#: commands/tablespace.c:316 commands/tablespace.c:951
+#: commands/tablespace.c:316 commands/tablespace.c:965
 #, c-format
 msgid "tablespace \"%s\" already exists"
 msgstr "табличное про�тран�тво \"%s\" уже �уще�твует"
 
-#: commands/tablespace.c:430 commands/tablespace.c:921
-#: commands/tablespace.c:1002 commands/tablespace.c:1071
-#: commands/tablespace.c:1204 commands/tablespace.c:1404
+#: commands/tablespace.c:430 commands/tablespace.c:935
+#: commands/tablespace.c:1016 commands/tablespace.c:1085
+#: commands/tablespace.c:1218 commands/tablespace.c:1418
 #, c-format
 msgid "tablespace \"%s\" does not exist"
 msgstr "табличное про�тран�тво \"%s\" не �уще�твует"
@@ -8973,32 +8976,32 @@
 msgstr "каталог \"%s\" уже и�пользует�� как табличное про�тран�тво"
 
 #: commands/tablespace.c:744 commands/tablespace.c:757
-#: commands/tablespace.c:781 commands/tablespace.c:872
+#: commands/tablespace.c:793 commands/tablespace.c:885
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "ошибка при удалении каталога \"%s\": %m"
 
-#: commands/tablespace.c:793 commands/tablespace.c:881
+#: commands/tablespace.c:806 commands/tablespace.c:894
 #, c-format
 msgid "could not remove symbolic link \"%s\": %m"
 msgstr "ошибка при удалении �имволиче�кой ��ылки \"%s\": %m"
 
-#: commands/tablespace.c:803 commands/tablespace.c:889
+#: commands/tablespace.c:816 commands/tablespace.c:903
 #, c-format
 msgid "\"%s\" is not a directory or symbolic link"
 msgstr "\"%s\" - �то не каталог или �имволиче�ка� ��ылка"
 
-#: commands/tablespace.c:1076
+#: commands/tablespace.c:1090
 #, c-format
 msgid "Tablespace \"%s\" does not exist."
 msgstr "Табличное про�тран�тво \"%s\" не �уще�твует."
 
-#: commands/tablespace.c:1503
+#: commands/tablespace.c:1517
 #, c-format
 msgid "directories for tablespace %u could not be removed"
 msgstr "удалить каталоги табличного про�тран�тва %u не удало�ь"
 
-#: commands/tablespace.c:1505
+#: commands/tablespace.c:1519
 #, c-format
 msgid "You can remove the directories manually if necessary."
 msgstr "При необходимо�ти вы можете удалить их вручную."
@@ -9149,8 +9152,8 @@
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "триггер BEFORE STATEMENT не может возвращать значение"
 
-#: commands/trigger.c:2727 executor/nodeModifyTable.c:648
-#: executor/nodeModifyTable.c:942
+#: commands/trigger.c:2727 executor/nodeModifyTable.c:663
+#: executor/nodeModifyTable.c:957
 #, c-format
 msgid ""
 "tuple to be updated was already modified by an operation triggered by the "
@@ -9159,8 +9162,8 @@
 "кортеж, который должен быть изменён, уже модифицирован в операции, вызванной "
 "текущей командой"
 
-#: commands/trigger.c:2728 executor/nodeModifyTable.c:649
-#: executor/nodeModifyTable.c:943
+#: commands/trigger.c:2728 executor/nodeModifyTable.c:664
+#: executor/nodeModifyTable.c:958
 #, c-format
 msgid ""
 "Consider using an AFTER trigger instead of a BEFORE trigger to propagate "
@@ -9169,10 +9172,9 @@
 "Возможно, дл� ра�про�транени� изменений в другие �троки �ледует и�пользовать "
 "триггер AFTER вме�то BEFORE."
 
-#: commands/trigger.c:2742 executor/execMain.c:2344
-#: executor/nodeLockRows.c:216 executor/nodeModifyTable.c:183
-#: executor/nodeModifyTable.c:661 executor/nodeModifyTable.c:955
-#: executor/nodeModifyTable.c:1122
+#: commands/trigger.c:2742 executor/execMain.c:2344 executor/nodeLockRows.c:216
+#: executor/nodeModifyTable.c:196 executor/nodeModifyTable.c:676
+#: executor/nodeModifyTable.c:970 executor/nodeModifyTable.c:1137
 #, c-format
 msgid "could not serialize access due to concurrent update"
 msgstr "не удало�ь �ериализовать до�туп из-за параллельного изменени�"
@@ -9788,62 +9790,62 @@
 "Скорее закройте открытые транзакции в мультитранзакци�х, чтобы избежать "
 "проблемы наложени�."
 
-#: commands/vacuum.c:1130
+#: commands/vacuum.c:1138
 #, c-format
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr ""
 "е�ть базы данных, которые не очищали�ь на прот�жении более чем 2 миллиардов "
 "транзакций"
 
-#: commands/vacuum.c:1131
+#: commands/vacuum.c:1139
 #, c-format
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr "Возможно, вы уже потер�ли данные в результате наложени� ID транзакций."
 
-#: commands/vacuum.c:1252
+#: commands/vacuum.c:1260
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "очи�тка \"%s\" пропу�кает�� --- блокировка недо�тупна"
 
-#: commands/vacuum.c:1278
+#: commands/vacuum.c:1286
 #, c-format
 msgid "skipping \"%s\" --- only superuser can vacuum it"
 msgstr ""
 "\"%s\" пропу�кает�� --- только �уперпользователь может очи�тить �ту таблицу"
 
-#: commands/vacuum.c:1282
+#: commands/vacuum.c:1290
 #, c-format
 msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
 msgstr ""
 "пропу�кает�� \"%s\" --- только �уперпользователь или владелец БД может "
 "очи�тить �ту таблицу"
 
-#: commands/vacuum.c:1286
+#: commands/vacuum.c:1294
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can vacuum it"
 msgstr ""
 "\"%s\" пропу�кает�� --- только владелец базы данных или �той таблицы может "
 "очи�тить её"
 
-#: commands/vacuum.c:1304
+#: commands/vacuum.c:1312
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr ""
 "\"%s\" пропу�кает�� --- очищать не таблицы или �пециальные �и�темные таблицы "
 "нельз�"
 
-#: commands/vacuumlazy.c:358
+#: commands/vacuumlazy.c:363
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
 msgstr ""
 "автоматиче�ка� очи�тка таблицы \"%s.%s.%s\": �канирований индек�а: %d\n"
 
-#: commands/vacuumlazy.c:363
+#: commands/vacuumlazy.c:368
 #, c-format
 msgid "pages: %u removed, %u remain, %u skipped due to pins\n"
 msgstr "�траниц: удалено: %u, о�тало�ь: %u, пропущено (закреплённых): %u\n"
 
-#: commands/vacuumlazy.c:368
+#: commands/vacuumlazy.c:373
 #, c-format
 msgid ""
 "tuples: %.0f removed, %.0f remain, %.0f are dead but not yet removable\n"
@@ -9851,45 +9853,45 @@
 "вер�ий �трок: удалено: %.0f, о�тало�ь: %.0f, «мёртвых», но ещё не подлежащих "
 "удалению: %.0f\n"
 
-#: commands/vacuumlazy.c:373
+#: commands/vacuumlazy.c:378
 #, c-format
 msgid "buffer usage: %d hits, %d misses, %d dirtied\n"
 msgstr ""
 "и�пользование буфера: попаданий: %d, промахов: %d, «гр�зных» запи�ей: %d\n"
 
-#: commands/vacuumlazy.c:377
+#: commands/vacuumlazy.c:382
 #, c-format
 msgid "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"
 msgstr ""
 "�редн�� �коро�ть чтени�: %.3f МБ/�, �редн�� �коро�ть запи�и: %.3f МБ/�\n"
 
-#: commands/vacuumlazy.c:379
+#: commands/vacuumlazy.c:384
 #, c-format
 msgid "system usage: %s"
 msgstr "нагрузка �и�темы: %s"
 
-#: commands/vacuumlazy.c:701
+#: commands/vacuumlazy.c:708
 #, c-format
 msgid "relation \"%s\" page %u is uninitialized --- fixing"
 msgstr ""
 "в отношении \"%s\" не инициализирована �траница %u --- �итуаци� и�правл�ет��"
 
-#: commands/vacuumlazy.c:1113
+#: commands/vacuumlazy.c:1120
 #, c-format
 msgid "\"%s\": removed %.0f row versions in %u pages"
 msgstr "\"%s\": удалено вер�ий �трок: %.0f, обработано �траниц: %u"
 
-#: commands/vacuumlazy.c:1123
+#: commands/vacuumlazy.c:1130
 #, c-format
 msgid "%.0f dead row versions cannot be removed yet.\n"
 msgstr "В данный момент нельз� удалить \"мёртвых\" �трок: %.0f.\n"
 
-#: commands/vacuumlazy.c:1125
+#: commands/vacuumlazy.c:1132
 #, c-format
 msgid "There were %.0f unused item pointers.\n"
 msgstr "�айдено неи�пользованных указателей: %.0f.\n"
 
-#: commands/vacuumlazy.c:1127
+#: commands/vacuumlazy.c:1134
 #, c-format
 msgid "Skipped %u page due to buffer pins.\n"
 msgid_plural "Skipped %u pages due to buffer pins.\n"
@@ -9897,7 +9899,7 @@
 msgstr[1] "Пропущено �траниц, закреплённых в буфере: %u.\n"
 msgstr[2] "Пропущено �траниц, закреплённых в буфере: %u.\n"
 
-#: commands/vacuumlazy.c:1131
+#: commands/vacuumlazy.c:1138
 #, c-format
 msgid "%u page is entirely empty.\n"
 msgid_plural "%u pages are entirely empty.\n"
@@ -9905,7 +9907,7 @@
 msgstr[1] "Полно�тью пу�тых �траниц: %u.\n"
 msgstr[2] "Полно�тью пу�тых �траниц: %u.\n"
 
-#: commands/vacuumlazy.c:1139
+#: commands/vacuumlazy.c:1146
 #, c-format
 msgid ""
 "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u "
@@ -9914,22 +9916,22 @@
 "\"%s\": найдено удал�емых вер�ий �трок: %.0f, неудал�емых - %.0f, обработано "
 "�траниц: %u, в�его �траниц: %u"
 
-#: commands/vacuumlazy.c:1208
+#: commands/vacuumlazy.c:1215
 #, c-format
 msgid "\"%s\": removed %d row versions in %d pages"
 msgstr "\"%s\": удалено вер�ий �трок: %d, обработано �траниц: %d"
 
-#: commands/vacuumlazy.c:1375
+#: commands/vacuumlazy.c:1382
 #, c-format
 msgid "scanned index \"%s\" to remove %d row versions"
 msgstr "про�канирован индек� \"%s\", удалено вер�ий �трок: %d"
 
-#: commands/vacuumlazy.c:1421
+#: commands/vacuumlazy.c:1428
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "индек� \"%s\" теперь �одержит вер�ий �трок: %.0f, в �траницах: %u"
 
-#: commands/vacuumlazy.c:1425
+#: commands/vacuumlazy.c:1432
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -9940,22 +9942,22 @@
 "Удалено индек�ных �траниц: %u, пригодно дл� повторного и�пользовани�: %u.\n"
 "%s."
 
-#: commands/vacuumlazy.c:1482
+#: commands/vacuumlazy.c:1489
 #, c-format
 msgid "\"%s\": stopping truncate due to conflicting lock request"
 msgstr "\"%s\": о�тановка у�ечени� из-за конфликтующего запро�а блокировки"
 
-#: commands/vacuumlazy.c:1547
+#: commands/vacuumlazy.c:1554
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
 msgstr "\"%s\": у�ечение (было �траниц: %u, �тало: %u)"
 
-#: commands/vacuumlazy.c:1603
+#: commands/vacuumlazy.c:1610
 #, c-format
 msgid "\"%s\": suspending truncate due to conflicting lock request"
 msgstr "\"%s\": прио�тановка у�ечени� из-за конфликтующего запро�а блокировки"
 
-#: commands/variable.c:164 utils/misc/guc.c:9660
+#: commands/variable.c:164 utils/misc/guc.c:9691
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "нера�познанное ключевое �лово: \"%s\"."
@@ -10070,54 +10072,54 @@
 msgid "Valid values are \"local\" and \"cascaded\"."
 msgstr "Допу�кают�� только значени� \"local\" и \"cascaded\"."
 
-#: commands/view.c:114
+#: commands/view.c:101
 #, c-format
 msgid "could not determine which collation to use for view column \"%s\""
 msgstr ""
 "не удало�ь определить правило �ортировки дл� �толбца пред�тавлени� \"%s\""
 
-#: commands/view.c:129
+#: commands/view.c:115
 #, c-format
 msgid "view must have at least one column"
 msgstr "в пред�тавлении должен быть минимум один �толбец"
 
-#: commands/view.c:263 commands/view.c:275
+#: commands/view.c:280 commands/view.c:292
 #, c-format
 msgid "cannot drop columns from view"
 msgstr "удал�ть �толбцы из пред�тавлени� нельз�"
 
-#: commands/view.c:280
+#: commands/view.c:297
 #, c-format
 msgid "cannot change name of view column \"%s\" to \"%s\""
 msgstr "изменить им� �толбца \"%s\" на \"%s\" в пред�тавлении нельз�"
 
-#: commands/view.c:288
+#: commands/view.c:305
 #, c-format
 msgid "cannot change data type of view column \"%s\" from %s to %s"
 msgstr "изменить тип �толбца пред�тавлени� \"%s\" � %s на %s нельз�"
 
-#: commands/view.c:427
+#: commands/view.c:444
 #, c-format
 msgid "views must not contain SELECT INTO"
 msgstr "пред�тавлени� не должны �одержать SELECT INTO"
 
-#: commands/view.c:440
+#: commands/view.c:457
 #, c-format
 msgid "views must not contain data-modifying statements in WITH"
 msgstr "пред�тавлени� не должны �одержать операторы, измен�ющие данные в WITH"
 
-#: commands/view.c:511
+#: commands/view.c:528
 #, c-format
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "в CREATE VIEW указано больше имён �толбцов, чем �амих �толбцов"
 
-#: commands/view.c:519
+#: commands/view.c:536
 #, c-format
 msgid "views cannot be unlogged because they do not have storage"
 msgstr ""
 "пред�тавлени� не могут быть нежурналируемыми, так как они нигде не хран�т��"
 
-#: commands/view.c:533
+#: commands/view.c:550
 #, c-format
 msgid "view \"%s\" will be a temporary view"
 msgstr "пред�тавление \"%s\" будет �оздано как временное"
@@ -10167,7 +10169,7 @@
 msgid "no value found for parameter %d"
 msgstr "не найдено значение параметра %d"
 
-#: executor/execIndexing.c:539
+#: executor/execIndexing.c:544
 #, c-format
 msgid ""
 "ON CONFLICT does not support deferrable unique constraints/exclusion "
@@ -10176,32 +10178,32 @@
 "ON CONFLICT не поддерживает откладываемые ограничени� уникально�ти/"
 "ограничени�-и�ключени� в каче�тве определ�ющего индек�а"
 
-#: executor/execIndexing.c:814
+#: executor/execIndexing.c:821
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "не удало�ь �оздать ограничение-и�ключение \"%s\""
 
-#: executor/execIndexing.c:817
+#: executor/execIndexing.c:824
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "Ключ %s конфликтует � ключом %s."
 
-#: executor/execIndexing.c:819
+#: executor/execIndexing.c:826
 #, c-format
 msgid "Key conflicts exist."
 msgstr "Обнаружен конфликт ключей."
 
-#: executor/execIndexing.c:825
+#: executor/execIndexing.c:832
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "конфликтующее значение ключа нарушает ограничение-и�ключение \"%s\""
 
-#: executor/execIndexing.c:828
+#: executor/execIndexing.c:835
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "Ключ %s конфликтует � �уще�твующим ключом %s."
 
-#: executor/execIndexing.c:830
+#: executor/execIndexing.c:837
 #, c-format
 msgid "Key conflicts with existing key."
 msgstr "Ключ конфликтует � уже �уще�твующим."
@@ -10228,7 +10230,7 @@
 "an unconditional ON INSERT DO INSTEAD rule."
 msgstr ""
 "Чтобы пред�тавление допу�кало добавление данных, у�тановите триггер INSTEAD "
-"OF INSERT trigger или безу�ловное правило ON INSERT DO INSTEAD."
+"OF INSERT или безу�ловное правило ON INSERT DO INSTEAD."
 
 #: executor/execMain.c:1057 rewrite/rewriteHandler.c:2649
 #, c-format
@@ -10380,11 +10382,11 @@
 "нова� �трока нарушает политику защиты на уровне �трок (выражение USING) дл� "
 "таблицы \"%s\""
 
-#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3191
-#: utils/adt/array_userfuncs.c:472 utils/adt/arrayfuncs.c:263
+#: executor/execQual.c:300 executor/execQual.c:328 executor/execQual.c:3209
+#: utils/adt/array_userfuncs.c:484 utils/adt/arrayfuncs.c:263
 #: utils/adt/arrayfuncs.c:561 utils/adt/arrayfuncs.c:1291
 #: utils/adt/arrayfuncs.c:3335 utils/adt/arrayfuncs.c:5219
-#: utils/adt/arrayfuncs.c:5742
+#: utils/adt/arrayfuncs.c:5736
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "чи�ло размерно�тей ма��ива (%d) превышает предел (%d)"
@@ -10394,12 +10396,12 @@
 msgid "array subscript in assignment must not be null"
 msgstr "индек� �лемента ма��ива в при�ваивании не может быть NULL"
 
-#: executor/execQual.c:635 executor/execQual.c:4116
+#: executor/execQual.c:635 executor/execQual.c:4156
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "атрибут %d имеет неверный тип"
 
-#: executor/execQual.c:636 executor/execQual.c:4117
+#: executor/execQual.c:636 executor/execQual.c:4157
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "В таблице задан тип %s, а в запро�е ожидает�� %s."
@@ -10506,12 +10508,12 @@
 msgid "op ANY/ALL (array) does not support set arguments"
 msgstr "операторы ANY/ALL (� ма��ивом) не поддерживают аргументы-множе�тва"
 
-#: executor/execQual.c:3169
+#: executor/execQual.c:3187
 #, c-format
 msgid "cannot merge incompatible arrays"
 msgstr "не удало�ь объединить не�овме�тимые ма��ивы"
 
-#: executor/execQual.c:3170
+#: executor/execQual.c:3188
 #, c-format
 msgid ""
 "Array with element type %s cannot be included in ARRAY construct with "
@@ -10520,7 +10522,7 @@
 "Ма��ив � типом �лементов %s нельз� включить в кон�трукцию ARRAY � типом "
 "�лементов %s."
 
-#: executor/execQual.c:3211 executor/execQual.c:3238
+#: executor/execQual.c:3229 executor/execQual.c:3256
 #, c-format
 msgid ""
 "multidimensional arrays must have array expressions with matching dimensions"
@@ -10528,48 +10530,48 @@
 "дл� многомерных ма��ивов должны задавать�� выражени� � �оответ�твующими "
 "размерно�т�ми"
 
-#: executor/execQual.c:3753
+#: executor/execQual.c:3771
 #, c-format
 msgid "NULLIF does not support set arguments"
 msgstr "NULLIF не поддерживает аргументы-множе�тва"
 
-#: executor/execQual.c:3986 utils/adt/domains.c:136
+#: executor/execQual.c:4019 utils/adt/domains.c:137
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "домен %s не допу�кает значени� null"
 
-#: executor/execQual.c:4016 utils/adt/domains.c:173
+#: executor/execQual.c:4056 utils/adt/domains.c:179
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "значение домена %s нарушает ограничение-проверку \"%s\""
 
-#: executor/execQual.c:4371
+#: executor/execQual.c:4411
 #, c-format
 msgid "WHERE CURRENT OF is not supported for this table type"
 msgstr "WHERE CURRENT OF дл� таблиц такого типа не поддерживает��"
 
-#: executor/execQual.c:4518 parser/parse_agg.c:596 parser/parse_agg.c:626
+#: executor/execQual.c:4558 parser/parse_agg.c:596 parser/parse_agg.c:626
 #, c-format
 msgid "aggregate function calls cannot be nested"
 msgstr "вложенные вызовы агрегатных функций недопу�тимы"
 
-#: executor/execQual.c:4580 parser/parse_agg.c:742
+#: executor/execQual.c:4620 parser/parse_agg.c:742
 #, c-format
 msgid "window function calls cannot be nested"
 msgstr "вложенные вызовы оконных функций недопу�тимы"
 
-#: executor/execQual.c:4792
+#: executor/execQual.c:4832
 #, c-format
 msgid "target type is not an array"
 msgstr "целевой тип не �вл�ет�� ма��ивом"
 
-#: executor/execQual.c:4907
+#: executor/execQual.c:4949
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "�толбец ROW() имеет тип %s, а должен - %s"
 
-#: executor/execQual.c:5042 utils/adt/arrayfuncs.c:3777
-#: utils/adt/arrayfuncs.c:6315 utils/adt/rowtypes.c:927
+#: executor/execQual.c:5084 utils/adt/arrayfuncs.c:3777
+#: utils/adt/arrayfuncs.c:6303 utils/adt/rowtypes.c:927
 #, c-format
 msgid "could not identify a comparison function for type %s"
 msgstr "не удало�ь найти функцию �равнени� дл� типа %s"
@@ -10589,19 +10591,24 @@
 msgid "could not determine actual type of argument declared %s"
 msgstr "не удало�ь определить фактиче�кий тип аргумента, объ�вленного как %s"
 
+#: executor/functions.c:509
+#, c-format
+msgid "cannot COPY to/from client in a SQL function"
+msgstr "в функции SQL нельз� выполнить COPY � уча�тием клиента"
+
 #. translator: %s is a SQL statement name
-#: executor/functions.c:506
+#: executor/functions.c:515
 #, c-format
 msgid "%s is not allowed in a SQL function"
 msgstr "%s нельз� и�пользовать в SQL-функции"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:513 executor/spi.c:1368 executor/spi.c:2158
+#: executor/functions.c:522 executor/spi.c:1368 executor/spi.c:2158
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "%s нельз� и�пользовать в не изменчивой (volatile) функции"
 
-#: executor/functions.c:641
+#: executor/functions.c:650
 #, c-format
 msgid ""
 "could not determine actual result type for function declared to return type "
@@ -10610,24 +10617,24 @@
 "не удало�ь определить фактиче�кий тип результата дл� функции (в объ�влении "
 "указан тип %s)"
 
-#: executor/functions.c:1405
+#: executor/functions.c:1414
 #, c-format
 msgid "SQL function \"%s\" statement %d"
 msgstr "SQL-функци� \"%s\", оператор %d"
 
-#: executor/functions.c:1431
+#: executor/functions.c:1440
 #, c-format
 msgid "SQL function \"%s\" during startup"
 msgstr "SQL-функци� \"%s\" (при �тарте)"
 
-#: executor/functions.c:1590 executor/functions.c:1627
-#: executor/functions.c:1639 executor/functions.c:1752
-#: executor/functions.c:1785 executor/functions.c:1815
+#: executor/functions.c:1599 executor/functions.c:1636
+#: executor/functions.c:1648 executor/functions.c:1761
+#: executor/functions.c:1794 executor/functions.c:1824
 #, c-format
 msgid "return type mismatch in function declared to return %s"
 msgstr "не�овпадение типа возврата в функции (в объ�влении указан тип %s)"
 
-#: executor/functions.c:1592
+#: executor/functions.c:1601
 #, c-format
 msgid ""
 "Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
@@ -10635,37 +10642,37 @@
 "По�ледним оператором в функции должен быть SELECT или INSERT/UPDATE/DELETE "
 "RETURNING."
 
-#: executor/functions.c:1629
+#: executor/functions.c:1638
 #, c-format
 msgid "Final statement must return exactly one column."
 msgstr "По�ледний оператор должен возвращать один �толбец."
 
-#: executor/functions.c:1641
+#: executor/functions.c:1650
 #, c-format
 msgid "Actual return type is %s."
 msgstr "Фактиче�кий тип возврата: %s."
 
-#: executor/functions.c:1754
+#: executor/functions.c:1763
 #, c-format
 msgid "Final statement returns too many columns."
 msgstr "По�ледний оператор возвращает �лишком много �толбцов."
 
-#: executor/functions.c:1787
+#: executor/functions.c:1796
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr "По�ледний оператор возвращает %s вме�то %s дл� �толбца %d."
 
-#: executor/functions.c:1817
+#: executor/functions.c:1826
 #, c-format
 msgid "Final statement returns too few columns."
 msgstr "По�ледний оператор возвращает �лишком мало �толбцов."
 
-#: executor/functions.c:1866
+#: executor/functions.c:1875
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "дл� SQL-функций тип возврата %s не поддерживает��"
 
-#: executor/nodeAgg.c:2450 executor/nodeWindowAgg.c:2286
+#: executor/nodeAgg.c:2471 executor/nodeWindowAgg.c:2319
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr ""
@@ -10686,7 +10693,7 @@
 msgid "could not write to hash-join temporary file: %m"
 msgstr "не удало�ь запи�ать во временный файл хеш-�оединени�: %m"
 
-#: executor/nodeHashjoin.c:928 executor/nodeHashjoin.c:938
+#: executor/nodeHashjoin.c:935 executor/nodeHashjoin.c:945
 #, c-format
 msgid "could not read from hash-join temporary file: %m"
 msgstr "не удало�ь прочитать временный файл хеш-�оединени�: %m"
@@ -10736,12 +10743,12 @@
 msgid "Query has too few columns."
 msgstr "Запро� возвращает меньше �толбцов."
 
-#: executor/nodeModifyTable.c:1103
+#: executor/nodeModifyTable.c:1118
 #, c-format
 msgid "ON CONFLICT DO UPDATE command cannot affect row a second time"
 msgstr "команда ON CONFLICT DO UPDATE не может мен�ть �троку повторно"
 
-#: executor/nodeModifyTable.c:1104
+#: executor/nodeModifyTable.c:1119
 #, c-format
 msgid ""
 "Ensure that no rows proposed for insertion within the same command have "
@@ -10771,22 +10778,22 @@
 msgid "moving-aggregate transition function must not return null"
 msgstr "функци� перехода движимого агрегата не должна возвращать NULL"
 
-#: executor/nodeWindowAgg.c:1609
+#: executor/nodeWindowAgg.c:1642
 #, c-format
 msgid "frame starting offset must not be null"
 msgstr "�мещение начала рамки не может быть NULL"
 
-#: executor/nodeWindowAgg.c:1622
+#: executor/nodeWindowAgg.c:1655
 #, c-format
 msgid "frame starting offset must not be negative"
 msgstr "�мещение начала рамки не может быть отрицательным"
 
-#: executor/nodeWindowAgg.c:1635
+#: executor/nodeWindowAgg.c:1668
 #, c-format
 msgid "frame ending offset must not be null"
 msgstr "�мещение конца рамки не может быть NULL"
 
-#: executor/nodeWindowAgg.c:1648
+#: executor/nodeWindowAgg.c:1681
 #, c-format
 msgid "frame ending offset must not be negative"
 msgstr "�мещение конца рамки не может быть отрицательным"
@@ -10822,12 +10829,12 @@
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE не поддерживает��"
 
-#: executor/spi.c:1343 parser/analyze.c:2292
+#: executor/spi.c:1343 parser/analyze.c:2289
 #, c-format
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Прокручиваемые кур�оры должны быть READ ONLY."
 
-#: executor/spi.c:2450
+#: executor/spi.c:2462
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "SQL-оператор: \"%s\""
@@ -10853,79 +10860,79 @@
 msgstr ""
 "�е удало�ь увеличить �троковый буфер (в буфере байт: %d, требовало�ь ещё %d)."
 
-#: libpq/auth.c:235
+#: libpq/auth.c:238
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr ""
-"пользователь \"%s\" не прошёл проверку подлинно�ти: не разрешённый компьютер "
+"пользователь \"%s\" не прошёл проверку подлинно�ти: не разрешённый компьютер"
 
-#: libpq/auth.c:238
+#: libpq/auth.c:241
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинно�ти (\"trust\")"
 
-#: libpq/auth.c:241
+#: libpq/auth.c:244
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинно�ти (Ident)"
 
-#: libpq/auth.c:244
+#: libpq/auth.c:247
 #, c-format
 msgid "Peer authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинно�ти (Peer)"
 
-#: libpq/auth.c:248
+#: libpq/auth.c:251
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинно�ти (по паролю)"
 
-#: libpq/auth.c:253
+#: libpq/auth.c:256
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинно�ти (GSSAPI)"
 
-#: libpq/auth.c:256
+#: libpq/auth.c:259
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинно�ти (SSPI)"
 
-#: libpq/auth.c:259
+#: libpq/auth.c:262
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинно�ти (PAM)"
 
-#: libpq/auth.c:262
+#: libpq/auth.c:265
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинно�ти (LDAP)"
 
-#: libpq/auth.c:265
+#: libpq/auth.c:268
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинно�ти (по �ертификату)"
 
-#: libpq/auth.c:268
+#: libpq/auth.c:271
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "пользователь \"%s\" не прошёл проверку подлинно�ти (RADIUS)"
 
-#: libpq/auth.c:271
+#: libpq/auth.c:274
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr ""
 "пользователь \"%s\" не прошёл проверку подлинно�ти: неверный метод проверки"
 
-#: libpq/auth.c:275
+#: libpq/auth.c:278
 #, c-format
 msgid "Connection matched pg_hba.conf line %d: \"%s\""
 msgstr "Подключение �оответ�твует �троке %d в pg_hba.conf: \"%s\""
 
-#: libpq/auth.c:330
+#: libpq/auth.c:333
 #, c-format
 msgid "connection requires a valid client certificate"
 msgstr "дл� подключени� требует�� годный �ертификат клиента"
 
-#: libpq/auth.c:372
+#: libpq/auth.c:375
 #, c-format
 msgid ""
 "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
@@ -10933,22 +10940,22 @@
 "pg_hba.conf отвергает подключение дл� репликации: компьютер \"%s\", "
 "пользователь \"%s\", \"%s\""
 
-#: libpq/auth.c:374 libpq/auth.c:390 libpq/auth.c:448 libpq/auth.c:466
+#: libpq/auth.c:377 libpq/auth.c:393 libpq/auth.c:451 libpq/auth.c:469
 msgid "SSL off"
 msgstr "SSL выкл."
 
-#: libpq/auth.c:374 libpq/auth.c:390 libpq/auth.c:448 libpq/auth.c:466
+#: libpq/auth.c:377 libpq/auth.c:393 libpq/auth.c:451 libpq/auth.c:469
 msgid "SSL on"
 msgstr "SSL вкл."
 
-#: libpq/auth.c:378
+#: libpq/auth.c:381
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\""
 msgstr ""
 "pg_hba.conf отвергает подключение дл� репликации: компьютер \"%s\", "
 "пользователь \"%s\""
 
-#: libpq/auth.c:387
+#: libpq/auth.c:390
 #, c-format
 msgid ""
 "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s"
@@ -10957,7 +10964,7 @@
 "pg_hba.conf отвергает подключение: компьютер \"%s\", пользователь \"%s\", "
 "база данных \"%s\", %s"
 
-#: libpq/auth.c:394
+#: libpq/auth.c:397
 #, c-format
 msgid ""
 "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
@@ -10965,37 +10972,37 @@
 "pg_hba.conf отвергает подключение: компьютер \"%s\", пользователь \"%s\", "
 "база данных \"%s\""
 
-#: libpq/auth.c:423
+#: libpq/auth.c:426
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup matches."
 msgstr ""
 "IP-адре� клиента разрешает�� в \"%s\", �оответ�твует пр�мому преобразованию."
 
-#: libpq/auth.c:426
+#: libpq/auth.c:429
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup not checked."
 msgstr ""
 "IP-адре� клиента разрешает�� в \"%s\", пр�мое преобразование не провер�ло�ь."
 
-#: libpq/auth.c:429
+#: libpq/auth.c:432
 #, c-format
 msgid "Client IP address resolved to \"%s\", forward lookup does not match."
 msgstr ""
 "IP-адре� клиента разрешает�� в \"%s\", �то не �оответ�твует пр�мому "
 "преобразованию."
 
-#: libpq/auth.c:432
+#: libpq/auth.c:435
 #, c-format
 msgid "Could not translate client host name \"%s\" to IP address: %s."
 msgstr ""
 "Преобразовать им� клиент�кого компьютера \"%s\" в IP-адре� не удало�ь: %s."
 
-#: libpq/auth.c:437
+#: libpq/auth.c:440
 #, c-format
 msgid "Could not resolve client IP address to a host name: %s."
 msgstr "Получить им� компьютера из IP-адре�а клиента не удало�ь: %s."
 
-#: libpq/auth.c:446
+#: libpq/auth.c:449
 #, c-format
 msgid ""
 "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s"
@@ -11004,7 +11011,7 @@
 "в pg_hba.conf нет запи�и, разрешающей подключение дл� репликации � "
 "компьютера \"%s\" дл� пользовател� \"%s\", %s"
 
-#: libpq/auth.c:453
+#: libpq/auth.c:456
 #, c-format
 msgid ""
 "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
@@ -11012,212 +11019,212 @@
 "в pg_hba.conf нет запи�и, разрешающей подключение дл� репликации � "
 "компьютера \"%s\" дл� пользовател� \"%s\""
 
-#: libpq/auth.c:463
+#: libpq/auth.c:466
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr ""
-"в pg_hba.conf нет запи�и, разрешающей подключение дл� репликации � "
-"компьютера \"%s\" дл� пользовател� \"%s\", базы данных \"%s\", %s"
+"в pg_hba.conf нет запи�и дл� компьютера \"%s\", пользовател� \"%s\", базы "
+"\"%s\", %s"
 
-#: libpq/auth.c:471
+#: libpq/auth.c:474
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
 msgstr ""
 "в pg_hba.conf нет запи�и дл� компьютера \"%s\", пользовател� \"%s\", базы "
 "\"%s\""
 
-#: libpq/auth.c:514 libpq/hba.c:1180
+#: libpq/auth.c:517 libpq/hba.c:1180
 #, c-format
 msgid ""
 "MD5 authentication is not supported when \"db_user_namespace\" is enabled"
 msgstr ""
-"проверка подлинно�ти MD5 не поддерживает��, когда включен режим "
+"проверка подлинно�ти MD5 не поддерживает��, когда включён режим "
 "\"db_user_namespace\""
 
-#: libpq/auth.c:640
+#: libpq/auth.c:643
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "ожидал�� ответ � паролем, но получено �ообщение %d"
 
-#: libpq/auth.c:668
+#: libpq/auth.c:671
 #, c-format
 msgid "invalid password packet size"
 msgstr "неверный размер пакета � паролем"
 
-#: libpq/auth.c:798
+#: libpq/auth.c:801
 #, c-format
 msgid "GSSAPI is not supported in protocol version 2"
 msgstr "GSSAPI не поддерживает�� в протоколе вер�ии 2"
 
-#: libpq/auth.c:858
+#: libpq/auth.c:861
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "ожидал�� ответ GSS, но получено �ообщение %d"
 
-#: libpq/auth.c:919
+#: libpq/auth.c:922
 msgid "accepting GSS security context failed"
 msgstr "прин�ть контек�т безопа�но�ти GSS не удало�ь"
 
-#: libpq/auth.c:945
+#: libpq/auth.c:948
 msgid "retrieving GSS user name failed"
 msgstr "получить им� пользовател� GSS не удало�ь"
 
-#: libpq/auth.c:1062
+#: libpq/auth.c:1067
 #, c-format
 msgid "SSPI is not supported in protocol version 2"
 msgstr "SSPI не поддерживает�� в протоколе вер�ии 2"
 
-#: libpq/auth.c:1077
+#: libpq/auth.c:1082
 msgid "could not acquire SSPI credentials"
 msgstr "не удало�ь получить удо�товерение SSPI"
 
-#: libpq/auth.c:1095
+#: libpq/auth.c:1100
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "ожидал�� ответ SSPI, но получено �ообщение %d"
 
-#: libpq/auth.c:1167
+#: libpq/auth.c:1172
 msgid "could not accept SSPI security context"
 msgstr "прин�ть контек�т безопа�но�ти SSPI не удало�ь"
 
-#: libpq/auth.c:1229
+#: libpq/auth.c:1234
 msgid "could not get token from SSPI security context"
 msgstr "не удало�ь получить маркер из контек�та безопа�но�ти SSPI"
 
-#: libpq/auth.c:1476
+#: libpq/auth.c:1481
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "не удало�ь �оздать �окет дл� подключени� к �ерверу Ident: %m"
 
-#: libpq/auth.c:1491
+#: libpq/auth.c:1496
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "не удало�ь прив�зать�� к локальному адре�у \"%s\": %m"
 
-#: libpq/auth.c:1503
+#: libpq/auth.c:1508
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "не удало�ь подключить�� к �ерверу Ident по адре�у \"%s\", порт %s: %m"
 
-#: libpq/auth.c:1525
+#: libpq/auth.c:1530
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr ""
 "не удало�ь отправить запро� �ерверу Ident по адре�у \"%s\", порт %s: %m"
 
-#: libpq/auth.c:1542
+#: libpq/auth.c:1547
 #, c-format
 msgid ""
 "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr ""
 "не удало�ь получить ответ от �ервера Ident по адре�у \"%s\", порт %s: %m"
 
-#: libpq/auth.c:1552
+#: libpq/auth.c:1557
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "неверно форматированный ответ от �ервера Ident: \"%s\""
 
-#: libpq/auth.c:1592
+#: libpq/auth.c:1597
 #, c-format
 msgid "peer authentication is not supported on this platform"
 msgstr "проверка подлинно�ти peer в �той ОС не поддерживает��"
 
-#: libpq/auth.c:1596
+#: libpq/auth.c:1601
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "не удало�ь получить данные пользовател� через механизм peer: %m"
 
-#: libpq/auth.c:1605
+#: libpq/auth.c:1610
 #, c-format
 msgid "could not look up local user ID %ld: %s"
 msgstr "найти локального пользовател� по идентификатору (%ld) не удало�ь: %s"
 
-#: libpq/auth.c:1689 libpq/auth.c:1960 libpq/auth.c:2316
+#: libpq/auth.c:1694 libpq/auth.c:1965 libpq/auth.c:2324
 #, c-format
 msgid "empty password returned by client"
 msgstr "клиент возвратил пу�той пароль"
 
-#: libpq/auth.c:1699
+#: libpq/auth.c:1704
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "ошибка в нижележащем �лое PAM: %s"
 
-#: libpq/auth.c:1768
+#: libpq/auth.c:1773
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "не удало�ь �оздать аутентификатор PAM: %s"
 
-#: libpq/auth.c:1779
+#: libpq/auth.c:1784
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "ошибка в pam_set_item(PAM_USER): %s"
 
-#: libpq/auth.c:1790
+#: libpq/auth.c:1795
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "ошибка в pam_set_item(PAM_CONV): %s"
 
-#: libpq/auth.c:1801
+#: libpq/auth.c:1806
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "ошибка в pam_authenticate: %s"
 
-#: libpq/auth.c:1812
+#: libpq/auth.c:1817
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "ошибка в pam_acct_mgmt: %s"
 
-#: libpq/auth.c:1823
+#: libpq/auth.c:1828
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "не удало�ь о�вободить аутентификатор PAM: %s"
 
-#: libpq/auth.c:1856
+#: libpq/auth.c:1861
 #, c-format
 msgid "could not initialize LDAP: %m"
 msgstr "не удало�ь инициализировать LDAP: %m"
 
-#: libpq/auth.c:1859
+#: libpq/auth.c:1864
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "не удало�ь инициализировать LDAP (код ошибки: %d)"
 
-#: libpq/auth.c:1869
+#: libpq/auth.c:1874
 #, c-format
 msgid "could not set LDAP protocol version: %s"
 msgstr "не удало�ь задать вер�ию протокола LDAP: %s"
 
-#: libpq/auth.c:1898
+#: libpq/auth.c:1903
 #, c-format
 msgid "could not load wldap32.dll"
 msgstr "не удало�ь загрузить wldap32.dll"
 
-#: libpq/auth.c:1906
+#: libpq/auth.c:1911
 #, c-format
 msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
 msgstr "не удало�ь найти функцию _ldap_start_tls_sA в wldap32.dll"
 
-#: libpq/auth.c:1907
+#: libpq/auth.c:1912
 #, c-format
 msgid "LDAP over SSL is not supported on this platform."
 msgstr "LDAP через SSL не поддерживает�� в �той ОС."
 
-#: libpq/auth.c:1922
+#: libpq/auth.c:1927
 #, c-format
 msgid "could not start LDAP TLS session: %s"
 msgstr "не удало�ь начать �еан� LDAP TLS: %s"
 
-#: libpq/auth.c:1944
+#: libpq/auth.c:1949
 #, c-format
 msgid "LDAP server not specified"
 msgstr "LDAP-�ервер не определён"
 
-#: libpq/auth.c:1997
+#: libpq/auth.c:2002
 #, c-format
 msgid "invalid character in user name for LDAP authentication"
 msgstr "недопу�тимый �имвол в имени пользовател� дл� проверки подлинно�ти LDAP"
 
-#: libpq/auth.c:2012
+#: libpq/auth.c:2017
 #, c-format
 msgid ""
 "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": "
@@ -11226,28 +11233,28 @@
 "не удало�ь выполнить начальную прив�зку LDAP дл� ldapbinddn \"%s\" на "
 "�ервере \"%s\": %s"
 
-#: libpq/auth.c:2036
+#: libpq/auth.c:2041
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": %s"
 msgstr ""
 "не удало�ь выполнить LDAP-пои�к по фильтру \"%s\" на �ервере \"%s\": %s"
 
-#: libpq/auth.c:2047
+#: libpq/auth.c:2052
 #, c-format
 msgid "LDAP user \"%s\" does not exist"
 msgstr "в LDAP нет пользовател� \"%s\""
 
-#: libpq/auth.c:2048
+#: libpq/auth.c:2053
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned no entries."
 msgstr "LDAP-пои�к по фильтру \"%s\" на �ервере \"%s\" не вернул результатов"
 
-#: libpq/auth.c:2052
+#: libpq/auth.c:2057
 #, c-format
 msgid "LDAP user \"%s\" is not unique"
 msgstr "пользователь LDAP \"%s\" не уникален"
 
-#: libpq/auth.c:2053
+#: libpq/auth.c:2058
 #, c-format
 msgid "LDAP search for filter \"%s\" on server \"%s\" returned %d entry."
 msgid_plural ""
@@ -11256,7 +11263,7 @@
 msgstr[1] "LDAP-пои�к по фильтру \"%s\" на �ервере \"%s\" вернул %d запи�и."
 msgstr[2] "LDAP-пои�к по фильтру \"%s\" на �ервере \"%s\" вернул %d запи�ей."
 
-#: libpq/auth.c:2071
+#: libpq/auth.c:2076
 #, c-format
 msgid ""
 "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
@@ -11264,19 +11271,19 @@
 "не удало�ь получить dn дл� первого результата, �оответ�твующего \"%s\" на "
 "�ервере \"%s\": %s"
 
-#: libpq/auth.c:2091
+#: libpq/auth.c:2096
 #, c-format
 msgid "could not unbind after searching for user \"%s\" on server \"%s\": %s"
 msgstr ""
 "не удало�ь отв�зать�� по�ле пои�ка пользовател� \"%s\" на �ервере \"%s\": %s"
 
-#: libpq/auth.c:2121
+#: libpq/auth.c:2126
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": %s"
 msgstr ""
 "ошибка при реги�трации в LDAP пользовател� \"%s\" на �ервере \"%s\": %s"
 
-#: libpq/auth.c:2149
+#: libpq/auth.c:2154
 #, c-format
 msgid ""
 "certificate authentication failed for user \"%s\": client certificate "
@@ -11285,98 +11292,98 @@
 "ошибка проверки подлинно�ти пользовател� \"%s\" по �ертификату: �ертификат "
 "клиента не �одержит им� пользовател�"
 
-#: libpq/auth.c:2272
+#: libpq/auth.c:2280
 #, c-format
 msgid "RADIUS server not specified"
 msgstr "RADIUS-�ервер не определён"
 
-#: libpq/auth.c:2279
+#: libpq/auth.c:2287
 #, c-format
 msgid "RADIUS secret not specified"
 msgstr "�екрет RADIUS не определён"
 
-#: libpq/auth.c:2295 libpq/hba.c:1590
+#: libpq/auth.c:2303 libpq/hba.c:1590
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "не удало�ь преобразовать им� �ервера RADIUS \"%s\" в адре�: %s"
 
-#: libpq/auth.c:2323
+#: libpq/auth.c:2331
 #, c-format
 msgid ""
 "RADIUS authentication does not support passwords longer than 16 characters"
 msgstr "проверка подлинно�ти RADIUS не поддерживает пароли длиннее 16 �имволов"
 
-#: libpq/auth.c:2334
+#: libpq/auth.c:2342
 #, c-format
 msgid "could not generate random encryption vector"
 msgstr "не удало�ь �генерировать �лучайный вектор шифровани�"
 
-#: libpq/auth.c:2357
+#: libpq/auth.c:2365
 #, c-format
 msgid "could not perform MD5 encryption of password"
 msgstr "не удало�ь вычи�лить MD5-хеш парол�"
 
-#: libpq/auth.c:2379
+#: libpq/auth.c:2387
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "не удало�ь �оздать �окет RADIUS: %m"
 
-#: libpq/auth.c:2400
+#: libpq/auth.c:2408
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "не удало�ь прив�зать�� к локальному �окету RADIUS: %m"
 
-#: libpq/auth.c:2410
+#: libpq/auth.c:2418
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "не удало�ь отправить пакет RADIUS: %m"
 
-#: libpq/auth.c:2443 libpq/auth.c:2468
+#: libpq/auth.c:2451 libpq/auth.c:2476
 #, c-format
 msgid "timeout waiting for RADIUS response"
 msgstr "превышено врем� ожидани� ответа RADIUS"
 
-#: libpq/auth.c:2461
+#: libpq/auth.c:2469
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "не удало�ь проверить �о�то�ние �окета RADIUS: %m"
 
-#: libpq/auth.c:2490
+#: libpq/auth.c:2498
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "не удало�ь прочитать ответ RADIUS: %m"
 
-#: libpq/auth.c:2502 libpq/auth.c:2506
+#: libpq/auth.c:2510 libpq/auth.c:2514
 #, c-format
 msgid "RADIUS response was sent from incorrect port: %d"
 msgstr "ответ RADIUS был отправлен � неверного порта: %d"
 
-#: libpq/auth.c:2515
+#: libpq/auth.c:2523
 #, c-format
 msgid "RADIUS response too short: %d"
 msgstr "�лишком короткий ответ RADIUS: %d"
 
-#: libpq/auth.c:2522
+#: libpq/auth.c:2530
 #, c-format
 msgid "RADIUS response has corrupt length: %d (actual length %d)"
 msgstr "в ответе RADIUS и�порчена длина: %d (фактиче�ка� длина %d)"
 
-#: libpq/auth.c:2530
+#: libpq/auth.c:2538
 #, c-format
 msgid "RADIUS response is to a different request: %d (should be %d)"
 msgstr "пришёл ответ RADIUS на другой запро�: %d (ожидал�� %d)"
 
-#: libpq/auth.c:2555
+#: libpq/auth.c:2563
 #, c-format
 msgid "could not perform MD5 encryption of received packet"
 msgstr "не удало�ь вычи�лить MD5 дл� прин�того пакета"
 
-#: libpq/auth.c:2564
+#: libpq/auth.c:2572
 #, c-format
 msgid "RADIUS response has incorrect MD5 signature"
 msgstr "ответ RADIUS �одержит неверную подпи�ь MD5"
 
-#: libpq/auth.c:2581
+#: libpq/auth.c:2589
 #, c-format
 msgid "RADIUS response has invalid code (%d) for user \"%s\""
 msgstr "ответ RADIUS �одержит неверный код (%d) дл� пользовател� \"%s\""
@@ -11463,123 +11470,123 @@
 msgid "requested length cannot be negative"
 msgstr "запрошенна� длина не может быть отрицательной"
 
-#: libpq/be-secure-openssl.c:184
+#: libpq/be-secure-openssl.c:189
 #, c-format
 msgid "could not create SSL context: %s"
 msgstr "не удало�ь �оздать контек�т SSL: %s"
 
-#: libpq/be-secure-openssl.c:200
+#: libpq/be-secure-openssl.c:205
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
 msgstr "не удало�ь загрузить �ертификат �ервера \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:206
+#: libpq/be-secure-openssl.c:211
 #, c-format
 msgid "could not access private key file \"%s\": %m"
 msgstr "не удало�ь обратить�� к файлу закрытого ключа \"%s\": %m"
 
-#: libpq/be-secure-openssl.c:221
+#: libpq/be-secure-openssl.c:226
 #, c-format
 msgid "private key file \"%s\" has group or world access"
 msgstr "к файлу закрытого ключа \"%s\" имеют до�туп в�е или группа"
 
-#: libpq/be-secure-openssl.c:223
+#: libpq/be-secure-openssl.c:228
 #, c-format
 msgid "Permissions should be u=rw (0600) or less."
 msgstr "Права должны быть u=rw (0600) или более ограниченные."
 
-#: libpq/be-secure-openssl.c:230
+#: libpq/be-secure-openssl.c:235
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "не удало�ь загрузить файл закрытого ключа \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:235
+#: libpq/be-secure-openssl.c:240
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "ошибка при проверке закрытого ключа: %s"
 
-#: libpq/be-secure-openssl.c:264
+#: libpq/be-secure-openssl.c:269
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
 msgstr "не удало�ь загрузить файл корневых �ертификатов \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:288
+#: libpq/be-secure-openssl.c:293
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" ignored"
 msgstr "файл �о �пи�ком отзыва �ертификатов SSL \"%s\" игнорирует��"
 
-#: libpq/be-secure-openssl.c:290
+#: libpq/be-secure-openssl.c:295
 #, c-format
 msgid "SSL library does not support certificate revocation lists."
 msgstr "Библиотека SSL не поддерживает �пи�ки отзыва �ертификатов."
 
-#: libpq/be-secure-openssl.c:295
+#: libpq/be-secure-openssl.c:300
 #, c-format
 msgid "could not load SSL certificate revocation list file \"%s\": %s"
 msgstr ""
 "не удало�ь загрузить файл �о �пи�ком отзыва �ертификатов SSL \"%s\": %s"
 
-#: libpq/be-secure-openssl.c:341
+#: libpq/be-secure-openssl.c:347
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "инициализировать SSL-подключение не удало�ь: %s"
 
-#: libpq/be-secure-openssl.c:349
+#: libpq/be-secure-openssl.c:355
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "не удало�ь �оздать SSL-�окет: %s"
 
-#: libpq/be-secure-openssl.c:383
+#: libpq/be-secure-openssl.c:409
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "не удало�ь прин�ть SSL-подключение: %m"
 
-#: libpq/be-secure-openssl.c:387 libpq/be-secure-openssl.c:398
+#: libpq/be-secure-openssl.c:413 libpq/be-secure-openssl.c:424
 #, c-format
 msgid "could not accept SSL connection: EOF detected"
 msgstr "не удало�ь прин�ть SSL-подключение: обрыв данных"
 
-#: libpq/be-secure-openssl.c:392
+#: libpq/be-secure-openssl.c:418
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "не удало�ь прин�ть SSL-подключение: %s"
 
-#: libpq/be-secure-openssl.c:403 libpq/be-secure-openssl.c:541
-#: libpq/be-secure-openssl.c:598
+#: libpq/be-secure-openssl.c:429 libpq/be-secure-openssl.c:570
+#: libpq/be-secure-openssl.c:630
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "нера�познанный код ошибки SSL: %d"
 
-#: libpq/be-secure-openssl.c:447
+#: libpq/be-secure-openssl.c:473
 #, c-format
 msgid "SSL certificate's common name contains embedded null"
 msgstr "Им� SSL-�ертификата включает нулевой байт"
 
-#: libpq/be-secure-openssl.c:458
+#: libpq/be-secure-openssl.c:484
 #, c-format
 msgid "SSL connection from \"%s\""
 msgstr "SSL-подключение от \"%s\""
 
-#: libpq/be-secure-openssl.c:532 libpq/be-secure-openssl.c:589
+#: libpq/be-secure-openssl.c:561 libpq/be-secure-openssl.c:621
 #, c-format
 msgid "SSL error: %s"
 msgstr "ошибка SSL: %s"
 
-#: libpq/be-secure-openssl.c:937
+#: libpq/be-secure-openssl.c:1032
 #, c-format
 msgid "ECDH: unrecognized curve name: %s"
 msgstr "ECDH: нера�познанное им� кривой: %s"
 
-#: libpq/be-secure-openssl.c:942
+#: libpq/be-secure-openssl.c:1037
 #, c-format
 msgid "ECDH: could not create key"
 msgstr "ECDH: не удало�ь �оздать ключ"
 
-#: libpq/be-secure-openssl.c:966
+#: libpq/be-secure-openssl.c:1061
 msgid "no SSL error reported"
 msgstr "нет �ообщени� об ошибке SSL"
 
-#: libpq/be-secure-openssl.c:970
+#: libpq/be-secure-openssl.c:1065
 #, c-format
 msgid "SSL error code %lu"
 msgstr "код ошибки SSL: %lu"
@@ -12054,7 +12061,7 @@
 msgid "could not receive data from client: %m"
 msgstr "не удало�ь получить данные от клиента: %m"
 
-#: libpq/pqcomm.c:1139 tcop/postgres.c:3902
+#: libpq/pqcomm.c:1139 tcop/postgres.c:3917
 #, c-format
 msgid "terminating connection because protocol synchronization was lost"
 msgstr "закрытие подключени� из-за потери �инхронизации протокола"
@@ -12100,12 +12107,12 @@
 msgid "invalid message format"
 msgstr "неверный формат �ообщени�"
 
-#: main/main.c:259
+#: main/main.c:264
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: ошибка WSAStartup: %d\n"
 
-#: main/main.c:306
+#: main/main.c:327
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -12114,7 +12121,7 @@
 "%s - �ервер PostgreSQL.\n"
 "\n"
 
-#: main/main.c:307
+#: main/main.c:328
 #, c-format
 msgid ""
 "Usage:\n"
@@ -12125,114 +12132,116 @@
 "  %s [П�Р�МЕТР]...\n"
 "\n"
 
-#: main/main.c:308
+#: main/main.c:329
 #, c-format
 msgid "Options:\n"
 msgstr "Параметры:\n"
 
-#: main/main.c:309
+#: main/main.c:330
 #, c-format
 msgid "  -B NBUFFERS        number of shared buffers\n"
 msgstr "  -B ЧИСЛО_БУФ       чи�ло раздел�емых буферов\n"
 
-#: main/main.c:310
+#: main/main.c:331
 #, c-format
 msgid "  -c NAME=VALUE      set run-time parameter\n"
 msgstr "  -c ИМЯ=З��ЧЕ�ИЕ    у�тановить параметр выполнени�\n"
 
-#: main/main.c:311
+#: main/main.c:332
 #, c-format
 msgid "  -C NAME            print value of run-time parameter, then exit\n"
 msgstr "  -C ИМЯ             выве�ти значение параметра выполнени� и выйти\n"
 
-#: main/main.c:312
+#: main/main.c:333
 #, c-format
 msgid "  -d 1-5             debugging level\n"
 msgstr "  -d 1-5             уровень отладочных �ообщений\n"
 
-#: main/main.c:313
+#: main/main.c:334
 #, c-format
 msgid "  -D DATADIR         database directory\n"
 msgstr "  -D К�Т�ЛОГ         каталог � данными\n"
 
-#: main/main.c:314
+# well-spelled: ДМГ
+#: main/main.c:335
 #, c-format
 msgid "  -e                 use European date input format (DMY)\n"
 msgstr "  -e                 и�пользовать европей�кий формат дат (ДМГ)\n"
 
-#: main/main.c:315
+#: main/main.c:336
 #, c-format
 msgid "  -F                 turn fsync off\n"
 msgstr "  -F                 выключить �инхронизацию � ФС\n"
 
-#: main/main.c:316
+#: main/main.c:337
 #, c-format
 msgid "  -h HOSTNAME        host name or IP address to listen on\n"
 msgstr "  -h ИМЯ             им� или IP-адре� дл� приёма �етевых �оединений\n"
 
-#: main/main.c:317
+#: main/main.c:338
 #, c-format
 msgid "  -i                 enable TCP/IP connections\n"
 msgstr "  -i                 включить �оединени� TCP/IP\n"
 
-#: main/main.c:318
+#: main/main.c:339
 #, c-format
 msgid "  -k DIRECTORY       Unix-domain socket location\n"
 msgstr "  -k К�Т�ЛОГ         ра�положение доменных �окетов Unix\n"
 
-#: main/main.c:320
+#: main/main.c:341
 #, c-format
 msgid "  -l                 enable SSL connections\n"
 msgstr "  -l                 разрешить SSL-подключени�\n"
 
-#: main/main.c:322
+# well-spelled: ПОДКЛ
+#: main/main.c:343
 #, c-format
 msgid "  -N MAX-CONNECT     maximum number of allowed connections\n"
 msgstr "  -N М�КС_ПОДКЛ      предельное чи�ло подключений\n"
 
-#: main/main.c:323
+#: main/main.c:344
 #, c-format
 msgid ""
 "  -o OPTIONS         pass \"OPTIONS\" to each server process (obsolete)\n"
 msgstr ""
 "  -o П�Р�МЕТРЫ       параметры дл� �ерверных проце��ов (уже неактуально)\n"
 
-#: main/main.c:324
+#: main/main.c:345
 #, c-format
 msgid "  -p PORT            port number to listen on\n"
 msgstr "  -p ПОРТ            номер порта дл� приёма подключений\n"
 
-#: main/main.c:325
+#: main/main.c:346
 #, c-format
 msgid "  -s                 show statistics after each query\n"
 msgstr "  -s                 показывать �тати�тику по�ле каждого запро�а\n"
 
-#: main/main.c:326
+#: main/main.c:347
 #, c-format
 msgid "  -S WORK-MEM        set amount of memory for sorts (in kB)\n"
 msgstr "  -S Р�Б_П�МЯТЬ      задать объём пам�ти дл� �ортировки (в КБ)\n"
 
-#: main/main.c:327
+#: main/main.c:348
 #, c-format
 msgid "  -V, --version      output version information, then exit\n"
 msgstr "  -V, --version      показать вер�ию и выйти\n"
 
-#: main/main.c:328
+#: main/main.c:349
 #, c-format
 msgid "  --NAME=VALUE       set run-time parameter\n"
 msgstr "  --ИМЯ=З��ЧЕ�ИЕ     у�тановить параметр выполнени�\n"
 
-#: main/main.c:329
+#: main/main.c:350
 #, c-format
 msgid "  --describe-config  describe configuration parameters, then exit\n"
 msgstr "  --describe-config  выве�ти параметры конфигурации и выйти\n"
 
-#: main/main.c:330
+#: main/main.c:351
 #, c-format
 msgid "  -?, --help         show this help, then exit\n"
 msgstr "  -?, --help         показать �ту �правку и выйти\n"
 
-#: main/main.c:332
+#: main/main.c:353
 #, c-format
 msgid ""
 "\n"
@@ -12241,12 +12250,12 @@
 "\n"
 "Параметры дл� разработчиков:\n"
 
-#: main/main.c:333
+#: main/main.c:354
 #, c-format
 msgid "  -f s|i|n|m|h       forbid use of some plan types\n"
 msgstr "  -f s|i|n|m|h       запретить некоторые типы планов\n"
 
-#: main/main.c:334
+#: main/main.c:355
 #, c-format
 msgid ""
 "  -n                 do not reinitialize shared memory after abnormal exit\n"
@@ -12254,22 +12263,22 @@
 "  -n                 не переинициализировать раздел�емую пам�ть по�ле\n"
 "                     аварийного выхода\n"
 
-#: main/main.c:335
+#: main/main.c:356
 #, c-format
 msgid "  -O                 allow system table structure changes\n"
 msgstr "  -O                 разрешить измен�ть �труктуру �и�темных таблиц\n"
 
-#: main/main.c:336
+#: main/main.c:357
 #, c-format
 msgid "  -P                 disable system indexes\n"
 msgstr "  -P                 отключить �и�темные индек�ы\n"
 
-#: main/main.c:337
+#: main/main.c:358
 #, c-format
 msgid "  -t pa|pl|ex        show timings after each query\n"
 msgstr "  -t pa|pl|ex        показать врем� каждого запро�а\n"
 
-#: main/main.c:338
+#: main/main.c:359
 #, c-format
 msgid ""
 "  -T                 send SIGSTOP to all backend processes if one dies\n"
@@ -12277,13 +12286,13 @@
 "  -T                 по�ылать �игнал SIGSTOP в�ем �ерверным проце��ам\n"
 "                     при отключении одного\n"
 
-#: main/main.c:339
+#: main/main.c:360
 #, c-format
 msgid "  -W NUM             wait NUM seconds to allow attach from a debugger\n"
 msgstr ""
 "  -W СЕК             ждать заданное чи�ло �екунд дл� подключени� отладчика\n"
 
-#: main/main.c:341
+#: main/main.c:362
 #, c-format
 msgid ""
 "\n"
@@ -12292,7 +12301,7 @@
 "\n"
 "Параметры дл� монопольного режима:\n"
 
-#: main/main.c:342
+#: main/main.c:363
 #, c-format
 msgid ""
 "  --single           selects single-user mode (must be first argument)\n"
@@ -12300,22 +12309,22 @@
 "  --single           включить монопольный режим\n"
 "                     (�тот аргумент должен быть первым)\n"
 
-#: main/main.c:343
+#: main/main.c:364
 #, c-format
 msgid "  DBNAME             database name (defaults to user name)\n"
 msgstr "  ИМЯ_БД             база данных (по умолчанию - им� пользовател�)\n"
 
-#: main/main.c:344
+#: main/main.c:365
 #, c-format
 msgid "  -d 0-5             override debugging level\n"
 msgstr "  -d 0-5             переопределить уровень отладочных �ообщений\n"
 
-#: main/main.c:345
+#: main/main.c:366
 #, c-format
 msgid "  -E                 echo statement before execution\n"
 msgstr "  -E                 выводить SQL-операторы перед выполнением\n"
 
-#: main/main.c:346
+#: main/main.c:367
 #, c-format
 msgid ""
 "  -j                 do not use newline as interactive query delimiter\n"
@@ -12323,12 +12332,12 @@
 "  -j                 не �читать конец �троки разделителем интерактивных "
 "запро�ов\n"
 
-#: main/main.c:347 main/main.c:352
+#: main/main.c:368 main/main.c:373
 #, c-format
 msgid "  -r FILENAME        send stdout and stderr to given file\n"
 msgstr "  -r ИМЯ_Ф�ЙЛ�       перенаправить STDOUT и STDERR в указанный файл\n"
 
-#: main/main.c:349
+#: main/main.c:370
 #, c-format
 msgid ""
 "\n"
@@ -12337,7 +12346,7 @@
 "\n"
 "Параметры дл� режима инициализации:\n"
 
-#: main/main.c:350
+#: main/main.c:371
 #, c-format
 msgid ""
 "  --boot             selects bootstrapping mode (must be first argument)\n"
@@ -12345,7 +12354,7 @@
 "  --boot             включить режим инициализации\n"
 "                     (�тот аргумент должен быть первым)\n"
 
-#: main/main.c:351
+#: main/main.c:372
 #, c-format
 msgid ""
 "  DBNAME             database name (mandatory argument in bootstrapping "
@@ -12353,12 +12362,12 @@
 msgstr ""
 "  ИМЯ_БД             им� базы данных (необходимо в режиме инициализации)\n"
 
-#: main/main.c:353
+#: main/main.c:374
 #, c-format
 msgid "  -x NUM             internal use\n"
 msgstr "  -x ЧИСЛО           параметр дл� внутреннего и�пользовани�\n"
 
-#: main/main.c:355
+#: main/main.c:376
 #, c-format
 msgid ""
 "\n"
@@ -12370,12 +12379,12 @@
 msgstr ""
 "\n"
 "Полный �пи�ок параметров конфигурации выполнени� и варианты\n"
-"их на�тройки через командную �троку или в файле конфигурации\n"
+"их у�тановки через командную �троку или в файле конфигурации\n"
 "вы можете найти в документации.\n"
 "\n"
 "Об ошибках �ообщайте по адре�у <pgsql-bugs@postgresql.org>.\n"
 
-#: main/main.c:369
+#: main/main.c:390
 #, c-format
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
@@ -12388,12 +12397,12 @@
 "должен запу�кать обычный пользователь. Подробнее о том, как\n"
 "правильно запу�кать �ервер, вы можете узнать в документации.\n"
 
-#: main/main.c:386
+#: main/main.c:407
 #, c-format
 msgid "%s: real and effective user IDs must match\n"
 msgstr "%s: фактиче�кий и �ффективный ID пользовател� должны �овпадать\n"
 
-#: main/main.c:393
+#: main/main.c:414
 #, c-format
 msgid ""
 "Execution of PostgreSQL by a user with administrative permissions is not\n"
@@ -12410,7 +12419,7 @@
 
 #: nodes/nodeFuncs.c:118 nodes/nodeFuncs.c:149 parser/parse_coerce.c:1820
 #: parser/parse_coerce.c:1848 parser/parse_coerce.c:1924
-#: parser/parse_expr.c:1981 parser/parse_func.c:597 parser/parse_oper.c:952
+#: parser/parse_expr.c:1994 parser/parse_func.c:597 parser/parse_oper.c:952
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "тип ма��ива дл� типа данных %s не найден"
@@ -12455,18 +12464,27 @@
 msgstr "%s не может примен�ть�� к NULL-�одержащей �тороне внешнего �оединени�"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/planner.c:1330 parser/analyze.c:1481 parser/analyze.c:1679
-#: parser/analyze.c:2460
+#: optimizer/plan/planner.c:1341 parser/analyze.c:1478 parser/analyze.c:1676
+#: parser/analyze.c:2457
 #, c-format
 msgid "%s is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "%s не�овме�тимо � UNION/INTERSECT/EXCEPT"
 
-#: optimizer/plan/planner.c:3587
+#: optimizer/plan/planner.c:1762 optimizer/plan/planner.c:3603
 #, c-format
 msgid "could not implement GROUP BY"
 msgstr "не удало�ь реализовать GROUP BY"
 
-#: optimizer/plan/planner.c:3588 optimizer/plan/planner.c:3756
+#: optimizer/plan/planner.c:1763
+#, c-format
+msgid ""
+"Some of the datatypes do not support sorting, which is required for grouping "
+"sets."
+msgstr ""
+"�екоторые типы данных не поддерживают �ортировку, что требует�� дл� наборов "
+"группировани�."
+
+#: optimizer/plan/planner.c:3604 optimizer/plan/planner.c:3772
 #: optimizer/prep/prepunion.c:828
 #, c-format
 msgid ""
@@ -12476,27 +12494,27 @@
 "Одни типы данных поддерживают только хеширование, а другие - только "
 "�ортировку."
 
-#: optimizer/plan/planner.c:3755
+#: optimizer/plan/planner.c:3771
 #, c-format
 msgid "could not implement DISTINCT"
 msgstr "не удало�ь реализовать DISTINCT"
 
-#: optimizer/plan/planner.c:4361
+#: optimizer/plan/planner.c:4377
 #, c-format
 msgid "could not implement window PARTITION BY"
 msgstr "не удало�ь реализовать PARTITION BY дл� окна"
 
-#: optimizer/plan/planner.c:4362
+#: optimizer/plan/planner.c:4378
 #, c-format
 msgid "Window partitioning columns must be of sortable datatypes."
 msgstr "Столбцы, разбивающие окна, должны иметь �ортируемые типы данных."
 
-#: optimizer/plan/planner.c:4366
+#: optimizer/plan/planner.c:4382
 #, c-format
 msgid "could not implement window ORDER BY"
 msgstr "не удало�ь реализовать ORDER BY дл� окна"
 
-#: optimizer/plan/planner.c:4367
+#: optimizer/plan/planner.c:4383
 #, c-format
 msgid "Window ordering columns must be of sortable datatypes."
 msgstr "Столбцы, �ортирующие окна, должны иметь �ортируемые типы данных."
@@ -12522,7 +12540,7 @@
 msgid "could not implement %s"
 msgstr "не удало�ь реализовать %s"
 
-#: optimizer/util/clauses.c:4597
+#: optimizer/util/clauses.c:4693
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "внедрённа� в код SQL-функци� \"%s\""
@@ -12534,22 +12552,24 @@
 "обращать�� к временным или нежурналируемым отношени�м в проце��е "
 "во��тановлени� нельз�"
 
-#: optimizer/util/plancat.c:498
+#: optimizer/util/plancat.c:490
 #, c-format
-msgid "system columns cannot be used in an ON CONFLICT clause"
-msgstr "�и�темные �толбцы нельз� и�пользовать в предложении ON CONFLICT"
+msgid "whole row unique index inference specifications are not supported"
+msgstr ""
+"указани� �о ��ылкой на в�ю �троку дл� выбора уникального индек�а не "
+"поддерживают��"
 
-#: optimizer/util/plancat.c:516
+#: optimizer/util/plancat.c:507
 #, c-format
 msgid "constraint in ON CONFLICT clause has no associated index"
 msgstr "ограничению в ON CONFLICT не �оответ�твует индек�"
 
-#: optimizer/util/plancat.c:568
+#: optimizer/util/plancat.c:558
 #, c-format
 msgid "ON CONFLICT DO UPDATE not supported with exclusion constraints"
 msgstr "ON CONFLICT DO UPDATE не поддерживает�� � ограничени�ми-и�ключени�ми"
 
-#: optimizer/util/plancat.c:675
+#: optimizer/util/plancat.c:663
 #, c-format
 msgid ""
 "there is no unique or exclusion constraint matching the ON CONFLICT "
@@ -12558,7 +12578,7 @@
 "нет уникального ограничени� или ограничени�-и�ключени�, �оответ�твующего "
 "указанию ON CONFLICT"
 
-#: parser/analyze.c:639 parser/analyze.c:1253
+#: parser/analyze.c:639 parser/analyze.c:1250
 #, c-format
 msgid "VALUES lists must all be the same length"
 msgstr "�пи�ки VALUES должны иметь одинаковую длину"
@@ -12582,34 +12602,34 @@
 "И�точником данных �вл�ет�� �трока, включающа� �только же �толбцов, �колько "
 "требует�� дл� INSERT. Вы намеренно и�пользовали �кобки?"
 
-#: parser/analyze.c:1074 parser/analyze.c:1454
+#: parser/analyze.c:1071 parser/analyze.c:1451
 #, c-format
 msgid "SELECT ... INTO is not allowed here"
 msgstr "SELECT ... INTO зде�ь не допу�кает��"
 
-#: parser/analyze.c:1267
+#: parser/analyze.c:1264
 #, c-format
 msgid "DEFAULT can only appear in a VALUES list within INSERT"
 msgstr "DEFAULT может при�ут�твовать в �пи�ке VALUES только в контек�те INSERT"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:1386 parser/analyze.c:2630
+#: parser/analyze.c:1383 parser/analyze.c:2627
 #, c-format
 msgid "%s cannot be applied to VALUES"
 msgstr "%s нельз� примен�ть к VALUES"
 
-#: parser/analyze.c:1607
+#: parser/analyze.c:1604
 #, c-format
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "неверное предложение UNION/INTERSECT/EXCEPT ORDER BY"
 
-#: parser/analyze.c:1608
+#: parser/analyze.c:1605
 #, c-format
 msgid "Only result column names can be used, not expressions or functions."
 msgstr ""
 "Допу�тимо и�пользование только имён �толбцов, но не выражений или функций."
 
-#: parser/analyze.c:1609
+#: parser/analyze.c:1606
 #, c-format
 msgid ""
 "Add the expression/function to every SELECT, or move the UNION into a FROM "
@@ -12618,12 +12638,12 @@
 "Добавьте выражение/функцию в каждый SELECT или перене�ите UNION в "
 "предложение FROM."
 
-#: parser/analyze.c:1669
+#: parser/analyze.c:1666
 #, c-format
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr "INTO можно добавить только в первый SELECT в UNION/INTERSECT/EXCEPT"
 
-#: parser/analyze.c:1733
+#: parser/analyze.c:1730
 #, c-format
 msgid ""
 "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
@@ -12632,143 +12652,143 @@
 "оператор, �о�тавл�ющий UNION/INTERSECT/EXCEPT, не может ��ылать�� на другие "
 "отношени� на том же уровне запро�а"
 
-#: parser/analyze.c:1822
+#: parser/analyze.c:1819
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "в�е запро�ы в %s должны возвращать одинаковое чи�ло �толбцов"
 
-#: parser/analyze.c:2215
+#: parser/analyze.c:2212
 #, c-format
 msgid "RETURNING must have at least one column"
 msgstr "в RETURNING должен быть минимум один �толбец"
 
-#: parser/analyze.c:2252
+#: parser/analyze.c:2249
 #, c-format
 msgid "cannot specify both SCROLL and NO SCROLL"
 msgstr "противоречивые указани� SCROLL и NO SCROLL"
 
-#: parser/analyze.c:2270
+#: parser/analyze.c:2267
 #, c-format
 msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
 msgstr "DECLARE CURSOR не может �одержать операторы, измен�ющие данные, в WITH"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2278
+#: parser/analyze.c:2275
 #, c-format
 msgid "DECLARE CURSOR WITH HOLD ... %s is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... %s не поддерживает��"
 
-#: parser/analyze.c:2281
+#: parser/analyze.c:2278
 #, c-format
 msgid "Holdable cursors must be READ ONLY."
 msgstr "Сохран�емые кур�оры должны быть READ ONLY."
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2289
+#: parser/analyze.c:2286
 #, c-format
 msgid "DECLARE SCROLL CURSOR ... %s is not supported"
 msgstr "DECLARE SCROLL CURSOR ... %s не поддерживает��"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2300
+#: parser/analyze.c:2297
 #, c-format
 msgid "DECLARE INSENSITIVE CURSOR ... %s is not supported"
 msgstr "DECLARE INSENSITIVE CURSOR ... %s не поддерживает��"
 
-#: parser/analyze.c:2303
+#: parser/analyze.c:2300
 #, c-format
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "�езави�имые кур�оры должны быть READ ONLY."
 
-#: parser/analyze.c:2369
+#: parser/analyze.c:2366
 #, c-format
 msgid "materialized views must not use data-modifying statements in WITH"
 msgstr ""
 "в материализованных пред�тавлени�х не должны и�пользовать�� операторы, "
 "измен�ющие данные в WITH"
 
-#: parser/analyze.c:2379
+#: parser/analyze.c:2376
 #, c-format
 msgid "materialized views must not use temporary tables or views"
 msgstr ""
 "в материализованных пред�тавлени�х не должны и�пользовать�� временные "
 "таблицы и пред�тавлени�"
 
-#: parser/analyze.c:2389
+#: parser/analyze.c:2386
 #, c-format
 msgid "materialized views may not be defined using bound parameters"
 msgstr ""
 "определ�ть материализованные пред�тавлени� �о �в�занными параметрами нельз�"
 
-#: parser/analyze.c:2401
+#: parser/analyze.c:2398
 #, c-format
 msgid "materialized views cannot be UNLOGGED"
 msgstr ""
 "материализованные пред�тавлени� не могут быть нежурналируемыми (UNLOGGED)"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2467
+#: parser/analyze.c:2464
 #, c-format
 msgid "%s is not allowed with DISTINCT clause"
 msgstr "%s не�овме�тимо � предложением DISTINCT"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2474
+#: parser/analyze.c:2471
 #, c-format
 msgid "%s is not allowed with GROUP BY clause"
 msgstr "%s не�овме�тимо � предложением GROUP BY"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2481
+#: parser/analyze.c:2478
 #, c-format
 msgid "%s is not allowed with HAVING clause"
 msgstr "%s не�овме�тимо � предложением HAVING"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2488
+#: parser/analyze.c:2485
 #, c-format
 msgid "%s is not allowed with aggregate functions"
 msgstr "%s не�овме�тимо � агрегатными функци�ми"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2495
+#: parser/analyze.c:2492
 #, c-format
 msgid "%s is not allowed with window functions"
 msgstr "%s не�овме�тимо � оконными функци�ми"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2502
+#: parser/analyze.c:2499
 #, c-format
 msgid "%s is not allowed with set-returning functions in the target list"
 msgstr ""
 "%s не допу�кает�� � функци�ми, возвращающие множе�тва, в �пи�ке результатов"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2581
+#: parser/analyze.c:2578
 #, c-format
 msgid "%s must specify unqualified relation names"
 msgstr "дл� %s нужно указывать неполные имена отношений"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2612
+#: parser/analyze.c:2609
 #, c-format
 msgid "%s cannot be applied to a join"
 msgstr "%s нельз� применить к �оединению"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2621
+#: parser/analyze.c:2618
 #, c-format
 msgid "%s cannot be applied to a function"
 msgstr "%s нельз� применить к функции"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2639
+#: parser/analyze.c:2636
 #, c-format
 msgid "%s cannot be applied to a WITH query"
 msgstr "%s нельз� применить к запро�у WITH"
 
 #. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: parser/analyze.c:2656
+#: parser/analyze.c:2653
 #, c-format
 msgid "relation \"%s\" in %s clause not found in FROM clause"
 msgstr "отношение \"%s\" в определении %s от�ут�твует в предложении FROM"
@@ -13265,7 +13285,7 @@
 
 #: parser/parse_coerce.c:971 parser/parse_coerce.c:1001
 #: parser/parse_coerce.c:1019 parser/parse_coerce.c:1034
-#: parser/parse_expr.c:2015 parser/parse_expr.c:2528 parser/parse_target.c:874
+#: parser/parse_expr.c:2028 parser/parse_expr.c:2552 parser/parse_target.c:885
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "приве�ти тип %s к %s нельз�"
@@ -13350,8 +13370,7 @@
 #: parser/parse_coerce.c:1735 parser/parse_coerce.c:1956
 #, c-format
 msgid "argument declared \"anyrange\" is not a range type but type %s"
-msgstr ""
-"аргумент, объ�вленный как \"anyrange\", оказал�� не диапазоном, а типом %s"
+msgstr "аргумент, объ�вленный как \"anyrange\", имеет не диапазонный тип, а %s"
 
 #: parser/parse_coerce.c:1751
 #, c-format
@@ -13461,13 +13480,13 @@
 "recursive query \"%s\" column %d has type %s in non-recursive term but type "
 "%s overall"
 msgstr ""
-"в рекур�ивном запро�е \"%s\" �толбец %d имеет тип %s в не рекур�ивной ча�ти, "
+"в рекур�ивном запро�е \"%s\" �толбец %d имеет тип %s в нерекур�ивной ча�ти, "
 "но в результате тип %s"
 
 #: parser/parse_cte.c:319
 #, c-format
 msgid "Cast the output of the non-recursive term to the correct type."
-msgstr "Приведите результат не рекур�ивной ча�ти к правильному типу."
+msgstr "Приведите результат нерекур�ивной ча�ти к правильному типу."
 
 #: parser/parse_cte.c:324
 #, c-format
@@ -13482,7 +13501,7 @@
 #, c-format
 msgid "Use the COLLATE clause to set the collation of the non-recursive term."
 msgstr ""
-"Измените правило �ортировки в не рекур�ивной ча�ти, добавив предложение "
+"Измените правило �ортировки в нерекур�ивной ча�ти, добавив предложение "
 "COLLATE."
 
 #: parser/parse_cte.c:419
@@ -13507,7 +13526,7 @@
 "recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] "
 "recursive-term"
 msgstr ""
-"рекур�ивный запро� \"%s\" должен иметь форму {не рекур�ивна� ча�ть} UNION "
+"рекур�ивный запро� \"%s\" должен иметь форму {нерекур�ивна� ча�ть} UNION "
 "[ALL] {рекур�ивна� ча�ть}"
 
 #: parser/parse_cte.c:703
@@ -13535,8 +13554,8 @@
 msgid "recursive reference to query \"%s\" must not appear more than once"
 msgstr "рекур�ивна� ��ылка на запро� \"%s\" указана неоднократно"
 
-#: parser/parse_expr.c:387 parser/parse_relation.c:3083
-#: parser/parse_relation.c:3103
+#: parser/parse_expr.c:387 parser/parse_relation.c:3176
+#: parser/parse_relation.c:3196
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "�толбец %s.%s не �уще�твует"
@@ -13551,19 +13570,20 @@
 msgid "could not identify column \"%s\" in record data type"
 msgstr "не удало�ь идентифицировать �толбец \"%s\" в типе запи�и"
 
+# skip-rule: space-before-period
 #: parser/parse_expr.c:411
 #, c-format
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr ""
 "запи�ь имени �толбца .%s применена к типу %s, который не �вл�ет�� �о�тавным"
 
-#: parser/parse_expr.c:441 parser/parse_target.c:660
+#: parser/parse_expr.c:441 parser/parse_target.c:671
 #, c-format
 msgid "row expansion via \"*\" is not supported here"
 msgstr "ра�ширение �троки через \"*\" зде�ь не поддерживает��"
 
-#: parser/parse_expr.c:767 parser/parse_relation.c:667
-#: parser/parse_relation.c:767 parser/parse_target.c:1109
+#: parser/parse_expr.c:767 parser/parse_relation.c:668
+#: parser/parse_relation.c:768 parser/parse_target.c:1120
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "неоднозначна� ��ылка на �толбец \"%s\""
@@ -13574,141 +13594,141 @@
 msgid "there is no parameter $%d"
 msgstr "параметр $%d не �уще�твует"
 
-#: parser/parse_expr.c:1034
+#: parser/parse_expr.c:1042
 #, c-format
 msgid "NULLIF requires = operator to yield boolean"
 msgstr "дл� NULLIF требует��, чтобы оператор = возвращал логиче�кое значение"
 
-#: parser/parse_expr.c:1468 gram.y:9745
+#: parser/parse_expr.c:1476 gram.y:9745
 #, c-format
 msgid "number of columns does not match number of values"
 msgstr "чи�ло �толбцов не равно чи�лу значений"
 
-#: parser/parse_expr.c:1697
+#: parser/parse_expr.c:1705
 msgid "cannot use subquery in check constraint"
 msgstr "в ограничении-проверке нельз� и�пользовать подзапро�ы"
 
-#: parser/parse_expr.c:1701
+#: parser/parse_expr.c:1709
 msgid "cannot use subquery in DEFAULT expression"
 msgstr "в выражении DEFAULT нельз� и�пользовать подзапро�ы"
 
-#: parser/parse_expr.c:1704
+#: parser/parse_expr.c:1712
 msgid "cannot use subquery in index expression"
 msgstr "в индек�ном выражении нельз� и�пользовать подзапро�ы"
 
-#: parser/parse_expr.c:1707
+#: parser/parse_expr.c:1715
 msgid "cannot use subquery in index predicate"
 msgstr "в предикате индек�а нельз� и�пользовать подзапро�ы"
 
-#: parser/parse_expr.c:1710
+#: parser/parse_expr.c:1718
 msgid "cannot use subquery in transform expression"
 msgstr "нельз� и�пользовать подзапро� в выражении преобразовани�"
 
-#: parser/parse_expr.c:1713
+#: parser/parse_expr.c:1721
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "в каче�тве параметра EXECUTE нельз� и�пользовать подзапро�"
 
-#: parser/parse_expr.c:1716
+#: parser/parse_expr.c:1724
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "в у�ловии WHEN дл� триггера нельз� и�пользовать подзапро�ы"
 
-#: parser/parse_expr.c:1770
+#: parser/parse_expr.c:1778
 #, c-format
 msgid "subquery must return only one column"
 msgstr "подзапро� должен вернуть только один �толбец"
 
-#: parser/parse_expr.c:1854
+#: parser/parse_expr.c:1862
 #, c-format
 msgid "subquery has too many columns"
 msgstr "в подзапро�е �лишком много �толбцов"
 
-#: parser/parse_expr.c:1859
+#: parser/parse_expr.c:1867
 #, c-format
 msgid "subquery has too few columns"
 msgstr "в подзапро�е недо�таточно �толбцов"
 
-#: parser/parse_expr.c:1955
+#: parser/parse_expr.c:1968
 #, c-format
 msgid "cannot determine type of empty array"
 msgstr "тип пу�того ма��ива определить нельз�"
 
-#: parser/parse_expr.c:1956
+#: parser/parse_expr.c:1969
 #, c-format
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr ""
 "Приведите его к желаемому типу �вным образом, например ARRAY[]::integer[]."
 
-#: parser/parse_expr.c:1970
+#: parser/parse_expr.c:1983
 #, c-format
 msgid "could not find element type for data type %s"
 msgstr "не удало�ь определить тип �лемента дл� типа данных %s"
 
-#: parser/parse_expr.c:2193
+#: parser/parse_expr.c:2206
 #, c-format
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "вме�то значени� XML-атрибута без имени должен указывать�� �толбец"
 
-#: parser/parse_expr.c:2194
+#: parser/parse_expr.c:2207
 #, c-format
 msgid "unnamed XML element value must be a column reference"
 msgstr "вме�то значени� XML-�лемента без имени должен указывать�� �толбец"
 
-#: parser/parse_expr.c:2209
+#: parser/parse_expr.c:2222
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "им� XML-атрибута \"%s\" указано неоднократно"
 
-#: parser/parse_expr.c:2316
+#: parser/parse_expr.c:2329
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "приве�ти результат XMLSERIALIZE к типу %s нельз�"
 
-#: parser/parse_expr.c:2601 parser/parse_expr.c:2797
+#: parser/parse_expr.c:2625 parser/parse_expr.c:2821
 #, c-format
 msgid "unequal number of entries in row expressions"
 msgstr "разное чи�ло �лементов в �троках"
 
-#: parser/parse_expr.c:2611
+#: parser/parse_expr.c:2635
 #, c-format
 msgid "cannot compare rows of zero length"
 msgstr "�троки нулевой длины �равнивать нельз�"
 
-#: parser/parse_expr.c:2636
+#: parser/parse_expr.c:2660
 #, c-format
 msgid "row comparison operator must yield type boolean, not type %s"
 msgstr ""
 "оператор �равнени� �трок должен выдавать результат логиче�кого типа, а не %s"
 
-#: parser/parse_expr.c:2643
+#: parser/parse_expr.c:2667
 #, c-format
 msgid "row comparison operator must not return a set"
 msgstr "оператор �равнени� �трок не должен возвращать множе�тво"
 
-#: parser/parse_expr.c:2702 parser/parse_expr.c:2743
+#: parser/parse_expr.c:2726 parser/parse_expr.c:2767
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "не удало�ь выбрать интерпретацию оператора �равнени� �трок %s"
 
-#: parser/parse_expr.c:2704
+#: parser/parse_expr.c:2728
 #, c-format
 msgid ""
 "Row comparison operators must be associated with btree operator families."
 msgstr ""
 "Операторы �равнени� �трок должны быть �в�заны � �емей�твом операторов btree."
 
-#: parser/parse_expr.c:2745
+#: parser/parse_expr.c:2769
 #, c-format
 msgid "There are multiple equally-plausible candidates."
 msgstr "Оказало�ь не�колько равноценных кандидатур."
 
-#: parser/parse_expr.c:2837
+#: parser/parse_expr.c:2861
 #, c-format
 msgid "IS DISTINCT FROM requires = operator to yield boolean"
 msgstr ""
 "дл� IS DISTINCT FROM требует��, чтобы оператор = возвращал логиче�кое "
 "значение"
 
-#: parser/parse_expr.c:3127 parser/parse_expr.c:3145
+#: parser/parse_expr.c:3151 parser/parse_expr.c:3169
 #, c-format
 msgid "operator precedence change: %s is now lower precedence than %s"
 msgstr ""
@@ -13919,8 +13939,8 @@
 msgstr ""
 "дл� при�ваивани� ма��ива требует�� тип %s, однако выражение имеет тип %s"
 
-#: parser/parse_oper.c:125 parser/parse_oper.c:722 utils/adt/regproc.c:583
-#: utils/adt/regproc.c:603 utils/adt/regproc.c:787
+#: parser/parse_oper.c:125 parser/parse_oper.c:722 utils/adt/regproc.c:584
+#: utils/adt/regproc.c:604 utils/adt/regproc.c:788
 #, c-format
 msgid "operator does not exist: %s"
 msgstr "оператор не �уще�твует: %s"
@@ -13930,9 +13950,9 @@
 msgid "Use an explicit ordering operator or modify the query."
 msgstr "И�пользуйте �вный оператор �ортировки или измените запро�."
 
-#: parser/parse_oper.c:226 utils/adt/array_userfuncs.c:782
-#: utils/adt/array_userfuncs.c:920 utils/adt/arrayfuncs.c:3613
-#: utils/adt/arrayfuncs.c:4051 utils/adt/arrayfuncs.c:6029
+#: parser/parse_oper.c:226 utils/adt/array_userfuncs.c:794
+#: utils/adt/array_userfuncs.c:933 utils/adt/arrayfuncs.c:3613
+#: utils/adt/arrayfuncs.c:4051 utils/adt/arrayfuncs.c:6017
 #: utils/adt/rowtypes.c:1167
 #, c-format
 msgid "could not identify an equality operator for type %s"
@@ -13995,27 +14015,27 @@
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "дл� параметра $%d выведены не�огла�ованные типы"
 
-#: parser/parse_relation.c:174
+#: parser/parse_relation.c:175
 #, c-format
 msgid "table reference \"%s\" is ambiguous"
 msgstr "��ылка на таблицу \"%s\" неоднозначна"
 
-#: parser/parse_relation.c:218
+#: parser/parse_relation.c:219
 #, c-format
 msgid "table reference %u is ambiguous"
 msgstr "��ылка на таблицу %u неоднозначна"
 
-#: parser/parse_relation.c:397
+#: parser/parse_relation.c:398
 #, c-format
 msgid "table name \"%s\" specified more than once"
 msgstr "им� таблицы \"%s\" указано больше одного раза"
 
-#: parser/parse_relation.c:424 parser/parse_relation.c:3023
+#: parser/parse_relation.c:425 parser/parse_relation.c:3116
 #, c-format
 msgid "invalid reference to FROM-clause entry for table \"%s\""
 msgstr "в �лементе предложени� FROM неверна� ��ылка на таблицу \"%s\""
 
-#: parser/parse_relation.c:427 parser/parse_relation.c:3028
+#: parser/parse_relation.c:428 parser/parse_relation.c:3121
 #, c-format
 msgid ""
 "There is an entry for table \"%s\", but it cannot be referenced from this "
@@ -14024,23 +14044,23 @@
 "Таблица \"%s\" при�ут�твует в запро�е, но �о�лать�� на неё из �той ча�ти "
 "запро�а нельз�."
 
-#: parser/parse_relation.c:429
+#: parser/parse_relation.c:430
 #, c-format
 msgid "The combining JOIN type must be INNER or LEFT for a LATERAL reference."
 msgstr "Дл� ��ылки LATERAL тип JOIN должен быть INNER или LEFT."
 
-#: parser/parse_relation.c:705
+#: parser/parse_relation.c:706
 #, c-format
 msgid "system column \"%s\" reference in check constraint is invalid"
 msgstr "в ограничении-проверке указан недопу�тимый �и�темный �толбец \"%s\""
 
-#: parser/parse_relation.c:1065 parser/parse_relation.c:1345
-#: parser/parse_relation.c:1847
+#: parser/parse_relation.c:1066 parser/parse_relation.c:1346
+#: parser/parse_relation.c:1848
 #, c-format
 msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr "в таблице \"%s\" �одержит�� �толбцов: %d, но указано: %d"
 
-#: parser/parse_relation.c:1152
+#: parser/parse_relation.c:1153
 #, c-format
 msgid ""
 "There is a WITH item named \"%s\", but it cannot be referenced from this "
@@ -14049,7 +14069,7 @@
 "В WITH е�ть �лемент \"%s\", но на него нельз� ��ылать�� из �той ча�ти "
 "запро�а."
 
-#: parser/parse_relation.c:1154
+#: parser/parse_relation.c:1155
 #, c-format
 msgid ""
 "Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
@@ -14057,7 +14077,7 @@
 "И�пользуйте WITH RECURSIVE или и�ключите ��ылки вперёд, переупор�дочив "
 "�лементы WITH."
 
-#: parser/parse_relation.c:1465
+#: parser/parse_relation.c:1466
 #, c-format
 msgid ""
 "a column definition list is only allowed for functions returning \"record\""
@@ -14065,54 +14085,54 @@
 "�пи�ок � определением �толбцов может быть только у функций, возвращающих "
 "запи�ь"
 
-#: parser/parse_relation.c:1474
+#: parser/parse_relation.c:1475
 #, c-format
 msgid "a column definition list is required for functions returning \"record\""
 msgstr ""
 "у функций, возвращающих запи�ь, должен быть �пи�ок � определением �толбцов"
 
-#: parser/parse_relation.c:1553
+#: parser/parse_relation.c:1554
 #, c-format
 msgid "function \"%s\" in FROM has unsupported return type %s"
 msgstr ""
 "функци� \"%s\", и�пользуема� во FROM, возвращает неподдерживаемый тип %s"
 
-#: parser/parse_relation.c:1675
+#: parser/parse_relation.c:1676
 #, c-format
 msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
 msgstr "в �пи�ках VALUES \"%s\" �одержит�� �толбцов: %d, но указано: %d"
 
-#: parser/parse_relation.c:1730
+#: parser/parse_relation.c:1731
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "чи�ло �толбцов в �оединени�х ограничено %d"
 
-#: parser/parse_relation.c:1820
+#: parser/parse_relation.c:1821
 #, c-format
 msgid "WITH query \"%s\" does not have a RETURNING clause"
 msgstr "в запро�е \"%s\" в WITH нет предложени� RETURNING"
 
-#: parser/parse_relation.c:2652 parser/parse_relation.c:2807
+#: parser/parse_relation.c:2738 parser/parse_relation.c:2900
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "�толбец %d отношени� \"%s\" не �уще�твует"
 
-#: parser/parse_relation.c:3026
+#: parser/parse_relation.c:3119
 #, c-format
 msgid "Perhaps you meant to reference the table alias \"%s\"."
 msgstr "Возможно, предполагала�ь ��ылка на п�евдоним таблицы \"%s\"."
 
-#: parser/parse_relation.c:3034
+#: parser/parse_relation.c:3127
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "таблица \"%s\" от�ут�твует в предложении FROM"
 
-#: parser/parse_relation.c:3086
+#: parser/parse_relation.c:3179
 #, c-format
 msgid "Perhaps you meant to reference the column \"%s.%s\"."
 msgstr "Возможно, предполагала�ь ��ылка на �толбец \"%s.%s\"."
 
-#: parser/parse_relation.c:3088
+#: parser/parse_relation.c:3181
 #, c-format
 msgid ""
 "There is a column named \"%s\" in table \"%s\", but it cannot be referenced "
@@ -14121,34 +14141,34 @@
 "Столбец \"%s\" е�ть в таблице \"%s\", но на него нельз� ��ылать�� из �той "
 "ча�ти запро�а."
 
-#: parser/parse_relation.c:3105
+#: parser/parse_relation.c:3198
 #, c-format
 msgid ""
 "Perhaps you meant to reference the column \"%s.%s\" or the column \"%s.%s\"."
 msgstr ""
 "Возможно, предполагала�ь ��ылка на �толбец \"%s.%s\" или �толбец \"%s.%s\"."
 
-#: parser/parse_target.c:421 parser/parse_target.c:713
+#: parser/parse_target.c:432 parser/parse_target.c:724
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "при�воить значение �и�темному �толбцу \"%s\" нельз�"
 
-#: parser/parse_target.c:449
+#: parser/parse_target.c:460
 #, c-format
 msgid "cannot set an array element to DEFAULT"
 msgstr "�лементу ма��ива нельз� при�воить значение по умолчанию"
 
-#: parser/parse_target.c:454
+#: parser/parse_target.c:465
 #, c-format
 msgid "cannot set a subfield to DEFAULT"
 msgstr "вложенному полю нельз� при�воить значение по умолчанию"
 
-#: parser/parse_target.c:523
+#: parser/parse_target.c:534
 #, c-format
 msgid "column \"%s\" is of type %s but expression is of type %s"
 msgstr "�толбец \"%s\" имеет тип %s, а выражение - %s"
 
-#: parser/parse_target.c:697
+#: parser/parse_target.c:708
 #, c-format
 msgid ""
 "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
@@ -14157,7 +14177,7 @@
 "при�воить значение полю \"%s\" �толбца \"%s\" нельз�, так как тип %s не "
 "�вл�ет�� �о�тавным"
 
-#: parser/parse_target.c:706
+#: parser/parse_target.c:717
 #, c-format
 msgid ""
 "cannot assign to field \"%s\" of column \"%s\" because there is no such "
@@ -14166,7 +14186,7 @@
 "при�воить значение полю \"%s\" �толбца \"%s\" нельз�, так как в типе данных "
 "%s нет такого �толбца"
 
-#: parser/parse_target.c:773
+#: parser/parse_target.c:784
 #, c-format
 msgid ""
 "array assignment to \"%s\" requires type %s but expression is of type %s"
@@ -14174,12 +14194,12 @@
 "дл� при�ваивани� ма��ива полю \"%s\" требует�� тип %s, однако выражение "
 "имеет тип %s"
 
-#: parser/parse_target.c:783
+#: parser/parse_target.c:794
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
 msgstr "вложенное поле \"%s\" имеет тип %s, а выражение - %s"
 
-#: parser/parse_target.c:1199
+#: parser/parse_target.c:1210
 #, c-format
 msgid "SELECT * with no tables specified is not valid"
 msgstr "SELECT * должен ��ылать�� на таблицы"
@@ -14266,86 +14286,86 @@
 msgid "LIKE is not supported for creating foreign tables"
 msgstr "LIKE при �оздании �торонних таблиц не поддерживает��"
 
-#: parser/parse_utilcmd.c:1239 parser/parse_utilcmd.c:1315
+#: parser/parse_utilcmd.c:1241 parser/parse_utilcmd.c:1317
 #, c-format
 msgid "Index \"%s\" contains a whole-row table reference."
 msgstr "Индек� \"%s\" ��ылает�� на тип в�ей �троки таблицы."
 
-#: parser/parse_utilcmd.c:1584
+#: parser/parse_utilcmd.c:1586
 #, c-format
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "в CREATE TABLE нельз� и�пользовать �уще�твующий индек�"
 
-#: parser/parse_utilcmd.c:1604
+#: parser/parse_utilcmd.c:1606
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
 msgstr "индек� \"%s\" уже �в�зан � ограничением"
 
-#: parser/parse_utilcmd.c:1612
+#: parser/parse_utilcmd.c:1614
 #, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
 msgstr "индек� \"%s\" не принадлежит таблице \"%s\""
 
-#: parser/parse_utilcmd.c:1619
+#: parser/parse_utilcmd.c:1621
 #, c-format
 msgid "index \"%s\" is not valid"
 msgstr "индек� \"%s\" - нерабочий"
 
-#: parser/parse_utilcmd.c:1625
+#: parser/parse_utilcmd.c:1627
 #, c-format
 msgid "\"%s\" is not a unique index"
 msgstr "\"%s\" не �вл�ет�� уникальным индек�ом"
 
-#: parser/parse_utilcmd.c:1626 parser/parse_utilcmd.c:1633
-#: parser/parse_utilcmd.c:1640 parser/parse_utilcmd.c:1710
+#: parser/parse_utilcmd.c:1628 parser/parse_utilcmd.c:1635
+#: parser/parse_utilcmd.c:1642 parser/parse_utilcmd.c:1712
 #, c-format
 msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr ""
 "Создать первичный ключ или ограничение уникально�ти дл� такого индек�а "
 "нельз�."
 
-#: parser/parse_utilcmd.c:1632
+#: parser/parse_utilcmd.c:1634
 #, c-format
 msgid "index \"%s\" contains expressions"
 msgstr "индек� \"%s\" �одержит выражени�"
 
-#: parser/parse_utilcmd.c:1639
+#: parser/parse_utilcmd.c:1641
 #, c-format
 msgid "\"%s\" is a partial index"
 msgstr "\"%s\" - ча�тичный индек�"
 
-#: parser/parse_utilcmd.c:1651
+#: parser/parse_utilcmd.c:1653
 #, c-format
 msgid "\"%s\" is a deferrable index"
 msgstr "\"%s\" - откладываемый индек�"
 
-#: parser/parse_utilcmd.c:1652
+#: parser/parse_utilcmd.c:1654
 #, c-format
 msgid "Cannot create a non-deferrable constraint using a deferrable index."
 msgstr ""
 "Создать не откладываемое ограничение на базе откладываемого индек�а нельз�."
 
-#: parser/parse_utilcmd.c:1709
+#: parser/parse_utilcmd.c:1711
 #, c-format
 msgid "index \"%s\" does not have default sorting behavior"
 msgstr "дл� индек�а \"%s\" не определено поведение при �ортировке по умолчанию"
 
-#: parser/parse_utilcmd.c:1856
+#: parser/parse_utilcmd.c:1858
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "�толбец \"%s\" фигурирует в первичном ключе дважды"
 
-#: parser/parse_utilcmd.c:1862
+#: parser/parse_utilcmd.c:1864
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "�толбец \"%s\" фигурирует в ограничении уникально�ти дважды"
 
-#: parser/parse_utilcmd.c:2032
+#: parser/parse_utilcmd.c:2034
 #, c-format
 msgid "index expression cannot return a set"
 msgstr "индек�ное выражение не может возвращать множе�тво"
 
-#: parser/parse_utilcmd.c:2043
+#: parser/parse_utilcmd.c:2045
 #, c-format
 msgid ""
 "index expressions and predicates can refer only to the table being indexed"
@@ -14353,17 +14373,17 @@
 "индек�ные выражени� и предикаты могут ��ылать�� только на индек�ируемую "
 "таблицу"
 
-#: parser/parse_utilcmd.c:2089
+#: parser/parse_utilcmd.c:2091
 #, c-format
 msgid "rules on materialized views are not supported"
 msgstr "правила дл� материализованных пред�тавлений не поддерживают��"
 
-#: parser/parse_utilcmd.c:2150
+#: parser/parse_utilcmd.c:2152
 #, c-format
 msgid "rule WHERE condition cannot contain references to other relations"
 msgstr "в у�лови�х WHERE дл� правил нельз� ��ылать�� на другие отношени�"
 
-#: parser/parse_utilcmd.c:2222
+#: parser/parse_utilcmd.c:2224
 #, c-format
 msgid ""
 "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
@@ -14372,85 +14392,85 @@
 "правила � у�лови�ми WHERE могут �одержать только дей�тви� SELECT, INSERT, "
 "UPDATE или DELETE"
 
-#: parser/parse_utilcmd.c:2240 parser/parse_utilcmd.c:2339
+#: parser/parse_utilcmd.c:2242 parser/parse_utilcmd.c:2341
 #: rewrite/rewriteHandler.c:478 rewrite/rewriteManip.c:1015
 #, c-format
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "у�ловные операторы UNION/INTERSECT/EXCEPT не реализованы"
 
-#: parser/parse_utilcmd.c:2258
+#: parser/parse_utilcmd.c:2260
 #, c-format
 msgid "ON SELECT rule cannot use OLD"
 msgstr "в правиле ON SELECT нельз� и�пользовать OLD"
 
-#: parser/parse_utilcmd.c:2262
+#: parser/parse_utilcmd.c:2264
 #, c-format
 msgid "ON SELECT rule cannot use NEW"
 msgstr "в правиле ON SELECT нельз� и�пользовать NEW"
 
-#: parser/parse_utilcmd.c:2271
+#: parser/parse_utilcmd.c:2273
 #, c-format
 msgid "ON INSERT rule cannot use OLD"
 msgstr "в правиле ON INSERT нельз� и�пользовать OLD"
 
-#: parser/parse_utilcmd.c:2277
+#: parser/parse_utilcmd.c:2279
 #, c-format
 msgid "ON DELETE rule cannot use NEW"
 msgstr "в правиле ON DELETE нельз� и�пользовать NEW"
 
-#: parser/parse_utilcmd.c:2305
+#: parser/parse_utilcmd.c:2307
 #, c-format
 msgid "cannot refer to OLD within WITH query"
 msgstr "в запро�е WITH нельз� ��ылать�� на OLD"
 
-#: parser/parse_utilcmd.c:2312
+#: parser/parse_utilcmd.c:2314
 #, c-format
 msgid "cannot refer to NEW within WITH query"
 msgstr "в запро�е WITH нельз� ��ылать�� на NEW"
 
-#: parser/parse_utilcmd.c:2515
+#: parser/parse_utilcmd.c:2517
 #, c-format
 msgid "transform expression must not return a set"
 msgstr "выражение преобразовани� не должно возвращать множе�тво"
 
-#: parser/parse_utilcmd.c:2629
+#: parser/parse_utilcmd.c:2631
 #, c-format
 msgid "misplaced DEFERRABLE clause"
 msgstr "предложение DEFERRABLE ра�положено неправильно"
 
-#: parser/parse_utilcmd.c:2634 parser/parse_utilcmd.c:2649
+#: parser/parse_utilcmd.c:2636 parser/parse_utilcmd.c:2651
 #, c-format
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "DEFERRABLE/NOT DEFERRABLE можно указать только один раз"
 
-#: parser/parse_utilcmd.c:2644
+#: parser/parse_utilcmd.c:2646
 #, c-format
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "предложение NOT DEFERRABLE ра�положено неправильно"
 
-#: parser/parse_utilcmd.c:2657 parser/parse_utilcmd.c:2683 gram.y:4852
+#: parser/parse_utilcmd.c:2659 parser/parse_utilcmd.c:2685 gram.y:4852
 #, c-format
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr ""
 "ограничение � характери�тикой INITIALLY DEFERRED должно быть объ�влено как "
 "DEFERRABLE"
 
-#: parser/parse_utilcmd.c:2665
+#: parser/parse_utilcmd.c:2667
 #, c-format
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "предложение INITIALLY DEFERRED ра�положено неправильно"
 
-#: parser/parse_utilcmd.c:2670 parser/parse_utilcmd.c:2696
+#: parser/parse_utilcmd.c:2672 parser/parse_utilcmd.c:2698
 #, c-format
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "INITIALLY IMMEDIATE/DEFERRED можно указать только один раз"
 
-#: parser/parse_utilcmd.c:2691
+#: parser/parse_utilcmd.c:2693
 #, c-format
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "предложение INITIALLY IMMEDIATE ра�положено неправильно"
 
-#: parser/parse_utilcmd.c:2882
+#: parser/parse_utilcmd.c:2884
 #, c-format
 msgid ""
 "CREATE specifies a schema (%s) different from the one being created (%s)"
@@ -14510,17 +14530,17 @@
 "Возможно, вам �ледует увеличить параметр �дра SEMVMX минимум до %d.  "
 "Подробнее об �том напи�ано в документации PostgreSQL."
 
-#: port/pg_shmem.c:141 port/sysv_shmem.c:141
+#: port/pg_shmem.c:195 port/sysv_shmem.c:195
 #, c-format
 msgid "could not create shared memory segment: %m"
 msgstr "не удало�ь �оздать �егмент раздел�емой пам�ти: %m"
 
-#: port/pg_shmem.c:142 port/sysv_shmem.c:142
+#: port/pg_shmem.c:196 port/sysv_shmem.c:196
 #, c-format
 msgid "Failed system call was shmget(key=%lu, size=%zu, 0%o)."
 msgstr "Ошибка в �и�темном вызове shmget(ключ=%lu, размер=%zu, 0%o)."
 
-#: port/pg_shmem.c:146 port/sysv_shmem.c:146
+#: port/pg_shmem.c:200 port/sysv_shmem.c:200
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory "
@@ -14534,7 +14554,7 @@
 "Подробна� информаци� о на�тройке раздел�емой пам�ти �одержит�� в "
 "документации PostgreSQL."
 
-#: port/pg_shmem.c:153 port/sysv_shmem.c:153
+#: port/pg_shmem.c:207 port/sysv_shmem.c:207
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory "
@@ -14549,7 +14569,7 @@
 "Подробна� информаци� о на�тройке раздел�емой пам�ти �одержит�� в "
 "документации PostgreSQL."
 
-#: port/pg_shmem.c:159 port/sysv_shmem.c:159
+#: port/pg_shmem.c:213 port/sysv_shmem.c:213
 #, c-format
 msgid ""
 "This error does *not* mean that you have run out of disk space.  It occurs "
@@ -14566,17 +14586,12 @@
 "Подробна� информаци� о на�тройке раздел�емой пам�ти �одержит�� в "
 "документации PostgreSQL."
 
-#: port/pg_shmem.c:340 port/sysv_shmem.c:340
-#, c-format
-msgid "huge TLB pages not supported on this platform"
-msgstr "гигант�кие �траницы TLB на �той платформе не поддерживают��"
-
-#: port/pg_shmem.c:390 port/sysv_shmem.c:390
+#: port/pg_shmem.c:504 port/sysv_shmem.c:504
 #, c-format
 msgid "could not map anonymous shared memory: %m"
 msgstr "не удало�ь получить анонимную раздел�емую пам�ть: %m"
 
-#: port/pg_shmem.c:392 port/sysv_shmem.c:392
+#: port/pg_shmem.c:506 port/sysv_shmem.c:506
 #, c-format
 msgid ""
 "This error usually means that PostgreSQL's request for a shared memory "
@@ -14590,22 +14605,22 @@
 "Б) можно �низить и�пользование раздел�емой пам�ти, возможно, уменьшив "
 "shared_buffers или max_connections."
 
-#: port/pg_shmem.c:439 port/sysv_shmem.c:439 port/win32_shmem.c:134
+#: port/pg_shmem.c:572 port/sysv_shmem.c:572 port/win32_shmem.c:134
 #, c-format
 msgid "huge pages not supported on this platform"
 msgstr "гигант�кие �траницы на �той платформе не поддерживают��"
 
-#: port/pg_shmem.c:553 port/sysv_shmem.c:553
+#: port/pg_shmem.c:667 port/sysv_shmem.c:667
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "не удало�ь получить информацию о каталоге данных \"%s\": %m"
 
-#: port/win32/crashdump.c:108
+#: port/win32/crashdump.c:122
 #, c-format
 msgid "could not load dbghelp.dll, cannot write crash dump\n"
 msgstr "не удало�ь загрузить dbghelp.dll, �охранить аварийный дамп нельз�\n"
 
-#: port/win32/crashdump.c:116
+#: port/win32/crashdump.c:130
 #, c-format
 msgid ""
 "could not load required functions in dbghelp.dll, cannot write crash dump\n"
@@ -14613,17 +14628,17 @@
 "не удало�ь найти требуемые функции в dbghelp.dll, �охранить аварийный дамп "
 "нельз�\n"
 
-#: port/win32/crashdump.c:147
+#: port/win32/crashdump.c:161
 #, c-format
 msgid "could not open crash dump file \"%s\" for writing: error code %lu\n"
 msgstr "не удало�ь открыть файл дампа \"%s\" дл� запи�и (код ошибки: %lu)\n"
 
-#: port/win32/crashdump.c:154
+#: port/win32/crashdump.c:168
 #, c-format
 msgid "wrote crash dump to file \"%s\"\n"
 msgstr "аварийный дамп запи�ан в файл\"%s\"\n"
 
-#: port/win32/crashdump.c:156
+#: port/win32/crashdump.c:170
 #, c-format
 msgid "could not write crash dump to file \"%s\": error code %lu\n"
 msgstr "не удало�ь запи�ать аварийный дамп в файл \"%s\" (код ошибки: %lu)\n"
@@ -14644,21 +14659,21 @@
 msgstr ""
 "не удало�ь получить SID группы Опытные пользователи (код ошибки: %lu)\n"
 
-#: port/win32/signal.c:193
+#: port/win32/signal.c:194
 #, c-format
 msgid "could not create signal listener pipe for PID %d: error code %lu"
 msgstr ""
 "не удало�ь �оздать канал приёма �игналов дл� проце��а � PID %d (код ошибки: "
 "%lu)"
 
-#: port/win32/signal.c:273 port/win32/signal.c:305
+#: port/win32/signal.c:274 port/win32/signal.c:306
 #, c-format
 msgid "could not create signal listener pipe: error code %lu; retrying\n"
 msgstr ""
 "не удало�ь �оздать канал приёма �игналов (код ошибки: %lu); ещё одна "
 "попытка...\n"
 
-#: port/win32/signal.c:316
+#: port/win32/signal.c:317
 #, c-format
 msgid "could not create signal dispatch thread: error code %lu\n"
 msgstr "не удало�ь �оздать поток ра�пределени� �игналов (код ошибки: %lu)\n"
@@ -14716,74 +14731,76 @@
 msgid "Failed system call was MapViewOfFileEx."
 msgstr "Ошибка в �и�темном вызове MapViewOfFileEx."
 
-#: postmaster/autovacuum.c:377
+#: postmaster/autovacuum.c:380
 #, c-format
 msgid "could not fork autovacuum launcher process: %m"
 msgstr "породить проце�� запу�ка автоочи�тки не удало�ь: %m"
 
-#: postmaster/autovacuum.c:413
+#: postmaster/autovacuum.c:416
 #, c-format
 msgid "autovacuum launcher started"
 msgstr "проце�� запу�ка автоочи�тки �оздан"
 
-#: postmaster/autovacuum.c:775
+#: postmaster/autovacuum.c:779
 #, c-format
 msgid "autovacuum launcher shutting down"
 msgstr "проце�� запу�ка автоочи�тки завершает��"
 
-#: postmaster/autovacuum.c:1443
+#: postmaster/autovacuum.c:1447
 #, c-format
 msgid "could not fork autovacuum worker process: %m"
 msgstr "не удало�ь породить рабочий проце�� автоочи�тки: %m"
 
-#: postmaster/autovacuum.c:1639
+#: postmaster/autovacuum.c:1643
 #, c-format
 msgid "autovacuum: processing database \"%s\""
 msgstr "автоочи�тка: обработка базы данных \"%s\""
 
-#: postmaster/autovacuum.c:2051
+# skip-rule: capital-letter-first
+#: postmaster/autovacuum.c:2058
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
 msgstr ""
 "автоочи�тка: удаление у�таревшей врем. таблицы \"%s\".\"%s\" в базе \"%s\""
 
-#: postmaster/autovacuum.c:2063
+# skip-rule: capital-letter-first
+#: postmaster/autovacuum.c:2070
 #, c-format
 msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
 msgstr ""
 "автоочи�тка: найдена у�таревша� врем. таблица \"%s\".\"%s\" в базе \"%s\""
 
-#: postmaster/autovacuum.c:2346
+#: postmaster/autovacuum.c:2355
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "автоматиче�ка� очи�тка таблицы \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2349
+#: postmaster/autovacuum.c:2358
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "автоматиче�кий анализ таблицы \"%s.%s.%s\""
 
-#: postmaster/autovacuum.c:2877
+#: postmaster/autovacuum.c:2907
 #, c-format
 msgid "autovacuum not started because of misconfiguration"
 msgstr "автоочи�тка не запущена из-за неправильной конфигурации"
 
-#: postmaster/autovacuum.c:2878
+#: postmaster/autovacuum.c:2908
 #, c-format
 msgid "Enable the \"track_counts\" option."
 msgstr "Включите параметр \"track_counts\"."
 
-#: postmaster/bgworker.c:346 postmaster/bgworker.c:746
+#: postmaster/bgworker.c:366 postmaster/bgworker.c:770
 #, c-format
 msgid "registering background worker \"%s\""
 msgstr "реги�траци� фонового проце��а \"%s\""
 
-#: postmaster/bgworker.c:375
+#: postmaster/bgworker.c:395
 #, c-format
 msgid "unregistering background worker \"%s\""
 msgstr "разреги�траци� фонового проце��а \"%s\""
 
-#: postmaster/bgworker.c:484
+#: postmaster/bgworker.c:504
 #, c-format
 msgid ""
 "background worker \"%s\": must attach to shared memory in order to request a "
@@ -14792,7 +14809,7 @@
 "фоновый проце�� \"%s\" должен иметь до�туп к общей пам�ти, чтобы запро�ить "
 "подключение к БД"
 
-#: postmaster/bgworker.c:493
+#: postmaster/bgworker.c:513
 #, c-format
 msgid ""
 "background worker \"%s\": cannot request database access if starting at "
@@ -14801,24 +14818,24 @@
 "фоновый проце�� \"%s\" не может получить до�туп к БД, е�ли он запущен при "
 "�тарте главного проце��а"
 
-#: postmaster/bgworker.c:507
+#: postmaster/bgworker.c:527
 #, c-format
 msgid "background worker \"%s\": invalid restart interval"
 msgstr "фоновый проце�� \"%s\": неправильный интервал перезапу�ка"
 
-#: postmaster/bgworker.c:552
+#: postmaster/bgworker.c:572
 #, c-format
 msgid "terminating background worker \"%s\" due to administrator command"
 msgstr "завершение фонового проце��а \"%s\" по команде админи�тратора"
 
-#: postmaster/bgworker.c:753
+#: postmaster/bgworker.c:777
 #, c-format
 msgid ""
 "background worker \"%s\": must be registered in shared_preload_libraries"
 msgstr ""
 "фоновой проце�� \"%s\" должен быть зареги�трирован в shared_preload_libraries"
 
-#: postmaster/bgworker.c:765
+#: postmaster/bgworker.c:789
 #, c-format
 msgid ""
 "background worker \"%s\": only dynamic background workers can request "
@@ -14827,12 +14844,12 @@
 "фоновый проце�� \"%s\": только динамиче�кие фоновые проце��ы могут "
 "запрашивать уведомление"
 
-#: postmaster/bgworker.c:780
+#: postmaster/bgworker.c:804
 #, c-format
 msgid "too many background workers"
 msgstr "�лишком много фоновых проце��ов"
 
-#: postmaster/bgworker.c:781
+#: postmaster/bgworker.c:805
 #, c-format
 msgid "Up to %d background worker can be registered with the current settings."
 msgid_plural ""
@@ -14844,7 +14861,7 @@
 msgstr[2] ""
 "Мак�имально возможное чи�ло фоновых проце��ов при текущих параметрах: %d."
 
-#: postmaster/bgworker.c:785
+#: postmaster/bgworker.c:809
 #, c-format
 msgid ""
 "Consider increasing the configuration parameter \"max_worker_processes\"."
@@ -14918,7 +14935,7 @@
 msgid "archive command was terminated by exception 0x%X"
 msgstr "команда архивации была прервана и�ключением 0x%X"
 
-#: postmaster/pgarch.c:598 postmaster/postmaster.c:3459
+#: postmaster/pgarch.c:598 postmaster/postmaster.c:3475
 #, c-format
 msgid ""
 "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
@@ -14951,137 +14968,137 @@
 msgid "could not open archive status directory \"%s\": %m"
 msgstr "не удало�ь открыть каталог �о�то�ни� архива \"%s\": %m"
 
-#: postmaster/pgstat.c:356
+#: postmaster/pgstat.c:355
 #, c-format
 msgid "could not resolve \"localhost\": %s"
 msgstr "не удало�ь разрешить \"localhost\": %s"
 
-#: postmaster/pgstat.c:379
+#: postmaster/pgstat.c:378
 #, c-format
 msgid "trying another address for the statistics collector"
 msgstr "проба другого адре�а дл� �борщика �тати�тики"
 
-#: postmaster/pgstat.c:388
+#: postmaster/pgstat.c:387
 #, c-format
 msgid "could not create socket for statistics collector: %m"
 msgstr "не удало�ь �оздать �окет дл� �борщика �тати�тики: %m"
 
-#: postmaster/pgstat.c:400
+#: postmaster/pgstat.c:399
 #, c-format
 msgid "could not bind socket for statistics collector: %m"
 msgstr "не удало�ь прив�зать�� к �окету дл� �борщика �тати�тики: %m"
 
-#: postmaster/pgstat.c:411
+#: postmaster/pgstat.c:410
 #, c-format
 msgid "could not get address of socket for statistics collector: %m"
 msgstr "не удало�ь получить адре� �окета дл� �борщика �тати�тики: %m"
 
-#: postmaster/pgstat.c:427
+#: postmaster/pgstat.c:426
 #, c-format
 msgid "could not connect socket for statistics collector: %m"
 msgstr "не удало�ь подключить �окет дл� �борщика �тати�тики: %m"
 
-#: postmaster/pgstat.c:448
+#: postmaster/pgstat.c:447
 #, c-format
 msgid "could not send test message on socket for statistics collector: %m"
 msgstr ""
 "не удало�ь по�лать те�товое �ообщение в �окет дл� �борщика �тати�тики: %m"
 
-#: postmaster/pgstat.c:474
+#: postmaster/pgstat.c:473
 #, c-format
 msgid "select() failed in statistics collector: %m"
 msgstr "�бой select() в �борщике �тати�тики: %m"
 
-#: postmaster/pgstat.c:489
+#: postmaster/pgstat.c:488
 #, c-format
 msgid "test message did not get through on socket for statistics collector"
 msgstr "те�товое �ообщение не прошло через �окет дл� �борщика �тати�тики"
 
-#: postmaster/pgstat.c:504
+#: postmaster/pgstat.c:503
 #, c-format
 msgid "could not receive test message on socket for statistics collector: %m"
 msgstr ""
 "те�товое �ообщение через �окет дл� �борщика �тати�тики получить не удало�ь: "
 "%m"
 
-#: postmaster/pgstat.c:514
+#: postmaster/pgstat.c:513
 #, c-format
 msgid "incorrect test message transmission on socket for statistics collector"
 msgstr "те�товое �ообщение через �окет дл� �борщика �тати�тики прошло неверно"
 
-#: postmaster/pgstat.c:537
+#: postmaster/pgstat.c:536
 #, c-format
 msgid "could not set statistics collector socket to nonblocking mode: %m"
 msgstr ""
 "не удало�ь переключить �окет �борщика �тати�тики в неблокирующий режим: %m"
 
-#: postmaster/pgstat.c:547
+#: postmaster/pgstat.c:546
 #, c-format
 msgid "disabling statistics collector for lack of working socket"
 msgstr "�борщик �тати�тики отключает�� из-за нехватки рабочего �окета"
 
-#: postmaster/pgstat.c:694
+#: postmaster/pgstat.c:693
 #, c-format
 msgid "could not fork statistics collector: %m"
 msgstr "не удало�ь породить проце�� �борщика �тати�тики: %m"
 
-#: postmaster/pgstat.c:1233 postmaster/pgstat.c:1257 postmaster/pgstat.c:1290
+#: postmaster/pgstat.c:1232 postmaster/pgstat.c:1256 postmaster/pgstat.c:1289
 #, c-format
 msgid "must be superuser to reset statistics counters"
 msgstr "дл� �бро�а �чётчиков �тати�тики нужно быть �уперпользователем"
 
-#: postmaster/pgstat.c:1266
+#: postmaster/pgstat.c:1265
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "запрошен �бро� неизве�тного �чётчика: \"%s\""
 
-#: postmaster/pgstat.c:1267
+#: postmaster/pgstat.c:1266
 #, c-format
 msgid "Target must be \"archiver\" or \"bgwriter\"."
 msgstr "Допу�тимый �чётчик: \"archiver\" или \"bgwriter\"."
 
-#: postmaster/pgstat.c:3425
+#: postmaster/pgstat.c:3433
 #, c-format
 msgid "could not read statistics message: %m"
 msgstr "не удало�ь прочитать �ообщение �тати�тики: %m"
 
-#: postmaster/pgstat.c:3756 postmaster/pgstat.c:3933
+#: postmaster/pgstat.c:3764 postmaster/pgstat.c:3921
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "не удало�ь открыть временный файл �тати�тики \"%s\": %m"
 
-#: postmaster/pgstat.c:3824 postmaster/pgstat.c:3978
+#: postmaster/pgstat.c:3831 postmaster/pgstat.c:3966
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "не удало�ь запи�ать во временный файл �тати�тики \"%s\": %m"
 
-#: postmaster/pgstat.c:3833 postmaster/pgstat.c:3987
+#: postmaster/pgstat.c:3840 postmaster/pgstat.c:3975
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "не удало�ь закрыть временный файл �тати�тики \"%s\": %m"
 
-#: postmaster/pgstat.c:3841 postmaster/pgstat.c:3995
+#: postmaster/pgstat.c:3848 postmaster/pgstat.c:3983
 #, c-format
 msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
 msgstr ""
 "не удало�ь переименовать временный файл �тати�тики из \"%s\" в \"%s\": %m"
 
-#: postmaster/pgstat.c:4077 postmaster/pgstat.c:4260 postmaster/pgstat.c:4415
+#: postmaster/pgstat.c:4072 postmaster/pgstat.c:4257 postmaster/pgstat.c:4410
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "не удало�ь открыть файл �тати�тики \"%s\": %m"
 
-#: postmaster/pgstat.c:4089 postmaster/pgstat.c:4099 postmaster/pgstat.c:4109
-#: postmaster/pgstat.c:4130 postmaster/pgstat.c:4145 postmaster/pgstat.c:4201
-#: postmaster/pgstat.c:4272 postmaster/pgstat.c:4292 postmaster/pgstat.c:4310
-#: postmaster/pgstat.c:4326 postmaster/pgstat.c:4344 postmaster/pgstat.c:4360
-#: postmaster/pgstat.c:4427 postmaster/pgstat.c:4439 postmaster/pgstat.c:4451
-#: postmaster/pgstat.c:4476 postmaster/pgstat.c:4498
+#: postmaster/pgstat.c:4084 postmaster/pgstat.c:4094 postmaster/pgstat.c:4104
+#: postmaster/pgstat.c:4125 postmaster/pgstat.c:4140 postmaster/pgstat.c:4194
+#: postmaster/pgstat.c:4269 postmaster/pgstat.c:4289 postmaster/pgstat.c:4307
+#: postmaster/pgstat.c:4323 postmaster/pgstat.c:4341 postmaster/pgstat.c:4357
+#: postmaster/pgstat.c:4422 postmaster/pgstat.c:4434 postmaster/pgstat.c:4446
+#: postmaster/pgstat.c:4471 postmaster/pgstat.c:4493
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "файл �тати�тики \"%s\" и�порчен"
 
-#: postmaster/pgstat.c:4615
+#: postmaster/pgstat.c:4622
 #, c-format
 msgid ""
 "using stale statistics instead of current ones because stats collector is "
@@ -15090,44 +15107,44 @@
 "и�пользует�� про�роченна� �тати�тика вме�то текущей, так как �борщик "
 "�тати�тики не отвечает"
 
-#: postmaster/pgstat.c:4933
+#: postmaster/pgstat.c:4951
 #, c-format
 msgid "database hash table corrupted during cleanup --- abort"
 msgstr "таблица хеша базы данных и�порчена при очи�тке --- прерывание"
 
-#: postmaster/postmaster.c:670
+#: postmaster/postmaster.c:681
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
 msgstr "%s: неверный аргумент дл� параметра -f: \"%s\"\n"
 
-#: postmaster/postmaster.c:756
+#: postmaster/postmaster.c:767
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
 msgstr "%s: неверный аргумент дл� параметра -t: \"%s\"\n"
 
-#: postmaster/postmaster.c:807
+#: postmaster/postmaster.c:818
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: неверный аргумент: \"%s\"\n"
 
-#: postmaster/postmaster.c:842
+#: postmaster/postmaster.c:857
 #, 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:847
+#: postmaster/postmaster.c:862
 #, c-format
 msgid "%s: max_wal_senders must be less than max_connections\n"
 msgstr "%s: параметр max_wal_senders должен быть меньше max_connections\n"
 
-#: postmaster/postmaster.c:852
+#: postmaster/postmaster.c:867
 #, c-format
 msgid "WAL archival cannot be enabled when wal_level is \"minimal\""
 msgstr "�рхивацию WAL нельз� включить, е�ли у�тановлен wal_level \"minimal\""
 
-#: postmaster/postmaster.c:855
+#: postmaster/postmaster.c:870
 #, c-format
 msgid ""
 "WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", "
@@ -15136,88 +15153,88 @@
 "Дл� потоковой тран�л�ции WAL (max_wal_senders > 0) wal_level должен быть "
 "\"archive\", \"hot_standby\" или \"logical\""
 
-#: postmaster/postmaster.c:863
+#: postmaster/postmaster.c:878
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s: ошибка в таблицах маркеров времени, требует�� и�правление\n"
 
-#: postmaster/postmaster.c:955 postmaster/postmaster.c:1053
-#: utils/init/miscinit.c:1400
+#: postmaster/postmaster.c:970 postmaster/postmaster.c:1068
+#: utils/init/miscinit.c:1410
 #, c-format
 msgid "invalid list syntax in parameter \"%s\""
 msgstr "неверный формат �пи�ка в параметре \"%s\""
 
-#: postmaster/postmaster.c:986
+#: postmaster/postmaster.c:1001
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "не удало�ь �оздать принимающий �окет дл� \"%s\""
 
-#: postmaster/postmaster.c:992
+#: postmaster/postmaster.c:1007
 #, c-format
 msgid "could not create any TCP/IP sockets"
 msgstr "не удало�ь �оздать �океты TCP/IP"
 
-#: postmaster/postmaster.c:1075
+#: postmaster/postmaster.c:1090
 #, c-format
 msgid "could not create Unix-domain socket in directory \"%s\""
 msgstr "не удало�ь �оздать доменный �окет в каталоге \"%s\""
 
-#: postmaster/postmaster.c:1081
+#: postmaster/postmaster.c:1096
 #, c-format
 msgid "could not create any Unix-domain sockets"
 msgstr "ни один доменный �окет �оздать не удало�ь"
 
-#: postmaster/postmaster.c:1093
+#: postmaster/postmaster.c:1108
 #, c-format
 msgid "no socket created for listening"
 msgstr "от�ут�твуют принимающие �океты"
 
-#: postmaster/postmaster.c:1133
+#: postmaster/postmaster.c:1148
 #, c-format
 msgid "could not create I/O completion port for child queue"
 msgstr "не удало�ь �оздать порт завершени� ввода/вывода дл� очереди потомков"
 
-#: postmaster/postmaster.c:1162
+#: postmaster/postmaster.c:1177
 #, c-format
 msgid "%s: could not change permissions of external PID file \"%s\": %s\n"
 msgstr "%s: не удало�ь помен�ть права дл� внешнего файла PID \"%s\": %s\n"
 
-#: postmaster/postmaster.c:1166
+#: postmaster/postmaster.c:1181
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %s\n"
 msgstr "%s: не удало�ь запи�ать внешний файл PID \"%s\": %s\n"
 
-#: postmaster/postmaster.c:1217
+#: postmaster/postmaster.c:1232
 #, c-format
 msgid "ending log output to stderr"
 msgstr "завершение вывода в stderr"
 
-#: postmaster/postmaster.c:1218
+#: postmaster/postmaster.c:1233
 #, c-format
 msgid "Future log output will go to log destination \"%s\"."
 msgstr "В дальнейшем протокол будет выводить�� в \"%s\"."
 
-#: postmaster/postmaster.c:1244 utils/init/postinit.c:200
+#: postmaster/postmaster.c:1259 utils/init/postinit.c:200
 #, c-format
 msgid "could not load pg_hba.conf"
 msgstr "не удало�ь загрузить pg_hba.conf"
 
-#: postmaster/postmaster.c:1270
+#: postmaster/postmaster.c:1285
 #, c-format
 msgid "postmaster became multithreaded during startup"
 msgstr "проце�� postmaster �тал многопоточным при запу�ке"
 
-#: postmaster/postmaster.c:1271
+#: postmaster/postmaster.c:1286
 #, c-format
 msgid "Set the LC_ALL environment variable to a valid locale."
 msgstr "У�тановите в переменной окружени� LC_ALL правильную локаль."
 
-#: postmaster/postmaster.c:1368
+#: postmaster/postmaster.c:1383
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: подход�щий и�полн�емый файл postgres не найден"
 
-#: postmaster/postmaster.c:1391 utils/misc/tzparser.c:341
+#: postmaster/postmaster.c:1406 utils/misc/tzparser.c:341
 #, c-format
 msgid ""
 "This may indicate an incomplete PostgreSQL installation, or that the file "
@@ -15226,43 +15243,43 @@
 "Возможно, PostgreSQL у�тановлен не полно�тью или файла \"%s\" нет в "
 "положенном ме�те."
 
-#: postmaster/postmaster.c:1419
+#: postmaster/postmaster.c:1434
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "каталог данных \"%s\" не �уще�твует"
 
-#: postmaster/postmaster.c:1424
+#: postmaster/postmaster.c:1439
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "не удало�ь �читать права на каталог \"%s\": %m"
 
-#: postmaster/postmaster.c:1432
+#: postmaster/postmaster.c:1447
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "указанный каталог данных \"%s\" не �уще�твует"
 
-#: postmaster/postmaster.c:1448
+#: postmaster/postmaster.c:1463
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "владелец каталога данных \"%s\" определён неверно"
 
-#: postmaster/postmaster.c:1450
+#: postmaster/postmaster.c:1465
 #, c-format
 msgid "The server must be started by the user that owns the data directory."
 msgstr ""
 "Сервер должен запу�кать пользователь, �вл�ющий�� владельцем каталога данных."
 
-#: postmaster/postmaster.c:1470
+#: postmaster/postmaster.c:1485
 #, c-format
 msgid "data directory \"%s\" has group or world access"
 msgstr "к каталогу данных \"%s\" имеют до�туп в�е или группа"
 
-#: postmaster/postmaster.c:1472
+#: postmaster/postmaster.c:1487
 #, c-format
 msgid "Permissions should be u=rwx (0700)."
 msgstr "Права должны быть: u=rwx (0700)."
 
-#: postmaster/postmaster.c:1483
+#: postmaster/postmaster.c:1498
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -15273,376 +15290,376 @@
 "Ожидало�ь найти её в каталоге \"%s\",\n"
 "но открыть файл \"%s\" не удало�ь: %s\n"
 
-#: postmaster/postmaster.c:1660
+#: postmaster/postmaster.c:1675
 #, c-format
 msgid "select() failed in postmaster: %m"
 msgstr "�бой select() в postmaster'е: %m"
 
-#: postmaster/postmaster.c:1810
+#: postmaster/postmaster.c:1826
 #, c-format
 msgid ""
 "performing immediate shutdown because data directory lock file is invalid"
 msgstr ""
 "немедленное отключение из-за ошибочного файла блокировки каталога данных"
 
-#: postmaster/postmaster.c:1888 postmaster/postmaster.c:1919
+#: postmaster/postmaster.c:1904 postmaster/postmaster.c:1935
 #, c-format
 msgid "incomplete startup packet"
 msgstr "неполный �тартовый пакет"
 
-#: postmaster/postmaster.c:1900
+#: postmaster/postmaster.c:1916
 #, c-format
 msgid "invalid length of startup packet"
 msgstr "неверна� длина �тартового пакета"
 
-#: postmaster/postmaster.c:1958
+#: postmaster/postmaster.c:1974
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "не удало�ь отправить ответ в проце��е SSL-�огла�овани�: %m"
 
-#: postmaster/postmaster.c:1987
+#: postmaster/postmaster.c:2003
 #, c-format
 msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr ""
 "неподдерживаемый протокол клиент�кого приложени� %u.%u; �ервер поддерживает "
-"%u.0 - %u.%u "
+"%u.0 - %u.%u"
 
-#: postmaster/postmaster.c:2050 utils/misc/guc.c:5484 utils/misc/guc.c:5577
-#: utils/misc/guc.c:6869 utils/misc/guc.c:9566 utils/misc/guc.c:9600
+#: postmaster/postmaster.c:2066 utils/misc/guc.c:5484 utils/misc/guc.c:5577
+#: utils/misc/guc.c:6874 utils/misc/guc.c:9597 utils/misc/guc.c:9631
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "неверное значение дл� параметра \"%s\": \"%s\""
 
-#: postmaster/postmaster.c:2053
+#: postmaster/postmaster.c:2069
 #, c-format
 msgid "Valid values are: \"false\", 0, \"true\", 1, \"database\"."
 msgstr "Допу�тимые значени�: \"false\", 0, \"true\", 1, \"database\"."
 
-#: postmaster/postmaster.c:2073
+#: postmaster/postmaster.c:2089
 #, c-format
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr ""
 "неверна� �труктура �тартового пакета: по�ледним байтом должен быть терминатор"
 
-#: postmaster/postmaster.c:2101
+#: postmaster/postmaster.c:2117
 #, c-format
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "в �тартовом пакете не указано им� пользовател� PostgreSQL"
 
-#: postmaster/postmaster.c:2160
+#: postmaster/postmaster.c:2176
 #, c-format
 msgid "the database system is starting up"
 msgstr "�и�тема баз данных запу�кает��"
 
-#: postmaster/postmaster.c:2165
+#: postmaster/postmaster.c:2181
 #, c-format
 msgid "the database system is shutting down"
 msgstr "�и�тема баз данных о�танавливает��"
 
-#: postmaster/postmaster.c:2170
+#: postmaster/postmaster.c:2186
 #, c-format
 msgid "the database system is in recovery mode"
 msgstr "�и�тема баз данных в режиме во��тановлени�"
 
-#: postmaster/postmaster.c:2175 storage/ipc/procarray.c:284
+#: postmaster/postmaster.c:2191 storage/ipc/procarray.c:284
 #: storage/ipc/sinvaladt.c:298 storage/lmgr/proc.c:334
 #, c-format
 msgid "sorry, too many clients already"
 msgstr "извините, уже �лишком много клиентов"
 
-#: postmaster/postmaster.c:2237
+#: postmaster/postmaster.c:2253
 #, c-format
 msgid "wrong key in cancel request for process %d"
 msgstr "неправильный ключ в запро�е на отмену проце��а %d"
 
-#: postmaster/postmaster.c:2245
+#: postmaster/postmaster.c:2261
 #, c-format
 msgid "PID %d in cancel request did not match any process"
 msgstr "проце�� � кодом %d, полученным в запро�е на отмену, не найден"
 
-#: postmaster/postmaster.c:2465
+#: postmaster/postmaster.c:2481
 #, c-format
 msgid "received SIGHUP, reloading configuration files"
 msgstr "получен SIGHUP, файлы конфигурации перезагружают��"
 
-#: postmaster/postmaster.c:2490
+#: postmaster/postmaster.c:2506
 #, c-format
 msgid "pg_hba.conf not reloaded"
 msgstr "pg_hba.conf не перезагружен"
 
-#: postmaster/postmaster.c:2494
+#: postmaster/postmaster.c:2510
 #, c-format
 msgid "pg_ident.conf not reloaded"
 msgstr "pg_ident.conf не перезагружен"
 
-#: postmaster/postmaster.c:2535
+#: postmaster/postmaster.c:2551
 #, c-format
 msgid "received smart shutdown request"
 msgstr "получен запро� на \"вежливое\" выключение"
 
-#: postmaster/postmaster.c:2587
+#: postmaster/postmaster.c:2603
 #, c-format
 msgid "received fast shutdown request"
 msgstr "получен запро� на бы�трое выключение"
 
-#: postmaster/postmaster.c:2613
+#: postmaster/postmaster.c:2629
 #, c-format
 msgid "aborting any active transactions"
 msgstr "прерывание в�ех активных транзакций"
 
-#: postmaster/postmaster.c:2647
+#: postmaster/postmaster.c:2663
 #, c-format
 msgid "received immediate shutdown request"
 msgstr "получен запро� на немедленное выключение"
 
-#: postmaster/postmaster.c:2708
+#: postmaster/postmaster.c:2724
 #, c-format
 msgid "shutdown at recovery target"
 msgstr "выключение при до�тижении цели во��тановлени�"
 
-#: postmaster/postmaster.c:2724 postmaster/postmaster.c:2747
+#: postmaster/postmaster.c:2740 postmaster/postmaster.c:2763
 msgid "startup process"
 msgstr "�тартовый проце��"
 
-#: postmaster/postmaster.c:2727
+#: postmaster/postmaster.c:2743
 #, c-format
 msgid "aborting startup due to startup process failure"
 msgstr "прерывание запу�ка из-за ошибки в �тартовом проце��е"
 
-#: postmaster/postmaster.c:2788
+#: postmaster/postmaster.c:2804
 #, c-format
 msgid "database system is ready to accept connections"
 msgstr "�и�тема БД готова принимать подключени�"
 
-#: postmaster/postmaster.c:2803
+#: postmaster/postmaster.c:2819
 msgid "background writer process"
 msgstr "проце�� фоновой запи�и"
 
-#: postmaster/postmaster.c:2857
+#: postmaster/postmaster.c:2873
 msgid "checkpointer process"
 msgstr "проце�� контрольных точек"
 
-#: postmaster/postmaster.c:2873
+#: postmaster/postmaster.c:2889
 msgid "WAL writer process"
 msgstr "проце�� запи�и WAL"
 
-#: postmaster/postmaster.c:2887
+#: postmaster/postmaster.c:2903
 msgid "WAL receiver process"
 msgstr "проце�� �читывани� WAL"
 
-#: postmaster/postmaster.c:2902
+#: postmaster/postmaster.c:2918
 msgid "autovacuum launcher process"
 msgstr "проце�� запу�ка автоочи�тки"
 
-#: postmaster/postmaster.c:2917
+#: postmaster/postmaster.c:2933
 msgid "archiver process"
 msgstr "проце�� архивации"
 
-#: postmaster/postmaster.c:2933
+#: postmaster/postmaster.c:2949
 msgid "statistics collector process"
 msgstr "проце�� �бора �тати�тики"
 
-#: postmaster/postmaster.c:2947
+#: postmaster/postmaster.c:2963
 msgid "system logger process"
 msgstr "проце�� �и�темного протоколировани�"
 
-#: postmaster/postmaster.c:3009
+#: postmaster/postmaster.c:3025
 msgid "worker process"
 msgstr "рабочий проце��"
 
-#: postmaster/postmaster.c:3092 postmaster/postmaster.c:3112
-#: postmaster/postmaster.c:3119 postmaster/postmaster.c:3137
+#: postmaster/postmaster.c:3108 postmaster/postmaster.c:3128
+#: postmaster/postmaster.c:3135 postmaster/postmaster.c:3153
 msgid "server process"
 msgstr "проце�� �ервера"
 
-#: postmaster/postmaster.c:3191
+#: postmaster/postmaster.c:3207
 #, c-format
 msgid "terminating any other active server processes"
 msgstr "завершение в�ех о�тальных активных �ерверных проце��ов"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3447
+#: postmaster/postmaster.c:3463
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) завершил�� � кодом выхода %d"
 
-#: postmaster/postmaster.c:3449 postmaster/postmaster.c:3460
-#: postmaster/postmaster.c:3471 postmaster/postmaster.c:3480
-#: postmaster/postmaster.c:3490
+#: postmaster/postmaster.c:3465 postmaster/postmaster.c:3476
+#: postmaster/postmaster.c:3487 postmaster/postmaster.c:3496
+#: postmaster/postmaster.c:3506
 #, c-format
 msgid "Failed process was running: %s"
 msgstr "Завершивший�� проце�� выполн�л дей�твие: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3457
+#: postmaster/postmaster.c:3473
 #, c-format
 msgid "%s (PID %d) was terminated by exception 0x%X"
 msgstr "%s (PID %d) был прерван и�ключением 0x%X"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3467
+#: postmaster/postmaster.c:3483
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d: %s"
 msgstr "%s (PID %d) был завершён по �игналу %d: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3478
+#: postmaster/postmaster.c:3494
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d"
 msgstr "%s (PID %d) был завершён по �игналу %d"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:3488
+#: postmaster/postmaster.c:3504
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) завершил�� � неизве�тным кодом �о�то�ни� %d"
 
-#: postmaster/postmaster.c:3675
+#: postmaster/postmaster.c:3691
 #, c-format
 msgid "abnormal database system shutdown"
 msgstr "аварийное выключение �и�темы БД"
 
-#: postmaster/postmaster.c:3715
+#: postmaster/postmaster.c:3731
 #, c-format
 msgid "all server processes terminated; reinitializing"
 msgstr "в�е �ерверные проце��ы завершены... переинициализаци�"
 
-#: postmaster/postmaster.c:3927
+#: postmaster/postmaster.c:3943
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "породить новый проце�� дл� �оединени� не удало�ь: %m"
 
-#: postmaster/postmaster.c:3969
+#: postmaster/postmaster.c:3985
 msgid "could not fork new process for connection: "
 msgstr "породить новый проце�� дл� �оединени� не удало�ь: "
 
-#: postmaster/postmaster.c:4083
+#: postmaster/postmaster.c:4099
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "прин�то подключение: узел=%s порт=%s"
 
-#: postmaster/postmaster.c:4088
+#: postmaster/postmaster.c:4104
 #, c-format
 msgid "connection received: host=%s"
 msgstr "прин�то подключение: узел=%s"
 
-#: postmaster/postmaster.c:4371
+#: postmaster/postmaster.c:4387
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "запу�тить �ерверный проце�� \"%s\" не удало�ь: %m"
 
-#: postmaster/postmaster.c:4931
+#: postmaster/postmaster.c:4926
 #, c-format
 msgid "database system is ready to accept read only connections"
 msgstr "�и�тема БД готова к подключени�м в режиме \"только чтение\""
 
-#: postmaster/postmaster.c:5214
+#: postmaster/postmaster.c:5213
 #, c-format
 msgid "could not fork startup process: %m"
 msgstr "породить �тартовый проце�� не удало�ь: %m"
 
-#: postmaster/postmaster.c:5218
+#: postmaster/postmaster.c:5217
 #, c-format
 msgid "could not fork background writer process: %m"
 msgstr "породить проце�� фоновой запи�и не удало�ь: %m"
 
-#: postmaster/postmaster.c:5222
+#: postmaster/postmaster.c:5221
 #, c-format
 msgid "could not fork checkpointer process: %m"
 msgstr "породить проце�� контрольных точек не удало�ь: %m"
 
-#: postmaster/postmaster.c:5226
+#: postmaster/postmaster.c:5225
 #, c-format
 msgid "could not fork WAL writer process: %m"
 msgstr "породить проце�� запи�и WAL не удало�ь: %m"
 
-#: postmaster/postmaster.c:5230
+#: postmaster/postmaster.c:5229
 #, c-format
 msgid "could not fork WAL receiver process: %m"
 msgstr "породить проце�� �читывани� WAL не удало�ь: %m"
 
-#: postmaster/postmaster.c:5234
+#: postmaster/postmaster.c:5233
 #, c-format
 msgid "could not fork process: %m"
 msgstr "породить проце�� не удало�ь: %m"
 
-#: postmaster/postmaster.c:5396 postmaster/postmaster.c:5419
+#: postmaster/postmaster.c:5395 postmaster/postmaster.c:5418
 #, c-format
 msgid "database connection requirement not indicated during registration"
 msgstr ""
 "при реги�трации фонового проце��а не указывало�ь, что ему требует�� "
 "подключение к БД"
 
-#: postmaster/postmaster.c:5403 postmaster/postmaster.c:5426
+#: postmaster/postmaster.c:5402 postmaster/postmaster.c:5425
 #, c-format
 msgid "invalid processing mode in background worker"
 msgstr "неправильный режим обработки в фоновом проце��е"
 
-#: postmaster/postmaster.c:5478
+#: postmaster/postmaster.c:5497
 #, c-format
 msgid "starting background worker process \"%s\""
 msgstr "запу�к фонового рабочего проце��а \"%s\""
 
-#: postmaster/postmaster.c:5489
+#: postmaster/postmaster.c:5509
 #, c-format
 msgid "could not fork worker process: %m"
 msgstr "породить рабочий проце�� не удало�ь: %m"
 
-#: postmaster/postmaster.c:5865
+#: postmaster/postmaster.c:5909
 #, c-format
 msgid "could not duplicate socket %d for use in backend: error code %d"
 msgstr ""
 "продублировать �окет %d дл� �ерверного проце��а не удало�ь (код ошибки: %d)"
 
-#: postmaster/postmaster.c:5897
+#: postmaster/postmaster.c:5941
 #, c-format
 msgid "could not create inherited socket: error code %d\n"
 msgstr "�оздать на�ледуемый �окет не удало�ь (код ошибки: %d)\n"
 
-#: postmaster/postmaster.c:5926
+#: postmaster/postmaster.c:5970
 #, c-format
 msgid "could not open backend variables file \"%s\": %s\n"
 msgstr "открыть файл �ерверных переменных \"%s\" не удало�ь: %s\n"
 
-#: postmaster/postmaster.c:5933
+#: postmaster/postmaster.c:5977
 #, c-format
 msgid "could not read from backend variables file \"%s\": %s\n"
 msgstr "прочитать файл �ерверных переменных \"%s\" не удало�ь: %s\n"
 
-#: postmaster/postmaster.c:5942
+#: postmaster/postmaster.c:5986
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "не удало�ь �тереть файл \"%s\": %s\n"
 
-#: postmaster/postmaster.c:5959
+#: postmaster/postmaster.c:6003
 #, c-format
 msgid "could not map view of backend variables: error code %lu\n"
 msgstr "отобразить файл �ерверных переменных не удало�ь (код ошибки: %lu)\n"
 
-#: postmaster/postmaster.c:5968
+#: postmaster/postmaster.c:6012
 #, c-format
 msgid "could not unmap view of backend variables: error code %lu\n"
 msgstr ""
 "отключить отображение файла �ерверных переменных не удало�ь (код ошибки: "
 "%lu)\n"
 
-#: postmaster/postmaster.c:5975
+#: postmaster/postmaster.c:6019
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %lu\n"
 msgstr ""
 "закрыть указатель файла �ерверных переменных не удало�ь (код ошибки: %lu)\n"
 
-#: postmaster/postmaster.c:6134
+#: postmaster/postmaster.c:6178
 #, c-format
 msgid "could not read exit code for process\n"
 msgstr "прочитать код завершени� проце��а не удало�ь\n"
 
-#: postmaster/postmaster.c:6139
+#: postmaster/postmaster.c:6183
 #, c-format
 msgid "could not post child completion status\n"
 msgstr "отправить �о�то�ние завершени� потомка не удало�ь\n"
@@ -15685,7 +15702,7 @@
 #: postmaster/syslogger.c:634 postmaster/syslogger.c:651
 #, c-format
 msgid "could not redirect stderr: %m"
-msgstr "не удало�ь перенаправить stderr: %m "
+msgstr "не удало�ь перенаправить stderr: %m"
 
 #: postmaster/syslogger.c:996
 #, c-format
@@ -15709,63 +15726,63 @@
 "не удало�ь определить, какое правило �ортировки и�пользовать дл� регул�рного "
 "выражени�"
 
-#: replication/basebackup.c:227
+#: replication/basebackup.c:229
 #, c-format
 msgid "could not stat control file \"%s\": %m"
 msgstr "не удало�ь найти управл�ющий файл \"%s\": %m"
 
-#: replication/basebackup.c:336
+#: replication/basebackup.c:338
 #, c-format
 msgid "could not find any WAL files"
 msgstr "не удало�ь найти ни одного файла WAL"
 
-#: replication/basebackup.c:349 replication/basebackup.c:363
-#: replication/basebackup.c:372
+#: replication/basebackup.c:351 replication/basebackup.c:365
+#: replication/basebackup.c:374
 #, c-format
 msgid "could not find WAL file \"%s\""
 msgstr "не удало�ь найти файл WAL \"%s\""
 
-#: replication/basebackup.c:411 replication/basebackup.c:437
+#: replication/basebackup.c:413 replication/basebackup.c:439
 #, c-format
 msgid "unexpected WAL file size \"%s\""
 msgstr "неприемлемый размер файла WAL \"%s\""
 
-#: replication/basebackup.c:423 replication/basebackup.c:1169
+#: replication/basebackup.c:425 replication/basebackup.c:1157
 #, c-format
 msgid "base backup could not send data, aborting backup"
 msgstr ""
 "в проце��е базового резервного копировани� не удало�ь передать данные, "
 "копирование прерывает��"
 
-#: replication/basebackup.c:525 replication/basebackup.c:534
-#: replication/basebackup.c:543 replication/basebackup.c:552
-#: replication/basebackup.c:561 replication/basebackup.c:572
-#: replication/basebackup.c:589
+#: replication/basebackup.c:527 replication/basebackup.c:536
+#: replication/basebackup.c:545 replication/basebackup.c:554
+#: replication/basebackup.c:563 replication/basebackup.c:574
+#: replication/basebackup.c:591
 #, c-format
 msgid "duplicate option \"%s\""
 msgstr "повтор�ющий�� параметр \"%s\""
 
-#: replication/basebackup.c:578 utils/misc/guc.c:5494
+#: replication/basebackup.c:580 utils/misc/guc.c:5494
 #, c-format
 msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
 msgstr "%d вне диапазона, допу�тимого дл� параметра \"%s\" (%d .. %d)"
 
-#: replication/basebackup.c:852 replication/basebackup.c:954
+#: replication/basebackup.c:854 replication/basebackup.c:956
 #, c-format
 msgid "could not stat file or directory \"%s\": %m"
 msgstr "не удало�ь получить информацию о файле или каталоге \"%s\": %m"
 
-#: replication/basebackup.c:1121
+#: replication/basebackup.c:1109
 #, c-format
 msgid "skipping special file \"%s\""
 msgstr "�пециальный файл \"%s\" пропу�кает��"
 
-#: replication/basebackup.c:1232
+#: replication/basebackup.c:1220
 #, c-format
 msgid "file name too long for tar format: \"%s\""
 msgstr "�лишком длинное им� файла дл� формата tar: \"%s\""
 
-#: replication/basebackup.c:1237
+#: replication/basebackup.c:1225
 #, c-format
 msgid ""
 "symbolic link target too long for tar format: file name \"%s\", target \"%s\""
@@ -15879,18 +15896,18 @@
 msgid "logical decoding cannot be used while in recovery"
 msgstr "логиче�кое декодирование нельз� и�пользовать в проце��е во��тановлени�"
 
-#: replication/logical/logical.c:234 replication/logical/logical.c:383
+#: replication/logical/logical.c:237 replication/logical/logical.c:395
 #, c-format
 msgid "cannot use physical replication slot for logical decoding"
 msgstr ""
 "физиче�кий �лот репликации нельз� и�пользовать дл� логиче�кого декодировани�"
 
-#: replication/logical/logical.c:239 replication/logical/logical.c:388
+#: replication/logical/logical.c:242 replication/logical/logical.c:400
 #, c-format
 msgid "replication slot \"%s\" was not created in this database"
 msgstr "�лот репликации \"%s\" �оздан не в �той базе данных"
 
-#: replication/logical/logical.c:246
+#: replication/logical/logical.c:249
 #, c-format
 msgid ""
 "cannot create logical replication slot in transaction that has performed "
@@ -15898,29 +15915,29 @@
 msgstr ""
 "нельз� �оздать логиче�кий �лот репликации в транзакции, о�уще�твл�ющей запи�ь"
 
-#: replication/logical/logical.c:425
+#: replication/logical/logical.c:437
 #, c-format
 msgid "starting logical decoding for slot \"%s\""
 msgstr "начинает�� логиче�кое декодирование дл� �лота \"%s\""
 
-#: replication/logical/logical.c:427
+#: replication/logical/logical.c:439
 #, c-format
 msgid "streaming transactions committing after %X/%X, reading WAL from %X/%X"
 msgstr "передача транзакций, фик�ируемых по�ле %X/%X, чтение WAL � %X/%X"
 
-#: replication/logical/logical.c:562
+#: replication/logical/logical.c:574
 #, c-format
 msgid ""
 "slot \"%s\", output plugin \"%s\", in the %s callback, associated LSN %X/%X"
 msgstr ""
 "�лот \"%s\", модуль вывода \"%s\", в обработчике %s, �в�занный LSN: %X/%X"
 
-#: replication/logical/logical.c:569
+#: replication/logical/logical.c:581
 #, c-format
 msgid "slot \"%s\", output plugin \"%s\", in the %s callback"
 msgstr "�лот \"%s\", модуль вывода \"%s\", в обработчике %s"
 
-#: replication/logical/logicalfuncs.c:192 replication/walsender.c:2129
+#: replication/logical/logicalfuncs.c:192 replication/walsender.c:2128
 #, c-format
 msgid "could not read from log segment %s, offset %u, length %lu: %m"
 msgstr "не удало�ь прочитать �егмент журнала %s (�мещение %u, длина %lu): %m"
@@ -15999,37 +16016,37 @@
 "удалить и�точник репликации � OID %d нельз�, он и�пользует�� проце��ом � PID "
 "%d"
 
-#: replication/logical/origin.c:690
+#: replication/logical/origin.c:674
 #, c-format
 msgid "replication checkpoint has wrong magic %u instead of %u"
 msgstr ""
 "контрольна� точка репликации имеет неправильную �игнатуру (%u вме�то %u)"
 
-#: replication/logical/origin.c:722
+#: replication/logical/origin.c:706
 #, c-format
 msgid "could not read file \"%s\": read %d of %zu"
 msgstr "не удало�ь прочитать файл \"%s\" (прочитано байт: %d из %zu)"
 
-#: replication/logical/origin.c:731
+#: replication/logical/origin.c:715
 #, c-format
 msgid "could not find free replication state, increase max_replication_slots"
 msgstr ""
 "не удало�ь найти �вободную �чейку дл� �о�то�ни� репликации, увеличьте "
 "max_replication_slots"
 
-#: replication/logical/origin.c:749
+#: replication/logical/origin.c:733
 #, c-format
 msgid "replication slot checkpoint has wrong checksum %u, expected %u"
 msgstr ""
 "неверна� контрольна� �умма файла контрольной точки дл� �лота репликации (%u "
 "вме�то %u)"
 
-#: replication/logical/origin.c:873
+#: replication/logical/origin.c:857
 #, c-format
 msgid "replication origin with OID %d is already active for PID %d"
 msgstr "и�точник репликации � OID %d уже зан�т проце��ом � PID %d"
 
-#: replication/logical/origin.c:884 replication/logical/origin.c:1064
+#: replication/logical/origin.c:868 replication/logical/origin.c:1048
 #, c-format
 msgid ""
 "could not find free replication state slot for replication origin with OID %u"
@@ -16037,41 +16054,41 @@
 "не удало�ь найти �вободный �лот �о�то�ни� репликации дл� и�точника "
 "репликации � OID %u"
 
-#: replication/logical/origin.c:886 replication/logical/origin.c:1066
-#: replication/slot.c:1241
+#: replication/logical/origin.c:870 replication/logical/origin.c:1050
+#: replication/slot.c:1268
 #, c-format
 msgid "Increase max_replication_slots and try again."
 msgstr "Увеличьте параметр max_replication_slots и повторите попытку."
 
-#: replication/logical/origin.c:1023
+#: replication/logical/origin.c:1007
 #, c-format
 msgid "cannot setup replication origin when one is already setup"
 msgstr "нельз� на�троить и�точник репликации, когда он уже на�троен"
 
-#: replication/logical/origin.c:1052
+#: replication/logical/origin.c:1036
 #, c-format
 msgid "replication identifier %d is already active for PID %d"
 msgstr "идентификатор репликации %d уже зан�т проце��ом � PID %d"
 
-#: replication/logical/origin.c:1098 replication/logical/origin.c:1293
-#: replication/logical/origin.c:1313
+#: replication/logical/origin.c:1082 replication/logical/origin.c:1277
+#: replication/logical/origin.c:1297
 #, c-format
 msgid "no replication origin is configured"
 msgstr "ни один и�точник репликации не на�троен"
 
-#: replication/logical/reorderbuffer.c:2170
+#: replication/logical/reorderbuffer.c:2219
 #, c-format
 msgid "could not write to data file for XID %u: %m"
 msgstr "не удало�ь запи�ать в файл данных дл� XID %u: %m"
 
-#: replication/logical/reorderbuffer.c:2266
-#: replication/logical/reorderbuffer.c:2286
+#: replication/logical/reorderbuffer.c:2315
+#: replication/logical/reorderbuffer.c:2335
 #, c-format
 msgid "could not read from reorderbuffer spill file: %m"
 msgstr "не удало�ь прочитать из файла подкачки буфера пере�ортировки: %m"
 
-#: replication/logical/reorderbuffer.c:2270
-#: replication/logical/reorderbuffer.c:2290
+#: replication/logical/reorderbuffer.c:2319
+#: replication/logical/reorderbuffer.c:2339
 #, c-format
 msgid ""
 "could not read from reorderbuffer spill file: read %d instead of %u bytes"
@@ -16079,13 +16096,14 @@
 "не удало�ь прочитать из файла подкачки буфера пере�ортировки (прочитано "
 "байт: %d, требовало�ь: %u)"
 
-#: replication/logical/reorderbuffer.c:2894
+#: replication/logical/reorderbuffer.c:2971
 #, c-format
 msgid "could not read from file \"%s\": read %d instead of %d bytes"
 msgstr ""
 "не удало�ь прочитать из файла \"%s\" (прочитано байт: %d, требовало�ь: %d)"
 
-#: replication/logical/snapbuild.c:600
+# skip-rule: capital-letter-first
+#: replication/logical/snapbuild.c:648
 #, c-format
 msgid "exported logical decoding snapshot: \"%s\" with %u transaction ID"
 msgid_plural ""
@@ -16097,66 +16115,69 @@
 msgstr[2] ""
 "�к�портирован �нимок логиче�кого декодировани�: \"%s\" (ид. транзакций: %u)"
 
-#: replication/logical/snapbuild.c:904 replication/logical/snapbuild.c:1269
-#: replication/logical/snapbuild.c:1800
+#: replication/logical/snapbuild.c:1226 replication/logical/snapbuild.c:1316
+#: replication/logical/snapbuild.c:1791
 #, c-format
 msgid "logical decoding found consistent point at %X/%X"
 msgstr "проце�� логиче�кого декодировани� до�тиг точки �огла�ованно�ти в %X/%X"
 
-#: replication/logical/snapbuild.c:906
-#, c-format
-msgid "Transaction ID %u finished; no more running transactions."
-msgstr "Транзакци� %u завершена, больше активных транзакций нет."
-
-#: replication/logical/snapbuild.c:1271
+#: replication/logical/snapbuild.c:1228
 #, c-format
 msgid "There are no running transactions."
 msgstr "Больше активных транзакций нет."
 
-#: replication/logical/snapbuild.c:1333
+#: replication/logical/snapbuild.c:1269
 #, c-format
 msgid "logical decoding found initial starting point at %X/%X"
 msgstr ""
 "проце�� логиче�кого декодировани� нашёл начальную �тартовую точку в %X/%X"
 
-#: replication/logical/snapbuild.c:1335
+#: replication/logical/snapbuild.c:1271 replication/logical/snapbuild.c:1294
 #, c-format
-msgid "%u transaction needs to finish."
-msgid_plural "%u transactions need to finish."
-msgstr[0] "�еобходимо дождать�� завершени� транзакций (%u)."
-msgstr[1] "�еобходимо дождать�� завершени� транзакций (%u)."
-msgstr[2] "�еобходимо дождать�� завершени� транзакций (%u)."
+msgid "Waiting for transactions (approximately %d) older than %u to end."
+msgstr "Ожидание транзакций (примерно %d), �тарее %u до конца."
 
-#: replication/logical/snapbuild.c:1674 replication/logical/snapbuild.c:1700
-#: replication/logical/snapbuild.c:1714 replication/logical/snapbuild.c:1728
+#: replication/logical/snapbuild.c:1292
+#, c-format
+msgid "logical decoding found initial consistent point at %X/%X"
+msgstr ""
+"при логиче�ком декодировании найдена начальна� точка �огла�ованно�ти в %X/%X"
+
+#: replication/logical/snapbuild.c:1318
+#, c-format
+msgid "There are no old transactions anymore."
+msgstr "Больше �тарых транзакций нет."
+
+#: replication/logical/snapbuild.c:1670 replication/logical/snapbuild.c:1696
+#: replication/logical/snapbuild.c:1711 replication/logical/snapbuild.c:1725
 #, c-format
 msgid "could not read file \"%s\", read %d of %d: %m"
 msgstr "не удало�ь прочитать файл \"%s\" (прочитано байт: %d из %d): %m"
 
-#: replication/logical/snapbuild.c:1680
+#: replication/logical/snapbuild.c:1676
 #, c-format
 msgid "snapbuild state file \"%s\" has wrong magic number: %u instead of %u"
 msgstr ""
 "файл �о�то�ни� snapbuild \"%s\" имеет неправильную �игнатуру (%u вме�то %u)"
 
-#: replication/logical/snapbuild.c:1685
+#: replication/logical/snapbuild.c:1681
 #, c-format
 msgid "snapbuild state file \"%s\" has unsupported version: %u instead of %u"
 msgstr ""
 "файл �о�то�ни� snapbuild \"%s\" имеет неправильную вер�ию (%u вме�то %u)"
 
-#: replication/logical/snapbuild.c:1741
+#: replication/logical/snapbuild.c:1738
 #, c-format
 msgid "checksum mismatch for snapbuild state file \"%s\": is %u, should be %u"
 msgstr ""
 "в файле �о�то�ни� snapbuild \"%s\" неверна� контрольна� �умма (%u вме�то %u)"
 
-#: replication/logical/snapbuild.c:1802
+#: replication/logical/snapbuild.c:1793
 #, c-format
 msgid "Logical decoding will begin using saved snapshot."
 msgstr "Логиче�кое декодирование начнёт�� � �охранённого �нимка."
 
-#: replication/logical/snapbuild.c:1875
+#: replication/logical/snapbuild.c:1864
 #, c-format
 msgid "could not parse file name \"%s\""
 msgstr "не удало�ь разобрать им� файла \"%s\""
@@ -16200,65 +16221,65 @@
 msgid "Free one or increase max_replication_slots."
 msgstr "О�вободите ненужные или увеличьте параметр max_replication_slots."
 
-#: replication/slot.c:348
+#: replication/slot.c:358
 #, c-format
 msgid "replication slot \"%s\" does not exist"
 msgstr "�лот репликации \"%s\" не �уще�твует"
 
-#: replication/slot.c:352
+#: replication/slot.c:362
 #, c-format
 msgid "replication slot \"%s\" is already active for PID %d"
 msgstr "�лот репликации \"%s\" уже зан�т проце��ом � PID %d"
 
-#: replication/slot.c:501 replication/slot.c:857 replication/slot.c:1202
+#: replication/slot.c:527 replication/slot.c:884 replication/slot.c:1229
 #, c-format
 msgid "could not remove directory \"%s\""
 msgstr "ошибка при удалении каталога \"%s\""
 
-#: replication/slot.c:776
+#: replication/slot.c:803
 #, c-format
 msgid "replication slots can only be used if max_replication_slots > 0"
 msgstr ""
 "�лоты репликации можно и�пользовать, только е�ли max_replication_slots > 0"
 
-#: replication/slot.c:781
+#: replication/slot.c:808
 #, c-format
 msgid "replication slots can only be used if wal_level >= archive"
 msgstr "�лоты репликации можно и�пользовать, только е�ли wal_level >= archive"
 
-#: replication/slot.c:1134 replication/slot.c:1172
+#: replication/slot.c:1161 replication/slot.c:1199
 #, c-format
 msgid "could not read file \"%s\", read %d of %u: %m"
 msgstr "не удало�ь прочитать файл \"%s\" (прочитано байт: %d из %u): %m"
 
-#: replication/slot.c:1143
+#: replication/slot.c:1170
 #, c-format
 msgid "replication slot file \"%s\" has wrong magic number: %u instead of %u"
 msgstr ""
 "файл �лота репликации \"%s\" имеет неправильную �игнатуру (%u вме�то %u)"
 
-#: replication/slot.c:1150
+#: replication/slot.c:1177
 #, c-format
 msgid "replication slot file \"%s\" has unsupported version %u"
 msgstr "файл �о�то�ни� snapbuild \"%s\" имеет неподдерживаемую вер�ию %u"
 
-#: replication/slot.c:1157
+#: replication/slot.c:1184
 #, c-format
 msgid "replication slot file \"%s\" has corrupted length %u"
 msgstr "у файла �лота репликации \"%s\" неверна� длина: %u"
 
-#: replication/slot.c:1187
+#: replication/slot.c:1214
 #, c-format
 msgid "checksum mismatch for replication slot file \"%s\": is %u, should be %u"
 msgstr ""
 "в файле �лота репликации \"%s\" неверна� контрольна� �умма (%u вме�то %u)"
 
-#: replication/slot.c:1240
+#: replication/slot.c:1267
 #, c-format
 msgid "too many replication slots active before shutdown"
 msgstr "перед завершением активно �лишком много �лотов репликации"
 
-#: replication/syncrep.c:199
+#: replication/syncrep.c:191
 #, c-format
 msgid ""
 "canceling the wait for synchronous replication and terminating connection "
@@ -16267,7 +16288,7 @@
 "отмена ожидани� �инхронной репликации и закрытие �оединени� по команде "
 "админи�тратора"
 
-#: replication/syncrep.c:200 replication/syncrep.c:217
+#: replication/syncrep.c:192 replication/syncrep.c:209
 #, c-format
 msgid ""
 "The transaction has already committed locally, but might not have been "
@@ -16276,18 +16297,18 @@
 "Транзакци� уже была зафик�ирована локально, но возможно не была "
 "реплицирована на резервный �ервер."
 
-#: replication/syncrep.c:216
+#: replication/syncrep.c:208
 #, c-format
 msgid "canceling wait for synchronous replication due to user request"
 msgstr "отмена ожидани� �инхронной репликации по запро�у пользовател�"
 
-#: replication/syncrep.c:346
+#: replication/syncrep.c:338
 #, c-format
 msgid "standby \"%s\" now has synchronous standby priority %u"
 msgstr ""
 "резервный �ервер \"%s\" теперь имеет приоритет �инхронной репликации %u"
 
-#: replication/syncrep.c:480
+#: replication/syncrep.c:472
 #, c-format
 msgid "standby \"%s\" is now the synchronous standby with priority %u"
 msgstr ""
@@ -16391,48 +16412,48 @@
 "запрошенна� начальна� точка %X/%X впереди позиции �брошенных данных журнала "
 "на �том �ервере (%X/%X)"
 
-#: replication/walsender.c:965
+#: replication/walsender.c:964
 #, c-format
 msgid "terminating walsender process after promotion"
 msgstr "завершение проце��а передачи журнала по�ле повышени�"
 
-#: replication/walsender.c:1292
+#: replication/walsender.c:1291
 #, c-format
 msgid "received replication command: %s"
 msgstr "получена команда репликации: %s"
 
-#: replication/walsender.c:1385 replication/walsender.c:1401
+#: replication/walsender.c:1392 replication/walsender.c:1408
 #, c-format
 msgid "unexpected EOF on standby connection"
 msgstr "неожиданный обрыв �оединени� � резервным �ервером"
 
-#: replication/walsender.c:1415
+#: replication/walsender.c:1422
 #, c-format
 msgid "unexpected standby message type \"%c\", after receiving CopyDone"
 msgstr ""
 "по�ле CopyDone резервный �ервер передал �ообщение неожиданного типа \"%c\""
 
-#: replication/walsender.c:1453
+#: replication/walsender.c:1460
 #, c-format
 msgid "invalid standby message type \"%c\""
 msgstr "неверный тип �ообщени� резервного �ервера: \"%c\""
 
-#: replication/walsender.c:1494
+#: replication/walsender.c:1501
 #, c-format
 msgid "unexpected message type \"%c\""
 msgstr "неожиданный тип �ообщени� \"%c\""
 
-#: replication/walsender.c:1781
+#: replication/walsender.c:1788
 #, c-format
 msgid "terminating walsender process due to replication timeout"
 msgstr "завершение проце��а передачи журнала из-за таймаута репликации"
 
-#: replication/walsender.c:1874
+#: replication/walsender.c:1873
 #, c-format
 msgid "standby \"%s\" has now caught up with primary"
 msgstr "резервный �ервер \"%s\" нагнал главный"
 
-#: replication/walsender.c:1978
+#: replication/walsender.c:1977
 #, c-format
 msgid ""
 "number of requested standby connections exceeds max_wal_senders (currently "
@@ -16441,7 +16462,7 @@
 "чи�ло запрошенных подключений резервных �ерверов прево�ходит max_wal_senders "
 "(�ейча�: %d)"
 
-#: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:961
+#: rewrite/rewriteDefine.c:112 rewrite/rewriteDefine.c:973
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" already exists"
 msgstr "правило \"%s\" дл� отношени� \"%s\" уже �уще�твует"
@@ -16511,7 +16532,8 @@
 #, c-format
 msgid "could not convert table \"%s\" to a view because it is not empty"
 msgstr ""
-"не удало�ь преобразовать таблицу \"%s\" в пред�тавление, так как она не пу�та"
+"не удало�ь преобразовать таблицу \"%s\" в пред�тавление, так как она не "
+"пу�та1"
 
 #: rewrite/rewriteDefine.c:440
 #, c-format
@@ -16582,13 +16604,20 @@
 msgid "RETURNING list has too many entries"
 msgstr "�пи�ок RETURNING �одержит �лишком много �толбцов"
 
-#: rewrite/rewriteDefine.c:684
+#: rewrite/rewriteDefine.c:695
 #, c-format
 msgid "cannot convert relation containing dropped columns to view"
 msgstr ""
 "преобразовать отношение, �одержащее удалённые �толбцы, в пред�тавление нельз�"
 
-#: rewrite/rewriteDefine.c:690
+#: rewrite/rewriteDefine.c:696
+#, c-format
+msgid ""
+"cannot create a RETURNING list for a relation containing dropped columns"
+msgstr ""
+"�оздать �пи�ок RETURNING дл� отношени�, �одержащего удалённые �толбцы, нельз�"
+
+#: rewrite/rewriteDefine.c:702
 #, c-format
 msgid ""
 "SELECT rule's target entry %d has different column name from column \"%s\""
@@ -16596,62 +16625,62 @@
 "�лементу %d результата правила дл� SELECT при�воено им�, отличное от имени "
 "�толбца \"%s\""
 
-#: rewrite/rewriteDefine.c:692
+#: rewrite/rewriteDefine.c:704
 #, c-format
 msgid "SELECT target entry is named \"%s\"."
 msgstr "Им� �лемента результата SELECT: \"%s\"."
 
-#: rewrite/rewriteDefine.c:701
+#: rewrite/rewriteDefine.c:713
 #, c-format
 msgid "SELECT rule's target entry %d has different type from column \"%s\""
 msgstr ""
 "�лемент %d результата правила дл� SELECT имеет тип, отличный от типа �толбца "
 "\"%s\""
 
-#: rewrite/rewriteDefine.c:703
+#: rewrite/rewriteDefine.c:715
 #, c-format
 msgid "RETURNING list's entry %d has different type from column \"%s\""
 msgstr "�лемент %d �пи�ка RETURNING имеет тип, отличный от типа �толбца \"%s\""
 
-#: rewrite/rewriteDefine.c:706 rewrite/rewriteDefine.c:730
+#: rewrite/rewriteDefine.c:718 rewrite/rewriteDefine.c:742
 #, c-format
 msgid "SELECT target entry has type %s, but column has type %s."
 msgstr "Элемент результата SELECT имеет тип %s, тогда как тип �толбца - %s."
 
-#: rewrite/rewriteDefine.c:709 rewrite/rewriteDefine.c:734
+#: rewrite/rewriteDefine.c:721 rewrite/rewriteDefine.c:746
 #, c-format
 msgid "RETURNING list entry has type %s, but column has type %s."
 msgstr "Элемент �пи�ка RETURNING имеет тип %s, тогда как тип �толбца - %s."
 
-#: rewrite/rewriteDefine.c:725
+#: rewrite/rewriteDefine.c:737
 #, c-format
 msgid "SELECT rule's target entry %d has different size from column \"%s\""
 msgstr ""
 "�лемент %d результата правила дл� SELECT имеет размер, отличный от �толбца "
 "\"%s\""
 
-#: rewrite/rewriteDefine.c:727
+#: rewrite/rewriteDefine.c:739
 #, c-format
 msgid "RETURNING list's entry %d has different size from column \"%s\""
 msgstr "�лемент %d �пи�ка RETURNING имеет размер, отличный от �толбца \"%s\""
 
-#: rewrite/rewriteDefine.c:744
+#: rewrite/rewriteDefine.c:756
 #, c-format
 msgid "SELECT rule's target list has too few entries"
 msgstr "�пи�ок результата правила дл� SELECT �одержит недо�таточно �лементов"
 
-#: rewrite/rewriteDefine.c:745
+#: rewrite/rewriteDefine.c:757
 #, c-format
 msgid "RETURNING list has too few entries"
 msgstr "�пи�ок RETURNING �одержит недо�таточно �лементов"
 
-#: rewrite/rewriteDefine.c:837 rewrite/rewriteDefine.c:952
+#: rewrite/rewriteDefine.c:849 rewrite/rewriteDefine.c:964
 #: rewrite/rewriteSupport.c:112
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" does not exist"
 msgstr "правило \"%s\" дл� отношени�\"%s\" не �уще�твует"
 
-#: rewrite/rewriteDefine.c:971
+#: rewrite/rewriteDefine.c:983
 #, c-format
 msgid "renaming an ON SELECT rule is not allowed"
 msgstr "переименовывать правило ON SELECT нельз�"
@@ -16949,17 +16978,17 @@
 msgid "invalid page in block %u of relation %s; zeroing out page"
 msgstr "неверна� �траница в блоке %u отношени� %s; �траница обнул�ет��"
 
-#: storage/buffer/bufmgr.c:3590
+#: storage/buffer/bufmgr.c:3595
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "не удало�ь запи�ь блок %u файла %s"
 
-#: storage/buffer/bufmgr.c:3592
+#: storage/buffer/bufmgr.c:3597
 #, c-format
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Множе�твенные �бои - возможно, по�то�нна� ошибка запи�и."
 
-#: storage/buffer/bufmgr.c:3613 storage/buffer/bufmgr.c:3632
+#: storage/buffer/bufmgr.c:3618 storage/buffer/bufmgr.c:3637
 #, c-format
 msgid "writing block %u of relation %s"
 msgstr "запи�ь блока %u отношени� %s"
@@ -16969,55 +16998,60 @@
 msgid "no empty local buffer available"
 msgstr "нет пу�того локального буфера"
 
-#: storage/file/fd.c:528
+#: storage/file/fd.c:548
+#, c-format
+msgid "could not link file \"%s\" to \"%s\": %m"
+msgstr "дл� файла \"%s\" не удало�ь �оздать ��ылку \"%s\": %m"
+
+#: storage/file/fd.c:642
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "ошибка в getrlimit(): %m"
 
-#: storage/file/fd.c:618
+#: storage/file/fd.c:732
 #, c-format
 msgid "insufficient file descriptors available to start server process"
 msgstr "недо�таточно де�крипторов файлов дл� запу�ка �ерверного проце��а"
 
-#: storage/file/fd.c:619
+#: storage/file/fd.c:733
 #, c-format
 msgid "System allows %d, we need at least %d."
 msgstr "Си�тема выдел�ет: %d, а требует�� минимум: %d."
 
-#: storage/file/fd.c:660 storage/file/fd.c:1694 storage/file/fd.c:1787
-#: storage/file/fd.c:1935
+#: storage/file/fd.c:774 storage/file/fd.c:1878 storage/file/fd.c:1971
+#: storage/file/fd.c:2119
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr "нехватка де�крипторов файлов: %m; о�вободите их и повторите попытку"
 
-#: storage/file/fd.c:1234
+#: storage/file/fd.c:1379
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "временный файл: путь \"%s\", размер %lu"
 
-#: storage/file/fd.c:1383
+#: storage/file/fd.c:1551
 #, c-format
 msgid "temporary file size exceeds temp_file_limit (%dkB)"
 msgstr "размер временного файла превышает предел temp_file_limit (%d КБ)"
 
-#: storage/file/fd.c:1670 storage/file/fd.c:1720
+#: storage/file/fd.c:1854 storage/file/fd.c:1904
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open file \"%s\""
 msgstr "превышен предел maxAllocatedDescs (%d) при попытке открыть файл \"%s\""
 
-#: storage/file/fd.c:1760
+#: storage/file/fd.c:1944
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to execute command \"%s\""
 msgstr ""
 "превышен предел maxAllocatedDescs (%d) при попытке выполнить команду \"%s\""
 
-#: storage/file/fd.c:1911
+#: storage/file/fd.c:2095
 #, c-format
 msgid "exceeded maxAllocatedDescs (%d) while trying to open directory \"%s\""
 msgstr ""
 "превышен предел maxAllocatedDescs (%d) при попытке открыть каталог \"%s\""
 
-#: storage/file/fd.c:1997
+#: storage/file/fd.c:2181
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "не удало�ь прочитать каталог \"%s\": %m"
@@ -17050,38 +17084,38 @@
 
 #: storage/ipc/dsm_impl.c:261 storage/ipc/dsm_impl.c:361
 #: storage/ipc/dsm_impl.c:533 storage/ipc/dsm_impl.c:648
-#: storage/ipc/dsm_impl.c:811 storage/ipc/dsm_impl.c:953
+#: storage/ipc/dsm_impl.c:819 storage/ipc/dsm_impl.c:961
 #, c-format
 msgid "could not unmap shared memory segment \"%s\": %m"
 msgstr "не удало�ь о�вободить �егмент раздел�емой пам�ти %s: %m"
 
 #: storage/ipc/dsm_impl.c:271 storage/ipc/dsm_impl.c:543
-#: storage/ipc/dsm_impl.c:658 storage/ipc/dsm_impl.c:821
+#: storage/ipc/dsm_impl.c:658 storage/ipc/dsm_impl.c:829
 #, c-format
 msgid "could not remove shared memory segment \"%s\": %m"
 msgstr "ошибка при удалении �егмента раздел�емой пам�ти \"%s\": %m"
 
-#: storage/ipc/dsm_impl.c:292 storage/ipc/dsm_impl.c:721
-#: storage/ipc/dsm_impl.c:835
+#: storage/ipc/dsm_impl.c:292 storage/ipc/dsm_impl.c:729
+#: storage/ipc/dsm_impl.c:843
 #, c-format
 msgid "could not open shared memory segment \"%s\": %m"
 msgstr "не удало�ь открыть �егмент раздел�емой пам�ти \"%s\": %m"
 
 #: storage/ipc/dsm_impl.c:316 storage/ipc/dsm_impl.c:559
-#: storage/ipc/dsm_impl.c:766 storage/ipc/dsm_impl.c:859
+#: storage/ipc/dsm_impl.c:774 storage/ipc/dsm_impl.c:867
 #, c-format
 msgid "could not stat shared memory segment \"%s\": %m"
 msgstr "не удало�ь обратить�� к �егменту раздел�емой пам�ти \"%s\": %m"
 
-#: storage/ipc/dsm_impl.c:335 storage/ipc/dsm_impl.c:878
-#: storage/ipc/dsm_impl.c:926
+#: storage/ipc/dsm_impl.c:335 storage/ipc/dsm_impl.c:886
+#: storage/ipc/dsm_impl.c:934
 #, c-format
 msgid "could not resize shared memory segment \"%s\" to %zu bytes: %m"
 msgstr ""
 "не удало�ь изменить размер �егмента раздел�емой пам�ти \"%s\" до %zu байт: %m"
 
 #: storage/ipc/dsm_impl.c:385 storage/ipc/dsm_impl.c:580
-#: storage/ipc/dsm_impl.c:742 storage/ipc/dsm_impl.c:977
+#: storage/ipc/dsm_impl.c:750 storage/ipc/dsm_impl.c:985
 #, c-format
 msgid "could not map shared memory segment \"%s\": %m"
 msgstr "не удало�ь отобразить �егмент раздел�емой пам�ти \"%s\": %m"
@@ -17091,12 +17125,12 @@
 msgid "could not get shared memory segment: %m"
 msgstr "не удало�ь получить �егмент раздел�емой пам�ти: %m"
 
-#: storage/ipc/dsm_impl.c:694
+#: storage/ipc/dsm_impl.c:714
 #, c-format
 msgid "could not create shared memory segment \"%s\": %m"
 msgstr "не удало�ь �оздать �егмент раздел�емой пам�ти \"%s\": %m"
 
-#: storage/ipc/dsm_impl.c:1018
+#: storage/ipc/dsm_impl.c:1026
 #, c-format
 msgid "could not duplicate handle for \"%s\": %m"
 msgstr "не удало�ь продублировать указатель дл� \"%s\": %m"
@@ -17138,13 +17172,13 @@
 msgid "requested shared memory size overflows size_t"
 msgstr "запрошенный размер раздел�емой пам�ти не умещает�� в size_t"
 
-#: storage/ipc/standby.c:500 tcop/postgres.c:2974
+#: storage/ipc/standby.c:502 tcop/postgres.c:2989
 #, c-format
 msgid "canceling statement due to conflict with recovery"
 msgstr ""
 "выполнение оператора отменено из-за конфликта � проце��ом во��тановлени�"
 
-#: storage/ipc/standby.c:501 tcop/postgres.c:2274
+#: storage/ipc/standby.c:503 tcop/postgres.c:2274
 #, c-format
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr ""
@@ -17392,13 +17426,13 @@
 msgid "a snapshot-importing transaction must not be READ ONLY DEFERRABLE"
 msgstr "транзакци�, импортирующа� �нимок, не должна быть READ ONLY DEFERRABLE"
 
-#: storage/lmgr/predicate.c:1705 utils/time/snapmgr.c:431
-#: utils/time/snapmgr.c:437
+#: storage/lmgr/predicate.c:1705 utils/time/snapmgr.c:472
+#: utils/time/snapmgr.c:478
 #, c-format
 msgid "could not import the requested snapshot"
 msgstr "не удало�ь импортировать запрошенный �нимок"
 
-#: storage/lmgr/predicate.c:1706 utils/time/snapmgr.c:438
+#: storage/lmgr/predicate.c:1706 utils/time/snapmgr.c:479
 #, c-format
 msgid "The source transaction %u is not running anymore."
 msgstr "И�ходна� транзакци� %u уже не выполн�ет��."
@@ -17485,33 +17519,33 @@
 #, c-format
 msgid "page verification failed, calculated checksum %u but expected %u"
 msgstr ""
-"ошибка проверки �траницы: получена контрольна� �умма %u, а ожидала�ь — %u"
+"ошибка проверки �траницы: получена контрольна� �умма %u, а ожидала�ь - %u"
 
-#: storage/page/bufpage.c:200 storage/page/bufpage.c:490
-#: storage/page/bufpage.c:705 storage/page/bufpage.c:836
-#: storage/page/bufpage.c:936
+#: storage/page/bufpage.c:203 storage/page/bufpage.c:522
+#: storage/page/bufpage.c:737 storage/page/bufpage.c:868
+#: storage/page/bufpage.c:968
 #, c-format
 msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr ""
 "и�порченные указатели �траницы: нижний = %u, верхний = %u, �пецобла�ть = %u"
 
-#: storage/page/bufpage.c:534
+#: storage/page/bufpage.c:566
 #, c-format
 msgid "corrupted item pointer: %u"
 msgstr "и�порченный указатель �лемента: %u"
 
-#: storage/page/bufpage.c:545 storage/page/bufpage.c:887
-#: storage/page/bufpage.c:1042
+#: storage/page/bufpage.c:577 storage/page/bufpage.c:919
+#: storage/page/bufpage.c:1074
 #, c-format
 msgid "corrupted item lengths: total %u, available space %u"
 msgstr "и�порченный размер �лемента (общий размер: %u, до�тупно: %u)"
 
-#: storage/page/bufpage.c:724 storage/page/bufpage.c:860
+#: storage/page/bufpage.c:756 storage/page/bufpage.c:892
 #, c-format
 msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr "и�порченный указатель �лемента: �мещение = %u, размер = %u"
 
-#: storage/page/bufpage.c:965
+#: storage/page/bufpage.c:997
 #, c-format
 msgid "corrupted item pointer: offset = %u, length = %u"
 msgstr "и�порченный указатель �лемента: �мещение = %u, длина = %u"
@@ -17573,34 +17607,34 @@
 "не удало�ь обрезать файл \"%s\" (требуема� длина в блоках: %u, но �ейча� он "
 "�одержит %u)"
 
-#: storage/smgr/md.c:938
+#: storage/smgr/md.c:939
 #, c-format
 msgid "could not truncate file \"%s\" to %u blocks: %m"
 msgstr "не удало�ь обрезать файл \"%s\" до нужного чи�ла блоков (%u): %m"
 
-#: storage/smgr/md.c:1218
+#: storage/smgr/md.c:1219
 #, c-format
 msgid "could not fsync file \"%s\" but retrying: %m"
 msgstr ""
 "не удало�ь �инхронизировать � ФС файл \"%s\", по�ледует повторна� попытка: %m"
 
-#: storage/smgr/md.c:1381
+#: storage/smgr/md.c:1382
 #, c-format
 msgid "could not forward fsync request because request queue is full"
 msgstr ""
 "не удало�ь отправить запро� �инхронизации � ФС (очередь запро�ов переполнена)"
 
-#: storage/smgr/md.c:1776
+#: storage/smgr/md.c:1777
 #, c-format
 msgid "could not open file \"%s\" (target block %u): %m"
 msgstr "не удало�ь открыть файл file \"%s\" (целевой блок %u): %m"
 
-#: tcop/fastpath.c:111 tcop/fastpath.c:475 tcop/fastpath.c:605
+#: tcop/fastpath.c:111 tcop/fastpath.c:463 tcop/fastpath.c:593
 #, c-format
 msgid "invalid argument size %d in function call message"
 msgstr "неверный размер аргумента (%d) в �ообщении вызова функции"
 
-#: tcop/fastpath.c:291 tcop/postgres.c:1003 tcop/postgres.c:1313
+#: tcop/fastpath.c:281 tcop/postgres.c:1003 tcop/postgres.c:1313
 #: tcop/postgres.c:1571 tcop/postgres.c:1975 tcop/postgres.c:2342
 #: tcop/postgres.c:2417
 #, c-format
@@ -17610,37 +17644,37 @@
 msgstr ""
 "текуща� транзакци� прервана, команды до конца блока транзакции игнорируют��"
 
-#: tcop/fastpath.c:319
+#: tcop/fastpath.c:309
 #, c-format
 msgid "fastpath function call: \"%s\" (OID %u)"
 msgstr "вызов функции fastpath: \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:401 tcop/postgres.c:1173 tcop/postgres.c:1438
+#: tcop/fastpath.c:391 tcop/postgres.c:1173 tcop/postgres.c:1438
 #: tcop/postgres.c:1816 tcop/postgres.c:2033
 #, c-format
 msgid "duration: %s ms"
 msgstr "продолжительно�ть: %s м�"
 
-#: tcop/fastpath.c:405
+#: tcop/fastpath.c:395
 #, c-format
 msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
 msgstr "продолжительно�ть %s м�, вызов функции fastpath: \"%s\" (OID %u)"
 
-#: tcop/fastpath.c:443 tcop/fastpath.c:570
+#: tcop/fastpath.c:431 tcop/fastpath.c:558
 #, c-format
 msgid "function call message contains %d arguments but function requires %d"
 msgstr ""
 "�ообщение вызова функции �одержит неверное чи�ло аргументов (%d, а требует�� "
 "%d)"
 
-#: tcop/fastpath.c:451
+#: tcop/fastpath.c:439
 #, c-format
 msgid "function call message contains %d argument formats but %d arguments"
 msgstr ""
 "�ообщение вызова функции �одержит неверное чи�ло форматов (%d, а аргументов "
 "%d)"
 
-#: tcop/fastpath.c:538 tcop/fastpath.c:621
+#: tcop/fastpath.c:526 tcop/fastpath.c:609
 #, c-format
 msgid "incorrect binary data format in function argument %d"
 msgstr "неправильный формат двоичных данных в аргументе функции %d"
@@ -17651,7 +17685,7 @@
 msgstr "неожиданный обрыв �оединени� � клиентом"
 
 #: tcop/postgres.c:449 tcop/postgres.c:461 tcop/postgres.c:472
-#: tcop/postgres.c:484 tcop/postgres.c:4268
+#: tcop/postgres.c:484 tcop/postgres.c:4277
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "неправильный тип клиент�кого �ообщени� %d"
@@ -17710,7 +17744,7 @@
 #: tcop/postgres.c:1723
 #, c-format
 msgid "incorrect binary data format in bind parameter %d"
-msgstr "неверный формат двоичных данных в параметре Вind %d"
+msgstr "неверный формат двоичных данных в параметре Bind %d"
 
 #: tcop/postgres.c:1821
 #, c-format
@@ -17781,7 +17815,7 @@
 #: tcop/postgres.c:2277
 #, c-format
 msgid "User was connected to a database that must be dropped."
-msgstr "Пользователь был подключен к базе данных, котора� должна быть удалена."
+msgstr "Пользователь был подключён к базе данных, котора� должна быть удалена."
 
 #: tcop/postgres.c:2606
 #, c-format
@@ -17848,32 +17882,32 @@
 msgid "connection to client lost"
 msgstr "подключение к клиенту потер�но"
 
-#: tcop/postgres.c:2951
+#: tcop/postgres.c:2966
 #, c-format
 msgid "canceling statement due to lock timeout"
 msgstr "выполнение оператора отменено из-за таймаута блокировки"
 
-#: tcop/postgres.c:2958
+#: tcop/postgres.c:2973
 #, c-format
 msgid "canceling statement due to statement timeout"
 msgstr "выполнение оператора отменено из-за таймаута"
 
-#: tcop/postgres.c:2965
+#: tcop/postgres.c:2980
 #, c-format
 msgid "canceling autovacuum task"
 msgstr "отмена задачи автоочи�тки"
 
-#: tcop/postgres.c:2988
+#: tcop/postgres.c:3003
 #, c-format
 msgid "canceling statement due to user request"
 msgstr "выполнение оператора отменено по запро�у пользовател�"
 
-#: tcop/postgres.c:3098
+#: tcop/postgres.c:3113
 #, c-format
 msgid "stack depth limit exceeded"
 msgstr "превышен предел глубины �тека"
 
-#: tcop/postgres.c:3099
+#: tcop/postgres.c:3114
 #, c-format
 msgid ""
 "Increase the configuration parameter \"max_stack_depth\" (currently %dkB), "
@@ -17883,12 +17917,12 @@
 "КБ), предварительно убедивши�ь, что ОС предо�тавл�ет до�таточный размер "
 "�тека."
 
-#: tcop/postgres.c:3162
+#: tcop/postgres.c:3177
 #, c-format
 msgid "\"max_stack_depth\" must not exceed %ldkB."
 msgstr "Значение \"max_stack_depth\" не должно превышать %ld КБ."
 
-#: tcop/postgres.c:3164
+#: tcop/postgres.c:3179
 #, c-format
 msgid ""
 "Increase the platform's stack depth limit via \"ulimit -s\" or local "
@@ -17897,48 +17931,48 @@
 "Увеличьте предел глубины �тека в �и�теме � помощью команды \"ulimit -s\" или "
 "�квивалента в вашей ОС."
 
-#: tcop/postgres.c:3524
+#: tcop/postgres.c:3539
 #, c-format
 msgid "invalid command-line argument for server process: %s"
 msgstr "неверный аргумент командной �троки дл� �ерверного проце��а: %s"
 
-#: tcop/postgres.c:3525 tcop/postgres.c:3531
+#: tcop/postgres.c:3540 tcop/postgres.c:3546
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Дл� дополнительной информации попробуйте \"%s --help\"."
 
-#: tcop/postgres.c:3529
+#: tcop/postgres.c:3544
 #, c-format
 msgid "%s: invalid command-line argument: %s"
 msgstr "%s: неверный аргумент командной �троки: %s"
 
-#: tcop/postgres.c:3590
+#: tcop/postgres.c:3605
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: не указаны ни база данных, ни пользователь"
 
-#: tcop/postgres.c:4176
+#: tcop/postgres.c:4185
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "неверный подтип �ообщени� CLOSE: %d"
 
-#: tcop/postgres.c:4211
+#: tcop/postgres.c:4220
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "неверный подтип �ообщени� DESCRIBE: %d"
 
-#: tcop/postgres.c:4289
+#: tcop/postgres.c:4298
 #, c-format
 msgid "fastpath function calls not supported in a replication connection"
 msgstr "вызовы функции fastpath не поддерживают�� дл� реплицирующих �оединений"
 
-#: tcop/postgres.c:4293
+#: tcop/postgres.c:4302
 #, c-format
 msgid "extended query protocol not supported in a replication connection"
 msgstr ""
 "протокол ра�ширенных запро�ов не поддерживает�� дл� реплицирующих �оединений"
 
-#: tcop/postgres.c:4463
+#: tcop/postgres.c:4472
 #, c-format
 msgid ""
 "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s"
@@ -17951,7 +17985,7 @@
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr ""
-"чи�ло форматов результатов в �ообщении Вind (%d) не равно чи�лу �толбцов в "
+"чи�ло форматов результатов в �ообщении Bind (%d) не равно чи�лу �толбцов в "
 "запро�е (%d)"
 
 #: tcop/pquery.c:968
@@ -18117,38 +18151,38 @@
 msgid "missing Dictionary parameter"
 msgstr "от�ут�твует параметр Dictionary"
 
-#: tsearch/spell.c:276
+#: tsearch/spell.c:289
 #, c-format
 msgid "could not open dictionary file \"%s\": %m"
 msgstr "не удало�ь открыть файл �ловар� \"%s\": %m"
 
-#: tsearch/spell.c:439 utils/adt/regexp.c:204
+#: tsearch/spell.c:452 utils/adt/regexp.c:204
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "неверное регул�рное выражение: %s"
 
-#: tsearch/spell.c:518 tsearch/spell.c:535 tsearch/spell.c:552
-#: tsearch/spell.c:569 tsearch/spell.c:591 gram.y:14253 gram.y:14270
+#: tsearch/spell.c:667 tsearch/spell.c:684 tsearch/spell.c:701
+#: tsearch/spell.c:718 tsearch/spell.c:740 gram.y:14257 gram.y:14274
 #, c-format
 msgid "syntax error"
 msgstr "ошибка �интак�и�а"
 
-#: tsearch/spell.c:596
+#: tsearch/spell.c:745
 #, c-format
 msgid "multibyte flag character is not allowed"
 msgstr "многобайтные �имволы флагов не допу�кают��"
 
-#: tsearch/spell.c:632 tsearch/spell.c:690 tsearch/spell.c:787
+#: tsearch/spell.c:779 tsearch/spell.c:835 tsearch/spell.c:937
 #, c-format
 msgid "could not open affix file \"%s\": %m"
 msgstr "не удало�ь открыть файл аффик�ов \"%s\": %m"
 
-#: tsearch/spell.c:678
+#: tsearch/spell.c:825
 #, c-format
 msgid "Ispell dictionary supports only default flag value"
 msgstr "�ловарь Ispell поддерживает дл� FLAG только значение default"
 
-#: tsearch/spell.c:901
+#: tsearch/spell.c:1050
 #, c-format
 msgid "affix file contains both old-style and new-style commands"
 msgstr "файл аффик�ов �одержит команды и в �таром, и в новом �тиле"
@@ -18195,27 +18229,27 @@
 msgid "text search parser does not support headline creation"
 msgstr "анализатор тек�тового пои�ка не поддерживает �оздание выдержек"
 
-#: tsearch/wparser_def.c:2557
+#: tsearch/wparser_def.c:2559
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
 msgstr "нера�познанный параметр функции выдержки: \"%s\""
 
-#: tsearch/wparser_def.c:2566
+#: tsearch/wparser_def.c:2568
 #, c-format
 msgid "MinWords should be less than MaxWords"
 msgstr "Значение MinWords должно быть меньше MaxWords"
 
-#: tsearch/wparser_def.c:2570
+#: tsearch/wparser_def.c:2572
 #, c-format
 msgid "MinWords should be positive"
 msgstr "Значение MinWords должно быть положительным"
 
-#: tsearch/wparser_def.c:2574
+#: tsearch/wparser_def.c:2576
 #, c-format
 msgid "ShortWord should be >= 0"
 msgstr "Значение ShortWord должно быть >= 0"
 
-#: tsearch/wparser_def.c:2578
+#: tsearch/wparser_def.c:2580
 #, c-format
 msgid "MaxFragments should be >= 0"
 msgstr "Значение MaxFragments должно быть >= 0"
@@ -18313,15 +18347,15 @@
 #: utils/adt/acl.c:1546
 #, c-format
 msgid "aclremove is no longer supported"
-msgstr "aclremove больше не поддерживает�� "
+msgstr "aclremove больше не поддерживает��"
 
 #: utils/adt/acl.c:1632 utils/adt/acl.c:1686
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
 msgstr "нера�познанный тип прав: \"%s\""
 
-#: utils/adt/acl.c:3426 utils/adt/regproc.c:123 utils/adt/regproc.c:144
-#: utils/adt/regproc.c:319
+#: utils/adt/acl.c:3426 utils/adt/regproc.c:124 utils/adt/regproc.c:145
+#: utils/adt/regproc.c:320
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "функци� \"%s\" не �уще�твует"
@@ -18333,87 +18367,87 @@
 
 #: utils/adt/array_expanded.c:276 utils/adt/arrayfuncs.c:934
 #: utils/adt/arrayfuncs.c:1522 utils/adt/arrayfuncs.c:3225
-#: utils/adt/arrayfuncs.c:3363 utils/adt/arrayfuncs.c:5838
-#: utils/adt/arrayfuncs.c:6149 utils/adt/arrayutils.c:93
+#: utils/adt/arrayfuncs.c:3363 utils/adt/arrayfuncs.c:5826
+#: utils/adt/arrayfuncs.c:6137 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/array_userfuncs.c:67 utils/adt/array_userfuncs.c:529
-#: utils/adt/array_userfuncs.c:609 utils/adt/json.c:1759 utils/adt/json.c:1854
+#: utils/adt/array_userfuncs.c:79 utils/adt/array_userfuncs.c:541
+#: utils/adt/array_userfuncs.c:621 utils/adt/json.c:1759 utils/adt/json.c:1854
 #: utils/adt/json.c:1892 utils/adt/jsonb.c:1126 utils/adt/jsonb.c:1155
-#: utils/adt/jsonb.c:1590 utils/adt/jsonb.c:1754 utils/adt/jsonb.c:1764
+#: utils/adt/jsonb.c:1591 utils/adt/jsonb.c:1755 utils/adt/jsonb.c:1765
 #, c-format
 msgid "could not determine input data type"
 msgstr "не удало�ь определить тип входных данных"
 
-#: utils/adt/array_userfuncs.c:72
+#: utils/adt/array_userfuncs.c:84
 #, c-format
 msgid "input data type is not an array"
 msgstr "тип входных данных не �вл�ет�� ма��ивом"
 
-#: utils/adt/array_userfuncs.c:120 utils/adt/array_userfuncs.c:174
-#: utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1161 utils/adt/float.c:1220
-#: utils/adt/float.c:2771 utils/adt/float.c:2787 utils/adt/int.c:623
+#: utils/adt/array_userfuncs.c:132 utils/adt/array_userfuncs.c:186
+#: utils/adt/arrayfuncs.c:1325 utils/adt/float.c:1158 utils/adt/float.c:1217
+#: utils/adt/float.c:2768 utils/adt/float.c:2784 utils/adt/int.c:623
 #: utils/adt/int.c:652 utils/adt/int.c:673 utils/adt/int.c:704
 #: utils/adt/int.c:737 utils/adt/int.c:759 utils/adt/int.c:907
 #: utils/adt/int.c:928 utils/adt/int.c:955 utils/adt/int.c:995
 #: utils/adt/int.c:1016 utils/adt/int.c:1043 utils/adt/int.c:1076
-#: utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2903
-#: utils/adt/numeric.c:2912 utils/adt/varbit.c:1173 utils/adt/varbit.c:1565
-#: utils/adt/varlena.c:1045 utils/adt/varlena.c:2582
+#: utils/adt/int.c:1159 utils/adt/int8.c:1298 utils/adt/numeric.c:2899
+#: utils/adt/numeric.c:2908 utils/adt/varbit.c:1173 utils/adt/varbit.c:1575
+#: utils/adt/varlena.c:1045 utils/adt/varlena.c:2595
 #, c-format
 msgid "integer out of range"
 msgstr "целое вне диапазона"
 
-#: utils/adt/array_userfuncs.c:127 utils/adt/array_userfuncs.c:184
+#: utils/adt/array_userfuncs.c:139 utils/adt/array_userfuncs.c:196
 #, c-format
 msgid "argument must be empty or one-dimensional array"
 msgstr "аргумент должен быть одномерным ма��ивом или пу�тым"
 
-#: utils/adt/array_userfuncs.c:266 utils/adt/array_userfuncs.c:305
-#: utils/adt/array_userfuncs.c:342 utils/adt/array_userfuncs.c:371
-#: utils/adt/array_userfuncs.c:399
+#: utils/adt/array_userfuncs.c:278 utils/adt/array_userfuncs.c:317
+#: utils/adt/array_userfuncs.c:354 utils/adt/array_userfuncs.c:383
+#: utils/adt/array_userfuncs.c:411
 #, c-format
 msgid "cannot concatenate incompatible arrays"
 msgstr "�оедин�ть не�овме�тимые ма��ивы нельз�"
 
-#: utils/adt/array_userfuncs.c:267
+#: utils/adt/array_userfuncs.c:279
 #, c-format
 msgid ""
 "Arrays with element types %s and %s are not compatible for concatenation."
 msgstr "Ма��ивы � �лементами типов %s и %s не�овме�тимы дл� �оединени�."
 
-#: utils/adt/array_userfuncs.c:306
+#: utils/adt/array_userfuncs.c:318
 #, c-format
 msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
 msgstr "Ма��ивы � размерно�т�ми %d и %d не�овме�тимы дл� �оединени�."
 
-#: utils/adt/array_userfuncs.c:343
+#: utils/adt/array_userfuncs.c:355
 #, c-format
 msgid ""
 "Arrays with differing element dimensions are not compatible for "
 "concatenation."
 msgstr "Ма��ивы � разными размерно�т�ми �лементов не�овме�тимы дл� �оединени�."
 
-#: utils/adt/array_userfuncs.c:372 utils/adt/array_userfuncs.c:400
+#: utils/adt/array_userfuncs.c:384 utils/adt/array_userfuncs.c:412
 #, c-format
 msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr "Ма��ивы � разными размерно�т�ми не�овме�тимы дл� �оединени�."
 
-#: utils/adt/array_userfuncs.c:468 utils/adt/arrayfuncs.c:1287
-#: utils/adt/arrayfuncs.c:3331 utils/adt/arrayfuncs.c:5738
+#: utils/adt/array_userfuncs.c:480 utils/adt/arrayfuncs.c:1287
+#: utils/adt/arrayfuncs.c:3331 utils/adt/arrayfuncs.c:5732
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "неверное чи�ло размерно�тей: %d"
 
-#: utils/adt/array_userfuncs.c:725 utils/adt/array_userfuncs.c:876
+#: utils/adt/array_userfuncs.c:737 utils/adt/array_userfuncs.c:889
 #, c-format
 msgid "searching for elements in multidimensional arrays is not supported"
 msgstr "пои�к �лементов в многомерных ма��ивах не поддерживает��"
 
-#: utils/adt/array_userfuncs.c:749
+#: utils/adt/array_userfuncs.c:761
 #, c-format
 msgid "initial position must not be null"
 msgstr "начальна� позици� не может быть NULL"
@@ -18540,10 +18574,9 @@
 #: utils/adt/arrayfuncs.c:2226 utils/adt/arrayfuncs.c:2248
 #: utils/adt/arrayfuncs.c:2297 utils/adt/arrayfuncs.c:2533
 #: utils/adt/arrayfuncs.c:2830 utils/adt/arrayfuncs.c:5718
-#: utils/adt/arrayfuncs.c:5750 utils/adt/arrayfuncs.c:5767
+#: utils/adt/arrayfuncs.c:5744 utils/adt/arrayfuncs.c:5755
 #: utils/adt/json.c:2290 utils/adt/json.c:2365 utils/adt/jsonb.c:1369
-#: utils/adt/jsonb.c:1455 utils/adt/jsonfuncs.c:3528
-#: utils/adt/jsonfuncs.c:3573
+#: utils/adt/jsonb.c:1455 utils/adt/jsonfuncs.c:3528 utils/adt/jsonfuncs.c:3573
 #, c-format
 msgid "wrong number of array subscripts"
 msgstr "неверное чи�ло индек�ов ма��ива"
@@ -18610,42 +18643,32 @@
 msgid "dimension array or low bound array cannot be null"
 msgstr "ма��ив размерно�тей или ма��ив нижних границ не может быть null"
 
-#: utils/adt/arrayfuncs.c:5719 utils/adt/arrayfuncs.c:5751
+#: utils/adt/arrayfuncs.c:5719 utils/adt/arrayfuncs.c:5745
 #, c-format
 msgid "Dimension array must be one dimensional."
 msgstr "Ма��ив размерно�тей должен быть одномерным."
 
-#: utils/adt/arrayfuncs.c:5724 utils/adt/arrayfuncs.c:5756
-#, c-format
-msgid "wrong range of array subscripts"
-msgstr "неправильный диапазон индек�ов ма��ивов"
-
-#: utils/adt/arrayfuncs.c:5725 utils/adt/arrayfuncs.c:5757
-#, c-format
-msgid "Lower bound of dimension array must be one."
-msgstr "�ижн�� граница ма��ива размерно�тей должна быть равна 1."
-
-#: utils/adt/arrayfuncs.c:5730 utils/adt/arrayfuncs.c:5762
+#: utils/adt/arrayfuncs.c:5724 utils/adt/arrayfuncs.c:5750
 #, c-format
 msgid "dimension values cannot be null"
 msgstr "значени� размерно�тей не могут быть null"
 
-#: utils/adt/arrayfuncs.c:5768
+#: utils/adt/arrayfuncs.c:5756
 #, c-format
 msgid "Low bound array has different size than dimensions array."
 msgstr "Ма��ив нижних границ и ма��ив размерно�тей имеют разные размеры."
 
-#: utils/adt/arrayfuncs.c:6014
+#: utils/adt/arrayfuncs.c:6002
 #, c-format
 msgid "removing elements from multidimensional arrays is not supported"
 msgstr "удаление �лементов из многомерных ма��ивов не поддерживает��"
 
-#: utils/adt/arrayfuncs.c:6291
+#: utils/adt/arrayfuncs.c:6279
 #, c-format
 msgid "thresholds must be one-dimensional array"
 msgstr "границы должны задавать�� одномерным ма��ивом"
 
-#: utils/adt/arrayfuncs.c:6296
+#: utils/adt/arrayfuncs.c:6284
 #, c-format
 msgid "thresholds array must not contain NULLs"
 msgstr "ма��ив границ не должен �одержать NULL"
@@ -18653,7 +18676,7 @@
 #: utils/adt/arrayutils.c:209
 #, c-format
 msgid "typmod array must be type cstring[]"
-msgstr "ма��ив typmod должен иметь тип cstring[] "
+msgstr "ма��ив typmod должен иметь тип cstring[]"
 
 #: utils/adt/arrayutils.c:214
 #, c-format
@@ -18682,13 +18705,13 @@
 
 #: utils/adt/cash.c:607 utils/adt/cash.c:657 utils/adt/cash.c:708
 #: utils/adt/cash.c:757 utils/adt/cash.c:809 utils/adt/cash.c:859
-#: utils/adt/float.c:788 utils/adt/float.c:852 utils/adt/float.c:2530
-#: utils/adt/float.c:2593 utils/adt/geo_ops.c:4155 utils/adt/int.c:719
+#: utils/adt/float.c:785 utils/adt/float.c:849 utils/adt/float.c:2527
+#: utils/adt/float.c:2590 utils/adt/geo_ops.c:4163 utils/adt/int.c:719
 #: utils/adt/int.c:861 utils/adt/int.c:969 utils/adt/int.c:1058
 #: utils/adt/int.c:1097 utils/adt/int.c:1125 utils/adt/int8.c:597
 #: utils/adt/int8.c:657 utils/adt/int8.c:897 utils/adt/int8.c:1005
-#: utils/adt/int8.c:1094 utils/adt/int8.c:1202 utils/adt/numeric.c:5917
-#: utils/adt/numeric.c:6200 utils/adt/timestamp.c:3349
+#: utils/adt/int8.c:1094 utils/adt/int8.c:1202 utils/adt/numeric.c:5920
+#: utils/adt/numeric.c:6203 utils/adt/timestamp.c:3448
 #, c-format
 msgid "division by zero"
 msgstr "деление на ноль"
@@ -18698,7 +18721,7 @@
 msgid "\"char\" out of range"
 msgstr "значение \"char\" вне диапазона"
 
-#: utils/adt/date.c:67 utils/adt/timestamp.c:94 utils/adt/varbit.c:52
+#: utils/adt/date.c:67 utils/adt/timestamp.c:95 utils/adt/varbit.c:52
 #: utils/adt/varchar.c:44
 #, c-format
 msgid "invalid type modifier"
@@ -18714,27 +18737,27 @@
 msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
 msgstr "TIME(%d)%s: точно�ть уменьшена до дозволенного мак�имума: %d"
 
-#: utils/adt/date.c:141 utils/adt/datetime.c:1208 utils/adt/datetime.c:2079
+#: utils/adt/date.c:141 utils/adt/datetime.c:1209 utils/adt/datetime.c:2122
 #, c-format
 msgid "date/time value \"current\" is no longer supported"
 msgstr "значение \"current\" дл� даты/времени больше не поддерживает��"
 
-#: utils/adt/date.c:166 utils/adt/formatting.c:3523
+#: utils/adt/date.c:166 utils/adt/formatting.c:3521
 #, c-format
 msgid "date out of range: \"%s\""
 msgstr "дата вне диапазона: \"%s\""
 
-#: utils/adt/date.c:216 utils/adt/xml.c:2029
+#: utils/adt/date.c:216 utils/adt/xml.c:2033
 #, c-format
 msgid "date out of range"
 msgstr "дата вне диапазона"
 
-#: utils/adt/date.c:258 utils/adt/timestamp.c:592
+#: utils/adt/date.c:258 utils/adt/timestamp.c:593
 #, c-format
 msgid "date field value out of range: %d-%02d-%02d"
 msgstr "значение пол� типа date вне диапазона: %d-%02d-%02d"
 
-#: utils/adt/date.c:264 utils/adt/timestamp.c:598
+#: utils/adt/date.c:264 utils/adt/timestamp.c:599
 #, c-format
 msgid "date out of range: %d-%02d-%02d"
 msgstr "дата вне диапазона: %d-%02d-%02d"
@@ -18750,28 +18773,28 @@
 msgstr "дата вне диапазона дл� типа timestamp"
 
 #: utils/adt/date.c:970 utils/adt/date.c:1016 utils/adt/date.c:1616
-#: utils/adt/date.c:1652 utils/adt/date.c:2524 utils/adt/formatting.c:3399
-#: utils/adt/formatting.c:3431 utils/adt/formatting.c:3499
-#: utils/adt/json.c:1534 utils/adt/json.c:1556 utils/adt/jsonb.c:823
-#: utils/adt/jsonb.c:847 utils/adt/nabstime.c:455 utils/adt/nabstime.c:498
-#: utils/adt/nabstime.c:528 utils/adt/nabstime.c:571 utils/adt/timestamp.c:224
-#: utils/adt/timestamp.c:267 utils/adt/timestamp.c:716
-#: utils/adt/timestamp.c:745 utils/adt/timestamp.c:784
-#: utils/adt/timestamp.c:2938 utils/adt/timestamp.c:2959
-#: utils/adt/timestamp.c:2972 utils/adt/timestamp.c:2981
-#: utils/adt/timestamp.c:3038 utils/adt/timestamp.c:3061
-#: utils/adt/timestamp.c:3074 utils/adt/timestamp.c:3085
-#: utils/adt/timestamp.c:3610 utils/adt/timestamp.c:3739
-#: utils/adt/timestamp.c:3780 utils/adt/timestamp.c:3868
-#: utils/adt/timestamp.c:3914 utils/adt/timestamp.c:4025
-#: utils/adt/timestamp.c:4349 utils/adt/timestamp.c:4465
-#: utils/adt/timestamp.c:4475 utils/adt/timestamp.c:4560
-#: utils/adt/timestamp.c:4679 utils/adt/timestamp.c:4689
-#: utils/adt/timestamp.c:5005 utils/adt/timestamp.c:5019
-#: utils/adt/timestamp.c:5144 utils/adt/timestamp.c:5151
-#: utils/adt/timestamp.c:5177 utils/adt/timestamp.c:5181
-#: utils/adt/timestamp.c:5250 utils/adt/xml.c:2051 utils/adt/xml.c:2058
-#: utils/adt/xml.c:2078 utils/adt/xml.c:2085
+#: utils/adt/date.c:1652 utils/adt/date.c:2524 utils/adt/datetime.c:1690
+#: utils/adt/formatting.c:3397 utils/adt/formatting.c:3429
+#: utils/adt/formatting.c:3497 utils/adt/json.c:1534 utils/adt/json.c:1556
+#: utils/adt/jsonb.c:823 utils/adt/jsonb.c:847 utils/adt/nabstime.c:455
+#: utils/adt/nabstime.c:498 utils/adt/nabstime.c:528 utils/adt/nabstime.c:571
+#: utils/adt/timestamp.c:225 utils/adt/timestamp.c:268
+#: utils/adt/timestamp.c:717 utils/adt/timestamp.c:746
+#: utils/adt/timestamp.c:785 utils/adt/timestamp.c:3037
+#: utils/adt/timestamp.c:3058 utils/adt/timestamp.c:3071
+#: utils/adt/timestamp.c:3080 utils/adt/timestamp.c:3137
+#: utils/adt/timestamp.c:3160 utils/adt/timestamp.c:3173
+#: utils/adt/timestamp.c:3184 utils/adt/timestamp.c:3709
+#: utils/adt/timestamp.c:3838 utils/adt/timestamp.c:3879
+#: utils/adt/timestamp.c:3967 utils/adt/timestamp.c:4013
+#: utils/adt/timestamp.c:4124 utils/adt/timestamp.c:4448
+#: utils/adt/timestamp.c:4564 utils/adt/timestamp.c:4574
+#: utils/adt/timestamp.c:4659 utils/adt/timestamp.c:4778
+#: utils/adt/timestamp.c:4788 utils/adt/timestamp.c:5035
+#: utils/adt/timestamp.c:5049 utils/adt/timestamp.c:5140
+#: utils/adt/timestamp.c:5147 utils/adt/timestamp.c:5173
+#: utils/adt/timestamp.c:5177 utils/adt/timestamp.c:5246 utils/adt/xml.c:2055
+#: utils/adt/xml.c:2062 utils/adt/xml.c:2082 utils/adt/xml.c:2089
 #, c-format
 msgid "timestamp out of range"
 msgstr "timestamp вне диапазона"
@@ -18787,7 +18810,7 @@
 msgid "time out of range"
 msgstr "врем� вне диапазона"
 
-#: utils/adt/date.c:1264 utils/adt/timestamp.c:617
+#: utils/adt/date.c:1264 utils/adt/timestamp.c:618
 #, c-format
 msgid "time field value out of range: %d:%02d:%02g"
 msgstr "значение пол� типа time вне диапазона: %d:%02d:%02g"
@@ -18807,54 +18830,47 @@
 msgid "\"time with time zone\" units \"%s\" not recognized"
 msgstr "\"врем� � ча�овым по��ом\" �одержит нера�познанные единицы \"%s\""
 
-#: utils/adt/date.c:2744 utils/adt/datetime.c:925 utils/adt/datetime.c:1805
-#: utils/adt/datetime.c:4566 utils/adt/timestamp.c:531
-#: utils/adt/timestamp.c:558 utils/adt/timestamp.c:5031
-#: utils/adt/timestamp.c:5261
+#: utils/adt/date.c:2744 utils/adt/datetime.c:926 utils/adt/datetime.c:1848
+#: utils/adt/datetime.c:4609 utils/adt/timestamp.c:532
+#: utils/adt/timestamp.c:559 utils/adt/timestamp.c:5061
+#: utils/adt/timestamp.c:5257
 #, c-format
 msgid "time zone \"%s\" not recognized"
 msgstr "ча�овой по�� \"%s\" не ра�познан"
 
-#: utils/adt/date.c:2784 utils/adt/timestamp.c:5102 utils/adt/timestamp.c:5287
+#: utils/adt/date.c:2784 utils/adt/timestamp.c:5098 utils/adt/timestamp.c:5283
 #, c-format
 msgid "interval time zone \"%s\" must not include months or days"
 msgstr ""
 "интервал \"%s\", задающий ча�овой по��, не должен �одержать дней или ме��цев"
 
-#: utils/adt/datetime.c:1680
-#, c-format
-msgid "time zone abbreviation \"%s\" is not used in time zone \"%s\""
-msgstr ""
-"краткое обозначение ча�ового по��а \"%s\" от�ут�твует в данных ча�ового "
-"по��а \"%s\""
-
-#: utils/adt/datetime.c:3766 utils/adt/datetime.c:3773
+#: utils/adt/datetime.c:3809 utils/adt/datetime.c:3816
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "значение пол� типа date/time вне диапазона: \"%s\""
 
-#: utils/adt/datetime.c:3775
+#: utils/adt/datetime.c:3818
 #, c-format
 msgid "Perhaps you need a different \"datestyle\" setting."
 msgstr "Возможно, вам нужно изменить на�тройку \"datestyle\"."
 
-#: utils/adt/datetime.c:3780
+#: utils/adt/datetime.c:3823
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "значение пол� interval вне диапазона: \"%s\""
 
-#: utils/adt/datetime.c:3786
+#: utils/adt/datetime.c:3829
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "�мещение ча�ового по��а вне диапазона: \"%s\""
 
 #. translator: first %s is inet or cidr
-#: utils/adt/datetime.c:3793 utils/adt/network.c:58
+#: utils/adt/datetime.c:3836 utils/adt/network.c:58
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
 msgstr "неверный �интак�и� дл� типа %s: \"%s\""
 
-#: utils/adt/datetime.c:4568
+#: utils/adt/datetime.c:4611
 #, c-format
 msgid ""
 "This time zone name appears in the configuration file for time zone "
@@ -18873,7 +18889,7 @@
 msgid "could not open tablespace directory \"%s\": %m"
 msgstr "не удало�ь открыть каталог табличного про�тран�тва \"%s\": %m"
 
-#: utils/adt/domains.c:85
+#: utils/adt/domains.c:86
 #, c-format
 msgid "type %s is not a domain"
 msgstr "тип \"%s\" не �вл�ет�� доменом"
@@ -18952,83 +18968,83 @@
 msgid "value out of range: underflow"
 msgstr "значение вне диапазона: антипереполнение"
 
-#: utils/adt/float.c:218 utils/adt/float.c:292 utils/adt/float.c:316
+#: utils/adt/float.c:215 utils/adt/float.c:289 utils/adt/float.c:313
 #, c-format
 msgid "invalid input syntax for type real: \"%s\""
 msgstr "неверный �интак�и� дл� типа real: \"%s\""
 
-#: utils/adt/float.c:286
+#: utils/adt/float.c:283
 #, c-format
 msgid "\"%s\" is out of range for type real"
 msgstr "\"%s\" вне диапазона дл� типа real"
 
-#: utils/adt/float.c:417 utils/adt/float.c:491 utils/adt/float.c:515
-#: utils/adt/numeric.c:5373 utils/adt/numeric.c:5399
+#: utils/adt/float.c:414 utils/adt/float.c:488 utils/adt/float.c:512
+#: utils/adt/numeric.c:5376 utils/adt/numeric.c:5402
 #, c-format
 msgid "invalid input syntax for type double precision: \"%s\""
 msgstr "неверный �интак�и� дл� типа double precision: \"%s\""
 
-#: utils/adt/float.c:485
+#: utils/adt/float.c:482
 #, c-format
 msgid "\"%s\" is out of range for type double precision"
 msgstr "\"%s\" вне диапазона дл� типа double precision"
 
-#: utils/adt/float.c:1179 utils/adt/float.c:1237 utils/adt/int.c:349
+#: utils/adt/float.c:1176 utils/adt/float.c:1234 utils/adt/int.c:349
 #: utils/adt/int.c:775 utils/adt/int.c:804 utils/adt/int.c:825
 #: utils/adt/int.c:845 utils/adt/int.c:879 utils/adt/int.c:1174
-#: utils/adt/int8.c:1323 utils/adt/numeric.c:3000 utils/adt/numeric.c:3009
+#: utils/adt/int8.c:1323 utils/adt/numeric.c:2996 utils/adt/numeric.c:3005
 #, c-format
 msgid "smallint out of range"
 msgstr "smallint вне диапазона"
 
-#: utils/adt/float.c:1363 utils/adt/numeric.c:6599
+#: utils/adt/float.c:1360 utils/adt/numeric.c:6602
 #, c-format
 msgid "cannot take square root of a negative number"
 msgstr "извлечь квадратный корень отрицательного чи�ла нельз�"
 
-#: utils/adt/float.c:1405 utils/adt/numeric.c:2820
+#: utils/adt/float.c:1402 utils/adt/numeric.c:2816
 #, c-format
 msgid "zero raised to a negative power is undefined"
 msgstr "ноль в отрицательной �тепени даёт неопределённо�ть"
 
-#: utils/adt/float.c:1409 utils/adt/numeric.c:2826
+#: utils/adt/float.c:1406 utils/adt/numeric.c:2822
 #, c-format
 msgid "a negative number raised to a non-integer power yields a complex result"
 msgstr "отрицательное чи�ло в дробной �тепени даёт комплек�ный результат"
 
-#: utils/adt/float.c:1475 utils/adt/float.c:1505 utils/adt/numeric.c:6817
+#: utils/adt/float.c:1472 utils/adt/float.c:1502 utils/adt/numeric.c:6820
 #, c-format
 msgid "cannot take logarithm of zero"
 msgstr "вычи�лить логарифм нул� нельз�"
 
-#: utils/adt/float.c:1479 utils/adt/float.c:1509 utils/adt/numeric.c:6821
+#: utils/adt/float.c:1476 utils/adt/float.c:1506 utils/adt/numeric.c:6824
 #, c-format
 msgid "cannot take logarithm of a negative number"
 msgstr "вычи�лить логарифм отрицательного чи�ла нельз�"
 
-#: utils/adt/float.c:1536 utils/adt/float.c:1557 utils/adt/float.c:1578
-#: utils/adt/float.c:1600 utils/adt/float.c:1621 utils/adt/float.c:1642
-#: utils/adt/float.c:1664 utils/adt/float.c:1685
+#: utils/adt/float.c:1533 utils/adt/float.c:1554 utils/adt/float.c:1575
+#: utils/adt/float.c:1597 utils/adt/float.c:1618 utils/adt/float.c:1639
+#: utils/adt/float.c:1661 utils/adt/float.c:1682
 #, c-format
 msgid "input is out of range"
 msgstr "введённое значение вне диапазона"
 
-#: utils/adt/float.c:2747 utils/adt/numeric.c:1454
+#: utils/adt/float.c:2744 utils/adt/numeric.c:1450
 #, c-format
 msgid "count must be greater than zero"
 msgstr "�чётчик должен быть больше нул�"
 
-#: utils/adt/float.c:2752 utils/adt/numeric.c:1461
+#: utils/adt/float.c:2749 utils/adt/numeric.c:1457
 #, c-format
 msgid "operand, lower bound, and upper bound cannot be NaN"
 msgstr "операнд, нижн�� и верхн�� границы не могут быть NaN"
 
-#: utils/adt/float.c:2758
+#: utils/adt/float.c:2755
 #, c-format
 msgid "lower and upper bounds must be finite"
 msgstr "нижн�� и верхн�� границы должны быть конечными"
 
-#: utils/adt/float.c:2796 utils/adt/numeric.c:1474
+#: utils/adt/float.c:2793 utils/adt/numeric.c:1470
 #, c-format
 msgid "lower bound cannot equal upper bound"
 msgstr "нижн�� граница не может равн�ть�� верхней"
@@ -19043,110 +19059,110 @@
 msgid "Intervals are not tied to specific calendar dates."
 msgstr "Интервалы не прив�зывают�� к определённым календарным датам."
 
-#: utils/adt/formatting.c:1059
+#: utils/adt/formatting.c:1058
 #, c-format
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "\"EEEE\" может быть только по�ледним шаблоном"
 
-#: utils/adt/formatting.c:1067
+#: utils/adt/formatting.c:1066
 #, c-format
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "\"9\" должна �то�ть до \"PR\""
 
-#: utils/adt/formatting.c:1083
+#: utils/adt/formatting.c:1082
 #, c-format
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "\"0\" должен �то�ть до \"PR\""
 
-#: utils/adt/formatting.c:1110
+#: utils/adt/formatting.c:1109
 #, c-format
 msgid "multiple decimal points"
 msgstr "многочи�ленные де��тичные точки"
 
-#: utils/adt/formatting.c:1114 utils/adt/formatting.c:1197
+#: utils/adt/formatting.c:1113 utils/adt/formatting.c:1196
 #, c-format
 msgid "cannot use \"V\" and decimal point together"
 msgstr "нельз� и�пользовать \"V\" вме�те � де��тичной точкой"
 
-#: utils/adt/formatting.c:1126
+#: utils/adt/formatting.c:1125
 #, c-format
 msgid "cannot use \"S\" twice"
 msgstr "нельз� и�пользовать \"S\" дважды"
 
-#: utils/adt/formatting.c:1130
+#: utils/adt/formatting.c:1129
 #, c-format
 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
 msgstr "нельз� и�пользовать \"S\" вме�те � \"PL\"/\"MI\"/\"SG\"/\"PR\""
 
-#: utils/adt/formatting.c:1150
+#: utils/adt/formatting.c:1149
 #, c-format
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "нельз� и�пользовать \"S\" вме�те � \"MI\""
 
-#: utils/adt/formatting.c:1160
+#: utils/adt/formatting.c:1159
 #, c-format
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "нельз� и�пользовать \"S\" вме�те � \"PL\""
 
-#: utils/adt/formatting.c:1170
+#: utils/adt/formatting.c:1169
 #, c-format
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "нельз� и�пользовать \"S\" вме�те � \"SG\""
 
-#: utils/adt/formatting.c:1179
+#: utils/adt/formatting.c:1178
 #, c-format
 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
 msgstr "нельз� и�пользовать \"PR\" вме�те � \"S\"/\"PL\"/\"MI\"/\"SG\""
 
-#: utils/adt/formatting.c:1205
+#: utils/adt/formatting.c:1204
 #, c-format
 msgid "cannot use \"EEEE\" twice"
 msgstr "нельз� и�пользовать \"EEEE\" дважды"
 
-#: utils/adt/formatting.c:1211
+#: utils/adt/formatting.c:1210
 #, c-format
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "\"EEEE\" не�овме�тим � другими форматами"
 
-#: utils/adt/formatting.c:1212
+#: utils/adt/formatting.c:1211
 #, c-format
 msgid ""
 "\"EEEE\" may only be used together with digit and decimal point patterns."
 msgstr ""
 "\"EEEE\" может и�пользовать�� только � шаблонами цифр и де��тичной точки."
 
-#: utils/adt/formatting.c:1412
+#: utils/adt/formatting.c:1411
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "\"%s\" не �вл�ет�� чи�лом"
 
-#: utils/adt/formatting.c:1513 utils/adt/formatting.c:1565
+#: utils/adt/formatting.c:1512 utils/adt/formatting.c:1564
 #, c-format
 msgid "could not determine which collation to use for lower() function"
 msgstr ""
 "не удало�ь определить, какое правило �ортировки и�пользовать дл� функции "
 "lower()"
 
-#: utils/adt/formatting.c:1633 utils/adt/formatting.c:1685
+#: utils/adt/formatting.c:1632 utils/adt/formatting.c:1684
 #, c-format
 msgid "could not determine which collation to use for upper() function"
 msgstr ""
 "не удало�ь определить, какое правило �ортировки и�пользовать дл� функции "
 "upper()"
 
-#: utils/adt/formatting.c:1754 utils/adt/formatting.c:1818
+#: utils/adt/formatting.c:1753 utils/adt/formatting.c:1817
 #, c-format
 msgid "could not determine which collation to use for initcap() function"
 msgstr ""
 "не удало�ь определить, какое правило �ортировки и�пользовать дл� функции "
 "initcap()"
 
-#: utils/adt/formatting.c:2122
+#: utils/adt/formatting.c:2114
 #, c-format
 msgid "invalid combination of date conventions"
 msgstr "неверное �очетание �тилей дат"
 
-#: utils/adt/formatting.c:2123
+#: utils/adt/formatting.c:2115
 #, c-format
 msgid ""
 "Do not mix Gregorian and ISO week date conventions in a formatting template."
@@ -19154,27 +19170,27 @@
 "�е �мешивайте Григориан�кий �тиль дат (недель) � ISO в одном шаблоне "
 "форматировани�."
 
-#: utils/adt/formatting.c:2140
+#: utils/adt/formatting.c:2132
 #, c-format
 msgid "conflicting values for \"%s\" field in formatting string"
 msgstr "конфликтующие значени� пол� \"%s\" в �троке форматировани�"
 
-#: utils/adt/formatting.c:2142
+#: utils/adt/formatting.c:2134
 #, c-format
 msgid "This value contradicts a previous setting for the same field type."
 msgstr "Это значение противоречит предыдущему значению пол� того же типа."
 
-#: utils/adt/formatting.c:2203
+#: utils/adt/formatting.c:2195
 #, c-format
 msgid "source string too short for \"%s\" formatting field"
 msgstr "входна� �трока короче, чем требует поле форматировани� \"%s\""
 
-#: utils/adt/formatting.c:2205
+#: utils/adt/formatting.c:2197
 #, c-format
 msgid "Field requires %d characters, but only %d remain."
 msgstr "Требует�� �имволов: %d, а о�тало�ь только %d."
 
-#: utils/adt/formatting.c:2208 utils/adt/formatting.c:2222
+#: utils/adt/formatting.c:2200 utils/adt/formatting.c:2214
 #, c-format
 msgid ""
 "If your source string is not fixed-width, try using the \"FM\" modifier."
@@ -19182,80 +19198,80 @@
 "Е�ли входна� �трока имеет переменную длину, попробуйте и�пользовать "
 "модификатор \"FM\"."
 
-#: utils/adt/formatting.c:2218 utils/adt/formatting.c:2231
-#: utils/adt/formatting.c:2361
+#: utils/adt/formatting.c:2210 utils/adt/formatting.c:2223
+#: utils/adt/formatting.c:2353
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "неверное значение \"%s\" дл� \"%s\""
 
-#: utils/adt/formatting.c:2220
+#: utils/adt/formatting.c:2212
 #, c-format
 msgid "Field requires %d characters, but only %d could be parsed."
 msgstr "Поле должно поглотить �имволов: %d, но удало�ь разобрать только %d."
 
-#: utils/adt/formatting.c:2233
+#: utils/adt/formatting.c:2225
 #, c-format
 msgid "Value must be an integer."
 msgstr "Значение должно быть целым чи�лом."
 
-#: utils/adt/formatting.c:2238
+#: utils/adt/formatting.c:2230
 #, c-format
 msgid "value for \"%s\" in source string is out of range"
 msgstr "значение \"%s\" во входной �троке вне диапазона"
 
-#: utils/adt/formatting.c:2240
+#: utils/adt/formatting.c:2232
 #, c-format
 msgid "Value must be in the range %d to %d."
 msgstr "Значение должно быть в интервале %d..%d."
 
-#: utils/adt/formatting.c:2363
+#: utils/adt/formatting.c:2355
 #, c-format
 msgid "The given value did not match any of the allowed values for this field."
 msgstr ""
 "Данное значение не �оответ�твует ни одному из допу�тимых значений дл� �того "
 "пол�."
 
-#: utils/adt/formatting.c:2551 utils/adt/formatting.c:2571
-#: utils/adt/formatting.c:2591 utils/adt/formatting.c:2611
-#: utils/adt/formatting.c:2630 utils/adt/formatting.c:2649
-#: utils/adt/formatting.c:2672 utils/adt/formatting.c:2690
-#: utils/adt/formatting.c:2708 utils/adt/formatting.c:2726
-#: utils/adt/formatting.c:2743 utils/adt/formatting.c:2760
+#: utils/adt/formatting.c:2547 utils/adt/formatting.c:2567
+#: utils/adt/formatting.c:2587 utils/adt/formatting.c:2607
+#: utils/adt/formatting.c:2626 utils/adt/formatting.c:2645
+#: utils/adt/formatting.c:2668 utils/adt/formatting.c:2686
+#: utils/adt/formatting.c:2704 utils/adt/formatting.c:2722
+#: utils/adt/formatting.c:2739 utils/adt/formatting.c:2756
 #, c-format
 msgid "localized string format value too long"
 msgstr "�лишком длинное значение формата локализованной �троки"
 
-#: utils/adt/formatting.c:3044
+#: utils/adt/formatting.c:3040
 #, c-format
 msgid "\"TZ\"/\"tz\"/\"OF\" format patterns are not supported in to_date"
 msgstr "шаблоны формата \"TZ\"/\"tz\"/\"OF\" не поддерживают�� в to_date"
 
-#: utils/adt/formatting.c:3152
+#: utils/adt/formatting.c:3149
 #, c-format
 msgid "invalid input string for \"Y,YYY\""
 msgstr "ошибка �интак�и�а в значении дл� шаблона \"Y,YYY\""
 
-#: utils/adt/formatting.c:3655
+#: utils/adt/formatting.c:3653
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
 msgstr "ча� \"%d\" не �оответ�твует 12-ча�овому формату времени"
 
-#: utils/adt/formatting.c:3657
+#: utils/adt/formatting.c:3655
 #, c-format
 msgid "Use the 24-hour clock, or give an hour between 1 and 12."
 msgstr "И�пользуйте 24-ча�овой формат или передавайте ча�ы от 1 до 12."
 
-#: utils/adt/formatting.c:3752
+#: utils/adt/formatting.c:3750
 #, c-format
 msgid "cannot calculate day of year without year information"
 msgstr "нельз� ра��читать день года без информации о годе"
 
-#: utils/adt/formatting.c:4601
+#: utils/adt/formatting.c:4599
 #, c-format
 msgid "\"EEEE\" not supported for input"
 msgstr "\"EEEE\" не поддерживает�� при вводе"
 
-#: utils/adt/formatting.c:4613
+#: utils/adt/formatting.c:4611
 #, c-format
 msgid "\"RN\" not supported for input"
 msgstr "\"RN\" не поддерживает�� при вводе"
@@ -19302,8 +19318,8 @@
 msgid "must be superuser to get directory listings"
 msgstr "читать �одержимое каталогов может только �уперпользователь"
 
-#: utils/adt/geo_ops.c:301 utils/adt/geo_ops.c:1400 utils/adt/geo_ops.c:3498
-#: utils/adt/geo_ops.c:4315 utils/adt/geo_ops.c:5259
+#: utils/adt/geo_ops.c:301 utils/adt/geo_ops.c:1400 utils/adt/geo_ops.c:3506
+#: utils/adt/geo_ops.c:4323 utils/adt/geo_ops.c:5267
 #, c-format
 msgid "too many points requested"
 msgstr "запрошено �лишком много точек"
@@ -19358,73 +19374,73 @@
 msgid "function \"dist_lb\" not implemented"
 msgstr "функци� \"dist_lb\" не реализована"
 
-#: utils/adt/geo_ops.c:3073
+#: utils/adt/geo_ops.c:3081
 #, c-format
 msgid "function \"close_sl\" not implemented"
 msgstr "функци� \"close_sl\" не реализована"
 
-#: utils/adt/geo_ops.c:3175
+#: utils/adt/geo_ops.c:3183
 #, c-format
 msgid "function \"close_lb\" not implemented"
 msgstr "функци� \"close_lb\" не реализована"
 
-#: utils/adt/geo_ops.c:3464
+#: utils/adt/geo_ops.c:3472
 #, c-format
 msgid "cannot create bounding box for empty polygon"
 msgstr "по�троить окружающий пр�моугольник дл� пу�того многоугольника нельз�"
 
-#: utils/adt/geo_ops.c:3489 utils/adt/geo_ops.c:3509
+#: utils/adt/geo_ops.c:3497 utils/adt/geo_ops.c:3517
 #, c-format
 msgid "invalid input syntax for type polygon: \"%s\""
 msgstr "неверный �интак�и� дл� типа polygon: \"%s\""
 
-#: utils/adt/geo_ops.c:3549
+#: utils/adt/geo_ops.c:3557
 #, c-format
 msgid "invalid number of points in external \"polygon\" value"
 msgstr "недопу�тимое чи�ло точек во внешнем пред�тавлении типа \"polygon\""
 
-#: utils/adt/geo_ops.c:4074
+#: utils/adt/geo_ops.c:4082
 #, c-format
 msgid "function \"poly_distance\" not implemented"
 msgstr "функци� \"poly_distance\" не реализована"
 
-#: utils/adt/geo_ops.c:4427
+#: utils/adt/geo_ops.c:4435
 #, c-format
 msgid "function \"path_center\" not implemented"
 msgstr "функци� \"path_center\" не реализована"
 
-#: utils/adt/geo_ops.c:4444
+#: utils/adt/geo_ops.c:4452
 #, c-format
 msgid "open path cannot be converted to polygon"
 msgstr "открытый путь нельз� преобразовать во многоугольник"
 
-#: utils/adt/geo_ops.c:4621 utils/adt/geo_ops.c:4631 utils/adt/geo_ops.c:4646
-#: utils/adt/geo_ops.c:4652
+#: utils/adt/geo_ops.c:4629 utils/adt/geo_ops.c:4639 utils/adt/geo_ops.c:4654
+#: utils/adt/geo_ops.c:4660
 #, c-format
 msgid "invalid input syntax for type circle: \"%s\""
 msgstr "неверный �интак�и� дл� типа circle: \"%s\""
 
-#: utils/adt/geo_ops.c:4674 utils/adt/geo_ops.c:4682
+#: utils/adt/geo_ops.c:4682 utils/adt/geo_ops.c:4690
 #, c-format
 msgid "could not format \"circle\" value"
 msgstr "не удало�ь отформатировать значение \"circle\""
 
-#: utils/adt/geo_ops.c:4709
+#: utils/adt/geo_ops.c:4717
 #, c-format
 msgid "invalid radius in external \"circle\" value"
 msgstr "недопу�тимый радиу� во внешнем пред�тавлении типа \"circle\""
 
-#: utils/adt/geo_ops.c:5245
+#: utils/adt/geo_ops.c:5253
 #, c-format
 msgid "cannot convert circle with radius zero to polygon"
 msgstr "круг � нулевым радиу�ом нельз� преобразовать в многоугольник"
 
-#: utils/adt/geo_ops.c:5250
+#: utils/adt/geo_ops.c:5258
 #, c-format
 msgid "must request at least 2 points"
 msgstr "точек должно быть минимум 2"
 
-#: utils/adt/geo_ops.c:5294
+#: utils/adt/geo_ops.c:5302
 #, c-format
 msgid "cannot convert empty polygon to circle"
 msgstr "пу�той многоугольник нельз� преобразовать в круг"
@@ -19444,8 +19460,8 @@
 msgid "oidvector has too many elements"
 msgstr "oidvector �одержит �лишком много �лементов"
 
-#: utils/adt/int.c:1362 utils/adt/int8.c:1460 utils/adt/numeric.c:1362
-#: utils/adt/timestamp.c:5348 utils/adt/timestamp.c:5429
+#: utils/adt/int.c:1362 utils/adt/int8.c:1460 utils/adt/numeric.c:1358
+#: utils/adt/timestamp.c:5344 utils/adt/timestamp.c:5425
 #, c-format
 msgid "step size cannot equal zero"
 msgstr "размер шага не может быть нулевым"
@@ -19469,8 +19485,8 @@
 #: utils/adt/int8.c:964 utils/adt/int8.c:991 utils/adt/int8.c:1031
 #: utils/adt/int8.c:1052 utils/adt/int8.c:1079 utils/adt/int8.c:1112
 #: utils/adt/int8.c:1140 utils/adt/int8.c:1161 utils/adt/int8.c:1188
-#: utils/adt/int8.c:1361 utils/adt/int8.c:1400 utils/adt/numeric.c:2955
-#: utils/adt/varbit.c:1645
+#: utils/adt/int8.c:1361 utils/adt/int8.c:1400 utils/adt/numeric.c:2951
+#: utils/adt/varbit.c:1655
 #, c-format
 msgid "bigint out of range"
 msgstr "bigint вне диапазона"
@@ -19608,7 +19624,7 @@
 msgid "could not determine data type for argument 2"
 msgstr "не удало�ь определить тип данных аргумента 2"
 
-#: utils/adt/json.c:2040 utils/adt/jsonb.c:1780
+#: utils/adt/json.c:2040 utils/adt/jsonb.c:1781
 #, c-format
 msgid "field name must not be null"
 msgstr "им� пол� не может быть NULL"
@@ -19685,7 +19701,7 @@
 msgid "argument %d: could not determine data type"
 msgstr "аргумент %d: не удало�ь определить тип данных"
 
-#: utils/adt/jsonb.c:1833
+#: utils/adt/jsonb.c:1834
 #, c-format
 msgid "object keys must be strings"
 msgstr "ключи объектов должны быть �троковыми"
@@ -19820,12 +19836,23 @@
 msgid "invalid concatenation of jsonb objects"
 msgstr "неверна� конкатенаци� объектов jsonb"
 
+#: utils/adt/jsonfuncs.c:3732
+#, c-format
+msgid "path element at position %d is null"
+msgstr "�лемент пути в позиции %d равен NULL"
+
+#: utils/adt/jsonfuncs.c:3888
+#, c-format
+msgid "path element at position %d is not an integer: \"%s\""
+msgstr "�лемент пути в позиции %d - не целочи�ленный: \"%s\""
+
+# well-spelled: �имв
 #: utils/adt/levenshtein.c:133
 #, c-format
 msgid "levenshtein argument exceeds maximum length of %d characters"
 msgstr "длина аргумента levenshtein() превышает мак�имум (%d �имв.)"
 
-#: utils/adt/like.c:212 utils/adt/selfuncs.c:5275
+#: utils/adt/like.c:212 utils/adt/selfuncs.c:5379
 #, c-format
 msgid "could not determine which collation to use for ILIKE"
 msgstr "не удало�ь определить, какой пор�док �ортировки и�пользовать дл� ILIKE"
@@ -20032,88 +20059,84 @@
 msgid "cannot subtract inet values of different sizes"
 msgstr "нельз� вычитать значени� inet разного размера"
 
-#: utils/adt/numeric.c:549 utils/adt/numeric.c:576 utils/adt/numeric.c:4604
-#: utils/adt/numeric.c:4627 utils/adt/numeric.c:4651 utils/adt/numeric.c:4658
+#: utils/adt/numeric.c:549 utils/adt/numeric.c:576 utils/adt/numeric.c:4600
+#: utils/adt/numeric.c:4623 utils/adt/numeric.c:4647
 #, c-format
 msgid "invalid input syntax for type numeric: \"%s\""
 msgstr "неверный �интак�и� дл� типа numeric: \"%s\""
 
-#: utils/adt/numeric.c:766
-#, c-format
-msgid "invalid length in external \"numeric\" value"
-msgstr "неверна� длина во внешнем значении \"numeric\""
-
-#: utils/adt/numeric.c:779
+#: utils/adt/numeric.c:775
 #, c-format
 msgid "invalid sign in external \"numeric\" value"
 msgstr "неверный знак во внешнем значении \"numeric\""
 
-#: utils/adt/numeric.c:785
+#: utils/adt/numeric.c:781
 #, c-format
 msgid "invalid scale in external \"numeric\" value"
 msgstr "неверный пор�док чи�ла во внешнем значении \"numeric\""
 
-#: utils/adt/numeric.c:794
+#: utils/adt/numeric.c:790
 #, c-format
 msgid "invalid digit in external \"numeric\" value"
 msgstr "неверна� цифра во внешнем значении \"numeric\""
 
-#: utils/adt/numeric.c:985 utils/adt/numeric.c:999
+#: utils/adt/numeric.c:981 utils/adt/numeric.c:995
 #, c-format
 msgid "NUMERIC precision %d must be between 1 and %d"
 msgstr "точно�ть NUMERIC %d должна быть между 1 и %d"
 
-#: utils/adt/numeric.c:990
+#: utils/adt/numeric.c:986
 #, c-format
 msgid "NUMERIC scale %d must be between 0 and precision %d"
 msgstr "пор�док NUMERIC %d должен быть между 0 и точно�тью (%d)"
 
-#: utils/adt/numeric.c:1008
+#: utils/adt/numeric.c:1004
 #, c-format
 msgid "invalid NUMERIC type modifier"
 msgstr "неверный модификатор типа NUMERIC"
 
-#: utils/adt/numeric.c:1340
+#: utils/adt/numeric.c:1336
 #, c-format
 msgid "start value cannot be NaN"
 msgstr "начальное значение не может быть NaN"
 
-#: utils/adt/numeric.c:1345
+#: utils/adt/numeric.c:1341
 #, c-format
 msgid "stop value cannot be NaN"
 msgstr "конечное значение не может быть NaN"
 
-#: utils/adt/numeric.c:1355
+#: utils/adt/numeric.c:1351
 #, c-format
 msgid "step size cannot be NaN"
 msgstr "размер шага не может быть NaN"
 
-#: utils/adt/numeric.c:2550 utils/adt/numeric.c:5104 utils/adt/numeric.c:7132
+#: utils/adt/numeric.c:2546 utils/adt/numeric.c:4662 utils/adt/numeric.c:5107
+#: utils/adt/numeric.c:7135
 #, c-format
 msgid "value overflows numeric format"
 msgstr "значение переполн�ет формат numeric"
 
-#: utils/adt/numeric.c:2881
+#: utils/adt/numeric.c:2877
 #, c-format
 msgid "cannot convert NaN to integer"
 msgstr "нельз� преобразовать NaN в integer"
 
-#: utils/adt/numeric.c:2947
+#: utils/adt/numeric.c:2943
 #, c-format
 msgid "cannot convert NaN to bigint"
 msgstr "нельз� преобразовать NaN в bigint"
 
-#: utils/adt/numeric.c:2992
+#: utils/adt/numeric.c:2988
 #, c-format
 msgid "cannot convert NaN to smallint"
 msgstr "нельз� преобразовать NaN в smallint"
 
-#: utils/adt/numeric.c:5174
+#: utils/adt/numeric.c:5177
 #, c-format
 msgid "numeric field overflow"
 msgstr "переполнение пол� numeric"
 
-#: utils/adt/numeric.c:5175
+#: utils/adt/numeric.c:5178
 #, c-format
 msgid ""
 "A field with precision %d, scale %d must round to an absolute value less "
@@ -20122,7 +20145,7 @@
 "Поле � точно�тью %d, пор�дком %d должно округл�ть�� до аб�олютного значени� "
 "меньше чем %s%d."
 
-#: utils/adt/numeric.c:6689
+#: utils/adt/numeric.c:6692
 #, c-format
 msgid "argument for function \"exp\" too big"
 msgstr "аргумент функции \"exp\" �лишком велик"
@@ -20183,24 +20206,24 @@
 msgid "percentile value %g is not between 0 and 1"
 msgstr "значение перцентил� %g лежит не в диапазоне 0..1"
 
-#: utils/adt/pg_locale.c:911
+#: utils/adt/pg_locale.c:1029
 #, c-format
 msgid "Apply system library package updates."
 msgstr "Обновите пакет � �и�темной библиотекой."
 
-#: utils/adt/pg_locale.c:1116
+#: utils/adt/pg_locale.c:1234
 #, c-format
 msgid "could not create locale \"%s\": %m"
 msgstr "не удало�ь �оздать локаль \"%s\": %m"
 
-#: utils/adt/pg_locale.c:1119
+#: utils/adt/pg_locale.c:1237
 #, c-format
 msgid ""
 "The operating system could not find any locale data for the locale name \"%s"
 "\"."
 msgstr "Операционна� �и�тема не может найти данные локали � именем \"%s\"."
 
-#: utils/adt/pg_locale.c:1206
+#: utils/adt/pg_locale.c:1324
 #, c-format
 msgid ""
 "collations with different collate and ctype values are not supported on this "
@@ -20209,17 +20232,17 @@
 "правила �ортировки � разными значени�ми collate и ctype не поддерживают�� на "
 "�той платформе"
 
-#: utils/adt/pg_locale.c:1221
+#: utils/adt/pg_locale.c:1339
 #, c-format
 msgid "nondefault collations are not supported on this platform"
 msgstr "на �той платформе поддерживают�� только �тандартные правила �ортировки"
 
-#: utils/adt/pg_locale.c:1392
+#: utils/adt/pg_locale.c:1510
 #, c-format
 msgid "invalid multibyte character for locale"
 msgstr "неверный многобайтный �имвол дл� локали"
 
-#: utils/adt/pg_locale.c:1393
+#: utils/adt/pg_locale.c:1511
 #, c-format
 msgid ""
 "The server's LC_CTYPE locale is probably incompatible with the database "
@@ -20439,11 +20462,13 @@
 msgid "Junk after right parenthesis or bracket."
 msgstr "Му�ор по�ле правой �кобки."
 
-#: utils/adt/regexp.c:285 utils/adt/regexp.c:1288 utils/adt/varlena.c:3588
+#: utils/adt/regexp.c:285 utils/adt/regexp.c:1288 utils/adt/varlena.c:3601
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "ошибка в регул�рном выражении: %s"
 
+# skip-rule: capital-letter-first
+# well-spelled: рег
 #: utils/adt/regexp.c:422
 #, c-format
 msgid "invalid regexp option: \"%c\""
@@ -20454,110 +20479,109 @@
 msgid "regexp_split does not support the global option"
 msgstr "regexp_split не поддерживает глобальный пои�к"
 
-#: utils/adt/regproc.c:128 utils/adt/regproc.c:148
+#: utils/adt/regproc.c:129 utils/adt/regproc.c:149
 #, c-format
 msgid "more than one function named \"%s\""
 msgstr "им� \"%s\" имеют не�колько функций"
 
-#: utils/adt/regproc.c:587 utils/adt/regproc.c:607
+#: utils/adt/regproc.c:588 utils/adt/regproc.c:608
 #, c-format
 msgid "more than one operator named %s"
 msgstr "им� %s имеют не�колько операторов"
 
-#: utils/adt/regproc.c:774 utils/adt/regproc.c:815 gram.y:7246
+#: utils/adt/regproc.c:775 utils/adt/regproc.c:816 gram.y:7246
 #, c-format
 msgid "missing argument"
 msgstr "от�ут�твует аргумент"
 
-#: utils/adt/regproc.c:775 utils/adt/regproc.c:816 gram.y:7247
+#: utils/adt/regproc.c:776 utils/adt/regproc.c:817 gram.y:7247
 #, c-format
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr ""
 "Чтобы обозначить от�ут�твующий аргумент унарного оператора, укажите NONE."
 
-#: utils/adt/regproc.c:779 utils/adt/regproc.c:820 utils/adt/regproc.c:2006
-#: utils/adt/ruleutils.c:8167 utils/adt/ruleutils.c:8292
+#: utils/adt/regproc.c:780 utils/adt/regproc.c:821 utils/adt/regproc.c:2007
+#: utils/adt/ruleutils.c:8222 utils/adt/ruleutils.c:8347
 #, c-format
 msgid "too many arguments"
 msgstr "�лишком много аргументов"
 
-#: utils/adt/regproc.c:780 utils/adt/regproc.c:821
+#: utils/adt/regproc.c:781 utils/adt/regproc.c:822
 #, c-format
 msgid "Provide two argument types for operator."
 msgstr "Предо�тавьте дл� оператора два типа аргументов."
 
-#: utils/adt/regproc.c:1594 utils/adt/regproc.c:1618 utils/adt/regproc.c:1715
-#: utils/adt/regproc.c:1739 utils/adt/regproc.c:1841 utils/adt/regproc.c:1846
-#: utils/adt/varlena.c:2859 utils/adt/varlena.c:2864
+#: utils/adt/regproc.c:1595 utils/adt/regproc.c:1619 utils/adt/regproc.c:1716
+#: utils/adt/regproc.c:1740 utils/adt/regproc.c:1842 utils/adt/regproc.c:1847
+#: utils/adt/varlena.c:2872 utils/adt/varlena.c:2877
 #, c-format
 msgid "invalid name syntax"
 msgstr "ошибка �интак�и�а в имени"
 
-#: utils/adt/regproc.c:1904
+#: utils/adt/regproc.c:1905
 #, c-format
 msgid "expected a left parenthesis"
 msgstr "ожидала�ь лева� �кобка"
 
-#: utils/adt/regproc.c:1920
+#: utils/adt/regproc.c:1921
 #, c-format
 msgid "expected a right parenthesis"
 msgstr "ожидала�ь права� �кобка"
 
-#: utils/adt/regproc.c:1939
+#: utils/adt/regproc.c:1940
 #, c-format
 msgid "expected a type name"
 msgstr "ожидало�ь им� типа"
 
-#: utils/adt/regproc.c:1971
+#: utils/adt/regproc.c:1972
 #, c-format
 msgid "improper type name"
 msgstr "ошибочное им� типа"
 
-#: utils/adt/ri_triggers.c:316 utils/adt/ri_triggers.c:373
-#: utils/adt/ri_triggers.c:792 utils/adt/ri_triggers.c:1015
-#: utils/adt/ri_triggers.c:1171 utils/adt/ri_triggers.c:1352
-#: utils/adt/ri_triggers.c:1517 utils/adt/ri_triggers.c:1693
-#: utils/adt/ri_triggers.c:1873 utils/adt/ri_triggers.c:2064
-#: utils/adt/ri_triggers.c:2122 utils/adt/ri_triggers.c:2227
-#: utils/adt/ri_triggers.c:2404 gram.y:3325
+#: utils/adt/ri_triggers.c:314 utils/adt/ri_triggers.c:371
+#: utils/adt/ri_triggers.c:790 utils/adt/ri_triggers.c:1013
+#: utils/adt/ri_triggers.c:1169 utils/adt/ri_triggers.c:1350
+#: utils/adt/ri_triggers.c:1515 utils/adt/ri_triggers.c:1691
+#: utils/adt/ri_triggers.c:1871 utils/adt/ri_triggers.c:2062
+#: utils/adt/ri_triggers.c:2120 utils/adt/ri_triggers.c:2225
+#: utils/adt/ri_triggers.c:2402 gram.y:3325
 #, c-format
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "выражение MATCH PARTIAL ещё не реализовано"
 
-#: utils/adt/ri_triggers.c:345 utils/adt/ri_triggers.c:2492
-#: utils/adt/ri_triggers.c:3317
+#: utils/adt/ri_triggers.c:343 utils/adt/ri_triggers.c:2490
+#: utils/adt/ri_triggers.c:3315
 #, c-format
 msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
 msgstr ""
-"INSERT или UPDATE в таблице \"%s\" нарушает ограничение внешнего ключа \"%s"
-"\" "
+"INSERT или UPDATE в таблице \"%s\" нарушает ограничение внешнего ключа \"%s\""
 
-#: utils/adt/ri_triggers.c:348 utils/adt/ri_triggers.c:2495
+#: utils/adt/ri_triggers.c:346 utils/adt/ri_triggers.c:2493
 #, c-format
 msgid "MATCH FULL does not allow mixing of null and nonnull key values."
 msgstr "MATCH FULL не позвол�ет �мешивать в значении ключа null и не null."
 
-#: utils/adt/ri_triggers.c:2734
+#: utils/adt/ri_triggers.c:2732
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr "функци� \"%s\" должна запу�кать�� дл� INSERT"
 
-#: utils/adt/ri_triggers.c:2740
+#: utils/adt/ri_triggers.c:2738
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr "функци� \"%s\" должна запу�кать�� дл� UPDATE"
 
-#: utils/adt/ri_triggers.c:2746
+#: utils/adt/ri_triggers.c:2744
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr "функци� \"%s\" должна запу�кать�� дл� DELETE"
 
-#: utils/adt/ri_triggers.c:2769
+#: utils/adt/ri_triggers.c:2767
 #, c-format
 msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
 msgstr "дл� триггера \"%s\" таблицы \"%s\" нет запи�и pg_constraint"
 
-#: utils/adt/ri_triggers.c:2771
+#: utils/adt/ri_triggers.c:2769
 #, c-format
 msgid ""
 "Remove this referential integrity trigger and its mates, then do ALTER TABLE "
@@ -20566,7 +20590,7 @@
 "Удалите �тот триггер ��ылочной цело�тно�ти и �в�занные объекты, а затем "
 "выполните ALTER TABLE ADD CONSTRAINT."
 
-#: utils/adt/ri_triggers.c:3227
+#: utils/adt/ri_triggers.c:3225
 #, c-format
 msgid ""
 "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
@@ -20575,22 +20599,22 @@
 "неожиданный результат запро�а ��ылочной цело�тно�ти к \"%s\" из ограничени� "
 "\"%s\" таблицы \"%s\""
 
-#: utils/adt/ri_triggers.c:3231
+#: utils/adt/ri_triggers.c:3229
 #, c-format
 msgid "This is most likely due to a rule having rewritten the query."
 msgstr "Скорее в�его �то вызвано правилом, перепи�авшим запро�."
 
-#: utils/adt/ri_triggers.c:3321
+#: utils/adt/ri_triggers.c:3319
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr "Ключ (%s)=(%s) от�ут�твует в таблице \"%s\"."
 
-#: utils/adt/ri_triggers.c:3324
+#: utils/adt/ri_triggers.c:3322
 #, c-format
 msgid "Key is not present in table \"%s\"."
 msgstr "Ключ от�ут�твует в таблице \"%s\"."
 
-#: utils/adt/ri_triggers.c:3330
+#: utils/adt/ri_triggers.c:3328
 #, c-format
 msgid ""
 "update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
@@ -20599,12 +20623,12 @@
 "UPDATE или DELETE в таблице \"%s\" нарушает ограничение внешнего ключа \"%s"
 "\" таблицы \"%s\""
 
-#: utils/adt/ri_triggers.c:3335
+#: utils/adt/ri_triggers.c:3333
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr "�а ключ (%s)=(%s) в�ё ещё е�ть ��ылки в таблице \"%s\"."
 
-#: utils/adt/ri_triggers.c:3338
+#: utils/adt/ri_triggers.c:3336
 #, c-format
 msgid "Key is still referenced from table \"%s\"."
 msgstr "�а ключ в�ё ещё е�ть ��ылки в таблице \"%s\"."
@@ -20655,151 +20679,151 @@
 msgid "improper binary format in record column %d"
 msgstr "неподход�щий двоичный формат в �толбце запи�и %d"
 
-#: utils/adt/rowtypes.c:902 utils/adt/rowtypes.c:1142
-#: utils/adt/rowtypes.c:1396 utils/adt/rowtypes.c:1673
+#: utils/adt/rowtypes.c:902 utils/adt/rowtypes.c:1142 utils/adt/rowtypes.c:1396
+#: utils/adt/rowtypes.c:1673
 #, c-format
 msgid "cannot compare dissimilar column types %s and %s at record column %d"
 msgstr "не удало�ь �равнить различные типы �толбцов %s и %s, �толбец запи�и %d"
 
-#: utils/adt/rowtypes.c:991 utils/adt/rowtypes.c:1213
-#: utils/adt/rowtypes.c:1529 utils/adt/rowtypes.c:1769
+#: utils/adt/rowtypes.c:991 utils/adt/rowtypes.c:1213 utils/adt/rowtypes.c:1529
+#: utils/adt/rowtypes.c:1769
 #, c-format
 msgid "cannot compare record types with different numbers of columns"
 msgstr "�равнивать типы запи�ей � разным чи�лом �толбцов нельз�"
 
-#: utils/adt/ruleutils.c:4147
+#: utils/adt/ruleutils.c:4150
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "правило \"%s\" имеет неподдерживаемый тип �обытий %d"
 
-#: utils/adt/selfuncs.c:5260
+#: utils/adt/selfuncs.c:5364
 #, c-format
 msgid "case insensitive matching not supported on type bytea"
-msgstr "реги�тро-незави�имое �равнение не поддерживает�� дл� типа bytea"
+msgstr "реги�тронезави�имое �равнение не поддерживает�� дл� типа bytea"
 
-#: utils/adt/selfuncs.c:5363
+#: utils/adt/selfuncs.c:5467
 #, c-format
 msgid "regular-expression matching not supported on type bytea"
-msgstr "�равнение � регул�рными выражени�ми не поддерживает�� дл� типа bytea "
+msgstr "�равнение � регул�рными выражени�ми не поддерживает�� дл� типа bytea"
 
 #: utils/adt/tid.c:71 utils/adt/tid.c:79 utils/adt/tid.c:87
 #, c-format
 msgid "invalid input syntax for type tid: \"%s\""
 msgstr "неверный �интак�и� дл� типа tid: \"%s\""
 
-#: utils/adt/timestamp.c:99
+#: utils/adt/timestamp.c:100
 #, c-format
 msgid "TIMESTAMP(%d)%s precision must not be negative"
 msgstr "TIMESTAMP(%d)%s: точно�ть должна быть неотрицательна"
 
-#: utils/adt/timestamp.c:105
+#: utils/adt/timestamp.c:106
 #, c-format
 msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
 msgstr "TIMESTAMP(%d)%s: точно�ть уменьшена до дозволенного мак�имума: %d"
 
-#: utils/adt/timestamp.c:170 utils/adt/timestamp.c:444
+#: utils/adt/timestamp.c:171 utils/adt/timestamp.c:445
 #, c-format
 msgid "timestamp out of range: \"%s\""
 msgstr "timestamp вне диапазона: \"%s\""
 
-#: utils/adt/timestamp.c:188 utils/adt/timestamp.c:462
-#: utils/adt/timestamp.c:917
+#: utils/adt/timestamp.c:189 utils/adt/timestamp.c:463
+#: utils/adt/timestamp.c:918
 #, c-format
 msgid "date/time value \"%s\" is no longer supported"
 msgstr "значение даты/времени \"%s\" более не поддерживает��"
 
-#: utils/adt/timestamp.c:258
+#: utils/adt/timestamp.c:259
 #, c-format
 msgid "timestamp cannot be NaN"
 msgstr "timestamp не может быть NaN"
 
-#: utils/adt/timestamp.c:379
+#: utils/adt/timestamp.c:380
 #, c-format
 msgid "timestamp(%d) precision must be between %d and %d"
 msgstr "точно�ть timestamp(%d) должна быть между %d и %d"
 
-#: utils/adt/timestamp.c:512
+#: utils/adt/timestamp.c:513
 #, c-format
 msgid "invalid input syntax for numeric time zone: \"%s\""
 msgstr "неверный �интак�и� дл� чи�лового ча�ового по��а: \"%s\""
 
-#: utils/adt/timestamp.c:514
+#: utils/adt/timestamp.c:515
 #, c-format
 msgid "Numeric time zones must have \"-\" or \"+\" as first character."
 msgstr ""
 "Запи�ь чи�лового ча�ового по��а должна начинать�� � �имвола \"-\" или \"+\"."
 
-#: utils/adt/timestamp.c:527
+#: utils/adt/timestamp.c:528
 #, c-format
 msgid "numeric time zone \"%s\" out of range"
 msgstr "чи�ловой ча�овой по�� \"%s\" вне диапазона"
 
-#: utils/adt/timestamp.c:630 utils/adt/timestamp.c:640
+#: utils/adt/timestamp.c:631 utils/adt/timestamp.c:641
 #, c-format
 msgid "timestamp out of range: %d-%02d-%02d %d:%02d:%02g"
 msgstr "timestamp вне диапазона: %d-%02d-%02d %d:%02d:%02g"
 
-#: utils/adt/timestamp.c:911 utils/adt/timestamp.c:1482
-#: utils/adt/timestamp.c:1985 utils/adt/timestamp.c:3125
-#: utils/adt/timestamp.c:3130 utils/adt/timestamp.c:3135
-#: utils/adt/timestamp.c:3185 utils/adt/timestamp.c:3192
-#: utils/adt/timestamp.c:3199 utils/adt/timestamp.c:3219
-#: utils/adt/timestamp.c:3226 utils/adt/timestamp.c:3233
-#: utils/adt/timestamp.c:3262 utils/adt/timestamp.c:3269
-#: utils/adt/timestamp.c:3314 utils/adt/timestamp.c:3605
-#: utils/adt/timestamp.c:3734 utils/adt/timestamp.c:4125
+#: utils/adt/timestamp.c:912 utils/adt/timestamp.c:1536
+#: utils/adt/timestamp.c:2042 utils/adt/timestamp.c:3224
+#: utils/adt/timestamp.c:3229 utils/adt/timestamp.c:3234
+#: utils/adt/timestamp.c:3284 utils/adt/timestamp.c:3291
+#: utils/adt/timestamp.c:3298 utils/adt/timestamp.c:3318
+#: utils/adt/timestamp.c:3325 utils/adt/timestamp.c:3332
+#: utils/adt/timestamp.c:3361 utils/adt/timestamp.c:3368
+#: utils/adt/timestamp.c:3413 utils/adt/timestamp.c:3704
+#: utils/adt/timestamp.c:3833 utils/adt/timestamp.c:4224
 #, c-format
 msgid "interval out of range"
 msgstr "interval вне диапазона"
 
-#: utils/adt/timestamp.c:1052 utils/adt/timestamp.c:1085
+#: utils/adt/timestamp.c:1053 utils/adt/timestamp.c:1086
 #, c-format
 msgid "invalid INTERVAL type modifier"
 msgstr "неверный модификатор типа INTERVAL"
 
-#: utils/adt/timestamp.c:1068
+#: utils/adt/timestamp.c:1069
 #, c-format
 msgid "INTERVAL(%d) precision must not be negative"
 msgstr "INTERVAL(%d): точно�ть должна быть неотрицательна"
 
-#: utils/adt/timestamp.c:1074
+#: utils/adt/timestamp.c:1075
 #, c-format
 msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
 msgstr "INTERVAL(%d): точно�ть уменьшена до мак�имально возможной: %d"
 
-#: utils/adt/timestamp.c:1426
+#: utils/adt/timestamp.c:1480
 #, c-format
 msgid "interval(%d) precision must be between %d and %d"
 msgstr "точно�ть interval(%d) должна быть между %d и %d"
 
-#: utils/adt/timestamp.c:2714
+#: utils/adt/timestamp.c:2813
 #, c-format
 msgid "cannot subtract infinite timestamps"
 msgstr "вычитать бе�конечные значени� timestamp нельз�"
 
-#: utils/adt/timestamp.c:3860 utils/adt/timestamp.c:4486
-#: utils/adt/timestamp.c:4506
+#: utils/adt/timestamp.c:3959 utils/adt/timestamp.c:4585
+#: utils/adt/timestamp.c:4605
 #, c-format
 msgid "timestamp units \"%s\" not supported"
 msgstr "единицы timestamp \"%s\" не поддерживают��"
 
-#: utils/adt/timestamp.c:3874 utils/adt/timestamp.c:4516
+#: utils/adt/timestamp.c:3973 utils/adt/timestamp.c:4615
 #, c-format
 msgid "timestamp units \"%s\" not recognized"
 msgstr "единицы timestamp \"%s\" не ра�познаны"
 
-#: utils/adt/timestamp.c:4014 utils/adt/timestamp.c:4697
-#: utils/adt/timestamp.c:4718
+#: utils/adt/timestamp.c:4113 utils/adt/timestamp.c:4796
+#: utils/adt/timestamp.c:4817
 #, c-format
 msgid "timestamp with time zone units \"%s\" not supported"
 msgstr "единицы timestamp � ча�овым по��ом \"%s\" не поддерживают��"
 
-#: utils/adt/timestamp.c:4031 utils/adt/timestamp.c:4727
+#: utils/adt/timestamp.c:4130 utils/adt/timestamp.c:4826
 #, c-format
 msgid "timestamp with time zone units \"%s\" not recognized"
 msgstr "единицы timestamp � ча�овым по��ом \"%s\" не ра�познаны"
 
-#: utils/adt/timestamp.c:4112
+#: utils/adt/timestamp.c:4211
 #, c-format
 msgid ""
 "interval units \"%s\" not supported because months usually have fractional "
@@ -20808,17 +20832,17 @@
 "единицы интервала \"%s\" не поддерживают��, так как в ме��цах дробное чи�ло "
 "недель"
 
-#: utils/adt/timestamp.c:4118 utils/adt/timestamp.c:4833
+#: utils/adt/timestamp.c:4217 utils/adt/timestamp.c:4932
 #, c-format
 msgid "interval units \"%s\" not supported"
 msgstr "единицы interval \"%s\" не поддерживают��"
 
-#: utils/adt/timestamp.c:4134 utils/adt/timestamp.c:4860
+#: utils/adt/timestamp.c:4233 utils/adt/timestamp.c:4959
 #, c-format
 msgid "interval units \"%s\" not recognized"
 msgstr "единицы interval \"%s\" не ра�познаны"
 
-#: utils/adt/timestamp.c:5024 utils/adt/timestamp.c:5254
+#: utils/adt/timestamp.c:5054 utils/adt/timestamp.c:5250
 #, c-format
 msgid "could not convert to time zone \"%s\""
 msgstr "не удало�ь пере�читать врем� в ча�овой по�� \"%s\""
@@ -20885,7 +20909,7 @@
 msgid "text-search query doesn't contain lexemes: \"%s\""
 msgstr "запро� пои�ка тек�та не �одержит лек�емы: \"%s\""
 
-#: utils/adt/tsquery.c:521 utils/adt/tsquery_util.c:340
+#: utils/adt/tsquery.c:521 utils/adt/tsquery_util.c:371
 #, c-format
 msgid "tsquery is too large"
 msgstr "tsquery �лишком большой"
@@ -20899,7 +20923,7 @@
 "запро� пои�ка тек�та игнорирует��, так как �одержит только �топ-�лова или не "
 "�одержит лек�ем"
 
-#: utils/adt/tsquery_rewrite.c:293
+#: utils/adt/tsquery_rewrite.c:322
 #, c-format
 msgid "ts_rewrite query must return two tsquery columns"
 msgstr "запро� ts_rewrite должен вернуть два �толбца типа tsquery"
@@ -20934,42 +20958,42 @@
 msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
 msgstr "�трока �лишком длинна дл� tsvector (%ld Б, при мак�имуме %ld)"
 
-#: utils/adt/tsvector_op.c:1173
+#: utils/adt/tsvector_op.c:1174
 #, c-format
 msgid "ts_stat query must return one tsvector column"
 msgstr "запро� ts_stat должен вернуть один �толбец tsvector"
 
-#: utils/adt/tsvector_op.c:1353
+#: utils/adt/tsvector_op.c:1354
 #, c-format
 msgid "tsvector column \"%s\" does not exist"
 msgstr "�толбец \"%s\" типа tsvector не �уще�твует"
 
-#: utils/adt/tsvector_op.c:1359
+#: utils/adt/tsvector_op.c:1360
 #, c-format
 msgid "column \"%s\" is not of tsvector type"
 msgstr "�толбец \"%s\" должен иметь тип tsvector"
 
-#: utils/adt/tsvector_op.c:1371
+#: utils/adt/tsvector_op.c:1372
 #, c-format
 msgid "configuration column \"%s\" does not exist"
 msgstr "�толбец конфигурации \"%s\" не �уще�твует"
 
-#: utils/adt/tsvector_op.c:1377
+#: utils/adt/tsvector_op.c:1378
 #, c-format
 msgid "column \"%s\" is not of regconfig type"
 msgstr "�толбец \"%s\" должен иметь тип regconfig"
 
-#: utils/adt/tsvector_op.c:1384
+#: utils/adt/tsvector_op.c:1385
 #, c-format
 msgid "configuration column \"%s\" must not be null"
 msgstr "значение �толбца конфигурации \"%s\" не должно быть null"
 
-#: utils/adt/tsvector_op.c:1397
+#: utils/adt/tsvector_op.c:1398
 #, c-format
 msgid "text search configuration name \"%s\" must be schema-qualified"
 msgstr "им� конфигурации тек�тового пои�ка \"%s\" должно указывать�� �о �хемой"
 
-#: utils/adt/tsvector_op.c:1422
+#: utils/adt/tsvector_op.c:1423
 #, c-format
 msgid "column \"%s\" is not of a character type"
 msgstr "�толбец \"%s\" имеет не �имвольный тип"
@@ -20979,6 +21003,7 @@
 msgid "syntax error in tsvector: \"%s\""
 msgstr "ошибка �интак�и�а в tsvector: \"%s\""
 
+# skip-rule: capital-letter-first
 #: utils/adt/tsvector_parser.c:199
 #, c-format
 msgid "there is no escaped character: \"%s\""
@@ -21045,8 +21070,8 @@
 msgstr "�трока битов не умещает�� в тип bit varying(%d)"
 
 #: utils/adt/varbit.c:1066 utils/adt/varbit.c:1168 utils/adt/varlena.c:832
-#: utils/adt/varlena.c:896 utils/adt/varlena.c:1040 utils/adt/varlena.c:2510
-#: utils/adt/varlena.c:2577
+#: utils/adt/varlena.c:896 utils/adt/varlena.c:1040 utils/adt/varlena.c:2523
+#: utils/adt/varlena.c:2590
 #, c-format
 msgid "negative substring length not allowed"
 msgstr "под�трока должна иметь неотрицательную длину"
@@ -21067,12 +21092,12 @@
 msgstr ""
 "нельз� и�пользовать \"ИСКЛЮЧ�ЮЩЕЕ ИЛИ\" (XOR) дл� битовых �трок разной длины"
 
-#: utils/adt/varbit.c:1793 utils/adt/varbit.c:1851
+#: utils/adt/varbit.c:1803 utils/adt/varbit.c:1861
 #, c-format
 msgid "bit index %d out of valid range (0..%d)"
 msgstr "индек� бита %d вне диапазона 0..%d"
 
-#: utils/adt/varbit.c:1802 utils/adt/varlena.c:2777
+#: utils/adt/varbit.c:1812 utils/adt/varlena.c:2790
 #, c-format
 msgid "new bit must be 0 or 1"
 msgstr "значением бита должен быть 0 или 1"
@@ -21104,48 +21129,48 @@
 msgid "could not compare Unicode strings: %m"
 msgstr "не удало�ь �равнить �троки в Unicode: %m"
 
-#: utils/adt/varlena.c:2655 utils/adt/varlena.c:2686 utils/adt/varlena.c:2722
-#: utils/adt/varlena.c:2765
+#: utils/adt/varlena.c:2668 utils/adt/varlena.c:2699 utils/adt/varlena.c:2735
+#: utils/adt/varlena.c:2778
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "индек� %d вне диапазона 0..%d"
 
-#: utils/adt/varlena.c:3684
+#: utils/adt/varlena.c:3697
 #, c-format
 msgid "field position must be greater than zero"
 msgstr "позици� пол� должна быть больше нул�"
 
-#: utils/adt/varlena.c:4563
+#: utils/adt/varlena.c:4576
 #, c-format
 msgid "unterminated format specifier"
 msgstr "незавершённый �пецификатор формата"
 
-#: utils/adt/varlena.c:4695 utils/adt/varlena.c:4815
+#: utils/adt/varlena.c:4708 utils/adt/varlena.c:4828
 #, c-format
 msgid "unrecognized conversion type specifier \"%c\""
 msgstr "нера�познанный �пецификатор преобразовани� \"%c\""
 
-#: utils/adt/varlena.c:4707 utils/adt/varlena.c:4764
+#: utils/adt/varlena.c:4720 utils/adt/varlena.c:4777
 #, c-format
 msgid "too few arguments for format"
 msgstr "мало аргументов дл� формата"
 
-#: utils/adt/varlena.c:4858 utils/adt/varlena.c:5041
+#: utils/adt/varlena.c:4871 utils/adt/varlena.c:5054
 #, c-format
 msgid "number is out of range"
 msgstr "чи�ло вне диапазона"
 
-#: utils/adt/varlena.c:4922 utils/adt/varlena.c:4950
+#: utils/adt/varlena.c:4935 utils/adt/varlena.c:4963
 #, c-format
 msgid "format specifies argument 0, but arguments are numbered from 1"
 msgstr "формат ��ылает�� на аргумент 0, но аргументы нумеруют�� � 1"
 
-#: utils/adt/varlena.c:4943
+#: utils/adt/varlena.c:4956
 #, c-format
 msgid "width argument position must be ended by \"$\""
 msgstr "указание аргумента ширины должно оканчивать�� \"$\""
 
-#: utils/adt/varlena.c:4988
+#: utils/adt/varlena.c:5001
 #, c-format
 msgid "null values cannot be formatted as an SQL identifier"
 msgstr "значени� null нельз� пред�тавить в виде SQL-идентификатора"
@@ -21160,73 +21185,73 @@
 msgid "argument of nth_value must be greater than zero"
 msgstr "аргумент nth_value должен быть больше нул�"
 
-#: utils/adt/xml.c:171
+#: utils/adt/xml.c:175
 #, c-format
 msgid "unsupported XML feature"
 msgstr "XML-функции не поддерживают��"
 
-#: utils/adt/xml.c:172
+#: utils/adt/xml.c:176
 #, c-format
 msgid "This functionality requires the server to be built with libxml support."
 msgstr "Дл� �той функционально�ти в �ервере не хватает поддержки libxml."
 
-#: utils/adt/xml.c:173
+#: utils/adt/xml.c:177
 #, c-format
 msgid "You need to rebuild PostgreSQL using --with-libxml."
 msgstr "�еобходимо перекомпилировать PostgreSQL � ключом --with-libxml."
 
-#: utils/adt/xml.c:192 utils/mb/mbutils.c:523
+#: utils/adt/xml.c:196 utils/mb/mbutils.c:523
 #, c-format
 msgid "invalid encoding name \"%s\""
 msgstr "неверное им� кодировки: \"%s\""
 
-#: utils/adt/xml.c:435 utils/adt/xml.c:440
+#: utils/adt/xml.c:439 utils/adt/xml.c:444
 #, c-format
 msgid "invalid XML comment"
 msgstr "ошибка в XML-комментарии"
 
-#: utils/adt/xml.c:569
+#: utils/adt/xml.c:573
 #, c-format
 msgid "not an XML document"
 msgstr "не XML-документ"
 
-#: utils/adt/xml.c:728 utils/adt/xml.c:751
+#: utils/adt/xml.c:732 utils/adt/xml.c:755
 #, c-format
 msgid "invalid XML processing instruction"
 msgstr "неправильна� XML-ин�трукци� обработки (PI)"
 
-#: utils/adt/xml.c:729
+#: utils/adt/xml.c:733
 #, c-format
 msgid "XML processing instruction target name cannot be \"%s\"."
 msgstr "назначением XML-ин�трукции обработки (PI) не может быть \"%s\"."
 
-#: utils/adt/xml.c:752
+#: utils/adt/xml.c:756
 #, c-format
 msgid "XML processing instruction cannot contain \"?>\"."
 msgstr "XML-ин�трукци� обработки (PI) не может �одержать \"?>\"."
 
-#: utils/adt/xml.c:831
+#: utils/adt/xml.c:835
 #, c-format
 msgid "xmlvalidate is not implemented"
 msgstr "функци� xmlvalidate не реализована"
 
-#: utils/adt/xml.c:910
+#: utils/adt/xml.c:914
 #, c-format
 msgid "could not initialize XML library"
 msgstr "не удало�ь инициализировать библиотеку XML"
 
-#: utils/adt/xml.c:911
+#: utils/adt/xml.c:915
 #, c-format
 msgid ""
 "libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
 msgstr "другой тип char в libxml2: sizeof(char)=%u, sizeof(xmlChar)=%u."
 
-#: utils/adt/xml.c:997
+#: utils/adt/xml.c:1001
 #, c-format
 msgid "could not set up XML error handler"
 msgstr "не удало�ь у�тановить обработчик XML-ошибок"
 
-#: utils/adt/xml.c:998
+#: utils/adt/xml.c:1002
 #, c-format
 msgid ""
 "This probably indicates that the version of libxml2 being used is not "
@@ -21235,72 +21260,72 @@
 "Возможно �то означает, что и�пользуема� вер�и� libxml2 не �овме�тима � "
 "заголовочными файлами libxml2, � которыми был �обран PostgreSQL."
 
-#: utils/adt/xml.c:1737
+#: utils/adt/xml.c:1741
 msgid "Invalid character value."
 msgstr "�еверный �имвол."
 
-#: utils/adt/xml.c:1740
+#: utils/adt/xml.c:1744
 msgid "Space required."
 msgstr "Требует�� пробел."
 
-#: utils/adt/xml.c:1743
+#: utils/adt/xml.c:1747
 msgid "standalone accepts only 'yes' or 'no'."
 msgstr "значени�ми атрибута standalone могут быть только 'yes' и 'no'."
 
-#: utils/adt/xml.c:1746
+#: utils/adt/xml.c:1750
 msgid "Malformed declaration: missing version."
 msgstr "Ошибочное объ�вление: не указана вер�и�."
 
-#: utils/adt/xml.c:1749
+#: utils/adt/xml.c:1753
 msgid "Missing encoding in text declaration."
 msgstr "В объ�влении не указана кодировка."
 
-#: utils/adt/xml.c:1752
+#: utils/adt/xml.c:1756
 msgid "Parsing XML declaration: '?>' expected."
 msgstr "Ошибка при разборе XML-объ�влени�: ожидает�� '?>'."
 
-#: utils/adt/xml.c:1755
+#: utils/adt/xml.c:1759
 #, c-format
 msgid "Unrecognized libxml error code: %d."
 msgstr "�ера�познанный код ошибки libxml: %d."
 
-#: utils/adt/xml.c:2030
+#: utils/adt/xml.c:2034
 #, c-format
 msgid "XML does not support infinite date values."
 msgstr "XML не поддерживает бе�конечно�ть в датах."
 
-#: utils/adt/xml.c:2052 utils/adt/xml.c:2079
+#: utils/adt/xml.c:2056 utils/adt/xml.c:2083
 #, c-format
 msgid "XML does not support infinite timestamp values."
 msgstr "XML не поддерживает бе�конечно�ть в timestamp."
 
-#: utils/adt/xml.c:2470
+#: utils/adt/xml.c:2483
 #, c-format
 msgid "invalid query"
 msgstr "неверный запро�"
 
-#: utils/adt/xml.c:3795
+#: utils/adt/xml.c:3808
 #, c-format
 msgid "invalid array for XML namespace mapping"
 msgstr "неправильный ма��ив � �опо�тавлени�ми про�тран�тв имён XML"
 
-#: utils/adt/xml.c:3796
+#: utils/adt/xml.c:3809
 #, c-format
 msgid ""
 "The array must be two-dimensional with length of the second axis equal to 2."
 msgstr "Ма��ив должен быть двухмерным и �одержать 2 �лемента по второй о�и."
 
-#: utils/adt/xml.c:3820
+#: utils/adt/xml.c:3833
 #, c-format
 msgid "empty XPath expression"
 msgstr "пу�тое выражение XPath"
 
-#: utils/adt/xml.c:3869
+#: utils/adt/xml.c:3882
 #, c-format
 msgid "neither namespace name nor URI may be null"
 msgstr "ни префик�, ни URI про�тран�тва имён не может быть null"
 
-#: utils/adt/xml.c:3876
+#: utils/adt/xml.c:3889
 #, c-format
 msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
 msgstr ""
@@ -21323,22 +21348,22 @@
 msgid "no output function available for type %s"
 msgstr "дл� типа %s нет функции вывода"
 
-#: utils/cache/plancache.c:725
+#: utils/cache/plancache.c:731
 #, c-format
 msgid "cached plan must not change result type"
 msgstr "в кешированном плане не должен измен�ть�� тип результата"
 
-#: utils/cache/relcache.c:5021
+#: utils/cache/relcache.c:5048
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
 msgstr "�оздать файл инициализации дл� кеша отношений \"%s\" не удало�ь: %m"
 
-#: utils/cache/relcache.c:5023
+#: utils/cache/relcache.c:5050
 #, c-format
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Продолжаем в�ё равно, хот� что-то не так."
 
-#: utils/cache/relcache.c:5256
+#: utils/cache/relcache.c:5283
 #, c-format
 msgid "could not remove cache file \"%s\": %m"
 msgstr "не удало�ь �тереть файл кеша \"%s\": %m"
@@ -21357,7 +21382,7 @@
 #: utils/cache/relmapper.c:664
 #, c-format
 msgid "could not read relation mapping file \"%s\": %m"
-msgstr "прочитать файл �опо�тавлени� отношений \"%s\" не удало�ь: %m "
+msgstr "прочитать файл �опо�тавлени� отношений \"%s\" не удало�ь: %m"
 
 #: utils/cache/relmapper.c:674
 #, c-format
@@ -21411,96 +21436,96 @@
 msgstr ""
 "в %s:%d произошла ошибка до готовно�ти под�и�темы обработки �ообщений\n"
 
-#: utils/error/elog.c:1864
+#: utils/error/elog.c:1873
 #, c-format
 msgid "could not reopen file \"%s\" as stderr: %m"
 msgstr "открыть файл \"%s\" как stderr не удало�ь: %m"
 
-#: utils/error/elog.c:1877
+#: utils/error/elog.c:1886
 #, c-format
 msgid "could not reopen file \"%s\" as stdout: %m"
 msgstr "открыть файл \"%s\" как stdout не удало�ь: %m"
 
-#: utils/error/elog.c:2353 utils/error/elog.c:2370 utils/error/elog.c:2386
+#: utils/error/elog.c:2362 utils/error/elog.c:2379 utils/error/elog.c:2395
 msgid "[unknown]"
 msgstr "[н/д]"
 
-#: utils/error/elog.c:2825 utils/error/elog.c:3124 utils/error/elog.c:3232
+#: utils/error/elog.c:2834 utils/error/elog.c:3133 utils/error/elog.c:3241
 msgid "missing error text"
 msgstr "от�ут�твует тек�т ошибки"
 
-#: utils/error/elog.c:2828 utils/error/elog.c:2831 utils/error/elog.c:3235
-#: utils/error/elog.c:3238
+#: utils/error/elog.c:2837 utils/error/elog.c:2840 utils/error/elog.c:3244
+#: utils/error/elog.c:3247
 #, c-format
 msgid " at character %d"
 msgstr " (�имвол %d)"
 
-#: utils/error/elog.c:2841 utils/error/elog.c:2848
+#: utils/error/elog.c:2850 utils/error/elog.c:2857
 msgid "DETAIL:  "
 msgstr "ПОДРОБ�ОСТИ:  "
 
-#: utils/error/elog.c:2855
+#: utils/error/elog.c:2864
 msgid "HINT:  "
 msgstr "ПОДСК�ЗК�:  "
 
-#: utils/error/elog.c:2862
+#: utils/error/elog.c:2871
 msgid "QUERY:  "
 msgstr "З�ПРОС:  "
 
-#: utils/error/elog.c:2869
+#: utils/error/elog.c:2878
 msgid "CONTEXT:  "
 msgstr "КО�ТЕКСТ:  "
 
-#: utils/error/elog.c:2879
+#: utils/error/elog.c:2888
 #, c-format
 msgid "LOCATION:  %s, %s:%d\n"
 msgstr "ПОЛОЖЕ�ИЕ: %s, %s:%d\n"
 
-#: utils/error/elog.c:2886
+#: utils/error/elog.c:2895
 #, c-format
 msgid "LOCATION:  %s:%d\n"
 msgstr "ПОЛОЖЕ�ИЕ: %s:%d\n"
 
-#: utils/error/elog.c:2900
+#: utils/error/elog.c:2909
 msgid "STATEMENT:  "
 msgstr "ОПЕР�ТОР:  "
 
 #. translator: This string will be truncated at 47
 #. characters expanded.
-#: utils/error/elog.c:3353
+#: utils/error/elog.c:3362
 #, c-format
 msgid "operating system error %d"
 msgstr "ошибка ОС %d"
 
-#: utils/error/elog.c:3548
+#: utils/error/elog.c:3557
 msgid "DEBUG"
 msgstr "ОТЛ�ДК�"
 
-#: utils/error/elog.c:3552
+#: utils/error/elog.c:3561
 msgid "LOG"
 msgstr "СООБЩЕ�ИЕ"
 
-#: utils/error/elog.c:3555
+#: utils/error/elog.c:3564
 msgid "INFO"
 msgstr "И�ФОРМ�ЦИЯ"
 
-#: utils/error/elog.c:3558
+#: utils/error/elog.c:3567
 msgid "NOTICE"
 msgstr "З�МЕЧ��ИЕ"
 
-#: utils/error/elog.c:3561
+#: utils/error/elog.c:3570
 msgid "WARNING"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ"
 
-#: utils/error/elog.c:3564
+#: utils/error/elog.c:3573
 msgid "ERROR"
 msgstr "ОШИБК�"
 
-#: utils/error/elog.c:3567
+#: utils/error/elog.c:3576
 msgid "FATAL"
 msgstr "В�Ж�О"
 
-#: utils/error/elog.c:3570
+#: utils/error/elog.c:3579
 msgid "PANIC"
 msgstr "П��ИК�"
 
@@ -21652,47 +21677,52 @@
 "параметр \"%s\" нельз� задать в рамках операции � ограничени�ми по "
 "безопа�но�ти"
 
-#: utils/init/miscinit.c:522
+#: utils/init/miscinit.c:502
+#, c-format
+msgid "role with OID %u does not exist"
+msgstr "роль � OID %u не �уще�твует"
+
+#: utils/init/miscinit.c:532
 #, c-format
 msgid "role \"%s\" is not permitted to log in"
 msgstr "дл� роли \"%s\" вход запрещён"
 
-#: utils/init/miscinit.c:540
+#: utils/init/miscinit.c:550
 #, c-format
 msgid "too many connections for role \"%s\""
 msgstr "�лишком много подключений дл� роли \"%s\""
 
-#: utils/init/miscinit.c:600
+#: utils/init/miscinit.c:610
 #, c-format
 msgid "permission denied to set session authorization"
 msgstr "нет прав дл� �мены объекта авторизации в �еан�е"
 
-#: utils/init/miscinit.c:683
+#: utils/init/miscinit.c:693
 #, c-format
 msgid "invalid role OID: %u"
 msgstr "неверный OID роли: %u"
 
-#: utils/init/miscinit.c:813
+#: utils/init/miscinit.c:823
 #, c-format
 msgid "could not create lock file \"%s\": %m"
 msgstr "не удало�ь �оздать файл блокировки \"%s\": %m"
 
-#: utils/init/miscinit.c:827
+#: utils/init/miscinit.c:837
 #, c-format
 msgid "could not open lock file \"%s\": %m"
 msgstr "не удало�ь открыть файл блокировки \"%s\": %m"
 
-#: utils/init/miscinit.c:833
+#: utils/init/miscinit.c:843
 #, c-format
 msgid "could not read lock file \"%s\": %m"
 msgstr "не удало�ь прочитать файл блокировки \"%s\": %m"
 
-#: utils/init/miscinit.c:841
+#: utils/init/miscinit.c:851
 #, c-format
 msgid "lock file \"%s\" is empty"
 msgstr "файл блокировки \"%s\" пу�т"
 
-#: utils/init/miscinit.c:842
+#: utils/init/miscinit.c:852
 #, c-format
 msgid ""
 "Either another server is starting, or the lock file is the remnant of a "
@@ -21701,40 +21731,40 @@
 "Либо �ейча� запу�кает�� другой �ервер, либо �тот файл о�тал�� в результате "
 "�бо� при предыдущем запу�ке."
 
-#: utils/init/miscinit.c:889
+#: utils/init/miscinit.c:899
 #, c-format
 msgid "lock file \"%s\" already exists"
 msgstr "файл блокировки \"%s\" уже �уще�твует"
 
-#: utils/init/miscinit.c:893
+#: utils/init/miscinit.c:903
 #, c-format
 msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
 msgstr "Другой �кземпл�р postgres (PID %d) работает � каталогом данных \"%s\"?"
 
-#: utils/init/miscinit.c:895
+#: utils/init/miscinit.c:905
 #, c-format
 msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
 msgstr ""
 "Другой �кземпл�р postmaster (PID %d) работает � каталогом данных \"%s\"?"
 
-#: utils/init/miscinit.c:898
+#: utils/init/miscinit.c:908
 #, c-format
 msgid "Is another postgres (PID %d) using socket file \"%s\"?"
 msgstr "Другой �кземпл�р postgres (PID %d) и�пользует файл �окета \"%s\"?"
 
-#: utils/init/miscinit.c:900
+#: utils/init/miscinit.c:910
 #, c-format
 msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
 msgstr "Другой �кземпл�р postmaster (PID %d) и�пользует файл �окета \"%s\"?"
 
-#: utils/init/miscinit.c:936
+#: utils/init/miscinit.c:946
 #, c-format
 msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
 msgstr ""
 "ранее выделенный блок раздел�емой пам�ти (ключ %lu, ID %lu) по-прежнему "
 "и�пользует��"
 
-#: utils/init/miscinit.c:939
+#: utils/init/miscinit.c:949
 #, c-format
 msgid ""
 "If you're sure there are no old server processes still running, remove the "
@@ -21743,12 +21773,12 @@
 "Е�ли вы уверены, что проце��ов �тарого �ервера уже не о�тало�ь, о�вободите "
 "�тот блок раздел�емой пам�ти или про�то удалите файл \"%s\"."
 
-#: utils/init/miscinit.c:955
+#: utils/init/miscinit.c:965
 #, c-format
 msgid "could not remove old lock file \"%s\": %m"
 msgstr "не удало�ь �тереть �тарый файл блокировки \"%s\": %m"
 
-#: utils/init/miscinit.c:957
+#: utils/init/miscinit.c:967
 #, c-format
 msgid ""
 "The file seems accidentally left over, but it could not be removed. Please "
@@ -21757,48 +21787,48 @@
 "Кажет��, файл �охранил�� по ошибке, но удалить его не получило�ь. "
 "Пожалуй�та, удалите файл вручную и повторите попытку."
 
-#: utils/init/miscinit.c:993 utils/init/miscinit.c:1004
-#: utils/init/miscinit.c:1014
+#: utils/init/miscinit.c:1003 utils/init/miscinit.c:1014
+#: utils/init/miscinit.c:1024
 #, c-format
 msgid "could not write lock file \"%s\": %m"
 msgstr "не удало�ь запи�ать файл блокировки \"%s\": %m"
 
-#: utils/init/miscinit.c:1143 utils/init/miscinit.c:1272 utils/misc/guc.c:8589
+#: utils/init/miscinit.c:1153 utils/init/miscinit.c:1282 utils/misc/guc.c:8610
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "не удало�ь прочитать файл \"%s\": %m"
 
-#: utils/init/miscinit.c:1262
+#: utils/init/miscinit.c:1272
 #, c-format
 msgid "could not open file \"%s\": %m; continuing anyway"
 msgstr "не удало�ь открыть файл \"%s\": %m; ошибка игнорирует��"
 
-#: utils/init/miscinit.c:1285
+#: utils/init/miscinit.c:1295
 #, c-format
 msgid "lock file \"%s\" contains wrong PID: %ld instead of %ld"
 msgstr "файл блокировки \"%s\" �одержит неверный PID: %ld вме�то %ld"
 
-#: utils/init/miscinit.c:1327 utils/init/miscinit.c:1340
+#: utils/init/miscinit.c:1337 utils/init/miscinit.c:1350
 #, c-format
 msgid "\"%s\" is not a valid data directory"
 msgstr "\"%s\" не �вл�ет�� каталогом данных"
 
-#: utils/init/miscinit.c:1329
+#: utils/init/miscinit.c:1339
 #, c-format
 msgid "File \"%s\" is missing."
 msgstr "Файл \"%s\" от�ут�твует."
 
-#: utils/init/miscinit.c:1342
+#: utils/init/miscinit.c:1352
 #, c-format
 msgid "File \"%s\" does not contain valid data."
 msgstr "Файл \"%s\" �одержит неприемлемые данные."
 
-#: utils/init/miscinit.c:1344
+#: utils/init/miscinit.c:1354
 #, c-format
 msgid "You might need to initdb."
 msgstr "Возможно, вам нужно выполнить initdb."
 
-#: utils/init/miscinit.c:1352
+#: utils/init/miscinit.c:1362
 #, c-format
 msgid ""
 "The data directory was initialized by PostgreSQL version %ld.%ld, which is "
@@ -21807,7 +21837,7 @@
 "Каталог данных инициализирован �ервером PostgreSQL вер�ии %ld.%ld, не "
 "�овме�тимой � данной вер�ией (%s)."
 
-#: utils/init/miscinit.c:1423
+#: utils/init/miscinit.c:1433
 #, c-format
 msgid "loaded library \"%s\""
 msgstr "загружена библиотека \"%s\""
@@ -22101,7 +22131,7 @@
 
 #: utils/misc/guc.c:561
 msgid "Write-Ahead Log / Settings"
-msgstr "Журнал WAL / �а�тройки"
+msgstr "Журнал WAL / Параметры"
 
 #: utils/misc/guc.c:563
 msgid "Write-Ahead Log / Checkpoints"
@@ -22638,7 +22668,7 @@
 "When turned on, unquoted NULL in an array input value means a null value; "
 "otherwise it is taken literally."
 msgstr ""
-"Когда �тот параметр включен, NULL без кавычек при вводе в ма��ив "
+"Когда �тот параметр включён, NULL без кавычек при вводе в ма��ив "
 "во�принимает�� как значение NULL, иначе - как �трока."
 
 #: utils/misc/guc.c:1400
@@ -22683,7 +22713,7 @@
 "Sets whether Kerberos and GSSAPI user names should be treated as case-"
 "insensitive."
 msgstr ""
-"Включает реги�тро-незави�имую обработку имён пользователей Kerberos и GSSAPI."
+"Включает реги�тронезави�имую обработку имён пользователей Kerberos и GSSAPI."
 
 #: utils/misc/guc.c:1508
 msgid "Warn about backslash escapes in ordinary string literals."
@@ -22915,7 +22945,7 @@
 msgstr ""
 "Значение параметра указывает�� в чи�ловом виде, во�принимаемом �и�темными "
 "функци�ми chmod и umask. (Чтобы и�пользовать привычный во�ьмеричный формат, "
-"добавьте в начало ноль (0).) "
+"добавьте в начало ноль (0).)"
 
 #: utils/misc/guc.c:1866
 msgid "Sets the maximum memory to be used for query workspaces."
@@ -23892,14 +23922,14 @@
 msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
 msgstr "%g вне диапазона, допу�тимого дл� параметра \"%s\" (%g .. %g)"
 
-#: utils/misc/guc.c:5675 utils/misc/guc.c:7004
+#: utils/misc/guc.c:5675 utils/misc/guc.c:7017
 #, c-format
 msgid "cannot set parameters during a parallel operation"
 msgstr "у�танавливать параметры во врем� параллельных операций нельз�"
 
 #: utils/misc/guc.c:5682 utils/misc/guc.c:6432 utils/misc/guc.c:6484
-#: utils/misc/guc.c:6845 utils/misc/guc.c:7592 utils/misc/guc.c:7751
-#: utils/misc/guc.c:9386
+#: utils/misc/guc.c:6845 utils/misc/guc.c:7605 utils/misc/guc.c:7764
+#: utils/misc/guc.c:9417
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "нера�познанный параметр конфигурации: \"%s\""
@@ -23921,7 +23951,7 @@
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "параметр \"%s\" нельз� изменить �ейча�"
 
-#: utils/misc/guc.c:5748 utils/misc/guc.c:5793 utils/misc/guc.c:9402
+#: utils/misc/guc.c:5748 utils/misc/guc.c:5793 utils/misc/guc.c:9433
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "нет прав дл� изменени� параметра \"%s\""
@@ -23938,7 +23968,7 @@
 "параметр \"%s\" нельз� задать в функции � контек�том безопа�но�ти "
 "определившего"
 
-#: utils/misc/guc.c:6440 utils/misc/guc.c:6488 utils/misc/guc.c:7755
+#: utils/misc/guc.c:6440 utils/misc/guc.c:6488 utils/misc/guc.c:7768
 #, c-format
 msgid "must be superuser to examine \"%s\""
 msgstr "прочитать \"%s\" может только �уперпользователь"
@@ -23953,47 +23983,52 @@
 msgid "must be superuser to execute ALTER SYSTEM command"
 msgstr "выполнить команду ALTER SYSTEM может только �уперпользователь"
 
-#: utils/misc/guc.c:6918
+#: utils/misc/guc.c:6890
+#, c-format
+msgid "parameter value for ALTER SYSTEM must not contain a newline"
+msgstr "значение параметра дл� ALTER SYSTEM не должно быть много�трочным"
+
+#: utils/misc/guc.c:6935
 #, c-format
 msgid "could not parse contents of file \"%s\""
 msgstr "не удало�ь разобрать �одержимое файла \"%s\""
 
-#: utils/misc/guc.c:7080
+#: utils/misc/guc.c:7093
 #, c-format
 msgid "SET LOCAL TRANSACTION SNAPSHOT is not implemented"
 msgstr "SET LOCAL TRANSACTION SNAPSHOT не реализовано"
 
-#: utils/misc/guc.c:7165
+#: utils/misc/guc.c:7178
 #, c-format
 msgid "SET requires parameter name"
 msgstr "SET требует им� параметра"
 
-#: utils/misc/guc.c:7289
+#: utils/misc/guc.c:7302
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "попытка переопределить параметр \"%s\""
 
-#: utils/misc/guc.c:9019
+#: utils/misc/guc.c:9050
 #, c-format
 msgid "parameter \"%s\" could not be set"
 msgstr "параметр \"%s\" нельз� у�тановить"
 
-#: utils/misc/guc.c:9106
+#: utils/misc/guc.c:9137
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "не удало�ь разобрать значение параметра \"%s\""
 
-#: utils/misc/guc.c:9464 utils/misc/guc.c:9498
+#: utils/misc/guc.c:9495 utils/misc/guc.c:9529
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "неверное значение параметра \"%s\": %d"
 
-#: utils/misc/guc.c:9532
+#: utils/misc/guc.c:9563
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "неверное значение параметра \"%s\": %g"
 
-#: utils/misc/guc.c:9722
+#: utils/misc/guc.c:9753
 #, c-format
 msgid ""
 "\"temp_buffers\" cannot be changed after any temporary tables have been "
@@ -24002,23 +24037,23 @@
 "параметр \"temp_buffers\" нельз� изменить по�ле обращени� к временным "
 "таблицам в текущем �еан�е."
 
-#: utils/misc/guc.c:9734
+#: utils/misc/guc.c:9765
 #, c-format
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour не поддерживает�� в данной �борке"
 
-#: utils/misc/guc.c:9747
+#: utils/misc/guc.c:9778
 #, c-format
 msgid "SSL is not supported by this build"
 msgstr "SSL не поддерживает�� в данной �борке"
 
-#: utils/misc/guc.c:9759
+#: utils/misc/guc.c:9790
 #, c-format
 msgid "Cannot enable parameter when \"log_statement_stats\" is true."
 msgstr ""
 "Этот параметр нельз� включить, когда \"log_statement_stats\" равен true."
 
-#: utils/misc/guc.c:9771
+#: utils/misc/guc.c:9802
 #, c-format
 msgid ""
 "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
@@ -24134,15 +24169,15 @@
 msgstr ""
 "в @INCLUDE не указано им� файла (файл ча�овых по��ов \"%s\", �трока %d)"
 
-#: utils/mmgr/aset.c:505
+#: utils/mmgr/aset.c:506
 #, c-format
 msgid "Failed while creating memory context \"%s\"."
 msgstr "Ошибка при �оздании контек�та пам�ти \"%s\"."
 
 #: utils/mmgr/mcxt.c:689 utils/mmgr/mcxt.c:724 utils/mmgr/mcxt.c:761
 #: utils/mmgr/mcxt.c:798 utils/mmgr/mcxt.c:832 utils/mmgr/mcxt.c:861
-#: utils/mmgr/mcxt.c:895 utils/mmgr/mcxt.c:975 utils/mmgr/mcxt.c:1008
-#: utils/mmgr/mcxt.c:1055
+#: utils/mmgr/mcxt.c:895 utils/mmgr/mcxt.c:977 utils/mmgr/mcxt.c:1011
+#: utils/mmgr/mcxt.c:1060
 #, c-format
 msgid "Failed on request of size %zu."
 msgstr "Ошибка при запро�е пам�ти (%zu Б)."
@@ -24199,45 +24234,45 @@
 #: utils/sort/tuplestore.c:1313
 #, c-format
 msgid "could not seek in tuplestore temporary file: %m"
-msgstr "не удало�ь переме�тить�� в файле временного хранилища кортежей: %m"
+msgstr "не удало�ь переме�тить�� во временном файле и�точника кортежей: %m"
 
 #: utils/sort/tuplestore.c:1460 utils/sort/tuplestore.c:1533
 #: utils/sort/tuplestore.c:1539
 #, c-format
 msgid "could not read from tuplestore temporary file: %m"
-msgstr "не удало�ь прочитать файл временного хранилища кортежей: %m"
+msgstr "не удало�ь прочитать временный файл и�точника кортежей: %m"
 
 #: utils/sort/tuplestore.c:1501 utils/sort/tuplestore.c:1506
 #: utils/sort/tuplestore.c:1512
 #, c-format
 msgid "could not write to tuplestore temporary file: %m"
-msgstr "не удало�ь запи�ать в файл временного хранилища кортежей: %m"
+msgstr "не удало�ь запи�ать во временный файл и�точника кортежей: %m"
 
-#: utils/time/snapmgr.c:432
+#: utils/time/snapmgr.c:473
 #, c-format
 msgid "The source transaction is not running anymore."
 msgstr "И�ходна� транзакци� уже не выполн�ет��."
 
-#: utils/time/snapmgr.c:986
+#: utils/time/snapmgr.c:1038
 #, c-format
 msgid "cannot export a snapshot from a subtransaction"
 msgstr "�к�портировать �нимок из вложенной транзакции нельз�"
 
-#: utils/time/snapmgr.c:1135 utils/time/snapmgr.c:1140
-#: utils/time/snapmgr.c:1145 utils/time/snapmgr.c:1160
-#: utils/time/snapmgr.c:1165 utils/time/snapmgr.c:1170
-#: utils/time/snapmgr.c:1269 utils/time/snapmgr.c:1285
-#: utils/time/snapmgr.c:1310
+#: utils/time/snapmgr.c:1187 utils/time/snapmgr.c:1192
+#: utils/time/snapmgr.c:1197 utils/time/snapmgr.c:1212
+#: utils/time/snapmgr.c:1217 utils/time/snapmgr.c:1222
+#: utils/time/snapmgr.c:1321 utils/time/snapmgr.c:1337
+#: utils/time/snapmgr.c:1362
 #, c-format
 msgid "invalid snapshot data in file \"%s\""
 msgstr "неверные данные �нимка в файле \"%s\""
 
-#: utils/time/snapmgr.c:1207
+#: utils/time/snapmgr.c:1259
 #, c-format
 msgid "SET TRANSACTION SNAPSHOT must be called before any query"
 msgstr "команда SET TRANSACTION SNAPSHOT должна выполн�ть�� до запро�ов"
 
-#: utils/time/snapmgr.c:1216
+#: utils/time/snapmgr.c:1268
 #, c-format
 msgid ""
 "a snapshot-importing transaction must have isolation level SERIALIZABLE or "
@@ -24246,12 +24281,12 @@
 "транзакци�, импортирующа� �нимок, должна иметь уровень изол�ции SERIALIZABLE "
 "или REPEATABLE READ"
 
-#: utils/time/snapmgr.c:1225 utils/time/snapmgr.c:1234
+#: utils/time/snapmgr.c:1277 utils/time/snapmgr.c:1286
 #, c-format
 msgid "invalid snapshot identifier: \"%s\""
 msgstr "неверный идентификатор �нимка: \"%s\""
 
-#: utils/time/snapmgr.c:1323
+#: utils/time/snapmgr.c:1375
 #, c-format
 msgid ""
 "a serializable transaction cannot import a snapshot from a non-serializable "
@@ -24259,7 +24294,7 @@
 msgstr ""
 "�ериализуема� транзакци� не может импортировать �нимок из не �ериализуемой"
 
-#: utils/time/snapmgr.c:1327
+#: utils/time/snapmgr.c:1379
 #, c-format
 msgid ""
 "a non-read-only serializable transaction cannot import a snapshot from a "
@@ -24268,7 +24303,7 @@
 "�ериализуема� транзакци� в режиме \"чтение-запи�ь\" не может импортировать "
 "�нимок из транзакции в режиме \"только чтение\""
 
-#: utils/time/snapmgr.c:1342
+#: utils/time/snapmgr.c:1394
 #, c-format
 msgid "cannot import a snapshot from a different database"
 msgstr "нельз� импортировать �нимок из другой базы данных"
@@ -24400,84 +24435,84 @@
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "предикат UNIQUE ещё не реализован"
 
-#: gram.y:12158
+#: gram.y:12162
 #, c-format
 msgid "cannot use multiple ORDER BY clauses with WITHIN GROUP"
 msgstr "ORDER BY � WITHIN GROUP можно указать только один раз"
 
-#: gram.y:12163
+#: gram.y:12167
 #, c-format
 msgid "cannot use DISTINCT with WITHIN GROUP"
 msgstr "DISTINCT нельз� и�пользовать � WITHIN GROUP"
 
-#: gram.y:12168
+#: gram.y:12172
 #, c-format
 msgid "cannot use VARIADIC with WITHIN GROUP"
 msgstr "VARIADIC нельз� и�пользовать � WITHIN GROUP"
 
-#: gram.y:12674
+#: gram.y:12678
 #, c-format
 msgid "RANGE PRECEDING is only supported with UNBOUNDED"
 msgstr "RANGE PRECEDING поддерживает�� только � UNBOUNDED"
 
-#: gram.y:12680
+#: gram.y:12684
 #, c-format
 msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
 msgstr "RANGE FOLLOWING поддерживает�� только � UNBOUNDED"
 
-#: gram.y:12707 gram.y:12730
+#: gram.y:12711 gram.y:12734
 #, c-format
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "началом рамки не может быть UNBOUNDED FOLLOWING"
 
-#: gram.y:12712
+#: gram.y:12716
 #, c-format
 msgid "frame starting from following row cannot end with current row"
 msgstr ""
 "рамка, начинающа��� �о �ледующей �троки, не может заканчивать�� текущей"
 
-#: gram.y:12735
+#: gram.y:12739
 #, c-format
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "концом рамки не может быть UNBOUNDED PRECEDING"
 
-#: gram.y:12741
+#: gram.y:12745
 #, c-format
 msgid "frame starting from current row cannot have preceding rows"
 msgstr ""
 "рамка, начинающа��� � текущей �троки, не может иметь предше�твующих �трок"
 
-#: gram.y:12748
+#: gram.y:12752
 #, c-format
 msgid "frame starting from following row cannot have preceding rows"
 msgstr ""
 "рамка, начинающа��� �о �ледующей �троки, не может иметь предше�твующих �трок"
 
-#: gram.y:13406
+#: gram.y:13410
 #, c-format
 msgid "type modifier cannot have parameter name"
 msgstr "параметр функции-модификатора типа должен быть безым�нным"
 
-#: gram.y:13412
+#: gram.y:13416
 #, c-format
 msgid "type modifier cannot have ORDER BY"
 msgstr "модификатор типа не может включать ORDER BY"
 
-#: gram.y:13470 gram.y:13505
+#: gram.y:13474 gram.y:13509
 #, c-format
 msgid "role name \"%s\" is reserved"
 msgstr "им� роли \"%s\" зарезервировано"
 
-#: gram.y:13476 gram.y:13482
+#: gram.y:13480 gram.y:13486
 #, c-format
 msgid "%s cannot be used as a role name here"
 msgstr "%s нельз� и�пользовать зде�ь как им� роли"
 
-#: gram.y:14101 gram.y:14290
+#: gram.y:14105 gram.y:14294
 msgid "improper use of \"*\""
 msgstr "недопу�тимое и�пользование \"*\""
 
-#: gram.y:14354
+#: gram.y:14358
 #, c-format
 msgid ""
 "an ordered-set aggregate with a VARIADIC direct argument must have one "
@@ -24486,50 +24521,50 @@
 "�ортирующа� агрегатна� функци� � непо�ред�твенным аргументом VARIADIC должна "
 "иметь один агрегатный аргумент VARIADIC того же типа данных"
 
-#: gram.y:14391
+#: gram.y:14395
 #, c-format
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "ORDER BY можно указать только один раз"
 
-#: gram.y:14402
+#: gram.y:14406
 #, c-format
 msgid "multiple OFFSET clauses not allowed"
 msgstr "OFFSET можно указать только один раз"
 
-#: gram.y:14411
+#: gram.y:14415
 #, c-format
 msgid "multiple LIMIT clauses not allowed"
 msgstr "LIMIT можно указать только один раз"
 
-#: gram.y:14420
+#: gram.y:14424
 #, c-format
 msgid "multiple WITH clauses not allowed"
 msgstr "WITH можно указать только один раз"
 
-#: gram.y:14600
+#: gram.y:14616
 #, c-format
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "в табличных функци�х не может быть аргументов OUT и INOUT"
 
-#: gram.y:14701
+#: gram.y:14717
 #, c-format
 msgid "multiple COLLATE clauses not allowed"
 msgstr "COLLATE можно указать только один раз"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14739 gram.y:14752
+#: gram.y:14755 gram.y:14768
 #, c-format
 msgid "%s constraints cannot be marked DEFERRABLE"
 msgstr "ограничени� %s не могут иметь характери�тики DEFERRABLE"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14765
+#: gram.y:14781
 #, c-format
 msgid "%s constraints cannot be marked NOT VALID"
 msgstr "ограничени� %s не могут иметь характери�тики NOT VALID"
 
 #. translator: %s is CHECK, UNIQUE, or similar
-#: gram.y:14778
+#: gram.y:14794
 #, c-format
 msgid "%s constraints cannot be marked NO INHERIT"
 msgstr "ограничени� %s не могут иметь характери�тики NO INHERIT"
@@ -24612,7 +24647,7 @@
 msgid "invalid streaming start location"
 msgstr "неверна� позици� начала потока"
 
-#: repl_scanner.l:170 scan.l:667
+#: repl_scanner.l:170 scan.l:668
 msgid "unterminated quoted string"
 msgstr "незавершённа� �трока в кавычках"
 
@@ -24621,24 +24656,24 @@
 msgid "syntax error: unexpected character \"%s\""
 msgstr "ошибка �интак�и�а: неожиданный �имвол \"%s\""
 
-#: scan.l:432
+#: scan.l:433
 msgid "unterminated /* comment"
 msgstr "незавершённый комментарий /*"
 
-#: scan.l:461
+#: scan.l:462
 msgid "unterminated bit string literal"
 msgstr "оборванна� битова� �трока"
 
-#: scan.l:482
+#: scan.l:483
 msgid "unterminated hexadecimal string literal"
 msgstr "оборванна� ше�тнадцатерична� �трока"
 
-#: scan.l:532
+#: scan.l:533
 #, c-format
 msgid "unsafe use of string constant with Unicode escapes"
 msgstr "небезопа�ное и�пользование �троковой кон�танты �о �пецкодами Unicode"
 
-#: scan.l:533
+#: scan.l:534
 #, c-format
 msgid ""
 "String constants with Unicode escapes cannot be used when "
@@ -24647,31 +24682,31 @@
 "Строки �о �пецкодами Unicode нельз� и�пользовать, когда параметр "
 "standard_conforming_strings выключен."
 
-#: scan.l:577 scan.l:773
+#: scan.l:578 scan.l:774
 msgid "invalid Unicode escape character"
 msgstr "неверный �имвол �пецкода Unicode"
 
-#: scan.l:602 scan.l:610 scan.l:618 scan.l:619 scan.l:620 scan.l:1329
-#: scan.l:1356 scan.l:1360 scan.l:1398 scan.l:1402 scan.l:1424
+#: scan.l:603 scan.l:611 scan.l:619 scan.l:620 scan.l:621 scan.l:1330
+#: scan.l:1357 scan.l:1361 scan.l:1399 scan.l:1403 scan.l:1425 scan.l:1435
 msgid "invalid Unicode surrogate pair"
 msgstr "неверна� �уррогатна� пара Unicode"
 
-#: scan.l:624
+#: scan.l:625
 #, c-format
 msgid "invalid Unicode escape"
 msgstr "неверный �пецкод Unicode"
 
-#: scan.l:625
+#: scan.l:626
 #, c-format
 msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
 msgstr "Спецкоды Unicode должны иметь вид \\uXXXX или \\UXXXXXXXX."
 
-#: scan.l:636
+#: scan.l:637
 #, c-format
 msgid "unsafe use of \\' in a string literal"
 msgstr "небезопа�ное и�пользование �имвола \\' в �троке"
 
-#: scan.l:637
+#: scan.l:638
 #, c-format
 msgid ""
 "Use '' to write quotes in strings. \\' is insecure in client-only encodings."
@@ -24679,35 +24714,35 @@
 "Запи�ывайте апо�троф в �троке в виде ''. Запи�ь \\' небезопа�на дл� "
 "и�ключительно клиент�ких кодировок."
 
-#: scan.l:712
+#: scan.l:713
 msgid "unterminated dollar-quoted string"
 msgstr "незавершённа� �пец�трока � $"
 
-#: scan.l:729 scan.l:753 scan.l:768
+#: scan.l:730 scan.l:754 scan.l:769
 msgid "zero-length delimited identifier"
 msgstr "пу�той идентификатор в кавычках"
 
-#: scan.l:788
+#: scan.l:789
 msgid "unterminated quoted identifier"
 msgstr "незавершённый идентификатор в кавычках"
 
-#: scan.l:919
+#: scan.l:920
 msgid "operator too long"
 msgstr "�лишком длинный оператор"
 
 #. translator: %s is typically the translation of "syntax error"
-#: scan.l:1072
+#: scan.l:1073
 #, c-format
 msgid "%s at end of input"
 msgstr "%s в конце"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: scan.l:1080
+#: scan.l:1081
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s (примерное положение: \"%s\")"
 
-#: scan.l:1245 scan.l:1277
+#: scan.l:1246 scan.l:1278
 msgid ""
 "Unicode escape values cannot be used for code point values above 007F when "
 "the server encoding is not UTF8"
@@ -24715,16 +24750,16 @@
 "Спецкоды Unicode дл� значений выше 007F можно и�пользовать только � "
 "�ерверной кодировкой UTF8"
 
-#: scan.l:1273 scan.l:1416
+#: scan.l:1274 scan.l:1417
 msgid "invalid Unicode escape value"
 msgstr "неверное значение �пецкода Unicode"
 
-#: scan.l:1472
+#: scan.l:1481
 #, c-format
 msgid "nonstandard use of \\' in a string literal"
 msgstr "не�тандартное применение \\' в �троке"
 
-#: scan.l:1473
+#: scan.l:1482
 #, c-format
 msgid ""
 "Use '' to write quotes in strings, or use the escape string syntax (E'...')."
@@ -24732,27 +24767,68 @@
 "Запи�ывайте апо�троф в �троках в виде '' или и�пользуйте �интак�и� �пец�трок "
 "(E'...')."
 
-#: scan.l:1482
+#: scan.l:1491
 #, c-format
 msgid "nonstandard use of \\\\ in a string literal"
 msgstr "не�тандартное применение \\\\ в �троке"
 
-#: scan.l:1483
+#: scan.l:1492
 #, c-format
 msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
 msgstr ""
 "И�пользуйте дл� запи�и обратных �л�шей �интак�и� �пец�трок, например E'\\\\'."
 
-#: scan.l:1497
+#: scan.l:1506
 #, c-format
 msgid "nonstandard use of escape in a string literal"
 msgstr "не�тандартное и�пользование �пец�имвола в �троке"
 
-#: scan.l:1498
+#: scan.l:1507
 #, c-format
 msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
 msgstr "И�пользуйте дл� запи�и �пец�имволов �интак�и� �пец�трок E'\\r\\n'."
 
+#~ msgid "Transaction ID %u finished; no more running transactions."
+#~ msgstr "Транзакци� %u завершена, больше активных транзакций нет."
+
+#~ msgid "%u transaction needs to finish."
+#~ msgid_plural "%u transactions need to finish."
+#~ msgstr[0] "�еобходимо дождать�� завершени� транзакций (%u)."
+#~ msgstr[1] "�еобходимо дождать�� завершени� транзакций (%u)."
+#~ msgstr[2] "�еобходимо дождать�� завершени� транзакций (%u)."
+
+#~ msgid "wrong range of array subscripts"
+#~ msgstr "неправильный диапазон индек�ов ма��ивов"
+
+#~ msgid "Lower bound of dimension array must be one."
+#~ msgstr "�ижн�� граница ма��ива размерно�тей должна быть равна 1."
+
+#~ msgid "huge TLB pages not supported on this platform"
+#~ msgstr "гигант�кие �траницы TLB на �той платформе не поддерживают��"
+
+#~ msgid "time zone abbreviation \"%s\" is not used in time zone \"%s\""
+#~ msgstr ""
+#~ "краткое обозначение ча�ового по��а \"%s\" от�ут�твует в данных ча�ового "
+#~ "по��а \"%s\""
+
+#~ msgid "invalid length in external \"numeric\" value"
+#~ msgstr "неверна� длина во внешнем значении \"numeric\""
+
+#~ msgid ""
+#~ "could not link file \"%s\" to \"%s\" (initialization of log file): %m"
+#~ msgstr ""
+#~ "дл� файла \"%s\" не удало�ь �оздать ��ылку \"%s\" (при инициализации "
+#~ "файла журнала): %m"
+
+#~ msgid ""
+#~ "could not rename file \"%s\" to \"%s\" (initialization of log file): %m"
+#~ msgstr ""
+#~ "не удало�ь переименовать файл \"%s\" в \"%s\" (при инициализации файла "
+#~ "журнала): %m"
+
+#~ msgid "system columns cannot be used in an ON CONFLICT clause"
+#~ msgstr "�и�темные �толбцы нельз� и�пользовать в предложении ON CONFLICT"
+
 #~ msgid "insufficient privilege to bypass row-level security"
 #~ msgstr "недо�таточно прав дл� обхода защиты на уровне �трок"
 
@@ -24932,9 +25008,6 @@
 #~ msgid "incorrect total length in record at %X/%X"
 #~ msgstr "некорректна� обща� длина в запи�и по �мещению %X/%X"
 
-#~ msgid "role with OID %u does not exist"
-#~ msgstr "роль � OID %u не �уще�твует"
-
 #~ msgid "=> is deprecated as an operator name"
 #~ msgstr "=> как им� оператора �читает�� у�таревшим"
 
diff -Nru postgresql-9.5-9.5.2/src/backend/port/atomics.c postgresql-9.5-9.5.8/src/backend/port/atomics.c
--- postgresql-9.5-9.5.2/src/backend/port/atomics.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/port/atomics.c	2017-08-07 21:13:41.000000000 +0000
@@ -112,6 +112,19 @@
 	ptr->value = val_;
 }
 
+void
+pg_atomic_write_u32_impl(volatile pg_atomic_uint32 *ptr, uint32 val)
+{
+	/*
+	 * One might think that an unlocked write doesn't need to acquire the
+	 * spinlock, but one would be wrong. Even an unlocked write has to cause a
+	 * concurrent pg_atomic_compare_exchange_u32() (et al) to fail.
+	 */
+	SpinLockAcquire((slock_t *) &ptr->sema);
+	ptr->value = val;
+	SpinLockRelease((slock_t *) &ptr->sema);
+}
+
 bool
 pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
 									uint32 *expected, uint32 newval)
diff -Nru postgresql-9.5-9.5.2/src/backend/port/dynloader/linux.c postgresql-9.5-9.5.8/src/backend/port/dynloader/linux.c
--- postgresql-9.5-9.5.2/src/backend/port/dynloader/linux.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/port/dynloader/linux.c	2017-08-07 21:13:41.000000000 +0000
@@ -124,7 +124,7 @@
 pg_dlerror(void)
 {
 #ifndef HAVE_DLD_H
-	return "dynaloader unspported";
+	return "dynaloader unsupported";
 #else
 	return dld_strerror(dld_errno);
 #endif
diff -Nru postgresql-9.5-9.5.2/src/backend/port/sysv_shmem.c postgresql-9.5-9.5.8/src/backend/port/sysv_shmem.c
--- postgresql-9.5-9.5.2/src/backend/port/sysv_shmem.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/port/sysv_shmem.c	2017-08-07 21:13:41.000000000 +0000
@@ -3,8 +3,11 @@
  * sysv_shmem.c
  *	  Implement shared memory using SysV facilities
  *
- * These routines represent a fairly thin layer on top of SysV shared
- * memory functionality.
+ * These routines used to be a fairly thin layer on top of SysV shared
+ * memory functionality.  With the addition of anonymous-shmem logic,
+ * they're a bit fatter now.  We still require a SysV shmem block to
+ * exist, though, because mmap'd shmem provides no way to find out how
+ * many processes are attached, which we need for interlocking purposes.
  *
  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -31,19 +34,50 @@
 #include "miscadmin.h"
 #include "portability/mem.h"
 #include "storage/dsm.h"
+#include "storage/fd.h"
 #include "storage/ipc.h"
 #include "storage/pg_shmem.h"
 #include "utils/guc.h"
 
 
+/*
+ * As of PostgreSQL 9.3, we normally allocate only a very small amount of
+ * System V shared memory, and only for the purposes of providing an
+ * interlock to protect the data directory.  The real shared memory block
+ * is allocated using mmap().  This works around the problem that many
+ * systems have very low limits on the amount of System V shared memory
+ * that can be allocated.  Even a limit of a few megabytes will be enough
+ * to run many copies of PostgreSQL without needing to adjust system settings.
+ *
+ * We assume that no one will attempt to run PostgreSQL 9.3 or later on
+ * systems that are ancient enough that anonymous shared memory is not
+ * supported, such as pre-2.4 versions of Linux.  If that turns out to be
+ * false, we might need to add compile and/or run-time tests here and do this
+ * only if the running kernel supports it.
+ *
+ * However, we must always disable this logic in the EXEC_BACKEND case, and
+ * fall back to the old method of allocating the entire segment using System V
+ * shared memory, because there's no way to attach an anonymous mmap'd segment
+ * to a process after exec().  Since EXEC_BACKEND is intended only for
+ * developer use, this shouldn't be a big problem.  Because of this, we do
+ * not worry about supporting anonymous shmem in the EXEC_BACKEND cases below.
+ */
+#ifndef EXEC_BACKEND
+#define USE_ANONYMOUS_SHMEM
+#endif
+
+
 typedef key_t IpcMemoryKey;		/* shared memory key passed to shmget(2) */
 typedef int IpcMemoryId;		/* shared memory ID returned by shmget(2) */
 
 
 unsigned long UsedShmemSegID = 0;
 void	   *UsedShmemSegAddr = NULL;
+
+#ifdef USE_ANONYMOUS_SHMEM
 static Size AnonymousShmemSize;
 static void *AnonymousShmem = NULL;
+#endif
 
 static void *InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size);
 static void IpcMemoryDetach(int status, Datum shmaddr);
@@ -68,8 +102,28 @@
 InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
 {
 	IpcMemoryId shmid;
+	void	   *requestedAddress = NULL;
 	void	   *memAddress;
 
+	/*
+	 * Normally we just pass requestedAddress = NULL to shmat(), allowing the
+	 * system to choose where the segment gets mapped.  But in an EXEC_BACKEND
+	 * build, it's possible for whatever is chosen in the postmaster to not
+	 * work for backends, due to variations in address space layout.  As a
+	 * rather klugy workaround, allow the user to specify the address to use
+	 * via setting the environment variable PG_SHMEM_ADDR.  (If this were of
+	 * interest for anything except debugging, we'd probably create a cleaner
+	 * and better-documented way to set it, such as a GUC.)
+	 */
+#ifdef EXEC_BACKEND
+	{
+		char	   *pg_shmem_addr = getenv("PG_SHMEM_ADDR");
+
+		if (pg_shmem_addr)
+			requestedAddress = (void *) strtoul(pg_shmem_addr, NULL, 0);
+	}
+#endif
+
 	shmid = shmget(memKey, size, IPC_CREAT | IPC_EXCL | IPCProtection);
 
 	if (shmid < 0)
@@ -169,10 +223,11 @@
 	on_shmem_exit(IpcMemoryDelete, Int32GetDatum(shmid));
 
 	/* OK, should be able to attach to the segment */
-	memAddress = shmat(shmid, NULL, PG_SHMAT_FLAGS);
+	memAddress = shmat(shmid, requestedAddress, PG_SHMAT_FLAGS);
 
 	if (memAddress == (void *) -1)
-		elog(FATAL, "shmat(id=%d) failed: %m", shmid);
+		elog(FATAL, "shmat(id=%d, addr=%p, flags=0x%x) failed: %m",
+			 shmid, requestedAddress, PG_SHMAT_FLAGS);
 
 	/* Register on-exit routine to detach new segment before deleting */
 	on_shmem_exit(IpcMemoryDetach, PointerGetDatum(memAddress));
@@ -204,10 +259,6 @@
 	/* Detach System V shared memory block. */
 	if (shmdt(DatumGetPointer(shmaddr)) < 0)
 		elog(LOG, "shmdt(%p) failed: %m", DatumGetPointer(shmaddr));
-	/* Release anonymous shared memory block, if any. */
-	if (AnonymousShmem != NULL
-		&& munmap(AnonymousShmem, AnonymousShmemSize) < 0)
-		elog(LOG, "munmap(%p) failed: %m", AnonymousShmem);
 }
 
 /****************************************************************************/
@@ -318,6 +369,82 @@
 	return true;
 }
 
+#ifdef USE_ANONYMOUS_SHMEM
+
+#ifdef MAP_HUGETLB
+
+/*
+ * Identify the huge page size to use.
+ *
+ * Some Linux kernel versions have a bug causing mmap() to fail on requests
+ * that are not a multiple of the hugepage size.  Versions without that bug
+ * instead silently round the request up to the next hugepage multiple ---
+ * and then munmap() fails when we give it a size different from that.
+ * So we have to round our request up to a multiple of the actual hugepage
+ * size to avoid trouble.
+ *
+ * Doing the round-up ourselves also lets us make use of the extra memory,
+ * rather than just wasting it.  Currently, we just increase the available
+ * space recorded in the shmem header, which will make the extra usable for
+ * purposes such as additional locktable entries.  Someday, for very large
+ * hugepage sizes, we might want to think about more invasive strategies,
+ * such as increasing shared_buffers to absorb the extra space.
+ *
+ * Returns the (real or assumed) page size into *hugepagesize,
+ * and the hugepage-related mmap flags to use into *mmap_flags.
+ *
+ * Currently *mmap_flags is always just MAP_HUGETLB.  Someday, on systems
+ * that support it, we might OR in additional bits to specify a particular
+ * non-default huge page size.
+ */
+static void
+GetHugePageSize(Size *hugepagesize, int *mmap_flags)
+{
+	/*
+	 * If we fail to find out the system's default huge page size, assume it
+	 * is 2MB.  This will work fine when the actual size is less.  If it's
+	 * more, we might get mmap() or munmap() failures due to unaligned
+	 * requests; but at this writing, there are no reports of any non-Linux
+	 * systems being picky about that.
+	 */
+	*hugepagesize = 2 * 1024 * 1024;
+	*mmap_flags = MAP_HUGETLB;
+
+	/*
+	 * System-dependent code to find out the default huge page size.
+	 *
+	 * On Linux, read /proc/meminfo looking for a line like "Hugepagesize:
+	 * nnnn kB".  Ignore any failures, falling back to the preset default.
+	 */
+#ifdef __linux__
+	{
+		FILE	   *fp = AllocateFile("/proc/meminfo", "r");
+		char		buf[128];
+		unsigned int sz;
+		char		ch;
+
+		if (fp)
+		{
+			while (fgets(buf, sizeof(buf), fp))
+			{
+				if (sscanf(buf, "Hugepagesize: %u %c", &sz, &ch) == 2)
+				{
+					if (ch == 'k')
+					{
+						*hugepagesize = sz * (Size) 1024;
+						break;
+					}
+					/* We could accept other units besides kB, if needed */
+				}
+			}
+			FreeFile(fp);
+		}
+	}
+#endif   /* __linux__ */
+}
+
+#endif   /* MAP_HUGETLB */
+
 /*
  * Creates an anonymous mmap()ed shared memory segment.
  *
@@ -325,7 +452,6 @@
  * actual size of the allocation, if it ends up allocating a segment that is
  * larger than requested.
  */
-#ifndef EXEC_BACKEND
 static void *
 CreateAnonymousSegment(Size *size)
 {
@@ -334,47 +460,35 @@
 	int			mmap_errno = 0;
 
 #ifndef MAP_HUGETLB
-	if (huge_pages == HUGE_PAGES_ON)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("huge TLB pages not supported on this platform")));
+	/* PGSharedMemoryCreate should have dealt with this case */
+	Assert(huge_pages != HUGE_PAGES_ON);
 #else
 	if (huge_pages == HUGE_PAGES_ON || huge_pages == HUGE_PAGES_TRY)
 	{
 		/*
 		 * Round up the request size to a suitable large value.
-		 *
-		 * Some Linux kernel versions are known to have a bug, which causes
-		 * mmap() with MAP_HUGETLB to fail if the request size is not a
-		 * multiple of any supported huge page size. To work around that, we
-		 * round up the request size to nearest 2MB. 2MB is the most common
-		 * huge page page size on affected systems.
-		 *
-		 * Aside from that bug, even with a kernel that does the allocation
-		 * correctly, rounding it up ourselves avoids wasting memory. Without
-		 * it, if we for example make an allocation of 2MB + 1 bytes, the
-		 * kernel might decide to use two 2MB huge pages for that, and waste 2
-		 * MB - 1 of memory. When we do the rounding ourselves, we can use
-		 * that space for allocations.
 		 */
-		int			hugepagesize = 2 * 1024 * 1024;
+		Size		hugepagesize;
+		int			mmap_flags;
+
+		GetHugePageSize(&hugepagesize, &mmap_flags);
 
 		if (allocsize % hugepagesize != 0)
 			allocsize += hugepagesize - (allocsize % hugepagesize);
 
 		ptr = mmap(NULL, allocsize, PROT_READ | PROT_WRITE,
-				   PG_MMAP_FLAGS | MAP_HUGETLB, -1, 0);
+				   PG_MMAP_FLAGS | mmap_flags, -1, 0);
 		mmap_errno = errno;
 		if (huge_pages == HUGE_PAGES_TRY && ptr == MAP_FAILED)
-			elog(DEBUG1, "mmap with MAP_HUGETLB failed, huge pages disabled: %m");
+			elog(DEBUG1, "mmap(%zu) with MAP_HUGETLB failed, huge pages disabled: %m",
+				 allocsize);
 	}
 #endif
 
-	if (huge_pages == HUGE_PAGES_OFF ||
-		(huge_pages == HUGE_PAGES_TRY && ptr == MAP_FAILED))
+	if (ptr == MAP_FAILED && huge_pages != HUGE_PAGES_ON)
 	{
 		/*
-		 * use the original size, not the rounded up value, when falling back
+		 * Use the original size, not the rounded-up value, when falling back
 		 * to non-huge pages.
 		 */
 		allocsize = *size;
@@ -401,7 +515,25 @@
 	*size = allocsize;
 	return ptr;
 }
-#endif
+
+/*
+ * AnonymousShmemDetach --- detach from an anonymous mmap'd block
+ * (called as an on_shmem_exit callback, hence funny argument list)
+ */
+static void
+AnonymousShmemDetach(int status, Datum arg)
+{
+	/* Release anonymous shared memory block, if any. */
+	if (AnonymousShmem != NULL)
+	{
+		if (munmap(AnonymousShmem, AnonymousShmemSize) < 0)
+			elog(LOG, "munmap(%p, %zu) failed: %m",
+				 AnonymousShmem, AnonymousShmemSize);
+		AnonymousShmem = NULL;
+	}
+}
+
+#endif   /* USE_ANONYMOUS_SHMEM */
 
 /*
  * PGSharedMemoryCreate
@@ -432,7 +564,8 @@
 	struct stat statbuf;
 	Size		sysvsize;
 
-#if defined(EXEC_BACKEND) || !defined(MAP_HUGETLB)
+	/* Complain if hugepages demanded but we can't possibly support them */
+#if !defined(USE_ANONYMOUS_SHMEM) || !defined(MAP_HUGETLB)
 	if (huge_pages == HUGE_PAGES_ON)
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -442,32 +575,13 @@
 	/* Room for a header? */
 	Assert(size > MAXALIGN(sizeof(PGShmemHeader)));
 
-	/*
-	 * As of PostgreSQL 9.3, we normally allocate only a very small amount of
-	 * System V shared memory, and only for the purposes of providing an
-	 * interlock to protect the data directory.  The real shared memory block
-	 * is allocated using mmap().  This works around the problem that many
-	 * systems have very low limits on the amount of System V shared memory
-	 * that can be allocated.  Even a limit of a few megabytes will be enough
-	 * to run many copies of PostgreSQL without needing to adjust system
-	 * settings.
-	 *
-	 * We assume that no one will attempt to run PostgreSQL 9.3 or later on
-	 * systems that are ancient enough that anonymous shared memory is not
-	 * supported, such as pre-2.4 versions of Linux.  If that turns out to be
-	 * false, we might need to add a run-time test here and do this only if
-	 * the running kernel supports it.
-	 *
-	 * However, we disable this logic in the EXEC_BACKEND case, and fall back
-	 * to the old method of allocating the entire segment using System V
-	 * shared memory, because there's no way to attach an mmap'd segment to a
-	 * process after exec().  Since EXEC_BACKEND is intended only for
-	 * developer use, this shouldn't be a big problem.
-	 */
-#ifndef EXEC_BACKEND
+#ifdef USE_ANONYMOUS_SHMEM
 	AnonymousShmem = CreateAnonymousSegment(&size);
 	AnonymousShmemSize = size;
 
+	/* Register on-exit routine to unmap the anonymous segment */
+	on_shmem_exit(AnonymousShmemDetach, (Datum) 0);
+
 	/* Now we need only allocate a minimal-sized SysV shmem block. */
 	sysvsize = sizeof(PGShmemHeader);
 #else
@@ -572,10 +686,14 @@
 	 * block. Otherwise, the System V shared memory block is only a shim, and
 	 * we must return a pointer to the real block.
 	 */
+#ifdef USE_ANONYMOUS_SHMEM
 	if (AnonymousShmem == NULL)
 		return hdr;
 	memcpy(AnonymousShmem, hdr, sizeof(PGShmemHeader));
 	return (PGShmemHeader *) AnonymousShmem;
+#else
+	return hdr;
+#endif
 }
 
 #ifdef EXEC_BACKEND
@@ -660,12 +778,12 @@
  *
  * Detach from the shared memory segment, if still attached.  This is not
  * intended to be called explicitly by the process that originally created the
- * segment (it will have an on_shmem_exit callback registered to do that).
+ * segment (it will have on_shmem_exit callback(s) registered to do that).
  * Rather, this is for subprocesses that have inherited an attachment and want
  * to get rid of it.
  *
  * UsedShmemSegID and UsedShmemSegAddr are implicit parameters to this
- * routine.
+ * routine, also AnonymousShmem and AnonymousShmemSize.
  */
 void
 PGSharedMemoryDetach(void)
@@ -682,10 +800,15 @@
 		UsedShmemSegAddr = NULL;
 	}
 
-	/* Release anonymous shared memory block, if any. */
-	if (AnonymousShmem != NULL
-		&& munmap(AnonymousShmem, AnonymousShmemSize) < 0)
-		elog(LOG, "munmap(%p) failed: %m", AnonymousShmem);
+#ifdef USE_ANONYMOUS_SHMEM
+	if (AnonymousShmem != NULL)
+	{
+		if (munmap(AnonymousShmem, AnonymousShmemSize) < 0)
+			elog(LOG, "munmap(%p, %zu) failed: %m",
+				 AnonymousShmem, AnonymousShmemSize);
+		AnonymousShmem = NULL;
+	}
+#endif
 }
 
 
diff -Nru postgresql-9.5-9.5.2/src/backend/port/unix_latch.c postgresql-9.5-9.5.8/src/backend/port/unix_latch.c
--- postgresql-9.5-9.5.2/src/backend/port/unix_latch.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/port/unix_latch.c	2017-08-07 21:13:41.000000000 +0000
@@ -90,9 +90,9 @@
 	 */
 	if (pipe(pipefd) < 0)
 		elog(FATAL, "pipe() failed: %m");
-	if (fcntl(pipefd[0], F_SETFL, O_NONBLOCK) < 0)
+	if (fcntl(pipefd[0], F_SETFL, O_NONBLOCK) == -1)
 		elog(FATAL, "fcntl() failed on read-end of self-pipe: %m");
-	if (fcntl(pipefd[1], F_SETFL, O_NONBLOCK) < 0)
+	if (fcntl(pipefd[1], F_SETFL, O_NONBLOCK) == -1)
 		elog(FATAL, "fcntl() failed on write-end of self-pipe: %m");
 
 	selfpipe_readfd = pipefd[0];
diff -Nru postgresql-9.5-9.5.2/src/backend/port/win32/crashdump.c postgresql-9.5-9.5.8/src/backend/port/win32/crashdump.c
--- postgresql-9.5-9.5.2/src/backend/port/win32/crashdump.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/port/win32/crashdump.c	2017-08-07 21:13:41.000000000 +0000
@@ -41,7 +41,21 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <string.h>
+/*
+ * Some versions of the MS SDK contain "typedef enum { ... } ;" which the MS
+ * compiler quite sanely complains about. Well done, Microsoft.
+ * This pragma disables the warning just while we include the header.
+ * The pragma is known to work with all (as at the time of writing) supported
+ * versions of MSVC.
+ */
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4091)
+#endif
 #include <dbghelp.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 /*
  * Much of the following code is based on CodeProject and MSDN examples,
diff -Nru postgresql-9.5-9.5.2/src/backend/port/win32/security.c postgresql-9.5-9.5.8/src/backend/port/win32/security.c
--- postgresql-9.5-9.5.2/src/backend/port/win32/security.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/port/win32/security.c	2017-08-07 21:13:41.000000000 +0000
@@ -188,7 +188,8 @@
 	_is_service = 0;
 	for (x = 0; x < Groups->GroupCount; x++)
 	{
-		if (EqualSid(ServiceSid, Groups->Groups[x].Sid))
+		if (EqualSid(ServiceSid, Groups->Groups[x].Sid) &&
+			(Groups->Groups[x].Attributes & SE_GROUP_ENABLED))
 		{
 			_is_service = 1;
 			break;
diff -Nru postgresql-9.5-9.5.2/src/backend/port/win32/signal.c postgresql-9.5-9.5.8/src/backend/port/win32/signal.c
--- postgresql-9.5-9.5.2/src/backend/port/win32/signal.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/port/win32/signal.c	2017-08-07 21:13:41.000000000 +0000
@@ -33,6 +33,7 @@
  */
 static CRITICAL_SECTION pg_signal_crit_sec;
 
+/* Note that array elements 0 are unused since they correspond to signal 0 */
 static pqsigfunc pg_signal_array[PG_SIGNAL_COUNT];
 static pqsigfunc pg_signal_defaults[PG_SIGNAL_COUNT];
 
@@ -105,15 +106,15 @@
 void
 pgwin32_dispatch_queued_signals(void)
 {
-	int			i;
+	int			exec_mask;
 
 	EnterCriticalSection(&pg_signal_crit_sec);
-	while (UNBLOCKED_SIGNAL_QUEUE())
+	while ((exec_mask = UNBLOCKED_SIGNAL_QUEUE()) != 0)
 	{
 		/* One or more unblocked signals queued for execution */
-		int			exec_mask = UNBLOCKED_SIGNAL_QUEUE();
+		int			i;
 
-		for (i = 0; i < PG_SIGNAL_COUNT; i++)
+		for (i = 1; i < PG_SIGNAL_COUNT; i++)
 		{
 			if (exec_mask & sigmask(i))
 			{
diff -Nru postgresql-9.5-9.5.2/src/backend/port/win32/socket.c postgresql-9.5-9.5.8/src/backend/port/win32/socket.c
--- postgresql-9.5-9.5.2/src/backend/port/win32/socket.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/port/win32/socket.c	2017-08-07 21:13:41.000000000 +0000
@@ -27,7 +27,10 @@
  */
 int			pgwin32_noblock = 0;
 
+/* Undef the macros defined in win32.h, so we can access system functions */
 #undef socket
+#undef bind
+#undef listen
 #undef accept
 #undef connect
 #undef select
@@ -41,23 +44,38 @@
 
 /*
  * Convert the last socket error code into errno
+ *
+ * Note: where there is a direct correspondence between a WSAxxx error code
+ * and a Berkeley error symbol, this mapping is actually a no-op, because
+ * in win32.h we redefine the network-related Berkeley error symbols to have
+ * the values of their WSAxxx counterparts.  The point of the switch is
+ * mostly to translate near-miss error codes into something that's sensible
+ * in the Berkeley universe.
  */
 static void
 TranslateSocketError(void)
 {
 	switch (WSAGetLastError())
 	{
-		case WSANOTINITIALISED:
-		case WSAENETDOWN:
-		case WSAEINPROGRESS:
 		case WSAEINVAL:
-		case WSAESOCKTNOSUPPORT:
-		case WSAEFAULT:
+		case WSANOTINITIALISED:
 		case WSAEINVALIDPROVIDER:
 		case WSAEINVALIDPROCTABLE:
-		case WSAEMSGSIZE:
+		case WSAEDESTADDRREQ:
 			errno = EINVAL;
 			break;
+		case WSAEINPROGRESS:
+			errno = EINPROGRESS;
+			break;
+		case WSAEFAULT:
+			errno = EFAULT;
+			break;
+		case WSAEISCONN:
+			errno = EISCONN;
+			break;
+		case WSAEMSGSIZE:
+			errno = EMSGSIZE;
+			break;
 		case WSAEAFNOSUPPORT:
 			errno = EAFNOSUPPORT;
 			break;
@@ -69,16 +87,23 @@
 			break;
 		case WSAEPROTONOSUPPORT:
 		case WSAEPROTOTYPE:
+		case WSAESOCKTNOSUPPORT:
 			errno = EPROTONOSUPPORT;
 			break;
+		case WSAECONNABORTED:
+			errno = ECONNABORTED;
+			break;
 		case WSAECONNREFUSED:
 			errno = ECONNREFUSED;
 			break;
+		case WSAECONNRESET:
+			errno = ECONNRESET;
+			break;
 		case WSAEINTR:
 			errno = EINTR;
 			break;
 		case WSAENOTSOCK:
-			errno = EBADFD;
+			errno = ENOTSOCK;
 			break;
 		case WSAEOPNOTSUPP:
 			errno = EOPNOTSUPP;
@@ -89,13 +114,24 @@
 		case WSAEACCES:
 			errno = EACCES;
 			break;
-		case WSAENOTCONN:
+		case WSAEADDRINUSE:
+			errno = EADDRINUSE;
+			break;
+		case WSAEADDRNOTAVAIL:
+			errno = EADDRNOTAVAIL;
+			break;
+		case WSAEHOSTUNREACH:
+		case WSAEHOSTDOWN:
+		case WSAHOST_NOT_FOUND:
+		case WSAENETDOWN:
+		case WSAENETUNREACH:
 		case WSAENETRESET:
-		case WSAECONNRESET:
+			errno = EHOSTUNREACH;
+			break;
+		case WSAENOTCONN:
 		case WSAESHUTDOWN:
-		case WSAECONNABORTED:
 		case WSAEDISCON:
-			errno = ECONNREFUSED;		/* ENOTCONN? */
+			errno = ENOTCONN;
 			break;
 		default:
 			ereport(NOTICE,
@@ -261,6 +297,27 @@
 	return s;
 }
 
+int
+pgwin32_bind(SOCKET s, struct sockaddr * addr, int addrlen)
+{
+	int			res;
+
+	res = bind(s, addr, addrlen);
+	if (res < 0)
+		TranslateSocketError();
+	return res;
+}
+
+int
+pgwin32_listen(SOCKET s, int backlog)
+{
+	int			res;
+
+	res = listen(s, backlog);
+	if (res < 0)
+		TranslateSocketError();
+	return res;
+}
 
 SOCKET
 pgwin32_accept(SOCKET s, struct sockaddr * addr, int *addrlen)
@@ -658,7 +715,9 @@
 	}
 
 	ZeroMemory(&wserrbuf, sizeof(wserrbuf));
-	if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE,
+	if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS |
+					  FORMAT_MESSAGE_FROM_SYSTEM |
+					  FORMAT_MESSAGE_FROM_HMODULE,
 					  handleDLL,
 					  err,
 					  MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
diff -Nru postgresql-9.5-9.5.2/src/backend/postmaster/autovacuum.c postgresql-9.5-9.5.8/src/backend/postmaster/autovacuum.c
--- postgresql-9.5-9.5.2/src/backend/postmaster/autovacuum.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/postmaster/autovacuum.c	2017-08-07 21:13:41.000000000 +0000
@@ -190,6 +190,7 @@
 	int			at_vacuum_cost_delay;
 	int			at_vacuum_cost_limit;
 	bool		at_dobalance;
+	bool		at_sharedrel;
 	char	   *at_relname;
 	char	   *at_nspname;
 	char	   *at_datname;
@@ -203,6 +204,7 @@
  * wi_links		entry into free list or running list
  * wi_dboid		OID of the database this worker is supposed to work on
  * wi_tableoid	OID of the table currently being vacuumed, if any
+ * wi_sharedrel	flag indicating whether table is marked relisshared
  * wi_proc		pointer to PGPROC of the running worker, NULL if not started
  * wi_launchtime Time at which this worker was launched
  * wi_cost_*	Vacuum cost-based delay parameters current in this worker
@@ -220,6 +222,7 @@
 	PGPROC	   *wi_proc;
 	TimestampTz wi_launchtime;
 	bool		wi_dobalance;
+	bool		wi_sharedrel;
 	int			wi_cost_delay;
 	int			wi_cost_limit;
 	int			wi_cost_limit_base;
@@ -717,6 +720,7 @@
 					worker = AutoVacuumShmem->av_startingWorker;
 					worker->wi_dboid = InvalidOid;
 					worker->wi_tableoid = InvalidOid;
+					worker->wi_sharedrel = false;
 					worker->wi_proc = NULL;
 					worker->wi_launchtime = 0;
 					dlist_push_head(&AutoVacuumShmem->av_freeWorkers,
@@ -1683,6 +1687,7 @@
 		dlist_delete(&MyWorkerInfo->wi_links);
 		MyWorkerInfo->wi_dboid = InvalidOid;
 		MyWorkerInfo->wi_tableoid = InvalidOid;
+		MyWorkerInfo->wi_sharedrel = false;
 		MyWorkerInfo->wi_proc = NULL;
 		MyWorkerInfo->wi_launchtime = 0;
 		MyWorkerInfo->wi_dobalance = false;
@@ -1894,6 +1899,8 @@
 	ScanKeyData key;
 	TupleDesc	pg_class_desc;
 	int			effective_multixact_freeze_max_age;
+	bool		did_vacuum = false;
+	bool		found_concurrent_worker = false;
 
 	/*
 	 * StartTransactionCommand and CommitTransactionCommand will automatically
@@ -2229,13 +2236,14 @@
 			if (worker == MyWorkerInfo)
 				continue;
 
-			/* ignore workers in other databases */
-			if (worker->wi_dboid != MyDatabaseId)
+			/* ignore workers in other databases (unless table is shared) */
+			if (!worker->wi_sharedrel && worker->wi_dboid != MyDatabaseId)
 				continue;
 
 			if (worker->wi_tableoid == relid)
 			{
 				skipit = true;
+				found_concurrent_worker = true;
 				break;
 			}
 		}
@@ -2271,6 +2279,7 @@
 		 * the lock so that other workers don't vacuum it concurrently.
 		 */
 		MyWorkerInfo->wi_tableoid = relid;
+		MyWorkerInfo->wi_sharedrel = tab->at_sharedrel;
 		LWLockRelease(AutovacuumScheduleLock);
 
 		/*
@@ -2361,6 +2370,8 @@
 		}
 		PG_END_TRY();
 
+		did_vacuum = true;
+
 		/* the PGXACT flags are reset at the next end of transaction */
 
 		/* be tidy */
@@ -2382,6 +2393,7 @@
 		 */
 		LWLockAcquire(AutovacuumLock, LW_EXCLUSIVE);
 		MyWorkerInfo->wi_tableoid = InvalidOid;
+		MyWorkerInfo->wi_sharedrel = false;
 		LWLockRelease(AutovacuumLock);
 
 		/* restore vacuum cost GUCs for the next iteration */
@@ -2397,8 +2409,25 @@
 	/*
 	 * Update pg_database.datfrozenxid, and truncate pg_clog if possible. We
 	 * only need to do this once, not after each table.
+	 *
+	 * Even if we didn't vacuum anything, it may still be important to do
+	 * this, because one indirect effect of vac_update_datfrozenxid() is to
+	 * update ShmemVariableCache->xidVacLimit.  That might need to be done
+	 * even if we haven't vacuumed anything, because relations with older
+	 * relfrozenxid values or other databases with older datfrozenxid values
+	 * might have been dropped, allowing xidVacLimit to advance.
+	 *
+	 * However, it's also important not to do this blindly in all cases,
+	 * because when autovacuum=off this will restart the autovacuum launcher.
+	 * If we're not careful, an infinite loop can result, where workers find
+	 * no work to do and restart the launcher, which starts another worker in
+	 * the same database that finds no work to do.  To prevent that, we skip
+	 * this if (1) we found no work to do and (2) we skipped at least one
+	 * table due to concurrent autovacuum activity.  In that case, the other
+	 * worker has already done it, or will do so when it finishes.
 	 */
-	vac_update_datfrozenxid();
+	if (did_vacuum || !found_concurrent_worker)
+		vac_update_datfrozenxid();
 
 	/* Finally close out the last transaction. */
 	CommitTransactionCommand();
@@ -2577,6 +2606,7 @@
 
 		tab = palloc(sizeof(autovac_table));
 		tab->at_relid = relid;
+		tab->at_sharedrel = classForm->relisshared;
 		tab->at_vacoptions = VACOPT_SKIPTOAST |
 			(dovacuum ? VACOPT_VACUUM : 0) |
 			(doanalyze ? VACOPT_ANALYZE : 0) |
diff -Nru postgresql-9.5-9.5.2/src/backend/postmaster/bgworker.c postgresql-9.5-9.5.8/src/backend/postmaster/bgworker.c
--- postgresql-9.5-9.5.2/src/backend/postmaster/bgworker.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/postmaster/bgworker.c	2017-08-07 21:13:41.000000000 +0000
@@ -16,6 +16,7 @@
 
 #include "miscadmin.h"
 #include "libpq/pqsignal.h"
+#include "access/parallel.h"
 #include "postmaster/bgworker_internals.h"
 #include "postmaster/postmaster.h"
 #include "storage/barrier.h"
@@ -94,6 +95,25 @@
 static BackgroundWorkerArray *BackgroundWorkerData;
 
 /*
+ * List of internal background workers. These are used for mapping the
+ * function name to actual function when building with EXEC_BACKEND and also
+ * to allow these to be loaded outside of shared_preload_libraries.
+ */
+typedef struct InternalBGWorkerMain
+{
+	char			   *bgw_function_name;
+	bgworker_main_type	bgw_main;
+} InternalBGWorkerMain;
+
+static const InternalBGWorkerMain InternalBGWorkers[] = {
+	{"ParallelWorkerMain", ParallelWorkerMain},
+	/* Dummy entry marking end of the array. */
+	{NULL, NULL}
+};
+
+static bgworker_main_type GetInternalBgWorkerMain(BackgroundWorker *worker);
+
+/*
  * Calculate shared memory needed.
  */
 Size
@@ -601,7 +621,6 @@
 	 */
 	if ((worker->bgw_flags & BGWORKER_SHMEM_ACCESS) == 0)
 	{
-		on_exit_reset();
 		dsm_detach_all();
 		PGSharedMemoryDetach();
 	}
@@ -696,22 +715,27 @@
 #endif
 	}
 
+	/* For internal workers set the entry point to known function address. */
+	entrypt = GetInternalBgWorkerMain(worker);
+
 	/*
-	 * If bgw_main is set, we use that value as the initial entrypoint.
-	 * However, if the library containing the entrypoint wasn't loaded at
-	 * postmaster startup time, passing it as a direct function pointer is not
-	 * possible.  To work around that, we allow callers for whom a function
-	 * pointer is not available to pass a library name (which will be loaded,
-	 * if necessary) and a function name (which will be looked up in the named
+	 * Otherwise, if bgw_main is set, we use that value as the initial
+	 * entrypoint. This does not work well EXEC_BACKEND outside Windows but
+	 * we keep the logic for backwards compatibility. In other cases use
+	 * the entry point specified by library name (which will be loaded, if
+	 * necessary) and a function name (which will be looked up in the named
 	 * library).
 	 */
-	if (worker->bgw_main != NULL)
-		entrypt = worker->bgw_main;
-	else
-		entrypt = (bgworker_main_type)
-			load_external_function(worker->bgw_library_name,
-								   worker->bgw_function_name,
-								   true, NULL);
+	if (entrypt == NULL)
+	{
+		if (worker->bgw_main != NULL)
+			entrypt = worker->bgw_main;
+		else
+			entrypt = (bgworker_main_type)
+				load_external_function(worker->bgw_library_name,
+									   worker->bgw_function_name,
+									   true, NULL);
+	}
 
 	/*
 	 * Note that in normal processes, we would call InitPostgres here.  For a
@@ -1025,13 +1049,16 @@
 
 			status = GetBackgroundWorkerPid(handle, &pid);
 			if (status == BGWH_STOPPED)
-				return status;
+				break;
 
 			rc = WaitLatch(&MyProc->procLatch,
 						   WL_LATCH_SET | WL_POSTMASTER_DEATH, 0);
 
 			if (rc & WL_POSTMASTER_DEATH)
-				return BGWH_POSTMASTER_DIED;
+			{
+				status = BGWH_POSTMASTER_DIED;
+				break;
+			}
 
 			ResetLatch(&MyProc->procLatch);
 		}
@@ -1076,3 +1103,28 @@
 	if (signal_postmaster)
 		SendPostmasterSignal(PMSIGNAL_BACKGROUND_WORKER_CHANGE);
 }
+
+/*
+ * Search the known internal worker array and return its main function
+ * pointer if found.
+ *
+ * Returns NULL if not known internal worker.
+ */
+static bgworker_main_type
+GetInternalBgWorkerMain(BackgroundWorker *worker)
+{
+	int i;
+
+	/* Internal workers always have to use postgres as library name. */
+	if (strncmp(worker->bgw_library_name, "postgres", BGW_MAXLEN) != 0)
+		return NULL;
+
+	for (i = 0; InternalBGWorkers[i].bgw_function_name; i++)
+	{
+		if (strncmp(InternalBGWorkers[i].bgw_function_name,
+					worker->bgw_function_name, BGW_MAXLEN) == 0)
+			return InternalBGWorkers[i].bgw_main;
+	}
+
+	return NULL;
+}
diff -Nru postgresql-9.5-9.5.2/src/backend/postmaster/pgstat.c postgresql-9.5-9.5.8/src/backend/postmaster/pgstat.c
--- postgresql-9.5-9.5.2/src/backend/postmaster/pgstat.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/postmaster/pgstat.c	2017-08-07 21:13:41.000000000 +0000
@@ -28,6 +28,9 @@
 #include <arpa/inet.h>
 #include <signal.h>
 #include <time.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 
 #include "pgstat.h"
 
@@ -38,7 +41,6 @@
 #include "access/xact.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_proc.h"
-#include "lib/ilist.h"
 #include "libpq/ip.h"
 #include "libpq/libpq.h"
 #include "libpq/pqsignal.h"
@@ -90,6 +92,9 @@
 #define PGSTAT_POLL_LOOP_COUNT	(PGSTAT_MAX_WAIT_TIME / PGSTAT_RETRY_DELAY)
 #define PGSTAT_INQ_LOOP_COUNT	(PGSTAT_INQ_INTERVAL / PGSTAT_RETRY_DELAY)
 
+/* Minimum receive buffer size for the collector's socket. */
+#define PGSTAT_MIN_RCVBUF		(100 * 1024)
+
 
 /* ----------
  * The initial size hints for the hash tables used in the collector.
@@ -221,17 +226,14 @@
 static PgStat_ArchiverStats archiverStats;
 static PgStat_GlobalStats globalStats;
 
-/* Write request info for each database */
-typedef struct DBWriteRequest
-{
-	Oid			databaseid;		/* OID of the database to write */
-	TimestampTz request_time;	/* timestamp of the last write request */
-	slist_node	next;
-} DBWriteRequest;
-
-/* Latest statistics request times from backends */
-static slist_head last_statrequests = SLIST_STATIC_INIT(last_statrequests);
+/*
+ * List of OIDs of databases we need to write out.  If an entry is InvalidOid,
+ * it means to write only the shared-catalog stats ("DB 0"); otherwise, we
+ * will write both that DB's data and the shared stats.
+ */
+static List *pending_write_requests = NIL;
 
+/* Signal handler flags */
 static volatile bool need_exit = false;
 static volatile bool got_SIGHUP = false;
 
@@ -538,6 +540,35 @@
 		goto startup_failed;
 	}
 
+	/*
+	 * Try to ensure that the socket's receive buffer is at least
+	 * PGSTAT_MIN_RCVBUF bytes, so that it won't easily overflow and lose
+	 * data.  Use of UDP protocol means that we are willing to lose data under
+	 * heavy load, but we don't want it to happen just because of ridiculously
+	 * small default buffer sizes (such as 8KB on older Windows versions).
+	 */
+	{
+		int			old_rcvbuf;
+		int			new_rcvbuf;
+		ACCEPT_TYPE_ARG3 rcvbufsize = sizeof(old_rcvbuf);
+
+		if (getsockopt(pgStatSock, SOL_SOCKET, SO_RCVBUF,
+					   (char *) &old_rcvbuf, &rcvbufsize) < 0)
+		{
+			elog(LOG, "getsockopt(SO_RCVBUF) failed: %m");
+			/* if we can't get existing size, always try to set it */
+			old_rcvbuf = 0;
+		}
+
+		new_rcvbuf = PGSTAT_MIN_RCVBUF;
+		if (old_rcvbuf < new_rcvbuf)
+		{
+			if (setsockopt(pgStatSock, SOL_SOCKET, SO_RCVBUF,
+						   (char *) &new_rcvbuf, sizeof(new_rcvbuf)) < 0)
+				elog(LOG, "setsockopt(SO_RCVBUF) failed: %m");
+		}
+	}
+
 	pg_freeaddrinfo_all(hints.ai_family, addrs);
 
 	return;
@@ -570,7 +601,7 @@
 {
 	DIR		   *dir;
 	struct dirent *entry;
-	char		fname[MAXPGPATH];
+	char		fname[MAXPGPATH * 2];
 
 	dir = AllocateDir(directory);
 	while ((entry = ReadDir(dir, directory)) != NULL)
@@ -600,7 +631,7 @@
 			strcmp(entry->d_name + nchars, "stat") != 0)
 			continue;
 
-		snprintf(fname, MAXPGPATH, "%s/%s", directory,
+		snprintf(fname, sizeof(fname), "%s/%s", directory,
 				 entry->d_name);
 		unlink(fname);
 	}
@@ -1350,11 +1381,15 @@
  * pgstat_report_analyze() -
  *
  *	Tell the collector about the table we just analyzed.
+ *
+ * Caller must provide new live- and dead-tuples estimates, as well as a
+ * flag indicating whether to reset the changes_since_analyze counter.
  * --------
  */
 void
 pgstat_report_analyze(Relation rel,
-					  PgStat_Counter livetuples, PgStat_Counter deadtuples)
+					  PgStat_Counter livetuples, PgStat_Counter deadtuples,
+					  bool resetcounter)
 {
 	PgStat_MsgAnalyze msg;
 
@@ -1391,6 +1426,7 @@
 	msg.m_databaseid = rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId;
 	msg.m_tableoid = RelationGetRelid(rel);
 	msg.m_autovacuum = IsAutoVacuumWorkerProcess();
+	msg.m_resetcounter = resetcounter;
 	msg.m_analyzetime = GetCurrentTimestamp();
 	msg.m_live_tuples = livetuples;
 	msg.m_dead_tuples = deadtuples;
@@ -2223,7 +2259,12 @@
 	pgstat_info->t_counts.t_tuples_updated += rec->tuples_updated;
 	pgstat_info->t_counts.t_tuples_deleted += rec->tuples_deleted;
 	pgstat_info->t_counts.t_truncated = rec->t_truncated;
-
+	if (rec->t_truncated)
+	{
+		/* forget live/dead stats seen by backend thus far */
+		pgstat_info->t_counts.t_delta_live_tuples = 0;
+		pgstat_info->t_counts.t_delta_dead_tuples = 0;
+	}
 	pgstat_info->t_counts.t_delta_live_tuples +=
 		rec->tuples_inserted - rec->tuples_deleted;
 	pgstat_info->t_counts.t_delta_dead_tuples +=
@@ -3344,8 +3385,7 @@
 	init_ps_display("stats collector process", "", "", "");
 
 	/*
-	 * Read in an existing statistics stats file or initialize the stats to
-	 * zero.
+	 * Read in existing stats files or initialize the stats to zero.
 	 */
 	pgStatRunningInCollector = true;
 	pgStatDBHash = pgstat_read_statsfiles(InvalidOid, true, true);
@@ -3391,8 +3431,8 @@
 			}
 
 			/*
-			 * Write the stats file if a new request has arrived that is not
-			 * satisfied by existing file.
+			 * Write the stats file(s) if a new request has arrived that is
+			 * not satisfied by existing file(s).
 			 */
 			if (pgstat_write_statsfile_needed())
 				pgstat_write_statsfiles(false, false);
@@ -3722,14 +3762,14 @@
  * pgstat_write_statsfiles() -
  *		Write the global statistics file, as well as requested DB files.
  *
- *	If writing to the permanent files (happens when the collector is
- *	shutting down only), remove the temporary files so that backends
- *	starting up under a new postmaster can't read the old data before
- *	the new collector is ready.
+ *	'permanent' specifies writing to the permanent files not temporary ones.
+ *	When true (happens only when the collector is shutting down), also remove
+ *	the temporary files so that backends starting up under a new postmaster
+ *	can't read old data before the new collector is ready.
  *
  *	When 'allDbs' is false, only the requested databases (listed in
- *	last_statrequests) will be written; otherwise, all databases will be
- *	written.
+ *	pending_write_requests) will be written; otherwise, all databases
+ *	will be written.
  * ----------
  */
 static void
@@ -3789,15 +3829,14 @@
 	while ((dbentry = (PgStat_StatDBEntry *) hash_seq_search(&hstat)) != NULL)
 	{
 		/*
-		 * Write out the tables and functions into the DB stat file, if
-		 * required.
-		 *
-		 * We need to do this before the dbentry write, to ensure the
-		 * timestamps written to both are consistent.
+		 * Write out the table and function stats for this DB into the
+		 * appropriate per-DB stat file, if required.
 		 */
 		if (allDbs || pgstat_db_requested(dbentry->databaseid))
 		{
+			/* Make DB's timestamp consistent with the global stats */
 			dbentry->stats_timestamp = globalStats.stats_timestamp;
+
 			pgstat_write_db_statsfile(dbentry, permanent);
 		}
 
@@ -3850,27 +3889,8 @@
 	 * Now throw away the list of requests.  Note that requests sent after we
 	 * started the write are still waiting on the network socket.
 	 */
-	if (!slist_is_empty(&last_statrequests))
-	{
-		slist_mutable_iter iter;
-
-		/*
-		 * Strictly speaking we should do slist_delete_current() before
-		 * freeing each request struct.  We skip that and instead
-		 * re-initialize the list header at the end.  Nonetheless, we must use
-		 * slist_foreach_modify, not just slist_foreach, since we will free
-		 * the node's storage before advancing.
-		 */
-		slist_foreach_modify(iter, &last_statrequests)
-		{
-			DBWriteRequest *req;
-
-			req = slist_container(DBWriteRequest, next, iter.cur);
-			pfree(req);
-		}
-
-		slist_init(&last_statrequests);
-	}
+	list_free(pending_write_requests);
+	pending_write_requests = NIL;
 }
 
 /*
@@ -4009,13 +4029,20 @@
 /* ----------
  * pgstat_read_statsfiles() -
  *
- *	Reads in the existing statistics collector files and initializes the
- *	databases' hash table.  If the permanent file name is requested (which
- *	only happens in the stats collector itself), also remove the file after
- *	reading; the in-memory status is now authoritative, and the permanent file
- *	would be out of date in case somebody else reads it.
+ *	Reads in some existing statistics collector files and returns the
+ *	databases hash table that is the top level of the data.
+ *
+ *	If 'onlydb' is not InvalidOid, it means we only want data for that DB
+ *	plus the shared catalogs ("DB 0").  We'll still populate the DB hash
+ *	table for all databases, but we don't bother even creating table/function
+ *	hash tables for other databases.
+ *
+ *	'permanent' specifies reading from the permanent files not temporary ones.
+ *	When true (happens only when the collector is starting up), remove the
+ *	files after reading; the in-memory status is now authoritative, and the
+ *	files would be out of date in case somebody else reads them.
  *
- *	If a deep read is requested, table/function stats are read also, otherwise
+ *	If a 'deep' read is requested, table/function stats are read, otherwise
  *	the table/function hash tables remain empty.
  * ----------
  */
@@ -4097,16 +4124,28 @@
 	{
 		ereport(pgStatRunningInCollector ? LOG : WARNING,
 				(errmsg("corrupted statistics file \"%s\"", statfile)));
+		memset(&globalStats, 0, sizeof(globalStats));
 		goto done;
 	}
 
 	/*
+	 * In the collector, disregard the timestamp we read from the permanent
+	 * stats file; we should be willing to write a temp stats file immediately
+	 * upon the first request from any backend.  This only matters if the old
+	 * file's timestamp is less than PGSTAT_STAT_INTERVAL ago, but that's not
+	 * an unusual scenario.
+	 */
+	if (pgStatRunningInCollector)
+		globalStats.stats_timestamp = 0;
+
+	/*
 	 * Read archiver stats struct
 	 */
 	if (fread(&archiverStats, 1, sizeof(archiverStats), fpin) != sizeof(archiverStats))
 	{
 		ereport(pgStatRunningInCollector ? LOG : WARNING,
 				(errmsg("corrupted statistics file \"%s\"", statfile)));
+		memset(&archiverStats, 0, sizeof(archiverStats));
 		goto done;
 	}
 
@@ -4152,8 +4191,17 @@
 				dbentry->functions = NULL;
 
 				/*
-				 * Don't collect tables if not the requested DB (or the
-				 * shared-table info)
+				 * In the collector, disregard the timestamp we read from the
+				 * permanent stats file; we should be willing to write a temp
+				 * stats file immediately upon the first request from any
+				 * backend.
+				 */
+				if (pgStatRunningInCollector)
+					dbentry->stats_timestamp = 0;
+
+				/*
+				 * Don't create tables/functions hashtables for uninteresting
+				 * databases.
 				 */
 				if (onlydb != InvalidOid)
 				{
@@ -4181,9 +4229,7 @@
 
 				/*
 				 * If requested, read the data from the database-specific
-				 * file. If there was onlydb specified (!= InvalidOid), we
-				 * would not get here because of a break above. So we don't
-				 * need to recheck.
+				 * file.  Otherwise we just leave the hashtables empty.
 				 */
 				if (deep)
 					pgstat_read_db_statsfile(dbentry->databaseid,
@@ -4222,10 +4268,14 @@
  * pgstat_read_db_statsfile() -
  *
  *	Reads in the existing statistics collector file for the given database,
- *	and initializes the tables and functions hash tables.
+ *	filling the passed-in tables and functions hash tables.
  *
- *	As pgstat_read_statsfiles, if the permanent file is requested, it is
+ *	As in pgstat_read_statsfiles, if the permanent file is requested, it is
  *	removed after reading.
+ *
+ *	Note: this code has the ability to skip storing per-table or per-function
+ *	data, if NULL is passed for the corresponding hashtable.  That's not used
+ *	at the moment though.
  * ----------
  */
 static void
@@ -4295,7 +4345,7 @@
 				}
 
 				/*
-				 * Skip if table belongs to a not requested database.
+				 * Skip if table data not wanted.
 				 */
 				if (tabhash == NULL)
 					break;
@@ -4329,7 +4379,7 @@
 				}
 
 				/*
-				 * Skip if function belongs to a not requested database.
+				 * Skip if function data not wanted.
 				 */
 				if (funchash == NULL)
 					break;
@@ -4371,8 +4421,6 @@
 		elog(DEBUG2, "removing permanent stats file \"%s\"", statfile);
 		unlink(statfile);
 	}
-
-	return;
 }
 
 /* ----------
@@ -4516,6 +4564,7 @@
 {
 	TimestampTz min_ts = 0;
 	TimestampTz ref_ts = 0;
+	Oid			inquiry_db;
 	int			count;
 
 	/* already read it? */
@@ -4524,6 +4573,17 @@
 	Assert(!pgStatRunningInCollector);
 
 	/*
+	 * In a normal backend, we check staleness of the data for our own DB, and
+	 * so we send MyDatabaseId in inquiry messages.  In the autovac launcher,
+	 * check staleness of the shared-catalog data, and send InvalidOid in
+	 * inquiry messages so as not to force writing unnecessary data.
+	 */
+	if (IsAutoVacuumLauncherProcess())
+		inquiry_db = InvalidOid;
+	else
+		inquiry_db = MyDatabaseId;
+
+	/*
 	 * Loop until fresh enough stats file is available or we ran out of time.
 	 * The stats inquiry message is sent repeatedly in case collector drops
 	 * it; but not every single time, as that just swamps the collector.
@@ -4536,7 +4596,7 @@
 
 		CHECK_FOR_INTERRUPTS();
 
-		ok = pgstat_read_db_statsfile_timestamp(MyDatabaseId, false, &file_ts);
+		ok = pgstat_read_db_statsfile_timestamp(inquiry_db, false, &file_ts);
 
 		cur_ts = GetCurrentTimestamp();
 		/* Calculate min acceptable timestamp, if we didn't already */
@@ -4595,7 +4655,7 @@
 				pfree(mytime);
 			}
 
-			pgstat_send_inquiry(cur_ts, min_ts, MyDatabaseId);
+			pgstat_send_inquiry(cur_ts, min_ts, inquiry_db);
 			break;
 		}
 
@@ -4605,7 +4665,7 @@
 
 		/* Not there or too old, so kick the collector and wait a bit */
 		if ((count % PGSTAT_INQ_LOOP_COUNT) == 0)
-			pgstat_send_inquiry(cur_ts, min_ts, MyDatabaseId);
+			pgstat_send_inquiry(cur_ts, min_ts, inquiry_db);
 
 		pg_usleep(PGSTAT_RETRY_DELAY * 1000L);
 	}
@@ -4617,7 +4677,8 @@
 
 	/*
 	 * Autovacuum launcher wants stats about all databases, but a shallow read
-	 * is sufficient.
+	 * is sufficient.  Regular backends want a deep read for just the tables
+	 * they can see (MyDatabaseId + shared catalogs).
 	 */
 	if (IsAutoVacuumLauncherProcess())
 		pgStatDBHash = pgstat_read_statsfiles(InvalidOid, false, false);
@@ -4678,43 +4739,27 @@
 static void
 pgstat_recv_inquiry(PgStat_MsgInquiry *msg, int len)
 {
-	slist_iter	iter;
-	DBWriteRequest *newreq;
 	PgStat_StatDBEntry *dbentry;
 
 	elog(DEBUG2, "received inquiry for database %u", msg->databaseid);
 
 	/*
-	 * Find the last write request for this DB.  If it's older than the
-	 * request's cutoff time, update it; otherwise there's nothing to do.
+	 * If there's already a write request for this DB, there's nothing to do.
 	 *
 	 * Note that if a request is found, we return early and skip the below
 	 * check for clock skew.  This is okay, since the only way for a DB
 	 * request to be present in the list is that we have been here since the
-	 * last write round.
+	 * last write round.  It seems sufficient to check for clock skew once per
+	 * write round.
 	 */
-	slist_foreach(iter, &last_statrequests)
-	{
-		DBWriteRequest *req = slist_container(DBWriteRequest, next, iter.cur);
-
-		if (req->databaseid != msg->databaseid)
-			continue;
-
-		if (msg->cutoff_time > req->request_time)
-			req->request_time = msg->cutoff_time;
+	if (list_member_oid(pending_write_requests, msg->databaseid))
 		return;
-	}
-
-	/*
-	 * There's no request for this DB yet, so create one.
-	 */
-	newreq = palloc(sizeof(DBWriteRequest));
-
-	newreq->databaseid = msg->databaseid;
-	newreq->request_time = msg->clock_time;
-	slist_push_head(&last_statrequests, &newreq->next);
 
 	/*
+	 * Check to see if we last wrote this database at a time >= the requested
+	 * cutoff time.  If so, this is a stale request that was generated before
+	 * we updated the DB file, and we don't need to do so again.
+	 *
 	 * If the requestor's local clock time is older than stats_timestamp, we
 	 * should suspect a clock glitch, ie system time going backwards; though
 	 * the more likely explanation is just delayed message receipt.  It is
@@ -4723,7 +4768,17 @@
 	 * to update the stats file for a long time.
 	 */
 	dbentry = pgstat_get_db_entry(msg->databaseid, false);
-	if ((dbentry != NULL) && (msg->clock_time < dbentry->stats_timestamp))
+	if (dbentry == NULL)
+	{
+		/*
+		 * We have no data for this DB.  Enter a write request anyway so that
+		 * the global stats will get updated.  This is needed to prevent
+		 * backend_read_statsfile from waiting for data that we cannot supply,
+		 * in the case of a new DB that nobody has yet reported any stats for.
+		 * See the behavior of pgstat_read_db_statsfile_timestamp.
+		 */
+	}
+	else if (msg->clock_time < dbentry->stats_timestamp)
 	{
 		TimestampTz cur_ts = GetCurrentTimestamp();
 
@@ -4744,11 +4799,27 @@
 				 writetime, mytime, dbentry->databaseid);
 			pfree(writetime);
 			pfree(mytime);
-
-			newreq->request_time = cur_ts;
-			dbentry->stats_timestamp = cur_ts - 1;
 		}
+		else
+		{
+			/*
+			 * Nope, it's just an old request.  Assuming msg's clock_time is
+			 * >= its cutoff_time, it must be stale, so we can ignore it.
+			 */
+			return;
+		}
+	}
+	else if (msg->cutoff_time <= dbentry->stats_timestamp)
+	{
+		/* Stale request, ignore it */
+		return;
 	}
+
+	/*
+	 * We need to write this DB, so create a request.
+	 */
+	pending_write_requests = lappend_oid(pending_write_requests,
+										 msg->databaseid);
 }
 
 
@@ -5105,10 +5176,12 @@
 	tabentry->n_dead_tuples = msg->m_dead_tuples;
 
 	/*
-	 * We reset changes_since_analyze to zero, forgetting any changes that
-	 * occurred while the ANALYZE was in progress.
+	 * If commanded, reset changes_since_analyze to zero.  This forgets any
+	 * changes that were committed while the ANALYZE was in progress, but we
+	 * have no good way to estimate how many of those there were.
 	 */
-	tabentry->changes_since_analyze = 0;
+	if (msg->m_resetcounter)
+		tabentry->changes_since_analyze = 0;
 
 	if (msg->m_autovacuum)
 	{
@@ -5327,13 +5400,13 @@
 /* ----------
  * pgstat_write_statsfile_needed() -
  *
- *	Do we need to write out the files?
+ *	Do we need to write out any stats files?
  * ----------
  */
 static bool
 pgstat_write_statsfile_needed(void)
 {
-	if (!slist_is_empty(&last_statrequests))
+	if (pending_write_requests != NIL)
 		return true;
 
 	/* Everything was written recently */
@@ -5349,16 +5422,18 @@
 static bool
 pgstat_db_requested(Oid databaseid)
 {
-	slist_iter	iter;
-
-	/* Check the databases if they need to refresh the stats. */
-	slist_foreach(iter, &last_statrequests)
-	{
-		DBWriteRequest *req = slist_container(DBWriteRequest, next, iter.cur);
+	/*
+	 * If any requests are outstanding at all, we should write the stats for
+	 * shared catalogs (the "database" with OID 0).  This ensures that
+	 * backends will see up-to-date stats for shared catalogs, even though
+	 * they send inquiry messages mentioning only their own DB.
+	 */
+	if (databaseid == InvalidOid && pending_write_requests != NIL)
+		return true;
 
-		if (req->databaseid == databaseid)
-			return true;
-	}
+	/* Search to see if there's an open request to write this database. */
+	if (list_member_oid(pending_write_requests, databaseid))
+		return true;
 
 	return false;
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/postmaster/postmaster.c postgresql-9.5-9.5.8/src/backend/postmaster/postmaster.c
--- postgresql-9.5-9.5.2/src/backend/postmaster/postmaster.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/postmaster/postmaster.c	2017-08-07 21:13:41.000000000 +0000
@@ -350,6 +350,9 @@
 /* the launcher needs to be signalled to communicate some condition */
 static volatile bool avlauncher_needs_signal = false;
 
+/* received START_WALRECEIVER signal */
+static volatile sig_atomic_t WalReceiverRequested = false;
+
 /* set when there's a worker that needs to be started up */
 static volatile bool StartWorkerNeeded = true;
 static volatile bool HaveCrashedWorker = false;
@@ -408,10 +411,12 @@
 #define SignalChildren(sig)			   SignalSomeChildren(sig, BACKEND_TYPE_ALL)
 
 static int	CountChildren(int target);
+static bool assign_backendlist_entry(RegisteredBgWorker *rw);
 static void maybe_start_bgworker(void);
 static bool CreateOptsFile(int argc, char *argv[], char *fullprogname);
 static pid_t StartChildProcess(AuxProcType type);
 static void StartAutovacuumWorker(void);
+static void MaybeStartWalReceiver(void);
 static void InitPostmasterDeathWatchHandle(void);
 
 /*
@@ -570,6 +575,16 @@
 	umask(S_IRWXG | S_IRWXO);
 
 	/*
+	 * Initialize random(3) so we don't get the same values in every run.
+	 *
+	 * Note: the seed is pretty predictable from externally-visible facts such
+	 * as postmaster start time, so avoid using random() for security-critical
+	 * random values during postmaster startup.  At the time of first
+	 * connection, PostmasterRandom will select a hopefully-more-random seed.
+	 */
+	srandom((unsigned int) (MyProcPid ^ MyStartTime));
+
+	/*
 	 * By default, palloc() requests in the postmaster will be allocated in
 	 * the PostmasterContext, which is space that can be recycled by backends.
 	 * Allocated data that needs to be available to backends should be
@@ -821,10 +836,14 @@
 	if (output_config_variable != NULL)
 	{
 		/*
-		 * permission is handled because the user is reading inside the data
-		 * dir
+		 * "-C guc" was specified, so print GUC's value and exit.  No extra
+		 * permission check is needed because the user is reading inside the
+		 * data dir.
 		 */
-		puts(GetConfigOption(output_config_variable, false, false));
+		const char *config_val = GetConfigOption(output_config_variable,
+												 false, false);
+
+		puts(config_val ? config_val : "");
 		ExitPostmaster(0);
 	}
 
@@ -1736,7 +1755,8 @@
 		}
 
 		/* If we have lost the stats collector, try to start a new one */
-		if (PgStatPID == 0 && pmState == PM_RUN)
+		if (PgStatPID == 0 &&
+			(pmState == PM_RUN || pmState == PM_HOT_STANDBY))
 			PgStatPID = pgstat_start();
 
 		/* If we have lost the archiver, try to start a new one. */
@@ -1751,6 +1771,10 @@
 				kill(AutoVacPID, SIGUSR2);
 		}
 
+		/* If we need to start a WAL receiver, try to do that now */
+		if (WalReceiverRequested)
+			MaybeStartWalReceiver();
+
 		/* Get other worker processes running, if needed */
 		if (StartWorkerNeeded || HaveCrashedWorker)
 			maybe_start_bgworker();
@@ -2877,7 +2901,8 @@
 		/*
 		 * Was it the wal receiver?  If exit status is zero (normal) or one
 		 * (FATAL exit), we assume everything is all right just like normal
-		 * backends.
+		 * backends.  (If we need a new wal receiver, we'll start one at the
+		 * next iteration of the postmaster's main loop.)
 		 */
 		if (pid == WalReceiverPID)
 		{
@@ -2932,7 +2957,7 @@
 			if (!EXIT_STATUS_0(exitstatus))
 				LogChildExit(LOG, _("statistics collector process"),
 							 pid, exitstatus);
-			if (pmState == PM_RUN)
+			if (pmState == PM_RUN || pmState == PM_HOT_STANDBY)
 				PgStatPID = pgstat_start();
 			continue;
 		}
@@ -4392,6 +4417,7 @@
 static pid_t
 internal_forkexec(int argc, char *argv[], Port *port)
 {
+	int			retry_count = 0;
 	STARTUPINFO si;
 	PROCESS_INFORMATION pi;
 	int			i;
@@ -4409,6 +4435,9 @@
 	Assert(strncmp(argv[1], "--fork", 6) == 0);
 	Assert(argv[2] == NULL);
 
+	/* Resume here if we need to retry */
+retry:
+
 	/* Set up shared memory for parameter passing */
 	ZeroMemory(&sa, sizeof(sa));
 	sa.nLength = sizeof(sa);
@@ -4500,22 +4529,26 @@
 
 	/*
 	 * Reserve the memory region used by our main shared memory segment before
-	 * we resume the child process.
+	 * we resume the child process.  Normally this should succeed, but if ASLR
+	 * is active then it might sometimes fail due to the stack or heap having
+	 * gotten mapped into that range.  In that case, just terminate the
+	 * process and retry.
 	 */
 	if (!pgwin32_ReserveSharedMemoryRegion(pi.hProcess))
 	{
-		/*
-		 * Failed to reserve the memory, so terminate the newly created
-		 * process and give up.
-		 */
+		/* pgwin32_ReserveSharedMemoryRegion already made a log entry */
 		if (!TerminateProcess(pi.hProcess, 255))
 			ereport(LOG,
 					(errmsg_internal("could not terminate process that failed to reserve memory: error code %lu",
 									 GetLastError())));
 		CloseHandle(pi.hProcess);
 		CloseHandle(pi.hThread);
-		return -1;				/* logging done made by
-								 * pgwin32_ReserveSharedMemoryRegion() */
+		if (++retry_count < 100)
+			goto retry;
+		ereport(LOG,
+				(errmsg("giving up after too many tries to reserve shared memory"),
+				 errhint("This might be caused by ASLR or antivirus software.")));
+		return -1;
 	}
 
 	/*
@@ -4604,10 +4637,17 @@
 	/* Setup essential subsystems (to ensure elog() behaves sanely) */
 	InitializeGUCOptions();
 
+	/* Check we got appropriate args */
+	if (argc < 3)
+		elog(FATAL, "invalid subpostmaster invocation");
+
 	/* Read in the variables file */
 	memset(&port, 0, sizeof(Port));
 	read_backend_variables(argv[2], &port);
 
+	/* Close the postmaster's sockets (as soon as we know them) */
+	ClosePostmasterPorts(strcmp(argv[1], "--forklog") == 0);
+
 	/*
 	 * Set reference point for stack-depth checking
 	 */
@@ -4625,15 +4665,21 @@
 				 errmsg("out of memory")));
 #endif
 
-	/* Check we got appropriate args */
-	if (argc < 3)
-		elog(FATAL, "invalid subpostmaster invocation");
-
 	/*
 	 * If appropriate, physically re-attach to shared memory segment. We want
 	 * to do this before going any further to ensure that we can attach at the
 	 * same address the postmaster used.  On the other hand, if we choose not
 	 * to re-attach, we may have other cleanup to do.
+	 *
+	 * If testing EXEC_BACKEND on Linux, you should run this as root before
+	 * starting the postmaster:
+	 *
+	 * echo 0 >/proc/sys/kernel/randomize_va_space
+	 *
+	 * This prevents using randomized stack and code addresses that cause the
+	 * child process's memory map to be different from the parent's, making it
+	 * sometimes impossible to attach to shared memory at the desired address.
+	 * Return the setting to its old value (usually '1' or '2') when finished.
 	 */
 	if (strcmp(argv[1], "--forkbackend") == 0 ||
 		strcmp(argv[1], "--forkavlauncher") == 0 ||
@@ -4679,9 +4725,6 @@
 	{
 		Assert(argc == 3);		/* shouldn't be any more args */
 
-		/* Close the postmaster's sockets */
-		ClosePostmasterPorts(false);
-
 		/*
 		 * Need to reinitialize the SSL library in the backend, since the
 		 * context structures contain function pointers and cannot be passed
@@ -4712,17 +4755,7 @@
 		/* Need a PGPROC to run CreateSharedMemoryAndSemaphores */
 		InitProcess();
 
-		/*
-		 * Attach process to shared data structures.  If testing EXEC_BACKEND
-		 * on Linux, you must run this as root before starting the postmaster:
-		 *
-		 * echo 0 >/proc/sys/kernel/randomize_va_space
-		 *
-		 * This prevents a randomized stack base address that causes child
-		 * shared memory to be at a different address than the parent, making
-		 * it impossible to attached to shared memory.  Return the value to
-		 * '1' when finished.
-		 */
+		/* Attach process to shared data structures */
 		CreateSharedMemoryAndSemaphores(false, 0);
 
 		/* And run the backend */
@@ -4730,9 +4763,6 @@
 	}
 	if (strcmp(argv[1], "--forkboot") == 0)
 	{
-		/* Close the postmaster's sockets */
-		ClosePostmasterPorts(false);
-
 		/* Restore basic shared memory pointers */
 		InitShmemAccess(UsedShmemSegAddr);
 
@@ -4746,9 +4776,6 @@
 	}
 	if (strcmp(argv[1], "--forkavlauncher") == 0)
 	{
-		/* Close the postmaster's sockets */
-		ClosePostmasterPorts(false);
-
 		/* Restore basic shared memory pointers */
 		InitShmemAccess(UsedShmemSegAddr);
 
@@ -4762,9 +4789,6 @@
 	}
 	if (strcmp(argv[1], "--forkavworker") == 0)
 	{
-		/* Close the postmaster's sockets */
-		ClosePostmasterPorts(false);
-
 		/* Restore basic shared memory pointers */
 		InitShmemAccess(UsedShmemSegAddr);
 
@@ -4783,11 +4807,6 @@
 		/* do this as early as possible; in particular, before InitProcess() */
 		IsBackgroundWorker = true;
 
-		InitPostmasterChild();
-
-		/* Close the postmaster's sockets */
-		ClosePostmasterPorts(false);
-
 		/* Restore basic shared memory pointers */
 		InitShmemAccess(UsedShmemSegAddr);
 
@@ -4797,33 +4816,26 @@
 		/* Attach process to shared data structures */
 		CreateSharedMemoryAndSemaphores(false, 0);
 
+		/* Fetch MyBgworkerEntry from shared memory */
 		shmem_slot = atoi(argv[1] + 15);
 		MyBgworkerEntry = BackgroundWorkerEntry(shmem_slot);
+
 		StartBackgroundWorker();
 	}
 	if (strcmp(argv[1], "--forkarch") == 0)
 	{
-		/* Close the postmaster's sockets */
-		ClosePostmasterPorts(false);
-
 		/* Do not want to attach to shared memory */
 
 		PgArchiverMain(argc, argv);		/* does not return */
 	}
 	if (strcmp(argv[1], "--forkcol") == 0)
 	{
-		/* Close the postmaster's sockets */
-		ClosePostmasterPorts(false);
-
 		/* Do not want to attach to shared memory */
 
 		PgstatCollectorMain(argc, argv);		/* does not return */
 	}
 	if (strcmp(argv[1], "--forklog") == 0)
 	{
-		/* Close the postmaster's sockets */
-		ClosePostmasterPorts(true);
-
 		/* Do not want to attach to shared memory */
 
 		SysLoggerMain(argc, argv);		/* does not return */
@@ -4977,14 +4989,12 @@
 		StartAutovacuumWorker();
 	}
 
-	if (CheckPostmasterSignal(PMSIGNAL_START_WALRECEIVER) &&
-		WalReceiverPID == 0 &&
-		(pmState == PM_STARTUP || pmState == PM_RECOVERY ||
-		 pmState == PM_HOT_STANDBY || pmState == PM_WAIT_READONLY) &&
-		Shutdown == NoShutdown)
+	if (CheckPostmasterSignal(PMSIGNAL_START_WALRECEIVER))
 	{
 		/* Startup Process wants us to start the walreceiver process. */
-		WalReceiverPID = StartWalReceiver();
+		/* Start immediately if possible, else remember request for later. */
+		WalReceiverRequested = true;
+		MaybeStartWalReceiver();
 	}
 
 	if (CheckPostmasterSignal(PMSIGNAL_ADVANCE_STATE_MACHINE) &&
@@ -5072,6 +5082,10 @@
 
 /*
  * PostmasterRandom
+ *
+ * Caution: use this only for values needed during connection-request
+ * processing.  Otherwise, the intended property of having an unpredictable
+ * delay between random_start_time and random_stop_time will be broken.
  */
 static long
 PostmasterRandom(void)
@@ -5106,7 +5120,7 @@
 }
 
 /*
- * Count up number of child processes of specified types (dead_end chidren
+ * Count up number of child processes of specified types (dead_end children
  * are always excluded).
  */
 static int
@@ -5332,6 +5346,24 @@
 }
 
 /*
+ * MaybeStartWalReceiver
+ *		Start the WAL receiver process, if not running and our state allows.
+ */
+static void
+MaybeStartWalReceiver(void)
+{
+	if (WalReceiverPID == 0 &&
+		(pmState == PM_STARTUP || pmState == PM_RECOVERY ||
+		 pmState == PM_HOT_STANDBY || pmState == PM_WAIT_READONLY) &&
+		Shutdown == NoShutdown)
+	{
+		WalReceiverPID = StartWalReceiver();
+		WalReceiverRequested = false;
+	}
+}
+
+
+/*
  * Create the opts file
  */
 static bool
@@ -5467,13 +5499,33 @@
  * Start a new bgworker.
  * Starting time conditions must have been checked already.
  *
+ * Returns true on success, false on failure.
+ * In either case, update the RegisteredBgWorker's state appropriately.
+ *
  * This code is heavily based on autovacuum.c, q.v.
  */
-static void
+static bool
 do_start_bgworker(RegisteredBgWorker *rw)
 {
 	pid_t		worker_pid;
 
+	Assert(rw->rw_pid == 0);
+
+	/*
+	 * Allocate and assign the Backend element.  Note we must do this before
+	 * forking, so that we can handle out of memory properly.
+	 *
+	 * Treat failure as though the worker had crashed.  That way, the
+	 * postmaster will wait a bit before attempting to start it again; if it
+	 * tried again right away, most likely it'd find itself repeating the
+	 * out-of-memory or fork failure condition.
+	 */
+	if (!assign_backendlist_entry(rw))
+	{
+		rw->rw_crashed_at = GetCurrentTimestamp();
+		return false;
+	}
+
 	ereport(DEBUG1,
 			(errmsg("starting background worker process \"%s\"",
 					rw->rw_worker.bgw_name)));
@@ -5485,9 +5537,17 @@
 #endif
 	{
 		case -1:
+			/* in postmaster, fork failed ... */
 			ereport(LOG,
 					(errmsg("could not fork worker process: %m")));
-			return;
+			/* undo what assign_backendlist_entry did */
+			ReleasePostmasterChildSlot(rw->rw_child_slot);
+			rw->rw_child_slot = 0;
+			free(rw->rw_backend);
+			rw->rw_backend = NULL;
+			/* mark entry as crashed, so we'll try again later */
+			rw->rw_crashed_at = GetCurrentTimestamp();
+			break;
 
 #ifndef EXEC_BACKEND
 		case 0:
@@ -5501,13 +5561,24 @@
 
 			MyBgworkerEntry = &rw->rw_worker;
 			StartBackgroundWorker();
+
+			exit(1);			/* should not get here */
 			break;
 #endif
 		default:
+			/* in postmaster, fork successful ... */
 			rw->rw_pid = worker_pid;
 			rw->rw_backend->pid = rw->rw_pid;
 			ReportBackgroundWorkerPID(rw);
+			/* add new worker to lists of backends */
+			dlist_push_head(&BackendList, &rw->rw_backend->elem);
+#ifdef EXEC_BACKEND
+			ShmemBackendArrayAdd(rw->rw_backend);
+#endif
+			return true;
 	}
+
+	return false;
 }
 
 /*
@@ -5554,6 +5625,8 @@
  * Allocate the Backend struct for a connected background worker, but don't
  * add it to the list of backends just yet.
  *
+ * On failure, return false without changing any worker state.
+ *
  * Some info from the Backend is copied into the passed rw.
  */
 static bool
@@ -5566,14 +5639,6 @@
 		ereport(LOG,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
-
-		/*
-		 * The worker didn't really crash, but setting this nonzero makes
-		 * postmaster wait a bit before attempting to start it again; if it
-		 * tried again right away, most likely it'd find itself under the same
-		 * memory pressure.
-		 */
-		rw->rw_crashed_at = GetCurrentTimestamp();
 		return false;
 	}
 
@@ -5603,6 +5668,11 @@
  * As a side effect, the bgworker control variables are set or reset whenever
  * there are more workers to start after this one, and whenever the overall
  * system state requires it.
+ *
+ * The reason we start at most one worker per call is to avoid consuming the
+ * postmaster's attention for too long when many such requests are pending.
+ * As long as StartWorkerNeeded is true, ServerLoop will not block and will
+ * call this function again after dealing with any other issues.
  */
 static void
 maybe_start_bgworker(void)
@@ -5610,13 +5680,19 @@
 	slist_mutable_iter iter;
 	TimestampTz now = 0;
 
+	/*
+	 * During crash recovery, we have no need to be called until the state
+	 * transition out of recovery.
+	 */
 	if (FatalError)
 	{
 		StartWorkerNeeded = false;
 		HaveCrashedWorker = false;
-		return;					/* not yet */
+		return;
 	}
 
+	/* Don't need to be called again unless we find a reason for it below */
+	StartWorkerNeeded = false;
 	HaveCrashedWorker = false;
 
 	slist_foreach_modify(iter, &BackgroundWorkerList)
@@ -5625,11 +5701,11 @@
 
 		rw = slist_container(RegisteredBgWorker, rw_lnode, iter.cur);
 
-		/* already running? */
+		/* ignore if already running */
 		if (rw->rw_pid != 0)
 			continue;
 
-		/* marked for death? */
+		/* if marked for death, clean up and remove from list */
 		if (rw->rw_terminate)
 		{
 			ForgetBackgroundWorker(&iter);
@@ -5651,12 +5727,14 @@
 				continue;
 			}
 
+			/* read system time only when needed */
 			if (now == 0)
 				now = GetCurrentTimestamp();
 
 			if (!TimestampDifferenceExceeds(rw->rw_crashed_at, now,
 									  rw->rw_worker.bgw_restart_time * 1000))
 			{
+				/* Set flag to remember that we have workers to start later */
 				HaveCrashedWorker = true;
 				continue;
 			}
@@ -5664,36 +5742,35 @@
 
 		if (bgworker_should_start_now(rw->rw_worker.bgw_start_time))
 		{
-			/* reset crash time before calling assign_backendlist_entry */
+			/* reset crash time before trying to start worker */
 			rw->rw_crashed_at = 0;
 
 			/*
-			 * Allocate and assign the Backend element.  Note we
-			 * must do this before forking, so that we can handle out of
-			 * memory properly.
+			 * Try to start the worker.
+			 *
+			 * On failure, give up processing workers for now, but set
+			 * StartWorkerNeeded so we'll come back here on the next iteration
+			 * of ServerLoop to try again.  (We don't want to wait, because
+			 * there might be additional ready-to-run workers.)  We could set
+			 * HaveCrashedWorker as well, since this worker is now marked
+			 * crashed, but there's no need because the next run of this
+			 * function will do that.
 			 */
-			if (!assign_backendlist_entry(rw))
+			if (!do_start_bgworker(rw))
+			{
+				StartWorkerNeeded = true;
 				return;
-
-			do_start_bgworker(rw);		/* sets rw->rw_pid */
-
-			dlist_push_head(&BackendList, &rw->rw_backend->elem);
-#ifdef EXEC_BACKEND
-			ShmemBackendArrayAdd(rw->rw_backend);
-#endif
+			}
 
 			/*
-			 * Have ServerLoop call us again.  Note that there might not
-			 * actually *be* another runnable worker, but we don't care all
-			 * that much; we will find out the next time we run.
+			 * Quit, but have ServerLoop call us again to look for additional
+			 * ready-to-run workers.  There might not be any, but we'll find
+			 * out the next time we run.
 			 */
 			StartWorkerNeeded = true;
 			return;
 		}
 	}
-
-	/* no runnable worker found */
-	StartWorkerNeeded = false;
 }
 
 /*
@@ -6176,7 +6253,7 @@
 	 * write fd. That is taken care of in ClosePostmasterPorts().
 	 */
 	Assert(MyProcPid == PostmasterPid);
-	if (pipe(postmaster_alive_fds))
+	if (pipe(postmaster_alive_fds) < 0)
 		ereport(FATAL,
 				(errcode_for_file_access(),
 				 errmsg_internal("could not create pipe to monitor postmaster death: %m")));
@@ -6185,7 +6262,7 @@
 	 * Set O_NONBLOCK to allow testing for the fd's presence with a read()
 	 * call.
 	 */
-	if (fcntl(postmaster_alive_fds[POSTMASTER_FD_WATCH], F_SETFL, O_NONBLOCK))
+	if (fcntl(postmaster_alive_fds[POSTMASTER_FD_WATCH], F_SETFL, O_NONBLOCK) == -1)
 		ereport(FATAL,
 				(errcode_for_socket_access(),
 				 errmsg_internal("could not set postmaster death monitoring pipe to nonblocking mode: %m")));
diff -Nru postgresql-9.5-9.5.2/src/backend/regex/regexport.c postgresql-9.5-9.5.8/src/backend/regex/regexport.c
--- postgresql-9.5-9.5.2/src/backend/regex/regexport.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/regex/regexport.c	2017-08-07 21:13:41.000000000 +0000
@@ -6,8 +6,8 @@
  * In this implementation, the NFA defines a necessary but not sufficient
  * condition for a string to match the regex: that is, there can be strings
  * that match the NFA but don't match the full regex, but not vice versa.
- * Thus, for example, it is okay for the functions below to ignore lookahead
- * constraints, which merely constrain the string some more.
+ * Thus, for example, it is okay for the functions below to treat lookahead
+ * constraints as no-ops, since they merely constrain the string some more.
  *
  * Notice that these functions return info into caller-provided arrays
  * rather than doing their own malloc's.  This simplifies the APIs by
@@ -28,6 +28,8 @@
 
 #include "regex/regexport.h"
 
+#include "miscadmin.h"
+
 static void scancolormap(struct colormap * cm, int co,
 			 union tree * t, int level, chr partial,
 			 pg_wchar **chars, int *chars_len);
@@ -76,29 +78,78 @@
 }
 
 /*
+ * pg_reg_getnumoutarcs() and pg_reg_getoutarcs() mask the existence of LACON
+ * arcs from the caller, treating any LACON as being automatically satisfied.
+ * Since the output representation does not support arcs that consume no
+ * character when traversed, we have to recursively traverse LACON arcs here,
+ * and report whatever normal arcs are reachable by traversing LACON arcs.
+ * Note that this wouldn't work if it were possible to reach the final state
+ * via LACON traversal, but the regex library never builds NFAs that have
+ * LACON arcs leading directly to the final state.  (This is because the
+ * regex executor is designed to consume one character beyond the nominal
+ * match end --- possibly an EOS indicator --- so there is always a set of
+ * ordinary arcs leading to the final state.)
+ *
+ * traverse_lacons is a recursive subroutine used by both exported functions
+ * to count and then emit the reachable regular arcs.  *arcs_count is
+ * incremented by the number of reachable arcs, and as many as will fit in
+ * arcs_len (possibly 0) are emitted into arcs[].
+ */
+static void
+traverse_lacons(struct cnfa * cnfa, int st,
+				int *arcs_count,
+				regex_arc_t *arcs, int arcs_len)
+{
+	struct carc *ca;
+
+	/*
+	 * Since this function recurses, it could theoretically be driven to stack
+	 * overflow.  In practice, this is mostly useful to backstop against a
+	 * failure of the regex compiler to remove a loop of LACON arcs.
+	 */
+	check_stack_depth();
+
+	for (ca = cnfa->states[st]; ca->co != COLORLESS; ca++)
+	{
+		if (ca->co < cnfa->ncolors)
+		{
+			/* Ordinary arc, so count and possibly emit it */
+			int			ndx = (*arcs_count)++;
+
+			if (ndx < arcs_len)
+			{
+				arcs[ndx].co = ca->co;
+				arcs[ndx].to = ca->to;
+			}
+		}
+		else
+		{
+			/* LACON arc --- assume it's satisfied and recurse... */
+			/* ... but first, assert it doesn't lead directly to post state */
+			Assert(ca->to != cnfa->post);
+
+			traverse_lacons(cnfa, ca->to, arcs_count, arcs, arcs_len);
+		}
+	}
+}
+
+/*
  * Get number of outgoing NFA arcs of state number "st".
- *
- * Note: LACON arcs are ignored, both here and in pg_reg_getoutarcs().
  */
 int
 pg_reg_getnumoutarcs(const regex_t *regex, int st)
 {
 	struct cnfa *cnfa;
-	struct carc *ca;
-	int			count;
+	int			arcs_count;
 
 	assert(regex != NULL && regex->re_magic == REMAGIC);
 	cnfa = &((struct guts *) regex->re_guts)->search;
 
 	if (st < 0 || st >= cnfa->nstates)
 		return 0;
-	count = 0;
-	for (ca = cnfa->states[st]; ca->co != COLORLESS; ca++)
-	{
-		if (ca->co < cnfa->ncolors)
-			count++;
-	}
-	return count;
+	arcs_count = 0;
+	traverse_lacons(cnfa, st, &arcs_count, NULL, 0);
+	return arcs_count;
 }
 
 /*
@@ -111,24 +162,15 @@
 				  regex_arc_t *arcs, int arcs_len)
 {
 	struct cnfa *cnfa;
-	struct carc *ca;
+	int			arcs_count;
 
 	assert(regex != NULL && regex->re_magic == REMAGIC);
 	cnfa = &((struct guts *) regex->re_guts)->search;
 
 	if (st < 0 || st >= cnfa->nstates || arcs_len <= 0)
 		return;
-	for (ca = cnfa->states[st]; ca->co != COLORLESS; ca++)
-	{
-		if (ca->co < cnfa->ncolors)
-		{
-			arcs->co = ca->co;
-			arcs->to = ca->to;
-			arcs++;
-			if (--arcs_len == 0)
-				break;
-		}
-	}
+	arcs_count = 0;
+	traverse_lacons(cnfa, st, &arcs_count, arcs, arcs_len);
 }
 
 /*
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/basebackup.c postgresql-9.5-9.5.8/src/backend/replication/basebackup.c
--- postgresql-9.5-9.5.2/src/backend/replication/basebackup.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/basebackup.c	2017-08-07 21:13:41.000000000 +0000
@@ -57,6 +57,8 @@
 static void sendFileWithContent(const char *filename, const char *content);
 static void _tarWriteHeader(const char *filename, const char *linktarget,
 				struct stat * statbuf);
+static int64 _tarWriteDir(const char *pathbuf, int basepathlen, struct stat * statbuf,
+			 bool sizeonly);
 static void send_int8_string(StringInfoData *buf, int64 intval);
 static void SendBackupHeader(List *tablespaces);
 static void base_backup_cleanup(int code, Datum arg);
@@ -883,7 +885,7 @@
 {
 	DIR		   *dir;
 	struct dirent *de;
-	char		pathbuf[MAXPGPATH];
+	char		pathbuf[MAXPGPATH * 2];
 	struct stat statbuf;
 	int64		size = 0;
 
@@ -935,7 +937,7 @@
 						 "and should not be used. "
 						 "Try taking another online backup.")));
 
-		snprintf(pathbuf, MAXPGPATH, "%s/%s", path, de->d_name);
+		snprintf(pathbuf, sizeof(pathbuf), "%s/%s", path, de->d_name);
 
 		/* Skip postmaster.pid and postmaster.opts in the data directory */
 		if (strcmp(pathbuf, "./postmaster.pid") == 0 ||
@@ -966,9 +968,7 @@
 		if ((statrelpath != NULL && strcmp(pathbuf, statrelpath) == 0) ||
 		  strncmp(de->d_name, PG_STAT_TMP_DIR, strlen(PG_STAT_TMP_DIR)) == 0)
 		{
-			if (!sizeonly)
-				_tarWriteHeader(pathbuf + basepathlen + 1, NULL, &statbuf);
-			size += 512;
+			size += _tarWriteDir(pathbuf, basepathlen, &statbuf, sizeonly);
 			continue;
 		}
 
@@ -978,9 +978,7 @@
 		 */
 		if (strcmp(de->d_name, "pg_replslot") == 0)
 		{
-			if (!sizeonly)
-				_tarWriteHeader(pathbuf + basepathlen + 1, NULL, &statbuf);
-			size += 512;		/* Size of the header just added */
+			size += _tarWriteDir(pathbuf, basepathlen, &statbuf, sizeonly);
 			continue;
 		}
 
@@ -991,18 +989,8 @@
 		 */
 		if (strcmp(pathbuf, "./pg_xlog") == 0)
 		{
-			if (!sizeonly)
-			{
-				/* If pg_xlog is a symlink, write it as a directory anyway */
-#ifndef WIN32
-				if (S_ISLNK(statbuf.st_mode))
-#else
-				if (pgwin32_is_junction(pathbuf))
-#endif
-					statbuf.st_mode = S_IFDIR | S_IRWXU;
-				_tarWriteHeader(pathbuf + basepathlen + 1, NULL, &statbuf);
-			}
-			size += 512;		/* Size of the header just added */
+			/* If pg_xlog is a symlink, write it as a directory anyway */
+			size += _tarWriteDir(pathbuf, basepathlen, &statbuf, sizeonly);
 
 			/*
 			 * Also send archive_status directory (by hackishly reusing
@@ -1245,6 +1233,30 @@
 }
 
 /*
+ * Write tar header for a directory.  If the entry in statbuf is a link then
+ * write it as a directory anyway.
+ */
+static int64
+_tarWriteDir(const char *pathbuf, int basepathlen, struct stat * statbuf,
+			 bool sizeonly)
+{
+	if (sizeonly)
+		/* Directory headers are always 512 bytes */
+		return 512;
+
+	/* If symlink, write it as a directory anyway */
+#ifndef WIN32
+	if (S_ISLNK(statbuf->st_mode))
+#else
+	if (pgwin32_is_junction(pathbuf))
+#endif
+		statbuf->st_mode = S_IFDIR | S_IRWXU;
+
+	_tarWriteHeader(pathbuf + basepathlen + 1, NULL, statbuf);
+	return 512;
+}
+
+/*
  * Increment the network transfer counter by the given number of bytes,
  * and sleep if necessary to comply with the requested network transfer
  * rate.
@@ -1288,26 +1300,16 @@
 		if (wait_result & WL_LATCH_SET)
 			CHECK_FOR_INTERRUPTS();
 	}
-	else
-	{
-		/*
-		 * The actual transfer rate is below the limit.  A negative value
-		 * would distort the adjustment of throttled_last.
-		 */
-		wait_result = 0;
-		sleep = 0;
-	}
 
 	/*
-	 * Only a whole multiple of throttling_sample was processed. The rest will
-	 * be done during the next call of this function.
+	 * As we work with integers, only whole multiple of throttling_sample was
+	 * processed. The rest will be done during the next call of this function.
 	 */
 	throttling_counter %= throttling_sample;
 
-	/* Once the (possible) sleep has ended, new period starts. */
-	if (wait_result & WL_TIMEOUT)
-		throttled_last += elapsed + sleep;
-	else if (sleep > 0)
-		/* Sleep was necessary but might have been interrupted. */
-		throttled_last = GetCurrentIntegerTimestamp();
+	/*
+	 * Time interval for the remaining amount and possible next increments
+	 * starts now.
+	 */
+	throttled_last = GetCurrentIntegerTimestamp();
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c postgresql-9.5-9.5.8/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
--- postgresql-9.5-9.5.2/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c	2017-08-07 21:13:41.000000000 +0000
@@ -426,14 +426,20 @@
 			 */
 			if (!libpq_select(-1))
 				continue;		/* interrupted */
+
+			/* Consume whatever data is available from the socket */
 			if (PQconsumeInput(streamConn) == 0)
-				return NULL;	/* trouble */
+			{
+				/* trouble; drop whatever we had and return NULL */
+				PQclear(lastResult);
+				return NULL;
+			}
 		}
 
 		/*
-		 * Emulate the PQexec()'s behavior of returning the last result when
-		 * there are many. Since walsender will never generate multiple
-		 * results, we skip the concatenation of error messages.
+		 * Emulate PQexec()'s behavior of returning the last result when there
+		 * are many.  Since walsender will never generate multiple results, we
+		 * skip the concatenation of error messages.
 		 */
 		result = PQgetResult(streamConn);
 		if (result == NULL)
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/libpqwalreceiver/Makefile postgresql-9.5-9.5.8/src/backend/replication/libpqwalreceiver/Makefile
--- postgresql-9.5-9.5.2/src/backend/replication/libpqwalreceiver/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/libpqwalreceiver/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -15,7 +15,7 @@
 override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS = libpqwalreceiver.o $(WIN32RES)
-SHLIB_LINK = $(libpq)
+SHLIB_LINK = $(libpq) $(filter -lintl, $(LIBS))
 SHLIB_PREREQS = submake-libpq
 PGFILEDESC = "libpqwalreceiver - receive WAL during streaming replication"
 NAME = libpqwalreceiver
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/logical/decode.c postgresql-9.5-9.5.8/src/backend/replication/logical/decode.c
--- postgresql-9.5-9.5.2/src/backend/replication/logical/decode.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/logical/decode.c	2017-08-07 21:13:41.000000000 +0000
@@ -476,7 +476,7 @@
 {
 	XLogRecPtr	origin_lsn = InvalidXLogRecPtr;
 	TimestampTz	commit_time = parsed->xact_time;
-	XLogRecPtr	origin_id = XLogRecGetOrigin(buf->record);
+	RepOriginId	origin_id = XLogRecGetOrigin(buf->record);
 	int			i;
 
 	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
@@ -560,9 +560,6 @@
 {
 	int			i;
 
-	SnapBuildAbortTxn(ctx->snapshot_builder, buf->record->EndRecPtr, xid,
-					  parsed->nsubxacts, parsed->subxacts);
-
 	for (i = 0; i < parsed->nsubxacts; i++)
 	{
 		ReorderBufferAbort(ctx->reorder, parsed->subxacts[i],
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/logical/logical.c postgresql-9.5-9.5.8/src/backend/replication/logical/logical.c
--- postgresql-9.5-9.5.2/src/backend/replication/logical/logical.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/logical/logical.c	2017-08-07 21:13:41.000000000 +0000
@@ -111,6 +111,7 @@
 StartupDecodingContext(List *output_plugin_options,
 					   XLogRecPtr start_lsn,
 					   TransactionId xmin_horizon,
+					   bool need_full_snapshot,
 					   XLogPageReadCB read_page,
 					   LogicalOutputPluginWriterPrepareWrite prepare_write,
 					   LogicalOutputPluginWriterWrite do_write)
@@ -170,7 +171,8 @@
 
 	ctx->reorder = ReorderBufferAllocate();
 	ctx->snapshot_builder =
-		AllocateSnapshotBuilder(ctx->reorder, xmin_horizon, start_lsn);
+		AllocateSnapshotBuilder(ctx->reorder, xmin_horizon, start_lsn,
+								need_full_snapshot);
 
 	ctx->reorder->private_data = ctx;
 
@@ -208,6 +210,7 @@
 LogicalDecodingContext *
 CreateInitDecodingContext(char *plugin,
 						  List *output_plugin_options,
+						  bool need_full_snapshot,
 						  XLogPageReadCB read_page,
 						  LogicalOutputPluginWriterPrepareWrite prepare_write,
 						  LogicalOutputPluginWriterWrite do_write)
@@ -310,28 +313,37 @@
 	 * the slot machinery about the new limit. Once that's done the
 	 * ProcArrayLock can be released as the slot machinery now is
 	 * protecting against vacuum.
+	 *
+	 * Note that, temporarily, the data, not just the catalog, xmin has to be
+	 * reserved if a data snapshot is to be exported.  Otherwise the initial
+	 * data snapshot created here is not guaranteed to be valid. After that
+	 * the data xmin doesn't need to be managed anymore and the global xmin
+	 * should be recomputed. As we are fine with losing the pegged data xmin
+	 * after crash - no chance a snapshot would get exported anymore - we can
+	 * get away with just setting the slot's
+	 * effective_xmin. ReplicationSlotRelease will reset it again.
+	 *
 	 * ----
 	 */
 	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
 
-	slot->effective_catalog_xmin = GetOldestSafeDecodingTransactionId();
-	slot->data.catalog_xmin = slot->effective_catalog_xmin;
+	xmin_horizon = GetOldestSafeDecodingTransactionId(!need_full_snapshot);
+
+	slot->effective_catalog_xmin = xmin_horizon;
+	slot->data.catalog_xmin = xmin_horizon;
+	if (need_full_snapshot)
+		slot->effective_xmin = xmin_horizon;
 
 	ReplicationSlotsComputeRequiredXmin(true);
 
 	LWLockRelease(ProcArrayLock);
 
-	/*
-	 * tell the snapshot builder to only assemble snapshot once reaching the a
-	 * running_xact's record with the respective xmin.
-	 */
-	xmin_horizon = slot->data.catalog_xmin;
-
 	ReplicationSlotMarkDirty();
 	ReplicationSlotSave();
 
 	ctx = StartupDecodingContext(NIL, InvalidXLogRecPtr, xmin_horizon,
-								 read_page, prepare_write, do_write);
+								 need_full_snapshot, read_page, prepare_write,
+								 do_write);
 
 	/* call output plugin initialization callback */
 	old_context = MemoryContextSwitchTo(ctx->context);
@@ -412,7 +424,7 @@
 	}
 
 	ctx = StartupDecodingContext(output_plugin_options,
-								 start_lsn, InvalidTransactionId,
+								 start_lsn, InvalidTransactionId, false,
 								 read_page, prepare_write, do_write);
 
 	/* call output plugin initialization callback */
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/logical/origin.c postgresql-9.5-9.5.8/src/backend/replication/logical/origin.c
--- postgresql-9.5-9.5.2/src/backend/replication/logical/origin.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/logical/origin.c	2017-08-07 21:13:41.000000000 +0000
@@ -120,9 +120,9 @@
 	XLogRecPtr	local_lsn;
 
 	/*
-	 * Slot is setup in backend?
+	 * PID of backend that's acquired slot, or 0 if none.
 	 */
-	pid_t		acquired_by;
+	int			acquired_by;
 
 	/*
 	 * Lock protecting remote_lsn and local_lsn.
@@ -566,6 +566,9 @@
 		if (curstate->roident == InvalidRepOriginId)
 			continue;
 
+		/* zero, to avoid uninitialized padding bytes */
+		memset(&disk_state, 0, sizeof(disk_state));
+
 		LWLockAcquire(&curstate->lock, LW_SHARED);
 
 		disk_state.roident = curstate->roident;
@@ -1257,7 +1260,7 @@
  * Return the replication progress for origin setup in the current session.
  *
  * If 'flush' is set to true it is ensured that the returned value corresponds
- * to a local transaction that has been flushed. this is useful if asychronous
+ * to a local transaction that has been flushed. this is useful if asynchronous
  * commits are used when replaying replicated transactions.
  */
 Datum
@@ -1343,7 +1346,7 @@
  * Return the replication progress for an individual replication origin.
  *
  * If 'flush' is set to true it is ensured that the returned value corresponds
- * to a local transaction that has been flushed. this is useful if asychronous
+ * to a local transaction that has been flushed. this is useful if asynchronous
  * commits are used when replaying replicated transactions.
  */
 Datum
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/logical/reorderbuffer.c postgresql-9.5-9.5.8/src/backend/replication/logical/reorderbuffer.c
--- postgresql-9.5-9.5.2/src/backend/replication/logical/reorderbuffer.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/logical/reorderbuffer.c	2017-08-07 21:13:41.000000000 +0000
@@ -744,13 +744,14 @@
 		elog(ERROR, "subxact logged without previous toplevel record");
 
 	/*
-	 * Pass the our base snapshot to the parent transaction if it doesn't have
+	 * Pass our base snapshot to the parent transaction if it doesn't have
 	 * one, or ours is older. That can happen if there are no changes in the
 	 * toplevel transaction but in one of the child transactions. This allows
-	 * the parent to simply use it's base snapshot initially.
+	 * the parent to simply use its base snapshot initially.
 	 */
-	if (txn->base_snapshot == NULL ||
-		txn->base_snapshot_lsn > subtxn->base_snapshot_lsn)
+	if (subtxn->base_snapshot != NULL &&
+		(txn->base_snapshot == NULL ||
+		 txn->base_snapshot_lsn > subtxn->base_snapshot_lsn))
 	{
 		txn->base_snapshot = subtxn->base_snapshot;
 		txn->base_snapshot_lsn = subtxn->base_snapshot_lsn;
@@ -872,9 +873,13 @@
 	{
 		ReorderBufferChange *cur_change;
 
-		if (txn->nentries != txn->nentries_mem)
+		if (txn->serialized)
+		{
+			/* serialize remaining changes */
+			ReorderBufferSerializeTXN(rb, txn);
 			ReorderBufferRestoreChanges(rb, txn, &state->entries[off].fd,
 										&state->entries[off].segno);
+		}
 
 		cur_change = dlist_head_element(ReorderBufferChange, node,
 										&txn->changes);
@@ -897,11 +902,14 @@
 		{
 			ReorderBufferChange *cur_change;
 
-			if (txn->nentries != txn->nentries_mem)
+			if (cur_txn->serialized)
+			{
+				/* serialize remaining changes */
+				ReorderBufferSerializeTXN(rb, cur_txn);
 				ReorderBufferRestoreChanges(rb, cur_txn,
 											&state->entries[off].fd,
 											&state->entries[off].segno);
-
+			}
 			cur_change = dlist_head_element(ReorderBufferChange, node,
 											&cur_txn->changes);
 
@@ -1116,7 +1124,7 @@
 	Assert(found);
 
 	/* remove entries spilled to disk */
-	if (txn->nentries != txn->nentries_mem)
+	if (txn->serialized)
 		ReorderBufferRestoreCleanup(rb, txn);
 
 	/* deallocate */
@@ -1307,10 +1315,6 @@
 	txn->origin_id = origin_id;
 	txn->origin_lsn = origin_lsn;
 
-	/* serialize the last bunch of changes if we need start earlier anyway */
-	if (txn->nentries_mem != txn->nentries)
-		ReorderBufferSerializeTXN(rb, txn);
-
 	/*
 	 * If this transaction didn't have any real changes in our database, it's
 	 * OK not to have a snapshot. Note that ReorderBufferCommitChild will have
@@ -1644,7 +1648,7 @@
  *
  * NB: Transactions handled here have to have actively aborted (i.e. have
  * produced an abort record). Implicitly aborted transactions are handled via
- * ReorderBufferAbortOld(); transactions we're just not interesteded in, but
+ * ReorderBufferAbortOld(); transactions we're just not interested in, but
  * which have committed are handled in ReorderBufferForget().
  *
  * This function purges this transaction and its contents from memory and
@@ -1696,7 +1700,7 @@
 
 		if (TransactionIdPrecedes(txn->xid, oldestRunningXid))
 		{
-			elog(DEBUG1, "aborting old transaction %u", txn->xid);
+			elog(DEBUG2, "aborting old transaction %u", txn->xid);
 
 			/* remove potential on-disk data, and deallocate this tx */
 			ReorderBufferCleanupTXN(rb, txn);
@@ -1712,7 +1716,7 @@
  * toplevel xid.
  *
  * This is significantly different to ReorderBufferAbort() because
- * transactions that have committed need to be treated differenly from aborted
+ * transactions that have committed need to be treated differently from aborted
  * ones since they may have modified the catalog.
  *
  * Note that this is only allowed to be called in the moment a transaction
@@ -2082,6 +2086,7 @@
 	Assert(spilled == txn->nentries_mem);
 	Assert(dlist_is_empty(&txn->changes));
 	txn->nentries_mem = 0;
+	txn->serialized = true;
 
 	if (fd != -1)
 		CloseTransientFile(fd);
@@ -2206,7 +2211,10 @@
 
 	if (write(fd, rb->outbuf, ondisk->size) != ondisk->size)
 	{
+		int save_errno = errno;
+
 		CloseTransientFile(fd);
+		errno = save_errno;
 		ereport(ERROR,
 				(errcode_for_file_access(),
 				 errmsg("could not write to data file for XID %u: %m",
@@ -2347,6 +2355,10 @@
 /*
  * Convert change from its on-disk format to in-memory format and queue it onto
  * the TXN's ->changes list.
+ *
+ * Note: although "data" is declared char*, at entry it points to a
+ * maxalign'd buffer, making it safe in most of this function to assume
+ * that the pointed-to data is suitably aligned for direct access.
  */
 static void
 ReorderBufferRestoreChange(ReorderBuffer *rb, ReorderBufferTXN *txn,
@@ -2374,7 +2386,7 @@
 		case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_INSERT:
 			if (change->data.tp.oldtuple)
 			{
-				Size		tuplelen = ((HeapTuple) data)->t_len;
+				uint32		tuplelen = ((HeapTuple) data)->t_len;
 
 				change->data.tp.oldtuple =
 					ReorderBufferGetTupleBuf(rb, tuplelen - SizeofHeapTupleHeader);
@@ -2395,7 +2407,11 @@
 
 			if (change->data.tp.newtuple)
 			{
-				Size		tuplelen = ((HeapTuple) data)->t_len;
+				/* here, data might not be suitably aligned! */
+				uint32		tuplelen;
+
+				memcpy(&tuplelen, data + offsetof(HeapTupleData, t_len),
+					   sizeof(uint32));
 
 				change->data.tp.newtuple =
 					ReorderBufferGetTupleBuf(rb, tuplelen - SizeofHeapTupleHeader);
@@ -2500,7 +2516,7 @@
 	while ((logical_de = ReadDir(logical_dir, "pg_replslot")) != NULL)
 	{
 		struct stat statbuf;
-		char		path[MAXPGPATH];
+		char		path[MAXPGPATH * 2 + 12];
 
 		if (strcmp(logical_de->d_name, ".") == 0 ||
 			strcmp(logical_de->d_name, "..") == 0)
@@ -2512,7 +2528,7 @@
 
 		/*
 		 * ok, has to be a surviving logical slot, iterate and delete
-		 * everythign starting with xid-*
+		 * everything starting with xid-*
 		 */
 		sprintf(path, "pg_replslot/%s", logical_de->d_name);
 
@@ -2927,7 +2943,8 @@
 	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY, 0);
 	if (fd < 0)
 		ereport(ERROR,
-				(errmsg("could not open file \"%s\": %m", path)));
+				(errcode_for_file_access(),
+				 errmsg("could not open file \"%s\": %m", path)));
 
 	while (true)
 	{
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/logical/snapbuild.c postgresql-9.5-9.5.8/src/backend/replication/logical/snapbuild.c
--- postgresql-9.5-9.5.2/src/backend/replication/logical/snapbuild.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/logical/snapbuild.c	2017-08-07 21:13:41.000000000 +0000
@@ -56,23 +56,34 @@
  *
  *
  * The snapbuild machinery is starting up in several stages, as illustrated
- * by the following graph:
+ * by the following graph describing the SnapBuild->state transitions:
+ *
  *		   +-------------------------+
- *	  +----|SNAPBUILD_START			 |-------------+
+ *	  +----|         START			 |-------------+
+ *	  |    +-------------------------+			   |
+ *	  |					|						   |
+ *	  |					|						   |
+ *	  |		   running_xacts #1					   |
+ *	  |					|						   |
+ *	  |					|						   |
+ *	  |					v						   |
+ *	  |    +-------------------------+			   v
+ *	  |    |   BUILDING_SNAPSHOT     |------------>|
  *	  |    +-------------------------+			   |
  *	  |					|						   |
  *	  |					|						   |
- *	  |		running_xacts with running xacts	   |
+ *	  |	running_xacts #2, xacts from #1 finished   |
  *	  |					|						   |
  *	  |					|						   |
  *	  |					v						   |
  *	  |    +-------------------------+			   v
- *	  |    |SNAPBUILD_FULL_SNAPSHOT  |------------>|
+ *	  |    |       FULL_SNAPSHOT     |------------>|
  *	  |    +-------------------------+			   |
+ *	  |					|						   |
  * running_xacts		|					   saved snapshot
  * with zero xacts		|				  at running_xacts's lsn
  *	  |					|						   |
- *	  |		all running toplevel TXNs finished	   |
+ *	  |	running_xacts with xacts from #2 finished  |
  *	  |					|						   |
  *	  |					v						   |
  *	  |    +-------------------------+			   |
@@ -82,8 +93,8 @@
  * Initially the machinery is in the START stage. When an xl_running_xacts
  * record is read that is sufficiently new (above the safe xmin horizon),
  * there's a state transition. If there were no running xacts when the
- * runnign_xacts record was generated, we'll directly go into CONSISTENT
- * state, otherwise we'll switch to the FULL_SNAPSHOT state. Having a full
+ * running_xacts record was generated, we'll directly go into CONSISTENT
+ * state, otherwise we'll switch to the BUILDING_SNAPSHOT state. Having a full
  * snapshot means that all transactions that start henceforth can be decoded
  * in their entirety, but transactions that started previously can't. In
  * FULL_SNAPSHOT we'll switch into CONSISTENT once all those previously
@@ -164,6 +175,9 @@
 	 */
 	TransactionId initial_xmin_horizon;
 
+	/* Indicates if we are building full snapshot or just catalog one .*/
+	bool		building_full_snapshot;
+
 	/*
 	 * Snapshot that's valid to see the catalog state seen at this moment.
 	 */
@@ -180,26 +194,24 @@
 	ReorderBuffer *reorder;
 
 	/*
-	 * Information about initially running transactions
-	 *
-	 * When we start building a snapshot there already may be transactions in
-	 * progress.  Those are stored in running.xip.  We don't have enough
-	 * information about those to decode their contents, so until they are
-	 * finished (xcnt=0) we cannot switch to a CONSISTENT state.
+	 * Outdated: This struct isn't used for its original purpose anymore, but
+	 * can't be removed / changed in a minor version, because it's stored
+	 * on-disk.
 	 */
 	struct
 	{
 		/*
-		 * As long as running.xcnt all XIDs < running.xmin and > running.xmax
-		 * have to be checked whether they still are running.
+		 * NB: This field is misused, until a major version can break on-disk
+		 * compatibility. See SnapBuildNextPhaseAt() /
+		 * SnapBuildStartNextPhaseAt().
 		 */
-		TransactionId xmin;
-		TransactionId xmax;
+		TransactionId was_xmin;
+		TransactionId was_xmax;
 
-		size_t		xcnt;		/* number of used xip entries */
-		size_t		xcnt_space; /* allocated size of xip */
-		TransactionId *xip;		/* running xacts array, xidComparator-sorted */
-	}			running;
+		size_t		was_xcnt;		/* number of used xip entries */
+		size_t		was_xcnt_space; /* allocated size of xip */
+		TransactionId *was_xip;		/* running xacts array, xidComparator-sorted */
+	}			was_running;
 
 	/*
 	 * Array of transactions which could have catalog changes that committed
@@ -245,12 +257,6 @@
 static ResourceOwner SavedResourceOwnerDuringExport = NULL;
 static bool ExportInProgress = false;
 
-/* transaction state manipulation functions */
-static void SnapBuildEndTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid);
-
-/* ->running manipulation */
-static bool SnapBuildTxnIsRunning(SnapBuild *builder, TransactionId xid);
-
 /* ->committed manipulation */
 static void SnapBuildPurgeCommittedTxn(SnapBuild *builder);
 
@@ -265,11 +271,39 @@
 
 /* xlog reading helper functions for SnapBuildProcessRecord */
 static bool SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *running);
+static void SnapBuildWaitSnapshot(xl_running_xacts *running, TransactionId cutoff);
 
 /* serialization functions */
 static void SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn);
 static bool SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn);
 
+/*
+ * Return TransactionId after which the next phase of initial snapshot
+ * building will happen.
+ */
+static inline TransactionId
+SnapBuildNextPhaseAt(SnapBuild *builder)
+{
+	/*
+	 * For backward compatibility reasons this has to be stored in the wrongly
+	 * named field.  Will be fixed in next major version.
+	 */
+	return builder->was_running.was_xmax;
+}
+
+/*
+ * Set TransactionId after which the next phase of initial snapshot building
+ * will happen.
+ */
+static inline void
+SnapBuildStartNextPhaseAt(SnapBuild *builder, TransactionId at)
+{
+	/*
+	 * For backward compatibility reasons this has to be stored in the wrongly
+	 * named field.  Will be fixed in next major version.
+	 */
+	builder->was_running.was_xmax = at;
+}
 
 /*
  * Allocate a new snapshot builder.
@@ -280,7 +314,8 @@
 SnapBuild *
 AllocateSnapshotBuilder(ReorderBuffer *reorder,
 						TransactionId xmin_horizon,
-						XLogRecPtr start_lsn)
+						XLogRecPtr start_lsn,
+						bool need_full_snapshot)
 {
 	MemoryContext context;
 	MemoryContext oldcontext;
@@ -309,6 +344,7 @@
 
 	builder->initial_xmin_horizon = xmin_horizon;
 	builder->start_decoding_at = start_lsn;
+	builder->building_full_snapshot = need_full_snapshot;
 
 	MemoryContextSwitchTo(oldcontext);
 
@@ -553,6 +589,18 @@
 	 * mechanism. Due to that we can do this without locks, we're only
 	 * changing our own value.
 	 */
+#ifdef USE_ASSERT_CHECKING
+	{
+		TransactionId safeXid;
+
+		LWLockAcquire(ProcArrayLock, LW_SHARED);
+		safeXid = GetOldestSafeDecodingTransactionId(false);
+		LWLockRelease(ProcArrayLock);
+
+		Assert(TransactionIdPrecedesOrEquals(safeXid, snap->xmin));
+	}
+#endif
+
 	MyPgXact->xmin = snap->xmin;
 
 	/* allocate in transaction context */
@@ -648,7 +696,7 @@
 	 * we got into the SNAPBUILD_FULL_SNAPSHOT state.
 	 */
 	if (builder->state < SNAPBUILD_CONSISTENT &&
-		SnapBuildTxnIsRunning(builder, xid))
+		TransactionIdPrecedes(xid, SnapBuildNextPhaseAt(builder)))
 		return false;
 
 	/*
@@ -661,7 +709,7 @@
 		if (builder->snapshot == NULL)
 		{
 			builder->snapshot = SnapBuildBuildSnapshot(builder, xid);
-			/* inrease refcount for the snapshot builder */
+			/* increase refcount for the snapshot builder */
 			SnapBuildSnapIncRefcount(builder->snapshot);
 		}
 
@@ -717,38 +765,6 @@
 }
 
 /*
- * Check whether `xid` is currently 'running'.
- *
- * Running transactions in our parlance are transactions which we didn't
- * observe from the start so we can't properly decode their contents. They
- * only exist after we freshly started from an < CONSISTENT snapshot.
- */
-static bool
-SnapBuildTxnIsRunning(SnapBuild *builder, TransactionId xid)
-{
-	Assert(builder->state < SNAPBUILD_CONSISTENT);
-	Assert(TransactionIdIsNormal(builder->running.xmin));
-	Assert(TransactionIdIsNormal(builder->running.xmax));
-
-	if (builder->running.xcnt &&
-		NormalTransactionIdFollows(xid, builder->running.xmin) &&
-		NormalTransactionIdPrecedes(xid, builder->running.xmax))
-	{
-		TransactionId *search =
-		bsearch(&xid, builder->running.xip, builder->running.xcnt_space,
-				sizeof(TransactionId), xidComparator);
-
-		if (search != NULL)
-		{
-			Assert(*search == xid);
-			return true;
-		}
-	}
-
-	return false;
-}
-
-/*
  * Add a new Snapshot to all transactions we're decoding that currently are
  * in-progress so they can see new catalog contents made by the transaction
  * that just committed. This is necessary because those in-progress
@@ -870,63 +886,6 @@
 }
 
 /*
- * Common logic for SnapBuildAbortTxn and SnapBuildCommitTxn dealing with
- * keeping track of the amount of running transactions.
- */
-static void
-SnapBuildEndTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid)
-{
-	if (builder->state == SNAPBUILD_CONSISTENT)
-		return;
-
-	/*
-	 * NB: This handles subtransactions correctly even if we started from
-	 * suboverflowed xl_running_xacts because we only keep track of toplevel
-	 * transactions. Since the latter are always are allocated before their
-	 * subxids and since they end at the same time it's sufficient to deal
-	 * with them here.
-	 */
-	if (SnapBuildTxnIsRunning(builder, xid))
-	{
-		Assert(builder->running.xcnt > 0);
-
-		if (!--builder->running.xcnt)
-		{
-			/*
-			 * None of the originally running transaction is running anymore,
-			 * so our incrementaly built snapshot now is consistent.
-			 */
-			ereport(LOG,
-				  (errmsg("logical decoding found consistent point at %X/%X",
-						  (uint32) (lsn >> 32), (uint32) lsn),
-				   errdetail("Transaction ID %u finished; no more running transactions.",
-							 xid)));
-			builder->state = SNAPBUILD_CONSISTENT;
-		}
-	}
-}
-
-/*
- * Abort a transaction, throw away all state we kept.
- */
-void
-SnapBuildAbortTxn(SnapBuild *builder, XLogRecPtr lsn,
-				  TransactionId xid,
-				  int nsubxacts, TransactionId *subxacts)
-{
-	int			i;
-
-	for (i = 0; i < nsubxacts; i++)
-	{
-		TransactionId subxid = subxacts[i];
-
-		SnapBuildEndTxn(builder, lsn, subxid);
-	}
-
-	SnapBuildEndTxn(builder, lsn, xid);
-}
-
-/*
  * Handle everything that needs to be done when a transaction commits
  */
 void
@@ -935,21 +894,26 @@
 {
 	int			nxact;
 
-	bool		forced_timetravel = false;
+	bool		needs_snapshot = false;
+	bool		needs_timetravel = false;
 	bool		sub_needs_timetravel = false;
-	bool		top_needs_timetravel = false;
 
 	TransactionId xmax = xid;
 
 	/*
-	 * If we couldn't observe every change of a transaction because it was
-	 * already running at the point we started to observe we have to assume it
-	 * made catalog changes.
-	 *
-	 * This has the positive benefit that we afterwards have enough
-	 * information to build an exportable snapshot that's usable by pg_dump et
-	 * al.
+	 * Transactions preceding BUILDING_SNAPSHOT will neither be decoded, nor
+	 * will they be part of a snapshot.  So we don't need to record anything.
 	 */
+	if (builder->state == SNAPBUILD_START ||
+		(builder->state == SNAPBUILD_BUILDING_SNAPSHOT &&
+		 TransactionIdPrecedes(xid, SnapBuildNextPhaseAt(builder))))
+	{
+		/* ensure that only commits after this are getting replayed */
+		if (builder->start_decoding_at <= lsn)
+			builder->start_decoding_at = lsn + 1;
+		return;
+	}
+
 	if (builder->state < SNAPBUILD_CONSISTENT)
 	{
 		/* ensure that only commits after this are getting replayed */
@@ -957,12 +921,13 @@
 			builder->start_decoding_at = lsn + 1;
 
 		/*
-		 * We could avoid treating !SnapBuildTxnIsRunning transactions as
-		 * timetravel ones, but we want to be able to export a snapshot when
-		 * we reached consistency.
+		 * If building an exportable snapshot, force xid to be tracked, even
+		 * if the transaction didn't modify the catalog.
 		 */
-		forced_timetravel = true;
-		elog(DEBUG1, "forced to assume catalog changes for xid %u because it was running to early", xid);
+		if (builder->building_full_snapshot)
+		{
+			needs_timetravel = true;
+		}
 	}
 
 	for (nxact = 0; nxact < nsubxacts; nxact++)
@@ -970,81 +935,81 @@
 		TransactionId subxid = subxacts[nxact];
 
 		/*
-		 * make sure txn is not tracked in running txn's anymore, switch state
+		 * Add subtransaction to base snapshot if catalog modifying, we don't
+		 * distinguish to toplevel transactions there.
 		 */
-		SnapBuildEndTxn(builder, lsn, subxid);
-
-		/*
-		 * If we're forcing timetravel we also need visibility information
-		 * about subtransaction, so keep track of subtransaction's state.
-		 */
-		if (forced_timetravel)
+		if (ReorderBufferXidHasCatalogChanges(builder->reorder, subxid))
 		{
+			sub_needs_timetravel = true;
+			needs_snapshot = true;
+
+			elog(DEBUG1, "found subtransaction %u:%u with catalog changes",
+				 xid, subxid);
+
 			SnapBuildAddCommittedTxn(builder, subxid);
+
 			if (NormalTransactionIdFollows(subxid, xmax))
 				xmax = subxid;
 		}
-
 		/*
-		 * Add subtransaction to base snapshot if it DDL, we don't distinguish
-		 * to toplevel transactions there.
+		 * If we're forcing timetravel we also need visibility information
+		 * about subtransaction, so keep track of subtransaction's state, even
+		 * if not catalog modifying.  Don't need to distribute a snapshot in
+		 * that case.
 		 */
-		else if (ReorderBufferXidHasCatalogChanges(builder->reorder, subxid))
+		else if (needs_timetravel)
 		{
-			sub_needs_timetravel = true;
-
-			elog(DEBUG1, "found subtransaction %u:%u with catalog changes.",
-				 xid, subxid);
-
 			SnapBuildAddCommittedTxn(builder, subxid);
-
 			if (NormalTransactionIdFollows(subxid, xmax))
 				xmax = subxid;
 		}
 	}
 
-	/*
-	 * Make sure toplevel txn is not tracked in running txn's anymore, switch
-	 * state to consistent if possible.
-	 */
-	SnapBuildEndTxn(builder, lsn, xid);
-
-	if (forced_timetravel)
+	/* if top-level modified catalog, it'll need a snapshot */
+	if (ReorderBufferXidHasCatalogChanges(builder->reorder, xid))
 	{
-		elog(DEBUG2, "forced transaction %u to do timetravel.", xid);
-
+		elog(DEBUG2, "found top level transaction %u, with catalog changes",
+			 xid);
+		needs_snapshot = true;
+		needs_timetravel = true;
 		SnapBuildAddCommittedTxn(builder, xid);
 	}
-	/* add toplevel transaction to base snapshot */
-	else if (ReorderBufferXidHasCatalogChanges(builder->reorder, xid))
+	else if (sub_needs_timetravel)
 	{
-		elog(DEBUG2, "found top level transaction %u, with catalog changes!",
-			 xid);
-
-		top_needs_timetravel = true;
+		/* track toplevel txn as well, subxact alone isn't meaningful */
 		SnapBuildAddCommittedTxn(builder, xid);
 	}
-	else if (sub_needs_timetravel)
+	else if (needs_timetravel)
 	{
-		/* mark toplevel txn as timetravel as well */
+		elog(DEBUG2, "forced transaction %u to do timetravel", xid);
+
 		SnapBuildAddCommittedTxn(builder, xid);
 	}
 
-	/* if there's any reason to build a historic snapshot, do so now */
-	if (forced_timetravel || top_needs_timetravel || sub_needs_timetravel)
+	if (!needs_timetravel)
 	{
-		/*
-		 * Adjust xmax of the snapshot builder, we only do that for committed,
-		 * catalog modifying, transactions, everything else isn't interesting
-		 * for us since we'll never look at the respective rows.
-		 */
-		if (!TransactionIdIsValid(builder->xmax) ||
-			TransactionIdFollowsOrEquals(xmax, builder->xmax))
-		{
-			builder->xmax = xmax;
-			TransactionIdAdvance(builder->xmax);
-		}
+		/* record that we cannot export a general snapshot anymore */
+		builder->committed.includes_all_transactions = false;
+	}
+
+	Assert(!needs_snapshot || needs_timetravel);
 
+	/*
+	 * Adjust xmax of the snapshot builder, we only do that for committed,
+	 * catalog modifying, transactions, everything else isn't interesting
+	 * for us since we'll never look at the respective rows.
+	 */
+	if (needs_timetravel &&
+		(!TransactionIdIsValid(builder->xmax) ||
+		 TransactionIdFollowsOrEquals(xmax, builder->xmax)))
+	{
+		builder->xmax = xmax;
+		TransactionIdAdvance(builder->xmax);
+	}
+
+	/* if there's any reason to build a historic snapshot, do so now */
+	if (needs_snapshot)
+	{
 		/*
 		 * If we haven't built a complete snapshot yet there's no need to hand
 		 * it out, it wouldn't (and couldn't) be used anyway.
@@ -1076,11 +1041,6 @@
 		/* add a new Snapshot to all currently running transactions */
 		SnapBuildDistributeNewCatalogSnapshot(builder, lsn);
 	}
-	else
-	{
-		/* record that we cannot export a general snapshot anymore */
-		builder->committed.includes_all_transactions = false;
-	}
 }
 
 
@@ -1198,22 +1158,20 @@
 	 *
 	 * a) There were no running transactions when the xl_running_xacts record
 	 *	  was inserted, jump to CONSISTENT immediately. We might find such a
-	 *	  state we were waiting for b) and c).
+	 *	  state while waiting on c)'s sub-states.
 	 *
-	 * b) Wait for all toplevel transactions that were running to end. We
-	 *	  simply track the number of in-progress toplevel transactions and
-	 *	  lower it whenever one commits or aborts. When that number
-	 *	  (builder->running.xcnt) reaches zero, we can go from FULL_SNAPSHOT
-	 *	  to CONSISTENT.
-	 *	  NB: We need to search running.xip when seeing a transaction's end to
-	 *	  make sure it's a toplevel transaction and it's been one of the
-	 *	  initially running ones.
-	 *	  Interestingly, in contrast to HS, this allows us not to care about
-	 *	  subtransactions - and by extension suboverflowed xl_running_xacts -
-	 *	  at all.
+	 * b) This (in a previous run) or another decoding slot serialized a
+	 *	  snapshot to disk that we can use.  Can't use this method for the
+	 *	  initial snapshot when slot is being created and needs full snapshot
+	 *	  for export or direct use, as that snapshot will only contain catalog
+	 *	  modifying transactions.
 	 *
-	 * c) This (in a previous run) or another decoding slot serialized a
-	 *	  snapshot to disk that we can use.
+	 * c) First incrementally build a snapshot for catalog tuples
+	 *    (BUILDING_SNAPSHOT), that requires all, already in-progress,
+	 *    transactions to finish.  Every transaction starting after that
+	 *    (FULL_SNAPSHOT state), has enough information to be decoded.  But
+	 *    for older running transactions no viable snapshot exists yet, so
+	 *    CONSISTENT will only be reached once all of those have finished.
 	 * ---
 	 */
 
@@ -1230,16 +1188,23 @@
 								 (uint32) (lsn >> 32), (uint32) lsn),
 		errdetail_internal("initial xmin horizon of %u vs the snapshot's %u",
 				 builder->initial_xmin_horizon, running->oldestRunningXid)));
+
+
+		SnapBuildWaitSnapshot(running, builder->initial_xmin_horizon);
+
 		return true;
 	}
 
 	/*
 	 * a) No transaction were running, we can jump to consistent.
 	 *
+	 * This is not affected by races around xl_running_xacts, because we can
+	 * miss transaction commits, but currently not transactions starting.
+	 *
 	 * NB: We might have already started to incrementally assemble a snapshot,
 	 * so we need to be careful to deal with that.
 	 */
-	if (running->xcnt == 0)
+	if (running->oldestRunningXid == running->nextXid)
 	{
 		if (builder->start_decoding_at == InvalidXLogRecPtr ||
 			builder->start_decoding_at <= lsn)
@@ -1254,12 +1219,8 @@
 		Assert(TransactionIdIsNormal(builder->xmin));
 		Assert(TransactionIdIsNormal(builder->xmax));
 
-		/* no transactions running now */
-		builder->running.xcnt = 0;
-		builder->running.xmin = InvalidTransactionId;
-		builder->running.xmax = InvalidTransactionId;
-
 		builder->state = SNAPBUILD_CONSISTENT;
+		SnapBuildStartNextPhaseAt(builder, InvalidTransactionId);
 
 		ereport(LOG,
 				(errmsg("logical decoding found consistent point at %X/%X",
@@ -1268,29 +1229,29 @@
 
 		return false;
 	}
-	/* c) valid on disk state */
-	else if (SnapBuildRestore(builder, lsn))
+	/* b) valid on disk state and not building full snapshot */
+	else if (!builder->building_full_snapshot &&
+			 SnapBuildRestore(builder, lsn))
 	{
 		/* there won't be any state to cleanup */
 		return false;
 	}
-
 	/*
-	 * b) first encounter of a useable xl_running_xacts record. If we had
-	 * found one earlier we would either track running transactions (i.e.
-	 * builder->running.xcnt != 0) or be consistent (this function wouldn't
-	 * get called).
+	 * c) transition from START to BUILDING_SNAPSHOT.
+	 *
+	 * In START state, and a xl_running_xacts record with running xacts is
+	 * encountered.  In that case, switch to BUILDING_SNAPSHOT state, and
+	 * record xl_running_xacts->nextXid.  Once all running xacts have finished
+	 * (i.e. they're all >= nextXid), we have a complete catalog snapshot.  It
+	 * might look that we could use xl_running_xact's ->xids information to
+	 * get there quicker, but that is problematic because transactions marked
+	 * as running, might already have inserted their commit record - it's
+	 * infeasible to change that with locking.
 	 */
-	else if (!builder->running.xcnt)
+	else if (builder->state == SNAPBUILD_START)
 	{
-		int			off;
-
-		/*
-		 * We only care about toplevel xids as those are the ones we
-		 * definitely see in the wal stream. As snapbuild.c tracks committed
-		 * instead of running transactions we don't need to know anything
-		 * about uncommitted subtransactions.
-		 */
+		builder->state = SNAPBUILD_BUILDING_SNAPSHOT;
+		SnapBuildStartNextPhaseAt(builder, running->nextXid);
 
 		/*
 		 * Start with an xmin/xmax that's correct for future, when all the
@@ -1304,59 +1265,57 @@
 		Assert(TransactionIdIsNormal(builder->xmin));
 		Assert(TransactionIdIsNormal(builder->xmax));
 
-		builder->running.xcnt = running->xcnt;
-		builder->running.xcnt_space = running->xcnt;
-		builder->running.xip =
-			MemoryContextAlloc(builder->context,
-							   builder->running.xcnt * sizeof(TransactionId));
-		memcpy(builder->running.xip, running->xids,
-			   builder->running.xcnt * sizeof(TransactionId));
-
-		/* sort so we can do a binary search */
-		qsort(builder->running.xip, builder->running.xcnt,
-			  sizeof(TransactionId), xidComparator);
-
-		builder->running.xmin = builder->running.xip[0];
-		builder->running.xmax = builder->running.xip[running->xcnt - 1];
-
-		/* makes comparisons cheaper later */
-		TransactionIdRetreat(builder->running.xmin);
-		TransactionIdAdvance(builder->running.xmax);
-
-		builder->state = SNAPBUILD_FULL_SNAPSHOT;
-
 		ereport(LOG,
 			(errmsg("logical decoding found initial starting point at %X/%X",
 					(uint32) (lsn >> 32), (uint32) lsn),
-			 errdetail_plural("%u transaction needs to finish.",
-							  "%u transactions need to finish.",
-							  builder->running.xcnt,
-							  (uint32) builder->running.xcnt)));
+			 errdetail("Waiting for transactions (approximately %d) older than %u to end.",
+					   running->xcnt, running->nextXid)));
 
-		/*
-		 * Iterate through all xids, wait for them to finish.
-		 *
-		 * This isn't required for the correctness of decoding, but to allow
-		 * isolationtester to notice that we're currently waiting for
-		 * something.
-		 */
-		for (off = 0; off < builder->running.xcnt; off++)
-		{
-			TransactionId xid = builder->running.xip[off];
+		SnapBuildWaitSnapshot(running, running->nextXid);
+	}
+	/*
+	 * c) transition from BUILDING_SNAPSHOT to FULL_SNAPSHOT.
+	 *
+	 * In BUILDING_SNAPSHOT state, and this xl_running_xacts' oldestRunningXid
+	 * is >= than nextXid from when we switched to BUILDING_SNAPSHOT.  This
+	 * means all transactions starting afterwards have enough information to
+	 * be decoded.  Switch to FULL_SNAPSHOT.
+	 */
+	else if (builder->state == SNAPBUILD_BUILDING_SNAPSHOT &&
+			 TransactionIdPrecedesOrEquals(SnapBuildNextPhaseAt(builder),
+										   running->oldestRunningXid))
+	{
+		builder->state = SNAPBUILD_FULL_SNAPSHOT;
+		SnapBuildStartNextPhaseAt(builder, running->nextXid);
 
-			/*
-			 * Upper layers should prevent that we ever need to wait on
-			 * ourselves. Check anyway, since failing to do so would either
-			 * result in an endless wait or an Assert() failure.
-			 */
-			if (TransactionIdIsCurrentTransactionId(xid))
-				elog(ERROR, "waiting for ourselves");
+		ereport(LOG,
+				(errmsg("logical decoding found initial consistent point at %X/%X",
+						(uint32) (lsn >> 32), (uint32) lsn),
+				 errdetail("Waiting for transactions (approximately %d) older than %u to end.",
+						   running->xcnt, running->nextXid)));
 
-			XactLockTableWait(xid, NULL, NULL, XLTW_None);
-		}
+		SnapBuildWaitSnapshot(running, running->nextXid);
+	}
+	/*
+	 * c) transition from FULL_SNAPSHOT to CONSISTENT.
+	 *
+	 * In FULL_SNAPSHOT state (see d) ), and this xl_running_xacts'
+	 * oldestRunningXid is >= than nextXid from when we switched to
+	 * FULL_SNAPSHOT.  This means all transactions that are currently in
+	 * progress have a catalog snapshot, and all their changes have been
+	 * collected.  Switch to CONSISTENT.
+	 */
+	else if (builder->state == SNAPBUILD_FULL_SNAPSHOT &&
+			 TransactionIdPrecedesOrEquals(SnapBuildNextPhaseAt(builder),
+										   running->oldestRunningXid))
+	{
+		builder->state = SNAPBUILD_CONSISTENT;
+		SnapBuildStartNextPhaseAt(builder, InvalidTransactionId);
 
-		/* nothing could have built up so far, so don't perform cleanup */
-		return false;
+		ereport(LOG,
+				(errmsg("logical decoding found consistent point at %X/%X",
+						(uint32) (lsn >> 32), (uint32) lsn),
+				 errdetail("There are no old transactions anymore.")));
 	}
 
 	/*
@@ -1365,8 +1324,54 @@
 	 * records so incremental cleanup can be performed.
 	 */
 	return true;
+
 }
 
+/* ---
+ * Iterate through xids in record, wait for all older than the cutoff to
+ * finish.  Then, if possible, log a new xl_running_xacts record.
+ *
+ * This isn't required for the correctness of decoding, but to:
+ * a) allow isolationtester to notice that we're currently waiting for
+ *    something.
+ * b) log a new xl_running_xacts record where it'd be helpful, without having
+ *    to write for bgwriter or checkpointer.
+ * ---
+ */
+static void
+SnapBuildWaitSnapshot(xl_running_xacts *running, TransactionId cutoff)
+{
+	int			off;
+
+	for (off = 0; off < running->xcnt; off++)
+	{
+		TransactionId xid = running->xids[off];
+
+		/*
+		 * Upper layers should prevent that we ever need to wait on
+		 * ourselves. Check anyway, since failing to do so would either
+		 * result in an endless wait or an Assert() failure.
+		 */
+		if (TransactionIdIsCurrentTransactionId(xid))
+			elog(ERROR, "waiting for ourselves");
+
+		if (TransactionIdFollows(xid, cutoff))
+			continue;
+
+		XactLockTableWait(xid, NULL, NULL, XLTW_None);
+	}
+
+	/*
+	 * All transactions we needed to finish finished - try to ensure there is
+	 * another xl_running_xacts record in a timely manner, without having to
+	 * write for bgwriter or checkpointer to log one.  During recovery we
+	 * can't enforce that, so we'll have to wait.
+	 */
+	if (!RecoveryInProgress())
+	{
+		LogStandbySnapshot();
+	}
+}
 
 /* -----------------------------------
  * Snapshot serialization support
@@ -1516,7 +1521,6 @@
 				 errmsg("could not remove file \"%s\": %m", path)));
 
 	needed_length = sizeof(SnapBuildOnDisk) +
-		sizeof(TransactionId) * builder->running.xcnt_space +
 		sizeof(TransactionId) * builder->committed.xcnt;
 
 	ondisk_c = MemoryContextAllocZero(builder->context, needed_length);
@@ -1535,18 +1539,14 @@
 	ondisk->builder.context = NULL;
 	ondisk->builder.snapshot = NULL;
 	ondisk->builder.reorder = NULL;
-	ondisk->builder.running.xip = NULL;
 	ondisk->builder.committed.xip = NULL;
 
 	COMP_CRC32C(ondisk->checksum,
 				&ondisk->builder,
 				sizeof(SnapBuild));
 
-	/* copy running xacts */
-	sz = sizeof(TransactionId) * builder->running.xcnt_space;
-	memcpy(ondisk_c, builder->running.xip, sz);
-	COMP_CRC32C(ondisk->checksum, ondisk_c, sz);
-	ondisk_c += sz;
+	/* there shouldn't be any running xacts */
+	Assert(builder->was_running.was_xcnt == 0);
 
 	/* copy committed xacts */
 	sz = sizeof(TransactionId) * builder->committed.xcnt;
@@ -1698,10 +1698,11 @@
 	}
 	COMP_CRC32C(checksum, &ondisk.builder, sizeof(SnapBuild));
 
-	/* restore running xacts information */
-	sz = sizeof(TransactionId) * ondisk.builder.running.xcnt_space;
-	ondisk.builder.running.xip = MemoryContextAllocZero(builder->context, sz);
-	readBytes = read(fd, ondisk.builder.running.xip, sz);
+	/* restore running xacts (dead, but kept for backward compat) */
+	sz = sizeof(TransactionId) * ondisk.builder.was_running.was_xcnt_space;
+	ondisk.builder.was_running.was_xip =
+		MemoryContextAllocZero(builder->context, sz);
+	readBytes = read(fd, ondisk.builder.was_running.was_xip, sz);
 	if (readBytes != sz)
 	{
 		CloseTransientFile(fd);
@@ -1710,7 +1711,7 @@
 				 errmsg("could not read file \"%s\", read %d of %d: %m",
 						path, readBytes, (int) sz)));
 	}
-	COMP_CRC32C(checksum, ondisk.builder.running.xip, sz);
+	COMP_CRC32C(checksum, ondisk.builder.was_running.was_xip, sz);
 
 	/* restore committed xacts information */
 	sz = sizeof(TransactionId) * ondisk.builder.committed.xcnt;
@@ -1774,12 +1775,6 @@
 	}
 	ondisk.builder.committed.xip = NULL;
 
-	builder->running.xcnt = ondisk.builder.running.xcnt;
-	if (builder->running.xip)
-		pfree(builder->running.xip);
-	builder->running.xcnt_space = ondisk.builder.running.xcnt_space;
-	builder->running.xip = ondisk.builder.running.xip;
-
 	/* our snapshot is not interesting anymore, build a new one */
 	if (builder->snapshot != NULL)
 	{
@@ -1799,8 +1794,6 @@
 	return true;
 
 snapshot_not_interesting:
-	if (ondisk.builder.running.xip != NULL)
-		pfree(ondisk.builder.running.xip);
 	if (ondisk.builder.committed.xip != NULL)
 		pfree(ondisk.builder.committed.xip);
 	return false;
@@ -1821,7 +1814,7 @@
 	XLogRecPtr	redo;
 	DIR		   *snap_dir;
 	struct dirent *snap_de;
-	char		path[MAXPGPATH];
+	char		path[MAXPGPATH + 21];
 
 	/*
 	 * We start of with a minimum of the last redo pointer. No new replication
@@ -1848,7 +1841,7 @@
 			strcmp(snap_de->d_name, "..") == 0)
 			continue;
 
-		snprintf(path, MAXPGPATH, "pg_logical/snapshots/%s", snap_de->d_name);
+		snprintf(path, sizeof(path), "pg_logical/snapshots/%s", snap_de->d_name);
 
 		if (lstat(path, &statbuf) == 0 && !S_ISREG(statbuf.st_mode))
 		{
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/repl_scanner.c postgresql-9.5-9.5.8/src/backend/replication/repl_scanner.c
--- postgresql-9.5-9.5.2/src/backend/replication/repl_scanner.c	2016-03-28 20:23:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/repl_scanner.c	2017-08-07 21:34:38.000000000 +0000
@@ -797,7 +797,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( replication_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -810,7 +810,7 @@
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, replication_yyin))==0 && ferror(replication_yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, replication_yyin)) == 0 && ferror(replication_yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1386,7 +1386,7 @@
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/slot.c postgresql-9.5-9.5.8/src/backend/replication/slot.c
--- postgresql-9.5-9.5.2/src/backend/replication/slot.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/slot.c	2017-08-07 21:13:41.000000000 +0000
@@ -263,12 +263,22 @@
 	 */
 	Assert(!slot->in_use);
 	Assert(slot->active_pid == 0);
-	slot->data.persistency = persistency;
-	slot->data.xmin = InvalidTransactionId;
-	slot->effective_xmin = InvalidTransactionId;
+
+	/* first initialize persistent data */
+	memset(&slot->data, 0, sizeof(ReplicationSlotPersistentData));
 	StrNCpy(NameStr(slot->data.name), name, NAMEDATALEN);
 	slot->data.database = db_specific ? MyDatabaseId : InvalidOid;
-	slot->data.restart_lsn = InvalidXLogRecPtr;
+	slot->data.persistency = persistency;
+
+	/* and then data only present in shared memory */
+	slot->just_dirtied = false;
+	slot->dirty = false;
+	slot->effective_xmin = InvalidTransactionId;
+	slot->effective_catalog_xmin = InvalidTransactionId;
+	slot->candidate_catalog_xmin = InvalidTransactionId;
+	slot->candidate_xmin_lsn = InvalidXLogRecPtr;
+	slot->candidate_restart_valid = InvalidXLogRecPtr;
+	slot->candidate_restart_lsn = InvalidXLogRecPtr;
 
 	/*
 	 * Create the slot on disk.  We haven't actually marked the slot allocated
@@ -386,6 +396,22 @@
 		SpinLockRelease(&slot->mutex);
 	}
 
+
+	/*
+	 * If slot needed to temporarily restrain both data and catalog xmin to
+	 * create the catalog snapshot, remove that temporary constraint.
+	 * Snapshots can only be exported while the initial snapshot is still
+	 * acquired.
+	 */
+	if (!TransactionIdIsValid(slot->data.xmin) &&
+		TransactionIdIsValid(slot->effective_xmin))
+	{
+		SpinLockAcquire(&slot->mutex);
+		slot->effective_xmin = InvalidTransactionId;
+		SpinLockRelease(&slot->mutex);
+		ReplicationSlotsComputeRequiredXmin(false);
+	}
+
 	MyReplicationSlot = NULL;
 
 	/* might not have been set when we've been a plain slot */
@@ -570,6 +596,9 @@
 
 /*
  * Compute the oldest xmin across all slots and store it in the ProcArray.
+ *
+ * If already_locked is true, ProcArrayLock has already been acquired
+ * exclusively.
  */
 void
 ReplicationSlotsComputeRequiredXmin(bool already_locked)
@@ -580,8 +609,7 @@
 
 	Assert(ReplicationSlotCtl != NULL);
 
-	if (!already_locked)
-		LWLockAcquire(ReplicationSlotControlLock, LW_SHARED);
+	LWLockAcquire(ReplicationSlotControlLock, LW_SHARED);
 
 	for (i = 0; i < max_replication_slots; i++)
 	{
@@ -614,8 +642,7 @@
 			agg_catalog_xmin = effective_catalog_xmin;
 	}
 
-	if (!already_locked)
-		LWLockRelease(ReplicationSlotControlLock);
+	LWLockRelease(ReplicationSlotControlLock);
 
 	ProcArraySetReplicationSlotXmin(agg_xmin, agg_catalog_xmin, already_locked);
 }
@@ -835,13 +862,13 @@
 	while ((replication_de = ReadDir(replication_dir, "pg_replslot")) != NULL)
 	{
 		struct stat statbuf;
-		char		path[MAXPGPATH];
+		char		path[MAXPGPATH + 12];
 
 		if (strcmp(replication_de->d_name, ".") == 0 ||
 			strcmp(replication_de->d_name, "..") == 0)
 			continue;
 
-		snprintf(path, MAXPGPATH, "pg_replslot/%s", replication_de->d_name);
+		snprintf(path, sizeof(path), "pg_replslot/%s", replication_de->d_name);
 
 		/* we're only creating directories here, skip if it's not our's */
 		if (lstat(path, &statbuf) == 0 && !S_ISDIR(statbuf.st_mode))
@@ -1073,7 +1100,7 @@
 {
 	ReplicationSlotOnDisk cp;
 	int			i;
-	char		path[MAXPGPATH];
+	char		path[MAXPGPATH + 22];
 	int			fd;
 	bool		restored = false;
 	int			readBytes;
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/slotfuncs.c postgresql-9.5-9.5.8/src/backend/replication/slotfuncs.c
--- postgresql-9.5-9.5.2/src/backend/replication/slotfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/slotfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -109,8 +109,8 @@
 	/*
 	 * Create logical decoding context, to build the initial snapshot.
 	 */
-	ctx = CreateInitDecodingContext(
-									NameStr(*plugin), NIL,
+	ctx = CreateInitDecodingContext(NameStr(*plugin), NIL,
+									false, /* do not build snapshot */
 									logical_read_local_xlog_page, NULL, NULL);
 
 	/* build initial snapshot, might take a while */
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/syncrep.c postgresql-9.5-9.5.8/src/backend/replication/syncrep.c
--- postgresql-9.5-9.5.2/src/backend/replication/syncrep.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/syncrep.c	2017-08-07 21:13:41.000000000 +0000
@@ -160,24 +160,16 @@
 	 */
 	for (;;)
 	{
-		int			syncRepState;
-
 		/* Must reset the latch before testing state. */
 		ResetLatch(MyLatch);
 
 		/*
-		 * Try checking the state without the lock first.  There's no
-		 * guarantee that we'll read the most up-to-date value, so if it looks
-		 * like we're still waiting, recheck while holding the lock.  But if
-		 * it looks like we're done, we must really be done, because once
-		 * 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.
-		 */
-		syncRepState = MyProc->syncRepState;
-		if (syncRepState == SYNC_REP_WAITING)
-			syncRepState = MyProc->syncRepState;
-		if (syncRepState == SYNC_REP_WAIT_COMPLETE)
+		 * Acquiring the lock is not needed, the latch ensures proper barriers.
+		 * If it looks like we're done, we must really be done, because once
+		 * 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.
+		 */
+		if (MyProc->syncRepState == SYNC_REP_WAIT_COMPLETE)
 			break;
 
 		/*
@@ -243,8 +235,11 @@
 	 * WalSender has checked our LSN and has removed us from queue. Clean up
 	 * state and leave.  It's OK to reset these shared memory fields without
 	 * holding SyncRepLock, because any walsenders will ignore us anyway when
-	 * we're not on the queue.
+	 * we're not on the queue.  We need a read barrier to make sure we see
+	 * the changes to the queue link (this might be unnecessary without
+	 * assertions, but better safe than sorry).
 	 */
+	pg_read_barrier();
 	Assert(SHMQueueIsDetached(&(MyProc->syncRepLinks)));
 	MyProc->syncRepState = SYNC_REP_NOT_WAITING;
 	MyProc->waitLSN = 0;
@@ -580,15 +575,22 @@
 									   offsetof(PGPROC, syncRepLinks));
 
 		/*
-		 * Set state to complete; see SyncRepWaitForLSN() for discussion of
-		 * the various states.
+		 * Remove thisproc from queue.
 		 */
-		thisproc->syncRepState = SYNC_REP_WAIT_COMPLETE;
+		SHMQueueDelete(&(thisproc->syncRepLinks));
 
 		/*
-		 * Remove thisproc from queue.
+		 * SyncRepWaitForLSN() reads syncRepState without holding the lock, so
+		 * make sure that it sees the queue link being removed before the
+		 * syncRepState change.
 		 */
-		SHMQueueDelete(&(thisproc->syncRepLinks));
+		pg_write_barrier();
+
+		/*
+		 * Set state to complete; see SyncRepWaitForLSN() for discussion of
+		 * the various states.
+		 */
+		thisproc->syncRepState = SYNC_REP_WAIT_COMPLETE;
 
 		/*
 		 * Wake only when we have set state and removed from queue.
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/walreceiver.c postgresql-9.5-9.5.8/src/backend/replication/walreceiver.c
--- postgresql-9.5-9.5.2/src/backend/replication/walreceiver.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/walreceiver.c	2017-08-07 21:13:41.000000000 +0000
@@ -1093,7 +1093,10 @@
  * in case they don't have a watch.
  *
  * If the user disables feedback, send one final message to tell sender
- * to forget about the xmin on this standby.
+ * to forget about the xmin on this standby. We also send this message
+ * on first connect because a previous connection might have set xmin
+ * on a replication slot. (If we're not using a slot it's harmless to
+ * send a feedback message explicitly setting InvalidTransactionId).
  */
 static void
 XLogWalRcvSendHSFeedback(bool immed)
@@ -1103,7 +1106,8 @@
 	uint32		nextEpoch;
 	TransactionId xmin;
 	static TimestampTz sendTime = 0;
-	static bool master_has_standby_xmin = false;
+	/* initially true so we always send at least one feedback message */
+	static bool master_has_standby_xmin = true;
 
 	/*
 	 * If the user doesn't want status to be reported to the master, be sure
@@ -1128,14 +1132,17 @@
 	}
 
 	/*
-	 * If Hot Standby is not yet active there is nothing to send. Check this
-	 * after the interval has expired to reduce number of calls.
+	 * If Hot Standby is not yet accepting connections there is nothing to
+	 * send. Check this after the interval has expired to reduce number of
+	 * calls.
+	 *
+	 * Bailing out here also ensures that we don't send feedback until we've
+	 * read our own replication slot state, so we don't tell the master to
+	 * discard needed xmin or catalog_xmin from any slots that may exist
+	 * on this replica.
 	 */
 	if (!HotStandbyActive())
-	{
-		Assert(!master_has_standby_xmin);
 		return;
-	}
 
 	/*
 	 * Make the expensive call to get the oldest xmin once we are certain
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/walreceiverfuncs.c postgresql-9.5-9.5.8/src/backend/replication/walreceiverfuncs.c
--- postgresql-9.5-9.5.2/src/backend/replication/walreceiverfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/walreceiverfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -329,7 +329,7 @@
 	long		secs;
 	int			usecs;
 
-	TimestampTz chunckReplayStartTime;
+	TimestampTz chunkReplayStartTime;
 
 	SpinLockAcquire(&walrcv->mutex);
 	receivePtr = walrcv->receivedUpto;
@@ -340,12 +340,12 @@
 	if (receivePtr == replayPtr)
 		return 0;
 
-	chunckReplayStartTime = GetCurrentChunkReplayStartTime();
+	chunkReplayStartTime = GetCurrentChunkReplayStartTime();
 
-	if (chunckReplayStartTime == 0)
+	if (chunkReplayStartTime == 0)
 		return -1;
 
-	TimestampDifference(chunckReplayStartTime,
+	TimestampDifference(chunkReplayStartTime,
 						GetCurrentTimestamp(),
 						&secs, &usecs);
 
diff -Nru postgresql-9.5-9.5.2/src/backend/replication/walsender.c postgresql-9.5-9.5.8/src/backend/replication/walsender.c
--- postgresql-9.5-9.5.2/src/backend/replication/walsender.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/replication/walsender.c	2017-08-07 21:13:41.000000000 +0000
@@ -24,11 +24,17 @@
  * are treated as not a crash but approximately normal termination;
  * the walsender will exit quickly without sending any more XLOG records.
  *
- * If the server is shut down, postmaster sends us SIGUSR2 after all
- * regular backends have exited and the shutdown checkpoint has been written.
- * This instructs walsender to send any outstanding WAL, including the
- * shutdown checkpoint record, wait for it to be replicated to the standby,
- * and then exit.
+ * If the server is shut down, checkpointer sends us
+ * PROCSIG_WALSND_INIT_STOPPING after all regular backends have exited.  If
+ * the backend is idle or runs an SQL query this causes the backend to
+ * shutdown, if logical replication is in progress all existing WAL records
+ * are processed followed by a shutdown.  Otherwise this causes the walsender
+ * to switch to the "stopping" state. In this state, the walsender will reject
+ * any further replication commands. The checkpointer begins the shutdown
+ * checkpoint once all walsenders are confirmed as stopping. When the shutdown
+ * checkpoint finishes, the postmaster sends us SIGUSR2. This instructs
+ * walsender to send any outstanding WAL, including the shutdown checkpoint
+ * record, wait for it to be replicated to the standby, and then exit.
  *
  *
  * Portions Copyright (c) 2010-2015, PostgreSQL Global Development Group
@@ -169,14 +175,14 @@
 static bool WalSndCaughtUp = false;
 
 /* Flags set by signal handlers for later service in main loop */
-static volatile sig_atomic_t got_SIGHUP = false;
-static volatile sig_atomic_t walsender_ready_to_stop = false;
+static volatile sig_atomic_t got_SIGUSR2 = false;
+static volatile sig_atomic_t got_STOPPING = false;
 
 /*
- * This is set while we are streaming. When not set, SIGUSR2 signal will be
- * handled like SIGTERM. When set, the main loop is responsible for checking
- * walsender_ready_to_stop and terminating when it's set (after streaming any
- * remaining WAL).
+ * This is set while we are streaming. When not set
+ * PROCSIG_WALSND_INIT_STOPPING signal will be handled like SIGTERM. When set,
+ * the main loop is responsible for checking got_STOPPING and terminating when
+ * it's set (after streaming any remaining WAL).
  */
 static volatile sig_atomic_t replication_active = false;
 
@@ -184,8 +190,6 @@
 static XLogRecPtr logical_startptr = InvalidXLogRecPtr;
 
 /* Signal handlers */
-static void WalSndSigHupHandler(SIGNAL_ARGS);
-static void WalSndXLogSendHandler(SIGNAL_ARGS);
 static void WalSndLastCycleHandler(SIGNAL_ARGS);
 
 /* Prototypes for private functions */
@@ -263,7 +267,8 @@
 		ReplicationSlotRelease();
 
 	replication_active = false;
-	if (walsender_ready_to_stop)
+
+	if (got_STOPPING || got_SIGUSR2)
 		proc_exit(0);
 
 	/* Revert back to startup state */
@@ -671,7 +676,7 @@
 		WalSndLoop(XLogSendPhysical);
 
 		replication_active = false;
-		if (walsender_ready_to_stop)
+		if (got_STOPPING)
 			proc_exit(0);
 		WalSndSetState(WALSNDSTATE_STARTUP);
 
@@ -758,15 +763,14 @@
 	/* make sure we have enough WAL available */
 	flushptr = WalSndWaitForWal(targetPagePtr + reqLen);
 
-	/* more than one block available */
-	if (targetPagePtr + XLOG_BLCKSZ <= flushptr)
-		count = XLOG_BLCKSZ;
-	/* not enough WAL synced, that can happen during shutdown */
-	else if (targetPagePtr + reqLen > flushptr)
+	/* fail if not (implies we are going to shut down) */
+	if (flushptr < targetPagePtr + reqLen)
 		return -1;
-	/* part of the page available */
+
+	if (targetPagePtr + XLOG_BLCKSZ <= flushptr)
+		count = XLOG_BLCKSZ;	/* more than one block available */
 	else
-		count = flushptr - targetPagePtr;
+		count = flushptr - targetPagePtr;	/* part of the page available */
 
 	/* now actually read the data, we know it's there */
 	XLogRead(cur_page, targetPagePtr, XLOG_BLCKSZ);
@@ -807,13 +811,12 @@
 		ReplicationSlotCreate(cmd->slotname, true, RS_EPHEMERAL);
 	}
 
-	initStringInfo(&output_message);
-
 	if (cmd->kind == REPLICATION_KIND_LOGICAL)
 	{
 		LogicalDecodingContext *ctx;
 
 		ctx = CreateInitDecodingContext(cmd->plugin, NIL,
+										true, /* build snapshot */
 										logical_read_xlog_page,
 										WalSndPrepareWrite, WalSndWriteData);
 
@@ -963,7 +966,7 @@
 	{
 		ereport(LOG,
 				(errmsg("terminating walsender process after promotion")));
-		walsender_ready_to_stop = true;
+		got_STOPPING = true;
 	}
 
 	WalSndSetState(WALSNDSTATE_CATCHUP);
@@ -1018,7 +1021,7 @@
 	ReplicationSlotRelease();
 
 	replication_active = false;
-	if (walsender_ready_to_stop)
+	if (got_STOPPING)
 		proc_exit(0);
 	WalSndSetState(WALSNDSTATE_STARTUP);
 
@@ -1105,9 +1108,9 @@
 		CHECK_FOR_INTERRUPTS();
 
 		/* Process any requests or signals received recently */
-		if (got_SIGHUP)
+		if (ConfigReloadPending)
 		{
-			got_SIGHUP = false;
+			ConfigReloadPending = false;
 			ProcessConfigFile(PGC_SIGHUP);
 			SyncRepInitConfig();
 		}
@@ -1146,7 +1149,11 @@
 }
 
 /*
- * Wait till WAL < loc is flushed to disk so it can be safely read.
+ * Wait till WAL < loc is flushed to disk so it can be safely sent to client.
+ *
+ * Returns end LSN of flushed WAL.  Normally this will be >= loc, but
+ * if we detect a shutdown request (either from postmaster or client)
+ * we will return early, so caller must always check.
  */
 static XLogRecPtr
 WalSndWaitForWal(XLogRecPtr loc)
@@ -1188,9 +1195,9 @@
 		CHECK_FOR_INTERRUPTS();
 
 		/* Process any requests or signals received recently */
-		if (got_SIGHUP)
+		if (ConfigReloadPending)
 		{
-			got_SIGHUP = false;
+			ConfigReloadPending = false;
 			ProcessConfigFile(PGC_SIGHUP);
 			SyncRepInitConfig();
 		}
@@ -1198,6 +1205,14 @@
 		/* Check for input from the client */
 		ProcessRepliesIfAny();
 
+		/*
+		 * If we're shutting down, trigger pending WAL to be written out,
+		 * otherwise we'd possibly end up waiting for WAL that never gets
+		 * written, because walwriter has shut down already.
+		 */
+		if (got_STOPPING)
+			XLogBackgroundFlush();
+
 		/* Update our idea of the currently flushed position. */
 		if (!RecoveryInProgress())
 			RecentFlushPtr = GetFlushRecPtr();
@@ -1205,15 +1220,13 @@
 			RecentFlushPtr = GetXLogReplayRecPtr(NULL);
 
 		/*
-		 * If postmaster asked us to stop, don't wait here anymore. This will
-		 * cause the xlogreader to return without reading a full record, which
-		 * is the fastest way to reach the mainloop which then can quit.
+		 * If postmaster asked us to stop, don't wait anymore.
 		 *
 		 * It's important to do this check after the recomputation of
 		 * RecentFlushPtr, so we can send all remaining data before shutting
 		 * down.
 		 */
-		if (walsender_ready_to_stop)
+		if (got_STOPPING)
 			break;
 
 		/*
@@ -1238,14 +1251,20 @@
 		WalSndCaughtUp = true;
 
 		/*
-		 * Try to flush pending output to the client. Also wait for the socket
-		 * becoming writable, if there's still pending output after an attempt
-		 * to flush. Otherwise we might just sit on output data while waiting
-		 * for new WAL being generated.
+		 * Try to flush any pending output to the client.
 		 */
 		if (pq_flush_if_writable() != 0)
 			WalSndShutdown();
 
+		/*
+		 * If we have received CopyDone from the client, sent CopyDone
+		 * ourselves, and the output buffer is empty, it's time to exit
+		 * streaming, so fail the current WAL fetch request.
+		 */
+		if (streamingDoneReceiving && streamingDoneSending &&
+			!pq_is_send_pending())
+			break;
+
 		now = GetCurrentTimestamp();
 
 		/* die if timeout was reached */
@@ -1254,6 +1273,13 @@
 		/* Send keepalive if the time has come */
 		WalSndKeepaliveIfNecessary(now);
 
+		/*
+		 * Sleep until something happens or we time out.  Also wait for the
+		 * socket becoming writable, if there's still pending output.
+		 * Otherwise we might sit on sendable output data while waiting for
+		 * new WAL to be generated.  (But if we have nothing to send, we don't
+		 * want to wake on socket-writable.)
+		 */
 		sleeptime = WalSndComputeSleeptime(now);
 
 		wakeEvents = WL_LATCH_SET | WL_POSTMASTER_DEATH |
@@ -1262,7 +1288,6 @@
 		if (pq_is_send_pending())
 			wakeEvents |= WL_SOCKET_WRITEABLE;
 
-		/* Sleep until something happens or we time out */
 		WaitLatchOrSocket(MyLatch, wakeEvents,
 						  MyProcPort->sock, sleeptime);
 	}
@@ -1284,6 +1309,22 @@
 	MemoryContext old_context;
 
 	/*
+	 * If WAL sender has been told that shutdown is getting close, switch its
+	 * status accordingly to handle the next replication commands correctly.
+	 */
+	if (got_STOPPING)
+		WalSndSetState(WALSNDSTATE_STOPPING);
+
+	/*
+	 * Throw error if in stopping mode.  We need prevent commands that could
+	 * generate WAL while the shutdown checkpoint is being written.  To be
+	 * safe, we just prohibit all new commands.
+	 */
+	if (MyWalSnd->state == WALSNDSTATE_STOPPING)
+		ereport(ERROR,
+				(errmsg("cannot execute new commands while WAL sender is in stopping mode")));
+
+	/*
 	 * Log replication command if log_replication_commands is enabled. Even
 	 * when it's disabled, log the command with DEBUG1 level for backward
 	 * compatibility.
@@ -1316,6 +1357,14 @@
 
 	cmd_node = replication_parse_result;
 
+	/*
+	 * Allocate buffers that will be used for each outgoing and incoming
+	 * message.  We do this just once per command to reduce palloc overhead.
+	 */
+	initStringInfo(&output_message);
+	initStringInfo(&reply_message);
+	initStringInfo(&tmpbuf);
+
 	switch (cmd_node->type)
 	{
 		case T_IdentifySystemCmd:
@@ -1789,14 +1838,6 @@
 WalSndLoop(WalSndSendDataCallback send_data)
 {
 	/*
-	 * Allocate buffers that will be used for each outgoing and incoming
-	 * message.  We do this just once to reduce palloc overhead.
-	 */
-	initStringInfo(&output_message);
-	initStringInfo(&reply_message);
-	initStringInfo(&tmpbuf);
-
-	/*
 	 * Initialize the last reply timestamp. That enables timeout processing
 	 * from hereon.
 	 */
@@ -1824,9 +1865,9 @@
 		CHECK_FOR_INTERRUPTS();
 
 		/* Process any requests or signals received recently */
-		if (got_SIGHUP)
+		if (ConfigReloadPending)
 		{
-			got_SIGHUP = false;
+			ConfigReloadPending = false;
 			ProcessConfigFile(PGC_SIGHUP);
 			SyncRepInitConfig();
 		}
@@ -1839,7 +1880,8 @@
 		 * ourselves, and the output buffer is empty, it's time to exit
 		 * streaming.
 		 */
-		if (!pq_is_send_pending() && streamingDoneSending && streamingDoneReceiving)
+		if (streamingDoneReceiving && streamingDoneSending &&
+			!pq_is_send_pending())
 			break;
 
 		/*
@@ -1883,7 +1925,7 @@
 			 * normal termination at shutdown, or a promotion, the walsender
 			 * is not sure which.
 			 */
-			if (walsender_ready_to_stop)
+			if (got_SIGUSR2)
 				WalSndDone(send_data);
 		}
 
@@ -2194,6 +2236,10 @@
 	XLogRecPtr	endptr;
 	Size		nbytes;
 
+	/* If requested switch the WAL sender to the stopping state. */
+	if (got_STOPPING)
+		WalSndSetState(WALSNDSTATE_STOPPING);
+
 	if (streamingDoneSending)
 	{
 		WalSndCaughtUp = true;
@@ -2454,7 +2500,16 @@
 		 * point, then we're caught up.
 		 */
 		if (logical_decoding_ctx->reader->EndRecPtr >= GetFlushRecPtr())
+		{
 			WalSndCaughtUp = true;
+
+			/*
+			 * Have WalSndLoop() terminate the connection in an orderly
+			 * manner, after writing out all the pending data.
+			 */
+			if (got_STOPPING)
+				got_SIGUSR2 = true;
+		}
 	}
 
 	/* Update shared memory status */
@@ -2486,13 +2541,14 @@
 	send_data();
 
 	/*
-	 * Check a write location to see whether all the WAL have successfully
-	 * been replicated if this walsender is connecting to a standby such as
-	 * pg_receivexlog which always returns an invalid flush location.
-	 * Otherwise, check a flush location.
+	 * To figure out whether all WAL has successfully been replicated, check
+	 * flush location if valid, write otherwise. Tools like pg_receivexlog
+	 * will usually (unless in synchronous mode) return an invalid flush
+	 * location.
 	 */
 	replicatedPtr = XLogRecPtrIsInvalid(MyWalSnd->flush) ?
 		MyWalSnd->write : MyWalSnd->flush;
+
 	if (WalSndCaughtUp && sentPtr == replicatedPtr &&
 		!pq_is_send_pending())
 	{
@@ -2503,7 +2559,10 @@
 		proc_exit(0);
 	}
 	if (!waiting_for_ping_response)
+	{
 		WalSndKeepalive(true);
+		waiting_for_ping_response = true;
+	}
 }
 
 /*
@@ -2563,35 +2622,13 @@
 	}
 }
 
-/* SIGHUP: set flag to re-read config file at next convenient time */
-static void
-WalSndSigHupHandler(SIGNAL_ARGS)
-{
-	int			save_errno = errno;
-
-	got_SIGHUP = true;
-
-	SetLatch(MyLatch);
-
-	errno = save_errno;
-}
-
-/* SIGUSR1: set flag to send WAL records */
-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)
+/*
+ * Handle PROCSIG_WALSND_INIT_STOPPING signal.
+ */
+void
+HandleWalSndInitStopping(void)
 {
-	int			save_errno = errno;
+	Assert(am_walsender);
 
 	/*
 	 * If replication has not yet started, die like with SIGTERM. If
@@ -2601,8 +2638,24 @@
 	 */
 	if (!replication_active)
 		kill(MyProcPid, SIGTERM);
+	else
+	{
+		got_STOPPING = true;
+		SetLatch(MyLatch);
+	}
+}
 
-	walsender_ready_to_stop = true;
+/*
+ * SIGUSR2: set flag to do a last cycle and shut down afterwards. The WAL
+ * sender should already have been switched to WALSNDSTATE_STOPPING at
+ * this point.
+ */
+static void
+WalSndLastCycleHandler(SIGNAL_ARGS)
+{
+	int			save_errno = errno;
+
+	got_SIGUSR2 = true;
 	SetLatch(MyLatch);
 
 	errno = save_errno;
@@ -2613,14 +2666,14 @@
 WalSndSignals(void)
 {
 	/* Set up signal handlers */
-	pqsignal(SIGHUP, WalSndSigHupHandler);		/* set flag to read config
+	pqsignal(SIGHUP, PostgresSigHupHandler);	/* set flag to read config
 												 * file */
 	pqsignal(SIGINT, SIG_IGN);	/* not used */
 	pqsignal(SIGTERM, die);		/* request shutdown */
 	pqsignal(SIGQUIT, quickdie);	/* hard crash time */
 	InitializeTimeouts();		/* establishes SIGALRM handler */
 	pqsignal(SIGPIPE, SIG_IGN);
-	pqsignal(SIGUSR1, WalSndXLogSendHandler);	/* request WAL sending */
+	pqsignal(SIGUSR1, procsignal_sigusr1_handler);
 	pqsignal(SIGUSR2, WalSndLastCycleHandler);	/* request a last cycle and
 												 * shutdown */
 
@@ -2700,6 +2753,77 @@
 	}
 }
 
+/*
+ * Signal all walsenders to move to stopping state.
+ *
+ * This will trigger walsenders to move to a state where no further WAL can be
+ * generated. See this file's header for details.
+ */
+void
+WalSndInitStopping(void)
+{
+	int			i;
+
+	for (i = 0; i < max_wal_senders; i++)
+	{
+		WalSnd	   *walsnd = &WalSndCtl->walsnds[i];
+		pid_t		pid;
+
+		SpinLockAcquire(&walsnd->mutex);
+		pid = walsnd->pid;
+		SpinLockRelease(&walsnd->mutex);
+
+		if (pid == 0)
+			continue;
+
+		SendProcSignal(pid, PROCSIG_WALSND_INIT_STOPPING, InvalidBackendId);
+	}
+}
+
+/*
+ * Wait that all the WAL senders have quit or reached the stopping state. This
+ * is used by the checkpointer to control when the shutdown checkpoint can
+ * safely be performed.
+ */
+void
+WalSndWaitStopping(void)
+{
+	for (;;)
+	{
+		int			i;
+		bool		all_stopped = true;
+
+		for (i = 0; i < max_wal_senders; i++)
+		{
+			WalSndState state;
+			WalSnd	   *walsnd = &WalSndCtl->walsnds[i];
+
+			SpinLockAcquire(&walsnd->mutex);
+
+			if (walsnd->pid == 0)
+			{
+				SpinLockRelease(&walsnd->mutex);
+				continue;
+			}
+
+			state = walsnd->state;
+			SpinLockRelease(&walsnd->mutex);
+
+			if (state != WALSNDSTATE_STOPPING)
+			{
+				all_stopped = false;
+				break;
+			}
+		}
+
+		/* safe to leave if confirmation is done for all WAL senders */
+		if (all_stopped)
+			return;
+
+		pg_usleep(10000L);		/* wait for 10 msec */
+	}
+}
+
 /* Set state for current walsender (only called in walsender) */
 void
 WalSndSetState(WalSndState state)
@@ -2734,6 +2858,8 @@
 			return "catchup";
 		case WALSNDSTATE_STREAMING:
 			return "streaming";
+		case WALSNDSTATE_STOPPING:
+			return "stopping";
 	}
 	return "UNKNOWN";
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/rewrite/rewriteHandler.c postgresql-9.5-9.5.8/src/backend/rewrite/rewriteHandler.c
--- postgresql-9.5-9.5.2/src/backend/rewrite/rewriteHandler.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/rewrite/rewriteHandler.c	2017-08-07 21:13:41.000000000 +0000
@@ -871,6 +871,7 @@
 					const char *attrName)
 {
 	TargetEntry *result;
+	CoerceToDomain *coerce_expr = NULL;
 	Node	   *src_expr;
 	Node	   *prior_expr;
 	Node	   *src_input;
@@ -907,10 +908,30 @@
 	 * For FieldStore, instead of nesting we can generate a single
 	 * FieldStore with multiple target fields.  We must nest when
 	 * ArrayRefs are involved though.
+	 *
+	 * As a further complication, the destination column might be a domain,
+	 * resulting in each assignment containing a CoerceToDomain node over a
+	 * FieldStore or ArrayRef.  These should have matching target domains,
+	 * so we strip them and reconstitute a single CoerceToDomain over the
+	 * combined FieldStore/ArrayRef nodes.  (Notice that this has the result
+	 * that the domain's checks are applied only after we do all the field or
+	 * element updates, not after each one.  This is arguably desirable.)
 	 *----------
 	 */
 	src_expr = (Node *) src_tle->expr;
 	prior_expr = (Node *) prior_tle->expr;
+
+	if (src_expr && IsA(src_expr, CoerceToDomain) &&
+		prior_expr && IsA(prior_expr, CoerceToDomain) &&
+		((CoerceToDomain *) src_expr)->resulttype ==
+		((CoerceToDomain *) prior_expr)->resulttype)
+	{
+		/* we assume without checking that resulttypmod/resultcollid match */
+		coerce_expr = (CoerceToDomain *) src_expr;
+		src_expr = (Node *) ((CoerceToDomain *) src_expr)->arg;
+		prior_expr = (Node *) ((CoerceToDomain *) prior_expr)->arg;
+	}
+
 	src_input = get_assignment_input(src_expr);
 	prior_input = get_assignment_input(prior_expr);
 	if (src_input == NULL ||
@@ -979,6 +1000,16 @@
 		newexpr = NULL;
 	}
 
+	if (coerce_expr)
+	{
+		/* put back the CoerceToDomain */
+		CoerceToDomain *newcoerce = makeNode(CoerceToDomain);
+
+		memcpy(newcoerce, coerce_expr, sizeof(CoerceToDomain));
+		newcoerce->arg = (Expr *) newexpr;
+		newexpr = (Node *) newcoerce;
+	}
+
 	result = flatCopyTargetEntry(src_tle);
 	result->expr = (Expr *) newexpr;
 	return result;
diff -Nru postgresql-9.5-9.5.2/src/backend/rewrite/rowsecurity.c postgresql-9.5-9.5.8/src/backend/rewrite/rowsecurity.c
--- postgresql-9.5-9.5.2/src/backend/rewrite/rowsecurity.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/rewrite/rowsecurity.c	2017-08-07 21:13:41.000000000 +0000
@@ -78,7 +78,8 @@
 								   List *permissive_policies,
 								   List *restrictive_policies,
 								   List **withCheckOptions,
-								   bool *hasSubLinks);
+								   bool *hasSubLinks,
+								   bool force_using);
 
 static bool check_role_for_policy(ArrayType *policy_roles, Oid user_id);
 
@@ -269,7 +270,8 @@
 							   permissive_policies,
 							   restrictive_policies,
 							   withCheckOptions,
-							   hasSubLinks);
+							   hasSubLinks,
+							   false);
 
 		/*
 		 * Get and add ALL/SELECT policies, if SELECT rights are required
@@ -292,7 +294,8 @@
 								   select_permissive_policies,
 								   select_restrictive_policies,
 								   withCheckOptions,
-								   hasSubLinks);
+								   hasSubLinks,
+								   true);
 		}
 
 		/*
@@ -321,7 +324,8 @@
 								   conflict_permissive_policies,
 								   conflict_restrictive_policies,
 								   withCheckOptions,
-								   hasSubLinks);
+								   hasSubLinks,
+								   true);
 
 			/*
 			 * Get and add ALL/SELECT policies, as WCO_RLS_CONFLICT_CHECK
@@ -343,7 +347,8 @@
 									   conflict_select_permissive_policies,
 									   conflict_select_restrictive_policies,
 									   withCheckOptions,
-									   hasSubLinks);
+									   hasSubLinks,
+									   true);
 			}
 
 			/* Enforce the WITH CHECK clauses of the UPDATE policies */
@@ -352,7 +357,8 @@
 								   conflict_permissive_policies,
 								   conflict_restrictive_policies,
 								   withCheckOptions,
-								   hasSubLinks);
+								   hasSubLinks,
+								   false);
 		}
 	}
 
@@ -641,13 +647,14 @@
 					   List *permissive_policies,
 					   List *restrictive_policies,
 					   List **withCheckOptions,
-					   bool *hasSubLinks)
+					   bool *hasSubLinks,
+					   bool force_using)
 {
 	ListCell   *item;
 	List	   *permissive_quals = NIL;
 
 #define QUAL_FOR_WCO(policy) \
-	( kind != WCO_RLS_CONFLICT_CHECK &&	\
+	( !force_using && \
 	  (policy)->with_check_qual != NULL ? \
 	  (policy)->with_check_qual : (policy)->qual )
 
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/buffer/bufmgr.c postgresql-9.5-9.5.8/src/backend/storage/buffer/bufmgr.c
--- postgresql-9.5-9.5.2/src/backend/storage/buffer/bufmgr.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/buffer/bufmgr.c	2017-08-07 21:13:41.000000000 +0000
@@ -1169,10 +1169,15 @@
 	 * paranoia.  We also reset the usage_count since any recency of use of
 	 * the old content is no longer relevant.  (The usage_count starts out at
 	 * 1 so that the buffer can survive one clock-sweep pass.)
+	 *
+	 * Make sure BM_PERMANENT is set for buffers that must be written at every
+	 * checkpoint.  Unlogged buffers only need to be written at shutdown
+	 * checkpoints, except for their "init" forks, which need to be treated
+	 * just like permanent relations.
 	 */
 	buf->tag = newTag;
 	buf->flags &= ~(BM_VALID | BM_DIRTY | BM_JUST_DIRTIED | BM_CHECKPOINT_NEEDED | BM_IO_ERROR | BM_PERMANENT);
-	if (relpersistence == RELPERSISTENCE_PERMANENT)
+	if (relpersistence == RELPERSISTENCE_PERMANENT || forkNum == INIT_FORKNUM)
 		buf->flags |= BM_TAG_VALID | BM_PERMANENT;
 	else
 		buf->flags |= BM_TAG_VALID;
@@ -3015,7 +3020,7 @@
  * This is essentially the same as MarkBufferDirty, except:
  *
  * 1. The caller does not write WAL; so if checksums are enabled, we may need
- *	  to write an XLOG_HINT WAL record to protect against torn pages.
+ *	  to write an XLOG_FPI WAL record to protect against torn pages.
  * 2. The caller might have only share-lock instead of exclusive-lock on the
  *	  buffer's content lock.
  * 3. This function does not guarantee that the buffer is always marked dirty
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/buffer/freelist.c postgresql-9.5-9.5.8/src/backend/storage/buffer/freelist.c
--- postgresql-9.5-9.5.2/src/backend/storage/buffer/freelist.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/buffer/freelist.c	2017-08-07 21:13:41.000000000 +0000
@@ -400,8 +400,8 @@
 /*
  * StrategyNotifyBgWriter -- set or clear allocation notification latch
  *
- * If bgwriterLatch isn't NULL, the next invocation of StrategyGetBuffer will
- * set that latch.  Pass NULL to clear the pending notification before it
+ * If bgwprocno isn't -1, the next invocation of StrategyGetBuffer will
+ * set that latch.  Pass -1 to clear the pending notification before it
  * happens.  This feature is used by the bgwriter process to wake itself up
  * from hibernation, and is not meant for anybody else to use.
  */
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/file/copydir.c postgresql-9.5-9.5.8/src/backend/storage/file/copydir.c
--- postgresql-9.5-9.5.2/src/backend/storage/file/copydir.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/file/copydir.c	2017-08-07 21:13:41.000000000 +0000
@@ -38,8 +38,8 @@
 {
 	DIR		   *xldir;
 	struct dirent *xlde;
-	char		fromfile[MAXPGPATH];
-	char		tofile[MAXPGPATH];
+	char		fromfile[MAXPGPATH * 2];
+	char		tofile[MAXPGPATH * 2];
 
 	if (mkdir(todir, S_IRWXU) != 0)
 		ereport(ERROR,
@@ -63,8 +63,8 @@
 			strcmp(xlde->d_name, "..") == 0)
 			continue;
 
-		snprintf(fromfile, MAXPGPATH, "%s/%s", fromdir, xlde->d_name);
-		snprintf(tofile, MAXPGPATH, "%s/%s", todir, xlde->d_name);
+		snprintf(fromfile, sizeof(fromfile), "%s/%s", fromdir, xlde->d_name);
+		snprintf(tofile, sizeof(tofile), "%s/%s", todir, xlde->d_name);
 
 		if (lstat(fromfile, &fst) < 0)
 			ereport(ERROR,
@@ -103,7 +103,7 @@
 			strcmp(xlde->d_name, "..") == 0)
 			continue;
 
-		snprintf(tofile, MAXPGPATH, "%s/%s", todir, xlde->d_name);
+		snprintf(tofile, sizeof(tofile), "%s/%s", todir, xlde->d_name);
 
 		/*
 		 * We don't need to sync subdirectories here since the recursive
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/file/fd.c postgresql-9.5-9.5.8/src/backend/storage/file/fd.c
--- postgresql-9.5-9.5.2/src/backend/storage/file/fd.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/file/fd.c	2017-08-07 21:13:41.000000000 +0000
@@ -153,7 +153,14 @@
 
 #define FileIsNotOpen(file) (VfdCache[file].fd == VFD_CLOSED)
 
+/*
+ * Note: a VFD's seekPos is normally always valid, but if for some reason
+ * an lseek() fails, it might become set to FileUnknownPos.  We can struggle
+ * along without knowing the seek position in many cases, but in some places
+ * we have to fail if we don't have it.
+ */
 #define FileUnknownPos ((off_t) -1)
+#define FilePosIsUnknown(pos) ((pos) < 0)
 
 /* these are the assigned bits in fdstate below: */
 #define FD_TEMPORARY		(1 << 0)	/* T = delete when closed */
@@ -167,7 +174,7 @@
 	File		nextFree;		/* link to next free VFD, if in freelist */
 	File		lruMoreRecently;	/* doubly linked recency-of-use list */
 	File		lruLessRecently;
-	off_t		seekPos;		/* current logical file position */
+	off_t		seekPos;		/* current logical file position, or -1 */
 	off_t		fileSize;		/* current size of file (0 if not temporary) */
 	char	   *fileName;		/* name of file, or NULL for unused VFD */
 	/* NB: fileName is malloc'd, and must be free'd when closing the VFD */
@@ -826,19 +833,33 @@
 
 	vfdP = &VfdCache[file];
 
-	/* delete the vfd record from the LRU ring */
-	Delete(file);
-
-	/* save the seek position */
-	vfdP->seekPos = lseek(vfdP->fd, (off_t) 0, SEEK_CUR);
-	Assert(vfdP->seekPos != (off_t) -1);
+	/*
+	 * Normally we should know the seek position, but if for some reason we
+	 * have lost track of it, try again to get it.  If we still can't get it,
+	 * we have a problem: we will be unable to restore the file seek position
+	 * when and if the file is re-opened.  But we can't really throw an error
+	 * and refuse to close the file, or activities such as transaction cleanup
+	 * will be broken.
+	 */
+	if (FilePosIsUnknown(vfdP->seekPos))
+	{
+		vfdP->seekPos = lseek(vfdP->fd, (off_t) 0, SEEK_CUR);
+		if (FilePosIsUnknown(vfdP->seekPos))
+			elog(LOG, "could not seek file \"%s\" before closing: %m",
+				 vfdP->fileName);
+	}
 
-	/* close the file */
+	/*
+	 * Close the file.  We aren't expecting this to fail; if it does, better
+	 * to leak the FD than to mess up our internal state.
+	 */
 	if (close(vfdP->fd))
-		elog(ERROR, "could not close file \"%s\": %m", vfdP->fileName);
-
-	--nfile;
+		elog(LOG, "could not close file \"%s\": %m", vfdP->fileName);
 	vfdP->fd = VFD_CLOSED;
+	--nfile;
+
+	/* delete the vfd record from the LRU ring */
+	Delete(file);
 }
 
 static void
@@ -889,22 +910,39 @@
 								 vfdP->fileMode);
 		if (vfdP->fd < 0)
 		{
-			DO_DB(elog(LOG, "RE_OPEN FAILED: %d", errno));
+			DO_DB(elog(LOG, "re-open failed: %m"));
 			return -1;
 		}
 		else
 		{
-			DO_DB(elog(LOG, "RE_OPEN SUCCESS"));
 			++nfile;
 		}
 
-		/* seek to the right position */
+		/*
+		 * Seek to the right position.  We need no special case for seekPos
+		 * equal to FileUnknownPos, as lseek() will certainly reject that
+		 * (thus completing the logic noted in LruDelete() that we will fail
+		 * to re-open a file if we couldn't get its seek position before
+		 * closing).
+		 */
 		if (vfdP->seekPos != (off_t) 0)
 		{
-			off_t returnValue PG_USED_FOR_ASSERTS_ONLY;
+			if (lseek(vfdP->fd, vfdP->seekPos, SEEK_SET) < 0)
+			{
+				/*
+				 * If we fail to restore the seek position, treat it like an
+				 * open() failure.
+				 */
+				int			save_errno = errno;
 
-			returnValue = lseek(vfdP->fd, vfdP->seekPos, SEEK_SET);
-			Assert(returnValue != (off_t) -1);
+				elog(LOG, "could not seek file \"%s\" after re-opening: %m",
+					 vfdP->fileName);
+				(void) close(vfdP->fd);
+				vfdP->fd = VFD_CLOSED;
+				--nfile;
+				errno = save_errno;
+				return -1;
+			}
 		}
 	}
 
@@ -1287,15 +1325,15 @@
 
 	if (!FileIsNotOpen(file))
 	{
-		/* remove the file from the lru ring */
-		Delete(file);
-
 		/* close the file */
 		if (close(vfdP->fd))
-			elog(ERROR, "could not close file \"%s\": %m", vfdP->fileName);
+			elog(LOG, "could not close file \"%s\": %m", vfdP->fileName);
 
 		--nfile;
 		vfdP->fd = VFD_CLOSED;
+
+		/* remove the file from the lru ring */
+		Delete(file);
 	}
 
 	/*
@@ -1400,6 +1438,7 @@
 FileRead(File file, char *buffer, int amount)
 {
 	int			returnCode;
+	Vfd		   *vfdP;
 
 	Assert(FileIsValid(file));
 
@@ -1412,11 +1451,17 @@
 	if (returnCode < 0)
 		return returnCode;
 
+	vfdP = &VfdCache[file];
+
 retry:
-	returnCode = read(VfdCache[file].fd, buffer, amount);
+	returnCode = read(vfdP->fd, buffer, amount);
 
 	if (returnCode >= 0)
-		VfdCache[file].seekPos += returnCode;
+	{
+		/* if seekPos is unknown, leave it that way */
+		if (!FilePosIsUnknown(vfdP->seekPos))
+			vfdP->seekPos += returnCode;
+	}
 	else
 	{
 		/*
@@ -1445,7 +1490,7 @@
 			goto retry;
 
 		/* Trouble, so assume we don't know the file position anymore */
-		VfdCache[file].seekPos = FileUnknownPos;
+		vfdP->seekPos = FileUnknownPos;
 	}
 
 	return returnCode;
@@ -1455,6 +1500,7 @@
 FileWrite(File file, char *buffer, int amount)
 {
 	int			returnCode;
+	Vfd		   *vfdP;
 
 	Assert(FileIsValid(file));
 
@@ -1467,6 +1513,8 @@
 	if (returnCode < 0)
 		return returnCode;
 
+	vfdP = &VfdCache[file];
+
 	/*
 	 * If enforcing temp_file_limit and it's a temp file, check to see if the
 	 * write would overrun temp_file_limit, and throw error if so.  Note: it's
@@ -1475,15 +1523,28 @@
 	 * message if we do that.  All current callers would just throw error
 	 * immediately anyway, so this is safe at present.
 	 */
-	if (temp_file_limit >= 0 && (VfdCache[file].fdstate & FD_TEMPORARY))
+	if (temp_file_limit >= 0 && (vfdP->fdstate & FD_TEMPORARY))
 	{
-		off_t		newPos = VfdCache[file].seekPos + amount;
+		off_t		newPos;
 
-		if (newPos > VfdCache[file].fileSize)
+		/*
+		 * Normally we should know the seek position, but if for some reason
+		 * we have lost track of it, try again to get it.  Here, it's fine to
+		 * throw an error if we still can't get it.
+		 */
+		if (FilePosIsUnknown(vfdP->seekPos))
+		{
+			vfdP->seekPos = lseek(vfdP->fd, (off_t) 0, SEEK_CUR);
+			if (FilePosIsUnknown(vfdP->seekPos))
+				elog(ERROR, "could not seek file \"%s\": %m", vfdP->fileName);
+		}
+
+		newPos = vfdP->seekPos + amount;
+		if (newPos > vfdP->fileSize)
 		{
 			uint64		newTotal = temporary_files_size;
 
-			newTotal += newPos - VfdCache[file].fileSize;
+			newTotal += newPos - vfdP->fileSize;
 			if (newTotal > (uint64) temp_file_limit * (uint64) 1024)
 				ereport(ERROR,
 						(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
@@ -1494,7 +1555,7 @@
 
 retry:
 	errno = 0;
-	returnCode = write(VfdCache[file].fd, buffer, amount);
+	returnCode = write(vfdP->fd, buffer, amount);
 
 	/* if write didn't set errno, assume problem is no disk space */
 	if (returnCode != amount && errno == 0)
@@ -1502,17 +1563,25 @@
 
 	if (returnCode >= 0)
 	{
-		VfdCache[file].seekPos += returnCode;
+		/* if seekPos is unknown, leave it that way */
+		if (!FilePosIsUnknown(vfdP->seekPos))
+			vfdP->seekPos += returnCode;
 
-		/* maintain fileSize and temporary_files_size if it's a temp file */
-		if (VfdCache[file].fdstate & FD_TEMPORARY)
+		/*
+		 * Maintain fileSize and temporary_files_size if it's a temp file.
+		 *
+		 * If seekPos is -1 (unknown), this will do nothing; but we could only
+		 * get here in that state if we're not enforcing temporary_files_size,
+		 * so we don't care.
+		 */
+		if (vfdP->fdstate & FD_TEMPORARY)
 		{
-			off_t		newPos = VfdCache[file].seekPos;
+			off_t		newPos = vfdP->seekPos;
 
-			if (newPos > VfdCache[file].fileSize)
+			if (newPos > vfdP->fileSize)
 			{
-				temporary_files_size += newPos - VfdCache[file].fileSize;
-				VfdCache[file].fileSize = newPos;
+				temporary_files_size += newPos - vfdP->fileSize;
+				vfdP->fileSize = newPos;
 			}
 		}
 	}
@@ -1540,7 +1609,7 @@
 			goto retry;
 
 		/* Trouble, so assume we don't know the file position anymore */
-		VfdCache[file].seekPos = FileUnknownPos;
+		vfdP->seekPos = FileUnknownPos;
 	}
 
 	return returnCode;
@@ -1566,7 +1635,7 @@
 off_t
 FileSeek(File file, off_t offset, int whence)
 {
-	int			returnCode;
+	Vfd		   *vfdP;
 
 	Assert(FileIsValid(file));
 
@@ -1575,25 +1644,33 @@
 			   (int64) VfdCache[file].seekPos,
 			   (int64) offset, whence));
 
+	vfdP = &VfdCache[file];
+
 	if (FileIsNotOpen(file))
 	{
 		switch (whence)
 		{
 			case SEEK_SET:
 				if (offset < 0)
-					elog(ERROR, "invalid seek offset: " INT64_FORMAT,
-						 (int64) offset);
-				VfdCache[file].seekPos = offset;
+				{
+					errno = EINVAL;
+					return (off_t) -1;
+				}
+				vfdP->seekPos = offset;
 				break;
 			case SEEK_CUR:
-				VfdCache[file].seekPos += offset;
+				if (FilePosIsUnknown(vfdP->seekPos) ||
+					vfdP->seekPos + offset < 0)
+				{
+					errno = EINVAL;
+					return (off_t) -1;
+				}
+				vfdP->seekPos += offset;
 				break;
 			case SEEK_END:
-				returnCode = FileAccess(file);
-				if (returnCode < 0)
-					return returnCode;
-				VfdCache[file].seekPos = lseek(VfdCache[file].fd,
-											   offset, whence);
+				if (FileAccess(file) < 0)
+					return (off_t) -1;
+				vfdP->seekPos = lseek(vfdP->fd, offset, whence);
 				break;
 			default:
 				elog(ERROR, "invalid whence: %d", whence);
@@ -1606,27 +1683,27 @@
 		{
 			case SEEK_SET:
 				if (offset < 0)
-					elog(ERROR, "invalid seek offset: " INT64_FORMAT,
-						 (int64) offset);
-				if (VfdCache[file].seekPos != offset)
-					VfdCache[file].seekPos = lseek(VfdCache[file].fd,
-												   offset, whence);
+				{
+					errno = EINVAL;
+					return (off_t) -1;
+				}
+				if (vfdP->seekPos != offset)
+					vfdP->seekPos = lseek(vfdP->fd, offset, whence);
 				break;
 			case SEEK_CUR:
-				if (offset != 0 || VfdCache[file].seekPos == FileUnknownPos)
-					VfdCache[file].seekPos = lseek(VfdCache[file].fd,
-												   offset, whence);
+				if (offset != 0 || FilePosIsUnknown(vfdP->seekPos))
+					vfdP->seekPos = lseek(vfdP->fd, offset, whence);
 				break;
 			case SEEK_END:
-				VfdCache[file].seekPos = lseek(VfdCache[file].fd,
-											   offset, whence);
+				vfdP->seekPos = lseek(vfdP->fd, offset, whence);
 				break;
 			default:
 				elog(ERROR, "invalid whence: %d", whence);
 				break;
 		}
 	}
-	return VfdCache[file].seekPos;
+
+	return vfdP->seekPos;
 }
 
 /*
@@ -2377,7 +2454,7 @@
 void
 RemovePgTempFiles(void)
 {
-	char		temp_path[MAXPGPATH];
+	char		temp_path[MAXPGPATH + 10 + sizeof(TABLESPACE_VERSION_DIRECTORY) + sizeof(PG_TEMP_FILES_DIR)];
 	DIR		   *spc_dir;
 	struct dirent *spc_de;
 
@@ -2425,7 +2502,7 @@
 {
 	DIR		   *temp_dir;
 	struct dirent *temp_de;
-	char		rm_path[MAXPGPATH];
+	char		rm_path[MAXPGPATH * 2];
 
 	temp_dir = AllocateDir(tmpdirname);
 	if (temp_dir == NULL)
@@ -2466,7 +2543,7 @@
 {
 	DIR		   *ts_dir;
 	struct dirent *de;
-	char		dbspace_path[MAXPGPATH];
+	char		dbspace_path[MAXPGPATH * 2];
 
 	ts_dir = AllocateDir(tsdirname);
 	if (ts_dir == NULL)
@@ -2507,7 +2584,7 @@
 {
 	DIR		   *dbspace_dir;
 	struct dirent *de;
-	char		rm_path[MAXPGPATH];
+	char		rm_path[MAXPGPATH * 2];
 
 	dbspace_dir = AllocateDir(dbspacedirname);
 	if (dbspace_dir == NULL)
@@ -2694,7 +2771,7 @@
 
 	while ((de = ReadDirExtended(dir, path, elevel)) != NULL)
 	{
-		char		subpath[MAXPGPATH];
+		char		subpath[MAXPGPATH * 2];
 		struct stat fst;
 		int			sret;
 
@@ -2704,7 +2781,7 @@
 			strcmp(de->d_name, "..") == 0)
 			continue;
 
-		snprintf(subpath, MAXPGPATH, "%s/%s", path, de->d_name);
+		snprintf(subpath, sizeof(subpath), "%s/%s", path, de->d_name);
 
 		if (process_symlinks)
 			sret = stat(subpath, &fst);
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/file/reinit.c postgresql-9.5-9.5.8/src/backend/storage/file/reinit.c
--- postgresql-9.5-9.5.2/src/backend/storage/file/reinit.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/file/reinit.c	2017-08-07 21:13:41.000000000 +0000
@@ -48,7 +48,7 @@
 void
 ResetUnloggedRelations(int op)
 {
-	char		temp_path[MAXPGPATH];
+	char		temp_path[MAXPGPATH + 10 + sizeof(TABLESPACE_VERSION_DIRECTORY)];
 	DIR		   *spc_dir;
 	struct dirent *spc_de;
 	MemoryContext tmpctx,
@@ -106,7 +106,7 @@
 {
 	DIR		   *ts_dir;
 	struct dirent *de;
-	char		dbspace_path[MAXPGPATH];
+	char		dbspace_path[MAXPGPATH * 2];
 
 	ts_dir = AllocateDir(tsdirname);
 	if (ts_dir == NULL)
@@ -147,7 +147,7 @@
 {
 	DIR		   *dbspace_dir;
 	struct dirent *de;
-	char		rm_path[MAXPGPATH];
+	char		rm_path[MAXPGPATH * 2];
 
 	/* Caller must specify at least one operation. */
 	Assert((op & (UNLOGGED_RELATION_CLEANUP | UNLOGGED_RELATION_INIT)) != 0);
@@ -310,7 +310,7 @@
 			ForkNumber	forkNum;
 			int			oidchars;
 			char		oidbuf[OIDCHARS + 1];
-			char		srcpath[MAXPGPATH];
+			char		srcpath[MAXPGPATH * 2];
 			char		dstpath[MAXPGPATH];
 
 			/* Skip anything that doesn't look like a relation data file. */
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/freespace/freespace.c postgresql-9.5-9.5.8/src/backend/storage/freespace/freespace.c
--- postgresql-9.5-9.5.2/src/backend/storage/freespace/freespace.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/freespace/freespace.c	2017-08-07 21:13:41.000000000 +0000
@@ -24,6 +24,7 @@
 #include "postgres.h"
 
 #include "access/htup_details.h"
+#include "access/xlog.h"
 #include "access/xlogutils.h"
 #include "miscadmin.h"
 #include "storage/freespace.h"
@@ -285,8 +286,26 @@
 		if (!BufferIsValid(buf))
 			return;				/* nothing to do; the FSM was already smaller */
 		LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
+
+		/* NO EREPORT(ERROR) from here till changes are logged */
+		START_CRIT_SECTION();
+
 		fsm_truncate_avail(BufferGetPage(buf), first_removed_slot);
-		MarkBufferDirtyHint(buf, false);
+
+		/*
+		 * Truncation of a relation is WAL-logged at a higher-level, and we
+		 * will be called at WAL replay. But if checksums are enabled, we need
+		 * to still write a WAL record to protect against a torn page, if the
+		 * page is flushed to disk before the truncation WAL record. We cannot
+		 * use MarkBufferDirtyHint here, because that will not dirty the page
+		 * during recovery.
+		 */
+		MarkBufferDirty(buf);
+		if (!InRecovery && RelationNeedsWAL(rel) && XLogHintBitIsNeeded())
+			log_newpage_buffer(buf, false);
+
+		END_CRIT_SECTION();
+
 		UnlockReleaseBuffer(buf);
 
 		new_nfsmblocks = fsm_logical_to_physical(first_removed_address) + 1;
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/ipc/dsm.c postgresql-9.5-9.5.8/src/backend/storage/ipc/dsm.c
--- postgresql-9.5-9.5.2/src/backend/storage/ipc/dsm.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/ipc/dsm.c	2017-08-07 21:13:41.000000000 +0000
@@ -306,9 +306,9 @@
 		if (strncmp(dent->d_name, PG_DYNSHMEM_MMAP_FILE_PREFIX,
 					strlen(PG_DYNSHMEM_MMAP_FILE_PREFIX)) == 0)
 		{
-			char		buf[MAXPGPATH];
+			char		buf[MAXPGPATH + sizeof(PG_DYNSHMEM_DIR)];
 
-			snprintf(buf, MAXPGPATH, PG_DYNSHMEM_DIR "/%s", dent->d_name);
+			snprintf(buf, sizeof(buf), PG_DYNSHMEM_DIR "/%s", dent->d_name);
 
 			elog(DEBUG2, "removing file \"%s\"", buf);
 
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/ipc/dsm_impl.c postgresql-9.5-9.5.8/src/backend/storage/ipc/dsm_impl.c
--- postgresql-9.5-9.5.2/src/backend/storage/ipc/dsm_impl.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/ipc/dsm_impl.c	2017-08-07 21:13:41.000000000 +0000
@@ -41,7 +41,7 @@
  *
  *
  * IDENTIFICATION
- *	  src/backend/storage/ipc/dsm.c
+ *	  src/backend/storage/ipc/dsm_impl.c
  *
  *-------------------------------------------------------------------------
  */
@@ -671,6 +671,7 @@
 	{
 		DWORD		size_high;
 		DWORD		size_low;
+		DWORD		errcode;
 
 		/* Shifts >= the width of the type are undefined. */
 #ifdef _WIN64
@@ -680,33 +681,40 @@
 #endif
 		size_low = (DWORD) request_size;
 
+		/* CreateFileMapping might not clear the error code on success */
+		SetLastError(0);
+
 		hmap = CreateFileMapping(INVALID_HANDLE_VALUE,	/* Use the pagefile */
 								 NULL,	/* Default security attrs */
 								 PAGE_READWRITE,		/* Memory is read/write */
 								 size_high,		/* Upper 32 bits of size */
 								 size_low,		/* Lower 32 bits of size */
 								 name);
+
+		errcode = GetLastError();
+		if (errcode == ERROR_ALREADY_EXISTS || errcode == ERROR_ACCESS_DENIED)
+		{
+			/*
+			 * On Windows, when the segment already exists, a handle for the
+			 * existing segment is returned.  We must close it before
+			 * returning.  However, if the existing segment is created by a
+			 * service, then it returns ERROR_ACCESS_DENIED. We don't do
+			 * _dosmaperr here, so errno won't be modified.
+			 */
+			if (hmap)
+				CloseHandle(hmap);
+			return false;
+		}
+
 		if (!hmap)
 		{
-			_dosmaperr(GetLastError());
+			_dosmaperr(errcode);
 			ereport(elevel,
 					(errcode_for_dynamic_shared_memory(),
 				  errmsg("could not create shared memory segment \"%s\": %m",
 						 name)));
 			return false;
 		}
-		_dosmaperr(GetLastError());
-		if (errno == EEXIST)
-		{
-			/*
-			 * On Windows, when the segment already exists, a handle for the
-			 * existing segment is returned.  We must close it before
-			 * returning.  We don't do _dosmaperr here, so errno won't be
-			 * modified.
-			 */
-			CloseHandle(hmap);
-			return false;
-		}
 	}
 	else
 	{
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/ipc/procarray.c postgresql-9.5-9.5.8/src/backend/storage/ipc/procarray.c
--- postgresql-9.5-9.5.2/src/backend/storage/ipc/procarray.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/ipc/procarray.c	2017-08-07 21:13:41.000000000 +0000
@@ -1920,20 +1920,21 @@
 
 	Assert(!RecoveryInProgress());
 
-	LWLockAcquire(ProcArrayLock, LW_SHARED);
-
 	/*
-	 * It's okay to read nextXid without acquiring XidGenLock because (1) we
-	 * assume TransactionIds can be read atomically and (2) we don't care if
-	 * we get a slightly stale value.  It can't be very stale anyway, because
-	 * the LWLockAcquire above will have done any necessary memory
-	 * interlocking.
+	 * Read nextXid, as the upper bound of what's still active.
+	 *
+	 * Reading a TransactionId is atomic, but we must grab the lock to make
+	 * sure that all XIDs < nextXid are already present in the proc array (or
+	 * have already completed), when we spin over it.
 	 */
+	LWLockAcquire(XidGenLock, LW_SHARED);
 	oldestRunningXid = ShmemVariableCache->nextXid;
+	LWLockRelease(XidGenLock);
 
 	/*
 	 * Spin over procArray collecting all xids and subxids.
 	 */
+	LWLockAcquire(ProcArrayLock, LW_SHARED);
 	for (index = 0; index < arrayP->numProcs; index++)
 	{
 		int			pgprocno = arrayP->pgprocnos[index];
@@ -1955,7 +1956,6 @@
 		 * smaller than oldestRunningXid
 		 */
 	}
-
 	LWLockRelease(ProcArrayLock);
 
 	return oldestRunningXid;
@@ -1978,7 +1978,7 @@
  * that the caller will immediately use the xid to peg the xmin horizon.
  */
 TransactionId
-GetOldestSafeDecodingTransactionId(void)
+GetOldestSafeDecodingTransactionId(bool catalogOnly)
 {
 	ProcArrayStruct *arrayP = procArray;
 	TransactionId oldestSafeXid;
@@ -2001,9 +2001,17 @@
 	/*
 	 * If there's already a slot pegging the xmin horizon, we can start with
 	 * that value, it's guaranteed to be safe since it's computed by this
-	 * routine initially and has been enforced since.
+	 * routine initially and has been enforced since.  We can always use the
+	 * slot's general xmin horizon, but the catalog horizon is only usable
+	 * when we only catalog data is going to be looked at.
 	 */
-	if (TransactionIdIsValid(procArray->replication_slot_catalog_xmin) &&
+	if (TransactionIdIsValid(procArray->replication_slot_xmin) &&
+		TransactionIdPrecedes(procArray->replication_slot_xmin,
+							  oldestSafeXid))
+		oldestSafeXid = procArray->replication_slot_xmin;
+
+	if (catalogOnly &&
+		TransactionIdIsValid(procArray->replication_slot_catalog_xmin) &&
 		TransactionIdPrecedes(procArray->replication_slot_catalog_xmin,
 							  oldestSafeXid))
 		oldestSafeXid = procArray->replication_slot_catalog_xmin;
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/ipc/procsignal.c postgresql-9.5-9.5.8/src/backend/storage/ipc/procsignal.c
--- postgresql-9.5-9.5.2/src/backend/storage/ipc/procsignal.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/ipc/procsignal.c	2017-08-07 21:13:41.000000000 +0000
@@ -20,6 +20,7 @@
 #include "access/parallel.h"
 #include "commands/async.h"
 #include "miscadmin.h"
+#include "replication/walsender.h"
 #include "storage/latch.h"
 #include "storage/ipc.h"
 #include "storage/proc.h"
@@ -278,6 +279,9 @@
 	if (CheckProcSignal(PROCSIG_PARALLEL_MESSAGE))
 		HandleParallelMessageInterrupt();
 
+	if (CheckProcSignal(PROCSIG_WALSND_INIT_STOPPING))
+		HandleWalSndInitStopping();
+
 	if (CheckProcSignal(PROCSIG_RECOVERY_CONFLICT_DATABASE))
 		RecoveryConflictInterrupt(PROCSIG_RECOVERY_CONFLICT_DATABASE);
 
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/ipc/shm_mq.c postgresql-9.5-9.5.8/src/backend/storage/ipc/shm_mq.c
--- postgresql-9.5-9.5.2/src/backend/storage/ipc/shm_mq.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/ipc/shm_mq.c	2017-08-07 21:13:41.000000000 +0000
@@ -472,7 +472,7 @@
  * it will point to a temporary buffer.  This mostly avoids data copying in
  * the hoped-for case where messages are short compared to the buffer size,
  * while still allowing longer messages.  In either case, the return value
- * remains valid until the next receive operation is perfomed on the queue.
+ * remains valid until the next receive operation is performed on the queue.
  *
  * When nowait = false, we'll wait on our process latch when the ring buffer
  * is empty and we have not yet received a full message.  The sender will
@@ -868,11 +868,11 @@
 			 */
 			WaitLatch(MyLatch, WL_LATCH_SET, 0);
 
-			/* An interrupt may have occurred while we were waiting. */
-			CHECK_FOR_INTERRUPTS();
-
 			/* Reset the latch so we don't spin. */
 			ResetLatch(MyLatch);
+
+			/* An interrupt may have occurred while we were waiting. */
+			CHECK_FOR_INTERRUPTS();
 		}
 		else
 		{
@@ -965,11 +965,11 @@
 		 */
 		WaitLatch(MyLatch, WL_LATCH_SET, 0);
 
-		/* An interrupt may have occurred while we were waiting. */
-		CHECK_FOR_INTERRUPTS();
-
 		/* Reset the latch so we don't spin. */
 		ResetLatch(MyLatch);
+
+		/* An interrupt may have occurred while we were waiting. */
+		CHECK_FOR_INTERRUPTS();
 	}
 }
 
@@ -1071,11 +1071,11 @@
 			/* Wait to be signalled. */
 			WaitLatch(MyLatch, WL_LATCH_SET, 0);
 
-			/* An interrupt may have occurred while we were waiting. */
-			CHECK_FOR_INTERRUPTS();
-
 			/* Reset the latch so we don't spin. */
 			ResetLatch(MyLatch);
+
+			/* An interrupt may have occurred while we were waiting. */
+			CHECK_FOR_INTERRUPTS();
 		}
 	}
 	PG_CATCH();
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/ipc/standby.c postgresql-9.5-9.5.8/src/backend/storage/ipc/standby.c
--- postgresql-9.5-9.5.2/src/backend/storage/ipc/standby.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/ipc/standby.c	2017-08-07 21:13:41.000000000 +0000
@@ -161,6 +161,8 @@
 {
 	TimestampTz ltime;
 
+	CHECK_FOR_INTERRUPTS();
+
 	/* Are we past the limit time? */
 	ltime = GetStandbyLimitTime();
 	if (ltime && GetCurrentTimestamp() >= ltime)
@@ -548,14 +550,14 @@
  * one transaction on one relation, and don't worry about lock queuing.
  *
  * We keep a single dynamically expandible list of locks in local memory,
- * RelationLockList, so we can keep track of the various entries made by
+ * RecoveryLockList, so we can keep track of the various entries made by
  * the Startup process's virtual xid in the shared lock table.
  *
  * We record the lock against the top-level xid, rather than individual
  * subtransaction xids. This means AccessExclusiveLocks held by aborted
  * subtransactions are not released as early as possible on standbys.
  *
- * List elements use type xl_rel_lock, since the WAL record type exactly
+ * List elements use type xl_standby_lock, since the WAL record type exactly
  * matches the information that we need to keep track of.
  *
  * We use session locks rather than normal locks so we don't need
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/lmgr/lock.c postgresql-9.5-9.5.8/src/backend/storage/lmgr/lock.c
--- postgresql-9.5-9.5.2/src/backend/storage/lmgr/lock.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/lmgr/lock.c	2017-08-07 21:13:41.000000000 +0000
@@ -2697,7 +2697,7 @@
 		vxids = (VirtualTransactionId *)
 			palloc0(sizeof(VirtualTransactionId) * (MaxBackends + 1));
 
-	/* Compute hash code and partiton lock, and look up conflicting modes. */
+	/* Compute hash code and partition lock, and look up conflicting modes. */
 	hashcode = LockTagHashCode(locktag);
 	partitionLock = LockHashPartitionLock(hashcode);
 	conflictMask = lockMethodTable->conflictTab[lockmode];
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/lmgr/lwlock.c postgresql-9.5-9.5.8/src/backend/storage/lmgr/lwlock.c
--- postgresql-9.5-9.5.2/src/backend/storage/lmgr/lwlock.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/lmgr/lwlock.c	2017-08-07 21:13:41.000000000 +0000
@@ -636,7 +636,7 @@
 				return false;
 			}
 			else
-				return true;	/* someobdy else has the lock */
+				return true;	/* somebody else has the lock */
 		}
 	}
 	pg_unreachable();
@@ -733,7 +733,7 @@
 		 * that happens before the list unlink happens, the list would end up
 		 * being corrupted.
 		 *
-		 * The barrier pairs with the SpinLockAcquire() when enqueing for
+		 * The barrier pairs with the SpinLockAcquire() when enqueuing for
 		 * another lock.
 		 */
 		pg_write_barrier();
@@ -823,7 +823,7 @@
 
 	/*
 	 * Can't just remove ourselves from the list, but we need to iterate over
-	 * all entries as somebody else could have unqueued us.
+	 * all entries as somebody else could have dequeued us.
 	 */
 	dlist_foreach_modify(iter, &lock->waiters)
 	{
@@ -1533,15 +1533,14 @@
 	 * be the latest-acquired lock; so search array backwards.
 	 */
 	for (i = num_held_lwlocks; --i >= 0;)
-	{
 		if (lock == held_lwlocks[i].lock)
-		{
-			mode = held_lwlocks[i].mode;
 			break;
-		}
-	}
+
 	if (i < 0)
 		elog(ERROR, "lock %s %d is not held", T_NAME(lock), T_ID(lock));
+
+	mode = held_lwlocks[i].mode;
+
 	num_held_lwlocks--;
 	for (; i < num_held_lwlocks; i++)
 		held_lwlocks[i] = held_lwlocks[i + 1];
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/lmgr/predicate.c postgresql-9.5-9.5.8/src/backend/storage/lmgr/predicate.c
--- postgresql-9.5-9.5.2/src/backend/storage/lmgr/predicate.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/lmgr/predicate.c	2017-08-07 21:13:41.000000000 +0000
@@ -805,6 +805,7 @@
 	oldSerXidControl = (OldSerXidControl)
 		ShmemInitStruct("OldSerXidControlData", sizeof(OldSerXidControlData), &found);
 
+	Assert(found == IsUnderPostmaster);
 	if (!found)
 	{
 		/*
@@ -1099,6 +1100,10 @@
 	Size		requestSize;
 	bool		found;
 
+#ifndef EXEC_BACKEND
+	Assert(!IsUnderPostmaster);
+#endif
+
 	/*
 	 * Compute size of predicate lock target hashtable. Note these
 	 * calculations must agree with PredicateLockShmemSize!
@@ -1121,16 +1126,22 @@
 											HASH_ELEM | HASH_BLOBS |
 											HASH_PARTITION | HASH_FIXED_SIZE);
 
-	/* Assume an average of 2 xacts per target */
-	max_table_size *= 2;
-
 	/*
 	 * Reserve a dummy entry in the hash table; we use it to make sure there's
 	 * always one entry available when we need to split or combine a page,
 	 * because running out of space there could mean aborting a
 	 * non-serializable transaction.
 	 */
-	hash_search(PredicateLockTargetHash, &ScratchTargetTag, HASH_ENTER, NULL);
+	if (!IsUnderPostmaster)
+	{
+		(void) hash_search(PredicateLockTargetHash, &ScratchTargetTag,
+						   HASH_ENTER, &found);
+		Assert(!found);
+	}
+
+	/* Pre-calculate the hash and partition lock of the scratch entry */
+	ScratchTargetTagHash = PredicateLockTargetTagHashCode(&ScratchTargetTag);
+	ScratchPartitionLock = PredicateLockHashPartitionLock(ScratchTargetTagHash);
 
 	/*
 	 * Allocate hash table for PREDICATELOCK structs.  This stores per
@@ -1142,6 +1153,9 @@
 	info.hash = predicatelock_hash;
 	info.num_partitions = NUM_PREDICATELOCK_PARTITIONS;
 
+	/* Assume an average of 2 xacts per target */
+	max_table_size *= 2;
+
 	PredicateLockHash = ShmemInitHash("PREDICATELOCK hash",
 									  max_table_size,
 									  max_table_size,
@@ -1168,6 +1182,7 @@
 	PredXact = ShmemInitStruct("PredXactList",
 							   PredXactListDataSize,
 							   &found);
+	Assert(found == IsUnderPostmaster);
 	if (!found)
 	{
 		int			i;
@@ -1246,6 +1261,7 @@
 	RWConflictPool = ShmemInitStruct("RWConflictPool",
 									 RWConflictPoolHeaderDataSize,
 									 &found);
+	Assert(found == IsUnderPostmaster);
 	if (!found)
 	{
 		int			i;
@@ -1277,6 +1293,7 @@
 		ShmemInitStruct("FinishedSerializableTransactions",
 						sizeof(SHM_QUEUE),
 						&found);
+	Assert(found == IsUnderPostmaster);
 	if (!found)
 		SHMQueueInit(FinishedSerializableTransactions);
 
@@ -1285,10 +1302,6 @@
 	 * transactions.
 	 */
 	OldSerXidInit();
-
-	/* Pre-calculate the hash and partition lock of the scratch entry */
-	ScratchTargetTagHash = PredicateLockTargetTagHashCode(&ScratchTargetTag);
-	ScratchPartitionLock = PredicateLockHashPartitionLock(ScratchTargetTagHash);
 }
 
 /*
@@ -3203,7 +3216,7 @@
 	/*
 	 * We can't trust XactReadOnly here, because a transaction which started
 	 * as READ WRITE can show as READ ONLY later, e.g., within
-	 * substransactions.  We want to flag a transaction as READ ONLY if it
+	 * subtransactions.  We want to flag a transaction as READ ONLY if it
 	 * commits without writing so that de facto READ ONLY transactions get the
 	 * benefit of some RO optimizations, so we will use this local variable to
 	 * get some cleanup logic right which is based on whether the transaction
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/page/bufpage.c postgresql-9.5-9.5.8/src/backend/storage/page/bufpage.c
--- postgresql-9.5-9.5.2/src/backend/storage/page/bufpage.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/page/bufpage.c	2017-08-07 21:13:41.000000000 +0000
@@ -153,12 +153,13 @@
 
 
 /*
- *	PageAddItem
+ *	PageAddItemExtended
  *
- *	Add an item to a page.  Return value is offset at which it was
- *	inserted, or InvalidOffsetNumber if there's not room to insert.
+ *	Add an item to a page.  Return value is the offset at which it was
+ *	inserted, or InvalidOffsetNumber if the item is not inserted for any
+ *	reason.  A WARNING is issued indicating the reason for the refusal.
  *
- *	If overwrite is true, we just store the item at the specified
+ *	If flag PAI_OVERWRITE is set, we just store the item at the specified
  *	offsetNumber (which must be either a currently-unused item pointer,
  *	or one past the last existing item).  Otherwise,
  *	if offsetNumber is valid and <= current max offset in the page,
@@ -167,18 +168,20 @@
  *	If offsetNumber is not valid, then assign one by finding the first
  *	one that is both unused and deallocated.
  *
- *	If is_heap is true, we enforce that there can't be more than
+ *	If flag PAI_IS_HEAP is set, we enforce that there can't be more than
  *	MaxHeapTuplesPerPage line pointers on the page.
  *
+ *	If flag PAI_ALLOW_FAR_OFFSET is not set, we disallow placing items
+ *	beyond one past the last existing item.
+ *
  *	!!! EREPORT(ERROR) IS DISALLOWED HERE !!!
  */
 OffsetNumber
-PageAddItem(Page page,
-			Item item,
-			Size size,
-			OffsetNumber offsetNumber,
-			bool overwrite,
-			bool is_heap)
+PageAddItemExtended(Page page,
+					Item item,
+					Size size,
+					OffsetNumber offsetNumber,
+					int flags)
 {
 	PageHeader	phdr = (PageHeader) page;
 	Size		alignedSize;
@@ -209,7 +212,7 @@
 	if (OffsetNumberIsValid(offsetNumber))
 	{
 		/* yes, check it */
-		if (overwrite)
+		if ((flags & PAI_OVERWRITE) != 0)
 		{
 			if (offsetNumber < limit)
 			{
@@ -257,13 +260,18 @@
 		}
 	}
 
-	if (offsetNumber > limit)
+	/*
+	 * Reject placing items beyond the first unused line pointer, unless
+	 * caller asked for that behavior specifically.
+	 */
+	if ((flags & PAI_ALLOW_FAR_OFFSET) == 0 && offsetNumber > limit)
 	{
 		elog(WARNING, "specified item offset is too large");
 		return InvalidOffsetNumber;
 	}
 
-	if (is_heap && offsetNumber > MaxHeapTuplesPerPage)
+	/* Reject placing items beyond heap boundary, if heap */
+	if ((flags & PAI_IS_HEAP) != 0 && offsetNumber > MaxHeapTuplesPerPage)
 	{
 		elog(WARNING, "can't put more than MaxHeapTuplesPerPage items in a heap page");
 		return InvalidOffsetNumber;
@@ -275,7 +283,10 @@
 	 * Note: do arithmetic as signed ints, to avoid mistakes if, say,
 	 * alignedSize > pd_upper.
 	 */
-	if (offsetNumber == limit || needshuffle)
+	if ((flags & PAI_ALLOW_FAR_OFFSET) != 0)
+		lower = Max(phdr->pd_lower,
+					SizeOfPageHeaderData + sizeof(ItemIdData) * offsetNumber);
+	else if (offsetNumber == limit || needshuffle)
 		lower = phdr->pd_lower + sizeof(ItemIdData);
 	else
 		lower = phdr->pd_lower;
@@ -324,6 +335,27 @@
 }
 
 /*
+ *	PageAddItem
+ *
+ *	Add an item to a page.  Return value is offset at which it was
+ *	inserted, or InvalidOffsetNumber if the item is not inserted for
+ *	any reason.
+ *
+ *	Passing the 'overwrite' and 'is_heap' parameters as true causes the
+ *	PAI_OVERWRITE and PAI_IS_HEAP flags to be set, respectively.
+ *
+ *	!!! EREPORT(ERROR) IS DISALLOWED HERE !!!
+ */
+OffsetNumber
+PageAddItem(Page page, Item item, Size size, OffsetNumber offsetNumber,
+			bool overwrite, bool is_heap)
+{
+	return PageAddItemExtended(page, item, size, offsetNumber,
+							   overwrite ? PAI_OVERWRITE : 0 |
+							   is_heap ? PAI_IS_HEAP : 0);
+}
+
+/*
  * PageGetTempPage
  *		Get a temporary page in local memory for special processing.
  *		The returned page is not initialized at all; caller must do that.
@@ -857,7 +889,7 @@
 			offset != MAXALIGN(offset))
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
-					 errmsg("corrupted item pointer: offset = %u, size = %u",
+					 errmsg("corrupted item pointer: offset = %u, length = %u",
 							offset, (unsigned int) size)));
 
 		if (nextitm < nitems && offnum == itemnos[nextitm])
diff -Nru postgresql-9.5-9.5.2/src/backend/storage/smgr/md.c postgresql-9.5-9.5.8/src/backend/storage/smgr/md.c
--- postgresql-9.5-9.5.2/src/backend/storage/smgr/md.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/storage/smgr/md.c	2017-08-07 21:13:41.000000000 +0000
@@ -918,6 +918,7 @@
 			v = v->mdfd_chain;
 			Assert(ov != reln->md_fd[forknum]); /* we never drop the 1st
 												 * segment */
+			FileClose(ov->mdfd_vfd);
 			pfree(ov);
 		}
 		else if (priorblocks + ((BlockNumber) RELSEG_SIZE) > nblocks)
diff -Nru postgresql-9.5-9.5.2/src/backend/tcop/fastpath.c postgresql-9.5-9.5.8/src/backend/tcop/fastpath.c
--- postgresql-9.5-9.5.2/src/backend/tcop/fastpath.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/tcop/fastpath.c	2017-08-07 21:13:41.000000000 +0000
@@ -249,24 +249,15 @@
  * This corresponds to the libpq protocol symbol "F".
  *
  * INPUT:
- *		In protocol version 3, postgres.c has already read the message body
- *		and will pass it in msgBuf.
- *		In old protocol, the passed msgBuf is empty and we must read the
- *		message here.
- *
- * RETURNS:
- *		0 if successful completion, EOF if frontend connection lost.
- *
- * Note: All ordinary errors result in ereport(ERROR,...).  However,
- * if we lose the frontend connection there is no one to ereport to,
- * and no use in proceeding...
+ *		postgres.c has already read the message body and will pass it in
+ *		msgBuf.
  *
  * Note: palloc()s done here and in the called function do not need to be
  * cleaned up explicitly.  We are called from PostgresMain() in the
  * MessageContext memory context, which will be automatically reset when
  * control returns to PostgresMain.
  */
-int
+void
 HandleFunctionRequest(StringInfo msgBuf)
 {
 	Oid			fid;
@@ -281,9 +272,8 @@
 	char		msec_str[32];
 
 	/*
-	 * Now that we've eaten the input message, check to see if we actually
-	 * want to do the function call or not.  It's now safe to ereport(); we
-	 * won't lose sync with the frontend.
+	 * We only accept COMMIT/ABORT if we are in an aborted transaction, and
+	 * COMMIT/ABORT cannot be executed through the fastpath interface.
 	 */
 	if (IsAbortedTransactionBlockState())
 		ereport(ERROR,
@@ -406,8 +396,6 @@
 							msec_str, fip->fname, fid)));
 			break;
 	}
-
-	return 0;
 }
 
 /*
diff -Nru postgresql-9.5-9.5.2/src/backend/tcop/postgres.c postgresql-9.5-9.5.8/src/backend/tcop/postgres.c
--- postgresql-9.5-9.5.2/src/backend/tcop/postgres.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/tcop/postgres.c	2017-08-07 21:13:41.000000000 +0000
@@ -122,13 +122,6 @@
 #endif
 
 /*
- * Flag to mark SIGHUP. Whenever the main loop comes around it
- * will reread the configuration file. (Better than doing the
- * reading in the signal handler, ey?)
- */
-static volatile sig_atomic_t got_SIGHUP = false;
-
-/*
  * Flag to keep track of whether we have started a transaction.
  * For extended query protocol this has to be remembered across messages.
  */
@@ -196,7 +189,6 @@
 static bool IsTransactionExitStmtList(List *parseTrees);
 static bool IsTransactionStmtList(List *parseTrees);
 static void drop_unnamed_stmt(void);
-static void SigHupHandler(SIGNAL_ARGS);
 static void log_disconnections(int code, Datum arg);
 
 
@@ -855,7 +847,7 @@
 
 	foreach(query_list, querytrees)
 	{
-		Query	   *query = (Query *) lfirst(query_list);
+		Query	   *query = castNode(Query, lfirst(query_list));
 		Node	   *stmt;
 
 		if (query->commandType == CMD_UTILITY)
@@ -2700,13 +2692,19 @@
 					   "invalid operation, such as division by zero.")));
 }
 
-/* SIGHUP: set flag to re-read config file at next convenient time */
-static void
-SigHupHandler(SIGNAL_ARGS)
+/*
+ * SIGHUP: set flag to re-read config file at next convenient time.
+ *
+ * Sets the ConfigReloadPending flag, which should be checked at convenient
+ * places inside main loops. (Better than doing the reading in the signal
+ * handler, ey?)
+ */
+void
+PostgresSigHupHandler(SIGNAL_ARGS)
 {
 	int			save_errno = errno;
 
-	got_SIGHUP = true;
+	ConfigReloadPending = true;
 	SetLatch(MyLatch);
 
 	errno = save_errno;
@@ -2920,6 +2918,9 @@
 
 	if (QueryCancelPending)
 	{
+		bool		lock_timeout_occurred;
+		bool		stmt_timeout_occurred;
+
 		/*
 		 * Don't allow query cancel interrupts while reading input from the
 		 * client, because we might lose sync in the FE/BE protocol.  (Die
@@ -2940,17 +2941,29 @@
 
 		/*
 		 * If LOCK_TIMEOUT and STATEMENT_TIMEOUT indicators are both set, we
-		 * prefer to report the former; but be sure to clear both.
+		 * need to clear both, so always fetch both.
+		 */
+		lock_timeout_occurred = get_timeout_indicator(LOCK_TIMEOUT, true);
+		stmt_timeout_occurred = get_timeout_indicator(STATEMENT_TIMEOUT, true);
+
+		/*
+		 * If both were set, we want to report whichever timeout completed
+		 * earlier; this ensures consistent behavior if the machine is slow
+		 * enough that the second timeout triggers before we get here.  A tie
+		 * is arbitrarily broken in favor of reporting a lock timeout.
 		 */
-		if (get_timeout_indicator(LOCK_TIMEOUT, true))
+		if (lock_timeout_occurred && stmt_timeout_occurred &&
+			get_timeout_finish_time(STATEMENT_TIMEOUT) < get_timeout_finish_time(LOCK_TIMEOUT))
+			lock_timeout_occurred = false;		/* report stmt timeout */
+
+		if (lock_timeout_occurred)
 		{
-			(void) get_timeout_indicator(STATEMENT_TIMEOUT, true);
 			LockErrorCleanup();
 			ereport(ERROR,
 					(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
 					 errmsg("canceling statement due to lock timeout")));
 		}
-		if (get_timeout_indicator(STATEMENT_TIMEOUT, true))
+		if (stmt_timeout_occurred)
 		{
 			LockErrorCleanup();
 			ereport(ERROR,
@@ -3616,8 +3629,8 @@
 		WalSndSignals();
 	else
 	{
-		pqsignal(SIGHUP, SigHupHandler);		/* set flag to read config
-												 * file */
+		pqsignal(SIGHUP, PostgresSigHupHandler);		/* set flag to read config
+														 * file */
 		pqsignal(SIGINT, StatementCancelHandler);		/* cancel current query */
 		pqsignal(SIGTERM, die); /* cancel current query and exit */
 
@@ -3933,6 +3946,12 @@
 		initStringInfo(&input_message);
 
 		/*
+		 * Also consider releasing our catalog snapshot if any, so that it's
+		 * not preventing advance of global xmin while we wait for the client.
+		 */
+		InvalidateCatalogSnapshotConditionally();
+
+		/*
 		 * (1) If we've reached idle state, tell the frontend we're ready for
 		 * a new query.
 		 *
@@ -3999,9 +4018,9 @@
 		 * (5) check for any other interesting events that happened while we
 		 * slept.
 		 */
-		if (got_SIGHUP)
+		if (ConfigReloadPending)
 		{
-			got_SIGHUP = false;
+			ConfigReloadPending = false;
 			ProcessConfigFile(PGC_SIGHUP);
 		}
 
@@ -4119,19 +4138,7 @@
 				/* switch back to message context */
 				MemoryContextSwitchTo(MessageContext);
 
-				if (HandleFunctionRequest(&input_message) == EOF)
-				{
-					/* lost frontend connection during F message input */
-
-					/*
-					 * Reset whereToSendOutput to prevent ereport from
-					 * attempting to send any more messages to client.
-					 */
-					if (whereToSendOutput == DestRemote)
-						whereToSendOutput = DestNone;
-
-					proc_exit(0);
-				}
+				HandleFunctionRequest(&input_message);
 
 				/* commit the function-invocation transaction */
 				finish_xact_command();
diff -Nru postgresql-9.5-9.5.2/src/backend/tcop/utility.c postgresql-9.5-9.5.8/src/backend/tcop/utility.c
--- postgresql-9.5-9.5.2/src/backend/tcop/utility.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/tcop/utility.c	2017-08-07 21:13:41.000000000 +0000
@@ -1452,7 +1452,13 @@
 				break;
 
 			case T_AlterTSConfigurationStmt:
-				address = AlterTSConfiguration((AlterTSConfigurationStmt *) parsetree);
+				AlterTSConfiguration((AlterTSConfigurationStmt *) parsetree);
+				/*
+				 * Commands are stashed in MakeConfigurationMapping and
+				 * DropConfigurationMapping, which are called from
+				 * AlterTSConfiguration
+				 */
+				commandCollected = true;
 				break;
 
 			case T_AlterTableMoveAllStmt:
diff -Nru postgresql-9.5-9.5.2/src/backend/tsearch/ts_parse.c postgresql-9.5-9.5.8/src/backend/tsearch/ts_parse.c
--- postgresql-9.5-9.5.2/src/backend/tsearch/ts_parse.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/tsearch/ts_parse.c	2017-08-07 21:13:41.000000000 +0000
@@ -179,7 +179,7 @@
 	if (ld->curDictId == InvalidOid)
 	{
 		/*
-		 * usial mode: dictionary wants only one word, but we should keep in
+		 * usual mode: dictionary wants only one word, but we should keep in
 		 * mind that we should go through all stack
 		 */
 
@@ -272,7 +272,7 @@
 
 				/*
 				 * We should be sure that current type of lexeme is recognized
-				 * by our dictinonary: we just check is it exist in list of
+				 * by our dictionary: we just check is it exist in list of
 				 * dictionaries ?
 				 */
 				for (i = 0; i < map->len && !dictExists; i++)
@@ -618,7 +618,7 @@
 				/* start of a new fragment */
 				infrag = 1;
 				numfragments++;
-				/* add a fragment delimitor if this is after the first one */
+				/* add a fragment delimiter if this is after the first one */
 				if (numfragments > 1)
 				{
 					memcpy(ptr, prs->fragdelim, prs->fragdelimlen);
diff -Nru postgresql-9.5-9.5.2/src/backend/tsearch/ts_typanalyze.c postgresql-9.5-9.5.8/src/backend/tsearch/ts_typanalyze.c
--- postgresql-9.5-9.5.2/src/backend/tsearch/ts_typanalyze.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/tsearch/ts_typanalyze.c	2017-08-07 21:13:41.000000000 +0000
@@ -232,9 +232,7 @@
 
 		/*
 		 * We loop through the lexemes in the tsvector and add them to our
-		 * tracking hashtable.  Note: the hashtable entries will point into
-		 * the (detoasted) tsvector value, therefore we cannot free that
-		 * storage until we're done.
+		 * tracking hashtable.
 		 */
 		lexemesptr = STRPTR(vector);
 		curentryptr = ARRPTR(vector);
@@ -242,7 +240,12 @@
 		{
 			bool		found;
 
-			/* Construct a hash key */
+			/*
+			 * Construct a hash key.  The key points into the (detoasted)
+			 * tsvector value at this point, but if a new entry is created, we
+			 * make a copy of it.  This way we can free the tsvector value
+			 * once we've processed all its lexemes.
+			 */
 			hash_key.lexeme = lexemesptr + curentryptr->pos;
 			hash_key.length = curentryptr->len;
 
@@ -261,6 +264,9 @@
 				/* Initialize new tracking list element */
 				item->frequency = 1;
 				item->delta = b_current - 1;
+
+				item->key.lexeme = palloc(hash_key.length);
+				memcpy(item->key.lexeme, hash_key.lexeme, hash_key.length);
 			}
 
 			/* lexeme_no is the number of elements processed (ie N) */
@@ -276,6 +282,10 @@
 			/* Advance to the next WordEntry in the tsvector */
 			curentryptr++;
 		}
+
+		/* If the vector was toasted, free the detoasted copy. */
+		if (TSVectorGetDatum(vector) != value)
+			pfree(vector);
 	}
 
 	/* We can only compute real stats if we found some non-null values. */
@@ -295,7 +305,7 @@
 		stats->stawidth = total_width / (double) nonnull_cnt;
 
 		/* Assume it's a unique column (see notes above) */
-		stats->stadistinct = -1.0;
+		stats->stadistinct = -1.0 * (1.0 - stats->stanullfrac);
 
 		/*
 		 * Construct an array of the interesting hashtable items, that is,
@@ -447,9 +457,12 @@
 	{
 		if (item->frequency + item->delta <= b_current)
 		{
+			char	   *lexeme = item->key.lexeme;
+
 			if (hash_search(lexemes_tab, (const void *) &item->key,
 							HASH_REMOVE, NULL) == NULL)
 				elog(ERROR, "hash table corrupted");
+			pfree(lexeme);
 		}
 	}
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/tsearch/wparser_def.c postgresql-9.5-9.5.8/src/backend/tsearch/wparser_def.c
--- postgresql-9.5-9.5.2/src/backend/tsearch/wparser_def.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/tsearch/wparser_def.c	2017-08-07 21:13:41.000000000 +0000
@@ -2421,7 +2421,7 @@
 						break;
 				}
 				if (curlen < min_words && i >= prs->curwords)
-				{				/* got end of text and our cover is shoter
+				{				/* got end of text and our cover is shorter
 								 * than min_words */
 					for (i = p - 1; i >= 0; i--)
 					{
@@ -2441,6 +2441,8 @@
 			}
 			else
 			{					/* shorter cover :((( */
+				if (i > q)
+					i = q;
 				for (; curlen > min_words; i--)
 				{
 					if (!NONWORDTOKEN(prs->words[i].type))
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/arrayfuncs.c postgresql-9.5-9.5.8/src/backend/utils/adt/arrayfuncs.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/arrayfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/arrayfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -5712,25 +5712,19 @@
 	/*
 	 * Params checks
 	 */
-	if (ARR_NDIM(dims) != 1)
+	if (ARR_NDIM(dims) > 1)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("wrong number of array subscripts"),
 				 errdetail("Dimension array must be one dimensional.")));
 
-	if (ARR_LBOUND(dims)[0] != 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
-				 errmsg("wrong range of array subscripts"),
-				 errdetail("Lower bound of dimension array must be one.")));
-
 	if (array_contains_nulls(dims))
 		ereport(ERROR,
 				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 				 errmsg("dimension values cannot be null")));
 
 	dimv = (int *) ARR_DATA_PTR(dims);
-	ndims = ARR_DIMS(dims)[0];
+	ndims = (ARR_NDIM(dims) > 0) ? ARR_DIMS(dims)[0] : 0;
 
 	if (ndims < 0)				/* we do allow zero-dimension arrays */
 		ereport(ERROR,
@@ -5744,24 +5738,18 @@
 
 	if (lbs != NULL)
 	{
-		if (ARR_NDIM(lbs) != 1)
+		if (ARR_NDIM(lbs) > 1)
 			ereport(ERROR,
 					(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 					 errmsg("wrong number of array subscripts"),
 					 errdetail("Dimension array must be one dimensional.")));
 
-		if (ARR_LBOUND(lbs)[0] != 1)
-			ereport(ERROR,
-					(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
-					 errmsg("wrong range of array subscripts"),
-				  errdetail("Lower bound of dimension array must be one.")));
-
 		if (array_contains_nulls(lbs))
 			ereport(ERROR,
 					(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 					 errmsg("dimension values cannot be null")));
 
-		if (ARR_DIMS(lbs)[0] != ndims)
+		if (ndims != ((ARR_NDIM(lbs) > 0) ? ARR_DIMS(lbs)[0] : 0))
 			ereport(ERROR,
 					(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 					 errmsg("wrong number of array subscripts"),
@@ -5779,12 +5767,12 @@
 		lbsv = deflbs;
 	}
 
+	nitems = ArrayGetNItems(ndims, dimv);
+
 	/* fast track for empty array */
-	if (ndims == 0)
+	if (nitems <= 0)
 		return construct_empty_array(elmtype);
 
-	nitems = ArrayGetNItems(ndims, dimv);
-
 	/*
 	 * We arrange to look up info about element type only once per series of
 	 * calls, assuming the element type doesn't change underneath us.
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/array_selfuncs.c postgresql-9.5-9.5.8/src/backend/utils/adt/array_selfuncs.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/array_selfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/array_selfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -132,7 +132,8 @@
 		useOr = !useOr;
 
 	/* Get array element stats for var, if available */
-	if (HeapTupleIsValid(vardata.statsTuple))
+	if (HeapTupleIsValid(vardata.statsTuple) &&
+		statistic_proc_security_check(&vardata, cmpfunc->fn_oid))
 	{
 		Form_pg_statistic stats;
 		Datum	   *values;
@@ -363,7 +364,8 @@
 	 */
 	array = DatumGetArrayTypeP(constval);
 
-	if (HeapTupleIsValid(vardata->statsTuple))
+	if (HeapTupleIsValid(vardata->statsTuple) &&
+		statistic_proc_security_check(vardata, cmpfunc->fn_oid))
 	{
 		Form_pg_statistic stats;
 		Datum	   *values;
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/array_userfuncs.c postgresql-9.5-9.5.8/src/backend/utils/adt/array_userfuncs.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/array_userfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/array_userfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -32,6 +32,10 @@
  * Caution: if the input is a read/write pointer, this returns the input
  * argument; so callers must be sure that their changes are "safe", that is
  * they cannot leave the array in a corrupt state.
+ *
+ * If we're being called as an aggregate function, make sure any newly-made
+ * expanded array is allocated in the aggregate state context, so as to save
+ * copying operations.
  */
 static ExpandedArrayHeader *
 fetch_array_arg_replace_nulls(FunctionCallInfo fcinfo, int argno)
@@ -39,6 +43,7 @@
 	ExpandedArrayHeader *eah;
 	Oid			element_type;
 	ArrayMetaState *my_extra;
+	MemoryContext resultcxt;
 
 	/* If first time through, create datatype cache struct */
 	my_extra = (ArrayMetaState *) fcinfo->flinfo->fn_extra;
@@ -51,10 +56,17 @@
 		fcinfo->flinfo->fn_extra = my_extra;
 	}
 
+	/* Figure out which context we want the result in */
+	if (!AggCheckCallContext(fcinfo, &resultcxt))
+		resultcxt = CurrentMemoryContext;
+
 	/* Now collect the array value */
 	if (!PG_ARGISNULL(argno))
 	{
+		MemoryContext oldcxt = MemoryContextSwitchTo(resultcxt);
+
 		eah = PG_GETARG_EXPANDED_ARRAYX(argno, my_extra);
+		MemoryContextSwitchTo(oldcxt);
 	}
 	else
 	{
@@ -72,7 +84,7 @@
 					 errmsg("input data type is not an array")));
 
 		eah = construct_empty_expanded_array(element_type,
-											 CurrentMemoryContext,
+											 resultcxt,
 											 my_extra);
 	}
 
@@ -783,7 +795,8 @@
 					   format_type_be(element_type))));
 
 		my_extra->element_type = element_type;
-		fmgr_info(typentry->eq_opr_finfo.fn_oid, &my_extra->proc);
+		fmgr_info_cxt(typentry->eq_opr_finfo.fn_oid, &my_extra->proc,
+					  fcinfo->flinfo->fn_mcxt);
 	}
 
 	/* Examine each array element until we find a match. */
@@ -921,7 +934,8 @@
 					   format_type_be(element_type))));
 
 		my_extra->element_type = element_type;
-		fmgr_info(typentry->eq_opr_finfo.fn_oid, &my_extra->proc);
+		fmgr_info_cxt(typentry->eq_opr_finfo.fn_oid, &my_extra->proc,
+					  fcinfo->flinfo->fn_mcxt);
 	}
 
 	/*
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/cash.c postgresql-9.5-9.5.8/src/backend/utils/adt/cash.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/cash.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/cash.c	2017-08-07 21:13:41.000000000 +0000
@@ -621,7 +621,7 @@
 	float8		f = PG_GETARG_FLOAT8(1);
 	Cash		result;
 
-	result = c * f;
+	result = rint(c * f);
 	PG_RETURN_CASH(result);
 }
 
@@ -636,7 +636,7 @@
 	Cash		c = PG_GETARG_CASH(1);
 	Cash		result;
 
-	result = f * c;
+	result = rint(f * c);
 	PG_RETURN_CASH(result);
 }
 
@@ -671,7 +671,7 @@
 	float4		f = PG_GETARG_FLOAT4(1);
 	Cash		result;
 
-	result = c * f;
+	result = rint(c * (float8) f);
 	PG_RETURN_CASH(result);
 }
 
@@ -686,7 +686,7 @@
 	Cash		c = PG_GETARG_CASH(1);
 	Cash		result;
 
-	result = f * c;
+	result = rint((float8) f * c);
 	PG_RETURN_CASH(result);
 }
 
@@ -707,7 +707,7 @@
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
 
-	result = rint(c / f);
+	result = rint(c / (float8) f);
 	PG_RETURN_CASH(result);
 }
 
@@ -756,7 +756,7 @@
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
 
-	result = rint(c / i);
+	result = c / i;
 
 	PG_RETURN_CASH(result);
 }
@@ -808,7 +808,7 @@
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
 
-	result = rint(c / i);
+	result = c / i;
 
 	PG_RETURN_CASH(result);
 }
@@ -858,7 +858,7 @@
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
 
-	result = rint(c / s);
+	result = c / s;
 	PG_RETURN_CASH(result);
 }
 
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/datetime.c postgresql-9.5-9.5.8/src/backend/utils/adt/datetime.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/datetime.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/datetime.c	2017-08-07 21:13:41.000000000 +0000
@@ -52,8 +52,9 @@
 				int scale);
 static int DetermineTimeZoneOffsetInternal(struct pg_tm * tm, pg_tz *tzp,
 								pg_time_t *tp);
-static int DetermineTimeZoneAbbrevOffsetInternal(pg_time_t t, const char *abbr,
-									  pg_tz *tzp, int *isdst);
+static bool DetermineTimeZoneAbbrevOffsetInternal(pg_time_t t,
+									  const char *abbr, pg_tz *tzp,
+									  int *offset, int *isdst);
 static pg_tz *FetchDynamicTimeZone(TimeZoneAbbrevTable *tbl, const datetkn *tp);
 
 
@@ -252,10 +253,10 @@
 
 
 /*
- * strtoi --- just like strtol, but returns int not long
+ * strtoint --- just like strtol, but returns int not long
  */
 static int
-strtoi(const char *nptr, char **endptr, int base)
+strtoint(const char *nptr, char **endptr, int base)
 {
 	long		val;
 
@@ -829,7 +830,7 @@
 						return DTERR_BAD_FORMAT;
 
 					errno = 0;
-					val = strtoi(field[i], &cp, 10);
+					val = strtoint(field[i], &cp, 10);
 					if (errno == ERANGE || val < 0)
 						return DTERR_FIELD_OVERFLOW;
 
@@ -993,7 +994,7 @@
 					int			val;
 
 					errno = 0;
-					val = strtoi(field[i], &cp, 10);
+					val = strtoint(field[i], &cp, 10);
 					if (errno == ERANGE)
 						return DTERR_FIELD_OVERFLOW;
 
@@ -1620,19 +1621,40 @@
  * This differs from the behavior of DetermineTimeZoneOffset() in that a
  * standard-time or daylight-time abbreviation forces use of the corresponding
  * GMT offset even when the zone was then in DS or standard time respectively.
+ * (However, that happens only if we can match the given abbreviation to some
+ * abbreviation that appears in the IANA timezone data.  Otherwise, we fall
+ * back to doing DetermineTimeZoneOffset().)
  */
 int
 DetermineTimeZoneAbbrevOffset(struct pg_tm * tm, const char *abbr, pg_tz *tzp)
 {
 	pg_time_t	t;
+	int			zone_offset;
+	int			abbr_offset;
+	int			abbr_isdst;
 
 	/*
 	 * Compute the UTC time we want to probe at.  (In event of overflow, we'll
 	 * probe at the epoch, which is a bit random but probably doesn't matter.)
 	 */
-	(void) DetermineTimeZoneOffsetInternal(tm, tzp, &t);
+	zone_offset = DetermineTimeZoneOffsetInternal(tm, tzp, &t);
 
-	return DetermineTimeZoneAbbrevOffsetInternal(t, abbr, tzp, &tm->tm_isdst);
+	/*
+	 * Try to match the abbreviation to something in the zone definition.
+	 */
+	if (DetermineTimeZoneAbbrevOffsetInternal(t, abbr, tzp,
+											  &abbr_offset, &abbr_isdst))
+	{
+		/* Success, so use the abbrev-specific answers. */
+		tm->tm_isdst = abbr_isdst;
+		return abbr_offset;
+	}
+
+	/*
+	 * No match, so use the answers we already got from
+	 * DetermineTimeZoneOffsetInternal.
+	 */
+	return zone_offset;
 }
 
 
@@ -1646,19 +1668,41 @@
 								pg_tz *tzp, int *isdst)
 {
 	pg_time_t	t = timestamptz_to_time_t(ts);
+	int			zone_offset;
+	int			abbr_offset;
+	int			tz;
+	struct pg_tm tm;
+	fsec_t		fsec;
+
+	/*
+	 * If the abbrev matches anything in the zone data, this is pretty easy.
+	 */
+	if (DetermineTimeZoneAbbrevOffsetInternal(t, abbr, tzp,
+											  &abbr_offset, isdst))
+		return abbr_offset;
+
+	/*
+	 * Else, break down the timestamp so we can use DetermineTimeZoneOffset.
+	 */
+	if (timestamp2tm(ts, &tz, &tm, &fsec, NULL, tzp) != 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("timestamp out of range")));
 
-	return DetermineTimeZoneAbbrevOffsetInternal(t, abbr, tzp, isdst);
+	zone_offset = DetermineTimeZoneOffset(&tm, tzp);
+	*isdst = tm.tm_isdst;
+	return zone_offset;
 }
 
 
 /* DetermineTimeZoneAbbrevOffsetInternal()
  *
  * Workhorse for above two functions: work from a pg_time_t probe instant.
- * DST status is returned into *isdst.
+ * On success, return GMT offset and DST status into *offset and *isdst.
  */
-static int
-DetermineTimeZoneAbbrevOffsetInternal(pg_time_t t, const char *abbr,
-									  pg_tz *tzp, int *isdst)
+static bool
+DetermineTimeZoneAbbrevOffsetInternal(pg_time_t t, const char *abbr, pg_tz *tzp,
+									  int *offset, int *isdst)
 {
 	char		upabbr[TZ_STRLEN_MAX + 1];
 	unsigned char *p;
@@ -1670,18 +1714,17 @@
 		*p = pg_toupper(*p);
 
 	/* Look up the abbrev's meaning at this time in this zone */
-	if (!pg_interpret_timezone_abbrev(upabbr,
-									  &t,
-									  &gmtoff,
-									  isdst,
-									  tzp))
-		ereport(ERROR,
-				(errcode(ERRCODE_CONFIG_FILE_ERROR),
-				 errmsg("time zone abbreviation \"%s\" is not used in time zone \"%s\"",
-						abbr, pg_get_timezone_name(tzp))));
-
-	/* Change sign to agree with DetermineTimeZoneOffset() */
-	return (int) -gmtoff;
+	if (pg_interpret_timezone_abbrev(upabbr,
+									 &t,
+									 &gmtoff,
+									 isdst,
+									 tzp))
+	{
+		/* Change sign to agree with DetermineTimeZoneOffset() */
+		*offset = (int) -gmtoff;
+		return true;
+	}
+	return false;
 }
 
 
@@ -1860,7 +1903,7 @@
 					}
 
 					errno = 0;
-					val = strtoi(field[i], &cp, 10);
+					val = strtoint(field[i], &cp, 10);
 					if (errno == ERANGE)
 						return DTERR_FIELD_OVERFLOW;
 
@@ -2531,13 +2574,13 @@
 	*tmask = DTK_TIME_M;
 
 	errno = 0;
-	tm->tm_hour = strtoi(str, &cp, 10);
+	tm->tm_hour = strtoint(str, &cp, 10);
 	if (errno == ERANGE)
 		return DTERR_FIELD_OVERFLOW;
 	if (*cp != ':')
 		return DTERR_BAD_FORMAT;
 	errno = 0;
-	tm->tm_min = strtoi(cp + 1, &cp, 10);
+	tm->tm_min = strtoint(cp + 1, &cp, 10);
 	if (errno == ERANGE)
 		return DTERR_FIELD_OVERFLOW;
 	if (*cp == '\0')
@@ -2565,7 +2608,7 @@
 	else if (*cp == ':')
 	{
 		errno = 0;
-		tm->tm_sec = strtoi(cp + 1, &cp, 10);
+		tm->tm_sec = strtoint(cp + 1, &cp, 10);
 		if (errno == ERANGE)
 			return DTERR_FIELD_OVERFLOW;
 		if (*cp == '\0')
@@ -2615,7 +2658,7 @@
 	*tmask = 0;
 
 	errno = 0;
-	val = strtoi(str, &cp, 10);
+	val = strtoint(str, &cp, 10);
 	if (errno == ERANGE)
 		return DTERR_FIELD_OVERFLOW;
 	if (cp == str)
@@ -2894,7 +2937,7 @@
 		return DTERR_BAD_FORMAT;
 
 	errno = 0;
-	hr = strtoi(str + 1, &cp, 10);
+	hr = strtoint(str + 1, &cp, 10);
 	if (errno == ERANGE)
 		return DTERR_TZDISP_OVERFLOW;
 
@@ -2902,13 +2945,13 @@
 	if (*cp == ':')
 	{
 		errno = 0;
-		min = strtoi(cp + 1, &cp, 10);
+		min = strtoint(cp + 1, &cp, 10);
 		if (errno == ERANGE)
 			return DTERR_TZDISP_OVERFLOW;
 		if (*cp == ':')
 		{
 			errno = 0;
-			sec = strtoi(cp + 1, &cp, 10);
+			sec = strtoint(cp + 1, &cp, 10);
 			if (errno == ERANGE)
 				return DTERR_TZDISP_OVERFLOW;
 		}
@@ -3181,7 +3224,7 @@
 				}
 
 				errno = 0;
-				val = strtoi(field[i], &cp, 10);
+				val = strtoint(field[i], &cp, 10);
 				if (errno == ERANGE)
 					return DTERR_FIELD_OVERFLOW;
 
@@ -3190,7 +3233,7 @@
 					/* SQL "years-months" syntax */
 					int			val2;
 
-					val2 = strtoi(cp + 1, &cp, 10);
+					val2 = strtoint(cp + 1, &cp, 10);
 					if (errno == ERANGE || val2 < 0 || val2 >= MONTHS_PER_YEAR)
 						return DTERR_FIELD_OVERFLOW;
 					if (*cp != '\0')
@@ -4780,8 +4823,17 @@
 						 &tzoff, &tm, &fsec, &tzn, tz) != 0)
 			continue;			/* ignore if conversion fails */
 
-		/* Ignore zic's rather silly "Factory" time zone */
-		if (tzn && strcmp(tzn, "Local time zone must be set--see zic manual page") == 0)
+		/*
+		 * Ignore zic's rather silly "Factory" time zone.  The long string
+		 * about "see zic manual page" is used in tzdata versions before
+		 * 2016g; we can drop it someday when we're pretty sure no such data
+		 * exists in the wild on platforms using --with-system-tzdata.  In
+		 * 2016g and later, the time zone abbreviation "-00" is used for
+		 * "Factory" as well as some invalid cases, all of which we can
+		 * reasonably omit from the pg_timezone_names view.
+		 */
+		if (tzn && (strcmp(tzn, "-00") == 0 ||
+		strcmp(tzn, "Local time zone must be set--see zic manual page") == 0))
 			continue;
 
 		/* Found a displayable zone */
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/dbsize.c postgresql-9.5-9.5.8/src/backend/utils/adt/dbsize.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/dbsize.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/dbsize.c	2017-08-07 21:13:41.000000000 +0000
@@ -39,7 +39,7 @@
 	int64		dirsize = 0;
 	struct dirent *direntry;
 	DIR		   *dirdesc;
-	char		filename[MAXPGPATH];
+	char		filename[MAXPGPATH * 2];
 
 	dirdesc = AllocateDir(path);
 
@@ -56,7 +56,7 @@
 			strcmp(direntry->d_name, "..") == 0)
 			continue;
 
-		snprintf(filename, MAXPGPATH, "%s/%s", path, direntry->d_name);
+		snprintf(filename, sizeof(filename), "%s/%s", path, direntry->d_name);
 
 		if (stat(filename, &fst) < 0)
 		{
@@ -84,7 +84,7 @@
 	DIR		   *dirdesc;
 	struct dirent *direntry;
 	char		dirpath[MAXPGPATH];
-	char		pathname[MAXPGPATH];
+	char		pathname[MAXPGPATH + 12 + sizeof(TABLESPACE_VERSION_DIRECTORY)];
 	AclResult	aclresult;
 
 	/* User must have connect privilege for target database */
@@ -96,7 +96,7 @@
 	/* Shared storage in pg_global is not counted */
 
 	/* Include pg_default storage */
-	snprintf(pathname, MAXPGPATH, "base/%u", dbOid);
+	snprintf(pathname, sizeof(pathname), "base/%u", dbOid);
 	totalsize = db_dir_size(pathname);
 
 	/* Scan the non-default tablespaces */
@@ -116,7 +116,7 @@
 			strcmp(direntry->d_name, "..") == 0)
 			continue;
 
-		snprintf(pathname, MAXPGPATH, "pg_tblspc/%s/%s/%u",
+		snprintf(pathname, sizeof(pathname), "pg_tblspc/%s/%s/%u",
 				 direntry->d_name, TABLESPACE_VERSION_DIRECTORY, dbOid);
 		totalsize += db_dir_size(pathname);
 	}
@@ -164,7 +164,7 @@
 calculate_tablespace_size(Oid tblspcOid)
 {
 	char		tblspcPath[MAXPGPATH];
-	char		pathname[MAXPGPATH];
+	char		pathname[MAXPGPATH * 2];
 	int64		totalsize = 0;
 	DIR		   *dirdesc;
 	struct dirent *direntry;
@@ -206,7 +206,7 @@
 			strcmp(direntry->d_name, "..") == 0)
 			continue;
 
-		snprintf(pathname, MAXPGPATH, "%s/%s", tblspcPath, direntry->d_name);
+		snprintf(pathname, sizeof(pathname), "%s/%s", tblspcPath, direntry->d_name);
 
 		if (stat(pathname, &fst) < 0)
 		{
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/domains.c postgresql-9.5-9.5.8/src/backend/utils/adt/domains.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/domains.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/domains.c	2017-08-07 21:13:41.000000000 +0000
@@ -35,6 +35,7 @@
 #include "executor/executor.h"
 #include "lib/stringinfo.h"
 #include "utils/builtins.h"
+#include "utils/expandeddatum.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
@@ -157,9 +158,14 @@
 					 * Set up value to be returned by CoerceToDomainValue
 					 * nodes.  Unlike ExecEvalCoerceToDomain, this econtext
 					 * couldn't be shared with anything else, so no need to
-					 * save and restore fields.
+					 * save and restore fields.  But we do need to protect the
+					 * passed-in value against being changed by called
+					 * functions.  (It couldn't be a R/W expanded object for
+					 * most uses, but that seems possible for domain_check().)
 					 */
-					econtext->domainValue_datum = value;
+					econtext->domainValue_datum =
+						MakeExpandedObjectReadOnly(value, isnull,
+									my_extra->constraint_ref.tcache->typlen);
 					econtext->domainValue_isNull = isnull;
 
 					conResult = ExecEvalExprSwitchContext(con->check_expr,
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/float.c postgresql-9.5-9.5.8/src/backend/utils/adt/float.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/float.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/float.c	2017-08-07 21:13:41.000000000 +0000
@@ -68,9 +68,6 @@
 int			extra_float_digits = 0;		/* Added to DBL_DIG or FLT_DIG */
 
 
-static int	float4_cmp_internal(float4 a, float4 b);
-static int	float8_cmp_internal(float8 a, float8 b);
-
 #ifndef HAVE_CBRT
 /*
  * Some machines (in particular, some versions of AIX) have an extern
@@ -867,7 +864,7 @@
 /*
  *		float4{eq,ne,lt,le,gt,ge}		- float4/float4 comparison operations
  */
-static int
+int
 float4_cmp_internal(float4 a, float4 b)
 {
 	/*
@@ -981,7 +978,7 @@
 /*
  *		float8{eq,ne,lt,le,gt,ge}		- float8/float8 comparison operations
  */
-static int
+int
 float8_cmp_internal(float8 a, float8 b)
 {
 	/*
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/formatting.c postgresql-9.5-9.5.8/src/backend/utils/adt/formatting.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/formatting.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/formatting.c	2017-08-07 21:13:41.000000000 +0000
@@ -964,7 +964,6 @@
 static char *str_numth(char *dest, char *num, int type);
 static int	adjust_partial_year_to_2020(int year);
 static int	strspace_len(char *str);
-static int	strdigits_len(char *str);
 static void from_char_set_mode(TmFromChar *tmfc, const FromCharDateMode mode);
 static void from_char_set_int(int *dest, const int value, const FormatNode *node);
 static int	from_char_parse_int_len(int *dest, char **src, const int len, FormatNode *node);
@@ -1976,9 +1975,19 @@
 
 /* ----------
  * Skip TM / th in FROM_CHAR
+ *
+ * If S_THth is on, skip two chars, assuming there are two available
  * ----------
  */
-#define SKIP_THth(_suf)		(S_THth(_suf) ? 2 : 0)
+#define SKIP_THth(ptr, _suf) \
+	do { \
+		if (S_THth(_suf)) \
+		{ \
+			if (*(ptr)) (ptr)++; \
+			if (*(ptr)) (ptr)++; \
+		} \
+	} while (0)
+
 
 #ifdef DEBUG_TO_FROM_CHAR
 /* -----------
@@ -2086,23 +2095,6 @@
 	return len;
 }
 
-static int
-strdigits_len(char *str)
-{
-	char	   *p = str;
-	int			len;
-
-	len = strspace_len(str);
-	p += len;
-
-	while (*p && isdigit((unsigned char) *p) && len <= DCH_MAX_ITEM_SIZ)
-	{
-		len++;
-		p++;
-	}
-	return len;
-}
-
 /*
  * Set the date mode of a from-char conversion.
  *
@@ -2286,7 +2278,7 @@
 
 	for (last = 0, a = array; *a != NULL; a++)
 	{
-		/* comperate first chars */
+		/* compare first chars */
 		if (*name != **a)
 			continue;
 
@@ -3000,19 +2992,19 @@
 			case DCH_HH12:
 				from_char_parse_int_len(&out->hh, &s, 2, n);
 				out->clock = CLOCK_12_HOUR;
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_HH24:
 				from_char_parse_int_len(&out->hh, &s, 2, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_MI:
 				from_char_parse_int(&out->mi, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_SS:
 				from_char_parse_int(&out->ss, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_MS:		/* millisecond */
 				len = from_char_parse_int_len(&out->ms, &s, 3, n);
@@ -3023,7 +3015,7 @@
 				out->ms *= len == 1 ? 100 :
 					len == 2 ? 10 : 1;
 
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_US:		/* microsecond */
 				len = from_char_parse_int_len(&out->us, &s, 6, n);
@@ -3034,11 +3026,11 @@
 					len == 4 ? 100 :
 					len == 5 ? 10 : 1;
 
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_SSSS:
 				from_char_parse_int(&out->ssss, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_tz:
 			case DCH_TZ:
@@ -3078,7 +3070,7 @@
 				break;
 			case DCH_MM:
 				from_char_parse_int(&out->mm, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_DAY:
 			case DCH_Day:
@@ -3098,31 +3090,31 @@
 				break;
 			case DCH_DDD:
 				from_char_parse_int(&out->ddd, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_IDDD:
 				from_char_parse_int_len(&out->ddd, &s, 3, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_DD:
 				from_char_parse_int(&out->dd, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_D:
 				from_char_parse_int(&out->d, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_ID:
 				from_char_parse_int_len(&out->d, &s, 1, n);
 				/* Shift numbering to match Gregorian where Sunday = 1 */
 				if (++out->d > 7)
 					out->d = 1;
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_WW:
 			case DCH_IW:
 				from_char_parse_int(&out->ww, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_Q:
 
@@ -3137,55 +3129,57 @@
 				 * isn't stored anywhere in 'out'.
 				 */
 				from_char_parse_int((int *) NULL, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_CC:
 				from_char_parse_int(&out->cc, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_Y_YYY:
 				{
 					int			matched,
 								years,
-								millenia;
+								millenia,
+								nch;
 
-					matched = sscanf(s, "%d,%03d", &millenia, &years);
-					if (matched != 2)
+					matched = sscanf(s, "%d,%03d%n", &millenia, &years, &nch);
+					if (matched < 2)
 						ereport(ERROR,
 								(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
 							  errmsg("invalid input string for \"Y,YYY\"")));
 					years += (millenia * 1000);
 					from_char_set_int(&out->year, years, n);
 					out->yysz = 4;
-					s += strdigits_len(s) + 4 + SKIP_THth(n->suffix);
+					s += nch;
+					SKIP_THth(s, n->suffix);
 				}
 				break;
 			case DCH_YYYY:
 			case DCH_IYYY:
 				from_char_parse_int(&out->year, &s, n);
 				out->yysz = 4;
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_YYY:
 			case DCH_IYY:
 				if (from_char_parse_int(&out->year, &s, n) < 4)
 					out->year = adjust_partial_year_to_2020(out->year);
 				out->yysz = 3;
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_YY:
 			case DCH_IY:
 				if (from_char_parse_int(&out->year, &s, n) < 4)
 					out->year = adjust_partial_year_to_2020(out->year);
 				out->yysz = 2;
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_Y:
 			case DCH_I:
 				if (from_char_parse_int(&out->year, &s, n) < 4)
 					out->year = adjust_partial_year_to_2020(out->year);
 				out->yysz = 1;
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_RM:
 				from_char_seq_search(&value, &s, rm_months_upper,
@@ -3199,11 +3193,11 @@
 				break;
 			case DCH_W:
 				from_char_parse_int(&out->w, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 			case DCH_J:
 				from_char_parse_int(&out->j, &s, n);
-				s += SKIP_THth(n->suffix);
+				SKIP_THth(s, n->suffix);
 				break;
 		}
 	}
@@ -4179,12 +4173,12 @@
 		 (id == NUM_0 || id == NUM_9) ? "NUM_0/9" : id == NUM_DEC ? "NUM_DEC" : "???");
 #endif
 
-	if (*Np->inout_p == ' ')
-		Np->inout_p++;
-
 #define OVERLOAD_TEST	(Np->inout_p >= Np->inout + input_len)
 #define AMOUNT_TEST(_s) (input_len-(Np->inout_p-Np->inout) >= _s)
 
+	if (OVERLOAD_TEST)
+		return;
+
 	if (*Np->inout_p == ' ')
 		Np->inout_p++;
 
@@ -4322,7 +4316,7 @@
 		 * next char is not digit
 		 */
 		if (IS_LSIGN(Np->Num) && isread &&
-			(Np->inout_p + 1) <= Np->inout + input_len &&
+			(Np->inout_p + 1) < Np->inout + input_len &&
 			!isdigit((unsigned char) *(Np->inout_p + 1)))
 		{
 			int			x;
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/geo_ops.c postgresql-9.5-9.5.8/src/backend/utils/adt/geo_ops.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/geo_ops.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/geo_ops.c	2017-08-07 21:13:41.000000000 +0000
@@ -2914,7 +2914,7 @@
 	}
 
 	/*
-	 * at this point the "normal" from point will hit lseg. The closet point
+	 * at this point the "normal" from point will hit lseg. The closest point
 	 * will be somewhere on the lseg
 	 */
 	tmp = line_construct_pm(pt, invm);
@@ -2923,7 +2923,15 @@
 		   tmp->A, tmp->B, tmp->C);
 #endif
 	result = interpt_sl(lseg, tmp);
-	Assert(result != NULL);
+
+	/*
+	 * ordinarily we should always find an intersection point, but that could
+	 * fail in the presence of NaN coordinates, and perhaps even from simple
+	 * roundoff issues.  Return a SQL NULL if so.
+	 */
+	if (result == NULL)
+		PG_RETURN_NULL();
+
 #ifdef GEODEBUG
 	printf("close_ps- result.x %f  result.y %f\n", result->x, result->y);
 #endif
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/inet_net_pton.c postgresql-9.5-9.5.8/src/backend/utils/adt/inet_net_pton.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/inet_net_pton.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/inet_net_pton.c	2017-08-07 21:13:41.000000000 +0000
@@ -496,7 +496,7 @@
 			else if (*src == '\0')
 				goto enoent;
 			if (tp + NS_INT16SZ > endp)
-				return (0);
+				goto enoent;
 			*tp++ = (u_char) (val >> 8) & 0xff;
 			*tp++ = (u_char) val & 0xff;
 			saw_xdigit = 0;
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/jsonb.c postgresql-9.5-9.5.8/src/backend/utils/adt/jsonb.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/jsonb.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/jsonb.c	2017-08-07 21:13:41.000000000 +0000
@@ -1211,7 +1211,7 @@
 		if (val_type == InvalidOid || val_type == UNKNOWNOID)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-			   errmsg("argument %d: could not determine data type", i + 1)));
+			   errmsg("could not determine data type for argument %d", i + 1)));
 
 		add_jsonb(arg, false, &result, val_type, true);
 
@@ -1234,7 +1234,7 @@
 		if (val_type == InvalidOid || val_type == UNKNOWNOID)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-			   errmsg("argument %d: could not determine data type", i + 2)));
+			   errmsg("could not determine data type for argument %d", i + 2)));
 		add_jsonb(arg, PG_ARGISNULL(i + 1), &result, val_type, false);
 	}
 
@@ -1294,7 +1294,7 @@
 		if (val_type == InvalidOid || val_type == UNKNOWNOID)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-			   errmsg("argument %d: could not determine data type", i + 1)));
+			   errmsg("could not determine data type for argument %d", i + 1)));
 		add_jsonb(arg, PG_ARGISNULL(i), &result, val_type, false);
 	}
 
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/json.c postgresql-9.5-9.5.8/src/backend/utils/adt/json.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/json.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/json.c	2017-08-07 21:13:41.000000000 +0000
@@ -323,7 +323,7 @@
  * Publicly visible entry point for the JSON parser.
  *
  * lex is a lexing context, set up for the json to be processed by calling
- * makeJsonLexContext(). sem is a strucure of function pointers to semantic
+ * makeJsonLexContext(). sem is a structure of function pointers to semantic
  * action routines to be called at appropriate spots during parsing, and a
  * pointer to a state object to be passed to those routines.
  */
@@ -2003,7 +2003,7 @@
 		if (arg_type == InvalidOid)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("could not determine data type for argument 1")));
+					 errmsg("could not determine data type for argument %d", 1)));
 
 		json_categorize_type(arg_type, &state->key_category,
 							 &state->key_output_func);
@@ -2013,7 +2013,7 @@
 		if (arg_type == InvalidOid)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("could not determine data type for argument 2")));
+					 errmsg("could not determine data type for argument %d", 2)));
 
 		json_categorize_type(arg_type, &state->val_category,
 							 &state->val_output_func);
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/jsonfuncs.c postgresql-9.5-9.5.8/src/backend/utils/adt/jsonfuncs.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/jsonfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/jsonfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -3553,7 +3553,7 @@
 
 
 /*
- * SQL function jsonb_delete(jsonb, text[])
+ * SQL function jsonb_delete_path(jsonb, text[])
  */
 Datum
 jsonb_delete_path(PG_FUNCTION_ARGS)
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/numeric.c postgresql-9.5-9.5.8/src/backend/utils/adt/numeric.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/numeric.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/numeric.c	2017-08-07 21:13:41.000000000 +0000
@@ -760,10 +760,6 @@
 	init_var(&value);
 
 	len = (uint16) pq_getmsgint(buf, sizeof(uint16));
-	if (len < 0 || len > NUMERIC_MAX_PRECISION + NUMERIC_MAX_RESULT_SCALE)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_BINARY_REPRESENTATION),
-				 errmsg("invalid length in external \"numeric\" value")));
 
 	alloc_var(&value, len);
 
@@ -4651,12 +4647,19 @@
 					 errmsg("invalid input syntax for type numeric: \"%s\"",
 							str)));
 		cp = endptr;
-		if (exponent > NUMERIC_MAX_PRECISION ||
-			exponent < -NUMERIC_MAX_PRECISION)
+
+		/*
+		 * At this point, dweight and dscale can't be more than about
+		 * INT_MAX/2 due to the MaxAllocSize limit on string length, so
+		 * constraining the exponent similarly should be enough to prevent
+		 * integer overflow in this function.  If the value is too large to
+		 * fit in storage format, make_result() will complain about it later;
+		 * for consistency use the same ereport errcode/text as make_result().
+		 */
+		if (exponent >= INT_MAX / 2 || exponent <= -(INT_MAX / 2))
 			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("invalid input syntax for type numeric: \"%s\"",
-							str)));
+					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+					 errmsg("value overflows numeric format")));
 		dweight += (int) exponent;
 		dscale -= (int) exponent;
 		if (dscale < 0)
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/pg_locale.c postgresql-9.5-9.5.8/src/backend/utils/adt/pg_locale.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/pg_locale.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/pg_locale.c	2017-08-07 21:13:41.000000000 +0000
@@ -382,51 +382,91 @@
 
 /*
  * Frees the malloced content of a struct lconv.  (But not the struct
- * itself.)
+ * itself.)  It's important that this not throw elog(ERROR).
  */
 static void
 free_struct_lconv(struct lconv * s)
 {
-	if (s->currency_symbol)
-		free(s->currency_symbol);
 	if (s->decimal_point)
 		free(s->decimal_point);
-	if (s->grouping)
-		free(s->grouping);
 	if (s->thousands_sep)
 		free(s->thousands_sep);
+	if (s->grouping)
+		free(s->grouping);
 	if (s->int_curr_symbol)
 		free(s->int_curr_symbol);
+	if (s->currency_symbol)
+		free(s->currency_symbol);
 	if (s->mon_decimal_point)
 		free(s->mon_decimal_point);
-	if (s->mon_grouping)
-		free(s->mon_grouping);
 	if (s->mon_thousands_sep)
 		free(s->mon_thousands_sep);
-	if (s->negative_sign)
-		free(s->negative_sign);
+	if (s->mon_grouping)
+		free(s->mon_grouping);
 	if (s->positive_sign)
 		free(s->positive_sign);
+	if (s->negative_sign)
+		free(s->negative_sign);
+}
+
+/*
+ * Check that all fields of a struct lconv (or at least, the ones we care
+ * about) are non-NULL.  The field list must match free_struct_lconv().
+ */
+static bool
+struct_lconv_is_valid(struct lconv * s)
+{
+	if (s->decimal_point == NULL)
+		return false;
+	if (s->thousands_sep == NULL)
+		return false;
+	if (s->grouping == NULL)
+		return false;
+	if (s->int_curr_symbol == NULL)
+		return false;
+	if (s->currency_symbol == NULL)
+		return false;
+	if (s->mon_decimal_point == NULL)
+		return false;
+	if (s->mon_thousands_sep == NULL)
+		return false;
+	if (s->mon_grouping == NULL)
+		return false;
+	if (s->positive_sign == NULL)
+		return false;
+	if (s->negative_sign == NULL)
+		return false;
+	return true;
 }
 
 
 /*
- * Return a strdup'ed string converted from the specified encoding to the
+ * Convert the strdup'd string at *str from the specified encoding to the
  * database encoding.
  */
-static char *
-db_encoding_strdup(int encoding, const char *str)
+static void
+db_encoding_convert(int encoding, char **str)
 {
 	char	   *pstr;
 	char	   *mstr;
 
 	/* convert the string to the database encoding */
-	pstr = pg_any_to_server(str, strlen(str), encoding);
+	pstr = pg_any_to_server(*str, strlen(*str), encoding);
+	if (pstr == *str)
+		return;					/* no conversion happened */
+
+	/* need it malloc'd not palloc'd */
 	mstr = strdup(pstr);
-	if (pstr != str)
-		pfree(pstr);
+	if (mstr == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory")));
+
+	/* replace old string */
+	free(*str);
+	*str = mstr;
 
-	return mstr;
+	pfree(pstr);
 }
 
 
@@ -440,13 +480,10 @@
 	static struct lconv CurrentLocaleConv;
 	static bool CurrentLocaleConvAllocated = false;
 	struct lconv *extlconv;
+	struct lconv worklconv;
+	bool		trouble = false;
 	char	   *save_lc_monetary;
 	char	   *save_lc_numeric;
-	char	   *decimal_point;
-	char	   *grouping;
-	char	   *thousands_sep;
-	int			encoding;
-
 #ifdef WIN32
 	char	   *save_lc_ctype;
 #endif
@@ -462,6 +499,20 @@
 		CurrentLocaleConvAllocated = false;
 	}
 
+	/*
+	 * This is tricky because we really don't want to risk throwing error
+	 * while the locale is set to other than our usual settings.  Therefore,
+	 * the process is: collect the usual settings, set locale to special
+	 * setting, copy relevant data into worklconv using strdup(), restore
+	 * normal settings, convert data to desired encoding, and finally stash
+	 * the collected data in CurrentLocaleConv.  This makes it safe if we
+	 * throw an error during encoding conversion or run out of memory anywhere
+	 * in the process.  All data pointed to by struct lconv members is
+	 * allocated with strdup, to avoid premature elog(ERROR) and to allow
+	 * using a single cleanup routine.
+	 */
+	memset(&worklconv, 0, sizeof(worklconv));
+
 	/* Save user's values of monetary and numeric locales */
 	save_lc_monetary = setlocale(LC_MONETARY, NULL);
 	if (save_lc_monetary)
@@ -477,7 +528,7 @@
 	 * Ideally, monetary and numeric local symbols could be returned in any
 	 * server encoding.  Unfortunately, the WIN32 API does not allow
 	 * setlocale() to return values in a codepage/CTYPE that uses more than
-	 * two bytes per character, like UTF-8:
+	 * two bytes per character, such as UTF-8:
 	 *
 	 * http://msdn.microsoft.com/en-us/library/x99tb11d.aspx
 	 *
@@ -487,7 +538,7 @@
 	 *
 	 * Therefore, we set LC_CTYPE to match LC_NUMERIC or LC_MONETARY (which
 	 * cannot be UTF8), call localeconv(), and then convert from the
-	 * numeric/monitary LC_CTYPE to the server encoding.  One example use of
+	 * numeric/monetary LC_CTYPE to the server encoding.  One example use of
 	 * this is for the Euro symbol.
 	 *
 	 * Perhaps someday we will use GetLocaleInfoW() which returns values in
@@ -499,6 +550,8 @@
 	if (save_lc_ctype)
 		save_lc_ctype = pstrdup(save_lc_ctype);
 
+	/* Here begins the critical section where we must not throw error */
+
 	/* use numeric to set the ctype */
 	setlocale(LC_CTYPE, locale_numeric);
 #endif
@@ -506,11 +559,11 @@
 	/* Get formatting information for numeric */
 	setlocale(LC_NUMERIC, locale_numeric);
 	extlconv = localeconv();
-	encoding = pg_get_encoding_from_locale(locale_numeric, true);
 
-	decimal_point = db_encoding_strdup(encoding, extlconv->decimal_point);
-	thousands_sep = db_encoding_strdup(encoding, extlconv->thousands_sep);
-	grouping = strdup(extlconv->grouping);
+	/* Must copy data now in case setlocale() overwrites it */
+	worklconv.decimal_point = strdup(extlconv->decimal_point);
+	worklconv.thousands_sep = strdup(extlconv->thousands_sep);
+	worklconv.grouping = strdup(extlconv->grouping);
 
 #ifdef WIN32
 	/* use monetary to set the ctype */
@@ -520,40 +573,36 @@
 	/* Get formatting information for monetary */
 	setlocale(LC_MONETARY, locale_monetary);
 	extlconv = localeconv();
-	encoding = pg_get_encoding_from_locale(locale_monetary, true);
 
-	/*
-	 * Must copy all values since restoring internal settings may overwrite
-	 * localeconv()'s results.  Note that if we were to fail within this
-	 * sequence before reaching "CurrentLocaleConvAllocated = true", we could
-	 * leak some memory --- but not much, so it's not worth agonizing over.
-	 */
-	CurrentLocaleConv = *extlconv;
-	CurrentLocaleConv.decimal_point = decimal_point;
-	CurrentLocaleConv.grouping = grouping;
-	CurrentLocaleConv.thousands_sep = thousands_sep;
-	CurrentLocaleConv.int_curr_symbol = db_encoding_strdup(encoding, extlconv->int_curr_symbol);
-	CurrentLocaleConv.currency_symbol = db_encoding_strdup(encoding, extlconv->currency_symbol);
-	CurrentLocaleConv.mon_decimal_point = db_encoding_strdup(encoding, extlconv->mon_decimal_point);
-	CurrentLocaleConv.mon_grouping = strdup(extlconv->mon_grouping);
-	CurrentLocaleConv.mon_thousands_sep = db_encoding_strdup(encoding, extlconv->mon_thousands_sep);
-	CurrentLocaleConv.negative_sign = db_encoding_strdup(encoding, extlconv->negative_sign);
-	CurrentLocaleConv.positive_sign = db_encoding_strdup(encoding, extlconv->positive_sign);
-	CurrentLocaleConvAllocated = true;
+	/* Must copy data now in case setlocale() overwrites it */
+	worklconv.int_curr_symbol = strdup(extlconv->int_curr_symbol);
+	worklconv.currency_symbol = strdup(extlconv->currency_symbol);
+	worklconv.mon_decimal_point = strdup(extlconv->mon_decimal_point);
+	worklconv.mon_thousands_sep = strdup(extlconv->mon_thousands_sep);
+	worklconv.mon_grouping = strdup(extlconv->mon_grouping);
+	worklconv.positive_sign = strdup(extlconv->positive_sign);
+	worklconv.negative_sign = strdup(extlconv->negative_sign);
+	/* Copy scalar fields as well */
+	worklconv.int_frac_digits = extlconv->int_frac_digits;
+	worklconv.frac_digits = extlconv->frac_digits;
+	worklconv.p_cs_precedes = extlconv->p_cs_precedes;
+	worklconv.p_sep_by_space = extlconv->p_sep_by_space;
+	worklconv.n_cs_precedes = extlconv->n_cs_precedes;
+	worklconv.n_sep_by_space = extlconv->n_sep_by_space;
+	worklconv.p_sign_posn = extlconv->p_sign_posn;
+	worklconv.n_sign_posn = extlconv->n_sign_posn;
 
 	/* Try to restore internal settings */
 	if (save_lc_monetary)
 	{
 		if (!setlocale(LC_MONETARY, save_lc_monetary))
-			elog(WARNING, "failed to restore old locale");
-		pfree(save_lc_monetary);
+			trouble = true;
 	}
 
 	if (save_lc_numeric)
 	{
 		if (!setlocale(LC_NUMERIC, save_lc_numeric))
-			elog(WARNING, "failed to restore old locale");
-		pfree(save_lc_numeric);
+			trouble = true;
 	}
 
 #ifdef WIN32
@@ -561,11 +610,74 @@
 	if (save_lc_ctype)
 	{
 		if (!setlocale(LC_CTYPE, save_lc_ctype))
-			elog(WARNING, "failed to restore old locale");
-		pfree(save_lc_ctype);
+			trouble = true;
 	}
 #endif
 
+	/*
+	 * At this point we've done our best to clean up, and can call functions
+	 * that might possibly throw errors with a clean conscience.  But let's
+	 * make sure we don't leak any already-strdup'd fields in worklconv.
+	 */
+	PG_TRY();
+	{
+		int			encoding;
+
+		/*
+		 * Report it if we failed to restore anything.  Perhaps this should be
+		 * FATAL, rather than continuing with bad locale settings?
+		 */
+		if (trouble)
+			elog(WARNING, "failed to restore old locale");
+
+		/* Release the pstrdup'd locale names */
+		if (save_lc_monetary)
+			pfree(save_lc_monetary);
+		if (save_lc_numeric)
+			pfree(save_lc_numeric);
+#ifdef WIN32
+		if (save_lc_ctype)
+			pfree(save_lc_ctype);
+#endif
+
+		/* If any of the preceding strdup calls failed, complain now. */
+		if (!struct_lconv_is_valid(&worklconv))
+			ereport(ERROR,
+					(errcode(ERRCODE_OUT_OF_MEMORY),
+					 errmsg("out of memory")));
+
+		/*
+		 * Now we must perform encoding conversion from whatever's associated
+		 * with the locale into the database encoding.
+		 */
+		encoding = pg_get_encoding_from_locale(locale_numeric, true);
+
+		db_encoding_convert(encoding, &worklconv.decimal_point);
+		db_encoding_convert(encoding, &worklconv.thousands_sep);
+		/* grouping is not text and does not require conversion */
+
+		encoding = pg_get_encoding_from_locale(locale_monetary, true);
+
+		db_encoding_convert(encoding, &worklconv.int_curr_symbol);
+		db_encoding_convert(encoding, &worklconv.currency_symbol);
+		db_encoding_convert(encoding, &worklconv.mon_decimal_point);
+		db_encoding_convert(encoding, &worklconv.mon_thousands_sep);
+		/* mon_grouping is not text and does not require conversion */
+		db_encoding_convert(encoding, &worklconv.positive_sign);
+		db_encoding_convert(encoding, &worklconv.negative_sign);
+	}
+	PG_CATCH();
+	{
+		free_struct_lconv(&worklconv);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
+
+	/*
+	 * Everything is good, so save the results.
+	 */
+	CurrentLocaleConv = worklconv;
+	CurrentLocaleConvAllocated = true;
 	CurrentLocaleConvValid = true;
 	return &CurrentLocaleConv;
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/pgstatfuncs.c postgresql-9.5-9.5.8/src/backend/utils/adt/pgstatfuncs.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/pgstatfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/pgstatfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -577,27 +577,17 @@
 		MemSet(values, 0, sizeof(values));
 		MemSet(nulls, 0, sizeof(nulls));
 
-		if (pid != -1)
-		{
-			/* Skip any which are not the one we're looking for. */
-			PgBackendStatus *be = pgstat_fetch_stat_beentry(curr_backend);
-
-			if (!be || be->st_procpid != pid)
-				continue;
-
-		}
-
 		/* Get the next one in the list */
 		local_beentry = pgstat_fetch_stat_local_beentry(curr_backend);
 		if (!local_beentry)
-			continue;
-
-		beentry = &local_beentry->backendStatus;
-		if (!beentry)
 		{
 			int			i;
 
-			for (i = 0; i < sizeof(nulls) / sizeof(nulls[0]); i++)
+			/* Ignore missing entries if looking for specific PID */
+			if (pid != -1)
+				continue;
+
+			for (i = 0; i < lengthof(nulls); i++)
 				nulls[i] = true;
 
 			nulls[5] = false;
@@ -607,6 +597,12 @@
 			continue;
 		}
 
+		beentry = &local_beentry->backendStatus;
+
+		/* If looking for specific PID, ignore all the others */
+		if (pid != -1 && beentry->st_procpid != pid)
+			continue;
+
 		/* Values available to all callers */
 		values[0] = ObjectIdGetDatum(beentry->st_databaseid);
 		values[1] = Int32GetDatum(beentry->st_procpid);
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/quote.c postgresql-9.5-9.5.8/src/backend/utils/adt/quote.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/quote.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/quote.c	2017-08-07 21:13:41.000000000 +0000
@@ -107,7 +107,7 @@
 
 	len = strlen(rawstr);
 	/* We make a worst-case result area; wasting a little space is OK */
-	result = palloc(len * 2 + 3);
+	result = palloc(len * 2 + 3 + 1);
 
 	newlen = quote_literal_internal(result, rawstr, len);
 	result[newlen] = '\0';
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/rangetypes_selfuncs.c postgresql-9.5-9.5.8/src/backend/utils/adt/rangetypes_selfuncs.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/rangetypes_selfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/rangetypes_selfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -20,6 +20,7 @@
 #include "access/htup_details.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_statistic.h"
+#include "catalog/pg_type.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/rangetypes.h"
@@ -246,8 +247,9 @@
 
 		/* Try to get fraction of empty ranges */
 		if (get_attstatsslot(vardata->statsTuple,
-							 vardata->atttype, vardata->atttypmod,
-						   STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM, InvalidOid,
+							 FLOAT8OID, -1,
+							 STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM,
+							 InvalidOid,
 							 NULL,
 							 NULL, NULL,
 							 &numbers, &nnumbers))
@@ -255,6 +257,7 @@
 			if (nnumbers != 1)
 				elog(ERROR, "invalid empty fraction statistic");		/* shouldn't happen */
 			empty_frac = numbers[0];
+			free_attstatsslot(FLOAT8OID, NULL, 0, numbers, nnumbers);
 		}
 		else
 		{
@@ -373,8 +376,8 @@
 {
 	Datum	   *hist_values;
 	int			nhist;
-	Datum	   *length_hist_values;
-	int			length_nhist;
+	Datum	   *length_hist_values = NULL;
+	int			length_nhist = 0;
 	RangeBound *hist_lower;
 	RangeBound *hist_upper;
 	int			i;
@@ -383,6 +386,15 @@
 	bool		empty;
 	double		hist_selec;
 
+	/* Can't use the histogram with insecure range support functions */
+	if (!statistic_proc_security_check(vardata,
+									   typcache->rng_cmp_proc_finfo.fn_oid))
+		return -1;
+	if (OidIsValid(typcache->rng_subdiff_finfo.fn_oid) &&
+		!statistic_proc_security_check(vardata,
+									   typcache->rng_subdiff_finfo.fn_oid))
+		return -1;
+
 	/* Try to get histogram of ranges */
 	if (!(HeapTupleIsValid(vardata->statsTuple) &&
 		  get_attstatsslot(vardata->statsTuple,
@@ -414,17 +426,25 @@
 	{
 		if (!(HeapTupleIsValid(vardata->statsTuple) &&
 			  get_attstatsslot(vardata->statsTuple,
-							   vardata->atttype, vardata->atttypmod,
+							   FLOAT8OID, -1,
 							   STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM,
 							   InvalidOid,
 							   NULL,
 							   &length_hist_values, &length_nhist,
 							   NULL, NULL)))
+		{
+			free_attstatsslot(vardata->atttype, hist_values, nhist, NULL, 0);
 			return -1.0;
+		}
 
 		/* check that it's a histogram, not just a dummy entry */
 		if (length_nhist < 2)
+		{
+			free_attstatsslot(FLOAT8OID,
+							  length_hist_values, length_nhist, NULL, 0);
+			free_attstatsslot(vardata->atttype, hist_values, nhist, NULL, 0);
 			return -1.0;
+		}
 	}
 
 	/* Extract the bounds of the constant value. */
@@ -533,7 +553,7 @@
 			{
 				/*
 				 * Lower bound no longer matters. Just estimate the fraction
-				 * with an upper bound <= const uppert bound
+				 * with an upper bound <= const upper bound
 				 */
 				hist_selec =
 					calc_hist_selectivity_scalar(typcache, &const_upper,
@@ -560,6 +580,10 @@
 			break;
 	}
 
+	free_attstatsslot(FLOAT8OID,
+					  length_hist_values, length_nhist, NULL, 0);
+	free_attstatsslot(vardata->atttype, hist_values, nhist, NULL, 0);
+
 	return hist_selec;
 }
 
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/rangetypes_typanalyze.c postgresql-9.5-9.5.8/src/backend/utils/adt/rangetypes_typanalyze.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/rangetypes_typanalyze.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/rangetypes_typanalyze.c	2017-08-07 21:13:41.000000000 +0000
@@ -203,7 +203,9 @@
 		/* Do the simple null-frac and width stats */
 		stats->stanullfrac = (double) null_cnt / (double) samplerows;
 		stats->stawidth = total_width / (double) non_null_cnt;
-		stats->stadistinct = -1.0;
+
+		/* Estimate that non-null values are unique */
+		stats->stadistinct = -1.0 * (1.0 - stats->stanullfrac);
 
 		/* Must copy the target values into anl_context */
 		old_cxt = MemoryContextSwitchTo(stats->anl_context);
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/regproc.c postgresql-9.5-9.5.8/src/backend/utils/adt/regproc.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/regproc.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/regproc.c	2017-08-07 21:13:41.000000000 +0000
@@ -35,6 +35,7 @@
 #include "lib/stringinfo.h"
 #include "miscadmin.h"
 #include "parser/parse_type.h"
+#include "parser/scansup.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
@@ -1911,7 +1912,7 @@
 	ptr2 = ptr + strlen(ptr);
 	while (--ptr2 > ptr)
 	{
-		if (!isspace((unsigned char) *ptr2))
+		if (!scanner_isspace(*ptr2))
 			break;
 	}
 	if (*ptr2 != ')')
@@ -1928,7 +1929,7 @@
 	for (;;)
 	{
 		/* allow leading whitespace */
-		while (isspace((unsigned char) *ptr))
+		while (scanner_isspace(*ptr))
 			ptr++;
 		if (*ptr == '\0')
 		{
@@ -1984,7 +1985,7 @@
 		/* Lop off trailing whitespace */
 		while (--ptr2 >= typename)
 		{
-			if (!isspace((unsigned char) *ptr2))
+			if (!scanner_isspace(*ptr2))
 				break;
 			*ptr2 = '\0';
 		}
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/ri_triggers.c postgresql-9.5-9.5.8/src/backend/utils/adt/ri_triggers.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/ri_triggers.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/ri_triggers.c	2017-08-07 21:13:41.000000000 +0000
@@ -44,6 +44,7 @@
 #include "parser/parse_coerce.h"
 #include "parser/parse_relation.h"
 #include "miscadmin.h"
+#include "storage/bufmgr.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
@@ -286,20 +287,17 @@
 	 * We should not even consider checking the row if it is no longer valid,
 	 * since it was either deleted (so the deferred check should be skipped)
 	 * or updated (in which case only the latest version of the row should be
-	 * checked).  Test its liveness according to SnapshotSelf.
-	 *
-	 * NOTE: The normal coding rule is that one must acquire the buffer
-	 * content lock to call HeapTupleSatisfiesVisibility.  We can skip that
-	 * here because we know that AfterTriggerExecute just fetched the tuple
-	 * successfully, so there cannot be a VACUUM compaction in progress on the
-	 * page (either heap_fetch would have waited for the VACUUM, or the
-	 * VACUUM's LockBufferForCleanup would be waiting for us to drop pin). And
-	 * since this is a row inserted by our open transaction, no one else can
-	 * be entitled to change its xmin/xmax.
+	 * checked).  Test its liveness according to SnapshotSelf.  We need pin
+	 * and lock on the buffer to call HeapTupleSatisfiesVisibility.  Caller
+	 * should be holding pin, but not lock.
 	 */
-	Assert(new_row_buf != InvalidBuffer);
+	LockBuffer(new_row_buf, BUFFER_LOCK_SHARE);
 	if (!HeapTupleSatisfiesVisibility(new_row, SnapshotSelf, new_row_buf))
+	{
+		LockBuffer(new_row_buf, BUFFER_LOCK_UNLOCK);
 		return PointerGetDatum(NULL);
+	}
+	LockBuffer(new_row_buf, BUFFER_LOCK_UNLOCK);
 
 	/*
 	 * Get the relation descriptors of the FK and PK tables.
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/ruleutils.c postgresql-9.5-9.5.8/src/backend/utils/adt/ruleutils.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/ruleutils.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/ruleutils.c	2017-08-07 21:13:41.000000000 +0000
@@ -402,6 +402,9 @@
 			  bool showimplicit);
 static void get_rule_expr_toplevel(Node *node, deparse_context *context,
 					   bool showimplicit);
+static void get_rule_expr_funccall(Node *node, deparse_context *context,
+					   bool showimplicit);
+static bool looks_like_function(Node *node);
 static void get_oper_expr(OpExpr *expr, deparse_context *context);
 static void get_func_expr(FuncExpr *expr, deparse_context *context,
 			  bool showimplicit);
@@ -950,7 +953,7 @@
  *
  * Note that the SQL-function versions of this omit any info about the
  * index tablespace; this is intentional because pg_dump wants it that way.
- * However pg_get_indexdef_string() includes index tablespace if not default.
+ * However pg_get_indexdef_string() includes the index tablespace.
  * ----------
  */
 Datum
@@ -982,7 +985,11 @@
 														   prettyFlags)));
 }
 
-/* Internal version that returns a palloc'd C string; no pretty-printing */
+/*
+ * Internal version for use by ALTER TABLE.
+ * Includes a tablespace clause in the result.
+ * Returns a palloc'd C string; no pretty-printing.
+ */
 char *
 pg_get_indexdef_string(Oid indexrelid)
 {
@@ -1231,20 +1238,19 @@
 		}
 
 		/*
-		 * If it's in a nondefault tablespace, say so, but only if requested
+		 * Print tablespace, but only if requested
 		 */
 		if (showTblSpc)
 		{
 			Oid			tblspc;
 
 			tblspc = get_rel_tablespace(indexrelid);
-			if (OidIsValid(tblspc))
-			{
-				if (isConstraint)
-					appendStringInfoString(&buf, " USING INDEX");
-				appendStringInfo(&buf, " TABLESPACE %s",
-							  quote_identifier(get_tablespace_name(tblspc)));
-			}
+			if (!OidIsValid(tblspc))
+				tblspc = MyDatabaseTableSpace;
+			if (isConstraint)
+				appendStringInfoString(&buf, " USING INDEX");
+			appendStringInfo(&buf, " TABLESPACE %s",
+							 quote_identifier(get_tablespace_name(tblspc)));
 		}
 
 		/*
@@ -2362,7 +2368,7 @@
 }
 
 /*
- * Append used transformated types to specified buffer
+ * Append used transformed types to specified buffer
  */
 static void
 print_function_trftypes(StringInfo buf, HeapTuple proctup)
@@ -4075,6 +4081,8 @@
 	char	   *ev_qual;
 	char	   *ev_action;
 	List	   *actions = NIL;
+	Relation	ev_relation;
+	TupleDesc	viewResultDesc = NULL;
 	int			fno;
 	Datum		dat;
 	bool		isnull;
@@ -4111,6 +4119,8 @@
 	if (ev_action != NULL)
 		actions = (List *) stringToNode(ev_action);
 
+	ev_relation = heap_open(ev_class, AccessShareLock);
+
 	/*
 	 * Build the rules definition text
 	 */
@@ -4127,6 +4137,7 @@
 	{
 		case '1':
 			appendStringInfoString(buf, "SELECT");
+			viewResultDesc = RelationGetDescr(ev_relation);
 			break;
 
 		case '2':
@@ -4216,7 +4227,7 @@
 		foreach(action, actions)
 		{
 			query = (Query *) lfirst(action);
-			get_query_def(query, buf, NIL, NULL,
+			get_query_def(query, buf, NIL, viewResultDesc,
 						  prettyFlags, WRAP_COLUMN_DEFAULT, 0);
 			if (prettyFlags)
 				appendStringInfoString(buf, ";\n");
@@ -4234,10 +4245,12 @@
 		Query	   *query;
 
 		query = (Query *) linitial(actions);
-		get_query_def(query, buf, NIL, NULL,
+		get_query_def(query, buf, NIL, viewResultDesc,
 					  prettyFlags, WRAP_COLUMN_DEFAULT, 0);
 		appendStringInfoChar(buf, ';');
 	}
+
+	heap_close(ev_relation, AccessShareLock);
 }
 
 
@@ -4259,20 +4272,28 @@
 	List	   *actions = NIL;
 	Relation	ev_relation;
 	int			fno;
+	Datum		dat;
 	bool		isnull;
 
 	/*
 	 * Get the attribute values from the rules tuple
 	 */
 	fno = SPI_fnumber(rulettc, "ev_type");
-	ev_type = (char) SPI_getbinval(ruletup, rulettc, fno, &isnull);
+	dat = SPI_getbinval(ruletup, rulettc, fno, &isnull);
+	Assert(!isnull);
+	ev_type = DatumGetChar(dat);
 
 	fno = SPI_fnumber(rulettc, "ev_class");
-	ev_class = (Oid) SPI_getbinval(ruletup, rulettc, fno, &isnull);
+	dat = SPI_getbinval(ruletup, rulettc, fno, &isnull);
+	Assert(!isnull);
+	ev_class = DatumGetObjectId(dat);
 
 	fno = SPI_fnumber(rulettc, "is_instead");
-	is_instead = (bool) SPI_getbinval(ruletup, rulettc, fno, &isnull);
+	dat = SPI_getbinval(ruletup, rulettc, fno, &isnull);
+	Assert(!isnull);
+	is_instead = DatumGetBool(dat);
 
+	/* these could be nulls */
 	fno = SPI_fnumber(rulettc, "ev_qual");
 	ev_qual = SPI_getvalue(ruletup, rulettc, fno);
 
@@ -5543,12 +5564,15 @@
 				context->varprefix = save_varprefix;
 			}
 		}
-		else if (confl->constraint != InvalidOid)
+		else if (OidIsValid(confl->constraint))
 		{
 			char	   *constraint = get_constraint_name(confl->constraint);
 
+			if (!constraint)
+				elog(ERROR, "cache lookup failed for constraint %u",
+					 confl->constraint);
 			appendStringInfo(buf, " ON CONSTRAINT %s",
-							 quote_qualified_identifier(NULL, constraint));
+							 quote_identifier(constraint));
 		}
 
 		if (confl->action == ONCONFLICT_NOTHING)
@@ -5704,8 +5728,11 @@
 			/*
 			 * We must dig down into the expr to see if it's a PARAM_MULTIEXPR
 			 * Param.  That could be buried under FieldStores and ArrayRefs
-			 * (cf processIndirection()), and underneath those there could be
-			 * an implicit type coercion.
+			 * and CoerceToDomains (cf processIndirection()), and underneath
+			 * those there could be an implicit type coercion.  Because we
+			 * would ignore implicit type coercions anyway, we don't need to
+			 * be as careful as processIndirection() is about descending past
+			 * implicit CoerceToDomains.
 			 */
 			expr = (Node *) tle->expr;
 			while (expr)
@@ -5724,6 +5751,14 @@
 						break;
 					expr = (Node *) aref->refassgnexpr;
 				}
+				else if (IsA(expr, CoerceToDomain))
+				{
+					CoerceToDomain *cdomain = (CoerceToDomain *) expr;
+
+					if (cdomain->coercionformat != COERCE_IMPLICIT_CAST)
+						break;
+					expr = (Node *) cdomain->arg;
+				}
 				else
 					break;
 			}
@@ -6009,7 +6044,8 @@
 
 		tle = get_tle_by_resno(dpns->inner_tlist, var->varattno);
 		if (!tle)
-			elog(ERROR, "bogus varattno for subquery var: %d", var->varattno);
+			elog(ERROR, "invalid attnum %d for relation \"%s\"",
+				 var->varattno, rte->eref->aliasname);
 
 		Assert(netlevelsup == 0);
 		push_child_plan(dpns, dpns->inner_planstate, &save_dpns);
@@ -6070,9 +6106,13 @@
 	else if (attnum > 0)
 	{
 		/* Get column name to use from the colinfo struct */
-		Assert(attnum <= colinfo->num_cols);
+		if (attnum > colinfo->num_cols)
+			elog(ERROR, "invalid attnum %d for relation \"%s\"",
+				 attnum, rte->eref->aliasname);
 		attname = colinfo->colnames[attnum - 1];
-		Assert(attname != NULL);
+		if (attname == NULL)	/* dropped column? */
+			elog(ERROR, "invalid attnum %d for relation \"%s\"",
+				 attnum, rte->eref->aliasname);
 	}
 	else
 	{
@@ -7203,6 +7243,24 @@
 									  get_base_element_type(exprType(arg2))),
 								 expr->useOr ? "ANY" : "ALL");
 				get_rule_expr_paren(arg2, context, true, node);
+
+				/*
+				 * There's inherent ambiguity in "x op ANY/ALL (y)" when y is
+				 * a bare sub-SELECT.  Since we're here, the sub-SELECT must
+				 * be meant as a scalar sub-SELECT yielding an array value to
+				 * be used in ScalarArrayOpExpr; but the grammar will
+				 * preferentially interpret such a construct as an ANY/ALL
+				 * SubLink.  To prevent misparsing the output that way, insert
+				 * a dummy coercion (which will be stripped by parse analysis,
+				 * so no inefficiency is added in dump and reload).  This is
+				 * indeed most likely what the user wrote to get the construct
+				 * accepted in the first place.
+				 */
+				if (IsA(arg2, SubLink) &&
+					((SubLink *) arg2)->subLinkType == EXPR_SUBLINK)
+					appendStringInfo(buf, "::%s",
+									 format_type_with_typemod(exprType(arg2),
+														  exprTypmod(arg2)));
 				appendStringInfoChar(buf, ')');
 				if (!PRETTY_PAREN(context))
 					appendStringInfoChar(buf, ')');
@@ -7864,17 +7922,43 @@
 				if (!PRETTY_PAREN(context))
 					appendStringInfoChar(buf, '(');
 				get_rule_expr_paren((Node *) ntest->arg, context, true, node);
-				switch (ntest->nulltesttype)
+
+				/*
+				 * For scalar inputs, we prefer to print as IS [NOT] NULL,
+				 * which is shorter and traditional.  If it's a rowtype input
+				 * but we're applying a scalar test, must print IS [NOT]
+				 * DISTINCT FROM NULL to be semantically correct.
+				 */
+				if (ntest->argisrow ||
+					!type_is_rowtype(exprType((Node *) ntest->arg)))
 				{
-					case IS_NULL:
-						appendStringInfoString(buf, " IS NULL");
-						break;
-					case IS_NOT_NULL:
-						appendStringInfoString(buf, " IS NOT NULL");
-						break;
-					default:
-						elog(ERROR, "unrecognized nulltesttype: %d",
-							 (int) ntest->nulltesttype);
+					switch (ntest->nulltesttype)
+					{
+						case IS_NULL:
+							appendStringInfoString(buf, " IS NULL");
+							break;
+						case IS_NOT_NULL:
+							appendStringInfoString(buf, " IS NOT NULL");
+							break;
+						default:
+							elog(ERROR, "unrecognized nulltesttype: %d",
+								 (int) ntest->nulltesttype);
+					}
+				}
+				else
+				{
+					switch (ntest->nulltesttype)
+					{
+						case IS_NULL:
+							appendStringInfoString(buf, " IS NOT DISTINCT FROM NULL");
+							break;
+						case IS_NOT_NULL:
+							appendStringInfoString(buf, " IS DISTINCT FROM NULL");
+							break;
+						default:
+							elog(ERROR, "unrecognized nulltesttype: %d",
+								 (int) ntest->nulltesttype);
+					}
 				}
 				if (!PRETTY_PAREN(context))
 					appendStringInfoChar(buf, ')');
@@ -8048,6 +8132,63 @@
 		get_rule_expr(node, context, showimplicit);
 }
 
+/*
+ * get_rule_expr_funccall		- Parse back a function-call expression
+ *
+ * Same as get_rule_expr(), except that we guarantee that the output will
+ * look like a function call, or like one of the things the grammar treats as
+ * equivalent to a function call (see the func_expr_windowless production).
+ * This is needed in places where the grammar uses func_expr_windowless and
+ * you can't substitute a parenthesized a_expr.  If what we have isn't going
+ * to look like a function call, wrap it in a dummy CAST() expression, which
+ * will satisfy the grammar --- and, indeed, is likely what the user wrote to
+ * produce such a thing.
+ */
+static void
+get_rule_expr_funccall(Node *node, deparse_context *context,
+					   bool showimplicit)
+{
+	if (looks_like_function(node))
+		get_rule_expr(node, context, showimplicit);
+	else
+	{
+		StringInfo	buf = context->buf;
+
+		appendStringInfoString(buf, "CAST(");
+		/* no point in showing any top-level implicit cast */
+		get_rule_expr(node, context, false);
+		appendStringInfo(buf, " AS %s)",
+						 format_type_with_typemod(exprType(node),
+												  exprTypmod(node)));
+	}
+}
+
+/*
+ * Helper function to identify node types that satisfy func_expr_windowless.
+ * If in doubt, "false" is always a safe answer.
+ */
+static bool
+looks_like_function(Node *node)
+{
+	if (node == NULL)
+		return false;			/* probably shouldn't happen */
+	switch (nodeTag(node))
+	{
+		case T_FuncExpr:
+			/* OK, unless it's going to deparse as a cast */
+			return (((FuncExpr *) node)->funcformat == COERCE_EXPLICIT_CALL);
+		case T_NullIfExpr:
+		case T_CoalesceExpr:
+		case T_MinMaxExpr:
+		case T_XmlExpr:
+			/* these are all accepted by func_expr_common_subexpr */
+			return true;
+		default:
+			break;
+	}
+	return false;
+}
+
 
 /*
  * get_oper_expr			- Parse back an OpExpr node
@@ -8865,7 +9006,7 @@
 				if (list_length(rte->functions) == 1 &&
 					(rtfunc1->funccolnames == NIL || !rte->funcordinality))
 				{
-					get_rule_expr(rtfunc1->funcexpr, context, true);
+					get_rule_expr_funccall(rtfunc1->funcexpr, context, true);
 					/* we'll print the coldeflist below, if it has one */
 				}
 				else
@@ -8928,7 +9069,7 @@
 
 							if (funcno > 0)
 								appendStringInfoString(buf, ", ");
-							get_rule_expr(rtfunc->funcexpr, context, true);
+							get_rule_expr_funccall(rtfunc->funcexpr, context, true);
 							if (rtfunc->funccolnames != NIL)
 							{
 								/* Reconstruct the column definition list */
@@ -9113,6 +9254,11 @@
 			if (!PRETTY_PAREN(context))
 				appendStringInfoChar(buf, ')');
 		}
+		else if (j->jointype != JOIN_INNER)
+		{
+			/* If we didn't say CROSS JOIN above, we must provide an ON */
+			appendStringInfoString(buf, " ON TRUE");
+		}
 
 		if (!PRETTY_PAREN(context) || j->alias != NULL)
 			appendStringInfoChar(buf, ')');
@@ -9310,12 +9456,17 @@
  * We strip any top-level FieldStore or assignment ArrayRef nodes that
  * appear in the input, and return the subexpression that's to be assigned.
  * If printit is true, we also print out the appropriate decoration for the
- * base column name (that the caller just printed).
+ * base column name (that the caller just printed).  We might also need to
+ * strip CoerceToDomain nodes, but only ones that appear above assignment
+ * nodes.
+ *
+ * Returns the subexpression that's to be assigned.
  */
 static Node *
 processIndirection(Node *node, deparse_context *context, bool printit)
 {
 	StringInfo	buf = context->buf;
+	CoerceToDomain *cdomain = NULL;
 
 	for (;;)
 	{
@@ -9365,10 +9516,28 @@
 			 */
 			node = (Node *) aref->refassgnexpr;
 		}
+		else if (IsA(node, CoerceToDomain))
+		{
+			cdomain = (CoerceToDomain *) node;
+			/* If it's an explicit domain coercion, we're done */
+			if (cdomain->coercionformat != COERCE_IMPLICIT_CAST)
+				break;
+			/* Tentatively descend past the CoerceToDomain */
+			node = (Node *) cdomain->arg;
+		}
 		else
 			break;
 	}
 
+	/*
+	 * If we descended past a CoerceToDomain whose argument turned out not to
+	 * be a FieldStore or array assignment, back up to the CoerceToDomain.
+	 * (This is not enough to be fully correct if there are nested implicit
+	 * CoerceToDomains, but such cases shouldn't ever occur.)
+	 */
+	if (cdomain && node == (Node *) cdomain->arg)
+		node = (Node *) cdomain;
+
 	return node;
 }
 
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/selfuncs.c postgresql-9.5-9.5.8/src/backend/utils/adt/selfuncs.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/selfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/selfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -111,6 +111,7 @@
 #include "catalog/pg_type.h"
 #include "executor/executor.h"
 #include "mb/pg_wchar.h"
+#include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
@@ -124,6 +125,7 @@
 #include "parser/parse_clause.h"
 #include "parser/parse_coerce.h"
 #include "parser/parsetree.h"
+#include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/bytea.h"
 #include "utils/date.h"
@@ -264,6 +266,7 @@
 {
 	double		selec;
 	bool		isdefault;
+	Oid			opfuncoid;
 
 	/*
 	 * If the constant is NULL, assume operator is strict and return zero, ie,
@@ -282,7 +285,9 @@
 	if (vardata->isunique && vardata->rel && vardata->rel->tuples >= 1.0)
 		return 1.0 / vardata->rel->tuples;
 
-	if (HeapTupleIsValid(vardata->statsTuple))
+	if (HeapTupleIsValid(vardata->statsTuple) &&
+		statistic_proc_security_check(vardata,
+									  (opfuncoid = get_opcode(operator))))
 	{
 		Form_pg_statistic stats;
 		Datum	   *values;
@@ -310,7 +315,7 @@
 		{
 			FmgrInfo	eqproc;
 
-			fmgr_info(get_opcode(operator), &eqproc);
+			fmgr_info(opfuncoid, &eqproc);
 
 			for (i = 0; i < nvalues; i++)
 			{
@@ -616,6 +621,7 @@
 	sumcommon = 0.0;
 
 	if (HeapTupleIsValid(vardata->statsTuple) &&
+		statistic_proc_security_check(vardata, opproc->fn_oid) &&
 		get_attstatsslot(vardata->statsTuple,
 						 vardata->atttype, vardata->atttypmod,
 						 STATISTIC_KIND_MCV, InvalidOid,
@@ -692,6 +698,7 @@
 	Assert(min_hist_size > 2 * n_skip);
 
 	if (HeapTupleIsValid(vardata->statsTuple) &&
+		statistic_proc_security_check(vardata, opproc->fn_oid) &&
 		get_attstatsslot(vardata->statsTuple,
 						 vardata->atttype, vardata->atttypmod,
 						 STATISTIC_KIND_HISTOGRAM, InvalidOid,
@@ -769,6 +776,7 @@
 	 * the reverse way if isgt is TRUE.
 	 */
 	if (HeapTupleIsValid(vardata->statsTuple) &&
+		statistic_proc_security_check(vardata, opproc->fn_oid) &&
 		get_attstatsslot(vardata->statsTuple,
 						 vardata->atttype, vardata->atttypmod,
 						 STATISTIC_KIND_HISTOGRAM, InvalidOid,
@@ -2253,6 +2261,7 @@
 	double		nd2;
 	bool		isdefault1;
 	bool		isdefault2;
+	Oid			opfuncoid;
 	Form_pg_statistic stats1 = NULL;
 	Form_pg_statistic stats2 = NULL;
 	bool		have_mcvs1 = false;
@@ -2269,30 +2278,36 @@
 	nd1 = get_variable_numdistinct(vardata1, &isdefault1);
 	nd2 = get_variable_numdistinct(vardata2, &isdefault2);
 
+	opfuncoid = get_opcode(operator);
+
 	if (HeapTupleIsValid(vardata1->statsTuple))
 	{
+		/* note we allow use of nullfrac regardless of security check */
 		stats1 = (Form_pg_statistic) GETSTRUCT(vardata1->statsTuple);
-		have_mcvs1 = get_attstatsslot(vardata1->statsTuple,
-									  vardata1->atttype,
-									  vardata1->atttypmod,
-									  STATISTIC_KIND_MCV,
-									  InvalidOid,
-									  NULL,
-									  &values1, &nvalues1,
-									  &numbers1, &nnumbers1);
+		if (statistic_proc_security_check(vardata1, opfuncoid))
+			have_mcvs1 = get_attstatsslot(vardata1->statsTuple,
+										  vardata1->atttype,
+										  vardata1->atttypmod,
+										  STATISTIC_KIND_MCV,
+										  InvalidOid,
+										  NULL,
+										  &values1, &nvalues1,
+										  &numbers1, &nnumbers1);
 	}
 
 	if (HeapTupleIsValid(vardata2->statsTuple))
 	{
+		/* note we allow use of nullfrac regardless of security check */
 		stats2 = (Form_pg_statistic) GETSTRUCT(vardata2->statsTuple);
-		have_mcvs2 = get_attstatsslot(vardata2->statsTuple,
-									  vardata2->atttype,
-									  vardata2->atttypmod,
-									  STATISTIC_KIND_MCV,
-									  InvalidOid,
-									  NULL,
-									  &values2, &nvalues2,
-									  &numbers2, &nnumbers2);
+		if (statistic_proc_security_check(vardata2, opfuncoid))
+			have_mcvs2 = get_attstatsslot(vardata2->statsTuple,
+										  vardata2->atttype,
+										  vardata2->atttypmod,
+										  STATISTIC_KIND_MCV,
+										  InvalidOid,
+										  NULL,
+										  &values2, &nvalues2,
+										  &numbers2, &nnumbers2);
 	}
 
 	if (have_mcvs1 && have_mcvs2)
@@ -2326,7 +2341,7 @@
 		int			i,
 					nmatches;
 
-		fmgr_info(get_opcode(operator), &eqproc);
+		fmgr_info(opfuncoid, &eqproc);
 		hasmatch1 = (bool *) palloc0(nvalues1 * sizeof(bool));
 		hasmatch2 = (bool *) palloc0(nvalues2 * sizeof(bool));
 
@@ -2469,6 +2484,7 @@
  *
  * (Also used for anti join, which we are supposed to estimate the same way.)
  * Caller has ensured that vardata1 is the LHS variable.
+ * Unlike eqjoinsel_inner, we have to cope with operator being InvalidOid.
  */
 static double
 eqjoinsel_semi(Oid operator,
@@ -2480,6 +2496,7 @@
 	double		nd2;
 	bool		isdefault1;
 	bool		isdefault2;
+	Oid			opfuncoid;
 	Form_pg_statistic stats1 = NULL;
 	bool		have_mcvs1 = false;
 	Datum	   *values1 = NULL;
@@ -2495,6 +2512,8 @@
 	nd1 = get_variable_numdistinct(vardata1, &isdefault1);
 	nd2 = get_variable_numdistinct(vardata2, &isdefault2);
 
+	opfuncoid = OidIsValid(operator) ? get_opcode(operator) : InvalidOid;
+
 	/*
 	 * 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
@@ -2516,18 +2535,21 @@
 
 	if (HeapTupleIsValid(vardata1->statsTuple))
 	{
+		/* note we allow use of nullfrac regardless of security check */
 		stats1 = (Form_pg_statistic) GETSTRUCT(vardata1->statsTuple);
-		have_mcvs1 = get_attstatsslot(vardata1->statsTuple,
-									  vardata1->atttype,
-									  vardata1->atttypmod,
-									  STATISTIC_KIND_MCV,
-									  InvalidOid,
-									  NULL,
-									  &values1, &nvalues1,
-									  &numbers1, &nnumbers1);
+		if (statistic_proc_security_check(vardata1, opfuncoid))
+			have_mcvs1 = get_attstatsslot(vardata1->statsTuple,
+										  vardata1->atttype,
+										  vardata1->atttypmod,
+										  STATISTIC_KIND_MCV,
+										  InvalidOid,
+										  NULL,
+										  &values1, &nvalues1,
+										  &numbers1, &nnumbers1);
 	}
 
-	if (HeapTupleIsValid(vardata2->statsTuple))
+	if (HeapTupleIsValid(vardata2->statsTuple) &&
+		statistic_proc_security_check(vardata2, opfuncoid))
 	{
 		have_mcvs2 = get_attstatsslot(vardata2->statsTuple,
 									  vardata2->atttype,
@@ -2569,7 +2591,7 @@
 		 */
 		clamped_nvalues2 = Min(nvalues2, nd2);
 
-		fmgr_info(get_opcode(operator), &eqproc);
+		fmgr_info(opfuncoid, &eqproc);
 		hasmatch1 = (bool *) palloc0(nvalues1 * sizeof(bool));
 		hasmatch2 = (bool *) palloc0(clamped_nvalues2 * sizeof(bool));
 
@@ -4333,6 +4355,9 @@
  *		this query.  (Caution: this should be trusted for statistical
  *		purposes only, since we do not check indimmediate nor verify that
  *		the exact same definition of equality applies.)
+ *	acl_ok: TRUE if current user has permission to read the column(s)
+ *		underlying the pg_statistic entry.  This is consulted by
+ *		statistic_proc_security_check().
  *
  * Caller is responsible for doing ReleaseVariableStats() before exiting.
  */
@@ -4501,6 +4526,30 @@
 												Int16GetDatum(pos + 1),
 												BoolGetDatum(false));
 							vardata->freefunc = ReleaseSysCache;
+
+							if (HeapTupleIsValid(vardata->statsTuple))
+							{
+								/* Get index's table for permission check */
+								RangeTblEntry *rte;
+
+								rte = planner_rt_fetch(index->rel->relid, root);
+								Assert(rte->rtekind == RTE_RELATION);
+
+								/*
+								 * For simplicity, we insist on the whole
+								 * table being selectable, rather than trying
+								 * to identify which column(s) the index
+								 * depends on.
+								 */
+								vardata->acl_ok =
+									(pg_class_aclcheck(rte->relid, GetUserId(),
+												 ACL_SELECT) == ACLCHECK_OK);
+							}
+							else
+							{
+								/* suppress leakproofness checks later */
+								vardata->acl_ok = true;
+							}
 						}
 						if (vardata->statsTuple)
 							break;
@@ -4553,6 +4602,21 @@
 											  Int16GetDatum(var->varattno),
 											  BoolGetDatum(rte->inh));
 		vardata->freefunc = ReleaseSysCache;
+
+		if (HeapTupleIsValid(vardata->statsTuple))
+		{
+			/* check if user has permission to read this column */
+			vardata->acl_ok =
+				(pg_class_aclcheck(rte->relid, GetUserId(),
+								   ACL_SELECT) == ACLCHECK_OK) ||
+				(pg_attribute_aclcheck(rte->relid, var->varattno, GetUserId(),
+									   ACL_SELECT) == ACLCHECK_OK);
+		}
+		else
+		{
+			/* suppress any possible leakproofness checks later */
+			vardata->acl_ok = true;
+		}
 	}
 	else if (rte->rtekind == RTE_SUBQUERY && !rte->inh)
 	{
@@ -4670,6 +4734,30 @@
 }
 
 /*
+ * Check whether it is permitted to call func_oid passing some of the
+ * pg_statistic data in vardata.  We allow this either if the user has SELECT
+ * privileges on the table or column underlying the pg_statistic data or if
+ * the function is marked leak-proof.
+ */
+bool
+statistic_proc_security_check(VariableStatData *vardata, Oid func_oid)
+{
+	if (vardata->acl_ok)
+		return true;
+
+	if (!OidIsValid(func_oid))
+		return false;
+
+	if (get_func_leakproof(func_oid))
+		return true;
+
+	ereport(DEBUG2,
+			(errmsg_internal("not using statistics because function \"%s\" is not leak-proof",
+							 get_func_name(func_oid))));
+	return false;
+}
+
+/*
  * get_variable_numdistinct
  *	  Estimate the number of distinct values of a variable.
  *
@@ -4684,6 +4772,7 @@
 get_variable_numdistinct(VariableStatData *vardata, bool *isdefault)
 {
 	double		stadistinct;
+	double		stanullfrac = 0.0;
 	double		ntuples;
 
 	*isdefault = false;
@@ -4691,7 +4780,8 @@
 	/*
 	 * Determine the stadistinct value to use.  There are cases where we can
 	 * get an estimate even without a pg_statistic entry, or can get a better
-	 * value than is in pg_statistic.
+	 * value than is in pg_statistic.  Grab stanullfrac too if we can find it
+	 * (otherwise, assume no nulls, for lack of any better idea).
 	 */
 	if (HeapTupleIsValid(vardata->statsTuple))
 	{
@@ -4700,6 +4790,7 @@
 
 		stats = (Form_pg_statistic) GETSTRUCT(vardata->statsTuple);
 		stadistinct = stats->stadistinct;
+		stanullfrac = stats->stanullfrac;
 	}
 	else if (vardata->vartype == BOOLOID)
 	{
@@ -4723,7 +4814,7 @@
 			{
 				case ObjectIdAttributeNumber:
 				case SelfItemPointerAttributeNumber:
-					stadistinct = -1.0; /* unique */
+					stadistinct = -1.0; /* unique (and all non null) */
 					break;
 				case TableOidAttributeNumber:
 					stadistinct = 1.0;	/* only 1 value */
@@ -4745,10 +4836,11 @@
 	 * If there is a unique index or DISTINCT clause for the variable, assume
 	 * it is unique no matter what pg_statistic says; the statistics could be
 	 * out of date, or we might have found a partial unique index that proves
-	 * the var is unique for this query.
+	 * the var is unique for this query.  However, we'd better still believe
+	 * the null-fraction statistic.
 	 */
 	if (vardata->isunique)
-		stadistinct = -1.0;
+		stadistinct = -1.0 * (1.0 - stanullfrac);
 
 	/*
 	 * If we had an absolute estimate, use that.
@@ -4807,6 +4899,7 @@
 	bool		have_data = false;
 	int16		typLen;
 	bool		typByVal;
+	Oid			opfuncoid;
 	Datum	   *values;
 	int			nvalues;
 	int			i;
@@ -4829,6 +4922,17 @@
 		return false;
 	}
 
+	/*
+	 * If we can't apply the sortop to the stats data, just fail.  In
+	 * principle, if there's a histogram and no MCVs, we could return the
+	 * histogram endpoints without ever applying the sortop ... but it's
+	 * probably not worth trying, because whatever the caller wants to do with
+	 * the endpoints would likely fail the security check too.
+	 */
+	if (!statistic_proc_security_check(vardata,
+									   (opfuncoid = get_opcode(sortop))))
+		return false;
+
 	get_typlenbyval(vardata->atttype, &typLen, &typByVal);
 
 	/*
@@ -4881,7 +4985,7 @@
 		bool		tmax_is_mcv = false;
 		FmgrInfo	opproc;
 
-		fmgr_info(get_opcode(sortop), &opproc);
+		fmgr_info(opfuncoid, &opproc);
 
 		for (i = 0; i < nvalues; i++)
 		{
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/timestamp.c postgresql-9.5-9.5.8/src/backend/utils/adt/timestamp.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/timestamp.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/timestamp.c	2017-08-07 21:13:41.000000000 +0000
@@ -24,6 +24,7 @@
 #include "access/hash.h"
 #include "access/xact.h"
 #include "catalog/pg_type.h"
+#include "common/int128.h"
 #include "funcapi.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
@@ -1165,6 +1166,59 @@
 	PG_RETURN_CSTRING(res);
 }
 
+/*
+ * Given an interval typmod value, return a code for the least-significant
+ * field that the typmod allows to be nonzero, for instance given
+ * INTERVAL DAY TO HOUR we want to identify "hour".
+ *
+ * The results should be ordered by field significance, which means
+ * we can't use the dt.h macros YEAR etc, because for some odd reason
+ * they aren't ordered that way.  Instead, arbitrarily represent
+ * SECOND = 0, MINUTE = 1, HOUR = 2, DAY = 3, MONTH = 4, YEAR = 5.
+ */
+static int
+intervaltypmodleastfield(int32 typmod)
+{
+	if (typmod < 0)
+		return 0;				/* SECOND */
+
+	switch (INTERVAL_RANGE(typmod))
+	{
+		case INTERVAL_MASK(YEAR):
+			return 5;			/* YEAR */
+		case INTERVAL_MASK(MONTH):
+			return 4;			/* MONTH */
+		case INTERVAL_MASK(DAY):
+			return 3;			/* DAY */
+		case INTERVAL_MASK(HOUR):
+			return 2;			/* HOUR */
+		case INTERVAL_MASK(MINUTE):
+			return 1;			/* MINUTE */
+		case INTERVAL_MASK(SECOND):
+			return 0;			/* SECOND */
+		case INTERVAL_MASK(YEAR) | INTERVAL_MASK(MONTH):
+			return 4;			/* MONTH */
+		case INTERVAL_MASK(DAY) | INTERVAL_MASK(HOUR):
+			return 2;			/* HOUR */
+		case INTERVAL_MASK(DAY) | INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE):
+			return 1;			/* MINUTE */
+		case INTERVAL_MASK(DAY) | INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE) | INTERVAL_MASK(SECOND):
+			return 0;			/* SECOND */
+		case INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE):
+			return 1;			/* MINUTE */
+		case INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE) | INTERVAL_MASK(SECOND):
+			return 0;			/* SECOND */
+		case INTERVAL_MASK(MINUTE) | INTERVAL_MASK(SECOND):
+			return 0;			/* SECOND */
+		case INTERVAL_FULL_RANGE:
+			return 0;			/* SECOND */
+		default:
+			elog(ERROR, "invalid INTERVAL typmod: 0x%x", typmod);
+			break;
+	}
+	return 0;					/* can't get here, but keep compiler quiet */
+}
+
 
 /* interval_transform()
  * Flatten superfluous calls to interval_scale().  The interval typmod is
@@ -1186,39 +1240,39 @@
 	if (IsA(typmod, Const) &&!((Const *) typmod)->constisnull)
 	{
 		Node	   *source = (Node *) linitial(expr->args);
-		int32		old_typmod = exprTypmod(source);
 		int32		new_typmod = DatumGetInt32(((Const *) typmod)->constvalue);
-		int			old_range;
-		int			old_precis;
-		int			new_range = INTERVAL_RANGE(new_typmod);
-		int			new_precis = INTERVAL_PRECISION(new_typmod);
-		int			new_range_fls;
-		int			old_range_fls;
+		bool		noop;
 
-		if (old_typmod < 0)
-		{
-			old_range = INTERVAL_FULL_RANGE;
-			old_precis = INTERVAL_FULL_PRECISION;
-		}
+		if (new_typmod < 0)
+			noop = true;
 		else
 		{
-			old_range = INTERVAL_RANGE(old_typmod);
-			old_precis = INTERVAL_PRECISION(old_typmod);
-		}
+			int32		old_typmod = exprTypmod(source);
+			int			old_least_field;
+			int			new_least_field;
+			int			old_precis;
+			int			new_precis;
+
+			old_least_field = intervaltypmodleastfield(old_typmod);
+			new_least_field = intervaltypmodleastfield(new_typmod);
+			if (old_typmod < 0)
+				old_precis = INTERVAL_FULL_PRECISION;
+			else
+				old_precis = INTERVAL_PRECISION(old_typmod);
+			new_precis = INTERVAL_PRECISION(new_typmod);
 
-		/*
-		 * Temporally-smaller fields occupy higher positions in the range
-		 * bitmap.  Since only the temporally-smallest bit matters for length
-		 * coercion purposes, we compare the last-set bits in the ranges.
-		 * Precision, which is to say, sub-second precision, only affects
-		 * ranges that include SECOND.
-		 */
-		new_range_fls = fls(new_range);
-		old_range_fls = fls(old_range);
-		if (new_typmod < 0 ||
-			((new_range_fls >= SECOND || new_range_fls >= old_range_fls) &&
-		   (old_range_fls < SECOND || new_precis >= MAX_INTERVAL_PRECISION ||
-			new_precis >= old_precis)))
+			/*
+			 * Cast is a no-op if least field stays the same or decreases
+			 * while precision stays the same or increases.  But precision,
+			 * which is to say, sub-second precision, only affects ranges that
+			 * include SECOND.
+			 */
+			noop = (new_least_field <= old_least_field) &&
+				(old_least_field > 0 /* SECOND */ ||
+				 new_precis >= MAX_INTERVAL_PRECISION ||
+				 new_precis >= old_precis);
+		}
+		if (noop)
 			ret = relabel_to_typmod(source, new_typmod);
 	}
 
@@ -1485,12 +1539,15 @@
 	result->month = years * MONTHS_PER_YEAR + months;
 	result->day = weeks * 7 + days;
 
-	secs += hours * (double) SECS_PER_HOUR + mins * (double) SECS_PER_MINUTE;
-
 #ifdef HAVE_INT64_TIMESTAMP
-	result->time = (int64) (secs * USECS_PER_SEC);
-#else
-	result->time = secs;
+	secs = rint(secs * USECS_PER_SEC);
+	result->time = hours * ((int64) SECS_PER_HOUR * USECS_PER_SEC) +
+		mins * ((int64) SECS_PER_MINUTE * USECS_PER_SEC) +
+		(int64) secs;
+#else
+	result->time = hours * (double) SECS_PER_HOUR +
+		mins * (double) SECS_PER_MINUTE +
+		secs;
 #endif
 
 	PG_RETURN_INTERVAL_P(result);
@@ -2426,19 +2483,47 @@
 /*
  *		interval_relop	- is interval1 relop interval2
  *
- *		collate invalid interval at the end
+ * Interval comparison is based on converting interval values to a linear
+ * representation expressed in the units of the time field (microseconds,
+ * in the case of integer timestamps) with days assumed to be always 24 hours
+ * and months assumed to be always 30 days.  To avoid overflow, we need a
+ * wider-than-int64 datatype for the linear representation, so use INT128
+ * with integer timestamps.
+ *
+ * In the float8 case, our problems are not with overflow but with precision;
+ * but it's been like that since day one, so live with it.
  */
-static inline TimeOffset
+#ifdef HAVE_INT64_TIMESTAMP
+typedef INT128 IntervalOffset;
+#else
+typedef TimeOffset IntervalOffset;
+#endif
+
+static inline IntervalOffset
 interval_cmp_value(const Interval *interval)
 {
-	TimeOffset	span;
-
-	span = interval->time;
+	IntervalOffset span;
 
 #ifdef HAVE_INT64_TIMESTAMP
-	span += interval->month * INT64CONST(30) * USECS_PER_DAY;
-	span += interval->day * INT64CONST(24) * USECS_PER_HOUR;
+	int64		dayfraction;
+	int64		days;
+
+	/*
+	 * Separate time field into days and dayfraction, then add the month and
+	 * day fields to the days part.  We cannot overflow int64 days here.
+	 */
+	dayfraction = interval->time % USECS_PER_DAY;
+	days = interval->time / USECS_PER_DAY;
+	days += interval->month * INT64CONST(30);
+	days += interval->day;
+
+	/* Widen dayfraction to 128 bits */
+	span = int64_to_int128(dayfraction);
+
+	/* Scale up days to microseconds, forming a 128-bit product */
+	int128_add_int64_mul_int64(&span, days, USECS_PER_DAY);
 #else
+	span = interval->time;
 	span += interval->month * ((double) DAYS_PER_MONTH * SECS_PER_DAY);
 	span += interval->day * ((double) HOURS_PER_DAY * SECS_PER_HOUR);
 #endif
@@ -2449,10 +2534,14 @@
 static int
 interval_cmp_internal(Interval *interval1, Interval *interval2)
 {
-	TimeOffset	span1 = interval_cmp_value(interval1);
-	TimeOffset	span2 = interval_cmp_value(interval2);
+	IntervalOffset span1 = interval_cmp_value(interval1);
+	IntervalOffset span2 = interval_cmp_value(interval2);
 
+#ifdef HAVE_INT64_TIMESTAMP
+	return int128_compare(span1, span2);
+#else
 	return ((span1 < span2) ? -1 : (span1 > span2) ? 1 : 0);
+#endif
 }
 
 Datum
@@ -2529,10 +2618,20 @@
 interval_hash(PG_FUNCTION_ARGS)
 {
 	Interval   *interval = PG_GETARG_INTERVAL_P(0);
-	TimeOffset	span = interval_cmp_value(interval);
+	IntervalOffset span = interval_cmp_value(interval);
 
 #ifdef HAVE_INT64_TIMESTAMP
-	return DirectFunctionCall1(hashint8, Int64GetDatumFast(span));
+	int64		span64;
+
+	/*
+	 * Use only the least significant 64 bits for hashing.  The upper 64 bits
+	 * seldom add any useful information, and besides we must do it like this
+	 * for compatibility with hashes calculated before use of INT128 was
+	 * introduced.
+	 */
+	span64 = int128_to_int64(span);
+
+	return DirectFunctionCall1(hashint8, Int64GetDatumFast(span64));
 #else
 	return DirectFunctionCall1(hashfloat8, Float8GetDatumFast(span));
 #endif
@@ -4867,84 +4966,15 @@
 
 
 /* timestamp_zone_transform()
- * If the zone argument of a timestamp_zone() or timestamptz_zone() call is a
- * plan-time constant denoting a zone equivalent to UTC, the call will always
- * return its second argument unchanged.  Simplify the expression tree
- * accordingly.  Civil time zones almost never qualify, because jurisdictions
- * that follow UTC today have not done so continuously.
+ * The original optimization here caused problems by relabeling Vars that
+ * could be matched to index entries.  It might be possible to resurrect it
+ * at some point by teaching the planner to be less cavalier with RelabelType
+ * nodes, but that will take careful analysis.
  */
 Datum
 timestamp_zone_transform(PG_FUNCTION_ARGS)
 {
-	Node	   *func_node = (Node *) PG_GETARG_POINTER(0);
-	FuncExpr   *expr = (FuncExpr *) func_node;
-	Node	   *ret = NULL;
-	Node	   *zone_node;
-
-	Assert(IsA(expr, FuncExpr));
-	Assert(list_length(expr->args) == 2);
-
-	zone_node = (Node *) linitial(expr->args);
-
-	if (IsA(zone_node, Const) &&!((Const *) zone_node)->constisnull)
-	{
-		text	   *zone = DatumGetTextPP(((Const *) zone_node)->constvalue);
-		char		tzname[TZ_STRLEN_MAX + 1];
-		char	   *lowzone;
-		int			type,
-					abbrev_offset;
-		pg_tz	   *tzp;
-		bool		noop = false;
-
-		/*
-		 * If the timezone is forever UTC+0, the FuncExpr function call is a
-		 * no-op for all possible timestamps.  This passage mirrors code in
-		 * timestamp_zone().
-		 */
-		text_to_cstring_buffer(zone, tzname, sizeof(tzname));
-		lowzone = downcase_truncate_identifier(tzname,
-											   strlen(tzname),
-											   false);
-		type = DecodeTimezoneAbbrev(0, lowzone, &abbrev_offset, &tzp);
-		if (type == TZ || type == DTZ)
-			noop = (abbrev_offset == 0);
-		else if (type == DYNTZ)
-		{
-			/*
-			 * An abbreviation of a single-offset timezone ought not to be
-			 * configured as a DYNTZ, so don't bother checking.
-			 */
-		}
-		else
-		{
-			long		tzname_offset;
-
-			tzp = pg_tzset(tzname);
-			if (tzp && pg_get_timezone_offset(tzp, &tzname_offset))
-				noop = (tzname_offset == 0);
-		}
-
-		if (noop)
-		{
-			Node	   *timestamp = (Node *) lsecond(expr->args);
-
-			/* Strip any existing RelabelType node(s) */
-			while (timestamp && IsA(timestamp, RelabelType))
-				timestamp = (Node *) ((RelabelType *) timestamp)->arg;
-
-			/*
-			 * Replace the FuncExpr with its timestamp argument, relabeled as
-			 * though the function call had computed it.
-			 */
-			ret = (Node *) makeRelabelType((Expr *) timestamp,
-										   exprType(func_node),
-										   exprTypmod(func_node),
-										   exprCollation(func_node),
-										   COERCE_EXPLICIT_CAST);
-		}
-	}
-
-	PG_RETURN_POINTER(ret);
+	PG_RETURN_POINTER(NULL);
 }
 
 /*	timestamp_zone()
@@ -5037,49 +5067,15 @@
 }
 
 /* timestamp_izone_transform()
- * If we deduce at plan time that a particular timestamp_izone() or
- * timestamptz_izone() call can only compute tz=0, the call will always return
- * its second argument unchanged.  Simplify the expression tree accordingly.
+ * The original optimization here caused problems by relabeling Vars that
+ * could be matched to index entries.  It might be possible to resurrect it
+ * at some point by teaching the planner to be less cavalier with RelabelType
+ * nodes, but that will take careful analysis.
  */
 Datum
 timestamp_izone_transform(PG_FUNCTION_ARGS)
 {
-	Node	   *func_node = (Node *) PG_GETARG_POINTER(0);
-	FuncExpr   *expr = (FuncExpr *) func_node;
-	Node	   *ret = NULL;
-	Node	   *zone_node;
-
-	Assert(IsA(expr, FuncExpr));
-	Assert(list_length(expr->args) == 2);
-
-	zone_node = (Node *) linitial(expr->args);
-
-	if (IsA(zone_node, Const) &&!((Const *) zone_node)->constisnull)
-	{
-		Interval   *zone;
-
-		zone = DatumGetIntervalP(((Const *) zone_node)->constvalue);
-		if (zone->month == 0 && zone->day == 0 && zone->time == 0)
-		{
-			Node	   *timestamp = (Node *) lsecond(expr->args);
-
-			/* Strip any existing RelabelType node(s) */
-			while (timestamp && IsA(timestamp, RelabelType))
-				timestamp = (Node *) ((RelabelType *) timestamp)->arg;
-
-			/*
-			 * Replace the FuncExpr with its timestamp argument, relabeled as
-			 * though the function call had computed it.
-			 */
-			ret = (Node *) makeRelabelType((Expr *) timestamp,
-										   exprType(func_node),
-										   exprTypmod(func_node),
-										   exprCollation(func_node),
-										   COERCE_EXPLICIT_CAST);
-		}
-	}
-
-	PG_RETURN_POINTER(ret);
+	PG_RETURN_POINTER(NULL);
 }
 
 /* timestamp_izone()
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/tsquery_rewrite.c postgresql-9.5-9.5.8/src/backend/utils/adt/tsquery_rewrite.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/tsquery_rewrite.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/tsquery_rewrite.c	2017-08-07 21:13:41.000000000 +0000
@@ -21,47 +21,43 @@
 #include "utils/builtins.h"
 
 
-static int
-addone(int *counters, int last, int total)
-{
-	/* since this function recurses, it could be driven to stack overflow. */
-	check_stack_depth();
-
-	counters[last]++;
-	if (counters[last] >= total)
-	{
-		if (last == 0)
-			return 0;
-		if (addone(counters, last - 1, total - 1) == 0)
-			return 0;
-		counters[last] = counters[last - 1] + 1;
-	}
-	return 1;
-}
-
 /*
- * If node is equal to ex, replace it with subs. Replacement is actually done
- * by returning either node or a copy of subs.
+ * If "node" is equal to "ex", return a copy of "subs" instead.
+ * If "ex" matches a subset of node's children, return a modified version
+ * of "node" in which those children are replaced with a copy of "subs".
+ * Otherwise return "node" unmodified.
+ *
+ * The QTN_NOCHANGE bit is set in successfully modified nodes, so that
+ * we won't uselessly recurse into them.
+ * Also, set *isfind true if we make a replacement.
  */
 static QTNode *
 findeq(QTNode *node, QTNode *ex, QTNode *subs, bool *isfind)
 {
+	/* Can't match unless signature matches and node type matches. */
 	if ((node->sign & ex->sign) != ex->sign ||
 		node->valnode->type != ex->valnode->type)
 		return node;
 
+	/* Ignore nodes marked NOCHANGE, too. */
 	if (node->flags & QTN_NOCHANGE)
 		return node;
 
 	if (node->valnode->type == QI_OPR)
 	{
+		/* Must be same operator. */
 		if (node->valnode->qoperator.oper != ex->valnode->qoperator.oper)
 			return node;
 
 		if (node->nchild == ex->nchild)
 		{
+			/*
+			 * Simple case: when same number of children, match if equal.
+			 * (This is reliable when the children were sorted earlier.)
+			 */
 			if (QTNEq(node, ex))
 			{
+				/* Match; delete node and return a copy of subs instead. */
 				QTNFree(node);
 				if (subs)
 				{
@@ -73,79 +69,98 @@
 				*isfind = true;
 			}
 		}
-		else if (node->nchild > ex->nchild)
+		else if (node->nchild > ex->nchild && ex->nchild > 0)
 		{
 			/*
-			 * AND and NOT are commutative, so we check if a subset of the
-			 * children match. For example, if tnode is A | B | C, and ex is B
-			 * | C, we have a match after we convert tnode to A | (B | C).
+			 * AND and OR are commutative/associative, so we should check if a
+			 * subset of the children match.  For example, if node is A|B|C,
+			 * and ex is B|C, we have a match after we notionally convert node
+			 * to A|(B|C).  This does not work for NOT or PHRASE nodes, but we
+			 * can't get here for those node types because they have a fixed
+			 * number of children.
+			 *
+			 * Because we expect that the children are sorted, it suffices to
+			 * make one pass through the two lists to find the matches.
 			 */
-			int		   *counters = (int *) palloc(sizeof(int) * node->nchild);
-			int			i;
-			QTNode	   *tnode = (QTNode *) palloc(sizeof(QTNode));
-
-			memset(tnode, 0, sizeof(QTNode));
-			tnode->child = (QTNode **) palloc(sizeof(QTNode *) * ex->nchild);
-			tnode->nchild = ex->nchild;
-			tnode->valnode = (QueryItem *) palloc(sizeof(QueryItem));
-			*(tnode->valnode) = *(ex->valnode);
-
-			for (i = 0; i < ex->nchild; i++)
-				counters[i] = i;
-
-			do
+			bool	   *matched;
+			int			nmatched;
+			int			i,
+						j;
+
+			/* Assert that the subset rule is OK */
+			Assert(node->valnode->qoperator.oper == OP_AND ||
+				   node->valnode->qoperator.oper == OP_OR);
+
+			/* matched[] will record which children of node matched */
+			matched = (bool *) palloc0(node->nchild * sizeof(bool));
+			nmatched = 0;
+			i = j = 0;
+			while (i < node->nchild && j < ex->nchild)
 			{
-				tnode->sign = 0;
-				for (i = 0; i < ex->nchild; i++)
+				int			cmp = QTNodeCompare(node->child[i], ex->child[j]);
+
+				if (cmp == 0)
 				{
-					tnode->child[i] = node->child[counters[i]];
-					tnode->sign |= tnode->child[i]->sign;
+					/* match! */
+					matched[i] = true;
+					nmatched++;
+					i++, j++;
 				}
-
-				if (QTNEq(tnode, ex))
+				else if (cmp < 0)
 				{
-					int			j = 0;
+					/* node->child[i] has no match, ignore it */
+					i++;
+				}
+				else
+				{
+					/* ex->child[j] has no match; we can give up immediately */
+					break;
+				}
+			}
 
-					pfree(tnode->valnode);
-					pfree(tnode->child);
-					pfree(tnode);
-					if (subs)
-					{
-						tnode = QTNCopy(subs);
-						tnode->flags = QTN_NOCHANGE | QTN_NEEDFREE;
-					}
+			if (nmatched == ex->nchild)
+			{
+				/* collapse out the matched children of node */
+				j = 0;
+				for (i = 0; i < node->nchild; i++)
+				{
+					if (matched[i])
+						QTNFree(node->child[i]);
 					else
-						tnode = NULL;
-
-					node->child[counters[0]] = tnode;
+						node->child[j++] = node->child[i];
+				}
 
-					for (i = 1; i < ex->nchild; i++)
-						node->child[counters[i]] = NULL;
-					for (i = 0; i < node->nchild; i++)
-					{
-						if (node->child[i])
-						{
-							node->child[j] = node->child[i];
-							j++;
-						}
-					}
+				/* and instead insert a copy of subs */
+				if (subs)
+				{
+					subs = QTNCopy(subs);
+					subs->flags |= QTN_NOCHANGE;
+					node->child[j++] = subs;
+				}
 
-					node->nchild = j;
+				node->nchild = j;
 
-					*isfind = true;
+				/*
+				 * At this point we might have a node with zero or one child,
+				 * which should be simplified.  But we leave it to our caller
+				 * (dofindsubquery) to take care of that.
+				 */
+
+				/*
+				 * Re-sort the node to put new child in the right place.  This
+				 * is a bit bogus, because it won't matter for findsubquery's
+				 * remaining processing, and it's insufficient to prepare the
+				 * tree for another search (we would need to re-flatten as
+				 * well, and we don't want to do that because we'd lose the
+				 * QTN_NOCHANGE marking on the new child).  But it's needed to
+				 * keep the results the same as the regression tests expect.
+				 */
+				QTNSort(node);
 
-					break;
-				}
-			} while (addone(counters, ex->nchild - 1, node->nchild));
-			if (tnode && (tnode->flags & QTN_NOCHANGE) == 0)
-			{
-				pfree(tnode->valnode);
-				pfree(tnode->child);
-				pfree(tnode);
+				*isfind = true;
 			}
-			else
-				QTNSort(node);
-			pfree(counters);
+
+			pfree(matched);
 		}
 	}
 	else
@@ -173,47 +188,56 @@
 	return node;
 }
 
+/*
+ * Recursive guts of findsubquery(): attempt to replace "ex" with "subs"
+ * at the root node, and if we failed to do so, recursively match against
+ * child nodes.
+ *
+ * Delete any void subtrees resulting from the replacement.
+ * In the following example '5' is replaced by empty operand:
+ *
+ *	  AND		->	  6
+ *	 /	 \
+ *	5	 OR
+ *		/  \
+ *	   6	5
+ */
 static QTNode *
 dofindsubquery(QTNode *root, QTNode *ex, QTNode *subs, bool *isfind)
 {
 	/* since this function recurses, it could be driven to stack overflow. */
 	check_stack_depth();
 
-	root = findeq(root, ex, subs, isfind);
+	/* also, since it's a bit expensive, let's check for query cancel. */
+	CHECK_FOR_INTERRUPTS();
 
-	if (root && (root->flags & QTN_NOCHANGE) == 0 && root->valnode->type == QI_OPR)
-	{
-		int			i;
-
-		for (i = 0; i < root->nchild; i++)
-			root->child[i] = dofindsubquery(root->child[i], ex, subs, isfind);
-	}
-
-	return root;
-}
-
-static QTNode *
-dropvoidsubtree(QTNode *root)
-{
-	if (!root)
-		return NULL;
+	/* match at the node itself */
+	root = findeq(root, ex, subs, isfind);
 
-	if (root->valnode->type == QI_OPR)
+	/* unless we matched here, consider matches at child nodes */
+	if (root && (root->flags & QTN_NOCHANGE) == 0 &&
+		root->valnode->type == QI_OPR)
 	{
 		int			i,
 					j = 0;
 
+		/*
+		 * Any subtrees that are replaced by NULL must be dropped from the
+		 * tree.
+		 */
 		for (i = 0; i < root->nchild; i++)
 		{
-			if (root->child[i])
-			{
-				root->child[j] = root->child[i];
+			root->child[j] = dofindsubquery(root->child[i], ex, subs, isfind);
+			if (root->child[j])
 				j++;
-			}
 		}
 
 		root->nchild = j;
 
+		/*
+		 * If we have just zero or one remaining child node, simplify out this
+		 * operator node.
+		 */
 		if (root->nchild == 0)
 		{
 			QTNFree(root);
@@ -231,6 +255,14 @@
 	return root;
 }
 
+/*
+ * Substitute "subs" for "ex" throughout the QTNode tree at root.
+ *
+ * If isfind isn't NULL, set *isfind to show whether we made any substitution.
+ *
+ * Both "root" and "ex" must have been through QTNTernary and QTNSort
+ * to ensure reliable matching.
+ */
 QTNode *
 findsubquery(QTNode *root, QTNode *ex, QTNode *subs, bool *isfind)
 {
@@ -238,9 +270,6 @@
 
 	root = dofindsubquery(root, ex, subs, &DidFind);
 
-	if (!subs && DidFind)
-		root = dropvoidsubtree(root);
-
 	if (isfind)
 		*isfind = DidFind;
 
@@ -343,6 +372,7 @@
 				{
 					/* ready the tree for another pass */
 					QTNClearFlags(tree, QTN_NOCHANGE);
+					QTNTernary(tree);
 					QTNSort(tree);
 				}
 			}
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/tsquery_util.c postgresql-9.5-9.5.8/src/backend/utils/adt/tsquery_util.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/tsquery_util.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/tsquery_util.c	2017-08-07 21:13:41.000000000 +0000
@@ -17,6 +17,9 @@
 #include "tsearch/ts_utils.h"
 #include "miscadmin.h"
 
+/*
+ * Build QTNode tree for a tsquery given in QueryItem array format.
+ */
 QTNode *
 QT2QTN(QueryItem *in, char *operand)
 {
@@ -50,6 +53,12 @@
 	return node;
 }
 
+/*
+ * Free a QTNode tree.
+ *
+ * Referenced "word" and "valnode" items are freed if marked as transient
+ * by flags.
+ */
 void
 QTNFree(QTNode *in)
 {
@@ -62,26 +71,27 @@
 	if (in->valnode->type == QI_VAL && in->word && (in->flags & QTN_WORDFREE) != 0)
 		pfree(in->word);
 
-	if (in->child)
+	if (in->valnode->type == QI_OPR)
 	{
-		if (in->valnode)
-		{
-			if (in->valnode->type == QI_OPR && in->nchild > 0)
-			{
-				int			i;
-
-				for (i = 0; i < in->nchild; i++)
-					QTNFree(in->child[i]);
-			}
-			if (in->flags & QTN_NEEDFREE)
-				pfree(in->valnode);
-		}
-		pfree(in->child);
+		int			i;
+
+		for (i = 0; i < in->nchild; i++)
+			QTNFree(in->child[i]);
 	}
+	if (in->child)
+		pfree(in->child);
+
+	if (in->flags & QTN_NEEDFREE)
+		pfree(in->valnode);
 
 	pfree(in);
 }
 
+/*
+ * Sort comparator for QTNodes.
+ *
+ * The sort order is somewhat arbitrary.
+ */
 int
 QTNodeCompare(QTNode *an, QTNode *bn)
 {
@@ -131,12 +141,19 @@
 	}
 }
 
+/*
+ * qsort comparator for QTNode pointers.
+ */
 static int
 cmpQTN(const void *a, const void *b)
 {
 	return QTNodeCompare(*(QTNode *const *) a, *(QTNode *const *) b);
 }
 
+/*
+ * Canonicalize a QTNode tree by sorting the children of AND/OR nodes
+ * into an arbitrary but well-defined order.
+ */
 void
 QTNSort(QTNode *in)
 {
@@ -154,13 +171,16 @@
 		qsort((void *) in->child, in->nchild, sizeof(QTNode *), cmpQTN);
 }
 
+/*
+ * Are two QTNode trees equal according to QTNodeCompare?
+ */
 bool
 QTNEq(QTNode *a, QTNode *b)
 {
 	uint32		sign = a->sign & b->sign;
 
 	if (!(sign == a->sign && sign == b->sign))
-		return 0;
+		return false;
 
 	return (QTNodeCompare(a, b) == 0) ? true : false;
 }
@@ -186,11 +206,17 @@
 	for (i = 0; i < in->nchild; i++)
 		QTNTernary(in->child[i]);
 
+	/* Only AND and OR are associative, so don't flatten other node types */
+	if (in->valnode->qoperator.oper != OP_AND &&
+		in->valnode->qoperator.oper != OP_OR)
+		return;
+
 	for (i = 0; i < in->nchild; i++)
 	{
 		QTNode	   *cc = in->child[i];
 
-		if (cc->valnode->type == QI_OPR && in->valnode->qoperator.oper == cc->valnode->qoperator.oper)
+		if (cc->valnode->type == QI_OPR &&
+			in->valnode->qoperator.oper == cc->valnode->qoperator.oper)
 		{
 			int			oldnchild = in->nchild;
 
@@ -229,9 +255,6 @@
 	for (i = 0; i < in->nchild; i++)
 		QTNBinary(in->child[i]);
 
-	if (in->nchild <= 2)
-		return;
-
 	while (in->nchild > 2)
 	{
 		QTNode	   *nn = (QTNode *) palloc0(sizeof(QTNode));
@@ -256,8 +279,9 @@
 }
 
 /*
- * Count the total length of operand string in tree, including '\0'-
- * terminators.
+ * Count the total length of operand strings in tree (including '\0'-
+ * terminators) and the total number of nodes.
+ * Caller must initialize *sumlen and *nnode to zeroes.
  */
 static void
 cntsize(QTNode *in, int *sumlen, int *nnode)
@@ -286,6 +310,10 @@
 	char	   *curoperand;
 } QTN2QTState;
 
+/*
+ * Recursively convert a QTNode tree into flat tsquery format.
+ * Caller must have allocated arrays of the correct size.
+ */
 static void
 fillQT(QTN2QTState *state, QTNode *in)
 {
@@ -323,6 +351,9 @@
 	}
 }
 
+/*
+ * Build flat tsquery from a QTNode tree.
+ */
 TSQuery
 QTN2QT(QTNode *in)
 {
@@ -351,6 +382,11 @@
 	return out;
 }
 
+/*
+ * Copy a QTNode tree.
+ *
+ * Modifiable copies of the words and valnodes are made, too.
+ */
 QTNode *
 QTNCopy(QTNode *in)
 {
@@ -386,6 +422,9 @@
 	return out;
 }
 
+/*
+ * Clear the specified flag bit(s) in all nodes of a QTNode tree.
+ */
 void
 QTNClearFlags(QTNode *in, uint32 flags)
 {
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/tsrank.c postgresql-9.5-9.5.8/src/backend/utils/adt/tsrank.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/tsrank.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/tsrank.c	2017-08-07 21:13:41.000000000 +0000
@@ -785,7 +785,7 @@
 
 		/*
 		 * if doc are big enough then ext.q may be equal to ext.p due to limit
-		 * of posional information. In this case we approximate number of
+		 * of positional information. In this case we approximate number of
 		 * noise word as half cover's length
 		 */
 		nNoise = (ext.q - ext.p) - (ext.end - ext.begin);
@@ -794,7 +794,7 @@
 		Wdoc += Cpos / ((double) (1 + nNoise));
 
 		CurExtPos = ((double) (ext.q + ext.p)) / 2.0;
-		if (NExtent > 0 && CurExtPos > PrevExtPos		/* prevent devision by
+		if (NExtent > 0 && CurExtPos > PrevExtPos		/* prevent division by
 														 * zero in a case of
 				multiple lexize */ )
 			SumDist += 1.0 / (CurExtPos - PrevExtPos);
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/tsvector_op.c postgresql-9.5-9.5.8/src/backend/utils/adt/tsvector_op.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/tsvector_op.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/tsvector_op.c	2017-08-07 21:13:41.000000000 +0000
@@ -784,7 +784,8 @@
 	CHKVAL		chkval;
 	bool		result;
 
-	if (!val->size || !query->size)
+	/* empty query matches nothing */
+	if (!query->size)
 	{
 		PG_FREE_IF_COPY(val, 0);
 		PG_FREE_IF_COPY(query, 1);
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/varbit.c postgresql-9.5-9.5.8/src/backend/utils/adt/varbit.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/varbit.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/varbit.c	2017-08-07 21:13:41.000000000 +0000
@@ -305,7 +305,7 @@
 	bits8		mask;
 
 	bitlen = pq_getmsgint(buf, sizeof(int32));
-	if (bitlen < 0)
+	if (bitlen < 0 || bitlen > VARBITMAXLEN)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_BINARY_REPRESENTATION),
 				 errmsg("invalid length in external bit string")));
@@ -368,7 +368,7 @@
 	bits8		mask;
 
 	/* No work if typmod is invalid or supplied data matches it already */
-	if (len <= 0 || len == VARBITLEN(arg))
+	if (len <= 0 || len > VARBITMAXLEN || len == VARBITLEN(arg))
 		PG_RETURN_VARBIT_P(arg);
 
 	if (!isExplicit)
@@ -621,7 +621,7 @@
 	bits8		mask;
 
 	bitlen = pq_getmsgint(buf, sizeof(int32));
-	if (bitlen < 0)
+	if (bitlen < 0 || bitlen > VARBITMAXLEN)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_BINARY_REPRESENTATION),
 				 errmsg("invalid length in external bit string")));
@@ -1387,9 +1387,14 @@
 
 	/* Negative shift is a shift to the right */
 	if (shft < 0)
+	{
+		/* Prevent integer overflow in negation */
+		if (shft < -VARBITMAXLEN)
+			shft = -VARBITMAXLEN;
 		PG_RETURN_DATUM(DirectFunctionCall2(bitshiftright,
 											VarBitPGetDatum(arg),
 											Int32GetDatum(-shft)));
+	}
 
 	result = (VarBit *) palloc(VARSIZE(arg));
 	SET_VARSIZE(result, VARSIZE(arg));
@@ -1447,9 +1452,14 @@
 
 	/* Negative shift is a shift to the left */
 	if (shft < 0)
+	{
+		/* Prevent integer overflow in negation */
+		if (shft < -VARBITMAXLEN)
+			shft = -VARBITMAXLEN;
 		PG_RETURN_DATUM(DirectFunctionCall2(bitshiftleft,
 											VarBitPGetDatum(arg),
 											Int32GetDatum(-shft)));
+	}
 
 	result = (VarBit *) palloc(VARSIZE(arg));
 	SET_VARSIZE(result, VARSIZE(arg));
@@ -1507,7 +1517,7 @@
 	int			destbitsleft,
 				srcbitsleft;
 
-	if (typmod <= 0)
+	if (typmod <= 0 || typmod > VARBITMAXLEN)
 		typmod = 1;				/* default bit length */
 
 	rlen = VARBITTOTALLEN(typmod);
@@ -1587,7 +1597,7 @@
 	int			destbitsleft,
 				srcbitsleft;
 
-	if (typmod <= 0)
+	if (typmod <= 0 || typmod > VARBITMAXLEN)
 		typmod = 1;				/* default bit length */
 
 	rlen = VARBITTOTALLEN(typmod);
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/varlena.c postgresql-9.5-9.5.8/src/backend/utils/adt/varlena.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/varlena.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/varlena.c	2017-08-07 21:13:41.000000000 +0000
@@ -2921,7 +2921,7 @@
 
 	*namelist = NIL;
 
-	while (isspace((unsigned char) *nextp))
+	while (scanner_isspace(*nextp))
 		nextp++;				/* skip leading whitespace */
 
 	if (*nextp == '\0')
@@ -2959,7 +2959,7 @@
 
 			curname = nextp;
 			while (*nextp && *nextp != separator &&
-				   !isspace((unsigned char) *nextp))
+				   !scanner_isspace(*nextp))
 				nextp++;
 			endp = nextp;
 			if (curname == nextp)
@@ -2981,13 +2981,13 @@
 			pfree(downname);
 		}
 
-		while (isspace((unsigned char) *nextp))
+		while (scanner_isspace(*nextp))
 			nextp++;			/* skip trailing whitespace */
 
 		if (*nextp == separator)
 		{
 			nextp++;
-			while (isspace((unsigned char) *nextp))
+			while (scanner_isspace(*nextp))
 				nextp++;		/* skip leading whitespace for next */
 			/* we expect another name, so done remains false */
 		}
@@ -3046,7 +3046,7 @@
 
 	*namelist = NIL;
 
-	while (isspace((unsigned char) *nextp))
+	while (scanner_isspace(*nextp))
 		nextp++;				/* skip leading whitespace */
 
 	if (*nextp == '\0')
@@ -3083,7 +3083,7 @@
 			while (*nextp && *nextp != separator)
 			{
 				/* trailing whitespace should not be included in name */
-				if (!isspace((unsigned char) *nextp))
+				if (!scanner_isspace(*nextp))
 					endp = nextp + 1;
 				nextp++;
 			}
@@ -3091,13 +3091,13 @@
 				return false;	/* empty unquoted name not allowed */
 		}
 
-		while (isspace((unsigned char) *nextp))
+		while (scanner_isspace(*nextp))
 			nextp++;			/* skip trailing whitespace */
 
 		if (*nextp == separator)
 		{
 			nextp++;
-			while (isspace((unsigned char) *nextp))
+			while (scanner_isspace(*nextp))
 				nextp++;		/* skip leading whitespace for next */
 			/* we expect another name, so done remains false */
 		}
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/windowfuncs.c postgresql-9.5-9.5.8/src/backend/utils/adt/windowfuncs.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/windowfuncs.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/windowfuncs.c	2017-08-07 21:13:41.000000000 +0000
@@ -342,7 +342,7 @@
 
 /*
  * lag_with_offset
- * returns the value of VE evelulated on a row that is OFFSET
+ * returns the value of VE evaluated on a row that is OFFSET
  * rows before the current row within a partition,
  * per spec.
  */
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/xid.c postgresql-9.5-9.5.8/src/backend/utils/adt/xid.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/xid.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/xid.c	2017-08-07 21:13:41.000000000 +0000
@@ -41,13 +41,10 @@
 xidout(PG_FUNCTION_ARGS)
 {
 	TransactionId transactionId = PG_GETARG_TRANSACTIONID(0);
+	char	   *result = (char *) palloc(16);
 
-	/* maximum 32 bit unsigned integer representation takes 10 chars */
-	char	   *str = palloc(11);
-
-	snprintf(str, 11, "%lu", (unsigned long) transactionId);
-
-	PG_RETURN_CSTRING(str);
+	snprintf(result, 16, "%lu", (unsigned long) transactionId);
+	PG_RETURN_CSTRING(result);
 }
 
 /*
@@ -148,12 +145,9 @@
 Datum
 cidin(PG_FUNCTION_ARGS)
 {
-	char	   *s = PG_GETARG_CSTRING(0);
-	CommandId	c;
-
-	c = atoi(s);
+	char	   *str = PG_GETARG_CSTRING(0);
 
-	PG_RETURN_COMMANDID(c);
+	PG_RETURN_COMMANDID((CommandId) strtoul(str, NULL, 0));
 }
 
 /*
@@ -165,7 +159,7 @@
 	CommandId	c = PG_GETARG_COMMANDID(0);
 	char	   *result = (char *) palloc(16);
 
-	snprintf(result, 16, "%u", (unsigned int) c);
+	snprintf(result, 16, "%lu", (unsigned long) c);
 	PG_RETURN_CSTRING(result);
 }
 
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/adt/xml.c postgresql-9.5-9.5.8/src/backend/utils/adt/xml.c
--- postgresql-9.5-9.5.2/src/backend/utils/adt/xml.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/adt/xml.c	2017-08-07 21:13:41.000000000 +0000
@@ -147,6 +147,10 @@
 					   PgXmlErrorContext *xmlerrcxt);
 #endif   /* USE_LIBXML */
 
+static void xmldata_root_element_start(StringInfo result, const char *eltname,
+						   const char *xmlschema, const char *targetns,
+						   bool top_level);
+static void xmldata_root_element_end(StringInfo result, const char *eltname);
 static StringInfo query_to_xml_internal(const char *query, char *tablename,
 					  const char *xmlschema, bool nulls, bool tableforest,
 					  const char *targetns, bool top_level);
@@ -2383,6 +2387,12 @@
 
 	initStringInfo(&result);
 
+	if (!tableforest)
+	{
+		xmldata_root_element_start(&result, "table", NULL, targetns, true);
+		appendStringInfoChar(&result, '\n');
+	}
+
 	SPI_connect();
 	portal = SPI_cursor_find(name);
 	if (portal == NULL)
@@ -2397,6 +2407,9 @@
 
 	SPI_finish();
 
+	if (!tableforest)
+		xmldata_root_element_end(&result, "table");
+
 	PG_RETURN_XML_P(stringinfo_to_xmltype(&result));
 }
 
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/cache/catcache.c postgresql-9.5-9.5.8/src/backend/utils/cache/catcache.c
--- postgresql-9.5-9.5.2/src/backend/utils/cache/catcache.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/cache/catcache.c	2017-08-07 21:13:41.000000000 +0000
@@ -427,7 +427,7 @@
 
 
 /*
- *	CatalogCacheIdInvalidate
+ *	CatCacheInvalidate
  *
  *	Invalidate entries in the specified cache, given a hash value.
  *
@@ -445,71 +445,57 @@
  *	This routine is only quasi-public: it should only be used by inval.c.
  */
 void
-CatalogCacheIdInvalidate(int cacheId, uint32 hashValue)
+CatCacheInvalidate(CatCache *cache, uint32 hashValue)
 {
-	slist_iter	cache_iter;
+	Index		hashIndex;
+	dlist_mutable_iter iter;
 
-	CACHE1_elog(DEBUG2, "CatalogCacheIdInvalidate: called");
+	CACHE1_elog(DEBUG2, "CatCacheInvalidate: called");
 
 	/*
-	 * inspect caches to find the proper cache
+	 * We don't bother to check whether the cache has finished initialization
+	 * yet; if not, there will be no entries in it so no problem.
 	 */
-	slist_foreach(cache_iter, &CacheHdr->ch_caches)
-	{
-		CatCache   *ccp = slist_container(CatCache, cc_next, cache_iter.cur);
-		Index		hashIndex;
-		dlist_mutable_iter iter;
-
-		if (cacheId != ccp->id)
-			continue;
 
-		/*
-		 * We don't bother to check whether the cache has finished
-		 * initialization yet; if not, there will be no entries in it so no
-		 * problem.
-		 */
+	/*
+	 * Invalidate *all* CatCLists in this cache; it's too hard to tell which
+	 * searches might still be correct, so just zap 'em all.
+	 */
+	dlist_foreach_modify(iter, &cache->cc_lists)
+	{
+		CatCList   *cl = dlist_container(CatCList, cache_elem, iter.cur);
 
-		/*
-		 * Invalidate *all* CatCLists in this cache; it's too hard to tell
-		 * which searches might still be correct, so just zap 'em all.
-		 */
-		dlist_foreach_modify(iter, &ccp->cc_lists)
-		{
-			CatCList   *cl = dlist_container(CatCList, cache_elem, iter.cur);
+		if (cl->refcount > 0)
+			cl->dead = true;
+		else
+			CatCacheRemoveCList(cache, cl);
+	}
 
-			if (cl->refcount > 0)
-				cl->dead = true;
-			else
-				CatCacheRemoveCList(ccp, cl);
-		}
+	/*
+	 * inspect the proper hash bucket for tuple matches
+	 */
+	hashIndex = HASH_INDEX(hashValue, cache->cc_nbuckets);
+	dlist_foreach_modify(iter, &cache->cc_bucket[hashIndex])
+	{
+		CatCTup    *ct = dlist_container(CatCTup, cache_elem, iter.cur);
 
-		/*
-		 * inspect the proper hash bucket for tuple matches
-		 */
-		hashIndex = HASH_INDEX(hashValue, ccp->cc_nbuckets);
-		dlist_foreach_modify(iter, &ccp->cc_bucket[hashIndex])
+		if (hashValue == ct->hash_value)
 		{
-			CatCTup    *ct = dlist_container(CatCTup, cache_elem, iter.cur);
-
-			if (hashValue == ct->hash_value)
+			if (ct->refcount > 0 ||
+				(ct->c_list && ct->c_list->refcount > 0))
 			{
-				if (ct->refcount > 0 ||
-					(ct->c_list && ct->c_list->refcount > 0))
-				{
-					ct->dead = true;
-					/* list, if any, was marked dead above */
-					Assert(ct->c_list == NULL || ct->c_list->dead);
-				}
-				else
-					CatCacheRemoveCTup(ccp, ct);
-				CACHE1_elog(DEBUG2, "CatalogCacheIdInvalidate: invalidated");
+				ct->dead = true;
+				/* list, if any, was marked dead above */
+				Assert(ct->c_list == NULL || ct->c_list->dead);
+			}
+			else
+				CatCacheRemoveCTup(cache, ct);
+			CACHE1_elog(DEBUG2, "CatCacheInvalidate: invalidated");
 #ifdef CATCACHE_STATS
-				ccp->cc_invals++;
+			cache->cc_invals++;
 #endif
-				/* could be multiple matches, so keep looking! */
-			}
+			/* could be multiple matches, so keep looking! */
 		}
-		break;					/* need only search this one cache */
 	}
 }
 
@@ -1830,7 +1816,7 @@
  *	the specified relation, find all catcaches it could be in, compute the
  *	correct hash value for each such catcache, and call the specified
  *	function to record the cache id and hash value in inval.c's lists.
- *	CatalogCacheIdInvalidate will be called later, if appropriate,
+ *	SysCacheInvalidate will be called later, if appropriate,
  *	using the recorded information.
  *
  *	For an insert or delete, tuple is the target tuple and newtuple is NULL.
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/cache/inval.c postgresql-9.5-9.5.8/src/backend/utils/cache/inval.c
--- postgresql-9.5-9.5.2/src/backend/utils/cache/inval.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/cache/inval.c	2017-08-07 21:13:41.000000000 +0000
@@ -175,19 +175,27 @@
 
 /*
  * Dynamically-registered callback functions.  Current implementation
- * assumes there won't be very many of these at once; could improve if needed.
+ * assumes there won't be enough of these to justify a dynamically resizable
+ * array; it'd be easy to improve that if needed.
+ *
+ * To avoid searching in CallSyscacheCallbacks, all callbacks for a given
+ * syscache are linked into a list pointed to by syscache_callback_links[id].
+ * The link values are syscache_callback_list[] index plus 1, or 0 for none.
  */
 
-#define MAX_SYSCACHE_CALLBACKS 32
+#define MAX_SYSCACHE_CALLBACKS 64
 #define MAX_RELCACHE_CALLBACKS 10
 
 static struct SYSCACHECALLBACK
 {
 	int16		id;				/* cache number */
+	int16		link;			/* next callback index+1 for same cache */
 	SyscacheCallbackFunction function;
 	Datum		arg;
 }	syscache_callback_list[MAX_SYSCACHE_CALLBACKS];
 
+static int16 syscache_callback_links[SysCacheSize];
+
 static int	syscache_callback_count = 0;
 
 static struct RELCACHECALLBACK
@@ -543,7 +551,7 @@
 		{
 			InvalidateCatalogSnapshot();
 
-			CatalogCacheIdInvalidate(msg->cc.id, msg->cc.hashValue);
+			SysCacheInvalidate(msg->cc.id, msg->cc.hashValue);
 
 			CallSyscacheCallbacks(msg->cc.id, msg->cc.hashValue);
 		}
@@ -1354,10 +1362,28 @@
 							  SyscacheCallbackFunction func,
 							  Datum arg)
 {
+	if (cacheid < 0 || cacheid >= SysCacheSize)
+		elog(FATAL, "invalid cache ID: %d", cacheid);
 	if (syscache_callback_count >= MAX_SYSCACHE_CALLBACKS)
 		elog(FATAL, "out of syscache_callback_list slots");
 
+	if (syscache_callback_links[cacheid] == 0)
+	{
+		/* first callback for this cache */
+		syscache_callback_links[cacheid] = syscache_callback_count + 1;
+	}
+	else
+	{
+		/* add to end of chain, so that older callbacks are called first */
+		int			i = syscache_callback_links[cacheid] - 1;
+
+		while (syscache_callback_list[i].link > 0)
+			i = syscache_callback_list[i].link - 1;
+		syscache_callback_list[i].link = syscache_callback_count + 1;
+	}
+
 	syscache_callback_list[syscache_callback_count].id = cacheid;
+	syscache_callback_list[syscache_callback_count].link = 0;
 	syscache_callback_list[syscache_callback_count].function = func;
 	syscache_callback_list[syscache_callback_count].arg = arg;
 
@@ -1397,11 +1423,16 @@
 {
 	int			i;
 
-	for (i = 0; i < syscache_callback_count; i++)
+	if (cacheid < 0 || cacheid >= SysCacheSize)
+		elog(ERROR, "invalid cache ID: %d", cacheid);
+
+	i = syscache_callback_links[cacheid] - 1;
+	while (i >= 0)
 	{
 		struct SYSCACHECALLBACK *ccitem = syscache_callback_list + i;
 
-		if (ccitem->id == cacheid)
-			(*ccitem->function) (ccitem->arg, cacheid, hashvalue);
+		Assert(ccitem->id == cacheid);
+		(*ccitem->function) (ccitem->arg, cacheid, hashvalue);
+		i = ccitem->link - 1;
 	}
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/cache/lsyscache.c postgresql-9.5-9.5.8/src/backend/utils/cache/lsyscache.c
--- postgresql-9.5-9.5.2/src/backend/utils/cache/lsyscache.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/cache/lsyscache.c	2017-08-07 21:13:41.000000000 +0000
@@ -2767,9 +2767,9 @@
  * that have been provided by a stats hook and didn't really come from
  * pg_statistic.
  *
- * statstuple: pg_statistics tuple to be examined.
- * atttype: type OID of attribute (can be InvalidOid if values == NULL).
- * atttypmod: typmod of attribute (can be 0 if values == NULL).
+ * statstuple: pg_statistic tuple to be examined.
+ * atttype: type OID of slot's stavalues (can be InvalidOid if values == NULL).
+ * atttypmod: typmod of slot's stavalues (can be 0 if values == NULL).
  * reqkind: STAKIND code for desired statistics slot kind.
  * reqop: STAOP value wanted, or InvalidOid if don't care.
  * actualop: if not NULL, *actualop receives the actual STAOP value.
@@ -2777,7 +2777,7 @@
  * numbers, nnumbers: if not NULL, the slot's stanumbers are extracted.
  *
  * If assigned, values and numbers are set to point to palloc'd arrays.
- * If the attribute type is pass-by-reference, the values referenced by
+ * If the stavalues datatype is pass-by-reference, the values referenced by
  * the values array are themselves palloc'd.  The palloc'd stuff can be
  * freed by calling free_attstatsslot.
  *
@@ -2907,7 +2907,8 @@
  * free_attstatsslot
  *		Free data allocated by get_attstatsslot
  *
- * atttype need be valid only if values != NULL.
+ * atttype is the type of the individual values in values[].
+ * It need be valid only if values != NULL.
  */
 void
 free_attstatsslot(Oid atttype,
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/cache/plancache.c postgresql-9.5-9.5.8/src/backend/utils/cache/plancache.c
--- postgresql-9.5-9.5.2/src/backend/utils/cache/plancache.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/cache/plancache.c	2017-08-07 21:13:41.000000000 +0000
@@ -120,6 +120,8 @@
 	CacheRegisterSyscacheCallback(NAMESPACEOID, PlanCacheSysCallback, (Datum) 0);
 	CacheRegisterSyscacheCallback(OPEROID, PlanCacheSysCallback, (Datum) 0);
 	CacheRegisterSyscacheCallback(AMOPOPID, PlanCacheSysCallback, (Datum) 0);
+	CacheRegisterSyscacheCallback(FOREIGNSERVEROID, PlanCacheSysCallback, (Datum) 0);
+	CacheRegisterSyscacheCallback(FOREIGNDATAWRAPPEROID, PlanCacheSysCallback, (Datum) 0);
 }
 
 /*
@@ -1125,7 +1127,7 @@
 GetCachedPlan(CachedPlanSource *plansource, ParamListInfo boundParams,
 			  bool useResOwner)
 {
-	CachedPlan *plan;
+	CachedPlan *plan = NULL;
 	List	   *qlist;
 	bool		customplan;
 
@@ -1207,6 +1209,8 @@
 		}
 	}
 
+	Assert(plan != NULL);
+
 	/* Flag the plan as in use by caller */
 	if (useResOwner)
 		ResourceOwnerEnlargePlanCacheRefs(CurrentResourceOwner);
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/cache/relcache.c postgresql-9.5-9.5.8/src/backend/utils/cache/relcache.c
--- postgresql-9.5-9.5.2/src/backend/utils/cache/relcache.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/cache/relcache.c	2017-08-07 21:13:41.000000000 +0000
@@ -1121,7 +1121,7 @@
 		 * points to the current file since the older file will be gone (or
 		 * truncated). The new file will still contain older rows so lookups
 		 * in them will work correctly. This wouldn't work correctly if
-		 * rewrites were allowed to change the schema in a noncompatible way,
+		 * rewrites were allowed to change the schema in an incompatible way,
 		 * but those are prevented both on catalog tables and on user tables
 		 * declared as additional catalog tables.
 		 */
@@ -4191,8 +4191,10 @@
  * we can include system attributes (e.g., OID) in the bitmap representation.
  *
  * Caller had better hold at least RowExclusiveLock on the target relation
- * to ensure that it has a stable set of indexes.  This also makes it safe
- * (deadlock-free) for us to take locks on the relation's indexes.
+ * to ensure it is safe (deadlock-free) for us to take locks on the relation's
+ * indexes.  Note that since the introduction of CREATE INDEX CONCURRENTLY,
+ * that lock level doesn't guarantee a stable set of indexes, so we have to
+ * be prepared to retry here in case of a change in the set of indexes.
  *
  * The returned result is palloc'd in the caller's memory context and should
  * be bms_free'd when not needed anymore.
@@ -4204,6 +4206,7 @@
 	Bitmapset  *uindexattrs;	/* columns in unique indexes */
 	Bitmapset  *idindexattrs;	/* columns in the replica identity */
 	List	   *indexoidlist;
+	List	   *newindexoidlist;
 	Oid			relreplindex;
 	ListCell   *l;
 	MemoryContext oldcxt;
@@ -4229,8 +4232,9 @@
 		return NULL;
 
 	/*
-	 * Get cached list of index OIDs
+	 * Get cached list of index OIDs. If we have to start over, we do so here.
 	 */
+restart:
 	indexoidlist = RelationGetIndexList(relation);
 
 	/* Fall out if no indexes (but relhasindex was set) */
@@ -4241,8 +4245,7 @@
 	 * Copy the rd_replidindex value computed by RelationGetIndexList before
 	 * proceeding.  This is needed because a relcache flush could occur inside
 	 * index_open below, resetting the fields managed by RelationGetIndexList.
-	 * (The values we're computing will still be valid, assuming that caller
-	 * has a sufficient lock on the relation.)
+	 * We need to do the work with a stable value for relreplindex.
 	 */
 	relreplindex = relation->rd_replidindex;
 
@@ -4310,7 +4313,31 @@
 		index_close(indexDesc, AccessShareLock);
 	}
 
-	list_free(indexoidlist);
+	/*
+	 * During one of the index_opens in the above loop, we might have received
+	 * a relcache flush event on this relcache entry, which might have been
+	 * signaling a change in the rel's index list.  If so, we'd better start
+	 * over to ensure we deliver up-to-date attribute bitmaps.
+	 */
+	newindexoidlist = RelationGetIndexList(relation);
+	if (equal(indexoidlist, newindexoidlist) &&
+		relreplindex == relation->rd_replidindex)
+	{
+		/* Still the same index set, so proceed */
+		list_free(newindexoidlist);
+		list_free(indexoidlist);
+	}
+	else
+	{
+		/* Gotta do it over ... might as well not leak memory */
+		list_free(newindexoidlist);
+		list_free(indexoidlist);
+		bms_free(uindexattrs);
+		bms_free(idindexattrs);
+		bms_free(indexattrs);
+
+		goto restart;
+	}
 
 	/* Don't leak the old values of these bitmaps, if any */
 	bms_free(relation->rd_indexattr);
@@ -5279,7 +5306,7 @@
 	const char *tblspcdir = "pg_tblspc";
 	DIR		   *dir;
 	struct dirent *de;
-	char		path[MAXPGPATH];
+	char		path[MAXPGPATH + 10 + sizeof(TABLESPACE_VERSION_DIRECTORY)];
 
 	/*
 	 * We zap the shared cache file too.  In theory it can't get out of sync
@@ -5321,7 +5348,7 @@
 {
 	DIR		   *dir;
 	struct dirent *de;
-	char		initfilename[MAXPGPATH];
+	char		initfilename[MAXPGPATH * 2];
 
 	/* Scan the tablespace directory to find per-database directories */
 	dir = AllocateDir(tblspcpath);
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/cache/relfilenodemap.c postgresql-9.5-9.5.8/src/backend/utils/cache/relfilenodemap.c
--- postgresql-9.5-9.5.2/src/backend/utils/cache/relfilenodemap.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/cache/relfilenodemap.c	2017-08-07 21:13:41.000000000 +0000
@@ -123,7 +123,7 @@
 	 * error.
 	 */
 	RelfilenodeMapHash =
-		hash_create("RelfilenodeMap cache", 1024, &ctl,
+		hash_create("RelfilenodeMap cache", 64, &ctl,
 					HASH_ELEM | HASH_BLOBS | HASH_CONTEXT);
 
 	/* Watch for invalidation events. */
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/cache/syscache.c postgresql-9.5-9.5.8/src/backend/utils/cache/syscache.c
--- postgresql-9.5-9.5.2/src/backend/utils/cache/syscache.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/cache/syscache.c	2017-08-07 21:13:41.000000000 +0000
@@ -844,8 +844,6 @@
 	}
 };
 
-#define SysCacheSize	((int) lengthof(cacheinfo))
-
 static CatCache *SysCache[SysCacheSize];
 
 static bool CacheInitialized = false;
@@ -876,6 +874,9 @@
 	int			i,
 				j;
 
+	StaticAssertStmt(SysCacheSize == (int) lengthof(cacheinfo),
+					 "SysCacheSize does not match syscache.c's array");
+
 	Assert(!CacheInitialized);
 
 	SysCacheRelationOidSize = SysCacheSupportingRelOidSize = 0;
@@ -1212,6 +1213,27 @@
 }
 
 /*
+ * SysCacheInvalidate
+ *
+ *	Invalidate entries in the specified cache, given a hash value.
+ *	See CatCacheInvalidate() for more info.
+ *
+ *	This routine is only quasi-public: it should only be used by inval.c.
+ */
+void
+SysCacheInvalidate(int cacheId, uint32 hashValue)
+{
+	if (cacheId < 0 || cacheId >= SysCacheSize)
+		elog(ERROR, "invalid cache ID: %d", cacheId);
+
+	/* if this cache isn't initialized yet, no need to do anything */
+	if (!PointerIsValid(SysCache[cacheId]))
+		return;
+
+	CatCacheInvalidate(SysCache[cacheId], hashValue);
+}
+
+/*
  * Certain relations that do not have system caches send snapshot invalidation
  * messages in lieu of catcache messages.  This is for the benefit of
  * GetCatalogSnapshot(), which can then reuse its existing MVCC snapshot
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/error/elog.c postgresql-9.5-9.5.8/src/backend/utils/error/elog.c
--- postgresql-9.5-9.5.2/src/backend/utils/error/elog.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/error/elog.c	2017-08-07 21:13:41.000000000 +0000
@@ -1585,7 +1585,10 @@
 /*
  * ThrowErrorData --- report an error described by an ErrorData structure
  *
- * This is intended to be used to re-report errors originally thrown by
+ * This is somewhat like ReThrowError, but it allows elevels besides ERROR,
+ * and the boolean flags such as output_to_server are computed via the
+ * default rules rather than being copied from the given ErrorData.
+ * This is primarily used to re-report errors originally reported by
  * background worker processes and then propagated (with or without
  * modification) to the backend responsible for them.
  */
@@ -1597,13 +1600,14 @@
 
 	if (!errstart(edata->elevel, edata->filename, edata->lineno,
 				  edata->funcname, NULL))
-		return;
+		return;					/* error is not to be reported at all */
 
 	newedata = &errordata[errordata_stack_depth];
-	oldcontext = MemoryContextSwitchTo(edata->assoc_context);
+	recursion_depth++;
+	oldcontext = MemoryContextSwitchTo(newedata->assoc_context);
 
-	/* Copy the supplied fields to the error stack. */
-	if (edata->sqlerrcode > 0)
+	/* Copy the supplied fields to the error stack entry. */
+	if (edata->sqlerrcode != 0)
 		newedata->sqlerrcode = edata->sqlerrcode;
 	if (edata->message)
 		newedata->message = pstrdup(edata->message);
@@ -1615,6 +1619,7 @@
 		newedata->hint = pstrdup(edata->hint);
 	if (edata->context)
 		newedata->context = pstrdup(edata->context);
+	/* assume message_id is not available */
 	if (edata->schema_name)
 		newedata->schema_name = pstrdup(edata->schema_name);
 	if (edata->table_name)
@@ -1625,11 +1630,15 @@
 		newedata->datatype_name = pstrdup(edata->datatype_name);
 	if (edata->constraint_name)
 		newedata->constraint_name = pstrdup(edata->constraint_name);
+	newedata->cursorpos = edata->cursorpos;
+	newedata->internalpos = edata->internalpos;
 	if (edata->internalquery)
 		newedata->internalquery = pstrdup(edata->internalquery);
 
 	MemoryContextSwitchTo(oldcontext);
+	recursion_depth--;
 
+	/* Process the error. */
 	errfinish(0);
 }
 
@@ -2197,7 +2206,7 @@
 {
 	struct timeval tv;
 	pg_time_t	stamp_time;
-	char		msbuf[8];
+	char		msbuf[13];
 
 	gettimeofday(&tv, NULL);
 	stamp_time = (pg_time_t) tv.tv_sec;
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/fmgr/funcapi.c postgresql-9.5-9.5.8/src/backend/utils/fmgr/funcapi.c
--- postgresql-9.5-9.5.2/src/backend/utils/fmgr/funcapi.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/fmgr/funcapi.c	2017-08-07 21:13:41.000000000 +0000
@@ -880,7 +880,7 @@
 /*
  * get_func_trftypes
  *
- * Returns a number of transformated types used by function.
+ * Returns the number of transformed types used by function.
  */
 int
 get_func_trftypes(HeapTuple procTup,
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/init/globals.c postgresql-9.5-9.5.8/src/backend/utils/init/globals.c
--- postgresql-9.5-9.5.2/src/backend/utils/init/globals.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/init/globals.c	2017-08-07 21:13:41.000000000 +0000
@@ -30,6 +30,7 @@
 volatile bool QueryCancelPending = false;
 volatile bool ProcDiePending = false;
 volatile bool ClientConnectionLost = false;
+volatile sig_atomic_t ConfigReloadPending = false;
 volatile uint32 InterruptHoldoffCount = 0;
 volatile uint32 QueryCancelHoldoffCount = 0;
 volatile uint32 CritSectionCount = 0;
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/init/postinit.c postgresql-9.5-9.5.8/src/backend/utils/init/postinit.c
--- postgresql-9.5-9.5.2/src/backend/utils/init/postinit.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/init/postinit.c	2017-08-07 21:13:41.000000000 +0000
@@ -1093,7 +1093,7 @@
 
 	relsetting = heap_open(DbRoleSettingRelationId, AccessShareLock);
 
-	/* read all the settings under the same snapsot for efficiency */
+	/* read all the settings under the same snapshot for efficiency */
 	snapshot = RegisterSnapshot(GetCatalogSnapshot(DbRoleSettingRelationId));
 
 	/* Later settings are ignored if set earlier. */
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/mb/Unicode/Makefile postgresql-9.5-9.5.8/src/backend/utils/mb/Unicode/Makefile
--- postgresql-9.5-9.5.2/src/backend/utils/mb/Unicode/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/mb/Unicode/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -42,7 +42,8 @@
 	johab_to_utf8.map utf8_to_johab.map \
 	uhc_to_utf8.map utf8_to_uhc.map \
 	gbk_to_utf8.map utf8_to_gbk.map \
-	koi8r_to_utf8.map utf8_to_koi8r.map
+	koi8r_to_utf8.map utf8_to_koi8r.map \
+	koi8u_to_utf8.map utf8_to_koi8u.map
 
 SPECIALMAPS = euc_cn_to_utf8.map utf8_to_euc_cn.map \
 	euc_jp_to_utf8.map utf8_to_euc_jp.map \
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/misc/guc.c postgresql-9.5-9.5.8/src/backend/utils/misc/guc.c
--- postgresql-9.5-9.5.2/src/backend/utils/misc/guc.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/misc/guc.c	2017-08-07 21:13:41.000000000 +0000
@@ -6857,22 +6857,37 @@
 					 errmsg("parameter \"%s\" cannot be changed",
 							name)));
 
+		/*
+		 * If a value is specified, verify that it's sane.
+		 */
 		if (value)
 		{
 			union config_var_val newval;
 			void	   *newextra = NULL;
 
+			/* Check that it's acceptable for the indicated parameter */
 			if (!parse_and_validate_value(record, name, value,
 										  PGC_S_FILE, ERROR,
 										  &newval, &newextra))
 				ereport(ERROR,
-						(errmsg("invalid value for parameter \"%s\": \"%s\"",
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("invalid value for parameter \"%s\": \"%s\"",
 								name, value)));
 
 			if (record->vartype == PGC_STRING && newval.stringval != NULL)
 				free(newval.stringval);
 			if (newextra)
 				free(newextra);
+
+			/*
+			 * We must also reject values containing newlines, because the
+			 * grammar for config files doesn't support embedded newlines in
+			 * string literals.
+			 */
+			if (strchr(value, '\n'))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("parameter value for ALTER SYSTEM must not contain a newline")));
 		}
 	}
 
@@ -6909,13 +6924,15 @@
 			infile = AllocateFile(AutoConfFileName, "r");
 			if (infile == NULL)
 				ereport(ERROR,
-						(errmsg("could not open file \"%s\": %m",
+						(errcode_for_file_access(),
+						 errmsg("could not open file \"%s\": %m",
 								AutoConfFileName)));
 
 			/* parse it */
 			if (!ParseConfigFp(infile, AutoConfFileName, 0, LOG, &head, &tail))
 				ereport(ERROR,
-						(errmsg("could not parse contents of file \"%s\"",
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("could not parse contents of file \"%s\"",
 								AutoConfFileName)));
 
 			FreeFile(infile);
@@ -7791,20 +7808,23 @@
 	/* unit */
 	if (conf->vartype == PGC_INT)
 	{
-		static char buf[8];
-
 		switch (conf->flags & (GUC_UNIT_MEMORY | GUC_UNIT_TIME))
 		{
 			case GUC_UNIT_KB:
 				values[2] = "kB";
 				break;
 			case GUC_UNIT_BLOCKS:
-				snprintf(buf, sizeof(buf), "%dkB", BLCKSZ / 1024);
-				values[2] = buf;
+				snprintf(buffer, sizeof(buffer), "%dkB", BLCKSZ / 1024);
+				values[2] = pstrdup(buffer);
 				break;
 			case GUC_UNIT_XBLOCKS:
-				snprintf(buf, sizeof(buf), "%dkB", XLOG_BLCKSZ / 1024);
-				values[2] = buf;
+				snprintf(buffer, sizeof(buffer), "%dkB", XLOG_BLCKSZ / 1024);
+				values[2] = pstrdup(buffer);
+				break;
+			case GUC_UNIT_XSEGS:
+				snprintf(buffer, sizeof(buffer), "%dMB",
+						 XLOG_SEG_SIZE / (1024 * 1024));
+				values[2] = pstrdup(buffer);
 				break;
 			case GUC_UNIT_MS:
 				values[2] = "ms";
@@ -7815,7 +7835,12 @@
 			case GUC_UNIT_MIN:
 				values[2] = "min";
 				break;
+			case 0:
+				values[2] = NULL;
+				break;
 			default:
+				elog(ERROR, "unrecognized GUC units value: %d",
+					 conf->flags & (GUC_UNIT_MEMORY | GUC_UNIT_TIME));
 				values[2] = NULL;
 				break;
 		}
@@ -8650,7 +8675,9 @@
 
 /*
  * estimate_variable_size:
- * Estimate max size for dumping the given GUC variable.
+ *		Compute space needed for dumping the given GUC variable.
+ *
+ * It's OK to overestimate, but not to underestimate.
  */
 static Size
 estimate_variable_size(struct config_generic * gconf)
@@ -8661,9 +8688,8 @@
 	if (can_skip_gucvar(gconf))
 		return 0;
 
-	size = 0;
-
-	size = add_size(size, strlen(gconf->name) + 1);
+	/* Name, plus trailing zero byte. */
+	size = strlen(gconf->name) + 1;
 
 	/* Get the maximum display length of the GUC value. */
 	switch (gconf->vartype)
@@ -8684,7 +8710,7 @@
 				 * small values.  Maximum value is 2147483647, i.e. 10 chars.
 				 * Include one byte for sign.
 				 */
-				if (abs(*conf->variable) < 1000)
+				if (Abs(*conf->variable) < 1000)
 					valsize = 3 + 1;
 				else
 					valsize = 10 + 1;
@@ -8694,11 +8720,12 @@
 		case PGC_REAL:
 			{
 				/*
-				 * We are going to print it with %.17g. Account for sign,
-				 * decimal point, and e+nnn notation. E.g.
-				 * -3.9932904234000002e+110
+				 * We are going to print it with %e with REALTYPE_PRECISION
+				 * fractional digits.  Account for sign, leading digit,
+				 * decimal point, and exponent with up to 3 digits.  E.g.
+				 * -3.99329042340000021e+110
 				 */
-				valsize = REALTYPE_PRECISION + 1 + 1 + 5;
+				valsize = 1 + 1 + 1 + REALTYPE_PRECISION + 5;
 			}
 			break;
 
@@ -8706,7 +8733,15 @@
 			{
 				struct config_string *conf = (struct config_string *) gconf;
 
-				valsize = strlen(*conf->variable);
+				/*
+				 * If the value is NULL, we transmit it as an empty string.
+				 * Although this is not physically the same value, GUC
+				 * generally treats a NULL the same as empty string.
+				 */
+				if (*conf->variable)
+					valsize = strlen(*conf->variable);
+				else
+					valsize = 0;
 			}
 			break;
 
@@ -8719,17 +8754,17 @@
 			break;
 	}
 
-	/* Allow space for terminating zero-byte */
+	/* Allow space for terminating zero-byte for value */
 	size = add_size(size, valsize + 1);
 
 	if (gconf->sourcefile)
 		size = add_size(size, strlen(gconf->sourcefile));
 
-	/* Allow space for terminating zero-byte */
+	/* Allow space for terminating zero-byte for sourcefile */
 	size = add_size(size, 1);
 
-	/* Include line whenever we include file. */
-	if (gconf->sourcefile)
+	/* Include line whenever file is nonempty. */
+	if (gconf->sourcefile && gconf->sourcefile[0])
 		size = add_size(size, sizeof(gconf->sourceline));
 
 	size = add_size(size, sizeof(gconf->source));
@@ -8847,7 +8882,7 @@
 			{
 				struct config_real *conf = (struct config_real *) gconf;
 
-				do_serialize(destptr, maxbytes, "%.*g",
+				do_serialize(destptr, maxbytes, "%.*e",
 							 REALTYPE_PRECISION, *conf->variable);
 			}
 			break;
@@ -8856,7 +8891,9 @@
 			{
 				struct config_string *conf = (struct config_string *) gconf;
 
-				do_serialize(destptr, maxbytes, "%s", *conf->variable);
+				/* NULL becomes empty string, see estimate_variable_size() */
+				do_serialize(destptr, maxbytes, "%s",
+							 *conf->variable ? *conf->variable : "");
 			}
 			break;
 
@@ -8873,7 +8910,7 @@
 	do_serialize(destptr, maxbytes, "%s",
 				 (gconf->sourcefile ? gconf->sourcefile : ""));
 
-	if (gconf->sourcefile)
+	if (gconf->sourcefile && gconf->sourcefile[0])
 		do_serialize_binary(destptr, maxbytes, &gconf->sourceline,
 							sizeof(gconf->sourceline));
 
@@ -8940,7 +8977,7 @@
 	for (ptr = *srcptr; ptr < srcend && *ptr != '\0'; ptr++)
 		;
 
-	if (ptr > srcend)
+	if (ptr >= srcend)
 		elog(ERROR, "could not find null terminator in GUC state");
 
 	/* Set the new position to the byte following the terminating NUL */
@@ -8994,9 +9031,7 @@
 	{
 		int			result;
 
-		if ((varname = read_gucstate(&srcptr, srcend)) == NULL)
-			break;
-
+		varname = read_gucstate(&srcptr, srcend);
 		varvalue = read_gucstate(&srcptr, srcend);
 		varsourcefile = read_gucstate(&srcptr, srcend);
 		if (varsourcefile[0])
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/misc/guc-file.c postgresql-9.5-9.5.8/src/backend/utils/misc/guc-file.c
--- postgresql-9.5-9.5.2/src/backend/utils/misc/guc-file.c	2016-03-28 20:23:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/misc/guc-file.c	2017-08-07 21:34:39.000000000 +0000
@@ -686,7 +686,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( GUC_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -699,7 +699,7 @@
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, GUC_yyin))==0 && ferror(GUC_yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, GUC_yyin)) == 0 && ferror(GUC_yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1100,7 +1100,7 @@
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/misc/Makefile postgresql-9.5-9.5.8/src/backend/utils/misc/Makefile
--- postgresql-9.5-9.5.2/src/backend/utils/misc/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/misc/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -18,7 +18,7 @@
        sampling.o superuser.o timeout.o tzparser.o
 
 # This location might depend on the installation directories. Therefore
-# we can't subsitute it into pg_config.h.
+# we can't substitute it into pg_config.h.
 ifdef krb_srvtab
 override CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"'
 endif
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/misc/pg_rusage.c postgresql-9.5-9.5.8/src/backend/utils/misc/pg_rusage.c
--- postgresql-9.5-9.5.2/src/backend/utils/misc/pg_rusage.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/misc/pg_rusage.c	2017-08-07 21:13:41.000000000 +0000
@@ -61,7 +61,9 @@
 	}
 
 	snprintf(result, sizeof(result),
-			 "CPU %d.%02ds/%d.%02du sec elapsed %d.%02d sec",
+	/*---
+	 * translator: %d.%02ds is system CPU time, %d.%02du is user CPU time */
+			 _("CPU %d.%02ds/%d.%02du sec elapsed %d.%02d sec"),
 			 (int) (ru1.ru.ru_stime.tv_sec - ru0->ru.ru_stime.tv_sec),
 		  (int) (ru1.ru.ru_stime.tv_usec - ru0->ru.ru_stime.tv_usec) / 10000,
 			 (int) (ru1.ru.ru_utime.tv_sec - ru0->ru.ru_utime.tv_sec),
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/misc/postgresql.conf.sample postgresql-9.5-9.5.8/src/backend/utils/misc/postgresql.conf.sample
--- postgresql-9.5-9.5.2/src/backend/utils/misc/postgresql.conf.sample	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/misc/postgresql.conf.sample	2017-08-07 21:13:41.000000000 +0000
@@ -62,8 +62,6 @@
 					# (change requires restart)
 #port = 5432				# (change requires restart)
 #max_connections = 100			# (change requires restart)
-# Note:  Increasing max_connections costs ~400 bytes of shared memory per
-# connection slot, plus lock space (see max_locks_per_transaction).
 #superuser_reserved_connections = 3	# (change requires restart)
 #unix_socket_directories = '/tmp'	# comma-separated list of directories
 					# (change requires restart)
@@ -119,10 +117,8 @@
 #temp_buffers = 8MB			# min 800kB
 #max_prepared_transactions = 0		# zero disables the feature
 					# (change requires restart)
-# Note:  Increasing max_prepared_transactions costs ~600 bytes of shared memory
-# per transaction slot, plus lock space (see max_locks_per_transaction).
-# It is not advisable to set max_prepared_transactions nonzero unless you
-# actively intend to use prepared transactions.
+# Caution: it is not advisable to set max_prepared_transactions nonzero unless
+# you actively intend to use prepared transactions.
 #work_mem = 4MB				# min 64kB
 #maintenance_work_mem = 64MB		# min 1MB
 #autovacuum_work_mem = -1		# min 1MB, or -1 to use maintenance_work_mem
@@ -134,6 +130,7 @@
 					#   windows
 					#   mmap
 					# use none to disable dynamic shared memory
+					# (change requires restart)
 
 # - Disk -
 
@@ -355,6 +352,7 @@
 #syslog_ident = 'postgres'
 
 # This is only relevant when logging to eventlog (win32):
+# (change requires restart)
 #event_source = 'PostgreSQL'
 
 # - When to Log -
@@ -573,9 +571,6 @@
 #deadlock_timeout = 1s
 #max_locks_per_transaction = 64		# min 10
 					# (change requires restart)
-# Note:  Each lock table slot uses ~270 bytes of shared memory, and there are
-# max_locks_per_transaction * (max_connections + max_prepared_transactions)
-# lock table slots.
 #max_pred_locks_per_transaction = 64	# min 10
 					# (change requires restart)
 
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/misc/timeout.c postgresql-9.5-9.5.8/src/backend/utils/misc/timeout.c
--- postgresql-9.5-9.5.2/src/backend/utils/misc/timeout.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/misc/timeout.c	2017-08-07 21:13:41.000000000 +0000
@@ -34,7 +34,7 @@
 	timeout_handler_proc timeout_handler;
 
 	TimestampTz start_time;		/* time that timeout was last activated */
-	TimestampTz fin_time;		/* if active, time it is due to fire */
+	TimestampTz fin_time;		/* time it is, or was last, due to fire */
 } timeout_params;
 
 /*
@@ -654,3 +654,17 @@
 {
 	return all_timeouts[id].start_time;
 }
+
+/*
+ * Return the time when the timeout is, or most recently was, due to fire
+ *
+ * Note: will return 0 if timeout has never been activated in this process.
+ * However, we do *not* reset the fin_time when a timeout occurs, so as
+ * not to create a race condition if SIGALRM fires just as some code is
+ * about to fetch the value.
+ */
+TimestampTz
+get_timeout_finish_time(TimeoutId id)
+{
+	return all_timeouts[id].fin_time;
+}
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/mmgr/aset.c postgresql-9.5-9.5.8/src/backend/utils/mmgr/aset.c
--- postgresql-9.5-9.5.2/src/backend/utils/mmgr/aset.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/mmgr/aset.c	2017-08-07 21:13:41.000000000 +0000
@@ -201,7 +201,8 @@
 typedef struct AllocBlockData
 {
 	AllocSet	aset;			/* aset that owns this block */
-	AllocBlock	next;			/* next block in aset's blocks list */
+	AllocBlock	prev;			/* prev block in aset's blocks list, if any */
+	AllocBlock	next;			/* next block in aset's blocks list, if any */
 	char	   *freeptr;		/* start of free space in this block */
 	char	   *endptr;			/* end of space in this block */
 }	AllocBlockData;
@@ -508,7 +509,10 @@
 		block->aset = set;
 		block->freeptr = ((char *) block) + ALLOC_BLOCKHDRSZ;
 		block->endptr = ((char *) block) + blksize;
+		block->prev = NULL;
 		block->next = set->blocks;
+		if (block->next)
+			block->next->prev = block;
 		set->blocks = block;
 		/* Mark block as not to be released at reset time */
 		set->keeper = block;
@@ -590,6 +594,7 @@
 			VALGRIND_MAKE_MEM_NOACCESS(datastart, block->freeptr - datastart);
 #endif
 			block->freeptr = datastart;
+			block->prev = NULL;
 			block->next = NULL;
 		}
 		else
@@ -696,16 +701,20 @@
 #endif
 
 		/*
-		 * Stick the new block underneath the active allocation block, so that
-		 * we don't lose the use of the space remaining therein.
+		 * Stick the new block underneath the active allocation block, if any,
+		 * so that we don't lose the use of the space remaining therein.
 		 */
 		if (set->blocks != NULL)
 		{
+			block->prev = set->blocks;
 			block->next = set->blocks->next;
+			if (block->next)
+				block->next->prev = block;
 			set->blocks->next = block;
 		}
 		else
 		{
+			block->prev = NULL;
 			block->next = NULL;
 			set->blocks = block;
 		}
@@ -886,7 +895,10 @@
 		VALGRIND_MAKE_MEM_NOACCESS(block->freeptr,
 								   blksize - ALLOC_BLOCKHDRSZ);
 
+		block->prev = NULL;
 		block->next = set->blocks;
+		if (block->next)
+			block->next->prev = block;
 		set->blocks = block;
 	}
 
@@ -946,29 +958,28 @@
 	{
 		/*
 		 * Big chunks are certain to have been allocated as single-chunk
-		 * blocks.  Find the containing block and return it to malloc().
+		 * blocks.  Just unlink that block and return it to malloc().
 		 */
-		AllocBlock	block = set->blocks;
-		AllocBlock	prevblock = NULL;
+		AllocBlock	block = (AllocBlock) (((char *) chunk) - ALLOC_BLOCKHDRSZ);
 
-		while (block != NULL)
-		{
-			if (chunk == (AllocChunk) (((char *) block) + ALLOC_BLOCKHDRSZ))
-				break;
-			prevblock = block;
-			block = block->next;
-		}
-		if (block == NULL)
+		/*
+		 * Try to verify that we have a sane block pointer: it should
+		 * reference the correct aset, and freeptr and endptr should point
+		 * just past the chunk.
+		 */
+		if (block->aset != set ||
+			block->freeptr != block->endptr ||
+			block->freeptr != ((char *) block) +
+			(chunk->size + ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ))
 			elog(ERROR, "could not find block containing chunk %p", chunk);
-		/* let's just make sure chunk is the only one in the block */
-		Assert(block->freeptr == ((char *) block) +
-			   (chunk->size + ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ));
 
 		/* OK, remove block from aset's list and free it */
-		if (prevblock == NULL)
-			set->blocks = block->next;
+		if (block->prev)
+			block->prev->next = block->next;
 		else
-			prevblock->next = block->next;
+			set->blocks = block->next;
+		if (block->next)
+			block->next->prev = block->prev;
 #ifdef CLOBBER_FREED_MEMORY
 		wipe_mem(block, block->freeptr - ((char *) block));
 #endif
@@ -1074,27 +1085,24 @@
 	if (oldsize > set->allocChunkLimit)
 	{
 		/*
-		 * The chunk must have been allocated as a single-chunk block.  Find
-		 * the containing block and use realloc() to make it bigger with
-		 * minimum space wastage.
+		 * The chunk must have been allocated as a single-chunk block.  Use
+		 * realloc() to make the containing block bigger with minimum space
+		 * wastage.
 		 */
-		AllocBlock	block = set->blocks;
-		AllocBlock	prevblock = NULL;
+		AllocBlock	block = (AllocBlock) (((char *) chunk) - ALLOC_BLOCKHDRSZ);
 		Size		chksize;
 		Size		blksize;
 
-		while (block != NULL)
-		{
-			if (chunk == (AllocChunk) (((char *) block) + ALLOC_BLOCKHDRSZ))
-				break;
-			prevblock = block;
-			block = block->next;
-		}
-		if (block == NULL)
+		/*
+		 * Try to verify that we have a sane block pointer: it should
+		 * reference the correct aset, and freeptr and endptr should point
+		 * just past the chunk.
+		 */
+		if (block->aset != set ||
+			block->freeptr != block->endptr ||
+			block->freeptr != ((char *) block) +
+			(chunk->size + ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ))
 			elog(ERROR, "could not find block containing chunk %p", chunk);
-		/* let's just make sure chunk is the only one in the block */
-		Assert(block->freeptr == ((char *) block) +
-			   (chunk->size + ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ));
 
 		/* Do the realloc */
 		chksize = MAXALIGN(size);
@@ -1107,10 +1115,12 @@
 		/* Update pointers since block has likely been moved */
 		chunk = (AllocChunk) (((char *) block) + ALLOC_BLOCKHDRSZ);
 		pointer = AllocChunkGetPointer(chunk);
-		if (prevblock == NULL)
-			set->blocks = block;
+		if (block->prev)
+			block->prev->next = block;
 		else
-			prevblock->next = block;
+			set->blocks = block;
+		if (block->next)
+			block->next->prev = block;
 		chunk->size = chksize;
 
 #ifdef MEMORY_CONTEXT_CHECKING
@@ -1134,7 +1144,7 @@
 
 		/* set mark to catch clobber of "unused" space */
 		if (size < chunk->size)
-			set_sentinel(AllocChunkGetPointer(chunk), size);
+			set_sentinel(pointer, size);
 #else							/* !MEMORY_CONTEXT_CHECKING */
 
 		/*
@@ -1147,7 +1157,8 @@
 
 		/* Make any trailing alignment padding NOACCESS. */
 		VALGRIND_MAKE_MEM_NOACCESS((char *) pointer + size, chksize - size);
-		return AllocChunkGetPointer(chunk);
+
+		return pointer;
 	}
 	else
 	{
@@ -1284,9 +1295,12 @@
 {
 	AllocSet	set = (AllocSet) context;
 	char	   *name = set->header.name;
+	AllocBlock	prevblock;
 	AllocBlock	block;
 
-	for (block = set->blocks; block != NULL; block = block->next)
+	for (prevblock = NULL, block = set->blocks;
+		 block != NULL;
+		 prevblock = block, block = block->next)
 	{
 		char	   *bpoz = ((char *) block) + ALLOC_BLOCKHDRSZ;
 		long		blk_used = block->freeptr - bpoz;
@@ -1304,6 +1318,16 @@
 		}
 
 		/*
+		 * Check block header fields
+		 */
+		if (block->aset != set ||
+			block->prev != prevblock ||
+			block->freeptr < bpoz ||
+			block->freeptr > block->endptr)
+			elog(WARNING, "problem in alloc set %s: corrupt header in block %p",
+				 name, block);
+
+		/*
 		 * Chunk walker
 		 */
 		while (bpoz < block->freeptr)
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/sort/tuplesort.c postgresql-9.5-9.5.8/src/backend/utils/sort/tuplesort.c
--- postgresql-9.5-9.5.2/src/backend/utils/sort/tuplesort.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/sort/tuplesort.c	2017-08-07 21:13:41.000000000 +0000
@@ -1314,7 +1314,7 @@
 			mtup->datum1 = index_getattr(tuple,
 										 1,
 										 RelationGetDescr(state->indexRel),
-										 &stup.isnull1);
+										 &mtup->isnull1);
 		}
 	}
 
@@ -2993,7 +2993,7 @@
 {
 	SortTuple  *memtuples = state->memtuples;
 	SortTuple  *tuple;
-	int			i,
+	unsigned int i,
 				n;
 
 	if (--state->memtupcount <= 0)
@@ -3001,12 +3001,17 @@
 
 	CHECK_FOR_INTERRUPTS();
 
+	/*
+	 * state->memtupcount is "int", but we use "unsigned int" for i, j, n.
+	 * This prevents overflow in the "2 * i + 1" calculation, since at the top
+	 * of the loop we must have i < n <= INT_MAX <= UINT_MAX/2.
+	 */
 	n = state->memtupcount;
 	tuple = &memtuples[n];		/* tuple that must be reinserted */
 	i = 0;						/* i is where the "hole" is */
 	for (;;)
 	{
-		int			j = 2 * i + 1;
+		unsigned int j = 2 * i + 1;
 
 		if (j >= n)
 			break;
@@ -3440,7 +3445,7 @@
 			mtup->datum1 = heap_getattr(tuple,
 									  state->indexInfo->ii_KeyAttrNumbers[0],
 										state->tupDesc,
-										&stup->isnull1);
+										&mtup->isnull1);
 		}
 	}
 }
@@ -3744,7 +3749,7 @@
 			mtup->datum1 = index_getattr(tuple,
 										 1,
 										 RelationGetDescr(state->indexRel),
-										 &stup->isnull1);
+										 &mtup->isnull1);
 		}
 	}
 }
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/time/snapmgr.c postgresql-9.5-9.5.8/src/backend/utils/time/snapmgr.c
--- postgresql-9.5-9.5.2/src/backend/utils/time/snapmgr.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/time/snapmgr.c	2017-08-07 21:13:41.000000000 +0000
@@ -1,4 +1,5 @@
 /*-------------------------------------------------------------------------
+ *
  * snapmgr.c
  *		PostgreSQL snapshot manager
  *
@@ -8,7 +9,7 @@
  * (tracked by separate refcounts on each snapshot), its memory can be freed.
  *
  * The FirstXactSnapshot, if any, is treated a bit specially: we increment its
- * regd_count and count it in RegisteredSnapshots, but this reference is not
+ * regd_count and list it in RegisteredSnapshots, but this reference is not
  * tracked by a resource owner. We used to use the TopTransactionResourceOwner
  * to track this snapshot reference, but that introduces logical circularity
  * and thus makes it impossible to clean up in a sane fashion.  It's better to
@@ -16,19 +17,22 @@
  * module is entirely lower-level than ResourceOwners.
  *
  * Likewise, any snapshots that have been exported by pg_export_snapshot
- * have regd_count = 1 and are counted in RegisteredSnapshots, but are not
+ * have regd_count = 1 and are listed in RegisteredSnapshots, but are not
  * tracked by any resource owner.
  *
+ * Likewise, the CatalogSnapshot is listed in RegisteredSnapshots when it
+ * is valid, but is not tracked by any resource owner.
+ *
  * The same is true for historic snapshots used during logical decoding,
- * their lifetime is managed separately (as they life longer as one xact.c
+ * their lifetime is managed separately (as they live longer than one xact.c
  * transaction).
  *
  * These arrangements let us reset MyPgXact->xmin when there are no snapshots
- * referenced by this transaction.  (One possible improvement would be to be
- * able to advance Xmin when the snapshot with the earliest Xmin is no longer
- * referenced.  That's a bit harder though, it requires more locking, and
- * anyway it should be rather uncommon to keep temporary snapshots referenced
- * for too long.)
+ * referenced by this transaction, and advance it when the one with oldest
+ * Xmin is no longer referenced.  For simplicity however, only registered
+ * snapshots not active snapshots participate in tracking which one is oldest;
+ * we don't try to change MyPgXact->xmin except when the active-snapshot
+ * stack is empty.
  *
  *
  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
@@ -66,7 +70,7 @@
  * SecondarySnapshot is a snapshot that's always up-to-date as of the current
  * instant, even in transaction-snapshot mode.  It should only be used for
  * special-purpose code (say, RI checking.)  CatalogSnapshot points to an
- * MVCC snapshot intended to be used for catalog scans; we must refresh it
+ * MVCC snapshot intended to be used for catalog scans; we must invalidate it
  * whenever a system catalog change occurs.
  *
  * These SnapshotData structs are static to simplify memory allocation
@@ -83,11 +87,6 @@
 static Snapshot HistoricSnapshot = NULL;
 
 /*
- * Staleness detection for CatalogSnapshot.
- */
-static bool CatalogSnapshotStale = true;
-
-/*
  * These are updated by GetSnapshotData.  We initialize them this way
  * for the convenience of TransactionIdIsInProgress: even in bootstrap
  * mode, we don't want it to say that BootstrapTransactionId is in progress.
@@ -125,8 +124,7 @@
 
 /*
  * Currently registered Snapshots.  Ordered in a heap by xmin, so that we can
- * quickly find the one with lowest xmin, to advance our MyPgXat->xmin.
- * resowner.c also tracks these.
+ * quickly find the one with lowest xmin, to advance our MyPgXact->xmin.
  */
 static int xmin_cmp(const pairingheap_node *a, const pairingheap_node *b,
 		 void *arg);
@@ -201,6 +199,12 @@
 	/* First call in transaction? */
 	if (!FirstSnapshotSet)
 	{
+		/*
+		 * Don't allow catalog snapshot to be older than xact snapshot.  Must
+		 * do this first to allow the empty-heap Assert to succeed.
+		 */
+		InvalidateCatalogSnapshot();
+
 		Assert(pairingheap_is_empty(&RegisteredSnapshots));
 		Assert(FirstXactSnapshot == NULL);
 
@@ -232,9 +236,6 @@
 		else
 			CurrentSnapshot = GetSnapshotData(&CurrentSnapshotData);
 
-		/* Don't allow catalog snapshot to be older than xact snapshot. */
-		CatalogSnapshotStale = true;
-
 		FirstSnapshotSet = true;
 		return CurrentSnapshot;
 	}
@@ -243,7 +244,7 @@
 		return CurrentSnapshot;
 
 	/* Don't allow catalog snapshot to be older than xact snapshot. */
-	CatalogSnapshotStale = true;
+	InvalidateCatalogSnapshot();
 
 	CurrentSnapshot = GetSnapshotData(&CurrentSnapshotData);
 
@@ -318,36 +319,72 @@
 	 * scan a relation for which neither catcache nor snapshot invalidations
 	 * are sent, we must refresh the snapshot every time.
 	 */
-	if (!CatalogSnapshotStale && !RelationInvalidatesSnapshotsOnly(relid) &&
+	if (CatalogSnapshot &&
+		!RelationInvalidatesSnapshotsOnly(relid) &&
 		!RelationHasSysCache(relid))
-		CatalogSnapshotStale = true;
+		InvalidateCatalogSnapshot();
 
-	if (CatalogSnapshotStale)
+	if (CatalogSnapshot == NULL)
 	{
 		/* Get new snapshot. */
 		CatalogSnapshot = GetSnapshotData(&CatalogSnapshotData);
 
 		/*
-		 * Mark new snapshost as valid.  We must do this last, in case an
-		 * ERROR occurs inside GetSnapshotData().
+		 * Make sure the catalog snapshot will be accounted for in decisions
+		 * about advancing PGXACT->xmin.  We could apply RegisterSnapshot, but
+		 * that would result in making a physical copy, which is overkill; and
+		 * it would also create a dependency on some resource owner, which we
+		 * do not want for reasons explained at the head of this file. Instead
+		 * just shove the CatalogSnapshot into the pairing heap manually. This
+		 * has to be reversed in InvalidateCatalogSnapshot, of course.
+		 *
+		 * NB: it had better be impossible for this to throw error, since the
+		 * CatalogSnapshot pointer is already valid.
 		 */
-		CatalogSnapshotStale = false;
+		pairingheap_add(&RegisteredSnapshots, &CatalogSnapshot->ph_node);
 	}
 
 	return CatalogSnapshot;
 }
 
 /*
- * Mark the current catalog snapshot as invalid.  We could change this API
- * to allow the caller to provide more fine-grained invalidation details, so
- * that a change to relation A wouldn't prevent us from using our cached
- * snapshot to scan relation B, but so far there's no evidence that the CPU
- * cycles we spent tracking such fine details would be well-spent.
+ * InvalidateCatalogSnapshot
+ *		Mark the current catalog snapshot, if any, as invalid
+ *
+ * We could change this API to allow the caller to provide more fine-grained
+ * invalidation details, so that a change to relation A wouldn't prevent us
+ * from using our cached snapshot to scan relation B, but so far there's no
+ * evidence that the CPU cycles we spent tracking such fine details would be
+ * well-spent.
+ */
+void
+InvalidateCatalogSnapshot(void)
+{
+	if (CatalogSnapshot)
+	{
+		pairingheap_remove(&RegisteredSnapshots, &CatalogSnapshot->ph_node);
+		CatalogSnapshot = NULL;
+		SnapshotResetXmin();
+	}
+}
+
+/*
+ * InvalidateCatalogSnapshotConditionally
+ *		Drop catalog snapshot if it's the only one we have
+ *
+ * This is called when we are about to wait for client input, so we don't
+ * want to continue holding the catalog snapshot if it might mean that the
+ * global xmin horizon can't advance.  However, if there are other snapshots
+ * still active or registered, the catalog snapshot isn't likely to be the
+ * oldest one, so we might as well keep it.
  */
 void
-InvalidateCatalogSnapshot()
+InvalidateCatalogSnapshotConditionally(void)
 {
-	CatalogSnapshotStale = true;
+	if (CatalogSnapshot &&
+		ActiveSnapshot == NULL &&
+		pairingheap_is_singular(&RegisteredSnapshots))
+		InvalidateCatalogSnapshot();
 }
 
 /*
@@ -364,6 +401,7 @@
 		CurrentSnapshot->curcid = curcid;
 	if (SecondarySnapshot)
 		SecondarySnapshot->curcid = curcid;
+	/* Should we do the same with CatalogSnapshot? */
 }
 
 /*
@@ -381,6 +419,9 @@
 	/* Caller should have checked this already */
 	Assert(!FirstSnapshotSet);
 
+	/* Better do this to ensure following Assert succeeds. */
+	InvalidateCatalogSnapshot();
+
 	Assert(pairingheap_is_empty(&RegisteredSnapshots));
 	Assert(FirstXactSnapshot == NULL);
 	Assert(!HistoricSnapshotActive());
@@ -769,7 +810,15 @@
  * Even if there are some remaining snapshots, we may be able to advance our
  * PGXACT->xmin to some degree.  This typically happens when a portal is
  * dropped.  For efficiency, we only consider recomputing PGXACT->xmin when
- * the active snapshot stack is empty.
+ * the active snapshot stack is empty; this allows us not to need to track
+ * which active snapshot is oldest.
+ *
+ * Note: it's tempting to use GetOldestSnapshot() here so that we can include
+ * active snapshots in the calculation.  However, that compares by LSN not
+ * xmin so it's not entirely clear that it's the same thing.  Also, we'd be
+ * critically dependent on the assumption that the bottommost active snapshot
+ * stack entry has the oldest xmin.  (Current uses of GetOldestSnapshot() are
+ * not actually critical, but this would be.)
  */
 static void
 SnapshotResetXmin(void)
@@ -855,7 +904,7 @@
 {
 	/*
 	 * In transaction-snapshot mode we must release our privately-managed
-	 * reference to the transaction snapshot.  We must decrement
+	 * reference to the transaction snapshot.  We must remove it from
 	 * RegisteredSnapshots to keep the check below happy.  But we don't bother
 	 * to do FreeSnapshot, for two reasons: the memory will go away with
 	 * TopTransactionContext anyway, and if someone has left the snapshot
@@ -895,7 +944,7 @@
 		/*
 		 * As with the FirstXactSnapshot, we needn't spend any effort on
 		 * cleaning up the per-snapshot data structures, but we do need to
-		 * unlink them from RegisteredSnapshots to prevent a warning below.
+		 * remove them from RegisteredSnapshots to prevent a warning below.
 		 */
 		foreach(lc, exportedSnapshots)
 		{
@@ -907,6 +956,9 @@
 		exportedSnapshots = NIL;
 	}
 
+	/* Drop catalog snapshot if any */
+	InvalidateCatalogSnapshot();
+
 	/* On commit, complain about leftover snapshots */
 	if (isCommit)
 	{
@@ -1365,7 +1417,7 @@
 void
 DeleteAllExportedSnapshotFiles(void)
 {
-	char		buf[MAXPGPATH];
+	char		buf[MAXPGPATH + sizeof(SNAPSHOT_EXPORT_DIR)];
 	DIR		   *s_dir;
 	struct dirent *s_de;
 
@@ -1386,7 +1438,7 @@
 			strcmp(s_de->d_name, "..") == 0)
 			continue;
 
-		snprintf(buf, MAXPGPATH, SNAPSHOT_EXPORT_DIR "/%s", s_de->d_name);
+		snprintf(buf, sizeof(buf), SNAPSHOT_EXPORT_DIR "/%s", s_de->d_name);
 		/* Again, unlink failure is not worthy of FATAL */
 		if (unlink(buf))
 			elog(LOG, "could not unlink file \"%s\": %m", buf);
@@ -1573,7 +1625,8 @@
 	/* Copy SubXIDs, if present. */
 	if (serialized_snapshot->subxcnt > 0)
 	{
-		snapshot->subxip = snapshot->xip + serialized_snapshot->xcnt;
+		snapshot->subxip = ((TransactionId *) (snapshot + 1)) +
+			serialized_snapshot->xcnt;
 		memcpy(snapshot->subxip, serialized_xids + serialized_snapshot->xcnt,
 			   serialized_snapshot->subxcnt * sizeof(TransactionId));
 	}
diff -Nru postgresql-9.5-9.5.2/src/backend/utils/time/tqual.c postgresql-9.5-9.5.8/src/backend/utils/time/tqual.c
--- postgresql-9.5-9.5.2/src/backend/utils/time/tqual.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/backend/utils/time/tqual.c	2017-08-07 21:13:41.000000000 +0000
@@ -408,8 +408,8 @@
 
 		/*
 		 * An invalid Xmin can be left behind by a speculative insertion that
-		 * is cancelled by super-deleting the tuple.  We shouldn't see any of
-		 * those in TOAST tables, but better safe than sorry.
+		 * is canceled by super-deleting the tuple.  This also applies to
+		 * TOAST tuples created during speculative insertion.
 		 */
 		else if (!TransactionIdIsValid(HeapTupleHeaderGetXmin(tuple)))
 			return false;
@@ -609,15 +609,12 @@
 	{
 		TransactionId xmax;
 
+		if (HEAP_LOCKED_UPGRADED(tuple->t_infomask))
+			return HeapTupleMayBeUpdated;
+
 		if (HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask))
 		{
-			/*
-			 * If it's only locked but neither EXCL_LOCK nor KEYSHR_LOCK is
-			 * set, it cannot possibly be running.  Otherwise need to check.
-			 */
-			if ((tuple->t_infomask & (HEAP_XMAX_EXCL_LOCK |
-									  HEAP_XMAX_KEYSHR_LOCK)) &&
-				MultiXactIdIsRunning(HeapTupleHeaderGetRawXmax(tuple), true))
+			if (MultiXactIdIsRunning(HeapTupleHeaderGetRawXmax(tuple), true))
 				return HeapTupleBeingUpdated;
 
 			SetHintBits(tuple, buffer, HEAP_XMAX_INVALID, InvalidTransactionId);
@@ -1258,26 +1255,21 @@
 		 * "Deleting" xact really only locked it, so the tuple is live in any
 		 * case.  However, we should make sure that either XMAX_COMMITTED or
 		 * XMAX_INVALID gets set once the xact is gone, to reduce the costs of
-		 * examining the tuple for future xacts.  Also, marking dead
-		 * MultiXacts as invalid here provides defense against MultiXactId
-		 * wraparound (see also comments in heap_freeze_tuple()).
+		 * examining the tuple for future xacts.
 		 */
 		if (!(tuple->t_infomask & HEAP_XMAX_COMMITTED))
 		{
 			if (tuple->t_infomask & HEAP_XMAX_IS_MULTI)
 			{
 				/*
-				 * If it's only locked but neither EXCL_LOCK nor KEYSHR_LOCK
-				 * are set, it cannot possibly be running; otherwise have to
-				 * check.
+				 * If it's a pre-pg_upgrade tuple, the multixact cannot
+				 * possibly be running; otherwise have to check.
 				 */
-				if ((tuple->t_infomask & (HEAP_XMAX_EXCL_LOCK |
-										  HEAP_XMAX_KEYSHR_LOCK)) &&
+				if (!HEAP_LOCKED_UPGRADED(tuple->t_infomask) &&
 					MultiXactIdIsRunning(HeapTupleHeaderGetRawXmax(tuple),
 										 true))
 					return HEAPTUPLE_LIVE;
 				SetHintBits(tuple, buffer, HEAP_XMAX_INVALID, InvalidTransactionId);
-
 			}
 			else
 			{
@@ -1605,7 +1597,7 @@
 }
 
 /*
- * check whether the transaciont id 'xid' is in the pre-sorted array 'xip'.
+ * check whether the transaction id 'xid' is in the pre-sorted array 'xip'.
  */
 static bool
 TransactionIdInArray(TransactionId xid, TransactionId *xip, Size num)
diff -Nru postgresql-9.5-9.5.2/src/bin/initdb/findtimezone.c postgresql-9.5-9.5.8/src/bin/initdb/findtimezone.c
--- postgresql-9.5-9.5.2/src/bin/initdb/findtimezone.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/initdb/findtimezone.c	2017-08-07 21:13:41.000000000 +0000
@@ -99,15 +99,15 @@
 	 */
 	if (strcmp(name, "GMT") == 0)
 	{
-		if (tzparse(name, &tz.state, TRUE) != 0)
+		if (!tzparse(name, &tz.state, true))
 		{
 			/* This really, really should not happen ... */
 			return NULL;
 		}
 	}
-	else if (tzload(name, NULL, &tz.state, TRUE) != 0)
+	else if (tzload(name, NULL, &tz.state, true) != 0)
 	{
-		if (name[0] == ':' || tzparse(name, &tz.state, FALSE) != 0)
+		if (name[0] == ':' || !tzparse(name, &tz.state, false))
 		{
 			return NULL;		/* unknown timezone */
 		}
@@ -584,7 +584,7 @@
 	/*
 	 * This list was built from the contents of the registry at
 	 * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time
-	 * Zones on Windows 2003 R2.
+	 * Zones on Windows 10 and Windows 7.
 	 *
 	 * The zones have been matched to Olson timezones by looking at the cities
 	 * listed in the win32 display name (in the comment here) in most cases.
@@ -592,417 +592,590 @@
 	{
 		"Afghanistan Standard Time", "Afghanistan Daylight Time",
 		"Asia/Kabul"
-	},							/* (GMT+04:30) Kabul */
+	},							/* (UTC+04:30) Kabul */
 	{
 		"Alaskan Standard Time", "Alaskan Daylight Time",
 		"US/Alaska"
-	},							/* (GMT-09:00) Alaska */
+	},							/* (UTC-09:00) Alaska */
+	{
+		"Aleutian Standard Time", "Aleutian Daylight Time",
+		"US/Aleutan"
+	},							/* (UTC-10:00) Aleutian Islands */
+	{
+		"Altai Standard Time", "Altai Daylight Time",
+		"Asia/Barnaul"
+	},							/* (UTC+07:00) Barnaul, Gorno-Altaysk */
 	{
 		"Arab Standard Time", "Arab Daylight Time",
 		"Asia/Kuwait"
-	},							/* (GMT+03:00) Kuwait, Riyadh */
+	},							/* (UTC+03:00) Kuwait, Riyadh */
 	{
 		"Arabian Standard Time", "Arabian Daylight Time",
 		"Asia/Muscat"
-	},							/* (GMT+04:00) Abu Dhabi, Muscat */
+	},							/* (UTC+04:00) Abu Dhabi, Muscat */
 	{
 		"Arabic Standard Time", "Arabic Daylight Time",
 		"Asia/Baghdad"
-	},							/* (GMT+03:00) Baghdad */
+	},							/* (UTC+03:00) Baghdad */
 	{
 		"Argentina Standard Time", "Argentina Daylight Time",
 		"America/Buenos_Aires"
-	},							/* (GMT-03:00) Buenos Aires */
+	},							/* (UTC-03:00) City of Buenos Aires */
 	{
 		"Armenian Standard Time", "Armenian Daylight Time",
 		"Asia/Yerevan"
-	},							/* (GMT+04:00) Yerevan */
+	},							/* (UTC+04:00) Baku, Tbilisi, Yerevan */
+	{
+		"Astrakhan Standard Time", "Astrakhan Daylight Time",
+		"Europe/Astrakhan"
+	},							/* (UTC+04:00) Astrakhan, Ulyanovsk */
 	{
 		"Atlantic Standard Time", "Atlantic Daylight Time",
 		"Canada/Atlantic"
-	},							/* (GMT-04:00) Atlantic Time (Canada) */
+	},							/* (UTC-04:00) Atlantic Time (Canada) */
 	{
 		"AUS Central Standard Time", "AUS Central Daylight Time",
 		"Australia/Darwin"
-	},							/* (GMT+09:30) Darwin */
+	},							/* (UTC+09:30) Darwin */
+	{
+		"Aus Central W. Standard Time", "Aus Central W. Daylight Time",
+		"Australia/Eucla"
+	},							/* (UTC+08:45) Eucla */
 	{
 		"AUS Eastern Standard Time", "AUS Eastern Daylight Time",
 		"Australia/Canberra"
-	},							/* (GMT+10:00) Canberra, Melbourne, Sydney */
+	},							/* (UTC+10:00) Canberra, Melbourne, Sydney */
 	{
 		"Azerbaijan Standard Time", "Azerbaijan Daylight Time",
 		"Asia/Baku"
-	},							/* (GMT+04:00) Baku */
+	},							/* (UTC+04:00) Baku */
 	{
 		"Azores Standard Time", "Azores Daylight Time",
 		"Atlantic/Azores"
-	},							/* (GMT-01:00) Azores */
+	},							/* (UTC-01:00) Azores */
+	{
+		"Bahia Standard Time", "Bahia Daylight Time",
+		"America/Salvador"
+	},							/* (UTC-03:00) Salvador */
 	{
 		"Bangladesh Standard Time", "Bangladesh Daylight Time",
 		"Asia/Dhaka"
-	},							/* (GMT+06:00) Dhaka */
+	},							/* (UTC+06:00) Dhaka */
+	{
+		"Bougainville Standard Time", "Bougainville Daylight Time",
+		"Pacific/Bougainville"
+	},							/* (UTC+11:00) Bougainville Island */
+	{
+		"Belarus Standard Time", "Belarus Daylight Time",
+		"Europe/Minsk"
+	},							/* (UTC+03:00) Minsk */
+	{
+		"Cabo Verde Standard Time", "Cabo Verde Daylight Time",
+		"Atlantic/Cape_Verde"
+	},							/* (UTC-01:00) Cabo Verde Is. */
+	{
+		"Chatham Islands Standard Time", "Chatham Islands Daylight Time",
+		"Pacific/Chatham"
+	},							/* (UTC+12:45) Chatham Islands */
 	{
 		"Canada Central Standard Time", "Canada Central Daylight Time",
 		"Canada/Saskatchewan"
-	},							/* (GMT-06:00) Saskatchewan */
+	},							/* (UTC-06:00) Saskatchewan */
 	{
 		"Cape Verde Standard Time", "Cape Verde Daylight Time",
 		"Atlantic/Cape_Verde"
-	},							/* (GMT-01:00) Cape Verde Is. */
+	},							/* (UTC-01:00) Cape Verde Is. */
 	{
 		"Caucasus Standard Time", "Caucasus Daylight Time",
 		"Asia/Baku"
-	},							/* (GMT+04:00) Baku, Tbilisi, Yerevan */
+	},							/* (UTC+04:00) Yerevan */
 	{
 		"Cen. Australia Standard Time", "Cen. Australia Daylight Time",
 		"Australia/Adelaide"
-	},							/* (GMT+09:30) Adelaide */
+	},							/* (UTC+09:30) Adelaide */
 	/* Central America (other than Mexico) generally does not observe DST */
 	{
 		"Central America Standard Time", "Central America Daylight Time",
 		"CST6"
-	},							/* (GMT-06:00) Central America */
+	},							/* (UTC-06:00) Central America */
 	{
 		"Central Asia Standard Time", "Central Asia Daylight Time",
 		"Asia/Dhaka"
-	},							/* (GMT+06:00) Astana, Dhaka */
+	},							/* (UTC+06:00) Astana */
 	{
 		"Central Brazilian Standard Time", "Central Brazilian Daylight Time",
 		"America/Cuiaba"
-	},							/* (GMT-04:00) Cuiaba */
+	},							/* (UTC-04:00) Cuiaba */
 	{
 		"Central Europe Standard Time", "Central Europe Daylight Time",
 		"Europe/Belgrade"
-	},							/* (GMT+01:00) Belgrade, Bratislava, Budapest,
+	},							/* (UTC+01:00) Belgrade, Bratislava, Budapest,
 								 * Ljubljana, Prague */
 	{
 		"Central European Standard Time", "Central European Daylight Time",
 		"Europe/Sarajevo"
-	},							/* (GMT+01:00) Sarajevo, Skopje, Warsaw,
+	},							/* (UTC+01:00) Sarajevo, Skopje, Warsaw,
 								 * Zagreb */
 	{
 		"Central Pacific Standard Time", "Central Pacific Daylight Time",
 		"Pacific/Noumea"
-	},							/* (GMT+11:00) Magadan, Solomon Is., New
-								 * Caledonia */
+	},							/* (UTC+11:00) Solomon Is., New Caledonia */
 	{
 		"Central Standard Time", "Central Daylight Time",
 		"US/Central"
-	},							/* (GMT-06:00) Central Time (US & Canada) */
+	},							/* (UTC-06:00) Central Time (US & Canada) */
 	{
 		"Central Standard Time (Mexico)", "Central Daylight Time (Mexico)",
 		"America/Mexico_City"
-	},							/* (GMT-06:00) Guadalajara, Mexico City,
-								 * Monterrey - New */
+	},							/* (UTC-06:00) Guadalajara, Mexico City,
+								 * Monterrey */
 	{
 		"China Standard Time", "China Daylight Time",
 		"Asia/Hong_Kong"
-	},							/* (GMT+08:00) Beijing, Chongqing, Hong Kong,
+	},							/* (UTC+08:00) Beijing, Chongqing, Hong Kong,
 								 * Urumqi */
 	{
+		"Cuba Standard Time", "Cuba Daylight Time",
+		"America/Havana"
+	},							/* (UTC-05:00) Havana */
+	{
 		"Dateline Standard Time", "Dateline Daylight Time",
-		"Etc/GMT+12"
-	},							/* (GMT-12:00) International Date Line West */
+		"Etc/UTC+12"
+	},							/* (UTC-12:00) International Date Line West */
 	{
 		"E. Africa Standard Time", "E. Africa Daylight Time",
 		"Africa/Nairobi"
-	},							/* (GMT+03:00) Nairobi */
+	},							/* (UTC+03:00) Nairobi */
 	{
 		"E. Australia Standard Time", "E. Australia Daylight Time",
 		"Australia/Brisbane"
-	},							/* (GMT+10:00) Brisbane */
+	},							/* (UTC+10:00) Brisbane */
 	{
 		"E. Europe Standard Time", "E. Europe Daylight Time",
 		"Europe/Bucharest"
-	},							/* (GMT+02:00) Bucharest */
+	},							/* (UTC+02:00) E. Europe */
 	{
 		"E. South America Standard Time", "E. South America Daylight Time",
 		"America/Araguaina"
-	},							/* (GMT-03:00) Brasilia */
+	},							/* (UTC-03:00) Brasilia */
 	{
 		"Eastern Standard Time", "Eastern Daylight Time",
 		"US/Eastern"
-	},							/* (GMT-05:00) Eastern Time (US & Canada) */
+	},							/* (UTC-05:00) Eastern Time (US & Canada) */
+	{
+		"Eastern Standard Time (Mexico)", "Eastern Daylight Time (Mexico)",
+		"America/Mexico_City"
+	},							/* (UTC-05:00) Chetumal */
+	{
+		"Easter Island Standard Time", "Easter Island Daylight Time",
+		"Pacific/Easter"
+	},							/* (UTC-06:00) Easter Island */
 	{
 		"Egypt Standard Time", "Egypt Daylight Time",
 		"Africa/Cairo"
-	},							/* (GMT+02:00) Cairo */
+	},							/* (UTC+02:00) Cairo */
 	{
-		"Ekaterinburg Standard Time", "Ekaterinburg Daylight Time",
+		"Ekaterinburg Standard Time (RTZ 4)", "Ekaterinburg Daylight Time",
 		"Asia/Yekaterinburg"
-	},							/* (GMT+05:00) Ekaterinburg */
+	},							/* (UTC+05:00) Ekaterinburg */
 	{
 		"Fiji Standard Time", "Fiji Daylight Time",
 		"Pacific/Fiji"
-	},							/* (GMT+12:00) Fiji, Kamchatka, Marshall Is. */
+	},							/* (UTC+12:00) Fiji */
 	{
 		"FLE Standard Time", "FLE Daylight Time",
 		"Europe/Helsinki"
-	},							/* (GMT+02:00) Helsinki, Kyiv, Riga, Sofia,
+	},							/* (UTC+02:00) Helsinki, Kyiv, Riga, Sofia,
 								 * Tallinn, Vilnius */
 	{
 		"Georgian Standard Time", "Georgian Daylight Time",
 		"Asia/Tbilisi"
-	},							/* (GMT+03:00) Tbilisi */
+	},							/* (UTC+04:00) Tbilisi */
 	{
 		"GMT Standard Time", "GMT Daylight Time",
 		"Europe/London"
-	},							/* (GMT) Greenwich Mean Time : Dublin,
-								 * Edinburgh, Lisbon, London */
+	},							/* (UTC) Dublin, Edinburgh, Lisbon, London */
 	{
 		"Greenland Standard Time", "Greenland Daylight Time",
 		"America/Godthab"
-	},							/* (GMT-03:00) Greenland */
+	},							/* (UTC-03:00) Greenland */
 	{
 		"Greenwich Standard Time", "Greenwich Daylight Time",
 		"Africa/Casablanca"
-	},							/* (GMT) Casablanca, Monrovia */
+	},							/* (UTC) Monrovia, Reykjavik */
 	{
 		"GTB Standard Time", "GTB Daylight Time",
 		"Europe/Athens"
-	},							/* (GMT+02:00) Athens, Istanbul, Minsk */
+	},							/* (UTC+02:00) Athens, Bucharest */
+	{
+		"Haiti Standard Time", "Haiti Daylight Time",
+		"US/Eastern"
+	},							/* (UTC-05:00) Haiti */
 	{
 		"Hawaiian Standard Time", "Hawaiian Daylight Time",
 		"US/Hawaii"
-	},							/* (GMT-10:00) Hawaii */
+	},							/* (UTC-10:00) Hawaii */
 	{
 		"India Standard Time", "India Daylight Time",
 		"Asia/Calcutta"
-	},							/* (GMT+05:30) Chennai, Kolkata, Mumbai, New
+	},							/* (UTC+05:30) Chennai, Kolkata, Mumbai, New
 								 * Delhi */
 	{
 		"Iran Standard Time", "Iran Daylight Time",
 		"Asia/Tehran"
-	},							/* (GMT+03:30) Tehran */
+	},							/* (UTC+03:30) Tehran */
 	{
 		"Jerusalem Standard Time", "Jerusalem Daylight Time",
 		"Asia/Jerusalem"
-	},							/* (GMT+02:00) Jerusalem */
+	},							/* (UTC+02:00) Jerusalem */
 	{
 		"Jordan Standard Time", "Jordan Daylight Time",
 		"Asia/Amman"
-	},							/* (GMT+02:00) Amman */
+	},							/* (UTC+02:00) Amman */
 	{
 		"Kamchatka Standard Time", "Kamchatka Daylight Time",
 		"Asia/Kamchatka"
-	},							/* (GMT+12:00) Petropavlovsk-Kamchatsky */
+	},							/* (UTC+12:00) Petropavlovsk-Kamchatsky - Old */
 	{
 		"Korea Standard Time", "Korea Daylight Time",
 		"Asia/Seoul"
-	},							/* (GMT+09:00) Seoul */
+	},							/* (UTC+09:00) Seoul */
+	{
+		"Libya Standard Time", "Libya Daylight Time",
+		"Africa/Tripoli"
+	},							/* (UTC+02:00) Tripoli */
+	{
+		"Line Islands Standard Time", "Line Islands Daylight Time",
+		"Pacific/Kiritimati"
+	},							/* (UTC+14:00) Kiritimati Island */
+	{
+		"Lord Howe Standard Time", "Lord Howe Daylight Time",
+		"Australia/Lord_Howe"
+	},							/* (UTC+10:30) Lord Howe Island */
+	{
+		"Magadan Standard Time", "Magadan Daylight Time",
+		"Asia/Magadan"
+	},							/* (UTC+10:00) Magadan */
+	{
+		"Marquesas Standard Time", "Marquesas Daylight Time",
+		"Pacific/Marquesas"
+	},							/* (UTC-09:30) Marquesas Islands */
 	{
 		"Mauritius Standard Time", "Mauritius Daylight Time",
 		"Indian/Mauritius"
-	},							/* (GMT+04:00) Port Louis */
+	},							/* (UTC+04:00) Port Louis */
 	{
 		"Mexico Standard Time", "Mexico Daylight Time",
 		"America/Mexico_City"
-	},							/* (GMT-06:00) Guadalajara, Mexico City,
+	},							/* (UTC-06:00) Guadalajara, Mexico City,
 								 * Monterrey */
 	{
 		"Mexico Standard Time 2", "Mexico Daylight Time 2",
 		"America/Chihuahua"
-	},							/* (GMT-07:00) Chihuahua, La Paz, Mazatlan */
+	},							/* (UTC-07:00) Chihuahua, La Paz, Mazatlan */
 	{
 		"Mid-Atlantic Standard Time", "Mid-Atlantic Daylight Time",
 		"Atlantic/South_Georgia"
-	},							/* (GMT-02:00) Mid-Atlantic */
+	},							/* (UTC-02:00) Mid-Atlantic - Old */
 	{
 		"Middle East Standard Time", "Middle East Daylight Time",
 		"Asia/Beirut"
-	},							/* (GMT+02:00) Beirut */
+	},							/* (UTC+02:00) Beirut */
 	{
 		"Montevideo Standard Time", "Montevideo Daylight Time",
 		"America/Montevideo"
-	},							/* (GMT-03:00) Montevideo */
+	},							/* (UTC-03:00) Montevideo */
 	{
 		"Morocco Standard Time", "Morocco Daylight Time",
 		"Africa/Casablanca"
-	},							/* (GMT) Casablanca */
+	},							/* (UTC) Casablanca */
 	{
 		"Mountain Standard Time", "Mountain Daylight Time",
 		"US/Mountain"
-	},							/* (GMT-07:00) Mountain Time (US & Canada) */
+	},							/* (UTC-07:00) Mountain Time (US & Canada) */
 	{
 		"Mountain Standard Time (Mexico)", "Mountain Daylight Time (Mexico)",
 		"America/Chihuahua"
-	},							/* (GMT-07:00) Chihuahua, La Paz, Mazatlan -
-								 * New */
+	},							/* (UTC-07:00) Chihuahua, La Paz, Mazatlan */
 	{
 		"Myanmar Standard Time", "Myanmar Daylight Time",
 		"Asia/Rangoon"
-	},							/* (GMT+06:30) Rangoon */
+	},							/* (UTC+06:30) Yangon (Rangoon) */
 	{
 		"N. Central Asia Standard Time", "N. Central Asia Daylight Time",
 		"Asia/Novosibirsk"
-	},							/* (GMT+06:00) Novosibirsk */
+	},							/* (UTC+06:00) Novosibirsk (RTZ 5) */
 	{
 		"Namibia Standard Time", "Namibia Daylight Time",
 		"Africa/Windhoek"
-	},							/* (GMT+02:00) Windhoek */
+	},							/* (UTC+01:00) Windhoek */
 	{
 		"Nepal Standard Time", "Nepal Daylight Time",
 		"Asia/Katmandu"
-	},							/* (GMT+05:45) Kathmandu */
+	},							/* (UTC+05:45) Kathmandu */
 	{
 		"New Zealand Standard Time", "New Zealand Daylight Time",
 		"Pacific/Auckland"
-	},							/* (GMT+12:00) Auckland, Wellington */
+	},							/* (UTC+12:00) Auckland, Wellington */
 	{
 		"Newfoundland Standard Time", "Newfoundland Daylight Time",
 		"Canada/Newfoundland"
-	},							/* (GMT-03:30) Newfoundland */
+	},							/* (UTC-03:30) Newfoundland */
+	{
+		"Norfolk Standard Time", "Norfolk Daylight Time",
+		"Pacific/Norfolk"
+	},							/* (UTC+11:00) Norfolk Island */
 	{
 		"North Asia East Standard Time", "North Asia East Daylight Time",
 		"Asia/Irkutsk"
-	},							/* (GMT+08:00) Irkutsk, Ulaan Bataar */
+	},							/* (UTC+08:00) Irkutsk, Ulaan Bataar */
 	{
 		"North Asia Standard Time", "North Asia Daylight Time",
 		"Asia/Krasnoyarsk"
-	},							/* (GMT+07:00) Krasnoyarsk */
+	},							/* (UTC+07:00) Krasnoyarsk */
+	{
+		"North Korea Standard Time", "North Korea Daylight Time",
+		"Asia/Pyongyang"
+	},							/* (UTC+08:30) Pyongyang */
 	{
 		"Pacific SA Standard Time", "Pacific SA Daylight Time",
 		"America/Santiago"
-	},							/* (GMT-04:00) Santiago */
+	},							/* (UTC-03:00) Santiago */
 	{
 		"Pacific Standard Time", "Pacific Daylight Time",
 		"US/Pacific"
-	},							/* (GMT-08:00) Pacific Time (US & Canada);
-								 * Tijuana */
+	},							/* (UTC-08:00) Pacific Time (US & Canada) */
 	{
 		"Pacific Standard Time (Mexico)", "Pacific Daylight Time (Mexico)",
 		"America/Tijuana"
-	},							/* (GMT-08:00) Tijuana, Baja California */
+	},							/* (UTC-08:00) Baja California */
 	{
 		"Pakistan Standard Time", "Pakistan Daylight Time",
 		"Asia/Karachi"
-	},							/* (GMT+05:00) Islamabad, Karachi */
+	},							/* (UTC+05:00) Islamabad, Karachi */
 	{
 		"Paraguay Standard Time", "Paraguay Daylight Time",
 		"America/Asuncion"
-	},							/* (GMT-04:00) Asuncion */
+	},							/* (UTC-04:00) Asuncion */
 	{
 		"Romance Standard Time", "Romance Daylight Time",
 		"Europe/Brussels"
-	},							/* (GMT+01:00) Brussels, Copenhagen, Madrid,
+	},							/* (UTC+01:00) Brussels, Copenhagen, Madrid,
 								 * Paris */
 	{
+		"Russia TZ 1 Standard Time", "Russia TZ 1 Daylight Time",
+		"Europe/Kaliningrad"
+	},							/* (UTC+02:00) Kaliningrad (RTZ 1) */
+	{
+		"Russia TZ 2 Standard Time", "Russia TZ 2 Daylight Time",
+		"Europe/Moscow"
+	},							/* (UTC+03:00) Moscow, St. Petersburg,
+								 * Volgograd (RTZ 2) */
+	{
+		"Russia TZ 3 Standard Time", "Russia TZ 3 Daylight Time",
+		"Europe/Samara"
+	},							/* (UTC+04:00) Izhevsk, Samara (RTZ 3) */
+	{
+		"Russia TZ 4 Standard Time", "Russia TZ 4 Daylight Time",
+		"Asia/Yekaterinburg"
+	},							/* (UTC+05:00) Ekaterinburg (RTZ 4) */
+	{
+		"Russia TZ 5 Standard Time", "Russia TZ 5 Daylight Time",
+		"Asia/Novosibirsk"
+	},							/* (UTC+06:00) Novosibirsk (RTZ 5) */
+	{
+		"Russia TZ 6 Standard Time", "Russia TZ 6 Daylight Time",
+		"Asia/Krasnoyarsk"
+	},							/* (UTC+07:00) Krasnoyarsk (RTZ 6) */
+	{
+		"Russia TZ 7 Standard Time", "Russia TZ 7 Daylight Time",
+		"Asia/Irkutsk"
+	},							/* (UTC+08:00) Irkutsk (RTZ 7) */
+	{
+		"Russia TZ 8 Standard Time", "Russia TZ 8 Daylight Time",
+		"Asia/Yakutsk"
+	},							/* (UTC+09:00) Yakutsk (RTZ 8) */
+	{
+		"Russia TZ 9 Standard Time", "Russia TZ 9 Daylight Time",
+		"Asia/Vladivostok"
+	},							/* (UTC+10:00) Vladivostok, Magadan
+								 * (RTZ 9) */
+	{
+		"Russia TZ 10 Standard Time", "Russia TZ 10 Daylight Time",
+		"Asia/Magadan"
+	},							/* (UTC+11:00) Chokurdakh (RTZ 10) */
+	{
+		"Russia TZ 11 Standard Time", "Russia TZ 11 Daylight Time",
+		"Asia/Anadyr"
+	},							/* (UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky
+								 * (RTZ 11) */
+	{
 		"Russian Standard Time", "Russian Daylight Time",
 		"Europe/Moscow"
-	},							/* (GMT+03:00) Moscow, St. Petersburg,
+	},							/* (UTC+03:00) Moscow, St. Petersburg,
 								 * Volgograd */
 	{
 		"SA Eastern Standard Time", "SA Eastern Daylight Time",
 		"America/Buenos_Aires"
-	},							/* (GMT-03:00) Buenos Aires, Georgetown */
+	},							/* (UTC-03:00) Cayenne, Fortaleza */
 	{
 		"SA Pacific Standard Time", "SA Pacific Daylight Time",
 		"America/Bogota"
-	},							/* (GMT-05:00) Bogota, Lima, Quito */
+	},							/* (UTC-05:00) Bogota, Lima, Quito, Rio
+								 * Branco */
 	{
 		"SA Western Standard Time", "SA Western Daylight Time",
 		"America/Caracas"
-	},							/* (GMT-04:00) Caracas, La Paz */
+	},							/* (UTC-04:00) Georgetown, La Paz, Manaus,
+								 * San Juan */
+	{
+		"Saint Pierre Standard Time", "Saint Pierre Daylight Time",
+		"America/Miquelon"
+	},							/* (UTC-03:00) Saint Pierre and Miquelon */
 	{
 		"Samoa Standard Time", "Samoa Daylight Time",
-		"Pacific/Midway"
-	},							/* (GMT-11:00) Midway Island, Samoa */
+		"Pacific/Samoa"
+	},							/* (UTC+13:00) Samoa */
 	{
 		"SE Asia Standard Time", "SE Asia Daylight Time",
 		"Asia/Bangkok"
-	},							/* (GMT+07:00) Bangkok, Hanoi, Jakarta */
+	},							/* (UTC+07:00) Bangkok, Hanoi, Jakarta */
 	{
 		"Malay Peninsula Standard Time", "Malay Peninsula Daylight Time",
 		"Asia/Kuala_Lumpur"
-	},							/* (GMT+08:00) Kuala Lumpur, Singapore */
+	},							/* (UTC+08:00) Kuala Lumpur, Singapore */
+	{
+		"Sakhalin Standard Time", "Sakhalin Daylight Time",
+		"Asia/Sakhalin"
+	},							/* (UTC+11:00) Sakhalin */
 	{
 		"South Africa Standard Time", "South Africa Daylight Time",
 		"Africa/Harare"
-	},							/* (GMT+02:00) Harare, Pretoria */
+	},							/* (UTC+02:00) Harare, Pretoria */
 	{
 		"Sri Lanka Standard Time", "Sri Lanka Daylight Time",
 		"Asia/Colombo"
-	},							/* (GMT+06:00) Sri Jayawardenepura */
+	},							/* (UTC+05:30) Sri Jayawardenepura */
+	{
+		"Syria Standard Time", "Syria Daylight Time",
+		"Asia/Damascus"
+	},							/* (UTC+02:00) Damascus */
 	{
 		"Taipei Standard Time", "Taipei Daylight Time",
 		"Asia/Taipei"
-	},							/* (GMT+08:00) Taipei */
+	},							/* (UTC+08:00) Taipei */
 	{
 		"Tasmania Standard Time", "Tasmania Daylight Time",
 		"Australia/Hobart"
-	},							/* (GMT+10:00) Hobart */
+	},							/* (UTC+10:00) Hobart */
+	{
+		"Tocantins Standard Time", "Tocantins Daylight Time",
+		"America/Araguaina"
+	},							/* (UTC-03:00) Araguaina */
 	{
 		"Tokyo Standard Time", "Tokyo Daylight Time",
 		"Asia/Tokyo"
-	},							/* (GMT+09:00) Osaka, Sapporo, Tokyo */
+	},							/* (UTC+09:00) Osaka, Sapporo, Tokyo */
 	{
 		"Tonga Standard Time", "Tonga Daylight Time",
 		"Pacific/Tongatapu"
-	},							/* (GMT+13:00) Nuku'alofa */
+	},							/* (UTC+13:00) Nuku'alofa */
+	{
+		"Tomsk Standard Time", "Tomsk Daylight Time",
+		"Asia/Tomsk"
+	},							/* (UTC+07:00) Tomsk */
+	{
+		"Transbaikal Standard Time", "Transbaikal Daylight Time",
+		"Asia/Chita"
+	},							/* (UTC+09:00) Chita */
+	{
+		"Turkey Standard Time", "Turkey Daylight Time",
+		"Europe/Istanbul"
+	},							/* (UTC+02:00) Istanbul */
+	{
+		"Turks and Caicos Standard Time", "Turks and Caicos Daylight Time",
+		"America/Grand_Turk"
+	},							/* (UTC-04:00) Turks and Caicos */
 	{
 		"Ulaanbaatar Standard Time", "Ulaanbaatar Daylight Time",
 		"Asia/Ulaanbaatar",
-	},							/* (GMT+08:00) Ulaanbaatar */
+	},							/* (UTC+08:00) Ulaanbaatar */
 	{
 		"US Eastern Standard Time", "US Eastern Daylight Time",
 		"US/Eastern"
-	},							/* (GMT-05:00) Indiana (East) */
+	},							/* (UTC-05:00) Indiana (East) */
 	{
 		"US Mountain Standard Time", "US Mountain Daylight Time",
 		"US/Arizona"
-	},							/* (GMT-07:00) Arizona */
+	},							/* (UTC-07:00) Arizona */
 	{
 		"Coordinated Universal Time", "Coordinated Universal Time",
 		"UTC"
-	},							/* (GMT) Coordinated Universal Time */
+	},							/* (UTC) Coordinated Universal Time */
 	{
 		"UTC+12", "UTC+12",
 		"Etc/GMT+12"
-	},							/* (GMT+12:00) Coordinated Universal Time+12 */
+	},							/* (UTC+12:00) Coordinated Universal Time+12 */
 	{
 		"UTC-02", "UTC-02",
 		"Etc/GMT-02"
-	},							/* (GMT-02:00) Coordinated Universal Time-02 */
+	},							/* (UTC-02:00) Coordinated Universal Time-02 */
+	{
+		"UTC-08", "UTC-08",
+		"Etc/GMT-08"
+	},							/* (UTC-08:00) Coordinated Universal Time-08 */
+	{
+		"UTC-09", "UTC-09",
+		"Etc/GMT-09"
+	},							/* (UTC-09:00) Coordinated Universal Time-09 */
 	{
 		"UTC-11", "UTC-11",
 		"Etc/GMT-11"
-	},							/* (GMT-11:00) Coordinated Universal Time-11 */
+	},							/* (UTC-11:00) Coordinated Universal Time-11 */
 	{
 		"Venezuela Standard Time", "Venezuela Daylight Time",
 		"America/Caracas",
-	},							/* (GMT-04:30) Caracas */
+	},							/* (UTC-04:30) Caracas */
 	{
 		"Vladivostok Standard Time", "Vladivostok Daylight Time",
 		"Asia/Vladivostok"
-	},							/* (GMT+10:00) Vladivostok */
+	},							/* (UTC+10:00) Vladivostok (RTZ 9) */
 	{
 		"W. Australia Standard Time", "W. Australia Daylight Time",
 		"Australia/Perth"
-	},							/* (GMT+08:00) Perth */
+	},							/* (UTC+08:00) Perth */
 #ifdef NOT_USED
 	/* Could not find a match for this one (just a guess). Excluded for now. */
 	{
 		"W. Central Africa Standard Time", "W. Central Africa Daylight Time",
 		"WAT"
-	},							/* (GMT+01:00) West Central Africa */
+	},							/* (UTC+01:00) West Central Africa */
 #endif
 	{
 		"W. Europe Standard Time", "W. Europe Daylight Time",
 		"CET"
-	},							/* (GMT+01:00) Amsterdam, Berlin, Bern, Rome,
+	},							/* (UTC+01:00) Amsterdam, Berlin, Bern, Rome,
 								 * Stockholm, Vienna */
 	{
+		"W. Mongolia Standard Time", "W. Mongolia Daylight Time",
+		"Asia/Hovd"
+	},							/* (UTC+07:00) Hovd */
+	{
 		"West Asia Standard Time", "West Asia Daylight Time",
 		"Asia/Karachi"
-	},							/* (GMT+05:00) Islamabad, Karachi, Tashkent */
+	},							/* (UTC+05:00) Ashgabat, Tashkent */
+	{
+		"West Bank Gaza Standard Time", "West Bank Gaza Daylight Time",
+		"Asia/Gaza"
+	},							/* (UTC+02:00) Gaza, Hebron */
 	{
 		"West Pacific Standard Time", "West Pacific Daylight Time",
 		"Pacific/Guam"
-	},							/* (GMT+10:00) Guam, Port Moresby */
+	},							/* (UTC+10:00) Guam, Port Moresby */
 	{
 		"Yakutsk Standard Time", "Yakutsk Daylight Time",
 		"Asia/Yakutsk"
-	},							/* (GMT+09:00) Yakutsk */
+	},							/* (UTC+09:00) Yakutsk */
 	{
 		NULL, NULL, NULL
 	}
diff -Nru postgresql-9.5-9.5.2/src/bin/initdb/initdb.c postgresql-9.5-9.5.8/src/bin/initdb/initdb.c
--- postgresql-9.5-9.5.2/src/bin/initdb/initdb.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/initdb/initdb.c	2017-08-07 21:13:41.000000000 +0000
@@ -556,7 +556,7 @@
 
 	while (errno = 0, (de = readdir(dir)) != NULL)
 	{
-		char		subpath[MAXPGPATH];
+		char		subpath[MAXPGPATH * 2];
 		struct stat fst;
 		int			sret;
 
@@ -564,7 +564,7 @@
 			strcmp(de->d_name, "..") == 0)
 			continue;
 
-		snprintf(subpath, MAXPGPATH, "%s/%s", path, de->d_name);
+		snprintf(subpath, sizeof(subpath), "%s/%s", path, de->d_name);
 
 		if (process_symlinks)
 			sret = stat(subpath, &fst);
diff -Nru postgresql-9.5-9.5.2/src/bin/initdb/po/de.po postgresql-9.5-9.5.8/src/bin/initdb/po/de.po
--- postgresql-9.5-9.5.2/src/bin/initdb/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/initdb/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,7 +1,7 @@
 # German message translation file for initdb.
 # Peter Eisentraut <peter_e@gmx.net>, 2003 - 2015.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
@@ -24,27 +24,27 @@
 #: ../../common/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "ungültige Programmdatei „%s“"
+msgstr "ungültige Programmdatei »%s«"
 
 #: ../../common/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "konnte Programmdatei „%s“ nicht lesen"
+msgstr "konnte Programmdatei »%s« nicht lesen"
 
 #: ../../common/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "konnte kein „%s“ zum Ausführen finden"
+msgstr "konnte kein »%s« zum Ausführen finden"
 
 #: ../../common/exec.c:257 ../../common/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "konnte nicht in Verzeichnis „%s“ wechseln: %s"
+msgstr "konnte nicht in Verzeichnis »%s« wechseln: %s"
 
 #: ../../common/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "konnte symbolische Verknüpfung „%s“ nicht lesen"
+msgstr "konnte symbolische Verknüpfung »%s« nicht lesen"
 
 #: ../../common/exec.c:523
 #, c-format
@@ -65,17 +65,17 @@
 #: ../../common/pgfnames.c:45
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht öffnen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht öffnen: %s\n"
 
 #: ../../common/pgfnames.c:72
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht lesen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht lesen: %s\n"
 
 #: ../../common/pgfnames.c:84
 #, c-format
 msgid "could not close directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht schließen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht schließen: %s\n"
 
 #: ../../common/restricted_token.c:68
 #, c-format
@@ -100,7 +100,7 @@
 #: ../../common/restricted_token.c:132
 #, c-format
 msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: konnte Prozess für Befehl „%s“ nicht starten: Fehlercode %lu\n"
+msgstr "%s: konnte Prozess für Befehl »%s« nicht starten: Fehlercode %lu\n"
 
 #: ../../common/restricted_token.c:170
 #, c-format
@@ -115,12 +115,12 @@
 #: ../../common/rmtree.c:77
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
-msgstr "konnte „stat“ für Datei oder Verzeichnis „%s“ nicht ausführen: %s\n"
+msgstr "konnte »stat« für Datei oder Verzeichnis »%s« nicht ausführen: %s\n"
 
 #: ../../common/rmtree.c:104 ../../common/rmtree.c:121
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
-msgstr "konnte Datei oder Verzeichnis „%s“ nicht entfernen: %s\n"
+msgstr "konnte Datei oder Verzeichnis »%s« nicht entfernen: %s\n"
 
 #: ../../common/username.c:45
 #, c-format
@@ -174,12 +174,12 @@
 #: ../../port/dirmod.c:219
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
-msgstr "konnte Junction für „%s“ nicht erzeugen: %s\n"
+msgstr "konnte Junction für »%s« nicht erzeugen: %s\n"
 
 #: ../../port/dirmod.c:294
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
-msgstr "konnte Junction für „%s“ nicht ermitteln: %s\n"
+msgstr "konnte Junction für »%s« nicht ermitteln: %s\n"
 
 #: initdb.c:329
 #, c-format
@@ -189,57 +189,57 @@
 #: initdb.c:439 initdb.c:1651
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: konnte Datei „%s“ nicht zum Lesen öffnen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht zum Lesen öffnen: %s\n"
 
 #: initdb.c:495 initdb.c:1047 initdb.c:1075
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
-msgstr "%s: konnte Datei „%s“ nicht zum Schreiben öffnen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht zum Schreiben öffnen: %s\n"
 
 #: initdb.c:503 initdb.c:511 initdb.c:1054 initdb.c:1081
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht schreiben: %s\n"
+msgstr "%s: konnte Datei »%s« nicht schreiben: %s\n"
 
 #: initdb.c:533 initdb.c:600
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht öffnen: %s\n"
 
 #: initdb.c:550
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
-msgstr "%s: konnte „stat“ für Datei „%s“ nicht ausführen: %s\n"
+msgstr "%s: konnte »stat« für Datei »%s« nicht ausführen: %s\n"
 
 #: initdb.c:563 initdb.c:620
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht lesen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht lesen: %s\n"
 
 #: initdb.c:570 initdb.c:627
 #, c-format
 msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht schließen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht schließen: %s\n"
 
 #: initdb.c:654 initdb.c:706
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht öffnen: %s\n"
 
 #: initdb.c:722
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht fsyncen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht fsyncen: %s\n"
 
 #: initdb.c:743
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
-msgstr "%s: konnte Befehl „%s“ nicht ausführen: %s\n"
+msgstr "%s: konnte Befehl »%s« nicht ausführen: %s\n"
 
 #: initdb.c:759
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
-msgstr "%s: entferne Datenverzeichnis „%s“\n"
+msgstr "%s: entferne Datenverzeichnis »%s«\n"
 
 #: initdb.c:762
 #, c-format
@@ -249,7 +249,7 @@
 #: initdb.c:768
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
-msgstr "%s: entferne Inhalt des Datenverzeichnisses „%s“\n"
+msgstr "%s: entferne Inhalt des Datenverzeichnisses »%s«\n"
 
 #: initdb.c:771
 #, c-format
@@ -259,7 +259,7 @@
 #: initdb.c:777
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
-msgstr "%s: entferne Transaktionslogverzeichnis „%s“\n"
+msgstr "%s: entferne Transaktionslogverzeichnis »%s«\n"
 
 #: initdb.c:780
 #, c-format
@@ -269,7 +269,7 @@
 #: initdb.c:786
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
-msgstr "%s: entferne Inhalt des Transaktionslogverzeichnisses „%s“\n"
+msgstr "%s: entferne Inhalt des Transaktionslogverzeichnisses »%s«\n"
 
 #: initdb.c:789
 #, c-format
@@ -279,12 +279,12 @@
 #: initdb.c:798
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
-msgstr "%s: Datenverzeichnis „%s“ wurde auf Anwenderwunsch nicht entfernt\n"
+msgstr "%s: Datenverzeichnis »%s« wurde auf Anwenderwunsch nicht entfernt\n"
 
 #: initdb.c:803
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
-msgstr "%s: Transaktionslogverzeichnis „%s“ wurde auf Anwenderwunsch nicht entfernt\n"
+msgstr "%s: Transaktionslogverzeichnis »%s« wurde auf Anwenderwunsch nicht entfernt\n"
 
 #: initdb.c:824
 #, c-format
@@ -294,23 +294,23 @@
 "own the server process.\n"
 msgstr ""
 "%s: kann nicht als root ausgeführt werden\n"
-"Bitte loggen Sie sich (z.B. mit „su“) als der (unprivilegierte) Benutzer\n"
+"Bitte loggen Sie sich (z.B. mit »su«) als der (unprivilegierte) Benutzer\n"
 "ein, der Eigentümer des Serverprozesses sein soll.\n"
 
 #: initdb.c:860
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
-msgstr "%s: „%s“ ist keine gültige Serverkodierung\n"
+msgstr "%s: »%s« ist keine gültige Serverkodierung\n"
 
 #: initdb.c:974 initdb.c:3225
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht erzeugen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht erzeugen: %s\n"
 
 #: initdb.c:1003
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
-msgstr "%s: Datei „%s“ existiert nicht\n"
+msgstr "%s: Datei »%s« existiert nicht\n"
 
 #: initdb.c:1005 initdb.c:1014 initdb.c:1024
 #, c-format
@@ -324,12 +324,12 @@
 #: initdb.c:1011
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
-msgstr "%s: konnte nicht auf Datei „%s“ zugreifen: %s\n"
+msgstr "%s: konnte nicht auf Datei »%s« zugreifen: %s\n"
 
 #: initdb.c:1022
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
-msgstr "%s: Datei „%s“ ist keine normale Datei\n"
+msgstr "%s: Datei »%s« ist keine normale Datei\n"
 
 #: initdb.c:1167
 #, c-format
@@ -353,7 +353,7 @@
 #: initdb.c:1345 initdb.c:1365 initdb.c:1449 initdb.c:1465
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
-msgstr "%s: konnte Zugriffsrechte von „%s“ nicht ändern: %s\n"
+msgstr "%s: konnte Zugriffsrechte von »%s« nicht ändern: %s\n"
 
 #: initdb.c:1489
 #, c-format
@@ -366,7 +366,7 @@
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
 "Check your installation or specify the correct path using the option -L.\n"
 msgstr ""
-"%s: Eingabedatei „%s“ gehört nicht zu PostgreSQL %s\n"
+"%s: Eingabedatei »%s« gehört nicht zu PostgreSQL %s\n"
 "Prüfen Sie Ihre Installation oder geben Sie den korrekten Pfad mit der\n"
 "Option -L an.\n"
 
@@ -390,12 +390,12 @@
 #: initdb.c:1658
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
-msgstr "%s: konnte Passwort nicht aus Datei „%s“ lesen: %s\n"
+msgstr "%s: konnte Passwort nicht aus Datei »%s« lesen: %s\n"
 
 #: initdb.c:1661
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
-msgstr "%s: Passwortdatei „%s“ ist leer\n"
+msgstr "%s: Passwortdatei »%s« ist leer\n"
 
 #: initdb.c:1674
 #, c-format
@@ -421,12 +421,12 @@
 #: initdb.c:1977
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
-msgstr "%s: Locale-Name zu lang, wird ausgelassen: „%s“\n"
+msgstr "%s: Locale-Name zu lang, wird ausgelassen: »%s«\n"
 
 #: initdb.c:2002
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
-msgstr "%s: Locale-Name hat Nicht-ASCII-Zeichen, wird ausgelassen: „%s“\n"
+msgstr "%s: Locale-Name hat Nicht-ASCII-Zeichen, wird ausgelassen: »%s«\n"
 
 #: initdb.c:2071
 #, c-format
@@ -436,7 +436,7 @@
 #: initdb.c:2072
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
-msgstr "Verwenden Sie die Option „--debug“, um Einzelheiten zu sehen.\n"
+msgstr "Verwenden Sie die Option »--debug«, um Einzelheiten zu sehen.\n"
 
 #: initdb.c:2075
 #, c-format
@@ -502,12 +502,12 @@
 #: initdb.c:2631
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
-msgstr "%s: konnte alte Locale „%s“ nicht wiederherstellen\n"
+msgstr "%s: konnte alte Locale »%s« nicht wiederherstellen\n"
 
 #: initdb.c:2641
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
-msgstr "%s: ungültiger Locale-Name „%s“\n"
+msgstr "%s: ungültiger Locale-Name »%s«\n"
 
 #: initdb.c:2653
 #, c-format
@@ -737,7 +737,7 @@
 "--auth-local and --auth-host, the next time you run initdb.\n"
 msgstr ""
 "\n"
-"WARNUNG: Authentifizierung für lokale Verbindungen auf „trust“ gesetzt\n"
+"WARNUNG: Authentifizierung für lokale Verbindungen auf »trust« gesetzt\n"
 "Sie können dies ändern, indem Sie pg_hba.conf bearbeiten oder beim\n"
 "nächsten Aufruf von initdb die Option -A, oder --auth-local und\n"
 "--auth-host, verwenden.\n"
@@ -745,7 +745,7 @@
 #: initdb.c:2819
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
-msgstr "%s: ungültige Authentifizierungsmethode „%s“ für „%s“-Verbindungen\n"
+msgstr "%s: ungültige Authentifizierungsmethode »%s« für »%s«-Verbindungen\n"
 
 #: initdb.c:2833
 #, c-format
@@ -772,8 +772,8 @@
 "same directory as \"%s\".\n"
 "Check your installation.\n"
 msgstr ""
-"Das Programm „postgres“ wird von %s benötigt, aber wurde nicht im\n"
-"selben Verzeichnis wie „%s“ gefunden.\n"
+"Das Programm »postgres« wird von %s benötigt, aber wurde nicht im\n"
+"selben Verzeichnis wie »%s« gefunden.\n"
 "Prüfen Sie Ihre Installation.\n"
 
 #: initdb.c:2905
@@ -783,7 +783,7 @@
 "but was not the same version as %s.\n"
 "Check your installation.\n"
 msgstr ""
-"Das Programm „postgres“ wurde von %s gefunden,\n"
+"Das Programm »postgres« wurde von %s gefunden,\n"
 "aber es hatte nicht die gleiche Version wie %s.\n"
 "Prüfen Sie Ihre Installation.\n"
 
@@ -795,7 +795,7 @@
 #: initdb.c:2943
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
-msgstr "Der Datenbankcluster wird mit der Locale „%s“ initialisiert werden.\n"
+msgstr "Der Datenbankcluster wird mit der Locale »%s« initialisiert werden.\n"
 
 #: initdb.c:2946
 #, c-format
@@ -819,7 +819,7 @@
 #: initdb.c:2970
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
-msgstr "%s: konnte keine passende Kodierung für Locale „%s“ finden\n"
+msgstr "%s: konnte keine passende Kodierung für Locale »%s« finden\n"
 
 #: initdb.c:2972
 #, c-format
@@ -829,7 +829,7 @@
 #: initdb.c:2973 initdb.c:3549 initdb.c:3570
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
 #: initdb.c:2985
 #, c-format
@@ -837,13 +837,13 @@
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
 "The default database encoding will be set to \"%s\" instead.\n"
 msgstr ""
-"Die von der Locale gesetzte Kodierung „%s“ ist nicht als serverseitige Kodierung erlaubt.\n"
-"Die Standarddatenbankkodierung wird stattdessen auf „%s“ gesetzt.\n"
+"Die von der Locale gesetzte Kodierung »%s« ist nicht als serverseitige Kodierung erlaubt.\n"
+"Die Standarddatenbankkodierung wird stattdessen auf »%s« gesetzt.\n"
 
 #: initdb.c:2993
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
-msgstr "%s: Locale „%s“ benötigt nicht unterstützte Kodierung „%s“\n"
+msgstr "%s: Locale »%s« benötigt nicht unterstützte Kodierung »%s«\n"
 
 #: initdb.c:2996
 #, c-format
@@ -851,33 +851,33 @@
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
 "Rerun %s with a different locale selection.\n"
 msgstr ""
-"Kodierung „%s“ ist nicht als serverseitige Kodierung erlaubt.\n"
+"Kodierung »%s« ist nicht als serverseitige Kodierung erlaubt.\n"
 "Starten Sie %s erneut mit einer anderen Locale-Wahl.\n"
 
 #: initdb.c:3005
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
-msgstr "Die Standarddatenbankkodierung wurde entsprechend auf „%s“ gesetzt.\n"
+msgstr "Die Standarddatenbankkodierung wurde entsprechend auf »%s« gesetzt.\n"
 
 #: initdb.c:3076
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
-msgstr "%s: konnte keine passende Textsuchekonfiguration für Locale „%s“ finden\n"
+msgstr "%s: konnte keine passende Textsuchekonfiguration für Locale »%s« finden\n"
 
 #: initdb.c:3087
 #, c-format
 msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
-msgstr "%s: Warnung: passende Textsuchekonfiguration für Locale „%s“ ist unbekannt\n"
+msgstr "%s: Warnung: passende Textsuchekonfiguration für Locale »%s« ist unbekannt\n"
 
 #: initdb.c:3092
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
-msgstr "%s: Warnung: angegebene Textsuchekonfiguration „%s“ passt möglicherweise nicht zur Locale „%s“\n"
+msgstr "%s: Warnung: angegebene Textsuchekonfiguration »%s« passt möglicherweise nicht zur Locale »%s«\n"
 
 #: initdb.c:3097
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
-msgstr "Die Standardtextsuchekonfiguration wird auf „%s“ gesetzt.\n"
+msgstr "Die Standardtextsuchekonfiguration wird auf »%s« gesetzt.\n"
 
 #: initdb.c:3141 initdb.c:3219
 #, c-format
@@ -892,12 +892,12 @@
 #: initdb.c:3161 initdb.c:3243
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
-msgstr "%s: konnte Rechte des Verzeichnisses „%s“ nicht ändern: %s\n"
+msgstr "%s: konnte Rechte des Verzeichnisses »%s« nicht ändern: %s\n"
 
 #: initdb.c:3176 initdb.c:3258
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
-msgstr "%s: Verzeichnis „%s“ existiert aber ist nicht leer\n"
+msgstr "%s: Verzeichnis »%s« existiert aber ist nicht leer\n"
 
 #: initdb.c:3182
 #, c-format
@@ -907,13 +907,13 @@
 "with an argument other than \"%s\".\n"
 msgstr ""
 "Wenn Sie ein neues Datenbanksystem erzeugen wollen, entfernen oder leeren\n"
-"Sie das Verzeichnis „%s“ or führen Sie %s\n"
-"mit einem anderen Argument als „%s“ aus.\n"
+"Sie das Verzeichnis »%s« or führen Sie %s\n"
+"mit einem anderen Argument als »%s« aus.\n"
 
 #: initdb.c:3190 initdb.c:3271
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
-msgstr "%s: konnte nicht auf Verzeichnis „%s“ zugreifen: %s\n"
+msgstr "%s: konnte nicht auf Verzeichnis »%s« zugreifen: %s\n"
 
 #: initdb.c:3210
 #, c-format
@@ -927,12 +927,12 @@
 "remove or empty the directory \"%s\".\n"
 msgstr ""
 "Wenn Sie dort den Transaktionslog ablegen wollen, entfernen oder leeren\n"
-"Sie das Verzeichnis „%s“.\n"
+"Sie das Verzeichnis »%s«.\n"
 
 #: initdb.c:3282
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
-msgstr "%s: konnte symbolische Verknüpfung „%s“ nicht erzeugen: %s\n"
+msgstr "%s: konnte symbolische Verknüpfung »%s« nicht erzeugen: %s\n"
 
 #: initdb.c:3287
 #, c-format
@@ -947,7 +947,7 @@
 #: initdb.c:3303
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
-msgstr "Es enthält ein Verzeichnis „lost+found“, vielleicht weil es ein Einhängepunkt ist.\n"
+msgstr "Es enthält ein Verzeichnis »lost+found«, vielleicht weil es ein Einhängepunkt ist.\n"
 
 #: initdb.c:3306
 #, c-format
@@ -976,7 +976,7 @@
 #: initdb.c:3568
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: zu viele Kommandozeilenargumente (das erste ist „%s“)\n"
+msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
 #: initdb.c:3585
 #, c-format
@@ -991,7 +991,7 @@
 "\n"
 msgstr ""
 "Die Dateien, die zu diesem Datenbanksystem gehören, werden dem Benutzer\n"
-"„%s“ gehören. Diesem Benutzer muss auch der Serverprozess gehören.\n"
+"»%s« gehören. Diesem Benutzer muss auch der Serverprozess gehören.\n"
 "\n"
 
 #: initdb.c:3623
diff -Nru postgresql-9.5-9.5.2/src/bin/initdb/po/es.po postgresql-9.5-9.5.8/src/bin/initdb/po/es.po
--- postgresql-9.5-9.5.2/src/bin/initdb/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/initdb/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: initdb (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:43+0000\n"
+"POT-Creation-Date: 2017-05-21 17:32+0000\n"
 "PO-Revision-Date: 2015-09-29 23:26-0300\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
@@ -175,119 +175,119 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
 
-#: ../../port/dirmod.c:219
+#: ../../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "no se pudo definir un junction para «%s»: %s\n"
 
-#: ../../port/dirmod.c:294
+#: ../../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "no se pudo obtener junction para «%s»: %s\n"
 
-#: initdb.c:340
+#: initdb.c:339
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria agotada\n"
 
-#: initdb.c:450 initdb.c:1620
+#: initdb.c:449 initdb.c:1596
 #, 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:506 initdb.c:1016 initdb.c:1044
+#: initdb.c:505 initdb.c:992 initdb.c:1020
 #, 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:514 initdb.c:522 initdb.c:1023 initdb.c:1050
+#: initdb.c:513 initdb.c:521 initdb.c:999 initdb.c:1026
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: no se pudo escribir el archivo «%s»: %s\n"
 
-#: initdb.c:553
+#: initdb.c:552
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: no se pudo abrir el directorio «%s»: %s\n"
 
-#: initdb.c:577 initdb.c:2424
+#: initdb.c:576 initdb.c:2400
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: no se pudo hacer stat del archivo «%s»: %s\n"
 
-#: initdb.c:589
+#: initdb.c:588
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: no se pudo leer el directorio «%s»: %s\n"
 
-#: initdb.c:622 initdb.c:681
+#: initdb.c:621 initdb.c:680
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: no se pudo abrir el archivo «%s»: %s\n"
 
-#: initdb.c:693
+#: initdb.c:692
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: no se pudo sincronizar (fsync) el archivo «%s»: %s\n"
 
-#: initdb.c:712
+#: initdb.c:711
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: no se pudo ejecutar la orden «%s»: %s\n"
 
-#: initdb.c:728
+#: initdb.c:727
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: eliminando el directorio de datos «%s»\n"
 
-#: initdb.c:731
+#: initdb.c:730
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: no se pudo eliminar el directorio de datos\n"
 
-#: initdb.c:737
+#: initdb.c:736
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: eliminando el contenido del directorio «%s»\n"
 
-#: initdb.c:740
+#: initdb.c:739
 #, 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:746
+#: initdb.c:745
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: eliminando el directorio de registro de transacciones «%s»\n"
 
-#: initdb.c:749
+#: initdb.c:748
 #, 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:755
+#: initdb.c:754
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: eliminando el contenido del directorio de registro de transacciones «%s»\n"
 
-#: initdb.c:758
+#: initdb.c:757
 #, 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:767
+#: initdb.c:766
 #, 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:772
+#: initdb.c:771
 #, 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:793
+#: initdb.c:792
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -298,22 +298,17 @@
 "Por favor conéctese (usando, por ejemplo, «su») con un usuario no privilegiado,\n"
 "quien ejecutará el proceso servidor.\n"
 
-#: initdb.c:829
+#: initdb.c:828
 #, 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:943 initdb.c:3217
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: no se pudo crear el directorio «%s»: %s\n"
-
-#: initdb.c:972
+#: initdb.c:948
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: el archivo «%s» no existe\n"
 
-#: initdb.c:974 initdb.c:983 initdb.c:993
+#: initdb.c:950 initdb.c:959 initdb.c:969
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -322,46 +317,46 @@
 "Esto puede significar que tiene una instalación corrupta o ha\n"
 "identificado el directorio equivocado con la opción -L.\n"
 
-#: initdb.c:980
+#: initdb.c:956
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: no se pudo acceder al archivo «%s»: %s\n"
 
-#: initdb.c:991
+#: initdb.c:967
 #, 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:1136
+#: initdb.c:1112
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "seleccionando el valor para max_connections ... "
 
-#: initdb.c:1166
+#: initdb.c:1142
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "seleccionando el valor para shared_buffers ... "
 
-#: initdb.c:1199
+#: initdb.c:1175
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "seleccionando implementación de memoria compartida dinámica ..."
 
-#: initdb.c:1217
+#: initdb.c:1193
 msgid "creating configuration files ... "
 msgstr "creando archivos de configuración ... "
 
-#: initdb.c:1314 initdb.c:1334 initdb.c:1418 initdb.c:1434
+#: initdb.c:1290 initdb.c:1310 initdb.c:1394 initdb.c:1410
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
 msgstr "%s: no se pudo cambiar los permisos de «%s»: %s\n"
 
-#: initdb.c:1458
+#: initdb.c:1434
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "creando base de datos template1 en %s/base/1 ... "
 
-#: initdb.c:1474
+#: initdb.c:1450
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -370,156 +365,156 @@
 "%s: el archivo de entrada «%s» no pertenece a PostgreSQL %s\n"
 "Verifique su instalación o especifique la ruta correcta usando la opción -L.\n"
 
-#: initdb.c:1561
+#: initdb.c:1537
 msgid "initializing pg_authid ... "
 msgstr "inicializando pg_authid ... "
 
-#: initdb.c:1595
+#: initdb.c:1571
 msgid "Enter new superuser password: "
 msgstr "Ingrese la nueva contraseña del superusuario: "
 
-#: initdb.c:1596
+#: initdb.c:1572
 msgid "Enter it again: "
 msgstr "Ingrésela nuevamente: "
 
-#: initdb.c:1599
+#: initdb.c:1575
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Las constraseñas no coinciden.\n"
 
-#: initdb.c:1627
+#: initdb.c:1603
 #, 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:1630
+#: initdb.c:1606
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
 msgstr "%s: el archivo de contraseña «%s» está vacío\n"
 
-#: initdb.c:1643
+#: initdb.c:1619
 #, c-format
 msgid "setting password ... "
 msgstr "estableciendo contraseña ... "
 
-#: initdb.c:1743
+#: initdb.c:1719
 msgid "initializing dependencies ... "
 msgstr "inicializando dependencias ... "
 
-#: initdb.c:1771
+#: initdb.c:1747
 msgid "creating system views ... "
 msgstr "creando las vistas de sistema ... "
 
-#: initdb.c:1807
+#: initdb.c:1783
 msgid "loading system objects' descriptions ... "
 msgstr "cargando las descripciones de los objetos del sistema ... "
 
-#: initdb.c:1913
+#: initdb.c:1889
 msgid "creating collations ... "
 msgstr "creando algoritmos de ordenamiento ... "
 
-#: initdb.c:1946
+#: initdb.c:1922
 #, 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:1971
+#: initdb.c:1947
 #, 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:2040
+#: initdb.c:2016
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "No se encontraron configuraciones regionales utilizables.\n"
 
-#: initdb.c:2041
+#: initdb.c:2017
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
 msgstr "Use la opción «--debug» para ver detalles.\n"
 
-#: initdb.c:2044
+#: initdb.c:2020
 #, c-format
 msgid "not supported on this platform\n"
 msgstr "no está soportado en esta plataforma\n"
 
-#: initdb.c:2059
+#: initdb.c:2035
 msgid "creating conversions ... "
 msgstr "creando conversiones ... "
 
-#: initdb.c:2094
+#: initdb.c:2070
 msgid "creating dictionaries ... "
 msgstr "creando diccionarios ... "
 
-#: initdb.c:2148
+#: initdb.c:2124
 msgid "setting privileges on built-in objects ... "
 msgstr "estableciendo privilegios en objetos predefinidos ... "
 
-#: initdb.c:2206
+#: initdb.c:2182
 msgid "creating information schema ... "
 msgstr "creando el esquema de información ... "
 
-#: initdb.c:2262
+#: initdb.c:2238
 msgid "loading PL/pgSQL server-side language ... "
 msgstr "instalando el lenguaje PL/pgSQL ... "
 
-#: initdb.c:2287
+#: initdb.c:2263
 msgid "vacuuming database template1 ... "
 msgstr "haciendo vacuum a la base de datos template1 ... "
 
-#: initdb.c:2340
+#: initdb.c:2316
 msgid "copying template1 to template0 ... "
 msgstr "copiando template1 a template0 ... "
 
-#: initdb.c:2372
+#: initdb.c:2348
 msgid "copying template1 to postgres ... "
 msgstr "copiando template1 a postgres ... "
 
-#: initdb.c:2407
+#: initdb.c:2383
 msgid "syncing data to disk ... "
 msgstr "sincronizando los datos a disco ... "
 
-#: initdb.c:2501
+#: initdb.c:2477
 #, c-format
 msgid "caught signal\n"
 msgstr "se ha capturado una señal\n"
 
-#: initdb.c:2507
+#: initdb.c:2483
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "no se pudo escribir al proceso hijo: %s\n"
 
-#: initdb.c:2515
+#: initdb.c:2491
 #, c-format
 msgid "ok\n"
 msgstr "hecho\n"
 
-#: initdb.c:2605
+#: initdb.c:2581
 #, c-format
 msgid "%s: setlocale() failed\n"
 msgstr "%s: setlocale() falló\n"
 
-#: initdb.c:2623
+#: initdb.c:2599
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
 msgstr "%s: no se pudo restaurar la configuración regional anterior «%s»\n"
 
-#: initdb.c:2633
+#: initdb.c:2609
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: nombre de configuración regional «%s» no es válido\n"
 
-#: initdb.c:2645
+#: initdb.c:2621
 #, c-format
 msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
 msgstr "%s: configuración regional inválida; revise las variables de entorno LANG y LC_*\n"
 
-#: initdb.c:2673
+#: initdb.c:2649
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: codificaciones no coinciden\n"
 
-#: initdb.c:2675
+#: initdb.c:2651
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -534,7 +529,7 @@
 "Ejecute %s nuevamente y no especifique una codificación, o bien especifique\n"
 "una combinación adecuada.\n"
 
-#: initdb.c:2747
+#: initdb.c:2723
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -543,17 +538,17 @@
 "%s inicializa un cluster de base de datos PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2748
+#: initdb.c:2724
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: initdb.c:2749
+#: initdb.c:2725
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPCIÓN]... [DATADIR]\n"
 
-#: initdb.c:2750
+#: initdb.c:2726
 #, c-format
 msgid ""
 "\n"
@@ -562,45 +557,45 @@
 "\n"
 "Opciones:\n"
 
-#: initdb.c:2751
+#: initdb.c:2727
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr ""
 "  -A, --auth=MÉTODO         método de autentificación por omisión para\n"
 "                            conexiones locales\n"
 
-#: initdb.c:2752
+#: initdb.c:2728
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr ""
 "  --auth-host=MÉTODO        método de autentificación por omisión para\n"
 "                            conexiones locales TCP/IP\n"
 
-#: initdb.c:2753
+#: initdb.c:2729
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr ""
 "  --auth-local=MÉTODO       método de autentificación por omisión para\n"
 "                            conexiones de socket local\n"
 
-#: initdb.c:2754
+#: initdb.c:2730
 #, 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:2755
+#: initdb.c:2731
 #, 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:2756
+#: initdb.c:2732
 #, 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:2757
+#: initdb.c:2733
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -614,17 +609,17 @@
 "                            en la categoría respectiva (el valor por omisión\n"
 "                            es tomado de variables de ambiente)\n"
 
-#: initdb.c:2761
+#: initdb.c:2737
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           equivalente a --locale=C\n"
 
-#: initdb.c:2762
+#: initdb.c:2738
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=ARCHIVO      leer contraseña del nuevo superusuario del archivo\n"
 
-#: initdb.c:2763
+#: initdb.c:2739
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -633,24 +628,24 @@
 "  -T, --text-search-config=CONF\n"
 "                            configuración de búsqueda en texto por omisión\n"
 
-#: initdb.c:2765
+#: initdb.c:2741
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=USUARIO    nombre del superusuario del cluster\n"
 
-#: initdb.c:2766
+#: initdb.c:2742
 #, 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:2767
+#: initdb.c:2743
 #, c-format
 msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr ""
 "  -X, --xlogdir=XLOGDIR     ubicación del directorio del registro de\n"
 "                            transacciones\n"
 
-#: initdb.c:2768
+#: initdb.c:2744
 #, c-format
 msgid ""
 "\n"
@@ -659,42 +654,42 @@
 "\n"
 "Opciones menos usadas:\n"
 
-#: initdb.c:2769
+#: initdb.c:2745
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               genera mucha salida de depuración\n"
 
-#: initdb.c:2770
+#: initdb.c:2746
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      activar sumas de verificación en páginas de datos\n"
 
-#: initdb.c:2771
+#: initdb.c:2747
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORIO             donde encontrar los archivos de entrada\n"
 
-#: initdb.c:2772
+#: initdb.c:2748
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             no limpiar después de errores\n"
 
-#: initdb.c:2773
+#: initdb.c:2749
 #, c-format
 msgid "  -N, --nosync              do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --nosync              no esperar que los cambios se sincronicen a disco\n"
 
-#: initdb.c:2774
+#: initdb.c:2750
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                muestra variables internas\n"
 
-#: initdb.c:2775
+#: initdb.c:2751
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr "  -S, --sync-only           sólo sincronizar el directorio de datos\n"
 
-#: initdb.c:2776
+#: initdb.c:2752
 #, c-format
 msgid ""
 "\n"
@@ -703,17 +698,17 @@
 "\n"
 "Otras opciones:\n"
 
-#: initdb.c:2777
+#: initdb.c:2753
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             mostrar información de version y salir\n"
 
-#: initdb.c:2778
+#: initdb.c:2754
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                mostrar esta ayuda y salir\n"
 
-#: initdb.c:2779
+#: initdb.c:2755
 #, c-format
 msgid ""
 "\n"
@@ -724,7 +719,7 @@
 "Si el directorio de datos no es especificado, se usa la variable de\n"
 "ambiente PGDATA.\n"
 
-#: initdb.c:2781
+#: initdb.c:2757
 #, c-format
 msgid ""
 "\n"
@@ -733,7 +728,7 @@
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2789
+#: initdb.c:2765
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -745,19 +740,19 @@
 "Puede cambiar esto editando pg_hba.conf o usando el parámetro -A,\n"
 "o --auth-local y --auth-host la próxima vez que ejecute initdb.\n"
 
-#: initdb.c:2811
+#: initdb.c:2787
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
 msgstr "%s: método de autentificación «%s» no válido para conexiones «%s»\n"
 
-#: initdb.c:2825
+#: initdb.c:2801
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr ""
 "%s: debe especificar una contraseña al superusuario para activar\n"
 "autentificación %s\n"
 
-#: initdb.c:2852
+#: initdb.c:2828
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -769,7 +764,7 @@
 "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:2890
+#: initdb.c:2866
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -780,7 +775,7 @@
 "directorio que «%s».\n"
 "Verifique su instalación.\n"
 
-#: initdb.c:2897
+#: initdb.c:2873
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -791,17 +786,17 @@
 "de la misma versión que «%s».\n"
 "Verifique su instalación.\n"
 
-#: initdb.c:2916
+#: initdb.c:2892
 #, 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:2935
+#: initdb.c:2911
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "El cluster será inicializado con configuración regional «%s».\n"
 
-#: initdb.c:2938
+#: initdb.c:2914
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -820,24 +815,24 @@
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2962
+#: initdb.c:2938
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr ""
 "%s: no se pudo encontrar una codificación apropiada para\n"
 "la configuración regional «%s»\n"
 
-#: initdb.c:2964
+#: initdb.c:2940
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Ejecute %s con la opción -E.\n"
 
-#: initdb.c:2965 initdb.c:3541 initdb.c:3562
+#: initdb.c:2941 initdb.c:3547 initdb.c:3568
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para obtener mayor información.\n"
 
-#: initdb.c:2977
+#: initdb.c:2953
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -847,12 +842,12 @@
 "no puede ser usada como codificación del lado del servidor.\n"
 "La codificación por omisión será «%s».\n"
 
-#: initdb.c:2985
+#: initdb.c:2961
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
 msgstr "%s: la configuración regional «%s» requiere la codificación no soportada «%s»\n"
 
-#: initdb.c:2988
+#: initdb.c:2964
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -862,58 +857,63 @@
 "del servidor.\n"
 "Ejecute %s nuevamente con una selección de configuración regional diferente.\n"
 
-#: initdb.c:2997
+#: initdb.c:2973
 #, 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:3068
+#: initdb.c:3044
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
 msgstr ""
 "%s: no se pudo encontrar una configuración para búsqueda en texto apropiada\n"
 "para la configuración regional «%s»\n"
 
-#: initdb.c:3079
+#: initdb.c:3055
 #, c-format
 msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
 msgstr ""
 "%s: atención: la configuración de búsqueda en texto apropiada para\n"
 "la configuración regional «%s» es desconocida\n"
 
-#: initdb.c:3084
+#: initdb.c:3060
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
 msgstr ""
 "%s: atención: la configuración de búsqueda en texto «%s» especificada\n"
 "podría no coincidir con la configuración regional «%s»\n"
 
-#: initdb.c:3089
+#: initdb.c:3065
 #, 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:3133 initdb.c:3211
+#: initdb.c:3109 initdb.c:3195
 #, c-format
 msgid "creating directory %s ... "
 msgstr "creando el directorio %s ... "
 
-#: initdb.c:3147 initdb.c:3229
+#: initdb.c:3115 initdb.c:3201 initdb.c:3269 initdb.c:3324
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: no se pudo crear el directorio «%s»: %s\n"
+
+#: initdb.c:3127 initdb.c:3213
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "corrigiendo permisos en el directorio existente %s ... "
 
-#: initdb.c:3153 initdb.c:3235
+#: initdb.c:3133 initdb.c:3219
 #, 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:3168 initdb.c:3250
+#: initdb.c:3148 initdb.c:3234
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: el directorio «%s» no está vacío\n"
 
-#: initdb.c:3174
+#: initdb.c:3154
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -924,17 +924,17 @@
 "el directorio «%s», o ejecute %s\n"
 "con un argumento distinto de «%s».\n"
 
-#: initdb.c:3182 initdb.c:3263 initdb.c:3575
+#: initdb.c:3162 initdb.c:3247 initdb.c:3581
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: no se pudo acceder al directorio «%s»: %s\n"
 
-#: initdb.c:3202
+#: initdb.c:3186
 #, 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:3256
+#: initdb.c:3240
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -943,27 +943,27 @@
 "Si quiere almacenar el directorio de registro de transacciones ahí,\n"
 "elimine o vacíe el directorio «%s».\n"
 
-#: initdb.c:3274
+#: initdb.c:3255
 #, 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:3279
+#: initdb.c:3260
 #, 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:3292
+#: initdb.c:3284
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
 msgstr "Contiene un archivo invisible, quizás por ser un punto de montaje.\n"
 
-#: initdb.c:3295
+#: initdb.c:3287
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
 msgstr "Contiene un directorio lost+found, quizás por ser un punto de montaje.\n"
 
-#: initdb.c:3298
+#: initdb.c:3290
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -972,34 +972,34 @@
 "Usar un punto de montaje directamente como directorio de datos no es\n"
 "recomendado.  Cree un subdirectorio bajo el punto de montaje.\n"
 
-#: initdb.c:3317
+#: initdb.c:3309
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "creando subdirectorios ... "
 
-#: initdb.c:3485
+#: initdb.c:3491
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Ejecutando en modo de depuración.\n"
 
-#: initdb.c:3489
+#: initdb.c:3495
 #, 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:3560
+#: initdb.c:3566
 #, 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:3586
+#: initdb.c:3592
 #, 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:3608
+#: initdb.c:3614
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1010,17 +1010,17 @@
 "Este usuario también debe ser quien ejecute el proceso servidor.\n"
 "\n"
 
-#: initdb.c:3624
+#: initdb.c:3630
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Las sumas de verificación en páginas de datos han sido activadas.\n"
 
-#: initdb.c:3626
+#: initdb.c:3632
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Las sumas de verificación en páginas de datos han sido desactivadas.\n"
 
-#: initdb.c:3635
+#: initdb.c:3641
 #, c-format
 msgid ""
 "\n"
@@ -1032,7 +1032,7 @@
 "El directorio de datos podría corromperse si el sistema operativo sufre\n"
 "una caída.\n"
 
-#: initdb.c:3644
+#: initdb.c:3650
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/initdb/po/fr.po postgresql-9.5-9.5.8/src/bin/initdb/po/fr.po
--- postgresql-9.5-9.5.2/src/bin/initdb/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/initdb/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 # translation of initdb.po to fr_fr
 # french message translation file for initdb
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 #
 # Guillaume Lelarge <guillaume@lelarge.info>, 2004-2009.
-# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
+# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2016-02-17 02:43+0000\n"
 "PO-Revision-Date: 2016-02-21 15:07+0100\n"
@@ -15,50 +15,50 @@
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
 msgid "could not identify current directory: %s"
-msgstr "n'a pas pu identifier le répertoire courant : %s"
+msgstr "n'a pas pu identifier le répertoire courant : %s"
 
 #: ../../common/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "binaire « %s » invalide"
+msgstr "binaire « %s » invalide"
 
 #: ../../common/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "n'a pas pu lire le binaire « %s »"
+msgstr "n'a pas pu lire le binaire « %s »"
 
 #: ../../common/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "n'a pas pu trouver un « %s » à exécuter"
+msgstr "n'a pas pu trouver un « %s » à exécuter"
 
 #: ../../common/exec.c:257 ../../common/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "n'a pas pu modifier le répertoire par « %s » : %s"
+msgstr "n'a pas pu modifier le répertoire par « %s » : %s"
 
 #: ../../common/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "n'a pas pu lire le lien symbolique « %s »"
+msgstr "n'a pas pu lire le lien symbolique « %s »"
 
 #: ../../common/exec.c:523
 #, c-format
 msgid "pclose failed: %s"
-msgstr "échec de pclose : %s"
+msgstr "échec de pclose : %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98
 #, c-format
 msgid "out of memory\n"
-msgstr "mémoire épuisée\n"
+msgstr "mémoire épuisée\n"
 
 #: ../../common/fe_memutils.c:92
 #, c-format
@@ -68,22 +68,22 @@
 #: ../../common/pgfnames.c:45
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
-msgstr "n'a pas pu ouvrir le répertoire « %s » : %s\n"
+msgstr "n'a pas pu ouvrir le répertoire « %s » : %s\n"
 
 #: ../../common/pgfnames.c:72
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
-msgstr "n'a pas pu lire le répertoire « %s » : %s\n"
+msgstr "n'a pas pu lire le répertoire « %s » : %s\n"
 
 #: ../../common/pgfnames.c:84
 #, c-format
 msgid "could not close directory \"%s\": %s\n"
-msgstr "n'a pas pu fermer le répertoire « %s » : %s\n"
+msgstr "n'a pas pu fermer le répertoire « %s » : %s\n"
 
 #: ../../common/restricted_token.c:68
 #, c-format
 msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s : ATTENTION : ne peut pas crér les jetons restreints sur cette plateforme\n"
+msgstr "%s : ATTENTION : ne peut pas crér les jetons restreints sur cette plateforme\n"
 
 #: ../../common/restricted_token.c:77
 #, c-format
@@ -98,39 +98,39 @@
 #: ../../common/restricted_token.c:110
 #, c-format
 msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s : n'a pas pu créer le jeton restreint : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu créer le jeton restreint : code d'erreur %lu\n"
 
 #: ../../common/restricted_token.c:132
 #, c-format
 msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s : n'a pas pu démarrer le processus pour la commande « %s » : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu démarrer le processus pour la commande « %s » : code d'erreur %lu\n"
 
 #: ../../common/restricted_token.c:170
 #, c-format
 msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr "%s : n'a pas pu ré-exécuter le jeton restreint : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu ré-exécuter le jeton restreint : code d'erreur %lu\n"
 
 #: ../../common/restricted_token.c:186
 #, c-format
 msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s : n'a pas pu récupérer le code de statut du sous-processus : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu récupérer le code de statut du sous-processus : code d'erreur %lu\n"
 
 #: ../../common/rmtree.c:77
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr ""
-"n'a pas pu récupérer les informations sur le fichier ou répertoire\n"
-"« %s » : %s\n"
+"n'a pas pu récupérer les informations sur le fichier ou répertoire\n"
+"« %s » : %s\n"
 
 #: ../../common/rmtree.c:104 ../../common/rmtree.c:121
 #, 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"
+msgstr "n'a pas pu supprimer le fichier ou répertoire « %s » : %s\n"
 
 #: ../../common/username.c:45
 #, c-format
 msgid "could not look up effective user ID %ld: %s"
-msgstr "n'a pas pu trouver l'identifiant réel %ld de l'utilisateur : %s"
+msgstr "n'a pas pu trouver l'identifiant réel %ld de l'utilisateur : %s"
 
 #: ../../common/username.c:47
 msgid "user does not exist"
@@ -139,12 +139,12 @@
 #: ../../common/username.c:62
 #, c-format
 msgid "user name lookup failure: error code %lu"
-msgstr "échec de la recherche du nom d'utilisateur : code erreur %lu"
+msgstr "échec de la recherche du nom d'utilisateur : code erreur %lu"
 
 #: ../../common/wait_error.c:47
 #, c-format
 msgid "command not executable"
-msgstr "commande non exécutable"
+msgstr "commande non exécutable"
 
 #: ../../common/wait_error.c:51
 #, c-format
@@ -154,138 +154,138 @@
 #: ../../common/wait_error.c:56
 #, c-format
 msgid "child process exited with exit code %d"
-msgstr "le processus fils a quitté avec le code de sortie %d"
+msgstr "le processus fils a quitté avec le code de sortie %d"
 
 #: ../../common/wait_error.c:63
 #, c-format
 msgid "child process was terminated by exception 0x%X"
-msgstr "le processus fils a été terminé par l'exception 0x%X"
+msgstr "le processus fils a été terminé par l'exception 0x%X"
 
 #: ../../common/wait_error.c:73
 #, c-format
 msgid "child process was terminated by signal %s"
-msgstr "le processus fils a été terminé par le signal %s"
+msgstr "le processus fils a été terminé par le signal %s"
 
 #: ../../common/wait_error.c:77
 #, c-format
 msgid "child process was terminated by signal %d"
-msgstr "le processus fils a été terminé par le signal %d"
+msgstr "le processus fils a été terminé par le signal %d"
 
 #: ../../common/wait_error.c:82
 #, c-format
 msgid "child process exited with unrecognized status %d"
-msgstr "le processus fils a quitté avec un statut %d non reconnu"
+msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
 #: ../../port/dirmod.c:219
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
-msgstr "n'a pas pu configurer la jonction pour « %s » : %s\n"
+msgstr "n'a pas pu configurer la jonction pour « %s » : %s\n"
 
 #: ../../port/dirmod.c:294
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
-msgstr "n'a pas pu obtenir la jonction pour « %s » : %s\n"
+msgstr "n'a pas pu obtenir la jonction pour « %s » : %s\n"
 
 #: initdb.c:339
 #, c-format
 msgid "%s: out of memory\n"
-msgstr "%s : mémoire épuisée\n"
+msgstr "%s : mémoire épuisée\n"
 
 #: initdb.c:449 initdb.c:1596
 #, 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"
+msgstr "%s : n'a pas pu ouvrir le fichier « %s » en lecture : %s\n"
 
 #: initdb.c:505 initdb.c:992 initdb.c:1020
 #, 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"
+msgstr "%s : n'a pas pu ouvrir le fichier « %s » en écriture : %s\n"
 
 #: initdb.c:513 initdb.c:521 initdb.c:999 initdb.c:1026
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s : n'a pas pu écrire le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu écrire le fichier « %s » : %s\n"
 
 #: initdb.c:552
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s : n'a pas pu ouvrir le répertoire « %s » : %s\n"
+msgstr "%s : n'a pas pu ouvrir le répertoire « %s » : %s\n"
 
 #: initdb.c:576 initdb.c:2400
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
-msgstr "%s : n'a pas pu récupérer les informations sur le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu récupérer les informations sur le fichier « %s » : %s\n"
 
 #: initdb.c:588
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
-msgstr "%s : n'a pas pu lire le répertoire « %s » : %s\n"
+msgstr "%s : n'a pas pu lire le répertoire « %s » : %s\n"
 
 #: initdb.c:621 initdb.c:680
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s : n'a pas pu ouvrir le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu ouvrir le fichier « %s » : %s\n"
 
 #: initdb.c:692
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
-msgstr "%s : n'a pas pu synchroniser sur disque le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu synchroniser sur disque le fichier « %s » : %s\n"
 
 #: initdb.c:711
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
-msgstr "%s : n'a pas pu exécuter la commande « %s » : %s\n"
+msgstr "%s : n'a pas pu exécuter la commande « %s » : %s\n"
 
 #: initdb.c:727
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
-msgstr "%s : suppression du répertoire des données « %s »\n"
+msgstr "%s : suppression du répertoire des données « %s »\n"
 
 #: initdb.c:730
 #, c-format
 msgid "%s: failed to remove data directory\n"
-msgstr "%s : échec de la suppression du répertoire des données\n"
+msgstr "%s : échec de la suppression du répertoire des données\n"
 
 #: initdb.c:736
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
-msgstr "%s : suppression du contenu du répertoire des données « %s »\n"
+msgstr "%s : suppression du contenu du répertoire des données « %s »\n"
 
 #: initdb.c:739
 #, 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"
+msgstr "%s : échec de la suppression du contenu du répertoire des données\n"
 
 #: initdb.c:745
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
-msgstr "%s : suppression du répertoire des journaux de transaction « %s »\n"
+msgstr "%s : suppression du répertoire des journaux de transaction « %s »\n"
 
 #: initdb.c:748
 #, 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"
+msgstr "%s : échec de la suppression du répertoire des journaux de transaction\n"
 
 #: initdb.c:754
 #, 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"
+msgstr "%s : suppression du contenu du répertoire des journaux de transaction « %s »\n"
 
 #: initdb.c:757
 #, 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"
+msgstr "%s : échec de la suppression du contenu du répertoire des journaux de transaction\n"
 
 #: initdb.c:766
 #, 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"
+msgstr "%s : répertoire des données « %s » non supprimé à la demande de l'utilisateur\n"
 
 #: initdb.c:771
 #, 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"
+"%s : répertoire des journaux de transaction « %s » non supprimé à la demande\n"
 "de l'utilisateur\n"
 
 #: initdb.c:792
@@ -295,19 +295,19 @@
 "Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
 "own the server process.\n"
 msgstr ""
-"%s : ne peut pas être exécuté en tant qu'utilisateur root\n"
-"Connectez-vous (par exemple en utilisant « su ») sous l'utilisateur (non\n"
-" privilégié) qui sera propriétaire du processus serveur.\n"
+"%s : ne peut pas être exécuté en tant qu'utilisateur root\n"
+"Connectez-vous (par exemple en utilisant « su ») sous l'utilisateur (non\n"
+" privilégié) qui sera propriétaire du processus serveur.\n"
 
 #: initdb.c:828
 #, 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"
+msgstr "%s : « %s » n'est pas un nom d'encodage serveur valide\n"
 
 #: initdb.c:948
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
-msgstr "%s : le fichier « %s » n'existe pas\n"
+msgstr "%s : le fichier « %s » n'existe pas\n"
 
 #: initdb.c:950 initdb.c:959 initdb.c:969
 #, c-format
@@ -316,46 +316,46 @@
 "the wrong directory with the invocation option -L.\n"
 msgstr ""
 "Cela peut signifier que votre installation est corrompue ou que vous avez\n"
-"identifié le mauvais répertoire avec l'option -L.\n"
+"identifié le mauvais répertoire avec l'option -L.\n"
 
 #: initdb.c:956
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
-msgstr "%s : n'a pas pu accéder au fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu accéder au fichier « %s » : %s\n"
 
 #: initdb.c:967
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
-msgstr "%s : « %s » n'est pas un fichier\n"
+msgstr "%s : « %s » n'est pas un fichier\n"
 
 #: initdb.c:1112
 #, c-format
 msgid "selecting default max_connections ... "
-msgstr "sélection de la valeur par défaut de max_connections... "
+msgstr "sélection de la valeur par défaut de max_connections... "
 
 #: initdb.c:1142
 #, c-format
 msgid "selecting default shared_buffers ... "
-msgstr "sélection de la valeur par défaut pour shared_buffers... "
+msgstr "sélection de la valeur par défaut pour shared_buffers... "
 
 #: initdb.c:1175
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
-msgstr "sélection de l'implémentation de la mémoire partagée dynamique..."
+msgstr "sélection de l'implémentation de la mémoire partagée dynamique..."
 
 #: initdb.c:1193
 msgid "creating configuration files ... "
-msgstr "création des fichiers de configuration... "
+msgstr "création des fichiers de configuration... "
 
 #: initdb.c:1290 initdb.c:1310 initdb.c:1394 initdb.c:1410
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
-msgstr "%s : n'a pas pu modifier les droits de « %s » : %s\n"
+msgstr "%s : n'a pas pu modifier les droits de « %s » : %s\n"
 
 #: initdb.c:1434
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
-msgstr "création de la base de données template1 dans %s/base/1... "
+msgstr "création de la base de données template1 dans %s/base/1... "
 
 #: initdb.c:1450
 #, c-format
@@ -363,8 +363,8 @@
 "%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 : le fichier « %s » n'appartient pas à PostgreSQL %s\n"
-"Vérifiez votre installation ou indiquez le bon chemin avec l'option -L.\n"
+"%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:1537
 msgid "initializing pg_authid ... "
@@ -376,7 +376,7 @@
 
 #: initdb.c:1572
 msgid "Enter it again: "
-msgstr "Saisissez-le à nouveau : "
+msgstr "Saisissez-le à nouveau : "
 
 #: initdb.c:1575
 #, c-format
@@ -386,12 +386,12 @@
 #: initdb.c:1603
 #, 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"
+msgstr "%s : n'a pas pu lire le mot de passe à partir du fichier « %s » : %s\n"
 
 #: initdb.c:1606
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
-msgstr "%s : le fichier de mots de passe « %s » est vide\n"
+msgstr "%s : le fichier de mots de passe « %s » est vide\n"
 
 #: initdb.c:1619
 #, c-format
@@ -400,52 +400,52 @@
 
 #: initdb.c:1719
 msgid "initializing dependencies ... "
-msgstr "initialisation des dépendances... "
+msgstr "initialisation des dépendances... "
 
 #: initdb.c:1747
 msgid "creating system views ... "
-msgstr "création des vues système... "
+msgstr "création des vues système... "
 
 #: initdb.c:1783
 msgid "loading system objects' descriptions ... "
-msgstr "chargement de la description des objets système... "
+msgstr "chargement de la description des objets système... "
 
 #: initdb.c:1889
 msgid "creating collations ... "
-msgstr "création des collationnements... "
+msgstr "création des collationnements... "
 
 #: initdb.c:1922
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
-msgstr "%s : nom de locale trop long, ignoré : « %s »\n"
+msgstr "%s : nom de locale trop long, ignoré : « %s »\n"
 
 #: initdb.c:1947
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
-msgstr "%s : le nom de la locale contient des caractères non ASCII, ignoré : « %s »\n"
+msgstr "%s : le nom de la locale contient des caractères non ASCII, ignoré : « %s »\n"
 
 #: initdb.c:2016
 #, c-format
 msgid "No usable system locales were found.\n"
-msgstr "Aucune locale système utilisable n'a été trouvée.\n"
+msgstr "Aucune locale système utilisable n'a été trouvée.\n"
 
 #: initdb.c:2017
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
-msgstr "Utilisez l'option « --debug » pour voir le détail.\n"
+msgstr "Utilisez l'option « --debug » pour voir le détail.\n"
 
 #: initdb.c:2020
 #, c-format
 msgid "not supported on this platform\n"
-msgstr "non supporté sur cette plateforme\n"
+msgstr "non supporté sur cette plateforme\n"
 
 #: initdb.c:2035
 msgid "creating conversions ... "
-msgstr "création des conversions... "
+msgstr "création des conversions... "
 
 #: initdb.c:2070
 msgid "creating dictionaries ... "
-msgstr "création des dictionnaires... "
+msgstr "création des dictionnaires... "
 
 #: initdb.c:2124
 msgid "setting privileges on built-in objects ... "
@@ -453,7 +453,7 @@
 
 #: initdb.c:2182
 msgid "creating information schema ... "
-msgstr "création du schéma d'informations... "
+msgstr "création du schéma d'informations... "
 
 #: initdb.c:2238
 msgid "loading PL/pgSQL server-side language ... "
@@ -461,7 +461,7 @@
 
 #: initdb.c:2263
 msgid "vacuuming database template1 ... "
-msgstr "lancement du vacuum sur la base de données template1... "
+msgstr "lancement du vacuum sur la base de données template1... "
 
 #: initdb.c:2316
 msgid "copying template1 to template0 ... "
@@ -473,17 +473,17 @@
 
 #: initdb.c:2383
 msgid "syncing data to disk ... "
-msgstr "synchronisation des données sur disque"
+msgstr "synchronisation des données sur disque"
 
 #: initdb.c:2477
 #, c-format
 msgid "caught signal\n"
-msgstr "signal reçu\n"
+msgstr "signal reçu\n"
 
 #: initdb.c:2483
 #, c-format
 msgid "could not write to child process: %s\n"
-msgstr "n'a pas pu écrire au processus fils : %s\n"
+msgstr "n'a pas pu écrire au processus fils : %s\n"
 
 #: initdb.c:2491
 #, c-format
@@ -493,27 +493,27 @@
 #: initdb.c:2581
 #, c-format
 msgid "%s: setlocale() failed\n"
-msgstr "%s : échec de setlocale\n"
+msgstr "%s : échec de setlocale\n"
 
 #: initdb.c:2599
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
-msgstr "%s : n'a pas pu restaurer l'ancienne locale « %s »\n"
+msgstr "%s : n'a pas pu restaurer l'ancienne locale « %s »\n"
 
 #: initdb.c:2609
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
-msgstr "%s : nom de locale invalide (« %s »)\n"
+msgstr "%s : nom de locale invalide (« %s »)\n"
 
 #: initdb.c:2621
 #, c-format
 msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
-msgstr "%s : configuration invalide de la locale ; vérifiez les variables d'environnement LANG et LC_*\n"
+msgstr "%s : configuration invalide de la locale ; vérifiez les variables d'environnement LANG et LC_*\n"
 
 #: initdb.c:2649
 #, c-format
 msgid "%s: encoding mismatch\n"
-msgstr "%s : différence d'encodage\n"
+msgstr "%s : différence d'encodage\n"
 
 #: initdb.c:2651
 #, c-format
@@ -524,10 +524,10 @@
 "Rerun %s and either do not specify an encoding explicitly,\n"
 "or choose a matching combination.\n"
 msgstr ""
-"L'encodage que vous avez sélectionné (%s) et celui que la locale\n"
-"sélectionnée utilise (%s) ne sont pas compatibles. Cela peut conduire à\n"
-"des erreurs dans les fonctions de manipulation de chaînes de caractères.\n"
-"Ré-exécutez %s sans préciser d'encodage, ou en choisissant une combinaison\n"
+"L'encodage que vous avez sélectionné (%s) et celui que la locale\n"
+"sélectionnée utilise (%s) ne sont pas compatibles. Cela peut conduire à\n"
+"des erreurs dans les fonctions de manipulation de chaînes de caractères.\n"
+"Ré-exécutez %s sans préciser d'encodage, ou en choisissant une combinaison\n"
 "compatible.\n"
 
 #: initdb.c:2723
@@ -547,7 +547,7 @@
 #: initdb.c:2725
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
-msgstr "  %s [OPTION]... [RÉP_DONNÉES]\n"
+msgstr "  %s [OPTION]... [RÉP_DONNÉES]\n"
 
 #: initdb.c:2726
 #, c-format
@@ -562,41 +562,41 @@
 #, 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"
+"  -A, --auth=MÉTHODE         méthode d'authentification par défaut pour les\n"
 "                             connexions locales\n"
 
 #: initdb.c:2728
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr ""
-"      --auth-host=MÉTHODE    méthode d'authentification par défaut pour les\n"
+"      --auth-host=MÉTHODE    méthode d'authentification par défaut pour les\n"
 "                             connexions locales TCP/IP\n"
 
 #: initdb.c:2729
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr ""
-"      --auth-local=MÉTHODE   méthode d'authentification par défaut pour les\n"
+"      --auth-local=MÉTHODE   méthode d'authentification par défaut pour les\n"
 "                             connexions locales socket\n"
 
 #: initdb.c:2730
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
-msgstr " [-D, --pgdata=]RÉP_DONNÉES  emplacement du cluster\n"
+msgstr " [-D, --pgdata=]RÉP_DONNÉES  emplacement du cluster\n"
 
 #: initdb.c:2731
 #, 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"
+"  -E, --encoding=ENCODAGE    initialise l'encodage par défaut des nouvelles\n"
+"                             bases de données\n"
 
 #: initdb.c:2732
 #, 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"
+"      --locale=LOCALE        initialise la locale par défaut pour les\n"
+"                             nouvelles bases de données\n"
 
 #: initdb.c:2733
 #, c-format
@@ -608,22 +608,22 @@
 msgstr ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
 "      --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
-"                             initialise la locale par défaut dans la\n"
-"                             catégorie respective pour les nouvelles bases\n"
-"                             de données (les valeurs par défaut sont prises\n"
+"                             initialise la locale par défaut dans la\n"
+"                             catégorie respective pour les nouvelles bases\n"
+"                             de données (les valeurs par défaut sont prises\n"
 "                             dans l'environnement)\n"
 
 #: initdb.c:2737
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
-msgstr "      --no-locale            équivalent à --locale=C\n"
+msgstr "      --no-locale            équivalent à --locale=C\n"
 
 #: initdb.c:2738
 #, 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"
+"                             super-utilisateur à partir de ce fichier\n"
 
 #: initdb.c:2739
 #, c-format
@@ -632,13 +632,13 @@
 "                            default text search configuration\n"
 msgstr ""
 "  -T, --text-search-config=CFG\n"
-"                             configuration par défaut de la recherche plein\n"
+"                             configuration par défaut de la recherche plein\n"
 "                             texte\n"
 
 #: initdb.c:2741
 #, 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"
+msgstr "  -U, --username=NOM         nom du super-utilisateur de la base de données\n"
 
 #: initdb.c:2742
 #, c-format
@@ -650,7 +650,7 @@
 #: initdb.c:2743
 #, 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"
+msgstr "  -X, --xlogdir=RÉP_XLOG     emplacement du répertoire des transactions\n"
 
 #: initdb.c:2744
 #, c-format
@@ -659,24 +659,24 @@
 "Less commonly used options:\n"
 msgstr ""
 "\n"
-"Options moins utilisées :\n"
+"Options moins utilisées :\n"
 
 #: initdb.c:2745
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
-msgstr "  -d, --debug                engendre un grand nombre de traces de débogage\n"
+msgstr "  -d, --debug                engendre un grand nombre de traces de débogage\n"
 
 #: initdb.c:2746
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
-msgstr "      -k, --data-checksums utilise les sommes de contrôles pour les pages de données\n"
+msgstr "      -k, --data-checksums utilise les sommes de contrôles pour les pages de données\n"
 
 #: initdb.c:2747
 #, 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"
+"  -L RÉPERTOIRE              indique où trouver les fichiers servant à la\n"
+"                             création du cluster\n"
 
 #: initdb.c:2748
 #, c-format
@@ -686,7 +686,7 @@
 #: initdb.c:2749
 #, c-format
 msgid "  -N, --nosync              do not wait for changes to be written safely to disk\n"
-msgstr "      -N, --nosync        n'attend pas que les modifications sont proprement écrites sur disque\n"
+msgstr "      -N, --nosync        n'attend pas que les modifications sont proprement écrites sur disque\n"
 
 #: initdb.c:2750
 #, c-format
@@ -696,7 +696,7 @@
 #: initdb.c:2751
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
-msgstr "      -S, --sync-only     synchronise uniquement le répertoire des données\n"
+msgstr "      -S, --sync-only     synchronise uniquement le répertoire des données\n"
 
 #: initdb.c:2752
 #, c-format
@@ -725,8 +725,8 @@
 "is used.\n"
 msgstr ""
 "\n"
-"Si le répertoire des données n'est pas indiqué, la variable d'environnement\n"
-"PGDATA est utilisée.\n"
+"Si le répertoire des données n'est pas indiqué, la variable d'environnement\n"
+"PGDATA est utilisée.\n"
 
 #: initdb.c:2757
 #, c-format
@@ -735,7 +735,7 @@
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
+"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
 #: initdb.c:2765
 msgid ""
@@ -745,16 +745,16 @@
 "--auth-local and --auth-host, the next time you run initdb.\n"
 msgstr ""
 "\n"
-"ATTENTION : active l'authentification « trust » pour les connexions\n"
+"ATTENTION : active l'authentification « trust » pour les connexions\n"
 "locales.\n"
-"Vous pouvez changer cette configuration en éditant le fichier pg_hba.conf\n"
+"Vous pouvez changer cette configuration en éditant le fichier pg_hba.conf\n"
 "ou en utilisant l'option -A, ou --auth-local et --auth-host au prochain\n"
 "lancement d'initdb.\n"
 
 #: initdb.c:2787
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
-msgstr "%s : méthode d'authentification « %s » invalide pour « %s »\n"
+msgstr "%s : méthode d'authentification « %s » invalide pour « %s »\n"
 
 #: initdb.c:2801
 #, c-format
@@ -771,9 +771,9 @@
 "will reside.  Do this with either the invocation option -D or the\n"
 "environment variable PGDATA.\n"
 msgstr ""
-"%s : aucun répertoire de données indiqué\n"
-"Vous devez identifier le répertoire où résideront les données pour ce\n"
-"système de bases de données. Faites-le soit avec l'option -D soit en\n"
+"%s : aucun répertoire de données indiqué\n"
+"Vous devez identifier le répertoire où résideront les données pour ce\n"
+"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:2866
@@ -783,9 +783,9 @@
 "same directory as \"%s\".\n"
 "Check your installation.\n"
 msgstr ""
-"Le programme « postgres » est nécessaire à %s mais n'a pas été trouvé dans\n"
-"le même répertoire que « %s ».\n"
-"Vérifiez votre installation.\n"
+"Le programme « postgres » est nécessaire à %s mais n'a pas été trouvé dans\n"
+"le même répertoire que « %s ».\n"
+"Vérifiez votre installation.\n"
 
 #: initdb.c:2873
 #, c-format
@@ -794,21 +794,21 @@
 "but was not the same version as %s.\n"
 "Check your installation.\n"
 msgstr ""
-"Le programme « postgres » a été trouvé par « %s » mais n'est pas de la même\n"
-"version que « %s ».\n"
-"Vérifiez votre installation.\n"
+"Le programme « postgres » a été trouvé par « %s » mais n'est pas de la même\n"
+"version que « %s ».\n"
+"Vérifiez votre installation.\n"
 
 #: initdb.c:2892
 #, 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"
+"%s : l'emplacement du fichier d'entrées doit être indiqué avec un chemin\n"
 "absolu\n"
 
 #: initdb.c:2911
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
-msgstr "L'instance sera initialisée avec la locale « %s ».\n"
+msgstr "L'instance sera initialisée avec la locale « %s ».\n"
 
 #: initdb.c:2914
 #, c-format
@@ -821,7 +821,7 @@
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 msgstr ""
-"Le cluster sera initialisé avec les locales\n"
+"Le cluster sera initialisé avec les locales\n"
 "  COLLATE:  %s\n"
 "  CTYPE:    %s\n"
 "  MESSAGES: %s\n"
@@ -832,7 +832,7 @@
 #: initdb.c:2938
 #, 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"
+msgstr "%s : n'a pas pu trouver un encodage adéquat pour la locale « %s »\n"
 
 #: initdb.c:2940
 #, c-format
@@ -842,7 +842,7 @@
 #: initdb.c:2941 initdb.c:3547 initdb.c:3568
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayer « %s --help » pour plus d'informations.\n"
+msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
 #: initdb.c:2953
 #, c-format
@@ -850,13 +850,13 @@
 "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"
+"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:2961
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
-msgstr "%s : la locale « %s » nécessite l'encodage « %s » non supporté\n"
+msgstr "%s : la locale « %s » nécessite l'encodage « %s » non supporté\n"
 
 #: initdb.c:2964
 #, c-format
@@ -864,66 +864,66 @@
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
 "Rerun %s with a different locale selection.\n"
 msgstr ""
-"L'encodage « %s » n'est pas autorisé en tant qu'encodage serveur.\n"
-"Ré-exécuter %s avec une locale différente.\n"
+"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:2973
 #, 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"
+"L'encodage par défaut des bases de données a été configuré en conséquence\n"
+"avec « %s ».\n"
 
 #: initdb.c:3044
 #, 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"
+" adéquation avec la locale « %s »\n"
 
 #: initdb.c:3055
 #, 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"
+"pour la locale « %s »\n"
 
 #: initdb.c:3060
 #, 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"
+"%s : attention : la configuration indiquée pour la recherche plein texte,\n"
+"« %s », pourrait ne pas correspondre à la locale « %s »\n"
 
 #: initdb.c:3065
 #, 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"
+msgstr "La configuration de la recherche plein texte a été initialisée à « %s ».\n"
 
 #: initdb.c:3109 initdb.c:3195
 #, c-format
 msgid "creating directory %s ... "
-msgstr "création du répertoire %s... "
+msgstr "création du répertoire %s... "
 
 #: initdb.c:3115 initdb.c:3201 initdb.c:3269 initdb.c:3324
 #, 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"
+msgstr "%s : n'a pas pu créer le répertoire « %s » : %s\n"
 
 #: initdb.c:3127 initdb.c:3213
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
-msgstr "correction des droits sur le répertoire existant %s... "
+msgstr "correction des droits sur le répertoire existant %s... "
 
 #: initdb.c:3133 initdb.c:3219
 #, 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"
+msgstr "%s : n'a pas pu modifier les droits du répertoire « %s » : %s\n"
 
 #: initdb.c:3148 initdb.c:3234
 #, 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"
+msgstr "%s : le répertoire « %s » existe mais n'est pas vide\n"
 
 #: initdb.c:3154
 #, c-format
@@ -932,21 +932,21 @@
 "the directory \"%s\" or run %s\n"
 "with an argument other than \"%s\".\n"
 msgstr ""
-"Si vous voulez créer un nouveau système de bases de données, supprimez ou\n"
-"videz le répertoire « %s ».\n"
-"Vous pouvez aussi exécuter %s avec un argument autre que « %s ».\n"
+"Si vous voulez créer un nouveau système de bases de données, supprimez ou\n"
+"videz le répertoire « %s ».\n"
+"Vous pouvez aussi exécuter %s avec un argument autre que « %s ».\n"
 
 #: initdb.c:3162 initdb.c:3247 initdb.c:3581
 #, 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"
+msgstr "%s : n'a pas pu accéder au répertoire « %s » : %s\n"
 
 #: initdb.c:3186
 #, 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"
+"%s : l'emplacement du répertoire des journaux de transactions doit être\n"
+"indiqué avec un chemin absolu\n"
 
 #: initdb.c:3240
 #, c-format
@@ -955,27 +955,27 @@
 "remove or empty the directory \"%s\".\n"
 msgstr ""
 "Si vous voulez enregistrer ici le journal des transactions, supprimez ou\n"
-"videz le répertoire « %s ».\n"
+"videz le répertoire « %s ».\n"
 
 #: initdb.c:3255
 #, 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"
+msgstr "%s : n'a pas pu créer le lien symbolique « %s » : %s\n"
 
 #: initdb.c:3260
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
-msgstr "%s : les liens symboliques ne sont pas supportés sur cette plateforme"
+msgstr "%s : les liens symboliques ne sont pas supportés sur cette plateforme"
 
 #: initdb.c:3284
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
-msgstr "Il contient un fichier invisible, peut-être parce qu'il s'agit d'un point de montage.\n"
+msgstr "Il contient un fichier invisible, peut-être parce qu'il s'agit d'un point de montage.\n"
 
 #: initdb.c:3287
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
-msgstr "Il contient un répertoire lost+found, peut-être parce qu'il s'agit d'un point de montage.\n"
+msgstr "Il contient un répertoire lost+found, peut-être parce qu'il s'agit d'un point de montage.\n"
 
 #: initdb.c:3290
 #, c-format
@@ -983,35 +983,35 @@
 "Using a mount point directly as the data directory is not recommended.\n"
 "Create a subdirectory under the mount point.\n"
 msgstr ""
-"Utiliser un point de montage comme répertoire de données n'est pas recommandé.\n"
-"Créez un sous-répertoire sous le point de montage.\n"
+"Utiliser un point de montage comme répertoire de données n'est pas recommandé.\n"
+"Créez un sous-répertoire sous le point de montage.\n"
 
 #: initdb.c:3309
 #, c-format
 msgid "creating subdirectories ... "
-msgstr "création des sous-répertoires... "
+msgstr "création des sous-répertoires... "
 
 #: initdb.c:3491
 #, c-format
 msgid "Running in debug mode.\n"
-msgstr "Lancé en mode débogage.\n"
+msgstr "Lancé en mode débogage.\n"
 
 #: initdb.c:3495
 #, 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"
+msgstr "Lancé en mode « sans nettoyage ». Les erreurs ne seront pas supprimées.\n"
 
 #: initdb.c:3566
 #, 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"
+msgstr "%s : trop d'arguments en ligne de commande (le premier étant « %s »)\n"
 
 #: initdb.c:3592
 #, 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"
+" peuvent pas être indiquées simultanément\n"
 
 #: initdb.c:3614
 #, c-format
@@ -1020,19 +1020,19 @@
 "This user must also own the server process.\n"
 "\n"
 msgstr ""
-"Les fichiers de ce cluster appartiendront à l'utilisateur « %s ».\n"
-"Le processus serveur doit également lui appartenir.\n"
+"Les fichiers de ce cluster appartiendront à l'utilisateur « %s ».\n"
+"Le processus serveur doit également lui appartenir.\n"
 "\n"
 
 #: initdb.c:3630
 #, c-format
 msgid "Data page checksums are enabled.\n"
-msgstr "Les sommes de contrôles des pages de données sont activées.\n"
+msgstr "Les sommes de contrôles des pages de données sont activées.\n"
 
 #: initdb.c:3632
 #, c-format
 msgid "Data page checksums are disabled.\n"
-msgstr "Les sommes de contrôles des pages de données sont désactivées.\n"
+msgstr "Les sommes de contrôles des pages de données sont désactivées.\n"
 
 #: initdb.c:3641
 #, c-format
@@ -1042,8 +1042,8 @@
 "The data directory might become corrupt if the operating system crashes.\n"
 msgstr ""
 "\n"
-"Synchronisation sur disque ignorée.\n"
-"Le répertoire des données pourrait être corrompu si le système d'exploitation s'arrêtait brutalement.\n"
+"Synchronisation sur disque ignorée.\n"
+"Le répertoire des données pourrait être corrompu si le système d'exploitation s'arrêtait brutalement.\n"
 
 #: initdb.c:3650
 #, c-format
@@ -1055,7 +1055,7 @@
 "\n"
 msgstr ""
 "\n"
-"Succès. Vous pouvez maintenant lancer le serveur de bases de données en utilisant :\n"
+"Succès. Vous pouvez maintenant lancer le serveur de bases de données en utilisant :\n"
 "\n"
 "    %s%s%spg_ctl%s -D %s%s%s -l journal_applicatif start\n"
 "\n"
@@ -1064,18 +1064,18 @@
 #~ msgstr "%s : n'a pas pu allouer les SID : code d'erreur %lu\n"
 
 #~ msgid "could not change directory to \"%s\""
-#~ msgstr "n'a pas pu accéder au répertoire « %s »"
+#~ msgstr "n'a pas pu accéder au répertoire « %s »"
 
 #~ 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"
+#~ "%s : le fichier de mots de passe n'a pas été créé.\n"
+#~ "Merci de rapporter ce problème.\n"
 
 #~ 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"
+#~ msgstr "%s : n'a pas pu déterminer une chaîne de version courte valide\n"
 
 #~ msgid "%s: unrecognized authentication method \"%s\"\n"
-#~ msgstr "%s : méthode d'authentification « %s » inconnue.\n"
+#~ msgstr "%s : méthode d'authentification « %s » inconnue.\n"
 
 #~ 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"
@@ -1084,4 +1084,4 @@
 #~ msgstr "%s : n'a pas pu obtenir d'informations sur l'utilisateur courant : %s\n"
 
 #~ msgid "%s: could not close directory \"%s\": %s\n"
-#~ msgstr "%s : n'a pas pu fermer le répertoire « %s » : %s\n"
+#~ msgstr "%s : n'a pas pu fermer le répertoire « %s » : %s\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/initdb/po/it.po postgresql-9.5-9.5.8/src/bin/initdb/po/it.po
--- postgresql-9.5-9.5.2/src/bin/initdb/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/initdb/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -24,8 +24,8 @@
 msgstr ""
 "Project-Id-Version: initdb (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-06 14:43+0000\n"
-"PO-Revision-Date: 2015-07-07 02:35+0100\n"
+"POT-Creation-Date: 2016-04-12 00:43+0000\n"
+"PO-Revision-Date: 2016-04-17 20:42+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -33,6 +33,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
@@ -190,117 +191,117 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "processo figlio uscito con stato non riconosciuto %d"
 
-#: ../../port/dirmod.c:219
+#: ../../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "non è stato possibile impostare la giunzione per \"%s\": %s\n"
 
-#: ../../port/dirmod.c:294
+#: ../../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "non è stato possibile ottenere la giunzione per \"%s\": %s\n"
 
-#: initdb.c:340
+#: initdb.c:339
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria esaurita\n"
 
-#: initdb.c:450 initdb.c:1620
+#: initdb.c:449 initdb.c:1596
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: errore nell'apertura del file \"%s\" per la lettura: %s\n"
 
-#: initdb.c:506 initdb.c:1016 initdb.c:1044
+#: initdb.c:505 initdb.c:992 initdb.c:1020
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: errore nell'apertura del file \"%s\" per la scrittura: %s\n"
 
-#: initdb.c:514 initdb.c:522 initdb.c:1023 initdb.c:1050
+#: initdb.c:513 initdb.c:521 initdb.c:999 initdb.c:1026
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: errore nella scrittura del file \"%s\": %s\n"
 
-#: initdb.c:553
+#: initdb.c:552
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: apertura della directory \"%s\" fallita: %s\n"
 
-#: initdb.c:577 initdb.c:2424
+#: initdb.c:576 initdb.c:2400
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: non è stato possibile ottenere informazioni sul file \"%s\": %s\n"
 
-#: initdb.c:589
+#: initdb.c:588
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: lettura della directory \"%s\" fallita: %s\n"
 
-#: initdb.c:622 initdb.c:681
+#: initdb.c:621 initdb.c:680
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: apertura del file \"%s\" fallita: %s\n"
 
-#: initdb.c:693
+#: initdb.c:692
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: fsync del file \"%s\" fallito: %s\n"
 
-#: initdb.c:712
+#: initdb.c:711
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: esecuzione del comando \"%s\" fallita: %s\n"
 
-#: initdb.c:728
+#: initdb.c:727
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: rimozione della directory dati \"%s\"\n"
 
-#: initdb.c:731
+#: initdb.c:730
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: rimozione della directory dati fallita\n"
 
-#: initdb.c:737
+#: initdb.c:736
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: rimozione dei contenuti della directory dati \"%s\"\n"
 
-#: initdb.c:740
+#: initdb.c:739
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: rimozione dei contenuti dalla directory dati fallita\n"
 
-#: initdb.c:746
+#: initdb.c:745
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: rimozione della directory dei log delle transazioni \"%s\"\n"
 
-#: initdb.c:749
+#: initdb.c:748
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: rimozione della directory dei log delle transazioni fallita\n"
 
-#: initdb.c:755
+#: initdb.c:754
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: rimozione dei contenuti della directory dei log delle transazioni \"%s\"\n"
 
-#: initdb.c:758
+#: initdb.c:757
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: rimozione dei contenuti della directory dei log delle transazioni fallita\n"
 
-#: initdb.c:767
+#: initdb.c:766
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: directory dati \"%s\" non rimossa su richiesta dell'utente\n"
 
-#: initdb.c:772
+#: initdb.c:771
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr "%s: directory dei log delle transazioni \"%s\" non rimossa su richiesta dell'utente\n"
 
-#: initdb.c:793
+#: initdb.c:792
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -311,22 +312,17 @@
 "Effettua il login (usando per esempio \"su\") con l'utente\n"
 "(non privilegiato) che controllerà il processo server.\n"
 
-#: initdb.c:829
+#: initdb.c:828
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" non è un nome di codifica per il server valido\n"
 
-#: initdb.c:943 initdb.c:3217
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: creazione della directory \"%s\" fallita: %s\n"
-
-#: initdb.c:972
+#: initdb.c:948
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: il file \"%s\" non esiste\n"
 
-#: initdb.c:974 initdb.c:983 initdb.c:993
+#: initdb.c:950 initdb.c:959 initdb.c:969
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -335,46 +331,46 @@
 "Questo potrebbe indica una installazione corrotta oppure\n"
 "hai indicato la directory errata con l'opzione -L.\n"
 
-#: initdb.c:980
+#: initdb.c:956
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: accesso al file \"%s\" fallito: %s\n"
 
-#: initdb.c:991
+#: initdb.c:967
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: il file \"%s\" non è un file regolare\n"
 
-#: initdb.c:1136
+#: initdb.c:1112
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "selezione del parametro max_connections predefinito ... "
 
-#: initdb.c:1166
+#: initdb.c:1142
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "selezione di shared_buffers predefinito ... "
 
-#: initdb.c:1199
+#: initdb.c:1175
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "selezione dell'implementazione della memoria dinamica ... "
 
-#: initdb.c:1217
+#: initdb.c:1193
 msgid "creating configuration files ... "
 msgstr "creazione dei file di configurazione ... "
 
-#: initdb.c:1314 initdb.c:1334 initdb.c:1418 initdb.c:1434
+#: initdb.c:1290 initdb.c:1310 initdb.c:1394 initdb.c:1410
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
 msgstr "%s: cambio di permesso di \"%s\" fallito: %s\n"
 
-#: initdb.c:1458
+#: initdb.c:1434
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "creazione del database template1 in in %s/base/1 ... "
 
-#: initdb.c:1474
+#: initdb.c:1450
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -384,156 +380,156 @@
 "Controlla la correttezza dell'installazione oppure specifica\n"
 "il percorso corretto con l'opzione -L.\n"
 
-#: initdb.c:1561
+#: initdb.c:1537
 msgid "initializing pg_authid ... "
 msgstr "inizializzazione di pg_authid ... "
 
-#: initdb.c:1595
+#: initdb.c:1571
 msgid "Enter new superuser password: "
 msgstr "Inserisci la nuova password del superutente: "
 
-#: initdb.c:1596
+#: initdb.c:1572
 msgid "Enter it again: "
 msgstr "Conferma password: "
 
-#: initdb.c:1599
+#: initdb.c:1575
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Le password non corrispondono.\n"
 
-#: initdb.c:1627
+#: initdb.c:1603
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: lettura del file delle password \"%s\" fallita: %s\n"
 
-#: initdb.c:1630
+#: initdb.c:1606
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
 msgstr "%s: il file delle password \"%s\" è vuoto\n"
 
-#: initdb.c:1643
+#: initdb.c:1619
 #, c-format
 msgid "setting password ... "
 msgstr "impostazione password ... "
 
-#: initdb.c:1743
+#: initdb.c:1719
 msgid "initializing dependencies ... "
 msgstr "inizializzazione delle dipendenze ... "
 
-#: initdb.c:1771
+#: initdb.c:1747
 msgid "creating system views ... "
 msgstr "creazione delle viste di sistema ... "
 
-#: initdb.c:1807
+#: initdb.c:1783
 msgid "loading system objects' descriptions ... "
 msgstr "caricamento delle descrizioni degli oggetti di sistema ... "
 
-#: initdb.c:1913
+#: initdb.c:1889
 msgid "creating collations ... "
 msgstr "creazione degli ordinamenti alfabetici ... "
 
-#: initdb.c:1946
+#: initdb.c:1922
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
 msgstr "%s: nome locale troppo lungo, saltato: \"%s\"\n"
 
-#: initdb.c:1971
+#: initdb.c:1947
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
 msgstr "%s: nome locale contiene caratteri non ASCII, saltato: \"%s\"\n"
 
-#: initdb.c:2040
+#: initdb.c:2016
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "Nessun locale di sistema trovato.\n"
 
-#: initdb.c:2041
+#: initdb.c:2017
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
 msgstr "Usa l'opzione \"--debug\" per vedere i dettagli.\n"
 
-#: initdb.c:2044
+#: initdb.c:2020
 #, c-format
 msgid "not supported on this platform\n"
 msgstr "non supportato su questa piattaforma\n"
 
-#: initdb.c:2059
+#: initdb.c:2035
 msgid "creating conversions ... "
 msgstr "creazione delle conversioni ... "
 
-#: initdb.c:2094
+#: initdb.c:2070
 msgid "creating dictionaries ... "
 msgstr "creazione dizionari ... "
 
-#: initdb.c:2148
+#: initdb.c:2124
 msgid "setting privileges on built-in objects ... "
 msgstr "impostazione dei privilegi per gli oggetti predefiniti ... "
 
-#: initdb.c:2206
+#: initdb.c:2182
 msgid "creating information schema ... "
 msgstr "creazione dello schema informazioni ... "
 
-#: initdb.c:2262
+#: initdb.c:2238
 msgid "loading PL/pgSQL server-side language ... "
 msgstr "caricamento del linguaggio lato server PL/pgSQL ... "
 
-#: initdb.c:2287
+#: initdb.c:2263
 msgid "vacuuming database template1 ... "
 msgstr "vacuum del database template1 ... "
 
-#: initdb.c:2340
+#: initdb.c:2316
 msgid "copying template1 to template0 ... "
 msgstr "copia di template1 a template0 ... "
 
-#: initdb.c:2372
+#: initdb.c:2348
 msgid "copying template1 to postgres ... "
 msgstr "copia di template1 a postgres ... "
 
-#: initdb.c:2407
+#: initdb.c:2383
 msgid "syncing data to disk ... "
 msgstr "sincronizzazione dati sul disco ... "
 
-#: initdb.c:2501
+#: initdb.c:2477
 #, c-format
 msgid "caught signal\n"
 msgstr "intercettato segnale\n"
 
-#: initdb.c:2507
+#: initdb.c:2483
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "scrittura verso il processo figlio fallita: %s\n"
 
-#: initdb.c:2515
+#: initdb.c:2491
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2605
+#: initdb.c:2581
 #, c-format
 msgid "%s: setlocale() failed\n"
 msgstr "%s: setlocale() fallito\n"
 
-#: initdb.c:2623
+#: initdb.c:2599
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
 msgstr "%s: ripristino del locale precedente \"%s\" fallito\n"
 
-#: initdb.c:2633
+#: initdb.c:2609
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: nome locale non valido \"%s\"\n"
 
-#: initdb.c:2645
+#: initdb.c:2621
 #, c-format
 msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
 msgstr "%s: impostazione locale non valida; controlla le variabili d'ambiente LANG e LC_*\n"
 
-#: initdb.c:2673
+#: initdb.c:2649
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: mancata corrispondenza di codifica\n"
 
-#: initdb.c:2675
+#: initdb.c:2651
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -548,7 +544,7 @@
 "Esegui di nuovo %s senza specificare una codifica esplicitamente\n"
 "oppure seleziona una combinazione corretta.\n"
 
-#: initdb.c:2747
+#: initdb.c:2723
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -557,17 +553,17 @@
 "%s inizializza un cluster di database PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2748
+#: initdb.c:2724
 #, c-format
 msgid "Usage:\n"
 msgstr "Utilizzo:\n"
 
-#: initdb.c:2749
+#: initdb.c:2725
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPZIONE]... [DATADIR]\n"
 
-#: initdb.c:2750
+#: initdb.c:2726
 #, c-format
 msgid ""
 "\n"
@@ -576,47 +572,47 @@
 "\n"
 "Opzioni:\n"
 
-#: initdb.c:2751
+#: initdb.c:2727
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr ""
 "  -A, --auth=METODO         metodo di autenticazione predefinito per le\n"
 "                            connessioni locali\n"
 
-#: initdb.c:2752
+#: initdb.c:2728
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr ""
 "      --auth-host=METODO    metodo di autenticazione predefinito per le\n"
 "                            connessioni TCP/IP\n"
 
-#: initdb.c:2753
+#: initdb.c:2729
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr ""
 "      --auth-local=METODO   metodo di autenticazione predefinito per le\n"
 "                            connessioni locali\n"
 
-#: initdb.c:2754
+#: initdb.c:2730
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DATADIR     dove creare questo cluster di database\n"
 
-#: initdb.c:2755
+#: initdb.c:2731
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr ""
 "  -E, --encoding=ENCODING   imposta la codifica predefinita per i nuovi\n"
 "                            database\n"
 
-#: initdb.c:2756
+#: initdb.c:2732
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr ""
 "      --locale=LOCALE       imposta il locale predefinito per i nuovi\n"
 "                            database\n"
 
-#: initdb.c:2757
+#: initdb.c:2733
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -631,17 +627,17 @@
 "                            Il valore predefinito viene preso dalle variabili\n"
 "                            d'ambiente\n"
 
-#: initdb.c:2761
+#: initdb.c:2737
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           equivalente a --locale=C\n"
 
-#: initdb.c:2762
+#: initdb.c:2738
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=FILE         leggi la password per il nuovo superutente dal file\n"
 
-#: initdb.c:2763
+#: initdb.c:2739
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -650,24 +646,24 @@
 "  -T, --text-search-config=CFG\n"
 "                            configurazione predefinita per la ricerca di testo\n"
 
-#: initdb.c:2765
+#: initdb.c:2741
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NOME       nome del superutente del database\n"
 
-#: initdb.c:2766
+#: initdb.c:2742
 #, c-format
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            richiedi la password per il nuovo superutente\n"
 
-#: initdb.c:2767
+#: initdb.c:2743
 #, c-format
 msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr ""
 "  -X, --xlogdir=XLOGDIR     posizione della directory contenente i log\n"
 "                            delle transazioni\n"
 
-#: initdb.c:2768
+#: initdb.c:2744
 #, c-format
 msgid ""
 "\n"
@@ -676,44 +672,44 @@
 "\n"
 "Opzioni utilizzate meno frequentemente:\n"
 
-#: initdb.c:2769
+#: initdb.c:2745
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               genera molto output di debug\n"
 
-#: initdb.c:2770
+#: initdb.c:2746
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      usa i checksum delle pagine dati\n"
 
-#: initdb.c:2771
+#: initdb.c:2747
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              dove trovare i file di input\n"
 
-#: initdb.c:2772
+#: initdb.c:2748
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             non ripulire dopo gli errori\n"
 
-#: initdb.c:2773
+#: initdb.c:2749
 #, c-format
 msgid "  -N, --nosync              do not wait for changes to be written safely to disk\n"
 msgstr ""
 "  -N, --nosync              non attendere che i cambiamenti siano stati\n"
 "                            scritti in sicurezza sul disco\n"
 
-#: initdb.c:2774
+#: initdb.c:2750
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                mostra le impostazioni interne\n"
 
-#: initdb.c:2775
+#: initdb.c:2751
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr "  -S, --sync-only           sincronizza solo la directory dei dati\n"
 
-#: initdb.c:2776
+#: initdb.c:2752
 #, c-format
 msgid ""
 "\n"
@@ -722,17 +718,17 @@
 "\n"
 "Altre opzioni:\n"
 
-#: initdb.c:2777
+#: initdb.c:2753
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             mostra informazioni sulla versione ed esci\n"
 
-#: initdb.c:2778
+#: initdb.c:2754
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                mostra questo aiuto ed esci\n"
 
-#: initdb.c:2779
+#: initdb.c:2755
 #, c-format
 msgid ""
 "\n"
@@ -743,7 +739,7 @@
 "Se la directory dati non è specificata, viene usata la variabile\n"
 "d'ambiente PGDATA.\n"
 
-#: initdb.c:2781
+#: initdb.c:2757
 #, c-format
 msgid ""
 "\n"
@@ -752,7 +748,7 @@
 "\n"
 "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2789
+#: initdb.c:2765
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -765,17 +761,17 @@
 "pg_hba.conf o utilizzando l'opzione -A oppure --auth-local and --auth-host\n"
 "alla prossima esecuzione di initdb.\n"
 
-#: initdb.c:2811
+#: initdb.c:2787
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
 msgstr "%s: metodo di autenticazione \"%s\" non valido per connessioni \"%s\"\n"
 
-#: initdb.c:2825
+#: initdb.c:2801
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr "%s: occorre specificare una password per il superutente per abilitare l'autenticazione %s\n"
 
-#: initdb.c:2852
+#: initdb.c:2828
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -788,7 +784,7 @@
 "database. Puoi farlo usando l'opzione -D oppure la variabile globale\n"
 "PGDATA.\n"
 
-#: initdb.c:2890
+#: initdb.c:2866
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -799,7 +795,7 @@
 "nella stessa directory \"%s\".\n"
 "Verifica la correttezza dell'installazione.\n"
 
-#: initdb.c:2897
+#: initdb.c:2873
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -810,17 +806,17 @@
 "ma non ha la stessa versione di %s.\n"
 "Verifica la correttezza dell'installazione.\n"
 
-#: initdb.c:2916
+#: initdb.c:2892
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: la posizione del file di input deve essere un percorso assoluto\n"
 
-#: initdb.c:2935
+#: initdb.c:2911
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "Il cluster di database sarà inizializzato con il locale \"%s\".\n"
 
-#: initdb.c:2938
+#: initdb.c:2914
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -839,22 +835,22 @@
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2962
+#: initdb.c:2938
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: nessuna codifica adeguata trovata per il locale \"%s\"\n"
 
-#: initdb.c:2964
+#: initdb.c:2940
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Esegui di nuovo %s con l'opzione -E.\n"
 
-#: initdb.c:2965 initdb.c:3541 initdb.c:3562
+#: initdb.c:2941 initdb.c:3547 initdb.c:3568
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
 
-#: initdb.c:2977
+#: initdb.c:2953
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -863,12 +859,12 @@
 "La codifica \"%s\" implicata dal locale non è consentita come codifica lato server.\n"
 "La codifica predefinita dei database sarà impostata invece a \"%s\".\n"
 
-#: initdb.c:2985
+#: initdb.c:2961
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
 msgstr "%s: il locale \"%s\" richiede la codifica non supportata \"%s\"\n"
 
-#: initdb.c:2988
+#: initdb.c:2964
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -877,54 +873,59 @@
 "La codifica \"%s\" non è disponibile come codifica lato server.\n"
 "Esegui di nuovo %s con un locale diverso.\n"
 
-#: initdb.c:2997
+#: initdb.c:2973
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr "La codifica predefinita del database è stata impostata a \"%s\".\n"
 
-#: initdb.c:3068
+#: initdb.c:3044
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
 msgstr "%s: nessuna configurazione per la ricerca testo adeguata al locale \"%s\"\n"
 
-#: initdb.c:3079
+#: initdb.c:3055
 #, c-format
 msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
 msgstr "%s: attenzione: non si conosce una configurazione per la ricerca testo adeguata al locale \"%s\"\n"
 
-#: initdb.c:3084
+#: initdb.c:3060
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
 msgstr ""
 "%s: attenzione: la configurazione specificata per la ricerca testo \"%s\"\n"
 "potrebbe non corrispondere al locale \"%s\"\n"
 
-#: initdb.c:3089
+#: initdb.c:3065
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "La configurazione predefinita di ricerca testo sarà impostata a \"%s\".\n"
 
-#: initdb.c:3133 initdb.c:3211
+#: initdb.c:3109 initdb.c:3195
 #, c-format
 msgid "creating directory %s ... "
 msgstr "creazione della directory %s ... "
 
-#: initdb.c:3147 initdb.c:3229
+#: initdb.c:3115 initdb.c:3201 initdb.c:3269 initdb.c:3324
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: creazione della directory \"%s\" fallita: %s\n"
+
+#: initdb.c:3127 initdb.c:3213
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "correzione dei permessi sulla directory esistente %s ... "
 
-#: initdb.c:3153 initdb.c:3235
+#: initdb.c:3133 initdb.c:3219
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: modifica dei permessi della directory \"%s\" fallita: %s\n"
 
-#: initdb.c:3168 initdb.c:3250
+#: initdb.c:3148 initdb.c:3234
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: la directory \"%s\" esiste ma non è vuota\n"
 
-#: initdb.c:3174
+#: initdb.c:3154
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -935,17 +936,17 @@
 "la directory \"%s\" oppure esegui %s\n"
 "con un argomento diverso da \"%s\".\n"
 
-#: initdb.c:3182 initdb.c:3263 initdb.c:3575
+#: initdb.c:3162 initdb.c:3247 initdb.c:3581
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: accesso alla directory \"%s\" fallito: %s\n"
 
-#: initdb.c:3202
+#: initdb.c:3186
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: la directory dei log delle transazioni deve essere un percorso assoluto\n"
 
-#: initdb.c:3256
+#: initdb.c:3240
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -954,27 +955,27 @@
 "Se vuoi salvare lì i log delle transazioni,\n"
 "elimina oppure svuota la directory \"%s\".\n"
 
-#: initdb.c:3274
+#: initdb.c:3255
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: creazione del link simbolico \"%s\" fallita: %s\n"
 
-#: initdb.c:3279
+#: initdb.c:3260
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: i link simbolici non sono supportati su questa piattaforma"
 
-#: initdb.c:3292
+#: initdb.c:3284
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
 msgstr "Contiene un file prefissato con punto o invisibile, forse perché è un punto di montaggio.\n"
 
-#: initdb.c:3295
+#: initdb.c:3287
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
 msgstr "Contiene una directory lost+found, forse perché è un punto di montaggio.\n"
 
-#: initdb.c:3298
+#: initdb.c:3290
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -983,34 +984,34 @@
 "Usare un punto di montaggio direttamente come directory dati non è\n"
 "consigliato. Crea una sottodirectory sotto il punto di montaggio.\n"
 
-#: initdb.c:3317
+#: initdb.c:3309
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "creazione delle sottodirectory ... "
 
-#: initdb.c:3485
+#: initdb.c:3491
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Esecuzione in modalità debug\n"
 
-#: initdb.c:3489
+#: initdb.c:3495
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Esecuzione in modalità noclean. Gli errori non verranno ripuliti.\n"
 
-#: initdb.c:3560
+#: initdb.c:3566
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: troppi argomenti nella riga di comando (il primo è \"%s\")\n"
 
-#: initdb.c:3586
+#: initdb.c:3592
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr ""
 "%s: il prompt della password ed un file contenente la password non\n"
 "possono essere specificati contemporaneamente\n"
 
-#: initdb.c:3608
+#: initdb.c:3614
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1021,17 +1022,17 @@
 "Questo utente deve inoltre possedere il processo server.\n"
 "\n"
 
-#: initdb.c:3624
+#: initdb.c:3630
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "La somma di controllo dei dati delle pagine è abilitata.\n"
 
-#: initdb.c:3626
+#: initdb.c:3632
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "La somma di controllo dei dati delle pagine è disabilitata.\n"
 
-#: initdb.c:3635
+#: initdb.c:3641
 #, c-format
 msgid ""
 "\n"
@@ -1042,7 +1043,7 @@
 "Sync sul disco saltato.\n"
 "La directory dei dati potrebbe diventare corrotta in caso di crash del sistema operativo.\n"
 
-#: initdb.c:3644
+#: initdb.c:3650
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/initdb/po/ru.po postgresql-9.5-9.5.8/src/bin/initdb/po/ru.po
--- postgresql-9.5-9.5.2/src/bin/initdb/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/initdb/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,46 +1,27 @@
-# INITDB Translated Messages into the Russian Language (UTF-8)
+# Russian message translation file for initdb
+# Copyright (C) 2004-2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Serguei A. Mokhov <mokhov@cs.concordia.ca>, 2004-2005.
+# Oleg Bartunov <oleg@sai.msu.su>, 2004.
+# Sergey Burladyan <eshkinkot@gmail.com>, 2009.
+# Andrey Sudnik <sudnikand@yandex.ru>, 2010.
+# Dmitriy Olshevskiy <olshevskiy87@bk.ru>, 2014.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# Copyright (c) 2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
-# Copyright (c) 2012-2013 Alexander Lakhin <exclusion@gmail.com>
-# Distributed under the same licensing terms as PostgreSQL itself.
-#
-# pgtranslation Id: initdb.po,v 1.4 2010/12/07 21:22:21 petere Exp $
-#
-# translation of subject-specific terminology, see:
-# перевод некоторых �пецифичных терминов:
-# http://wiki.postgresql.org/wiki/NLS/ru/dict
-#
-# ChangeLog:
-#   - August 24, 2014: Updates for 9.4. Alexander Lakhin <exclusion@gmail.com>.
-#     - With corrections from Dmitriy Olshevskiy <olshevskiy87@bk.ru>
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 22, 2012: Minor fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 15, 2012: complete translation for 9.1. Alexander Lakhin <exclusion@gmail.com>.
-#   - November , 2010: complete translation for 9 current, Andrey Sudnik <sudnikand@yandex.ru>.
-#   - March 26, 2009: complete translation for 8.3, Sergey Burladyan <eshkinkot@gmail.com>.
-#   - January 17, 2005: complete translation for 8.0, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - December, 2004: New translation by Oleg Bartunov <oleg@sai.msu.su>.
-#   - March 27 - December 10, 2004: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: initdb (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-22 00:13+0000\n"
-"PO-Revision-Date: 2015-07-27 22:16+0300\n"
+"POT-Creation-Date: 2017-02-09 21:21+0000\n"
+"PO-Revision-Date: 2017-03-28 20:31+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgtranslation-translators@pgfoundry.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
-"X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
@@ -199,118 +180,118 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "дочерний проце�� завершил�� � нера�познанным �о�то�нием %d"
 
-#: ../../port/dirmod.c:219
+#: ../../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "не удало�ь �оздать �в�зь дл� каталога \"%s\": %s\n"
 
-#: ../../port/dirmod.c:294
+#: ../../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "не удало�ь получить �в�зь дл� каталога \"%s\": %s\n"
 
-#: initdb.c:340
+#: initdb.c:339
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: нехватка пам�ти\n"
 
-#: initdb.c:450 initdb.c:1620
+#: initdb.c:449 initdb.c:1596
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: не удало�ь открыть файл \"%s\" дл� чтени�: %s\n"
 
-#: initdb.c:506 initdb.c:1016 initdb.c:1044
+#: initdb.c:505 initdb.c:992 initdb.c:1020
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: не удало�ь открыть файл \"%s\" дл� запи�и: %s\n"
 
-#: initdb.c:514 initdb.c:522 initdb.c:1023 initdb.c:1050
+#: initdb.c:513 initdb.c:521 initdb.c:999 initdb.c:1026
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: не удало�ь запи�ать файл \"%s\": %s\n"
 
-#: initdb.c:553
+#: initdb.c:552
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: не удало�ь открыть каталог \"%s\": %s\n"
 
-#: initdb.c:577 initdb.c:2424
+#: initdb.c:576 initdb.c:2400
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: не удало�ь получить информацию о файле \"%s\": %s\n"
 
-#: initdb.c:589
+#: initdb.c:588
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: не удало�ь прочитать каталог \"%s\": %s\n"
 
-#: initdb.c:622 initdb.c:681
+#: initdb.c:621 initdb.c:680
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: не удало�ь открыть файл \"%s\": %s\n"
 
-#: initdb.c:693
+#: initdb.c:692
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: не удало�ь �инхронизировать � ФС файл \"%s\": %s\n"
 
-#: initdb.c:712
+#: initdb.c:711
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: не удало�ь выполнить команду \"%s\": %s\n"
 
-#: initdb.c:728
+#: initdb.c:727
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: удаление каталога данных \"%s\"\n"
 
-#: initdb.c:731
+#: initdb.c:730
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: ошибка при удалении каталога данных\n"
 
-#: initdb.c:737
+#: initdb.c:736
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: удаление �одержимого каталога данных \"%s\"\n"
 
-#: initdb.c:740
+#: initdb.c:739
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: ошибка при удалении �одержимого каталога данных\n"
 
-#: initdb.c:746
+#: initdb.c:745
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: удаление каталога журнала транзакций \"%s\"\n"
 
-#: initdb.c:749
+#: initdb.c:748
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: ошибка при удалении каталога журнала транзакций\n"
 
-#: initdb.c:755
+#: initdb.c:754
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: очи�тка каталога журнала транзакций \"%s\"\n"
 
-#: initdb.c:758
+#: initdb.c:757
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: ошибка при очи�тке каталога журнала транзакций\n"
 
-#: initdb.c:767
+#: initdb.c:766
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: каталог данных \"%s\" не был удалён по запро�у пользовател�\n"
 
-#: initdb.c:772
+#: initdb.c:771
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr ""
 "%s: каталог журнала транзакций \"%s\" не был удалён по запро�у пользовател�\n"
 
-#: initdb.c:793
+#: initdb.c:792
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -321,22 +302,17 @@
 "Пожалуй�та, переключите�ь на обычного пользовател� (например,\n"
 "и�пользу� \"su\"), который будет запу�кать �ерверный проце��.\n"
 
-#: initdb.c:829
+#: initdb.c:828
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" - неверное им� �ерверной кодировки\n"
 
-#: initdb.c:943 initdb.c:3217
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: не удало�ь �оздать каталог \"%s\": %s\n"
-
-#: initdb.c:972
+#: initdb.c:948
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: файл \"%s\" не �уще�твует\n"
 
-#: initdb.c:974 initdb.c:983 initdb.c:993
+#: initdb.c:950 initdb.c:959 initdb.c:969
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -345,206 +321,207 @@
 "Это означает, что ваша у�тановка PostgreSQL и�порчена или в параметре -L\n"
 "задан неправильный каталог.\n"
 
-#: initdb.c:980
+#: initdb.c:956
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: нет до�тупа к файлу \"%s\": %s\n"
 
-#: initdb.c:991
+#: initdb.c:967
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: \"%s\" - не обычный файл\n"
 
-#: initdb.c:1136
+#: initdb.c:1112
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "выбирает�� значение max_connections... "
 
-#: initdb.c:1166
+#: initdb.c:1142
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "выбирает�� значение shared_buffers... "
 
-#: initdb.c:1199
+#: initdb.c:1175
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "выбор реализации динамиче�кой раздел�емой пам�ти ... "
 
-#: initdb.c:1217
+#: initdb.c:1193
 msgid "creating configuration files ... "
 msgstr "�оздание конфигурационных файлов... "
 
-#: initdb.c:1314 initdb.c:1334 initdb.c:1418 initdb.c:1434
+#: initdb.c:1290 initdb.c:1310 initdb.c:1394 initdb.c:1410
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
 msgstr "%s: не удало�ь помен�ть права дл� \"%s\": %s\n"
 
-#: initdb.c:1458
+#: initdb.c:1434
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "�оздание базы template1 в %s/base/1... "
 
-#: initdb.c:1474
+#: initdb.c:1450
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
 "Check your installation or specify the correct path using the option -L.\n"
 msgstr ""
 "%s: входной файл \"%s\" не принадлежит PostgreSQL %s\n"
-"Проверьте вашу у�тановку или укажите правильный путь в параметре -L.\n"
+"Проверьте правильно�ть у�тановки или укажите корректный путь в параметре -"
+"L.\n"
 
-#: initdb.c:1561
+#: initdb.c:1537
 msgid "initializing pg_authid ... "
 msgstr "инициализаци� pg_authid... "
 
-#: initdb.c:1595
+#: initdb.c:1571
 msgid "Enter new superuser password: "
 msgstr "Введите новый пароль �уперпользовател�: "
 
-#: initdb.c:1596
+#: initdb.c:1572
 msgid "Enter it again: "
 msgstr "Повторите его: "
 
-#: initdb.c:1599
+#: initdb.c:1575
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Пароли не �овпадают.\n"
 
-#: initdb.c:1627
+#: initdb.c:1603
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: не удало�ь прочитать пароль из файла \"%s\": %s\n"
 
-#: initdb.c:1630
+#: initdb.c:1606
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
 msgstr "%s: файл парол� \"%s\" пу�т\n"
 
-#: initdb.c:1643
+#: initdb.c:1619
 #, c-format
 msgid "setting password ... "
 msgstr "у�тановка парол�... "
 
-#: initdb.c:1743
+#: initdb.c:1719
 msgid "initializing dependencies ... "
 msgstr "инициализаци� зави�имо�тей... "
 
-#: initdb.c:1771
+#: initdb.c:1747
 msgid "creating system views ... "
 msgstr "�оздание �и�темных пред�тавлений... "
 
-#: initdb.c:1807
+#: initdb.c:1783
 msgid "loading system objects' descriptions ... "
 msgstr "загрузка опи�аний �и�темных объектов... "
 
-#: initdb.c:1913
+#: initdb.c:1889
 msgid "creating collations ... "
 msgstr "�оздание правил �ортировки... "
 
-#: initdb.c:1946
+#: initdb.c:1922
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
 msgstr "%s: �лишком длинное им� локали, пропущено: \"%s\"\n"
 
-#: initdb.c:1971
+#: initdb.c:1947
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
 msgstr "%s: им� локали �одержит не ASCII-�имволы, пропущено: \"%s\"\n"
 
-#: initdb.c:2040
+#: initdb.c:2016
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "Пригодные локали в �и�теме не найдены.\n"
 
-#: initdb.c:2041
+#: initdb.c:2017
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
 msgstr "Добавьте параметр \"--debug\", чтобы узнать подробно�ти.\n"
 
-#: initdb.c:2044
+#: initdb.c:2020
 #, c-format
 msgid "not supported on this platform\n"
 msgstr "не поддерживает�� в �той ОС\n"
 
-#: initdb.c:2059
+#: initdb.c:2035
 msgid "creating conversions ... "
 msgstr "�оздание преобразований... "
 
-#: initdb.c:2094
+#: initdb.c:2070
 msgid "creating dictionaries ... "
 msgstr "�оздание �ловарей... "
 
-#: initdb.c:2148
+#: initdb.c:2124
 msgid "setting privileges on built-in objects ... "
 msgstr "у�тановка прав дл� в�троенных объектов... "
 
-#: initdb.c:2206
+#: initdb.c:2182
 msgid "creating information schema ... "
 msgstr "�оздание информационной �хемы... "
 
-#: initdb.c:2262
+#: initdb.c:2238
 msgid "loading PL/pgSQL server-side language ... "
 msgstr "загрузка �ерверного �зыка PL/pgSQL... "
 
-#: initdb.c:2287
+#: initdb.c:2263
 msgid "vacuuming database template1 ... "
 msgstr "очи�тка базы данных template1... "
 
-#: initdb.c:2340
+#: initdb.c:2316
 msgid "copying template1 to template0 ... "
 msgstr "копирование template1 в template0... "
 
-#: initdb.c:2372
+#: initdb.c:2348
 msgid "copying template1 to postgres ... "
 msgstr "копирование template1 в postgres... "
 
-#: initdb.c:2407
+#: initdb.c:2383
 msgid "syncing data to disk ... "
 msgstr "�охранение данных на ди�ке... "
 
-#: initdb.c:2501
+#: initdb.c:2477
 #, c-format
 msgid "caught signal\n"
 msgstr "получен �игнал\n"
 
-#: initdb.c:2507
+#: initdb.c:2483
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "не удало�ь запи�ать в поток дочернего проце��а: %s\n"
 
-#: initdb.c:2515
+#: initdb.c:2491
 #, c-format
 msgid "ok\n"
 msgstr "ок\n"
 
-#: initdb.c:2605
+#: initdb.c:2581
 #, c-format
 msgid "%s: setlocale() failed\n"
 msgstr "%s: ошибка в setlocale()\n"
 
-#: initdb.c:2623
+#: initdb.c:2599
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
 msgstr "%s: не удало�ь во��тановить �тарую локаль \"%s\"\n"
 
-#: initdb.c:2633
+#: initdb.c:2609
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: ошибочное им� локали \"%s\"\n"
 
-#: initdb.c:2645
+#: initdb.c:2621
 #, c-format
 msgid ""
 "%s: invalid locale settings; check LANG and LC_* environment variables\n"
 msgstr ""
-"%s: неверные на�тройки локали; проверьте переменные окружени� LANG и LC_*\n"
+"%s: неверные у�тановки локали; проверьте переменные окружени� LANG и LC_*\n"
 
-#: initdb.c:2673
+#: initdb.c:2649
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: не�оответ�твие кодировки\n"
 
-#: initdb.c:2675
+#: initdb.c:2651
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -559,7 +536,7 @@
 "Дл� и�правлени� перезапу�тите %s, не указыва� кодировку �вно, \n"
 "либо выберите подход�щее �очетание параметров локализации.\n"
 
-#: initdb.c:2747
+#: initdb.c:2723
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -568,17 +545,17 @@
 "%s инициализирует кла�тер PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2748
+#: initdb.c:2724
 #, c-format
 msgid "Usage:\n"
 msgstr "И�пользование:\n"
 
-#: initdb.c:2749
+#: initdb.c:2725
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [П�Р�МЕТР]... [К�Т�ЛОГ]\n"
 
-#: initdb.c:2750
+#: initdb.c:2726
 #, c-format
 msgid ""
 "\n"
@@ -587,7 +564,7 @@
 "\n"
 "Параметры:\n"
 
-#: initdb.c:2751
+#: initdb.c:2727
 #, c-format
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
@@ -596,7 +573,7 @@
 "  -A, --auth=МЕТОД          метод проверки подлинно�ти по умолчанию\n"
 "                            дл� локальных подключений\n"
 
-#: initdb.c:2752
+#: initdb.c:2728
 #, c-format
 msgid ""
 "      --auth-host=METHOD    default authentication method for local TCP/IP "
@@ -605,7 +582,7 @@
 "      --auth-host=МЕТОД     метод проверки подлинно�ти по умолчанию\n"
 "                            дл� локальных TCP/IP-подключений\n"
 
-#: initdb.c:2753
+#: initdb.c:2729
 #, c-format
 msgid ""
 "      --auth-local=METHOD   default authentication method for local-socket "
@@ -614,22 +591,22 @@
 "      --auth-local=МЕТОД    метод проверки подлинно�ти по умолчанию\n"
 "                            дл� локальных подключений через �окет\n"
 
-#: initdb.c:2754
+#: initdb.c:2730
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]К�Т�ЛОГ     ра�положение данных �того кла�тера БД\n"
 
-#: initdb.c:2755
+#: initdb.c:2731
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=КОДИРОВК�  кодировка по умолчанию дл� новых баз\n"
 
-#: initdb.c:2756
+#: initdb.c:2732
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=ЛОК�ЛЬ       локаль по умолчанию дл� новых баз\n"
 
-#: initdb.c:2757
+#: initdb.c:2733
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -643,19 +620,19 @@
 "                            у�тановить �оответ�твующий параметр локали\n"
 "                            дл� новых баз (вме�то значени� из окружени�)\n"
 
-#: initdb.c:2761
+#: initdb.c:2737
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           �квивалентно --locale=C\n"
 
-#: initdb.c:2762
+#: initdb.c:2738
 #, c-format
 msgid ""
 "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr ""
 "      --pwfile=Ф�ЙЛ         прочитать пароль �уперпользовател� из файла\n"
 
-#: initdb.c:2763
+#: initdb.c:2739
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -664,24 +641,24 @@
 "  -T, --text-search-config=КО�ФИГУР�ЦИЯ\n"
 "                            конфигураци� тек�тового пои�ка по умолчанию\n"
 
-#: initdb.c:2765
+#: initdb.c:2741
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=ИМЯ        им� �уперпользовател� БД\n"
 
-#: initdb.c:2766
+#: initdb.c:2742
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            запро�ить пароль �уперпользовател�\n"
 
-#: initdb.c:2767
+#: initdb.c:2743
 #, c-format
 msgid ""
 "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr "  -X, --xlogdir=К�Т�ЛОГ     ра�положение журнала транзакций\n"
 
-#: initdb.c:2768
+#: initdb.c:2744
 #, c-format
 msgid ""
 "\n"
@@ -690,27 +667,27 @@
 "\n"
 "Редко и�пользуемые параметры:\n"
 
-#: initdb.c:2769
+#: initdb.c:2745
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               выдавать много отладочных �ообщений\n"
 
-#: initdb.c:2770
+#: initdb.c:2746
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      включить контроль цело�тно�ти �траниц\n"
 
-#: initdb.c:2771
+#: initdb.c:2747
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L К�Т�ЛОГ                ра�положение входных файлов\n"
 
-#: initdb.c:2772
+#: initdb.c:2748
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             не очищать по�ле ошибок\n"
 
-#: initdb.c:2773
+#: initdb.c:2749
 #, c-format
 msgid ""
 "  -N, --nosync              do not wait for changes to be written safely to "
@@ -718,18 +695,18 @@
 msgstr ""
 "  -N, --nosync              не ждать завершени� �охранени� данных на ди�ке\n"
 
-#: initdb.c:2774
+#: initdb.c:2750
 #, c-format
 msgid "  -s, --show                show internal settings\n"
-msgstr "  -s, --show                показать внутренние на�тройки\n"
+msgstr "  -s, --show                показать внутренние у�тановки\n"
 
-#: initdb.c:2775
+#: initdb.c:2751
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr ""
 "  -S, --sync-only           только �инхронизировать � ФС каталог данных\n"
 
-#: initdb.c:2776
+#: initdb.c:2752
 #, c-format
 msgid ""
 "\n"
@@ -738,17 +715,17 @@
 "\n"
 "Другие параметры:\n"
 
-#: initdb.c:2777
+#: initdb.c:2753
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             показать вер�ию и выйти\n"
 
-#: initdb.c:2778
+#: initdb.c:2754
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                показать �ту �правку и выйти\n"
 
-#: initdb.c:2779
+#: initdb.c:2755
 #, c-format
 msgid ""
 "\n"
@@ -758,7 +735,7 @@
 "\n"
 "Е�ли каталог данных не указан, и�пользует�� переменна� окружени� PGDATA.\n"
 
-#: initdb.c:2781
+#: initdb.c:2757
 #, c-format
 msgid ""
 "\n"
@@ -767,7 +744,7 @@
 "\n"
 "Об ошибках �ообщайте по адре�у <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2789
+#: initdb.c:2765
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -781,20 +758,20 @@
 "A,\n"
 "--auth-local или --auth-host при �ледующем выполнении initdb.\n"
 
-#: initdb.c:2811
+#: initdb.c:2787
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
 msgstr ""
 "%s: нера�познанный метод проверки подлинно�ти \"%s\" дл� подключений \"%s\"\n"
 
-#: initdb.c:2825
+#: initdb.c:2801
 #, c-format
 msgid ""
 "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr ""
 "%s: дл� применени� метода %s необходимо указать пароль �уперпользовател�\n"
 
-#: initdb.c:2852
+#: initdb.c:2828
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -802,12 +779,12 @@
 "will reside.  Do this with either the invocation option -D or the\n"
 "environment variable PGDATA.\n"
 msgstr ""
-"%s: каталог данных не определён\n"
+"%s: каталог данных не определён.\n"
 "Вы должны указать, где будут ра�полагать�� данные �той СУБД.\n"
 "Это можно �делать, добавив ключ -D или у�тановив переменную\n"
 "окружени� PGDATA.\n"
 
-#: initdb.c:2890
+#: initdb.c:2866
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -816,9 +793,9 @@
 msgstr ""
 "Программа \"postgres\" нужна дл� %s, но она не найдена\n"
 "в каталоге \"%s\".\n"
-"Проверьте вашу у�тановку PostgreSQL.\n"
+"Проверьте правильно�ть у�тановки СУБД.\n"
 
-#: initdb.c:2897
+#: initdb.c:2873
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -827,19 +804,19 @@
 msgstr ""
 "Программа \"postgres\" найдена в \"%s\",\n"
 "но её вер�и� отличает�� от вер�ии %s.\n"
-"Проверьте вашу у�тановку PostgreSQL.\n"
+"Проверьте правильно�ть у�тановки СУБД.\n"
 
-#: initdb.c:2916
+#: initdb.c:2892
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: ра�положение входных файлов должно задавать�� аб�олютным путём\n"
 
-#: initdb.c:2935
+#: initdb.c:2911
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "Кла�тер баз данных будет инициализирован � локалью \"%s\".\n"
 
-#: initdb.c:2938
+#: initdb.c:2914
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -858,22 +835,22 @@
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2962
+#: initdb.c:2938
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: не удало�ь найти подход�щую кодировку дл� локали \"%s\"\n"
 
-#: initdb.c:2964
+#: initdb.c:2940
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Перезапу�тите %s � параметром -E.\n"
 
-#: initdb.c:2965 initdb.c:3541 initdb.c:3562
+#: initdb.c:2941 initdb.c:3547 initdb.c:3568
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Дл� дополнительной информации попробуйте \"%s --help\".\n"
 
-#: initdb.c:2977
+#: initdb.c:2953
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -882,12 +859,12 @@
 "Кодировка \"%s\", подразумеваема� локалью, не годит�� дл� �ервера.\n"
 "Вме�то неё в каче�тве кодировки БД по умолчанию будет выбрана \"%s\".\n"
 
-#: initdb.c:2985
+#: initdb.c:2961
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
 msgstr "%s: дл� локали \"%s\" требует�� неподдерживаема� кодировка \"%s\"\n"
 
-#: initdb.c:2988
+#: initdb.c:2964
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -896,13 +873,13 @@
 "Кодировка \"%s\" недопу�тима в каче�тве кодировки �ервера.\n"
 "Перезапу�тите %s, выбрав другую локаль.\n"
 
-#: initdb.c:2997
+#: initdb.c:2973
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr ""
 "Кодировка БД по умолчанию, выбранна� в �оответ�твии � на�тройками: \"%s\".\n"
 
-#: initdb.c:3068
+#: initdb.c:3044
 #, c-format
 msgid ""
 "%s: could not find suitable text search configuration for locale \"%s\"\n"
@@ -910,7 +887,7 @@
 "%s: не удало�ь найти подход�щую конфигурацию тек�тового пои�ка дл� локали "
 "\"%s\"\n"
 
-#: initdb.c:3079
+#: initdb.c:3055
 #, c-format
 msgid ""
 "%s: warning: suitable text search configuration for locale \"%s\" is "
@@ -919,7 +896,7 @@
 "%s: внимание: дл� локали \"%s\" нет изве�тной конфигурации тек�тового "
 "пои�ка\n"
 
-#: initdb.c:3084
+#: initdb.c:3060
 #, c-format
 msgid ""
 "%s: warning: specified text search configuration \"%s\" might not match "
@@ -928,32 +905,37 @@
 "%s: внимание: указанна� конфигураци� тек�тового пои�ка \"%s\" может не "
 "�оответ�твовать локали \"%s\"\n"
 
-#: initdb.c:3089
+#: initdb.c:3065
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "Выбрана конфигураци� тек�тового пои�ка по умолчанию \"%s\".\n"
 
-#: initdb.c:3133 initdb.c:3211
+#: initdb.c:3109 initdb.c:3195
 #, c-format
 msgid "creating directory %s ... "
 msgstr "�оздание каталога %s... "
 
-#: initdb.c:3147 initdb.c:3229
+#: initdb.c:3115 initdb.c:3201 initdb.c:3269 initdb.c:3324
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: не удало�ь �оздать каталог \"%s\": %s\n"
+
+#: initdb.c:3127 initdb.c:3213
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "и�правление прав дл� �уще�твующего каталога %s... "
 
-#: initdb.c:3153 initdb.c:3235
+#: initdb.c:3133 initdb.c:3219
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: не удало�ь помен�ть права дл� каталога \"%s\": %s\n"
 
-#: initdb.c:3168 initdb.c:3250
+#: initdb.c:3148 initdb.c:3234
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: каталог \"%s\" �уще�твует, но он не пу�т\n"
 
-#: initdb.c:3174
+#: initdb.c:3154
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -964,19 +946,19 @@
 "удалите или очи�тите каталог \"%s\",\n"
 "либо при запу�ке %s в каче�тве пути укажите не \"%s\".\n"
 
-#: initdb.c:3182 initdb.c:3263 initdb.c:3575
+#: initdb.c:3162 initdb.c:3247 initdb.c:3581
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: нет до�тупа к каталогу \"%s\": %s\n"
 
-#: initdb.c:3202
+#: initdb.c:3186
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr ""
 "%s: ра�положение каталога журнала транзакций должно определ�ть�� аб�олютным "
 "путём\n"
 
-#: initdb.c:3256
+#: initdb.c:3240
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -985,17 +967,17 @@
 "Е�ли вы хотите хранить журнал транзакций зде�ь,\n"
 "удалите или очи�тите каталог \"%s\".\n"
 
-#: initdb.c:3274
+#: initdb.c:3255
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: не удало�ь �оздать �имволиче�кую ��ылку \"%s\": %s\n"
 
-#: initdb.c:3279
+#: initdb.c:3260
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: �имволиче�кие ��ылки не поддерживают�� в �той ОС"
 
-#: initdb.c:3292
+#: initdb.c:3284
 #, c-format
 msgid ""
 "It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
@@ -1003,13 +985,13 @@
 msgstr ""
 "Он �одержит файл � точкой (невидимый), возможно �то точка монтировани�.\n"
 
-#: initdb.c:3295
+#: initdb.c:3287
 #, c-format
 msgid ""
 "It contains a lost+found directory, perhaps due to it being a mount point.\n"
 msgstr "Он �одержит подкаталог lost+found, возможно �то точка монтировани�.\n"
 
-#: initdb.c:3298
+#: initdb.c:3290
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -1019,34 +1001,34 @@
 "рекомендует��.\n"
 "Создайте в монтируемом ре�ур�е подкаталог и и�пользуйте его.\n"
 
-#: initdb.c:3317
+#: initdb.c:3309
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "�оздание подкаталогов... "
 
-#: initdb.c:3485
+#: initdb.c:3491
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Программа запущена в режиме отладки.\n"
 
-#: initdb.c:3489
+#: initdb.c:3495
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr ""
 "Программа запущена в режим 'noclean' - очи�тки и и�правлени� ошибок не "
 "будет.\n"
 
-#: initdb.c:3560
+#: initdb.c:3566
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: �лишком много аргументов командной �троки (первый: \"%s\")\n"
 
-#: initdb.c:3586
+#: initdb.c:3592
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr "%s: нельз� одновременно запро�ить пароль и прочитать пароль из файла\n"
 
-#: initdb.c:3608
+#: initdb.c:3614
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1057,17 +1039,17 @@
 "От его имени также будет запу�кать�� проце�� �ервера.\n"
 "\n"
 
-#: initdb.c:3624
+#: initdb.c:3630
 #, c-format
 msgid "Data page checksums are enabled.\n"
-msgstr "Контроль цело�тно�ти �траниц данных включен.\n"
+msgstr "Контроль цело�тно�ти �траниц данных включён.\n"
 
-#: initdb.c:3626
+#: initdb.c:3632
 #, c-format
 msgid "Data page checksums are disabled.\n"
-msgstr "Контроль цело�тно�ти �траниц данных отключен.\n"
+msgstr "Контроль цело�тно�ти �траниц данных отключён.\n"
 
-#: initdb.c:3635
+#: initdb.c:3641
 #, c-format
 msgid ""
 "\n"
@@ -1078,7 +1060,7 @@
 "Сохранение данных на ди�к пропу�кает��.\n"
 "Каталог данных может повредить�� при �бое операционной �и�темы.\n"
 
-#: initdb.c:3644
+#: initdb.c:3650
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_archivecleanup/pg_archivecleanup.c postgresql-9.5-9.5.8/src/bin/pg_archivecleanup/pg_archivecleanup.c
--- postgresql-9.5-9.5.2/src/bin/pg_archivecleanup/pg_archivecleanup.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_archivecleanup/pg_archivecleanup.c	2017-08-07 21:13:41.000000000 +0000
@@ -32,7 +32,7 @@
 
 char	   *archiveLocation;	/* where to find the archive? */
 char	   *restartWALFileName; /* the file from which we can restart restore */
-char		WALFilePath[MAXPGPATH];		/* the file path including archive */
+char		WALFilePath[MAXPGPATH * 2];		/* the file path including archive */
 char		exclusiveCleanupFileName[MAXFNAMELEN];		/* the oldest file we
 														 * want to remain in
 														 * archive */
@@ -133,7 +133,7 @@
 				 * extension that might have been chopped off before testing
 				 * the sequence.
 				 */
-				snprintf(WALFilePath, MAXPGPATH, "%s/%s",
+				snprintf(WALFilePath, sizeof(WALFilePath), "%s/%s",
 						 archiveLocation, xlde->d_name);
 
 				if (dryrun)
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/pg_basebackup.c postgresql-9.5-9.5.8/src/bin/pg_basebackup/pg_basebackup.c
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/pg_basebackup.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/pg_basebackup.c	2017-08-07 21:13:41.000000000 +0000
@@ -20,7 +20,9 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <time.h>
-
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 #ifdef HAVE_LIBZ
 #include <zlib.h>
 #endif
@@ -238,7 +240,7 @@
 	printf(_("  -r, --max-rate=RATE    maximum transfer rate to transfer data directory\n"
 	  "                         (in kB/s, or use suffix \"k\" or \"M\")\n"));
 	printf(_("  -R, --write-recovery-conf\n"
-			 "                         write recovery.conf after backup\n"));
+			 "                         write recovery.conf for replication\n"));
 	printf(_("  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
 	  "                         relocate tablespace in OLDDIR to NEWDIR\n"));
 	printf(_("  -x, --xlog             include required WAL files in backup (fetch mode)\n"));
@@ -793,6 +795,10 @@
 		 */
 		if (strcmp(basedir, "-") == 0)
 		{
+#ifdef WIN32
+			_setmode(fileno(stdout), _O_BINARY);
+#endif
+
 #ifdef HAVE_LIBZ
 			if (compresslevel != 0)
 			{
@@ -1641,6 +1647,14 @@
 	if (maxrate > 0)
 		maxrate_clause = psprintf("MAX_RATE %u", maxrate);
 
+	if (verbose)
+		fprintf(stderr,
+				_("%s: initiating base backup, waiting for checkpoint to complete\n"),
+				progname);
+
+	if (showprogress && !verbose)
+		fprintf(stderr, "waiting for checkpoint\r");
+
 	basebkp =
 		psprintf("BASE_BACKUP LABEL '%s' %s %s %s %s %s %s",
 				 escaped_label,
@@ -1678,6 +1692,9 @@
 
 	strlcpy(xlogstart, PQgetvalue(res, 0, 0), sizeof(xlogstart));
 
+	if (verbose)
+		fprintf(stderr, _("%s: checkpoint completed\n"), progname);
+
 	/*
 	 * 9.3 and later sends the TLI of the starting point. With older servers,
 	 * assume it's the same as the latest timeline reported by
@@ -1812,6 +1829,11 @@
 		int			r;
 #else
 		DWORD		status;
+		/*
+		 * get a pointer sized version of bgchild to avoid warnings about
+		 * casting to a different size on WIN64.
+		 */
+		intptr_t	bgchild_handle = bgchild;
 		uint32		hi,
 					lo;
 #endif
@@ -1874,7 +1896,7 @@
 		InterlockedIncrement(&has_xlogendptr);
 
 		/* First wait for the thread to exit */
-		if (WaitForSingleObjectEx((HANDLE) bgchild, INFINITE, FALSE) !=
+		if (WaitForSingleObjectEx((HANDLE) bgchild_handle, INFINITE, FALSE) !=
 			WAIT_OBJECT_0)
 		{
 			_dosmaperr(GetLastError());
@@ -1882,7 +1904,7 @@
 					progname, strerror(errno));
 			disconnect_and_exit(1);
 		}
-		if (GetExitCodeThread((HANDLE) bgchild, &status) == 0)
+		if (GetExitCodeThread((HANDLE) bgchild_handle, &status) == 0)
 		{
 			_dosmaperr(GetLastError());
 			fprintf(stderr, _("%s: could not get child thread exit status: %s\n"),
@@ -2045,7 +2067,7 @@
 				break;
 			case 'Z':
 				compresslevel = atoi(optarg);
-				if (compresslevel <= 0 || compresslevel > 9)
+				if (compresslevel < 0 || compresslevel > 9)
 				{
 					fprintf(stderr, _("%s: invalid compression level \"%s\"\n"),
 							progname, optarg);
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/pg_receivexlog.c postgresql-9.5-9.5.8/src/bin/pg_basebackup/pg_receivexlog.c
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/pg_receivexlog.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/pg_receivexlog.c	2017-08-07 21:13:41.000000000 +0000
@@ -210,7 +210,7 @@
 		if (!ispartial)
 		{
 			struct stat statbuf;
-			char		fullpath[MAXPGPATH];
+			char		fullpath[MAXPGPATH * 2];
 
 			snprintf(fullpath, sizeof(fullpath), "%s/%s", basedir, dirent->d_name);
 			if (stat(fullpath, &statbuf) != 0)
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/pg_recvlogical.c postgresql-9.5-9.5.8/src/bin/pg_basebackup/pg_recvlogical.c
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/pg_recvlogical.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/pg_recvlogical.c	2017-08-07 21:13:41.000000000 +0000
@@ -15,6 +15,9 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 
 /* local includes */
 #include "streamutil.h"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/de.po postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/de.po
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,16 +1,16 @@
 # German message translation file for pg_basebackup
-# Copyright (C) 2011 - 2015 PostgreSQL Global Development Group
+# Copyright (C) 2011 - 2017 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Peter Eisentraut <peter_e@gmx.net>, 2011 - 2015.
+# Peter Eisentraut <peter_e@gmx.net>, 2011 - 2017.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-09-22 15:13+0000\n"
-"PO-Revision-Date: 2015-09-22 20:32-0400\n"
+"POT-Creation-Date: 2017-05-07 21:30+0000\n"
+"PO-Revision-Date: 2017-05-08 08:31-0400\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -30,32 +30,32 @@
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "kann NULL-Zeiger nicht kopieren (interner Fehler)\n"
 
-#: pg_basebackup.c:154
+#: pg_basebackup.c:156
 #, c-format
 msgid "%s: directory name too long\n"
 msgstr "%s: Verzeichnisname zu lang\n"
 
-#: pg_basebackup.c:164
+#: pg_basebackup.c:166
 #, c-format
 msgid "%s: multiple \"=\" signs in tablespace mapping\n"
-msgstr "%s: mehrere „=“-Zeichen im Tablespace-Mapping\n"
+msgstr "%s: mehrere »=«-Zeichen im Tablespace-Mapping\n"
 
-#: pg_basebackup.c:177
+#: pg_basebackup.c:179
 #, c-format
 msgid "%s: invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\"\n"
-msgstr "%s: ungültiges Tablespace-Mapping-Format „%s“, muss „ALTES_VERZ=NEUES_VERZ“ sein\n"
+msgstr "%s: ungültiges Tablespace-Mapping-Format »%s«, muss »ALTES_VERZ=NEUES_VERZ« sein\n"
 
-#: pg_basebackup.c:190
+#: pg_basebackup.c:192
 #, c-format
 msgid "%s: old directory is not an absolute path in tablespace mapping: %s\n"
 msgstr "%s: altes Verzeichnis im Tablespace-Mapping ist kein absoluter Pfad: %s\n"
 
-#: pg_basebackup.c:197
+#: pg_basebackup.c:199
 #, c-format
 msgid "%s: new directory is not an absolute path in tablespace mapping: %s\n"
 msgstr "%s: neues Verzeichnis im Tablespace-Mapping ist kein absoluter Pfad: %s\n"
 
-#: pg_basebackup.c:231
+#: pg_basebackup.c:233
 #, c-format
 msgid ""
 "%s takes a base backup of a running PostgreSQL server.\n"
@@ -64,17 +64,17 @@
 "%s erzeugt eine Basissicherung eines laufenden PostgreSQL-Servers.\n"
 "\n"
 
-#: pg_basebackup.c:233 pg_receivexlog.c:66 pg_recvlogical.c:69
+#: pg_basebackup.c:235 pg_receivexlog.c:66 pg_recvlogical.c:72
 #, c-format
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
-#: pg_basebackup.c:234 pg_receivexlog.c:67 pg_recvlogical.c:70
+#: pg_basebackup.c:236 pg_receivexlog.c:67 pg_recvlogical.c:73
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_basebackup.c:235
+#: pg_basebackup.c:237
 #, c-format
 msgid ""
 "\n"
@@ -83,35 +83,35 @@
 "\n"
 "Optionen, die die Ausgabe kontrollieren:\n"
 
-#: pg_basebackup.c:236
+#: pg_basebackup.c:238
 #, c-format
 msgid "  -D, --pgdata=DIRECTORY receive base backup into directory\n"
 msgstr "  -D, --pgdata=VERZ      Basissicherung in dieses Verzeichnis empfangen\n"
 
-#: pg_basebackup.c:237
+#: pg_basebackup.c:239
 #, c-format
 msgid "  -F, --format=p|t       output format (plain (default), tar)\n"
 msgstr "  -F, --format=p|t       Ausgabeformat (plain (Voreinstellung), tar)\n"
 
-#: pg_basebackup.c:238
+#: pg_basebackup.c:240
 #, c-format
 msgid ""
 "  -r, --max-rate=RATE    maximum transfer rate to transfer data directory\n"
 "                         (in kB/s, or use suffix \"k\" or \"M\")\n"
 msgstr ""
 "  -r, --max-rate=RATE    maximale Transferrate für Übertragung des Datenver-\n"
-"                         zeichnisses (in kB/s, oder Suffix „k“ oder „M“ abgeben)\n"
+"                         zeichnisses (in kB/s, oder Suffix »k« oder »M« abgeben)\n"
 
-#: pg_basebackup.c:240
+#: pg_basebackup.c:242
 #, c-format
 msgid ""
 "  -R, --write-recovery-conf\n"
-"                         write recovery.conf after backup\n"
+"                         write recovery.conf for replication\n"
 msgstr ""
 "  -R, --write-recovery-conf\n"
-"                         recovery.conf schreiben nach der Sicherung\n"
+"                         recovery.conf für Replikation schreiben\n"
 
-#: pg_basebackup.c:242
+#: pg_basebackup.c:244
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
@@ -120,14 +120,14 @@
 "  -T, --tablespace-mapping=ALTES_VERZ=NEUES_VERZ\n"
 "                         Tablespace in ALTES_VERZ nach NEUES_VERZ verlagern\n"
 
-#: pg_basebackup.c:244
+#: pg_basebackup.c:246
 #, c-format
 msgid "  -x, --xlog             include required WAL files in backup (fetch mode)\n"
 msgstr ""
 "  -x, --xlog             benötigte WAL-Dateien in Sicherung einbeziehen\n"
 "                         (Fetch-Modus)\n"
 
-#: pg_basebackup.c:245
+#: pg_basebackup.c:247
 #, c-format
 msgid ""
 "  -X, --xlog-method=fetch|stream\n"
@@ -136,22 +136,22 @@
 "  -X, --xlog-method=fetch|stream\n"
 "                         benötigte WAL-Dateien mit angegebener Methode einbeziehen\n"
 
-#: pg_basebackup.c:247
+#: pg_basebackup.c:249
 #, c-format
 msgid "      --xlogdir=XLOGDIR  location for the transaction log directory\n"
 msgstr "      --xlogdir=XLOGVERZ Verzeichnis für das Transaktionslog\n"
 
-#: pg_basebackup.c:248
+#: pg_basebackup.c:250
 #, c-format
 msgid "  -z, --gzip             compress tar output\n"
 msgstr "  -z, --gzip             Tar-Ausgabe komprimieren\n"
 
-#: pg_basebackup.c:249
+#: pg_basebackup.c:251
 #, c-format
 msgid "  -Z, --compress=0-9     compress tar output with given compression level\n"
 msgstr "  -Z, --compress=0-9     Tar-Ausgabe mit angegebenem Niveau komprimieren\n"
 
-#: pg_basebackup.c:250
+#: pg_basebackup.c:252
 #, c-format
 msgid ""
 "\n"
@@ -160,7 +160,7 @@
 "\n"
 "Allgemeine Optionen:\n"
 
-#: pg_basebackup.c:251
+#: pg_basebackup.c:253
 #, c-format
 msgid ""
 "  -c, --checkpoint=fast|spread\n"
@@ -169,32 +169,32 @@
 "  -c, --checkpoint=fast|spread\n"
 "                         schnelles oder verteiltes Checkpointing einstellen\n"
 
-#: pg_basebackup.c:253
+#: pg_basebackup.c:255
 #, c-format
 msgid "  -l, --label=LABEL      set backup label\n"
 msgstr "  -l, --label=LABEL      Backup-Label setzen\n"
 
-#: pg_basebackup.c:254
+#: pg_basebackup.c:256
 #, c-format
 msgid "  -P, --progress         show progress information\n"
 msgstr "  -P, --progress         Fortschrittsinformationen zeigen\n"
 
-#: pg_basebackup.c:255 pg_receivexlog.c:76 pg_recvlogical.c:89
+#: pg_basebackup.c:257 pg_receivexlog.c:76 pg_recvlogical.c:92
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
-msgstr "  -v, --verbose          „Verbose“-Modus\n"
+msgstr "  -v, --verbose          »Verbose«-Modus\n"
 
-#: pg_basebackup.c:256 pg_receivexlog.c:77 pg_recvlogical.c:90
+#: pg_basebackup.c:258 pg_receivexlog.c:77 pg_recvlogical.c:93
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          Versionsinformationen anzeigen, dann beenden\n"
 
-#: pg_basebackup.c:257 pg_receivexlog.c:78 pg_recvlogical.c:91
+#: pg_basebackup.c:259 pg_receivexlog.c:78 pg_recvlogical.c:94
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_basebackup.c:258 pg_receivexlog.c:79 pg_recvlogical.c:92
+#: pg_basebackup.c:260 pg_receivexlog.c:79 pg_recvlogical.c:95
 #, c-format
 msgid ""
 "\n"
@@ -203,22 +203,22 @@
 "\n"
 "Verbindungsoptionen:\n"
 
-#: pg_basebackup.c:259 pg_receivexlog.c:80
+#: pg_basebackup.c:261 pg_receivexlog.c:80
 #, c-format
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=VERBDG    Verbindungsparameter\n"
 
-#: pg_basebackup.c:260 pg_receivexlog.c:81 pg_recvlogical.c:94
+#: pg_basebackup.c:262 pg_receivexlog.c:81 pg_recvlogical.c:97
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME    Name des Datenbankservers oder Socket-Verzeichnis\n"
 
-#: pg_basebackup.c:261 pg_receivexlog.c:82 pg_recvlogical.c:95
+#: pg_basebackup.c:263 pg_receivexlog.c:82 pg_recvlogical.c:98
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=PORT        Portnummer des Datenbankservers\n"
 
-#: pg_basebackup.c:262
+#: pg_basebackup.c:264
 #, c-format
 msgid ""
 "  -s, --status-interval=INTERVAL\n"
@@ -227,22 +227,22 @@
 "  -s, --status-interval=INTERVALL\n"
 "                         Zeit zwischen an Server gesendeten Statuspaketen (in Sekunden)\n"
 
-#: pg_basebackup.c:264 pg_receivexlog.c:83 pg_recvlogical.c:96
+#: pg_basebackup.c:266 pg_receivexlog.c:83 pg_recvlogical.c:99
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=NAME    Datenbankbenutzername\n"
 
-#: pg_basebackup.c:265 pg_receivexlog.c:84 pg_recvlogical.c:97
+#: pg_basebackup.c:267 pg_receivexlog.c:84 pg_recvlogical.c:100
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password      niemals nach Passwort fragen\n"
 
-#: pg_basebackup.c:266 pg_receivexlog.c:85 pg_recvlogical.c:98
+#: pg_basebackup.c:268 pg_receivexlog.c:85 pg_recvlogical.c:101
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr "  -W, --password         nach Passwort fragen (sollte automatisch geschehen)\n"
 
-#: pg_basebackup.c:267 pg_receivexlog.c:89 pg_recvlogical.c:99
+#: pg_basebackup.c:269 pg_receivexlog.c:89 pg_recvlogical.c:102
 #, c-format
 msgid ""
 "\n"
@@ -251,201 +251,196 @@
 "\n"
 "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_basebackup.c:310
+#: pg_basebackup.c:312
 #, c-format
 msgid "%s: could not read from ready pipe: %s\n"
 msgstr "%s: konnte nicht aus bereiter Pipe lesen: %s\n"
 
-#: pg_basebackup.c:318 pg_basebackup.c:411 pg_basebackup.c:1879
-#: streamutil.c:285
+#: pg_basebackup.c:320 pg_basebackup.c:413 pg_basebackup.c:1887
+#: streamutil.c:293
 #, c-format
 msgid "%s: could not parse transaction log location \"%s\"\n"
-msgstr "%s: konnte Transaktionslogposition „%s“ nicht interpretieren\n"
+msgstr "%s: konnte Transaktionslogposition »%s« nicht interpretieren\n"
 
-#: pg_basebackup.c:424
+#: pg_basebackup.c:426
 #, c-format
 msgid "%s: could not create pipe for background process: %s\n"
 msgstr "%s: konnte Pipe für Hintergrundprozess nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:449 pg_basebackup.c:504 pg_basebackup.c:1262
+#: pg_basebackup.c:451 pg_basebackup.c:506 pg_basebackup.c:1254
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht erzeugen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:467
+#: pg_basebackup.c:469
 #, c-format
 msgid "%s: could not create background process: %s\n"
 msgstr "%s: konnte Hintergrundprozess nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:479
+#: pg_basebackup.c:481
 #, c-format
 msgid "%s: could not create background thread: %s\n"
 msgstr "%s: konnte Hintergrund-Thread nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:523
+#: pg_basebackup.c:525
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
-msgstr "%s: Verzeichnis „%s“ existiert aber ist nicht leer\n"
+msgstr "%s: Verzeichnis »%s« existiert aber ist nicht leer\n"
 
-#: pg_basebackup.c:531
+#: pg_basebackup.c:533
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
-msgstr "%s: konnte nicht auf Verzeichnis „%s“ zugreifen: %s\n"
+msgstr "%s: konnte nicht auf Verzeichnis »%s« zugreifen: %s\n"
 
-#: pg_basebackup.c:593
+#: pg_basebackup.c:595
 #, c-format
 msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
 msgstr[0] "%*s/%s kB (100%%), %d/%d Tablespace %*s"
 msgstr[1] "%*s/%s kB (100%%), %d/%d Tablespaces %*s"
 
-#: pg_basebackup.c:605
+#: pg_basebackup.c:607
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
 msgstr[0] "%*s/%s kB (%d%%), %d/%d Tablespace (%s%-*.*s)"
 msgstr[1] "%*s/%s kB (%d%%), %d/%d Tablespaces (%s%-*.*s)"
 
-#: pg_basebackup.c:621
+#: pg_basebackup.c:623
 #, 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:643
+#: pg_basebackup.c:645
 #, c-format
 msgid "%s: transfer rate \"%s\" is not a valid value\n"
-msgstr "%s: Transferrate „%s“ ist kein gültiger Wert\n"
+msgstr "%s: Transferrate »%s« ist kein gültiger Wert\n"
 
-#: pg_basebackup.c:650
+#: pg_basebackup.c:652
 #, c-format
 msgid "%s: invalid transfer rate \"%s\": %s\n"
-msgstr "%s: ungültige Transferrate „%s“: %s\n"
+msgstr "%s: ungültige Transferrate »%s«: %s\n"
 
-#: pg_basebackup.c:660
+#: pg_basebackup.c:662
 #, c-format
 msgid "%s: transfer rate must be greater than zero\n"
 msgstr "%s: Transferrate muss größer als null sein\n"
 
-#: pg_basebackup.c:694
+#: pg_basebackup.c:696
 #, c-format
 msgid "%s: invalid --max-rate unit: \"%s\"\n"
-msgstr "%s: ungültige Einheit für --max-rate: „%s“\n"
+msgstr "%s: ungültige Einheit für --max-rate: »%s«\n"
 
-#: pg_basebackup.c:703
+#: pg_basebackup.c:705
 #, c-format
 msgid "%s: transfer rate \"%s\" exceeds integer range\n"
-msgstr "%s: Transferrate „%s“ überschreitet Bereich für ganze Zahlen\n"
+msgstr "%s: Transferrate »%s« überschreitet Bereich für ganze Zahlen\n"
 
-#: pg_basebackup.c:715
+#: pg_basebackup.c:717
 #, c-format
 msgid "%s: transfer rate \"%s\" is out of range\n"
-msgstr "%s: Transferrate „%s“ ist außerhalb des gültigen Bereichs\n"
+msgstr "%s: Transferrate »%s« ist außerhalb des gültigen Bereichs\n"
 
-#: pg_basebackup.c:739
+#: pg_basebackup.c:741
 #, c-format
 msgid "%s: could not write to compressed file \"%s\": %s\n"
-msgstr "%s: konnte nicht in komprimierte Datei „%s“ schreiben: %s\n"
+msgstr "%s: konnte nicht in komprimierte Datei »%s« schreiben: %s\n"
 
-#: pg_basebackup.c:749 pg_basebackup.c:1356 pg_basebackup.c:1574
+#: pg_basebackup.c:751 pg_basebackup.c:1348 pg_basebackup.c:1566
 #, c-format
 msgid "%s: could not write to file \"%s\": %s\n"
-msgstr "%s: konnte nicht in Datei „%s“ schreiben: %s\n"
+msgstr "%s: konnte nicht in Datei »%s« schreiben: %s\n"
 
-#: pg_basebackup.c:804 pg_basebackup.c:825 pg_basebackup.c:853
+#: pg_basebackup.c:806 pg_basebackup.c:827 pg_basebackup.c:855
 #, c-format
 msgid "%s: could not set compression level %d: %s\n"
 msgstr "%s: konnte Komprimierungsniveau %d nicht setzen: %s\n"
 
-#: pg_basebackup.c:874
+#: pg_basebackup.c:876
 #, c-format
 msgid "%s: could not create compressed file \"%s\": %s\n"
-msgstr "%s: konnte komprimierte Datei „%s“ nicht erzeugen: %s\n"
+msgstr "%s: konnte komprimierte Datei »%s« nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:885 pg_basebackup.c:1316 pg_basebackup.c:1567
+#: pg_basebackup.c:887 pg_basebackup.c:1308 pg_basebackup.c:1559
 #, c-format
 msgid "%s: could not create file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht erzeugen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:897 pg_basebackup.c:1161
+#: pg_basebackup.c:899 pg_basebackup.c:1163
 #, c-format
 msgid "%s: could not get COPY data stream: %s"
 msgstr "%s: konnte COPY-Datenstrom nicht empfangen: %s"
 
-#: pg_basebackup.c:954
+#: pg_basebackup.c:956
 #, c-format
 msgid "%s: could not close compressed file \"%s\": %s\n"
-msgstr "%s: konnte komprimierte Datei „%s“ nicht schließen: %s\n"
+msgstr "%s: konnte komprimierte Datei »%s« nicht schließen: %s\n"
 
-#: pg_basebackup.c:967 pg_recvlogical.c:569 receivelog.c:213 receivelog.c:362
-#: receivelog.c:754
+#: pg_basebackup.c:969 pg_recvlogical.c:572 receivelog.c:216 receivelog.c:365
+#: receivelog.c:759
 #, c-format
 msgid "%s: could not close file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht schließen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht schließen: %s\n"
 
-#: pg_basebackup.c:978 pg_basebackup.c:1190 pg_recvlogical.c:435
-#: receivelog.c:1044
+#: pg_basebackup.c:980 pg_basebackup.c:1192 pg_recvlogical.c:438
+#: receivelog.c:1049
 #, c-format
 msgid "%s: could not read COPY data: %s"
 msgstr "%s: konnte COPY-Daten nicht lesen: %s"
 
-#: pg_basebackup.c:1204
+#: pg_basebackup.c:1206
 #, c-format
 msgid "%s: invalid tar block header size: %d\n"
 msgstr "%s: ungültige Tar-Block-Kopf-Größe: %d\n"
 
-#: pg_basebackup.c:1212
-#, c-format
-msgid "%s: could not parse file size\n"
-msgstr "%s: konnte Dateigröße nicht entziffern\n"
-
-#: pg_basebackup.c:1220
-#, c-format
-msgid "%s: could not parse file mode\n"
-msgstr "%s: konnte Dateimodus nicht entziffern\n"
-
-#: pg_basebackup.c:1270
+#: pg_basebackup.c:1262
 #, c-format
 msgid "%s: could not set permissions on directory \"%s\": %s\n"
-msgstr "%s: konnte Zugriffsrechte des Verzeichnisses „%s“ nicht setzen: %s\n"
+msgstr "%s: konnte Zugriffsrechte des Verzeichnisses »%s« nicht setzen: %s\n"
 
-#: pg_basebackup.c:1294
+#: pg_basebackup.c:1286
 #, 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"
+msgstr "%s: konnte symbolische Verknüpfung von »%s« nach »%s« nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:1303
+#: pg_basebackup.c:1295
 #, c-format
 msgid "%s: unrecognized link indicator \"%c\"\n"
-msgstr "%s: unbekannter Verknüpfungsindikator „%c“\n"
+msgstr "%s: unbekannter Verknüpfungsindikator »%c«\n"
 
-#: pg_basebackup.c:1323
+#: pg_basebackup.c:1315
 #, c-format
 msgid "%s: could not set permissions on file \"%s\": %s\n"
-msgstr "%s: konnte Rechte der Datei „%s“ nicht setzen: %s\n"
+msgstr "%s: konnte Rechte der Datei »%s« nicht setzen: %s\n"
 
-#: pg_basebackup.c:1382
+#: pg_basebackup.c:1374
 #, 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:1468 pg_basebackup.c:1488 pg_basebackup.c:1495
-#: pg_basebackup.c:1542
+#: pg_basebackup.c:1460 pg_basebackup.c:1480 pg_basebackup.c:1487
+#: pg_basebackup.c:1534
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: Speicher aufgebraucht\n"
 
-#: pg_basebackup.c:1619
+#: pg_basebackup.c:1611
 #, c-format
 msgid "%s: incompatible server version %s\n"
 msgstr "%s: inkompatible Serverversion %s\n"
 
-#: pg_basebackup.c:1666 pg_recvlogical.c:261 receivelog.c:549 receivelog.c:600
-#: receivelog.c:641 streamutil.c:255 streamutil.c:353 streamutil.c:399
+#: pg_basebackup.c:1648
+#, c-format
+msgid "%s: initiating base backup, waiting for checkpoint to complete\n"
+msgstr "%s: Basissicherung eingeleitet, warte auf Abschluss des Checkpoints\n"
+
+#: pg_basebackup.c:1666 pg_recvlogical.c:264 receivelog.c:554 receivelog.c:605
+#: receivelog.c:646 streamutil.c:263 streamutil.c:367 streamutil.c:413
 #, c-format
 msgid "%s: could not send replication command \"%s\": %s"
-msgstr "%s: konnte Replikationsbefehl „%s“ nicht senden: %s"
+msgstr "%s: konnte Replikationsbefehl »%s« nicht senden: %s"
 
 #: pg_basebackup.c:1677
 #, c-format
@@ -457,173 +452,178 @@
 msgid "%s: server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: unerwartete Antwort auf Befehl BASE_BACKUP: %d Zeilen und %d Felder erhalten, %d Zeilen und %d Felder erwartet\n"
 
-#: pg_basebackup.c:1704
+#: pg_basebackup.c:1692
+#, c-format
+msgid "%s: checkpoint completed\n"
+msgstr "%s: Checkpoint abgeschlossen\n"
+
+#: pg_basebackup.c:1707
 #, c-format
 msgid "transaction log start point: %s on timeline %u\n"
 msgstr "Transaktionslog-Startpunkt: %s auf Zeitleiste %u\n"
 
-#: pg_basebackup.c:1713
+#: pg_basebackup.c:1716
 #, c-format
 msgid "%s: could not get backup header: %s"
 msgstr "%s: konnte Kopf der Sicherung nicht empfangen: %s"
 
-#: pg_basebackup.c:1719
+#: pg_basebackup.c:1722
 #, c-format
 msgid "%s: no data returned from server\n"
 msgstr "%s: keine Daten vom Server zurückgegeben\n"
 
-#: pg_basebackup.c:1751
+#: pg_basebackup.c:1754
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %d\n"
 msgstr "%s: kann nur einen einzelnen Tablespace auf die Standardausgabe schreiben, Datenbank hat %d\n"
 
-#: pg_basebackup.c:1763
+#: pg_basebackup.c:1766
 #, c-format
 msgid "%s: starting background WAL receiver\n"
 msgstr "%s: Hintergrund-WAL-Receiver wird gestartet\n"
 
-#: pg_basebackup.c:1794
+#: pg_basebackup.c:1797
 #, c-format
 msgid "%s: could not get transaction log end position from server: %s"
 msgstr "%s: konnte Transaktionslogendposition nicht vom Server empfangen: %s"
 
-#: pg_basebackup.c:1801
+#: pg_basebackup.c:1804
 #, c-format
 msgid "%s: no transaction log end position returned from server\n"
 msgstr "%s: kein Transaktionslogendpunkt vom Server zurückgegeben\n"
 
-#: pg_basebackup.c:1813
+#: pg_basebackup.c:1816
 #, c-format
 msgid "%s: final receive failed: %s"
 msgstr "%s: letztes Empfangen fehlgeschlagen: %s"
 
-#: pg_basebackup.c:1831
+#: pg_basebackup.c:1839
 #, c-format
 msgid "%s: waiting for background process to finish streaming ...\n"
 msgstr "%s: warte bis Hintergrundprozess Streaming beendet hat ...\n"
 
-#: pg_basebackup.c:1837
+#: pg_basebackup.c:1845
 #, c-format
 msgid "%s: could not send command to background pipe: %s\n"
 msgstr "%s: konnte Befehl nicht an Hintergrund-Pipe senden: %s\n"
 
-#: pg_basebackup.c:1846
+#: pg_basebackup.c:1854
 #, c-format
 msgid "%s: could not wait for child process: %s\n"
 msgstr "%s: konnte nicht auf Kindprozess warten: %s\n"
 
-#: pg_basebackup.c:1852
+#: pg_basebackup.c:1860
 #, c-format
 msgid "%s: child %d died, expected %d\n"
 msgstr "%s: Kindprozess %d endete, aber %d wurde erwartet\n"
 
-#: pg_basebackup.c:1858
+#: pg_basebackup.c:1866
 #, c-format
 msgid "%s: child process did not exit normally\n"
 msgstr "%s: Kindprozess hat nicht normal beendet\n"
 
-#: pg_basebackup.c:1864
+#: pg_basebackup.c:1872
 #, c-format
 msgid "%s: child process exited with error %d\n"
 msgstr "%s: Kindprozess hat mit Fehler %d beendet\n"
 
-#: pg_basebackup.c:1891
+#: pg_basebackup.c:1899
 #, c-format
 msgid "%s: could not wait for child thread: %s\n"
 msgstr "%s: konnte nicht auf Kind-Thread warten: %s\n"
 
-#: pg_basebackup.c:1898
+#: pg_basebackup.c:1906
 #, c-format
 msgid "%s: could not get child thread exit status: %s\n"
 msgstr "%s: konnte Statuscode des Kind-Threads nicht ermitteln: %s\n"
 
-#: pg_basebackup.c:1904
+#: pg_basebackup.c:1912
 #, c-format
 msgid "%s: child thread exited with error %u\n"
 msgstr "%s: Kind-Thread hat mit Fehler %u beendet\n"
 
-#: pg_basebackup.c:1993
+#: pg_basebackup.c:2001
 #, 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"
+msgstr "%s: ungültiges Ausgabeformat »%s«, muss »plain« oder »tar« sein\n"
 
-#: pg_basebackup.c:2011 pg_basebackup.c:2023
+#: pg_basebackup.c:2019 pg_basebackup.c:2031
 #, c-format
 msgid "%s: cannot specify both --xlog and --xlog-method\n"
 msgstr "%s: --xlog und --xlog-method können nicht zusammen verwendet werden\n"
 
-#: pg_basebackup.c:2038
+#: pg_basebackup.c:2046
 #, c-format
 msgid "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
-msgstr "%s: ungültige Option „%s“ für --xlog-method, muss „fetch“ oder „stream“ sein\n"
+msgstr "%s: ungültige Option »%s« für --xlog-method, muss »fetch« oder »stream« sein\n"
 
-#: pg_basebackup.c:2060
+#: pg_basebackup.c:2068
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
-msgstr "%s: ungültiges Komprimierungsniveau „%s“\n"
+msgstr "%s: ungültiges Komprimierungsniveau »%s«\n"
 
-#: pg_basebackup.c:2072
+#: pg_basebackup.c:2080
 #, 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"
+msgstr "%s: ungültiges Checkpoint-Argument »%s«, muss »fast« oder »spread« sein\n"
 
-#: pg_basebackup.c:2099 pg_receivexlog.c:439 pg_recvlogical.c:752
+#: pg_basebackup.c:2107 pg_receivexlog.c:439 pg_recvlogical.c:755
 #, c-format
 msgid "%s: invalid status interval \"%s\"\n"
-msgstr "%s: ungültiges Statusintervall „%s“\n"
+msgstr "%s: ungültiges Statusintervall »%s«\n"
 
-#: pg_basebackup.c:2115 pg_basebackup.c:2129 pg_basebackup.c:2140
-#: pg_basebackup.c:2153 pg_basebackup.c:2163 pg_basebackup.c:2175
-#: pg_basebackup.c:2186 pg_receivexlog.c:471 pg_receivexlog.c:485
+#: pg_basebackup.c:2123 pg_basebackup.c:2137 pg_basebackup.c:2148
+#: pg_basebackup.c:2161 pg_basebackup.c:2171 pg_basebackup.c:2183
+#: pg_basebackup.c:2194 pg_receivexlog.c:471 pg_receivexlog.c:485
 #: pg_receivexlog.c:493 pg_receivexlog.c:503 pg_receivexlog.c:514
-#: pg_recvlogical.c:779 pg_recvlogical.c:793 pg_recvlogical.c:804
-#: pg_recvlogical.c:812 pg_recvlogical.c:820 pg_recvlogical.c:828
-#: pg_recvlogical.c:836 pg_recvlogical.c:844
+#: pg_recvlogical.c:782 pg_recvlogical.c:796 pg_recvlogical.c:807
+#: pg_recvlogical.c:815 pg_recvlogical.c:823 pg_recvlogical.c:831
+#: pg_recvlogical.c:839 pg_recvlogical.c:847
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
-#: pg_basebackup.c:2127 pg_receivexlog.c:483 pg_recvlogical.c:791
+#: pg_basebackup.c:2135 pg_receivexlog.c:483 pg_recvlogical.c:794
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: zu viele Kommandozeilenargumente (das erste ist „%s“)\n"
+msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
-#: pg_basebackup.c:2139 pg_receivexlog.c:513
+#: pg_basebackup.c:2147 pg_receivexlog.c:513
 #, c-format
 msgid "%s: no target directory specified\n"
 msgstr "%s: kein Zielverzeichnis angegeben\n"
 
-#: pg_basebackup.c:2151
+#: pg_basebackup.c:2159
 #, 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:2161
+#: pg_basebackup.c:2169
 #, c-format
 msgid "%s: WAL streaming can only be used in plain mode\n"
-msgstr "%s: WAL-Streaming kann nur im „plain“-Modus verwendet werden\n"
+msgstr "%s: WAL-Streaming kann nur im »plain«-Modus verwendet werden\n"
 
-#: pg_basebackup.c:2173
+#: pg_basebackup.c:2181
 #, c-format
 msgid "%s: transaction log directory location can only be specified in plain mode\n"
-msgstr "%s: Transaktionslogverzeichnis kann nur im „plain“-Modus angegeben werden\n"
+msgstr "%s: Transaktionslogverzeichnis kann nur im »plain«-Modus angegeben werden\n"
 
-#: pg_basebackup.c:2184
+#: pg_basebackup.c:2192
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: Transaktionslogverzeichnis muss absoluten Pfad haben\n"
 
-#: pg_basebackup.c:2196
+#: pg_basebackup.c:2204
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s: diese Installation unterstützt keine Komprimierung\n"
 
-#: pg_basebackup.c:2223
+#: pg_basebackup.c:2231
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
-msgstr "%s: konnte symbolische Verknüpfung „%s“ nicht erzeugen: %s\n"
+msgstr "%s: konnte symbolische Verknüpfung »%s« nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:2228
+#: pg_basebackup.c:2236
 #, c-format
 msgid "%s: symlinks are not supported on this platform\n"
 msgstr "%s: symbolische Verknüpfungen werden auf dieser Plattform nicht unterstützt\n"
@@ -637,7 +637,7 @@
 "%s empfängt PostgreSQL-Streaming-Transaktionslogs.\n"
 "\n"
 
-#: pg_receivexlog.c:68 pg_recvlogical.c:75
+#: pg_receivexlog.c:68 pg_recvlogical.c:78
 #, c-format
 msgid ""
 "\n"
@@ -651,17 +651,17 @@
 msgid "  -D, --directory=DIR    receive transaction log files into this directory\n"
 msgstr "  -D, --directory=VERZ   Transaktionslogdateien in dieses Verzeichnis empfangen\n"
 
-#: pg_receivexlog.c:70 pg_recvlogical.c:79
+#: pg_receivexlog.c:70 pg_recvlogical.c:82
 #, c-format
 msgid "      --if-not-exists    do not error if slot already exists when creating a slot\n"
 msgstr "      --if-not-exists    keinen Fehler ausgeben, wenn Slot beim Erzeugen schon existiert\n"
 
-#: pg_receivexlog.c:71 pg_recvlogical.c:81
+#: pg_receivexlog.c:71 pg_recvlogical.c:84
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop          bei Verbindungsverlust nicht erneut probieren\n"
 
-#: pg_receivexlog.c:72 pg_recvlogical.c:86
+#: pg_receivexlog.c:72 pg_recvlogical.c:89
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
@@ -689,12 +689,12 @@
 "\n"
 "Optionale Aktionen:\n"
 
-#: pg_receivexlog.c:87 pg_recvlogical.c:72
+#: pg_receivexlog.c:87 pg_recvlogical.c:75
 #, c-format
 msgid "      --create-slot      create a new replication slot (for the slot's name see --slot)\n"
 msgstr "      --create-slot      neuen Replikations-Slot erzeugen (Slot-Name siehe --slot)\n"
 
-#: pg_receivexlog.c:88 pg_recvlogical.c:73
+#: pg_receivexlog.c:88 pg_recvlogical.c:76
 #, c-format
 msgid "      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"
 msgstr "      --drop-slot        Replikations-Slot löschen (Slot-Name siehe --slot)\n"
@@ -717,37 +717,37 @@
 #: pg_receivexlog.c:142
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht öffnen: %s\n"
 
 #: pg_receivexlog.c:160
 #, c-format
 msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht schließen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht schließen: %s\n"
 
-#: pg_receivexlog.c:218 pg_recvlogical.c:343
+#: pg_receivexlog.c:218 pg_recvlogical.c:346
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
-msgstr "%s: konnte „stat“ für Datei „%s“ nicht ausführen: %s\n"
+msgstr "%s: konnte »stat« für Datei »%s« nicht ausführen: %s\n"
 
 #: pg_receivexlog.c:226
 #, c-format
 msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
-msgstr "%s: Segmentdatei „%s“ hat falsche Größe %d, wird übersprungen\n"
+msgstr "%s: Segmentdatei »%s« hat falsche Größe %d, wird übersprungen\n"
 
 #: pg_receivexlog.c:245
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht lesen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht lesen: %s\n"
 
 #: pg_receivexlog.c:331
 #, c-format
 msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
 msgstr "%s: starte Log-Streaming bei %X/%X (Zeitleiste %u)\n"
 
-#: pg_receivexlog.c:420 pg_recvlogical.c:699
+#: pg_receivexlog.c:420 pg_recvlogical.c:702
 #, c-format
 msgid "%s: invalid port number \"%s\"\n"
-msgstr "%s: ungültige Portnummer „%s“\n"
+msgstr "%s: ungültige Portnummer »%s«\n"
 
 #: pg_receivexlog.c:492
 #, c-format
@@ -763,30 +763,30 @@
 #: pg_receivexlog.c:556
 #, c-format
 msgid "%s: replication connection using slot \"%s\" is unexpectedly database specific\n"
-msgstr "%s: Replikationsverbindung, die Slot „%s“ verwendet, ist unerwarteterweise datenbankspezifisch\n"
+msgstr "%s: Replikationsverbindung, die Slot »%s« verwendet, ist unerwarteterweise datenbankspezifisch\n"
 
-#: pg_receivexlog.c:568 pg_recvlogical.c:884
+#: pg_receivexlog.c:568 pg_recvlogical.c:887
 #, c-format
 msgid "%s: dropping replication slot \"%s\"\n"
-msgstr "%s: lösche Replikations-Slot „%s“\n"
+msgstr "%s: lösche Replikations-Slot »%s«\n"
 
-#: pg_receivexlog.c:581 pg_recvlogical.c:896
+#: pg_receivexlog.c:581 pg_recvlogical.c:899
 #, c-format
 msgid "%s: creating replication slot \"%s\"\n"
-msgstr "%s: erzeuge Replikations-Slot „%s“\n"
+msgstr "%s: erzeuge Replikations-Slot »%s«\n"
 
-#: pg_receivexlog.c:608 pg_recvlogical.c:922
+#: pg_receivexlog.c:608 pg_recvlogical.c:925
 #, c-format
 msgid "%s: disconnected\n"
 msgstr "%s: Verbindung beendet\n"
 
 #. translator: check source for value for %d
-#: pg_receivexlog.c:615 pg_recvlogical.c:929
+#: pg_receivexlog.c:615 pg_recvlogical.c:932
 #, c-format
 msgid "%s: disconnected; waiting %d seconds to try again\n"
 msgstr "%s: Verbindung beendet; erneuter Versuch in %d Sekunden\n"
 
-#: pg_recvlogical.c:67
+#: pg_recvlogical.c:70
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
@@ -795,7 +795,7 @@
 "%s kontrolliert logische Dekodierungsströme von PostgreSQL.\n"
 "\n"
 
-#: pg_recvlogical.c:71
+#: pg_recvlogical.c:74
 #, c-format
 msgid ""
 "\n"
@@ -804,17 +804,17 @@
 "\n"
 "Auszuführende Aktion:\n"
 
-#: pg_recvlogical.c:74
+#: pg_recvlogical.c:77
 #, c-format
 msgid "      --start            start streaming in a replication slot (for the slot's name see --slot)\n"
 msgstr "      --start            Streaming in einem Replikations-Slot starten (Slot-Name siehe --slot)\n"
 
-#: pg_recvlogical.c:76
+#: pg_recvlogical.c:79
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr "  -f, --file=DATEI       Log in diese Datei empfangen, - für Standardausgabe\n"
 
-#: pg_recvlogical.c:77
+#: pg_recvlogical.c:80
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
@@ -823,12 +823,12 @@
 "  -F  --fsync-interval=SEK\n"
 "                         Zeit zwischen Fsyncs der Ausgabedatei (Standard: %d)\n"
 
-#: pg_recvlogical.c:80
+#: pg_recvlogical.c:83
 #, c-format
 msgid "  -I, --startpos=LSN     where in an existing slot should the streaming start\n"
 msgstr "  -I, --startpos=LSN     wo in einem bestehenden Slot das Streaming starten soll\n"
 
-#: pg_recvlogical.c:82
+#: pg_recvlogical.c:85
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -839,313 +839,313 @@
 "                         Option NAME mit optionalem Wert WERT an den\n"
 "                         Ausgabe-Plugin übergeben\n"
 
-#: pg_recvlogical.c:85
+#: pg_recvlogical.c:88
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr "  -P, --plugin=PLUGIN    Ausgabe-Plugin PLUGIN verwenden (Standard: %s)\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:91
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
 msgstr "  -S, --slot=SLOTNAME    Name des logischen Replikations-Slots\n"
 
-#: pg_recvlogical.c:93
+#: pg_recvlogical.c:96
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=DBNAME    Datenbank, mit der verbunden werden soll\n"
 
-#: pg_recvlogical.c:126
+#: pg_recvlogical.c:129
 #, c-format
 msgid "%s: confirming write up to %X/%X, flush to %X/%X (slot %s)\n"
 msgstr "%s: bestätige Schreiben bis %X/%X, Flush bis %X/%X (Slot %s)\n"
 
-#: pg_recvlogical.c:151 receivelog.c:415
+#: pg_recvlogical.c:154 receivelog.c:418
 #, c-format
 msgid "%s: could not send feedback packet: %s"
 msgstr "%s: konnte Rückmeldungspaket nicht senden: %s"
 
-#: pg_recvlogical.c:190
+#: pg_recvlogical.c:193
 #, c-format
 msgid "%s: could not fsync log file \"%s\": %s\n"
-msgstr "%s: konnte Logdatei „%s“ nicht fsyncen: %s\n"
+msgstr "%s: konnte Logdatei »%s« nicht fsyncen: %s\n"
 
-#: pg_recvlogical.c:229
+#: pg_recvlogical.c:232
 #, c-format
 msgid "%s: starting log streaming at %X/%X (slot %s)\n"
 msgstr "%s: starte Log-Streaming bei %X/%X (Slot %s)\n"
 
-#: pg_recvlogical.c:271
+#: pg_recvlogical.c:274
 #, c-format
 msgid "%s: streaming initiated\n"
 msgstr "%s: Streaming eingeleitet\n"
 
-#: pg_recvlogical.c:336
+#: pg_recvlogical.c:339
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
-msgstr "%s: konnte Logdatei „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Logdatei »%s« nicht öffnen: %s\n"
 
-#: pg_recvlogical.c:412 receivelog.c:980
+#: pg_recvlogical.c:415 receivelog.c:985
 #, c-format
 msgid "%s: select() failed: %s\n"
 msgstr "%s: select() fehlgeschlagen: %s\n"
 
-#: pg_recvlogical.c:421 receivelog.c:1030
+#: pg_recvlogical.c:424 receivelog.c:1035
 #, c-format
 msgid "%s: could not receive data from WAL stream: %s"
 msgstr "%s: konnte keine Daten vom WAL-Stream empfangen: %s"
 
-#: pg_recvlogical.c:462 pg_recvlogical.c:501 receivelog.c:1075
-#: receivelog.c:1144
+#: pg_recvlogical.c:465 pg_recvlogical.c:504 receivelog.c:1080
+#: receivelog.c:1149
 #, c-format
 msgid "%s: streaming header too small: %d\n"
 msgstr "%s: Streaming-Header zu klein: %d\n"
 
-#: pg_recvlogical.c:484 receivelog.c:924
+#: pg_recvlogical.c:487 receivelog.c:929
 #, c-format
 msgid "%s: unrecognized streaming header: \"%c\"\n"
-msgstr "%s: unbekannter Streaming-Header: „%c“\n"
+msgstr "%s: unbekannter Streaming-Header: »%c«\n"
 
-#: pg_recvlogical.c:530 pg_recvlogical.c:544
+#: pg_recvlogical.c:533 pg_recvlogical.c:547
 #, c-format
 msgid "%s: could not write %u bytes to log file \"%s\": %s\n"
-msgstr "%s: konnte %u Bytes nicht in Logdatei „%s“ schreiben: %s\n"
+msgstr "%s: konnte %u Bytes nicht in Logdatei »%s« schreiben: %s\n"
 
-#: pg_recvlogical.c:555 receivelog.c:707 receivelog.c:745
+#: pg_recvlogical.c:558 receivelog.c:712 receivelog.c:750
 #, c-format
 msgid "%s: unexpected termination of replication stream: %s"
 msgstr "%s: unerwarteter Abbruch des Replikations-Streams: %s"
 
-#: pg_recvlogical.c:678
+#: pg_recvlogical.c:681
 #, c-format
 msgid "%s: invalid fsync interval \"%s\"\n"
-msgstr "%s: ungültiges Fsync-Intervall „%s“\n"
+msgstr "%s: ungültiges Fsync-Intervall »%s«\n"
 
-#: pg_recvlogical.c:719
+#: pg_recvlogical.c:722
 #, c-format
 msgid "%s: could not parse start position \"%s\"\n"
-msgstr "%s: konnte Startposition „%s“ nicht parsen\n"
+msgstr "%s: konnte Startposition »%s« nicht parsen\n"
 
-#: pg_recvlogical.c:803
+#: pg_recvlogical.c:806
 #, c-format
 msgid "%s: no slot specified\n"
 msgstr "%s: kein Slot angegeben\n"
 
-#: pg_recvlogical.c:811
+#: pg_recvlogical.c:814
 #, c-format
 msgid "%s: no target file specified\n"
 msgstr "%s: keine Zieldatei angegeben\n"
 
-#: pg_recvlogical.c:819
+#: pg_recvlogical.c:822
 #, c-format
 msgid "%s: no database specified\n"
 msgstr "%s: keine Datenbank angegeben\n"
 
-#: pg_recvlogical.c:827
+#: pg_recvlogical.c:830
 #, c-format
 msgid "%s: at least one action needs to be specified\n"
 msgstr "%s: mindestens eine Aktion muss angegeben werden\n"
 
-#: pg_recvlogical.c:835
+#: pg_recvlogical.c:838
 #, c-format
 msgid "%s: cannot use --create-slot or --start together with --drop-slot\n"
 msgstr "%s: --create-slot oder --start kann nicht zusammen mit --drop-slot verwendet werden\n"
 
-#: pg_recvlogical.c:843
+#: pg_recvlogical.c:846
 #, c-format
 msgid "%s: cannot use --create-slot or --drop-slot together with --startpos\n"
 msgstr "%s: --create-slot oder --drop-slot kann nicht zusammen mit --startpos verwendet werden\n"
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:877
 #, c-format
 msgid "%s: could not establish database-specific replication connection\n"
 msgstr "%s: konnte keine datenbankspezifische Replikationsverbindung herstellen\n"
 
-#: receivelog.c:75
+#: receivelog.c:78
 #, c-format
 msgid "%s: could not create archive status file \"%s\": %s\n"
-msgstr "%s: konnte Archivstatusdatei „%s“ nicht erzeugen: %s\n"
+msgstr "%s: konnte Archivstatusdatei »%s« nicht erzeugen: %s\n"
 
-#: receivelog.c:82 receivelog.c:206 receivelog.c:355 receivelog.c:848
-#: receivelog.c:1096
+#: receivelog.c:85 receivelog.c:209 receivelog.c:358 receivelog.c:853
+#: receivelog.c:1101
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht fsyncen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht fsyncen: %s\n"
 
-#: receivelog.c:121
+#: receivelog.c:124
 #, c-format
 msgid "%s: could not open transaction log file \"%s\": %s\n"
-msgstr "%s: konnte Transaktionslogdatei „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Transaktionslogdatei »%s« nicht öffnen: %s\n"
 
-#: receivelog.c:133
+#: receivelog.c:136
 #, c-format
 msgid "%s: could not stat transaction log file \"%s\": %s\n"
-msgstr "%s: konnte „stat“ für Transaktionslogdatei „%s“ nicht ausführen: %s\n"
+msgstr "%s: konnte »stat« für Transaktionslogdatei »%s« nicht ausführen: %s\n"
 
-#: receivelog.c:147
+#: receivelog.c:150
 #, c-format
 msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
-msgstr "%s: Transaktionslogdatei „%s“ hat %d Bytes, sollte 0 oder %d sein\n"
+msgstr "%s: Transaktionslogdatei »%s« hat %d Bytes, sollte 0 oder %d sein\n"
 
-#: receivelog.c:160
+#: receivelog.c:163
 #, c-format
 msgid "%s: could not pad transaction log file \"%s\": %s\n"
-msgstr "%s: konnte Transaktionslogdatei „%s“ nicht auffüllen: %s\n"
+msgstr "%s: konnte Transaktionslogdatei »%s« nicht auffüllen: %s\n"
 
-#: receivelog.c:173
+#: receivelog.c:176
 #, c-format
 msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
-msgstr "%s: konnte Positionszeiger nicht an den Anfang der Transaktionslogdatei „%s“ setzen: %s\n"
+msgstr "%s: konnte Positionszeiger nicht an den Anfang der Transaktionslogdatei »%s« setzen: %s\n"
 
-#: receivelog.c:199
+#: receivelog.c:202
 #, c-format
 msgid "%s: could not determine seek position in file \"%s\": %s\n"
-msgstr "%s: konnte Positionszeiger in Datei „%s“ nicht ermitteln: %s\n"
+msgstr "%s: konnte Positionszeiger in Datei »%s« nicht ermitteln: %s\n"
 
-#: receivelog.c:232
+#: receivelog.c:235
 #, c-format
 msgid "%s: could not rename file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht umbenennen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht umbenennen: %s\n"
 
-#: receivelog.c:239
+#: receivelog.c:242
 #, c-format
 msgid "%s: not renaming \"%s%s\", segment is not complete\n"
-msgstr "%s: „%s%s“ wird nicht umbenannt, Segment ist noch nicht vollständig\n"
+msgstr "%s: »%s%s« wird nicht umbenannt, Segment ist noch nicht vollständig\n"
 
-#: receivelog.c:285
+#: receivelog.c:288
 #, c-format
 msgid "%s: could not open timeline history file \"%s\": %s\n"
-msgstr "%s: konnte Zeitleisten-History-Datei „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Zeitleisten-History-Datei »%s« nicht öffnen: %s\n"
 
-#: receivelog.c:313
+#: receivelog.c:316
 #, c-format
 msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
 msgstr "%s: Server berichtete unerwarteten History-Dateinamen für Zeitleiste %u: %s\n"
 
-#: receivelog.c:330
+#: receivelog.c:333
 #, c-format
 msgid "%s: could not create timeline history file \"%s\": %s\n"
-msgstr "%s: konnte Zeitleisten-History-Datei „%s“ nicht erzeugen: %s\n"
+msgstr "%s: konnte Zeitleisten-History-Datei »%s« nicht erzeugen: %s\n"
 
-#: receivelog.c:347
+#: receivelog.c:350
 #, c-format
 msgid "%s: could not write timeline history file \"%s\": %s\n"
-msgstr "%s: konnte Zeitleisten-History-Datei „%s“ nicht schreiben: %s\n"
+msgstr "%s: konnte Zeitleisten-History-Datei »%s« nicht schreiben: %s\n"
 
-#: receivelog.c:372
+#: receivelog.c:375
 #, c-format
 msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht in „%s“ umbenennen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht in »%s« umbenennen: %s\n"
 
-#: receivelog.c:449
+#: receivelog.c:452
 #, c-format
 msgid "%s: incompatible server version %s; client does not support streaming from server versions older than %s\n"
 msgstr "%s: inkompatible Serverversion %s; Client unterstützt Streaming nicht mit Serverversionen älter als %s\n"
 
-#: receivelog.c:459
+#: receivelog.c:462
 #, c-format
 msgid "%s: incompatible server version %s; client does not support streaming from server versions newer than %s\n"
 msgstr "%s: inkompatible Serverversion %s; Client unterstützt Streaming nicht mit Serverversionen neuer als %s\n"
 
-#: receivelog.c:557 streamutil.c:264 streamutil.c:299
+#: receivelog.c:562 streamutil.c:272 streamutil.c:311
 #, c-format
 msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields\n"
 msgstr "%s: konnte System nicht identifizieren: %d Zeilen und %d Felder erhalten, %d Zeilen und %d oder mehr Felder erwartet\n"
 
-#: receivelog.c:565
+#: receivelog.c:570
 #, c-format
 msgid "%s: system identifier does not match between base backup and streaming connection\n"
 msgstr "%s: Systemidentifikator stimmt nicht zwischen Basissicherung und Streaming-Verbindung überein\n"
 
-#: receivelog.c:573
+#: receivelog.c:578
 #, c-format
 msgid "%s: starting timeline %u is not present in the server\n"
 msgstr "%s: Startzeitleiste %u ist auf dem Server nicht vorhanden\n"
 
-#: receivelog.c:613
+#: receivelog.c:618
 #, c-format
 msgid "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: unerwartete Antwort auf Befehl TIMELINE_HISTORY: %d Zeilen und %d Felder erhalten, %d Zeilen und %d Felder erwartet\n"
 
-#: receivelog.c:688
+#: receivelog.c:693
 #, c-format
 msgid "%s: server reported unexpected next timeline %u, following timeline %u\n"
 msgstr "%s: Server berichtete unerwartete nächste Zeitleiste %u, folgend auf Zeitleiste %u\n"
 
-#: receivelog.c:695
+#: receivelog.c:700
 #, c-format
 msgid "%s: server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X\n"
 msgstr "%s: Server beendete Streaming von Zeitleiste %u bei %X/%X, aber gab an, dass nächste Zeitleiste %u bei %X/%X beginnt\n"
 
-#: receivelog.c:736
+#: receivelog.c:741
 #, c-format
 msgid "%s: replication stream was terminated before stop point\n"
 msgstr "%s: Replikationsstrom wurde vor Stopppunkt abgebrochen\n"
 
-#: receivelog.c:785
+#: receivelog.c:790
 #, c-format
 msgid "%s: unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: unerwartete Ergebnismenge nach Ende der Zeitleiste: %d Zeilen und %d Felder erhalten, %d Zeilen und %d Felder erwartet\n"
 
-#: receivelog.c:795
+#: receivelog.c:800
 #, c-format
 msgid "%s: could not parse next timeline's starting point \"%s\"\n"
-msgstr "%s: konnte Startpunkt der nächsten Zeitleiste („%s“) nicht interpretieren\n"
+msgstr "%s: konnte Startpunkt der nächsten Zeitleiste (»%s«) nicht interpretieren\n"
 
-#: receivelog.c:959
+#: receivelog.c:964
 #, c-format
 msgid "%s: socket not open"
 msgstr "%s: Socket ist nicht offen"
 
-#: receivelog.c:1163
+#: receivelog.c:1168
 #, c-format
 msgid "%s: received transaction log record for offset %u with no file open\n"
 msgstr "%s: Transaktionslogeintrag für Offset %u erhalten ohne offene Datei\n"
 
-#: receivelog.c:1175
+#: receivelog.c:1180
 #, c-format
 msgid "%s: got WAL data offset %08x, expected %08x\n"
 msgstr "%s: WAL-Daten-Offset %08x erhalten, %08x erwartet\n"
 
-#: receivelog.c:1212
+#: receivelog.c:1217
 #, c-format
 msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
-msgstr "%s: konnte %u Bytes nicht in WAL-Datei „%s“ schreiben: %s\n"
+msgstr "%s: konnte %u Bytes nicht in WAL-Datei »%s« schreiben: %s\n"
 
-#: receivelog.c:1237 receivelog.c:1279 receivelog.c:1311
+#: receivelog.c:1242 receivelog.c:1284 receivelog.c:1316
 #, c-format
 msgid "%s: could not send copy-end packet: %s"
 msgstr "%s: konnte COPY-Ende-Paket nicht senden: %s"
 
-#: streamutil.c:145
+#: streamutil.c:153
 msgid "Password: "
 msgstr "Passwort: "
 
-#: streamutil.c:169
+#: streamutil.c:177
 #, c-format
 msgid "%s: could not connect to server\n"
 msgstr "%s: konnte nicht mit Server verbinden\n"
 
-#: streamutil.c:187
+#: streamutil.c:195
 #, c-format
 msgid "%s: could not connect to server: %s"
 msgstr "%s: konnte nicht mit Server verbinden: %s"
 
-#: streamutil.c:211
+#: streamutil.c:219
 #, c-format
 msgid "%s: could not determine server setting for integer_datetimes\n"
 msgstr "%s: konnte Servereinstellung für integer_datetimes nicht ermitteln\n"
 
-#: streamutil.c:224
+#: streamutil.c:232
 #, c-format
 msgid "%s: integer_datetimes compile flag does not match server\n"
-msgstr "%s: Kompilieroption „integer_datetimes“ stimmt nicht mit Server überein\n"
+msgstr "%s: Kompilieroption »integer_datetimes« stimmt nicht mit Server überein\n"
 
-#: streamutil.c:365
+#: streamutil.c:379
 #, c-format
 msgid "%s: could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: konnte Replikations-Slot „%s“ nicht erzeugen: %d Zeilen und %d Felder erhalten, %d Zeilen und %d Felder erwartet\n"
+msgstr "%s: konnte Replikations-Slot »%s« nicht erzeugen: %d Zeilen und %d Felder erhalten, %d Zeilen und %d Felder erwartet\n"
 
-#: streamutil.c:410
+#: streamutil.c:424
 #, c-format
 msgid "%s: could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: konnte Replikations-Slot „%s“ nicht löschen: %d Zeilen und %d Felder erhalten, %d Zeilen und %d Felder erwartet\n"
+msgstr "%s: konnte Replikations-Slot »%s« nicht löschen: %d Zeilen und %d Felder erhalten, %d Zeilen und %d Felder erwartet\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/es.po postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/es.po
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: pg_basebackup (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:43+0000\n"
+"POT-Creation-Date: 2017-05-21 17:32+0000\n"
 "PO-Revision-Date: 2015-09-30 12:30-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: Spanish <pgsql-es-ayuda@postgresql.org>\n"
@@ -30,32 +30,32 @@
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
 
-#: pg_basebackup.c:154
+#: pg_basebackup.c:156
 #, c-format
 msgid "%s: directory name too long\n"
 msgstr "%s: nombre de directorio demasiado largo\n"
 
-#: pg_basebackup.c:164
+#: pg_basebackup.c:166
 #, c-format
 msgid "%s: multiple \"=\" signs in tablespace mapping\n"
 msgstr "%s: múltiples signos «=» en mapeo de tablespace\n"
 
-#: pg_basebackup.c:177
+#: pg_basebackup.c:179
 #, c-format
 msgid "%s: invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\"\n"
 msgstr "%s: formato de mapeo de tablespace «%s» no válido, debe ser «ANTIGUO=NUEVO»\n"
 
-#: pg_basebackup.c:190
+#: pg_basebackup.c:192
 #, c-format
 msgid "%s: old directory is not an absolute path in tablespace mapping: %s\n"
 msgstr "%s: directorio antiguo no es una ruta absoluta en mapeo de tablespace: %s\n"
 
-#: pg_basebackup.c:197
+#: pg_basebackup.c:199
 #, c-format
 msgid "%s: new directory is not an absolute path in tablespace mapping: %s\n"
 msgstr "%s: directorio nuevo no es una ruta absoluta en mapeo de tablespace: %s\n"
 
-#: pg_basebackup.c:231
+#: pg_basebackup.c:233
 #, c-format
 msgid ""
 "%s takes a base backup of a running PostgreSQL server.\n"
@@ -64,17 +64,17 @@
 "%s obtiene un respaldo base a partir de un servidor PostgreSQL en ejecución.\n"
 "\n"
 
-#: pg_basebackup.c:233 pg_receivexlog.c:66 pg_recvlogical.c:69
+#: pg_basebackup.c:235 pg_receivexlog.c:66 pg_recvlogical.c:72
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_basebackup.c:234 pg_receivexlog.c:67 pg_recvlogical.c:70
+#: pg_basebackup.c:236 pg_receivexlog.c:67 pg_recvlogical.c:73
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPCIÓN]...\n"
 
-#: pg_basebackup.c:235
+#: pg_basebackup.c:237
 #, c-format
 msgid ""
 "\n"
@@ -83,17 +83,17 @@
 "\n"
 "Opciones que controlan la salida:\n"
 
-#: pg_basebackup.c:236
+#: pg_basebackup.c:238
 #, c-format
 msgid "  -D, --pgdata=DIRECTORY receive base backup into directory\n"
 msgstr "  -D, --pgdata=DIRECTORIO  recibir el respaldo base en directorio\n"
 
-#: pg_basebackup.c:237
+#: pg_basebackup.c:239
 #, c-format
 msgid "  -F, --format=p|t       output format (plain (default), tar)\n"
 msgstr "  -F, --format=p|t         formato de salida (plano (por omisión), tar)\n"
 
-#: pg_basebackup.c:238
+#: pg_basebackup.c:240
 #, c-format
 msgid ""
 "  -r, --max-rate=RATE    maximum transfer rate to transfer data directory\n"
@@ -102,16 +102,16 @@
 "  -r, --max-rate=TASA      máxima tasa a la que transferir el directorio de datos\n"
 "                           (en kB/s, o use sufijos «k» o «M»)\n"
 
-#: pg_basebackup.c:240
+#: pg_basebackup.c:242
 #, c-format
 msgid ""
 "  -R, --write-recovery-conf\n"
-"                         write recovery.conf after backup\n"
+"                         write recovery.conf for replication\n"
 msgstr ""
-"  -R, --write-recovery-info\n"
-"                           escribe recovery.conf después del respaldo\n"
+"  -R, --write-recovery-conf\n"
+"                           escribe recovery.conf para replicación\n"
 
-#: pg_basebackup.c:242
+#: pg_basebackup.c:244
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
@@ -120,14 +120,14 @@
 "  -T, --tablespace-mapping=ANTIGUO=NUEVO\n"
 "                           reubicar el directorio de tablespace de ANTIGUO a NUEVO\n"
 
-#: pg_basebackup.c:244
+#: pg_basebackup.c:246
 #, c-format
 msgid "  -x, --xlog             include required WAL files in backup (fetch mode)\n"
 msgstr ""
 "  -x, --xlog               incluye los archivos WAL necesarios en el respaldo\n"
 "                           (modo fetch)\n"
 
-#: pg_basebackup.c:245
+#: pg_basebackup.c:247
 #, c-format
 msgid ""
 "  -X, --xlog-method=fetch|stream\n"
@@ -137,22 +137,22 @@
 "                           incluye los archivos WAL necesarios,\n"
 "                           en el modo especificado\n"
 
-#: pg_basebackup.c:247
+#: pg_basebackup.c:249
 #, c-format
 msgid "      --xlogdir=XLOGDIR  location for the transaction log directory\n"
 msgstr "      --xlogdir=DIR        ubicación para los archivos del registro transaccional\n"
 
-#: pg_basebackup.c:248
+#: pg_basebackup.c:250
 #, c-format
 msgid "  -z, --gzip             compress tar output\n"
 msgstr "  -z, --gzip               comprimir la salida de tar\n"
 
-#: pg_basebackup.c:249
+#: pg_basebackup.c:251
 #, 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:250
+#: pg_basebackup.c:252
 #, c-format
 msgid ""
 "\n"
@@ -161,7 +161,7 @@
 "\n"
 "Opciones generales:\n"
 
-#: pg_basebackup.c:251
+#: pg_basebackup.c:253
 #, c-format
 msgid ""
 "  -c, --checkpoint=fast|spread\n"
@@ -170,32 +170,32 @@
 "  -c, --checkpoint=fast|spread\n"
 "                           utilizar checkpoint rápido o extendido\n"
 
-#: pg_basebackup.c:253
+#: pg_basebackup.c:255
 #, c-format
 msgid "  -l, --label=LABEL      set backup label\n"
 msgstr "  -l, --label=ETIQUETA     establecer etiqueta del respaldo\n"
 
-#: pg_basebackup.c:254
+#: pg_basebackup.c:256
 #, c-format
 msgid "  -P, --progress         show progress information\n"
 msgstr "  -P, --progress           mostrar información de progreso\n"
 
-#: pg_basebackup.c:255 pg_receivexlog.c:76 pg_recvlogical.c:89
+#: pg_basebackup.c:257 pg_receivexlog.c:76 pg_recvlogical.c:92
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose            desplegar mensajes verbosos\n"
 
-#: pg_basebackup.c:256 pg_receivexlog.c:77 pg_recvlogical.c:90
+#: pg_basebackup.c:258 pg_receivexlog.c:77 pg_recvlogical.c:93
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version            mostrar información de versión, luego salir\n"
 
-#: pg_basebackup.c:257 pg_receivexlog.c:78 pg_recvlogical.c:91
+#: pg_basebackup.c:259 pg_receivexlog.c:78 pg_recvlogical.c:94
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help               mostrar esta ayuda, luego salir\n"
 
-#: pg_basebackup.c:258 pg_receivexlog.c:79 pg_recvlogical.c:92
+#: pg_basebackup.c:260 pg_receivexlog.c:79 pg_recvlogical.c:95
 #, c-format
 msgid ""
 "\n"
@@ -204,22 +204,22 @@
 "\n"
 "Opciones de conexión:\n"
 
-#: pg_basebackup.c:259 pg_receivexlog.c:80
+#: pg_basebackup.c:261 pg_receivexlog.c:80
 #, c-format
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -s, --dbname=CONSTR      cadena de conexión\n"
 
-#: pg_basebackup.c:260 pg_receivexlog.c:81 pg_recvlogical.c:94
+#: pg_basebackup.c:262 pg_receivexlog.c:81 pg_recvlogical.c:97
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr "  -h, --host=ANFITRIÓN     dirección del servidor o directorio del socket\n"
 
-#: pg_basebackup.c:261 pg_receivexlog.c:82 pg_recvlogical.c:95
+#: pg_basebackup.c:263 pg_receivexlog.c:82 pg_recvlogical.c:98
 #, 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:262
+#: pg_basebackup.c:264
 #, c-format
 msgid ""
 "  -s, --status-interval=INTERVAL\n"
@@ -228,24 +228,24 @@
 "  -s, --status-interval=INTERVALO (segundos)\n"
 "                           tiempo entre envíos de paquetes de estado al servidor\n"
 
-#: pg_basebackup.c:264 pg_receivexlog.c:83 pg_recvlogical.c:96
+#: pg_basebackup.c:266 pg_receivexlog.c:83 pg_recvlogical.c:99
 #, 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:265 pg_receivexlog.c:84 pg_recvlogical.c:97
+#: pg_basebackup.c:267 pg_receivexlog.c:84 pg_recvlogical.c:100
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password        nunca pedir contraseña\n"
 
-#: pg_basebackup.c:266 pg_receivexlog.c:85 pg_recvlogical.c:98
+#: pg_basebackup.c:268 pg_receivexlog.c:85 pg_recvlogical.c:101
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password           forzar un prompt para la contraseña\n"
 "                           (debería ser automático)\n"
 
-#: pg_basebackup.c:267 pg_receivexlog.c:89 pg_recvlogical.c:99
+#: pg_basebackup.c:269 pg_receivexlog.c:89 pg_recvlogical.c:102
 #, c-format
 msgid ""
 "\n"
@@ -254,198 +254,193 @@
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_basebackup.c:310
+#: pg_basebackup.c:312
 #, c-format
 msgid "%s: could not read from ready pipe: %s\n"
 msgstr "%s: no se pudo leer desde la tubería: %s\n"
 
-#: pg_basebackup.c:318 pg_basebackup.c:411 pg_basebackup.c:1879
-#: streamutil.c:285
+#: pg_basebackup.c:320 pg_basebackup.c:413 pg_basebackup.c:1887
+#: streamutil.c:293
 #, c-format
 msgid "%s: could not parse transaction log location \"%s\"\n"
 msgstr "%s: no se pudo interpretar la ubicación del registro transaccional «%s»\n"
 
-#: pg_basebackup.c:424
+#: pg_basebackup.c:426
 #, c-format
 msgid "%s: could not create pipe for background process: %s\n"
 msgstr "%s: no se pudo crear la tubería para el proceso en segundo plano: %s\n"
 
-#: pg_basebackup.c:449 pg_basebackup.c:504 pg_basebackup.c:1262
+#: pg_basebackup.c:451 pg_basebackup.c:506 pg_basebackup.c:1254
 #, 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:467
+#: pg_basebackup.c:469
 #, c-format
 msgid "%s: could not create background process: %s\n"
 msgstr "%s: no se pudo lanzar el proceso en segundo plano: %s\n"
 
-#: pg_basebackup.c:479
+#: pg_basebackup.c:481
 #, c-format
 msgid "%s: could not create background thread: %s\n"
 msgstr "%s: no se pudo lanzar el hilo en segundo plano: %s\n"
 
-#: pg_basebackup.c:523
+#: pg_basebackup.c:525
 #, 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:531
+#: pg_basebackup.c:533
 #, 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:593
+#: pg_basebackup.c:595
 #, c-format
 msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
 msgstr[0] "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgstr[1] "%*s/%s kB (100%%), %d/%d tablespaces %*s"
 
-#: pg_basebackup.c:605
+#: pg_basebackup.c:607
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
 msgstr[0] "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgstr[1] "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
 
-#: pg_basebackup.c:621
+#: pg_basebackup.c:623
 #, 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:643
+#: pg_basebackup.c:645
 #, c-format
 msgid "%s: transfer rate \"%s\" is not a valid value\n"
 msgstr "%s: tasa de transferencia «%s» no es un valor válido\n"
 
-#: pg_basebackup.c:650
+#: pg_basebackup.c:652
 #, c-format
 msgid "%s: invalid transfer rate \"%s\": %s\n"
 msgstr "%s: tasa de transferencia «%s» no válida: %s\n"
 
-#: pg_basebackup.c:660
+#: pg_basebackup.c:662
 #, c-format
 msgid "%s: transfer rate must be greater than zero\n"
 msgstr "%s: tasa de transferencia debe ser mayor que cero\n"
 
-#: pg_basebackup.c:694
+#: pg_basebackup.c:696
 #, c-format
 msgid "%s: invalid --max-rate unit: \"%s\"\n"
 msgstr "%s: unidad de --max-rato no válida: «%s»\n"
 
-#: pg_basebackup.c:703
+#: pg_basebackup.c:705
 #, c-format
 msgid "%s: transfer rate \"%s\" exceeds integer range\n"
 msgstr "%s: la tasa de transferencia «%s» excede el rango de enteros\n"
 
-#: pg_basebackup.c:715
+#: pg_basebackup.c:717
 #, c-format
 msgid "%s: transfer rate \"%s\" is out of range\n"
 msgstr "%s: la tasa de transferencia «%s» está fuera de rango\n"
 
-#: pg_basebackup.c:739
+#: pg_basebackup.c:741
 #, 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:749 pg_basebackup.c:1356 pg_basebackup.c:1574
+#: pg_basebackup.c:751 pg_basebackup.c:1348 pg_basebackup.c:1566
 #, 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:804 pg_basebackup.c:825 pg_basebackup.c:853
+#: pg_basebackup.c:806 pg_basebackup.c:827 pg_basebackup.c:855
 #, c-format
 msgid "%s: could not set compression level %d: %s\n"
 msgstr "%s: no se pudo definir el nivel de compresión %d: %s\n"
 
-#: pg_basebackup.c:874
+#: pg_basebackup.c:876
 #, 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:885 pg_basebackup.c:1316 pg_basebackup.c:1567
+#: pg_basebackup.c:887 pg_basebackup.c:1308 pg_basebackup.c:1559
 #, 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:897 pg_basebackup.c:1161
+#: pg_basebackup.c:899 pg_basebackup.c:1163
 #, 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:954
+#: pg_basebackup.c:956
 #, c-format
 msgid "%s: could not close compressed file \"%s\": %s\n"
 msgstr "%s: no se pudo cerrar el archivo comprimido «%s»: %s\n"
 
-#: pg_basebackup.c:967 pg_recvlogical.c:569 receivelog.c:213 receivelog.c:362
-#: receivelog.c:754
+#: pg_basebackup.c:969 pg_recvlogical.c:572 receivelog.c:216 receivelog.c:365
+#: receivelog.c:759
 #, c-format
 msgid "%s: could not close file \"%s\": %s\n"
 msgstr "%s: no se pudo cerrar el archivo «%s»: %s\n"
 
-#: pg_basebackup.c:978 pg_basebackup.c:1190 pg_recvlogical.c:435
-#: receivelog.c:1044
+#: pg_basebackup.c:980 pg_basebackup.c:1192 pg_recvlogical.c:438
+#: receivelog.c:1049
 #, c-format
 msgid "%s: could not read COPY data: %s"
 msgstr "%s: no fue posible leer datos COPY: %s"
 
-#: pg_basebackup.c:1204
+#: pg_basebackup.c:1206
 #, c-format
 msgid "%s: invalid tar block header size: %d\n"
 msgstr "%s: tamaño de bloque de cabecera de tar no válido: %d\n"
 
-#: pg_basebackup.c:1212
-#, 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:1220
-#, c-format
-msgid "%s: could not parse file mode\n"
-msgstr "%s: nose pudo interpretar el modo del archivo\n"
-
-#: pg_basebackup.c:1270
+#: pg_basebackup.c:1262
 #, 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:1294
+#: pg_basebackup.c:1286
 #, c-format
 msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
 msgstr "%s: no se pudo crear un enlace simbólico desde «%s» a «%s»: %s\n"
 
-#: pg_basebackup.c:1303
+#: pg_basebackup.c:1295
 #, c-format
 msgid "%s: unrecognized link indicator \"%c\"\n"
 msgstr "%s: indicador de enlace «%c» no reconocido\n"
 
-#: pg_basebackup.c:1323
+#: pg_basebackup.c:1315
 #, 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:1382
+#: pg_basebackup.c:1374
 #, c-format
 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:1468 pg_basebackup.c:1488 pg_basebackup.c:1495
-#: pg_basebackup.c:1542
+#: pg_basebackup.c:1460 pg_basebackup.c:1480 pg_basebackup.c:1487
+#: pg_basebackup.c:1534
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria agotada\n"
 
-#: pg_basebackup.c:1619
+#: pg_basebackup.c:1611
 #, c-format
 msgid "%s: incompatible server version %s\n"
 msgstr "%s: versión del servidor %s incompatible\n"
 
-#: pg_basebackup.c:1666 pg_recvlogical.c:261 receivelog.c:549 receivelog.c:600
-#: receivelog.c:641 streamutil.c:255 streamutil.c:353 streamutil.c:399
+#: pg_basebackup.c:1648
+#, c-format
+msgid "%s: initiating base backup, waiting for checkpoint to complete\n"
+msgstr "%s: iniciando el respaldo base, esperando que el checkpoint se complete\n"
+
+#: pg_basebackup.c:1666 pg_recvlogical.c:264 receivelog.c:554 receivelog.c:605
+#: receivelog.c:646 streamutil.c:263 streamutil.c:367 streamutil.c:413
 #, c-format
 msgid "%s: could not send replication command \"%s\": %s"
 msgstr "%s: no se pudo ejecutar la orden de replicación «%s»: %s"
@@ -460,173 +455,178 @@
 msgid "%s: server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: el servidor envió una respuesta inesperada a la orden BASE_BACKUP; se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos\n"
 
-#: pg_basebackup.c:1704
+#: pg_basebackup.c:1692
+#, c-format
+msgid "%s: checkpoint completed\n"
+msgstr "%s: el checkpoint se ha completado\n"
+
+#: pg_basebackup.c:1707
 #, c-format
 msgid "transaction log start point: %s on timeline %u\n"
 msgstr "punto de inicio del registro transaccional: %s en el timeline %u\n"
 
-#: pg_basebackup.c:1713
+#: pg_basebackup.c:1716
 #, c-format
 msgid "%s: could not get backup header: %s"
 msgstr "%s: no se pudo obtener la cabecera de respaldo: %s"
 
-#: pg_basebackup.c:1719
+#: pg_basebackup.c:1722
 #, c-format
 msgid "%s: no data returned from server\n"
 msgstr "%s: el servidor no retornó datos\n"
 
-#: pg_basebackup.c:1751
+#: pg_basebackup.c:1754
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %d\n"
 msgstr "%s: sólo se puede escribir un tablespace a stdout, la base de datos tiene %d\n"
 
-#: pg_basebackup.c:1763
+#: pg_basebackup.c:1766
 #, c-format
 msgid "%s: starting background WAL receiver\n"
 msgstr "%s: iniciando el receptor de WAL en segundo plano\n"
 
-#: pg_basebackup.c:1794
+#: pg_basebackup.c:1797
 #, c-format
 msgid "%s: could not get transaction log end position from server: %s"
 msgstr "%s: no se pudo obtener la posición final del registro transaccional del servidor: %s"
 
-#: pg_basebackup.c:1801
+#: pg_basebackup.c:1804
 #, c-format
 msgid "%s: no transaction log end position returned from server\n"
 msgstr "%s: el servidor no retornó la posición final del registro transaccional\n"
 
-#: pg_basebackup.c:1813
+#: pg_basebackup.c:1816
 #, c-format
 msgid "%s: final receive failed: %s"
 msgstr "%s: la recepción final falló: %s"
 
-#: pg_basebackup.c:1831
+#: pg_basebackup.c:1839
 #, c-format
 msgid "%s: waiting for background process to finish streaming ...\n"
 msgstr "%s: esperando que el proceso en segundo plano complete el flujo...\n"
 
-#: pg_basebackup.c:1837
+#: pg_basebackup.c:1845
 #, c-format
 msgid "%s: could not send command to background pipe: %s\n"
 msgstr "%s: no se pudo enviar una orden a la tubería de segundo plano: %s\n"
 
-#: pg_basebackup.c:1846
+#: pg_basebackup.c:1854
 #, c-format
 msgid "%s: could not wait for child process: %s\n"
 msgstr "%s: no se pudo esperar al proceso hijo: %s\n"
 
-#: pg_basebackup.c:1852
+#: pg_basebackup.c:1860
 #, c-format
 msgid "%s: child %d died, expected %d\n"
 msgstr "%s: el hijo %d murió, pero se esperaba al %d\n"
 
-#: pg_basebackup.c:1858
+#: pg_basebackup.c:1866
 #, c-format
 msgid "%s: child process did not exit normally\n"
 msgstr "%s: el proceso hijo no terminó normalmente\n"
 
-#: pg_basebackup.c:1864
+#: pg_basebackup.c:1872
 #, c-format
 msgid "%s: child process exited with error %d\n"
 msgstr "%s: el proceso hijo terminó con código de salida %d\n"
 
-#: pg_basebackup.c:1891
+#: pg_basebackup.c:1899
 #, c-format
 msgid "%s: could not wait for child thread: %s\n"
 msgstr "%s: no se pudo esperar el hilo hijo: %s\n"
 
-#: pg_basebackup.c:1898
+#: pg_basebackup.c:1906
 #, c-format
 msgid "%s: could not get child thread exit status: %s\n"
 msgstr "%s: no se pudo obtener la cabecera de respaldo: %s\n"
 
-#: pg_basebackup.c:1904
+#: pg_basebackup.c:1912
 #, c-format
 msgid "%s: child thread exited with error %u\n"
 msgstr "%s: el hilo hijo terminó con error %u\n"
 
-#: pg_basebackup.c:1993
+#: pg_basebackup.c:2001
 #, 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:2011 pg_basebackup.c:2023
+#: pg_basebackup.c:2019 pg_basebackup.c:2031
 #, c-format
 msgid "%s: cannot specify both --xlog and --xlog-method\n"
 msgstr "%s: no se puede tanto --xlog como --xlog-method\n"
 
-#: pg_basebackup.c:2038
+#: pg_basebackup.c:2046
 #, c-format
 msgid "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
 msgstr "%s: opción de xlog-method «%s» no válida, debe ser «fetch» o «stream»\n"
 
-#: pg_basebackup.c:2060
+#: pg_basebackup.c:2068
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
 msgstr "%s: valor de compresión «%s» no válido\n"
 
-#: pg_basebackup.c:2072
+#: pg_basebackup.c:2080
 #, 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:2099 pg_receivexlog.c:439 pg_recvlogical.c:752
+#: pg_basebackup.c:2107 pg_receivexlog.c:439 pg_recvlogical.c:755
 #, c-format
 msgid "%s: invalid status interval \"%s\"\n"
 msgstr "%s: intervalo de estado «%s» no válido\n"
 
-#: pg_basebackup.c:2115 pg_basebackup.c:2129 pg_basebackup.c:2140
-#: pg_basebackup.c:2153 pg_basebackup.c:2163 pg_basebackup.c:2175
-#: pg_basebackup.c:2186 pg_receivexlog.c:471 pg_receivexlog.c:485
+#: pg_basebackup.c:2123 pg_basebackup.c:2137 pg_basebackup.c:2148
+#: pg_basebackup.c:2161 pg_basebackup.c:2171 pg_basebackup.c:2183
+#: pg_basebackup.c:2194 pg_receivexlog.c:471 pg_receivexlog.c:485
 #: pg_receivexlog.c:493 pg_receivexlog.c:503 pg_receivexlog.c:514
-#: pg_recvlogical.c:779 pg_recvlogical.c:793 pg_recvlogical.c:804
-#: pg_recvlogical.c:812 pg_recvlogical.c:820 pg_recvlogical.c:828
-#: pg_recvlogical.c:836 pg_recvlogical.c:844
+#: pg_recvlogical.c:782 pg_recvlogical.c:796 pg_recvlogical.c:807
+#: pg_recvlogical.c:815 pg_recvlogical.c:823 pg_recvlogical.c:831
+#: pg_recvlogical.c:839 pg_recvlogical.c:847
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para obtener más información.\n"
 
-#: pg_basebackup.c:2127 pg_receivexlog.c:483 pg_recvlogical.c:791
+#: pg_basebackup.c:2135 pg_receivexlog.c:483 pg_recvlogical.c:794
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: demasiados argumentos en la línea de órdenes (el primero es «%s»)\n"
 
-#: pg_basebackup.c:2139 pg_receivexlog.c:513
+#: pg_basebackup.c:2147 pg_receivexlog.c:513
 #, c-format
 msgid "%s: no target directory specified\n"
 msgstr "%s: no se especificó un directorio de salida\n"
 
-#: pg_basebackup.c:2151
+#: pg_basebackup.c:2159
 #, 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:2161
+#: pg_basebackup.c:2169
 #, c-format
 msgid "%s: WAL streaming can only be used in plain mode\n"
 msgstr "%s: el flujo de WAL sólo puede usar en modo «plain»\n"
 
-#: pg_basebackup.c:2173
+#: pg_basebackup.c:2181
 #, c-format
 msgid "%s: transaction log directory location can only be specified in plain mode\n"
 msgstr "%s: la ubicación del registro transaccional sólo puede especificarse en modo «plain»\n"
 
-#: pg_basebackup.c:2184
+#: pg_basebackup.c:2192
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: la ubicación del registro transaccional debe ser una ruta absoluta\n"
 
-#: pg_basebackup.c:2196
+#: pg_basebackup.c:2204
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s: esta instalación no soporta compresión\n"
 
-#: pg_basebackup.c:2223
+#: pg_basebackup.c:2231
 #, 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"
 
-#: pg_basebackup.c:2228
+#: pg_basebackup.c:2236
 #, c-format
 msgid "%s: symlinks are not supported on this platform\n"
 msgstr "%s: los enlaces simbólicos no están soportados en esta plataforma\n"
@@ -640,7 +640,7 @@
 "%s recibe flujos del registro transaccional de PostgreSQL.\n"
 "\n"
 
-#: pg_receivexlog.c:68 pg_recvlogical.c:75
+#: pg_receivexlog.c:68 pg_recvlogical.c:78
 #, c-format
 msgid ""
 "\n"
@@ -654,17 +654,17 @@
 msgid "  -D, --directory=DIR    receive transaction log files into this directory\n"
 msgstr "  -D, --directory=DIR    recibe los archivos de transacción a este directorio\n"
 
-#: pg_receivexlog.c:70 pg_recvlogical.c:79
+#: pg_receivexlog.c:70 pg_recvlogical.c:82
 #, c-format
 msgid "      --if-not-exists    do not error if slot already exists when creating a slot\n"
 msgstr "      --if-not-exists    no abandonar si el slot ya existe al crear un slot\n"
 
-#: pg_receivexlog.c:71 pg_recvlogical.c:81
+#: pg_receivexlog.c:71 pg_recvlogical.c:84
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop          no entrar en bucle al perder la conexión\n"
 
-#: pg_receivexlog.c:72 pg_recvlogical.c:86
+#: pg_receivexlog.c:72 pg_recvlogical.c:89
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
@@ -695,12 +695,12 @@
 "\n"
 "Acciones optativas:\n"
 
-#: pg_receivexlog.c:87 pg_recvlogical.c:72
+#: pg_receivexlog.c:87 pg_recvlogical.c:75
 #, c-format
 msgid "      --create-slot      create a new replication slot (for the slot's name see --slot)\n"
 msgstr "      --create-slot        crea un nuevo slot de replicación (para el nombre, vea --slot)\n"
 
-#: pg_receivexlog.c:88 pg_recvlogical.c:73
+#: pg_receivexlog.c:88 pg_recvlogical.c:76
 #, c-format
 msgid "      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"
 msgstr "      --drop-slot          elimina un slot de replicación (para el nombre, vea --slot)\n"
@@ -730,7 +730,7 @@
 msgid "%s: could not close directory \"%s\": %s\n"
 msgstr "%s: no se pudo cerrar el directorio «%s»: %s\n"
 
-#: pg_receivexlog.c:218 pg_recvlogical.c:343
+#: pg_receivexlog.c:218 pg_recvlogical.c:346
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: no se pudo hacer stat del archivo «%s»: %s\n"
@@ -750,7 +750,7 @@
 msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
 msgstr "%s: iniciando el flujo de log en %X/%X (timeline %u)\n"
 
-#: pg_receivexlog.c:420 pg_recvlogical.c:699
+#: pg_receivexlog.c:420 pg_recvlogical.c:702
 #, c-format
 msgid "%s: invalid port number \"%s\"\n"
 msgstr "%s: número de puerto «%s» no válido\n"
@@ -771,28 +771,28 @@
 msgid "%s: replication connection using slot \"%s\" is unexpectedly database specific\n"
 msgstr "%s: la conexión de replicación usando el slot «%s» es inesperadamente específica a una base de datos\n"
 
-#: pg_receivexlog.c:568 pg_recvlogical.c:884
+#: pg_receivexlog.c:568 pg_recvlogical.c:887
 #, c-format
 msgid "%s: dropping replication slot \"%s\"\n"
 msgstr "%s: eliminando el slot de replicación «%s»\n"
 
-#: pg_receivexlog.c:581 pg_recvlogical.c:896
+#: pg_receivexlog.c:581 pg_recvlogical.c:899
 #, c-format
 msgid "%s: creating replication slot \"%s\"\n"
 msgstr "%s: creando el slot de replicación «%s»\n"
 
-#: pg_receivexlog.c:608 pg_recvlogical.c:922
+#: pg_receivexlog.c:608 pg_recvlogical.c:925
 #, c-format
 msgid "%s: disconnected\n"
 msgstr "%s: desconectado\n"
 
 #. translator: check source for value for %d
-#: pg_receivexlog.c:615 pg_recvlogical.c:929
+#: pg_receivexlog.c:615 pg_recvlogical.c:932
 #, c-format
 msgid "%s: disconnected; waiting %d seconds to try again\n"
 msgstr "%s: desconectado; esperando %d segundos para intentar nuevamente\n"
 
-#: pg_recvlogical.c:67
+#: pg_recvlogical.c:70
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
@@ -801,7 +801,7 @@
 "%s controla flujos de decodificación lógica de PostgreSQL.\n"
 "\n"
 
-#: pg_recvlogical.c:71
+#: pg_recvlogical.c:74
 #, c-format
 msgid ""
 "\n"
@@ -810,17 +810,17 @@
 "\n"
 "Acciones a ejecutar:\n"
 
-#: pg_recvlogical.c:74
+#: pg_recvlogical.c:77
 #, c-format
 msgid "      --start            start streaming in a replication slot (for the slot's name see --slot)\n"
 msgstr "      --start              inicie flujo en un slot de replicación (para el nombre, vea --slot)\n"
 
-#: pg_recvlogical.c:76
+#: pg_recvlogical.c:79
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr "  -f, --file=ARCHIVO       recibe el log en este archivo, - para stdout\n"
 
-#: pg_recvlogical.c:77
+#: pg_recvlogical.c:80
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
@@ -829,12 +829,12 @@
 "  -F, --fsync-interval=SEGS\n"
 "                         tiempo entre fsyncs del archivo de salida (omisión: %d)\n"
 
-#: pg_recvlogical.c:80
+#: pg_recvlogical.c:83
 #, c-format
 msgid "  -I, --startpos=LSN     where in an existing slot should the streaming start\n"
 msgstr "  -I, --startpos=LSN    dónde en un slot existente debe empezar el flujo\n"
 
-#: pg_recvlogical.c:82
+#: pg_recvlogical.c:85
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -845,313 +845,319 @@
 "                         pasar opción NOMBRE con valor opcional VALOR al\n"
 "                         plugin de salida\n"
 
-#: pg_recvlogical.c:85
+#: pg_recvlogical.c:88
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr "  -P, --plugin=PLUGIN    use plugin de salida PLUGIN (omisión: %s)\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:91
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
 msgstr "  -S, --slot=NOMBRE-SLOT   nombre del slot de replicación lógica\n"
 
-#: pg_recvlogical.c:93
+#: pg_recvlogical.c:96
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=BASE         base de datos a la cual conectarse\n"
 
-#: pg_recvlogical.c:126
+#: pg_recvlogical.c:129
 #, c-format
 msgid "%s: confirming write up to %X/%X, flush to %X/%X (slot %s)\n"
 msgstr "%s: confirmando escritura hasta %X/%X, fsync hasta %X/%X (slot %s)\n"
 
-#: pg_recvlogical.c:151 receivelog.c:415
+#: pg_recvlogical.c:154 receivelog.c:418
 #, c-format
 msgid "%s: could not send feedback packet: %s"
 msgstr "%s: no se pudo enviar el paquete de retroalimentación: %s"
 
-#: pg_recvlogical.c:190
+#: pg_recvlogical.c:193
 #, c-format
 msgid "%s: could not fsync log file \"%s\": %s\n"
 msgstr "%s: no se pudo sincronizar (fsync) el archivo de registro «%s»: %s\n"
 
-#: pg_recvlogical.c:229
+#: pg_recvlogical.c:232
 #, c-format
 msgid "%s: starting log streaming at %X/%X (slot %s)\n"
 msgstr "%s: iniciando el flujo de log en %X/%X (slot %s)\n"
 
-#: pg_recvlogical.c:271
+#: pg_recvlogical.c:274
 #, c-format
 msgid "%s: streaming initiated\n"
 msgstr "%s: flujo iniciado\n"
 
-#: pg_recvlogical.c:336
+#: pg_recvlogical.c:339
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s: no se pudo abrir archivo de log «%s»: %s\n"
 
-#: pg_recvlogical.c:412 receivelog.c:980
+#: pg_recvlogical.c:415 receivelog.c:985
 #, c-format
 msgid "%s: select() failed: %s\n"
 msgstr "%s: select() falló: %s\n"
 
-#: pg_recvlogical.c:421 receivelog.c:1030
+#: pg_recvlogical.c:424 receivelog.c:1035
 #, c-format
 msgid "%s: could not receive data from WAL stream: %s"
 msgstr "%s: no se pudo recibir datos desde el flujo de WAL: %s"
 
-#: pg_recvlogical.c:462 pg_recvlogical.c:501 receivelog.c:1075
-#: receivelog.c:1144
+#: pg_recvlogical.c:465 pg_recvlogical.c:504 receivelog.c:1080
+#: receivelog.c:1149
 #, c-format
 msgid "%s: streaming header too small: %d\n"
 msgstr "%s: cabecera de flujo demasiado pequeña: %d\n"
 
-#: pg_recvlogical.c:484 receivelog.c:924
+#: pg_recvlogical.c:487 receivelog.c:929
 #, c-format
 msgid "%s: unrecognized streaming header: \"%c\"\n"
 msgstr "%s: cabecera de flujo no reconocida: «%c»\n"
 
-#: pg_recvlogical.c:530 pg_recvlogical.c:544
+#: pg_recvlogical.c:533 pg_recvlogical.c:547
 #, c-format
 msgid "%s: could not write %u bytes to log file \"%s\": %s\n"
 msgstr "%s: no se pudo escribir %u bytes al archivo de registro «%s»: %s\n"
 
-#: pg_recvlogical.c:555 receivelog.c:707 receivelog.c:745
+#: pg_recvlogical.c:558 receivelog.c:712 receivelog.c:750
 #, c-format
 msgid "%s: unexpected termination of replication stream: %s"
 msgstr "%s: término inesperado del flujo de replicación: %s"
 
-#: pg_recvlogical.c:678
+#: pg_recvlogical.c:681
 #, c-format
 msgid "%s: invalid fsync interval \"%s\"\n"
 msgstr "%s: intervalo de fsync «%s» no válido\n"
 
-#: pg_recvlogical.c:719
+#: pg_recvlogical.c:722
 #, c-format
 msgid "%s: could not parse start position \"%s\"\n"
 msgstr "%s: no se pudo interpretar la posición de inicio «%s»\n"
 
-#: pg_recvlogical.c:803
+#: pg_recvlogical.c:806
 #, c-format
 msgid "%s: no slot specified\n"
 msgstr "%s: no se especificó slot\n"
 
-#: pg_recvlogical.c:811
+#: pg_recvlogical.c:814
 #, c-format
 msgid "%s: no target file specified\n"
 msgstr "%s: no se especificó un archivo de destino\n"
 
-#: pg_recvlogical.c:819
+#: pg_recvlogical.c:822
 #, c-format
 msgid "%s: no database specified\n"
 msgstr "%s: no se especificó una base de datos\n"
 
-#: pg_recvlogical.c:827
+#: pg_recvlogical.c:830
 #, c-format
 msgid "%s: at least one action needs to be specified\n"
 msgstr "%s: debe especificarse al menos una operación\n"
 
-#: pg_recvlogical.c:835
+#: pg_recvlogical.c:838
 #, c-format
 msgid "%s: cannot use --create-slot or --start together with --drop-slot\n"
 msgstr "%s: no puede usarse --create-slot o --start junto con --drop-slot\n"
 
-#: pg_recvlogical.c:843
+#: pg_recvlogical.c:846
 #, c-format
 msgid "%s: cannot use --create-slot or --drop-slot together with --startpos\n"
 msgstr "%s: no puede usarse --create-slot o --drop-slot junto con --startpos\n"
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:877
 #, c-format
 msgid "%s: could not establish database-specific replication connection\n"
 msgstr "%s: no se pudo establecer una conexión de replicación específica a una base de datos\n"
 
-#: receivelog.c:75
+#: receivelog.c:78
 #, c-format
 msgid "%s: could not create archive status file \"%s\": %s\n"
 msgstr "%s: no se pudo crear el archivo de estado «%s»: %s\n"
 
-#: receivelog.c:82 receivelog.c:206 receivelog.c:355 receivelog.c:848
-#: receivelog.c:1096
+#: receivelog.c:85 receivelog.c:209 receivelog.c:358 receivelog.c:853
+#: receivelog.c:1101
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: no se pudo sincronizar (fsync) el archivo «%s»: %s\n"
 
-#: receivelog.c:121
+#: receivelog.c:124
 #, c-format
 msgid "%s: could not open transaction log file \"%s\": %s\n"
 msgstr "%s: no se pudo abrir el archivo de transacción «%s»: %s\n"
 
-#: receivelog.c:133
+#: receivelog.c:136
 #, c-format
 msgid "%s: could not stat transaction log file \"%s\": %s\n"
 msgstr "%s: no se pudo hacer stat del archivo de transacción «%s»: %s\n"
 
-#: receivelog.c:147
+#: receivelog.c:150
 #, c-format
 msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
 msgstr "%s: el archivo de transacción «%s» mide %d bytes, debería ser 0 o %d\n"
 
-#: receivelog.c:160
+#: receivelog.c:163
 #, c-format
 msgid "%s: could not pad transaction log file \"%s\": %s\n"
 msgstr "%s: no se pudo rellenar (pad) el archivo de transacción «%s»: %s\n"
 
-#: receivelog.c:173
+#: receivelog.c:176
 #, c-format
 msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
 msgstr "%s: no se pudo posicionar (seek) al inicio del archivo de transacción «%s»: %s\n"
 
-#: receivelog.c:199
+#: receivelog.c:202
 #, c-format
 msgid "%s: could not determine seek position in file \"%s\": %s\n"
 msgstr "%s: no se pudo determinar la posición (seek) en el archivo «%s»: %s\n"
 
-#: receivelog.c:232
+#: receivelog.c:235
 #, c-format
 msgid "%s: could not rename file \"%s\": %s\n"
 msgstr "%s: no se pudo cambiar el nombre al archivo «%s»: %s\n"
 
-#: receivelog.c:239
+#: receivelog.c:242
 #, c-format
 msgid "%s: not renaming \"%s%s\", segment is not complete\n"
 msgstr "%s: no se cambiará el nombre a «%s%s», el segmento no está completo\n"
 
-#: receivelog.c:285
+#: receivelog.c:288
 #, c-format
 msgid "%s: could not open timeline history file \"%s\": %s\n"
 msgstr "%s: no se pudo abrir el archivo de historia de timeline «%s»: %s\n"
 
-#: receivelog.c:313
+#: receivelog.c:316
 #, c-format
 msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
 msgstr "%s: el servidor reportó un nombre inesperado para el archivo de historia de timeline %u: %s\n"
 
-#: receivelog.c:330
+#: receivelog.c:333
 #, c-format
 msgid "%s: could not create timeline history file \"%s\": %s\n"
 msgstr "%s: no se pudo crear el archivo de historia de timeline «%s»: %s\n"
 
-#: receivelog.c:347
+#: receivelog.c:350
 #, c-format
 msgid "%s: could not write timeline history file \"%s\": %s\n"
 msgstr "%s: no se pudo escribir al archivo de historia de timeline «%s»: %s\n"
 
-#: receivelog.c:372
+#: receivelog.c:375
 #, c-format
 msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
 msgstr "%s: no se pudo cambiar el nombre al archivo «%s» a «%s»: %s\n"
 
-#: receivelog.c:449
+#: receivelog.c:452
 #, c-format
 msgid "%s: incompatible server version %s; client does not support streaming from server versions older than %s\n"
 msgstr "%s: versión de servidor %s incompatible; el cliente no soporta flujos de servidores anteriores a la versión %s\n"
 
-#: receivelog.c:459
+#: receivelog.c:462
 #, c-format
 msgid "%s: incompatible server version %s; client does not support streaming from server versions newer than %s\n"
 msgstr "%s: versión de servidor %s incompatible; el cliente no soporta flujos de servidores posteriores a %s\n"
 
-#: receivelog.c:557 streamutil.c:264 streamutil.c:299
+#: receivelog.c:562 streamutil.c:272 streamutil.c:311
 #, c-format
 msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields\n"
 msgstr "%s: no se pudo identificar al sistema: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d o más campos\n"
 
-#: receivelog.c:565
+#: receivelog.c:570
 #, c-format
 msgid "%s: system identifier does not match between base backup and streaming connection\n"
 msgstr "%s: el identificador de sistema no coincide entre el respaldo base y la conexión de flujo\n"
 
-#: receivelog.c:573
+#: receivelog.c:578
 #, c-format
 msgid "%s: starting timeline %u is not present in the server\n"
 msgstr "%s: el timeline de inicio %u no está presente en el servidor\n"
 
-#: receivelog.c:613
+#: receivelog.c:618
 #, c-format
 msgid "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: respuesta inesperada a la orden TIMELINE_HISTORY: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos\n"
 
-#: receivelog.c:688
+#: receivelog.c:693
 #, c-format
 msgid "%s: server reported unexpected next timeline %u, following timeline %u\n"
 msgstr "%s: el servidor reportó un timeline siguiente %u inesperado, a continuación del timeline %u\n"
 
-#: receivelog.c:695
+#: receivelog.c:700
 #, c-format
 msgid "%s: server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X\n"
 msgstr "%s: el servidor paró la transmisión del timeline %u en %X/%X, pero reportó que el siguiente timeline %u comienza en %X/%X\n"
 
-#: receivelog.c:736
+#: receivelog.c:741
 #, c-format
 msgid "%s: replication stream was terminated before stop point\n"
 msgstr "%s: el flujo de replicación terminó antes del punto de término\n"
 
-#: receivelog.c:785
+#: receivelog.c:790
 #, c-format
 msgid "%s: unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: respuesta inesperada después del fin-de-timeline: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos\n"
 
-#: receivelog.c:795
+#: receivelog.c:800
 #, c-format
 msgid "%s: could not parse next timeline's starting point \"%s\"\n"
 msgstr "%s: no se pudo interpretar el punto de inicio del siguiente timeline «%s»\n"
 
-#: receivelog.c:959
+#: receivelog.c:964
 #, c-format
 msgid "%s: socket not open"
 msgstr "%s: socket no abierto"
 
-#: receivelog.c:1163
+#: receivelog.c:1168
 #, c-format
 msgid "%s: received transaction log record for offset %u with no file open\n"
 msgstr "%s: se recibió un registro transaccional para el desplazamiento %u sin ningún archivo abierto\n"
 
-#: receivelog.c:1175
+#: receivelog.c:1180
 #, c-format
 msgid "%s: got WAL data offset %08x, expected %08x\n"
 msgstr "%s: se obtuvo desplazamiento de datos WAL %08x, se esperaba %08x\n"
 
-#: receivelog.c:1212
+#: receivelog.c:1217
 #, c-format
 msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
 msgstr "%s: no se pudo escribir %u bytes al archivo WAL «%s»: %s\n"
 
-#: receivelog.c:1237 receivelog.c:1279 receivelog.c:1311
+#: receivelog.c:1242 receivelog.c:1284 receivelog.c:1316
 #, c-format
 msgid "%s: could not send copy-end packet: %s"
 msgstr "%s: no se pudo enviar el paquete copy-end: %s"
 
-#: streamutil.c:145
+#: streamutil.c:153
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: streamutil.c:169
+#: streamutil.c:177
 #, c-format
 msgid "%s: could not connect to server\n"
 msgstr "%s: no se pudo conectar al servidor\n"
 
-#: streamutil.c:187
+#: streamutil.c:195
 #, c-format
 msgid "%s: could not connect to server: %s"
 msgstr "%s: no se pudo conectar al servidor: %s"
 
-#: streamutil.c:211
+#: streamutil.c:219
 #, c-format
 msgid "%s: could not determine server setting for integer_datetimes\n"
 msgstr "%s: no se pudo determinar la opción integer_datetimes del servidor\n"
 
-#: streamutil.c:224
+#: streamutil.c:232
 #, c-format
 msgid "%s: integer_datetimes compile flag does not match server\n"
 msgstr "%s: la opción de compilación integer_datetimes no coincide con el servidor\n"
 
-#: streamutil.c:365
+#: streamutil.c:379
 #, c-format
 msgid "%s: could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: no se pudo create el slot de replicación «%s»: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos\n"
 
-#: streamutil.c:410
+#: streamutil.c:424
 #, c-format
 msgid "%s: could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: no se pudo eliminar el slot de replicación «%s»: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos\n"
+
+#~ msgid "%s: could not parse file mode\n"
+#~ msgstr "%s: nose pudo interpretar el modo del archivo\n"
+
+#~ msgid "%s: could not parse file size\n"
+#~ msgstr "%s: no se pudo interpretar el tamaño del archivo\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/fr.po postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/fr.po
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -5,127 +5,127 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.2\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-17 02:43+0000\n"
-"PO-Revision-Date: 2016-02-21 15:14+0100\n"
+"POT-Creation-Date: 2017-06-30 16:31+0000\n"
+"PO-Revision-Date: 2017-07-02 17:43+0200\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-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.12\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98
 #, c-format
 msgid "out of memory\n"
-msgstr "mémoire épuisée\n"
+msgstr "mémoire épuisée\n"
 
 #: ../../common/fe_memutils.c:92
 #, c-format
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
-#: pg_basebackup.c:154
+#: pg_basebackup.c:156
 #, c-format
 msgid "%s: directory name too long\n"
-msgstr "%s : nom du répertoire trop long\n"
+msgstr "%s : nom du répertoire trop long\n"
 
-#: pg_basebackup.c:164
+#: pg_basebackup.c:166
 #, c-format
 msgid "%s: multiple \"=\" signs in tablespace mapping\n"
-msgstr "%s : multiple signes « = » dans la correspondance de tablespace\n"
+msgstr "%s : multiple signes « = » dans la correspondance de tablespace\n"
 
-#: pg_basebackup.c:177
+#: pg_basebackup.c:179
 #, c-format
 msgid "%s: invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\"\n"
-msgstr "%s : format de correspondance de tablespace « %s » invalide, doit être « ANCIENREPERTOIRE=NOUVEAUREPERTOIRE »\n"
+msgstr "%s : format de correspondance de tablespace « %s » invalide, doit être « ANCIENREPERTOIRE=NOUVEAUREPERTOIRE »\n"
 
-#: pg_basebackup.c:190
+#: pg_basebackup.c:192
 #, c-format
 msgid "%s: old directory is not an absolute path in tablespace mapping: %s\n"
-msgstr "%s : l'ancien répertoire n'est pas un chemin absolu dans la correspondance de tablespace : %s\n"
+msgstr "%s : l'ancien répertoire n'est pas un chemin absolu dans la correspondance de tablespace : %s\n"
 
-#: pg_basebackup.c:197
+#: pg_basebackup.c:199
 #, c-format
 msgid "%s: new directory is not an absolute path in tablespace mapping: %s\n"
-msgstr "%s : le nouveau répertoire n'est pas un chemin absolu dans la correspondance de tablespace : %s\n"
+msgstr "%s : le nouveau répertoire n'est pas un chemin absolu dans la correspondance de tablespace : %s\n"
 
-#: pg_basebackup.c:231
+#: pg_basebackup.c:233
 #, 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"
+"%s prend une sauvegarde binaire d'un serveur PostgreSQL en cours d'exécution.\n"
 "\n"
 
-#: pg_basebackup.c:233 pg_receivexlog.c:66 pg_recvlogical.c:69
+#: pg_basebackup.c:235 pg_receivexlog.c:66 pg_recvlogical.c:72
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_basebackup.c:234 pg_receivexlog.c:67 pg_recvlogical.c:70
+#: pg_basebackup.c:236 pg_receivexlog.c:67 pg_recvlogical.c:73
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_basebackup.c:235
+#: pg_basebackup.c:237
 #, c-format
 msgid ""
 "\n"
 "Options controlling the output:\n"
 msgstr ""
 "\n"
-"Options contrôlant la sortie :\n"
+"Options contrôlant la sortie :\n"
 
-#: pg_basebackup.c:236
+#: pg_basebackup.c:238
 #, c-format
 msgid "  -D, --pgdata=DIRECTORY receive base backup into directory\n"
-msgstr "  -D, --pgdata=RÉPERTOIRE      reçoit la sauvegarde de base dans ce répertoire\n"
+msgstr "  -D, --pgdata=RÉPERTOIRE      reçoit la sauvegarde de base dans ce répertoire\n"
 
-#: pg_basebackup.c:237
+#: pg_basebackup.c:239
 #, c-format
 msgid "  -F, --format=p|t       output format (plain (default), tar)\n"
-msgstr "  -F, --format=p|t             format en sortie (plain (par défaut), tar)\n"
+msgstr "  -F, --format=p|t             format en sortie (plain (par défaut), tar)\n"
 
-#: pg_basebackup.c:238
+#: pg_basebackup.c:240
 #, c-format
 msgid ""
 "  -r, --max-rate=RATE    maximum transfer rate to transfer data directory\n"
 "                         (in kB/s, or use suffix \"k\" or \"M\")\n"
 msgstr ""
-"  -r, --max-rate=TAUX          taux maximum de transfert du répertoire de\n"
-"                               données (en Ko/s, ou utiliser le suffixe « k »\n"
-"                               ou « M »)\n"
+"  -r, --max-rate=TAUX          taux maximum de transfert du répertoire de\n"
+"                               données (en Ko/s, ou utiliser le suffixe « k »\n"
+"                               ou « M »)\n"
 
-#: pg_basebackup.c:240
+#: pg_basebackup.c:242
 #, c-format
 msgid ""
 "  -R, --write-recovery-conf\n"
-"                         write recovery.conf after backup\n"
-msgstr "  -R, --write-recovery-conf    écrit le recovery.conf après la sauvegarde\n"
+"                         write recovery.conf for replication\n"
+msgstr "  -R, --write-recovery-conf    écrit le recovery.conf pour la réplication\n"
 
-#: pg_basebackup.c:242
+#: pg_basebackup.c:244
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
 "                         relocate tablespace in OLDDIR to NEWDIR\n"
 msgstr ""
 "  -T, --tablespace-mapping=ANCIENREP=NOUVEAUREP\n"
-"                               déplacer le répertoire ANCIENREP en NOUVEAUREP\n"
+"                               déplacer le répertoire ANCIENREP en NOUVEAUREP\n"
 
-#: pg_basebackup.c:244
+#: pg_basebackup.c:246
 #, c-format
 msgid "  -x, --xlog             include required WAL files in backup (fetch mode)\n"
 msgstr ""
-"  -x, --xlog                   inclut les journaux de transactions nécessaires\n"
+"  -x, --xlog                   inclut les journaux de transactions nécessaires\n"
 "                               dans la sauvegarde (mode fetch)\n"
 
-#: pg_basebackup.c:245
+#: pg_basebackup.c:247
 #, c-format
 msgid ""
 "  -X, --xlog-method=fetch|stream\n"
@@ -133,69 +133,69 @@
 msgstr ""
 "  -X, --xlog-method=fetch|stream\n"
 "                               inclut les journaux de transactions requis avec\n"
-"                               la méthode spécifiée\n"
+"                               la méthode spécifiée\n"
 
-#: pg_basebackup.c:247
+#: pg_basebackup.c:249
 #, c-format
 msgid "      --xlogdir=XLOGDIR  location for the transaction log directory\n"
 msgstr ""
-"  -X, --xlogdir=RÉP_XLOG       emplacement du répertoire des journaux de\n"
+"  -X, --xlogdir=RÉP_XLOG       emplacement du répertoire des journaux de\n"
 "                               transactions\n"
 
-#: pg_basebackup.c:248
+#: pg_basebackup.c:250
 #, c-format
 msgid "  -z, --gzip             compress tar output\n"
 msgstr "  -z, --gzip                   compresse la sortie tar\n"
 
-#: pg_basebackup.c:249
+#: pg_basebackup.c:251
 #, 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é\n"
+"                               compression indiqué\n"
 
-#: pg_basebackup.c:250
+#: pg_basebackup.c:252
 #, c-format
 msgid ""
 "\n"
 "General options:\n"
 msgstr ""
 "\n"
-"Options générales :\n"
+"Options générales :\n"
 
-#: pg_basebackup.c:251
+#: pg_basebackup.c:253
 #, c-format
 msgid ""
 "  -c, --checkpoint=fast|spread\n"
 "                         set fast or spread checkpointing\n"
-msgstr "  -c, --checkpoint=fast|spread exécute un CHECKPOINT rapide ou réparti\n"
+msgstr "  -c, --checkpoint=fast|spread exécute un CHECKPOINT rapide ou réparti\n"
 
-#: pg_basebackup.c:253
+#: pg_basebackup.c:255
 #, c-format
 msgid "  -l, --label=LABEL      set backup label\n"
 msgstr "  -l, --label=LABEL            configure le label de sauvegarde\n"
 
-#: pg_basebackup.c:254
+#: pg_basebackup.c:256
 #, c-format
 msgid "  -P, --progress         show progress information\n"
 msgstr "  -P, --progress               affiche la progression de la sauvegarde\n"
 
-#: pg_basebackup.c:255 pg_receivexlog.c:76 pg_recvlogical.c:89
+#: pg_basebackup.c:257 pg_receivexlog.c:76 pg_recvlogical.c:92
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose                affiche des messages verbeux\n"
 
-#: pg_basebackup.c:256 pg_receivexlog.c:77 pg_recvlogical.c:90
+#: pg_basebackup.c:258 pg_receivexlog.c:77 pg_recvlogical.c:93
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version              affiche la version puis quitte\n"
 
-#: pg_basebackup.c:257 pg_receivexlog.c:78 pg_recvlogical.c:91
+#: pg_basebackup.c:259 pg_receivexlog.c:78 pg_recvlogical.c:94
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help                 affiche cette aide puis quitte\n"
 
-#: pg_basebackup.c:258 pg_receivexlog.c:79 pg_recvlogical.c:92
+#: pg_basebackup.c:260 pg_receivexlog.c:79 pg_recvlogical.c:95
 #, c-format
 msgid ""
 "\n"
@@ -204,436 +204,446 @@
 "\n"
 "Options de connexion :\n"
 
-#: pg_basebackup.c:259 pg_receivexlog.c:80
+#: pg_basebackup.c:261 pg_receivexlog.c:80
 #, c-format
 msgid "  -d, --dbname=CONNSTR   connection string\n"
-msgstr "  -d, --dbname=CONNSTR         chaîne de connexion\n"
+msgstr "  -d, --dbname=CONNSTR         chaîne de connexion\n"
 
-#: pg_basebackup.c:260 pg_receivexlog.c:81 pg_recvlogical.c:94
+#: pg_basebackup.c:262 pg_receivexlog.c:81 pg_recvlogical.c:97
 #, 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"
+"  -h, --host=NOMHÔTE           hôte du serveur de bases de données ou\n"
+"                               répertoire des sockets\n"
 
-#: pg_basebackup.c:261 pg_receivexlog.c:82 pg_recvlogical.c:95
+#: pg_basebackup.c:263 pg_receivexlog.c:82 pg_recvlogical.c:98
 #, 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"
+"  -p, --port=PORT              numéro de port du serveur de bases de\n"
+"                               données\n"
 
-#: pg_basebackup.c:262
+#: pg_basebackup.c:264
 #, c-format
 msgid ""
 "  -s, --status-interval=INTERVAL\n"
 "                         time between status packets sent to server (in seconds)\n"
 msgstr ""
-"  -s, --status-interval=INTERVAL durée entre l'envoi de paquets de statut au\n"
+"  -s, --status-interval=INTERVAL durée entre l'envoi de paquets de statut au\n"
 "                                 serveur (en secondes)\n"
 
-#: pg_basebackup.c:264 pg_receivexlog.c:83 pg_recvlogical.c:96
+#: pg_basebackup.c:266 pg_receivexlog.c:83 pg_recvlogical.c:99
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=NOM           se connecte avec cet utilisateur\n"
 
-#: pg_basebackup.c:265 pg_receivexlog.c:84 pg_recvlogical.c:97
+#: pg_basebackup.c:267 pg_receivexlog.c:84 pg_recvlogical.c:100
 #, 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:266 pg_receivexlog.c:85 pg_recvlogical.c:98
+#: pg_basebackup.c:268 pg_receivexlog.c:85 pg_recvlogical.c:101
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password               force la demande du mot de passe (devrait arriver\n"
 "                               automatiquement)\n"
 
-#: pg_basebackup.c:267 pg_receivexlog.c:89 pg_recvlogical.c:99
+#: pg_basebackup.c:269 pg_receivexlog.c:89 pg_recvlogical.c:102
 #, c-format
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
+"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_basebackup.c:310
+#: pg_basebackup.c:312
 #, c-format
 msgid "%s: could not read from ready pipe: %s\n"
-msgstr "%s : n'a pas pu lire à partir du tube : %s\n"
+msgstr "%s : n'a pas pu lire à partir du tube : %s\n"
 
-#: pg_basebackup.c:318 pg_basebackup.c:411 pg_basebackup.c:1869
-#: streamutil.c:285
+#: pg_basebackup.c:320 pg_basebackup.c:413 pg_basebackup.c:1887
+#: streamutil.c:293
 #, c-format
 msgid "%s: could not parse transaction log location \"%s\"\n"
-msgstr "%s : n'a pas pu analyser l'emplacement du journal des transactions « %s »\n"
+msgstr "%s : n'a pas pu analyser l'emplacement du journal des transactions « %s »\n"
 
-#: pg_basebackup.c:424
+#: pg_basebackup.c:426
 #, c-format
 msgid "%s: could not create pipe for background process: %s\n"
-msgstr "%s : n'a pas pu créer un tube pour le processus en tâche de fond : %s\n"
+msgstr "%s : n'a pas pu créer un tube pour le processus en tâche de fond : %s\n"
 
-#: pg_basebackup.c:449 pg_basebackup.c:504 pg_basebackup.c:1252
+#: pg_basebackup.c:451 pg_basebackup.c:506 pg_basebackup.c:1254
 #, 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"
+msgstr "%s : n'a pas pu créer le répertoire « %s » : %s\n"
 
-#: pg_basebackup.c:467
+#: pg_basebackup.c:469
 #, c-format
 msgid "%s: could not create background process: %s\n"
-msgstr "%s : n'a pas pu créer un processus en tâche de fond : %s\n"
+msgstr "%s : n'a pas pu créer un processus en tâche de fond : %s\n"
 
-#: pg_basebackup.c:479
+#: pg_basebackup.c:481
 #, c-format
 msgid "%s: could not create background thread: %s\n"
-msgstr "%s : n'a pas pu créer un thread en tâche de fond : %s\n"
+msgstr "%s : n'a pas pu créer un thread en tâche de fond : %s\n"
 
-#: pg_basebackup.c:523
+#: pg_basebackup.c:525
 #, 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"
+msgstr "%s : le répertoire « %s » existe mais n'est pas vide\n"
 
-#: pg_basebackup.c:531
+#: pg_basebackup.c:533
 #, 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"
+msgstr "%s : n'a pas pu accéder au répertoire « %s » : %s\n"
 
-#: pg_basebackup.c:593
+#: pg_basebackup.c:595
 #, c-format
 msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
 msgstr[0] "%*s/%s Ko (100%%), %d/%d tablespace %*s"
 msgstr[1] "%*s/%s Ko (100%%), %d/%d tablespaces %*s"
 
-#: pg_basebackup.c:605
+#: pg_basebackup.c:607
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
 msgstr[0] "%*s/%s Ko (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgstr[1] "%*s/%s Ko (%d%%), %d/%d tablespaces (%s%-*.*s)"
 
-#: pg_basebackup.c:621
+#: pg_basebackup.c:623
 #, 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:643
+#: pg_basebackup.c:645
 #, c-format
 msgid "%s: transfer rate \"%s\" is not a valid value\n"
-msgstr "%s : le taux de transfert « %s » ne correspond pas à une valeur valide\n"
+msgstr "%s : le taux de transfert « %s » ne correspond pas à une valeur valide\n"
 
-#: pg_basebackup.c:650
+#: pg_basebackup.c:652
 #, c-format
 msgid "%s: invalid transfer rate \"%s\": %s\n"
-msgstr "%s : taux de transfert invalide (« %s ») : %s\n"
+msgstr "%s : taux de transfert invalide (« %s ») : %s\n"
 
-#: pg_basebackup.c:660
+#: pg_basebackup.c:662
 #, c-format
 msgid "%s: transfer rate must be greater than zero\n"
-msgstr "%s : le taux de transfert doit être supérieur à zéro\n"
+msgstr "%s : le taux de transfert doit être supérieur à zéro\n"
 
-#: pg_basebackup.c:694
+#: pg_basebackup.c:696
 #, c-format
 msgid "%s: invalid --max-rate unit: \"%s\"\n"
-msgstr "%s : unité invalide pour --max-rate : « %s »\n"
+msgstr "%s : unité invalide pour --max-rate : « %s »\n"
 
-#: pg_basebackup.c:703
+#: pg_basebackup.c:705
 #, c-format
 msgid "%s: transfer rate \"%s\" exceeds integer range\n"
-msgstr "%s : le taux de transfert « %s » dépasse l'échelle des entiers\n"
+msgstr "%s : le taux de transfert « %s » dépasse l'échelle des entiers\n"
 
-#: pg_basebackup.c:715
+#: pg_basebackup.c:717
 #, c-format
 msgid "%s: transfer rate \"%s\" is out of range\n"
-msgstr "%s : le taux de transfert « %s » est en dehors des limites\n"
+msgstr "%s : le taux de transfert « %s » est en dehors des limites\n"
 
-#: pg_basebackup.c:739
+#: pg_basebackup.c:741
 #, 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"
+msgstr "%s : n'a pas pu écrire dans le fichier compressé « %s » : %s\n"
 
-#: pg_basebackup.c:749 pg_basebackup.c:1346 pg_basebackup.c:1564
+#: pg_basebackup.c:751 pg_basebackup.c:1348 pg_basebackup.c:1566
 #, 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"
+msgstr "%s : n'a pas pu écrire dans le fichier « %s » : %s\n"
 
-#: pg_basebackup.c:804 pg_basebackup.c:825 pg_basebackup.c:853
+#: pg_basebackup.c:806 pg_basebackup.c:827 pg_basebackup.c:855
 #, c-format
 msgid "%s: could not set compression level %d: %s\n"
 msgstr "%s : n'a pas pu configurer le niveau de compression %d : %s\n"
 
-#: pg_basebackup.c:874
+#: pg_basebackup.c:876
 #, 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"
+msgstr "%s : n'a pas pu créer le fichier compressé « %s » : %s\n"
 
-#: pg_basebackup.c:885 pg_basebackup.c:1306 pg_basebackup.c:1557
+#: pg_basebackup.c:887 pg_basebackup.c:1308 pg_basebackup.c:1559
 #, c-format
 msgid "%s: could not create file \"%s\": %s\n"
-msgstr "%s : n'a pas pu créer le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu créer le fichier « %s » : %s\n"
 
-#: pg_basebackup.c:897 pg_basebackup.c:1161
+#: pg_basebackup.c:899 pg_basebackup.c:1163
 #, 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"
+msgstr "%s : n'a pas pu obtenir le flux de données de COPY : %s"
 
-#: pg_basebackup.c:954
+#: pg_basebackup.c:956
 #, c-format
 msgid "%s: could not close compressed file \"%s\": %s\n"
-msgstr "%s : n'a pas pu fermer le fichier compressé « %s » : %s\n"
+msgstr "%s : n'a pas pu fermer le fichier compressé « %s » : %s\n"
 
-#: pg_basebackup.c:967 pg_recvlogical.c:569 receivelog.c:213 receivelog.c:362
-#: receivelog.c:754
+#: pg_basebackup.c:969 pg_recvlogical.c:572 receivelog.c:216 receivelog.c:365
+#: receivelog.c:759
 #, c-format
 msgid "%s: could not close file \"%s\": %s\n"
-msgstr "%s : n'a pas pu fermer le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu fermer le fichier « %s » : %s\n"
 
-#: pg_basebackup.c:978 pg_basebackup.c:1190 pg_recvlogical.c:435
-#: receivelog.c:1044
+#: pg_basebackup.c:980 pg_basebackup.c:1192 pg_recvlogical.c:438
+#: receivelog.c:1049
 #, c-format
 msgid "%s: could not read COPY data: %s"
-msgstr "%s : n'a pas pu lire les données du COPY : %s"
+msgstr "%s : n'a pas pu lire les données du COPY : %s"
 
-#: pg_basebackup.c:1204
+#: pg_basebackup.c:1206
 #, c-format
 msgid "%s: invalid tar block header size: %d\n"
-msgstr "%s : taille invalide de l'en-tête de bloc du fichier tar : %d\n"
+msgstr "%s : taille invalide de l'en-tête de bloc du fichier tar : %d\n"
 
-#: pg_basebackup.c:1260
+#: pg_basebackup.c:1262
 #, 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"
+msgstr "%s : n'a pas configurer les droits sur le répertoire « %s » : %s\n"
 
-#: pg_basebackup.c:1284
+#: pg_basebackup.c:1286
 #, 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"
+msgstr "%s : n'a pas pu créer le lien symbolique de « %s » vers « %s » : %s\n"
 
-#: pg_basebackup.c:1293
+#: pg_basebackup.c:1295
 #, c-format
 msgid "%s: unrecognized link indicator \"%c\"\n"
-msgstr "%s : indicateur de lien « %c » non reconnu\n"
+msgstr "%s : indicateur de lien « %c » non reconnu\n"
 
-#: pg_basebackup.c:1313
+#: pg_basebackup.c:1315
 #, 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"
+msgstr "%s : n'a pas pu configurer les droits sur le fichier « %s » : %s\n"
 
-#: pg_basebackup.c:1372
+#: pg_basebackup.c:1374
 #, 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"
+msgstr "%s : le flux COPY s'est terminé avant que le dernier fichier soit terminé\n"
 
-#: pg_basebackup.c:1458 pg_basebackup.c:1478 pg_basebackup.c:1485
-#: pg_basebackup.c:1532
+#: pg_basebackup.c:1460 pg_basebackup.c:1480 pg_basebackup.c:1487
+#: pg_basebackup.c:1534
 #, c-format
 msgid "%s: out of memory\n"
-msgstr "%s : mémoire épuisée\n"
+msgstr "%s : mémoire épuisée\n"
 
-#: pg_basebackup.c:1609
+#: pg_basebackup.c:1611
 #, c-format
 msgid "%s: incompatible server version %s\n"
-msgstr "%s : version « %s » du serveur incompatible\n"
+msgstr "%s : version « %s » du serveur incompatible\n"
 
-#: pg_basebackup.c:1656 pg_recvlogical.c:261 receivelog.c:549 receivelog.c:600
-#: receivelog.c:641 streamutil.c:255 streamutil.c:359 streamutil.c:405
+#: pg_basebackup.c:1648
+#, c-format
+msgid "%s: initiating base backup, waiting for checkpoint to complete\n"
+msgstr "%s : initiation de la sauvegarde de base, en attente de la fin du checkpoint\n"
+
+#: pg_basebackup.c:1666 pg_recvlogical.c:264 receivelog.c:554 receivelog.c:605
+#: receivelog.c:646 streamutil.c:263 streamutil.c:367 streamutil.c:413
 #, c-format
 msgid "%s: could not send replication command \"%s\": %s"
-msgstr "%s : n'a pas pu envoyer la commande de réplication « %s » : %s"
+msgstr "%s : n'a pas pu envoyer la commande de réplication « %s » : %s"
 
-#: pg_basebackup.c:1667
+#: pg_basebackup.c:1677
 #, 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:1674
+#: pg_basebackup.c:1684
 #, c-format
 msgid "%s: server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s : le serveur a renvoyé une réponse inattendue à la commande BASE_BACKUP ; a récupéré %d lignes et %d champs, alors qu'il attendait %d lignes et %d champs\n"
+msgstr "%s : le serveur a renvoyé une réponse inattendue à la commande BASE_BACKUP ; a récupéré %d lignes et %d champs, alors qu'il attendait %d lignes et %d champs\n"
+
+#: pg_basebackup.c:1692
+#, c-format
+msgid "%s: checkpoint completed\n"
+msgstr "%s : checkpoint terminé\n"
 
-#: pg_basebackup.c:1694
+#: pg_basebackup.c:1707
 #, c-format
 msgid "transaction log start point: %s on timeline %u\n"
-msgstr "point de départ du journal de transactions : %s sur la timeline %u\n"
+msgstr "point de départ du journal de transactions : %s sur la timeline %u\n"
 
-#: pg_basebackup.c:1703
+#: pg_basebackup.c:1716
 #, c-format
 msgid "%s: could not get backup header: %s"
-msgstr "%s : n'a pas pu obtenir l'en-tête du serveur : %s"
+msgstr "%s : n'a pas pu obtenir l'en-tête du serveur : %s"
 
-#: pg_basebackup.c:1709
+#: pg_basebackup.c:1722
 #, c-format
 msgid "%s: no data returned from server\n"
-msgstr "%s : aucune donnée renvoyée du serveur\n"
+msgstr "%s : aucune donnée renvoyée du serveur\n"
 
-#: pg_basebackup.c:1741
+#: pg_basebackup.c:1754
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %d\n"
-msgstr "%s : peut seulement écrire un tablespace sur la sortie standard, la base en a %d\n"
+msgstr "%s : peut seulement écrire un tablespace sur la sortie standard, la base en a %d\n"
 
-#: pg_basebackup.c:1753
+#: pg_basebackup.c:1766
 #, c-format
 msgid "%s: starting background WAL receiver\n"
-msgstr "%s : lance le récepteur de journaux de transactions en tâche de fond\n"
+msgstr "%s : lance le récepteur de journaux de transactions en tâche de fond\n"
 
-#: pg_basebackup.c:1784
+#: pg_basebackup.c:1797
 #, c-format
 msgid "%s: could not get transaction log end position from server: %s"
 msgstr ""
-"%s : n'a pas pu obtenir la position finale des journaux de transactions à\n"
+"%s : n'a pas pu obtenir la position finale des journaux de transactions à\n"
 "partir du serveur : %s"
 
-#: pg_basebackup.c:1791
+#: pg_basebackup.c:1804
 #, c-format
 msgid "%s: no transaction log end position returned from server\n"
-msgstr "%s : aucune position de fin du journal de transactions renvoyée par le serveur\n"
+msgstr "%s : aucune position de fin du journal de transactions renvoyée par le serveur\n"
 
-#: pg_basebackup.c:1803
+#: pg_basebackup.c:1816
 #, c-format
 msgid "%s: final receive failed: %s"
-msgstr "%s : échec lors de la réception finale : %s"
+msgstr "%s : échec lors de la réception finale : %s"
 
-#: pg_basebackup.c:1821
+#: pg_basebackup.c:1839
 #, c-format
 msgid "%s: waiting for background process to finish streaming ...\n"
-msgstr "%s : en attente que le processus en tâche de fond termine le flux...\n"
+msgstr "%s : en attente que le processus en tâche de fond termine le flux...\n"
 
-#: pg_basebackup.c:1827
+#: pg_basebackup.c:1845
 #, c-format
 msgid "%s: could not send command to background pipe: %s\n"
 msgstr "%s : n'a pas pu envoyer la commande au tube du processus : %s\n"
 
-#: pg_basebackup.c:1836
+#: pg_basebackup.c:1854
 #, c-format
 msgid "%s: could not wait for child process: %s\n"
 msgstr "%s : n'a pas pu attendre le processus fils : %s\n"
 
-#: pg_basebackup.c:1842
+#: pg_basebackup.c:1860
 #, c-format
 msgid "%s: child %d died, expected %d\n"
 msgstr "%s : le fils %d est mort, %d attendu\n"
 
-#: pg_basebackup.c:1848
+#: pg_basebackup.c:1866
 #, c-format
 msgid "%s: child process did not exit normally\n"
-msgstr "%s : le processus fils n'a pas quitté normalement\n"
+msgstr "%s : le processus fils n'a pas quitté normalement\n"
 
-#: pg_basebackup.c:1854
+#: pg_basebackup.c:1872
 #, c-format
 msgid "%s: child process exited with error %d\n"
-msgstr "%s : le processus fils a quitté avec le code erreur %d\n"
+msgstr "%s : le processus fils a quitté avec le code erreur %d\n"
 
-#: pg_basebackup.c:1881
+#: pg_basebackup.c:1899
 #, c-format
 msgid "%s: could not wait for child thread: %s\n"
 msgstr "%s : n'a pas pu attendre le thread : %s\n"
 
-#: pg_basebackup.c:1888
+#: pg_basebackup.c:1906
 #, c-format
 msgid "%s: could not get child thread exit status: %s\n"
 msgstr "%s : n'a pas pu obtenir le code de sortie du thread : %s\n"
 
-#: pg_basebackup.c:1894
+#: pg_basebackup.c:1912
 #, c-format
 msgid "%s: child thread exited with error %u\n"
-msgstr "%s : le thread a quitté avec le code d'erreur %u\n"
+msgstr "%s : le thread a quitté avec le code d'erreur %u\n"
 
-#: pg_basebackup.c:1983
+#: pg_basebackup.c:2001
 #, 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"
+msgstr "%s : format de sortie « %s » invalide, doit être soit « plain » soit « tar »\n"
 
-#: pg_basebackup.c:2001 pg_basebackup.c:2013
+#: pg_basebackup.c:2019 pg_basebackup.c:2031
 #, c-format
 msgid "%s: cannot specify both --xlog and --xlog-method\n"
-msgstr "%s : ne peut pas spécifier à la fois --xlog et --xlog-method\n"
+msgstr "%s : ne peut pas spécifier à la fois --xlog et --xlog-method\n"
 
-#: pg_basebackup.c:2028
+#: pg_basebackup.c:2046
 #, c-format
 msgid "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
 msgstr ""
-"%s : option xlog-method « %s » invalide, doit être soit « fetch » soit « stream »\n"
-"soit « stream »\n"
+"%s : option xlog-method « %s » invalide, doit être soit « fetch » soit « stream »\n"
+"soit « stream »\n"
 
-#: pg_basebackup.c:2050
+#: pg_basebackup.c:2068
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
-msgstr "%s : niveau de compression « %s » invalide\n"
+msgstr "%s : niveau de compression « %s » invalide\n"
 
-#: pg_basebackup.c:2062
+#: pg_basebackup.c:2080
 #, 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"
+"%s : argument « %s » invalide pour le CHECKPOINT, doit être soit « fast »\n"
+"soit « spread »\n"
 
-#: pg_basebackup.c:2089 pg_receivexlog.c:439 pg_recvlogical.c:752
+#: pg_basebackup.c:2107 pg_receivexlog.c:439 pg_recvlogical.c:755
 #, c-format
 msgid "%s: invalid status interval \"%s\"\n"
-msgstr "%s : intervalle « %s » invalide du statut\n"
+msgstr "%s : intervalle « %s » invalide du statut\n"
 
-#: pg_basebackup.c:2105 pg_basebackup.c:2119 pg_basebackup.c:2130
-#: pg_basebackup.c:2143 pg_basebackup.c:2153 pg_basebackup.c:2165
-#: pg_basebackup.c:2176 pg_receivexlog.c:471 pg_receivexlog.c:485
+#: pg_basebackup.c:2123 pg_basebackup.c:2137 pg_basebackup.c:2148
+#: pg_basebackup.c:2161 pg_basebackup.c:2171 pg_basebackup.c:2183
+#: pg_basebackup.c:2194 pg_receivexlog.c:471 pg_receivexlog.c:485
 #: pg_receivexlog.c:493 pg_receivexlog.c:503 pg_receivexlog.c:514
-#: pg_recvlogical.c:779 pg_recvlogical.c:793 pg_recvlogical.c:804
-#: pg_recvlogical.c:812 pg_recvlogical.c:820 pg_recvlogical.c:828
-#: pg_recvlogical.c:836 pg_recvlogical.c:844
+#: pg_recvlogical.c:782 pg_recvlogical.c:796 pg_recvlogical.c:807
+#: pg_recvlogical.c:815 pg_recvlogical.c:823 pg_recvlogical.c:831
+#: pg_recvlogical.c:839 pg_recvlogical.c:847
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayer « %s --help » pour plus d'informations.\n"
+msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
-#: pg_basebackup.c:2117 pg_receivexlog.c:483 pg_recvlogical.c:791
+#: pg_basebackup.c:2135 pg_receivexlog.c:483 pg_recvlogical.c:794
 #, 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"
+msgstr "%s : trop d'arguments en ligne de commande (le premier étant « %s »)\n"
 
-#: pg_basebackup.c:2129 pg_receivexlog.c:513
+#: pg_basebackup.c:2147 pg_receivexlog.c:513
 #, c-format
 msgid "%s: no target directory specified\n"
-msgstr "%s : aucun répertoire cible indiqué\n"
+msgstr "%s : aucun répertoire cible indiqué\n"
 
-#: pg_basebackup.c:2141
+#: pg_basebackup.c:2159
 #, 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"
+msgstr "%s : seules les sauvegardes en mode tar peuvent être compressées\n"
 
-#: pg_basebackup.c:2151
+#: pg_basebackup.c:2169
 #, c-format
 msgid "%s: WAL streaming can only be used in plain mode\n"
-msgstr "%s : le flux de journaux de transactions peut seulement être utilisé en mode plain\n"
+msgstr "%s : le flux de journaux de transactions peut seulement être utilisé en mode plain\n"
 
-#: pg_basebackup.c:2163
+#: pg_basebackup.c:2181
 #, c-format
 msgid "%s: transaction log directory location can only be specified in plain mode\n"
 msgstr ""
-"%s : l'emplacement du répertoire des journaux de transactions doit être\n"
-"indiqué uniquement dans le mode plain\n"
+"%s : l'emplacement du répertoire des journaux de transactions doit être\n"
+"indiqué uniquement dans le mode plain\n"
 
-#: pg_basebackup.c:2174
+#: pg_basebackup.c:2192
 #, 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"
+"%s : l'emplacement du répertoire des journaux de transactions doit être\n"
+"indiqué avec un chemin absolu\n"
 
-#: pg_basebackup.c:2186
+#: pg_basebackup.c:2204
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s : cette construction ne supporte pas la compression\n"
 
-#: pg_basebackup.c:2213
+#: pg_basebackup.c:2231
 #, 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"
+msgstr "%s : n'a pas pu créer le lien symbolique « %s » : %s\n"
 
-#: pg_basebackup.c:2218
+#: pg_basebackup.c:2236
 #, c-format
 msgid "%s: symlinks are not supported on this platform\n"
-msgstr "%s : les liens symboliques ne sont pas supportés sur cette plateforme\n"
+msgstr "%s : les liens symboliques ne sont pas supportés sur cette plateforme\n"
 
 #: pg_receivexlog.c:64
 #, c-format
@@ -641,10 +651,10 @@
 "%s receives PostgreSQL streaming transaction logs.\n"
 "\n"
 msgstr ""
-"%s reçoit le flux des journaux de transactions PostgreSQL.\n"
+"%s reçoit le flux des journaux de transactions PostgreSQL.\n"
 "\n"
 
-#: pg_receivexlog.c:68 pg_recvlogical.c:75
+#: pg_receivexlog.c:68 pg_recvlogical.c:78
 #, c-format
 msgid ""
 "\n"
@@ -657,41 +667,41 @@
 #, c-format
 msgid "  -D, --directory=DIR    receive transaction log files into this directory\n"
 msgstr ""
-"  -D, --directory=RÉP          reçoit les journaux de transactions dans ce\n"
-"                               répertoire\n"
+"  -D, --directory=RÉP          reçoit les journaux de transactions dans ce\n"
+"                               répertoire\n"
 
-#: pg_receivexlog.c:70 pg_recvlogical.c:79
+#: pg_receivexlog.c:70 pg_recvlogical.c:82
 #, c-format
 msgid "      --if-not-exists    do not error if slot already exists when creating a slot\n"
 msgstr ""
 "      --if-not-exists          ne pas renvoyer une erreur si le slot existe\\n\n"
-"                               déjà lors de sa création\n"
+"                               déjà lors de sa création\n"
 
-#: pg_receivexlog.c:71 pg_recvlogical.c:81
+#: pg_receivexlog.c:71 pg_recvlogical.c:84
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop                ne boucle pas en cas de perte de la connexion\n"
 
-#: pg_receivexlog.c:72 pg_recvlogical.c:86
+#: pg_receivexlog.c:72 pg_recvlogical.c:89
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
 "                         time between status packets sent to server (default: %d)\n"
 msgstr ""
-"  -s, --status-interval=SECS   durée entre l'envoi de paquets de statut au\n"
-"                               (par défaut %d)\n"
+"  -s, --status-interval=SECS   durée entre l'envoi de paquets de statut au\n"
+"                               (par défaut %d)\n"
 
 #: pg_receivexlog.c:74
 #, c-format
 msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
-msgstr "  -S, --slot=NOMREP            slot de réplication à utiliser\n"
+msgstr "  -S, --slot=NOMREP            slot de réplication à utiliser\n"
 
 #: pg_receivexlog.c:75
 #, c-format
 msgid "      --synchronous      flush transaction log immediately after writing\n"
 msgstr ""
-"      --synchronous            vider le journal de transactions immédiatement\\n\n"
-"                               après son écriture\n"
+"      --synchronous            vider le journal de transactions immédiatement\\n\n"
+"                               après son écriture\n"
 
 #: pg_receivexlog.c:86
 #, c-format
@@ -702,69 +712,69 @@
 "\n"
 "Actions optionnelles :\n"
 
-#: pg_receivexlog.c:87 pg_recvlogical.c:72
+#: pg_receivexlog.c:87 pg_recvlogical.c:75
 #, c-format
 msgid "      --create-slot      create a new replication slot (for the slot's name see --slot)\n"
 msgstr ""
-"      --create-slot            créer un nouveau slot de réplication (pour le\n"
+"      --create-slot            créer un nouveau slot de réplication (pour le\n"
 "                               nom du slot, voir --slot)\n"
 
-#: pg_receivexlog.c:88 pg_recvlogical.c:73
+#: pg_receivexlog.c:88 pg_recvlogical.c:76
 #, c-format
 msgid "      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"
 msgstr ""
-"      --drop-slot              supprimer un nouveau slot de réplication (pour\n"
+"      --drop-slot              supprimer un nouveau slot de réplication (pour\n"
 "                               le nom du slot, voir --slot)\n"
 
 #: pg_receivexlog.c:100
 #, c-format
 msgid "%s: finished segment at %X/%X (timeline %u)\n"
-msgstr "%s : segment terminé à %X/%X (timeline %u)\n"
+msgstr "%s : segment terminé à %X/%X (timeline %u)\n"
 
 #: pg_receivexlog.c:113
 #, c-format
 msgid "%s: switched to timeline %u at %X/%X\n"
-msgstr "%s : a basculé sur la timeline %u à %X/%X\n"
+msgstr "%s : a basculé sur la timeline %u à %X/%X\n"
 
 #: pg_receivexlog.c:122
 #, c-format
 msgid "%s: received interrupt signal, exiting\n"
-msgstr "%s : a reçu un signal d'interruption, quitte\n"
+msgstr "%s : a reçu un signal d'interruption, quitte\n"
 
 #: pg_receivexlog.c:142
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s : n'a pas pu ouvrir le répertoire « %s » : %s\n"
+msgstr "%s : n'a pas pu ouvrir le répertoire « %s » : %s\n"
 
 #: pg_receivexlog.c:160
 #, c-format
 msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s : n'a pas pu fermer le répertoire « %s » : %s\n"
+msgstr "%s : n'a pas pu fermer le répertoire « %s » : %s\n"
 
-#: pg_receivexlog.c:218 pg_recvlogical.c:343
+#: pg_receivexlog.c:218 pg_recvlogical.c:346
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
-msgstr "%s : n'a pas pu récupérer les informations sur le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu récupérer les informations sur le fichier « %s » : %s\n"
 
 #: pg_receivexlog.c:226
 #, c-format
 msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
-msgstr "%s : le segment « %s » a une taille %d incorrecte, ignoré\n"
+msgstr "%s : le segment « %s » a une taille %d incorrecte, ignoré\n"
 
 #: pg_receivexlog.c:245
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
-msgstr "%s : n'a pas pu lire le répertoire « %s » : %s\n"
+msgstr "%s : n'a pas pu lire le répertoire « %s » : %s\n"
 
 #: pg_receivexlog.c:331
 #, c-format
 msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
-msgstr "%s : commence le flux des journaux à %X/%X (timeline %u)\n"
+msgstr "%s : commence le flux des journaux à %X/%X (timeline %u)\n"
 
-#: pg_receivexlog.c:420 pg_recvlogical.c:699
+#: pg_receivexlog.c:420 pg_recvlogical.c:702
 #, c-format
 msgid "%s: invalid port number \"%s\"\n"
-msgstr "%s : numéro de port invalide : « %s »\n"
+msgstr "%s : numéro de port invalide : « %s »\n"
 
 #: pg_receivexlog.c:492
 #, c-format
@@ -781,77 +791,77 @@
 #, c-format
 msgid "%s: replication connection using slot \"%s\" is unexpectedly database specific\n"
 msgstr ""
-"%s : la connexion de réplication utilisant le slot « %s » est spécifique à\n"
+"%s : la connexion de réplication utilisant le slot « %s » est spécifique à\n"
 "une base, ce qui est inattendu\n"
 
-#: pg_receivexlog.c:568 pg_recvlogical.c:884
+#: pg_receivexlog.c:568 pg_recvlogical.c:887
 #, c-format
 msgid "%s: dropping replication slot \"%s\"\n"
-msgstr "%s : suppression du slot de réplication « %s »\n"
+msgstr "%s : suppression du slot de réplication « %s »\n"
 
-#: pg_receivexlog.c:581 pg_recvlogical.c:896
+#: pg_receivexlog.c:581 pg_recvlogical.c:899
 #, c-format
 msgid "%s: creating replication slot \"%s\"\n"
-msgstr "%s : création du slot de réplication « %s »\n"
+msgstr "%s : création du slot de réplication « %s »\n"
 
-#: pg_receivexlog.c:608 pg_recvlogical.c:922
+#: pg_receivexlog.c:608 pg_recvlogical.c:925
 #, c-format
 msgid "%s: disconnected\n"
-msgstr "%s : déconnecté\n"
+msgstr "%s : déconnecté\n"
 
 #. translator: check source for value for %d
-#: pg_receivexlog.c:615 pg_recvlogical.c:929
+#: pg_receivexlog.c:615 pg_recvlogical.c:932
 #, c-format
 msgid "%s: disconnected; waiting %d seconds to try again\n"
-msgstr "%s : déconnecté, attente de %d secondes avant une nouvelle tentative\n"
+msgstr "%s : déconnecté, attente de %d secondes avant une nouvelle tentative\n"
 
-#: pg_recvlogical.c:67
+#: pg_recvlogical.c:70
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
 "\n"
 msgstr ""
-"%s contrôle le flux des modifications logiques de PostgreSQL.\n"
+"%s contrôle le flux des modifications logiques de PostgreSQL.\n"
 "\n"
 
-#: pg_recvlogical.c:71
+#: pg_recvlogical.c:74
 #, c-format
 msgid ""
 "\n"
 "Action to be performed:\n"
 msgstr ""
 "\n"
-"Action à réaliser :\n"
+"Action à réaliser :\n"
 
-#: pg_recvlogical.c:74
+#: pg_recvlogical.c:77
 #, c-format
 msgid "      --start            start streaming in a replication slot (for the slot's name see --slot)\n"
 msgstr ""
-"      --start                  lance le flux dans un slot de réplication (pour\n"
+"      --start                  lance le flux dans un slot de réplication (pour\n"
 "                               le nom du slot, voir --slot)\n"
 
-#: pg_recvlogical.c:76
+#: pg_recvlogical.c:79
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
-msgstr "  -f, --file=NOMFICHIER        trace la réception dans ce fichier, - pour stdout\n"
+msgstr "  -f, --file=NOMFICHIER        trace la réception dans ce fichier, - pour stdout\n"
 
-#: pg_recvlogical.c:77
+#: pg_recvlogical.c:80
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
 "                         time between fsyncs to the output file (default: %d)\n"
 msgstr ""
-"  -F  --fsync-interval=SECS    durée entre les fsyncs vers le fichier de sortie\n"
-"                               (par défaut %d)\n"
+"  -F  --fsync-interval=SECS    durée entre les fsyncs vers le fichier de sortie\n"
+"                               (par défaut %d)\n"
 
-#: pg_recvlogical.c:80
+#: pg_recvlogical.c:83
 #, c-format
 msgid "  -I, --startpos=LSN     where in an existing slot should the streaming start\n"
 msgstr ""
-"  -I, --startpos=LSN           position de début du streaming dans le slot\n"
+"  -I, --startpos=LSN           position de début du streaming dans le slot\n"
 "                               existant\n"
 
-#: pg_recvlogical.c:82
+#: pg_recvlogical.c:85
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -861,397 +871,397 @@
 "  -o, --option=NOM[=VALEUR]    passe l'option NAME avec la valeur optionnelle\n"
 "                               VALEUR au plugin en sortie\n"
 
-#: pg_recvlogical.c:85
+#: pg_recvlogical.c:88
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr ""
 "  -P, --plugin=PLUGIN          utilise le plugin PLUGIN en sortie\n"
-"                               (par défaut %s)\n"
+"                               (par défaut %s)\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:91
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
-msgstr "  -S, --slot=NOMSLOT           nom du slot de réplication logique\n"
+msgstr "  -S, --slot=NOMSLOT           nom du slot de réplication logique\n"
 
-#: pg_recvlogical.c:93
+#: pg_recvlogical.c:96
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
-msgstr "  -d, --dbname=NOMBASE      base de données de connexion\n"
+msgstr "  -d, --dbname=NOMBASE      base de données de connexion\n"
 
-#: pg_recvlogical.c:126
+#: pg_recvlogical.c:129
 #, c-format
 msgid "%s: confirming write up to %X/%X, flush to %X/%X (slot %s)\n"
-msgstr "%s : confirmation d'écriture jusqu'à %X/%X et de synchronisation jusqu'à %X/%X (slot %s)\n"
+msgstr "%s : confirmation d'écriture jusqu'à %X/%X et de synchronisation jusqu'à %X/%X (slot %s)\n"
 
-#: pg_recvlogical.c:151 receivelog.c:415
+#: pg_recvlogical.c:154 receivelog.c:418
 #, c-format
 msgid "%s: could not send feedback packet: %s"
 msgstr "%s : n'a pas pu envoyer le paquet d'informations en retour : %s"
 
-#: pg_recvlogical.c:190
+#: pg_recvlogical.c:193
 #, c-format
 msgid "%s: could not fsync log file \"%s\": %s\n"
-msgstr "%s : n'a pas pu synchroniser sur disque le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu synchroniser sur disque le fichier « %s » : %s\n"
 
-#: pg_recvlogical.c:229
+#: pg_recvlogical.c:232
 #, c-format
 msgid "%s: starting log streaming at %X/%X (slot %s)\n"
-msgstr "%s : commence le flux des journaux à %X/%X (slot %s)\n"
+msgstr "%s : commence le flux des journaux à %X/%X (slot %s)\n"
 
-#: pg_recvlogical.c:271
+#: pg_recvlogical.c:274
 #, c-format
 msgid "%s: streaming initiated\n"
-msgstr "%s : flux lancé\n"
+msgstr "%s : flux lancé\n"
 
-#: pg_recvlogical.c:336
+#: pg_recvlogical.c:339
 #, 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"
+msgstr "%s : n'a pas pu ouvrir le journal applicatif « %s » : %s\n"
 
-#: pg_recvlogical.c:412 receivelog.c:980
+#: pg_recvlogical.c:415 receivelog.c:985
 #, c-format
 msgid "%s: select() failed: %s\n"
-msgstr "%s : échec de select() : %s\n"
+msgstr "%s : échec de select() : %s\n"
 
-#: pg_recvlogical.c:421 receivelog.c:1030
+#: pg_recvlogical.c:424 receivelog.c:1035
 #, c-format
 msgid "%s: could not receive data from WAL stream: %s"
-msgstr "%s : n'a pas pu recevoir des données du flux de WAL : %s"
+msgstr "%s : n'a pas pu recevoir des données du flux de WAL : %s"
 
-#: pg_recvlogical.c:462 pg_recvlogical.c:501 receivelog.c:1075
-#: receivelog.c:1144
+#: pg_recvlogical.c:465 pg_recvlogical.c:504 receivelog.c:1080
+#: receivelog.c:1149
 #, c-format
 msgid "%s: streaming header too small: %d\n"
-msgstr "%s : en-tête de flux trop petit : %d\n"
+msgstr "%s : en-tête de flux trop petit : %d\n"
 
-#: pg_recvlogical.c:484 receivelog.c:924
+#: pg_recvlogical.c:487 receivelog.c:929
 #, c-format
 msgid "%s: unrecognized streaming header: \"%c\"\n"
-msgstr "%s : entête non reconnu du flux : « %c »\n"
+msgstr "%s : entête non reconnu du flux : « %c »\n"
 
-#: pg_recvlogical.c:530 pg_recvlogical.c:544
+#: pg_recvlogical.c:533 pg_recvlogical.c:547
 #, c-format
 msgid "%s: could not write %u bytes to log file \"%s\": %s\n"
-msgstr "%s : n'a pas pu écrire %u octets dans le journal de transactions « %s » : %s\n"
+msgstr "%s : n'a pas pu écrire %u octets dans le journal de transactions « %s » : %s\n"
 
-#: pg_recvlogical.c:555 receivelog.c:707 receivelog.c:745
+#: pg_recvlogical.c:558 receivelog.c:712 receivelog.c:750
 #, c-format
 msgid "%s: unexpected termination of replication stream: %s"
-msgstr "%s : fin inattendue du flux de réplication : %s"
+msgstr "%s : fin inattendue du flux de réplication : %s"
 
-#: pg_recvlogical.c:678
+#: pg_recvlogical.c:681
 #, c-format
 msgid "%s: invalid fsync interval \"%s\"\n"
-msgstr "%s : intervalle fsync « %s » invalide\n"
+msgstr "%s : intervalle fsync « %s » invalide\n"
 
-#: pg_recvlogical.c:719
+#: pg_recvlogical.c:722
 #, c-format
 msgid "%s: could not parse start position \"%s\"\n"
-msgstr "%s : n'a pas pu analyser la position de départ « %s »\n"
+msgstr "%s : n'a pas pu analyser la position de départ « %s »\n"
 
-#: pg_recvlogical.c:803
+#: pg_recvlogical.c:806
 #, c-format
 msgid "%s: no slot specified\n"
-msgstr "%s : aucun slot de réplication indiqué\n"
+msgstr "%s : aucun slot de réplication indiqué\n"
 
-#: pg_recvlogical.c:811
+#: pg_recvlogical.c:814
 #, c-format
 msgid "%s: no target file specified\n"
-msgstr "%s : aucun fichier cible indiqué\n"
+msgstr "%s : aucun fichier cible indiqué\n"
 
-#: pg_recvlogical.c:819
+#: pg_recvlogical.c:822
 #, c-format
 msgid "%s: no database specified\n"
-msgstr "%s : aucun base de données indiquée\n"
+msgstr "%s : aucun base de données indiquée\n"
 
-#: pg_recvlogical.c:827
+#: pg_recvlogical.c:830
 #, c-format
 msgid "%s: at least one action needs to be specified\n"
-msgstr "%s : au moins une action doit être indiquée\n"
+msgstr "%s : au moins une action doit être indiquée\n"
 
-#: pg_recvlogical.c:835
+#: pg_recvlogical.c:838
 #, c-format
 msgid "%s: cannot use --create-slot or --start together with --drop-slot\n"
 msgstr "%s : ne peut pas utiliser --create-slot ou --start avec --drop-slot\n"
 
-#: pg_recvlogical.c:843
+#: pg_recvlogical.c:846
 #, c-format
 msgid "%s: cannot use --create-slot or --drop-slot together with --startpos\n"
 msgstr "%s : ne peut pas utiliser --create-slot ou --drop-slot avec --startpos\n"
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:877
 #, c-format
 msgid "%s: could not establish database-specific replication connection\n"
-msgstr "%s : n'a pas pu établir une connexion de réplication spécifique à la base\n"
+msgstr "%s : n'a pas pu établir une connexion de réplication spécifique à la base\n"
 
-#: receivelog.c:75
+#: receivelog.c:78
 #, c-format
 msgid "%s: could not create archive status file \"%s\": %s\n"
-msgstr "%s : n'a pas pu créer le fichier de statut d'archivage « %s » : %s\n"
+msgstr "%s : n'a pas pu créer le fichier de statut d'archivage « %s » : %s\n"
 
-#: receivelog.c:82 receivelog.c:206 receivelog.c:355 receivelog.c:848
-#: receivelog.c:1096
+#: receivelog.c:85 receivelog.c:209 receivelog.c:358 receivelog.c:853
+#: receivelog.c:1101
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
-msgstr "%s : n'a pas pu synchroniser sur disque le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu synchroniser sur disque le fichier « %s » : %s\n"
 
-#: receivelog.c:121
+#: receivelog.c:124
 #, c-format
 msgid "%s: could not open transaction log file \"%s\": %s\n"
-msgstr "%s : n'a pas pu ouvrir le journal des transactions « %s » : %s\n"
+msgstr "%s : n'a pas pu ouvrir le journal des transactions « %s » : %s\n"
 
-#: receivelog.c:133
+#: receivelog.c:136
 #, c-format
 msgid "%s: could not stat transaction log file \"%s\": %s\n"
 msgstr ""
-"%s : n'a pas pu récupérer les informations sur le journal de transactions\n"
-"« %s » : %s\n"
+"%s : n'a pas pu récupérer les informations sur le journal de transactions\n"
+"« %s » : %s\n"
 
-#: receivelog.c:147
+#: receivelog.c:150
 #, c-format
 msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
 msgstr ""
-"%s : le segment « %s » du journal de transactions comprend %d octets, cela\n"
-"devrait être 0 ou %d\n"
+"%s : le segment « %s » du journal de transactions comprend %d octets, cela\n"
+"devrait être 0 ou %d\n"
 
-#: receivelog.c:160
+#: receivelog.c:163
 #, c-format
 msgid "%s: could not pad transaction log file \"%s\": %s\n"
-msgstr "%s : n'a pas pu remplir de zéros le journal de transactions « %s » : %s\n"
+msgstr "%s : n'a pas pu remplir de zéros le journal de transactions « %s » : %s\n"
 
-#: receivelog.c:173
+#: receivelog.c:176
 #, c-format
 msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
-msgstr "%s : n'a pas pu rechercher le début du journal de transaction « %s » : %s\n"
+msgstr "%s : n'a pas pu rechercher le début du journal de transaction « %s » : %s\n"
 
-#: receivelog.c:199
+#: receivelog.c:202
 #, c-format
 msgid "%s: could not determine seek position in file \"%s\": %s\n"
-msgstr "%s : n'a pas pu déterminer la position de recherche dans le fichier d'archive « %s » : %s\n"
+msgstr "%s : n'a pas pu déterminer la position de recherche dans le fichier d'archive « %s » : %s\n"
 
-#: receivelog.c:232
+#: receivelog.c:235
 #, c-format
 msgid "%s: could not rename file \"%s\": %s\n"
-msgstr "%s : n'a pas pu renommer le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu renommer le fichier « %s » : %s\n"
 
-#: receivelog.c:239
+#: receivelog.c:242
 #, c-format
 msgid "%s: not renaming \"%s%s\", segment is not complete\n"
-msgstr "%s : pas de renommage de « %s%s », le segment n'est pas complet\n"
+msgstr "%s : pas de renommage de « %s%s », le segment n'est pas complet\n"
 
-#: receivelog.c:285
+#: receivelog.c:288
 #, c-format
 msgid "%s: could not open timeline history file \"%s\": %s\n"
-msgstr "%s : n'a pas pu ouvrir le journal historique de la timeline « %s » : %s\n"
+msgstr "%s : n'a pas pu ouvrir le journal historique de la timeline « %s » : %s\n"
 
-#: receivelog.c:313
+#: receivelog.c:316
 #, c-format
 msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
-msgstr "%s : le serveur a renvoyé un nom de fichier historique inattendu pour la timeline %u : %s\n"
+msgstr "%s : le serveur a renvoyé un nom de fichier historique inattendu pour la timeline %u : %s\n"
 
-#: receivelog.c:330
+#: receivelog.c:333
 #, c-format
 msgid "%s: could not create timeline history file \"%s\": %s\n"
-msgstr "%s : n'a pas pu créer le fichier historique de la timeline « %s » : %s\n"
+msgstr "%s : n'a pas pu créer le fichier historique de la timeline « %s » : %s\n"
 
-#: receivelog.c:347
+#: receivelog.c:350
 #, c-format
 msgid "%s: could not write timeline history file \"%s\": %s\n"
-msgstr "%s : n'a pas pu écrire dans le fichier historique de la timeline « %s » : %s\n"
+msgstr "%s : n'a pas pu écrire dans le fichier historique de la timeline « %s » : %s\n"
 
-#: receivelog.c:372
+#: receivelog.c:375
 #, c-format
 msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
-msgstr "%s : n'a pas pu renommer le fichier « %s » en « %s » : %s\n"
+msgstr "%s : n'a pas pu renommer le fichier « %s » en « %s » : %s\n"
 
-#: receivelog.c:449
+#: receivelog.c:452
 #, c-format
 msgid "%s: incompatible server version %s; client does not support streaming from server versions older than %s\n"
 msgstr "%s : version %s du serveur incompatible ; le client ne supporte pas le streaming de versions plus anciennes que %s\n"
 
-#: receivelog.c:459
+#: receivelog.c:462
 #, c-format
 msgid "%s: incompatible server version %s; client does not support streaming from server versions newer than %s\n"
-msgstr "%s : version %s du serveur incompatible ; le client ne supporte pas le streaming de versions plus récentes que %s\n"
+msgstr "%s : version %s du serveur incompatible ; le client ne supporte pas le streaming de versions plus récentes que %s\n"
 
-#: receivelog.c:557 streamutil.c:264 streamutil.c:303
+#: receivelog.c:562 streamutil.c:272 streamutil.c:311
 #, c-format
 msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields\n"
 msgstr ""
-"%s : n'a pas pu identifier le système, a récupéré %d lignes et %d champs,\n"
+"%s : n'a pas pu identifier le système, a récupéré %d lignes et %d champs,\n"
 "attendait %d lignes et %d champs (ou plus)\n"
 
-#: receivelog.c:565
+#: receivelog.c:570
 #, c-format
 msgid "%s: system identifier does not match between base backup and streaming connection\n"
 msgstr ""
-"%s : l'identifiant système ne correspond pas entre la sauvegarde des fichiers\n"
-"et la connexion de réplication\n"
+"%s : l'identifiant système ne correspond pas entre la sauvegarde des fichiers\n"
+"et la connexion de réplication\n"
 
-#: receivelog.c:573
+#: receivelog.c:578
 #, c-format
 msgid "%s: starting timeline %u is not present in the server\n"
-msgstr "%s : la timeline %u de départ n'est pas dans le serveur\n"
+msgstr "%s : la timeline %u de départ n'est pas dans le serveur\n"
 
-#: receivelog.c:613
+#: receivelog.c:618
 #, c-format
 msgid "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s : réponse inattendue à la commande TIMELINE_HISTORY : a récupéré %d lignes et %d champs, alors qu'il attendait %d lignes et %d champs\n"
+msgstr "%s : réponse inattendue à la commande TIMELINE_HISTORY : a récupéré %d lignes et %d champs, alors qu'il attendait %d lignes et %d champs\n"
 
-#: receivelog.c:688
+#: receivelog.c:693
 #, c-format
 msgid "%s: server reported unexpected next timeline %u, following timeline %u\n"
-msgstr "%s: le serveur a renvoyé une timeline suivante %u inattendue, après la timeline %u\n"
+msgstr "%s: le serveur a renvoyé une timeline suivante %u inattendue, après la timeline %u\n"
 
-#: receivelog.c:695
+#: receivelog.c:700
 #, c-format
 msgid "%s: server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X\n"
-msgstr "%s : le serveur a arrêté l'envoi de la timeline %u à %X/%X, mais a indiqué que la timeline suivante, %u, commence à %X/%X\n"
+msgstr "%s : le serveur a arrêté l'envoi de la timeline %u à %X/%X, mais a indiqué que la timeline suivante, %u, commence à %X/%X\n"
 
-#: receivelog.c:736
+#: receivelog.c:741
 #, c-format
 msgid "%s: replication stream was terminated before stop point\n"
-msgstr "%s : le flux de réplication a été abandonné avant d'arriver au point d'arrêt\n"
+msgstr "%s : le flux de réplication a été abandonné avant d'arriver au point d'arrêt\n"
 
-#: receivelog.c:785
+#: receivelog.c:790
 #, c-format
 msgid "%s: unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s : ensemble de résultats inattendu après la fin de la timeline : a récupéré %d lignes et %d champs, alors qu'il attendait %d lignes et %d champs\n"
+msgstr "%s : ensemble de résultats inattendu après la fin de la timeline : a récupéré %d lignes et %d champs, alors qu'il attendait %d lignes et %d champs\n"
 
-#: receivelog.c:795
+#: receivelog.c:800
 #, c-format
 msgid "%s: could not parse next timeline's starting point \"%s\"\n"
-msgstr "%s : n'a pas pu analyser la position de départ de la prochaine timeline « %s »\n"
+msgstr "%s : n'a pas pu analyser la position de départ de la prochaine timeline « %s »\n"
 
-#: receivelog.c:959
+#: receivelog.c:964
 #, c-format
 msgid "%s: socket not open"
 msgstr "%s : socket non ouvert"
 
-#: receivelog.c:1163
+#: receivelog.c:1168
 #, c-format
 msgid "%s: received transaction log record for offset %u with no file open\n"
 msgstr ""
-"%s : a reçu l'enregistrement du journal de transactions pour le décalage %u\n"
+"%s : a reçu l'enregistrement du journal de transactions pour le décalage %u\n"
 "sans fichier ouvert\n"
 
-#: receivelog.c:1175
+#: receivelog.c:1180
 #, c-format
 msgid "%s: got WAL data offset %08x, expected %08x\n"
-msgstr "%s : a obtenu le décalage %08x pour les données du journal, attendait %08x\n"
+msgstr "%s : a obtenu le décalage %08x pour les données du journal, attendait %08x\n"
 
-#: receivelog.c:1212
+#: receivelog.c:1217
 #, c-format
 msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
-msgstr "%s : n'a pas pu écrire %u octets dans le journal de transactions « %s » : %s\n"
+msgstr "%s : n'a pas pu écrire %u octets dans le journal de transactions « %s » : %s\n"
 
-#: receivelog.c:1237 receivelog.c:1279 receivelog.c:1311
+#: receivelog.c:1242 receivelog.c:1284 receivelog.c:1316
 #, c-format
 msgid "%s: could not send copy-end packet: %s"
 msgstr "%s : n'a pas pu envoyer le paquet de fin de copie : %s"
 
-#: streamutil.c:145
+#: streamutil.c:153
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: streamutil.c:169
+#: streamutil.c:177
 #, c-format
 msgid "%s: could not connect to server\n"
 msgstr "%s : n'a pas pu se connecter au serveur\n"
 
-#: streamutil.c:187
+#: streamutil.c:195
 #, c-format
 msgid "%s: could not connect to server: %s"
 msgstr "%s : n'a pas pu se connecter au serveur : %s"
 
-#: streamutil.c:211
+#: streamutil.c:219
 #, c-format
 msgid "%s: could not determine server setting for integer_datetimes\n"
-msgstr "%s : n'a pas pu déterminer la configuration serveur de integer_datetimes\n"
+msgstr "%s : n'a pas pu déterminer la configuration serveur de integer_datetimes\n"
 
-#: streamutil.c:224
+#: streamutil.c:232
 #, c-format
 msgid "%s: integer_datetimes compile flag does not match server\n"
 msgstr "%s : l'option de compilation integer_datetimes ne correspond pas au serveur\n"
 
-#: streamutil.c:371
+#: streamutil.c:379
 #, c-format
 msgid "%s: could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr ""
-"%s : n'a pas pu créer le slot de réplication « %s » : a récupéré %d lignes et %d champs,\n"
+"%s : n'a pas pu créer le slot de réplication « %s » : a récupéré %d lignes et %d champs,\n"
 "attendait %d lignes et %d champs\n"
 
-#: streamutil.c:416
+#: streamutil.c:424
 #, c-format
 msgid "%s: could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr ""
-"%s : n'a pas pu supprimer le slot de réplication « %s » : a récupéré %d lignes et %d champs,\n"
+"%s : n'a pas pu supprimer le slot de réplication « %s » : a récupéré %d lignes et %d champs,\n"
 "attendait %d lignes et %d champs\n"
 
-#~ msgid "%s: no start point returned from server\n"
-#~ msgstr "%s : aucun point de redémarrage renvoyé du serveur\n"
+#~ msgid "%s: could not parse file size\n"
+#~ msgstr "%s : n'a pas pu analyser la taille du fichier\n"
 
-#~ msgid "%s: timeline does not match between base backup and streaming connection\n"
-#~ msgstr ""
-#~ "%s : la timeline ne correspond pas entre la sauvegarde des fichiers et la\n"
-#~ "connexion de réplication\n"
+#~ msgid "%s: could not parse file mode\n"
+#~ msgstr "%s : n'a pas pu analyser le mode du fichier\n"
 
-#~ msgid "%s: keepalive message has incorrect size %d\n"
-#~ msgstr "%s : le message keepalive a une taille %d incorrecte\n"
+#~ msgid "%s: could not parse transaction log file name \"%s\"\n"
+#~ msgstr "%s : n'a pas pu analyser le nom du journal de transactions « %s »\n"
 
-#~ msgid "  --version                output version information, then exit\n"
-#~ msgstr "  --version                    affiche la version et quitte\n"
+#~ msgid "%s: could not close file %s: %s\n"
+#~ msgstr "%s : n'a pas pu fermer le fichier %s : %s\n"
 
-#~ msgid "  --help                   show this help, then exit\n"
-#~ msgstr "  --help                       affiche cette aide et quitte\n"
+#~ msgid "  -V, --version            output version information, then exit\n"
+#~ msgstr "  -V, --version              affiche la version puis quitte\n"
 
-#~ msgid "%s: could not read copy data: %s\n"
-#~ msgstr "%s : n'a pas pu lire les données du COPY : %s\n"
+#~ msgid "  -?, --help               show this help, then exit\n"
+#~ msgstr "  -?, --help                 affiche cette aide puis quitte\n"
 
-#~ msgid "%s: could not get current position in file %s: %s\n"
-#~ msgstr "%s : n'a pas pu obtenir la position courant dans le fichier %s : %s\n"
+#~ msgid "%s: invalid format of xlog location: %s\n"
+#~ msgstr "%s : format invalide de l'emplacement du journal de transactions : %s\n"
 
-#~ msgid "%s: could not seek back to beginning of WAL segment %s: %s\n"
-#~ msgstr "%s : n'a pas pu se déplacer au début du segment WAL %s : %s\n"
+#~ msgid "%s: could not identify system: %s"
+#~ msgstr "%s : n'a pas pu identifier le système : %s"
 
-#~ msgid "%s: could not pad WAL segment %s: %s\n"
-#~ msgstr "%s : n'a pas pu terminer le segment WAL %s : %s\n"
+#~ msgid "%s: could not send base backup command: %s"
+#~ msgstr "%s : n'a pas pu envoyer la commande de sauvegarde de base : %s"
 
-#~ msgid "%s: could not stat WAL segment %s: %s\n"
-#~ msgstr "%s : n'a pas pu récupérer les informations sur le segment WAL %s : %s\n"
+#~ msgid "%s: could not identify system: %s\n"
+#~ msgstr "%s : n'a pas pu identifier le système : %s\n"
+
+#~ msgid "%s: could not parse log start position from value \"%s\"\n"
+#~ msgstr "%s : n'a pas pu analyser la position de départ des WAL à partir de la valeur « %s »\n"
 
 #~ msgid "%s: could not open WAL segment %s: %s\n"
 #~ msgstr "%s : n'a pas pu ouvrir le segment WAL %s : %s\n"
 
-#~ msgid "%s: could not parse log start position from value \"%s\"\n"
-#~ msgstr "%s : n'a pas pu analyser la position de départ des WAL à partir de la valeur « %s »\n"
-
-#~ msgid "%s: could not identify system: %s\n"
-#~ msgstr "%s : n'a pas pu identifier le système : %s\n"
+#~ msgid "%s: could not stat WAL segment %s: %s\n"
+#~ msgstr "%s : n'a pas pu récupérer les informations sur le segment WAL %s : %s\n"
 
-#~ msgid "%s: could not send base backup command: %s"
-#~ msgstr "%s : n'a pas pu envoyer la commande de sauvegarde de base : %s"
+#~ msgid "%s: could not pad WAL segment %s: %s\n"
+#~ msgstr "%s : n'a pas pu terminer le segment WAL %s : %s\n"
 
-#~ msgid "%s: could not identify system: %s"
-#~ msgstr "%s : n'a pas pu identifier le système : %s"
+#~ msgid "%s: could not seek back to beginning of WAL segment %s: %s\n"
+#~ msgstr "%s : n'a pas pu se déplacer au début du segment WAL %s : %s\n"
 
-#~ msgid "%s: invalid format of xlog location: %s\n"
-#~ msgstr "%s : format invalide de l'emplacement du journal de transactions : %s\n"
+#~ msgid "%s: could not get current position in file %s: %s\n"
+#~ msgstr "%s : n'a pas pu obtenir la position courant dans le fichier %s : %s\n"
 
-#~ msgid "  -?, --help               show this help, then exit\n"
-#~ msgstr "  -?, --help                 affiche cette aide puis quitte\n"
+#~ msgid "%s: could not read copy data: %s\n"
+#~ msgstr "%s : n'a pas pu lire les données du COPY : %s\n"
 
-#~ msgid "  -V, --version            output version information, then exit\n"
-#~ msgstr "  -V, --version              affiche la version puis quitte\n"
+#~ msgid "  --help                   show this help, then exit\n"
+#~ msgstr "  --help                       affiche cette aide et quitte\n"
 
-#~ msgid "%s: could not close file %s: %s\n"
-#~ msgstr "%s : n'a pas pu fermer le fichier %s : %s\n"
+#~ msgid "  --version                output version information, then exit\n"
+#~ msgstr "  --version                    affiche la version et quitte\n"
 
-#~ msgid "%s: could not parse transaction log file name \"%s\"\n"
-#~ msgstr "%s : n'a pas pu analyser le nom du journal de transactions « %s »\n"
+#~ msgid "%s: keepalive message has incorrect size %d\n"
+#~ msgstr "%s : le message keepalive a une taille %d incorrecte\n"
 
-#~ msgid "%s: could not parse file mode\n"
-#~ msgstr "%s : n'a pas pu analyser le mode du fichier\n"
+#~ msgid "%s: timeline does not match between base backup and streaming connection\n"
+#~ msgstr ""
+#~ "%s : la timeline ne correspond pas entre la sauvegarde des fichiers et la\n"
+#~ "connexion de réplication\n"
 
-#~ msgid "%s: could not parse file size\n"
-#~ msgstr "%s : n'a pas pu analyser la taille du fichier\n"
+#~ msgid "%s: no start point returned from server\n"
+#~ msgstr "%s : aucun point de redémarrage renvoyé du serveur\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/it.po postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/it.po
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: pg_basebackup (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-08-15 18:43+0000\n"
-"PO-Revision-Date: 2015-08-16 09:58+0100\n"
+"POT-Creation-Date: 2017-05-22 15:51+0000\n"
+"PO-Revision-Date: 2017-05-23 01:51+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98
@@ -29,32 +29,32 @@
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "impossibile duplicare il puntatore nullo (errore interno)\n"
 
-#: pg_basebackup.c:154
+#: pg_basebackup.c:156
 #, c-format
 msgid "%s: directory name too long\n"
 msgstr "%s: nome directory troppo lungo\n"
 
-#: pg_basebackup.c:164
+#: pg_basebackup.c:166
 #, c-format
 msgid "%s: multiple \"=\" signs in tablespace mapping\n"
 msgstr "%s: più di un segno \"=\" nella mappatura dei tablespace\n"
 
-#: pg_basebackup.c:177
+#: pg_basebackup.c:179
 #, c-format
 msgid "%s: invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\"\n"
 msgstr "%s: formato di mappatura dei tablespace \"%s\" non valido, deve essere \"VECCHIADIR=NUOVADIR\"\n"
 
-#: pg_basebackup.c:190
+#: pg_basebackup.c:192
 #, c-format
 msgid "%s: old directory is not an absolute path in tablespace mapping: %s\n"
 msgstr "%s: la vecchia directory non è un percorso assoluto nella mappatura dei tablespace: %s\n"
 
-#: pg_basebackup.c:197
+#: pg_basebackup.c:199
 #, c-format
 msgid "%s: new directory is not an absolute path in tablespace mapping: %s\n"
 msgstr "%s: la nuova directory non è un percorso assoluto nella mappatura dei tablespace: %s\n"
 
-#: pg_basebackup.c:231
+#: pg_basebackup.c:233
 #, c-format
 msgid ""
 "%s takes a base backup of a running PostgreSQL server.\n"
@@ -63,17 +63,17 @@
 "%s crea un backup di base di un server PostgreSQL in esecuzione.\n"
 "\n"
 
-#: pg_basebackup.c:233 pg_receivexlog.c:66 pg_recvlogical.c:69
+#: pg_basebackup.c:235 pg_receivexlog.c:66 pg_recvlogical.c:72
 #, c-format
 msgid "Usage:\n"
 msgstr "Utilizzo:\n"
 
-#: pg_basebackup.c:234 pg_receivexlog.c:67 pg_recvlogical.c:70
+#: pg_basebackup.c:236 pg_receivexlog.c:67 pg_recvlogical.c:73
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPZIONE]...\n"
 
-#: pg_basebackup.c:235
+#: pg_basebackup.c:237
 #, c-format
 msgid ""
 "\n"
@@ -82,17 +82,17 @@
 "\n"
 "Opzioni di controllo del'output:\n"
 
-#: pg_basebackup.c:236
+#: pg_basebackup.c:238
 #, c-format
 msgid "  -D, --pgdata=DIRECTORY receive base backup into directory\n"
 msgstr "  -D, --pgdata=DIRECTORY directory in cui ricevere il backup di base\n"
 
-#: pg_basebackup.c:237
+#: pg_basebackup.c:239
 #, c-format
 msgid "  -F, --format=p|t       output format (plain (default), tar)\n"
 msgstr "  -F, --format=p|t       formato di output (plain (default), tar)\n"
 
-#: pg_basebackup.c:238
+#: pg_basebackup.c:240
 #, c-format
 msgid ""
 "  -r, --max-rate=RATE    maximum transfer rate to transfer data directory\n"
@@ -101,21 +101,16 @@
 "  -r, --max-rate=RATE    transfer rate massimo per trasferire la directory dei dati\n"
 "                         (in kB/s, oppure usa i suffissi \"k\" o \"M\")\n"
 
-#: pg_basebackup.c:240
+#: pg_basebackup.c:242
 #, c-format
 msgid ""
 "  -R, --write-recovery-conf\n"
-"                         write recovery.conf after backup\n"
+"                         write recovery.conf for replication\n"
 msgstr ""
 "  -R, --write-recovery-conf\n"
-"                         scrivi recovery.conf dopo il backup\n"
+"                         scrivi recovery.conf per la replica\n"
 
-#: pg_basebackup.c:242 pg_receivexlog.c:74
-#, c-format
-msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
-msgstr "  -S, --slot=NOMESLOT    slot di replicazione da usare\n"
-
-#: pg_basebackup.c:243
+#: pg_basebackup.c:244
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
@@ -124,14 +119,14 @@
 "  -T, --tablespace-mapping=VECCHIADIR=NUOVADIR\n"
 "                         sposta il tablespace da VECCHIADIR a NUOVADIR\n"
 
-#: pg_basebackup.c:245
+#: pg_basebackup.c:246
 #, c-format
 msgid "  -x, --xlog             include required WAL files in backup (fetch mode)\n"
 msgstr ""
 "  -x, --xlog             includi i file WAL necessari nel backup\n"
 "                         (modalità fetch)\n"
 
-#: pg_basebackup.c:246
+#: pg_basebackup.c:247
 #, c-format
 msgid ""
 "  -X, --xlog-method=fetch|stream\n"
@@ -140,22 +135,22 @@
 "  -X, --xlog-method=fetch|stream\n"
 "                         includi i file WAL richiesti col metodo specificato\n"
 
-#: pg_basebackup.c:248
+#: pg_basebackup.c:249
 #, c-format
 msgid "      --xlogdir=XLOGDIR  location for the transaction log directory\n"
 msgstr "      --xlogdir=XLOGDIR  posizione per la directory del log delle transazioni\n"
 
-#: pg_basebackup.c:249
+#: pg_basebackup.c:250
 #, c-format
 msgid "  -z, --gzip             compress tar output\n"
 msgstr "  -z, --gzip             comprimi l'output tar\n"
 
-#: pg_basebackup.c:250
+#: pg_basebackup.c:251
 #, c-format
 msgid "  -Z, --compress=0-9     compress tar output with given compression level\n"
 msgstr "  -Z, --compress=0-9     comprimi l'output tar a questo livello di compressione\n"
 
-#: pg_basebackup.c:251
+#: pg_basebackup.c:252
 #, c-format
 msgid ""
 "\n"
@@ -164,7 +159,7 @@
 "\n"
 "Opzioni generali:\n"
 
-#: pg_basebackup.c:252
+#: pg_basebackup.c:253
 #, c-format
 msgid ""
 "  -c, --checkpoint=fast|spread\n"
@@ -173,32 +168,32 @@
 "  -c, --checkpoint=fast|spread\n"
 "                         imposta punti di controllo più veloci o più radi\n"
 
-#: pg_basebackup.c:254
+#: pg_basebackup.c:255
 #, c-format
 msgid "  -l, --label=LABEL      set backup label\n"
 msgstr "  -l, --label=LABEL      imposta l'etichetta del backup\n"
 
-#: pg_basebackup.c:255
+#: pg_basebackup.c:256
 #, c-format
 msgid "  -P, --progress         show progress information\n"
 msgstr "  -P, --progress         mostra informazioni sull'esecuzione\n"
 
-#: pg_basebackup.c:256 pg_receivexlog.c:76 pg_recvlogical.c:89
+#: pg_basebackup.c:257 pg_receivexlog.c:76 pg_recvlogical.c:92
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose          messaggi di output più numerosi\n"
 
-#: pg_basebackup.c:257 pg_receivexlog.c:77 pg_recvlogical.c:90
+#: pg_basebackup.c:258 pg_receivexlog.c:77 pg_recvlogical.c:93
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          mostra informazioni sulla versione ed esci\n"
 
-#: pg_basebackup.c:258 pg_receivexlog.c:78 pg_recvlogical.c:91
+#: pg_basebackup.c:259 pg_receivexlog.c:78 pg_recvlogical.c:94
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             mostra questo aiuto ed esci\n"
 
-#: pg_basebackup.c:259 pg_receivexlog.c:79 pg_recvlogical.c:92
+#: pg_basebackup.c:260 pg_receivexlog.c:79 pg_recvlogical.c:95
 #, c-format
 msgid ""
 "\n"
@@ -207,22 +202,22 @@
 "\n"
 "Opzioni di connessione:\n"
 
-#: pg_basebackup.c:260 pg_receivexlog.c:80
+#: pg_basebackup.c:261 pg_receivexlog.c:80
 #, c-format
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=CONNSTR   stringa di connessione\n"
 
-#: pg_basebackup.c:261 pg_receivexlog.c:81 pg_recvlogical.c:94
+#: pg_basebackup.c:262 pg_receivexlog.c:81 pg_recvlogical.c:97
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME    host del server database o directory del socket\n"
 
-#: pg_basebackup.c:262 pg_receivexlog.c:82 pg_recvlogical.c:95
+#: pg_basebackup.c:263 pg_receivexlog.c:82 pg_recvlogical.c:98
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=PORT        numero di porta del server database\n"
 
-#: pg_basebackup.c:263
+#: pg_basebackup.c:264
 #, c-format
 msgid ""
 "  -s, --status-interval=INTERVAL\n"
@@ -232,24 +227,24 @@
 "                         intervallo tra i pacchetti di stato inviati al server\n"
 "                         (in secondi)\n"
 
-#: pg_basebackup.c:265 pg_receivexlog.c:83 pg_recvlogical.c:96
+#: pg_basebackup.c:266 pg_receivexlog.c:83 pg_recvlogical.c:99
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr "  -U, --username=NAME    connettiti al database col nome utente specificato\n"
 
-#: pg_basebackup.c:266 pg_receivexlog.c:84 pg_recvlogical.c:97
+#: pg_basebackup.c:267 pg_receivexlog.c:84 pg_recvlogical.c:100
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password      non chiedere mai la password\n"
 
-#: pg_basebackup.c:267 pg_receivexlog.c:85 pg_recvlogical.c:98
+#: pg_basebackup.c:268 pg_receivexlog.c:85 pg_recvlogical.c:101
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password         forza la richiesta della password\n"
 "                         (dovrebbe essere automatico)\n"
 
-#: pg_basebackup.c:268 pg_receivexlog.c:89 pg_recvlogical.c:99
+#: pg_basebackup.c:269 pg_receivexlog.c:89 pg_recvlogical.c:102
 #, c-format
 msgid ""
 "\n"
@@ -258,248 +253,248 @@
 "\n"
 "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_basebackup.c:311
+#: pg_basebackup.c:312
 #, c-format
 msgid "%s: could not read from ready pipe: %s\n"
 msgstr "%s: lettura dalla pipe pronta fallita: %s\n"
 
-#: pg_basebackup.c:319 pg_basebackup.c:412 pg_basebackup.c:1887
-#: streamutil.c:285
+#: pg_basebackup.c:320 pg_basebackup.c:413 pg_basebackup.c:1887
+#: streamutil.c:293
 #, c-format
 msgid "%s: could not parse transaction log location \"%s\"\n"
 msgstr "%s: interpretazione della posizione del log delle transazioni \"%s\" fallita\n"
 
-#: pg_basebackup.c:425
+#: pg_basebackup.c:426
 #, c-format
 msgid "%s: could not create pipe for background process: %s\n"
 msgstr "%s: creazione della pipe per il processo in background fallita: %s\n"
 
-#: pg_basebackup.c:450 pg_basebackup.c:505 pg_basebackup.c:1263
+#: pg_basebackup.c:451 pg_basebackup.c:506 pg_basebackup.c:1254
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: creazione della directory \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:468
+#: pg_basebackup.c:469
 #, c-format
 msgid "%s: could not create background process: %s\n"
 msgstr "%s: creazione del processo in background fallita: %s\n"
 
-#: pg_basebackup.c:480
+#: pg_basebackup.c:481
 #, c-format
 msgid "%s: could not create background thread: %s\n"
 msgstr "%s: creazione del thread in background fallita: %s\n"
 
-#: pg_basebackup.c:524
+#: pg_basebackup.c:525
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: la directory \"%s\" esiste ma non è vuota\n"
 
-#: pg_basebackup.c:532
+#: pg_basebackup.c:533
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: accesso alla directory \"%s\" fallito: %s\n"
 
-#: pg_basebackup.c:594
+#: pg_basebackup.c:595
 #, c-format
 msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
 msgstr[0] "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgstr[1] "%*s/%s kB (100%%), %d/%d tablespace %*s"
 
-#: pg_basebackup.c:606
+#: pg_basebackup.c:607
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
 msgstr[0] "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgstr[1] "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 
-#: pg_basebackup.c:622
+#: pg_basebackup.c:623
 #, 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 tablespace"
 
-#: pg_basebackup.c:644
+#: pg_basebackup.c:645
 #, c-format
 msgid "%s: transfer rate \"%s\" is not a valid value\n"
 msgstr "%s: il transfer rate \"%s\" non è un valore valido\n"
 
-#: pg_basebackup.c:651
+#: pg_basebackup.c:652
 #, c-format
 msgid "%s: invalid transfer rate \"%s\": %s\n"
 msgstr "%s: transfer rate non valido \"%s\": %s\n"
 
-#: pg_basebackup.c:661
+#: pg_basebackup.c:662
 #, c-format
 msgid "%s: transfer rate must be greater than zero\n"
 msgstr "%s: il transfer rate deve essere maggiore di zero\n"
 
-#: pg_basebackup.c:695
+#: pg_basebackup.c:696
 #, c-format
 msgid "%s: invalid --max-rate unit: \"%s\"\n"
 msgstr "%s: unità --max-rate non valida: \"%s\"\n"
 
-#: pg_basebackup.c:704
+#: pg_basebackup.c:705
 #, c-format
 msgid "%s: transfer rate \"%s\" exceeds integer range\n"
 msgstr "%s: il transfer rate \"%s\" eccede l'intervallo degli interi\n"
 
-#: pg_basebackup.c:716
+#: pg_basebackup.c:717
 #, c-format
 msgid "%s: transfer rate \"%s\" is out of range\n"
 msgstr "%s: il transfer rate \"%s\" è fuori dall'intervallo consentito\n"
 
-#: pg_basebackup.c:740
+#: pg_basebackup.c:741
 #, c-format
 msgid "%s: could not write to compressed file \"%s\": %s\n"
 msgstr "%s: scrittura nel file compresso \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:750 pg_basebackup.c:1357 pg_basebackup.c:1582
+#: pg_basebackup.c:751 pg_basebackup.c:1348 pg_basebackup.c:1566
 #, c-format
 msgid "%s: could not write to file \"%s\": %s\n"
 msgstr "%s: scrittura nel file \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:805 pg_basebackup.c:826 pg_basebackup.c:854
+#: pg_basebackup.c:806 pg_basebackup.c:827 pg_basebackup.c:855
 #, c-format
 msgid "%s: could not set compression level %d: %s\n"
 msgstr "%s: impostazione del livello di compressione %d fallito: %s\n"
 
-#: pg_basebackup.c:875
+#: pg_basebackup.c:876
 #, c-format
 msgid "%s: could not create compressed file \"%s\": %s\n"
 msgstr "%s: creazione del file compresso \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:886 pg_basebackup.c:1317 pg_basebackup.c:1575
+#: pg_basebackup.c:887 pg_basebackup.c:1308 pg_basebackup.c:1559
 #, c-format
 msgid "%s: could not create file \"%s\": %s\n"
 msgstr "%s: creazione del file \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:898 pg_basebackup.c:1162
+#: pg_basebackup.c:899 pg_basebackup.c:1163
 #, c-format
 msgid "%s: could not get COPY data stream: %s"
 msgstr "%s: non è stato possibile ottenere lo stream di dati COPY: %s"
 
-#: pg_basebackup.c:955
+#: pg_basebackup.c:956
 #, c-format
 msgid "%s: could not close compressed file \"%s\": %s\n"
 msgstr "%s: chiusura del file compresso \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:968 pg_recvlogical.c:569 receivelog.c:213 receivelog.c:362
-#: receivelog.c:754
+#: pg_basebackup.c:969 pg_recvlogical.c:572 receivelog.c:216 receivelog.c:365
+#: receivelog.c:759
 #, c-format
 msgid "%s: could not close file \"%s\": %s\n"
 msgstr "%s: chiusura del file \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:979 pg_basebackup.c:1191 pg_recvlogical.c:435
-#: receivelog.c:1044
+#: pg_basebackup.c:980 pg_basebackup.c:1192 pg_recvlogical.c:438
+#: receivelog.c:1049
 #, c-format
 msgid "%s: could not read COPY data: %s"
 msgstr "%s: lettura dei dati COPY fallita: %s"
 
-#: pg_basebackup.c:1205
+#: pg_basebackup.c:1206
 #, c-format
 msgid "%s: invalid tar block header size: %d\n"
 msgstr "%s: dimensione del blocco di intestazione del file tar non valida: %d\n"
 
-#: pg_basebackup.c:1213
-#, c-format
-msgid "%s: could not parse file size\n"
-msgstr "%s: interpretazione della dimensione del file fallita\n"
-
-#: pg_basebackup.c:1221
-#, c-format
-msgid "%s: could not parse file mode\n"
-msgstr "%s: interpretazione della modalità del file fallita\n"
-
-#: pg_basebackup.c:1271
+#: pg_basebackup.c:1262
 #, c-format
 msgid "%s: could not set permissions on directory \"%s\": %s\n"
 msgstr "%s: impostazione dei permessi sulla directory \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:1295
+#: pg_basebackup.c:1286
 #, c-format
 msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
 msgstr "%s: creazione del link simbolico da \"%s\" a \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:1304
+#: pg_basebackup.c:1295
 #, c-format
 msgid "%s: unrecognized link indicator \"%c\"\n"
 msgstr "%s: indicatore di link sconosciuto \"%c\"\n"
 
-#: pg_basebackup.c:1324
+#: pg_basebackup.c:1315
 #, c-format
 msgid "%s: could not set permissions on file \"%s\": %s\n"
 msgstr "%s: impostazione dei permessi sul file \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:1383
+#: pg_basebackup.c:1374
 #, c-format
 msgid "%s: COPY stream ended before last file was finished\n"
 msgstr "%s: lo stream COPY è terminato prima che l'ultimo file fosse finito\n"
 
-#: pg_basebackup.c:1469 pg_basebackup.c:1489 pg_basebackup.c:1496
-#: pg_basebackup.c:1550
+#: pg_basebackup.c:1460 pg_basebackup.c:1480 pg_basebackup.c:1487
+#: pg_basebackup.c:1534
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria esaurita\n"
 
-#: pg_basebackup.c:1627
+#: pg_basebackup.c:1611
 #, c-format
 msgid "%s: incompatible server version %s\n"
 msgstr "%s: versione del server incompatibile %s\n"
 
-#: pg_basebackup.c:1674 pg_recvlogical.c:261 receivelog.c:549 receivelog.c:600
-#: receivelog.c:641 streamutil.c:255 streamutil.c:353 streamutil.c:399
+#: pg_basebackup.c:1648
+#, c-format
+msgid "%s: initiating base backup, waiting for checkpoint to complete\n"
+msgstr "%s: avvio del backup di base, in attesa del completamento del checkpoint\n"
+
+#: pg_basebackup.c:1666 pg_recvlogical.c:264 receivelog.c:554 receivelog.c:605
+#: receivelog.c:646 streamutil.c:263 streamutil.c:367 streamutil.c:413
 #, c-format
 msgid "%s: could not send replication command \"%s\": %s"
 msgstr "%s: invio del comando di replica \"%s\" fallito: %s"
 
-#: pg_basebackup.c:1685
+#: pg_basebackup.c:1677
 #, c-format
 msgid "%s: could not initiate base backup: %s"
 msgstr "%s: avvio del backup di base fallito: %s"
 
-#: pg_basebackup.c:1692
+#: pg_basebackup.c:1684
 #, c-format
 msgid "%s: server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: il server ha restituito una risposta imprevista al comando BASE_BACKUP; ricevute %d righe e %d campi, attese %d righe e %d campi\n"
 
-#: pg_basebackup.c:1712
+#: pg_basebackup.c:1692
+#, c-format
+msgid "%s: checkpoint completed\n"
+msgstr "%s: checkpoint completato\n"
+
+#: pg_basebackup.c:1707
 #, c-format
 msgid "transaction log start point: %s on timeline %u\n"
 msgstr "punto di avvio log delle transazioni: %s sulla timeline %u\n"
 
-#: pg_basebackup.c:1721
+#: pg_basebackup.c:1716
 #, c-format
 msgid "%s: could not get backup header: %s"
 msgstr "%s: non è stato possibile ottenere l'intestazione del backup: %s"
 
-#: pg_basebackup.c:1727
+#: pg_basebackup.c:1722
 #, c-format
 msgid "%s: no data returned from server\n"
 msgstr "%s: nessun dato restituito dal server\n"
 
-#: pg_basebackup.c:1759
+#: pg_basebackup.c:1754
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %d\n"
 msgstr "%s: è possibile scrivere solo un singolo tablespace su stdout, il database ne ha %d\n"
 
-#: pg_basebackup.c:1771
+#: pg_basebackup.c:1766
 #, c-format
 msgid "%s: starting background WAL receiver\n"
 msgstr "%s: avvio del ricevitore dei WAL in background\n"
 
-#: pg_basebackup.c:1802
+#: pg_basebackup.c:1797
 #, c-format
 msgid "%s: could not get transaction log end position from server: %s"
 msgstr "%s: non è stato possibile ottenere la posizione finale del log delle transazioni dal server: %s"
 
-#: pg_basebackup.c:1809
+#: pg_basebackup.c:1804
 #, c-format
 msgid "%s: no transaction log end position returned from server\n"
 msgstr "%s: nessuna posizione finale del log delle transazioni restituita dal server\n"
 
-#: pg_basebackup.c:1821
+#: pg_basebackup.c:1816
 #, c-format
 msgid "%s: final receive failed: %s"
 msgstr "%s: ricezione finale fallita: %s"
@@ -549,93 +544,88 @@
 msgid "%s: child thread exited with error %u\n"
 msgstr "%s: il thread figlio è terminato con errore %u\n"
 
-#: pg_basebackup.c:2002
+#: pg_basebackup.c:2001
 #, c-format
 msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
 msgstr "%s: formato di output \"%s\" non valido, deve essere \"plain\" oppure \"tar\"\n"
 
-#: pg_basebackup.c:2023 pg_basebackup.c:2035
+#: pg_basebackup.c:2019 pg_basebackup.c:2031
 #, c-format
 msgid "%s: cannot specify both --xlog and --xlog-method\n"
 msgstr "%s: non è possibile specificare sia --xlog che --xlog-method\n"
 
-#: pg_basebackup.c:2050
+#: pg_basebackup.c:2046
 #, c-format
 msgid "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
 msgstr "%s: opzione xlog-method \"%s\" non valida, deve essere \"fetch\" oppure \"stream\"\n"
 
-#: pg_basebackup.c:2072
+#: pg_basebackup.c:2068
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
 msgstr "%s: livello di compressione non valido \"%s\"\n"
 
-#: pg_basebackup.c:2084
+#: pg_basebackup.c:2080
 #, c-format
 msgid "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
 msgstr "%s: argomento di checkpoint \"%s\" non valido, deve essere \"fast\" oppure \"spread\"\n"
 
-#: pg_basebackup.c:2111 pg_receivexlog.c:439 pg_recvlogical.c:752
+#: pg_basebackup.c:2107 pg_receivexlog.c:439 pg_recvlogical.c:755
 #, c-format
 msgid "%s: invalid status interval \"%s\"\n"
 msgstr "%s: intervallo di status \"%s\" non valido\n"
 
-#: pg_basebackup.c:2127 pg_basebackup.c:2141 pg_basebackup.c:2152
-#: pg_basebackup.c:2165 pg_basebackup.c:2175 pg_basebackup.c:2185
-#: pg_basebackup.c:2197 pg_basebackup.c:2208 pg_receivexlog.c:471
-#: pg_receivexlog.c:485 pg_receivexlog.c:493 pg_receivexlog.c:503
-#: pg_receivexlog.c:514 pg_recvlogical.c:779 pg_recvlogical.c:793
-#: pg_recvlogical.c:804 pg_recvlogical.c:812 pg_recvlogical.c:820
-#: pg_recvlogical.c:828 pg_recvlogical.c:836 pg_recvlogical.c:844
+#: pg_basebackup.c:2123 pg_basebackup.c:2137 pg_basebackup.c:2148
+#: pg_basebackup.c:2161 pg_basebackup.c:2171 pg_basebackup.c:2183
+#: pg_basebackup.c:2194 pg_receivexlog.c:471 pg_receivexlog.c:485
+#: pg_receivexlog.c:493 pg_receivexlog.c:503 pg_receivexlog.c:514
+#: pg_recvlogical.c:782 pg_recvlogical.c:796 pg_recvlogical.c:807
+#: pg_recvlogical.c:815 pg_recvlogical.c:823 pg_recvlogical.c:831
+#: pg_recvlogical.c:839 pg_recvlogical.c:847
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
 
-#: pg_basebackup.c:2139 pg_receivexlog.c:483 pg_recvlogical.c:791
+#: pg_basebackup.c:2135 pg_receivexlog.c:483 pg_recvlogical.c:794
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: troppi argomenti nella riga di comando (il primo è \"%s\")\n"
 
-#: pg_basebackup.c:2151 pg_receivexlog.c:513
+#: pg_basebackup.c:2147 pg_receivexlog.c:513
 #, c-format
 msgid "%s: no target directory specified\n"
 msgstr "%s: nessuna directory di destinazione specificata\n"
 
-#: pg_basebackup.c:2163
+#: pg_basebackup.c:2159
 #, c-format
 msgid "%s: only tar mode backups can be compressed\n"
 msgstr "%s: solo i backup in modalità tar possono essere compressi\n"
 
-#: pg_basebackup.c:2173
+#: pg_basebackup.c:2169
 #, c-format
 msgid "%s: WAL streaming can only be used in plain mode\n"
 msgstr "%s: lo streaming WAL può essere usato solo in modalità plain\n"
 
-#: pg_basebackup.c:2183
-#, c-format
-msgid "%s: replication slots can only be used with WAL streaming\n"
-msgstr "%s: gli slot di replica possono essere usati solo con lo streaming WAL\n"
-
-#: pg_basebackup.c:2195
+#: pg_basebackup.c:2181
 #, c-format
 msgid "%s: transaction log directory location can only be specified in plain mode\n"
 msgstr "%s: la posizione della directory del log delle transazioni può essere specificata solo in modalità plain\n"
 
-#: pg_basebackup.c:2206
+#: pg_basebackup.c:2192
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: la posizione della directory del log delle transazioni deve essere un percorso assoluto\n"
 
-#: pg_basebackup.c:2218
+#: pg_basebackup.c:2204
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s: questo binario compilato non supporta la compressione\n"
 
-#: pg_basebackup.c:2245
+#: pg_basebackup.c:2231
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: creazione del link simbolico \"%s\" fallita: %s\n"
 
-#: pg_basebackup.c:2250
+#: pg_basebackup.c:2236
 #, c-format
 msgid "%s: symlinks are not supported on this platform\n"
 msgstr "%s: questa piattaforma non supporta i link simbolici\n"
@@ -649,7 +639,7 @@
 "%s riceve lo stream del log delle transazioni di PostgreSQL.\n"
 "\n"
 
-#: pg_receivexlog.c:68 pg_recvlogical.c:75
+#: pg_receivexlog.c:68 pg_recvlogical.c:78
 #, c-format
 msgid ""
 "\n"
@@ -663,19 +653,17 @@
 msgid "  -D, --directory=DIR    receive transaction log files into this directory\n"
 msgstr "  -D, --directory=DIR    ricevi i file di log delle transazioni in questa directory\n"
 
-#: pg_receivexlog.c:70 pg_recvlogical.c:79
+#: pg_receivexlog.c:70 pg_recvlogical.c:82
 #, c-format
-msgid "      --if-not-exists    do not treat naming conflicts as an error when creating a slot\n"
-msgstr ""
-"      --if-not-exists    non considerare i conflitti di nome come errori nella creazione\n"
-"                         di uno slot\n"
+msgid "      --if-not-exists    do not error if slot already exists when creating a slot\n"
+msgstr "      --if-not-exists    non dare un errore se esiste già uno slot con lo stesso nome\n"
 
-#: pg_receivexlog.c:71 pg_recvlogical.c:81
+#: pg_receivexlog.c:71 pg_recvlogical.c:84
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop          non ri-eseguire se la connessione è persa\n"
 
-#: pg_receivexlog.c:72 pg_recvlogical.c:86
+#: pg_receivexlog.c:72 pg_recvlogical.c:89
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
@@ -685,6 +673,11 @@
 "                         tempo tra gli invii dei pacchetti di stato al server\n"
 "                         (default: %d)\n"
 
+#: pg_receivexlog.c:74
+#, c-format
+msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
+msgstr "  -S, --slot=NOMESLOT    slot di replicazione da usare\n"
+
 #: pg_receivexlog.c:75
 #, c-format
 msgid "      --synchronous      flush transaction log immediately after writing\n"
@@ -699,12 +692,12 @@
 "\n"
 "Azioni opzionali:\n"
 
-#: pg_receivexlog.c:87 pg_recvlogical.c:72
+#: pg_receivexlog.c:87 pg_recvlogical.c:75
 #, c-format
 msgid "      --create-slot      create a new replication slot (for the slot's name see --slot)\n"
 msgstr "      --create-slot      crea un nuovo slot di replica (per il nome vedi --slot)\n"
 
-#: pg_receivexlog.c:88 pg_recvlogical.c:73
+#: pg_receivexlog.c:88 pg_recvlogical.c:76
 #, c-format
 msgid "      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"
 msgstr "      --drop-slot        elimina lo slot di replica (per il nome vedi --slot)\n"
@@ -734,7 +727,7 @@
 msgid "%s: could not close directory \"%s\": %s\n"
 msgstr "%s: chiusura della directory \"%s\" fallita: %s\n"
 
-#: pg_receivexlog.c:218 pg_recvlogical.c:343
+#: pg_receivexlog.c:218 pg_recvlogical.c:346
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: non è stato possibile ottenere informazioni sul file \"%s\": %s\n"
@@ -754,7 +747,7 @@
 msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
 msgstr "%s: avvio dello streaming dei log a %X/%X (timeline %u)\n"
 
-#: pg_receivexlog.c:420 pg_recvlogical.c:699
+#: pg_receivexlog.c:420 pg_recvlogical.c:702
 #, c-format
 msgid "%s: invalid port number \"%s\"\n"
 msgstr "%s: numero di porta non valido \"%s\"\n"
@@ -775,28 +768,28 @@
 msgid "%s: replication connection using slot \"%s\" is unexpectedly database specific\n"
 msgstr "%s: la replica di connessione usando lo slot \"%s\" è inaspettatamente specifica per il database\n"
 
-#: pg_receivexlog.c:568 pg_recvlogical.c:884
+#: pg_receivexlog.c:568 pg_recvlogical.c:887
 #, c-format
 msgid "%s: dropping replication slot \"%s\"\n"
 msgstr "%s: eliminazione dello slot di replica \"%s\"\n"
 
-#: pg_receivexlog.c:581 pg_recvlogical.c:896
+#: pg_receivexlog.c:581 pg_recvlogical.c:899
 #, c-format
 msgid "%s: creating replication slot \"%s\"\n"
 msgstr "%s: creazione dello slot di replica \"%s\"\n"
 
-#: pg_receivexlog.c:608 pg_recvlogical.c:922
+#: pg_receivexlog.c:608 pg_recvlogical.c:925
 #, c-format
 msgid "%s: disconnected\n"
 msgstr "%s: disconnesso\n"
 
 #. translator: check source for value for %d
-#: pg_receivexlog.c:615 pg_recvlogical.c:929
+#: pg_receivexlog.c:615 pg_recvlogical.c:932
 #, c-format
 msgid "%s: disconnected; waiting %d seconds to try again\n"
 msgstr "%s: disconnesso; aspetterò %d secondi prima di riprovare\n"
 
-#: pg_recvlogical.c:67
+#: pg_recvlogical.c:70
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
@@ -805,7 +798,7 @@
 "%s controlla i flussi di decodifica logica di PostgreSQ.\n"
 "\n"
 
-#: pg_recvlogical.c:71
+#: pg_recvlogical.c:74
 #, c-format
 msgid ""
 "\n"
@@ -814,17 +807,17 @@
 "\n"
 "Azioni da effettuare:\n"
 
-#: pg_recvlogical.c:74
+#: pg_recvlogical.c:77
 #, c-format
 msgid "      --start            start streaming in a replication slot (for the slot's name see --slot)\n"
 msgstr "      --start            avvia lo streaming in uno slot di replica (per il nome vedi --slot)\n"
 
-#: pg_recvlogical.c:76
+#: pg_recvlogical.c:79
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr "  -f, --file=FILE        riceve i log in questo file, - per stdout\n"
 
-#: pg_recvlogical.c:77
+#: pg_recvlogical.c:80
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
@@ -833,12 +826,12 @@
 "  -F  --fsync-interval=SEC\n"
 "                         tempo tra i sync del file di output (default: %d)\n"
 
-#: pg_recvlogical.c:80
+#: pg_recvlogical.c:83
 #, c-format
 msgid "  -I, --startpos=LSN     where in an existing slot should the streaming start\n"
 msgstr "  -I, --startpos=LSN     dove deve partire lo streaming in uno slot esistente\n"
 
-#: pg_recvlogical.c:82
+#: pg_recvlogical.c:85
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -849,313 +842,313 @@
 "                         passa l'opzione NOME col valore opzionale VALORE\n"
 "                         al plugin di output\n"
 
-#: pg_recvlogical.c:85
+#: pg_recvlogical.c:88
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr "  -P, --plugin=PLUGIN    usa il plugin di output PLUGIN (default: %s)\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:91
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
 msgstr "  -S, --slot=NOMESLOT    nome dello slot di replica logica\n"
 
-#: pg_recvlogical.c:93
+#: pg_recvlogical.c:96
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=NOMEDB    database a cui connettersi\n"
 
-#: pg_recvlogical.c:126
+#: pg_recvlogical.c:129
 #, c-format
 msgid "%s: confirming write up to %X/%X, flush to %X/%X (slot %s)\n"
 msgstr "%s: scritture confermate fino a %X/%X, flush a %X/%X (slot %s)\n"
 
-#: pg_recvlogical.c:151 receivelog.c:415
+#: pg_recvlogical.c:154 receivelog.c:418
 #, c-format
 msgid "%s: could not send feedback packet: %s"
 msgstr "%s: invio del pacchetto di feedback fallito: %s"
 
-#: pg_recvlogical.c:190
+#: pg_recvlogical.c:193
 #, c-format
 msgid "%s: could not fsync log file \"%s\": %s\n"
 msgstr "%s: fsync del file di log \"%s\" fallito: %s\n"
 
-#: pg_recvlogical.c:229
+#: pg_recvlogical.c:232
 #, c-format
 msgid "%s: starting log streaming at %X/%X (slot %s)\n"
 msgstr "%s: inizio dello streaming dei log a %X/%X (slot %s)\n"
 
-#: pg_recvlogical.c:271
+#: pg_recvlogical.c:274
 #, c-format
 msgid "%s: streaming initiated\n"
 msgstr "%s: streaming iniziato\n"
 
-#: pg_recvlogical.c:336
+#: pg_recvlogical.c:339
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s: apertura del file di log \"%s\" fallita: %s\n"
 
-#: pg_recvlogical.c:412 receivelog.c:980
+#: pg_recvlogical.c:415 receivelog.c:985
 #, c-format
 msgid "%s: select() failed: %s\n"
 msgstr "%s: select() fallita: %s\n"
 
-#: pg_recvlogical.c:421 receivelog.c:1030
+#: pg_recvlogical.c:424 receivelog.c:1035
 #, c-format
 msgid "%s: could not receive data from WAL stream: %s"
 msgstr "%s: ricezione dati dallo stream WAL fallita: %s"
 
-#: pg_recvlogical.c:462 pg_recvlogical.c:501 receivelog.c:1075
-#: receivelog.c:1144
+#: pg_recvlogical.c:465 pg_recvlogical.c:504 receivelog.c:1080
+#: receivelog.c:1149
 #, c-format
 msgid "%s: streaming header too small: %d\n"
 msgstr "%s: intestazione dello streaming troppo piccola: %d\n"
 
-#: pg_recvlogical.c:484 receivelog.c:924
+#: pg_recvlogical.c:487 receivelog.c:929
 #, c-format
 msgid "%s: unrecognized streaming header: \"%c\"\n"
 msgstr "%s: intestazione dello streaming sconosciuta: \"%c\"\n"
 
-#: pg_recvlogical.c:530 pg_recvlogical.c:544
+#: pg_recvlogical.c:533 pg_recvlogical.c:547
 #, c-format
 msgid "%s: could not write %u bytes to log file \"%s\": %s\n"
 msgstr "%s: scrittura di %u byte nel file di log \"%s\" fallita: %s\n"
 
-#: pg_recvlogical.c:555 receivelog.c:707 receivelog.c:745
+#: pg_recvlogical.c:558 receivelog.c:712 receivelog.c:750
 #, c-format
 msgid "%s: unexpected termination of replication stream: %s"
 msgstr "%s: terminazione inaspettata dello stream di replica: %s"
 
-#: pg_recvlogical.c:678
+#: pg_recvlogical.c:681
 #, c-format
 msgid "%s: invalid fsync interval \"%s\"\n"
 msgstr "%s: intervallo di fsync \"%s\" non valido\n"
 
-#: pg_recvlogical.c:719
+#: pg_recvlogical.c:722
 #, c-format
 msgid "%s: could not parse start position \"%s\"\n"
 msgstr "%s: interpretazione della posizione di inizio \"%s\" fallita\n"
 
-#: pg_recvlogical.c:803
+#: pg_recvlogical.c:806
 #, c-format
 msgid "%s: no slot specified\n"
 msgstr "%s: slot non specificato\n"
 
-#: pg_recvlogical.c:811
+#: pg_recvlogical.c:814
 #, c-format
 msgid "%s: no target file specified\n"
 msgstr "%s: file di destinazione non specificato\n"
 
-#: pg_recvlogical.c:819
+#: pg_recvlogical.c:822
 #, c-format
 msgid "%s: no database specified\n"
 msgstr "%s: database non specificato\n"
 
-#: pg_recvlogical.c:827
+#: pg_recvlogical.c:830
 #, c-format
 msgid "%s: at least one action needs to be specified\n"
 msgstr "%s: occorre specificare almeno una azione\n"
 
-#: pg_recvlogical.c:835
+#: pg_recvlogical.c:838
 #, c-format
 msgid "%s: cannot use --create-slot or --start together with --drop-slot\n"
 msgstr "%s: --create-slot o --start non possono essere usate con --drop-slot\n"
 
-#: pg_recvlogical.c:843
+#: pg_recvlogical.c:846
 #, c-format
 msgid "%s: cannot use --create-slot or --drop-slot together with --startpos\n"
 msgstr "%s: --create-slot o --drop-slot non possono essere usate con --startpos\n"
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:877
 #, c-format
 msgid "%s: could not establish database-specific replication connection\n"
 msgstr "%s: connessione di replica specifica per il database fallita\n"
 
-#: receivelog.c:75
+#: receivelog.c:78
 #, c-format
 msgid "%s: could not create archive status file \"%s\": %s\n"
 msgstr "%s: creazione del file di stato dell'archivio \"%s\" fallita: %s\n"
 
-#: receivelog.c:82 receivelog.c:206 receivelog.c:355 receivelog.c:848
-#: receivelog.c:1096
+#: receivelog.c:85 receivelog.c:209 receivelog.c:358 receivelog.c:853
+#: receivelog.c:1101
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: fsync del file \"%s\" fallito: %s\n"
 
-#: receivelog.c:121
+#: receivelog.c:124
 #, c-format
 msgid "%s: could not open transaction log file \"%s\": %s\n"
 msgstr "%s: apertura del file di log delle transazioni \"%s\" fallita: %s\n"
 
-#: receivelog.c:133
+#: receivelog.c:136
 #, c-format
 msgid "%s: could not stat transaction log file \"%s\": %s\n"
 msgstr "%s: non è stato possibile ottenere informazioni sul file di log delle transazioni \"%s\": %s\n"
 
-#: receivelog.c:147
+#: receivelog.c:150
 #, c-format
 msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
 msgstr "%s: il file di log delle transazioni \"%s\" ha %d byte, dovrebbero essere 0 or %d\n"
 
-#: receivelog.c:160
+#: receivelog.c:163
 #, c-format
 msgid "%s: could not pad transaction log file \"%s\": %s\n"
 msgstr "%s: correzione della lunghezza del file di log delle transazioni \"%s\" fallita: %s\n"
 
-#: receivelog.c:173
+#: receivelog.c:176
 #, c-format
 msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
 msgstr "%s: spostamento all'inizio del file di log delle transazioni \"%s\" fallito: %s\n"
 
-#: receivelog.c:199
+#: receivelog.c:202
 #, c-format
 msgid "%s: could not determine seek position in file \"%s\": %s\n"
 msgstr "%s: determinazione della posizione dove muoversi nel file \"%s\" fallita: %s\n"
 
-#: receivelog.c:232
+#: receivelog.c:235
 #, c-format
 msgid "%s: could not rename file \"%s\": %s\n"
 msgstr "%s: non è stato possibile rinominare il file \"%s\": %s\n"
 
-#: receivelog.c:239
+#: receivelog.c:242
 #, c-format
 msgid "%s: not renaming \"%s%s\", segment is not complete\n"
 msgstr "%s: \"%s%s\" non rinominato, il segmento non è completo\n"
 
-#: receivelog.c:285
+#: receivelog.c:288
 #, c-format
 msgid "%s: could not open timeline history file \"%s\": %s\n"
 msgstr "%s: apertura del file della storia della timeline \"%s\" fallita: %s\n"
 
-#: receivelog.c:313
+#: receivelog.c:316
 #, c-format
 msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
 msgstr "%s: il server ha riportato un nome di file della storia imprevisto per la timeline %u: %s\n"
 
-#: receivelog.c:330
+#: receivelog.c:333
 #, c-format
 msgid "%s: could not create timeline history file \"%s\": %s\n"
 msgstr "%s: creazione del file di storia della timeline \"%s\" fallita: %s\n"
 
-#: receivelog.c:347
+#: receivelog.c:350
 #, c-format
 msgid "%s: could not write timeline history file \"%s\": %s\n"
 msgstr "%s: scrittura del file di storia della timeline \"%s\" fallita: %s\n"
 
-#: receivelog.c:372
+#: receivelog.c:375
 #, c-format
 msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
 msgstr "%s: non è stato possibile rinominare il file di storia della timeline \"%s\" in \"%s\": %s\n"
 
-#: receivelog.c:449
+#: receivelog.c:452
 #, c-format
 msgid "%s: incompatible server version %s; client does not support streaming from server versions older than %s\n"
 msgstr "%s: server di versione %s non compatibile; il client non supporta lo streaming da server di versione precedente a %s\n"
 
-#: receivelog.c:459
+#: receivelog.c:462
 #, c-format
 msgid "%s: incompatible server version %s; client does not support streaming from server versions newer than %s\n"
 msgstr "%s: server di versione %s non compatibile; il client non supporta lo streaming da server di versione successiva a %s\n"
 
-#: receivelog.c:557 streamutil.c:264 streamutil.c:299
+#: receivelog.c:562 streamutil.c:272 streamutil.c:311
 #, c-format
 msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields\n"
 msgstr "%s: identificazione del sistema fallita: ricevute %d righe e %d campi, attese %d righe e %d campi o più\n"
 
-#: receivelog.c:565
+#: receivelog.c:570
 #, c-format
 msgid "%s: system identifier does not match between base backup and streaming connection\n"
 msgstr "%s: l'identificativo di sistema non combacia tra il backup di base e la connessione in streaming\n"
 
-#: receivelog.c:573
+#: receivelog.c:578
 #, c-format
 msgid "%s: starting timeline %u is not present in the server\n"
 msgstr "%s: la timeline di inizio %u non è presente nel server\n"
 
-#: receivelog.c:613
+#: receivelog.c:618
 #, c-format
 msgid "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: risposta inattesa al comando TIMELINE_HISTORY: ricevute %d righe e %d campi, attese %d righe e %d campi\n"
 
-#: receivelog.c:688
+#: receivelog.c:693
 #, c-format
 msgid "%s: server reported unexpected next timeline %u, following timeline %u\n"
 msgstr "%s: il server ha riportato la timeline successiva imprevista %u, a seguito della timeline %u\n"
 
-#: receivelog.c:695
+#: receivelog.c:700
 #, c-format
 msgid "%s: server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X\n"
 msgstr "%s: il server ha interrotto lo streaming della timeline %u a %X/%X, ma ha riportato l'inizio della timeline successiva %u a %X/%X\n"
 
-#: receivelog.c:736
+#: receivelog.c:741
 #, c-format
 msgid "%s: replication stream was terminated before stop point\n"
 msgstr "%s: lo stream di replica è terminato prima del punto di arresto\n"
 
-#: receivelog.c:785
+#: receivelog.c:790
 #, c-format
 msgid "%s: unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: risultato imprevisto dopo la fine della timeline: ricevute %d righe e %d campi, attese %d righe e %d campi\n"
 
-#: receivelog.c:795
+#: receivelog.c:800
 #, c-format
 msgid "%s: could not parse next timeline's starting point \"%s\"\n"
 msgstr "%s: interpretazione del punto d'inizio della nuova timeline \"%s\" fallita\n"
 
-#: receivelog.c:959
+#: receivelog.c:964
 #, c-format
 msgid "%s: socket not open"
 msgstr "%s: socket non aperto"
 
-#: receivelog.c:1163
+#: receivelog.c:1168
 #, c-format
 msgid "%s: received transaction log record for offset %u with no file open\n"
 msgstr "%s: ricevuti record di log delle transazioni per offset %u senza alcun file aperto\n"
 
-#: receivelog.c:1175
+#: receivelog.c:1180
 #, c-format
 msgid "%s: got WAL data offset %08x, expected %08x\n"
 msgstr "%s: ricevuto offset dati WAL %08x, atteso %08x\n"
 
-#: receivelog.c:1212
+#: receivelog.c:1217
 #, c-format
 msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
 msgstr "%s: scrittura di %u byte nel file WAL \"%s\" fallita: %s\n"
 
-#: receivelog.c:1237 receivelog.c:1279 receivelog.c:1311
+#: receivelog.c:1242 receivelog.c:1284 receivelog.c:1316
 #, c-format
 msgid "%s: could not send copy-end packet: %s"
 msgstr "%s: invio del pacchetto di fine copia fallito: %s"
 
-#: streamutil.c:145
+#: streamutil.c:153
 msgid "Password: "
 msgstr "Password: "
 
-#: streamutil.c:169
+#: streamutil.c:177
 #, c-format
 msgid "%s: could not connect to server\n"
 msgstr "%s: connessione al server fallita\n"
 
-#: streamutil.c:187
+#: streamutil.c:195
 #, c-format
 msgid "%s: could not connect to server: %s"
 msgstr "%s: connessione al server fallita: %s"
 
-#: streamutil.c:211
+#: streamutil.c:219
 #, c-format
 msgid "%s: could not determine server setting for integer_datetimes\n"
 msgstr "%s: non è stato possibile determinare l'impostazione integer_datetimes del server\n"
 
-#: streamutil.c:224
+#: streamutil.c:232
 #, c-format
 msgid "%s: integer_datetimes compile flag does not match server\n"
 msgstr "%s: l'opzione di compilazione integer_datetimes non combacia con quella del server\n"
 
-#: streamutil.c:365
+#: streamutil.c:379
 #, c-format
 msgid "%s: could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: creazione dello slot di replica \"%s\" fallita: ricevute %d righe e %d campi, attesi %d righe e %d campi\n"
 
-#: streamutil.c:410
+#: streamutil.c:424
 #, c-format
 msgid "%s: could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: eliminazione dello slot di replica \"%s\" fallita: ricevute %d righe e %d campi, attesi %d righe e %d campi\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/pt_BR.po postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/pt_BR.po
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/pt_BR.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/pt_BR.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 # 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>, 2012-2015.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2012-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-09-17 22:32-0300\n"
+"POT-Creation-Date: 2017-05-08 15:52-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"
@@ -28,32 +28,32 @@
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "não pode duplicar ponteiro nulo (erro interno)\n"
 
-#: pg_basebackup.c:154
+#: pg_basebackup.c:156
 #, c-format
 msgid "%s: directory name too long\n"
 msgstr "%s: nome de diretório é muito longo\n"
 
-#: pg_basebackup.c:164
+#: pg_basebackup.c:166
 #, c-format
 msgid "%s: multiple \"=\" signs in tablespace mapping\n"
 msgstr "%s: múltiplos sinais \"=\" em mapeamento de tablespace\n"
 
-#: pg_basebackup.c:177
+#: pg_basebackup.c:179
 #, c-format
 msgid "%s: invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\"\n"
 msgstr "%s: formato de mapeamento de tablespace \"%s\" é inválido, deve ser \"DIRANTIGO=DIRNOVO\"\n"
 
-#: pg_basebackup.c:190
+#: pg_basebackup.c:192
 #, c-format
 msgid "%s: old directory is not an absolute path in tablespace mapping: %s\n"
 msgstr "%s: diretório antigo não é um caminho absoluto no mapeamento de tablespace: %s\n"
 
-#: pg_basebackup.c:197
+#: pg_basebackup.c:199
 #, c-format
 msgid "%s: new directory is not an absolute path in tablespace mapping: %s\n"
 msgstr "%s: diretório novo não é um caminho absoluto no mapeamento de tablespace: %s\n"
 
-#: pg_basebackup.c:231
+#: pg_basebackup.c:233
 #, c-format
 msgid ""
 "%s takes a base backup of a running PostgreSQL server.\n"
@@ -62,17 +62,17 @@
 "%s faz uma cópia de segurança base de um servidor PostgreSQL em execução.\n"
 "\n"
 
-#: pg_basebackup.c:233 pg_receivexlog.c:66 pg_recvlogical.c:69
+#: pg_basebackup.c:235 pg_receivexlog.c:66 pg_recvlogical.c:72
 #, c-format
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: pg_basebackup.c:234 pg_receivexlog.c:67 pg_recvlogical.c:70
+#: pg_basebackup.c:236 pg_receivexlog.c:67 pg_recvlogical.c:73
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPÇÃO]...\n"
 
-#: pg_basebackup.c:235
+#: pg_basebackup.c:237
 #, c-format
 msgid ""
 "\n"
@@ -81,17 +81,17 @@
 "\n"
 "Opções que controlam a saída:\n"
 
-#: pg_basebackup.c:236
+#: pg_basebackup.c:238
 #, 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:237
+#: pg_basebackup.c:239
 #, c-format
 msgid "  -F, --format=p|t       output format (plain (default), tar)\n"
 msgstr "  -F, --format=p|t       formato de saída (texto (padrão), tar)\n"
 
-#: pg_basebackup.c:238
+#: pg_basebackup.c:240
 #, c-format
 msgid ""
 "  -r, --max-rate=RATE    maximum transfer rate to transfer data directory\n"
@@ -100,16 +100,16 @@
 "  -r, --max-rate=TAXA    taxa de transferência máxima para enviar diretório de dados\n"
 "                         (em kB/s ou utilize sufixo \"k\" ou \"M\")\n"
 
-#: pg_basebackup.c:240
+#: pg_basebackup.c:242
 #, c-format
 msgid ""
 "  -R, --write-recovery-conf\n"
-"                         write recovery.conf after backup\n"
+"                         write recovery.conf for replication\n"
 msgstr ""
 "  -R, --write-recovery-conf\n"
-"                         escreve recovery.conf após cópia de segurança\n"
+"                         escreve recovery.conf para replicação\n"
 
-#: pg_basebackup.c:242
+#: pg_basebackup.c:244
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
@@ -118,12 +118,12 @@
 "  -T, --tablespace-mapping=DIRANTIGO=DIRNOVO\n"
 "                         realoca tablespace de DIRANTIGO para DIRNOVO\n"
 
-#: pg_basebackup.c:244
+#: pg_basebackup.c:246
 #, c-format
 msgid "  -x, --xlog             include required WAL files in backup (fetch mode)\n"
 msgstr "  -x, --xlog             inclui os arquivos do WAL requeridos na cópia de segurança (modo busca)\n"
 
-#: pg_basebackup.c:245
+#: pg_basebackup.c:247
 #, c-format
 msgid ""
 "  -X, --xlog-method=fetch|stream\n"
@@ -132,22 +132,22 @@
 "  -X, --xlog-method=fetch|stream\n"
 "                         inclui os arquivos do WAL requeridos na cópia de segurança\n"
 
-#: pg_basebackup.c:247
+#: pg_basebackup.c:249
 #, c-format
 msgid "      --xlogdir=XLOGDIR  location for the transaction log directory\n"
 msgstr "      --xlogdir=DIRXLOG  local do log de transação\n"
 
-#: pg_basebackup.c:248
+#: pg_basebackup.c:250
 #, c-format
 msgid "  -z, --gzip             compress tar output\n"
 msgstr "  -z, --gzip             comprime saída do tar\n"
 
-#: pg_basebackup.c:249
+#: pg_basebackup.c:251
 #, 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:250
+#: pg_basebackup.c:252
 #, c-format
 msgid ""
 "\n"
@@ -156,7 +156,7 @@
 "\n"
 "Opções gerais:\n"
 
-#: pg_basebackup.c:251
+#: pg_basebackup.c:253
 #, c-format
 msgid ""
 "  -c, --checkpoint=fast|spread\n"
@@ -165,32 +165,32 @@
 "  -c, --checkpoint=fast|spread\n"
 "                         define ponto de controle rápido ou distribuído\n"
 
-#: pg_basebackup.c:253
+#: pg_basebackup.c:255
 #, 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:254
+#: pg_basebackup.c:256
 #, c-format
 msgid "  -P, --progress         show progress information\n"
 msgstr "  -P, --progress         mostra informação de progresso\n"
 
-#: pg_basebackup.c:255 pg_receivexlog.c:76 pg_recvlogical.c:89
+#: pg_basebackup.c:257 pg_receivexlog.c:76 pg_recvlogical.c:92
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose          mostra mensagens de detalhe\n"
 
-#: pg_basebackup.c:256 pg_receivexlog.c:77 pg_recvlogical.c:90
+#: pg_basebackup.c:258 pg_receivexlog.c:77 pg_recvlogical.c:93
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          mostra informação sobre a versão e termina\n"
 
-#: pg_basebackup.c:257 pg_receivexlog.c:78 pg_recvlogical.c:91
+#: pg_basebackup.c:259 pg_receivexlog.c:78 pg_recvlogical.c:94
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             mostra essa ajuda e termina\n"
 
-#: pg_basebackup.c:258 pg_receivexlog.c:79 pg_recvlogical.c:92
+#: pg_basebackup.c:260 pg_receivexlog.c:79 pg_recvlogical.c:95
 #, c-format
 msgid ""
 "\n"
@@ -199,22 +199,22 @@
 "\n"
 "Opções de conexão:\n"
 
-#: pg_basebackup.c:259 pg_receivexlog.c:80
+#: pg_basebackup.c:261 pg_receivexlog.c:80
 #, c-format
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=TEXTO     cadeia de caracteres de conexão\n"
 
-#: pg_basebackup.c:260 pg_receivexlog.c:81 pg_recvlogical.c:94
+#: pg_basebackup.c:262 pg_receivexlog.c:81 pg_recvlogical.c:97
 #, 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:261 pg_receivexlog.c:82 pg_recvlogical.c:95
+#: pg_basebackup.c:263 pg_receivexlog.c:82 pg_recvlogical.c:98
 #, 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:262
+#: pg_basebackup.c:264
 #, c-format
 msgid ""
 "  -s, --status-interval=INTERVAL\n"
@@ -223,22 +223,22 @@
 "  -s, --status-interval=INTERVALO\n"
 "                         tempo entre envio de pacotes de status ao servidor (em segundos)\n"
 
-#: pg_basebackup.c:264 pg_receivexlog.c:83 pg_recvlogical.c:96
+#: pg_basebackup.c:266 pg_receivexlog.c:83 pg_recvlogical.c:99
 #, 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:265 pg_receivexlog.c:84 pg_recvlogical.c:97
+#: pg_basebackup.c:267 pg_receivexlog.c:84 pg_recvlogical.c:100
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password      nunca pergunta senha\n"
 
-#: pg_basebackup.c:266 pg_receivexlog.c:85 pg_recvlogical.c:98
+#: pg_basebackup.c:268 pg_receivexlog.c:85 pg_recvlogical.c:101
 #, c-format
 msgid "  -W, --password         force password prompt (should happen automatically)\n"
 msgstr "  -W, --password         pergunta senha (pode ocorrer automaticamente)\n"
 
-#: pg_basebackup.c:267 pg_receivexlog.c:89 pg_recvlogical.c:99
+#: pg_basebackup.c:269 pg_receivexlog.c:89 pg_recvlogical.c:102
 #, c-format
 msgid ""
 "\n"
@@ -247,198 +247,193 @@
 "\n"
 "Relate erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_basebackup.c:310
+#: pg_basebackup.c:312
 #, c-format
 msgid "%s: could not read from ready pipe: %s\n"
 msgstr "%s: não pôde ler do pipe: %s\n"
 
-#: pg_basebackup.c:318 pg_basebackup.c:411 pg_basebackup.c:1879
-#: streamutil.c:285
+#: pg_basebackup.c:320 pg_basebackup.c:413 pg_basebackup.c:1887
+#: streamutil.c:293
 #, c-format
 msgid "%s: could not parse transaction log location \"%s\"\n"
 msgstr "%s: não pôde validar local do log de transação \"%s\"\n"
 
-#: pg_basebackup.c:424
+#: pg_basebackup.c:426
 #, c-format
 msgid "%s: could not create pipe for background process: %s\n"
 msgstr "%s: não pôde criar pipe para processo em segundo plano: %s\n"
 
-#: pg_basebackup.c:449 pg_basebackup.c:504 pg_basebackup.c:1262
+#: pg_basebackup.c:451 pg_basebackup.c:506 pg_basebackup.c:1254
 #, 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:467
+#: pg_basebackup.c:469
 #, c-format
 msgid "%s: could not create background process: %s\n"
 msgstr "%s: não pôde criar processo em segundo plano: %s\n"
 
-#: pg_basebackup.c:479
+#: pg_basebackup.c:481
 #, c-format
 msgid "%s: could not create background thread: %s\n"
 msgstr "%s: não pôde criar thread em segundo plano: %s\n"
 
-#: pg_basebackup.c:523
+#: pg_basebackup.c:525
 #, 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:531
+#: pg_basebackup.c:533
 #, 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:593
+#: pg_basebackup.c:595
 #, c-format
 msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
 msgstr[0] "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgstr[1] "%*s/%s kB (100%%), %d/%d tablespaces %*s"
 
-#: pg_basebackup.c:605
+#: pg_basebackup.c:607
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
 msgstr[0] "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgstr[1] "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
 
-#: pg_basebackup.c:621
+#: pg_basebackup.c:623
 #, 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:643
+#: pg_basebackup.c:645
 #, c-format
 msgid "%s: transfer rate \"%s\" is not a valid value\n"
 msgstr "%s: taxa de transferência \"%s\" não é um valor válido\n"
 
-#: pg_basebackup.c:650
+#: pg_basebackup.c:652
 #, c-format
 msgid "%s: invalid transfer rate \"%s\": %s\n"
 msgstr "%s: taxa de transferência \"%s\" é inválida: %s\n"
 
-#: pg_basebackup.c:660
+#: pg_basebackup.c:662
 #, c-format
 msgid "%s: transfer rate must be greater than zero\n"
 msgstr "%s: taxa de transferência deve ser maior do que zero\n"
 
-#: pg_basebackup.c:694
+#: pg_basebackup.c:696
 #, c-format
 msgid "%s: invalid --max-rate unit: \"%s\"\n"
 msgstr "%s: unidade de --max-rate é inválida: \"%s\"\n"
 
-#: pg_basebackup.c:703
+#: pg_basebackup.c:705
 #, c-format
 msgid "%s: transfer rate \"%s\" exceeds integer range\n"
 msgstr "%s: taxa de transferência \"%s\" excede intervalo de inteiros\n"
 
-#: pg_basebackup.c:715
+#: pg_basebackup.c:717
 #, c-format
 msgid "%s: transfer rate \"%s\" is out of range\n"
 msgstr "%s: taxa de transferência \"%s\" está fora do intervalo\n"
 
-#: pg_basebackup.c:739
+#: pg_basebackup.c:741
 #, 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:749 pg_basebackup.c:1356 pg_basebackup.c:1574
+#: pg_basebackup.c:751 pg_basebackup.c:1348 pg_basebackup.c:1566
 #, 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:804 pg_basebackup.c:825 pg_basebackup.c:853
+#: pg_basebackup.c:806 pg_basebackup.c:827 pg_basebackup.c:855
 #, c-format
 msgid "%s: could not set compression level %d: %s\n"
 msgstr "%s: não pôde definir nível de compressão %d: %s\n"
 
-#: pg_basebackup.c:874
+#: pg_basebackup.c:876
 #, 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:885 pg_basebackup.c:1316 pg_basebackup.c:1567
+#: pg_basebackup.c:887 pg_basebackup.c:1308 pg_basebackup.c:1559
 #, 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:897 pg_basebackup.c:1161
+#: pg_basebackup.c:899 pg_basebackup.c:1163
 #, 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:954
+#: pg_basebackup.c:956
 #, c-format
 msgid "%s: could not close compressed file \"%s\": %s\n"
 msgstr "%s: não pôde fechar arquivo comprimido \"%s\": %s\n"
 
-#: pg_basebackup.c:967 pg_recvlogical.c:569 receivelog.c:213 receivelog.c:362
-#: receivelog.c:754
+#: pg_basebackup.c:969 pg_recvlogical.c:572 receivelog.c:216 receivelog.c:365
+#: receivelog.c:759
 #, c-format
 msgid "%s: could not close file \"%s\": %s\n"
 msgstr "%s: não pôde fechar arquivo \"%s\": %s\n"
 
-#: pg_basebackup.c:978 pg_basebackup.c:1190 pg_recvlogical.c:435
-#: receivelog.c:1044
+#: pg_basebackup.c:980 pg_basebackup.c:1192 pg_recvlogical.c:438
+#: receivelog.c:1049
 #, c-format
 msgid "%s: could not read COPY data: %s"
 msgstr "%s: não pôde ler dados do COPY: %s"
 
-#: pg_basebackup.c:1204
+#: pg_basebackup.c:1206
 #, c-format
 msgid "%s: invalid tar block header size: %d\n"
 msgstr "%s: tamanho do cabeçalho do bloco tar é inválido: %d\n"
 
-#: pg_basebackup.c:1212
-#, c-format
-msgid "%s: could not parse file size\n"
-msgstr "%s: não pôde obter tamanho do arquivo\n"
-
-#: pg_basebackup.c:1220
-#, c-format
-msgid "%s: could not parse file mode\n"
-msgstr "%s: não pôde obter modo do arquivo\n"
-
-#: pg_basebackup.c:1270
+#: pg_basebackup.c:1262
 #, 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:1294
+#: pg_basebackup.c:1286
 #, 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:1303
+#: pg_basebackup.c:1295
 #, c-format
 msgid "%s: unrecognized link indicator \"%c\"\n"
 msgstr "%s: indicador de link \"%c\" desconhecido\n"
 
-#: pg_basebackup.c:1323
+#: pg_basebackup.c:1315
 #, 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:1382
+#: pg_basebackup.c:1374
 #, 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:1468 pg_basebackup.c:1488 pg_basebackup.c:1495
-#: pg_basebackup.c:1542
+#: pg_basebackup.c:1460 pg_basebackup.c:1480 pg_basebackup.c:1487
+#: pg_basebackup.c:1534
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: sem memória\n"
 
-#: pg_basebackup.c:1619
+#: pg_basebackup.c:1611
 #, c-format
 msgid "%s: incompatible server version %s\n"
 msgstr "%s: versão do servidor %s é incompatível\n"
 
-#: pg_basebackup.c:1666 pg_recvlogical.c:261 receivelog.c:549 receivelog.c:600
-#: receivelog.c:641 streamutil.c:255 streamutil.c:353 streamutil.c:399
+#: pg_basebackup.c:1648
+#, c-format
+msgid "%s: initiating base backup, waiting for checkpoint to complete\n"
+msgstr "%s: iniciando cópia de segurança base, esperando concluir o ponto de controle\n"
+
+#: pg_basebackup.c:1666 pg_recvlogical.c:264 receivelog.c:554 receivelog.c:605
+#: receivelog.c:646 streamutil.c:263 streamutil.c:367 streamutil.c:413
 #, c-format
 msgid "%s: could not send replication command \"%s\": %s"
 msgstr "%s: não pôde enviar comando de replicação \"%s\": %s"
@@ -453,173 +448,178 @@
 msgid "%s: server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: servidor retornou resposta inesperada para comando BASE_BACKUP; recebeu %d registros e %d campos, esperado %d registros e %d campos\n"
 
-#: pg_basebackup.c:1704
+#: pg_basebackup.c:1692
+#, c-format
+msgid "%s: checkpoint completed\n"
+msgstr "%s: ponto de controle concluído\n"
+
+#: pg_basebackup.c:1707
 #, c-format
 msgid "transaction log start point: %s on timeline %u\n"
 msgstr "ponto de início do log de transação: %s na linha do tempo %u\n"
 
-#: pg_basebackup.c:1713
+#: pg_basebackup.c:1716
 #, 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:1719
+#: pg_basebackup.c:1722
 #, c-format
 msgid "%s: no data returned from server\n"
 msgstr "%s: nenhum dado foi retornado do servidor\n"
 
-#: pg_basebackup.c:1751
+#: pg_basebackup.c:1754
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %d\n"
 msgstr "%s: só pode escrever uma tablespace para saída padrão, banco de dados tem %d\n"
 
-#: pg_basebackup.c:1763
+#: pg_basebackup.c:1766
 #, c-format
 msgid "%s: starting background WAL receiver\n"
 msgstr "%s: iniciando receptor do WAL em segundo plano\n"
 
-#: pg_basebackup.c:1794
+#: pg_basebackup.c:1797
 #, c-format
 msgid "%s: could not get transaction log end position from server: %s"
 msgstr "%s: não pôde obter posição final do log de transação do servidor: %s"
 
-#: pg_basebackup.c:1801
+#: pg_basebackup.c:1804
 #, c-format
 msgid "%s: no transaction log end position returned from server\n"
 msgstr "%s: nenhuma posição final do log de transação foi retornada do servidor\n"
 
-#: pg_basebackup.c:1813
+#: pg_basebackup.c:1816
 #, c-format
 msgid "%s: final receive failed: %s"
 msgstr "%s: recepção final falhou: %s"
 
-#: pg_basebackup.c:1831
+#: pg_basebackup.c:1839
 #, c-format
 msgid "%s: waiting for background process to finish streaming ...\n"
 msgstr "%s: esperando processo em segundo plano terminar o envio ...\n"
 
-#: pg_basebackup.c:1837
+#: pg_basebackup.c:1845
 #, c-format
 msgid "%s: could not send command to background pipe: %s\n"
 msgstr "%s: não pôde enviar comando para pipe em segundo plano: %s\n"
 
-#: pg_basebackup.c:1846
+#: pg_basebackup.c:1854
 #, c-format
 msgid "%s: could not wait for child process: %s\n"
 msgstr "%s: não pôde esperar por processo filho: %s\n"
 
-#: pg_basebackup.c:1852
+#: pg_basebackup.c:1860
 #, c-format
 msgid "%s: child %d died, expected %d\n"
 msgstr "%s: processo filho %d morreu, esperado %d\n"
 
-#: pg_basebackup.c:1858
+#: pg_basebackup.c:1866
 #, c-format
 msgid "%s: child process did not exit normally\n"
 msgstr "%s: processo filho não terminou normalmente\n"
 
-#: pg_basebackup.c:1864
+#: pg_basebackup.c:1872
 #, c-format
 msgid "%s: child process exited with error %d\n"
 msgstr "%s: processo filho terminou com código de saída %d\n"
 
-#: pg_basebackup.c:1891
+#: pg_basebackup.c:1899
 #, c-format
 msgid "%s: could not wait for child thread: %s\n"
 msgstr "%s: não pôde esperar por thread filho: %s\n"
 
-#: pg_basebackup.c:1898
+#: pg_basebackup.c:1906
 #, c-format
 msgid "%s: could not get child thread exit status: %s\n"
 msgstr "%s: não pôde obter status de saída de thread filho: %s\n"
 
-#: pg_basebackup.c:1904
+#: pg_basebackup.c:1912
 #, c-format
 msgid "%s: child thread exited with error %u\n"
 msgstr "%s: thread filho terminou com erro %u\n"
 
-#: pg_basebackup.c:1993
+#: pg_basebackup.c:2001
 #, 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:2011 pg_basebackup.c:2023
+#: pg_basebackup.c:2019 pg_basebackup.c:2031
 #, c-format
 msgid "%s: cannot specify both --xlog and --xlog-method\n"
 msgstr "%s: não pode especificar ambas opções --xlog e --xlog-method\n"
 
-#: pg_basebackup.c:2038
+#: pg_basebackup.c:2046
 #, c-format
 msgid "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
 msgstr "%s: opção de xlog-method \"%s\" é inválida, deve ser \"fetch\" ou \"stream\"\n"
 
-#: pg_basebackup.c:2060
+#: pg_basebackup.c:2068
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
 msgstr "%s: nível de compressão \"%s\" é inválido\n"
 
-#: pg_basebackup.c:2072
+#: pg_basebackup.c:2080
 #, 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:2099 pg_receivexlog.c:439 pg_recvlogical.c:752
+#: pg_basebackup.c:2107 pg_receivexlog.c:439 pg_recvlogical.c:755
 #, c-format
 msgid "%s: invalid status interval \"%s\"\n"
 msgstr "%s: intervalo do status \"%s\" é inválido\n"
 
-#: pg_basebackup.c:2115 pg_basebackup.c:2129 pg_basebackup.c:2140
-#: pg_basebackup.c:2153 pg_basebackup.c:2163 pg_basebackup.c:2175
-#: pg_basebackup.c:2186 pg_receivexlog.c:471 pg_receivexlog.c:485
+#: pg_basebackup.c:2123 pg_basebackup.c:2137 pg_basebackup.c:2148
+#: pg_basebackup.c:2161 pg_basebackup.c:2171 pg_basebackup.c:2183
+#: pg_basebackup.c:2194 pg_receivexlog.c:471 pg_receivexlog.c:485
 #: pg_receivexlog.c:493 pg_receivexlog.c:503 pg_receivexlog.c:514
-#: pg_recvlogical.c:779 pg_recvlogical.c:793 pg_recvlogical.c:804
-#: pg_recvlogical.c:812 pg_recvlogical.c:820 pg_recvlogical.c:828
-#: pg_recvlogical.c:836 pg_recvlogical.c:844
+#: pg_recvlogical.c:782 pg_recvlogical.c:796 pg_recvlogical.c:807
+#: pg_recvlogical.c:815 pg_recvlogical.c:823 pg_recvlogical.c:831
+#: pg_recvlogical.c:839 pg_recvlogical.c:847
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: pg_basebackup.c:2127 pg_receivexlog.c:483 pg_recvlogical.c:791
+#: pg_basebackup.c:2135 pg_receivexlog.c:483 pg_recvlogical.c:794
 #, 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:2139 pg_receivexlog.c:513
+#: pg_basebackup.c:2147 pg_receivexlog.c:513
 #, c-format
 msgid "%s: no target directory specified\n"
 msgstr "%s: nenhum diretório de destino foi especificado\n"
 
-#: pg_basebackup.c:2151
+#: pg_basebackup.c:2159
 #, 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:2161
+#: pg_basebackup.c:2169
 #, c-format
 msgid "%s: WAL streaming can only be used in plain mode\n"
 msgstr "%s: envio do WAL só pode ser utilizado no modo plain\n"
 
-#: pg_basebackup.c:2173
+#: pg_basebackup.c:2181
 #, c-format
 msgid "%s: transaction log directory location can only be specified in plain mode\n"
 msgstr "%s: diretório do log de transação só pode ser especificado no modo plain\n"
 
-#: pg_basebackup.c:2184
+#: pg_basebackup.c:2192
 #, 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"
 
-#: pg_basebackup.c:2196
+#: pg_basebackup.c:2204
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s: esse programa binário não suporta compressão\n"
 
-#: pg_basebackup.c:2223
+#: pg_basebackup.c:2231
 #, 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"
 
-#: pg_basebackup.c:2228
+#: pg_basebackup.c:2236
 #, c-format
 msgid "%s: symlinks are not supported on this platform\n"
 msgstr "%s: links simbólicos não são suportados nessa plataforma\n"
@@ -633,7 +633,7 @@
 "%s recebe fluxo de logs de transação do PostgreSQL.\n"
 "\n"
 
-#: pg_receivexlog.c:68 pg_recvlogical.c:75
+#: pg_receivexlog.c:68 pg_recvlogical.c:78
 #, c-format
 msgid ""
 "\n"
@@ -647,17 +647,17 @@
 msgid "  -D, --directory=DIR    receive transaction log files into this directory\n"
 msgstr "  -D, --directory=DIR    recebe arquivos de log de transação neste diretório\n"
 
-#: pg_receivexlog.c:70 pg_recvlogical.c:79
+#: pg_receivexlog.c:70 pg_recvlogical.c:82
 #, c-format
 msgid "      --if-not-exists    do not error if slot already exists when creating a slot\n"
 msgstr "      --if-not-exists    não emite erro se a entrada já existe ao criar uma entrada\n"
 
-#: pg_receivexlog.c:71 pg_recvlogical.c:81
+#: pg_receivexlog.c:71 pg_recvlogical.c:84
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop          não tentar novamente ao perder a conexão\n"
 
-#: pg_receivexlog.c:72 pg_recvlogical.c:86
+#: pg_receivexlog.c:72 pg_recvlogical.c:89
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
@@ -685,12 +685,12 @@
 "\n"
 "Ações opcionais:\n"
 
-#: pg_receivexlog.c:87 pg_recvlogical.c:72
+#: pg_receivexlog.c:87 pg_recvlogical.c:75
 #, c-format
 msgid "      --create-slot      create a new replication slot (for the slot's name see --slot)\n"
 msgstr "      --create-slot      cria uma nova entrada de replicação (para nome da entrada veja --slot)\n"
 
-#: pg_receivexlog.c:88 pg_recvlogical.c:73
+#: pg_receivexlog.c:88 pg_recvlogical.c:76
 #, c-format
 msgid "      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"
 msgstr "      --drop-slot        remove a entrada de replicação (para nome da entrada veja --slot)\n"
@@ -720,7 +720,7 @@
 msgid "%s: could not close directory \"%s\": %s\n"
 msgstr "%s: não pôde fechar diretório \"%s\": %s\n"
 
-#: pg_receivexlog.c:218 pg_recvlogical.c:343
+#: pg_receivexlog.c:218 pg_recvlogical.c:346
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: não pôde executar stat no arquivo \"%s\": %s\n"
@@ -740,7 +740,7 @@
 msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
 msgstr "%s: iniciando fluxo de log em %X/%X (linha do tempo %u)\n"
 
-#: pg_receivexlog.c:420 pg_recvlogical.c:699
+#: pg_receivexlog.c:420 pg_recvlogical.c:702
 #, c-format
 msgid "%s: invalid port number \"%s\"\n"
 msgstr "%s: número de porta inválido: \"%s\"\n"
@@ -761,28 +761,28 @@
 msgid "%s: replication connection using slot \"%s\" is unexpectedly database specific\n"
 msgstr "%s: conexão de replicação utilizando entrada \"%s\" é inesperadamente específica a um banco de dados\n"
 
-#: pg_receivexlog.c:568 pg_recvlogical.c:884
+#: pg_receivexlog.c:568 pg_recvlogical.c:887
 #, c-format
 msgid "%s: dropping replication slot \"%s\"\n"
 msgstr "%s: removendo entrada de replicação \"%s\"\n"
 
-#: pg_receivexlog.c:581 pg_recvlogical.c:896
+#: pg_receivexlog.c:581 pg_recvlogical.c:899
 #, c-format
 msgid "%s: creating replication slot \"%s\"\n"
 msgstr "%s: criando entrada de replicação \"%s\"\n"
 
-#: pg_receivexlog.c:608 pg_recvlogical.c:922
+#: pg_receivexlog.c:608 pg_recvlogical.c:925
 #, c-format
 msgid "%s: disconnected\n"
 msgstr "%s: desconectado\n"
 
 #. translator: check source for value for %d
-#: pg_receivexlog.c:615 pg_recvlogical.c:929
+#: pg_receivexlog.c:615 pg_recvlogical.c:932
 #, c-format
 msgid "%s: disconnected; waiting %d seconds to try again\n"
 msgstr "%s: desconectado; esperando %d segundos para tentar novamente\n"
 
-#: pg_recvlogical.c:67
+#: pg_recvlogical.c:70
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
@@ -791,7 +791,7 @@
 "%s controla fluxos de replicação lógica do PostgreSQL.\n"
 "\n"
 
-#: pg_recvlogical.c:71
+#: pg_recvlogical.c:74
 #, c-format
 msgid ""
 "\n"
@@ -800,17 +800,17 @@
 "\n"
 "Ação a ser executada:\n"
 
-#: pg_recvlogical.c:74
+#: pg_recvlogical.c:77
 #, c-format
 msgid "      --start            start streaming in a replication slot (for the slot's name see --slot)\n"
 msgstr "      --start            inicia fluxo na entrada de replicação (para nome da entrada veja --slot)\n"
 
-#: pg_recvlogical.c:76
+#: pg_recvlogical.c:79
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr "  -f, --file=ARQUIVO     recebe log neste arquivo, - para saída padrão\n"
 
-#: pg_recvlogical.c:77
+#: pg_recvlogical.c:80
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
@@ -819,12 +819,12 @@
 "  -F, --fsync-interval=SEGS\n"
 "                         tempo entre fsyncs no arquivo de saída (padrão: %d)\n"
 
-#: pg_recvlogical.c:80
+#: pg_recvlogical.c:83
 #, c-format
 msgid "  -I, --startpos=LSN     where in an existing slot should the streaming start\n"
 msgstr "  -I, --startpos=LSN     onde o fluxo deve iniciar na entrada existente\n"
 
-#: pg_recvlogical.c:82
+#: pg_recvlogical.c:85
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -835,313 +835,313 @@
 "                         passa opção NOME com valor opcional VALOR para o\n"
 "                         plugin de saída\n"
 
-#: pg_recvlogical.c:85
+#: pg_recvlogical.c:88
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr "  -P, --plugin=PLUGIN    utiliza o plugin de saída PLUGIN (padrão: %s)\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:91
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
 msgstr "  -S, --slot=NOME        nome da entrada de replicação lógica\n"
 
-#: pg_recvlogical.c:93
+#: pg_recvlogical.c:96
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=NOMEBD    banco de dados ao qual quer se conectar\n"
 
-#: pg_recvlogical.c:126
+#: pg_recvlogical.c:129
 #, c-format
 msgid "%s: confirming write up to %X/%X, flush to %X/%X (slot %s)\n"
 msgstr "%s: confirmando escrita até %X/%X, escrita no disco até %X/%X (entrada %s)\n"
 
-#: pg_recvlogical.c:151 receivelog.c:415
+#: pg_recvlogical.c:154 receivelog.c:418
 #, c-format
 msgid "%s: could not send feedback packet: %s"
 msgstr "%s: não pôde enviar pacote de retorno: %s"
 
-#: pg_recvlogical.c:190
+#: pg_recvlogical.c:193
 #, c-format
 msgid "%s: could not fsync log file \"%s\": %s\n"
 msgstr "%s: não pôde executar fsync no arquivo de log \"%s\": %s\n"
 
-#: pg_recvlogical.c:229
+#: pg_recvlogical.c:232
 #, c-format
 msgid "%s: starting log streaming at %X/%X (slot %s)\n"
 msgstr "%s: iniciando fluxo de log em %X/%X (entrada %s)\n"
 
-#: pg_recvlogical.c:271
+#: pg_recvlogical.c:274
 #, c-format
 msgid "%s: streaming initiated\n"
 msgstr "%s: fluxo iniciado\n"
 
-#: pg_recvlogical.c:336
+#: pg_recvlogical.c:339
 #, 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"
 
-#: pg_recvlogical.c:412 receivelog.c:980
+#: pg_recvlogical.c:415 receivelog.c:985
 #, c-format
 msgid "%s: select() failed: %s\n"
 msgstr "%s: select() falhou: %s\n"
 
-#: pg_recvlogical.c:421 receivelog.c:1030
+#: pg_recvlogical.c:424 receivelog.c:1035
 #, c-format
 msgid "%s: could not receive data from WAL stream: %s"
 msgstr "%s: não pôde receber dados do fluxo do WAL: %s"
 
-#: pg_recvlogical.c:462 pg_recvlogical.c:501 receivelog.c:1075
-#: receivelog.c:1144
+#: pg_recvlogical.c:465 pg_recvlogical.c:504 receivelog.c:1080
+#: receivelog.c:1149
 #, c-format
 msgid "%s: streaming header too small: %d\n"
 msgstr "%s: cabeçalho de fluxo muito pequeno: %d\n"
 
-#: pg_recvlogical.c:484 receivelog.c:924
+#: pg_recvlogical.c:487 receivelog.c:929
 #, c-format
 msgid "%s: unrecognized streaming header: \"%c\"\n"
 msgstr "%s: cabeçalho de fluxo desconhecido: \"%c\"\n"
 
-#: pg_recvlogical.c:530 pg_recvlogical.c:544
+#: pg_recvlogical.c:533 pg_recvlogical.c:547
 #, c-format
 msgid "%s: could not write %u bytes to log file \"%s\": %s\n"
 msgstr "%s: não pôde escrever %u bytes no arquivo de log \"%s\": %s\n"
 
-#: pg_recvlogical.c:555 receivelog.c:707 receivelog.c:745
+#: pg_recvlogical.c:558 receivelog.c:712 receivelog.c:750
 #, c-format
 msgid "%s: unexpected termination of replication stream: %s"
 msgstr "%s: término inesperado do fluxo de replicação: %s"
 
-#: pg_recvlogical.c:678
+#: pg_recvlogical.c:681
 #, c-format
 msgid "%s: invalid fsync interval \"%s\"\n"
 msgstr "%s: intervalo de fsync \"%s\" é inválido\n"
 
-#: pg_recvlogical.c:719
+#: pg_recvlogical.c:722
 #, c-format
 msgid "%s: could not parse start position \"%s\"\n"
 msgstr "%s: não pôde validar posição inicial \"%s\"\n"
 
-#: pg_recvlogical.c:803
+#: pg_recvlogical.c:806
 #, c-format
 msgid "%s: no slot specified\n"
 msgstr "%s: nenhuma entrada especificada\n"
 
-#: pg_recvlogical.c:811
+#: pg_recvlogical.c:814
 #, c-format
 msgid "%s: no target file specified\n"
 msgstr "%s: nenhum arquivo de destino foi especificado\n"
 
-#: pg_recvlogical.c:819
+#: pg_recvlogical.c:822
 #, c-format
 msgid "%s: no database specified\n"
 msgstr "%s: nenhum banco de dados especificado\n"
 
-#: pg_recvlogical.c:827
+#: pg_recvlogical.c:830
 #, c-format
 msgid "%s: at least one action needs to be specified\n"
 msgstr "%s: pelo menos uma ação precisa ser especificada\n"
 
-#: pg_recvlogical.c:835
+#: pg_recvlogical.c:838
 #, c-format
 msgid "%s: cannot use --create-slot or --start together with --drop-slot\n"
 msgstr "%s: não pode utilizar --create-slot ou --start junto com --drop-slot\n"
 
-#: pg_recvlogical.c:843
+#: pg_recvlogical.c:846
 #, c-format
 msgid "%s: cannot use --create-slot or --drop-slot together with --startpos\n"
 msgstr "%s: não pode utilizar --create-slot ou --drop-slot junto com --startpos\n"
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:877
 #, c-format
 msgid "%s: could not establish database-specific replication connection\n"
 msgstr "%s: não pôde estabelecer conexão de replicação a um banco de dados específico\n"
 
-#: receivelog.c:75
+#: receivelog.c:78
 #, c-format
 msgid "%s: could not create archive status file \"%s\": %s\n"
 msgstr "%s: não pôde criar arquivo de status do arquivador \"%s\": %s\n"
 
-#: receivelog.c:82 receivelog.c:206 receivelog.c:355 receivelog.c:848
-#: receivelog.c:1096
+#: receivelog.c:85 receivelog.c:209 receivelog.c:358 receivelog.c:853
+#: receivelog.c:1101
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: não pôde executar fsync no arquivo \"%s\": %s\n"
 
-#: receivelog.c:121
+#: receivelog.c:124
 #, c-format
 msgid "%s: could not open transaction log file \"%s\": %s\n"
 msgstr "%s: não pôde abrir arquivo de log de transação \"%s\": %s\n"
 
-#: receivelog.c:133
+#: receivelog.c:136
 #, c-format
 msgid "%s: could not stat transaction log file \"%s\": %s\n"
 msgstr "%s: não pôde executar stat no arquivo de log de transação \"%s\": %s\n"
 
-#: receivelog.c:147
+#: receivelog.c:150
 #, c-format
 msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
 msgstr "%s: arquivo de log de transação \"%s\" tem %d bytes, deveria ser 0 ou %d\n"
 
-#: receivelog.c:160
+#: receivelog.c:163
 #, c-format
 msgid "%s: could not pad transaction log file \"%s\": %s\n"
 msgstr "%s: não pôde preencher arquivo de log de transação \"%s\": %s\n"
 
-#: receivelog.c:173
+#: receivelog.c:176
 #, c-format
 msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
 msgstr "%s: não pôde buscar início do arquivo de log de transação \"%s\": %s\n"
 
-#: receivelog.c:199
+#: receivelog.c:202
 #, c-format
 msgid "%s: could not determine seek position in file \"%s\": %s\n"
 msgstr "%s: não pôde determinar posição de busca no arquivo \"%s\": %s\n"
 
-#: receivelog.c:232
+#: receivelog.c:235
 #, c-format
 msgid "%s: could not rename file \"%s\": %s\n"
 msgstr "%s: não pôde renomear arquivo \"%s\": %s\n"
 
-#: receivelog.c:239
+#: receivelog.c:242
 #, c-format
 msgid "%s: not renaming \"%s%s\", segment is not complete\n"
 msgstr "%s: não renomeará \"%s%s\", segmento não está completo\n"
 
-#: receivelog.c:285
+#: receivelog.c:288
 #, c-format
 msgid "%s: could not open timeline history file \"%s\": %s\n"
 msgstr "%s: não pôde abrir arquivo de histórico da linha do tempo \"%s\": %s\n"
 
-#: receivelog.c:313
+#: receivelog.c:316
 #, c-format
 msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
 msgstr "%s: servidor relatou nome de arquivo de histórico inesperado para linha do tempo %u: %s\n"
 
-#: receivelog.c:330
+#: receivelog.c:333
 #, c-format
 msgid "%s: could not create timeline history file \"%s\": %s\n"
 msgstr "%s: não pôde criar arquivo de histórico da linha do tempo \"%s\": %s\n"
 
-#: receivelog.c:347
+#: receivelog.c:350
 #, c-format
 msgid "%s: could not write timeline history file \"%s\": %s\n"
 msgstr "%s: não pôde escrever no arquivo de histórico da linha do tempo \"%s\": %s\n"
 
-#: receivelog.c:372
+#: receivelog.c:375
 #, c-format
 msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
 msgstr "%s: não pôde renomear arquivo \"%s\" para \"%s\": %s\n"
 
-#: receivelog.c:449
+#: receivelog.c:452
 #, c-format
 msgid "%s: incompatible server version %s; client does not support streaming from server versions older than %s\n"
 msgstr "%s: versão do servidor %s é incompatível; cliente não suporta fluxo de versões do servidor mais antigas do que %s\n"
 
-#: receivelog.c:459
+#: receivelog.c:462
 #, c-format
 msgid "%s: incompatible server version %s; client does not support streaming from server versions newer than %s\n"
 msgstr "%s: versão do servidor %s é incompatível; cliente não suporta fluxo de versões do servidor mais novas do que %s\n"
 
-#: receivelog.c:557 streamutil.c:264 streamutil.c:299
+#: receivelog.c:562 streamutil.c:272 streamutil.c:311
 #, c-format
 msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields\n"
 msgstr "%s: não pôde identificar sistema: recebeu %d registros e %d campos, esperado %d registros e %d ou mais campos\n"
 
-#: receivelog.c:565
+#: receivelog.c:570
 #, c-format
 msgid "%s: system identifier does not match between base backup and streaming connection\n"
 msgstr "%s: identificador do sistema não corresponde entre cópia base e conexão de envio do WAL\n"
 
-#: receivelog.c:573
+#: receivelog.c:578
 #, c-format
 msgid "%s: starting timeline %u is not present in the server\n"
 msgstr "%s: linha do tempo inicial %u não está presente no servidor\n"
 
-#: receivelog.c:613
+#: receivelog.c:618
 #, c-format
 msgid "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: resposta inesperada para comando TIMELINE_HISTORY: recebeu %d registros e %d campos, esperado %d registros e %d campos\n"
 
-#: receivelog.c:688
+#: receivelog.c:693
 #, c-format
 msgid "%s: server reported unexpected next timeline %u, following timeline %u\n"
 msgstr "%s: servidor relatou próxima linha do tempo %u inesperada, seguindo linha do tempo %u\n"
 
-#: receivelog.c:695
+#: receivelog.c:700
 #, c-format
 msgid "%s: server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X\n"
 msgstr "%s: servidor parou de enviar linha do tempo %u em %X/%X, mas relatou próxima linha do tempo %u começando em %X/%X\n"
 
-#: receivelog.c:736
+#: receivelog.c:741
 #, c-format
 msgid "%s: replication stream was terminated before stop point\n"
 msgstr "%s: fluxo de replicação foi terminado antes do ponto de parada\n"
 
-#: receivelog.c:785
+#: receivelog.c:790
 #, c-format
 msgid "%s: unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: conjunto de resultados inesperado após fim da linha do tempo: recebeu %d registros e %d campos, esperado %d registros e %d campos\n"
 
-#: receivelog.c:795
+#: receivelog.c:800
 #, c-format
 msgid "%s: could not parse next timeline's starting point \"%s\"\n"
 msgstr "%s: não pôde validar ponto de partida da próxima linha do tempo \"%s\"\n"
 
-#: receivelog.c:959
+#: receivelog.c:964
 #, c-format
 msgid "%s: socket not open"
 msgstr "%s: soquete não está aberto"
 
-#: receivelog.c:1163
+#: receivelog.c:1168
 #, c-format
 msgid "%s: received transaction log record for offset %u with no file open\n"
 msgstr "%s: recebeu registro do log de transação para posição %u sem um arquivo aberto\n"
 
-#: receivelog.c:1175
+#: receivelog.c:1180
 #, c-format
 msgid "%s: got WAL data offset %08x, expected %08x\n"
 msgstr "%s: recebeu dados do WAL da posição %08x, esperada %08x\n"
 
-#: receivelog.c:1212
+#: receivelog.c:1217
 #, c-format
 msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
 msgstr "%s: não pôde escrever %u bytes no arquivo do WAL \"%s\": %s\n"
 
-#: receivelog.c:1237 receivelog.c:1279 receivelog.c:1311
+#: receivelog.c:1242 receivelog.c:1284 receivelog.c:1316
 #, c-format
 msgid "%s: could not send copy-end packet: %s"
 msgstr "%s: não pôde enviar pacote indicando fim de cópia: %s"
 
-#: streamutil.c:145
+#: streamutil.c:153
 msgid "Password: "
 msgstr "Senha: "
 
-#: streamutil.c:169
+#: streamutil.c:177
 #, c-format
 msgid "%s: could not connect to server\n"
 msgstr "%s: não pôde se conectar ao servidor\n"
 
-#: streamutil.c:187
+#: streamutil.c:195
 #, c-format
 msgid "%s: could not connect to server: %s"
 msgstr "%s: não pôde se conectar ao servidor: %s"
 
-#: streamutil.c:211
+#: streamutil.c:219
 #, c-format
 msgid "%s: could not determine server setting for integer_datetimes\n"
 msgstr "%s: não pôde determinar valor do parâmetro integer_datetimes do servidor\n"
 
-#: streamutil.c:224
+#: streamutil.c:232
 #, c-format
 msgid "%s: integer_datetimes compile flag does not match server\n"
 msgstr "%s: opção de compilação integer_datetimes não corresponde com a do servidor\n"
 
-#: streamutil.c:365
+#: streamutil.c:379
 #, c-format
 msgid "%s: could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: não pôde criar entrada de replicação \"%s\": recebeu %d registros e %d campos, esperado %d registros e %d campos\n"
 
-#: streamutil.c:410
+#: streamutil.c:424
 #, c-format
 msgid "%s: could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
 msgstr "%s: não pôde remover entrada de replicação \"%s\": recebeu %d registros e %d campos, esperado %d registros e %d campos\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/ru.po postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/ru.po
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,29 +1,22 @@
 # Russian message translation file for pg_basebackup
-# Copyright (C) 2012 PostgreSQL Global Development Group
-# Copyright (c) 2012-2013 Alexander Lakhin <exclusion@gmail.com>
+# Copyright (C) 2012-2016 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# ChangeLog:
-#   - August 24, 2014: Updates for 9.4. Alexander Lakhin <exclusion@gmail.com>.
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 17, 2012: Complete translation for 9.1, Alexander Lakhin <exclusion@gmail.com>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: pg_basebackup (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-09-19 03:13+0000\n"
-"PO-Revision-Date: 2015-10-16 16:12+0400\n"
-"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"POT-Creation-Date: 2017-05-26 20:50+0000\n"
+"PO-Revision-Date: 2017-05-27 16:06+0300\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 2.0\n"
+"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98
@@ -36,17 +29,17 @@
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублировани� нулевого указател� (внутренн�� ошибка)\n"
 
-#: pg_basebackup.c:154
+#: pg_basebackup.c:156
 #, c-format
 msgid "%s: directory name too long\n"
 msgstr "%s: �лишком длинное им� каталога\n"
 
-#: pg_basebackup.c:164
+#: pg_basebackup.c:166
 #, c-format
 msgid "%s: multiple \"=\" signs in tablespace mapping\n"
 msgstr "%s: не�колько знаков \"=\" в �опо�тавлении табличного про�тран�тва\n"
 
-#: pg_basebackup.c:177
+#: pg_basebackup.c:179
 #, c-format
 msgid ""
 "%s: invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\"\n"
@@ -54,21 +47,21 @@
 "%s: �опо�тавление табл. про�тран�тва запи�ано неверно: \"%s\", должно быть "
 "\"СТ�РЫЙ_К�Т�ЛОГ=�ОВЫЙ_К�Т�ЛОГ\"\n"
 
-#: pg_basebackup.c:190
+#: pg_basebackup.c:192
 #, c-format
 msgid "%s: old directory is not an absolute path in tablespace mapping: %s\n"
 msgstr ""
 "%s: �тарый каталог в �опо�тавлении табл. про�тран�тва задан не аб�олютным "
 "путём: %s\n"
 
-#: pg_basebackup.c:197
+#: pg_basebackup.c:199
 #, c-format
 msgid "%s: new directory is not an absolute path in tablespace mapping: %s\n"
 msgstr ""
 "%s: новый каталог в �опо�тавлении табл. про�тран�тва задан не аб�олютным "
 "путём: %s\n"
 
-#: pg_basebackup.c:231
+#: pg_basebackup.c:233
 #, c-format
 msgid ""
 "%s takes a base backup of a running PostgreSQL server.\n"
@@ -77,17 +70,17 @@
 "%s делает базовую резервную копию работающего �ервера PostgreSQL.\n"
 "\n"
 
-#: pg_basebackup.c:233 pg_receivexlog.c:66 pg_recvlogical.c:69
+#: pg_basebackup.c:235 pg_receivexlog.c:66 pg_recvlogical.c:72
 #, c-format
 msgid "Usage:\n"
 msgstr "И�пользование:\n"
 
-#: pg_basebackup.c:234 pg_receivexlog.c:67 pg_recvlogical.c:70
+#: pg_basebackup.c:236 pg_receivexlog.c:67 pg_recvlogical.c:73
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [П�Р�МЕТР]...\n"
 
-#: pg_basebackup.c:235
+#: pg_basebackup.c:237
 #, c-format
 msgid ""
 "\n"
@@ -96,19 +89,19 @@
 "\n"
 "Параметры, управл�ющие выводом:\n"
 
-#: pg_basebackup.c:236
+#: pg_basebackup.c:238
 #, c-format
 msgid "  -D, --pgdata=DIRECTORY receive base backup into directory\n"
 msgstr "  -D, --pgdata=К�Т�ЛОГ   �охранить базовую копию в указанный каталог\n"
 
-#: pg_basebackup.c:237
+#: pg_basebackup.c:239
 #, c-format
 msgid "  -F, --format=p|t       output format (plain (default), tar)\n"
 msgstr ""
 "  -F, --format=p|t       формат вывода (p (по умолчанию) - про�той, t - "
 "tar)\n"
 
-#: pg_basebackup.c:238
+#: pg_basebackup.c:240
 #, c-format
 msgid ""
 "  -r, --max-rate=RATE    maximum transfer rate to transfer data directory\n"
@@ -117,21 +110,16 @@
 "  -r, --max-rate=СКОРОСТЬ мак�. �коро�ть передачи данных в целевой каталог\n"
 "                         (в КБ/�, либо добавьте �уффик� \"k\" или \"M\")\n"
 
-#: pg_basebackup.c:240
+#: pg_basebackup.c:242
 #, c-format
 msgid ""
 "  -R, --write-recovery-conf\n"
-"                         write recovery.conf after backup\n"
+"                         write recovery.conf for replication\n"
 msgstr ""
 "  -R, --write-recovery-conf\n"
-"                         запи�ать recovery.conf по�ле копировани�\n"
+"                         запи�ать recovery.conf дл� репликации\n"
 
-#: pg_basebackup.c:242 pg_receivexlog.c:74
-#, c-format
-msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
-msgstr "  -S, --slot=ИМЯ_СЛОТ�   и�пользовать заданный �лот репликации\n"
-
-#: pg_basebackup.c:243
+#: pg_basebackup.c:244
 #, c-format
 msgid ""
 "  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
@@ -142,14 +130,14 @@
 "каталога\n"
 "                         в новый\n"
 
-#: pg_basebackup.c:245
+#: pg_basebackup.c:246
 #, c-format
 msgid ""
 "  -x, --xlog             include required WAL files in backup (fetch mode)\n"
 msgstr ""
 "  -x, --xlog             включить в копию требуемые файлы WAL (режим fetch)\n"
 
-#: pg_basebackup.c:246
+#: pg_basebackup.c:247
 #, c-format
 msgid ""
 "  -X, --xlog-method=fetch|stream\n"
@@ -159,25 +147,25 @@
 "                         включить в копию требуемые файлы WAL, и�пользу�\n"
 "                         заданный метод\n"
 
-#: pg_basebackup.c:248
+#: pg_basebackup.c:249
 #, c-format
 msgid "      --xlogdir=XLOGDIR  location for the transaction log directory\n"
 msgstr ""
 "      --xlogdir=К�Т�ЛОГ_XLOG\n"
 "                         ра�положение каталога � журналом транзакций\n"
 
-#: pg_basebackup.c:249
+#: pg_basebackup.c:250
 #, c-format
 msgid "  -z, --gzip             compress tar output\n"
 msgstr "  -z, --gzip             �жать выходной tar\n"
 
-#: pg_basebackup.c:250
+#: pg_basebackup.c:251
 #, c-format
 msgid ""
 "  -Z, --compress=0-9     compress tar output with given compression level\n"
 msgstr "  -Z, --compress=0-9     у�тановить уровень �жати� выходного архива\n"
 
-#: pg_basebackup.c:251
+#: pg_basebackup.c:252
 #, c-format
 msgid ""
 "\n"
@@ -186,7 +174,7 @@
 "\n"
 "Общие параметры:\n"
 
-#: pg_basebackup.c:252
+#: pg_basebackup.c:253
 #, c-format
 msgid ""
 "  -c, --checkpoint=fast|spread\n"
@@ -195,32 +183,32 @@
 "  -c, --checkpoint=fast|spread\n"
 "                         режим бы�трых или ра�пределённых контрольных точек\n"
 
-#: pg_basebackup.c:254
+#: pg_basebackup.c:255
 #, c-format
 msgid "  -l, --label=LABEL      set backup label\n"
 msgstr "  -l, --label=МЕТК�      у�тановить метку резервной копии\n"
 
-#: pg_basebackup.c:255
+#: pg_basebackup.c:256
 #, c-format
 msgid "  -P, --progress         show progress information\n"
 msgstr "  -P, --progress         показывать прогре�� операции\n"
 
-#: pg_basebackup.c:256 pg_receivexlog.c:76 pg_recvlogical.c:89
+#: pg_basebackup.c:257 pg_receivexlog.c:76 pg_recvlogical.c:92
 #, c-format
 msgid "  -v, --verbose          output verbose messages\n"
 msgstr "  -v, --verbose          выводить подробные �ообщени�\n"
 
-#: pg_basebackup.c:257 pg_receivexlog.c:77 pg_recvlogical.c:90
+#: pg_basebackup.c:258 pg_receivexlog.c:77 pg_recvlogical.c:93
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          показать вер�ию и выйти\n"
 
-#: pg_basebackup.c:258 pg_receivexlog.c:78 pg_recvlogical.c:91
+#: pg_basebackup.c:259 pg_receivexlog.c:78 pg_recvlogical.c:94
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             показать �ту �правку и выйти\n"
 
-#: pg_basebackup.c:259 pg_receivexlog.c:79 pg_recvlogical.c:92
+#: pg_basebackup.c:260 pg_receivexlog.c:79 pg_recvlogical.c:95
 #, c-format
 msgid ""
 "\n"
@@ -229,22 +217,22 @@
 "\n"
 "Параметры подключени�:\n"
 
-#: pg_basebackup.c:260 pg_receivexlog.c:80
+#: pg_basebackup.c:261 pg_receivexlog.c:80
 #, c-format
 msgid "  -d, --dbname=CONNSTR   connection string\n"
 msgstr "  -d, --dbname=СТРОК�    �трока подключени�\n"
 
-#: pg_basebackup.c:261 pg_receivexlog.c:81 pg_recvlogical.c:94
+#: pg_basebackup.c:262 pg_receivexlog.c:81 pg_recvlogical.c:97
 #, c-format
 msgid "  -h, --host=HOSTNAME    database server host or socket directory\n"
 msgstr "  -h, --host=ИМЯ         им� �ервера баз данных или каталог �окетов\n"
 
-#: pg_basebackup.c:262 pg_receivexlog.c:82 pg_recvlogical.c:95
+#: pg_basebackup.c:263 pg_receivexlog.c:82 pg_recvlogical.c:98
 #, c-format
 msgid "  -p, --port=PORT        database server port number\n"
 msgstr "  -p, --port=ПОРТ        номер порта �ервера БД\n"
 
-#: pg_basebackup.c:263
+#: pg_basebackup.c:264
 #, c-format
 msgid ""
 "  -s, --status-interval=INTERVAL\n"
@@ -255,19 +243,19 @@
 "                         интервал между передаваемыми �ерверу\n"
 "                         пакетами �о�то�ни� (в �екундах)\n"
 
-#: pg_basebackup.c:265 pg_receivexlog.c:83 pg_recvlogical.c:96
+#: pg_basebackup.c:266 pg_receivexlog.c:83 pg_recvlogical.c:99
 #, c-format
 msgid "  -U, --username=NAME    connect as specified database user\n"
 msgstr ""
 "  -U, --username=NAME    connect as specified database user\n"
 "  -U, --username=ИМЯ     им� пользовател� баз данных\n"
 
-#: pg_basebackup.c:266 pg_receivexlog.c:84 pg_recvlogical.c:97
+#: pg_basebackup.c:267 pg_receivexlog.c:84 pg_recvlogical.c:100
 #, c-format
 msgid "  -w, --no-password      never prompt for password\n"
 msgstr "  -w, --no-password      не запрашивать пароль\n"
 
-#: pg_basebackup.c:267 pg_receivexlog.c:85 pg_recvlogical.c:98
+#: pg_basebackup.c:268 pg_receivexlog.c:85 pg_recvlogical.c:101
 #, c-format
 msgid ""
 "  -W, --password         force password prompt (should happen "
@@ -275,7 +263,7 @@
 msgstr ""
 "  -W, --password         запрашивать пароль в�егда (обычно не требует��)\n"
 
-#: pg_basebackup.c:268 pg_receivexlog.c:89 pg_recvlogical.c:99
+#: pg_basebackup.c:269 pg_receivexlog.c:89 pg_recvlogical.c:102
 #, c-format
 msgid ""
 "\n"
@@ -284,48 +272,48 @@
 "\n"
 "Об ошибках �ообщайте по адре�у <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_basebackup.c:311
+#: pg_basebackup.c:312
 #, c-format
 msgid "%s: could not read from ready pipe: %s\n"
 msgstr "%s: не удало�ь прочитать из готового канала: %s\n"
 
-#: pg_basebackup.c:319 pg_basebackup.c:412 pg_basebackup.c:1887
-#: streamutil.c:285
+#: pg_basebackup.c:320 pg_basebackup.c:413 pg_basebackup.c:1887
+#: streamutil.c:293
 #, c-format
 msgid "%s: could not parse transaction log location \"%s\"\n"
 msgstr "%s: не удало�ь разобрать положение в журнале транзакций \"%s\"\n"
 
-#: pg_basebackup.c:425
+#: pg_basebackup.c:426
 #, c-format
 msgid "%s: could not create pipe for background process: %s\n"
 msgstr "%s: не удало�ь �оздать канал дл� фонового проце��а: %s\n"
 
-#: pg_basebackup.c:450 pg_basebackup.c:505 pg_basebackup.c:1263
+#: pg_basebackup.c:451 pg_basebackup.c:506 pg_basebackup.c:1254
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: не удало�ь �оздать каталог \"%s\": %s\n"
 
-#: pg_basebackup.c:468
+#: pg_basebackup.c:469
 #, c-format
 msgid "%s: could not create background process: %s\n"
 msgstr "%s: не удало�ь �оздать фоновый проце��: %s\n"
 
-#: pg_basebackup.c:480
+#: pg_basebackup.c:481
 #, c-format
 msgid "%s: could not create background thread: %s\n"
 msgstr "%s: не удало�ь �оздать фоновый поток выполнени�: %s\n"
 
-#: pg_basebackup.c:524
+#: pg_basebackup.c:525
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: каталог \"%s\" �уще�твует, но он не пу�т\n"
 
-#: pg_basebackup.c:532
+#: pg_basebackup.c:533
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: нет до�тупа к каталогу \"%s\": %s\n"
 
-#: pg_basebackup.c:594
+#: pg_basebackup.c:595
 #, c-format
 msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
 msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
@@ -333,7 +321,7 @@
 msgstr[1] "%*s/%s КБ (100%%), табличное про�тран�тво %d/%d %*s"
 msgstr[2] "%*s/%s КБ (100%%), табличное про�тран�тво %d/%d %*s"
 
-#: pg_basebackup.c:606
+#: pg_basebackup.c:607
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
@@ -341,7 +329,7 @@
 msgstr[1] "%*s/%s КБ (%d%%), табличное про�тран�тво %d/%d (%s%-*.*s)"
 msgstr[2] "%*s/%s КБ (%d%%), табличное про�тран�тво %d/%d (%s%-*.*s)"
 
-#: pg_basebackup.c:622
+#: pg_basebackup.c:623
 #, c-format
 msgid "%*s/%s kB (%d%%), %d/%d tablespace"
 msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces"
@@ -349,146 +337,143 @@
 msgstr[1] "%*s/%s КБ (%d%%), табличное про�тран�тво %d/%d"
 msgstr[2] "%*s/%s КБ (%d%%), табличное про�тран�тво %d/%d"
 
-#: pg_basebackup.c:644
+#: pg_basebackup.c:645
 #, c-format
 msgid "%s: transfer rate \"%s\" is not a valid value\n"
 msgstr "%s: неверное значение (\"%s\") дл� �коро�ти передачи данных\n"
 
-#: pg_basebackup.c:651
+#: pg_basebackup.c:652
 #, c-format
 msgid "%s: invalid transfer rate \"%s\": %s\n"
 msgstr "%s: неверна� �коро�ть передачи данных \"%s\": %s\n"
 
-#: pg_basebackup.c:661
+#: pg_basebackup.c:662
 #, c-format
 msgid "%s: transfer rate must be greater than zero\n"
 msgstr "%s: �коро�ть передачи должна быть больше 0\n"
 
-#: pg_basebackup.c:695
+#: pg_basebackup.c:696
 #, c-format
 msgid "%s: invalid --max-rate unit: \"%s\"\n"
 msgstr "%s: неверна� единица измерени� в --max-rate: \"%s\"\n"
 
-#: pg_basebackup.c:704
+#: pg_basebackup.c:705
 #, c-format
 msgid "%s: transfer rate \"%s\" exceeds integer range\n"
 msgstr "%s: �коро�ть передачи \"%s\" вне целочи�ленного диапазона\n"
 
-#: pg_basebackup.c:716
+#: pg_basebackup.c:717
 #, c-format
 msgid "%s: transfer rate \"%s\" is out of range\n"
 msgstr "%s: �коро�ть передачи \"%s\" вне диапазона\n"
 
-#: pg_basebackup.c:740
+#: pg_basebackup.c:741
 #, c-format
 msgid "%s: could not write to compressed file \"%s\": %s\n"
 msgstr "%s: не удало�ь запи�ать файл �жатого архива \"%s\": %s\n"
 
-#: pg_basebackup.c:750 pg_basebackup.c:1357 pg_basebackup.c:1582
+#: pg_basebackup.c:751 pg_basebackup.c:1348 pg_basebackup.c:1566
 #, c-format
 msgid "%s: could not write to file \"%s\": %s\n"
 msgstr "%s: не удало�ь запи�ать файл \"%s\": %s\n"
 
-#: pg_basebackup.c:805 pg_basebackup.c:826 pg_basebackup.c:854
+#: pg_basebackup.c:806 pg_basebackup.c:827 pg_basebackup.c:855
 #, c-format
 msgid "%s: could not set compression level %d: %s\n"
 msgstr "%s: не удало�ь у�тановить уровень �жати� %d: %s\n"
 
-#: pg_basebackup.c:875
+#: pg_basebackup.c:876
 #, c-format
 msgid "%s: could not create compressed file \"%s\": %s\n"
 msgstr "%s: не удало�ь �оздать файл �жатого архива \"%s\": %s\n"
 
-#: pg_basebackup.c:886 pg_basebackup.c:1317 pg_basebackup.c:1575
+#: pg_basebackup.c:887 pg_basebackup.c:1308 pg_basebackup.c:1559
 #, c-format
 msgid "%s: could not create file \"%s\": %s\n"
 msgstr "%s: не удало�ь �оздать файл \"%s\": %s\n"
 
-#: pg_basebackup.c:898 pg_basebackup.c:1162
+#: pg_basebackup.c:899 pg_basebackup.c:1163
 #, c-format
 msgid "%s: could not get COPY data stream: %s"
 msgstr "%s: не удало�ь получить поток данных COPY: %s"
 
-#: pg_basebackup.c:955
+#: pg_basebackup.c:956
 #, c-format
 msgid "%s: could not close compressed file \"%s\": %s\n"
 msgstr "%s: не удало�ь закрыть �жатый файл \"%s\": %s\n"
 
-#: pg_basebackup.c:968 pg_recvlogical.c:569 receivelog.c:213 receivelog.c:362
-#: receivelog.c:754
+#: pg_basebackup.c:969 pg_recvlogical.c:572 receivelog.c:216 receivelog.c:365
+#: receivelog.c:759
 #, c-format
 msgid "%s: could not close file \"%s\": %s\n"
 msgstr "%s: не удало�ь закрыть файл \"%s\": %s\n"
 
-#: pg_basebackup.c:979 pg_basebackup.c:1191 pg_recvlogical.c:435
-#: receivelog.c:1044
+#: pg_basebackup.c:980 pg_basebackup.c:1192 pg_recvlogical.c:438
+#: receivelog.c:1049
 #, c-format
 msgid "%s: could not read COPY data: %s"
 msgstr "%s: не удало�ь прочитать данные COPY: %s"
 
-#: pg_basebackup.c:1205
+#: pg_basebackup.c:1206
 #, c-format
 msgid "%s: invalid tar block header size: %d\n"
 msgstr "%s: неверный размер заголовка блока tar: %d\n"
 
-#: pg_basebackup.c:1213
-#, c-format
-msgid "%s: could not parse file size\n"
-msgstr "%s: не удало�ь разобрать размер файла\n"
-
-#: pg_basebackup.c:1221
-#, c-format
-msgid "%s: could not parse file mode\n"
-msgstr "%s: не удало�ь разобрать режим файла\n"
-
-#: pg_basebackup.c:1271
+#: pg_basebackup.c:1262
 #, c-format
 msgid "%s: could not set permissions on directory \"%s\": %s\n"
 msgstr "%s: не удало�ь у�тановить права дл� каталога \"%s\": %s\n"
 
-#: pg_basebackup.c:1295
+#: pg_basebackup.c:1286
 #, c-format
 msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
 msgstr "%s: не удало�ь �оздать �имволиче�кую ��ылку \"%s\" в \"%s\": %s\n"
 
-#: pg_basebackup.c:1304
+#: pg_basebackup.c:1295
 #, c-format
 msgid "%s: unrecognized link indicator \"%c\"\n"
 msgstr "%s: нера�познанный индикатор �в�зи \"%c\"\n"
 
-#: pg_basebackup.c:1324
+#: pg_basebackup.c:1315
 #, c-format
 msgid "%s: could not set permissions on file \"%s\": %s\n"
 msgstr "%s: не удало�ь у�тановить права до�тупа дл� файла \"%s\": %s\n"
 
-#: pg_basebackup.c:1383
+#: pg_basebackup.c:1374
 #, c-format
 msgid "%s: COPY stream ended before last file was finished\n"
 msgstr "%s: поток COPY закончил�� до завершени� по�леднего файла\n"
 
-#: pg_basebackup.c:1469 pg_basebackup.c:1489 pg_basebackup.c:1496
-#: pg_basebackup.c:1550
+#: pg_basebackup.c:1460 pg_basebackup.c:1480 pg_basebackup.c:1487
+#: pg_basebackup.c:1534
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: нехватка пам�ти\n"
 
-#: pg_basebackup.c:1627
+#: pg_basebackup.c:1611
 #, c-format
 msgid "%s: incompatible server version %s\n"
 msgstr "%s: не�овме�тима� вер�и� �ервера %s\n"
 
-#: pg_basebackup.c:1674 pg_recvlogical.c:261 receivelog.c:549 receivelog.c:600
-#: receivelog.c:641 streamutil.c:255 streamutil.c:353 streamutil.c:399
+#: pg_basebackup.c:1648
+#, c-format
+msgid "%s: initiating base backup, waiting for checkpoint to complete\n"
+msgstr ""
+"%s: начинает�� базовое резервное копирование, ожидает�� завершение "
+"контрольной точки\n"
+
+#: pg_basebackup.c:1666 pg_recvlogical.c:264 receivelog.c:554 receivelog.c:605
+#: receivelog.c:646 streamutil.c:263 streamutil.c:367 streamutil.c:413
 #, c-format
 msgid "%s: could not send replication command \"%s\": %s"
 msgstr "%s: не удало�ь передать команду репликации \"%s\": %s"
 
-#: pg_basebackup.c:1685
+#: pg_basebackup.c:1677
 #, c-format
 msgid "%s: could not initiate base backup: %s"
 msgstr "%s: не удало�ь инициализировать базовое резервное копирование: %s"
 
-#: pg_basebackup.c:1692
+#: pg_basebackup.c:1684
 #, c-format
 msgid ""
 "%s: server returned unexpected response to BASE_BACKUP command; got %d rows "
@@ -497,45 +482,50 @@
 "%s: �ервер вернул неожиданный ответ на команду BASE_BACKUP; получено �трок: "
 "%d, полей: %d, а ожидало�ь �трок: %d, полей: %d\n"
 
-#: pg_basebackup.c:1712
+#: pg_basebackup.c:1692
+#, c-format
+msgid "%s: checkpoint completed\n"
+msgstr "%s: контрольна� точка завершена\n"
+
+#: pg_basebackup.c:1707
 #, c-format
 msgid "transaction log start point: %s on timeline %u\n"
 msgstr "�тартова� точка журнала транзакций: %s на линии времени %u\n"
 
-#: pg_basebackup.c:1721
+#: pg_basebackup.c:1716
 #, c-format
 msgid "%s: could not get backup header: %s"
 msgstr "%s: не удало�ь получить заголовок резервной копии: %s"
 
-#: pg_basebackup.c:1727
+#: pg_basebackup.c:1722
 #, c-format
 msgid "%s: no data returned from server\n"
 msgstr "%s: �ервер не вернул данные\n"
 
-#: pg_basebackup.c:1759
+#: pg_basebackup.c:1754
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %d\n"
 msgstr ""
 "%s: в stdout можно выве�ти только одно табличное про�тран�тво, в�его в СУБД "
 "их %d\n"
 
-#: pg_basebackup.c:1771
+#: pg_basebackup.c:1766
 #, c-format
 msgid "%s: starting background WAL receiver\n"
 msgstr "%s: запу�к фонового проце��а �читывани� WAL\n"
 
-#: pg_basebackup.c:1802
+#: pg_basebackup.c:1797
 #, c-format
 msgid "%s: could not get transaction log end position from server: %s"
 msgstr ""
 "%s: не удало�ь получить конечную позицию в журнале транзакций � �ервера: %s"
 
-#: pg_basebackup.c:1809
+#: pg_basebackup.c:1804
 #, c-format
 msgid "%s: no transaction log end position returned from server\n"
 msgstr "%s: �ервер не вернул конечную позицию в журнале транзакций\n"
 
-#: pg_basebackup.c:1821
+#: pg_basebackup.c:1816
 #, c-format
 msgid "%s: final receive failed: %s"
 msgstr "%s: ошибка в конце передачи: %s"
@@ -585,17 +575,17 @@
 msgid "%s: child thread exited with error %u\n"
 msgstr "%s: дочерний поток завершил�� � ошибкой %u\n"
 
-#: pg_basebackup.c:2002
+#: pg_basebackup.c:2001
 #, c-format
 msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
 msgstr "%s: неверный формат вывода \"%s\", должен быть \"plain\" или \"tar\"\n"
 
-#: pg_basebackup.c:2023 pg_basebackup.c:2035
+#: pg_basebackup.c:2019 pg_basebackup.c:2031
 #, c-format
 msgid "%s: cannot specify both --xlog and --xlog-method\n"
 msgstr "%s: указать и --xlog, и --xlog-method одновременно нельз�\n"
 
-#: pg_basebackup.c:2050
+#: pg_basebackup.c:2046
 #, c-format
 msgid ""
 "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
@@ -603,12 +593,12 @@
 "%s: неверный аргумент дл� xlog-method - \"%s\", допу�кает�� только \"fetch\" "
 "или \"stream\"\n"
 
-#: pg_basebackup.c:2072
+#: pg_basebackup.c:2068
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
 msgstr "%s: неверный уровень �жати� \"%s\"\n"
 
-#: pg_basebackup.c:2084
+#: pg_basebackup.c:2080
 #, c-format
 msgid ""
 "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
@@ -616,49 +606,43 @@
 "%s: неверный аргумент режима контрольных точек \"%s\", должен быть \"fast\" "
 "или \"spread\"\n"
 
-#: pg_basebackup.c:2111 pg_receivexlog.c:439 pg_recvlogical.c:752
+#: pg_basebackup.c:2107 pg_receivexlog.c:439 pg_recvlogical.c:755
 #, c-format
 msgid "%s: invalid status interval \"%s\"\n"
 msgstr "%s: неверный интервал �ообщений о �о�то�нии \"%s\"\n"
 
-#: pg_basebackup.c:2127 pg_basebackup.c:2141 pg_basebackup.c:2152
-#: pg_basebackup.c:2165 pg_basebackup.c:2175 pg_basebackup.c:2185
-#: pg_basebackup.c:2197 pg_basebackup.c:2208 pg_receivexlog.c:471
-#: pg_receivexlog.c:485 pg_receivexlog.c:493 pg_receivexlog.c:503
-#: pg_receivexlog.c:514 pg_recvlogical.c:779 pg_recvlogical.c:793
-#: pg_recvlogical.c:804 pg_recvlogical.c:812 pg_recvlogical.c:820
-#: pg_recvlogical.c:828 pg_recvlogical.c:836 pg_recvlogical.c:844
+#: pg_basebackup.c:2123 pg_basebackup.c:2137 pg_basebackup.c:2148
+#: pg_basebackup.c:2161 pg_basebackup.c:2171 pg_basebackup.c:2183
+#: pg_basebackup.c:2194 pg_receivexlog.c:471 pg_receivexlog.c:485
+#: pg_receivexlog.c:493 pg_receivexlog.c:503 pg_receivexlog.c:514
+#: pg_recvlogical.c:782 pg_recvlogical.c:796 pg_recvlogical.c:807
+#: pg_recvlogical.c:815 pg_recvlogical.c:823 pg_recvlogical.c:831
+#: pg_recvlogical.c:839 pg_recvlogical.c:847
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Дл� дополнительной информации попробуйте \"%s --help\".\n"
 
-#: pg_basebackup.c:2139 pg_receivexlog.c:483 pg_recvlogical.c:791
+#: pg_basebackup.c:2135 pg_receivexlog.c:483 pg_recvlogical.c:794
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: �лишком много аргументов командной �троки (первый: \"%s\")\n"
 
-#: pg_basebackup.c:2151 pg_receivexlog.c:513
+#: pg_basebackup.c:2147 pg_receivexlog.c:513
 #, c-format
 msgid "%s: no target directory specified\n"
 msgstr "%s: целевой каталог не указан\n"
 
-#: pg_basebackup.c:2163
+#: pg_basebackup.c:2159
 #, c-format
 msgid "%s: only tar mode backups can be compressed\n"
 msgstr "%s: �жимать можно только резервные копии в архиве tar\n"
 
-#: pg_basebackup.c:2173
+#: pg_basebackup.c:2169
 #, c-format
 msgid "%s: WAL streaming can only be used in plain mode\n"
 msgstr "%s: потокова� передача WAL поддерживает�� только в режиме plain\n"
 
-#: pg_basebackup.c:2183
-#, c-format
-msgid "%s: replication slots can only be used with WAL streaming\n"
-msgstr ""
-"%s: �лоты репликации можно и�пользовать только при потоковой передаче WAL\n"
-
-#: pg_basebackup.c:2195
+#: pg_basebackup.c:2181
 #, c-format
 msgid ""
 "%s: transaction log directory location can only be specified in plain mode\n"
@@ -666,24 +650,24 @@
 "%s: ра�положение каталога журнала транзакций можно указать только в режиме "
 "plain\n"
 
-#: pg_basebackup.c:2206
+#: pg_basebackup.c:2192
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr ""
 "%s: ра�положение каталога журнала транзакций должно определ�ть�� аб�олютным "
 "путём\n"
 
-#: pg_basebackup.c:2218
+#: pg_basebackup.c:2204
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s: �та �борка программы не поддерживает �жатие\n"
 
-#: pg_basebackup.c:2245
+#: pg_basebackup.c:2231
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: не удало�ь �оздать �имволиче�кую ��ылку \"%s\": %s\n"
 
-#: pg_basebackup.c:2250
+#: pg_basebackup.c:2236
 #, c-format
 msgid "%s: symlinks are not supported on this platform\n"
 msgstr "%s: �имволиче�кие ��ылки не поддерживают�� в �той ОС\n"
@@ -697,7 +681,7 @@
 "%s получает тран�лируемые журналы транзакций PostgreSQL.\n"
 "\n"
 
-#: pg_receivexlog.c:68 pg_recvlogical.c:75
+#: pg_receivexlog.c:68 pg_recvlogical.c:78
 #, c-format
 msgid ""
 "\n"
@@ -711,10 +695,10 @@
 msgid ""
 "  -D, --directory=DIR    receive transaction log files into this directory\n"
 msgstr ""
-"  -D, --directory=ПУТЬ   �охран�ть файлы журналов транзакций в данный "
+"  -D, --directory=ПУТЬ   �охран�ть файлы журнала транзакций в данный "
 "каталог\n"
 
-#: pg_receivexlog.c:70 pg_recvlogical.c:79
+#: pg_receivexlog.c:70 pg_recvlogical.c:82
 #, c-format
 msgid ""
 "      --if-not-exists    do not error if slot already exists when creating a "
@@ -723,12 +707,12 @@
 "      --if-not-exists    не выдавать ошибку при попытке �оздать уже "
 "�уще�твующий �лот\n"
 
-#: pg_receivexlog.c:71 pg_recvlogical.c:81
+#: pg_receivexlog.c:71 pg_recvlogical.c:84
 #, c-format
 msgid "  -n, --no-loop          do not loop on connection lost\n"
 msgstr "  -n, --no-loop          прерывать работу при потере �оединени�\n"
 
-#: pg_receivexlog.c:72 pg_recvlogical.c:86
+#: pg_receivexlog.c:72 pg_recvlogical.c:89
 #, c-format
 msgid ""
 "  -s, --status-interval=SECS\n"
@@ -739,6 +723,11 @@
 "                         интервал между отправкой �тату�ных пакетов �ерверу "
 "(по умолчанию: %d)\n"
 
+#: pg_receivexlog.c:74
+#, c-format
+msgid "  -S, --slot=SLOTNAME    replication slot to use\n"
+msgstr "  -S, --slot=ИМЯ_СЛОТ�   и�пользовать заданный �лот репликации\n"
+
 #: pg_receivexlog.c:75
 #, c-format
 msgid ""
@@ -755,7 +744,7 @@
 "\n"
 "Дополнительные дей�тви�:\n"
 
-#: pg_receivexlog.c:87 pg_recvlogical.c:72
+#: pg_receivexlog.c:87 pg_recvlogical.c:75
 #, c-format
 msgid ""
 "      --create-slot      create a new replication slot (for the slot's name "
@@ -764,7 +753,7 @@
 "      --create-slot      �оздать новый �лот репликации (им� �лота задаёт "
 "параметр --slot)\n"
 
-#: pg_receivexlog.c:88 pg_recvlogical.c:73
+#: pg_receivexlog.c:88 pg_recvlogical.c:76
 #, c-format
 msgid ""
 "      --drop-slot        drop the replication slot (for the slot's name see "
@@ -798,7 +787,7 @@
 msgid "%s: could not close directory \"%s\": %s\n"
 msgstr "%s: не удало�ь закрыть каталог \"%s\": %s\n"
 
-#: pg_receivexlog.c:218 pg_recvlogical.c:343
+#: pg_receivexlog.c:218 pg_recvlogical.c:346
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: не удало�ь получить информацию о файле \"%s\": %s\n"
@@ -819,7 +808,7 @@
 msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
 msgstr "%s: начало передачи журнала � позиции %X/%X (лини� времени %u)\n"
 
-#: pg_receivexlog.c:420 pg_recvlogical.c:699
+#: pg_receivexlog.c:420 pg_recvlogical.c:702
 #, c-format
 msgid "%s: invalid port number \"%s\"\n"
 msgstr "%s: неверный номер порта \"%s\"\n"
@@ -844,28 +833,28 @@
 "%s: подключение дл� репликации через �лот \"%s\" оказало�ь прив�зано к базе "
 "данных\n"
 
-#: pg_receivexlog.c:568 pg_recvlogical.c:884
+#: pg_receivexlog.c:568 pg_recvlogical.c:887
 #, c-format
 msgid "%s: dropping replication slot \"%s\"\n"
 msgstr "%s: удаление �лота репликации \"%s\"\n"
 
-#: pg_receivexlog.c:581 pg_recvlogical.c:896
+#: pg_receivexlog.c:581 pg_recvlogical.c:899
 #, c-format
 msgid "%s: creating replication slot \"%s\"\n"
 msgstr "%s: �оздание �лота репликации \"%s\"\n"
 
-#: pg_receivexlog.c:608 pg_recvlogical.c:922
+#: pg_receivexlog.c:608 pg_recvlogical.c:925
 #, c-format
 msgid "%s: disconnected\n"
 msgstr "%s: отключение\n"
 
 #. translator: check source for value for %d
-#: pg_receivexlog.c:615 pg_recvlogical.c:929
+#: pg_receivexlog.c:615 pg_recvlogical.c:932
 #, c-format
 msgid "%s: disconnected; waiting %d seconds to try again\n"
 msgstr "%s: отключение; через %d �ек. по�ледует повторное подключение\n"
 
-#: pg_recvlogical.c:67
+#: pg_recvlogical.c:70
 #, c-format
 msgid ""
 "%s controls PostgreSQL logical decoding streams.\n"
@@ -874,7 +863,7 @@
 "%s управл�ет потоками логиче�кого декодировани� PostgreSQL.\n"
 "\n"
 
-#: pg_recvlogical.c:71
+#: pg_recvlogical.c:74
 #, c-format
 msgid ""
 "\n"
@@ -883,7 +872,7 @@
 "\n"
 "Дей�твие, которое будет выполнено:\n"
 
-#: pg_recvlogical.c:74
+#: pg_recvlogical.c:77
 #, c-format
 msgid ""
 "      --start            start streaming in a replication slot (for the "
@@ -892,13 +881,13 @@
 "      --start            начать передачу в �лоте репликации (им� �лота "
 "задаёт параметр --slot)\n"
 
-#: pg_recvlogical.c:76
+#: pg_recvlogical.c:79
 #, c-format
 msgid "  -f, --file=FILE        receive log into this file, - for stdout\n"
 msgstr ""
 "  -f, --file=Ф�ЙЛ        �охран�ть журнал в �тот файл, - обозначает stdout\n"
 
-#: pg_recvlogical.c:77
+#: pg_recvlogical.c:80
 #, c-format
 msgid ""
 "  -F  --fsync-interval=SECS\n"
@@ -909,7 +898,7 @@
 "                         периодично�ть �бро�а на ди�к выходного файла (по "
 "умолчанию: %d)\n"
 
-#: pg_recvlogical.c:80
+#: pg_recvlogical.c:83
 #, c-format
 msgid ""
 "  -I, --startpos=LSN     where in an existing slot should the streaming "
@@ -918,7 +907,7 @@
 "  -I, --startpos=LSN     определ�ет, � какой позиции в �уще�твующем �лоте "
 "начнёт�� передача\n"
 
-#: pg_recvlogical.c:82
+#: pg_recvlogical.c:85
 #, c-format
 msgid ""
 "  -o, --option=NAME[=VALUE]\n"
@@ -930,213 +919,213 @@
 "необ�зательным\n"
 "                         значением модулю вывода\n"
 
-#: pg_recvlogical.c:85
+#: pg_recvlogical.c:88
 #, c-format
 msgid "  -P, --plugin=PLUGIN    use output plugin PLUGIN (default: %s)\n"
 msgstr ""
 "  -P, --plugin=МОДУЛЬ    и�пользовать заданный модуль вывода (по умолчанию: "
 "%s)\n"
 
-#: pg_recvlogical.c:88
+#: pg_recvlogical.c:91
 #, c-format
 msgid "  -S, --slot=SLOTNAME    name of the logical replication slot\n"
 msgstr "  -S, --slot=ИМЯ_СЛОТ�   им� �лота логиче�кой репликации\n"
 
-#: pg_recvlogical.c:93
+#: pg_recvlogical.c:96
 #, c-format
 msgid "  -d, --dbname=DBNAME    database to connect to\n"
 msgstr "  -d, --dbname=ИМЯ_БД    целева� база данных\n"
 
-#: pg_recvlogical.c:126
+#: pg_recvlogical.c:129
 #, c-format
 msgid "%s: confirming write up to %X/%X, flush to %X/%X (slot %s)\n"
 msgstr ""
 "%s: подтверждает�� запи�ь до %X/%X, �инхронизаци� � ФС до %X/%X (�лот %s)\n"
 
-#: pg_recvlogical.c:151 receivelog.c:415
+#: pg_recvlogical.c:154 receivelog.c:418
 #, c-format
 msgid "%s: could not send feedback packet: %s"
 msgstr "%s: не удало�ь отправить пакет отзыва: %s"
 
-#: pg_recvlogical.c:190
+#: pg_recvlogical.c:193
 #, c-format
 msgid "%s: could not fsync log file \"%s\": %s\n"
 msgstr "%s: не удало�ь �инхронизировать � ФС файл журнала \"%s\": %s\n"
 
-#: pg_recvlogical.c:229
+#: pg_recvlogical.c:232
 #, c-format
 msgid "%s: starting log streaming at %X/%X (slot %s)\n"
 msgstr "%s: начало передачи журнала � позиции %X/%X (�лот %s)\n"
 
-#: pg_recvlogical.c:271
+#: pg_recvlogical.c:274
 #, c-format
 msgid "%s: streaming initiated\n"
 msgstr "%s: передача запущена\n"
 
-#: pg_recvlogical.c:336
+#: pg_recvlogical.c:339
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s: не удало�ь открыть файл журнала \"%s\": %s\n"
 
-#: pg_recvlogical.c:412 receivelog.c:980
+#: pg_recvlogical.c:415 receivelog.c:985
 #, c-format
 msgid "%s: select() failed: %s\n"
 msgstr "%s: ошибка в select(): %s\n"
 
-#: pg_recvlogical.c:421 receivelog.c:1030
+#: pg_recvlogical.c:424 receivelog.c:1035
 #, c-format
 msgid "%s: could not receive data from WAL stream: %s"
 msgstr "%s: не удало�ь получить данные из потока WAL: %s"
 
-#: pg_recvlogical.c:462 pg_recvlogical.c:501 receivelog.c:1075
-#: receivelog.c:1144
+#: pg_recvlogical.c:465 pg_recvlogical.c:504 receivelog.c:1080
+#: receivelog.c:1149
 #, c-format
 msgid "%s: streaming header too small: %d\n"
 msgstr "%s: заголовок потока �лишком мал: %d\n"
 
-#: pg_recvlogical.c:484 receivelog.c:924
+#: pg_recvlogical.c:487 receivelog.c:929
 #, c-format
 msgid "%s: unrecognized streaming header: \"%c\"\n"
 msgstr "%s: нера�познанный заголовок потока: \"%c\"\n"
 
-#: pg_recvlogical.c:530 pg_recvlogical.c:544
+#: pg_recvlogical.c:533 pg_recvlogical.c:547
 #, c-format
 msgid "%s: could not write %u bytes to log file \"%s\": %s\n"
 msgstr "%s: не удало�ь запи�ать %u байт в файл журнала \"%s\": %s\n"
 
-#: pg_recvlogical.c:555 receivelog.c:707 receivelog.c:745
+#: pg_recvlogical.c:558 receivelog.c:712 receivelog.c:750
 #, c-format
 msgid "%s: unexpected termination of replication stream: %s"
 msgstr "%s: неожиданный конец потока репликации: %s"
 
-#: pg_recvlogical.c:678
+#: pg_recvlogical.c:681
 #, c-format
 msgid "%s: invalid fsync interval \"%s\"\n"
 msgstr "%s: неверный интервал �инхронизации � ФС \"%s\"\n"
 
-#: pg_recvlogical.c:719
+#: pg_recvlogical.c:722
 #, c-format
 msgid "%s: could not parse start position \"%s\"\n"
 msgstr "%s: не удало�ь разобрать начальную позицию \"%s\"\n"
 
-#: pg_recvlogical.c:803
+#: pg_recvlogical.c:806
 #, c-format
 msgid "%s: no slot specified\n"
 msgstr "%s: �лот не указан\n"
 
-#: pg_recvlogical.c:811
+#: pg_recvlogical.c:814
 #, c-format
 msgid "%s: no target file specified\n"
 msgstr "%s: целевой файл не задан\n"
 
-#: pg_recvlogical.c:819
+#: pg_recvlogical.c:822
 #, c-format
 msgid "%s: no database specified\n"
 msgstr "%s: база данных не задана\n"
 
-#: pg_recvlogical.c:827
+#: pg_recvlogical.c:830
 #, c-format
 msgid "%s: at least one action needs to be specified\n"
 msgstr "%s: необходимо задать минимум одно дей�твие\n"
 
-#: pg_recvlogical.c:835
+#: pg_recvlogical.c:838
 #, c-format
 msgid "%s: cannot use --create-slot or --start together with --drop-slot\n"
 msgstr "%s: --create-slot или --start нельз� примен�ть вме�те � --drop-slot\n"
 
-#: pg_recvlogical.c:843
+#: pg_recvlogical.c:846
 #, c-format
 msgid "%s: cannot use --create-slot or --drop-slot together with --startpos\n"
 msgstr ""
 "%s: --create-slot или --drop-slot нельз� примен�ть вме�те � --startpos\n"
 
-#: pg_recvlogical.c:874
+#: pg_recvlogical.c:877
 #, c-format
 msgid "%s: could not establish database-specific replication connection\n"
 msgstr ""
 "%s: не удало�ь у�тановить подключение дл� репликации к определённой базе "
 "данных\n"
 
-#: receivelog.c:75
+#: receivelog.c:78
 #, c-format
 msgid "%s: could not create archive status file \"%s\": %s\n"
 msgstr "%s: не удало�ь �оздать файл �тату�а архива \"%s\": %s\n"
 
-#: receivelog.c:82 receivelog.c:206 receivelog.c:355 receivelog.c:848
-#: receivelog.c:1096
+#: receivelog.c:85 receivelog.c:209 receivelog.c:358 receivelog.c:853
+#: receivelog.c:1101
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: не удало�ь �инхронизировать � ФС файл \"%s\": %s\n"
 
-#: receivelog.c:121
+#: receivelog.c:124
 #, c-format
 msgid "%s: could not open transaction log file \"%s\": %s\n"
 msgstr "%s: не удало�ь открыть файл журнала транзакций \"%s\": %s\n"
 
-#: receivelog.c:133
+#: receivelog.c:136
 #, c-format
 msgid "%s: could not stat transaction log file \"%s\": %s\n"
 msgstr "%s: не удало�ь проверить файл журнала транзакций \"%s\": %s\n"
 
-#: receivelog.c:147
+#: receivelog.c:150
 #, c-format
 msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
 msgstr ""
 "%s: файл журнала транзакций \"%s\" имеет размер %d Б, а должен - 0 или %d\n"
 
-#: receivelog.c:160
+#: receivelog.c:163
 #, c-format
 msgid "%s: could not pad transaction log file \"%s\": %s\n"
 msgstr "%s: не удало�ь дополнить файл журнала транзакций \"%s\": %s\n"
 
-#: receivelog.c:173
+#: receivelog.c:176
 #, c-format
 msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
 msgstr "%s: не удало�ь перейти к началу файла журнала транзакций \"%s\": %s\n"
 
-#: receivelog.c:199
+#: receivelog.c:202
 #, c-format
 msgid "%s: could not determine seek position in file \"%s\": %s\n"
 msgstr "%s: не удало�ь определить текущую позицию в файле \"%s\": %s\n"
 
-#: receivelog.c:232
+#: receivelog.c:235
 #, c-format
 msgid "%s: could not rename file \"%s\": %s\n"
 msgstr "%s: не удало�ь переименовать файл \"%s\": %s\n"
 
-#: receivelog.c:239
+#: receivelog.c:242
 #, c-format
 msgid "%s: not renaming \"%s%s\", segment is not complete\n"
 msgstr ""
 "%s: файл \"%s%s\" не переименовывает��, так как �то не полный �егмент\n"
 
-#: receivelog.c:285
+#: receivelog.c:288
 #, c-format
 msgid "%s: could not open timeline history file \"%s\": %s\n"
 msgstr "%s: не удало�ь открыть файл и�тории линии времени \"%s\": %s\n"
 
-#: receivelog.c:313
+#: receivelog.c:316
 #, c-format
 msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
 msgstr ""
 "%s: �ервер �ообщил неожиданное им� файла и�тории дл� линии времени %u: %s\n"
 
-#: receivelog.c:330
+#: receivelog.c:333
 #, c-format
 msgid "%s: could not create timeline history file \"%s\": %s\n"
 msgstr "%s: не удало�ь �оздать файл и�тории линии времени \"%s\": %s\n"
 
-#: receivelog.c:347
+#: receivelog.c:350
 #, c-format
 msgid "%s: could not write timeline history file \"%s\": %s\n"
 msgstr "%s: не удало�ь запи�ать файл и�тории линии времени \"%s\": %s\n"
 
-#: receivelog.c:372
+#: receivelog.c:375
 #, c-format
 msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
 msgstr "%s: не удало�ь переименовать файл \"%s\" в \"%s\": %s\n"
 
-#: receivelog.c:449
+#: receivelog.c:452
 #, c-format
 msgid ""
 "%s: incompatible server version %s; client does not support streaming from "
@@ -1145,7 +1134,7 @@
 "%s: не�овме�тима� вер�и� �ервера %s; клиент не поддерживает репликацию � "
 "�ерверов вер�ии ниже %s\n"
 
-#: receivelog.c:459
+#: receivelog.c:462
 #, c-format
 msgid ""
 "%s: incompatible server version %s; client does not support streaming from "
@@ -1154,7 +1143,7 @@
 "%s: не�овме�тима� вер�и� �ервера %s; клиент не поддерживает репликацию � "
 "�ерверов вер�ии выше %s\n"
 
-#: receivelog.c:557 streamutil.c:264 streamutil.c:299
+#: receivelog.c:562 streamutil.c:272 streamutil.c:311
 #, c-format
 msgid ""
 "%s: could not identify system: got %d rows and %d fields, expected %d rows "
@@ -1163,7 +1152,7 @@
 "%s: не удало�ь идентифицировать �и�тему, получено �трок: %d, полей: %d "
 "(ожидало�ь: %d и %d (или более))\n"
 
-#: receivelog.c:565
+#: receivelog.c:570
 #, c-format
 msgid ""
 "%s: system identifier does not match between base backup and streaming "
@@ -1172,12 +1161,12 @@
 "%s: �и�темный идентификатор базовой резервной копии отличает�� от "
 "идентификатора потоковой передачи\n"
 
-#: receivelog.c:573
+#: receivelog.c:578
 #, c-format
 msgid "%s: starting timeline %u is not present in the server\n"
 msgstr "%s: на �ервере нет начальной линии времени %u\n"
 
-#: receivelog.c:613
+#: receivelog.c:618
 #, c-format
 msgid ""
 "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d "
@@ -1186,14 +1175,14 @@
 "%s: �ервер вернул неожиданный ответ на команду TIMELINE_HISTORY; получено "
 "�трок: %d, полей: %d, а ожидало�ь �трок: %d, полей: %d\n"
 
-#: receivelog.c:688
+#: receivelog.c:693
 #, c-format
 msgid ""
 "%s: server reported unexpected next timeline %u, following timeline %u\n"
 msgstr ""
 "%s: �ервер неожиданно �ообщил линию времени %u по�ле линии времени %u\n"
 
-#: receivelog.c:695
+#: receivelog.c:700
 #, c-format
 msgid ""
 "%s: server stopped streaming timeline %u at %X/%X, but reported next "
@@ -1202,12 +1191,12 @@
 "%s: �ервер прекратил передачу линии времени %u в %X/%X, но �ообщил, что "
 "�ледующа� линии времени %u начнёт�� в %X/%X\n"
 
-#: receivelog.c:736
+#: receivelog.c:741
 #, c-format
 msgid "%s: replication stream was terminated before stop point\n"
 msgstr "%s: поток репликации закончил�� до точки о�танова\n"
 
-#: receivelog.c:785
+#: receivelog.c:790
 #, c-format
 msgid ""
 "%s: unexpected result set after end-of-timeline: got %d rows and %d fields, "
@@ -1216,64 +1205,64 @@
 "%s: �ервер вернул неожиданный набор данных по�ле конца линии времени - "
 "получено �трок: %d, полей: %d, а ожидало�ь �трок: %d, полей: %d\n"
 
-#: receivelog.c:795
+#: receivelog.c:800
 #, c-format
 msgid "%s: could not parse next timeline's starting point \"%s\"\n"
 msgstr ""
 "%s: не удало�ь разобрать начальную точку �ледующей линии времени \"%s\"\n"
 
-#: receivelog.c:959
+#: receivelog.c:964
 #, c-format
 msgid "%s: socket not open"
 msgstr "%s: �окет не открыт"
 
-#: receivelog.c:1163
+#: receivelog.c:1168
 #, c-format
 msgid "%s: received transaction log record for offset %u with no file open\n"
 msgstr ""
 "%s: получена запи�ь журнала транзакций по �мещению %u, но файл не открыт\n"
 
-#: receivelog.c:1175
+#: receivelog.c:1180
 #, c-format
 msgid "%s: got WAL data offset %08x, expected %08x\n"
 msgstr "%s: получено �мещение данных WAL %08x, но ожидало�ь %08x\n"
 
-#: receivelog.c:1212
+#: receivelog.c:1217
 #, c-format
 msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
 msgstr "%s: не удало�ь запи�ать %u байт в файл WAL \"%s\": %s\n"
 
-#: receivelog.c:1237 receivelog.c:1279 receivelog.c:1311
+#: receivelog.c:1242 receivelog.c:1284 receivelog.c:1316
 #, c-format
 msgid "%s: could not send copy-end packet: %s"
 msgstr "%s: не удало�ь отправить пакет \"конец COPY\": %s"
 
-#: streamutil.c:145
+#: streamutil.c:153
 msgid "Password: "
 msgstr "Пароль: "
 
-#: streamutil.c:169
+#: streamutil.c:177
 #, c-format
 msgid "%s: could not connect to server\n"
 msgstr "%s: не удало�ь подключить�� к �ерверу\n"
 
-#: streamutil.c:187
+#: streamutil.c:195
 #, c-format
 msgid "%s: could not connect to server: %s"
 msgstr "%s: не удало�ь подключить�� к �ерверу: %s"
 
-#: streamutil.c:211
+#: streamutil.c:219
 #, c-format
 msgid "%s: could not determine server setting for integer_datetimes\n"
 msgstr "%s: не удало�ь получить на�тройку �ервера integer_datetimes\n"
 
-#: streamutil.c:224
+#: streamutil.c:232
 #, c-format
 msgid "%s: integer_datetimes compile flag does not match server\n"
 msgstr ""
 "%s: флаг компил�ции integer_datetimes не �оответ�твует на�тройке �ервера\n"
 
-#: streamutil.c:365
+#: streamutil.c:379
 #, c-format
 msgid ""
 "%s: could not create replication slot \"%s\": got %d rows and %d fields, "
@@ -1282,7 +1271,7 @@
 "%s: не удало�ь �оздать �лот репликации \"%s\"; получено �трок: %d, полей: %d "
 "(ожидало�ь: %d и %d)\n"
 
-#: streamutil.c:410
+#: streamutil.c:424
 #, c-format
 msgid ""
 "%s: could not drop replication slot \"%s\": got %d rows and %d fields, "
@@ -1291,6 +1280,17 @@
 "%s: не удало�ь удалить �лот репликации \"%s\"; получено �трок: %d, полей: %d "
 "(ожидало�ь: %d и %d)\n"
 
+#~ msgid "%s: could not parse file size\n"
+#~ msgstr "%s: не удало�ь разобрать размер файла\n"
+
+#~ msgid "%s: could not parse file mode\n"
+#~ msgstr "%s: не удало�ь разобрать режим файла\n"
+
+#~ msgid "%s: replication slots can only be used with WAL streaming\n"
+#~ msgstr ""
+#~ "%s: �лоты репликации можно и�пользовать только при потоковой передаче "
+#~ "WAL\n"
+
 #~ msgid "%s: could not remove symbolic link \"%s\": %s\n"
 #~ msgstr "%s: ошибка при удалении �имволиче�кой ��ылки \"%s\": %s\n"
 
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/receivelog.c postgresql-9.5-9.5.8/src/bin/pg_basebackup/receivelog.c
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/receivelog.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/receivelog.c	2017-08-07 21:13:41.000000000 +0000
@@ -16,6 +16,9 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 
 /* local includes */
 #include "receivelog.h"
@@ -516,26 +519,28 @@
 	if (!CheckServerVersionForStreaming(conn))
 		return false;
 
+	/*
+	 * Decide whether we want to report the flush position. If we report
+	 * the flush position, the primary will know what WAL we'll
+	 * possibly re-request, and it can then remove older WAL safely.
+	 * We must always do that when we are using slots.
+	 *
+	 * Reporting the flush position makes one eligible as a synchronous
+	 * replica. People shouldn't include generic names in
+	 * synchronous_standby_names, but we've protected them against it so
+	 * far, so let's continue to do so unless specifically requested.
+	 */
 	if (replication_slot != NULL)
 	{
-		/*
-		 * Report the flush position, so the primary can know what WAL we'll
-		 * possibly re-request, and remove older WAL safely.
-		 *
-		 * We only report it when a slot has explicitly been used, because
-		 * reporting the flush position makes one eligible as a synchronous
-		 * replica. People shouldn't include generic names in
-		 * synchronous_standby_names, but we've protected them against it so
-		 * far, so let's continue to do so in the situations when possible. If
-		 * they've got a slot, though, we need to report the flush position,
-		 * so that the master can remove WAL.
-		 */
 		reportFlushPosition = true;
 		sprintf(slotcmd, "SLOT \"%s\" ", replication_slot);
 	}
 	else
 	{
-		reportFlushPosition = false;
+		if (synchronous)
+			reportFlushPosition = true;
+		else
+			reportFlushPosition = false;
 		slotcmd[0] = 0;
 	}
 
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_basebackup/streamutil.c postgresql-9.5-9.5.8/src/bin/pg_basebackup/streamutil.c
--- postgresql-9.5-9.5.2/src/bin/pg_basebackup/streamutil.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_basebackup/streamutil.c	2017-08-07 21:13:41.000000000 +0000
@@ -64,9 +64,15 @@
 	PQconninfoOption *conn_opt;
 	char	   *err_msg = NULL;
 
+	/* pg_recvlogical uses dbname only; others use connection_string only. */
+	Assert(dbname == NULL || connection_string == NULL);
+
 	/*
 	 * Merge the connection info inputs given in form of connection string,
 	 * options and default values (dbname=replication, replication=true, etc.)
+	 * Explicitly discard any dbname value in the connection string;
+	 * otherwise, PQconnectdbParams() would interpret that value as being
+	 * itself a connection string.
 	 */
 	i = 0;
 	if (connection_string)
@@ -80,7 +86,8 @@
 
 		for (conn_opt = conn_opts; conn_opt->keyword != NULL; conn_opt++)
 		{
-			if (conn_opt->val != NULL && conn_opt->val[0] != '\0')
+			if (conn_opt->val != NULL && conn_opt->val[0] != '\0' &&
+				strcmp(conn_opt->keyword, "dbname") != 0)
 				argcount++;
 		}
 
@@ -89,7 +96,8 @@
 
 		for (conn_opt = conn_opts; conn_opt->keyword != NULL; conn_opt++)
 		{
-			if (conn_opt->val != NULL && conn_opt->val[0] != '\0')
+			if (conn_opt->val != NULL && conn_opt->val[0] != '\0' &&
+				strcmp(conn_opt->keyword, "dbname") != 0)
 			{
 				keywords[i] = conn_opt->keyword;
 				values[i] = conn_opt->val;
diff -Nru postgresql-9.5-9.5.2/src/bin/pgbench/exprscan.c postgresql-9.5-9.5.8/src/bin/pgbench/exprscan.c
--- postgresql-9.5-9.5.2/src/bin/pgbench/exprscan.c	2016-03-28 20:23:04.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pgbench/exprscan.c	2017-08-07 21:34:42.000000000 +0000
@@ -618,7 +618,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( expr_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -631,7 +631,7 @@
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, expr_yyin))==0 && ferror(expr_yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, expr_yyin)) == 0 && ferror(expr_yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1051,7 +1051,7 @@
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
diff -Nru postgresql-9.5-9.5.2/src/bin/pgbench/pgbench.c postgresql-9.5-9.5.8/src/bin/pgbench/pgbench.c
--- postgresql-9.5-9.5.2/src/bin/pgbench/pgbench.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pgbench/pgbench.c	2017-08-07 21:13:41.000000000 +0000
@@ -219,6 +219,7 @@
 	Variable   *variables;		/* array of variable definitions */
 	int			nvariables;
 	int64		txn_scheduled;	/* scheduled start time of transaction (usec) */
+	int64		sleep_until;	/* scheduled start time of next cmd (usec) */
 	instr_time	txn_begin;		/* used for measuring schedule lag times */
 	instr_time	stmt_begin;		/* used for measuring statement latencies */
 	int64		txn_latencies;	/* cumulated latencies */
@@ -1238,6 +1239,7 @@
 			}
 		}
 
+		st->sleep_until = st->txn_scheduled;
 		st->sleeping = 1;
 		st->throttling = true;
 		st->is_throttled = true;
@@ -1253,7 +1255,7 @@
 		if (INSTR_TIME_IS_ZERO(now))
 			INSTR_TIME_SET_CURRENT(now);
 		now_us = INSTR_TIME_GET_MICROSEC(now);
-		if (st->txn_scheduled <= now_us)
+		if (st->sleep_until <= now_us)
 		{
 			st->sleeping = 0;	/* Done sleeping, go ahead with next command */
 			if (st->throttling)
@@ -1721,7 +1723,7 @@
 				usec *= 1000000;
 
 			INSTR_TIME_SET_CURRENT(now);
-			st->txn_scheduled = INSTR_TIME_GET_MICROSEC(now) + usec;
+			st->sleep_until = INSTR_TIME_GET_MICROSEC(now) + usec;
 			st->sleeping = 1;
 
 			st->listen = 1;
@@ -2734,9 +2736,9 @@
 	}
 	else
 	{
-		/* only an average latency computed from the duration is available */
+		/* no measurement, show average latency computed from run time */
 		printf("latency average: %.3f ms\n",
-			   1000.0 * duration * nclients / normal_xacts);
+			   1000.0 * time_include * nclients / normal_xacts);
 	}
 
 	if (throttle_delay)
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_config/po/de.po postgresql-9.5-9.5.8/src/bin/pg_config/po/de.po
--- postgresql-9.5-9.5.2/src/bin/pg_config/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_config/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,7 +1,7 @@
 # German message translation file for pg_config
 # Peter Eisentraut <peter_e@gmx.net>, 2004 - 2013.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
@@ -24,27 +24,27 @@
 #: ../../port/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "ungültige Programmdatei „%s“"
+msgstr "ungültige Programmdatei »%s«"
 
 #: ../../port/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "konnte Programmdatei „%s“ nicht lesen"
+msgstr "konnte Programmdatei »%s« nicht lesen"
 
 #: ../../port/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "konnte kein „%s“ zum Ausführen finden"
+msgstr "konnte kein »%s« zum Ausführen finden"
 
 #: ../../port/exec.c:257 ../../port/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "konnte nicht in Verzeichnis „%s“ wechseln: %s"
+msgstr "konnte nicht in Verzeichnis »%s« wechseln: %s"
 
 #: ../../port/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "konnte symbolische Verknüpfung „%s“ nicht lesen"
+msgstr "konnte symbolische Verknüpfung »%s« nicht lesen"
 
 #: ../../port/exec.c:523
 #, c-format
@@ -171,7 +171,7 @@
 "  --configure           show options given to \"configure\" script when\n"
 "                        PostgreSQL was built\n"
 msgstr ""
-"  --configure           zeige Optionen des „configure“-Skriptes beim Bauen\n"
+"  --configure           zeige Optionen des »configure«-Skriptes beim Bauen\n"
 "                        von PostgreSQL\n"
 
 #: pg_config.c:448
@@ -243,7 +243,7 @@
 #: pg_config.c:465
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
 #: pg_config.c:504
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_config/po/es.po postgresql-9.5-9.5.8/src/bin/pg_config/po/es.po
--- postgresql-9.5-9.5.2/src/bin/pg_config/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_config/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: pg_config (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:43+0000\n"
+"POT-Creation-Date: 2017-05-21 17:31+0000\n"
 "PO-Revision-Date: 2014-12-16 12:12-0300\n"
 "Last-Translator: Alvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: es <pgsql-es-ayuda@postgresql.org>\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_config/po/fr.po postgresql-9.5-9.5.8/src/bin/pg_config/po/fr.po
--- postgresql-9.5-9.5.2/src/bin/pg_config/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_config/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 # translation of pg_config.po to fr_fr
 # french message translation file for pg_config
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 #
 # Guillaume Lelarge <guillaume@lelarge.info>, 2004-2009.
-# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
+# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2013-08-16 22:18+0000\n"
 "PO-Revision-Date: 2012-07-22 20:48+0100\n"
@@ -15,50 +15,50 @@
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
 #, c-format
 msgid "could not identify current directory: %s"
-msgstr "n'a pas pu identifier le répertoire courant : %s"
+msgstr "n'a pas pu identifier le répertoire courant : %s"
 
 #: ../../port/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "binaire « %s » invalide"
+msgstr "binaire « %s » invalide"
 
 #: ../../port/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "n'a pas pu lire le binaire « %s »"
+msgstr "n'a pas pu lire le binaire « %s »"
 
 #: ../../port/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "n'a pas pu trouver un « %s » à exécuter"
+msgstr "n'a pas pu trouver un « %s » à exécuter"
 
 #: ../../port/exec.c:257 ../../port/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "n'a pas pu changer le répertoire par « %s » : %s"
+msgstr "n'a pas pu changer le répertoire par « %s » : %s"
 
 #: ../../port/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "n'a pas pu lire le lien symbolique « %s »"
+msgstr "n'a pas pu lire le lien symbolique « %s »"
 
 #: ../../port/exec.c:523
 #, c-format
 msgid "pclose failed: %s"
-msgstr "échec de pclose : %s"
+msgstr "échec de pclose : %s"
 
 #: 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 "non enregistré\n"
+msgstr "non enregistré\n"
 
 #: pg_config.c:428
 #, c-format
@@ -68,7 +68,7 @@
 "\n"
 msgstr ""
 "\n"
-"%s fournit des informations sur la version installée de PostgreSQL.\n"
+"%s fournit des informations sur la version installée de PostgreSQL.\n"
 "\n"
 
 #: pg_config.c:429
@@ -93,7 +93,7 @@
 #: pg_config.c:432
 #, c-format
 msgid "  --bindir              show location of user executables\n"
-msgstr "  --bindir              affiche l'emplacement des exécutables utilisateur\n"
+msgstr "  --bindir              affiche l'emplacement des exécutables utilisateur\n"
 
 #: pg_config.c:433
 #, c-format
@@ -113,27 +113,27 @@
 "  --includedir          show location of C header files of the client\n"
 "                        interfaces\n"
 msgstr ""
-"  --includedir          affiche l'emplacement des fichiers d'en-tête C\n"
+"  --includedir          affiche l'emplacement des fichiers d'en-tête C\n"
 "                        des interfaces client\n"
 
 #: pg_config.c:437
 #, c-format
 msgid "  --pkgincludedir       show location of other C header files\n"
 msgstr ""
-"  --pkgincludedir       affiche l'emplacement des autres fichiers d'en-tête\n"
+"  --pkgincludedir       affiche l'emplacement des autres fichiers d'en-tête\n"
 "                        C\n"
 
 #: pg_config.c:438
 #, c-format
 msgid "  --includedir-server   show location of C header files for the server\n"
 msgstr ""
-"  --includedir-server   affiche l'emplacement des fichiers d'en-tête C du\n"
+"  --includedir-server   affiche l'emplacement des fichiers d'en-tête C du\n"
 "                        serveur\n"
 
 #: pg_config.c:439
 #, c-format
 msgid "  --libdir              show location of object code libraries\n"
-msgstr "  --libdir              affiche l'emplacement des bibliothèques\n"
+msgstr "  --libdir              affiche l'emplacement des bibliothèques\n"
 
 #: pg_config.c:440
 #, c-format
@@ -159,14 +159,14 @@
 msgid "  --sharedir            show location of architecture-independent support files\n"
 msgstr ""
 "  --sharedir            affiche l'emplacement des fichiers de support\n"
-"                        indépendants de l'architecture\n"
+"                        indépendants de l'architecture\n"
 
 #: pg_config.c:444
 #, c-format
 msgid "  --sysconfdir          show location of system-wide configuration files\n"
 msgstr ""
 "  --sysconfdir          affiche l'emplacement des fichiers de configuration\n"
-"                        globaux du système\n"
+"                        globaux du système\n"
 
 #: pg_config.c:445
 #, c-format
@@ -179,63 +179,63 @@
 "  --configure           show options given to \"configure\" script when\n"
 "                        PostgreSQL was built\n"
 msgstr ""
-"  --configure           affiche les options passées au script « configure »\n"
-"                        à la construction de PostgreSQL\n"
+"  --configure           affiche les options passées au script « configure »\n"
+"                        à la construction de PostgreSQL\n"
 
 #: pg_config.c:448
 #, c-format
 msgid "  --cc                  show CC value used when PostgreSQL was built\n"
 msgstr ""
-"  --cc                  affiche la valeur de CC utilisée lors de la\n"
+"  --cc                  affiche la valeur de CC utilisée lors de la\n"
 "                        construction de PostgreSQL\n"
 
 #: pg_config.c:449
 #, c-format
 msgid "  --cppflags            show CPPFLAGS value used when PostgreSQL was built\n"
 msgstr ""
-"  --cppflags            affiche la valeur de CPPFLAGS utilisée lors de la\n"
+"  --cppflags            affiche la valeur de CPPFLAGS utilisée lors de la\n"
 "                        construction de PostgreSQL\n"
 
 #: pg_config.c:450
 #, c-format
 msgid "  --cflags              show CFLAGS value used when PostgreSQL was built\n"
 msgstr ""
-"  --cflags              affiche la valeur de CFLAGS utilisée lors de la\n"
+"  --cflags              affiche la valeur de CFLAGS utilisée lors de la\n"
 "                        construction de PostgreSQL\n"
 
 #: pg_config.c:451
 #, c-format
 msgid "  --cflags_sl           show CFLAGS_SL value used when PostgreSQL was built\n"
 msgstr ""
-"  --cflags_sl           affiche la valeur de CFLAGS_SL utilisée lors de la\n"
+"  --cflags_sl           affiche la valeur de CFLAGS_SL utilisée lors de la\n"
 "                        construction de PostgreSQL\n"
 
 #: pg_config.c:452
 #, c-format
 msgid "  --ldflags             show LDFLAGS value used when PostgreSQL was built\n"
 msgstr ""
-"  --ldflags             affiche la valeur de LDFLAGS utilisée à lors de la\n"
+"  --ldflags             affiche la valeur de LDFLAGS utilisée à lors de la\n"
 "                        construction de PostgreSQL\n"
 
 #: pg_config.c:453
 #, c-format
 msgid "  --ldflags_ex          show LDFLAGS_EX value used when PostgreSQL was built\n"
 msgstr ""
-"  --ldflags_ex          affiche la valeur de LDFLAGS_EX  utilisée lors de la\n"
+"  --ldflags_ex          affiche la valeur de LDFLAGS_EX  utilisée lors de la\n"
 "                        construction de PostgreSQL\n"
 
 #: pg_config.c:454
 #, c-format
 msgid "  --ldflags_sl          show LDFLAGS_SL value used when PostgreSQL was built\n"
 msgstr ""
-"  --ldflags_sl          affiche la valeur de LDFLAGS_SL utilisée lors de la\n"
+"  --ldflags_sl          affiche la valeur de LDFLAGS_SL utilisée lors de la\n"
 "                        construction de PostgreSQL\n"
 
 #: pg_config.c:455
 #, c-format
 msgid "  --libs                show LIBS value used when PostgreSQL was built\n"
 msgstr ""
-"  --libs                affiche la valeur de LIBS utilisée lors de la\n"
+"  --libs                affiche la valeur de LIBS utilisée lors de la\n"
 "                        construction de PostgreSQL\n"
 
 #: pg_config.c:456
@@ -256,23 +256,23 @@
 "\n"
 msgstr ""
 "\n"
-"Sans argument, tous les éléments connus sont affichés.\n"
+"Sans argument, tous les éléments connus sont affichés.\n"
 "\n"
 
 #: pg_config.c:459
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
+msgstr "Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
 #: pg_config.c:465
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayer « %s --help » pour plus d'informations.\n"
+msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
 #: pg_config.c:504
 #, c-format
 msgid "%s: could not find own program executable\n"
-msgstr "%s : n'a pas pu trouver son propre exécutable\n"
+msgstr "%s : n'a pas pu trouver son propre exécutable\n"
 
 #: pg_config.c:527
 #, c-format
@@ -283,19 +283,19 @@
 #~ msgstr "  --help                affiche cette aide puis quitte\n"
 
 #~ msgid "child process exited with unrecognized status %d"
-#~ msgstr "le processus fils a quitté avec un statut %d non reconnu"
+#~ msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
 #~ msgid "child process was terminated by signal %d"
-#~ msgstr "le processus fils a été terminé par le signal %d"
+#~ msgstr "le processus fils a été terminé par le signal %d"
 
 #~ msgid "child process was terminated by signal %s"
-#~ msgstr "le processus fils a été terminé par le signal %s"
+#~ msgstr "le processus fils a été terminé par le signal %s"
 
 #~ msgid "child process was terminated by exception 0x%X"
-#~ msgstr "le processus fils a été terminé par l'exception 0x%X"
+#~ msgstr "le processus fils a été terminé par l'exception 0x%X"
 
 #~ msgid "child process exited with exit code %d"
-#~ msgstr "le processus fils a quitté avec le code de sortie %d"
+#~ msgstr "le processus fils a quitté avec le code de sortie %d"
 
 #~ msgid "could not change directory to \"%s\""
-#~ msgstr "n'a pas pu accéder au répertoire « %s »"
+#~ msgstr "n'a pas pu accéder au répertoire « %s »"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_config/po/ru.po postgresql-9.5-9.5.8/src/bin/pg_config/po/ru.po
--- postgresql-9.5-9.5.2/src/bin/pg_config/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_config/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,41 +1,26 @@
-# PG_CONFIG Translated Messages into the Russian Language (UTF-8)
+# Russian message translation file for pg_config
+# Copyright (C) 2004-2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Oleg Bartunov <oleg@sai.msu.su>, 2004.
+# Serguei A. Mokhov <mokhov@cs.concordia.ca>, 2004-2005.
+# Sergey Burladyan <eshkinkot@gmail.com>, 2009, 2012.
+# Andrey Sudnik <sudnikand@gmail.com>, 2010.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2016.
 #
-# Copyright (c) 2004-2005 Serguei A. Mokhov, mokhov@cs.concordia.ca
-# Copyright (c) 2012-2013 Alexander Lakhin <exclusion@gmail.com>
-# Distributed under the same licensing terms as PostgreSQL itself.
-#
-# pgtranslation Id: pg_config.po,v 1.4 2010/12/07 21:22:21 petere Exp $
-#
-# translation of subject-specific terminology, see:
-# перевод некоторых �пецифичных терминов:
-# http://wiki.postgresql.org/wiki/NLS/ru/dict
-#
-# ChangeLog:
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 17, 2012: Minor fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - December 1, 2010: translation for 9.1, Andrey Sudnik <sudnikand@gmail.com>.
-#   - March 26, 2009: complete translation for 8.3, Sergey Burladyan <eshkinkot@gmail.com>.
-#   - January 17, 2005: Complete translation for 8.0, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - December, 2004: Corrections and improvements by Oleg Bartunov <oleg@sai.msu.su>.
-#   - October 13 - November 24, 2004: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: pg_config (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-08-02 06:42+0000\n"
-"PO-Revision-Date: 2014-08-14 22:47+0400\n"
-"Last-Translator: Dmitriy Olshevskiy <olshevskiy87@bk.ru>\n"
-"Language-Team: Russian <pgtranslation-translators@pgfoundry.org>\n"
+"POT-Creation-Date: 2016-09-20 18:21+0000\n"
+"PO-Revision-Date: 2016-09-20 12:00+0300\n"
+"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.6.7\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_controldata/po/de.po postgresql-9.5-9.5.8/src/bin/pg_controldata/po/de.po
--- postgresql-9.5-9.5.2/src/bin/pg_controldata/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_controldata/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,14 +1,14 @@
 # German message translation file for pg_controldata
 # Peter Eisentraut <peter_e@gmx.net>, 2002 - 2015.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2016-01-04 02:14+0000\n"
-"PO-Revision-Date: 2016-01-03 21:29-0500\n"
+"PO-Revision-Date: 2016-04-24 22:54-0400\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -116,12 +116,12 @@
 #: pg_controldata.c:134 pg_controldata.c:152 pg_controldata.c:160
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
 #: pg_controldata.c:150
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: zu viele Kommandozeilenargumente (das erste ist „%s“)\n"
+msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
 #: pg_controldata.c:159
 #, c-format
@@ -131,12 +131,12 @@
 #: pg_controldata.c:168
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: konnte Datei „%s“ nicht zum Lesen öffnen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht zum Lesen öffnen: %s\n"
 
 #: pg_controldata.c:175
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht lesen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht lesen: %s\n"
 
 #: pg_controldata.c:189
 #, c-format
@@ -148,7 +148,7 @@
 msgstr ""
 "WARNUNG: Berechnete CRC-Checksumme stimmt nicht mit dem Wert in der Datei\n"
 "überein. Entweder ist die Datei kaputt oder sie hat ein anderes Layout\n"
-"als von diesem Program erwartet. Die Ergebnisse unten sind nicht\n"
+"als von diesem Programm erwartet. Die Ergebnisse unten sind nicht\n"
 "verlässlich.\n"
 "\n"
 
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_controldata/po/es.po postgresql-9.5-9.5.8/src/bin/pg_controldata/po/es.po
--- postgresql-9.5-9.5.2/src/bin/pg_controldata/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_controldata/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: pg_controldata (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:44+0000\n"
+"POT-Creation-Date: 2017-05-21 17:32+0000\n"
 "PO-Revision-Date: 2015-09-29 23:36-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: Castellano <pgsql-es-ayuda@postgresql.org>\n"
@@ -285,13 +285,13 @@
 
 #: pg_controldata.c:274
 #, c-format
-msgid "Latest checkpoint's oldestCommitTs:   %u\n"
-msgstr "oldestCommitTs del último checkpoint:       %u\n"
+msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
+msgstr "oldestCommitTsXid del último checkpoint:    %u\n"
 
 #: pg_controldata.c:276
 #, c-format
-msgid "Latest checkpoint's newestCommitTs:   %u\n"
-msgstr "newestCommitTs del último checkpoint:       %u\n"
+msgid "Latest checkpoint's newestCommitTsXid:%u\n"
+msgstr "newestCommitTsXid del último checkpoint:    %u\n"
 
 #: pg_controldata.c:278
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_controldata/po/fr.po postgresql-9.5-9.5.8/src/bin/pg_controldata/po/fr.po
--- postgresql-9.5-9.5.2/src/bin/pg_controldata/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_controldata/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,14 +1,14 @@
 # translation of pg_controldata.po to fr_fr
 # french message translation file for pg_controldata
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 #
-# Loïc Hennequin <loic.hennequin@wanadoo.fr>, 2002.
+# Loïc Hennequin <loic.hennequin@wanadoo.fr>, 2002.
 # Guillaume Lelarge <guillaume@lelarge.info>, 2003-2009.
-# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
+# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2016-02-17 02:43+0000\n"
 "PO-Revision-Date: 2016-02-21 15:17+0100\n"
@@ -16,7 +16,7 @@
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
@@ -26,7 +26,7 @@
 "%s displays control information of a PostgreSQL database cluster.\n"
 "\n"
 msgstr ""
-"%s affiche les informations de contrôle du cluster de bases de données\n"
+"%s affiche les informations de contrôle du cluster de bases de données\n"
 "PostgreSQL.\n"
 "\n"
 
@@ -38,7 +38,7 @@
 #: pg_controldata.c:37
 #, c-format
 msgid "  %s [OPTION] [DATADIR]\n"
-msgstr "  %s [OPTION] [RÉP_DONNÉES]\n"
+msgstr "  %s [OPTION] [RÉP_DONNÉES]\n"
 
 #: pg_controldata.c:38
 #, c-format
@@ -52,7 +52,7 @@
 #: pg_controldata.c:39
 #, c-format
 msgid " [-D] DATADIR    data directory\n"
-msgstr "  [-D] RÉPDONNEES    répertoire de la base de données\n"
+msgstr "  [-D] RÉPDONNEES    répertoire de la base de données\n"
 
 #: pg_controldata.c:40
 #, c-format
@@ -73,38 +73,38 @@
 "\n"
 msgstr ""
 "\n"
-"Si aucun répertoire (RÉP_DONNÉES) n'est indiqué, la variable\n"
-"d'environnement PGDATA est utilisée.\n"
+"Si aucun répertoire (RÉP_DONNÉES) n'est indiqué, la variable\n"
+"d'environnement PGDATA est utilisée.\n"
 "\n"
 
 #: pg_controldata.c:44
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
+msgstr "Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
 #: pg_controldata.c:54
 msgid "starting up"
-msgstr "démarrage en cours"
+msgstr "démarrage en cours"
 
 #: pg_controldata.c:56
 msgid "shut down"
-msgstr "arrêt"
+msgstr "arrêt"
 
 #: pg_controldata.c:58
 msgid "shut down in recovery"
-msgstr "arrêt pendant la restauration"
+msgstr "arrêt pendant la restauration"
 
 #: pg_controldata.c:60
 msgid "shutting down"
-msgstr "arrêt en cours"
+msgstr "arrêt en cours"
 
 #: pg_controldata.c:62
 msgid "in crash recovery"
-msgstr "restauration en cours (suite à un arrêt brutal)"
+msgstr "restauration en cours (suite à un arrêt brutal)"
 
 #: pg_controldata.c:64
 msgid "in archive recovery"
-msgstr "restauration en cours (à partir des archives)"
+msgstr "restauration en cours (à partir des archives)"
 
 #: pg_controldata.c:66
 msgid "in production"
@@ -121,27 +121,27 @@
 #: pg_controldata.c:134 pg_controldata.c:152 pg_controldata.c:160
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayer « %s --help » pour plus d'informations.\n"
+msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
 #: pg_controldata.c:150
 #, 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"
+msgstr "%s : trop d'arguments en ligne de commande (le premier étant « %s »)\n"
 
 #: pg_controldata.c:159
 #, c-format
 msgid "%s: no data directory specified\n"
-msgstr "%s : aucun répertoire de données indiqué\n"
+msgstr "%s : aucun répertoire de données indiqué\n"
 
 #: pg_controldata.c:168
 #, 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"
+msgstr "%s : n'a pas pu ouvrir le fichier « %s » en lecture : %s\n"
 
 #: pg_controldata.c:175
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s : n'a pas pu lire le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu lire le fichier « %s » : %s\n"
 
 #: pg_controldata.c:189
 #, c-format
@@ -151,17 +151,17 @@
 "is expecting.  The results below are untrustworthy.\n"
 "\n"
 msgstr ""
-"ATTENTION : Les sommes de contrôle (CRC) calculées ne correspondent pas aux\n"
-"valeurs stockées dans le fichier.\n"
-"Soit le fichier est corrompu, soit son organisation diffère de celle\n"
+"ATTENTION : Les sommes de contrôle (CRC) calculées ne correspondent pas aux\n"
+"valeurs stockées dans le fichier.\n"
+"Soit le fichier est corrompu, soit son organisation diffère de celle\n"
 "attendue par le programme.\n"
-"Les résultats ci-dessous ne sont pas dignes de confiance.\n"
+"Les résultats ci-dessous ne sont pas dignes de confiance.\n"
 "\n"
 
 #: pg_controldata.c:223
 #, c-format
 msgid "pg_control version number:            %u\n"
-msgstr "Numéro de version de pg_control :                       %u\n"
+msgstr "Numéro de version de pg_control :                       %u\n"
 
 #: pg_controldata.c:226
 #, c-format
@@ -171,46 +171,46 @@
 "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 ""
-"ATTENTION : possible incohérence dans l'ordre des octets\n"
-"L'ordre des octets utilisé pour enregistrer le fichier pg_control peut ne\n"
-"pas correspondre à celui utilisé par ce programme. Dans ce cas, les\n"
-"résultats ci-dessous sont incorrects, et l'installation PostgreSQL\n"
-"incompatible avec ce répertoire des données.\n"
+"ATTENTION : possible incohérence dans l'ordre des octets\n"
+"L'ordre des octets utilisé pour enregistrer le fichier pg_control peut ne\n"
+"pas correspondre à celui utilisé par ce programme. Dans ce cas, les\n"
+"résultats ci-dessous sont incorrects, et l'installation PostgreSQL\n"
+"incompatible avec ce répertoire des données.\n"
 
 #: pg_controldata.c:230
 #, c-format
 msgid "Catalog version number:               %u\n"
-msgstr "Numéro de version du catalogue :                        %u\n"
+msgstr "Numéro de version du catalogue :                        %u\n"
 
 #: pg_controldata.c:232
 #, c-format
 msgid "Database system identifier:           %s\n"
-msgstr "Identifiant du système de base de données :             %s\n"
+msgstr "Identifiant du système de base de données :             %s\n"
 
 #: pg_controldata.c:234
 #, c-format
 msgid "Database cluster state:               %s\n"
-msgstr "État du cluster de base de données :                    %s\n"
+msgstr "État du cluster de base de données :                    %s\n"
 
 #: pg_controldata.c:236
 #, c-format
 msgid "pg_control last modified:             %s\n"
-msgstr "Dernière modification de pg_control :                   %s\n"
+msgstr "Dernière modification de pg_control :                   %s\n"
 
 #: pg_controldata.c:238
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
-msgstr "Dernier point de contrôle :                             %X/%X\n"
+msgstr "Dernier point de contrôle :                             %X/%X\n"
 
 #: pg_controldata.c:241
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
-msgstr "Point de contrôle précédent :                           %X/%X\n"
+msgstr "Point de contrôle précédent :                           %X/%X\n"
 
 #: pg_controldata.c:244
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
-msgstr "Dernier REDO (reprise) du point de contrôle :           %X/%X\n"
+msgstr "Dernier REDO (reprise) du point de contrôle :           %X/%X\n"
 
 #: pg_controldata.c:247
 #, c-format
@@ -220,7 +220,7 @@
 #: pg_controldata.c:249
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
-msgstr "Dernier TimeLineID du point de contrôle :               %u\n"
+msgstr "Dernier TimeLineID du point de contrôle :               %u\n"
 
 #: pg_controldata.c:251
 #, c-format
@@ -230,50 +230,50 @@
 #: pg_controldata.c:253
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
-msgstr "Dernier full_page_writes du point de contrôle :         %s\n"
+msgstr "Dernier full_page_writes du point de contrôle :         %s\n"
 
 #: pg_controldata.c:254 pg_controldata.c:299 pg_controldata.c:309
 msgid "off"
-msgstr "désactivé"
+msgstr "désactivé"
 
 #: pg_controldata.c:254 pg_controldata.c:299 pg_controldata.c:309
 msgid "on"
-msgstr "activé"
+msgstr "activé"
 
 #: pg_controldata.c:255
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u/%u\n"
-msgstr "Dernier NextXID du point de contrôle :                  %u/%u\n"
+msgstr "Dernier NextXID du point de contrôle :                  %u/%u\n"
 
 #: pg_controldata.c:258
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "Dernier NextOID du point de contrôle :                  %u\n"
+msgstr "Dernier NextOID du point de contrôle :                  %u\n"
 
 #: pg_controldata.c:260
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
-msgstr "Dernier NextMultiXactId du point de contrôle :          %u\n"
+msgstr "Dernier NextMultiXactId du point de contrôle :          %u\n"
 
 #: pg_controldata.c:262
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
-msgstr "Dernier NextMultiOffset du point de contrôle :          %u\n"
+msgstr "Dernier NextMultiOffset du point de contrôle :          %u\n"
 
 #: pg_controldata.c:264
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
-msgstr "Dernier oldestXID du point de contrôle :                %u\n"
+msgstr "Dernier oldestXID du point de contrôle :                %u\n"
 
 #: pg_controldata.c:266
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
-msgstr "Dernier oldestXID du point de contrôle de la base :     %u\n"
+msgstr "Dernier oldestXID du point de contrôle de la base :     %u\n"
 
 #: pg_controldata.c:268
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
-msgstr "Dernier oldestActiveXID du point de contrôle :          %u\n"
+msgstr "Dernier oldestActiveXID du point de contrôle :          %u\n"
 
 #: pg_controldata.c:270
 #, c-format
@@ -298,17 +298,17 @@
 #: pg_controldata.c:278
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
-msgstr "Heure du dernier point de contrôle :                    %s\n"
+msgstr "Heure du dernier point de contrôle :                    %s\n"
 
 #: pg_controldata.c:280
 #, c-format
 msgid "Fake LSN counter for unlogged rels:   %X/%X\n"
-msgstr "Faux compteur LSN pour les relations non journalisés :  %X/%X\n"
+msgstr "Faux compteur LSN pour les relations non journalisés :  %X/%X\n"
 
 #: pg_controldata.c:283
 #, c-format
 msgid "Minimum recovery ending location:     %X/%X\n"
-msgstr "Emplacement de fin de la récupération minimale :        %X/%X\n"
+msgstr "Emplacement de fin de la récupération minimale :        %X/%X\n"
 
 #: pg_controldata.c:286
 #, c-format
@@ -318,7 +318,7 @@
 #: pg_controldata.c:288
 #, c-format
 msgid "Backup start location:                %X/%X\n"
-msgstr "Début de la sauvegarde :                                %X/%X\n"
+msgstr "Début de la sauvegarde :                                %X/%X\n"
 
 #: pg_controldata.c:291
 #, c-format
@@ -341,47 +341,47 @@
 #: pg_controldata.c:296
 #, c-format
 msgid "wal_level setting:                    %s\n"
-msgstr "Paramètrage actuel de wal_level :                       %s\n"
+msgstr "Paramètrage actuel de wal_level :                       %s\n"
 
 #: pg_controldata.c:298
 #, c-format
 msgid "wal_log_hints setting:                %s\n"
-msgstr "Paramétrage actuel de wal_log_hints :                   %s\n"
+msgstr "Paramétrage actuel de wal_log_hints :                   %s\n"
 
 #: pg_controldata.c:300
 #, c-format
 msgid "max_connections setting:              %d\n"
-msgstr "Paramètrage actuel de max_connections :                 %d\n"
+msgstr "Paramètrage actuel de max_connections :                 %d\n"
 
 #: pg_controldata.c:302
 #, c-format
 msgid "max_worker_processes setting:         %d\n"
-msgstr "Paramétrage actuel de max_worker_processes :            %d\n"
+msgstr "Paramétrage actuel de max_worker_processes :            %d\n"
 
 #: pg_controldata.c:304
 #, c-format
 msgid "max_prepared_xacts setting:           %d\n"
-msgstr "Paramètrage actuel de max_prepared_xacts :              %d\n"
+msgstr "Paramètrage actuel de max_prepared_xacts :              %d\n"
 
 #: pg_controldata.c:306
 #, c-format
 msgid "max_locks_per_xact setting:           %d\n"
-msgstr "Paramètrage actuel de max_locks_per_xact :              %d\n"
+msgstr "Paramètrage actuel de max_locks_per_xact :              %d\n"
 
 #: pg_controldata.c:308
 #, c-format
 msgid "track_commit_timestamp setting:       %s\n"
-msgstr "Paramètrage actuel de track_commit_timestamp :          %s\n"
+msgstr "Paramètrage actuel de track_commit_timestamp :          %s\n"
 
 #: pg_controldata.c:310
 #, c-format
 msgid "Maximum data alignment:               %u\n"
-msgstr "Alignement maximal des données :                        %u\n"
+msgstr "Alignement maximal des données :                        %u\n"
 
 #: pg_controldata.c:313
 #, c-format
 msgid "Database block size:                  %u\n"
-msgstr "Taille du bloc de la base de données :                  %u\n"
+msgstr "Taille du bloc de la base de données :                  %u\n"
 
 #: pg_controldata.c:315
 #, c-format
@@ -429,7 +429,7 @@
 
 #: pg_controldata.c:330
 msgid "floating-point numbers"
-msgstr "nombres à virgule flottante"
+msgstr "nombres à virgule flottante"
 
 #: pg_controldata.c:331
 #, c-format
@@ -438,7 +438,7 @@
 
 #: pg_controldata.c:332 pg_controldata.c:334
 msgid "by reference"
-msgstr "par référence"
+msgstr "par référence"
 
 #: pg_controldata.c:332 pg_controldata.c:334
 msgid "by value"
@@ -452,7 +452,7 @@
 #: pg_controldata.c:335
 #, c-format
 msgid "Data page checksum version:           %u\n"
-msgstr "Version des sommes de contrôle des pages de données :   %u\n"
+msgstr "Version des sommes de contrôle des pages de données :   %u\n"
 
 #~ msgid ""
 #~ "Usage:\n"
@@ -463,7 +463,7 @@
 #~ "  --version      output version information, then exit\n"
 #~ msgstr ""
 #~ "Usage :\n"
-#~ "  %s [OPTION] [RÉP_DONNÉES]\n"
+#~ "  %s [OPTION] [RÉP_DONNÉES]\n"
 #~ "\n"
 #~ "Options :\n"
 #~ "  --help         affiche cette aide et quitte\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_controldata/po/it.po postgresql-9.5-9.5.8/src/bin/pg_controldata/po/it.po
--- postgresql-9.5-9.5.2/src/bin/pg_controldata/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_controldata/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -23,8 +23,8 @@
 msgstr ""
 "Project-Id-Version: pg_controldata (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-06 14:44+0000\n"
-"PO-Revision-Date: 2015-07-07 03:17+0100\n"
+"POT-Creation-Date: 2016-04-12 00:44+0000\n"
+"PO-Revision-Date: 2017-04-23 03:02+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -32,7 +32,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: pg_controldata.c:35
 #, c-format
@@ -50,8 +51,8 @@
 
 #: pg_controldata.c:37
 #, c-format
-msgid "  %s [OPTION] [[-D] DATADIR]\n"
-msgstr "  %s [OPZIONE] [[-D] DATADIR]\n"
+msgid "  %s [OPTION] [DATADIR]\n"
+msgstr "  %s [OPZIONE] [DATADIR]\n"
 
 #: pg_controldata.c:38
 #, c-format
@@ -64,15 +65,20 @@
 
 #: pg_controldata.c:39
 #, c-format
+msgid " [-D] DATADIR    data directory\n"
+msgstr " [-D] DATADIR    directory dei dati\n"
+
+#: pg_controldata.c:40
+#, c-format
 msgid "  -V, --version  output version information, then exit\n"
 msgstr "  -V, --version  mostra informazioni sulla versione ed esci\n"
 
-#: pg_controldata.c:40
+#: pg_controldata.c:41
 #, c-format
 msgid "  -?, --help     show this help, then exit\n"
 msgstr "  -?, --help     mostra questo aiuto ed esci\n"
 
-#: pg_controldata.c:41
+#: pg_controldata.c:42
 #, c-format
 msgid ""
 "\n"
@@ -85,73 +91,73 @@
 "variabile d'ambiente PGDATA.\n"
 "\n"
 
-#: pg_controldata.c:43
+#: pg_controldata.c:44
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_controldata.c:53
+#: pg_controldata.c:54
 msgid "starting up"
 msgstr "avvio in corso"
 
-#: pg_controldata.c:55
+#: pg_controldata.c:56
 msgid "shut down"
 msgstr "spento"
 
-#: pg_controldata.c:57
+#: pg_controldata.c:58
 msgid "shut down in recovery"
 msgstr "arresto durante il ripristino"
 
-#: pg_controldata.c:59
+#: pg_controldata.c:60
 msgid "shutting down"
 msgstr "arresto in corso"
 
-#: pg_controldata.c:61
+#: pg_controldata.c:62
 msgid "in crash recovery"
 msgstr "in fase di recupero da un crash"
 
-#: pg_controldata.c:63
+#: pg_controldata.c:64
 msgid "in archive recovery"
 msgstr "in fase di recupero di un archivio"
 
-#: pg_controldata.c:65
+#: pg_controldata.c:66
 msgid "in production"
 msgstr "in produzione"
 
-#: pg_controldata.c:67
+#: pg_controldata.c:68
 msgid "unrecognized status code"
 msgstr "codice di stato sconosciuto"
 
-#: pg_controldata.c:84
+#: pg_controldata.c:85
 msgid "unrecognized wal_level"
 msgstr "wal_level sconosciuto"
 
-#: pg_controldata.c:133 pg_controldata.c:151 pg_controldata.c:159
+#: pg_controldata.c:134 pg_controldata.c:152 pg_controldata.c:160
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
 
-#: pg_controldata.c:149
+#: pg_controldata.c:150
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: troppi argomenti di riga di comando (il primo è \"%s\")\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:159
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: non è stata specificata una directory per i dati\n"
 
-#: pg_controldata.c:167
+#: pg_controldata.c:168
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: errore nell'apertura del file \"%s\" per la lettura: %s\n"
+msgstr "%s: apertura del file \"%s\" per la lettura fallita: %s\n"
 
-#: pg_controldata.c:174
+#: pg_controldata.c:175
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
 msgstr "%s: lettura del file \"%s\" fallita: %s\n"
 
-#: pg_controldata.c:188
+#: pg_controldata.c:189
 #, c-format
 msgid ""
 "WARNING: Calculated CRC checksum does not match value stored in file.\n"
@@ -159,17 +165,17 @@
 "is expecting.  The results below are untrustworthy.\n"
 "\n"
 msgstr ""
-"ATTENZIONE: La somma di controllo CRC non corrisponde al valore memorizzato nel file.\n"
-"O il file è corrotto oppure ha un formato differente da quello previsto.\n"
-"I risultati seguenti non sono affidabili.\n"
+"ATTENZIONE: Il codice di controllo CRC calcolato non combacia con quello\n"
+"memorizzato nel file. O il file è corrotto o ha un formato diverso da quanto\n"
+"questo programma si aspetta. I risultati seguenti non sono affidabili.\n"
 "\n"
 
-#: pg_controldata.c:222
+#: pg_controldata.c:223
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "Numero di versione di pg_control:           %u\n"
 
-#: pg_controldata.c:225
+#: pg_controldata.c:226
 #, c-format
 msgid ""
 "WARNING: possible byte ordering mismatch\n"
@@ -177,280 +183,285 @@
 "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 ""
-"ATTENZIONE: possibile errore nel byte ordering\n"
-"il byte ordering usato per archiviare il file pg_control potrebbe non\n"
-"corrispondere a quello usato da questo programma. In questo caso il risultato\n"
-"qui sotto potrebbe essere non corretto, e l'installazione di PostgreSQL\n"
-"potrebbe essere incompatibile con questa directory dei dati.\n"
+"ATTENZIONE: possibile differenza nell'ordine dei byte\n"
+"L'ordine dei byte usato per memorizzare il file pg_control potrebbe non\n"
+"combaciare con quello usato da questo programma. In questo caso i risultati\n"
+"seguenti non sarebbero corretti e l'installazione di PostgreSQL sarebbe\n"
+"incompatibile con questa directory di dati.\n"
 
-#: pg_controldata.c:229
+#: pg_controldata.c:230
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Numero di versione del catalogo:            %u\n"
 
-#: pg_controldata.c:231
+#: pg_controldata.c:232
 #, c-format
 msgid "Database system identifier:           %s\n"
 msgstr "Identificatore di sistema del database:     %s\n"
 
-#: pg_controldata.c:233
+#: pg_controldata.c:234
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "Stato del cluster di database:              %s\n"
 
-#: pg_controldata.c:235
+#: pg_controldata.c:236
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "Ultima modifica a pg_control:               %s\n"
 
-#: pg_controldata.c:237
+#: pg_controldata.c:238
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Ultima posizione del checkpoint:            %X/%X\n"
 
-#: pg_controldata.c:240
+#: pg_controldata.c:241
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "Posizione precedente del checkpoint:        %X/%X\n"
 
-#: pg_controldata.c:243
+#: pg_controldata.c:244
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "Locazione di REDO dell'ultimo checkpoint:   %X/%X\n"
 
-#: pg_controldata.c:246
+#: pg_controldata.c:247
 #, c-format
 msgid "Latest checkpoint's REDO WAL file:    %s\n"
 msgstr "File WAL di REDO dell'ultimo checkpoint:    %s\n"
 
-#: pg_controldata.c:248
+#: pg_controldata.c:249
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "TimeLineId dell'ultimo checkpoint:          %u\n"
 
-#: pg_controldata.c:250
+#: pg_controldata.c:251
 #, c-format
 msgid "Latest checkpoint's PrevTimeLineID:   %u\n"
 msgstr "PrevTimeLineID dell'ultimo checkpoint:      %u\n"
 
-#: pg_controldata.c:252
+#: pg_controldata.c:253
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "full_page_writes dell'ultimo checkpoint:    %s\n"
 
-#: pg_controldata.c:253 pg_controldata.c:296 pg_controldata.c:306
+#: pg_controldata.c:254 pg_controldata.c:299 pg_controldata.c:309
 msgid "off"
 msgstr "disattivato"
 
-#: pg_controldata.c:253 pg_controldata.c:296 pg_controldata.c:306
+#: pg_controldata.c:254 pg_controldata.c:299 pg_controldata.c:309
 msgid "on"
 msgstr "attivato"
 
-#: pg_controldata.c:254
+#: pg_controldata.c:255
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u/%u\n"
 msgstr "NextXID dell'ultimo checkpoint:             %u%u\n"
 
-#: pg_controldata.c:257
+#: pg_controldata.c:258
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID dell'ultimo checkpoint:             %u\n"
 
-#: pg_controldata.c:259
+#: pg_controldata.c:260
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId dell'ultimo checkpoint:     %u\n"
 
-#: pg_controldata.c:261
+#: pg_controldata.c:262
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset dell'ultimo checkpoint:     %u\n"
 
-#: pg_controldata.c:263
+#: pg_controldata.c:264
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID dell'ultimo checkpoint:           %u\n"
 
-#: pg_controldata.c:265
+#: pg_controldata.c:266
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "DB dell'oldestXID dell'ultimo checkpoint:   %u\n"
 
-#: pg_controldata.c:267
+#: pg_controldata.c:268
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "oldestActiveXID dell'ultimo checkpoint:     %u\n"
 
-#: pg_controldata.c:269
+#: pg_controldata.c:270
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXID dell'ultimo checkpoint:      %u\n"
 
-#: pg_controldata.c:271
+#: pg_controldata.c:272
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "DB dell'oldestMulti dell'ultimo checkpoint: %u\n"
 
-#: pg_controldata.c:273
+#: pg_controldata.c:274
+#, c-format
+msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
+msgstr "oldestCommitTsXid dell'ultimo checkpoint:   %u\n"
+
+#: pg_controldata.c:276
 #, c-format
-msgid "Latest checkpoint's oldestCommitTs:   %u\n"
-msgstr "oldestCommitTs dell'ultimo checkpoint:      %u\n"
+msgid "Latest checkpoint's newestCommitTsXid:%u\n"
+msgstr "newestCommitTsXid dell'ultimo checkpoint:   %u\n"
 
-#: pg_controldata.c:275
+#: pg_controldata.c:278
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "Orario ultimo checkpoint:                   %s\n"
 
-#: pg_controldata.c:277
+#: pg_controldata.c:280
 #, c-format
 msgid "Fake LSN counter for unlogged rels:   %X/%X\n"
 msgstr "Falso contatore LSN per rel. non loggate:   %X/%X\n"
 
-#: pg_controldata.c:280
+#: pg_controldata.c:283
 #, c-format
 msgid "Minimum recovery ending location:     %X/%X\n"
 msgstr "Posizione del minimum recovery ending:      %X/%X\n"
 
-#: pg_controldata.c:283
+#: pg_controldata.c:286
 #, c-format
 msgid "Min recovery ending loc's timeline:   %u\n"
 msgstr "Timeline posiz. minimum recovery ending:    %u\n"
 
-#: pg_controldata.c:285
+#: pg_controldata.c:288
 #, c-format
 msgid "Backup start location:                %X/%X\n"
 msgstr "Posizione dell'inizio del backup:           %X/%X\n"
 
-#: pg_controldata.c:288
+#: pg_controldata.c:291
 #, c-format
 msgid "Backup end location:                  %X/%X\n"
 msgstr "Posizione della fine del backup:            %X/%X\n"
 
-#: pg_controldata.c:291
+#: pg_controldata.c:294
 #, c-format
 msgid "End-of-backup record required:        %s\n"
 msgstr "Record di fine backup richiesto:            %s\n"
 
-#: pg_controldata.c:292
+#: pg_controldata.c:295
 msgid "no"
 msgstr "no"
 
-#: pg_controldata.c:292
+#: pg_controldata.c:295
 msgid "yes"
 msgstr "sì"
 
-#: pg_controldata.c:293
+#: pg_controldata.c:296
 #, c-format
-msgid "Current wal_level setting:            %s\n"
-msgstr "Impostazione attuale wal_level:             %s\n"
+msgid "wal_level setting:                    %s\n"
+msgstr "Impostazione di wal_level:                  %s\n"
 
-#: pg_controldata.c:295
+#: pg_controldata.c:298
 #, c-format
-msgid "Current wal_log_hints setting:        %s\n"
-msgstr "Impostazione attuale wal_log_hints:         %s\n"
+msgid "wal_log_hints setting:                %s\n"
+msgstr "Impostazione di wal_log_hints:              %s\n"
 
-#: pg_controldata.c:297
+#: pg_controldata.c:300
 #, c-format
-msgid "Current max_connections setting:      %d\n"
-msgstr "Impostazione attuale max_connections:       %d\n"
+msgid "max_connections setting:              %d\n"
+msgstr "Impostazione di max_connections:            %d\n"
 
-#: pg_controldata.c:299
+#: pg_controldata.c:302
 #, c-format
-msgid "Current max_worker_processes setting: %d\n"
-msgstr "Impostazione attuale max_worker_processes:  %d\n"
+msgid "max_worker_processes setting:         %d\n"
+msgstr "Impostazione di max_worker_processes:       %d\n"
 
-#: pg_controldata.c:301
+#: pg_controldata.c:304
 #, c-format
-msgid "Current max_prepared_xacts setting:   %d\n"
-msgstr "Impostazione attuale max_prepared_xacts:    %d\n"
+msgid "max_prepared_xacts setting:           %d\n"
+msgstr "Impostazione di max_prepared_xacts:         %d\n"
 
-#: pg_controldata.c:303
+#: pg_controldata.c:306
 #, c-format
-msgid "Current max_locks_per_xact setting:   %d\n"
-msgstr "Impostazione attuale max_locks_per_xact:    %d\n"
+msgid "max_locks_per_xact setting:           %d\n"
+msgstr "Impostazione di max_locks_per_xact:         %d\n"
 
-#: pg_controldata.c:305
+#: pg_controldata.c:308
 #, c-format
-msgid "Current track_commit_timestamp setting: %s\n"
-msgstr "Attuale impostazione track_commit_timestamp:%s\n"
+msgid "track_commit_timestamp setting:       %s\n"
+msgstr "Impostazione di track_commit_timestamp:     %s\n"
 
-#: pg_controldata.c:307
+#: pg_controldata.c:310
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Massimo allineamento dei dati:              %u\n"
 
-#: pg_controldata.c:310
+#: pg_controldata.c:313
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Dimensione blocco database:                 %u\n"
 
-#: pg_controldata.c:312
+#: pg_controldata.c:315
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blocchi per ogni segmento grosse tabelle:   %u\n"
 
-#: pg_controldata.c:314
+#: pg_controldata.c:317
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Dimensione blocco WAL:                      %u\n"
 
-#: pg_controldata.c:316
+#: pg_controldata.c:319
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Byte per segmento WAL:                      %u\n"
 
-#: pg_controldata.c:318
+#: pg_controldata.c:321
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Lunghezza massima degli identificatori:     %u\n"
 
-#: pg_controldata.c:320
+#: pg_controldata.c:323
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Massimo numero di colonne in un indice:     %u\n"
 
-#: pg_controldata.c:322
+#: pg_controldata.c:325
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Massima dimensione di un segmento TOAST:    %u\n"
 
-#: pg_controldata.c:324
+#: pg_controldata.c:327
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Dimensione di un blocco large-object:       %u\n"
 
-#: pg_controldata.c:326
+#: pg_controldata.c:329
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Memorizzazione per tipi data/ora:           %s\n"
 
-#: pg_controldata.c:327
+#: pg_controldata.c:330
 msgid "64-bit integers"
 msgstr "interi a 64 bit"
 
-#: pg_controldata.c:327
+#: pg_controldata.c:330
 msgid "floating-point numbers"
 msgstr "numeri in virgola mobile"
 
-#: pg_controldata.c:328
+#: pg_controldata.c:331
 #, c-format
 msgid "Float4 argument passing:              %s\n"
 msgstr "Passaggio di argomenti Float4:              %s\n"
 
-#: pg_controldata.c:329 pg_controldata.c:331
+#: pg_controldata.c:332 pg_controldata.c:334
 msgid "by reference"
 msgstr "per riferimento"
 
-#: pg_controldata.c:329 pg_controldata.c:331
+#: pg_controldata.c:332 pg_controldata.c:334
 msgid "by value"
 msgstr "per valore"
 
-#: pg_controldata.c:330
+#: pg_controldata.c:333
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "passaggio di argomenti Float8:              %s\n"
 
-#: pg_controldata.c:332
+#: pg_controldata.c:335
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Versione somma di controllo dati pagine:    %u\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_controldata/po/ru.po postgresql-9.5-9.5.8/src/bin/pg_controldata/po/ru.po
--- postgresql-9.5-9.5.2/src/bin/pg_controldata/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_controldata/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,38 +1,25 @@
-# PG_CONTROLDATA Translated Messages into the Russian Language (UTF-8)
+# Russian message translation file for pg_controldata
+# Copyright (C) 2002-2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Serguei A. Mokhov <mokhov@cs.concordia.ca>, 2002-2004.
+# Oleg Bartunov <oleg@sai.msu.su>, 2004.
+# Andrey Sudnik <sudnikand@gmail.com>, 2011.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# Copyright (c) 2012-2013 Alexander Lakhin <exclusion@gmail.com>
-# Distributed under the same licensing terms as PostgreSQL itself.
-#
-# pgtranslation Id: pg_controldata.po,v 1.3 2011/05/14 01:57:42 alvherre Exp $
-#
-# ChangeLog:
-#   - May 20, 2013: Alexander Lakhin <exclusion@gmail.com>.
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 17, 2012: Minor fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - January 27, 2011: improvments by Andrey Sudnik for 9.x <sudnikand@gmail.com>.
-#   - December, 2004: Corrections and improvements by Oleg Bartunov <oleg@sai.msu.su>.
-#   - March 27 - September 24, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>.
-#   - July 24 - August 23, 2003: Updates for 7.4.*; <mokhov@cs.concordia.ca>.
-#   - September 7, 2002: Complete post 7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: pg_controldata (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-12-29 22:14+0000\n"
-"PO-Revision-Date: 2015-12-31 14:51+0300\n"
+"POT-Creation-Date: 2017-02-06 22:21+0000\n"
+"PO-Revision-Date: 2016-12-20 18:28+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 2.0\n"
 
 #: pg_controldata.c:35
 #, c-format
@@ -210,36 +197,43 @@
 msgid "pg_control last modified:             %s\n"
 msgstr "По�леднее обновление pg_control:      %s\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:238
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Положение по�ледней конт. точки:      %X/%X\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:241
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "Положение предыдущей конт. точки:     %X/%X\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:244
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "Положение REDO по�ледней конт. точки: %X/%X\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:247
 #, c-format
 msgid "Latest checkpoint's REDO WAL file:    %s\n"
-msgstr "Файл WAL c REDO по�ледней к.т.:       %s\n"
+msgstr "Файл WAL c REDO по�ледней к. т.:      %s\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:249
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "Лини� времени по�ледней конт. точки:  %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:251
 #, c-format
 msgid "Latest checkpoint's PrevTimeLineID:   %u\n"
-msgstr "Пред. лини� времени по�ледней к.т.:   %u\n"
+msgstr "Пред. лини� времени по�ледней к. т.:  %u\n"
 
+# skip-rule: no-space-after-period
 #: pg_controldata.c:253
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
@@ -253,56 +247,67 @@
 msgid "on"
 msgstr "вкл."
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:255
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u/%u\n"
 msgstr "NextXID по�ледней конт. точки:        %u/%u\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:258
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID по�ледней конт. точки:        %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:260
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId по�лед. конт. точки:  %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:262
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset по�лед. конт. точки:  %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:264
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID по�ледней конт. точки:      %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:266
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "БД � oldestXID по�ледней конт. точки: %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:268
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
-msgstr "oldestActiveXID по�ледней к.т.:       %u\n"
+msgstr "oldestActiveXID по�ледней к. т.:      %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:270
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXid по�ледней конт. точки: %u\n"
 
+# skip-rule: double-space, capital-letter-first
 #: pg_controldata.c:272
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
-msgstr "БД � oldestMulti по�ледней к.т.:      %u\n"
+msgstr "БД � oldestMulti по�ледней к. т.:     %u\n"
 
+# skip-rule: double-space, capital-letter-first
 #: pg_controldata.c:274
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "oldestCommitTsXid по�ледней к. т.:    %u\n"
 
+# skip-rule: capital-letter-first, double-space
 #: pg_controldata.c:276
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
@@ -313,6 +318,8 @@
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "Врем� по�ледней контрольной точки:    %s\n"
 
+# skip-rule: capital-letter-first
+# well-spelled: нежурналир
 #: pg_controldata.c:280
 #, c-format
 msgid "Fake LSN counter for unlogged rels:   %X/%X\n"
@@ -323,10 +330,11 @@
 msgid "Minimum recovery ending location:     %X/%X\n"
 msgstr "Мин. положение конца во��тановлени�:  %X/%X\n"
 
+# skip-rule: capital-letter-first
 #: pg_controldata.c:286
 #, c-format
 msgid "Min recovery ending loc's timeline:   %u\n"
-msgstr "Лини� времени мин. положени� к.в.:    %u\n"
+msgstr "Лини� времени мин. положени� к. в.:   %u\n"
 
 #: pg_controldata.c:288
 #, c-format
@@ -396,6 +404,7 @@
 msgid "Database block size:                  %u\n"
 msgstr "Размер блока БД:                      %u\n"
 
+# skip-rule: double-space
 #: pg_controldata.c:315
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
@@ -419,7 +428,7 @@
 #: pg_controldata.c:323
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
-msgstr "Мак�имальное чи�ло �толбцов в индек�е: %u\n"
+msgstr "Мак�. чи�ло �толбцов в индек�е:       %u\n"
 
 #: pg_controldata.c:325
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_ctl/po/de.po postgresql-9.5-9.5.8/src/bin/pg_ctl/po/de.po
--- postgresql-9.5-9.5.2/src/bin/pg_ctl/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_ctl/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,7 +1,7 @@
 # German message translation file for pg_ctl
 # Peter Eisentraut <peter_e@gmx.net>, 2004 - 2015.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
@@ -24,27 +24,27 @@
 #: ../../common/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "ungültige Programmdatei „%s“"
+msgstr "ungültige Programmdatei »%s«"
 
 #: ../../common/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "konnte Programmdatei „%s“ nicht lesen"
+msgstr "konnte Programmdatei »%s« nicht lesen"
 
 #: ../../common/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "konnte kein „%s“ zum Ausführen finden"
+msgstr "konnte kein »%s« zum Ausführen finden"
 
 #: ../../common/exec.c:257 ../../common/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "konnte nicht in Verzeichnis „%s“ wechseln: %s"
+msgstr "konnte nicht in Verzeichnis »%s« wechseln: %s"
 
 #: ../../common/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "konnte symbolische Verknüpfung „%s“ nicht lesen"
+msgstr "konnte symbolische Verknüpfung »%s« nicht lesen"
 
 #: ../../common/exec.c:523
 #, c-format
@@ -106,32 +106,32 @@
 #: pg_ctl.c:258
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
-msgstr "%s: Verzeichnis „%s“ existiert nicht\n"
+msgstr "%s: Verzeichnis »%s« existiert nicht\n"
 
 #: pg_ctl.c:261
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
-msgstr "%s: konnte nicht auf Verzeichnis „%s“ zugreifen: %s\n"
+msgstr "%s: konnte nicht auf Verzeichnis »%s« zugreifen: %s\n"
 
 #: pg_ctl.c:275
 #, c-format
 msgid "%s: directory \"%s\" is not a database cluster directory\n"
-msgstr "%s: Verzeichnis „%s“ ist kein Datenbankclusterverzeichnis\n"
+msgstr "%s: Verzeichnis »%s« ist kein Datenbankclusterverzeichnis\n"
 
 #: pg_ctl.c:288
 #, c-format
 msgid "%s: could not open PID file \"%s\": %s\n"
-msgstr "%s: konnte PID-Datei „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte PID-Datei »%s« nicht öffnen: %s\n"
 
 #: pg_ctl.c:297
 #, c-format
 msgid "%s: the PID file \"%s\" is empty\n"
-msgstr "%s: die PID-Datei „%s“ ist leer\n"
+msgstr "%s: die PID-Datei »%s« ist leer\n"
 
 #: pg_ctl.c:300
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
-msgstr "%s: ungültige Daten in PID-Datei „%s“\n"
+msgstr "%s: ungültige Daten in PID-Datei »%s«\n"
 
 #: pg_ctl.c:450 pg_ctl.c:478
 #, c-format
@@ -169,12 +169,12 @@
 #: pg_ctl.c:760
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: konnte Datei „%s“ nicht lesen\n"
+msgstr "%s: konnte Datei »%s« nicht lesen\n"
 
 #: pg_ctl.c:765
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: Optionsdatei „%s“ muss genau eine Zeile haben\n"
+msgstr "%s: Optionsdatei »%s« muss genau eine Zeile haben\n"
 
 #: pg_ctl.c:816
 #, c-format
@@ -183,8 +183,8 @@
 "same directory as \"%s\".\n"
 "Check your installation.\n"
 msgstr ""
-"Das Programm „%s“ wird von %s benötigt, aber wurde nicht im\n"
-"selben Verzeichnis wie „%s“ gefunden.\n"
+"Das Programm »%s« wird von %s benötigt, aber wurde nicht im\n"
+"selben Verzeichnis wie »%s« gefunden.\n"
 "Prüfen Sie Ihre Installation.\n"
 
 #: pg_ctl.c:822
@@ -194,7 +194,7 @@
 "but was not the same version as %s.\n"
 "Check your installation.\n"
 msgstr ""
-"Das Programm „%s“ wurde von %s gefunden,\n"
+"Das Programm »%s« wurde von %s gefunden,\n"
 "aber es hatte nicht die gleiche Version wie %s.\n"
 "Prüfen Sie Ihre Installation.\n"
 
@@ -253,7 +253,7 @@
 #: pg_ctl.c:956 pg_ctl.c:1042 pg_ctl.c:1132 pg_ctl.c:1172
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: PID-Datei „%s“ existiert nicht\n"
+msgstr "%s: PID-Datei »%s« existiert nicht\n"
 
 #: pg_ctl.c:957 pg_ctl.c:1044 pg_ctl.c:1133 pg_ctl.c:1173
 msgid "Is server running?\n"
@@ -297,7 +297,7 @@
 "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
 msgstr ""
-"TIPP: Die Option „-m fast“ beendet Sitzungen sofort, statt auf das Beenden\n"
+"TIPP: Die Option »-m fast« beendet Sitzungen sofort, statt auf das Beenden\n"
 "durch die Sitzungen selbst zu warten.\n"
 
 #: pg_ctl.c:1022 pg_ctl.c:1112
@@ -349,12 +349,12 @@
 #: pg_ctl.c:1203
 #, 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"
+msgstr "%s: konnte Signaldatei zum Befördern »%s« nicht erzeugen: %s\n"
 
 #: pg_ctl.c:1209
 #, 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"
+msgstr "%s: konnte Signaldatei zum Befördern »%s« nicht schreiben: %s\n"
 
 #: pg_ctl.c:1217
 #, c-format
@@ -364,7 +364,7 @@
 #: pg_ctl.c:1220
 #, 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"
+msgstr "%s: konnte Signaldatei zum Befördern »%s« nicht entfernen: %s\n"
 
 #: pg_ctl.c:1225
 msgid "server promoting\n"
@@ -398,7 +398,7 @@
 #: pg_ctl.c:1386
 #, c-format
 msgid "%s: could not find postgres program executable\n"
-msgstr "%s: konnte „postgres“ Programmdatei nicht finden\n"
+msgstr "%s: konnte »postgres« Programmdatei nicht finden\n"
 
 #: pg_ctl.c:1469 pg_ctl.c:1503
 #, c-format
@@ -408,27 +408,27 @@
 #: pg_ctl.c:1475
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
-msgstr "%s: Systemdienst „%s“ ist bereits registriert\n"
+msgstr "%s: Systemdienst »%s« ist bereits registriert\n"
 
 #: pg_ctl.c:1486
 #, c-format
 msgid "%s: could not register service \"%s\": error code %lu\n"
-msgstr "%s: konnte Systemdienst „%s“ nicht registrieren: Fehlercode %lu\n"
+msgstr "%s: konnte Systemdienst »%s« nicht registrieren: Fehlercode %lu\n"
 
 #: pg_ctl.c:1509
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
-msgstr "%s: Systemdienst „%s“ ist nicht registriert\n"
+msgstr "%s: Systemdienst »%s« ist nicht registriert\n"
 
 #: pg_ctl.c:1516
 #, c-format
 msgid "%s: could not open service \"%s\": error code %lu\n"
-msgstr "%s: konnte Systemdienst „%s“ nicht öffnen: Fehlercode %lu\n"
+msgstr "%s: konnte Systemdienst »%s« nicht öffnen: Fehlercode %lu\n"
 
 #: pg_ctl.c:1525
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %lu\n"
-msgstr "%s: konnte Systemdienst „%s“ nicht deregistrieren: Fehlercode %lu\n"
+msgstr "%s: konnte Systemdienst »%s« nicht deregistrieren: Fehlercode %lu\n"
 
 #: pg_ctl.c:1612
 msgid "Waiting for server startup...\n"
@@ -445,7 +445,7 @@
 #: pg_ctl.c:1674
 #, c-format
 msgid "%s: could not start service \"%s\": error code %lu\n"
-msgstr "%s: konnte Systemdienst „%s“ nicht starten: Fehlercode %lu\n"
+msgstr "%s: konnte Systemdienst »%s« nicht starten: Fehlercode %lu\n"
 
 #: pg_ctl.c:1748
 #, c-format
@@ -475,7 +475,7 @@
 #: pg_ctl.c:1914
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
 #: pg_ctl.c:1922
 #, c-format
@@ -670,7 +670,7 @@
 #: pg_ctl.c:1964
 #, c-format
 msgid "  -m, --mode=MODE        MODE can be \"smart\", \"fast\", or \"immediate\"\n"
-msgstr "  -m, --mode=MODUS       MODUS kann „smart“, „fast“ oder „immediate“ sein\n"
+msgstr "  -m, --mode=MODUS       MODUS kann »smart«, »fast« oder »immediate« sein\n"
 
 #: pg_ctl.c:1966
 #, c-format
@@ -705,7 +705,7 @@
 "Allowed signal names for kill:\n"
 msgstr ""
 "\n"
-"Erlaubte Signalnamen für „kill“:\n"
+"Erlaubte Signalnamen für »kill«:\n"
 
 #: pg_ctl.c:1975
 #, c-format
@@ -714,7 +714,7 @@
 "Options for register and unregister:\n"
 msgstr ""
 "\n"
-"Optionen für „register“ und „unregister“:\n"
+"Optionen für »register« und »unregister«:\n"
 
 #: pg_ctl.c:1976
 #, c-format
@@ -769,22 +769,22 @@
 #: pg_ctl.c:2011
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s: unbekannter Shutdown-Modus „%s“\n"
+msgstr "%s: unbekannter Shutdown-Modus »%s«\n"
 
 #: pg_ctl.c:2043
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s: unbekannter Signalname „%s“\n"
+msgstr "%s: unbekannter Signalname »%s«\n"
 
 #: pg_ctl.c:2060
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
-msgstr "%s: unbekannter Starttyp „%s“\n"
+msgstr "%s: unbekannter Starttyp »%s«\n"
 
 #: pg_ctl.c:2115
 #, c-format
 msgid "%s: could not determine the data directory using command \"%s\"\n"
-msgstr "%s: konnte das Datenverzeichnis mit Befehl „%s“ nicht ermitteln\n"
+msgstr "%s: konnte das Datenverzeichnis mit Befehl »%s« nicht ermitteln\n"
 
 #: pg_ctl.c:2187
 #, c-format
@@ -794,7 +794,7 @@
 "own the server process.\n"
 msgstr ""
 "%s: kann nicht als root ausgeführt werden\n"
-"Bitte loggen Sie sich (z.B. mit „su“) als der (unprivilegierte) Benutzer\n"
+"Bitte loggen Sie sich (z.B. mit »su«) als der (unprivilegierte) Benutzer\n"
 "ein, der Eigentümer des Serverprozesses sein soll.\n"
 
 #: pg_ctl.c:2266
@@ -805,17 +805,17 @@
 #: pg_ctl.c:2304
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: zu viele Kommandozeilenargumente (das erste ist „%s“)\n"
+msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
 #: pg_ctl.c:2328
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: fehlende Argumente für „kill“-Modus\n"
+msgstr "%s: fehlende Argumente für »kill«-Modus\n"
 
 #: pg_ctl.c:2346
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: unbekannter Operationsmodus „%s“\n"
+msgstr "%s: unbekannter Operationsmodus »%s«\n"
 
 #: pg_ctl.c:2356
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_ctl/po/es.po postgresql-9.5-9.5.8/src/bin/pg_ctl/po/es.po
--- postgresql-9.5-9.5.2/src/bin/pg_ctl/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_ctl/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: pg_ctl (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:43+0000\n"
+"POT-Creation-Date: 2017-05-21 17:31+0000\n"
 "PO-Revision-Date: 2015-09-30 12:18-0300\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL Español <pgsql-es-ayuda@postgresql.org>\n"
@@ -56,8 +56,8 @@
 msgstr "pclose falló: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 ../../port/path.c:598 ../../port/path.c:636
-#: ../../port/path.c:653
+#: ../../common/fe_memutils.c:98 ../../port/path.c:602 ../../port/path.c:640
+#: ../../port/path.c:657
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
@@ -102,95 +102,87 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
 
-#: ../../port/path.c:620
+#: ../../port/path.c:624
 #, c-format
 msgid "could not get current working directory: %s\n"
 msgstr "no se pudo obtener el directorio de trabajo actual: %s\n"
 
-#: pg_ctl.c:257
+#: pg_ctl.c:263
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
 msgstr "%s: el directorio «%s» no existe\n"
 
-#: pg_ctl.c:260
+#: pg_ctl.c:266
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: no se pudo acceder al directorio «%s»: %s\n"
 
-#: pg_ctl.c:274
+#: pg_ctl.c:280
 #, c-format
 msgid "%s: directory \"%s\" is not a database cluster directory\n"
 msgstr "%s: el directorio «%s» no es un directorio de base de datos\n"
 
-#: pg_ctl.c:287
+#: pg_ctl.c:293
 #, 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:296
+#: pg_ctl.c:302
 #, c-format
 msgid "%s: the PID file \"%s\" is empty\n"
 msgstr "%s: el archivo de PID «%s» está vacío\n"
 
-#: pg_ctl.c:299
+#: pg_ctl.c:305
 #, 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:530
+#: pg_ctl.c:455 pg_ctl.c:483
 #, 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"
+msgid "%s: could not start server: %s\n"
+msgstr "%s: no se pudo iniciar el servidor: %s\n"
 
-#: pg_ctl.c:600
+#: pg_ctl.c:507
 #, 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"
+msgid "%s: could not start server: error code %lu\n"
+msgstr "%s: no se pudo iniciar el servidor: código de error %lu\n"
 
-#: pg_ctl.c:653
+#: pg_ctl.c:584
 #, c-format
 msgid ""
 "\n"
-"%s: could not stat file \"%s\": %s\n"
+"%s: -w option is not supported when starting a pre-9.1 server\n"
 msgstr ""
 "\n"
-"%s: no se pudo hacer «stat» al archivo «%s»: %s\n"
+"%s: la opción -w no está soportada cuando se inicia un servidor anterior a 9.1\n"
 
-#: pg_ctl.c:660
+#: pg_ctl.c:649
 #, c-format
 msgid ""
 "\n"
-"%s: this data directory appears to be running a pre-existing postmaster\n"
+"%s: -w option cannot use a relative socket directory specification\n"
 msgstr ""
 "\n"
-"%s: este directorio de datos parece estar ejecutando un postmaster pre-existente\n"
+"%s: la opción -w no puede usar una especificación relativa de directorio\n"
 
-#: pg_ctl.c:710
+#: pg_ctl.c:751
 #, 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:735
+#: pg_ctl.c:776
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: no se pudo leer el archivo «%s»\n"
 
-#: pg_ctl.c:740
+#: pg_ctl.c:781
 #, 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:791
+#: pg_ctl.c:832
 #, c-format
 msgid ""
 "The program \"%s\" is needed by %s but was not found in the\n"
@@ -201,7 +193,7 @@
 "directorio que «%s».\n"
 "Verifique su instalación.\n"
 
-#: pg_ctl.c:797
+#: pg_ctl.c:838
 #, c-format
 msgid ""
 "The program \"%s\" was found by \"%s\"\n"
@@ -212,42 +204,37 @@
 "de la misma versión que «%s».\n"
 "Verifique su instalación.\n"
 
-#: pg_ctl.c:830
+#: pg_ctl.c:871
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: falló la creación de la base de datos\n"
 
-#: pg_ctl.c:845
+#: pg_ctl.c:886
 #, 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:882
-#, 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:889
+#: pg_ctl.c:924
 msgid "waiting for server to start..."
 msgstr "esperando que el servidor se inicie..."
 
-#: pg_ctl.c:894 pg_ctl.c:995 pg_ctl.c:1086
+#: pg_ctl.c:929 pg_ctl.c:1036 pg_ctl.c:1127
 msgid " done\n"
 msgstr " listo\n"
 
-#: pg_ctl.c:895
+#: pg_ctl.c:930
 msgid "server started\n"
 msgstr "servidor iniciado\n"
 
-#: pg_ctl.c:898 pg_ctl.c:902
+#: pg_ctl.c:933 pg_ctl.c:937
 msgid " stopped waiting\n"
 msgstr " abandonando la espera\n"
 
-#: pg_ctl.c:899
+#: pg_ctl.c:934
 msgid "server is still starting up\n"
 msgstr "servidor aún iniciándose\n"
 
-#: pg_ctl.c:903
+#: pg_ctl.c:938
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -256,45 +243,45 @@
 "%s: no se pudo iniciar el servidor.\n"
 "Examine el registro del servidor.\n"
 
-#: pg_ctl.c:909 pg_ctl.c:987 pg_ctl.c:1077
+#: pg_ctl.c:944 pg_ctl.c:1028 pg_ctl.c:1118
 msgid " failed\n"
 msgstr " falló\n"
 
-#: pg_ctl.c:910
+#: pg_ctl.c:945
 #, 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:916
+#: pg_ctl.c:951
 msgid "server starting\n"
 msgstr "servidor iniciándose\n"
 
-#: pg_ctl.c:931 pg_ctl.c:1017 pg_ctl.c:1107 pg_ctl.c:1147
+#: pg_ctl.c:972 pg_ctl.c:1058 pg_ctl.c:1148 pg_ctl.c:1188
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: el archivo de PID «%s» no existe\n"
 
-#: pg_ctl.c:932 pg_ctl.c:1019 pg_ctl.c:1108 pg_ctl.c:1148
+#: pg_ctl.c:973 pg_ctl.c:1060 pg_ctl.c:1149 pg_ctl.c:1189
 msgid "Is server running?\n"
 msgstr "¿Está el servidor en ejecución?\n"
 
-#: pg_ctl.c:938
+#: pg_ctl.c:979
 #, 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:946 pg_ctl.c:1041
+#: pg_ctl.c:987 pg_ctl.c:1082
 #, 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:953
+#: pg_ctl.c:994
 msgid "server shutting down\n"
 msgstr "servidor deteniéndose\n"
 
-#: pg_ctl.c:968 pg_ctl.c:1056
+#: pg_ctl.c:1009 pg_ctl.c:1097
 msgid ""
 "WARNING: online backup mode is active\n"
 "Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -304,16 +291,16 @@
 "El apagado no se completará hasta que se invoque la función pg_stop_backup().\n"
 "\n"
 
-#: pg_ctl.c:972 pg_ctl.c:1060
+#: pg_ctl.c:1013 pg_ctl.c:1101
 msgid "waiting for server to shut down..."
 msgstr "esperando que el servidor se detenga..."
 
-#: pg_ctl.c:989 pg_ctl.c:1079
+#: pg_ctl.c:1030 pg_ctl.c:1120
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: el servidor no se detiene\n"
 
-#: pg_ctl.c:991 pg_ctl.c:1081
+#: pg_ctl.c:1032 pg_ctl.c:1122
 msgid ""
 "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
@@ -321,192 +308,192 @@
 "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:997 pg_ctl.c:1087
+#: pg_ctl.c:1038 pg_ctl.c:1128
 msgid "server stopped\n"
 msgstr "servidor detenido\n"
 
-#: pg_ctl.c:1020 pg_ctl.c:1093
+#: pg_ctl.c:1061 pg_ctl.c:1134
 msgid "starting server anyway\n"
 msgstr "iniciando el servidor de todas maneras\n"
 
-#: pg_ctl.c:1029
+#: pg_ctl.c:1070
 #, 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:1032 pg_ctl.c:1117
+#: pg_ctl.c:1073 pg_ctl.c:1158
 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:1091
+#: pg_ctl.c:1132
 #, 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:1114
+#: pg_ctl.c:1155
 #, 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:1123
+#: pg_ctl.c:1164
 #, 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:1128
+#: pg_ctl.c:1169
 msgid "server signaled\n"
 msgstr "se ha enviado una señal al servidor\n"
 
-#: pg_ctl.c:1154
+#: pg_ctl.c:1195
 #, 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:1163
+#: pg_ctl.c:1204
 #, 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:1178
+#: pg_ctl.c:1219
 #, 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:1184
+#: pg_ctl.c:1225
 #, 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:1192
+#: pg_ctl.c:1233
 #, 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:1195
+#: pg_ctl.c:1236
 #, 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:1200
+#: pg_ctl.c:1241
 msgid "server promoting\n"
 msgstr "servidor promoviendo\n"
 
-#: pg_ctl.c:1247
+#: pg_ctl.c:1288
 #, 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:1260
+#: pg_ctl.c:1301
 #, c-format
 msgid "%s: server is running (PID: %ld)\n"
 msgstr "%s: el servidor está en ejecución (PID: %ld)\n"
 
-#: pg_ctl.c:1276
+#: pg_ctl.c:1317
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: no hay servidor en ejecución\n"
 
-#: pg_ctl.c:1294
+#: pg_ctl.c:1335
 #, 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:1351
+#: pg_ctl.c:1392
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: no se pudo encontrar el ejecutable propio\n"
 
-#: pg_ctl.c:1361
+#: pg_ctl.c:1402
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: no se pudo encontrar el ejecutable postgres\n"
 
-#: pg_ctl.c:1444 pg_ctl.c:1478
+#: pg_ctl.c:1486 pg_ctl.c:1520
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: no se pudo abrir el gestor de servicios\n"
 
-#: pg_ctl.c:1450
+#: pg_ctl.c:1492
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: el servicio «%s» ya está registrado\n"
 
-#: pg_ctl.c:1461
+#: pg_ctl.c:1503
 #, c-format
 msgid "%s: could not register service \"%s\": error code %lu\n"
 msgstr "%s: no se pudo registrar el servicio «%s»: código de error %lu\n"
 
-#: pg_ctl.c:1484
+#: pg_ctl.c:1526
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: el servicio «%s» no ha sido registrado\n"
 
-#: pg_ctl.c:1491
+#: pg_ctl.c:1533
 #, c-format
 msgid "%s: could not open service \"%s\": error code %lu\n"
 msgstr "%s: no se pudo abrir el servicio «%s»: código de error %lu\n"
 
-#: pg_ctl.c:1500
+#: pg_ctl.c:1542
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %lu\n"
 msgstr "%s: no se pudo dar de baja el servicio «%s»: código de error %lu\n"
 
-#: pg_ctl.c:1587
+#: pg_ctl.c:1629
 msgid "Waiting for server startup...\n"
 msgstr "Esperando que el servidor se inicie...\n"
 
-#: pg_ctl.c:1590
+#: pg_ctl.c:1632
 msgid "Timed out waiting for server startup\n"
 msgstr "Se agotó el tiempo de espera al inicio del servidor\n"
 
-#: pg_ctl.c:1594
+#: pg_ctl.c:1636
 msgid "Server started and accepting connections\n"
 msgstr "Servidor iniciado y aceptando conexiones\n"
 
-#: pg_ctl.c:1650
+#: pg_ctl.c:1691
 #, c-format
 msgid "%s: could not start service \"%s\": error code %lu\n"
 msgstr "%s: no se pudo iniciar el servicio «%s»: código de error %lu\n"
 
-#: pg_ctl.c:1724
+#: pg_ctl.c:1919
 #, 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:1739
+#: pg_ctl.c:1934
 #, c-format
 msgid "%s: could not open process token: error code %lu\n"
 msgstr "%s: no se pudo abrir el token de proceso: código de error %lu\n"
 
-#: pg_ctl.c:1753
+#: pg_ctl.c:1948
 #, c-format
 msgid "%s: could not allocate SIDs: error code %lu\n"
 msgstr "%s: no se pudo emplazar los SIDs: código de error %lu\n"
 
-#: pg_ctl.c:1773
+#: pg_ctl.c:1968
 #, c-format
 msgid "%s: could not create restricted token: error code %lu\n"
 msgstr "%s: no se pudo crear el token restringido: código de error %lu\n"
 
-#: pg_ctl.c:1807
+#: pg_ctl.c:2002
 #, 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:1890
+#: pg_ctl.c:2085
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para obtener más información.\n"
 
-#: pg_ctl.c:1898
+#: pg_ctl.c:2093
 #, c-format
 msgid ""
 "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -516,27 +503,27 @@
 "un servidor PostgreSQL.\n"
 "\n"
 
-#: pg_ctl.c:1899
+#: pg_ctl.c:2094
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_ctl.c:1900
+#: pg_ctl.c:2095
 #, c-format
 msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
 msgstr "  %s init[db]               [-D DATADIR] [-s] [-o \"OPCIONES\"]\n"
 
-#: pg_ctl.c:1901
+#: pg_ctl.c:2096
 #, c-format
 msgid "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
 msgstr "  %s start   [-w] [-t SEGS] [-D DATADIR] [-s] [-l ARCHIVO] [-o \"OPCIONES\"]\n"
 
-#: pg_ctl.c:1902
+#: pg_ctl.c:2097
 #, 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:1903
+#: pg_ctl.c:2098
 #, c-format
 msgid ""
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -545,27 +532,27 @@
 "  %s restart [-w] [-t SEGS] [-D DATADIR] [-s] [-m MODO-DETENCIÓN]\n"
 "                   [-o «OPCIONES»]\n"
 
-#: pg_ctl.c:1905
+#: pg_ctl.c:2100
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D DATADIR] [-s]\n"
 
-#: pg_ctl.c:1906
+#: pg_ctl.c:2101
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D DATADIR]\n"
 
-#: pg_ctl.c:1907
+#: pg_ctl.c:2102
 #, c-format
 msgid "  %s promote [-D DATADIR] [-s]\n"
 msgstr "  %s promote [-D DATADIR] [-s]\n"
 
-#: pg_ctl.c:1908
+#: pg_ctl.c:2103
 #, c-format
 msgid "  %s kill    SIGNALNAME PID\n"
 msgstr "  %s kill    NOMBRE-SEÑAL ID-DE-PROCESO\n"
 
-#: pg_ctl.c:1910
+#: pg_ctl.c:2105
 #, c-format
 msgid ""
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
@@ -574,12 +561,12 @@
 "  %s register   [-N SERVICIO] [-U USUARIO] [-P PASSWORD] [-D DATADIR]\n"
 "                    [-S TIPO-INICIO] [-w] [-t SEGS] [-o «OPCIONES»]\n"
 
-#: pg_ctl.c:1912
+#: pg_ctl.c:2107
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N SERVICIO]\n"
 
-#: pg_ctl.c:1915
+#: pg_ctl.c:2110
 #, c-format
 msgid ""
 "\n"
@@ -588,47 +575,47 @@
 "\n"
 "Opciones comunes:\n"
 
-#: pg_ctl.c:1916
+#: pg_ctl.c:2111
 #, 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:1918
+#: pg_ctl.c:2113
 #, c-format
 msgid "  -e SOURCE              event source for logging when running as a service\n"
-msgstr ""
+msgstr "  -e ORIGEN              origen para el log de eventos cuando se ejecuta como servicio\n"
 
-#: pg_ctl.c:1920
+#: pg_ctl.c:2115
 #, 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:1921
+#: pg_ctl.c:2116
 #, c-format
 msgid "  -t, --timeout=SECS     seconds to wait when using -w option\n"
 msgstr "  -t, --timeout=SEGS     segundos a esperar cuando se use la opción -w\n"
 
-#: pg_ctl.c:1922
+#: pg_ctl.c:2117
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          mostrar información de versión, luego salir\n"
 
-#: pg_ctl.c:1923
+#: pg_ctl.c:2118
 #, c-format
 msgid "  -w                     wait until operation completes\n"
 msgstr "  -w                     esperar hasta que la operación se haya completado\n"
 
-#: pg_ctl.c:1924
+#: pg_ctl.c:2119
 #, 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:1925
+#: pg_ctl.c:2120
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             mostrar esta ayuda, luego salir\n"
 
-#: pg_ctl.c:1926
+#: pg_ctl.c:2121
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -637,12 +624,12 @@
 "(Por omisión se espera para las detenciones, pero no los inicios o reinicios)\n"
 "\n"
 
-#: pg_ctl.c:1927
+#: pg_ctl.c:2122
 #, 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:1929
+#: pg_ctl.c:2124
 #, c-format
 msgid ""
 "\n"
@@ -651,24 +638,24 @@
 "\n"
 "Opciones para inicio y reinicio:\n"
 
-#: pg_ctl.c:1931
+#: pg_ctl.c:2126
 #, 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:1933
+#: pg_ctl.c:2128
 #, 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:1935
+#: pg_ctl.c:2130
 #, 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:1936
+#: pg_ctl.c:2131
 #, c-format
 msgid ""
 "  -o OPTIONS             command line options to pass to postgres\n"
@@ -677,12 +664,12 @@
 "  -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:1938
+#: pg_ctl.c:2133
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p RUTA-A-POSTGRES     normalmente no es necesario\n"
 
-#: pg_ctl.c:1939
+#: pg_ctl.c:2134
 #, c-format
 msgid ""
 "\n"
@@ -691,12 +678,12 @@
 "\n"
 "Opciones para detener o reiniciar:\n"
 
-#: pg_ctl.c:1940
+#: pg_ctl.c:2135
 #, c-format
 msgid "  -m, --mode=MODE        MODE can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr "  -m, --mode=MODO        puede ser «smart», «fast» o «immediate»\n"
 
-#: pg_ctl.c:1942
+#: pg_ctl.c:2137
 #, c-format
 msgid ""
 "\n"
@@ -705,24 +692,24 @@
 "\n"
 "Modos de detención son:\n"
 
-#: pg_ctl.c:1943
+#: pg_ctl.c:2138
 #, 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:1944
+#: pg_ctl.c:2139
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        salir directamente, con apagado apropiado\n"
 
-#: pg_ctl.c:1945
+#: pg_ctl.c:2140
 #, c-format
 msgid "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
 msgstr ""
 "  immediate   salir sin apagado completo; se ejecutará recuperación\n"
 "              en el próximo inicio\n"
 
-#: pg_ctl.c:1947
+#: pg_ctl.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -731,7 +718,7 @@
 "\n"
 "Nombres de señales permitidos para kill:\n"
 
-#: pg_ctl.c:1951
+#: pg_ctl.c:2146
 #, c-format
 msgid ""
 "\n"
@@ -740,35 +727,35 @@
 "\n"
 "Opciones para registrar y dar de baja:\n"
 
-#: pg_ctl.c:1952
+#: pg_ctl.c:2147
 #, c-format
 msgid "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr ""
 "  -N SERVICIO            nombre de servicio con el cual registrar\n"
 "                         el servidor PostgreSQL\n"
 
-#: pg_ctl.c:1953
+#: pg_ctl.c:2148
 #, 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:1954
+#: pg_ctl.c:2149
 #, 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:1955
+#: pg_ctl.c:2150
 #, 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:1957
+#: pg_ctl.c:2152
 #, c-format
 msgid ""
 "\n"
@@ -777,17 +764,17 @@
 "\n"
 "Tipos de inicio del servicio son:\n"
 
-#: pg_ctl.c:1958
+#: pg_ctl.c:2153
 #, 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:1959
+#: pg_ctl.c:2154
 #, c-format
 msgid "  demand     start service on demand\n"
 msgstr "  demand     iniciar el servicio en demanda\n"
 
-#: pg_ctl.c:1962
+#: pg_ctl.c:2157
 #, c-format
 msgid ""
 "\n"
@@ -796,27 +783,27 @@
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_ctl.c:1987
+#: pg_ctl.c:2182
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: modo de apagado «%s» no reconocido\n"
 
-#: pg_ctl.c:2019
+#: pg_ctl.c:2214
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: nombre de señal «%s» no reconocido\n"
 
-#: pg_ctl.c:2036
+#: pg_ctl.c:2231
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
 msgstr "%s: tipo de inicio «%s» no reconocido\n"
 
-#: pg_ctl.c:2091
+#: pg_ctl.c:2286
 #, c-format
 msgid "%s: could not determine the data directory using command \"%s\"\n"
 msgstr "%s: no se pudo determinar el directorio de datos usando la orden «%s»\n"
 
-#: pg_ctl.c:2163
+#: pg_ctl.c:2359
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -827,32 +814,49 @@
 "Por favor conéctese (usando, por ejemplo, «su») con un usuario no privilegiado,\n"
 "quien ejecutará el proceso servidor.\n"
 
-#: pg_ctl.c:2242
+#: pg_ctl.c:2442
 #, 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:2280
+#: pg_ctl.c:2481
 #, 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:2304
+#: pg_ctl.c:2505
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: argumentos faltantes para envío de señal\n"
 
-#: pg_ctl.c:2322
+#: pg_ctl.c:2523
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: modo de operación «%s» no reconocido\n"
 
-#: pg_ctl.c:2332
+#: pg_ctl.c:2533
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: no se especificó operación\n"
 
-#: pg_ctl.c:2353
+#: pg_ctl.c:2554
 #, c-format
 msgid "%s: no database directory specified and environment variable PGDATA unset\n"
 msgstr "%s: no se especificó directorio de datos y la variable PGDATA no está definida\n"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid ""
+#~ "\n"
+#~ "%s: could not stat file \"%s\": %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%s: no se pudo hacer «stat» al archivo «%s»: %s\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_ctl/po/fr.po postgresql-9.5-9.5.8/src/bin/pg_ctl/po/fr.po
--- postgresql-9.5-9.5.2/src/bin/pg_ctl/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_ctl/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 # translation of pg_ctl.po to fr_fr
 # french message translation file for pg_ctl
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 #
 # Guillaume Lelarge <guillaume@lelarge.info>, 2003-2009.
-# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
+# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2016-02-17 02:43+0000\n"
 "PO-Revision-Date: 2016-02-21 15:19+0100\n"
@@ -15,51 +15,51 @@
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
 msgid "could not identify current directory: %s"
-msgstr "n'a pas pu identifier le répertoire courant : %s"
+msgstr "n'a pas pu identifier le répertoire courant : %s"
 
 #: ../../common/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "binaire « %s » invalide"
+msgstr "binaire « %s » invalide"
 
 #: ../../common/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "n'a pas pu lire le binaire « %s »"
+msgstr "n'a pas pu lire le binaire « %s »"
 
 #: ../../common/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "n'a pas pu trouver un « %s » à exécuter"
+msgstr "n'a pas pu trouver un « %s » à exécuter"
 
 #: ../../common/exec.c:257 ../../common/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "n'a pas pu modifier le répertoire par « %s » : %s"
+msgstr "n'a pas pu modifier le répertoire par « %s » : %s"
 
 #: ../../common/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "n'a pas pu lire le lien symbolique « %s »"
+msgstr "n'a pas pu lire le lien symbolique « %s »"
 
 #: ../../common/exec.c:523
 #, c-format
 msgid "pclose failed: %s"
-msgstr "échec de pclose : %s"
+msgstr "échec de pclose : %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 ../../port/path.c:598 ../../port/path.c:636
 #: ../../port/path.c:653
 #, c-format
 msgid "out of memory\n"
-msgstr "mémoire épuisée\n"
+msgstr "mémoire épuisée\n"
 
 #: ../../common/fe_memutils.c:92
 #, c-format
@@ -69,7 +69,7 @@
 #: ../../common/wait_error.c:47
 #, c-format
 msgid "command not executable"
-msgstr "commande non exécutable"
+msgstr "commande non exécutable"
 
 #: ../../common/wait_error.c:51
 #, c-format
@@ -79,72 +79,72 @@
 #: ../../common/wait_error.c:56
 #, c-format
 msgid "child process exited with exit code %d"
-msgstr "le processus fils a quitté avec le code de sortie %d"
+msgstr "le processus fils a quitté avec le code de sortie %d"
 
 #: ../../common/wait_error.c:63
 #, c-format
 msgid "child process was terminated by exception 0x%X"
-msgstr "le processus fils a été terminé par l'exception 0x%X"
+msgstr "le processus fils a été terminé par l'exception 0x%X"
 
 #: ../../common/wait_error.c:73
 #, c-format
 msgid "child process was terminated by signal %s"
-msgstr "le processus fils a été terminé par le signal %s"
+msgstr "le processus fils a été terminé par le signal %s"
 
 #: ../../common/wait_error.c:77
 #, c-format
 msgid "child process was terminated by signal %d"
-msgstr "le processus fils a été terminé par le signal %d"
+msgstr "le processus fils a été terminé par le signal %d"
 
 #: ../../common/wait_error.c:82
 #, c-format
 msgid "child process exited with unrecognized status %d"
-msgstr "le processus fils a quitté avec un statut %d non reconnu"
+msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
 #: ../../port/path.c:620
 #, c-format
 msgid "could not get current working directory: %s\n"
-msgstr "n'a pas pu obtenir le répertoire de travail : %s\n"
+msgstr "n'a pas pu obtenir le répertoire de travail : %s\n"
 
 #: pg_ctl.c:263
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
-msgstr "%s : le répertoire « %s » n'existe pas\n"
+msgstr "%s : le répertoire « %s » n'existe pas\n"
 
 #: pg_ctl.c:266
 #, 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"
+msgstr "%s : n'a pas pu accéder au répertoire « %s » : %s\n"
 
 #: pg_ctl.c:280
 #, c-format
 msgid "%s: directory \"%s\" is not a database cluster directory\n"
-msgstr "%s : le répertoire « %s » n'est pas un répertoire d'instance\n"
+msgstr "%s : le répertoire « %s » n'est pas un répertoire d'instance\n"
 
 #: pg_ctl.c:293
 #, 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"
+msgstr "%s : n'a pas pu ouvrir le fichier de PID « %s » : %s\n"
 
 #: pg_ctl.c:302
 #, c-format
 msgid "%s: the PID file \"%s\" is empty\n"
-msgstr "%s : le fichier PID « %s » est vide\n"
+msgstr "%s : le fichier PID « %s » est vide\n"
 
 #: pg_ctl.c:305
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
-msgstr "%s : données invalides dans le fichier de PID « %s »\n"
+msgstr "%s : données invalides dans le fichier de PID « %s »\n"
 
 #: pg_ctl.c:455 pg_ctl.c:483
 #, c-format
 msgid "%s: could not start server: %s\n"
-msgstr "%s : n'a pas pu démarrer le serveur : %s\n"
+msgstr "%s : n'a pas pu démarrer le serveur : %s\n"
 
 #: pg_ctl.c:507
 #, c-format
 msgid "%s: could not start server: error code %lu\n"
-msgstr "%s : n'a pas pu démarrer le serveur : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu démarrer le serveur : code d'erreur %lu\n"
 
 #: pg_ctl.c:584
 #, c-format
@@ -153,7 +153,7 @@
 "%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"
+"%s : l'option -w n'est pas supportée lors du démarrage d'un serveur pré-9.1\n"
 
 #: pg_ctl.c:649
 #, c-format
@@ -162,7 +162,7 @@
 "%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"
+"%s : l'option -w ne peut pas utiliser un chemin relatif vers le répertoire de\n"
 "la socket\n"
 
 #: pg_ctl.c:751
@@ -175,12 +175,12 @@
 #: pg_ctl.c:776
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
-msgstr "%s : n'a pas pu lire le fichier « %s »\n"
+msgstr "%s : n'a pas pu lire le fichier « %s »\n"
 
 #: pg_ctl.c:781
 #, 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"
+msgstr "%s : le fichier d'options « %s » ne doit comporter qu'une seule ligne\n"
 
 #: pg_ctl.c:832
 #, c-format
@@ -189,9 +189,9 @@
 "same directory as \"%s\".\n"
 "Check your installation.\n"
 msgstr ""
-"Le programme « %s » est nécessaire pour %s, mais n'a pas été trouvé\n"
-"dans le même répertoire que « %s ».\n"
-"Vérifiez votre installation.\n"
+"Le programme « %s » est nécessaire pour %s, mais n'a pas été trouvé\n"
+"dans le même répertoire que « %s ».\n"
+"Vérifiez votre installation.\n"
 
 #: pg_ctl.c:838
 #, c-format
@@ -200,41 +200,41 @@
 "but was not the same version as %s.\n"
 "Check your installation.\n"
 msgstr ""
-"Le programme « %s », trouvé par « %s », n'est pas de la même version\n"
+"Le programme « %s », trouvé par « %s », n'est pas de la même version\n"
 "que %s.\n"
-"Vérifiez votre installation.\n"
+"Vérifiez votre installation.\n"
 
 #: pg_ctl.c:871
 #, c-format
 msgid "%s: database system initialization failed\n"
-msgstr "%s : l'initialisation du système a échoué\n"
+msgstr "%s : l'initialisation du système a échoué\n"
 
 #: pg_ctl.c:886
 #, 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"
+"%s : un autre serveur semble en cours d'exécution ; le démarrage du serveur\n"
+"va toutefois être tenté\n"
 
 #: pg_ctl.c:924
 msgid "waiting for server to start..."
-msgstr "en attente du démarrage du serveur..."
+msgstr "en attente du démarrage du serveur..."
 
 #: pg_ctl.c:929 pg_ctl.c:1036 pg_ctl.c:1127
 msgid " done\n"
-msgstr " effectué\n"
+msgstr " effectué\n"
 
 #: pg_ctl.c:930
 msgid "server started\n"
-msgstr "serveur démarré\n"
+msgstr "serveur démarré\n"
 
 #: pg_ctl.c:933 pg_ctl.c:937
 msgid " stopped waiting\n"
-msgstr " attente arrêtée\n"
+msgstr " attente arrêtée\n"
 
 #: pg_ctl.c:934
 msgid "server is still starting up\n"
-msgstr "le serveur est toujours en cours de démarrage\n"
+msgstr "le serveur est toujours en cours de démarrage\n"
 
 #: pg_ctl.c:938
 #, c-format
@@ -242,46 +242,46 @@
 "%s: could not start server\n"
 "Examine the log output.\n"
 msgstr ""
-"%s : n'a pas pu démarrer le serveur\n"
+"%s : n'a pas pu démarrer le serveur\n"
 "Examinez le journal applicatif.\n"
 
 #: pg_ctl.c:944 pg_ctl.c:1028 pg_ctl.c:1118
 msgid " failed\n"
-msgstr " a échoué\n"
+msgstr " a échoué\n"
 
 #: pg_ctl.c:945
 #, c-format
 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"
+msgstr "%s : n'a pas pu attendre le serveur à cause d'une mauvaise configuration\n"
 
 #: pg_ctl.c:951
 msgid "server starting\n"
-msgstr "serveur en cours de démarrage\n"
+msgstr "serveur en cours de démarrage\n"
 
 #: pg_ctl.c:972 pg_ctl.c:1058 pg_ctl.c:1148 pg_ctl.c:1188
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s : le fichier de PID « %s » n'existe pas\n"
+msgstr "%s : le fichier de PID « %s » n'existe pas\n"
 
 #: pg_ctl.c:973 pg_ctl.c:1060 pg_ctl.c:1149 pg_ctl.c:1189
 msgid "Is server running?\n"
-msgstr "Le serveur est-il en cours d'exécution ?\n"
+msgstr "Le serveur est-il en cours d'exécution ?\n"
 
 #: pg_ctl.c:979
 #, 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"
+"%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:987 pg_ctl.c:1082
 #, 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"
+msgstr "%s : n'a pas pu envoyer le signal d'arrêt (PID : %ld) : %s\n"
 
 #: pg_ctl.c:994
 msgid "server shutting down\n"
-msgstr "serveur en cours d'arrêt\n"
+msgstr "serveur en cours d'arrêt\n"
 
 #: pg_ctl.c:1009 pg_ctl.c:1097
 msgid ""
@@ -289,57 +289,57 @@
 "Shutdown will not complete until pg_stop_backup() is called.\n"
 "\n"
 msgstr ""
-"ATTENTION : le mode de sauvegarde en ligne est activé.\n"
-"L'arrêt ne surviendra qu'au moment où pg_stop_backup() sera appelé.\n"
+"ATTENTION : le mode de sauvegarde en ligne est activé.\n"
+"L'arrêt ne surviendra qu'au moment où pg_stop_backup() sera appelé.\n"
 "\n"
 
 #: pg_ctl.c:1013 pg_ctl.c:1101
 msgid "waiting for server to shut down..."
-msgstr "en attente de l'arrêt du serveur..."
+msgstr "en attente de l'arrêt du serveur..."
 
 #: pg_ctl.c:1030 pg_ctl.c:1120
 #, c-format
 msgid "%s: server does not shut down\n"
-msgstr "%s : le serveur ne s'est pas arrêté\n"
+msgstr "%s : le serveur ne s'est pas arrêté\n"
 
 #: pg_ctl.c:1032 pg_ctl.c:1122
 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"
+"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:1038 pg_ctl.c:1128
 msgid "server stopped\n"
-msgstr "serveur arrêté\n"
+msgstr "serveur arrêté\n"
 
 #: pg_ctl.c:1061 pg_ctl.c:1134
 msgid "starting server anyway\n"
-msgstr "lancement du serveur malgré tout\n"
+msgstr "lancement du serveur malgré tout\n"
 
 #: pg_ctl.c:1070
 #, 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"
+"cours d'exécution (PID : %ld)\n"
 
 #: pg_ctl.c:1073 pg_ctl.c:1158
 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"
+msgstr "Merci d'arrêter le serveur mono-utilisateur et de réessayer.\n"
 
 #: pg_ctl.c:1132
 #, 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"
+msgstr "%s : l'ancien processus serveur (PID : %ld) semble être parti\n"
 
 #: pg_ctl.c:1155
 #, 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"
+"cours d'exécution (PID : %ld)\n"
 
 #: pg_ctl.c:1164
 #, c-format
@@ -355,7 +355,7 @@
 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"
+"cours d'exécution (PID : %ld)\n"
 
 #: pg_ctl.c:1204
 #, c-format
@@ -365,12 +365,12 @@
 #: pg_ctl.c:1219
 #, 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"
+msgstr "%s : n'a pas pu créer le fichier « %s » signalant la promotion : %s\n"
 
 #: pg_ctl.c:1225
 #, 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"
+msgstr "%s : n'a pas pu écrire le fichier « %s » signalant la promotion : %s\n"
 
 #: pg_ctl.c:1233
 #, c-format
@@ -380,7 +380,7 @@
 #: pg_ctl.c:1236
 #, 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"
+msgstr "%s : n'a pas pu supprimer le fichier « %s » signalant la promotion : %s\n"
 
 #: pg_ctl.c:1241
 msgid "server promoting\n"
@@ -389,17 +389,17 @@
 #: pg_ctl.c:1288
 #, 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"
+msgstr "%s : le serveur mono-utilisateur est en cours d'exécution (PID : %ld)\n"
 
 #: pg_ctl.c:1301
 #, c-format
 msgid "%s: server is running (PID: %ld)\n"
-msgstr "%s : le serveur est en cours d'exécution (PID : %ld)\n"
+msgstr "%s : le serveur est en cours d'exécution (PID : %ld)\n"
 
 #: pg_ctl.c:1317
 #, c-format
 msgid "%s: no server running\n"
-msgstr "%s : aucun serveur en cours d'exécution\n"
+msgstr "%s : aucun serveur en cours d'exécution\n"
 
 #: pg_ctl.c:1335
 #, c-format
@@ -409,12 +409,12 @@
 #: pg_ctl.c:1392
 #, c-format
 msgid "%s: could not find own program executable\n"
-msgstr "%s : n'a pas pu trouver l'exécutable du programme\n"
+msgstr "%s : n'a pas pu trouver l'exécutable du programme\n"
 
 #: pg_ctl.c:1402
 #, c-format
 msgid "%s: could not find postgres program executable\n"
-msgstr "%s : n'a pas pu trouver l'exécutable postgres\n"
+msgstr "%s : n'a pas pu trouver l'exécutable postgres\n"
 
 #: pg_ctl.c:1486 pg_ctl.c:1520
 #, c-format
@@ -424,49 +424,49 @@
 #: pg_ctl.c:1492
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
-msgstr "%s : le service « %s » est déjà enregistré\n"
+msgstr "%s : le service « %s » est déjà enregistré\n"
 
 #: pg_ctl.c:1503
 #, c-format
 msgid "%s: could not register service \"%s\": error code %lu\n"
-msgstr "%s : n'a pas pu enregistrer le service « %s » : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu enregistrer le service « %s » : code d'erreur %lu\n"
 
 #: pg_ctl.c:1526
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
-msgstr "%s : le service « %s » n'est pas enregistré\n"
+msgstr "%s : le service « %s » n'est pas enregistré\n"
 
 #: pg_ctl.c:1533
 #, c-format
 msgid "%s: could not open service \"%s\": error code %lu\n"
-msgstr "%s :  n'a pas pu ouvrir le service « %s » : code d'erreur %lu\n"
+msgstr "%s :  n'a pas pu ouvrir le service « %s » : code d'erreur %lu\n"
 
 #: pg_ctl.c:1542
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %lu\n"
-msgstr "%s : n'a pas pu supprimer le service « %s » : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu supprimer le service « %s » : code d'erreur %lu\n"
 
 #: pg_ctl.c:1629
 msgid "Waiting for server startup...\n"
-msgstr "En attente du démarrage du serveur...\n"
+msgstr "En attente du démarrage du serveur...\n"
 
 #: pg_ctl.c:1632
 msgid "Timed out waiting for server startup\n"
-msgstr "Dépassement du délai pour le démarrage du serveur\n"
+msgstr "Dépassement du délai pour le démarrage du serveur\n"
 
 #: pg_ctl.c:1636
 msgid "Server started and accepting connections\n"
-msgstr "Serveur lancé et acceptant les connexions\n"
+msgstr "Serveur lancé et acceptant les connexions\n"
 
 #: pg_ctl.c:1691
 #, c-format
 msgid "%s: could not start service \"%s\": error code %lu\n"
-msgstr "%s : n'a pas pu démarrer le service « %s » : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu démarrer le service « %s » : code d'erreur %lu\n"
 
 #: pg_ctl.c:1919
 #, 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"
+msgstr "%s : ATTENTION : ne peut pas crér les jetons restreints sur cette plateforme\n"
 
 #: pg_ctl.c:1934
 #, c-format
@@ -481,17 +481,17 @@
 #: pg_ctl.c:1968
 #, c-format
 msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s : n'a pas pu créer le jeton restreint : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu créer le jeton restreint : code d'erreur %lu\n"
 
 #: pg_ctl.c:2002
 #, 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"
+msgstr "%s : ATTENTION : n'a pas pu localiser toutes les fonctions objet de job dans l'API système\n"
 
 #: pg_ctl.c:2085
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayer « %s --help » pour plus d'informations.\n"
+msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
 #: pg_ctl.c:2093
 #, c-format
@@ -499,7 +499,7 @@
 "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
 "\n"
 msgstr ""
-"%s est un outil pour initialiser, démarrer, arrêter et contrôler un serveur\n"
+"%s est un outil pour initialiser, démarrer, arrêter et contrôler un serveur\n"
 "PostgreSQL.\n"
 "\n"
 
@@ -511,19 +511,19 @@
 #: pg_ctl.c:2095
 #, 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"
+msgstr "  %s init[db]   [-D RÉP_DONNÉES] [-s] [-o \"OPTIONS\"]\n"
 
 #: pg_ctl.c:2096
 #, 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"
+"  %s start      [-w] [-t SECS] [-D RÉP_DONNÉES] [-s] [-l NOM_FICHIER]\n"
 "                [-o \"OPTIONS\"]\n"
 
 #: pg_ctl.c:2097
 #, 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"
+msgstr "  %s stop       [-W] [-t SECS] [-D RÉP_DONNÉES] [-s] [-m MODE_ARRET]\n"
 
 #: pg_ctl.c:2098
 #, c-format
@@ -531,23 +531,23 @@
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 "                 [-o \"OPTIONS\"]\n"
 msgstr ""
-"  %s restart    [-w] [-t SECS] [-D RÉP_DONNÉES] [-s] [-m MODE_ARRET]\n"
+"  %s restart    [-w] [-t SECS] [-D RÉP_DONNÉES] [-s] [-m MODE_ARRET]\n"
 "                [-o \"OPTIONS\"]\n"
 
 #: pg_ctl.c:2100
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
-msgstr "  %s reload     [-D RÉP_DONNÉES] [-s]\n"
+msgstr "  %s reload     [-D RÉP_DONNÉES] [-s]\n"
 
 #: pg_ctl.c:2101
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
-msgstr "  %s status     [-D RÉP_DONNÉES]\n"
+msgstr "  %s status     [-D RÉP_DONNÉES]\n"
 
 #: pg_ctl.c:2102
 #, c-format
 msgid "  %s promote [-D DATADIR] [-s]\n"
-msgstr "  %s promote    [-D RÉP_DONNÉES] [-s]\n"
+msgstr "  %s promote    [-D RÉP_DONNÉES] [-s]\n"
 
 #: pg_ctl.c:2103
 #, c-format
@@ -561,7 +561,7 @@
 "                    [-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] [-S TYPE_DÉMARRAGE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+"                [-D RÉP_DONNÉES] [-S TYPE_DÉMARRAGE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
 
 #: pg_ctl.c:2107
 #, c-format
@@ -575,19 +575,19 @@
 "Common options:\n"
 msgstr ""
 "\n"
-"Options générales :\n"
+"Options générales :\n"
 
 #: pg_ctl.c:2111
 #, 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"
+msgstr "  -D, --pgdata=RÉP_DONNÉES emplacement de stockage du cluster\n"
 
 #: pg_ctl.c:2113
 #, c-format
 msgid "  -e SOURCE              event source for logging when running as a service\n"
 msgstr ""
-"  -e SOURCE                source de l'événement pour la trace lors de\n"
-"                           l'exécution en tant que service\n"
+"  -e SOURCE                source de l'événement pour la trace lors de\n"
+"                           l'exécution en tant que service\n"
 
 #: pg_ctl.c:2115
 #, c-format
@@ -600,7 +600,7 @@
 #, c-format
 msgid "  -t, --timeout=SECS     seconds to wait when using -w option\n"
 msgstr ""
-"  -t, --timeout=SECS       durée en secondes à attendre lors de\n"
+"  -t, --timeout=SECS       durée en secondes à attendre lors de\n"
 "                           l'utilisation de l'option -w\n"
 
 #: pg_ctl.c:2117
@@ -611,12 +611,12 @@
 #: pg_ctl.c:2118
 #, c-format
 msgid "  -w                     wait until operation completes\n"
-msgstr "  -w                       attend la fin de l'opération\n"
+msgstr "  -w                       attend la fin de l'opération\n"
 
 #: pg_ctl.c:2119
 #, c-format
 msgid "  -W                     do not wait until operation completes\n"
-msgstr "  -W                       n'attend pas la fin de l'opération\n"
+msgstr "  -W                       n'attend pas la fin de l'opération\n"
 
 #: pg_ctl.c:2120
 #, c-format
@@ -629,14 +629,14 @@
 "(The default is to wait for shutdown, but not for start or restart.)\n"
 "\n"
 msgstr ""
-"(Le comportement par défaut attend l'arrêt, pas le démarrage ou le\n"
-"redémarrage.)\n"
+"(Le comportement par défaut attend l'arrêt, pas le démarrage ou le\n"
+"redémarrage.)\n"
 "\n"
 
 #: pg_ctl.c:2122
 #, 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"
+msgstr "Si l'option -D est omise, la variable d'environnement PGDATA est utilisée.\n"
 
 #: pg_ctl.c:2124
 #, c-format
@@ -645,23 +645,23 @@
 "Options for start or restart:\n"
 msgstr ""
 "\n"
-"Options pour le démarrage ou le redémarrage :\n"
+"Options pour le démarrage ou le redémarrage :\n"
 
 #: pg_ctl.c:2126
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
-msgstr "  -c, --core-files         autorise postgres à produire des fichiers core\n"
+msgstr "  -c, --core-files         autorise postgres à produire des fichiers core\n"
 
 #: pg_ctl.c:2128
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
-msgstr "  -c, --core-files         non applicable à cette plateforme\n"
+msgstr "  -c, --core-files         non applicable à cette plateforme\n"
 
 #: pg_ctl.c:2130
 #, 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"
+"  -l, --log=NOM_FICHIER    écrit (ou ajoute) le journal du serveur dans\n"
 "                           NOM_FICHIER\n"
 
 #: pg_ctl.c:2131
@@ -670,14 +670,14 @@
 "  -o OPTIONS             command line options to pass to postgres\n"
 "                         (PostgreSQL server executable) or initdb\n"
 msgstr ""
-"  -o OPTIONS               options de la ligne de commande à passer à\n"
-"                           postgres (exécutable du serveur PostgreSQL)\n"
-"                           ou à initdb\n"
+"  -o OPTIONS               options de la ligne de commande à passer à\n"
+"                           postgres (exécutable du serveur PostgreSQL)\n"
+"                           ou à initdb\n"
 
 #: pg_ctl.c:2133
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
-msgstr "  -p CHEMIN_POSTGRES       normalement pas nécessaire\n"
+msgstr "  -p CHEMIN_POSTGRES       normalement pas nécessaire\n"
 
 #: pg_ctl.c:2134
 #, c-format
@@ -686,14 +686,14 @@
 "Options for stop or restart:\n"
 msgstr ""
 "\n"
-"Options pour l'arrêt ou le redémarrage :\n"
+"Options pour l'arrêt ou le redémarrage :\n"
 
 #: pg_ctl.c:2135
 #, c-format
 msgid "  -m, --mode=MODE        MODE can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr ""
-"  -m, --mode=MODE          MODE peut valoir « smart », « fast » ou\n"
-"                           « immediate »\n"
+"  -m, --mode=MODE          MODE peut valoir « smart », « fast » ou\n"
+"                           « immediate »\n"
 
 #: pg_ctl.c:2137
 #, c-format
@@ -702,24 +702,24 @@
 "Shutdown modes are:\n"
 msgstr ""
 "\n"
-"Les modes d'arrêt sont :\n"
+"Les modes d'arrêt sont :\n"
 
 #: pg_ctl.c:2138
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
-msgstr "  smart                    quitte après déconnexion de tous les clients\n"
+msgstr "  smart                    quitte après déconnexion de tous les clients\n"
 
 #: pg_ctl.c:2139
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
-msgstr "  fast                     quitte directement, et arrête correctement\n"
+msgstr "  fast                     quitte directement, et arrête correctement\n"
 
 #: pg_ctl.c:2140
 #, 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"
+"  immediate                quitte sans arrêt complet ; entraîne une\n"
+"                           restauration au démarrage suivant\n"
 
 #: pg_ctl.c:2142
 #, c-format
@@ -728,7 +728,7 @@
 "Allowed signal names for kill:\n"
 msgstr ""
 "\n"
-"Signaux autorisés pour kill :\n"
+"Signaux autorisés pour kill :\n"
 
 #: pg_ctl.c:2146
 #, c-format
@@ -737,34 +737,34 @@
 "Options for register and unregister:\n"
 msgstr ""
 "\n"
-"Options d'enregistrement ou de dés-enregistrement :\n"
+"Options d'enregistrement ou de dés-enregistrement :\n"
 
 #: pg_ctl.c:2147
 #, 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"
+"  -N NOM_SERVICE           nom du service utilisé pour l'enregistrement du\n"
 "                           serveur PostgreSQL\n"
 
 #: pg_ctl.c:2148
 #, 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"
+"  -P MOT_DE_PASSE          mot de passe du compte utilisé pour\n"
 "                           l'enregistrement du serveur PostgreSQL\n"
 
 #: pg_ctl.c:2149
 #, 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"
+"  -U NOM_UTILISATEUR       nom de l'utilisateur du compte utilisé pour\n"
 "                           l'enregistrement du serveur PostgreSQL\n"
 
 #: pg_ctl.c:2150
 #, 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"
+"  -S TYPE_DÉMARRAGE        type de démarrage du service pour enregistrer le\n"
 "                           serveur PostgreSQL\n"
 
 #: pg_ctl.c:2152
@@ -774,19 +774,19 @@
 "Start types are:\n"
 msgstr ""
 "\n"
-"Les types de démarrage sont :\n"
+"Les types de démarrage sont :\n"
 
 #: pg_ctl.c:2153
 #, 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"
+"  auto       démarre le service automatiquement lors du démarrage du système\n"
+"             (par défaut)\n"
 
 #: pg_ctl.c:2154
 #, c-format
 msgid "  demand     start service on demand\n"
-msgstr "  demand     démarre le service à la demande\n"
+msgstr "  demand     démarre le service à la demande\n"
 
 #: pg_ctl.c:2157
 #, c-format
@@ -795,27 +795,27 @@
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
+"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
 #: pg_ctl.c:2182
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s : mode d'arrêt non reconnu « %s »\n"
+msgstr "%s : mode d'arrêt non reconnu « %s »\n"
 
 #: pg_ctl.c:2214
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s : signal non reconnu « %s »\n"
+msgstr "%s : signal non reconnu « %s »\n"
 
 #: pg_ctl.c:2231
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
-msgstr "%s : type de redémarrage « %s » non reconnu\n"
+msgstr "%s : type de redémarrage « %s » non reconnu\n"
 
 #: pg_ctl.c:2286
 #, c-format
 msgid "%s: could not determine the data directory using command \"%s\"\n"
-msgstr "%s : n'a pas déterminer le répertoire des données en utilisant la commande « %s »\n"
+msgstr "%s : n'a pas déterminer le répertoire des données en utilisant la commande « %s »\n"
 
 #: pg_ctl.c:2359
 #, c-format
@@ -824,19 +824,19 @@
 "Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
 "own the server process.\n"
 msgstr ""
-"%s : ne peut pas être exécuté en tant qu'utilisateur root\n"
-"Connectez-vous (par exemple en utilisant « su ») sous l'utilisateur (non\n"
-" privilégié) qui sera propriétaire du processus serveur.\n"
+"%s : ne peut pas être exécuté en tant qu'utilisateur root\n"
+"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:2442
 #, c-format
 msgid "%s: -S option not supported on this platform\n"
-msgstr "%s : option -S non supportée sur cette plateforme\n"
+msgstr "%s : option -S non supportée sur cette plateforme\n"
 
 #: pg_ctl.c:2481
 #, 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"
+msgstr "%s : trop d'arguments en ligne de commande (le premier étant « %s »)\n"
 
 #: pg_ctl.c:2505
 #, c-format
@@ -846,41 +846,41 @@
 #: pg_ctl.c:2523
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s : mode d'opération « %s » non reconnu\n"
+msgstr "%s : mode d'opération « %s » non reconnu\n"
 
 #: pg_ctl.c:2533
 #, c-format
 msgid "%s: no operation specified\n"
-msgstr "%s : aucune opération indiquée\n"
+msgstr "%s : aucune opération indiquée\n"
 
 #: pg_ctl.c:2554
 #, 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"
+"%s : aucun répertoire de bases de données indiqué et variable\n"
+"d'environnement PGDATA non initialisée\n"
 
 #~ msgid ""
 #~ "\n"
 #~ "Options for stop, restart, or promote:\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Options pour l'arrêt, le redémarrage ou la promotion :\n"
+#~ "Options pour l'arrêt, le redémarrage ou la promotion :\n"
 
 #~ msgid "could not change directory to \"%s\""
-#~ msgstr "n'a pas pu accéder au répertoire « %s »"
+#~ msgstr "n'a pas pu accéder au répertoire « %s »"
 
 #~ msgid "%s: out of memory\n"
-#~ msgstr "%s : mémoire épuisée\n"
+#~ msgstr "%s : mémoire épuisée\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"
+#~ "%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"
+#~ "ou d'envoyer un signal à un processus PostgreSQL\n"
 #~ "\n"
 
 #~ msgid "  --version              output version information, then exit\n"
@@ -893,11 +893,11 @@
 #~ msgstr "%s : n'a pas pu ouvrir le jeton du processus : %lu\n"
 
 #~ 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"
+#~ msgstr "%s : n'a pas pu démarrer le serveur : le code de sortie est %d\n"
 
 #~ 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"
+#~ "%s : ce répertoire des données semble être utilisé par un postmaster déjà existant\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_ctl/po/it.po postgresql-9.5-9.5.8/src/bin/pg_ctl/po/it.po
--- postgresql-9.5-9.5.2/src/bin/pg_ctl/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_ctl/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -19,8 +19,8 @@
 msgstr ""
 "Project-Id-Version: pg_ctl (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-08-15 18:43+0000\n"
-"PO-Revision-Date: 2015-08-16 10:00+0100\n"
+"POT-Creation-Date: 2016-04-12 00:43+0000\n"
+"PO-Revision-Date: 2017-05-29 17:04+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -28,7 +28,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
@@ -117,88 +118,80 @@
 msgid "could not get current working directory: %s\n"
 msgstr "determinazione della directory corrente fallita: %s\n"
 
-#: pg_ctl.c:257
+#: pg_ctl.c:263
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
 msgstr "%s: la directory \"%s\" non esiste\n"
 
-#: pg_ctl.c:260
+#: pg_ctl.c:266
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: accesso alla directory \"%s\" fallito: %s\n"
 
-#: pg_ctl.c:274
+#: pg_ctl.c:280
 #, c-format
 msgid "%s: directory \"%s\" is not a database cluster directory\n"
 msgstr "%s: la directory \"%s\" non è la directory di un cluster di database\n"
 
-#: pg_ctl.c:287
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: could not open PID file \"%s\": %s\n"
 msgstr "%s: apertura del file PID \"%s\" fallita: %s\n"
 
-#: pg_ctl.c:296
+#: pg_ctl.c:302
 #, c-format
 msgid "%s: the PID file \"%s\" is empty\n"
 msgstr "%s: il file PID \"%s\" è vuoto\n"
 
-#: pg_ctl.c:299
+#: pg_ctl.c:305
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: dati non validi nel file PID \"%s\"\n"
 
-#: pg_ctl.c:530
+#: pg_ctl.c:455 pg_ctl.c:483
 #, c-format
-msgid ""
-"\n"
-"%s: -w option is not supported when starting a pre-9.1 server\n"
-msgstr ""
-"\n"
-"%s: l'opzione -w non è supportata per avviare un server pre-9.1\n"
+msgid "%s: could not start server: %s\n"
+msgstr "%s: errore di avvio del server: %s\n"
 
-#: pg_ctl.c:600
+#: pg_ctl.c:507
 #, c-format
-msgid ""
-"\n"
-"%s: -w option cannot use a relative socket directory specification\n"
-msgstr ""
-"\n"
-"%s: l'opzione -w non può specificare una directory socket relativa\n"
+msgid "%s: could not start server: error code %lu\n"
+msgstr "%s: errore di avvio del server: codice dell'errore %lu\n"
 
-#: pg_ctl.c:653
+#: pg_ctl.c:584
 #, c-format
 msgid ""
 "\n"
-"%s: could not stat file \"%s\": %s\n"
+"%s: -w option is not supported when starting a pre-9.1 server\n"
 msgstr ""
 "\n"
-"%s: lettura informazioni del file \"%s\" fallita: %s\n"
+"%s: l'opzione -w non è supportata per avviare un server pre-9.1\n"
 
-#: pg_ctl.c:660
+#: pg_ctl.c:649
 #, c-format
 msgid ""
 "\n"
-"%s: this data directory appears to be running a pre-existing postmaster\n"
+"%s: -w option cannot use a relative socket directory specification\n"
 msgstr ""
 "\n"
-"%s: sembra che questa directory dati sia in esecuzione con un postmaster preesistente\n"
+"%s: l'opzione -w non può specificare una directory socket relativa\n"
 
-#: pg_ctl.c:710
+#: pg_ctl.c:751
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr "%s: non è possibile configurare il limite di grandezza dei core file; impedito dall'hard limit\n"
 
-#: pg_ctl.c:735
+#: pg_ctl.c:776
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: lettura del file \"%s\" fallita\n"
 
-#: pg_ctl.c:740
+#: pg_ctl.c:781
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: il file di opzione \"%s\" deve avere esattamente una riga\n"
 
-#: pg_ctl.c:791
+#: pg_ctl.c:832
 #, c-format
 msgid ""
 "The program \"%s\" is needed by %s but was not found in the\n"
@@ -209,7 +202,7 @@
 "nella stessa directory di \"%s\".\n"
 "Verifica che l'installazione sia corretta.\n"
 
-#: pg_ctl.c:797
+#: pg_ctl.c:838
 #, c-format
 msgid ""
 "The program \"%s\" was found by \"%s\"\n"
@@ -220,42 +213,37 @@
 "la stessa versione di %s.\n"
 "Verifica che l'installazione sia corretta.\n"
 
-#: pg_ctl.c:830
+#: pg_ctl.c:871
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: inizializzazione del sistema di database fallita\n"
 
-#: pg_ctl.c:845
+#: pg_ctl.c:886
 #, 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:882
-#, c-format
-msgid "%s: could not start server: exit code was %d\n"
-msgstr "%s: avvio del server fallito: il codice di uscita è %d\n"
-
-#: pg_ctl.c:889
+#: pg_ctl.c:924
 msgid "waiting for server to start..."
 msgstr "in attesa che il server si avvii..."
 
-#: pg_ctl.c:894 pg_ctl.c:995 pg_ctl.c:1086
+#: pg_ctl.c:929 pg_ctl.c:1036 pg_ctl.c:1127
 msgid " done\n"
 msgstr " fatto\n"
 
-#: pg_ctl.c:895
+#: pg_ctl.c:930
 msgid "server started\n"
 msgstr "il server è stato avviato\n"
 
-#: pg_ctl.c:898 pg_ctl.c:902
+#: pg_ctl.c:933 pg_ctl.c:937
 msgid " stopped waiting\n"
 msgstr " attesa interrotta\n"
 
-#: pg_ctl.c:899
+#: pg_ctl.c:934
 msgid "server is still starting up\n"
 msgstr "il server si sta ancora avviando\n"
 
-#: pg_ctl.c:903
+#: pg_ctl.c:938
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -264,43 +252,43 @@
 "%s: l'avvio del server è fallito\n"
 "Esamina il log di output.\n"
 
-#: pg_ctl.c:909 pg_ctl.c:987 pg_ctl.c:1077
+#: pg_ctl.c:944 pg_ctl.c:1028 pg_ctl.c:1118
 msgid " failed\n"
 msgstr " fallito\n"
 
-#: pg_ctl.c:910
+#: pg_ctl.c:945
 #, c-format
 msgid "%s: could not wait for server because of misconfiguration\n"
 msgstr "%s: non è stato possibile attendere il server a causa di configurazione errata\n"
 
-#: pg_ctl.c:916
+#: pg_ctl.c:951
 msgid "server starting\n"
 msgstr "il server si sta avviando\n"
 
-#: pg_ctl.c:931 pg_ctl.c:1017 pg_ctl.c:1107 pg_ctl.c:1147
+#: pg_ctl.c:972 pg_ctl.c:1058 pg_ctl.c:1148 pg_ctl.c:1188
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: il file PID \"%s\" non esiste\n"
 
-#: pg_ctl.c:932 pg_ctl.c:1019 pg_ctl.c:1108 pg_ctl.c:1148
+#: pg_ctl.c:973 pg_ctl.c:1060 pg_ctl.c:1149 pg_ctl.c:1189
 msgid "Is server running?\n"
 msgstr "Il server è in esecuzione?\n"
 
-#: pg_ctl.c:938
+#: pg_ctl.c:979
 #, 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:946 pg_ctl.c:1041
+#: pg_ctl.c:987 pg_ctl.c:1082
 #, c-format
 msgid "%s: could not send stop signal (PID: %ld): %s\n"
 msgstr "%s: invio del segnale di arresto fallito (PID: %ld): %s\n"
 
-#: pg_ctl.c:953
+#: pg_ctl.c:994
 msgid "server shutting down\n"
 msgstr "il server è in fase di arresto\n"
 
-#: pg_ctl.c:968 pg_ctl.c:1056
+#: pg_ctl.c:1009 pg_ctl.c:1097
 msgid ""
 "WARNING: online backup mode is active\n"
 "Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -310,16 +298,16 @@
 "L'arresto non sarà completato finché non sarà chiamata pg_stop_backup().\n"
 "\n"
 
-#: pg_ctl.c:972 pg_ctl.c:1060
+#: pg_ctl.c:1013 pg_ctl.c:1101
 msgid "waiting for server to shut down..."
 msgstr "in attesa dell'arresto del server...."
 
-#: pg_ctl.c:989 pg_ctl.c:1079
+#: pg_ctl.c:1030 pg_ctl.c:1120
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: il server non si è arrestato\n"
 
-#: pg_ctl.c:991 pg_ctl.c:1081
+#: pg_ctl.c:1032 pg_ctl.c:1122
 msgid ""
 "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
@@ -327,184 +315,184 @@
 "NOTA: L'opzione \"-m fast\" disconnette le sessioni immediatamente invece di\n"
 "attendere che siano le sessioni a disconnettersi.\n"
 
-#: pg_ctl.c:997 pg_ctl.c:1087
+#: pg_ctl.c:1038 pg_ctl.c:1128
 msgid "server stopped\n"
 msgstr "il server è stato arrestato\n"
 
-#: pg_ctl.c:1020 pg_ctl.c:1093
+#: pg_ctl.c:1061 pg_ctl.c:1134
 msgid "starting server anyway\n"
 msgstr "il server si sta avviando comunque\n"
 
-#: pg_ctl.c:1029
+#: pg_ctl.c:1070
 #, 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 singolo utente (PID: %ld)\n"
 
-#: pg_ctl.c:1032 pg_ctl.c:1117
+#: pg_ctl.c:1073 pg_ctl.c:1158
 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:1091
+#: pg_ctl.c:1132
 #, 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:1114
+#: pg_ctl.c:1155
 #, 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:1123
+#: pg_ctl.c:1164
 #, c-format
 msgid "%s: could not send reload signal (PID: %ld): %s\n"
 msgstr "%s: invio segnale di reload fallito (PID: %ld): %s\n"
 
-#: pg_ctl.c:1128
+#: pg_ctl.c:1169
 msgid "server signaled\n"
 msgstr "segnale inviato al server\n"
 
-#: pg_ctl.c:1154
+#: pg_ctl.c:1195
 #, c-format
 msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
 msgstr "%s: non è possibile promuovere il server: il server è in esecuzione in modalità a singolo utente (PID: %ld)\n"
 
-#: pg_ctl.c:1163
+#: pg_ctl.c:1204
 #, c-format
 msgid "%s: cannot promote server; server is not in standby mode\n"
 msgstr "%s: non è possibile promuovere il server: il server non è in modalità standby\n"
 
-#: pg_ctl.c:1178
+#: pg_ctl.c:1219
 #, c-format
 msgid "%s: could not create promote signal file \"%s\": %s\n"
 msgstr "%s: creazione del file di segnale di promozione \"%s\" fallito: %s\n"
 
-#: pg_ctl.c:1184
+#: pg_ctl.c:1225
 #, c-format
 msgid "%s: could not write promote signal file \"%s\": %s\n"
 msgstr "%s: scrittura del file di segnale di promozione \"%s\" fallita: %s\n"
 
-#: pg_ctl.c:1192
+#: pg_ctl.c:1233
 #, c-format
 msgid "%s: could not send promote signal (PID: %ld): %s\n"
 msgstr "%s: invio del segnale di promozione fallito (PID: %ld): %s\n"
 
-#: pg_ctl.c:1195
+#: pg_ctl.c:1236
 #, c-format
 msgid "%s: could not remove promote signal file \"%s\": %s\n"
 msgstr "%s: rimozione del file di segnale di promozione \"%s\" fallita: %s\n"
 
-#: pg_ctl.c:1200
+#: pg_ctl.c:1241
 msgid "server promoting\n"
 msgstr "il server sta venendo promosso\n"
 
-#: pg_ctl.c:1247
+#: pg_ctl.c:1288
 #, 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:1260
+#: pg_ctl.c:1301
 #, c-format
 msgid "%s: server is running (PID: %ld)\n"
 msgstr "%s: il server è in esecuzione (PID: %ld)\n"
 
-#: pg_ctl.c:1276
+#: pg_ctl.c:1317
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: nessun server in esecuzione\n"
 
-#: pg_ctl.c:1294
+#: pg_ctl.c:1335
 #, c-format
 msgid "%s: could not send signal %d (PID: %ld): %s\n"
 msgstr "%s: invio del segnale %d fallito (PID: %ld): %s\n"
 
-#: pg_ctl.c:1351
+#: pg_ctl.c:1392
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: il proprio programma eseguibile non è stato trovato\n"
 
-#: pg_ctl.c:1361
+#: pg_ctl.c:1402
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: il programma eseguibile postgres non è stato trovato\n"
 
-#: pg_ctl.c:1444 pg_ctl.c:1478
+#: pg_ctl.c:1486 pg_ctl.c:1520
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: apertura del service manager fallita\n"
 
-#: pg_ctl.c:1450
+#: pg_ctl.c:1492
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: il servizio \"%s\" è già registrato\n"
 
-#: pg_ctl.c:1461
+#: pg_ctl.c:1503
 #, c-format
 msgid "%s: could not register service \"%s\": error code %lu\n"
 msgstr "%s: registrazione del servizio \"%s\" fallita: codice errore %lu\n"
 
-#: pg_ctl.c:1484
+#: pg_ctl.c:1526
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: il servizio \"%s\" non è registrato\n"
 
-#: pg_ctl.c:1491
+#: pg_ctl.c:1533
 #, c-format
 msgid "%s: could not open service \"%s\": error code %lu\n"
 msgstr "%s: apertura del servizio \"%s\" fallita: codice errore %lu\n"
 
-#: pg_ctl.c:1500
+#: pg_ctl.c:1542
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %lu\n"
 msgstr "%s: rimozione della registrazione del servizio \"%s\" fallita: codice errore %lu\n"
 
-#: pg_ctl.c:1587
+#: pg_ctl.c:1629
 msgid "Waiting for server startup...\n"
 msgstr "In attesa che il server si avvii...\n"
 
-#: pg_ctl.c:1590
+#: pg_ctl.c:1632
 msgid "Timed out waiting for server startup\n"
 msgstr "Il tempo di attesa per l'avvio del server è scaduto\n"
 
-#: pg_ctl.c:1594
+#: pg_ctl.c:1636
 msgid "Server started and accepting connections\n"
 msgstr "Il server è avviato e accetta connessioni\n"
 
-#: pg_ctl.c:1650
+#: pg_ctl.c:1691
 #, c-format
 msgid "%s: could not start service \"%s\": error code %lu\n"
 msgstr "%s: non è possibile avviare il servizio \"%s\": codice errore %lu\n"
 
-#: pg_ctl.c:1724
+#: pg_ctl.c:1919
 #, c-format
 msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
 msgstr "%s: ATTENZIONE: non è possibile creare token ristretti su questa piattaforma\n"
 
-#: pg_ctl.c:1739
+#: pg_ctl.c:1934
 #, c-format
 msgid "%s: could not open process token: error code %lu\n"
 msgstr "%s: apertura del token di processo fallita: codice errore %lu\n"
 
-#: pg_ctl.c:1753
+#: pg_ctl.c:1948
 #, c-format
 msgid "%s: could not allocate SIDs: error code %lu\n"
 msgstr "%s: allocazione dei SID fallita: codice errore %lu\n"
 
-#: pg_ctl.c:1773
+#: pg_ctl.c:1968
 #, c-format
 msgid "%s: could not create restricted token: error code %lu\n"
 msgstr "%s: creazione del token ristretto fallita: codice errore %lu\n"
 
-#: pg_ctl.c:1807
+#: pg_ctl.c:2002
 #, c-format
 msgid "%s: WARNING: could not locate all job object functions in system API\n"
 msgstr "%s: ATTENZIONE: non tutte le funzioni di controllo dei job nella API di sistema sono state trovate\n"
 
-#: pg_ctl.c:1890
+#: pg_ctl.c:2085
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
 
-#: pg_ctl.c:1898
+#: pg_ctl.c:2093
 #, c-format
 msgid ""
 "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -513,27 +501,27 @@
 "%s è un programma per inizializzare, avviare, fermare o controllare un server PostgreSQL.\n"
 "\n"
 
-#: pg_ctl.c:1899
+#: pg_ctl.c:2094
 #, c-format
 msgid "Usage:\n"
 msgstr "Utilizzo:\n"
 
-#: pg_ctl.c:1900
+#: pg_ctl.c:2095
 #, c-format
 msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
 msgstr "  %s init[db]               [-D DATADIR] [-s] [-o \"OPZIONI\"]\n"
 
-#: pg_ctl.c:1901
+#: pg_ctl.c:2096
 #, 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 NOMEFILE] [-o \"OPZIONI\"]\n"
 
-#: pg_ctl.c:1902
+#: pg_ctl.c:2097
 #, 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:1903
+#: pg_ctl.c:2098
 #, c-format
 msgid ""
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -542,27 +530,27 @@
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 "                 [-o \"OPZIONI\"]\n"
 
-#: pg_ctl.c:1905
+#: pg_ctl.c:2100
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D DATADIR] [-s]\n"
 
-#: pg_ctl.c:1906
+#: pg_ctl.c:2101
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D DATADIR]\n"
 
-#: pg_ctl.c:1907
+#: pg_ctl.c:2102
 #, c-format
 msgid "  %s promote [-D DATADIR] [-s]\n"
 msgstr "  %s promote [-D DATADIR] [-s]\n"
 
-#: pg_ctl.c:1908
+#: pg_ctl.c:2103
 #, c-format
 msgid "  %s kill    SIGNALNAME PID\n"
 msgstr "  %s kill    SIGNALNAME PID\n"
 
-#: pg_ctl.c:1910
+#: pg_ctl.c:2105
 #, c-format
 msgid ""
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
@@ -571,12 +559,12 @@
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
 "                    [-S START-TYPE] [-w] [-t SECS] [-o \"OPZIONI\"]\n"
 
-#: pg_ctl.c:1912
+#: pg_ctl.c:2107
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
-msgstr "  %s unregister [-N SERVICENAME]\n"
+msgstr "  %s unregister [-N SERVIZIO]\n"
 
-#: pg_ctl.c:1915
+#: pg_ctl.c:2110
 #, c-format
 msgid ""
 "\n"
@@ -585,51 +573,47 @@
 "\n"
 "Opzioni comuni:\n"
 
-#: pg_ctl.c:1916
+#: pg_ctl.c:2111
 #, c-format
 msgid "  -D, --pgdata=DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata DATADIR   posizione dell'area di archiviazione del database\n"
 
-#: pg_ctl.c:1917
+#: pg_ctl.c:2113
 #, 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"
+msgid "  -e SOURCE              event source for logging when running as a service\n"
+msgstr "  -e SORGENTE            sorgente eventi per il log quando eseguito come servizio\n"
 
-#: pg_ctl.c:1919
+#: pg_ctl.c:2115
 #, c-format
-msgid ""
-"  -e SOURCE              event source to use for logging when running\n"
-"                         as a service\n"
-msgstr ""
-"  -e SORGENTE            sorgente eventi da usare per il log quando eseguito\n"
-"                         come servizio\n"
+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:1922
+#: pg_ctl.c:2116
 #, c-format
 msgid "  -t, --timeout=SECS     seconds to wait when using -w option\n"
-msgstr "  -t, --timeout=SECS     secondi da aspettare quando si usa l'opzione -w\n"
+msgstr "  -t, --timeout=SEC      secondi da aspettare quando si usa l'opzione -w\n"
 
-#: pg_ctl.c:1923
+#: pg_ctl.c:2117
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          mostra informazioni sulla versione ed esci\n"
 
-#: pg_ctl.c:1924
+#: pg_ctl.c:2118
 #, c-format
 msgid "  -w                     wait until operation completes\n"
 msgstr "  -w                     aspetta finché l'operazione non sia stata completata\n"
 
-#: pg_ctl.c:1925
+#: pg_ctl.c:2119
 #, c-format
 msgid "  -W                     do not wait until operation completes\n"
 msgstr "  -W                     non aspettare finché l'operazione non è terminata\n"
 
-#: pg_ctl.c:1926
+#: pg_ctl.c:2120
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             mostra questo aiuto ed esci\n"
 
-#: pg_ctl.c:1927
+#: pg_ctl.c:2121
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -639,12 +623,12 @@
 "l'avvio o il riavvio.)\n"
 "\n"
 
-#: pg_ctl.c:1928
+#: pg_ctl.c:2122
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "Se l'opzione -D è omessa, viene usata la variabile d'ambiente PGDATA.\n"
 
-#: pg_ctl.c:1930
+#: pg_ctl.c:2124
 #, c-format
 msgid ""
 "\n"
@@ -653,22 +637,22 @@
 "\n"
 "Opzioni per l'avvio o il riavvio:\n"
 
-#: pg_ctl.c:1932
+#: pg_ctl.c:2126
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files       permette a postgres di produrre core file\n"
 
-#: pg_ctl.c:1934
+#: pg_ctl.c:2128
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files       non disponibile su questa piattaforma\n"
 
-#: pg_ctl.c:1936
+#: pg_ctl.c:2130
 #, c-format
 msgid "  -l, --log=FILENAME     write (or append) server log to FILENAME\n"
 msgstr "  -l, --log NOMEFILE     scrivi (o accoda) il log del server in NOMEFILE\n"
 
-#: pg_ctl.c:1937
+#: pg_ctl.c:2131
 #, c-format
 msgid ""
 "  -o OPTIONS             command line options to pass to postgres\n"
@@ -677,12 +661,12 @@
 "  -o OPZIONI             opzioni da riga di comando da passare a postgres\n"
 "                         (programma eseguibile del server PostgreSQL)\n"
 
-#: pg_ctl.c:1939
+#: pg_ctl.c:2133
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p PATH-TO-POSTGRES    normalmente non necessario\n"
 
-#: pg_ctl.c:1940
+#: pg_ctl.c:2134
 #, c-format
 msgid ""
 "\n"
@@ -691,12 +675,12 @@
 "\n"
 "Opzioni per l'arresto o il riavvio:\n"
 
-#: pg_ctl.c:1941
+#: pg_ctl.c:2135
 #, c-format
 msgid "  -m, --mode=MODE        MODE can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr "  -m, --mode=MODE        MODE può essere \"smart\", \"fast\" o \"immediate\"\n"
 
-#: pg_ctl.c:1943
+#: pg_ctl.c:2137
 #, c-format
 msgid ""
 "\n"
@@ -705,24 +689,24 @@
 "\n"
 "I modi di spegnimento sono:\n"
 
-#: pg_ctl.c:1944
+#: pg_ctl.c:2138
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       termina dopo che tutti i client si sono disconnessi\n"
 
-#: pg_ctl.c:1945
+#: pg_ctl.c:2139
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        termina direttamente, con una corretta procedura di arresto\n"
 
-#: pg_ctl.c:1946
+#: pg_ctl.c:2140
 #, c-format
 msgid "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
 msgstr ""
 "  immediate   termina senza un arresto completo: ciò porterà ad un recupero\n"
 "              dei dati al riavvio\n"
 
-#: pg_ctl.c:1948
+#: pg_ctl.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -731,7 +715,7 @@
 "\n"
 "Nomi di segnali permessi per kill:\n"
 
-#: pg_ctl.c:1952
+#: pg_ctl.c:2146
 #, c-format
 msgid ""
 "\n"
@@ -740,27 +724,27 @@
 "\n"
 "Opzioni per register e unregister:\n"
 
-#: pg_ctl.c:1953
+#: pg_ctl.c:2147
 #, c-format
 msgid "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
-msgstr "  -N SERVICENAME  nome del servizio con cui registrare il server PostgreSQL\n"
+msgstr "  -N SERVIZIO     nome del servizio con cui registrare il server PostgreSQL\n"
 
-#: pg_ctl.c:1954
+#: pg_ctl.c:2148
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr "  -P PASSWORD     password per l'account con cui registrare il server PostgreSQL\n"
 
-#: pg_ctl.c:1955
+#: pg_ctl.c:2149
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
-msgstr "  -U USERNAME     nome utente dell'account con cui registrare il server PostgreSQL\n"
+msgstr "  -U UTENTE       nome utente dell'account con cui registrare il server PostgreSQL\n"
 
-#: pg_ctl.c:1956
+#: pg_ctl.c:2150
 #, c-format
 msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
-msgstr "  -S START-TYPE   tipo di avvio del servizio con cui registrare il server PostgreSQL\n"
+msgstr "  -S TIPO-AVVIO   tipo di avvio del servizio con cui registrare il server PostgreSQL\n"
 
-#: pg_ctl.c:1958
+#: pg_ctl.c:2152
 #, c-format
 msgid ""
 "\n"
@@ -769,17 +753,17 @@
 "\n"
 "I tipi di avvio sono:\n"
 
-#: pg_ctl.c:1959
+#: pg_ctl.c:2153
 #, c-format
 msgid "  auto       start service automatically during system startup (default)\n"
 msgstr "  auto       avvia il servizio automaticamente durante l'avvio del sistema (predefinito)\n"
 
-#: pg_ctl.c:1960
+#: pg_ctl.c:2154
 #, c-format
 msgid "  demand     start service on demand\n"
 msgstr "  demand     avvia il servizio quando richiesto\n"
 
-#: pg_ctl.c:1963
+#: pg_ctl.c:2157
 #, c-format
 msgid ""
 "\n"
@@ -788,27 +772,27 @@
 "\n"
 "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_ctl.c:1988
+#: pg_ctl.c:2182
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: modalità di arresto sconosciuta \"%s\"\n"
 
-#: pg_ctl.c:2020
+#: pg_ctl.c:2214
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: nome del segnale sconosciuto \"%s\"\n"
 
-#: pg_ctl.c:2037
+#: pg_ctl.c:2231
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
 msgstr "%s: tipo di avvio sconosciuto \"%s\"\n"
 
-#: pg_ctl.c:2092
+#: pg_ctl.c:2286
 #, c-format
 msgid "%s: could not determine the data directory using command \"%s\"\n"
 msgstr "%s: non è stato possibile determinare la directory dei dati usando il comando \"%s\"\n"
 
-#: pg_ctl.c:2164
+#: pg_ctl.c:2359
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -819,32 +803,32 @@
 "Effettua il login (usando per esempio \"su\") con l'utente\n"
 "(non privilegiato) che controllerà il processo server.\n"
 
-#: pg_ctl.c:2243
+#: pg_ctl.c:2442
 #, c-format
 msgid "%s: -S option not supported on this platform\n"
 msgstr "%s: l'opzione -S non è supportata su questa piattaforma\n"
 
-#: pg_ctl.c:2281
+#: pg_ctl.c:2481
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: troppi argomenti nella riga di comando (il primo è \"%s\")\n"
 
-#: pg_ctl.c:2305
+#: pg_ctl.c:2505
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: mancano gli argomenti per la modalità di kill\n"
 
-#: pg_ctl.c:2323
+#: pg_ctl.c:2523
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: modalità di operazione sconosciuta \"%s\"\n"
 
-#: pg_ctl.c:2333
+#: pg_ctl.c:2533
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: nessuna operazione specificata\n"
 
-#: pg_ctl.c:2354
+#: pg_ctl.c:2554
 #, 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"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_ctl/po/ru.po postgresql-9.5-9.5.8/src/bin/pg_ctl/po/ru.po
--- postgresql-9.5-9.5.2/src/bin/pg_ctl/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_ctl/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,47 +1,27 @@
-# PG_CTL Translated Messages into the Russian Language (UTF-8)
+# Russian message translation file for pg_ctl
+# Copyright (C) 2004-2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Oleg Bartunov <oleg@sai.msu.su>, 2004.
+# Serguei A. Mokhov <mokhov@cs.concordia.ca>, 2004-2005.
+# Sergey Burladyan <eshkinkot@gmail.com>, 2009, 2012.
+# Andrey Sudnik <sudnikand@gmail.com>, 2010.
+# Dmitriy Olshevskiy <olshevskiy87@bk.ru>, 2014.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# Copyright (c) 2004-2005 Serguei A. Mokhov, mokhov@cs.concordia.ca
-# Copyright (c) 2012-2013 Alexander Lakhin, exclusion@gmail.com
-# Distributed under the same licensing terms as PostgreSQL itself.
-#
-# pgtranslation Id: pg_ctl.po,v 1.4 2010/12/07 21:22:21 petere Exp $
-#
-# translation of subject-specific terminology, see:
-# перевод некоторых �пецифичных терминов:
-# http://wiki.postgresql.org/wiki/NLS/ru/dict
-#
-# ChangeLog:
-#   - August 24, 2014: Updates for 9.4. Alexander Lakhin <exclusion@gmail.com>.
-#     - With corrections from Dmitriy Olshevskiy <olshevskiy87@bk.ru>
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 21, 2012: Minor fixes. Alexander Lakhin <exclusion@gmail.com>.
-#     - With corrections from Sergey Burladyan <eshkinkot@gmail.com>
-#   - February 17, 2012: Minor fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - December 1, 2010: Complete translation for 9.1, Andrey Sudnik <sudnikand@gmail.com>.
-#   - March 26, 2009: complete translation for 8.3, Sergey Burladyan <eshkinkot@gmail.com>.
-#   - January 17, 2005: Complete translation for 8.0, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - December, 2004: New version of translation by Oleg Bartunov <oleg@sai.msu.su>.
-#   - May 29 - November 24, 2004: Initial translation for 8.0; Serguei A. Mokhov <mokhov@cs.concordia.ca>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: pg_ctl (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-17 05:43+0000\n"
-"PO-Revision-Date: 2015-10-17 17:03+0400\n"
+"POT-Creation-Date: 2017-01-30 17:21+0000\n"
+"PO-Revision-Date: 2016-11-24 11:51+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
-"X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 2.0\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
@@ -79,8 +59,8 @@
 msgstr "ошибка pclose: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 ../../port/path.c:598 ../../port/path.c:636
-#: ../../port/path.c:653
+#: ../../common/fe_memutils.c:98 ../../port/path.c:602 ../../port/path.c:640
+#: ../../port/path.c:657
 #, c-format
 msgid "out of memory\n"
 msgstr "нехватка пам�ти\n"
@@ -125,52 +105,52 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "дочерний проце�� завершил�� � нера�познанным �о�то�нием %d"
 
-#: ../../port/path.c:620
+#: ../../port/path.c:624
 #, c-format
 msgid "could not get current working directory: %s\n"
 msgstr "не удало�ь определить текущий рабочий каталог: %s\n"
 
-#: pg_ctl.c:258
+#: pg_ctl.c:263
 #, c-format
 msgid "%s: directory \"%s\" does not exist\n"
 msgstr "%s: каталог \"%s\" не �уще�твует\n"
 
-#: pg_ctl.c:261
+#: pg_ctl.c:266
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: нет до�тупа к каталогу \"%s\": %s\n"
 
-#: pg_ctl.c:275
+#: pg_ctl.c:280
 #, c-format
 msgid "%s: directory \"%s\" is not a database cluster directory\n"
 msgstr "%s: каталог \"%s\" не �одержит �труктуры кла�тера баз данных\n"
 
-#: pg_ctl.c:288
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: could not open PID file \"%s\": %s\n"
 msgstr "%s: не удало�ь открыть файл PID \"%s\": %s\n"
 
-#: pg_ctl.c:297
+#: pg_ctl.c:302
 #, c-format
 msgid "%s: the PID file \"%s\" is empty\n"
 msgstr "%s: файл PID \"%s\" пу�т\n"
 
-#: pg_ctl.c:300
+#: pg_ctl.c:305
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: неверные данные в файле PID \"%s\"\n"
 
-#: pg_ctl.c:450 pg_ctl.c:478
+#: pg_ctl.c:455 pg_ctl.c:483
 #, c-format
 msgid "%s: could not start server: %s\n"
 msgstr "%s: не удало�ь запу�тить �ервер: %s\n"
 
-#: pg_ctl.c:502
+#: pg_ctl.c:507
 #, c-format
 msgid "%s: could not start server: error code %lu\n"
 msgstr "%s: не удало�ь запу�тить �ервер (код ошибки: %lu)\n"
 
-#: pg_ctl.c:579
+#: pg_ctl.c:584
 #, c-format
 msgid ""
 "\n"
@@ -179,7 +159,7 @@
 "\n"
 "%s: параметр -w не поддерживает�� при запу�ке �ервера до вер�ии 9.1\n"
 
-#: pg_ctl.c:644
+#: pg_ctl.c:649
 #, c-format
 msgid ""
 "\n"
@@ -188,24 +168,24 @@
 "\n"
 "%s: в параметре -w нельз� указывать отно�ительный путь к каталогу �окетов\n"
 
-#: pg_ctl.c:735
+#: pg_ctl.c:751
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr ""
 "%s: не удало�ь ограничить размер дампа пам�ти; запрещено жё�тким "
 "ограничением\n"
 
-#: pg_ctl.c:760
+#: pg_ctl.c:776
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: не удало�ь прочитать файл \"%s\"\n"
 
-#: pg_ctl.c:765
+#: pg_ctl.c:781
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: в файле параметров \"%s\" должна быть ровно одна �трока\n"
 
-#: pg_ctl.c:816
+#: pg_ctl.c:832
 #, c-format
 msgid ""
 "The program \"%s\" is needed by %s but was not found in the\n"
@@ -214,9 +194,9 @@
 msgstr ""
 "Программа \"%s\" необходима дл� %s, но не найдена\n"
 "в каталоге \"%s\".\n"
-"Проверьте вашу у�тановку PostgreSQL.\n"
+"Проверьте правильно�ть у�тановки СУБД.\n"
 
-#: pg_ctl.c:822
+#: pg_ctl.c:838
 #, c-format
 msgid ""
 "The program \"%s\" was found by \"%s\"\n"
@@ -225,41 +205,41 @@
 msgstr ""
 "Программа \"%s\" найдена в \"%s\",\n"
 "но её вер�и� отличает�� от вер�ии %s.\n"
-"Проверьте вашу у�тановку PostgreSQL.\n"
+"Проверьте правильно�ть у�тановки СУБД.\n"
 
-#: pg_ctl.c:855
+#: pg_ctl.c:871
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: �бой при инициализации �и�темы баз данных\n"
 
-#: pg_ctl.c:870
+#: pg_ctl.c:886
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr ""
 "%s: возможно, уже работает другой �ервер; в�ё же пробуем запу�тить �тот "
 "�ервер\n"
 
-#: pg_ctl.c:908
+#: pg_ctl.c:924
 msgid "waiting for server to start..."
 msgstr "ожидание запу�ка �ервера..."
 
-#: pg_ctl.c:913 pg_ctl.c:1020 pg_ctl.c:1111
+#: pg_ctl.c:929 pg_ctl.c:1036 pg_ctl.c:1127
 msgid " done\n"
 msgstr " готово\n"
 
-#: pg_ctl.c:914
+#: pg_ctl.c:930
 msgid "server started\n"
 msgstr "�ервер запущен\n"
 
-#: pg_ctl.c:917 pg_ctl.c:921
+#: pg_ctl.c:933 pg_ctl.c:937
 msgid " stopped waiting\n"
 msgstr " прекращение ожидани�\n"
 
-#: pg_ctl.c:918
+#: pg_ctl.c:934
 msgid "server is still starting up\n"
 msgstr "�ервер в�ё ещё запу�кает��\n"
 
-#: pg_ctl.c:922
+#: pg_ctl.c:938
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -268,44 +248,44 @@
 "%s: не удало�ь запу�тить �ервер\n"
 "Изучите протокол выполнени�.\n"
 
-#: pg_ctl.c:928 pg_ctl.c:1012 pg_ctl.c:1102
+#: pg_ctl.c:944 pg_ctl.c:1028 pg_ctl.c:1118
 msgid " failed\n"
 msgstr " ошибка\n"
 
-#: pg_ctl.c:929
+#: pg_ctl.c:945
 #, c-format
 msgid "%s: could not wait for server because of misconfiguration\n"
 msgstr "%s: не удало�ь дождать�� �ервера в�лед�твие ошибки конфигурации\n"
 
-#: pg_ctl.c:935
+#: pg_ctl.c:951
 msgid "server starting\n"
 msgstr "�ервер запу�кает��\n"
 
-#: pg_ctl.c:956 pg_ctl.c:1042 pg_ctl.c:1132 pg_ctl.c:1172
+#: pg_ctl.c:972 pg_ctl.c:1058 pg_ctl.c:1148 pg_ctl.c:1188
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: файл PID \"%s\" не �уще�твует\n"
 
-#: pg_ctl.c:957 pg_ctl.c:1044 pg_ctl.c:1133 pg_ctl.c:1173
+#: pg_ctl.c:973 pg_ctl.c:1060 pg_ctl.c:1149 pg_ctl.c:1189
 msgid "Is server running?\n"
 msgstr "Запущен ли �ервер?\n"
 
-#: pg_ctl.c:963
+#: pg_ctl.c:979
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: о�тановить �ервер � PID %ld нельз� - он запущен в монопольном режиме\n"
 
-#: pg_ctl.c:971 pg_ctl.c:1066
+#: pg_ctl.c:987 pg_ctl.c:1082
 #, c-format
 msgid "%s: could not send stop signal (PID: %ld): %s\n"
 msgstr "%s: не удало�ь отправить �игнал о�тановки (PID: %ld): %s\n"
 
-#: pg_ctl.c:978
+#: pg_ctl.c:994
 msgid "server shutting down\n"
 msgstr "�ервер о�танавливает��\n"
 
-#: pg_ctl.c:993 pg_ctl.c:1081
+#: pg_ctl.c:1009 pg_ctl.c:1097
 msgid ""
 "WARNING: online backup mode is active\n"
 "Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -315,16 +295,16 @@
 "Выключение произойдёт только при вызове pg_stop_backup().\n"
 "\n"
 
-#: pg_ctl.c:997 pg_ctl.c:1085
+#: pg_ctl.c:1013 pg_ctl.c:1101
 msgid "waiting for server to shut down..."
 msgstr "ожидание завершени� работы �ервера..."
 
-#: pg_ctl.c:1014 pg_ctl.c:1104
+#: pg_ctl.c:1030 pg_ctl.c:1120
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: �ервер не о�танавливает��\n"
 
-#: pg_ctl.c:1016 pg_ctl.c:1106
+#: pg_ctl.c:1032 pg_ctl.c:1122
 msgid ""
 "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
@@ -332,189 +312,189 @@
 "ПОДСК�ЗК�: Параметр \"-m fast\" может �бро�ить �еан�ы принудительно,\n"
 "не дожида��ь, пока они завершат�� �ами.\n"
 
-#: pg_ctl.c:1022 pg_ctl.c:1112
+#: pg_ctl.c:1038 pg_ctl.c:1128
 msgid "server stopped\n"
 msgstr "�ервер о�тановлен\n"
 
-#: pg_ctl.c:1045 pg_ctl.c:1118
+#: pg_ctl.c:1061 pg_ctl.c:1134
 msgid "starting server anyway\n"
 msgstr "�ервер запу�кает��, не�мотр� на �то\n"
 
-#: pg_ctl.c:1054
+#: pg_ctl.c:1070
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: перезапу�тить �ервер � PID %ld нельз� - он запущен в монопольном режиме\n"
 
-#: pg_ctl.c:1057 pg_ctl.c:1142
+#: pg_ctl.c:1073 pg_ctl.c:1158
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "Пожалуй�та, о�тановите его и повторите попытку.\n"
 
-#: pg_ctl.c:1116
+#: pg_ctl.c:1132
 #, c-format
 msgid "%s: old server process (PID: %ld) seems to be gone\n"
 msgstr "%s: похоже, что �тарый �ерверный проце�� (PID: %ld) и�чез\n"
 
-#: pg_ctl.c:1139
+#: pg_ctl.c:1155
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: перезагрузить �ервер � PID %ld нельз� - он запущен в монопольном режиме\n"
 
-#: pg_ctl.c:1148
+#: pg_ctl.c:1164
 #, c-format
 msgid "%s: could not send reload signal (PID: %ld): %s\n"
 msgstr "%s: не удало�ь отправить �игнал перезагрузки (PID: %ld): %s\n"
 
-#: pg_ctl.c:1153
+#: pg_ctl.c:1169
 msgid "server signaled\n"
 msgstr "�игнал отправлен �ерверу\n"
 
-#: pg_ctl.c:1179
+#: pg_ctl.c:1195
 #, c-format
 msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: повы�ить �ервер � PID %ld нельз� - он выполн�ет�� в монопольном режиме\n"
 
-#: pg_ctl.c:1188
+#: pg_ctl.c:1204
 #, c-format
 msgid "%s: cannot promote server; server is not in standby mode\n"
 msgstr "%s: повы�ить �ервер нельз� - он работает не в режиме резерва\n"
 
-#: pg_ctl.c:1203
+#: pg_ctl.c:1219
 #, c-format
 msgid "%s: could not create promote signal file \"%s\": %s\n"
 msgstr "%s: не удало�ь �оздать файл \"%s\" � �игналом к повышению: %s\n"
 
-#: pg_ctl.c:1209
+#: pg_ctl.c:1225
 #, c-format
 msgid "%s: could not write promote signal file \"%s\": %s\n"
 msgstr "%s: не удало�ь запи�ать файл \"%s\" � �игналом к повышению: %s\n"
 
-#: pg_ctl.c:1217
+#: pg_ctl.c:1233
 #, c-format
 msgid "%s: could not send promote signal (PID: %ld): %s\n"
 msgstr "%s: не удало�ь отправить �игнал к повышению (PID: %ld): %s\n"
 
-#: pg_ctl.c:1220
+#: pg_ctl.c:1236
 #, c-format
 msgid "%s: could not remove promote signal file \"%s\": %s\n"
 msgstr "%s: ошибка при удалении файла \"%s\" � �игналом к повышению: %s\n"
 
-#: pg_ctl.c:1225
+#: pg_ctl.c:1241
 msgid "server promoting\n"
 msgstr "�ервер повышает��\n"
 
-#: pg_ctl.c:1272
+#: pg_ctl.c:1288
 #, c-format
 msgid "%s: single-user server is running (PID: %ld)\n"
 msgstr "%s: �ервер работает в монопольном режиме (PID: %ld)\n"
 
-#: pg_ctl.c:1285
+#: pg_ctl.c:1301
 #, c-format
 msgid "%s: server is running (PID: %ld)\n"
 msgstr "%s: �ервер работает (PID: %ld)\n"
 
-#: pg_ctl.c:1301
+#: pg_ctl.c:1317
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: �ервер не работает\n"
 
-#: pg_ctl.c:1319
+#: pg_ctl.c:1335
 #, c-format
 msgid "%s: could not send signal %d (PID: %ld): %s\n"
 msgstr "%s: не удало�ь отправить �игнал %d (PID: %ld): %s\n"
 
-#: pg_ctl.c:1376
+#: pg_ctl.c:1392
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: не удало�ь найти �вой и�полн�емый файл\n"
 
-#: pg_ctl.c:1386
+#: pg_ctl.c:1402
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: не удало�ь найти и�полн�емый файл postgres\n"
 
-#: pg_ctl.c:1469 pg_ctl.c:1503
+#: pg_ctl.c:1486 pg_ctl.c:1520
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: не удало�ь открыть менеджер �лужб\n"
 
-#: pg_ctl.c:1475
+#: pg_ctl.c:1492
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: �лужба \"%s\" уже зареги�трирована\n"
 
-#: pg_ctl.c:1486
+#: pg_ctl.c:1503
 #, c-format
 msgid "%s: could not register service \"%s\": error code %lu\n"
 msgstr "%s: не удало�ь зареги�трировать �лужбу \"%s\" (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1509
+#: pg_ctl.c:1526
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: �лужба \"%s\" не зареги�трирована\n"
 
-#: pg_ctl.c:1516
+#: pg_ctl.c:1533
 #, c-format
 msgid "%s: could not open service \"%s\": error code %lu\n"
 msgstr "%s: не удало�ь открыть �лужбу \"%s\" (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1525
+#: pg_ctl.c:1542
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %lu\n"
 msgstr "%s: ошибка при удалении �лужбы \"%s\" (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1612
+#: pg_ctl.c:1629
 msgid "Waiting for server startup...\n"
 msgstr "Ожидание запу�ка �ервера...\n"
 
-#: pg_ctl.c:1615
+#: pg_ctl.c:1632
 msgid "Timed out waiting for server startup\n"
 msgstr "Превышено врем� ожидани� запу�ка �ервера\n"
 
-#: pg_ctl.c:1619
+#: pg_ctl.c:1636
 msgid "Server started and accepting connections\n"
 msgstr "Сервер запущен и принимает подключени�\n"
 
-#: pg_ctl.c:1674
+#: pg_ctl.c:1691
 #, c-format
 msgid "%s: could not start service \"%s\": error code %lu\n"
 msgstr "%s: не удало�ь запу�тить �лужбу \"%s\" (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1748
+#: pg_ctl.c:1919
 #, c-format
 msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
 msgstr "%s: ПРЕДУПРЕЖДЕ�ИЕ: в �той ОС нельз� �оздавать ограниченные маркеры\n"
 
-#: pg_ctl.c:1763
+#: pg_ctl.c:1934
 #, c-format
 msgid "%s: could not open process token: error code %lu\n"
 msgstr "%s: не удало�ь открыть маркер проце��а (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1777
+#: pg_ctl.c:1948
 #, c-format
 msgid "%s: could not allocate SIDs: error code %lu\n"
 msgstr "%s: не удало�ь подготовить �труктуры SID (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1797
+#: pg_ctl.c:1968
 #, c-format
 msgid "%s: could not create restricted token: error code %lu\n"
 msgstr "%s: не удало�ь �оздать ограниченный маркер (код ошибки: %lu)\n"
 
-#: pg_ctl.c:1831
+#: pg_ctl.c:2002
 #, c-format
 msgid "%s: WARNING: could not locate all job object functions in system API\n"
 msgstr ""
 "%s: ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь найти в�е функции дл� работы � задачами в "
 "�и�темном API\n"
 
-#: pg_ctl.c:1914
+#: pg_ctl.c:2085
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Дл� дополнительной информации попробуйте \"%s --help\".\n"
 
-#: pg_ctl.c:1922
+#: pg_ctl.c:2093
 #, c-format
 msgid ""
 "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -524,18 +504,18 @@
 "PostgreSQL.\n"
 "\n"
 
-#: pg_ctl.c:1923
+#: pg_ctl.c:2094
 #, c-format
 msgid "Usage:\n"
 msgstr "И�пользование:\n"
 
-#: pg_ctl.c:1924
+#: pg_ctl.c:2095
 #, c-format
 msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
 msgstr ""
 "  %s init[db]               [-D К�Т�ЛОГ-Д���ЫХ] [-s] [-o \"П�Р�МЕТРЫ\"]\n"
 
-#: pg_ctl.c:1925
+#: pg_ctl.c:2096
 #, c-format
 msgid ""
 "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
@@ -544,13 +524,13 @@
 "  %s start   [-w] [-t СЕК] [-D К�Т�ЛОГ-Д���ЫХ] [-s] [-l ИМЯ-Ф�ЙЛ�]\n"
 "                 [-o \"П�Р�МЕТРЫ\"]\n"
 
-#: pg_ctl.c:1926
+#: pg_ctl.c:2097
 #, 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:1927
+#: pg_ctl.c:2098
 #, c-format
 msgid ""
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -559,27 +539,27 @@
 "  %s restart [-w] [-t СЕК] [-D К�Т�ЛОГ-Д���ЫХ] [-s] [-m РЕЖИМ-ОСТ��ОВКИ]\n"
 "                 [-o \"П�Р�МЕТРЫ\"]\n"
 
-#: pg_ctl.c:1929
+#: pg_ctl.c:2100
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D К�Т�ЛОГ-Д���ЫХ] [-s]\n"
 
-#: pg_ctl.c:1930
+#: pg_ctl.c:2101
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D К�Т�ЛОГ-Д���ЫХ]\n"
 
-#: pg_ctl.c:1931
+#: pg_ctl.c:2102
 #, c-format
 msgid "  %s promote [-D DATADIR] [-s]\n"
 msgstr "  %s promote [-D К�Т�ЛОГ-Д���ЫХ] [-s]\n"
 
-#: pg_ctl.c:1932
+#: pg_ctl.c:2103
 #, c-format
 msgid "  %s kill    SIGNALNAME PID\n"
 msgstr "  %s kill    СИГ��Л PID\n"
 
-#: pg_ctl.c:1934
+#: pg_ctl.c:2105
 #, c-format
 msgid ""
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
@@ -589,12 +569,12 @@
 "                  [-D К�Т�ЛОГ-Д���ЫХ] [-S ТИП-З�ПУСК�] [-w] [-t СЕК]\n"
 "                  [-o \"П�Р�МЕТРЫ\"]\n"
 
-#: pg_ctl.c:1936
+#: pg_ctl.c:2107
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N ИМЯ-СЛУЖБЫ]\n"
 
-#: pg_ctl.c:1939
+#: pg_ctl.c:2110
 #, c-format
 msgid ""
 "\n"
@@ -603,12 +583,12 @@
 "\n"
 "Общие параметры:\n"
 
-#: pg_ctl.c:1940
+#: pg_ctl.c:2111
 #, c-format
 msgid "  -D, --pgdata=DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata=К�Т�ЛОГ   ра�положение хранилища баз данных\n"
 
-#: pg_ctl.c:1942
+#: pg_ctl.c:2113
 #, c-format
 msgid ""
 "  -e SOURCE              event source for logging when running as a service\n"
@@ -617,40 +597,40 @@
 "журнал,\n"
 "                         когда �ервер работает в виде �лужбы\n"
 
-#: pg_ctl.c:1944
+#: pg_ctl.c:2115
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr ""
 "  -s, --silent           выводить только ошибки, без информационных "
 "�ообщений\n"
 
-#: pg_ctl.c:1945
+#: pg_ctl.c:2116
 #, c-format
 msgid "  -t, --timeout=SECS     seconds to wait when using -w option\n"
 msgstr ""
 "  -t, --timeout=СЕК      врем� ожидани� при и�пользовании параметра -w\n"
 
-#: pg_ctl.c:1946
+#: pg_ctl.c:2117
 #, c-format
 msgid "  -V, --version          output version information, then exit\n"
 msgstr "  -V, --version          показать вер�ию и выйти\n"
 
-#: pg_ctl.c:1947
+#: pg_ctl.c:2118
 #, c-format
 msgid "  -w                     wait until operation completes\n"
 msgstr "  -w                     ждать завершени� операции\n"
 
-#: pg_ctl.c:1948
+#: pg_ctl.c:2119
 #, c-format
 msgid "  -W                     do not wait until operation completes\n"
 msgstr "  -W                     не ждать завершени� операции\n"
 
-#: pg_ctl.c:1949
+#: pg_ctl.c:2120
 #, c-format
 msgid "  -?, --help             show this help, then exit\n"
 msgstr "  -?, --help             показать �ту �правку и выйти\n"
 
-#: pg_ctl.c:1950
+#: pg_ctl.c:2121
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -659,12 +639,12 @@
 "(По умолчанию ожидание имеет ме�то при о�тановке, но не при (пере)запу�ке.)\n"
 "\n"
 
-#: pg_ctl.c:1951
+#: pg_ctl.c:2122
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "Е�ли параметр -D опущен, и�пользует�� переменна� окружени� PGDATA.\n"
 
-#: pg_ctl.c:1953
+#: pg_ctl.c:2124
 #, c-format
 msgid ""
 "\n"
@@ -673,24 +653,24 @@
 "\n"
 "Параметры запу�ка и перезапу�ка:\n"
 
-#: pg_ctl.c:1955
+#: pg_ctl.c:2126
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files       указать postgres �оздавать дампы пам�ти\n"
 
-#: pg_ctl.c:1957
+#: pg_ctl.c:2128
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files       неприменимо на �той платформе\n"
 
-#: pg_ctl.c:1959
+#: pg_ctl.c:2130
 #, c-format
 msgid "  -l, --log=FILENAME     write (or append) server log to FILENAME\n"
 msgstr ""
 "  -l, --log=Ф�ЙЛ         запи�ывать (или добавл�ть) протокол �ервера в "
 "Ф�ЙЛ.\n"
 
-#: pg_ctl.c:1960
+#: pg_ctl.c:2131
 #, c-format
 msgid ""
 "  -o OPTIONS             command line options to pass to postgres\n"
@@ -699,12 +679,12 @@
 "  -o П�Р�МЕТРЫ           параметры командной �троки дл� postgres\n"
 "                         (и�полн�емого файла �ервера PostgreSQL) или initdb\n"
 
-#: pg_ctl.c:1962
+#: pg_ctl.c:2133
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p ПУТЬ-К-POSTGRES     обычно не требует��\n"
 
-#: pg_ctl.c:1963
+#: pg_ctl.c:2134
 #, c-format
 msgid ""
 "\n"
@@ -713,14 +693,14 @@
 "\n"
 "Параметры о�тановки и перезапу�ка:\n"
 
-#: pg_ctl.c:1964
+#: pg_ctl.c:2135
 #, c-format
 msgid ""
 "  -m, --mode=MODE        MODE can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr ""
 "  -m, --mode=РЕЖИМ       может быть \"smart\", \"fast\" или \"immediate\"\n"
 
-#: pg_ctl.c:1966
+#: pg_ctl.c:2137
 #, c-format
 msgid ""
 "\n"
@@ -729,17 +709,17 @@
 "\n"
 "Режимы о�тановки:\n"
 
-#: pg_ctl.c:1967
+#: pg_ctl.c:2138
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       закончить работу по�ле отключени� в�ех клиентов\n"
 
-#: pg_ctl.c:1968
+#: pg_ctl.c:2139
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        закончить �разу, в штатном режиме\n"
 
-#: pg_ctl.c:1969
+#: pg_ctl.c:2140
 #, c-format
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
@@ -748,7 +728,7 @@
 "  immediate   закончить немедленно, в �к�тренном режиме; влечёт за �обой\n"
 "              во��тановление при перезапу�ке\n"
 
-#: pg_ctl.c:1971
+#: pg_ctl.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -757,7 +737,7 @@
 "\n"
 "Разрешённые �игналы дл� команды kill:\n"
 
-#: pg_ctl.c:1975
+#: pg_ctl.c:2146
 #, c-format
 msgid ""
 "\n"
@@ -766,30 +746,30 @@
 "\n"
 "Параметры дл� реги�трации и удалени�:\n"
 
-#: pg_ctl.c:1976
+#: pg_ctl.c:2147
 #, c-format
 msgid ""
 "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr "  -N ИМЯ-СЛУЖБЫ   им� �лужбы дл� реги�трации �ервера PostgreSQL\n"
 
-#: pg_ctl.c:1977
+#: pg_ctl.c:2148
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr ""
 "  -P П�РОЛЬ       пароль учётной запи�и дл� реги�трации �ервера PostgreSQL\n"
 
-#: pg_ctl.c:1978
+#: pg_ctl.c:2149
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr ""
 "  -U ПОЛЬЗОВ�ТЕЛЬ им� пользовател� дл� реги�трации �ервера PostgreSQL\n"
 
-#: pg_ctl.c:1979
+#: pg_ctl.c:2150
 #, c-format
 msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
 msgstr "  -S ТИП-З�ПУСК�  тип запу�ка �лужбы �ервера PostgreSQL\n"
 
-#: pg_ctl.c:1981
+#: pg_ctl.c:2152
 #, c-format
 msgid ""
 "\n"
@@ -798,7 +778,7 @@
 "\n"
 "Типы запу�ка:\n"
 
-#: pg_ctl.c:1982
+#: pg_ctl.c:2153
 #, c-format
 msgid ""
 "  auto       start service automatically during system startup (default)\n"
@@ -806,12 +786,12 @@
 "  auto       запу�кать �лужбу автоматиче�ки при �тарте �и�темы (по "
 "умолчанию)\n"
 
-#: pg_ctl.c:1983
+#: pg_ctl.c:2154
 #, c-format
 msgid "  demand     start service on demand\n"
 msgstr "  demand     запу�кать �лужбу по требованию\n"
 
-#: pg_ctl.c:1986
+#: pg_ctl.c:2157
 #, c-format
 msgid ""
 "\n"
@@ -820,27 +800,27 @@
 "\n"
 "Об ошибках �ообщайте по адре�у <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_ctl.c:2011
+#: pg_ctl.c:2182
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: неизве�тный режим о�тановки \"%s\"\n"
 
-#: pg_ctl.c:2043
+#: pg_ctl.c:2214
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: нера�познанное им� �игнала \"%s\"\n"
 
-#: pg_ctl.c:2060
+#: pg_ctl.c:2231
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
 msgstr "%s: нера�познанный тип запу�ка \"%s\"\n"
 
-#: pg_ctl.c:2115
+#: pg_ctl.c:2286
 #, c-format
 msgid "%s: could not determine the data directory using command \"%s\"\n"
 msgstr "%s: не удало�ь определить каталог данных � помощью команды \"%s\"\n"
 
-#: pg_ctl.c:2187
+#: pg_ctl.c:2359
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -851,32 +831,32 @@
 "Пожалуй�та, переключите�ь на обычного пользовател� (например,\n"
 "и�пользу� \"su\"), который будет запу�кать �ерверный проце��.\n"
 
-#: pg_ctl.c:2266
+#: pg_ctl.c:2442
 #, c-format
 msgid "%s: -S option not supported on this platform\n"
 msgstr "%s: параметр -S не поддерживает�� в �той ОС\n"
 
-#: pg_ctl.c:2304
+#: pg_ctl.c:2481
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: �лишком много аргументов командной �троки (первый: \"%s\")\n"
 
-#: pg_ctl.c:2328
+#: pg_ctl.c:2505
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: от�ут�твуют аргументы дл� режима kill\n"
 
-#: pg_ctl.c:2346
+#: pg_ctl.c:2523
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: нера�познанный режим работы \"%s\"\n"
 
-#: pg_ctl.c:2356
+#: pg_ctl.c:2533
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: команда не указана\n"
 
-#: pg_ctl.c:2377
+#: pg_ctl.c:2554
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/compress_io.c postgresql-9.5-9.5.8/src/bin/pg_dump/compress_io.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/compress_io.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/compress_io.c	2017-08-07 21:13:41.000000000 +0000
@@ -54,7 +54,6 @@
 #include "postgres_fe.h"
 
 #include "compress_io.h"
-#include "parallel.h"
 #include "pg_backup_utils.h"
 
 /*----------------------
@@ -184,9 +183,6 @@
 WriteDataToArchive(ArchiveHandle *AH, CompressorState *cs,
 				   const void *data, size_t dLen)
 {
-	/* Are we aborting? */
-	checkAborting(AH);
-
 	switch (cs->comprAlg)
 	{
 		case COMPR_ALG_LIBZ:
@@ -351,9 +347,6 @@
 	/* no minimal chunk size for zlib */
 	while ((cnt = readF(AH, &buf, &buflen)))
 	{
-		/* Are we aborting? */
-		checkAborting(AH);
-
 		zp->next_in = (void *) buf;
 		zp->avail_in = cnt;
 
@@ -414,9 +407,6 @@
 
 	while ((cnt = readF(AH, &buf, &buflen)))
 	{
-		/* Are we aborting? */
-		checkAborting(AH);
-
 		ahwrite(buf, 1, cnt, AH);
 	}
 
@@ -602,8 +592,14 @@
 	{
 		ret = gzread(fp->compressedfp, ptr, size);
 		if (ret != size && !gzeof(fp->compressedfp))
+		{
+			int		errnum;
+			const char *errmsg = gzerror(fp->compressedfp, &errnum);
+
 			exit_horribly(modulename,
-					"could not read from input file: %s\n", strerror(errno));
+						  "could not read from input file: %s\n",
+						  errnum == Z_ERRNO ? strerror(errno) : errmsg);
+		}
 	}
 	else
 #endif
@@ -705,6 +701,22 @@
 		return feof(fp->uncompressedfp);
 }
 
+const char *
+get_cfp_error(cfp *fp)
+{
+#ifdef HAVE_LIBZ
+	if (fp->compressedfp)
+	{
+		int			errnum;
+		const char *errmsg = gzerror(fp->compressedfp, &errnum);
+
+		if (errnum != Z_ERRNO)
+			return errmsg;
+	}
+#endif
+	return strerror(errno);
+}
+
 #ifdef HAVE_LIBZ
 static int
 hasSuffix(const char *filename, const char *suffix)
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/compress_io.h postgresql-9.5-9.5.8/src/bin/pg_dump/compress_io.h
--- postgresql-9.5-9.5.2/src/bin/pg_dump/compress_io.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/compress_io.h	2017-08-07 21:13:41.000000000 +0000
@@ -65,5 +65,6 @@
 extern char *cfgets(cfp *fp, char *buf, int len);
 extern int	cfclose(cfp *fp);
 extern int	cfeof(cfp *fp);
+extern const char *get_cfp_error(cfp *fp);
 
 #endif
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/dumputils.c postgresql-9.5-9.5.8/src/bin/pg_dump/dumputils.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/dumputils.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/dumputils.c	2017-08-07 21:13:41.000000000 +0000
@@ -179,6 +179,44 @@
 }
 
 /*
+ * Format a Postgres version number (in the PG_VERSION_NUM integer format
+ * returned by PQserverVersion()) as a string.  This exists mainly to
+ * encapsulate knowledge about two-part vs. three-part version numbers.
+ *
+ * For re-entrancy, caller must supply the buffer the string is put in.
+ * Recommended size of the buffer is 32 bytes.
+ *
+ * Returns address of 'buf', as a notational convenience.
+ */
+char *
+formatPGVersionNumber(int version_number, bool include_minor,
+					  char *buf, size_t buflen)
+{
+	if (version_number >= 100000)
+	{
+		/* New two-part style */
+		if (include_minor)
+			snprintf(buf, buflen, "%d.%d", version_number / 10000,
+					 version_number % 10000);
+		else
+			snprintf(buf, buflen, "%d", version_number / 10000);
+	}
+	else
+	{
+		/* Old three-part style */
+		if (include_minor)
+			snprintf(buf, buflen, "%d.%d.%d", version_number / 10000,
+					 (version_number / 100) % 100,
+					 version_number % 100);
+		else
+			snprintf(buf, buflen, "%d.%d", version_number / 10000,
+					 (version_number / 100) % 100);
+	}
+	return buf;
+}
+
+
+/*
  * Convert a string value to an SQL string literal and append it to
  * the given buffer.  We assume the specified client_encoding and
  * standard_conforming_strings settings.
@@ -339,6 +377,210 @@
 }
 
 
+/*
+ * Append the given string to the shell command being built in the buffer,
+ * with suitable shell-style quoting to create exactly one argument.
+ *
+ * Forbid LF or CR characters, which have scant practical use beyond designing
+ * security breaches.  The Windows command shell is unusable as a conduit for
+ * arguments containing LF or CR characters.  A future major release should
+ * reject those characters in CREATE ROLE and CREATE DATABASE, because use
+ * there eventually leads to errors here.
+ */
+void
+appendShellString(PQExpBuffer buf, const char *str)
+{
+	const char *p;
+
+#ifndef WIN32
+	appendPQExpBufferChar(buf, '\'');
+	for (p = str; *p; p++)
+	{
+		if (*p == '\n' || *p == '\r')
+		{
+			fprintf(stderr,
+					_("shell command argument contains a newline or carriage return: \"%s\"\n"),
+					str);
+			exit(EXIT_FAILURE);
+		}
+
+		if (*p == '\'')
+			appendPQExpBufferStr(buf, "'\"'\"'");
+		else
+			appendPQExpBufferChar(buf, *p);
+	}
+	appendPQExpBufferChar(buf, '\'');
+#else							/* WIN32 */
+	int			backslash_run_length = 0;
+
+	/*
+	 * A Windows system() argument experiences two layers of interpretation.
+	 * First, cmd.exe interprets the string.  Its behavior is undocumented,
+	 * but a caret escapes any byte except LF or CR that would otherwise have
+	 * special meaning.  Handling of a caret before LF or CR differs between
+	 * "cmd.exe /c" and other modes, and it is unusable here.
+	 *
+	 * Second, the new process parses its command line to construct argv (see
+	 * https://msdn.microsoft.com/en-us/library/17w5ykft.aspx).  This treats
+	 * backslash-double quote sequences specially.
+	 */
+	appendPQExpBufferStr(buf, "^\"");
+	for (p = str; *p; p++)
+	{
+		if (*p == '\n' || *p == '\r')
+		{
+			fprintf(stderr,
+					_("shell command argument contains a newline or carriage return: \"%s\"\n"),
+					str);
+			exit(EXIT_FAILURE);
+		}
+
+		/* Change N backslashes before a double quote to 2N+1 backslashes. */
+		if (*p == '"')
+		{
+			while (backslash_run_length)
+			{
+				appendPQExpBufferStr(buf, "^\\");
+				backslash_run_length--;
+			}
+			appendPQExpBufferStr(buf, "^\\");
+		}
+		else if (*p == '\\')
+			backslash_run_length++;
+		else
+			backslash_run_length = 0;
+
+		/*
+		 * Decline to caret-escape the most mundane characters, to ease
+		 * debugging and lest we approach the command length limit.
+		 */
+		if (!((*p >= 'a' && *p <= 'z') ||
+			  (*p >= 'A' && *p <= 'Z') ||
+			  (*p >= '0' && *p <= '9')))
+			appendPQExpBufferChar(buf, '^');
+		appendPQExpBufferChar(buf, *p);
+	}
+
+	/*
+	 * Change N backslashes at end of argument to 2N backslashes, because they
+	 * precede the double quote that terminates the argument.
+	 */
+	while (backslash_run_length)
+	{
+		appendPQExpBufferStr(buf, "^\\");
+		backslash_run_length--;
+	}
+	appendPQExpBufferStr(buf, "^\"");
+#endif   /* WIN32 */
+}
+
+
+/*
+ * Append the given string to the buffer, with suitable quoting for passing
+ * the string as a value, in a keyword/pair value in a libpq connection
+ * string
+ */
+void
+appendConnStrVal(PQExpBuffer buf, const char *str)
+{
+	const char *s;
+	bool		needquotes;
+
+	/*
+	 * If the string is one or more plain ASCII characters, no need to quote
+	 * it. This is quite conservative, but better safe than sorry.
+	 */
+	needquotes = true;
+	for (s = str; *s; s++)
+	{
+		if (!((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') ||
+			  (*s >= '0' && *s <= '9') || *s == '_' || *s == '.'))
+		{
+			needquotes = true;
+			break;
+		}
+		needquotes = false;
+	}
+
+	if (needquotes)
+	{
+		appendPQExpBufferChar(buf, '\'');
+		while (*str)
+		{
+			/* ' and \ must be escaped by to \' and \\ */
+			if (*str == '\'' || *str == '\\')
+				appendPQExpBufferChar(buf, '\\');
+
+			appendPQExpBufferChar(buf, *str);
+			str++;
+		}
+		appendPQExpBufferChar(buf, '\'');
+	}
+	else
+		appendPQExpBufferStr(buf, str);
+}
+
+
+/*
+ * Append a psql meta-command that connects to the given database with the
+ * then-current connection's user, host and port.
+ */
+void
+appendPsqlMetaConnect(PQExpBuffer buf, const char *dbname)
+{
+	const char *s;
+	bool		complex;
+
+	/*
+	 * If the name is plain ASCII characters, emit a trivial "\connect "foo"".
+	 * For other names, even many not technically requiring it, skip to the
+	 * general case.  No database has a zero-length name.
+	 */
+	complex = false;
+	for (s = dbname; *s; s++)
+	{
+		if (*s == '\n' || *s == '\r')
+		{
+			fprintf(stderr,
+					_("database name contains a newline or carriage return: \"%s\"\n"),
+					dbname);
+			exit(EXIT_FAILURE);
+		}
+
+		if (!((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') ||
+			  (*s >= '0' && *s <= '9') || *s == '_' || *s == '.'))
+		{
+			complex = true;
+		}
+	}
+
+	appendPQExpBufferStr(buf, "\\connect ");
+	if (complex)
+	{
+		PQExpBufferData connstr;
+
+		initPQExpBuffer(&connstr);
+		appendPQExpBuffer(&connstr, "dbname=");
+		appendConnStrVal(&connstr, dbname);
+
+		appendPQExpBuffer(buf, "-reuse-previous=on ");
+
+		/*
+		 * As long as the name does not contain a newline, SQL identifier
+		 * quoting satisfies the psql meta-command parser.  Prefer not to
+		 * involve psql-interpreted single quotes, which behaved differently
+		 * before PostgreSQL 9.2.
+		 */
+		appendPQExpBufferStr(buf, fmtId(connstr.data));
+
+		termPQExpBuffer(&connstr);
+	}
+	else
+		appendPQExpBufferStr(buf, fmtId(dbname));
+	appendPQExpBufferChar(buf, '\n');
+}
+
+
 /*
  * Convert a bytea value (presented as raw bytes) to an SQL string literal
  * and append it to the given buffer.  We assume the specified
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/dumputils.h postgresql-9.5-9.5.8/src/bin/pg_dump/dumputils.h
--- postgresql-9.5-9.5.2/src/bin/pg_dump/dumputils.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/dumputils.h	2017-08-07 21:13:41.000000000 +0000
@@ -72,6 +72,8 @@
 extern const char *fmtId(const char *identifier);
 extern const char *fmtQualifiedId(int remoteVersion,
 			   const char *schema, const char *id);
+extern char *formatPGVersionNumber(int version_number, bool include_minor,
+					  char *buf, size_t buflen);
 extern void appendStringLiteral(PQExpBuffer buf, const char *str,
 					int encoding, bool std_strings);
 extern void appendStringLiteralConn(PQExpBuffer buf, const char *str,
@@ -81,6 +83,9 @@
 extern void appendByteaLiteral(PQExpBuffer buf,
 				   const unsigned char *str, size_t length,
 				   bool std_strings);
+extern void appendShellString(PQExpBuffer buf, const char *str);
+extern void appendConnStrVal(PQExpBuffer buf, const char *str);
+extern void appendPsqlMetaConnect(PQExpBuffer buf, const char *dbname);
 extern bool parsePGArray(const char *atext, char ***itemarray, int *nitems);
 extern bool buildACLCommands(const char *name, const char *subname,
 				 const char *type, const char *acls, const char *owner,
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/parallel.c postgresql-9.5-9.5.8/src/bin/pg_dump/parallel.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/parallel.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/parallel.c	2017-08-07 21:13:41.000000000 +0000
@@ -2,22 +2,67 @@
  *
  * parallel.c
  *
- *	Parallel support for the pg_dump archiver
+ *	Parallel support for pg_dump and pg_restore
  *
  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	The author is not responsible for loss or damages that may
- *	result from its use.
- *
  * IDENTIFICATION
  *		src/bin/pg_dump/parallel.c
  *
  *-------------------------------------------------------------------------
  */
 
+/*
+ * Parallel operation works like this:
+ *
+ * The original, master process calls ParallelBackupStart(), which forks off
+ * the desired number of worker processes, which each enter WaitForCommands().
+ *
+ * The master process dispatches an individual work item to one of the worker
+ * processes in DispatchJobForTocEntry().  That calls
+ * AH->MasterStartParallelItemPtr, a routine of the output format.  This
+ * function's arguments are the parents archive handle AH (containing the full
+ * catalog information), the TocEntry that the worker should work on and a
+ * T_Action value indicating whether this is a backup or a restore task.  The
+ * function simply converts the TocEntry assignment into a command string that
+ * is then sent over to the worker process. In the simplest case that would be
+ * something like "DUMP 1234", with 1234 being the TocEntry id.
+ *
+ * The worker process receives and decodes the command and passes it to the
+ * routine pointed to by AH->WorkerJobDumpPtr or AH->WorkerJobRestorePtr,
+ * which are routines of the current archive format.  That routine performs
+ * the required action (dump or restore) and returns a malloc'd status string.
+ * The status string is passed back to the master where it is interpreted by
+ * AH->MasterEndParallelItemPtr, another format-specific routine.  That
+ * function can update state or catalog information on the master's side,
+ * depending on the reply from the worker process.  In the end it returns a
+ * status code, which is 0 for successful execution.
+ *
+ * Remember that we have forked off the workers only after we have read in
+ * the catalog.  That's why our worker processes can also access the catalog
+ * information.  (In the Windows case, the workers are threads in the same
+ * process.  To avoid problems, they work with cloned copies of the Archive
+ * data structure; see RunWorker().)
+ *
+ * In the master process, the workerStatus field for each worker has one of
+ * the following values:
+ *		WRKR_IDLE: it's waiting for a command
+ *		WRKR_WORKING: it's been sent a command
+ *		WRKR_FINISHED: it's returned a result
+ *		WRKR_TERMINATED: process ended
+ * The FINISHED state indicates that the worker is idle, but we've not yet
+ * dealt with the status code it returned from the prior command.
+ * ReapWorkerStatus() extracts the unhandled command status value and sets
+ * the workerStatus back to WRKR_IDLE.
+ */
+
 #include "postgres_fe.h"
 
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 #include "parallel.h"
 #include "pg_backup_utils.h"
 
@@ -29,15 +74,11 @@
 #include <fcntl.h>
 #endif
 
+/* Mnemonic macros for indexing the fd array returned by pipe(2) */
 #define PIPE_READ							0
 #define PIPE_WRITE							1
 
-/* file-scope variables */
 #ifdef WIN32
-static unsigned int tMasterThreadId = 0;
-static HANDLE termEvent = INVALID_HANDLE_VALUE;
-static int	pgpipe(int handles[2]);
-static int	piperead(int s, char *buf, int len);
 
 /*
  * Structure to hold info passed by _beginthreadex() to the function it calls
@@ -45,26 +86,27 @@
  */
 typedef struct
 {
-	ArchiveHandle *AH;
-	int			worker;
-	int			pipeRead;
-	int			pipeWrite;
+	ArchiveHandle *AH;			/* master database connection */
+	ParallelSlot *slot;			/* this worker's parallel slot */
 } WorkerInfo;
 
+/* Windows implementation of pipe access */
+static int	pgpipe(int handles[2]);
+static int	piperead(int s, char *buf, int len);
 #define pipewrite(a,b,c)	send(a,b,c,0)
-#else
-/*
- * aborting is only ever used in the master, the workers are fine with just
- * wantAbort.
- */
-static bool aborting = false;
-static volatile sig_atomic_t wantAbort = 0;
 
+#else							/* !WIN32 */
+
+/* Non-Windows implementation of pipe access */
 #define pgpipe(a)			pipe(a)
 #define piperead(a,b,c)		read(a,b,c)
 #define pipewrite(a,b,c)	write(a,b,c)
-#endif
 
+#endif   /* WIN32 */
+
+/*
+ * State info for archive_close_connection() shutdown callback.
+ */
 typedef struct ShutdownInformation
 {
 	ParallelState *pstate;
@@ -73,22 +115,67 @@
 
 static ShutdownInformation shutdown_info;
 
+/*
+ * State info for signal handling.
+ * We assume signal_info initializes to zeroes.
+ *
+ * On Unix, myAH is the master DB connection in the master process, and the
+ * worker's own connection in worker processes.  On Windows, we have only one
+ * instance of signal_info, so myAH is the master connection and the worker
+ * connections must be dug out of pstate->parallelSlot[].
+ */
+typedef struct DumpSignalInformation
+{
+	ArchiveHandle *myAH;		/* database connection to issue cancel for */
+	ParallelState *pstate;		/* parallel state, if any */
+	bool		handler_set;	/* signal handler set up in this process? */
+#ifndef WIN32
+	bool		am_worker;		/* am I a worker process? */
+#endif
+} DumpSignalInformation;
+
+static volatile DumpSignalInformation signal_info;
+
+#ifdef WIN32
+static CRITICAL_SECTION signal_info_lock;
+#endif
+
+/*
+ * Write a simple string to stderr --- must be safe in a signal handler.
+ * We ignore the write() result since there's not much we could do about it.
+ * Certain compilers make that harder than it ought to be.
+ */
+#define write_stderr(str) \
+	do { \
+		const char *str_ = (str); \
+		int		rc_; \
+		rc_ = write(fileno(stderr), str_, strlen(str_)); \
+		(void) rc_; \
+	} while (0)
+
+
+#ifdef WIN32
+/* file-scope variables */
+static DWORD tls_index;
+
+/* globally visible variables (needed by exit_nicely) */
+bool		parallel_init_done = false;
+DWORD		mainThreadId;
+#endif   /* WIN32 */
+
 static const char *modulename = gettext_noop("parallel archiver");
 
+/* Local function prototypes */
 static ParallelSlot *GetMyPSlot(ParallelState *pstate);
-static void parallel_msg_master(ParallelSlot *slot, const char *modulename,
-					const char *fmt, va_list ap) pg_attribute_printf(3, 0);
 static void archive_close_connection(int code, void *arg);
 static void ShutdownWorkersHard(ParallelState *pstate);
 static void WaitForTerminatingWorkers(ParallelState *pstate);
-
-#ifndef WIN32
-static void sigTermHandler(int signum);
-#endif
-static void SetupWorker(ArchiveHandle *AH, int pipefd[2], int worker);
+static void setup_cancel_handler(void);
+static void set_cancel_pstate(ParallelState *pstate);
+static void set_cancel_slot_archive(ParallelSlot *slot, ArchiveHandle *AH);
+static void RunWorker(ArchiveHandle *AH, ParallelSlot *slot);
 static bool HasEveryWorkerTerminated(ParallelState *pstate);
-
-static void lockTableNoWait(ArchiveHandle *AH, TocEntry *te);
+static void lockTableForWorker(ArchiveHandle *AH, TocEntry *te);
 static void WaitForCommands(ArchiveHandle *AH, int pipefd[2]);
 static char *getMessageFromMaster(int pipefd[2]);
 static void sendMessageToMaster(int pipefd[2], const char *str);
@@ -104,14 +191,10 @@
 #define messageEquals(msg, pattern) \
 	(strcmp(msg, pattern) == 0)
 
-#ifdef WIN32
-static void shutdown_parallel_dump_utils(int code, void *unused);
-bool		parallel_init_done = false;
-static DWORD tls_index;
-DWORD		mainThreadId;
-#endif
-
 
+/*
+ * Shutdown callback to clean up socket access
+ */
 #ifdef WIN32
 static void
 shutdown_parallel_dump_utils(int code, void *unused)
@@ -122,6 +205,11 @@
 }
 #endif
 
+/*
+ * Initialize parallel dump support --- should be called early in process
+ * startup.  (Currently, this is called whether or not we intend parallel
+ * activity.)
+ */
 void
 init_parallel_dump_utils(void)
 {
@@ -131,119 +219,69 @@
 		WSADATA		wsaData;
 		int			err;
 
+		/* Prepare for threaded operation */
 		tls_index = TlsAlloc();
 		mainThreadId = GetCurrentThreadId();
+
+		/* Initialize socket access */
 		err = WSAStartup(MAKEWORD(2, 2), &wsaData);
 		if (err != 0)
 		{
 			fprintf(stderr, _("%s: WSAStartup failed: %d\n"), progname, err);
 			exit_nicely(1);
 		}
+		/* ... and arrange to shut it down at exit */
 		on_exit_nicely(shutdown_parallel_dump_utils, NULL);
 		parallel_init_done = true;
 	}
 #endif
 }
 
+/*
+ * Find the ParallelSlot for the current worker process or thread.
+ *
+ * Returns NULL if no matching slot is found (this implies we're the master).
+ */
 static ParallelSlot *
 GetMyPSlot(ParallelState *pstate)
 {
 	int			i;
 
 	for (i = 0; i < pstate->numWorkers; i++)
+	{
 #ifdef WIN32
 		if (pstate->parallelSlot[i].threadId == GetCurrentThreadId())
 #else
 		if (pstate->parallelSlot[i].pid == getpid())
 #endif
 			return &(pstate->parallelSlot[i]);
-
-	return NULL;
-}
-
-/*
- * Fail and die, with a message to stderr.  Parameters as for write_msg.
- *
- * This is defined in parallel.c, because in parallel mode, things are more
- * complicated. If the worker process does exit_horribly(), we forward its
- * last words to the master process. The master process then does
- * exit_horribly() with this error message itself and prints it normally.
- * After printing the message, exit_horribly() on the master will shut down
- * the remaining worker processes.
- */
-void
-exit_horribly(const char *modulename, const char *fmt,...)
-{
-	va_list		ap;
-	ParallelState *pstate = shutdown_info.pstate;
-	ParallelSlot *slot;
-
-	va_start(ap, fmt);
-
-	if (pstate == NULL)
-	{
-		/* Not in parallel mode, just write to stderr */
-		vwrite_msg(modulename, fmt, ap);
-	}
-	else
-	{
-		slot = GetMyPSlot(pstate);
-
-		if (!slot)
-			/* We're the parent, just write the message out */
-			vwrite_msg(modulename, fmt, ap);
-		else
-			/* If we're a worker process, send the msg to the master process */
-			parallel_msg_master(slot, modulename, fmt, ap);
 	}
 
-	va_end(ap);
-
-	exit_nicely(1);
-}
-
-/* Sends the error message from the worker to the master process */
-static void
-parallel_msg_master(ParallelSlot *slot, const char *modulename,
-					const char *fmt, va_list ap)
-{
-	char		buf[512];
-	int			pipefd[2];
-
-	pipefd[PIPE_READ] = slot->pipeRevRead;
-	pipefd[PIPE_WRITE] = slot->pipeRevWrite;
-
-	strcpy(buf, "ERROR ");
-	vsnprintf(buf + strlen("ERROR "),
-			  sizeof(buf) - strlen("ERROR "), fmt, ap);
-
-	sendMessageToMaster(pipefd, buf);
+	return NULL;
 }
 
 /*
  * A thread-local version of getLocalPQExpBuffer().
  *
- * Non-reentrant but reduces memory leakage. (On Windows the memory leakage
- * will be one buffer per thread, which is at least better than one per call).
+ * Non-reentrant but reduces memory leakage: we'll consume one buffer per
+ * thread, which is much better than one per fmtId/fmtQualifiedId call.
  */
+#ifdef WIN32
 static PQExpBuffer
 getThreadLocalPQExpBuffer(void)
 {
 	/*
 	 * The Tls code goes awry if we use a static var, so we provide for both
-	 * static and auto, and omit any use of the static var when using Tls.
+	 * static and auto, and omit any use of the static var when using Tls. We
+	 * rely on TlsGetValue() to return 0 if the value is not yet set.
 	 */
 	static PQExpBuffer s_id_return = NULL;
 	PQExpBuffer id_return;
 
-#ifdef WIN32
 	if (parallel_init_done)
-		id_return = (PQExpBuffer) TlsGetValue(tls_index);		/* 0 when not set */
+		id_return = (PQExpBuffer) TlsGetValue(tls_index);
 	else
 		id_return = s_id_return;
-#else
-	id_return = s_id_return;
-#endif
 
 	if (id_return)				/* first time through? */
 	{
@@ -254,24 +292,19 @@
 	{
 		/* new buffer */
 		id_return = createPQExpBuffer();
-#ifdef WIN32
 		if (parallel_init_done)
 			TlsSetValue(tls_index, id_return);
 		else
 			s_id_return = id_return;
-#else
-		s_id_return = id_return;
-#endif
-
 	}
 
 	return id_return;
 }
+#endif   /* WIN32 */
 
 /*
- * pg_dump and pg_restore register the Archive pointer for the exit handler
- * (called from exit_horribly). This function mainly exists so that we can
- * keep shutdown_info in file scope only.
+ * pg_dump and pg_restore call this to register the cleanup handler
+ * as soon as they've created the ArchiveHandle.
  */
 void
 on_exit_close_archive(Archive *AHX)
@@ -281,8 +314,8 @@
 }
 
 /*
- * This function can close archives in both the parallel and non-parallel
- * case.
+ * on_exit_nicely handler for shutting down database connections and
+ * worker processes cleanly.
  */
 static void
 archive_close_connection(int code, void *arg)
@@ -291,87 +324,103 @@
 
 	if (si->pstate)
 	{
+		/* In parallel mode, must figure out who we are */
 		ParallelSlot *slot = GetMyPSlot(si->pstate);
 
 		if (!slot)
 		{
 			/*
-			 * We're the master: We have already printed out the message
-			 * passed to exit_horribly() either from the master itself or from
-			 * a worker process. Now we need to close our own database
-			 * connection (only open during parallel dump but not restore) and
-			 * shut down the remaining workers.
+			 * We're the master.  Forcibly shut down workers, then close our
+			 * own database connection, if any.
 			 */
-			DisconnectDatabase(si->AHX);
-#ifndef WIN32
+			ShutdownWorkersHard(si->pstate);
 
+			if (si->AHX)
+				DisconnectDatabase(si->AHX);
+		}
+		else
+		{
 			/*
-			 * Setting aborting to true switches to best-effort-mode
-			 * (send/receive but ignore errors) in communicating with our
-			 * workers.
+			 * We're a worker.  Shut down our own DB connection if any.  On
+			 * Windows, we also have to close our communication sockets, to
+			 * emulate what will happen on Unix when the worker process exits.
+			 * (Without this, if this is a premature exit, the master would
+			 * fail to detect it because there would be no EOF condition on
+			 * the other end of the pipe.)
 			 */
-			aborting = true;
-#endif
-			ShutdownWorkersHard(si->pstate);
-		}
-		else if (slot->args->AH)
-			DisconnectDatabase(&(slot->args->AH->public));
-	}
-	else if (si->AHX)
-		DisconnectDatabase(si->AHX);
-}
+			if (slot->args->AH)
+				DisconnectDatabase(&(slot->args->AH->public));
 
-/*
- * If we have one worker that terminates for some reason, we'd like the other
- * threads to terminate as well (and not finish with their 70 GB table dump
- * first...). Now in UNIX we can just kill these processes, and let the signal
- * handler set wantAbort to 1. In Windows we set a termEvent and this serves
- * as the signal for everyone to terminate.
- */
-void
-checkAborting(ArchiveHandle *AH)
-{
 #ifdef WIN32
-	if (WaitForSingleObject(termEvent, 0) == WAIT_OBJECT_0)
-#else
-	if (wantAbort)
+			closesocket(slot->pipeRevRead);
+			closesocket(slot->pipeRevWrite);
 #endif
-		exit_horribly(modulename, "worker is terminating\n");
+		}
+	}
+	else
+	{
+		/* Non-parallel operation: just kill the master DB connection */
+		if (si->AHX)
+			DisconnectDatabase(si->AHX);
+	}
 }
 
 /*
- * Shut down any remaining workers, this has an implicit do_wait == true.
+ * Forcibly shut down any remaining workers, waiting for them to finish.
  *
- * The fastest way we can make the workers terminate gracefully is when
- * they are listening for new commands and we just tell them to terminate.
+ * Note that we don't expect to come here during normal exit (the workers
+ * should be long gone, and the ParallelState too).  We're only here in an
+ * exit_horribly() situation, so intervening to cancel active commands is
+ * appropriate.
  */
 static void
 ShutdownWorkersHard(ParallelState *pstate)
 {
-#ifndef WIN32
 	int			i;
 
-	signal(SIGPIPE, SIG_IGN);
-
 	/*
-	 * Close our write end of the sockets so that the workers know they can
-	 * exit.
+	 * Close our write end of the sockets so that any workers waiting for
+	 * commands know they can exit.
 	 */
 	for (i = 0; i < pstate->numWorkers; i++)
 		closesocket(pstate->parallelSlot[i].pipeWrite);
 
+	/*
+	 * Force early termination of any commands currently in progress.
+	 */
+#ifndef WIN32
+	/* On non-Windows, send SIGTERM to each worker process. */
 	for (i = 0; i < pstate->numWorkers; i++)
-		kill(pstate->parallelSlot[i].pid, SIGTERM);
+	{
+		pid_t		pid = pstate->parallelSlot[i].pid;
+
+		if (pid != 0)
+			kill(pid, SIGTERM);
+	}
 #else
-	/* The workers monitor this event via checkAborting(). */
-	SetEvent(termEvent);
+
+	/*
+	 * On Windows, send query cancels directly to the workers' backends.  Use
+	 * a critical section to ensure worker threads don't change state.
+	 */
+	EnterCriticalSection(&signal_info_lock);
+	for (i = 0; i < pstate->numWorkers; i++)
+	{
+		ArchiveHandle *AH = pstate->parallelSlot[i].args->AH;
+		char		errbuf[1];
+
+		if (AH != NULL && AH->connCancel != NULL)
+			(void) PQcancel(AH->connCancel, errbuf, sizeof(errbuf));
+	}
+	LeaveCriticalSection(&signal_info_lock);
 #endif
 
+	/* Now wait for them to terminate. */
 	WaitForTerminatingWorkers(pstate);
 }
 
 /*
- * Wait for the termination of the processes using the OS-specific method.
+ * Wait for all workers to terminate.
  */
 static void
 WaitForTerminatingWorkers(ParallelState *pstate)
@@ -382,97 +431,443 @@
 		int			j;
 
 #ifndef WIN32
+		/* On non-Windows, use wait() to wait for next worker to end */
 		int			status;
 		pid_t		pid = wait(&status);
 
+		/* Find dead worker's slot, and clear the PID field */
 		for (j = 0; j < pstate->numWorkers; j++)
-			if (pstate->parallelSlot[j].pid == pid)
-				slot = &(pstate->parallelSlot[j]);
-#else
-		uintptr_t	hThread;
-		DWORD		ret;
-		uintptr_t  *lpHandles = pg_malloc(sizeof(HANDLE) * pstate->numWorkers);
+		{
+			slot = &(pstate->parallelSlot[j]);
+			if (slot->pid == pid)
+			{
+				slot->pid = 0;
+				break;
+			}
+		}
+#else							/* WIN32 */
+		/* On Windows, we must use WaitForMultipleObjects() */
+		HANDLE	   *lpHandles = pg_malloc(sizeof(HANDLE) * pstate->numWorkers);
 		int			nrun = 0;
+		DWORD		ret;
+		uintptr_t	hThread;
 
 		for (j = 0; j < pstate->numWorkers; j++)
+		{
 			if (pstate->parallelSlot[j].workerStatus != WRKR_TERMINATED)
 			{
-				lpHandles[nrun] = pstate->parallelSlot[j].hThread;
+				lpHandles[nrun] = (HANDLE) pstate->parallelSlot[j].hThread;
 				nrun++;
 			}
-		ret = WaitForMultipleObjects(nrun, (HANDLE *) lpHandles, false, INFINITE);
+		}
+		ret = WaitForMultipleObjects(nrun, lpHandles, false, INFINITE);
 		Assert(ret != WAIT_FAILED);
-		hThread = lpHandles[ret - WAIT_OBJECT_0];
+		hThread = (uintptr_t) lpHandles[ret - WAIT_OBJECT_0];
+		free(lpHandles);
 
+		/* Find dead worker's slot, and clear the hThread field */
 		for (j = 0; j < pstate->numWorkers; j++)
-			if (pstate->parallelSlot[j].hThread == hThread)
-				slot = &(pstate->parallelSlot[j]);
-
-		free(lpHandles);
-#endif
-		Assert(slot);
+		{
+			slot = &(pstate->parallelSlot[j]);
+			if (slot->hThread == hThread)
+			{
+				/* For cleanliness, close handles for dead threads */
+				CloseHandle((HANDLE) slot->hThread);
+				slot->hThread = (uintptr_t) INVALID_HANDLE_VALUE;
+				break;
+			}
+		}
+#endif   /* WIN32 */
 
+		/* On all platforms, update workerStatus as well */
+		Assert(j < pstate->numWorkers);
 		slot->workerStatus = WRKR_TERMINATED;
 	}
-	Assert(HasEveryWorkerTerminated(pstate));
 }
 
+
+/*
+ * Code for responding to cancel interrupts (SIGINT, control-C, etc)
+ *
+ * This doesn't quite belong in this module, but it needs access to the
+ * ParallelState data, so there's not really a better place either.
+ *
+ * When we get a cancel interrupt, we could just die, but in pg_restore that
+ * could leave a SQL command (e.g., CREATE INDEX on a large table) running
+ * for a long time.  Instead, we try to send a cancel request and then die.
+ * pg_dump probably doesn't really need this, but we might as well use it
+ * there too.  Note that sending the cancel directly from the signal handler
+ * is safe because PQcancel() is written to make it so.
+ *
+ * In parallel operation on Unix, each process is responsible for canceling
+ * its own connection (this must be so because nobody else has access to it).
+ * Furthermore, the master process should attempt to forward its signal to
+ * each child.  In simple manual use of pg_dump/pg_restore, forwarding isn't
+ * needed because typing control-C at the console would deliver SIGINT to
+ * every member of the terminal process group --- but in other scenarios it
+ * might be that only the master gets signaled.
+ *
+ * On Windows, the cancel handler runs in a separate thread, because that's
+ * how SetConsoleCtrlHandler works.  We make it stop worker threads, send
+ * cancels on all active connections, and then return FALSE, which will allow
+ * the process to die.  For safety's sake, we use a critical section to
+ * protect the PGcancel structures against being changed while the signal
+ * thread runs.
+ */
+
+#ifndef WIN32
+
+/*
+ * Signal handler (Unix only)
+ */
+static void
+sigTermHandler(SIGNAL_ARGS)
+{
+	int			i;
+	char		errbuf[1];
+
+	/*
+	 * Some platforms allow delivery of new signals to interrupt an active
+	 * signal handler.  That could muck up our attempt to send PQcancel, so
+	 * disable the signals that setup_cancel_handler enabled.
+	 */
+	pqsignal(SIGINT, SIG_IGN);
+	pqsignal(SIGTERM, SIG_IGN);
+	pqsignal(SIGQUIT, SIG_IGN);
+
+	/*
+	 * If we're in the master, forward signal to all workers.  (It seems best
+	 * to do this before PQcancel; killing the master transaction will result
+	 * in invalid-snapshot errors from active workers, which maybe we can
+	 * quiet by killing workers first.)  Ignore any errors.
+	 */
+	if (signal_info.pstate != NULL)
+	{
+		for (i = 0; i < signal_info.pstate->numWorkers; i++)
+		{
+			pid_t		pid = signal_info.pstate->parallelSlot[i].pid;
+
+			if (pid != 0)
+				kill(pid, SIGTERM);
+		}
+	}
+
+	/*
+	 * Send QueryCancel if we have a connection to send to.  Ignore errors,
+	 * there's not much we can do about them anyway.
+	 */
+	if (signal_info.myAH != NULL && signal_info.myAH->connCancel != NULL)
+		(void) PQcancel(signal_info.myAH->connCancel, errbuf, sizeof(errbuf));
+
+	/*
+	 * Report we're quitting, using nothing more complicated than write(2).
+	 * When in parallel operation, only the master process should do this.
+	 */
+	if (!signal_info.am_worker)
+	{
+		if (progname)
+		{
+			write_stderr(progname);
+			write_stderr(": ");
+		}
+		write_stderr("terminated by user\n");
+	}
+
+	/* And die. */
+	exit(1);
+}
+
+/*
+ * Enable cancel interrupt handler, if not already done.
+ */
+static void
+setup_cancel_handler(void)
+{
+	/*
+	 * When forking, signal_info.handler_set will propagate into the new
+	 * process, but that's fine because the signal handler state does too.
+	 */
+	if (!signal_info.handler_set)
+	{
+		signal_info.handler_set = true;
+
+		pqsignal(SIGINT, sigTermHandler);
+		pqsignal(SIGTERM, sigTermHandler);
+		pqsignal(SIGQUIT, sigTermHandler);
+	}
+}
+
+#else							/* WIN32 */
+
+/*
+ * Console interrupt handler --- runs in a newly-started thread.
+ *
+ * After stopping other threads and sending cancel requests on all open
+ * connections, we return FALSE which will allow the default ExitProcess()
+ * action to be taken.
+ */
+static BOOL WINAPI
+consoleHandler(DWORD dwCtrlType)
+{
+	int			i;
+	char		errbuf[1];
+
+	if (dwCtrlType == CTRL_C_EVENT ||
+		dwCtrlType == CTRL_BREAK_EVENT)
+	{
+		/* Critical section prevents changing data we look at here */
+		EnterCriticalSection(&signal_info_lock);
+
+		/*
+		 * If in parallel mode, stop worker threads and send QueryCancel to
+		 * their connected backends.  The main point of stopping the worker
+		 * threads is to keep them from reporting the query cancels as errors,
+		 * which would clutter the user's screen.  We needn't stop the master
+		 * thread since it won't be doing much anyway.  Do this before
+		 * canceling the main transaction, else we might get invalid-snapshot
+		 * errors reported before we can stop the workers.  Ignore errors,
+		 * there's not much we can do about them anyway.
+		 */
+		if (signal_info.pstate != NULL)
+		{
+			for (i = 0; i < signal_info.pstate->numWorkers; i++)
+			{
+				ParallelSlot *slot = &(signal_info.pstate->parallelSlot[i]);
+				ArchiveHandle *AH = slot->args->AH;
+				HANDLE		hThread = (HANDLE) slot->hThread;
+
+				/*
+				 * Using TerminateThread here may leave some resources leaked,
+				 * but it doesn't matter since we're about to end the whole
+				 * process.
+				 */
+				if (hThread != INVALID_HANDLE_VALUE)
+					TerminateThread(hThread, 0);
+
+				if (AH != NULL && AH->connCancel != NULL)
+					(void) PQcancel(AH->connCancel, errbuf, sizeof(errbuf));
+			}
+		}
+
+		/*
+		 * Send QueryCancel to master connection, if enabled.  Ignore errors,
+		 * there's not much we can do about them anyway.
+		 */
+		if (signal_info.myAH != NULL && signal_info.myAH->connCancel != NULL)
+			(void) PQcancel(signal_info.myAH->connCancel,
+							errbuf, sizeof(errbuf));
+
+		LeaveCriticalSection(&signal_info_lock);
+
+		/*
+		 * Report we're quitting, using nothing more complicated than
+		 * write(2).  (We might be able to get away with using write_msg()
+		 * here, but since we terminated other threads uncleanly above, it
+		 * seems better to assume as little as possible.)
+		 */
+		if (progname)
+		{
+			write_stderr(progname);
+			write_stderr(": ");
+		}
+		write_stderr("terminated by user\n");
+	}
+
+	/* Always return FALSE to allow signal handling to continue */
+	return FALSE;
+}
+
+/*
+ * Enable cancel interrupt handler, if not already done.
+ */
+static void
+setup_cancel_handler(void)
+{
+	if (!signal_info.handler_set)
+	{
+		signal_info.handler_set = true;
+
+		InitializeCriticalSection(&signal_info_lock);
+
+		SetConsoleCtrlHandler(consoleHandler, TRUE);
+	}
+}
+
+#endif   /* WIN32 */
+
+
+/*
+ * set_archive_cancel_info
+ *
+ * Fill AH->connCancel with cancellation info for the specified database
+ * connection; or clear it if conn is NULL.
+ */
+void
+set_archive_cancel_info(ArchiveHandle *AH, PGconn *conn)
+{
+	PGcancel   *oldConnCancel;
+
+	/*
+	 * Activate the interrupt handler if we didn't yet in this process.  On
+	 * Windows, this also initializes signal_info_lock; therefore it's
+	 * important that this happen at least once before we fork off any
+	 * threads.
+	 */
+	setup_cancel_handler();
+
+	/*
+	 * On Unix, we assume that storing a pointer value is atomic with respect
+	 * to any possible signal interrupt.  On Windows, use a critical section.
+	 */
+
+#ifdef WIN32
+	EnterCriticalSection(&signal_info_lock);
+#endif
+
+	/* Free the old one if we have one */
+	oldConnCancel = AH->connCancel;
+	/* be sure interrupt handler doesn't use pointer while freeing */
+	AH->connCancel = NULL;
+
+	if (oldConnCancel != NULL)
+		PQfreeCancel(oldConnCancel);
+
+	/* Set the new one if specified */
+	if (conn)
+		AH->connCancel = PQgetCancel(conn);
+
+	/*
+	 * On Unix, there's only ever one active ArchiveHandle per process, so we
+	 * can just set signal_info.myAH unconditionally.  On Windows, do that
+	 * only in the main thread; worker threads have to make sure their
+	 * ArchiveHandle appears in the pstate data, which is dealt with in
+	 * RunWorker().
+	 */
 #ifndef WIN32
-/* Signal handling (UNIX only) */
+	signal_info.myAH = AH;
+#else
+	if (mainThreadId == GetCurrentThreadId())
+		signal_info.myAH = AH;
+#endif
+
+#ifdef WIN32
+	LeaveCriticalSection(&signal_info_lock);
+#endif
+}
+
+/*
+ * set_cancel_pstate
+ *
+ * Set signal_info.pstate to point to the specified ParallelState, if any.
+ * We need this mainly to have an interlock against Windows signal thread.
+ */
 static void
-sigTermHandler(int signum)
+set_cancel_pstate(ParallelState *pstate)
 {
-	wantAbort = 1;
+#ifdef WIN32
+	EnterCriticalSection(&signal_info_lock);
+#endif
+
+	signal_info.pstate = pstate;
+
+#ifdef WIN32
+	LeaveCriticalSection(&signal_info_lock);
+#endif
 }
+
+/*
+ * set_cancel_slot_archive
+ *
+ * Set ParallelSlot's AH field to point to the specified archive, if any.
+ * We need this mainly to have an interlock against Windows signal thread.
+ */
+static void
+set_cancel_slot_archive(ParallelSlot *slot, ArchiveHandle *AH)
+{
+#ifdef WIN32
+	EnterCriticalSection(&signal_info_lock);
 #endif
 
+	slot->args->AH = AH;
+
+#ifdef WIN32
+	LeaveCriticalSection(&signal_info_lock);
+#endif
+}
+
+
 /*
- * This function is called by both UNIX and Windows variants to set up a
- * worker process.
+ * This function is called by both Unix and Windows variants to set up
+ * and run a worker process.  Caller should exit the process (or thread)
+ * upon return.
  */
 static void
-SetupWorker(ArchiveHandle *AH, int pipefd[2], int worker)
+RunWorker(ArchiveHandle *AH, ParallelSlot *slot)
 {
+	int			pipefd[2];
+
+	/* fetch child ends of pipes */
+	pipefd[PIPE_READ] = slot->pipeRevRead;
+	pipefd[PIPE_WRITE] = slot->pipeRevWrite;
+
 	/*
-	 * Call the setup worker function that's defined in the ArchiveHandle.
+	 * Clone the archive so that we have our own state to work with, and in
+	 * particular our own database connection.
 	 *
-	 * We get the raw connection only for the reason that we can close it
-	 * properly when we shut down. This happens only that way when it is
-	 * brought down because of an error.
+	 * We clone on Unix as well as Windows, even though technically we don't
+	 * need to because fork() gives us a copy in our own address space
+	 * already.  But CloneArchive resets the state information and also clones
+	 * the database connection which both seem kinda helpful.
 	 */
-	(AH->SetupWorkerPtr) ((Archive *) AH);
+	AH = CloneArchive(AH);
 
-	Assert(AH->connection != NULL);
+	/* Remember cloned archive where signal handler can find it */
+	set_cancel_slot_archive(slot, AH);
 
+	/*
+	 * Call the setup worker function that's defined in the ArchiveHandle.
+	 */
+	(AH->SetupWorkerPtr) ((Archive *) AH);
+
+	/*
+	 * Execute commands until done.
+	 */
 	WaitForCommands(AH, pipefd);
 
-	closesocket(pipefd[PIPE_READ]);
-	closesocket(pipefd[PIPE_WRITE]);
+	/*
+	 * Disconnect from database and clean up.
+	 */
+	set_cancel_slot_archive(slot, NULL);
+	DisconnectDatabase(&(AH->public));
+	DeCloneArchive(AH);
 }
 
+/*
+ * Thread base function for Windows
+ */
 #ifdef WIN32
 static unsigned __stdcall
 init_spawned_worker_win32(WorkerInfo *wi)
 {
-	ArchiveHandle *AH;
-	int			pipefd[2] = {wi->pipeRead, wi->pipeWrite};
-	int			worker = wi->worker;
-
-	AH = CloneArchive(wi->AH);
+	ArchiveHandle *AH = wi->AH;
+	ParallelSlot *slot = wi->slot;
 
+	/* Don't need WorkerInfo anymore */
 	free(wi);
-	SetupWorker(AH, pipefd, worker);
 
-	DeCloneArchive(AH);
+	/* Run the worker ... */
+	RunWorker(AH, slot);
+
+	/* Exit the thread */
 	_endthreadex(0);
 	return 0;
 }
-#endif
+#endif   /* WIN32 */
 
 /*
- * This function starts the parallel dump or restore by spawning off the
- * worker processes in both Unix and Windows. For Windows, it creates a number
- * of threads while it does a fork() on Unix.
+ * This function starts a parallel dump or restore by spawning off the worker
+ * processes.  For Windows, it creates a number of threads; on Unix the
+ * workers are created with fork().
  */
 ParallelState *
 ParallelBackupStart(ArchiveHandle *AH)
@@ -483,9 +878,6 @@
 
 	Assert(AH->public.numWorkers > 0);
 
-	/* Ensure stdio state is quiesced before forking */
-	fflush(NULL);
-
 	pstate = (ParallelState *) pg_malloc(sizeof(ParallelState));
 
 	pstate->numWorkers = AH->public.numWorkers;
@@ -497,22 +889,32 @@
 	pstate->parallelSlot = (ParallelSlot *) pg_malloc(slotSize);
 	memset((void *) pstate->parallelSlot, 0, slotSize);
 
+#ifdef WIN32
+	/* Make fmtId() and fmtQualifiedId() use thread-local storage */
+	getLocalPQExpBuffer = getThreadLocalPQExpBuffer;
+#endif
+
 	/*
-	 * Set the pstate in the shutdown_info. The exit handler uses pstate if
-	 * set and falls back to AHX otherwise.
+	 * Set the pstate in shutdown_info, to tell the exit handler that it must
+	 * clean up workers as well as the main database connection.  But we don't
+	 * set this in signal_info yet, because we don't want child processes to
+	 * inherit non-NULL signal_info.pstate.
 	 */
 	shutdown_info.pstate = pstate;
-	getLocalPQExpBuffer = getThreadLocalPQExpBuffer;
 
-#ifdef WIN32
-	tMasterThreadId = GetCurrentThreadId();
-	termEvent = CreateEvent(NULL, true, false, "Terminate");
-#else
-	signal(SIGTERM, sigTermHandler);
-	signal(SIGINT, sigTermHandler);
-	signal(SIGQUIT, sigTermHandler);
-#endif
+	/*
+	 * Temporarily disable query cancellation on the master connection.  This
+	 * ensures that child processes won't inherit valid AH->connCancel
+	 * settings and thus won't try to issue cancels against the master's
+	 * connection.  No harm is done if we fail while it's disabled, because
+	 * the master connection is idle at this point anyway.
+	 */
+	set_archive_cancel_info(AH, NULL);
 
+	/* Ensure stdio state is quiesced before forking */
+	fflush(NULL);
+
+	/* Create desired number of workers */
 	for (i = 0; i < pstate->numWorkers; i++)
 	{
 #ifdef WIN32
@@ -521,60 +923,50 @@
 #else
 		pid_t		pid;
 #endif
+		ParallelSlot *slot = &(pstate->parallelSlot[i]);
 		int			pipeMW[2],
 					pipeWM[2];
 
+		/* Create communication pipes for this worker */
 		if (pgpipe(pipeMW) < 0 || pgpipe(pipeWM) < 0)
 			exit_horribly(modulename,
 						  "could not create communication channels: %s\n",
 						  strerror(errno));
 
-		pstate->parallelSlot[i].workerStatus = WRKR_IDLE;
-		pstate->parallelSlot[i].args = (ParallelArgs *) pg_malloc(sizeof(ParallelArgs));
-		pstate->parallelSlot[i].args->AH = NULL;
-		pstate->parallelSlot[i].args->te = NULL;
+		slot->workerStatus = WRKR_IDLE;
+		slot->args = (ParallelArgs *) pg_malloc(sizeof(ParallelArgs));
+		slot->args->AH = NULL;
+		slot->args->te = NULL;
+
+		/* master's ends of the pipes */
+		slot->pipeRead = pipeWM[PIPE_READ];
+		slot->pipeWrite = pipeMW[PIPE_WRITE];
+		/* child's ends of the pipes */
+		slot->pipeRevRead = pipeMW[PIPE_READ];
+		slot->pipeRevWrite = pipeWM[PIPE_WRITE];
+
 #ifdef WIN32
-		/* Allocate a new structure for every worker */
+		/* Create transient structure to pass args to worker function */
 		wi = (WorkerInfo *) pg_malloc(sizeof(WorkerInfo));
 
-		wi->worker = i;
 		wi->AH = AH;
-		wi->pipeRead = pstate->parallelSlot[i].pipeRevRead = pipeMW[PIPE_READ];
-		wi->pipeWrite = pstate->parallelSlot[i].pipeRevWrite = pipeWM[PIPE_WRITE];
+		wi->slot = slot;
 
 		handle = _beginthreadex(NULL, 0, (void *) &init_spawned_worker_win32,
-								wi, 0, &(pstate->parallelSlot[i].threadId));
-		pstate->parallelSlot[i].hThread = handle;
-#else
+								wi, 0, &(slot->threadId));
+		slot->hThread = handle;
+#else							/* !WIN32 */
 		pid = fork();
 		if (pid == 0)
 		{
 			/* we are the worker */
 			int			j;
-			int			pipefd[2];
 
-			pipefd[0] = pipeMW[PIPE_READ];
-			pipefd[1] = pipeWM[PIPE_WRITE];
+			/* this is needed for GetMyPSlot() */
+			slot->pid = getpid();
 
-			/*
-			 * Store the fds for the reverse communication in pstate. Actually
-			 * we only use this in case of an error and don't use pstate
-			 * otherwise in the worker process. On Windows we write to the
-			 * global pstate, in Unix we write to our process-local copy but
-			 * that's also where we'd retrieve this information back from.
-			 */
-			pstate->parallelSlot[i].pipeRevRead = pipefd[PIPE_READ];
-			pstate->parallelSlot[i].pipeRevWrite = pipefd[PIPE_WRITE];
-			pstate->parallelSlot[i].pid = getpid();
-
-			/*
-			 * Call CloneArchive on Unix as well even though technically we
-			 * don't need to because fork() gives us a copy in our own address
-			 * space already. But CloneArchive resets the state information
-			 * and also clones the database connection (for parallel dump)
-			 * which both seem kinda helpful.
-			 */
-			pstate->parallelSlot[i].args->AH = CloneArchive(AH);
+			/* instruct signal handler that we're in a worker now */
+			signal_info.am_worker = true;
 
 			/* close read end of Worker -> Master */
 			closesocket(pipeWM[PIPE_READ]);
@@ -583,7 +975,7 @@
 
 			/*
 			 * Close all inherited fds for communication of the master with
-			 * the other workers.
+			 * previously-forked workers.
 			 */
 			for (j = 0; j < i; j++)
 			{
@@ -591,128 +983,96 @@
 				closesocket(pstate->parallelSlot[j].pipeWrite);
 			}
 
-			SetupWorker(pstate->parallelSlot[i].args->AH, pipefd, i);
+			/* Run the worker ... */
+			RunWorker(AH, slot);
 
+			/* We can just exit(0) when done */
 			exit(0);
 		}
 		else if (pid < 0)
+		{
 			/* fork failed */
 			exit_horribly(modulename,
 						  "could not create worker process: %s\n",
 						  strerror(errno));
+		}
 
-		/* we are the Master, pid > 0 here */
-		Assert(pid > 0);
+		/* In Master after successful fork */
+		slot->pid = pid;
 
 		/* close read end of Master -> Worker */
 		closesocket(pipeMW[PIPE_READ]);
 		/* close write end of Worker -> Master */
 		closesocket(pipeWM[PIPE_WRITE]);
+#endif   /* WIN32 */
+	}
 
-		pstate->parallelSlot[i].pid = pid;
+	/*
+	 * Having forked off the workers, disable SIGPIPE so that master isn't
+	 * killed if it tries to send a command to a dead worker.  We don't want
+	 * the workers to inherit this setting, though.
+	 */
+#ifndef WIN32
+	pqsignal(SIGPIPE, SIG_IGN);
 #endif
 
-		pstate->parallelSlot[i].pipeRead = pipeWM[PIPE_READ];
-		pstate->parallelSlot[i].pipeWrite = pipeMW[PIPE_WRITE];
-	}
+	/*
+	 * Re-establish query cancellation on the master connection.
+	 */
+	set_archive_cancel_info(AH, AH->connection);
+
+	/*
+	 * Tell the cancel signal handler to forward signals to worker processes,
+	 * too.  (As with query cancel, we did not need this earlier because the
+	 * workers have not yet been given anything to do; if we die before this
+	 * point, any already-started workers will see EOF and quit promptly.)
+	 */
+	set_cancel_pstate(pstate);
 
 	return pstate;
 }
 
 /*
- * Tell all of our workers to terminate.
- *
- * Pretty straightforward routine, first we tell everyone to terminate, then
- * we listen to the workers' replies and finally close the sockets that we
- * have used for communication.
+ * Close down a parallel dump or restore.
  */
 void
 ParallelBackupEnd(ArchiveHandle *AH, ParallelState *pstate)
 {
 	int			i;
 
+	/* No work if non-parallel */
 	if (pstate->numWorkers == 1)
 		return;
 
+	/* There should not be any unfinished jobs */
 	Assert(IsEveryWorkerIdle(pstate));
 
-	/* close the sockets so that the workers know they can exit */
+	/* Close the sockets so that the workers know they can exit */
 	for (i = 0; i < pstate->numWorkers; i++)
 	{
 		closesocket(pstate->parallelSlot[i].pipeRead);
 		closesocket(pstate->parallelSlot[i].pipeWrite);
 	}
+
+	/* Wait for them to exit */
 	WaitForTerminatingWorkers(pstate);
 
 	/*
-	 * Remove the pstate again, so the exit handler in the parent will now
-	 * again fall back to closing AH->connection (if connected).
+	 * Unlink pstate from shutdown_info, so the exit handler will not try to
+	 * use it; and likewise unlink from signal_info.
 	 */
 	shutdown_info.pstate = NULL;
+	set_cancel_pstate(NULL);
 
+	/* Release state (mere neatnik-ism, since we're about to terminate) */
 	free(pstate->parallelSlot);
 	free(pstate);
 }
 
-
 /*
- * The sequence is the following (for dump, similar for restore):
- *
- * The master process starts the parallel backup in ParllelBackupStart, this
- * forks the worker processes which enter WaitForCommand().
- *
- * The master process dispatches an individual work item to one of the worker
- * processes in DispatchJobForTocEntry(). It calls
- * AH->MasterStartParallelItemPtr, a routine of the output format. This
- * function's arguments are the parents archive handle AH (containing the full
- * catalog information), the TocEntry that the worker should work on and a
- * T_Action act indicating whether this is a backup or a restore item.  The
- * function then converts the TocEntry assignment into a string that is then
- * sent over to the worker process. In the simplest case that would be
- * something like "DUMP 1234", with 1234 being the TocEntry id.
+ * Dispatch a job to some free worker (caller must ensure there is one!)
  *
- * The worker receives the message in the routine pointed to by
- * WorkerJobDumpPtr or WorkerJobRestorePtr. These are also pointers to
- * corresponding routines of the respective output format, e.g.
- * _WorkerJobDumpDirectory().
- *
- * Remember that we have forked off the workers only after we have read in the
- * catalog. That's why our worker processes can also access the catalog
- * information. Now they re-translate the textual representation to a TocEntry
- * on their side and do the required action (restore or dump).
- *
- * The result is again a textual string that is sent back to the master and is
- * interpreted by AH->MasterEndParallelItemPtr. This function can update state
- * or catalog information on the master's side, depending on the reply from
- * the worker process. In the end it returns status which is 0 for successful
- * execution.
- *
- * ---------------------------------------------------------------------
- * Master									Worker
- *
- *											enters WaitForCommands()
- * DispatchJobForTocEntry(...te...)
- *
- * [ Worker is IDLE ]
- *
- * arg = (MasterStartParallelItemPtr)()
- * send: DUMP arg
- *											receive: DUMP arg
- *											str = (WorkerJobDumpPtr)(arg)
- * [ Worker is WORKING ]					... gets te from arg ...
- *											... dump te ...
- *											send: OK DUMP info
- *
- * In ListenToWorkers():
- *
- * [ Worker is FINISHED ]
- * receive: OK DUMP info
- * status = (MasterEndParallelItemPtr)(info)
- *
- * In ReapWorkerStatus(&ptr):
- * *ptr = status;
- * [ Worker is IDLE ]
- * ---------------------------------------------------------------------
+ * te is the TocEntry to be processed, act is the action to be taken on it.
  */
 void
 DispatchJobForTocEntry(ArchiveHandle *AH, ParallelState *pstate, TocEntry *te,
@@ -722,20 +1082,24 @@
 	char	   *arg;
 
 	/* our caller makes sure that at least one worker is idle */
-	Assert(GetIdleWorker(pstate) != NO_SLOT);
 	worker = GetIdleWorker(pstate);
 	Assert(worker != NO_SLOT);
 
+	/* Construct and send command string */
 	arg = (AH->MasterStartParallelItemPtr) (AH, te, act);
 
 	sendMessageToWorker(pstate, worker, arg);
 
+	/* XXX aren't we leaking string here? (no, because it's static. Ick.) */
+
+	/* Remember worker is busy, and which TocEntry it's working on */
 	pstate->parallelSlot[worker].workerStatus = WRKR_WORKING;
 	pstate->parallelSlot[worker].args->te = te;
 }
 
 /*
- * Find the first free parallel slot (if any).
+ * Find an idle worker and return its slot number.
+ * Return NO_SLOT if none are idle.
  */
 int
 GetIdleWorker(ParallelState *pstate)
@@ -743,13 +1107,15 @@
 	int			i;
 
 	for (i = 0; i < pstate->numWorkers; i++)
+	{
 		if (pstate->parallelSlot[i].workerStatus == WRKR_IDLE)
 			return i;
+	}
 	return NO_SLOT;
 }
 
 /*
- * Return true iff every worker process is in the WRKR_TERMINATED state.
+ * Return true iff every worker is in the WRKR_TERMINATED state.
  */
 static bool
 HasEveryWorkerTerminated(ParallelState *pstate)
@@ -757,8 +1123,10 @@
 	int			i;
 
 	for (i = 0; i < pstate->numWorkers; i++)
+	{
 		if (pstate->parallelSlot[i].workerStatus != WRKR_TERMINATED)
 			return false;
+	}
 	return true;
 }
 
@@ -771,62 +1139,50 @@
 	int			i;
 
 	for (i = 0; i < pstate->numWorkers; i++)
+	{
 		if (pstate->parallelSlot[i].workerStatus != WRKR_IDLE)
 			return false;
+	}
 	return true;
 }
 
 /*
- * ---------------------------------------------------------------------
- * One danger of the parallel backup is a possible deadlock:
+ * Acquire lock on a table to be dumped by a worker process.
+ *
+ * The master process is already holding an ACCESS SHARE lock.  Ordinarily
+ * it's no problem for a worker to get one too, but if anything else besides
+ * pg_dump is running, there's a possible deadlock:
  *
  * 1) Master dumps the schema and locks all tables in ACCESS SHARE mode.
  * 2) Another process requests an ACCESS EXCLUSIVE lock (which is not granted
  *	  because the master holds a conflicting ACCESS SHARE lock).
- * 3) The worker process also requests an ACCESS SHARE lock to read the table.
- *	  The worker's not granted that lock but is enqueued behind the ACCESS
- *	  EXCLUSIVE lock request.
- * ---------------------------------------------------------------------
+ * 3) A worker process also requests an ACCESS SHARE lock to read the table.
+ *	  The worker is enqueued behind the ACCESS EXCLUSIVE lock request.
+ * 4) Now we have a deadlock, since the master is effectively waiting for
+ *	  the worker.  The server cannot detect that, however.
  *
- * Now what we do here is to just request a lock in ACCESS SHARE but with
- * NOWAIT in the worker prior to touching the table. If we don't get the lock,
+ * To prevent an infinite wait, prior to touching a table in a worker, request
+ * a lock in ACCESS SHARE mode but with NOWAIT.  If we don't get the lock,
  * then we know that somebody else has requested an ACCESS EXCLUSIVE lock and
- * are good to just fail the whole backup because we have detected a deadlock.
+ * so we have a deadlock.  We must fail the backup in that case.
  */
 static void
-lockTableNoWait(ArchiveHandle *AH, TocEntry *te)
+lockTableForWorker(ArchiveHandle *AH, TocEntry *te)
 {
-	Archive    *AHX = (Archive *) AH;
 	const char *qualId;
-	PQExpBuffer query = createPQExpBuffer();
+	PQExpBuffer query;
 	PGresult   *res;
 
-	Assert(AH->format == archDirectory);
-	Assert(strcmp(te->desc, "BLOBS") != 0);
-
-	appendPQExpBuffer(query,
-					  "SELECT pg_namespace.nspname,"
-					  "       pg_class.relname "
-					  "  FROM pg_class "
-					"  JOIN pg_namespace on pg_namespace.oid = relnamespace "
-					  " WHERE pg_class.oid = %u", te->catalogId.oid);
-
-	res = PQexec(AH->connection, query->data);
-
-	if (!res || PQresultStatus(res) != PGRES_TUPLES_OK)
-		exit_horribly(modulename,
-					  "could not get relation name for OID %u: %s\n",
-					  te->catalogId.oid, PQerrorMessage(AH->connection));
+	/* Nothing to do for BLOBS */
+	if (strcmp(te->desc, "BLOBS") == 0)
+		return;
 
-	resetPQExpBuffer(query);
+	query = createPQExpBuffer();
 
-	qualId = fmtQualifiedId(AHX->remoteVersion,
-							PQgetvalue(res, 0, 0),
-							PQgetvalue(res, 0, 1));
+	qualId = fmtQualifiedId(AH->public.remoteVersion, te->namespace, te->tag);
 
 	appendPQExpBuffer(query, "LOCK TABLE %s IN ACCESS SHARE MODE NOWAIT",
 					  qualId);
-	PQclear(res);
 
 	res = PQexec(AH->connection, query->data);
 
@@ -842,11 +1198,9 @@
 }
 
 /*
- * That's the main routine for the worker.
- * When it starts up it enters this routine and waits for commands from the
- * master process. After having processed a command it comes back to here to
- * wait for the next command. Finally it will receive a TERMINATE command and
- * exit.
+ * WaitForCommands: main routine for a worker process.
+ *
+ * Read and execute commands from the master until we see EOF on the pipe.
  */
 static void
 WaitForCommands(ArchiveHandle *AH, int pipefd[2])
@@ -854,69 +1208,57 @@
 	char	   *command;
 	DumpId		dumpId;
 	int			nBytes;
-	char	   *str = NULL;
+	char	   *str;
 	TocEntry   *te;
 
 	for (;;)
 	{
 		if (!(command = getMessageFromMaster(pipefd)))
 		{
-			PQfinish(AH->connection);
-			AH->connection = NULL;
+			/* EOF, so done */
 			return;
 		}
 
 		if (messageStartsWith(command, "DUMP "))
 		{
-			Assert(AH->format == archDirectory);
+			/* Decode the command */
 			sscanf(command + strlen("DUMP "), "%d%n", &dumpId, &nBytes);
 			Assert(nBytes == strlen(command) - strlen("DUMP "));
-
 			te = getTocEntryByDumpId(AH, dumpId);
 			Assert(te != NULL);
 
-			/*
-			 * Lock the table but with NOWAIT. Note that the parent is already
-			 * holding a lock. If we cannot acquire another ACCESS SHARE MODE
-			 * lock, then somebody else has requested an exclusive lock in the
-			 * meantime.  lockTableNoWait dies in this case to prevent a
-			 * deadlock.
-			 */
-			if (strcmp(te->desc, "BLOBS") != 0)
-				lockTableNoWait(AH, te);
+			/* Acquire lock on this table within the worker's session */
+			lockTableForWorker(AH, te);
 
-			/*
-			 * The message we return here has been pg_malloc()ed and we are
-			 * responsible for free()ing it.
-			 */
+			/* Perform the dump command */
 			str = (AH->WorkerJobDumpPtr) (AH, te);
-			Assert(AH->connection != NULL);
+
+			/* Return status to master */
 			sendMessageToMaster(pipefd, str);
+
+			/* we are responsible for freeing the status string */
 			free(str);
 		}
 		else if (messageStartsWith(command, "RESTORE "))
 		{
-			Assert(AH->format == archDirectory || AH->format == archCustom);
-			Assert(AH->connection != NULL);
-
+			/* Decode the command */
 			sscanf(command + strlen("RESTORE "), "%d%n", &dumpId, &nBytes);
 			Assert(nBytes == strlen(command) - strlen("RESTORE "));
-
 			te = getTocEntryByDumpId(AH, dumpId);
 			Assert(te != NULL);
 
-			/*
-			 * The message we return here has been pg_malloc()ed and we are
-			 * responsible for free()ing it.
-			 */
+			/* Perform the restore command */
 			str = (AH->WorkerJobRestorePtr) (AH, te);
-			Assert(AH->connection != NULL);
+
+			/* Return status to master */
 			sendMessageToMaster(pipefd, str);
+
+			/* we are responsible for freeing the status string */
 			free(str);
 		}
 		else
 			exit_horribly(modulename,
-					   "unrecognized command on communication channel: %s\n",
+					   "unrecognized command received from master: \"%s\"\n",
 						  command);
 
 		/* command was pg_malloc'd and we are responsible for free()ing it. */
@@ -925,18 +1267,21 @@
 }
 
 /*
- * ---------------------------------------------------------------------
- * Note the status change:
+ * Check for status messages from workers.
+ *
+ * If do_wait is true, wait to get a status message; otherwise, just return
+ * immediately if there is none available.
  *
- * DispatchJobForTocEntry		WRKR_IDLE -> WRKR_WORKING
- * ListenToWorkers				WRKR_WORKING -> WRKR_FINISHED / WRKR_TERMINATED
- * ReapWorkerStatus				WRKR_FINISHED -> WRKR_IDLE
- * ---------------------------------------------------------------------
- *
- * Just calling ReapWorkerStatus() when all workers are working might or might
- * not give you an idle worker because you need to call ListenToWorkers() in
- * between and only thereafter ReapWorkerStatus(). This is necessary in order
- * to get and deal with the status (=result) of the worker's execution.
+ * When we get a status message, we let MasterEndParallelItemPtr process it,
+ * then save the resulting status code and switch the worker's state to
+ * WRKR_FINISHED.  Later, caller must call ReapWorkerStatus() to verify
+ * that the status was "OK" and push the worker back to IDLE state.
+ *
+ * XXX Rube Goldberg would be proud of this API, but no one else should be.
+ *
+ * XXX is it worth checking for more than one status message per call?
+ * It seems somewhat unlikely that multiple workers would finish at exactly
+ * the same time.
  */
 void
 ListenToWorkers(ArchiveHandle *AH, ParallelState *pstate, bool do_wait)
@@ -944,22 +1289,23 @@
 	int			worker;
 	char	   *msg;
 
+	/* Try to collect a status message */
 	msg = getMessageFromWorker(pstate, do_wait, &worker);
 
 	if (!msg)
 	{
+		/* If do_wait is true, we must have detected EOF on some socket */
 		if (do_wait)
 			exit_horribly(modulename, "a worker process died unexpectedly\n");
 		return;
 	}
 
+	/* Process it and update our idea of the worker's status */
 	if (messageStartsWith(msg, "OK "))
 	{
+		TocEntry   *te = pstate->parallelSlot[worker].args->te;
 		char	   *statusString;
-		TocEntry   *te;
 
-		pstate->parallelSlot[worker].workerStatus = WRKR_FINISHED;
-		te = pstate->parallelSlot[worker].args->te;
 		if (messageStartsWith(msg, "OK RESTORE "))
 		{
 			statusString = msg + strlen("OK RESTORE ");
@@ -976,27 +1322,25 @@
 		}
 		else
 			exit_horribly(modulename,
-						  "invalid message received from worker: %s\n", msg);
-	}
-	else if (messageStartsWith(msg, "ERROR "))
-	{
-		Assert(AH->format == archDirectory || AH->format == archCustom);
-		pstate->parallelSlot[worker].workerStatus = WRKR_TERMINATED;
-		exit_horribly(modulename, "%s", msg + strlen("ERROR "));
+						  "invalid message received from worker: \"%s\"\n",
+						  msg);
+		pstate->parallelSlot[worker].workerStatus = WRKR_FINISHED;
 	}
 	else
-		exit_horribly(modulename, "invalid message received from worker: %s\n", msg);
+		exit_horribly(modulename,
+					  "invalid message received from worker: \"%s\"\n",
+					  msg);
 
-	/* both Unix and Win32 return pg_malloc()ed space, so we free it */
+	/* Free the string returned from getMessageFromWorker */
 	free(msg);
 }
 
 /*
- * This function is executed in the master process.
+ * Check to see if any worker is in WRKR_FINISHED state.  If so,
+ * return its command status code into *status, reset it to IDLE state,
+ * and return its slot number.  Otherwise return NO_SLOT.
  *
- * This function is used to get the return value of a terminated worker
- * process. If a process has terminated, its status is stored in *status and
- * the id of the worker is returned.
+ * This function is executed in the master process.
  */
 int
 ReapWorkerStatus(ParallelState *pstate, int *status)
@@ -1017,9 +1361,16 @@
 }
 
 /*
- * This function is executed in the master process.
+ * Wait, if necessary, until we have at least one idle worker.
+ * Reap worker status as necessary to move FINISHED workers to IDLE state.
+ *
+ * We assume that no extra processing is required when reaping a finished
+ * command, except for checking that the status was OK (zero).
+ * Caution: that assumption means that this function can only be used in
+ * parallel dump, not parallel restore, because the latter has a more
+ * complex set of rules about handling status.
  *
- * It looks for an idle worker process and only returns if there is one.
+ * This function is executed in the master process.
  */
 void
 EnsureIdleWorker(ArchiveHandle *AH, ParallelState *pstate)
@@ -1059,9 +1410,16 @@
 }
 
 /*
- * This function is executed in the master process.
+ * Wait for all workers to be idle.
+ * Reap worker status as necessary to move FINISHED workers to IDLE state.
+ *
+ * We assume that no extra processing is required when reaping a finished
+ * command, except for checking that the status was OK (zero).
+ * Caution: that assumption means that this function can only be used in
+ * parallel dump, not parallel restore, because the latter has a more
+ * complex set of rules about handling status.
  *
- * It waits for all workers to terminate.
+ * This function is executed in the master process.
  */
 void
 EnsureWorkersFinished(ArchiveHandle *AH, ParallelState *pstate)
@@ -1083,10 +1441,11 @@
 }
 
 /*
- * This function is executed in the worker process.
+ * Read one command message from the master, blocking if necessary
+ * until one is available, and return it as a malloc'd string.
+ * On EOF, return NULL.
  *
- * It returns the next message on the communication channel, blocking until it
- * becomes available.
+ * This function is executed in worker processes.
  */
 static char *
 getMessageFromMaster(int pipefd[2])
@@ -1095,9 +1454,9 @@
 }
 
 /*
- * This function is executed in the worker process.
+ * Send a status message to the master.
  *
- * It sends a message to the master on the communication channel.
+ * This function is executed in worker processes.
  */
 static void
 sendMessageToMaster(int pipefd[2], const char *str)
@@ -1111,9 +1470,8 @@
 }
 
 /*
- * A select loop that repeats calling select until a descriptor in the read
- * set becomes readable. On Windows we have to check for the termination event
- * from time to time, on Unix we can just block forever.
+ * Wait until some descriptor in "workerset" becomes readable.
+ * Returns -1 on error, else the number of readable descriptors.
  */
 static int
 select_loop(int maxFd, fd_set *workerset)
@@ -1121,59 +1479,38 @@
 	int			i;
 	fd_set		saveSet = *workerset;
 
-#ifdef WIN32
-	/* should always be the master */
-	Assert(tMasterThreadId == GetCurrentThreadId());
-
-	for (;;)
-	{
-		/*
-		 * sleep a quarter of a second before checking if we should terminate.
-		 */
-		struct timeval tv = {0, 250000};
-
-		*workerset = saveSet;
-		i = select(maxFd + 1, workerset, NULL, NULL, &tv);
-
-		if (i == SOCKET_ERROR && WSAGetLastError() == WSAEINTR)
-			continue;
-		if (i)
-			break;
-	}
-#else							/* UNIX */
-
 	for (;;)
 	{
 		*workerset = saveSet;
 		i = select(maxFd + 1, workerset, NULL, NULL, NULL);
 
-		/*
-		 * If we Ctrl-C the master process, it's likely that we interrupt
-		 * select() here. The signal handler will set wantAbort == true and
-		 * the shutdown journey starts from here. Note that we'll come back
-		 * here later when we tell all workers to terminate and read their
-		 * responses. But then we have aborting set to true.
-		 */
-		if (wantAbort && !aborting)
-			exit_horribly(modulename, "terminated by user\n");
-
+#ifndef WIN32
 		if (i < 0 && errno == EINTR)
 			continue;
+#else
+		if (i == SOCKET_ERROR && WSAGetLastError() == WSAEINTR)
+			continue;
+#endif
 		break;
 	}
-#endif
 
 	return i;
 }
 
 
 /*
- * This function is executed in the master process.
+ * Check for messages from worker processes.
+ *
+ * If a message is available, return it as a malloc'd string, and put the
+ * index of the sending worker in *worker.
+ *
+ * If nothing is available, wait if "do_wait" is true, else return NULL.
  *
- * It returns the next message from the worker on the communication channel,
- * optionally blocking (do_wait) until it becomes available.
+ * If we detect EOF on any socket, we'll return NULL.  It's not great that
+ * that's hard to distinguish from the no-data-available case, but for now
+ * our one caller is okay with that.
  *
- * The id of the worker is returned in *worker.
+ * This function is executed in the master process.
  */
 static char *
 getMessageFromWorker(ParallelState *pstate, bool do_wait, int *worker)
@@ -1183,14 +1520,13 @@
 	int			maxFd = -1;
 	struct timeval nowait = {0, 0};
 
+	/* construct bitmap of socket descriptors for select() */
 	FD_ZERO(&workerset);
-
 	for (i = 0; i < pstate->numWorkers; i++)
 	{
 		if (pstate->parallelSlot[i].workerStatus == WRKR_TERMINATED)
 			continue;
 		FD_SET(pstate->parallelSlot[i].pipeRead, &workerset);
-		/* actually WIN32 ignores the first parameter to select()... */
 		if (pstate->parallelSlot[i].pipeRead > maxFd)
 			maxFd = pstate->parallelSlot[i].pipeRead;
 	}
@@ -1207,7 +1543,7 @@
 	}
 
 	if (i < 0)
-		exit_horribly(modulename, "error in ListenToWorkers(): %s\n", strerror(errno));
+		exit_horribly(modulename, "select() failed: %s\n", strerror(errno));
 
 	for (i = 0; i < pstate->numWorkers; i++)
 	{
@@ -1216,6 +1552,16 @@
 		if (!FD_ISSET(pstate->parallelSlot[i].pipeRead, &workerset))
 			continue;
 
+		/*
+		 * Read the message if any.  If the socket is ready because of EOF,
+		 * we'll return NULL instead (and the socket will stay ready, so the
+		 * condition will persist).
+		 *
+		 * Note: because this is a blocking read, we'll wait if only part of
+		 * the message is available.  Waiting a long time would be bad, but
+		 * since worker status messages are short and are always sent in one
+		 * operation, it shouldn't be a problem in practice.
+		 */
 		msg = readMessageFromPipe(pstate->parallelSlot[i].pipeRead);
 		*worker = i;
 		return msg;
@@ -1225,9 +1571,9 @@
 }
 
 /*
- * This function is executed in the master process.
+ * Send a command message to the specified worker process.
  *
- * It sends a message to a certain worker on the communication channel.
+ * This function is executed in the master process.
  */
 static void
 sendMessageToWorker(ParallelState *pstate, int worker, const char *str)
@@ -1236,22 +1582,18 @@
 
 	if (pipewrite(pstate->parallelSlot[worker].pipeWrite, str, len) != len)
 	{
-		/*
-		 * If we're already aborting anyway, don't care if we succeed or not.
-		 * The child might have gone already.
-		 */
-#ifndef WIN32
-		if (!aborting)
-#endif
-			exit_horribly(modulename,
-						"could not write to the communication channel: %s\n",
-						  strerror(errno));
+		exit_horribly(modulename,
+					  "could not write to the communication channel: %s\n",
+					  strerror(errno));
 	}
 }
 
 /*
- * The underlying function to read a message from the communication channel
- * (fd) with optional blocking (do_wait).
+ * Read one message from the specified pipe (fd), blocking if necessary
+ * until one is available, and return it as a malloc'd string.
+ * On EOF, return NULL.
+ *
+ * A "message" on the channel is just a null-terminated string.
  */
 static char *
 readMessageFromPipe(int fd)
@@ -1262,59 +1604,53 @@
 	int			ret;
 
 	/*
-	 * The problem here is that we need to deal with several possibilites: we
-	 * could receive only a partial message or several messages at once. The
-	 * caller expects us to return exactly one message however.
-	 *
-	 * We could either read in as much as we can and keep track of what we
-	 * delivered back to the caller or we just read byte by byte. Once we see
-	 * (char) 0, we know that it's the message's end. This would be quite
-	 * inefficient for more data but since we are reading only on the command
-	 * channel, the performance loss does not seem worth the trouble of
-	 * keeping internal states for different file descriptors.
+	 * In theory, if we let piperead() read multiple bytes, it might give us
+	 * back fragments of multiple messages.  (That can't actually occur, since
+	 * neither master nor workers send more than one message without waiting
+	 * for a reply, but we don't wish to assume that here.)  For simplicity,
+	 * read a byte at a time until we get the terminating '\0'.  This method
+	 * is a bit inefficient, but since this is only used for relatively short
+	 * command and status strings, it shouldn't matter.
 	 */
 	bufsize = 64;				/* could be any number */
 	msg = (char *) pg_malloc(bufsize);
-
 	msgsize = 0;
 	for (;;)
 	{
-		Assert(msgsize <= bufsize);
+		Assert(msgsize < bufsize);
 		ret = piperead(fd, msg + msgsize, 1);
-
-		/* worker has closed the connection or another error happened */
 		if (ret <= 0)
-			break;
+			break;				/* error or connection closure */
 
 		Assert(ret == 1);
 
 		if (msg[msgsize] == '\0')
-			return msg;
+			return msg;			/* collected whole message */
 
 		msgsize++;
-		if (msgsize == bufsize)
+		if (msgsize == bufsize) /* enlarge buffer if needed */
 		{
-			/* could be any number */
-			bufsize += 16;
+			bufsize += 16;		/* could be any number */
 			msg = (char *) pg_realloc(msg, bufsize);
 		}
 	}
 
-	/*
-	 * Worker has closed the connection, make sure to clean up before return
-	 * since we are not returning msg (but did allocate it).
-	 */
+	/* Other end has closed the connection */
 	pg_free(msg);
-
 	return NULL;
 }
 
 #ifdef WIN32
+
 /*
- * This is a replacement version of pipe for Win32 which allows returned
- * handles to be used in select(). Note that read/write calls must be replaced
- * with recv/send.  "handles" have to be integers so we check for errors then
- * cast to integers.
+ * This is a replacement version of pipe(2) for Windows which allows the pipe
+ * handles to be used in select().
+ *
+ * Reads and writes on the pipe must go through piperead()/pipewrite().
+ *
+ * For consistency with Unix we declare the returned handles as "int".
+ * This is okay even on WIN64 because system handles are not more than
+ * 32 bits wide, but we do have to do some casting.
  */
 static int
 pgpipe(int handles[2])
@@ -1379,6 +1715,8 @@
 	{
 		write_msg(modulename, "pgpipe: could not connect socket: error code %d\n",
 				  WSAGetLastError());
+		closesocket(handles[1]);
+		handles[1] = -1;
 		closesocket(s);
 		return -1;
 	}
@@ -1397,15 +1735,20 @@
 	return 0;
 }
 
+/*
+ * Windows implementation of reading from a pipe.
+ */
 static int
 piperead(int s, char *buf, int len)
 {
 	int			ret = recv(s, buf, len, 0);
 
 	if (ret < 0 && WSAGetLastError() == WSAECONNRESET)
-		/* EOF on the pipe! (win32 socket based implementation) */
+	{
+		/* EOF on the pipe! */
 		ret = 0;
+	}
 	return ret;
 }
 
-#endif
+#endif   /* WIN32 */
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/parallel.h postgresql-9.5-9.5.8/src/bin/pg_dump/parallel.h
--- postgresql-9.5-9.5.2/src/bin/pg_dump/parallel.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/parallel.h	2017-08-07 21:13:41.000000000 +0000
@@ -42,9 +42,9 @@
 	ParallelArgs *args;
 	T_WorkerStatus workerStatus;
 	int			status;
-	int			pipeRead;
+	int			pipeRead;		/* master's end of the pipes */
 	int			pipeWrite;
-	int			pipeRevRead;
+	int			pipeRevRead;	/* child's end of the pipes */
 	int			pipeRevWrite;
 #ifdef WIN32
 	uintptr_t	hThread;
@@ -82,6 +82,6 @@
 					   TocEntry *te, T_Action act);
 extern void ParallelBackupEnd(ArchiveHandle *AH, ParallelState *pstate);
 
-extern void checkAborting(ArchiveHandle *AH);
+extern void set_archive_cancel_info(ArchiveHandle *AH, PGconn *conn);
 
 #endif   /* PG_DUMP_PARALLEL_H */
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_archiver.c postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_archiver.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_archiver.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_archiver.c	2017-08-07 21:13:41.000000000 +0000
@@ -57,7 +57,7 @@
 	 const int compression, ArchiveMode mode, SetupWorkerPtr setupWorkerPtr);
 static void _getObjectDescription(PQExpBuffer buf, TocEntry *te,
 					  ArchiveHandle *AH);
-static void _printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData, bool acl_pass);
+static void _printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData);
 static char *replace_line_endings(const char *str);
 static void _doSetFixedOutputState(ArchiveHandle *AH);
 static void _doSetSessionAuth(ArchiveHandle *AH, const char *user);
@@ -70,6 +70,7 @@
 static void processEncodingEntry(ArchiveHandle *AH, TocEntry *te);
 static void processStdStringsEntry(ArchiveHandle *AH, TocEntry *te);
 static teReqs _tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt);
+static RestorePass _tocEntryRestorePass(TocEntry *te);
 static bool _tocEntryIsACL(TocEntry *te);
 static void _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te);
 static void _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te);
@@ -85,13 +86,18 @@
 static void RestoreOutput(ArchiveHandle *AH, OutputContext savedContext);
 
 static int	restore_toc_entry(ArchiveHandle *AH, TocEntry *te, bool is_parallel);
-static void restore_toc_entries_prefork(ArchiveHandle *AH);
-static void restore_toc_entries_parallel(ArchiveHandle *AH, ParallelState *pstate,
+static void restore_toc_entries_prefork(ArchiveHandle *AH,
+							TocEntry *pending_list);
+static void restore_toc_entries_parallel(ArchiveHandle *AH,
+							 ParallelState *pstate,
+							 TocEntry *pending_list);
+static void restore_toc_entries_postfork(ArchiveHandle *AH,
 							 TocEntry *pending_list);
-static void restore_toc_entries_postfork(ArchiveHandle *AH, TocEntry *pending_list);
 static void par_list_header_init(TocEntry *l);
 static void par_list_append(TocEntry *l, TocEntry *te);
 static void par_list_remove(TocEntry *te);
+static void move_to_ready_list(TocEntry *pending_list, TocEntry *ready_list,
+				   RestorePass pass);
 static TocEntry *get_next_work_item(ArchiveHandle *AH,
 				   TocEntry *ready_list,
 				   ParallelState *pstate);
@@ -506,7 +512,6 @@
 						 * knows how to do it, without depending on
 						 * te->dropStmt; use that.  For other objects we need
 						 * to parse the command.
-						 *
 						 */
 						if (strncmp(te->desc, "BLOB", 4) == 0)
 						{
@@ -514,10 +519,8 @@
 						}
 						else
 						{
-							char		buffer[40];
-							char	   *mark;
 							char	   *dropStmt = pg_strdup(te->dropStmt);
-							char	   *dropStmtPtr = dropStmt;
+							char	   *dropStmtOrig = dropStmt;
 							PQExpBuffer ftStmt = createPQExpBuffer();
 
 							/*
@@ -534,18 +537,28 @@
 							/*
 							 * ALTER TABLE..ALTER COLUMN..DROP DEFAULT does
 							 * not support the IF EXISTS clause, and therefore
-							 * we simply emit the original command for such
-							 * objects. For other objects, we need to extract
-							 * the first part of the DROP which includes the
-							 * object type. Most of the time this matches
+							 * we simply emit the original command for DEFAULT
+							 * objects (modulo the adjustment made above).
+							 *
+							 * If we used CREATE OR REPLACE VIEW as a means of
+							 * quasi-dropping an ON SELECT rule, that should
+							 * be emitted unchanged as well.
+							 *
+							 * For other object types, we need to extract the
+							 * first part of the DROP which includes the
+							 * object type.  Most of the time this matches
 							 * te->desc, so search for that; however for the
 							 * different kinds of CONSTRAINTs, we know to
 							 * search for hardcoded "DROP CONSTRAINT" instead.
 							 */
-							if (strcmp(te->desc, "DEFAULT") == 0)
+							if (strcmp(te->desc, "DEFAULT") == 0 ||
+								strncmp(dropStmt, "CREATE OR REPLACE VIEW", 22) == 0)
 								appendPQExpBufferStr(ftStmt, dropStmt);
 							else
 							{
+								char		buffer[40];
+								char	   *mark;
+
 								if (strcmp(te->desc, "CONSTRAINT") == 0 ||
 								 strcmp(te->desc, "CHECK CONSTRAINT") == 0 ||
 									strcmp(te->desc, "FK CONSTRAINT") == 0)
@@ -555,19 +568,28 @@
 											 te->desc);
 
 								mark = strstr(dropStmt, buffer);
-								Assert(mark != NULL);
 
-								*mark = '\0';
-								appendPQExpBuffer(ftStmt, "%s%s IF EXISTS%s",
-												  dropStmt, buffer,
-												  mark + strlen(buffer));
+								if (mark)
+								{
+									*mark = '\0';
+									appendPQExpBuffer(ftStmt, "%s%s IF EXISTS%s",
+													  dropStmt, buffer,
+													  mark + strlen(buffer));
+								}
+								else
+								{
+									/* complain and emit unmodified command */
+									write_msg(modulename,
+											  "WARNING: could not find where to insert IF EXISTS in statement \"%s\"\n",
+											  dropStmtOrig);
+									appendPQExpBufferStr(ftStmt, dropStmt);
+								}
 							}
 
 							ahprintf(AH, "%s", ftStmt->data);
 
 							destroyPQExpBuffer(ftStmt);
-
-							pg_free(dropStmtPtr);
+							pg_free(dropStmtOrig);
 						}
 					}
 				}
@@ -591,20 +613,18 @@
 		AH->currSchema = NULL;
 	}
 
-	/*
-	 * In serial mode, we now process each non-ACL TOC entry.
-	 *
-	 * In parallel mode, turn control over to the parallel-restore logic.
-	 */
 	if (parallel_mode)
 	{
+		/*
+		 * In parallel mode, turn control over to the parallel-restore logic.
+		 */
 		ParallelState *pstate;
 		TocEntry	pending_list;
 
 		par_list_header_init(&pending_list);
 
 		/* This runs PRE_DATA items and then disconnects from the database */
-		restore_toc_entries_prefork(AH);
+		restore_toc_entries_prefork(AH, &pending_list);
 		Assert(AH->connection == NULL);
 
 		/* ParallelBackupStart() will actually fork the processes */
@@ -618,28 +638,51 @@
 	}
 	else
 	{
+		/*
+		 * In serial mode, process everything in three phases: normal items,
+		 * then ACLs, then matview refresh items.  We might be able to skip
+		 * one or both extra phases in some cases, eg data-only restores.
+		 */
+		bool		haveACL = false;
+		bool		haveRefresh = false;
+
 		for (te = AH->toc->next; te != AH->toc; te = te->next)
-			(void) restore_toc_entry(AH, te, false);
-	}
+		{
+			if ((te->reqs & (REQ_SCHEMA | REQ_DATA)) == 0)
+				continue;		/* ignore if not to be dumped at all */
 
-	/*
-	 * Scan TOC again to output ownership commands and ACLs
-	 */
-	for (te = AH->toc->next; te != AH->toc; te = te->next)
-	{
-		AH->currentTE = te;
+			switch (_tocEntryRestorePass(te))
+			{
+				case RESTORE_PASS_MAIN:
+					(void) restore_toc_entry(AH, te, false);
+					break;
+				case RESTORE_PASS_ACL:
+					haveACL = true;
+					break;
+				case RESTORE_PASS_REFRESH:
+					haveRefresh = true;
+					break;
+			}
+		}
 
-		/* Both schema and data objects might now have ownership/ACLs */
-		if ((te->reqs & (REQ_SCHEMA | REQ_DATA)) != 0)
+		if (haveACL)
 		{
-			/* Show namespace if available */
-			if (te->namespace)
-				ahlog(AH, 1, "setting owner and privileges for %s \"%s.%s\"\n",
-					  te->desc, te->namespace, te->tag);
-			else
-				ahlog(AH, 1, "setting owner and privileges for %s \"%s\"\n",
-					  te->desc, te->tag);
-			_printTocEntry(AH, te, false, true);
+			for (te = AH->toc->next; te != AH->toc; te = te->next)
+			{
+				if ((te->reqs & (REQ_SCHEMA | REQ_DATA)) != 0 &&
+					_tocEntryRestorePass(te) == RESTORE_PASS_ACL)
+					(void) restore_toc_entry(AH, te, false);
+			}
+		}
+
+		if (haveRefresh)
+		{
+			for (te = AH->toc->next; te != AH->toc; te = te->next)
+			{
+				if ((te->reqs & (REQ_SCHEMA | REQ_DATA)) != 0 &&
+					_tocEntryRestorePass(te) == RESTORE_PASS_REFRESH)
+					(void) restore_toc_entry(AH, te, false);
+			}
 		}
 	}
 
@@ -686,10 +729,7 @@
 	AH->currentTE = te;
 
 	/* Work out what, if anything, we want from this entry */
-	if (_tocEntryIsACL(te))
-		reqs = 0;				/* ACLs are never restored here */
-	else
-		reqs = te->reqs;
+	reqs = te->reqs;
 
 	/*
 	 * Ignore DATABASE entry unless we should create it.  We must check this
@@ -710,17 +750,19 @@
 
 	defnDumped = false;
 
-	if ((reqs & REQ_SCHEMA) != 0)		/* We want the schema */
+	/*
+	 * If it has a schema component that we want, then process that
+	 */
+	if ((reqs & REQ_SCHEMA) != 0)
 	{
-		/* Show namespace if available */
+		/* Show namespace in log message if available */
 		if (te->namespace)
 			ahlog(AH, 1, "creating %s \"%s.%s\"\n",
 				  te->desc, te->namespace, te->tag);
 		else
 			ahlog(AH, 1, "creating %s \"%s\"\n", te->desc, te->tag);
 
-
-		_printTocEntry(AH, te, false, false);
+		_printTocEntry(AH, te, false);
 		defnDumped = true;
 
 		if (strcmp(te->desc, "TABLE") == 0)
@@ -762,14 +804,21 @@
 		/* If we created a DB, connect to it... */
 		if (strcmp(te->desc, "DATABASE") == 0)
 		{
+			PQExpBufferData connstr;
+
+			initPQExpBuffer(&connstr);
+			appendPQExpBufferStr(&connstr, "dbname=");
+			appendConnStrVal(&connstr, te->tag);
+			/* Abandon struct, but keep its buffer until process exit. */
+
 			ahlog(AH, 1, "connecting to new database \"%s\"\n", te->tag);
 			_reconnectToDB(AH, te->tag);
-			ropt->dbname = pg_strdup(te->tag);
+			ropt->dbname = connstr.data;
 		}
 	}
 
 	/*
-	 * If we have a data component, then process it
+	 * If it has a data component that we want, then process that
 	 */
 	if ((reqs & REQ_DATA) != 0)
 	{
@@ -785,7 +834,7 @@
 			 */
 			if (AH->PrintTocDataPtr !=NULL)
 			{
-				_printTocEntry(AH, te, true, false);
+				_printTocEntry(AH, te, true);
 
 				if (strcmp(te->desc, "BLOBS") == 0 ||
 					strcmp(te->desc, "BLOB COMMENTS") == 0)
@@ -873,7 +922,7 @@
 		{
 			/* If we haven't already dumped the defn part, do so now */
 			ahlog(AH, 1, "executing %s %s\n", te->desc, te->tag);
-			_printTocEntry(AH, te, false, false);
+			_printTocEntry(AH, te, false);
 		}
 	}
 
@@ -1067,7 +1116,8 @@
 
 	ahprintf(AH, ";\n; Archive created at %s\n", stamp_str);
 	ahprintf(AH, ";     dbname: %s\n;     TOC Entries: %d\n;     Compression: %d\n",
-			 AH->archdbname, AH->tocCount, AH->compression);
+			 replace_line_endings(AH->archdbname),
+			 AH->tocCount, AH->compression);
 
 	switch (AH->format)
 	{
@@ -1104,10 +1154,37 @@
 			curSection = te->section;
 		if (ropt->verbose ||
 			(_tocEntryRequired(te, curSection, ropt) & (REQ_SCHEMA | REQ_DATA)) != 0)
+		{
+			char	   *sanitized_name;
+			char	   *sanitized_schema;
+			char	   *sanitized_owner;
+
+			/*
+			 * As in _printTocEntry(), sanitize strings that might contain
+			 * newlines, to ensure that each logical output line is in fact
+			 * one physical output line.  This prevents confusion when the
+			 * file is read by "pg_restore -L".  Note that we currently don't
+			 * bother to quote names, meaning that the name fields aren't
+			 * automatically parseable.  "pg_restore -L" doesn't care because
+			 * it only examines the dumpId field, but someday we might want to
+			 * try harder.
+			 */
+			sanitized_name = replace_line_endings(te->tag);
+			if (te->namespace)
+				sanitized_schema = replace_line_endings(te->namespace);
+			else
+				sanitized_schema = pg_strdup("-");
+			sanitized_owner = replace_line_endings(te->owner);
+
 			ahprintf(AH, "%d; %u %u %s %s %s %s\n", te->dumpId,
 					 te->catalogId.tableoid, te->catalogId.oid,
-					 te->desc, te->namespace ? te->namespace : "-",
-					 te->tag, te->owner);
+					 te->desc, sanitized_schema, sanitized_name,
+					 sanitized_owner);
+
+			free(sanitized_name);
+			free(sanitized_schema);
+			free(sanitized_owner);
+		}
 		if (ropt->verbose && te->nDeps > 0)
 		{
 			int			i;
@@ -2264,18 +2341,18 @@
 	AH->OF = stdout;
 
 	/*
-	 * On Windows, we need to use binary mode to read/write non-text archive
-	 * formats.  Force stdin/stdout into binary mode if that is what we are
-	 * using.
+	 * On Windows, we need to use binary mode to read/write non-text files,
+	 * which include all archive formats as well as compressed plain text.
+	 * Force stdin/stdout into binary mode if that is what we are using.
 	 */
 #ifdef WIN32
-	if (fmt != archNull &&
+	if ((fmt != archNull || compression != 0) &&
 		(AH->fSpec == NULL || strcmp(AH->fSpec, "") == 0))
 	{
 		if (mode == archModeWrite)
-			setmode(fileno(stdout), O_BINARY);
+			_setmode(fileno(stdout), O_BINARY);
 		else
-			setmode(fileno(stdin), O_BINARY);
+			_setmode(fileno(stdin), O_BINARY);
 	}
 #endif
 
@@ -2313,6 +2390,9 @@
 	return AH;
 }
 
+/*
+ * Write out all data (tables & blobs)
+ */
 void
 WriteDataChunks(ArchiveHandle *AH, ParallelState *pstate)
 {
@@ -2330,15 +2410,18 @@
 		{
 			/*
 			 * If we are in a parallel backup, then we are always the master
-			 * process.
+			 * process.  Dispatch each data-transfer job to a worker.
 			 */
 			EnsureIdleWorker(AH, pstate);
-			Assert(GetIdleWorker(pstate) != NO_SLOT);
 			DispatchJobForTocEntry(AH, pstate, te, ACT_DUMP);
 		}
 		else
 			WriteDataChunksForTocEntry(AH, te);
 	}
+
+	/*
+	 * If parallel, wait for workers to finish.
+	 */
 	EnsureWorkersFinished(AH, pstate);
 }
 
@@ -2751,7 +2834,17 @@
 
 	/* Mask it if we only want schema */
 	if (ropt->schemaOnly)
-		res = res & REQ_SCHEMA;
+	{
+		/*
+		 * In binary-upgrade mode, even with schema-only set, we do not mask
+		 * out large objects.  Only large object definitions, comments and
+		 * other information should be generated in binary-upgrade mode (not
+		 * the actual data).
+		 */
+		if (!(ropt->binary_upgrade && strcmp(te->desc,"BLOB") == 0) &&
+		!(ropt->binary_upgrade && strncmp(te->tag,"LARGE OBJECT ", 13) == 0))
+			res = res & REQ_SCHEMA;
+	}
 
 	/* Mask it if we only want data */
 	if (ropt->dataOnly)
@@ -2769,7 +2862,29 @@
 }
 
 /*
+ * Identify which pass we should restore this TOC entry in.
+ *
+ * See notes with the RestorePass typedef in pg_backup_archiver.h.
+ */
+static RestorePass
+_tocEntryRestorePass(TocEntry *te)
+{
+	/* "ACL LANGUAGE" was a crock emitted only in PG 7.4 */
+	if (strcmp(te->desc, "ACL") == 0 ||
+		strcmp(te->desc, "ACL LANGUAGE") == 0 ||
+		strcmp(te->desc, "DEFAULT ACL") == 0)
+		return RESTORE_PASS_ACL;
+	if (strcmp(te->desc, "MATERIALIZED VIEW DATA") == 0)
+		return RESTORE_PASS_REFRESH;
+	return RESTORE_PASS_MAIN;
+}
+
+/*
  * Identify TOC entries that are ACLs.
+ *
+ * Note: it seems worth duplicating some code here to avoid a hard-wired
+ * assumption that these are exactly the same entries that we restore during
+ * the RESTORE_PASS_ACL phase.
  */
 static bool
 _tocEntryIsACL(TocEntry *te)
@@ -2915,12 +3030,17 @@
 		ReconnectToServer(AH, dbname, NULL);
 	else
 	{
-		PQExpBuffer qry = createPQExpBuffer();
+		if (dbname)
+		{
+			PQExpBufferData connectbuf;
 
-		appendPQExpBuffer(qry, "\\connect %s\n\n",
-						  dbname ? fmtId(dbname) : "-");
-		ahprintf(AH, "%s", qry->data);
-		destroyPQExpBuffer(qry);
+			initPQExpBuffer(&connectbuf);
+			appendPsqlMetaConnect(&connectbuf, dbname);
+			ahprintf(AH, "%s\n", connectbuf.data);
+			termPQExpBuffer(&connectbuf);
+		}
+		else
+			ahprintf(AH, "%s\n", "\\connect -\n");
 	}
 
 	/*
@@ -3132,6 +3252,7 @@
 		strcmp(type, "DATABASE") == 0 ||
 		strcmp(type, "PROCEDURAL LANGUAGE") == 0 ||
 		strcmp(type, "SCHEMA") == 0 ||
+		strcmp(type, "EVENT TRIGGER") == 0 ||
 		strcmp(type, "FOREIGN DATA WRAPPER") == 0 ||
 		strcmp(type, "SERVER") == 0 ||
 		strcmp(type, "USER MAPPING") == 0)
@@ -3176,38 +3297,40 @@
 		return;
 	}
 
-	write_msg(modulename, "WARNING: don't know how to set owner for object type %s\n",
+	write_msg(modulename, "WARNING: don't know how to set owner for object type \"%s\"\n",
 			  type);
 }
 
+/*
+ * Emit the SQL commands to create the object represented by a TOC entry
+ *
+ * This now also includes issuing an ALTER OWNER command to restore the
+ * object's ownership, if wanted.  But note that the object's permissions
+ * will remain at default, until the matching ACL TOC entry is restored.
+ */
 static void
-_printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData, bool acl_pass)
+_printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData)
 {
 	RestoreOptions *ropt = AH->public.ropt;
 
-	/* ACLs are dumped only during acl pass */
-	if (acl_pass)
-	{
-		if (!_tocEntryIsACL(te))
-			return;
-	}
-	else
-	{
-		if (_tocEntryIsACL(te))
-			return;
-	}
-
 	/*
 	 * Avoid dumping the public schema, as it will already be created ...
-	 * unless we are using --clean mode, in which case it's been deleted and
-	 * we'd better recreate it.  Likewise for its comment, if any.
+	 * unless we are using --clean mode (and *not* --create mode), in which
+	 * case we've previously issued a DROP for it so we'd better recreate it.
+	 *
+	 * Likewise for its comment, if any.  (We could try issuing the COMMENT
+	 * command anyway; but it'd fail if the restore is done as non-super-user,
+	 * so let's not.)
+	 *
+	 * XXX it looks pretty ugly to hard-wire the public schema like this, but
+	 * it sits in a sort of no-mans-land between being a system object and a
+	 * user object, so it really is special in a way.
 	 */
-	if (!ropt->dropSchema)
+	if (!(ropt->dropSchema && !ropt->createDB))
 	{
 		if (strcmp(te->desc, "SCHEMA") == 0 &&
 			strcmp(te->tag, "public") == 0)
 			return;
-		/* The comment restore would require super-user privs, so avoid it. */
 		if (strcmp(te->desc, "COMMENT") == 0 &&
 			strcmp(te->tag, "SCHEMA public") == 0)
 			return;
@@ -3328,6 +3451,7 @@
 			strcmp(te->desc, "OPERATOR FAMILY") == 0 ||
 			strcmp(te->desc, "PROCEDURAL LANGUAGE") == 0 ||
 			strcmp(te->desc, "SCHEMA") == 0 ||
+			strcmp(te->desc, "EVENT TRIGGER") == 0 ||
 			strcmp(te->desc, "TABLE") == 0 ||
 			strcmp(te->desc, "TYPE") == 0 ||
 			strcmp(te->desc, "VIEW") == 0 ||
@@ -3363,7 +3487,7 @@
 		}
 		else
 		{
-			write_msg(modulename, "WARNING: don't know how to set owner for object type %s\n",
+			write_msg(modulename, "WARNING: don't know how to set owner for object type \"%s\"\n",
 					  te->desc);
 		}
 	}
@@ -3372,7 +3496,7 @@
 	 * If it's an ACL entry, it might contain SET SESSION AUTHORIZATION
 	 * commands, so we can no longer assume we know the current auth setting.
 	 */
-	if (acl_pass)
+	if (_tocEntryIsACL(te))
 	{
 		if (AH->currUser)
 			free(AH->currUser);
@@ -3381,8 +3505,9 @@
 }
 
 /*
- * Sanitize a string to be included in an SQL comment, by replacing any
- * newlines with spaces.
+ * Sanitize a string to be included in an SQL comment or TOC listing,
+ * by replacing any newlines with spaces.
+ * The result is a freshly malloc'd string.
  */
 static char *
 replace_line_endings(const char *str)
@@ -3401,6 +3526,9 @@
 	return result;
 }
 
+/*
+ * Write the file header for a custom-format archive
+ */
 void
 WriteHead(ArchiveHandle *AH)
 {
@@ -3413,17 +3541,7 @@
 	(*AH->WriteBytePtr) (AH, AH->intSize);
 	(*AH->WriteBytePtr) (AH, AH->offSize);
 	(*AH->WriteBytePtr) (AH, AH->format);
-
-#ifndef HAVE_LIBZ
-	if (AH->compression != 0)
-		write_msg(modulename, "WARNING: requested compression not available in this "
-				  "installation -- archive will be uncompressed\n");
-
-	AH->compression = 0;
-#endif
-
 	WriteInt(AH, AH->compression);
-
 	crtm = *localtime(&AH->createDate);
 	WriteInt(AH, crtm.tm_sec);
 	WriteInt(AH, crtm.tm_min);
@@ -3582,16 +3700,14 @@
 /*
  * Main engine for parallel restore.
  *
- * Work is done in three phases.
- * First we process all SECTION_PRE_DATA tocEntries, in a single connection,
- * just as for a standard restore.  Second we process the remaining non-ACL
- * steps in parallel worker children (threads on Windows, processes on Unix),
- * each of which connects separately to the database.  Finally we process all
- * the ACL entries in a single connection (that happens back in
- * RestoreArchive).
+ * Parallel restore is done in three phases.  In this first phase,
+ * we'll process all SECTION_PRE_DATA TOC entries that are allowed to be
+ * processed in the RESTORE_PASS_MAIN pass.  (In practice, that's all
+ * PRE_DATA items other than ACLs.)  Entries we can't process now are
+ * added to the pending_list for later phases to deal with.
  */
 static void
-restore_toc_entries_prefork(ArchiveHandle *AH)
+restore_toc_entries_prefork(ArchiveHandle *AH, TocEntry *pending_list)
 {
 	bool		skipped_some;
 	TocEntry   *next_work_item;
@@ -3609,23 +3725,31 @@
 	 * about showing all the dependencies of SECTION_PRE_DATA items, so we do
 	 * not risk trying to process them out-of-order.
 	 *
+	 * Stuff that we can't do immediately gets added to the pending_list.
+	 * Note: we don't yet filter out entries that aren't going to be restored.
+	 * They might participate in dependency chains connecting entries that
+	 * should be restored, so we treat them as live until we actually process
+	 * them.
+	 *
 	 * Note: as of 9.2, it should be guaranteed that all PRE_DATA items appear
 	 * before DATA items, and all DATA items before POST_DATA items.  That is
 	 * not certain to be true in older archives, though, so this loop is coded
 	 * to not assume it.
 	 */
+	AH->restorePass = RESTORE_PASS_MAIN;
 	skipped_some = false;
 	for (next_work_item = AH->toc->next; next_work_item != AH->toc; next_work_item = next_work_item->next)
 	{
-		/* NB: process-or-continue logic must be the inverse of loop below */
+		bool		do_now = true;
+
 		if (next_work_item->section != SECTION_PRE_DATA)
 		{
 			/* DATA and POST_DATA items are just ignored for now */
 			if (next_work_item->section == SECTION_DATA ||
 				next_work_item->section == SECTION_POST_DATA)
 			{
+				do_now = false;
 				skipped_some = true;
-				continue;
 			}
 			else
 			{
@@ -3636,18 +3760,35 @@
 				 * comment's dependencies are satisfied, so skip it for now.
 				 */
 				if (skipped_some)
-					continue;
+					do_now = false;
 			}
 		}
 
-		ahlog(AH, 1, "processing item %d %s %s\n",
-			  next_work_item->dumpId,
-			  next_work_item->desc, next_work_item->tag);
+		/*
+		 * Also skip items that need to be forced into later passes.  We need
+		 * not set skipped_some in this case, since by assumption no main-pass
+		 * items could depend on these.
+		 */
+		if (_tocEntryRestorePass(next_work_item) != RESTORE_PASS_MAIN)
+			do_now = false;
 
-		(void) restore_toc_entry(AH, next_work_item, false);
+		if (do_now)
+		{
+			/* OK, restore the item and update its dependencies */
+			ahlog(AH, 1, "processing item %d %s %s\n",
+				  next_work_item->dumpId,
+				  next_work_item->desc, next_work_item->tag);
+
+			(void) restore_toc_entry(AH, next_work_item, false);
 
-		/* there should be no touch of ready_list here, so pass NULL */
-		reduce_dependencies(AH, next_work_item, NULL);
+			/* there should be no touch of ready_list here, so pass NULL */
+			reduce_dependencies(AH, next_work_item, NULL);
+		}
+		else
+		{
+			/* Nope, so add it to pending_list */
+			par_list_append(pending_list, next_work_item);
+		}
 	}
 
 	/*
@@ -3673,91 +3814,60 @@
 /*
  * Main engine for parallel restore.
  *
- * Work is done in three phases.
- * First we process all SECTION_PRE_DATA tocEntries, in a single connection,
- * just as for a standard restore. This is done in restore_toc_entries_prefork().
- * Second we process the remaining non-ACL steps in parallel worker children
- * (threads on Windows, processes on Unix), these fork off and set up their
- * connections before we call restore_toc_entries_parallel_forked.
- * Finally we process all the ACL entries in a single connection (that happens
- * back in RestoreArchive).
+ * Parallel restore is done in three phases.  In this second phase,
+ * we process entries by dispatching them to parallel worker children
+ * (processes on Unix, threads on Windows), each of which connects
+ * separately to the database.  Inter-entry dependencies are respected,
+ * and so is the RestorePass multi-pass structure.  When we can no longer
+ * make any entries ready to process, we exit.  Normally, there will be
+ * nothing left to do; but if there is, the third phase will mop up.
  */
 static void
 restore_toc_entries_parallel(ArchiveHandle *AH, ParallelState *pstate,
 							 TocEntry *pending_list)
 {
-	int			work_status;
-	bool		skipped_some;
 	TocEntry	ready_list;
 	TocEntry   *next_work_item;
-	int			ret_child;
 
 	ahlog(AH, 2, "entering restore_toc_entries_parallel\n");
 
 	/*
-	 * Initialize the lists of ready items, the list for pending items has
-	 * already been initialized in the caller.  After this setup, the pending
-	 * list is everything that needs to be done but is blocked by one or more
-	 * dependencies, while the ready list contains items that have no
-	 * remaining dependencies. Note: we don't yet filter out entries that
-	 * aren't going to be restored. They might participate in dependency
-	 * chains connecting entries that should be restored, so we treat them as
-	 * live until we actually process them.
+	 * The pending_list contains all items that we need to restore.  Move all
+	 * items that are available to process immediately into the ready_list.
+	 * After this setup, the pending list is everything that needs to be done
+	 * but is blocked by one or more dependencies, while the ready list
+	 * contains items that have no remaining dependencies and are OK to
+	 * process in the current restore pass.
 	 */
 	par_list_header_init(&ready_list);
-	skipped_some = false;
-	for (next_work_item = AH->toc->next; next_work_item != AH->toc; next_work_item = next_work_item->next)
-	{
-		/* NB: process-or-continue logic must be the inverse of loop above */
-		if (next_work_item->section == SECTION_PRE_DATA)
-		{
-			/* All PRE_DATA items were dealt with above */
-			continue;
-		}
-		if (next_work_item->section == SECTION_DATA ||
-			next_work_item->section == SECTION_POST_DATA)
-		{
-			/* set this flag at same point that previous loop did */
-			skipped_some = true;
-		}
-		else
-		{
-			/* SECTION_NONE items must be processed if previous loop didn't */
-			if (!skipped_some)
-				continue;
-		}
-
-		if (next_work_item->depCount > 0)
-			par_list_append(pending_list, next_work_item);
-		else
-			par_list_append(&ready_list, next_work_item);
-	}
+	AH->restorePass = RESTORE_PASS_MAIN;
+	move_to_ready_list(pending_list, &ready_list, AH->restorePass);
 
 	/*
 	 * main parent loop
 	 *
 	 * Keep going until there is no worker still running AND there is no work
-	 * left to be done.
+	 * left to be done.  Note invariant: at top of loop, there should always
+	 * be at least one worker available to dispatch a job to.
 	 */
-
 	ahlog(AH, 1, "entering main parallel loop\n");
 
-	while ((next_work_item = get_next_work_item(AH, &ready_list, pstate)) != NULL ||
-		   !IsEveryWorkerIdle(pstate))
+	for (;;)
 	{
+		/* Look for an item ready to be dispatched to a worker */
+		next_work_item = get_next_work_item(AH, &ready_list, pstate);
 		if (next_work_item != NULL)
 		{
 			/* If not to be restored, don't waste time launching a worker */
-			if ((next_work_item->reqs & (REQ_SCHEMA | REQ_DATA)) == 0 ||
-				_tocEntryIsACL(next_work_item))
+			if ((next_work_item->reqs & (REQ_SCHEMA | REQ_DATA)) == 0)
 			{
 				ahlog(AH, 1, "skipping item %d %s %s\n",
 					  next_work_item->dumpId,
 					  next_work_item->desc, next_work_item->tag);
-
+				/* Drop it from ready_list, and update its dependencies */
 				par_list_remove(next_work_item);
 				reduce_dependencies(AH, next_work_item, &ready_list);
-
+				/* Loop around to see if anything else can be dispatched */
 				continue;
 			}
 
@@ -3765,20 +3875,40 @@
 				  next_work_item->dumpId,
 				  next_work_item->desc, next_work_item->tag);
 
+			/* Remove it from ready_list, and dispatch to some worker */
 			par_list_remove(next_work_item);
 
-			Assert(GetIdleWorker(pstate) != NO_SLOT);
 			DispatchJobForTocEntry(AH, pstate, next_work_item, ACT_RESTORE);
 		}
+		else if (IsEveryWorkerIdle(pstate))
+		{
+			/*
+			 * Nothing is ready and no worker is running, so we're done with
+			 * the current pass or maybe with the whole process.
+			 */
+			if (AH->restorePass == RESTORE_PASS_LAST)
+				break;			/* No more parallel processing is possible */
+
+			/* Advance to next restore pass */
+			AH->restorePass++;
+			/* That probably allows some stuff to be made ready */
+			move_to_ready_list(pending_list, &ready_list, AH->restorePass);
+			/* Loop around to see if anything's now ready */
+			continue;
+		}
 		else
 		{
-			/* at least one child is working and we have nothing ready. */
-			Assert(!IsEveryWorkerIdle(pstate));
+			/*
+			 * We have nothing ready, but at least one child is working, so
+			 * wait for some subjob to finish.
+			 */
 		}
 
 		for (;;)
 		{
 			int			nTerm = 0;
+			int			ret_child;
+			int			work_status;
 
 			/*
 			 * In order to reduce dependencies as soon as possible and
@@ -3819,9 +3949,21 @@
 		}
 	}
 
+	/* There should now be nothing in ready_list. */
+	Assert(ready_list.par_next == &ready_list);
+
 	ahlog(AH, 1, "finished main parallel loop\n");
 }
 
+/*
+ * Main engine for parallel restore.
+ *
+ * Parallel restore is done in three phases.  In this third phase,
+ * we mop up any remaining TOC entries by processing them serially.
+ * This phase normally should have nothing to do, but if we've somehow
+ * gotten stuck due to circular dependencies or some such, this provides
+ * at least some chance of completing the restore successfully.
+ */
 static void
 restore_toc_entries_postfork(ArchiveHandle *AH, TocEntry *pending_list)
 {
@@ -3837,12 +3979,14 @@
 					ropt->pghost, ropt->pgport, ropt->username,
 					ropt->promptPassword);
 
+	/* re-establish fixed state */
 	_doSetFixedOutputState(AH);
 
 	/*
-	 * Make sure there is no non-ACL work left due to, say, circular
-	 * dependencies, or some other pathological condition. If so, do it in the
-	 * single parent connection.
+	 * Make sure there is no work left due to, say, circular dependencies, or
+	 * some other pathological condition.  If so, do it in the single parent
+	 * connection.  We don't sweat about RestorePass ordering; it's likely we
+	 * already violated that.
 	 */
 	for (te = pending_list->par_next; te != pending_list; te = te->par_next)
 	{
@@ -3850,8 +3994,6 @@
 			  te->dumpId, te->desc, te->tag);
 		(void) restore_toc_entry(AH, te, false);
 	}
-
-	/* The ACLs will be handled back in RestoreArchive. */
 }
 
 /*
@@ -3911,6 +4053,36 @@
 
 
 /*
+ * Move all immediately-ready items from pending_list to ready_list.
+ *
+ * Items are considered ready if they have no remaining dependencies and
+ * they belong in the current restore pass.  (See also reduce_dependencies,
+ * which applies the same logic one-at-a-time.)
+ */
+static void
+move_to_ready_list(TocEntry *pending_list, TocEntry *ready_list,
+				   RestorePass pass)
+{
+	TocEntry   *te;
+	TocEntry   *next_te;
+
+	for (te = pending_list->par_next; te != pending_list; te = next_te)
+	{
+		/* must save list link before possibly moving te to other list */
+		next_te = te->par_next;
+
+		if (te->depCount == 0 &&
+			_tocEntryRestorePass(te) == pass)
+		{
+			/* Remove it from pending_list ... */
+			par_list_remove(te);
+			/* ... and add to ready_list */
+			par_list_append(ready_list, te);
+		}
+	}
+}
+
+/*
  * Find the next work item (if any) that is capable of being run now.
  *
  * To qualify, the item must have no remaining dependencies
@@ -4015,10 +4187,9 @@
 	TocEntry   *te = args->te;
 	int			status;
 
-	_doSetFixedOutputState(AH);
-
 	Assert(AH->connection != NULL);
 
+	/* Count only errors associated with this TOC entry */
 	AH->public.n_errors = 0;
 
 	/* Restore the TOC item */
@@ -4300,8 +4471,17 @@
 	{
 		TocEntry   *otherte = AH->tocsByDumpId[te->revDeps[i]];
 
+		Assert(otherte->depCount > 0);
 		otherte->depCount--;
-		if (otherte->depCount == 0 && otherte->par_prev != NULL)
+
+		/*
+		 * It's ready if it has no remaining dependencies and it belongs in
+		 * the current restore pass.  However, don't move it if it has not yet
+		 * been put into the pending list.
+		 */
+		if (otherte->depCount == 0 &&
+			_tocEntryRestorePass(otherte) == AH->restorePass &&
+			otherte->par_prev != NULL)
 		{
 			/* It must be in the pending list, so remove it ... */
 			par_list_remove(otherte);
@@ -4364,6 +4544,7 @@
 
 	/* The clone will have its own connection, so disregard connection state */
 	clone->connection = NULL;
+	clone->connCancel = NULL;
 	clone->currUser = NULL;
 	clone->currSchema = NULL;
 	clone->currTablespace = NULL;
@@ -4387,18 +4568,21 @@
 		RestoreOptions *ropt = AH->public.ropt;
 
 		Assert(AH->connection == NULL);
+
 		/* this also sets clone->connection */
 		ConnectDatabase((Archive *) clone, ropt->dbname,
 						ropt->pghost, ropt->pgport, ropt->username,
 						ropt->promptPassword);
+
+		/* re-establish fixed state */
+		_doSetFixedOutputState(clone);
 	}
 	else
 	{
-		char	   *dbname;
+		PQExpBufferData connstr;
 		char	   *pghost;
 		char	   *pgport;
 		char	   *username;
-		const char *encname;
 
 		Assert(AH->connection != NULL);
 
@@ -4408,22 +4592,19 @@
 		 * because all just return a pointer and do not actually send/receive
 		 * any data to/from the database.
 		 */
-		dbname = PQdb(AH->connection);
+		initPQExpBuffer(&connstr);
+		appendPQExpBuffer(&connstr, "dbname=");
+		appendConnStrVal(&connstr, PQdb(AH->connection));
 		pghost = PQhost(AH->connection);
 		pgport = PQport(AH->connection);
 		username = PQuser(AH->connection);
-		encname = pg_encoding_to_char(AH->public.encoding);
 
 		/* this also sets clone->connection */
-		ConnectDatabase((Archive *) clone, dbname, pghost, pgport, username, TRI_NO);
+		ConnectDatabase((Archive *) clone, connstr.data,
+						pghost, pgport, username, TRI_NO);
 
-		/*
-		 * Set the same encoding, whatever we set here is what we got from
-		 * pg_encoding_to_char(), so we really shouldn't run into an error
-		 * setting that very same value. Also see the comment in
-		 * SetupConnection().
-		 */
-		PQsetClientEncoding(clone->connection, encname);
+		termPQExpBuffer(&connstr);
+		/* setupDumpWorker will fix up connection state */
 	}
 
 	/* Let the format-specific code have a chance too */
@@ -4441,6 +4622,9 @@
 void
 DeCloneArchive(ArchiveHandle *AH)
 {
+	/* Should not have an open database connection */
+	Assert(AH->connection == NULL);
+
 	/* Clear format-specific state */
 	(AH->DeClonePtr) (AH);
 
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_archiver.h postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_archiver.h
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_archiver.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_archiver.h	2017-08-07 21:13:41.000000000 +0000
@@ -200,6 +200,30 @@
 	OUTPUT_OTHERDATA			/* writing data as INSERT commands */
 } ArchiverOutput;
 
+/*
+ * For historical reasons, ACL items are interspersed with everything else in
+ * a dump file's TOC; typically they're right after the object they're for.
+ * However, we need to restore data before ACLs, as otherwise a read-only
+ * table (ie one where the owner has revoked her own INSERT privilege) causes
+ * data restore failures.  On the other hand, matview REFRESH commands should
+ * come out after ACLs, as otherwise non-superuser-owned matviews might not
+ * be able to execute.  (If the permissions at the time of dumping would not
+ * allow a REFRESH, too bad; we won't fix that for you.)  These considerations
+ * force us to make three passes over the TOC, restoring the appropriate
+ * subset of items in each pass.  We assume that the dependency sort resulted
+ * in an appropriate ordering of items within each subset.
+ * XXX This mechanism should be superseded by tracking dependencies on ACLs
+ * properly; but we'll still need it for old dump files even after that.
+ */
+typedef enum
+{
+	RESTORE_PASS_MAIN = 0,		/* Main pass (most TOC item types) */
+	RESTORE_PASS_ACL,			/* ACL item types */
+	RESTORE_PASS_REFRESH		/* Matview REFRESH items */
+
+#define RESTORE_PASS_LAST RESTORE_PASS_REFRESH
+} RestorePass;
+
 typedef enum
 {
 	REQ_SCHEMA = 0x01,			/* want schema */
@@ -285,6 +309,9 @@
 	char	   *savedPassword;	/* password for ropt->username, if known */
 	char	   *use_role;
 	PGconn	   *connection;
+	/* If connCancel isn't NULL, SIGINT handler will send a cancel */
+	PGcancel   *volatile connCancel;
+
 	int			connectToDB;	/* Flag to indicate if direct DB connection is
 								 * required */
 	ArchiverOutput outputKind;	/* Flag for what we're currently writing */
@@ -328,6 +355,7 @@
 	int			noTocComments;
 	ArchiverStage stage;
 	ArchiverStage lastErrorStage;
+	RestorePass restorePass;	/* used only during parallel restore */
 	struct _tocEntry *currentTE;
 	struct _tocEntry *lastErrorTE;
 };
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_custom.c postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_custom.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_custom.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_custom.c	2017-08-07 21:13:41.000000000 +0000
@@ -203,7 +203,7 @@
  *
  * Optional.
  *
- * Set up extrac format-related TOC data.
+ * Set up extract format-related TOC data.
 */
 static void
 _ArchiveEntry(ArchiveHandle *AH, TocEntry *te)
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_db.c postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_db.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_db.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_db.c	2017-08-07 21:13:41.000000000 +0000
@@ -12,6 +12,7 @@
 #include "postgres_fe.h"
 
 #include "dumputils.h"
+#include "parallel.h"
 #include "pg_backup_archiver.h"
 #include "pg_backup_db.h"
 #include "pg_backup_utils.h"
@@ -37,6 +38,7 @@
 {
 	const char *remoteversion_str;
 	int			remoteversion;
+	PGresult   *res;
 
 	remoteversion_str = PQparameterStatus(AH->connection, "server_version");
 	remoteversion = PQserverVersion(AH->connection);
@@ -56,6 +58,20 @@
 				  remoteversion_str, progname, PG_VERSION);
 		exit_horribly(NULL, "aborting because of server version mismatch\n");
 	}
+
+	/*
+	 * When running against 9.0 or later, check if we are in recovery mode,
+	 * which means we are on a hot standby.
+	 */
+	if (remoteversion >= 90000)
+	{
+		res = ExecuteSqlQueryForSingleRow((Archive *) AH, "SELECT pg_catalog.pg_is_in_recovery()");
+
+		AH->public.isStandby = (strcmp(PQgetvalue(res, 0, 0), "t") == 0);
+		PQclear(res);
+	}
+	else
+		AH->public.isStandby = false;
 }
 
 /*
@@ -91,6 +107,9 @@
 
 	newConn = _connectDB(AH, newdbname, newusername);
 
+	/* Update ArchiveHandle's connCancel before closing old connection */
+	set_archive_cancel_info(AH, newConn);
+
 	PQfinish(AH->connection);
 	AH->connection = newConn;
 
@@ -109,6 +128,7 @@
 static PGconn *
 _connectDB(ArchiveHandle *AH, const char *reqdb, const char *requser)
 {
+	PQExpBufferData connstr;
 	PGconn	   *newConn;
 	const char *newdb;
 	const char *newuser;
@@ -137,6 +157,10 @@
 			exit_horribly(modulename, "out of memory\n");
 	}
 
+	initPQExpBuffer(&connstr);
+	appendPQExpBuffer(&connstr, "dbname=");
+	appendConnStrVal(&connstr, newdb);
+
 	do
 	{
 		const char *keywords[7];
@@ -151,7 +175,7 @@
 		keywords[3] = "password";
 		values[3] = password;
 		keywords[4] = "dbname";
-		values[4] = newdb;
+		values[4] = connstr.data;
 		keywords[5] = "fallback_application_name";
 		values[5] = progname;
 		keywords[6] = NULL;
@@ -203,6 +227,8 @@
 	if (password)
 		free(password);
 
+	termPQExpBuffer(&connstr);
+
 	/* check for version mismatch */
 	_check_database_version(AH);
 
@@ -312,6 +338,9 @@
 	_check_database_version(AH);
 
 	PQsetNoticeProcessor(AH->connection, notice_processor, NULL);
+
+	/* arrange for SIGINT to issue a query cancel on this connection */
+	set_archive_cancel_info(AH, AH->connection);
 }
 
 /*
@@ -322,19 +351,25 @@
 DisconnectDatabase(Archive *AHX)
 {
 	ArchiveHandle *AH = (ArchiveHandle *) AHX;
-	PGcancel   *cancel;
 	char		errbuf[1];
 
 	if (!AH->connection)
 		return;
 
-	if (PQtransactionStatus(AH->connection) == PQTRANS_ACTIVE)
+	if (AH->connCancel)
 	{
-		if ((cancel = PQgetCancel(AH->connection)))
-		{
-			PQcancel(cancel, errbuf, sizeof(errbuf));
-			PQfreeCancel(cancel);
-		}
+		/*
+		 * If we have an active query, send a cancel before closing, ignoring
+		 * any errors.  This is of no use for a normal exit, but might be
+		 * helpful during exit_horribly().
+		 */
+		if (PQtransactionStatus(AH->connection) == PQTRANS_ACTIVE)
+			(void) PQcancel(AH->connCancel, errbuf, sizeof(errbuf));
+
+		/*
+		 * Prevent signal handler from sending a cancel after this.
+		 */
+		set_archive_cancel_info(AH, NULL);
 	}
 
 	PQfinish(AH->connection);
@@ -389,6 +424,29 @@
 }
 
 /*
+ * Execute an SQL query and verify that we got exactly one row back.
+ */
+PGresult *
+ExecuteSqlQueryForSingleRow(Archive *fout, char *query)
+{
+	PGresult   *res;
+	int			ntups;
+
+	res = ExecuteSqlQuery(fout, query, PGRES_TUPLES_OK);
+
+	/* Expecting a single result only */
+	ntups = PQntuples(res);
+	if (ntups != 1)
+		exit_horribly(NULL,
+					  ngettext("query returned %d row instead of one: %s\n",
+							   "query returned %d rows instead of one: %s\n",
+							   ntups),
+					  ntups, query);
+
+	return res;
+}
+
+/*
  * Convenience function to send a query.
  * Monitors result to detect COPY statements
  */
@@ -593,6 +651,11 @@
 								tocEntryTag, PQerrorMessage(AH->connection));
 		PQclear(res);
 
+		/* Do this to ensure we've pumped libpq back to idle state */
+		if (PQgetResult(AH->connection) != NULL)
+			write_msg(NULL, "WARNING: unexpected extra results during COPY of table \"%s\"\n",
+					  tocEntryTag);
+
 		AH->pgCopyIn = false;
 	}
 }
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_db.h postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_db.h
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_db.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_db.h	2017-08-07 21:13:41.000000000 +0000
@@ -16,6 +16,7 @@
 extern void ExecuteSqlStatement(Archive *AHX, const char *query);
 extern PGresult *ExecuteSqlQuery(Archive *AHX, const char *query,
 				ExecStatusType status);
+extern PGresult *ExecuteSqlQueryForSingleRow(Archive *fout, char *query);
 
 extern void EndDBCopyMode(Archive *AHX, const char *tocEntryTag);
 
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_directory.c postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_directory.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_directory.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_directory.c	2017-08-07 21:13:41.000000000 +0000
@@ -356,11 +356,10 @@
 {
 	lclContext *ctx = (lclContext *) AH->formatData;
 
-	/* Are we aborting? */
-	checkAborting(AH);
-
 	if (dLen > 0 && cfwrite(data, dLen, ctx->dataFH) != dLen)
-		WRITE_ERROR_EXIT;
+		exit_horribly(modulename, "could not write to output file: %s\n",
+					  get_cfp_error(ctx->dataFH));
+
 
 	return;
 }
@@ -406,7 +405,9 @@
 	buflen = ZLIB_OUT_SIZE;
 
 	while ((cnt = cfread(buf, buflen, cfp)))
+	{
 		ahwrite(buf, 1, cnt, AH);
+	}
 
 	free(buf);
 	if (cfclose(cfp) !=0)
@@ -496,7 +497,8 @@
 	lclContext *ctx = (lclContext *) AH->formatData;
 
 	if (cfwrite(&c, 1, ctx->dataFH) != 1)
-		WRITE_ERROR_EXIT;
+		exit_horribly(modulename, "could not write to output file: %s\n",
+					  get_cfp_error(ctx->dataFH));
 
 	return 1;
 }
@@ -524,11 +526,9 @@
 {
 	lclContext *ctx = (lclContext *) AH->formatData;
 
-	/* Are we aborting? */
-	checkAborting(AH);
-
 	if (cfwrite(buf, len, ctx->dataFH) != len)
-		WRITE_ERROR_EXIT;
+		exit_horribly(modulename, "could not write to output file: %s\n",
+					  get_cfp_error(ctx->dataFH));
 
 	return;
 }
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup.h postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup.h
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup.h	2017-08-07 21:13:41.000000000 +0000
@@ -102,7 +102,7 @@
 	SimpleStringList tableNames;
 
 	int			useDB;
-	char	   *dbname;
+	char	   *dbname;			/* subject to expand_dbname */
 	char	   *pgport;
 	char	   *pghost;
 	char	   *username;
@@ -116,11 +116,12 @@
 
 	bool	   *idWanted;		/* array showing which dump IDs to emit */
 	int			enable_row_security;
+	int			binary_upgrade;
 } RestoreOptions;
 
 typedef struct _dumpOptions
 {
-	const char *dbname;
+	const char *dbname;			/* subject to expand_dbname */
 	const char *pghost;
 	const char *pgport;
 	const char *username;
@@ -172,6 +173,7 @@
 	int			verbose;
 	char	   *remoteVersionStr;		/* server's version string */
 	int			remoteVersion;	/* same in numeric form */
+	bool		isStandby;		/* is server a standby node */
 
 	int			minRemoteVersion;		/* allowable range */
 	int			maxRemoteVersion;
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_tar.c postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_tar.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_tar.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_tar.c	2017-08-07 21:13:41.000000000 +0000
@@ -556,8 +556,20 @@
 			{
 				res = GZREAD(&((char *) buf)[used], 1, len, th->zFH);
 				if (res != len && !GZEOF(th->zFH))
+				{
+#ifdef HAVE_LIBZ
+					int		errnum;
+					const char *errmsg = gzerror(th->zFH, &errnum);
+
 					exit_horribly(modulename,
-					"could not read from input file: %s\n", strerror(errno));
+								  "could not read from input file: %s\n",
+								  errnum == Z_ERRNO ? strerror(errno) : errmsg);
+#else
+					exit_horribly(modulename,
+								  "could not read from input file: %s\n",
+								  strerror(errno));
+#endif
+				}
 			}
 			else
 			{
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_utils.c postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_utils.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_backup_utils.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_backup_utils.c	2017-08-07 21:13:41.000000000 +0000
@@ -93,6 +93,23 @@
 	vfprintf(stderr, _(fmt), ap);
 }
 
+/*
+ * Fail and die, with a message to stderr.  Parameters as for write_msg.
+ *
+ * Note that on_exit_nicely callbacks will get run.
+ */
+void
+exit_horribly(const char *modulename, const char *fmt,...)
+{
+	va_list		ap;
+
+	va_start(ap, fmt);
+	vwrite_msg(modulename, fmt, ap);
+	va_end(ap);
+
+	exit_nicely(1);
+}
+
 /* Register a callback to be run when exit_nicely is invoked. */
 void
 on_exit_nicely(on_exit_nicely_callback function, void *arg)
@@ -106,7 +123,20 @@
 
 /*
  * Run accumulated on_exit_nicely callbacks in reverse order and then exit
- * quietly.  This needs to be thread-safe.
+ * without printing any message.
+ *
+ * If running in a parallel worker thread on Windows, we only exit the thread,
+ * not the whole process.
+ *
+ * Note that in parallel operation on Windows, the callback(s) will be run
+ * by each thread since the list state is necessarily shared by all threads;
+ * each callback must contain logic to ensure it does only what's appropriate
+ * for its thread.  On Unix, callbacks are also run by each process, but only
+ * for callbacks established before we fork off the child processes.  (It'd
+ * be cleaner to reset the list after fork(), and let each child establish
+ * its own callbacks; but then the behavior would be completely inconsistent
+ * between Windows and Unix.  For now, just be sure to establish callbacks
+ * before forking to avoid inconsistency.)
  */
 void
 exit_nicely(int code)
@@ -119,7 +149,7 @@
 
 #ifdef WIN32
 	if (parallel_init_done && GetCurrentThreadId() != mainThreadId)
-		ExitThread(code);
+		_endthreadex(code);
 #endif
 
 	exit(code);
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_dumpall.c postgresql-9.5-9.5.8/src/bin/pg_dump/pg_dumpall.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_dumpall.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_dumpall.c	2017-08-07 21:13:41.000000000 +0000
@@ -49,8 +49,6 @@
 					   const char *name2);
 static void dumpDatabases(PGconn *conn);
 static void dumpTimestamp(const char *msg);
-static void doShellQuoting(PQExpBuffer buf, const char *str);
-static void doConnStrQuoting(PQExpBuffer buf, const char *str);
 
 static int	runPgDump(const char *dbname);
 static void buildShSecLabels(PGconn *conn, const char *catalog_name,
@@ -214,7 +212,7 @@
 			case 'f':
 				filename = pg_strdup(optarg);
 				appendPQExpBufferStr(pgdumpopts, " -f ");
-				doShellQuoting(pgdumpopts, filename);
+				appendShellString(pgdumpopts, filename);
 				break;
 
 			case 'g':
@@ -251,7 +249,7 @@
 
 			case 'S':
 				appendPQExpBufferStr(pgdumpopts, " -S ");
-				doShellQuoting(pgdumpopts, optarg);
+				appendShellString(pgdumpopts, optarg);
 				break;
 
 			case 't':
@@ -287,13 +285,13 @@
 
 			case 2:
 				appendPQExpBufferStr(pgdumpopts, " --lock-wait-timeout ");
-				doShellQuoting(pgdumpopts, optarg);
+				appendShellString(pgdumpopts, optarg);
 				break;
 
 			case 3:
 				use_role = pg_strdup(optarg);
 				appendPQExpBufferStr(pgdumpopts, " --role ");
-				doShellQuoting(pgdumpopts, use_role);
+				appendShellString(pgdumpopts, use_role);
 				break;
 
 			default:
@@ -550,6 +548,7 @@
 
 	printf(_("\nGeneral options:\n"));
 	printf(_("  -f, --file=FILENAME          output file name\n"));
+	printf(_("  -v, --verbose                verbose mode\n"));
 	printf(_("  -V, --version                output version information, then exit\n"));
 	printf(_("  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"));
 	printf(_("  -?, --help                   show this help, then exit\n"));
@@ -1428,7 +1427,7 @@
 							  fdbname, fmtId(dbtablespace));
 
 			/* connect to original database */
-			appendPQExpBuffer(buf, "\\connect %s\n", fdbname);
+			appendPsqlMetaConnect(buf, dbname);
 		}
 
 		if (binary_upgrade)
@@ -1654,11 +1653,15 @@
 		int			ret;
 
 		char	   *dbname = PQgetvalue(res, i, 0);
+		PQExpBufferData connectbuf;
 
 		if (verbose)
 			fprintf(stderr, _("%s: dumping database \"%s\"...\n"), progname, dbname);
 
-		fprintf(OPF, "\\connect %s\n\n", fmtId(dbname));
+		initPQExpBuffer(&connectbuf);
+		appendPsqlMetaConnect(&connectbuf, dbname);
+		fprintf(OPF, "%s\n", connectbuf.data);
+		termPQExpBuffer(&connectbuf);
 
 		/*
 		 * Restore will need to write to the target cluster.  This connection
@@ -1726,9 +1729,9 @@
 	 * string.
 	 */
 	appendPQExpBuffer(connstrbuf, "%s dbname=", connstr);
-	doConnStrQuoting(connstrbuf, dbname);
+	appendConnStrVal(connstrbuf, dbname);
 
-	doShellQuoting(cmd, connstrbuf->data);
+	appendShellString(cmd, connstrbuf->data);
 
 	if (verbose)
 		fprintf(stderr, _("%s: running \"%s\"\n"), progname, cmd->data);
@@ -1814,7 +1817,9 @@
 
 		/*
 		 * Merge the connection info inputs given in form of connection string
-		 * and other options.
+		 * and other options.  Explicitly discard any dbname value in the
+		 * connection string; otherwise, PQconnectdbParams() would interpret
+		 * that value as being itself a connection string.
 		 */
 		if (connection_string)
 		{
@@ -1827,7 +1832,8 @@
 
 			for (conn_opt = conn_opts; conn_opt->keyword != NULL; conn_opt++)
 			{
-				if (conn_opt->val != NULL && conn_opt->val[0] != '\0')
+				if (conn_opt->val != NULL && conn_opt->val[0] != '\0' &&
+					strcmp(conn_opt->keyword, "dbname") != 0)
 					argcount++;
 			}
 
@@ -1836,7 +1842,8 @@
 
 			for (conn_opt = conn_opts; conn_opt->keyword != NULL; conn_opt++)
 			{
-				if (conn_opt->val != NULL && conn_opt->val[0] != '\0')
+				if (conn_opt->val != NULL && conn_opt->val[0] != '\0' &&
+					strcmp(conn_opt->keyword, "dbname") != 0)
 				{
 					keywords[i] = conn_opt->keyword;
 					values[i] = conn_opt->val;
@@ -2008,7 +2015,7 @@
 			appendPQExpBufferChar(buf, ' ');
 		firstkeyword = false;
 		appendPQExpBuffer(buf, "%s=", keywords[i]);
-		doConnStrQuoting(buf, values[i]);
+		appendConnStrVal(buf, values[i]);
 	}
 
 	connstr = pg_strdup(buf->data);
@@ -2081,81 +2088,3 @@
 	if (strftime(buf, sizeof(buf), PGDUMP_STRFTIME_FMT, localtime(&now)) != 0)
 		fprintf(OPF, "-- %s %s\n\n", msg, buf);
 }
-
-
-/*
- * Append the given string to the buffer, with suitable quoting for passing
- * the string as a value, in a keyword/pair value in a libpq connection
- * string
- */
-static void
-doConnStrQuoting(PQExpBuffer buf, const char *str)
-{
-	const char *s;
-	bool		needquotes;
-
-	/*
-	 * If the string consists entirely of plain ASCII characters, no need to
-	 * quote it. This is quite conservative, but better safe than sorry.
-	 */
-	needquotes = false;
-	for (s = str; *s; s++)
-	{
-		if (!((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') ||
-			  (*s >= '0' && *s <= '9') || *s == '_' || *s == '.'))
-		{
-			needquotes = true;
-			break;
-		}
-	}
-
-	if (needquotes)
-	{
-		appendPQExpBufferChar(buf, '\'');
-		while (*str)
-		{
-			/* ' and \ must be escaped by to \' and \\ */
-			if (*str == '\'' || *str == '\\')
-				appendPQExpBufferChar(buf, '\\');
-
-			appendPQExpBufferChar(buf, *str);
-			str++;
-		}
-		appendPQExpBufferChar(buf, '\'');
-	}
-	else
-		appendPQExpBufferStr(buf, str);
-}
-
-/*
- * Append the given string to the shell command being built in the buffer,
- * with suitable shell-style quoting.
- */
-static void
-doShellQuoting(PQExpBuffer buf, const char *str)
-{
-	const char *p;
-
-#ifndef WIN32
-	appendPQExpBufferChar(buf, '\'');
-	for (p = str; *p; p++)
-	{
-		if (*p == '\'')
-			appendPQExpBufferStr(buf, "'\"'\"'");
-		else
-			appendPQExpBufferChar(buf, *p);
-	}
-	appendPQExpBufferChar(buf, '\'');
-#else							/* WIN32 */
-
-	appendPQExpBufferChar(buf, '"');
-	for (p = str; *p; p++)
-	{
-		if (*p == '"')
-			appendPQExpBufferStr(buf, "\\\"");
-		else
-			appendPQExpBufferChar(buf, *p);
-	}
-	appendPQExpBufferChar(buf, '"');
-#endif   /* WIN32 */
-}
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_dump.c postgresql-9.5-9.5.8/src/bin/pg_dump/pg_dump.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_dump.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_dump.c	2017-08-07 21:13:41.000000000 +0000
@@ -94,7 +94,10 @@
 /* subquery used to convert user ID (eg, datdba) to user name */
 static const char *username_subquery;
 
-/* obsolete as of 7.3: */
+/*
+ * For 8.0 and earlier servers, pulled from pg_database, for 8.1+ we use
+ * FirstNormalObjectId - 1.
+ */
 static Oid	g_last_builtin_oid; /* value of the last builtin oid */
 
 /*
@@ -255,7 +258,6 @@
 static void fmtReloptionsArray(Archive *fout, PQExpBuffer buffer,
 				   const char *reloptions, const char *prefix);
 static char *get_synchronized_snapshot(Archive *fout);
-static PGresult *ExecuteSqlQueryForSingleRow(Archive *fout, char *query);
 static void setupDumpWorker(Archive *AHX);
 
 
@@ -579,12 +581,21 @@
 	/* Custom and directory formats are compressed by default, others not */
 	if (compressLevel == -1)
 	{
+#ifdef HAVE_LIBZ
 		if (archiveFormat == archCustom || archiveFormat == archDirectory)
 			compressLevel = Z_DEFAULT_COMPRESSION;
 		else
+#endif
 			compressLevel = 0;
 	}
 
+#ifndef HAVE_LIBZ
+	if (compressLevel != 0)
+		write_msg(NULL, "WARNING: requested compression not available in this "
+				  "installation -- archive will be uncompressed\n");
+	compressLevel = 0;
+#endif
+
 	/*
 	 * On Windows we can only have at most MAXIMUM_WAIT_OBJECTS (= 64 usually)
 	 * parallel jobs because that's the maximum limit for the
@@ -595,7 +606,7 @@
 		|| numWorkers > MAXIMUM_WAIT_OBJECTS
 #endif
 		)
-		exit_horribly(NULL, "%s: invalid number of parallel jobs\n", progname);
+		exit_horribly(NULL, "invalid number of parallel jobs\n");
 
 	/* Parallel backup only in the directory archive format so far */
 	if (archiveFormat != archDirectory && numWorkers > 1)
@@ -638,23 +649,11 @@
 		dopt.no_security_labels = 1;
 
 	/*
-	 * When running against 9.0 or later, check if we are in recovery mode,
-	 * which means we are on a hot standby.
+	 * On hot standby slaves, never try to dump unlogged table data, since it
+	 * will just throw an error.
 	 */
-	if (fout->remoteVersion >= 90000)
-	{
-		PGresult   *res = ExecuteSqlQueryForSingleRow(fout, "SELECT pg_catalog.pg_is_in_recovery()");
-
-		if (strcmp(PQgetvalue(res, 0, 0), "t") == 0)
-		{
-			/*
-			 * On hot standby slaves, never try to dump unlogged table data,
-			 * since it will just throw an error.
-			 */
-			dopt.no_unlogged_table_data = true;
-		}
-		PQclear(res);
-	}
+	if (fout->isStandby)
+		dopt.no_unlogged_table_data = true;
 
 	/* Select the appropriate subquery to convert user IDs to names */
 	if (fout->remoteVersion >= 80100)
@@ -677,17 +676,24 @@
 		exit_horribly(NULL,
 		   "Exported snapshots are not supported by this server version.\n");
 
-	/* Find the last built-in OID, if needed */
-	if (fout->remoteVersion < 70300)
+	/*
+	 * Find the last built-in OID, if needed (prior to 8.1)
+	 *
+	 * With 8.1 and above, we can just use FirstNormalObjectId - 1.
+	 */
+	if (fout->remoteVersion < 80100)
 	{
 		if (fout->remoteVersion >= 70100)
 			g_last_builtin_oid = findLastBuiltinOid_V71(fout,
 												  PQdb(GetConnection(fout)));
 		else
 			g_last_builtin_oid = findLastBuiltinOid_V70(fout);
-		if (g_verbose)
-			write_msg(NULL, "last built-in OID is %u\n", g_last_builtin_oid);
 	}
+	else
+		g_last_builtin_oid = FirstNormalObjectId - 1;
+
+	if (g_verbose)
+		write_msg(NULL, "last built-in OID is %u\n", g_last_builtin_oid);
 
 	/* Expand schema selection patterns into OID lists */
 	if (schema_include_patterns.head != NULL)
@@ -741,7 +747,15 @@
 			getTableDataFKConstraints();
 	}
 
-	if (dopt.outputBlobs)
+	/*
+	 * In binary-upgrade mode, we do not have to worry about the actual blob
+	 * data or the associated metadata that resides in the pg_largeobject and
+	 * pg_largeobject_metadata tables, respectivly.
+	 *
+	 * However, we do need to collect blob information as there may be
+	 * comments or other information on blobs that we do need to dump out.
+	 */
+	if (dopt.outputBlobs || dopt.binary_upgrade)
 		getBlobs(fout);
 
 	/*
@@ -824,6 +838,7 @@
 	ropt->lockWaitTimeout = dopt.lockWaitTimeout;
 	ropt->include_everything = dopt.include_everything;
 	ropt->enable_row_security = dopt.enable_row_security;
+	ropt->binary_upgrade = dopt.binary_upgrade;
 
 	if (compressLevel == -1)
 		ropt->compression = 0;
@@ -939,10 +954,7 @@
 	const char *std_strings;
 
 	/*
-	 * Set the client encoding if requested. If dumpencoding == NULL then
-	 * either it hasn't been requested or we're a cloned connection and then
-	 * this has already been set in CloneArchive according to the original
-	 * connection encoding.
+	 * Set the client encoding if requested.
 	 */
 	if (dumpencoding)
 	{
@@ -960,7 +972,11 @@
 	std_strings = PQparameterStatus(conn, "standard_conforming_strings");
 	AH->std_strings = (std_strings && strcmp(std_strings, "on") == 0);
 
-	/* Set the role if requested */
+	/*
+	 * Set the role if requested.  In a parallel dump worker, we'll be passed
+	 * use_role == NULL, but AH->use_role is already set (if user specified it
+	 * originally) and we should use that.
+	 */
 	if (!use_role && AH->use_role)
 		use_role = AH->use_role;
 
@@ -973,9 +989,9 @@
 		ExecuteSqlStatement(AH, query->data);
 		destroyPQExpBuffer(query);
 
-		/* save this for later use on parallel connections */
+		/* save it for possible later use by parallel workers */
 		if (!AH->use_role)
-			AH->use_role = strdup(use_role);
+			AH->use_role = pg_strdup(use_role);
 	}
 
 	/* Set the datestyle to ISO to ensure the dump's portability */
@@ -1061,11 +1077,12 @@
 							"SET TRANSACTION ISOLATION LEVEL SERIALIZABLE");
 
 	/*
-	 * define an export snapshot, either chosen by user or needed for parallel
-	 * dump.
+	 * If user specified a snapshot to use, select that.  In a parallel dump
+	 * worker, we'll be passed dumpsnapshot == NULL, but AH->sync_snapshot_id
+	 * is already set (if the server can handle it) and we should use that.
 	 */
 	if (dumpsnapshot)
-		AH->sync_snapshot_id = strdup(dumpsnapshot);
+		AH->sync_snapshot_id = pg_strdup(dumpsnapshot);
 
 	if (AH->sync_snapshot_id)
 	{
@@ -1079,24 +1096,43 @@
 	else if (AH->numWorkers > 1 &&
 			 AH->remoteVersion >= 90200 &&
 			 !dopt->no_synchronized_snapshots)
+	{
+		if (AH->isStandby)
+			exit_horribly(NULL,
+			 "Synchronized snapshots are not supported on standby servers.\n"
+						  "Run with --no-synchronized-snapshots instead if you do not need\n"
+						  "synchronized snapshots.\n");
+
+
 		AH->sync_snapshot_id = get_synchronized_snapshot(AH);
+	}
 }
 
+/* Set up connection for a parallel worker process */
 static void
-setupDumpWorker(Archive *AHX)
+setupDumpWorker(Archive *AH)
 {
-	setup_connection(AHX, NULL, NULL, NULL);
+	/*
+	 * We want to re-select all the same values the master connection is
+	 * using.  We'll have inherited directly-usable values in
+	 * AH->sync_snapshot_id and AH->use_role, but we need to translate the
+	 * inherited encoding value back to a string to pass to setup_connection.
+	 */
+	setup_connection(AH,
+					 pg_encoding_to_char(AH->encoding),
+					 NULL,
+					 NULL);
 }
 
 static char *
 get_synchronized_snapshot(Archive *fout)
 {
-	char	   *query = "SELECT pg_export_snapshot()";
+	char	   *query = "SELECT pg_catalog.pg_export_snapshot()";
 	char	   *result;
 	PGresult   *res;
 
 	res = ExecuteSqlQueryForSingleRow(fout, query);
-	result = strdup(PQgetvalue(res, 0, 0));
+	result = pg_strdup(PQgetvalue(res, 0, 0));
 	PQclear(res);
 
 	return result;
@@ -1423,7 +1459,7 @@
 	if (checkExtensionMembership(&cast->dobj, dopt))
 		return;					/* extension membership overrides all else */
 
-	if (cast->dobj.catId.oid < (Oid) FirstNormalObjectId)
+	if (cast->dobj.catId.oid <= (Oid) g_last_builtin_oid)
 		cast->dobj.dump = false;
 	else
 		cast->dobj.dump = dopt->include_everything;
@@ -1443,7 +1479,7 @@
 	if (checkExtensionMembership(&plang->dobj, dopt))
 		return;					/* extension membership overrides all else */
 
-	if (plang->dobj.catId.oid < (Oid) FirstNormalObjectId)
+	if (plang->dobj.catId.oid <= (Oid) g_last_builtin_oid)
 		plang->dobj.dump = false;
 	else
 		plang->dobj.dump = dopt->include_everything;
@@ -1462,7 +1498,7 @@
 static void
 selectDumpableExtension(ExtensionInfo *extinfo, DumpOptions *dopt)
 {
-	if (dopt->binary_upgrade && extinfo->dobj.catId.oid < (Oid) FirstNormalObjectId)
+	if (dopt->binary_upgrade && extinfo->dobj.catId.oid <= (Oid) g_last_builtin_oid)
 		extinfo->dobj.dump = false;
 	else
 		extinfo->dobj.dump = dopt->include_everything;
@@ -1659,6 +1695,11 @@
 	}
 	PQclear(res);
 
+	/* Do this to ensure we've pumped libpq back to idle state */
+	if (PQgetResult(conn) != NULL)
+		write_msg(NULL, "WARNING: unexpected extra results during COPY of table \"%s\"\n",
+				  classname);
+
 	destroyPQExpBuffer(q);
 	return 1;
 }
@@ -2422,7 +2463,8 @@
 		appendPQExpBufferStr(creaQry, " LC_CTYPE = ");
 		appendStringLiteralAH(creaQry, ctype, fout);
 	}
-	if (strlen(tablespace) > 0 && strcmp(tablespace, "pg_default") != 0)
+	if (strlen(tablespace) > 0 && strcmp(tablespace, "pg_default") != 0 &&
+		!dopt->outputNoTablespaces)
 		appendPQExpBuffer(creaQry, " TABLESPACE = %s",
 						  fmtId(tablespace));
 	appendPQExpBufferStr(creaQry, ";\n");
@@ -2792,8 +2834,14 @@
 				 NULL, binfo->rolname,
 				 binfo->dobj.catId, 0, binfo->dobj.dumpId);
 
-	/* Dump ACL if any */
-	if (binfo->blobacl)
+	/*
+	 * Dump ACL if any
+	 *
+	 * Do not dump the ACL in binary-upgrade mode, however, as the ACL will be
+	 * copied over by pg_upgrade as it is part of the pg_largeobject_metadata
+	 * table.
+	 */
+	if (binfo->blobacl && !fout->dopt->binary_upgrade)
 		dumpACL(fout, binfo->dobj.catId, binfo->dobj.dumpId, "LARGE OBJECT",
 				binfo->dobj.name, NULL, cquery->data,
 				NULL, binfo->rolname, binfo->blobacl);
@@ -2818,6 +2866,13 @@
 	int			i;
 	int			cnt;
 
+	/*
+	 * Do not dump out blob data in binary-upgrade mode, pg_upgrade will copy
+	 * the pg_largeobject table over entirely from the old cluster.
+	 */
+	if (fout->dopt->binary_upgrade)
+		return 1;
+
 	if (g_verbose)
 		write_msg(NULL, "saving large objects\n");
 
@@ -4458,19 +4513,24 @@
 	selectSourceSchema(fout, "pg_catalog");
 
 	/*
-	 * Find all user-defined functions.  Normally we can exclude functions in
-	 * pg_catalog, which is worth doing since there are several thousand of
-	 * 'em.  However, there are some extensions that create functions in
-	 * pg_catalog.  In normal dumps we can still ignore those --- but in
-	 * binary-upgrade mode, we must dump the member objects of the extension,
-	 * so be sure to fetch any such functions.
+	 * Find all interesting functions.  This is a bit complicated:
 	 *
-	 * Also, in 9.2 and up, exclude functions that are internally dependent on
-	 * something else, since presumably those will be created as a result of
-	 * creating the something else.  This currently only acts to suppress
-	 * constructor functions for range types.  Note that this is OK only
-	 * because the constructors don't have any dependencies the range type
-	 * doesn't have; otherwise we might not get creation ordering correct.
+	 * 1. Always exclude aggregates; those are handled elsewhere.
+	 *
+	 * 2. Always exclude functions that are internally dependent on something
+	 * else, since presumably those will be created as a result of creating
+	 * the something else.  This currently acts only to suppress constructor
+	 * functions for range types (so we only need it in 9.2 and up).  Note
+	 * this is OK only because the constructors don't have any dependencies
+	 * the range type doesn't have; otherwise we might not get creation
+	 * ordering correct.
+	 *
+	 * 3. Otherwise, we normally exclude functions in pg_catalog.  However, if
+	 * they're members of extensions and we are in binary-upgrade mode then
+	 * include them, since we want to dump extension members individually in
+	 * that mode.  Also, if they are used by casts or transforms then we need
+	 * to gather the information about them, though they won't be dumped if
+	 * they are built-in.
 	 */
 
 	if (fout->remoteVersion >= 70300)
@@ -4481,16 +4541,31 @@
 						  "pronamespace, "
 						  "(%s proowner) AS rolname "
 						  "FROM pg_proc p "
-						  "WHERE NOT proisagg AND ("
-						  "pronamespace != "
-						  "(SELECT oid FROM pg_namespace "
-						  "WHERE nspname = 'pg_catalog')",
+						  "WHERE NOT proisagg",
 						  username_subquery);
 		if (fout->remoteVersion >= 90200)
 			appendPQExpBufferStr(query,
 							   "\n  AND NOT EXISTS (SELECT 1 FROM pg_depend "
 								 "WHERE classid = 'pg_proc'::regclass AND "
 								 "objid = p.oid AND deptype = 'i')");
+		appendPQExpBuffer(query,
+							 "\n  AND ("
+							 "\n  pronamespace != "
+							 "(SELECT oid FROM pg_namespace "
+							 "WHERE nspname = 'pg_catalog')"
+							 "\n  OR EXISTS (SELECT 1 FROM pg_cast"
+							 "\n  WHERE pg_cast.oid > '%u'::oid"
+							 "\n  AND p.oid = pg_cast.castfunc)",
+							 g_last_builtin_oid);
+
+		if (fout->remoteVersion >= 90500)
+			appendPQExpBuffer(query,
+								 "\n  OR EXISTS (SELECT 1 FROM pg_transform"
+								 "\n  WHERE pg_transform.oid > %u::oid"
+								 "\n  AND (p.oid = pg_transform.trffromsql"
+								 "\n  OR p.oid = pg_transform.trftosql))",
+								 g_last_builtin_oid);
+
 		if (dopt->binary_upgrade && fout->remoteVersion >= 90100)
 			appendPQExpBufferStr(query,
 							   "\n  OR EXISTS(SELECT 1 FROM pg_depend WHERE "
@@ -8060,7 +8135,8 @@
 	}
 	else
 	{
-		if (dopt->schemaOnly)
+		/* We do dump blob comments in binary-upgrade mode */
+		if (dopt->schemaOnly && !dopt->binary_upgrade)
 			return;
 	}
 
@@ -8602,8 +8678,8 @@
 		/*
 		 * We unconditionally create the extension, so we must drop it if it
 		 * exists.  This could happen if the user deleted 'plpgsql' and then
-		 * readded it, causing its oid to be greater than FirstNormalObjectId.
-		 * The FirstNormalObjectId test was kept to avoid repeatedly dropping
+		 * readded it, causing its oid to be greater than g_last_builtin_oid.
+		 * The g_last_builtin_oid test was kept to avoid repeatedly dropping
 		 * and recreating extensions like 'plpgsql'.
 		 */
 		appendPQExpBuffer(q, "DROP EXTENSION IF EXISTS %s;\n", qextname);
@@ -10113,10 +10189,10 @@
 
 	/* Dump Proc Lang Comments and Security Labels */
 	dumpComment(fout, labelq->data,
-				NULL, "",
+				lanschema, plang->lanowner,
 				plang->dobj.catId, 0, plang->dobj.dumpId);
 	dumpSecLabel(fout, labelq->data,
-				 NULL, "",
+				 lanschema, plang->lanowner,
 				 plang->dobj.catId, 0, plang->dobj.dumpId);
 
 	if (plang->lanpltrusted)
@@ -10797,7 +10873,8 @@
 	{
 		funcInfo = findFuncByOid(cast->castfunc);
 		if (funcInfo == NULL)
-			return;
+			exit_horribly(NULL, "could not find function definition for function with OID %u\n",
+						  cast->castfunc);
 	}
 
 	/*
@@ -10870,7 +10947,7 @@
 
 	/* Dump Cast Comments */
 	dumpComment(fout, labelq->data,
-				NULL, "",
+				"pg_catalog", "",
 				cast->dobj.catId, 0, cast->dobj.dumpId);
 
 	destroyPQExpBuffer(defqry);
@@ -10901,13 +10978,15 @@
 	{
 		fromsqlFuncInfo = findFuncByOid(transform->trffromsql);
 		if (fromsqlFuncInfo == NULL)
-			return;
+			exit_horribly(NULL, "could not find function definition for function with OID %u\n",
+						  transform->trffromsql);
 	}
 	if (OidIsValid(transform->trftosql))
 	{
 		tosqlFuncInfo = findFuncByOid(transform->trftosql);
 		if (tosqlFuncInfo == NULL)
-			return;
+			exit_horribly(NULL, "could not find function definition for function with OID %u\n",
+						  transform->trftosql);
 	}
 
 	/* Make sure we are in proper schema (needed for getFormattedTypeName) */
@@ -10988,7 +11067,7 @@
 
 	/* Dump Transform Comments */
 	dumpComment(fout, labelq->data,
-				NULL, "",
+				"pg_catalog", "",
 				transform->dobj.catId, 0, transform->dobj.dumpId);
 
 	free(lanname);
@@ -11494,7 +11573,8 @@
 	i_opcfamilynsp = PQfnumber(res, "opcfamilynsp");
 	i_amname = PQfnumber(res, "amname");
 
-	opcintype = PQgetvalue(res, 0, i_opcintype);
+	/* opcintype may still be needed after we PQclear res */
+	opcintype = pg_strdup(PQgetvalue(res, 0, i_opcintype));
 	opckeytype = PQgetvalue(res, 0, i_opckeytype);
 	opcdefault = PQgetvalue(res, 0, i_opcdefault);
 	/* opcfamily will still be needed after we PQclear res */
@@ -11522,9 +11602,7 @@
 	appendPQExpBuffer(q, "FOR TYPE %s USING %s",
 					  opcintype,
 					  fmtId(amname));
-	if (strlen(opcfamilyname) > 0 &&
-		(strcmp(opcfamilyname, opcinfo->dobj.name) != 0 ||
-		 strcmp(opcfamilynsp, opcinfo->dobj.namespace->dobj.name) != 0))
+	if (strlen(opcfamilyname) > 0)
 	{
 		appendPQExpBufferStr(q, " FAMILY ");
 		if (strcmp(opcfamilynsp, opcinfo->dobj.namespace->dobj.name) != 0)
@@ -11730,6 +11808,15 @@
 
 	PQclear(res);
 
+	/*
+	 * If needComma is still false it means we haven't added anything after
+	 * the AS keyword.  To avoid printing broken SQL, append a dummy STORAGE
+	 * clause with the same datatype.  This isn't sanctioned by the
+	 * documentation, but actually DefineOpClass will treat it as a no-op.
+	 */
+	if (!needComma)
+		appendPQExpBuffer(q, "STORAGE %s", opcintype);
+
 	appendPQExpBufferStr(q, ";\n");
 
 	appendPQExpBuffer(labelq, "OPERATOR CLASS %s",
@@ -11752,9 +11839,11 @@
 
 	/* Dump Operator Class Comments */
 	dumpComment(fout, labelq->data,
-				NULL, opcinfo->rolname,
+				opcinfo->dobj.namespace->dobj.name, opcinfo->rolname,
 				opcinfo->dobj.catId, 0, opcinfo->dobj.dumpId);
 
+	free(opcintype);
+	free(opcfamily);
 	free(amname);
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(q);
@@ -11808,15 +11897,6 @@
 	if (!opfinfo->dobj.dump || dopt->dataOnly)
 		return;
 
-	/*
-	 * We want to dump the opfamily only if (1) it contains "loose" operators
-	 * or functions, or (2) it contains an opclass with a different name or
-	 * owner.  Otherwise it's sufficient to let it be created during creation
-	 * of the contained opclass, and not dumping it improves portability of
-	 * the dump.  Since we have to fetch the loose operators/funcs anyway, do
-	 * that first.
-	 */
-
 	query = createPQExpBuffer();
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
@@ -11899,40 +11979,6 @@
 
 	res_procs = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
 
-	if (PQntuples(res_ops) == 0 && PQntuples(res_procs) == 0)
-	{
-		/* No loose members, so check contained opclasses */
-		resetPQExpBuffer(query);
-
-		appendPQExpBuffer(query, "SELECT 1 "
-						  "FROM pg_catalog.pg_opclass c, pg_catalog.pg_opfamily f, pg_catalog.pg_depend "
-						  "WHERE f.oid = '%u'::pg_catalog.oid "
-			"AND refclassid = 'pg_catalog.pg_opfamily'::pg_catalog.regclass "
-						  "AND refobjid = f.oid "
-				"AND classid = 'pg_catalog.pg_opclass'::pg_catalog.regclass "
-						  "AND objid = c.oid "
-						  "AND (opcname != opfname OR opcnamespace != opfnamespace OR opcowner != opfowner) "
-						  "LIMIT 1",
-						  opfinfo->dobj.catId.oid);
-
-		res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
-
-		if (PQntuples(res) == 0)
-		{
-			/* no need to dump it, so bail out */
-			PQclear(res);
-			PQclear(res_ops);
-			PQclear(res_procs);
-			destroyPQExpBuffer(query);
-			destroyPQExpBuffer(q);
-			destroyPQExpBuffer(delq);
-			destroyPQExpBuffer(labelq);
-			return;
-		}
-
-		PQclear(res);
-	}
-
 	/* Get additional fields from the pg_opfamily row */
 	resetPQExpBuffer(query);
 
@@ -12066,7 +12112,7 @@
 
 	/* Dump Operator Family Comments */
 	dumpComment(fout, labelq->data,
-				NULL, opfinfo->rolname,
+				opfinfo->dobj.namespace->dobj.name, opfinfo->rolname,
 				opfinfo->dobj.catId, 0, opfinfo->dobj.dumpId);
 
 	free(amname);
@@ -12754,7 +12800,7 @@
 
 	/* Dump Parser Comments */
 	dumpComment(fout, labelq->data,
-				NULL, "",
+				prsinfo->dobj.namespace->dobj.name, "",
 				prsinfo->dobj.catId, 0, prsinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(q);
@@ -12842,7 +12888,7 @@
 
 	/* Dump Dictionary Comments */
 	dumpComment(fout, labelq->data,
-				NULL, dictinfo->rolname,
+				dictinfo->dobj.namespace->dobj.name, dictinfo->rolname,
 				dictinfo->dobj.catId, 0, dictinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(q);
@@ -12909,7 +12955,7 @@
 
 	/* Dump Template Comments */
 	dumpComment(fout, labelq->data,
-				NULL, "",
+				tmplinfo->dobj.namespace->dobj.name, "",
 				tmplinfo->dobj.catId, 0, tmplinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(q);
@@ -13038,7 +13084,7 @@
 
 	/* Dump Configuration Comments */
 	dumpComment(fout, labelq->data,
-				NULL, cfginfo->rolname,
+				cfginfo->dobj.namespace->dobj.name, cfginfo->rolname,
 				cfginfo->dobj.catId, 0, cfginfo->dobj.dumpId);
 
 	destroyPQExpBuffer(q);
@@ -13485,7 +13531,8 @@
 	}
 	else
 	{
-		if (dopt->schemaOnly)
+		/* We do dump blob security labels in binary-upgrade mode */
+		if (dopt->schemaOnly && !dopt->binary_upgrade)
 			return;
 	}
 
@@ -14963,10 +15010,10 @@
 }
 
 /*
- * findLastBuiltInOid -
+ * findLastBuiltinOid -
  * find the last built in oid
  *
- * For 7.1 and 7.2, we do this by retrieving datlastsysoid from the
+ * For 7.1 through 8.0, we do this by retrieving datlastsysoid from the
  * pg_database entry for the current database
  */
 static Oid
@@ -14988,7 +15035,7 @@
 }
 
 /*
- * findLastBuiltInOid -
+ * findLastBuiltinOid -
  * find the last built in oid
  *
  * For 7.0, we do this by assuming that the last thing that initdb does is to
@@ -15489,6 +15536,7 @@
 {
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer query;
+	PQExpBuffer delqry;
 	PQExpBuffer labelq;
 
 	/* Skip if not to be dumped */
@@ -15496,6 +15544,7 @@
 		return;
 
 	query = createPQExpBuffer();
+	delqry = createPQExpBuffer();
 	labelq = createPQExpBuffer();
 
 	appendPQExpBufferStr(query, "CREATE EVENT TRIGGER ");
@@ -15535,19 +15584,27 @@
 		}
 		appendPQExpBufferStr(query, ";\n");
 	}
+
+	appendPQExpBuffer(delqry, "DROP EVENT TRIGGER %s;\n",
+					  fmtId(evtinfo->dobj.name));
+
 	appendPQExpBuffer(labelq, "EVENT TRIGGER %s",
 					  fmtId(evtinfo->dobj.name));
 
 	ArchiveEntry(fout, evtinfo->dobj.catId, evtinfo->dobj.dumpId,
-				 evtinfo->dobj.name, NULL, NULL, evtinfo->evtowner, false,
+				 evtinfo->dobj.name, NULL, NULL,
+				 evtinfo->evtowner, false,
 				 "EVENT TRIGGER", SECTION_POST_DATA,
-				 query->data, "", NULL, NULL, 0, NULL, NULL);
+				 query->data, delqry->data, NULL,
+				 NULL, 0,
+				 NULL, NULL);
 
 	dumpComment(fout, labelq->data,
 				NULL, evtinfo->evtowner,
 				evtinfo->dobj.catId, 0, evtinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(query);
+	destroyPQExpBuffer(delqry);
 	destroyPQExpBuffer(labelq);
 }
 
@@ -16595,26 +16652,3 @@
 	if (options)
 		free(options);
 }
-
-/*
- * Execute an SQL query and verify that we got exactly one row back.
- */
-static PGresult *
-ExecuteSqlQueryForSingleRow(Archive *fout, char *query)
-{
-	PGresult   *res;
-	int			ntups;
-
-	res = ExecuteSqlQuery(fout, query, PGRES_TUPLES_OK);
-
-	/* Expecting a single result only */
-	ntups = PQntuples(res);
-	if (ntups != 1)
-		exit_horribly(NULL,
-					  ngettext("query returned %d row instead of one: %s\n",
-							   "query returned %d rows instead of one: %s\n",
-							   ntups),
-					  ntups, query);
-
-	return res;
-}
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/pg_restore.c postgresql-9.5-9.5.8/src/bin/pg_dump/pg_restore.c
--- postgresql-9.5-9.5.2/src/bin/pg_dump/pg_restore.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/pg_restore.c	2017-08-07 21:13:41.000000000 +0000
@@ -323,6 +323,22 @@
 		exit_nicely(1);
 	}
 
+	if (numWorkers <= 0)
+	{
+		fprintf(stderr, _("%s: invalid number of parallel jobs\n"), progname);
+		exit(1);
+	}
+
+	/* See comments in pg_dump.c */
+#ifdef WIN32
+	if (numWorkers > MAXIMUM_WAIT_OBJECTS)
+	{
+		fprintf(stderr, _("%s: maximum number of parallel jobs is %d\n"),
+				progname, MAXIMUM_WAIT_OBJECTS);
+		exit(1);
+	}
+#endif
+
 	/* Can't do single-txn mode with multiple connections */
 	if (opts->single_txn && numWorkers > 1)
 	{
@@ -394,16 +410,6 @@
 	if (opts->tocFile)
 		SortTocFromFile(AH);
 
-	/* See comments in pg_dump.c */
-#ifdef WIN32
-	if (numWorkers > MAXIMUM_WAIT_OBJECTS)
-	{
-		fprintf(stderr, _("%s: maximum number of parallel jobs is %d\n"),
-				progname, MAXIMUM_WAIT_OBJECTS);
-		exit(1);
-	}
-#endif
-
 	AH->numWorkers = numWorkers;
 
 	if (opts->tocSummary)
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/po/de.po postgresql-9.5-9.5.8/src/bin/pg_dump/po/de.po
--- postgresql-9.5-9.5.2/src/bin/pg_dump/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,14 +1,14 @@
 # German message translation file for pg_dump and friends
 # Peter Eisentraut <peter_e@gmx.net>, 2001 - 2016.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-08 10:43+0000\n"
-"PO-Revision-Date: 2016-02-08 12:22-0500\n"
+"POT-Creation-Date: 2017-08-07 16:30+0000\n"
+"PO-Revision-Date: 2016-10-24 08:58-0400\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -25,27 +25,27 @@
 #: ../../common/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "ungültige Programmdatei „%s“"
+msgstr "ungültige Programmdatei »%s«"
 
 #: ../../common/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "konnte Programmdatei „%s“ nicht lesen"
+msgstr "konnte Programmdatei »%s« nicht lesen"
 
 #: ../../common/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "konnte kein „%s“ zum Ausführen finden"
+msgstr "konnte kein »%s« zum Ausführen finden"
 
 #: ../../common/exec.c:257 ../../common/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "konnte nicht in Verzeichnis „%s“ wechseln: %s"
+msgstr "konnte nicht in Verzeichnis »%s« wechseln: %s"
 
 #: ../../common/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "konnte symbolische Verknüpfung „%s“ nicht lesen"
+msgstr "konnte symbolische Verknüpfung »%s« nicht lesen"
 
 #: ../../common/exec.c:523
 #, c-format
@@ -53,8 +53,8 @@
 msgstr "pclose fehlgeschlagen: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 pg_backup_db.c:137 pg_backup_db.c:188
-#: pg_backup_db.c:245 pg_backup_db.c:287
+#: ../../common/fe_memutils.c:98 pg_backup_db.c:157 pg_backup_db.c:212
+#: pg_backup_db.c:271 pg_backup_db.c:313
 #, c-format
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
@@ -267,180 +267,170 @@
 #: common.c:902
 #, 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"
+msgstr "Sanity-Check fehlgeschlagen, Eltern-OID %u von Tabelle »%s« (OID %u) nicht gefunden\n"
 
 #: common.c:944
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers\n"
-msgstr "konnte numerisches Array „%s“ nicht parsen: zu viele Zahlen\n"
+msgstr "konnte numerisches Array »%s« nicht parsen: zu viele Zahlen\n"
 
 #: common.c:959
 #, 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"
+msgstr "konnte numerisches Array »%s« nicht parsen: ungültiges Zeichen in Zahl\n"
 
 #. translator: this is a module name
-#: compress_io.c:79
+#: compress_io.c:78
 msgid "compress_io"
 msgstr "compress_io"
 
-#: compress_io.c:115
+#: compress_io.c:114
 #, c-format
 msgid "invalid compression code: %d\n"
 msgstr "ungültiger Komprimierungscode: %d\n"
 
-#: compress_io.c:139 compress_io.c:175 compress_io.c:196 compress_io.c:529
-#: compress_io.c:572
+#: compress_io.c:138 compress_io.c:174 compress_io.c:192 compress_io.c:519
+#: compress_io.c:562
 #, c-format
 msgid "not built with zlib support\n"
 msgstr "nicht mit zlib-Unterstützung gebaut\n"
 
-#: compress_io.c:246 compress_io.c:348
+#: compress_io.c:242 compress_io.c:344
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "konnte Komprimierungsbibliothek nicht initialisieren: %s\n"
 
-#: compress_io.c:267
+#: compress_io.c:263
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "konnte Komprimierungsstrom nicht schließen: %s\n"
 
-#: compress_io.c:285
+#: compress_io.c:281
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "konnte Daten nicht komprimieren: %s\n"
 
-#: compress_io.c:368 compress_io.c:384
+#: compress_io.c:361 compress_io.c:377
 #, c-format
 msgid "could not uncompress data: %s\n"
 msgstr "konnte Daten nicht dekomprimieren: %s\n"
 
-#: compress_io.c:392
+#: compress_io.c:385
 #, c-format
 msgid "could not close compression library: %s\n"
 msgstr "konnte Komprimierungsbibliothek nicht schließen: %s\n"
 
-#: compress_io.c:606 compress_io.c:642 pg_backup_custom.c:591
-#: pg_backup_tar.c:560
+#: compress_io.c:600 compress_io.c:638 pg_backup_custom.c:591
+#: pg_backup_tar.c:565 pg_backup_tar.c:569
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "konnte nicht aus Eingabedatei lesen: %s\n"
 
-#: compress_io.c:645 pg_backup_custom.c:588 pg_backup_directory.c:552
-#: pg_backup_tar.c:796 pg_backup_tar.c:820
+#: compress_io.c:641 pg_backup_custom.c:588 pg_backup_directory.c:552
+#: pg_backup_tar.c:808 pg_backup_tar.c:832
 #, c-format
 msgid "could not read from input file: end of file\n"
 msgstr "konnte nicht aus Eingabedatei lesen: Dateiende\n"
 
-#: parallel.c:76
+#: dumputils.c:402 dumputils.c:433
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr "Argument des Shell-Befehls enthält Newline oder Carriage Return: »%s«\n"
+
+#: dumputils.c:545
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr "Datenbankname enthält Newline oder Carriage Return: »%s«\n"
+
+#: parallel.c:166
 msgid "parallel archiver"
 msgstr "paralleler Archivierer"
 
-#: parallel.c:139
+#: parallel.c:230
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: WSAStartup fehlgeschlagen: %d\n"
 
-#: parallel.c:339
-#, c-format
-msgid "worker is terminating\n"
-msgstr "Arbeitsprozess bricht ab\n"
-
-#: parallel.c:529
+#: parallel.c:933
 #, c-format
 msgid "could not create communication channels: %s\n"
 msgstr "konnte Kommunikationskanäle nicht erzeugen: %s\n"
 
-#: parallel.c:601
+#: parallel.c:996
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "konnte Arbeitsprozess nicht erzeugen: %s\n"
 
-#: parallel.c:818
-#, c-format
-msgid "could not get relation name for OID %u: %s\n"
-msgstr "konnte Relationsnamen für OID %u nicht ermitteln: %s\n"
-
-#: parallel.c:835
+#: parallel.c:1191
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
 "This usually means that someone requested an ACCESS EXCLUSIVE lock on the table after the pg_dump parent process had gotten the initial ACCESS SHARE lock on the table.\n"
 msgstr ""
-"konnte Sperre für Relation „%s“ nicht setzen\n"
+"konnte Sperre für Relation »%s« nicht setzen\n"
 "Das bedeutet meistens, dass jemand eine ACCESS-EXCLUSIVE-Sperre auf die Tabelle gesetzt hat, nachdem der pg-dump-Elternprozess die anfängliche ACCESS-SHARE-Sperre gesetzt hatte.\n"
 
-#: parallel.c:919
+#: parallel.c:1261
 #, c-format
-msgid "unrecognized command on communication channel: %s\n"
-msgstr "unbekannter Befehl auf Kommunikationskanal: %s\n"
+msgid "unrecognized command received from master: \"%s\"\n"
+msgstr "unbekannter Befehl vom Master empfangen: »%s«\n"
 
-#: parallel.c:952
+#: parallel.c:1299
 #, c-format
 msgid "a worker process died unexpectedly\n"
 msgstr "ein Arbeitsprozess endete unerwartet\n"
 
-#: parallel.c:979 parallel.c:988
+#: parallel.c:1325 parallel.c:1331
 #, c-format
-msgid "invalid message received from worker: %s\n"
-msgstr "ungültige Nachricht vom Arbeitsprozess empfangen: %s\n"
+msgid "invalid message received from worker: \"%s\"\n"
+msgstr "ungültige Nachricht vom Arbeitsprozess empfangen: »%s«\n"
 
-#: parallel.c:985 pg_backup_db.c:355
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: parallel.c:1037 parallel.c:1081
+#: parallel.c:1388 parallel.c:1439
 #, c-format
 msgid "error processing a parallel work item\n"
 msgstr "Fehler beim Verarbeiten eines parallelen Arbeitselements\n"
 
-#: parallel.c:1109 parallel.c:1247
+#: parallel.c:1468 parallel.c:1586
 #, c-format
 msgid "could not write to the communication channel: %s\n"
 msgstr "konnte nicht in den Kommunikationskanal schreiben: %s\n"
 
-#: parallel.c:1158
+#: parallel.c:1546
 #, c-format
-msgid "terminated by user\n"
-msgstr "vom Benutzer abgebrochen\n"
+msgid "select() failed: %s\n"
+msgstr "select() fehlgeschlagen: %s\n"
 
-#: parallel.c:1210
-#, c-format
-msgid "error in ListenToWorkers(): %s\n"
-msgstr "Fehler in ListenToWorkers(): %s\n"
-
-#: parallel.c:1335
+#: parallel.c:1671
 #, c-format
 msgid "pgpipe: could not create socket: error code %d\n"
 msgstr "pgpipe: konnte Socket nicht erzeugen: Fehlercode %d\n"
 
-#: parallel.c:1346
+#: parallel.c:1682
 #, c-format
 msgid "pgpipe: could not bind: error code %d\n"
 msgstr "pgpipe: konnte nicht binden: Fehlercode %d\n"
 
-#: parallel.c:1353
+#: parallel.c:1689
 #, c-format
 msgid "pgpipe: could not listen: error code %d\n"
 msgstr "pgpipe: konnte nicht auf Socket hören: Fehlercode %d\n"
 
-#: parallel.c:1360
+#: parallel.c:1696
 #, c-format
 msgid "pgpipe: getsockname() failed: error code %d\n"
 msgstr "pgpipe: getsockname() fehlgeschlagen: Fehlercode %d\n"
 
-#: parallel.c:1371
+#: parallel.c:1707
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d\n"
 msgstr "pgpipe: konnte zweites Socket nicht erzeugen: Fehlercode %d\n"
 
-#: parallel.c:1380
+#: parallel.c:1716
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d\n"
 msgstr "pgpipe: konnte Socket nicht verbinden: Fehlercode %d\n"
 
-#: parallel.c:1387
+#: parallel.c:1725
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d\n"
 msgstr "pgpipe: konnte Verbindung nicht annehmen: Fehlercode %d\n"
@@ -450,468 +440,458 @@
 msgid "archiver"
 msgstr "Archivierer"
 
-#: pg_backup_archiver.c:229 pg_backup_archiver.c:1499
+#: pg_backup_archiver.c:235 pg_backup_archiver.c:1576
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "konnte Ausgabedatei nicht schließen: %s\n"
 
-#: pg_backup_archiver.c:275 pg_backup_archiver.c:280
+#: pg_backup_archiver.c:281 pg_backup_archiver.c:286
 #, c-format
 msgid "WARNING: archive items not in correct section order\n"
 msgstr "WARNUNG: Archivelemente nicht in richtiger Abschnittsreihenfolge\n"
 
-#: pg_backup_archiver.c:286
+#: pg_backup_archiver.c:292
 #, c-format
 msgid "unexpected section code %d\n"
 msgstr "unerwarteter Abschnittscode %d\n"
 
-#: pg_backup_archiver.c:318
+#: pg_backup_archiver.c:324
 #, c-format
 msgid "-C and -1 are incompatible options\n"
 msgstr "-C und -1 sind inkompatible Optionen\n"
 
-#: pg_backup_archiver.c:328
+#: pg_backup_archiver.c:334
 #, c-format
 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:332
+#: pg_backup_archiver.c:338
 #, c-format
 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:350
+#: pg_backup_archiver.c:356
 #, c-format
 msgid "cannot restore from compressed archive (compression not supported in this installation)\n"
 msgstr "kann komprimiertes Archiv nicht wiederherstellen (Komprimierung in dieser Installation nicht unterstützt)\n"
 
-#: pg_backup_archiver.c:367
+#: pg_backup_archiver.c:373
 #, c-format
 msgid "connecting to database for restore\n"
 msgstr "verbinde mit der Datenbank zur Wiederherstellung\n"
 
-#: pg_backup_archiver.c:369
+#: pg_backup_archiver.c:375
 #, c-format
 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:414
+#: pg_backup_archiver.c:420
 #, c-format
 msgid "implied data-only restore\n"
 msgstr "implizit werden nur Daten wiederhergestellt\n"
 
-#: pg_backup_archiver.c:484
+#: pg_backup_archiver.c:490
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "entferne %s %s\n"
 
-#: pg_backup_archiver.c:637
-#, c-format
-msgid "setting owner and privileges for %s \"%s.%s\"\n"
-msgstr "setze Eigentümer und Privilegien für %s „%s.%s“\n"
-
-#: pg_backup_archiver.c:640
+#: pg_backup_archiver.c:583
 #, c-format
-msgid "setting owner and privileges for %s \"%s\"\n"
-msgstr "setze Eigentümer und Privilegien für %s „%s“\n"
+msgid "WARNING: could not find where to insert IF EXISTS in statement \"%s\"\n"
+msgstr "WARNUNG: konnte nicht bestimmen, wo IF EXISTS in die Anweisung »%s« eingefügt werden soll\n"
 
-#: pg_backup_archiver.c:706 pg_backup_archiver.c:708
+#: pg_backup_archiver.c:746 pg_backup_archiver.c:748
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "Warnung aus der ursprünglichen Ausgabedatei: %s\n"
 
-#: pg_backup_archiver.c:717
+#: pg_backup_archiver.c:760
 #, c-format
 msgid "creating %s \"%s.%s\"\n"
-msgstr "erstelle %s „%s.%s“\n"
+msgstr "erstelle %s »%s.%s«\n"
 
-#: pg_backup_archiver.c:720
+#: pg_backup_archiver.c:763
 #, c-format
 msgid "creating %s \"%s\"\n"
-msgstr "erstelle %s „%s“\n"
+msgstr "erstelle %s »%s«\n"
 
-#: pg_backup_archiver.c:765
+#: pg_backup_archiver.c:814
 #, c-format
 msgid "connecting to new database \"%s\"\n"
-msgstr "verbinde mit neuer Datenbank „%s“\n"
+msgstr "verbinde mit neuer Datenbank »%s«\n"
 
-#: pg_backup_archiver.c:793
+#: pg_backup_archiver.c:842
 #, c-format
 msgid "processing %s\n"
 msgstr "verarbeite %s\n"
 
-#: pg_backup_archiver.c:813
+#: pg_backup_archiver.c:862
 #, c-format
 msgid "processing data for table \"%s.%s\"\n"
-msgstr "verarbeite Daten für Tabelle „%s.%s“\n"
+msgstr "verarbeite Daten für Tabelle »%s.%s«\n"
 
-#: pg_backup_archiver.c:875
+#: pg_backup_archiver.c:924
 #, c-format
 msgid "executing %s %s\n"
 msgstr "führe %s %s aus\n"
 
-#: pg_backup_archiver.c:914
+#: pg_backup_archiver.c:963
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "schalte Trigger für %s aus\n"
 
-#: pg_backup_archiver.c:942
+#: pg_backup_archiver.c:991
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "schalte Trigger für %s ein\n"
 
-#: pg_backup_archiver.c:972
+#: pg_backup_archiver.c:1021
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine\n"
 msgstr "interner Fehler -- WriteData kann nicht außerhalb des Kontexts einer DataDumper-Routine aufgerufen werden\n"
 
-#: pg_backup_archiver.c:1137
+#: pg_backup_archiver.c:1214
 #, c-format
 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:1195
+#: pg_backup_archiver.c:1272
 #, 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:1216 pg_backup_tar.c:738
+#: pg_backup_archiver.c:1293 pg_backup_tar.c:750
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "Wiederherstellung von Large Object mit OID %u\n"
 
-#: pg_backup_archiver.c:1228
+#: pg_backup_archiver.c:1305
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "konnte Large Object %u nicht erstellen: %s"
 
-#: pg_backup_archiver.c:1233 pg_dump.c:2859
+#: pg_backup_archiver.c:1310 pg_dump.c:2914
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "konnte Large Object %u nicht öffnen: %s"
 
-#: pg_backup_archiver.c:1291
+#: pg_backup_archiver.c:1368
 #, c-format
 msgid "could not open TOC file \"%s\": %s\n"
-msgstr "konnte Inhaltsverzeichnisdatei „%s“ nicht öffnen: %s\n"
+msgstr "konnte Inhaltsverzeichnisdatei »%s« nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:1332
+#: pg_backup_archiver.c:1409
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "WARNUNG: Zeile ignoriert: %s\n"
 
-#: pg_backup_archiver.c:1339
+#: pg_backup_archiver.c:1416
 #, 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:1360 pg_backup_directory.c:230
+#: pg_backup_archiver.c:1437 pg_backup_directory.c:230
 #: pg_backup_directory.c:601
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "konnte Inhaltsverzeichnisdatei nicht finden: %s\n"
 
-#: pg_backup_archiver.c:1469 pg_backup_custom.c:162 pg_backup_directory.c:341
+#: pg_backup_archiver.c:1546 pg_backup_custom.c:162 pg_backup_directory.c:341
 #: pg_backup_directory.c:587 pg_backup_directory.c:645
 #: pg_backup_directory.c:665
 #, c-format
 msgid "could not open output file \"%s\": %s\n"
-msgstr "konnte Ausgabedatei „%s“ nicht öffnen: %s\n"
+msgstr "konnte Ausgabedatei »%s« nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:1472 pg_backup_custom.c:169
+#: pg_backup_archiver.c:1549 pg_backup_custom.c:169
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "konnte Ausgabedatei nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:1578
+#: pg_backup_archiver.c:1655
 #, 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:1584
+#: pg_backup_archiver.c:1661
 #, 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:1677
+#: pg_backup_archiver.c:1754
 #, c-format
 msgid "Error while INITIALIZING:\n"
 msgstr "Fehler in Phase INITIALIZING:\n"
 
-#: pg_backup_archiver.c:1682
+#: pg_backup_archiver.c:1759
 #, c-format
 msgid "Error while PROCESSING TOC:\n"
 msgstr "Fehler in Phase PROCESSING TOC:\n"
 
-#: pg_backup_archiver.c:1687
+#: pg_backup_archiver.c:1764
 #, c-format
 msgid "Error while FINALIZING:\n"
 msgstr "Fehler in Phase FINALIZING:\n"
 
-#: pg_backup_archiver.c:1692
+#: pg_backup_archiver.c:1769
 #, 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:1765
+#: pg_backup_archiver.c:1842
 #, c-format
 msgid "bad dumpId\n"
 msgstr "ungültige DumpId\n"
 
-#: pg_backup_archiver.c:1786
+#: pg_backup_archiver.c:1863
 #, c-format
 msgid "bad table dumpId for TABLE DATA item\n"
-msgstr "ungültige Tabellen-DumpId für „TABLE DATA“-Eintrag\n"
+msgstr "ungültige Tabellen-DumpId für »TABLE DATA«-Eintrag\n"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1955
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "unerwartete Datenoffsetmarkierung %d\n"
 
-#: pg_backup_archiver.c:1891
+#: pg_backup_archiver.c:1968
 #, c-format
 msgid "file offset in dump file is too large\n"
 msgstr "Dateioffset in Dumpdatei ist zu groß\n"
 
-#: pg_backup_archiver.c:2004
+#: pg_backup_archiver.c:2081
 #, c-format
 msgid "attempting to ascertain archive format\n"
 msgstr "versuche Archivformat zu ermitteln\n"
 
-#: pg_backup_archiver.c:2030 pg_backup_archiver.c:2040
+#: pg_backup_archiver.c:2107 pg_backup_archiver.c:2117
 #, c-format
 msgid "directory name too long: \"%s\"\n"
-msgstr "Verzeichnisname zu lang: „%s“\n"
+msgstr "Verzeichnisname zu lang: »%s«\n"
 
-#: pg_backup_archiver.c:2048
+#: pg_backup_archiver.c:2125
 #, c-format
 msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)\n"
-msgstr "Verzeichnis „%s“ scheint kein gültiges Archiv zu sein („toc.dat“ existiert nicht)\n"
+msgstr "Verzeichnis »%s« scheint kein gültiges Archiv zu sein (»toc.dat« existiert nicht)\n"
 
-#: pg_backup_archiver.c:2056 pg_backup_custom.c:181 pg_backup_custom.c:770
-#: pg_backup_directory.c:214 pg_backup_directory.c:402
+#: pg_backup_archiver.c:2133 pg_backup_custom.c:181 pg_backup_custom.c:770
+#: pg_backup_directory.c:214 pg_backup_directory.c:401
 #, c-format
 msgid "could not open input file \"%s\": %s\n"
-msgstr "konnte Eingabedatei „%s“ nicht öffnen: %s\n"
+msgstr "konnte Eingabedatei »%s« nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:2064 pg_backup_custom.c:188
+#: pg_backup_archiver.c:2141 pg_backup_custom.c:188
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "konnte Eingabedatei nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:2071
+#: pg_backup_archiver.c:2148
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "konnte Eingabedatei nicht lesen: %s\n"
 
-#: pg_backup_archiver.c:2073
+#: pg_backup_archiver.c:2150
 #, 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:2156
+#: pg_backup_archiver.c:2233
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql.\n"
 msgstr "Eingabedatei ist anscheinend ein Dump im Textformat. Bitte verwenden Sie psql.\n"
 
-#: pg_backup_archiver.c:2162
+#: pg_backup_archiver.c:2239
 #, c-format
 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:2168
+#: pg_backup_archiver.c:2245
 #, c-format
 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:2188
+#: pg_backup_archiver.c:2265
 #, c-format
 msgid "could not close input file: %s\n"
 msgstr "konnte Eingabedatei nicht schließen: %s\n"
 
-#: pg_backup_archiver.c:2205
+#: pg_backup_archiver.c:2282
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "erstelle AH für %s, Format %d\n"
 
-#: pg_backup_archiver.c:2310
+#: pg_backup_archiver.c:2387
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
-msgstr "nicht erkanntes Dateiformat „%d“\n"
+msgstr "nicht erkanntes Dateiformat »%d«\n"
 
-#: pg_backup_archiver.c:2460
+#: pg_backup_archiver.c:2543
 #, 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:2576
+#: pg_backup_archiver.c:2659
 #, 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:2610
+#: pg_backup_archiver.c:2693
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
-msgstr "nicht erkannte Kodierung „%s“\n"
+msgstr "nicht erkannte Kodierung »%s«\n"
 
-#: pg_backup_archiver.c:2615
+#: pg_backup_archiver.c:2698
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "ungültiger ENCODING-Eintrag: %s\n"
 
-#: pg_backup_archiver.c:2633
+#: pg_backup_archiver.c:2716
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "ungültiger STDSTRINGS-Eintrag: %s\n"
 
-#: pg_backup_archiver.c:2858
+#: pg_backup_archiver.c:2973
 #, c-format
 msgid "could not set session user to \"%s\": %s"
-msgstr "konnte Sitzungsbenutzer nicht auf „%s“ setzen: %s"
+msgstr "konnte Sitzungsbenutzer nicht auf »%s« setzen: %s"
 
-#: pg_backup_archiver.c:2890
+#: pg_backup_archiver.c:3005
 #, c-format
 msgid "could not set default_with_oids: %s"
 msgstr "konnte default_with_oids nicht setzen: %s"
 
-#: pg_backup_archiver.c:3030
+#: pg_backup_archiver.c:3150
 #, c-format
 msgid "could not set search_path to \"%s\": %s"
-msgstr "konnte search_path nicht auf „%s“ setzen: %s"
+msgstr "konnte search_path nicht auf »%s« setzen: %s"
 
-#: pg_backup_archiver.c:3092
+#: pg_backup_archiver.c:3212
 #, c-format
 msgid "could not set default_tablespace to %s: %s"
-msgstr "konnte default_tablespace nicht auf „%s“ setzen: %s"
+msgstr "konnte default_tablespace nicht auf »%s« setzen: %s"
 
-#: pg_backup_archiver.c:3179 pg_backup_archiver.c:3366
+#: pg_backup_archiver.c:3300 pg_backup_archiver.c:3490
 #, 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"
+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:3419
-#, c-format
-msgid "WARNING: requested compression not available in this installation -- archive will be uncompressed\n"
-msgstr "WARNUNG: Komprimierung ist in dieser Installation nicht verfügbar -- Archiv wird nicht komprimiert\n"
-
-#: pg_backup_archiver.c:3458
+#: pg_backup_archiver.c:3576
 #, c-format
 msgid "did not find magic string in file header\n"
 msgstr "magische Zeichenkette im Dateikopf nicht gefunden\n"
 
-#: pg_backup_archiver.c:3471
+#: pg_backup_archiver.c:3589
 #, 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:3476
+#: pg_backup_archiver.c:3594
 #, 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:3480
+#: pg_backup_archiver.c:3598
 #, c-format
 msgid "WARNING: archive was made on a machine with larger integers, some operations might fail\n"
 msgstr "WARNUNG: Archiv wurde auf einer Maschine mit größeren Integers erstellt; einige Operationen könnten fehlschlagen\n"
 
-#: pg_backup_archiver.c:3490
+#: pg_backup_archiver.c:3608
 #, 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:3506
+#: pg_backup_archiver.c:3624
 #, c-format
 msgid "WARNING: archive is compressed, but this installation does not support compression -- no data will be available\n"
 msgstr "WARNUNG: Archiv ist komprimiert, aber diese Installation unterstützt keine Komprimierung -- keine Daten verfügbar\n"
 
-#: pg_backup_archiver.c:3524
+#: pg_backup_archiver.c:3642
 #, c-format
 msgid "WARNING: invalid creation date in header\n"
 msgstr "WARNUNG: ungültiges Erstellungsdatum im Kopf\n"
 
-#: pg_backup_archiver.c:3599
+#: pg_backup_archiver.c:3715
 #, c-format
 msgid "entering restore_toc_entries_prefork\n"
 msgstr "Eintritt in restore_toc_entries_prefork\n"
 
-#: pg_backup_archiver.c:3643
+#: pg_backup_archiver.c:3778
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "verarbeite Element %d %s %s\n"
 
-#: pg_backup_archiver.c:3695
+#: pg_backup_archiver.c:3832
 #, c-format
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "Eintritt in restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3743
+#: pg_backup_archiver.c:3853
 #, c-format
 msgid "entering main parallel loop\n"
 msgstr "Eintritt in Hauptparallelschleife\n"
 
-#: pg_backup_archiver.c:3754
+#: pg_backup_archiver.c:3864
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "Element %d %s %s wird übersprungen\n"
 
-#: pg_backup_archiver.c:3764
+#: pg_backup_archiver.c:3874
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "starte Element %d %s %s\n"
 
-#: pg_backup_archiver.c:3822
+#: pg_backup_archiver.c:3955
 #, c-format
 msgid "finished main parallel loop\n"
 msgstr "Hauptparallelschleife beendet\n"
 
-#: pg_backup_archiver.c:3831
+#: pg_backup_archiver.c:3973
 #, c-format
 msgid "entering restore_toc_entries_postfork\n"
 msgstr "Eintritt in restore_toc_entries_postfork\n"
 
-#: pg_backup_archiver.c:3849
+#: pg_backup_archiver.c:3993
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "verarbeite verpasstes Element %d %s %s\n"
 
-#: pg_backup_archiver.c:3998
+#: pg_backup_archiver.c:4170
 #, c-format
 msgid "no item ready\n"
 msgstr "kein Element bereit\n"
 
-#: pg_backup_archiver.c:4047
+#: pg_backup_archiver.c:4218
 #, c-format
 msgid "could not find slot of finished worker\n"
 msgstr "konnte Slot des beendeten Arbeitsprozesses nicht finden\n"
 
-#: pg_backup_archiver.c:4049
+#: pg_backup_archiver.c:4220
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "Element %d %s %s abgeschlossen\n"
 
-#: pg_backup_archiver.c:4062
+#: pg_backup_archiver.c:4233
 #, c-format
 msgid "worker process failed: exit code %d\n"
 msgstr "Arbeitsprozess fehlgeschlagen: Code %d\n"
 
-#: pg_backup_archiver.c:4224
+#: pg_backup_archiver.c:4395
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "übertrage Abhängigkeit %d -> %d an %d\n"
 
-#: pg_backup_archiver.c:4297
+#: pg_backup_archiver.c:4468
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "reduziere Abhängigkeiten für %d\n"
 
-#: pg_backup_archiver.c:4336
+#: pg_backup_archiver.c:4516
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data\n"
-msgstr "Tabelle „%s“ konnte nicht erzeugt werden, ihre Daten werden nicht wiederhergestellt werden\n"
+msgstr "Tabelle »%s« konnte nicht erzeugt werden, ihre Daten werden nicht wiederhergestellt werden\n"
 
 #. translator: this is a module name
 #: pg_backup_custom.c:94
@@ -959,7 +939,7 @@
 msgstr "unerkannter Datenblocktyp %d beim Wiederherstellen des Archivs gefunden\n"
 
 #: pg_backup_custom.c:709 pg_backup_custom.c:759 pg_backup_custom.c:908
-#: pg_backup_tar.c:1087
+#: pg_backup_tar.c:1099
 #, c-format
 msgid "could not determine seek position in archive file: %s\n"
 msgstr "konnte Positionszeiger in Archivdatei nicht ermitteln: %s\n"
@@ -1000,104 +980,121 @@
 msgstr "WARNUNG: erwartete Dateiposition stimmt nicht mit ftell überein -- benutze ftell\n"
 
 #. translator: this is a module name
-#: pg_backup_db.c:29
+#: pg_backup_db.c:30
 msgid "archiver (db)"
 msgstr "Archivierer (DB)"
 
-#: pg_backup_db.c:44
+#: pg_backup_db.c:46
 #, c-format
 msgid "could not get server_version from libpq\n"
 msgstr "konnte server_version nicht von libpq ermitteln\n"
 
-#: pg_backup_db.c:55 pg_dumpall.c:1965
+#: pg_backup_db.c:57 pg_dumpall.c:1972
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "Version des Servers: %s; Version von %s: %s\n"
 
-#: pg_backup_db.c:57 pg_dumpall.c:1967
+#: pg_backup_db.c:59 pg_dumpall.c:1974
 #, c-format
 msgid "aborting because of server version mismatch\n"
 msgstr "Abbruch wegen unpassender Serverversion\n"
 
-#: pg_backup_db.c:128
+#: pg_backup_db.c:148
 #, c-format
 msgid "connecting to database \"%s\" as user \"%s\"\n"
-msgstr "verbinde mit Datenbank „%s“ als Benutzer „%s“\n"
+msgstr "verbinde mit Datenbank »%s« als Benutzer »%s«\n"
 
-#: pg_backup_db.c:135 pg_backup_db.c:183 pg_backup_db.c:243 pg_backup_db.c:285
-#: pg_dumpall.c:1795 pg_dumpall.c:1903
+#: pg_backup_db.c:155 pg_backup_db.c:207 pg_backup_db.c:269 pg_backup_db.c:311
+#: pg_dumpall.c:1798 pg_dumpall.c:1910
 msgid "Password: "
 msgstr "Passwort: "
 
-#: pg_backup_db.c:164
+#: pg_backup_db.c:188
 #, c-format
 msgid "failed to reconnect to database\n"
 msgstr "konnte nicht wieder zur Datenbank verbinden\n"
 
-#: pg_backup_db.c:169
+#: pg_backup_db.c:193
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "konnte nicht wieder zur Datenbank verbinden: %s"
 
-#: pg_backup_db.c:185
+#: pg_backup_db.c:209
 #, c-format
 msgid "connection needs password\n"
 msgstr "Verbindung benötigt Passwort\n"
 
-#: pg_backup_db.c:237
+#: pg_backup_db.c:263
 #, c-format
 msgid "already connected to a database\n"
 msgstr "bereits mit einer Datenbank verbunden\n"
 
-#: pg_backup_db.c:277
+#: pg_backup_db.c:303
 #, c-format
 msgid "failed to connect to database\n"
 msgstr "Verbinden zur Datenbank schlug fehl\n"
 
-#: pg_backup_db.c:294
+#: pg_backup_db.c:320
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
-msgstr "Verbindung zur Datenbank „%s“ fehlgeschlagen: %s"
+msgstr "Verbindung zur Datenbank »%s« fehlgeschlagen: %s"
+
+#: pg_backup_db.c:390
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: pg_backup_db.c:362
+#: pg_backup_db.c:397
 #, c-format
 msgid "query failed: %s"
 msgstr "Anfrage fehlgeschlagen: %s"
 
-#: pg_backup_db.c:364
+#: pg_backup_db.c:399
 #, c-format
 msgid "query was: %s\n"
 msgstr "Anfrage war: %s\n"
 
-#: pg_backup_db.c:428
+#: pg_backup_db.c:441
+#, 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_backup_db.c:486
 #, c-format
 msgid "%s: %s    Command was: %s\n"
 msgstr "%s: %s    Die Anweisung war: %s\n"
 
-#: pg_backup_db.c:484 pg_backup_db.c:558 pg_backup_db.c:565
+#: pg_backup_db.c:542 pg_backup_db.c:616 pg_backup_db.c:623
 msgid "could not execute query"
 msgstr "konnte Anfrage nicht ausführen"
 
-#: pg_backup_db.c:537
+#: pg_backup_db.c:595
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "Fehler in PQputCopyData: %s"
 
-#: pg_backup_db.c:586
+#: pg_backup_db.c:644
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "Fehler in PQputCopyEnd: %s"
 
-#: pg_backup_db.c:592
+#: pg_backup_db.c:650
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
-msgstr "COPY fehlgeschlagen für Tabelle „%s“: %s"
+msgstr "COPY fehlgeschlagen für Tabelle »%s«: %s"
+
+#: pg_backup_db.c:656 pg_dump.c:1700
+#, c-format
+msgid "WARNING: unexpected extra results during COPY of table \"%s\"\n"
+msgstr "WARNUNG: unerwartete zusätzliche Ergebnisse während COPY von Tabelle »%s«\n"
 
-#: pg_backup_db.c:605
+#: pg_backup_db.c:668
 msgid "could not start database transaction"
 msgstr "konnte Datenbanktransaktion nicht starten"
 
-#: pg_backup_db.c:613
+#: pg_backup_db.c:676
 msgid "could not commit database transaction"
 msgstr "konnte Datenbanktransaktion nicht beenden"
 
@@ -1114,42 +1111,48 @@
 #: pg_backup_directory.c:191
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht lesen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht lesen: %s\n"
 
 #: pg_backup_directory.c:195
 #, c-format
 msgid "could not close directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht schließen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht schließen: %s\n"
 
 #: pg_backup_directory.c:201
 #, c-format
 msgid "could not create directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht erzeugen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht erzeugen: %s\n"
+
+#: pg_backup_directory.c:360 pg_backup_directory.c:500
+#: pg_backup_directory.c:530
+#, c-format
+msgid "could not write to output file: %s\n"
+msgstr "konnte nicht in Ausgabedatei schreiben: %s\n"
 
-#: pg_backup_directory.c:413
+#: pg_backup_directory.c:414
 #, c-format
 msgid "could not close data file: %s\n"
 msgstr "konnte Datendatei nicht schließen: %s\n"
 
-#: pg_backup_directory.c:454
+#: pg_backup_directory.c:455
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %s\n"
-msgstr "konnte Large-Object-Inhaltsverzeichnisdatei „%s“ nicht zur Eingabe öffnen: %s\n"
+msgstr "konnte Large-Object-Inhaltsverzeichnisdatei »%s« nicht zur Eingabe öffnen: %s\n"
 
-#: pg_backup_directory.c:465
+#: pg_backup_directory.c:466
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\"\n"
-msgstr "ungültige Zeile in Large-Object-Inhaltsverzeichnisdatei „%s“: %s\n"
+msgstr "ungültige Zeile in Large-Object-Inhaltsverzeichnisdatei »%s«: %s\n"
 
-#: pg_backup_directory.c:474
+#: pg_backup_directory.c:475
 #, c-format
 msgid "error reading large object TOC file \"%s\"\n"
-msgstr "Fehler beim Lesen von Large-Object-Inhaltsverzeichnisdatei „%s“\n"
+msgstr "Fehler beim Lesen von Large-Object-Inhaltsverzeichnisdatei »%s«\n"
 
-#: pg_backup_directory.c:478
+#: pg_backup_directory.c:479
 #, c-format
 msgid "could not close large object TOC file \"%s\": %s\n"
-msgstr "konnte Large-Object-Inhaltsverzeichnisdatei „%s“ nicht schließen: %s\n"
+msgstr "konnte Large-Object-Inhaltsverzeichnisdatei »%s« nicht schließen: %s\n"
 
 #: pg_backup_directory.c:688
 #, c-format
@@ -1159,7 +1162,7 @@
 #: pg_backup_directory.c:720
 #, c-format
 msgid "file name too long: \"%s\"\n"
-msgstr "Dateiname zu lang: „%s“\n"
+msgstr "Dateiname zu lang: »%s«\n"
 
 #: pg_backup_directory.c:806
 #, c-format
@@ -1179,7 +1182,7 @@
 #: pg_backup_tar.c:182
 #, c-format
 msgid "could not open TOC file \"%s\" for output: %s\n"
-msgstr "konnte Inhaltsverzeichnisdatei „%s“ nicht zur Ausgabe öffnen: %s\n"
+msgstr "konnte Inhaltsverzeichnisdatei »%s« nicht zur Ausgabe öffnen: %s\n"
 
 #: pg_backup_tar.c:190
 #, c-format
@@ -1194,7 +1197,7 @@
 #: pg_backup_tar.c:219
 #, c-format
 msgid "could not open TOC file \"%s\" for input: %s\n"
-msgstr "konnte Inhaltsverzeichnisdatei „%s“ nicht zur Eingabe öffnen: %s\n"
+msgstr "konnte Inhaltsverzeichnisdatei »%s« nicht zur Eingabe öffnen: %s\n"
 
 #: pg_backup_tar.c:226
 #, c-format
@@ -1204,7 +1207,7 @@
 #: pg_backup_tar.c:353
 #, c-format
 msgid "could not find file \"%s\" in archive\n"
-msgstr "konnte Datei „%s“ nicht im Archiv finden\n"
+msgstr "konnte Datei »%s« nicht im Archiv finden\n"
 
 #: pg_backup_tar.c:419
 #, c-format
@@ -1221,69 +1224,69 @@
 msgid "could not close tar member\n"
 msgstr "konnte Tar-Mitglied nicht schließen\n"
 
-#: pg_backup_tar.c:570
+#: pg_backup_tar.c:582
 #, c-format
 msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
 msgstr "interner Fehler -- weder th noch fh in tarReadRaw() angegeben\n"
 
-#: pg_backup_tar.c:693
+#: pg_backup_tar.c:705
 #, c-format
 msgid "unexpected COPY statement syntax: \"%s\"\n"
-msgstr "unerwartete Syntax der COPY-Anweisung: „%s“\n"
+msgstr "unerwartete Syntax der COPY-Anweisung: »%s«\n"
 
-#: pg_backup_tar.c:959
+#: pg_backup_tar.c:971
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "Large Object hat ungültige Oid (%u)\n"
 
-#: pg_backup_tar.c:1103
+#: pg_backup_tar.c:1115
 #, c-format
 msgid "could not close temporary file: %s\n"
 msgstr "konnte temporäre Datei nicht schließen: %s\n"
 
-#: pg_backup_tar.c:1113
+#: pg_backup_tar.c:1125
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr "tatsächliche Dateilänge (%s) stimmt nicht mit erwarteter Länge (%s) überein\n"
 
-#: pg_backup_tar.c:1150
+#: pg_backup_tar.c:1162
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "bewege Position von %s auf nächstes Mitglied bei Position %s\n"
 
-#: pg_backup_tar.c:1161
+#: pg_backup_tar.c:1173
 #, c-format
 msgid "now at file position %s\n"
 msgstr "jetzt bei Dateiposition %s\n"
 
-#: pg_backup_tar.c:1170 pg_backup_tar.c:1200
+#: pg_backup_tar.c:1182 pg_backup_tar.c:1212
 #, c-format
 msgid "could not find header for file \"%s\" in tar archive\n"
-msgstr "konnte Kopf für Datei „%s“ im Tar-Archiv nicht finden\n"
+msgstr "konnte Kopf für Datei »%s« im Tar-Archiv nicht finden\n"
 
-#: pg_backup_tar.c:1184
+#: pg_backup_tar.c:1196
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "Tar-Mitglied %s übersprungen\n"
 
-#: pg_backup_tar.c:1188
+#: pg_backup_tar.c:1200
 #, 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 "Ausgabe der Daten in anderer Reihenfolge wird in diesem Archivformat nicht unterstützt: „%s“ wird benötigt, aber es kommt vor „%s“ in der Archivdatei.\n"
+msgstr "Ausgabe der Daten in anderer Reihenfolge wird in diesem Archivformat nicht unterstützt: »%s« wird benötigt, aber es kommt vor »%s« in der Archivdatei.\n"
 
-#: pg_backup_tar.c:1234
+#: pg_backup_tar.c:1246
 #, c-format
 msgid "incomplete tar header found (%lu byte)\n"
 msgid_plural "incomplete tar header found (%lu bytes)\n"
 msgstr[0] "unvollständiger Tar-Dateikopf gefunden (%lu Byte)\n"
 msgstr[1] "unvollständiger Tar-Dateikopf gefunden (%lu Bytes)\n"
 
-#: pg_backup_tar.c:1275
+#: pg_backup_tar.c:1287
 #, c-format
 msgid "TOC Entry %s at %s (length %s, checksum %d)\n"
 msgstr "Inhaltsverzeichniseintrag %s bei %s (Länge %s, Prüfsumme %d)\n"
 
-#: pg_backup_tar.c:1286
+#: pg_backup_tar.c:1298
 #, c-format
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
 msgstr "beschädigter Tar-Kopf in %s gefunden (%d erwartet, %d berechnet), Dateiposition %s\n"
@@ -1291,66 +1294,71 @@
 #: pg_backup_utils.c:54
 #, c-format
 msgid "%s: unrecognized section name: \"%s\"\n"
-msgstr "%s: unbekannter Abschnittsname: „%s“\n"
+msgstr "%s: unbekannter Abschnittsname: »%s«\n"
 
-#: pg_backup_utils.c:56 pg_dump.c:524 pg_dump.c:541 pg_dumpall.c:300
-#: pg_dumpall.c:310 pg_dumpall.c:320 pg_dumpall.c:329 pg_dumpall.c:345
-#: pg_dumpall.c:403 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
+#: pg_backup_utils.c:56 pg_dump.c:526 pg_dump.c:543 pg_dumpall.c:298
+#: pg_dumpall.c:308 pg_dumpall.c:318 pg_dumpall.c:327 pg_dumpall.c:343
+#: pg_dumpall.c:401 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
-#: pg_backup_utils.c:101
+#: pg_backup_utils.c:118
 #, c-format
 msgid "out of on_exit_nicely slots\n"
 msgstr "on_exit_nicely-Slots aufgebraucht\n"
 
-#: pg_dump.c:494
+#: pg_dump.c:496
 #, c-format
 msgid "compression level must be in range 0..9\n"
 msgstr "Komprimierungsniveau muss im Bereich 0..9 sein\n"
 
-#: pg_dump.c:539 pg_dumpall.c:308 pg_restore.c:291
+#: pg_dump.c:541 pg_dumpall.c:306 pg_restore.c:291
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: zu viele Kommandozeilenargumente (das erste ist „%s“)\n"
+msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
-#: pg_dump.c:552
+#: pg_dump.c:554
 #, c-format
 msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
 msgstr "Optionen -s/--schema-only und -a/--data-only können nicht zusammen verwendet werden\n"
 
-#: pg_dump.c:558
+#: pg_dump.c:560
 #, c-format
 msgid "options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "Optionen -c/--clean und -a/--data-only können nicht zusammen verwendet werden\n"
 
-#: pg_dump.c:564
+#: pg_dump.c:566
 #, c-format
 msgid "options --inserts/--column-inserts and -o/--oids cannot be used together\n"
 msgstr "Optionen --inserts/--column-inserts und -o/--oids können nicht zusammen verwendet werden\n"
 
-#: pg_dump.c:565
+#: pg_dump.c:567
 #, c-format
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(Die INSERT-Anweisung kann OIDs nicht setzen.)\n"
 
-#: pg_dump.c:570
+#: pg_dump.c:572
 #, c-format
 msgid "option --if-exists requires option -c/--clean\n"
 msgstr "Option --if-exists benötigt Option -c/--clean\n"
 
-#: pg_dump.c:598
+#: pg_dump.c:594
 #, c-format
-msgid "%s: invalid number of parallel jobs\n"
-msgstr "%s: ungültige Anzahl paralleler Jobs\n"
+msgid "WARNING: requested compression not available in this installation -- archive will be uncompressed\n"
+msgstr "WARNUNG: Komprimierung ist in dieser Installation nicht verfügbar -- Archiv wird nicht komprimiert\n"
+
+#: pg_dump.c:609
+#, c-format
+msgid "invalid number of parallel jobs\n"
+msgstr "ungültige Anzahl paralleler Jobs\n"
 
-#: pg_dump.c:602
+#: pg_dump.c:613
 #, c-format
 msgid "parallel backup only supported by the directory format\n"
-msgstr "parallele Sicherung wird nur vom Ausgabeformat „Verzeichnis“ unterstützt\n"
+msgstr "parallele Sicherung wird nur vom Ausgabeformat »Verzeichnis« unterstützt\n"
 
-#: pg_dump.c:671
+#: pg_dump.c:670
 #, c-format
 msgid ""
 "Synchronized snapshots are not supported by this server version.\n"
@@ -1361,27 +1369,27 @@
 "Verwenden Sie --no-synchronized-snapshots, wenn Sie keine synchronisierten\n"
 "Snapshots benötigen.\n"
 
-#: pg_dump.c:678
+#: pg_dump.c:677
 #, c-format
 msgid "Exported snapshots are not supported by this server version.\n"
 msgstr "Exportierte Snapshots werden in dieser Serverversion nicht unterstützt.\n"
 
-#: pg_dump.c:689
+#: pg_dump.c:696
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "letzte eingebaute OID ist %u\n"
 
-#: pg_dump.c:698
+#: pg_dump.c:704
 #, c-format
 msgid "No matching schemas were found\n"
 msgstr "Keine passenden Schemas gefunden\n"
 
-#: pg_dump.c:710
+#: pg_dump.c:716
 #, c-format
 msgid "No matching tables were found\n"
 msgstr "Keine passenden Tabellen gefunden\n"
 
-#: pg_dump.c:867
+#: pg_dump.c:882
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -1390,17 +1398,17 @@
 "%s gibt eine Datenbank als Textdatei oder in anderen Formaten aus.\n"
 "\n"
 
-#: pg_dump.c:868 pg_dumpall.c:548 pg_restore.c:434
+#: pg_dump.c:883 pg_dumpall.c:546 pg_restore.c:440
 #, c-format
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
-#: pg_dump.c:869
+#: pg_dump.c:884
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [DBNAME]\n"
 
-#: pg_dump.c:871 pg_dumpall.c:551 pg_restore.c:437
+#: pg_dump.c:886 pg_dumpall.c:549 pg_restore.c:443
 #, c-format
 msgid ""
 "\n"
@@ -1409,12 +1417,12 @@
 "\n"
 "Allgemeine Optionen:\n"
 
-#: pg_dump.c:872
+#: pg_dump.c:887
 #, 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:873
+#: pg_dump.c:888
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1423,37 +1431,37 @@
 "  -F, --format=c|d|t|p         Ausgabeformat (custom, d=Verzeichnis, tar,\n"
 "                               plain text)\n"
 
-#: pg_dump.c:875
+#: pg_dump.c:890
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr "  -j, --jobs=NUM               so viele parallele Jobs zur Sicherung verwenden\n"
 
-#: pg_dump.c:876
+#: pg_dump.c:891 pg_dumpall.c:551
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
-msgstr "  -v, --verbose                „Verbose“-Modus\n"
+msgstr "  -v, --verbose                »Verbose«-Modus\n"
 
-#: pg_dump.c:877 pg_dumpall.c:553
+#: pg_dump.c:892 pg_dumpall.c:552
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                Versionsinformationen anzeigen, dann beenden\n"
 
-#: pg_dump.c:878
+#: pg_dump.c:893
 #, 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:879 pg_dumpall.c:554
+#: pg_dump.c:894 pg_dumpall.c:553
 #, 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:880 pg_dumpall.c:555
+#: pg_dump.c:895 pg_dumpall.c:554
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_dump.c:882 pg_dumpall.c:556
+#: pg_dump.c:897 pg_dumpall.c:555
 #, c-format
 msgid ""
 "\n"
@@ -1462,109 +1470,109 @@
 "\n"
 "Optionen die den Inhalt der Ausgabe kontrollieren:\n"
 
-#: pg_dump.c:883 pg_dumpall.c:557
+#: pg_dump.c:898 pg_dumpall.c:556
 #, 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:884
+#: pg_dump.c:899
 #, c-format
 msgid "  -b, --blobs                  include large objects in dump\n"
 msgstr "  -b, --blobs                  Large Objects mit ausgeben\n"
 
-#: pg_dump.c:885 pg_restore.c:448
+#: pg_dump.c:900 pg_restore.c:454
 #, c-format
 msgid "  -c, --clean                  clean (drop) database objects before recreating\n"
 msgstr "  -c, --clean                  Datenbankobjekte vor der Wiedererstellung löschen\n"
 
-#: pg_dump.c:886
+#: pg_dump.c:901
 #, c-format
 msgid "  -C, --create                 include commands to create database in dump\n"
 msgstr ""
 "  -C, --create                 Anweisungen zum Erstellen der Datenbank in\n"
 "                               Ausgabe einfügen\n"
 
-#: pg_dump.c:887
+#: pg_dump.c:902
 #, c-format
 msgid "  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=KODIERUNG     Daten in Kodierung KODIERUNG ausgeben\n"
 
-#: pg_dump.c:888
+#: pg_dump.c:903
 #, 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:889
+#: pg_dump.c:904
 #, 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:890 pg_dumpall.c:560
+#: pg_dump.c:905 pg_dumpall.c:559
 #, c-format
 msgid "  -o, --oids                   include OIDs in dump\n"
 msgstr "  -o, --oids                   OIDs mit ausgeben\n"
 
-#: pg_dump.c:891
+#: pg_dump.c:906
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
 "                               plain-text format\n"
 msgstr ""
 "  -O, --no-owner               Wiederherstellung der Objekteigentümerschaft im\n"
-"                               „plain text“-Format auslassen\n"
+"                               »plain text«-Format auslassen\n"
 
-#: pg_dump.c:893 pg_dumpall.c:563
+#: pg_dump.c:908 pg_dumpall.c:562
 #, 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:894
+#: pg_dump.c:909
 #, 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"
+msgstr "  -S, --superuser=NAME         Superusername für »plain text«-Format\n"
 
-#: pg_dump.c:895
+#: pg_dump.c:910
 #, 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:896
+#: pg_dump.c:911
 #, 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:897 pg_dumpall.c:566
+#: pg_dump.c:912 pg_dumpall.c:565
 #, 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:898 pg_dumpall.c:567
+#: pg_dump.c:913 pg_dumpall.c:566
 #, 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:899 pg_dumpall.c:568
+#: pg_dump.c:914 pg_dumpall.c:567
 #, c-format
 msgid "  --column-inserts             dump data as INSERT commands with column names\n"
 msgstr ""
 "  --column-inserts             Daten als INSERT-Anweisungen mit Spaltennamen\n"
 "                               ausgeben\n"
 
-#: pg_dump.c:900 pg_dumpall.c:569
+#: pg_dump.c:915 pg_dumpall.c:568
 #, c-format
 msgid "  --disable-dollar-quoting     disable dollar quoting, use SQL standard quoting\n"
 msgstr ""
 "  --disable-dollar-quoting     Dollar-Quoting abschalten, normales SQL-Quoting\n"
 "                               verwenden\n"
 
-#: pg_dump.c:901 pg_dumpall.c:570 pg_restore.c:464
+#: pg_dump.c:916 pg_dumpall.c:569 pg_restore.c:470
 #, c-format
 msgid "  --disable-triggers           disable triggers during data-only restore\n"
 msgstr ""
 "  --disable-triggers           Trigger während der Datenwiederherstellung\n"
 "                               abschalten\n"
 
-#: pg_dump.c:902
+#: pg_dump.c:917
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user has\n"
@@ -1573,68 +1581,68 @@
 "  --enable-row-security        Sicherheit auf Zeilenebene einschalten (nur Daten\n"
 "                               ausgeben, auf die der Benutzer Zugriff hat)\n"
 
-#: pg_dump.c:904
+#: pg_dump.c:919
 #, c-format
 msgid "  --exclude-table-data=TABLE   do NOT dump data for the named table(s)\n"
 msgstr "  --exclude-table-data=TABELLE Daten der angegebenen Tabelle(n) NICHT ausgeben\n"
 
-#: pg_dump.c:905 pg_dumpall.c:571 pg_restore.c:466
+#: pg_dump.c:920 pg_dumpall.c:570 pg_restore.c:472
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr "  --if-exists                  IF EXISTS verwenden, wenn Objekte gelöscht werden\n"
 
-#: pg_dump.c:906 pg_dumpall.c:572
+#: pg_dump.c:921 pg_dumpall.c:571
 #, c-format
 msgid "  --inserts                    dump data as INSERT commands, rather than COPY\n"
 msgstr "  --inserts                    Daten als INSERT-Anweisungen statt COPY ausgeben\n"
 
-#: pg_dump.c:907 pg_dumpall.c:573
+#: pg_dump.c:922 pg_dumpall.c:572
 #, 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:908
+#: pg_dump.c:923
 #, c-format
 msgid "  --no-synchronized-snapshots  do not use synchronized snapshots in parallel jobs\n"
 msgstr ""
 "  --no-synchronized-snapshots  keine synchronisierten Snapshots in parallelen\n"
 "                               Jobs verwenden\n"
 
-#: pg_dump.c:909 pg_dumpall.c:574
+#: pg_dump.c:924 pg_dumpall.c:573
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             Tablespace-Zuordnungen nicht ausgeben\n"
 
-#: pg_dump.c:910 pg_dumpall.c:575
+#: pg_dump.c:925 pg_dumpall.c:574
 #, c-format
 msgid "  --no-unlogged-table-data     do not dump unlogged table data\n"
 msgstr "  --no-unlogged-table-data     Daten in ungeloggten Tabellen nicht ausgeben\n"
 
-#: pg_dump.c:911 pg_dumpall.c:576
+#: pg_dump.c:926 pg_dumpall.c:575
 #, c-format
 msgid "  --quote-all-identifiers      quote all identifiers, even if not key words\n"
 msgstr ""
 "  --quote-all-identifiers      alle Bezeichner in Anführungszeichen, selbst wenn\n"
 "                               kein Schlüsselwort\n"
 
-#: pg_dump.c:912
+#: pg_dump.c:927
 #, c-format
 msgid "  --section=SECTION            dump named section (pre-data, data, or post-data)\n"
 msgstr ""
 "  --section=ABSCHNITT          angegebenen Abschnitt ausgeben (pre-data, data\n"
 "                               oder post-data)\n"
 
-#: pg_dump.c:913
+#: pg_dump.c:928
 #, c-format
 msgid "  --serializable-deferrable    wait until the dump can run without anomalies\n"
 msgstr "  --serializable-deferrable    warten bis der Dump ohne Anomalien laufen kann\n"
 
-#: pg_dump.c:914
+#: pg_dump.c:929
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr "  --snapshot=SNAPSHOT          angegebenen Snapshot für den Dump verwenden\n"
 
-#: pg_dump.c:915 pg_dumpall.c:577 pg_restore.c:472
+#: pg_dump.c:930 pg_dumpall.c:576 pg_restore.c:478
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1646,7 +1654,7 @@
 "                               OWNER Befehle verwenden, um Eigentümerschaft zu\n"
 "                               setzen\n"
 
-#: pg_dump.c:919 pg_dumpall.c:581 pg_restore.c:476
+#: pg_dump.c:934 pg_dumpall.c:580 pg_restore.c:482
 #, c-format
 msgid ""
 "\n"
@@ -1655,42 +1663,42 @@
 "\n"
 "Verbindungsoptionen:\n"
 
-#: pg_dump.c:920
+#: pg_dump.c:935
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=DBNAME      auszugebende Datenbank\n"
 
-#: pg_dump.c:921 pg_dumpall.c:583 pg_restore.c:477
+#: pg_dump.c:936 pg_dumpall.c:582 pg_restore.c:483
 #, 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:922 pg_dumpall.c:585 pg_restore.c:478
+#: pg_dump.c:937 pg_dumpall.c:584 pg_restore.c:484
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT          Portnummer des Datenbankservers\n"
 
-#: pg_dump.c:923 pg_dumpall.c:586 pg_restore.c:479
+#: pg_dump.c:938 pg_dumpall.c:585 pg_restore.c:485
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NAME      Datenbankbenutzername\n"
 
-#: pg_dump.c:924 pg_dumpall.c:587 pg_restore.c:480
+#: pg_dump.c:939 pg_dumpall.c:586 pg_restore.c:486
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        niemals nach Passwort fragen\n"
 
-#: pg_dump.c:925 pg_dumpall.c:588 pg_restore.c:481
+#: pg_dump.c:940 pg_dumpall.c:587 pg_restore.c:487
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W, --password           nach Passwort fragen (sollte automatisch geschehen)\n"
 
-#: pg_dump.c:926 pg_dumpall.c:589
+#: pg_dump.c:941 pg_dumpall.c:588
 #, 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:928
+#: pg_dump.c:943
 #, c-format
 msgid ""
 "\n"
@@ -1703,367 +1711,376 @@
 "PGDATABASE verwendet.\n"
 "\n"
 
-#: pg_dump.c:930 pg_dumpall.c:593 pg_restore.c:488
+#: pg_dump.c:945 pg_dumpall.c:592 pg_restore.c:494
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:950
+#: pg_dump.c:962
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
-msgstr "ungültige Clientkodierung „%s“ angegeben\n"
+msgstr "ungültige Clientkodierung »%s« angegeben\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1102
+#, c-format
+msgid ""
+"Synchronized snapshots are not supported on standby servers.\n"
+"Run with --no-synchronized-snapshots instead if you do not need\n"
+"synchronized snapshots.\n"
+msgstr ""
+"Synchronisierte Snapshots werden auf Standby-Servern nicht unterstützt.\n"
+"Verwenden Sie --no-synchronized-snapshots, wenn Sie keine synchronisierten\n"
+"Snapshots benötigen.\n"
+
+#: pg_dump.c:1171
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
-msgstr "ungültiges Ausgabeformat „%s“ angegeben\n"
+msgstr "ungültiges Ausgabeformat »%s« angegeben\n"
 
-#: pg_dump.c:1157
+#: pg_dump.c:1193
 #, c-format
 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:1521
+#: pg_dump.c:1557
 #, c-format
 msgid "dumping contents of table \"%s.%s\"\n"
-msgstr "gebe Inhalt der Tabelle „%s.%s“ aus\n"
+msgstr "gebe Inhalt der Tabelle »%s.%s« aus\n"
 
-#: pg_dump.c:1645
+#: pg_dump.c:1681
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
-msgstr "Ausgabe des Inhalts der Tabelle „%s“ fehlgeschlagen: PQgetCopyData() fehlgeschlagen.\n"
+msgstr "Ausgabe des Inhalts der Tabelle »%s« fehlgeschlagen: PQgetCopyData() fehlgeschlagen.\n"
 
-#: pg_dump.c:1646 pg_dump.c:1656
+#: pg_dump.c:1682 pg_dump.c:1692
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Fehlermeldung vom Server: %s"
 
-#: pg_dump.c:1647 pg_dump.c:1657
+#: pg_dump.c:1683 pg_dump.c:1693
 #, c-format
 msgid "The command was: %s\n"
 msgstr "Die Anweisung war: %s\n"
 
-#: pg_dump.c:1655
+#: pg_dump.c:1691
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed.\n"
-msgstr "Ausgabe des Inhalts der Tabelle „%s“ fehlgeschlagen: PQgetResult() fehlgeschlagen.\n"
+msgstr "Ausgabe des Inhalts der Tabelle »%s« fehlgeschlagen: PQgetResult() fehlgeschlagen.\n"
 
-#: pg_dump.c:2297
+#: pg_dump.c:2338
 #, c-format
 msgid "saving database definition\n"
 msgstr "sichere Datenbankdefinition\n"
 
-#: pg_dump.c:2630
+#: pg_dump.c:2672
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "sichere Kodierung = %s\n"
 
-#: pg_dump.c:2657
+#: pg_dump.c:2699
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "sichere standard_conforming_strings = %s\n"
 
-#: pg_dump.c:2690
+#: pg_dump.c:2732
 #, c-format
 msgid "reading large objects\n"
 msgstr "lese Large Objects\n"
 
-#: pg_dump.c:2822
+#: pg_dump.c:2877
 #, c-format
 msgid "saving large objects\n"
 msgstr "sichere Large Objects\n"
 
-#: pg_dump.c:2869
+#: pg_dump.c:2924
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "Fehler beim Lesen von Large Object %u: %s"
 
-#: pg_dump.c:2921
+#: pg_dump.c:2976
 #, c-format
 msgid "reading row security enabled for table \"%s.%s\"\n"
-msgstr "lese Einstellung von Sicherheit auf Zeilenebene für Tabelle „%s.%s“\n"
+msgstr "lese Einstellung von Sicherheit auf Zeilenebene für Tabelle »%s.%s«\n"
 
-#: pg_dump.c:2952
+#: pg_dump.c:3007
 #, c-format
 msgid "reading policies for table \"%s.%s\"\n"
-msgstr "lese Policys von Tabelle „%s.%s“\n"
+msgstr "lese Policys von Tabelle »%s.%s«\n"
 
-#: pg_dump.c:3083
+#: pg_dump.c:3138
 #, c-format
 msgid "unexpected policy command type: \"%s\"\n"
-msgstr "unerwarteter Policy-Befehlstyp: „%s“\n"
+msgstr "unerwarteter Policy-Befehlstyp: »%s«\n"
 
-#: pg_dump.c:3298
+#: pg_dump.c:3353
 #, c-format
 msgid "could not find parent extension for %s\n"
 msgstr "konnte Erweiterung, zu der %s gehört, nicht finden\n"
 
-#: pg_dump.c:3402
+#: pg_dump.c:3457
 #, 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"
+msgstr "WARNUNG: Eigentümer des Schemas »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:3445
+#: pg_dump.c:3500
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "Schema mit OID %u existiert nicht\n"
 
-#: pg_dump.c:3797
+#: pg_dump.c:3852
 #, 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"
+msgstr "WARNUNG: Eigentümer des Datentypen »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:3909
+#: pg_dump.c:3964
 #, 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"
+msgstr "WARNUNG: Eigentümer des Operatoren »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:4171
+#: pg_dump.c:4226
 #, 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"
+msgstr "WARNUNG: Eigentümer der Operatorklasse »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:4260
+#: pg_dump.c:4315
 #, 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"
+msgstr "WARNUNG: Eigentümer der Operatorfamilie »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:4399
+#: pg_dump.c:4454
 #, 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"
+msgstr "WARNUNG: Eigentümer der Aggregatfunktion »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:4582
+#: pg_dump.c:4657
 #, 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"
+msgstr "WARNUNG: Eigentümer der Funktion »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:5270
+#: pg_dump.c:5345
 #, 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"
+msgstr "WARNUNG: Eigentümer der Tabelle »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:5422
+#: pg_dump.c:5497
 #, c-format
 msgid "reading indexes for table \"%s.%s\"\n"
-msgstr "lese Indexe von Tabelle „%s.%s“\n"
+msgstr "lese Indexe von Tabelle »%s.%s«\n"
 
-#: pg_dump.c:5789
+#: pg_dump.c:5864
 #, c-format
 msgid "reading foreign key constraints for table \"%s.%s\"\n"
-msgstr "lese Fremdschlüssel-Constraints von Tabelle „%s.%s“\n"
+msgstr "lese Fremdschlüssel-Constraints von Tabelle »%s.%s«\n"
 
-#: pg_dump.c:6035
+#: pg_dump.c:6110
 #, c-format
 msgid "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not found\n"
 msgstr "Sanity-Check fehlgeschlagen, Elterntabelle %u von pg_rewrite-Eintrag OID %u nicht gefunden\n"
 
-#: pg_dump.c:6128
+#: pg_dump.c:6203
 #, c-format
 msgid "reading triggers for table \"%s.%s\"\n"
-msgstr "lese Trigger von Tabelle „%s.%s“\n"
+msgstr "lese Trigger von Tabelle »%s.%s«\n"
 
-#: pg_dump.c:6293
+#: pg_dump.c:6368
 #, c-format
 msgid "query produced null referenced table name for foreign key trigger \"%s\" on table \"%s\" (OID of table: %u)\n"
-msgstr "Anfrage ergab NULL als Name der Tabelle auf die sich Fremdschlüssel-Trigger „%s“ von Tabelle „%s“ bezieht (OID der Tabelle: %u)\n"
+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:6879
+#: pg_dump.c:6954
 #, c-format
 msgid "finding the columns and types of table \"%s.%s\"\n"
-msgstr "finde Spalten und Typen von Tabelle „%s.%s“\n"
+msgstr "finde Spalten und Typen von Tabelle »%s.%s«\n"
 
-#: pg_dump.c:7058
+#: pg_dump.c:7133
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
-msgstr "ungültige Spaltennummerierung in Tabelle „%s“\n"
+msgstr "ungültige Spaltennummerierung in Tabelle »%s«\n"
 
-#: pg_dump.c:7092
+#: pg_dump.c:7167
 #, c-format
 msgid "finding default expressions of table \"%s.%s\"\n"
-msgstr "finde DEFAULT-Ausdrücke von Tabelle „%s.%s“\n"
+msgstr "finde DEFAULT-Ausdrücke von Tabelle »%s.%s«\n"
 
-#: pg_dump.c:7145
+#: pg_dump.c:7220
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
-msgstr "ungültiger adnum-Wert %d für Tabelle „%s“\n"
+msgstr "ungültiger adnum-Wert %d für Tabelle »%s«\n"
 
-#: pg_dump.c:7217
+#: pg_dump.c:7292
 #, c-format
 msgid "finding check constraints for table \"%s.%s\"\n"
-msgstr "finde Check-Constraints für Tabelle „%s.%s“\n"
+msgstr "finde Check-Constraints für Tabelle »%s.%s«\n"
 
-#: pg_dump.c:7313
+#: pg_dump.c:7388
 #, 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:7317
+#: pg_dump.c:7392
 #, c-format
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(Die Systemkataloge sind wahrscheinlich verfälscht.)\n"
 
-#: pg_dump.c:8707
+#: pg_dump.c:8783
 #, c-format
 msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
-msgstr "WARNUNG: typtype des Datentypen „%s“ scheint ungültig zu sein\n"
+msgstr "WARNUNG: typtype des Datentypen »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:10203
+#: pg_dump.c:10279
 #, c-format
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "WARNUNG: unsinniger Wert in proargmodes-Array\n"
 
-#: pg_dump.c:10555
+#: pg_dump.c:10631
 #, c-format
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "WARNUNG: konnte proallargtypes-Array nicht interpretieren\n"
 
-#: pg_dump.c:10571
+#: pg_dump.c:10647
 #, c-format
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "WARNUNG: konnte proargmodes-Array nicht interpretieren\n"
 
-#: pg_dump.c:10585
+#: pg_dump.c:10661
 #, c-format
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "WARNUNG: konnte proargnames-Array nicht interpretieren\n"
 
-#: pg_dump.c:10596
+#: pg_dump.c:10672
 #, c-format
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "WARNUNG: konnte proconfig-Array nicht interpretieren\n"
 
-#: pg_dump.c:10667
+#: pg_dump.c:10743
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
-msgstr "ungültiger provolatile-Wert für Funktion „%s“\n"
+msgstr "ungültiger provolatile-Wert für Funktion »%s«\n"
+
+#: pg_dump.c:10876 pg_dump.c:10981 pg_dump.c:10988
+#, c-format
+msgid "could not find function definition for function with OID %u\n"
+msgstr "konnte Funktionsdefinition für Funktion mit OID %u nicht finden\n"
 
-#: pg_dump.c:10844
+#: pg_dump.c:10921
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
 msgstr "WARNUNG: unsinniger Wert in Feld pg_cast.castfunc oder pg_cast.castmethod\n"
 
-#: pg_dump.c:10847
+#: pg_dump.c:10924
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "WARNUNG: unsinniger Wert in Feld pg_cast.castmethod\n"
 
-#: pg_dump.c:10931
+#: pg_dump.c:11010
 #, c-format
 msgid "WARNING: bogus transform definition, at least one of trffromsql and trftosql should be nonzero\n"
 msgstr "WARNUNG: unsinnige Transformationsdefinition, mindestens eins von trffromsql und trftosql sollte nicht null sein\n"
 
-#: pg_dump.c:10948
+#: pg_dump.c:11027
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trffromsql field\n"
 msgstr "WARNUNG: unsinniger Wert in Feld pg_transform.trffromsql\n"
 
-#: pg_dump.c:10969
+#: pg_dump.c:11048
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trftosql field\n"
 msgstr "WARNUNG: unsinniger Wert in Feld pg_transform.trftosql\n"
 
-#: pg_dump.c:11356
+#: pg_dump.c:11435
 #, 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:12536
+#: pg_dump.c:12582
 #, c-format
 msgid "WARNING: aggregate function %s could not be dumped correctly for this database version; ignored\n"
 msgstr "WARNUNG: Aggregatfunktion %s konnte für diese Datenbankversion nicht korrekt ausgegeben werden - ignoriert\n"
 
-#: pg_dump.c:13360
+#: pg_dump.c:13406
 #, c-format
 msgid "unrecognized object type in default privileges: %d\n"
 msgstr "unbekannter Objekttyp in den Vorgabeprivilegien: %d\n"
 
-#: pg_dump.c:13375
+#: pg_dump.c:13421
 #, c-format
 msgid "could not parse default ACL list (%s)\n"
 msgstr "konnte Vorgabe-ACL-Liste (%s) nicht interpretieren\n"
 
-#: pg_dump.c:13431
+#: pg_dump.c:13477
 #, 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"
+msgstr "konnte ACL-Zeichenkette (%s) für Objekt »%s« (%s) nicht interpretieren\n"
 
-#: pg_dump.c:13852
+#: pg_dump.c:13899
 #, 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"
+msgstr "Anfrage um die Definition der Sicht »%s« zu ermitteln lieferte keine Daten\n"
 
-#: pg_dump.c:13855
+#: pg_dump.c:13902
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition\n"
-msgstr "Anfrage um die Definition der Sicht „%s“ zu ermitteln lieferte mehr als eine Definition\n"
+msgstr "Anfrage um die Definition der Sicht »%s« zu ermitteln lieferte mehr als eine Definition\n"
 
-#: pg_dump.c:13862
+#: pg_dump.c:13909
 #, 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"
+msgstr "Definition der Sicht »%s« scheint leer zu sein (Länge null)\n"
 
-#: pg_dump.c:14610
+#: pg_dump.c:14657
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
-msgstr "ungültige Spaltennummer %d in Tabelle „%s“\n"
+msgstr "ungültige Spaltennummer %d in Tabelle »%s«\n"
 
-#: pg_dump.c:14736
+#: pg_dump.c:14783
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
-msgstr "fehlender Index für Constraint „%s“\n"
+msgstr "fehlender Index für Constraint »%s«\n"
 
-#: pg_dump.c:14927
+#: pg_dump.c:14974
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "unbekannter Constraint-Typ: %c\n"
 
-#: pg_dump.c:15077 pg_dump.c:15241
+#: pg_dump.c:15124 pg_dump.c:15288
 #, 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] "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:15088
+#: pg_dump.c:15135
 #, 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"
+msgstr "Anfrage nach Daten der Sequenz %s ergab Name »%s«\n"
 
-#: pg_dump.c:15337
+#: pg_dump.c:15384
 #, c-format
 msgid "unexpected tgtype value: %d\n"
 msgstr "unerwarteter tgtype-Wert: %d\n"
 
-#: pg_dump.c:15419
+#: pg_dump.c:15466
 #, 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"
+msgstr "fehlerhafte Argumentzeichenkette (%s) für Trigger »%s« von Tabelle »%s«\n"
 
-#: pg_dump.c:15608
+#: pg_dump.c:15665
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned\n"
-msgstr "Anfrage nach Regel „%s“ der Tabelle „%s“ fehlgeschlagen: falsche Anzahl Zeilen zurückgegeben\n"
+msgstr "Anfrage nach Regel »%s« der Tabelle »%s« fehlgeschlagen: falsche Anzahl Zeilen zurückgegeben\n"
 
-#: pg_dump.c:15990
+#: pg_dump.c:16047
 #, c-format
 msgid "reading dependency data\n"
 msgstr "lese Abhängigkeitsdaten\n"
 
-#: pg_dump.c:16550
+#: pg_dump.c:16607
 #, c-format
 msgid "WARNING: could not parse reloptions array\n"
 msgstr "WARNUNG: konnte reloptions-Array nicht interpretieren\n"
 
-#: pg_dump.c:16614
-#, 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"
-
 #. translator: this is a module name
 #: pg_dump_sort.c:23
 msgid "sorter"
@@ -2111,68 +2128,68 @@
 msgid "WARNING: could not resolve dependency loop among these items:\n"
 msgstr "WARNUNG: konnte Abhängigkeitsschleife zwischen diesen Elementen nicht auflösen:\n"
 
-#: pg_dumpall.c:181
+#: pg_dumpall.c:179
 #, 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 ""
-"Das Programm „pg_dump“ wird von %s benötigt, aber wurde nicht im\n"
-"selben Verzeichnis wie „%s“ gefunden.\n"
+"Das Programm »pg_dump« wird von %s benötigt, aber wurde nicht im\n"
+"selben Verzeichnis wie »%s« gefunden.\n"
 "Prüfen Sie Ihre Installation.\n"
 
-#: pg_dumpall.c:188
+#: pg_dumpall.c:186
 #, 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 ""
-"Das Programm „pg_dump“ wurde von „%s“ gefunden,\n"
+"Das Programm »pg_dump« wurde von »%s« gefunden,\n"
 "aber war nicht die gleiche Version wie %s.\n"
 "Prüfen Sie Ihre Installation.\n"
 
-#: pg_dumpall.c:318
+#: pg_dumpall.c:316
 #, c-format
 msgid "%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
 msgstr "%s: Optionen -g/--globals-only und -r/--roles-only können nicht zusammen verwendet werden\n"
 
-#: pg_dumpall.c:327
+#: pg_dumpall.c:325
 #, c-format
 msgid "%s: options -g/--globals-only and -t/--tablespaces-only cannot be used together\n"
 msgstr "%s: Optionen -g/--globals-only und -t/--tablespaces-only können nicht zusammen verwendet werden\n"
 
-#: pg_dumpall.c:336 pg_restore.c:343
+#: pg_dumpall.c:334 pg_restore.c:359
 #, c-format
 msgid "%s: option --if-exists requires option -c/--clean\n"
 msgstr "%s: Option --if-exists benötigt Option -c/--clean\n"
 
-#: pg_dumpall.c:343
+#: pg_dumpall.c:341
 #, c-format
 msgid "%s: options -r/--roles-only and -t/--tablespaces-only cannot be used together\n"
 msgstr "%s: Optionen -r/--roles-only und -t/--tablespaces-only können nicht zusammen verwendet werden\n"
 
-#: pg_dumpall.c:385 pg_dumpall.c:1892
+#: pg_dumpall.c:383 pg_dumpall.c:1899
 #, c-format
 msgid "%s: could not connect to database \"%s\"\n"
-msgstr "%s: konnte nicht mit der Datenbank „%s“ verbinden\n"
+msgstr "%s: konnte nicht mit der Datenbank »%s« verbinden\n"
 
-#: pg_dumpall.c:400
+#: pg_dumpall.c:398
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
 "Please specify an alternative database.\n"
 msgstr ""
-"%s: konnte nicht mit Datenbank „postgres“ oder „template1“ verbinden\n"
+"%s: konnte nicht mit Datenbank »postgres« oder »template1« verbinden\n"
 "Bitte geben Sie eine alternative Datenbank an.\n"
 
-#: pg_dumpall.c:417
+#: pg_dumpall.c:415
 #, c-format
 msgid "%s: could not open the output file \"%s\": %s\n"
-msgstr "%s: konnte die Ausgabedatei „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte die Ausgabedatei »%s« nicht öffnen: %s\n"
 
-#: pg_dumpall.c:547
+#: pg_dumpall.c:545
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2181,63 +2198,63 @@
 "%s gibt einen PostgreSQL-Datenbankcluster in eine SQL-Skriptdatei aus.\n"
 "\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:547
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:550
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=DATEINAME         Name der Ausgabedatei\n"
 
-#: pg_dumpall.c:558
+#: pg_dumpall.c:557
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr "  -c, --clean                  Datenbanken vor der Wiedererstellung löschen\n"
 
-#: pg_dumpall.c:559
+#: pg_dumpall.c:558
 #, c-format
 msgid "  -g, --globals-only           dump only global objects, no databases\n"
 msgstr "  -g, --globals-only           nur globale Objekte ausgeben, keine Datenbanken\n"
 
-#: pg_dumpall.c:561 pg_restore.c:456
+#: pg_dumpall.c:560 pg_restore.c:462
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr ""
 "  -O, --no-owner               Wiederherstellung der Objekteigentümerschaft\n"
 "                               auslassen\n"
 
-#: pg_dumpall.c:562
+#: pg_dumpall.c:561
 #, c-format
 msgid "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
 msgstr ""
 "  -r, --roles-only             nur Rollen ausgeben, keine Datenbanken oder\n"
 "                               Tablespaces\n"
 
-#: pg_dumpall.c:564
+#: pg_dumpall.c:563
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in the dump\n"
 msgstr "  -S, --superuser=NAME         Superusername für den Dump\n"
 
-#: pg_dumpall.c:565
+#: pg_dumpall.c:564
 #, c-format
 msgid "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
 msgstr ""
 "  -t, --tablespaces-only       nur Tablespaces ausgeben, keine Datenbanken oder\n"
 "                               Rollen\n"
 
-#: pg_dumpall.c:582
+#: pg_dumpall.c:581
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=VERBDG      mit angegebenen Verbindungsparametern verbinden\n"
 
-#: pg_dumpall.c:584
+#: pg_dumpall.c:583
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=DBNAME    alternative Standarddatenbank\n"
 
-#: pg_dumpall.c:591
+#: pg_dumpall.c:590
 #, c-format
 msgid ""
 "\n"
@@ -2250,62 +2267,62 @@
 "Standardausgabe geschrieben.\n"
 "\n"
 
-#: pg_dumpall.c:1118
+#: pg_dumpall.c:1117
 #, c-format
 msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
-msgstr "%s: konnte ACL-Zeichenkette (%s) für Tablespace „%s“ nicht interpretieren\n"
+msgstr "%s: konnte ACL-Zeichenkette (%s) für Tablespace »%s« nicht interpretieren\n"
 
-#: pg_dumpall.c:1449
+#: pg_dumpall.c:1448
 #, c-format
 msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
-msgstr "%s: konnte ACL-Zeichenkette (%s) für Datenbank „%s“ nicht interpretieren\n"
+msgstr "%s: konnte ACL-Zeichenkette (%s) für Datenbank »%s« nicht interpretieren\n"
 
 #: pg_dumpall.c:1659
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
-msgstr "%s: Ausgabe der Datenbank „%s“...\n"
+msgstr "%s: Ausgabe der Datenbank »%s«...\n"
 
-#: pg_dumpall.c:1680
+#: pg_dumpall.c:1683
 #, c-format
 msgid "%s: pg_dump failed on database \"%s\", exiting\n"
-msgstr "%s: pg_dump für Datenbank „%s“ fehlgeschlagen; beende\n"
+msgstr "%s: pg_dump für Datenbank »%s« fehlgeschlagen; beende\n"
 
-#: pg_dumpall.c:1689
+#: pg_dumpall.c:1692
 #, c-format
 msgid "%s: could not re-open the output file \"%s\": %s\n"
-msgstr "%s: konnte die Ausgabedatei „%s“ nicht neu öffnen: %s\n"
+msgstr "%s: konnte die Ausgabedatei »%s« nicht neu öffnen: %s\n"
 
-#: pg_dumpall.c:1734
+#: pg_dumpall.c:1737
 #, c-format
 msgid "%s: running \"%s\"\n"
-msgstr "%s: führe „%s“ aus\n"
+msgstr "%s: führe »%s« aus\n"
 
-#: pg_dumpall.c:1914
+#: pg_dumpall.c:1921
 #, c-format
 msgid "%s: could not connect to database \"%s\": %s\n"
-msgstr "%s: konnte nicht mit der Datenbank „%s“ verbinden: %s\n"
+msgstr "%s: konnte nicht mit der Datenbank »%s« verbinden: %s\n"
 
-#: pg_dumpall.c:1944
+#: pg_dumpall.c:1951
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: konnte Version des Servers nicht ermitteln\n"
 
-#: pg_dumpall.c:1950
+#: pg_dumpall.c:1957
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
-msgstr "%s: konnte Versionszeichenkette „%s“ nicht entziffern\n"
+msgstr "%s: konnte Versionszeichenkette »%s« nicht entziffern\n"
 
-#: pg_dumpall.c:2028 pg_dumpall.c:2054
+#: pg_dumpall.c:2035 pg_dumpall.c:2061
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: führe %s aus\n"
 
-#: pg_dumpall.c:2034 pg_dumpall.c:2060
+#: pg_dumpall.c:2041 pg_dumpall.c:2067
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: Anfrage fehlgeschlagen: %s"
 
-#: pg_dumpall.c:2036 pg_dumpall.c:2062
+#: pg_dumpall.c:2043 pg_dumpall.c:2069
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: Anfrage war: %s\n"
@@ -2325,27 +2342,32 @@
 msgid "%s: options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "%s: Optionen -c/--clean und -a/--data-only können nicht zusammen verwendet werden\n"
 
-#: pg_restore.c:329
+#: pg_restore.c:328
+#, c-format
+msgid "%s: invalid number of parallel jobs\n"
+msgstr "%s: ungültige Anzahl paralleler Jobs\n"
+
+#: pg_restore.c:336
+#, c-format
+msgid "%s: maximum number of parallel jobs is %d\n"
+msgstr "%s: maximale Anzahl paralleler Jobs ist %d\n"
+
+#: pg_restore.c:345
 #, c-format
 msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
 msgstr "%s: --single-transaction und mehrere Jobs können nicht zusammen verwendet werden\n"
 
-#: pg_restore.c:369
+#: pg_restore.c:385
 #, c-format
 msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
-msgstr "unbekanntes Archivformat „%s“; bitte „c“, „d“ oder „t“ angeben\n"
-
-#: pg_restore.c:401
-#, c-format
-msgid "%s: maximum number of parallel jobs is %d\n"
-msgstr "%s: maximale Anzahl paralleler Jobs ist %d\n"
+msgstr "unbekanntes Archivformat »%s«; bitte »c«, »d« oder »t« angeben\n"
 
-#: pg_restore.c:419
+#: pg_restore.c:425
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
 msgstr "WARNUNG: bei Wiederherstellung ignorierte Fehler: %d\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:439
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2355,47 +2377,47 @@
 "gesichert wurde.\n"
 "\n"
 
-#: pg_restore.c:435
+#: pg_restore.c:441
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPTION]... [DATEI]\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:444
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=NAME        mit angegebener Datenbank verbinden\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:445
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=DATEINAME     Name der Ausgabedatei\n"
 
-#: pg_restore.c:440
+#: pg_restore.c:446
 #, c-format
 msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr "  -F, --format=c|d|t       Format der Backup-Datei (sollte automatisch gehen)\n"
 
-#: pg_restore.c:441
+#: pg_restore.c:447
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               Inhaltsverzeichnis für dieses Archiv anzeigen\n"
 
-#: pg_restore.c:442
+#: pg_restore.c:448
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
-msgstr "  -v, --verbose            „Verbose“-Modus\n"
+msgstr "  -v, --verbose            »Verbose«-Modus\n"
 
-#: pg_restore.c:443
+#: pg_restore.c:449
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            Versionsinformationen anzeigen, dann beenden\n"
 
-#: pg_restore.c:444
+#: pg_restore.c:450
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_restore.c:446
+#: pg_restore.c:452
 #, c-format
 msgid ""
 "\n"
@@ -2404,34 +2426,34 @@
 "\n"
 "Optionen die die Wiederherstellung kontrollieren:\n"
 
-#: pg_restore.c:447
+#: pg_restore.c:453
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr "  -a, --data-only              nur Daten, nicht das Schema, wiederherstellen\n"
 
-#: pg_restore.c:449
+#: pg_restore.c:455
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 Zieldatenbank erzeugen\n"
 
-#: pg_restore.c:450
+#: pg_restore.c:456
 #, c-format
 msgid "  -e, --exit-on-error          exit on error, default is to continue\n"
 msgstr "  -e, --exit-on-error          bei Fehler beenden, Voreinstellung ist fortsetzen\n"
 
-#: pg_restore.c:451
+#: pg_restore.c:457
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NAME             benannten Index wiederherstellen\n"
 
-#: pg_restore.c:452
+#: pg_restore.c:458
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to restore\n"
 msgstr ""
 "  -j, --jobs=NUM               so viele parallele Jobs zur Wiederherstellung\n"
 "                               verwenden\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:459
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -2441,52 +2463,52 @@
 "                               Inhaltsverzeichnis aus dieser Datei zur Auswahl oder\n"
 "                               Sortierung der Ausgabe verwenden\n"
 
-#: pg_restore.c:455
+#: pg_restore.c:461
 #, c-format
 msgid "  -n, --schema=NAME            restore only objects in this schema\n"
 msgstr "  -n, --schema=NAME            nur Objekte in diesem Schema wiederherstellen\n"
 
-#: pg_restore.c:457
+#: pg_restore.c:463
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=NAME(args)    benannte Funktion wiederherstellen\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:464
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr "  -s, --schema-only            nur das Schema, nicht die Daten, wiederherstellen\n"
 
-#: pg_restore.c:459
+#: pg_restore.c:465
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use for disabling triggers\n"
 msgstr "  -S, --superuser=NAME         Name des Superusers, um Trigger auszuschalten\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:466
 #, c-format
 msgid "  -t, --table=NAME             restore named table\n"
 msgstr "  -t, --table=NAME             benannte Tabelle wiederherstellen\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:467
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NAME           benannten Trigger wiederherstellen\n"
 
-#: pg_restore.c:462
+#: pg_restore.c:468
 #, c-format
 msgid "  -x, --no-privileges          skip restoration of access privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          Wiederherstellung der Zugriffsprivilegien auslassen\n"
 
-#: pg_restore.c:463
+#: pg_restore.c:469
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr "  -1, --single-transaction     Wiederherstellung als eine einzige Transaktion\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:471
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        Sicherheit auf Zeilenebene einschalten\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:473
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
@@ -2495,29 +2517,29 @@
 "  --no-data-for-failed-tables  Daten für Tabellen, die nicht erzeugt werden\n"
 "                               konnten, nicht wiederherstellen\n"
 
-#: pg_restore.c:469
+#: pg_restore.c:475
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels         Security-Labels nicht wiederherstellen\n"
 
-#: pg_restore.c:470
+#: pg_restore.c:476
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces             Tablespace-Zuordnungen nicht wiederherstellen\n"
 
-#: pg_restore.c:471
+#: pg_restore.c:477
 #, c-format
 msgid "  --section=SECTION            restore named section (pre-data, data, or post-data)\n"
 msgstr ""
 "  --section=ABSCHNITT          angegebenen Abschnitt wiederherstellen (pre-data,\n"
 "                               data oder post-data)\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:488
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=ROLLENNAME        vor der Wiederherstellung SET ROLE ausführen\n"
 
-#: pg_restore.c:484
+#: pg_restore.c:490
 #, c-format
 msgid ""
 "\n"
@@ -2528,7 +2550,7 @@
 "Die Optionen -I, -n, -P, -t, -T und --section können kombiniert und mehrfach\n"
 "angegeben werden, um mehrere Objekte auszuwählen.\n"
 
-#: pg_restore.c:487
+#: pg_restore.c:493
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/po/es.po postgresql-9.5-9.5.8/src/bin/pg_dump/po/es.po
--- postgresql-9.5-9.5.2/src/bin/pg_dump/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: pg_dump (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:43+0000\n"
+"POT-Creation-Date: 2017-05-21 17:32+0000\n"
 "PO-Revision-Date: 2015-10-02 16:34-0300\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL Español <pgsql-es-ayuda@postgresql.org>\n"
@@ -58,8 +58,8 @@
 msgstr "pclose falló: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 pg_backup_db.c:135 pg_backup_db.c:190
-#: pg_backup_db.c:234 pg_backup_db.c:280
+#: ../../common/fe_memutils.c:98 pg_backup_db.c:157 pg_backup_db.c:212
+#: pg_backup_db.c:271 pg_backup_db.c:313
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
@@ -104,268 +104,273 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
 
-#: common.c:109
+#: common.c:119
+#, c-format
+msgid "reading extensions\n"
+msgstr "leyendo las extensiones\n"
+
+#: common.c:124
+#, c-format
+msgid "identifying extension members\n"
+msgstr "identificando miembros de extensión\n"
+
+#: common.c:128
 #, c-format
 msgid "reading schemas\n"
 msgstr "leyendo esquemas\n"
 
-#: common.c:120
+#: common.c:139
 #, c-format
 msgid "reading user-defined tables\n"
 msgstr "leyendo las tablas definidas por el usuario\n"
 
-#: common.c:128
-#, c-format
-msgid "reading extensions\n"
-msgstr "leyendo las extensiones\n"
-
-#: common.c:132
+#: common.c:147
 #, c-format
 msgid "reading user-defined functions\n"
 msgstr "leyendo las funciones definidas por el usuario\n"
 
-#: common.c:138
+#: common.c:153
 #, c-format
 msgid "reading user-defined types\n"
 msgstr "leyendo los tipos definidos por el usuario\n"
 
-#: common.c:144
+#: common.c:159
 #, c-format
 msgid "reading procedural languages\n"
 msgstr "leyendo los lenguajes procedurales\n"
 
-#: common.c:148
+#: common.c:163
 #, c-format
 msgid "reading user-defined aggregate functions\n"
 msgstr "leyendo las funciones de agregación definidas por el usuario\n"
 
-#: common.c:152
+#: common.c:167
 #, c-format
 msgid "reading user-defined operators\n"
 msgstr "leyendo los operadores definidos por el usuario\n"
 
-#: common.c:157
+#: common.c:172
 #, c-format
 msgid "reading user-defined operator classes\n"
 msgstr "leyendo las clases de operadores definidos por el usuario\n"
 
-#: common.c:161
+#: common.c:176
 #, c-format
 msgid "reading user-defined operator families\n"
 msgstr "leyendo las familias de operadores definidas por el usuario\n"
 
-#: common.c:165
+#: common.c:180
 #, c-format
 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:169
+#: common.c:184
 #, c-format
 msgid "reading user-defined text search templates\n"
 msgstr "leyendo las plantillas de búsqueda en texto definidas por el usuario\n"
 
-#: common.c:173
+#: common.c:188
 #, c-format
 msgid "reading user-defined text search dictionaries\n"
 msgstr "leyendo los diccionarios de búsqueda en texto definidos por el usuario\n"
 
-#: common.c:177
+#: common.c:192
 #, c-format
 msgid "reading user-defined text search configurations\n"
 msgstr "leyendo las configuraciones de búsqueda en texto definidas por el usuario\n"
 
-#: common.c:181
+#: common.c:196
 #, c-format
 msgid "reading user-defined foreign-data wrappers\n"
 msgstr "leyendo los conectores de datos externos definidos por el usuario\n"
 
-#: common.c:185
+#: common.c:200
 #, c-format
 msgid "reading user-defined foreign servers\n"
 msgstr "leyendo los servidores foráneos definidas por el usuario\n"
 
-#: common.c:189
+#: common.c:204
 #, c-format
 msgid "reading default privileges\n"
 msgstr "leyendo los privilegios por omisión\n"
 
-#: common.c:193
+#: common.c:208
 #, c-format
 msgid "reading user-defined collations\n"
 msgstr "leyendo los ordenamientos definidos por el usuario\n"
 
-#: common.c:198
+#: common.c:213
 #, c-format
 msgid "reading user-defined conversions\n"
 msgstr "leyendo las conversiones definidas por el usuario\n"
 
-#: common.c:202
+#: common.c:217
 #, c-format
 msgid "reading type casts\n"
 msgstr "leyendo conversiones de tipo\n"
 
-#: common.c:206
+#: common.c:221
 #, c-format
 msgid "reading transforms\n"
 msgstr "leyendo las transformaciones\n"
 
-#: common.c:210
+#: common.c:225
 #, c-format
 msgid "reading table inheritance information\n"
 msgstr "leyendo la información de herencia de las tablas\n"
 
-#: common.c:214
+#: common.c:229
 #, c-format
 msgid "reading event triggers\n"
 msgstr "leyendo los disparadores por eventos\n"
 
-#: common.c:223
+#: common.c:234
 #, c-format
-msgid "finding extension members\n"
-msgstr "buscando miembros de extensión\n"
+msgid "finding extension tables\n"
+msgstr "buscando tablas de extensión\n"
 
-#: common.c:228
+#: common.c:239
 #, c-format
 msgid "finding inheritance relationships\n"
 msgstr "buscando relaciones de herencia\n"
 
-#: common.c:232
+#: common.c:243
 #, c-format
 msgid "reading column info for interesting tables\n"
 msgstr "leyendo la información de columnas para las tablas interesantes\n"
 
-#: common.c:236
+#: common.c:247
 #, c-format
 msgid "flagging inherited columns in subtables\n"
 msgstr "marcando las columnas heredadas en las subtablas\n"
 
-#: common.c:240
+#: common.c:251
 #, c-format
 msgid "reading indexes\n"
 msgstr "leyendo los índices\n"
 
-#: common.c:244
+#: common.c:255
 #, c-format
 msgid "reading constraints\n"
 msgstr "leyendo las restricciones\n"
 
-#: common.c:248
+#: common.c:259
 #, c-format
 msgid "reading triggers\n"
 msgstr "leyendo los disparadores (triggers)\n"
 
-#: common.c:252
+#: common.c:263
 #, c-format
 msgid "reading rewrite rules\n"
 msgstr "leyendo las reglas de reescritura\n"
 
-#: common.c:256
+#: common.c:267
 #, c-format
 msgid "reading policies\n"
 msgstr "leyendo políticas\n"
 
-#: common.c:804
+#: common.c:902
 #, 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:846
+#: common.c:944
 #, 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:861
+#: common.c:959
 #, 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"
 
 #. translator: this is a module name
-#: compress_io.c:79
+#: compress_io.c:78
 msgid "compress_io"
 msgstr "compress_io"
 
-#: compress_io.c:115
+#: compress_io.c:114
 #, c-format
 msgid "invalid compression code: %d\n"
 msgstr "código de compresión no válido: %d\n"
 
-#: compress_io.c:139 compress_io.c:175 compress_io.c:196 compress_io.c:529
-#: compress_io.c:572
+#: compress_io.c:138 compress_io.c:174 compress_io.c:192 compress_io.c:519
+#: compress_io.c:562
 #, c-format
 msgid "not built with zlib support\n"
 msgstr "no contiene soporte zlib\n"
 
-#: compress_io.c:246 compress_io.c:348
+#: compress_io.c:242 compress_io.c:344
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "no se pudo inicializar la biblioteca de compresión: %s\n"
 
-#: compress_io.c:267
+#: compress_io.c:263
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "no se pudo cerrar el flujo comprimido: %s\n"
 
-#: compress_io.c:285
+#: compress_io.c:281
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "no se pudo comprimir datos: %s\n"
 
-#: compress_io.c:368 compress_io.c:384
+#: compress_io.c:361 compress_io.c:377
 #, c-format
 msgid "could not uncompress data: %s\n"
 msgstr "no se pudo descomprimir datos: %s\n"
 
-#: compress_io.c:392
+#: compress_io.c:385
 #, c-format
 msgid "could not close compression library: %s\n"
 msgstr "no se pudo cerrar la biblioteca de compresión: %s\n"
 
-#: compress_io.c:606 compress_io.c:642 pg_backup_custom.c:591
-#: pg_backup_tar.c:567
+#: compress_io.c:596 compress_io.c:632 pg_backup_custom.c:591
+#: pg_backup_tar.c:560
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "no se pudo leer el archivo de entrada: %s\n"
 
-#: compress_io.c:645 pg_backup_custom.c:588 pg_backup_directory.c:552
-#: pg_backup_tar.c:803 pg_backup_tar.c:827
+#: compress_io.c:635 pg_backup_custom.c:588 pg_backup_directory.c:548
+#: pg_backup_tar.c:796 pg_backup_tar.c:820
 #, c-format
 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"
 
-#: parallel.c:78
+#: dumputils.c:402 dumputils.c:433
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr ""
+
+#: dumputils.c:545
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr ""
+
+#: parallel.c:166
 msgid "parallel archiver"
 msgstr "parallel archiver"
 
-#: parallel.c:143
+#: parallel.c:230
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: WSAStartup falló: %d\n"
 
-#: parallel.c:343
-#, c-format
-msgid "worker is terminating\n"
-msgstr "el proceso hijo está terminando\n"
-
-#: parallel.c:537
+#: parallel.c:933
 #, c-format
 msgid "could not create communication channels: %s\n"
 msgstr "no se pudo crear los canales de comunicación: %s\n"
 
-#: parallel.c:611
+#: parallel.c:996
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "no se pudo crear el proceso hijo: %s\n"
 
-#: parallel.c:828
-#, c-format
-msgid "could not get relation name for OID %u: %s\n"
-msgstr "no se pudo obtener un nombre de relación para el OID %u: %s\n"
-
-#: parallel.c:845
+#: parallel.c:1191
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -374,77 +379,67 @@
 "no se pudo obtener un lock en la relación «%s»\n"
 "Esto normalmente significa que alguien solicitó un lock ACCESS EXCLUSIVE en la tabla después de que el proceso pg_dump padre había obtenido el lock ACCESS SHARE en la tabla.\n"
 
-#: parallel.c:929
+#: parallel.c:1261
 #, c-format
-msgid "unrecognized command on communication channel: %s\n"
-msgstr "orden no reconocida en canal de comunicación: %s\n"
+msgid "unrecognized command received from master: \"%s\"\n"
+msgstr "orden no reconocida recibida del servidor: «%s»\n"
 
-#: parallel.c:962
+#: parallel.c:1299
 #, c-format
 msgid "a worker process died unexpectedly\n"
 msgstr "un proceso hijo murió inesperadamente\n"
 
-#: parallel.c:989 parallel.c:998
-#, c-format
-msgid "invalid message received from worker: %s\n"
-msgstr "mensaje no válido recibido del proceso hijo: %s\n"
-
-#: parallel.c:995 pg_backup_db.c:337
+#: parallel.c:1325 parallel.c:1331
 #, c-format
-msgid "%s"
-msgstr "%s"
+msgid "invalid message received from worker: \"%s\"\n"
+msgstr "mensaje no válido recibido del proceso hijo: «%s»\n"
 
-#: parallel.c:1047 parallel.c:1091
+#: parallel.c:1388 parallel.c:1439
 #, c-format
 msgid "error processing a parallel work item\n"
 msgstr "error procesando un elemento de trabajo en paralelo\n"
 
-#: parallel.c:1119 parallel.c:1257
+#: parallel.c:1468 parallel.c:1586
 #, c-format
 msgid "could not write to the communication channel: %s\n"
 msgstr "no se pudo escribir al canal de comunicación: %s\n"
 
-#: parallel.c:1168
+#: parallel.c:1546
 #, c-format
-msgid "terminated by user\n"
-msgstr "terminado por el usuario\n"
+msgid "select() failed: %s\n"
+msgstr "select() fallida: %s\n"
 
-#: parallel.c:1220
-#, c-format
-msgid "error in ListenToWorkers(): %s\n"
-msgstr "error en ListenToWorkers(): %s\n"
-
-#: parallel.c:1345
+#: parallel.c:1671
 #, c-format
 msgid "pgpipe: could not create socket: error code %d\n"
 msgstr "pgpipe: no se pudo crear el socket: código de error %d\n"
 
-#: parallel.c:1356
+#: parallel.c:1682
 #, c-format
 msgid "pgpipe: could not bind: error code %d\n"
 msgstr "pgpipe: no se pudo enlazar: código de error %d\n"
 
-#: parallel.c:1363
+#: parallel.c:1689
 #, c-format
 msgid "pgpipe: could not listen: error code %d\n"
 msgstr "pgpipe: no se pudo escuchar: código de error %d\n"
 
-#: parallel.c:1370
+#: parallel.c:1696
 #, c-format
 msgid "pgpipe: getsockname() failed: error code %d\n"
 msgstr "pgpipe: getsockname() falló: código de error %d\n"
 
-#: parallel.c:1381
+#: parallel.c:1707
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d\n"
 msgstr "pgpipe: no se pudo crear el segundo socket: código de error %d\n"
 
-#: parallel.c:1390
+#: parallel.c:1716
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d\n"
 msgstr "pgpipe: no se pudo conectar el socket: código de error %d\n"
 
-#: parallel.c:1397
+#: parallel.c:1725
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d\n"
 msgstr "pgpipe: no se pudo aceptar la conexión: código de error %d\n"
@@ -454,479 +449,477 @@
 msgid "archiver"
 msgstr "archiver"
 
-#: pg_backup_archiver.c:230 pg_backup_archiver.c:1479
+#: pg_backup_archiver.c:229 pg_backup_archiver.c:1550
 #, 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:265 pg_backup_archiver.c:270
+#: pg_backup_archiver.c:275 pg_backup_archiver.c:280
 #, c-format
 msgid "WARNING: archive items not in correct section order\n"
 msgstr "ATENCIÓN: elementos del archivo no están en el orden correcto de secciones\n"
 
-#: pg_backup_archiver.c:276
+#: pg_backup_archiver.c:286
 #, c-format
 msgid "unexpected section code %d\n"
 msgstr "código de sección %d inesperado\n"
 
-#: pg_backup_archiver.c:308
+#: pg_backup_archiver.c:318
 #, c-format
 msgid "-C and -1 are incompatible options\n"
 msgstr "-C y -1 son opciones incompatibles\n"
 
-#: pg_backup_archiver.c:318
+#: pg_backup_archiver.c:328
 #, c-format
 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:322
+#: pg_backup_archiver.c:332
 #, c-format
 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:340
+#: pg_backup_archiver.c:350
 #, c-format
 msgid "cannot restore from compressed archive (compression not supported in this installation)\n"
 msgstr "no se puede reestablecer desde un archivo comprimido (la compresión no está soportada en esta instalación)\n"
 
-#: pg_backup_archiver.c:357
+#: pg_backup_archiver.c:367
 #, c-format
 msgid "connecting to database for restore\n"
 msgstr "conectando a la base de datos para reestablecimiento\n"
 
-#: pg_backup_archiver.c:359
+#: pg_backup_archiver.c:369
 #, c-format
 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:404
+#: pg_backup_archiver.c:414
 #, c-format
 msgid "implied data-only restore\n"
 msgstr "asumiendo reestablecimiento de sólo datos\n"
 
-#: pg_backup_archiver.c:474
+#: pg_backup_archiver.c:484
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "eliminando %s %s\n"
 
-#: pg_backup_archiver.c:627
+#: pg_backup_archiver.c:577
+#, c-format
+msgid "WARNING: could not find where to insert IF EXISTS in statement \"%s\"\n"
+msgstr "PRECAUCIÓN: no se pudo encontrar dónde insertar IF EXISTS en la sentencia «%s»\n"
+
+#: pg_backup_archiver.c:653
 #, c-format
 msgid "setting owner and privileges for %s \"%s.%s\"\n"
 msgstr "estableciendo dueño y privilegios para %s «%s.%s»\n"
 
-#: pg_backup_archiver.c:630
+#: pg_backup_archiver.c:656
 #, 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:696 pg_backup_archiver.c:698
+#: pg_backup_archiver.c:722 pg_backup_archiver.c:724
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "precaución desde el archivo original: %s\n"
 
-#: pg_backup_archiver.c:707
+#: pg_backup_archiver.c:733
 #, c-format
 msgid "creating %s \"%s.%s\"\n"
 msgstr "creando %s «%s.%s»\n"
 
-#: pg_backup_archiver.c:710
+#: pg_backup_archiver.c:736
 #, c-format
 msgid "creating %s \"%s\"\n"
 msgstr "creando %s «%s»\n"
 
-#: pg_backup_archiver.c:755
+#: pg_backup_archiver.c:788
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "conectando a nueva base de datos «%s»\n"
 
-#: pg_backup_archiver.c:783
+#: pg_backup_archiver.c:816
 #, c-format
 msgid "processing %s\n"
 msgstr "procesando %s\n"
 
-#: pg_backup_archiver.c:803
+#: pg_backup_archiver.c:836
 #, c-format
 msgid "processing data for table \"%s.%s\"\n"
 msgstr "procesando datos de la tabla «%s.%s»\n"
 
-#: pg_backup_archiver.c:865
+#: pg_backup_archiver.c:898
 #, c-format
 msgid "executing %s %s\n"
 msgstr "ejecutando %s %s\n"
 
-#: pg_backup_archiver.c:902
+#: pg_backup_archiver.c:937
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "deshabilitando disparadores (triggers) para %s\n"
 
-#: pg_backup_archiver.c:928
+#: pg_backup_archiver.c:965
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "habilitando disparadores (triggers) para %s\n"
 
-#: pg_backup_archiver.c:958
+#: pg_backup_archiver.c:995
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine\n"
 msgstr ""
 "error interno -- WriteData no puede ser llamada fuera del contexto\n"
 "de una rutina DataDumper\n"
 
-#: pg_backup_archiver.c:1122
+#: pg_backup_archiver.c:1188
 #, c-format
 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:1176
+#: pg_backup_archiver.c:1246
 #, 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:1197 pg_backup_tar.c:745
+#: pg_backup_archiver.c:1267 pg_backup_tar.c:738
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "reestableciendo objeto grande con OID %u\n"
 
-#: pg_backup_archiver.c:1209
+#: pg_backup_archiver.c:1279
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "no se pudo crear el objeto grande %u: %s"
 
-#: pg_backup_archiver.c:1214 pg_dump.c:2774
+#: pg_backup_archiver.c:1284 pg_dump.c:2914
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "no se pudo abrir el objeto grande %u: %s"
 
-#: pg_backup_archiver.c:1271
+#: pg_backup_archiver.c:1342
 #, 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:1312
+#: pg_backup_archiver.c:1383
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "PRECAUCIÓN: línea ignorada: %s\n"
 
-#: pg_backup_archiver.c:1319
+#: pg_backup_archiver.c:1390
 #, 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:1340 pg_backup_directory.c:230
-#: pg_backup_directory.c:601
+#: pg_backup_archiver.c:1411 pg_backup_directory.c:230
+#: pg_backup_directory.c:597
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "no se pudo cerrar el archivo TOC: %s\n"
 
-#: pg_backup_archiver.c:1449 pg_backup_custom.c:162 pg_backup_directory.c:341
-#: pg_backup_directory.c:587 pg_backup_directory.c:645
-#: pg_backup_directory.c:665
+#: pg_backup_archiver.c:1520 pg_backup_custom.c:162 pg_backup_directory.c:341
+#: pg_backup_directory.c:583 pg_backup_directory.c:641
+#: pg_backup_directory.c:661
 #, 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:1452 pg_backup_custom.c:169
+#: pg_backup_archiver.c:1523 pg_backup_custom.c:169
 #, 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:1556
+#: pg_backup_archiver.c:1629
 #, 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] "se escribió %lu byte de los datos del objeto grande (resultado = %lu)\n"
 msgstr[1] "se escribieron %lu bytes de los datos del objeto grande (resultado = %lu)\n"
 
-#: pg_backup_archiver.c:1562
+#: pg_backup_archiver.c:1635
 #, 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:1655
+#: pg_backup_archiver.c:1728
 #, c-format
 msgid "Error while INITIALIZING:\n"
 msgstr "Error durante INICIALIZACIÓN:\n"
 
-#: pg_backup_archiver.c:1660
+#: pg_backup_archiver.c:1733
 #, c-format
 msgid "Error while PROCESSING TOC:\n"
 msgstr "Error durante PROCESAMIENTO DE TABLA DE CONTENIDOS:\n"
 
-#: pg_backup_archiver.c:1665
+#: pg_backup_archiver.c:1738
 #, c-format
 msgid "Error while FINALIZING:\n"
 msgstr "Error durante FINALIZACIÓN:\n"
 
-#: pg_backup_archiver.c:1670
+#: pg_backup_archiver.c:1743
 #, 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:1743
+#: pg_backup_archiver.c:1816
 #, c-format
 msgid "bad dumpId\n"
 msgstr "dumpId incorrecto\n"
 
-#: pg_backup_archiver.c:1764
+#: pg_backup_archiver.c:1837
 #, c-format
 msgid "bad table dumpId for TABLE DATA item\n"
 msgstr "dumpId de tabla incorrecto para elemento TABLE DATA\n"
 
-#: pg_backup_archiver.c:1856
+#: pg_backup_archiver.c:1929
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "bandera de posición inesperada %d\n"
 
-#: pg_backup_archiver.c:1869
+#: pg_backup_archiver.c:1942
 #, c-format
 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:1982
+#: pg_backup_archiver.c:2055
 #, c-format
 msgid "attempting to ascertain archive format\n"
 msgstr "intentando comprobar el formato del archivador\n"
 
-#: pg_backup_archiver.c:2008 pg_backup_archiver.c:2018
+#: pg_backup_archiver.c:2081 pg_backup_archiver.c:2091
 #, c-format
 msgid "directory name too long: \"%s\"\n"
 msgstr "nombre de directorio demasiado largo: «%s»\n"
 
-#: pg_backup_archiver.c:2026
+#: pg_backup_archiver.c:2099
 #, 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:2034 pg_backup_custom.c:181 pg_backup_custom.c:770
-#: pg_backup_directory.c:214 pg_backup_directory.c:402
+#: pg_backup_archiver.c:2107 pg_backup_custom.c:181 pg_backup_custom.c:770
+#: pg_backup_directory.c:214 pg_backup_directory.c:399
 #, 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:2042 pg_backup_custom.c:188
+#: pg_backup_archiver.c:2115 pg_backup_custom.c:188
 #, 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:2049
+#: pg_backup_archiver.c:2122
 #, 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:2051
+#: pg_backup_archiver.c:2124
 #, 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:2134
+#: pg_backup_archiver.c:2207
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql.\n"
 msgstr "el archivo de entrada parece ser un volcado de texto. Por favor use psql.\n"
 
-#: pg_backup_archiver.c:2140
+#: pg_backup_archiver.c:2213
 #, c-format
 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:2146
+#: pg_backup_archiver.c:2219
 #, c-format
 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:2166
+#: pg_backup_archiver.c:2239
 #, 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:2183
+#: pg_backup_archiver.c:2256
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "reservando AH para %s, formato %d\n"
 
-#: pg_backup_archiver.c:2288
+#: pg_backup_archiver.c:2361
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "formato de archivo no reconocido «%d»\n"
 
-#: pg_backup_archiver.c:2438
+#: pg_backup_archiver.c:2517
 #, 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:2554
+#: pg_backup_archiver.c:2633
 #, 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:2588
+#: pg_backup_archiver.c:2667
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "no se reconoce la codificación: «%s»\n"
 
-#: pg_backup_archiver.c:2593
+#: pg_backup_archiver.c:2672
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "elemento ENCODING no válido: %s\n"
 
-#: pg_backup_archiver.c:2611
+#: pg_backup_archiver.c:2690
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "elemento STDSTRINGS no válido: %s\n"
 
-#: pg_backup_archiver.c:2834
+#: pg_backup_archiver.c:2925
 #, 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:2866
+#: pg_backup_archiver.c:2957
 #, c-format
 msgid "could not set default_with_oids: %s"
 msgstr "no se pudo definir default_with_oids: %s"
 
-#: pg_backup_archiver.c:3004
+#: pg_backup_archiver.c:3102
 #, c-format
 msgid "could not set search_path to \"%s\": %s"
 msgstr "no se pudo establecer search_path a «%s»: %s"
 
-#: pg_backup_archiver.c:3065
+#: pg_backup_archiver.c:3164
 #, c-format
 msgid "could not set default_tablespace to %s: %s"
 msgstr "no se pudo establecer default_tablespace a %s: %s"
 
-#: pg_backup_archiver.c:3152 pg_backup_archiver.c:3337
+#: pg_backup_archiver.c:3251 pg_backup_archiver.c:3445
 #, 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:3390
-#, c-format
-msgid "WARNING: requested compression not available in this installation -- archive will be uncompressed\n"
-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:3429
+#: pg_backup_archiver.c:3528
 #, c-format
 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:3442
+#: pg_backup_archiver.c:3541
 #, 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:3447
+#: pg_backup_archiver.c:3546
 #, 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:3451
+#: pg_backup_archiver.c:3550
 #, c-format
 msgid "WARNING: archive was made on a machine with larger integers, some operations might fail\n"
 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:3461
+#: pg_backup_archiver.c:3560
 #, 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:3477
+#: pg_backup_archiver.c:3576
 #, c-format
 msgid "WARNING: archive is compressed, but this installation does not support compression -- no data will be available\n"
 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:3495
+#: pg_backup_archiver.c:3594
 #, c-format
 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:3571
+#: pg_backup_archiver.c:3669
 #, c-format
 msgid "entering restore_toc_entries_prefork\n"
 msgstr "ingresando restore_toc_entries_prefork\n"
 
-#: pg_backup_archiver.c:3615
+#: pg_backup_archiver.c:3713
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "procesando el elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:3667
+#: pg_backup_archiver.c:3765
 #, c-format
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "ingresando restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3715
+#: pg_backup_archiver.c:3813
 #, c-format
 msgid "entering main parallel loop\n"
 msgstr "ingresando al bucle paralelo principal\n"
 
-#: pg_backup_archiver.c:3726
+#: pg_backup_archiver.c:3824
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "saltando el elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:3736
+#: pg_backup_archiver.c:3834
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "lanzando el elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:3794
+#: pg_backup_archiver.c:3890
 #, c-format
 msgid "finished main parallel loop\n"
 msgstr "terminó el bucle paralelo principal\n"
 
-#: pg_backup_archiver.c:3803
+#: pg_backup_archiver.c:3899
 #, c-format
 msgid "entering restore_toc_entries_postfork\n"
 msgstr "ingresando restore_toc_entries_postfork\n"
 
-#: pg_backup_archiver.c:3821
+#: pg_backup_archiver.c:3918
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "procesando el elemento saltado %d %s %s\n"
 
-#: pg_backup_archiver.c:3970
+#: pg_backup_archiver.c:4067
 #, c-format
 msgid "no item ready\n"
 msgstr "ningún elemento listo\n"
 
-#: pg_backup_archiver.c:4020
+#: pg_backup_archiver.c:4115
 #, c-format
 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:4022
+#: pg_backup_archiver.c:4117
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "terminó el elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:4035
+#: pg_backup_archiver.c:4130
 #, 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:4197
+#: pg_backup_archiver.c:4292
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "transferiendo la dependencia %d -> %d a %d\n"
 
-#: pg_backup_archiver.c:4270
+#: pg_backup_archiver.c:4365
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "reduciendo las dependencias para %d\n"
 
-#: pg_backup_archiver.c:4309
+#: pg_backup_archiver.c:4404
 #, 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"
@@ -979,7 +972,7 @@
 msgstr "se encontró un bloque tipo %d no reconocido al restablecer el archivador\n"
 
 #: pg_backup_custom.c:709 pg_backup_custom.c:759 pg_backup_custom.c:908
-#: pg_backup_tar.c:1090
+#: pg_backup_tar.c:1087
 #, 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"
@@ -1020,104 +1013,121 @@
 msgstr "ATENCIÓN: ftell no coincide con la posición esperada -- se usó ftell\n"
 
 #. translator: this is a module name
-#: pg_backup_db.c:29
+#: pg_backup_db.c:30
 msgid "archiver (db)"
 msgstr "archiver (bd)"
 
-#: pg_backup_db.c:44
+#: pg_backup_db.c:46
 #, c-format
 msgid "could not get server_version from libpq\n"
 msgstr "no se pudo obtener server_version desde libpq\n"
 
-#: pg_backup_db.c:55 pg_dumpall.c:1965
+#: pg_backup_db.c:57 pg_dumpall.c:1972
 #, 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:57 pg_dumpall.c:1967
+#: pg_backup_db.c:59 pg_dumpall.c:1974
 #, 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:128
+#: pg_backup_db.c:148
 #, 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:133 pg_backup_db.c:185 pg_backup_db.c:232 pg_backup_db.c:278
-#: pg_dumpall.c:1795 pg_dumpall.c:1903
+#: pg_backup_db.c:155 pg_backup_db.c:207 pg_backup_db.c:269 pg_backup_db.c:311
+#: pg_dumpall.c:1798 pg_dumpall.c:1910
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: pg_backup_db.c:166
+#: pg_backup_db.c:188
 #, c-format
 msgid "failed to reconnect to database\n"
 msgstr "falló la reconexión a la base de datos\n"
 
-#: pg_backup_db.c:171
+#: pg_backup_db.c:193
 #, 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:187
+#: pg_backup_db.c:209
 #, c-format
 msgid "connection needs password\n"
 msgstr "la conexión necesita contraseña\n"
 
-#: pg_backup_db.c:228
+#: pg_backup_db.c:263
 #, c-format
 msgid "already connected to a database\n"
 msgstr "ya está conectado a una base de datos\n"
 
-#: pg_backup_db.c:270
+#: pg_backup_db.c:303
 #, c-format
 msgid "failed to connect to database\n"
 msgstr "falló la conexión a la base de datos\n"
 
-#: pg_backup_db.c:289
+#: pg_backup_db.c:320
 #, 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:344
+#: pg_backup_db.c:390
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pg_backup_db.c:397
 #, c-format
 msgid "query failed: %s"
 msgstr "la consulta falló: %s"
 
-#: pg_backup_db.c:346
+#: pg_backup_db.c:399
 #, c-format
 msgid "query was: %s\n"
 msgstr "la consulta era: %s\n"
 
-#: pg_backup_db.c:410
+#: pg_backup_db.c:441
+#, 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_backup_db.c:486
 #, c-format
 msgid "%s: %s    Command was: %s\n"
 msgstr "%s: %s    La orden era: %s\n"
 
-#: pg_backup_db.c:466 pg_backup_db.c:540 pg_backup_db.c:547
+#: pg_backup_db.c:542 pg_backup_db.c:616 pg_backup_db.c:623
 msgid "could not execute query"
 msgstr "no se pudo ejecutar la consulta"
 
-#: pg_backup_db.c:519
+#: pg_backup_db.c:595
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "PQputCopyData regresó un error: %s"
 
-#: pg_backup_db.c:568
+#: pg_backup_db.c:644
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "PQputCopyEnd regresó un error: %s"
 
-#: pg_backup_db.c:574
+#: pg_backup_db.c:650
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "COPY falló para la tabla «%s»: %s"
 
-#: pg_backup_db.c:587
+#: pg_backup_db.c:656 pg_dump.c:1700
+#, c-format
+msgid "WARNING: unexpected extra results during COPY of table \"%s\"\n"
+msgstr "PRECAUCIÓN: resultados extra inesperados durante el COPY de la tabla «%s»\n"
+
+#: pg_backup_db.c:668
 msgid "could not start database transaction"
 msgstr "no se pudo iniciar la transacción en la base de datos"
 
-#: pg_backup_db.c:595
+#: pg_backup_db.c:676
 msgid "could not commit database transaction"
 msgstr "no se pudo terminar la transacción a la base de datos"
 
@@ -1146,42 +1156,42 @@
 msgid "could not create directory \"%s\": %s\n"
 msgstr "no se pudo crear el directorio «%s»: %s\n"
 
-#: pg_backup_directory.c:413
+#: pg_backup_directory.c:412
 #, c-format
 msgid "could not close data file: %s\n"
 msgstr "no se pudo cerrar el archivo de datos: %s\n"
 
-#: pg_backup_directory.c:454
+#: pg_backup_directory.c:453
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %s\n"
 msgstr "no se pudo abrir el archivo de la tabla de contenidos de objetos grandes «%s» para su lectura: %s\n"
 
-#: pg_backup_directory.c:465
+#: pg_backup_directory.c:464
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\"\n"
 msgstr "línea no válida en el archivo de la tabla de contenido de objetos grandes «%s»: «%s»\n"
 
-#: pg_backup_directory.c:474
+#: pg_backup_directory.c:473
 #, c-format
 msgid "error reading large object TOC file \"%s\"\n"
 msgstr "error al leer el archivo de la tabla de contenidos de objetos grandes «%s»\n"
 
-#: pg_backup_directory.c:478
+#: pg_backup_directory.c:477
 #, c-format
 msgid "could not close large object TOC file \"%s\": %s\n"
 msgstr "no se pudo cerrar el archivo de la tabla de contenido de los objetos grandes «%s»: %s\n"
 
-#: pg_backup_directory.c:688
+#: pg_backup_directory.c:684
 #, c-format
 msgid "could not write to blobs TOC file\n"
 msgstr "no se pudo escribir al archivo de la tabla de contenidos de objetos grandes\n"
 
-#: pg_backup_directory.c:720
+#: pg_backup_directory.c:716
 #, c-format
 msgid "file name too long: \"%s\"\n"
 msgstr "nombre de archivo demasiado largo: «%s»\n"
 
-#: pg_backup_directory.c:806
+#: pg_backup_directory.c:802
 #, c-format
 msgid "error during backup\n"
 msgstr "error durante el volcado\n"
@@ -1192,125 +1202,120 @@
 msgstr "no se puede leer este formato\n"
 
 #. translator: this is a module name
-#: pg_backup_tar.c:108
+#: pg_backup_tar.c:101
 msgid "tar archiver"
 msgstr "tar archiver"
 
-#: pg_backup_tar.c:189
+#: pg_backup_tar.c:182
 #, 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:197
+#: pg_backup_tar.c:190
 #, 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:218 pg_backup_tar.c:374
+#: pg_backup_tar.c:211 pg_backup_tar.c:367
 #, c-format
 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:226
+#: pg_backup_tar.c:219
 #, 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:233
+#: pg_backup_tar.c:226
 #, 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:360
+#: pg_backup_tar.c:353
 #, 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:426
+#: pg_backup_tar.c:419
 #, 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:437
+#: pg_backup_tar.c:430
 #, c-format
 msgid "could not open temporary file\n"
 msgstr "no se pudo abrir archivo temporal\n"
 
-#: pg_backup_tar.c:464
+#: pg_backup_tar.c:457
 #, c-format
 msgid "could not close tar member\n"
 msgstr "no se pudo cerrar miembro del archivo tar\n"
 
-#: pg_backup_tar.c:577
+#: pg_backup_tar.c:570
 #, c-format
 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:700
+#: pg_backup_tar.c:693
 #, c-format
 msgid "unexpected COPY statement syntax: \"%s\"\n"
 msgstr "sintaxis de sentencia COPY inesperada: «%s»\n"
 
-#: pg_backup_tar.c:962
+#: pg_backup_tar.c:959
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "el OID del objeto grande no es válido (%u)\n"
 
-#: pg_backup_tar.c:1099
-#, c-format
-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:1113
+#: pg_backup_tar.c:1103
 #, c-format
 msgid "could not close temporary file: %s\n"
 msgstr "no se pudo abrir archivo temporal: %s\n"
 
-#: pg_backup_tar.c:1123
+#: pg_backup_tar.c:1113
 #, 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:1160
+#: pg_backup_tar.c:1150
 #, 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:1171
+#: pg_backup_tar.c:1161
 #, c-format
 msgid "now at file position %s\n"
 msgstr "ahora en la posición del archivo %s\n"
 
-#: pg_backup_tar.c:1180 pg_backup_tar.c:1210
+#: pg_backup_tar.c:1170 pg_backup_tar.c:1200
 #, 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:1194
+#: pg_backup_tar.c:1184
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "saltando miembro del archivo tar %s\n"
 
-#: pg_backup_tar.c:1198
+#: pg_backup_tar.c:1188
 #, 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 ""
 "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:1245
+#: pg_backup_tar.c:1234
 #, 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:1283
+#: pg_backup_tar.c:1275
 #, 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"
+msgid "TOC Entry %s at %s (length %s, checksum %d)\n"
+msgstr "entrada TOC %s en %s (tamaño %s, suma de integridad %d)\n"
 
-#: pg_backup_tar.c:1293
+#: pg_backup_tar.c:1286
 #, c-format
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
 msgstr ""
@@ -1322,69 +1327,71 @@
 msgid "%s: unrecognized section name: \"%s\"\n"
 msgstr "%s: nombre de sección «%s» no reconocido\n"
 
-#: pg_backup_utils.c:56 pg_dump.c:521 pg_dump.c:538 pg_dumpall.c:300
-#: pg_dumpall.c:310 pg_dumpall.c:320 pg_dumpall.c:329 pg_dumpall.c:345
-#: pg_dumpall.c:403 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
+#: pg_backup_utils.c:56 pg_dump.c:526 pg_dump.c:543 pg_dumpall.c:298
+#: pg_dumpall.c:308 pg_dumpall.c:318 pg_dumpall.c:327 pg_dumpall.c:343
+#: pg_dumpall.c:401 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prueba «%s --help» para más información.\n"
 
-#: pg_backup_utils.c:101
+#: pg_backup_utils.c:118
 #, c-format
 msgid "out of on_exit_nicely slots\n"
 msgstr "elementos on_exit_nicely agotados\n"
 
-#: pg_dump.c:491
+#: pg_dump.c:496
 #, c-format
 msgid "compression level must be in range 0..9\n"
 msgstr "nivel de compresión debe estar en el rango 0..9\n"
 
-#: pg_dump.c:536 pg_dumpall.c:308 pg_restore.c:291
+#: pg_dump.c:541 pg_dumpall.c:306 pg_restore.c:291
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: demasiados argumentos en la línea de órdenes (el primero es «%s»)\n"
 
-#: pg_dump.c:549
+#: pg_dump.c:554
 #, c-format
 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:555
+#: pg_dump.c:560
 #, c-format
 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:561
+#: pg_dump.c:566
 #, c-format
 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:562
+#: pg_dump.c:567
 #, c-format
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(La orden INSERT no puede establecer los OIDs).\n"
 
-#: pg_dump.c:567
+#: pg_dump.c:572
 #, c-format
 msgid "option --if-exists requires option -c/--clean\n"
 msgstr "la opción --if-exists requiere la opción -c/--clean\n"
 
-#: pg_dump.c:595
+#: pg_dump.c:594
 #, c-format
-msgid "%s: invalid number of parallel jobs\n"
-msgstr "%s: número de trabajos paralelos no válido\n"
+msgid "WARNING: requested compression not available in this installation -- archive will be uncompressed\n"
+msgstr ""
+"PRECAUCIÓN: la compresión solicitada no está soportada en esta\n"
+"instalación -- el archivador no será comprimido\n"
 
-#: pg_dump.c:599
+#: pg_dump.c:609
 #, c-format
-msgid "parallel backup only supported by the directory format\n"
-msgstr "el volcado en paralelo sólo está soportado por el formato «directory»\n"
+msgid "invalid number of parallel jobs\n"
+msgstr "número no válido de trabajos paralelos\n"
 
-#: pg_dump.c:609
+#: pg_dump.c:613
 #, 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"
+msgid "parallel backup only supported by the directory format\n"
+msgstr "el volcado en paralelo sólo está soportado por el formato «directory»\n"
 
-#: pg_dump.c:668
+#: pg_dump.c:670
 #, c-format
 msgid ""
 "Synchronized snapshots are not supported by this server version.\n"
@@ -1394,27 +1401,27 @@
 "Los snapshots sincronizados no están soportados por esta versión del servidor.\n"
 "Ejecute con --no-synchronized-snapshots si no los necesita.\n"
 
-#: pg_dump.c:675
+#: pg_dump.c:677
 #, c-format
 msgid "Exported snapshots are not supported by this server version.\n"
 msgstr "Los snapshot exportados no están soportados por esta versión de servidor.\n"
 
-#: pg_dump.c:686
+#: pg_dump.c:696
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "el último OID interno es %u\n"
 
-#: pg_dump.c:695
+#: pg_dump.c:704
 #, c-format
 msgid "No matching schemas were found\n"
 msgstr "No se encontraron esquemas coincidentes\n"
 
-#: pg_dump.c:707
+#: pg_dump.c:716
 #, c-format
 msgid "No matching tables were found\n"
 msgstr "No se encontraron tablas coincidentes\n"
 
-#: pg_dump.c:861
+#: pg_dump.c:882
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -1423,17 +1430,17 @@
 "%s extrae una base de datos en formato de texto o en otros formatos.\n"
 "\n"
 
-#: pg_dump.c:862 pg_dumpall.c:548 pg_restore.c:432
+#: pg_dump.c:883 pg_dumpall.c:546 pg_restore.c:440
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_dump.c:863
+#: pg_dump.c:884
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPCIÓN]... [NOMBREDB]\n"
 
-#: pg_dump.c:865 pg_dumpall.c:551 pg_restore.c:435
+#: pg_dump.c:886 pg_dumpall.c:549 pg_restore.c:443
 #, c-format
 msgid ""
 "\n"
@@ -1442,12 +1449,12 @@
 "\n"
 "Opciones generales:\n"
 
-#: pg_dump.c:866
+#: pg_dump.c:887
 #, c-format
 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:867
+#: pg_dump.c:888
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1456,37 +1463,37 @@
 "  -F, --format=c|d|t|p     Formato del archivo de salida (c=personalizado, \n"
 "                           d=directorio, t=tar, p=texto (por omisión))\n"
 
-#: pg_dump.c:869
+#: pg_dump.c:890
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr "  -j, --jobs=NUM           máximo de procesos paralelos para volcar\n"
 
-#: pg_dump.c:870
+#: pg_dump.c:891 pg_dumpall.c:551
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose            modo verboso\n"
 
-#: pg_dump.c:871 pg_dumpall.c:553
+#: pg_dump.c:892 pg_dumpall.c:552
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version            mostrar información de version y salir\n"
 
-#: pg_dump.c:872
+#: pg_dump.c:893
 #, 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:873 pg_dumpall.c:554
+#: pg_dump.c:894 pg_dumpall.c:553
 #, 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:874 pg_dumpall.c:555
+#: pg_dump.c:895 pg_dumpall.c:554
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help               mostrar esta ayuda y salir\n"
 
-#: pg_dump.c:876 pg_dumpall.c:556
+#: pg_dump.c:897 pg_dumpall.c:555
 #, c-format
 msgid ""
 "\n"
@@ -1495,49 +1502,49 @@
 "\n"
 "Opciones que controlan el contenido de la salida:\n"
 
-#: pg_dump.c:877 pg_dumpall.c:557
+#: pg_dump.c:898 pg_dumpall.c:556
 #, 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:878
+#: pg_dump.c:899
 #, 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:879 pg_restore.c:446
+#: pg_dump.c:900 pg_restore.c:454
 #, c-format
 msgid "  -c, --clean                  clean (drop) database objects before recreating\n"
 msgstr "  -c, --clean              tira (drop) la base de datos antes de crearla\n"
 
-#: pg_dump.c:880
+#: pg_dump.c:901
 #, c-format
 msgid "  -C, --create                 include commands to create database in dump\n"
 msgstr ""
 "  -C, --create             incluye órdenes para crear la base de datos\n"
 "                           en la extracción\n"
 
-#: pg_dump.c:881
+#: pg_dump.c:902
 #, 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:882
+#: pg_dump.c:903
 #, 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:883
+#: pg_dump.c:904
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA  do NOT dump the named schema(s)\n"
 msgstr "  -N, --exclude-schema=ESQUEMA  NO extrae el o los esquemas nombrados\n"
 
-#: pg_dump.c:884 pg_dumpall.c:560
+#: pg_dump.c:905 pg_dumpall.c:559
 #, c-format
 msgid "  -o, --oids                   include OIDs in dump\n"
 msgstr "  -o, --oids               incluye OIDs en la extracción\n"
 
-#: pg_dump.c:885
+#: pg_dump.c:906
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1546,58 +1553,58 @@
 "  -O, --no-owner           en formato de sólo texto, no reestablece\n"
 "                           los dueños de los objetos\n"
 
-#: pg_dump.c:887 pg_dumpall.c:563
+#: pg_dump.c:908 pg_dumpall.c:562
 #, 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:888
+#: pg_dump.c:909
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in plain-text format\n"
 msgstr "  -S, --superuser=NAME     superusuario a utilizar en el volcado de texto\n"
 
-#: pg_dump.c:889
+#: pg_dump.c:910
 #, c-format
 msgid "  -t, --table=TABLE            dump the named table(s) only\n"
 msgstr "  -t, --table=TABLE        extrae sólo la o las tablas nombradas\n"
 
-#: pg_dump.c:890
+#: pg_dump.c:911
 #, c-format
 msgid "  -T, --exclude-table=TABLE    do NOT dump the named table(s)\n"
 msgstr "  -T, --exclude-table=TABLA  NO extrae la(s) tabla(s) nombrada(s)\n"
 
-#: pg_dump.c:891 pg_dumpall.c:566
+#: pg_dump.c:912 pg_dumpall.c:565
 #, 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:892 pg_dumpall.c:567
+#: pg_dump.c:913 pg_dumpall.c:566
 #, 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:893 pg_dumpall.c:568
+#: pg_dump.c:914 pg_dumpall.c:567
 #, c-format
 msgid "  --column-inserts             dump data as INSERT commands with column names\n"
 msgstr ""
 "  --column-inserts         extrae los datos usando INSERT con nombres\n"
 "                           de columnas\n"
 
-#: pg_dump.c:894 pg_dumpall.c:569
+#: pg_dump.c:915 pg_dumpall.c:568
 #, c-format
 msgid "  --disable-dollar-quoting     disable dollar quoting, use SQL standard quoting\n"
 msgstr ""
 "  --disable-dollar-quoting deshabilita el uso de «delimitadores de dólar»,\n"
 "                           usa delimitadores de cadena estándares\n"
 
-#: pg_dump.c:895 pg_dumpall.c:570 pg_restore.c:462
+#: pg_dump.c:916 pg_dumpall.c:569 pg_restore.c:470
 #, c-format
 msgid "  --disable-triggers           disable triggers during data-only restore\n"
 msgstr ""
 "  --disable-triggers       deshabilita los disparadores (triggers) durante el\n"
 "                           restablecimiento de la extracción de sólo-datos\n"
 
-#: pg_dump.c:896
+#: pg_dump.c:917
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user has\n"
@@ -1606,70 +1613,70 @@
 "  --enable-row-security        activa seguridad de filas (volcar sólo el\n"
 "                               contenido al que el usuario tiene acceso)\n"
 
-#: pg_dump.c:898
+#: pg_dump.c:919
 #, c-format
 msgid "  --exclude-table-data=TABLE   do NOT dump data for the named table(s)\n"
 msgstr "  --exclude-table-data=TABLA  NO extrae los datos de la(s) tabla(s) nombrada(s)\n"
 
-#: pg_dump.c:899 pg_dumpall.c:571 pg_restore.c:464
+#: pg_dump.c:920 pg_dumpall.c:570 pg_restore.c:472
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr "  --if-exists               usa IF EXISTS al eliminar objetos\n"
 
-#: pg_dump.c:900 pg_dumpall.c:572
+#: pg_dump.c:921 pg_dumpall.c:571
 #, 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:901 pg_dumpall.c:573
+#: pg_dump.c:922 pg_dumpall.c:572
 #, c-format
 msgid "  --no-security-labels         do not dump security label assignments\n"
 msgstr "  --no-security-labels     no volcar asignaciones de etiquetas de seguridad\n"
 
-#: pg_dump.c:902
+#: pg_dump.c:923
 #, c-format
 msgid "  --no-synchronized-snapshots  do not use synchronized snapshots in parallel jobs\n"
 msgstr ""
 "  --no-synchronized-snapshots  no usar snapshots sincronizados en trabajos\n"
 "                           en paralelo\n"
 
-#: pg_dump.c:903 pg_dumpall.c:574
+#: pg_dump.c:924 pg_dumpall.c:573
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces         no volcar asignaciones de tablespace\n"
 
-#: pg_dump.c:904 pg_dumpall.c:575
+#: pg_dump.c:925 pg_dumpall.c:574
 #, 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:905 pg_dumpall.c:576
+#: pg_dump.c:926 pg_dumpall.c:575
 #, c-format
 msgid "  --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:906
+#: pg_dump.c:927
 #, c-format
 msgid "  --section=SECTION            dump named section (pre-data, data, or post-data)\n"
 msgstr ""
 "  --section=SECCIÓN        volcar la sección nombrada (pre-data, data,\n"
 "                           post-data)\n"
 
-#: pg_dump.c:907
+#: pg_dump.c:928
 #, c-format
 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:908
+#: pg_dump.c:929
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr "  --snapshot=SNAPSHOT          use el snapshot dado para la extracción\n"
 
-#: pg_dump.c:909 pg_dumpall.c:577 pg_restore.c:470
+#: pg_dump.c:930 pg_dumpall.c:576 pg_restore.c:478
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1680,7 +1687,7 @@
 "                           usa órdenes SESSION AUTHORIZATION en lugar de\n"
 "                           ALTER OWNER para cambiar los dueño de los objetos\n"
 
-#: pg_dump.c:913 pg_dumpall.c:581 pg_restore.c:474
+#: pg_dump.c:934 pg_dumpall.c:580 pg_restore.c:482
 #, c-format
 msgid ""
 "\n"
@@ -1689,46 +1696,46 @@
 "\n"
 "Opciones de conexión:\n"
 
-#: pg_dump.c:914
+#: pg_dump.c:935
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=NOMBRE      nombre de la base de datos que volcar\n"
 
-#: pg_dump.c:915 pg_dumpall.c:583 pg_restore.c:475
+#: pg_dump.c:936 pg_dumpall.c:582 pg_restore.c:483
 #, 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:916 pg_dumpall.c:585 pg_restore.c:476
+#: pg_dump.c:937 pg_dumpall.c:584 pg_restore.c:484
 #, 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:917 pg_dumpall.c:586 pg_restore.c:477
+#: pg_dump.c:938 pg_dumpall.c:585 pg_restore.c:485
 #, 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:918 pg_dumpall.c:587 pg_restore.c:478
+#: pg_dump.c:939 pg_dumpall.c:586 pg_restore.c:486
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        nunca pedir una contraseña\n"
 
-#: pg_dump.c:919 pg_dumpall.c:588 pg_restore.c:479
+#: pg_dump.c:940 pg_dumpall.c:587 pg_restore.c:487
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password           fuerza un prompt para la contraseña\n"
 "                           (debería ser automático)\n"
 
-#: pg_dump.c:920 pg_dumpall.c:589
+#: pg_dump.c:941 pg_dumpall.c:588
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=ROL               ejecuta SET ROLE antes del volcado\n"
 
-#: pg_dump.c:922
+#: pg_dump.c:943
 #, c-format
 msgid ""
 "\n"
@@ -1741,367 +1748,380 @@
 "de la variable de ambiente PGDATABASE.\n"
 "\n"
 
-#: pg_dump.c:924 pg_dumpall.c:593 pg_restore.c:486
+#: pg_dump.c:945 pg_dumpall.c:592 pg_restore.c:494
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Reporta errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:943
+#: pg_dump.c:962
 #, 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:1128
+#: pg_dump.c:1102
+#, c-format
+msgid ""
+"Synchronized snapshots are not supported on standby servers.\n"
+"Run with --no-synchronized-snapshots instead if you do not need\n"
+"synchronized snapshots.\n"
+msgstr ""
+"Los snapshots sincronizados no están soportados en servidores standby.\n"
+"Ejecute con --no-synchronized-snapshots si no los necesita.\n"
+
+#: pg_dump.c:1171
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
 msgstr "el formato de salida especificado «%s» no es válido\n"
 
-#: pg_dump.c:1150
+#: pg_dump.c:1193
 #, c-format
 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:1439
+#: pg_dump.c:1557
 #, c-format
 msgid "dumping contents of table \"%s.%s\"\n"
 msgstr "extrayendo el contenido de la tabla «%s.%s»\n"
 
-#: pg_dump.c:1563
+#: pg_dump.c:1681
 #, 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:1564 pg_dump.c:1574
+#: pg_dump.c:1682 pg_dump.c:1692
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Mensaje de error del servidor: %s"
 
-#: pg_dump.c:1565 pg_dump.c:1575
+#: pg_dump.c:1683 pg_dump.c:1693
 #, c-format
 msgid "The command was: %s\n"
 msgstr "La orden era: %s\n"
 
-#: pg_dump.c:1573
+#: pg_dump.c:1691
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed.\n"
 msgstr "Falló la extracción del contenido de la tabla «%s»: PQgetResult() falló.\n"
 
-#: pg_dump.c:2212
+#: pg_dump.c:2338
 #, c-format
 msgid "saving database definition\n"
 msgstr "salvando las definiciones de la base de datos\n"
 
-#: pg_dump.c:2545
+#: pg_dump.c:2672
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "salvando codificaciones = %s\n"
 
-#: pg_dump.c:2572
+#: pg_dump.c:2699
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "salvando standard_conforming_strings = %s\n"
 
-#: pg_dump.c:2605
+#: pg_dump.c:2732
 #, c-format
 msgid "reading large objects\n"
 msgstr "leyendo objetos grandes\n"
 
-#: pg_dump.c:2737
+#: pg_dump.c:2877
 #, c-format
 msgid "saving large objects\n"
 msgstr "salvando objetos grandes\n"
 
-#: pg_dump.c:2784
+#: pg_dump.c:2924
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "error al leer el objeto grande %u: %s"
 
-#: pg_dump.c:2836
+#: pg_dump.c:2976
 #, c-format
 msgid "reading row security enabled for table \"%s.%s\"\n"
 msgstr "leyendo si seguridad de filas está activa para la tabla «%s.%s»\n"
 
-#: pg_dump.c:2867
+#: pg_dump.c:3007
 #, c-format
 msgid "reading policies for table \"%s.%s\"\n"
 msgstr "extrayendo las políticas para la tabla «%s.%s»\n"
 
-#: pg_dump.c:2997
+#: pg_dump.c:3138
 #, c-format
 msgid "unexpected policy command type: \"%s\"\n"
 msgstr "tipo de orden inesperada en política: «%s»\n"
 
-#: pg_dump.c:3212
+#: pg_dump.c:3353
 #, c-format
 msgid "could not find parent extension for %s\n"
 msgstr "no se pudo encontrar la extensión padre para %s\n"
 
-#: pg_dump.c:3315
+#: pg_dump.c:3457
 #, 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:3358
+#: pg_dump.c:3500
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "el esquema con OID %u no existe\n"
 
-#: pg_dump.c:3708
+#: pg_dump.c:3852
 #, 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:3819
+#: pg_dump.c:3964
 #, 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:4078
+#: pg_dump.c:4226
 #, 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:4166
+#: pg_dump.c:4315
 #, 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:4304
+#: pg_dump.c:4454
 #, 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:4486
+#: pg_dump.c:4657
 #, 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:5159
+#: pg_dump.c:5345
 #, 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:5311
+#: pg_dump.c:5497
 #, c-format
 msgid "reading indexes for table \"%s.%s\"\n"
 msgstr "extrayendo los índices para la tabla «%s.%s»\n"
 
-#: pg_dump.c:5678
+#: pg_dump.c:5864
 #, c-format
 msgid "reading foreign key constraints for table \"%s.%s\"\n"
 msgstr "extrayendo restricciones de llave foránea para la tabla «%s.%s»\n"
 
-#: pg_dump.c:5924
+#: pg_dump.c:6110
 #, c-format
 msgid "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not found\n"
 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:6017
+#: pg_dump.c:6203
 #, c-format
 msgid "reading triggers for table \"%s.%s\"\n"
 msgstr "extrayendo los disparadores (triggers) para la tabla «%s.%s»\n"
 
-#: pg_dump.c:6179
+#: pg_dump.c:6368
 #, c-format
 msgid "query produced null referenced table name for foreign key trigger \"%s\" on table \"%s\" (OID of table: %u)\n"
 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:6751
+#: pg_dump.c:6954
 #, c-format
 msgid "finding the columns and types of table \"%s.%s\"\n"
 msgstr "buscando las columnas y tipos de la tabla «%s.%s»\n"
 
-#: pg_dump.c:6930
+#: pg_dump.c:7133
 #, 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:6964
+#: pg_dump.c:7167
 #, c-format
 msgid "finding default expressions of table \"%s.%s\"\n"
 msgstr "buscando expresiones por omisión de la tabla «%s.%s»\n"
 
-#: pg_dump.c:7017
+#: pg_dump.c:7220
 #, 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:7089
+#: pg_dump.c:7292
 #, c-format
 msgid "finding check constraints for table \"%s.%s\"\n"
 msgstr "buscando restricciones de revisión (check) para la tabla «%s.%s»\n"
 
-#: pg_dump.c:7185
+#: pg_dump.c:7388
 #, 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] "se esperaban %d restricciones CHECK en la tabla «%s» pero se encontraron %d\n"
 msgstr[1] "se esperaban %d restricciones CHECK en la tabla «%s» pero se encontraron %d\n"
 
-#: pg_dump.c:7189
+#: pg_dump.c:7392
 #, c-format
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(Los catálogos del sistema podrían estar corruptos)\n"
 
-#: pg_dump.c:8566
+#: pg_dump.c:8783
 #, c-format
 msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
 msgstr "PRECAUCIÓN: el typtype del tipo «%s» parece no ser válido\n"
 
-#: pg_dump.c:10092
+#: pg_dump.c:10279
 #, c-format
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "PRECAUCIÓN: valor no válido en el arreglo proargmodes\n"
 
-#: pg_dump.c:10443
+#: pg_dump.c:10631
 #, c-format
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "PRECAUCIÓN: no se pudo interpretar el arreglo proallargtypes\n"
 
-#: pg_dump.c:10459
+#: pg_dump.c:10647
 #, c-format
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "PRECAUCIÓN: no se pudo interpretar el arreglo proargmodes\n"
 
-#: pg_dump.c:10473
+#: pg_dump.c:10661
 #, c-format
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "PRECAUCIÓN: no se pudo interpretar el arreglo proargnames\n"
 
-#: pg_dump.c:10484
+#: pg_dump.c:10672
 #, c-format
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "PRECAUCIÓN: no se pudo interpretar el arreglo proconfig\n"
 
-#: pg_dump.c:10555
+#: pg_dump.c:10743
 #, 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:10731
+#: pg_dump.c:10876 pg_dump.c:10981 pg_dump.c:10988
+#, c-format
+msgid "could not find function definition for function with OID %u\n"
+msgstr "no se encontró la definición de la función con OID %u\n"
+
+#: pg_dump.c:10921
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
 msgstr "PRECAUCIÓN: valor no válido en los campos pg_cast.castfunc o pg_cast.castmethod\n"
 
-#: pg_dump.c:10734
+#: pg_dump.c:10924
 #, c-format
 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:10817
+#: pg_dump.c:11010
 #, c-format
 msgid "WARNING: bogus transform definition, at least one of trffromsql and trftosql should be nonzero\n"
 msgstr "PRECAUCIÓN: definición errónea de transformación; al menos uno de trffromsql and trftosql debe ser distinto de cero\n"
 
-#: pg_dump.c:10834
+#: pg_dump.c:11027
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trffromsql field\n"
 msgstr "PRECAUCIÓN: valor erróneo en el campo pg_transform.trffromsql\n"
 
-#: pg_dump.c:10855
+#: pg_dump.c:11048
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trftosql field\n"
 msgstr "PRECAUCIÓN: valor erróneo en el campo pg_transform.trftosql\n"
 
-#: pg_dump.c:11241
+#: pg_dump.c:11435
 #, 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:12416
+#: pg_dump.c:12570
 #, c-format
 msgid "WARNING: aggregate function %s could not be dumped correctly for this database version; ignored\n"
 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:13241
+#: pg_dump.c:13394
 #, c-format
 msgid "unrecognized object type in default privileges: %d\n"
 msgstr "tipo de objeto desconocido en privilegios por omisión: %d\n"
 
-#: pg_dump.c:13256
+#: pg_dump.c:13409
 #, 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:13311
+#: pg_dump.c:13465
 #, 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:13728
+#: pg_dump.c:13887
 #, 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:13731
+#: pg_dump.c:13890
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition\n"
 msgstr "la consulta para obtener la definición de la vista «%s» regresó más de una definición\n"
 
-#: pg_dump.c:13738
+#: pg_dump.c:13897
 #, 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:14475
+#: pg_dump.c:14645
 #, 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:14599
+#: pg_dump.c:14771
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "falta un índice para restricción «%s»\n"
 
-#: pg_dump.c:14786
+#: pg_dump.c:14962
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "tipo de restricción inesperado: %c\n"
 
-#: pg_dump.c:14935 pg_dump.c:15099
+#: pg_dump.c:15112 pg_dump.c:15276
 #, 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] "la consulta para obtener los datos de la secuencia «%s» regresó %d entrada, pero se esperaba 1\n"
 msgstr[1] "la consulta para obtener los datos de la secuencia «%s» regresó %d entradas, pero se esperaba 1\n"
 
-#: pg_dump.c:14946
+#: pg_dump.c:15123
 #, 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"
 
-#: pg_dump.c:15194
+#: pg_dump.c:15372
 #, c-format
 msgid "unexpected tgtype value: %d\n"
 msgstr "tgtype no esperado: %d\n"
 
-#: pg_dump.c:15276
+#: pg_dump.c:15454
 #, 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:15463
+#: pg_dump.c:15643
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned\n"
 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:15842
+#: pg_dump.c:16025
 #, c-format
 msgid "reading dependency data\n"
 msgstr "obteniendo datos de dependencias\n"
 
-#: pg_dump.c:16389
+#: pg_dump.c:16585
 #, 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"
+msgid "WARNING: could not parse reloptions array\n"
+msgstr "PRECAUCIÓN: no se pudo interpretar el arreglo reloptions\n"
 
 #. translator: this is a module name
 #: pg_dump_sort.c:23
@@ -2123,34 +2143,34 @@
 msgid "could not identify dependency loop\n"
 msgstr "no se pudo identificar bucle de dependencia\n"
 
-#: pg_dump_sort.c:1250
+#: pg_dump_sort.c:1254
 #, c-format
 msgid "NOTICE: there are circular foreign-key constraints on this table:\n"
 msgid_plural "NOTICE: there are circular foreign-key constraints among these tables:\n"
 msgstr[0] "NOTA: hay restricciones de llave foránea circulares en la siguiente tabla:\n"
 msgstr[1] "NOTA: hay restricciones de llave foránea circulares entre las siguientes tablas:\n"
 
-#: pg_dump_sort.c:1254 pg_dump_sort.c:1274
+#: pg_dump_sort.c:1258 pg_dump_sort.c:1278
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
 
-#: pg_dump_sort.c:1255
+#: pg_dump_sort.c:1259
 #, c-format
 msgid "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints.\n"
 msgstr "Puede no ser capaz de restaurar el respaldo sin usar --disable-triggers o temporalmente eliminar las restricciones.\n"
 
-#: pg_dump_sort.c:1256
+#: pg_dump_sort.c:1260
 #, c-format
 msgid "Consider using a full dump instead of a --data-only dump to avoid this problem.\n"
 msgstr "Considere usar un volcado completo en lugar de --data-only para evitar este problema.\n"
 
-#: pg_dump_sort.c:1268
+#: pg_dump_sort.c:1272
 #, c-format
 msgid "WARNING: could not resolve dependency loop among these items:\n"
 msgstr "PRECAUCIÓN: no se pudo resolver el bucle de dependencias entre los siguientes elementos:\n"
 
-#: pg_dumpall.c:181
+#: pg_dumpall.c:179
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -2161,7 +2181,7 @@
 "directorio que «%s».\n"
 "Verifique su instalación.\n"
 
-#: pg_dumpall.c:188
+#: pg_dumpall.c:186
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by \"%s\"\n"
@@ -2172,32 +2192,32 @@
 "pero no es de la misma versión que %s.\n"
 "Verifique su instalación.\n"
 
-#: pg_dumpall.c:318
+#: pg_dumpall.c:316
 #, c-format
 msgid "%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
 msgstr "%s: las opciones -g/--globals-only y -r/--roles-only no pueden usarse juntas\n"
 
-#: pg_dumpall.c:327
+#: pg_dumpall.c:325
 #, c-format
 msgid "%s: options -g/--globals-only and -t/--tablespaces-only cannot be used together\n"
 msgstr "%s: las opciones -g/--globals-only y -t/--tablespaces-only no pueden usarse juntas\n"
 
-#: pg_dumpall.c:336 pg_restore.c:343
+#: pg_dumpall.c:334 pg_restore.c:359
 #, c-format
 msgid "%s: option --if-exists requires option -c/--clean\n"
 msgstr "%s: la opción --if-exists requiere la opción -c/--clean\n"
 
-#: pg_dumpall.c:343
+#: pg_dumpall.c:341
 #, c-format
 msgid "%s: options -r/--roles-only and -t/--tablespaces-only cannot be used together\n"
 msgstr "%s: las opciones -r/--roles-only y -t/--tablespaces-only no pueden usarse juntas\n"
 
-#: pg_dumpall.c:385 pg_dumpall.c:1892
+#: pg_dumpall.c:383 pg_dumpall.c:1899
 #, 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:400
+#: pg_dumpall.c:398
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2206,12 +2226,12 @@
 "%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:417
+#: pg_dumpall.c:415
 #, 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:547
+#: pg_dumpall.c:545
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2221,63 +2241,63 @@
 "guión (script) SQL.\n"
 "\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:547
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPCIÓN]...\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:550
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=ARCHIVO       nombre del archivo de salida\n"
 
-#: pg_dumpall.c:558
+#: pg_dumpall.c:557
 #, 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:559
+#: pg_dumpall.c:558
 #, 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:561 pg_restore.c:454
+#: pg_dumpall.c:560 pg_restore.c:462
 #, 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:562
+#: pg_dumpall.c:561
 #, c-format
 msgid "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
 msgstr ""
 "  -r, --roles-only         extrae sólo los roles, no bases de datos\n"
 "                           ni tablespaces\n"
 
-#: pg_dumpall.c:564
+#: pg_dumpall.c:563
 #, 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:565
+#: pg_dumpall.c:564
 #, c-format
 msgid "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
 msgstr ""
 "  -t, --tablespaces-only   extrae sólo los tablespaces, no bases de datos\n"
 "                           ni roles\n"
 
-#: pg_dumpall.c:582
+#: pg_dumpall.c:581
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=CONNSTR     conectar usando la cadena de conexión\n"
 
-#: pg_dumpall.c:584
+#: pg_dumpall.c:583
 #, 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:591
+#: pg_dumpall.c:590
 #, c-format
 msgid ""
 "\n"
@@ -2289,12 +2309,12 @@
 "Si no se usa -f/--file, el volcado de SQL será escrito a la salida estándar.\n"
 "\n"
 
-#: pg_dumpall.c:1118
+#: pg_dumpall.c:1117
 #, 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:1449
+#: pg_dumpall.c:1448
 #, 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"
@@ -2304,47 +2324,47 @@
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: extrayendo base de datos «%s»...\n"
 
-#: pg_dumpall.c:1680
+#: pg_dumpall.c:1683
 #, 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:1689
+#: pg_dumpall.c:1692
 #, 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:1734
+#: pg_dumpall.c:1737
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: ejecutando «%s»\n"
 
-#: pg_dumpall.c:1914
+#: pg_dumpall.c:1921
 #, 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:1944
+#: pg_dumpall.c:1951
 #, 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:1950
+#: pg_dumpall.c:1957
 #, 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:2028 pg_dumpall.c:2054
+#: pg_dumpall.c:2035 pg_dumpall.c:2061
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: ejecutando %s\n"
 
-#: pg_dumpall.c:2034 pg_dumpall.c:2060
+#: pg_dumpall.c:2041 pg_dumpall.c:2067
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: falló la consulta: %s"
 
-#: pg_dumpall.c:2036 pg_dumpall.c:2062
+#: pg_dumpall.c:2043 pg_dumpall.c:2069
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: la consulta era: %s\n"
@@ -2364,27 +2384,32 @@
 msgid "%s: options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "%s: las opciones -c/--clean y -a/--data-only no pueden usarse juntas\n"
 
-#: pg_restore.c:329
+#: pg_restore.c:328
+#, c-format
+msgid "%s: invalid number of parallel jobs\n"
+msgstr "%s: número de trabajos paralelos no válido\n"
+
+#: pg_restore.c:336
+#, c-format
+msgid "%s: maximum number of parallel jobs is %d\n"
+msgstr "%s: el número máximo de trabajos en paralelo es %d\n"
+
+#: pg_restore.c:345
 #, 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:369
+#: pg_restore.c:385
 #, c-format
 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:399
-#, c-format
-msgid "%s: maximum number of parallel jobs is %d\n"
-msgstr "%s: el número máximo de trabajos en paralelo es %d\n"
-
-#: pg_restore.c:417
+#: pg_restore.c:425
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
 msgstr "PRECAUCIÓN: errores ignorados durante la recuperación: %d\n"
 
-#: pg_restore.c:431
+#: pg_restore.c:439
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2394,49 +2419,49 @@
 "creado por pg_dump.\n"
 "\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:441
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPCIÓN]... [ARCHIVO]\n"
 
-#: pg_restore.c:436
+#: pg_restore.c:444
 #, 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:437
+#: pg_restore.c:445
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=ARCHIVO       nombre del archivo de salida\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:446
 #, c-format
 msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr "  -F, --format=c|d|t       formato del volcado (debería ser automático)\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:447
 #, 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:440
+#: pg_restore.c:448
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            modo verboso\n"
 
-#: pg_restore.c:441
+#: pg_restore.c:449
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            mostrar información de versión y salir\n"
 
-#: pg_restore.c:442
+#: pg_restore.c:450
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               mostrar esta ayuda y salir\n"
 
-#: pg_restore.c:444
+#: pg_restore.c:452
 #, c-format
 msgid ""
 "\n"
@@ -2445,34 +2470,34 @@
 "\n"
 "Opciones que controlan la recuperación:\n"
 
-#: pg_restore.c:445
+#: pg_restore.c:453
 #, 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:447
+#: pg_restore.c:455
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create             crea la base de datos de destino\n"
 
-#: pg_restore.c:448
+#: pg_restore.c:456
 #, 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:449
+#: pg_restore.c:457
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NOMBRE       reestablece el índice nombrado\n"
 
-#: pg_restore.c:450
+#: pg_restore.c:458
 #, 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:451
+#: pg_restore.c:459
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -2481,56 +2506,56 @@
 "  -L, --use-list=ARCHIVO   usa la tabla de contenido especificada para ordenar\n"
 "                           la salida de este archivo\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:461
 #, 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:455
+#: pg_restore.c:463
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr ""
 "  -P, --function=NOMBRE(args)\n"
 "                           reestablece la función nombrada\n"
 
-#: pg_restore.c:456
+#: pg_restore.c:464
 #, 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:457
+#: pg_restore.c:465
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use for disabling triggers\n"
 msgstr ""
 "  -S, --superuser=NOMBRE   especifica el nombre del superusuario que se usa\n"
 "                           para deshabilitar los disparadores (triggers)\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:466
 #, c-format
 msgid "  -t, --table=NAME             restore named table\n"
 msgstr "  -t, --table=NOMBRE       reestablece la tabla nombrada\n"
 
-#: pg_restore.c:459
+#: pg_restore.c:467
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NOMBRE     reestablece el disparador (trigger) nombrado\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:468
 #, c-format
 msgid "  -x, --no-privileges          skip restoration of access privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges      no reestablece los privilegios (grant/revoke)\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:469
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr "  -1, --single-transaction reestablece en una única transacción\n"
 
-#: pg_restore.c:463
+#: pg_restore.c:471
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security    activa seguridad de filas\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:473
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
@@ -2540,29 +2565,29 @@
 "                           no reestablece datos de tablas que no pudieron\n"
 "                           ser creadas\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:475
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels     no restaura etiquetas de seguridad\n"
 
-#: pg_restore.c:468
+#: pg_restore.c:476
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces         no vuelca asignaciones de tablespace\n"
 
-#: pg_restore.c:469
+#: pg_restore.c:477
 #, c-format
 msgid "  --section=SECTION            restore named section (pre-data, data, or post-data)\n"
 msgstr ""
 "  --section=SECCIÓN        reestablece la sección nombrada (pre-data, data\n"
 "                           post-data)\n"
 
-#: pg_restore.c:480
+#: pg_restore.c:488
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=ROLENAME          hace SET ROLE antes de restaurar\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:490
 #, c-format
 msgid ""
 "\n"
@@ -2573,7 +2598,7 @@
 "Las opciones -I, -n, -P, -t, -T, y --section pueden ser combinadas y especificadas\n"
 "varias veces para seleccionar varios objetos.\n"
 
-#: pg_restore.c:485
+#: pg_restore.c:493
 #, c-format
 msgid ""
 "\n"
@@ -2583,3 +2608,24 @@
 "\n"
 "Si no se especifica un archivo de entrada, se usa la entrada estándar.\n"
 "\n"
+
+#~ msgid "could not open output file \"%s\" for writing\n"
+#~ msgstr "no se pudo abrir el archivo de salida «%s» para escritura\n"
+
+#~ msgid "archive member too large for tar format\n"
+#~ msgstr "el miembro de archivador es demasiado grande para el formato tar\n"
+
+#~ msgid "error in ListenToWorkers(): %s\n"
+#~ msgstr "error en ListenToWorkers(): %s\n"
+
+#~ msgid "terminated by user\n"
+#~ msgstr "terminado por el usuario\n"
+
+#~ msgid "unrecognized command on communication channel: %s\n"
+#~ msgstr "orden no reconocida en canal de comunicación: %s\n"
+
+#~ msgid "could not get relation name for OID %u: %s\n"
+#~ msgstr "no se pudo obtener un nombre de relación para el OID %u: %s\n"
+
+#~ msgid "worker is terminating\n"
+#~ msgstr "el proceso hijo está terminando\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/po/fr.po postgresql-9.5-9.5.8/src/bin/pg_dump/po/fr.po
--- postgresql-9.5-9.5.2/src/bin/pg_dump/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,66 +1,66 @@
 # translation of pg_dump.po to fr_fr
 # french message translation file for pg_dump
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 #
 # Guillaume Lelarge <guillaume@lelarge.info>, 2004-2009.
-# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
+# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-17 02:43+0000\n"
-"PO-Revision-Date: 2016-02-21 16:08+0100\n"
+"POT-Creation-Date: 2017-07-24 07:31+0000\n"
+"PO-Revision-Date: 2017-07-24 21:28+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 2.0.2\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
 msgid "could not identify current directory: %s"
-msgstr "n'a pas pu identifier le répertoire courant : %s"
+msgstr "n'a pas pu identifier le répertoire courant : %s"
 
 #: ../../common/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "binaire « %s » invalide"
+msgstr "binaire « %s » invalide"
 
 #: ../../common/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "n'a pas pu lire le binaire « %s »"
+msgstr "n'a pas pu lire le binaire « %s »"
 
 #: ../../common/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "n'a pas pu trouver un « %s » à exécuter"
+msgstr "n'a pas pu trouver un « %s » à exécuter"
 
 #: ../../common/exec.c:257 ../../common/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "n'a pas pu changer le répertoire par « %s » : %s"
+msgstr "n'a pas pu changer le répertoire par « %s » : %s"
 
 #: ../../common/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "n'a pas pu lire le lien symbolique « %s »"
+msgstr "n'a pas pu lire le lien symbolique « %s »"
 
 #: ../../common/exec.c:523
 #, c-format
 msgid "pclose failed: %s"
-msgstr "échec de pclose : %s"
+msgstr "échec de pclose : %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 pg_backup_db.c:137 pg_backup_db.c:188
-#: pg_backup_db.c:245 pg_backup_db.c:287
+#: ../../common/fe_memutils.c:98 pg_backup_db.c:157 pg_backup_db.c:212
+#: pg_backup_db.c:271 pg_backup_db.c:313
 #, c-format
 msgid "out of memory\n"
-msgstr "mémoire épuisée\n"
+msgstr "mémoire épuisée\n"
 
 #: ../../common/fe_memutils.c:92
 #, c-format
@@ -70,7 +70,7 @@
 #: ../../common/wait_error.c:47
 #, c-format
 msgid "command not executable"
-msgstr "commande non exécutable"
+msgstr "commande non exécutable"
 
 #: ../../common/wait_error.c:51
 #, c-format
@@ -80,27 +80,27 @@
 #: ../../common/wait_error.c:56
 #, c-format
 msgid "child process exited with exit code %d"
-msgstr "le processus fils a quitté avec le code de sortie %d"
+msgstr "le processus fils a quitté avec le code de sortie %d"
 
 #: ../../common/wait_error.c:63
 #, c-format
 msgid "child process was terminated by exception 0x%X"
-msgstr "le processus fils a été terminé par l'exception 0x%X"
+msgstr "le processus fils a été terminé par l'exception 0x%X"
 
 #: ../../common/wait_error.c:73
 #, c-format
 msgid "child process was terminated by signal %s"
-msgstr "le processus fils a été terminé par le signal %s"
+msgstr "le processus fils a été terminé par le signal %s"
 
 #: ../../common/wait_error.c:77
 #, c-format
 msgid "child process was terminated by signal %d"
-msgstr "le processus fils a été terminé par le signal %d"
+msgstr "le processus fils a été terminé par le signal %d"
 
 #: ../../common/wait_error.c:82
 #, c-format
 msgid "child process exited with unrecognized status %d"
-msgstr "le processus fils a quitté avec un statut %d non reconnu"
+msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
 #: common.c:119
 #, c-format
@@ -115,7 +115,7 @@
 #: common.c:128
 #, c-format
 msgid "reading schemas\n"
-msgstr "lecture des schémas\n"
+msgstr "lecture des schémas\n"
 
 #: common.c:139
 #, c-format
@@ -135,27 +135,27 @@
 #: common.c:159
 #, c-format
 msgid "reading procedural languages\n"
-msgstr "lecture des langages procéduraux\n"
+msgstr "lecture des langages procéduraux\n"
 
 #: common.c:163
 #, c-format
 msgid "reading user-defined aggregate functions\n"
-msgstr "lecture des fonctions d'aggrégats utilisateur\n"
+msgstr "lecture des fonctions d'aggrégats utilisateur\n"
 
 #: common.c:167
 #, c-format
 msgid "reading user-defined operators\n"
-msgstr "lecture des opérateurs utilisateur\n"
+msgstr "lecture des opérateurs utilisateur\n"
 
 #: common.c:172
 #, c-format
 msgid "reading user-defined operator classes\n"
-msgstr "lecture des classes d'opérateurs utilisateur\n"
+msgstr "lecture des classes d'opérateurs utilisateur\n"
 
 #: common.c:176
 #, c-format
 msgid "reading user-defined operator families\n"
-msgstr "lecture des familles d'opérateurs utilisateur\n"
+msgstr "lecture des familles d'opérateurs utilisateur\n"
 
 #: common.c:180
 #, c-format
@@ -165,7 +165,7 @@
 #: common.c:184
 #, c-format
 msgid "reading user-defined text search templates\n"
-msgstr "lecture des modèles utilisateur pour la recherche plein texte\n"
+msgstr "lecture des modèles utilisateur pour la recherche plein texte\n"
 
 #: common.c:188
 #, c-format
@@ -181,7 +181,7 @@
 #: common.c:196
 #, c-format
 msgid "reading user-defined foreign-data wrappers\n"
-msgstr "lecture des wrappers de données distantes utilisateur\n"
+msgstr "lecture des wrappers de données distantes utilisateur\n"
 
 #: common.c:200
 #, c-format
@@ -191,7 +191,7 @@
 #: common.c:204
 #, c-format
 msgid "reading default privileges\n"
-msgstr "lecture des droits par défaut\n"
+msgstr "lecture des droits par défaut\n"
 
 #: common.c:208
 #, c-format
@@ -216,12 +216,12 @@
 #: common.c:225
 #, c-format
 msgid "reading table inheritance information\n"
-msgstr "lecture des informations d'héritage des tables\n"
+msgstr "lecture des informations d'héritage des tables\n"
 
 #: common.c:229
 #, c-format
 msgid "reading event triggers\n"
-msgstr "lecture des déclencheurs sur évènement\n"
+msgstr "lecture des déclencheurs sur évènement\n"
 
 #: common.c:234
 #, c-format
@@ -231,17 +231,17 @@
 #: common.c:239
 #, c-format
 msgid "finding inheritance relationships\n"
-msgstr "recherche des relations d'héritage\n"
+msgstr "recherche des relations d'héritage\n"
 
 #: common.c:243
 #, c-format
 msgid "reading column info for interesting tables\n"
-msgstr "lecture des informations de colonnes des tables intéressantes\n"
+msgstr "lecture des informations de colonnes des tables intéressantes\n"
 
 #: common.c:247
 #, c-format
 msgid "flagging inherited columns in subtables\n"
-msgstr "marquage des colonnes héritées dans les sous-tables\n"
+msgstr "marquage des colonnes héritées dans les sous-tables\n"
 
 #: common.c:251
 #, c-format
@@ -256,12 +256,12 @@
 #: common.c:259
 #, c-format
 msgid "reading triggers\n"
-msgstr "lecture des déclencheurs\n"
+msgstr "lecture des déclencheurs\n"
 
 #: common.c:263
 #, c-format
 msgid "reading rewrite rules\n"
-msgstr "lecture des règles de réécriture\n"
+msgstr "lecture des règles de réécriture\n"
 
 #: common.c:267
 #, c-format
@@ -273,104 +273,108 @@
 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) "
+"vérification échouée, OID %u parent de la table « %s » (OID %u) "
 "introuvable\n"
 
 #: common.c:944
 #, 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"
+msgstr "n'a pas pu analyser le tableau numérique « %s » : trop de nombres\n"
 
 #: common.c:959
 #, 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"
+"n'a pas pu analyser le tableau numérique « %s » : caractère invalide dans\n"
 "le nombre\n"
 
 #. translator: this is a module name
-#: compress_io.c:79
+#: compress_io.c:78
 msgid "compress_io"
 msgstr "compression_io"
 
-#: compress_io.c:115
+#: compress_io.c:114
 #, c-format
 msgid "invalid compression code: %d\n"
 msgstr "code de compression invalide : %d\n"
 
-#: compress_io.c:139 compress_io.c:175 compress_io.c:196 compress_io.c:529
-#: compress_io.c:572
+#: compress_io.c:138 compress_io.c:174 compress_io.c:192 compress_io.c:519
+#: compress_io.c:562
 #, c-format
 msgid "not built with zlib support\n"
 msgstr "pas construit avec le support de zlib\n"
 
-#: compress_io.c:246 compress_io.c:348
+#: compress_io.c:242 compress_io.c:344
 #, c-format
 msgid "could not initialize compression library: %s\n"
-msgstr "n'a pas pu initialiser la bibliothèque de compression : %s\n"
+msgstr "n'a pas pu initialiser la bibliothèque de compression : %s\n"
 
-#: compress_io.c:267
+#: compress_io.c:263
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "n'a pas pu fermer le flux de compression : %s\n"
 
-#: compress_io.c:285
+#: compress_io.c:281
 #, c-format
 msgid "could not compress data: %s\n"
-msgstr "n'a pas pu compresser les données : %s\n"
+msgstr "n'a pas pu compresser les données : %s\n"
 
-#: compress_io.c:368 compress_io.c:384
+#: compress_io.c:361 compress_io.c:377
 #, c-format
 msgid "could not uncompress data: %s\n"
-msgstr "n'a pas pu décompresser les données : %s\n"
+msgstr "n'a pas pu décompresser les données : %s\n"
 
-#: compress_io.c:392
+#: compress_io.c:385
 #, c-format
 msgid "could not close compression library: %s\n"
-msgstr "n'a pas pu fermer la bibliothèque de compression : %s\n"
+msgstr "n'a pas pu fermer la bibliothèque de compression : %s\n"
 
-#: compress_io.c:606 compress_io.c:642 pg_backup_custom.c:591
+#: compress_io.c:596 compress_io.c:632 pg_backup_custom.c:591
 #: pg_backup_tar.c:560
 #, 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"
+msgstr "n'a pas pu lire à partir du fichier en entrée : %s\n"
 
-#: compress_io.c:645 pg_backup_custom.c:588 pg_backup_directory.c:552
+#: compress_io.c:635 pg_backup_custom.c:588 pg_backup_directory.c:548
 #: pg_backup_tar.c:796 pg_backup_tar.c:820
 #, c-format
 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"
+msgstr "n'a pas pu lire à partir du fichier en entrée : fin du fichier\n"
 
-#: parallel.c:76
-msgid "parallel archiver"
-msgstr "archiveur en parallèle"
+#: dumputils.c:402 dumputils.c:433
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr ""
+"l'argument de la commande shell contient un retour à la ligne ou un retour "
+"chariot : « %s »\n"
 
-#: parallel.c:139
+#: dumputils.c:545
 #, c-format
-msgid "%s: WSAStartup failed: %d\n"
-msgstr "%s : WSAStartup a échoué : %d\n"
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr ""
+"le nom de la base de données contient un retour à la ligne ou un retour "
+"chariot : « %s »\n"
 
-#: parallel.c:339
+#: parallel.c:166
+msgid "parallel archiver"
+msgstr "archiveur en parallèle"
+
+#: parallel.c:230
 #, c-format
-msgid "worker is terminating\n"
-msgstr "le worker est en cours d'arrêt\n"
+msgid "%s: WSAStartup failed: %d\n"
+msgstr "%s : WSAStartup a échoué : %d\n"
 
-#: parallel.c:529
+#: parallel.c:933
 #, c-format
 msgid "could not create communication channels: %s\n"
-msgstr "n'a pas pu créer le canal de communication : %s\n"
+msgstr "n'a pas pu créer le canal de communication : %s\n"
 
-#: parallel.c:601
+#: parallel.c:996
 #, c-format
 msgid "could not create worker process: %s\n"
-msgstr "n'a pas pu créer le processus de travail : %s\n"
+msgstr "n'a pas pu créer le processus de travail : %s\n"
 
-#: parallel.c:818
-#, c-format
-msgid "could not get relation name for OID %u: %s\n"
-msgstr "n'a pas pu obtenir le nom de la relation pour l'OID %u: %s\n"
-
-#: parallel.c:835
+#: parallel.c:1191
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -378,82 +382,72 @@
 "table after the pg_dump parent process had gotten the initial ACCESS SHARE "
 "lock on the table.\n"
 msgstr ""
-"impossible d'obtenir un verrou sur la relationn « %s »\n"
-"Cela signifie en général que quelqu'un à demandé un verrou ACCESS EXCLUSIVE "
-"sur la table après que pg_dump ait obtenu son verrou ACCESS SHARE initial "
+"impossible d'obtenir un verrou sur la relationn « %s »\n"
+"Cela signifie en général que quelqu'un à demandé un verrou ACCESS EXCLUSIVE "
+"sur la table après que pg_dump ait obtenu son verrou ACCESS SHARE initial "
 "sur la table.\n"
 
-#: parallel.c:919
+#: parallel.c:1261
 #, c-format
-msgid "unrecognized command on communication channel: %s\n"
-msgstr "commande inconnue sur le canal de communucation: %s\n"
+msgid "unrecognized command received from master: \"%s\"\n"
+msgstr "commande reçu du primaire non reconnue : « %s »\n"
 
-#: parallel.c:952
+#: parallel.c:1299
 #, c-format
 msgid "a worker process died unexpectedly\n"
-msgstr "un processus worker a subi un arrêt brutal inattendu\n"
-
-#: parallel.c:979 parallel.c:988
-#, c-format
-msgid "invalid message received from worker: %s\n"
-msgstr "message invalide reçu du worker: %s\n"
+msgstr "un processus worker a subi un arrêt brutal inattendu\n"
 
-#: parallel.c:985 pg_backup_db.c:355
+#: parallel.c:1325 parallel.c:1331
 #, c-format
-msgid "%s"
-msgstr "%s"
+msgid "invalid message received from worker: \"%s\"\n"
+msgstr "message invalide reçu du worker : « %s »\n"
 
-#: parallel.c:1037 parallel.c:1081
+#: parallel.c:1388 parallel.c:1439
 #, c-format
 msgid "error processing a parallel work item\n"
-msgstr "erreur durant le traitement en parallèle d'un item\n"
+msgstr "erreur durant le traitement en parallèle d'un item\n"
 
-#: parallel.c:1109 parallel.c:1247
+#: parallel.c:1468 parallel.c:1586
 #, c-format
 msgid "could not write to the communication channel: %s\n"
-msgstr "n'a pas pu écrire dans le canal de communication: %s\n"
-
-#: parallel.c:1158
-#, c-format
-msgid "terminated by user\n"
-msgstr "terminé par l'utilisateur\n"
+msgstr "n'a pas pu écrire dans le canal de communication: %s\n"
 
-#: parallel.c:1210
+#: parallel.c:1546
 #, c-format
-msgid "error in ListenToWorkers(): %s\n"
-msgstr "erreur dans ListenToWorkers(): %s\n"
+msgid "select() failed: %s\n"
+msgstr "échec de select() : %s\n"
 
-#: parallel.c:1335
+#: parallel.c:1671
 #, c-format
 msgid "pgpipe: could not create socket: error code %d\n"
-msgstr "pgpipe: n'a pas pu créer le socket: code d'erreur %d\n"
+msgstr "pgpipe: n'a pas pu créer le socket: code d'erreur %d\n"
 
-#: parallel.c:1346
+#: parallel.c:1682
 #, c-format
 msgid "pgpipe: could not bind: error code %d\n"
 msgstr "pgpipe: n'a pas pu se lier: code d'erreur %d\n"
 
-#: parallel.c:1353
+#: parallel.c:1689
 #, c-format
 msgid "pgpipe: could not listen: error code %d\n"
-msgstr "pgpipe : n'a pas pu se mettre en écoute: code d'erreur %d\n"
+msgstr "pgpipe : n'a pas pu se mettre en écoute: code d'erreur %d\n"
 
-#: parallel.c:1360
+#: parallel.c:1696
 #, c-format
 msgid "pgpipe: getsockname() failed: error code %d\n"
-msgstr "pgpipe: getsocketname() a échoué: code d'erreur %d\n"
+msgstr "pgpipe: getsocketname() a échoué: code d'erreur %d\n"
 
-#: parallel.c:1371
+#: parallel.c:1707
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d\n"
-msgstr "pgpipe: n'a pas pu créer un deuxième socket: code d'erreur %d\n"
+msgstr "pgpipe: n'a pas pu créer un deuxième socket: code d'erreur %d\n"
 
-#: parallel.c:1380
+#: parallel.c:1716
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d\n"
 msgstr "pgpipe: n'a pas pu de se connecter au socket: code d'erreur %d\n"
 
-#: parallel.c:1387
+#: parallel.c:1725
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d\n"
 msgstr "pgpipe: n'a pas pu accepter de connexion: code d'erreur %d\n"
@@ -463,7 +457,7 @@
 msgid "archiver"
 msgstr "archiveur"
 
-#: pg_backup_archiver.c:229 pg_backup_archiver.c:1499
+#: pg_backup_archiver.c:229 pg_backup_archiver.c:1550
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "n'a pas pu fermer le fichier de sortie : %s\n"
@@ -472,7 +466,7 @@
 #, c-format
 msgid "WARNING: archive items not in correct section order\n"
 msgstr ""
-"ATTENTION : les éléments de l'archive ne sont pas dans l'ordre correct de "
+"ATTENTION : les éléments de l'archive ne sont pas dans l'ordre correct de "
 "la section\n"
 
 #: pg_backup_archiver.c:286
@@ -489,7 +483,7 @@
 #, c-format
 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"
+"la restauration parallèle n'est pas supportée avec ce format de fichier\n"
 "d'archive\n"
 
 #: pg_backup_archiver.c:332
@@ -497,8 +491,8 @@
 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"
+"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:350
 #, c-format
@@ -506,487 +500,486 @@
 "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"
+"ne peut pas restaurer à partir de l'archive compressée (compression non\n"
 "disponible dans cette installation)\n"
 
 #: pg_backup_archiver.c:367
 #, c-format
 msgid "connecting to database for restore\n"
-msgstr "connexion à la base de données pour la restauration\n"
+msgstr "connexion à la base de données pour la restauration\n"
 
 #: pg_backup_archiver.c:369
 #, c-format
 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 connexions directes à la base de données ne sont pas supportées dans\n"
 "les archives pre-1.3\n"
 
 #: pg_backup_archiver.c:414
 #, c-format
 msgid "implied data-only restore\n"
-msgstr "a impliqué une restauration des données uniquement\n"
+msgstr "a impliqué une restauration des données uniquement\n"
 
 #: pg_backup_archiver.c:484
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "suppression de %s %s\n"
 
-#: pg_backup_archiver.c:637
+#: pg_backup_archiver.c:577
+#, c-format
+msgid ""
+"WARNING: could not find where to insert IF EXISTS in statement \"%s\"\n"
+msgstr ""
+"ATTENTION : n'a pas pu trouver où insérer IF EXISTS dans l'instruction « %s "
+"»\n"
+
+#: pg_backup_archiver.c:653
 #, c-format
 msgid "setting owner and privileges for %s \"%s.%s\"\n"
-msgstr "réglage du propriétaire et des droits pour %s « %s.%s»\n"
+msgstr "réglage du propriétaire et des droits pour %s « %s.%s»\n"
 
-#: pg_backup_archiver.c:640
+#: pg_backup_archiver.c:656
 #, c-format
 msgid "setting owner and privileges for %s \"%s\"\n"
-msgstr "réglage du propriétaire et des droits pour %s « %s »\n"
+msgstr "réglage du propriétaire et des droits pour %s « %s »\n"
 
-#: pg_backup_archiver.c:706 pg_backup_archiver.c:708
+#: pg_backup_archiver.c:722 pg_backup_archiver.c:724
 #, 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:717
+#: pg_backup_archiver.c:733
 #, c-format
 msgid "creating %s \"%s.%s\"\n"
-msgstr "création de %s « %s.%s »\n"
+msgstr "création de %s « %s.%s »\n"
 
-#: pg_backup_archiver.c:720
+#: pg_backup_archiver.c:736
 #, c-format
 msgid "creating %s \"%s\"\n"
-msgstr "création de %s « %s »\n"
+msgstr "création de %s « %s »\n"
 
-#: pg_backup_archiver.c:765
+#: pg_backup_archiver.c:788
 #, c-format
 msgid "connecting to new database \"%s\"\n"
-msgstr "connexion à la nouvelle base de données « %s »\n"
+msgstr "connexion à la nouvelle base de données « %s »\n"
 
-#: pg_backup_archiver.c:793
+#: pg_backup_archiver.c:816
 #, c-format
 msgid "processing %s\n"
 msgstr "traitement de %s\n"
 
-#: pg_backup_archiver.c:813
+#: pg_backup_archiver.c:836
 #, c-format
 msgid "processing data for table \"%s.%s\"\n"
-msgstr "traitement des données de la table « %s.%s »\n"
+msgstr "traitement des données de la table « %s.%s »\n"
 
-#: pg_backup_archiver.c:875
+#: pg_backup_archiver.c:898
 #, c-format
 msgid "executing %s %s\n"
-msgstr "exécution de %s %s\n"
+msgstr "exécution de %s %s\n"
 
-#: pg_backup_archiver.c:914
+#: pg_backup_archiver.c:937
 #, c-format
 msgid "disabling triggers for %s\n"
-msgstr "désactivation des déclencheurs pour %s\n"
+msgstr "désactivation des déclencheurs pour %s\n"
 
-#: pg_backup_archiver.c:942
+#: pg_backup_archiver.c:965
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "activation des triggers pour %s\n"
 
-#: pg_backup_archiver.c:972
+#: pg_backup_archiver.c:995
 #, c-format
 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"
+"erreur interne -- WriteData ne peut pas être appelé en dehors du contexte\n"
 "de la routine DataDumper\n"
 
-#: pg_backup_archiver.c:1137
+#: pg_backup_archiver.c:1188
 #, c-format
 msgid "large-object output not supported in chosen format\n"
 msgstr ""
-"la sauvegarde des « Large Objects » n'est pas supportée dans le format "
+"la sauvegarde des « Large Objects » n'est pas supportée dans le format "
 "choisi\n"
 
-#: pg_backup_archiver.c:1195
+#: pg_backup_archiver.c:1246
 #, 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"
+msgstr[0] "restauration de %d « Large Object »\n"
+msgstr[1] "restauration de %d « Large Objects »\n"
 
-#: pg_backup_archiver.c:1216 pg_backup_tar.c:738
+#: pg_backup_archiver.c:1267 pg_backup_tar.c:738
 #, c-format
 msgid "restoring large object with OID %u\n"
-msgstr "restauration du « Large Object » d'OID %u\n"
+msgstr "restauration du « Large Object » d'OID %u\n"
 
-#: pg_backup_archiver.c:1228
+#: pg_backup_archiver.c:1279
 #, c-format
 msgid "could not create large object %u: %s"
-msgstr "n'a pas pu créer le « Large Object » %u : %s"
+msgstr "n'a pas pu créer le « Large Object » %u : %s"
 
-#: pg_backup_archiver.c:1233 pg_dump.c:2859
+#: pg_backup_archiver.c:1284 pg_dump.c:2914
 #, c-format
 msgid "could not open large object %u: %s"
-msgstr "n'a pas pu ouvrir le « Large Object » %u : %s"
+msgstr "n'a pas pu ouvrir le « Large Object » %u : %s"
 
-#: pg_backup_archiver.c:1291
+#: pg_backup_archiver.c:1342
 #, c-format
 msgid "could not open TOC file \"%s\": %s\n"
-msgstr "n'a pas pu ouvrir le fichier TOC « %s » : %s\n"
+msgstr "n'a pas pu ouvrir le fichier TOC « %s » : %s\n"
 
-#: pg_backup_archiver.c:1332
+#: pg_backup_archiver.c:1383
 #, c-format
 msgid "WARNING: line ignored: %s\n"
-msgstr "ATTENTION : ligne ignorée : %s\n"
+msgstr "ATTENTION : ligne ignorée : %s\n"
 
-#: pg_backup_archiver.c:1339
+#: pg_backup_archiver.c:1390
 #, 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"
+msgstr "n'a pas pu trouver l'entrée pour l'ID %d\n"
 
-#: pg_backup_archiver.c:1360 pg_backup_directory.c:230
-#: pg_backup_directory.c:601
+#: pg_backup_archiver.c:1411 pg_backup_directory.c:230
+#: pg_backup_directory.c:597
 #, 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:1469 pg_backup_custom.c:162 pg_backup_directory.c:341
-#: pg_backup_directory.c:587 pg_backup_directory.c:645
-#: pg_backup_directory.c:665
+#: pg_backup_archiver.c:1520 pg_backup_custom.c:162 pg_backup_directory.c:341
+#: pg_backup_directory.c:583 pg_backup_directory.c:641
+#: pg_backup_directory.c:661
 #, c-format
 msgid "could not open output file \"%s\": %s\n"
-msgstr "n'a pas pu ouvrir le fichier de sauvegarde « %s » : %s\n"
+msgstr "n'a pas pu ouvrir le fichier de sauvegarde « %s » : %s\n"
 
-#: pg_backup_archiver.c:1472 pg_backup_custom.c:169
+#: pg_backup_archiver.c:1523 pg_backup_custom.c:169
 #, 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:1578
+#: pg_backup_archiver.c:1629
 #, 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"
+"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"
+"a écrit %lu octets de données d'un « Large Object » (résultat = %lu)\n"
 
-#: pg_backup_archiver.c:1584
+#: pg_backup_archiver.c:1635
 #, 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"
+"n'a pas pu écrire le « Large Object » (résultat : %lu, attendu : %lu)\n"
 
-#: pg_backup_archiver.c:1677
+#: pg_backup_archiver.c:1728
 #, c-format
 msgid "Error while INITIALIZING:\n"
-msgstr "Erreur pendant l'initialisation (« INITIALIZING ») :\n"
+msgstr "Erreur pendant l'initialisation (« INITIALIZING ») :\n"
 
-#: pg_backup_archiver.c:1682
+#: pg_backup_archiver.c:1733
 #, c-format
 msgid "Error while PROCESSING TOC:\n"
-msgstr "Erreur pendant le traitement de la TOC (« PROCESSING TOC ») :\n"
+msgstr "Erreur pendant le traitement de la TOC (« PROCESSING TOC ») :\n"
 
-#: pg_backup_archiver.c:1687
+#: pg_backup_archiver.c:1738
 #, c-format
 msgid "Error while FINALIZING:\n"
-msgstr "Erreur pendant la finalisation (« FINALIZING ») :\n"
+msgstr "Erreur pendant la finalisation (« FINALIZING ») :\n"
 
-#: pg_backup_archiver.c:1692
+#: pg_backup_archiver.c:1743
 #, 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"
+msgstr "Erreur à partir de l'entrée TOC %d ; %u %u %s %s %s\n"
 
-#: pg_backup_archiver.c:1765
+#: pg_backup_archiver.c:1816
 #, c-format
 msgid "bad dumpId\n"
 msgstr "mauvais dumpId\n"
 
-#: pg_backup_archiver.c:1786
+#: pg_backup_archiver.c:1837
 #, c-format
 msgid "bad table dumpId for TABLE DATA item\n"
-msgstr "mauvais dumpId de table pour l'élément TABLE DATA\n"
+msgstr "mauvais dumpId de table pour l'élément TABLE DATA\n"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1929
 #, c-format
 msgid "unexpected data offset flag %d\n"
-msgstr "drapeau de décalage de données inattendu %d\n"
+msgstr "drapeau de décalage de données inattendu %d\n"
 
-#: pg_backup_archiver.c:1891
+#: pg_backup_archiver.c:1942
 #, c-format
 msgid "file offset in dump file is too large\n"
-msgstr "le décalage dans le fichier de sauvegarde est trop important\n"
+msgstr "le décalage dans le fichier de sauvegarde est trop important\n"
 
-#: pg_backup_archiver.c:2004
+#: pg_backup_archiver.c:2055
 #, c-format
 msgid "attempting to ascertain archive format\n"
 msgstr "tentative d'identification du format de l'archive\n"
 
-#: pg_backup_archiver.c:2030 pg_backup_archiver.c:2040
+#: pg_backup_archiver.c:2081 pg_backup_archiver.c:2091
 #, c-format
 msgid "directory name too long: \"%s\"\n"
-msgstr "nom du répertoire trop long : « %s »\n"
+msgstr "nom du répertoire trop long : « %s »\n"
 
-#: pg_backup_archiver.c:2048
+#: pg_backup_archiver.c:2099
 #, 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 » "
+"le répertoire « %s » ne semble pas être une archive valide (« toc.dat » "
 "n'existe pas)\n"
 
-#: pg_backup_archiver.c:2056 pg_backup_custom.c:181 pg_backup_custom.c:770
-#: pg_backup_directory.c:214 pg_backup_directory.c:402
+#: pg_backup_archiver.c:2107 pg_backup_custom.c:181 pg_backup_custom.c:770
+#: pg_backup_directory.c:214 pg_backup_directory.c:399
 #, 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"
+msgstr "n'a pas pu ouvrir le fichier en entrée « %s » : %s\n"
 
-#: pg_backup_archiver.c:2064 pg_backup_custom.c:188
+#: pg_backup_archiver.c:2115 pg_backup_custom.c:188
 #, c-format
 msgid "could not open input file: %s\n"
-msgstr "n'a pas pu ouvrir le fichier en entrée : %s\n"
+msgstr "n'a pas pu ouvrir le fichier en entrée : %s\n"
 
-#: pg_backup_archiver.c:2071
+#: pg_backup_archiver.c:2122
 #, c-format
 msgid "could not read input file: %s\n"
-msgstr "n'a pas pu lire le fichier en entrée : %s\n"
+msgstr "n'a pas pu lire le fichier en entrée : %s\n"
 
-#: pg_backup_archiver.c:2073
+#: pg_backup_archiver.c:2124
 #, 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"
+msgstr "le fichier en entrée est trop petit (%lu lus, 5 attendus)\n"
 
-#: pg_backup_archiver.c:2156
+#: pg_backup_archiver.c:2207
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql.\n"
 msgstr ""
-"Le fichier en entrée semble être une sauvegarde au format texte. Merci "
+"Le fichier en entrée semble être une sauvegarde au format texte. Merci "
 "d'utiliser psql.\n"
 
-#: pg_backup_archiver.c:2162
+#: pg_backup_archiver.c:2213
 #, c-format
 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"
+"le fichier en entrée ne semble pas être une archive valide (trop petit ?)\n"
 
-#: pg_backup_archiver.c:2168
+#: pg_backup_archiver.c:2219
 #, c-format
 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"
+msgstr "le fichier en entrée ne semble pas être une archive valide\n"
 
-#: pg_backup_archiver.c:2188
+#: pg_backup_archiver.c:2239
 #, c-format
 msgid "could not close input file: %s\n"
-msgstr "n'a pas pu fermer le fichier en entrée : %s\n"
+msgstr "n'a pas pu fermer le fichier en entrée : %s\n"
 
-#: pg_backup_archiver.c:2205
+#: pg_backup_archiver.c:2256
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "allocation d'AH pour %s, format %d\n"
 
-#: pg_backup_archiver.c:2310
+#: pg_backup_archiver.c:2361
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
-msgstr "format de fichier « %d » non reconnu\n"
+msgstr "format de fichier « %d » non reconnu\n"
 
-#: pg_backup_archiver.c:2460
+#: pg_backup_archiver.c:2517
 #, 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"
+"ID %d de l'entrée en dehors de la plage -- peut-être un TOC corrompu\n"
 
-#: pg_backup_archiver.c:2576
+#: pg_backup_archiver.c:2633
 #, 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"
+msgstr "lecture de l'entrée %d de la TOC (ID %d) pour %s %s\n"
 
-#: pg_backup_archiver.c:2610
+#: pg_backup_archiver.c:2667
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
-msgstr "encodage « %s » non reconnu\n"
+msgstr "encodage « %s » non reconnu\n"
 
-#: pg_backup_archiver.c:2615
+#: pg_backup_archiver.c:2672
 #, c-format
 msgid "invalid ENCODING item: %s\n"
-msgstr "élément ENCODING invalide : %s\n"
+msgstr "élément ENCODING invalide : %s\n"
 
-#: pg_backup_archiver.c:2633
+#: pg_backup_archiver.c:2690
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
-msgstr "élément STDSTRINGS invalide : %s\n"
+msgstr "élément STDSTRINGS invalide : %s\n"
 
-#: pg_backup_archiver.c:2858
+#: pg_backup_archiver.c:2925
 #, c-format
 msgid "could not set session user to \"%s\": %s"
-msgstr "n'a pas pu initialiser la session utilisateur à « %s »: %s"
+msgstr "n'a pas pu initialiser la session utilisateur à « %s »: %s"
 
-#: pg_backup_archiver.c:2890
+#: pg_backup_archiver.c:2957
 #, c-format
 msgid "could not set default_with_oids: %s"
 msgstr "n'a pas pu configurer default_with_oids : %s"
 
-#: pg_backup_archiver.c:3030
+#: pg_backup_archiver.c:3102
 #, c-format
 msgid "could not set search_path to \"%s\": %s"
-msgstr "n'a pas pu configurer search_path à « %s » : %s"
+msgstr "n'a pas pu configurer search_path à « %s » : %s"
 
-#: pg_backup_archiver.c:3092
+#: pg_backup_archiver.c:3164
 #, c-format
 msgid "could not set default_tablespace to %s: %s"
-msgstr "n'a pas pu configurer default_tablespace à %s : %s"
-
-#: pg_backup_archiver.c:3179 pg_backup_archiver.c:3366
-#, 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"
+msgstr "n'a pas pu configurer default_tablespace à %s : %s"
 
-#: pg_backup_archiver.c:3419
+#: pg_backup_archiver.c:3252 pg_backup_archiver.c:3447
 #, c-format
-msgid ""
-"WARNING: requested compression not available in this installation -- "
-"archive will be uncompressed\n"
+msgid "WARNING: don't know how to set owner for object type \"%s\"\n"
 msgstr ""
-"ATTENTION : la compression requise n'est pas disponible avec cette\n"
-"installation -- l'archive ne sera pas compressée\n"
+"ATTENTION : ne sait pas comment initialiser le propriétaire du type d'objet "
+"« %s »\n"
 
-#: pg_backup_archiver.c:3458
+#: pg_backup_archiver.c:3530
 #, c-format
 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"
+msgstr "n'a pas trouver la chaîne magique dans le fichier d'en-tête\n"
 
-#: pg_backup_archiver.c:3471
+#: pg_backup_archiver.c:3543
 #, 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"
+msgstr "version non supportée (%d.%d) dans le fichier d'en-tête\n"
 
-#: pg_backup_archiver.c:3476
+#: pg_backup_archiver.c:3548
 #, 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"
+msgstr "échec de la vérification sur la taille de l'entier (%lu)\n"
 
-#: pg_backup_archiver.c:3480
+#: pg_backup_archiver.c:3552
 #, c-format
 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"
+"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:3490
+#: pg_backup_archiver.c:3562
 #, 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"
+msgstr "le format attendu (%d) diffère du format du fichier (%d)\n"
 
-#: pg_backup_archiver.c:3506
+#: pg_backup_archiver.c:3578
 #, c-format
 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"
+"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:3524
+#: pg_backup_archiver.c:3596
 #, c-format
 msgid "WARNING: invalid creation date in header\n"
-msgstr "ATTENTION : date de création invalide dans l'en-tête\n"
+msgstr "ATTENTION : date de création invalide dans l'en-tête\n"
 
-#: pg_backup_archiver.c:3599
+#: pg_backup_archiver.c:3671
 #, c-format
 msgid "entering restore_toc_entries_prefork\n"
-msgstr "entrée dans restore_toc_entries_prefork\n"
+msgstr "entrée dans restore_toc_entries_prefork\n"
 
-#: pg_backup_archiver.c:3643
+#: pg_backup_archiver.c:3715
 #, c-format
 msgid "processing item %d %s %s\n"
-msgstr "traitement de l'élément %d %s %s\n"
+msgstr "traitement de l'élément %d %s %s\n"
 
-#: pg_backup_archiver.c:3695
+#: pg_backup_archiver.c:3767
 #, c-format
 msgid "entering restore_toc_entries_parallel\n"
-msgstr "entrée dans restore_toc_entries_parallel\n"
+msgstr "entrée dans restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3743
+#: pg_backup_archiver.c:3815
 #, c-format
 msgid "entering main parallel loop\n"
-msgstr "entrée dans la boucle parallèle principale\n"
+msgstr "entrée dans la boucle parallèle principale\n"
 
-#: pg_backup_archiver.c:3754
+#: pg_backup_archiver.c:3826
 #, c-format
 msgid "skipping item %d %s %s\n"
-msgstr "omission de l'élément %d %s %s\n"
+msgstr "omission de l'élément %d %s %s\n"
 
-#: pg_backup_archiver.c:3764
+#: pg_backup_archiver.c:3836
 #, c-format
 msgid "launching item %d %s %s\n"
-msgstr "élément de lancement %d %s %s\n"
+msgstr "élément de lancement %d %s %s\n"
 
-#: pg_backup_archiver.c:3822
+#: pg_backup_archiver.c:3892
 #, c-format
 msgid "finished main parallel loop\n"
-msgstr "fin de la boucle parallèle principale\n"
+msgstr "fin de la boucle parallèle principale\n"
 
-#: pg_backup_archiver.c:3831
+#: pg_backup_archiver.c:3901
 #, c-format
 msgid "entering restore_toc_entries_postfork\n"
-msgstr "entrée dans restore_toc_entries_prefork\n"
+msgstr "entrée dans restore_toc_entries_prefork\n"
 
-#: pg_backup_archiver.c:3849
+#: pg_backup_archiver.c:3920
 #, c-format
 msgid "processing missed item %d %s %s\n"
-msgstr "traitement de l'élément manquant %d %s %s\n"
+msgstr "traitement de l'élément manquant %d %s %s\n"
 
-#: pg_backup_archiver.c:3998
+#: pg_backup_archiver.c:4069
 #, c-format
 msgid "no item ready\n"
-msgstr "aucun élément prêt\n"
+msgstr "aucun élément prêt\n"
 
-#: pg_backup_archiver.c:4047
+#: pg_backup_archiver.c:4117
 #, c-format
 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:4049
+#: pg_backup_archiver.c:4119
 #, c-format
 msgid "finished item %d %s %s\n"
-msgstr "élément terminé %d %s %s\n"
+msgstr "élément terminé %d %s %s\n"
 
-#: pg_backup_archiver.c:4062
+#: pg_backup_archiver.c:4132
 #, c-format
 msgid "worker process failed: exit code %d\n"
-msgstr "échec du processus de travail : code de sortie %d\n"
+msgstr "échec du processus de travail : code de sortie %d\n"
 
-#: pg_backup_archiver.c:4224
+#: pg_backup_archiver.c:4294
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
-msgstr "transfert de la dépendance %d -> %d vers %d\n"
+msgstr "transfert de la dépendance %d -> %d vers %d\n"
 
-#: pg_backup_archiver.c:4297
+#: pg_backup_archiver.c:4367
 #, c-format
 msgid "reducing dependencies for %d\n"
-msgstr "réduction des dépendances pour %d\n"
+msgstr "réduction des dépendances pour %d\n"
 
-#: pg_backup_archiver.c:4336
+#: pg_backup_archiver.c:4406
 #, 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"
+"la table « %s » n'a pas pu être créée, ses données ne seront pas "
+"restaurées\n"
 
 #. translator: this is a module name
 #: pg_backup_custom.c:94
 msgid "custom archiver"
-msgstr "programme d'archivage personnalisé"
+msgstr "programme d'archivage personnalisé"
 
 #: pg_backup_custom.c:384 pg_backup_null.c:149
 #, c-format
 msgid "invalid OID for large object\n"
-msgstr "OID invalide pour le « Large Object »\n"
+msgstr "OID invalide pour le « Large Object »\n"
 
 #: pg_backup_custom.c:455
 #, 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"
+"type de bloc de données non reconnu (%d) lors de la recherche dans\n"
 "l'archive\n"
 
 #: pg_backup_custom.c:466
@@ -1002,9 +995,9 @@
 "archive\n"
 msgstr ""
 "n'a pas pu trouver l'identifiant de bloc %d dans l'archive -\n"
-"il est possible que cela soit dû à une demande de restauration dans un "
+"il est possible que cela soit dû à une demande de restauration dans un "
 "ordre\n"
-"différent, qui n'a pas pu être géré à cause d'un manque d'information de\n"
+"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:481
@@ -1014,9 +1007,9 @@
 "restore request, which cannot be handled due to non-seekable input file\n"
 msgstr ""
 "n'a pas pu trouver l'identifiant de bloc %d dans l'archive -\n"
-"il est possible que cela soit dû à une demande de restauration dans un "
+"il est possible que cela soit dû à une demande de restauration dans un "
 "ordre\n"
-"différent, ce qui ne peut pas être géré à cause d'un fichier non gérable "
+"différent, ce qui ne peut pas être géré à cause d'un fichier non gérable "
 "en\n"
 "recherche\n"
 
@@ -1031,13 +1024,13 @@
 #, 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"
+"ID de bloc inattendu (%d) lors de la lecture des données -- %d attendu\n"
 
 #: pg_backup_custom.c:507
 #, 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 "
+"type de bloc de données %d non reconnu lors de la restauration de "
 "l'archive\n"
 
 #: pg_backup_custom.c:709 pg_backup_custom.c:759 pg_backup_custom.c:908
@@ -1045,7 +1038,7 @@
 #, 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 : "
+"n'a pas pu déterminer la position de recherche dans le fichier d'archive : "
 "%s\n"
 
 #: pg_backup_custom.c:727 pg_backup_custom.c:764
@@ -1056,19 +1049,19 @@
 #: pg_backup_custom.c:746
 #, c-format
 msgid "can only reopen input archives\n"
-msgstr "peut seulement rouvrir l'archive en entrée\n"
+msgstr "peut seulement rouvrir l'archive en entrée\n"
 
 #: pg_backup_custom.c:753
 #, c-format
 msgid "parallel restore from standard input is not supported\n"
-msgstr "la restauration parallélisée n'est pas supportée à partir de stdin\n"
+msgstr "la restauration parallélisée n'est pas supportée à partir de stdin\n"
 
 #: pg_backup_custom.c:755
 #, c-format
 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"
+"la restauration parallélisée n'est pas supportée à partir de fichiers sans "
+"table de matière\n"
 
 #: pg_backup_custom.c:774
 #, c-format
@@ -1080,180 +1073,199 @@
 #: pg_backup_custom.c:792
 #, c-format
 msgid "compressor active\n"
-msgstr "compression activée\n"
+msgstr "compression activée\n"
 
 #: pg_backup_custom.c:912
 #, c-format
 msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
 msgstr ""
-"ATTENTION : ftell ne correspond pas à la position attendue -- ftell "
-"utilisé\n"
+"ATTENTION : ftell ne correspond pas à la position attendue -- ftell "
+"utilisé\n"
 
 #. translator: this is a module name
-#: pg_backup_db.c:29
+#: pg_backup_db.c:30
 msgid "archiver (db)"
 msgstr "programme d'archivage (db)"
 
-#: pg_backup_db.c:44
+#: pg_backup_db.c:46
 #, c-format
 msgid "could not get server_version from libpq\n"
 msgstr "n'a pas pu obtenir server_version de libpq\n"
 
-#: pg_backup_db.c:55 pg_dumpall.c:1965
+#: pg_backup_db.c:57 pg_dumpall.c:1972
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "version du serveur : %s ; %s version : %s\n"
 
-#: pg_backup_db.c:57 pg_dumpall.c:1967
+#: pg_backup_db.c:59 pg_dumpall.c:1974
 #, c-format
 msgid "aborting because of server version mismatch\n"
-msgstr "annulation à cause de la différence des versions\n"
+msgstr "annulation à cause de la différence des versions\n"
 
-#: pg_backup_db.c:128
+#: pg_backup_db.c:148
 #, 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"
+msgstr "connexion à la base de données « %s » en tant qu'utilisateur « %s »\n"
 
-#: pg_backup_db.c:135 pg_backup_db.c:183 pg_backup_db.c:243 pg_backup_db.c:285
-#: pg_dumpall.c:1795 pg_dumpall.c:1903
+#: pg_backup_db.c:155 pg_backup_db.c:207 pg_backup_db.c:269 pg_backup_db.c:311
+#: pg_dumpall.c:1798 pg_dumpall.c:1910
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: pg_backup_db.c:164
+#: pg_backup_db.c:188
 #, c-format
 msgid "failed to reconnect to database\n"
-msgstr "la reconnexion à la base de données a échoué\n"
+msgstr "la reconnexion à la base de données a échoué\n"
 
-#: pg_backup_db.c:169
+#: pg_backup_db.c:193
 #, c-format
 msgid "could not reconnect to database: %s"
-msgstr "n'a pas pu se reconnecter à la base de données : %s"
+msgstr "n'a pas pu se reconnecter à la base de données : %s"
 
-#: pg_backup_db.c:185
+#: pg_backup_db.c:209
 #, c-format
 msgid "connection needs password\n"
-msgstr "la connexion nécessite un mot de passe\n"
+msgstr "la connexion nécessite un mot de passe\n"
 
-#: pg_backup_db.c:237
+#: pg_backup_db.c:263
 #, c-format
 msgid "already connected to a database\n"
-msgstr "déjà connecté à une base de données\n"
+msgstr "déjà connecté à une base de données\n"
 
-#: pg_backup_db.c:277
+#: pg_backup_db.c:303
 #, c-format
 msgid "failed to connect to database\n"
-msgstr "n'a pas pu se connecter à la base de données\n"
+msgstr "n'a pas pu se connecter à la base de données\n"
 
-#: pg_backup_db.c:294
+#: pg_backup_db.c:320
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
-msgstr "la connexion à la base de données « %s » a échoué : %s"
+msgstr "la connexion à la base de données « %s » a échoué : %s"
+
+#: pg_backup_db.c:390
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: pg_backup_db.c:362
+#: pg_backup_db.c:397
 #, c-format
 msgid "query failed: %s"
-msgstr "échec de la requête : %s"
+msgstr "échec de la requête : %s"
 
-#: pg_backup_db.c:364
+#: pg_backup_db.c:399
 #, c-format
 msgid "query was: %s\n"
-msgstr "la requête était : %s\n"
+msgstr "la requête était : %s\n"
+
+#: pg_backup_db.c:441
+#, 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_backup_db.c:428
+#: pg_backup_db.c:486
 #, c-format
 msgid "%s: %s    Command was: %s\n"
-msgstr "%s: %s    La commande était : %s\n"
+msgstr "%s: %s    La commande était : %s\n"
 
-#: pg_backup_db.c:484 pg_backup_db.c:558 pg_backup_db.c:565
+#: pg_backup_db.c:542 pg_backup_db.c:616 pg_backup_db.c:623
 msgid "could not execute query"
-msgstr "n'a pas pu exécuter la requête"
+msgstr "n'a pas pu exécuter la requête"
 
-#: pg_backup_db.c:537
+#: pg_backup_db.c:595
 #, c-format
 msgid "error returned by PQputCopyData: %s"
-msgstr "erreur renvoyée par PQputCopyData : %s"
+msgstr "erreur renvoyée par PQputCopyData : %s"
 
-#: pg_backup_db.c:586
+#: pg_backup_db.c:644
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
-msgstr "erreur renvoyée par PQputCopyEnd : %s"
+msgstr "erreur renvoyée par PQputCopyEnd : %s"
 
-#: pg_backup_db.c:592
+#: pg_backup_db.c:650
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
-msgstr "COPY échoué pour la table « %s » : %s"
+msgstr "COPY échoué pour la table « %s » : %s"
 
-#: pg_backup_db.c:605
+#: pg_backup_db.c:656 pg_dump.c:1700
+#, c-format
+msgid "WARNING: unexpected extra results during COPY of table \"%s\"\n"
+msgstr ""
+"ATTENTION : résultats supplémentaires inattendues lors du COPY de la table "
+"« %s »\n"
+
+#: pg_backup_db.c:668
 msgid "could not start database transaction"
-msgstr "n'a pas pu démarrer la transaction de la base de données"
+msgstr "n'a pas pu démarrer la transaction de la base de données"
 
-#: pg_backup_db.c:613
+#: pg_backup_db.c:676
 msgid "could not commit database transaction"
-msgstr "n'a pas pu valider la transaction de la base de données"
+msgstr "n'a pas pu valider la transaction de la base de données"
 
 #. translator: this is a module name
 #: pg_backup_directory.c:64
 msgid "directory archiver"
-msgstr "archiveur répertoire"
+msgstr "archiveur répertoire"
 
 #: pg_backup_directory.c:162
 #, c-format
 msgid "no output directory specified\n"
-msgstr "aucun répertoire cible indiqué\n"
+msgstr "aucun répertoire cible indiqué\n"
 
 #: pg_backup_directory.c:191
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
-msgstr "n'a pas pu lire le répertoire « %s » : %s\n"
+msgstr "n'a pas pu lire le répertoire « %s » : %s\n"
 
 #: pg_backup_directory.c:195
 #, c-format
 msgid "could not close directory \"%s\": %s\n"
-msgstr "n'a pas pu fermer le répertoire « %s » : %s\n"
+msgstr "n'a pas pu fermer le répertoire « %s » : %s\n"
 
 #: pg_backup_directory.c:201
 #, c-format
 msgid "could not create directory \"%s\": %s\n"
-msgstr "n'a pas pu créer le répertoire « %s » : %s\n"
+msgstr "n'a pas pu créer le répertoire « %s » : %s\n"
 
-#: pg_backup_directory.c:413
+#: pg_backup_directory.c:412
 #, c-format
 msgid "could not close data file: %s\n"
-msgstr "n'a pas pu fermer le fichier de données : %s\n"
+msgstr "n'a pas pu fermer le fichier de données : %s\n"
 
-#: pg_backup_directory.c:454
+#: pg_backup_directory.c:453
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %s\n"
 msgstr ""
-"n'a pas pu ouvrir le fichier sommaire « %s » du Large Object en entrée : "
+"n'a pas pu ouvrir le fichier sommaire « %s » du Large Object en entrée : "
 "%s\n"
 
-#: pg_backup_directory.c:465
+#: pg_backup_directory.c:464
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\"\n"
-msgstr "ligne invalide dans le fichier TOC du Large Object « %s » : « %s »\n"
+msgstr "ligne invalide dans le fichier TOC du Large Object « %s » : « %s »\n"
 
-#: pg_backup_directory.c:474
+#: pg_backup_directory.c:473
 #, c-format
 msgid "error reading large object TOC file \"%s\"\n"
-msgstr "erreur lors de la lecture du TOC du fichier Large Object « %s »\n"
+msgstr "erreur lors de la lecture du TOC du fichier Large Object « %s »\n"
 
-#: pg_backup_directory.c:478
+#: pg_backup_directory.c:477
 #, c-format
 msgid "could not close large object TOC file \"%s\": %s\n"
-msgstr "n'a pas pu fermer le TOC du Large Object « %s » : %s\n"
+msgstr "n'a pas pu fermer le TOC du Large Object « %s » : %s\n"
 
-#: pg_backup_directory.c:688
+#: pg_backup_directory.c:684
 #, c-format
 msgid "could not write to blobs TOC file\n"
-msgstr "n'a pas pu écrire dans le fichier toc des données binaires\n"
+msgstr "n'a pas pu écrire dans le fichier toc des données binaires\n"
 
-#: pg_backup_directory.c:720
+#: pg_backup_directory.c:716
 #, c-format
 msgid "file name too long: \"%s\"\n"
-msgstr "nom du fichier trop long : « %s »\n"
+msgstr "nom du fichier trop long : « %s »\n"
 
-#: pg_backup_directory.c:806
+#: pg_backup_directory.c:802
 #, c-format
 msgid "error during backup\n"
 msgstr "erreur lors de la sauvegarde\n"
@@ -1261,7 +1273,7 @@
 #: pg_backup_null.c:74
 #, c-format
 msgid "this format cannot be read\n"
-msgstr "ce format ne peut pas être lu\n"
+msgstr "ce format ne peut pas être lu\n"
 
 #. translator: this is a module name
 #: pg_backup_tar.c:101
@@ -1271,7 +1283,7 @@
 #: pg_backup_tar.c:182
 #, 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"
+msgstr "n'a pas pu ouvrir le fichier TOC « %s » en sortie : %s\n"
 
 #: pg_backup_tar.c:190
 #, c-format
@@ -1281,27 +1293,27 @@
 #: pg_backup_tar.c:211 pg_backup_tar.c:367
 #, c-format
 msgid "compression is not supported by tar archive format\n"
-msgstr "compression non supportée par le format des archives tar\n"
+msgstr "compression non supportée par le format des archives tar\n"
 
 #: pg_backup_tar.c:219
 #, 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"
+msgstr "n'a pas pu ouvrir le fichier TOC « %s » en entrée : %s\n"
 
 #: pg_backup_tar.c:226
 #, 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"
+msgstr "n'a pas pu ouvrir le fichier TOC en entrée : %s\n"
 
 #: pg_backup_tar.c:353
 #, c-format
 msgid "could not find file \"%s\" in archive\n"
-msgstr "n'a pas pu trouver le fichier « %s » dans l'archive\n"
+msgstr "n'a pas pu trouver le fichier « %s » dans l'archive\n"
 
 #: pg_backup_tar.c:419
 #, c-format
 msgid "could not generate temporary file name: %s\n"
-msgstr "impossible de créer le nom du fichier temporaire : %s\n"
+msgstr "impossible de créer le nom du fichier temporaire : %s\n"
 
 #: pg_backup_tar.c:430
 #, c-format
@@ -1316,17 +1328,17 @@
 #: pg_backup_tar.c:570
 #, c-format
 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"
+msgstr "erreur interne -- ni th ni fh ne sont précisés dans tarReadRaw()\n"
 
 #: pg_backup_tar.c:693
 #, c-format
 msgid "unexpected COPY statement syntax: \"%s\"\n"
-msgstr "syntaxe inattendue de l'instruction COPY : « %s »\n"
+msgstr "syntaxe inattendue de l'instruction COPY : « %s »\n"
 
 #: pg_backup_tar.c:959
 #, c-format
 msgid "invalid OID for large object (%u)\n"
-msgstr "OID invalide pour le « Large Object » (%u)\n"
+msgstr "OID invalide pour le « Large Object » (%u)\n"
 
 #: pg_backup_tar.c:1103
 #, c-format
@@ -1337,7 +1349,7 @@
 #, 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 "
+"la longueur réelle du fichier (%s) ne correspond pas à ce qui était "
 "attendu\n"
 "(%s)\n"
 
@@ -1345,7 +1357,7 @@
 #, 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 "
+"déplacement de la position %s vers le prochain membre à la position %s du "
 "fichier\n"
 
 #: pg_backup_tar.c:1161
@@ -1356,7 +1368,7 @@
 #: pg_backup_tar.c:1170 pg_backup_tar.c:1200
 #, 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"
+msgstr "n'a pas pu trouver l'en-tête du fichier « %s » dans l'archive tar\n"
 
 #: pg_backup_tar.c:1184
 #, c-format
@@ -1369,464 +1381,473 @@
 "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 ""
-"la restauration désordonnée de données n'est pas supportée avec ce format\n"
-"d'archive : « %s » est requis mais vient avant « %s » dans le fichier\n"
+"la restauration désordonnée de données n'est pas supportée avec ce format\n"
+"d'archive : « %s » est requis mais vient avant « %s » dans le fichier\n"
 "d'archive.\n"
 
 #: pg_backup_tar.c:1234
 #, 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"
+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:1275
 #, c-format
 msgid "TOC Entry %s at %s (length %s, checksum %d)\n"
-msgstr "entrée TOC %s à %s (longueur %s, somme de contrôle %d)\n"
+msgstr "entrée TOC %s à %s (longueur %s, somme de contrôle %d)\n"
 
 #: pg_backup_tar.c:1286
 #, 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"
+"en-tête tar corrompu trouvé dans %s (%d attendu, %d calculé ) à la\n"
 "position %s du fichier\n"
 
 #: pg_backup_utils.c:54
 #, c-format
 msgid "%s: unrecognized section name: \"%s\"\n"
-msgstr "%s : nom de section non reconnu : « %s »\n"
+msgstr "%s : nom de section non reconnu : « %s »\n"
 
-#: pg_backup_utils.c:56 pg_dump.c:524 pg_dump.c:541 pg_dumpall.c:300
-#: pg_dumpall.c:310 pg_dumpall.c:320 pg_dumpall.c:329 pg_dumpall.c:345
-#: pg_dumpall.c:403 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
+#: pg_backup_utils.c:56 pg_dump.c:526 pg_dump.c:543 pg_dumpall.c:298
+#: pg_dumpall.c:308 pg_dumpall.c:318 pg_dumpall.c:327 pg_dumpall.c:343
+#: pg_dumpall.c:401 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayer « %s --help » pour plus d'informations.\n"
+msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
-#: pg_backup_utils.c:101
+#: pg_backup_utils.c:118
 #, c-format
 msgid "out of on_exit_nicely slots\n"
 msgstr "plus d'emplacements on_exit_nicely\n"
 
-#: pg_dump.c:494
+#: pg_dump.c:496
 #, c-format
 msgid "compression level must be in range 0..9\n"
-msgstr "le niveau de compression doit être compris entre 0 et 9\n"
+msgstr "le niveau de compression doit être compris entre 0 et 9\n"
 
-#: pg_dump.c:539 pg_dumpall.c:308 pg_restore.c:291
+#: pg_dump.c:541 pg_dumpall.c:306 pg_restore.c:291
 #, 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"
+"%s : trop d'arguments en ligne de commande (le premier étant « %s »)\n"
 
-#: pg_dump.c:552
+#: pg_dump.c:554
 #, c-format
 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"
+"les options « -s/--schema-only » et « -a/--data-only » ne peuvent pas être\n"
+"utilisées conjointement\n"
 
-#: pg_dump.c:558
+#: pg_dump.c:560
 #, c-format
 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"
+"les options « -c/--clean » et « -a/--data-only » ne peuvent pas être\n"
+"utilisées conjointement\n"
 
-#: pg_dump.c:564
+#: pg_dump.c:566
 #, c-format
 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"
+"les options « --inserts/--column-inserts » et « -o/--oids » ne\n"
+"peuvent pas être utilisées conjointement\n"
 
-#: pg_dump.c:565
+#: pg_dump.c:567
 #, c-format
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(La commande INSERT ne peut pas positionner les OID.)\n"
 
-#: pg_dump.c:570
+#: pg_dump.c:572
 #, c-format
 msgid "option --if-exists requires option -c/--clean\n"
-msgstr "l'option --if-exists nécessite l'option -c/--clean\n"
+msgstr "l'option --if-exists nécessite l'option -c/--clean\n"
 
-#: pg_dump.c:598
+#: pg_dump.c:594
 #, c-format
-msgid "%s: invalid number of parallel jobs\n"
-msgstr "%s : nombre de jobs en parallèle invalide\n"
+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_dump.c:609
+#, c-format
+msgid "invalid number of parallel jobs\n"
+msgstr "nombre de jobs parallèles invalide\n"
 
-#: pg_dump.c:602
+#: pg_dump.c:613
 #, c-format
 msgid "parallel backup only supported by the directory format\n"
 msgstr ""
-"la sauvegarde parallèle n'est supportée qu'avec le format répertoire\n"
+"la sauvegarde parallèle n'est supportée qu'avec le format répertoire\n"
 
-#: pg_dump.c:671
+#: pg_dump.c:670
 #, c-format
 msgid ""
 "Synchronized snapshots are not supported by this server version.\n"
 "Run with --no-synchronized-snapshots instead if you do not need\n"
 "synchronized snapshots.\n"
 msgstr ""
-"Les snapshots synchronisés ne sont pas supportés par cette version "
+"Les snapshots synchronisés ne sont pas supportés par cette version "
 "serveur.\n"
-"Lancez avec --no-synchronized-snapshots à la place si vous n'avez pas "
+"Lancez avec --no-synchronized-snapshots à la place si vous n'avez pas "
 "besoin\n"
-"de snapshots synchronisés.\n"
+"de snapshots synchronisés.\n"
 
-#: pg_dump.c:678
+#: pg_dump.c:677
 #, c-format
 msgid "Exported snapshots are not supported by this server version.\n"
 msgstr ""
-"Les images exportées de la base ne sont pas supportées par cette version du "
+"Les images exportées de la base ne sont pas supportées par cette version du "
 "serveur.\n"
 "\n"
 
-#: pg_dump.c:689
+#: pg_dump.c:696
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "le dernier OID interne est %u\n"
 
-#: pg_dump.c:698
+#: pg_dump.c:704
 #, c-format
 msgid "No matching schemas were found\n"
-msgstr "Aucun schéma correspondant n'a été trouvé\n"
+msgstr "Aucun schéma correspondant n'a été trouvé\n"
 
-#: pg_dump.c:710
+#: pg_dump.c:716
 #, c-format
 msgid "No matching tables were found\n"
-msgstr "Aucune table correspondante n'a été trouvée\n"
+msgstr "Aucune table correspondante n'a été trouvée\n"
 
-#: pg_dump.c:867
+#: pg_dump.c:882
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
 "\n"
 msgstr ""
-"%s exporte une base de données dans un fichier texte ou dans d'autres\n"
+"%s exporte une base de données dans un fichier texte ou dans d'autres\n"
 "formats.\n"
 "\n"
 
-#: pg_dump.c:868 pg_dumpall.c:548 pg_restore.c:434
+#: pg_dump.c:883 pg_dumpall.c:546 pg_restore.c:440
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_dump.c:869
+#: pg_dump.c:884
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [NOMBASE]\n"
 
-#: pg_dump.c:871 pg_dumpall.c:551 pg_restore.c:437
+#: pg_dump.c:886 pg_dumpall.c:549 pg_restore.c:443
 #, c-format
 msgid ""
 "\n"
 "General options:\n"
 msgstr ""
 "\n"
-"Options générales :\n"
+"Options générales :\n"
 
-#: pg_dump.c:872
+#: pg_dump.c:887
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr ""
-"  -f, --file=NOMFICHIER        nom du fichier ou du répertoire en sortie\n"
+"  -f, --file=NOMFICHIER        nom du fichier ou du répertoire en sortie\n"
 
-#: pg_dump.c:873
+#: pg_dump.c:888
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
 "                               plain text (default))\n"
 msgstr ""
-"  -F, --format=c|d|t|p         format du fichier de sortie (personnalisé,\n"
-"                               répertoire, tar, texte (par défaut))\n"
+"  -F, --format=c|d|t|p         format du fichier de sortie (personnalisé,\n"
+"                               répertoire, tar, texte (par défaut))\n"
 
-#: pg_dump.c:875
+#: pg_dump.c:890
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr ""
-"  -j, --jobs=NUMERO            utilise ce nombre de jobs en parallèle pour\n"
+"  -j, --jobs=NUMERO            utilise ce nombre de jobs en parallèle pour\n"
 "                               la sauvegarde\n"
 
-#: pg_dump.c:876
+#: pg_dump.c:891 pg_dumpall.c:551
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                mode verbeux\n"
 
-#: pg_dump.c:877 pg_dumpall.c:553
+#: pg_dump.c:892 pg_dumpall.c:552
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version              affiche la version puis quitte\n"
 
-#: pg_dump.c:878
+#: pg_dump.c:893
 #, 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"
+"                               compressés\n"
 
-#: pg_dump.c:879 pg_dumpall.c:554
+#: pg_dump.c:894 pg_dumpall.c:553
 #, 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 "
+"  --lock-wait-timeout=DÉLAI    échec après l'attente du DÉLAI pour un "
 "verrou\n"
 "                               de table\n"
 
-#: pg_dump.c:880 pg_dumpall.c:555
+#: pg_dump.c:895 pg_dumpall.c:554
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                 affiche cette aide puis quitte\n"
 
-#: pg_dump.c:882 pg_dumpall.c:556
+#: pg_dump.c:897 pg_dumpall.c:555
 #, c-format
 msgid ""
 "\n"
 "Options controlling the output content:\n"
 msgstr ""
 "\n"
-"Options contrôlant le contenu en sortie :\n"
+"Options contrôlant le contenu en sortie :\n"
 
-#: pg_dump.c:883 pg_dumpall.c:557
+#: pg_dump.c:898 pg_dumpall.c:556
 #, 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"
+"  -a, --data-only              sauvegarde uniquement les données, pas le\n"
+"                               schéma\n"
 
-#: pg_dump.c:884
+#: pg_dump.c:899
 #, c-format
 msgid "  -b, --blobs                  include large objects in dump\n"
 msgstr ""
-"  -b, --blobs                  inclut les « Large Objects » dans la\n"
+"  -b, --blobs                  inclut les « Large Objects » dans la\n"
 "                               sauvegarde\n"
 
-#: pg_dump.c:885 pg_restore.c:448
+#: pg_dump.c:900 pg_restore.c:454
 #, c-format
 msgid ""
 "  -c, --clean                  clean (drop) database objects before "
 "recreating\n"
 msgstr ""
 "  -c, --clean                  nettoie/supprime les objets de la base de\n"
-"                               données avant de les créer\n"
+"                               données avant de les créer\n"
 
-#: pg_dump.c:886
+#: pg_dump.c:901
 #, 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"
+"  -C, --create                 inclut les commandes de création de la base\n"
 "                               dans la sauvegarde\n"
 
-#: pg_dump.c:887
+#: pg_dump.c:902
 #, 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"
+"  -E, --encoding=ENCODAGE      sauvegarde les données dans l'encodage\n"
 "                               ENCODAGE\n"
 
-#: pg_dump.c:888
+#: pg_dump.c:903
 #, 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"
+"  -n, --schema=SCHÉMA          sauvegarde uniquement le schéma indiqué\n"
 
-#: pg_dump.c:889
+#: pg_dump.c:904
 #, 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"
+msgstr "  -N, --exclude-schema=SCHÉMA  ne sauvegarde pas le schéma indiqué\n"
 
-#: pg_dump.c:890 pg_dumpall.c:560
+#: pg_dump.c:905 pg_dumpall.c:559
 #, c-format
 msgid "  -o, --oids                   include OIDs in dump\n"
 msgstr "  -o, --oids                   inclut les OID dans la sauvegarde\n"
 
-#: pg_dump.c:891
+#: pg_dump.c:906
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
 "                               plain-text format\n"
 msgstr ""
-"  -O, --no-owner               ne sauvegarde pas les propriétaires des\n"
+"  -O, --no-owner               ne sauvegarde pas les propriétaires des\n"
 "                               objets lors de l'utilisation du format "
 "texte\n"
 
-#: pg_dump.c:893 pg_dumpall.c:563
+#: pg_dump.c:908 pg_dumpall.c:562
 #, 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"
+"                               données\n"
 
-#: pg_dump.c:894
+#: pg_dump.c:909
 #, 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"
+"  -S, --superuser=NOM          indique le nom du super-utilisateur à\n"
 "                               utiliser avec le format texte\n"
 
-#: pg_dump.c:895
+#: pg_dump.c:910
 #, c-format
 msgid "  -t, --table=TABLE            dump the named table(s) only\n"
 msgstr ""
-"  -t, --table=TABLE            sauvegarde uniquement la table indiquée\n"
+"  -t, --table=TABLE            sauvegarde uniquement la table indiquée\n"
 
-#: pg_dump.c:896
+#: pg_dump.c:911
 #, 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"
+msgstr "  -T, --exclude-table=TABLE    ne sauvegarde pas la table indiquée\n"
 
-#: pg_dump.c:897 pg_dumpall.c:566
+#: pg_dump.c:912 pg_dumpall.c:565
 #, 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:898 pg_dumpall.c:567
+#: pg_dump.c:913 pg_dumpall.c:566
 #, c-format
 msgid "  --binary-upgrade             for use by upgrade utilities only\n"
 msgstr ""
-"  --binary-upgrade             à n'utiliser que par les outils de mise à\n"
+"  --binary-upgrade             à n'utiliser que par les outils de mise à\n"
 "                               jour seulement\n"
 
-#: pg_dump.c:899 pg_dumpall.c:568
+#: pg_dump.c:914 pg_dumpall.c:567
 #, c-format
 msgid ""
 "  --column-inserts             dump data as INSERT commands with column "
 "names\n"
 msgstr ""
-"  --column-inserts             sauvegarde les données avec des commandes\n"
-"                               INSERT en précisant les noms des colonnes\n"
+"  --column-inserts             sauvegarde les données avec des commandes\n"
+"                               INSERT en précisant les noms des colonnes\n"
 
-#: pg_dump.c:900 pg_dumpall.c:569
+#: pg_dump.c:915 pg_dumpall.c:568
 #, c-format
 msgid ""
 "  --disable-dollar-quoting     disable dollar quoting, use SQL standard "
 "quoting\n"
 msgstr ""
-"  --disable-dollar-quoting     désactive l'utilisation des guillemets\n"
+"  --disable-dollar-quoting     désactive l'utilisation des guillemets\n"
 "                               dollar dans le but de respecter le standard\n"
-"                               SQL en matière de guillemets\n"
+"                               SQL en matière de guillemets\n"
 
-#: pg_dump.c:901 pg_dumpall.c:570 pg_restore.c:464
+#: pg_dump.c:916 pg_dumpall.c:569 pg_restore.c:470
 #, c-format
 msgid ""
 "  --disable-triggers           disable triggers during data-only restore\n"
 msgstr ""
-"  --disable-triggers           désactive les triggers en mode de "
+"  --disable-triggers           désactive les triggers en mode de "
 "restauration\n"
-"                               des données seules\n"
+"                               des données seules\n"
 
-#: pg_dump.c:902
+#: pg_dump.c:917
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user "
 "has\n"
 "                               access to)\n"
 msgstr ""
-"  --enable-row-security        active la sécurité niveau ligne (et donc\\n\n"
+"  --enable-row-security        active la sécurité niveau ligne (et donc\\n\n"
 "                               sauvegarde uniquement le contenu visible par"
 "\\n\n"
 "                               cet utilisateur)\n"
 
-#: pg_dump.c:904
+#: pg_dump.c:919
 #, c-format
 msgid ""
 "  --exclude-table-data=TABLE   do NOT dump data for the named table(s)\n"
-msgstr "  --exclude-table-data=TABLE   ne sauvegarde pas la table indiquée\n"
+msgstr "  --exclude-table-data=TABLE   ne sauvegarde pas la table indiquée\n"
 
-#: pg_dump.c:905 pg_dumpall.c:571 pg_restore.c:466
+#: pg_dump.c:920 pg_dumpall.c:570 pg_restore.c:472
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr ""
 "  --if-exists                  utilise IF EXISTS lors de la suppression des "
 "objets\n"
 
-#: pg_dump.c:906 pg_dumpall.c:572
+#: pg_dump.c:921 pg_dumpall.c:571
 #, c-format
 msgid ""
 "  --inserts                    dump data as INSERT commands, rather than "
 "COPY\n"
 msgstr ""
-"  --inserts                    sauvegarde les données avec des "
+"  --inserts                    sauvegarde les données avec des "
 "instructions\n"
-"                               INSERT plutôt que COPY\n"
+"                               INSERT plutôt que COPY\n"
 
-#: pg_dump.c:907 pg_dumpall.c:573
+#: pg_dump.c:922 pg_dumpall.c:572
 #, 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"
+"                               sécurité\n"
 
-#: pg_dump.c:908
+#: pg_dump.c:923
 #, c-format
 msgid ""
 "  --no-synchronized-snapshots  do not use synchronized snapshots in "
 "parallel jobs\n"
 msgstr ""
-"  --no-synchronized-snapshots  n'utilise pas de snapshots synchronisés pour "
-"les jobs en parallèle\n"
+"  --no-synchronized-snapshots  n'utilise pas de snapshots synchronisés pour "
+"les jobs en parallèle\n"
 
-#: pg_dump.c:909 pg_dumpall.c:574
+#: pg_dump.c:924 pg_dumpall.c:573
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr ""
 "  --no-tablespaces             ne sauvegarde pas les affectations de\n"
 "                               tablespaces\n"
 
-#: pg_dump.c:910 pg_dumpall.c:575
+#: pg_dump.c:925 pg_dumpall.c:574
 #, c-format
 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 "
+"  --no-unlogged-table-data     ne sauvegarde pas les données des tables "
 "non\n"
-"                               journalisées\n"
+"                               journalisées\n"
 
-#: pg_dump.c:911 pg_dumpall.c:576
+#: pg_dump.c:926 pg_dumpall.c:575
 #, c-format
 msgid ""
 "  --quote-all-identifiers      quote all identifiers, even if not key "
 "words\n"
 msgstr ""
 "  --quote-all-identifiers      met entre guillemets tous les identifiants\n"
-"                               même s'il ne s'agit pas de mots clés\n"
+"                               même s'il ne s'agit pas de mots clés\n"
 
-#: pg_dump.c:912
+#: pg_dump.c:927
 #, c-format
 msgid ""
 "  --section=SECTION            dump named section (pre-data, data, or post-"
 "data)\n"
 msgstr ""
-"  --section=SECTION            sauvegarde la section indiquée (pre-data, "
+"  --section=SECTION            sauvegarde la section indiquée (pre-data, "
 "data\n"
 "                               ou post-data)\n"
 
-#: pg_dump.c:913
+#: pg_dump.c:928
 #, c-format
 msgid ""
 "  --serializable-deferrable    wait until the dump can run without "
 "anomalies\n"
 msgstr ""
-"  --serializable-deferrable    attend jusqu'à ce que la sauvegarde puisse\n"
-"                               s'exécuter sans anomalies\n"
+"  --serializable-deferrable    attend jusqu'à ce que la sauvegarde puisse\n"
+"                               s'exécuter sans anomalies\n"
 
-#: pg_dump.c:914
+#: pg_dump.c:929
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr ""
-"  --snapshot=SNAPSHOT          utilise l'image donnée pour la sauvegarde\n"
+"  --snapshot=SNAPSHOT          utilise l'image donnée pour la sauvegarde\n"
 
-#: pg_dump.c:915 pg_dumpall.c:577 pg_restore.c:472
+#: pg_dump.c:930 pg_dumpall.c:576 pg_restore.c:478
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1838,9 +1859,9 @@
 "                               utilise les commandes SET SESSION "
 "AUTHORIZATION\n"
 "                               au lieu des commandes ALTER OWNER pour\n"
-"                               modifier les propriétaires\n"
+"                               modifier les propriétaires\n"
 
-#: pg_dump.c:919 pg_dumpall.c:581 pg_restore.c:476
+#: pg_dump.c:934 pg_dumpall.c:580 pg_restore.c:482
 #, c-format
 msgid ""
 "\n"
@@ -1849,50 +1870,50 @@
 "\n"
 "Options de connexion :\n"
 
-#: pg_dump.c:920
+#: pg_dump.c:935
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
-msgstr "  -d, --dbname=NOMBASE      base de données à sauvegarder\n"
+msgstr "  -d, --dbname=NOMBASE      base de données à sauvegarder\n"
 
-#: pg_dump.c:921 pg_dumpall.c:583 pg_restore.c:477
+#: pg_dump.c:936 pg_dumpall.c:582 pg_restore.c:483
 #, 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"
+"  -h, --host=NOMHÔTE           hôte du serveur de bases de données ou\n"
+"                               répertoire des sockets\n"
 
-#: pg_dump.c:922 pg_dumpall.c:585 pg_restore.c:478
+#: pg_dump.c:937 pg_dumpall.c:584 pg_restore.c:484
 #, 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"
+"  -p, --port=PORT              numéro de port du serveur de bases de\n"
+"                               données\n"
 
-#: pg_dump.c:923 pg_dumpall.c:586 pg_restore.c:479
+#: pg_dump.c:938 pg_dumpall.c:585 pg_restore.c:485
 #, 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:924 pg_dumpall.c:587 pg_restore.c:480
+#: pg_dump.c:939 pg_dumpall.c:586 pg_restore.c:486
 #, 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:925 pg_dumpall.c:588 pg_restore.c:481
+#: pg_dump.c:940 pg_dumpall.c:587 pg_restore.c:487
 #, 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"
+"                               défaut)\n"
 
-#: pg_dump.c:926 pg_dumpall.c:589
+#: pg_dump.c:941 pg_dumpall.c:588
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
-msgstr "  --role=NOMROLE               exécute SET ROLE avant la sauvegarde\n"
+msgstr "  --role=NOMROLE               exécute SET ROLE avant la sauvegarde\n"
 
-#: pg_dump.c:928
+#: pg_dump.c:943
 #, c-format
 msgid ""
 "\n"
@@ -1901,434 +1922,445 @@
 "\n"
 msgstr ""
 "\n"
-"Si aucune base de données n'est indiquée, la valeur de la variable\n"
-"d'environnement PGDATABASE est alors utilisée.\n"
+"Si aucune base de données n'est indiquée, la valeur de la variable\n"
+"d'environnement PGDATABASE est alors utilisée.\n"
 "\n"
 
-#: pg_dump.c:930 pg_dumpall.c:593 pg_restore.c:488
+#: pg_dump.c:945 pg_dumpall.c:592 pg_restore.c:494
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
+msgstr "Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:950
+#: pg_dump.c:962
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
-msgstr "encodage client indiqué (« %s ») invalide\n"
+msgstr "encodage client indiqué (« %s ») invalide\n"
+
+#: pg_dump.c:1102
+#, c-format
+msgid ""
+"Synchronized snapshots are not supported on standby servers.\n"
+"Run with --no-synchronized-snapshots instead if you do not need\n"
+"synchronized snapshots.\n"
+msgstr ""
+"Les snapshots synchronisés ne sont pas supportés par les serveurs "
+"secondaires.\n"
+"Lancez avec --no-synchronized-snapshots à la place si vous n'avez pas "
+"besoin\n"
+"de snapshots synchronisés.\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1171
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
-msgstr "format de sortie « %s » invalide\n"
+msgstr "format de sortie « %s » invalide\n"
 
-#: pg_dump.c:1157
+#: pg_dump.c:1193
 #, c-format
 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 "
+"le serveur doit être de version 7.3 ou supérieure pour utiliser les "
 "options\n"
-"de sélection du schéma\n"
+"de sélection du schéma\n"
 
-#: pg_dump.c:1521
+#: pg_dump.c:1557
 #, c-format
 msgid "dumping contents of table \"%s.%s\"\n"
-msgstr "sauvegarde du contenu de la table « %s.%s »\n"
+msgstr "sauvegarde du contenu de la table « %s.%s »\n"
 
-#: pg_dump.c:1645
+#: pg_dump.c:1681
 #, 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"
+"La sauvegarde du contenu de la table « %s » a échoué : échec de\n"
 "PQgetCopyData().\n"
 
-#: pg_dump.c:1646 pg_dump.c:1656
+#: pg_dump.c:1682 pg_dump.c:1692
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Message d'erreur du serveur : %s"
 
-#: pg_dump.c:1647 pg_dump.c:1657
+#: pg_dump.c:1683 pg_dump.c:1693
 #, c-format
 msgid "The command was: %s\n"
-msgstr "La commande était : %s\n"
+msgstr "La commande était : %s\n"
 
-#: pg_dump.c:1655
+#: pg_dump.c:1691
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed.\n"
 msgstr ""
-"La sauvegarde du contenu de la table « %s » a échoué : échec de\n"
+"La sauvegarde du contenu de la table « %s » a échoué : échec de\n"
 "PQgetResult().\n"
 
-#: pg_dump.c:2297
+#: pg_dump.c:2338
 #, c-format
 msgid "saving database definition\n"
-msgstr "sauvegarde de la définition de la base de données\n"
+msgstr "sauvegarde de la définition de la base de données\n"
 
-#: pg_dump.c:2630
+#: pg_dump.c:2672
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "encodage de la sauvegarde = %s\n"
 
-#: pg_dump.c:2657
+#: pg_dump.c:2699
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "standard_conforming_strings de la sauvegarde = %s\n"
 
-#: pg_dump.c:2690
+#: pg_dump.c:2732
 #, c-format
 msgid "reading large objects\n"
-msgstr "lecture des « Large Objects »\n"
+msgstr "lecture des « Large Objects »\n"
 
-#: pg_dump.c:2822
+#: pg_dump.c:2877
 #, c-format
 msgid "saving large objects\n"
-msgstr "sauvegarde des « Large Objects »\n"
+msgstr "sauvegarde des « Large Objects »\n"
 
-#: pg_dump.c:2869
+#: pg_dump.c:2924
 #, c-format
 msgid "error reading large object %u: %s"
-msgstr "erreur lors de la lecture du « Large Object » %u : %s"
+msgstr "erreur lors de la lecture du « Large Object » %u : %s"
 
-#: pg_dump.c:2921
+#: pg_dump.c:2976
 #, c-format
 msgid "reading row security enabled for table \"%s.%s\"\n"
 msgstr ""
-"lecture de l'activation de la sécurité niveau ligne pour la table « %s.%s "
-"»\n"
+"lecture de l'activation de la sécurité niveau ligne pour la table « %s.%s "
+"»\n"
 
-#: pg_dump.c:2952
+#: pg_dump.c:3007
 #, c-format
 msgid "reading policies for table \"%s.%s\"\n"
-msgstr "lecture des politiques pour la table « %s.%s »\n"
+msgstr "lecture des politiques pour la table « %s.%s »\n"
 
-#: pg_dump.c:3083
+#: pg_dump.c:3138
 #, c-format
 msgid "unexpected policy command type: \"%s\"\n"
-msgstr "type de commande inattendu pour la politique : « %s »\n"
+msgstr "type de commande inattendu pour la politique : « %s »\n"
 
-#: pg_dump.c:3298
+#: pg_dump.c:3353
 #, c-format
 msgid "could not find parent extension for %s\n"
 msgstr "n'a pas pu trouver l'extension parent pour %s\n"
 
-#: pg_dump.c:3402
+#: pg_dump.c:3457
 #, 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"
+msgstr "ATTENTION : le propriétaire du schéma « %s » semble être invalide\n"
 
-#: pg_dump.c:3445
+#: pg_dump.c:3500
 #, c-format
 msgid "schema with OID %u does not exist\n"
-msgstr "le schéma d'OID %u n'existe pas\n"
+msgstr "le schéma d'OID %u n'existe pas\n"
 
-#: pg_dump.c:3797
+#: pg_dump.c:3852
 #, 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"
+"ATTENTION : le propriétaire du type de données « %s » semble être invalide\n"
 
-#: pg_dump.c:3909
+#: pg_dump.c:3964
 #, 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"
+"ATTENTION : le propriétaire de l'opérateur « %s » semble être invalide\n"
 
-#: pg_dump.c:4171
+#: pg_dump.c:4226
 #, 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"
+"ATTENTION : le propriétaire de la classe d'opérateur « %s » semble être\n"
 "invalide\n"
 
-#: pg_dump.c:4260
+#: pg_dump.c:4315
 #, 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"
+"ATTENTION : le propriétaire de la famille d'opérateur « %s » semble être\n"
 "invalide\n"
 
-#: pg_dump.c:4399
+#: pg_dump.c:4454
 #, 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"
+"ATTENTION : le propriétaire de la fonction d'aggrégat « %s » semble être\n"
 "invalide\n"
 
-#: pg_dump.c:4582
+#: pg_dump.c:4657
 #, 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"
+"ATTENTION : le propriétaire de la fonction « %s » semble être invalide\n"
 
-#: pg_dump.c:5270
+#: pg_dump.c:5345
 #, 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"
+msgstr "ATTENTION : le propriétaire de la table « %s » semble être invalide\n"
 
-#: pg_dump.c:5422
+#: pg_dump.c:5497
 #, c-format
 msgid "reading indexes for table \"%s.%s\"\n"
-msgstr "lecture des index de la table « %s.%s »\n"
+msgstr "lecture des index de la table « %s.%s »\n"
 
-#: pg_dump.c:5789
+#: pg_dump.c:5864
 #, c-format
 msgid "reading foreign key constraints for table \"%s.%s\"\n"
-msgstr "lecture des contraintes de clés étrangères pour la table « %s.%s »\n"
+msgstr "lecture des contraintes de clés étrangères pour la table « %s.%s »\n"
 
-#: pg_dump.c:6035
+#: pg_dump.c:6110
 #, 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"
+"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:6128
+#: pg_dump.c:6203
 #, c-format
 msgid "reading triggers for table \"%s.%s\"\n"
-msgstr "lecture des triggers pour la table « %s.%s »\n"
+msgstr "lecture des triggers pour la table « %s.%s »\n"
 
-#: pg_dump.c:6293
+#: pg_dump.c:6368
 #, 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"
+"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:6879
+#: pg_dump.c:6954
 #, c-format
 msgid "finding the columns and types of table \"%s.%s\"\n"
-msgstr "recherche des colonnes et types de la table « %s.%s »\n"
+msgstr "recherche des colonnes et types de la table « %s.%s »\n"
 
-#: pg_dump.c:7058
+#: pg_dump.c:7133
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
-msgstr "numérotation des colonnes invalide pour la table « %s »\n"
+msgstr "numérotation des colonnes invalide pour la table « %s »\n"
 
-#: pg_dump.c:7092
+#: pg_dump.c:7167
 #, c-format
 msgid "finding default expressions of table \"%s.%s\"\n"
-msgstr "recherche des expressions par défaut de la table « %s.%s »\n"
+msgstr "recherche des expressions par défaut de la table « %s.%s »\n"
 
-#: pg_dump.c:7145
+#: pg_dump.c:7220
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
-msgstr "valeur adnum %d invalide pour la table « %s »\n"
+msgstr "valeur adnum %d invalide pour la table « %s »\n"
 
-#: pg_dump.c:7217
+#: pg_dump.c:7292
 #, c-format
 msgid "finding check constraints for table \"%s.%s\"\n"
-msgstr "recherche des contraintes de vérification pour la table « %s.%s »\n"
+msgstr "recherche des contraintes de vérification pour la table « %s.%s »\n"
 
-#: pg_dump.c:7313
+#: pg_dump.c:7388
 #, 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 contrainte de vérification attendue pour la table « %s » mais %d\n"
-"trouvée\n"
+"%d contrainte de vérification attendue pour la table « %s » mais %d\n"
+"trouvée\n"
 msgstr[1] ""
-"%d contraintes de vérification attendues pour la table « %s » mais %d\n"
-"trouvées\n"
+"%d contraintes de vérification attendues pour la table « %s » mais %d\n"
+"trouvées\n"
 
-#: pg_dump.c:7317
+#: pg_dump.c:7392
 #, c-format
 msgid "(The system catalogs might be corrupted.)\n"
-msgstr "(Les catalogues système sont peut-être corrompus.)\n"
+msgstr "(Les catalogues système sont peut-être corrompus.)\n"
 
-#: pg_dump.c:8707
+#: pg_dump.c:8783
 #, c-format
 msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
 msgstr ""
-"ATTENTION : la colonne typtype du type de données « %s » semble être "
+"ATTENTION : la colonne typtype du type de données « %s » semble être "
 "invalide\n"
 
-#: pg_dump.c:10203
+#: pg_dump.c:10279
 #, c-format
 msgid "WARNING: bogus value in proargmodes array\n"
-msgstr "ATTENTION : valeur erronée dans le tableau proargmodes\n"
+msgstr "ATTENTION : valeur erronée dans le tableau proargmodes\n"
 
-#: pg_dump.c:10555
+#: pg_dump.c:10631
 #, c-format
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "ATTENTION : n'a pas pu analyser le tableau proallargtypes\n"
 
-#: pg_dump.c:10571
+#: pg_dump.c:10647
 #, c-format
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "ATTENTION : n'a pas pu analyser le tableau proargmodes\n"
 
-#: pg_dump.c:10585
+#: pg_dump.c:10661
 #, c-format
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "ATTENTION : n'a pas pu analyser le tableau proargnames\n"
 
-#: pg_dump.c:10596
+#: pg_dump.c:10672
 #, c-format
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "ATTENTION : n'a pas pu analyser le tableau proconfig\n"
 
-#: pg_dump.c:10667
+#: pg_dump.c:10743
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
-msgstr "valeur provolatile non reconnue pour la fonction « %s »\n"
+msgstr "valeur provolatile non reconnue pour la fonction « %s »\n"
 
-#: pg_dump.c:10844
+#: pg_dump.c:10876 pg_dump.c:10981 pg_dump.c:10988
+#, c-format
+msgid "could not find function definition for function with OID %u\n"
+msgstr "n'a pas pu trouver la définition de la fonction d'OID %u\n"
+
+#: pg_dump.c:10921
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
 msgstr ""
-"ATTENTION : valeur erronée dans le champ pg_cast.castfunc ou pg_cast."
+"ATTENTION : valeur erronée dans le champ pg_cast.castfunc ou pg_cast."
 "castmethod\n"
 
-#: pg_dump.c:10847
+#: pg_dump.c:10924
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
-msgstr "ATTENTION : valeur erronée dans pg_cast.castmethod\n"
+msgstr "ATTENTION : valeur erronée dans pg_cast.castmethod\n"
 
-#: pg_dump.c:10931
+#: pg_dump.c:11010
 #, c-format
 msgid ""
 "WARNING: bogus transform definition, at least one of trffromsql and "
 "trftosql should be nonzero\n"
 msgstr ""
-"ATTENTION : définition de transformation invalide, au moins un de "
+"ATTENTION : définition de transformation invalide, au moins un de "
 "trffromsql et trftosql ne doit pas valoir 0\n"
 
-#: pg_dump.c:10948
+#: pg_dump.c:11027
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trffromsql field\n"
-msgstr "ATTENTION : valeur erronée dans pg_transform.trffromsql\n"
+msgstr "ATTENTION : valeur erronée dans pg_transform.trffromsql\n"
 
-#: pg_dump.c:10969
+#: pg_dump.c:11048
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trftosql field\n"
-msgstr "ATTENTION : valeur erronée dans pg_transform.trftosql\n"
+msgstr "ATTENTION : valeur erronée dans pg_transform.trftosql\n"
 
-#: pg_dump.c:11356
+#: pg_dump.c:11435
 #, 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"
+msgstr "ATTENTION : n'a pas pu trouver l'opérateur d'OID %s\n"
 
-#: pg_dump.c:12536
+#: pg_dump.c:12582
 #, 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"
+"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:13360
+#: pg_dump.c:13406
 #, c-format
 msgid "unrecognized object type in default privileges: %d\n"
-msgstr "type d'objet inconnu dans les droits par défaut : %d\n"
+msgstr "type d'objet inconnu dans les droits par défaut : %d\n"
 
-#: pg_dump.c:13375
+#: pg_dump.c:13421
 #, 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"
+msgstr "n'a pas pu analyser la liste ACL par défaut (%s)\n"
 
-#: pg_dump.c:13431
+#: pg_dump.c:13477
 #, 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"
+msgstr "n'a pas pu analyser la liste ACL (%s) de l'objet « %s » (%s)\n"
 
-#: pg_dump.c:13852
+#: pg_dump.c:13899
 #, 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"
+"la requête permettant d'obtenir la définition de la vue « %s » n'a renvoyé\n"
+"aucune donnée\n"
 
-#: pg_dump.c:13855
+#: pg_dump.c:13902
 #, 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"
+"la requête permettant d'obtenir la définition de la vue « %s » a renvoyé\n"
+" plusieurs définitions\n"
 
-#: pg_dump.c:13862
+#: pg_dump.c:13909
 #, 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"
+msgstr "la définition de la vue « %s » semble être vide (longueur nulle)\n"
 
-#: pg_dump.c:14610
+#: pg_dump.c:14657
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
-msgstr "numéro de colonne %d invalide pour la table « %s »\n"
+msgstr "numéro de colonne %d invalide pour la table « %s »\n"
 
-#: pg_dump.c:14736
+#: pg_dump.c:14783
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
-msgstr "index manquant pour la contrainte « %s »\n"
+msgstr "index manquant pour la contrainte « %s »\n"
 
-#: pg_dump.c:14927
+#: pg_dump.c:14974
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "type de contrainte inconnu : %c\n"
 
-#: pg_dump.c:15077 pg_dump.c:15241
+#: pg_dump.c:15124 pg_dump.c:15288
 #, 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] ""
-"la requête permettant d'obtenir les données de la séquence « %s » a "
-"renvoyé\n"
+"la requête permettant d'obtenir les données de la séquence « %s » a "
+"renvoyé\n"
 "%d ligne (une seule attendue)\n"
 msgstr[1] ""
-"la requête permettant d'obtenir les données de la séquence « %s » a "
-"renvoyé\n"
+"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:15088
+#: pg_dump.c:15135
 #, 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"
+"la requête permettant d'obtenir les données de la séquence « %s » a "
+"renvoyé\n"
+"le nom « %s »\n"
 
-#: pg_dump.c:15337
+#: pg_dump.c:15384
 #, c-format
 msgid "unexpected tgtype value: %d\n"
 msgstr "valeur tgtype inattendue : %d\n"
 
-#: pg_dump.c:15419
+#: pg_dump.c:15466
 #, 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"
+"chaîne argument invalide (%s) pour le trigger « %s » sur la table « %s »\n"
 
-#: pg_dump.c:15608
+#: pg_dump.c:15665
 #, 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"
+"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:15990
+#: pg_dump.c:16047
 #, c-format
 msgid "reading dependency data\n"
-msgstr "lecture des données de dépendance\n"
+msgstr "lecture des données de dépendance\n"
 
-#: pg_dump.c:16550
+#: pg_dump.c:16607
 #, c-format
 msgid "WARNING: could not parse reloptions array\n"
 msgstr "ATTENTION : n'a pas pu analyser le tableau reloptions\n"
 
-#: pg_dump.c:16614
-#, 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"
-
 #. translator: this is a module name
 #: pg_dump_sort.c:23
 msgid "sorter"
@@ -2342,12 +2374,12 @@
 #: pg_dump_sort.c:495
 #, c-format
 msgid "invalid dependency %d\n"
-msgstr "dépendance invalide %d\n"
+msgstr "dépendance invalide %d\n"
 
 #: pg_dump_sort.c:728
 #, c-format
 msgid "could not identify dependency loop\n"
-msgstr "n'a pas pu identifier la boucle de dépendance\n"
+msgstr "n'a pas pu identifier la boucle de dépendance\n"
 
 #: pg_dump_sort.c:1254
 #, c-format
@@ -2355,10 +2387,10 @@
 msgid_plural ""
 "NOTICE: there are circular foreign-key constraints among these tables:\n"
 msgstr[0] ""
-"NOTE : il existe des constraintes de clés étrangères circulaires sur cette "
+"NOTE : il existe des constraintes de clés étrangères circulaires sur cette "
 "table :\n"
 msgstr[1] ""
-"NOTE : il existe des constraintes de clés étrangères circulaires sur ces "
+"NOTE : il existe des constraintes de clés étrangères circulaires sur ces "
 "tables :\n"
 
 #: pg_dump_sort.c:1258 pg_dump_sort.c:1278
@@ -2382,157 +2414,157 @@
 "Consider using a full dump instead of a --data-only dump to avoid this "
 "problem.\n"
 msgstr ""
-"Considérez l'utilisation d'une sauvegarde complète au lieu d'une "
+"Considérez l'utilisation d'une sauvegarde complète au lieu d'une "
 "sauvegarde\n"
-"des données seulement pour éviter ce problème.\n"
+"des données seulement pour éviter ce problème.\n"
 
 #: pg_dump_sort.c:1272
 #, c-format
 msgid "WARNING: could not resolve dependency loop among these items:\n"
 msgstr ""
-"ATTENTION : n'a pas pu résoudre la boucle de dépendances parmi ces "
-"éléments :\n"
+"ATTENTION : n'a pas pu résoudre la boucle de dépendances parmi ces "
+"éléments :\n"
 
-#: pg_dumpall.c:181
+#: pg_dumpall.c:179
 #, 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 ""
-"Le programme « pg_dump » est nécessaire à %s mais n'a pas été trouvé dans "
+"Le programme « pg_dump » est nécessaire à %s mais n'a pas été trouvé dans "
 "le\n"
-"même répertoire que « %s ».\n"
-"Vérifiez votre installation.\n"
+"même répertoire que « %s ».\n"
+"Vérifiez votre installation.\n"
 
-#: pg_dumpall.c:188
+#: pg_dumpall.c:186
 #, 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 ""
-"Le programme « pg_dump » a été trouvé par « %s » mais n'a pas la même\n"
+"Le programme « pg_dump » a été trouvé par « %s » mais n'a pas la même\n"
 "version que %s.\n"
-"Vérifiez votre installation.\n"
+"Vérifiez votre installation.\n"
 
-#: pg_dumpall.c:318
+#: pg_dumpall.c:316
 #, 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 "
+"%s : les options « -g/--globals-only » et « -r/--roles-only » ne peuvent "
 "pas\n"
-"être utilisées conjointement\n"
+"être utilisées conjointement\n"
 
-#: pg_dumpall.c:327
+#: pg_dumpall.c:325
 #, 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"
+"%s : les options « -g/--globals-only » et « -t/--tablespaces-only » ne\n"
+"peuvent pas être utilisées conjointement\n"
 
-#: pg_dumpall.c:336 pg_restore.c:343
+#: pg_dumpall.c:334 pg_restore.c:359
 #, c-format
 msgid "%s: option --if-exists requires option -c/--clean\n"
-msgstr "%s : l'option --if-exists nécessite l'option -c/--clean\n"
+msgstr "%s : l'option --if-exists nécessite l'option -c/--clean\n"
 
-#: pg_dumpall.c:343
+#: pg_dumpall.c:341
 #, 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 "
+"%s : les options « -r/--roles-only » et « -t/--tablespaces-only » ne "
 "peuvent\n"
-"pas être utilisées conjointement\n"
+"pas être utilisées conjointement\n"
 
-#: pg_dumpall.c:385 pg_dumpall.c:1892
+#: pg_dumpall.c:383 pg_dumpall.c:1899
 #, 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"
+msgstr "%s : n'a pas pu se connecter à la base de données « %s »\n"
 
-#: pg_dumpall.c:400
+#: pg_dumpall.c:398
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
 "Please specify an alternative database.\n"
 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"
+"%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:417
+#: pg_dumpall.c:415
 #, 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"
+msgstr "%s : n'a pas pu ouvrir le fichier de sauvegarde « %s » : %s\n"
 
-#: pg_dumpall.c:547
+#: pg_dumpall.c:545
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
 "\n"
 msgstr ""
-"%s extrait un cluster de bases de données PostgreSQL dans un fichier de\n"
+"%s extrait un cluster de bases de données PostgreSQL dans un fichier de\n"
 "commandes SQL.\n"
 "\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:547
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:550
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=NOMFICHIER        nom du fichier de sortie\n"
 
-#: pg_dumpall.c:558
+#: pg_dumpall.c:557
 #, c-format
 msgid ""
 "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr ""
-"  -c, --clean                  nettoie (supprime) les bases de données "
+"  -c, --clean                  nettoie (supprime) les bases de données "
 "avant de\n"
-"                               les créer\n"
+"                               les créer\n"
 
-#: pg_dumpall.c:559
+#: pg_dumpall.c:558
 #, c-format
 msgid ""
 "  -g, --globals-only           dump only global objects, no databases\n"
 msgstr ""
-"  -g, --globals-only           sauvegarde uniquement les objets système, "
+"  -g, --globals-only           sauvegarde uniquement les objets système, "
 "pas\n"
-"                               le contenu des bases de données\n"
+"                               le contenu des bases de données\n"
 
-#: pg_dumpall.c:561 pg_restore.c:456
+#: pg_dumpall.c:560 pg_restore.c:462
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr ""
-"  -O, --no-owner               omet la restauration des propriétaires des\n"
+"  -O, --no-owner               omet la restauration des propriétaires des\n"
 "                               objets\n"
 
-#: pg_dumpall.c:562
+#: pg_dumpall.c:561
 #, 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 "
+"  -r, --roles-only             sauvegarde uniquement les rôles, pas les "
 "bases\n"
-"                               de données ni les tablespaces\n"
+"                               de données ni les tablespaces\n"
 
-#: pg_dumpall.c:564
+#: pg_dumpall.c:563
 #, 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 à "
+"  -S, --superuser=NOM          indique le nom du super-utilisateur à "
 "utiliser\n"
 "                               avec le format texte\n"
 
-#: pg_dumpall.c:565
+#: pg_dumpall.c:564
 #, c-format
 msgid ""
 "  -t, --tablespaces-only       dump only tablespaces, no databases or "
@@ -2540,21 +2572,21 @@
 msgstr ""
 "  -t, --tablespaces-only       sauvegarde uniquement les tablespaces, pas "
 "les\n"
-"                               bases de données ni les rôles\n"
+"                               bases de données ni les rôles\n"
 
-#: pg_dumpall.c:582
+#: pg_dumpall.c:581
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr ""
-"  -d, --dbname=CHAINE_CONN       connexion à l'aide de la chaîne de "
+"  -d, --dbname=CHAINE_CONN       connexion à l'aide de la chaîne de "
 "connexion\n"
 
-#: pg_dumpall.c:584
+#: pg_dumpall.c:583
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
-msgstr "  -l, --database=NOM_BASE      indique une autre base par défaut\n"
+msgstr "  -l, --database=NOM_BASE      indique une autre base par défaut\n"
 
-#: pg_dumpall.c:591
+#: pg_dumpall.c:590
 #, c-format
 msgid ""
 "\n"
@@ -2564,267 +2596,272 @@
 "\n"
 msgstr ""
 "\n"
-"Si -f/--file n'est pas utilisé, le script SQL sera envoyé sur la sortie\n"
+"Si -f/--file n'est pas utilisé, le script SQL sera envoyé sur la sortie\n"
 "standard.\n"
 "\n"
 
-#: pg_dumpall.c:1118
+#: pg_dumpall.c:1117
 #, 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"
+"%s : n'a pas pu analyser la liste d'ACL (%s) pour le tablespace « %s »\n"
 
-#: pg_dumpall.c:1449
+#: pg_dumpall.c:1448
 #, 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"
+"%s : n'a pas pu analyser la liste d'ACL (%s) pour la base de données « %s "
+"»\n"
 
 #: pg_dumpall.c:1659
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
-msgstr "%s : sauvegarde de la base de données « %s »...\n"
+msgstr "%s : sauvegarde de la base de données « %s »...\n"
 
-#: pg_dumpall.c:1680
+#: pg_dumpall.c:1683
 #, 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"
+msgstr "%s : échec de pg_dump sur la base de données « %s », quitte\n"
 
-#: pg_dumpall.c:1689
+#: pg_dumpall.c:1692
 #, 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"
+msgstr "%s : n'a pas pu rouvrir le fichier de sortie « %s » : %s\n"
 
-#: pg_dumpall.c:1734
+#: pg_dumpall.c:1737
 #, c-format
 msgid "%s: running \"%s\"\n"
-msgstr "%s : exécute « %s »\n"
+msgstr "%s : exécute « %s »\n"
 
-#: pg_dumpall.c:1914
+#: pg_dumpall.c:1921
 #, 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"
+msgstr "%s : n'a pas pu se connecter à la base de données « %s » : %s\n"
 
-#: pg_dumpall.c:1944
+#: pg_dumpall.c:1951
 #, 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:1950
+#: pg_dumpall.c:1957
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
-msgstr "%s : n'a pas pu analyser la version du serveur « %s »\n"
+msgstr "%s : n'a pas pu analyser la version du serveur « %s »\n"
 
-#: pg_dumpall.c:2028 pg_dumpall.c:2054
+#: pg_dumpall.c:2035 pg_dumpall.c:2061
 #, c-format
 msgid "%s: executing %s\n"
-msgstr "%s : exécute %s\n"
+msgstr "%s : exécute %s\n"
 
-#: pg_dumpall.c:2034 pg_dumpall.c:2060
+#: pg_dumpall.c:2041 pg_dumpall.c:2067
 #, c-format
 msgid "%s: query failed: %s"
-msgstr "%s : échec de la requête : %s"
+msgstr "%s : échec de la requête : %s"
 
-#: pg_dumpall.c:2036 pg_dumpall.c:2062
+#: pg_dumpall.c:2043 pg_dumpall.c:2069
 #, c-format
 msgid "%s: query was: %s\n"
-msgstr "%s : la requête était : %s\n"
+msgstr "%s : la requête était : %s\n"
 
 #: pg_restore.c:303
 #, 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"
+"%s : les options « -d/--dbname » et « -f/--file » ne peuvent pas être\n"
+"utilisées conjointement\n"
 
 #: pg_restore.c:314
 #, c-format
 msgid ""
 "%s: options -s/--schema-only and -a/--data-only cannot be used together\n"
 msgstr ""
-"%s : les options « -s/--schema-only » et « -a/--data-only » ne peuvent pas "
-"être\n"
-"utilisées conjointement\n"
+"%s : les options « -s/--schema-only » et « -a/--data-only » ne peuvent pas "
+"être\n"
+"utilisées conjointement\n"
 
 #: pg_restore.c:321
 #, c-format
 msgid "%s: options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr ""
-"%s : les options « -c/--clean » et « -a/--data-only » ne peuvent pas être\n"
-"utilisées conjointement\n"
+"%s : les options « -c/--clean » et « -a/--data-only » ne peuvent pas être\n"
+"utilisées conjointement\n"
+
+#: pg_restore.c:328
+#, c-format
+msgid "%s: invalid number of parallel jobs\n"
+msgstr "%s : nombre de jobs en parallèle invalide\n"
 
-#: pg_restore.c:329
+#: pg_restore.c:336
+#, c-format
+msgid "%s: maximum number of parallel jobs is %d\n"
+msgstr "%s: le nombre maximum de jobs en parallèle est %d\n"
+
+#: pg_restore.c:345
 #, 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"
+"%s : les options --single-transaction et -j ne peuvent pas être indiquées\n"
+"simultanément\n"
 
-#: pg_restore.c:369
+#: pg_restore.c:385
 #, c-format
 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:401
-#, c-format
-msgid "%s: maximum number of parallel jobs is %d\n"
-msgstr "%s: le nombre maximum de jobs en parallèle est %d\n"
+"format d'archive « %s » non reconnu ; merci d'indiquer « c », « d » ou « t "
+"»\n"
 
-#: pg_restore.c:419
+#: pg_restore.c:425
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
-msgstr "ATTENTION : erreurs ignorées lors de la restauration : %d\n"
+msgstr "ATTENTION : erreurs ignorées lors de la restauration : %d\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:439
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
 "\n"
 msgstr ""
-"%s restaure une base de données PostgreSQL à partir d'une archive créée "
+"%s restaure une base de données PostgreSQL à partir d'une archive créée "
 "par\n"
 "pg_dump.\n"
 "\n"
 
-#: pg_restore.c:435
+#: pg_restore.c:441
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPTION]... [FICHIER]\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:444
 #, 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"
+"  -d, --dbname=NOM             nom de la base de données utilisée pour la\n"
 "                               connexion\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:445
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=NOMFICHIER        nom du fichier de sortie\n"
 
-#: pg_restore.c:440
+#: pg_restore.c:446
 #, c-format
 msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr ""
 "  -F, --format=c|d|t           format du fichier de sauvegarde (devrait "
-"être\n"
+"être\n"
 "                               automatique)\n"
 
-#: pg_restore.c:441
+#: pg_restore.c:447
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr ""
-"  -l, --list                   affiche la table des matières de l'archive "
+"  -l, --list                   affiche la table des matières de l'archive "
 "(TOC)\n"
 
-#: pg_restore.c:442
+#: pg_restore.c:448
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose                mode verbeux\n"
 
-#: pg_restore.c:443
+#: pg_restore.c:449
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version                affiche la version puis quitte\n"
 
-#: pg_restore.c:444
+#: pg_restore.c:450
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help                   affiche cette aide puis quitte\n"
 
-#: pg_restore.c:446
+#: pg_restore.c:452
 #, c-format
 msgid ""
 "\n"
 "Options controlling the restore:\n"
 msgstr ""
 "\n"
-"Options contrôlant la restauration :\n"
+"Options contrôlant la restauration :\n"
 
-#: pg_restore.c:447
+#: pg_restore.c:453
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr ""
-"  -a, --data-only              restaure uniquement les données, pas la\n"
+"  -a, --data-only              restaure uniquement les données, pas la\n"
 "                               structure\n"
 
-#: pg_restore.c:449
+#: pg_restore.c:455
 #, c-format
 msgid "  -C, --create                 create the target database\n"
-msgstr "  -C, --create                 crée la base de données cible\n"
+msgstr "  -C, --create                 crée la base de données cible\n"
 
-#: pg_restore.c:450
+#: pg_restore.c:456
 #, c-format
 msgid "  -e, --exit-on-error          exit on error, default is to continue\n"
 msgstr ""
-"  -e, --exit-on-error          quitte en cas d'erreur, continue par défaut\n"
+"  -e, --exit-on-error          quitte en cas d'erreur, continue par défaut\n"
 
-#: pg_restore.c:451
+#: pg_restore.c:457
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
-msgstr "  -I, --index=NOM              restaure l'index indiqué\n"
+msgstr "  -I, --index=NOM              restaure l'index indiqué\n"
 
-#: pg_restore.c:452
+#: pg_restore.c:458
 #, 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"
+"  -j, --jobs=NUMERO            utilise ce nombre de jobs en parallèle pour\n"
 "                               la restauration\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:459
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
 "                               selecting/ordering output\n"
 msgstr ""
-"  -L, --use-list=NOMFICHIER    utilise la table des matières à partir\n"
-"                               de ce fichier pour sélectionner/trier\n"
+"  -L, --use-list=NOMFICHIER    utilise la table des matières à partir\n"
+"                               de ce fichier pour sélectionner/trier\n"
 "                               la sortie\n"
 
-#: pg_restore.c:455
+#: pg_restore.c:461
 #, c-format
 msgid "  -n, --schema=NAME            restore only objects in this schema\n"
 msgstr ""
-"  -n, --schema=NOM             restaure uniquement les objets de ce schéma\n"
+"  -n, --schema=NOM             restaure uniquement les objets de ce schéma\n"
 
-#: pg_restore.c:457
+#: pg_restore.c:463
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
-msgstr "  -P, --function=NOM(args)     restaure la fonction indiquée\n"
+msgstr "  -P, --function=NOM(args)     restaure la fonction indiquée\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:464
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr ""
 "  -s, --schema-only            restaure uniquement la structure, pas les\n"
-"                               données\n"
+"                               données\n"
 
-#: pg_restore.c:459
+#: pg_restore.c:465
 #, 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 triggers\n"
+"  -S, --superuser=NOM          indique le nom du super-utilisateur à\n"
+"                               utiliser pour désactiver les triggers\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:466
 #, c-format
 msgid "  -t, --table=NAME             restore named table\n"
-msgstr "  -t, --table=NOM              restaure la table indiquée\n"
+msgstr "  -t, --table=NOM              restaure la table indiquée\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:467
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
-msgstr "  -T, --trigger=NOM            restaure le trigger indiqué\n"
+msgstr "  -T, --trigger=NOM            restaure le trigger indiqué\n"
 
-#: pg_restore.c:462
+#: pg_restore.c:468
 #, c-format
 msgid ""
 "  -x, --no-privileges          skip restoration of access privileges (grant/"
@@ -2834,56 +2871,56 @@
 "objets\n"
 "                               (grant/revoke)\n"
 
-#: pg_restore.c:463
+#: pg_restore.c:469
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr "  -1, --single-transaction     restaure dans une seule transaction\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:471
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
-msgstr "  --enable-row-security        active la sécurité niveau ligne\n"
+msgstr "  --enable-row-security        active la sécurité niveau ligne\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:473
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not "
 "be\n"
 "                               created\n"
 msgstr ""
-"  --no-data-for-failed-tables  ne restaure pas les données des tables qui\n"
-"                               n'ont pas pu être créées\n"
+"  --no-data-for-failed-tables  ne restaure pas les données des tables qui\n"
+"                               n'ont pas pu être créées\n"
 
-#: pg_restore.c:469
+#: pg_restore.c:475
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr ""
-"  --no-security-labels         ne restaure pas les labels de sécurité\n"
+"  --no-security-labels         ne restaure pas les labels de sécurité\n"
 
-#: pg_restore.c:470
+#: pg_restore.c:476
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr ""
 "  --no-tablespaces             ne restaure pas les affectations de\n"
 "                               tablespaces\n"
 
-#: pg_restore.c:471
+#: pg_restore.c:477
 #, c-format
 msgid ""
 "  --section=SECTION            restore named section (pre-data, data, or "
 "post-data)\n"
 msgstr ""
-"  --section=SECTION            restaure la section indiquée (pre-data, "
+"  --section=SECTION            restaure la section indiquée (pre-data, "
 "data\n"
 "                               ou post-data)\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:488
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr ""
-"  --role=NOMROLE               exécute SET ROLE avant la restauration\n"
+"  --role=NOMROLE               exécute SET ROLE avant la restauration\n"
 
-#: pg_restore.c:484
+#: pg_restore.c:490
 #, c-format
 msgid ""
 "\n"
@@ -2892,11 +2929,11 @@
 "multiple times to select multiple objects.\n"
 msgstr ""
 "\n"
-"Les options -I, -n, -P, -t, -T et --section peuvent être combinées et "
-"indiquées\n"
-"plusieurs fois pour sélectionner plusieurs objets.\n"
+"Les options -I, -n, -P, -t, -T et --section peuvent être combinées et "
+"indiquées\n"
+"plusieurs fois pour sélectionner plusieurs objets.\n"
 
-#: pg_restore.c:487
+#: pg_restore.c:493
 #, c-format
 msgid ""
 "\n"
@@ -2904,13 +2941,28 @@
 "\n"
 msgstr ""
 "\n"
-"Si aucun nom de fichier n'est fourni en entrée, alors l'entrée standard "
+"Si aucun nom de fichier n'est fourni en entrée, alors l'entrée standard "
 "est\n"
-"utilisée.\n"
+"utilisée.\n"
 "\n"
 
+#~ msgid "worker is terminating\n"
+#~ msgstr "le worker est en cours d'arrêt\n"
+
+#~ msgid "could not get relation name for OID %u: %s\n"
+#~ msgstr "n'a pas pu obtenir le nom de la relation pour l'OID %u: %s\n"
+
+#~ msgid "unrecognized command on communication channel: %s\n"
+#~ msgstr "commande inconnue sur le canal de communucation: %s\n"
+
+#~ msgid "terminated by user\n"
+#~ msgstr "terminé par l'utilisateur\n"
+
+#~ msgid "error in ListenToWorkers(): %s\n"
+#~ msgstr "erreur dans ListenToWorkers(): %s\n"
+
 #~ msgid "could not change directory to \"%s\""
-#~ msgstr "n'a pas pu accéder au répertoire « %s »"
+#~ msgstr "n'a pas pu accéder au répertoire « %s »"
 
 #~ msgid "cannot duplicate null pointer\n"
 #~ msgstr "ne peut pas dupliquer un pointeur nul\n"
@@ -2922,13 +2974,13 @@
 #~ msgstr "parallel_restore ne devrait pas retourner\n"
 
 #~ msgid "could not create worker thread: %s\n"
-#~ msgstr "n'a pas pu créer le fil de travail: %s\n"
+#~ msgstr "n'a pas pu créer le fil de travail: %s\n"
 
 #~ msgid "could not parse version string \"%s\"\n"
-#~ msgstr "n'a pas pu analyser la chaîne de version « %s »\n"
+#~ msgstr "n'a pas pu analyser la chaîne de version « %s »\n"
 
 #~ msgid "%s: could not parse version \"%s\"\n"
-#~ msgstr "%s : n'a pas pu analyser la version « %s »\n"
+#~ msgstr "%s : n'a pas pu analyser la version « %s »\n"
 
 #~ msgid "-C and -c are incompatible options\n"
 #~ msgstr "-C et -c sont des options incompatibles\n"
@@ -2936,55 +2988,55 @@
 #~ 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"
+#~ "instruction COPY invalide -- n'a pas pu trouver « copy » dans la chaîne "
+#~ "« %s »\n"
 
 #~ 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"
+#~ "instruction COPY invalide -- n'a pas pu trouver « from stdin » dans la\n"
+#~ "chaîne « %s » à partir de la position %lu\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[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"
+#~ "%d octets requis, %d obtenus de « lookahead » et %d du fichier\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"
+#~ 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 "query returned %d rows instead of one: %s\n"
-#~ msgstr "la requête a renvoyé %d lignes au lieu d'une seule : %s\n"
+#~ msgstr "la requête a renvoyé %d lignes au lieu d'une seule : %s\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"
+#~ msgstr "aucune définition de label trouvée pour l'ID enum %u\n"
 
 #~ msgid "compression support is disabled in this format\n"
-#~ msgstr "le support de la compression est désactivé avec ce format\n"
+#~ msgstr "le support de la compression est désactivé avec ce format\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"
+#~ msgstr "n'a pas pu analyser la liste ACL (%s) du « Large Object » %u"
 
 #~ msgid "saving large object properties\n"
-#~ msgstr "sauvegarde des propriétés des « Large Objects »\n"
+#~ msgstr "sauvegarde des propriétés des « Large Objects »\n"
 
 #~ msgid "dumpBlobs(): could not open large object %u: %s"
-#~ msgstr "dumpBlobs() : n'a pas pu ouvrir le « Large Object » %u : %s"
+#~ msgstr "dumpBlobs() : n'a pas pu ouvrir le « Large Object » %u : %s"
 
 #~ msgid ""
 #~ "dumping a specific TOC data block out of order is not supported without "
 #~ "ID on this input stream (fseek required)\n"
 #~ msgstr ""
-#~ "la sauvegarde d'un bloc de données spécifique du TOC dans le désordre "
+#~ "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"
+#~ "pas supporté sans identifiant sur ce flux d'entrée (fseek requis)\n"
 
 #~ msgid "query returned no rows: %s\n"
-#~ msgstr "la requête n'a renvoyé aucune ligne : %s\n"
+#~ msgstr "la requête n'a renvoyé aucune ligne : %s\n"
 
 #~ msgid "%s: invalid -X option -- %s\n"
 #~ msgstr "%s : option -X invalide -- %s\n"
@@ -2996,7 +3048,7 @@
 #~ msgstr "ne peut pas rouvrir stdin\n"
 
 #~ msgid "%s: out of memory\n"
-#~ msgstr "%s : mémoire épuisée\n"
+#~ msgstr "%s : mémoire épuisée\n"
 
 #~ msgid ""
 #~ "  --use-set-session-authorization\n"
@@ -3009,13 +3061,13 @@
 #~ "AUTHORIZATION\n"
 #~ "                               au lieu des commandes ALTER OWNER pour "
 #~ "les\n"
-#~ "                               modifier les propriétaires\n"
+#~ "                               modifier les propriétaires\n"
 
 #~ msgid ""
 #~ "  --disable-triggers       disable triggers during data-only restore\n"
 #~ msgstr ""
-#~ "  --disable-triggers           désactiver les déclencheurs lors de la\n"
-#~ "                               restauration des données seules\n"
+#~ "  --disable-triggers           désactiver les déclencheurs lors de la\n"
+#~ "                               restauration des données seules\n"
 
 #~ msgid "  -O, --no-owner           skip restoration of object ownership\n"
 #~ msgstr ""
@@ -3027,9 +3079,9 @@
 #~ "  -c, --clean              clean (drop) database objects before "
 #~ "recreating\n"
 #~ msgstr ""
-#~ "  -c, --clean               nettoie/supprime les bases de données avant "
+#~ "  -c, --clean               nettoie/supprime les bases de données avant "
 #~ "de\n"
-#~ "                            les créer\n"
+#~ "                            les créer\n"
 
 #~ msgid "  --version                output version information, then exit\n"
 #~ msgstr "  --version                    affiche la version et quitte\n"
@@ -3038,19 +3090,19 @@
 #~ msgstr "  --help                       affiche cette aide et quitte\n"
 
 #~ msgid "restoring large object OID %u\n"
-#~ msgstr "restauration du « Large Object » d'OID %u\n"
+#~ msgstr "restauration du « Large Object » d'OID %u\n"
 
 #~ msgid "could not close large object file\n"
-#~ msgstr "n'a pas pu fermer le fichier du « Large Object »\n"
+#~ msgstr "n'a pas pu fermer le fichier du « Large Object »\n"
 
 #~ 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"
+#~ msgstr "n'a pas pu ouvrir la TOC du « Large Object » en sortie : %s\n"
 
 #~ msgid "could not open large object TOC for input: %s\n"
-#~ msgstr "n'a pas pu ouvrir la TOC du « Large Object » en entrée : %s\n"
+#~ msgstr "n'a pas pu ouvrir la TOC du « Large Object » en entrée : %s\n"
 
 #~ msgid "could not close data file after reading\n"
-#~ msgstr "n'a pas pu fermer le fichier de données après lecture\n"
+#~ msgstr "n'a pas pu fermer le fichier de données après lecture\n"
 
 #~ msgid ""
 #~ "WARNING:\n"
@@ -3058,40 +3110,40 @@
 #~ "  normal use. Files will be written in the current working directory.\n"
 #~ msgstr ""
 #~ "ATTENTION :\n"
-#~ "  Ce format est présent dans un but de démonstration ; il n'est pas "
-#~ "prévu\n"
-#~ "  pour une utilisation normale. Les fichiers seront écrits dans le\n"
-#~ "  répertoire actuel.\n"
+#~ "  Ce format est présent dans un but de démonstration ; il n'est pas "
+#~ "prévu\n"
+#~ "  pour une utilisation normale. Les fichiers seront écrits dans le\n"
+#~ "  répertoire actuel.\n"
 
 #~ msgid "file archiver"
 #~ msgstr "programme d'archivage de fichiers"
 
 #~ msgid "SQL command failed\n"
-#~ msgstr "la commande SQL a échoué\n"
+#~ msgstr "la commande SQL a échoué\n"
 
 #~ 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"
+#~ "a trouvé plusieurs entrées pour pg_indexes dans la table pg_class\n"
 
 #~ 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"
+#~ msgstr "n'a pas pu trouver l'entrée de pg_indexes dans pg_class\n"
 
 #~ 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"
+#~ "a trouvé plusieurs entrées dans pg_database pour cette base de données\n"
 
 #~ msgid "missing pg_database entry for this database\n"
-#~ msgstr "entrée pg_database manquante pour cette base de données\n"
+#~ msgstr "entrée pg_database manquante pour cette base de données\n"
 
 #~ 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] ""
-#~ "la requête a renvoyé %d entrée de serveur distant pour la table distante "
-#~ "« %s »\n"
+#~ "la requête a renvoyé %d entrée de serveur distant pour la table distante "
+#~ "« %s »\n"
 #~ msgstr[1] ""
-#~ "la requête a renvoyé %d entrées de serveurs distants pour la table "
-#~ "distante « %s »\n"
+#~ "la requête a renvoyé %d entrées de serveurs distants pour la table "
+#~ "distante « %s »\n"
 
 #~ msgid ""
 #~ "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
@@ -3105,11 +3157,11 @@
 #~ 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"
+#~ "la requête a renvoyé plusieurs (%d) entrées pg_database pour la base de\n"
+#~ "données « %s »\n"
 
 #~ msgid "missing pg_database entry for database \"%s\"\n"
-#~ msgstr "entrée manquante dans pg_database pour la base de données « %s »\n"
+#~ msgstr "entrée manquante dans pg_database pour la base de données « %s »\n"
 
 #~ msgid "*** aborted because of error\n"
 #~ msgstr "*** interrompu du fait d'erreurs\n"
@@ -3123,7 +3175,7 @@
 
 #~ 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 "
+#~ "pas de correspondance entre la position réelle et celle prévue du "
 #~ "fichier\n"
 #~ "(%s vs. %s)\n"
 
@@ -3131,25 +3183,25 @@
 #~ msgstr "n'a pas pu remplir la fin du membre de tar\n"
 
 #~ 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"
+#~ msgstr "n'a pas pu écrire le bloc nul à la fin de l'archive tar\n"
 
 #~ msgid "could not write byte\n"
-#~ msgstr "n'a pas pu écrire l'octet\n"
+#~ msgstr "n'a pas pu écrire l'octet\n"
 
 #~ msgid "could not write byte: %s\n"
-#~ msgstr "n'a pas pu écrire un octet : %s\n"
+#~ msgstr "n'a pas pu écrire un octet : %s\n"
 
 #~ msgid "unexpected end of file\n"
 #~ msgstr "fin de fichier inattendu\n"
 
 #~ msgid "could not write to custom output routine\n"
-#~ msgstr "n'a pas pu écrire vers la routine de sauvegarde personnalisée\n"
+#~ msgstr "n'a pas pu écrire vers la routine de sauvegarde personnalisée\n"
 
 #~ msgid "could not write to output file: %s\n"
-#~ msgstr "n'a pas pu écrire dans le fichier de sauvegarde : %s\n"
+#~ msgstr "n'a pas pu écrire dans le fichier de sauvegarde : %s\n"
 
 #~ msgid "could not open output file \"%s\" for writing\n"
-#~ msgstr "n'a pas pu ouvrir le fichier de sauvegarde « %s » en écriture\n"
+#~ msgstr "n'a pas pu ouvrir le fichier de sauvegarde « %s » en écriture\n"
 
 #~ msgid "archive member too large for tar format\n"
 #~ msgstr "membre de l'archive trop volumineux pour le format tar\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/po/it.po postgresql-9.5-9.5.8/src/bin/pg_dump/po/it.po
--- postgresql-9.5-9.5.2/src/bin/pg_dump/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -24,8 +24,8 @@
 msgstr ""
 "Project-Id-Version: pg_dump (Postgresql) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-08-15 18:43+0000\n"
-"PO-Revision-Date: 2015-08-16 10:01+0100\n"
+"POT-Creation-Date: 2017-02-09 21:22+0000\n"
+"PO-Revision-Date: 2017-04-23 02:51+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -33,7 +33,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
@@ -71,8 +71,8 @@
 msgstr "pclose fallita: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 pg_backup_db.c:135 pg_backup_db.c:190
-#: pg_backup_db.c:234 pg_backup_db.c:280
+#: ../../common/fe_memutils.c:98 pg_backup_db.c:157 pg_backup_db.c:212
+#: pg_backup_db.c:271 pg_backup_db.c:313
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria esaurita\n"
@@ -117,264 +117,269 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "processo figlio uscito con stato non riconosciuto %d"
 
-#: common.c:109
+#: common.c:119
+#, c-format
+msgid "reading extensions\n"
+msgstr "lettura delle estensioni\n"
+
+#: common.c:124
+#, c-format
+msgid "identifying extension members\n"
+msgstr "identificazione dei membri delle estensioni\n"
+
+#: common.c:128
 #, c-format
 msgid "reading schemas\n"
 msgstr "lettura schemi\n"
 
-#: common.c:120
+#: common.c:139
 #, c-format
 msgid "reading user-defined tables\n"
 msgstr "lettura delle tabelle definite dall'utente\n"
 
-#: common.c:128
-#, c-format
-msgid "reading extensions\n"
-msgstr "lettura delle estensioni\n"
-
-#: common.c:132
+#: common.c:147
 #, c-format
 msgid "reading user-defined functions\n"
 msgstr "lettura funzioni definite dall'utente\n"
 
-#: common.c:138
+#: common.c:153
 #, c-format
 msgid "reading user-defined types\n"
 msgstr "lettura tipi definiti dall'utente\n"
 
-#: common.c:144
+#: common.c:159
 #, c-format
 msgid "reading procedural languages\n"
 msgstr "lettura linguaggi procedurali\n"
 
-#: common.c:148
+#: common.c:163
 #, c-format
 msgid "reading user-defined aggregate functions\n"
 msgstr "lettura funzioni di aggregazione definite dall'utente\n"
 
-#: common.c:152
+#: common.c:167
 #, c-format
 msgid "reading user-defined operators\n"
 msgstr "lettura operatori definiti dall'utente\n"
 
-#: common.c:157
+#: common.c:172
 #, c-format
 msgid "reading user-defined operator classes\n"
 msgstr "lettura classi operatore definite dall'utente\n"
 
-#: common.c:161
+#: common.c:176
 #, c-format
 msgid "reading user-defined operator families\n"
 msgstr "lettura delle famiglie di operatori definiti dall'utente\n"
 
-#: common.c:165
+#: common.c:180
 #, c-format
 msgid "reading user-defined text search parsers\n"
 msgstr "lettura dei parser di ricerca testo definiti dall'utente\n"
 
-#: common.c:169
+#: common.c:184
 #, c-format
 msgid "reading user-defined text search templates\n"
 msgstr "lettura dei modelli di ricerca testo definiti dall'utente\n"
 
-#: common.c:173
+#: common.c:188
 #, c-format
 msgid "reading user-defined text search dictionaries\n"
 msgstr "lettura dei dizionari di ricerca testo definiti dall'utente\n"
 
-#: common.c:177
+#: common.c:192
 #, c-format
 msgid "reading user-defined text search configurations\n"
 msgstr "lettura delle configurazioni di ricerca testo definite dall'utente\n"
 
-#: common.c:181
+#: common.c:196
 #, c-format
 msgid "reading user-defined foreign-data wrappers\n"
 msgstr "lettura dei wrapper di dati esterni definiti dall'utente\n"
 
-#: common.c:185
+#: common.c:200
 #, c-format
 msgid "reading user-defined foreign servers\n"
 msgstr "lettura dei server esterni definiti dall'utente\n"
 
-#: common.c:189
+#: common.c:204
 #, c-format
 msgid "reading default privileges\n"
 msgstr "lettura dei privilegi predefiniti\n"
 
-#: common.c:193
+#: common.c:208
 #, c-format
 msgid "reading user-defined collations\n"
 msgstr "lettura degli ordini definiti dall'utente\n"
 
-#: common.c:198
+#: common.c:213
 #, c-format
 msgid "reading user-defined conversions\n"
 msgstr "lettura delle conversioni definite dall'utente\n"
 
-#: common.c:202
+#: common.c:217
 #, c-format
 msgid "reading type casts\n"
 msgstr "lettura delle conversioni dei tipi\n"
 
-#: common.c:206
+#: common.c:221
 #, c-format
 msgid "reading transforms\n"
 msgstr "lettura delle trasformazioni\n"
 
-#: common.c:210
+#: common.c:225
 #, c-format
 msgid "reading table inheritance information\n"
 msgstr "lettura informazioni di ereditarietà delle tabelle\n"
 
-#: common.c:214
+#: common.c:229
 #, c-format
 msgid "reading event triggers\n"
 msgstr "lettura dei trigger di evento\n"
 
-#: common.c:223
+#: common.c:234
 #, c-format
-msgid "finding extension members\n"
-msgstr "ricerca degli elementi delle estensioni\n"
+msgid "finding extension tables\n"
+msgstr "ricerca delle tabelle delle estensioni\n"
 
-#: common.c:228
+#: common.c:239
 #, c-format
 msgid "finding inheritance relationships\n"
 msgstr "ricerca delle relazioni di ereditarietà\n"
 
-#: common.c:232
+#: common.c:243
 #, c-format
 msgid "reading column info for interesting tables\n"
 msgstr "lettura informazioni di colonna per le tabelle interessate\n"
 
-#: common.c:236
+#: common.c:247
 #, c-format
 msgid "flagging inherited columns in subtables\n"
 msgstr "marcatura colonne ereditate nelle sottotabelle\n"
 
-#: common.c:240
+#: common.c:251
 #, c-format
 msgid "reading indexes\n"
 msgstr "lettura degli indici\n"
 
-#: common.c:244
+#: common.c:255
 #, c-format
 msgid "reading constraints\n"
 msgstr "lettura dei vincoli\n"
 
-#: common.c:248
+#: common.c:259
 #, c-format
 msgid "reading triggers\n"
 msgstr "lettura dei trigger\n"
 
-#: common.c:252
+#: common.c:263
 #, c-format
 msgid "reading rewrite rules\n"
 msgstr "lettura regole di riscrittura\n"
 
-#: common.c:256
+#: common.c:267
 #, c-format
 msgid "reading policies\n"
-msgstr "lettura delle politiche\n"
+msgstr "lettura delle regole di sicurezza\n"
 
-#: common.c:804
+#: common.c:902
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
 msgstr "controllo di integrità fallito, OID padre %u della tabella \"%s\" (OID %u) non trovato\n"
 
-#: common.c:846
+#: common.c:944
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers\n"
 msgstr "non è stato possibile interpretare l'array numerico \"%s\": troppi numeri\n"
 
-#: common.c:861
+#: common.c:959
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number\n"
 msgstr "non è stato possibile interpretare l'array numerico \"%s\": caratteri non validi nel numero\n"
 
 #. translator: this is a module name
-#: compress_io.c:79
+#: compress_io.c:78
 msgid "compress_io"
 msgstr "compress_io"
 
-#: compress_io.c:115
+#: compress_io.c:114
 #, c-format
 msgid "invalid compression code: %d\n"
 msgstr "codice di compressione non valido: %d\n"
 
-#: compress_io.c:139 compress_io.c:175 compress_io.c:196 compress_io.c:529
-#: compress_io.c:572
+#: compress_io.c:138 compress_io.c:174 compress_io.c:192 compress_io.c:519
+#: compress_io.c:562
 #, c-format
 msgid "not built with zlib support\n"
 msgstr "compilato senza il supporto a zlib\n"
 
-#: compress_io.c:246 compress_io.c:348
+#: compress_io.c:242 compress_io.c:344
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "inizializzazione della libreria di compressione fallita: %s\n"
 
-#: compress_io.c:267
+#: compress_io.c:263
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "chiusura dello stream di compressione fallita: %s\n"
 
-#: compress_io.c:285
+#: compress_io.c:281
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "compressione dei dati fallita: %s\n"
 
-#: compress_io.c:368 compress_io.c:384
+#: compress_io.c:361 compress_io.c:377
 #, c-format
 msgid "could not uncompress data: %s\n"
 msgstr "decompressione dei dati fallita: %s\n"
 
-#: compress_io.c:392
+#: compress_io.c:385
 #, c-format
 msgid "could not close compression library: %s\n"
 msgstr "chiusura della libreria di compressione fallita: %s\n"
 
-#: compress_io.c:606 compress_io.c:642 pg_backup_custom.c:591
-#: pg_backup_tar.c:555
+#: compress_io.c:596 compress_io.c:632 pg_backup_custom.c:591
+#: pg_backup_tar.c:560
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "lettura dal file di input fallita: %s\n"
 
-#: compress_io.c:645 pg_backup_custom.c:588 pg_backup_directory.c:552
-#: pg_backup_tar.c:791 pg_backup_tar.c:815
+#: compress_io.c:635 pg_backup_custom.c:588 pg_backup_directory.c:548
+#: pg_backup_tar.c:796 pg_backup_tar.c:820
 #, c-format
 msgid "could not read from input file: end of file\n"
 msgstr "lettura dal file di input fallita: fine del file\n"
 
-#: parallel.c:78
+#: dumputils.c:402 dumputils.c:433
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr "il comando della shell nel parametro contiene un \"a capo\": \"%s\"\n"
+
+#: dumputils.c:545
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr "il nome del database contiene un \"a capo\": \"%s\"\n"
+
+#: parallel.c:166
 msgid "parallel archiver"
 msgstr "archiviatore parallelo"
 
-#: parallel.c:143
+#: parallel.c:230
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: WSAStartup fallita: %d\n"
 
-#: parallel.c:343
-#, c-format
-msgid "worker is terminating\n"
-msgstr "il worker sta terminando\n"
-
-#: parallel.c:537
+#: parallel.c:933
 #, c-format
 msgid "could not create communication channels: %s\n"
 msgstr "creazione dei canali di comunicazione fallita: %s\n"
 
-#: parallel.c:611
+#: parallel.c:996
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "creazione del processo worker fallita: %s\n"
 
-#: parallel.c:828
-#, c-format
-msgid "could not get relation name for OID %u: %s\n"
-msgstr "errore nell'ottenere il nome della relazione per l'OID %u: %s\n"
-
-#: parallel.c:845
+#: parallel.c:1191
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -383,77 +388,67 @@
 "errore nell'ottenere un lock sulla relazione \"%s\"\n"
 "Questo di solito vuol dire che qualcuno ha richiesto un lock ACCESS EXCLUSIVE sulla tabella dopo che il processo padre di pg_dump aveva ottenuto il lock ACCESS SHARE iniziale sulla tabella.\n"
 
-#: parallel.c:929
+#: parallel.c:1261
 #, c-format
-msgid "unrecognized command on communication channel: %s\n"
-msgstr "comando sconosciuto sul canale di comunicazione: %s\n"
+msgid "unrecognized command received from master: \"%s\"\n"
+msgstr "comando sconosciuto ricevuto dal master: \"%s\"\n"
 
-#: parallel.c:962
+#: parallel.c:1299
 #, c-format
 msgid "a worker process died unexpectedly\n"
 msgstr "un processo worker è morto inaspettatamente\n"
 
-#: parallel.c:989 parallel.c:998
-#, c-format
-msgid "invalid message received from worker: %s\n"
-msgstr "messaggio non valido ricevuto dal worker: %s\n"
-
-#: parallel.c:995 pg_backup_db.c:337
+#: parallel.c:1325 parallel.c:1331
 #, c-format
-msgid "%s"
-msgstr "%s"
+msgid "invalid message received from worker: \"%s\"\n"
+msgstr "messaggio non valido ricevuto dal worker: \"%s\"\n"
 
-#: parallel.c:1047 parallel.c:1091
+#: parallel.c:1388 parallel.c:1439
 #, c-format
 msgid "error processing a parallel work item\n"
 msgstr "errore nel processo di una unità di lavoro parallela\n"
 
-#: parallel.c:1119 parallel.c:1257
+#: parallel.c:1468 parallel.c:1586
 #, c-format
 msgid "could not write to the communication channel: %s\n"
 msgstr "scrittura nel canale di comunicazione fallita: %s\n"
 
-#: parallel.c:1168
+#: parallel.c:1546
 #, c-format
-msgid "terminated by user\n"
-msgstr "terminato dall'utente\n"
+msgid "select() failed: %s\n"
+msgstr "select() fallita: %s\n"
 
-#: parallel.c:1220
-#, c-format
-msgid "error in ListenToWorkers(): %s\n"
-msgstr "errore in ListenToWorkers(): %s\n"
-
-#: parallel.c:1345
+#: parallel.c:1671
 #, c-format
 msgid "pgpipe: could not create socket: error code %d\n"
 msgstr "pgpipe: errore nella creazione del socket: codice di errore %d\n"
 
-#: parallel.c:1356
+#: parallel.c:1682
 #, c-format
 msgid "pgpipe: could not bind: error code %d\n"
 msgstr "pgpipe: bind fallito: codice di errore %d\n"
 
-#: parallel.c:1363
+#: parallel.c:1689
 #, c-format
 msgid "pgpipe: could not listen: error code %d\n"
 msgstr "pgpipe: listen fallito: codice di errore %d\n"
 
-#: parallel.c:1370
+#: parallel.c:1696
 #, c-format
 msgid "pgpipe: getsockname() failed: error code %d\n"
 msgstr "pgpipe: getsockname() fallito: codice di errore %d\n"
 
-#: parallel.c:1381
+#: parallel.c:1707
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d\n"
 msgstr "pgpipe: creazione del secondo socket fallita: codice di errore %d\n"
 
-#: parallel.c:1390
+#: parallel.c:1716
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d\n"
 msgstr "pgpipe: connessione del socket fallita: codice di errore %d\n"
 
-#: parallel.c:1397
+#: parallel.c:1725
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d\n"
 msgstr "pgpipe: accept della connessione fallito: codice di errore %d\n"
@@ -463,465 +458,465 @@
 msgid "archiver"
 msgstr "archiviatore"
 
-#: pg_backup_archiver.c:230 pg_backup_archiver.c:1479
+#: pg_backup_archiver.c:229 pg_backup_archiver.c:1522
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "chiusura del file di output fallita: %s\n"
 
-#: pg_backup_archiver.c:265 pg_backup_archiver.c:270
+#: pg_backup_archiver.c:275 pg_backup_archiver.c:280
 #, c-format
 msgid "WARNING: archive items not in correct section order\n"
 msgstr "ATTENZIONE: gli elementi dell'archivio non sono nell'ordine di sezione giusto\n"
 
-#: pg_backup_archiver.c:276
+#: pg_backup_archiver.c:286
 #, c-format
 msgid "unexpected section code %d\n"
 msgstr "codice di sezione non prevista %d\n"
 
-#: pg_backup_archiver.c:308
+#: pg_backup_archiver.c:318
 #, c-format
 msgid "-C and -1 are incompatible options\n"
 msgstr "-C e -1 sono opzioni incompatibili\n"
 
-#: pg_backup_archiver.c:318
+#: pg_backup_archiver.c:328
 #, c-format
 msgid "parallel restore is not supported with this archive file format\n"
 msgstr "il ripristino parallelo non è supportato con questo formato di archivio\n"
 
-#: pg_backup_archiver.c:322
+#: pg_backup_archiver.c:332
 #, c-format
 msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
 msgstr "il ripristino parallelo non è supportato con archivi eseguiti da pg_dump precedenti la versione 8.0\n"
 
-#: pg_backup_archiver.c:340
+#: pg_backup_archiver.c:350
 #, c-format
 msgid "cannot restore from compressed archive (compression not supported in this installation)\n"
 msgstr "non è possibile ripristinare da archivio compresso (compressione non supportata in questa installazione)\n"
 
-#: pg_backup_archiver.c:357
+#: pg_backup_archiver.c:367
 #, c-format
 msgid "connecting to database for restore\n"
 msgstr "connessione al database per il ripristino\n"
 
-#: pg_backup_archiver.c:359
+#: pg_backup_archiver.c:369
 #, c-format
 msgid "direct database connections are not supported in pre-1.3 archives\n"
 msgstr "le connessioni dirette al database non sono supportate negli archivi pre-1.3\n"
 
-#: pg_backup_archiver.c:404
+#: pg_backup_archiver.c:414
 #, c-format
 msgid "implied data-only restore\n"
 msgstr "ripristino implicito dei soli dati\n"
 
-#: pg_backup_archiver.c:474
+#: pg_backup_archiver.c:484
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "cancellazione di %s %s\n"
 
-#: pg_backup_archiver.c:627
+#: pg_backup_archiver.c:577
 #, c-format
-msgid "setting owner and privileges for %s \"%s\".\"%s\"\n"
-msgstr "impostazione di proprietario e permessi per %s \"%s\".\"%s\"\n"
+msgid "WARNING: could not find where to insert IF EXISTS in statement \"%s\"\n"
+msgstr "ATTENZIONE: posizione dove inserire IF EXISTS nell'istruzione \"%s\" non trovata\n"
 
-#: pg_backup_archiver.c:630
+#: pg_backup_archiver.c:653
+#, c-format
+msgid "setting owner and privileges for %s \"%s.%s\"\n"
+msgstr "impostazione di proprietario e permessi per %s \"%s.%s\"\n"
+
+#: pg_backup_archiver.c:656
 #, c-format
 msgid "setting owner and privileges for %s \"%s\"\n"
 msgstr "impostazione di proprietario e permessi per %s \"%s\"\n"
 
-#: pg_backup_archiver.c:696 pg_backup_archiver.c:698
+#: pg_backup_archiver.c:722 pg_backup_archiver.c:724
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "avvertimento dal file originale scaricato: %s\n"
 
-#: pg_backup_archiver.c:707
+#: pg_backup_archiver.c:733
 #, c-format
-msgid "creating %s \"%s\".\"%s\"\n"
-msgstr "creazione di %s \"%s\".\"%s\"\n"
+msgid "creating %s \"%s.%s\"\n"
+msgstr "creazione %s \"%s.%s\"\n"
 
-#: pg_backup_archiver.c:710
+#: pg_backup_archiver.c:736
 #, c-format
 msgid "creating %s \"%s\"\n"
 msgstr "creazione di %s \"%s\"\n"
 
-#: pg_backup_archiver.c:755
+#: pg_backup_archiver.c:788
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "connessione al nuovo database \"%s\"\n"
 
-#: pg_backup_archiver.c:783
+#: pg_backup_archiver.c:816
 #, c-format
 msgid "processing %s\n"
 msgstr "elaborazione di %s\n"
 
-#: pg_backup_archiver.c:803
+#: pg_backup_archiver.c:836
 #, c-format
-msgid "processing data for table \"%s\".\"%s\"\n"
-msgstr "elaborazione dati per la tabella \"%s\".\"%s\"\n"
+msgid "processing data for table \"%s.%s\"\n"
+msgstr "elaborazione dati per la tabella \"%s.%s\".\n"
 
-#: pg_backup_archiver.c:865
+#: pg_backup_archiver.c:898
 #, c-format
 msgid "executing %s %s\n"
 msgstr "esecuzione di %s %s\n"
 
-#: pg_backup_archiver.c:902
+#: pg_backup_archiver.c:937
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "disabilitazione trigger per %s\n"
 
-#: pg_backup_archiver.c:928
+#: pg_backup_archiver.c:965
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "abilitazione trigger per %s\n"
 
-#: pg_backup_archiver.c:958
+#: pg_backup_archiver.c:995
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine\n"
 msgstr "errore interno -- WriteData non può essere chiamata al di fuori del contesto di una routine DataDumper\n"
 
-#: pg_backup_archiver.c:1122
+#: pg_backup_archiver.c:1160
 #, c-format
 msgid "large-object output not supported in chosen format\n"
 msgstr "emissione dei large object non supportata nel formato scelto\n"
 
-#: pg_backup_archiver.c:1176
+#: pg_backup_archiver.c:1218
 #, c-format
 msgid "restored %d large object\n"
 msgid_plural "restored %d large objects\n"
 msgstr[0] "ripristinato %d large object\n"
 msgstr[1] "ripristinati %d large object\n"
 
-#: pg_backup_archiver.c:1197 pg_backup_tar.c:733
+#: pg_backup_archiver.c:1239 pg_backup_tar.c:738
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "ripristino del large object con OID %u\n"
 
-#: pg_backup_archiver.c:1209
+#: pg_backup_archiver.c:1251
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "creazione il large object %u fallita: %s"
 
-#: pg_backup_archiver.c:1214 pg_dump.c:2773
+#: pg_backup_archiver.c:1256 pg_dump.c:2892
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "apertura del large object %u fallita: %s"
 
-#: pg_backup_archiver.c:1271
+#: pg_backup_archiver.c:1314
 #, c-format
 msgid "could not open TOC file \"%s\": %s\n"
 msgstr "apertura del file TOC \"%s\" fallita: %s\n"
 
-#: pg_backup_archiver.c:1312
+#: pg_backup_archiver.c:1355
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "ATTENZIONE: la riga è stata ignorata: %s\n"
 
-#: pg_backup_archiver.c:1319
+#: pg_backup_archiver.c:1362
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "non sono state trovate voci per l'ID %d\n"
 
-#: pg_backup_archiver.c:1340 pg_backup_directory.c:230
-#: pg_backup_directory.c:601
+#: pg_backup_archiver.c:1383 pg_backup_directory.c:230
+#: pg_backup_directory.c:597
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "chiusura del file TOC fallita: %s\n"
 
-#: pg_backup_archiver.c:1449 pg_backup_custom.c:162 pg_backup_directory.c:341
-#: pg_backup_directory.c:587 pg_backup_directory.c:645
-#: pg_backup_directory.c:665
+#: pg_backup_archiver.c:1492 pg_backup_custom.c:162 pg_backup_directory.c:341
+#: pg_backup_directory.c:583 pg_backup_directory.c:641
+#: pg_backup_directory.c:661
 #, c-format
 msgid "could not open output file \"%s\": %s\n"
 msgstr "apertura del file di output \"%s\" fallita: %s\n"
 
-#: pg_backup_archiver.c:1452 pg_backup_custom.c:169
+#: pg_backup_archiver.c:1495 pg_backup_custom.c:169
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "apertura del file di output fallita: %s\n"
 
-#: pg_backup_archiver.c:1556
+#: pg_backup_archiver.c:1601
 #, 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] "scritto %lu byte di dati large object (risultato = %lu)\n"
 msgstr[1] "scritti %lu byte di dati large object (risultato = %lu)\n"
 
-#: pg_backup_archiver.c:1562
+#: pg_backup_archiver.c:1607
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr "scrittura del large object fallita (risultato: %lu, previsto: %lu)\n"
 
-#: pg_backup_archiver.c:1655
+#: pg_backup_archiver.c:1700
 #, c-format
 msgid "Error while INITIALIZING:\n"
 msgstr "Errore durante INIZIALIZZAZIONE:\n"
 
-#: pg_backup_archiver.c:1660
+#: pg_backup_archiver.c:1705
 #, c-format
 msgid "Error while PROCESSING TOC:\n"
 msgstr "Errore durante ELABORAZIONE TOC:\n"
 
-#: pg_backup_archiver.c:1665
+#: pg_backup_archiver.c:1710
 #, c-format
 msgid "Error while FINALIZING:\n"
 msgstr "Errore durante FINALIZZAZIONE:\n"
 
-#: pg_backup_archiver.c:1670
+#: pg_backup_archiver.c:1715
 #, c-format
 msgid "Error from TOC entry %d; %u %u %s %s %s\n"
 msgstr "Errore nella voce TOC %d; %u %u %s %s %s\n"
 
-#: pg_backup_archiver.c:1743
+#: pg_backup_archiver.c:1788
 #, c-format
 msgid "bad dumpId\n"
 msgstr "dumpId errato\n"
 
-#: pg_backup_archiver.c:1764
+#: pg_backup_archiver.c:1809
 #, c-format
 msgid "bad table dumpId for TABLE DATA item\n"
 msgstr "dumpId di tabella errato per elemento TABLE DATA\n"
 
-#: pg_backup_archiver.c:1856
+#: pg_backup_archiver.c:1901
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "flag di offset dati non previsto %d\n"
 
-#: pg_backup_archiver.c:1869
+#: pg_backup_archiver.c:1914
 #, c-format
 msgid "file offset in dump file is too large\n"
 msgstr "l'offset del file scaricato è troppo grande\n"
 
-#: pg_backup_archiver.c:1982
+#: pg_backup_archiver.c:2027
 #, c-format
 msgid "attempting to ascertain archive format\n"
 msgstr "tentativo di accertamento del formato dell'archivio\n"
 
-#: pg_backup_archiver.c:2008 pg_backup_archiver.c:2018
+#: pg_backup_archiver.c:2053 pg_backup_archiver.c:2063
 #, c-format
 msgid "directory name too long: \"%s\"\n"
 msgstr "nome della directory troppo lungo: \"%s\"\n"
 
-#: pg_backup_archiver.c:2026
+#: pg_backup_archiver.c:2071
 #, c-format
 msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)\n"
 msgstr "la directory \"%s\" non sembra un archivio valido (\"toc.dat\" non esiste)\n"
 
-#: pg_backup_archiver.c:2034 pg_backup_custom.c:181 pg_backup_custom.c:770
-#: pg_backup_directory.c:214 pg_backup_directory.c:402
+#: pg_backup_archiver.c:2079 pg_backup_custom.c:181 pg_backup_custom.c:770
+#: pg_backup_directory.c:214 pg_backup_directory.c:399
 #, c-format
 msgid "could not open input file \"%s\": %s\n"
 msgstr "apertura del file di input \"%s\" fallita: %s\n"
 
-#: pg_backup_archiver.c:2042 pg_backup_custom.c:188
+#: pg_backup_archiver.c:2087 pg_backup_custom.c:188
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "apertura del file di input fallita: %s\n"
 
-#: pg_backup_archiver.c:2049
+#: pg_backup_archiver.c:2094
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "lettura del file di input fallita: %s\n"
 
-#: pg_backup_archiver.c:2051
+#: pg_backup_archiver.c:2096
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "il file di input è troppo corto (letti %lu, previsti 5)\n"
 
-#: pg_backup_archiver.c:2134
+#: pg_backup_archiver.c:2179
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql.\n"
 msgstr "il file di input sembra un dump in formato testo. Prego usare psql.\n"
 
-#: pg_backup_archiver.c:2140
+#: pg_backup_archiver.c:2185
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "il file di input non sembra essere un archivio valido (è troppo corto?)\n"
 
-#: pg_backup_archiver.c:2146
+#: pg_backup_archiver.c:2191
 #, c-format
 msgid "input file does not appear to be a valid archive\n"
 msgstr "il file di input non sembra essere un archivio valido\n"
 
-#: pg_backup_archiver.c:2166
+#: pg_backup_archiver.c:2211
 #, c-format
 msgid "could not close input file: %s\n"
 msgstr "chiusura del file di input fallita: %s\n"
 
-#: pg_backup_archiver.c:2183
+#: pg_backup_archiver.c:2228
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "allocazione AH per %s, formato %d\n"
 
-#: pg_backup_archiver.c:2288
+#: pg_backup_archiver.c:2333
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "formato di file \"%d\" sconosciuto\n"
 
-#: pg_backup_archiver.c:2438
+#: pg_backup_archiver.c:2489
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
 msgstr "la voce ID %d è fuori dall'intervallo consentito -- possibile corruzione della TOC\n"
 
-#: pg_backup_archiver.c:2554
+#: pg_backup_archiver.c:2605
 #, c-format
 msgid "read TOC entry %d (ID %d) for %s %s\n"
 msgstr "letta voce TOC %d (ID %d) per %s %s\n"
 
-#: pg_backup_archiver.c:2588
+#: pg_backup_archiver.c:2639
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "codifica sconosciuta \"%s\"\n"
 
-#: pg_backup_archiver.c:2593
+#: pg_backup_archiver.c:2644
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "elemento ENCODING non valido: %s\n"
 
-#: pg_backup_archiver.c:2611
+#: pg_backup_archiver.c:2662
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "elemento STDSTRINGS non valido: %s\n"
 
-#: pg_backup_archiver.c:2840
+#: pg_backup_archiver.c:2887
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "impostazione della sessione utente a \"%s\" fallita: %s"
 
-#: pg_backup_archiver.c:2872
+#: pg_backup_archiver.c:2919
 #, c-format
 msgid "could not set default_with_oids: %s"
 msgstr "impostazione di default_with_oids fallita: %s"
 
-#: pg_backup_archiver.c:3010
+#: pg_backup_archiver.c:3064
 #, c-format
 msgid "could not set search_path to \"%s\": %s"
 msgstr "impostazione di search_path a \"%s\" fallita: %s"
 
-#: pg_backup_archiver.c:3071
+#: pg_backup_archiver.c:3126
 #, c-format
 msgid "could not set default_tablespace to %s: %s"
 msgstr "impostazione di default_tablespace a %s fallita: %s"
 
-#: pg_backup_archiver.c:3158 pg_backup_archiver.c:3343
+#: pg_backup_archiver.c:3213 pg_backup_archiver.c:3407
 #, c-format
 msgid "WARNING: don't know how to set owner for object type %s\n"
 msgstr "ATTENZIONE: non si sa come impostare il proprietario per il tipo di oggetto %s\n"
 
-#: pg_backup_archiver.c:3396
-#, c-format
-msgid "WARNING: requested compression not available in this installation -- archive will be uncompressed\n"
-msgstr "ATTENZIONE: la compressione richiesta non è disponibile in questa installazione -- l'archivio non sarà compresso\n"
-
-#: pg_backup_archiver.c:3435
+#: pg_backup_archiver.c:3489
 #, c-format
 msgid "did not find magic string in file header\n"
 msgstr "magic string non trovata nell'intestazione del file\n"
 
-#: pg_backup_archiver.c:3448
+#: pg_backup_archiver.c:3502
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "versione (%d.%d) non supportata nell'intestazione del file\n"
 
-#: pg_backup_archiver.c:3453
+#: pg_backup_archiver.c:3507
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "verifica sulla dimensione degli interi (%lu) fallita\n"
 
-#: pg_backup_archiver.c:3457
+#: pg_backup_archiver.c:3511
 #, c-format
 msgid "WARNING: archive was made on a machine with larger integers, some operations might fail\n"
 msgstr "ATTENZIONE: L'archivio è stato creato su una macchina con interi lunghi, alcune operazioni potrebbero fallire\n"
 
-#: pg_backup_archiver.c:3467
+#: pg_backup_archiver.c:3521
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr "il formato previsto (%d) differisce dal formato trovato nel file (%d)\n"
 
-#: pg_backup_archiver.c:3483
+#: pg_backup_archiver.c:3537
 #, c-format
 msgid "WARNING: archive is compressed, but this installation does not support compression -- no data will be available\n"
 msgstr "ATTENZIONE: l'archivio è compresso, ma questa installazione non supporta la compressione -- nessun dato sarà disponibile\n"
 
-#: pg_backup_archiver.c:3501
+#: pg_backup_archiver.c:3555
 #, c-format
 msgid "WARNING: invalid creation date in header\n"
 msgstr "ATTENZIONE: la data di creazione nell'intestazione non è valida\n"
 
-#: pg_backup_archiver.c:3577
+#: pg_backup_archiver.c:3630
 #, c-format
 msgid "entering restore_toc_entries_prefork\n"
 msgstr "inizio di restore_toc_entries_prefork\n"
 
-#: pg_backup_archiver.c:3621
+#: pg_backup_archiver.c:3674
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "elaborazione elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:3673
+#: pg_backup_archiver.c:3726
 #, c-format
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "immissione restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3721
+#: pg_backup_archiver.c:3774
 #, c-format
 msgid "entering main parallel loop\n"
 msgstr "inizio del loop principale parallelo\n"
 
-#: pg_backup_archiver.c:3732
+#: pg_backup_archiver.c:3785
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "saltato l'elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:3742
+#: pg_backup_archiver.c:3795
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "avvio dell'elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:3800
+#: pg_backup_archiver.c:3851
 #, c-format
 msgid "finished main parallel loop\n"
 msgstr "loop principale parallelo terminato\n"
 
-#: pg_backup_archiver.c:3809
+#: pg_backup_archiver.c:3860
 #, c-format
 msgid "entering restore_toc_entries_postfork\n"
 msgstr "inizio di restore_toc_entries_postfork\n"
 
-#: pg_backup_archiver.c:3827
+#: pg_backup_archiver.c:3879
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "elaborazione dell'elemento perduto %d %s %s\n"
 
-#: pg_backup_archiver.c:3976
+#: pg_backup_archiver.c:4028
 #, c-format
 msgid "no item ready\n"
 msgstr "nessun elemento pronto\n"
 
-#: pg_backup_archiver.c:4026
+#: pg_backup_archiver.c:4076
 #, c-format
 msgid "could not find slot of finished worker\n"
 msgstr "non è stato trovato alcuno slot di worker terminati\n"
 
-#: pg_backup_archiver.c:4028
+#: pg_backup_archiver.c:4078
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "elemento %d %s %s terminato\n"
 
-#: pg_backup_archiver.c:4041
+#: pg_backup_archiver.c:4091
 #, c-format
 msgid "worker process failed: exit code %d\n"
 msgstr "processo worker fallito: codice di uscita %d\n"
 
-#: pg_backup_archiver.c:4203
+#: pg_backup_archiver.c:4253
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "trasferimento di dipendenza %d -> %d a %d\n"
 
-#: pg_backup_archiver.c:4276
+#: pg_backup_archiver.c:4326
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "riduzione dipendenze per %d\n"
 
-#: pg_backup_archiver.c:4315
+#: pg_backup_archiver.c:4365
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data\n"
 msgstr "creazione della tabella \"%s\" fallita, i suoi dati non verranno ripristinati\n"
@@ -972,7 +967,7 @@
 msgstr "tipo di blocco dati sconosciuto %d durante il ripristino dell'archivio\n"
 
 #: pg_backup_custom.c:709 pg_backup_custom.c:759 pg_backup_custom.c:908
-#: pg_backup_tar.c:1078
+#: pg_backup_tar.c:1087
 #, c-format
 msgid "could not determine seek position in archive file: %s\n"
 msgstr "non è stato possibile determinare la posizione per il seek nel file d'archivio: %s\n"
@@ -1013,104 +1008,121 @@
 msgstr "ATTENZIONE: ftell non corrisponde alla posizione prevista -- verrà usato il valore restituito da ftell\n"
 
 #. translator: this is a module name
-#: pg_backup_db.c:29
+#: pg_backup_db.c:30
 msgid "archiver (db)"
 msgstr "archiviatore (db)"
 
-#: pg_backup_db.c:44
+#: pg_backup_db.c:46
 #, c-format
 msgid "could not get server_version from libpq\n"
 msgstr "non è stato possibile ottenere server_version da libpq\n"
 
-#: pg_backup_db.c:55 pg_dumpall.c:1954
+#: pg_backup_db.c:57 pg_dumpall.c:1972
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "versione del server: %s; %s versione: %s\n"
 
-#: pg_backup_db.c:57 pg_dumpall.c:1956
+#: pg_backup_db.c:59 pg_dumpall.c:1974
 #, c-format
 msgid "aborting because of server version mismatch\n"
 msgstr "abortito perché la versione del server non corrisponde\n"
 
-#: pg_backup_db.c:128
+#: pg_backup_db.c:148
 #, c-format
 msgid "connecting to database \"%s\" as user \"%s\"\n"
 msgstr "connessione al database \"%s\" come utente \"%s\"\n"
 
-#: pg_backup_db.c:133 pg_backup_db.c:185 pg_backup_db.c:232 pg_backup_db.c:278
-#: pg_dumpall.c:1784 pg_dumpall.c:1892
+#: pg_backup_db.c:155 pg_backup_db.c:207 pg_backup_db.c:269 pg_backup_db.c:311
+#: pg_dumpall.c:1798 pg_dumpall.c:1910
 msgid "Password: "
 msgstr "Password: "
 
-#: pg_backup_db.c:166
+#: pg_backup_db.c:188
 #, c-format
 msgid "failed to reconnect to database\n"
 msgstr "riconnessione al database fallita\n"
 
-#: pg_backup_db.c:171
+#: pg_backup_db.c:193
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "riconnessione al database fallita: %s"
 
-#: pg_backup_db.c:187
+#: pg_backup_db.c:209
 #, c-format
 msgid "connection needs password\n"
 msgstr "la connessione richiede la password\n"
 
-#: pg_backup_db.c:228
+#: pg_backup_db.c:263
 #, c-format
 msgid "already connected to a database\n"
 msgstr "già connesso ad un database\n"
 
-#: pg_backup_db.c:270
+#: pg_backup_db.c:303
 #, c-format
 msgid "failed to connect to database\n"
 msgstr "connessione al database fallita\n"
 
-#: pg_backup_db.c:289
+#: pg_backup_db.c:320
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "connessione al database \"%s\" fallita: %s"
 
-#: pg_backup_db.c:344
+#: pg_backup_db.c:390
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pg_backup_db.c:397
 #, c-format
 msgid "query failed: %s"
 msgstr "query fallita: %s"
 
-#: pg_backup_db.c:346
+#: pg_backup_db.c:399
 #, c-format
 msgid "query was: %s\n"
 msgstr "la query era: %s\n"
 
-#: pg_backup_db.c:410
+#: pg_backup_db.c:441
+#, 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 query ha restituito %d riga invece di una: %s\n"
+msgstr[1] "la query ha restituito %d righe invece di una: %s\n"
+
+#: pg_backup_db.c:486
 #, c-format
 msgid "%s: %s    Command was: %s\n"
 msgstr "%s: %s    Il comando era: %s\n"
 
-#: pg_backup_db.c:466 pg_backup_db.c:540 pg_backup_db.c:547
+#: pg_backup_db.c:542 pg_backup_db.c:616 pg_backup_db.c:623
 msgid "could not execute query"
 msgstr "esecuzione della query fallita"
 
-#: pg_backup_db.c:519
+#: pg_backup_db.c:595
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "errore restituito da PQputCopyData: %s"
 
-#: pg_backup_db.c:568
+#: pg_backup_db.c:644
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "errore restituito da PQputCopyEnd: %s"
 
-#: pg_backup_db.c:574
+#: pg_backup_db.c:650
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "COPY fallito per la tabella \"%s\": %s"
 
-#: pg_backup_db.c:587
+#: pg_backup_db.c:656 pg_dump.c:1691
+#, c-format
+msgid "WARNING: unexpected extra results during COPY of table \"%s\"\n"
+msgstr "ATTENZIONE: risultati aggiuntivi inattesi nel COPY della tabella \"%s\"\n"
+
+#: pg_backup_db.c:668
 msgid "could not start database transaction"
 msgstr "avvio della transazione database fallito"
 
-#: pg_backup_db.c:595
+#: pg_backup_db.c:676
 msgid "could not commit database transaction"
 msgstr "commit della transazione database fallito"
 
@@ -1139,42 +1151,42 @@
 msgid "could not create directory \"%s\": %s\n"
 msgstr "creazione della directory \"%s\" fallita: %s\n"
 
-#: pg_backup_directory.c:413
+#: pg_backup_directory.c:412
 #, c-format
 msgid "could not close data file: %s\n"
 msgstr "chiusura del file di dati fallita: %s\n"
 
-#: pg_backup_directory.c:454
+#: pg_backup_directory.c:453
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %s\n"
 msgstr "apertura del file TOC dei large object \"%s\" per l'input fallita: %s\n"
 
-#: pg_backup_directory.c:465
+#: pg_backup_directory.c:464
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\"\n"
 msgstr "riga non valida nel file TOC dei large object \"%s\": \"%s\"\n"
 
-#: pg_backup_directory.c:474
+#: pg_backup_directory.c:473
 #, c-format
 msgid "error reading large object TOC file \"%s\"\n"
 msgstr "errore in lettura del file TOC dei large object \"%s\"\n"
 
-#: pg_backup_directory.c:478
+#: pg_backup_directory.c:477
 #, c-format
 msgid "could not close large object TOC file \"%s\": %s\n"
 msgstr "chiusura del file TOC dei large object \"%s\" fallita: %s\n"
 
-#: pg_backup_directory.c:688
+#: pg_backup_directory.c:684
 #, c-format
 msgid "could not write to blobs TOC file\n"
 msgstr "scrittura nel file TOC dei blob fallita\n"
 
-#: pg_backup_directory.c:720
+#: pg_backup_directory.c:716
 #, c-format
 msgid "file name too long: \"%s\"\n"
 msgstr "nome del file troppo lungo: \"%s\"\n"
 
-#: pg_backup_directory.c:806
+#: pg_backup_directory.c:802
 #, c-format
 msgid "error during backup\n"
 msgstr "errore durante il backup\n"
@@ -1185,123 +1197,118 @@
 msgstr "questo formato non può essere letto\n"
 
 #. translator: this is a module name
-#: pg_backup_tar.c:108
+#: pg_backup_tar.c:101
 msgid "tar archiver"
 msgstr "archiviatore tar"
 
-#: pg_backup_tar.c:189
+#: pg_backup_tar.c:182
 #, c-format
 msgid "could not open TOC file \"%s\" for output: %s\n"
 msgstr "apertura del file TOC \"%s\" per l'output fallita: %s\n"
 
-#: pg_backup_tar.c:197
+#: pg_backup_tar.c:190
 #, c-format
 msgid "could not open TOC file for output: %s\n"
 msgstr "apertura del file TOC per l'output fallita: %s\n"
 
-#: pg_backup_tar.c:218 pg_backup_tar.c:374
+#: pg_backup_tar.c:211 pg_backup_tar.c:367
 #, c-format
 msgid "compression is not supported by tar archive format\n"
 msgstr "compressione non supportata dal formato di archivio tar\n"
 
-#: pg_backup_tar.c:226
+#: pg_backup_tar.c:219
 #, c-format
 msgid "could not open TOC file \"%s\" for input: %s\n"
 msgstr "apertura del file TOC \"%s\" per l'input fallita: %s\n"
 
-#: pg_backup_tar.c:233
+#: pg_backup_tar.c:226
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "apertura del file TOC per l'input fallita: %s\n"
 
-#: pg_backup_tar.c:360
+#: pg_backup_tar.c:353
 #, c-format
 msgid "could not find file \"%s\" in archive\n"
 msgstr "file \"%s\" non trovato nell'archivio\n"
 
-#: pg_backup_tar.c:416
+#: pg_backup_tar.c:419
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "generazione del nome del file temporaneo fallita: %s\n"
 
-#: pg_backup_tar.c:425
+#: pg_backup_tar.c:430
 #, c-format
 msgid "could not open temporary file\n"
 msgstr "apertura del file temporaneo fallita\n"
 
-#: pg_backup_tar.c:452
+#: pg_backup_tar.c:457
 #, c-format
 msgid "could not close tar member\n"
 msgstr "chiusura del membro tar fallita\n"
 
-#: pg_backup_tar.c:565
+#: pg_backup_tar.c:570
 #, c-format
 msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
 msgstr "errore interno -- né th né fh specificato in tarReadRaw()\n"
 
-#: pg_backup_tar.c:688
+#: pg_backup_tar.c:693
 #, c-format
 msgid "unexpected COPY statement syntax: \"%s\"\n"
 msgstr "sintassi dell'istruzione COPY imprevista: \"%s\"\n"
 
-#: pg_backup_tar.c:950
+#: pg_backup_tar.c:959
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "OID non valida per il large object (%u)\n"
 
-#: pg_backup_tar.c:1087
-#, c-format
-msgid "archive member too large for tar format\n"
-msgstr "membro dell'archivio troppo grande per il formato tar\n"
-
-#: pg_backup_tar.c:1101
+#: pg_backup_tar.c:1103
 #, c-format
 msgid "could not close temporary file: %s\n"
 msgstr "chiusura del file temporaneo fallita: %s\n"
 
-#: pg_backup_tar.c:1111
+#: pg_backup_tar.c:1113
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr "la lunghezza del file (%s) non corrisponde con quella prevista (%s)\n"
 
-#: pg_backup_tar.c:1148
+#: pg_backup_tar.c:1150
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "spostamento dalla posizione %s al membro successivo alla posizione nel file %s\n"
 
-#: pg_backup_tar.c:1159
+#: pg_backup_tar.c:1161
 #, c-format
 msgid "now at file position %s\n"
 msgstr "attuale posizione nel file %s\n"
 
-#: pg_backup_tar.c:1168 pg_backup_tar.c:1198
+#: pg_backup_tar.c:1170 pg_backup_tar.c:1200
 #, c-format
 msgid "could not find header for file \"%s\" in tar archive\n"
 msgstr "intestazione per il file \"%s\" nell'archivio tar non trovata\n"
 
-#: pg_backup_tar.c:1182
+#: pg_backup_tar.c:1184
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "salto del membro tar %s\n"
 
-#: pg_backup_tar.c:1186
+#: pg_backup_tar.c:1188
 #, 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 "il ripristino dei dati fuori ordine non è supportato in questo formato di archivio: è richiesto \"%s\", ma nel file d'archivio viene prima di \"%s\".\n"
 
-#: pg_backup_tar.c:1233
+#: pg_backup_tar.c:1234
 #, c-format
 msgid "incomplete tar header found (%lu byte)\n"
 msgid_plural "incomplete tar header found (%lu bytes)\n"
 msgstr[0] "intestazione del file tar incompleta (%lu byte)\n"
 msgstr[1] "intestazione del file tar incompleta (%lu byte)\n"
 
-#: pg_backup_tar.c:1271
+#: pg_backup_tar.c:1275
 #, c-format
-msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
-msgstr "Voce TOC  %s a %s (lunghezza %lu, checksum %d)\n"
+msgid "TOC Entry %s at %s (length %s, checksum %d)\n"
+msgstr "Voce TOC %s a %s (lunghezza %s, checksum %d)\n"
 
-#: pg_backup_tar.c:1281
+#: pg_backup_tar.c:1286
 #, c-format
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
 msgstr "intestazione tar corrotta in %s (previsti %d, calcolati %d) alla posizione file %s\n"
@@ -1311,69 +1318,69 @@
 msgid "%s: unrecognized section name: \"%s\"\n"
 msgstr "%s: nome di sezione sconosciuto: \"%s\"\n"
 
-#: pg_backup_utils.c:56 pg_dump.c:521 pg_dump.c:538 pg_dumpall.c:300
-#: pg_dumpall.c:310 pg_dumpall.c:320 pg_dumpall.c:329 pg_dumpall.c:345
-#: pg_dumpall.c:403 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
+#: pg_backup_utils.c:56 pg_dump.c:526 pg_dump.c:543 pg_dumpall.c:298
+#: pg_dumpall.c:308 pg_dumpall.c:318 pg_dumpall.c:327 pg_dumpall.c:343
+#: pg_dumpall.c:401 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
 
-#: pg_backup_utils.c:101
+#: pg_backup_utils.c:118
 #, c-format
 msgid "out of on_exit_nicely slots\n"
 msgstr "slot on_exit_nicely terminati\n"
 
-#: pg_dump.c:491
+#: pg_dump.c:496
 #, c-format
 msgid "compression level must be in range 0..9\n"
 msgstr "il livello di compressione dev'essere tra 0 e 9\n"
 
-#: pg_dump.c:536 pg_dumpall.c:308 pg_restore.c:291
+#: pg_dump.c:541 pg_dumpall.c:306 pg_restore.c:291
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: troppi argomenti nella riga di comando (il primo è \"%s\")\n"
 
-#: pg_dump.c:549
+#: pg_dump.c:554
 #, c-format
 msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
 msgstr "le opzioni -s/--schema-only e -a/--data-only non possono essere usate insieme\n"
 
-#: pg_dump.c:555
+#: pg_dump.c:560
 #, c-format
 msgid "options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "le opzioni -c/--clean e -a/--data-only non possono essere usate insieme\n"
 
-#: pg_dump.c:561
+#: pg_dump.c:566
 #, c-format
 msgid "options --inserts/--column-inserts and -o/--oids cannot be used together\n"
 msgstr "le opzioni --inserts/--column-inserts e -o/--oids non possono essere usate insieme\n"
 
-#: pg_dump.c:562
+#: pg_dump.c:567
 #, c-format
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(Il comando INSERT non può impostare OID.)\n"
 
-#: pg_dump.c:567
+#: pg_dump.c:572
 #, c-format
 msgid "option --if-exists requires option -c/--clean\n"
 msgstr "l'opzione --if-exists richiede l'opzione -c/--clean\n"
 
-#: pg_dump.c:595
+#: pg_dump.c:594
 #, c-format
-msgid "%s: invalid number of parallel jobs\n"
-msgstr "%s: numero di job paralleli non valido\n"
+msgid "WARNING: requested compression not available in this installation -- archive will be uncompressed\n"
+msgstr "ATTENZIONE: la compressione richiesta non è disponibile in questa installazione -- l'archivio non sarà compresso\n"
 
-#: pg_dump.c:599
+#: pg_dump.c:609
 #, c-format
-msgid "parallel backup only supported by the directory format\n"
-msgstr "il backup parallelo è supportato solo con il formato directory.\n"
+msgid "invalid number of parallel jobs\n"
+msgstr "numero di job paralleli non valido\n"
 
-#: pg_dump.c:609
+#: pg_dump.c:613
 #, c-format
-msgid "could not open output file \"%s\" for writing\n"
-msgstr "apertura del file di output \"%s\" per la scrittura fallita\n"
+msgid "parallel backup only supported by the directory format\n"
+msgstr "il backup parallelo è supportato solo con il formato directory.\n"
 
-#: pg_dump.c:668
+#: pg_dump.c:670
 #, c-format
 msgid ""
 "Synchronized snapshots are not supported by this server version.\n"
@@ -1384,27 +1391,27 @@
 "del server. Puoi usare --no-synchronized-snapshots invece se non hai\n"
 "bisogno di snapshot sincronizzati.\n"
 
-#: pg_dump.c:675
+#: pg_dump.c:677
 #, c-format
 msgid "Exported snapshots are not supported by this server version.\n"
 msgstr "Gli snapshot esportati non sono supportati da questa versione del server.\n"
 
-#: pg_dump.c:686
+#: pg_dump.c:696
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "l'ultimo OID predefinito è %u\n"
 
-#: pg_dump.c:695
+#: pg_dump.c:704
 #, c-format
 msgid "No matching schemas were found\n"
 msgstr "Non è stato trovato nessuno schema corrispondente\n"
 
-#: pg_dump.c:707
+#: pg_dump.c:716
 #, c-format
 msgid "No matching tables were found\n"
 msgstr "Non è stata trovata nessuna tabella corrispondente\n"
 
-#: pg_dump.c:861
+#: pg_dump.c:873
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -1413,17 +1420,17 @@
 "%s scarica un database in formato testo o in altri formati.\n"
 "\n"
 
-#: pg_dump.c:862 pg_dumpall.c:548 pg_restore.c:432
+#: pg_dump.c:874 pg_dumpall.c:546 pg_restore.c:440
 #, c-format
 msgid "Usage:\n"
 msgstr "Utilizzo:\n"
 
-#: pg_dump.c:863
+#: pg_dump.c:875
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPZIONE]... [NOMEDB]\n"
 
-#: pg_dump.c:865 pg_dumpall.c:551 pg_restore.c:435
+#: pg_dump.c:877 pg_dumpall.c:549 pg_restore.c:443
 #, c-format
 msgid ""
 "\n"
@@ -1432,12 +1439,12 @@
 "\n"
 "Opzioni generali:\n"
 
-#: pg_dump.c:866
+#: pg_dump.c:878
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr "  -f, --file=NOMEFILE          nome del file o directory di output\n"
 
-#: pg_dump.c:867
+#: pg_dump.c:879
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1446,39 +1453,39 @@
 "  -F, --format=c|d|t|p         formato del file di output (custom, directory,\n"
 "                               tar, testo in chiaro (predefinito))\n"
 
-#: pg_dump.c:869
+#: pg_dump.c:881
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr "  -j, --jobs=NUM               usa NUM job paralleli per il dump\n"
 
-#: pg_dump.c:870
+#: pg_dump.c:882 pg_dumpall.c:551
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                stampa più informazioni\n"
 
-#: pg_dump.c:871 pg_dumpall.c:553
+#: pg_dump.c:883 pg_dumpall.c:552
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                mostra informazioni sulla versione ed esci\n"
 
-#: pg_dump.c:872
+#: pg_dump.c:884
 #, c-format
 msgid "  -Z, --compress=0-9           compression level for compressed formats\n"
 msgstr "  -Z, --compress=0-9           livello di compressione per formati compressi\n"
 
-#: pg_dump.c:873 pg_dumpall.c:554
+#: pg_dump.c:885 pg_dumpall.c:553
 #, c-format
 msgid "  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"
 msgstr ""
 "  --lock-wait-timeout=TIMEOUT  termina con errore dopo un'attesa di TIMEOUT\n"
 "                               per un lock di tabella\n"
 
-#: pg_dump.c:874 pg_dumpall.c:555
+#: pg_dump.c:886 pg_dumpall.c:554
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   mostra questo aiuto ed esci\n"
 
-#: pg_dump.c:876 pg_dumpall.c:556
+#: pg_dump.c:888 pg_dumpall.c:555
 #, c-format
 msgid ""
 "\n"
@@ -1487,51 +1494,51 @@
 "\n"
 "Opzioni per il controllo del contenuto dell'output:\n"
 
-#: pg_dump.c:877 pg_dumpall.c:557
+#: pg_dump.c:889 pg_dumpall.c:556
 #, c-format
 msgid "  -a, --data-only              dump only the data, not the schema\n"
 msgstr "  -a, --data-only              scarica solamente i dati, non lo schema\n"
 
-#: pg_dump.c:878
+#: pg_dump.c:890
 #, c-format
 msgid "  -b, --blobs                  include large objects in dump\n"
 msgstr "  -b, --blobs                  includi nell'archivio i large object\n"
 
-#: pg_dump.c:879 pg_restore.c:446
+#: pg_dump.c:891 pg_restore.c:454
 #, c-format
 msgid "  -c, --clean                  clean (drop) database objects before recreating\n"
 msgstr ""
 "  -c, --clean                  svuota (drop) gli oggetti del database prima di\n"
 "                               ricrearli\n"
 
-#: pg_dump.c:880
+#: pg_dump.c:892
 #, c-format
 msgid "  -C, --create                 include commands to create database in dump\n"
 msgstr ""
 "  -C, --create                 include nell'archivio i comandi per creare\n"
 "                               i database\n"
 
-#: pg_dump.c:881
+#: pg_dump.c:893
 #, c-format
 msgid "  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=CODIFICA      scarica i dati nella CODIFICA indicata\n"
 
-#: pg_dump.c:882
+#: pg_dump.c:894
 #, c-format
 msgid "  -n, --schema=SCHEMA          dump the named schema(s) only\n"
 msgstr "  -n, --schema=SCHEMA          scarica solo lo schema o gli schemi indicati\n"
 
-#: pg_dump.c:883
+#: pg_dump.c:895
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA  do NOT dump the named schema(s)\n"
 msgstr "  -N, --exclude-schema=SCHEMA  non scaricare lo schema o gli schemi indicati\n"
 
-#: pg_dump.c:884 pg_dumpall.c:560
+#: pg_dump.c:896 pg_dumpall.c:559
 #, c-format
 msgid "  -o, --oids                   include OIDs in dump\n"
 msgstr "  -o, --oids                   includi gli OID nel dump\n"
 
-#: pg_dump.c:885
+#: pg_dump.c:897
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1540,128 +1547,132 @@
 "  -O, --no-owner               salta il ripristino del proprietario degli\n"
 "                               oggetti nel formato testo in chiaro\n"
 
-#: pg_dump.c:887 pg_dumpall.c:563
+#: pg_dump.c:899 pg_dumpall.c:562
 #, c-format
 msgid "  -s, --schema-only            dump only the schema, no data\n"
 msgstr "  -s, --schema-only            scarica solo lo schema, non i dati\n"
 
-#: pg_dump.c:888
+#: pg_dump.c:900
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in plain-text format\n"
 msgstr ""
 "  -S, --superuser=NOME         nome del superutente da usare nel formato testo\n"
 "                               in chiaro\n"
 
-#: pg_dump.c:889
+#: pg_dump.c:901
 #, c-format
 msgid "  -t, --table=TABLE            dump the named table(s) only\n"
 msgstr "  -t, --table=TABELLA          scarica solo la tabella o le tabelle indicate\n"
 
-#: pg_dump.c:890
+#: pg_dump.c:902
 #, c-format
 msgid "  -T, --exclude-table=TABLE    do NOT dump the named table(s)\n"
 msgstr "  -T, --exclude-table=TABELLA  NON scaricare la tabella o le tabelle indicate\n"
 
-#: pg_dump.c:891 pg_dumpall.c:566
+#: pg_dump.c:903 pg_dumpall.c:565
 #, c-format
 msgid "  -x, --no-privileges          do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          non scaricare i privilegi (grant/revoke)\n"
 
-#: pg_dump.c:892 pg_dumpall.c:567
+#: pg_dump.c:904 pg_dumpall.c:566
 #, c-format
 msgid "  --binary-upgrade             for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade             da utilizzare solo dall'utilità di aggiornamento\n"
 
-#: pg_dump.c:893 pg_dumpall.c:568
+#: pg_dump.c:905 pg_dumpall.c:567
 #, c-format
 msgid "  --column-inserts             dump data as INSERT commands with column names\n"
 msgstr ""
 "  --column-inserts             scarica dati come comandi INSERT con nomi\n"
 "                               di colonna\n"
 
-#: pg_dump.c:894 pg_dumpall.c:569
+#: pg_dump.c:906 pg_dumpall.c:568
 #, c-format
 msgid "  --disable-dollar-quoting     disable dollar quoting, use SQL standard quoting\n"
 msgstr ""
 "  --disable-dollar-quoting     disabilita la quotazione con dollari, usa la\n"
 "                               quotazione standard SQL\n"
 
-#: pg_dump.c:895 pg_dumpall.c:570 pg_restore.c:462
+#: pg_dump.c:907 pg_dumpall.c:569 pg_restore.c:470
 #, c-format
 msgid "  --disable-triggers           disable triggers during data-only restore\n"
 msgstr ""
 "  --disable-triggers           disabilita i trigger durante il ripristino\n"
 "                               dei soli dati\n"
 
-#: pg_dump.c:896 pg_restore.c:463
+#: pg_dump.c:908
 #, c-format
-msgid "  --enable-row-security        enable row level security\n"
-msgstr "  --enable-row-security        abilita la sicurezza a livello di riga\n"
+msgid ""
+"  --enable-row-security        enable row security (dump only content user has\n"
+"                               access to)\n"
+msgstr ""
+"  --enable-row-security        abilita la sicurezza per riga (salva solo i dati\n"
+"                               a cui l'utente ha accesso)\n"
 
-#: pg_dump.c:897
+#: pg_dump.c:910
 #, c-format
 msgid "  --exclude-table-data=TABLE   do NOT dump data for the named table(s)\n"
 msgstr ""
 "  --exclude-table-data=TABLE   NON scaricare i dati per la tabella o le tabelle\n"
 "                               indicate\n"
 
-#: pg_dump.c:898 pg_dumpall.c:571 pg_restore.c:464
+#: pg_dump.c:911 pg_dumpall.c:570 pg_restore.c:472
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr "  --if-exists                  usa IF EXISTS nell'eliminare gli oggetti\n"
 
-#: pg_dump.c:899 pg_dumpall.c:572
+#: pg_dump.c:912 pg_dumpall.c:571
 #, c-format
 msgid "  --inserts                    dump data as INSERT commands, rather than COPY\n"
 msgstr "  --inserts                    scarica i dati come comandi INSERT anziché COPY\n"
 
-#: pg_dump.c:900 pg_dumpall.c:573
+#: pg_dump.c:913 pg_dumpall.c:572
 #, c-format
 msgid "  --no-security-labels         do not dump security label assignments\n"
 msgstr "  --no-security-labels         non scaricare le assegnazioni di sicurezza\n"
 
-#: pg_dump.c:901
+#: pg_dump.c:914
 #, c-format
 msgid "  --no-synchronized-snapshots  do not use synchronized snapshots in parallel jobs\n"
 msgstr "  --no-synchronized-snapshots  non usare snapshot sincronizzati nei job paralleli\n"
 
-#: pg_dump.c:902 pg_dumpall.c:574
+#: pg_dump.c:915 pg_dumpall.c:573
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             non scarica le assegnazioni di tablespace\n"
 
-#: pg_dump.c:903 pg_dumpall.c:575
+#: pg_dump.c:916 pg_dumpall.c:574
 #, c-format
 msgid "  --no-unlogged-table-data     do not dump unlogged table data\n"
 msgstr "  --no-unlogged-table-data     non scaricare i dati delle tabelle non loggate\n"
 
-#: pg_dump.c:904 pg_dumpall.c:576
+#: pg_dump.c:917 pg_dumpall.c:575
 #, c-format
 msgid "  --quote-all-identifiers      quote all identifiers, even if not key words\n"
 msgstr ""
 "  --quote-all-identifiers      metti tutti gli identificatori tra virgolette,\n"
 "                               anche se non sono parole chiave\n"
 
-#: pg_dump.c:905
+#: pg_dump.c:918
 #, c-format
 msgid "  --section=SECTION            dump named section (pre-data, data, or post-data)\n"
 msgstr ""
 "  --section=SECTION            scarica la sezione con questo nome (pre-data,\n"
 "                               data o post-data)\n"
 
-#: pg_dump.c:906
+#: pg_dump.c:919
 #, c-format
 msgid "  --serializable-deferrable    wait until the dump can run without anomalies\n"
 msgstr ""
 "  --serializable-deferrable    attendi prima che lo scaricamento possa essere\n"
 "                               eseguito senza anomalie\n"
 
-#: pg_dump.c:907
+#: pg_dump.c:920
 #, c-format
-msgid "  --snapshot=SNAPSHOT          use given synchronous snapshot for the dump\n"
-msgstr "  --snapshot=SNAPSHOT          usa il dato snapshot sincrono per il dump\n"
+msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
+msgstr "  --snapshot=SNAPSHOT          usa questo snapshot per il salvataggio\n"
 
-#: pg_dump.c:908 pg_dumpall.c:577 pg_restore.c:470
+#: pg_dump.c:921 pg_dumpall.c:576 pg_restore.c:478
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1672,7 +1683,7 @@
 "                               usa i comandi SET SESSION AUTHORIZATION invece\n"
 "                               di ALTER OWNER per impostare il proprietario\n"
 
-#: pg_dump.c:912 pg_dumpall.c:581 pg_restore.c:474
+#: pg_dump.c:925 pg_dumpall.c:580 pg_restore.c:482
 #, c-format
 msgid ""
 "\n"
@@ -1681,44 +1692,44 @@
 "\n"
 "Opzioni di connessione:\n"
 
-#: pg_dump.c:913
+#: pg_dump.c:926
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=NOMEDB      database da scaricare\n"
 
-#: pg_dump.c:914 pg_dumpall.c:583 pg_restore.c:475
+#: pg_dump.c:927 pg_dumpall.c:582 pg_restore.c:483
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=NOMEHOST      host server del database o directory socket\n"
 
-#: pg_dump.c:915 pg_dumpall.c:585 pg_restore.c:476
+#: pg_dump.c:928 pg_dumpall.c:584 pg_restore.c:484
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORTA         numero porta del server di database\n"
 
-#: pg_dump.c:916 pg_dumpall.c:586 pg_restore.c:477
+#: pg_dump.c:929 pg_dumpall.c:585 pg_restore.c:485
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NOME      connessione con l'utente di database specificato\n"
 
-#: pg_dump.c:917 pg_dumpall.c:587 pg_restore.c:478
+#: pg_dump.c:930 pg_dumpall.c:586 pg_restore.c:486
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        non chiedere mai le password\n"
 
-#: pg_dump.c:918 pg_dumpall.c:588 pg_restore.c:479
+#: pg_dump.c:931 pg_dumpall.c:587 pg_restore.c:487
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password           forza la richiesta di una password (dovrebbe essere\n"
 "                           automatico)\n"
 
-#: pg_dump.c:919 pg_dumpall.c:589
+#: pg_dump.c:932 pg_dumpall.c:588
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=NOMERUOLO         esegui SET ROLE prima di scaricare\n"
 
-#: pg_dump.c:921
+#: pg_dump.c:934
 #, c-format
 msgid ""
 "\n"
@@ -1731,361 +1742,375 @@
 "della variabile di ambiente PGDATABASE.\n"
 "\n"
 
-#: pg_dump.c:923 pg_dumpall.c:593 pg_restore.c:486
+#: pg_dump.c:936 pg_dumpall.c:592 pg_restore.c:494
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:942
+#: pg_dump.c:953
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
 msgstr "codifica client specificata \"%s\" non valida\n"
 
-#: pg_dump.c:1127
+#: pg_dump.c:1093
+#, c-format
+msgid ""
+"Synchronized snapshots are not supported on standby servers.\n"
+"Run with --no-synchronized-snapshots instead if you do not need\n"
+"synchronized snapshots.\n"
+msgstr ""
+"Gli snapshot sincronizzati non sono supportati sui server di standby.\n"
+"Usa --no-synchronized-snapshots se non ti servono snapshot\n"
+"sincronizzati.\n"
+
+#: pg_dump.c:1162
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
 msgstr "formato di output specificato \"%s\" non valido\n"
 
-#: pg_dump.c:1149
+#: pg_dump.c:1184
 #, c-format
 msgid "server version must be at least 7.3 to use schema selection switches\n"
 msgstr "per usare le opzioni di selezione schema la versione del server deve essere almeno 7.3\n"
 
-#: pg_dump.c:1438
+#: pg_dump.c:1548
 #, c-format
-msgid "dumping contents of table \"%s\".\"%s\"\n"
-msgstr "salvataggio del contenuto della tabella \"%s\".\"%s\"\n"
+msgid "dumping contents of table \"%s.%s\"\n"
+msgstr "salvataggio del contenuto della tabella \"%s.%s\"\n"
 
-#: pg_dump.c:1562
+#: pg_dump.c:1672
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
 msgstr "Lo scarico dei contenuti della tabella \"%s\" è fallito: PQgetCopyData() fallito.\n"
 
-#: pg_dump.c:1563 pg_dump.c:1573
+#: pg_dump.c:1673 pg_dump.c:1683
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Messaggio di errore dal server: %s"
 
-#: pg_dump.c:1564 pg_dump.c:1574
+#: pg_dump.c:1674 pg_dump.c:1684
 #, c-format
 msgid "The command was: %s\n"
 msgstr "Il comando era: %s\n"
 
-#: pg_dump.c:1572
+#: pg_dump.c:1682
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed.\n"
 msgstr "Scarico dei contenuti della tabella \"%s\" fallito: PQgetResult() fallito.\n"
 
-#: pg_dump.c:2211
+#: pg_dump.c:2329
 #, c-format
 msgid "saving database definition\n"
 msgstr "salvataggio definizione del database\n"
 
-#: pg_dump.c:2544
+#: pg_dump.c:2663
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "salvataggio codifica = %s\n"
 
-#: pg_dump.c:2571
+#: pg_dump.c:2690
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "salvataggio standard_conforming_strings = %s\n"
 
-#: pg_dump.c:2604
+#: pg_dump.c:2723
 #, c-format
 msgid "reading large objects\n"
 msgstr "lettura dei large object\n"
 
-#: pg_dump.c:2736
+#: pg_dump.c:2855
 #, c-format
 msgid "saving large objects\n"
 msgstr "salvataggio dei large object\n"
 
-#: pg_dump.c:2783
+#: pg_dump.c:2902
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "errore di lettura del large object %u: %s"
 
-#: pg_dump.c:2835
+#: pg_dump.c:2954
 #, c-format
-msgid "reading row security enabled for table \"%s\".\"%s\"\n"
-msgstr "lettura dell'abilitazione della sicurezza delle righe per la tabella \"%s\".\"%s\"\n"
+msgid "reading row security enabled for table \"%s.%s\"\n"
+msgstr "letture delle regole di sicurezza per riga abilitata per la tabella \"%s.%s\"\n"
 
-#: pg_dump.c:2866
+#: pg_dump.c:2985
 #, c-format
-msgid "reading policies for table \"%s\".\"%s\"\n"
-msgstr "lettura delle politiche per la tabella \"%s\".\"%s\"\n"
+msgid "reading policies for table \"%s.%s\"\n"
+msgstr "lettura delle regole di sicurezza per la tabella \"%s.%s\"\n"
 
-#: pg_dump.c:2996
+#: pg_dump.c:3116
 #, c-format
 msgid "unexpected policy command type: \"%s\"\n"
-msgstr "tipo di comando di politica imprevisto: \"%s\"\n"
+msgstr "tipo di comando di regola di sicurezza imprevisto: \"%s\"\n"
 
-#: pg_dump.c:3211
+#: pg_dump.c:3331
 #, c-format
 msgid "could not find parent extension for %s\n"
 msgstr "estensione genitore di %s non trovata\n"
 
-#: pg_dump.c:3314
+#: pg_dump.c:3435
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
 msgstr "ATTENZIONE: il proprietario dello schema \"%s\" sembra non essere valido\n"
 
-#: pg_dump.c:3357
+#: pg_dump.c:3478
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "lo schema con OID %u non esiste\n"
 
-#: pg_dump.c:3707
+#: pg_dump.c:3830
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr "ATTENZIONE: il proprietario del tipo dato \"%s\" non sembra essere valido\n"
 
-#: pg_dump.c:3818
+#: pg_dump.c:3942
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "ATTENZIONE: il proprietario dell'operatore \"%s\" non sembra essere valido\n"
 
-#: pg_dump.c:4077
+#: pg_dump.c:4204
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr "ATTENZIONE: il proprietario della classe operatore \"%s\" non sembra essere valido\n"
 
-#: pg_dump.c:4165
+#: pg_dump.c:4293
 #, c-format
 msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
 msgstr "ATTENZIONE: il proprietario della famiglia di operatori \"%s\" non sembra essere valido\n"
 
-#: pg_dump.c:4303
+#: pg_dump.c:4432
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr "ATTENZIONE: il proprietario della funzione di aggregazione \"%s\" non sembra essere valido\n"
 
-#: pg_dump.c:4485
+#: pg_dump.c:4635
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "ATTENZIONE: il proprietario della funzione \"%s\" non sembra essere valido\n"
 
-#: pg_dump.c:5158
+#: pg_dump.c:5323
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "ATTENZIONE: il proprietario della tabella \"%s\" non sembra essere valido\n"
 
-#: pg_dump.c:5310
+#: pg_dump.c:5475
 #, c-format
-msgid "reading indexes for table \"%s\".\"%s\"\n"
-msgstr "lettura degli indici della tabella \"%s\".\"%s\"\n"
+msgid "reading indexes for table \"%s.%s\"\n"
+msgstr "lettura degli indici della tabella \"%s.%s\"\n"
 
-#: pg_dump.c:5677
+#: pg_dump.c:5842
 #, c-format
-msgid "reading foreign key constraints for table \"%s\".\"%s\"\n"
-msgstr "lettura dei vincoli di chiave esterna per la tabella \"%s\".\"%s\"\n"
+msgid "reading foreign key constraints for table \"%s.%s\"\n"
+msgstr "lettura dei vincoli di chiave esterna della tabella \"%s.%s\"\n"
 
-#: pg_dump.c:5923
+#: pg_dump.c:6088
 #, c-format
 msgid "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not found\n"
 msgstr "controllo integrità fallito, l'OID %u della tabella padre della voce OID %u di pg_rewrite non è stato trovato\n"
 
-#: pg_dump.c:6016
+#: pg_dump.c:6181
 #, c-format
-msgid "reading triggers for table \"%s\".\"%s\"\n"
-msgstr "lettura dei trigger per la tabella \"%s\".\"%s\"\n"
+msgid "reading triggers for table \"%s.%s\"\n"
+msgstr "lettura dei trigger della tabella \"%s.%s\"\n"
 
-#: pg_dump.c:6178
+#: pg_dump.c:6346
 #, c-format
 msgid "query produced null referenced table name for foreign key trigger \"%s\" on table \"%s\" (OID of table: %u)\n"
 msgstr "la query non ha prodotto nessun nome di tabella referenziata per il trigger di chiave esterna \"%s\" sulla tabella \"%s\" (OID della tabella: %u)\n"
 
-#: pg_dump.c:6750
+#: pg_dump.c:6932
 #, c-format
-msgid "finding the columns and types of table \"%s\".\"%s\"\n"
-msgstr "ricerca delle colonne e dei tipi della tabella \"%s\".\"%s\"\n"
+msgid "finding the columns and types of table \"%s.%s\"\n"
+msgstr "lettura delle colonne e dei tipi della tabella \"%s.%s\"\n"
 
-#: pg_dump.c:6929
+#: pg_dump.c:7111
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "numerazione delle colonne non valida nella tabella \"%s\"\n"
 
-#: pg_dump.c:6963
+#: pg_dump.c:7145
 #, c-format
-msgid "finding default expressions of table \"%s\".\"%s\"\n"
-msgstr "ricerca delle espressioni di default della tabella \"%s\".\"%s\"\n"
+msgid "finding default expressions of table \"%s.%s\"\n"
+msgstr "lettura delle espressioni di default della tabella \"%s.%s\"\n"
 
-#: pg_dump.c:7016
+#: pg_dump.c:7198
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "valore adnum %d non valido per la tabella \"%s\"\n"
 
-#: pg_dump.c:7088
+#: pg_dump.c:7270
 #, c-format
-msgid "finding check constraints for table \"%s\".\"%s\"\n"
-msgstr "ricerca dei vincoli di controllo per la tabella \"%s\".\"%s\"\n"
+msgid "finding check constraints for table \"%s.%s\"\n"
+msgstr "ricerca dei vincoli di controllo della tabella \"%s.%s\"\n"
 
-#: pg_dump.c:7184
+#: pg_dump.c:7366
 #, 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] "previsto %d vincolo di controllo sulla tabella \"%s\" ma trovato %d\n"
 msgstr[1] "previsti %d vincoli di controllo sulla tabella \"%s\" ma trovati %d\n"
 
-#: pg_dump.c:7188
+#: pg_dump.c:7370
 #, c-format
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(I cataloghi di sistema potrebbero essere corrotti.)\n"
 
-#: pg_dump.c:8565
+#: pg_dump.c:8760
 #, c-format
 msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
 msgstr "ATTENZIONE: il \"typtype\" del tipo dato \"%s\" sembra non essere valido\n"
 
-#: pg_dump.c:10091
+#: pg_dump.c:10256
 #, c-format
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "ATTENZIONE: valore errato nell'array proargmode\n"
 
-#: pg_dump.c:10442
+#: pg_dump.c:10608
 #, c-format
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "ATTENZIONE: non è stato possibile analizzare l'array proallargtype\n"
 
-#: pg_dump.c:10458
+#: pg_dump.c:10624
 #, c-format
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "ATTENZIONE: non è stato possibile analizzare l'array proargmode\n"
 
-#: pg_dump.c:10472
+#: pg_dump.c:10638
 #, c-format
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "ATTENZIONE: non è stato possibile analizzare l'array proargname\n"
 
-#: pg_dump.c:10483
+#: pg_dump.c:10649
 #, c-format
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "ATTENZIONE: non è stato possibile analizzare l'array preconfig\n"
 
-#: pg_dump.c:10554
+#: pg_dump.c:10720
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "valore provolatile sconosciuto per la funzione \"%s\"\n"
 
-#: pg_dump.c:10732
+#: pg_dump.c:10853 pg_dump.c:10958 pg_dump.c:10965
+#, c-format
+msgid "could not find function definition for function with OID %u\n"
+msgstr "definizione della funzione con OID %u non trovata\n"
+
+#: pg_dump.c:10898
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
 msgstr "ATTENZIONE: valore non corretto nei campi pg_cast.castfunc o pg_cast.castmethod\n"
 
-#: pg_dump.c:10735
+#: pg_dump.c:10901
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "ATTENZIONE: valore non corretto nel campo pg_cast.castmethod\n"
 
-#: pg_dump.c:10820
+#: pg_dump.c:10987
 #, c-format
 msgid "WARNING: bogus transform definition, at least one of trffromsql and trftosql should be nonzero\n"
 msgstr "ATTENZIONE: definizione della trasformazione non corretta, almeno uno tra trffromsql e trftosql dovrebbe essere non-zero\n"
 
-#: pg_dump.c:10837
+#: pg_dump.c:11004
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trffromsql field\n"
 msgstr "ATTENZIONE: valore non corretto nel campo pg_transform.trffromsql\n"
 
-#: pg_dump.c:10858
+#: pg_dump.c:11025
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trftosql field\n"
 msgstr "ATTENZIONE: valore non corretto nel campo pg_transform.trftosql\n"
 
-#: pg_dump.c:11244
+#: pg_dump.c:11412
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "ATTENZIONE: operatore con OID %s non trovato\n"
 
-#: pg_dump.c:12419
+#: pg_dump.c:12547
 #, c-format
 msgid "WARNING: aggregate function %s could not be dumped correctly for this database version; ignored\n"
 msgstr "ATTENZIONE: la funzione di aggregazione %s non può essere scaricata correttamente per questa versione database; ignorata\n"
 
-#: pg_dump.c:13244
+#: pg_dump.c:13371
 #, c-format
 msgid "unrecognized object type in default privileges: %d\n"
 msgstr "tipo di oggetto sconosciuto nei privilegi predefiniti: %d\n"
 
-#: pg_dump.c:13259
+#: pg_dump.c:13386
 #, c-format
 msgid "could not parse default ACL list (%s)\n"
 msgstr "non è stato possibile interpretare la ACL predefinita (%s)\n"
 
-#: pg_dump.c:13314
+#: pg_dump.c:13442
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr "non è stato possibile analizzare la lista ACL (%s) per l'oggetto \"%s\" (%s)\n"
 
-#: pg_dump.c:13731
+#: pg_dump.c:13863
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr "la query per ottenere la definizione della vista \"%s\" non ha restituito dati\n"
 
-#: pg_dump.c:13734
+#: pg_dump.c:13866
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition\n"
 msgstr "la query per ottenere la definizione della vista \"%s\" ha restituito più di una definizione\n"
 
-#: pg_dump.c:13741
+#: pg_dump.c:13873
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "la definizione della vista  \"%s\" sembra essere vuota (lunghezza zero)\n"
 
-#: pg_dump.c:14478
+#: pg_dump.c:14621
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "il numero di colonne %d non è valido per la tabella \"%s\"\n"
 
-#: pg_dump.c:14602
+#: pg_dump.c:14747
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "omesso indice per vincolo \"%s\"\n"
 
-#: pg_dump.c:14789
+#: pg_dump.c:14938
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "tipo di vincolo sconosciuto: %c\n"
 
-#: pg_dump.c:14938 pg_dump.c:15102
+#: pg_dump.c:15088 pg_dump.c:15252
 #, 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] "la query per ottenere i dati della sequenza \"%s\" ha restituito %d riga (prevista 1)\n"
 msgstr[1] "la query per ottenere i dati della sequenza \"%s\" ha restituito %d righe (prevista 1)\n"
 
-#: pg_dump.c:14949
+#: pg_dump.c:15099
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr "la query per ottenere dati della sequenza \"%s\" ha restituito il nome \"%s\"\n"
 
-#: pg_dump.c:15197
+#: pg_dump.c:15348
 #, c-format
 msgid "unexpected tgtype value: %d\n"
 msgstr "valore tgtype inatteso: %d\n"
 
-#: pg_dump.c:15279
+#: pg_dump.c:15430
 #, c-format
 msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr "la stringa argomento (%s) non è valida per il trigger \"%s\" sulla tabella \"%s\"\n"
 
-#: pg_dump.c:15466
+#: pg_dump.c:15619
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned\n"
 msgstr "la query per ottenere regole \"%s\" per la tabella \"%s\" ha fallito: ha restituito un numero errato di righe\n"
 
-#: pg_dump.c:15845
+#: pg_dump.c:16001
 #, c-format
 msgid "reading dependency data\n"
 msgstr "lettura dati di dipendenza\n"
 
-#: pg_dump.c:16392
+#: pg_dump.c:16561
 #, 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 query ha restituito %d riga invece di una: %s\n"
-msgstr[1] "la query ha restituito %d righe invece di una: %s\n"
+msgid "WARNING: could not parse reloptions array\n"
+msgstr "ATTENZIONE: errore di lettura dell'array reloptions\n"
 
 #. translator: this is a module name
 #: pg_dump_sort.c:23
@@ -2107,32 +2132,34 @@
 msgid "could not identify dependency loop\n"
 msgstr "identificazione del ciclo di dipendenze fallito\n"
 
-#: pg_dump_sort.c:1250
+#: pg_dump_sort.c:1254
 #, c-format
-msgid "NOTICE: there are circular foreign-key constraints among these table(s):\n"
-msgstr "AVVISO: ci sono vincoli di dipendenza circolari tra chiavi esterne tra queste tabelle:\n"
+msgid "NOTICE: there are circular foreign-key constraints on this table:\n"
+msgid_plural "NOTICE: there are circular foreign-key constraints among these tables:\n"
+msgstr[0] "AVVISO: ci sono vincoli di dipendenza circolari tra chiavi esterne in questa tabella:\n"
+msgstr[1] "AVVISO: ci sono vincoli di dipendenza circolari tra chiavi esterne tra queste tabelle:\n"
 
-#: pg_dump_sort.c:1252 pg_dump_sort.c:1272
+#: pg_dump_sort.c:1258 pg_dump_sort.c:1278
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
 
-#: pg_dump_sort.c:1253
+#: pg_dump_sort.c:1259
 #, c-format
 msgid "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints.\n"
 msgstr "Potreste non essere in grado di ripristinare l'archivio senza usare --disable-triggers o eliminare temporaneamente i vincoli.\n"
 
-#: pg_dump_sort.c:1254
+#: pg_dump_sort.c:1260
 #, c-format
 msgid "Consider using a full dump instead of a --data-only dump to avoid this problem.\n"
 msgstr "Considera l'uso di un salvataggio completo invece di uno --data-only per evitare questo problema.\n"
 
-#: pg_dump_sort.c:1266
+#: pg_dump_sort.c:1272
 #, c-format
 msgid "WARNING: could not resolve dependency loop among these items:\n"
 msgstr "ATTENZIONE: risoluzione del ciclo di dipendenze tra questi elementi fallito:\n"
 
-#: pg_dumpall.c:181
+#: pg_dumpall.c:179
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -2143,7 +2170,7 @@
 "stessa directory di \"%s\".\n"
 "Verifica che l'installazione sia corretta.\n"
 
-#: pg_dumpall.c:188
+#: pg_dumpall.c:186
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by \"%s\"\n"
@@ -2154,32 +2181,32 @@
 "ma non è la stessa versione di %s.\n"
 "Controllate la vostra installazione.\n"
 
-#: pg_dumpall.c:318
+#: pg_dumpall.c:316
 #, c-format
 msgid "%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
 msgstr "%s: le opzioni -g/--globals-only e -r/--roles-only non possono essere usate insieme\n"
 
-#: pg_dumpall.c:327
+#: pg_dumpall.c:325
 #, c-format
 msgid "%s: options -g/--globals-only and -t/--tablespaces-only cannot be used together\n"
 msgstr "%s: le opzioni -g/--globals-only e -t/--tablespaces-only non possono essere usate insieme\n"
 
-#: pg_dumpall.c:336 pg_restore.c:343
+#: pg_dumpall.c:334 pg_restore.c:359
 #, c-format
 msgid "%s: option --if-exists requires option -c/--clean\n"
 msgstr "%s: l'opzione --if-exists richiede l'opzione -c/--clean\n"
 
-#: pg_dumpall.c:343
+#: pg_dumpall.c:341
 #, c-format
 msgid "%s: options -r/--roles-only and -t/--tablespaces-only cannot be used together\n"
 msgstr "%s: la opzioni -r/--roles-only e -t/--tablespaces-only non possono essere usate insieme\n"
 
-#: pg_dumpall.c:385 pg_dumpall.c:1881
+#: pg_dumpall.c:383 pg_dumpall.c:1899
 #, c-format
 msgid "%s: could not connect to database \"%s\"\n"
 msgstr "%s: connessione al database \"%s\" fallita\n"
 
-#: pg_dumpall.c:400
+#: pg_dumpall.c:398
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2188,12 +2215,12 @@
 "%s: non stato è possibile connettersi ai database \"postgres\" o \"template1\"\n"
 "Specificare un database alternativo.\n"
 
-#: pg_dumpall.c:417
+#: pg_dumpall.c:415
 #, c-format
 msgid "%s: could not open the output file \"%s\": %s\n"
 msgstr "%s: apertura del file di output \"%s\" fallita: %s\n"
 
-#: pg_dumpall.c:547
+#: pg_dumpall.c:545
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2202,57 +2229,57 @@
 "%s estrae un cluster di database PostgreSQL in un file script SQL.\n"
 "\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:547
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPZIONE]...\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:550
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=NOMEFILE          nome file di output\n"
 
-#: pg_dumpall.c:558
+#: pg_dumpall.c:557
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr "  -c, --clean                  pulisci (drop) i database prima di ricrearli\n"
 
-#: pg_dumpall.c:559
+#: pg_dumpall.c:558
 #, c-format
 msgid "  -g, --globals-only           dump only global objects, no databases\n"
 msgstr "  -g, --globals-only           scarica solo gli oggetti globali e non i database\n"
 
-#: pg_dumpall.c:561 pg_restore.c:454
+#: pg_dumpall.c:560 pg_restore.c:462
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr "  -O, --no-owner               salta il ripristino del proprietario degli oggetti\n"
 
-#: pg_dumpall.c:562
+#: pg_dumpall.c:561
 #, c-format
 msgid "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
 msgstr "  -r, --roles-only             scarica solo i ruoli e non i database o i tablespace\n"
 
-#: pg_dumpall.c:564
+#: pg_dumpall.c:563
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in the dump\n"
 msgstr "  -S, --superuser=NOME         nome del superutente da usare nel dump\n"
 
-#: pg_dumpall.c:565
+#: pg_dumpall.c:564
 #, c-format
 msgid "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
 msgstr "  -t, --tablespaces-only       scarica solo i tablespace e non i database o i ruoli\n"
 
-#: pg_dumpall.c:582
+#: pg_dumpall.c:581
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=STRCONN     connettiti usando la stringa di connessione\n"
 
-#: pg_dumpall.c:584
+#: pg_dumpall.c:583
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=NOMEDB    database predefinito alternativo\n"
 
-#: pg_dumpall.c:591
+#: pg_dumpall.c:590
 #, c-format
 msgid ""
 "\n"
@@ -2265,62 +2292,62 @@
 "output.\n"
 "\n"
 
-#: pg_dumpall.c:1118
+#: pg_dumpall.c:1117
 #, c-format
 msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
 msgstr "%s: non è stato possibile analizzare la lista ACL (%s) per il tablespace \"%s\"\n"
 
-#: pg_dumpall.c:1431
+#: pg_dumpall.c:1448
 #, c-format
 msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
 msgstr "%s: non è stato possibile analizzare la lista ACL (%s) per il database \"%s\"\n"
 
-#: pg_dumpall.c:1648
+#: pg_dumpall.c:1659
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: scaricamento del database \"%s\"...\n"
 
-#: pg_dumpall.c:1669
+#: pg_dumpall.c:1683
 #, c-format
 msgid "%s: pg_dump failed on database \"%s\", exiting\n"
 msgstr "%s: pg_dump fallito per il database \"%s\", in uscita\n"
 
-#: pg_dumpall.c:1678
+#: pg_dumpall.c:1692
 #, c-format
 msgid "%s: could not re-open the output file \"%s\": %s\n"
 msgstr "%s: riapertura del file di output \"%s\" fallita: %s\n"
 
-#: pg_dumpall.c:1723
+#: pg_dumpall.c:1737
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: in elaborazione \"%s\"\n"
 
-#: pg_dumpall.c:1903
+#: pg_dumpall.c:1921
 #, c-format
 msgid "%s: could not connect to database \"%s\": %s\n"
 msgstr "%s: connessione al database \"%s\" fallita: %s\n"
 
-#: pg_dumpall.c:1933
+#: pg_dumpall.c:1951
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: non è stato possibile ottenere la versione del server\n"
 
-#: pg_dumpall.c:1939
+#: pg_dumpall.c:1957
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: non è stato possibile analizzare la versione del server \"%s\"\n"
 
-#: pg_dumpall.c:2017 pg_dumpall.c:2043
+#: pg_dumpall.c:2035 pg_dumpall.c:2061
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: esecuzione di %s\n"
 
-#: pg_dumpall.c:2023 pg_dumpall.c:2049
+#: pg_dumpall.c:2041 pg_dumpall.c:2067
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: query fallita: %s"
 
-#: pg_dumpall.c:2025 pg_dumpall.c:2051
+#: pg_dumpall.c:2043 pg_dumpall.c:2069
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: la query era: %s\n"
@@ -2340,27 +2367,32 @@
 msgid "%s: options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "%s: le opzioni -c/--clean e -a/--data-only non possono essere usate insieme\n"
 
-#: pg_restore.c:329
+#: pg_restore.c:328
+#, c-format
+msgid "%s: invalid number of parallel jobs\n"
+msgstr "%s: numero di job paralleli non valido\n"
+
+#: pg_restore.c:336
+#, c-format
+msgid "%s: maximum number of parallel jobs is %d\n"
+msgstr "%s: il numero massimo di job paralleli è %d\n"
+
+#: pg_restore.c:345
 #, c-format
 msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
 msgstr "%s: non si può specificare insieme --single-transaction e job multipli\n"
 
-#: pg_restore.c:369
+#: pg_restore.c:385
 #, c-format
 msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
 msgstr "formato di archivio sconosciuto \"%s\"; specificare \"c\", \"d\" o \"t\"\n"
 
-#: pg_restore.c:399
-#, c-format
-msgid "%s: maximum number of parallel jobs is %d\n"
-msgstr "%s: il numero massimo di job paralleli è %d\n"
-
-#: pg_restore.c:417
+#: pg_restore.c:425
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
 msgstr "ATTENZIONE: errore ignorato durante il ripristino: %d\n"
 
-#: pg_restore.c:431
+#: pg_restore.c:439
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2369,47 +2401,47 @@
 "%s ripristino di un database PostgreSQL da un archivio creato con pg_dump.\n"
 "\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:441
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPZIONE]... [FILE]\n"
 
-#: pg_restore.c:436
+#: pg_restore.c:444
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=NOME        nome del database a cui connettersi\n"
 
-#: pg_restore.c:437
+#: pg_restore.c:445
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=NOMEFILE      nome del file di output\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:446
 #, c-format
 msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr "  -F, --format=c|d|t       formato del file di backup (dovrebbe essere automatico)\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:447
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               stampa un riassunto della TOC dell'archivio\n"
 
-#: pg_restore.c:440
+#: pg_restore.c:448
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            stampa più informazioni\n"
 
-#: pg_restore.c:441
+#: pg_restore.c:449
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            mostra informazioni sulla versione ed esci\n"
 
-#: pg_restore.c:442
+#: pg_restore.c:450
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               mostra questo aiuto ed esci\n"
 
-#: pg_restore.c:444
+#: pg_restore.c:452
 #, c-format
 msgid ""
 "\n"
@@ -2418,32 +2450,32 @@
 "\n"
 "Opzioni per il controllo del ripristino:\n"
 
-#: pg_restore.c:445
+#: pg_restore.c:453
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr "  -a, --data-only              ripristina solo i dati, non gli schemi\n"
 
-#: pg_restore.c:447
+#: pg_restore.c:455
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 crea il database in oggetto\n"
 
-#: pg_restore.c:448
+#: pg_restore.c:456
 #, c-format
 msgid "  -e, --exit-on-error          exit on error, default is to continue\n"
 msgstr "  -e, --exit-on-error          esci in caso di errore, il comportamento predefinito è continuare\n"
 
-#: pg_restore.c:449
+#: pg_restore.c:457
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NOME             ripristina l'indice indicato\n"
 
-#: pg_restore.c:450
+#: pg_restore.c:458
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to restore\n"
 msgstr "  -j, --jobs=NUM               per il ripristino usa questo numero di job paralleli\n"
 
-#: pg_restore.c:451
+#: pg_restore.c:459
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -2452,47 +2484,52 @@
 "  -L, --use-list=NOMEFILE      utilizza la tabella dei contenuti di questo file per\n"
 "                               selezionare/ordinare l'output\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:461
 #, c-format
 msgid "  -n, --schema=NAME            restore only objects in this schema\n"
 msgstr "  -n, --schema=NOME            ripristina solo gli oggetti in questo schema\n"
 
-#: pg_restore.c:455
+#: pg_restore.c:463
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=NOME(arg)     ripristina la funzione indicata\n"
 
-#: pg_restore.c:456
+#: pg_restore.c:464
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr "  -s, --schema-only            ripristina solo lo schema e non i dati\n"
 
-#: pg_restore.c:457
+#: pg_restore.c:465
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use for disabling triggers\n"
 msgstr "  -S, --superuser=NOME         nome del superutente da usare per disabilitare i trigger\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:466
 #, c-format
-msgid "  -t, --table=NAME             restore named relation (table, view, etc)\n"
-msgstr "  -t, --table=NOME             ripristina la relazione nominata (tabella, vista, ecc.)\n"
+msgid "  -t, --table=NAME             restore named table\n"
+msgstr "  -t, --table=NAME             ripristina la tabella indicata\n"
 
-#: pg_restore.c:459
+#: pg_restore.c:467
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NOME           ripristina il trigger indicato\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:468
 #, c-format
 msgid "  -x, --no-privileges          skip restoration of access privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          salta il ripristino dei privilegi di accesso (grant/revoke)\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:469
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr "  -1, --single-transaction     ripristina in un'unica transazione\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:471
+#, c-format
+msgid "  --enable-row-security        enable row security\n"
+msgstr "  --enable-row-security        abilita la sicurezza per riga\n"
+
+#: pg_restore.c:473
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
@@ -2501,27 +2538,27 @@
 "  --no-data-for-failed-tables  non ripristinare i dati delle tabelle che non\n"
 "                               è stato possibile creare\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:475
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels         do ripristinare le etichette di sicurezza\n"
 
-#: pg_restore.c:468
+#: pg_restore.c:476
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces             non ripristina le assegnazioni dei tablespace\n"
 
-#: pg_restore.c:469
+#: pg_restore.c:477
 #, c-format
 msgid "  --section=SECTION            restore named section (pre-data, data, or post-data)\n"
 msgstr "  --section=SEZIONE            ripristina la sezione indicata (pre-data, data o post-data)\n"
 
-#: pg_restore.c:480
+#: pg_restore.c:488
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=NOMERUOLO         esegui SET ROLE prima del ripristino\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:490
 #, c-format
 msgid ""
 "\n"
@@ -2532,7 +2569,7 @@
 "Le opzioni -I, -n, -P, -t, -T e --section possono essere combinate e specificate\n"
 "più volte per selezionare più oggetti.\n"
 
-#: pg_restore.c:485
+#: pg_restore.c:493
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/po/pl.po postgresql-9.5-9.5.8/src/bin/pg_dump/po/pl.po
--- postgresql-9.5-9.5.2/src/bin/pg_dump/po/pl.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/po/pl.po	2017-08-07 21:13:41.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: pg_dump (PostgreSQL 9.5)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-13 23:13+0000\n"
-"PO-Revision-Date: 2016-02-14 01:11+0200\n"
+"POT-Creation-Date: 2016-08-08 16:51+0000\n"
+"PO-Revision-Date: 2016-08-08 21:21+0200\n"
 "Last-Translator: grzegorz <begina.felicysym@wp.eu>\n"
 "Language-Team: begina.felicysym@wp.eu\n"
 "Language: pl\n"
@@ -55,8 +55,8 @@
 msgstr "pclose nie powiodło się: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 pg_backup_db.c:137 pg_backup_db.c:188
-#: pg_backup_db.c:245 pg_backup_db.c:287
+#: ../../common/fe_memutils.c:98 pg_backup_db.c:157 pg_backup_db.c:212
+#: pg_backup_db.c:271 pg_backup_db.c:313
 #, c-format
 msgid "out of memory\n"
 msgstr "brak pamięci\n"
@@ -108,7 +108,6 @@
 
 #: common.c:124
 #, c-format
-#| msgid "finding extension members\n"
 msgid "identifying extension members\n"
 msgstr "identyfikowanie składników rozszerzeń\n"
 
@@ -224,7 +223,6 @@
 
 #: common.c:234
 #, c-format
-#| msgid "finding extension members\n"
 msgid "finding extension tables\n"
 msgstr "odnajdywanie tabel rozszerzeń\n"
 
@@ -284,88 +282,91 @@
 msgstr "nie można przetworzyć tablicy numerycznej \"%s\": niepoprawny znak w liczbie\n"
 
 #. translator: this is a module name
-#: compress_io.c:79
+#: compress_io.c:78
 msgid "compress_io"
 msgstr "kompresuj_io"
 
-#: compress_io.c:115
+#: compress_io.c:114
 #, c-format
 msgid "invalid compression code: %d\n"
 msgstr "niepoprawny kod kompresji: %d\n"
 
-#: compress_io.c:139 compress_io.c:175 compress_io.c:196 compress_io.c:529
-#: compress_io.c:572
+#: compress_io.c:138 compress_io.c:174 compress_io.c:192 compress_io.c:519
+#: compress_io.c:562
 #, c-format
 msgid "not built with zlib support\n"
 msgstr "nie wbudowano obsługi zlib\n"
 
-#: compress_io.c:246 compress_io.c:348
+#: compress_io.c:242 compress_io.c:344
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "nie udało się zainicjować biblioteki kompresji: %s\n"
 
-#: compress_io.c:267
+#: compress_io.c:263
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "nie udało się zamknąć strumienia kompresji: %s\n"
 
-#: compress_io.c:285
+#: compress_io.c:281
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "nie udało się spakować danych: %s\n"
 
-#: compress_io.c:368 compress_io.c:384
+#: compress_io.c:361 compress_io.c:377
 #, c-format
 msgid "could not uncompress data: %s\n"
 msgstr "nie udało się rozpakować danych: %s\n"
 
-#: compress_io.c:392
+#: compress_io.c:385
 #, c-format
 msgid "could not close compression library: %s\n"
 msgstr "nie udało się zamknąć biblioteki kompresji: %s\n"
 
-#: compress_io.c:606 compress_io.c:642 pg_backup_custom.c:591
+#: compress_io.c:596 compress_io.c:632 pg_backup_custom.c:591
 #: pg_backup_tar.c:560
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "nie można czytać z pliku wejścia: %s\n"
 
-#: compress_io.c:645 pg_backup_custom.c:588 pg_backup_directory.c:552
+#: compress_io.c:635 pg_backup_custom.c:588 pg_backup_directory.c:548
 #: pg_backup_tar.c:796 pg_backup_tar.c:820
 #, c-format
 msgid "could not read from input file: end of file\n"
 msgstr "nie można czytać pliku wejścia: koniec pliku\n"
 
-#: parallel.c:76
+#: dumputils.c:364 dumputils.c:395
+#, c-format
+#| msgid "COPY delimiter cannot be newline or carriage return"
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr "argument polecenia powłoki zawiera znak nowej linii lub powrotu karetki: \"%"
+"s\"\n"
+
+#: dumputils.c:507
+#, c-format
+#| msgid "COPY delimiter cannot be newline or carriage return"
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr "nazwa bazy danych zawiera znak nowej linii lub powrotu karetki: \"%s\"\n"
+
+#: parallel.c:162
 msgid "parallel archiver"
 msgstr "archiwizator równoległy"
 
-#: parallel.c:139
+#: parallel.c:226
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: nie powiodło się WSAStartup: %d\n"
 
-#: parallel.c:339
-#, c-format
-msgid "worker is terminating\n"
-msgstr "pracownik kończy pracę\n"
-
-#: parallel.c:529
+#: parallel.c:929
 #, c-format
 msgid "could not create communication channels: %s\n"
 msgstr "nie można utworzyć kanałów komunikacyjnych: %s\n"
 
-#: parallel.c:601
+#: parallel.c:992
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "nie można utworzyć procesu roboczego: %s\n"
 
-#: parallel.c:818
-#, c-format
-msgid "could not get relation name for OID %u: %s\n"
-msgstr "nie można pobrać nazwy relacji dla OID %u: %s\n"
-
-#: parallel.c:835
+#: parallel.c:1187
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -374,77 +375,69 @@
 "nie udało się uzyskać blokady na relacji \"%s\"\n"
 "Oznacza to zazwyczaj że ktoś zażądał blokady ACCESS EXCLUSIVE na tabeli gdy wcześniej proces nadrzędny pg_dump uzyskał początkową blokadę ACCESS SHARE na tabeli.\n"
 
-#: parallel.c:919
+#: parallel.c:1257
 #, c-format
-msgid "unrecognized command on communication channel: %s\n"
-msgstr "nierozpoznane polecenie w kanale komunikacyjnym: %s\n"
+#| msgid "unrecognized recovery parameter \"%s\""
+msgid "unrecognized command received from master: \"%s\"\n"
+msgstr "nierozpoznane polecenie otrzymane od podstawowego: \"%s\"\n"
 
-#: parallel.c:952
+#: parallel.c:1295
 #, c-format
 msgid "a worker process died unexpectedly\n"
 msgstr "proces roboczy nie zakończył się nieoczekiwanie\n"
 
-#: parallel.c:979 parallel.c:988
-#, c-format
-msgid "invalid message received from worker: %s\n"
-msgstr "niepoprawny komunikat otrzymany od pracownika: %s\n"
-
-#: parallel.c:985 pg_backup_db.c:355
+#: parallel.c:1321 parallel.c:1327
 #, c-format
-msgid "%s"
-msgstr "%s"
+#| msgid "invalid message received from worker: %s\n"
+msgid "invalid message received from worker: \"%s\"\n"
+msgstr "niepoprawny komunikat otrzymany od pracownika: \"%s\"\n"
 
-#: parallel.c:1037 parallel.c:1081
+#: parallel.c:1384 parallel.c:1435
 #, c-format
 msgid "error processing a parallel work item\n"
 msgstr "błąd przetwarzania równoległego elementu roboczego\n"
 
-#: parallel.c:1109 parallel.c:1247
+#: parallel.c:1464 parallel.c:1582
 #, c-format
 msgid "could not write to the communication channel: %s\n"
 msgstr "nie można zapisać do kanału komunikacyjnego: %s\n"
 
-#: parallel.c:1158
+#: parallel.c:1542
 #, c-format
-msgid "terminated by user\n"
-msgstr "zakończono przez użytkownika\n"
+msgid "select() failed: %s\n"
+msgstr "select() nie udało się: %s\n"
 
-#: parallel.c:1210
-#, c-format
-msgid "error in ListenToWorkers(): %s\n"
-msgstr "błąd w ListenToWorkers(): %s\n"
-
-#: parallel.c:1335
+#: parallel.c:1667
 #, c-format
 msgid "pgpipe: could not create socket: error code %d\n"
 msgstr "pgpipe: nie można utworzyć gniazda: kod błędu %d\n"
 
-#: parallel.c:1346
+#: parallel.c:1678
 #, c-format
 msgid "pgpipe: could not bind: error code %d\n"
 msgstr "pgpipe: nie udało się dowiązać: kod błędu %d\n"
 
-#: parallel.c:1353
+#: parallel.c:1685
 #, c-format
 msgid "pgpipe: could not listen: error code %d\n"
 msgstr "pgpipe: nie dało się nasłuchiwać: kod błędu %d\n"
 
-#: parallel.c:1360
+#: parallel.c:1692
 #, c-format
 msgid "pgpipe: getsockname() failed: error code %d\n"
 msgstr "pgpipe: getsockname() nie powiodła: kod błędu %d\n"
 
-#: parallel.c:1371
+#: parallel.c:1703
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d\n"
 msgstr "pgpipe: nie można utworzyć drugiego gniazda: kod błędu %d\n"
 
-#: parallel.c:1380
+#: parallel.c:1712
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d\n"
 msgstr "pgpipe: nie można połączyć się do gniazda: kod błędu %d\n"
 
-#: parallel.c:1387
+#: parallel.c:1721
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d\n"
 msgstr "pgpipe: nie można przyjąć połączenia: kod błądu %d\n"
@@ -454,7 +447,7 @@
 msgid "archiver"
 msgstr "archiwizator"
 
-#: pg_backup_archiver.c:229 pg_backup_archiver.c:1499
+#: pg_backup_archiver.c:229 pg_backup_archiver.c:1506
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "nie można zamknąć pliku wyjścia: %s\n"
@@ -534,47 +527,47 @@
 msgid "creating %s \"%s\"\n"
 msgstr "tworzenie %s \"%s\"\n"
 
-#: pg_backup_archiver.c:765
+#: pg_backup_archiver.c:772
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "Å‚Ä…czenie do nowej bazy danych \"%s\"\n"
 
-#: pg_backup_archiver.c:793
+#: pg_backup_archiver.c:800
 #, c-format
 msgid "processing %s\n"
 msgstr "przetwarzanie %s\n"
 
-#: pg_backup_archiver.c:813
+#: pg_backup_archiver.c:820
 #, c-format
 msgid "processing data for table \"%s.%s\"\n"
 msgstr "przetwarzanie danych tabeli \"%s.%s\"\n"
 
-#: pg_backup_archiver.c:875
+#: pg_backup_archiver.c:882
 #, c-format
 msgid "executing %s %s\n"
 msgstr "wykonywanie %s %s\n"
 
-#: pg_backup_archiver.c:914
+#: pg_backup_archiver.c:921
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "wyłączanie wyzwalaczy dla %s\n"
 
-#: pg_backup_archiver.c:942
+#: pg_backup_archiver.c:949
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "włączanie wyzwalaczy dla: %s\n"
 
-#: pg_backup_archiver.c:972
+#: pg_backup_archiver.c:979
 #, c-format
 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:1137
+#: pg_backup_archiver.c:1144
 #, c-format
 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:1195
+#: pg_backup_archiver.c:1202
 #, c-format
 msgid "restored %d large object\n"
 msgid_plural "restored %d large objects\n"
@@ -582,55 +575,55 @@
 msgstr[1] "odtworzono %d duże obiekty\n"
 msgstr[2] "odtworzono %d dużych obiektów\n"
 
-#: pg_backup_archiver.c:1216 pg_backup_tar.c:738
+#: pg_backup_archiver.c:1223 pg_backup_tar.c:738
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "odtwarzanie dużego obiektu z OID %u\n"
 
-#: pg_backup_archiver.c:1228
+#: pg_backup_archiver.c:1235
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "nie można utworzyć dużego obiektu %u: %s"
 
-#: pg_backup_archiver.c:1233 pg_dump.c:2859
+#: pg_backup_archiver.c:1240 pg_dump.c:2881
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "nie można otworzyć dużego obiektu %u: %s"
 
-#: pg_backup_archiver.c:1291
+#: pg_backup_archiver.c:1298
 #, 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:1332
+#: pg_backup_archiver.c:1339
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "OSTRZEŻENIE: zignorowano linię: %s\n"
 
-#: pg_backup_archiver.c:1339
+#: pg_backup_archiver.c:1346
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "nie znaleziono wpisu dla ID %d\n"
 
-#: pg_backup_archiver.c:1360 pg_backup_directory.c:230
-#: pg_backup_directory.c:601
+#: pg_backup_archiver.c:1367 pg_backup_directory.c:230
+#: pg_backup_directory.c:597
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "nie można zamknąć pliku TOC: %s\n"
 
-#: pg_backup_archiver.c:1469 pg_backup_custom.c:162 pg_backup_directory.c:341
-#: pg_backup_directory.c:587 pg_backup_directory.c:645
-#: pg_backup_directory.c:665
+#: pg_backup_archiver.c:1476 pg_backup_custom.c:162 pg_backup_directory.c:341
+#: pg_backup_directory.c:583 pg_backup_directory.c:641
+#: pg_backup_directory.c:661
 #, 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:1472 pg_backup_custom.c:169
+#: pg_backup_archiver.c:1479 pg_backup_custom.c:169
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "nie można otworzyć pliku wyjścia %s\n"
 
-#: pg_backup_archiver.c:1578
+#: pg_backup_archiver.c:1585
 #, 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"
@@ -638,283 +631,278 @@
 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:1584
+#: pg_backup_archiver.c:1591
 #, 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:1677
+#: pg_backup_archiver.c:1684
 #, c-format
 msgid "Error while INITIALIZING:\n"
 msgstr "BÅ‚Ä…d podczas INICJACJI:\n"
 
-#: pg_backup_archiver.c:1682
+#: pg_backup_archiver.c:1689
 #, c-format
 msgid "Error while PROCESSING TOC:\n"
 msgstr "BÅ‚Ä…d podczas PRZETWARZANIA TOC:\n"
 
-#: pg_backup_archiver.c:1687
+#: pg_backup_archiver.c:1694
 #, c-format
 msgid "Error while FINALIZING:\n"
 msgstr "Błąd podczas ZAKAŃCZANIA:\n"
 
-#: pg_backup_archiver.c:1692
+#: pg_backup_archiver.c:1699
 #, 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:1765
+#: pg_backup_archiver.c:1772
 #, c-format
 msgid "bad dumpId\n"
 msgstr "niepoprawny dumpId\n"
 
-#: pg_backup_archiver.c:1786
+#: pg_backup_archiver.c:1793
 #, c-format
 msgid "bad table dumpId for TABLE DATA item\n"
 msgstr "niepoprawna tabela dumpId dla elementu TABLE DATA\n"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1885
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "nieoczekiwana dana flagi przesunięcia %d\n"
 
-#: pg_backup_archiver.c:1891
+#: pg_backup_archiver.c:1898
 #, c-format
 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:2004
+#: pg_backup_archiver.c:2011
 #, c-format
 msgid "attempting to ascertain archive format\n"
 msgstr "próba ustalenia formatu archiwum\n"
 
-#: pg_backup_archiver.c:2030 pg_backup_archiver.c:2040
+#: pg_backup_archiver.c:2037 pg_backup_archiver.c:2047
 #, c-format
 msgid "directory name too long: \"%s\"\n"
 msgstr "zbyt długa nazwa pliku: \"%s\"\n"
 
-#: pg_backup_archiver.c:2048
+#: pg_backup_archiver.c:2055
 #, 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:2056 pg_backup_custom.c:181 pg_backup_custom.c:770
-#: pg_backup_directory.c:214 pg_backup_directory.c:402
+#: pg_backup_archiver.c:2063 pg_backup_custom.c:181 pg_backup_custom.c:770
+#: pg_backup_directory.c:214 pg_backup_directory.c:399
 #, 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:2064 pg_backup_custom.c:188
+#: pg_backup_archiver.c:2071 pg_backup_custom.c:188
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "nie można otworzyć pliku wyjścia %s\n"
 
-#: pg_backup_archiver.c:2071
+#: pg_backup_archiver.c:2078
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "nie można odczytać pliku wejścia %s\n"
 
-#: pg_backup_archiver.c:2073
+#: pg_backup_archiver.c:2080
 #, 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:2156
+#: pg_backup_archiver.c:2163
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql.\n"
 msgstr "plik wejścia wydaje się zrzutem w formacie tekstowym. Należy użyć psql.\n"
 
-#: pg_backup_archiver.c:2162
+#: pg_backup_archiver.c:2169
 #, c-format
 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:2168
+#: pg_backup_archiver.c:2175
 #, c-format
 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:2188
+#: pg_backup_archiver.c:2195
 #, c-format
 msgid "could not close input file: %s\n"
 msgstr "nie można zamknąć pliku wejścia: %s\n"
 
-#: pg_backup_archiver.c:2205
+#: pg_backup_archiver.c:2212
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "przydzielenie AH da %s, format %d\n"
 
-#: pg_backup_archiver.c:2310
+#: pg_backup_archiver.c:2317
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "nierozpoznany format pliku \"%d\"\n"
 
-#: pg_backup_archiver.c:2460
+#: pg_backup_archiver.c:2473
 #, 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:2576
+#: pg_backup_archiver.c:2589
 #, 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:2610
+#: pg_backup_archiver.c:2623
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "niezrozumiały kodowanie \"%s\"\n"
 
-#: pg_backup_archiver.c:2615
+#: pg_backup_archiver.c:2628
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "niepoprawny element ENCODING: %s\n"
 
-#: pg_backup_archiver.c:2633
+#: pg_backup_archiver.c:2646
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "niepoprawny element STDSTRINGS: %s\n"
 
-#: pg_backup_archiver.c:2858
+#: pg_backup_archiver.c:2871
 #, 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:2890
+#: pg_backup_archiver.c:2903
 #, c-format
 msgid "could not set default_with_oids: %s"
 msgstr "nie można ustawić default_with_oids: %s"
 
-#: pg_backup_archiver.c:3030
+#: pg_backup_archiver.c:3048
 #, c-format
 msgid "could not set search_path to \"%s\": %s"
 msgstr "nie można ustawić search_path na \"%s\": %s"
 
-#: pg_backup_archiver.c:3092
+#: pg_backup_archiver.c:3110
 #, c-format
 msgid "could not set default_tablespace to %s: %s"
 msgstr "nie można ustawić default_tablespace na %s: %s"
 
-#: pg_backup_archiver.c:3179 pg_backup_archiver.c:3366
+#: pg_backup_archiver.c:3197 pg_backup_archiver.c:3391
 #, 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:3419
-#, c-format
-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:3458
+#: pg_backup_archiver.c:3473
 #, c-format
 msgid "did not find magic string in file header\n"
 msgstr "nie znaleziono magicznego zdania w nagłówku pliku\n"
 
-#: pg_backup_archiver.c:3471
+#: pg_backup_archiver.c:3486
 #, 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:3476
+#: pg_backup_archiver.c:3491
 #, 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:3480
+#: pg_backup_archiver.c:3495
 #, c-format
 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:3490
+#: pg_backup_archiver.c:3505
 #, 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:3506
+#: pg_backup_archiver.c:3521
 #, c-format
 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:3524
+#: pg_backup_archiver.c:3539
 #, c-format
 msgid "WARNING: invalid creation date in header\n"
 msgstr "OSTRZEŻENIE: niepoprawna data utworzenia w nagłówku\n"
 
-#: pg_backup_archiver.c:3599
+#: pg_backup_archiver.c:3614
 #, c-format
 msgid "entering restore_toc_entries_prefork\n"
 msgstr "wejście do restore_toc_entries_prefork\n"
 
-#: pg_backup_archiver.c:3643
+#: pg_backup_archiver.c:3658
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "przetwarzanie elementu %d %s %s\n"
 
-#: pg_backup_archiver.c:3695
+#: pg_backup_archiver.c:3710
 #, c-format
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "wprowadzanie restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3743
+#: pg_backup_archiver.c:3758
 #, c-format
 msgid "entering main parallel loop\n"
 msgstr "wejście w główną pętlę współbieżności\n"
 
-#: pg_backup_archiver.c:3754
+#: pg_backup_archiver.c:3769
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "pominięcie elementu %d %s %s\n"
 
-#: pg_backup_archiver.c:3764
+#: pg_backup_archiver.c:3779
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "uruchomienie elementu %d %s %s\n"
 
-#: pg_backup_archiver.c:3822
+#: pg_backup_archiver.c:3835
 #, c-format
 msgid "finished main parallel loop\n"
 msgstr "kończenie głównej pętli współbieżności\n"
 
-#: pg_backup_archiver.c:3831
+#: pg_backup_archiver.c:3844
 #, c-format
 msgid "entering restore_toc_entries_postfork\n"
 msgstr "wejście do restore_toc_entries_postfork\n"
 
-#: pg_backup_archiver.c:3849
+#: pg_backup_archiver.c:3863
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "przetwarzanie brakujÄ…cego elementu %d %s %s\n"
 
-#: pg_backup_archiver.c:3998
+#: pg_backup_archiver.c:4012
 #, c-format
 msgid "no item ready\n"
 msgstr "brak gotowego elementu\n"
 
-#: pg_backup_archiver.c:4047
+#: pg_backup_archiver.c:4060
 #, c-format
 msgid "could not find slot of finished worker\n"
 msgstr "nie można znaleźć gniazda zakończonego procesu roboczego\n"
 
-#: pg_backup_archiver.c:4049
+#: pg_backup_archiver.c:4062
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "ukończono element %d %s %s\n"
 
-#: pg_backup_archiver.c:4062
+#: pg_backup_archiver.c:4075
 #, 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:4224
+#: pg_backup_archiver.c:4237
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "przenoszenie zależności %d -> %d do %d\n"
 
-#: pg_backup_archiver.c:4297
+#: pg_backup_archiver.c:4310
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "redukcja zależności dla %d\n"
 
-#: pg_backup_archiver.c:4336
+#: pg_backup_archiver.c:4349
 #, 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"
@@ -1006,104 +994,122 @@
 msgstr "OSTRZEŻENIE: niezgodność ftell z oczekiwaną pozycją -- użyto ftel\n"
 
 #. translator: this is a module name
-#: pg_backup_db.c:29
+#: pg_backup_db.c:30
 msgid "archiver (db)"
 msgstr "archiwizator (db)"
 
-#: pg_backup_db.c:44
+#: pg_backup_db.c:46
 #, c-format
 msgid "could not get server_version from libpq\n"
 msgstr "nie można pobrać server_version z libpq\n"
 
-#: pg_backup_db.c:55 pg_dumpall.c:1965
+#: pg_backup_db.c:57 pg_dumpall.c:1971
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "wersja serwera: %s; %s w wersji: %s\n"
 
-#: pg_backup_db.c:57 pg_dumpall.c:1967
+#: pg_backup_db.c:59 pg_dumpall.c:1973
 #, c-format
 msgid "aborting because of server version mismatch\n"
 msgstr "przerwano z powodu niezgodności wersji serwera\n"
 
-#: pg_backup_db.c:128
+#: pg_backup_db.c:148
 #, 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:135 pg_backup_db.c:183 pg_backup_db.c:243 pg_backup_db.c:285
-#: pg_dumpall.c:1795 pg_dumpall.c:1903
+#: pg_backup_db.c:155 pg_backup_db.c:207 pg_backup_db.c:269 pg_backup_db.c:311
+#: pg_dumpall.c:1797 pg_dumpall.c:1909
 msgid "Password: "
 msgstr "Hasło: "
 
-#: pg_backup_db.c:164
+#: pg_backup_db.c:188
 #, c-format
 msgid "failed to reconnect to database\n"
 msgstr "nie udało się połączyć ponownie z bazą danych\n"
 
-#: pg_backup_db.c:169
+#: pg_backup_db.c:193
 #, 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:185
+#: pg_backup_db.c:209
 #, c-format
 msgid "connection needs password\n"
 msgstr "połączenie wymaga hasła\n"
 
-#: pg_backup_db.c:237
+#: pg_backup_db.c:263
 #, c-format
 msgid "already connected to a database\n"
 msgstr "już połączono z bazą danych\n"
 
-#: pg_backup_db.c:277
+#: pg_backup_db.c:303
 #, c-format
 msgid "failed to connect to database\n"
 msgstr "nie udało się połączyć z bazą danych\n"
 
-#: pg_backup_db.c:294
+#: pg_backup_db.c:320
 #, 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:362
+#: pg_backup_db.c:390
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pg_backup_db.c:397
 #, c-format
 msgid "query failed: %s"
 msgstr "zapytanie nie powiodło się: %s"
 
-#: pg_backup_db.c:364
+#: pg_backup_db.c:399
 #, c-format
 msgid "query was: %s\n"
 msgstr "zapytanie brzmiało: %s\n"
 
-#: pg_backup_db.c:428
+#: pg_backup_db.c:441
+#, 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_backup_db.c:486
 #, c-format
 msgid "%s: %s    Command was: %s\n"
 msgstr "%s: %s    Polecenie brzmiało: %s\n"
 
-#: pg_backup_db.c:484 pg_backup_db.c:558 pg_backup_db.c:565
+#: pg_backup_db.c:542 pg_backup_db.c:616 pg_backup_db.c:623
 msgid "could not execute query"
 msgstr "nie można wykonać zapytania"
 
-#: pg_backup_db.c:537
+#: pg_backup_db.c:595
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "błąd zwrócony przez PQputCopyData: %s"
 
-#: pg_backup_db.c:586
+#: pg_backup_db.c:644
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "błąd zwrócony przez PQputCopyEnd: %s"
 
-#: pg_backup_db.c:592
+#: pg_backup_db.c:650
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "nie udało się COPY dla tabeli \"%s\": %s"
 
-#: pg_backup_db.c:605
+#: pg_backup_db.c:656 pg_dump.c:1681
+#, c-format
+msgid "WARNING: unexpected extra results during COPY of table \"%s\"\n"
+msgstr "OSTRZEŻENIE: nieoczekiwane dodatkowe wyniki podczas COPY tabeli \"%s\"\n"
+
+#: pg_backup_db.c:668
 msgid "could not start database transaction"
 msgstr "nie można uruchomić transakcji na bazie danych"
 
-#: pg_backup_db.c:613
+#: pg_backup_db.c:676
 msgid "could not commit database transaction"
 msgstr "nie można zatwierdzić transakcji na bazie danych"
 
@@ -1132,42 +1138,42 @@
 msgid "could not create directory \"%s\": %s\n"
 msgstr "nie można utworzyć folderu \"%s\": %s\n"
 
-#: pg_backup_directory.c:413
+#: pg_backup_directory.c:412
 #, c-format
 msgid "could not close data file: %s\n"
 msgstr "nie można zamknąć pliku danych: %s\n"
 
-#: pg_backup_directory.c:454
+#: pg_backup_directory.c:453
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %s\n"
 msgstr "nie można otworzyć pliku TOC dużych obiektów \"%s\" do odczytu: %s\n"
 
-#: pg_backup_directory.c:465
+#: pg_backup_directory.c:464
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\"\n"
 msgstr "niepoprawna linia w pliku TOC dużych obiektów \"%s\": \"%s\"\n"
 
-#: pg_backup_directory.c:474
+#: pg_backup_directory.c:473
 #, c-format
 msgid "error reading large object TOC file \"%s\"\n"
 msgstr "błąd odczytu pliku TOC dużych obiektów \"%s\"\n"
 
-#: pg_backup_directory.c:478
+#: pg_backup_directory.c:477
 #, c-format
 msgid "could not close large object TOC file \"%s\": %s\n"
 msgstr "nie można zamknąć pliku TOC dużych obiektów \"%s\": %s\n"
 
-#: pg_backup_directory.c:688
+#: pg_backup_directory.c:684
 #, c-format
 msgid "could not write to blobs TOC file\n"
 msgstr "nie można zapisać do pliku TOC blobów\n"
 
-#: pg_backup_directory.c:720
+#: pg_backup_directory.c:716
 #, c-format
 msgid "file name too long: \"%s\"\n"
 msgstr "zbyt długa nazwa pliku: \"%s\"\n"
 
-#: pg_backup_directory.c:806
+#: pg_backup_directory.c:802
 #, c-format
 msgid "error during backup\n"
 msgstr "błąd podczas tworzenia kopii zapasowej\n"
@@ -1300,64 +1306,69 @@
 msgid "%s: unrecognized section name: \"%s\"\n"
 msgstr "%s: nierozpoznana nazwa sekcji: \"%s\"\n"
 
-#: pg_backup_utils.c:56 pg_dump.c:524 pg_dump.c:541 pg_dumpall.c:300
-#: pg_dumpall.c:310 pg_dumpall.c:320 pg_dumpall.c:329 pg_dumpall.c:345
-#: pg_dumpall.c:403 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
+#: pg_backup_utils.c:56 pg_dump.c:523 pg_dump.c:540 pg_dumpall.c:298
+#: pg_dumpall.c:308 pg_dumpall.c:318 pg_dumpall.c:327 pg_dumpall.c:343
+#: pg_dumpall.c:401 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
 
-#: pg_backup_utils.c:101
+#: pg_backup_utils.c:118
 #, c-format
 msgid "out of on_exit_nicely slots\n"
 msgstr "zabrakło gniazd on_exit_nicely\n"
 
-#: pg_dump.c:494
+#: pg_dump.c:493
 #, c-format
 msgid "compression level must be in range 0..9\n"
 msgstr "poziom kompresji musi być z zakresu 0..9\n"
 
-#: pg_dump.c:539 pg_dumpall.c:308 pg_restore.c:291
+#: pg_dump.c:538 pg_dumpall.c:306 pg_restore.c:291
 #, 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:552
+#: pg_dump.c:551
 #, c-format
 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:558
+#: pg_dump.c:557
 #, c-format
 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:564
+#: pg_dump.c:563
 #, c-format
 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:565
+#: pg_dump.c:564
 #, c-format
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(Polecenie INSERT nie może ustawiać OIDów.)\n"
 
-#: pg_dump.c:570
+#: pg_dump.c:569
 #, c-format
 msgid "option --if-exists requires option -c/--clean\n"
 msgstr "opcja --if-exists wymaga opcji -c/--clean\n"
 
-#: pg_dump.c:598
+#: pg_dump.c:591
+#, c-format
+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_dump.c:606
 #, c-format
 msgid "%s: invalid number of parallel jobs\n"
 msgstr "%s: nieprawidłowa liczba zadań współbieżnych\n"
 
-#: pg_dump.c:602
+#: pg_dump.c:610
 #, c-format
 msgid "parallel backup only supported by the directory format\n"
 msgstr "współbieżne tworzenie kopii zapasowej nie jest obsługiwane w tym formacie archiwum\n"
 
-#: pg_dump.c:671
+#: pg_dump.c:667
 #, c-format
 msgid ""
 "Synchronized snapshots are not supported by this server version.\n"
@@ -1368,27 +1379,27 @@
 "Można uruchomić z --no-synchronized-snapshots jeśli nie są potrzebne\n"
 "migawki synchronizowane.\n"
 
-#: pg_dump.c:678
+#: pg_dump.c:674
 #, c-format
 msgid "Exported snapshots are not supported by this server version.\n"
 msgstr "Eksportowane migawki nie są obsługiwane przez tą wersję serwera.\n"
 
-#: pg_dump.c:689
+#: pg_dump.c:685
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "ostatni wbudowany OID to %u\n"
 
-#: pg_dump.c:698
+#: pg_dump.c:694
 #, c-format
 msgid "No matching schemas were found\n"
 msgstr "Nie znaleziono pasujących schematów\n"
 
-#: pg_dump.c:710
+#: pg_dump.c:706
 #, c-format
 msgid "No matching tables were found\n"
 msgstr "Nie znaleziono pasujÄ…cych tabel\n"
 
-#: pg_dump.c:867
+#: pg_dump.c:863
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -1397,17 +1408,17 @@
 "%s zrzuca bazę danych jako plik tekstowy lub do innych formatów.\n"
 "\n"
 
-#: pg_dump.c:868 pg_dumpall.c:548 pg_restore.c:434
+#: pg_dump.c:864 pg_dumpall.c:546 pg_restore.c:434
 #, c-format
 msgid "Usage:\n"
 msgstr "Składnia:\n"
 
-#: pg_dump.c:869
+#: pg_dump.c:865
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPCJA]... [NAZWADB]\n"
 
-#: pg_dump.c:871 pg_dumpall.c:551 pg_restore.c:437
+#: pg_dump.c:867 pg_dumpall.c:549 pg_restore.c:437
 #, c-format
 msgid ""
 "\n"
@@ -1416,12 +1427,12 @@
 "\n"
 "Opcje ogólne:\n"
 
-#: pg_dump.c:872
+#: pg_dump.c:868
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr "  -f, --file=NAZWAPLIKU        nazwa pliku lub folderu wyjścia\n"
 
-#: pg_dump.c:873
+#: pg_dump.c:869
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1430,39 +1441,39 @@
 "  -F, --format=c|d|t|p         format pliku wyjścia (c-użytkownika, d-folder, \n"
 "                               t-tar, p-tekstowy (domyślny))\n"
 
-#: pg_dump.c:875
+#: pg_dump.c:871
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr "  -j, --jobs=NUM               użycie tylu równoległych zadań przy zrzucie\n"
 
-#: pg_dump.c:876
+#: pg_dump.c:872
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                tryb informacji szczegółowych\n"
 
-#: pg_dump.c:877 pg_dumpall.c:553
+#: pg_dump.c:873 pg_dumpall.c:551
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                pokaż informacje o wersji i zakończ\n"
 
-#: pg_dump.c:878
+#: pg_dump.c:874
 #, 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:879 pg_dumpall.c:554
+#: pg_dump.c:875 pg_dumpall.c:552
 #, 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:880 pg_dumpall.c:555
+#: pg_dump.c:876 pg_dumpall.c:553
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   pokaż tą pomoc i zakończ działanie\n"
 
-#: pg_dump.c:882 pg_dumpall.c:556
+#: pg_dump.c:878 pg_dumpall.c:554
 #, c-format
 msgid ""
 "\n"
@@ -1471,49 +1482,49 @@
 "\n"
 "Opcje kontrolujące zawartość wyjścia:\n"
 
-#: pg_dump.c:883 pg_dumpall.c:557
+#: pg_dump.c:879 pg_dumpall.c:555
 #, 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:884
+#: pg_dump.c:880
 #, c-format
 msgid "  -b, --blobs                  include large objects in dump\n"
 msgstr "  -b, --blobs                  dodaje duże obiekty do zrzutu\n"
 
-#: pg_dump.c:885 pg_restore.c:448
+#: pg_dump.c:881 pg_restore.c:448
 #, 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:886
+#: pg_dump.c:882
 #, 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:887
+#: pg_dump.c:883
 #, 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:888
+#: pg_dump.c:884
 #, 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:889
+#: pg_dump.c:885
 #, 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:890 pg_dumpall.c:560
+#: pg_dump.c:886 pg_dumpall.c:558
 #, c-format
 msgid "  -o, --oids                   include OIDs in dump\n"
 msgstr "  -o, --oids                   dodaje OIDy do zrzutu\n"
 
-#: pg_dump.c:891
+#: pg_dump.c:887
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1522,52 +1533,52 @@
 "  -O, --no-owner               pomija odtworzenie wskazania właściciela obiektu\n"
 "                               w formacie tekstowym\n"
 
-#: pg_dump.c:893 pg_dumpall.c:563
+#: pg_dump.c:889 pg_dumpall.c:561
 #, 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:894
+#: pg_dump.c:890
 #, 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:895
+#: pg_dump.c:891
 #, 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:896
+#: pg_dump.c:892
 #, 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:897 pg_dumpall.c:566
+#: pg_dump.c:893 pg_dumpall.c:564
 #, 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:898 pg_dumpall.c:567
+#: pg_dump.c:894 pg_dumpall.c:565
 #, 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:899 pg_dumpall.c:568
+#: pg_dump.c:895 pg_dumpall.c:566
 #, 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:900 pg_dumpall.c:569
+#: pg_dump.c:896 pg_dumpall.c:567
 #, 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:901 pg_dumpall.c:570 pg_restore.c:464
+#: pg_dump.c:897 pg_dumpall.c:568 pg_restore.c:464
 #, c-format
 msgid "  --disable-triggers           disable triggers during data-only restore\n"
 msgstr "  --disable-triggers           wyłącza wyzwalacze podczas odtwarzania wyłącznie danych\n"
 
-#: pg_dump.c:902
+#: pg_dump.c:898
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user has\n"
@@ -1576,66 +1587,66 @@
 "  --enable-row-security        włącz bezpieczeństwo wierszy (zrzucaj tylko to\n"
 "                               do czego użytkownik ma dostęp)\n"
 
-#: pg_dump.c:904
+#: pg_dump.c:900
 #, c-format
 msgid "  --exclude-table-data=TABLE   do NOT dump data for the named table(s)\n"
-msgstr "  ---exclude-table-data=TABELA  NIE zrzuca danych tabeli o tej nazwie\n"
+msgstr "  --exclude-table-data=TABELA  NIE zrzuca danych tabeli o tej nazwie\n"
 
-#: pg_dump.c:905 pg_dumpall.c:571 pg_restore.c:466
+#: pg_dump.c:901 pg_dumpall.c:569 pg_restore.c:466
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr "  --if-exists                  używa IF EXISTS podczas kasowania obiektów\n"
 
-#: pg_dump.c:906 pg_dumpall.c:572
+#: pg_dump.c:902 pg_dumpall.c:570
 #, 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:907 pg_dumpall.c:573
+#: pg_dump.c:903 pg_dumpall.c:571
 #, 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:908
+#: pg_dump.c:904
 #, c-format
 msgid "  --no-synchronized-snapshots  do not use synchronized snapshots in parallel jobs\n"
 msgstr "  --no-synchronized-snapshots  nie używaj migawek synchronizowanych w zadaniach współbieżnych\n"
 
-#: pg_dump.c:909 pg_dumpall.c:574
+#: pg_dump.c:905 pg_dumpall.c:572
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             nie zrzuca przypisań do przestrzeni tabel\n"
 
-#: pg_dump.c:910 pg_dumpall.c:575
+#: pg_dump.c:906 pg_dumpall.c:573
 #, 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:911 pg_dumpall.c:576
+#: pg_dump.c:907 pg_dumpall.c:574
 #, 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:912
+#: pg_dump.c:908
 #, c-format
 msgid "  --section=SECTION            dump named section (pre-data, data, or post-data)\n"
 msgstr "  --section=SECTION            zrzuca nazwanÄ… sekcjÄ™ (pre-dane, dane, lub post-dane)\n"
 
-#: pg_dump.c:913
+#: pg_dump.c:909
 #, 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:914
+#: pg_dump.c:910
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr "  --snapshot=MIGAWKA           używa wskazanej migawki do zrzutu\n"
 
-#: pg_dump.c:915 pg_dumpall.c:577 pg_restore.c:472
+#: pg_dump.c:911 pg_dumpall.c:575 pg_restore.c:472
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1646,7 +1657,7 @@
 "                               używa poleceń SET SESSION AUTHORIZATION zamiast\n"
 "                               poleceń ALTER OWNER by ustawić właściciela\n"
 
-#: pg_dump.c:919 pg_dumpall.c:581 pg_restore.c:476
+#: pg_dump.c:915 pg_dumpall.c:579 pg_restore.c:476
 #, c-format
 msgid ""
 "\n"
@@ -1655,42 +1666,42 @@
 "\n"
 "Opcje połączenia:\n"
 
-#: pg_dump.c:920
+#: pg_dump.c:916
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=NAZWADB      baza danych do utworzenia kopii\n"
 
-#: pg_dump.c:921 pg_dumpall.c:583 pg_restore.c:477
+#: pg_dump.c:917 pg_dumpall.c:581 pg_restore.c:477
 #, 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:922 pg_dumpall.c:585 pg_restore.c:478
+#: pg_dump.c:918 pg_dumpall.c:583 pg_restore.c:478
 #, 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:923 pg_dumpall.c:586 pg_restore.c:479
+#: pg_dump.c:919 pg_dumpall.c:584 pg_restore.c:479
 #, 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:924 pg_dumpall.c:587 pg_restore.c:480
+#: pg_dump.c:920 pg_dumpall.c:585 pg_restore.c:480
 #, 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:925 pg_dumpall.c:588 pg_restore.c:481
+#: pg_dump.c:921 pg_dumpall.c:586 pg_restore.c:481
 #, 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:926 pg_dumpall.c:589
+#: pg_dump.c:922 pg_dumpall.c:587
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=NAZWAROLI         wykonuje SET ROLE przed odtworzeniem\n"
 
-#: pg_dump.c:928
+#: pg_dump.c:924
 #, c-format
 msgid ""
 "\n"
@@ -1703,197 +1714,212 @@
 "środowiskowa PGDATABASE.\n"
 "\n"
 
-#: pg_dump.c:930 pg_dumpall.c:593 pg_restore.c:488
+#: pg_dump.c:926 pg_dumpall.c:591 pg_restore.c:488
 #, 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:950
+#: pg_dump.c:943
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
 msgstr "wskazano niepoprawne kodowanie klienta \"%s\"\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1083
+#, c-format
+#| msgid ""
+#| "Synchronized snapshots are not supported by this server version.\n"
+#| "Run with --no-synchronized-snapshots instead if you do not need\n"
+#| "synchronized snapshots.\n"
+msgid ""
+"Synchronized snapshots are not supported on standby servers.\n"
+"Run with --no-synchronized-snapshots instead if you do not need\n"
+"synchronized snapshots.\n"
+msgstr ""
+"Synchronizowane migawki nie są obsługiwane na serwerach w trybie gotowości.\n"
+"Można uruchomić z --no-synchronized-snapshots jeśli nie są potrzebne\n"
+"migawki synchronizowane.\n"
+
+#: pg_dump.c:1152
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
 msgstr "wskazano niepoprawny format wyjścia \"%s\"\n"
 
-#: pg_dump.c:1157
+#: pg_dump.c:1174
 #, c-format
 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:1521
+#: pg_dump.c:1538
 #, c-format
 msgid "dumping contents of table \"%s.%s\"\n"
 msgstr "zrzut zawartości tabeli \"%s.%s\"\n"
 
-#: pg_dump.c:1645
+#: pg_dump.c:1662
 #, 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:1646 pg_dump.c:1656
+#: pg_dump.c:1663 pg_dump.c:1673
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Komunikat błędu z serwera: %s"
 
-#: pg_dump.c:1647 pg_dump.c:1657
+#: pg_dump.c:1664 pg_dump.c:1674
 #, c-format
 msgid "The command was: %s\n"
 msgstr "Treść polecenia: %s\n"
 
-#: pg_dump.c:1655
+#: pg_dump.c:1672
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed.\n"
 msgstr "Nie powiódł się zrzut zawartości tabeli \"%s\": niepowodzenie PQgetResult().\n"
 
-#: pg_dump.c:2297
+#: pg_dump.c:2319
 #, c-format
 msgid "saving database definition\n"
 msgstr "zapis definicji bazy danych\n"
 
-#: pg_dump.c:2630
+#: pg_dump.c:2652
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "zapis kodowania = %s\n"
 
-#: pg_dump.c:2657
+#: pg_dump.c:2679
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "zapis standard_conforming_strings = %s\n"
 
-#: pg_dump.c:2690
+#: pg_dump.c:2712
 #, c-format
 msgid "reading large objects\n"
 msgstr "odczyt dużych obiektów\n"
 
-#: pg_dump.c:2822
+#: pg_dump.c:2844
 #, c-format
 msgid "saving large objects\n"
 msgstr "zapis dużych obiektów\n"
 
-#: pg_dump.c:2869
+#: pg_dump.c:2891
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "błąd odczytu dużego obiektu %u: %s"
 
-#: pg_dump.c:2921
+#: pg_dump.c:2943
 #, c-format
 msgid "reading row security enabled for table \"%s.%s\"\n"
 msgstr "odczyt włączonych zabezpieczeń wiersza dla tabeli \"%s.%s\"\n"
 
-#: pg_dump.c:2952
+#: pg_dump.c:2974
 #, c-format
 msgid "reading policies for table \"%s.%s\"\n"
 msgstr "odczyt polityk dla tabeli \"%s.%s\"\n"
 
-#: pg_dump.c:3083
+#: pg_dump.c:3105
 #, c-format
 msgid "unexpected policy command type: \"%s\"\n"
 msgstr "nieoczekiwany typ polecenia polityki \"%s\"\n"
 
-#: pg_dump.c:3298
+#: pg_dump.c:3320
 #, c-format
 msgid "could not find parent extension for %s\n"
 msgstr "nie można odnaleźć rozszerzenia nadrzędnego dla %s\n"
 
-#: pg_dump.c:3402
+#: pg_dump.c:3424
 #, 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:3445
+#: pg_dump.c:3467
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "schemat z OID %u nie istnieje\n"
 
-#: pg_dump.c:3797
+#: pg_dump.c:3819
 #, 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:3909
+#: pg_dump.c:3931
 #, 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:4171
+#: pg_dump.c:4193
 #, 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:4260
+#: pg_dump.c:4282
 #, 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:4399
+#: pg_dump.c:4421
 #, 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:4582
+#: pg_dump.c:4604
 #, 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:5270
+#: pg_dump.c:5292
 #, 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:5422
+#: pg_dump.c:5444
 #, c-format
 msgid "reading indexes for table \"%s.%s\"\n"
 msgstr "odczyt indeksów dla tabeli \"%s.%s\"\n"
 
-#: pg_dump.c:5789
+#: pg_dump.c:5811
 #, c-format
 msgid "reading foreign key constraints for table \"%s.%s\"\n"
 msgstr "odczyt ograniczeń kluczy obcych dla tabeli \"%s.%s\"\n"
 
-#: pg_dump.c:6035
+#: pg_dump.c:6057
 #, 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:6128
+#: pg_dump.c:6150
 #, c-format
 msgid "reading triggers for table \"%s.%s\"\n"
 msgstr "odczyt wyzwalaczy dla tabeli \"%s.%s\"\n"
 
-#: pg_dump.c:6293
+#: pg_dump.c:6315
 #, 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:6879
+#: pg_dump.c:6901
 #, c-format
 msgid "finding the columns and types of table \"%s.%s\"\n"
 msgstr "wyszukiwanie kolumn i typów dla tabeli \"%s.%s\"\n"
 
-#: pg_dump.c:7058
+#: pg_dump.c:7080
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "niepoprawna numeracja kolumn dla tabeli \"%s\"\n"
 
-#: pg_dump.c:7092
+#: pg_dump.c:7114
 #, c-format
 msgid "finding default expressions of table \"%s.%s\"\n"
 msgstr "wyszukiwanie wyrażeń domyślnych dla tabeli \"%s.%s\"\n"
 
-#: pg_dump.c:7145
+#: pg_dump.c:7167
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "niepoprawna wartość adnum %d dla tabeli \"%s\"\n"
 
-#: pg_dump.c:7217
+#: pg_dump.c:7239
 #, c-format
 msgid "finding check constraints for table \"%s.%s\"\n"
 msgstr "odczyt ograniczeń sprawdzających dla tabeli \"%s.%s\"\n"
 
-#: pg_dump.c:7313
+#: pg_dump.c:7335
 #, 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"
@@ -1901,127 +1927,127 @@
 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:7317
+#: pg_dump.c:7339
 #, c-format
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(Foldery systemowe mogą być uszkodzone.)\n"
 
-#: pg_dump.c:8707
+#: pg_dump.c:8729
 #, c-format
 msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
 msgstr "OSTRZEŻENIE: typtype typu danych \"%s\" wydaje się być niepoprawny\n"
 
-#: pg_dump.c:10203
+#: pg_dump.c:10225
 #, c-format
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "OSTRZEŻENIE: błędna wartość w tablicy proargmodes\n"
 
-#: pg_dump.c:10555
+#: pg_dump.c:10577
 #, c-format
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "OSTRZEŻENIE: nie można przeanalizować tablicy proallargtypes\n"
 
-#: pg_dump.c:10571
+#: pg_dump.c:10593
 #, c-format
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "OSTRZEŻENIE: nie można przeanalizować tablicy proargmodes\n"
 
-#: pg_dump.c:10585
+#: pg_dump.c:10607
 #, c-format
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "OSTRZEŻENIE: nie można przeanalizować tablicy proargnames\n"
 
-#: pg_dump.c:10596
+#: pg_dump.c:10618
 #, c-format
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "OSTRZEŻENIE: nie można przeanalizować tablicy proconfig\n"
 
-#: pg_dump.c:10667
+#: pg_dump.c:10689
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "nierozpoznana wartość provolatile dla funkcji \"%s\"\n"
 
-#: pg_dump.c:10844
+#: pg_dump.c:10866
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
 msgstr "OSTRZEŻENIE: błędna wartość w pg_cast.castfunc lub nie udało się wykonać pg_cast.castmethod\n"
 
-#: pg_dump.c:10847
+#: pg_dump.c:10869
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "OSTRZEŻENIE: błędna wartość pola pg_cast.castmethod\n"
 
-#: pg_dump.c:10931
+#: pg_dump.c:10953
 #, c-format
 msgid "WARNING: bogus transform definition, at least one of trffromsql and trftosql should be nonzero\n"
 msgstr "OSTRZEŻENIE: błędna definicja transformacji, co najmniej jedna z trffromsql i trftosql powinna być niezerowa\n"
 
-#: pg_dump.c:10948
+#: pg_dump.c:10970
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trffromsql field\n"
 msgstr "OSTRZEŻENIE: błędna wartość pola pg_transform.trffromsql\n"
 
-#: pg_dump.c:10969
+#: pg_dump.c:10991
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trftosql field\n"
 msgstr "OSTRZEŻENIE: błędna wartość pola pg_transform.trftosql\n"
 
-#: pg_dump.c:11356
+#: pg_dump.c:11378
 #, 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:12536
+#: pg_dump.c:12513
 #, 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:13360
+#: pg_dump.c:13337
 #, c-format
 msgid "unrecognized object type in default privileges: %d\n"
 msgstr "nieznany typ obiektu w uprawnieniach domyślnych: %d\n"
 
-#: pg_dump.c:13375
+#: pg_dump.c:13352
 #, 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:13431
+#: pg_dump.c:13408
 #, 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:13852
+#: pg_dump.c:13829
 #, 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:13855
+#: pg_dump.c:13832
 #, 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:13862
+#: pg_dump.c:13839
 #, 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:14610
+#: pg_dump.c:14587
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "niepoprawny numer kolumny %d dla tabeli \"%s\"\n"
 
-#: pg_dump.c:14736
+#: pg_dump.c:14713
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "brak indeksu dla ograniczenia \"%s\"\n"
 
-#: pg_dump.c:14927
+#: pg_dump.c:14904
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "nierozpoznany typ ograniczenia: %c\n"
 
-#: pg_dump.c:15077 pg_dump.c:15241
+#: pg_dump.c:15054 pg_dump.c:15218
 #, 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"
@@ -2029,44 +2055,36 @@
 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:15088
+#: pg_dump.c:15065
 #, 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:15337
+#: pg_dump.c:15314
 #, c-format
 msgid "unexpected tgtype value: %d\n"
 msgstr "nieoczekiwana wartość tgtype: %d\n"
 
-#: pg_dump.c:15419
+#: pg_dump.c:15396
 #, 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:15608
+#: pg_dump.c:15585
 #, 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:15990
+#: pg_dump.c:15967
 #, c-format
 msgid "reading dependency data\n"
 msgstr "odczyt informacji o zależnościach\n"
 
-#: pg_dump.c:16550
+#: pg_dump.c:16527
 #, c-format
 msgid "WARNING: could not parse reloptions array\n"
 msgstr "OSTRZEŻENIE: nie można przeanalizować tablicy reloptions\n"
 
-#: pg_dump.c:16614
-#, 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"
-
 #. translator: this is a module name
 #: pg_dump_sort.c:23
 msgid "sorter"
@@ -2115,7 +2133,7 @@
 msgid "WARNING: could not resolve dependency loop among these items:\n"
 msgstr "OSTRZEŻENIE: nie można rozwiązać pętli powiązań pomiędzy elementami:\n"
 
-#: pg_dumpall.c:181
+#: pg_dumpall.c:179
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -2126,7 +2144,7 @@
 "w tym samym folderze co \"%s\".\n"
 "Sprawdź instalację.\n"
 
-#: pg_dumpall.c:188
+#: pg_dumpall.c:186
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by \"%s\"\n"
@@ -2137,32 +2155,32 @@
 "ale nie jest w tej samej wersji co %s.\n"
 "Sprawdź instalację.\n"
 
-#: pg_dumpall.c:318
+#: pg_dumpall.c:316
 #, 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:327
+#: pg_dumpall.c:325
 #, 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:336 pg_restore.c:343
+#: pg_dumpall.c:334 pg_restore.c:343
 #, c-format
 msgid "%s: option --if-exists requires option -c/--clean\n"
 msgstr "%s: opcja --if-exists wymaga opcji -c/--clean\n"
 
-#: pg_dumpall.c:343
+#: pg_dumpall.c:341
 #, 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:385 pg_dumpall.c:1892
+#: pg_dumpall.c:383 pg_dumpall.c:1898
 #, 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:400
+#: pg_dumpall.c:398
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2171,12 +2189,12 @@
 "%s: n ie udało się połączyć do bazy danych \"postgres\" ani \"template1\"\n"
 "Proszę wskazać alternatywną bazę danych.\n"
 
-#: pg_dumpall.c:417
+#: pg_dumpall.c:415
 #, 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:547
+#: pg_dumpall.c:545
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2185,57 +2203,57 @@
 "%s wyciÄ…ga klaster bazy danych PostgreSQL do pliku skryptowego SQL.\n"
 "\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:547
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPCJA]...\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:550
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=NAZWAPLIKU        nazwa pliku wyjścia\n"
 
-#: pg_dumpall.c:558
+#: pg_dumpall.c:556
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr "  -c, --clean                  czyszczenie (kasowanie) baz danych przed odtworzeniem\n"
 
-#: pg_dumpall.c:559
+#: pg_dumpall.c:557
 #, 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:561 pg_restore.c:456
+#: pg_dumpall.c:559 pg_restore.c:456
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr "  -O, --no-owner               bez odtwarzania posiadania obiektu\n"
 
-#: pg_dumpall.c:562
+#: pg_dumpall.c:560
 #, 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:564
+#: pg_dumpall.c:562
 #, 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:565
+#: pg_dumpall.c:563
 #, 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:582
+#: pg_dumpall.c:580
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=POLACZENIE  połączenie do bazy danych wedle ciągu połączenia\n"
 
-#: pg_dumpall.c:584
+#: pg_dumpall.c:582
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=NAZWADB   alternatywna domyślna baza danych\n"
 
-#: pg_dumpall.c:591
+#: pg_dumpall.c:589
 #, c-format
 msgid ""
 "\n"
@@ -2248,62 +2266,62 @@
 "wyjścia.\n"
 "\n"
 
-#: pg_dumpall.c:1118
+#: pg_dumpall.c:1116
 #, 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:1449
+#: pg_dumpall.c:1447
 #, 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:1659
+#: pg_dumpall.c:1658
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: tworzenie kopii zapasowej bazy danych \"%s\"...\n"
 
-#: pg_dumpall.c:1680
+#: pg_dumpall.c:1682
 #, 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:1689
+#: pg_dumpall.c:1691
 #, 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:1734
+#: pg_dumpall.c:1736
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: uruchomiony \"%s\"\n"
 
-#: pg_dumpall.c:1914
+#: pg_dumpall.c:1920
 #, 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:1944
+#: pg_dumpall.c:1950
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: nie można pobrać wersji serwera\n"
 
-#: pg_dumpall.c:1950
+#: pg_dumpall.c:1956
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: nie można odczytać wersji serwera \"%s\"\n"
 
-#: pg_dumpall.c:2028 pg_dumpall.c:2054
+#: pg_dumpall.c:2034 pg_dumpall.c:2060
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: wykonanie %s\n"
 
-#: pg_dumpall.c:2034 pg_dumpall.c:2060
+#: pg_dumpall.c:2040 pg_dumpall.c:2066
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: zapytanie nie powiodło się: %s"
 
-#: pg_dumpall.c:2036 pg_dumpall.c:2062
+#: pg_dumpall.c:2042 pg_dumpall.c:2068
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: zapytanie brzmiało: %s\n"
@@ -2531,8 +2549,23 @@
 "Jeśli nie wskazano nazwy pliku, użyty zostanie wejście standardowe.\n"
 "\n"
 
+#~ msgid "could not open output file \"%s\" for writing\n"
+#~ msgstr "nie można otworzyć pliku wyjścia \"%s\" do zapisu\n"
+
 #~ msgid "archive member too large for tar format\n"
 #~ msgstr "składnik archiwum za duży dla formatu tar\n"
 
-#~ msgid "could not open output file \"%s\" for writing\n"
-#~ msgstr "nie można otworzyć pliku wyjścia \"%s\" do zapisu\n"
+#~ msgid "error in ListenToWorkers(): %s\n"
+#~ msgstr "błąd w ListenToWorkers(): %s\n"
+
+#~ msgid "terminated by user\n"
+#~ msgstr "zakończono przez użytkownika\n"
+
+#~ msgid "unrecognized command on communication channel: %s\n"
+#~ msgstr "nierozpoznane polecenie w kanale komunikacyjnym: %s\n"
+
+#~ msgid "could not get relation name for OID %u: %s\n"
+#~ msgstr "nie można pobrać nazwy relacji dla OID %u: %s\n"
+
+#~ msgid "worker is terminating\n"
+#~ msgstr "pracownik kończy pracę\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/po/pt_BR.po postgresql-9.5-9.5.8/src/bin/pg_dump/po/pt_BR.po
--- postgresql-9.5-9.5.2/src/bin/pg_dump/po/pt_BR.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/po/pt_BR.po	2017-08-07 21:13:41.000000000 +0000
@@ -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-2016.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-13 17:22-0300\n"
+"POT-Creation-Date: 2017-08-06 01:45-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"
@@ -54,8 +54,8 @@
 msgstr "pclose falhou: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 pg_backup_db.c:137 pg_backup_db.c:188
-#: pg_backup_db.c:245 pg_backup_db.c:287
+#: ../../common/fe_memutils.c:98 pg_backup_db.c:157 pg_backup_db.c:212
+#: pg_backup_db.c:271 pg_backup_db.c:313
 #, c-format
 msgid "out of memory\n"
 msgstr "sem memória\n"
@@ -281,88 +281,88 @@
 msgstr "não pôde validar matriz numérica \"%s\": caracter inválido no número\n"
 
 #. translator: this is a module name
-#: compress_io.c:79
+#: compress_io.c:78
 msgid "compress_io"
 msgstr "compress_io"
 
-#: compress_io.c:115
+#: compress_io.c:114
 #, c-format
 msgid "invalid compression code: %d\n"
 msgstr "código de compressão é inválido: %d\n"
 
-#: compress_io.c:139 compress_io.c:175 compress_io.c:196 compress_io.c:529
-#: compress_io.c:572
+#: compress_io.c:138 compress_io.c:174 compress_io.c:192 compress_io.c:519
+#: compress_io.c:562
 #, c-format
 msgid "not built with zlib support\n"
 msgstr "não foi construído com suporte a zlib\n"
 
-#: compress_io.c:246 compress_io.c:348
+#: compress_io.c:242 compress_io.c:344
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "não pôde inicializar biblioteca de compressão: %s\n"
 
-#: compress_io.c:267
+#: compress_io.c:263
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "não pôde fechar arquivo comprimido: %s\n"
 
-#: compress_io.c:285
+#: compress_io.c:281
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "não pôde comprimir dados: %s\n"
 
-#: compress_io.c:368 compress_io.c:384
+#: compress_io.c:361 compress_io.c:377
 #, c-format
 msgid "could not uncompress data: %s\n"
 msgstr "não pôde descomprimir dados: %s\n"
 
-#: compress_io.c:392
+#: compress_io.c:385
 #, c-format
 msgid "could not close compression library: %s\n"
 msgstr "não pôde fechar biblioteca de compressão: %s\n"
 
-#: compress_io.c:606 compress_io.c:642 pg_backup_custom.c:591
-#: pg_backup_tar.c:560
+#: compress_io.c:600 compress_io.c:638 pg_backup_custom.c:591
+#: pg_backup_tar.c:565 pg_backup_tar.c:569
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "não pôde ler arquivo de entrada: %s\n"
 
-#: compress_io.c:645 pg_backup_custom.c:588 pg_backup_directory.c:552
-#: pg_backup_tar.c:796 pg_backup_tar.c:820
+#: compress_io.c:641 pg_backup_custom.c:588 pg_backup_directory.c:552
+#: pg_backup_tar.c:808 pg_backup_tar.c:832
 #, c-format
 msgid "could not read from input file: end of file\n"
 msgstr "não pôde ler arquivo de entrada: fim do arquivo\n"
 
-#: parallel.c:76
+#: dumputils.c:402 dumputils.c:433
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr "argumento do comando do interpretador de comandos (shell) contém uma nova linha ou retorno de carro: \"%s\"\n"
+
+#: dumputils.c:545
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr "nome do banco de dados contém uma nova linha ou retorno de carro: \"%s\"\n"
+
+#: parallel.c:166
 msgid "parallel archiver"
 msgstr "arquivador paralelo"
 
-#: parallel.c:139
+#: parallel.c:230
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: WSAStartup falhou: %d\n"
 
-#: parallel.c:339
-#, c-format
-msgid "worker is terminating\n"
-msgstr "processo filho está terminando\n"
-
-#: parallel.c:529
+#: parallel.c:933
 #, c-format
 msgid "could not create communication channels: %s\n"
 msgstr "não pôde criar canais de comunicação: %s\n"
 
-#: parallel.c:601
+#: parallel.c:996
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "não pôde criar processo filho: %s\n"
 
-#: parallel.c:818
-#, c-format
-msgid "could not get relation name for OID %u: %s\n"
-msgstr "não pôde obter nome de relação pelo OID %u: %s\n"
-
-#: parallel.c:835
+#: parallel.c:1191
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -371,77 +371,67 @@
 "não pôde obter bloqueio na relação \"%s\"\n"
 "Isso geralmente significa que alguém solicitou um bloqueio ACCESS EXCLUSIVE na tabela após o processo pai do pg_dump ter obtido o bloqueio ACCESS SHARE inicial na tabela.\n"
 
-#: parallel.c:919
+#: parallel.c:1261
 #, c-format
-msgid "unrecognized command on communication channel: %s\n"
-msgstr "comando desconhecido em canal de comunicação: %s\n"
+msgid "unrecognized command received from master: \"%s\"\n"
+msgstr "comando desconhecido recebido do servidor principal: \"%s\"\n"
 
-#: parallel.c:952
+#: parallel.c:1299
 #, c-format
 msgid "a worker process died unexpectedly\n"
 msgstr "um processo filho morreu inesperadamente\n"
 
-#: parallel.c:979 parallel.c:988
+#: parallel.c:1325 parallel.c:1331
 #, c-format
-msgid "invalid message received from worker: %s\n"
-msgstr "mensagem inválida recebida do processo filho: %s\n"
+msgid "invalid message received from worker: \"%s\"\n"
+msgstr "mensagem inválida recebida do processo filho: \"%s\"\n"
 
-#: parallel.c:985 pg_backup_db.c:355
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: parallel.c:1037 parallel.c:1081
+#: parallel.c:1388 parallel.c:1439
 #, c-format
 msgid "error processing a parallel work item\n"
 msgstr "erro ao processar um item de trabalho paralelo\n"
 
-#: parallel.c:1109 parallel.c:1247
+#: parallel.c:1468 parallel.c:1586
 #, c-format
 msgid "could not write to the communication channel: %s\n"
 msgstr "não pôde escrever no canal de comunicação: %s\n"
 
-#: parallel.c:1158
+#: parallel.c:1546
 #, c-format
-msgid "terminated by user\n"
-msgstr "terminado pelo usuário\n"
+msgid "select() failed: %s\n"
+msgstr "select() falhou: %s\n"
 
-#: parallel.c:1210
-#, c-format
-msgid "error in ListenToWorkers(): %s\n"
-msgstr "erro em ListenToWorkers(): %s\n"
-
-#: parallel.c:1335
+#: parallel.c:1671
 #, c-format
 msgid "pgpipe: could not create socket: error code %d\n"
 msgstr "pgpipe: não pôde criar soquete: código de erro %d\n"
 
-#: parallel.c:1346
+#: parallel.c:1682
 #, c-format
 msgid "pgpipe: could not bind: error code %d\n"
 msgstr "pgpipe: não pôde se ligar: código de erro %d\n"
 
-#: parallel.c:1353
+#: parallel.c:1689
 #, c-format
 msgid "pgpipe: could not listen: error code %d\n"
 msgstr "pgpipe: não pôde escutar: código de erro %d\n"
 
-#: parallel.c:1360
+#: parallel.c:1696
 #, c-format
 msgid "pgpipe: getsockname() failed: error code %d\n"
 msgstr "pgpipe: getsockname() falhou: código de erro %d\n"
 
-#: parallel.c:1371
+#: parallel.c:1707
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d\n"
 msgstr "pgpipe: não pôde criar segundo soquete: código de erro %d\n"
 
-#: parallel.c:1380
+#: parallel.c:1716
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d\n"
 msgstr "pgpipe: não pôde se conectar ao soquete: código de erro %d\n"
 
-#: parallel.c:1387
+#: parallel.c:1725
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d\n"
 msgstr "pgpipe: não pôde aceitar conexão: código de erro %d\n"
@@ -451,465 +441,455 @@
 msgid "archiver"
 msgstr "arquivador"
 
-#: pg_backup_archiver.c:229 pg_backup_archiver.c:1499
+#: pg_backup_archiver.c:235 pg_backup_archiver.c:1576
 #, 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:275 pg_backup_archiver.c:280
+#: pg_backup_archiver.c:281 pg_backup_archiver.c:286
 #, c-format
 msgid "WARNING: archive items not in correct section order\n"
 msgstr "AVISO: itens do archive não estão na ordem correta de seções\n"
 
-#: pg_backup_archiver.c:286
+#: pg_backup_archiver.c:292
 #, c-format
 msgid "unexpected section code %d\n"
 msgstr "código de seção %d inesperado\n"
 
-#: pg_backup_archiver.c:318
+#: pg_backup_archiver.c:324
 #, c-format
 msgid "-C and -1 are incompatible options\n"
 msgstr "-C e -1 são opções incompatíveis\n"
 
-#: pg_backup_archiver.c:328
+#: pg_backup_archiver.c:334
 #, c-format
 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:332
+#: pg_backup_archiver.c:338
 #, c-format
 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:350
+#: pg_backup_archiver.c:356
 #, c-format
 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 instalação)\n"
 
-#: pg_backup_archiver.c:367
+#: pg_backup_archiver.c:373
 #, c-format
 msgid "connecting to database for restore\n"
 msgstr "conectando ao banco de dados para restauração\n"
 
-#: pg_backup_archiver.c:369
+#: pg_backup_archiver.c:375
 #, c-format
 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 a versão 1.3\n"
 
-#: pg_backup_archiver.c:414
+#: pg_backup_archiver.c:420
 #, c-format
 msgid "implied data-only restore\n"
 msgstr "restauração do tipo somente dados implícita\n"
 
-#: pg_backup_archiver.c:484
+#: pg_backup_archiver.c:490
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "removendo %s %s\n"
 
-#: pg_backup_archiver.c:637
-#, c-format
-msgid "setting owner and privileges for %s \"%s.%s\"\n"
-msgstr "definindo dono e privilégios para %s \"%s.%s\"\n"
-
-#: pg_backup_archiver.c:640
+#: pg_backup_archiver.c:583
 #, c-format
-msgid "setting owner and privileges for %s \"%s\"\n"
-msgstr "definindo dono e privilégios para %s \"%s\"\n"
+msgid "WARNING: could not find where to insert IF EXISTS in statement \"%s\"\n"
+msgstr "AVISO: não pôde encontrar onde inserir IF EXISTS no comando \"%s\"\n"
 
-#: pg_backup_archiver.c:706 pg_backup_archiver.c:708
+#: pg_backup_archiver.c:746 pg_backup_archiver.c:748
 #, 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:717
+#: pg_backup_archiver.c:760
 #, c-format
 msgid "creating %s \"%s.%s\"\n"
 msgstr "criando %s \"%s.%s\"\n"
 
-#: pg_backup_archiver.c:720
+#: pg_backup_archiver.c:763
 #, c-format
 msgid "creating %s \"%s\"\n"
 msgstr "criando %s \"%s\"\n"
 
-#: pg_backup_archiver.c:765
+#: pg_backup_archiver.c:814
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "conectando ao novo banco de dados \"%s\"\n"
 
-#: pg_backup_archiver.c:793
+#: pg_backup_archiver.c:842
 #, c-format
 msgid "processing %s\n"
 msgstr "processando %s\n"
 
-#: pg_backup_archiver.c:813
+#: pg_backup_archiver.c:862
 #, c-format
 msgid "processing data for table \"%s.%s\"\n"
 msgstr "processando dados da tabela \"%s.%s\"\n"
 
-#: pg_backup_archiver.c:875
+#: pg_backup_archiver.c:924
 #, c-format
 msgid "executing %s %s\n"
 msgstr "executando %s %s\n"
 
-#: pg_backup_archiver.c:914
+#: pg_backup_archiver.c:963
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "desabilitando gatilhos para %s\n"
 
-#: pg_backup_archiver.c:942
+#: pg_backup_archiver.c:991
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "habilitando gatilhos para %s\n"
 
-#: pg_backup_archiver.c:972
+#: pg_backup_archiver.c:1021
 #, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine\n"
 msgstr "erro interno -- WriteData não pode ser chamada fora do contexto de uma rotina DataDumper\n"
 
-#: pg_backup_archiver.c:1137
+#: pg_backup_archiver.c:1214
 #, c-format
 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:1195
+#: pg_backup_archiver.c:1272
 #, c-format
 msgid "restored %d large object\n"
 msgid_plural "restored %d large objects\n"
 msgstr[0] "restaurado %d objeto grande\n"
 msgstr[1] "restaurado %d objetos grandes\n"
 
-#: pg_backup_archiver.c:1216 pg_backup_tar.c:738
+#: pg_backup_archiver.c:1293 pg_backup_tar.c:750
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "restaurando objeto grande com OID %u\n"
 
-#: pg_backup_archiver.c:1228
+#: pg_backup_archiver.c:1305
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "não pôde criar objeto grande %u: %s"
 
-#: pg_backup_archiver.c:1233 pg_dump.c:2859
+#: pg_backup_archiver.c:1310 pg_dump.c:2914
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "não pôde abrir objeto grande %u: %s"
 
-#: pg_backup_archiver.c:1291
+#: pg_backup_archiver.c:1368
 #, 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:1332
+#: pg_backup_archiver.c:1409
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "AVISO: linha ignorada: %s\n"
 
-#: pg_backup_archiver.c:1339
+#: pg_backup_archiver.c:1416
 #, 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:1360 pg_backup_directory.c:230
+#: pg_backup_archiver.c:1437 pg_backup_directory.c:230
 #: pg_backup_directory.c:601
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "não pôde fechar arquivo TOC: %s\n"
 
-#: pg_backup_archiver.c:1469 pg_backup_custom.c:162 pg_backup_directory.c:341
+#: pg_backup_archiver.c:1546 pg_backup_custom.c:162 pg_backup_directory.c:341
 #: pg_backup_directory.c:587 pg_backup_directory.c:645
 #: pg_backup_directory.c:665
 #, 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:1472 pg_backup_custom.c:169
+#: pg_backup_archiver.c:1549 pg_backup_custom.c:169
 #, 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:1578
+#: pg_backup_archiver.c:1655
 #, 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 de objeto grande (resultado = %lu)\n"
 msgstr[1] "escreveu %lu bytes de dados de objeto grande (resultado = %lu)\n"
 
-#: pg_backup_archiver.c:1584
+#: pg_backup_archiver.c:1661
 #, 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:1677
+#: pg_backup_archiver.c:1754
 #, c-format
 msgid "Error while INITIALIZING:\n"
 msgstr "Erro ao INICIALIZAR:\n"
 
-#: pg_backup_archiver.c:1682
+#: pg_backup_archiver.c:1759
 #, c-format
 msgid "Error while PROCESSING TOC:\n"
 msgstr "Erro ao PROCESSAR TOC:\n"
 
-#: pg_backup_archiver.c:1687
+#: pg_backup_archiver.c:1764
 #, c-format
 msgid "Error while FINALIZING:\n"
 msgstr "Erro ao FINALIZAR:\n"
 
-#: pg_backup_archiver.c:1692
+#: pg_backup_archiver.c:1769
 #, 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:1765
+#: pg_backup_archiver.c:1842
 #, c-format
 msgid "bad dumpId\n"
 msgstr "dumpId inválido\n"
 
-#: pg_backup_archiver.c:1786
+#: pg_backup_archiver.c:1863
 #, c-format
 msgid "bad table dumpId for TABLE DATA item\n"
 msgstr "dumpId de tabela inválido para item TABLE DATA\n"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1955
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "Marcador de deslocamento de dado %d é inesperado\n"
 
-#: pg_backup_archiver.c:1891
+#: pg_backup_archiver.c:1968
 #, c-format
 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:2004
+#: pg_backup_archiver.c:2081
 #, c-format
 msgid "attempting to ascertain archive format\n"
 msgstr "tentando verificar formato de arquivo\n"
 
-#: pg_backup_archiver.c:2030 pg_backup_archiver.c:2040
+#: pg_backup_archiver.c:2107 pg_backup_archiver.c:2117
 #, c-format
 msgid "directory name too long: \"%s\"\n"
 msgstr "nome de diretório é muito longo: \"%s\"\n"
 
-#: pg_backup_archiver.c:2048
+#: pg_backup_archiver.c:2125
 #, 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:2056 pg_backup_custom.c:181 pg_backup_custom.c:770
-#: pg_backup_directory.c:214 pg_backup_directory.c:402
+#: pg_backup_archiver.c:2133 pg_backup_custom.c:181 pg_backup_custom.c:770
+#: pg_backup_directory.c:214 pg_backup_directory.c:401
 #, 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:2064 pg_backup_custom.c:188
+#: pg_backup_archiver.c:2141 pg_backup_custom.c:188
 #, 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:2071
+#: pg_backup_archiver.c:2148
 #, 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:2073
+#: pg_backup_archiver.c:2150
 #, 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:2156
+#: pg_backup_archiver.c:2233
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql.\n"
 msgstr "arquivo de entrada parece estar no formato texto. Por favor utilize o psql.\n"
 
-#: pg_backup_archiver.c:2162
+#: pg_backup_archiver.c:2239
 #, c-format
 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"
 
-#: pg_backup_archiver.c:2168
+#: pg_backup_archiver.c:2245
 #, c-format
 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"
 
-#: pg_backup_archiver.c:2188
+#: pg_backup_archiver.c:2265
 #, 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:2205
+#: pg_backup_archiver.c:2282
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "alocando AH para %s, formato %d\n"
 
-#: pg_backup_archiver.c:2310
+#: pg_backup_archiver.c:2387
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "formato de arquivo \"%d\" é desconhecido\n"
 
-#: pg_backup_archiver.c:2460
+#: pg_backup_archiver.c:2543
 #, 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:2576
+#: pg_backup_archiver.c:2659
 #, 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:2610
+#: pg_backup_archiver.c:2693
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "codificação \"%s\" é desconhecida\n"
 
-#: pg_backup_archiver.c:2615
+#: pg_backup_archiver.c:2698
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "item ENCODING inválido: %s\n"
 
-#: pg_backup_archiver.c:2633
+#: pg_backup_archiver.c:2716
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "item STDSTRINGS inválido: %s\n"
 
-#: pg_backup_archiver.c:2858
+#: pg_backup_archiver.c:2973
 #, 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:2890
+#: pg_backup_archiver.c:3005
 #, c-format
 msgid "could not set default_with_oids: %s"
 msgstr "não pôde definir default_with_oids: %s"
 
-#: pg_backup_archiver.c:3030
+#: pg_backup_archiver.c:3150
 #, c-format
 msgid "could not set search_path to \"%s\": %s"
 msgstr "não pôde definir search_path para \"%s\": %s"
 
-#: pg_backup_archiver.c:3092
+#: pg_backup_archiver.c:3212
 #, c-format
 msgid "could not set default_tablespace to %s: %s"
 msgstr "não pôde definir default_tablespace para %s: %s"
 
-#: pg_backup_archiver.c:3179 pg_backup_archiver.c:3366
+#: pg_backup_archiver.c:3300 pg_backup_archiver.c:3490
 #, 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"
+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:3419
-#, c-format
-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 será descomprimido\n"
-
-#: pg_backup_archiver.c:3458
+#: pg_backup_archiver.c:3576
 #, c-format
 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:3471
+#: pg_backup_archiver.c:3589
 #, 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:3476
+#: pg_backup_archiver.c:3594
 #, 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:3480
+#: pg_backup_archiver.c:3598
 #, c-format
 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 operações podem falhar\n"
 
-#: pg_backup_archiver.c:3490
+#: pg_backup_archiver.c:3608
 #, 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:3506
+#: pg_backup_archiver.c:3624
 #, c-format
 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 -- nenhum dado está disponível\n"
 
-#: pg_backup_archiver.c:3524
+#: pg_backup_archiver.c:3642
 #, c-format
 msgid "WARNING: invalid creation date in header\n"
 msgstr "AVISO: data de criação inválida no cabeçalho\n"
 
-#: pg_backup_archiver.c:3599
+#: pg_backup_archiver.c:3715
 #, c-format
 msgid "entering restore_toc_entries_prefork\n"
 msgstr "executando restore_toc_entries_prefork\n"
 
-#: pg_backup_archiver.c:3643
+#: pg_backup_archiver.c:3778
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "processando item %d %s %s\n"
 
-#: pg_backup_archiver.c:3695
+#: pg_backup_archiver.c:3832
 #, c-format
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "executando restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3743
+#: pg_backup_archiver.c:3853
 #, c-format
 msgid "entering main parallel loop\n"
 msgstr "executando laço paralelo principal\n"
 
-#: pg_backup_archiver.c:3754
+#: pg_backup_archiver.c:3864
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "ignorando item %d %s %s\n"
 
-#: pg_backup_archiver.c:3764
+#: pg_backup_archiver.c:3874
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "iniciando item %d %s %s\n"
 
-#: pg_backup_archiver.c:3822
+#: pg_backup_archiver.c:3955
 #, c-format
 msgid "finished main parallel loop\n"
 msgstr "laço paralelo principal terminado\n"
 
-#: pg_backup_archiver.c:3831
+#: pg_backup_archiver.c:3973
 #, c-format
 msgid "entering restore_toc_entries_postfork\n"
 msgstr "executando restore_toc_entries_postfork\n"
 
-#: pg_backup_archiver.c:3849
+#: pg_backup_archiver.c:3993
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "iniciando item adiado %d %s %s\n"
 
-#: pg_backup_archiver.c:3998
+#: pg_backup_archiver.c:4170
 #, c-format
 msgid "no item ready\n"
 msgstr "nenhum item está pronto\n"
 
-#: pg_backup_archiver.c:4047
+#: pg_backup_archiver.c:4218
 #, c-format
 msgid "could not find slot of finished worker\n"
 msgstr "não pôde encontrar entrada do processo filho terminado\n"
 
-#: pg_backup_archiver.c:4049
+#: pg_backup_archiver.c:4220
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "item terminado %d %s %s\n"
 
-#: pg_backup_archiver.c:4062
+#: pg_backup_archiver.c:4233
 #, 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:4224
+#: pg_backup_archiver.c:4395
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "tranferindo dependência %d -> %d para %d\n"
 
-#: pg_backup_archiver.c:4297
+#: pg_backup_archiver.c:4468
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "reduzindo dependências para %d\n"
 
-#: pg_backup_archiver.c:4336
+#: pg_backup_archiver.c:4516
 #, 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"
@@ -960,7 +940,7 @@
 msgstr "tipo de bloco de dados desconhecido %d durante restauração do arquivo\n"
 
 #: pg_backup_custom.c:709 pg_backup_custom.c:759 pg_backup_custom.c:908
-#: pg_backup_tar.c:1087
+#: pg_backup_tar.c:1099
 #, 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"
@@ -1001,104 +981,121 @@
 msgstr "AVISO: ftell não corresponde com posição esperada -- ftell utilizado\n"
 
 #. translator: this is a module name
-#: pg_backup_db.c:29
+#: pg_backup_db.c:30
 msgid "archiver (db)"
 msgstr "arquivador (bd)"
 
-#: pg_backup_db.c:44
+#: pg_backup_db.c:46
 #, c-format
 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:55 pg_dumpall.c:1965
+#: pg_backup_db.c:57 pg_dumpall.c:1972
 #, 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:57 pg_dumpall.c:1967
+#: pg_backup_db.c:59 pg_dumpall.c:1974
 #, 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:128
+#: pg_backup_db.c:148
 #, 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:135 pg_backup_db.c:183 pg_backup_db.c:243 pg_backup_db.c:285
-#: pg_dumpall.c:1795 pg_dumpall.c:1903
+#: pg_backup_db.c:155 pg_backup_db.c:207 pg_backup_db.c:269 pg_backup_db.c:311
+#: pg_dumpall.c:1798 pg_dumpall.c:1910
 msgid "Password: "
 msgstr "Senha: "
 
-#: pg_backup_db.c:164
+#: pg_backup_db.c:188
 #, c-format
 msgid "failed to reconnect to database\n"
 msgstr "falhou ao reconectar ao banco de dados\n"
 
-#: pg_backup_db.c:169
+#: pg_backup_db.c:193
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "não pôde reconectar ao banco de dados: %s"
 
-#: pg_backup_db.c:185
+#: pg_backup_db.c:209
 #, c-format
 msgid "connection needs password\n"
 msgstr "conexão precisa de senha\n"
 
-#: pg_backup_db.c:237
+#: pg_backup_db.c:263
 #, c-format
 msgid "already connected to a database\n"
 msgstr "já está conectado ao banco de dados\n"
 
-#: pg_backup_db.c:277
+#: pg_backup_db.c:303
 #, c-format
 msgid "failed to connect to database\n"
 msgstr "falhou ao conectar ao banco de dados\n"
 
-#: pg_backup_db.c:294
+#: pg_backup_db.c:320
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "conexão com banco de dados \"%s\" falhou: %s"
 
-#: pg_backup_db.c:362
+#: pg_backup_db.c:390
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pg_backup_db.c:397
 #, c-format
 msgid "query failed: %s"
 msgstr "consulta falhou: %s"
 
-#: pg_backup_db.c:364
+#: pg_backup_db.c:399
 #, c-format
 msgid "query was: %s\n"
 msgstr "consulta foi: %s\n"
 
-#: pg_backup_db.c:428
+#: pg_backup_db.c:441
+#, 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 linha ao invés de uma: %s\n"
+msgstr[1] "consulta retornou %d linhas ao invés de uma: %s\n"
+
+#: pg_backup_db.c:486
 #, c-format
 msgid "%s: %s    Command was: %s\n"
 msgstr "%s: %s    Comando foi: %s\n"
 
-#: pg_backup_db.c:484 pg_backup_db.c:558 pg_backup_db.c:565
+#: pg_backup_db.c:542 pg_backup_db.c:616 pg_backup_db.c:623
 msgid "could not execute query"
 msgstr "não pôde executar consulta"
 
-#: pg_backup_db.c:537
+#: pg_backup_db.c:595
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "erro retornado pelo PQputCopyData: %s"
 
-#: pg_backup_db.c:586
+#: pg_backup_db.c:644
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "erro retornado pelo PQputCopyEnd: %s"
 
-#: pg_backup_db.c:592
+#: pg_backup_db.c:650
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "COPY falhou para tabela \"%s\": %s"
 
-#: pg_backup_db.c:605
+#: pg_backup_db.c:656 pg_dump.c:1700
+#, c-format
+msgid "WARNING: unexpected extra results during COPY of table \"%s\"\n"
+msgstr "AVISO: resultados extra inesperados durante COPY da tabela \"%s\"\n"
+
+#: pg_backup_db.c:668
 msgid "could not start database transaction"
 msgstr "não pôde iniciar transação do banco de dados"
 
-#: pg_backup_db.c:613
+#: pg_backup_db.c:676
 msgid "could not commit database transaction"
 msgstr "não pôde efetivar transação do banco de dados"
 
@@ -1127,27 +1124,33 @@
 msgid "could not create directory \"%s\": %s\n"
 msgstr "não pôde criar diretório \"%s\": %s\n"
 
-#: pg_backup_directory.c:413
+#: pg_backup_directory.c:360 pg_backup_directory.c:500
+#: pg_backup_directory.c:530
+#, 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_directory.c:414
 #, c-format
 msgid "could not close data file: %s\n"
 msgstr "não pôde fechar arquivo de dados: %s\n"
 
-#: pg_backup_directory.c:454
+#: pg_backup_directory.c:455
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %s\n"
 msgstr "não pôde abrir arquivo TOC de objetos grandes \"%s\" para entrada: %s\n"
 
-#: pg_backup_directory.c:465
+#: pg_backup_directory.c:466
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\"\n"
 msgstr "linha inválida em arquivo TOC de objetos grandes \"%s\": \"%s\"\n"
 
-#: pg_backup_directory.c:474
+#: pg_backup_directory.c:475
 #, c-format
 msgid "error reading large object TOC file \"%s\"\n"
 msgstr "erro ao ler arquivo TOC de objetos grandes \"%s\"\n"
 
-#: pg_backup_directory.c:478
+#: pg_backup_directory.c:479
 #, c-format
 msgid "could not close large object TOC file \"%s\": %s\n"
 msgstr "não pôde fechar arquivo TOC de objetos grandes \"%s\": %s\n"
@@ -1222,69 +1225,69 @@
 msgid "could not close tar member\n"
 msgstr "não pôde fechar membro tar\n"
 
-#: pg_backup_tar.c:570
+#: pg_backup_tar.c:582
 #, c-format
 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:693
+#: pg_backup_tar.c:705
 #, c-format
 msgid "unexpected COPY statement syntax: \"%s\"\n"
 msgstr "sintaxe do comando COPY inesperada: \"%s\"\n"
 
-#: pg_backup_tar.c:959
+#: pg_backup_tar.c:971
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "OID inválido para objeto grande (%u)\n"
 
-#: pg_backup_tar.c:1103
+#: pg_backup_tar.c:1115
 #, 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:1113
+#: pg_backup_tar.c:1125
 #, 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:1150
+#: pg_backup_tar.c:1162
 #, 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:1161
+#: pg_backup_tar.c:1173
 #, c-format
 msgid "now at file position %s\n"
 msgstr "agora na posição %s do arquivo\n"
 
-#: pg_backup_tar.c:1170 pg_backup_tar.c:1200
+#: pg_backup_tar.c:1182 pg_backup_tar.c:1212
 #, 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"
 
-#: pg_backup_tar.c:1184
+#: pg_backup_tar.c:1196
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "ignorando membro tar %s\n"
 
-#: pg_backup_tar.c:1188
+#: pg_backup_tar.c:1200
 #, 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"
 
-#: pg_backup_tar.c:1234
+#: pg_backup_tar.c:1246
 #, 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 encontrado (%lu byte)\n"
 msgstr[1] "cabeçalho tar incompleto encontrado (%lu bytes)\n"
 
-#: pg_backup_tar.c:1275
+#: pg_backup_tar.c:1287
 #, c-format
 msgid "TOC Entry %s at %s (length %s, checksum %d)\n"
 msgstr "Registro TOC %s em %s (tamanho %s, soma de verificação %d)\n"
 
-#: pg_backup_tar.c:1286
+#: pg_backup_tar.c:1298
 #, c-format
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
 msgstr "cabeçalho tar corrompido foi encontrado em %s (esperado %d, computado %d) na posição %s do arquivo\n"
@@ -1294,64 +1297,69 @@
 msgid "%s: unrecognized section name: \"%s\"\n"
 msgstr "%s: nome de seção desconhecido: \"%s\"\n"
 
-#: pg_backup_utils.c:56 pg_dump.c:524 pg_dump.c:541 pg_dumpall.c:300
-#: pg_dumpall.c:310 pg_dumpall.c:320 pg_dumpall.c:329 pg_dumpall.c:345
-#: pg_dumpall.c:403 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
+#: pg_backup_utils.c:56 pg_dump.c:526 pg_dump.c:543 pg_dumpall.c:298
+#: pg_dumpall.c:308 pg_dumpall.c:318 pg_dumpall.c:327 pg_dumpall.c:343
+#: pg_dumpall.c:401 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: pg_backup_utils.c:101
+#: pg_backup_utils.c:118
 #, c-format
 msgid "out of on_exit_nicely slots\n"
 msgstr "acabaram os elementos para on_exit_nicely\n"
 
-#: pg_dump.c:494
+#: pg_dump.c:496
 #, c-format
 msgid "compression level must be in range 0..9\n"
 msgstr "nível de compressão deve estar no intervalo de 0..9\n"
 
-#: pg_dump.c:539 pg_dumpall.c:308 pg_restore.c:291
+#: pg_dump.c:541 pg_dumpall.c:306 pg_restore.c:291
 #, 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:552
+#: pg_dump.c:554
 #, c-format
 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:558
+#: pg_dump.c:560
 #, c-format
 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:564
+#: pg_dump.c:566
 #, c-format
 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:565
+#: pg_dump.c:567
 #, c-format
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(O comando INSERT não pode definir OIDs.)\n"
 
-#: pg_dump.c:570
+#: pg_dump.c:572
 #, c-format
 msgid "option --if-exists requires option -c/--clean\n"
 msgstr "opção --if-exists requer opção -c/--clean\n"
 
-#: pg_dump.c:598
+#: pg_dump.c:594
 #, c-format
-msgid "%s: invalid number of parallel jobs\n"
-msgstr "%s: número de tarefas paralelas inválido\n"
+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 será descomprimido\n"
+
+#: pg_dump.c:609
+#, c-format
+msgid "invalid number of parallel jobs\n"
+msgstr "número de tarefas paralelas inválido\n"
 
-#: pg_dump.c:602
+#: pg_dump.c:613
 #, c-format
 msgid "parallel backup only supported by the directory format\n"
 msgstr "cópia de segurança paralela somente é suportada pelo formato diretório\n"
 
-#: pg_dump.c:671
+#: pg_dump.c:670
 #, c-format
 msgid ""
 "Synchronized snapshots are not supported by this server version.\n"
@@ -1362,27 +1370,27 @@
 "Execute com --no-synchronized-snapshots se você não precisa de\n"
 "instantâneos sincronizados.\n"
 
-#: pg_dump.c:678
+#: pg_dump.c:677
 #, c-format
 msgid "Exported snapshots are not supported by this server version.\n"
 msgstr "Instantâneos exportados não são suportados por esta versão do servidor.\n"
 
-#: pg_dump.c:689
+#: pg_dump.c:696
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "último OID interno é %u\n"
 
-#: pg_dump.c:698
+#: pg_dump.c:704
 #, c-format
 msgid "No matching schemas were found\n"
 msgstr "Nenhum esquema correspondente foi encontrado\n"
 
-#: pg_dump.c:710
+#: pg_dump.c:716
 #, c-format
 msgid "No matching tables were found\n"
 msgstr "Nenhuma tabela correspondente foi encontrada\n"
 
-#: pg_dump.c:867
+#: pg_dump.c:882
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -1391,17 +1399,17 @@
 "%s salva um banco de dados em um arquivo texto ou em outros formatos.\n"
 "\n"
 
-#: pg_dump.c:868 pg_dumpall.c:548 pg_restore.c:434
+#: pg_dump.c:883 pg_dumpall.c:546 pg_restore.c:440
 #, c-format
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: pg_dump.c:869
+#: pg_dump.c:884
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPÇÃO]... [NOMEBD]\n"
 
-#: pg_dump.c:871 pg_dumpall.c:551 pg_restore.c:437
+#: pg_dump.c:886 pg_dumpall.c:549 pg_restore.c:443
 #, c-format
 msgid ""
 "\n"
@@ -1410,12 +1418,12 @@
 "\n"
 "Opções gerais:\n"
 
-#: pg_dump.c:872
+#: pg_dump.c:887
 #, c-format
 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:873
+#: pg_dump.c:888
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1424,37 +1432,37 @@
 "  -F, --format=c|d|t|p         formato do arquivo de saída (personalizado, diretório,\n"
 "                               tar, texto (padrão))\n"
 
-#: pg_dump.c:875
+#: pg_dump.c:890
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr "  -j, --jobs=NUM               use esse número de tarefas paralelas para copiar\n"
 
-#: pg_dump.c:876
+#: pg_dump.c:891 pg_dumpall.c:551
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                modo informações detalhadas\n"
 
-#: pg_dump.c:877 pg_dumpall.c:553
+#: pg_dump.c:892 pg_dumpall.c:552
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                mostra informação sobre a versão e termina\n"
 
-#: pg_dump.c:878
+#: pg_dump.c:893
 #, 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:879 pg_dumpall.c:554
+#: pg_dump.c:894 pg_dumpall.c:553
 #, c-format
 msgid "  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"
 msgstr "  --lock-wait-timeout=TEMPO    falha após esperar TEMPO por um travamento de tabela\n"
 
-#: pg_dump.c:880 pg_dumpall.c:555
+#: pg_dump.c:895 pg_dumpall.c:554
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   mostra essa ajuda e termina\n"
 
-#: pg_dump.c:882 pg_dumpall.c:556
+#: pg_dump.c:897 pg_dumpall.c:555
 #, c-format
 msgid ""
 "\n"
@@ -1463,47 +1471,47 @@
 "\n"
 "Opções que controlam a saída do conteúdo:\n"
 
-#: pg_dump.c:883 pg_dumpall.c:557
+#: pg_dump.c:898 pg_dumpall.c:556
 #, 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:884
+#: pg_dump.c:899
 #, 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:885 pg_restore.c:448
+#: pg_dump.c:900 pg_restore.c:454
 #, c-format
 msgid "  -c, --clean                  clean (drop) database objects before recreating\n"
 msgstr "  -c, --clean                  exclui (remove) bancos de dados antes de criá-lo novamente\n"
 
-#: pg_dump.c:886
+#: pg_dump.c:901
 #, c-format
 msgid "  -C, --create                 include commands to create database in dump\n"
 msgstr "  -C, --create                 inclui comandos para criação dos bancos de dados na cópia de segurança\n"
 
-#: pg_dump.c:887
+#: pg_dump.c:902
 #, 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:888
+#: pg_dump.c:903
 #, 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:889
+#: pg_dump.c:904
 #, 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:890 pg_dumpall.c:560
+#: pg_dump.c:905 pg_dumpall.c:559
 #, 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:891
+#: pg_dump.c:906
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1512,52 +1520,52 @@
 "  -O, --no-owner               ignora restauração do dono dos objetos\n"
 "                               no formato texto\n"
 
-#: pg_dump.c:893 pg_dumpall.c:563
+#: pg_dump.c:908 pg_dumpall.c:562
 #, 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:894
+#: pg_dump.c:909
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in plain-text format\n"
 msgstr "  -S, --superuser=NOME         nome de super-usuário a ser usado no formato texto\n"
 
-#: pg_dump.c:895
+#: pg_dump.c:910
 #, 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:896
+#: pg_dump.c:911
 #, 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:897 pg_dumpall.c:566
+#: pg_dump.c:912 pg_dumpall.c:565
 #, 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:898 pg_dumpall.c:567
+#: pg_dump.c:913 pg_dumpall.c:566
 #, 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:899 pg_dumpall.c:568
+#: pg_dump.c:914 pg_dumpall.c:567
 #, c-format
 msgid "  --column-inserts             dump data as INSERT commands with column names\n"
 msgstr "  --column-inserts             copia dados utilizando comandos INSERT com nomes das colunas\n"
 
-#: pg_dump.c:900 pg_dumpall.c:569
+#: pg_dump.c:915 pg_dumpall.c:568
 #, c-format
 msgid "  --disable-dollar-quoting     disable dollar quoting, use SQL standard quoting\n"
 msgstr "  --disable-dollar-quoting     desabilita delimitação por cifrão, usa delimitadores do padrão SQL\n"
 
-#: pg_dump.c:901 pg_dumpall.c:570 pg_restore.c:464
+#: pg_dump.c:916 pg_dumpall.c:569 pg_restore.c:470
 #, 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_dump.c:902
+#: pg_dump.c:917
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user has\n"
@@ -1566,62 +1574,62 @@
 "  --enable-row-security        habilita segurança de registros (copia somente conteúdo\n"
 "                               que usuário tenha acesso)\n"
 
-#: pg_dump.c:904
+#: pg_dump.c:919
 #, c-format
 msgid "  --exclude-table-data=TABLE   do NOT dump data for the named table(s)\n"
 msgstr "  --exclude-table-data=TABELA  NÃO copia os dados da(s) tabela(s) especificada(s)\n"
 
-#: pg_dump.c:905 pg_dumpall.c:571 pg_restore.c:466
+#: pg_dump.c:920 pg_dumpall.c:570 pg_restore.c:472
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr "  --if-exists                  use IF EXISTS ao remover objetos\n"
 
-#: pg_dump.c:906 pg_dumpall.c:572
+#: pg_dump.c:921 pg_dumpall.c:571
 #, 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:907 pg_dumpall.c:573
+#: pg_dump.c:922 pg_dumpall.c:572
 #, 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:908
+#: pg_dump.c:923
 #, c-format
 msgid "  --no-synchronized-snapshots  do not use synchronized snapshots in parallel jobs\n"
 msgstr "  --no-synchronized-snapshots  não utiliza instantâneos sincronizados em tarefas paralelas\n"
 
-#: pg_dump.c:909 pg_dumpall.c:574
+#: pg_dump.c:924 pg_dumpall.c:573
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             não copia atribuições de tablespaces\n"
 
-#: pg_dump.c:910 pg_dumpall.c:575
+#: pg_dump.c:925 pg_dumpall.c:574
 #, c-format
 msgid "  --no-unlogged-table-data     do not dump unlogged table data\n"
 msgstr "  --no-unlogged-table-data     não copia dados de tabelas unlogged\n"
 
-#: pg_dump.c:911 pg_dumpall.c:576
+#: pg_dump.c:926 pg_dumpall.c:575
 #, c-format
 msgid "  --quote-all-identifiers      quote all identifiers, even if not key words\n"
 msgstr "  --quote-all-identifiers      todos os identificadores entre aspas, mesmo que não sejam palavras chave\n"
 
-#: pg_dump.c:912
+#: pg_dump.c:927
 #, c-format
 msgid "  --section=SECTION            dump named section (pre-data, data, or post-data)\n"
 msgstr "  --section=SEÇÃO              copia seção especificada (pre-data, data ou post-data)\n"
 
-#: pg_dump.c:913
+#: pg_dump.c:928
 #, 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:914
+#: pg_dump.c:929
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr "  --snapshot=INSTANTÂNEO       utiliza instantâneo informado para a cópia\n"
 
-#: pg_dump.c:915 pg_dumpall.c:577 pg_restore.c:472
+#: pg_dump.c:930 pg_dumpall.c:576 pg_restore.c:478
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1632,7 +1640,7 @@
 "                               usa comandos SET SESSION AUTHORIZATION ao invés de\n"
 "                               comandos ALTER OWNER para definir o dono\n"
 
-#: pg_dump.c:919 pg_dumpall.c:581 pg_restore.c:476
+#: pg_dump.c:934 pg_dumpall.c:580 pg_restore.c:482
 #, c-format
 msgid ""
 "\n"
@@ -1641,42 +1649,42 @@
 "\n"
 "Opções de conexão:\n"
 
-#: pg_dump.c:920
+#: pg_dump.c:935
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=NOMEBD      banco de dados a ser copiado\n"
 
-#: pg_dump.c:921 pg_dumpall.c:583 pg_restore.c:477
+#: pg_dump.c:936 pg_dumpall.c:582 pg_restore.c:483
 #, 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:922 pg_dumpall.c:585 pg_restore.c:478
+#: pg_dump.c:937 pg_dumpall.c:584 pg_restore.c:484
 #, 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:923 pg_dumpall.c:586 pg_restore.c:479
+#: pg_dump.c:938 pg_dumpall.c:585 pg_restore.c:485
 #, 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:924 pg_dumpall.c:587 pg_restore.c:480
+#: pg_dump.c:939 pg_dumpall.c:586 pg_restore.c:486
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        nunca pergunta senha\n"
 
-#: pg_dump.c:925 pg_dumpall.c:588 pg_restore.c:481
+#: pg_dump.c:940 pg_dumpall.c:587 pg_restore.c:487
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W, --password           pergunta senha (pode ocorrer automaticamente)\n"
 
-#: pg_dump.c:926 pg_dumpall.c:589
+#: pg_dump.c:941 pg_dumpall.c:588
 #, 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:928
+#: pg_dump.c:943
 #, c-format
 msgid ""
 "\n"
@@ -1689,367 +1697,376 @@
 "PGDATABASE é utilizada.\n"
 "\n"
 
-#: pg_dump.c:930 pg_dumpall.c:593 pg_restore.c:488
+#: pg_dump.c:945 pg_dumpall.c:592 pg_restore.c:494
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Relate erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:950
+#: pg_dump.c:962
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
 msgstr "codificação de cliente \"%s\" especificada é inválida\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1102
+#, c-format
+msgid ""
+"Synchronized snapshots are not supported on standby servers.\n"
+"Run with --no-synchronized-snapshots instead if you do not need\n"
+"synchronized snapshots.\n"
+msgstr ""
+"Instantâneos sincronizados não são suportados nos servidores em espera.\n"
+"Execute com --no-synchronized-snapshots se você não precisa de\n"
+"instantâneos sincronizados.\n"
+
+#: pg_dump.c:1171
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
 msgstr "formato de saída especificado \"%s\" é inválido\n"
 
-#: pg_dump.c:1157
+#: pg_dump.c:1193
 #, c-format
 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:1521
+#: pg_dump.c:1557
 #, c-format
 msgid "dumping contents of table \"%s.%s\"\n"
 msgstr "copiando conteúdo da tabela \"%s.%s\"\n"
 
-#: pg_dump.c:1645
+#: pg_dump.c:1681
 #, 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:1646 pg_dump.c:1656
+#: pg_dump.c:1682 pg_dump.c:1692
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Mensagem de erro do servidor: %s"
 
-#: pg_dump.c:1647 pg_dump.c:1657
+#: pg_dump.c:1683 pg_dump.c:1693
 #, c-format
 msgid "The command was: %s\n"
 msgstr "O comando foi: %s\n"
 
-#: pg_dump.c:1655
+#: pg_dump.c:1691
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed.\n"
 msgstr "Cópia do conteúdo da tabela \"%s\" falhou: PQgetResult() falhou.\n"
 
-#: pg_dump.c:2297
+#: pg_dump.c:2338
 #, c-format
 msgid "saving database definition\n"
 msgstr "salvando definição do banco de dados\n"
 
-#: pg_dump.c:2630
+#: pg_dump.c:2672
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "salvando codificação = %s\n"
 
-#: pg_dump.c:2657
+#: pg_dump.c:2699
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "salvando padrão de escape de cadeia de caracteres = %s\n"
 
-#: pg_dump.c:2690
+#: pg_dump.c:2732
 #, c-format
 msgid "reading large objects\n"
 msgstr "lendo objetos grandes\n"
 
-#: pg_dump.c:2822
+#: pg_dump.c:2877
 #, c-format
 msgid "saving large objects\n"
 msgstr "salvando objetos grandes\n"
 
-#: pg_dump.c:2869
+#: pg_dump.c:2924
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "erro ao ler objeto grande %u: %s"
 
-#: pg_dump.c:2921
+#: pg_dump.c:2976
 #, c-format
 msgid "reading row security enabled for table \"%s.%s\"\n"
 msgstr "lendo informação de segurança de registros da tabela \"%s.%s\"\n"
 
-#: pg_dump.c:2952
+#: pg_dump.c:3007
 #, c-format
 msgid "reading policies for table \"%s.%s\"\n"
 msgstr "lendo políticas de segurança da tabela \"%s.%s\"\n"
 
-#: pg_dump.c:3083
+#: pg_dump.c:3138
 #, c-format
 msgid "unexpected policy command type: \"%s\"\n"
 msgstr "tipo de comando da política de segurança inesperado: \"%s\"\n"
 
-#: pg_dump.c:3298
+#: pg_dump.c:3353
 #, c-format
 msgid "could not find parent extension for %s\n"
 msgstr "não pôde encontrar extensão pai para %s\n"
 
-#: pg_dump.c:3402
+#: pg_dump.c:3457
 #, 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:3445
+#: pg_dump.c:3500
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "esquema com OID %u não existe\n"
 
-#: pg_dump.c:3797
+#: pg_dump.c:3852
 #, 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:3909
+#: pg_dump.c:3964
 #, 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:4171
+#: pg_dump.c:4226
 #, 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:4260
+#: pg_dump.c:4315
 #, 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:4399
+#: pg_dump.c:4454
 #, 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:4582
+#: pg_dump.c:4657
 #, 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:5270
+#: pg_dump.c:5345
 #, 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:5422
+#: pg_dump.c:5497
 #, c-format
 msgid "reading indexes for table \"%s.%s\"\n"
 msgstr "lendo índices da tabela \"%s.%s\"\n"
 
-#: pg_dump.c:5789
+#: pg_dump.c:5864
 #, c-format
 msgid "reading foreign key constraints for table \"%s.%s\"\n"
 msgstr "lendo restrições de chave estrangeira da tabela \"%s.%s\"\n"
 
-#: pg_dump.c:6035
+#: pg_dump.c:6110
 #, c-format
 msgid "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not found\n"
 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:6128
+#: pg_dump.c:6203
 #, c-format
 msgid "reading triggers for table \"%s.%s\"\n"
 msgstr "lendo gatilhos da tabela \"%s.%s\"\n"
 
-#: pg_dump.c:6293
+#: pg_dump.c:6368
 #, c-format
 msgid "query produced null referenced table name for foreign key trigger \"%s\" on table \"%s\" (OID of table: %u)\n"
 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:6879
+#: pg_dump.c:6954
 #, c-format
 msgid "finding the columns and types of table \"%s.%s\"\n"
 msgstr "encontrando as colunas e tipos da tabela \"%s.%s\"\n"
 
-#: pg_dump.c:7058
+#: pg_dump.c:7133
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "numeração de coluna inválida para tabela \"%s\"\n"
 
-#: pg_dump.c:7092
+#: pg_dump.c:7167
 #, c-format
 msgid "finding default expressions of table \"%s.%s\"\n"
 msgstr "encontrando expressões padrão da tabela \"%s.%s\"\n"
 
-#: pg_dump.c:7145
+#: pg_dump.c:7220
 #, 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:7217
+#: pg_dump.c:7292
 #, c-format
 msgid "finding check constraints for table \"%s.%s\"\n"
 msgstr "encontrando restrições de verificação para tabela \"%s.%s\"\n"
 
-#: pg_dump.c:7313
+#: pg_dump.c:7388
 #, 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] "esperado %d restrição de verificação na tabela \"%s\" mas encontrou %d\n"
 msgstr[1] "esperado %d restrições de verificação na tabela \"%s\" mas encontrou %d\n"
 
-#: pg_dump.c:7317
+#: pg_dump.c:7392
 #, c-format
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(O catálogo do sistema pode estar corrompido).\n"
 
-#: pg_dump.c:8707
+#: pg_dump.c:8783
 #, c-format
 msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
 msgstr "AVISO: typtype do tipo de dado \"%s\" parece ser inválido\n"
 
-#: pg_dump.c:10203
+#: pg_dump.c:10279
 #, c-format
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "AVISO: valor inválido na matriz proargmodes\n"
 
-#: pg_dump.c:10555
+#: pg_dump.c:10631
 #, c-format
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "AVISO: não pôde validar matriz proallargtypes\n"
 
-#: pg_dump.c:10571
+#: pg_dump.c:10647
 #, c-format
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "AVISO: não pôde validar matriz proargmodes\n"
 
-#: pg_dump.c:10585
+#: pg_dump.c:10661
 #, c-format
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "AVISO: não pôde validar matriz proargnames\n"
 
-#: pg_dump.c:10596
+#: pg_dump.c:10672
 #, c-format
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "AVISO: não pôde validar matriz proconfig\n"
 
-#: pg_dump.c:10667
+#: pg_dump.c:10743
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "valor de provolatile desconhecido para função \"%s\"\n"
 
-#: pg_dump.c:10844
+#: pg_dump.c:10876 pg_dump.c:10981 pg_dump.c:10988
+#, c-format
+msgid "could not find function definition for function with OID %u\n"
+msgstr "não foi possível encontrar definição da função para OID %u\n"
+
+#: pg_dump.c:10921
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
 msgstr "AVISO: valor inválido no campo pg_cast.castfunc ou pg_cast.castmethod\n"
 
-#: pg_dump.c:10847
+#: pg_dump.c:10924
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "AVISO: valor inválido no campo pg_cast.castmethod\n"
 
-#: pg_dump.c:10931
+#: pg_dump.c:11010
 #, c-format
 msgid "WARNING: bogus transform definition, at least one of trffromsql and trftosql should be nonzero\n"
 msgstr "AVISO: definição de transformação inválida, pelo menos um dos trffromsql e trftosql não devem ser zero\n"
 
-#: pg_dump.c:10948
+#: pg_dump.c:11027
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trffromsql field\n"
 msgstr "AVISO: valor inválido no campo pg_transform.trffromsql\n"
 
-#: pg_dump.c:10969
+#: pg_dump.c:11048
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trftosql field\n"
 msgstr "AVISO: valor inválido no campo pg_cast.trftosql\n"
 
-#: pg_dump.c:11356
+#: pg_dump.c:11435
 #, 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:12536
+#: pg_dump.c:12582
 #, c-format
 msgid "WARNING: aggregate function %s could not be dumped correctly for this database version; ignored\n"
 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:13360
+#: pg_dump.c:13406
 #, c-format
 msgid "unrecognized object type in default privileges: %d\n"
 msgstr "tipo de objeto desconhecido em privilégios padrão: %d\n"
 
-#: pg_dump.c:13375
+#: pg_dump.c:13421
 #, 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:13431
+#: pg_dump.c:13477
 #, 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:13852
+#: pg_dump.c:13899
 #, 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:13855
+#: pg_dump.c:13902
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition\n"
 msgstr "consulta para obter definição da visão \"%s\" retornou mais de uma definição\n"
 
-#: pg_dump.c:13862
+#: pg_dump.c:13909
 #, 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:14610
+#: pg_dump.c:14657
 #, 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:14736
+#: pg_dump.c:14783
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "faltando índice para restrição \"%s\"\n"
 
-#: pg_dump.c:14927
+#: pg_dump.c:14974
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "tipo de restrição é desconhecido: %c\n"
 
-#: pg_dump.c:15077 pg_dump.c:15241
+#: pg_dump.c:15124 pg_dump.c:15288
 #, 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] "consulta para obter dados da sequência \"%s\" retornou %d linha (esperado 1)\n"
 msgstr[1] "consulta para obter dados da sequência \"%s\" retornou %d linhas (esperado 1)\n"
 
-#: pg_dump.c:15088
+#: pg_dump.c:15135
 #, 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:15337
+#: pg_dump.c:15384
 #, c-format
 msgid "unexpected tgtype value: %d\n"
 msgstr "valor tgtype inesperado: %d\n"
 
-#: pg_dump.c:15419
+#: pg_dump.c:15466
 #, 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:15608
+#: pg_dump.c:15665
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned\n"
 msgstr "consulta para obter regra \"%s\" para tabela \"%s\" falhou: número incorreto de registros foi retornado\n"
 
-#: pg_dump.c:15990
+#: pg_dump.c:16047
 #, c-format
 msgid "reading dependency data\n"
 msgstr "lendo dados sobre dependência\n"
 
-#: pg_dump.c:16550
+#: pg_dump.c:16607
 #, c-format
 msgid "WARNING: could not parse reloptions array\n"
 msgstr "AVISO: não pôde validar matriz reloptions\n"
 
-#: pg_dump.c:16614
-#, 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 linha ao invés de uma: %s\n"
-msgstr[1] "consulta retornou %d linhas ao invés de uma: %s\n"
-
 #. translator: this is a module name
 #: pg_dump_sort.c:23
 msgid "sorter"
@@ -2097,7 +2114,7 @@
 msgid "WARNING: could not resolve dependency loop among these items:\n"
 msgstr "AVISO: não pôde resolver dependência circular entre esses itens:\n"
 
-#: pg_dumpall.c:181
+#: pg_dumpall.c:179
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -2108,7 +2125,7 @@
 "mesmo diretório que \"%s\".\n"
 "Verifique sua instalação.\n"
 
-#: pg_dumpall.c:188
+#: pg_dumpall.c:186
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by \"%s\"\n"
@@ -2119,32 +2136,32 @@
 "mas não tem a mesma versão que %s.\n"
 "Verifique sua instalação.\n"
 
-#: pg_dumpall.c:318
+#: pg_dumpall.c:316
 #, c-format
 msgid "%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
 msgstr "%s: opções -g/--globals-only e -r/--roles-only não podem ser utilizadas juntas\n"
 
-#: pg_dumpall.c:327
+#: pg_dumpall.c:325
 #, c-format
 msgid "%s: options -g/--globals-only and -t/--tablespaces-only cannot be used together\n"
 msgstr "%s: opções -g/--globals-only e -t/--tablespaces-only não podem ser utilizadas juntas\n"
 
-#: pg_dumpall.c:336 pg_restore.c:343
+#: pg_dumpall.c:334 pg_restore.c:359
 #, c-format
 msgid "%s: option --if-exists requires option -c/--clean\n"
 msgstr "%s: opção --if-exists requer opção -c/--clean\n"
 
-#: pg_dumpall.c:343
+#: pg_dumpall.c:341
 #, c-format
 msgid "%s: options -r/--roles-only and -t/--tablespaces-only cannot be used together\n"
 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:1892
+#: pg_dumpall.c:383 pg_dumpall.c:1899
 #, 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:398
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2153,12 +2170,12 @@
 "%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:415
 #, 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:547
+#: pg_dumpall.c:545
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2167,57 +2184,57 @@
 "%s salva os bancos de dados de um agrupamento do PostgreSQL em um arquivo de script.\n"
 "\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:547
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPÇÃO]...\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:550
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=ARQUIVO           nome do arquivo de saída\n"
 
-#: pg_dumpall.c:558
+#: pg_dumpall.c:557
 #, c-format
 msgid "  -c, --clean                  clean (drop) databases before recreating\n"
 msgstr "  -c, --clean                  exclui (remove) bancos de dados antes de criá-los novamente\n"
 
-#: pg_dumpall.c:559
+#: pg_dumpall.c:558
 #, 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:561 pg_restore.c:456
+#: pg_dumpall.c:560 pg_restore.c:462
 #, 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:562
+#: pg_dumpall.c:561
 #, c-format
 msgid "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
 msgstr "  -r, --roles-only             copia somente roles, e não bancos de dados ou tablespaces\n"
 
-#: pg_dumpall.c:564
+#: pg_dumpall.c:563
 #, 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:565
+#: pg_dumpall.c:564
 #, c-format
 msgid "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
 msgstr "  -t, --tablespaces-only       copia somente tablespaces, e não bancos de dados ou roles\n"
 
-#: pg_dumpall.c:582
+#: pg_dumpall.c:581
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=TEXTO       cadeia de caracteres de conexão\n"
 
-#: pg_dumpall.c:584
+#: pg_dumpall.c:583
 #, 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:591
+#: pg_dumpall.c:590
 #, c-format
 msgid ""
 "\n"
@@ -2230,12 +2247,12 @@
 " padrão.\n"
 "\n"
 
-#: pg_dumpall.c:1118
+#: pg_dumpall.c:1117
 #, 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:1449
+#: pg_dumpall.c:1448
 #, 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"
@@ -2245,47 +2262,47 @@
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: copiando banco de dados \"%s\"...\n"
 
-#: pg_dumpall.c:1680
+#: pg_dumpall.c:1683
 #, 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:1689
+#: pg_dumpall.c:1692
 #, 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:1734
+#: pg_dumpall.c:1737
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: executando \"%s\"\n"
 
-#: pg_dumpall.c:1914
+#: pg_dumpall.c:1921
 #, 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:1944
+#: pg_dumpall.c:1951
 #, 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:1950
+#: pg_dumpall.c:1957
 #, 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:2028 pg_dumpall.c:2054
+#: pg_dumpall.c:2035 pg_dumpall.c:2061
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: executando %s\n"
 
-#: pg_dumpall.c:2034 pg_dumpall.c:2060
+#: pg_dumpall.c:2041 pg_dumpall.c:2067
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: consulta falhou: %s"
 
-#: pg_dumpall.c:2036 pg_dumpall.c:2062
+#: pg_dumpall.c:2043 pg_dumpall.c:2069
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: consulta foi: %s\n"
@@ -2305,27 +2322,32 @@
 msgid "%s: options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "%s: opções -c/--clean e -a/--data-only não podem ser utilizadas juntas\n"
 
-#: pg_restore.c:329
+#: pg_restore.c:328
+#, c-format
+msgid "%s: invalid number of parallel jobs\n"
+msgstr "%s: número de tarefas paralelas inválido\n"
+
+#: pg_restore.c:336
+#, c-format
+msgid "%s: maximum number of parallel jobs is %d\n"
+msgstr "%s: número máximo de tarefas paralelas é %d\n"
+
+#: pg_restore.c:345
 #, 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:369
+#: pg_restore.c:385
 #, c-format
 msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
 msgstr "formato de archive desconhecido \"%s\"; por favor especifique \"c\", \"d\" ou \"t\"\n"
 
-#: pg_restore.c:401
-#, c-format
-msgid "%s: maximum number of parallel jobs is %d\n"
-msgstr "%s: número máximo de tarefas paralelas é %d\n"
-
-#: pg_restore.c:419
+#: pg_restore.c:425
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
 msgstr "AVISO: erros ignorados durante restauração: %d\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:439
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2334,47 +2356,47 @@
 "%s restaura um banco de dados PostgreSQL a partir de um arquivo criado pelo pg_dump.\n"
 "\n"
 
-#: pg_restore.c:435
+#: pg_restore.c:441
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPÇÃO]... [ARQUIVO]\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:444
 #, 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:439
+#: pg_restore.c:445
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=ARQUIVO       nome do arquivo de saída\n"
 
-#: pg_restore.c:440
+#: pg_restore.c:446
 #, c-format
 msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr "  -F, --format=c|d|t       formato de arquivo de cópia de segurança (deve ser automático)\n"
 
-#: pg_restore.c:441
+#: pg_restore.c:447
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               mostra TOC resumido do arquivo\n"
 
-#: pg_restore.c:442
+#: pg_restore.c:448
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            modo de detalhe\n"
 
-#: pg_restore.c:443
+#: pg_restore.c:449
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            mostra informação sobre a versão e termina\n"
 
-#: pg_restore.c:444
+#: pg_restore.c:450
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               mostra essa ajuda e termina\n"
 
-#: pg_restore.c:446
+#: pg_restore.c:452
 #, c-format
 msgid ""
 "\n"
@@ -2383,32 +2405,32 @@
 "\n"
 "Opções que controlam a restauração:\n"
 
-#: pg_restore.c:447
+#: pg_restore.c:453
 #, 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:449
+#: pg_restore.c:455
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 cria o banco de dados informado\n"
 
-#: pg_restore.c:450
+#: pg_restore.c:456
 #, 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:451
+#: pg_restore.c:457
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=NOME             restaura o índice especificado\n"
 
-#: pg_restore.c:452
+#: pg_restore.c:458
 #, 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:453
+#: pg_restore.c:459
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -2417,52 +2439,52 @@
 "  -L, --use-list=ARQUIVO       usa tabela de conteúdo deste arquivo para\n"
 "                               selecionar/ordenar saída\n"
 
-#: pg_restore.c:455
+#: pg_restore.c:461
 #, 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:457
+#: pg_restore.c:463
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=NOME(args)    restaura função especificada\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:464
 #, 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:459
+#: pg_restore.c:465
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use for disabling triggers\n"
 msgstr "  -S, --superuser=NOME         nome do super-usuário usado para desabilitar os gatilhos\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:466
 #, c-format
 msgid "  -t, --table=NAME             restore named table\n"
 msgstr "  -t, --table=NOME             restaura tabela especificada\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:467
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=NOME           restaura gatilho especificado\n"
 
-#: pg_restore.c:462
+#: pg_restore.c:468
 #, c-format
 msgid "  -x, --no-privileges          skip restoration of access privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          ignora restauração dos privilégios de acesso (grant/revoke)\n"
 
-#: pg_restore.c:463
+#: pg_restore.c:469
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr "  -1, --single-transaction     restaura como uma transação única\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:471
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        habilita segurança de registros\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:473
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
@@ -2471,27 +2493,27 @@
 "  --no-data-for-failed-tables  não restaura dados de tabelas que não puderam ser\n"
 "                               criadas\n"
 
-#: pg_restore.c:469
+#: pg_restore.c:475
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels         não restaura as atribuições de rótulos de segurança\n"
 
-#: pg_restore.c:470
+#: pg_restore.c:476
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr "  --no-tablespaces             não restaura as atribuições de tablespaces\n"
 
-#: pg_restore.c:471
+#: pg_restore.c:477
 #, c-format
 msgid "  --section=SECTION            restore named section (pre-data, data, or post-data)\n"
 msgstr "  --section=SEÇÃO              restaura seção especificada (pre-data, data ou post-data)\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:488
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=NOMEROLE          executa SET ROLE antes da restauração\n"
 
-#: pg_restore.c:484
+#: pg_restore.c:490
 #, c-format
 msgid ""
 "\n"
@@ -2502,7 +2524,7 @@
 "As opções -I, -n, -P, -t, -T e --section podem ser combinadas e especificadas\n"
 "múltiplas vezes para selecionar múltiplos objetos.\n"
 
-#: pg_restore.c:487
+#: pg_restore.c:493
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_dump/po/ru.po postgresql-9.5-9.5.8/src/bin/pg_dump/po/ru.po
--- postgresql-9.5-9.5.2/src/bin/pg_dump/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_dump/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,45 +1,26 @@
-# PG_DUMP Translated Messages into the Russian Language (UTF-8)
+# Russian message translation file for pg_dump
+# Copyright (C) 2001-2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Serguei A. Mokhov <mokhov@cs.concordia.ca>, 2001-2005.
+# Oleg Bartunov <oleg@sai.msu.su>, 2004.
+# Sergey Burladyan <eshkinkot@gmail.com>, 2012.
+# Dmitriy Olshevskiy <olshevskiy87@bk.ru>, 2014.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# Copyright (c) 2001-2005 Serguei A. Mokhov, mokhov@cs.concordia.ca
-# Copyright (c) 2012-2013 Alexander Lakhin, exclusion@gmail.com
-# Distributed under the same licensing terms as PostgreSQL itself.
-#
-# pgtranslation Id: pg_dump.po,v 1.2 2009/10/14 21:08:40 petere Exp $
-#
-# ChangeLog:
-#   - August 24, 2014: Updates for 9.4. Alexander Lakhin <exclusion@gmail.com>.
-#     - With corrections from Dmitriy Olshevskiy <olshevskiy87@bk.ru>
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 3, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 21, 2012: Minor fixes. Alexander Lakhin <exclusion@gmail.com>.
-#     - With corrections from Sergey Burladyan <eshkinkot@gmail.com>
-#   - February 18, 2012: Complete translation for 9.1. Alexander Lakhin <exclusion@gmail.com>.
-#   - January 17, 2005: Complete translation for 8.0, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - December, 2004: New translation by Oleg Bartunov <oleg@sai.msu.su>.
-#   - April 6 - December 10, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>.
-#   - July 24 - October 5, 2003: Updates for 7.4.x; <mokhov@cs.concordia.ca>.
-#   - October 12, 2002: Post-7.3 beta 2, Fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - September 14, 2002: Post-7.3 beta 1, Take II, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - September 7, 2002: Post-7.3 beta 1 fuzzy message fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - September 2001 - August 2002: Initial translation and maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: pg_dump (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-01-15 04:43+0000\n"
-"PO-Revision-Date: 2016-01-17 08:02+0300\n"
+"POT-Creation-Date: 2017-05-26 20:51+0000\n"
+"PO-Revision-Date: 2017-04-03 08:42+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 2.0\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
@@ -77,8 +58,8 @@
 msgstr "ошибка pclose: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 pg_backup_db.c:137 pg_backup_db.c:188
-#: pg_backup_db.c:245 pg_backup_db.c:287
+#: ../../common/fe_memutils.c:98 pg_backup_db.c:157 pg_backup_db.c:212
+#: pg_backup_db.c:271 pg_backup_db.c:313
 #, c-format
 msgid "out of memory\n"
 msgstr "нехватка пам�ти\n"
@@ -291,7 +272,9 @@
 #: common.c:902
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
-msgstr "родитель�ка� таблица � OID %u дл� таблицы \"%s\" (OID %u) не найдена\n"
+msgstr ""
+"нарушение цело�тно�ти: родитель�ка� таблица � OID %u дл� таблицы \"%s\" (OID "
+"%u) не найдена\n"
 
 #: common.c:944
 #, c-format
@@ -304,88 +287,91 @@
 msgstr "не удало�ь разобрать чи�ловой ма��ив \"%s\": неверный �имвол в чи�ле\n"
 
 #. translator: this is a module name
-#: compress_io.c:79
+#: compress_io.c:78
 msgid "compress_io"
 msgstr "compress_io"
 
-#: compress_io.c:115
+#: compress_io.c:114
 #, c-format
 msgid "invalid compression code: %d\n"
 msgstr "неверный код �жати�: %d\n"
 
-#: compress_io.c:139 compress_io.c:175 compress_io.c:196 compress_io.c:529
-#: compress_io.c:572
+#: compress_io.c:138 compress_io.c:174 compress_io.c:192 compress_io.c:519
+#: compress_io.c:562
 #, c-format
 msgid "not built with zlib support\n"
 msgstr "программа �обрана без поддержки zlib\n"
 
-#: compress_io.c:246 compress_io.c:348
+#: compress_io.c:242 compress_io.c:344
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "не удало�ь инициализировать библиотеку �жати�: %s\n"
 
-#: compress_io.c:267
+#: compress_io.c:263
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "не удало�ь закрыть поток �жатых данных: %s\n"
 
-#: compress_io.c:285
+#: compress_io.c:281
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "не удало�ь �жать данные: %s\n"
 
-#: compress_io.c:368 compress_io.c:384
+#: compress_io.c:361 compress_io.c:377
 #, c-format
 msgid "could not uncompress data: %s\n"
 msgstr "не удало�ь ра�паковать данные: %s\n"
 
-#: compress_io.c:392
+#: compress_io.c:385
 #, c-format
 msgid "could not close compression library: %s\n"
 msgstr "не удало�ь закрыть библиотеку �жати�: %s\n"
 
-#: compress_io.c:606 compress_io.c:642 pg_backup_custom.c:591
+#: compress_io.c:596 compress_io.c:632 pg_backup_custom.c:591
 #: pg_backup_tar.c:560
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "не удало�ь прочитать входной файл: %s\n"
 
-#: compress_io.c:645 pg_backup_custom.c:588 pg_backup_directory.c:552
+#: compress_io.c:635 pg_backup_custom.c:588 pg_backup_directory.c:548
 #: pg_backup_tar.c:796 pg_backup_tar.c:820
 #, c-format
 msgid "could not read from input file: end of file\n"
 msgstr "не удало�ь прочитать входной файл: конец файла\n"
 
-#: parallel.c:76
+#: dumputils.c:402 dumputils.c:433
+#, c-format
+msgid "shell command argument contains a newline or carriage return: \"%s\"\n"
+msgstr ""
+"аргумент команды оболочки �одержит �имвол новой �троки или перевода каретки: "
+"\"%s\"\n"
+
+#: dumputils.c:545
+#, c-format
+msgid "database name contains a newline or carriage return: \"%s\"\n"
+msgstr ""
+"им� базы данных �одержит �имвол новой �троки или перевода каретки: \"%s\"\n"
+
+#: parallel.c:166
 msgid "parallel archiver"
 msgstr "параллельный архиватор"
 
-#: parallel.c:139
+#: parallel.c:230
 #, c-format
 msgid "%s: WSAStartup failed: %d\n"
 msgstr "%s: ошибка WSAStartup: %d\n"
 
-#: parallel.c:339
-#, c-format
-msgid "worker is terminating\n"
-msgstr "рабочий проце�� прерывает��\n"
-
-#: parallel.c:529
+#: parallel.c:933
 #, c-format
 msgid "could not create communication channels: %s\n"
 msgstr "не удало�ь �оздать каналы межпроце��ного взаимодей�тви�: %s\n"
 
-#: parallel.c:601
+#: parallel.c:996
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "не удало�ь �оздать рабочий проце��: %s\n"
 
-#: parallel.c:818
-#, c-format
-msgid "could not get relation name for OID %u: %s\n"
-msgstr "не удало�ь получить им� отношени� � OID %u: %s\n"
-
-#: parallel.c:835
+#: parallel.c:1191
 #, c-format
 msgid ""
 "could not obtain lock on relation \"%s\"\n"
@@ -398,77 +384,67 @@
 "�той таблицы по�ле того, как родитель�кий проце�� pg_dump получил дл� неё "
 "начальную блокировку ACCESS SHARE.\n"
 
-#: parallel.c:919
+#: parallel.c:1261
 #, c-format
-msgid "unrecognized command on communication channel: %s\n"
-msgstr "�еизве�тна� команда в канале взаимодей�тви�: %s\n"
+msgid "unrecognized command received from master: \"%s\"\n"
+msgstr "от ведущего получена нера�познанна� команда: \"%s\"\n"
 
-#: parallel.c:952
+#: parallel.c:1299
 #, c-format
 msgid "a worker process died unexpectedly\n"
 msgstr "рабочий проце�� неожиданно прекратил��\n"
 
-#: parallel.c:979 parallel.c:988
+#: parallel.c:1325 parallel.c:1331
 #, c-format
-msgid "invalid message received from worker: %s\n"
-msgstr "от рабочего проце��а получено ошибочное �ообщение: %s\n"
+msgid "invalid message received from worker: \"%s\"\n"
+msgstr "от рабочего проце��а получено ошибочное �ообщение: \"%s\"\n"
 
-#: parallel.c:985 pg_backup_db.c:355
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: parallel.c:1037 parallel.c:1081
+#: parallel.c:1388 parallel.c:1439
 #, c-format
 msgid "error processing a parallel work item\n"
 msgstr "ошибка выполнени� ча�ти параллельной работы\n"
 
-#: parallel.c:1109 parallel.c:1247
+#: parallel.c:1468 parallel.c:1586
 #, c-format
 msgid "could not write to the communication channel: %s\n"
 msgstr "не удало�ь запи�ать в канал взаимодей�тви�: %s\n"
 
-#: parallel.c:1158
-#, c-format
-msgid "terminated by user\n"
-msgstr "прервано пользователем\n"
-
-#: parallel.c:1210
+#: parallel.c:1546
 #, c-format
-msgid "error in ListenToWorkers(): %s\n"
-msgstr "ошибка в ListenToWorkers(): %s\n"
+msgid "select() failed: %s\n"
+msgstr "ошибка в select(): %s\n"
 
-#: parallel.c:1335
+#: parallel.c:1671
 #, c-format
 msgid "pgpipe: could not create socket: error code %d\n"
 msgstr "pgpipe: не удало�ь �оздать �окет (код ошибки: %d)\n"
 
-#: parallel.c:1346
+#: parallel.c:1682
 #, c-format
 msgid "pgpipe: could not bind: error code %d\n"
 msgstr "pgpipe: не удало�ь прив�зать�� к �окету (код ошибки: %d)\n"
 
-#: parallel.c:1353
+#: parallel.c:1689
 #, c-format
 msgid "pgpipe: could not listen: error code %d\n"
 msgstr "pgpipe: не удало�ь начать приём (код ошибки: %d)\n"
 
-#: parallel.c:1360
+#: parallel.c:1696
 #, c-format
 msgid "pgpipe: getsockname() failed: error code %d\n"
 msgstr "pgpipe: ошибка в getsockname() (код ошибки: %d)\n"
 
-#: parallel.c:1371
+#: parallel.c:1707
 #, c-format
 msgid "pgpipe: could not create second socket: error code %d\n"
 msgstr "pgpipe: не удало�ь �оздать второй �окет (код ошибки: %d)\n"
 
-#: parallel.c:1380
+#: parallel.c:1716
 #, c-format
 msgid "pgpipe: could not connect socket: error code %d\n"
 msgstr "pgpipe: не удало�ь подключить �окет (код ошибки: %d)\n"
 
-#: parallel.c:1387
+#: parallel.c:1725
 #, c-format
 msgid "pgpipe: could not accept connection: error code %d\n"
 msgstr "pgpipe: не удало�ь прин�ть �оединение (код ошибки: %d)\n"
@@ -478,7 +454,7 @@
 msgid "archiver"
 msgstr "архиватор"
 
-#: pg_backup_archiver.c:229 pg_backup_archiver.c:1499
+#: pg_backup_archiver.c:229 pg_backup_archiver.c:1550
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "не удало�ь закрыть выходной файл: %s\n"
@@ -545,62 +521,69 @@
 msgid "dropping %s %s\n"
 msgstr "удал�ет�� %s %s\n"
 
-#: pg_backup_archiver.c:637
+#: pg_backup_archiver.c:577
+#, c-format
+msgid "WARNING: could not find where to insert IF EXISTS in statement \"%s\"\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь определить, куда добавить IF EXISTS в оператор "
+"\"%s\"\n"
+
+#: pg_backup_archiver.c:653
 #, c-format
 msgid "setting owner and privileges for %s \"%s.%s\"\n"
 msgstr "у�тановка владельца и прав: %s \"%s.%s\"\n"
 
-#: pg_backup_archiver.c:640
+#: pg_backup_archiver.c:656
 #, c-format
 msgid "setting owner and privileges for %s \"%s\"\n"
 msgstr "у�тановка владельца и прав: %s \"%s\"\n"
 
-#: pg_backup_archiver.c:706 pg_backup_archiver.c:708
+#: pg_backup_archiver.c:722 pg_backup_archiver.c:724
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "предупреждение из и�ходного файла: %s\n"
 
-#: pg_backup_archiver.c:717
+#: pg_backup_archiver.c:733
 #, c-format
 msgid "creating %s \"%s.%s\"\n"
 msgstr "�оздаёт�� %s \"%s.%s\"\n"
 
-#: pg_backup_archiver.c:720
+#: pg_backup_archiver.c:736
 #, c-format
 msgid "creating %s \"%s\"\n"
 msgstr "�оздаёт�� %s \"%s\"\n"
 
-#: pg_backup_archiver.c:765
+#: pg_backup_archiver.c:788
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "подключение к новой базе данных \"%s\"\n"
 
-#: pg_backup_archiver.c:793
+#: pg_backup_archiver.c:816
 #, c-format
 msgid "processing %s\n"
 msgstr "обрабатывает�� %s\n"
 
-#: pg_backup_archiver.c:813
+#: pg_backup_archiver.c:836
 #, c-format
 msgid "processing data for table \"%s.%s\"\n"
 msgstr "обрабатывают�� данные таблицы \"%s.%s\"\n"
 
-#: pg_backup_archiver.c:875
+#: pg_backup_archiver.c:898
 #, c-format
 msgid "executing %s %s\n"
 msgstr "выполн�ет�� %s %s\n"
 
-#: pg_backup_archiver.c:914
+#: pg_backup_archiver.c:937
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "отключают�� триггеры таблицы %s\n"
 
-#: pg_backup_archiver.c:942
+#: pg_backup_archiver.c:965
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "включают�� триггеры таблицы %s\n"
 
-#: pg_backup_archiver.c:972
+#: pg_backup_archiver.c:995
 #, c-format
 msgid ""
 "internal error -- WriteData cannot be called outside the context of a "
@@ -609,12 +592,12 @@
 "внутренн�� ошибка -- WriteData нельз� вызывать вне контек�та процедуры "
 "DataDumper\n"
 
-#: pg_backup_archiver.c:1137
+#: pg_backup_archiver.c:1188
 #, c-format
 msgid "large-object output not supported in chosen format\n"
 msgstr "выбранный формат не поддерживает выгрузку больших объектов\n"
 
-#: pg_backup_archiver.c:1195
+#: pg_backup_archiver.c:1246
 #, c-format
 msgid "restored %d large object\n"
 msgid_plural "restored %d large objects\n"
@@ -622,55 +605,55 @@
 msgstr[1] "во��тановлено %d больших объекта\n"
 msgstr[2] "во��тановлено %d больших объектов\n"
 
-#: pg_backup_archiver.c:1216 pg_backup_tar.c:738
+#: pg_backup_archiver.c:1267 pg_backup_tar.c:738
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "во��тановление большого объекта � OID %u\n"
 
-#: pg_backup_archiver.c:1228
+#: pg_backup_archiver.c:1279
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "не удало�ь �оздать большой объект %u: %s"
 
-#: pg_backup_archiver.c:1233 pg_dump.c:2862
+#: pg_backup_archiver.c:1284 pg_dump.c:2914
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "не удало�ь открыть большой объект %u: %s"
 
-#: pg_backup_archiver.c:1291
+#: pg_backup_archiver.c:1342
 #, c-format
 msgid "could not open TOC file \"%s\": %s\n"
 msgstr "не удало�ь открыть файл оглавлени� \"%s\": %s\n"
 
-#: pg_backup_archiver.c:1332
+#: pg_backup_archiver.c:1383
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: �трока проигнорирована: %s\n"
 
-#: pg_backup_archiver.c:1339
+#: pg_backup_archiver.c:1390
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "не найдена запи�ь дл� ID %d\n"
 
-#: pg_backup_archiver.c:1360 pg_backup_directory.c:230
-#: pg_backup_directory.c:601
+#: pg_backup_archiver.c:1411 pg_backup_directory.c:230
+#: pg_backup_directory.c:597
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "не удало�ь закрыть файл оглавлени�: %s\n"
 
-#: pg_backup_archiver.c:1469 pg_backup_custom.c:162 pg_backup_directory.c:341
-#: pg_backup_directory.c:587 pg_backup_directory.c:645
-#: pg_backup_directory.c:665
+#: pg_backup_archiver.c:1520 pg_backup_custom.c:162 pg_backup_directory.c:341
+#: pg_backup_directory.c:583 pg_backup_directory.c:641
+#: pg_backup_directory.c:661
 #, c-format
 msgid "could not open output file \"%s\": %s\n"
 msgstr "не удало�ь открыть выходной файл \"%s\": %s\n"
 
-#: pg_backup_archiver.c:1472 pg_backup_custom.c:169
+#: pg_backup_archiver.c:1523 pg_backup_custom.c:169
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "не удало�ь открыть выходной файл: %s\n"
 
-#: pg_backup_archiver.c:1578
+#: pg_backup_archiver.c:1629
 #, 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"
@@ -678,196 +661,187 @@
 msgstr[1] "запи�ано %lu байта данных большого объекта (результат = %lu)\n"
 msgstr[2] "запи�ано %lu байт данных большого объекта (результат = %lu)\n"
 
-#: pg_backup_archiver.c:1584
+#: pg_backup_archiver.c:1635
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr "не удало�ь запи�ать большой объект (результат: %lu, ожидало�ь: %lu)\n"
 
-#: pg_backup_archiver.c:1677
+#: pg_backup_archiver.c:1728
 #, c-format
 msgid "Error while INITIALIZING:\n"
 msgstr "Ошибка при инициализации:\n"
 
-#: pg_backup_archiver.c:1682
+#: pg_backup_archiver.c:1733
 #, c-format
 msgid "Error while PROCESSING TOC:\n"
 msgstr "Ошибка при обработке оглавлени�:\n"
 
-#: pg_backup_archiver.c:1687
+#: pg_backup_archiver.c:1738
 #, c-format
 msgid "Error while FINALIZING:\n"
 msgstr "Ошибка при завершении:\n"
 
-#: pg_backup_archiver.c:1692
+#: pg_backup_archiver.c:1743
 #, c-format
 msgid "Error from TOC entry %d; %u %u %s %s %s\n"
 msgstr "Ошибка из запи�и оглавлени� %d; %u %u %s %s %s\n"
 
-#: pg_backup_archiver.c:1765
+#: pg_backup_archiver.c:1816
 #, c-format
 msgid "bad dumpId\n"
 msgstr "неверный dumpId\n"
 
-#: pg_backup_archiver.c:1786
+#: pg_backup_archiver.c:1837
 #, c-format
 msgid "bad table dumpId for TABLE DATA item\n"
 msgstr "неверный dumpId таблицы в �лементе TABLE DATA\n"
 
-#: pg_backup_archiver.c:1878
+#: pg_backup_archiver.c:1929
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "неожиданный флаг �мещени� данных: %d\n"
 
-#: pg_backup_archiver.c:1891
+#: pg_backup_archiver.c:1942
 #, c-format
 msgid "file offset in dump file is too large\n"
 msgstr "�лишком большое �мещение в файле вывода\n"
 
-#: pg_backup_archiver.c:2004
+#: pg_backup_archiver.c:2055
 #, c-format
 msgid "attempting to ascertain archive format\n"
 msgstr "попытка вы��нить формат архива\n"
 
-#: pg_backup_archiver.c:2030 pg_backup_archiver.c:2040
+#: pg_backup_archiver.c:2081 pg_backup_archiver.c:2091
 #, c-format
 msgid "directory name too long: \"%s\"\n"
 msgstr "�лишком длинное им� каталога: \"%s\"\n"
 
-#: pg_backup_archiver.c:2048
+#: pg_backup_archiver.c:2099
 #, 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:2056 pg_backup_custom.c:181 pg_backup_custom.c:770
-#: pg_backup_directory.c:214 pg_backup_directory.c:402
+#: pg_backup_archiver.c:2107 pg_backup_custom.c:181 pg_backup_custom.c:770
+#: pg_backup_directory.c:214 pg_backup_directory.c:399
 #, c-format
 msgid "could not open input file \"%s\": %s\n"
 msgstr "не удало�ь открыть входной файл \"%s\": %s\n"
 
-#: pg_backup_archiver.c:2064 pg_backup_custom.c:188
+#: pg_backup_archiver.c:2115 pg_backup_custom.c:188
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "не удало�ь открыть входной файл: %s\n"
 
-#: pg_backup_archiver.c:2071
+#: pg_backup_archiver.c:2122
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "не удало�ь прочитать входной файл: %s\n"
 
-#: pg_backup_archiver.c:2073
+#: pg_backup_archiver.c:2124
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "входной файл �лишком короткий (прочитано байт: %lu, ожидало�ь: 5)\n"
 
-#: pg_backup_archiver.c:2156
+#: pg_backup_archiver.c:2207
 #, c-format
 msgid "input file appears to be a text format dump. Please use psql.\n"
 msgstr ""
 "входной файл похоже имеет тек�товый формат. Загрузите его � помощью psql.\n"
 
-#: pg_backup_archiver.c:2162
+#: pg_backup_archiver.c:2213
 #, c-format
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "входной файл не похож на архив (возможно, �лишком мал?)\n"
 
-#: pg_backup_archiver.c:2168
+#: pg_backup_archiver.c:2219
 #, c-format
 msgid "input file does not appear to be a valid archive\n"
 msgstr "входной файл не похож на архив\n"
 
-#: pg_backup_archiver.c:2188
+#: pg_backup_archiver.c:2239
 #, c-format
 msgid "could not close input file: %s\n"
 msgstr "не удало�ь закрыть входной файл: %s\n"
 
-#: pg_backup_archiver.c:2205
+#: pg_backup_archiver.c:2256
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "выделение �труктуры AH дл� %s, формат %d\n"
 
-#: pg_backup_archiver.c:2310
+#: pg_backup_archiver.c:2361
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "неопознанный формат файла: \"%d\"\n"
 
-#: pg_backup_archiver.c:2460
+#: pg_backup_archiver.c:2517
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
 msgstr "ID запи�и %d вне диапазона - возможно повреждено оглавление\n"
 
-#: pg_backup_archiver.c:2576
+#: pg_backup_archiver.c:2633
 #, c-format
 msgid "read TOC entry %d (ID %d) for %s %s\n"
 msgstr "прочитана запи�ь оглавлени� %d (ID %d): %s %s\n"
 
-#: pg_backup_archiver.c:2610
+#: pg_backup_archiver.c:2667
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "нера�познанна� кодировка \"%s\"\n"
 
-#: pg_backup_archiver.c:2615
+#: pg_backup_archiver.c:2672
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "неверный �лемент ENCODING: %s\n"
 
-#: pg_backup_archiver.c:2633
+#: pg_backup_archiver.c:2690
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "неверный �лемент STDSTRINGS: %s\n"
 
-#: pg_backup_archiver.c:2858
+#: pg_backup_archiver.c:2925
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "не удало�ь переключить пользовател� �е��ии на \"%s\": %s"
 
-#: pg_backup_archiver.c:2890
+#: pg_backup_archiver.c:2957
 #, c-format
 msgid "could not set default_with_oids: %s"
 msgstr "не удало�ь у�тановить параметр default_with_oids: %s"
 
-#: pg_backup_archiver.c:3030
+#: pg_backup_archiver.c:3102
 #, c-format
 msgid "could not set search_path to \"%s\": %s"
 msgstr "не удало�ь при�воить search_path значение \"%s\": %s"
 
-#: pg_backup_archiver.c:3092
+#: pg_backup_archiver.c:3164
 #, c-format
 msgid "could not set default_tablespace to %s: %s"
 msgstr "не удало�ь задать дл� default_tablespace значение %s: %s"
 
-#: pg_backup_archiver.c:3179 pg_backup_archiver.c:3366
+#: pg_backup_archiver.c:3251 pg_backup_archiver.c:3445
 #, c-format
 msgid "WARNING: don't know how to set owner for object type %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: неизве�тно, как назначить владельца дл� объекта типа %s\n"
 
-#: pg_backup_archiver.c:3419
-#, c-format
-msgid ""
-"WARNING: requested compression not available in this installation -- archive "
-"will be uncompressed\n"
-msgstr ""
-"ПРЕДУПРЕЖДЕ�ИЕ: у�тановленна� вер�и� программы не поддерживает �жатие -- "
-"архив не будет �жимать��\n"
-
-#: pg_backup_archiver.c:3458
+#: pg_backup_archiver.c:3528
 #, c-format
 msgid "did not find magic string in file header\n"
 msgstr "в файле заголовка не найдена магиче�ка� �трока\n"
 
-#: pg_backup_archiver.c:3471
+#: pg_backup_archiver.c:3541
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "неподдерживаема� вер�и� (%d.%d) в заголовке файла\n"
 
-#: pg_backup_archiver.c:3476
+#: pg_backup_archiver.c:3546
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "не�оответ�твие размера integer (%lu)\n"
 
-#: pg_backup_archiver.c:3480
+#: pg_backup_archiver.c:3550
 #, c-format
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
@@ -876,12 +850,12 @@
 "ПРЕДУПРЕЖДЕ�ИЕ: архив был �делан на компьютере большей разр�дно�ти -- "
 "возможен �бой некоторых операций\n"
 
-#: pg_backup_archiver.c:3490
+#: pg_backup_archiver.c:3560
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr "ожидаемый формат (%d) отличает�� от формата, указанного в файле (%d)\n"
 
-#: pg_backup_archiver.c:3506
+#: pg_backup_archiver.c:3576
 #, c-format
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
@@ -890,87 +864,87 @@
 "ПРЕДУПРЕЖДЕ�ИЕ: архив �жат, но у�тановленна� вер�и� не поддерживает �жатие "
 "-- данные недо�тупны\n"
 
-#: pg_backup_archiver.c:3524
+#: pg_backup_archiver.c:3594
 #, c-format
 msgid "WARNING: invalid creation date in header\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: неверна� дата �оздани� в заголовке\n"
 
-#: pg_backup_archiver.c:3599
+#: pg_backup_archiver.c:3669
 #, c-format
 msgid "entering restore_toc_entries_prefork\n"
 msgstr "вход в restore_toc_entries_prefork\n"
 
-#: pg_backup_archiver.c:3643
+#: pg_backup_archiver.c:3713
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "обработка объекта %d %s %s\n"
 
-#: pg_backup_archiver.c:3695
+#: pg_backup_archiver.c:3765
 #, c-format
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "вход в restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3743
+#: pg_backup_archiver.c:3813
 #, c-format
 msgid "entering main parallel loop\n"
 msgstr "вход в о�новной параллельный цикл\n"
 
-#: pg_backup_archiver.c:3754
+#: pg_backup_archiver.c:3824
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "объект %d %s %s пропу�кает��\n"
 
-#: pg_backup_archiver.c:3764
+#: pg_backup_archiver.c:3834
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "объект %d %s %s запу�кает��\n"
 
-#: pg_backup_archiver.c:3822
+#: pg_backup_archiver.c:3890
 #, c-format
 msgid "finished main parallel loop\n"
 msgstr "о�новной параллельный цикл закончен\n"
 
-#: pg_backup_archiver.c:3831
+#: pg_backup_archiver.c:3899
 #, c-format
 msgid "entering restore_toc_entries_postfork\n"
 msgstr "вход в restore_toc_entries_postfork\n"
 
-#: pg_backup_archiver.c:3849
+#: pg_backup_archiver.c:3918
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "обработка пропущенного объекта %d %s %s\n"
 
-#: pg_backup_archiver.c:3998
+#: pg_backup_archiver.c:4067
 #, c-format
 msgid "no item ready\n"
 msgstr "�лемент не готов\n"
 
-#: pg_backup_archiver.c:4047
+#: pg_backup_archiver.c:4115
 #, c-format
 msgid "could not find slot of finished worker\n"
 msgstr "не удало�ь найти �лот законченного рабочего объекта\n"
 
-#: pg_backup_archiver.c:4049
+#: pg_backup_archiver.c:4117
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "закончен объект %d %s %s\n"
 
-#: pg_backup_archiver.c:4062
+#: pg_backup_archiver.c:4130
 #, c-format
 msgid "worker process failed: exit code %d\n"
 msgstr "рабочий проце�� завершил�� � кодом возврата %d\n"
 
-#: pg_backup_archiver.c:4224
+#: pg_backup_archiver.c:4292
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "переключение зави�имо�ти %d -> %d на %d\n"
 
-#: pg_backup_archiver.c:4297
+#: pg_backup_archiver.c:4365
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "уменьшение зави�имо�тей дл� %d\n"
 
-#: pg_backup_archiver.c:4336
+#: pg_backup_archiver.c:4404
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data\n"
 msgstr "�оздать таблицу \"%s\" не удало�ь, её данные не будут во��тановлены\n"
@@ -1076,104 +1050,124 @@
 "ftell\n"
 
 #. translator: this is a module name
-#: pg_backup_db.c:29
+#: pg_backup_db.c:30
 msgid "archiver (db)"
 msgstr "архиватор (БД)"
 
-#: pg_backup_db.c:44
+#: pg_backup_db.c:46
 #, c-format
 msgid "could not get server_version from libpq\n"
 msgstr "не удало�ь получить вер�ию �ервера из libpq\n"
 
-#: pg_backup_db.c:55 pg_dumpall.c:1965
+#: pg_backup_db.c:57 pg_dumpall.c:1972
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "вер�и� �ервера: %s; вер�и� %s: %s\n"
 
-#: pg_backup_db.c:57 pg_dumpall.c:1967
+#: pg_backup_db.c:59 pg_dumpall.c:1974
 #, c-format
 msgid "aborting because of server version mismatch\n"
 msgstr "продолжение работы � другой вер�ией �ервера невозможно\n"
 
-#: pg_backup_db.c:128
+#: pg_backup_db.c:148
 #, c-format
 msgid "connecting to database \"%s\" as user \"%s\"\n"
 msgstr "подключение к базе \"%s\" � именем пользовател� \"%s\"\n"
 
-#: pg_backup_db.c:135 pg_backup_db.c:183 pg_backup_db.c:243 pg_backup_db.c:285
-#: pg_dumpall.c:1795 pg_dumpall.c:1903
+#: pg_backup_db.c:155 pg_backup_db.c:207 pg_backup_db.c:269 pg_backup_db.c:311
+#: pg_dumpall.c:1798 pg_dumpall.c:1910
 msgid "Password: "
 msgstr "Пароль: "
 
-#: pg_backup_db.c:164
+#: pg_backup_db.c:188
 #, c-format
 msgid "failed to reconnect to database\n"
 msgstr "ошибка переподключени� к базе данных\n"
 
-#: pg_backup_db.c:169
+#: pg_backup_db.c:193
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "не удало�ь переподключить�� к базе: %s"
 
-#: pg_backup_db.c:185
+#: pg_backup_db.c:209
 #, c-format
 msgid "connection needs password\n"
 msgstr "дл� подключени� необходим пароль\n"
 
-#: pg_backup_db.c:237
+#: pg_backup_db.c:263
 #, c-format
 msgid "already connected to a database\n"
 msgstr "подключение к базе данных уже у�тановлено\n"
 
-#: pg_backup_db.c:277
+#: pg_backup_db.c:303
 #, c-format
 msgid "failed to connect to database\n"
 msgstr "ошибка подключени� к базе данных\n"
 
-#: pg_backup_db.c:294
+#: pg_backup_db.c:320
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "не удало�ь подключить�� к базе \"%s\": %s"
 
-#: pg_backup_db.c:362
+#: pg_backup_db.c:390
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pg_backup_db.c:397
 #, c-format
 msgid "query failed: %s"
 msgstr "ошибка при выполнении запро�а: %s"
 
-#: pg_backup_db.c:364
+#: pg_backup_db.c:399
 #, c-format
 msgid "query was: %s\n"
 msgstr "запро�: %s\n"
 
-#: pg_backup_db.c:428
+#: pg_backup_db.c:441
+#, 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] "запро� вернул %d �троку вме�то одной: %s\n"
+msgstr[1] "запро� вернул %d �троки вме�то одной: %s\n"
+msgstr[2] "запро� вернул %d �трок вме�то одной: %s\n"
+
+#: pg_backup_db.c:486
 #, c-format
 msgid "%s: %s    Command was: %s\n"
 msgstr "%s: %s    Выполн�ла�ь команда: %s\n"
 
-#: pg_backup_db.c:484 pg_backup_db.c:558 pg_backup_db.c:565
+#: pg_backup_db.c:542 pg_backup_db.c:616 pg_backup_db.c:623
 msgid "could not execute query"
 msgstr "не удало�ь выполнить запро�"
 
-#: pg_backup_db.c:537
+#: pg_backup_db.c:595
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "ошибка в PQputCopyData: %s"
 
-#: pg_backup_db.c:586
+#: pg_backup_db.c:644
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "ошибка в PQputCopyEnd: %s"
 
-#: pg_backup_db.c:592
+#: pg_backup_db.c:650
 #, c-format
 msgid "COPY failed for table \"%s\": %s"
 msgstr "�бой команды COPY дл� таблицы \"%s\": %s"
 
-#: pg_backup_db.c:605
+#: pg_backup_db.c:656 pg_dump.c:1700
+#, c-format
+msgid "WARNING: unexpected extra results during COPY of table \"%s\"\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕ�ИЕ: неожиданные лишние результаты получены при COPY дл� таблицы "
+"\"%s\"\n"
+
+#: pg_backup_db.c:668
 msgid "could not start database transaction"
 msgstr "не удаёт�� начать транзакцию"
 
-#: pg_backup_db.c:613
+#: pg_backup_db.c:676
 msgid "could not commit database transaction"
 msgstr "не удало�ь зафик�ировать транзакцию"
 
@@ -1202,43 +1196,43 @@
 msgid "could not create directory \"%s\": %s\n"
 msgstr "�оздать каталог \"%s\" не удало�ь: %s\n"
 
-#: pg_backup_directory.c:413
+#: pg_backup_directory.c:412
 #, c-format
 msgid "could not close data file: %s\n"
 msgstr "не удало�ь закрыть файл данных: %s\n"
 
-#: pg_backup_directory.c:454
+#: pg_backup_directory.c:453
 #, c-format
 msgid "could not open large object TOC file \"%s\" for input: %s\n"
 msgstr ""
 "не удало�ь открыть дл� чтени� файл оглавлени� больших объектов \"%s\": %s\n"
 
-#: pg_backup_directory.c:465
+#: pg_backup_directory.c:464
 #, c-format
 msgid "invalid line in large object TOC file \"%s\": \"%s\"\n"
 msgstr "неверна� �трока в файле оглавлени� больших объектов \"%s\": \"%s\"\n"
 
-#: pg_backup_directory.c:474
+#: pg_backup_directory.c:473
 #, c-format
 msgid "error reading large object TOC file \"%s\"\n"
 msgstr "ошибка чтени� файла оглавлени� больших объектов \"%s\"\n"
 
-#: pg_backup_directory.c:478
+#: pg_backup_directory.c:477
 #, c-format
 msgid "could not close large object TOC file \"%s\": %s\n"
 msgstr "не удало�ь закрыть файл оглавлени� больших объектов \"%s\": %s\n"
 
-#: pg_backup_directory.c:688
+#: pg_backup_directory.c:684
 #, c-format
 msgid "could not write to blobs TOC file\n"
 msgstr "не удало�ь запи�ать в файл оглавлени� больших объектов\n"
 
-#: pg_backup_directory.c:720
+#: pg_backup_directory.c:716
 #, c-format
 msgid "file name too long: \"%s\"\n"
 msgstr "�лишком длинное им� файла: \"%s\"\n"
 
-#: pg_backup_directory.c:806
+#: pg_backup_directory.c:802
 #, c-format
 msgid "error during backup\n"
 msgstr "ошибка в проце��е резервного копировани�\n"
@@ -1361,6 +1355,7 @@
 msgstr[1] "найден неполный tar-заголовок (размер %lu байта)\n"
 msgstr[2] "найден неполный tar-заголовок (размер %lu байтов)\n"
 
+# skip-rule: capital-letter-first
 #: pg_backup_tar.c:1275
 #, c-format
 msgid "TOC Entry %s at %s (length %s, checksum %d)\n"
@@ -1379,73 +1374,77 @@
 msgid "%s: unrecognized section name: \"%s\"\n"
 msgstr "%s: нера�познанное им� раздела: \"%s\"\n"
 
-#: pg_backup_utils.c:56 pg_dump.c:524 pg_dump.c:541 pg_dumpall.c:300
-#: pg_dumpall.c:310 pg_dumpall.c:320 pg_dumpall.c:329 pg_dumpall.c:345
-#: pg_dumpall.c:403 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
+#: pg_backup_utils.c:56 pg_dump.c:526 pg_dump.c:543 pg_dumpall.c:298
+#: pg_dumpall.c:308 pg_dumpall.c:318 pg_dumpall.c:327 pg_dumpall.c:343
+#: pg_dumpall.c:401 pg_restore.c:277 pg_restore.c:293 pg_restore.c:305
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Дл� дополнительной информации попробуйте \"%s --help\".\n"
 
-#: pg_backup_utils.c:101
+#: pg_backup_utils.c:118
 #, c-format
 msgid "out of on_exit_nicely slots\n"
 msgstr "превышен предел обработчиков штатного выхода\n"
 
-#: pg_dump.c:494
+#: pg_dump.c:496
 #, c-format
 msgid "compression level must be in range 0..9\n"
 msgstr "уровень �жати� должен быть в диапазоне 0..9\n"
 
-#: pg_dump.c:539 pg_dumpall.c:308 pg_restore.c:291
+#: pg_dump.c:541 pg_dumpall.c:306 pg_restore.c:291
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: �лишком много аргументов командной �троки (первый: \"%s\")\n"
 
-#: pg_dump.c:552
+#: pg_dump.c:554
 #, c-format
 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:558
+#: pg_dump.c:560
 #, c-format
 msgid "options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "параметры -c/--clean и -a/--data-only и�ключают друг друга\n"
 
-#: pg_dump.c:564
+#: pg_dump.c:566
 #, c-format
 msgid ""
 "options --inserts/--column-inserts and -o/--oids cannot be used together\n"
 msgstr ""
 "параметры --inserts/--column-inserts и -o/--oids и�ключают друг друга\n"
 
-#: pg_dump.c:565
+#: pg_dump.c:567
 #, c-format
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(В INSERT нельз� определ�ть OID.)\n"
 
-#: pg_dump.c:570
+#: pg_dump.c:572
 #, c-format
 msgid "option --if-exists requires option -c/--clean\n"
 msgstr "параметру --if-exists требует�� параметр -c/--clean\n"
 
-#: pg_dump.c:598
+#: pg_dump.c:594
 #, c-format
-msgid "%s: invalid number of parallel jobs\n"
-msgstr "%s: неверное чи�ло параллельных заданий\n"
+msgid ""
+"WARNING: requested compression not available in this installation -- archive "
+"will be uncompressed\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕ�ИЕ: у�тановленна� вер�и� программы не поддерживает �жатие -- "
+"архив не будет �жимать��\n"
+
+#: pg_dump.c:609
+#, c-format
+msgid "invalid number of parallel jobs\n"
+msgstr "неверное чи�ло параллельных заданий\n"
 
-#: pg_dump.c:602
+#: pg_dump.c:613
 #, c-format
 msgid "parallel backup only supported by the directory format\n"
 msgstr ""
 "параллельное резервное копирование поддерживает�� только � форматом \"каталог"
 "\"\n"
 
-#: pg_dump.c:615
-#, c-format
-msgid "could not open output file \"%s\" for writing\n"
-msgstr "не удало�ь открыть выходной файл \"%s\"  дл� запи�и\n"
-
-#: pg_dump.c:674
+#: pg_dump.c:670
 #, c-format
 msgid ""
 "Synchronized snapshots are not supported by this server version.\n"
@@ -1456,27 +1455,27 @@
 "Е�ли они вам не нужны, укажите при запу�ке ключ\n"
 "--no-synchronized-snapshots.\n"
 
-#: pg_dump.c:681
+#: pg_dump.c:677
 #, c-format
 msgid "Exported snapshots are not supported by this server version.\n"
 msgstr "Эк�портированные �нимки не поддерживают�� �той вер�ией �ервера.\n"
 
-#: pg_dump.c:692
+#: pg_dump.c:696
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "по�ледний �и�темный OID: %u\n"
 
-#: pg_dump.c:701
+#: pg_dump.c:704
 #, c-format
 msgid "No matching schemas were found\n"
 msgstr "Соответ�твующие �хемы не найдены\n"
 
-#: pg_dump.c:713
+#: pg_dump.c:716
 #, c-format
 msgid "No matching tables were found\n"
 msgstr "Соответ�твующие таблицы не найдены\n"
 
-#: pg_dump.c:870
+#: pg_dump.c:882
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -1485,17 +1484,17 @@
 "%s �охран�ет резервную копию БД в тек�товом файле или другом виде.\n"
 "\n"
 
-#: pg_dump.c:871 pg_dumpall.c:548 pg_restore.c:434
+#: pg_dump.c:883 pg_dumpall.c:546 pg_restore.c:440
 #, c-format
 msgid "Usage:\n"
 msgstr "И�пользование:\n"
 
-#: pg_dump.c:872
+#: pg_dump.c:884
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [П�Р�МЕТР]... [ИМЯ_БД]\n"
 
-#: pg_dump.c:874 pg_dumpall.c:551 pg_restore.c:437
+#: pg_dump.c:886 pg_dumpall.c:549 pg_restore.c:443
 #, c-format
 msgid ""
 "\n"
@@ -1504,12 +1503,12 @@
 "\n"
 "Общие параметры:\n"
 
-#: pg_dump.c:875
+#: pg_dump.c:887
 #, c-format
 msgid "  -f, --file=FILENAME          output file or directory name\n"
 msgstr "  -f, --file=ИМЯ               им� выходного файла или каталога\n"
 
-#: pg_dump.c:876
+#: pg_dump.c:888
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p         output file format (custom, directory, tar,\n"
@@ -1519,7 +1518,7 @@
 "                               (пользователь�кий | каталог | tar |\n"
 "                               тек�товый (по умолчанию))\n"
 
-#: pg_dump.c:878
+#: pg_dump.c:890
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to dump\n"
 msgstr ""
@@ -1527,23 +1526,23 @@
 "чи�ло\n"
 "                               заданий\n"
 
-#: pg_dump.c:879
+#: pg_dump.c:891 pg_dumpall.c:551
 #, c-format
 msgid "  -v, --verbose                verbose mode\n"
 msgstr "  -v, --verbose                режим подробных �ообщений\n"
 
-#: pg_dump.c:880 pg_dumpall.c:553
+#: pg_dump.c:892 pg_dumpall.c:552
 #, c-format
 msgid "  -V, --version                output version information, then exit\n"
 msgstr "  -V, --version                показать вер�ию и выйти\n"
 
-#: pg_dump.c:881
+#: pg_dump.c:893
 #, c-format
 msgid ""
 "  -Z, --compress=0-9           compression level for compressed formats\n"
 msgstr "  -Z, --compress=0-9           уровень �жати� при архивации\n"
 
-#: pg_dump.c:882 pg_dumpall.c:554
+#: pg_dump.c:894 pg_dumpall.c:553
 #, c-format
 msgid ""
 "  --lock-wait-timeout=TIMEOUT  fail after waiting TIMEOUT for a table lock\n"
@@ -1551,12 +1550,12 @@
 "  --lock-wait-timeout=Т�ЙМ�УТ  прервать операцию при таймауте блокировки "
 "таблицы\n"
 
-#: pg_dump.c:883 pg_dumpall.c:555
+#: pg_dump.c:895 pg_dumpall.c:554
 #, c-format
 msgid "  -?, --help                   show this help, then exit\n"
 msgstr "  -?, --help                   показать �ту �правку и выйти\n"
 
-#: pg_dump.c:885 pg_dumpall.c:556
+#: pg_dump.c:897 pg_dumpall.c:555
 #, c-format
 msgid ""
 "\n"
@@ -1565,17 +1564,17 @@
 "\n"
 "Параметры, управл�ющие выводом:\n"
 
-#: pg_dump.c:886 pg_dumpall.c:557
+#: pg_dump.c:898 pg_dumpall.c:556
 #, c-format
 msgid "  -a, --data-only              dump only the data, not the schema\n"
 msgstr "  -a, --data-only              выгрузить только данные, без �хемы\n"
 
-#: pg_dump.c:887
+#: pg_dump.c:899
 #, c-format
 msgid "  -b, --blobs                  include large objects in dump\n"
 msgstr "  -b, --blobs                  выгрузить также большие объекты\n"
 
-#: pg_dump.c:888 pg_restore.c:448
+#: pg_dump.c:900 pg_restore.c:454
 #, c-format
 msgid ""
 "  -c, --clean                  clean (drop) database objects before "
@@ -1584,7 +1583,7 @@
 "  -c, --clean                  очи�тить (удалить) объекты БД при "
 "во��тановлении\n"
 
-#: pg_dump.c:889
+#: pg_dump.c:901
 #, c-format
 msgid ""
 "  -C, --create                 include commands to create database in dump\n"
@@ -1592,27 +1591,27 @@
 "  -C, --create                 добавить в копию команды �оздани� базы "
 "данных\n"
 
-#: pg_dump.c:890
+#: pg_dump.c:902
 #, c-format
 msgid "  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=КОДИРОВК�     выгружать данные в заданной кодировке\n"
 
-#: pg_dump.c:891
+#: pg_dump.c:903
 #, c-format
 msgid "  -n, --schema=SCHEMA          dump the named schema(s) only\n"
 msgstr "  -n, --schema=СХЕМ�           выгрузить только указанную �хему(ы)\n"
 
-#: pg_dump.c:892
+#: pg_dump.c:904
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA  do NOT dump the named schema(s)\n"
 msgstr "  -N, --exclude-schema=СХЕМ�   �Е выгружать указанную �хему(ы)\n"
 
-#: pg_dump.c:893 pg_dumpall.c:560
+#: pg_dump.c:905 pg_dumpall.c:559
 #, c-format
 msgid "  -o, --oids                   include OIDs in dump\n"
 msgstr "  -o, --oids                   выгружать данные � OID\n"
 
-#: pg_dump.c:894
+#: pg_dump.c:906
 #, c-format
 msgid ""
 "  -O, --no-owner               skip restoration of object ownership in\n"
@@ -1621,12 +1620,12 @@
 "  -O, --no-owner               не во��танавливать владение объектами\n"
 "                               при и�пользовании тек�тового формата\n"
 
-#: pg_dump.c:896 pg_dumpall.c:563
+#: pg_dump.c:908 pg_dumpall.c:562
 #, c-format
 msgid "  -s, --schema-only            dump only the schema, no data\n"
 msgstr "  -s, --schema-only            выгрузить только �хему, без данных\n"
 
-#: pg_dump.c:897
+#: pg_dump.c:909
 #, c-format
 msgid ""
 "  -S, --superuser=NAME         superuser user name to use in plain-text "
@@ -1635,27 +1634,27 @@
 "  -S, --superuser=ИМЯ          им� пользовател�, который будет задей�твован\n"
 "                               при во��тановлении из тек�тового формата\n"
 
-#: pg_dump.c:898
+#: pg_dump.c:910
 #, c-format
 msgid "  -t, --table=TABLE            dump the named table(s) only\n"
 msgstr "  -t, --table=Т�БЛИЦ�          выгрузить только указанную таблицу(ы)\n"
 
-#: pg_dump.c:899
+#: pg_dump.c:911
 #, c-format
 msgid "  -T, --exclude-table=TABLE    do NOT dump the named table(s)\n"
 msgstr "  -T, --exclude-table=Т�БЛИЦ�  �Е выгружать указанную таблицу(ы)\n"
 
-#: pg_dump.c:900 pg_dumpall.c:566
+#: pg_dump.c:912 pg_dumpall.c:565
 #, c-format
 msgid "  -x, --no-privileges          do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          не выгружать права (назначение/отзыв)\n"
 
-#: pg_dump.c:901 pg_dumpall.c:567
+#: pg_dump.c:913 pg_dumpall.c:566
 #, c-format
 msgid "  --binary-upgrade             for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade             только дл� утилит обновлени� БД\n"
 
-#: pg_dump.c:902 pg_dumpall.c:568
+#: pg_dump.c:914 pg_dumpall.c:567
 #, c-format
 msgid ""
 "  --column-inserts             dump data as INSERT commands with column "
@@ -1664,7 +1663,7 @@
 "  --column-inserts             выгружать данные в виде INSERT � именами "
 "�толбцов\n"
 
-#: pg_dump.c:903 pg_dumpall.c:569
+#: pg_dump.c:915 pg_dumpall.c:568
 #, c-format
 msgid ""
 "  --disable-dollar-quoting     disable dollar quoting, use SQL standard "
@@ -1673,7 +1672,7 @@
 "  --disable-dollar-quoting     отключить �пец�троки � $, выводить �троки\n"
 "                               по �тандарту SQL\n"
 
-#: pg_dump.c:904 pg_dumpall.c:570 pg_restore.c:464
+#: pg_dump.c:916 pg_dumpall.c:569 pg_restore.c:470
 #, c-format
 msgid ""
 "  --disable-triggers           disable triggers during data-only restore\n"
@@ -1681,7 +1680,7 @@
 "  --disable-triggers           отключить триггеры при во��тановлении\n"
 "                               только данных, без �хемы\n"
 
-#: pg_dump.c:905
+#: pg_dump.c:917
 #, c-format
 msgid ""
 "  --enable-row-security        enable row security (dump only content user "
@@ -1692,19 +1691,19 @@
 "только\n"
 "                               те данные, которые до�тупны пользователю)\n"
 
-#: pg_dump.c:907
+#: pg_dump.c:919
 #, c-format
 msgid ""
 "  --exclude-table-data=TABLE   do NOT dump data for the named table(s)\n"
 msgstr "  --exclude-table-data=Т�БЛИЦ� �Е выгружать указанную таблицу(ы)\n"
 
-#: pg_dump.c:908 pg_dumpall.c:571 pg_restore.c:466
+#: pg_dump.c:920 pg_dumpall.c:570 pg_restore.c:472
 #, c-format
 msgid "  --if-exists                  use IF EXISTS when dropping objects\n"
 msgstr ""
 "  --if-exists                  примен�ть IF EXISTS при удалении объектов\n"
 
-#: pg_dump.c:909 pg_dumpall.c:572
+#: pg_dump.c:921 pg_dumpall.c:571
 #, c-format
 msgid ""
 "  --inserts                    dump data as INSERT commands, rather than "
@@ -1713,13 +1712,13 @@
 "  --inserts                    выгрузить данные в виде команд INSERT, не "
 "COPY\n"
 
-#: pg_dump.c:910 pg_dumpall.c:573
+#: pg_dump.c:922 pg_dumpall.c:572
 #, c-format
 msgid "  --no-security-labels         do not dump security label assignments\n"
 msgstr ""
 "  --no-security-labels         не выгружать назначени� меток безопа�но�ти\n"
 
-#: pg_dump.c:911
+#: pg_dump.c:923
 #, c-format
 msgid ""
 "  --no-synchronized-snapshots  do not use synchronized snapshots in parallel "
@@ -1728,20 +1727,20 @@
 "  --no-synchronized-snapshots  не и�пользовать �инхронизированные �нимки\n"
 "                               в параллельных задани�х\n"
 
-#: pg_dump.c:912 pg_dumpall.c:574
+#: pg_dump.c:924 pg_dumpall.c:573
 #, c-format
 msgid "  --no-tablespaces             do not dump tablespace assignments\n"
 msgstr ""
 "  --no-tablespaces             не выгружать назначени� табличных "
 "про�тран�тв\n"
 
-#: pg_dump.c:913 pg_dumpall.c:575
+#: pg_dump.c:925 pg_dumpall.c:574
 #, c-format
 msgid "  --no-unlogged-table-data     do not dump unlogged table data\n"
 msgstr ""
 "  --no-unlogged-table-data     не выгружать данные нежурналируемых таблиц\n"
 
-#: pg_dump.c:914 pg_dumpall.c:576
+#: pg_dump.c:926 pg_dumpall.c:575
 #, c-format
 msgid ""
 "  --quote-all-identifiers      quote all identifiers, even if not key words\n"
@@ -1749,7 +1748,7 @@
 "  --quote-all-identifiers      заключать в кавычки в�е идентификаторы,\n"
 "                               а не только ключевые �лова\n"
 
-#: pg_dump.c:915
+#: pg_dump.c:927
 #, c-format
 msgid ""
 "  --section=SECTION            dump named section (pre-data, data, or post-"
@@ -1758,7 +1757,7 @@
 "  --section=Р�ЗДЕЛ             выгрузить заданный раздел\n"
 "                               (pre-data, data или post-data)\n"
 
-#: pg_dump.c:916
+#: pg_dump.c:928
 #, c-format
 msgid ""
 "  --serializable-deferrable    wait until the dump can run without "
@@ -1767,13 +1766,13 @@
 "  --serializable-deferrable    дождать�� момента дл� выгрузки данных без "
 "аномалий\n"
 
-#: pg_dump.c:917
+#: pg_dump.c:929
 #, c-format
 msgid "  --snapshot=SNAPSHOT          use given snapshot for the dump\n"
 msgstr ""
 "  --snapshot=С�ИМОК            и�пользовать при выгрузке заданный �нимок\n"
 
-#: pg_dump.c:918 pg_dumpall.c:577 pg_restore.c:472
+#: pg_dump.c:930 pg_dumpall.c:576 pg_restore.c:478
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1785,7 +1784,7 @@
 "                               у�танавливать владельца, и�пользу� команды\n"
 "                               SET SESSION AUTHORIZATION вме�то ALTER OWNER\n"
 
-#: pg_dump.c:922 pg_dumpall.c:581 pg_restore.c:476
+#: pg_dump.c:934 pg_dumpall.c:580 pg_restore.c:482
 #, c-format
 msgid ""
 "\n"
@@ -1794,33 +1793,33 @@
 "\n"
 "Параметры подключени�:\n"
 
-#: pg_dump.c:923
+#: pg_dump.c:935
 #, c-format
 msgid "  -d, --dbname=DBNAME      database to dump\n"
 msgstr "  -d, --dbname=БД          им� базы данных дл� выгрузки\n"
 
-#: pg_dump.c:924 pg_dumpall.c:583 pg_restore.c:477
+#: pg_dump.c:936 pg_dumpall.c:582 pg_restore.c:483
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=ИМЯ           им� �ервера баз данных или каталог �окетов\n"
 
-#: pg_dump.c:925 pg_dumpall.c:585 pg_restore.c:478
+#: pg_dump.c:937 pg_dumpall.c:584 pg_restore.c:484
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=ПОРТ          номер порта �ервера БД\n"
 
-#: pg_dump.c:926 pg_dumpall.c:586 pg_restore.c:479
+#: pg_dump.c:938 pg_dumpall.c:585 pg_restore.c:485
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=ИМЯ       им� пользовател� баз данных\n"
 
-#: pg_dump.c:927 pg_dumpall.c:587 pg_restore.c:480
+#: pg_dump.c:939 pg_dumpall.c:586 pg_restore.c:486
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        не запрашивать пароль\n"
 
-#: pg_dump.c:928 pg_dumpall.c:588 pg_restore.c:481
+#: pg_dump.c:940 pg_dumpall.c:587 pg_restore.c:487
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -1828,12 +1827,12 @@
 msgstr ""
 "  -W, --password           запрашивать пароль в�егда (обычно не требует��)\n"
 
-#: pg_dump.c:929 pg_dumpall.c:589
+#: pg_dump.c:941 pg_dumpall.c:588
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=ИМЯ_РОЛИ          выполнить SET ROLE перед выгрузкой\n"
 
-#: pg_dump.c:931
+#: pg_dump.c:943
 #, c-format
 msgid ""
 "\n"
@@ -1846,180 +1845,191 @@
 "PGDATABASE.\n"
 "\n"
 
-#: pg_dump.c:933 pg_dumpall.c:593 pg_restore.c:488
+#: pg_dump.c:945 pg_dumpall.c:592 pg_restore.c:494
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Об ошибках �ообщайте по адре�у <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:953
+#: pg_dump.c:962
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
 msgstr "указана неверна� клиент�ка� кодировка \"%s\"\n"
 
-#: pg_dump.c:1138
+#: pg_dump.c:1102
+#, c-format
+msgid ""
+"Synchronized snapshots are not supported on standby servers.\n"
+"Run with --no-synchronized-snapshots instead if you do not need\n"
+"synchronized snapshots.\n"
+msgstr ""
+"�а резервных �ерверах �инхронизированные �нимки не поддерживают��.\n"
+"Е�ли они вам не нужны, укажите при запу�ке ключ\n"
+"--no-synchronized-snapshots.\n"
+
+#: pg_dump.c:1171
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
 msgstr "указан неверный формат вывода: \"%s\"\n"
 
-#: pg_dump.c:1160
+#: pg_dump.c:1193
 #, c-format
 msgid "server version must be at least 7.3 to use schema selection switches\n"
 msgstr ""
 "дл� и�пользовани� параметров выбора �хемы нужен �ервер вер�ии 7.3 или новее\n"
 
-#: pg_dump.c:1524
+#: pg_dump.c:1557
 #, c-format
 msgid "dumping contents of table \"%s.%s\"\n"
 msgstr "выгрузка �одержимого таблицы \"%s.%s\"\n"
 
-#: pg_dump.c:1648
+#: pg_dump.c:1681
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
 msgstr "Ошибка выгрузки таблицы \"%s\": �бой в PQendcopy().\n"
 
-#: pg_dump.c:1649 pg_dump.c:1659
+#: pg_dump.c:1682 pg_dump.c:1692
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Сообщение об ошибке � �ервера: %s"
 
-#: pg_dump.c:1650 pg_dump.c:1660
+#: pg_dump.c:1683 pg_dump.c:1693
 #, c-format
 msgid "The command was: %s\n"
 msgstr "Выполн�ла�ь команда: %s\n"
 
-#: pg_dump.c:1658
+#: pg_dump.c:1691
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed.\n"
 msgstr "Ошибка выгрузки таблицы \"%s\": �бой в PQgetResult().\n"
 
-#: pg_dump.c:2300
+#: pg_dump.c:2338
 #, c-format
 msgid "saving database definition\n"
 msgstr "�охранение определени� базы данных\n"
 
-#: pg_dump.c:2633
+#: pg_dump.c:2672
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "�охранение кодировки (%s)\n"
 
-#: pg_dump.c:2660
+#: pg_dump.c:2699
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "�охранение standard_conforming_strings (%s)\n"
 
-#: pg_dump.c:2693
+#: pg_dump.c:2732
 #, c-format
 msgid "reading large objects\n"
 msgstr "чтение больших объектов\n"
 
-#: pg_dump.c:2825
+#: pg_dump.c:2877
 #, c-format
 msgid "saving large objects\n"
 msgstr "�охранение больших объектов\n"
 
-#: pg_dump.c:2872
+#: pg_dump.c:2924
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "ошибка чтени� большого объекта %u: %s"
 
-#: pg_dump.c:2924
+#: pg_dump.c:2976
 #, c-format
 msgid "reading row security enabled for table \"%s.%s\"\n"
 msgstr "чтение информации о защите �трок дл� таблицы \"%s.%s\"\n"
 
-#: pg_dump.c:2955
+#: pg_dump.c:3007
 #, c-format
 msgid "reading policies for table \"%s.%s\"\n"
 msgstr "чтение политик таблицы \"%s.%s\"\n"
 
-#: pg_dump.c:3086
+#: pg_dump.c:3138
 #, c-format
 msgid "unexpected policy command type: \"%s\"\n"
 msgstr "нера�познанный тип команды в политике: \"%s\"\n"
 
-#: pg_dump.c:3301
+#: pg_dump.c:3353
 #, c-format
 msgid "could not find parent extension for %s\n"
 msgstr "не удало�ь найти родитель�кое ра�ширение дл� %s\n"
 
 # TO REVIEW
-#: pg_dump.c:3405
+#: pg_dump.c:3457
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: у �хемы \"%s\" по-видимому неправильный владелец\n"
 
-#: pg_dump.c:3448
+#: pg_dump.c:3500
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "�хема � OID %u не �уще�твует\n"
 
-#: pg_dump.c:3800
+#: pg_dump.c:3852
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: у типа данных \"%s\" по-видимому неправильный владелец\n"
 
-#: pg_dump.c:3912
+#: pg_dump.c:3964
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: у оператора \"%s\" по-видимому неправильный владелец\n"
 
-#: pg_dump.c:4174
+#: pg_dump.c:4226
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: у кла��а операторов \"%s\" по-видимому неправильный "
 "владелец\n"
 
-#: pg_dump.c:4263
+#: pg_dump.c:4315
 #, c-format
 msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: у �емей�тва операторов \"%s\" по-видимому неправильный "
 "владелец\n"
 
-#: pg_dump.c:4402
+#: pg_dump.c:4454
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: у агрегатной функции \"%s\" по-видимому неправильный "
 "владелец\n"
 
-#: pg_dump.c:4585
+#: pg_dump.c:4657
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: у функции \"%s\" по-видимому неправильный владелец\n"
 
-#: pg_dump.c:5273
+#: pg_dump.c:5345
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: у таблицы \"%s\" по-видимому неправильный владелец\n"
 
-#: pg_dump.c:5425
+#: pg_dump.c:5497
 #, c-format
 msgid "reading indexes for table \"%s.%s\"\n"
 msgstr "чтение индек�ов таблицы \"%s.%s\"\n"
 
-#: pg_dump.c:5792
+#: pg_dump.c:5864
 #, c-format
 msgid "reading foreign key constraints for table \"%s.%s\"\n"
 msgstr "чтение ограничений внешних ключей таблицы \"%s.%s\"\n"
 
-#: pg_dump.c:6038
+#: pg_dump.c:6110
 #, c-format
 msgid ""
 "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
 "found\n"
 msgstr ""
-"по OID %u не удало�ь найти родитель�кую таблицу дл� запи�и pg_rewrite � OID "
-"%u\n"
+"нарушение цело�тно�ти: по OID %u не удало�ь найти родитель�кую таблицу дл� "
+"запи�и pg_rewrite � OID %u\n"
 
-#: pg_dump.c:6131
+#: pg_dump.c:6203
 #, c-format
 msgid "reading triggers for table \"%s.%s\"\n"
 msgstr "чтение триггеров таблицы \"%s.%s\"\n"
 
-#: pg_dump.c:6293
+#: pg_dump.c:6368
 #, c-format
 msgid ""
 "query produced null referenced table name for foreign key trigger \"%s\" on "
@@ -2028,32 +2038,32 @@
 "запро� не вернул им� целевой таблицы дл� триггера внешнего ключа \"%s\" в "
 "таблице \"%s\" (OID целевой таблицы: %u)\n"
 
-#: pg_dump.c:6879
+#: pg_dump.c:6954
 #, c-format
 msgid "finding the columns and types of table \"%s.%s\"\n"
 msgstr "пои�к �толбцов и типов таблицы \"%s.%s\"\n"
 
-#: pg_dump.c:7058
+#: pg_dump.c:7133
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "неверна� нумераци� �толбцов в таблице \"%s\"\n"
 
-#: pg_dump.c:7092
+#: pg_dump.c:7167
 #, c-format
 msgid "finding default expressions of table \"%s.%s\"\n"
 msgstr "пои�к выражений по умолчанию дл� таблицы \"%s.%s\"\n"
 
-#: pg_dump.c:7145
+#: pg_dump.c:7220
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "неверное значение adnum (%d) в таблице \"%s\"\n"
 
-#: pg_dump.c:7217
+#: pg_dump.c:7292
 #, c-format
 msgid "finding check constraints for table \"%s.%s\"\n"
 msgstr "пои�к ограничений-проверок дл� таблицы \"%s.%s\"\n"
 
-#: pg_dump.c:7313
+#: pg_dump.c:7388
 #, 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"
@@ -2064,61 +2074,66 @@
 msgstr[2] ""
 "ожидало�ь %d ограничений-проверок дл� таблицы \"%s\", но найдено: %d\n"
 
-#: pg_dump.c:7317
+#: pg_dump.c:7392
 #, c-format
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(Возможно повреждены �и�темные каталоги.)\n"
 
-#: pg_dump.c:8707
+#: pg_dump.c:8783
 #, c-format
 msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: у типа данных \"%s\" по-видимому неправильный тип типа\n"
 
-#: pg_dump.c:10203
+#: pg_dump.c:10279
 #, c-format
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: неприемлемое значение в ма��иве proargmodes\n"
 
-#: pg_dump.c:10555
+#: pg_dump.c:10631
 #, c-format
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь разобрать ма��ив proallargtypes\n"
 
-#: pg_dump.c:10571
+#: pg_dump.c:10647
 #, c-format
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь разобрать ма��ив proargmodes\n"
 
-#: pg_dump.c:10585
+#: pg_dump.c:10661
 #, c-format
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь разобрать ма��ив proargnames\n"
 
-#: pg_dump.c:10596
+#: pg_dump.c:10672
 #, c-format
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь разобрать ма��ив proconfig\n"
 
 # TO REVEIW
-#: pg_dump.c:10667
+#: pg_dump.c:10743
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "недопу�тимое значение provolatile дл� функции \"%s\"\n"
 
-#: pg_dump.c:10844
+#: pg_dump.c:10876 pg_dump.c:10981 pg_dump.c:10988
+#, c-format
+msgid "could not find function definition for function with OID %u\n"
+msgstr "не удало�ь найти определение функции дл� функции � OID %u\n"
+
+#: pg_dump.c:10921
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: неприемлемое значение в поле pg_cast.castfunc или pg_cast."
 "castmethod\n"
 
-#: pg_dump.c:10847
+#: pg_dump.c:10924
 #, c-format
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: неприемлемое значение в поле pg_cast.castmethod\n"
 
-#: pg_dump.c:10931
+#: pg_dump.c:11010
 #, c-format
 msgid ""
 "WARNING: bogus transform definition, at least one of trffromsql and trftosql "
@@ -2127,22 +2142,22 @@
 "ПРЕДУПРЕЖДЕ�ИЕ: неприемлемое определение преобразовани� (trffromsql или "
 "trftosql должно быть ненулевым)\n"
 
-#: pg_dump.c:10948
+#: pg_dump.c:11027
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trffromsql field\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: неприемлемое значение в поле pg_transform.trffromsql\n"
 
-#: pg_dump.c:10969
+#: pg_dump.c:11048
 #, c-format
 msgid "WARNING: bogus value in pg_transform.trftosql field\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: неприемлемое значение в поле pg_transform.trftosql\n"
 
-#: pg_dump.c:11356
+#: pg_dump.c:11435
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: оператор � OID %s не найден\n"
 
-#: pg_dump.c:12536
+#: pg_dump.c:12582
 #, c-format
 msgid ""
 "WARNING: aggregate function %s could not be dumped correctly for this "
@@ -2151,28 +2166,28 @@
 "ПРЕДУПРЕЖДЕ�ИЕ: агрегатна� функци� %s не может быть правильно выгружена дл� "
 "�той вер�ии базы данных; функци� проигнорирована\n"
 
-#: pg_dump.c:13360
+#: pg_dump.c:13406
 #, c-format
 msgid "unrecognized object type in default privileges: %d\n"
 msgstr "нера�познанный тип объекта в определении прав по умолчанию: %d)\n"
 
-#: pg_dump.c:13375
+#: pg_dump.c:13421
 #, c-format
 msgid "could not parse default ACL list (%s)\n"
 msgstr "не удало�ь разобрать �пи�ок прав по умолчанию (%s)\n"
 
-#: pg_dump.c:13431
+#: pg_dump.c:13477
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr "не удало�ь разобрать �пи�ок прав (%s) дл� объекта \"%s\" (%s)\n"
 
-#: pg_dump.c:13852
+#: pg_dump.c:13899
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr ""
 "запро� на получение определени� пред�тавлени� \"%s\" не возвратил данные\n"
 
-#: pg_dump.c:13855
+#: pg_dump.c:13902
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition\n"
@@ -2180,27 +2195,27 @@
 "запро� на получени� определени� пред�тавлени� \"%s\" возвратил не�колько "
 "определений\n"
 
-#: pg_dump.c:13862
+#: pg_dump.c:13909
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "определение пред�тавлени� \"%s\" пу�тое (длина равна нулю)\n"
 
-#: pg_dump.c:14610
+#: pg_dump.c:14657
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "неверный номер �толбца %d дл� таблицы \"%s\"\n"
 
-#: pg_dump.c:14736
+#: pg_dump.c:14783
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "от�ут�твует индек� дл� ограничени� \"%s\"\n"
 
-#: pg_dump.c:14927
+#: pg_dump.c:14974
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "нера�познанный тип ограничени�: %c\n"
 
-#: pg_dump.c:15077 pg_dump.c:15241
+#: pg_dump.c:15124 pg_dump.c:15288
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
 msgid_plural ""
@@ -2215,23 +2230,23 @@
 "запро� на получение данных по�ледовательно�ти \"%s\" вернул %d �трок "
 "(ожидала�ь 1)\n"
 
-#: pg_dump.c:15088
+#: pg_dump.c:15135
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr ""
 "запро� на получение данных по�ледовательно�ти \"%s\" вернул им� \"%s\"\n"
 
-#: pg_dump.c:15337
+#: pg_dump.c:15384
 #, c-format
 msgid "unexpected tgtype value: %d\n"
 msgstr "неожиданное значение tgtype: %d\n"
 
-#: pg_dump.c:15419
+#: pg_dump.c:15466
 #, c-format
 msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr "неверна� �трока аргументов (%s) дл� триггера \"%s\" таблицы \"%s\"\n"
 
-#: pg_dump.c:15608
+#: pg_dump.c:15655
 #, c-format
 msgid ""
 "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
@@ -2240,24 +2255,16 @@
 "запро� на получение правила \"%s\" дл� таблицы \"%s\" возвратил неверное "
 "чи�ло �трок\n"
 
-#: pg_dump.c:15990
+#: pg_dump.c:16037
 #, c-format
 msgid "reading dependency data\n"
 msgstr "чтение данных о зави�имо�т�х\n"
 
-#: pg_dump.c:16550
+#: pg_dump.c:16597
 #, c-format
 msgid "WARNING: could not parse reloptions array\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь разобрать ма��ив reloptions\n"
 
-#: pg_dump.c:16614
-#, 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] "запро� вернул %d �троку вме�то одной: %s\n"
-msgstr[1] "запро� вернул %d �троки вме�то одной: %s\n"
-msgstr[2] "запро� вернул %d �трок вме�то одной: %s\n"
-
 #. translator: this is a module name
 #: pg_dump_sort.c:23
 msgid "sorter"
@@ -2278,7 +2285,7 @@
 msgid "could not identify dependency loop\n"
 msgstr "не удало�ь определить цикл зави�имо�тей\n"
 
-#: pg_dump_sort.c:1250
+#: pg_dump_sort.c:1254
 #, c-format
 msgid "NOTICE: there are circular foreign-key constraints on this table:\n"
 msgid_plural ""
@@ -2290,12 +2297,12 @@
 msgstr[2] ""
 "З�МЕЧ��ИЕ: в �ледующих таблицах зациклены ограничени� внешних ключей:\n"
 
-#: pg_dump_sort.c:1254 pg_dump_sort.c:1274
+#: pg_dump_sort.c:1258 pg_dump_sort.c:1278
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
 
-#: pg_dump_sort.c:1255
+#: pg_dump_sort.c:1259
 #, c-format
 msgid ""
 "You might not be able to restore the dump without using --disable-triggers "
@@ -2304,7 +2311,7 @@
 "Возможно дл� во��тановлени� базы вам потребует�� и�пользовать --disable-"
 "triggers или временно удалить ограничени�.\n"
 
-#: pg_dump_sort.c:1256
+#: pg_dump_sort.c:1260
 #, c-format
 msgid ""
 "Consider using a full dump instead of a --data-only dump to avoid this "
@@ -2313,14 +2320,14 @@
 "Во избежание �той проблемы, вам веро�тно �тоит выгружать в�ю базу данных, а "
 "не только данные (--data-only).\n"
 
-#: pg_dump_sort.c:1268
+#: pg_dump_sort.c:1272
 #, c-format
 msgid "WARNING: could not resolve dependency loop among these items:\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь разрешить цикл зави�имо�тей дл� �ледующих "
 "объектов:\n"
 
-#: pg_dumpall.c:181
+#: pg_dumpall.c:179
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -2329,9 +2336,9 @@
 msgstr ""
 "Дл� %s необходима программа \"pg_dump\", но она не найдена\n"
 "в каталоге \"%s\".\n"
-"Проверьте вашу у�тановку PostgreSQL.\n"
+"Проверьте правильно�ть у�тановки СУБД.\n"
 
-#: pg_dumpall.c:188
+#: pg_dumpall.c:186
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by \"%s\"\n"
@@ -2340,16 +2347,16 @@
 msgstr ""
 "Программа \"pg_dump\" найдена в \"%s\",\n"
 "но её вер�и� отличает�� от вер�ии %s.\n"
-"Проверьте вашу у�тановку PostgreSQL.\n"
+"Проверьте правильно�ть у�тановки СУБД.\n"
 
-#: pg_dumpall.c:318
+#: pg_dumpall.c:316
 #, 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"
 
-#: pg_dumpall.c:327
+#: pg_dumpall.c:325
 #, c-format
 msgid ""
 "%s: options -g/--globals-only and -t/--tablespaces-only cannot be used "
@@ -2358,12 +2365,12 @@
 "%s: параметры -g/--globals-only и -t/--tablespaces-only и�ключают друг "
 "друга\n"
 
-#: pg_dumpall.c:336 pg_restore.c:343
+#: pg_dumpall.c:334 pg_restore.c:359
 #, c-format
 msgid "%s: option --if-exists requires option -c/--clean\n"
 msgstr "%s: параметру --if-exists требует�� параметр -c/--clean\n"
 
-#: pg_dumpall.c:343
+#: pg_dumpall.c:341
 #, c-format
 msgid ""
 "%s: options -r/--roles-only and -t/--tablespaces-only cannot be used "
@@ -2371,12 +2378,12 @@
 msgstr ""
 "%s: параметры -r/--roles-only и -t/--tablespaces-only и�ключают друг друга\n"
 
-#: pg_dumpall.c:385 pg_dumpall.c:1892
+#: pg_dumpall.c:383 pg_dumpall.c:1899
 #, c-format
 msgid "%s: could not connect to database \"%s\"\n"
 msgstr "%s: не удало�ь подключить�� к базе данных: \"%s\"\n"
 
-#: pg_dumpall.c:400
+#: pg_dumpall.c:398
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2385,12 +2392,12 @@
 "%s: не удало�ь подключить�� к базе данных \"postgres\" или \"template1\"\n"
 "Укажите другую базу данных.\n"
 
-#: pg_dumpall.c:417
+#: pg_dumpall.c:415
 #, c-format
 msgid "%s: could not open the output file \"%s\": %s\n"
 msgstr "%s: не удало�ь открыть выходной файл \"%s\": %s\n"
 
-#: pg_dumpall.c:547
+#: pg_dumpall.c:545
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2399,17 +2406,17 @@
 "%s �к�портирует в�ё �одержимое кла�тера баз данных PostgreSQL в SQL-�крипт.\n"
 "\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:547
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [П�Р�МЕТР]...\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:550
 #, c-format
 msgid "  -f, --file=FILENAME          output file name\n"
 msgstr "  -f, --file=ИМЯ_Ф�ЙЛ�         им� выходного файла\n"
 
-#: pg_dumpall.c:558
+#: pg_dumpall.c:557
 #, c-format
 msgid ""
 "  -c, --clean                  clean (drop) databases before recreating\n"
@@ -2417,18 +2424,18 @@
 "  -c, --clean                  очи�тить (удалить) базы данных перед\n"
 "                               во��тановлением\n"
 
-#: pg_dumpall.c:559
+#: pg_dumpall.c:558
 #, c-format
 msgid "  -g, --globals-only           dump only global objects, no databases\n"
 msgstr ""
 "  -g, --globals-only           выгрузить только глобальные объекты, без баз\n"
 
-#: pg_dumpall.c:561 pg_restore.c:456
+#: pg_dumpall.c:560 pg_restore.c:462
 #, c-format
 msgid "  -O, --no-owner               skip restoration of object ownership\n"
 msgstr "  -O, --no-owner               не во��танавливать владение объектами\n"
 
-#: pg_dumpall.c:562
+#: pg_dumpall.c:561
 #, c-format
 msgid ""
 "  -r, --roles-only             dump only roles, no databases or tablespaces\n"
@@ -2436,13 +2443,13 @@
 "  -r, --roles-only             выгрузить только роли, без баз данных\n"
 "                               и табличных про�тран�тв\n"
 
-#: pg_dumpall.c:564
+#: pg_dumpall.c:563
 #, c-format
 msgid "  -S, --superuser=NAME         superuser user name to use in the dump\n"
 msgstr ""
 "  -S, --superuser=ИМЯ          им� пользовател� дл� выполнени� выгрузки\n"
 
-#: pg_dumpall.c:565
+#: pg_dumpall.c:564
 #, c-format
 msgid ""
 "  -t, --tablespaces-only       dump only tablespaces, no databases or roles\n"
@@ -2450,17 +2457,17 @@
 "  -t, --tablespaces-only       выгружать только табличные про�тран�тва,\n"
 "                               без баз данных и ролей\n"
 
-#: pg_dumpall.c:582
+#: pg_dumpall.c:581
 #, c-format
 msgid "  -d, --dbname=CONNSTR     connect using connection string\n"
 msgstr "  -d, --dbname=СТРОК�      подключить�� � данной �трокой подключени�\n"
 
-#: pg_dumpall.c:584
+#: pg_dumpall.c:583
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=ИМЯ_БД    выбор другой базы данных по умолчанию\n"
 
-#: pg_dumpall.c:591
+#: pg_dumpall.c:590
 #, c-format
 msgid ""
 "\n"
@@ -2474,14 +2481,14 @@
 "вывод.\n"
 "\n"
 
-#: pg_dumpall.c:1118
+#: pg_dumpall.c:1117
 #, c-format
 msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
 msgstr ""
 "%s: не удало�ь разобрать �пи�ок управлени� до�тупом (%s) дл� табл. "
 "про�тран�тва \"%s\"\n"
 
-#: pg_dumpall.c:1449
+#: pg_dumpall.c:1448
 #, c-format
 msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
 msgstr ""
@@ -2493,47 +2500,47 @@
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: выгрузка базы данных \"%s\"...\n"
 
-#: pg_dumpall.c:1680
+#: pg_dumpall.c:1683
 #, c-format
 msgid "%s: pg_dump failed on database \"%s\", exiting\n"
 msgstr "%s: ошибка pg_dump дл� базы данных \"%s\", выход...\n"
 
-#: pg_dumpall.c:1689
+#: pg_dumpall.c:1692
 #, c-format
 msgid "%s: could not re-open the output file \"%s\": %s\n"
 msgstr "%s: не удало�ь повторно открыть выходной файл \"%s\": %s\n"
 
-#: pg_dumpall.c:1734
+#: pg_dumpall.c:1737
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: выполн�ет�� \"%s\"\n"
 
-#: pg_dumpall.c:1914
+#: pg_dumpall.c:1921
 #, c-format
 msgid "%s: could not connect to database \"%s\": %s\n"
 msgstr "%s: не удало�ь подключить�� к базе \"%s\": %s\n"
 
-#: pg_dumpall.c:1944
+#: pg_dumpall.c:1951
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: не удало�ь узнать вер�ию �ервера\n"
 
-#: pg_dumpall.c:1950
+#: pg_dumpall.c:1957
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: не удало�ь разобрать �троку вер�ии �ервера \"%s\"\n"
 
-#: pg_dumpall.c:2028 pg_dumpall.c:2054
+#: pg_dumpall.c:2035 pg_dumpall.c:2061
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: выполн�ет�� %s\n"
 
-#: pg_dumpall.c:2034 pg_dumpall.c:2060
+#: pg_dumpall.c:2041 pg_dumpall.c:2067
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: ошибка при выполнении запро�а: %s"
 
-#: pg_dumpall.c:2036 pg_dumpall.c:2062
+#: pg_dumpall.c:2043 pg_dumpall.c:2069
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: запро�: %s\n"
@@ -2555,29 +2562,34 @@
 msgid "%s: options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "%s: параметры -c/--clean and -a/--data-only и�ключают друг друга\n"
 
-#: pg_restore.c:329
+#: pg_restore.c:328
+#, c-format
+msgid "%s: invalid number of parallel jobs\n"
+msgstr "%s: неверное чи�ло параллельных заданий\n"
+
+#: pg_restore.c:336
+#, c-format
+msgid "%s: maximum number of parallel jobs is %d\n"
+msgstr "%s: мак�имальное чи�ло параллельных заданий равно %d\n"
+
+#: pg_restore.c:345
 #, c-format
 msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
 msgstr ""
 "%s: параметр --single-transaction допу�кает�� только � одним заданием\n"
 
-#: pg_restore.c:369
+#: pg_restore.c:385
 #, c-format
 msgid ""
 "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
 msgstr "нера�познанный формат архива \"%s\"; укажите \"c\", \"d\" или \"t\"\n"
 
-#: pg_restore.c:401
-#, c-format
-msgid "%s: maximum number of parallel jobs is %d\n"
-msgstr "%s: мак�имальное чи�ло параллельных заданий равно %d\n"
-
-#: pg_restore.c:419
+#: pg_restore.c:425
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: при во��тановлении проигнорировано ошибок: %d\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:439
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2587,48 +2599,48 @@
 "pg_dump.\n"
 "\n"
 
-#: pg_restore.c:435
+#: pg_restore.c:441
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [П�Р�МЕТР]... [Ф�ЙЛ]\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:444
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=БД          подключить�� к указанной базе данных\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:445
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=ИМЯ_Ф�ЙЛ�     им� выходного файла\n"
 
-#: pg_restore.c:440
+#: pg_restore.c:446
 #, c-format
 msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr ""
 "  -F, --format=c|d|t       формат файла (должен определ�ть�� автоматиче�ки)\n"
 
-#: pg_restore.c:441
+#: pg_restore.c:447
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               выве�ти краткое оглавление архива\n"
 
-#: pg_restore.c:442
+#: pg_restore.c:448
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            выводить подробные �ообщени�\n"
 
-#: pg_restore.c:443
+#: pg_restore.c:449
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            показать вер�ию и выйти\n"
 
-#: pg_restore.c:444
+#: pg_restore.c:450
 #, c-format
 msgid "  -?, --help               show this help, then exit\n"
 msgstr "  -?, --help               показать �ту �правку и выйти\n"
 
-#: pg_restore.c:446
+#: pg_restore.c:452
 #, c-format
 msgid ""
 "\n"
@@ -2637,35 +2649,35 @@
 "\n"
 "Параметры, управл�ющие во��тановлением:\n"
 
-#: pg_restore.c:447
+#: pg_restore.c:453
 #, c-format
 msgid "  -a, --data-only              restore only the data, no schema\n"
 msgstr "  -a, --data-only              во��тановить только данные, без �хемы\n"
 
-#: pg_restore.c:449
+#: pg_restore.c:455
 #, c-format
 msgid "  -C, --create                 create the target database\n"
 msgstr "  -C, --create                 �оздать целевую базу данных\n"
 
-#: pg_restore.c:450
+#: pg_restore.c:456
 #, c-format
 msgid "  -e, --exit-on-error          exit on error, default is to continue\n"
 msgstr ""
 "  -e, --exit-on-error          выйти при ошибке (по умолчанию - продолжать)\n"
 
-#: pg_restore.c:451
+#: pg_restore.c:457
 #, c-format
 msgid "  -I, --index=NAME             restore named index\n"
 msgstr "  -I, --index=ИМЯ              во��тановить указанный индек�\n"
 
-#: pg_restore.c:452
+#: pg_restore.c:458
 #, c-format
 msgid "  -j, --jobs=NUM               use this many parallel jobs to restore\n"
 msgstr ""
 "  -j, --jobs=ЧИСЛО             ра�параллелить во��тановление на указанное "
 "чи�ло заданий\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:459
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME      use table of contents from this file for\n"
@@ -2674,23 +2686,25 @@
 "  -L, --use-list=ИМЯ_Ф�ЙЛ�     и�пользовать оглавление из �того файла дл�\n"
 "                               чтени�/упор�дочивани� данных\n"
 
-#: pg_restore.c:455
+#: pg_restore.c:461
 #, c-format
 msgid "  -n, --schema=NAME            restore only objects in this schema\n"
 msgstr ""
 "  -n, --schema=ИМЯ             во��тановить объекты только в �той �хеме\n"
 
-#: pg_restore.c:457
+# skip-rule: no-space-before-parentheses
+# well-spelled: арг
+#: pg_restore.c:463
 #, c-format
 msgid "  -P, --function=NAME(args)    restore named function\n"
 msgstr "  -P, --function=ИМЯ(арг-ты)   во��тановить заданную функцию\n"
 
-#: pg_restore.c:458
+#: pg_restore.c:464
 #, c-format
 msgid "  -s, --schema-only            restore only the schema, no data\n"
 msgstr "  -s, --schema-only            во��тановить только �хему, без данных\n"
 
-#: pg_restore.c:459
+#: pg_restore.c:465
 #, c-format
 msgid ""
 "  -S, --superuser=NAME         superuser user name to use for disabling "
@@ -2699,17 +2713,17 @@
 "  -S, --superuser=ИМЯ          им� �уперпользовател� дл� отключени� "
 "триггеров\n"
 
-#: pg_restore.c:460
+#: pg_restore.c:466
 #, c-format
 msgid "  -t, --table=NAME             restore named table\n"
 msgstr "  -t, --table=ИМЯ              во��тановить заданную таблицу\n"
 
-#: pg_restore.c:461
+#: pg_restore.c:467
 #, c-format
 msgid "  -T, --trigger=NAME           restore named trigger\n"
 msgstr "  -T, --trigger=ИМЯ            во��тановить заданный триггер\n"
 
-#: pg_restore.c:462
+#: pg_restore.c:468
 #, c-format
 msgid ""
 "  -x, --no-privileges          skip restoration of access privileges (grant/"
@@ -2718,18 +2732,18 @@
 "  -x, --no-privileges          не во��танавливать права до�тупа\n"
 "                               (назначение/отзыв)\n"
 
-#: pg_restore.c:463
+#: pg_restore.c:469
 #, c-format
 msgid "  -1, --single-transaction     restore as a single transaction\n"
 msgstr ""
 "  -1, --single-transaction     выполнить во��тановление в одной транзакции\n"
 
-#: pg_restore.c:465
+#: pg_restore.c:471
 #, c-format
 msgid "  --enable-row-security        enable row security\n"
 msgstr "  --enable-row-security        включить защиту на уровне �трок\n"
 
-#: pg_restore.c:467
+#: pg_restore.c:473
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables  do not restore data of tables that could not "
@@ -2739,19 +2753,19 @@
 "  --no-data-for-failed-tables  не во��танавливать данные таблиц, которые\n"
 "                               не удало�ь �оздать\n"
 
-#: pg_restore.c:469
+#: pg_restore.c:475
 #, c-format
 msgid "  --no-security-labels         do not restore security labels\n"
 msgstr "  --no-security-labels         не во��танавливать метки безопа�но�ти\n"
 
-#: pg_restore.c:470
+#: pg_restore.c:476
 #, c-format
 msgid "  --no-tablespaces             do not restore tablespace assignments\n"
 msgstr ""
 "  --no-tablespaces             не во��танавливать назначени� табл. "
 "про�тран�тв\n"
 
-#: pg_restore.c:471
+#: pg_restore.c:477
 #, c-format
 msgid ""
 "  --section=SECTION            restore named section (pre-data, data, or "
@@ -2760,12 +2774,12 @@
 "  --section=Р�ЗДЕЛ             во��тановить заданный раздел\n"
 "                               (pre-data, data или post-data)\n"
 
-#: pg_restore.c:482
+#: pg_restore.c:488
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before restore\n"
 msgstr "  --role=ИМЯ_РОЛИ          выполнить SET ROLE перед во��тановлением\n"
 
-#: pg_restore.c:484
+#: pg_restore.c:490
 #, c-format
 msgid ""
 "\n"
@@ -2776,7 +2790,7 @@
 "Параметры -I, -n, -P, -t, -T и --section можно комбинировать и указывать\n"
 "не�колько раз дл� выбора не�кольких объектов.\n"
 
-#: pg_restore.c:487
+#: pg_restore.c:493
 #, c-format
 msgid ""
 "\n"
@@ -2788,6 +2802,21 @@
 "ввода.\n"
 "\n"
 
+#~ msgid "could not get relation name for OID %u: %s\n"
+#~ msgstr "не удало�ь получить им� отношени� � OID %u: %s\n"
+
+#~ msgid "terminated by user\n"
+#~ msgstr "прервано пользователем\n"
+
+#~ msgid "error in ListenToWorkers(): %s\n"
+#~ msgstr "ошибка в ListenToWorkers(): %s\n"
+
+#~ msgid "worker is terminating\n"
+#~ msgstr "рабочий проце�� прерывает��\n"
+
+#~ msgid "could not open output file \"%s\" for writing\n"
+#~ msgstr "не удало�ь открыть выходной файл \"%s\"  дл� запи�и\n"
+
 #~ msgid "archive member too large for tar format\n"
 #~ msgstr "компонент архива �лишком велик дл� формата tar\n"
 
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_resetxlog/pg_resetxlog.c postgresql-9.5-9.5.8/src/bin/pg_resetxlog/pg_resetxlog.c
--- postgresql-9.5-9.5.2/src/bin/pg_resetxlog/pg_resetxlog.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_resetxlog/pg_resetxlog.c	2017-08-07 21:13:41.000000000 +0000
@@ -72,6 +72,7 @@
 static uint32 minXlogTli = 0;
 static XLogSegNo minXlogSegNo = 0;
 
+static void CheckDataVersion(void);
 static bool ReadControlFile(void);
 static void GuessControlValues(void);
 static void PrintControlValues(bool guessed);
@@ -320,6 +321,9 @@
 		exit(1);
 	}
 
+	/* Check that data directory matches our server version */
+	CheckDataVersion();
+
 	/*
 	 * Check for a postmaster lock file --- if there is one, refuse to
 	 * proceed, on grounds we might be interfering with a live installation.
@@ -454,6 +458,70 @@
 
 
 /*
+ * Look at the version string stored in PG_VERSION and decide if this utility
+ * can be run safely or not.
+ *
+ * We don't want to inject pg_control and WAL files that are for a different
+ * major version; that can't do anything good.  Note that we don't treat
+ * mismatching version info in pg_control as a reason to bail out, because
+ * recovering from a corrupted pg_control is one of the main reasons for this
+ * program to exist at all.  However, PG_VERSION is unlikely to get corrupted,
+ * and if it were it would be easy to fix by hand.  So let's make this check
+ * to prevent simple user errors.
+ */
+static void
+CheckDataVersion(void)
+{
+	const char *ver_file = "PG_VERSION";
+	FILE	   *ver_fd;
+	char		rawline[64];
+	int			len;
+
+	if ((ver_fd = fopen(ver_file, "r")) == NULL)
+	{
+		fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
+				progname, ver_file, strerror(errno));
+		exit(1);
+	}
+
+	/* version number has to be the first line read */
+	if (!fgets(rawline, sizeof(rawline), ver_fd))
+	{
+		if (!ferror(ver_fd))
+		{
+			fprintf(stderr, _("%s: unexpected empty file \"%s\"\n"),
+					progname, ver_file);
+		}
+		else
+		{
+			fprintf(stderr, _("%s: could not read file \"%s\": %s\n"),
+					progname, ver_file, strerror(errno));
+		}
+		exit(1);
+	}
+
+	/* remove trailing newline, handling Windows newlines as well */
+	len = strlen(rawline);
+	if (len > 0 && rawline[len - 1] == '\n')
+	{
+		rawline[--len] = '\0';
+		if (len > 0 && rawline[len - 1] == '\r')
+			rawline[--len] = '\0';
+	}
+
+	if (strcmp(rawline, PG_MAJORVERSION) != 0)
+	{
+		fprintf(stderr, _("%s: data directory is of wrong version\n"
+						  "File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\".\n"),
+				progname, ver_file, rawline, PG_MAJORVERSION);
+		exit(1);
+	}
+
+	fclose(ver_fd);
+}
+
+
+/*
  * Try to read the existing pg_control file.
  *
  * This routine is also responsible for updating old pg_control versions
@@ -522,7 +590,7 @@
 	}
 
 	/* Looks like it's a mess. */
-	fprintf(stderr, _("%s: pg_control exists but is broken or unknown version; ignoring it\n"),
+	fprintf(stderr, _("%s: pg_control exists but is broken or wrong version; ignoring it\n"),
 			progname);
 	return false;
 }
@@ -963,7 +1031,7 @@
 {
 	DIR		   *xldir;
 	struct dirent *xlde;
-	char		path[MAXPGPATH];
+	char		path[MAXPGPATH + sizeof(XLOGDIR)];
 
 	xldir = opendir(XLOGDIR);
 	if (xldir == NULL)
@@ -978,7 +1046,7 @@
 		if (IsXLogFileName(xlde->d_name) ||
 			IsPartialXLogFileName(xlde->d_name))
 		{
-			snprintf(path, MAXPGPATH, "%s/%s", XLOGDIR, xlde->d_name);
+			snprintf(path, sizeof(path), "%s/%s", XLOGDIR, xlde->d_name);
 			if (unlink(path) < 0)
 			{
 				fprintf(stderr, _("%s: could not delete file \"%s\": %s\n"),
@@ -1010,11 +1078,11 @@
 static void
 KillExistingArchiveStatus(void)
 {
+#define ARCHSTATDIR XLOGDIR "/archive_status"
+
 	DIR		   *xldir;
 	struct dirent *xlde;
-	char		path[MAXPGPATH];
-
-#define ARCHSTATDIR XLOGDIR "/archive_status"
+	char		path[MAXPGPATH + sizeof(ARCHSTATDIR)];
 
 	xldir = opendir(ARCHSTATDIR);
 	if (xldir == NULL)
@@ -1032,7 +1100,7 @@
 			 strcmp(xlde->d_name + XLOG_FNAME_LEN, ".partial.ready") == 0 ||
 			 strcmp(xlde->d_name + XLOG_FNAME_LEN, ".partial.done") == 0))
 		{
-			snprintf(path, MAXPGPATH, "%s/%s", ARCHSTATDIR, xlde->d_name);
+			snprintf(path, sizeof(path), "%s/%s", ARCHSTATDIR, xlde->d_name);
 			if (unlink(path) < 0)
 			{
 				fprintf(stderr, _("%s: could not delete file \"%s\": %s\n"),
@@ -1100,7 +1168,7 @@
 	record->xl_rmid = RM_XLOG_ID;
 
 	recptr += SizeOfXLogRecord;
-	*(recptr++) = XLR_BLOCK_ID_DATA_SHORT;
+	*(recptr++) = (char) XLR_BLOCK_ID_DATA_SHORT;
 	*(recptr++) = sizeof(CheckPoint);
 	memcpy(recptr, &ControlFile.checkPointCopy,
 		   sizeof(CheckPoint));
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/de.po postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/de.po
--- postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 # German message translation file for pg_resetxlog
 # Peter Eisentraut <peter_e@gmx.net>, 2002 - 2015.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-01-04 02:13+0000\n"
+"POT-Creation-Date: 2017-08-07 16:30+0000\n"
 "PO-Revision-Date: 2016-01-03 21:33-0500\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
@@ -39,7 +39,7 @@
 #: ../../common/restricted_token.c:132
 #, c-format
 msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: konnte Prozess für Befehl „%s“ nicht starten: Fehlercode %lu\n"
+msgstr "%s: konnte Prozess für Befehl »%s« nicht starten: Fehlercode %lu\n"
 
 #: ../../common/restricted_token.c:170
 #, c-format
@@ -52,95 +52,95 @@
 msgstr "%s: konnte Statuscode des Subprozesses nicht ermitteln: Fehlercode %lu\n"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetxlog.c:140 pg_resetxlog.c:155 pg_resetxlog.c:170 pg_resetxlog.c:177
-#: pg_resetxlog.c:201 pg_resetxlog.c:216 pg_resetxlog.c:224 pg_resetxlog.c:250
-#: pg_resetxlog.c:264
+#: pg_resetxlog.c:141 pg_resetxlog.c:156 pg_resetxlog.c:171 pg_resetxlog.c:178
+#: pg_resetxlog.c:202 pg_resetxlog.c:217 pg_resetxlog.c:225 pg_resetxlog.c:251
+#: pg_resetxlog.c:265
 #, c-format
 msgid "%s: invalid argument for option %s\n"
 msgstr "%s: ungültiges Argument für Option %s\n"
 
-#: pg_resetxlog.c:141 pg_resetxlog.c:156 pg_resetxlog.c:171 pg_resetxlog.c:178
-#: pg_resetxlog.c:202 pg_resetxlog.c:217 pg_resetxlog.c:225 pg_resetxlog.c:251
-#: pg_resetxlog.c:265 pg_resetxlog.c:272 pg_resetxlog.c:285 pg_resetxlog.c:293
+#: pg_resetxlog.c:142 pg_resetxlog.c:157 pg_resetxlog.c:172 pg_resetxlog.c:179
+#: pg_resetxlog.c:203 pg_resetxlog.c:218 pg_resetxlog.c:226 pg_resetxlog.c:252
+#: pg_resetxlog.c:266 pg_resetxlog.c:273 pg_resetxlog.c:286 pg_resetxlog.c:294
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
-#: pg_resetxlog.c:146
+#: pg_resetxlog.c:147
 #, c-format
 msgid "%s: transaction ID epoch (-e) must not be -1\n"
 msgstr "%s: Transaktions-ID-Epoche (-e) darf nicht -1 sein\n"
 
-#: pg_resetxlog.c:161
+#: pg_resetxlog.c:162
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: Transaktions-ID (-x) darf nicht 0 sein\n"
 
-#: pg_resetxlog.c:185 pg_resetxlog.c:192
+#: pg_resetxlog.c:186 pg_resetxlog.c:193
 #, c-format
 msgid "%s: transaction ID (-c) must be either 0 or greater than or equal to 2\n"
 msgstr "%s: Transaktions-ID (-c) muss entweder 0 oder größer oder gleich 2 sein\n"
 
-#: pg_resetxlog.c:207
+#: pg_resetxlog.c:208
 #, c-format
 msgid "%s: OID (-o) must not be 0\n"
 msgstr "%s: OID (-o) darf nicht 0 sein\n"
 
-#: pg_resetxlog.c:230
+#: pg_resetxlog.c:231
 #, c-format
 msgid "%s: multitransaction ID (-m) must not be 0\n"
 msgstr "%s: Multitransaktions-ID (-m) darf nicht 0 sein\n"
 
-#: pg_resetxlog.c:240
+#: pg_resetxlog.c:241
 #, c-format
 msgid "%s: oldest multitransaction ID (-m) must not be 0\n"
 msgstr "%s: älteste Multitransaktions-ID (-m) darf nicht 0 sein\n"
 
-#: pg_resetxlog.c:256
+#: pg_resetxlog.c:257
 #, c-format
 msgid "%s: multitransaction offset (-O) must not be -1\n"
 msgstr "%s: Multitransaktions-Offset (-O) darf nicht -1 sein\n"
 
-#: pg_resetxlog.c:283
+#: pg_resetxlog.c:284
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: zu viele Kommandozeilenargumente (das erste ist „%s“)\n"
+msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
-#: pg_resetxlog.c:292
+#: pg_resetxlog.c:293
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: kein Datenverzeichnis angegeben\n"
 
-#: pg_resetxlog.c:306
+#: pg_resetxlog.c:307
 #, c-format
 msgid "%s: cannot be executed by \"root\"\n"
-msgstr "%s: kann nicht von „root“ ausgeführt werden\n"
+msgstr "%s: kann nicht von »root« ausgeführt werden\n"
 
-#: pg_resetxlog.c:308
+#: pg_resetxlog.c:309
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser.\n"
 msgstr "Sie müssen %s als PostgreSQL-Superuser ausführen.\n"
 
-#: pg_resetxlog.c:318
+#: pg_resetxlog.c:319
 #, c-format
 msgid "%s: could not change directory to \"%s\": %s\n"
-msgstr "%s: konnte nicht in Verzeichnis „%s“ wechseln: %s\n"
+msgstr "%s: konnte nicht in Verzeichnis »%s« wechseln: %s\n"
 
-#: pg_resetxlog.c:331 pg_resetxlog.c:477
+#: pg_resetxlog.c:335 pg_resetxlog.c:482 pg_resetxlog.c:545
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: konnte Datei „%s“ nicht zum Lesen öffnen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht zum Lesen öffnen: %s\n"
 
-#: pg_resetxlog.c:338
+#: pg_resetxlog.c:342
 #, 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: Sperrdatei „%s“ existiert bereits\n"
+"%s: Sperrdatei »%s« existiert bereits\n"
 "Läuft der Server?  Wenn nicht, dann Sperrdatei löschen und nochmal versuchen.\n"
 
-#: pg_resetxlog.c:425
+#: pg_resetxlog.c:429
 #, c-format
 msgid ""
 "\n"
@@ -150,7 +150,7 @@
 "Wenn diese Werte akzeptabel scheinen, dann benutzen Sie -f um das\n"
 "Zurücksetzen zu erzwingen.\n"
 
-#: pg_resetxlog.c:437
+#: pg_resetxlog.c:441
 #, c-format
 msgid ""
 "The database server was not shut down cleanly.\n"
@@ -162,12 +162,31 @@
 "Wenn Sie trotzdem weiter machen wollen, benutzen Sie -f, um das\n"
 "Zurücksetzen zu erzwingen.\n"
 
-#: pg_resetxlog.c:451
+#: pg_resetxlog.c:455
 #, c-format
 msgid "Transaction log reset\n"
 msgstr "Transaktionslog wurde zurück gesetzt\n"
 
-#: pg_resetxlog.c:480
+#: pg_resetxlog.c:492
+#, c-format
+msgid "%s: unexpected empty file \"%s\"\n"
+msgstr "%s: unerwartete leere Datei »%s«\n"
+
+#: pg_resetxlog.c:497 pg_resetxlog.c:561
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: konnte Datei »%s« nicht lesen: %s\n"
+
+#: pg_resetxlog.c:514
+#, c-format
+msgid ""
+"%s: data directory is of wrong version\n"
+"File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\".\n"
+msgstr ""
+"%s: Datenverzeichnis hat falsche Version\n"
+"Datei »%s« enthält »%s«, was nicht mit der Version dieses Programms »%s« kompatibel ist.\n"
+
+#: pg_resetxlog.c:548
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -178,22 +197,17 @@
 "  touch %s\n"
 "aus und versuchen Sie es erneut.\n"
 
-#: pg_resetxlog.c:493
-#, c-format
-msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht lesen: %s\n"
-
-#: pg_resetxlog.c:516
+#: pg_resetxlog.c:584
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
 msgstr "%s: pg_control existiert, aber mit ungültiger CRC; mit Vorsicht fortfahren\n"
 
-#: pg_resetxlog.c:525
+#: pg_resetxlog.c:593
 #, c-format
-msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control existiert, aber ist kaputt oder hat unbekannte Version; wird ignoriert\n"
+msgid "%s: pg_control exists but is broken or wrong version; ignoring it\n"
+msgstr "%s: pg_control existiert, aber ist kaputt oder hat falsche Version; wird ignoriert\n"
 
-#: pg_resetxlog.c:628
+#: pg_resetxlog.c:696
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -202,7 +216,7 @@
 "Geschätzte pg_control-Werte:\n"
 "\n"
 
-#: pg_resetxlog.c:630
+#: pg_resetxlog.c:698
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -211,176 +225,176 @@
 "Aktuelle pg_control-Werte:\n"
 "\n"
 
-#: pg_resetxlog.c:639
+#: pg_resetxlog.c:707
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control-Versionsnummer:                   %u\n"
 
-#: pg_resetxlog.c:641
+#: pg_resetxlog.c:709
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Katalogversionsnummer:                       %u\n"
 
-#: pg_resetxlog.c:643
+#: pg_resetxlog.c:711
 #, c-format
 msgid "Database system identifier:           %s\n"
 msgstr "Datenbanksystemidentifikation:               %s\n"
 
-#: pg_resetxlog.c:645
+#: pg_resetxlog.c:713
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "TimeLineID des letzten Checkpoints:          %u\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:715
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "full_page_writes des letzten Checkpoints:    %s\n"
 
-#: pg_resetxlog.c:648
+#: pg_resetxlog.c:716
 msgid "off"
 msgstr "aus"
 
-#: pg_resetxlog.c:648
+#: pg_resetxlog.c:716
 msgid "on"
 msgstr "an"
 
-#: pg_resetxlog.c:649
+#: pg_resetxlog.c:717
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u/%u\n"
 msgstr "NextXID des letzten Checkpoints:             %u/%u\n"
 
-#: pg_resetxlog.c:652
+#: pg_resetxlog.c:720
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID des letzten Checkpoints:             %u\n"
 
-#: pg_resetxlog.c:654
+#: pg_resetxlog.c:722
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId des letzten Checkpoints:     %u\n"
 
-#: pg_resetxlog.c:656
+#: pg_resetxlog.c:724
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset des letzten Checkpoints:     %u\n"
 
-#: pg_resetxlog.c:658
+#: pg_resetxlog.c:726
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID des letzten Checkpoints:           %u\n"
 
-#: pg_resetxlog.c:660
+#: pg_resetxlog.c:728
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "DB der oldestXID des letzten Checkpoints:    %u\n"
 
-#: pg_resetxlog.c:662
+#: pg_resetxlog.c:730
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "oldestActiveXID des letzten Checkpoints:     %u\n"
 
-#: pg_resetxlog.c:664
+#: pg_resetxlog.c:732
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXid des letzten Checkpoints:      %u\n"
 
-#: pg_resetxlog.c:666
+#: pg_resetxlog.c:734
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "DB des oldestMulti des letzten Checkpoints:  %u\n"
 
-#: pg_resetxlog.c:668
+#: pg_resetxlog.c:736
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "oldestCommitTsXid des letzten Checkpoints:   %u\n"
 
-#: pg_resetxlog.c:670
+#: pg_resetxlog.c:738
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "newestCommitTsXid des letzten Checkpoints:   %u\n"
 
-#: pg_resetxlog.c:672
+#: pg_resetxlog.c:740
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Maximale Datenausrichtung (Alignment):       %u\n"
 
-#: pg_resetxlog.c:675
+#: pg_resetxlog.c:743
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Datenbankblockgröße:                         %u\n"
 
-#: pg_resetxlog.c:677
+#: pg_resetxlog.c:745
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blöcke pro Segment:                          %u\n"
 
-#: pg_resetxlog.c:679
+#: pg_resetxlog.c:747
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "WAL-Blockgröße:                              %u\n"
 
-#: pg_resetxlog.c:681
+#: pg_resetxlog.c:749
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Bytes pro WAL-Segment:                       %u\n"
 
-#: pg_resetxlog.c:683
+#: pg_resetxlog.c:751
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maximale Bezeichnerlänge:                    %u\n"
 
-#: pg_resetxlog.c:685
+#: pg_resetxlog.c:753
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Maximale Spalten in einem Index:             %u\n"
 
-#: pg_resetxlog.c:687
+#: pg_resetxlog.c:755
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Maximale Größe eines Stücks TOAST:           %u\n"
 
-#: pg_resetxlog.c:689
+#: pg_resetxlog.c:757
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Größe eines Large-Object-Chunks:             %u\n"
 
-#: pg_resetxlog.c:691
+#: pg_resetxlog.c:759
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Speicherung von Datum/Zeit-Typen:            %s\n"
 
-#: pg_resetxlog.c:692
+#: pg_resetxlog.c:760
 msgid "64-bit integers"
 msgstr "64-Bit-Ganzzahlen"
 
-#: pg_resetxlog.c:692
+#: pg_resetxlog.c:760
 msgid "floating-point numbers"
 msgstr "Gleitkommazahlen"
 
-#: pg_resetxlog.c:693
+#: pg_resetxlog.c:761
 #, c-format
 msgid "Float4 argument passing:              %s\n"
 msgstr "Ãœbergabe von Float4-Argumenten:              %s\n"
 
-#: pg_resetxlog.c:694 pg_resetxlog.c:696
+#: pg_resetxlog.c:762 pg_resetxlog.c:764
 msgid "by reference"
 msgstr "Referenz"
 
-#: pg_resetxlog.c:694 pg_resetxlog.c:696
+#: pg_resetxlog.c:762 pg_resetxlog.c:764
 msgid "by value"
 msgstr "Wert"
 
-#: pg_resetxlog.c:695
+#: pg_resetxlog.c:763
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Ãœbergabe von Float8-Argumenten:              %s\n"
 
-#: pg_resetxlog.c:697
+#: pg_resetxlog.c:765
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Datenseitenprüfsummenversion:                %u\n"
 
-#: pg_resetxlog.c:711
+#: pg_resetxlog.c:779
 #, c-format
 msgid ""
 "\n"
@@ -393,117 +407,117 @@
 "Zu ändernde Werte:\n"
 "\n"
 
-#: pg_resetxlog.c:714
+#: pg_resetxlog.c:782
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "Erstes Logdateisegment nach Zurücksetzen:    %s\n"
 
-#: pg_resetxlog.c:718
+#: pg_resetxlog.c:786
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                             %u\n"
 
-#: pg_resetxlog.c:720
+#: pg_resetxlog.c:788
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                              %u\n"
 
-#: pg_resetxlog.c:722
+#: pg_resetxlog.c:790
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "OldestMulti's DB:                            %u\n"
 
-#: pg_resetxlog.c:728
+#: pg_resetxlog.c:796
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                             %u\n"
 
-#: pg_resetxlog.c:734
+#: pg_resetxlog.c:802
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                                     %u\n"
 
-#: pg_resetxlog.c:740
+#: pg_resetxlog.c:808
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                                     %u\n"
 
-#: pg_resetxlog.c:742
+#: pg_resetxlog.c:810
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                                   %u\n"
 
-#: pg_resetxlog.c:744
+#: pg_resetxlog.c:812
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "OldestXID's DB:                              %u\n"
 
-#: pg_resetxlog.c:750
+#: pg_resetxlog.c:818
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "NextXID-Epoche:                              %u\n"
 
-#: pg_resetxlog.c:756
+#: pg_resetxlog.c:824
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                           %u\n"
 
-#: pg_resetxlog.c:761
+#: pg_resetxlog.c:829
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                           %u\n"
 
-#: pg_resetxlog.c:827
+#: pg_resetxlog.c:895
 #, c-format
 msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix PG_CONTROL_SIZE\n"
 msgstr "%s: interner Fehler -- sizeof(ControlFileData) ist zu groß ... PG_CONTROL_SIZE reparieren\n"
 
-#: pg_resetxlog.c:842
+#: pg_resetxlog.c:910
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: konnte pg_control-Datei nicht erstellen: %s\n"
 
-#: pg_resetxlog.c:853
+#: pg_resetxlog.c:921
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%sL konnte pg_control-Datei nicht schreiben: %s\n"
 
-#: pg_resetxlog.c:860 pg_resetxlog.c:1156
+#: pg_resetxlog.c:928 pg_resetxlog.c:1224
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: fsync-Fehler: %s\n"
 
-#: pg_resetxlog.c:900 pg_resetxlog.c:971 pg_resetxlog.c:1022
+#: pg_resetxlog.c:968 pg_resetxlog.c:1039 pg_resetxlog.c:1090
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht öffnen: %s\n"
 
-#: pg_resetxlog.c:936 pg_resetxlog.c:993 pg_resetxlog.c:1047
+#: pg_resetxlog.c:1004 pg_resetxlog.c:1061 pg_resetxlog.c:1115
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht lesen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht lesen: %s\n"
 
-#: pg_resetxlog.c:943 pg_resetxlog.c:1000 pg_resetxlog.c:1054
+#: pg_resetxlog.c:1011 pg_resetxlog.c:1068 pg_resetxlog.c:1122
 #, c-format
 msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht schließen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht schließen: %s\n"
 
-#: pg_resetxlog.c:984 pg_resetxlog.c:1038
+#: pg_resetxlog.c:1052 pg_resetxlog.c:1106
 #, c-format
 msgid "%s: could not delete file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht löschen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht löschen: %s\n"
 
-#: pg_resetxlog.c:1123
+#: pg_resetxlog.c:1191
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht öffnen: %s\n"
 
-#: pg_resetxlog.c:1134 pg_resetxlog.c:1148
+#: pg_resetxlog.c:1202 pg_resetxlog.c:1216
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht schreiben: %s\n"
+msgstr "%s: konnte Datei »%s« nicht schreiben: %s\n"
 
-#: pg_resetxlog.c:1167
+#: pg_resetxlog.c:1235
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
@@ -512,7 +526,7 @@
 "%s setzt den PostgreSQL-Transaktionslog zurück.\n"
 "\n"
 
-#: pg_resetxlog.c:1168
+#: pg_resetxlog.c:1236
 #, c-format
 msgid ""
 "Usage:\n"
@@ -523,79 +537,79 @@
 "  %s [OPTION]... DATENVERZEICHNIS\n"
 "\n"
 
-#: pg_resetxlog.c:1169
+#: pg_resetxlog.c:1237
 #, c-format
 msgid "Options:\n"
 msgstr "Optionen:\n"
 
-#: pg_resetxlog.c:1170
+#: pg_resetxlog.c:1238
 #, c-format
 msgid "  -c XID,XID       set oldest and newest transactions bearing commit timestamp\n"
 msgstr "  -c XID,XID       älteste und neuste Transaktion mit Commit-Timestamp setzen\n"
 
-#: pg_resetxlog.c:1171
+#: pg_resetxlog.c:1239
 #, c-format
 msgid "                   (zero in either value means no change)\n"
 msgstr "                   (Null in einem Wert bedeutet keine Änderung)\n"
 
-#: pg_resetxlog.c:1172
+#: pg_resetxlog.c:1240
 #, c-format
 msgid " [-D] DATADIR      data directory\n"
 msgstr " [-D] DATENVERZ    Datenbankverzeichnis\n"
 
-#: pg_resetxlog.c:1173
+#: pg_resetxlog.c:1241
 #, c-format
 msgid "  -e XIDEPOCH      set next transaction ID epoch\n"
 msgstr "  -e XIDEPOCHE     nächste Transaktions-ID-Epoche setzen\n"
 
-#: pg_resetxlog.c:1174
+#: pg_resetxlog.c:1242
 #, c-format
 msgid "  -f               force update to be done\n"
 msgstr "  -f               Änderung erzwingen\n"
 
-#: pg_resetxlog.c:1175
+#: pg_resetxlog.c:1243
 #, c-format
 msgid "  -l XLOGFILE      force minimum WAL starting location for new transaction log\n"
 msgstr "  -l XLOGDATEI     minimale WAL-Startposition für neuen Log erzwingen\n"
 
-#: pg_resetxlog.c:1176
+#: pg_resetxlog.c:1244
 #, c-format
 msgid "  -m MXID,MXID     set next and oldest multitransaction ID\n"
 msgstr "  -m MXID,MXID     nächste und älteste Multitransaktions-ID setzen\n"
 
-#: pg_resetxlog.c:1177
+#: pg_resetxlog.c:1245
 #, c-format
 msgid "  -n               no update, just show what would be done (for testing)\n"
 msgstr ""
 "  -n               keine Änderungen; nur zeigen, was gemacht werden würde (zum\n"
 "                   Testen)\n"
 
-#: pg_resetxlog.c:1178
+#: pg_resetxlog.c:1246
 #, c-format
 msgid "  -o OID           set next OID\n"
 msgstr "  -o OID           nächste OID setzen\n"
 
-#: pg_resetxlog.c:1179
+#: pg_resetxlog.c:1247
 #, c-format
 msgid "  -O OFFSET        set next multitransaction offset\n"
 msgstr "  -O OFFSET        nächsten Multitransaktions-Offset setzen\n"
 
-#: pg_resetxlog.c:1180
+#: pg_resetxlog.c:1248
 #, c-format
 msgid "  -V, --version    output version information, then exit\n"
 msgstr "  -V, --version    Versionsinformationen anzeigen, dann beenden\n"
 
-#: pg_resetxlog.c:1181
+#: pg_resetxlog.c:1249
 #, c-format
 msgid "  -x XID           set next transaction ID\n"
 msgstr "  -x XID           nächste Transaktions-ID setzen\n"
 
-#: pg_resetxlog.c:1182
+#: pg_resetxlog.c:1250
 #, c-format
 msgid "  -?, --help       show this help, then exit\n"
 msgstr "  -?, --help       diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_resetxlog.c:1183
+#: pg_resetxlog.c:1251
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/es.po postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/es.po
--- postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: pg_resetxlog (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:43+0000\n"
+"POT-Creation-Date: 2017-05-21 17:31+0000\n"
 "PO-Revision-Date: 2015-09-30 12:34-0300\n"
 "Last-Translator: Martín Marqués <martin@2ndquadrant.com>\n"
 "Language-Team: Español <pgsql-es-ayuda@postgresql.org>\n"
@@ -295,13 +295,13 @@
 
 #: pg_resetxlog.c:668
 #, c-format
-msgid "Latest checkpoint's oldestCommitTs:   %u\n"
-msgstr "oldestCommitTs del último checkpoint:            %u\n"
+msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
+msgstr "oldestCommitTsXid del último checkpoint:         %u\n"
 
 #: pg_resetxlog.c:670
 #, c-format
-msgid "Latest checkpoint's newestCommitTs:   %u\n"
-msgstr "newestCommitTs del último checkpoint:            %u\n"
+msgid "Latest checkpoint's newestCommitTsXid:%u\n"
+msgstr "newestCommitTsXid del último checkpoint:         %u\n"
 
 #: pg_resetxlog.c:672
 #, c-format
@@ -449,13 +449,13 @@
 
 #: pg_resetxlog.c:756
 #, c-format
-msgid "oldestCommitTs:                       %u\n"
-msgstr "OldestCommitTs:                       %u\n"
+msgid "oldestCommitTsXid:                    %u\n"
+msgstr "oldestCommitTsXid:                    %u\n"
 
 #: pg_resetxlog.c:761
 #, c-format
-msgid "newestCommitTs:                       %u\n"
-msgstr "newestCommitTs:                       %u\n"
+msgid "newestCommitTsXid:                    %u\n"
+msgstr "newestCommitTsXid:                    %u\n"
 
 #: pg_resetxlog.c:827
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/fr.po postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/fr.po
--- postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,28 +1,28 @@
 # translation of pg_resetxlog.po to fr_fr
 # french message translation file for pg_resetxlog
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 #
 # Guillaume Lelarge <guillaume@lelarge.info>, 2003-2009.
-# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
+# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-17 02:43+0000\n"
-"PO-Revision-Date: 2016-02-21 15:52+0100\n"
+"POT-Creation-Date: 2017-06-30 16:31+0000\n"
+"PO-Revision-Date: 2017-07-02 17:36+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.12\n"
 
 #: ../../common/restricted_token.c:68
 #, c-format
 msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s : ATTENTION : ne peut pas crér les jetons restreints sur cette plateforme\n"
+msgstr "%s : ATTENTION : ne peut pas crér les jetons restreints sur cette plateforme\n"
 
 #: ../../common/restricted_token.c:77
 #, c-format
@@ -37,115 +37,115 @@
 #: ../../common/restricted_token.c:110
 #, c-format
 msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s : n'a pas pu créer le jeton restreint : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu créer le jeton restreint : code d'erreur %lu\n"
 
 #: ../../common/restricted_token.c:132
 #, c-format
 msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s : n'a pas pu démarrer le processus pour la commande « %s » : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu démarrer le processus pour la commande « %s » : code d'erreur %lu\n"
 
 #: ../../common/restricted_token.c:170
 #, c-format
 msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr "%s : n'a pas pu ré-exécuter le jeton restreint : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu ré-exécuter le jeton restreint : code d'erreur %lu\n"
 
 #: ../../common/restricted_token.c:186
 #, c-format
 msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s : n'a pas pu récupérer le code de statut du sous-processus : code d'erreur %lu\n"
+msgstr "%s : n'a pas pu récupérer le code de statut du sous-processus : code d'erreur %lu\n"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetxlog.c:140 pg_resetxlog.c:155 pg_resetxlog.c:170 pg_resetxlog.c:177
-#: pg_resetxlog.c:201 pg_resetxlog.c:216 pg_resetxlog.c:224 pg_resetxlog.c:250
-#: pg_resetxlog.c:264
+#: pg_resetxlog.c:141 pg_resetxlog.c:156 pg_resetxlog.c:171 pg_resetxlog.c:178
+#: pg_resetxlog.c:202 pg_resetxlog.c:217 pg_resetxlog.c:225 pg_resetxlog.c:251
+#: pg_resetxlog.c:265
 #, c-format
 msgid "%s: invalid argument for option %s\n"
 msgstr "%s : argument invalide pour l'option %s\n"
 
-#: pg_resetxlog.c:141 pg_resetxlog.c:156 pg_resetxlog.c:171 pg_resetxlog.c:178
-#: pg_resetxlog.c:202 pg_resetxlog.c:217 pg_resetxlog.c:225 pg_resetxlog.c:251
-#: pg_resetxlog.c:265 pg_resetxlog.c:272 pg_resetxlog.c:285 pg_resetxlog.c:293
+#: pg_resetxlog.c:142 pg_resetxlog.c:157 pg_resetxlog.c:172 pg_resetxlog.c:179
+#: pg_resetxlog.c:203 pg_resetxlog.c:218 pg_resetxlog.c:226 pg_resetxlog.c:252
+#: pg_resetxlog.c:266 pg_resetxlog.c:273 pg_resetxlog.c:286 pg_resetxlog.c:294
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayer « %s --help » pour plus d'informations.\n"
+msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
-#: pg_resetxlog.c:146
+#: pg_resetxlog.c:147
 #, c-format
 msgid "%s: transaction ID epoch (-e) must not be -1\n"
 msgstr ""
-"%s : la valeur epoch de l'identifiant de transaction (-e) ne doit pas être\n"
+"%s : la valeur epoch de l'identifiant de transaction (-e) ne doit pas être\n"
 "-1\n"
 
-#: pg_resetxlog.c:161
+#: pg_resetxlog.c:162
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
-msgstr "%s : l'identifiant de la transaction (-x) ne doit pas être 0\n"
+msgstr "%s : l'identifiant de la transaction (-x) ne doit pas être 0\n"
 
-#: pg_resetxlog.c:185 pg_resetxlog.c:192
+#: pg_resetxlog.c:186 pg_resetxlog.c:193
 #, c-format
 msgid "%s: transaction ID (-c) must be either 0 or greater than or equal to 2\n"
-msgstr "%s : l'identifiant de transaction (-c) doit être 0 ou supérieur ou égal à 2\n"
+msgstr "%s : l'identifiant de transaction (-c) doit être 0 ou supérieur ou égal à 2\n"
 
-#: pg_resetxlog.c:207
+#: pg_resetxlog.c:208
 #, c-format
 msgid "%s: OID (-o) must not be 0\n"
-msgstr "%s : l'OID (-o) ne doit pas être 0\n"
+msgstr "%s : l'OID (-o) ne doit pas être 0\n"
 
-#: pg_resetxlog.c:230
+#: pg_resetxlog.c:231
 #, c-format
 msgid "%s: multitransaction ID (-m) must not be 0\n"
-msgstr "%s : l'identifiant de multi-transaction (-m) ne doit pas être 0\n"
+msgstr "%s : l'identifiant de multi-transaction (-m) ne doit pas être 0\n"
 
-#: pg_resetxlog.c:240
+#: pg_resetxlog.c:241
 #, c-format
 msgid "%s: oldest multitransaction ID (-m) must not be 0\n"
-msgstr "%s : l'identifiant de multi-transaction le plus ancien (-m) ne doit pas être 0\n"
+msgstr "%s : l'identifiant de multi-transaction le plus ancien (-m) ne doit pas être 0\n"
 
-#: pg_resetxlog.c:256
+#: pg_resetxlog.c:257
 #, c-format
 msgid "%s: multitransaction offset (-O) must not be -1\n"
-msgstr "%s : le décalage de multi-transaction (-O) ne doit pas être -1\n"
+msgstr "%s : le décalage de multi-transaction (-O) ne doit pas être -1\n"
 
-#: pg_resetxlog.c:283
+#: pg_resetxlog.c:284
 #, 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"
+msgstr "%s : trop d'arguments en ligne de commande (le premier étant « %s »)\n"
 
-#: pg_resetxlog.c:292
+#: pg_resetxlog.c:293
 #, c-format
 msgid "%s: no data directory specified\n"
-msgstr "%s : aucun répertoire de données indiqué\n"
+msgstr "%s : aucun répertoire de données indiqué\n"
 
-#: pg_resetxlog.c:306
+#: pg_resetxlog.c:307
 #, c-format
 msgid "%s: cannot be executed by \"root\"\n"
-msgstr "%s : ne peut pas être exécuté par « root »\n"
+msgstr "%s : ne peut pas être exécuté par « root »\n"
 
-#: pg_resetxlog.c:308
+#: pg_resetxlog.c:309
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser.\n"
-msgstr "Vous devez exécuter %s en tant que super-utilisateur PostgreSQL.\n"
+msgstr "Vous devez exécuter %s en tant que super-utilisateur PostgreSQL.\n"
 
-#: pg_resetxlog.c:318
+#: pg_resetxlog.c:319
 #, 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"
+msgstr "%s : n'a pas pu accéder au répertoire « %s » : %s\n"
 
-#: pg_resetxlog.c:331 pg_resetxlog.c:477
+#: pg_resetxlog.c:335 pg_resetxlog.c:482 pg_resetxlog.c:545
 #, 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"
+msgstr "%s : n'a pas pu ouvrir le fichier « %s » en lecture : %s\n"
 
-#: pg_resetxlog.c:338
+#: pg_resetxlog.c:342
 #, 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 : le verrou « %s » existe\n"
-"Le serveur est-il démarré ? Sinon, supprimer le fichier verrou et réessayer.\n"
+"%s : le verrou « %s » existe\n"
+"Le serveur est-il démarré ? Sinon, supprimer le fichier verrou et réessayer.\n"
 
-#: pg_resetxlog.c:425
+#: pg_resetxlog.c:429
 #, c-format
 msgid ""
 "\n"
@@ -153,62 +153,74 @@
 msgstr ""
 "\n"
 "Si ces valeurs semblent acceptables, utiliser -f pour forcer la\n"
-"réinitialisation.\n"
+"réinitialisation.\n"
 
-#: pg_resetxlog.c:437
+#: pg_resetxlog.c:441
 #, 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 ""
-"Le serveur de bases de données n'a pas été arrêté proprement.\n"
-"Ré-initialiser le journal des transactions peut occasionner des pertes de\n"
-"données.\n"
-"Pour continuer malgré tout, utiliser -f pour forcer la\n"
-"réinitialisation.\n"
+"Le serveur de bases de données n'a pas été arrêté proprement.\n"
+"Ré-initialiser le journal des transactions peut occasionner des pertes de\n"
+"données.\n"
+"Pour continuer malgré tout, utiliser -f pour forcer la\n"
+"réinitialisation.\n"
 
-#: pg_resetxlog.c:451
+#: pg_resetxlog.c:455
 #, c-format
 msgid "Transaction log reset\n"
-msgstr "Réinitialisation du journal des transactions\n"
+msgstr "Réinitialisation du journal des transactions\n"
 
-#: pg_resetxlog.c:480
+#: pg_resetxlog.c:492
+#, c-format
+msgid "%s: unexpected empty file \"%s\"\n"
+msgstr "%s : fichier vide « %s» inattendu\n"
+
+#: pg_resetxlog.c:497 pg_resetxlog.c:561
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s : n'a pas pu lire le fichier « %s » : %s\n"
+
+#: pg_resetxlog.c:514
+#, c-format
+msgid ""
+"%s: data directory is of wrong version\n"
+"File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\".\n"
+msgstr "%s : le répertoire des données n'est pas de la bonne version. Le fichier « %s » contient « %s », qui n'est pas compatible avec la version « %s » de ce programme.\n"
+
+#: pg_resetxlog.c:548
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
 "  touch %s\n"
 "and try again.\n"
 msgstr ""
-"Si le chemin du répertoire de données est correct, exécuter\n"
+"Si le chemin du répertoire de données est correct, exécuter\n"
 "  touch %s\n"
-"et réessayer.\n"
-
-#: pg_resetxlog.c:493
-#, c-format
-msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s : n'a pas pu lire le fichier « %s » : %s\n"
+"et réessayer.\n"
 
-#: pg_resetxlog.c:516
+#: pg_resetxlog.c:584
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
-msgstr "%s : pg_control existe mais son CRC est invalide ; agir avec précaution\n"
+msgstr "%s : pg_control existe mais son CRC est invalide ; agir avec précaution\n"
 
-#: pg_resetxlog.c:525
+#: pg_resetxlog.c:593
 #, c-format
-msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s : pg_control existe mais est corrompu ou de version inconnue ; ignoré\n"
+msgid "%s: pg_control exists but is broken or wrong version; ignoring it\n"
+msgstr "%s : pg_control existe mais est corrompu ou d'une mauvaise version ; ignoré\n"
 
-#: pg_resetxlog.c:628
+#: pg_resetxlog.c:696
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
 msgstr ""
-"Valeurs de pg_control devinées :\n"
+"Valeurs de pg_control devinées :\n"
 "\n"
 
-#: pg_resetxlog.c:630
+#: pg_resetxlog.c:698
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -217,176 +229,176 @@
 "Valeurs actuelles de pg_control :\n"
 "\n"
 
-#: pg_resetxlog.c:639
+#: pg_resetxlog.c:707
 #, c-format
 msgid "pg_control version number:            %u\n"
-msgstr "Numéro de version de pg_control :                       %u\n"
+msgstr "Numéro de version de pg_control :                       %u\n"
 
-#: pg_resetxlog.c:641
+#: pg_resetxlog.c:709
 #, c-format
 msgid "Catalog version number:               %u\n"
-msgstr "Numéro de version du catalogue :                        %u\n"
+msgstr "Numéro de version du catalogue :                        %u\n"
 
-#: pg_resetxlog.c:643
+#: pg_resetxlog.c:711
 #, c-format
 msgid "Database system identifier:           %s\n"
-msgstr "Identifiant du système de base de données :             %s\n"
+msgstr "Identifiant du système de base de données :             %s\n"
 
-#: pg_resetxlog.c:645
+#: pg_resetxlog.c:713
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
-msgstr "Dernier TimeLineID du point de contrôle :               %u\n"
+msgstr "Dernier TimeLineID du point de contrôle :               %u\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:715
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
-msgstr "Dernier full_page_writes du point de contrôle :         %s\n"
+msgstr "Dernier full_page_writes du point de contrôle :         %s\n"
 
-#: pg_resetxlog.c:648
+#: pg_resetxlog.c:716
 msgid "off"
-msgstr "désactivé"
+msgstr "désactivé"
 
-#: pg_resetxlog.c:648
+#: pg_resetxlog.c:716
 msgid "on"
-msgstr "activé"
+msgstr "activé"
 
-#: pg_resetxlog.c:649
+#: pg_resetxlog.c:717
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u/%u\n"
-msgstr "Dernier NextXID du point de contrôle :                  %u/%u\n"
+msgstr "Dernier NextXID du point de contrôle :                  %u/%u\n"
 
-#: pg_resetxlog.c:652
+#: pg_resetxlog.c:720
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "Dernier NextOID du point de contrôle :                  %u\n"
+msgstr "Dernier NextOID du point de contrôle :                  %u\n"
 
-#: pg_resetxlog.c:654
+#: pg_resetxlog.c:722
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
-msgstr "Dernier NextMultiXactId du point de contrôle :          %u\n"
+msgstr "Dernier NextMultiXactId du point de contrôle :          %u\n"
 
-#: pg_resetxlog.c:656
+#: pg_resetxlog.c:724
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
-msgstr "Dernier NextMultiOffset du point de contrôle :          %u\n"
+msgstr "Dernier NextMultiOffset du point de contrôle :          %u\n"
 
-#: pg_resetxlog.c:658
+#: pg_resetxlog.c:726
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
-msgstr "Dernier oldestXID du point de contrôle :                %u\n"
+msgstr "Dernier oldestXID du point de contrôle :                %u\n"
 
-#: pg_resetxlog.c:660
+#: pg_resetxlog.c:728
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
-msgstr "Dernier oldestXID du point de contrôle de la base :     %u\n"
+msgstr "Dernier oldestXID du point de contrôle de la base :     %u\n"
 
-#: pg_resetxlog.c:662
+#: pg_resetxlog.c:730
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
-msgstr "Dernier oldestActiveXID du point de contrôle :          %u\n"
+msgstr "Dernier oldestActiveXID du point de contrôle :          %u\n"
 
-#: pg_resetxlog.c:664
+#: pg_resetxlog.c:732
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
-msgstr "Dernier oldestMultiXID du point de contrôle :           %u\n"
+msgstr "Dernier oldestMultiXID du point de contrôle :           %u\n"
 
-#: pg_resetxlog.c:666
+#: pg_resetxlog.c:734
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
-msgstr "Dernier oldestMulti du point de contrôle de la base :     %u\n"
+msgstr "Dernier oldestMulti du point de contrôle de la base :     %u\n"
 
-#: pg_resetxlog.c:668
+#: pg_resetxlog.c:736
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
-msgstr "Dernier oldestCommitTsXid du point de contrôle :        %u\n"
+msgstr "Dernier oldestCommitTsXid du point de contrôle :        %u\n"
 
-#: pg_resetxlog.c:670
+#: pg_resetxlog.c:738
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
-msgstr "Dernier newestCommitTsXid du point de contrôle :        %u\n"
+msgstr "Dernier newestCommitTsXid du point de contrôle :        %u\n"
 
-#: pg_resetxlog.c:672
+#: pg_resetxlog.c:740
 #, c-format
 msgid "Maximum data alignment:               %u\n"
-msgstr "Alignement maximal des données :                        %u\n"
+msgstr "Alignement maximal des données :                        %u\n"
 
-#: pg_resetxlog.c:675
+#: pg_resetxlog.c:743
 #, c-format
 msgid "Database block size:                  %u\n"
-msgstr "Taille du bloc de la base de données :                  %u\n"
+msgstr "Taille du bloc de la base de données :                  %u\n"
 
-#: pg_resetxlog.c:677
+#: pg_resetxlog.c:745
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blocs par segment des relations volumineuses :          %u\n"
 
-#: pg_resetxlog.c:679
+#: pg_resetxlog.c:747
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Taille de bloc du journal de transaction :              %u\n"
 
-#: pg_resetxlog.c:681
+#: pg_resetxlog.c:749
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Octets par segment du journal de transaction :          %u\n"
 
-#: pg_resetxlog.c:683
+#: pg_resetxlog.c:751
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Longueur maximale des identifiants :                    %u\n"
 
-#: pg_resetxlog.c:685
+#: pg_resetxlog.c:753
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Nombre maximal de colonnes d'un index:                  %u\n"
 
-#: pg_resetxlog.c:687
+#: pg_resetxlog.c:755
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Longueur maximale d'un morceau TOAST :                  %u\n"
 
-#: pg_resetxlog.c:689
+#: pg_resetxlog.c:757
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Taille d'un morceau de Large Object :                   %u\n"
 
-#: pg_resetxlog.c:691
+#: pg_resetxlog.c:759
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Stockage du type date/heure :                           %s\n"
 
-#: pg_resetxlog.c:692
+#: pg_resetxlog.c:760
 msgid "64-bit integers"
 msgstr "entiers 64-bits"
 
-#: pg_resetxlog.c:692
+#: pg_resetxlog.c:760
 msgid "floating-point numbers"
-msgstr "nombres à virgule flottante"
+msgstr "nombres à virgule flottante"
 
-#: pg_resetxlog.c:693
+#: pg_resetxlog.c:761
 #, c-format
 msgid "Float4 argument passing:              %s\n"
 msgstr "Passage d'argument float4 :                             %s\n"
 
-#: pg_resetxlog.c:694 pg_resetxlog.c:696
+#: pg_resetxlog.c:762 pg_resetxlog.c:764
 msgid "by reference"
-msgstr "par référence"
+msgstr "par référence"
 
-#: pg_resetxlog.c:694 pg_resetxlog.c:696
+#: pg_resetxlog.c:762 pg_resetxlog.c:764
 msgid "by value"
 msgstr "par valeur"
 
-#: pg_resetxlog.c:695
+#: pg_resetxlog.c:763
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Passage d'argument float8 :                             %s\n"
 
-#: pg_resetxlog.c:697
+#: pg_resetxlog.c:765
 #, c-format
 msgid "Data page checksum version:           %u\n"
-msgstr "Version des sommes de contrôle des pages de données : %u\n"
+msgstr "Version des sommes de contrôle des pages de données : %u\n"
 
-#: pg_resetxlog.c:711
+#: pg_resetxlog.c:779
 #, c-format
 msgid ""
 "\n"
@@ -396,131 +408,131 @@
 msgstr ""
 "\n"
 "\n"
-"Valeurs à changer :\n"
+"Valeurs à changer :\n"
 "\n"
 
-#: pg_resetxlog.c:714
+#: pg_resetxlog.c:782
 #, c-format
 msgid "First log segment after reset:        %s\n"
-msgstr "Premier segment du journal après réinitialisation :     %s\n"
+msgstr "Premier segment du journal après réinitialisation :     %s\n"
 
-#: pg_resetxlog.c:718
+#: pg_resetxlog.c:786
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                      %u\n"
 
-#: pg_resetxlog.c:720
+#: pg_resetxlog.c:788
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                       %u\n"
 
-#: pg_resetxlog.c:722
+#: pg_resetxlog.c:790
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "OldestMulti's DB:                     %u\n"
 
-#: pg_resetxlog.c:728
+#: pg_resetxlog.c:796
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                      %u\n"
 
-#: pg_resetxlog.c:734
+#: pg_resetxlog.c:802
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                              %u\n"
 
-#: pg_resetxlog.c:740
+#: pg_resetxlog.c:808
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                              %u\n"
 
-#: pg_resetxlog.c:742
+#: pg_resetxlog.c:810
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                            %u\n"
 
-#: pg_resetxlog.c:744
+#: pg_resetxlog.c:812
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "OldestXID's DB:                       %u\n"
 
-#: pg_resetxlog.c:750
+#: pg_resetxlog.c:818
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "NextXID Epoch:                        %u\n"
 
-#: pg_resetxlog.c:756
+#: pg_resetxlog.c:824
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                    %u\n"
 
-#: pg_resetxlog.c:761
+#: pg_resetxlog.c:829
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                    %u\n"
 
-#: pg_resetxlog.c:827
+#: pg_resetxlog.c:895
 #, c-format
 msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix PG_CONTROL_SIZE\n"
 msgstr ""
 "%s : erreur interne -- sizeof(ControlFileData) est trop important...\n"
 "corrigez PG_CONTROL_SIZE\n"
 
-#: pg_resetxlog.c:842
+#: pg_resetxlog.c:910
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
-msgstr "%s : n'a pas pu créer le fichier pg_control : %s\n"
+msgstr "%s : n'a pas pu créer le fichier pg_control : %s\n"
 
-#: pg_resetxlog.c:853
+#: pg_resetxlog.c:921
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
-msgstr "%s : n'a pas pu écrire le fichier pg_control : %s\n"
+msgstr "%s : n'a pas pu écrire le fichier pg_control : %s\n"
 
-#: pg_resetxlog.c:860 pg_resetxlog.c:1156
+#: pg_resetxlog.c:928 pg_resetxlog.c:1224
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s : erreur fsync : %s\n"
 
-#: pg_resetxlog.c:900 pg_resetxlog.c:971 pg_resetxlog.c:1022
+#: pg_resetxlog.c:968 pg_resetxlog.c:1039 pg_resetxlog.c:1090
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s : n'a pas pu ouvrir le répertoire « %s » : %s\n"
+msgstr "%s : n'a pas pu ouvrir le répertoire « %s » : %s\n"
 
-#: pg_resetxlog.c:936 pg_resetxlog.c:993 pg_resetxlog.c:1047
+#: pg_resetxlog.c:1004 pg_resetxlog.c:1061 pg_resetxlog.c:1115
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
-msgstr "%s : n'a pas pu lire le répertoire « %s » : %s\n"
+msgstr "%s : n'a pas pu lire le répertoire « %s » : %s\n"
 
-#: pg_resetxlog.c:943 pg_resetxlog.c:1000 pg_resetxlog.c:1054
+#: pg_resetxlog.c:1011 pg_resetxlog.c:1068 pg_resetxlog.c:1122
 #, c-format
 msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s : n'a pas pu fermer le répertoire « %s » : %s\n"
+msgstr "%s : n'a pas pu fermer le répertoire « %s » : %s\n"
 
-#: pg_resetxlog.c:984 pg_resetxlog.c:1038
+#: pg_resetxlog.c:1052 pg_resetxlog.c:1106
 #, c-format
 msgid "%s: could not delete file \"%s\": %s\n"
-msgstr "%s : n'a pas pu supprimer le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu supprimer le fichier « %s » : %s\n"
 
-#: pg_resetxlog.c:1123
+#: pg_resetxlog.c:1191
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s : n'a pas pu ouvrir le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu ouvrir le fichier « %s » : %s\n"
 
-#: pg_resetxlog.c:1134 pg_resetxlog.c:1148
+#: pg_resetxlog.c:1202 pg_resetxlog.c:1216
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s : n'a pas pu écrire le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu écrire le fichier « %s » : %s\n"
 
-#: pg_resetxlog.c:1167
+#: pg_resetxlog.c:1235
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
 "\n"
 msgstr ""
-"%s réinitialise le journal des transactions PostgreSQL.\n"
+"%s réinitialise le journal des transactions PostgreSQL.\n"
 "\n"
 
-#: pg_resetxlog.c:1168
+#: pg_resetxlog.c:1236
 #, c-format
 msgid ""
 "Usage:\n"
@@ -528,117 +540,117 @@
 "\n"
 msgstr ""
 "Usage :\n"
-"  %s [OPTION]... RÉP_DONNÉES\n"
+"  %s [OPTION]... RÉP_DONNÉES\n"
 "\n"
 
-#: pg_resetxlog.c:1169
+#: pg_resetxlog.c:1237
 #, c-format
 msgid "Options:\n"
 msgstr "Options :\n"
 
-#: pg_resetxlog.c:1170
+#: pg_resetxlog.c:1238
 #, c-format
 msgid "  -c XID,XID       set oldest and newest transactions bearing commit timestamp\n"
-msgstr "  -c XID,XID      configure la plus ancienne et la plus récente transaction\n"
+msgstr "  -c XID,XID      configure la plus ancienne et la plus récente transaction\n"
 
-#: pg_resetxlog.c:1171
+#: pg_resetxlog.c:1239
 #, c-format
 msgid "                   (zero in either value means no change)\n"
-msgstr "                  (zéro dans l'une des deux valeurs signifie aucun changement)\n"
+msgstr "                  (zéro dans l'une des deux valeurs signifie aucun changement)\n"
 
-#: pg_resetxlog.c:1172
+#: pg_resetxlog.c:1240
 #, c-format
 msgid " [-D] DATADIR      data directory\n"
-msgstr "  [-D] RÉPDONNEES répertoire de la base de données\n"
+msgstr "  [-D] RÉPDONNEES répertoire de la base de données\n"
 
-#: pg_resetxlog.c:1173
+#: pg_resetxlog.c:1241
 #, c-format
 msgid "  -e XIDEPOCH      set next transaction ID epoch\n"
 msgstr ""
 "  -e XIDEPOCH     fixe la valeur epoch du prochain identifiant de\n"
 "                  transaction\n"
 
-#: pg_resetxlog.c:1174
+#: pg_resetxlog.c:1242
 #, c-format
 msgid "  -f               force update to be done\n"
-msgstr "  -f              force la mise à jour\n"
+msgstr "  -f              force la mise à jour\n"
 
-#: pg_resetxlog.c:1175
+#: pg_resetxlog.c:1243
 #, c-format
 msgid "  -l XLOGFILE      force minimum WAL starting location for new transaction log\n"
 msgstr ""
-"  -l FICHIERXLOG  force l'emplacement minimal de début des WAL du nouveau\n"
+"  -l FICHIERXLOG  force l'emplacement minimal de début des WAL du nouveau\n"
 "                  journal de transactions\n"
 
-#: pg_resetxlog.c:1176
+#: pg_resetxlog.c:1244
 #, c-format
 msgid "  -m MXID,MXID     set next and oldest multitransaction ID\n"
 msgstr "  -m MXID,MXID    fixe le prochain identifiant multi-transaction\n"
 
-#: pg_resetxlog.c:1177
+#: pg_resetxlog.c:1245
 #, c-format
 msgid "  -n               no update, just show what would be done (for testing)\n"
 msgstr ""
-"  -n              pas de mise à jour, affiche simplement ce qui sera fait\n"
+"  -n              pas de mise à jour, affiche simplement ce qui sera fait\n"
 "                  (pour test)\n"
 
-#: pg_resetxlog.c:1178
+#: pg_resetxlog.c:1246
 #, c-format
 msgid "  -o OID           set next OID\n"
 msgstr "  -o OID          fixe le prochain OID\n"
 
-#: pg_resetxlog.c:1179
+#: pg_resetxlog.c:1247
 #, c-format
 msgid "  -O OFFSET        set next multitransaction offset\n"
-msgstr "  -O DÉCALAGE     fixe le décalage de la prochaine multi-transaction\n"
+msgstr "  -O DÉCALAGE     fixe le décalage de la prochaine multi-transaction\n"
 
-#: pg_resetxlog.c:1180
+#: pg_resetxlog.c:1248
 #, c-format
 msgid "  -V, --version    output version information, then exit\n"
 msgstr "  -V, --version  affiche la version et quitte\n"
 
-#: pg_resetxlog.c:1181
+#: pg_resetxlog.c:1249
 #, c-format
 msgid "  -x XID           set next transaction ID\n"
 msgstr "  -x XID          fixe le prochain identifiant de transaction\n"
 
-#: pg_resetxlog.c:1182
+#: pg_resetxlog.c:1250
 #, c-format
 msgid "  -?, --help       show this help, then exit\n"
 msgstr "  -?, --help     affiche cette aide et quitte\n"
 
-#: pg_resetxlog.c:1183
+#: pg_resetxlog.c:1251
 #, c-format
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
+"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
-#~ msgid "First log file ID after reset:        %u\n"
-#~ msgstr "Premier identifiant du journal après réinitialisation : %u\n"
+#~ msgid "%s: invalid argument for option -x\n"
+#~ msgstr "%s : argument invalide pour l'option -x\n"
 
-#~ msgid "  --version       output version information, then exit\n"
-#~ msgstr "  --version       afficherla version et quitte\n"
+#~ msgid "%s: invalid argument for option -o\n"
+#~ msgstr "%s : argument invalide pour l'option -o\n"
 
-#~ msgid "  --help          show this help, then exit\n"
-#~ msgstr "  --help          affiche cette aide et quitte\n"
+#~ msgid "%s: invalid argument for option -m\n"
+#~ msgstr "%s : argument invalide pour l'option -m\n"
 
-#~ msgid "%s: could not read from directory \"%s\": %s\n"
-#~ msgstr "%s : n'a pas pu lire le répertoire « %s » : %s\n"
+#~ msgid "%s: invalid argument for option -O\n"
+#~ msgstr "%s : argument invalide pour l'option -O\n"
 
 #~ msgid "%s: invalid argument for option -l\n"
 #~ msgstr "%s : argument invalide pour l'option -l\n"
 
-#~ msgid "%s: invalid argument for option -O\n"
-#~ msgstr "%s : argument invalide pour l'option -O\n"
+#~ msgid "%s: could not read from directory \"%s\": %s\n"
+#~ msgstr "%s : n'a pas pu lire le répertoire « %s » : %s\n"
 
-#~ msgid "%s: invalid argument for option -m\n"
-#~ msgstr "%s : argument invalide pour l'option -m\n"
+#~ msgid "  --help          show this help, then exit\n"
+#~ msgstr "  --help          affiche cette aide et quitte\n"
 
-#~ msgid "%s: invalid argument for option -o\n"
-#~ msgstr "%s : argument invalide pour l'option -o\n"
+#~ msgid "  --version       output version information, then exit\n"
+#~ msgstr "  --version       afficherla version et quitte\n"
 
-#~ msgid "%s: invalid argument for option -x\n"
-#~ msgstr "%s : argument invalide pour l'option -x\n"
+#~ msgid "First log file ID after reset:        %u\n"
+#~ msgstr "Premier identifiant du journal après réinitialisation : %u\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/it.po postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/it.po
--- postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -23,8 +23,8 @@
 msgstr ""
 "Project-Id-Version: pg_resetxlog (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-06 14:43+0000\n"
-"PO-Revision-Date: 2015-07-07 03:01+0100\n"
+"POT-Creation-Date: 2016-04-12 00:43+0000\n"
+"PO-Revision-Date: 2016-04-17 20:51+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -32,6 +32,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #: ../../common/restricted_token.c:68
@@ -70,86 +71,86 @@
 msgstr "%s: lettura del codice di uscita del sottoprocesso fallita: codice di errore %lu\n"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetxlog.c:142 pg_resetxlog.c:157 pg_resetxlog.c:172 pg_resetxlog.c:179
-#: pg_resetxlog.c:203 pg_resetxlog.c:218 pg_resetxlog.c:226 pg_resetxlog.c:252
-#: pg_resetxlog.c:266
+#: pg_resetxlog.c:140 pg_resetxlog.c:155 pg_resetxlog.c:170 pg_resetxlog.c:177
+#: pg_resetxlog.c:201 pg_resetxlog.c:216 pg_resetxlog.c:224 pg_resetxlog.c:250
+#: pg_resetxlog.c:264
 #, c-format
 msgid "%s: invalid argument for option %s\n"
 msgstr "%s: argomento non valido per l'opzione %s\n"
 
-#: pg_resetxlog.c:143 pg_resetxlog.c:158 pg_resetxlog.c:173 pg_resetxlog.c:180
-#: pg_resetxlog.c:204 pg_resetxlog.c:219 pg_resetxlog.c:227 pg_resetxlog.c:253
-#: pg_resetxlog.c:267 pg_resetxlog.c:274 pg_resetxlog.c:287 pg_resetxlog.c:295
+#: pg_resetxlog.c:141 pg_resetxlog.c:156 pg_resetxlog.c:171 pg_resetxlog.c:178
+#: pg_resetxlog.c:202 pg_resetxlog.c:217 pg_resetxlog.c:225 pg_resetxlog.c:251
+#: pg_resetxlog.c:265 pg_resetxlog.c:272 pg_resetxlog.c:285 pg_resetxlog.c:293
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
 
-#: pg_resetxlog.c:148
+#: pg_resetxlog.c:146
 #, c-format
 msgid "%s: transaction ID epoch (-e) must not be -1\n"
 msgstr "%s: l'ID epoch della transazione (-e) non deve essere -1\n"
 
-#: pg_resetxlog.c:163
+#: pg_resetxlog.c:161
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: l'ID della transazione (-x) non deve essere 0\n"
 
-#: pg_resetxlog.c:187 pg_resetxlog.c:194
+#: pg_resetxlog.c:185 pg_resetxlog.c:192
 #, c-format
 msgid "%s: transaction ID (-c) must be either 0 or greater than or equal to 2\n"
 msgstr "%s: l'ID di transazione (-c) dev'essere 0 or maggiore o uguale a 2\n"
 
-#: pg_resetxlog.c:209
+#: pg_resetxlog.c:207
 #, c-format
 msgid "%s: OID (-o) must not be 0\n"
 msgstr "%s: l'OID (-o) non deve essere 0\n"
 
-#: pg_resetxlog.c:232
+#: pg_resetxlog.c:230
 #, c-format
 msgid "%s: multitransaction ID (-m) must not be 0\n"
 msgstr "%s: l'ID della multitransazione (-m) non deve essere 0\n"
 
-#: pg_resetxlog.c:242
+#: pg_resetxlog.c:240
 #, c-format
 msgid "%s: oldest multitransaction ID (-m) must not be 0\n"
 msgstr "%s: l'ID multitransazione più vecchio (-m) non può essere 0\n"
 
-#: pg_resetxlog.c:258
+#: pg_resetxlog.c:256
 #, c-format
 msgid "%s: multitransaction offset (-O) must not be -1\n"
 msgstr "%s: l'offset di una multitransazione (-O) non può essere -1\n"
 
-#: pg_resetxlog.c:285
+#: pg_resetxlog.c:283
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: troppi argomenti di riga di comando (il primo è \"%s\")\n"
 
-#: pg_resetxlog.c:294
+#: pg_resetxlog.c:292
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: non è stata specificata una directory per i dati\n"
 
-#: pg_resetxlog.c:308
+#: pg_resetxlog.c:306
 #, c-format
 msgid "%s: cannot be executed by \"root\"\n"
 msgstr "%s non può essere eseguito da \"root\"\n"
 
-#: pg_resetxlog.c:310
+#: pg_resetxlog.c:308
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser.\n"
 msgstr "È obbligatorio eseguire %s come superutente di PostgreSQL.\n"
 
-#: pg_resetxlog.c:320
+#: pg_resetxlog.c:318
 #, c-format
 msgid "%s: could not change directory to \"%s\": %s\n"
 msgstr "%s: spostamento nella directory \"%s\" fallito: %s\n"
 
-#: pg_resetxlog.c:333 pg_resetxlog.c:479
+#: pg_resetxlog.c:331 pg_resetxlog.c:477
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: errore nell'apertura del file \"%s\" per la lettura: %s\n"
 
-#: pg_resetxlog.c:340
+#: pg_resetxlog.c:338
 #, c-format
 msgid ""
 "%s: lock file \"%s\" exists\n"
@@ -158,7 +159,7 @@
 "%s: il file di lock \"%s\" esiste\n"
 "Il server è in esecuzione? Se non lo è, cancella il file di lock e riprova.\n"
 
-#: pg_resetxlog.c:427
+#: pg_resetxlog.c:425
 #, c-format
 msgid ""
 "\n"
@@ -167,7 +168,7 @@
 "\n"
 "Se questi parametri sembrano accettabili, utilizza -f per forzare un reset.\n"
 
-#: pg_resetxlog.c:439
+#: pg_resetxlog.c:437
 #, c-format
 msgid ""
 "The database server was not shut down cleanly.\n"
@@ -178,12 +179,12 @@
 "Resettare il registro delle transazioni può causare una perdita di dati.\n"
 "Se vuoi continuare comunque, utilizza -f per forzare il reset.\n"
 
-#: pg_resetxlog.c:453
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Transaction log reset\n"
 msgstr "Registro delle transazioni riavviato\n"
 
-#: pg_resetxlog.c:482
+#: pg_resetxlog.c:480
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -194,22 +195,22 @@
 "  touch %s\n"
 "e riprova.\n"
 
-#: pg_resetxlog.c:495
+#: pg_resetxlog.c:493
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
 msgstr "%s: lettura del file \"%s\" fallita: %s\n"
 
-#: pg_resetxlog.c:518
+#: pg_resetxlog.c:516
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
 msgstr "%s: pg_control esiste ma ha un CRC non valido; procedere con cautela\n"
 
-#: pg_resetxlog.c:527
+#: pg_resetxlog.c:525
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
 msgstr "%s: pg_control esiste ma è inutilizzabile o è una versione sconosciuta; verrà ignorato\n"
 
-#: pg_resetxlog.c:630
+#: pg_resetxlog.c:628
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -218,7 +219,7 @@
 "Valori pg_control indovinati:\n"
 "\n"
 
-#: pg_resetxlog.c:632
+#: pg_resetxlog.c:630
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -227,176 +228,176 @@
 "Valori pg_control attuali:\n"
 "\n"
 
-#: pg_resetxlog.c:641
+#: pg_resetxlog.c:639
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "Numero di versione di pg_control:           %u\n"
 
-#: pg_resetxlog.c:643
+#: pg_resetxlog.c:641
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Numero di versione del catalogo:            %u\n"
 
-#: pg_resetxlog.c:645
+#: pg_resetxlog.c:643
 #, c-format
 msgid "Database system identifier:           %s\n"
 msgstr "Identificatore di sistema del database:     %s\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:645
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "TimeLineId dell'ultimo checkpoint:          %u\n"
 
-#: pg_resetxlog.c:649
+#: pg_resetxlog.c:647
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "full_page_writes dell'ultimo checkpoint:    %s\n"
 
-#: pg_resetxlog.c:650
+#: pg_resetxlog.c:648
 msgid "off"
 msgstr "disattivato"
 
-#: pg_resetxlog.c:650
+#: pg_resetxlog.c:648
 msgid "on"
 msgstr "attivato"
 
-#: pg_resetxlog.c:651
+#: pg_resetxlog.c:649
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u/%u\n"
 msgstr "NextXID dell'ultimo checkpoint:             %u%u\n"
 
-#: pg_resetxlog.c:654
+#: pg_resetxlog.c:652
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID dell'ultimo checkpoint:             %u\n"
 
-#: pg_resetxlog.c:656
+#: pg_resetxlog.c:654
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId dell'ultimo checkpoint:     %u\n"
 
-#: pg_resetxlog.c:658
+#: pg_resetxlog.c:656
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset dell'ultimo checkpoint:     %u\n"
 
-#: pg_resetxlog.c:660
+#: pg_resetxlog.c:658
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID dell'ultimo checkpoint:           %u\n"
 
-#: pg_resetxlog.c:662
+#: pg_resetxlog.c:660
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "DB dell'oldestXID dell'ultimo checkpoint:   %u\n"
 
-#: pg_resetxlog.c:664
+#: pg_resetxlog.c:662
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "oldestActiveXID dell'ultimo checkpoint:     %u\n"
 
-#: pg_resetxlog.c:666
+#: pg_resetxlog.c:664
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXID dell'ultimo checkpoint:      %u\n"
 
-#: pg_resetxlog.c:668
+#: pg_resetxlog.c:666
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "DB dell'oldestMulti dell'ultimo checkpoint: %u\n"
 
-#: pg_resetxlog.c:670
+#: pg_resetxlog.c:668
 #, c-format
-msgid "Latest checkpoint's oldest CommitTs:  %u\n"
-msgstr "CommitTs più vecchio ultimo checkpoint:     %u\n"
+msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
+msgstr "oldestCommitTsXid dell'ultimo checkpoint:   %u\n"
 
-#: pg_resetxlog.c:672
+#: pg_resetxlog.c:670
 #, c-format
-msgid "Latest checkpoint's newest CommitTs:  %u\n"
-msgstr "CommitTs più nuovo dell'ultimo checkpoint:  %u\n"
+msgid "Latest checkpoint's newestCommitTsXid:%u\n"
+msgstr "newestCommitTsXid dell'ultimo checkpoint:   %u\n"
 
-#: pg_resetxlog.c:674
+#: pg_resetxlog.c:672
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Massimo allineamento dei dati:              %u\n"
 
-#: pg_resetxlog.c:677
+#: pg_resetxlog.c:675
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Dimensione blocco database:                 %u\n"
 
-#: pg_resetxlog.c:679
+#: pg_resetxlog.c:677
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blocchi per ogni segmento grosse tabelle:   %u\n"
 
-#: pg_resetxlog.c:681
+#: pg_resetxlog.c:679
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Dimensione blocco WAL:                      %u\n"
 
-#: pg_resetxlog.c:683
+#: pg_resetxlog.c:681
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Byte per segmento WAL:                      %u\n"
 
-#: pg_resetxlog.c:685
+#: pg_resetxlog.c:683
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Lunghezza massima degli identificatori:     %u\n"
 
-#: pg_resetxlog.c:687
+#: pg_resetxlog.c:685
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Massimo numero di colonne in un indice:     %u\n"
 
-#: pg_resetxlog.c:689
+#: pg_resetxlog.c:687
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Massima dimensione di un segmento TOAST:    %u\n"
 
-#: pg_resetxlog.c:691
+#: pg_resetxlog.c:689
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Dimensione di un blocco large-object:       %u\n"
 
-#: pg_resetxlog.c:693
+#: pg_resetxlog.c:691
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Memorizzazione per tipi data/ora:           %s\n"
 
-#: pg_resetxlog.c:694
+#: pg_resetxlog.c:692
 msgid "64-bit integers"
 msgstr "interi a 64 bit"
 
-#: pg_resetxlog.c:694
+#: pg_resetxlog.c:692
 msgid "floating-point numbers"
 msgstr "numeri in virgola mobile"
 
-#: pg_resetxlog.c:695
+#: pg_resetxlog.c:693
 #, c-format
 msgid "Float4 argument passing:              %s\n"
 msgstr "Passaggio di argomenti Float4:              %s\n"
 
-#: pg_resetxlog.c:696 pg_resetxlog.c:698
+#: pg_resetxlog.c:694 pg_resetxlog.c:696
 msgid "by reference"
 msgstr "per riferimento"
 
-#: pg_resetxlog.c:696 pg_resetxlog.c:698
+#: pg_resetxlog.c:694 pg_resetxlog.c:696
 msgid "by value"
 msgstr "per valore"
 
-#: pg_resetxlog.c:697
+#: pg_resetxlog.c:695
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "passaggio di argomenti Float8:              %s\n"
 
-#: pg_resetxlog.c:699
+#: pg_resetxlog.c:697
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Versione somma di controllo dati pagine:    %u\n"
 
-#: pg_resetxlog.c:713
+#: pg_resetxlog.c:711
 #, c-format
 msgid ""
 "\n"
@@ -409,117 +410,117 @@
 "Valori da cambiare:\n"
 "\n"
 
-#: pg_resetxlog.c:716
+#: pg_resetxlog.c:714
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "Primo segmento di log dopo il reset:        %s\n"
 
-#: pg_resetxlog.c:720
+#: pg_resetxlog.c:718
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                            %u\n"
 
-#: pg_resetxlog.c:722
+#: pg_resetxlog.c:720
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                             %u\n"
 
-#: pg_resetxlog.c:724
+#: pg_resetxlog.c:722
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "DB di OldestMulti:                          %u\n"
 
-#: pg_resetxlog.c:730
+#: pg_resetxlog.c:728
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                            %u\n"
 
-#: pg_resetxlog.c:736
+#: pg_resetxlog.c:734
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                                    %u\n"
 
-#: pg_resetxlog.c:742
+#: pg_resetxlog.c:740
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                                    %u\n"
 
-#: pg_resetxlog.c:744
+#: pg_resetxlog.c:742
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                                  %u\n"
 
-#: pg_resetxlog.c:746
+#: pg_resetxlog.c:744
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "DB di OldestXID:                            %u\n"
 
-#: pg_resetxlog.c:752
+#: pg_resetxlog.c:750
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "Epoca del NextXID:                          %u\n"
 
-#: pg_resetxlog.c:758
+#: pg_resetxlog.c:756
 #, c-format
-msgid "oldestCommitTs:                       %u\n"
-msgstr "oldestCommitTs:                             %u\n"
+msgid "oldestCommitTsXid:                    %u\n"
+msgstr "oldestCommitTsXid:                          %u\n"
 
-#: pg_resetxlog.c:763
+#: pg_resetxlog.c:761
 #, c-format
-msgid "newestCommitTs:                       %u\n"
-msgstr "newestCommitTs:                             %u\n"
+msgid "newestCommitTsXid:                    %u\n"
+msgstr "newestCommitTsXid:                          %u\n"
 
-#: pg_resetxlog.c:829
+#: pg_resetxlog.c:827
 #, c-format
 msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix PG_CONTROL_SIZE\n"
 msgstr "%s: errore interno -- sizeof(ControlFileData) è troppo grande ... correggere PG_CONTROL_SIZE\n"
 
-#: pg_resetxlog.c:844
+#: pg_resetxlog.c:842
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: creazione del file pg_control fallita: %s\n"
 
-#: pg_resetxlog.c:855
+#: pg_resetxlog.c:853
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: scrittura del file pg_control fallita: %s\n"
 
-#: pg_resetxlog.c:862 pg_resetxlog.c:1158
+#: pg_resetxlog.c:860 pg_resetxlog.c:1156
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: errore fsync: %s\n"
 
-#: pg_resetxlog.c:902 pg_resetxlog.c:973 pg_resetxlog.c:1024
+#: pg_resetxlog.c:900 pg_resetxlog.c:971 pg_resetxlog.c:1022
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: apertura della directory \"%s\" fallita: %s\n"
 
-#: pg_resetxlog.c:938 pg_resetxlog.c:995 pg_resetxlog.c:1049
+#: pg_resetxlog.c:936 pg_resetxlog.c:993 pg_resetxlog.c:1047
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: lettura della directory \"%s\" fallita: %s\n"
 
-#: pg_resetxlog.c:945 pg_resetxlog.c:1002 pg_resetxlog.c:1056
+#: pg_resetxlog.c:943 pg_resetxlog.c:1000 pg_resetxlog.c:1054
 #, c-format
 msgid "%s: could not close directory \"%s\": %s\n"
 msgstr "%s: chiusura della directory \"%s\" fallita: %s\n"
 
-#: pg_resetxlog.c:986 pg_resetxlog.c:1040
+#: pg_resetxlog.c:984 pg_resetxlog.c:1038
 #, c-format
 msgid "%s: could not delete file \"%s\": %s\n"
 msgstr "%s: cancellazione del file \"%s\" fallita: %s\n"
 
-#: pg_resetxlog.c:1125
+#: pg_resetxlog.c:1123
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: apertura del file \"%s\" fallita: %s\n"
 
-#: pg_resetxlog.c:1136 pg_resetxlog.c:1150
+#: pg_resetxlog.c:1134 pg_resetxlog.c:1148
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: errore nella scrittura del file \"%s\": %s\n"
 
-#: pg_resetxlog.c:1169
+#: pg_resetxlog.c:1167
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
@@ -528,83 +529,88 @@
 "%s riavvia il registro delle transazioni di PostgreSQL.\n"
 "\n"
 
-#: pg_resetxlog.c:1170
+#: pg_resetxlog.c:1168
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [OPTION]... {[-D] DATADIR}\n"
+"  %s [OPTION]... DATADIR\n"
 "\n"
 msgstr ""
 "Utilizzo:\n"
-"  %s [OPZIONE]... {[-D] DATADIR}\n"
+"  %s [OPZIONI]... DATADIR\n"
 "\n"
 
-#: pg_resetxlog.c:1171
+#: pg_resetxlog.c:1169
 #, c-format
 msgid "Options:\n"
 msgstr "Opzioni:\n"
 
-#: pg_resetxlog.c:1172
+#: pg_resetxlog.c:1170
 #, c-format
 msgid "  -c XID,XID       set oldest and newest transactions bearing commit timestamp\n"
 msgstr "  -c XID,XID       imposta le transazione più vecchia e più nuova che portano l'ora di commit\n"
 
-#: pg_resetxlog.c:1173
+#: pg_resetxlog.c:1171
 #, c-format
 msgid "                   (zero in either value means no change)\n"
 msgstr "                   (zero in uno dei dei valori vuol dire nessun cambiamento)\n"
 
-#: pg_resetxlog.c:1174
+#: pg_resetxlog.c:1172
+#, c-format
+msgid " [-D] DATADIR      data directory\n"
+msgstr " [-D] DATADIR      directory dei dati\n"
+
+#: pg_resetxlog.c:1173
 #, c-format
 msgid "  -e XIDEPOCH      set next transaction ID epoch\n"
 msgstr "  -e XIDEPOCH      imposta il prossimo ID epoch transazione\n"
 
-#: pg_resetxlog.c:1175
+#: pg_resetxlog.c:1174
 #, c-format
 msgid "  -f               force update to be done\n"
 msgstr "  -f               forza l'esecuzione dell'aggiornamento\n"
 
-#: pg_resetxlog.c:1176
+#: pg_resetxlog.c:1175
 #, c-format
 msgid "  -l XLOGFILE      force minimum WAL starting location for new transaction log\n"
 msgstr "  -l XLOGFILE      forza la locazione di inizio WAL minima per il nuovo log transazioni\n"
 
-#: pg_resetxlog.c:1177
+#: pg_resetxlog.c:1176
 #, c-format
 msgid "  -m MXID,MXID     set next and oldest multitransaction ID\n"
 msgstr "  -m MXID,MXID     imposta gli ID multitransazione successivo e più vecchio\n"
 
-#: pg_resetxlog.c:1178
+#: pg_resetxlog.c:1177
 #, c-format
 msgid "  -n               no update, just show what would be done (for testing)\n"
 msgstr "  -n               nessuna modifica, mostra solo cosa sarebbe fatto (per prova)\n"
 
-#: pg_resetxlog.c:1179
+#: pg_resetxlog.c:1178
 #, c-format
 msgid "  -o OID           set next OID\n"
 msgstr "  -o OID           imposta il prossimo OID\n"
 
-#: pg_resetxlog.c:1180
+#: pg_resetxlog.c:1179
 #, c-format
 msgid "  -O OFFSET        set next multitransaction offset\n"
 msgstr "  -O OFFSET        imposta il prossimo offset multitransazione\n"
 
-#: pg_resetxlog.c:1181
+#: pg_resetxlog.c:1180
 #, c-format
 msgid "  -V, --version    output version information, then exit\n"
 msgstr "  -V, --version    mostra informazioni sulla versione ed esci\n"
 
-#: pg_resetxlog.c:1182
+#: pg_resetxlog.c:1181
 #, c-format
 msgid "  -x XID           set next transaction ID\n"
 msgstr "  -x XID           imposta il prossimo ID di transazione\n"
 
-#: pg_resetxlog.c:1183
+#: pg_resetxlog.c:1182
 #, c-format
 msgid "  -?, --help       show this help, then exit\n"
 msgstr "  -?, --help       mostra questo aiuto ed esci\n"
 
-#: pg_resetxlog.c:1184
+#: pg_resetxlog.c:1183
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/pt_BR.po postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/pt_BR.po
--- postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/pt_BR.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/pt_BR.po	2017-08-07 21:13:41.000000000 +0000
@@ -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-2016.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-13 17:22-0300\n"
+"POT-Creation-Date: 2017-08-06 01:45-0300\n"
 "PO-Revision-Date: 2005-10-04 22:55-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -54,86 +54,86 @@
 msgstr "%s: não pôde obter código de saída de subprocesso: código de erro %lu\n"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetxlog.c:140 pg_resetxlog.c:155 pg_resetxlog.c:170 pg_resetxlog.c:177
-#: pg_resetxlog.c:201 pg_resetxlog.c:216 pg_resetxlog.c:224 pg_resetxlog.c:250
-#: pg_resetxlog.c:264
+#: pg_resetxlog.c:141 pg_resetxlog.c:156 pg_resetxlog.c:171 pg_resetxlog.c:178
+#: pg_resetxlog.c:202 pg_resetxlog.c:217 pg_resetxlog.c:225 pg_resetxlog.c:251
+#: pg_resetxlog.c:265
 #, c-format
 msgid "%s: invalid argument for option %s\n"
 msgstr "%s: argumento inválido para opção %s\n"
 
-#: pg_resetxlog.c:141 pg_resetxlog.c:156 pg_resetxlog.c:171 pg_resetxlog.c:178
-#: pg_resetxlog.c:202 pg_resetxlog.c:217 pg_resetxlog.c:225 pg_resetxlog.c:251
-#: pg_resetxlog.c:265 pg_resetxlog.c:272 pg_resetxlog.c:285 pg_resetxlog.c:293
+#: pg_resetxlog.c:142 pg_resetxlog.c:157 pg_resetxlog.c:172 pg_resetxlog.c:179
+#: pg_resetxlog.c:203 pg_resetxlog.c:218 pg_resetxlog.c:226 pg_resetxlog.c:252
+#: pg_resetxlog.c:266 pg_resetxlog.c:273 pg_resetxlog.c:286 pg_resetxlog.c:294
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: pg_resetxlog.c:146
+#: pg_resetxlog.c:147
 #, c-format
 msgid "%s: transaction ID epoch (-e) must not be -1\n"
 msgstr "%s: época do ID da transação (-e) não deve ser -1\n"
 
-#: pg_resetxlog.c:161
+#: pg_resetxlog.c:162
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: ID da transação (-x) não deve ser 0\n"
 
-#: pg_resetxlog.c:185 pg_resetxlog.c:192
+#: pg_resetxlog.c:186 pg_resetxlog.c:193
 #, c-format
 msgid "%s: transaction ID (-c) must be either 0 or greater than or equal to 2\n"
 msgstr "%s: ID de transação (-c) deve ser 0 ou maior ou igual a 2\n"
 
-#: pg_resetxlog.c:207
+#: pg_resetxlog.c:208
 #, c-format
 msgid "%s: OID (-o) must not be 0\n"
 msgstr "%s: OID (-o) não deve ser 0\n"
 
-#: pg_resetxlog.c:230
+#: pg_resetxlog.c:231
 #, c-format
 msgid "%s: multitransaction ID (-m) must not be 0\n"
 msgstr "%s: ID de transação múltipla (-m) não deve ser 0\n"
 
-#: pg_resetxlog.c:240
+#: pg_resetxlog.c:241
 #, c-format
 msgid "%s: oldest multitransaction ID (-m) must not be 0\n"
 msgstr "%s: ID de transação múltipla mais velho (-m) não deve ser 0\n"
 
-#: pg_resetxlog.c:256
+#: pg_resetxlog.c:257
 #, c-format
 msgid "%s: multitransaction offset (-O) must not be -1\n"
 msgstr "%s: deslocamento da transação múltipla (-O) não deve ser -1\n"
 
-#: pg_resetxlog.c:283
+#: pg_resetxlog.c:284
 #, 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_resetxlog.c:292
+#: pg_resetxlog.c:293
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: nenhum diretório de dados foi especificado\n"
 
-#: pg_resetxlog.c:306
+#: pg_resetxlog.c:307
 #, c-format
 msgid "%s: cannot be executed by \"root\"\n"
 msgstr "%s: não pode ser executado pelo \"root\"\n"
 
-#: pg_resetxlog.c:308
+#: pg_resetxlog.c:309
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser.\n"
 msgstr "Você deve executar %s como um super-usuário do PostgreSQL.\n"
 
-#: pg_resetxlog.c:318
+#: pg_resetxlog.c:319
 #, 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"
 
-#: pg_resetxlog.c:331 pg_resetxlog.c:477
+#: pg_resetxlog.c:335 pg_resetxlog.c:482 pg_resetxlog.c:545
 #, 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"
 
-#: pg_resetxlog.c:338
+#: pg_resetxlog.c:342
 #, c-format
 msgid ""
 "%s: lock file \"%s\" exists\n"
@@ -142,7 +142,7 @@
 "%s: arquivo de bloqueio \"%s\" existe\n"
 "O servidor está executando? Se não, apague o arquivo de bloqueio e tente novamente.\n"
 
-#: pg_resetxlog.c:425
+#: pg_resetxlog.c:429
 #, c-format
 msgid ""
 "\n"
@@ -151,7 +151,7 @@
 "\n"
 "Se estes valores lhe parecem aceitáveis, use -f para forçar o reinício.\n"
 
-#: pg_resetxlog.c:437
+#: pg_resetxlog.c:441
 #, c-format
 msgid ""
 "The database server was not shut down cleanly.\n"
@@ -162,12 +162,31 @@
 "Reiniciar o log de transação pode causar perda de dados.\n"
 "Se você quer continuar mesmo assim, use -f para forçar o reinício.\n"
 
-#: pg_resetxlog.c:451
+#: pg_resetxlog.c:455
 #, c-format
 msgid "Transaction log reset\n"
 msgstr "Log de transação reiniciado\n"
 
-#: pg_resetxlog.c:480
+#: pg_resetxlog.c:492
+#, c-format
+msgid "%s: unexpected empty file \"%s\"\n"
+msgstr "%s: arquivo vazio \"%s\" inesperado\n"
+
+#: pg_resetxlog.c:497 pg_resetxlog.c:561
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: não pôde ler arquivo \"%s\": %s\n"
+
+#: pg_resetxlog.c:514
+#, c-format
+msgid ""
+"%s: data directory is of wrong version\n"
+"File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\".\n"
+msgstr ""
+"%s: diretório de dados é da versão incorreta\n"
+"Arquivo \"%s\" contém \"%s\", que não é compatível com a versão \"%s\" deste programa.\n"
+
+#: pg_resetxlog.c:548
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -178,22 +197,17 @@
 "  touch %s\n"
 "e tente novamente.\n"
 
-#: pg_resetxlog.c:493
-#, c-format
-msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: não pôde ler arquivo \"%s\": %s\n"
-
-#: pg_resetxlog.c:516
+#: pg_resetxlog.c:584
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
 msgstr "%s: pg_control existe mas tem CRC inválido: prossiga com cuidado\n"
 
-#: pg_resetxlog.c:525
+#: pg_resetxlog.c:593
 #, c-format
-msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control existe mas não funciona ou sua versão é desconhecida; ignorando-o\n"
+msgid "%s: pg_control exists but is broken or wrong version; ignoring it\n"
+msgstr "%s: pg_control existe mas não funciona ou sua versão está incorreta; ignorando-o\n"
 
-#: pg_resetxlog.c:628
+#: pg_resetxlog.c:696
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -202,7 +216,7 @@
 "Valores supostos do pg_control:\n"
 "\n"
 
-#: pg_resetxlog.c:630
+#: pg_resetxlog.c:698
 #, c-format
 msgid ""
 "Current pg_control values:\n"
@@ -211,176 +225,176 @@
 "Valores atuais do pg_control:\n"
 "\n"
 
-#: pg_resetxlog.c:639
+#: pg_resetxlog.c:707
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "número da versão do pg_control:                    %u\n"
 
-#: pg_resetxlog.c:641
+#: pg_resetxlog.c:709
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Número da versão do catálogo:                      %u\n"
 
-#: pg_resetxlog.c:643
+#: pg_resetxlog.c:711
 #, c-format
 msgid "Database system identifier:           %s\n"
 msgstr "Identificador do sistema de banco de dados:        %s\n"
 
-#: pg_resetxlog.c:645
+#: pg_resetxlog.c:713
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "TimeLineID do último ponto de controle:            %u\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:715
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "full_page_writes do último ponto de controle:      %s\n"
 
-#: pg_resetxlog.c:648
+#: pg_resetxlog.c:716
 msgid "off"
 msgstr "desabilitado"
 
-#: pg_resetxlog.c:648
+#: pg_resetxlog.c:716
 msgid "on"
 msgstr "habilitado"
 
-#: pg_resetxlog.c:649
+#: pg_resetxlog.c:717
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u/%u\n"
 msgstr "NextXID do último ponto de controle:               %u/%u\n"
 
-#: pg_resetxlog.c:652
+#: pg_resetxlog.c:720
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID do último ponto de controle:               %u\n"
 
-#: pg_resetxlog.c:654
+#: pg_resetxlog.c:722
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId do último ponto de controle:       %u\n"
 
-#: pg_resetxlog.c:656
+#: pg_resetxlog.c:724
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset do último ponto de controle:       %u\n"
 
-#: pg_resetxlog.c:658
+#: pg_resetxlog.c:726
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID do último ponto de controle:             %u\n"
 
-#: pg_resetxlog.c:660
+#: pg_resetxlog.c:728
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "BD do oldestXID do último ponto de controle:       %u\n"
 
-#: pg_resetxlog.c:662
+#: pg_resetxlog.c:730
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
 msgstr "oldestActiveXID do último ponto de controle:       %u\n"
 
-#: pg_resetxlog.c:664
+#: pg_resetxlog.c:732
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXid do último ponto de controle:        %u\n"
 
-#: pg_resetxlog.c:666
+#: pg_resetxlog.c:734
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
 msgstr "BD do oldestMulti do último ponto de controle:     %u\n"
 
-#: pg_resetxlog.c:668
+#: pg_resetxlog.c:736
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "oldestCommitTsXid do último ponto de controle:     %u\n"
 
-#: pg_resetxlog.c:670
+#: pg_resetxlog.c:738
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "newestCommitTsXid do último ponto de controle:     %u\n"
 
-#: pg_resetxlog.c:672
+#: pg_resetxlog.c:740
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Máximo alinhamento de dado:                        %u\n"
 
-#: pg_resetxlog.c:675
+#: pg_resetxlog.c:743
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Tamanho do bloco do banco de dados:                %u\n"
 
-#: pg_resetxlog.c:677
+#: pg_resetxlog.c:745
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blocos por segmento da relação grande:             %u\n"
 
-#: pg_resetxlog.c:679
+#: pg_resetxlog.c:747
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "Tamanho do bloco do WAL:                           %u\n"
 
-#: pg_resetxlog.c:681
+#: pg_resetxlog.c:749
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Bytes por segmento do WAL:                         %u\n"
 
-#: pg_resetxlog.c:683
+#: pg_resetxlog.c:751
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Tamanho máximo de identificadores:                 %u\n"
 
-#: pg_resetxlog.c:685
+#: pg_resetxlog.c:753
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "Máximo de colunas em um índice:                    %u\n"
 
-#: pg_resetxlog.c:687
+#: pg_resetxlog.c:755
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "Tamanho máximo do bloco TOAST:                     %u\n"
 
-#: pg_resetxlog.c:689
+#: pg_resetxlog.c:757
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
 msgstr "Tamanho do bloco de um objeto grande:              %u\n"
 
-#: pg_resetxlog.c:691
+#: pg_resetxlog.c:759
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Tipo de data/hora do repositório:                  %s\n"
 
-#: pg_resetxlog.c:692
+#: pg_resetxlog.c:760
 msgid "64-bit integers"
 msgstr "inteiros de 64 bits"
 
-#: pg_resetxlog.c:692
+#: pg_resetxlog.c:760
 msgid "floating-point numbers"
 msgstr "números de ponto flutuante"
 
-#: pg_resetxlog.c:693
+#: pg_resetxlog.c:761
 #, c-format
 msgid "Float4 argument passing:              %s\n"
 msgstr "Passagem de argumento float4:                      %s\n"
 
-#: pg_resetxlog.c:694 pg_resetxlog.c:696
+#: pg_resetxlog.c:762 pg_resetxlog.c:764
 msgid "by reference"
 msgstr "por referência"
 
-#: pg_resetxlog.c:694 pg_resetxlog.c:696
+#: pg_resetxlog.c:762 pg_resetxlog.c:764
 msgid "by value"
 msgstr "por valor"
 
-#: pg_resetxlog.c:695
+#: pg_resetxlog.c:763
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Passagem de argumento float8:                      %s\n"
 
-#: pg_resetxlog.c:697
+#: pg_resetxlog.c:765
 #, c-format
 msgid "Data page checksum version:           %u\n"
 msgstr "Versão da verificação de páginas de dados:         %u\n"
 
-#: pg_resetxlog.c:711
+#: pg_resetxlog.c:779
 #, c-format
 msgid ""
 "\n"
@@ -393,117 +407,117 @@
 "Valores a serem alterados:\n"
 "\n"
 
-#: pg_resetxlog.c:714
+#: pg_resetxlog.c:782
 #, c-format
 msgid "First log segment after reset:        %s\n"
 msgstr "Primeiro segmento do arquivo de log após reinício: %s\n"
 
-#: pg_resetxlog.c:718
+#: pg_resetxlog.c:786
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
 msgstr "NextMultiXactId:                                   %u\n"
 
-#: pg_resetxlog.c:720
+#: pg_resetxlog.c:788
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
 msgstr "OldestMultiXid:                                    %u\n"
 
-#: pg_resetxlog.c:722
+#: pg_resetxlog.c:790
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
 msgstr "BD do OldestMulti:                                 %u\n"
 
-#: pg_resetxlog.c:728
+#: pg_resetxlog.c:796
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
 msgstr "NextMultiOffset:                                   %u\n"
 
-#: pg_resetxlog.c:734
+#: pg_resetxlog.c:802
 #, c-format
 msgid "NextOID:                              %u\n"
 msgstr "NextOID:                                           %u\n"
 
-#: pg_resetxlog.c:740
+#: pg_resetxlog.c:808
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                                           %u\n"
 
-#: pg_resetxlog.c:742
+#: pg_resetxlog.c:810
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                                         %u\n"
 
-#: pg_resetxlog.c:744
+#: pg_resetxlog.c:812
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "BD do OldestXID:                                   %u\n"
 
-#: pg_resetxlog.c:750
+#: pg_resetxlog.c:818
 #, c-format
 msgid "NextXID epoch:                        %u\n"
 msgstr "época do NextXID:                                  %u\n"
 
-#: pg_resetxlog.c:756
+#: pg_resetxlog.c:824
 #, c-format
 msgid "oldestCommitTsXid:                    %u\n"
 msgstr "oldestCommitTsXid:                                 %u\n"
 
-#: pg_resetxlog.c:761
+#: pg_resetxlog.c:829
 #, c-format
 msgid "newestCommitTsXid:                    %u\n"
 msgstr "newestCommitTsXid:                                 %u\n"
 
-#: pg_resetxlog.c:827
+#: pg_resetxlog.c:895
 #, c-format
 msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix PG_CONTROL_SIZE\n"
 msgstr "%s: erro interno -- sizeof(ControlFileData) é muito grande ... conserte o PG_CONTROL_SIZE\n"
 
-#: pg_resetxlog.c:842
+#: pg_resetxlog.c:910
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: não pôde criar arquivo do pg_control: %s\n"
 
-#: pg_resetxlog.c:853
+#: pg_resetxlog.c:921
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: não pôde escrever no arquivo do pg_control: %s\n"
 
-#: pg_resetxlog.c:860 pg_resetxlog.c:1156
+#: pg_resetxlog.c:928 pg_resetxlog.c:1224
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: erro ao executar fsync: %s\n"
 
-#: pg_resetxlog.c:900 pg_resetxlog.c:971 pg_resetxlog.c:1022
+#: pg_resetxlog.c:968 pg_resetxlog.c:1039 pg_resetxlog.c:1090
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: não pôde abrir diretório \"%s\": %s\n"
 
-#: pg_resetxlog.c:936 pg_resetxlog.c:993 pg_resetxlog.c:1047
+#: pg_resetxlog.c:1004 pg_resetxlog.c:1061 pg_resetxlog.c:1115
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: não pôde ler diretório \"%s\": %s\n"
 
-#: pg_resetxlog.c:943 pg_resetxlog.c:1000 pg_resetxlog.c:1054
+#: pg_resetxlog.c:1011 pg_resetxlog.c:1068 pg_resetxlog.c:1122
 #, c-format
 msgid "%s: could not close directory \"%s\": %s\n"
 msgstr "%s: não pôde fechar diretório \"%s\": %s\n"
 
-#: pg_resetxlog.c:984 pg_resetxlog.c:1038
+#: pg_resetxlog.c:1052 pg_resetxlog.c:1106
 #, c-format
 msgid "%s: could not delete file \"%s\": %s\n"
 msgstr "%s: não pôde apagar arquivo \"%s\": %s\n"
 
-#: pg_resetxlog.c:1123
+#: pg_resetxlog.c:1191
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: não pôde abrir arquivo \"%s\": %s\n"
 
-#: pg_resetxlog.c:1134 pg_resetxlog.c:1148
+#: pg_resetxlog.c:1202 pg_resetxlog.c:1216
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: não pôde escrever no arquivo \"%s\": %s\n"
 
-#: pg_resetxlog.c:1167
+#: pg_resetxlog.c:1235
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
@@ -512,7 +526,7 @@
 "%s reinicia o log de transação do PostgreSQL.\n"
 "\n"
 
-#: pg_resetxlog.c:1168
+#: pg_resetxlog.c:1236
 #, c-format
 msgid ""
 "Usage:\n"
@@ -523,77 +537,77 @@
 "  %s [OPÇÃO]... DIRDADOS\n"
 "\n"
 
-#: pg_resetxlog.c:1169
+#: pg_resetxlog.c:1237
 #, c-format
 msgid "Options:\n"
 msgstr "Opções:\n"
 
-#: pg_resetxlog.c:1170
+#: pg_resetxlog.c:1238
 #, c-format
 msgid "  -c XID,XID       set oldest and newest transactions bearing commit timestamp\n"
 msgstr "  -c XID,XID       define transações mais velha e mais nova contendo timestamp de efetivação\n"
 
-#: pg_resetxlog.c:1171
+#: pg_resetxlog.c:1239
 #, c-format
 msgid "                   (zero in either value means no change)\n"
 msgstr "                   (zero em qualquer valor significa nenhuma mudança)\n"
 
-#: pg_resetxlog.c:1172
+#: pg_resetxlog.c:1240
 #, c-format
 msgid " [-D] DATADIR      data directory\n"
 msgstr " [-D] DIRDADOS     diretório de dados\n"
 
-#: pg_resetxlog.c:1173
+#: pg_resetxlog.c:1241
 #, c-format
 msgid "  -e XIDEPOCH      set next transaction ID epoch\n"
 msgstr "  -e ÉPOCA_XID     define próxima época do ID de transação\n"
 
-#: pg_resetxlog.c:1174
+#: pg_resetxlog.c:1242
 #, c-format
 msgid "  -f               force update to be done\n"
 msgstr "  -f               força atualização ser feita\n"
 
-#: pg_resetxlog.c:1175
+#: pg_resetxlog.c:1243
 #, c-format
 msgid "  -l XLOGFILE      force minimum WAL starting location for new transaction log\n"
 msgstr "  -l XLOGFILE      força local inicial mínimo do WAL para novo log de transação\n"
 
-#: pg_resetxlog.c:1176
+#: pg_resetxlog.c:1244
 #, c-format
 msgid "  -m MXID,MXID     set next and oldest multitransaction ID\n"
 msgstr "  -m MXID,MXID     define próximo e mais velho ID de transação múltipla\n"
 
-#: pg_resetxlog.c:1177
+#: pg_resetxlog.c:1245
 #, c-format
 msgid "  -n               no update, just show what would be done (for testing)\n"
 msgstr "  -n               sem atualização, mostra o que seria feito (para teste)\n"
 
-#: pg_resetxlog.c:1178
+#: pg_resetxlog.c:1246
 #, c-format
 msgid "  -o OID           set next OID\n"
 msgstr "  -o OID           define próximo OID\n"
 
-#: pg_resetxlog.c:1179
+#: pg_resetxlog.c:1247
 #, c-format
 msgid "  -O OFFSET        set next multitransaction offset\n"
 msgstr "  -O OFFSET        define próxima posição de transação múltipla\n"
 
-#: pg_resetxlog.c:1180
+#: pg_resetxlog.c:1248
 #, c-format
 msgid "  -V, --version    output version information, then exit\n"
 msgstr "  -V, --version    mostra informação sobre a versão e termina\n"
 
-#: pg_resetxlog.c:1181
+#: pg_resetxlog.c:1249
 #, c-format
 msgid "  -x XID           set next transaction ID\n"
 msgstr "  -x XID           define próximo ID de transação\n"
 
-#: pg_resetxlog.c:1182
+#: pg_resetxlog.c:1250
 #, c-format
 msgid "  -?, --help       show this help, then exit\n"
 msgstr "  -?, --help       mostra essa ajuda e termina\n"
 
-#: pg_resetxlog.c:1183
+#: pg_resetxlog.c:1251
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/ru.po postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/ru.po
--- postgresql-9.5-9.5.2/src/bin/pg_resetxlog/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_resetxlog/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,45 +1,26 @@
-# PG_RESETXLOG Translated Messages into the Russian Language (UTF-8)
+# Russian message translation file for pg_resetxlog
+# Copyright (C) 2002-2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Serguei A. Mokhov <mokhov@cs.concordia.ca>, 2002-2005.
+# Oleg Bartunov <oleg@sai.msu.su>, 2004.
+# Sergey Burladyan <eshkinkot@gmail.com>, 2009.
+# Dmitriy Olshevskiy <olshevskiy87@bk.ru>, 2014.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2016.
 #
-# Copyright (c) 2002-2005 Serguei A. Mokhov, mokhov@cs.concordia.ca
-# Copyright (c) 2012-2013 Alexander Lakhin, exclusion@gmail.com
-# Distributed under the same licensing terms as PostgreSQL itself.
-#
-# pgtranslation Id: pg_resetxlog.po,v 1.3 2009/10/14 21:08:40 petere Exp $
-#
-# translation of subject-specific terminology, see:
-# перевод некоторых �пецифичных терминов:
-# http://wiki.postgresql.org/wiki/NLS/ru/dict
-#
-# ChangeLog:
-#   - August 24, 2014: Updates for 9.4. Alexander Lakhin <exclusion@gmail.com>.
-#     - With corrections from Dmitriy Olshevskiy <olshevskiy87@bk.ru>
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 18, 2012: Complete translation for 9.1. Alexander Lakhin <exclusion@gmail.com>.
-#   - March 27, 2009: complete translation for 8.3, Sergey Burladyan <eshkinkot@gmail.com>.
-#   - January 17, 2005: Complete translation for 8.0, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - December, 2004: Corrections and improvements by Oleg Bartunov <oleg@sai.msu.su>.
-#   - April 6 - August 11, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>.
-#   - July 24 - August 23, 2003: Updates for 7.4.*; <mokhov@cs.concordia.ca>.
-#   - October 12, 2002: Complete post-7.3beta2 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: pg_resetxlog (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-12-29 22:13+0000\n"
-"PO-Revision-Date: 2015-12-31 14:56+0300\n"
+"POT-Creation-Date: 2017-02-06 22:20+0000\n"
+"PO-Revision-Date: 2016-12-20 18:26+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 2.0\n"
 
 #: ../../common/restricted_token.c:68
 #, c-format
@@ -256,11 +237,13 @@
 msgid "Database system identifier:           %s\n"
 msgstr "Идентификатор �и�темы баз данных:     %s\n"
 
+# skip-rule: capital-letter-first
 #: pg_resetxlog.c:645
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "Лини� времени по�ледней конт. точки:  %u\n"
 
+# skip-rule: no-space-after-period
 #: pg_resetxlog.c:647
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
@@ -274,56 +257,67 @@
 msgid "on"
 msgstr "вкл."
 
+# skip-rule: capital-letter-first
 #: pg_resetxlog.c:649
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u/%u\n"
 msgstr "NextXID по�ледней конт. точки:        %u/%u\n"
 
+# skip-rule: capital-letter-first
 #: pg_resetxlog.c:652
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID по�ледней конт. точки:        %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_resetxlog.c:654
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
 msgstr "NextMultiXactId по�лед. конт. точки:  %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_resetxlog.c:656
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
 msgstr "NextMultiOffset по�лед. конт. точки:  %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_resetxlog.c:658
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
 msgstr "oldestXID по�ледней конт. точки:      %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_resetxlog.c:660
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
 msgstr "БД � oldestXID по�ледней конт. точки: %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_resetxlog.c:662
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
-msgstr "oldestActiveXID по�ледней к.т.:       %u\n"
+msgstr "oldestActiveXID по�ледней к. т.:      %u\n"
 
+# skip-rule: capital-letter-first
 #: pg_resetxlog.c:664
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
 msgstr "oldestMultiXid по�ледней конт. точки: %u\n"
 
+# skip-rule: capital-letter-first, double-space
 #: pg_resetxlog.c:666
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
-msgstr "БД � oldestMulti по�ледней к.т.:      %u\n"
+msgstr "БД � oldestMulti по�ледней к. т.:     %u\n"
 
+# skip-rule: capital-letter-first, double-space
 #: pg_resetxlog.c:668
 #, c-format
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "oldestCommitTsXid по�ледней к. т.:    %u\n"
 
+# skip-rule: capital-letter-first, double-space
 #: pg_resetxlog.c:670
 #, c-format
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
@@ -339,6 +333,7 @@
 msgid "Database block size:                  %u\n"
 msgstr "Размер блока БД:                      %u\n"
 
+# skip-rule: double-space
 #: pg_resetxlog.c:677
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
@@ -553,7 +548,7 @@
 "  %s [OPTION]... DATADIR\n"
 "\n"
 msgstr ""
-"Usage:\n"
+"И�пользование:\n"
 "  %s [П�Р�МЕТР]... К�Т_Д���ЫХ\n"
 "\n"
 
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/copy_fetch.c postgresql-9.5-9.5.8/src/bin/pg_rewind/copy_fetch.c
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/copy_fetch.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/copy_fetch.c	2017-08-07 21:13:41.000000000 +0000
@@ -67,14 +67,14 @@
 	while (errno = 0, (xlde = readdir(xldir)) != NULL)
 	{
 		struct stat fst;
-		char		fullpath[MAXPGPATH];
-		char		path[MAXPGPATH];
+		char		fullpath[MAXPGPATH * 2];
+		char		path[MAXPGPATH * 2];
 
 		if (strcmp(xlde->d_name, ".") == 0 ||
 			strcmp(xlde->d_name, "..") == 0)
 			continue;
 
-		snprintf(fullpath, MAXPGPATH, "%s/%s", fullparentpath, xlde->d_name);
+		snprintf(fullpath, sizeof(fullpath), "%s/%s", fullparentpath, xlde->d_name);
 
 		if (lstat(fullpath, &fst) < 0)
 		{
@@ -95,9 +95,9 @@
 		}
 
 		if (parentpath)
-			snprintf(path, MAXPGPATH, "%s/%s", parentpath, xlde->d_name);
+			snprintf(path, sizeof(path), "%s/%s", parentpath, xlde->d_name);
 		else
-			snprintf(path, MAXPGPATH, "%s", xlde->d_name);
+			snprintf(path, sizeof(path), "%s", xlde->d_name);
 
 		if (S_ISREG(fst.st_mode))
 			callback(path, FILE_TYPE_REGULAR, fst.st_size, NULL);
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/libpq_fetch.c postgresql-9.5-9.5.8/src/bin/pg_rewind/libpq_fetch.c
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/libpq_fetch.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/libpq_fetch.c	2017-08-07 21:13:41.000000000 +0000
@@ -49,6 +49,7 @@
 libpqConnect(const char *connstr)
 {
 	char	   *str;
+	PGresult   *res;
 
 	conn = PQconnectdb(connstr);
 	if (PQstatus(conn) == CONNECTION_BAD)
@@ -77,6 +78,19 @@
 	if (strcmp(str, "on") != 0)
 		pg_fatal("full_page_writes must be enabled in the source server\n");
 	pg_free(str);
+
+	/*
+	 * Although we don't do any "real" updates, we do work with a temporary
+	 * table. We don't care about synchronous commit for that. It doesn't
+	 * otherwise matter much, but if the server is using synchronous
+	 * replication, and replication isn't working for some reason, we don't
+	 * want to get stuck, waiting for it to start working again.
+	 */
+	res = PQexec(conn, "SET synchronous_commit = off");
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+		pg_fatal("could not set up connection context: %s",
+				 PQresultErrorMessage(res));
+	PQclear(res);
 }
 
 /*
@@ -181,7 +195,7 @@
 	for (i = 0; i < PQntuples(res); i++)
 	{
 		char	   *path = PQgetvalue(res, i, 0);
-		int			filesize = atoi(PQgetvalue(res, i, 1));
+		int64		filesize = atol(PQgetvalue(res, i, 1));
 		bool		isdir = (strcmp(PQgetvalue(res, i, 2), "t") == 0);
 		char	   *link_target = PQgetvalue(res, i, 3);
 		file_type_t type;
@@ -207,13 +221,35 @@
 	PQclear(res);
 }
 
+/*
+ * Converts an int64 from network byte order to native format.
+ */
+static int64
+pg_recvint64(int64 value)
+{
+	union
+	{
+		int64	i64;
+		uint32	i32[2];
+	} swap;
+	int64	result;
+
+	swap.i64 = value;
+
+	result = (uint32) ntohl(swap.i32[0]);
+	result <<= 32;
+	result |= (uint32) ntohl(swap.i32[1]);
+
+	return result;
+}
+
 /*----
  * Runs a query, which returns pieces of files from the remote source data
  * directory, and overwrites the corresponding parts of target files with
  * the received parts. The result set is expected to be of format:
  *
  * path		text	-- path in the data directory, e.g "base/1/123"
- * begin	int4	-- offset within the file
+ * begin	int8	-- offset within the file
  * chunk	bytea	-- file content
  *----
  */
@@ -234,7 +270,7 @@
 	{
 		char	   *filename;
 		int			filenamelen;
-		int			chunkoff;
+		int64		chunkoff;
 		int			chunksize;
 		char	   *chunk;
 
@@ -256,8 +292,8 @@
 		if (PQnfields(res) != 3 || PQntuples(res) != 1)
 			pg_fatal("unexpected result set size while fetching remote files\n");
 
-		if (PQftype(res, 0) != TEXTOID &&
-			PQftype(res, 1) != INT4OID &&
+		if (PQftype(res, 0) != TEXTOID ||
+			PQftype(res, 1) != INT8OID ||
 			PQftype(res, 2) != BYTEAOID)
 		{
 			pg_fatal("unexpected data types in result set while fetching remote files: %u %u %u\n",
@@ -277,12 +313,12 @@
 			pg_fatal("unexpected null values in result while fetching remote files\n");
 		}
 
-		if (PQgetlength(res, 0, 1) != sizeof(int32))
+		if (PQgetlength(res, 0, 1) != sizeof(int64))
 			pg_fatal("unexpected result length while fetching remote files\n");
 
 		/* Read result set to local variables */
-		memcpy(&chunkoff, PQgetvalue(res, 0, 1), sizeof(int32));
-		chunkoff = ntohl(chunkoff);
+		memcpy(&chunkoff, PQgetvalue(res, 0, 1), sizeof(int64));
+		chunkoff = pg_recvint64(chunkoff);
 		chunksize = PQgetlength(res, 0, 2);
 
 		filenamelen = PQgetlength(res, 0, 0);
@@ -307,7 +343,7 @@
 			continue;
 		}
 
-		pg_log(PG_DEBUG, "received chunk for file \"%s\", offset %d, size %d\n",
+		pg_log(PG_DEBUG, "received chunk for file \"%s\", offset " INT64_FORMAT ", size %d\n",
 			   filename, chunkoff, chunksize);
 
 		open_target_file(filename, false);
@@ -367,7 +403,7 @@
  * function to actually fetch the data.
  */
 static void
-fetch_file_range(const char *path, unsigned int begin, unsigned int end)
+fetch_file_range(const char *path, uint64 begin, uint64 end)
 {
 	char		linebuf[MAXPGPATH + 23];
 
@@ -376,12 +412,13 @@
 	{
 		unsigned int len;
 
+		/* Fine as long as CHUNKSIZE is not bigger than UINT32_MAX */
 		if (end - begin > CHUNKSIZE)
 			len = CHUNKSIZE;
 		else
-			len = end - begin;
+			len = (unsigned int) (end - begin);
 
-		snprintf(linebuf, sizeof(linebuf), "%s\t%u\t%u\n", path, begin, len);
+		snprintf(linebuf, sizeof(linebuf), "%s\t" UINT64_FORMAT "\t%u\n", path, begin, len);
 
 		if (PQputCopyData(conn, linebuf, strlen(linebuf)) != 1)
 			pg_fatal("could not send COPY data: %s",
@@ -406,7 +443,7 @@
 	 * First create a temporary table, and load it with the blocks that we
 	 * need to fetch.
 	 */
-	sql = "CREATE TEMPORARY TABLE fetchchunks(path text, begin int4, len int4);";
+	sql = "CREATE TEMPORARY TABLE fetchchunks(path text, begin int8, len int4);";
 	res = PQexec(conn, sql);
 
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/logging.c postgresql-9.5-9.5.8/src/bin/pg_rewind/logging.c
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/logging.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/logging.c	2017-08-07 21:13:41.000000000 +0000
@@ -34,26 +34,26 @@
 {
 	char		message[QUERY_ALLOC];
 
-	vsnprintf(message, sizeof(message), fmt, ap);
+	vsnprintf(message, sizeof(message), _(fmt), ap);
 
 	switch (type)
 	{
 		case PG_DEBUG:
 			if (debug)
-				printf("%s", _(message));
+				printf("%s", message);
 			break;
 
 		case PG_PROGRESS:
 			if (showprogress)
-				printf("%s", _(message));
+				printf("%s", message);
 			break;
 
 		case PG_WARNING:
-			printf("%s", _(message));
+			printf("%s", message);
 			break;
 
 		case PG_FATAL:
-			printf("\n%s", _(message));
+			printf("\n%s", message);
 			printf("%s", _("Failure, exiting\n"));
 			exit(1);
 			break;
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/nls.mk postgresql-9.5-9.5.8/src/bin/pg_rewind/nls.mk
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/nls.mk	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/nls.mk	2017-08-07 21:13:41.000000000 +0000
@@ -1,6 +1,6 @@
 # src/bin/pg_rewind/nls.mk
 CATALOG_NAME     = pg_rewind
-AVAIL_LANGUAGES  =de es fr it ko pl ru zh_CN
+AVAIL_LANGUAGES  =de es fr it ko pl pt_BR ru zh_CN
 GETTEXT_FILES    = copy_fetch.c datapagemap.c fetch.c file_ops.c filemap.c libpq_fetch.c logging.c parsexlog.c pg_rewind.c timeline.c ../../common/fe_memutils.c ../../common/restricted_token.c xlogreader.c
 
 GETTEXT_TRIGGERS = pg_log:2 pg_fatal report_invalid_record:2
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/pg_rewind.c postgresql-9.5-9.5.8/src/bin/pg_rewind/pg_rewind.c
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/pg_rewind.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/pg_rewind.c	2017-08-07 21:13:41.000000000 +0000
@@ -158,6 +158,13 @@
 		exit(1);
 	}
 
+	if (datadir_source != NULL && connstr_source != NULL)
+	{
+		fprintf(stderr, _("%s: only one of --source-pgdata or --source-server can be specified\n"), progname);
+		fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
+		exit(1);
+	}
+
 	if (datadir_target == NULL)
 	{
 		fprintf(stderr, _("%s: no target data directory specified (--target-pgdata)\n"), progname);
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/po/de.po postgresql-9.5-9.5.8/src/bin/pg_rewind/po/de.po
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: pg_rewind (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-03 13:43+0000\n"
-"PO-Revision-Date: 2015-10-03 12:17-0400\n"
+"POT-Creation-Date: 2016-10-24 07:51+0000\n"
+"PO-Revision-Date: 2016-10-24 09:00-0400\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -17,8 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127
-#: parsexlog.c:179
+#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127 parsexlog.c:179
 #, c-format
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
@@ -51,7 +50,7 @@
 #: ../../common/restricted_token.c:132
 #, c-format
 msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: konnte Prozess für Befehl „%s“ nicht starten: Fehlercode %lu\n"
+msgstr "%s: konnte Prozess für Befehl »%s« nicht starten: Fehlercode %lu\n"
 
 #: ../../common/restricted_token.c:170
 #, c-format
@@ -66,147 +65,147 @@
 #: copy_fetch.c:64
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht öffnen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht öffnen: %s\n"
 
 #: copy_fetch.c:93 filemap.c:112 filemap.c:267
 #, c-format
 msgid "could not stat file \"%s\": %s\n"
-msgstr "konnte „stat“ für Datei „%s“ nicht ausführen: %s\n"
+msgstr "konnte »stat« für Datei »%s« nicht ausführen: %s\n"
 
 #: copy_fetch.c:122
 #, c-format
 msgid "could not read symbolic link \"%s\": %s\n"
-msgstr "konnte symbolische Verknüpfung „%s“ nicht lesen: %s\n"
+msgstr "konnte symbolische Verknüpfung »%s« nicht lesen: %s\n"
 
 #: copy_fetch.c:125
 #, c-format
 msgid "symbolic link \"%s\" target is too long\n"
-msgstr "Ziel für symbolische Verknüpfung „%s“ ist zu lang\n"
+msgstr "Ziel für symbolische Verknüpfung »%s« ist zu lang\n"
 
 #: copy_fetch.c:140
 #, c-format
 msgid "\"%s\" is a symbolic link, but symbolic links are not supported on this platform\n"
-msgstr "„%s“ ist eine symbolische Verknüpfung, aber symbolische Verknüpfungen werden auf dieser Plattform nicht unterstützt\n"
+msgstr "»%s« ist eine symbolische Verknüpfung, aber symbolische Verknüpfungen werden auf dieser Plattform nicht unterstützt\n"
 
 #: copy_fetch.c:147
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht lesen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht lesen: %s\n"
 
 #: copy_fetch.c:151
 #, c-format
 msgid "could not close directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht schließen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht schließen: %s\n"
 
 #: copy_fetch.c:171
 #, c-format
 msgid "could not open source file \"%s\": %s\n"
-msgstr "konnte Quelldatei „%s“ nicht öffnen: %s\n"
+msgstr "konnte Quelldatei »%s« nicht öffnen: %s\n"
 
 #: copy_fetch.c:175
 #, c-format
 msgid "could not seek in source file: %s\n"
 msgstr "konnte Positionszeiger in Quelldatei nicht setzen: %s\n"
 
-#: copy_fetch.c:192 file_ops.c:301
+#: copy_fetch.c:192 file_ops.c:300
 #, c-format
 msgid "could not read file \"%s\": %s\n"
-msgstr "konnte Datei „%s“ nicht lesen: %s\n"
+msgstr "konnte Datei »%s« nicht lesen: %s\n"
 
 #: copy_fetch.c:195
 #, c-format
 msgid "unexpected EOF while reading file \"%s\"\n"
-msgstr "unerwartetes EOF beim Lesen der Datei „%s“\n"
+msgstr "unerwartetes EOF beim Lesen der Datei »%s«\n"
 
 #: copy_fetch.c:202
 #, c-format
 msgid "could not close file \"%s\": %s\n"
-msgstr "konnte Datei „%s“ nicht schließen: %s\n"
+msgstr "konnte Datei »%s« nicht schließen: %s\n"
 
 #: file_ops.c:64
 #, c-format
 msgid "could not open target file \"%s\": %s\n"
-msgstr "konnte Zieldatei „%s“ nicht öffnen: %s\n"
+msgstr "konnte Zieldatei »%s« nicht öffnen: %s\n"
 
 #: file_ops.c:78
 #, c-format
 msgid "could not close target file \"%s\": %s\n"
-msgstr "konnte Zieldatei „%s“ nicht schließen: %s\n"
+msgstr "konnte Zieldatei »%s« nicht schließen: %s\n"
 
-#: file_ops.c:99
+#: file_ops.c:98
 #, c-format
 msgid "could not seek in target file \"%s\": %s\n"
-msgstr "konnte Positionszeiger in Zieldatei „%s“ nicht setzen: %s\n"
+msgstr "konnte Positionszeiger in Zieldatei »%s« nicht setzen: %s\n"
 
-#: file_ops.c:115
+#: file_ops.c:114
 #, c-format
 msgid "could not write file \"%s\": %s\n"
-msgstr "konnte Datei „%s“ nicht schreiben: %s\n"
+msgstr "konnte Datei »%s« nicht schreiben: %s\n"
 
-#: file_ops.c:165
+#: file_ops.c:164
 #, c-format
 msgid "invalid action (CREATE) for regular file\n"
 msgstr "ungültige Aktion (CREATE) für normale Datei\n"
 
-#: file_ops.c:180
+#: file_ops.c:179
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
-msgstr "konnte Datei „%s“ nicht löschen: %s\n"
+msgstr "konnte Datei »%s« nicht löschen: %s\n"
 
-#: file_ops.c:197
+#: file_ops.c:196
 #, c-format
 msgid "could not open file \"%s\" for truncation: %s\n"
-msgstr "konnte Datei „%s“ nicht zum Kürzen öffnen: %s\n"
+msgstr "konnte Datei »%s« nicht zum Kürzen öffnen: %s\n"
 
-#: file_ops.c:201
+#: file_ops.c:200
 #, c-format
 msgid "could not truncate file \"%s\" to %u: %s\n"
-msgstr "konnte Datei „%s“ nicht auf %u kürzen: %s\n"
+msgstr "konnte Datei »%s« nicht auf %u kürzen: %s\n"
 
-#: file_ops.c:217
+#: file_ops.c:216
 #, c-format
 msgid "could not create directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht erzeugen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht erzeugen: %s\n"
 
-#: file_ops.c:231
+#: file_ops.c:230
 #, c-format
 msgid "could not remove directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht löschen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht löschen: %s\n"
 
-#: file_ops.c:245
+#: file_ops.c:244
 #, c-format
 msgid "could not create symbolic link at \"%s\": %s\n"
-msgstr "konnte symbolische Verknüpfung „%s“ nicht erstellen: %s\n"
+msgstr "konnte symbolische Verknüpfung »%s« nicht erstellen: %s\n"
 
-#: file_ops.c:259
+#: file_ops.c:258
 #, c-format
 msgid "could not remove symbolic link \"%s\": %s\n"
-msgstr "konnte symbolische Verknüpfung „%s“ nicht löschen: %s\n"
+msgstr "konnte symbolische Verknüpfung »%s« nicht löschen: %s\n"
 
-#: file_ops.c:289 file_ops.c:293
+#: file_ops.c:288 file_ops.c:292
 #, c-format
 msgid "could not open file \"%s\" for reading: %s\n"
-msgstr "konnte Datei „%s“ nicht zum Lesen öffnen: %s\n"
+msgstr "konnte Datei »%s« nicht zum Lesen öffnen: %s\n"
 
 #: filemap.c:104
 #, c-format
 msgid "data file \"%s\" in source is not a regular file\n"
-msgstr "Datendatei „%s“ in der Quelle ist keine normale Datei\n"
+msgstr "Datendatei »%s« in der Quelle ist keine normale Datei\n"
 
 #: filemap.c:126
 #, c-format
 msgid "\"%s\" is not a directory\n"
-msgstr "„%s“ ist kein Verzeichnis\n"
+msgstr "»%s« ist kein Verzeichnis\n"
 
 #: filemap.c:149
 #, c-format
 msgid "\"%s\" is not a symbolic link\n"
-msgstr "„%s“ ist keine symbolische Verknüpfung\n"
+msgstr "»%s« ist keine symbolische Verknüpfung\n"
 
 #: filemap.c:161
 #, c-format
 msgid "\"%s\" is not a regular file\n"
-msgstr "„%s“ ist keine normale Datei\n"
+msgstr "»%s« ist keine normale Datei\n"
 
 #: filemap.c:279
 #, c-format
@@ -216,151 +215,156 @@
 #: filemap.c:401
 #, c-format
 msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
-msgstr "unerwartete Seitenänderung für Verzeichnis oder symbolische Verknüpfung „%s“\n"
+msgstr "unerwartete Seitenänderung für Verzeichnis oder symbolische Verknüpfung »%s«\n"
 
-#: libpq_fetch.c:55
+#: libpq_fetch.c:56
 #, c-format
 msgid "could not connect to server: %s"
 msgstr "konnte nicht mit Server verbinden: %s"
 
-#: libpq_fetch.c:58
+#: libpq_fetch.c:59
 #, c-format
 msgid "connected to server\n"
 msgstr "mit Server verbunden\n"
 
-#: libpq_fetch.c:68
+#: libpq_fetch.c:69
 #, c-format
 msgid "source server must not be in recovery mode\n"
 msgstr "Quell-Server darf nicht im Wiederherstellungsmodus sein\n"
 
-#: libpq_fetch.c:78
+#: libpq_fetch.c:79
 #, c-format
 msgid "full_page_writes must be enabled in the source server\n"
 msgstr "full_page_writes muss im Quell-Server eingeschaltet sein\n"
 
-#: libpq_fetch.c:95
+#: libpq_fetch.c:91
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "konnte Verbindungskontext nicht einrichten: %s"
+
+#: libpq_fetch.c:109
 #, c-format
 msgid "error running query (%s) in source server: %s"
 msgstr "Fehler beim Ausführen einer Anfrage (%s) im Quellserver: %s"
 
-#: libpq_fetch.c:100
+#: libpq_fetch.c:114
 #, c-format
 msgid "unexpected result set from query\n"
 msgstr "Anfrage ergab unerwartete Ergebnismenge\n"
 
-#: libpq_fetch.c:123
+#: libpq_fetch.c:137
 #, c-format
 msgid "unrecognized result \"%s\" for current WAL insert location\n"
-msgstr "unbekanntes Ergebnis „%s“ für aktuelle WAL-Einfügeposition\n"
+msgstr "unbekanntes Ergebnis »%s« für aktuelle WAL-Einfügeposition\n"
 
-#: libpq_fetch.c:173
+#: libpq_fetch.c:187
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "konnte Dateiliste nicht holen: %s"
 
-#: libpq_fetch.c:178
+#: libpq_fetch.c:192
 #, c-format
 msgid "unexpected result set while fetching file list\n"
 msgstr "unerwartete Ergebnismenge beim Holen der Dateiliste\n"
 
-#: libpq_fetch.c:226
+#: libpq_fetch.c:240
 #, c-format
 msgid "could not send query: %s"
 msgstr "konnte Anfrage nicht senden: %s"
 
-#: libpq_fetch.c:228
+#: libpq_fetch.c:242
 #, c-format
 msgid "getting file chunks\n"
 msgstr "hole Dateistücke\n"
 
-#: libpq_fetch.c:231
+#: libpq_fetch.c:245
 #, c-format
 msgid "could not set libpq connection to single row mode\n"
 msgstr "konnte libpq-Verbindung nicht in den Einzelzeilenmodus setzen\n"
 
-#: libpq_fetch.c:251
+#: libpq_fetch.c:265
 #, c-format
 msgid "unexpected result while fetching remote files: %s"
 msgstr "unerwartetes Ergebnis beim Holen von fernen Dateien: %s"
 
-#: libpq_fetch.c:257
+#: libpq_fetch.c:271
 #, c-format
 msgid "unexpected result set size while fetching remote files\n"
 msgstr "unerwartete Ergebnismengengröße beim Holen von fernen Dateien\n"
 
-#: libpq_fetch.c:263
+#: libpq_fetch.c:277
 #, c-format
 msgid "unexpected data types in result set while fetching remote files: %u %u %u\n"
 msgstr "unerwartete Datentypen in Ergebnismenge beim Holen von fernen Dateien: %u %u %u\n"
 
-#: libpq_fetch.c:271
+#: libpq_fetch.c:285
 #, c-format
 msgid "unexpected result format while fetching remote files\n"
 msgstr "unerwartetes Ergebnisformat beim Holen von fernen Dateien\n"
 
-#: libpq_fetch.c:277
+#: libpq_fetch.c:291
 #, c-format
 msgid "unexpected null values in result while fetching remote files\n"
 msgstr "unerwartete NULL-Werte im Ergebnis beim Holen von fernen Dateien\n"
 
-#: libpq_fetch.c:281
+#: libpq_fetch.c:295
 #, c-format
 msgid "unexpected result length while fetching remote files\n"
 msgstr "unerwartete Ergebnislänge beim Holen von fernen Dateien\n"
 
-#: libpq_fetch.c:303
+#: libpq_fetch.c:317
 #, c-format
 msgid "received null value for chunk for file \"%s\", file has been deleted\n"
-msgstr "NULL-Wert für Stück von Datei „%s“ empfangen, Datei wurde gelöscht\n"
+msgstr "NULL-Wert für Stück von Datei »%s« empfangen, Datei wurde gelöscht\n"
 
-#: libpq_fetch.c:310
+#: libpq_fetch.c:324
 #, c-format
 msgid "received chunk for file \"%s\", offset %d, size %d\n"
-msgstr "Stück von Datei „%s“ empfangen, Offset %d, Größe %d\n"
+msgstr "Stück von Datei »%s« empfangen, Offset %d, Größe %d\n"
 
-#: libpq_fetch.c:339
+#: libpq_fetch.c:353
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
-msgstr "konnte ferne Datei „%s“ nicht holen: %s"
+msgstr "konnte ferne Datei »%s« nicht holen: %s"
 
-#: libpq_fetch.c:344
+#: libpq_fetch.c:358
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\"\n"
-msgstr "unerwartete Ergebnismenge beim Holen der fernen Datei „%s“\n"
+msgstr "unerwartete Ergebnismenge beim Holen der fernen Datei »%s«\n"
 
-#: libpq_fetch.c:355
+#: libpq_fetch.c:369
 #, c-format
 msgid "fetched file \"%s\", length %d\n"
-msgstr "Datei „%s“ geholt, Länge %d\n"
+msgstr "Datei »%s« geholt, Länge %d\n"
 
-#: libpq_fetch.c:387
+#: libpq_fetch.c:401
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "konnte COPY-Daten nicht senden: %s"
 
-#: libpq_fetch.c:413
+#: libpq_fetch.c:427
 #, c-format
 msgid "could not create temporary table: %s"
 msgstr "konnte temporäre Tabelle nicht erzeugen: %s"
 
-#: libpq_fetch.c:421
+#: libpq_fetch.c:435
 #, c-format
 msgid "could not send file list: %s"
 msgstr "konnte Dateiliste nicht senden: %s"
 
-#: libpq_fetch.c:463
+#: libpq_fetch.c:477
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "konnte COPY-Ende nicht senden: %s"
 
-#: libpq_fetch.c:469
+#: libpq_fetch.c:483
 #, c-format
 msgid "unexpected result while sending file list: %s"
 msgstr "unerwartetes Ergebnis beim Senden der Dateiliste: %s"
 
 #: logging.c:57
 msgid "Failure, exiting\n"
-msgstr "Fehlgeschlagen, Program wird beendet\n"
+msgstr "Fehlgeschlagen, Programm wird beendet\n"
 
 #: logging.c:140
 #, c-format
@@ -390,17 +394,17 @@
 #: parsexlog.c:268
 #, c-format
 msgid "could not open file \"%s\": %s\n"
-msgstr "konnte Datei „%s“ nicht öffnen: %s\n"
+msgstr "konnte Datei »%s« nicht öffnen: %s\n"
 
 #: parsexlog.c:282
 #, c-format
 msgid "could not seek in file \"%s\": %s\n"
-msgstr "konnte Positionszeiger in Datei „%s“ nicht setzen: %s\n"
+msgstr "konnte Positionszeiger in Datei »%s« nicht setzen: %s\n"
 
 #: parsexlog.c:289
 #, c-format
 msgid "could not read from file \"%s\": %s\n"
-msgstr "konnte nicht aus Datei „%s“ nicht lesen: %s\n"
+msgstr "konnte nicht aus Datei »%s« nicht lesen: %s\n"
 
 #: parsexlog.c:357
 #, c-format
@@ -411,7 +415,7 @@
 "WAL-Eintrag modifiziert eine Relation, aber Typ des Eintrags wurde nicht erkannt\n"
 "lsn: %X/%X, rmgr: %s, info: %02X\n"
 
-#: pg_rewind.c:59
+#: pg_rewind.c:60
 #, c-format
 msgid ""
 "%s resynchronizes a PostgreSQL cluster with another copy of the cluster.\n"
@@ -420,7 +424,7 @@
 "%s resynchronisiert einen PostgreSQL-Cluster mit einer Kopie des Clusters.\n"
 "\n"
 
-#: pg_rewind.c:60
+#: pg_rewind.c:61
 #, c-format
 msgid ""
 "Usage:\n"
@@ -431,54 +435,54 @@
 "  %s [OPTION]...\n"
 "\n"
 
-#: pg_rewind.c:61
+#: pg_rewind.c:62
 #, c-format
 msgid "Options:\n"
 msgstr "Optionen:\n"
 
-#: pg_rewind.c:62
+#: pg_rewind.c:63
 #, c-format
 msgid "  -D, --target-pgdata=DIRECTORY  existing data directory to modify\n"
 msgstr "  -D, --target-pgdata=VERZ       bestehendes zu modifizierendes Datenverzeichnis\n"
 
-#: pg_rewind.c:63
+#: pg_rewind.c:64
 #, c-format
 msgid "      --source-pgdata=DIRECTORY  source data directory to synchronize with\n"
 msgstr ""
 "      --source-pgdata=VERZ       Quelldatenverzeichnis, mit dem synchronisiert\n"
 "                                 werden soll\n"
 
-#: pg_rewind.c:64
+#: pg_rewind.c:65
 #, c-format
 msgid "      --source-server=CONNSTR    source server to synchronize with\n"
 msgstr "      --source-server=VERB       Quellserver, mit dem synchronisiert werden soll\n"
 
-#: pg_rewind.c:65
+#: pg_rewind.c:66
 #, c-format
 msgid "  -n, --dry-run                  stop before modifying anything\n"
 msgstr "  -n, --dry-run                  anhalten, bevor etwas geändert wird\n"
 
-#: pg_rewind.c:66
+#: pg_rewind.c:67
 #, c-format
 msgid "  -P, --progress                 write progress messages\n"
 msgstr "  -P, --progress                 Fortschrittsmeldungen ausgeben\n"
 
-#: pg_rewind.c:67
+#: pg_rewind.c:68
 #, c-format
 msgid "      --debug                    write a lot of debug messages\n"
 msgstr "      --debug                    viele Debug-Meldungen ausgeben\n"
 
-#: pg_rewind.c:68
+#: pg_rewind.c:69
 #, c-format
 msgid "  -V, --version                  output version information, then exit\n"
 msgstr "  -V, --version                  Versionsinformationen anzeigen, dann beenden\n"
 
-#: pg_rewind.c:69
+#: pg_rewind.c:70
 #, c-format
 msgid "  -?, --help                     show this help, then exit\n"
 msgstr "  -?, --help                     diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_rewind.c:70
+#: pg_rewind.c:71
 #, c-format
 msgid ""
 "\n"
@@ -487,77 +491,83 @@
 "\n"
 "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_rewind.c:125 pg_rewind.c:156 pg_rewind.c:163 pg_rewind.c:171
+#: pg_rewind.c:126 pg_rewind.c:157 pg_rewind.c:164 pg_rewind.c:171
+#: pg_rewind.c:179
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
-#: pg_rewind.c:155
+#: pg_rewind.c:156
 #, c-format
 msgid "%s: no source specified (--source-pgdata or --source-server)\n"
 msgstr "%s: keine Quelle angegeben (--source-pgdata oder --source-server)\n"
 
-#: pg_rewind.c:162
+#: pg_rewind.c:163
+#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s: --source-pgdata und --source-server können nicht zusammen angegeben werden\n"
+
+#: pg_rewind.c:170
 #, c-format
 msgid "%s: no target data directory specified (--target-pgdata)\n"
 msgstr "%s: kein Zielverzeichnis angegeben (--target-pgdata)\n"
 
-#: pg_rewind.c:169
+#: pg_rewind.c:177
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: zu viele Kommandozeilenargumente (das erste ist „%s“)\n"
+msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
-#: pg_rewind.c:184
+#: pg_rewind.c:192
 #, c-format
 msgid "cannot be executed by \"root\"\n"
-msgstr "kann nicht von „root“ ausgeführt werden\n"
+msgstr "kann nicht von »root« ausgeführt werden\n"
 
-#: pg_rewind.c:185
+#: pg_rewind.c:193
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser.\n"
 msgstr "Sie müssen %s als PostgreSQL-Superuser ausführen.\n"
 
-#: pg_rewind.c:215
+#: pg_rewind.c:224
 #, c-format
 msgid "source and target cluster are on the same timeline\n"
 msgstr "Quell- und Ziel-Cluster sind auf der gleichen Zeitleiste\n"
 
-#: pg_rewind.c:218
+#: pg_rewind.c:230
 #, c-format
 msgid "servers diverged at WAL position %X/%X on timeline %u\n"
 msgstr "Server divergierten bei WAL-Position %X/%X auf Zeitleiste %u\n"
 
-#: pg_rewind.c:253
+#: pg_rewind.c:266
 #, c-format
 msgid "no rewind required\n"
 msgstr "kein Rückspulen nötig\n"
 
-#: pg_rewind.c:259
+#: pg_rewind.c:272
 #, c-format
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
 msgstr "Rückspulen ab letztem gemeinsamen Checkpoint bei %X/%X auf Zeitleiste %u\n"
 
-#: pg_rewind.c:267
+#: pg_rewind.c:280
 #, c-format
 msgid "reading source file list\n"
 msgstr "lese Quelldateiliste\n"
 
-#: pg_rewind.c:269
+#: pg_rewind.c:282
 #, c-format
 msgid "reading target file list\n"
 msgstr "lese Zieldateiliste\n"
 
-#: pg_rewind.c:279
+#: pg_rewind.c:292
 #, c-format
 msgid "reading WAL in target\n"
 msgstr "lese WAL im Ziel-Cluster\n"
 
-#: pg_rewind.c:296
+#: pg_rewind.c:309
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
 msgstr "%lu MB müssen kopiert werden (Gesamtgröße des Quellverzeichnisses ist %lu MB)\n"
 
-#: pg_rewind.c:313
+#: pg_rewind.c:326
 #, c-format
 msgid ""
 "\n"
@@ -566,56 +576,88 @@
 "\n"
 "erzeuge Backup-Label und aktualisiere Kontrolldatei\n"
 
-#: pg_rewind.c:341
+#: pg_rewind.c:354
+#, c-format
+msgid "syncing target data directory\n"
+msgstr "synchronisiere Zieldatenverzeichnis\n"
+
+#: pg_rewind.c:357
 #, c-format
 msgid "Done!\n"
 msgstr "Fertig!\n"
 
-#: pg_rewind.c:353
+#: pg_rewind.c:369
 #, c-format
 msgid "source and target clusters are from different systems\n"
 msgstr "Quell- und Ziel-Cluster sind von verschiedenen Systemen\n"
 
-#: pg_rewind.c:361
+#: pg_rewind.c:377
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind\n"
 msgstr "die Cluster sind nicht mit dieser Version von pg_rewind kompatibel\n"
 
-#: pg_rewind.c:371
+#: pg_rewind.c:387
 #, c-format
 msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
-msgstr "Zielserver muss entweder Datenprüfsummen oder „wal_log_hints = on“ verwenden\n"
+msgstr "Zielserver muss entweder Datenprüfsummen oder »wal_log_hints = on« verwenden\n"
 
-#: pg_rewind.c:381
+#: pg_rewind.c:398
 #, c-format
 msgid "target server must be shut down cleanly\n"
 msgstr "Zielserver muss sauber heruntergefahren worden sein\n"
 
-#: pg_rewind.c:389
+#: pg_rewind.c:408
 #, c-format
 msgid "source data directory must be shut down cleanly\n"
 msgstr "Quelldatenverzeichnis muss sauber heruntergefahren worden sein\n"
 
-#: pg_rewind.c:456
+#: pg_rewind.c:475
 #, c-format
 msgid "could not find common ancestor of the source and target cluster's timelines\n"
 msgstr "konnte keinen gemeinsamen Anfangspunkt in den Zeitleisten von Quell- und Ziel-Cluster finden\n"
 
-#: pg_rewind.c:496
+#: pg_rewind.c:515
 #, c-format
 msgid "backup label buffer too small\n"
 msgstr "Puffer für Backup-Label ist zu klein\n"
 
-#: pg_rewind.c:518
+#: pg_rewind.c:538
 #, c-format
 msgid "unexpected control file CRC\n"
 msgstr "unerwartete CRC in Kontrolldatei\n"
 
-#: pg_rewind.c:528
+#: pg_rewind.c:548
 #, c-format
 msgid "unexpected control file size %d, expected %d\n"
 msgstr "unerwartete Kontrolldateigröße %d, erwartet wurde %d\n"
 
+#: pg_rewind.c:615
+#, c-format
+msgid ""
+"The program \"initdb\" is needed by %s but was \n"
+"not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Das Programm »initdb« wird von %s benötigt, aber wurde nicht im\n"
+"selben Verzeichnis wie »%s« gefunden.\n"
+"Prüfen Sie Ihre Installation.\n"
+
+#: pg_rewind.c:619
+#, c-format
+msgid ""
+"The program \"initdb\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"Das Programm »initdb« wurde von %s gefunden,\n"
+"aber es hatte nicht die gleiche Version wie %s.\n"
+"Prüfen Sie Ihre Installation.\n"
+
+#: pg_rewind.c:637
+#, c-format
+msgid "sync of target directory failed\n"
+msgstr "Synchronisieren des Zielverzeichnisses fehlgeschlagen\n"
+
 #: timeline.c:76 timeline.c:82
 #, c-format
 msgid "syntax error in history file: %s\n"
@@ -731,57 +773,57 @@
 msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
 msgstr "Zeitleisten-ID %u außer der Reihe (nach %u) in Logsegment %s, Offset %u"
 
-#: xlogreader.c:1024
+#: xlogreader.c:1061
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %u außer der Reihe bei %X/%X"
 
-#: xlogreader.c:1046
+#: xlogreader.c:1083
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA gesetzt, aber keine Daten enthalten bei %X/%X"
 
-#: xlogreader.c:1053
+#: xlogreader.c:1090
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA nicht gesetzt, aber Datenlänge ist %u bei %X/%X"
 
-#: xlogreader.c:1086
+#: xlogreader.c:1123
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE gesetzt, aber Loch Offset %u Länge %u Block-Abbild-Länge %u bei %X/%X"
 
-#: xlogreader.c:1102
+#: xlogreader.c:1139
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE nicht gesetzt, aber Loch Offset %u Länge %u bei %X/%X"
 
-#: xlogreader.c:1117
+#: xlogreader.c:1154
 #, c-format
 msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_IS_COMPRESSED gesetzt, aber Block-Abbild-Länge %u bei %X/%X"
 
-#: xlogreader.c:1132
+#: xlogreader.c:1169
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "weder BKPIMAGE_HAS_HOLE noch BKPIMAGE_IS_COMPRESSED gesetzt, aber Block-Abbild-Länge ist %u bei %X/%X"
 
-#: xlogreader.c:1148
+#: xlogreader.c:1185
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL gesetzt, aber keine vorangehende Relation bei %X/%X"
 
-#: xlogreader.c:1160
+#: xlogreader.c:1197
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "ungültige block_id %u bei %X/%X"
 
-#: xlogreader.c:1225
+#: xlogreader.c:1262
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "Datensatz mit ungültiger Länge bei %X/%X"
 
-#: xlogreader.c:1314
+#: xlogreader.c:1351
 #, c-format
 msgid "invalid compressed image at %X/%X, block %d"
 msgstr "ungültiges komprimiertes Abbild bei %X/%X, Block %d"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/po/es.po postgresql-9.5-9.5.8/src/bin/pg_rewind/po/es.po
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pg_rewind (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:43+0000\n"
+"POT-Creation-Date: 2017-05-21 17:32+0000\n"
 "PO-Revision-Date: 2015-10-02 16:25-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL Español <pgsql-es-ayuda@postgresql.org>\n"
@@ -108,7 +108,7 @@
 msgid "could not seek in source file: %s\n"
 msgstr "no se pudo posicionar en archivo de origen: %s\n"
 
-#: copy_fetch.c:192 file_ops.c:301
+#: copy_fetch.c:192 file_ops.c:300
 #, c-format
 msgid "could not read file \"%s\": %s\n"
 msgstr "no se pudo leer el archivo «%s»: %s\n"
@@ -133,57 +133,57 @@
 msgid "could not close target file \"%s\": %s\n"
 msgstr "no se pudo cerrar el archivo de destino «%s»: %s\n"
 
-#: file_ops.c:99
+#: file_ops.c:98
 #, c-format
 msgid "could not seek in target file \"%s\": %s\n"
 msgstr "no se pudo posicionar en archivo de destino «%s»: %s\n"
 
-#: file_ops.c:115
+#: file_ops.c:114
 #, c-format
 msgid "could not write file \"%s\": %s\n"
 msgstr "no se pudo escribir el archivo «%s»: %s\n"
 
-#: file_ops.c:165
+#: file_ops.c:164
 #, c-format
 msgid "invalid action (CREATE) for regular file\n"
 msgstr "acción no válida (CREATE) para archivo regular\n"
 
-#: file_ops.c:180
+#: file_ops.c:179
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "no se pudo eliminar el archivo «%s»: %s\n"
 
-#: file_ops.c:197
+#: file_ops.c:196
 #, c-format
 msgid "could not open file \"%s\" for truncation: %s\n"
 msgstr "no se pudo abrir el archivo «%s» para truncarlo: %s\n"
 
-#: file_ops.c:201
+#: file_ops.c:200
 #, c-format
 msgid "could not truncate file \"%s\" to %u: %s\n"
 msgstr "no se pudo truncar el archivo «%s» a %u: %s\n"
 
-#: file_ops.c:217
+#: file_ops.c:216
 #, c-format
 msgid "could not create directory \"%s\": %s\n"
 msgstr "no se pudo crear el directorio «%s»: %s\n"
 
-#: file_ops.c:231
+#: file_ops.c:230
 #, c-format
 msgid "could not remove directory \"%s\": %s\n"
 msgstr "no se pudo eliminar el directorio «%s»: %s\n"
 
-#: file_ops.c:245
+#: file_ops.c:244
 #, c-format
 msgid "could not create symbolic link at \"%s\": %s\n"
 msgstr "no se pudo crear el link simbólico en «%s»: %s\n"
 
-#: file_ops.c:259
+#: file_ops.c:258
 #, c-format
 msgid "could not remove symbolic link \"%s\": %s\n"
 msgstr "no se pudo eliminar el link simbólico «%s»: %s\n"
 
-#: file_ops.c:289 file_ops.c:293
+#: file_ops.c:288 file_ops.c:292
 #, c-format
 msgid "could not open file \"%s\" for reading: %s\n"
 msgstr "no se pudo abrir el archivo «%s» para lectura: %s\n"
@@ -218,142 +218,147 @@
 msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
 msgstr "modificación de página inesperada para el directorio o link simbólico «%s»\n"
 
-#: libpq_fetch.c:55
+#: libpq_fetch.c:56
 #, c-format
 msgid "could not connect to server: %s"
 msgstr "no se pudo conectar al servidor: %s"
 
-#: libpq_fetch.c:58
+#: libpq_fetch.c:59
 #, c-format
 msgid "connected to server\n"
 msgstr "conectado al servidor\n"
 
-#: libpq_fetch.c:68
+#: libpq_fetch.c:69
 #, c-format
 msgid "source server must not be in recovery mode\n"
 msgstr "el servidor de origen no debe estar en modo de recuperación\n"
 
-#: libpq_fetch.c:78
+#: libpq_fetch.c:79
 #, c-format
 msgid "full_page_writes must be enabled in the source server\n"
 msgstr "full_page_writes debe estar activado en el servidor de origen\n"
 
-#: libpq_fetch.c:95
+#: libpq_fetch.c:91
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "no se pudo establecer el contexto de conexión: %s"
+
+#: libpq_fetch.c:109
 #, c-format
 msgid "error running query (%s) in source server: %s"
 msgstr "error ejecutando consulta (%s) en el servidor de origen: %s"
 
-#: libpq_fetch.c:100
+#: libpq_fetch.c:114
 #, c-format
 msgid "unexpected result set from query\n"
 msgstr "conjunto de resultados inesperados de la consulta\n"
 
-#: libpq_fetch.c:123
+#: libpq_fetch.c:137
 #, c-format
 msgid "unrecognized result \"%s\" for current WAL insert location\n"
 msgstr "resultado «%s» no reconocido para la ubicación de inserción WAL actual\n"
 
-#: libpq_fetch.c:173
+#: libpq_fetch.c:187
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "no se pudo obtener el listado de archivos: %s"
 
-#: libpq_fetch.c:178
+#: libpq_fetch.c:192
 #, c-format
 msgid "unexpected result set while fetching file list\n"
 msgstr "conjunto de resultados inesperado mientras se obtenía el listado de archivos\n"
 
-#: libpq_fetch.c:226
+#: libpq_fetch.c:240
 #, c-format
 msgid "could not send query: %s"
 msgstr "no se pudo enviar la consulta: %s"
 
-#: libpq_fetch.c:228
+#: libpq_fetch.c:242
 #, c-format
 msgid "getting file chunks\n"
 msgstr "obteniendo trozos de archivos\n"
 
-#: libpq_fetch.c:231
+#: libpq_fetch.c:245
 #, c-format
 msgid "could not set libpq connection to single row mode\n"
 msgstr "no se pudo establecer la coneción libpq a modo «single row»\n"
 
-#: libpq_fetch.c:251
+#: libpq_fetch.c:265
 #, c-format
 msgid "unexpected result while fetching remote files: %s"
 msgstr "resultados inesperados mientras se obtenían archivos remotos: %s"
 
-#: libpq_fetch.c:257
+#: libpq_fetch.c:271
 #, c-format
 msgid "unexpected result set size while fetching remote files\n"
 msgstr "tamaño del conjunto de resultados inesperado mientras se obtenían archivos remotos\n"
 
-#: libpq_fetch.c:263
+#: libpq_fetch.c:277
 #, c-format
 msgid "unexpected data types in result set while fetching remote files: %u %u %u\n"
 msgstr "tipos de dato inesperados en el conjunto de resultados mientras se obtenían archivos remotos: %u %u %u\n"
 
-#: libpq_fetch.c:271
+#: libpq_fetch.c:285
 #, c-format
 msgid "unexpected result format while fetching remote files\n"
 msgstr "formato de resultados inesperado mientras se obtenían archivos remotos\n"
 
-#: libpq_fetch.c:277
+#: libpq_fetch.c:291
 #, c-format
 msgid "unexpected null values in result while fetching remote files\n"
 msgstr "valores nulos inesperados en el resultado mientras se obtenían archivos remotos\n"
 
-#: libpq_fetch.c:281
+#: libpq_fetch.c:295
 #, c-format
 msgid "unexpected result length while fetching remote files\n"
 msgstr "largo del resultado inesperado mientras se obtenían los archivos remotos\n"
 
-#: libpq_fetch.c:303
+#: libpq_fetch.c:317
 #, c-format
 msgid "received null value for chunk for file \"%s\", file has been deleted\n"
 msgstr "recibido un valor NULL para un trozo del archivo «%s», el archivo ha sido borrado\n"
 
-#: libpq_fetch.c:310
+#: libpq_fetch.c:324
 #, c-format
 msgid "received chunk for file \"%s\", offset %d, size %d\n"
 msgstr "recibido un trozo para el archivo «%s», posición %d, tamaño %d\n"
 
-#: libpq_fetch.c:339
+#: libpq_fetch.c:353
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
 msgstr "no se pudo obtener el archivo remoto «%s»: %s"
 
-#: libpq_fetch.c:344
+#: libpq_fetch.c:358
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\"\n"
 msgstr "conjunto de resultados inesperado mientras se obtenía el archivo remoto «%s»\n"
 
-#: libpq_fetch.c:355
+#: libpq_fetch.c:369
 #, c-format
 msgid "fetched file \"%s\", length %d\n"
 msgstr "obtenido archivo «%s», largo %d\n"
 
-#: libpq_fetch.c:387
+#: libpq_fetch.c:401
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "no se pudo enviar datos COPY: %s"
 
-#: libpq_fetch.c:413
+#: libpq_fetch.c:427
 #, c-format
 msgid "could not create temporary table: %s"
 msgstr "no se pudo crear tabla temporal: %s"
 
-#: libpq_fetch.c:421
+#: libpq_fetch.c:435
 #, c-format
 msgid "could not send file list: %s"
 msgstr "no se pudo enviar el listado de archivos: %s"
 
-#: libpq_fetch.c:463
+#: libpq_fetch.c:477
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "no se pudo enviar fin-de-COPY: %s"
 
-#: libpq_fetch.c:469
+#: libpq_fetch.c:483
 #, c-format
 msgid "unexpected result while sending file list: %s"
 msgstr "resultados inesperados mientras se enviaba el listado de archivos: %s"
@@ -411,7 +416,7 @@
 "el registro WAL modifica una relación, pero el tipo de registro no es reconocido\n"
 "lsn: %X/%X, rmgr: %s, info: %02X\n"
 
-#: pg_rewind.c:59
+#: pg_rewind.c:60
 #, c-format
 msgid ""
 "%s resynchronizes a PostgreSQL cluster with another copy of the cluster.\n"
@@ -420,7 +425,7 @@
 "%s resincroniza un cluster PostgreSQL con otra copia del cluster.\n"
 "\n"
 
-#: pg_rewind.c:60
+#: pg_rewind.c:61
 #, c-format
 msgid ""
 "Usage:\n"
@@ -431,52 +436,52 @@
 "  %s [OPCION]...\n"
 "\n"
 
-#: pg_rewind.c:61
+#: pg_rewind.c:62
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: pg_rewind.c:62
+#: pg_rewind.c:63
 #, c-format
 msgid "  -D, --target-pgdata=DIRECTORY  existing data directory to modify\n"
 msgstr "  -D, --target-pgdata=DIRECTORIO directorio de datos existente a modificar\n"
 
-#: pg_rewind.c:63
+#: pg_rewind.c:64
 #, c-format
 msgid "      --source-pgdata=DIRECTORY  source data directory to synchronize with\n"
 msgstr "      --source-pgdata=DIRECTORIO directorio de datos de origen a sincronizar\n"
 
-#: pg_rewind.c:64
+#: pg_rewind.c:65
 #, c-format
 msgid "      --source-server=CONNSTR    source server to synchronize with\n"
 msgstr "      --source-server=CONN       servidor de origen a sincronizar\n"
 
-#: pg_rewind.c:65
+#: pg_rewind.c:66
 #, c-format
 msgid "  -n, --dry-run                  stop before modifying anything\n"
 msgstr "  -n, --dry-run                  detener antes de modificar nada\n"
 
-#: pg_rewind.c:66
+#: pg_rewind.c:67
 #, c-format
 msgid "  -P, --progress                 write progress messages\n"
 msgstr "  -P, --progress                 escribir mensajes de progreso\n"
 
-#: pg_rewind.c:67
+#: pg_rewind.c:68
 #, c-format
 msgid "      --debug                    write a lot of debug messages\n"
 msgstr "      --debug                    escribir muchos mensajes de depuración\n"
 
-#: pg_rewind.c:68
+#: pg_rewind.c:69
 #, c-format
 msgid "  -V, --version                  output version information, then exit\n"
 msgstr "  -V, --version                  mostrar información de versión y salir\n"
 
-#: pg_rewind.c:69
+#: pg_rewind.c:70
 #, c-format
 msgid "  -?, --help                     show this help, then exit\n"
 msgstr "  -?, --help                     mostrar esta ayuda y salir\n"
 
-#: pg_rewind.c:70
+#: pg_rewind.c:71
 #, c-format
 msgid ""
 "\n"
@@ -485,77 +490,83 @@
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_rewind.c:125 pg_rewind.c:156 pg_rewind.c:163 pg_rewind.c:171
+#: pg_rewind.c:126 pg_rewind.c:157 pg_rewind.c:164 pg_rewind.c:171
+#: pg_rewind.c:179
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Pruebe «%s --help» para mayor información.\n"
 
-#: pg_rewind.c:155
+#: pg_rewind.c:156
 #, c-format
 msgid "%s: no source specified (--source-pgdata or --source-server)\n"
 msgstr "%s: no se especificó origen (--source-pgdata o --source-server)\n"
 
-#: pg_rewind.c:162
+#: pg_rewind.c:163
+#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s: sólo uno de --source-pgdata o --source-server puede ser especificado\n"
+
+#: pg_rewind.c:170
 #, c-format
 msgid "%s: no target data directory specified (--target-pgdata)\n"
 msgstr "%s: no se especificó directorio de datos de destino (--target-pgdata)\n"
 
-#: pg_rewind.c:169
+#: pg_rewind.c:177
 #, 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_rewind.c:184
+#: pg_rewind.c:192
 #, c-format
 msgid "cannot be executed by \"root\"\n"
 msgstr "no puede ser ejecutado por «root»\n"
 
-#: pg_rewind.c:185
+#: pg_rewind.c:193
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser.\n"
 msgstr "Debe ejecutar %s con el superusuario de PostgreSQL.\n"
 
-#: pg_rewind.c:215
+#: pg_rewind.c:224
 #, c-format
 msgid "source and target cluster are on the same timeline\n"
 msgstr "el cluster de origen y destino están en el mismo timeline\n"
 
-#: pg_rewind.c:218
+#: pg_rewind.c:230
 #, c-format
 msgid "servers diverged at WAL position %X/%X on timeline %u\n"
 msgstr "servidores divergieron en la posición de WAL %X/%X del timeline %u\n"
 
-#: pg_rewind.c:253
+#: pg_rewind.c:266
 #, c-format
 msgid "no rewind required\n"
 msgstr "no se requiere rebobinar\n"
 
-#: pg_rewind.c:259
+#: pg_rewind.c:272
 #, c-format
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
 msgstr "rebobinando desde el último checkpoint común en %X/%X en el timeline %u\n"
 
-#: pg_rewind.c:267
+#: pg_rewind.c:280
 #, c-format
 msgid "reading source file list\n"
 msgstr "leyendo la lista de archivos de origen\n"
 
-#: pg_rewind.c:269
+#: pg_rewind.c:282
 #, c-format
 msgid "reading target file list\n"
 msgstr "leyendo la lista de archivos de destino\n"
 
-#: pg_rewind.c:279
+#: pg_rewind.c:292
 #, c-format
 msgid "reading WAL in target\n"
 msgstr "leyendo WAL en destino\n"
 
-#: pg_rewind.c:296
+#: pg_rewind.c:309
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
 msgstr "se necesitan copiar %lu MB (tamaño total de directorio de origen es %lu MB)\n"
 
-#: pg_rewind.c:313
+#: pg_rewind.c:326
 #, c-format
 msgid ""
 "\n"
@@ -564,56 +575,88 @@
 "\n"
 "creando etiqueta de respaldo y actualizando archivo de control\n"
 
-#: pg_rewind.c:341
+#: pg_rewind.c:354
+#, c-format
+msgid "syncing target data directory\n"
+msgstr "sincronizando directorio de datos de destino\n"
+
+#: pg_rewind.c:357
 #, c-format
 msgid "Done!\n"
 msgstr "¡Listo!\n"
 
-#: pg_rewind.c:353
+#: pg_rewind.c:369
 #, c-format
 msgid "source and target clusters are from different systems\n"
 msgstr "clusters de origen y destino son de sistemas diferentes\n"
 
-#: pg_rewind.c:361
+#: pg_rewind.c:377
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind\n"
 msgstr "los clusters no son compatibles con esta versión de pg_rewind\n"
 
-#: pg_rewind.c:371
+#: pg_rewind.c:387
 #, c-format
 msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
 msgstr "el servidor de destino necesita tener sumas de verificación de datos o «wal_log_hints» activados\n"
 
-#: pg_rewind.c:381
+#: pg_rewind.c:398
 #, c-format
 msgid "target server must be shut down cleanly\n"
 msgstr "el directorio de destino debe estar apagado limpiamente\n"
 
-#: pg_rewind.c:389
+#: pg_rewind.c:408
 #, c-format
 msgid "source data directory must be shut down cleanly\n"
 msgstr "el directorio de origen debe estar apagado limpiamente\n"
 
-#: pg_rewind.c:456
+#: pg_rewind.c:475
 #, c-format
 msgid "could not find common ancestor of the source and target cluster's timelines\n"
 msgstr "no se pudo encontrar un ancestro común en el timeline de los clusters de origen y destino\n"
 
-#: pg_rewind.c:496
+#: pg_rewind.c:515
 #, c-format
 msgid "backup label buffer too small\n"
 msgstr "el búfer del backup label es demasiado pequeño\n"
 
-#: pg_rewind.c:518
+#: pg_rewind.c:538
 #, c-format
 msgid "unexpected control file CRC\n"
 msgstr "CRC de archivo de control inesperado\n"
 
-#: pg_rewind.c:528
+#: pg_rewind.c:548
 #, c-format
 msgid "unexpected control file size %d, expected %d\n"
 msgstr "tamaño del archivo de control %d inesperado, se esperaba %d\n"
 
+#: pg_rewind.c:615
+#, fuzzy, c-format
+msgid ""
+"The program \"initdb\" is needed by %s but was \n"
+"not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s necesita el programa «initdb», pero no pudo ser encontrado en el mismo\n"
+"directorio que «%s».\n"
+"Verifique su instalación.\n"
+
+#: pg_rewind.c:619
+#, c-format
+msgid ""
+"The program \"initdb\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"El programa «initdb» fue encontrado por «%s», pero no es\n"
+"de la misma versión que %s.\n"
+"Verifique su instalación.\n"
+
+#: pg_rewind.c:637
+#, c-format
+msgid "sync of target directory failed\n"
+msgstr "falló sincronización de directorio destino\n"
+
 #: timeline.c:76 timeline.c:82
 #, c-format
 msgid "syntax error in history file: %s\n"
@@ -729,57 +772,57 @@
 msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
 msgstr "ID de timeline %u fuera de secuencia (después de %u) en archivo %s, posición %u"
 
-#: xlogreader.c:1024
+#: xlogreader.c:1061
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %u fuera de orden en %X/%X"
 
-#: xlogreader.c:1046
+#: xlogreader.c:1083
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA está definido, pero no hay datos en %X/%X"
 
-#: xlogreader.c:1053
+#: xlogreader.c:1090
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA no está definido, pero el largo de los datos es %u en %X/%X"
 
-#: xlogreader.c:1086
+#: xlogreader.c:1123
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE está definido, pero posición del agujero es %u largo %u largo de imagen %u en %X/%X"
 
-#: xlogreader.c:1102
+#: xlogreader.c:1139
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE no está definido, pero posición del agujero es %u largo %u en %X/%X"
 
-#: xlogreader.c:1117
+#: xlogreader.c:1154
 #, c-format
 msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_IS_COMPRESSED definido, pero largo de imagen de bloque es %u en %X/%X"
 
-#: xlogreader.c:1132
+#: xlogreader.c:1169
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ni BKPIMAGE_HAS_HOLE ni BKPIMAGE_IS_COMPRESSED está definido, pero largo de imagen de bloque es %u en %X/%X"
 
-#: xlogreader.c:1148
+#: xlogreader.c:1185
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL está definido, pero no hay «rel» anterior en %X/%X "
 
-#: xlogreader.c:1160
+#: xlogreader.c:1197
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "block_id %u no válido en %X/%X"
 
-#: xlogreader.c:1225
+#: xlogreader.c:1262
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "registro con largo no válido en %X/%X"
 
-#: xlogreader.c:1314
+#: xlogreader.c:1351
 #, c-format
 msgid "invalid compressed image at %X/%X, block %d"
 msgstr "imagen comprimida no válida en %X/%X, bloque %d"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/po/fr.po postgresql-9.5-9.5.8/src/bin/pg_rewind/po/fr.po
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: pg_rewind (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-21 16:13+0000\n"
-"PO-Revision-Date: 2016-02-24 13:21+0100\n"
+"POT-Creation-Date: 2017-07-24 21:01+0000\n"
+"PO-Revision-Date: 2017-07-25 21:15+0200\n"
+"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
+"Language-Team: \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
-"Language-Team: \n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 2.0.2\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127 parsexlog.c:179
@@ -108,7 +108,7 @@
 msgid "could not seek in source file: %s\n"
 msgstr "n'a pas pu chercher dans le fichier source : %s\n"
 
-#: copy_fetch.c:192 file_ops.c:301
+#: copy_fetch.c:192 file_ops.c:300
 #, c-format
 msgid "could not read file \"%s\": %s\n"
 msgstr "n'a pas pu lire le fichier « %s » : %s\n"
@@ -133,57 +133,57 @@
 msgid "could not close target file \"%s\": %s\n"
 msgstr "n'a pas pu fermer le fichier cible « %s » : %s\n"
 
-#: file_ops.c:99
+#: file_ops.c:98
 #, c-format
 msgid "could not seek in target file \"%s\": %s\n"
 msgstr "n'a pas pu chercher dans le fichier cible « %s » : %s\n"
 
-#: file_ops.c:115
+#: file_ops.c:114
 #, c-format
 msgid "could not write file \"%s\": %s\n"
 msgstr "n'a pas pu écrire le fichier « %s » : %s\n"
 
-#: file_ops.c:165
+#: file_ops.c:164
 #, c-format
 msgid "invalid action (CREATE) for regular file\n"
 msgstr "action (CREATE) invalide pour les fichiers réguliers\n"
 
-#: file_ops.c:180
+#: file_ops.c:179
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "n'a pas pu supprimer le fichier « %s » : %s\n"
 
-#: file_ops.c:197
+#: file_ops.c:196
 #, c-format
 msgid "could not open file \"%s\" for truncation: %s\n"
 msgstr "n'a pas pu ouvrir le fichier « %s » pour le troncage : %s\n"
 
-#: file_ops.c:201
+#: file_ops.c:200
 #, c-format
 msgid "could not truncate file \"%s\" to %u: %s\n"
 msgstr "n'a pas pu tronquer le fichier « %s » à %u : %s\n"
 
-#: file_ops.c:217
+#: file_ops.c:216
 #, c-format
 msgid "could not create directory \"%s\": %s\n"
 msgstr "n'a pas pu créer le répertoire « %s » : %s\n"
 
-#: file_ops.c:231
+#: file_ops.c:230
 #, c-format
 msgid "could not remove directory \"%s\": %s\n"
 msgstr "n'a pas pu supprimer le répertoire « %s » : %s\n"
 
-#: file_ops.c:245
+#: file_ops.c:244
 #, c-format
 msgid "could not create symbolic link at \"%s\": %s\n"
 msgstr "n'a pas pu créer le lien symbolique à « %s » : %s\n"
 
-#: file_ops.c:259
+#: file_ops.c:258
 #, c-format
 msgid "could not remove symbolic link \"%s\": %s\n"
 msgstr "n'a pas pu supprimer le lien symbolique « %s » : %s\n"
 
-#: file_ops.c:289 file_ops.c:293
+#: file_ops.c:288 file_ops.c:292
 #, c-format
 msgid "could not open file \"%s\" for reading: %s\n"
 msgstr "n'a pas pu ouvrir le fichier « %s » pour une lecture : %s\n"
@@ -218,142 +218,147 @@
 msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
 msgstr "modification inattendue de page pour le répertoire ou le lien symbolique « %s »\n"
 
-#: libpq_fetch.c:55
+#: libpq_fetch.c:56
 #, c-format
 msgid "could not connect to server: %s"
 msgstr "n'a pas pu se connecter au serveur : %s"
 
-#: libpq_fetch.c:58
+#: libpq_fetch.c:59
 #, c-format
 msgid "connected to server\n"
 msgstr "connecté au serveur\n"
 
-#: libpq_fetch.c:68
+#: libpq_fetch.c:69
 #, c-format
 msgid "source server must not be in recovery mode\n"
 msgstr "le serveur source ne doit pas être en mode restauration\n"
 
-#: libpq_fetch.c:78
+#: libpq_fetch.c:79
 #, c-format
 msgid "full_page_writes must be enabled in the source server\n"
 msgstr "full_page_writes doit être activé sur le serveur source\n"
 
-#: libpq_fetch.c:95
+#: libpq_fetch.c:91
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "n'a pas pu configurer le contexte de connexion : %s"
+
+#: libpq_fetch.c:109
 #, c-format
 msgid "error running query (%s) in source server: %s"
 msgstr "erreur lors de l'exécution de la requête (%s) dans le serveur source : %s"
 
-#: libpq_fetch.c:100
+#: libpq_fetch.c:114
 #, c-format
 msgid "unexpected result set from query\n"
 msgstr "ensemble de résultats inattendu de la requête\n"
 
-#: libpq_fetch.c:123
+#: libpq_fetch.c:137
 #, c-format
 msgid "unrecognized result \"%s\" for current WAL insert location\n"
 msgstr "résultat non reconnu « %s » pour l'emplacement d'insertion actuel dans les WAL\n"
 
-#: libpq_fetch.c:173
+#: libpq_fetch.c:187
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "n'a pas pu récupérer la liste des fichiers : %s"
 
-#: libpq_fetch.c:178
+#: libpq_fetch.c:192
 #, c-format
 msgid "unexpected result set while fetching file list\n"
 msgstr "ensemble de résultats inattendu lors de la récupération de la liste des fichiers\n"
 
-#: libpq_fetch.c:226
+#: libpq_fetch.c:262
 #, c-format
 msgid "could not send query: %s"
 msgstr "n'a pas pu envoyer la requête : %s"
 
-#: libpq_fetch.c:228
+#: libpq_fetch.c:264
 #, c-format
 msgid "getting file chunks\n"
 msgstr "récupération des parties de fichier\n"
 
-#: libpq_fetch.c:231
+#: libpq_fetch.c:267
 #, c-format
 msgid "could not set libpq connection to single row mode\n"
 msgstr "n'a pas pu configurer la connexion libpq en mode ligne seule\n"
 
-#: libpq_fetch.c:251
+#: libpq_fetch.c:287
 #, c-format
 msgid "unexpected result while fetching remote files: %s"
 msgstr "résultat inattendu lors de la récupération des fichiers cibles : %s"
 
-#: libpq_fetch.c:257
+#: libpq_fetch.c:293
 #, c-format
 msgid "unexpected result set size while fetching remote files\n"
 msgstr "taille inattendue de l'ensemble de résultats lors de la récupération des fichiers distants\n"
 
-#: libpq_fetch.c:263
+#: libpq_fetch.c:299
 #, c-format
 msgid "unexpected data types in result set while fetching remote files: %u %u %u\n"
 msgstr "types de données inattendus dans l'ensemble de résultats lors de la récupération des fichiers distants : %u %u %u\n"
 
-#: libpq_fetch.c:271
+#: libpq_fetch.c:307
 #, c-format
 msgid "unexpected result format while fetching remote files\n"
 msgstr "format de résultat inattendu lors de la récupération des fichiers distants\n"
 
-#: libpq_fetch.c:277
+#: libpq_fetch.c:313
 #, c-format
 msgid "unexpected null values in result while fetching remote files\n"
 msgstr "valeurs NULL inattendues dans le résultat lors de la récupération des fichiers distants\n"
 
-#: libpq_fetch.c:281
+#: libpq_fetch.c:317
 #, c-format
 msgid "unexpected result length while fetching remote files\n"
 msgstr "longueur de résultats inattendu lors de la récupération des fichiers distants\n"
 
-#: libpq_fetch.c:303
+#: libpq_fetch.c:339
 #, c-format
 msgid "received null value for chunk for file \"%s\", file has been deleted\n"
 msgstr "a reçu une valeur NULL pour une partie du fichier « %s », le fichier a été supprimé\n"
 
-#: libpq_fetch.c:310
+#: libpq_fetch.c:346
 #, c-format
-msgid "received chunk for file \"%s\", offset %d, size %d\n"
-msgstr "récupération d'une partie du fichier « %s », décalage %d, taille %d\n"
+msgid "received chunk for file \"%s\", offset "
+msgstr "récupération d'une partie du fichier « %s », décalage "
 
-#: libpq_fetch.c:339
+#: libpq_fetch.c:375
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
 msgstr "n'a pas pu récupérer le fichier distant « %s » : %s"
 
-#: libpq_fetch.c:344
+#: libpq_fetch.c:380
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\"\n"
 msgstr "ensemble de résultats inattendu lors de la récupération du fichier distant « %s »\n"
 
-#: libpq_fetch.c:355
+#: libpq_fetch.c:391
 #, c-format
 msgid "fetched file \"%s\", length %d\n"
 msgstr "fichier récupéré « %s », longueur %d\n"
 
-#: libpq_fetch.c:387
+#: libpq_fetch.c:424
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "n'a pas pu envoyer les données COPY : %s"
 
-#: libpq_fetch.c:413
+#: libpq_fetch.c:450
 #, c-format
 msgid "could not create temporary table: %s"
 msgstr "n'a pas pu créer la table temporaire : %s"
 
-#: libpq_fetch.c:421
+#: libpq_fetch.c:458
 #, c-format
 msgid "could not send file list: %s"
 msgstr "n'a pas pu envoyer la liste de fichiers : %s"
 
-#: libpq_fetch.c:463
+#: libpq_fetch.c:500
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "n'a pas pu envoyer end-of-COPY : %s"
 
-#: libpq_fetch.c:469
+#: libpq_fetch.c:506
 #, c-format
 msgid "unexpected result while sending file list: %s"
 msgstr "résultat inattendu lors de l'envoi de la liste de fichiers : %s"
@@ -411,7 +416,7 @@
 "l'enregistrement WAL modifie une relation mais le type d'enregistrement n'est pas reconnu\n"
 "lsn : %X/%X, rmgr : %s, info : %02X\n"
 
-#: pg_rewind.c:59
+#: pg_rewind.c:60
 #, c-format
 msgid ""
 "%s resynchronizes a PostgreSQL cluster with another copy of the cluster.\n"
@@ -420,7 +425,7 @@
 "%s resynchronise une instance PostgreSQL avec une autre copie de l'instance.\n"
 "\n"
 
-#: pg_rewind.c:60
+#: pg_rewind.c:61
 #, c-format
 msgid ""
 "Usage:\n"
@@ -431,52 +436,52 @@
 "  %s [OPTION]...\n"
 "\n"
 
-#: pg_rewind.c:61
+#: pg_rewind.c:62
 #, c-format
 msgid "Options:\n"
 msgstr "Options :\n"
 
-#: pg_rewind.c:62
+#: pg_rewind.c:63
 #, c-format
 msgid "  -D, --target-pgdata=DIRECTORY  existing data directory to modify\n"
 msgstr "  -D, --target-pgdata=RÉPERTOIRE répertoire de données existant à modifier\n"
 
-#: pg_rewind.c:63
+#: pg_rewind.c:64
 #, c-format
 msgid "      --source-pgdata=DIRECTORY  source data directory to synchronize with\n"
 msgstr "      --source-pgdata=RÉPERTOIRE répertoire des données source pour la synchronisation\n"
 
-#: pg_rewind.c:64
+#: pg_rewind.c:65
 #, c-format
 msgid "      --source-server=CONNSTR    source server to synchronize with\n"
 msgstr "      --source-server=CONNSTR    serveur source pour la synchronisation\n"
 
-#: pg_rewind.c:65
+#: pg_rewind.c:66
 #, c-format
 msgid "  -n, --dry-run                  stop before modifying anything\n"
 msgstr "  -n, --dry-run                  arrête avant de modifier quoi que ce soit\n"
 
-#: pg_rewind.c:66
+#: pg_rewind.c:67
 #, c-format
 msgid "  -P, --progress                 write progress messages\n"
 msgstr "  -P, --progress                 écrit les messages de progression\n"
 
-#: pg_rewind.c:67
+#: pg_rewind.c:68
 #, c-format
 msgid "      --debug                    write a lot of debug messages\n"
 msgstr "      --debug                    écrit beaucoup de messages de débogage\n"
 
-#: pg_rewind.c:68
+#: pg_rewind.c:69
 #, c-format
 msgid "  -V, --version                  output version information, then exit\n"
 msgstr "  -V, --version                  affiche la version, puis quitte\n"
 
-#: pg_rewind.c:69
+#: pg_rewind.c:70
 #, c-format
 msgid "  -?, --help                     show this help, then exit\n"
 msgstr "  -?, --help                     affiche cette aide, puis quitte\n"
 
-#: pg_rewind.c:70
+#: pg_rewind.c:71
 #, c-format
 msgid ""
 "\n"
@@ -485,77 +490,83 @@
 "\n"
 "Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_rewind.c:125 pg_rewind.c:156 pg_rewind.c:163 pg_rewind.c:171
+#: pg_rewind.c:126 pg_rewind.c:157 pg_rewind.c:164 pg_rewind.c:171
+#: pg_rewind.c:179
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Essayez « %s --help » pour plus d'informations.\n"
 
-#: pg_rewind.c:155
+#: pg_rewind.c:156
 #, c-format
 msgid "%s: no source specified (--source-pgdata or --source-server)\n"
 msgstr "%s : aucune source indiquée (--source-pgdata ou --source-server)\n"
 
-#: pg_rewind.c:162
+#: pg_rewind.c:163
+#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s : une seule des options --source-pgdata et --source-server peut être indiquée\n"
+
+#: pg_rewind.c:170
 #, c-format
 msgid "%s: no target data directory specified (--target-pgdata)\n"
 msgstr "%s : aucun répertoire de données cible indiqué (--target-pgdata)\n"
 
-#: pg_rewind.c:169
+#: pg_rewind.c:177
 #, 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_rewind.c:184
+#: pg_rewind.c:192
 #, c-format
 msgid "cannot be executed by \"root\"\n"
 msgstr "ne peut pas être exécuté par « root »\n"
 
-#: pg_rewind.c:185
+#: pg_rewind.c:193
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser.\n"
 msgstr "Vous devez exécuter %s en tant que super-utilisateur PostgreSQL.\n"
 
-#: pg_rewind.c:216
+#: pg_rewind.c:224
 #, c-format
 msgid "source and target cluster are on the same timeline\n"
 msgstr "les instances source et cible sont sur la même ligne de temps\n"
 
-#: pg_rewind.c:222
+#: pg_rewind.c:230
 #, c-format
 msgid "servers diverged at WAL position %X/%X on timeline %u\n"
 msgstr "les serveurs ont divergé à la position %X/%X des WAL sur la timeline %u\n"
 
-#: pg_rewind.c:258
+#: pg_rewind.c:266
 #, c-format
 msgid "no rewind required\n"
 msgstr "pas de retour en arrière requis\n"
 
-#: pg_rewind.c:264
+#: pg_rewind.c:272
 #, c-format
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
 msgstr "retour en arrière depuis le dernier checkpoint commun à %X/%X sur la ligne de temps %u\n"
 
-#: pg_rewind.c:272
+#: pg_rewind.c:280
 #, c-format
 msgid "reading source file list\n"
 msgstr "lecture de la liste des fichiers sources\n"
 
-#: pg_rewind.c:274
+#: pg_rewind.c:282
 #, c-format
 msgid "reading target file list\n"
 msgstr "lecture de la liste des fichiers cibles\n"
 
-#: pg_rewind.c:284
+#: pg_rewind.c:292
 #, c-format
 msgid "reading WAL in target\n"
 msgstr "lecture du WAL dans la cible\n"
 
-#: pg_rewind.c:301
+#: pg_rewind.c:309
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
 msgstr "a besoin de copier %lu Mo (la taille totale du répertoire source est %lu Mo)\n"
 
-#: pg_rewind.c:318
+#: pg_rewind.c:326
 #, c-format
 msgid ""
 "\n"
@@ -564,56 +575,88 @@
 "\n"
 "création du fichier backup_label et mise à jour du fichier contrôle\n"
 
-#: pg_rewind.c:346
+#: pg_rewind.c:354
+#, c-format
+msgid "syncing target data directory\n"
+msgstr "synchronisation du répertoire de données cible\n"
+
+#: pg_rewind.c:357
 #, c-format
 msgid "Done!\n"
 msgstr "Terminé !\n"
 
-#: pg_rewind.c:358
+#: pg_rewind.c:369
 #, c-format
 msgid "source and target clusters are from different systems\n"
 msgstr "les instances source et cible proviennent de systèmes différents\n"
 
-#: pg_rewind.c:366
+#: pg_rewind.c:377
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind\n"
 msgstr "les instances ne sont pas compatibles avec cette version de pg_rewind\n"
 
-#: pg_rewind.c:376
+#: pg_rewind.c:387
 #, c-format
 msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
 msgstr "le serveur cible doit soit utiliser les sommes de contrôle sur les données soit avoir wal_log_hints configuré à on\n"
 
-#: pg_rewind.c:387
+#: pg_rewind.c:398
 #, c-format
 msgid "target server must be shut down cleanly\n"
 msgstr "le serveur cible doit être arrêté proprement\n"
 
-#: pg_rewind.c:397
+#: pg_rewind.c:408
 #, c-format
 msgid "source data directory must be shut down cleanly\n"
 msgstr "le répertoire de données source doit être arrêté proprement\n"
 
-#: pg_rewind.c:464
+#: pg_rewind.c:475
 #, c-format
 msgid "could not find common ancestor of the source and target cluster's timelines\n"
 msgstr "n'a pas pu trouver l'ancêtre commun des lignes de temps des instances source et cible\n"
 
-#: pg_rewind.c:504
+#: pg_rewind.c:515
 #, c-format
 msgid "backup label buffer too small\n"
 msgstr "tampon du label de sauvegarde trop petit\n"
 
-#: pg_rewind.c:526
+#: pg_rewind.c:538
 #, c-format
 msgid "unexpected control file CRC\n"
 msgstr "CRC inattendu pour le fichier de contrôle\n"
 
-#: pg_rewind.c:536
+#: pg_rewind.c:548
 #, c-format
 msgid "unexpected control file size %d, expected %d\n"
 msgstr "taille %d inattendue du fichier de contrôle, %d attendu\n"
 
+#: pg_rewind.c:615
+#, c-format
+msgid ""
+"The program \"initdb\" is needed by %s but was \n"
+"not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Le programme « initdb » est nécessaire pour %s, mais n'a pas été trouvé\n"
+"dans le même répertoire que « %s ».\n"
+"Vérifiez votre installation.\n"
+
+#: pg_rewind.c:619
+#, c-format
+msgid ""
+"The program \"initdb\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"Le programme « initdb » a été trouvé par « %s »\n"
+"mais n'était pas de la même version que %s.\n"
+"Vérifiez votre installation.\n"
+
+#: pg_rewind.c:637
+#, c-format
+msgid "sync of target directory failed\n"
+msgstr "échec de la synchronisation du répertoire cible\n"
+
 #: timeline.c:76 timeline.c:82
 #, c-format
 msgid "syntax error in history file: %s\n"
@@ -731,57 +774,57 @@
 msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
 msgstr "identifiant timeline %u hors de la séquence (après %u) dans le segment %s, décalage %u"
 
-#: xlogreader.c:1024
+#: xlogreader.c:1061
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "block_id %u désordonné à %X/%X"
 
-#: xlogreader.c:1046
+#: xlogreader.c:1083
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA configuré, mais aucune donnée inclus à %X/%X"
 
-#: xlogreader.c:1053
+#: xlogreader.c:1090
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA non configuré, mais la longueur des données est %u à %X/%X"
 
-#: xlogreader.c:1086
+#: xlogreader.c:1123
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE activé, mais décalage trou %u longueur %u longueur image bloc %u à %X/%X"
 
-#: xlogreader.c:1102
+#: xlogreader.c:1139
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr "BKPIMAGE_HAS_HOLE désactivé, mais décalage trou %u longueur %u à %X/%X"
 
-#: xlogreader.c:1117
+#: xlogreader.c:1154
 #, c-format
 msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
 msgstr "BKPIMAGE_IS_COMPRESSED configuré, mais la longueur de l'image du bloc est %u à %X/%X"
 
-#: xlogreader.c:1132
+#: xlogreader.c:1169
 #, c-format
 msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
 msgstr "ni BKPIMAGE_HAS_HOLE ni BKPIMAGE_IS_COMPRESSED configuré, mais la longueur de l'image du bloc est %u à %X/%X"
 
-#: xlogreader.c:1148
+#: xlogreader.c:1185
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr "BKPBLOCK_SAME_REL configuré, mais pas de relation précédente à %X/%X"
 
-#: xlogreader.c:1160
+#: xlogreader.c:1197
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "block_id %u invalide à %X/%X"
 
-#: xlogreader.c:1225
+#: xlogreader.c:1262
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "enregistrement de longueur invalide à %X/%X"
 
-#: xlogreader.c:1314
+#: xlogreader.c:1351
 #, c-format
 msgid "invalid compressed image at %X/%X, block %d"
 msgstr "image compressée invalide à %X/%X, bloc %d"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/po/it.po postgresql-9.5-9.5.8/src/bin/pg_rewind/po/it.po
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -15,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: pg_rewind (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-06 21:14+0000\n"
-"PO-Revision-Date: 2015-07-07 02:32+0100\n"
+"POT-Creation-Date: 2017-02-09 21:22+0000\n"
+"PO-Revision-Date: 2017-04-23 02:54+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -25,149 +25,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: ../../../src/backend/access/transam/xlogreader.c:267
-#, c-format
-msgid "invalid record offset at %X/%X"
-msgstr "offset del record non valido a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:275
-#, c-format
-msgid "contrecord is requested by %X/%X"
-msgstr "contrecord richiesto da %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:315
-#: ../../../src/backend/access/transam/xlogreader.c:606
-#, c-format
-msgid "invalid record length at %X/%X"
-msgstr "lunghezza del record non valida a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:329
-#, c-format
-msgid "record length %u at %X/%X too long"
-msgstr "lunghezza del record %u a %X/%X eccessiva"
-
-#: ../../../src/backend/access/transam/xlogreader.c:370
-#, c-format
-msgid "there is no contrecord flag at %X/%X"
-msgstr "non c'è un flag di contrecord a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:383
-#, c-format
-msgid "invalid contrecord length %u at %X/%X"
-msgstr "lunghezza di contrecord %u non valida a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:613
-#, c-format
-msgid "invalid resource manager ID %u at %X/%X"
-msgstr "ID di gestione risorse %u non valido a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:627
-#: ../../../src/backend/access/transam/xlogreader.c:644
-#, c-format
-msgid "record with incorrect prev-link %X/%X at %X/%X"
-msgstr "record con link-precedente %X/%X non corretto a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:681
-#, c-format
-msgid "incorrect resource manager data checksum in record at %X/%X"
-msgstr "checksum dei dati del manager di risorse non corretto nel record a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:714
-#, c-format
-msgid "invalid magic number %04X in log segment %s, offset %u"
-msgstr "numero magico %04X non valido nel segmento di log %s, offset %u"
-
-#: ../../../src/backend/access/transam/xlogreader.c:728
-#: ../../../src/backend/access/transam/xlogreader.c:779
-#, c-format
-msgid "invalid info bits %04X in log segment %s, offset %u"
-msgstr "bit di info %04X non validi nel segmento di log %s, offset %u"
-
-#: ../../../src/backend/access/transam/xlogreader.c:754
-#, c-format
-msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s."
-msgstr "Il file di WAL è di un database diverso: l'identificatore del file di WAL del database è %s, l'identificatore di pg_control del database è %s."
-
-#: ../../../src/backend/access/transam/xlogreader.c:761
-#, c-format
-msgid "WAL file is from different database system: Incorrect XLOG_SEG_SIZE in page header."
-msgstr "Il file di WAL è di un database diverso: XLOG_SEG_SIZE non corretto nell'header di pagina."
-
-#: ../../../src/backend/access/transam/xlogreader.c:767
-#, c-format
-msgid "WAL file is from different database system: Incorrect XLOG_BLCKSZ in page header."
-msgstr "Il file di WAL è di un database diverso: XLOG_BLCKSZ non corretto nell'header di pagina."
-
-#: ../../../src/backend/access/transam/xlogreader.c:793
-#, c-format
-msgid "unexpected pageaddr %X/%X in log segment %s, offset %u"
-msgstr "pageaddr inaspettato %X/%X nel segmento di log %s, offset %u"
-
-#: ../../../src/backend/access/transam/xlogreader.c:818
-#, c-format
-msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
-msgstr "ID della timeline %u (dopo %u) fuori sequenza nel segmento di log %s, offset %u"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1027
-#, c-format
-msgid "out-of-order block_id %u at %X/%X"
-msgstr "block_id fuori sequenza %u a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1049
-#, c-format
-msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
-msgstr "BKPBLOCK_HAS_DATA impostato, ma dati non inclusi a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1056
-#, c-format
-msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
-msgstr "BKPBLOCK_HAS_DATA non impostato, ma la lunghezza dei dati è %u a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1089
-#, c-format
-msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
-msgstr "BKPIMAGE_HAS_HOLE impostato, ma offset buco %u lunghezza %u lunghezza dell'immagine del blocco %u a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1105
-#, c-format
-msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
-msgstr "BKPIMAGE_HAS_HOLE non impostato, ma offset buco %u lunghezza %u a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1120
-#, c-format
-msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
-msgstr "BKPIMAGE_IS_COMPRESSED impostato, ma la lunghezza dell'immagine del blocco è %u a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1135
-#, c-format
-msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
-msgstr "né BKPIMAGE_HAS_HOLE né BKPIMAGE_IS_COMPRESSED impostati, ma la lunghezza dell'immagine del blocco è %u a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1151
-#, c-format
-msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
-msgstr "BKPBLOCK_SAME_REL impostato ma non c'è un rel precedente a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1163
-#, c-format
-msgid "invalid block_id %u at %X/%X"
-msgstr "block_id %u non valido a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1228
-#, c-format
-msgid "record with invalid length at %X/%X"
-msgstr "record con lunghezza non valida a %X/%X"
-
-#: ../../../src/backend/access/transam/xlogreader.c:1317
-#, c-format
-msgid "invalid compressed image at %X/%X, block %d"
-msgstr "immagine compressa non valida a %X/%X, blocco %d"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127
-#: parsexlog.c:179
+#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127 parsexlog.c:179
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria esaurita\n"
@@ -217,7 +78,7 @@
 msgid "could not open directory \"%s\": %s\n"
 msgstr "apertura della directory \"%s\" fallita: %s\n"
 
-#: copy_fetch.c:93 filemap.c:104 filemap.c:259
+#: copy_fetch.c:93 filemap.c:112 filemap.c:267
 #, c-format
 msgid "could not stat file \"%s\": %s\n"
 msgstr "richiesta informazioni sul file \"%s\" fallita: %s\n"
@@ -257,7 +118,7 @@
 msgid "could not seek in source file: %s\n"
 msgstr "spostamento nel file di origine fallito: %s\n"
 
-#: copy_fetch.c:192 file_ops.c:301
+#: copy_fetch.c:192 file_ops.c:300
 #, c-format
 msgid "could not read file \"%s\": %s\n"
 msgstr "lettura del file \"%s\" fallita: %s\n"
@@ -282,227 +143,232 @@
 msgid "could not close target file \"%s\": %s\n"
 msgstr "chiusura del file di destinazione \"%s\" fallita: %s\n"
 
-#: file_ops.c:99
+#: file_ops.c:98
 #, c-format
 msgid "could not seek in target file \"%s\": %s\n"
 msgstr "spostamento nel file di destinazione \"%s\" fallito: %s\n"
 
-#: file_ops.c:115
+#: file_ops.c:114
 #, c-format
 msgid "could not write file \"%s\": %s\n"
 msgstr "scrittura nel file \"%s\" fallita: %s\n"
 
-#: file_ops.c:165
+#: file_ops.c:164
 #, c-format
 msgid "invalid action (CREATE) for regular file\n"
 msgstr "azione non valida (CREATE) per file regolari\n"
 
-#: file_ops.c:180
+#: file_ops.c:179
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "rimozione del file \"%s\" fallita: %s\n"
 
-#: file_ops.c:197
+#: file_ops.c:196
 #, c-format
 msgid "could not open file \"%s\" for truncation: %s\n"
 msgstr "apertura del file \"%s\" per troncamento fallita: %s\n"
 
-#: file_ops.c:201
+#: file_ops.c:200
 #, c-format
-msgid "could not truncate file \"%s\" to %u bytes: %s\n"
-msgstr "troncamento del file \"%s\" a %u byte fallita: %s\n"
+msgid "could not truncate file \"%s\" to %u: %s\n"
+msgstr "troncamento del file \"%s\" a %u fallito: %s\n"
 
-#: file_ops.c:217
+#: file_ops.c:216
 #, c-format
 msgid "could not create directory \"%s\": %s\n"
 msgstr "creazione della directory \"%s\" fallita: %s\n"
 
-#: file_ops.c:231
+#: file_ops.c:230
 #, c-format
 msgid "could not remove directory \"%s\": %s\n"
 msgstr "rimozione della directory \"%s\" fallita: %s\n"
 
-#: file_ops.c:245
+#: file_ops.c:244
 #, c-format
 msgid "could not create symbolic link at \"%s\": %s\n"
 msgstr "creazione del link simbolico a \"%s\" fallita: %s\n"
 
-#: file_ops.c:259
+#: file_ops.c:258
 #, c-format
 msgid "could not remove symbolic link \"%s\": %s\n"
 msgstr "rimozione del link simbolico \"%s\" fallita: %s\n"
 
-#: file_ops.c:289 file_ops.c:293
+#: file_ops.c:288 file_ops.c:292
 #, c-format
 msgid "could not open file \"%s\" for reading: %s\n"
 msgstr "apertura del file \"%s\" in lettura fallita: %s\n"
 
-#: filemap.c:96
+#: filemap.c:104
 #, c-format
 msgid "data file \"%s\" in source is not a regular file\n"
 msgstr "il file di dati di origine \"%s\" non è un file regolare\n"
 
-#: filemap.c:118
+#: filemap.c:126
 #, c-format
 msgid "\"%s\" is not a directory\n"
 msgstr "\"%s\" non è una directory\n"
 
-#: filemap.c:141
+#: filemap.c:149
 #, c-format
 msgid "\"%s\" is not a symbolic link\n"
 msgstr "\"%s\" non è un link simbolico\n"
 
-#: filemap.c:153
+#: filemap.c:161
 #, c-format
 msgid "\"%s\" is not a regular file\n"
 msgstr "\"%s\" non è un file regolare\n"
 
-#: filemap.c:271
+#: filemap.c:279
 #, c-format
 msgid "source file list is empty\n"
 msgstr "la lista dei file di origine è vuota\n"
 
-#: filemap.c:387
+#: filemap.c:401
 #, c-format
 msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
 msgstr "modifica di pagina imprevista per la directory o il link simbolico \"%s\"\n"
 
-#: libpq_fetch.c:55
+#: libpq_fetch.c:56
 #, c-format
 msgid "could not connect to server: %s"
 msgstr "connessione al server fallita: %s"
 
-#: libpq_fetch.c:58
+#: libpq_fetch.c:59
 #, c-format
 msgid "connected to server\n"
 msgstr "connesso al server\n"
 
-#: libpq_fetch.c:68
+#: libpq_fetch.c:69
 #, c-format
 msgid "source server must not be in recovery mode\n"
 msgstr "il server di origine non dev'essere in modalità di recupero\n"
 
-#: libpq_fetch.c:78
+#: libpq_fetch.c:79
 #, c-format
 msgid "full_page_writes must be enabled in the source server\n"
 msgstr "full_page_writes dev'essere abilitato nel server di origine\n"
 
-#: libpq_fetch.c:94
+#: libpq_fetch.c:91
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "preparazione del contesto di connessione fallita: %s"
+
+#: libpq_fetch.c:109
 #, c-format
 msgid "error running query (%s) in source server: %s"
 msgstr "errore nell'esecuzione della query (%s) nel server di origine: %s"
 
-#: libpq_fetch.c:99
+#: libpq_fetch.c:114
 #, c-format
 msgid "unexpected result set from query\n"
 msgstr "risultato imprevisto dalla query\n"
 
-#: libpq_fetch.c:122
+#: libpq_fetch.c:137
 #, c-format
-msgid "unrecognized result \"%s\" for current XLOG insert location\n"
-msgstr "risultato \"%s\" non riconosciuto per la locazione di inserimento XLOG corrente\n"
+msgid "unrecognized result \"%s\" for current WAL insert location\n"
+msgstr "risultato \"%s\" non riconosciuto per la locazione di inserimento WAL corrente\n"
 
-#: libpq_fetch.c:170
+#: libpq_fetch.c:187
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "ricezione della lista dei file fallita: %s"
 
-#: libpq_fetch.c:175
+#: libpq_fetch.c:192
 #, c-format
 msgid "unexpected result set while fetching file list\n"
 msgstr "risultato imprevisto ricevendo la lista dei file\n"
 
-#: libpq_fetch.c:222
+#: libpq_fetch.c:240
 #, c-format
 msgid "could not send query: %s"
 msgstr "invio della query non riuscito: %s"
 
-#: libpq_fetch.c:224
+#: libpq_fetch.c:242
 #, c-format
 msgid "getting file chunks\n"
 msgstr "ricezione blocchi del file\n"
 
-#: libpq_fetch.c:227
+#: libpq_fetch.c:245
 #, c-format
 msgid "could not set libpq connection to single row mode\n"
 msgstr "impostazione della connessione libpq in modalità riga singola fallita\n"
 
-#: libpq_fetch.c:247
+#: libpq_fetch.c:265
 #, c-format
-msgid "unexpected result while fetching remote files: %s\n"
-msgstr "risultato imprevisto ricevendo i file remoti: %s\n"
+msgid "unexpected result while fetching remote files: %s"
+msgstr "risultato imprevisto ricevendo i file remoti: %s"
 
-#: libpq_fetch.c:253
+#: libpq_fetch.c:271
 #, c-format
 msgid "unexpected result set size while fetching remote files\n"
 msgstr "dimensione del risultato imprevisto ricevendo i file remoti\n"
 
-#: libpq_fetch.c:259
+#: libpq_fetch.c:277
 #, c-format
 msgid "unexpected data types in result set while fetching remote files: %u %u %u\n"
 msgstr "tipo di dati imprevisto nel risultato ricevendo i file remoti: %u %u %u\n"
 
-#: libpq_fetch.c:267
+#: libpq_fetch.c:285
 #, c-format
 msgid "unexpected result format while fetching remote files\n"
 msgstr "formato del risultato imprevisto ricevendo i file remoti\n"
 
-#: libpq_fetch.c:273
+#: libpq_fetch.c:291
 #, c-format
 msgid "unexpected null values in result while fetching remote files\n"
 msgstr "valori null non previsti nel risultato ricevendo i file remoti\n"
 
-#: libpq_fetch.c:277
+#: libpq_fetch.c:295
 #, c-format
 msgid "unexpected result length while fetching remote files\n"
 msgstr "lunghezza del risultato non prevista ricevendo i file remoti\n"
 
-#: libpq_fetch.c:299
+#: libpq_fetch.c:317
 #, c-format
-msgid "received NULL chunk for file \"%s\", file has been deleted\n"
-msgstr "ricevuto blocco NULL per il file \"%s\", il file è stato cancellato\n"
+msgid "received null value for chunk for file \"%s\", file has been deleted\n"
+msgstr "ricevuto valore null per il blocco del file \"%s\", il file è stato cancellato\n"
 
-#: libpq_fetch.c:306
+#: libpq_fetch.c:324
 #, c-format
 msgid "received chunk for file \"%s\", offset %d, size %d\n"
 msgstr "ricevuto blocco per il file \"%s\", offset %d, dimensione %d\n"
 
-#: libpq_fetch.c:335
+#: libpq_fetch.c:353
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
 msgstr "ricezione del file remoto \"%s\" fallita: %s"
 
-#: libpq_fetch.c:340
+#: libpq_fetch.c:358
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\"\n"
 msgstr "risultato inatteso leggendo il file remoto \"%s\"\n"
 
-#: libpq_fetch.c:349
+#: libpq_fetch.c:369
 #, c-format
 msgid "fetched file \"%s\", length %d\n"
 msgstr "ricevuto il file \"%s\", lunghezza %d\n"
 
-#: libpq_fetch.c:381
+#: libpq_fetch.c:401
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "invio dei dati di COPY fallito: %s"
 
-#: libpq_fetch.c:407
+#: libpq_fetch.c:427
 #, c-format
 msgid "could not create temporary table: %s"
 msgstr "creazione della tabella temporanea fallita: %s"
 
-#: libpq_fetch.c:414
+#: libpq_fetch.c:435
 #, c-format
 msgid "could not send file list: %s"
 msgstr "invio della lista dei file fallito: %s"
 
-#: libpq_fetch.c:455
+#: libpq_fetch.c:477
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "invio del fine-COPY fallito: %s"
 
-#: libpq_fetch.c:461
+#: libpq_fetch.c:483
 #, c-format
 msgid "unexpected result while sending file list: %s"
 msgstr "risultato imprevisto inviando la lista dei file: %s"
@@ -560,7 +426,7 @@
 "il file WAL modifica una relazione, ma il tipo di record non è riconosciuto\n"
 "lsn: %X/%X, rmgr: %s, info: %02X\n"
 
-#: pg_rewind.c:59
+#: pg_rewind.c:60
 #, c-format
 msgid ""
 "%s resynchronizes a PostgreSQL cluster with another copy of the cluster.\n"
@@ -569,7 +435,7 @@
 "%s risincronizza un cluster PostgreSQL con un'altra copia del cluster.\n"
 "\n"
 
-#: pg_rewind.c:60
+#: pg_rewind.c:61
 #, c-format
 msgid ""
 "Usage:\n"
@@ -580,52 +446,52 @@
 "  %s [OPZIONE]...\n"
 "\n"
 
-#: pg_rewind.c:61
+#: pg_rewind.c:62
 #, c-format
 msgid "Options:\n"
 msgstr "Opzioni:\n"
 
-#: pg_rewind.c:62
+#: pg_rewind.c:63
 #, c-format
 msgid "  -D, --target-pgdata=DIRECTORY  existing data directory to modify\n"
 msgstr "  -D, --target-pgdata=DIRECTORY  directory dati esistente da modificare\n"
 
-#: pg_rewind.c:63
+#: pg_rewind.c:64
 #, c-format
-msgid "      --source-pgdata=DIRECTORY  source data directory to sync with\n"
+msgid "      --source-pgdata=DIRECTORY  source data directory to synchronize with\n"
 msgstr "      --source-pgdata=DIRECTORY  directory dati di partenza con cui sincronizzare\n"
 
-#: pg_rewind.c:64
+#: pg_rewind.c:65
 #, c-format
-msgid "      --source-server=CONNSTR    source server to sync with\n"
+msgid "      --source-server=CONNSTR    source server to synchronize with\n"
 msgstr "      --source-server=CONNSTR    server di origine con cui sincronizzare\n"
 
-#: pg_rewind.c:65
+#: pg_rewind.c:66
 #, c-format
 msgid "  -n, --dry-run                  stop before modifying anything\n"
 msgstr "  -n, --dry-run                  fermati prima di modificare qualunque cosa\n"
 
-#: pg_rewind.c:66
+#: pg_rewind.c:67
 #, c-format
 msgid "  -P, --progress                 write progress messages\n"
 msgstr "  -P, --progress                 stampa messaggi di avanzamento\n"
 
-#: pg_rewind.c:67
+#: pg_rewind.c:68
 #, c-format
 msgid "      --debug                    write a lot of debug messages\n"
 msgstr "      --debug                    stampa una gran quantità di messaggi di debug\n"
 
-#: pg_rewind.c:68
+#: pg_rewind.c:69
 #, c-format
 msgid "  -V, --version                  output version information, then exit\n"
 msgstr "  -V, --version                  stampa informazioni sulla versione ed esci\n"
 
-#: pg_rewind.c:69
+#: pg_rewind.c:70
 #, c-format
 msgid "  -?, --help                     show this help, then exit\n"
 msgstr "  -?, --help                     mostra questo aiuto ed esci\n"
 
-#: pg_rewind.c:70
+#: pg_rewind.c:71
 #, c-format
 msgid ""
 "\n"
@@ -634,77 +500,83 @@
 "\n"
 "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_rewind.c:125 pg_rewind.c:156 pg_rewind.c:163 pg_rewind.c:171
+#: pg_rewind.c:126 pg_rewind.c:157 pg_rewind.c:164 pg_rewind.c:171
+#: pg_rewind.c:179
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
 
-#: pg_rewind.c:155
+#: pg_rewind.c:156
 #, c-format
 msgid "%s: no source specified (--source-pgdata or --source-server)\n"
 msgstr "%s: nessuna origine specificata (--source-pgdata o --source-server)\n"
 
-#: pg_rewind.c:162
+#: pg_rewind.c:163
+#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s: è possibile specificare solo uno tra --source-pgdata e --source-server\n"
+
+#: pg_rewind.c:170
 #, c-format
 msgid "%s: no target data directory specified (--target-pgdata)\n"
 msgstr "%s: nessuna directory di dati di destinazione specificata (--target-pgdata)\n"
 
-#: pg_rewind.c:169
+#: pg_rewind.c:177
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: troppi argomenti nella riga di comando (il primo è \"%s\")\n"
 
-#: pg_rewind.c:184
+#: pg_rewind.c:192
 #, c-format
 msgid "cannot be executed by \"root\"\n"
 msgstr "non può essere eseguito da \"root\"\n"
 
-#: pg_rewind.c:185
+#: pg_rewind.c:193
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser.\n"
 msgstr "È obbligatorio eseguire %s come superutente di PostgreSQL.\n"
 
-#: pg_rewind.c:215
+#: pg_rewind.c:224
 #, c-format
 msgid "source and target cluster are on the same timeline\n"
 msgstr "i cluster di origine e di destinazione sono sulla stessa linea temporale\n"
 
-#: pg_rewind.c:218
+#: pg_rewind.c:230
 #, c-format
-msgid "The servers diverged at WAL position %X/%X on timeline %u.\n"
-msgstr "I server sono andati a divergere alla posizione WAL %X/%X sulla timeline %u.\n"
+msgid "servers diverged at WAL position %X/%X on timeline %u\n"
+msgstr "i server sono andati a divergere alla posizione WAL %X/%X sulla timeline %u\n"
 
-#: pg_rewind.c:253
+#: pg_rewind.c:266
 #, c-format
-msgid "No rewind required.\n"
-msgstr "Rewind non richiesto.\n"
+msgid "no rewind required\n"
+msgstr "rewind non richiesto\n"
 
-#: pg_rewind.c:259
+#: pg_rewind.c:272
 #, c-format
-msgid "Rewinding from last common checkpoint at %X/%X on timeline %u\n"
-msgstr "Riavvolgimento all'ultimo checkpoint in comune a %X/%X sulla timeline %u\n"
+msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
+msgstr "riavvolgimento dall'ultimo checkpoint comune a %X/%X sulla timeline %u\n"
 
-#: pg_rewind.c:267
+#: pg_rewind.c:280
 #, c-format
 msgid "reading source file list\n"
 msgstr "lettura della lista dei file di origine\n"
 
-#: pg_rewind.c:269
+#: pg_rewind.c:282
 #, c-format
 msgid "reading target file list\n"
 msgstr "lettura della lista dei file di destinazione\n"
 
-#: pg_rewind.c:279
+#: pg_rewind.c:292
 #, c-format
 msgid "reading WAL in target\n"
 msgstr "lettura del WAL nella destinazione\n"
 
-#: pg_rewind.c:296
+#: pg_rewind.c:309
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
 msgstr "è necessario copiare %lu MB (la dimensione totale della directory di origine è di %lu MB)\n"
 
-#: pg_rewind.c:313
+#: pg_rewind.c:326
 #, c-format
 msgid ""
 "\n"
@@ -713,56 +585,88 @@
 "\n"
 "creazione dell'etichetta di backup e aggiornamento del file di controllo\n"
 
-#: pg_rewind.c:341
+#: pg_rewind.c:354
+#, c-format
+msgid "syncing target data directory\n"
+msgstr "sincronizzazione della directory dati di destinazione\n"
+
+#: pg_rewind.c:357
 #, c-format
 msgid "Done!\n"
 msgstr "Fatto!\n"
 
-#: pg_rewind.c:353
+#: pg_rewind.c:369
 #, c-format
 msgid "source and target clusters are from different systems\n"
 msgstr "i cluster di origine e di destinazione sono di sistemi diversi\n"
 
-#: pg_rewind.c:361
+#: pg_rewind.c:377
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind\n"
 msgstr "i cluster non sono compatibili con questa versione di pg_rewind\n"
 
-#: pg_rewind.c:371
+#: pg_rewind.c:387
 #, c-format
 msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
 msgstr "il server di destinazione deve usare o il checksum dei dati o \"wal_log_hints = on\"\n"
 
-#: pg_rewind.c:381
+#: pg_rewind.c:398
 #, c-format
 msgid "target server must be shut down cleanly\n"
 msgstr "il server di destinazione dev'essere arrestato in maniera pulita\n"
 
-#: pg_rewind.c:389
+#: pg_rewind.c:408
 #, c-format
 msgid "source data directory must be shut down cleanly\n"
 msgstr "la directory dei dati di origine deve essere arrestata in maniera pulita\n"
 
-#: pg_rewind.c:456
+#: pg_rewind.c:475
 #, c-format
 msgid "could not find common ancestor of the source and target cluster's timelines\n"
 msgstr "impossibile trovare un antenato comune nelle timeline dei cluster di origine e di destinazione\n"
 
-#: pg_rewind.c:496
+#: pg_rewind.c:515
 #, c-format
 msgid "backup label buffer too small\n"
 msgstr "buffer dell'etichetta di backup troppo piccolo\n"
 
-#: pg_rewind.c:518
+#: pg_rewind.c:538
 #, c-format
 msgid "unexpected control file CRC\n"
 msgstr "CRC del file di controllo imprevisto\n"
 
-#: pg_rewind.c:528
+#: pg_rewind.c:548
 #, c-format
 msgid "unexpected control file size %d, expected %d\n"
 msgstr "dimensione del file di controllo %d imprevista, atteso %d\n"
 
+#: pg_rewind.c:615
+#, c-format
+msgid ""
+"The program \"initdb\" is needed by %s but was \n"
+"not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Il programma \"initdb\" è richiesto da %s ma non è \n"
+"stato tro vato nella stessa directory di \"%s\".\n"
+"Controlla la tua installazione.\n"
+
+#: pg_rewind.c:619
+#, c-format
+msgid ""
+"The program \"initdb\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"Il programma \"initdb\" è stato trovato da \"%s\"\n"
+"ma non è la stessa versione di %s.\n"
+"Controlla la tua installazione.\n"
+
+#: pg_rewind.c:637
+#, c-format
+msgid "sync of target directory failed\n"
+msgstr "sincronizzazione della directory di destinazione fallita\n"
+
 #: timeline.c:76 timeline.c:82
 #, c-format
 msgid "syntax error in history file: %s\n"
@@ -775,8 +679,8 @@
 
 #: timeline.c:83
 #, c-format
-msgid "Expected an XLOG switchpoint location.\n"
-msgstr "Attesa una locazione di punto di switch XLOG.\n"
+msgid "Expected a transaction log switchpoint location.\n"
+msgstr "Attesa una locazione di switchpoint del log delle transazioni.\n"
 
 #: timeline.c:88
 #, c-format
@@ -797,3 +701,138 @@
 #, c-format
 msgid "Timeline IDs must be less than child timeline's ID.\n"
 msgstr "Gli ID della timeline devono essere meno dell'ID della timeline del figlio.\n"
+
+#: xlogreader.c:264
+#, c-format
+msgid "invalid record offset at %X/%X"
+msgstr "offset del record non valido a %X/%X"
+
+#: xlogreader.c:272
+#, c-format
+msgid "contrecord is requested by %X/%X"
+msgstr "contrecord richiesto da %X/%X"
+
+#: xlogreader.c:312 xlogreader.c:603
+#, c-format
+msgid "invalid record length at %X/%X"
+msgstr "lunghezza del record non valida a %X/%X"
+
+#: xlogreader.c:326
+#, c-format
+msgid "record length %u at %X/%X too long"
+msgstr "lunghezza del record %u a %X/%X eccessiva"
+
+#: xlogreader.c:367
+#, c-format
+msgid "there is no contrecord flag at %X/%X"
+msgstr "non c'è un flag di contrecord a %X/%X"
+
+#: xlogreader.c:380
+#, c-format
+msgid "invalid contrecord length %u at %X/%X"
+msgstr "lunghezza di contrecord %u non valida a %X/%X"
+
+#: xlogreader.c:610
+#, c-format
+msgid "invalid resource manager ID %u at %X/%X"
+msgstr "ID di gestione risorse %u non valido a %X/%X"
+
+#: xlogreader.c:624 xlogreader.c:641
+#, c-format
+msgid "record with incorrect prev-link %X/%X at %X/%X"
+msgstr "record con link-precedente %X/%X non corretto a %X/%X"
+
+#: xlogreader.c:678
+#, c-format
+msgid "incorrect resource manager data checksum in record at %X/%X"
+msgstr "checksum dei dati del manager di risorse non corretto nel record a %X/%X"
+
+#: xlogreader.c:711
+#, c-format
+msgid "invalid magic number %04X in log segment %s, offset %u"
+msgstr "numero magico %04X non valido nel segmento di log %s, offset %u"
+
+#: xlogreader.c:725 xlogreader.c:776
+#, c-format
+msgid "invalid info bits %04X in log segment %s, offset %u"
+msgstr "bit di info %04X non validi nel segmento di log %s, offset %u"
+
+#: xlogreader.c:751
+#, c-format
+msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s"
+msgstr "il file WAL è di un database diverso: l'identificativo del database del file WAL è %s, quello del database di pg_control è %s"
+
+#: xlogreader.c:758
+#, c-format
+msgid "WAL file is from different database system: incorrect XLOG_SEG_SIZE in page header"
+msgstr "il file WAL è di un database diverso: XLOG_SEG_SIZE non corretto nell'header di pagina"
+
+#: xlogreader.c:764
+#, c-format
+msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
+msgstr "il file WAL è di un database diverso: XLOG_BLCKSZ non corretto nell'header di pagina"
+
+#: xlogreader.c:790
+#, c-format
+msgid "unexpected pageaddr %X/%X in log segment %s, offset %u"
+msgstr "pageaddr inaspettato %X/%X nel segmento di log %s, offset %u"
+
+#: xlogreader.c:815
+#, c-format
+msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
+msgstr "ID della timeline %u (dopo %u) fuori sequenza nel segmento di log %s, offset %u"
+
+#: xlogreader.c:1061
+#, c-format
+msgid "out-of-order block_id %u at %X/%X"
+msgstr "block_id fuori sequenza %u a %X/%X"
+
+#: xlogreader.c:1083
+#, c-format
+msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
+msgstr "BKPBLOCK_HAS_DATA impostato, ma dati non inclusi a %X/%X"
+
+#: xlogreader.c:1090
+#, c-format
+msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
+msgstr "BKPBLOCK_HAS_DATA non impostato, ma la lunghezza dei dati è %u a %X/%X"
+
+#: xlogreader.c:1123
+#, c-format
+msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
+msgstr "BKPIMAGE_HAS_HOLE impostato, ma offset buco %u lunghezza %u lunghezza dell'immagine del blocco %u a %X/%X"
+
+#: xlogreader.c:1139
+#, c-format
+msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
+msgstr "BKPIMAGE_HAS_HOLE non impostato, ma offset buco %u lunghezza %u a %X/%X"
+
+#: xlogreader.c:1154
+#, c-format
+msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
+msgstr "BKPIMAGE_IS_COMPRESSED impostato, ma la lunghezza dell'immagine del blocco è %u a %X/%X"
+
+#: xlogreader.c:1169
+#, c-format
+msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
+msgstr "né BKPIMAGE_HAS_HOLE né BKPIMAGE_IS_COMPRESSED impostati, ma la lunghezza dell'immagine del blocco è %u a %X/%X"
+
+#: xlogreader.c:1185
+#, c-format
+msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
+msgstr "BKPBLOCK_SAME_REL impostato ma non c'è un rel precedente a %X/%X"
+
+#: xlogreader.c:1197
+#, c-format
+msgid "invalid block_id %u at %X/%X"
+msgstr "block_id %u non valido a %X/%X"
+
+#: xlogreader.c:1262
+#, c-format
+msgid "record with invalid length at %X/%X"
+msgstr "record con lunghezza non valida a %X/%X"
+
+#: xlogreader.c:1351
+#, c-format
+msgid "invalid compressed image at %X/%X, block %d"
+msgstr "immagine compressa non valida a %X/%X, blocco %d"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/po/pl.po postgresql-9.5-9.5.8/src/bin/pg_rewind/po/pl.po
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/po/pl.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/po/pl.po	2017-08-07 21:13:41.000000000 +0000
@@ -2,13 +2,13 @@
 # Copyright (C) 2015 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-# grzegorz <begina.felicysym@wp.eu>, 2015.
+# grzegorz <begina.felicysym@wp.eu>, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_rewind (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-29 01:44+0000\n"
-"PO-Revision-Date: 2015-10-29 21:20+0200\n"
+"POT-Creation-Date: 2016-03-31 03:13+0000\n"
+"PO-Revision-Date: 2016-04-04 00:04+0200\n"
 "Last-Translator: grzegorz <begina.felicysym@wp.eu>\n"
 "Language-Team: begina.felicysym@wp.eu\n"
 "Language: pl\n"
@@ -111,7 +111,7 @@
 msgid "could not seek in source file: %s\n"
 msgstr "nie można pozycjonować w pliku wyjścia %s\n"
 
-#: copy_fetch.c:192 file_ops.c:301
+#: copy_fetch.c:192 file_ops.c:300
 #, c-format
 msgid "could not read file \"%s\": %s\n"
 msgstr "nie można czytać pliku \"%s\": %s\n"
@@ -136,58 +136,57 @@
 msgid "could not close target file \"%s\": %s\n"
 msgstr "nie można zamknąć pliku docelowego \"%s\": %s\n"
 
-#: file_ops.c:99
+#: file_ops.c:98
 #, c-format
 msgid "could not seek in target file \"%s\": %s\n"
 msgstr "nie można przeszukiwać pliku docelowego \"%s\": %s\n"
 
-#: file_ops.c:115
+#: file_ops.c:114
 #, c-format
 msgid "could not write file \"%s\": %s\n"
 msgstr "nie można pisać do pliku \"%s\": %s\n"
 
-#: file_ops.c:165
+#: file_ops.c:164
 #, c-format
 msgid "invalid action (CREATE) for regular file\n"
 msgstr "nieprawidłowe działanie (CREATE) dla zwykłego pliku\n"
 
-#: file_ops.c:180
+#: file_ops.c:179
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "nie można usunąć pliku \"%s\": %s\n"
 
-#: file_ops.c:197
+#: file_ops.c:196
 #, c-format
 msgid "could not open file \"%s\" for truncation: %s\n"
 msgstr "nie można otworzyć pliku \"%s\" do obcięcia: %s\n"
 
-#: file_ops.c:201
+#: file_ops.c:200
 #, c-format
-#| msgid "could not truncate file \"%s\" to %u: %m"
 msgid "could not truncate file \"%s\" to %u: %s\n"
 msgstr "nie można obciąć pliku \"%s\" do %u: %s\n"
 
-#: file_ops.c:217
+#: file_ops.c:216
 #, c-format
 msgid "could not create directory \"%s\": %s\n"
 msgstr "nie można utworzyć folderu \"%s\": %s\n"
 
-#: file_ops.c:231
+#: file_ops.c:230
 #, c-format
 msgid "could not remove directory \"%s\": %s\n"
 msgstr "nie można usunąć folderu \"%s\": %s\n"
 
-#: file_ops.c:245
+#: file_ops.c:244
 #, c-format
 msgid "could not create symbolic link at \"%s\": %s\n"
 msgstr "nie można utworzyć linku symbolicznego na \"%s\": %s\n"
 
-#: file_ops.c:259
+#: file_ops.c:258
 #, c-format
 msgid "could not remove symbolic link \"%s\": %s\n"
 msgstr "nie można usunąć linku symbolicznego \"%s\": %s\n"
 
-#: file_ops.c:289 file_ops.c:293
+#: file_ops.c:288 file_ops.c:292
 #, c-format
 msgid "could not open file \"%s\" for reading: %s\n"
 msgstr "nie można otworzyć pliku \"%s\" do odczytu: %s\n"
@@ -254,7 +253,6 @@
 
 #: libpq_fetch.c:123
 #, c-format
-#| msgid "unrecognized result \"%s\" for current XLOG insert location\n"
 msgid "unrecognized result \"%s\" for current WAL insert location\n"
 msgstr "nierozpoznany wynik \"%s\" dla bieżącego położenia wstawiania WAL\n"
 
@@ -285,7 +283,6 @@
 
 #: libpq_fetch.c:251
 #, c-format
-#| msgid "unexpected result while fetching remote files: %s\n"
 msgid "unexpected result while fetching remote files: %s"
 msgstr "nieoczekiwany wynik przy pobieraniu plików zdalnych: %s"
 
@@ -316,7 +313,6 @@
 
 #: libpq_fetch.c:303
 #, c-format
-#| msgid "received NULL chunk for file \"%s\", file has been deleted\n"
 msgid "received null value for chunk for file \"%s\", file has been deleted\n"
 msgstr "otrzymano wartość null dla pliku \"%s\", plik został usunięty\n"
 
@@ -418,7 +414,7 @@
 "rekord WAL zmienia relację, butale typ rekordu nie został rozpoznany\n"
 "lsn: %X/%X, rmgr: %s, info: %02X\n"
 
-#: pg_rewind.c:59
+#: pg_rewind.c:60
 #, c-format
 msgid ""
 "%s resynchronizes a PostgreSQL cluster with another copy of the cluster.\n"
@@ -427,7 +423,7 @@
 "%s resynchronizuje klaster PostgreSQL z innÄ… kopiÄ… tego klastra.\n"
 "\n"
 
-#: pg_rewind.c:60
+#: pg_rewind.c:61
 #, c-format
 msgid ""
 "Usage:\n"
@@ -438,54 +434,52 @@
 "  %s [OPCJE]...\n"
 "\n"
 
-#: pg_rewind.c:61
+#: pg_rewind.c:62
 #, c-format
 msgid "Options:\n"
 msgstr "Opcje:\n"
 
-#: pg_rewind.c:62
+#: pg_rewind.c:63
 #, c-format
 msgid "  -D, --target-pgdata=DIRECTORY  existing data directory to modify\n"
 msgstr "  -D, --target-pgdata=FOLDER     istniejÄ…cy folder danych do zmiany\n"
 
-#: pg_rewind.c:63
+#: pg_rewind.c:64
 #, c-format
-#| msgid "      --source-pgdata=DIRECTORY  source data directory to sync with\n"
 msgid "      --source-pgdata=DIRECTORY  source data directory to synchronize with\n"
 msgstr "      --source-pgdata=FOLDER     źródłowy folder danych do zsynchronizowania\n"
 
-#: pg_rewind.c:64
+#: pg_rewind.c:65
 #, c-format
-#| msgid "      --source-server=CONNSTR    source server to sync with\n"
 msgid "      --source-server=CONNSTR    source server to synchronize with\n"
 msgstr "      --source-server=CONNSTR    serwer źródłowy do zsynchronizowania\n"
 
-#: pg_rewind.c:65
+#: pg_rewind.c:66
 #, c-format
 msgid "  -n, --dry-run                  stop before modifying anything\n"
 msgstr "  -n, --dry-run                  zatrzymaj przed zmianÄ… czegokolwiek\n"
 
-#: pg_rewind.c:66
+#: pg_rewind.c:67
 #, c-format
 msgid "  -P, --progress                 write progress messages\n"
 msgstr "  -P, --progress                 wypisz komunikaty postępu\n"
 
-#: pg_rewind.c:67
+#: pg_rewind.c:68
 #, c-format
 msgid "      --debug                    write a lot of debug messages\n"
 msgstr "      --debug                    wypisz masę komunikatów debugowania\n"
 
-#: pg_rewind.c:68
+#: pg_rewind.c:69
 #, c-format
 msgid "  -V, --version                  output version information, then exit\n"
 msgstr "  -V, --version                  pokaż informacje o wersji i zakończ\n"
 
-#: pg_rewind.c:69
+#: pg_rewind.c:70
 #, c-format
 msgid "  -?, --help                     show this help, then exit\n"
 msgstr "  -?, --help                     pokaż tą pomoc i zakończ działanie\n"
 
-#: pg_rewind.c:70
+#: pg_rewind.c:71
 #, c-format
 msgid ""
 "\n"
@@ -494,81 +488,77 @@
 "\n"
 "Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_rewind.c:125 pg_rewind.c:156 pg_rewind.c:163 pg_rewind.c:171
+#: pg_rewind.c:126 pg_rewind.c:157 pg_rewind.c:164 pg_rewind.c:172
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Użyj \"%s --help\" aby uzyskać więcej informacji.\n"
 
-#: pg_rewind.c:155
+#: pg_rewind.c:156
 #, c-format
 msgid "%s: no source specified (--source-pgdata or --source-server)\n"
 msgstr "%s: nie wskazano źródła (--source-pgdata lub --source-server)\n"
 
-#: pg_rewind.c:162
+#: pg_rewind.c:163
 #, c-format
 msgid "%s: no target data directory specified (--target-pgdata)\n"
 msgstr "%s: nie wskazano docelowego folderu danych (--target-pgdata)\n"
 
-#: pg_rewind.c:169
+#: pg_rewind.c:170
 #, 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_rewind.c:184
+#: pg_rewind.c:185
 #, c-format
 msgid "cannot be executed by \"root\"\n"
 msgstr "nie może być wykonywane pod \"rootem\"\n"
 
-#: pg_rewind.c:185
+#: pg_rewind.c:186
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser.\n"
 msgstr "Musisz uruchomić %s jako superużytkownik PostgreSQL.\n"
 
-#: pg_rewind.c:215
+#: pg_rewind.c:217
 #, c-format
 msgid "source and target cluster are on the same timeline\n"
 msgstr "klaster źródłowy i docelowy są na tej samej linii czasowej\n"
 
-#: pg_rewind.c:218
+#: pg_rewind.c:223
 #, c-format
-#| msgid "The servers diverged at WAL position %X/%X on timeline %u.\n"
 msgid "servers diverged at WAL position %X/%X on timeline %u\n"
 msgstr "serwery rozeszły się na pozycji WAL %X/%X linii czasowej %u\n"
 
-#: pg_rewind.c:253
+#: pg_rewind.c:259
 #, c-format
-#| msgid "No rewind required.\n"
 msgid "no rewind required\n"
 msgstr "przewinięcie nie jest konieczne\n"
 
-#: pg_rewind.c:259
+#: pg_rewind.c:265
 #, c-format
-#| msgid "Rewinding from last common checkpoint at %X/%X on timeline %u\n"
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
-msgstr "przewinięcie do ostatniego zgodnego punktu kontrolnego na %X/%X linii "
-"czasowej %u\n"
+msgstr "przewinięcie do ostatniego zgodnego punktu kontrolnego na %X/%X linii czasowej %u\n"
 
-#: pg_rewind.c:267
+#: pg_rewind.c:273
 #, c-format
 msgid "reading source file list\n"
 msgstr "odczyt źródłowej listy plików\n"
 
-#: pg_rewind.c:269
+#: pg_rewind.c:275
 #, c-format
 msgid "reading target file list\n"
 msgstr "odczyt docelowej listy plików\n"
 
-#: pg_rewind.c:279
+#: pg_rewind.c:285
 #, c-format
 msgid "reading WAL in target\n"
 msgstr "odczyt WAL docelowy\n"
 
-#: pg_rewind.c:296
+#: pg_rewind.c:302
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
 msgstr "potrzeba skopiować %lu MB (pełna wielkość folderu źródłowego to %lu MB)\n"
 
-#: pg_rewind.c:313
+#: pg_rewind.c:319
 #, c-format
 msgid ""
 "\n"
@@ -577,56 +567,98 @@
 "\n"
 "tworzenie etykiety kopii zapasowej i aktualizacja pliku sterujÄ…cego\n"
 
-#: pg_rewind.c:341
+#: pg_rewind.c:347
+#, c-format
+#| msgid "%s: failed to remove data directory\n"
+msgid "syncing target data directory\n"
+msgstr "docelowy katalog danych synchronizacji\n"
+
+#: pg_rewind.c:350
 #, c-format
 msgid "Done!\n"
 msgstr "Wykonano!\n"
 
-#: pg_rewind.c:353
+#: pg_rewind.c:362
 #, c-format
 msgid "source and target clusters are from different systems\n"
 msgstr "klastry źródłowy i docelowy pochodzą z innych systemów\n"
 
-#: pg_rewind.c:361
+#: pg_rewind.c:370
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind\n"
 msgstr "klastry nie sÄ… kompatybilne z tÄ… wersjÄ… pg_rewind\n"
 
-#: pg_rewind.c:371
+#: pg_rewind.c:380
 #, c-format
 msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
 msgstr "serwer docelowy wymaga użycia albo sum kontrolnych albo \"wal_log_hints = on\"\n"
 
-#: pg_rewind.c:381
+#: pg_rewind.c:391
 #, c-format
 msgid "target server must be shut down cleanly\n"
 msgstr "serwer docelowy musi zostać czysto wyłączony\n"
 
-#: pg_rewind.c:389
+#: pg_rewind.c:401
 #, c-format
 msgid "source data directory must be shut down cleanly\n"
 msgstr "źródłowy folder danych musi być czysto wyłączony\n"
 
-#: pg_rewind.c:456
+#: pg_rewind.c:468
 #, c-format
 msgid "could not find common ancestor of the source and target cluster's timelines\n"
 msgstr "nie można znaleźć wspólnego przodka źródłowej i docelowej osi czasu klastra\n"
 
-#: pg_rewind.c:496
+#: pg_rewind.c:508
 #, c-format
 msgid "backup label buffer too small\n"
 msgstr "bufor etykiety kopii zapasowej jest za mały\n"
 
-#: pg_rewind.c:518
+#: pg_rewind.c:531
 #, c-format
 msgid "unexpected control file CRC\n"
 msgstr "nieoczekiwane CRC pliku kontrolnego\n"
 
-#: pg_rewind.c:528
+#: pg_rewind.c:541
 #, c-format
 msgid "unexpected control file size %d, expected %d\n"
 msgstr "nieoczekiwana długość pliku kontrolnego %d, oczekiwano %d\n"
 
+#: pg_rewind.c:608
+#, 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"
+msgid ""
+"The program \"initdb\" is needed by %s but was \n"
+"not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"initdb\" jest wymagany przez %s ale nie został \n"
+"znaleziony w tym samym folderze co \"%s\".\n"
+"Sprawdź instalację.\n"
+
+#: pg_rewind.c:612
+#, c-format
+#| msgid ""
+#| "The program \"%s\" was found by \"%s\"\n"
+#| "but was not the same version as %s.\n"
+#| "Check your installation.\n"
+msgid ""
+"The program \"initdb\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"initdb\" został znaleziony przez \"%s\"\n"
+"ale nie jest w tej samej wersji co %s.\n"
+"Sprawdź instalację.\n"
+
+#: pg_rewind.c:630
+#, c-format
+#| msgid "%s: no target directory specified\n"
+msgid "sync of target directory failed\n"
+msgstr "nie powiodło się sync folderu docelowego\n"
+
 #: timeline.c:76 timeline.c:82
 #, c-format
 msgid "syntax error in history file: %s\n"
@@ -639,7 +671,6 @@
 
 #: timeline.c:83
 #, c-format
-#| msgid "Expected a transaction log switchpoint location."
 msgid "Expected a transaction log switchpoint location.\n"
 msgstr "Oczekiwano położenia przełączenia dziennika transakcji.\n"
 
@@ -720,28 +751,18 @@
 
 #: xlogreader.c:751
 #, c-format
-#| msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s."
 msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s"
-msgstr ""
-"plik WAL pochodzi z innego systemu bazy danych: identyfikator systemu bazy "
-"danych z pliku WAL to %s, a identyfikator systemu bazy danych z pg_control "
-"to %s"
+msgstr "plik WAL pochodzi z innego systemu bazy danych: identyfikator systemu bazy danych z pliku WAL to %s, a identyfikator systemu bazy danych z pg_control to %s"
 
 #: xlogreader.c:758
 #, c-format
-#| msgid "WAL file is from different database system: Incorrect XLOG_SEG_SIZE in page header."
 msgid "WAL file is from different database system: incorrect XLOG_SEG_SIZE in page header"
-msgstr ""
-"plik WAL pochodzi z innego systemu bazy danych: niepoprawny XLOG_SEG_SIZE w "
-"nagłówku strony"
+msgstr "plik WAL pochodzi z innego systemu bazy danych: niepoprawny XLOG_SEG_SIZE w nagłówku strony"
 
 #: xlogreader.c:764
 #, c-format
-#| msgid "WAL file is from different database system: Incorrect XLOG_BLCKSZ in page header."
 msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
-msgstr ""
-"plik WAL pochodzi z innego systemu bazy danych: niepoprawny XLOG_BLCKSZ w "
-"nagłówku strony"
+msgstr "plik WAL pochodzi z innego systemu bazy danych: niepoprawny XLOG_BLCKSZ w nagłówku strony"
 
 #: xlogreader.c:790
 #, c-format
@@ -808,8 +829,8 @@
 msgid "invalid compressed image at %X/%X, block %d"
 msgstr "niepoprawny skompresowany obraz na %X/%X, blok %d"
 
-#~ msgid "Expected an XLOG switchpoint location.\n"
-#~ msgstr "Oczekiwano położenia przełączenia XLOG.\n"
-
 #~ msgid "could not truncate file \"%s\" to %u bytes: %s\n"
 #~ msgstr "nie można obciąć pliku \"%s\" do %u bajtów: %s\n"
+
+#~ msgid "Expected an XLOG switchpoint location.\n"
+#~ msgstr "Oczekiwano położenia przełączenia XLOG.\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/po/pt_BR.po postgresql-9.5-9.5.8/src/bin/pg_rewind/po/pt_BR.po
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/po/pt_BR.po	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/po/pt_BR.po	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,827 @@
+# Brazilian Portuguese message translation file for pg_rewind
+# Copyright (C) 2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2016-2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_rewind (PostgreSQL) 9.5\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2017-08-06 01:46-0300\n"
+"PO-Revision-Date: 2015-10-04 16:36-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"
+
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127
+#: parsexlog.c:179
+#, c-format
+msgid "out of memory\n"
+msgstr "sem memória\n"
+
+#: ../../common/fe_memutils.c:92
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "não pode duplicar ponteiro nulo (erro interno)\n"
+
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: AVISO: não pode criar informações restritas nessa plataforma\n"
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s: não pôde abrir informação sobre processo: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: não pôde alocar SIDs: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: não pôde criar informação restrita: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s: não pôde iniciar processo para comando \"%s\": código de erro %lu\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: não pôde executar novamente com informação restrita: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: não pôde obter código de saída de subprocesso: código de erro %lu\n"
+
+#: copy_fetch.c:64
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "não pôde abrir diretório \"%s\": %s\n"
+
+#: copy_fetch.c:93 filemap.c:112 filemap.c:267
+#, c-format
+msgid "could not stat file \"%s\": %s\n"
+msgstr "não pôde executar stat no arquivo \"%s\": %s\n"
+
+#: copy_fetch.c:122
+#, c-format
+msgid "could not read symbolic link \"%s\": %s\n"
+msgstr "não pôde ler link simbólico \"%s\": %s\n"
+
+#: copy_fetch.c:125
+#, c-format
+msgid "symbolic link \"%s\" target is too long\n"
+msgstr "alvo do link simbólico \"%s\" é muito longo\n"
+
+#: copy_fetch.c:140
+#, c-format
+msgid "\"%s\" is a symbolic link, but symbolic links are not supported on this platform\n"
+msgstr "\"%s\" é um link simbólico mas links simbólicos não são suportados nesta plataforma\n"
+
+#: copy_fetch.c:147
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "não pôde ler diretório \"%s\": %s\n"
+
+#: copy_fetch.c:151
+#, c-format
+msgid "could not close directory \"%s\": %s\n"
+msgstr "não pôde fechar diretório \"%s\": %s\n"
+
+#: copy_fetch.c:171
+#, c-format
+msgid "could not open source file \"%s\": %s\n"
+msgstr "não pôde abrir arquivo de origem \"%s\": %s\n"
+
+#: copy_fetch.c:175
+#, c-format
+msgid "could not seek in source file: %s\n"
+msgstr "não pôde posicionar no arquivo de origem: %s\n"
+
+#: copy_fetch.c:192 file_ops.c:300
+#, c-format
+msgid "could not read file \"%s\": %s\n"
+msgstr "não pôde ler arquivo \"%s\": %s\n"
+
+#: copy_fetch.c:195
+#, c-format
+msgid "unexpected EOF while reading file \"%s\"\n"
+msgstr "EOF inesperado ao ler arquivo \"%s\"\n"
+
+#: copy_fetch.c:202
+#, c-format
+msgid "could not close file \"%s\": %s\n"
+msgstr "não pôde fechar arquivo \"%s\": %s\n"
+
+#: file_ops.c:64
+#, c-format
+msgid "could not open target file \"%s\": %s\n"
+msgstr "não pôde abrir arquivo de destino \"%s\": %s\n"
+
+#: file_ops.c:78
+#, c-format
+msgid "could not close target file \"%s\": %s\n"
+msgstr "não pôde fechar arquivo de destino \"%s\": %s\n"
+
+#: file_ops.c:98
+#, c-format
+msgid "could not seek in target file \"%s\": %s\n"
+msgstr "não pôde posicionar no arquivo de destino \"%s\": %s\n"
+
+#: file_ops.c:114
+#, c-format
+msgid "could not write file \"%s\": %s\n"
+msgstr "não pôde escrever no arquivo \"%s\": %s\n"
+
+#: file_ops.c:164
+#, c-format
+msgid "invalid action (CREATE) for regular file\n"
+msgstr "ação inválida (CREATE) para arquivo regular\n"
+
+#: file_ops.c:179
+#, c-format
+msgid "could not remove file \"%s\": %s\n"
+msgstr "não pôde remover arquivo \"%s\": %s\n"
+
+#: file_ops.c:196
+#, c-format
+msgid "could not open file \"%s\" for truncation: %s\n"
+msgstr "não pôde abrir arquivo \"%s\" para truncamento: %s\n"
+
+#: file_ops.c:200
+#, c-format
+msgid "could not truncate file \"%s\" to %u: %s\n"
+msgstr "não pôde truncar arquivo \"%s\" para %u: %s\n"
+
+#: file_ops.c:216
+#, c-format
+msgid "could not create directory \"%s\": %s\n"
+msgstr "não pôde criar diretório \"%s\": %s\n"
+
+#: file_ops.c:230
+#, c-format
+msgid "could not remove directory \"%s\": %s\n"
+msgstr "não pôde remover diretório \"%s\": %s\n"
+
+#: file_ops.c:244
+#, c-format
+msgid "could not create symbolic link at \"%s\": %s\n"
+msgstr "não pôde criar link simbólico em \"%s\": %s\n"
+
+#: file_ops.c:258
+#, c-format
+msgid "could not remove symbolic link \"%s\": %s\n"
+msgstr "não pôde remover link simbólico \"%s\": %s\n"
+
+#: file_ops.c:288 file_ops.c:292
+#, c-format
+msgid "could not open file \"%s\" for reading: %s\n"
+msgstr "não pôde abrir arquivo \"%s\" para leitura: %s\n"
+
+#: filemap.c:104
+#, c-format
+msgid "data file \"%s\" in source is not a regular file\n"
+msgstr "arquivo de dados \"%s\" na origem não é um arquivo regular\n"
+
+#: filemap.c:126
+#, c-format
+msgid "\"%s\" is not a directory\n"
+msgstr "\"%s\" não é um diretório\n"
+
+#: filemap.c:149
+#, c-format
+msgid "\"%s\" is not a symbolic link\n"
+msgstr "\"%s\" não é um link simbólico\n"
+
+#: filemap.c:161
+#, c-format
+msgid "\"%s\" is not a regular file\n"
+msgstr "\"%s\" não é um arquivo regular\n"
+
+#: filemap.c:279
+#, c-format
+msgid "source file list is empty\n"
+msgstr "lista de arquivos da origem está vazia\n"
+
+#: filemap.c:401
+#, c-format
+msgid "unexpected page modification for directory or symbolic link \"%s\"\n"
+msgstr "modificação de página inesperada em diretório ou link simbólico \"%s\"\n"
+
+#: libpq_fetch.c:56
+#, c-format
+msgid "could not connect to server: %s"
+msgstr "não pôde conectar ao servidor: %s"
+
+#: libpq_fetch.c:59
+#, c-format
+msgid "connected to server\n"
+msgstr "conectado ao servidor\n"
+
+#: libpq_fetch.c:69
+#, c-format
+msgid "source server must not be in recovery mode\n"
+msgstr "servidor de origem não deve estar em modo de recuperação\n"
+
+#: libpq_fetch.c:79
+#, c-format
+msgid "full_page_writes must be enabled in the source server\n"
+msgstr "full_page_writes deve estar habilitado no servidor de origem\n"
+
+#: libpq_fetch.c:91
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "não pôde configurar contexto de conexão: %s"
+
+#: libpq_fetch.c:109
+#, c-format
+msgid "error running query (%s) in source server: %s"
+msgstr "erro ao executar consulta (%s) no servidor de origem: %s"
+
+#: libpq_fetch.c:114
+#, c-format
+msgid "unexpected result set from query\n"
+msgstr "conjunto de resultados inesperado da consulta\n"
+
+#: libpq_fetch.c:137
+#, c-format
+msgid "unrecognized result \"%s\" for current WAL insert location\n"
+msgstr "resultado desconhecido \"%s\" para local de inserção atual no WAL\n"
+
+#: libpq_fetch.c:187
+#, c-format
+msgid "could not fetch file list: %s"
+msgstr "não pôde obter lista de arquivos: %s"
+
+#: libpq_fetch.c:192
+#, c-format
+msgid "unexpected result set while fetching file list\n"
+msgstr "conjunto de resultados inesperado ao obter lista de arquivos\n"
+
+#: libpq_fetch.c:262
+#, c-format
+msgid "could not send query: %s"
+msgstr "não pôde enviar consulta: %s"
+
+#: libpq_fetch.c:264
+#, c-format
+msgid "getting file chunks\n"
+msgstr "obtendo blocos do arquivo\n"
+
+#: libpq_fetch.c:267
+#, c-format
+msgid "could not set libpq connection to single row mode\n"
+msgstr "não pôde definir conexão libpq para modo de registro único\n"
+
+#: libpq_fetch.c:287
+#, c-format
+msgid "unexpected result while fetching remote files: %s"
+msgstr "resultado inesperado ao obter arquivos remotos: %s"
+
+#: libpq_fetch.c:293
+#, c-format
+msgid "unexpected result set size while fetching remote files\n"
+msgstr "tamanho do conjunto de resultados inesperado ao obter arquivos remotos\n"
+
+#: libpq_fetch.c:299
+#, c-format
+msgid "unexpected data types in result set while fetching remote files: %u %u %u\n"
+msgstr "tipos de daos inesperados no conjunto de resultados ao obter arquivos remotos: %u %u %u\n"
+
+#: libpq_fetch.c:307
+#, c-format
+msgid "unexpected result format while fetching remote files\n"
+msgstr "formato de resultado inesperado ao obter arquivos remotos\n"
+
+#: libpq_fetch.c:313
+#, c-format
+msgid "unexpected null values in result while fetching remote files\n"
+msgstr "valores nulos inesperados em resultado ao obter arquivos remotos\n"
+
+#: libpq_fetch.c:317
+#, c-format
+msgid "unexpected result length while fetching remote files\n"
+msgstr "tamanho de resultado inesperado ao obter arquivos remotos\n"
+
+#: libpq_fetch.c:339
+#, c-format
+msgid "received null value for chunk for file \"%s\", file has been deleted\n"
+msgstr "valor nulo recebido para bloco do arquivo \"%s\", arquivo foi removido\n"
+
+#: libpq_fetch.c:346
+#, c-format
+msgid "received chunk for file \"%s\", offset "
+msgstr "bloco recebido para arquivo \"%s\", posição "
+
+#: libpq_fetch.c:375
+#, c-format
+msgid "could not fetch remote file \"%s\": %s"
+msgstr "não pôde obter arquivo remoto \"%s\": %s"
+
+#: libpq_fetch.c:380
+#, c-format
+msgid "unexpected result set while fetching remote file \"%s\"\n"
+msgstr "conjunto de resultados inesperado ao obter arquivo remoto \"%s\"\n"
+
+#: libpq_fetch.c:391
+#, c-format
+msgid "fetched file \"%s\", length %d\n"
+msgstr "arquivo \"%s\" obtido, tamanho %d\n"
+
+#: libpq_fetch.c:424
+#, c-format
+msgid "could not send COPY data: %s"
+msgstr "não pôde enviar dados do COPY: %s"
+
+#: libpq_fetch.c:450
+#, c-format
+msgid "could not create temporary table: %s"
+msgstr "não pôde criar tabela temporária: %s"
+
+#: libpq_fetch.c:458
+#, c-format
+msgid "could not send file list: %s"
+msgstr "não pôde enviar lista de arquivos: %s"
+
+#: libpq_fetch.c:500
+#, c-format
+msgid "could not send end-of-COPY: %s"
+msgstr "não pôde enviar fim do COPY: %s"
+
+#: libpq_fetch.c:506
+#, c-format
+msgid "unexpected result while sending file list: %s"
+msgstr "resultado inesperado ao enviar lista de arquivos: %s"
+
+#: logging.c:57
+msgid "Failure, exiting\n"
+msgstr "Falha, terminando\n"
+
+#: logging.c:140
+#, c-format
+msgid "%*s/%s kB (%d%%) copied"
+msgstr "%*s/%s kB (%d%%) copiado"
+
+#: parsexlog.c:87 parsexlog.c:133
+#, c-format
+msgid "could not read WAL record at %X/%X: %s\n"
+msgstr "não pôde ler registro do WAL em %X/%X: %s\n"
+
+#: parsexlog.c:91 parsexlog.c:136
+#, c-format
+msgid "could not read WAL record at %X/%X\n"
+msgstr "não pôde ler registro do WAL em %X/%X\n"
+
+#: parsexlog.c:191
+#, c-format
+msgid "could not find previous WAL record at %X/%X: %s\n"
+msgstr "não pôde encontrar registro do WAL anterior em %X/%X: %s\n"
+
+#: parsexlog.c:195
+#, c-format
+msgid "could not find previous WAL record at %X/%X\n"
+msgstr "não pôde encontrar registro do WAL anterior em %X/%X\n"
+
+#: parsexlog.c:268
+#, c-format
+msgid "could not open file \"%s\": %s\n"
+msgstr "não pôde abrir arquivo \"%s\": %s\n"
+
+#: parsexlog.c:282
+#, c-format
+msgid "could not seek in file \"%s\": %s\n"
+msgstr "não pôde posicionar no arquivo \"%s\": %s\n"
+
+#: parsexlog.c:289
+#, c-format
+msgid "could not read from file \"%s\": %s\n"
+msgstr "não pôde ler do arquivo \"%s\": %s\n"
+
+#: parsexlog.c:357
+#, c-format
+msgid ""
+"WAL record modifies a relation, but record type is not recognized\n"
+"lsn: %X/%X, rmgr: %s, info: %02X\n"
+msgstr ""
+"registro do WAL modifica uma relação mas tipo do registro é desconhecido\n"
+"lsn: %X/%X, rmgr: %s, info: %02X\n"
+
+#: pg_rewind.c:60
+#, c-format
+msgid ""
+"%s resynchronizes a PostgreSQL cluster with another copy of the cluster.\n"
+"\n"
+msgstr "%s sincroniza um agrupamento do PostgreSQL com outra cópia do agrupamento.\n"
+
+#: pg_rewind.c:61
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION]...\n"
+"\n"
+msgstr ""
+"Uso:\n"
+"  %s [OPÇÃO]...\n"
+"\n"
+
+#: pg_rewind.c:62
+#, c-format
+msgid "Options:\n"
+msgstr "Opções:\n"
+
+#: pg_rewind.c:63
+#, c-format
+msgid "  -D, --target-pgdata=DIRECTORY  existing data directory to modify\n"
+msgstr "  -D, --target-pgdata=DIRETÓRIO  diretório de dados existente a ser modificado\n"
+
+#: pg_rewind.c:64
+#, c-format
+msgid "      --source-pgdata=DIRECTORY  source data directory to synchronize with\n"
+msgstr "      --source-pgdata=DIRETÓRIO  sincroniza com esse diretório de dados de origem\n"
+
+#: pg_rewind.c:65
+#, c-format
+msgid "      --source-server=CONNSTR    source server to synchronize with\n"
+msgstr "      --source-server=TEXTO      sincroniza com esse servidor de origem\n"
+
+#: pg_rewind.c:66
+#, c-format
+msgid "  -n, --dry-run                  stop before modifying anything\n"
+msgstr "  -n, --dry-run                  para antes de qualquer modifcação\n"
+
+#: pg_rewind.c:67
+#, c-format
+msgid "  -P, --progress                 write progress messages\n"
+msgstr "  -P, --progress                 escreve mensagens de progresso\n"
+
+#: pg_rewind.c:68
+#, c-format
+msgid "      --debug                    write a lot of debug messages\n"
+msgstr "      --debug                    mostra saída da depuração\n"
+
+#: pg_rewind.c:69
+#, c-format
+msgid "  -V, --version                  output version information, then exit\n"
+msgstr "  -V, --version                  mostra informação sobre a versão e termina\n"
+
+#: pg_rewind.c:70
+#, c-format
+msgid "  -?, --help                     show this help, then exit\n"
+msgstr "  -?, --help                     mostra essa ajuda e termina\n"
+
+#: pg_rewind.c:71
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Relate erros a <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_rewind.c:126 pg_rewind.c:157 pg_rewind.c:164 pg_rewind.c:171
+#: pg_rewind.c:179
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
+
+#: pg_rewind.c:156
+#, c-format
+msgid "%s: no source specified (--source-pgdata or --source-server)\n"
+msgstr "%s: nenhuma origem especificada (--source-pgdata ou --source-server)\n"
+
+#: pg_rewind.c:163
+#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s: somente uma das opções --source-pgdata ou --source-server pode ser especificada\n"
+
+#: pg_rewind.c:170
+#, c-format
+msgid "%s: no target data directory specified (--target-pgdata)\n"
+msgstr "%s: nenhum diretório de dados de destino especificado (--target-pgdata)\n"
+
+#: pg_rewind.c:177
+#, 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_rewind.c:192
+#, c-format
+msgid "cannot be executed by \"root\"\n"
+msgstr "não pode ser executado pelo \"root\"\n"
+
+#: pg_rewind.c:193
+#, c-format
+msgid "You must run %s as the PostgreSQL superuser.\n"
+msgstr "Você deve executar %s como um super-usuário do PostgreSQL.\n"
+
+#: pg_rewind.c:224
+#, c-format
+msgid "source and target cluster are on the same timeline\n"
+msgstr "agrupamentos de origem e destino estão na mesma linha do tempo\n"
+
+#: pg_rewind.c:230
+#, c-format
+msgid "servers diverged at WAL position %X/%X on timeline %u\n"
+msgstr "servidores divergem na posição do WAL %X/%X na linha do tempo %u\n"
+
+#: pg_rewind.c:266
+#, c-format
+msgid "no rewind required\n"
+msgstr "nenhuma sincronização é necessária\n"
+
+#: pg_rewind.c:272
+#, c-format
+msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
+msgstr "sincronizando a partir do último ponto de controle em comum em %X/%X na linha do tempo %u\n"
+
+#: pg_rewind.c:280
+#, c-format
+msgid "reading source file list\n"
+msgstr "lendo lista de arquivos da origem\n"
+
+#: pg_rewind.c:282
+#, c-format
+msgid "reading target file list\n"
+msgstr "lendo lista de arquivos do destino\n"
+
+#: pg_rewind.c:292
+#, c-format
+msgid "reading WAL in target\n"
+msgstr "lendo WAL no destino\n"
+
+#: pg_rewind.c:309
+#, c-format
+msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
+msgstr "precisa copiar %lu MB (tamanho total do diretório de origem é %lu MB)\n"
+
+#: pg_rewind.c:326
+#, c-format
+msgid ""
+"\n"
+"creating backup label and updating control file\n"
+msgstr ""
+"\n"
+"criando rótulo de cópia de segurança e atualizando arquivo de controle\n"
+
+#: pg_rewind.c:354
+#, c-format
+msgid "syncing target data directory\n"
+msgstr "sincronizando diretório de dados de destino\n"
+
+#: pg_rewind.c:357
+#, c-format
+msgid "Done!\n"
+msgstr "Feito!\n"
+
+#: pg_rewind.c:369
+#, c-format
+msgid "source and target clusters are from different systems\n"
+msgstr "agrupamentos de origem e destino são de sistemas diferentes\n"
+
+#: pg_rewind.c:377
+#, c-format
+msgid "clusters are not compatible with this version of pg_rewind\n"
+msgstr "agrupamentos não são compatíveis com esta versão do pg_rewind\n"
+
+#: pg_rewind.c:387
+#, c-format
+msgid "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
+msgstr "servidor de destino precisa utilizar soma de verificação de dados ou \"wal_log_hints = on\"\n"
+
+#: pg_rewind.c:398
+#, c-format
+msgid "target server must be shut down cleanly\n"
+msgstr "servidor de destino deve ser desligado corretamente\n"
+
+#: pg_rewind.c:408
+#, c-format
+msgid "source data directory must be shut down cleanly\n"
+msgstr "diretório de dados de origem deve ser desligado corretamente\n"
+
+#: pg_rewind.c:475
+#, c-format
+msgid "could not find common ancestor of the source and target cluster's timelines\n"
+msgstr "não pôde encontrar antecessor comum das linhas do tempo dos agrupamentos de origem e destino\n"
+
+#: pg_rewind.c:515
+#, c-format
+msgid "backup label buffer too small\n"
+msgstr "buffer do rótulo da cópia de segurança é muito pequeno\n"
+
+#: pg_rewind.c:538
+#, c-format
+msgid "unexpected control file CRC\n"
+msgstr "CRC do arquivo de controle inesperado\n"
+
+#: pg_rewind.c:548
+#, c-format
+msgid "unexpected control file size %d, expected %d\n"
+msgstr "tamanho de arquivo de controle inesperado %d, esperado %d\n"
+
+#: pg_rewind.c:615
+#, c-format
+msgid ""
+"The program \"initdb\" is needed by %s but was \n"
+"not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"O programa \"initdb\" é requerido pelo %s mas não \n"
+"foi encontrado no mesmo diretório que \"%s\".\n"
+"Verifique sua instalação.\n"
+
+#: pg_rewind.c:619
+#, c-format
+msgid ""
+"The program \"initdb\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"O programa \"initdb\" foi encontrado pelo \"%s\"\n"
+"mas não tem a mesma versão que %s.\n"
+"Verifique sua instalação.\n"
+
+#: pg_rewind.c:637
+#, c-format
+msgid "sync of target directory failed\n"
+msgstr "sincronia do diretório de destino falhou\n"
+
+#: timeline.c:76 timeline.c:82
+#, c-format
+msgid "syntax error in history file: %s\n"
+msgstr "erro de sintaxe no arquivo de histórico: %s\n"
+
+#: timeline.c:77
+#, c-format
+msgid "Expected a numeric timeline ID.\n"
+msgstr "Esperado um ID de linha do tempo numérico.\n"
+
+#: timeline.c:83
+#, c-format
+msgid "Expected a transaction log switchpoint location.\n"
+msgstr "Esperado um local de transição do log de transação.\n"
+
+#: timeline.c:88
+#, c-format
+msgid "invalid data in history file: %s\n"
+msgstr "dado é inválido no arquivo de histórico: %s\n"
+
+#: timeline.c:89
+#, c-format
+msgid "Timeline IDs must be in increasing sequence.\n"
+msgstr "IDs de linha do tempo devem ser uma sequência crescente.\n"
+
+#: timeline.c:109
+#, c-format
+msgid "invalid data in history file\n"
+msgstr "dado é inválido no arquivo de histórico\n"
+
+#: timeline.c:110
+#, c-format
+msgid "Timeline IDs must be less than child timeline's ID.\n"
+msgstr "IDs de linha do tempo devem ser menores do que ID de linha do tempo descendente.\n"
+
+#: xlogreader.c:264
+#, c-format
+msgid "invalid record offset at %X/%X"
+msgstr "posição do registro é inválida em %X/%X"
+
+#: xlogreader.c:272
+#, c-format
+msgid "contrecord is requested by %X/%X"
+msgstr "contrecord é solicitado por %X/%X"
+
+#: xlogreader.c:312 xlogreader.c:603
+#, c-format
+msgid "invalid record length at %X/%X"
+msgstr "tamanho de registro inválido em %X/%X"
+
+#: xlogreader.c:326
+#, c-format
+msgid "record length %u at %X/%X too long"
+msgstr "tamanho do registro %u em %X/%X é muito longo"
+
+#: xlogreader.c:367
+#, c-format
+msgid "there is no contrecord flag at %X/%X"
+msgstr "não há marcação contrecord em %X/%X"
+
+#: xlogreader.c:380
+#, c-format
+msgid "invalid contrecord length %u at %X/%X"
+msgstr "tamanho de contrecord %u é inválido em %X/%X"
+
+#: xlogreader.c:610
+#, c-format
+msgid "invalid resource manager ID %u at %X/%X"
+msgstr "ID do gerenciador de recursos %u é inválido em %X/%X"
+
+#: xlogreader.c:624 xlogreader.c:641
+#, c-format
+msgid "record with incorrect prev-link %X/%X at %X/%X"
+msgstr "registro com prev-link %X/%X incorreto em %X/%X"
+
+#: xlogreader.c:678
+#, c-format
+msgid "incorrect resource manager data checksum in record at %X/%X"
+msgstr "soma de verificação do gerenciador de recursos é incorreta no registro em %X/%X"
+
+#: xlogreader.c:711
+#, c-format
+msgid "invalid magic number %04X in log segment %s, offset %u"
+msgstr "número mágico %04X inválido no arquivo de log %s, posição %u"
+
+#: xlogreader.c:725 xlogreader.c:776
+#, c-format
+msgid "invalid info bits %04X in log segment %s, offset %u"
+msgstr "bits de marcação %04X inválidos no arquivo de log %s, posição %u"
+
+#: xlogreader.c:751
+#, c-format
+msgid "WAL file is from different database system: WAL file database system identifier is %s, pg_control database system identifier is %s"
+msgstr "arquivo do WAL é de um sistema de banco de dados diferente: identificador do sistema de banco de dados do arquivo do WAL é %s, identificador do sistema de banco de dados do pg_control é %s"
+
+#: xlogreader.c:758
+#, c-format
+msgid "WAL file is from different database system: incorrect XLOG_SEG_SIZE in page header"
+msgstr "arquivo do WAL é de um sistema de banco de dados diferente: XLOG_SEG_SIZE incorreto no cabeçalho da página"
+
+#: xlogreader.c:764
+#, c-format
+msgid "WAL file is from different database system: incorrect XLOG_BLCKSZ in page header"
+msgstr "arquivo do WAL é de um sistema de banco de dados diferente: XLOG_BLCKSZ incorreto no cabeçalho da página"
+
+#: xlogreader.c:790
+#, c-format
+msgid "unexpected pageaddr %X/%X in log segment %s, offset %u"
+msgstr "endereço da página %X/%X inesperado no arquivo de log %s, posição %u"
+
+#: xlogreader.c:815
+#, c-format
+msgid "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u"
+msgstr "ID de linha do tempo %u fora de sequência (após %u) no arquivo de log %s, posição %u"
+
+#: xlogreader.c:1061
+#, c-format
+msgid "out-of-order block_id %u at %X/%X"
+msgstr "block_id %u fora de ordem em %X/%X"
+
+#: xlogreader.c:1083
+#, c-format
+msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
+msgstr "BKPBLOCK_HAS_DATA definido mas nenhum dado incluído em %X/%X"
+
+#: xlogreader.c:1090
+#, c-format
+msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
+msgstr "BKPBLOCK_HAS_DATA não foi definido mas tamanho do dado é %u em %X/%X"
+
+#: xlogreader.c:1123
+#, c-format
+msgid "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X"
+msgstr "BKPIMAGE_HAS_HOLE definido mas posição do espaço livre %u tamanho %u tamanho da imagem do bloco %u em %X/%X"
+
+#: xlogreader.c:1139
+#, c-format
+msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
+msgstr "BKPIMAGE_HAS_HOLE não foi definido mas posição do espaço livre %u tamanho %u em %X/%X"
+
+#: xlogreader.c:1154
+#, c-format
+msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
+msgstr "BKPIMAGE_IS_COMPRESSED definido mas tamanho da imagem do bloco %u em %X/%X"
+
+#: xlogreader.c:1169
+#, c-format
+msgid "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image length is %u at %X/%X"
+msgstr "nem BKPIMAGE_HAS_HOLE nem BKPIMAGE_IS_COMPRESSED foi definido mas tamanho da imagem do bloco é %u em %X/%X"
+
+#: xlogreader.c:1185
+#, c-format
+msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
+msgstr "BKPBLOCK_SAME_REL definido mas não há relação anterior em %X/%X"
+
+#: xlogreader.c:1197
+#, c-format
+msgid "invalid block_id %u at %X/%X"
+msgstr "block_id %u é inválido em %X/%X"
+
+#: xlogreader.c:1262
+#, c-format
+msgid "record with invalid length at %X/%X"
+msgstr "registro com tamanho inválido em %X/%X"
+
+#: xlogreader.c:1351
+#, c-format
+msgid "invalid compressed image at %X/%X, block %d"
+msgstr "imagem compactada é inválida em %X/%X, bloco %d"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_rewind/po/ru.po postgresql-9.5-9.5.8/src/bin/pg_rewind/po/ru.po
--- postgresql-9.5-9.5.2/src/bin/pg_rewind/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_rewind/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,27 +1,25 @@
-# LANGUAGE message translation file for pg_rewind
-# Copyright (C) 2015 PostgreSQL Global Development Group
+# Russian message translation file for pg_rewind
+# Copyright (C) 2015-2016 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
+# Alexander Lakhin <exclusion@gmail.com>, 2015-2017.
 #
-# Alexander Lakhin <exclusion@gmail.com>, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_rewind (PostgreSQL) 9.6\n"
+"Project-Id-Version: pg_rewind (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-17 05:43+0000\n"
-"PO-Revision-Date: 2015-10-18 18:13+0400\n"
+"POT-Creation-Date: 2017-01-30 17:22+0000\n"
+"PO-Revision-Date: 2016-11-24 14:26+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 2.0\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127
-#: parsexlog.c:179
+#: ../../common/fe_memutils.c:98 parsexlog.c:74 parsexlog.c:127 parsexlog.c:179
 #, c-format
 msgid "out of memory\n"
 msgstr "нехватка пам�ти\n"
@@ -117,7 +115,7 @@
 msgid "could not seek in source file: %s\n"
 msgstr "не удало�ь переме�тить�� в и�ходном файле: %s\n"
 
-#: copy_fetch.c:192 file_ops.c:301
+#: copy_fetch.c:192 file_ops.c:300
 #, c-format
 msgid "could not read file \"%s\": %s\n"
 msgstr "не удало�ь прочитать файл \"%s\": %s\n"
@@ -142,57 +140,57 @@
 msgid "could not close target file \"%s\": %s\n"
 msgstr "не удало�ь закрыть целевой файл \"%s\": %s\n"
 
-#: file_ops.c:99
+#: file_ops.c:98
 #, c-format
 msgid "could not seek in target file \"%s\": %s\n"
 msgstr "не удало�ь переме�тить�� в целевом файле \"%s\": %s\n"
 
-#: file_ops.c:115
+#: file_ops.c:114
 #, c-format
 msgid "could not write file \"%s\": %s\n"
 msgstr "не удало�ь запи�ать файл \"%s\": %s\n"
 
-#: file_ops.c:165
+#: file_ops.c:164
 #, c-format
 msgid "invalid action (CREATE) for regular file\n"
 msgstr "неверное дей�твие (CREATE) дл� обычного файла\n"
 
-#: file_ops.c:180
+#: file_ops.c:179
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "не удало�ь �тереть файл \"%s\": %s\n"
 
-#: file_ops.c:197
+#: file_ops.c:196
 #, c-format
 msgid "could not open file \"%s\" for truncation: %s\n"
 msgstr "не удало�ь открыть файл \"%s\" дл� у�ечени�: %s\n"
 
-#: file_ops.c:201
+#: file_ops.c:200
 #, c-format
 msgid "could not truncate file \"%s\" to %u: %s\n"
 msgstr "не удало�ь у�ечь файл \"%s\" до нужного размера (%u): %s\n"
 
-#: file_ops.c:217
+#: file_ops.c:216
 #, c-format
 msgid "could not create directory \"%s\": %s\n"
 msgstr "�оздать каталог \"%s\" не удало�ь: %s\n"
 
-#: file_ops.c:231
+#: file_ops.c:230
 #, c-format
 msgid "could not remove directory \"%s\": %s\n"
 msgstr "ошибка при удалении каталога \"%s\": %s\n"
 
-#: file_ops.c:245
+#: file_ops.c:244
 #, c-format
 msgid "could not create symbolic link at \"%s\": %s\n"
 msgstr "не удало�ь �оздать �имволиче�кую ��ылку \"%s\": %s\n"
 
-#: file_ops.c:259
+#: file_ops.c:258
 #, c-format
 msgid "could not remove symbolic link \"%s\": %s\n"
 msgstr "ошибка при удалении �имволиче�кой ��ылки \"%s\": %s\n"
 
-#: file_ops.c:289 file_ops.c:293
+#: file_ops.c:288 file_ops.c:292
 #, c-format
 msgid "could not open file \"%s\" for reading: %s\n"
 msgstr "не удало�ь открыть файл \"%s\" дл� чтени�: %s\n"
@@ -229,78 +227,83 @@
 "неожиданна� модификаци� �траницы дл� каталога или �имволиче�кой ��ылки \"%s"
 "\"\n"
 
-#: libpq_fetch.c:55
+#: libpq_fetch.c:56
 #, c-format
 msgid "could not connect to server: %s"
 msgstr "не удало�ь подключить�� к �ерверу: %s"
 
-#: libpq_fetch.c:58
+#: libpq_fetch.c:59
 #, c-format
 msgid "connected to server\n"
 msgstr "подключение к �ерверу у�тановлено\n"
 
-#: libpq_fetch.c:68
+#: libpq_fetch.c:69
 #, c-format
 msgid "source server must not be in recovery mode\n"
 msgstr "и�ходный �ервер должен быть в режиме во��тановлени�\n"
 
-#: libpq_fetch.c:78
+#: libpq_fetch.c:79
 #, c-format
 msgid "full_page_writes must be enabled in the source server\n"
-msgstr "на и�ходном �ервере должен быть включен режим full_page_writes\n"
+msgstr "на и�ходном �ервере должен быть включён режим full_page_writes\n"
 
-#: libpq_fetch.c:95
+#: libpq_fetch.c:91
+#, c-format
+msgid "could not set up connection context: %s"
+msgstr "не удало�ь на�троить контек�т подключени�: %s"
+
+#: libpq_fetch.c:109
 #, c-format
 msgid "error running query (%s) in source server: %s"
 msgstr "ошибка выполнени� запро�а (%s) на и�ходном �ервере: %s"
 
-#: libpq_fetch.c:100
+#: libpq_fetch.c:114
 #, c-format
 msgid "unexpected result set from query\n"
 msgstr "неожиданный результат запро�а\n"
 
-#: libpq_fetch.c:123
+#: libpq_fetch.c:137
 #, c-format
 msgid "unrecognized result \"%s\" for current WAL insert location\n"
 msgstr ""
 "нера�познанный результат \"%s\" вме�то текущей позиции добавлени� в WAL\n"
 
-#: libpq_fetch.c:173
+#: libpq_fetch.c:187
 #, c-format
 msgid "could not fetch file list: %s"
 msgstr "не удало�ь получить �пи�ок файлов: %s"
 
-#: libpq_fetch.c:178
+#: libpq_fetch.c:192
 #, c-format
 msgid "unexpected result set while fetching file list\n"
 msgstr "неожиданный результат при получении �пи�ка файлов\n"
 
-#: libpq_fetch.c:226
+#: libpq_fetch.c:240
 #, c-format
 msgid "could not send query: %s"
 msgstr "не удало�ь отправить запро�: %s"
 
-#: libpq_fetch.c:228
+#: libpq_fetch.c:242
 #, c-format
 msgid "getting file chunks\n"
 msgstr "получение �егментов файлов\n"
 
-#: libpq_fetch.c:231
+#: libpq_fetch.c:245
 #, c-format
 msgid "could not set libpq connection to single row mode\n"
 msgstr "не удало�ь переве�ти подключение libpq в одно�трочный режим\n"
 
-#: libpq_fetch.c:251
+#: libpq_fetch.c:265
 #, c-format
 msgid "unexpected result while fetching remote files: %s"
 msgstr "неожиданный результат при получении удалённых файлов: %s"
 
-#: libpq_fetch.c:257
+#: libpq_fetch.c:271
 #, c-format
 msgid "unexpected result set size while fetching remote files\n"
 msgstr "неожиданный размер набора результатов при получении удалённых файлов\n"
 
-#: libpq_fetch.c:263
+#: libpq_fetch.c:277
 #, c-format
 msgid ""
 "unexpected data types in result set while fetching remote files: %u %u %u\n"
@@ -308,68 +311,68 @@
 "неожиданные типы данных в наборе результатов при получении удалённых файлов: "
 "%u %u %u\n"
 
-#: libpq_fetch.c:271
+#: libpq_fetch.c:285
 #, c-format
 msgid "unexpected result format while fetching remote files\n"
 msgstr "неожиданный формат результата при получении удалённых файлов\n"
 
-#: libpq_fetch.c:277
+#: libpq_fetch.c:291
 #, c-format
 msgid "unexpected null values in result while fetching remote files\n"
 msgstr ""
 "неожиданные значени� NULL в результате при получении удалённых файлов\n"
 
-#: libpq_fetch.c:281
+#: libpq_fetch.c:295
 #, c-format
 msgid "unexpected result length while fetching remote files\n"
 msgstr "неожиданна� длина результата при получении удалённых файлов\n"
 
-#: libpq_fetch.c:303
+#: libpq_fetch.c:317
 #, c-format
 msgid "received null value for chunk for file \"%s\", file has been deleted\n"
 msgstr "дл� файла \"%s\" вме�то �егмента получено NULL-значение, файл удалён\n"
 
-#: libpq_fetch.c:310
+#: libpq_fetch.c:324
 #, c-format
 msgid "received chunk for file \"%s\", offset %d, size %d\n"
 msgstr "получен �егмент файла \"%s\": �мещение %d, размер %d\n"
 
-#: libpq_fetch.c:339
+#: libpq_fetch.c:353
 #, c-format
 msgid "could not fetch remote file \"%s\": %s"
 msgstr "не удало�ь получить удалённый файл \"%s\": %s"
 
-#: libpq_fetch.c:344
+#: libpq_fetch.c:358
 #, c-format
 msgid "unexpected result set while fetching remote file \"%s\"\n"
 msgstr "неожиданный набор результатов при получении удалённого файла \"%s\"\n"
 
-#: libpq_fetch.c:355
+#: libpq_fetch.c:369
 #, c-format
 msgid "fetched file \"%s\", length %d\n"
 msgstr "получен файл \"%s\", длина %d\n"
 
-#: libpq_fetch.c:387
+#: libpq_fetch.c:401
 #, c-format
 msgid "could not send COPY data: %s"
 msgstr "не удало�ь отправить данные COPY: %s"
 
-#: libpq_fetch.c:413
+#: libpq_fetch.c:427
 #, c-format
 msgid "could not create temporary table: %s"
 msgstr "не удало�ь �оздать временную таблицу: %s"
 
-#: libpq_fetch.c:421
+#: libpq_fetch.c:435
 #, c-format
 msgid "could not send file list: %s"
 msgstr "не удало�ь отправить �пи�ок файлов: %s"
 
-#: libpq_fetch.c:463
+#: libpq_fetch.c:477
 #, c-format
 msgid "could not send end-of-COPY: %s"
 msgstr "не удало�ь отправить �ообщение о завершении копировани�: %s"
 
-#: libpq_fetch.c:469
+#: libpq_fetch.c:483
 #, c-format
 msgid "unexpected result while sending file list: %s"
 msgstr "неожиданный результат при передаче �пи�ка: %s"
@@ -427,7 +430,7 @@
 "Запи�ь WAL модифицирует отношение, но тип запи�и не ра�познан\n"
 "lsn: %X/%X, rmgr: %s, info: %02X\n"
 
-#: pg_rewind.c:59
+#: pg_rewind.c:60
 #, c-format
 msgid ""
 "%s resynchronizes a PostgreSQL cluster with another copy of the cluster.\n"
@@ -436,7 +439,7 @@
 "%s �инхронизирует кла�тер PostgreSQL � другой копией кла�тера.\n"
 "\n"
 
-#: pg_rewind.c:60
+#: pg_rewind.c:61
 #, c-format
 msgid ""
 "Usage:\n"
@@ -447,19 +450,19 @@
 "  %s [П�Р�МЕТР]...\n"
 "\n"
 
-#: pg_rewind.c:61
+#: pg_rewind.c:62
 #, c-format
 msgid "Options:\n"
 msgstr "Параметры:\n"
 
-#: pg_rewind.c:62
+#: pg_rewind.c:63
 #, c-format
 msgid "  -D, --target-pgdata=DIRECTORY  existing data directory to modify\n"
 msgstr ""
 "  -D, --target-pgdata=К�Т�ЛОГ    �уще�твующий каталог, куда будут запи�аны "
 "данные\n"
 
-#: pg_rewind.c:63
+#: pg_rewind.c:64
 #, c-format
 msgid ""
 "      --source-pgdata=DIRECTORY  source data directory to synchronize with\n"
@@ -467,43 +470,44 @@
 "      --source-pgdata=К�Т�ЛОГ    и�ходный каталог, � которым будет проведена "
 "�инхронизаци�\n"
 
-#: pg_rewind.c:64
+# well-spelled: ПОДКЛ
+#: pg_rewind.c:65
 #, c-format
 msgid "      --source-server=CONNSTR    source server to synchronize with\n"
 msgstr ""
 "      --source-server=СТР_ПОДКЛ  �ервер, � которым будет проведена "
 "�инхронизаци�\n"
 
-#: pg_rewind.c:65
+#: pg_rewind.c:66
 #, c-format
 msgid "  -n, --dry-run                  stop before modifying anything\n"
 msgstr ""
 "  -n, --dry-run                  о�тановить�� до вне�ени� каких-либо "
 "изменений\n"
 
-#: pg_rewind.c:66
+#: pg_rewind.c:67
 #, c-format
 msgid "  -P, --progress                 write progress messages\n"
 msgstr "  -P, --progress                 выводить �ообщени� о ходе проце��а\n"
 
-#: pg_rewind.c:67
+#: pg_rewind.c:68
 #, c-format
 msgid "      --debug                    write a lot of debug messages\n"
 msgstr ""
 "      --debug                    выдавать множе�тво отладочных �ообщений\n"
 
-#: pg_rewind.c:68
+#: pg_rewind.c:69
 #, c-format
 msgid ""
 "  -V, --version                  output version information, then exit\n"
 msgstr "  -V, --version                  показать вер�ию и выйти\n"
 
-#: pg_rewind.c:69
+#: pg_rewind.c:70
 #, c-format
 msgid "  -?, --help                     show this help, then exit\n"
 msgstr "  -?, --help                     показать �ту �правку и выйти\n"
 
-#: pg_rewind.c:70
+#: pg_rewind.c:71
 #, c-format
 msgid ""
 "\n"
@@ -512,81 +516,87 @@
 "\n"
 "Об ошибках �ообщайте по адре�у <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_rewind.c:125 pg_rewind.c:156 pg_rewind.c:163 pg_rewind.c:171
+#: pg_rewind.c:126 pg_rewind.c:157 pg_rewind.c:164 pg_rewind.c:171
+#: pg_rewind.c:179
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Дл� дополнительной информации попробуйте \"%s --help\".\n"
 
-#: pg_rewind.c:155
+#: pg_rewind.c:156
 #, c-format
 msgid "%s: no source specified (--source-pgdata or --source-server)\n"
 msgstr ""
 "%s: и�точник не указан (требует�� --source-pgdata или --source-server)\n"
 
-#: pg_rewind.c:162
+#: pg_rewind.c:163
+#, c-format
+msgid "%s: only one of --source-pgdata or --source-server can be specified\n"
+msgstr "%s: указать можно только --source-pgdata либо --source-server\n"
+
+#: pg_rewind.c:170
 #, c-format
 msgid "%s: no target data directory specified (--target-pgdata)\n"
 msgstr "%s: целевой каталог данных не указан (--target-pgdata)\n"
 
-#: pg_rewind.c:169
+#: pg_rewind.c:177
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: �лишком много аргументов командной �троки (первый: \"%s\")\n"
 
-#: pg_rewind.c:184
+#: pg_rewind.c:192
 #, c-format
 msgid "cannot be executed by \"root\"\n"
 msgstr "программу не должен запу�кать root\n"
 
-#: pg_rewind.c:185
+#: pg_rewind.c:193
 #, c-format
 msgid "You must run %s as the PostgreSQL superuser.\n"
 msgstr "Запу�кать %s нужно от имени �уперпользовател� PostgreSQL.\n"
 
-#: pg_rewind.c:215
+#: pg_rewind.c:224
 #, c-format
 msgid "source and target cluster are on the same timeline\n"
 msgstr "и�ходный и целевой кла�тер уже на одной линии времени\n"
 
-#: pg_rewind.c:218
+#: pg_rewind.c:230
 #, c-format
 msgid "servers diverged at WAL position %X/%X on timeline %u\n"
 msgstr "Серверы разошли�ь в позиции WAL %X/%X на линии времени %u.\n"
 
-#: pg_rewind.c:253
+#: pg_rewind.c:266
 #, c-format
 msgid "no rewind required\n"
 msgstr "перемотка не требует��.\n"
 
-#: pg_rewind.c:259
+#: pg_rewind.c:272
 #, c-format
 msgid "rewinding from last common checkpoint at %X/%X on timeline %u\n"
 msgstr ""
 "перемотка от по�ледней общей контрольной точки в позиции %X/%X на линии "
 "времени %u\n"
 
-#: pg_rewind.c:267
+#: pg_rewind.c:280
 #, c-format
 msgid "reading source file list\n"
 msgstr "чтение �пи�ка и�ходных файлов\n"
 
-#: pg_rewind.c:269
+#: pg_rewind.c:282
 #, c-format
 msgid "reading target file list\n"
 msgstr "чтение �пи�ка целевых файлов\n"
 
-#: pg_rewind.c:279
+#: pg_rewind.c:292
 #, c-format
 msgid "reading WAL in target\n"
 msgstr "чтение WAL в целевом кла�тере\n"
 
-#: pg_rewind.c:296
+#: pg_rewind.c:309
 #, c-format
 msgid "need to copy %lu MB (total source directory size is %lu MB)\n"
 msgstr ""
 "требует�� �копировать %lu МБ (общий размер и�ходного каталога: %lu МБ)\n"
 
-#: pg_rewind.c:313
+#: pg_rewind.c:326
 #, c-format
 msgid ""
 "\n"
@@ -595,22 +605,27 @@
 "\n"
 "�оздание метки копии и модификаци� управл�ющего файла\n"
 
-#: pg_rewind.c:341
+#: pg_rewind.c:354
+#, c-format
+msgid "syncing target data directory\n"
+msgstr "�инхронизаци� целевого каталога данных\n"
+
+#: pg_rewind.c:357
 #, c-format
 msgid "Done!\n"
 msgstr "Готово!\n"
 
-#: pg_rewind.c:353
+#: pg_rewind.c:369
 #, c-format
 msgid "source and target clusters are from different systems\n"
 msgstr "и�ходный и целевой кла�теры отно��т�� к разным �и�темам\n"
 
-#: pg_rewind.c:361
+#: pg_rewind.c:377
 #, c-format
 msgid "clusters are not compatible with this version of pg_rewind\n"
 msgstr "кла�теры не�овме�тимы � �той вер�ией pg_rewind\n"
 
-#: pg_rewind.c:371
+#: pg_rewind.c:387
 #, c-format
 msgid ""
 "target server needs to use either data checksums or \"wal_log_hints = on\"\n"
@@ -618,38 +633,65 @@
 "на целевом �ервере должны быть контрольные �уммы данных или \"wal_log_hints "
 "= on\"\n"
 
-#: pg_rewind.c:381
+#: pg_rewind.c:398
 #, c-format
 msgid "target server must be shut down cleanly\n"
 msgstr "целевой �ервер должен быть выключен штатно\n"
 
-#: pg_rewind.c:389
+#: pg_rewind.c:408
 #, c-format
 msgid "source data directory must be shut down cleanly\n"
 msgstr "работа � и�ходным каталогом данных должна быть завершена штатно\n"
 
-#: pg_rewind.c:456
+#: pg_rewind.c:475
 #, c-format
 msgid ""
 "could not find common ancestor of the source and target cluster's timelines\n"
 msgstr ""
-"не удало�ь найти общего предка линий времени и�ходного и целевых кла�теров\n"
+"не удало�ь найти общего предка линий времени и�ходного и целевого кла�теров\n"
 
-#: pg_rewind.c:496
+#: pg_rewind.c:515
 #, c-format
 msgid "backup label buffer too small\n"
 msgstr "буфер дл� метки копии �лишком мал\n"
 
-#: pg_rewind.c:518
+#: pg_rewind.c:538
 #, c-format
 msgid "unexpected control file CRC\n"
 msgstr "неверна� контрольна� �умма управл�ющего файла\n"
 
-#: pg_rewind.c:528
+#: pg_rewind.c:548
 #, c-format
 msgid "unexpected control file size %d, expected %d\n"
 msgstr "неверный размер управл�ющего файла (%d), ожидало�ь: %d\n"
 
+#: pg_rewind.c:615
+#, c-format
+msgid ""
+"The program \"initdb\" is needed by %s but was \n"
+"not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Дл� %s необходима программа \"initdb\", но она не найдена\n"
+"в каталоге \"%s\".\n"
+"Проверьте правильно�ть у�тановки СУБД.\n"
+
+#: pg_rewind.c:619
+#, c-format
+msgid ""
+"The program \"initdb\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"Программа \"initdb\" найдена в \"%s\",\n"
+"но её вер�и� отличает�� от вер�ии %s.\n"
+"Проверьте правильно�ть у�тановки СУБД.\n"
+
+#: pg_rewind.c:637
+#, c-format
+msgid "sync of target directory failed\n"
+msgstr "�бой �инхронизации целевого каталога\n"
+
 #: timeline.c:76 timeline.c:82
 #, c-format
 msgid "syntax error in history file: %s\n"
@@ -783,23 +825,23 @@
 "нарушение по�ледовательно�ти ID линии времени %u (по�ле %u) в �егменте "
 "журнала %s, �мещение %u"
 
-#: xlogreader.c:1024
+#: xlogreader.c:1061
 #, c-format
 msgid "out-of-order block_id %u at %X/%X"
 msgstr "идентификатор блока %u идёт не по пор�дку в позиции %X/%X"
 
-#: xlogreader.c:1046
+#: xlogreader.c:1083
 #, c-format
 msgid "BKPBLOCK_HAS_DATA set, but no data included at %X/%X"
 msgstr "BKPBLOCK_HAS_DATA у�тановлен, но данных в позиции %X/%X нет"
 
-#: xlogreader.c:1053
+#: xlogreader.c:1090
 #, c-format
 msgid "BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X"
 msgstr ""
 "BKPBLOCK_HAS_DATA не у�тановлен, но длина данных равна %u в позиции %X/%X"
 
-#: xlogreader.c:1086
+#: xlogreader.c:1123
 #, c-format
 msgid ""
 "BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at "
@@ -808,21 +850,21 @@
 "BKPIMAGE_HAS_HOLE у�тановлен, но дл� пропу�ка заданы �мещение %u и длина %u "
 "при длине образа блока %u в позиции %X/%X"
 
-#: xlogreader.c:1102
+#: xlogreader.c:1139
 #, c-format
 msgid "BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X"
 msgstr ""
 "BKPIMAGE_HAS_HOLE не у�тановлен, но дл� пропу�ка заданы �мещение %u и длина "
 "%u в позиции %X/%X"
 
-#: xlogreader.c:1117
+#: xlogreader.c:1154
 #, c-format
 msgid "BKPIMAGE_IS_COMPRESSED set, but block image length %u at %X/%X"
 msgstr ""
 "BKPIMAGE_IS_COMPRESSED у�тановлен, но длина образа блока равна %u в позиции "
 "%X/%X"
 
-#: xlogreader.c:1132
+#: xlogreader.c:1169
 #, c-format
 msgid ""
 "neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_IS_COMPRESSED set, but block image "
@@ -831,24 +873,24 @@
 "ни BKPIMAGE_HAS_HOLE, ни BKPIMAGE_IS_COMPRESSED не у�тановлены, но длина "
 "образа блока равна %u в позиции %X/%X"
 
-#: xlogreader.c:1148
+#: xlogreader.c:1185
 #, c-format
 msgid "BKPBLOCK_SAME_REL set but no previous rel at %X/%X"
 msgstr ""
 "BKPBLOCK_SAME_REL у�тановлен, но предыдущее значение не задано в позиции %X/"
 "%X"
 
-#: xlogreader.c:1160
+#: xlogreader.c:1197
 #, c-format
 msgid "invalid block_id %u at %X/%X"
 msgstr "неверный идентификатор блока %u в позиции %X/%X"
 
-#: xlogreader.c:1225
+#: xlogreader.c:1262
 #, c-format
 msgid "record with invalid length at %X/%X"
 msgstr "запи�ь � неверной длиной в позиции %X/%X"
 
-#: xlogreader.c:1314
+#: xlogreader.c:1351
 #, c-format
 msgid "invalid compressed image at %X/%X, block %d"
 msgstr "неверный �жатый образ в позиции %X/%X, блок %d"
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_test_fsync/pg_test_fsync.c postgresql-9.5-9.5.8/src/bin/pg_test_fsync/pg_test_fsync.c
--- postgresql-9.5-9.5.2/src/bin/pg_test_fsync/pg_test_fsync.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_test_fsync/pg_test_fsync.c	2017-08-07 21:13:41.000000000 +0000
@@ -7,6 +7,7 @@
 
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <fcntl.h>
 #include <time.h>
 #include <unistd.h>
 #include <signal.h>
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_upgrade/check.c postgresql-9.5-9.5.8/src/bin/pg_upgrade/check.c
--- postgresql-9.5-9.5.2/src/bin/pg_upgrade/check.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_upgrade/check.c	2017-08-07 21:13:41.000000000 +0000
@@ -159,15 +159,21 @@
 
 
 void
-issue_warnings(void)
+issue_warnings_and_set_wal_level(void)
 {
+	/*
+	 * We unconditionally start/stop the new server because pg_resetwal -o
+	 * set wal_level to 'minimum'.  If the user is upgrading standby
+	 * servers using the rsync instructions, they will need pg_upgrade
+	 * to write its final WAL record showing wal_level as 'replica'.
+	 */
+	start_postmaster(&new_cluster, true);
+
 	/* Create dummy large object permissions for old < PG 9.0? */
 	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 804)
-	{
-		start_postmaster(&new_cluster, true);
 		new_9_0_populate_pg_largeobject_metadata(&new_cluster, false);
-		stop_postmaster(false);
-	}
+
+	stop_postmaster(false);
 }
 
 
@@ -404,12 +410,17 @@
 create_script_for_cluster_analyze(char **analyze_script_file_name)
 {
 	FILE	   *script = NULL;
-	char	   *user_specification = "";
+	PQExpBufferData user_specification;
 
 	prep_status("Creating script to analyze new cluster");
 
+	initPQExpBuffer(&user_specification);
 	if (os_info.user_specified)
-		user_specification = psprintf("-U \"%s\" ", os_info.user);
+	{
+		appendPQExpBufferStr(&user_specification, "-U ");
+		appendShellString(&user_specification, os_info.user);
+		appendPQExpBufferChar(&user_specification, ' ');
+	}
 
 	*analyze_script_file_name = psprintf("%sanalyze_new_cluster.%s",
 										 SCRIPT_PREFIX, SCRIPT_EXT);
@@ -449,18 +460,18 @@
 	fprintf(script, "echo %sthis script and run:%s\n",
 			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %s    \"%s/vacuumdb\" %s--all %s%s\n", ECHO_QUOTE,
-			new_cluster.bindir, user_specification,
+			new_cluster.bindir, user_specification.data,
 	/* Did we copy the free space files? */
 			(GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?
 			"--analyze-only" : "--analyze", ECHO_QUOTE);
 	fprintf(script, "echo%s\n\n", ECHO_BLANK);
 
 	fprintf(script, "\"%s/vacuumdb\" %s--all --analyze-in-stages\n",
-			new_cluster.bindir, user_specification);
+			new_cluster.bindir, user_specification.data);
 	/* Did we copy the free space files? */
 	if (GET_MAJOR_VERSION(old_cluster.major_version) < 804)
 		fprintf(script, "\"%s/vacuumdb\" %s--all\n", new_cluster.bindir,
-				user_specification);
+				user_specification.data);
 
 	fprintf(script, "echo%s\n\n", ECHO_BLANK);
 	fprintf(script, "echo %sDone%s\n",
@@ -474,8 +485,7 @@
 				 *analyze_script_file_name, getErrorText());
 #endif
 
-	if (os_info.user_specified)
-		pg_free(user_specification);
+	termPQExpBuffer(&user_specification);
 
 	check_ok();
 }
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_upgrade/dump.c postgresql-9.5-9.5.8/src/bin/pg_upgrade/dump.c
--- postgresql-9.5-9.5.2/src/bin/pg_upgrade/dump.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_upgrade/dump.c	2017-08-07 21:13:41.000000000 +0000
@@ -12,7 +12,6 @@
 #include "pg_upgrade.h"
 
 #include <sys/types.h>
-#include "catalog/binary_upgrade.h"
 
 
 void
@@ -47,6 +46,15 @@
 		char		sql_file_name[MAXPGPATH],
 					log_file_name[MAXPGPATH];
 		DbInfo	   *old_db = &old_cluster.dbarr.dbs[dbnum];
+		PQExpBufferData connstr,
+					escaped_connstr;
+
+		initPQExpBuffer(&connstr);
+		appendPQExpBuffer(&connstr, "dbname=");
+		appendConnStrVal(&connstr, old_db->db_name);
+		initPQExpBuffer(&escaped_connstr);
+		appendShellString(&escaped_connstr, connstr.data);
+		termPQExpBuffer(&connstr);
 
 		pg_log(PG_STATUS, "%s", old_db->db_name);
 		snprintf(sql_file_name, sizeof(sql_file_name), DB_DUMP_FILE_MASK, old_db->db_oid);
@@ -54,10 +62,12 @@
 
 		parallel_exec_prog(log_file_name, NULL,
 				   "\"%s/pg_dump\" %s --schema-only --quote-all-identifiers "
-				  "--binary-upgrade --format=custom %s --file=\"%s\" \"%s\"",
+					  "--binary-upgrade --format=custom %s --file=\"%s\" %s",
 						 new_cluster.bindir, cluster_conn_opts(&old_cluster),
 						   log_opts.verbose ? "--verbose" : "",
-						   sql_file_name, old_db->db_name);
+						   sql_file_name, escaped_connstr.data);
+
+		termPQExpBuffer(&escaped_connstr);
 	}
 
 	/* reap all children */
@@ -69,71 +79,3 @@
 	end_progress_output();
 	check_ok();
 }
-
-
-/*
- * It is possible for there to be a mismatch in the need for TOAST tables
- * between the old and new servers, e.g. some pre-9.1 tables didn't need
- * TOAST tables but will need them in 9.1+.  (There are also opposite cases,
- * but these are handled by setting binary_upgrade_next_toast_pg_class_oid.)
- *
- * We can't allow the TOAST table to be created by pg_dump with a
- * pg_dump-assigned oid because it might conflict with a later table that
- * uses that oid, causing a "file exists" error for pg_class conflicts, and
- * a "duplicate oid" error for pg_type conflicts.  (TOAST tables need pg_type
- * entries.)
- *
- * Therefore, a backend in binary-upgrade mode will not create a TOAST
- * table unless an OID as passed in via pg_upgrade_support functions.
- * This function is called after the restore and uses ALTER TABLE to
- * auto-create any needed TOAST tables which will not conflict with
- * restored oids.
- */
-void
-optionally_create_toast_tables(void)
-{
-	int			dbnum;
-
-	prep_status("Creating newly-required TOAST tables");
-
-	for (dbnum = 0; dbnum < new_cluster.dbarr.ndbs; dbnum++)
-	{
-		PGresult   *res;
-		int			ntups;
-		int			rowno;
-		int			i_nspname,
-					i_relname;
-		DbInfo	   *active_db = &new_cluster.dbarr.dbs[dbnum];
-		PGconn	   *conn = connectToServer(&new_cluster, active_db->db_name);
-
-		res = executeQueryOrDie(conn,
-								"SELECT n.nspname, c.relname "
-								"FROM	pg_catalog.pg_class c, "
-								"		pg_catalog.pg_namespace n "
-								"WHERE	c.relnamespace = n.oid AND "
-								"		n.nspname NOT IN ('pg_catalog', 'information_schema') AND "
-								"c.relkind IN ('r', 'm') AND "
-								"c.reltoastrelid = 0");
-
-		ntups = PQntuples(res);
-		i_nspname = PQfnumber(res, "nspname");
-		i_relname = PQfnumber(res, "relname");
-		for (rowno = 0; rowno < ntups; rowno++)
-		{
-			/* enable auto-oid-numbered TOAST creation if needed */
-			PQclear(executeQueryOrDie(conn, "SELECT pg_catalog.binary_upgrade_set_next_toast_pg_class_oid('%d'::pg_catalog.oid);",
-									  OPTIONALLY_CREATE_TOAST_OID));
-
-			/* dummy command that also triggers check for required TOAST table */
-			PQclear(executeQueryOrDie(conn, "ALTER TABLE %s.%s RESET (binary_upgrade_dummy_option);",
-						 quote_identifier(PQgetvalue(res, rowno, i_nspname)),
-					   quote_identifier(PQgetvalue(res, rowno, i_relname))));
-		}
-
-		PQclear(res);
-
-		PQfinish(conn);
-	}
-
-	check_ok();
-}
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_upgrade/function.c postgresql-9.5-9.5.8/src/bin/pg_upgrade/function.c
--- postgresql-9.5-9.5.2/src/bin/pg_upgrade/function.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_upgrade/function.c	2017-08-07 21:13:41.000000000 +0000
@@ -12,6 +12,31 @@
 #include "pg_upgrade.h"
 
 #include "access/transam.h"
+#include "catalog/pg_language.h"
+
+
+/*
+ * qsort comparator for pointers to library names
+ *
+ * We sort first by name length, then alphabetically for names of the same
+ * length.  This is to ensure that, eg, "hstore_plpython" sorts after both
+ * "hstore" and "plpython"; otherwise transform modules will probably fail
+ * their LOAD tests.  (The backend ought to cope with that consideration,
+ * but it doesn't yet, and even when it does it'll still be a good idea
+ * to have a predictable order of probing here.)
+ */
+static int
+library_name_compare(const void *p1, const void *p2)
+{
+	const char *str1 = *(const char *const *) p1;
+	const char *str2 = *(const char *const *) p2;
+	int			slen1 = strlen(str1);
+	int			slen2 = strlen(str2);
+
+	if (slen1 != slen2)
+		return slen1 - slen2;
+	return strcmp(str1, str2);
+}
 
 
 /*
@@ -38,17 +63,15 @@
 		PGconn	   *conn = connectToServer(&old_cluster, active_db->db_name);
 
 		/*
-		 * Fetch all libraries referenced in this DB.  We can't exclude the
-		 * "pg_catalog" schema because, while such functions are not
-		 * explicitly dumped by pg_dump, they do reference implicit objects
-		 * that pg_dump does dump, e.g. CREATE LANGUAGE plperl.
+		 * Fetch all libraries containing non-built-in C functions in this DB.
 		 */
 		ress[dbnum] = executeQueryOrDie(conn,
 										"SELECT DISTINCT probin "
-										"FROM	pg_catalog.pg_proc "
-										"WHERE	prolang = 13 /* C */ AND "
+										"FROM pg_catalog.pg_proc "
+										"WHERE prolang = %u AND "
 										"probin IS NOT NULL AND "
 										"oid >= %u;",
+										ClanguageId,
 										FirstNormalObjectId);
 		totaltups += PQntuples(ress[dbnum]);
 
@@ -69,13 +92,15 @@
 
 			res = executeQueryOrDie(conn,
 									"SELECT 1 "
-						   "FROM	pg_catalog.pg_proc JOIN pg_namespace "
-							 "		ON pronamespace = pg_namespace.oid "
+									"FROM pg_catalog.pg_proc p "
+									"    JOIN pg_catalog.pg_namespace n "
+									"    ON pronamespace = n.oid "
 							   "WHERE proname = 'plpython_call_handler' AND "
 									"nspname = 'public' AND "
-									"prolang = 13 /* C */ AND "
+									"prolang = %u AND "
 									"probin = '$libdir/plpython' AND "
-									"pg_proc.oid >= %u;",
+									"p.oid >= %u;",
+									ClanguageId,
 									FirstNormalObjectId);
 			if (PQntuples(res) > 0)
 			{
@@ -112,13 +137,18 @@
 	if (found_public_plpython_handler)
 		pg_fatal("Remove the problem functions from the old cluster to continue.\n");
 
-	/* Allocate what's certainly enough space */
-	os_info.libraries = (char **) pg_malloc(totaltups * sizeof(char *));
-
 	/*
-	 * Now remove duplicates across DBs.  This is pretty inefficient code, but
-	 * there probably aren't enough entries to matter.
+	 * Now we want to remove duplicates across DBs and sort the library names
+	 * into order.  This avoids multiple probes of the same library, and
+	 * ensures that libraries are probed in a consistent order, which is
+	 * important for reproducible behavior if one library depends on another.
+	 *
+	 * First transfer all the names into one array, then sort, then remove
+	 * duplicates.  Note: we strdup each name in the first loop so that we can
+	 * safely clear the PGresults in the same loop.  This is a bit wasteful
+	 * but it's unlikely there are enough names to matter.
 	 */
+	os_info.libraries = (char **) pg_malloc(totaltups * sizeof(char *));
 	totaltups = 0;
 
 	for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
@@ -131,27 +161,34 @@
 		for (rowno = 0; rowno < ntups; rowno++)
 		{
 			char	   *lib = PQgetvalue(res, rowno, 0);
-			bool		dup = false;
-			int			n;
 
-			for (n = 0; n < totaltups; n++)
-			{
-				if (strcmp(lib, os_info.libraries[n]) == 0)
-				{
-					dup = true;
-					break;
-				}
-			}
-			if (!dup)
-				os_info.libraries[totaltups++] = pg_strdup(lib);
+			os_info.libraries[totaltups++] = pg_strdup(lib);
 		}
-
 		PQclear(res);
 	}
 
-	os_info.num_libraries = totaltups;
-
 	pg_free(ress);
+
+	if (totaltups > 1)
+	{
+		int			i,
+					lastnondup;
+
+		qsort((void *) os_info.libraries, totaltups, sizeof(char *),
+			  library_name_compare);
+
+		for (i = 1, lastnondup = 0; i < totaltups; i++)
+		{
+			if (strcmp(os_info.libraries[i],
+					   os_info.libraries[lastnondup]) != 0)
+				os_info.libraries[++lastnondup] = os_info.libraries[i];
+			else
+				pg_free(os_info.libraries[i]);
+		}
+		totaltups = lastnondup + 1;
+	}
+
+	os_info.num_libraries = totaltups;
 }
 
 
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_upgrade/pg_upgrade.c postgresql-9.5-9.5.8/src/bin/pg_upgrade/pg_upgrade.c
--- postgresql-9.5-9.5.2/src/bin/pg_upgrade/pg_upgrade.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_upgrade/pg_upgrade.c	2017-08-07 21:13:41.000000000 +0000
@@ -159,7 +159,7 @@
 	create_script_for_cluster_analyze(&analyze_script_file_name);
 	create_script_for_old_cluster_deletion(&deletion_script_file_name);
 
-	issue_warnings();
+	issue_warnings_and_set_wal_level();
 
 	pg_log(PG_REPORT, "\nUpgrade Complete\n");
 	pg_log(PG_REPORT, "----------------\n");
@@ -307,6 +307,15 @@
 		char		sql_file_name[MAXPGPATH],
 					log_file_name[MAXPGPATH];
 		DbInfo	   *old_db = &old_cluster.dbarr.dbs[dbnum];
+		PQExpBufferData connstr,
+					escaped_connstr;
+
+		initPQExpBuffer(&connstr);
+		appendPQExpBuffer(&connstr, "dbname=");
+		appendConnStrVal(&connstr, old_db->db_name);
+		initPQExpBuffer(&escaped_connstr);
+		appendShellString(&escaped_connstr, connstr.data);
+		termPQExpBuffer(&connstr);
 
 		pg_log(PG_STATUS, "%s", old_db->db_name);
 		snprintf(sql_file_name, sizeof(sql_file_name), DB_DUMP_FILE_MASK, old_db->db_oid);
@@ -318,11 +327,13 @@
 		 */
 		parallel_exec_prog(log_file_name,
 						   NULL,
-						   "\"%s/pg_restore\" %s --exit-on-error --verbose --dbname \"%s\" \"%s\"",
+		 "\"%s/pg_restore\" %s --exit-on-error --verbose --dbname %s \"%s\"",
 						   new_cluster.bindir,
 						   cluster_conn_opts(&new_cluster),
-						   old_db->db_name,
+						   escaped_connstr.data,
 						   sql_file_name);
+
+		termPQExpBuffer(&escaped_connstr);
 	}
 
 	/* reap all children */
@@ -334,13 +345,11 @@
 
 	/*
 	 * We don't have minmxids for databases or relations in pre-9.3 clusters,
-	 * so set those after we have restores the schemas.
+	 * so set those after we have restored the schema.
 	 */
 	if (GET_MAJOR_VERSION(old_cluster.major_version) < 903)
 		set_frozenxids(true);
 
-	optionally_create_toast_tables();
-
 	/* regenerate now that we have objects in the databases */
 	get_db_and_rel_infos(&new_cluster);
 }
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_upgrade/pg_upgrade.h postgresql-9.5-9.5.8/src/bin/pg_upgrade/pg_upgrade.h
--- postgresql-9.5-9.5.2/src/bin/pg_upgrade/pg_upgrade.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_upgrade/pg_upgrade.h	2017-08-07 21:13:41.000000000 +0000
@@ -11,6 +11,7 @@
 #include <sys/time.h>
 
 #include "libpq-fe.h"
+#include "pqexpbuffer.h"
 
 /* Use port in the private/dynamic port number range */
 #define DEF_PGUPORT			50432
@@ -330,7 +331,7 @@
 void		check_and_dump_old_cluster(bool live_check);
 void		check_new_cluster(void);
 void		report_clusters_compatible(void);
-void		issue_warnings(void);
+void		issue_warnings_and_set_wal_level(void);
 void output_completion_banner(char *analyze_script_file_name,
 						 char *deletion_script_file_name);
 void		check_cluster_versions(void);
@@ -349,7 +350,6 @@
 /* dump.c */
 
 void		generate_old_dump(void);
-void		optionally_create_toast_tables(void);
 
 
 /* exec.c */
@@ -452,6 +452,9 @@
 /* util.c */
 
 char	   *quote_identifier(const char *s);
+extern void appendShellString(PQExpBuffer buf, const char *str);
+extern void appendConnStrVal(PQExpBuffer buf, const char *str);
+extern void appendPsqlMetaConnect(PQExpBuffer buf, const char *dbname);
 int			get_user_info(char **user_name_p);
 void		check_ok(void);
 void		report_status(eLogType type, const char *fmt,...) pg_attribute_printf(2, 3);
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_upgrade/server.c postgresql-9.5-9.5.8/src/bin/pg_upgrade/server.c
--- postgresql-9.5-9.5.2/src/bin/pg_upgrade/server.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_upgrade/server.c	2017-08-07 21:13:41.000000000 +0000
@@ -51,18 +51,25 @@
 static PGconn *
 get_db_conn(ClusterInfo *cluster, const char *db_name)
 {
-	char		conn_opts[2 * NAMEDATALEN + MAXPGPATH + 100];
+	PQExpBufferData conn_opts;
+	PGconn	   *conn;
 
+	/* Build connection string with proper quoting */
+	initPQExpBuffer(&conn_opts);
+	appendPQExpBufferStr(&conn_opts, "dbname=");
+	appendConnStrVal(&conn_opts, db_name);
+	appendPQExpBufferStr(&conn_opts, " user=");
+	appendConnStrVal(&conn_opts, os_info.user);
+	appendPQExpBuffer(&conn_opts, " port=%d", cluster->port);
 	if (cluster->sockdir)
-		snprintf(conn_opts, sizeof(conn_opts),
-				 "dbname = '%s' user = '%s' host = '%s' port = %d",
-				 db_name, os_info.user, cluster->sockdir, cluster->port);
-	else
-		snprintf(conn_opts, sizeof(conn_opts),
-				 "dbname = '%s' user = '%s' port = %d",
-				 db_name, os_info.user, cluster->port);
+	{
+		appendPQExpBufferStr(&conn_opts, " host=");
+		appendConnStrVal(&conn_opts, cluster->sockdir);
+	}
 
-	return PQconnectdb(conn_opts);
+	conn = PQconnectdb(conn_opts.data);
+	termPQExpBuffer(&conn_opts);
+	return conn;
 }
 
 
@@ -74,23 +81,28 @@
  * sets, but the utilities we need aren't very consistent about the treatment
  * of database name options, so we leave that out.
  *
- * Note result is in static storage, so use it right away.
+ * Result is valid until the next call to this function.
  */
 char *
 cluster_conn_opts(ClusterInfo *cluster)
 {
-	static char conn_opts[MAXPGPATH + NAMEDATALEN + 100];
+	static PQExpBuffer buf;
 
-	if (cluster->sockdir)
-		snprintf(conn_opts, sizeof(conn_opts),
-				 "--host \"%s\" --port %d --username \"%s\"",
-				 cluster->sockdir, cluster->port, os_info.user);
+	if (buf == NULL)
+		buf = createPQExpBuffer();
 	else
-		snprintf(conn_opts, sizeof(conn_opts),
-				 "--port %d --username \"%s\"",
-				 cluster->port, os_info.user);
+		resetPQExpBuffer(buf);
 
-	return conn_opts;
+	if (cluster->sockdir)
+	{
+		appendPQExpBufferStr(buf, "--host ");
+		appendShellString(buf, cluster->sockdir);
+		appendPQExpBufferChar(buf, ' ');
+	}
+	appendPQExpBuffer(buf, "--port %d --username ", cluster->port);
+	appendShellString(buf, os_info.user);
+
+	return buf->data;
 }
 
 
@@ -174,10 +186,11 @@
 {
 	char		cmd[MAXPGPATH * 4 + 1000];
 	PGconn	   *conn;
-	bool		exit_hook_registered = false;
 	bool		pg_ctl_return = false;
 	char		socket_string[MAXPGPATH + 200];
 
+	static bool exit_hook_registered = false;
+
 	if (!exit_hook_registered)
 	{
 		atexit(stop_postmaster_atexit);
@@ -306,7 +319,7 @@
 			  "\"%s/pg_ctl\" -w -D \"%s\" -o \"%s\" %s stop",
 			  cluster->bindir, cluster->pgconfig,
 			  cluster->pgopts ? cluster->pgopts : "",
-			  fast ? "-m fast" : "");
+			  fast ? "-m fast" : "-m smart");
 
 	os_info.running_cluster = NULL;
 }
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_upgrade/test.sh postgresql-9.5-9.5.8/src/bin/pg_upgrade/test.sh
--- postgresql-9.5-9.5.2/src/bin/pg_upgrade/test.sh	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_upgrade/test.sh	2017-08-07 21:13:41.000000000 +0000
@@ -153,6 +153,20 @@
 
 standard_initdb "$oldbindir"/initdb
 "$oldbindir"/pg_ctl start -l "$logdir/postmaster1.log" -o "$POSTMASTER_OPTS" -w
+
+# Create databases with names covering the ASCII bytes other than NUL, BEL,
+# LF, or CR.  BEL would ring the terminal bell in the course of this test, and
+# it is not otherwise a special case.  PostgreSQL doesn't support the rest.
+dbname1=`awk 'BEGIN { for (i= 1; i < 46; i++)
+	if (i != 7 && i != 10 && i != 13) printf "%c", i }' </dev/null`
+# Exercise backslashes adjacent to double quotes, a Windows special case.
+dbname1='\"\'$dbname1'\\"\\\'
+dbname2=`awk 'BEGIN { for (i = 46; i <  91; i++) printf "%c", i }' </dev/null`
+dbname3=`awk 'BEGIN { for (i = 91; i < 128; i++) printf "%c", i }' </dev/null`
+createdb "$dbname1" || createdb_status=$?
+createdb "$dbname2" || createdb_status=$?
+createdb "$dbname3" || createdb_status=$?
+
 if "$MAKE" -C "$oldsrc" installcheck; then
 	pg_dumpall -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
 	if [ "$newsrc" != "$oldsrc" ]; then
@@ -178,6 +192,9 @@
 	make_installcheck_status=$?
 fi
 "$oldbindir"/pg_ctl -m fast stop
+if [ -n "$createdb_status" ]; then
+	exit 1
+fi
 if [ -n "$make_installcheck_status" ]; then
 	exit 1
 fi
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_upgrade/util.c postgresql-9.5-9.5.8/src/bin/pg_upgrade/util.c
--- postgresql-9.5-9.5.2/src/bin/pg_upgrade/util.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_upgrade/util.c	2017-08-07 21:13:41.000000000 +0000
@@ -89,7 +89,7 @@
 {
 	char		message[QUERY_ALLOC];
 
-	vsnprintf(message, sizeof(message), fmt, ap);
+	vsnprintf(message, sizeof(message), _(fmt), ap);
 
 	/* PG_VERBOSE and PG_STATUS are only output in verbose mode */
 	/* fopen() on log_opts.internal might have failed, so check it */
@@ -108,7 +108,7 @@
 	{
 		case PG_VERBOSE:
 			if (log_opts.verbose)
-				printf("%s", _(message));
+				printf("%s", message);
 			break;
 
 		case PG_STATUS:
@@ -123,16 +123,16 @@
 					   strlen(message) <= MESSAGE_WIDTH - 2 ? message :
 					   message + strlen(message) - MESSAGE_WIDTH + 3 + 2);
 			else
-				printf("  %s\n", _(message));
+				printf("  %s\n", message);
 			break;
 
 		case PG_REPORT:
 		case PG_WARNING:
-			printf("%s", _(message));
+			printf("%s", message);
 			break;
 
 		case PG_FATAL:
-			printf("\n%s", _(message));
+			printf("\n%s", message);
 			printf("Failure, exiting\n");
 			exit(1);
 			break;
@@ -205,6 +205,210 @@
 }
 
 
+/*
+ * Append the given string to the shell command being built in the buffer,
+ * with suitable shell-style quoting to create exactly one argument.
+ *
+ * Forbid LF or CR characters, which have scant practical use beyond designing
+ * security breaches.  The Windows command shell is unusable as a conduit for
+ * arguments containing LF or CR characters.  A future major release should
+ * reject those characters in CREATE ROLE and CREATE DATABASE, because use
+ * there eventually leads to errors here.
+ */
+void
+appendShellString(PQExpBuffer buf, const char *str)
+{
+	const char *p;
+
+#ifndef WIN32
+	appendPQExpBufferChar(buf, '\'');
+	for (p = str; *p; p++)
+	{
+		if (*p == '\n' || *p == '\r')
+		{
+			fprintf(stderr,
+					_("shell command argument contains a newline or carriage return: \"%s\"\n"),
+					str);
+			exit(EXIT_FAILURE);
+		}
+
+		if (*p == '\'')
+			appendPQExpBufferStr(buf, "'\"'\"'");
+		else
+			appendPQExpBufferChar(buf, *p);
+	}
+	appendPQExpBufferChar(buf, '\'');
+#else							/* WIN32 */
+	int			backslash_run_length = 0;
+
+	/*
+	 * A Windows system() argument experiences two layers of interpretation.
+	 * First, cmd.exe interprets the string.  Its behavior is undocumented,
+	 * but a caret escapes any byte except LF or CR that would otherwise have
+	 * special meaning.  Handling of a caret before LF or CR differs between
+	 * "cmd.exe /c" and other modes, and it is unusable here.
+	 *
+	 * Second, the new process parses its command line to construct argv (see
+	 * https://msdn.microsoft.com/en-us/library/17w5ykft.aspx).  This treats
+	 * backslash-double quote sequences specially.
+	 */
+	appendPQExpBufferStr(buf, "^\"");
+	for (p = str; *p; p++)
+	{
+		if (*p == '\n' || *p == '\r')
+		{
+			fprintf(stderr,
+					_("shell command argument contains a newline or carriage return: \"%s\"\n"),
+					str);
+			exit(EXIT_FAILURE);
+		}
+
+		/* Change N backslashes before a double quote to 2N+1 backslashes. */
+		if (*p == '"')
+		{
+			while (backslash_run_length)
+			{
+				appendPQExpBufferStr(buf, "^\\");
+				backslash_run_length--;
+			}
+			appendPQExpBufferStr(buf, "^\\");
+		}
+		else if (*p == '\\')
+			backslash_run_length++;
+		else
+			backslash_run_length = 0;
+
+		/*
+		 * Decline to caret-escape the most mundane characters, to ease
+		 * debugging and lest we approach the command length limit.
+		 */
+		if (!((*p >= 'a' && *p <= 'z') ||
+			  (*p >= 'A' && *p <= 'Z') ||
+			  (*p >= '0' && *p <= '9')))
+			appendPQExpBufferChar(buf, '^');
+		appendPQExpBufferChar(buf, *p);
+	}
+
+	/*
+	 * Change N backslashes at end of argument to 2N backslashes, because they
+	 * precede the double quote that terminates the argument.
+	 */
+	while (backslash_run_length)
+	{
+		appendPQExpBufferStr(buf, "^\\");
+		backslash_run_length--;
+	}
+	appendPQExpBufferStr(buf, "^\"");
+#endif   /* WIN32 */
+}
+
+
+/*
+ * Append the given string to the buffer, with suitable quoting for passing
+ * the string as a value, in a keyword/pair value in a libpq connection
+ * string
+ */
+void
+appendConnStrVal(PQExpBuffer buf, const char *str)
+{
+	const char *s;
+	bool		needquotes;
+
+	/*
+	 * If the string is one or more plain ASCII characters, no need to quote
+	 * it. This is quite conservative, but better safe than sorry.
+	 */
+	needquotes = true;
+	for (s = str; *s; s++)
+	{
+		if (!((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') ||
+			  (*s >= '0' && *s <= '9') || *s == '_' || *s == '.'))
+		{
+			needquotes = true;
+			break;
+		}
+		needquotes = false;
+	}
+
+	if (needquotes)
+	{
+		appendPQExpBufferChar(buf, '\'');
+		while (*str)
+		{
+			/* ' and \ must be escaped by to \' and \\ */
+			if (*str == '\'' || *str == '\\')
+				appendPQExpBufferChar(buf, '\\');
+
+			appendPQExpBufferChar(buf, *str);
+			str++;
+		}
+		appendPQExpBufferChar(buf, '\'');
+	}
+	else
+		appendPQExpBufferStr(buf, str);
+}
+
+
+/*
+ * Append a psql meta-command that connects to the given database with the
+ * then-current connection's user, host and port.
+ */
+void
+appendPsqlMetaConnect(PQExpBuffer buf, const char *dbname)
+{
+	const char *s;
+	bool		complex;
+
+	/*
+	 * If the name is plain ASCII characters, emit a trivial "\connect "foo"".
+	 * For other names, even many not technically requiring it, skip to the
+	 * general case.  No database has a zero-length name.
+	 */
+	complex = false;
+	for (s = dbname; *s; s++)
+	{
+		if (*s == '\n' || *s == '\r')
+		{
+			fprintf(stderr,
+					_("database name contains a newline or carriage return: \"%s\"\n"),
+					dbname);
+			exit(EXIT_FAILURE);
+		}
+
+		if (!((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') ||
+			  (*s >= '0' && *s <= '9') || *s == '_' || *s == '.'))
+		{
+			complex = true;
+		}
+	}
+
+	appendPQExpBufferStr(buf, "\\connect ");
+	if (complex)
+	{
+		PQExpBufferData connstr;
+
+		initPQExpBuffer(&connstr);
+		appendPQExpBuffer(&connstr, "dbname=");
+		appendConnStrVal(&connstr, dbname);
+
+		appendPQExpBuffer(buf, "-reuse-previous=on ");
+
+		/*
+		 * As long as the name does not contain a newline, SQL identifier
+		 * quoting satisfies the psql meta-command parser.  Prefer not to
+		 * involve psql-interpreted single quotes, which behaved differently
+		 * before PostgreSQL 9.2.
+		 */
+		appendPQExpBufferStr(buf, quote_identifier(connstr.data));
+
+		termPQExpBuffer(&connstr);
+	}
+	else
+		appendPQExpBufferStr(buf, quote_identifier(dbname));
+	appendPQExpBufferChar(buf, '\n');
+}
+
+
 /*
  * get_user_info()
  */
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_upgrade/version.c postgresql-9.5-9.5.8/src/bin/pg_upgrade/version.c
--- postgresql-9.5-9.5.2/src/bin/pg_upgrade/version.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_upgrade/version.c	2017-08-07 21:13:41.000000000 +0000
@@ -48,10 +48,16 @@
 			found = true;
 			if (!check_mode)
 			{
+				PQExpBufferData connectbuf;
+
 				if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)
 					pg_fatal("could not open file \"%s\": %s\n", output_path, getErrorText());
-				fprintf(script, "\\connect %s\n",
-						quote_identifier(active_db->db_name));
+
+				initPQExpBuffer(&connectbuf);
+				appendPsqlMetaConnect(&connectbuf, active_db->db_name);
+				fputs(connectbuf.data, script);
+				termPQExpBuffer(&connectbuf);
+
 				fprintf(script,
 						"SELECT pg_catalog.lo_create(t.loid)\n"
 						"FROM (SELECT DISTINCT loid FROM pg_catalog.pg_largeobject) AS t;\n");
diff -Nru postgresql-9.5-9.5.2/src/bin/pg_xlogdump/pg_xlogdump.c postgresql-9.5-9.5.8/src/bin/pg_xlogdump/pg_xlogdump.c
--- postgresql-9.5-9.5.2/src/bin/pg_xlogdump/pg_xlogdump.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/pg_xlogdump/pg_xlogdump.c	2017-08-07 21:13:41.000000000 +0000
@@ -249,6 +249,7 @@
 		if (sendFile < 0 || !XLByteInSeg(recptr, sendSegNo))
 		{
 			char		fname[MAXFNAMELEN];
+			int			tries;
 
 			/* Switch to another logfile segment */
 			if (sendFile >= 0)
@@ -258,7 +259,30 @@
 
 			XLogFileName(fname, timeline_id, sendSegNo);
 
-			sendFile = fuzzy_open_file(directory, fname);
+			/*
+			 * In follow mode there is a short period of time after the
+			 * server has written the end of the previous file before the
+			 * new file is available. So we loop for 5 seconds looking
+			 * for the file to appear before giving up.
+			 */
+			for (tries = 0; tries < 10; tries++)
+			{
+				sendFile = fuzzy_open_file(directory, fname);
+				if (sendFile >= 0)
+					break;
+				if (errno == ENOENT)
+				{
+					int			save_errno = errno;
+
+					/* File not there yet, try again */
+					pg_usleep(500 * 1000);
+
+					errno = save_errno;
+					continue;
+				}
+				/* Any other error, fall through and fail */
+				break;
+			}
 
 			if (sendFile < 0)
 				fatal_error("could not find file \"%s\": %s",
@@ -339,23 +363,13 @@
 }
 
 /*
- * Store per-rmgr and per-record statistics for a given record.
+ * Calculate the size of a record, split into !FPI and FPI parts.
  */
 static void
-XLogDumpCountRecord(XLogDumpConfig *config, XLogDumpStats *stats,
-					XLogReaderState *record)
+XLogDumpRecordLen(XLogReaderState *record, uint32 *rec_len, uint32 *fpi_len)
 {
-	RmgrId		rmid;
-	uint8		recid;
-	uint32		rec_len;
-	uint32		fpi_len;
 	int			block_id;
 
-	stats->count++;
-
-	rmid = XLogRecGetRmid(record);
-	rec_len = XLogRecGetDataLen(record) + SizeOfXLogRecord;
-
 	/*
 	 * Calculate the amount of FPI data in the record.
 	 *
@@ -363,13 +377,38 @@
 	 * bimg_len indicating the length of FPI data. It doesn't seem worth it to
 	 * add an accessor macro for this.
 	 */
-	fpi_len = 0;
+	*fpi_len = 0;
 	for (block_id = 0; block_id <= record->max_block_id; block_id++)
 	{
 		if (XLogRecHasBlockImage(record, block_id))
-			fpi_len += record->blocks[block_id].bimg_len;
+			*fpi_len += record->blocks[block_id].bimg_len;
 	}
 
+	/*
+	 * Calculate the length of the record as the total length - the length of
+	 * all the block images.
+	 */
+	*rec_len = XLogRecGetTotalLen(record) - *fpi_len;
+}
+
+/*
+ * Store per-rmgr and per-record statistics for a given record.
+ */
+static void
+XLogDumpCountRecord(XLogDumpConfig *config, XLogDumpStats *stats,
+					XLogReaderState *record)
+{
+	RmgrId		rmid;
+	uint8		recid;
+	uint32		rec_len;
+	uint32		fpi_len;
+
+	stats->count++;
+
+	rmid = XLogRecGetRmid(record);
+
+	XLogDumpRecordLen(record, &rec_len, &fpi_len);
+
 	/* Update per-rmgr statistics */
 
 	stats->rmgr_stats[rmid].count++;
@@ -398,6 +437,8 @@
 {
 	const char *id;
 	const RmgrDescData *desc = &RmgrDescTable[XLogRecGetRmid(record)];
+	uint32		rec_len;
+	uint32		fpi_len;
 	RelFileNode rnode;
 	ForkNumber	forknum;
 	BlockNumber blk;
@@ -405,13 +446,15 @@
 	uint8		info = XLogRecGetInfo(record);
 	XLogRecPtr	xl_prev = XLogRecGetPrev(record);
 
+	XLogDumpRecordLen(record, &rec_len, &fpi_len);
+
 	id = desc->rm_identify(info);
 	if (id == NULL)
 		id = psprintf("UNKNOWN (%x)", info & ~XLR_INFO_MASK);
 
 	printf("rmgr: %-11s len (rec/tot): %6u/%6u, tx: %10u, lsn: %X/%08X, prev %X/%08X, ",
 		   desc->rm_name,
-		   XLogRecGetDataLen(record), XLogRecGetTotalLen(record),
+		   rec_len, XLogRecGetTotalLen(record),
 		   XLogRecGetXid(record),
 		   (uint32) (record->ReadRecPtr >> 32), (uint32) record->ReadRecPtr,
 		   (uint32) (xl_prev >> 32), (uint32) xl_prev);
@@ -855,7 +898,7 @@
 		if (!verify_directory(private.inpath))
 		{
 			fprintf(stderr,
-					"%s: path \"%s\" cannot be opened: %s",
+					"%s: path \"%s\" cannot be opened: %s\n",
 					progname, private.inpath, strerror(errno));
 			goto bad_argument;
 		}
@@ -1023,7 +1066,7 @@
 		XLogDumpDisplayStats(&config, &stats);
 
 	if (errormsg)
-		fatal_error("error in WAL record at %X/%X: %s\n",
+		fatal_error("error in WAL record at %X/%X: %s",
 					(uint32) (xlogreader_state->ReadRecPtr >> 32),
 					(uint32) xlogreader_state->ReadRecPtr,
 					errormsg);
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/command.c postgresql-9.5-9.5.8/src/bin/psql/command.c
--- postgresql-9.5-9.5.2/src/bin/psql/command.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/command.c	2017-08-07 21:13:41.000000000 +0000
@@ -56,7 +56,8 @@
 			 PQExpBuffer query_buf);
 static bool do_edit(const char *filename_arg, PQExpBuffer query_buf,
 		int lineno, bool *edited);
-static bool do_connect(char *dbname, char *user, char *host, char *port);
+static bool do_connect(enum trivalue reuse_previous_specification,
+		   char *dbname, char *user, char *host, char *port);
 static bool do_shell(const char *command);
 static bool do_watch(PQExpBuffer query_buf, long sleep);
 static bool lookup_function_oid(const char *desc, Oid *foid);
@@ -217,12 +218,9 @@
 	/*
 	 * \c or \connect -- connect to database using the specified parameters.
 	 *
-	 * \c dbname user host port
+	 * \c [-reuse-previous=BOOL] dbname user host port
 	 *
-	 * If any of these parameters are omitted or specified as '-', the current
-	 * value of the parameter will be used instead. If the parameter has no
-	 * current value, the default value for that parameter will be used. Some
-	 * examples:
+	 * Specifying a parameter as '-' is equivalent to omitting it.  Examples:
 	 *
 	 * \c - - hst		Connect to current database on current port of host
 	 * "hst" as current user. \c - usr - prt   Connect to current database on
@@ -231,17 +229,31 @@
 	 */
 	else if (strcmp(cmd, "c") == 0 || strcmp(cmd, "connect") == 0)
 	{
+		static const char prefix[] = "-reuse-previous=";
 		char	   *opt1,
 				   *opt2,
 				   *opt3,
 				   *opt4;
+		enum trivalue reuse_previous;
 
 		opt1 = read_connect_arg(scan_state);
+		if (opt1 != NULL && strncmp(opt1, prefix, sizeof(prefix) - 1) == 0)
+		{
+			reuse_previous =
+				ParseVariableBool(opt1 + sizeof(prefix) - 1, prefix) ?
+				TRI_YES : TRI_NO;
+
+			free(opt1);
+			opt1 = read_connect_arg(scan_state);
+		}
+		else
+			reuse_previous = TRI_DEFAULT;
+
 		opt2 = read_connect_arg(scan_state);
 		opt3 = read_connect_arg(scan_state);
 		opt4 = read_connect_arg(scan_state);
 
-		success = do_connect(opt1, opt2, opt3, opt4);
+		success = do_connect(reuse_previous, opt1, opt2, opt3, opt4);
 
 		free(opt1);
 		free(opt2);
@@ -596,8 +608,11 @@
 
 		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);
+			char		sverbuf[32];
+
+			psql_error("The server (version %s) does not support editing function source.\n",
+					   formatPGVersionNumber(pset.sversion, false,
+											 sverbuf, sizeof(sverbuf)));
 			status = PSQL_CMD_ERROR;
 		}
 		else if (!query_buf)
@@ -1226,8 +1241,11 @@
 									  OT_WHOLE_LINE, NULL, true);
 		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);
+			char		sverbuf[32];
+
+			psql_error("The server (version %s) does not support showing function source.\n",
+					   formatPGVersionNumber(pset.sversion, false,
+											 sverbuf, sizeof(sverbuf)));
 			status = PSQL_CMD_ERROR;
 		}
 		else if (!func)
@@ -1599,22 +1617,26 @@
 /*
  * do_connect -- handler for \connect
  *
- * Connects to a database with given parameters. If there exists an
- * established connection, NULL values will be replaced with the ones
- * in the current connection. Otherwise NULL will be passed for that
- * parameter to PQconnectdbParams(), so the libpq defaults will be used.
+ * Connects to a database with given parameters. Absent an established
+ * connection, all parameters are required. Given -reuse-previous=off or a
+ * connection string without -reuse-previous=on, NULL values will pass through
+ * to PQconnectdbParams(), so the libpq defaults will be used. Otherwise, NULL
+ * values will be replaced with the ones in the current connection.
  *
  * In interactive mode, if connection fails with the given parameters,
  * the old connection will be kept.
  */
 static bool
-do_connect(char *dbname, char *user, char *host, char *port)
+do_connect(enum trivalue reuse_previous_specification,
+		   char *dbname, char *user, char *host, char *port)
 {
 	PGconn	   *o_conn = pset.db,
 			   *n_conn;
 	char	   *password = NULL;
 	bool		keep_password;
 	bool		has_connection_string;
+	bool		reuse_previous;
+	PQExpBufferData connstr;
 
 	if (!o_conn && (!dbname || !user || !host || !port))
 	{
@@ -1628,17 +1650,36 @@
 		return false;
 	}
 
-	/* grab values from the old connection, unless supplied by caller */
-	if (!user)
+	has_connection_string = dbname ?
+		recognized_connection_string(dbname) : false;
+	switch (reuse_previous_specification)
+	{
+		case TRI_YES:
+			reuse_previous = true;
+			break;
+		case TRI_NO:
+			reuse_previous = false;
+			break;
+		default:
+			reuse_previous = !has_connection_string;
+			break;
+	}
+	/* Silently ignore arguments subsequent to a connection string. */
+	if (has_connection_string)
+	{
+		user = NULL;
+		host = NULL;
+		port = NULL;
+	}
+
+	/* grab missing values from the old connection */
+	if (!user && reuse_previous)
 		user = PQuser(o_conn);
-	if (!host)
+	if (!host && reuse_previous)
 		host = PQhost(o_conn);
-	if (!port)
+	if (!port && reuse_previous)
 		port = PQport(o_conn);
 
-	has_connection_string =
-		dbname ? recognized_connection_string(dbname) : false;
-
 	/*
 	 * Any change in the parameters read above makes us discard the password.
 	 * We also discard it if we're to use a conninfo rather than the
@@ -1655,11 +1696,19 @@
 			(port && PQport(o_conn) && strcmp(port, PQport(o_conn)) == 0);
 
 	/*
-	 * Grab dbname from old connection unless supplied by caller.  No password
-	 * discard if this changes: passwords aren't (usually) database-specific.
+	 * Grab missing dbname from old connection.  No password discard if this
+	 * changes: passwords aren't (usually) database-specific.
 	 */
-	if (!dbname)
-		dbname = PQdb(o_conn);
+	if (!dbname && reuse_previous)
+	{
+		initPQExpBuffer(&connstr);
+		appendPQExpBuffer(&connstr, "dbname=");
+		appendConnStrVal(&connstr, PQdb(o_conn));
+		dbname = connstr.data;
+		/* has_connection_string=true would be a dead store */
+	}
+	else
+		connstr.data = NULL;
 
 	/*
 	 * If the user asked to be prompted for a password, ask for one now. If
@@ -1689,20 +1738,27 @@
 #define PARAMS_ARRAY_SIZE	8
 		const char **keywords = pg_malloc(PARAMS_ARRAY_SIZE * sizeof(*keywords));
 		const char **values = pg_malloc(PARAMS_ARRAY_SIZE * sizeof(*values));
-		int			paramnum = 0;
+		int			paramnum = -1;
 
-		keywords[0] = "dbname";
-		values[0] = dbname;
+		keywords[++paramnum] = "host";
+		values[paramnum] = host;
+		keywords[++paramnum] = "port";
+		values[paramnum] = port;
+		keywords[++paramnum] = "user";
+		values[paramnum] = user;
 
-		if (!has_connection_string)
-		{
-			keywords[++paramnum] = "host";
-			values[paramnum] = host;
-			keywords[++paramnum] = "port";
-			values[paramnum] = port;
-			keywords[++paramnum] = "user";
-			values[paramnum] = user;
-		}
+		/*
+		 * Position in the array matters when the dbname is a connection
+		 * string, because settings in a connection string override earlier
+		 * array entries only.  Thus, user= in the connection string always
+		 * takes effect, but client_encoding= often will not.
+		 *
+		 * If you change this code, also change the initial-connection code in
+		 * main().  For no good reason, a connection string password= takes
+		 * precedence in main() but not here.
+		 */
+		keywords[++paramnum] = "dbname";
+		values[paramnum] = dbname;
 		keywords[++paramnum] = "password";
 		values[paramnum] = password;
 		keywords[++paramnum] = "fallback_application_name";
@@ -1761,8 +1817,12 @@
 		}
 
 		PQfinish(n_conn);
+		if (connstr.data)
+			termPQExpBuffer(&connstr);
 		return false;
 	}
+	if (connstr.data)
+		termPQExpBuffer(&connstr);
 
 	/*
 	 * Replace the old connection with the new one, and update
@@ -1809,22 +1869,21 @@
 	if (!pset.quiet && !pset.notty)
 	{
 		int			client_ver = PG_VERSION_NUM;
+		char		cverbuf[32];
+		char		sverbuf[32];
 
 		if (pset.sversion != client_ver)
 		{
 			const char *server_version;
-			char		server_ver_str[16];
 
 			/* Try to get full text form, might include "devel" etc */
 			server_version = PQparameterStatus(pset.db, "server_version");
+			/* Otherwise fall back on pset.sversion */
 			if (!server_version)
 			{
-				snprintf(server_ver_str, sizeof(server_ver_str),
-						 "%d.%d.%d",
-						 pset.sversion / 10000,
-						 (pset.sversion / 100) % 100,
-						 pset.sversion % 100);
-				server_version = server_ver_str;
+				formatPGVersionNumber(pset.sversion, true,
+									  sverbuf, sizeof(sverbuf));
+				server_version = sverbuf;
 			}
 
 			printf(_("%s (%s, server %s)\n"),
@@ -1835,10 +1894,13 @@
 			printf("%s (%s)\n", pset.progname, PG_VERSION);
 
 		if (pset.sversion / 100 > client_ver / 100)
-			printf(_("WARNING: %s major version %d.%d, server major version %d.%d.\n"
+			printf(_("WARNING: %s major version %s, server major version %s.\n"
 					 "         Some psql features might not work.\n"),
-				 pset.progname, client_ver / 10000, (client_ver / 100) % 100,
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+				   pset.progname,
+				   formatPGVersionNumber(client_ver, false,
+										 cverbuf, sizeof(cverbuf)),
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 
 #ifdef WIN32
 		checkWin32Codepage();
@@ -2943,7 +3005,7 @@
 do_watch(PQExpBuffer query_buf, long sleep)
 {
 	printQueryOpt myopt = pset.popt;
-	char		title[50];
+	char		title[256];
 
 	if (!query_buf || query_buf->len <= 0)
 	{
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/common.c postgresql-9.5-9.5.8/src/bin/psql/common.c
--- postgresql-9.5-9.5.2/src/bin/psql/common.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/common.c	2017-08-07 21:13:41.000000000 +0000
@@ -23,6 +23,7 @@
 #include "settings.h"
 #include "command.h"
 #include "copy.h"
+#include "dumputils.h"
 #include "mbprint.h"
 
 
@@ -175,8 +176,18 @@
 static CRITICAL_SECTION cancelConnLock;
 #endif
 
-/* Used from signal handlers, no buffering */
-#define write_stderr(str)	write(fileno(stderr), str, strlen(str))
+/*
+ * Write a simple string to stderr --- must be safe in a signal handler.
+ * We ignore the write() result since there's not much we could do about it.
+ * Certain compilers make that harder than it ought to be.
+ */
+#define write_stderr(str) \
+	do { \
+		const char *str_ = (str); \
+		int		rc_; \
+		rc_ = write(fileno(stderr), str_, strlen(str_)); \
+		(void) rc_; \
+	} while (0)
 
 
 #ifndef WIN32
@@ -185,7 +196,6 @@
 handle_sigint(SIGNAL_ARGS)
 {
 	int			save_errno = errno;
-	int			rc;
 	char		errbuf[256];
 
 	/* if we are waiting for input, longjmp out of it */
@@ -202,16 +212,11 @@
 	if (cancelConn != NULL)
 	{
 		if (PQcancel(cancelConn, errbuf, sizeof(errbuf)))
-		{
-			rc = write_stderr("Cancel request sent\n");
-			(void) rc;			/* ignore errors, nothing we can do here */
-		}
+			write_stderr("Cancel request sent\n");
 		else
 		{
-			rc = write_stderr("Could not send cancel request: ");
-			(void) rc;			/* ignore errors, nothing we can do here */
-			rc = write_stderr(errbuf);
-			(void) rc;			/* ignore errors, nothing we can do here */
+			write_stderr("Could not send cancel request: ");
+			write_stderr(errbuf);
 		}
 	}
 
@@ -684,7 +689,7 @@
 			char	   *varname;
 			char	   *value;
 
-			/* concate prefix and column name */
+			/* concatenate prefix and column name */
 			varname = psprintf("%s%s", pset.gset_prefix, colname);
 
 			if (!PQgetisnull(result, 0, i))
@@ -1033,8 +1038,11 @@
 	{
 		if (on_error_rollback_warning == false && pset.sversion < 80000)
 		{
-			psql_error("The server (version %d.%d) does not support savepoints for ON_ERROR_ROLLBACK.\n",
-					   pset.sversion / 10000, (pset.sversion / 100) % 100);
+			char		sverbuf[32];
+
+			psql_error("The server (version %s) does not support savepoints for ON_ERROR_ROLLBACK.\n",
+					   formatPGVersionNumber(pset.sversion, false,
+											 sverbuf, sizeof(sverbuf)));
 			on_error_rollback_warning = true;
 		}
 		else
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/copy.c postgresql-9.5-9.5.8/src/bin/psql/copy.c
--- postgresql-9.5-9.5.2/src/bin/psql/copy.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/copy.c	2017-08-07 21:13:41.000000000 +0000
@@ -539,7 +539,7 @@
 		showprompt = true;
 		if (!pset.quiet)
 			puts(_("Enter data to be copied followed by a newline.\n"
-				   "End with a backslash and a period on a line by itself."));
+				   "End with a backslash and a period on a line by itself, or an EOF signal."));
 	}
 	else
 		showprompt = false;
@@ -673,6 +673,16 @@
 copyin_cleanup:
 
 	/*
+	 * Clear the EOF flag on the stream, in case copying ended due to an EOF
+	 * signal.  This allows an interactive TTY session to perform another COPY
+	 * FROM STDIN later.  (In non-STDIN cases, we're about to close the file
+	 * anyway, so it doesn't matter.)  Although we don't ever test the flag
+	 * with feof(), some fread() implementations won't read more data if it's
+	 * set.  This also clears the error flag, but we already checked that.
+	 */
+	clearerr(copystream);
+
+	/*
 	 * Check command status and return to normal libpq state.
 	 *
 	 * We do not want to return with the status still PGRES_COPY_IN: our
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/describe.c postgresql-9.5-9.5.8/src/bin/psql/describe.c
--- postgresql-9.5-9.5.2/src/bin/psql/describe.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/describe.c	2017-08-07 21:13:41.000000000 +0000
@@ -141,8 +141,11 @@
 
 	if (pset.sversion < 80000)
 	{
-		psql_error("The server (version %d.%d) does not support tablespaces.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support tablespaces.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -244,8 +247,11 @@
 
 	if (showWindow && pset.sversion < 80400)
 	{
-		psql_error("\\df does not take a \"w\" option with server version %d.%d\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("\\df does not take a \"w\" option with server version %s\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -870,8 +876,11 @@
 
 	if (pset.sversion < 90000)
 	{
-		psql_error("The server (version %d.%d) does not support altering default privileges.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support altering default privileges.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -1449,8 +1458,8 @@
 		appendPQExpBufferStr(&buf, ",\n  NULL AS indexdef");
 	if (tableinfo.relkind == 'f' && pset.sversion >= 90200)
 		appendPQExpBufferStr(&buf, ",\n  CASE WHEN attfdwoptions IS NULL THEN '' ELSE "
-							 "  '(' || array_to_string(ARRAY(SELECT quote_ident(option_name) ||  ' ' || quote_literal(option_value)  FROM "
-							 "  pg_options_to_table(attfdwoptions)), ', ') || ')' END AS attfdwoptions");
+							 "  '(' || 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(attfdwoptions)), ', ') || ')' END AS attfdwoptions");
 	else
 		appendPQExpBufferStr(&buf, ",\n  NULL AS attfdwoptions");
 	if (verbose)
@@ -1800,7 +1809,7 @@
 						  "\n a.attnum=d.refobjsubid)"
 			   "\nWHERE d.classid='pg_catalog.pg_class'::pg_catalog.regclass"
 			 "\n AND d.refclassid='pg_catalog.pg_class'::pg_catalog.regclass"
-						  "\n AND d.objid=%s"
+						  "\n AND d.objid='%s'"
 						  "\n AND d.deptype='a'",
 						  oid);
 
@@ -1956,7 +1965,7 @@
 				printTableAddFooter(&cont, _("Check constraints:"));
 				for (i = 0; i < tuples; i++)
 				{
-					/* untranslated contraint name and def */
+					/* untranslated constraint name and def */
 					printfPQExpBuffer(&buf, "    \"%s\" %s",
 									  PQgetvalue(result, i, 0),
 									  PQgetvalue(result, i, 1));
@@ -2034,7 +2043,7 @@
 		{
 			printfPQExpBuffer(&buf,
 							  "SELECT pol.polname,\n"
-							  "CASE WHEN pol.polroles = '{0}' THEN NULL ELSE array_to_string(array(select rolname from pg_roles where oid = any (pol.polroles) order by 1),',') END,\n"
+							  "CASE WHEN pol.polroles = '{0}' THEN NULL ELSE pg_catalog.array_to_string(array(select rolname from pg_catalog.pg_roles where oid = any (pol.polroles) order by 1),',') END,\n"
 					   "pg_catalog.pg_get_expr(pol.polqual, pol.polrelid),\n"
 				  "pg_catalog.pg_get_expr(pol.polwithcheck, pol.polrelid),\n"
 							  "CASE pol.polcmd \n"
@@ -2394,13 +2403,13 @@
 			/* Footer information about foreign table */
 			printfPQExpBuffer(&buf,
 							  "SELECT s.srvname,\n"
-							  "       array_to_string(ARRAY(SELECT "
-							  "       quote_ident(option_name) ||  ' ' || "
-							  "       quote_literal(option_value)  FROM "
-							"       pg_options_to_table(ftoptions)),  ', ') "
+							  "  pg_catalog.array_to_string(ARRAY(\n"
+							  "    SELECT pg_catalog.quote_ident(option_name)"
+							  " || ' ' || pg_catalog.quote_literal(option_value)\n"
+							  "    FROM pg_catalog.pg_options_to_table(ftoptions)),  ', ')\n"
 							  "FROM pg_catalog.pg_foreign_table f,\n"
 							  "     pg_catalog.pg_foreign_server s\n"
-							  "WHERE f.ftrelid = %s AND s.oid = f.ftserver;",
+							  "WHERE f.ftrelid = '%s' AND s.oid = f.ftserver;",
 							  oid);
 			result = PSQLexec(buf.data);
 			if (!result)
@@ -2412,7 +2421,7 @@
 			}
 
 			/* Print server name */
-			printfPQExpBuffer(&buf, "Server: %s",
+			printfPQExpBuffer(&buf, _("Server: %s"),
 							  PQgetvalue(result, 0, 0));
 			printTableAddFooter(&cont, buf.data);
 
@@ -2420,7 +2429,7 @@
 			ftoptions = PQgetvalue(result, 0, 1);
 			if (ftoptions && ftoptions[0] != '\0')
 			{
-				printfPQExpBuffer(&buf, "FDW Options: (%s)", ftoptions);
+				printfPQExpBuffer(&buf, _("FDW Options: (%s)"), ftoptions);
 				printTableAddFooter(&cont, buf.data);
 			}
 			PQclear(result);
@@ -2828,16 +2837,16 @@
 
 		printfPQExpBuffer(&buf, "SELECT rolname AS \"%s\", datname AS \"%s\",\n"
 				  "pg_catalog.array_to_string(setconfig, E'\\n') AS \"%s\"\n"
-						  "FROM pg_db_role_setting AS s\n"
-				   "LEFT JOIN pg_database ON pg_database.oid = setdatabase\n"
-						  "LEFT JOIN pg_roles ON pg_roles.oid = setrole\n",
+						  "FROM pg_catalog.pg_db_role_setting s\n"
+						  "LEFT JOIN pg_catalog.pg_database d ON d.oid = setdatabase\n"
+						  "LEFT JOIN pg_catalog.pg_roles r ON r.oid = setrole\n",
 						  gettext_noop("Role"),
 						  gettext_noop("Database"),
 						  gettext_noop("Settings"));
 		havewhere = processSQLNamePattern(pset.db, &buf, pattern, false, false,
-									   NULL, "pg_roles.rolname", NULL, NULL);
+										  NULL, "r.rolname", NULL, NULL);
 		processSQLNamePattern(pset.db, &buf, pattern2, havewhere, false,
-							  NULL, "pg_database.datname", NULL, NULL);
+							  NULL, "d.datname", NULL, NULL);
 		appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
 	}
 	else
@@ -2886,7 +2895,6 @@
  * s - sequences
  * E - foreign table (Note: different from 'f', the relkind value)
  * (any order of the above is fine)
- * If tabtypes is empty, we default to \dtvsE.
  */
 bool
 listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSystem)
@@ -2903,6 +2911,7 @@
 	printQueryOpt myopt = pset.popt;
 	static const bool translate_columns[] = {false, false, true, false, false, false, false};
 
+	/* If tabtypes is empty, we default to \dtvmsE (but see also command.c) */
 	if (!(showTables || showIndexes || showViews || showMatViews || showSeq || showForeign))
 		showTables = showViews = showMatViews = showSeq = showForeign = true;
 
@@ -2945,7 +2954,7 @@
 	if (verbose)
 	{
 		/*
-		 * As of PostgreSQL 9.0, use pg_table_size() to show a more acurate
+		 * As of PostgreSQL 9.0, use pg_table_size() to show a more accurate
 		 * size of a table, including FSM, VM and TOAST tables.
 		 */
 		if (pset.sversion >= 90000)
@@ -3066,13 +3075,13 @@
 	{
 		appendPQExpBuffer(&buf,
 						  ",\n       NOT l.lanispl AS \"%s\",\n"
-						  "       l.lanplcallfoid::regprocedure AS \"%s\",\n"
-				   "       l.lanvalidator::regprocedure AS \"%s\",\n       ",
+						  "       l.lanplcallfoid::pg_catalog.regprocedure AS \"%s\",\n"
+						  "       l.lanvalidator::pg_catalog.regprocedure AS \"%s\",\n       ",
 						  gettext_noop("Internal Language"),
 						  gettext_noop("Call Handler"),
 						  gettext_noop("Validator"));
 		if (pset.sversion >= 90000)
-			appendPQExpBuffer(&buf, "l.laninline::regprocedure AS \"%s\",\n       ",
+			appendPQExpBuffer(&buf, "l.laninline::pg_catalog.regprocedure AS \"%s\",\n       ",
 							  gettext_noop("Inline Handler"));
 		printACLColumn(&buf, "l.lanacl");
 	}
@@ -3453,8 +3462,11 @@
 
 	if (pset.sversion < 90100)
 	{
-		psql_error("The server (version %d.%d) does not support collations.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support collations.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -3585,8 +3597,11 @@
 
 	if (pset.sversion < 80300)
 	{
-		psql_error("The server (version %d.%d) does not support full text search.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support full text search.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -3820,8 +3835,11 @@
 
 	if (pset.sversion < 80300)
 	{
-		psql_error("The server (version %d.%d) does not support full text search.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support full text search.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -3888,8 +3906,11 @@
 
 	if (pset.sversion < 80300)
 	{
-		psql_error("The server (version %d.%d) does not support full text search.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support full text search.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -3956,8 +3977,11 @@
 
 	if (pset.sversion < 80300)
 	{
-		psql_error("The server (version %d.%d) does not support full text search.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support full text search.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -4154,8 +4178,11 @@
 
 	if (pset.sversion < 80400)
 	{
-		psql_error("The server (version %d.%d) does not support foreign-data wrappers.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support foreign-data wrappers.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -4179,10 +4206,10 @@
 		printACLColumn(&buf, "fdwacl");
 		appendPQExpBuffer(&buf,
 						  ",\n CASE WHEN fdwoptions IS NULL THEN '' ELSE "
-						  "  '(' || array_to_string(ARRAY(SELECT "
-						  "  quote_ident(option_name) ||  ' ' || "
-						  "  quote_literal(option_value)  FROM "
-						  "  pg_options_to_table(fdwoptions)),  ', ') || ')' "
+						  "  '(' || 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(fdwoptions)),  ', ') || ')' "
 						  "  END AS \"%s\"",
 						  gettext_noop("FDW Options"));
 
@@ -4234,8 +4261,11 @@
 
 	if (pset.sversion < 80400)
 	{
-		psql_error("The server (version %d.%d) does not support foreign servers.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support foreign servers.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -4257,10 +4287,10 @@
 						  "  s.srvtype AS \"%s\",\n"
 						  "  s.srvversion AS \"%s\",\n"
 						  "  CASE WHEN srvoptions IS NULL THEN '' ELSE "
-						  "  '(' || array_to_string(ARRAY(SELECT "
-						  "  quote_ident(option_name) ||  ' ' || "
-						  "  quote_literal(option_value)  FROM "
-						  "  pg_options_to_table(srvoptions)),  ', ') || ')' "
+						  "  '(' || 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(srvoptions)),  ', ') || ')' "
 						  "  END AS \"%s\",\n"
 						  "  d.description AS \"%s\"",
 						  gettext_noop("Type"),
@@ -4275,7 +4305,7 @@
 
 	if (verbose)
 		appendPQExpBufferStr(&buf,
-							 "LEFT JOIN pg_description d\n       "
+							 "LEFT JOIN pg_catalog.pg_description d\n       "
 						   "ON d.classoid = s.tableoid AND d.objoid = s.oid "
 							 "AND d.objsubid = 0\n");
 
@@ -4313,8 +4343,11 @@
 
 	if (pset.sversion < 80400)
 	{
-		psql_error("The server (version %d.%d) does not support user mappings.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support user mappings.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -4328,10 +4361,10 @@
 	if (verbose)
 		appendPQExpBuffer(&buf,
 						  ",\n CASE WHEN umoptions IS NULL THEN '' ELSE "
-						  "  '(' || array_to_string(ARRAY(SELECT "
-						  "  quote_ident(option_name) ||  ' ' || "
-						  "  quote_literal(option_value)  FROM "
-						  "  pg_options_to_table(umoptions)),  ', ') || ')' "
+						  "  '(' || 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(umoptions)),  ', ') || ')' "
 						  "  END AS \"%s\"",
 						  gettext_noop("FDW Options"));
 
@@ -4371,8 +4404,11 @@
 
 	if (pset.sversion < 90100)
 	{
-		psql_error("The server (version %d.%d) does not support foreign tables.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support foreign tables.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -4388,10 +4424,10 @@
 	if (verbose)
 		appendPQExpBuffer(&buf,
 						  ",\n CASE WHEN ftoptions IS NULL THEN '' ELSE "
-						  "  '(' || array_to_string(ARRAY(SELECT "
-						  "  quote_ident(option_name) ||  ' ' || "
-						  "  quote_literal(option_value)  FROM "
-						  "  pg_options_to_table(ftoptions)),  ', ') || ')' "
+						  "  '(' || 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)),  ', ') || ')' "
 						  "  END AS \"%s\",\n"
 						  "  d.description AS \"%s\"",
 						  gettext_noop("FDW Options"),
@@ -4446,8 +4482,11 @@
 
 	if (pset.sversion < 90100)
 	{
-		psql_error("The server (version %d.%d) does not support extensions.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support extensions.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
@@ -4500,8 +4539,11 @@
 
 	if (pset.sversion < 90100)
 	{
-		psql_error("The server (version %d.%d) does not support extensions.\n",
-				   pset.sversion / 10000, (pset.sversion / 100) % 100);
+		char		sverbuf[32];
+
+		psql_error("The server (version %s) does not support extensions.\n",
+				   formatPGVersionNumber(pset.sversion, false,
+										 sverbuf, sizeof(sverbuf)));
 		return true;
 	}
 
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/help.c postgresql-9.5-9.5.8/src/bin/psql/help.c
--- postgresql-9.5-9.5.2/src/bin/psql/help.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/help.c	2017-08-07 21:13:41.000000000 +0000
@@ -65,7 +65,7 @@
 		}
 	}
 
-	output = PageOutput(59, pager ? &(pset.popt.topt) : NULL);
+	output = PageOutput(61, pager ? &(pset.popt.topt) : NULL);
 
 	fprintf(output, _("psql is the PostgreSQL interactive terminal.\n\n"));
 	fprintf(output, _("Usage:\n"));
@@ -159,7 +159,7 @@
 
 	currdb = PQdb(pset.db);
 
-	output = PageOutput(103, pager ? &(pset.popt.topt) : NULL);
+	output = PageOutput(107, pager ? &(pset.popt.topt) : NULL);
 
 	/* if you add/remove a line here, change the row count above */
 
@@ -306,7 +306,7 @@
 {
 	FILE	   *output;
 
-	output = PageOutput(85, pager ? &(pset.popt.topt) : NULL);
+	output = PageOutput(87, pager ? &(pset.popt.topt) : NULL);
 
 	fprintf(output, _("List of specially treated variables\n\n"));
 
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/input.c postgresql-9.5-9.5.8/src/bin/psql/input.c
--- postgresql-9.5-9.5.2/src/bin/psql/input.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/input.c	2017-08-07 21:13:41.000000000 +0000
@@ -218,7 +218,7 @@
 		}
 
 		/* EOL? */
-		if (buffer->data[buffer->len - 1] == '\n')
+		if (buffer->len > 0 && buffer->data[buffer->len - 1] == '\n')
 		{
 			buffer->data[buffer->len - 1] = '\0';
 			return pg_strdup(buffer->data);
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/po/de.po postgresql-9.5-9.5.8/src/bin/psql/po/de.po
--- postgresql-9.5-9.5.2/src/bin/psql/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,14 +1,14 @@
 # German message translation file for psql
-# Peter Eisentraut <peter_e@gmx.net>, 2001 - 2015.
+# Peter Eisentraut <peter_e@gmx.net>, 2001 - 2016.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-01-04 02:12+0000\n"
-"PO-Revision-Date: 2016-01-03 22:15-0500\n"
+"POT-Creation-Date: 2017-08-07 16:29+0000\n"
+"PO-Revision-Date: 2016-10-24 09:04-0400\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -25,27 +25,27 @@
 #: ../../common/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "ungültige Programmdatei „%s“"
+msgstr "ungültige Programmdatei »%s«"
 
 #: ../../common/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "konnte Programmdatei „%s“ nicht lesen"
+msgstr "konnte Programmdatei »%s« nicht lesen"
 
 #: ../../common/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "konnte kein „%s“ zum Ausführen finden"
+msgstr "konnte kein »%s« zum Ausführen finden"
 
 #: ../../common/exec.c:257 ../../common/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "konnte nicht in Verzeichnis „%s“ wechseln: %s"
+msgstr "konnte nicht in Verzeichnis »%s« wechseln: %s"
 
 #: ../../common/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "konnte symbolische Verknüpfung „%s“ nicht lesen"
+msgstr "konnte symbolische Verknüpfung »%s« nicht lesen"
 
 #: ../../common/exec.c:523
 #, c-format
@@ -53,7 +53,7 @@
 msgstr "pclose fehlgeschlagen: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 command.c:318 input.c:216 mainloop.c:73
+#: ../../common/fe_memutils.c:98 command.c:330 input.c:216 mainloop.c:73
 #: mainloop.c:253
 #, c-format
 msgid "out of memory\n"
@@ -69,7 +69,7 @@
 msgid "could not look up effective user ID %ld: %s"
 msgstr "konnte effektive Benutzer-ID %ld nicht nachschlagen: %s"
 
-#: ../../common/username.c:47 command.c:273
+#: ../../common/username.c:47 command.c:285
 msgid "user does not exist"
 msgstr "Benutzer existiert nicht"
 
@@ -113,226 +113,226 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "Kindprozess hat mit unbekanntem Status %d beendet"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Ungültige Anweisung \\%s.  Versuchen Sie \\? für Hilfe.\n"
 
-#: command.c:116
+#: command.c:117
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "ungültige Anweisung \\%s\n"
 
-#: command.c:127
+#: command.c:128
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
-msgstr "\\%s: überflüssiges Argument „%s“ ignoriert\n"
+msgstr "\\%s: überflüssiges Argument »%s« ignoriert\n"
 
-#: command.c:271
+#: command.c:283
 #, c-format
 msgid "could not get home directory for user ID %ld: %s\n"
 msgstr "konnte Home-Verzeichnis für Benutzer-ID %ld nicht ermitteln: %s\n"
 
-#: command.c:289
+#: command.c:301
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
-msgstr "\\%s: konnte nicht in das Verzeichnis „%s“ wechseln: %s\n"
+msgstr "\\%s: konnte nicht in das Verzeichnis »%s« wechseln: %s\n"
 
-#: command.c:304 common.c:461 common.c:519 common.c:977
+#: command.c:316 common.c:466 common.c:524 common.c:982
 #, 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:331
+#: command.c:343
 #, c-format
 msgid "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
-msgstr "Sie sind verbunden mit der Datenbank „%s“ als Benutzer „%s“ via Socket in „%s“ auf Port „%s“.\n"
+msgstr "Sie sind verbunden mit der Datenbank »%s« als Benutzer »%s« via Socket in »%s« auf Port »%s«.\n"
 
-#: command.c:334
+#: command.c:346
 #, c-format
 msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
-msgstr "Sie sind verbunden mit der Datenbank „%s“ als Benutzer „%s“ auf Host „%s“ auf Port „%s“.\n"
+msgstr "Sie sind verbunden mit der Datenbank »%s« als Benutzer »%s« auf Host »%s« auf Port »%s«.\n"
 
-#: command.c:535 command.c:605 command.c:1405
+#: command.c:547 command.c:620 command.c:1423
 #, c-format
 msgid "no query buffer\n"
 msgstr "kein Anfragepuffer\n"
 
-#: command.c:568 command.c:3172
+#: command.c:580 command.c:3234
 #, c-format
 msgid "invalid line number: %s\n"
 msgstr "ungültige Zeilennummer: %s\n"
 
-#: command.c:599
+#: command.c:613
 #, 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"
+msgid "The server (version %s) does not support editing function source.\n"
+msgstr "Der Server (Version %s) unterstützt das Bearbeiten des Funktionsquelltextes nicht.\n"
 
-#: command.c:679
+#: command.c:694
 msgid "No changes"
 msgstr "keine Änderungen"
 
-#: command.c:733
+#: command.c:748
 #, 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:830 command.c:880 command.c:894 command.c:911 command.c:1018
-#: command.c:1182 command.c:1385 command.c:1416
+#: command.c:845 command.c:895 command.c:909 command.c:926 command.c:1033
+#: command.c:1197 command.c:1403 command.c:1434
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: notwendiges Argument fehlt\n"
 
-#: command.c:943
+#: command.c:958
 msgid "Query buffer is empty."
 msgstr "Anfragepuffer ist leer."
 
-#: command.c:953
+#: command.c:968
 msgid "Enter new password: "
 msgstr "Neues Passwort eingeben: "
 
-#: command.c:954
+#: command.c:969
 msgid "Enter it again: "
 msgstr "Geben Sie es noch einmal ein: "
 
-#: command.c:958
+#: command.c:973
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Passwörter stimmten nicht überein.\n"
 
-#: command.c:976
+#: command.c:991
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Passwortverschlüsselung ist fehlgeschlagen.\n"
 
-#: command.c:1047 command.c:1163 command.c:1390
+#: command.c:1062 command.c:1178 command.c:1408
 #, c-format
 msgid "\\%s: error while setting variable\n"
 msgstr "\\%s: Fehler beim Setzen der Variable\n"
 
-#: command.c:1110
+#: command.c:1125
 msgid "Query buffer reset (cleared)."
 msgstr "Anfragepuffer wurde gelöscht."
 
-#: command.c:1122
+#: command.c:1137
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
-msgstr "Befehlsgeschichte in Datei „%s“ geschrieben.\n"
+msgstr "Befehlsgeschichte in Datei »%s« geschrieben.\n"
 
-#: command.c:1187
+#: command.c:1202
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\"\n"
-msgstr "\\%s: Name der Umgebungsvariable darf kein „=“ enthalten\n"
+msgstr "\\%s: Name der Umgebungsvariable darf kein »=« enthalten\n"
 
-#: command.c:1229
+#: command.c:1246
 #, 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"
+msgid "The server (version %s) does not support showing function source.\n"
+msgstr "Der Server (Version %s) unterstützt das Anzeigen des Funktionsquelltextes nicht.\n"
 
-#: command.c:1235
+#: command.c:1253
 #, c-format
 msgid "function name is required\n"
 msgstr "Funktionsname wird benötigt\n"
 
-#: command.c:1370
+#: command.c:1388
 msgid "Timing is on."
 msgstr "Zeitmessung ist an."
 
-#: command.c:1372
+#: command.c:1390
 msgid "Timing is off."
 msgstr "Zeitmessung ist aus."
 
-#: command.c:1434 command.c:1454 command.c:2091 command.c:2094 command.c:2097
-#: command.c:2103 command.c:2105 command.c:2113 command.c:2123 command.c:2132
-#: command.c:2146 command.c:2163 command.c:2222 common.c:66 copy.c:331
-#: copy.c:391 copy.c:404 psqlscan.l:1700 psqlscan.l:1711 psqlscan.l:1721
+#: command.c:1452 command.c:1472 command.c:2153 command.c:2156 command.c:2159
+#: command.c:2165 command.c:2167 command.c:2175 command.c:2185 command.c:2194
+#: command.c:2208 command.c:2225 command.c:2284 common.c:67 copy.c:331
+#: copy.c:391 copy.c:404 psqlscan.l:1701 psqlscan.l:1712 psqlscan.l:1722
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1548
+#: command.c:1566
 #, c-format
 msgid "+ opt(%d) = |%s|\n"
 msgstr "+ opt(%d) = |%s|\n"
 
-#: command.c:1574 startup.c:195
+#: command.c:1592 startup.c:195
 msgid "Password: "
 msgstr "Passwort: "
 
-#: command.c:1579 startup.c:197
+#: command.c:1597 startup.c:197
 #, c-format
 msgid "Password for user %s: "
 msgstr "Passwort für Benutzer %s: "
 
-#: command.c:1626
+#: command.c:1648
 #, c-format
 msgid "All connection parameters must be supplied because no database connection exists\n"
 msgstr "Alle Verbindungsparameter müssen angegeben werden, weil keine Datenbankverbindung besteht\n"
 
-#: command.c:1747 command.c:3206 common.c:139 common.c:432 common.c:1020
-#: common.c:1045 common.c:1145 copy.c:488 copy.c:698 large_obj.c:156
-#: large_obj.c:191 large_obj.c:253 psqlscan.l:1972
+#: command.c:1803 command.c:3268 common.c:140 common.c:437 common.c:1025
+#: common.c:1053 common.c:1153 copy.c:488 copy.c:708 large_obj.c:156
+#: large_obj.c:191 large_obj.c:253 psqlscan.l:1973
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1751
+#: command.c:1807
 #, c-format
 msgid "Previous connection kept\n"
 msgstr "Vorherige Verbindung wurde behalten\n"
 
-#: command.c:1755
+#: command.c:1811
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1789
+#: command.c:1849
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
-msgstr "Sie sind jetzt verbunden mit der Datenbank „%s“ als Benutzer „%s“ via Socket in „%s“ auf Port „%s“.\n"
+msgstr "Sie sind jetzt verbunden mit der Datenbank »%s« als Benutzer »%s« via Socket in »%s« auf Port »%s«.\n"
 
-#: command.c:1792
+#: command.c:1852
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
-msgstr "Sie sind jetzt verbunden mit der Datenbank „%s“ als Benutzer „%s“ auf Host „%s“ auf Port „%s“.\n"
+msgstr "Sie sind jetzt verbunden mit der Datenbank »%s« als Benutzer »%s« auf Host »%s« auf Port »%s«.\n"
 
-#: command.c:1796
+#: command.c:1856
 #, 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"
+msgstr "Sie sind jetzt verbunden mit der Datenbank »%s« als Benutzer »%s«.\n"
 
-#: command.c:1830
+#: command.c:1889
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, Server %s)\n"
 
-#: command.c:1838
+#: command.c:1897
 #, c-format
 msgid ""
-"WARNING: %s major version %d.%d, server major version %d.%d.\n"
+"WARNING: %s major version %s, server major version %s.\n"
 "         Some psql features might not work.\n"
 msgstr ""
-"WARNUNG: %s-Hauptversion %d.%d, Server-Hauptversion %d.%d.\n"
+"WARNUNG: %s-Hauptversion %s, Server-Hauptversion %s.\n"
 "         Einige Features von psql werden eventuell nicht funktionieren.\n"
 
-#: command.c:1872
+#: command.c:1934
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, bits: %s, compression: %s)\n"
 msgstr "SSL-Verbindung (Protokoll: %s, Verschlüsselungsmethode: %s, Bits: %s, Komprimierung: %s)\n"
 
-#: command.c:1873 command.c:1874 command.c:1875
+#: command.c:1935 command.c:1936 command.c:1937
 msgid "unknown"
 msgstr "unbekannt"
 
-#: command.c:1876 help.c:46
+#: command.c:1938 help.c:46
 msgid "off"
 msgstr "aus"
 
-#: command.c:1876 help.c:46
+#: command.c:1938 help.c:46
 msgid "on"
 msgstr "an"
 
-#: command.c:1896
+#: command.c:1958
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -342,236 +342,236 @@
 "Warnung: Konsolencodeseite (%u) unterscheidet sich von der Windows-\n"
 "         Codeseite (%u). 8-Bit-Zeichen funktionieren möglicherweise nicht\n"
 "         richtig. Einzelheiten finden Sie auf der psql-Handbuchseite unter\n"
-"         „Notes for Windows users“.\n"
+"         »Notes for Windows users«.\n"
 
-#: command.c:1980
+#: command.c:2042
 #, c-format
 msgid "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:2009
+#: command.c:2071
 #, c-format
 msgid "could not start editor \"%s\"\n"
-msgstr "konnte Editor „%s“ nicht starten\n"
+msgstr "konnte Editor »%s« nicht starten\n"
 
-#: command.c:2011
+#: command.c:2073
 #, c-format
 msgid "could not start /bin/sh\n"
 msgstr "konnte /bin/sh nicht starten\n"
 
-#: command.c:2049
+#: command.c:2111
 #, c-format
 msgid "could not locate temporary directory: %s\n"
 msgstr "konnte temporäres Verzeichnis nicht finden: %s\n"
 
-#: command.c:2076
+#: command.c:2138
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
-msgstr "konnte temporäre Datei „%s“ nicht öffnen: %s\n"
+msgstr "konnte temporäre Datei »%s« nicht öffnen: %s\n"
 
-#: command.c:2380
+#: command.c:2442
 #, c-format
 msgid "\\pset: allowed formats are unaligned, aligned, wrapped, html, asciidoc, latex, latex-longtable, troff-ms\n"
 msgstr "\\pset: zulässige Formate sind unaligned, aligned, wrapped, html, asciidoc, latex, latex-longtable, troff-ms\n"
 
-#: command.c:2399
+#: command.c:2461
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
 msgstr "\\pset: zulässige Linienstile sind ascii, old-ascii, unicode\n"
 
-#: command.c:2415
+#: command.c:2477
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double\n"
 msgstr "\\pset: zulässige Unicode-Rahmnenlinienstile sind single, double\n"
 
-#: command.c:2430
+#: command.c:2492
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double\n"
 msgstr "\\pset: zulässige Unicode-Spaltenlinienstile sind single, double\n"
 
-#: command.c:2445
+#: command.c:2507
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double\n"
 msgstr "\\pset: zulässige Unicode-Kopflinienstile sind single, double\n"
 
-#: command.c:2597 command.c:2776
+#: command.c:2659 command.c:2838
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: unbekannte Option: %s\n"
 
-#: command.c:2615
+#: command.c:2677
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Rahmenstil ist %d.\n"
 
-#: command.c:2621
+#: command.c:2683
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "Zielbreite ist nicht gesetzt.\n"
 
-#: command.c:2623
+#: command.c:2685
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "Zielbreite ist %d.\n"
 
-#: command.c:2630
+#: command.c:2692
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Erweiterte Anzeige ist an.\n"
 
-#: command.c:2632
+#: command.c:2694
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "Erweiterte Anzeige wird automatisch verwendet.\n"
 
-#: command.c:2634
+#: command.c:2696
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Erweiterte Anzeige ist aus.\n"
 
-#: command.c:2641 command.c:2649
+#: command.c:2703 command.c:2711
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "Feldtrennzeichen ist ein Null-Byte.\n"
 
-#: command.c:2643
+#: command.c:2705
 #, c-format
 msgid "Field separator is \"%s\".\n"
-msgstr "Feldtrennzeichen ist „%s“.\n"
+msgstr "Feldtrennzeichen ist »%s«.\n"
 
-#: command.c:2656
+#: command.c:2718
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "Standardfußzeile ist an.\n"
 
-#: command.c:2658
+#: command.c:2720
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "Standardfußzeile ist aus.\n"
 
-#: command.c:2664
+#: command.c:2726
 #, c-format
 msgid "Output format is %s.\n"
-msgstr "Ausgabeformat ist „%s“.\n"
+msgstr "Ausgabeformat ist »%s«.\n"
 
-#: command.c:2670
+#: command.c:2732
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Linienstil ist %s.\n"
 
-#: command.c:2677
+#: command.c:2739
 #, c-format
 msgid "Null display is \"%s\".\n"
-msgstr "Null-Anzeige ist „%s“.\n"
+msgstr "Null-Anzeige ist »%s«.\n"
 
-#: command.c:2685
+#: command.c:2747
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "Lokalisiertes Format für numerische Daten ist an.\n"
 
-#: command.c:2687
+#: command.c:2749
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "Lokalisiertes Format für numerische Daten ist aus.\n"
 
-#: command.c:2694
+#: command.c:2756
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "Pager wird für lange Ausgaben verwendet.\n"
 
-#: command.c:2696
+#: command.c:2758
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "Pager wird immer verwendet.\n"
 
-#: command.c:2698
+#: command.c:2760
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "Pager-Verwendung ist aus.\n"
 
-#: command.c:2704
+#: command.c:2766
 #, c-format
 msgid "Pager won't be used for less than %d line.\n"
 msgid_plural "Pager won't be used for less than %d lines.\n"
 msgstr[0] "Pager wird nicht für weniger als %d Zeile verwendet werden.\n"
 msgstr[1] "Pager wird nicht für weniger als %d Zeilen verwendet werden.\n"
 
-#: command.c:2714 command.c:2724
+#: command.c:2776 command.c:2786
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "Satztrennzeichen ist ein Null-Byte.\n"
 
-#: command.c:2716
+#: command.c:2778
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "Satztrennzeichen ist <newline>.\n"
 
-#: command.c:2718
+#: command.c:2780
 #, c-format
 msgid "Record separator is \"%s\".\n"
-msgstr "Satztrennzeichen ist „%s“.\n"
+msgstr "Satztrennzeichen ist »%s«.\n"
 
-#: command.c:2731
+#: command.c:2793
 #, c-format
 msgid "Table attributes are \"%s\".\n"
-msgstr "Tabellenattribute sind „%s“.\n"
+msgstr "Tabellenattribute sind »%s«.\n"
 
-#: command.c:2734
+#: command.c:2796
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Tabellenattribute sind nicht gesetzt.\n"
 
-#: command.c:2741
+#: command.c:2803
 #, c-format
 msgid "Title is \"%s\".\n"
-msgstr "Titel ist „%s“.\n"
+msgstr "Titel ist »%s«.\n"
 
-#: command.c:2743
+#: command.c:2805
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Titel ist nicht gesetzt.\n"
 
-#: command.c:2750
+#: command.c:2812
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "Nur Datenzeilen ist an.\n"
 
-#: command.c:2752
+#: command.c:2814
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "Nur Datenzeilen ist aus.\n"
 
-#: command.c:2758
+#: command.c:2820
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
-msgstr "Unicode-Rahmenlinienstil ist „%s“.\n"
+msgstr "Unicode-Rahmenlinienstil ist »%s«.\n"
 
-#: command.c:2764
+#: command.c:2826
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
-msgstr "Unicode-Spaltenlinienstil ist „%s“.\n"
+msgstr "Unicode-Spaltenlinienstil ist »%s«.\n"
 
-#: command.c:2770
+#: command.c:2832
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
-msgstr "Unicode-Kopflinienstil ist „%s“.\n"
+msgstr "Unicode-Kopflinienstil ist »%s«.\n"
 
-#: command.c:2930
+#: command.c:2992
 #, c-format
 msgid "\\!: failed\n"
 msgstr "\\!: fehlgeschlagen\n"
 
-#: command.c:2950 common.c:567
+#: command.c:3012 common.c:572
 #, c-format
 msgid "\\watch cannot be used with an empty query\n"
 msgstr "\\watch kann nicht mit einer leeren Anfrage verwendet werden\n"
 
-#: command.c:2971
+#: command.c:3033
 #, c-format
 msgid "Watch every %lds\t%s"
 msgstr "\\watch alle %lds\t%s"
 
-#: command.c:3022 command.c:3029 common.c:467 common.c:474 common.c:1003
+#: command.c:3084 command.c:3091 common.c:472 common.c:479 common.c:1008
 #, c-format
 msgid ""
 "********* QUERY **********\n"
@@ -584,72 +584,72 @@
 "**************************\n"
 "\n"
 
-#: common.c:306
+#: common.c:311
 #, c-format
 msgid "connection to server was lost\n"
 msgstr "Verbindung zum Server wurde verloren\n"
 
-#: common.c:310
+#: common.c:315
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "Die Verbindung zum Server wurde verloren.  Versuche Reset: "
 
-#: common.c:315
+#: common.c:320
 #, c-format
 msgid "Failed.\n"
 msgstr "Fehlgeschlagen.\n"
 
-#: common.c:322
+#: common.c:327
 #, c-format
 msgid "Succeeded.\n"
 msgstr "Erfolgreich.\n"
 
-#: common.c:422 common.c:774 common.c:942
+#: common.c:427 common.c:779 common.c:947
 #, c-format
 msgid "unexpected PQresultStatus: %d\n"
 msgstr "unerwarteter PQresultStatus: %d\n"
 
-#: common.c:574
+#: common.c:579
 #, c-format
 msgid "\\watch cannot be used with COPY\n"
 msgstr "\\watch kann nicht mit COPY verwendet werden\n"
 
-#: common.c:579
+#: common.c:584
 #, c-format
 msgid "unexpected result status for \\watch\n"
 msgstr "unerwarteter Ergebnisstatus für \\watch\n"
 
-#: common.c:590 common.c:1161
+#: common.c:595 common.c:1169
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Zeit: %.3f ms\n"
 
-#: common.c:608
+#: common.c:613
 #, c-format
 msgid "Asynchronous notification \"%s\" with payload \"%s\" received from server process with PID %d.\n"
-msgstr "Asynchrone Benachrichtigung „%s“ mit Daten „%s“ vom Serverprozess mit PID %d empfangen.\n"
+msgstr "Asynchrone Benachrichtigung »%s« mit Daten »%s« vom Serverprozess mit PID %d empfangen.\n"
 
-#: common.c:611
+#: common.c:616
 #, c-format
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
-msgstr "Asynchrone Benachrichtigung „%s“ vom Serverprozess mit PID %d empfangen.\n"
+msgstr "Asynchrone Benachrichtigung »%s« vom Serverprozess mit PID %d empfangen.\n"
 
-#: common.c:669
+#: common.c:674
 #, c-format
 msgid "no rows returned for \\gset\n"
 msgstr "keine Zeilen für \\gset zurückgegeben\n"
 
-#: common.c:674
+#: common.c:679
 #, c-format
 msgid "more than one row returned for \\gset\n"
 msgstr "mehr als eine Zeile für \\gset zurückgegeben\n"
 
-#: common.c:700
+#: common.c:705
 #, c-format
 msgid "could not set variable \"%s\"\n"
-msgstr "konnte Variable „%s“ nicht setzen\n"
+msgstr "konnte Variable »%s« nicht setzen\n"
 
-#: common.c:985
+#: common.c:990
 #, c-format
 msgid ""
 "***(Single step mode: verify command)*******************************************\n"
@@ -658,19 +658,19 @@
 msgstr ""
 "***(Einzelschrittmodus: Anfrage bestätigen)*************************************\n"
 "%s\n"
-"***(Drücken Sie die Eingabetaste um fortzufahren oder „x“ um abzubrechen)*******\n"
+"***(Drücken Sie die Eingabetaste um fortzufahren oder »x« um abzubrechen)*******\n"
 
-#: common.c:1036
+#: common.c:1043
 #, c-format
-msgid "The server (version %d.%d) does not support savepoints for ON_ERROR_ROLLBACK.\n"
-msgstr "Der Server (Version %d.%d) unterstützt keine Sicherungspunkte für ON_ERROR_ROLLBACK.\n"
+msgid "The server (version %s) does not support savepoints for ON_ERROR_ROLLBACK.\n"
+msgstr "Der Server (Version %s) unterstützt keine Sicherungspunkte für ON_ERROR_ROLLBACK.\n"
 
-#: common.c:1090
+#: common.c:1098
 #, c-format
 msgid "STATEMENT:  %s\n"
 msgstr "ANWEISUNG:  %s\n"
 
-#: common.c:1133
+#: common.c:1141
 #, c-format
 msgid "unexpected transaction status (%d)\n"
 msgstr "unerwarteter Transaktionsstatus (%d)\n"
@@ -683,7 +683,7 @@
 #: copy.c:253
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
-msgstr "\\copy: Parse-Fehler bei „%s“\n"
+msgstr "\\copy: Parse-Fehler bei »%s«\n"
 
 #: copy.c:255
 #, c-format
@@ -693,12 +693,12 @@
 #: copy.c:328
 #, c-format
 msgid "could not execute command \"%s\": %s\n"
-msgstr "konnte Befehl „%s“ nicht ausführen: %s\n"
+msgstr "konnte Befehl »%s« nicht ausführen: %s\n"
 
 #: copy.c:344
 #, c-format
 msgid "could not stat file \"%s\": %s\n"
-msgstr "konnte „stat“ für Datei „%s“ nicht ausführen: %s\n"
+msgstr "konnte »stat« für Datei »%s« nicht ausführen: %s\n"
 
 #: copy.c:348
 #, c-format
@@ -727,52 +727,52 @@
 #: copy.c:541
 msgid ""
 "Enter data to be copied followed by a newline.\n"
-"End with a backslash and a period on a line by itself."
+"End with a backslash and a period on a line by itself, or an EOF signal."
 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."
+"Beenden Sie mit einem Backslash und einem Punkt alleine auf einer Zeile, oder einem EOF-Signal."
 
 #: copy.c:670
 msgid "aborted because of read failure"
 msgstr "abgebrochen wegen Lesenfehlers"
 
-#: copy.c:694
+#: copy.c:704
 msgid "trying to exit copy mode"
 msgstr "versuche, den COPY-Modus zu verlassen"
 
-#: describe.c:71 describe.c:264 describe.c:496 describe.c:626 describe.c:769
-#: describe.c:886 describe.c:956 describe.c:2928 describe.c:3133
-#: describe.c:3223 describe.c:3468 describe.c:3605 describe.c:3834
-#: describe.c:3906 describe.c:3917 describe.c:3976 describe.c:4384
-#: describe.c:4463
+#: describe.c:71 describe.c:270 describe.c:502 describe.c:632 describe.c:775
+#: describe.c:895 describe.c:965 describe.c:2937 describe.c:3142
+#: describe.c:3232 describe.c:3480 describe.c:3620 describe.c:3852
+#: describe.c:3927 describe.c:3938 describe.c:4000 describe.c:4420
+#: describe.c:4503
 msgid "Schema"
 msgstr "Schema"
 
-#: describe.c:72 describe.c:156 describe.c:164 describe.c:265 describe.c:497
-#: describe.c:627 describe.c:688 describe.c:770 describe.c:957 describe.c:2929
-#: describe.c:3055 describe.c:3134 describe.c:3224 describe.c:3303
-#: describe.c:3469 describe.c:3533 describe.c:3606 describe.c:3835
-#: describe.c:3907 describe.c:3918 describe.c:3977 describe.c:4166
-#: describe.c:4247 describe.c:4461
+#: describe.c:72 describe.c:159 describe.c:167 describe.c:271 describe.c:503
+#: describe.c:633 describe.c:694 describe.c:776 describe.c:966 describe.c:2938
+#: describe.c:3064 describe.c:3143 describe.c:3233 describe.c:3312
+#: describe.c:3481 describe.c:3545 describe.c:3621 describe.c:3853
+#: describe.c:3928 describe.c:3939 describe.c:4001 describe.c:4193
+#: describe.c:4277 describe.c:4501
 msgid "Name"
 msgstr "Name"
 
-#: describe.c:73 describe.c:277 describe.c:323 describe.c:340
+#: describe.c:73 describe.c:283 describe.c:329 describe.c:346
 msgid "Result data type"
 msgstr "Ergebnisdatentyp"
 
-#: describe.c:81 describe.c:94 describe.c:98 describe.c:278 describe.c:324
-#: describe.c:341
+#: describe.c:81 describe.c:94 describe.c:98 describe.c:284 describe.c:330
+#: describe.c:347
 msgid "Argument data types"
 msgstr "Argumentdatentypen"
 
-#: describe.c:105 describe.c:187 describe.c:370 describe.c:545 describe.c:642
-#: describe.c:713 describe.c:959 describe.c:1572 describe.c:2729
-#: describe.c:2962 describe.c:3086 describe.c:3160 describe.c:3233
-#: describe.c:3316 describe.c:3384 describe.c:3476 describe.c:3542
-#: describe.c:3607 describe.c:3743 describe.c:3783 describe.c:3851
-#: describe.c:3910 describe.c:3919 describe.c:3978 describe.c:4192
-#: describe.c:4269 describe.c:4398 describe.c:4464 large_obj.c:289
+#: describe.c:105 describe.c:190 describe.c:376 describe.c:551 describe.c:648
+#: describe.c:719 describe.c:968 describe.c:1581 describe.c:2738
+#: describe.c:2971 describe.c:3095 describe.c:3169 describe.c:3242
+#: describe.c:3325 describe.c:3393 describe.c:3488 describe.c:3554
+#: describe.c:3622 describe.c:3758 describe.c:3798 describe.c:3869
+#: describe.c:3931 describe.c:3940 describe.c:4002 describe.c:4219
+#: describe.c:4299 describe.c:4434 describe.c:4504 large_obj.c:289
 #: large_obj.c:299
 msgid "Description"
 msgstr "Beschreibung"
@@ -781,969 +781,978 @@
 msgid "List of aggregate functions"
 msgstr "Liste der Aggregatfunktionen"
 
-#: describe.c:144
+#: describe.c:146
 #, c-format
-msgid "The server (version %d.%d) does not support tablespaces.\n"
-msgstr "Der Server (Version %d.%d) unterstützt keine Tablespaces.\n"
+msgid "The server (version %s) does not support tablespaces.\n"
+msgstr "Der Server (Version %s) unterstützt keine Tablespaces.\n"
 
-#: describe.c:157 describe.c:165 describe.c:367 describe.c:535 describe.c:689
-#: describe.c:885 describe.c:2938 describe.c:3059 describe.c:3305
-#: describe.c:3534 describe.c:4167 describe.c:4248 large_obj.c:288
+#: describe.c:160 describe.c:168 describe.c:373 describe.c:541 describe.c:695
+#: describe.c:894 describe.c:2947 describe.c:3068 describe.c:3314
+#: describe.c:3546 describe.c:4194 describe.c:4278 large_obj.c:288
 msgid "Owner"
 msgstr "Eigentümer"
 
-#: describe.c:158 describe.c:166
+#: describe.c:161 describe.c:169
 msgid "Location"
 msgstr "Pfad"
 
-#: describe.c:177 describe.c:2543
+#: describe.c:180 describe.c:2552
 msgid "Options"
 msgstr "Optionen"
 
-#: describe.c:182 describe.c:508 describe.c:705 describe.c:2954
-#: describe.c:2958
+#: describe.c:185 describe.c:514 describe.c:711 describe.c:2963 describe.c:2967
 msgid "Size"
 msgstr "Größe"
 
-#: describe.c:204
+#: describe.c:207
 msgid "List of tablespaces"
 msgstr "Liste der Tablespaces"
 
-#: describe.c:241
+#: describe.c:244
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df akzeptiert nur [antwS+] als Optionen\n"
 
-#: describe.c:247
+#: describe.c:252
 #, c-format
-msgid "\\df does not take a \"w\" option with server version %d.%d\n"
-msgstr "\\df akzeptiert die Option „w“ nicht mit Serverversion %d.%d\n"
+msgid "\\df does not take a \"w\" option with server version %s\n"
+msgstr "\\df akzeptiert die Option »w« nicht mit Serverversion %s\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:280 describe.c:326 describe.c:343
+#: describe.c:286 describe.c:332 describe.c:349
 msgid "agg"
 msgstr "Agg"
 
-#: describe.c:281
+#: describe.c:287
 msgid "window"
 msgstr "Fenster"
 
-#: describe.c:282 describe.c:327 describe.c:344 describe.c:1093
+#: describe.c:288 describe.c:333 describe.c:350 describe.c:1102
 msgid "trigger"
 msgstr "Trigger"
 
-#: describe.c:283 describe.c:328 describe.c:345
+#: describe.c:289 describe.c:334 describe.c:351
 msgid "normal"
 msgstr "normal"
 
-#: describe.c:284 describe.c:329 describe.c:346 describe.c:776 describe.c:895
-#: describe.c:1541 describe.c:2937 describe.c:3135 describe.c:4266
+#: describe.c:290 describe.c:335 describe.c:352 describe.c:782 describe.c:904
+#: describe.c:1550 describe.c:2946 describe.c:3144 describe.c:4296
 msgid "Type"
 msgstr "Typ"
 
-#: describe.c:360
+#: describe.c:366
 msgid "definer"
 msgstr "definer"
 
-#: describe.c:361
+#: describe.c:367
 msgid "invoker"
 msgstr "invoker"
 
-#: describe.c:362
+#: describe.c:368
 msgid "Security"
 msgstr "Sicherheit"
 
-#: describe.c:363
+#: describe.c:369
 msgid "immutable"
 msgstr "unveränderlich"
 
-#: describe.c:364
+#: describe.c:370
 msgid "stable"
 msgstr "stabil"
 
-#: describe.c:365
+#: describe.c:371
 msgid "volatile"
 msgstr "volatil"
 
-#: describe.c:366
+#: describe.c:372
 msgid "Volatility"
 msgstr "Volatilität"
 
-#: describe.c:368
+#: describe.c:374
 msgid "Language"
 msgstr "Sprache"
 
-#: describe.c:369
+#: describe.c:375
 msgid "Source code"
 msgstr "Quelltext"
 
-#: describe.c:467
+#: describe.c:473
 msgid "List of functions"
 msgstr "Liste der Funktionen"
 
-#: describe.c:507
+#: describe.c:513
 msgid "Internal name"
 msgstr "Interner Name"
 
-#: describe.c:529
+#: describe.c:535
 msgid "Elements"
 msgstr "Elemente"
 
-#: describe.c:585
+#: describe.c:591
 msgid "List of data types"
 msgstr "Liste der Datentypen"
 
-#: describe.c:628
+#: describe.c:634
 msgid "Left arg type"
 msgstr "Linker Typ"
 
-#: describe.c:629
+#: describe.c:635
 msgid "Right arg type"
 msgstr "Rechter Typ"
 
-#: describe.c:630
+#: describe.c:636
 msgid "Result type"
 msgstr "Ergebnistyp"
 
-#: describe.c:635 describe.c:3375 describe.c:3742
+#: describe.c:641 describe.c:3384 describe.c:3757
 msgid "Function"
 msgstr "Funktion"
 
-#: describe.c:660
+#: describe.c:666
 msgid "List of operators"
 msgstr "Liste der Operatoren"
 
-#: describe.c:690
+#: describe.c:696
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: describe.c:695 describe.c:3470
+#: describe.c:701 describe.c:3482
 msgid "Collate"
 msgstr "Sortierfolge"
 
-#: describe.c:696 describe.c:3471
+#: describe.c:702 describe.c:3483
 msgid "Ctype"
 msgstr "Zeichentyp"
 
-#: describe.c:709
+#: describe.c:715
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:731
+#: describe.c:737
 msgid "List of databases"
 msgstr "Liste der Datenbanken"
 
-#: describe.c:771 describe.c:888 describe.c:2930
+#: describe.c:777 describe.c:897 describe.c:2939
 msgid "table"
 msgstr "Tabelle"
 
-#: describe.c:772 describe.c:2931
+#: describe.c:778 describe.c:2940
 msgid "view"
 msgstr "Sicht"
 
-#: describe.c:773 describe.c:2932
+#: describe.c:779 describe.c:2941
 msgid "materialized view"
 msgstr "materialisierte Sicht"
 
-#: describe.c:774 describe.c:890 describe.c:2934
+#: describe.c:780 describe.c:899 describe.c:2943
 msgid "sequence"
 msgstr "Sequenz"
 
-#: describe.c:775 describe.c:2936
+#: describe.c:781 describe.c:2945
 msgid "foreign table"
 msgstr "Fremdtabelle"
 
-#: describe.c:787
+#: describe.c:793
 msgid "Column privileges"
 msgstr "Spaltenprivilegien"
 
-#: describe.c:818
+#: describe.c:824
 msgid "Policies"
 msgstr "Policys"
 
-#: describe.c:844 describe.c:4608 describe.c:4612
+#: describe.c:850 describe.c:4651 describe.c:4655
 msgid "Access privileges"
 msgstr "Zugriffsprivilegien"
 
-#: describe.c:873
+#: describe.c:881
 #, c-format
-msgid "The server (version %d.%d) does not support altering default privileges.\n"
-msgstr "Der Server (Version %d.%d) unterstützt kein Ändern der Vorgabeprivilegien.\n"
+msgid "The server (version %s) does not support altering default privileges.\n"
+msgstr "Der Server (Version %s) unterstützt kein Ändern der Vorgabeprivilegien.\n"
 
-#: describe.c:892
+#: describe.c:901
 msgid "function"
 msgstr "Funktion"
 
-#: describe.c:894
+#: describe.c:903
 msgid "type"
 msgstr "Typ"
 
-#: describe.c:918
+#: describe.c:927
 msgid "Default access privileges"
 msgstr "Vorgegebene Zugriffsprivilegien"
 
-#: describe.c:958
+#: describe.c:967
 msgid "Object"
 msgstr "Objekt"
 
-#: describe.c:972
+#: describe.c:981
 msgid "table constraint"
 msgstr "Tabellen-Constraint"
 
-#: describe.c:994
+#: describe.c:1003
 msgid "domain constraint"
 msgstr "Domänen-Constraint"
 
-#: describe.c:1022
+#: describe.c:1031
 msgid "operator class"
 msgstr "Operatorklasse"
 
-#: describe.c:1051
+#: describe.c:1060
 msgid "operator family"
 msgstr "Operatorfamilie"
 
-#: describe.c:1073
+#: describe.c:1082
 msgid "rule"
 msgstr "Rule"
 
-#: describe.c:1115
+#: describe.c:1124
 msgid "Object descriptions"
 msgstr "Objektbeschreibungen"
 
-#: describe.c:1169
+#: describe.c:1178
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
-msgstr "Keine Relationen namens „%s“ gefunden\n"
+msgstr "Keine Relationen namens »%s« gefunden\n"
 
-#: describe.c:1379
+#: describe.c:1388
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "Keine Relation mit OID %s gefunden.\n"
 
-#: describe.c:1485
+#: describe.c:1494
 #, c-format
 msgid "Unlogged table \"%s.%s\""
-msgstr "Ungeloggte Tabelle „%s.%s“"
+msgstr "Ungeloggte Tabelle »%s.%s«"
 
-#: describe.c:1488
+#: describe.c:1497
 #, c-format
 msgid "Table \"%s.%s\""
-msgstr "Tabelle „%s.%s“"
+msgstr "Tabelle »%s.%s«"
 
-#: describe.c:1492
+#: describe.c:1501
 #, c-format
 msgid "View \"%s.%s\""
-msgstr "Sicht „%s.%s“"
+msgstr "Sicht »%s.%s«"
 
-#: describe.c:1497
+#: describe.c:1506
 #, c-format
 msgid "Unlogged materialized view \"%s.%s\""
-msgstr "Ungeloggte materialisierte Sicht „%s.%s“"
+msgstr "Ungeloggte materialisierte Sicht »%s.%s«"
 
-#: describe.c:1500
+#: describe.c:1509
 #, c-format
 msgid "Materialized view \"%s.%s\""
-msgstr "Materialisierte Sicht „%s.%s“"
+msgstr "Materialisierte Sicht »%s.%s«"
 
-#: describe.c:1504
+#: describe.c:1513
 #, c-format
 msgid "Sequence \"%s.%s\""
-msgstr "Sequenz „%s.%s“"
+msgstr "Sequenz »%s.%s«"
 
-#: describe.c:1509
+#: describe.c:1518
 #, c-format
 msgid "Unlogged index \"%s.%s\""
-msgstr "Ungeloggter Index „%s.%s“"
+msgstr "Ungeloggter Index »%s.%s«"
 
-#: describe.c:1512
+#: describe.c:1521
 #, c-format
 msgid "Index \"%s.%s\""
-msgstr "Index „%s.%s“"
+msgstr "Index »%s.%s«"
 
-#: describe.c:1517
+#: describe.c:1526
 #, c-format
 msgid "Special relation \"%s.%s\""
-msgstr "Spezielle Relation „%s.%s“"
+msgstr "Spezielle Relation »%s.%s«"
 
-#: describe.c:1521
+#: describe.c:1530
 #, c-format
 msgid "TOAST table \"%s.%s\""
-msgstr "TOAST-Tabelle „%s.%s“"
+msgstr "TOAST-Tabelle »%s.%s«"
 
-#: describe.c:1525
+#: describe.c:1534
 #, c-format
 msgid "Composite type \"%s.%s\""
-msgstr "Zusammengesetzter Typ „%s.%s“"
+msgstr "Zusammengesetzter Typ »%s.%s«"
 
-#: describe.c:1529
+#: describe.c:1538
 #, c-format
 msgid "Foreign table \"%s.%s\""
-msgstr "Fremdtabelle „%s.%s“"
+msgstr "Fremdtabelle »%s.%s«"
 
-#: describe.c:1540
+#: describe.c:1549
 msgid "Column"
 msgstr "Spalte"
 
-#: describe.c:1549
+#: describe.c:1558
 msgid "Modifiers"
 msgstr "Attribute"
 
-#: describe.c:1554
+#: describe.c:1563
 msgid "Value"
 msgstr "Wert"
 
-#: describe.c:1557
+#: describe.c:1566
 msgid "Definition"
 msgstr "Definition"
 
-#: describe.c:1560 describe.c:4187 describe.c:4268 describe.c:4336
-#: describe.c:4397
+#: describe.c:1569 describe.c:4214 describe.c:4298 describe.c:4369
+#: describe.c:4433
 msgid "FDW Options"
 msgstr "FDW-Optionen"
 
-#: describe.c:1564
+#: describe.c:1573
 msgid "Storage"
 msgstr "Speicherung"
 
-#: describe.c:1567
+#: describe.c:1576
 msgid "Stats target"
 msgstr "Statistikziel"
 
-#: describe.c:1617
+#: describe.c:1626
 #, c-format
 msgid "collate %s"
 msgstr "Sortierfolge %s"
 
-#: describe.c:1625
+#: describe.c:1634
 msgid "not null"
 msgstr "not null"
 
 #. translator: default values of column definitions
-#: describe.c:1635
+#: describe.c:1644
 #, c-format
 msgid "default %s"
 msgstr "Vorgabewert %s"
 
-#: describe.c:1750
+#: describe.c:1759
 msgid "primary key, "
 msgstr "Primärschlüssel, "
 
-#: describe.c:1752
+#: describe.c:1761
 msgid "unique, "
 msgstr "eindeutig, "
 
-#: describe.c:1758
+#: describe.c:1767
 #, c-format
 msgid "for table \"%s.%s\""
-msgstr "für Tabelle „%s.%s“"
+msgstr "für Tabelle »%s.%s«"
 
-#: describe.c:1762
+#: describe.c:1771
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", Prädikat (%s)"
 
-#: describe.c:1765
+#: describe.c:1774
 msgid ", clustered"
 msgstr ", geclustert"
 
-#: describe.c:1768
+#: describe.c:1777
 msgid ", invalid"
 msgstr ", ungültig"
 
-#: describe.c:1771
+#: describe.c:1780
 msgid ", deferrable"
 msgstr ", DEFERRABLE"
 
-#: describe.c:1774
+#: describe.c:1783
 msgid ", initially deferred"
 msgstr ", INITIALLY DEFERRED"
 
-#: describe.c:1777
+#: describe.c:1786
 msgid ", replica identity"
 msgstr ", Replika-Identität"
 
-#: describe.c:1812
+#: describe.c:1821
 #, c-format
 msgid "Owned by: %s"
 msgstr "Eigentümer: %s"
 
-#: describe.c:1872
+#: describe.c:1881
 msgid "Indexes:"
 msgstr "Indexe:"
 
-#: describe.c:1956
+#: describe.c:1965
 msgid "Check constraints:"
 msgstr "Check-Constraints:"
 
-#: describe.c:1987
+#: describe.c:1996
 msgid "Foreign-key constraints:"
 msgstr "Fremdschlüssel-Constraints:"
 
-#: describe.c:2018
+#: describe.c:2027
 msgid "Referenced by:"
 msgstr "Fremdschlüsselverweise von:"
 
-#: describe.c:2063
+#: describe.c:2072
 msgid "Policies:"
 msgstr "Policys:"
 
-#: describe.c:2066
+#: describe.c:2075
 msgid "Policies (forced row security enabled):"
 msgstr "Policys (Sicherheit auf Zeilenebene erzwungen):"
 
-#: describe.c:2069
+#: describe.c:2078
 msgid "Policies (row security enabled): (none)"
 msgstr "Policys (Sicherheit auf Zeilenebene eingeschaltet): (keine)"
 
-#: describe.c:2072
+#: describe.c:2081
 msgid "Policies (forced row security enabled): (none)"
 msgstr "Policys (Sicherheit auf Zeilenebene erzwungen): (keine)"
 
-#: describe.c:2075
+#: describe.c:2084
 msgid "Policies (row security disabled):"
 msgstr "Policys (Sicherheit auf Zeilenebene ausgeschaltet):"
 
-#: describe.c:2175 describe.c:2225
+#: describe.c:2184 describe.c:2234
 msgid "Rules:"
 msgstr "Regeln:"
 
-#: describe.c:2178
+#: describe.c:2187
 msgid "Disabled rules:"
 msgstr "Abgeschaltete Regeln:"
 
-#: describe.c:2181
+#: describe.c:2190
 msgid "Rules firing always:"
 msgstr "Regeln, die immer aktiv werden:"
 
-#: describe.c:2184
+#: describe.c:2193
 msgid "Rules firing on replica only:"
 msgstr "Regeln, die nur im Replikat aktiv werden:"
 
-#: describe.c:2208
+#: describe.c:2217
 msgid "View definition:"
 msgstr "Sichtdefinition:"
 
-#: describe.c:2343
+#: describe.c:2352
 msgid "Triggers:"
 msgstr "Trigger:"
 
-#: describe.c:2347
+#: describe.c:2356
 msgid "Disabled user triggers:"
 msgstr "Abgeschaltete Benutzer-Trigger:"
 
-#: describe.c:2349
+#: describe.c:2358
 msgid "Disabled triggers:"
 msgstr "Abgeschaltete Trigger:"
 
-#: describe.c:2352
+#: describe.c:2361
 msgid "Disabled internal triggers:"
 msgstr "Abgeschaltete interne Trigger:"
 
-#: describe.c:2355
+#: describe.c:2364
 msgid "Triggers firing always:"
 msgstr "Trigger, die immer aktiv werden:"
 
-#: describe.c:2358
+#: describe.c:2367
 msgid "Triggers firing on replica only:"
 msgstr "Trigger, die nur im Replikat aktiv werden:"
 
-#: describe.c:2437
+#: describe.c:2424
+#, c-format
+msgid "Server: %s"
+msgstr "Server: %s"
+
+#: describe.c:2432
+#, c-format
+msgid "FDW Options: (%s)"
+msgstr "FDW-Optionen: (%s)"
+
+#: describe.c:2446
 msgid "Inherits"
 msgstr "Erbt von"
 
-#: describe.c:2476
+#: describe.c:2485
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Anzahl Kindtabellen: %d (Mit \\d+ alle anzeigen.)"
 
-#: describe.c:2483
+#: describe.c:2492
 msgid "Child tables"
 msgstr "Kindtabellen"
 
-#: describe.c:2505
+#: describe.c:2514
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Getypte Tabelle vom Typ: %s"
 
-#: describe.c:2519
+#: describe.c:2528
 msgid "Replica Identity"
 msgstr "Replika-Identität"
 
-#: describe.c:2532
+#: describe.c:2541
 msgid "Has OIDs: yes"
 msgstr "Hat OIDs: ja"
 
-#: describe.c:2620
+#: describe.c:2629
 #, c-format
 msgid "Tablespace: \"%s\""
-msgstr "Tablespace: „%s“"
+msgstr "Tablespace: »%s«"
 
 #. translator: before this string there's an index description like
 #. '"foo_pkey" PRIMARY KEY, btree (a)'
-#: describe.c:2632
+#: describe.c:2641
 #, c-format
 msgid ", tablespace \"%s\""
-msgstr ", Tablespace „%s“"
+msgstr ", Tablespace »%s«"
 
-#: describe.c:2722
+#: describe.c:2731
 msgid "List of roles"
 msgstr "Liste der Rollen"
 
-#: describe.c:2724
+#: describe.c:2733
 msgid "Role name"
 msgstr "Rollenname"
 
-#: describe.c:2725
+#: describe.c:2734
 msgid "Attributes"
 msgstr "Attribute"
 
-#: describe.c:2726
+#: describe.c:2735
 msgid "Member of"
 msgstr "Mitglied von"
 
-#: describe.c:2737
+#: describe.c:2746
 msgid "Superuser"
 msgstr "Superuser"
 
-#: describe.c:2740
+#: describe.c:2749
 msgid "No inheritance"
 msgstr "keine Vererbung"
 
-#: describe.c:2743
+#: describe.c:2752
 msgid "Create role"
 msgstr "Rolle erzeugen"
 
-#: describe.c:2746
+#: describe.c:2755
 msgid "Create DB"
 msgstr "DB erzeugen"
 
-#: describe.c:2749
+#: describe.c:2758
 msgid "Cannot login"
 msgstr "kann nicht einloggen"
 
-#: describe.c:2753
+#: describe.c:2762
 msgid "Replication"
 msgstr "Replikation"
 
-#: describe.c:2757
+#: describe.c:2766
 msgid "Bypass RLS"
 msgstr "Bypass RLS"
 
-#: describe.c:2766
+#: describe.c:2775
 msgid "No connections"
 msgstr "keine Verbindungen"
 
-#: describe.c:2768
+#: describe.c:2777
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d Verbindung"
 msgstr[1] "%d Verbindungen"
 
-#: describe.c:2778
+#: describe.c:2787
 msgid "Password valid until "
 msgstr "Passwort gültig bis "
 
-#: describe.c:2834
+#: describe.c:2843
 msgid "Role"
 msgstr "Rolle"
 
-#: describe.c:2835
+#: describe.c:2844
 msgid "Database"
 msgstr "Datenbank"
 
-#: describe.c:2836
+#: describe.c:2845
 msgid "Settings"
 msgstr "Einstellung"
 
-#: describe.c:2846
+#: describe.c:2855
 #, 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:2857
+#: describe.c:2866
 #, c-format
 msgid "No matching settings found.\n"
 msgstr "Keine passenden Einstellungen gefunden.\n"
 
-#: describe.c:2859
+#: describe.c:2868
 #, c-format
 msgid "No settings found.\n"
 msgstr "Keine Einstellungen gefunden.\n"
 
-#: describe.c:2864
+#: describe.c:2873
 msgid "List of settings"
 msgstr "Liste der Einstellungen"
 
-#: describe.c:2933
+#: describe.c:2942
 msgid "index"
 msgstr "Index"
 
-#: describe.c:2935
+#: describe.c:2944
 msgid "special"
 msgstr "speziell"
 
-#: describe.c:2943 describe.c:4385
+#: describe.c:2952 describe.c:4421
 msgid "Table"
 msgstr "Tabelle"
 
-#: describe.c:3019
+#: describe.c:3028
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "Keine passenden Relationen gefunden.\n"
 
-#: describe.c:3021
+#: describe.c:3030
 #, c-format
 msgid "No relations found.\n"
 msgstr "Keine Relationen gefunden.\n"
 
-#: describe.c:3026
+#: describe.c:3035
 msgid "List of relations"
 msgstr "Liste der Relationen"
 
-#: describe.c:3063
+#: describe.c:3072
 msgid "Trusted"
 msgstr "Vertraut"
 
-#: describe.c:3071
+#: describe.c:3080
 msgid "Internal Language"
 msgstr "Interne Sprache"
 
-#: describe.c:3072
+#: describe.c:3081
 msgid "Call Handler"
 msgstr "Call-Handler"
 
-#: describe.c:3073 describe.c:4174
+#: describe.c:3082 describe.c:4201
 msgid "Validator"
 msgstr "Validator"
 
-#: describe.c:3076
+#: describe.c:3085
 msgid "Inline Handler"
 msgstr "Inline-Handler"
 
-#: describe.c:3104
+#: describe.c:3113
 msgid "List of languages"
 msgstr "Liste der Sprachen"
 
-#: describe.c:3148
+#: describe.c:3157
 msgid "Modifier"
 msgstr "Attribut"
 
-#: describe.c:3149
+#: describe.c:3158
 msgid "Check"
 msgstr "Check"
 
-#: describe.c:3191
+#: describe.c:3200
 msgid "List of domains"
 msgstr "Liste der Domänen"
 
-#: describe.c:3225
+#: describe.c:3234
 msgid "Source"
 msgstr "Quelle"
 
-#: describe.c:3226
+#: describe.c:3235
 msgid "Destination"
 msgstr "Ziel"
 
-#: describe.c:3227 describe.c:3376
+#: describe.c:3236 describe.c:3385
 msgid "no"
 msgstr "nein"
 
-#: describe.c:3227 describe.c:3378
+#: describe.c:3236 describe.c:3387
 msgid "yes"
 msgstr "ja"
 
-#: describe.c:3228
+#: describe.c:3237
 msgid "Default?"
 msgstr "Standard?"
 
-#: describe.c:3265
+#: describe.c:3274
 msgid "List of conversions"
 msgstr "Liste der Konversionen"
 
-#: describe.c:3304
+#: describe.c:3313
 msgid "Event"
 msgstr "Ereignis"
 
-#: describe.c:3306
+#: describe.c:3315
 msgid "enabled"
 msgstr "eingeschaltet"
 
-#: describe.c:3307
+#: describe.c:3316
 msgid "replica"
 msgstr "Replika"
 
-#: describe.c:3308
+#: describe.c:3317
 msgid "always"
 msgstr "immer"
 
-#: describe.c:3309
+#: describe.c:3318
 msgid "disabled"
 msgstr "ausgeschaltet"
 
-#: describe.c:3310
+#: describe.c:3319
 msgid "Enabled"
 msgstr "Eingeschaltet"
 
-#: describe.c:3311
+#: describe.c:3320
 msgid "Procedure"
 msgstr "Prozedur"
 
-#: describe.c:3312
+#: describe.c:3321
 msgid "Tags"
 msgstr "Tags"
 
-#: describe.c:3331
+#: describe.c:3340
 msgid "List of event triggers"
 msgstr "Liste der Ereignistrigger"
 
-#: describe.c:3373
+#: describe.c:3382
 msgid "Source type"
 msgstr "Quelltyp"
 
-#: describe.c:3374
+#: describe.c:3383
 msgid "Target type"
 msgstr "Zieltyp"
 
-#: describe.c:3377
+#: describe.c:3386
 msgid "in assignment"
 msgstr "in Zuweisung"
 
-#: describe.c:3379
+#: describe.c:3388
 msgid "Implicit?"
 msgstr "Implizit?"
 
-#: describe.c:3430
+#: describe.c:3439
 msgid "List of casts"
 msgstr "Liste der Typumwandlungen"
 
-#: describe.c:3456
+#: describe.c:3467
 #, c-format
-msgid "The server (version %d.%d) does not support collations.\n"
-msgstr "Der Server (Version %d.%d) unterstützt keine Sortierfolgen.\n"
+msgid "The server (version %s) does not support collations.\n"
+msgstr "Der Server (Version %s) unterstützt keine Sortierfolgen.\n"
 
-#: describe.c:3506
+#: describe.c:3518
 msgid "List of collations"
 msgstr "Liste der Sortierfolgen"
 
-#: describe.c:3565
+#: describe.c:3577
 msgid "List of schemas"
 msgstr "Liste der Schemas"
 
-#: describe.c:3588 describe.c:3823 describe.c:3891 describe.c:3959
+#: describe.c:3602 describe.c:3840 describe.c:3911 describe.c:3982
 #, 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"
+msgid "The server (version %s) does not support full text search.\n"
+msgstr "Der Server (Version %s) unterstützt keine Volltextsuche.\n"
 
-#: describe.c:3622
+#: describe.c:3637
 msgid "List of text search parsers"
 msgstr "Liste der Textsucheparser"
 
-#: describe.c:3665
+#: describe.c:3680
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
-msgstr "Kein Textsucheparser namens „%s“ gefunden\n"
+msgstr "Kein Textsucheparser namens »%s« gefunden\n"
 
-#: describe.c:3740
+#: describe.c:3755
 msgid "Start parse"
 msgstr "Parsen starten"
 
-#: describe.c:3741
+#: describe.c:3756
 msgid "Method"
 msgstr "Methode"
 
-#: describe.c:3745
+#: describe.c:3760
 msgid "Get next token"
 msgstr "Nächstes Token lesen"
 
-#: describe.c:3747
+#: describe.c:3762
 msgid "End parse"
 msgstr "Parsen beenden"
 
-#: describe.c:3749
+#: describe.c:3764
 msgid "Get headline"
 msgstr "Ãœberschrift ermitteln"
 
-#: describe.c:3751
+#: describe.c:3766
 msgid "Get token types"
 msgstr "Tokentypen ermitteln"
 
-#: describe.c:3761
+#: describe.c:3776
 #, c-format
 msgid "Text search parser \"%s.%s\""
-msgstr "Textsucheparser „%s.%s“"
+msgstr "Textsucheparser »%s.%s«"
 
-#: describe.c:3763
+#: describe.c:3778
 #, c-format
 msgid "Text search parser \"%s\""
-msgstr "Textsucheparser „%s“"
+msgstr "Textsucheparser »%s«"
 
-#: describe.c:3782
+#: describe.c:3797
 msgid "Token name"
 msgstr "Tokenname"
 
-#: describe.c:3793
+#: describe.c:3808
 #, c-format
 msgid "Token types for parser \"%s.%s\""
-msgstr "Tokentypen für Parser „%s.%s“"
+msgstr "Tokentypen für Parser »%s.%s«"
 
-#: describe.c:3795
+#: describe.c:3810
 #, c-format
 msgid "Token types for parser \"%s\""
-msgstr "Tokentypen für Parser „%s“"
+msgstr "Tokentypen für Parser »%s«"
 
-#: describe.c:3845
+#: describe.c:3863
 msgid "Template"
 msgstr "Vorlage"
 
-#: describe.c:3846
+#: describe.c:3864
 msgid "Init options"
 msgstr "Initialisierungsoptionen"
 
-#: describe.c:3868
+#: describe.c:3886
 msgid "List of text search dictionaries"
 msgstr "Liste der Textsuchewörterbücher"
 
-#: describe.c:3908
+#: describe.c:3929
 msgid "Init"
 msgstr "Init"
 
-#: describe.c:3909
+#: describe.c:3930
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:3936
+#: describe.c:3957
 msgid "List of text search templates"
 msgstr "Liste der Textsuchevorlagen"
 
-#: describe.c:3993
+#: describe.c:4017
 msgid "List of text search configurations"
 msgstr "Liste der Textsuchekonfigurationen"
 
-#: describe.c:4037
+#: describe.c:4061
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
-msgstr "Keine Textsuchekonfiguration namens „%s“ gefunden\n"
+msgstr "Keine Textsuchekonfiguration namens »%s« gefunden\n"
 
-#: describe.c:4103
+#: describe.c:4127
 msgid "Token"
 msgstr "Token"
 
-#: describe.c:4104
+#: describe.c:4128
 msgid "Dictionaries"
 msgstr "Wörterbücher"
 
-#: describe.c:4115
+#: describe.c:4139
 #, c-format
 msgid "Text search configuration \"%s.%s\""
-msgstr "Textsuchekonfiguration „%s.%s“"
+msgstr "Textsuchekonfiguration »%s.%s«"
 
-#: describe.c:4118
+#: describe.c:4142
 #, c-format
 msgid "Text search configuration \"%s\""
-msgstr "Textsuchekonfiguration „%s“"
+msgstr "Textsuchekonfiguration »%s«"
 
-#: describe.c:4122
+#: describe.c:4146
 #, c-format
 msgid ""
 "\n"
 "Parser: \"%s.%s\""
 msgstr ""
 "\n"
-"Parser: „%s.%s“"
+"Parser: »%s.%s«"
 
-#: describe.c:4125
+#: describe.c:4149
 #, c-format
 msgid ""
 "\n"
 "Parser: \"%s\""
 msgstr ""
 "\n"
-"Parser: „%s“"
+"Parser: »%s«"
 
-#: describe.c:4157
+#: describe.c:4183
 #, 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"
+msgid "The server (version %s) does not support foreign-data wrappers.\n"
+msgstr "Der Server (Version %s) unterstützt keine Fremddaten-Wrapper.\n"
 
-#: describe.c:4171
+#: describe.c:4198
 msgid "Handler"
 msgstr "Handler"
 
-#: describe.c:4214
+#: describe.c:4241
 msgid "List of foreign-data wrappers"
 msgstr "Liste der Fremddaten-Wrapper"
 
-#: describe.c:4237
+#: describe.c:4266
 #, 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"
+msgid "The server (version %s) does not support foreign servers.\n"
+msgstr "Der Server (Version %s) unterstützt keine Fremdserver.\n"
 
-#: describe.c:4249
+#: describe.c:4279
 msgid "Foreign-data wrapper"
 msgstr "Fremddaten-Wrapper"
 
-#: describe.c:4267 describe.c:4462
+#: describe.c:4297 describe.c:4502
 msgid "Version"
 msgstr "Version"
 
-#: describe.c:4293
+#: describe.c:4323
 msgid "List of foreign servers"
 msgstr "Liste der Fremdserver"
 
-#: describe.c:4316
+#: describe.c:4348
 #, 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"
+msgid "The server (version %s) does not support user mappings.\n"
+msgstr "Der Server (Version %s) unterstützt keine Benutzerabbildungen.\n"
 
-#: describe.c:4325 describe.c:4386
+#: describe.c:4358 describe.c:4422
 msgid "Server"
 msgstr "Server"
 
-#: describe.c:4326
+#: describe.c:4359
 msgid "User name"
 msgstr "Benutzername"
 
-#: describe.c:4351
+#: describe.c:4384
 msgid "List of user mappings"
 msgstr "Liste der Benutzerabbildungen"
 
-#: describe.c:4374
+#: describe.c:4409
 #, 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"
+msgid "The server (version %s) does not support foreign tables.\n"
+msgstr "Der Server (Version %s) unterstützt keine Fremdtabellen.\n"
 
-#: describe.c:4425
+#: describe.c:4462
 msgid "List of foreign tables"
 msgstr "Liste der Fremdtabellen"
 
-#: describe.c:4448 describe.c:4502
+#: describe.c:4487 describe.c:4544
 #, c-format
-msgid "The server (version %d.%d) does not support extensions.\n"
-msgstr "Der Server (Version %d.%d) unterstützt keine Erweiterungen.\n"
+msgid "The server (version %s) does not support extensions.\n"
+msgstr "Der Server (Version %s) unterstützt keine Erweiterungen.\n"
 
-#: describe.c:4479
+#: describe.c:4519
 msgid "List of installed extensions"
 msgstr "Liste der installierten Erweiterungen"
 
-#: describe.c:4529
+#: describe.c:4572
 #, c-format
 msgid "Did not find any extension named \"%s\".\n"
-msgstr "Keine Erweiterungen namens „%s“ gefunden\n"
+msgstr "Keine Erweiterungen namens »%s« gefunden\n"
 
-#: describe.c:4532
+#: describe.c:4575
 #, c-format
 msgid "Did not find any extensions.\n"
 msgstr "Keine Erweiterungen gefunden\n"
 
-#: describe.c:4576
+#: describe.c:4619
 msgid "Object Description"
 msgstr "Objektbeschreibung"
 
-#: describe.c:4585
+#: describe.c:4628
 #, c-format
 msgid "Objects in extension \"%s\""
-msgstr "Objekte in Erweiterung „%s“"
+msgstr "Objekte in Erweiterung »%s«"
 
 #: help.c:63
 #, c-format
@@ -1788,7 +1797,7 @@
 msgid "  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
 msgstr ""
 "  -d, --dbname=DBNAME      Datenbank, zu der verbunden werden soll\n"
-"                           (Standard: „%s“)\n"
+"                           (Standard: »%s«)\n"
 
 #: help.c:81
 #, c-format
@@ -1827,7 +1836,7 @@
 "  -1 (\"one\"), --single-transaction\n"
 "                           execute as a single transaction (if non-interactive)\n"
 msgstr ""
-"  -1 („eins“), --single-transaction\n"
+"  -1 (»eins«), --single-transaction\n"
 "                           als eine einzige Transaktion ausführen (wenn nicht\n"
 "                           interaktiv)\n"
 
@@ -1931,7 +1940,7 @@
 msgstr ""
 "  -F, --field-separator=ZEICHEN\n"
 "                           Feldtrennzeichen für unausgerichteten Ausgabemodus\n"
-"                           (Standard: „%s“)\n"
+"                           (Standard: »%s«)\n"
 
 #: help.c:111
 #, c-format
@@ -1963,7 +1972,7 @@
 #: help.c:116
 #, c-format
 msgid "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, border)\n"
-msgstr "  -T, --table-attr=TEXT    HTML „table“-Tag-Attribute setzen (z.B. width, border)\n"
+msgstr "  -T, --table-attr=TEXT    HTML »table«-Tag-Attribute setzen (z.B. width, border)\n"
 
 #: help.c:117
 #, c-format
@@ -2004,7 +2013,7 @@
 msgid "  -h, --host=HOSTNAME      database server host or socket directory (default: \"%s\")\n"
 msgstr ""
 "  -h, --host=HOSTNAME      Hostname des Datenbankservers oder\n"
-"                           Socket-Verzeichnis (Standard: „%s“)\n"
+"                           Socket-Verzeichnis (Standard: »%s«)\n"
 
 #: help.c:127
 msgid "local socket"
@@ -2013,12 +2022,12 @@
 #: help.c:130
 #, c-format
 msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
-msgstr "  -p, --port=PORT          Port des Datenbankservers (Standard: „%s“)\n"
+msgstr "  -p, --port=PORT          Port des Datenbankservers (Standard: »%s«)\n"
 
 #: help.c:136
 #, c-format
 msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
-msgstr "  -U, --username=NAME      Datenbank-Benutzername (Standard: „%s“)\n"
+msgstr "  -U, --username=NAME      Datenbank-Benutzername (Standard: »%s«)\n"
 
 #: help.c:137
 #, c-format
@@ -2040,8 +2049,8 @@
 "\n"
 msgstr ""
 "\n"
-"Für mehr Informationen, geben Sie „\\?“ (für interne Anweisungen) oder\n"
-"„\\help“ (für SQL-Anweisungen) in psql ein oder schauen Sie in den psql-\n"
+"Für mehr Informationen, geben Sie »\\?« (für interne Anweisungen) oder\n"
+"»\\help« (für SQL-Anweisungen) in psql ein oder schauen Sie in den psql-\n"
 "Abschnitt der PostgreSQL-Dokumentation.\n"
 "\n"
 
@@ -2122,7 +2131,7 @@
 #: help.c:184
 #, c-format
 msgid "  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
-msgstr "  \\ef [FUNKNAME [LINE]]  Funktionsdefinition mit externem Editor bearbeiten\n"
+msgstr "  \\ef [FUNKNAME [ZEILE]] Funktionsdefinition mit externem Editor bearbeiten\n"
 
 #: help.c:185
 #, c-format
@@ -2383,7 +2392,7 @@
 #: help.c:241
 #, c-format
 msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
-msgstr "  \\sf[+] [FUNKNAME]      Funktionsdefinition zeigen\n"
+msgstr "  \\sf[+] FUNKNAME        Funktionsdefinition zeigen\n"
 
 #: help.c:242
 #, c-format
@@ -2457,7 +2466,7 @@
 "                         connect to new database (currently \"%s\")\n"
 msgstr ""
 "  \\c[onnect] {[DBNAME|- BENUTZER|- HOST|- PORT|-] | conninfo}\n"
-"                         mit neuer Datenbank verbinden (aktuell „%s“)\n"
+"                         mit neuer Datenbank verbinden (aktuell »%s«)\n"
 
 #: help.c:268
 #, c-format
@@ -2611,7 +2620,7 @@
 "                     if set to \"noexec\", just show without execution\n"
 msgstr ""
 "  ECHO_HIDDEN        wenn gesetzt, interne Anfragen, die von Backslash-Befehlen\n"
-"                     ausgeführt werden, anzeigen; wenn auf „noexec“ gesetzt, nur\n"
+"                     ausgeführt werden, anzeigen; wenn auf »noexec« gesetzt, nur\n"
 "                     anzeigen, nicht ausführen\n"
 
 #: help.c:325
@@ -2751,7 +2760,7 @@
 #: help.c:351
 #, c-format
 msgid "  columns            target width for the wrapped format\n"
-msgstr "  columns            Zielbreite für das Format „wrapped“\n"
+msgstr "  columns            Zielbreite für das Format »wrapped«\n"
 
 #: help.c:352
 #, c-format
@@ -2763,7 +2772,7 @@
 msgid "  fieldsep           field separator for unaligned output (default \"%s\")\n"
 msgstr ""
 "  fieldsep           Feldtrennzeichen für unausgerichteten Ausgabemodus\n"
-"                     (Standard „%s“)\n"
+"                     (Standard »%s«)\n"
 
 #: help.c:354
 #, c-format
@@ -2828,9 +2837,9 @@
 "  tableattr (or T)   specify attributes for table tag in html format or proportional\n"
 "                     column widths for left-aligned data types in latex-longtable format\n"
 msgstr ""
-"  tableattr (or T)   Attribute für das „table“-Tag im Format „html“ oder\n"
+"  tableattr (or T)   Attribute für das »table«-Tag im Format »html« oder\n"
 "                     proportionale Spaltenbreite für links ausgerichtete Datentypen\n"
-"                     im Format „latex-longtable“\n"
+"                     im Format »latex-longtable«\n"
 
 #: help.c:366
 #, c-format
@@ -2893,7 +2902,7 @@
 #: help.c:382
 #, c-format
 msgid "  COLUMNS            number of columns for wrapped format\n"
-msgstr "  COLUMNS            Anzahl Spalten im Format „wrapped“\n"
+msgstr "  COLUMNS            Anzahl Spalten im Format »wrapped«\n"
 
 #: help.c:383
 #, c-format
@@ -2903,27 +2912,27 @@
 #: help.c:384
 #, c-format
 msgid "  PGAPPNAME          same as the application_name connection parameter\n"
-msgstr "  PGAPPNAME          wie Verbindungsparameter „application_name“\n"
+msgstr "  PGAPPNAME          wie Verbindungsparameter »application_name«\n"
 
 #: help.c:385
 #, c-format
 msgid "  PGDATABASE         same as the dbname connection parameter\n"
-msgstr "  PGDATABASE         wie Verbindungsparameter „dbname“\n"
+msgstr "  PGDATABASE         wie Verbindungsparameter »dbname«\n"
 
 #: help.c:386
 #, c-format
 msgid "  PGHOST             same as the host connection parameter\n"
-msgstr "  PGHOST             wie Verbindungsparameter „host“\n"
+msgstr "  PGHOST             wie Verbindungsparameter »host«\n"
 
 #: help.c:387
 #, c-format
 msgid "  PGPORT             same as the port connection parameter\n"
-msgstr "  PGPORT             wie Verbindungsparameter „port“\n"
+msgstr "  PGPORT             wie Verbindungsparameter »port«\n"
 
 #: help.c:388
 #, c-format
 msgid "  PGUSER             same as the user connection parameter\n"
-msgstr "  PGUSER             wie Verbindungsparameter „user“\n"
+msgstr "  PGUSER             wie Verbindungsparameter »user«\n"
 
 #: help.c:389
 #, c-format
@@ -2998,7 +3007,7 @@
 "No help available for \"%s\".\n"
 "Try \\h with no arguments to see available help.\n"
 msgstr ""
-"Keine Hilfe verfügbar für „%s“.\n"
+"Keine Hilfe verfügbar für »%s«.\n"
 "Versuchen Sie \\h ohne Argumente, um die verfügbare Hilfe zu sehen.\n"
 
 #: input.c:205
@@ -3009,7 +3018,7 @@
 #: input.c:460 input.c:499
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
-msgstr "konnte Befehlsgeschichte nicht in „%s“ speichern: %s\n"
+msgstr "konnte Befehlsgeschichte nicht in »%s« speichern: %s\n"
 
 #: input.c:519
 #, c-format
@@ -3042,7 +3051,7 @@
 #: mainloop.c:161
 #, c-format
 msgid "Use \"\\q\" to leave %s.\n"
-msgstr "Verwenden Sie „\\q“, um %s zu verlassen.\n"
+msgstr "Verwenden Sie »\\q«, um %s zu verlassen.\n"
 
 #: mainloop.c:183
 msgid ""
@@ -3079,22 +3088,22 @@
 msgstr[0] "(%lu Zeile)"
 msgstr[1] "(%lu Zeilen)"
 
-#: print.c:2902
+#: print.c:2910
 #, c-format
 msgid "Interrupted\n"
 msgstr "Unterbrochen\n"
 
-#: print.c:2966
+#: print.c:2974
 #, c-format
 msgid "Cannot add header to table content: column count of %d exceeded.\n"
 msgstr "Kann keinen weiteren Spaltenkopf zur Tabelle hinzufügen: Spaltenzahl %d überschritten.\n"
 
-#: print.c:3006
+#: print.c:3014
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
 msgstr "Cann keine weitere Zelle zur Tabelle hinzufügen: Zellengesamtzahl %d überschritten.\n"
 
-#: print.c:3255
+#: print.c:3263
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "ungültiges Ausgabeformat (interner Fehler): %d"
@@ -3102,19 +3111,19 @@
 #: psqlscan.l:751
 #, c-format
 msgid "skipping recursive expansion of variable \"%s\"\n"
-msgstr "rekursive Auswertung der Variable „%s“ wird ausgelassen\n"
+msgstr "rekursive Auswertung der Variable »%s« wird ausgelassen\n"
 
-#: psqlscan.l:1627
+#: psqlscan.l:1628
 #, c-format
 msgid "unterminated quoted string\n"
 msgstr "Zeichenkette in Anführungszeichen nicht abgeschlossen\n"
 
-#: psqlscan.l:1727
+#: psqlscan.l:1728
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: Speicher aufgebraucht\n"
 
-#: psqlscan.l:1956
+#: psqlscan.l:1957
 #, c-format
 msgid "can't escape without active connection\n"
 msgstr "Escape kann nicht ohne aktive Verbindung ausgeführt werden\n"
@@ -3129,158 +3138,156 @@
 #: sql_help.c:367 sql_help.c:369 sql_help.c:412 sql_help.c:414 sql_help.c:417
 #: sql_help.c:419 sql_help.c:483 sql_help.c:488 sql_help.c:493 sql_help.c:498
 #: sql_help.c:546 sql_help.c:548 sql_help.c:550 sql_help.c:553 sql_help.c:555
-#: sql_help.c:566 sql_help.c:568 sql_help.c:608 sql_help.c:610 sql_help.c:613
-#: sql_help.c:615 sql_help.c:617 sql_help.c:646 sql_help.c:650 sql_help.c:668
-#: sql_help.c:671 sql_help.c:674 sql_help.c:703 sql_help.c:715 sql_help.c:723
-#: sql_help.c:726 sql_help.c:729 sql_help.c:744 sql_help.c:747 sql_help.c:792
-#: sql_help.c:815 sql_help.c:826 sql_help.c:828 sql_help.c:845 sql_help.c:854
-#: sql_help.c:856 sql_help.c:858 sql_help.c:870 sql_help.c:874 sql_help.c:876
-#: sql_help.c:960 sql_help.c:962 sql_help.c:965 sql_help.c:968 sql_help.c:970
-#: sql_help.c:972 sql_help.c:1033 sql_help.c:1035 sql_help.c:1037
-#: sql_help.c:1040 sql_help.c:1061 sql_help.c:1064 sql_help.c:1067
-#: sql_help.c:1070 sql_help.c:1074 sql_help.c:1076 sql_help.c:1078
-#: sql_help.c:1080 sql_help.c:1094 sql_help.c:1097 sql_help.c:1099
-#: sql_help.c:1101 sql_help.c:1111 sql_help.c:1113 sql_help.c:1123
-#: sql_help.c:1125 sql_help.c:1134 sql_help.c:1155 sql_help.c:1157
-#: sql_help.c:1159 sql_help.c:1162 sql_help.c:1164 sql_help.c:1166
-#: sql_help.c:1216 sql_help.c:1254 sql_help.c:1257 sql_help.c:1259
-#: sql_help.c:1261 sql_help.c:1263 sql_help.c:1265 sql_help.c:1268
-#: sql_help.c:1308 sql_help.c:1555 sql_help.c:1571 sql_help.c:1584
-#: sql_help.c:1635 sql_help.c:1639 sql_help.c:1649 sql_help.c:1669
-#: sql_help.c:1694 sql_help.c:1712 sql_help.c:1740 sql_help.c:1814
-#: sql_help.c:1857 sql_help.c:1879 sql_help.c:1899 sql_help.c:1900
-#: sql_help.c:1935 sql_help.c:1955 sql_help.c:1977 sql_help.c:1990
-#: sql_help.c:2022 sql_help.c:2047 sql_help.c:2091 sql_help.c:2277
-#: sql_help.c:2290 sql_help.c:2307 sql_help.c:2323 sql_help.c:2362
-#: sql_help.c:2413 sql_help.c:2417 sql_help.c:2419 sql_help.c:2425
-#: sql_help.c:2443 sql_help.c:2470 sql_help.c:2505 sql_help.c:2517
-#: sql_help.c:2526 sql_help.c:2576 sql_help.c:2604 sql_help.c:2612
-#: sql_help.c:2620 sql_help.c:2628 sql_help.c:2636 sql_help.c:2644
-#: sql_help.c:2652 sql_help.c:2660 sql_help.c:2669 sql_help.c:2680
-#: sql_help.c:2688 sql_help.c:2696 sql_help.c:2704 sql_help.c:2712
-#: sql_help.c:2722 sql_help.c:2731 sql_help.c:2740 sql_help.c:2748
-#: sql_help.c:2757 sql_help.c:2765 sql_help.c:2774 sql_help.c:2782
-#: sql_help.c:2790 sql_help.c:2798 sql_help.c:2806 sql_help.c:2814
-#: sql_help.c:2822 sql_help.c:2830 sql_help.c:2838 sql_help.c:2855
-#: sql_help.c:2864 sql_help.c:2872 sql_help.c:2889 sql_help.c:2904
-#: sql_help.c:3169 sql_help.c:3220 sql_help.c:3249 sql_help.c:3257
-#: sql_help.c:3676 sql_help.c:3724 sql_help.c:3865
+#: sql_help.c:566 sql_help.c:568 sql_help.c:607 sql_help.c:609 sql_help.c:612
+#: sql_help.c:614 sql_help.c:616 sql_help.c:644 sql_help.c:648 sql_help.c:666
+#: sql_help.c:669 sql_help.c:672 sql_help.c:701 sql_help.c:713 sql_help.c:721
+#: sql_help.c:724 sql_help.c:727 sql_help.c:742 sql_help.c:745 sql_help.c:790
+#: sql_help.c:813 sql_help.c:824 sql_help.c:826 sql_help.c:843 sql_help.c:852
+#: sql_help.c:854 sql_help.c:856 sql_help.c:868 sql_help.c:872 sql_help.c:874
+#: sql_help.c:958 sql_help.c:960 sql_help.c:963 sql_help.c:966 sql_help.c:968
+#: sql_help.c:970 sql_help.c:1031 sql_help.c:1033 sql_help.c:1035
+#: sql_help.c:1038 sql_help.c:1059 sql_help.c:1062 sql_help.c:1065
+#: sql_help.c:1068 sql_help.c:1072 sql_help.c:1074 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1092 sql_help.c:1095 sql_help.c:1097
+#: sql_help.c:1099 sql_help.c:1109 sql_help.c:1111 sql_help.c:1121
+#: sql_help.c:1123 sql_help.c:1132 sql_help.c:1153 sql_help.c:1155
+#: sql_help.c:1157 sql_help.c:1160 sql_help.c:1162 sql_help.c:1164
+#: sql_help.c:1215 sql_help.c:1257 sql_help.c:1260 sql_help.c:1262
+#: sql_help.c:1264 sql_help.c:1266 sql_help.c:1268 sql_help.c:1271
+#: sql_help.c:1311 sql_help.c:1558 sql_help.c:1574 sql_help.c:1587
+#: sql_help.c:1638 sql_help.c:1642 sql_help.c:1652 sql_help.c:1672
+#: sql_help.c:1697 sql_help.c:1715 sql_help.c:1743 sql_help.c:1817
+#: sql_help.c:1860 sql_help.c:1882 sql_help.c:1902 sql_help.c:1903
+#: sql_help.c:1938 sql_help.c:1958 sql_help.c:1980 sql_help.c:1993
+#: sql_help.c:2025 sql_help.c:2050 sql_help.c:2094 sql_help.c:2280
+#: sql_help.c:2293 sql_help.c:2310 sql_help.c:2326 sql_help.c:2365
+#: sql_help.c:2416 sql_help.c:2420 sql_help.c:2422 sql_help.c:2428
+#: sql_help.c:2446 sql_help.c:2474 sql_help.c:2509 sql_help.c:2521
+#: sql_help.c:2530 sql_help.c:2580 sql_help.c:2608 sql_help.c:2616
+#: sql_help.c:2624 sql_help.c:2632 sql_help.c:2640 sql_help.c:2648
+#: sql_help.c:2656 sql_help.c:2664 sql_help.c:2673 sql_help.c:2684
+#: sql_help.c:2692 sql_help.c:2700 sql_help.c:2708 sql_help.c:2716
+#: sql_help.c:2726 sql_help.c:2735 sql_help.c:2744 sql_help.c:2752
+#: sql_help.c:2761 sql_help.c:2769 sql_help.c:2778 sql_help.c:2786
+#: sql_help.c:2794 sql_help.c:2802 sql_help.c:2810 sql_help.c:2818
+#: sql_help.c:2826 sql_help.c:2834 sql_help.c:2842 sql_help.c:2859
+#: sql_help.c:2868 sql_help.c:2876 sql_help.c:2893 sql_help.c:2908
+#: sql_help.c:3173 sql_help.c:3224 sql_help.c:3253 sql_help.c:3261
+#: sql_help.c:3680 sql_help.c:3728 sql_help.c:3869
 msgid "name"
 msgstr "Name"
 
-#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1372
-#: sql_help.c:2577 sql_help.c:3472
+#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1375
+#: sql_help.c:2581 sql_help.c:3476
 msgid "aggregate_signature"
 msgstr "Aggregatsignatur"
 
 #: sql_help.c:35 sql_help.c:62 sql_help.c:77 sql_help.c:113 sql_help.c:233
 #: sql_help.c:251 sql_help.c:370 sql_help.c:418 sql_help.c:492 sql_help.c:533
-#: sql_help.c:547 sql_help.c:567 sql_help.c:614 sql_help.c:670 sql_help.c:725
-#: sql_help.c:746 sql_help.c:793 sql_help.c:817 sql_help.c:827 sql_help.c:857
-#: sql_help.c:877 sql_help.c:969 sql_help.c:1034 sql_help.c:1077
-#: sql_help.c:1098 sql_help.c:1112 sql_help.c:1124 sql_help.c:1136
-#: sql_help.c:1163 sql_help.c:1217 sql_help.c:1262
+#: sql_help.c:547 sql_help.c:567 sql_help.c:613 sql_help.c:668 sql_help.c:723
+#: sql_help.c:744 sql_help.c:791 sql_help.c:815 sql_help.c:825 sql_help.c:855
+#: sql_help.c:875 sql_help.c:967 sql_help.c:1032 sql_help.c:1075
+#: sql_help.c:1096 sql_help.c:1110 sql_help.c:1122 sql_help.c:1134
+#: sql_help.c:1161 sql_help.c:1216 sql_help.c:1265
 msgid "new_name"
 msgstr "neuer_Name"
 
 #: sql_help.c:38 sql_help.c:64 sql_help.c:79 sql_help.c:115 sql_help.c:231
 #: sql_help.c:249 sql_help.c:368 sql_help.c:454 sql_help.c:497 sql_help.c:569
-#: sql_help.c:578 sql_help.c:633 sql_help.c:649 sql_help.c:673 sql_help.c:728
-#: sql_help.c:829 sql_help.c:855 sql_help.c:875 sql_help.c:1018
-#: sql_help.c:1036 sql_help.c:1079 sql_help.c:1100 sql_help.c:1158
-#: sql_help.c:1260 sql_help.c:2263
+#: sql_help.c:578 sql_help.c:632 sql_help.c:647 sql_help.c:671 sql_help.c:726
+#: sql_help.c:827 sql_help.c:853 sql_help.c:873 sql_help.c:1016 sql_help.c:1034
+#: sql_help.c:1077 sql_help.c:1098 sql_help.c:1156 sql_help.c:1263
+#: sql_help.c:2266
 msgid "new_owner"
 msgstr "neuer_Eigentümer"
 
 #: sql_help.c:41 sql_help.c:66 sql_help.c:81 sql_help.c:235 sql_help.c:299
-#: sql_help.c:420 sql_help.c:502 sql_help.c:616 sql_help.c:653 sql_help.c:676
-#: sql_help.c:731 sql_help.c:859 sql_help.c:971 sql_help.c:1081
-#: sql_help.c:1102 sql_help.c:1114 sql_help.c:1126 sql_help.c:1165
-#: sql_help.c:1264
+#: sql_help.c:420 sql_help.c:502 sql_help.c:615 sql_help.c:651 sql_help.c:674
+#: sql_help.c:729 sql_help.c:857 sql_help.c:969 sql_help.c:1079 sql_help.c:1100
+#: sql_help.c:1112 sql_help.c:1124 sql_help.c:1163 sql_help.c:1267
 msgid "new_schema"
 msgstr "neues_Schema"
 
-#: sql_help.c:42 sql_help.c:1425 sql_help.c:2578 sql_help.c:3491
+#: sql_help.c:42 sql_help.c:1428 sql_help.c:2582 sql_help.c:3495
 msgid "where aggregate_signature is:"
 msgstr "wobei Aggregatsignatur Folgendes ist:"
 
 #: sql_help.c:43 sql_help.c:46 sql_help.c:49 sql_help.c:316 sql_help.c:341
 #: sql_help.c:344 sql_help.c:347 sql_help.c:484 sql_help.c:489 sql_help.c:494
-#: sql_help.c:499 sql_help.c:1390 sql_help.c:1426 sql_help.c:1429
-#: sql_help.c:1432 sql_help.c:1556 sql_help.c:1572 sql_help.c:1575
-#: sql_help.c:1815 sql_help.c:2579 sql_help.c:2582 sql_help.c:2585
-#: sql_help.c:2670 sql_help.c:3055 sql_help.c:3387 sql_help.c:3478
-#: sql_help.c:3492 sql_help.c:3495 sql_help.c:3498
+#: sql_help.c:499 sql_help.c:1393 sql_help.c:1429 sql_help.c:1432
+#: sql_help.c:1435 sql_help.c:1559 sql_help.c:1575 sql_help.c:1578
+#: sql_help.c:1818 sql_help.c:2583 sql_help.c:2586 sql_help.c:2589
+#: sql_help.c:2674 sql_help.c:3059 sql_help.c:3391 sql_help.c:3482
+#: sql_help.c:3496 sql_help.c:3499 sql_help.c:3502
 msgid "argmode"
 msgstr "Argmodus"
 
 #: sql_help.c:44 sql_help.c:47 sql_help.c:50 sql_help.c:317 sql_help.c:342
 #: sql_help.c:345 sql_help.c:348 sql_help.c:485 sql_help.c:490 sql_help.c:495
-#: sql_help.c:500 sql_help.c:1391 sql_help.c:1427 sql_help.c:1430
-#: sql_help.c:1433 sql_help.c:1557 sql_help.c:1573 sql_help.c:1576
-#: sql_help.c:1816 sql_help.c:2580 sql_help.c:2583 sql_help.c:2586
-#: sql_help.c:2671 sql_help.c:3479 sql_help.c:3493 sql_help.c:3496
-#: sql_help.c:3499
+#: sql_help.c:500 sql_help.c:1394 sql_help.c:1430 sql_help.c:1433
+#: sql_help.c:1436 sql_help.c:1560 sql_help.c:1576 sql_help.c:1579
+#: sql_help.c:1819 sql_help.c:2584 sql_help.c:2587 sql_help.c:2590
+#: sql_help.c:2675 sql_help.c:3483 sql_help.c:3497 sql_help.c:3500
+#: sql_help.c:3503
 msgid "argname"
 msgstr "Argname"
 
 #: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:318 sql_help.c:343
 #: sql_help.c:346 sql_help.c:349 sql_help.c:486 sql_help.c:491 sql_help.c:496
-#: sql_help.c:501 sql_help.c:1392 sql_help.c:1428 sql_help.c:1431
-#: sql_help.c:1434 sql_help.c:1817 sql_help.c:2581 sql_help.c:2584
-#: sql_help.c:2587 sql_help.c:2672 sql_help.c:3480 sql_help.c:3494
-#: sql_help.c:3497 sql_help.c:3500
+#: sql_help.c:501 sql_help.c:1395 sql_help.c:1431 sql_help.c:1434
+#: sql_help.c:1437 sql_help.c:1820 sql_help.c:2585 sql_help.c:2588
+#: sql_help.c:2591 sql_help.c:2676 sql_help.c:3484 sql_help.c:3498
+#: sql_help.c:3501 sql_help.c:3504
 msgid "argtype"
 msgstr "Argtyp"
 
-#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:787
-#: sql_help.c:872 sql_help.c:1095 sql_help.c:1211 sql_help.c:1239
-#: sql_help.c:1482 sql_help.c:1488 sql_help.c:1743 sql_help.c:1775
-#: sql_help.c:1782 sql_help.c:1858 sql_help.c:2023 sql_help.c:2112
-#: sql_help.c:2292 sql_help.c:2471 sql_help.c:2493 sql_help.c:2923
-#: sql_help.c:3089
+#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:785
+#: sql_help.c:870 sql_help.c:1093 sql_help.c:1210 sql_help.c:1242
+#: sql_help.c:1485 sql_help.c:1491 sql_help.c:1746 sql_help.c:1778
+#: sql_help.c:1785 sql_help.c:1861 sql_help.c:2026 sql_help.c:2115
+#: sql_help.c:2295 sql_help.c:2475 sql_help.c:2497 sql_help.c:2927
+#: sql_help.c:3093
 msgid "option"
 msgstr "Option"
 
-#: sql_help.c:108 sql_help.c:788 sql_help.c:1212 sql_help.c:1859
-#: sql_help.c:2024 sql_help.c:2472
+#: sql_help.c:108 sql_help.c:786 sql_help.c:1211 sql_help.c:1862
+#: sql_help.c:2027 sql_help.c:2476
 msgid "where option can be:"
 msgstr "wobei Option Folgendes sein kann:"
 
-#: sql_help.c:109 sql_help.c:1676
+#: sql_help.c:109 sql_help.c:1679
 msgid "allowconn"
 msgstr "allowconn"
 
-#: sql_help.c:110 sql_help.c:789 sql_help.c:1213 sql_help.c:1677
-#: sql_help.c:2025 sql_help.c:2473
+#: sql_help.c:110 sql_help.c:787 sql_help.c:1212 sql_help.c:1680
+#: sql_help.c:2028 sql_help.c:2477
 msgid "connlimit"
 msgstr "Verbindungslimit"
 
-#: sql_help.c:111 sql_help.c:1678
+#: sql_help.c:111 sql_help.c:1681
 msgid "istemplate"
 msgstr "istemplate"
 
-#: sql_help.c:117 sql_help.c:557 sql_help.c:619 sql_help.c:634 sql_help.c:974
-#: sql_help.c:1011
+#: sql_help.c:117 sql_help.c:557 sql_help.c:618 sql_help.c:972 sql_help.c:1009
 msgid "new_tablespace"
 msgstr "neuer_Tablespace"
 
 #: sql_help.c:119 sql_help.c:122 sql_help.c:124 sql_help.c:506 sql_help.c:508
-#: sql_help.c:509 sql_help.c:796 sql_help.c:800 sql_help.c:803 sql_help.c:888
-#: sql_help.c:891 sql_help.c:1219 sql_help.c:1222 sql_help.c:1224
-#: sql_help.c:1826 sql_help.c:3274 sql_help.c:3665
+#: sql_help.c:509 sql_help.c:794 sql_help.c:798 sql_help.c:801 sql_help.c:886
+#: sql_help.c:889 sql_help.c:1219 sql_help.c:1223 sql_help.c:1226
+#: sql_help.c:1829 sql_help.c:3278 sql_help.c:3669
 msgid "configuration_parameter"
 msgstr "Konfigurationsparameter"
 
 #: sql_help.c:120 sql_help.c:366 sql_help.c:438 sql_help.c:444 sql_help.c:456
-#: sql_help.c:507 sql_help.c:552 sql_help.c:625 sql_help.c:631 sql_help.c:797
-#: sql_help.c:873 sql_help.c:889 sql_help.c:890 sql_help.c:993 sql_help.c:1013
-#: sql_help.c:1039 sql_help.c:1096 sql_help.c:1220 sql_help.c:1240
-#: sql_help.c:1744 sql_help.c:1776 sql_help.c:1783 sql_help.c:1827
-#: sql_help.c:1828 sql_help.c:1887 sql_help.c:1919 sql_help.c:2113
-#: sql_help.c:2187 sql_help.c:2195 sql_help.c:2227 sql_help.c:2249
-#: sql_help.c:2266 sql_help.c:2293 sql_help.c:2494 sql_help.c:3090
-#: sql_help.c:3666 sql_help.c:3667
+#: sql_help.c:507 sql_help.c:552 sql_help.c:624 sql_help.c:630 sql_help.c:795
+#: sql_help.c:871 sql_help.c:887 sql_help.c:888 sql_help.c:991 sql_help.c:1011
+#: sql_help.c:1037 sql_help.c:1094 sql_help.c:1220 sql_help.c:1243
+#: sql_help.c:1747 sql_help.c:1779 sql_help.c:1786 sql_help.c:1830
+#: sql_help.c:1831 sql_help.c:1890 sql_help.c:1922 sql_help.c:2116
+#: sql_help.c:2190 sql_help.c:2198 sql_help.c:2230 sql_help.c:2252
+#: sql_help.c:2269 sql_help.c:2296 sql_help.c:2498 sql_help.c:3094
+#: sql_help.c:3670 sql_help.c:3671
 msgid "value"
 msgstr "Wert"
 
@@ -3288,9 +3295,9 @@
 msgid "target_role"
 msgstr "Zielrolle"
 
-#: sql_help.c:183 sql_help.c:1727 sql_help.c:2071 sql_help.c:2076
-#: sql_help.c:3037 sql_help.c:3044 sql_help.c:3058 sql_help.c:3064
-#: sql_help.c:3369 sql_help.c:3376 sql_help.c:3390 sql_help.c:3396
+#: sql_help.c:183 sql_help.c:1730 sql_help.c:2074 sql_help.c:2079
+#: sql_help.c:3041 sql_help.c:3048 sql_help.c:3062 sql_help.c:3068
+#: sql_help.c:3373 sql_help.c:3380 sql_help.c:3394 sql_help.c:3400
 msgid "schema_name"
 msgstr "Schemaname"
 
@@ -3304,32 +3311,32 @@
 
 #: sql_help.c:186 sql_help.c:187 sql_help.c:188 sql_help.c:189 sql_help.c:190
 #: sql_help.c:191 sql_help.c:192 sql_help.c:193 sql_help.c:531 sql_help.c:556
-#: sql_help.c:618 sql_help.c:749 sql_help.c:807 sql_help.c:973 sql_help.c:1227
-#: sql_help.c:1862 sql_help.c:1863 sql_help.c:1864 sql_help.c:1865
-#: sql_help.c:1866 sql_help.c:1992 sql_help.c:2028 sql_help.c:2029
-#: sql_help.c:2030 sql_help.c:2031 sql_help.c:2032 sql_help.c:2476
-#: sql_help.c:2477 sql_help.c:2478 sql_help.c:2479 sql_help.c:2480
-#: sql_help.c:3071 sql_help.c:3072 sql_help.c:3073 sql_help.c:3370
-#: sql_help.c:3374 sql_help.c:3377 sql_help.c:3379 sql_help.c:3381
-#: sql_help.c:3383 sql_help.c:3385 sql_help.c:3391 sql_help.c:3393
-#: sql_help.c:3395 sql_help.c:3397 sql_help.c:3399 sql_help.c:3401
-#: sql_help.c:3402 sql_help.c:3403 sql_help.c:3686
+#: sql_help.c:617 sql_help.c:747 sql_help.c:805 sql_help.c:971 sql_help.c:1230
+#: sql_help.c:1865 sql_help.c:1866 sql_help.c:1867 sql_help.c:1868
+#: sql_help.c:1869 sql_help.c:1995 sql_help.c:2031 sql_help.c:2032
+#: sql_help.c:2033 sql_help.c:2034 sql_help.c:2035 sql_help.c:2480
+#: sql_help.c:2481 sql_help.c:2482 sql_help.c:2483 sql_help.c:2484
+#: sql_help.c:3075 sql_help.c:3076 sql_help.c:3077 sql_help.c:3374
+#: sql_help.c:3378 sql_help.c:3381 sql_help.c:3383 sql_help.c:3385
+#: sql_help.c:3387 sql_help.c:3389 sql_help.c:3395 sql_help.c:3397
+#: sql_help.c:3399 sql_help.c:3401 sql_help.c:3403 sql_help.c:3405
+#: sql_help.c:3406 sql_help.c:3407 sql_help.c:3690
 msgid "role_name"
 msgstr "Rollenname"
 
-#: sql_help.c:219 sql_help.c:431 sql_help.c:984 sql_help.c:986 sql_help.c:1256
-#: sql_help.c:1697 sql_help.c:1701 sql_help.c:1786 sql_help.c:1790
-#: sql_help.c:1883 sql_help.c:2199 sql_help.c:2209 sql_help.c:2231
-#: sql_help.c:3120 sql_help.c:3135 sql_help.c:3137 sql_help.c:3551
-#: sql_help.c:3552 sql_help.c:3561 sql_help.c:3602 sql_help.c:3603
-#: sql_help.c:3604 sql_help.c:3605 sql_help.c:3606 sql_help.c:3607
-#: sql_help.c:3640 sql_help.c:3641 sql_help.c:3646 sql_help.c:3651
-#: sql_help.c:3790 sql_help.c:3791 sql_help.c:3800 sql_help.c:3841
-#: sql_help.c:3842 sql_help.c:3843 sql_help.c:3844 sql_help.c:3845
-#: sql_help.c:3846 sql_help.c:3893 sql_help.c:3895 sql_help.c:3928
-#: sql_help.c:3984 sql_help.c:3985 sql_help.c:3994 sql_help.c:4035
-#: sql_help.c:4036 sql_help.c:4037 sql_help.c:4038 sql_help.c:4039
-#: sql_help.c:4040
+#: sql_help.c:219 sql_help.c:431 sql_help.c:982 sql_help.c:984 sql_help.c:1259
+#: sql_help.c:1700 sql_help.c:1704 sql_help.c:1789 sql_help.c:1793
+#: sql_help.c:1886 sql_help.c:2202 sql_help.c:2212 sql_help.c:2234
+#: sql_help.c:3124 sql_help.c:3139 sql_help.c:3141 sql_help.c:3555
+#: sql_help.c:3556 sql_help.c:3565 sql_help.c:3606 sql_help.c:3607
+#: sql_help.c:3608 sql_help.c:3609 sql_help.c:3610 sql_help.c:3611
+#: sql_help.c:3644 sql_help.c:3645 sql_help.c:3650 sql_help.c:3655
+#: sql_help.c:3794 sql_help.c:3795 sql_help.c:3804 sql_help.c:3845
+#: sql_help.c:3846 sql_help.c:3847 sql_help.c:3848 sql_help.c:3849
+#: sql_help.c:3850 sql_help.c:3897 sql_help.c:3899 sql_help.c:3932
+#: sql_help.c:3988 sql_help.c:3989 sql_help.c:3998 sql_help.c:4039
+#: sql_help.c:4040 sql_help.c:4041 sql_help.c:4042 sql_help.c:4043
+#: sql_help.c:4044
 msgid "expression"
 msgstr "Ausdruck"
 
@@ -3338,18 +3345,17 @@
 msgstr "Domänen-Constraint"
 
 #: sql_help.c:224 sql_help.c:226 sql_help.c:229 sql_help.c:446 sql_help.c:447
-#: sql_help.c:966 sql_help.c:999 sql_help.c:1000 sql_help.c:1001
-#: sql_help.c:1021 sql_help.c:1378 sql_help.c:1380 sql_help.c:1700
-#: sql_help.c:1785 sql_help.c:1789 sql_help.c:2198 sql_help.c:2208
-#: sql_help.c:3132
+#: sql_help.c:964 sql_help.c:997 sql_help.c:998 sql_help.c:999 sql_help.c:1019
+#: sql_help.c:1381 sql_help.c:1383 sql_help.c:1703 sql_help.c:1788
+#: sql_help.c:1792 sql_help.c:2201 sql_help.c:2211 sql_help.c:3136
 msgid "constraint_name"
 msgstr "Constraint-Name"
 
-#: sql_help.c:227 sql_help.c:967
+#: sql_help.c:227 sql_help.c:965
 msgid "new_constraint_name"
 msgstr "neuer_Constraint-Name"
 
-#: sql_help.c:297 sql_help.c:871
+#: sql_help.c:297 sql_help.c:869
 msgid "new_version"
 msgstr "neue_Version"
 
@@ -3361,17 +3367,17 @@
 msgid "where member_object is:"
 msgstr "wobei Elementobjekt Folgendes ist:"
 
-#: sql_help.c:305 sql_help.c:1371 sql_help.c:3471
+#: sql_help.c:305 sql_help.c:1374 sql_help.c:3475
 msgid "aggregate_name"
 msgstr "Aggregatname"
 
-#: sql_help.c:307 sql_help.c:1373 sql_help.c:1615 sql_help.c:1619
-#: sql_help.c:1621 sql_help.c:2595
+#: sql_help.c:307 sql_help.c:1376 sql_help.c:1618 sql_help.c:1622
+#: sql_help.c:1624 sql_help.c:2599
 msgid "source_type"
 msgstr "Quelltyp"
 
-#: sql_help.c:308 sql_help.c:1374 sql_help.c:1616 sql_help.c:1620
-#: sql_help.c:1622 sql_help.c:2596
+#: sql_help.c:308 sql_help.c:1377 sql_help.c:1619 sql_help.c:1623
+#: sql_help.c:1625 sql_help.c:2600
 msgid "target_type"
 msgstr "Zieltyp"
 
@@ -3379,57 +3385,57 @@
 #: sql_help.c:314 sql_help.c:319 sql_help.c:323 sql_help.c:325 sql_help.c:327
 #: sql_help.c:328 sql_help.c:329 sql_help.c:330 sql_help.c:331 sql_help.c:332
 #: sql_help.c:333 sql_help.c:334 sql_help.c:335 sql_help.c:338 sql_help.c:339
-#: sql_help.c:1375 sql_help.c:1382 sql_help.c:1383 sql_help.c:1384
-#: sql_help.c:1385 sql_help.c:1386 sql_help.c:1387 sql_help.c:1388
-#: sql_help.c:1393 sql_help.c:1395 sql_help.c:1399 sql_help.c:1401
-#: sql_help.c:1405 sql_help.c:1406 sql_help.c:1409 sql_help.c:1410
-#: sql_help.c:1411 sql_help.c:1412 sql_help.c:1413 sql_help.c:1414
-#: sql_help.c:1415 sql_help.c:1416 sql_help.c:1417 sql_help.c:1422
-#: sql_help.c:1423 sql_help.c:3468 sql_help.c:3473 sql_help.c:3474
-#: sql_help.c:3475 sql_help.c:3476 sql_help.c:3482 sql_help.c:3483
-#: sql_help.c:3484 sql_help.c:3485 sql_help.c:3486 sql_help.c:3487
-#: sql_help.c:3488 sql_help.c:3489
+#: sql_help.c:1378 sql_help.c:1385 sql_help.c:1386 sql_help.c:1387
+#: sql_help.c:1388 sql_help.c:1389 sql_help.c:1390 sql_help.c:1391
+#: sql_help.c:1396 sql_help.c:1398 sql_help.c:1402 sql_help.c:1404
+#: sql_help.c:1408 sql_help.c:1409 sql_help.c:1412 sql_help.c:1413
+#: sql_help.c:1414 sql_help.c:1415 sql_help.c:1416 sql_help.c:1417
+#: sql_help.c:1418 sql_help.c:1419 sql_help.c:1420 sql_help.c:1425
+#: sql_help.c:1426 sql_help.c:3472 sql_help.c:3477 sql_help.c:3478
+#: sql_help.c:3479 sql_help.c:3480 sql_help.c:3486 sql_help.c:3487
+#: sql_help.c:3488 sql_help.c:3489 sql_help.c:3490 sql_help.c:3491
+#: sql_help.c:3492 sql_help.c:3493
 msgid "object_name"
 msgstr "Objektname"
 
-#: sql_help.c:315 sql_help.c:713 sql_help.c:1389 sql_help.c:1617
-#: sql_help.c:1652 sql_help.c:1715 sql_help.c:1936 sql_help.c:1967
-#: sql_help.c:2367 sql_help.c:3054 sql_help.c:3386 sql_help.c:3477
-#: sql_help.c:3580 sql_help.c:3584 sql_help.c:3588 sql_help.c:3591
-#: sql_help.c:3819 sql_help.c:3823 sql_help.c:3827 sql_help.c:3830
-#: sql_help.c:4013 sql_help.c:4017 sql_help.c:4021 sql_help.c:4024
+#: sql_help.c:315 sql_help.c:711 sql_help.c:1392 sql_help.c:1620
+#: sql_help.c:1655 sql_help.c:1718 sql_help.c:1939 sql_help.c:1970
+#: sql_help.c:2370 sql_help.c:3058 sql_help.c:3390 sql_help.c:3481
+#: sql_help.c:3584 sql_help.c:3588 sql_help.c:3592 sql_help.c:3595
+#: sql_help.c:3823 sql_help.c:3827 sql_help.c:3831 sql_help.c:3834
+#: sql_help.c:4017 sql_help.c:4021 sql_help.c:4025 sql_help.c:4028
 msgid "function_name"
 msgstr "Funktionsname"
 
-#: sql_help.c:320 sql_help.c:706 sql_help.c:1396 sql_help.c:1960
+#: sql_help.c:320 sql_help.c:704 sql_help.c:1399 sql_help.c:1963
 msgid "operator_name"
 msgstr "Operatorname"
 
-#: sql_help.c:321 sql_help.c:647 sql_help.c:651 sql_help.c:1397
-#: sql_help.c:1937 sql_help.c:2713
+#: sql_help.c:321 sql_help.c:645 sql_help.c:649 sql_help.c:1400 sql_help.c:1940
+#: sql_help.c:2717
 msgid "left_type"
 msgstr "linker_Typ"
 
-#: sql_help.c:322 sql_help.c:648 sql_help.c:652 sql_help.c:1398
-#: sql_help.c:1938 sql_help.c:2714
+#: sql_help.c:322 sql_help.c:646 sql_help.c:650 sql_help.c:1401 sql_help.c:1941
+#: sql_help.c:2718
 msgid "right_type"
 msgstr "rechter_Typ"
 
-#: sql_help.c:324 sql_help.c:326 sql_help.c:669 sql_help.c:672 sql_help.c:675
-#: sql_help.c:704 sql_help.c:716 sql_help.c:724 sql_help.c:727 sql_help.c:730
-#: sql_help.c:1400 sql_help.c:1402 sql_help.c:1957 sql_help.c:1978
-#: sql_help.c:2214 sql_help.c:2723 sql_help.c:2732
+#: sql_help.c:324 sql_help.c:326 sql_help.c:667 sql_help.c:670 sql_help.c:673
+#: sql_help.c:702 sql_help.c:714 sql_help.c:722 sql_help.c:725 sql_help.c:728
+#: sql_help.c:1403 sql_help.c:1405 sql_help.c:1960 sql_help.c:1981
+#: sql_help.c:2217 sql_help.c:2727 sql_help.c:2736
 msgid "index_method"
 msgstr "Indexmethode"
 
-#: sql_help.c:336 sql_help.c:1017 sql_help.c:1418 sql_help.c:1823
-#: sql_help.c:2190 sql_help.c:2336 sql_help.c:2846 sql_help.c:3068
-#: sql_help.c:3400
+#: sql_help.c:336 sql_help.c:1015 sql_help.c:1421 sql_help.c:1826
+#: sql_help.c:2193 sql_help.c:2339 sql_help.c:2850 sql_help.c:3072
+#: sql_help.c:3404
 msgid "type_name"
 msgstr "Typname"
 
-#: sql_help.c:337 sql_help.c:1419 sql_help.c:1822 sql_help.c:2337
-#: sql_help.c:2561 sql_help.c:2847 sql_help.c:3060 sql_help.c:3392
+#: sql_help.c:337 sql_help.c:1422 sql_help.c:1825 sql_help.c:2340
+#: sql_help.c:2565 sql_help.c:2851 sql_help.c:3064 sql_help.c:3396
 msgid "lang_name"
 msgstr "Sprachname"
 
@@ -3437,112 +3443,112 @@
 msgid "and aggregate_signature is:"
 msgstr "und Aggregatsignatur Folgendes ist:"
 
-#: sql_help.c:363 sql_help.c:1741
+#: sql_help.c:363 sql_help.c:1744
 msgid "handler_function"
 msgstr "Handler-Funktion"
 
-#: sql_help.c:364 sql_help.c:1742
+#: sql_help.c:364 sql_help.c:1745
 msgid "validator_function"
 msgstr "Validator-Funktion"
 
-#: sql_help.c:413 sql_help.c:487 sql_help.c:609 sql_help.c:961 sql_help.c:1156
-#: sql_help.c:2205 sql_help.c:2206 sql_help.c:2222 sql_help.c:2223
+#: sql_help.c:413 sql_help.c:487 sql_help.c:608 sql_help.c:959 sql_help.c:1154
+#: sql_help.c:2208 sql_help.c:2209 sql_help.c:2225 sql_help.c:2226
 msgid "action"
 msgstr "Aktion"
 
 #: sql_help.c:415 sql_help.c:422 sql_help.c:426 sql_help.c:427 sql_help.c:430
 #: sql_help.c:432 sql_help.c:433 sql_help.c:434 sql_help.c:436 sql_help.c:439
-#: sql_help.c:441 sql_help.c:442 sql_help.c:611 sql_help.c:621 sql_help.c:623
-#: sql_help.c:626 sql_help.c:628 sql_help.c:853 sql_help.c:963 sql_help.c:976
-#: sql_help.c:980 sql_help.c:981 sql_help.c:985 sql_help.c:987 sql_help.c:988
-#: sql_help.c:989 sql_help.c:991 sql_help.c:994 sql_help.c:996 sql_help.c:1255
-#: sql_help.c:1258 sql_help.c:1278 sql_help.c:1377 sql_help.c:1479
-#: sql_help.c:1484 sql_help.c:1498 sql_help.c:1499 sql_help.c:1500
-#: sql_help.c:1773 sql_help.c:1820 sql_help.c:1882 sql_help.c:1917
-#: sql_help.c:2098 sql_help.c:2178 sql_help.c:2191 sql_help.c:2210
-#: sql_help.c:2212 sql_help.c:2219 sql_help.c:2230 sql_help.c:2247
-#: sql_help.c:2370 sql_help.c:2506 sql_help.c:3039 sql_help.c:3040
-#: sql_help.c:3119 sql_help.c:3134 sql_help.c:3136 sql_help.c:3138
-#: sql_help.c:3371 sql_help.c:3372 sql_help.c:3470 sql_help.c:3611
-#: sql_help.c:3850 sql_help.c:3892 sql_help.c:3894 sql_help.c:3896
-#: sql_help.c:3913 sql_help.c:3916 sql_help.c:4044
+#: sql_help.c:441 sql_help.c:442 sql_help.c:610 sql_help.c:620 sql_help.c:622
+#: sql_help.c:625 sql_help.c:627 sql_help.c:851 sql_help.c:961 sql_help.c:974
+#: sql_help.c:978 sql_help.c:979 sql_help.c:983 sql_help.c:985 sql_help.c:986
+#: sql_help.c:987 sql_help.c:989 sql_help.c:992 sql_help.c:994 sql_help.c:1258
+#: sql_help.c:1261 sql_help.c:1281 sql_help.c:1380 sql_help.c:1482
+#: sql_help.c:1487 sql_help.c:1501 sql_help.c:1502 sql_help.c:1503
+#: sql_help.c:1776 sql_help.c:1823 sql_help.c:1885 sql_help.c:1920
+#: sql_help.c:2101 sql_help.c:2181 sql_help.c:2194 sql_help.c:2213
+#: sql_help.c:2215 sql_help.c:2222 sql_help.c:2233 sql_help.c:2250
+#: sql_help.c:2373 sql_help.c:2510 sql_help.c:3043 sql_help.c:3044
+#: sql_help.c:3123 sql_help.c:3138 sql_help.c:3140 sql_help.c:3142
+#: sql_help.c:3375 sql_help.c:3376 sql_help.c:3474 sql_help.c:3615
+#: sql_help.c:3854 sql_help.c:3896 sql_help.c:3898 sql_help.c:3900
+#: sql_help.c:3917 sql_help.c:3920 sql_help.c:4048
 msgid "column_name"
 msgstr "Spaltenname"
 
-#: sql_help.c:416 sql_help.c:612 sql_help.c:964
+#: sql_help.c:416 sql_help.c:611 sql_help.c:962
 msgid "new_column_name"
 msgstr "neuer_Spaltenname"
 
-#: sql_help.c:421 sql_help.c:503 sql_help.c:620 sql_help.c:975 sql_help.c:1169
+#: sql_help.c:421 sql_help.c:503 sql_help.c:619 sql_help.c:973 sql_help.c:1167
 msgid "where action is one of:"
 msgstr "wobei Aktion Folgendes sein kann:"
 
-#: sql_help.c:423 sql_help.c:428 sql_help.c:977 sql_help.c:982 sql_help.c:1171
-#: sql_help.c:1175 sql_help.c:1695 sql_help.c:1774 sql_help.c:1956
-#: sql_help.c:2179 sql_help.c:2415 sql_help.c:3221
+#: sql_help.c:423 sql_help.c:428 sql_help.c:975 sql_help.c:980 sql_help.c:1169
+#: sql_help.c:1173 sql_help.c:1698 sql_help.c:1777 sql_help.c:1959
+#: sql_help.c:2182 sql_help.c:2418 sql_help.c:3225
 msgid "data_type"
 msgstr "Datentyp"
 
-#: sql_help.c:424 sql_help.c:429 sql_help.c:978 sql_help.c:983 sql_help.c:1172
-#: sql_help.c:1176 sql_help.c:1696 sql_help.c:1777 sql_help.c:1884
-#: sql_help.c:2180 sql_help.c:2416 sql_help.c:2422 sql_help.c:3129
+#: sql_help.c:424 sql_help.c:429 sql_help.c:976 sql_help.c:981 sql_help.c:1170
+#: sql_help.c:1174 sql_help.c:1699 sql_help.c:1780 sql_help.c:1887
+#: sql_help.c:2183 sql_help.c:2419 sql_help.c:2425 sql_help.c:3133
 msgid "collation"
 msgstr "Sortierfolge"
 
-#: sql_help.c:425 sql_help.c:979 sql_help.c:1778 sql_help.c:2181
-#: sql_help.c:2192
+#: sql_help.c:425 sql_help.c:977 sql_help.c:1781 sql_help.c:2184
+#: sql_help.c:2195
 msgid "column_constraint"
 msgstr "Spalten-Constraint"
 
-#: sql_help.c:435 sql_help.c:622 sql_help.c:990
+#: sql_help.c:435 sql_help.c:621 sql_help.c:988
 msgid "integer"
 msgstr "ganze_Zahl"
 
-#: sql_help.c:437 sql_help.c:440 sql_help.c:624 sql_help.c:627 sql_help.c:992
-#: sql_help.c:995
+#: sql_help.c:437 sql_help.c:440 sql_help.c:623 sql_help.c:626 sql_help.c:990
+#: sql_help.c:993
 msgid "attribute_option"
 msgstr "Attributoption"
 
-#: sql_help.c:445 sql_help.c:997 sql_help.c:1779 sql_help.c:2182
-#: sql_help.c:2193
+#: sql_help.c:445 sql_help.c:995 sql_help.c:1782 sql_help.c:2185
+#: sql_help.c:2196
 msgid "table_constraint"
 msgstr "Tabellen-Constraint"
 
-#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:1002
-#: sql_help.c:1003 sql_help.c:1004 sql_help.c:1005 sql_help.c:1420
+#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:1000
+#: sql_help.c:1001 sql_help.c:1002 sql_help.c:1003 sql_help.c:1423
 msgid "trigger_name"
 msgstr "Triggername"
 
-#: sql_help.c:452 sql_help.c:453 sql_help.c:1015 sql_help.c:1016
-#: sql_help.c:1780 sql_help.c:2185
+#: sql_help.c:452 sql_help.c:453 sql_help.c:1013 sql_help.c:1014
+#: sql_help.c:1783 sql_help.c:2188
 msgid "parent_table"
 msgstr "Elterntabelle"
 
-#: sql_help.c:504 sql_help.c:1824
+#: sql_help.c:504 sql_help.c:1827
 msgid "execution_cost"
 msgstr "Ausführungskosten"
 
-#: sql_help.c:505 sql_help.c:1825
+#: sql_help.c:505 sql_help.c:1828
 msgid "result_rows"
 msgstr "Ergebniszeilen"
 
-#: sql_help.c:526 sql_help.c:528 sql_help.c:786 sql_help.c:794 sql_help.c:798
-#: sql_help.c:801 sql_help.c:804 sql_help.c:1210 sql_help.c:1218
-#: sql_help.c:1221 sql_help.c:1223 sql_help.c:1225 sql_help.c:2072
-#: sql_help.c:2074 sql_help.c:2077 sql_help.c:2078 sql_help.c:3038
-#: sql_help.c:3042 sql_help.c:3045 sql_help.c:3047 sql_help.c:3049
-#: sql_help.c:3051 sql_help.c:3053 sql_help.c:3059 sql_help.c:3061
-#: sql_help.c:3063 sql_help.c:3065 sql_help.c:3067 sql_help.c:3069
+#: sql_help.c:526 sql_help.c:528 sql_help.c:784 sql_help.c:792 sql_help.c:796
+#: sql_help.c:799 sql_help.c:802 sql_help.c:1209 sql_help.c:1217
+#: sql_help.c:1221 sql_help.c:1224 sql_help.c:1227 sql_help.c:2075
+#: sql_help.c:2077 sql_help.c:2080 sql_help.c:2081 sql_help.c:3042
+#: sql_help.c:3046 sql_help.c:3049 sql_help.c:3051 sql_help.c:3053
+#: sql_help.c:3055 sql_help.c:3057 sql_help.c:3063 sql_help.c:3065
+#: sql_help.c:3067 sql_help.c:3069 sql_help.c:3071 sql_help.c:3073
 msgid "role_specification"
 msgstr "Rollenangabe"
 
-#: sql_help.c:527 sql_help.c:529 sql_help.c:1237 sql_help.c:1670
-#: sql_help.c:2080 sql_help.c:2491 sql_help.c:2880 sql_help.c:3696
+#: sql_help.c:527 sql_help.c:529 sql_help.c:1240 sql_help.c:1673
+#: sql_help.c:2083 sql_help.c:2495 sql_help.c:2884 sql_help.c:3700
 msgid "user_name"
 msgstr "Benutzername"
 
-#: sql_help.c:530 sql_help.c:806 sql_help.c:1226 sql_help.c:2079
-#: sql_help.c:3070
+#: sql_help.c:530 sql_help.c:804 sql_help.c:1229 sql_help.c:2082
+#: sql_help.c:3074
 msgid "where role_specification can be:"
 msgstr "wobei Rollenangabe Folgendes sein kann:"
 
@@ -3550,937 +3556,938 @@
 msgid "group_name"
 msgstr "Gruppenname"
 
-#: sql_help.c:549 sql_help.c:1675 sql_help.c:1888 sql_help.c:1920
-#: sql_help.c:2188 sql_help.c:2196 sql_help.c:2228 sql_help.c:2250
-#: sql_help.c:2262 sql_help.c:3066 sql_help.c:3398
+#: sql_help.c:549 sql_help.c:1678 sql_help.c:1891 sql_help.c:1923
+#: sql_help.c:2191 sql_help.c:2199 sql_help.c:2231 sql_help.c:2253
+#: sql_help.c:2265 sql_help.c:3070 sql_help.c:3402
 msgid "tablespace_name"
 msgstr "Tablespace-Name"
 
-#: sql_help.c:551 sql_help.c:554 sql_help.c:630 sql_help.c:632 sql_help.c:1012
-#: sql_help.c:1014 sql_help.c:1886 sql_help.c:1918 sql_help.c:2186
-#: sql_help.c:2194 sql_help.c:2226 sql_help.c:2248
+#: sql_help.c:551 sql_help.c:554 sql_help.c:629 sql_help.c:631 sql_help.c:1010
+#: sql_help.c:1012 sql_help.c:1889 sql_help.c:1921 sql_help.c:2189
+#: sql_help.c:2197 sql_help.c:2229 sql_help.c:2251
 msgid "storage_parameter"
 msgstr "Storage-Parameter"
 
-#: sql_help.c:577 sql_help.c:1394 sql_help.c:3481
+#: sql_help.c:577 sql_help.c:1397 sql_help.c:3485
 msgid "large_object_oid"
 msgstr "Large-Object-OID"
 
-#: sql_help.c:629 sql_help.c:1010 sql_help.c:1019 sql_help.c:1022
-#: sql_help.c:1318
+#: sql_help.c:628 sql_help.c:1008 sql_help.c:1017 sql_help.c:1020
+#: sql_help.c:1321
 msgid "index_name"
 msgstr "Indexname"
 
-#: sql_help.c:705 sql_help.c:717 sql_help.c:1959
+#: sql_help.c:703 sql_help.c:715 sql_help.c:1962
 msgid "strategy_number"
 msgstr "Strategienummer"
 
-#: sql_help.c:707 sql_help.c:708 sql_help.c:711 sql_help.c:712 sql_help.c:718
-#: sql_help.c:719 sql_help.c:721 sql_help.c:722 sql_help.c:1961
-#: sql_help.c:1962 sql_help.c:1965 sql_help.c:1966
+#: sql_help.c:705 sql_help.c:706 sql_help.c:709 sql_help.c:710 sql_help.c:716
+#: sql_help.c:717 sql_help.c:719 sql_help.c:720 sql_help.c:1964 sql_help.c:1965
+#: sql_help.c:1968 sql_help.c:1969
 msgid "op_type"
 msgstr "Optyp"
 
-#: sql_help.c:709 sql_help.c:1963
+#: sql_help.c:707 sql_help.c:1966
 msgid "sort_family_name"
 msgstr "Sortierfamilienname"
 
-#: sql_help.c:710 sql_help.c:720 sql_help.c:1964
+#: sql_help.c:708 sql_help.c:718 sql_help.c:1967
 msgid "support_number"
 msgstr "Unterst-Nummer"
 
-#: sql_help.c:714 sql_help.c:1618 sql_help.c:1968 sql_help.c:2339
-#: sql_help.c:2341
+#: sql_help.c:712 sql_help.c:1621 sql_help.c:1971 sql_help.c:2342
+#: sql_help.c:2344
 msgid "argument_type"
 msgstr "Argumenttyp"
 
-#: sql_help.c:745 sql_help.c:748 sql_help.c:816 sql_help.c:852 sql_help.c:1135
-#: sql_help.c:1277 sql_help.c:1317 sql_help.c:1379 sql_help.c:1404
-#: sql_help.c:1408 sql_help.c:1421 sql_help.c:1478 sql_help.c:1483
-#: sql_help.c:1772 sql_help.c:1880 sql_help.c:1916 sql_help.c:1991
-#: sql_help.c:2049 sql_help.c:2097 sql_help.c:2177 sql_help.c:2189
-#: sql_help.c:2246 sql_help.c:2364 sql_help.c:2540 sql_help.c:2749
-#: sql_help.c:2766 sql_help.c:2856 sql_help.c:3036 sql_help.c:3041
-#: sql_help.c:3086 sql_help.c:3117 sql_help.c:3368 sql_help.c:3373
-#: sql_help.c:3469 sql_help.c:3566 sql_help.c:3568 sql_help.c:3617
-#: sql_help.c:3656 sql_help.c:3805 sql_help.c:3807 sql_help.c:3856
-#: sql_help.c:3890 sql_help.c:3912 sql_help.c:3914 sql_help.c:3915
-#: sql_help.c:3999 sql_help.c:4001 sql_help.c:4050
+#: sql_help.c:743 sql_help.c:746 sql_help.c:814 sql_help.c:850 sql_help.c:1133
+#: sql_help.c:1280 sql_help.c:1320 sql_help.c:1382 sql_help.c:1407
+#: sql_help.c:1411 sql_help.c:1424 sql_help.c:1481 sql_help.c:1486
+#: sql_help.c:1775 sql_help.c:1883 sql_help.c:1919 sql_help.c:1994
+#: sql_help.c:2052 sql_help.c:2100 sql_help.c:2180 sql_help.c:2192
+#: sql_help.c:2249 sql_help.c:2367 sql_help.c:2544 sql_help.c:2753
+#: sql_help.c:2770 sql_help.c:2860 sql_help.c:3040 sql_help.c:3045
+#: sql_help.c:3090 sql_help.c:3121 sql_help.c:3372 sql_help.c:3377
+#: sql_help.c:3473 sql_help.c:3570 sql_help.c:3572 sql_help.c:3621
+#: sql_help.c:3660 sql_help.c:3809 sql_help.c:3811 sql_help.c:3860
+#: sql_help.c:3894 sql_help.c:3916 sql_help.c:3918 sql_help.c:3919
+#: sql_help.c:4003 sql_help.c:4005 sql_help.c:4054
 msgid "table_name"
 msgstr "Tabellenname"
 
-#: sql_help.c:750 sql_help.c:1993
+#: sql_help.c:748 sql_help.c:1996
 msgid "using_expression"
 msgstr "Using-Ausdruck"
 
-#: sql_help.c:751 sql_help.c:1994
+#: sql_help.c:749 sql_help.c:1997
 msgid "check_expression"
 msgstr "Check-Ausdruck"
 
-#: sql_help.c:790 sql_help.c:1214 sql_help.c:1860 sql_help.c:2026
-#: sql_help.c:2474
+#: sql_help.c:788 sql_help.c:1213 sql_help.c:1863 sql_help.c:2029
+#: sql_help.c:2478
 msgid "password"
 msgstr "Passwort"
 
-#: sql_help.c:791 sql_help.c:1215 sql_help.c:1861 sql_help.c:2027
-#: sql_help.c:2475
+#: sql_help.c:789 sql_help.c:1214 sql_help.c:1864 sql_help.c:2030
+#: sql_help.c:2479
 msgid "timestamp"
 msgstr "Zeit"
 
-#: sql_help.c:795 sql_help.c:799 sql_help.c:802 sql_help.c:805 sql_help.c:3046
-#: sql_help.c:3378
+#: sql_help.c:793 sql_help.c:797 sql_help.c:800 sql_help.c:803 sql_help.c:1218
+#: sql_help.c:1222 sql_help.c:1225 sql_help.c:1228 sql_help.c:3050
+#: sql_help.c:3382
 msgid "database_name"
 msgstr "Datenbankname"
 
-#: sql_help.c:846 sql_help.c:2092
+#: sql_help.c:844 sql_help.c:2095
 msgid "increment"
 msgstr "Inkrement"
 
-#: sql_help.c:847 sql_help.c:2093
+#: sql_help.c:845 sql_help.c:2096
 msgid "minvalue"
 msgstr "Minwert"
 
-#: sql_help.c:848 sql_help.c:2094
+#: sql_help.c:846 sql_help.c:2097
 msgid "maxvalue"
 msgstr "Maxwert"
 
-#: sql_help.c:849 sql_help.c:2095 sql_help.c:3564 sql_help.c:3654
-#: sql_help.c:3803 sql_help.c:3932 sql_help.c:3997
+#: sql_help.c:847 sql_help.c:2098 sql_help.c:3568 sql_help.c:3658
+#: sql_help.c:3807 sql_help.c:3936 sql_help.c:4001
 msgid "start"
 msgstr "Start"
 
-#: sql_help.c:850
+#: sql_help.c:848
 msgid "restart"
 msgstr "Restart"
 
-#: sql_help.c:851 sql_help.c:2096
+#: sql_help.c:849 sql_help.c:2099
 msgid "cache"
 msgstr "Cache"
 
-#: sql_help.c:998
+#: sql_help.c:996
 msgid "table_constraint_using_index"
 msgstr "Tabellen-Constraint-für-Index"
 
-#: sql_help.c:1006 sql_help.c:1007 sql_help.c:1008 sql_help.c:1009
+#: sql_help.c:1004 sql_help.c:1005 sql_help.c:1006 sql_help.c:1007
 msgid "rewrite_rule_name"
 msgstr "Regelname"
 
-#: sql_help.c:1020
+#: sql_help.c:1018
 msgid "and table_constraint_using_index is:"
 msgstr "und Tabellen-Constraint-für-Index Folgendes ist:"
 
-#: sql_help.c:1038 sql_help.c:1041 sql_help.c:2265
+#: sql_help.c:1036 sql_help.c:1039 sql_help.c:2268
 msgid "tablespace_option"
 msgstr "Tablespace-Option"
 
-#: sql_help.c:1062 sql_help.c:1065 sql_help.c:1071 sql_help.c:1075
+#: sql_help.c:1060 sql_help.c:1063 sql_help.c:1069 sql_help.c:1073
 msgid "token_type"
 msgstr "Tokentyp"
 
-#: sql_help.c:1063 sql_help.c:1066
+#: sql_help.c:1061 sql_help.c:1064
 msgid "dictionary_name"
 msgstr "Wörterbuchname"
 
-#: sql_help.c:1068 sql_help.c:1072
+#: sql_help.c:1066 sql_help.c:1070
 msgid "old_dictionary"
 msgstr "altes_Wörterbuch"
 
-#: sql_help.c:1069 sql_help.c:1073
+#: sql_help.c:1067 sql_help.c:1071
 msgid "new_dictionary"
 msgstr "neues_Wörterbuch"
 
-#: sql_help.c:1160 sql_help.c:1170 sql_help.c:1173 sql_help.c:1174
-#: sql_help.c:2414
+#: sql_help.c:1158 sql_help.c:1168 sql_help.c:1171 sql_help.c:1172
+#: sql_help.c:2417
 msgid "attribute_name"
 msgstr "Attributname"
 
-#: sql_help.c:1161
+#: sql_help.c:1159
 msgid "new_attribute_name"
 msgstr "neuer_Attributname"
 
-#: sql_help.c:1167
+#: sql_help.c:1165
 msgid "new_enum_value"
 msgstr "neuer_Enum-Wert"
 
-#: sql_help.c:1168
+#: sql_help.c:1166
 msgid "existing_enum_value"
 msgstr "existierender_Enum-Wert"
 
-#: sql_help.c:1238 sql_help.c:1781 sql_help.c:2108 sql_help.c:2492
-#: sql_help.c:2881 sql_help.c:3052 sql_help.c:3087 sql_help.c:3384
+#: sql_help.c:1241 sql_help.c:1784 sql_help.c:2111 sql_help.c:2496
+#: sql_help.c:2885 sql_help.c:3056 sql_help.c:3091 sql_help.c:3388
 msgid "server_name"
 msgstr "Servername"
 
-#: sql_help.c:1266 sql_help.c:1269 sql_help.c:2507
+#: sql_help.c:1269 sql_help.c:1272 sql_help.c:2511
 msgid "view_option_name"
 msgstr "Sichtoptionsname"
 
-#: sql_help.c:1267 sql_help.c:2508
+#: sql_help.c:1270 sql_help.c:2512
 msgid "view_option_value"
 msgstr "Sichtoptionswert"
 
-#: sql_help.c:1292 sql_help.c:3712 sql_help.c:3714 sql_help.c:3738
+#: sql_help.c:1295 sql_help.c:3716 sql_help.c:3718 sql_help.c:3742
 msgid "transaction_mode"
 msgstr "Transaktionsmodus"
 
-#: sql_help.c:1293 sql_help.c:3715 sql_help.c:3739
+#: sql_help.c:1296 sql_help.c:3719 sql_help.c:3743
 msgid "where transaction_mode is one of:"
 msgstr "wobei Transaktionsmodus Folgendes sein kann:"
 
-#: sql_help.c:1376
+#: sql_help.c:1379
 msgid "relation_name"
 msgstr "Relationsname"
 
-#: sql_help.c:1381 sql_help.c:3048 sql_help.c:3380
+#: sql_help.c:1384 sql_help.c:3052 sql_help.c:3384
 msgid "domain_name"
 msgstr "Domänenname"
 
-#: sql_help.c:1403
+#: sql_help.c:1406
 msgid "policy_name"
 msgstr "Policy-Name"
 
-#: sql_help.c:1407
+#: sql_help.c:1410
 msgid "rule_name"
 msgstr "Regelname"
 
-#: sql_help.c:1424
+#: sql_help.c:1427
 msgid "text"
 msgstr "Text"
 
-#: sql_help.c:1449 sql_help.c:3230 sql_help.c:3418
+#: sql_help.c:1452 sql_help.c:3234 sql_help.c:3422
 msgid "transaction_id"
 msgstr "Transaktions-ID"
 
-#: sql_help.c:1480 sql_help.c:1486 sql_help.c:3156
+#: sql_help.c:1483 sql_help.c:1489 sql_help.c:3160
 msgid "filename"
 msgstr "Dateiname"
 
-#: sql_help.c:1481 sql_help.c:1487 sql_help.c:2051 sql_help.c:2052
-#: sql_help.c:2053
+#: sql_help.c:1484 sql_help.c:1490 sql_help.c:2054 sql_help.c:2055
+#: sql_help.c:2056
 msgid "command"
 msgstr "Befehl"
 
-#: sql_help.c:1485 sql_help.c:1921 sql_help.c:2251 sql_help.c:2509
-#: sql_help.c:2527 sql_help.c:3121
+#: sql_help.c:1488 sql_help.c:1924 sql_help.c:2254 sql_help.c:2513
+#: sql_help.c:2531 sql_help.c:3125
 msgid "query"
 msgstr "Anfrage"
 
-#: sql_help.c:1489 sql_help.c:2926
+#: sql_help.c:1492 sql_help.c:2930
 msgid "where option can be one of:"
 msgstr "wobei Option eine der folgenden sein kann:"
 
-#: sql_help.c:1490
+#: sql_help.c:1493
 msgid "format_name"
 msgstr "Formatname"
 
-#: sql_help.c:1491 sql_help.c:1492 sql_help.c:1495 sql_help.c:2927
-#: sql_help.c:2928 sql_help.c:2929 sql_help.c:2930 sql_help.c:2931
+#: sql_help.c:1494 sql_help.c:1495 sql_help.c:1498 sql_help.c:2931
+#: sql_help.c:2932 sql_help.c:2933 sql_help.c:2934 sql_help.c:2935
 msgid "boolean"
 msgstr "boolean"
 
-#: sql_help.c:1493
+#: sql_help.c:1496
 msgid "delimiter_character"
 msgstr "Trennzeichen"
 
-#: sql_help.c:1494
+#: sql_help.c:1497
 msgid "null_string"
 msgstr "Null-Zeichenkette"
 
-#: sql_help.c:1496
+#: sql_help.c:1499
 msgid "quote_character"
 msgstr "Quote-Zeichen"
 
-#: sql_help.c:1497
+#: sql_help.c:1500
 msgid "escape_character"
 msgstr "Escape-Zeichen"
 
-#: sql_help.c:1501
+#: sql_help.c:1504
 msgid "encoding_name"
 msgstr "Kodierungsname"
 
-#: sql_help.c:1558 sql_help.c:1574 sql_help.c:1577
+#: sql_help.c:1561 sql_help.c:1577 sql_help.c:1580
 msgid "arg_data_type"
 msgstr "Arg-Datentyp"
 
-#: sql_help.c:1559 sql_help.c:1578 sql_help.c:1586
+#: sql_help.c:1562 sql_help.c:1581 sql_help.c:1589
 msgid "sfunc"
 msgstr "Ãœbergangsfunktion"
 
-#: sql_help.c:1560 sql_help.c:1579 sql_help.c:1587
+#: sql_help.c:1563 sql_help.c:1582 sql_help.c:1590
 msgid "state_data_type"
 msgstr "Zustandsdatentyp"
 
-#: sql_help.c:1561 sql_help.c:1580 sql_help.c:1588
+#: sql_help.c:1564 sql_help.c:1583 sql_help.c:1591
 msgid "state_data_size"
 msgstr "Zustandsdatengröße"
 
-#: sql_help.c:1562 sql_help.c:1581 sql_help.c:1589
+#: sql_help.c:1565 sql_help.c:1584 sql_help.c:1592
 msgid "ffunc"
 msgstr "Abschlussfunktion"
 
-#: sql_help.c:1563 sql_help.c:1582 sql_help.c:1590
+#: sql_help.c:1566 sql_help.c:1585 sql_help.c:1593
 msgid "initial_condition"
 msgstr "Anfangswert"
 
-#: sql_help.c:1564 sql_help.c:1591
+#: sql_help.c:1567 sql_help.c:1594
 msgid "msfunc"
 msgstr "Moving-Ãœbergangsfunktion"
 
-#: sql_help.c:1565 sql_help.c:1592
+#: sql_help.c:1568 sql_help.c:1595
 msgid "minvfunc"
 msgstr "Moving-Inversfunktion"
 
-#: sql_help.c:1566 sql_help.c:1593
+#: sql_help.c:1569 sql_help.c:1596
 msgid "mstate_data_type"
 msgstr "Moving-Zustandsdatentyp"
 
-#: sql_help.c:1567 sql_help.c:1594
+#: sql_help.c:1570 sql_help.c:1597
 msgid "mstate_data_size"
 msgstr "Moving-Zustandsdatengröße"
 
-#: sql_help.c:1568 sql_help.c:1595
+#: sql_help.c:1571 sql_help.c:1598
 msgid "mffunc"
 msgstr "Moving-Abschlussfunktion"
 
-#: sql_help.c:1569 sql_help.c:1596
+#: sql_help.c:1572 sql_help.c:1599
 msgid "minitial_condition"
 msgstr "Moving-Anfangswert"
 
-#: sql_help.c:1570 sql_help.c:1597
+#: sql_help.c:1573 sql_help.c:1600
 msgid "sort_operator"
 msgstr "Sortieroperator"
 
-#: sql_help.c:1583
+#: sql_help.c:1586
 msgid "or the old syntax"
 msgstr "oder die alte Syntax"
 
-#: sql_help.c:1585
+#: sql_help.c:1588
 msgid "base_type"
 msgstr "Basistyp"
 
-#: sql_help.c:1636
+#: sql_help.c:1639
 msgid "locale"
 msgstr "Locale"
 
-#: sql_help.c:1637 sql_help.c:1673
+#: sql_help.c:1640 sql_help.c:1676
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:1638 sql_help.c:1674
+#: sql_help.c:1641 sql_help.c:1677
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:1640
+#: sql_help.c:1643
 msgid "existing_collation"
 msgstr "existierende_Sortierfolge"
 
-#: sql_help.c:1650
+#: sql_help.c:1653
 msgid "source_encoding"
 msgstr "Quellkodierung"
 
-#: sql_help.c:1651
+#: sql_help.c:1654
 msgid "dest_encoding"
 msgstr "Zielkodierung"
 
-#: sql_help.c:1671 sql_help.c:2291
+#: sql_help.c:1674 sql_help.c:2294
 msgid "template"
 msgstr "Vorlage"
 
-#: sql_help.c:1672
+#: sql_help.c:1675
 msgid "encoding"
 msgstr "Kodierung"
 
-#: sql_help.c:1698
+#: sql_help.c:1701
 msgid "constraint"
 msgstr "Constraint"
 
-#: sql_help.c:1699
+#: sql_help.c:1702
 msgid "where constraint is:"
 msgstr "wobei Constraint Folgendes ist:"
 
-#: sql_help.c:1713 sql_help.c:2048 sql_help.c:2363
+#: sql_help.c:1716 sql_help.c:2051 sql_help.c:2366
 msgid "event"
 msgstr "Ereignis"
 
-#: sql_help.c:1714
+#: sql_help.c:1717
 msgid "filter_variable"
 msgstr "Filtervariable"
 
-#: sql_help.c:1726
+#: sql_help.c:1729
 msgid "extension_name"
 msgstr "Erweiterungsname"
 
-#: sql_help.c:1728
+#: sql_help.c:1731
 msgid "version"
 msgstr "Version"
 
-#: sql_help.c:1729
+#: sql_help.c:1732
 msgid "old_version"
 msgstr "alte_Version"
 
-#: sql_help.c:1784 sql_help.c:2197
+#: sql_help.c:1787 sql_help.c:2200
 msgid "where column_constraint is:"
 msgstr "wobei Spalten-Constraint Folgendes ist:"
 
-#: sql_help.c:1787 sql_help.c:1818 sql_help.c:2200
+#: sql_help.c:1790 sql_help.c:1821 sql_help.c:2203
 msgid "default_expr"
 msgstr "Vorgabeausdruck"
 
-#: sql_help.c:1788 sql_help.c:2207
+#: sql_help.c:1791 sql_help.c:2210
 msgid "and table_constraint is:"
 msgstr "und Tabellen-Constraint Folgendes ist:"
 
-#: sql_help.c:1819
+#: sql_help.c:1822
 msgid "rettype"
 msgstr "Rückgabetyp"
 
-#: sql_help.c:1821
+#: sql_help.c:1824
 msgid "column_type"
 msgstr "Spaltentyp"
 
-#: sql_help.c:1829
+#: sql_help.c:1832
 msgid "definition"
 msgstr "Definition"
 
-#: sql_help.c:1830
+#: sql_help.c:1833
 msgid "obj_file"
 msgstr "Objektdatei"
 
-#: sql_help.c:1831
+#: sql_help.c:1834
 msgid "link_symbol"
 msgstr "Linksymbol"
 
-#: sql_help.c:1832
+#: sql_help.c:1835
 msgid "attribute"
 msgstr "Attribut"
 
-#: sql_help.c:1867 sql_help.c:2033 sql_help.c:2481
+#: sql_help.c:1870 sql_help.c:2036 sql_help.c:2485
 msgid "uid"
 msgstr "Uid"
 
-#: sql_help.c:1881
+#: sql_help.c:1884
 msgid "method"
 msgstr "Methode"
 
-#: sql_help.c:1885 sql_help.c:2232 sql_help.c:3130
+#: sql_help.c:1888 sql_help.c:2235 sql_help.c:3134
 msgid "opclass"
 msgstr "Opklasse"
 
-#: sql_help.c:1889 sql_help.c:2218
+#: sql_help.c:1892 sql_help.c:2221
 msgid "predicate"
 msgstr "Prädikat"
 
-#: sql_help.c:1901
+#: sql_help.c:1904
 msgid "call_handler"
 msgstr "Handler"
 
-#: sql_help.c:1902
+#: sql_help.c:1905
 msgid "inline_handler"
 msgstr "Inline-Handler"
 
-#: sql_help.c:1903
+#: sql_help.c:1906
 msgid "valfunction"
 msgstr "Valfunktion"
 
-#: sql_help.c:1939
+#: sql_help.c:1942
 msgid "com_op"
 msgstr "Kommutator-Op"
 
-#: sql_help.c:1940
+#: sql_help.c:1943
 msgid "neg_op"
 msgstr "Umkehrungs-Op"
 
-#: sql_help.c:1941
+#: sql_help.c:1944
 msgid "res_proc"
 msgstr "Res-Funktion"
 
-#: sql_help.c:1942
+#: sql_help.c:1945
 msgid "join_proc"
 msgstr "Join-Funktion"
 
-#: sql_help.c:1958
+#: sql_help.c:1961
 msgid "family_name"
 msgstr "Familienname"
 
-#: sql_help.c:1969
+#: sql_help.c:1972
 msgid "storage_type"
 msgstr "Storage-Typ"
 
-#: sql_help.c:2050 sql_help.c:2366 sql_help.c:2543 sql_help.c:3140
-#: sql_help.c:3555 sql_help.c:3557 sql_help.c:3645 sql_help.c:3647
-#: sql_help.c:3794 sql_help.c:3796 sql_help.c:3899 sql_help.c:3988
-#: sql_help.c:3990
+#: sql_help.c:2053 sql_help.c:2369 sql_help.c:2547 sql_help.c:3144
+#: sql_help.c:3559 sql_help.c:3561 sql_help.c:3649 sql_help.c:3651
+#: sql_help.c:3798 sql_help.c:3800 sql_help.c:3903 sql_help.c:3992
+#: sql_help.c:3994
 msgid "condition"
 msgstr "Bedingung"
 
-#: sql_help.c:2054 sql_help.c:2369
+#: sql_help.c:2057 sql_help.c:2372
 msgid "where event can be one of:"
 msgstr "wobei Ereignis eins der folgenden sein kann:"
 
-#: sql_help.c:2073 sql_help.c:2075
+#: sql_help.c:2076 sql_help.c:2078
 msgid "schema_element"
 msgstr "Schemaelement"
 
-#: sql_help.c:2109
+#: sql_help.c:2112
 msgid "server_type"
 msgstr "Servertyp"
 
-#: sql_help.c:2110
+#: sql_help.c:2113
 msgid "server_version"
 msgstr "Serverversion"
 
-#: sql_help.c:2111 sql_help.c:3050 sql_help.c:3382
+#: sql_help.c:2114 sql_help.c:3054 sql_help.c:3386
 msgid "fdw_name"
 msgstr "FDW-Name"
 
-#: sql_help.c:2183
+#: sql_help.c:2186
 msgid "source_table"
 msgstr "Quelltabelle"
 
-#: sql_help.c:2184
+#: sql_help.c:2187
 msgid "like_option"
 msgstr "Like-Option"
 
-#: sql_help.c:2201 sql_help.c:2202 sql_help.c:2211 sql_help.c:2213
-#: sql_help.c:2217
+#: sql_help.c:2204 sql_help.c:2205 sql_help.c:2214 sql_help.c:2216
+#: sql_help.c:2220
 msgid "index_parameters"
 msgstr "Indexparameter"
 
-#: sql_help.c:2203 sql_help.c:2220
+#: sql_help.c:2206 sql_help.c:2223
 msgid "reftable"
 msgstr "Reftabelle"
 
-#: sql_help.c:2204 sql_help.c:2221
+#: sql_help.c:2207 sql_help.c:2224
 msgid "refcolumn"
 msgstr "Refspalte"
 
-#: sql_help.c:2215
+#: sql_help.c:2218
 msgid "exclude_element"
 msgstr "Exclude-Element"
 
-#: sql_help.c:2216 sql_help.c:3562 sql_help.c:3652 sql_help.c:3801
-#: sql_help.c:3930 sql_help.c:3995
+#: sql_help.c:2219 sql_help.c:3566 sql_help.c:3656 sql_help.c:3805
+#: sql_help.c:3934 sql_help.c:3999
 msgid "operator"
 msgstr "Operator"
 
-#: sql_help.c:2224
+#: sql_help.c:2227
 msgid "and like_option is:"
 msgstr "und Like-Option Folgendes ist:"
 
-#: sql_help.c:2225
+#: sql_help.c:2228
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "Indexparameter bei UNIQUE-, PRIMARY KEY- und EXCLUDE-Constraints sind:"
 
-#: sql_help.c:2229
+#: sql_help.c:2232
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "Exclude-Element in einem EXCLUDE-Constraint ist:"
 
-#: sql_help.c:2264
+#: sql_help.c:2267
 msgid "directory"
 msgstr "Verzeichnis"
 
-#: sql_help.c:2278
+#: sql_help.c:2281
 msgid "parser_name"
 msgstr "Parser-Name"
 
-#: sql_help.c:2279
+#: sql_help.c:2282
 msgid "source_config"
 msgstr "Quellkonfig"
 
-#: sql_help.c:2308
+#: sql_help.c:2311
 msgid "start_function"
 msgstr "Startfunktion"
 
-#: sql_help.c:2309
+#: sql_help.c:2312
 msgid "gettoken_function"
 msgstr "Gettext-Funktion"
 
-#: sql_help.c:2310
+#: sql_help.c:2313
 msgid "end_function"
 msgstr "Endfunktion"
 
-#: sql_help.c:2311
+#: sql_help.c:2314
 msgid "lextypes_function"
 msgstr "Lextypenfunktion"
 
-#: sql_help.c:2312
+#: sql_help.c:2315
 msgid "headline_function"
 msgstr "Headline-Funktion"
 
-#: sql_help.c:2324
+#: sql_help.c:2327
 msgid "init_function"
 msgstr "Init-Funktion"
 
-#: sql_help.c:2325
+#: sql_help.c:2328
 msgid "lexize_function"
 msgstr "Lexize-Funktion"
 
-#: sql_help.c:2338
+#: sql_help.c:2341
 msgid "from_sql_function_name"
 msgstr "From-SQL-Funktionsname"
 
-#: sql_help.c:2340
+#: sql_help.c:2343
 msgid "to_sql_function_name"
 msgstr "To-SQL-Funktionsname"
 
-#: sql_help.c:2365
+#: sql_help.c:2368
 msgid "referenced_table_name"
 msgstr "verwiesener_Tabellenname"
 
-#: sql_help.c:2368
+#: sql_help.c:2371
 msgid "arguments"
 msgstr "Argumente"
 
-#: sql_help.c:2418 sql_help.c:3490
+#: sql_help.c:2421 sql_help.c:3494
 msgid "label"
 msgstr "Label"
 
-#: sql_help.c:2420
+#: sql_help.c:2423
 msgid "subtype"
 msgstr "Untertyp"
 
-#: sql_help.c:2421
+#: sql_help.c:2424
 msgid "subtype_operator_class"
 msgstr "Untertyp-Operatorklasse"
 
-#: sql_help.c:2423
+#: sql_help.c:2426
 msgid "canonical_function"
 msgstr "Canonical-Funktion"
 
-#: sql_help.c:2424
+#: sql_help.c:2427
 msgid "subtype_diff_function"
 msgstr "Untertyp-Diff-Funktion"
 
-#: sql_help.c:2426
+#: sql_help.c:2429
 msgid "input_function"
 msgstr "Eingabefunktion"
 
-#: sql_help.c:2427
+#: sql_help.c:2430
 msgid "output_function"
 msgstr "Ausgabefunktion"
 
-#: sql_help.c:2428
+#: sql_help.c:2431
 msgid "receive_function"
 msgstr "Empfangsfunktion"
 
-#: sql_help.c:2429
+#: sql_help.c:2432
 msgid "send_function"
 msgstr "Sendefunktion"
 
-#: sql_help.c:2430
+#: sql_help.c:2433
 msgid "type_modifier_input_function"
 msgstr "Typmod-Eingabefunktion"
 
-#: sql_help.c:2431
+#: sql_help.c:2434
 msgid "type_modifier_output_function"
 msgstr "Typmod-Ausgabefunktion"
 
-#: sql_help.c:2432
+#: sql_help.c:2435
 msgid "analyze_function"
 msgstr "Analyze-Funktion"
 
-#: sql_help.c:2433
+#: sql_help.c:2436
 msgid "internallength"
 msgstr "interne_Länge"
 
-#: sql_help.c:2434
+#: sql_help.c:2437
 msgid "alignment"
 msgstr "Ausrichtung"
 
-#: sql_help.c:2435
+#: sql_help.c:2438
 msgid "storage"
 msgstr "Speicherung"
 
-#: sql_help.c:2436
+#: sql_help.c:2439
 msgid "like_type"
 msgstr "wie_Typ"
 
-#: sql_help.c:2437
+#: sql_help.c:2440
 msgid "category"
 msgstr "Kategorie"
 
-#: sql_help.c:2438
+#: sql_help.c:2441
 msgid "preferred"
 msgstr "bevorzugt"
 
-#: sql_help.c:2439
+#: sql_help.c:2442
 msgid "default"
 msgstr "Vorgabewert"
 
-#: sql_help.c:2440
+#: sql_help.c:2443
 msgid "element"
 msgstr "Element"
 
-#: sql_help.c:2441
+#: sql_help.c:2444
 msgid "delimiter"
 msgstr "Trennzeichen"
 
-#: sql_help.c:2442
+#: sql_help.c:2445
 msgid "collatable"
 msgstr "sortierbar"
 
-#: sql_help.c:2539 sql_help.c:3116 sql_help.c:3550 sql_help.c:3639
-#: sql_help.c:3789 sql_help.c:3889 sql_help.c:3983
+#: sql_help.c:2543 sql_help.c:3120 sql_help.c:3554 sql_help.c:3643
+#: sql_help.c:3793 sql_help.c:3893 sql_help.c:3987
 msgid "with_query"
 msgstr "With-Anfrage"
 
-#: sql_help.c:2541 sql_help.c:3118 sql_help.c:3569 sql_help.c:3575
-#: sql_help.c:3578 sql_help.c:3582 sql_help.c:3586 sql_help.c:3594
-#: sql_help.c:3808 sql_help.c:3814 sql_help.c:3817 sql_help.c:3821
-#: sql_help.c:3825 sql_help.c:3833 sql_help.c:3891 sql_help.c:4002
-#: sql_help.c:4008 sql_help.c:4011 sql_help.c:4015 sql_help.c:4019
-#: sql_help.c:4027
+#: sql_help.c:2545 sql_help.c:3122 sql_help.c:3573 sql_help.c:3579
+#: sql_help.c:3582 sql_help.c:3586 sql_help.c:3590 sql_help.c:3598
+#: sql_help.c:3812 sql_help.c:3818 sql_help.c:3821 sql_help.c:3825
+#: sql_help.c:3829 sql_help.c:3837 sql_help.c:3895 sql_help.c:4006
+#: sql_help.c:4012 sql_help.c:4015 sql_help.c:4019 sql_help.c:4023
+#: sql_help.c:4031
 msgid "alias"
 msgstr "Alias"
 
-#: sql_help.c:2542
+#: sql_help.c:2546
 msgid "using_list"
 msgstr "Using-Liste"
 
-#: sql_help.c:2544 sql_help.c:2957 sql_help.c:3197 sql_help.c:3900
+#: sql_help.c:2548 sql_help.c:2961 sql_help.c:3201 sql_help.c:3904
 msgid "cursor_name"
 msgstr "Cursor-Name"
 
-#: sql_help.c:2545 sql_help.c:3124 sql_help.c:3901
+#: sql_help.c:2549 sql_help.c:3128 sql_help.c:3905
 msgid "output_expression"
 msgstr "Ausgabeausdruck"
 
-#: sql_help.c:2546 sql_help.c:3125 sql_help.c:3553 sql_help.c:3642
-#: sql_help.c:3792 sql_help.c:3902 sql_help.c:3986
+#: sql_help.c:2550 sql_help.c:3129 sql_help.c:3557 sql_help.c:3646
+#: sql_help.c:3796 sql_help.c:3906 sql_help.c:3990
 msgid "output_name"
 msgstr "Ausgabename"
 
-#: sql_help.c:2562
+#: sql_help.c:2566
 msgid "code"
 msgstr "Code"
 
-#: sql_help.c:2905
+#: sql_help.c:2909
 msgid "parameter"
 msgstr "Parameter"
 
-#: sql_help.c:2924 sql_help.c:2925 sql_help.c:3222
+#: sql_help.c:2928 sql_help.c:2929 sql_help.c:3226
 msgid "statement"
 msgstr "Anweisung"
 
-#: sql_help.c:2956 sql_help.c:3196
+#: sql_help.c:2960 sql_help.c:3200
 msgid "direction"
 msgstr "Richtung"
 
-#: sql_help.c:2958 sql_help.c:3198
+#: sql_help.c:2962 sql_help.c:3202
 msgid "where direction can be empty or one of:"
 msgstr "wobei Richtung leer sein kann oder Folgendes:"
 
-#: sql_help.c:2959 sql_help.c:2960 sql_help.c:2961 sql_help.c:2962
-#: sql_help.c:2963 sql_help.c:3199 sql_help.c:3200 sql_help.c:3201
-#: sql_help.c:3202 sql_help.c:3203 sql_help.c:3563 sql_help.c:3565
-#: sql_help.c:3653 sql_help.c:3655 sql_help.c:3802 sql_help.c:3804
-#: sql_help.c:3931 sql_help.c:3933 sql_help.c:3996 sql_help.c:3998
+#: sql_help.c:2963 sql_help.c:2964 sql_help.c:2965 sql_help.c:2966
+#: sql_help.c:2967 sql_help.c:3203 sql_help.c:3204 sql_help.c:3205
+#: sql_help.c:3206 sql_help.c:3207 sql_help.c:3567 sql_help.c:3569
+#: sql_help.c:3657 sql_help.c:3659 sql_help.c:3806 sql_help.c:3808
+#: sql_help.c:3935 sql_help.c:3937 sql_help.c:4000 sql_help.c:4002
 msgid "count"
 msgstr "Anzahl"
 
-#: sql_help.c:3043 sql_help.c:3375
+#: sql_help.c:3047 sql_help.c:3379
 msgid "sequence_name"
 msgstr "Sequenzname"
 
-#: sql_help.c:3056 sql_help.c:3388
+#: sql_help.c:3060 sql_help.c:3392
 msgid "arg_name"
 msgstr "Argname"
 
-#: sql_help.c:3057 sql_help.c:3389
+#: sql_help.c:3061 sql_help.c:3393
 msgid "arg_type"
 msgstr "Argtyp"
 
-#: sql_help.c:3062 sql_help.c:3394
+#: sql_help.c:3066 sql_help.c:3398
 msgid "loid"
 msgstr "Large-Object-OID"
 
-#: sql_help.c:3085
+#: sql_help.c:3089
 msgid "remote_schema"
 msgstr "fernes_Schema"
 
-#: sql_help.c:3088
+#: sql_help.c:3092
 msgid "local_schema"
 msgstr "lokales_Schema"
 
-#: sql_help.c:3122
+#: sql_help.c:3126
 msgid "conflict_target"
 msgstr "Konfliktziel"
 
-#: sql_help.c:3123
+#: sql_help.c:3127
 msgid "conflict_action"
 msgstr "Konfliktaktion"
 
-#: sql_help.c:3126
+#: sql_help.c:3130
 msgid "where conflict_target can be one of:"
 msgstr "wobei Konfliktziel Folgendes sein kann:"
 
-#: sql_help.c:3127
+#: sql_help.c:3131
 msgid "index_column_name"
 msgstr "Indexspaltenname"
 
-#: sql_help.c:3128
+#: sql_help.c:3132
 msgid "index_expression"
 msgstr "Indexausdruck"
 
-#: sql_help.c:3131
+#: sql_help.c:3135
 msgid "index_predicate"
 msgstr "Indexprädikat"
 
-#: sql_help.c:3133
+#: sql_help.c:3137
 msgid "and conflict_action is one of:"
 msgstr "und Konfliktaktion Folgendes sein kann:"
 
-#: sql_help.c:3139 sql_help.c:3897
+#: sql_help.c:3143 sql_help.c:3901
 msgid "sub-SELECT"
 msgstr "Sub-SELECT"
 
-#: sql_help.c:3148 sql_help.c:3211 sql_help.c:3873
+#: sql_help.c:3152 sql_help.c:3215 sql_help.c:3877
 msgid "channel"
 msgstr "Kanal"
 
-#: sql_help.c:3170
+#: sql_help.c:3174
 msgid "lockmode"
 msgstr "Sperrmodus"
 
-#: sql_help.c:3171
+#: sql_help.c:3175
 msgid "where lockmode is one of:"
 msgstr "wobei Sperrmodus Folgendes sein kann:"
 
-#: sql_help.c:3212
+#: sql_help.c:3216
 msgid "payload"
 msgstr "Payload"
 
-#: sql_help.c:3239
+#: sql_help.c:3243
 msgid "old_role"
 msgstr "alte_Rolle"
 
-#: sql_help.c:3240
+#: sql_help.c:3244
 msgid "new_role"
 msgstr "neue_Rolle"
 
-#: sql_help.c:3265 sql_help.c:3426 sql_help.c:3434
+#: sql_help.c:3269 sql_help.c:3430 sql_help.c:3438
 msgid "savepoint_name"
 msgstr "Sicherungspunktsname"
 
-#: sql_help.c:3467
+#: sql_help.c:3471
 msgid "provider"
 msgstr "Provider"
 
-#: sql_help.c:3554 sql_help.c:3596 sql_help.c:3598 sql_help.c:3644
-#: sql_help.c:3793 sql_help.c:3835 sql_help.c:3837 sql_help.c:3987
-#: sql_help.c:4029 sql_help.c:4031
+#: sql_help.c:3558 sql_help.c:3600 sql_help.c:3602 sql_help.c:3648
+#: sql_help.c:3797 sql_help.c:3839 sql_help.c:3841 sql_help.c:3991
+#: sql_help.c:4033 sql_help.c:4035
 msgid "from_item"
 msgstr "From-Element"
 
-#: sql_help.c:3556 sql_help.c:3608 sql_help.c:3795 sql_help.c:3847
-#: sql_help.c:3989 sql_help.c:4041
+#: sql_help.c:3560 sql_help.c:3612 sql_help.c:3799 sql_help.c:3851
+#: sql_help.c:3993 sql_help.c:4045
 msgid "grouping_element"
 msgstr "Gruppierelement"
 
-#: sql_help.c:3558 sql_help.c:3648 sql_help.c:3797 sql_help.c:3991
+#: sql_help.c:3562 sql_help.c:3652 sql_help.c:3801 sql_help.c:3995
 msgid "window_name"
 msgstr "Fenstername"
 
-#: sql_help.c:3559 sql_help.c:3649 sql_help.c:3798 sql_help.c:3992
+#: sql_help.c:3563 sql_help.c:3653 sql_help.c:3802 sql_help.c:3996
 msgid "window_definition"
 msgstr "Fensterdefinition"
 
-#: sql_help.c:3560 sql_help.c:3574 sql_help.c:3612 sql_help.c:3650
-#: sql_help.c:3799 sql_help.c:3813 sql_help.c:3851 sql_help.c:3993
-#: sql_help.c:4007 sql_help.c:4045
+#: sql_help.c:3564 sql_help.c:3578 sql_help.c:3616 sql_help.c:3654
+#: sql_help.c:3803 sql_help.c:3817 sql_help.c:3855 sql_help.c:3997
+#: sql_help.c:4011 sql_help.c:4049
 msgid "select"
 msgstr "Select"
 
-#: sql_help.c:3567 sql_help.c:3806 sql_help.c:4000
+#: sql_help.c:3571 sql_help.c:3810 sql_help.c:4004
 msgid "where from_item can be one of:"
 msgstr "wobei From-Element Folgendes sein kann:"
 
-#: sql_help.c:3570 sql_help.c:3576 sql_help.c:3579 sql_help.c:3583
-#: sql_help.c:3595 sql_help.c:3809 sql_help.c:3815 sql_help.c:3818
-#: sql_help.c:3822 sql_help.c:3834 sql_help.c:4003 sql_help.c:4009
-#: sql_help.c:4012 sql_help.c:4016 sql_help.c:4028
+#: sql_help.c:3574 sql_help.c:3580 sql_help.c:3583 sql_help.c:3587
+#: sql_help.c:3599 sql_help.c:3813 sql_help.c:3819 sql_help.c:3822
+#: sql_help.c:3826 sql_help.c:3838 sql_help.c:4007 sql_help.c:4013
+#: sql_help.c:4016 sql_help.c:4020 sql_help.c:4032
 msgid "column_alias"
 msgstr "Spaltenalias"
 
-#: sql_help.c:3571 sql_help.c:3810 sql_help.c:4004
+#: sql_help.c:3575 sql_help.c:3814 sql_help.c:4008
 msgid "sampling_method"
 msgstr "Stichprobenmethode"
 
-#: sql_help.c:3572 sql_help.c:3581 sql_help.c:3585 sql_help.c:3589
-#: sql_help.c:3592 sql_help.c:3811 sql_help.c:3820 sql_help.c:3824
-#: sql_help.c:3828 sql_help.c:3831 sql_help.c:4005 sql_help.c:4014
-#: sql_help.c:4018 sql_help.c:4022 sql_help.c:4025
+#: sql_help.c:3576 sql_help.c:3585 sql_help.c:3589 sql_help.c:3593
+#: sql_help.c:3596 sql_help.c:3815 sql_help.c:3824 sql_help.c:3828
+#: sql_help.c:3832 sql_help.c:3835 sql_help.c:4009 sql_help.c:4018
+#: sql_help.c:4022 sql_help.c:4026 sql_help.c:4029
 msgid "argument"
 msgstr "Argument"
 
-#: sql_help.c:3573 sql_help.c:3812 sql_help.c:4006
+#: sql_help.c:3577 sql_help.c:3816 sql_help.c:4010
 msgid "seed"
 msgstr "Startwert"
 
-#: sql_help.c:3577 sql_help.c:3610 sql_help.c:3816 sql_help.c:3849
-#: sql_help.c:4010 sql_help.c:4043
+#: sql_help.c:3581 sql_help.c:3614 sql_help.c:3820 sql_help.c:3853
+#: sql_help.c:4014 sql_help.c:4047
 msgid "with_query_name"
 msgstr "With-Anfragename"
 
-#: sql_help.c:3587 sql_help.c:3590 sql_help.c:3593 sql_help.c:3826
-#: sql_help.c:3829 sql_help.c:3832 sql_help.c:4020 sql_help.c:4023
-#: sql_help.c:4026
+#: sql_help.c:3591 sql_help.c:3594 sql_help.c:3597 sql_help.c:3830
+#: sql_help.c:3833 sql_help.c:3836 sql_help.c:4024 sql_help.c:4027
+#: sql_help.c:4030
 msgid "column_definition"
 msgstr "Spaltendefinition"
 
-#: sql_help.c:3597 sql_help.c:3836 sql_help.c:4030
+#: sql_help.c:3601 sql_help.c:3840 sql_help.c:4034
 msgid "join_type"
 msgstr "Verbundtyp"
 
-#: sql_help.c:3599 sql_help.c:3838 sql_help.c:4032
+#: sql_help.c:3603 sql_help.c:3842 sql_help.c:4036
 msgid "join_condition"
 msgstr "Verbundbedingung"
 
-#: sql_help.c:3600 sql_help.c:3839 sql_help.c:4033
+#: sql_help.c:3604 sql_help.c:3843 sql_help.c:4037
 msgid "join_column"
 msgstr "Verbundspalte"
 
-#: sql_help.c:3601 sql_help.c:3840 sql_help.c:4034
+#: sql_help.c:3605 sql_help.c:3844 sql_help.c:4038
 msgid "and grouping_element can be one of:"
 msgstr "und Gruppierelement eins der folgenden sein kann:"
 
-#: sql_help.c:3609 sql_help.c:3848 sql_help.c:4042
+#: sql_help.c:3613 sql_help.c:3852 sql_help.c:4046
 msgid "and with_query is:"
 msgstr "und With-Anfrage ist:"
 
-#: sql_help.c:3613 sql_help.c:3852 sql_help.c:4046
+#: sql_help.c:3617 sql_help.c:3856 sql_help.c:4050
 msgid "values"
 msgstr "values"
 
-#: sql_help.c:3614 sql_help.c:3853 sql_help.c:4047
+#: sql_help.c:3618 sql_help.c:3857 sql_help.c:4051
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:3615 sql_help.c:3854 sql_help.c:4048
+#: sql_help.c:3619 sql_help.c:3858 sql_help.c:4052
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:3616 sql_help.c:3855 sql_help.c:4049
+#: sql_help.c:3620 sql_help.c:3859 sql_help.c:4053
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:3643
+#: sql_help.c:3647
 msgid "new_table"
 msgstr "neue_Tabelle"
 
-#: sql_help.c:3668
+#: sql_help.c:3672
 msgid "timezone"
 msgstr "Zeitzone"
 
-#: sql_help.c:3713
+#: sql_help.c:3717
 msgid "snapshot_id"
 msgstr "Snapshot-ID"
 
-#: sql_help.c:3898
+#: sql_help.c:3902
 msgid "from_list"
 msgstr "From-Liste"
 
-#: sql_help.c:3929
+#: sql_help.c:3933
 msgid "sort_expression"
 msgstr "Sortierausdruck"
 
@@ -5116,7 +5123,7 @@
 #: startup.c:278
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
-msgstr "%s: konnte Logdatei „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Logdatei »%s« nicht öffnen: %s\n"
 
 #: startup.c:342
 #, c-format
@@ -5124,33 +5131,33 @@
 "Type \"help\" for help.\n"
 "\n"
 msgstr ""
-"Geben Sie „help“ für Hilfe ein.\n"
+"Geben Sie »help« für Hilfe ein.\n"
 "\n"
 
 #: startup.c:490
 #, c-format
 msgid "%s: could not set printing parameter \"%s\"\n"
-msgstr "%s: konnte Ausgabeparameter „%s“ nicht setzen\n"
+msgstr "%s: konnte Ausgabeparameter »%s« nicht setzen\n"
 
 #: startup.c:530
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
-msgstr "%s: konnte Variable „%s“ nicht löschen\n"
+msgstr "%s: konnte Variable »%s« nicht löschen\n"
 
 #: startup.c:540
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
-msgstr "%s: konnte Variable „%s“ nicht setzen\n"
+msgstr "%s: konnte Variable »%s« nicht setzen\n"
 
 #: startup.c:600
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
 #: startup.c:617
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
-msgstr "%s: Warnung: überflüssiges Kommandozeilenargument „%s“ ignoriert\n"
+msgstr "%s: Warnung: überflüssiges Kommandozeilenargument »%s« ignoriert\n"
 
 #: startup.c:639
 #, c-format
@@ -5160,9 +5167,9 @@
 #: startup.c:761 startup.c:808 startup.c:829 startup.c:866 variables.c:121
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\"; assuming \"%s\"\n"
-msgstr "unbekannter Wert „%s“ für „%s“; „%s“ wird angenommen\n"
+msgstr "unbekannter Wert »%s« für »%s«; »%s« wird angenommen\n"
 
-#: tab-complete.c:4581
+#: tab-complete.c:4593
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/po/es.po postgresql-9.5-9.5.8/src/bin/psql/po/es.po
--- postgresql-9.5-9.5.2/src/bin/psql/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: psql (PostgreSQL 9.5)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 02:43+0000\n"
-"PO-Revision-Date: 2015-10-05 11:40-0300\n"
+"POT-Creation-Date: 2017-05-21 17:31+0000\n"
+"PO-Revision-Date: 2016-07-12 09:13-0400\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL Español <pgsql-es-ayuda@postgresql.org>\n"
 "Language: es\n"
@@ -57,7 +57,7 @@
 msgstr "pclose falló: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 command.c:318 input.c:205 mainloop.c:73
+#: ../../common/fe_memutils.c:98 command.c:330 input.c:216 mainloop.c:73
 #: mainloop.c:253
 #, c-format
 msgid "out of memory\n"
@@ -73,7 +73,7 @@
 msgid "could not look up effective user ID %ld: %s"
 msgstr "no se pudo buscar el ID de usuario efectivo %ld: %s"
 
-#: ../../common/username.c:47 command.c:273
+#: ../../common/username.c:47 command.c:285
 msgid "user does not exist"
 msgstr "el usuario no existe"
 
@@ -117,228 +117,228 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Orden \\%s no válida. Use \\? para obtener ayuda.\n"
 
-#: command.c:116
+#: command.c:117
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "orden \\%s no válida\n"
 
-#: command.c:127
+#: command.c:128
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
 msgstr "\\%s: argumento extra «%s» ignorado\n"
 
-#: command.c:271
+#: command.c:283
 #, c-format
 msgid "could not get home directory for user ID %ld: %s\n"
 msgstr "no se pudo obtener directorio home para el usuario de ID %ld: %s\n"
 
-#: command.c:289
+#: command.c:301
 #, 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:304 common.c:442 common.c:500 common.c:962
+#: command.c:316 common.c:466 common.c:524 common.c:982
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "No está conectado a una base de datos.\n"
 
-#: command.c:331
+#: command.c:343
 #, 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:334
+#: command.c:346
 #, 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:535 command.c:605 command.c:1405
+#: command.c:547 command.c:620 command.c:1423
 #, c-format
 msgid "no query buffer\n"
 msgstr "no hay búfer de consulta\n"
 
-#: command.c:568 command.c:3161
+#: command.c:580 command.c:3234
 #, c-format
 msgid "invalid line number: %s\n"
 msgstr "número de línea no válido: %s\n"
 
-#: command.c:599
+#: command.c:613
 #, c-format
-msgid "The server (version %d.%d) does not support editing function source.\n"
-msgstr "El servidor (versión %d.%d) no soporta la edición del código fuente de funciones.\n"
+msgid "The server (version %s) does not support editing function source.\n"
+msgstr "El servidor (versión %s) no soporta la edición del código fuente de funciones.\n"
 
-#: command.c:679
+#: command.c:694
 msgid "No changes"
 msgstr "Sin cambios"
 
-#: command.c:733
+#: command.c:748
 #, 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:830 command.c:880 command.c:894 command.c:911 command.c:1018
-#: command.c:1182 command.c:1385 command.c:1416
+#: command.c:845 command.c:895 command.c:909 command.c:926 command.c:1033
+#: command.c:1197 command.c:1403 command.c:1434
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: falta argumento requerido\n"
 
-#: command.c:943
+#: command.c:958
 msgid "Query buffer is empty."
 msgstr "El búfer de consulta está vacío."
 
-#: command.c:953
+#: command.c:968
 msgid "Enter new password: "
 msgstr "Ingrese la nueva contraseña: "
 
-#: command.c:954
+#: command.c:969
 msgid "Enter it again: "
 msgstr "Ingrésela nuevamente: "
 
-#: command.c:958
+#: command.c:973
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Las constraseñas no coinciden.\n"
 
-#: command.c:976
+#: command.c:991
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "El cifrado de la contraseña falló.\n"
 
-#: command.c:1047 command.c:1163 command.c:1390
+#: command.c:1062 command.c:1178 command.c:1408
 #, c-format
 msgid "\\%s: error while setting variable\n"
 msgstr "\\%s: error mientras se definía la variable\n"
 
-#: command.c:1110
+#: command.c:1125
 msgid "Query buffer reset (cleared)."
 msgstr "El búfer de consulta ha sido reiniciado (limpiado)."
 
-#: command.c:1122
+#: command.c:1137
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "Se escribió la historia en el archivo «%s».\n"
 
-#: command.c:1187
+#: command.c:1202
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\"\n"
 msgstr "\\%s: el nombre de variable de ambiente no debe contener «=»\n"
 
-#: command.c:1229
+#: command.c:1246
 #, c-format
-msgid "The server (version %d.%d) does not support showing function source.\n"
-msgstr "El servidor (versión %d.%d) no soporta el despliegue del código fuente de funciones.\n"
+msgid "The server (version %s) does not support showing function source.\n"
+msgstr "El servidor (versión %s) no soporta el despliegue del código fuente de funciones.\n"
 
-#: command.c:1235
+#: command.c:1253
 #, c-format
 msgid "function name is required\n"
 msgstr "el nombre de la función es requerido\n"
 
-#: command.c:1370
+#: command.c:1388
 msgid "Timing is on."
 msgstr "El despliegue de duración está activado."
 
-#: command.c:1372
+#: command.c:1390
 msgid "Timing is off."
 msgstr "El despliegue de duración está desactivado."
 
-#: command.c:1433 command.c:1453 command.c:2084 command.c:2087 command.c:2090
-#: command.c:2096 command.c:2098 command.c:2106 command.c:2116 command.c:2125
-#: command.c:2139 command.c:2156 command.c:2215 common.c:74 copy.c:333
-#: copy.c:393 copy.c:408 psqlscan.l:1700 psqlscan.l:1711 psqlscan.l:1721
+#: command.c:1452 command.c:1472 command.c:2153 command.c:2156 command.c:2159
+#: command.c:2165 command.c:2167 command.c:2175 command.c:2185 command.c:2194
+#: command.c:2208 command.c:2225 command.c:2284 common.c:67 copy.c:331
+#: copy.c:391 copy.c:404 psqlscan.l:1701 psqlscan.l:1712 psqlscan.l:1722
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1544
+#: command.c:1566
 #, c-format
 msgid "+ opt(%d) = |%s|\n"
 msgstr "+ opt(%d) = |%s|\n"
 
-#: command.c:1570 startup.c:195
+#: command.c:1592 startup.c:195
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: command.c:1575 startup.c:197
+#: command.c:1597 startup.c:197
 #, c-format
 msgid "Password for user %s: "
 msgstr "Contraseña para usuario %s: "
 
-#: command.c:1622
+#: command.c:1648
 #, c-format
 msgid "All connection parameters must be supplied because no database connection exists\n"
 msgstr "Debe proveer todos los parámetros de conexión porque no existe conexión a una base de datos\n"
 
-#: command.c:1740 command.c:3195 common.c:120 common.c:413 common.c:1005
-#: common.c:1030 common.c:1130 copy.c:492 copy.c:702 large_obj.c:156
-#: large_obj.c:191 large_obj.c:253 psqlscan.l:1972
+#: command.c:1803 command.c:3268 common.c:140 common.c:437 common.c:1025
+#: common.c:1053 common.c:1153 copy.c:488 copy.c:708 large_obj.c:156
+#: large_obj.c:191 large_obj.c:253 psqlscan.l:1973
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1744
+#: command.c:1807
 #, c-format
 msgid "Previous connection kept\n"
 msgstr "Se ha mantenido la conexión anterior\n"
 
-#: command.c:1748
+#: command.c:1811
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1782
+#: command.c:1849
 #, c-format
 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:1785
+#: command.c:1852
 #, c-format
 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:1789
+#: command.c:1856
 #, c-format
 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:1823
+#: command.c:1889
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, servidor %s)\n"
 
-#: command.c:1831
+#: command.c:1897
 #, c-format
 msgid ""
-"WARNING: %s major version %d.%d, server major version %d.%d.\n"
+"WARNING: %s major version %s, server major version %s.\n"
 "         Some psql features might not work.\n"
 msgstr ""
-"ADVERTENCIA: %s versión %d.%d, servidor versión %d.%d.\n"
+"ADVERTENCIA: %s versión mayor %s, servidor versión mayor %s.\n"
 "          Algunas características de psql podrían no funcionar.\n"
 
-#: command.c:1865
+#: command.c:1934
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, bits: %s, compression: %s)\n"
 msgstr "conexión SSL (protocolo: %s, cifrado: %s, bits: %s, compresión: %s)\n"
 
-#: command.c:1866 command.c:1867 command.c:1868
+#: command.c:1935 command.c:1936 command.c:1937
 msgid "unknown"
 msgstr "desconocido"
 
-#: command.c:1869 help.c:46
+#: command.c:1938 help.c:46
 msgid "off"
 msgstr "desactivado"
 
-#: command.c:1869 help.c:46
+#: command.c:1938 help.c:46
 msgid "on"
 msgstr "activado"
 
-#: command.c:1889
+#: command.c:1958
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -351,227 +351,234 @@
 "            Vea la página de referencia de psql «Notes for Windows users»\n"
 "            para obtener más detalles.\n"
 
-#: command.c:1973
+#: command.c:2042
 #, c-format
 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:2002
+#: command.c:2071
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "no se pudo iniciar el editor «%s»\n"
 
-#: command.c:2004
+#: command.c:2073
 #, c-format
 msgid "could not start /bin/sh\n"
 msgstr "no se pudo iniciar /bin/sh\n"
 
-#: command.c:2042
+#: command.c:2111
 #, c-format
 msgid "could not locate temporary directory: %s\n"
 msgstr "no se pudo ubicar el directorio temporal: %s\n"
 
-#: command.c:2069
+#: command.c:2138
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "no se pudo abrir archivo temporal «%s»: %s\n"
 
-#: command.c:2377
+#: command.c:2442
 #, c-format
 msgid "\\pset: allowed formats are unaligned, aligned, wrapped, html, asciidoc, latex, latex-longtable, troff-ms\n"
 msgstr "\\pset: formatos permitidos son unaligned, aligned, wrapped, html, asciidoc, latex, latex-longtable, troff-ms\n"
 
-#: command.c:2396
+#: command.c:2461
 #, c-format
 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:2410
+#: command.c:2477
 #, c-format
-msgid "\\pset: allowed unicode border linestyle are single, double\n"
-msgstr "\\pset: estilos de línea unicode de borde permitidos son single, double\n"
+msgid "\\pset: allowed Unicode border line styles are single, double\n"
+msgstr "\\pset: estilos de línea Unicode de borde permitidos son single, double\n"
 
-#: command.c:2423
+#: command.c:2492
 #, c-format
-msgid "\\pset: allowed unicode column linestyle are single, double\n"
-msgstr "\\pset: estilos de línea unicode de columna permitidos son single, double\n"
+msgid "\\pset: allowed Unicode column line styles are single, double\n"
+msgstr "\\pset: estilos de línea Unicode de columna permitidos son single, double\n"
 
-#: command.c:2436
+#: command.c:2507
 #, c-format
-msgid "\\pset: allowed unicode header linestyle are single, double\n"
-msgstr "\\pset: estilos de línea unicode de encabezado permitidos son single, double\n"
+msgid "\\pset: allowed Unicode header line styles are single, double\n"
+msgstr "\\pset: estilos de línea Unicode de encabezado permitidos son single, double\n"
 
-#: command.c:2588 command.c:2765
+#: command.c:2659 command.c:2838
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: opción desconocida: %s\n"
 
-#: command.c:2606
+#: command.c:2677
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "El estilo de borde es %d.\n"
 
-#: command.c:2612
+#: command.c:2683
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "El ancho no está definido.\n"
 
-#: command.c:2614
+#: command.c:2685
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "El ancho es %d.\n"
 
-#: command.c:2621
+#: command.c:2692
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Se ha activado el despliegue expandido.\n"
 
-#: command.c:2623
+#: command.c:2694
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "El despliegue expandido se usa automáticamente.\n"
 
-#: command.c:2625
+#: command.c:2696
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Se ha desactivado el despliegue expandido.\n"
 
-#: command.c:2632 command.c:2640
+#: command.c:2703 command.c:2711
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "El separador de campos es el byte cero.\n"
 
-#: command.c:2634
+#: command.c:2705
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "El separador de campos es «%s».\n"
 
-#: command.c:2647
+#: command.c:2718
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "El pie por omisión está activo.\n"
 
-#: command.c:2649
+#: command.c:2720
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "El pie de página por omisión está desactivado.\n"
 
-#: command.c:2655
+#: command.c:2726
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "El formato de salida es %s.\n"
 
-#: command.c:2661
+#: command.c:2732
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "El estilo de línea es %s.\n"
 
-#: command.c:2668
+#: command.c:2739
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Despliegue de nulos es «%s».\n"
 
-#: command.c:2676
+#: command.c:2747
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "La salida numérica ajustada localmente está habilitada.\n"
 
-#: command.c:2678
+#: command.c:2749
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "La salida numérica ajustada localmente está deshabilitada.\n"
 
-#: command.c:2685
+#: command.c:2756
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "El paginador se usará para salida larga.\n"
 
-#: command.c:2687
+#: command.c:2758
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "El paginador se usará siempre.\n"
 
-#: command.c:2689
+#: command.c:2760
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "El paginador no se usará.\n"
 
-#: command.c:2695
+#: command.c:2766
 #, c-format
-msgid "Pager won't be used for less than %d lines\n"
-msgstr "El paginador no se usará para menos de %d líneas\n"
+msgid "Pager won't be used for less than %d line.\n"
+msgid_plural "Pager won't be used for less than %d lines.\n"
+msgstr[0] "El paginador no se usará para menos de %d línea.\n"
+msgstr[1] "El paginador no se usará para menos de %d líneas.\n"
 
-#: command.c:2703 command.c:2713
+#: command.c:2776 command.c:2786
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "El separador de filas es el byte cero.\n"
 
-#: command.c:2705
+#: command.c:2778
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "El separador de filas es <salto de línea>.\n"
 
-#: command.c:2707
+#: command.c:2780
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "El separador de filas es «%s».\n"
 
-#: command.c:2720
+#: command.c:2793
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "Los atributos de tabla son «%s».\n"
 
-#: command.c:2723
+#: command.c:2796
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Los atributos de tabla han sido indefinidos.\n"
 
-#: command.c:2730
+#: command.c:2803
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "El título es «%s».\n"
 
-#: command.c:2732
+#: command.c:2805
 #, c-format
 msgid "Title is unset.\n"
 msgstr "El título ha sido indefinido.\n"
 
-#: command.c:2739
+#: command.c:2812
 #, c-format
 msgid "Tuples only is on.\n"
-msgstr "Mostrar sólo filas está desactivado.\n"
+msgstr "Mostrar sólo filas está activado.\n"
 
-#: command.c:2741
+#: command.c:2814
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "Mostrar sólo filas está desactivado.\n"
 
-#: command.c:2747 command.c:2759
+#: command.c:2820
 #, c-format
-msgid "Unicode border linestyle is \"%s\".\n"
-msgstr "El estilo unicode de borde es «%s».\n"
+msgid "Unicode border line style is \"%s\".\n"
+msgstr "El estilo Unicode de borde es «%s».\n"
 
-#: command.c:2753
+#: command.c:2826
 #, c-format
-msgid "Unicode column linestyle is \"%s\".\n"
-msgstr "El estilo de línea unicode de columna es «%s».\n"
+msgid "Unicode column line style is \"%s\".\n"
+msgstr "El estilo de línea Unicode de columna es «%s».\n"
 
-#: command.c:2919
+#: command.c:2832
+#, c-format
+msgid "Unicode header line style is \"%s\".\n"
+msgstr "El estilo de línea Unicode de encabezado es «%s».\n"
+
+#: command.c:2992
 #, c-format
 msgid "\\!: failed\n"
 msgstr "\\!: falló\n"
 
-#: command.c:2939 common.c:548
+#: command.c:3012 common.c:572
 #, c-format
 msgid "\\watch cannot be used with an empty query\n"
 msgstr "\\watch no puede ser usado con una consulta vacía\n"
 
-#: command.c:2960
+#: command.c:3033
 #, c-format
 msgid "Watch every %lds\t%s"
 msgstr "Ejecución cada %lds\t%s"
 
-#: command.c:3011 command.c:3018 common.c:448 common.c:455 common.c:988
+#: command.c:3084 command.c:3091 common.c:472 common.c:479 common.c:1008
 #, c-format
 msgid ""
 "********* QUERY **********\n"
@@ -584,72 +591,72 @@
 "**************************\n"
 "\n"
 
-#: common.c:287
+#: common.c:311
 #, c-format
 msgid "connection to server was lost\n"
 msgstr "se ha perdido la conexión al servidor\n"
 
-#: common.c:291
+#: common.c:315
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "La conexión al servidor se ha perdido. Intentando reiniciar: "
 
-#: common.c:296
+#: common.c:320
 #, c-format
 msgid "Failed.\n"
 msgstr "falló.\n"
 
-#: common.c:303
+#: common.c:327
 #, c-format
 msgid "Succeeded.\n"
 msgstr "con éxito.\n"
 
-#: common.c:403 common.c:759 common.c:927
+#: common.c:427 common.c:779 common.c:947
 #, c-format
 msgid "unexpected PQresultStatus: %d\n"
 msgstr "PQresultStatus no esperado: %d\n"
 
-#: common.c:555
+#: common.c:579
 #, c-format
 msgid "\\watch cannot be used with COPY\n"
 msgstr "no se puede usar \\watch con COPY\n"
 
-#: common.c:560
+#: common.c:584
 #, c-format
 msgid "unexpected result status for \\watch\n"
 msgstr "Estado de resultado inesperado de \\watch\n"
 
-#: common.c:571 common.c:1146
+#: common.c:595 common.c:1169
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Duración: %.3f ms\n"
 
-#: common.c:589
+#: common.c:613
 #, c-format
 msgid "Asynchronous notification \"%s\" with payload \"%s\" received from server process with PID %d.\n"
 msgstr "Notificación asíncrona «%s» con carga «%s» recibida del proceso de servidor con PID %d.\n"
 
-#: common.c:592
+#: common.c:616
 #, c-format
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "Notificación asíncrona «%s» recibida del proceso de servidor con PID %d.\n"
 
-#: common.c:654
+#: common.c:674
 #, c-format
 msgid "no rows returned for \\gset\n"
 msgstr "\\gset no retornó renglón alguno\n"
 
-#: common.c:659
+#: common.c:679
 #, c-format
 msgid "more than one row returned for \\gset\n"
 msgstr "\\gset retornó más de un renglón\n"
 
-#: common.c:685
+#: common.c:705
 #, c-format
 msgid "could not set variable \"%s\"\n"
 msgstr "no se pudo definir la variable «%s»\n"
 
-#: common.c:970
+#: common.c:990
 #, c-format
 msgid ""
 "***(Single step mode: verify command)*******************************************\n"
@@ -660,17 +667,17 @@
 "%s\n"
 "***(presione enter para continuar, o x y enter para cancelar)*******************\n"
 
-#: common.c:1021
+#: common.c:1043
 #, c-format
-msgid "The server (version %d.%d) does not support savepoints for ON_ERROR_ROLLBACK.\n"
-msgstr "El servidor (versión %d.%d) no soporta savepoints para ON_ERROR_ROLLBACK.\n"
+msgid "The server (version %s) does not support savepoints for ON_ERROR_ROLLBACK.\n"
+msgstr "El servidor (versión %s) no soporta savepoints para ON_ERROR_ROLLBACK.\n"
 
-#: common.c:1075
+#: common.c:1098
 #, c-format
 msgid "STATEMENT:  %s\n"
 msgstr "SENTENCIA:  %s\n"
 
-#: common.c:1118
+#: common.c:1141
 #, c-format
 msgid "unexpected transaction status (%d)\n"
 msgstr "estado de transacción inesperado (%d)\n"
@@ -690,89 +697,89 @@
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: error de procesamiento al final de la línea\n"
 
-#: copy.c:330
+#: copy.c:328
 #, c-format
 msgid "could not execute command \"%s\": %s\n"
 msgstr "no se pudo ejecutar la orden «%s»: %s\n"
 
-#: copy.c:346
+#: copy.c:344
 #, c-format
 msgid "could not stat file \"%s\": %s\n"
 msgstr "no se pudo hacer stat del archivo «%s»: %s\n"
 
-#: copy.c:350
+#: copy.c:348
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: no se puede copiar desde/hacia un directorio\n"
 
-#: copy.c:387
+#: copy.c:385
 #, c-format
 msgid "could not close pipe to external command: %s\n"
 msgstr "no se pudo cerrar la tubería a una orden externa: %s\n"
 
-#: copy.c:455 copy.c:466
+#: copy.c:451 copy.c:462
 #, c-format
 msgid "could not write COPY data: %s\n"
 msgstr "no se pudo escribir datos COPY: %s\n"
 
-#: copy.c:473
+#: copy.c:469
 #, c-format
 msgid "COPY data transfer failed: %s"
 msgstr "falló la transferencia de datos COPY: %s"
 
-#: copy.c:534
+#: copy.c:530
 msgid "canceled by user"
 msgstr "cancelada por el usuario"
 
-#: copy.c:545
+#: copy.c:541
 msgid ""
 "Enter data to be copied followed by a newline.\n"
-"End with a backslash and a period on a line by itself."
+"End with a backslash and a period on a line by itself, or an EOF signal."
 msgstr ""
 "Ingrese los datos a ser copiados seguidos de un fin de línea.\n"
-"Termine con un backslash y un punto."
+"Termine con un backslash y un punto, o una señal EOF."
 
-#: copy.c:674
+#: copy.c:670
 msgid "aborted because of read failure"
 msgstr "se abortó por un error de lectura"
 
-#: copy.c:698
+#: copy.c:704
 msgid "trying to exit copy mode"
 msgstr "tratando de salir del modo copy"
 
-#: describe.c:71 describe.c:264 describe.c:496 describe.c:626 describe.c:769
-#: describe.c:886 describe.c:956 describe.c:2921 describe.c:3126
-#: describe.c:3216 describe.c:3461 describe.c:3598 describe.c:3827
-#: describe.c:3899 describe.c:3910 describe.c:3969 describe.c:4377
-#: describe.c:4456
+#: describe.c:71 describe.c:270 describe.c:502 describe.c:632 describe.c:775
+#: describe.c:895 describe.c:965 describe.c:2937 describe.c:3142
+#: describe.c:3232 describe.c:3480 describe.c:3620 describe.c:3852
+#: describe.c:3927 describe.c:3938 describe.c:4000 describe.c:4420
+#: describe.c:4503
 msgid "Schema"
 msgstr "Esquema"
 
-#: describe.c:72 describe.c:156 describe.c:164 describe.c:265 describe.c:497
-#: describe.c:627 describe.c:688 describe.c:770 describe.c:957 describe.c:2922
-#: describe.c:3048 describe.c:3127 describe.c:3217 describe.c:3296
-#: describe.c:3462 describe.c:3526 describe.c:3599 describe.c:3828
-#: describe.c:3900 describe.c:3911 describe.c:3970 describe.c:4159
-#: describe.c:4240 describe.c:4454
+#: describe.c:72 describe.c:159 describe.c:167 describe.c:271 describe.c:503
+#: describe.c:633 describe.c:694 describe.c:776 describe.c:966 describe.c:2938
+#: describe.c:3064 describe.c:3143 describe.c:3233 describe.c:3312
+#: describe.c:3481 describe.c:3545 describe.c:3621 describe.c:3853
+#: describe.c:3928 describe.c:3939 describe.c:4001 describe.c:4193
+#: describe.c:4277 describe.c:4501
 msgid "Name"
 msgstr "Nombre"
 
-#: describe.c:73 describe.c:277 describe.c:323 describe.c:340
+#: describe.c:73 describe.c:283 describe.c:329 describe.c:346
 msgid "Result data type"
 msgstr "Tipo de dato de salida"
 
-#: describe.c:81 describe.c:94 describe.c:98 describe.c:278 describe.c:324
-#: describe.c:341
+#: describe.c:81 describe.c:94 describe.c:98 describe.c:284 describe.c:330
+#: describe.c:347
 msgid "Argument data types"
 msgstr "Tipos de datos de argumentos"
 
-#: describe.c:105 describe.c:187 describe.c:370 describe.c:545 describe.c:642
-#: describe.c:713 describe.c:959 describe.c:1570 describe.c:2722
-#: describe.c:2955 describe.c:3079 describe.c:3153 describe.c:3226
-#: describe.c:3309 describe.c:3377 describe.c:3469 describe.c:3535
-#: describe.c:3600 describe.c:3736 describe.c:3776 describe.c:3844
-#: describe.c:3903 describe.c:3912 describe.c:3971 describe.c:4185
-#: describe.c:4262 describe.c:4391 describe.c:4457 large_obj.c:289
+#: describe.c:105 describe.c:190 describe.c:376 describe.c:551 describe.c:648
+#: describe.c:719 describe.c:968 describe.c:1581 describe.c:2738
+#: describe.c:2971 describe.c:3095 describe.c:3169 describe.c:3242
+#: describe.c:3325 describe.c:3393 describe.c:3488 describe.c:3554
+#: describe.c:3622 describe.c:3758 describe.c:3798 describe.c:3869
+#: describe.c:3931 describe.c:3940 describe.c:4002 describe.c:4219
+#: describe.c:4299 describe.c:4434 describe.c:4504 large_obj.c:289
 #: large_obj.c:299
 msgid "Description"
 msgstr "Descripción"
@@ -781,861 +788,879 @@
 msgid "List of aggregate functions"
 msgstr "Listado de funciones de agregación"
 
-#: describe.c:144
+#: describe.c:146
 #, c-format
-msgid "The server (version %d.%d) does not support tablespaces.\n"
-msgstr "El servidor (versión %d.%d) no soporta tablespaces.\n"
+msgid "The server (version %s) does not support tablespaces.\n"
+msgstr "El servidor (versión %s) no soporta tablespaces.\n"
 
-#: describe.c:157 describe.c:165 describe.c:367 describe.c:535 describe.c:689
-#: describe.c:885 describe.c:2931 describe.c:3052 describe.c:3298
-#: describe.c:3527 describe.c:4160 describe.c:4241 large_obj.c:288
+#: describe.c:160 describe.c:168 describe.c:373 describe.c:541 describe.c:695
+#: describe.c:894 describe.c:2947 describe.c:3068 describe.c:3314
+#: describe.c:3546 describe.c:4194 describe.c:4278 large_obj.c:288
 msgid "Owner"
 msgstr "Dueño"
 
-#: describe.c:158 describe.c:166
+#: describe.c:161 describe.c:169
 msgid "Location"
 msgstr "Ubicación"
 
-#: describe.c:177 describe.c:2535
+#: describe.c:180 describe.c:2552
 msgid "Options"
 msgstr "Opciones"
 
-#: describe.c:182 describe.c:508 describe.c:705 describe.c:2947
-#: describe.c:2951
+#: describe.c:185 describe.c:514 describe.c:711 describe.c:2963
+#: describe.c:2967
 msgid "Size"
 msgstr "Tamaño"
 
-#: describe.c:204
+#: describe.c:207
 msgid "List of tablespaces"
 msgstr "Listado de tablespaces"
 
-#: describe.c:241
+#: describe.c:244
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df sólo acepta las opciones [antwS+]\n"
 
-#: describe.c:247
+#: describe.c:252
 #, 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"
+msgid "\\df does not take a \"w\" option with server version %s\n"
+msgstr "\\df no acepta la opción «w» en un servidor versión %s\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:280 describe.c:326 describe.c:343
+#: describe.c:286 describe.c:332 describe.c:349
 msgid "agg"
 msgstr "agg"
 
-#: describe.c:281
+#: describe.c:287
 msgid "window"
 msgstr "ventana"
 
-#: describe.c:282 describe.c:327 describe.c:344 describe.c:1093
+#: describe.c:288 describe.c:333 describe.c:350 describe.c:1102
 msgid "trigger"
 msgstr "disparador"
 
-#: describe.c:283 describe.c:328 describe.c:345
+#: describe.c:289 describe.c:334 describe.c:351
 msgid "normal"
 msgstr "normal"
 
-#: describe.c:284 describe.c:329 describe.c:346 describe.c:776 describe.c:895
-#: describe.c:1539 describe.c:2930 describe.c:3128 describe.c:4259
+#: describe.c:290 describe.c:335 describe.c:352 describe.c:782 describe.c:904
+#: describe.c:1550 describe.c:2946 describe.c:3144 describe.c:4296
 msgid "Type"
 msgstr "Tipo"
 
-#: describe.c:360
+#: describe.c:366
 msgid "definer"
 msgstr "definidor"
 
-#: describe.c:361
+#: describe.c:367
 msgid "invoker"
 msgstr "invocador"
 
-#: describe.c:362
+#: describe.c:368
 msgid "Security"
 msgstr "Seguridad"
 
-#: describe.c:363
+#: describe.c:369
 msgid "immutable"
 msgstr "inmutable"
 
-#: describe.c:364
+#: describe.c:370
 msgid "stable"
 msgstr "estable"
 
-#: describe.c:365
+#: describe.c:371
 msgid "volatile"
 msgstr "volátil"
 
-#: describe.c:366
+#: describe.c:372
 msgid "Volatility"
 msgstr "Volatilidad"
 
-#: describe.c:368
+#: describe.c:374
 msgid "Language"
 msgstr "Lenguaje"
 
-#: describe.c:369
+#: describe.c:375
 msgid "Source code"
 msgstr "Código fuente"
 
-#: describe.c:467
+#: describe.c:473
 msgid "List of functions"
 msgstr "Listado de funciones"
 
-#: describe.c:507
+#: describe.c:513
 msgid "Internal name"
 msgstr "Nombre interno"
 
-#: describe.c:529
+#: describe.c:535
 msgid "Elements"
 msgstr "Elementos"
 
-#: describe.c:585
+#: describe.c:591
 msgid "List of data types"
 msgstr "Listado de tipos de dato"
 
-#: describe.c:628
+#: describe.c:634
 msgid "Left arg type"
 msgstr "Tipo arg izq"
 
-#: describe.c:629
+#: describe.c:635
 msgid "Right arg type"
 msgstr "Tipo arg der"
 
-#: describe.c:630
+#: describe.c:636
 msgid "Result type"
 msgstr "Tipo resultado"
 
-#: describe.c:635 describe.c:3368 describe.c:3735
+#: describe.c:641 describe.c:3384 describe.c:3757
 msgid "Function"
 msgstr "Función"
 
-#: describe.c:660
+#: describe.c:666
 msgid "List of operators"
 msgstr "Listado de operadores"
 
-#: describe.c:690
+#: describe.c:696
 msgid "Encoding"
 msgstr "Codificación"
 
-#: describe.c:695 describe.c:3463
+#: describe.c:701 describe.c:3482
 msgid "Collate"
 msgstr "Collate"
 
-#: describe.c:696 describe.c:3464
+#: describe.c:702 describe.c:3483
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:709
+#: describe.c:715
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:731
+#: describe.c:737
 msgid "List of databases"
 msgstr "Listado de base de datos"
 
-#: describe.c:771 describe.c:888 describe.c:2923
+#: describe.c:777 describe.c:897 describe.c:2939
 msgid "table"
 msgstr "tabla"
 
-#: describe.c:772 describe.c:2924
+#: describe.c:778 describe.c:2940
 msgid "view"
 msgstr "vista"
 
-#: describe.c:773 describe.c:2925
+#: describe.c:779 describe.c:2941
 msgid "materialized view"
 msgstr "vistas materializadas"
 
-#: describe.c:774 describe.c:890 describe.c:2927
+#: describe.c:780 describe.c:899 describe.c:2943
 msgid "sequence"
 msgstr "secuencia"
 
-#: describe.c:775 describe.c:2929
+#: describe.c:781 describe.c:2945
 msgid "foreign table"
 msgstr "tabla foránea"
 
-#: describe.c:787
+#: describe.c:793
 msgid "Column privileges"
 msgstr "Privilegios de acceso a columnas"
 
-#: describe.c:818
+#: describe.c:824
 msgid "Policies"
 msgstr "Políticas"
 
-#: describe.c:844 describe.c:4601 describe.c:4605
+#: describe.c:850 describe.c:4651 describe.c:4655
 msgid "Access privileges"
 msgstr "Privilegios"
 
-#: describe.c:873
+#: describe.c:881
 #, c-format
-msgid "The server (version %d.%d) does not support altering default privileges.\n"
-msgstr "El servidor (versión %d.%d) no soporta la alteración de privilegios por omisión.\n"
+msgid "The server (version %s) does not support altering default privileges.\n"
+msgstr "El servidor (versión %s) no soporta la alteración de privilegios por omisión.\n"
 
-#: describe.c:892
+#: describe.c:901
 msgid "function"
 msgstr "función"
 
-#: describe.c:894
+#: describe.c:903
 msgid "type"
 msgstr "tipo"
 
-#: describe.c:918
+#: describe.c:927
 msgid "Default access privileges"
 msgstr "Privilegios de acceso por omisión"
 
-#: describe.c:958
+#: describe.c:967
 msgid "Object"
 msgstr "Objeto"
 
-#: describe.c:972
+#: describe.c:981
 msgid "table constraint"
 msgstr "restricción de tabla"
 
-#: describe.c:994
+#: describe.c:1003
 msgid "domain constraint"
 msgstr "restricción de dominio"
 
-#: describe.c:1022
+#: describe.c:1031
 msgid "operator class"
 msgstr "clase de operadores"
 
-#: describe.c:1051
+#: describe.c:1060
 msgid "operator family"
 msgstr "familia de operadores"
 
-#: describe.c:1073
+#: describe.c:1082
 msgid "rule"
 msgstr "regla"
 
-#: describe.c:1115
+#: describe.c:1124
 msgid "Object descriptions"
 msgstr "Descripciones de objetos"
 
-#: describe.c:1169
+#: describe.c:1178
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "No se encontró relación llamada «%s».\n"
 
-#: describe.c:1378
+#: describe.c:1388
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "No se encontró relación con OID %s.\n"
 
-#: describe.c:1483
+#: describe.c:1494
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "Tabla unlogged «%s.%s»"
 
-#: describe.c:1486
+#: describe.c:1497
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabla «%s.%s»"
 
-#: describe.c:1490
+#: describe.c:1501
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vista «%s.%s»"
 
-#: describe.c:1495
+#: describe.c:1506
 #, c-format
 msgid "Unlogged materialized view \"%s.%s\""
 msgstr "Vista materializada unlogged «%s.%s»"
 
-#: describe.c:1498
+#: describe.c:1509
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Vista materializada \"%s.%s\""
 
-#: describe.c:1502
+#: describe.c:1513
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Secuencia «%s.%s»"
 
-#: describe.c:1507
+#: describe.c:1518
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "�ndice unlogged «%s.%s»"
 
-#: describe.c:1510
+#: describe.c:1521
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "�ndice «%s.%s»"
 
-#: describe.c:1515
+#: describe.c:1526
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Relación especial «%s.%s»"
 
-#: describe.c:1519
+#: describe.c:1530
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "Tabla TOAST «%s.%s»"
 
-#: describe.c:1523
+#: describe.c:1534
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Tipo compuesto «%s.%s»"
 
-#: describe.c:1527
+#: describe.c:1538
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "Tabla foránea «%s.%s»"
 
-#: describe.c:1538
+#: describe.c:1549
 msgid "Column"
 msgstr "Columna"
 
-#: describe.c:1547
+#: describe.c:1558
 msgid "Modifiers"
 msgstr "Modificadores"
 
-#: describe.c:1552
+#: describe.c:1563
 msgid "Value"
 msgstr "Valor"
 
-#: describe.c:1555
+#: describe.c:1566
 msgid "Definition"
 msgstr "Definición"
 
-#: describe.c:1558 describe.c:4180 describe.c:4261 describe.c:4329
-#: describe.c:4390
+#: describe.c:1569 describe.c:4214 describe.c:4298 describe.c:4369
+#: describe.c:4433
 msgid "FDW Options"
 msgstr "Opciones de FDW"
 
-#: describe.c:1562
+#: describe.c:1573
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: describe.c:1565
+#: describe.c:1576
 msgid "Stats target"
 msgstr "Estadísticas"
 
-#: describe.c:1615
+#: describe.c:1626
 #, c-format
 msgid "collate %s"
 msgstr "collate %s"
 
-#: describe.c:1623
+#: describe.c:1634
 msgid "not null"
 msgstr "not null"
 
 #. translator: default values of column definitions
-#: describe.c:1633
+#: describe.c:1644
 #, c-format
 msgid "default %s"
 msgstr "valor por omisión %s"
 
-#: describe.c:1748
+#: describe.c:1759
 msgid "primary key, "
 msgstr "llave primaria, "
 
-#: describe.c:1750
+#: describe.c:1761
 msgid "unique, "
 msgstr "único, "
 
-#: describe.c:1756
+#: describe.c:1767
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "de tabla «%s.%s»"
 
-#: describe.c:1760
+#: describe.c:1771
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predicado (%s)"
 
-#: describe.c:1763
+#: describe.c:1774
 msgid ", clustered"
 msgstr ", clustered"
 
-#: describe.c:1766
+#: describe.c:1777
 msgid ", invalid"
 msgstr ", no válido"
 
-#: describe.c:1769
+#: describe.c:1780
 msgid ", deferrable"
 msgstr ", postergable"
 
-#: describe.c:1772
+#: describe.c:1783
 msgid ", initially deferred"
 msgstr ", inicialmente postergada"
 
-#: describe.c:1775
+#: describe.c:1786
 msgid ", replica identity"
 msgstr ", identidad de replicación"
 
-#: describe.c:1810
+#: describe.c:1821
 #, c-format
 msgid "Owned by: %s"
 msgstr "Asociada a: %s"
 
-#: describe.c:1870
+#: describe.c:1881
 msgid "Indexes:"
 msgstr "�ndices:"
 
-#: describe.c:1954
+#: describe.c:1965
 msgid "Check constraints:"
 msgstr "Restricciones CHECK:"
 
-#: describe.c:1985
+#: describe.c:1996
 msgid "Foreign-key constraints:"
 msgstr "Restricciones de llave foránea:"
 
-#: describe.c:2016
+#: describe.c:2027
 msgid "Referenced by:"
 msgstr "Referenciada por:"
 
-#: describe.c:2061
+#: describe.c:2072
 msgid "Policies:"
 msgstr "Políticas:"
 
-#: describe.c:2064
-msgid "Policies (Row Security Enabled): (None)"
-msgstr "Políticas (Seguridad de filas activa): (Ninguna)"
-
-#: describe.c:2067
-msgid "Policies (Row Security Disabled):"
-msgstr "Políticas (Seguridad de filas inactiva):"
+#: describe.c:2075
+msgid "Policies (forced row security enabled):"
+msgstr "Políticas (seguridad de registros forzada):"
+
+#: describe.c:2078
+msgid "Policies (row security enabled): (none)"
+msgstr "Políticas (seguridad de filas activa): (ninguna)"
+
+#: describe.c:2081
+msgid "Policies (forced row security enabled): (none)"
+msgstr "Políticas (seguridad de filas forzada): (ninguna)"
+
+#: describe.c:2084
+msgid "Policies (row security disabled):"
+msgstr "Políticas (seguridad de filas inactiva):"
 
-#: describe.c:2167 describe.c:2217
+#: describe.c:2184 describe.c:2234
 msgid "Rules:"
 msgstr "Reglas:"
 
-#: describe.c:2170
+#: describe.c:2187
 msgid "Disabled rules:"
 msgstr "Reglas deshabilitadas:"
 
-#: describe.c:2173
+#: describe.c:2190
 msgid "Rules firing always:"
 msgstr "Reglas que se activan siempre:"
 
-#: describe.c:2176
+#: describe.c:2193
 msgid "Rules firing on replica only:"
 msgstr "Reglas que se activan sólo en las réplicas:"
 
-#: describe.c:2200
+#: describe.c:2217
 msgid "View definition:"
 msgstr "Definición de vista:"
 
-#: describe.c:2335
+#: describe.c:2352
 msgid "Triggers:"
 msgstr "Triggers:"
 
-#: describe.c:2339
+#: describe.c:2356
 msgid "Disabled user triggers:"
 msgstr "Disparadores de usuario deshabilitados:"
 
-#: describe.c:2341
+#: describe.c:2358
 msgid "Disabled triggers:"
 msgstr "Disparadores deshabilitados:"
 
-#: describe.c:2344
+#: describe.c:2361
 msgid "Disabled internal triggers:"
 msgstr "Disparadores internos deshabilitados:"
 
-#: describe.c:2347
+#: describe.c:2364
 msgid "Triggers firing always:"
 msgstr "Disparadores que siempre se ejecutan:"
 
-#: describe.c:2350
+#: describe.c:2367
 msgid "Triggers firing on replica only:"
 msgstr "Disparadores que se ejecutan sólo en las réplicas:"
 
-#: describe.c:2429
+#: describe.c:2424
+#, c-format
+msgid "Server: %s"
+msgstr "Servidor: %s"
+
+#: describe.c:2432
+#, c-format
+msgid "FDW Options: (%s)"
+msgstr "Opciones de FDW: (%s)"
+
+#: describe.c:2446
 msgid "Inherits"
 msgstr "Hereda"
 
-#: describe.c:2468
+#: describe.c:2485
 #, 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:2475
+#: describe.c:2492
 msgid "Child tables"
 msgstr "Tablas hijas"
 
-#: describe.c:2497
+#: describe.c:2514
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Tabla tipada de tipo: %s"
 
-#: describe.c:2511
+#: describe.c:2528
 msgid "Replica Identity"
 msgstr "Identidad de replicación"
 
-#: describe.c:2524
+#: describe.c:2541
 msgid "Has OIDs: yes"
 msgstr "Tiene OIDs: sí"
 
-#: describe.c:2613
+#: describe.c:2629
 #, 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:2625
+#: describe.c:2641
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace «%s»"
 
-#: describe.c:2715
+#: describe.c:2731
 msgid "List of roles"
 msgstr "Lista de roles"
 
-#: describe.c:2717
+#: describe.c:2733
 msgid "Role name"
 msgstr "Nombre de rol"
 
-#: describe.c:2718
+#: describe.c:2734
 msgid "Attributes"
 msgstr "Atributos"
 
-#: describe.c:2719
+#: describe.c:2735
 msgid "Member of"
 msgstr "Miembro de"
 
-#: describe.c:2730
+#: describe.c:2746
 msgid "Superuser"
 msgstr "Superusuario"
 
-#: describe.c:2733
+#: describe.c:2749
 msgid "No inheritance"
 msgstr "Sin herencia"
 
-#: describe.c:2736
+#: describe.c:2752
 msgid "Create role"
 msgstr "Crear rol"
 
-#: describe.c:2739
+#: describe.c:2755
 msgid "Create DB"
 msgstr "Crear BD"
 
-#: describe.c:2742
+#: describe.c:2758
 msgid "Cannot login"
 msgstr "No puede conectarse"
 
-#: describe.c:2746
+#: describe.c:2762
 msgid "Replication"
 msgstr "Replicación"
 
-#: describe.c:2750
+#: describe.c:2766
 msgid "Bypass RLS"
 msgstr "Ignora RLS"
 
-#: describe.c:2759
+#: describe.c:2775
 msgid "No connections"
 msgstr "Ninguna conexión"
 
-#: describe.c:2761
+#: describe.c:2777
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d conexión"
 msgstr[1] "%d conexiones"
 
-#: describe.c:2771
+#: describe.c:2787
 msgid "Password valid until "
 msgstr "Constraseña válida hasta "
 
-#: describe.c:2827
+#: describe.c:2843
 msgid "Role"
 msgstr "Nombre de rol"
 
-#: describe.c:2828
+#: describe.c:2844
 msgid "Database"
 msgstr "Base de Datos"
 
-#: describe.c:2829
+#: describe.c:2845
 msgid "Settings"
 msgstr "Seteos"
 
-#: describe.c:2839
+#: describe.c:2855
 #, 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:2850
+#: describe.c:2866
 #, c-format
 msgid "No matching settings found.\n"
 msgstr "No se encontraron parámetros coincidentes.\n"
 
-#: describe.c:2852
+#: describe.c:2868
 #, c-format
 msgid "No settings found.\n"
 msgstr "No se encontraron parámetros.\n"
 
-#: describe.c:2857
+#: describe.c:2873
 msgid "List of settings"
 msgstr "Listado de parámetros"
 
-#: describe.c:2926
+#: describe.c:2942
 msgid "index"
 msgstr "índice"
 
-#: describe.c:2928
+#: describe.c:2944
 msgid "special"
 msgstr "especial"
 
-#: describe.c:2936 describe.c:4378
+#: describe.c:2952 describe.c:4421
 msgid "Table"
 msgstr "Tabla"
 
-#: describe.c:3012
+#: describe.c:3028
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "No se encontraron relaciones coincidentes.\n"
 
-#: describe.c:3014
+#: describe.c:3030
 #, c-format
 msgid "No relations found.\n"
 msgstr "No se encontraron relaciones.\n"
 
-#: describe.c:3019
+#: describe.c:3035
 msgid "List of relations"
 msgstr "Listado de relaciones"
 
-#: describe.c:3056
+#: describe.c:3072
 msgid "Trusted"
 msgstr "Confiable"
 
-#: describe.c:3064
+#: describe.c:3080
 msgid "Internal Language"
 msgstr "Lenguaje interno"
 
-#: describe.c:3065
+#: describe.c:3081
 msgid "Call Handler"
 msgstr "Manejador de llamada"
 
-#: describe.c:3066 describe.c:4167
+#: describe.c:3082 describe.c:4201
 msgid "Validator"
 msgstr "Validador"
 
-#: describe.c:3069
+#: describe.c:3085
 msgid "Inline Handler"
 msgstr "Manejador en línea"
 
-#: describe.c:3097
+#: describe.c:3113
 msgid "List of languages"
 msgstr "Lista de lenguajes"
 
-#: describe.c:3141
+#: describe.c:3157
 msgid "Modifier"
 msgstr "Modificador"
 
-#: describe.c:3142
+#: describe.c:3158
 msgid "Check"
 msgstr "Check"
 
-#: describe.c:3184
+#: describe.c:3200
 msgid "List of domains"
 msgstr "Listado de dominios"
 
-#: describe.c:3218
+#: describe.c:3234
 msgid "Source"
 msgstr "Fuente"
 
-#: describe.c:3219
+#: describe.c:3235
 msgid "Destination"
 msgstr "Destino"
 
-#: describe.c:3220 describe.c:3369
+#: describe.c:3236 describe.c:3385
 msgid "no"
 msgstr "no"
 
-#: describe.c:3220 describe.c:3371
+#: describe.c:3236 describe.c:3387
 msgid "yes"
 msgstr "sí"
 
-#: describe.c:3221
+#: describe.c:3237
 msgid "Default?"
 msgstr "Por omisión?"
 
-#: describe.c:3258
+#: describe.c:3274
 msgid "List of conversions"
 msgstr "Listado de conversiones"
 
-#: describe.c:3297
+#: describe.c:3313
 msgid "Event"
 msgstr "Evento"
 
-#: describe.c:3299
+#: describe.c:3315
 msgid "enabled"
 msgstr "activo"
 
-#: describe.c:3300
+#: describe.c:3316
 msgid "replica"
 msgstr "réplica"
 
-#: describe.c:3301
+#: describe.c:3317
 msgid "always"
 msgstr "siempre"
 
-#: describe.c:3302
+#: describe.c:3318
 msgid "disabled"
 msgstr "inactivo"
 
-#: describe.c:3303
+#: describe.c:3319
 msgid "Enabled"
 msgstr "Activo"
 
-#: describe.c:3304
+#: describe.c:3320
 msgid "Procedure"
 msgstr "Procedimiento"
 
-#: describe.c:3305
+#: describe.c:3321
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: describe.c:3324
+#: describe.c:3340
 msgid "List of event triggers"
 msgstr "Listado de disparadores por eventos"
 
-#: describe.c:3366
+#: describe.c:3382
 msgid "Source type"
 msgstr "Tipo fuente"
 
-#: describe.c:3367
+#: describe.c:3383
 msgid "Target type"
 msgstr "Tipo destino"
 
-#: describe.c:3370
+#: describe.c:3386
 msgid "in assignment"
 msgstr "en asignación"
 
-#: describe.c:3372
+#: describe.c:3388
 msgid "Implicit?"
 msgstr "Implícito?"
 
-#: describe.c:3423
+#: describe.c:3439
 msgid "List of casts"
 msgstr "Listado de conversiones de tipo (casts)"
 
-#: describe.c:3449
+#: describe.c:3467
 #, c-format
-msgid "The server (version %d.%d) does not support collations.\n"
-msgstr "El servidor (versión %d.%d) no soporta «collations».\n"
+msgid "The server (version %s) does not support collations.\n"
+msgstr "El servidor (versión %s) no soporta «collations».\n"
 
-#: describe.c:3499
+#: describe.c:3518
 msgid "List of collations"
 msgstr "Listado de ordenamientos"
 
-#: describe.c:3558
+#: describe.c:3577
 msgid "List of schemas"
 msgstr "Listado de esquemas"
 
-#: describe.c:3581 describe.c:3816 describe.c:3884 describe.c:3952
+#: describe.c:3602 describe.c:3840 describe.c:3911 describe.c:3982
 #, 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"
+msgid "The server (version %s) does not support full text search.\n"
+msgstr "El servidor (versión %s) no soporta búsqueda en texto.\n"
 
-#: describe.c:3615
+#: describe.c:3637
 msgid "List of text search parsers"
 msgstr "Listado de analizadores de búsqueda en texto"
 
-#: describe.c:3658
+#: describe.c:3680
 #, 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:3733
+#: describe.c:3755
 msgid "Start parse"
 msgstr "Inicio de parse"
 
-#: describe.c:3734
+#: describe.c:3756
 msgid "Method"
 msgstr "Método"
 
-#: describe.c:3738
+#: describe.c:3760
 msgid "Get next token"
 msgstr "Obtener siguiente elemento"
 
-#: describe.c:3740
+#: describe.c:3762
 msgid "End parse"
 msgstr "Fin de parse"
 
-#: describe.c:3742
+#: describe.c:3764
 msgid "Get headline"
 msgstr "Obtener encabezado"
 
-#: describe.c:3744
+#: describe.c:3766
 msgid "Get token types"
 msgstr "Obtener tipos de elemento"
 
-#: describe.c:3754
+#: describe.c:3776
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analizador de búsqueda en texto «%s.%s»"
 
-#: describe.c:3756
+#: describe.c:3778
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analizador de búsqueda en texto «%s»"
 
-#: describe.c:3775
+#: describe.c:3797
 msgid "Token name"
 msgstr "Nombre de elemento"
 
-#: describe.c:3786
+#: describe.c:3808
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tipos de elemento para el analizador «%s.%s»"
 
-#: describe.c:3788
+#: describe.c:3810
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tipos de elemento para el analizador «%s»"
 
-#: describe.c:3838
+#: describe.c:3863
 msgid "Template"
 msgstr "Plantilla"
 
-#: describe.c:3839
+#: describe.c:3864
 msgid "Init options"
 msgstr "Opciones de inicialización"
 
-#: describe.c:3861
+#: describe.c:3886
 msgid "List of text search dictionaries"
 msgstr "Listado de diccionarios de búsqueda en texto"
 
-#: describe.c:3901
+#: describe.c:3929
 msgid "Init"
 msgstr "Inicializador"
 
-#: describe.c:3902
+#: describe.c:3930
 msgid "Lexize"
 msgstr "Fn. análisis léx."
 
-#: describe.c:3929
+#: describe.c:3957
 msgid "List of text search templates"
 msgstr "Listado de plantillas de búsqueda en texto"
 
-#: describe.c:3986
+#: describe.c:4017
 msgid "List of text search configurations"
 msgstr "Listado de configuraciones de búsqueda en texto"
 
-#: describe.c:4030
+#: describe.c:4061
 #, 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:4096
+#: describe.c:4127
 msgid "Token"
 msgstr "Elemento"
 
-#: describe.c:4097
+#: describe.c:4128
 msgid "Dictionaries"
 msgstr "Diccionarios"
 
-#: describe.c:4108
+#: describe.c:4139
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Configuración de búsqueda en texto «%s.%s»"
 
-#: describe.c:4111
+#: describe.c:4142
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Configuración de búsqueda en texto «%s»"
 
-#: describe.c:4115
+#: describe.c:4146
 #, c-format
 msgid ""
 "\n"
@@ -1644,7 +1669,7 @@
 "\n"
 "Analizador: «%s.%s»"
 
-#: describe.c:4118
+#: describe.c:4149
 #, c-format
 msgid ""
 "\n"
@@ -1653,86 +1678,86 @@
 "\n"
 "Analizador: «%s»"
 
-#: describe.c:4150
+#: describe.c:4183
 #, 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"
+msgid "The server (version %s) does not support foreign-data wrappers.\n"
+msgstr "El servidor (versión %s) no soporta conectores de datos externos.\n"
 
-#: describe.c:4164
+#: describe.c:4198
 msgid "Handler"
 msgstr "Manejador"
 
-#: describe.c:4207
+#: describe.c:4241
 msgid "List of foreign-data wrappers"
 msgstr "Listado de conectores de datos externos"
 
-#: describe.c:4230
+#: describe.c:4266
 #, 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"
+msgid "The server (version %s) does not support foreign servers.\n"
+msgstr "El servidor (versión %s) no soporta servidores foráneos.\n"
 
-#: describe.c:4242
+#: describe.c:4279
 msgid "Foreign-data wrapper"
 msgstr "Conectores de datos externos"
 
-#: describe.c:4260 describe.c:4455
+#: describe.c:4297 describe.c:4502
 msgid "Version"
 msgstr "Versión"
 
-#: describe.c:4286
+#: describe.c:4323
 msgid "List of foreign servers"
 msgstr "Listado de servidores foráneos"
 
-#: describe.c:4309
+#: describe.c:4348
 #, 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"
+msgid "The server (version %s) does not support user mappings.\n"
+msgstr "El servidor (versión %s) no soporta mapeos de usuario.\n"
 
-#: describe.c:4318 describe.c:4379
+#: describe.c:4358 describe.c:4422
 msgid "Server"
 msgstr "Servidor"
 
-#: describe.c:4319
+#: describe.c:4359
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: describe.c:4344
+#: describe.c:4384
 msgid "List of user mappings"
 msgstr "Listado de mapeos de usuario"
 
-#: describe.c:4367
+#: describe.c:4409
 #, 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"
+msgid "The server (version %s) does not support foreign tables.\n"
+msgstr "El servidor (versión %s) no soporta tablas foráneas.\n"
 
-#: describe.c:4418
+#: describe.c:4462
 msgid "List of foreign tables"
 msgstr "Listado de tablas foráneas"
 
-#: describe.c:4441 describe.c:4495
+#: describe.c:4487 describe.c:4544
 #, c-format
-msgid "The server (version %d.%d) does not support extensions.\n"
-msgstr "El servidor (versión %d.%d) no soporta extensiones.\n"
+msgid "The server (version %s) does not support extensions.\n"
+msgstr "El servidor (versión %s) no soporta extensiones.\n"
 
-#: describe.c:4472
+#: describe.c:4519
 msgid "List of installed extensions"
 msgstr "Listado de extensiones instaladas"
 
-#: describe.c:4522
+#: describe.c:4572
 #, c-format
 msgid "Did not find any extension named \"%s\".\n"
 msgstr "No se encontró extensión llamada «%s».\n"
 
-#: describe.c:4525
+#: describe.c:4575
 #, c-format
 msgid "Did not find any extensions.\n"
 msgstr "No se encontró ninguna extensión.\n"
 
-#: describe.c:4569
+#: describe.c:4619
 msgid "Object Description"
 msgstr "Descripciones de objetos"
 
-#: describe.c:4578
+#: describe.c:4628
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Objetos en extensión «%s»"
@@ -2078,18 +2103,18 @@
 
 #: help.c:176
 #, c-format
-msgid "  \\? [commands]          description of all psql backslash commands\n"
-msgstr "  \\? [commands]   descripción de todas las órdenes backslash de psql\n"
+msgid "  \\? [commands]          show help on backslash commands\n"
+msgstr "  \\? [commands]   desplegar ayuda sobre las órdenes backslash\n"
 
 #: help.c:177
 #, c-format
-msgid "  \\? options             description of all psql commandline options\n"
-msgstr "  \\? options      descripción de las opciones de línea de órdenes de psql\n"
+msgid "  \\? options             show help on psql command-line options\n"
+msgstr "  \\? options      desplegar ayuda sobre opciones de línea de órdenes\n"
 
 #: help.c:178
 #, c-format
-msgid "  \\? variables           description of all psql configuration variables\n"
-msgstr "  \\? variables    descripción de las variables de configuración de psql\n"
+msgid "  \\? variables           show help on special variables\n"
+msgstr "  \\? variables    desplegar ayuda sobre variables especiales\n"
 
 #: help.c:179
 #, c-format
@@ -2547,8 +2572,12 @@
 
 #: help.c:311
 #, c-format
-msgid "List of specially treated variables.\n"
-msgstr "Lista de variables con tratamiento especial.\n"
+msgid ""
+"List of specially treated variables\n"
+"\n"
+msgstr ""
+"Lista de variables con tratamiento especial\n"
+"\n"
 
 #: help.c:313
 #, c-format
@@ -2559,11 +2588,11 @@
 #, c-format
 msgid ""
 "  psql --set=NAME=VALUE\n"
-"  or \\set NAME VALUE in interactive mode\n"
+"  or \\set NAME VALUE inside psql\n"
 "\n"
 msgstr ""
 "  psql --set=NOMBRE=VALOR\n"
-"  o \\set NOMBRE VALOR en modo interactivo\n"
+"  o \\set NOMBRE VALOR dentro de psql\n"
 
 #: help.c:317
 #, c-format
@@ -2575,7 +2604,7 @@
 #: help.c:318
 #, c-format
 msgid ""
-"  COMP_KEYWORD_CASE  determine the case used to complete SQL keywords\n"
+"  COMP_KEYWORD_CASE  determines the case used to complete SQL key words\n"
 "                     [lower, upper, preserve-lower, preserve-upper]\n"
 msgstr ""
 "  COMP_KEYWORD_CASE  determina si usar mayúsculas al completar palabras SQL\n"
@@ -2589,7 +2618,7 @@
 #: help.c:321
 #, c-format
 msgid ""
-"  ECHO               control what input is written to standard output\n"
+"  ECHO               controls what input is written to standard output\n"
 "                     [all, errors, none, queries]\n"
 msgstr ""
 "  ECHO               controla qué entrada se escribe a la salida estándar\n"
@@ -2598,8 +2627,8 @@
 #: help.c:323
 #, c-format
 msgid ""
-"  ECHO_HIDDEN        display internal queries executed by backslash commands when it is set\n"
-"                     or with [noexec] just show without execution\n"
+"  ECHO_HIDDEN        if set, display internal queries executed by backslash commands;\n"
+"                     if set to \"noexec\", just show without execution\n"
 msgstr ""
 "  ECHO_HIDDEN        muestra consultas internas usadas por órdenes backslash\n"
 "                     con [noexec] sólo las muestra sin ejecutarlas\n"
@@ -2607,8 +2636,7 @@
 #: help.c:325
 #, c-format
 msgid "  ENCODING           current client character set encoding\n"
-msgstr ""
-"  ENCODING           codificación actual del cliente\n"
+msgstr "  ENCODING           codificación actual del cliente\n"
 
 #: help.c:326
 #, c-format
@@ -2621,15 +2649,15 @@
 
 #: help.c:328
 #, c-format
-msgid "  HISTCONTROL        control history list [ignorespace, ignoredups, ignoreboth]\n"
+msgid "  HISTCONTROL        controls command history [ignorespace, ignoredups, ignoreboth]\n"
 msgstr ""
-"  HISTCONTROL        controla la lista de historia\n"
+"  HISTCONTROL        controla la lista de historia de órdenes\n"
 "                     [ignorespace, ignoredups, ignoreboth]\n"
 
 #: help.c:329
 #, c-format
-msgid "  HISTFILE           file name used to store the history list\n"
-msgstr "  HISTFILE           nombre de archivo usado para almacenar la historia\n"
+msgid "  HISTFILE           file name used to store the command history\n"
+msgstr "  HISTFILE           nombre de archivo para almacenar historia de órdenes\n"
 
 #: help.c:330
 #, c-format
@@ -2638,7 +2666,7 @@
 
 #: help.c:331
 #, c-format
-msgid "  HOST               the currently connected database server\n"
+msgid "  HOST               the currently connected database server host\n"
 msgstr "  HOST               el servidor actualmente conectado\n"
 
 #: help.c:332
@@ -2650,15 +2678,15 @@
 
 #: help.c:333
 #, c-format
-msgid "  LASTOID            the value of last affected OID\n"
+msgid "  LASTOID            value of the last affected OID\n"
 msgstr "  LASTOID            el valor del último OID afectado\n"
 
 #: help.c:334
 #, c-format
-msgid "  ON_ERROR_ROLLBACK  if set, an error doesn't stop a transaction (uses implicit SAVEPOINTs)\n"
+msgid "  ON_ERROR_ROLLBACK  if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
 msgstr ""
 "  ON_ERROR_ROLLBACK  si está definido, un error no aborta la transacción\n"
-"                     (usa SAVEPOINTs implícitos)\n"
+"                     (usa «savepoints» implícitos)\n"
 
 #: help.c:335
 #, c-format
@@ -2672,19 +2700,19 @@
 
 #: help.c:337
 #, c-format
-msgid "  PROMPT1            specify the standard psql prompt\n"
+msgid "  PROMPT1            specifies the standard psql prompt\n"
 msgstr "  PROMPT1            especifica el prompt estándar de psql\n"
 
 #: help.c:338
 #, c-format
-msgid "  PROMPT2            specify the prompt used when a statement continues from a previous line\n"
+msgid "  PROMPT2            specifies the prompt used when a statement continues from a previous line\n"
 msgstr ""
 "  PROMPT2            especifica el prompt usado cuando una sentencia continúa\n"
 "                     de una línea anterior\n"
 
 #: help.c:339
 #, c-format
-msgid "  PROMPT3            specify the prompt used during COPY ... FROM STDIN\n"
+msgid "  PROMPT3            specifies the prompt used during COPY ... FROM STDIN\n"
 msgstr "  PROMPT3            especifica el prompt usado durante COPY ... FROM STDIN\n"
 
 #: help.c:340
@@ -2709,28 +2737,27 @@
 
 #: help.c:344
 #, c-format
-msgid "  VERBOSITY          control verbosity of error reports [default, verbose, terse]\n"
+msgid "  VERBOSITY          controls verbosity of error reports [default, verbose, terse]\n"
 msgstr "  VERBOSITY          controla la verbosidad de errores [default, verbose, terse]\n"
 
 #: help.c:346
 #, c-format
 msgid ""
 "\n"
-"Display influencing variables:\n"
+"Display settings:\n"
 msgstr ""
 "\n"
-"Variables que influencian el despliegue:\n"
-
+"Parámetros de despliegue:\n"
 
 #: help.c:348
 #, c-format
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
-"  or \\pset NAME [VALUE] in interactive mode\n"
+"  or \\pset NAME [VALUE] inside psql\n"
 "\n"
 msgstr ""
 "  psql --pset=NOMBRE[=VALOR]\n"
-"  o \\pset NOMBRE [VALOR] en modo interactivo\n"
+"  o \\pset NOMBRE [VALOR] dentro de psql\n"
 "\n"
 
 #: help.c:350
@@ -2740,26 +2767,25 @@
 
 #: help.c:351
 #, c-format
-msgid "  columns            set the target width for the wrapped format\n"
+msgid "  columns            target width for the wrapped format\n"
 msgstr "  columns            define el ancho para formato «wrapped»\n"
 
 #: help.c:352
 #, c-format
-msgid "  expanded (or x)    toggle expanded output\n"
-msgstr "  expanded (o x)     cambia el modo expandido\n"
+msgid "  expanded (or x)    expanded output [on, off, auto]\n"
+msgstr "  expanded (o x)     salida expandida [on, off, auto]\n"
 
 #: help.c:353
 #, c-format
-msgid "  fieldsep           field separator for unaligned output (default '|')\n"
+msgid "  fieldsep           field separator for unaligned output (default \"%s\")\n"
 msgstr ""
-"  fieldsep           separador de campos para salida desalineada\n"
-"                     (por omisión: «|»)\n"
+"  fieldsep           separador de campos para formato «unaligned»\n"
+"                     (por omisión: «%s»)\n"
 
 #: help.c:354
 #, c-format
-msgid "  fieldsep_zero      set field separator in unaligned mode to zero\n"
-msgstr ""
-"  fieldsep_zero      define el separador de campos a cero\n"
+msgid "  fieldsep_zero      set field separator for unaligned output to zero byte\n"
+msgstr "  fieldsep_zero      separador de campos en «unaligned» es byte cero\n"
 
 #: help.c:355
 #, c-format
@@ -2797,25 +2823,24 @@
 
 #: help.c:362
 #, c-format
-msgid "  recordsep          specify the record (line) separator to use in unaligned output format\n"
-msgstr ""
-"  recordsep          especifica el separador de registros a usar en formato de salida «unaligned»\n"
+msgid "  recordsep          record (line) separator for unaligned output\n"
+msgstr "  recordsep          separador de registros (líneas) para formato «unaligned»\n"
 
 #: help.c:363
 #, c-format
-msgid "  recordsep_zero     set the record separator to use in unaligned output format to a zero byte.\n"
-msgstr ""
-"  recordsep_zero     define el separador de registros en formato «unaligned» al byte cero\n"
+msgid "  recordsep_zero     set record separator for unaligned output to zero byte\n"
+msgstr "  recordsep_zero     separador de registros en «unaligned» es byte cero\n"
 
+# XXX WTF does this mean?
 #: help.c:364
 #, c-format
-# XXX WTF does this mean?
 msgid ""
 "  tableattr (or T)   specify attributes for table tag in html format or proportional\n"
-"                     column width of left aligned data type in latex format\n"
+"                     column widths for left-aligned data types in latex-longtable format\n"
 msgstr ""
-"  tableattr (o T)    especifica atributos para el tag «table» en formato «html», o ancho proporcional\n"
-"                     de columnas de tipos de dato alineados a la izquierda en formato «latex»\n"
+"  tableattr (o T)    especifica atributos para el tag «table» en formato «html»,\n"
+"                     o ancho proporcional de columnas alineadas a la izquierda\n"
+"                     en formato «latex-longtable»\n"
 
 #: help.c:366
 #, c-format
@@ -2829,22 +2854,16 @@
 
 #: help.c:368
 #, c-format
-msgid "  unicode_border_linestyle\n"
-msgstr "  unicode_border_linestyle\n"
-
-#: help.c:369
-#, c-format
-msgid "  unicode_column_linestyle\n"
-msgstr "  unicode_column_linestyle\n"
-
-#: help.c:370
-#, c-format
 msgid ""
+"  unicode_border_linestyle\n"
+"  unicode_column_linestyle\n"
 "  unicode_header_linestyle\n"
-"                     set the style of unicode line drawing [single, double]\n"
+"                     set the style of Unicode line drawing [single, double]\n"
 msgstr ""
+"  unicode_border_linestyle\n"
+"  unicode_column_linestyle\n"
 "  unicode_header_linestyle\n"
-"                     define el estilo de líneas «unicode» [single, double]\n"
+"                     define el estilo de líneas Unicode [single, double]\n"
 
 #: help.c:373
 #, c-format
@@ -2859,23 +2878,23 @@
 #, c-format
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
-"  or \\setenv NAME [VALUE] in interactive mode\n"
+"  or \\setenv NAME [VALUE] inside psql\n"
 "\n"
 msgstr ""
 "  NOMBRE=VALOR [NOMBRE=VALOR] psql ...\n"
-"  o \\setenv NOMBRE [VALOR] en modo interactivo\n"
+"  o \\setenv NOMBRE [VALOR] dentro de psql\n"
 
 #: help.c:379
 #, c-format
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
-"  or \\setenv NAME VALUE in interactive mode\n"
+"  or \\setenv NAME [VALUE] inside psql\n"
 "\n"
 msgstr ""
 "  set NOMBRE=VALOR\n"
 "  psql ...\n"
-"  o \\setenv NOMBRE VALOR en modo interactivo\n"
+"  o \\setenv NOMBRE [VALOR] dentro de psql\n"
 
 #: help.c:382
 #, c-format
@@ -2988,17 +3007,17 @@
 "No hay ayuda disponible para «%s».\n"
 "Pruebe \\h sin argumentos para mostrar los elementos de ayuda disponibles.\n"
 
-#: input.c:194
+#: input.c:205
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "no se pudo leer el archivo de entrada: %s\n"
 
-#: input.c:446 input.c:485
+#: input.c:460 input.c:499
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
 msgstr "no se pudo guardar historial a archivo «%s»: %s\n"
 
-#: input.c:505
+#: input.c:519
 #, c-format
 msgid "history is not supported by this installation\n"
 msgstr "el historial de órdenes no está soportado en esta instalación\n"
@@ -3058,29 +3077,29 @@
 "       \\g o punto y coma («;») para ejecutar la consulta\n"
 "       \\q para salir\n"
 
-#: print.c:344
+#: print.c:352
 #, c-format
 msgid "(%lu row)"
 msgid_plural "(%lu rows)"
 msgstr[0] "(%lu fila)"
 msgstr[1] "(%lu filas)"
 
-#: print.c:2801
+#: print.c:2910
 #, c-format
 msgid "Interrupted\n"
 msgstr "Interrumpido\n"
 
-#: print.c:2867
+#: print.c:2974
 #, c-format
 msgid "Cannot add header to table content: column count of %d exceeded.\n"
 msgstr "No se puede agregar un encabezado al contenido de la tabla: la cantidad de columnas de %d ha sido excedida.\n"
 
-#: print.c:2907
+#: print.c:3014
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
 msgstr "No se puede agregar una celda al contenido de la tabla: la cantidad de celdas de %d ha sido excedida.\n"
 
-#: print.c:3139
+#: print.c:3263
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "formato de salida no válido (error interno): %d"
@@ -3090,17 +3109,17 @@
 msgid "skipping recursive expansion of variable \"%s\"\n"
 msgstr "saltando expansión recursiva de la variable «%s»\n"
 
-#: psqlscan.l:1627
+#: psqlscan.l:1628
 #, c-format
 msgid "unterminated quoted string\n"
 msgstr "cadena en comillas sin terminar\n"
 
-#: psqlscan.l:1727
+#: psqlscan.l:1728
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria agotada\n"
 
-#: psqlscan.l:1956
+#: psqlscan.l:1957
 #, c-format
 msgid "can't escape without active connection\n"
 msgstr "no se puede escapar sin una conexión activa\n"
@@ -3115,158 +3134,157 @@
 #: sql_help.c:367 sql_help.c:369 sql_help.c:412 sql_help.c:414 sql_help.c:417
 #: sql_help.c:419 sql_help.c:483 sql_help.c:488 sql_help.c:493 sql_help.c:498
 #: sql_help.c:546 sql_help.c:548 sql_help.c:550 sql_help.c:553 sql_help.c:555
-#: sql_help.c:566 sql_help.c:568 sql_help.c:608 sql_help.c:610 sql_help.c:613
-#: sql_help.c:615 sql_help.c:617 sql_help.c:646 sql_help.c:650 sql_help.c:668
-#: sql_help.c:671 sql_help.c:674 sql_help.c:703 sql_help.c:715 sql_help.c:723
-#: sql_help.c:726 sql_help.c:729 sql_help.c:743 sql_help.c:789 sql_help.c:812
-#: sql_help.c:823 sql_help.c:825 sql_help.c:842 sql_help.c:851 sql_help.c:853
-#: sql_help.c:855 sql_help.c:867 sql_help.c:871 sql_help.c:873 sql_help.c:955
-#: sql_help.c:957 sql_help.c:960 sql_help.c:963 sql_help.c:965 sql_help.c:967
-#: sql_help.c:1028 sql_help.c:1030 sql_help.c:1032 sql_help.c:1035
-#: sql_help.c:1056 sql_help.c:1059 sql_help.c:1062 sql_help.c:1065
-#: sql_help.c:1069 sql_help.c:1071 sql_help.c:1073 sql_help.c:1075
-#: sql_help.c:1089 sql_help.c:1092 sql_help.c:1094 sql_help.c:1096
-#: sql_help.c:1106 sql_help.c:1108 sql_help.c:1118 sql_help.c:1120
-#: sql_help.c:1129 sql_help.c:1150 sql_help.c:1152 sql_help.c:1154
-#: sql_help.c:1157 sql_help.c:1159 sql_help.c:1161 sql_help.c:1211
-#: sql_help.c:1249 sql_help.c:1252 sql_help.c:1254 sql_help.c:1256
-#: sql_help.c:1258 sql_help.c:1260 sql_help.c:1263 sql_help.c:1303
-#: sql_help.c:1550 sql_help.c:1566 sql_help.c:1579 sql_help.c:1630
-#: sql_help.c:1634 sql_help.c:1644 sql_help.c:1664 sql_help.c:1689
-#: sql_help.c:1707 sql_help.c:1735 sql_help.c:1809 sql_help.c:1852
-#: sql_help.c:1874 sql_help.c:1894 sql_help.c:1895 sql_help.c:1930
-#: sql_help.c:1950 sql_help.c:1972 sql_help.c:1985 sql_help.c:2017
-#: sql_help.c:2042 sql_help.c:2086 sql_help.c:2272 sql_help.c:2285
-#: sql_help.c:2302 sql_help.c:2318 sql_help.c:2357 sql_help.c:2408
-#: sql_help.c:2412 sql_help.c:2414 sql_help.c:2420 sql_help.c:2438
-#: sql_help.c:2465 sql_help.c:2500 sql_help.c:2512 sql_help.c:2521
-#: sql_help.c:2571 sql_help.c:2599 sql_help.c:2607 sql_help.c:2615
-#: sql_help.c:2623 sql_help.c:2631 sql_help.c:2639 sql_help.c:2647
-#: sql_help.c:2655 sql_help.c:2664 sql_help.c:2675 sql_help.c:2683
-#: sql_help.c:2691 sql_help.c:2699 sql_help.c:2707 sql_help.c:2717
-#: sql_help.c:2726 sql_help.c:2735 sql_help.c:2743 sql_help.c:2752
-#: sql_help.c:2760 sql_help.c:2769 sql_help.c:2777 sql_help.c:2785
-#: sql_help.c:2793 sql_help.c:2801 sql_help.c:2809 sql_help.c:2817
-#: sql_help.c:2825 sql_help.c:2833 sql_help.c:2850 sql_help.c:2859
-#: sql_help.c:2867 sql_help.c:2884 sql_help.c:2899 sql_help.c:3164
-#: sql_help.c:3215 sql_help.c:3244 sql_help.c:3252 sql_help.c:3671
-#: sql_help.c:3719 sql_help.c:3860
+#: sql_help.c:566 sql_help.c:568 sql_help.c:607 sql_help.c:609 sql_help.c:612
+#: sql_help.c:614 sql_help.c:616 sql_help.c:644 sql_help.c:648 sql_help.c:666
+#: sql_help.c:669 sql_help.c:672 sql_help.c:701 sql_help.c:713 sql_help.c:721
+#: sql_help.c:724 sql_help.c:727 sql_help.c:742 sql_help.c:745 sql_help.c:790
+#: sql_help.c:813 sql_help.c:824 sql_help.c:826 sql_help.c:843 sql_help.c:852
+#: sql_help.c:854 sql_help.c:856 sql_help.c:868 sql_help.c:872 sql_help.c:874
+#: sql_help.c:958 sql_help.c:960 sql_help.c:963 sql_help.c:966 sql_help.c:968
+#: sql_help.c:970 sql_help.c:1031 sql_help.c:1033 sql_help.c:1035
+#: sql_help.c:1038 sql_help.c:1059 sql_help.c:1062 sql_help.c:1065
+#: sql_help.c:1068 sql_help.c:1072 sql_help.c:1074 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1092 sql_help.c:1095 sql_help.c:1097
+#: sql_help.c:1099 sql_help.c:1109 sql_help.c:1111 sql_help.c:1121
+#: sql_help.c:1123 sql_help.c:1132 sql_help.c:1153 sql_help.c:1155
+#: sql_help.c:1157 sql_help.c:1160 sql_help.c:1162 sql_help.c:1164
+#: sql_help.c:1215 sql_help.c:1253 sql_help.c:1256 sql_help.c:1258
+#: sql_help.c:1260 sql_help.c:1262 sql_help.c:1264 sql_help.c:1267
+#: sql_help.c:1307 sql_help.c:1554 sql_help.c:1570 sql_help.c:1583
+#: sql_help.c:1634 sql_help.c:1638 sql_help.c:1648 sql_help.c:1668
+#: sql_help.c:1693 sql_help.c:1711 sql_help.c:1739 sql_help.c:1813
+#: sql_help.c:1856 sql_help.c:1878 sql_help.c:1898 sql_help.c:1899
+#: sql_help.c:1934 sql_help.c:1954 sql_help.c:1976 sql_help.c:1989
+#: sql_help.c:2021 sql_help.c:2046 sql_help.c:2090 sql_help.c:2276
+#: sql_help.c:2289 sql_help.c:2306 sql_help.c:2322 sql_help.c:2361
+#: sql_help.c:2412 sql_help.c:2416 sql_help.c:2418 sql_help.c:2424
+#: sql_help.c:2442 sql_help.c:2470 sql_help.c:2505 sql_help.c:2517
+#: sql_help.c:2526 sql_help.c:2576 sql_help.c:2604 sql_help.c:2612
+#: sql_help.c:2620 sql_help.c:2628 sql_help.c:2636 sql_help.c:2644
+#: sql_help.c:2652 sql_help.c:2660 sql_help.c:2669 sql_help.c:2680
+#: sql_help.c:2688 sql_help.c:2696 sql_help.c:2704 sql_help.c:2712
+#: sql_help.c:2722 sql_help.c:2731 sql_help.c:2740 sql_help.c:2748
+#: sql_help.c:2757 sql_help.c:2765 sql_help.c:2774 sql_help.c:2782
+#: sql_help.c:2790 sql_help.c:2798 sql_help.c:2806 sql_help.c:2814
+#: sql_help.c:2822 sql_help.c:2830 sql_help.c:2838 sql_help.c:2855
+#: sql_help.c:2864 sql_help.c:2872 sql_help.c:2889 sql_help.c:2904
+#: sql_help.c:3169 sql_help.c:3220 sql_help.c:3249 sql_help.c:3257
+#: sql_help.c:3676 sql_help.c:3724 sql_help.c:3865
 msgid "name"
 msgstr "nombre"
 
-#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1367
-#: sql_help.c:2572 sql_help.c:3467
+#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1371
+#: sql_help.c:2577 sql_help.c:3472
 msgid "aggregate_signature"
 msgstr "signatura_func_agregación"
 
 #: sql_help.c:35 sql_help.c:62 sql_help.c:77 sql_help.c:113 sql_help.c:233
 #: sql_help.c:251 sql_help.c:370 sql_help.c:418 sql_help.c:492 sql_help.c:533
-#: sql_help.c:547 sql_help.c:567 sql_help.c:614 sql_help.c:670 sql_help.c:725
-#: sql_help.c:745 sql_help.c:790 sql_help.c:814 sql_help.c:824 sql_help.c:854
-#: sql_help.c:874 sql_help.c:964 sql_help.c:1029 sql_help.c:1072
-#: sql_help.c:1093 sql_help.c:1107 sql_help.c:1119 sql_help.c:1131
-#: sql_help.c:1158 sql_help.c:1212 sql_help.c:1257
+#: sql_help.c:547 sql_help.c:567 sql_help.c:613 sql_help.c:668 sql_help.c:723
+#: sql_help.c:744 sql_help.c:791 sql_help.c:815 sql_help.c:825 sql_help.c:855
+#: sql_help.c:875 sql_help.c:967 sql_help.c:1032 sql_help.c:1075
+#: sql_help.c:1096 sql_help.c:1110 sql_help.c:1122 sql_help.c:1134
+#: sql_help.c:1161 sql_help.c:1216 sql_help.c:1261
 msgid "new_name"
 msgstr "nuevo_nombre"
 
 #: sql_help.c:38 sql_help.c:64 sql_help.c:79 sql_help.c:115 sql_help.c:231
 #: sql_help.c:249 sql_help.c:368 sql_help.c:454 sql_help.c:497 sql_help.c:569
-#: sql_help.c:578 sql_help.c:633 sql_help.c:649 sql_help.c:673 sql_help.c:728
-#: sql_help.c:826 sql_help.c:852 sql_help.c:872 sql_help.c:1013
-#: sql_help.c:1031 sql_help.c:1074 sql_help.c:1095 sql_help.c:1153
-#: sql_help.c:1255 sql_help.c:2258
+#: sql_help.c:578 sql_help.c:632 sql_help.c:647 sql_help.c:671 sql_help.c:726
+#: sql_help.c:827 sql_help.c:853 sql_help.c:873 sql_help.c:1016
+#: sql_help.c:1034 sql_help.c:1077 sql_help.c:1098 sql_help.c:1156
+#: sql_help.c:1259 sql_help.c:2262
 msgid "new_owner"
 msgstr "nuevo_dueño"
 
 #: sql_help.c:41 sql_help.c:66 sql_help.c:81 sql_help.c:235 sql_help.c:299
-#: sql_help.c:420 sql_help.c:502 sql_help.c:616 sql_help.c:653 sql_help.c:676
-#: sql_help.c:731 sql_help.c:856 sql_help.c:966 sql_help.c:1076
-#: sql_help.c:1097 sql_help.c:1109 sql_help.c:1121 sql_help.c:1160
-#: sql_help.c:1259
+#: sql_help.c:420 sql_help.c:502 sql_help.c:615 sql_help.c:651 sql_help.c:674
+#: sql_help.c:729 sql_help.c:857 sql_help.c:969 sql_help.c:1079
+#: sql_help.c:1100 sql_help.c:1112 sql_help.c:1124 sql_help.c:1163
+#: sql_help.c:1263
 msgid "new_schema"
 msgstr "nuevo_esquema"
 
-#: sql_help.c:42 sql_help.c:1420 sql_help.c:2573 sql_help.c:3486
+#: sql_help.c:42 sql_help.c:1424 sql_help.c:2578 sql_help.c:3491
 msgid "where aggregate_signature is:"
 msgstr "donde signatura_func_agregación es:"
 
 #: sql_help.c:43 sql_help.c:46 sql_help.c:49 sql_help.c:316 sql_help.c:341
 #: sql_help.c:344 sql_help.c:347 sql_help.c:484 sql_help.c:489 sql_help.c:494
-#: sql_help.c:499 sql_help.c:1385 sql_help.c:1421 sql_help.c:1424
-#: sql_help.c:1427 sql_help.c:1551 sql_help.c:1567 sql_help.c:1570
-#: sql_help.c:1810 sql_help.c:2574 sql_help.c:2577 sql_help.c:2580
-#: sql_help.c:2665 sql_help.c:3050 sql_help.c:3382 sql_help.c:3473
-#: sql_help.c:3487 sql_help.c:3490 sql_help.c:3493
+#: sql_help.c:499 sql_help.c:1389 sql_help.c:1425 sql_help.c:1428
+#: sql_help.c:1431 sql_help.c:1555 sql_help.c:1571 sql_help.c:1574
+#: sql_help.c:1814 sql_help.c:2579 sql_help.c:2582 sql_help.c:2585
+#: sql_help.c:2670 sql_help.c:3055 sql_help.c:3387 sql_help.c:3478
+#: sql_help.c:3492 sql_help.c:3495 sql_help.c:3498
 msgid "argmode"
 msgstr "modo_arg"
 
 #: sql_help.c:44 sql_help.c:47 sql_help.c:50 sql_help.c:317 sql_help.c:342
 #: sql_help.c:345 sql_help.c:348 sql_help.c:485 sql_help.c:490 sql_help.c:495
-#: sql_help.c:500 sql_help.c:1386 sql_help.c:1422 sql_help.c:1425
-#: sql_help.c:1428 sql_help.c:1552 sql_help.c:1568 sql_help.c:1571
-#: sql_help.c:1811 sql_help.c:2575 sql_help.c:2578 sql_help.c:2581
-#: sql_help.c:2666 sql_help.c:3474 sql_help.c:3488 sql_help.c:3491
-#: sql_help.c:3494
+#: sql_help.c:500 sql_help.c:1390 sql_help.c:1426 sql_help.c:1429
+#: sql_help.c:1432 sql_help.c:1556 sql_help.c:1572 sql_help.c:1575
+#: sql_help.c:1815 sql_help.c:2580 sql_help.c:2583 sql_help.c:2586
+#: sql_help.c:2671 sql_help.c:3479 sql_help.c:3493 sql_help.c:3496
+#: sql_help.c:3499
 msgid "argname"
 msgstr "nombre_arg"
 
 #: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:318 sql_help.c:343
 #: sql_help.c:346 sql_help.c:349 sql_help.c:486 sql_help.c:491 sql_help.c:496
-#: sql_help.c:501 sql_help.c:1387 sql_help.c:1423 sql_help.c:1426
-#: sql_help.c:1429 sql_help.c:1812 sql_help.c:2576 sql_help.c:2579
-#: sql_help.c:2582 sql_help.c:2667 sql_help.c:3475 sql_help.c:3489
-#: sql_help.c:3492 sql_help.c:3495
+#: sql_help.c:501 sql_help.c:1391 sql_help.c:1427 sql_help.c:1430
+#: sql_help.c:1433 sql_help.c:1816 sql_help.c:2581 sql_help.c:2584
+#: sql_help.c:2587 sql_help.c:2672 sql_help.c:3480 sql_help.c:3494
+#: sql_help.c:3497 sql_help.c:3500
 msgid "argtype"
 msgstr "tipo_arg"
 
-#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:784
-#: sql_help.c:869 sql_help.c:1090 sql_help.c:1206 sql_help.c:1234
-#: sql_help.c:1477 sql_help.c:1483 sql_help.c:1738 sql_help.c:1770
-#: sql_help.c:1777 sql_help.c:1853 sql_help.c:2018 sql_help.c:2107
-#: sql_help.c:2287 sql_help.c:2466 sql_help.c:2488 sql_help.c:2918
-#: sql_help.c:3084
+#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:785
+#: sql_help.c:870 sql_help.c:1093 sql_help.c:1210 sql_help.c:1238
+#: sql_help.c:1481 sql_help.c:1487 sql_help.c:1742 sql_help.c:1774
+#: sql_help.c:1781 sql_help.c:1857 sql_help.c:2022 sql_help.c:2111
+#: sql_help.c:2291 sql_help.c:2471 sql_help.c:2493 sql_help.c:2923
+#: sql_help.c:3089
 msgid "option"
 msgstr "opción"
 
-#: sql_help.c:108 sql_help.c:785 sql_help.c:1207 sql_help.c:1854
-#: sql_help.c:2019 sql_help.c:2467
+#: sql_help.c:108 sql_help.c:786 sql_help.c:1211 sql_help.c:1858
+#: sql_help.c:2023 sql_help.c:2472
 msgid "where option can be:"
 msgstr "donde opción puede ser:"
 
-#: sql_help.c:109 sql_help.c:1671
+#: sql_help.c:109 sql_help.c:1675
 msgid "allowconn"
 msgstr "allowconn"
 
-#: sql_help.c:110 sql_help.c:786 sql_help.c:1208 sql_help.c:1672
-#: sql_help.c:2020 sql_help.c:2468
+#: sql_help.c:110 sql_help.c:787 sql_help.c:1212 sql_help.c:1676
+#: sql_help.c:2024 sql_help.c:2473
 msgid "connlimit"
 msgstr "límite_conexiones"
 
-#: sql_help.c:111 sql_help.c:1673
+#: sql_help.c:111 sql_help.c:1677
 msgid "istemplate"
 msgstr "esplantilla"
 
-#: sql_help.c:117 sql_help.c:557 sql_help.c:619 sql_help.c:634 sql_help.c:969
-#: sql_help.c:1006
+#: sql_help.c:117 sql_help.c:557 sql_help.c:618 sql_help.c:972 sql_help.c:1009
 msgid "new_tablespace"
 msgstr "nuevo_tablespace"
 
 #: sql_help.c:119 sql_help.c:122 sql_help.c:124 sql_help.c:506 sql_help.c:508
-#: sql_help.c:509 sql_help.c:793 sql_help.c:797 sql_help.c:800 sql_help.c:885
-#: sql_help.c:888 sql_help.c:1214 sql_help.c:1217 sql_help.c:1219
-#: sql_help.c:1821 sql_help.c:3269 sql_help.c:3660
+#: sql_help.c:509 sql_help.c:794 sql_help.c:798 sql_help.c:801 sql_help.c:886
+#: sql_help.c:889 sql_help.c:1218 sql_help.c:1221 sql_help.c:1223
+#: sql_help.c:1825 sql_help.c:3274 sql_help.c:3665
 msgid "configuration_parameter"
 msgstr "parámetro_de_configuración"
 
 #: sql_help.c:120 sql_help.c:366 sql_help.c:438 sql_help.c:444 sql_help.c:456
-#: sql_help.c:507 sql_help.c:552 sql_help.c:625 sql_help.c:631 sql_help.c:794
-#: sql_help.c:870 sql_help.c:886 sql_help.c:887 sql_help.c:988 sql_help.c:1008
-#: sql_help.c:1034 sql_help.c:1091 sql_help.c:1215 sql_help.c:1235
-#: sql_help.c:1739 sql_help.c:1771 sql_help.c:1778 sql_help.c:1822
-#: sql_help.c:1823 sql_help.c:1882 sql_help.c:1914 sql_help.c:2108
-#: sql_help.c:2182 sql_help.c:2190 sql_help.c:2222 sql_help.c:2244
-#: sql_help.c:2261 sql_help.c:2288 sql_help.c:2489 sql_help.c:3085
-#: sql_help.c:3661 sql_help.c:3662
+#: sql_help.c:507 sql_help.c:552 sql_help.c:624 sql_help.c:630 sql_help.c:795
+#: sql_help.c:871 sql_help.c:887 sql_help.c:888 sql_help.c:991 sql_help.c:1011
+#: sql_help.c:1037 sql_help.c:1094 sql_help.c:1219 sql_help.c:1239
+#: sql_help.c:1743 sql_help.c:1775 sql_help.c:1782 sql_help.c:1826
+#: sql_help.c:1827 sql_help.c:1886 sql_help.c:1918 sql_help.c:2112
+#: sql_help.c:2186 sql_help.c:2194 sql_help.c:2226 sql_help.c:2248
+#: sql_help.c:2265 sql_help.c:2292 sql_help.c:2494 sql_help.c:3090
+#: sql_help.c:3666 sql_help.c:3667
 msgid "value"
 msgstr "valor"
 
@@ -3274,9 +3292,9 @@
 msgid "target_role"
 msgstr "rol_destino"
 
-#: sql_help.c:183 sql_help.c:1722 sql_help.c:2066 sql_help.c:2071
-#: sql_help.c:3032 sql_help.c:3039 sql_help.c:3053 sql_help.c:3059
-#: sql_help.c:3364 sql_help.c:3371 sql_help.c:3385 sql_help.c:3391
+#: sql_help.c:183 sql_help.c:1726 sql_help.c:2070 sql_help.c:2075
+#: sql_help.c:3037 sql_help.c:3044 sql_help.c:3058 sql_help.c:3064
+#: sql_help.c:3369 sql_help.c:3376 sql_help.c:3390 sql_help.c:3396
 msgid "schema_name"
 msgstr "nombre_de_esquema"
 
@@ -3290,32 +3308,32 @@
 
 #: sql_help.c:186 sql_help.c:187 sql_help.c:188 sql_help.c:189 sql_help.c:190
 #: sql_help.c:191 sql_help.c:192 sql_help.c:193 sql_help.c:531 sql_help.c:556
-#: sql_help.c:618 sql_help.c:746 sql_help.c:804 sql_help.c:968 sql_help.c:1222
-#: sql_help.c:1857 sql_help.c:1858 sql_help.c:1859 sql_help.c:1860
-#: sql_help.c:1861 sql_help.c:1987 sql_help.c:2023 sql_help.c:2024
-#: sql_help.c:2025 sql_help.c:2026 sql_help.c:2027 sql_help.c:2471
-#: sql_help.c:2472 sql_help.c:2473 sql_help.c:2474 sql_help.c:2475
-#: sql_help.c:3066 sql_help.c:3067 sql_help.c:3068 sql_help.c:3365
-#: sql_help.c:3369 sql_help.c:3372 sql_help.c:3374 sql_help.c:3376
-#: sql_help.c:3378 sql_help.c:3380 sql_help.c:3386 sql_help.c:3388
-#: sql_help.c:3390 sql_help.c:3392 sql_help.c:3394 sql_help.c:3396
-#: sql_help.c:3397 sql_help.c:3398 sql_help.c:3681
+#: sql_help.c:617 sql_help.c:747 sql_help.c:805 sql_help.c:971 sql_help.c:1226
+#: sql_help.c:1861 sql_help.c:1862 sql_help.c:1863 sql_help.c:1864
+#: sql_help.c:1865 sql_help.c:1991 sql_help.c:2027 sql_help.c:2028
+#: sql_help.c:2029 sql_help.c:2030 sql_help.c:2031 sql_help.c:2476
+#: sql_help.c:2477 sql_help.c:2478 sql_help.c:2479 sql_help.c:2480
+#: sql_help.c:3071 sql_help.c:3072 sql_help.c:3073 sql_help.c:3370
+#: sql_help.c:3374 sql_help.c:3377 sql_help.c:3379 sql_help.c:3381
+#: sql_help.c:3383 sql_help.c:3385 sql_help.c:3391 sql_help.c:3393
+#: sql_help.c:3395 sql_help.c:3397 sql_help.c:3399 sql_help.c:3401
+#: sql_help.c:3402 sql_help.c:3403 sql_help.c:3686
 msgid "role_name"
 msgstr "nombre_de_rol"
 
-#: sql_help.c:219 sql_help.c:431 sql_help.c:979 sql_help.c:981 sql_help.c:1251
-#: sql_help.c:1692 sql_help.c:1696 sql_help.c:1781 sql_help.c:1785
-#: sql_help.c:1878 sql_help.c:2194 sql_help.c:2204 sql_help.c:2226
-#: sql_help.c:3115 sql_help.c:3130 sql_help.c:3132 sql_help.c:3546
-#: sql_help.c:3547 sql_help.c:3556 sql_help.c:3597 sql_help.c:3598
-#: sql_help.c:3599 sql_help.c:3600 sql_help.c:3601 sql_help.c:3602
-#: sql_help.c:3635 sql_help.c:3636 sql_help.c:3641 sql_help.c:3646
-#: sql_help.c:3785 sql_help.c:3786 sql_help.c:3795 sql_help.c:3836
-#: sql_help.c:3837 sql_help.c:3838 sql_help.c:3839 sql_help.c:3840
-#: sql_help.c:3841 sql_help.c:3888 sql_help.c:3890 sql_help.c:3923
-#: sql_help.c:3979 sql_help.c:3980 sql_help.c:3989 sql_help.c:4030
-#: sql_help.c:4031 sql_help.c:4032 sql_help.c:4033 sql_help.c:4034
-#: sql_help.c:4035
+#: sql_help.c:219 sql_help.c:431 sql_help.c:982 sql_help.c:984 sql_help.c:1255
+#: sql_help.c:1696 sql_help.c:1700 sql_help.c:1785 sql_help.c:1789
+#: sql_help.c:1882 sql_help.c:2198 sql_help.c:2208 sql_help.c:2230
+#: sql_help.c:3120 sql_help.c:3135 sql_help.c:3137 sql_help.c:3551
+#: sql_help.c:3552 sql_help.c:3561 sql_help.c:3602 sql_help.c:3603
+#: sql_help.c:3604 sql_help.c:3605 sql_help.c:3606 sql_help.c:3607
+#: sql_help.c:3640 sql_help.c:3641 sql_help.c:3646 sql_help.c:3651
+#: sql_help.c:3790 sql_help.c:3791 sql_help.c:3800 sql_help.c:3841
+#: sql_help.c:3842 sql_help.c:3843 sql_help.c:3844 sql_help.c:3845
+#: sql_help.c:3846 sql_help.c:3893 sql_help.c:3895 sql_help.c:3928
+#: sql_help.c:3984 sql_help.c:3985 sql_help.c:3994 sql_help.c:4035
+#: sql_help.c:4036 sql_help.c:4037 sql_help.c:4038 sql_help.c:4039
+#: sql_help.c:4040
 msgid "expression"
 msgstr "expresión"
 
@@ -3324,17 +3342,17 @@
 msgstr "restricción_de_dominio"
 
 #: sql_help.c:224 sql_help.c:226 sql_help.c:229 sql_help.c:446 sql_help.c:447
-#: sql_help.c:961 sql_help.c:994 sql_help.c:995 sql_help.c:996 sql_help.c:1016
-#: sql_help.c:1373 sql_help.c:1375 sql_help.c:1695 sql_help.c:1780
-#: sql_help.c:1784 sql_help.c:2193 sql_help.c:2203 sql_help.c:3127
+#: sql_help.c:964 sql_help.c:997 sql_help.c:998 sql_help.c:999 sql_help.c:1019
+#: sql_help.c:1377 sql_help.c:1379 sql_help.c:1699 sql_help.c:1784
+#: sql_help.c:1788 sql_help.c:2197 sql_help.c:2207 sql_help.c:3132
 msgid "constraint_name"
 msgstr "nombre_restricción"
 
-#: sql_help.c:227 sql_help.c:962
+#: sql_help.c:227 sql_help.c:965
 msgid "new_constraint_name"
 msgstr "nuevo_nombre_restricción"
 
-#: sql_help.c:297 sql_help.c:868
+#: sql_help.c:297 sql_help.c:869
 msgid "new_version"
 msgstr "nueva_versión"
 
@@ -3346,17 +3364,17 @@
 msgid "where member_object is:"
 msgstr "dondo objeto_miembro es:"
 
-#: sql_help.c:305 sql_help.c:1366 sql_help.c:3466
+#: sql_help.c:305 sql_help.c:1370 sql_help.c:3471
 msgid "aggregate_name"
 msgstr "nombre_función_agregación"
 
-#: sql_help.c:307 sql_help.c:1368 sql_help.c:1610 sql_help.c:1614
-#: sql_help.c:1616 sql_help.c:2590
+#: sql_help.c:307 sql_help.c:1372 sql_help.c:1614 sql_help.c:1618
+#: sql_help.c:1620 sql_help.c:2595
 msgid "source_type"
 msgstr "tipo_fuente"
 
-#: sql_help.c:308 sql_help.c:1369 sql_help.c:1611 sql_help.c:1615
-#: sql_help.c:1617 sql_help.c:2591
+#: sql_help.c:308 sql_help.c:1373 sql_help.c:1615 sql_help.c:1619
+#: sql_help.c:1621 sql_help.c:2596
 msgid "target_type"
 msgstr "tipo_destino"
 
@@ -3364,57 +3382,57 @@
 #: sql_help.c:314 sql_help.c:319 sql_help.c:323 sql_help.c:325 sql_help.c:327
 #: sql_help.c:328 sql_help.c:329 sql_help.c:330 sql_help.c:331 sql_help.c:332
 #: sql_help.c:333 sql_help.c:334 sql_help.c:335 sql_help.c:338 sql_help.c:339
-#: sql_help.c:1370 sql_help.c:1377 sql_help.c:1378 sql_help.c:1379
-#: sql_help.c:1380 sql_help.c:1381 sql_help.c:1382 sql_help.c:1383
-#: sql_help.c:1388 sql_help.c:1390 sql_help.c:1394 sql_help.c:1396
-#: sql_help.c:1400 sql_help.c:1401 sql_help.c:1404 sql_help.c:1405
-#: sql_help.c:1406 sql_help.c:1407 sql_help.c:1408 sql_help.c:1409
-#: sql_help.c:1410 sql_help.c:1411 sql_help.c:1412 sql_help.c:1417
-#: sql_help.c:1418 sql_help.c:3463 sql_help.c:3468 sql_help.c:3469
-#: sql_help.c:3470 sql_help.c:3471 sql_help.c:3477 sql_help.c:3478
-#: sql_help.c:3479 sql_help.c:3480 sql_help.c:3481 sql_help.c:3482
-#: sql_help.c:3483 sql_help.c:3484
+#: sql_help.c:1374 sql_help.c:1381 sql_help.c:1382 sql_help.c:1383
+#: sql_help.c:1384 sql_help.c:1385 sql_help.c:1386 sql_help.c:1387
+#: sql_help.c:1392 sql_help.c:1394 sql_help.c:1398 sql_help.c:1400
+#: sql_help.c:1404 sql_help.c:1405 sql_help.c:1408 sql_help.c:1409
+#: sql_help.c:1410 sql_help.c:1411 sql_help.c:1412 sql_help.c:1413
+#: sql_help.c:1414 sql_help.c:1415 sql_help.c:1416 sql_help.c:1421
+#: sql_help.c:1422 sql_help.c:3468 sql_help.c:3473 sql_help.c:3474
+#: sql_help.c:3475 sql_help.c:3476 sql_help.c:3482 sql_help.c:3483
+#: sql_help.c:3484 sql_help.c:3485 sql_help.c:3486 sql_help.c:3487
+#: sql_help.c:3488 sql_help.c:3489
 msgid "object_name"
 msgstr "nombre_de_objeto"
 
-#: sql_help.c:315 sql_help.c:713 sql_help.c:1384 sql_help.c:1612
-#: sql_help.c:1647 sql_help.c:1710 sql_help.c:1931 sql_help.c:1962
-#: sql_help.c:2362 sql_help.c:3049 sql_help.c:3381 sql_help.c:3472
-#: sql_help.c:3575 sql_help.c:3579 sql_help.c:3583 sql_help.c:3586
-#: sql_help.c:3814 sql_help.c:3818 sql_help.c:3822 sql_help.c:3825
-#: sql_help.c:4008 sql_help.c:4012 sql_help.c:4016 sql_help.c:4019
+#: sql_help.c:315 sql_help.c:711 sql_help.c:1388 sql_help.c:1616
+#: sql_help.c:1651 sql_help.c:1714 sql_help.c:1935 sql_help.c:1966
+#: sql_help.c:2366 sql_help.c:3054 sql_help.c:3386 sql_help.c:3477
+#: sql_help.c:3580 sql_help.c:3584 sql_help.c:3588 sql_help.c:3591
+#: sql_help.c:3819 sql_help.c:3823 sql_help.c:3827 sql_help.c:3830
+#: sql_help.c:4013 sql_help.c:4017 sql_help.c:4021 sql_help.c:4024
 msgid "function_name"
 msgstr "nombre_de_función"
 
-#: sql_help.c:320 sql_help.c:706 sql_help.c:1391 sql_help.c:1955
+#: sql_help.c:320 sql_help.c:704 sql_help.c:1395 sql_help.c:1959
 msgid "operator_name"
 msgstr "nombre_operador"
 
-#: sql_help.c:321 sql_help.c:647 sql_help.c:651 sql_help.c:1392
-#: sql_help.c:1932 sql_help.c:2708
+#: sql_help.c:321 sql_help.c:645 sql_help.c:649 sql_help.c:1396
+#: sql_help.c:1936 sql_help.c:2713
 msgid "left_type"
 msgstr "tipo_izq"
 
-#: sql_help.c:322 sql_help.c:648 sql_help.c:652 sql_help.c:1393
-#: sql_help.c:1933 sql_help.c:2709
+#: sql_help.c:322 sql_help.c:646 sql_help.c:650 sql_help.c:1397
+#: sql_help.c:1937 sql_help.c:2714
 msgid "right_type"
 msgstr "tipo_der"
 
-#: sql_help.c:324 sql_help.c:326 sql_help.c:669 sql_help.c:672 sql_help.c:675
-#: sql_help.c:704 sql_help.c:716 sql_help.c:724 sql_help.c:727 sql_help.c:730
-#: sql_help.c:1395 sql_help.c:1397 sql_help.c:1952 sql_help.c:1973
-#: sql_help.c:2209 sql_help.c:2718 sql_help.c:2727
+#: sql_help.c:324 sql_help.c:326 sql_help.c:667 sql_help.c:670 sql_help.c:673
+#: sql_help.c:702 sql_help.c:714 sql_help.c:722 sql_help.c:725 sql_help.c:728
+#: sql_help.c:1399 sql_help.c:1401 sql_help.c:1956 sql_help.c:1977
+#: sql_help.c:2213 sql_help.c:2723 sql_help.c:2732
 msgid "index_method"
 msgstr "método_de_índice"
 
-#: sql_help.c:336 sql_help.c:1012 sql_help.c:1413 sql_help.c:1818
-#: sql_help.c:2185 sql_help.c:2331 sql_help.c:2841 sql_help.c:3063
-#: sql_help.c:3395
+#: sql_help.c:336 sql_help.c:1015 sql_help.c:1417 sql_help.c:1822
+#: sql_help.c:2189 sql_help.c:2335 sql_help.c:2846 sql_help.c:3068
+#: sql_help.c:3400
 msgid "type_name"
 msgstr "nombre_de_tipo"
 
-#: sql_help.c:337 sql_help.c:1414 sql_help.c:1817 sql_help.c:2332
-#: sql_help.c:2556 sql_help.c:2842 sql_help.c:3055 sql_help.c:3387
+#: sql_help.c:337 sql_help.c:1418 sql_help.c:1821 sql_help.c:2336
+#: sql_help.c:2561 sql_help.c:2847 sql_help.c:3060 sql_help.c:3392
 msgid "lang_name"
 msgstr "nombre_lenguaje"
 
@@ -3422,112 +3440,112 @@
 msgid "and aggregate_signature is:"
 msgstr "y signatura_func_agregación es:"
 
-#: sql_help.c:363 sql_help.c:1736
+#: sql_help.c:363 sql_help.c:1740
 msgid "handler_function"
 msgstr "función_manejadora"
 
-#: sql_help.c:364 sql_help.c:1737
+#: sql_help.c:364 sql_help.c:1741
 msgid "validator_function"
 msgstr "función_validadora"
 
-#: sql_help.c:413 sql_help.c:487 sql_help.c:609 sql_help.c:956 sql_help.c:1151
-#: sql_help.c:2200 sql_help.c:2201 sql_help.c:2217 sql_help.c:2218
+#: sql_help.c:413 sql_help.c:487 sql_help.c:608 sql_help.c:959 sql_help.c:1154
+#: sql_help.c:2204 sql_help.c:2205 sql_help.c:2221 sql_help.c:2222
 msgid "action"
 msgstr "acción"
 
 #: sql_help.c:415 sql_help.c:422 sql_help.c:426 sql_help.c:427 sql_help.c:430
 #: sql_help.c:432 sql_help.c:433 sql_help.c:434 sql_help.c:436 sql_help.c:439
-#: sql_help.c:441 sql_help.c:442 sql_help.c:611 sql_help.c:621 sql_help.c:623
-#: sql_help.c:626 sql_help.c:628 sql_help.c:850 sql_help.c:958 sql_help.c:971
-#: sql_help.c:975 sql_help.c:976 sql_help.c:980 sql_help.c:982 sql_help.c:983
-#: sql_help.c:984 sql_help.c:986 sql_help.c:989 sql_help.c:991 sql_help.c:1250
-#: sql_help.c:1253 sql_help.c:1273 sql_help.c:1372 sql_help.c:1474
-#: sql_help.c:1479 sql_help.c:1493 sql_help.c:1494 sql_help.c:1495
-#: sql_help.c:1768 sql_help.c:1815 sql_help.c:1877 sql_help.c:1912
-#: sql_help.c:2093 sql_help.c:2173 sql_help.c:2186 sql_help.c:2205
-#: sql_help.c:2207 sql_help.c:2214 sql_help.c:2225 sql_help.c:2242
-#: sql_help.c:2365 sql_help.c:2501 sql_help.c:3034 sql_help.c:3035
-#: sql_help.c:3114 sql_help.c:3129 sql_help.c:3131 sql_help.c:3133
-#: sql_help.c:3366 sql_help.c:3367 sql_help.c:3465 sql_help.c:3606
-#: sql_help.c:3845 sql_help.c:3887 sql_help.c:3889 sql_help.c:3891
-#: sql_help.c:3908 sql_help.c:3911 sql_help.c:4039
+#: sql_help.c:441 sql_help.c:442 sql_help.c:610 sql_help.c:620 sql_help.c:622
+#: sql_help.c:625 sql_help.c:627 sql_help.c:851 sql_help.c:961 sql_help.c:974
+#: sql_help.c:978 sql_help.c:979 sql_help.c:983 sql_help.c:985 sql_help.c:986
+#: sql_help.c:987 sql_help.c:989 sql_help.c:992 sql_help.c:994 sql_help.c:1254
+#: sql_help.c:1257 sql_help.c:1277 sql_help.c:1376 sql_help.c:1478
+#: sql_help.c:1483 sql_help.c:1497 sql_help.c:1498 sql_help.c:1499
+#: sql_help.c:1772 sql_help.c:1819 sql_help.c:1881 sql_help.c:1916
+#: sql_help.c:2097 sql_help.c:2177 sql_help.c:2190 sql_help.c:2209
+#: sql_help.c:2211 sql_help.c:2218 sql_help.c:2229 sql_help.c:2246
+#: sql_help.c:2369 sql_help.c:2506 sql_help.c:3039 sql_help.c:3040
+#: sql_help.c:3119 sql_help.c:3134 sql_help.c:3136 sql_help.c:3138
+#: sql_help.c:3371 sql_help.c:3372 sql_help.c:3470 sql_help.c:3611
+#: sql_help.c:3850 sql_help.c:3892 sql_help.c:3894 sql_help.c:3896
+#: sql_help.c:3913 sql_help.c:3916 sql_help.c:4044
 msgid "column_name"
 msgstr "nombre_de_columna"
 
-#: sql_help.c:416 sql_help.c:612 sql_help.c:959
+#: sql_help.c:416 sql_help.c:611 sql_help.c:962
 msgid "new_column_name"
 msgstr "nuevo_nombre_de_columna"
 
-#: sql_help.c:421 sql_help.c:503 sql_help.c:620 sql_help.c:970 sql_help.c:1164
+#: sql_help.c:421 sql_help.c:503 sql_help.c:619 sql_help.c:973 sql_help.c:1167
 msgid "where action is one of:"
 msgstr "donde acción es una de:"
 
-#: sql_help.c:423 sql_help.c:428 sql_help.c:972 sql_help.c:977 sql_help.c:1166
-#: sql_help.c:1170 sql_help.c:1690 sql_help.c:1769 sql_help.c:1951
-#: sql_help.c:2174 sql_help.c:2410 sql_help.c:3216
+#: sql_help.c:423 sql_help.c:428 sql_help.c:975 sql_help.c:980 sql_help.c:1169
+#: sql_help.c:1173 sql_help.c:1694 sql_help.c:1773 sql_help.c:1955
+#: sql_help.c:2178 sql_help.c:2414 sql_help.c:3221
 msgid "data_type"
 msgstr "tipo_de_dato"
 
-#: sql_help.c:424 sql_help.c:429 sql_help.c:973 sql_help.c:978 sql_help.c:1167
-#: sql_help.c:1171 sql_help.c:1691 sql_help.c:1772 sql_help.c:1879
-#: sql_help.c:2175 sql_help.c:2411 sql_help.c:2417 sql_help.c:3124
+#: sql_help.c:424 sql_help.c:429 sql_help.c:976 sql_help.c:981 sql_help.c:1170
+#: sql_help.c:1174 sql_help.c:1695 sql_help.c:1776 sql_help.c:1883
+#: sql_help.c:2179 sql_help.c:2415 sql_help.c:2421 sql_help.c:3129
 msgid "collation"
 msgstr "ordenamiento"
 
-#: sql_help.c:425 sql_help.c:974 sql_help.c:1773 sql_help.c:2176
-#: sql_help.c:2187
+#: sql_help.c:425 sql_help.c:977 sql_help.c:1777 sql_help.c:2180
+#: sql_help.c:2191
 msgid "column_constraint"
 msgstr "restricción_de_columna"
 
-#: sql_help.c:435 sql_help.c:622 sql_help.c:985
+#: sql_help.c:435 sql_help.c:621 sql_help.c:988
 msgid "integer"
 msgstr "entero"
 
-#: sql_help.c:437 sql_help.c:440 sql_help.c:624 sql_help.c:627 sql_help.c:987
-#: sql_help.c:990
+#: sql_help.c:437 sql_help.c:440 sql_help.c:623 sql_help.c:626 sql_help.c:990
+#: sql_help.c:993
 msgid "attribute_option"
 msgstr "opción_de_atributo"
 
-#: sql_help.c:445 sql_help.c:992 sql_help.c:1774 sql_help.c:2177
-#: sql_help.c:2188
+#: sql_help.c:445 sql_help.c:995 sql_help.c:1778 sql_help.c:2181
+#: sql_help.c:2192
 msgid "table_constraint"
 msgstr "restricción_de_tabla"
 
-#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:997
-#: sql_help.c:998 sql_help.c:999 sql_help.c:1000 sql_help.c:1415
+#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:1000
+#: sql_help.c:1001 sql_help.c:1002 sql_help.c:1003 sql_help.c:1419
 msgid "trigger_name"
 msgstr "nombre_disparador"
 
-#: sql_help.c:452 sql_help.c:453 sql_help.c:1010 sql_help.c:1011
-#: sql_help.c:1775 sql_help.c:2180
+#: sql_help.c:452 sql_help.c:453 sql_help.c:1013 sql_help.c:1014
+#: sql_help.c:1779 sql_help.c:2184
 msgid "parent_table"
 msgstr "tabla_padre"
 
-#: sql_help.c:504 sql_help.c:1819
+#: sql_help.c:504 sql_help.c:1823
 msgid "execution_cost"
 msgstr "costo_de_ejecución"
 
-#: sql_help.c:505 sql_help.c:1820
+#: sql_help.c:505 sql_help.c:1824
 msgid "result_rows"
 msgstr "núm_de_filas"
 
-#: sql_help.c:526 sql_help.c:528 sql_help.c:783 sql_help.c:791 sql_help.c:795
-#: sql_help.c:798 sql_help.c:801 sql_help.c:1205 sql_help.c:1213
-#: sql_help.c:1216 sql_help.c:1218 sql_help.c:1220 sql_help.c:2067
-#: sql_help.c:2069 sql_help.c:2072 sql_help.c:2073 sql_help.c:3033
-#: sql_help.c:3037 sql_help.c:3040 sql_help.c:3042 sql_help.c:3044
-#: sql_help.c:3046 sql_help.c:3048 sql_help.c:3054 sql_help.c:3056
-#: sql_help.c:3058 sql_help.c:3060 sql_help.c:3062 sql_help.c:3064
+#: sql_help.c:526 sql_help.c:528 sql_help.c:784 sql_help.c:792 sql_help.c:796
+#: sql_help.c:799 sql_help.c:802 sql_help.c:1209 sql_help.c:1217
+#: sql_help.c:1220 sql_help.c:1222 sql_help.c:1224 sql_help.c:2071
+#: sql_help.c:2073 sql_help.c:2076 sql_help.c:2077 sql_help.c:3038
+#: sql_help.c:3042 sql_help.c:3045 sql_help.c:3047 sql_help.c:3049
+#: sql_help.c:3051 sql_help.c:3053 sql_help.c:3059 sql_help.c:3061
+#: sql_help.c:3063 sql_help.c:3065 sql_help.c:3067 sql_help.c:3069
 msgid "role_specification"
 msgstr "especificación_de_rol"
 
-#: sql_help.c:527 sql_help.c:529 sql_help.c:1232 sql_help.c:1665
-#: sql_help.c:2075 sql_help.c:2486 sql_help.c:2875 sql_help.c:3691
+#: sql_help.c:527 sql_help.c:529 sql_help.c:1236 sql_help.c:1669
+#: sql_help.c:2079 sql_help.c:2491 sql_help.c:2880 sql_help.c:3696
 msgid "user_name"
 msgstr "nombre_de_usuario"
 
-#: sql_help.c:530 sql_help.c:803 sql_help.c:1221 sql_help.c:2074
-#: sql_help.c:3065
+#: sql_help.c:530 sql_help.c:804 sql_help.c:1225 sql_help.c:2078
+#: sql_help.c:3070
 msgid "where role_specification can be:"
 msgstr "donde especificación_de_rol puede ser:"
 
@@ -3535,937 +3553,937 @@
 msgid "group_name"
 msgstr "nombre_de_grupo"
 
-#: sql_help.c:549 sql_help.c:1670 sql_help.c:1883 sql_help.c:1915
-#: sql_help.c:2183 sql_help.c:2191 sql_help.c:2223 sql_help.c:2245
-#: sql_help.c:2257 sql_help.c:3061 sql_help.c:3393
+#: sql_help.c:549 sql_help.c:1674 sql_help.c:1887 sql_help.c:1919
+#: sql_help.c:2187 sql_help.c:2195 sql_help.c:2227 sql_help.c:2249
+#: sql_help.c:2261 sql_help.c:3066 sql_help.c:3398
 msgid "tablespace_name"
 msgstr "nombre_de_tablespace"
 
-#: sql_help.c:551 sql_help.c:554 sql_help.c:630 sql_help.c:632 sql_help.c:1007
-#: sql_help.c:1009 sql_help.c:1881 sql_help.c:1913 sql_help.c:2181
-#: sql_help.c:2189 sql_help.c:2221 sql_help.c:2243
+#: sql_help.c:551 sql_help.c:554 sql_help.c:629 sql_help.c:631 sql_help.c:1010
+#: sql_help.c:1012 sql_help.c:1885 sql_help.c:1917 sql_help.c:2185
+#: sql_help.c:2193 sql_help.c:2225 sql_help.c:2247
 msgid "storage_parameter"
 msgstr "parámetro_de_almacenamiento"
 
-#: sql_help.c:577 sql_help.c:1389 sql_help.c:3476
+#: sql_help.c:577 sql_help.c:1393 sql_help.c:3481
 msgid "large_object_oid"
 msgstr "oid_de_objeto_grande"
 
-#: sql_help.c:629 sql_help.c:1005 sql_help.c:1014 sql_help.c:1017
-#: sql_help.c:1313
+#: sql_help.c:628 sql_help.c:1008 sql_help.c:1017 sql_help.c:1020
+#: sql_help.c:1317
 msgid "index_name"
 msgstr "nombre_índice"
 
-#: sql_help.c:705 sql_help.c:717 sql_help.c:1954
+#: sql_help.c:703 sql_help.c:715 sql_help.c:1958
 msgid "strategy_number"
 msgstr "número_de_estrategia"
 
-#: sql_help.c:707 sql_help.c:708 sql_help.c:711 sql_help.c:712 sql_help.c:718
-#: sql_help.c:719 sql_help.c:721 sql_help.c:722 sql_help.c:1956
-#: sql_help.c:1957 sql_help.c:1960 sql_help.c:1961
+#: sql_help.c:705 sql_help.c:706 sql_help.c:709 sql_help.c:710 sql_help.c:716
+#: sql_help.c:717 sql_help.c:719 sql_help.c:720 sql_help.c:1960
+#: sql_help.c:1961 sql_help.c:1964 sql_help.c:1965
 msgid "op_type"
 msgstr "tipo_op"
 
-#: sql_help.c:709 sql_help.c:1958
+#: sql_help.c:707 sql_help.c:1962
 msgid "sort_family_name"
 msgstr "nombre_familia_ordenamiento"
 
-#: sql_help.c:710 sql_help.c:720 sql_help.c:1959
+#: sql_help.c:708 sql_help.c:718 sql_help.c:1963
 msgid "support_number"
 msgstr "número_de_soporte"
 
-#: sql_help.c:714 sql_help.c:1613 sql_help.c:1963 sql_help.c:2334
-#: sql_help.c:2336
+#: sql_help.c:712 sql_help.c:1617 sql_help.c:1967 sql_help.c:2338
+#: sql_help.c:2340
 msgid "argument_type"
 msgstr "tipo_argumento"
 
-#: sql_help.c:744 sql_help.c:813 sql_help.c:849 sql_help.c:1130
-#: sql_help.c:1272 sql_help.c:1312 sql_help.c:1374 sql_help.c:1399
-#: sql_help.c:1403 sql_help.c:1416 sql_help.c:1473 sql_help.c:1478
-#: sql_help.c:1767 sql_help.c:1875 sql_help.c:1911 sql_help.c:1986
-#: sql_help.c:2044 sql_help.c:2092 sql_help.c:2172 sql_help.c:2184
-#: sql_help.c:2241 sql_help.c:2359 sql_help.c:2535 sql_help.c:2744
-#: sql_help.c:2761 sql_help.c:2851 sql_help.c:3031 sql_help.c:3036
-#: sql_help.c:3081 sql_help.c:3112 sql_help.c:3363 sql_help.c:3368
-#: sql_help.c:3464 sql_help.c:3561 sql_help.c:3563 sql_help.c:3612
-#: sql_help.c:3651 sql_help.c:3800 sql_help.c:3802 sql_help.c:3851
-#: sql_help.c:3885 sql_help.c:3907 sql_help.c:3909 sql_help.c:3910
-#: sql_help.c:3994 sql_help.c:3996 sql_help.c:4045
+#: sql_help.c:743 sql_help.c:746 sql_help.c:814 sql_help.c:850 sql_help.c:1133
+#: sql_help.c:1276 sql_help.c:1316 sql_help.c:1378 sql_help.c:1403
+#: sql_help.c:1407 sql_help.c:1420 sql_help.c:1477 sql_help.c:1482
+#: sql_help.c:1771 sql_help.c:1879 sql_help.c:1915 sql_help.c:1990
+#: sql_help.c:2048 sql_help.c:2096 sql_help.c:2176 sql_help.c:2188
+#: sql_help.c:2245 sql_help.c:2363 sql_help.c:2540 sql_help.c:2749
+#: sql_help.c:2766 sql_help.c:2856 sql_help.c:3036 sql_help.c:3041
+#: sql_help.c:3086 sql_help.c:3117 sql_help.c:3368 sql_help.c:3373
+#: sql_help.c:3469 sql_help.c:3566 sql_help.c:3568 sql_help.c:3617
+#: sql_help.c:3656 sql_help.c:3805 sql_help.c:3807 sql_help.c:3856
+#: sql_help.c:3890 sql_help.c:3912 sql_help.c:3914 sql_help.c:3915
+#: sql_help.c:3999 sql_help.c:4001 sql_help.c:4050
 msgid "table_name"
 msgstr "nombre_de_tabla"
 
-#: sql_help.c:747 sql_help.c:1988
+#: sql_help.c:748 sql_help.c:1992
 msgid "using_expression"
 msgstr "expresión_using"
 
-#: sql_help.c:748 sql_help.c:1989
+#: sql_help.c:749 sql_help.c:1993
 msgid "check_expression"
 msgstr "expresión_check"
 
-#: sql_help.c:787 sql_help.c:1209 sql_help.c:1855 sql_help.c:2021
-#: sql_help.c:2469
+#: sql_help.c:788 sql_help.c:1213 sql_help.c:1859 sql_help.c:2025
+#: sql_help.c:2474
 msgid "password"
 msgstr "contraseña"
 
-#: sql_help.c:788 sql_help.c:1210 sql_help.c:1856 sql_help.c:2022
-#: sql_help.c:2470
+#: sql_help.c:789 sql_help.c:1214 sql_help.c:1860 sql_help.c:2026
+#: sql_help.c:2475
 msgid "timestamp"
 msgstr "fecha_hora"
 
-#: sql_help.c:792 sql_help.c:796 sql_help.c:799 sql_help.c:802 sql_help.c:3041
-#: sql_help.c:3373
+#: sql_help.c:793 sql_help.c:797 sql_help.c:800 sql_help.c:803 sql_help.c:3046
+#: sql_help.c:3378
 msgid "database_name"
 msgstr "nombre_de_base_de_datos"
 
-#: sql_help.c:843 sql_help.c:2087
+#: sql_help.c:844 sql_help.c:2091
 msgid "increment"
 msgstr "incremento"
 
-#: sql_help.c:844 sql_help.c:2088
+#: sql_help.c:845 sql_help.c:2092
 msgid "minvalue"
 msgstr "valormin"
 
-#: sql_help.c:845 sql_help.c:2089
+#: sql_help.c:846 sql_help.c:2093
 msgid "maxvalue"
 msgstr "valormax"
 
-#: sql_help.c:846 sql_help.c:2090 sql_help.c:3559 sql_help.c:3649
-#: sql_help.c:3798 sql_help.c:3927 sql_help.c:3992
+#: sql_help.c:847 sql_help.c:2094 sql_help.c:3564 sql_help.c:3654
+#: sql_help.c:3803 sql_help.c:3932 sql_help.c:3997
 msgid "start"
 msgstr "inicio"
 
-#: sql_help.c:847
+#: sql_help.c:848
 msgid "restart"
 msgstr "reinicio"
 
-#: sql_help.c:848 sql_help.c:2091
+#: sql_help.c:849 sql_help.c:2095
 msgid "cache"
 msgstr "cache"
 
-#: sql_help.c:993
+#: sql_help.c:996
 msgid "table_constraint_using_index"
 msgstr "restricción_de_tabla_con_índice"
 
-#: sql_help.c:1001 sql_help.c:1002 sql_help.c:1003 sql_help.c:1004
+#: sql_help.c:1004 sql_help.c:1005 sql_help.c:1006 sql_help.c:1007
 msgid "rewrite_rule_name"
 msgstr "nombre_regla_de_reescritura"
 
-#: sql_help.c:1015
+#: sql_help.c:1018
 msgid "and table_constraint_using_index is:"
 msgstr "y restricción_de_tabla_con_índice es:"
 
-#: sql_help.c:1033 sql_help.c:1036 sql_help.c:2260
+#: sql_help.c:1036 sql_help.c:1039 sql_help.c:2264
 msgid "tablespace_option"
 msgstr "opción_de_tablespace"
 
-#: sql_help.c:1057 sql_help.c:1060 sql_help.c:1066 sql_help.c:1070
+#: sql_help.c:1060 sql_help.c:1063 sql_help.c:1069 sql_help.c:1073
 msgid "token_type"
 msgstr "tipo_de_token"
 
-#: sql_help.c:1058 sql_help.c:1061
+#: sql_help.c:1061 sql_help.c:1064
 msgid "dictionary_name"
 msgstr "nombre_diccionario"
 
-#: sql_help.c:1063 sql_help.c:1067
+#: sql_help.c:1066 sql_help.c:1070
 msgid "old_dictionary"
 msgstr "diccionario_antiguo"
 
-#: sql_help.c:1064 sql_help.c:1068
+#: sql_help.c:1067 sql_help.c:1071
 msgid "new_dictionary"
 msgstr "diccionario_nuevo"
 
-#: sql_help.c:1155 sql_help.c:1165 sql_help.c:1168 sql_help.c:1169
-#: sql_help.c:2409
+#: sql_help.c:1158 sql_help.c:1168 sql_help.c:1171 sql_help.c:1172
+#: sql_help.c:2413
 msgid "attribute_name"
 msgstr "nombre_atributo"
 
-#: sql_help.c:1156
+#: sql_help.c:1159
 msgid "new_attribute_name"
 msgstr "nuevo_nombre_atributo"
 
-#: sql_help.c:1162
+#: sql_help.c:1165
 msgid "new_enum_value"
 msgstr "nuevo_valor_enum"
 
-#: sql_help.c:1163
+#: sql_help.c:1166
 msgid "existing_enum_value"
 msgstr "valor_enum_existente"
 
-#: sql_help.c:1233 sql_help.c:1776 sql_help.c:2103 sql_help.c:2487
-#: sql_help.c:2876 sql_help.c:3047 sql_help.c:3082 sql_help.c:3379
+#: sql_help.c:1237 sql_help.c:1780 sql_help.c:2107 sql_help.c:2492
+#: sql_help.c:2881 sql_help.c:3052 sql_help.c:3087 sql_help.c:3384
 msgid "server_name"
 msgstr "nombre_de_servidor"
 
-#: sql_help.c:1261 sql_help.c:1264 sql_help.c:2502
+#: sql_help.c:1265 sql_help.c:1268 sql_help.c:2507
 msgid "view_option_name"
 msgstr "nombre_opción_de_vista"
 
-#: sql_help.c:1262 sql_help.c:2503
+#: sql_help.c:1266 sql_help.c:2508
 msgid "view_option_value"
 msgstr "valor_opción_de_vista"
 
-#: sql_help.c:1287 sql_help.c:3707 sql_help.c:3709 sql_help.c:3733
+#: sql_help.c:1291 sql_help.c:3712 sql_help.c:3714 sql_help.c:3738
 msgid "transaction_mode"
 msgstr "modo_de_transacción"
 
-#: sql_help.c:1288 sql_help.c:3710 sql_help.c:3734
+#: sql_help.c:1292 sql_help.c:3715 sql_help.c:3739
 msgid "where transaction_mode is one of:"
 msgstr "donde modo_de_transacción es uno de:"
 
-#: sql_help.c:1371
+#: sql_help.c:1375
 msgid "relation_name"
 msgstr "nombre_relación"
 
-#: sql_help.c:1376 sql_help.c:3043 sql_help.c:3375
+#: sql_help.c:1380 sql_help.c:3048 sql_help.c:3380
 msgid "domain_name"
 msgstr "nombre_de_dominio"
 
-#: sql_help.c:1398
+#: sql_help.c:1402
 msgid "policy_name"
 msgstr "nombre_de_política"
 
-#: sql_help.c:1402
+#: sql_help.c:1406
 msgid "rule_name"
 msgstr "nombre_regla"
 
-#: sql_help.c:1419
+#: sql_help.c:1423
 msgid "text"
 msgstr "texto"
 
-#: sql_help.c:1444 sql_help.c:3225 sql_help.c:3413
+#: sql_help.c:1448 sql_help.c:3230 sql_help.c:3418
 msgid "transaction_id"
 msgstr "id_de_transacción"
 
-#: sql_help.c:1475 sql_help.c:1481 sql_help.c:3151
+#: sql_help.c:1479 sql_help.c:1485 sql_help.c:3156
 msgid "filename"
 msgstr "nombre_de_archivo"
 
-#: sql_help.c:1476 sql_help.c:1482 sql_help.c:2046 sql_help.c:2047
-#: sql_help.c:2048
+#: sql_help.c:1480 sql_help.c:1486 sql_help.c:2050 sql_help.c:2051
+#: sql_help.c:2052
 msgid "command"
 msgstr "orden"
 
-#: sql_help.c:1480 sql_help.c:1916 sql_help.c:2246 sql_help.c:2504
-#: sql_help.c:2522 sql_help.c:3116
+#: sql_help.c:1484 sql_help.c:1920 sql_help.c:2250 sql_help.c:2509
+#: sql_help.c:2527 sql_help.c:3121
 msgid "query"
 msgstr "consulta"
 
-#: sql_help.c:1484 sql_help.c:2921
+#: sql_help.c:1488 sql_help.c:2926
 msgid "where option can be one of:"
 msgstr "donde opción puede ser una de:"
 
-#: sql_help.c:1485
+#: sql_help.c:1489
 msgid "format_name"
 msgstr "nombre_de_formato"
 
-#: sql_help.c:1486 sql_help.c:1487 sql_help.c:1490 sql_help.c:2922
-#: sql_help.c:2923 sql_help.c:2924 sql_help.c:2925 sql_help.c:2926
+#: sql_help.c:1490 sql_help.c:1491 sql_help.c:1494 sql_help.c:2927
+#: sql_help.c:2928 sql_help.c:2929 sql_help.c:2930 sql_help.c:2931
 msgid "boolean"
 msgstr "booleano"
 
-#: sql_help.c:1488
+#: sql_help.c:1492
 msgid "delimiter_character"
 msgstr "carácter_delimitador"
 
-#: sql_help.c:1489
+#: sql_help.c:1493
 msgid "null_string"
 msgstr "cadena_null"
 
-#: sql_help.c:1491
+#: sql_help.c:1495
 msgid "quote_character"
 msgstr "carácter_de_comilla"
 
-#: sql_help.c:1492
+#: sql_help.c:1496
 msgid "escape_character"
 msgstr "carácter_de_escape"
 
-#: sql_help.c:1496
+#: sql_help.c:1500
 msgid "encoding_name"
 msgstr "nombre_codificación"
 
-#: sql_help.c:1553 sql_help.c:1569 sql_help.c:1572
+#: sql_help.c:1557 sql_help.c:1573 sql_help.c:1576
 msgid "arg_data_type"
 msgstr "tipo_de_dato_arg"
 
-#: sql_help.c:1554 sql_help.c:1573 sql_help.c:1581
+#: sql_help.c:1558 sql_help.c:1577 sql_help.c:1585
 msgid "sfunc"
 msgstr "func_transición"
 
-#: sql_help.c:1555 sql_help.c:1574 sql_help.c:1582
+#: sql_help.c:1559 sql_help.c:1578 sql_help.c:1586
 msgid "state_data_type"
 msgstr "tipo_de_dato_de_estado"
 
-#: sql_help.c:1556 sql_help.c:1575 sql_help.c:1583
+#: sql_help.c:1560 sql_help.c:1579 sql_help.c:1587
 msgid "state_data_size"
 msgstr "tamaño_de_dato_de_estado"
 
-#: sql_help.c:1557 sql_help.c:1576 sql_help.c:1584
+#: sql_help.c:1561 sql_help.c:1580 sql_help.c:1588
 msgid "ffunc"
 msgstr "func_final"
 
-#: sql_help.c:1558 sql_help.c:1577 sql_help.c:1585
+#: sql_help.c:1562 sql_help.c:1581 sql_help.c:1589
 msgid "initial_condition"
 msgstr "condición_inicial"
 
-#: sql_help.c:1559 sql_help.c:1586
+#: sql_help.c:1563 sql_help.c:1590
 msgid "msfunc"
 msgstr "func_transición_m"
 
-#: sql_help.c:1560 sql_help.c:1587
+#: sql_help.c:1564 sql_help.c:1591
 msgid "minvfunc"
 msgstr "func_inv_m"
 
-#: sql_help.c:1561 sql_help.c:1588
+#: sql_help.c:1565 sql_help.c:1592
 msgid "mstate_data_type"
 msgstr "tipo_de_dato_de_estado_m"
 
-#: sql_help.c:1562 sql_help.c:1589
+#: sql_help.c:1566 sql_help.c:1593
 msgid "mstate_data_size"
 msgstr "tamaño_de_dato_de_estado_m"
 
-#: sql_help.c:1563 sql_help.c:1590
+#: sql_help.c:1567 sql_help.c:1594
 msgid "mffunc"
 msgstr "func_final_m"
 
-#: sql_help.c:1564 sql_help.c:1591
+#: sql_help.c:1568 sql_help.c:1595
 msgid "minitial_condition"
 msgstr "condición_inicial_m"
 
-#: sql_help.c:1565 sql_help.c:1592
+#: sql_help.c:1569 sql_help.c:1596
 msgid "sort_operator"
 msgstr "operador_de_ordenamiento"
 
-#: sql_help.c:1578
+#: sql_help.c:1582
 msgid "or the old syntax"
 msgstr "o la sintaxis antigua"
 
-#: sql_help.c:1580
+#: sql_help.c:1584
 msgid "base_type"
 msgstr "tipo_base"
 
-#: sql_help.c:1631
+#: sql_help.c:1635
 msgid "locale"
 msgstr "configuración regional"
 
-#: sql_help.c:1632 sql_help.c:1668
+#: sql_help.c:1636 sql_help.c:1672
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:1633 sql_help.c:1669
+#: sql_help.c:1637 sql_help.c:1673
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:1635
+#: sql_help.c:1639
 msgid "existing_collation"
 msgstr "ordenamiento_existente"
 
-#: sql_help.c:1645
+#: sql_help.c:1649
 msgid "source_encoding"
 msgstr "codificación_origen"
 
-#: sql_help.c:1646
+#: sql_help.c:1650
 msgid "dest_encoding"
 msgstr "codificación_destino"
 
-#: sql_help.c:1666 sql_help.c:2286
+#: sql_help.c:1670 sql_help.c:2290
 msgid "template"
 msgstr "plantilla"
 
-#: sql_help.c:1667
+#: sql_help.c:1671
 msgid "encoding"
 msgstr "codificación"
 
-#: sql_help.c:1693
+#: sql_help.c:1697
 msgid "constraint"
 msgstr "restricción"
 
-#: sql_help.c:1694
+#: sql_help.c:1698
 msgid "where constraint is:"
 msgstr "donde restricción es:"
 
-#: sql_help.c:1708 sql_help.c:2043 sql_help.c:2358
+#: sql_help.c:1712 sql_help.c:2047 sql_help.c:2362
 msgid "event"
 msgstr "evento"
 
-#: sql_help.c:1709
+#: sql_help.c:1713
 msgid "filter_variable"
 msgstr "variable_de_filtrado"
 
-#: sql_help.c:1721
+#: sql_help.c:1725
 msgid "extension_name"
 msgstr "nombre_de_extensión"
 
-#: sql_help.c:1723
+#: sql_help.c:1727
 msgid "version"
 msgstr "versión"
 
-#: sql_help.c:1724
+#: sql_help.c:1728
 msgid "old_version"
 msgstr "versión_antigua"
 
-#: sql_help.c:1779 sql_help.c:2192
+#: sql_help.c:1783 sql_help.c:2196
 msgid "where column_constraint is:"
 msgstr "donde restricción_de_columna es:"
 
-#: sql_help.c:1782 sql_help.c:1813 sql_help.c:2195
+#: sql_help.c:1786 sql_help.c:1817 sql_help.c:2199
 msgid "default_expr"
 msgstr "expr_por_omisión"
 
-#: sql_help.c:1783 sql_help.c:2202
+#: sql_help.c:1787 sql_help.c:2206
 msgid "and table_constraint is:"
 msgstr "y restricción_de_tabla es:"
 
-#: sql_help.c:1814
+#: sql_help.c:1818
 msgid "rettype"
 msgstr "tipo_ret"
 
-#: sql_help.c:1816
+#: sql_help.c:1820
 msgid "column_type"
 msgstr "tipo_columna"
 
-#: sql_help.c:1824
+#: sql_help.c:1828
 msgid "definition"
 msgstr "definición"
 
-#: sql_help.c:1825
+#: sql_help.c:1829
 msgid "obj_file"
 msgstr "archivo_obj"
 
-#: sql_help.c:1826
+#: sql_help.c:1830
 msgid "link_symbol"
 msgstr "símbolo_enlace"
 
-#: sql_help.c:1827
+#: sql_help.c:1831
 msgid "attribute"
 msgstr "atributo"
 
-#: sql_help.c:1862 sql_help.c:2028 sql_help.c:2476
+#: sql_help.c:1866 sql_help.c:2032 sql_help.c:2481
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:1876
+#: sql_help.c:1880
 msgid "method"
 msgstr "método"
 
-#: sql_help.c:1880 sql_help.c:2227 sql_help.c:3125
+#: sql_help.c:1884 sql_help.c:2231 sql_help.c:3130
 msgid "opclass"
 msgstr "clase_de_ops"
 
-#: sql_help.c:1884 sql_help.c:2213
+#: sql_help.c:1888 sql_help.c:2217
 msgid "predicate"
 msgstr "predicado"
 
-#: sql_help.c:1896
+#: sql_help.c:1900
 msgid "call_handler"
 msgstr "manejador_de_llamada"
 
-#: sql_help.c:1897
+#: sql_help.c:1901
 msgid "inline_handler"
 msgstr "manejador_en_línea"
 
-#: sql_help.c:1898
+#: sql_help.c:1902
 msgid "valfunction"
 msgstr "función_val"
 
-#: sql_help.c:1934
+#: sql_help.c:1938
 msgid "com_op"
 msgstr "op_conm"
 
-#: sql_help.c:1935
+#: sql_help.c:1939
 msgid "neg_op"
 msgstr "op_neg"
 
-#: sql_help.c:1936
+#: sql_help.c:1940
 msgid "res_proc"
 msgstr "proc_res"
 
-#: sql_help.c:1937
+#: sql_help.c:1941
 msgid "join_proc"
 msgstr "proc_join"
 
-#: sql_help.c:1953
+#: sql_help.c:1957
 msgid "family_name"
 msgstr "nombre_familia"
 
-#: sql_help.c:1964
+#: sql_help.c:1968
 msgid "storage_type"
 msgstr "tipo_almacenamiento"
 
-#: sql_help.c:2045 sql_help.c:2361 sql_help.c:2538 sql_help.c:3135
-#: sql_help.c:3550 sql_help.c:3552 sql_help.c:3640 sql_help.c:3642
-#: sql_help.c:3789 sql_help.c:3791 sql_help.c:3894 sql_help.c:3983
-#: sql_help.c:3985
+#: sql_help.c:2049 sql_help.c:2365 sql_help.c:2543 sql_help.c:3140
+#: sql_help.c:3555 sql_help.c:3557 sql_help.c:3645 sql_help.c:3647
+#: sql_help.c:3794 sql_help.c:3796 sql_help.c:3899 sql_help.c:3988
+#: sql_help.c:3990
 msgid "condition"
 msgstr "condición"
 
-#: sql_help.c:2049 sql_help.c:2364
+#: sql_help.c:2053 sql_help.c:2368
 msgid "where event can be one of:"
 msgstr "donde evento puede ser una de:"
 
-#: sql_help.c:2068 sql_help.c:2070
+#: sql_help.c:2072 sql_help.c:2074
 msgid "schema_element"
 msgstr "elemento_de_esquema"
 
-#: sql_help.c:2104
+#: sql_help.c:2108
 msgid "server_type"
 msgstr "tipo_de_servidor"
 
-#: sql_help.c:2105
+#: sql_help.c:2109
 msgid "server_version"
 msgstr "versión_de_servidor"
 
-#: sql_help.c:2106 sql_help.c:3045 sql_help.c:3377
+#: sql_help.c:2110 sql_help.c:3050 sql_help.c:3382
 msgid "fdw_name"
 msgstr "nombre_fdw"
 
-#: sql_help.c:2178
+#: sql_help.c:2182
 msgid "source_table"
 msgstr "tabla_origen"
 
-#: sql_help.c:2179
+#: sql_help.c:2183
 msgid "like_option"
 msgstr "opción_de_like"
 
-#: sql_help.c:2196 sql_help.c:2197 sql_help.c:2206 sql_help.c:2208
-#: sql_help.c:2212
+#: sql_help.c:2200 sql_help.c:2201 sql_help.c:2210 sql_help.c:2212
+#: sql_help.c:2216
 msgid "index_parameters"
 msgstr "parámetros_de_índice"
 
-#: sql_help.c:2198 sql_help.c:2215
+#: sql_help.c:2202 sql_help.c:2219
 msgid "reftable"
 msgstr "tabla_ref"
 
-#: sql_help.c:2199 sql_help.c:2216
+#: sql_help.c:2203 sql_help.c:2220
 msgid "refcolumn"
 msgstr "columna_ref"
 
-#: sql_help.c:2210
+#: sql_help.c:2214
 msgid "exclude_element"
 msgstr "elemento_de_exclusión"
 
-#: sql_help.c:2211 sql_help.c:3557 sql_help.c:3647 sql_help.c:3796
-#: sql_help.c:3925 sql_help.c:3990
+#: sql_help.c:2215 sql_help.c:3562 sql_help.c:3652 sql_help.c:3801
+#: sql_help.c:3930 sql_help.c:3995
 msgid "operator"
 msgstr "operador"
 
-#: sql_help.c:2219
+#: sql_help.c:2223
 msgid "and like_option is:"
 msgstr "y opción_de_like es:"
 
-#: sql_help.c:2220
+#: sql_help.c:2224
 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:2224
+#: sql_help.c:2228
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "elemento_de_exclusión en una restricción EXCLUDE es:"
 
-#: sql_help.c:2259
+#: sql_help.c:2263
 msgid "directory"
 msgstr "directorio"
 
-#: sql_help.c:2273
+#: sql_help.c:2277
 msgid "parser_name"
 msgstr "nombre_de_parser"
 
-#: sql_help.c:2274
+#: sql_help.c:2278
 msgid "source_config"
 msgstr "config_origen"
 
-#: sql_help.c:2303
+#: sql_help.c:2307
 msgid "start_function"
 msgstr "función_inicio"
 
-#: sql_help.c:2304
+#: sql_help.c:2308
 msgid "gettoken_function"
 msgstr "función_gettoken"
 
-#: sql_help.c:2305
+#: sql_help.c:2309
 msgid "end_function"
 msgstr "función_fin"
 
-#: sql_help.c:2306
+#: sql_help.c:2310
 msgid "lextypes_function"
 msgstr "función_lextypes"
 
-#: sql_help.c:2307
+#: sql_help.c:2311
 msgid "headline_function"
 msgstr "función_headline"
 
-#: sql_help.c:2319
+#: sql_help.c:2323
 msgid "init_function"
 msgstr "función_init"
 
-#: sql_help.c:2320
+#: sql_help.c:2324
 msgid "lexize_function"
 msgstr "función_lexize"
 
-#: sql_help.c:2333
+#: sql_help.c:2337
 msgid "from_sql_function_name"
 msgstr "nombre_de_función_from"
 
-#: sql_help.c:2335
+#: sql_help.c:2339
 msgid "to_sql_function_name"
 msgstr "nombre_de_función_to"
 
-#: sql_help.c:2360
+#: sql_help.c:2364
 msgid "referenced_table_name"
 msgstr "nombre_tabla_referenciada"
 
-#: sql_help.c:2363
+#: sql_help.c:2367
 msgid "arguments"
 msgstr "argumentos"
 
-#: sql_help.c:2413 sql_help.c:3485
+#: sql_help.c:2417 sql_help.c:3490
 msgid "label"
 msgstr "etiqueta"
 
-#: sql_help.c:2415
+#: sql_help.c:2419
 msgid "subtype"
 msgstr "subtipo"
 
-#: sql_help.c:2416
+#: sql_help.c:2420
 msgid "subtype_operator_class"
 msgstr "clase_de_operador_del_subtipo"
 
-#: sql_help.c:2418
+#: sql_help.c:2422
 msgid "canonical_function"
 msgstr "función_canónica"
 
-#: sql_help.c:2419
+#: sql_help.c:2423
 msgid "subtype_diff_function"
 msgstr "función_diff_del_subtipo"
 
-#: sql_help.c:2421
+#: sql_help.c:2425
 msgid "input_function"
 msgstr "función_entrada"
 
-#: sql_help.c:2422
+#: sql_help.c:2426
 msgid "output_function"
 msgstr "función_salida"
 
-#: sql_help.c:2423
+#: sql_help.c:2427
 msgid "receive_function"
 msgstr "función_receive"
 
-#: sql_help.c:2424
+#: sql_help.c:2428
 msgid "send_function"
 msgstr "función_send"
 
-#: sql_help.c:2425
+#: sql_help.c:2429
 msgid "type_modifier_input_function"
 msgstr "función_entrada_del_modificador_de_tipo"
 
-#: sql_help.c:2426
+#: sql_help.c:2430
 msgid "type_modifier_output_function"
 msgstr "función_salida_del_modificador_de_tipo"
 
-#: sql_help.c:2427
+#: sql_help.c:2431
 msgid "analyze_function"
 msgstr "función_analyze"
 
-#: sql_help.c:2428
+#: sql_help.c:2432
 msgid "internallength"
 msgstr "largo_interno"
 
-#: sql_help.c:2429
+#: sql_help.c:2433
 msgid "alignment"
 msgstr "alineamiento"
 
-#: sql_help.c:2430
+#: sql_help.c:2434
 msgid "storage"
 msgstr "almacenamiento"
 
-#: sql_help.c:2431
+#: sql_help.c:2435
 msgid "like_type"
 msgstr "como_tipo"
 
-#: sql_help.c:2432
+#: sql_help.c:2436
 msgid "category"
 msgstr "categoría"
 
-#: sql_help.c:2433
+#: sql_help.c:2437
 msgid "preferred"
 msgstr "preferido"
 
-#: sql_help.c:2434
+#: sql_help.c:2438
 msgid "default"
 msgstr "valor_por_omisión"
 
-#: sql_help.c:2435
+#: sql_help.c:2439
 msgid "element"
 msgstr "elemento"
 
-#: sql_help.c:2436
+#: sql_help.c:2440
 msgid "delimiter"
 msgstr "delimitador"
 
-#: sql_help.c:2437
+#: sql_help.c:2441
 msgid "collatable"
 msgstr "ordenable"
 
-#: sql_help.c:2534 sql_help.c:3111 sql_help.c:3545 sql_help.c:3634
-#: sql_help.c:3784 sql_help.c:3884 sql_help.c:3978
+#: sql_help.c:2539 sql_help.c:3116 sql_help.c:3550 sql_help.c:3639
+#: sql_help.c:3789 sql_help.c:3889 sql_help.c:3983
 msgid "with_query"
 msgstr "consulta_with"
 
-#: sql_help.c:2536 sql_help.c:3113 sql_help.c:3564 sql_help.c:3570
-#: sql_help.c:3573 sql_help.c:3577 sql_help.c:3581 sql_help.c:3589
-#: sql_help.c:3803 sql_help.c:3809 sql_help.c:3812 sql_help.c:3816
-#: sql_help.c:3820 sql_help.c:3828 sql_help.c:3886 sql_help.c:3997
-#: sql_help.c:4003 sql_help.c:4006 sql_help.c:4010 sql_help.c:4014
-#: sql_help.c:4022
+#: sql_help.c:2541 sql_help.c:3118 sql_help.c:3569 sql_help.c:3575
+#: sql_help.c:3578 sql_help.c:3582 sql_help.c:3586 sql_help.c:3594
+#: sql_help.c:3808 sql_help.c:3814 sql_help.c:3817 sql_help.c:3821
+#: sql_help.c:3825 sql_help.c:3833 sql_help.c:3891 sql_help.c:4002
+#: sql_help.c:4008 sql_help.c:4011 sql_help.c:4015 sql_help.c:4019
+#: sql_help.c:4027
 msgid "alias"
 msgstr "alias"
 
-#: sql_help.c:2537
+#: sql_help.c:2542
 msgid "using_list"
 msgstr "lista_using"
 
-#: sql_help.c:2539 sql_help.c:2952 sql_help.c:3192 sql_help.c:3895
+#: sql_help.c:2544 sql_help.c:2957 sql_help.c:3197 sql_help.c:3900
 msgid "cursor_name"
 msgstr "nombre_de_cursor"
 
-#: sql_help.c:2540 sql_help.c:3119 sql_help.c:3896
+#: sql_help.c:2545 sql_help.c:3124 sql_help.c:3901
 msgid "output_expression"
 msgstr "expresión_de_salida"
 
-#: sql_help.c:2541 sql_help.c:3120 sql_help.c:3548 sql_help.c:3637
-#: sql_help.c:3787 sql_help.c:3897 sql_help.c:3981
+#: sql_help.c:2546 sql_help.c:3125 sql_help.c:3553 sql_help.c:3642
+#: sql_help.c:3792 sql_help.c:3902 sql_help.c:3986
 msgid "output_name"
 msgstr "nombre_de_salida"
 
-#: sql_help.c:2557
+#: sql_help.c:2562
 msgid "code"
 msgstr "código"
 
-#: sql_help.c:2900
+#: sql_help.c:2905
 msgid "parameter"
 msgstr "parámetro"
 
-#: sql_help.c:2919 sql_help.c:2920 sql_help.c:3217
+#: sql_help.c:2924 sql_help.c:2925 sql_help.c:3222
 msgid "statement"
 msgstr "sentencia"
 
-#: sql_help.c:2951 sql_help.c:3191
+#: sql_help.c:2956 sql_help.c:3196
 msgid "direction"
 msgstr "dirección"
 
-#: sql_help.c:2953 sql_help.c:3193
+#: sql_help.c:2958 sql_help.c:3198
 msgid "where direction can be empty or one of:"
 msgstr "donde dirección puede ser vacío o uno de:"
 
-#: sql_help.c:2954 sql_help.c:2955 sql_help.c:2956 sql_help.c:2957
-#: sql_help.c:2958 sql_help.c:3194 sql_help.c:3195 sql_help.c:3196
-#: sql_help.c:3197 sql_help.c:3198 sql_help.c:3558 sql_help.c:3560
-#: sql_help.c:3648 sql_help.c:3650 sql_help.c:3797 sql_help.c:3799
-#: sql_help.c:3926 sql_help.c:3928 sql_help.c:3991 sql_help.c:3993
+#: sql_help.c:2959 sql_help.c:2960 sql_help.c:2961 sql_help.c:2962
+#: sql_help.c:2963 sql_help.c:3199 sql_help.c:3200 sql_help.c:3201
+#: sql_help.c:3202 sql_help.c:3203 sql_help.c:3563 sql_help.c:3565
+#: sql_help.c:3653 sql_help.c:3655 sql_help.c:3802 sql_help.c:3804
+#: sql_help.c:3931 sql_help.c:3933 sql_help.c:3996 sql_help.c:3998
 msgid "count"
 msgstr "cantidad"
 
-#: sql_help.c:3038 sql_help.c:3370
+#: sql_help.c:3043 sql_help.c:3375
 msgid "sequence_name"
 msgstr "nombre_secuencia"
 
-#: sql_help.c:3051 sql_help.c:3383
+#: sql_help.c:3056 sql_help.c:3388
 msgid "arg_name"
 msgstr "nombre_arg"
 
-#: sql_help.c:3052 sql_help.c:3384
+#: sql_help.c:3057 sql_help.c:3389
 msgid "arg_type"
 msgstr "tipo_arg"
 
-#: sql_help.c:3057 sql_help.c:3389
+#: sql_help.c:3062 sql_help.c:3394
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:3080
+#: sql_help.c:3085
 msgid "remote_schema"
 msgstr "schema_remoto"
 
-#: sql_help.c:3083
+#: sql_help.c:3088
 msgid "local_schema"
 msgstr "schema_local"
 
-#: sql_help.c:3117
+#: sql_help.c:3122
 msgid "conflict_target"
 msgstr "destino_de_conflict"
 
-#: sql_help.c:3118
+#: sql_help.c:3123
 msgid "conflict_action"
 msgstr "acción_de_conflict"
 
-#: sql_help.c:3121
+#: sql_help.c:3126
 msgid "where conflict_target can be one of:"
 msgstr "donde destino_de_conflict puede ser uno de:"
 
-#: sql_help.c:3122
-msgid "column_name_index"
-msgstr "nombre_de_columna_en_índice"
+#: sql_help.c:3127
+msgid "index_column_name"
+msgstr "nombre_de_columna_de_índice"
 
-#: sql_help.c:3123
-msgid "expression_index"
-msgstr "expresión_índice"
+#: sql_help.c:3128
+msgid "index_expression"
+msgstr "expresión_de_índice"
 
-#: sql_help.c:3126
+#: sql_help.c:3131
 msgid "index_predicate"
 msgstr "predicado_de_índice"
 
-#: sql_help.c:3128
+#: sql_help.c:3133
 msgid "and conflict_action is one of:"
 msgstr "donde acción_de_conflict es una de:"
 
-#: sql_help.c:3134 sql_help.c:3892
+#: sql_help.c:3139 sql_help.c:3897
 msgid "sub-SELECT"
 msgstr "sub-SELECT"
 
-#: sql_help.c:3143 sql_help.c:3206 sql_help.c:3868
+#: sql_help.c:3148 sql_help.c:3211 sql_help.c:3873
 msgid "channel"
 msgstr "canal"
 
-#: sql_help.c:3165
+#: sql_help.c:3170
 msgid "lockmode"
 msgstr "modo_bloqueo"
 
-#: sql_help.c:3166
+#: sql_help.c:3171
 msgid "where lockmode is one of:"
 msgstr "donde modo_bloqueo es uno de:"
 
-#: sql_help.c:3207
+#: sql_help.c:3212
 msgid "payload"
 msgstr "carga"
 
-#: sql_help.c:3234
+#: sql_help.c:3239
 msgid "old_role"
 msgstr "rol_antiguo"
 
-#: sql_help.c:3235
+#: sql_help.c:3240
 msgid "new_role"
 msgstr "rol_nuevo"
 
-#: sql_help.c:3260 sql_help.c:3421 sql_help.c:3429
+#: sql_help.c:3265 sql_help.c:3426 sql_help.c:3434
 msgid "savepoint_name"
 msgstr "nombre_de_savepoint"
 
-#: sql_help.c:3462
+#: sql_help.c:3467
 msgid "provider"
 msgstr "proveedor"
 
-#: sql_help.c:3549 sql_help.c:3591 sql_help.c:3593 sql_help.c:3639
-#: sql_help.c:3788 sql_help.c:3830 sql_help.c:3832 sql_help.c:3982
-#: sql_help.c:4024 sql_help.c:4026
+#: sql_help.c:3554 sql_help.c:3596 sql_help.c:3598 sql_help.c:3644
+#: sql_help.c:3793 sql_help.c:3835 sql_help.c:3837 sql_help.c:3987
+#: sql_help.c:4029 sql_help.c:4031
 msgid "from_item"
 msgstr "item_de_from"
 
-#: sql_help.c:3551 sql_help.c:3603 sql_help.c:3790 sql_help.c:3842
-#: sql_help.c:3984 sql_help.c:4036
+#: sql_help.c:3556 sql_help.c:3608 sql_help.c:3795 sql_help.c:3847
+#: sql_help.c:3989 sql_help.c:4041
 msgid "grouping_element"
 msgstr "elemento_agrupante"
 
-#: sql_help.c:3553 sql_help.c:3643 sql_help.c:3792 sql_help.c:3986
+#: sql_help.c:3558 sql_help.c:3648 sql_help.c:3797 sql_help.c:3991
 msgid "window_name"
 msgstr "nombre_de_ventana"
 
-#: sql_help.c:3554 sql_help.c:3644 sql_help.c:3793 sql_help.c:3987
+#: sql_help.c:3559 sql_help.c:3649 sql_help.c:3798 sql_help.c:3992
 msgid "window_definition"
 msgstr "definición_de_ventana"
 
-#: sql_help.c:3555 sql_help.c:3569 sql_help.c:3607 sql_help.c:3645
-#: sql_help.c:3794 sql_help.c:3808 sql_help.c:3846 sql_help.c:3988
-#: sql_help.c:4002 sql_help.c:4040
+#: sql_help.c:3560 sql_help.c:3574 sql_help.c:3612 sql_help.c:3650
+#: sql_help.c:3799 sql_help.c:3813 sql_help.c:3851 sql_help.c:3993
+#: sql_help.c:4007 sql_help.c:4045
 msgid "select"
 msgstr "select"
 
-#: sql_help.c:3562 sql_help.c:3801 sql_help.c:3995
+#: sql_help.c:3567 sql_help.c:3806 sql_help.c:4000
 msgid "where from_item can be one of:"
 msgstr "donde item_de_from puede ser uno de:"
 
-#: sql_help.c:3565 sql_help.c:3571 sql_help.c:3574 sql_help.c:3578
-#: sql_help.c:3590 sql_help.c:3804 sql_help.c:3810 sql_help.c:3813
-#: sql_help.c:3817 sql_help.c:3829 sql_help.c:3998 sql_help.c:4004
-#: sql_help.c:4007 sql_help.c:4011 sql_help.c:4023
+#: sql_help.c:3570 sql_help.c:3576 sql_help.c:3579 sql_help.c:3583
+#: sql_help.c:3595 sql_help.c:3809 sql_help.c:3815 sql_help.c:3818
+#: sql_help.c:3822 sql_help.c:3834 sql_help.c:4003 sql_help.c:4009
+#: sql_help.c:4012 sql_help.c:4016 sql_help.c:4028
 msgid "column_alias"
 msgstr "alias_de_columna"
 
-#: sql_help.c:3566 sql_help.c:3805 sql_help.c:3999
+#: sql_help.c:3571 sql_help.c:3810 sql_help.c:4004
 msgid "sampling_method"
 msgstr "método_de_sampleo"
 
-#: sql_help.c:3567 sql_help.c:3576 sql_help.c:3580 sql_help.c:3584
-#: sql_help.c:3587 sql_help.c:3806 sql_help.c:3815 sql_help.c:3819
-#: sql_help.c:3823 sql_help.c:3826 sql_help.c:4000 sql_help.c:4009
-#: sql_help.c:4013 sql_help.c:4017 sql_help.c:4020
+#: sql_help.c:3572 sql_help.c:3581 sql_help.c:3585 sql_help.c:3589
+#: sql_help.c:3592 sql_help.c:3811 sql_help.c:3820 sql_help.c:3824
+#: sql_help.c:3828 sql_help.c:3831 sql_help.c:4005 sql_help.c:4014
+#: sql_help.c:4018 sql_help.c:4022 sql_help.c:4025
 msgid "argument"
 msgstr "argumento"
 
-#: sql_help.c:3568 sql_help.c:3807 sql_help.c:4001
+#: sql_help.c:3573 sql_help.c:3812 sql_help.c:4006
 msgid "seed"
 msgstr "semilla"
 
-#: sql_help.c:3572 sql_help.c:3605 sql_help.c:3811 sql_help.c:3844
-#: sql_help.c:4005 sql_help.c:4038
+#: sql_help.c:3577 sql_help.c:3610 sql_help.c:3816 sql_help.c:3849
+#: sql_help.c:4010 sql_help.c:4043
 msgid "with_query_name"
 msgstr "nombre_consulta_with"
 
-#: sql_help.c:3582 sql_help.c:3585 sql_help.c:3588 sql_help.c:3821
-#: sql_help.c:3824 sql_help.c:3827 sql_help.c:4015 sql_help.c:4018
-#: sql_help.c:4021
+#: sql_help.c:3587 sql_help.c:3590 sql_help.c:3593 sql_help.c:3826
+#: sql_help.c:3829 sql_help.c:3832 sql_help.c:4020 sql_help.c:4023
+#: sql_help.c:4026
 msgid "column_definition"
 msgstr "definición_de_columna"
 
-#: sql_help.c:3592 sql_help.c:3831 sql_help.c:4025
+#: sql_help.c:3597 sql_help.c:3836 sql_help.c:4030
 msgid "join_type"
 msgstr "tipo_de_join"
 
-#: sql_help.c:3594 sql_help.c:3833 sql_help.c:4027
+#: sql_help.c:3599 sql_help.c:3838 sql_help.c:4032
 msgid "join_condition"
 msgstr "condición_de_join"
 
-#: sql_help.c:3595 sql_help.c:3834 sql_help.c:4028
+#: sql_help.c:3600 sql_help.c:3839 sql_help.c:4033
 msgid "join_column"
 msgstr "columna_de_join"
 
-#: sql_help.c:3596 sql_help.c:3835 sql_help.c:4029
+#: sql_help.c:3601 sql_help.c:3840 sql_help.c:4034
 msgid "and grouping_element can be one of:"
 msgstr "donde elemento_agrupante puede ser una de:"
 
-#: sql_help.c:3604 sql_help.c:3843 sql_help.c:4037
+#: sql_help.c:3609 sql_help.c:3848 sql_help.c:4042
 msgid "and with_query is:"
 msgstr "y consulta_with es:"
 
-#: sql_help.c:3608 sql_help.c:3847 sql_help.c:4041
+#: sql_help.c:3613 sql_help.c:3852 sql_help.c:4046
 msgid "values"
 msgstr "valores"
 
-#: sql_help.c:3609 sql_help.c:3848 sql_help.c:4042
+#: sql_help.c:3614 sql_help.c:3853 sql_help.c:4047
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:3610 sql_help.c:3849 sql_help.c:4043
+#: sql_help.c:3615 sql_help.c:3854 sql_help.c:4048
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:3611 sql_help.c:3850 sql_help.c:4044
+#: sql_help.c:3616 sql_help.c:3855 sql_help.c:4049
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:3638
+#: sql_help.c:3643
 msgid "new_table"
 msgstr "nueva_tabla"
 
-#: sql_help.c:3663
+#: sql_help.c:3668
 msgid "timezone"
 msgstr "huso_horario"
 
-#: sql_help.c:3708
+#: sql_help.c:3713
 msgid "snapshot_id"
 msgstr "id_de_snapshot"
 
-#: sql_help.c:3893
+#: sql_help.c:3898
 msgid "from_list"
 msgstr "lista_from"
 
-#: sql_help.c:3924
+#: sql_help.c:3929
 msgid "sort_expression"
 msgstr "expresión_orden"
 
@@ -4550,8 +4568,8 @@
 msgstr "cambia la definición de una familia de operadores"
 
 #: sql_help.h:297
-msgid "change the definition of a policy"
-msgstr "cambia la definición de una política"
+msgid "change the definition of a row level security policy"
+msgstr "cambia la definición de una política de seguridad de registros"
 
 #: sql_help.h:302 sql_help.h:372
 msgid "change a database role"
@@ -4726,8 +4744,8 @@
 msgstr "define una nueva familia de operadores"
 
 #: sql_help.h:522
-msgid "define a new policy for a table"
-msgstr "define una nueva política para una tabla"
+msgid "define a new row level security policy for a table"
+msgstr "define una nueva política de seguridad de registros para una tabla"
 
 #: sql_help.h:532
 msgid "define a new rewrite rule"
@@ -4890,8 +4908,8 @@
 msgstr "elimina objetos de propiedad de un rol de la base de datos"
 
 #: sql_help.h:737
-msgid "remove a policy from a table"
-msgstr "elimina una política de una tabla"
+msgid "remove a row level security policy from a table"
+msgstr "elimina una política de seguridad de registros de una tabla"
 
 #: sql_help.h:747
 msgid "remove a rewrite rule"
@@ -5100,12 +5118,12 @@
 msgid "%s: -1 can only be used in non-interactive mode\n"
 msgstr "%s: -1 sólo puede ser usado en modo no interactivo\n"
 
-#: startup.c:277
+#: startup.c:278
 #, 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:339
+#: startup.c:342
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -5114,42 +5132,42 @@
 "Digite «help» para obtener ayuda.\n"
 "\n"
 
-#: startup.c:486
+#: startup.c:490
 #, 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:526
+#: startup.c:530
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: no se pudo eliminar la variable «%s»\n"
 
-#: startup.c:536
+#: startup.c:540
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: no se pudo definir la variable «%s»\n"
 
-#: startup.c:596
+#: startup.c:600
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para obtener más información.\n"
 
-#: startup.c:613
+#: startup.c:617
 #, 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:635
+#: startup.c:639
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: no se pudo encontrar el ejecutable propio\n"
 
-#: startup.c:757 startup.c:804 startup.c:825 startup.c:862 variables.c:121
+#: startup.c:761 startup.c:808 startup.c:829 startup.c:866 variables.c:121
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\"; assuming \"%s\"\n"
 msgstr "valor «%s» no reconocido para «%s»; asumiendo «%s»\n"
 
-#: tab-complete.c:4566
+#: tab-complete.c:4597
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
@@ -5160,8 +5178,27 @@
 "La consulta era:\n"
 "%s\n"
 
+#~ msgid "SSL connection (unknown cipher)\n"
+#~ msgstr "conexión SSL (cifrado desconocido)\n"
+
 #~ msgid "(No rows)\n"
 #~ msgstr "(Sin filas)\n"
 
-#~ msgid "SSL connection (unknown cipher)\n"
-#~ msgstr "conexión SSL (cifrado desconocido)\n"
+#~ msgid "expression_index"
+#~ msgstr "expresión_índice"
+
+#~ msgid "column_name_index"
+#~ msgstr "nombre_de_columna_en_índice"
+
+#~ msgid "  unicode_column_linestyle\n"
+#~ msgstr "  unicode_column_linestyle\n"
+
+#~ msgid "  unicode_border_linestyle\n"
+#~ msgstr "  unicode_border_linestyle\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Display influencing variables:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Variables que influencian el despliegue:\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/po/fr.po postgresql-9.5-9.5.8/src/bin/psql/po/fr.po
--- postgresql-9.5-9.5.2/src/bin/psql/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,66 +1,66 @@
 # translation of psql.po to fr_fr
 # french message translation file for psql
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
 # Guillaume Lelarge <guillaume@lelarge.info>, 2003-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-22 20:12+0000\n"
-"PO-Revision-Date: 2016-02-24 13:32+0100\n"
+"POT-Creation-Date: 2017-06-30 16:30+0000\n"
+"PO-Revision-Date: 2017-07-02 17:13+0200\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-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.12\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
 msgid "could not identify current directory: %s"
-msgstr "n'a pas pu identifier le répertoire courant : %s"
+msgstr "n'a pas pu identifier le répertoire courant : %s"
 
 #: ../../common/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "binaire « %s » invalide"
+msgstr "binaire « %s » invalide"
 
 #: ../../common/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "n'a pas pu lire le binaire « %s »"
+msgstr "n'a pas pu lire le binaire « %s »"
 
 #: ../../common/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "n'a pas pu trouver un « %s » à exécuter"
+msgstr "n'a pas pu trouver un « %s » à exécuter"
 
 #: ../../common/exec.c:257 ../../common/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "n'a pas pu changer le répertoire par « %s » : %s"
+msgstr "n'a pas pu changer le répertoire par « %s » : %s"
 
 #: ../../common/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "n'a pas pu lire le lien symbolique « %s »"
+msgstr "n'a pas pu lire le lien symbolique « %s »"
 
 #: ../../common/exec.c:523
 #, c-format
 msgid "pclose failed: %s"
-msgstr "échec de pclose : %s"
+msgstr "échec de pclose : %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 command.c:318 input.c:216 mainloop.c:73
+#: ../../common/fe_memutils.c:98 command.c:330 input.c:216 mainloop.c:73
 #: mainloop.c:253
 #, c-format
 msgid "out of memory\n"
-msgstr "mémoire épuisée\n"
+msgstr "mémoire épuisée\n"
 
 #: ../../common/fe_memutils.c:92
 #, c-format
@@ -70,21 +70,21 @@
 #: ../../common/username.c:45
 #, c-format
 msgid "could not look up effective user ID %ld: %s"
-msgstr "n'a pas pu trouver l'identifiant réel %ld de l'utilisateur : %s"
+msgstr "n'a pas pu trouver l'identifiant réel %ld de l'utilisateur : %s"
 
-#: ../../common/username.c:47 command.c:273
+#: ../../common/username.c:47 command.c:285
 msgid "user does not exist"
 msgstr "l'utilisateur n'existe pas"
 
 #: ../../common/username.c:62
 #, c-format
 msgid "user name lookup failure: error code %lu"
-msgstr "échec de la recherche du nom d'utilisateur : code erreur %lu"
+msgstr "échec de la recherche du nom d'utilisateur : code erreur %lu"
 
 #: ../../common/wait_error.c:47
 #, c-format
 msgid "command not executable"
-msgstr "commande non exécutable"
+msgstr "commande non exécutable"
 
 #: ../../common/wait_error.c:51
 #, c-format
@@ -94,493 +94,493 @@
 #: ../../common/wait_error.c:56
 #, c-format
 msgid "child process exited with exit code %d"
-msgstr "le processus fils a quitté avec le code de sortie %d"
+msgstr "le processus fils a quitté avec le code de sortie %d"
 
 #: ../../common/wait_error.c:63
 #, c-format
 msgid "child process was terminated by exception 0x%X"
-msgstr "le processus fils a été terminé par l'exception 0x%X"
+msgstr "le processus fils a été terminé par l'exception 0x%X"
 
 #: ../../common/wait_error.c:73
 #, c-format
 msgid "child process was terminated by signal %s"
-msgstr "le processus fils a été terminé par le signal %s"
+msgstr "le processus fils a été terminé par le signal %s"
 
 #: ../../common/wait_error.c:77
 #, c-format
 msgid "child process was terminated by signal %d"
-msgstr "le processus fils a été terminé par le signal %d"
+msgstr "le processus fils a été terminé par le signal %d"
 
 #: ../../common/wait_error.c:82
 #, c-format
 msgid "child process exited with unrecognized status %d"
-msgstr "le processus fils a quitté avec un statut %d non reconnu"
+msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
-msgstr "Commande \\%s invalide. Essayez \\? pour l'aide-mémoire.\n"
+msgstr "Commande \\%s invalide. Essayez \\? pour l'aide-mémoire.\n"
 
-#: command.c:116
+#: command.c:117
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "commande \\%s invalide\n"
 
-#: command.c:127
+#: command.c:128
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
-msgstr "\\%s : argument « %s » supplémentaire ignoré\n"
+msgstr "\\%s : argument « %s » supplémentaire ignoré\n"
 
-#: command.c:271
+#: command.c:283
 #, c-format
 msgid "could not get home directory for user ID %ld: %s\n"
-msgstr "n'a pas pu obtenir le répertoire principal pour l'identifiant d'utilisateur %ld : %s\n"
+msgstr "n'a pas pu obtenir le répertoire principal pour l'identifiant d'utilisateur %ld : %s\n"
 
-#: command.c:289
+#: command.c:301
 #, 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"
+msgstr "\\%s : n'a pas pu accéder au répertoire « %s » : %s\n"
 
-#: command.c:304 common.c:461 common.c:519 common.c:977
+#: command.c:316 common.c:466 common.c:524 common.c:982
 #, c-format
 msgid "You are currently not connected to a database.\n"
-msgstr "Vous n'êtes pas connecté à une base de données.\n"
+msgstr "Vous n'êtes pas connecté à une base de données.\n"
 
-#: command.c:331
+#: command.c:343
 #, 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"
+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:334
+#: command.c:346
 #, 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"
+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:535 command.c:605 command.c:1405
+#: command.c:547 command.c:620 command.c:1423
 #, c-format
 msgid "no query buffer\n"
-msgstr "aucun tampon de requête\n"
+msgstr "aucun tampon de requête\n"
 
-#: command.c:568 command.c:3172
+#: command.c:580 command.c:3234
 #, c-format
 msgid "invalid line number: %s\n"
-msgstr "numéro de ligne invalide : %s\n"
+msgstr "numéro de ligne invalide : %s\n"
 
-#: command.c:599
+#: command.c:613
 #, c-format
-msgid "The server (version %d.%d) does not support editing function source.\n"
-msgstr "Le serveur (version %d.%d) ne supporte pas l'édition du code de la fonction.\n"
+msgid "The server (version %s) does not support editing function source.\n"
+msgstr "Le serveur (version %s) ne supporte pas l'édition du code de la fonction.\n"
 
-#: command.c:679
+#: command.c:694
 msgid "No changes"
 msgstr "Aucun changement"
 
-#: command.c:733
+#: command.c:748
 #, 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"
+msgstr "%s : nom d'encodage invalide ou procédure de conversion introuvable\n"
 
-#: command.c:830 command.c:880 command.c:894 command.c:911 command.c:1018
-#: command.c:1182 command.c:1385 command.c:1416
+#: command.c:845 command.c:895 command.c:909 command.c:926 command.c:1033
+#: command.c:1197 command.c:1403 command.c:1434
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s : argument requis manquant\n"
 
-#: command.c:943
+#: command.c:958
 msgid "Query buffer is empty."
-msgstr "Le tampon de requête est vide."
+msgstr "Le tampon de requête est vide."
 
-#: command.c:953
+#: command.c:968
 msgid "Enter new password: "
 msgstr "Saisissez le nouveau mot de passe : "
 
-#: command.c:954
+#: command.c:969
 msgid "Enter it again: "
-msgstr "Saisissez-le à nouveau : "
+msgstr "Saisissez-le à nouveau : "
 
-#: command.c:958
+#: command.c:973
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Les mots de passe ne sont pas identiques.\n"
 
-#: command.c:976
+#: command.c:991
 #, c-format
 msgid "Password encryption failed.\n"
-msgstr "Échec du chiffrement du mot de passe.\n"
+msgstr "Échec du chiffrement du mot de passe.\n"
 
-#: command.c:1047 command.c:1163 command.c:1390
+#: command.c:1062 command.c:1178 command.c:1408
 #, c-format
 msgid "\\%s: error while setting variable\n"
 msgstr "\\%s : erreur lors de l'initialisation de la variable\n"
 
-#: command.c:1110
+#: command.c:1125
 msgid "Query buffer reset (cleared)."
-msgstr "Le tampon de requête a été effacé."
+msgstr "Le tampon de requête a été effacé."
 
-#: command.c:1122
+#: command.c:1137
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
-msgstr "Historique sauvegardé dans le fichier « %s ».\n"
+msgstr "Historique sauvegardé dans le fichier « %s ».\n"
 
-#: command.c:1187
+#: command.c:1202
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\"\n"
-msgstr "\\%s : le nom de la variable d'environnement ne doit pas contenir « = »\n"
+msgstr "\\%s : le nom de la variable d'environnement ne doit pas contenir « = »\n"
 
-#: command.c:1229
+#: command.c:1246
 #, c-format
-msgid "The server (version %d.%d) does not support showing function source.\n"
-msgstr "Le serveur (version %d.%d) ne supporte pas l'affichage du code de la fonction.\n"
+msgid "The server (version %s) does not support showing function source.\n"
+msgstr "Le serveur (version %s) ne supporte pas l'affichage du code de la fonction.\n"
 
-#: command.c:1235
+#: command.c:1253
 #, c-format
 msgid "function name is required\n"
 msgstr "le nom de la fonction est requis\n"
 
-#: command.c:1370
+#: command.c:1388
 msgid "Timing is on."
-msgstr "Chronométrage activé."
+msgstr "Chronométrage activé."
 
-#: command.c:1372
+#: command.c:1390
 msgid "Timing is off."
-msgstr "Chronométrage désactivé."
+msgstr "Chronométrage désactivé."
 
-#: command.c:1434 command.c:1454 command.c:2091 command.c:2094 command.c:2097
-#: command.c:2103 command.c:2105 command.c:2113 command.c:2123 command.c:2132
-#: command.c:2146 command.c:2163 command.c:2222 common.c:66 copy.c:331
-#: copy.c:391 copy.c:404 psqlscan.l:1700 psqlscan.l:1711 psqlscan.l:1721
+#: command.c:1452 command.c:1472 command.c:2153 command.c:2156 command.c:2159
+#: command.c:2165 command.c:2167 command.c:2175 command.c:2185 command.c:2194
+#: command.c:2208 command.c:2225 command.c:2284 common.c:67 copy.c:331
+#: copy.c:391 copy.c:404 psqlscan.l:1701 psqlscan.l:1712 psqlscan.l:1722
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s : %s\n"
 
-#: command.c:1548
+#: command.c:1566
 #, c-format
 msgid "+ opt(%d) = |%s|\n"
 msgstr "+ opt(%d) = |%s|\n"
 
-#: command.c:1574 startup.c:195
+#: command.c:1592 startup.c:195
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: command.c:1579 startup.c:197
+#: command.c:1597 startup.c:197
 #, c-format
 msgid "Password for user %s: "
 msgstr "Mot de passe pour l'utilisateur %s : "
 
-#: command.c:1626
+#: command.c:1648
 #, c-format
 msgid "All connection parameters must be supplied because no database connection exists\n"
 msgstr ""
-"Tous les paramètres de connexions doivent être fournis car il n'y a pas de connexion\n"
-"à une base de données existante.\n"
+"Tous les paramètres de connexions doivent être fournis car il n'y a pas de connexion\n"
+"à une base de données existante.\n"
 
-#: command.c:1747 command.c:3206 common.c:139 common.c:432 common.c:1020
-#: common.c:1045 common.c:1145 copy.c:488 copy.c:698 large_obj.c:156
-#: large_obj.c:191 large_obj.c:253 psqlscan.l:1972
+#: command.c:1803 command.c:3268 common.c:140 common.c:437 common.c:1025
+#: common.c:1053 common.c:1153 copy.c:488 copy.c:708 large_obj.c:156
+#: large_obj.c:191 large_obj.c:253 psqlscan.l:1973
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1751
+#: command.c:1807
 #, c-format
 msgid "Previous connection kept\n"
-msgstr "Connexion précédente conservée\n"
+msgstr "Connexion précédente conservée\n"
 
-#: command.c:1755
+#: command.c:1811
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect : %s"
 
-#: command.c:1789
+#: command.c:1849
 #, c-format
 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"
+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:1792
+#: command.c:1852
 #, c-format
 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"
+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:1796
+#: command.c:1856
 #, c-format
 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"
+msgstr "Vous êtes maintenant connecté à la base de données « %s » en tant qu'utilisateur « %s ».\n"
 
-#: command.c:1830
+#: command.c:1889
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, serveur %s)\n"
 
-#: command.c:1838
+#: command.c:1897
 #, c-format
 msgid ""
-"WARNING: %s major version %d.%d, server major version %d.%d.\n"
+"WARNING: %s major version %s, server major version %s.\n"
 "         Some psql features might not work.\n"
 msgstr ""
-"ATTENTION : %s version majeure %d.%d, version majeure du serveur %d.%d.\n"
-"         Certaines fonctionnalités de psql pourraient ne pas fonctionner.\n"
+"ATTENTION : %s version majeure %s, version majeure du serveur %s.\n"
+"         Certaines fonctionnalités de psql pourraient ne pas fonctionner.\n"
 
-#: command.c:1872
+#: command.c:1934
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, bits: %s, compression: %s)\n"
 msgstr "Connexion SSL (protocole : %s, chiffrement : %s, bits : %s, compression : %s)\n"
 
-#: command.c:1873 command.c:1874 command.c:1875
+#: command.c:1935 command.c:1936 command.c:1937
 msgid "unknown"
 msgstr "inconnu"
 
-#: command.c:1876 help.c:46
+#: command.c:1938 help.c:46
 msgid "off"
-msgstr "désactivé"
+msgstr "désactivé"
 
-#: command.c:1876 help.c:46
+#: command.c:1938 help.c:46
 msgid "on"
-msgstr "activé"
+msgstr "activé"
 
-#: command.c:1896
+#: command.c:1958
 #, 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 ""
-"Attention : l'encodage console (%u) diffère de l'encodage Windows (%u).\n"
-"            Les caractères 8 bits peuvent ne pas fonctionner correctement.\n"
-"            Voir la section « Notes aux utilisateurs de Windows » de la page\n"
-"            référence de psql pour les détails.\n"
+"Attention : l'encodage console (%u) diffère de l'encodage Windows (%u).\n"
+"            Les caractères 8 bits peuvent ne pas fonctionner correctement.\n"
+"            Voir la section « Notes aux utilisateurs de Windows » de la page\n"
+"            référence de psql pour les détails.\n"
 
-#: command.c:1980
+#: command.c:2042
 #, c-format
 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"
+"la variable d'environnement EDITOR_LINENUMBER_SWITCH doit être configurée\n"
+"pour spécifier un numéro de ligne\n"
 
-#: command.c:2009
+#: command.c:2071
 #, c-format
 msgid "could not start editor \"%s\"\n"
-msgstr "n'a pas pu exécuter l'éditeur « %s »\n"
+msgstr "n'a pas pu exécuter l'éditeur « %s »\n"
 
-#: command.c:2011
+#: command.c:2073
 #, c-format
 msgid "could not start /bin/sh\n"
-msgstr "n'a pas pu exécuter /bin/sh\n"
+msgstr "n'a pas pu exécuter /bin/sh\n"
 
-#: command.c:2049
+#: command.c:2111
 #, c-format
 msgid "could not locate temporary directory: %s\n"
-msgstr "n'a pas pu localiser le répertoire temporaire : %s\n"
+msgstr "n'a pas pu localiser le répertoire temporaire : %s\n"
 
-#: command.c:2076
+#: command.c:2138
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
-msgstr "n'a pas pu ouvrir le fichier temporaire « %s » : %s\n"
+msgstr "n'a pas pu ouvrir le fichier temporaire « %s » : %s\n"
 
-#: command.c:2380
+#: command.c:2442
 #, c-format
 msgid "\\pset: allowed formats are unaligned, aligned, wrapped, html, asciidoc, latex, latex-longtable, troff-ms\n"
 msgstr ""
-"\\pset : les formats autorisés sont unaligned, aligned, wrapped, html, asciidoc, latex,\n"
+"\\pset : les formats autorisés sont unaligned, aligned, wrapped, html, asciidoc, latex,\n"
 "latex-longtable, troff-ms\n"
 
-#: command.c:2399
+#: command.c:2461
 #, c-format
 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"
+msgstr "\\pset: les styles de lignes autorisés sont ascii, old-ascii, unicode\n"
 
-#: command.c:2415
+#: command.c:2477
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double\n"
-msgstr "\\pset : les styles autorisés de ligne de bordure Unicode sont single, double\n"
+msgstr "\\pset : les styles autorisés de ligne de bordure Unicode sont single, double\n"
 
-#: command.c:2430
+#: command.c:2492
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double\n"
-msgstr "\\pset : les styles autorisés pour la ligne de colonne Unicode sont single, double\n"
+msgstr "\\pset : les styles autorisés pour la ligne de colonne Unicode sont single, double\n"
 
-#: command.c:2445
+#: command.c:2507
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double\n"
-msgstr "\\pset : les styles autorisés pour la ligne d'en-tête Unicode sont single, double\n"
+msgstr "\\pset : les styles autorisés pour la ligne d'en-tête Unicode sont single, double\n"
 
-#: command.c:2597 command.c:2776
+#: command.c:2659 command.c:2838
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset : option inconnue : %s\n"
 
-#: command.c:2615
+#: command.c:2677
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Le style de bordure est %d.\n"
 
-#: command.c:2621
+#: command.c:2683
 #, c-format
 msgid "Target width is unset.\n"
-msgstr "La largeur cible n'est pas configuré.\n"
+msgstr "La largeur cible n'est pas configuré.\n"
 
-#: command.c:2623
+#: command.c:2685
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "La largeur cible est %d.\n"
 
-#: command.c:2630
+#: command.c:2692
 #, c-format
 msgid "Expanded display is on.\n"
-msgstr "Affichage étendu activé.\n"
+msgstr "Affichage étendu activé.\n"
 
-#: command.c:2632
+#: command.c:2694
 #, c-format
 msgid "Expanded display is used automatically.\n"
-msgstr "L'affichage étendu est utilisé automatiquement.\n"
+msgstr "L'affichage étendu est utilisé automatiquement.\n"
 
-#: command.c:2634
+#: command.c:2696
 #, c-format
 msgid "Expanded display is off.\n"
-msgstr "Affichage étendu désactivé.\n"
+msgstr "Affichage étendu désactivé.\n"
 
-#: command.c:2641 command.c:2649
+#: command.c:2703 command.c:2711
 #, c-format
 msgid "Field separator is zero byte.\n"
-msgstr "Le séparateur de champs est l'octet zéro.\n"
+msgstr "Le séparateur de champs est l'octet zéro.\n"
 
-#: command.c:2643
+#: command.c:2705
 #, c-format
 msgid "Field separator is \"%s\".\n"
-msgstr "Le séparateur de champs est « %s ».\n"
+msgstr "Le séparateur de champs est « %s ».\n"
 
-#: command.c:2656
+#: command.c:2718
 #, c-format
 msgid "Default footer is on.\n"
-msgstr "Le bas de page pas défaut est activé.\n"
+msgstr "Le bas de page pas défaut est activé.\n"
 
-#: command.c:2658
+#: command.c:2720
 #, c-format
 msgid "Default footer is off.\n"
-msgstr "Le bas de page par défaut est désactivé.\n"
+msgstr "Le bas de page par défaut est désactivé.\n"
 
-#: command.c:2664
+#: command.c:2726
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Le format de sortie est %s.\n"
 
-#: command.c:2670
+#: command.c:2732
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Le style de ligne est %s.\n"
 
-#: command.c:2677
+#: command.c:2739
 #, c-format
 msgid "Null display is \"%s\".\n"
-msgstr "L'affichage de null est « %s ».\n"
+msgstr "L'affichage de null est « %s ».\n"
 
-#: command.c:2685
+#: command.c:2747
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
-msgstr "L'affichage de la sortie numérique adaptée à la locale est activé.\n"
+msgstr "L'affichage de la sortie numérique adaptée à la locale est activé.\n"
 
-#: command.c:2687
+#: command.c:2749
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
-msgstr "L'affichage de la sortie numérique adaptée à la locale est désactivé.\n"
+msgstr "L'affichage de la sortie numérique adaptée à la locale est désactivé.\n"
 
-#: command.c:2694
+#: command.c:2756
 #, c-format
 msgid "Pager is used for long output.\n"
-msgstr "Le paginateur est utilisé pour les affichages longs.\n"
+msgstr "Le paginateur est utilisé pour les affichages longs.\n"
 
-#: command.c:2696
+#: command.c:2758
 #, c-format
 msgid "Pager is always used.\n"
-msgstr "Le paginateur est toujours utilisé.\n"
+msgstr "Le paginateur est toujours utilisé.\n"
 
-#: command.c:2698
+#: command.c:2760
 #, c-format
 msgid "Pager usage is off.\n"
-msgstr "L'utilisation du paginateur est désactivé.\n"
+msgstr "L'utilisation du paginateur est désactivé.\n"
 
-#: command.c:2704
+#: command.c:2766
 #, c-format
 msgid "Pager won't be used for less than %d line.\n"
 msgid_plural "Pager won't be used for less than %d lines.\n"
-msgstr[0] "Le paginateur ne sera pas utilisé pour moins que %d ligne.\n"
-msgstr[1] "Le paginateur ne sera pas utilisé pour moins que %d lignes.\n"
+msgstr[0] "Le paginateur ne sera pas utilisé pour moins que %d ligne.\n"
+msgstr[1] "Le paginateur ne sera pas utilisé pour moins que %d lignes.\n"
 
-#: command.c:2714 command.c:2724
+#: command.c:2776 command.c:2786
 #, c-format
 msgid "Record separator is zero byte.\n"
-msgstr "Le séparateur d'enregistrements est l'octet zéro.\n"
+msgstr "Le séparateur d'enregistrements est l'octet zéro.\n"
 
-#: command.c:2716
+#: command.c:2778
 #, c-format
 msgid "Record separator is <newline>.\n"
-msgstr "Le séparateur d'enregistrement est <saut de ligne>.\n"
+msgstr "Le séparateur d'enregistrement est <saut de ligne>.\n"
 
-#: command.c:2718
+#: command.c:2780
 #, c-format
 msgid "Record separator is \"%s\".\n"
-msgstr "Le séparateur d'enregistrements est « %s ».\n"
+msgstr "Le séparateur d'enregistrements est « %s ».\n"
 
-#: command.c:2731
+#: command.c:2793
 #, c-format
 msgid "Table attributes are \"%s\".\n"
-msgstr "Les attributs de la table sont « %s ».\n"
+msgstr "Les attributs de la table sont « %s ».\n"
 
-#: command.c:2734
+#: command.c:2796
 #, c-format
 msgid "Table attributes unset.\n"
-msgstr "Les attributs de la table ne sont pas définis.\n"
+msgstr "Les attributs de la table ne sont pas définis.\n"
 
-#: command.c:2741
+#: command.c:2803
 #, c-format
 msgid "Title is \"%s\".\n"
-msgstr "Le titre est « %s ».\n"
+msgstr "Le titre est « %s ».\n"
 
-#: command.c:2743
+#: command.c:2805
 #, c-format
 msgid "Title is unset.\n"
-msgstr "Le titre n'est pas défini.\n"
+msgstr "Le titre n'est pas défini.\n"
 
-#: command.c:2750
+#: command.c:2812
 #, c-format
 msgid "Tuples only is on.\n"
-msgstr "L'affichage des tuples seuls est activé.\n"
+msgstr "L'affichage des tuples seuls est activé.\n"
 
-#: command.c:2752
+#: command.c:2814
 #, c-format
 msgid "Tuples only is off.\n"
-msgstr "L'affichage des tuples seuls est désactivé.\n"
+msgstr "L'affichage des tuples seuls est désactivé.\n"
 
-#: command.c:2758
+#: command.c:2820
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
-msgstr "Le style de bordure Unicode est « %s ».\n"
+msgstr "Le style de bordure Unicode est « %s ».\n"
 
-#: command.c:2764
+#: command.c:2826
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
-msgstr "Le style de ligne Unicode est « %s ».\n"
+msgstr "Le style de ligne Unicode est « %s ».\n"
 
-#: command.c:2770
+#: command.c:2832
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
-msgstr "Le style d'en-tête Unicode est « %s ».\n"
+msgstr "Le style d'en-tête Unicode est « %s ».\n"
 
-#: command.c:2930
+#: command.c:2992
 #, c-format
 msgid "\\!: failed\n"
-msgstr "\\! : échec\n"
+msgstr "\\! : échec\n"
 
-#: command.c:2950 common.c:567
+#: command.c:3012 common.c:572
 #, c-format
 msgid "\\watch cannot be used with an empty query\n"
-msgstr "\\watch ne peut pas être utilisé avec une requête vide\n"
+msgstr "\\watch ne peut pas être utilisé avec une requête vide\n"
 
-#: command.c:2971
+#: command.c:3033
 #, c-format
 msgid "Watch every %lds\t%s"
-msgstr "Vérifier chaque %lds\t%s"
+msgstr "Vérifier chaque %lds\t%s"
 
-#: command.c:3022 command.c:3029 common.c:467 common.c:474 common.c:1003
+#: command.c:3084 command.c:3091 common.c:472 common.c:479 common.c:1008
 #, c-format
 msgid ""
 "********* QUERY **********\n"
@@ -588,107 +588,107 @@
 "**************************\n"
 "\n"
 msgstr ""
-"******** REQUÊTE *********\n"
+"******** REQUÊTE *********\n"
 "%s\n"
 "**************************\n"
 "\n"
 
-#: common.c:306
+#: common.c:311
 #, c-format
 msgid "connection to server was lost\n"
-msgstr "la connexion au serveur a été perdue\n"
+msgstr "la connexion au serveur a été perdue\n"
 
-#: common.c:310
+#: common.c:315
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
-msgstr "La connexion au serveur a été perdue. Tentative de réinitialisation : "
+msgstr "La connexion au serveur a été perdue. Tentative de réinitialisation : "
 
-#: common.c:315
+#: common.c:320
 #, c-format
 msgid "Failed.\n"
-msgstr "Échec.\n"
+msgstr "Échec.\n"
 
-#: common.c:322
+#: common.c:327
 #, c-format
 msgid "Succeeded.\n"
-msgstr "Succès.\n"
+msgstr "Succès.\n"
 
-#: common.c:422 common.c:774 common.c:942
+#: common.c:427 common.c:779 common.c:947
 #, c-format
 msgid "unexpected PQresultStatus: %d\n"
 msgstr "PQresultStatus inattendu : %d\n"
 
-#: common.c:574
+#: common.c:579
 #, c-format
 msgid "\\watch cannot be used with COPY\n"
-msgstr "\\watch ne peut pas être utilisé avec COPY\n"
+msgstr "\\watch ne peut pas être utilisé avec COPY\n"
 
-#: common.c:579
+#: common.c:584
 #, c-format
 msgid "unexpected result status for \\watch\n"
-msgstr "statut résultat inattendu pour \\watch\n"
+msgstr "statut résultat inattendu pour \\watch\n"
 
-#: common.c:590 common.c:1161
+#: common.c:595 common.c:1169
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Temps : %.3f ms\n"
 
-#: common.c:608
+#: common.c:613
 #, c-format
 msgid "Asynchronous notification \"%s\" with payload \"%s\" received from server process with PID %d.\n"
 msgstr ""
-"Notification asynchrone « %s » reçue avec le contenu « %s » en provenance du\n"
+"Notification asynchrone « %s » reçue avec le contenu « %s » en provenance du\n"
 "processus serveur de PID %d.\n"
 
-#: common.c:611
+#: common.c:616
 #, c-format
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr ""
-"Notification asynchrone « %s » reçue en provenance du processus serveur de\n"
+"Notification asynchrone « %s » reçue en provenance du processus serveur de\n"
 "PID %d.\n"
 
-#: common.c:669
+#: common.c:674
 #, c-format
 msgid "no rows returned for \\gset\n"
-msgstr "aucune ligne retournée pour \\gset\n"
+msgstr "aucune ligne retournée pour \\gset\n"
 
-#: common.c:674
+#: common.c:679
 #, c-format
 msgid "more than one row returned for \\gset\n"
-msgstr "plus d'une ligne retournée pour \\gset\n"
+msgstr "plus d'une ligne retournée pour \\gset\n"
 
-#: common.c:700
+#: common.c:705
 #, c-format
 msgid "could not set variable \"%s\"\n"
-msgstr "n'a pas pu initialiser la variable « %s »\n"
+msgstr "n'a pas pu initialiser la variable « %s »\n"
 
-#: common.c:985
+#: common.c:990
 #, c-format
 msgid ""
 "***(Single step mode: verify command)*******************************************\n"
 "%s\n"
 "***(press return to proceed or enter x and return to cancel)********************\n"
 msgstr ""
-"***(Mode étape par étape: vérifiez la commande)*********************************\n"
+"***(Mode étape par étape: vérifiez la commande)*********************************\n"
 "%s\n"
-"***(appuyez sur entrée pour l'exécuter ou tapez x puis entrée pour annuler)***\n"
+"***(appuyez sur entrée pour l'exécuter ou tapez x puis entrée pour annuler)***\n"
 
-#: common.c:1036
+#: common.c:1043
 #, c-format
-msgid "The server (version %d.%d) does not support savepoints for ON_ERROR_ROLLBACK.\n"
+msgid "The server (version %s) does not support savepoints for ON_ERROR_ROLLBACK.\n"
 msgstr ""
-"Le serveur (version %d.%d) ne supporte pas les points de sauvegarde pour\n"
+"Le serveur (version %s) ne supporte pas les points de sauvegarde pour\n"
 "ON_ERROR_ROLLBACK.\n"
 
-#: common.c:1090
+#: common.c:1098
 #, c-format
 msgid "STATEMENT:  %s\n"
 msgstr "INSTRUCTION :  %s\n"
 
-#: common.c:1133
+#: common.c:1141
 #, c-format
 msgid "unexpected transaction status (%d)\n"
-msgstr "état de la transaction inattendu (%d)\n"
+msgstr "état de la transaction inattendu (%d)\n"
 
 #: copy.c:98
 #, c-format
@@ -698,27 +698,27 @@
 #: copy.c:253
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
-msgstr "\\copy : erreur d'analyse sur « %s »\n"
+msgstr "\\copy : erreur d'analyse sur « %s »\n"
 
 #: copy.c:255
 #, c-format
 msgid "\\copy: parse error at end of line\n"
-msgstr "\\copy : erreur d'analyse à la fin de la ligne\n"
+msgstr "\\copy : erreur d'analyse à la fin de la ligne\n"
 
 #: copy.c:328
 #, c-format
 msgid "could not execute command \"%s\": %s\n"
-msgstr "n'a pas pu exécuter la commande « %s » : %s\n"
+msgstr "n'a pas pu exécuter la commande « %s » : %s\n"
 
 #: copy.c:344
 #, c-format
 msgid "could not stat file \"%s\": %s\n"
-msgstr "n'a pas pu tester le fichier « %s » : %s\n"
+msgstr "n'a pas pu tester le fichier « %s » : %s\n"
 
 #: copy.c:348
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
-msgstr "%s : ne peut pas copier à partir de/vers un répertoire\n"
+msgstr "%s : ne peut pas copier à partir de/vers un répertoire\n"
 
 #: copy.c:385
 #, c-format
@@ -728,1036 +728,1046 @@
 #: copy.c:451 copy.c:462
 #, c-format
 msgid "could not write COPY data: %s\n"
-msgstr "n'a pas pu écrire les données du COPY : %s\n"
+msgstr "n'a pas pu écrire les données du COPY : %s\n"
 
 #: copy.c:469
 #, c-format
 msgid "COPY data transfer failed: %s"
-msgstr "Échec du transfert de données COPY : %s"
+msgstr "Échec du transfert de données COPY : %s"
 
 #: copy.c:530
 msgid "canceled by user"
-msgstr "annulé par l'utilisateur"
+msgstr "annulé par l'utilisateur"
 
 #: copy.c:541
 msgid ""
 "Enter data to be copied followed by a newline.\n"
-"End with a backslash and a period on a line by itself."
+"End with a backslash and a period on a line by itself, or an EOF signal."
 msgstr ""
-"Saisissez les données à copier suivies d'un saut de ligne.\n"
-"Terminez avec un antislash et un point seuls sur une ligne."
+"Saisissez les données à copier suivies d'un saut de ligne.\n"
+"Terminez avec un antislash et un point seuls sur une ligne, ou un signal EOF."
 
 #: copy.c:670
 msgid "aborted because of read failure"
-msgstr "annulé du fait d'une erreur de lecture"
+msgstr "annulé du fait d'une erreur de lecture"
 
-#: copy.c:694
+#: copy.c:704
 msgid "trying to exit copy mode"
 msgstr "tente de sortir du mode copy"
 
-#: describe.c:71 describe.c:264 describe.c:496 describe.c:626 describe.c:769
-#: describe.c:886 describe.c:956 describe.c:2928 describe.c:3133
-#: describe.c:3223 describe.c:3468 describe.c:3605 describe.c:3834
-#: describe.c:3906 describe.c:3917 describe.c:3976 describe.c:4384
-#: describe.c:4464
+#: describe.c:71 describe.c:270 describe.c:502 describe.c:632 describe.c:775
+#: describe.c:895 describe.c:965 describe.c:2937 describe.c:3142
+#: describe.c:3232 describe.c:3480 describe.c:3620 describe.c:3852
+#: describe.c:3927 describe.c:3938 describe.c:4000 describe.c:4420
+#: describe.c:4503
 msgid "Schema"
-msgstr "Schéma"
+msgstr "Schéma"
 
-#: describe.c:72 describe.c:156 describe.c:164 describe.c:265 describe.c:497
-#: describe.c:627 describe.c:688 describe.c:770 describe.c:957 describe.c:2929
-#: describe.c:3055 describe.c:3134 describe.c:3224 describe.c:3303
-#: describe.c:3469 describe.c:3533 describe.c:3606 describe.c:3835
-#: describe.c:3907 describe.c:3918 describe.c:3977 describe.c:4166
-#: describe.c:4247 describe.c:4462
+#: describe.c:72 describe.c:159 describe.c:167 describe.c:271 describe.c:503
+#: describe.c:633 describe.c:694 describe.c:776 describe.c:966 describe.c:2938
+#: describe.c:3064 describe.c:3143 describe.c:3233 describe.c:3312
+#: describe.c:3481 describe.c:3545 describe.c:3621 describe.c:3853
+#: describe.c:3928 describe.c:3939 describe.c:4001 describe.c:4193
+#: describe.c:4277 describe.c:4501
 msgid "Name"
 msgstr "Nom"
 
-#: describe.c:73 describe.c:277 describe.c:323 describe.c:340
+#: describe.c:73 describe.c:283 describe.c:329 describe.c:346
 msgid "Result data type"
-msgstr "Type de données du résultat"
+msgstr "Type de données du résultat"
 
-#: describe.c:81 describe.c:94 describe.c:98 describe.c:278 describe.c:324
-#: describe.c:341
+#: describe.c:81 describe.c:94 describe.c:98 describe.c:284 describe.c:330
+#: describe.c:347
 msgid "Argument data types"
-msgstr "Type de données des paramètres"
+msgstr "Type de données des paramètres"
 
-#: describe.c:105 describe.c:187 describe.c:370 describe.c:545 describe.c:642
-#: describe.c:713 describe.c:959 describe.c:1572 describe.c:2729
-#: describe.c:2962 describe.c:3086 describe.c:3160 describe.c:3233
-#: describe.c:3316 describe.c:3384 describe.c:3476 describe.c:3542
-#: describe.c:3607 describe.c:3743 describe.c:3783 describe.c:3851
-#: describe.c:3910 describe.c:3919 describe.c:3978 describe.c:4192
-#: describe.c:4269 describe.c:4398 describe.c:4465 large_obj.c:289
+#: describe.c:105 describe.c:190 describe.c:376 describe.c:551 describe.c:648
+#: describe.c:719 describe.c:968 describe.c:1581 describe.c:2738
+#: describe.c:2971 describe.c:3095 describe.c:3169 describe.c:3242
+#: describe.c:3325 describe.c:3393 describe.c:3488 describe.c:3554
+#: describe.c:3622 describe.c:3758 describe.c:3798 describe.c:3869
+#: describe.c:3931 describe.c:3940 describe.c:4002 describe.c:4219
+#: describe.c:4299 describe.c:4434 describe.c:4504 large_obj.c:289
 #: large_obj.c:299
 msgid "Description"
 msgstr "Description"
 
 #: describe.c:123
 msgid "List of aggregate functions"
-msgstr "Liste des fonctions d'agrégation"
+msgstr "Liste des fonctions d'agrégation"
 
-#: describe.c:144
+#: describe.c:146
 #, 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"
+msgid "The server (version %s) does not support tablespaces.\n"
+msgstr "Le serveur (version %s) ne supporte pas les tablespaces.\n"
 
-#: describe.c:157 describe.c:165 describe.c:367 describe.c:535 describe.c:689
-#: describe.c:885 describe.c:2938 describe.c:3059 describe.c:3305
-#: describe.c:3534 describe.c:4167 describe.c:4248 large_obj.c:288
+#: describe.c:160 describe.c:168 describe.c:373 describe.c:541 describe.c:695
+#: describe.c:894 describe.c:2947 describe.c:3068 describe.c:3314
+#: describe.c:3546 describe.c:4194 describe.c:4278 large_obj.c:288
 msgid "Owner"
-msgstr "Propriétaire"
+msgstr "Propriétaire"
 
-#: describe.c:158 describe.c:166
+#: describe.c:161 describe.c:169
 msgid "Location"
 msgstr "Emplacement"
 
-#: describe.c:177 describe.c:2543
+#: describe.c:180 describe.c:2552
 msgid "Options"
 msgstr "Options"
 
-#: describe.c:182 describe.c:508 describe.c:705 describe.c:2954 describe.c:2958
+#: describe.c:185 describe.c:514 describe.c:711 describe.c:2963 describe.c:2967
 msgid "Size"
 msgstr "Taille"
 
-#: describe.c:204
+#: describe.c:207
 msgid "List of tablespaces"
 msgstr "Liste des tablespaces"
 
-#: describe.c:241
+#: describe.c:244
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df prends seulement [antwS+] comme options\n"
 
-#: describe.c:247
+#: describe.c:252
 #, 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"
+msgid "\\df does not take a \"w\" option with server version %s\n"
+msgstr "\\df ne prend pas l'option « w » pour un serveur en version %s.\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:280 describe.c:326 describe.c:343
+#: describe.c:286 describe.c:332 describe.c:349
 msgid "agg"
 msgstr "agg"
 
-#: describe.c:281
+#: describe.c:287
 msgid "window"
 msgstr "window"
 
-#: describe.c:282 describe.c:327 describe.c:344 describe.c:1093
+#: describe.c:288 describe.c:333 describe.c:350 describe.c:1102
 msgid "trigger"
 msgstr "trigger"
 
-#: describe.c:283 describe.c:328 describe.c:345
+#: describe.c:289 describe.c:334 describe.c:351
 msgid "normal"
 msgstr "normal"
 
-#: describe.c:284 describe.c:329 describe.c:346 describe.c:776 describe.c:895
-#: describe.c:1541 describe.c:2937 describe.c:3135 describe.c:4266
+#: describe.c:290 describe.c:335 describe.c:352 describe.c:782 describe.c:904
+#: describe.c:1550 describe.c:2946 describe.c:3144 describe.c:4296
 msgid "Type"
 msgstr "Type"
 
-#: describe.c:360
+#: describe.c:366
 msgid "definer"
 msgstr "definer"
 
-#: describe.c:361
+#: describe.c:367
 msgid "invoker"
 msgstr "invoker"
 
-#: describe.c:362
+#: describe.c:368
 msgid "Security"
-msgstr "Sécurité"
+msgstr "Sécurité"
 
-#: describe.c:363
+#: describe.c:369
 msgid "immutable"
 msgstr "immutable"
 
-#: describe.c:364
+#: describe.c:370
 msgid "stable"
 msgstr "stable"
 
-#: describe.c:365
+#: describe.c:371
 msgid "volatile"
 msgstr "volatile"
 
-#: describe.c:366
+#: describe.c:372
 msgid "Volatility"
-msgstr "Volatibilité"
+msgstr "Volatibilité"
 
-#: describe.c:368
+#: describe.c:374
 msgid "Language"
 msgstr "Langage"
 
-#: describe.c:369
+#: describe.c:375
 msgid "Source code"
 msgstr "Code source"
 
-#: describe.c:467
+#: describe.c:473
 msgid "List of functions"
 msgstr "Liste des fonctions"
 
-#: describe.c:507
+#: describe.c:513
 msgid "Internal name"
 msgstr "Nom interne"
 
-#: describe.c:529
+#: describe.c:535
 msgid "Elements"
-msgstr "Éléments"
+msgstr "Éléments"
 
-#: describe.c:585
+#: describe.c:591
 msgid "List of data types"
-msgstr "Liste des types de données"
+msgstr "Liste des types de données"
 
-#: describe.c:628
+#: describe.c:634
 msgid "Left arg type"
 msgstr "Type de l'arg. gauche"
 
-#: describe.c:629
+#: describe.c:635
 msgid "Right arg type"
 msgstr "Type de l'arg. droit"
 
-#: describe.c:630
+#: describe.c:636
 msgid "Result type"
-msgstr "Type du résultat"
+msgstr "Type du résultat"
 
-#: describe.c:635 describe.c:3375 describe.c:3742
+#: describe.c:641 describe.c:3384 describe.c:3757
 msgid "Function"
 msgstr "Fonction"
 
-#: describe.c:660
+#: describe.c:666
 msgid "List of operators"
-msgstr "Liste des opérateurs"
+msgstr "Liste des opérateurs"
 
-#: describe.c:690
+#: describe.c:696
 msgid "Encoding"
 msgstr "Encodage"
 
-#: describe.c:695 describe.c:3470
+#: describe.c:701 describe.c:3482
 msgid "Collate"
 msgstr "Collationnement"
 
-#: describe.c:696 describe.c:3471
+#: describe.c:702 describe.c:3483
 msgid "Ctype"
 msgstr "Type caract."
 
-#: describe.c:709
+#: describe.c:715
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:731
+#: describe.c:737
 msgid "List of databases"
-msgstr "Liste des bases de données"
+msgstr "Liste des bases de données"
 
-#: describe.c:771 describe.c:888 describe.c:2930
+#: describe.c:777 describe.c:897 describe.c:2939
 msgid "table"
 msgstr "table"
 
-#: describe.c:772 describe.c:2931
+#: describe.c:778 describe.c:2940
 msgid "view"
 msgstr "vue"
 
-#: describe.c:773 describe.c:2932
+#: describe.c:779 describe.c:2941
 msgid "materialized view"
-msgstr "vue matérialisée"
+msgstr "vue matérialisée"
 
-#: describe.c:774 describe.c:890 describe.c:2934
+#: describe.c:780 describe.c:899 describe.c:2943
 msgid "sequence"
-msgstr "séquence"
+msgstr "séquence"
 
-#: describe.c:775 describe.c:2936
+#: describe.c:781 describe.c:2945
 msgid "foreign table"
 msgstr "table distante"
 
-#: describe.c:787
+#: describe.c:793
 msgid "Column privileges"
-msgstr "Droits d'accès à la colonne"
+msgstr "Droits d'accès à la colonne"
 
-#: describe.c:818
+#: describe.c:824
 msgid "Policies"
 msgstr "Politiques"
 
-#: describe.c:844 describe.c:4609 describe.c:4613
+#: describe.c:850 describe.c:4651 describe.c:4655
 msgid "Access privileges"
-msgstr "Droits d'accès"
+msgstr "Droits d'accès"
 
-#: describe.c:873
+#: describe.c:881
 #, 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"
+msgid "The server (version %s) does not support altering default privileges.\n"
+msgstr "Le serveur (version %s) ne supporte pas la modification des droits par défaut.\n"
 
-#: describe.c:892
+#: describe.c:901
 msgid "function"
 msgstr "fonction"
 
-#: describe.c:894
+#: describe.c:903
 msgid "type"
 msgstr "type"
 
-#: describe.c:918
+#: describe.c:927
 msgid "Default access privileges"
-msgstr "Droits d'accès par défaut"
+msgstr "Droits d'accès par défaut"
 
-#: describe.c:958
+#: describe.c:967
 msgid "Object"
 msgstr "Objet"
 
-#: describe.c:972
+#: describe.c:981
 msgid "table constraint"
 msgstr "contrainte de table"
 
-#: describe.c:994
+#: describe.c:1003
 msgid "domain constraint"
 msgstr "contrainte de domaine"
 
-#: describe.c:1022
+#: describe.c:1031
 msgid "operator class"
-msgstr "classe d'opérateur"
+msgstr "classe d'opérateur"
 
-#: describe.c:1051
+#: describe.c:1060
 msgid "operator family"
-msgstr "famille d'opérateur"
+msgstr "famille d'opérateur"
 
-#: describe.c:1073
+#: describe.c:1082
 msgid "rule"
-msgstr "règle"
+msgstr "règle"
 
-#: describe.c:1115
+#: describe.c:1124
 msgid "Object descriptions"
 msgstr "Descriptions des objets"
 
-#: describe.c:1169
+#: describe.c:1178
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
-msgstr "Aucune relation nommée « %s » n'a été trouvée.\n"
+msgstr "Aucune relation nommée « %s » n'a été trouvée.\n"
 
-#: describe.c:1379
+#: describe.c:1388
 #, 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"
+msgstr "Aucune relation avec l'OID « %s » n'a été trouvée.\n"
 
-#: describe.c:1485
+#: describe.c:1494
 #, c-format
 msgid "Unlogged table \"%s.%s\""
-msgstr "Table non tracée « %s.%s »"
+msgstr "Table non tracée « %s.%s »"
 
-#: describe.c:1488
+#: describe.c:1497
 #, c-format
 msgid "Table \"%s.%s\""
-msgstr "Table « %s.%s »"
+msgstr "Table « %s.%s »"
 
-#: describe.c:1492
+#: describe.c:1501
 #, c-format
 msgid "View \"%s.%s\""
-msgstr "Vue « %s.%s »"
+msgstr "Vue « %s.%s »"
 
-#: describe.c:1497
+#: describe.c:1506
 #, c-format
 msgid "Unlogged materialized view \"%s.%s\""
-msgstr "Vue matérialisée non journalisée « %s.%s »"
+msgstr "Vue matérialisée non journalisée « %s.%s »"
 
-#: describe.c:1500
+#: describe.c:1509
 #, c-format
 msgid "Materialized view \"%s.%s\""
-msgstr "Vue matérialisée « %s.%s »"
+msgstr "Vue matérialisée « %s.%s »"
 
-#: describe.c:1504
+#: describe.c:1513
 #, c-format
 msgid "Sequence \"%s.%s\""
-msgstr "Séquence « %s.%s »"
+msgstr "Séquence « %s.%s »"
 
-#: describe.c:1509
+#: describe.c:1518
 #, c-format
 msgid "Unlogged index \"%s.%s\""
-msgstr "Index non tracé « %s.%s »"
+msgstr "Index non tracé « %s.%s »"
 
-#: describe.c:1512
+#: describe.c:1521
 #, c-format
 msgid "Index \"%s.%s\""
-msgstr "Index « %s.%s »"
+msgstr "Index « %s.%s »"
 
-#: describe.c:1517
+#: describe.c:1526
 #, c-format
 msgid "Special relation \"%s.%s\""
-msgstr "Relation spéciale « %s.%s »"
+msgstr "Relation spéciale « %s.%s »"
 
-#: describe.c:1521
+#: describe.c:1530
 #, c-format
 msgid "TOAST table \"%s.%s\""
-msgstr "Table TOAST « %s.%s »"
+msgstr "Table TOAST « %s.%s »"
 
-#: describe.c:1525
+#: describe.c:1534
 #, c-format
 msgid "Composite type \"%s.%s\""
-msgstr "Type composé « %s.%s »"
+msgstr "Type composé « %s.%s »"
 
-#: describe.c:1529
+#: describe.c:1538
 #, c-format
 msgid "Foreign table \"%s.%s\""
-msgstr "Table distante « %s.%s »"
+msgstr "Table distante « %s.%s »"
 
-#: describe.c:1540
+#: describe.c:1549
 msgid "Column"
 msgstr "Colonne"
 
-#: describe.c:1549
+#: describe.c:1558
 msgid "Modifiers"
 msgstr "Modificateurs"
 
-#: describe.c:1554
+#: describe.c:1563
 msgid "Value"
 msgstr "Valeur"
 
-#: describe.c:1557
+#: describe.c:1566
 msgid "Definition"
-msgstr "Définition"
+msgstr "Définition"
 
-#: describe.c:1560 describe.c:4187 describe.c:4268 describe.c:4336
-#: describe.c:4397
+#: describe.c:1569 describe.c:4214 describe.c:4298 describe.c:4369
+#: describe.c:4433
 msgid "FDW Options"
 msgstr "Options FDW"
 
-#: describe.c:1564
+#: describe.c:1573
 msgid "Storage"
 msgstr "Stockage"
 
-#: describe.c:1567
+#: describe.c:1576
 msgid "Stats target"
 msgstr "Cible de statistiques"
 
-#: describe.c:1617
+#: describe.c:1626
 #, c-format
 msgid "collate %s"
 msgstr "collationnement %s"
 
-#: describe.c:1625
+#: describe.c:1634
 msgid "not null"
 msgstr "non NULL"
 
 #. translator: default values of column definitions
-#: describe.c:1635
+#: describe.c:1644
 #, c-format
 msgid "default %s"
-msgstr "Par défaut, %s"
+msgstr "Par défaut, %s"
 
-#: describe.c:1750
+#: describe.c:1759
 msgid "primary key, "
-msgstr "clé primaire, "
+msgstr "clé primaire, "
 
-#: describe.c:1752
+#: describe.c:1761
 msgid "unique, "
 msgstr "unique, "
 
-#: describe.c:1758
+#: describe.c:1767
 #, c-format
 msgid "for table \"%s.%s\""
-msgstr "pour la table « %s.%s »"
+msgstr "pour la table « %s.%s »"
 
-#: describe.c:1762
+#: describe.c:1771
 #, c-format
 msgid ", predicate (%s)"
-msgstr ", prédicat (%s)"
+msgstr ", prédicat (%s)"
 
-#: describe.c:1765
+#: describe.c:1774
 msgid ", clustered"
 msgstr ", en cluster"
 
-#: describe.c:1768
+#: describe.c:1777
 msgid ", invalid"
 msgstr ", invalide"
 
-#: describe.c:1771
+#: describe.c:1780
 msgid ", deferrable"
-msgstr ", déferrable"
+msgstr ", déferrable"
 
-#: describe.c:1774
+#: describe.c:1783
 msgid ", initially deferred"
-msgstr ", initialement déferré"
+msgstr ", initialement déferré"
 
-#: describe.c:1777
+#: describe.c:1786
 msgid ", replica identity"
-msgstr ", identité réplica"
+msgstr ", identité réplica"
 
-#: describe.c:1812
+#: describe.c:1821
 #, c-format
 msgid "Owned by: %s"
-msgstr "Propriétaire : %s"
+msgstr "Propriétaire : %s"
 
-#: describe.c:1872
+#: describe.c:1881
 msgid "Indexes:"
 msgstr "Index :"
 
-#: describe.c:1956
+#: describe.c:1965
 msgid "Check constraints:"
-msgstr "Contraintes de vérification :"
+msgstr "Contraintes de vérification :"
 
-#: describe.c:1987
+#: describe.c:1996
 msgid "Foreign-key constraints:"
-msgstr "Contraintes de clés étrangères :"
+msgstr "Contraintes de clés étrangères :"
 
-#: describe.c:2018
+#: describe.c:2027
 msgid "Referenced by:"
-msgstr "Référencé par :"
+msgstr "Référencé par :"
 
-#: describe.c:2063
+#: describe.c:2072
 msgid "Policies:"
 msgstr "Politiques :"
 
-#: describe.c:2066
+#: describe.c:2075
 msgid "Policies (forced row security enabled):"
-msgstr "Politiques (mode sécurité de ligne activé en forcé) :"
+msgstr "Politiques (mode sécurité de ligne activé en forcé) :"
 
-#: describe.c:2069
+#: describe.c:2078
 msgid "Policies (row security enabled): (none)"
-msgstr "Politiques (mode sécurité de ligne activé) : (aucune)"
+msgstr "Politiques (mode sécurité de ligne activé) : (aucune)"
 
-#: describe.c:2072
+#: describe.c:2081
 msgid "Policies (forced row security enabled): (none)"
-msgstr "Politiques (mode sécurité de ligne activé en forcé) : (aucune)"
+msgstr "Politiques (mode sécurité de ligne activé en forcé) : (aucune)"
 
-#: describe.c:2075
+#: describe.c:2084
 msgid "Policies (row security disabled):"
-msgstr "Politiques (mode sécurité de ligne désactivé) :"
+msgstr "Politiques (mode sécurité de ligne désactivé) :"
 
-#: describe.c:2175 describe.c:2225
+#: describe.c:2184 describe.c:2234
 msgid "Rules:"
-msgstr "Règles :"
+msgstr "Règles :"
 
-#: describe.c:2178
+#: describe.c:2187
 msgid "Disabled rules:"
-msgstr "Règles désactivées :"
+msgstr "Règles désactivées :"
 
-#: describe.c:2181
+#: describe.c:2190
 msgid "Rules firing always:"
-msgstr "Règles toujous activées :"
+msgstr "Règles toujous activées :"
 
-#: describe.c:2184
+#: describe.c:2193
 msgid "Rules firing on replica only:"
-msgstr "Règles activées uniquement sur le réplica :"
+msgstr "Règles activées uniquement sur le réplica :"
 
-#: describe.c:2208
+#: describe.c:2217
 msgid "View definition:"
-msgstr "Définition de la vue :"
+msgstr "Définition de la vue :"
 
-#: describe.c:2343
+#: describe.c:2352
 msgid "Triggers:"
 msgstr "Triggers :"
 
-#: describe.c:2347
+#: describe.c:2356
 msgid "Disabled user triggers:"
-msgstr "Triggers utilisateurs désactivés :"
+msgstr "Triggers utilisateurs désactivés :"
 
-#: describe.c:2349
+#: describe.c:2358
 msgid "Disabled triggers:"
-msgstr "Triggers désactivés :"
+msgstr "Triggers désactivés :"
 
-#: describe.c:2352
+#: describe.c:2361
 msgid "Disabled internal triggers:"
-msgstr "Triggers internes désactivés :"
+msgstr "Triggers internes désactivés :"
 
-#: describe.c:2355
+#: describe.c:2364
 msgid "Triggers firing always:"
-msgstr "Triggers toujours activés :"
+msgstr "Triggers toujours activés :"
 
-#: describe.c:2358
+#: describe.c:2367
 msgid "Triggers firing on replica only:"
-msgstr "Triggers activés uniquement sur le réplica :"
+msgstr "Triggers activés uniquement sur le réplica :"
+
+#: describe.c:2424
+#, c-format
+msgid "Server: %s"
+msgstr "Serveur : %s"
+
+#: describe.c:2432
+#, c-format
+msgid "FDW Options: (%s)"
+msgstr "Options FDW : (%s)"
 
-#: describe.c:2437
+#: describe.c:2446
 msgid "Inherits"
-msgstr "Hérite de"
+msgstr "Hérite de"
 
-#: describe.c:2476
+#: describe.c:2485
 #, 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:2483
+#: describe.c:2492
 msgid "Child tables"
 msgstr "Tables enfant :"
 
-#: describe.c:2505
+#: describe.c:2514
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Table de type : %s"
 
-#: describe.c:2519
+#: describe.c:2528
 msgid "Replica Identity"
-msgstr "Identité de réplicat"
+msgstr "Identité de réplicat"
 
-#: describe.c:2532
+#: describe.c:2541
 msgid "Has OIDs: yes"
 msgstr "Contient des OID : oui"
 
-#: describe.c:2620
+#: describe.c:2629
 #, c-format
 msgid "Tablespace: \"%s\""
-msgstr "Tablespace : « %s »"
+msgstr "Tablespace : « %s »"
 
 #. translator: before this string there's an index description like
 #. '"foo_pkey" PRIMARY KEY, btree (a)'
-#: describe.c:2632
+#: describe.c:2641
 #, c-format
 msgid ", tablespace \"%s\""
-msgstr ", tablespace « %s »"
+msgstr ", tablespace « %s »"
 
-#: describe.c:2722
+#: describe.c:2731
 msgid "List of roles"
-msgstr "Liste des rôles"
+msgstr "Liste des rôles"
 
-#: describe.c:2724
+#: describe.c:2733
 msgid "Role name"
-msgstr "Nom du rôle"
+msgstr "Nom du rôle"
 
-#: describe.c:2725
+#: describe.c:2734
 msgid "Attributes"
 msgstr "Attributs"
 
-#: describe.c:2726
+#: describe.c:2735
 msgid "Member of"
 msgstr "Membre de"
 
-#: describe.c:2737
+#: describe.c:2746
 msgid "Superuser"
 msgstr "Superutilisateur"
 
-#: describe.c:2740
+#: describe.c:2749
 msgid "No inheritance"
-msgstr "Pas d'héritage"
+msgstr "Pas d'héritage"
 
-#: describe.c:2743
+#: describe.c:2752
 msgid "Create role"
-msgstr "Créer un rôle"
+msgstr "Créer un rôle"
 
-#: describe.c:2746
+#: describe.c:2755
 msgid "Create DB"
-msgstr "Créer une base"
+msgstr "Créer une base"
 
-#: describe.c:2749
+#: describe.c:2758
 msgid "Cannot login"
 msgstr "Ne peut pas se connecter"
 
-#: describe.c:2753
+#: describe.c:2762
 msgid "Replication"
-msgstr "Réplication"
+msgstr "Réplication"
 
-#: describe.c:2757
+#: describe.c:2766
 msgid "Bypass RLS"
 msgstr "Contournement RLS"
 
-#: describe.c:2766
+#: describe.c:2775
 msgid "No connections"
 msgstr "Sans connexions"
 
-#: describe.c:2768
+#: describe.c:2777
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d connexion"
 msgstr[1] "%d connexions"
 
-#: describe.c:2778
+#: describe.c:2787
 msgid "Password valid until "
-msgstr "Mot de passe valide jusqu'à "
+msgstr "Mot de passe valide jusqu'à "
 
-#: describe.c:2834
+#: describe.c:2843
 msgid "Role"
-msgstr "Rôle"
+msgstr "Rôle"
 
-#: describe.c:2835
+#: describe.c:2844
 msgid "Database"
-msgstr "Base de données"
+msgstr "Base de données"
 
-#: describe.c:2836
+#: describe.c:2845
 msgid "Settings"
-msgstr "Réglages"
+msgstr "Réglages"
 
-#: describe.c:2846
+#: describe.c:2855
 #, 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"
+msgstr "Pas de supprot des paramètres rôle par base de données pour la version de ce serveur.\n"
 
-#: describe.c:2857
+#: describe.c:2866
 #, c-format
 msgid "No matching settings found.\n"
-msgstr "Aucun paramètre correspondant trouvé.\n"
+msgstr "Aucun paramètre correspondant trouvé.\n"
 
-#: describe.c:2859
+#: describe.c:2868
 #, c-format
 msgid "No settings found.\n"
-msgstr "Aucun paramètre trouvé.\n"
+msgstr "Aucun paramètre trouvé.\n"
 
-#: describe.c:2864
+#: describe.c:2873
 msgid "List of settings"
-msgstr "Liste des paramètres"
+msgstr "Liste des paramètres"
 
-#: describe.c:2933
+#: describe.c:2942
 msgid "index"
 msgstr "index"
 
-#: describe.c:2935
+#: describe.c:2944
 msgid "special"
-msgstr "spécial"
+msgstr "spécial"
 
-#: describe.c:2943 describe.c:4385
+#: describe.c:2952 describe.c:4421
 msgid "Table"
 msgstr "Table"
 
-#: describe.c:3019
+#: describe.c:3028
 #, c-format
 msgid "No matching relations found.\n"
-msgstr "Aucune relation correspondante trouvée.\n"
+msgstr "Aucune relation correspondante trouvée.\n"
 
-#: describe.c:3021
+#: describe.c:3030
 #, c-format
 msgid "No relations found.\n"
-msgstr "Aucune relation trouvée.\n"
+msgstr "Aucune relation trouvée.\n"
 
-#: describe.c:3026
+#: describe.c:3035
 msgid "List of relations"
 msgstr "Liste des relations"
 
-#: describe.c:3063
+#: describe.c:3072
 msgid "Trusted"
 msgstr "De confiance"
 
-#: describe.c:3071
+#: describe.c:3080
 msgid "Internal Language"
 msgstr "Langage interne"
 
-#: describe.c:3072
+#: describe.c:3081
 msgid "Call Handler"
 msgstr "Gestionnaire d'appel"
 
-#: describe.c:3073 describe.c:4174
+#: describe.c:3082 describe.c:4201
 msgid "Validator"
 msgstr "Validateur"
 
-#: describe.c:3076
+#: describe.c:3085
 msgid "Inline Handler"
 msgstr "Gestionnaire en ligne"
 
-#: describe.c:3104
+#: describe.c:3113
 msgid "List of languages"
 msgstr "Liste des langages"
 
-#: describe.c:3148
+#: describe.c:3157
 msgid "Modifier"
 msgstr "Modificateur"
 
-#: describe.c:3149
+#: describe.c:3158
 msgid "Check"
-msgstr "Vérification"
+msgstr "Vérification"
 
-#: describe.c:3191
+#: describe.c:3200
 msgid "List of domains"
 msgstr "Liste des domaines"
 
-#: describe.c:3225
+#: describe.c:3234
 msgid "Source"
 msgstr "Source"
 
-#: describe.c:3226
+#: describe.c:3235
 msgid "Destination"
 msgstr "Destination"
 
-#: describe.c:3227 describe.c:3376
+#: describe.c:3236 describe.c:3385
 msgid "no"
 msgstr "non"
 
-#: describe.c:3227 describe.c:3378
+#: describe.c:3236 describe.c:3387
 msgid "yes"
 msgstr "oui"
 
-#: describe.c:3228
+#: describe.c:3237
 msgid "Default?"
-msgstr "Par défaut ?"
+msgstr "Par défaut ?"
 
-#: describe.c:3265
+#: describe.c:3274
 msgid "List of conversions"
 msgstr "Liste des conversions"
 
-#: describe.c:3304
+#: describe.c:3313
 msgid "Event"
-msgstr "Événement"
+msgstr "Événement"
 
-#: describe.c:3306
+#: describe.c:3315
 msgid "enabled"
-msgstr "activé"
+msgstr "activé"
 
-#: describe.c:3307
+#: describe.c:3316
 msgid "replica"
-msgstr "réplicat"
+msgstr "réplicat"
 
-#: describe.c:3308
+#: describe.c:3317
 msgid "always"
 msgstr "toujours"
 
-#: describe.c:3309
+#: describe.c:3318
 msgid "disabled"
-msgstr "désactivé"
+msgstr "désactivé"
 
-#: describe.c:3310
+#: describe.c:3319
 msgid "Enabled"
-msgstr "Activé"
+msgstr "Activé"
 
-#: describe.c:3311
+#: describe.c:3320
 msgid "Procedure"
-msgstr "Procédure"
+msgstr "Procédure"
 
-#: describe.c:3312
+#: describe.c:3321
 msgid "Tags"
 msgstr "Tags"
 
-#: describe.c:3331
+#: describe.c:3340
 msgid "List of event triggers"
-msgstr "Liste des triggers sur évènement"
+msgstr "Liste des triggers sur évènement"
 
-#: describe.c:3373
+#: describe.c:3382
 msgid "Source type"
 msgstr "Type source"
 
-#: describe.c:3374
+#: describe.c:3383
 msgid "Target type"
 msgstr "Type cible"
 
-#: describe.c:3377
+#: describe.c:3386
 msgid "in assignment"
-msgstr "assigné"
+msgstr "assigné"
 
-#: describe.c:3379
+#: describe.c:3388
 msgid "Implicit?"
 msgstr "Implicite ?"
 
-#: describe.c:3430
+#: describe.c:3439
 msgid "List of casts"
 msgstr "Liste des conversions explicites"
 
-#: describe.c:3456
+#: describe.c:3467
 #, c-format
-msgid "The server (version %d.%d) does not support collations.\n"
-msgstr "Le serveur (version %d.%d) ne supporte pas les collationnements.\n"
+msgid "The server (version %s) does not support collations.\n"
+msgstr "Le serveur (version %s) ne supporte pas les collationnements.\n"
 
-#: describe.c:3506
+#: describe.c:3518
 msgid "List of collations"
 msgstr "Liste des collationnements"
 
-#: describe.c:3565
+#: describe.c:3577
 msgid "List of schemas"
-msgstr "Liste des schémas"
+msgstr "Liste des schémas"
 
-#: describe.c:3588 describe.c:3823 describe.c:3891 describe.c:3959
+#: describe.c:3602 describe.c:3840 describe.c:3911 describe.c:3982
 #, 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"
+msgid "The server (version %s) does not support full text search.\n"
+msgstr "Le serveur (version %s) ne supporte pas la recherche plein texte.\n"
 
-#: describe.c:3622
+#: describe.c:3637
 msgid "List of text search parsers"
 msgstr "Liste des analyseurs de la recherche de texte"
 
-#: describe.c:3665
+#: describe.c:3680
 #, 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"
+msgstr "Aucun analyseur de la recherche de texte nommé « %s » n'a été trouvé.\n"
 
-#: describe.c:3740
+#: describe.c:3755
 msgid "Start parse"
-msgstr "Début de l'analyse"
+msgstr "Début de l'analyse"
 
-#: describe.c:3741
+#: describe.c:3756
 msgid "Method"
-msgstr "Méthode"
+msgstr "Méthode"
 
-#: describe.c:3745
+#: describe.c:3760
 msgid "Get next token"
 msgstr "Obtenir le prochain jeton"
 
-#: describe.c:3747
+#: describe.c:3762
 msgid "End parse"
 msgstr "Fin de l'analyse"
 
-#: describe.c:3749
+#: describe.c:3764
 msgid "Get headline"
-msgstr "Obtenir l'en-tête"
+msgstr "Obtenir l'en-tête"
 
-#: describe.c:3751
+#: describe.c:3766
 msgid "Get token types"
 msgstr "Obtenir les types de jeton"
 
-#: describe.c:3761
+#: describe.c:3776
 #, c-format
 msgid "Text search parser \"%s.%s\""
-msgstr "Analyseur « %s.%s » de la recherche de texte"
+msgstr "Analyseur « %s.%s » de la recherche de texte"
 
-#: describe.c:3763
+#: describe.c:3778
 #, c-format
 msgid "Text search parser \"%s\""
-msgstr "Analyseur « %s » de la recherche de texte"
+msgstr "Analyseur « %s » de la recherche de texte"
 
-#: describe.c:3782
+#: describe.c:3797
 msgid "Token name"
 msgstr "Nom du jeton"
 
-#: describe.c:3793
+#: describe.c:3808
 #, c-format
 msgid "Token types for parser \"%s.%s\""
-msgstr "Types de jeton pour l'analyseur « %s.%s »"
+msgstr "Types de jeton pour l'analyseur « %s.%s »"
 
-#: describe.c:3795
+#: describe.c:3810
 #, c-format
 msgid "Token types for parser \"%s\""
-msgstr "Types de jeton pour l'analyseur « %s »"
+msgstr "Types de jeton pour l'analyseur « %s »"
 
-#: describe.c:3845
+#: describe.c:3863
 msgid "Template"
-msgstr "Modèle"
+msgstr "Modèle"
 
-#: describe.c:3846
+#: describe.c:3864
 msgid "Init options"
 msgstr "Options d'initialisation :"
 
-#: describe.c:3868
+#: describe.c:3886
 msgid "List of text search dictionaries"
 msgstr "Liste des dictionnaires de la recherche de texte"
 
-#: describe.c:3908
+#: describe.c:3929
 msgid "Init"
 msgstr "Initialisation"
 
-#: describe.c:3909
+#: describe.c:3930
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:3936
+#: describe.c:3957
 msgid "List of text search templates"
-msgstr "Liste des modèles de la recherche de texte"
+msgstr "Liste des modèles de la recherche de texte"
 
-#: describe.c:3993
+#: describe.c:4017
 msgid "List of text search configurations"
 msgstr "Liste des configurations de la recherche de texte"
 
-#: describe.c:4037
+#: describe.c:4061
 #, 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"
+msgstr "Aucune configuration de la recherche de texte nommée « %s » n'a été trouvée.\n"
 
-#: describe.c:4103
+#: describe.c:4127
 msgid "Token"
 msgstr "Jeton"
 
-#: describe.c:4104
+#: describe.c:4128
 msgid "Dictionaries"
 msgstr "Dictionnaires"
 
-#: describe.c:4115
+#: describe.c:4139
 #, c-format
 msgid "Text search configuration \"%s.%s\""
-msgstr "Configuration « %s.%s » de la recherche de texte"
+msgstr "Configuration « %s.%s » de la recherche de texte"
 
-#: describe.c:4118
+#: describe.c:4142
 #, c-format
 msgid "Text search configuration \"%s\""
-msgstr "Configuration « %s » de la recherche de texte"
+msgstr "Configuration « %s » de la recherche de texte"
 
-#: describe.c:4122
+#: describe.c:4146
 #, c-format
 msgid ""
 "\n"
 "Parser: \"%s.%s\""
 msgstr ""
 "\n"
-"Analyseur : « %s.%s »"
+"Analyseur : « %s.%s »"
 
-#: describe.c:4125
+#: describe.c:4149
 #, c-format
 msgid ""
 "\n"
 "Parser: \"%s\""
 msgstr ""
 "\n"
-"Analyseur : « %s »"
+"Analyseur : « %s »"
 
-#: describe.c:4157
+#: describe.c:4183
 #, 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"
+msgid "The server (version %s) does not support foreign-data wrappers.\n"
+msgstr "Le serveur (version %s) ne supporte pas les wrappers de données distantes.\n"
 
-#: describe.c:4171
+#: describe.c:4198
 msgid "Handler"
 msgstr "Gestionnaire"
 
-#: describe.c:4214
+#: describe.c:4241
 msgid "List of foreign-data wrappers"
-msgstr "Liste des wrappers de données distantes"
+msgstr "Liste des wrappers de données distantes"
 
-#: describe.c:4237
+#: describe.c:4266
 #, 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"
+msgid "The server (version %s) does not support foreign servers.\n"
+msgstr "Le serveur (version %s) ne supporte pas les serveurs distants.\n"
 
-#: describe.c:4249
+#: describe.c:4279
 msgid "Foreign-data wrapper"
-msgstr "Wrapper des données distantes"
+msgstr "Wrapper des données distantes"
 
-#: describe.c:4267 describe.c:4463
+#: describe.c:4297 describe.c:4502
 msgid "Version"
 msgstr "Version"
 
-#: describe.c:4293
+#: describe.c:4323
 msgid "List of foreign servers"
 msgstr "Liste des serveurs distants"
 
-#: describe.c:4316
+#: describe.c:4348
 #, 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"
+msgid "The server (version %s) does not support user mappings.\n"
+msgstr "Le serveur (version %s) ne supporte pas les correspondances d'utilisateurs.\n"
 
-#: describe.c:4325 describe.c:4386
+#: describe.c:4358 describe.c:4422
 msgid "Server"
 msgstr "Serveur"
 
-#: describe.c:4326
+#: describe.c:4359
 msgid "User name"
 msgstr "Nom de l'utilisateur"
 
-#: describe.c:4351
+#: describe.c:4384
 msgid "List of user mappings"
 msgstr "Liste des correspondances utilisateurs"
 
-#: describe.c:4374
+#: describe.c:4409
 #, 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"
+msgid "The server (version %s) does not support foreign tables.\n"
+msgstr "Le serveur (version %s) ne supporte pas les tables distantes.\n"
 
-#: describe.c:4426
+#: describe.c:4462
 msgid "List of foreign tables"
 msgstr "Liste des tables distantes"
 
-#: describe.c:4449 describe.c:4503
+#: describe.c:4487 describe.c:4544
 #, 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"
+msgid "The server (version %s) does not support extensions.\n"
+msgstr "Le serveur (version %s) ne supporte pas les extensions.\n"
 
-#: describe.c:4480
+#: describe.c:4519
 msgid "List of installed extensions"
-msgstr "Liste des extensions installées"
+msgstr "Liste des extensions installées"
 
-#: describe.c:4530
+#: describe.c:4572
 #, c-format
 msgid "Did not find any extension named \"%s\".\n"
-msgstr "N'a trouvé aucune extension nommée « %s ».\n"
+msgstr "N'a trouvé aucune extension nommée « %s ».\n"
 
-#: describe.c:4533
+#: describe.c:4575
 #, c-format
 msgid "Did not find any extensions.\n"
-msgstr "N'a trouvé aucune extension.\n"
+msgstr "N'a trouvé aucune extension.\n"
 
-#: describe.c:4577
+#: describe.c:4619
 msgid "Object Description"
 msgstr "Description d'un objet"
 
-#: describe.c:4586
+#: describe.c:4628
 #, c-format
 msgid "Objects in extension \"%s\""
-msgstr "Objets dans l'extension « %s »"
+msgstr "Objets dans l'extension « %s »"
 
 #: help.c:63
 #, c-format
@@ -1790,34 +1800,34 @@
 #: help.c:74
 #, c-format
 msgid "General options:\n"
-msgstr "Options générales :\n"
+msgstr "Options générales :\n"
 
 #: help.c:79
 #, 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"
+"                  exécute une commande unique (SQL ou interne), puis quitte\n"
 
 #: help.c:80
 #, c-format
 msgid "  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
 msgstr ""
 "  -d, --dbname=NOM_BASE\n"
-"                  indique le nom de la base de données à laquelle se\n"
-"                  connecter (par défaut : « %s »)\n"
+"                  indique le nom de la base de données à laquelle se\n"
+"                  connecter (par défaut : « %s »)\n"
 
 #: help.c:81
 #, 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"
+"                  exécute les commandes du fichier, puis quitte\n"
 
 #: help.c:82
 #, c-format
 msgid "  -l, --list               list available databases, then exit\n"
-msgstr "  -l, --list      affiche les bases de données disponibles, puis quitte\n"
+msgstr "  -l, --list      affiche les bases de données disponibles, puis quitte\n"
 
 #: help.c:83
 #, c-format
@@ -1838,7 +1848,7 @@
 #: help.c:87
 #, 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"
+msgstr "  -X, --no-psqlrc ne lit pas le fichier de démarrage (~/.psqlrc)\n"
 
 #: help.c:88
 #, c-format
@@ -1846,8 +1856,8 @@
 "  -1 (\"one\"), --single-transaction\n"
 "                           execute as a single transaction (if non-interactive)\n"
 msgstr ""
-"  -1 (« un »), --single-transaction\n"
-"                  exécute dans une transaction unique (si non intéractif)\n"
+"  -1 (« un »), --single-transaction\n"
+"                  exécute dans une transaction unique (si non intéractif)\n"
 
 #: help.c:90
 #, c-format
@@ -1857,12 +1867,12 @@
 #: help.c:91
 #, c-format
 msgid "      --help=commands      list backslash commands, then exit\n"
-msgstr "      --help=commandes     liste les méta-commandes, puis quitte\n"
+msgstr "      --help=commandes     liste les méta-commandes, puis quitte\n"
 
 #: help.c:92
 #, c-format
 msgid "      --help=variables     list special variables, then exit\n"
-msgstr "      --help=variables     liste les variables spéciales, puis quitte\n"
+msgstr "      --help=variables     liste les variables spéciales, puis quitte\n"
 
 #: help.c:94
 #, c-format
@@ -1871,7 +1881,7 @@
 "Input and output options:\n"
 msgstr ""
 "\n"
-"Options d'entrée/sortie :\n"
+"Options d'entrée/sortie :\n"
 
 #: help.c:95
 #, c-format
@@ -1881,21 +1891,21 @@
 #: help.c:96
 #, c-format
 msgid "  -b, --echo-errors        echo failed commands\n"
-msgstr "  -b, --echo-errors        affiche les commandes échouées\n"
+msgstr "  -b, --echo-errors        affiche les commandes échouées\n"
 
 #: help.c:97
 #, 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"
+"                  affiche les commandes envoyées au serveur\n"
 
 #: help.c:98
 #, 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"
+"                  affiche les requêtes engendrées par les commandes internes\n"
 
 #: help.c:99
 #, c-format
@@ -1909,7 +1919,7 @@
 msgid "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
 "  -n, --no-readline\n"
-"                  désactive l'édition avancée de la ligne de commande\n"
+"                  désactive l'édition avancée de la ligne de commande\n"
 "                  (readline)\n"
 
 #: help.c:101
@@ -1917,23 +1927,23 @@
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr ""
 "  -o, --output=FICHIER\n"
-"                  écrit les résultats des requêtes dans un fichier (ou\n"
+"                  écrit les résultats des requêtes dans un fichier (ou\n"
 "                  |tube)\n"
 
 #: help.c:102
 #, 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"
+"  -q, --quiet     s'exécute silencieusement (pas de messages, uniquement le\n"
+"                  résultat des requêtes)\n"
 
 #: help.c:103
 #, c-format
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr ""
 "  -s, --single-step\n"
-"                  active le mode étape par étape (confirmation pour chaque\n"
-"                  requête)\n"
+"                  active le mode étape par étape (confirmation pour chaque\n"
+"                  requête)\n"
 
 #: help.c:104
 #, c-format
@@ -1956,7 +1966,7 @@
 #, 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"
+"  -A, --no-align  active le mode d'affichage non aligné des tables (-P\n"
 "                  format=unaligned)\n"
 
 #: help.c:108
@@ -1966,8 +1976,8 @@
 "                           field separator for unaligned output (default: \"%s\")\n"
 msgstr ""
 "  -F, --field-separator=CHAINE\n"
-"                  séparateur de champs pour un affichage non aligné\n"
-"                  (par défaut : « %s »)\n"
+"                  séparateur de champs pour un affichage non aligné\n"
+"                  (par défaut : « %s »)\n"
 
 #: help.c:111
 #, c-format
@@ -1979,7 +1989,7 @@
 msgid "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset command)\n"
 msgstr ""
 "  -P, --pset=VAR[=ARG]\n"
-"                  initialise l'option d'impression VAR à ARG (voir la\n"
+"                  initialise l'option d'impression VAR à ARG (voir la\n"
 "                  commande \\pset)\n"
 
 #: help.c:113
@@ -1989,8 +1999,8 @@
 "                           record separator for unaligned output (default: newline)\n"
 msgstr ""
 "  -R, --record-separator=CHAINE\n"
-"                  séparateur d'enregistrements pour un affichage non aligné\n"
-"                  (par défaut : saut de ligne)\n"
+"                  séparateur d'enregistrements pour un affichage non aligné\n"
+"                  (par défaut : saut de ligne)\n"
 
 #: help.c:115
 #, c-format
@@ -2010,7 +2020,7 @@
 #: help.c:117
 #, c-format
 msgid "  -x, --expanded           turn on expanded table output\n"
-msgstr "  -x, --expanded  active l'affichage étendu des tables (-P expanded)\n"
+msgstr "  -x, --expanded  active l'affichage étendu des tables (-P expanded)\n"
 
 #: help.c:118
 #, c-format
@@ -2019,8 +2029,8 @@
 "                           set field separator for unaligned output to zero byte\n"
 msgstr ""
 "  -z, --field-separator-zero\n"
-"                  initialise le séparateur de champs pour un affichage non\n"
-"                  aligné à l'octet zéro\n"
+"                  initialise le séparateur de champs pour un affichage non\n"
+"                  aligné à l'octet zéro\n"
 
 #: help.c:120
 #, c-format
@@ -2029,8 +2039,8 @@
 "                           set record separator for unaligned output to zero byte\n"
 msgstr ""
 "  -0, --record-separator-zero\n"
-"                  initialise le séparateur d'enregistrements pour un affichage\n"
-"                  non aligné à l'octet zéro\n"
+"                  initialise le séparateur d'enregistrements pour un affichage\n"
+"                  non aligné à l'octet zéro\n"
 
 #: help.c:123
 #, c-format
@@ -2045,8 +2055,8 @@
 #, 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"
+"  -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:127
 msgid "local socket"
@@ -2056,16 +2066,16 @@
 #, 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"
+"  -p, --port=PORT port du serveur de la base de données (par défaut :\n"
+"                  « %s »)\n"
 
 #: help.c:136
 #, c-format
 msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
 msgstr ""
 "  -U, --username=NOM\n"
-"                  nom d'utilisateur de la base de données (par défaut :\n"
-"                  « %s »)\n"
+"                  nom d'utilisateur de la base de données (par défaut :\n"
+"                  « %s »)\n"
 
 #: help.c:137
 #, c-format
@@ -2091,20 +2101,20 @@
 "\n"
 msgstr ""
 "\n"
-"Pour en savoir davantage, saisissez « \\? » (pour les commandes internes) ou\n"
-"« \\help » (pour les commandes SQL) dans psql, ou consultez la section psql\n"
+"Pour en savoir davantage, saisissez « \\? » (pour les commandes internes) ou\n"
+"« \\help » (pour les commandes SQL) dans psql, ou consultez la section psql\n"
 "de la documentation de PostgreSQL.\n"
 "\n"
 
 #: help.c:143
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Rapportez les bogues à <pgsql-bugs@postgresql.org>.\n"
+msgstr "Rapportez les bogues à <pgsql-bugs@postgresql.org>.\n"
 
 #: help.c:166
 #, c-format
 msgid "General\n"
-msgstr "Général\n"
+msgstr "Général\n"
 
 #: help.c:167
 #, c-format
@@ -2117,13 +2127,13 @@
 #, 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"
+"  \\g [FICHIER] ou ;    envoie le tampon de requêtes au serveur (et les\n"
+"                       résultats au fichier ou |tube)\n"
 
 #: help.c:169
 #, c-format
 msgid "  \\gset [PREFIX]         execute query and store results in psql variables\n"
-msgstr "  \\gset [PRÉFIXE]    exécute la requête et stocke les résultats dans des variables psql\n"
+msgstr "  \\gset [PRÉFIXE]    exécute la requête et stocke les résultats dans des variables psql\n"
 
 #: help.c:170
 #, c-format
@@ -2133,7 +2143,7 @@
 #: help.c:171
 #, c-format
 msgid "  \\watch [SEC]           execute query every SEC seconds\n"
-msgstr "  \\watch [SEC]           exécute la requête toutes les SEC secondes\n"
+msgstr "  \\watch [SEC]           exécute la requête toutes les SEC secondes\n"
 
 #: help.c:174
 #, c-format
@@ -2143,7 +2153,7 @@
 #: help.c:176
 #, c-format
 msgid "  \\? [commands]          show help on backslash commands\n"
-msgstr "  \\? [commandes]         affiche l'aide sur les métacommandes\n"
+msgstr "  \\? [commandes]         affiche l'aide sur les métacommandes\n"
 
 #: help.c:177
 #, c-format
@@ -2153,43 +2163,43 @@
 #: help.c:178
 #, c-format
 msgid "  \\? variables           show help on special variables\n"
-msgstr "  \\? variables           affiche l'aide sur les variables spéciales\n"
+msgstr "  \\? variables           affiche l'aide sur les variables spéciales\n"
 
 #: help.c:179
 #, 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"
+"  \\h [NOM]             aide-mémoire pour les commandes SQL, * pour toutes\n"
 "                       les commandes\n"
 
 #: help.c:182
 #, c-format
 msgid "Query Buffer\n"
-msgstr "Tampon de requête\n"
+msgstr "Tampon de requête\n"
 
 #: help.c:183
 #, c-format
 msgid "  \\e [FILE] [LINE]       edit the query buffer (or file) with external editor\n"
 msgstr ""
-"  \\e [FICHIER] [LIGNE] édite le tampon de requête ou le fichier avec un\n"
-"                        éditeur externe\n"
+"  \\e [FICHIER] [LIGNE] édite le tampon de requête ou le fichier avec un\n"
+"                        éditeur externe\n"
 
 #: help.c:184
 #, c-format
 msgid "  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
 msgstr ""
-"  \\ef [FONCTION [LIGNE]] é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:185
 #, c-format
 msgid "  \\p                     show the contents of the query buffer\n"
-msgstr "  \\p                   affiche le contenu du tampon de requête\n"
+msgstr "  \\p                   affiche le contenu du tampon de requête\n"
 
 #: help.c:186
 #, c-format
 msgid "  \\r                     reset (clear) the query buffer\n"
-msgstr "  \\r                   efface le tampon de requêtes\n"
+msgstr "  \\r                   efface le tampon de requêtes\n"
 
 #: help.c:188
 #, c-format
@@ -2202,51 +2212,51 @@
 #, 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"
+"  \\w [FICHIER]         écrit le contenu du tampon de requêtes dans un\n"
 "                       fichier\n"
 
 #: help.c:193
 #, c-format
 msgid "Input/Output\n"
-msgstr "Entrée/Sortie\n"
+msgstr "Entrée/Sortie\n"
 
 #: help.c:194
 #, 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"
+"  \\copy ...            exécute SQL COPY avec le flux de données dirigé vers\n"
+"                       l'hôte client\n"
 
 #: help.c:195
 #, c-format
 msgid "  \\echo [STRING]         write string to standard output\n"
-msgstr "  \\echo [TEXTE]        écrit un texte sur la sortie standard\n"
+msgstr "  \\echo [TEXTE]        écrit un texte sur la sortie standard\n"
 
 #: help.c:196
 #, c-format
 msgid "  \\i FILE                execute commands from file\n"
-msgstr "  \\i FICHIER           exécute les commandes du fichier\n"
+msgstr "  \\i FICHIER           exécute les commandes du fichier\n"
 
 #: help.c:197
 #, c-format
 msgid "  \\ir FILE               as \\i, but relative to location of current script\n"
 msgstr ""
-"  \\ir FICHIER         identique à \\i, mais relatif à l'emplacement du script\n"
+"  \\ir FICHIER         identique à \\i, mais relatif à l'emplacement du script\n"
 "                       ou un |tube\n"
 
 #: help.c:198
 #, 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"
+"  \\o [FICHIER]         envoie les résultats de la requête vers un fichier\n"
 "                       ou un |tube\n"
 
 #: help.c:199
 #, 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"
+"  \\qecho [TEXTE]       écrit un texte sur la sortie des résultats des\n"
+"                       requêtes (voir \\o)\n"
 
 #: help.c:202
 #, c-format
@@ -2256,76 +2266,76 @@
 #: help.c:203
 #, c-format
 msgid "  (options: S = show system objects, + = additional detail)\n"
-msgstr "  (options : S = affiche les objets systèmes, + = informations supplémentaires)\n"
+msgstr "  (options : S = affiche les objets systèmes, + = informations supplémentaires)\n"
 
 #: help.c:204
 #, c-format
 msgid "  \\d[S+]                 list tables, views, and sequences\n"
-msgstr "  \\d[S+]               affiche la liste des tables, vues et séquences\n"
+msgstr "  \\d[S+]               affiche la liste des tables, vues et séquences\n"
 
 #: help.c:205
 #, 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"
+"                       de la séquence ou de l'index\n"
 
 #: help.c:206
 #, c-format
 msgid "  \\da[S]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[S] [MODÈLE]      affiche les aggrégats\n"
+msgstr "  \\da[S] [MODÈLE]      affiche les aggrégats\n"
 
 #: help.c:207
 #, c-format
 msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
-msgstr "  \\db[+] [MODÈLE]      affiche la liste des tablespaces\n"
+msgstr "  \\db[+] [MODÈLE]      affiche la liste des tablespaces\n"
 
 #: help.c:208
 #, c-format
 msgid "  \\dc[S+] [PATTERN]      list conversions\n"
-msgstr "  \\dc[S+] [MODÈLE]     affiche la liste des conversions\n"
+msgstr "  \\dc[S+] [MODÈLE]     affiche la liste des conversions\n"
 
 #: help.c:209
 #, c-format
 msgid "  \\dC[+]  [PATTERN]      list casts\n"
-msgstr "  \\dC[+] [MODÈLE]      affiche la liste des transtypages\n"
+msgstr "  \\dC[+] [MODÈLE]      affiche la liste des transtypages\n"
 
 #: help.c:210
 #, c-format
 msgid "  \\dd[S]  [PATTERN]      show object descriptions not displayed elsewhere\n"
 msgstr ""
-"  \\dd[S] [MODÈLE]      affiche les commentaires des objets dont le commentaire\n"
-"                        n'est affiché nul part ailleurs\n"
+"  \\dd[S] [MODÈLE]      affiche les commentaires des objets dont le commentaire\n"
+"                        n'est affiché nul part ailleurs\n"
 
 #: help.c:211
 #, c-format
 msgid "  \\ddp    [PATTERN]      list default privileges\n"
-msgstr "  \\ddp   [MODÈLE]      affiche les droits par défaut\n"
+msgstr "  \\ddp   [MODÈLE]      affiche les droits par défaut\n"
 
 #: help.c:212
 #, c-format
 msgid "  \\dD[S+] [PATTERN]      list domains\n"
-msgstr "  \\dD[S+] [MODÈLE]     affiche la liste des domaines\n"
+msgstr "  \\dD[S+] [MODÈLE]     affiche la liste des domaines\n"
 
 #: help.c:213
 #, c-format
 msgid "  \\det[+] [PATTERN]      list foreign tables\n"
-msgstr "  \\det[+] [MODÈLE]     affiche la liste des tables distantes\n"
+msgstr "  \\det[+] [MODÈLE]     affiche la liste des tables distantes\n"
 
 #: help.c:214
 #, c-format
 msgid "  \\des[+] [PATTERN]      list foreign servers\n"
-msgstr "  \\des[+] [MODÈLE]     affiche la liste des serveurs distants\n"
+msgstr "  \\des[+] [MODÈLE]     affiche la liste des serveurs distants\n"
 
 #: help.c:215
 #, c-format
 msgid "  \\deu[+] [PATTERN]      list user mappings\n"
-msgstr "  \\deu[+] [MODÈLE]     affiche la liste des correspondances utilisateurs\n"
+msgstr "  \\deu[+] [MODÈLE]     affiche la liste des correspondances utilisateurs\n"
 
 #: help.c:216
 #, c-format
 msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dew[+] [MODÈLE]     affiche la liste des wrappers de données distantes\n"
+msgstr "  \\dew[+] [MODÈLE]     affiche la liste des wrappers de données distantes\n"
 
 #: help.c:217
 #, c-format
@@ -2338,138 +2348,138 @@
 #, c-format
 msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
 msgstr ""
-"  \\dF[+] [MODÈLE]      affiche la liste des configurations de la recherche\n"
+"  \\dF[+] [MODÈLE]      affiche la liste des configurations de la recherche\n"
 "                        plein texte\n"
 
 #: help.c:219
 #, c-format
 msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
 msgstr ""
-"  \\dFd[+] [MODÈLE]     affiche la liste des dictionnaires de la recherche de\n"
+"  \\dFd[+] [MODÈLE]     affiche la liste des dictionnaires de la recherche de\n"
 "                        texte\n"
 
 #: help.c:220
 #, c-format
 msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
 msgstr ""
-"  \\dFp[+] [MODÈLE]        affiche la liste des analyseurs de la recherche de\n"
+"  \\dFp[+] [MODÈLE]        affiche la liste des analyseurs de la recherche de\n"
 "                       texte\n"
 
 #: help.c:221
 #, 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"
+"  \\dFt[+] [MODÈLE]     affiche la liste des modèles de la recherche de\n"
 "                        texte\n"
 
 #: help.c:222
 #, c-format
 msgid "  \\dg[+]  [PATTERN]      list roles\n"
-msgstr "  \\dg[+]  [MODÈLE]     affiche la liste des rôles\n"
+msgstr "  \\dg[+]  [MODÈLE]     affiche la liste des rôles\n"
 
 #: help.c:223
 #, c-format
 msgid "  \\di[S+] [PATTERN]      list indexes\n"
-msgstr "  \\di[S+] [MODÈLE]     affiche la liste des index\n"
+msgstr "  \\di[S+] [MODÈLE]     affiche la liste des index\n"
 
 #: help.c:224
 #, c-format
 msgid "  \\dl                    list large objects, same as \\lo_list\n"
 msgstr ""
-"  \\dl                  affiche la liste des « Large Objects », identique à\n"
+"  \\dl                  affiche la liste des « Large Objects », identique à\n"
 "                        \\lo_list\n"
 
 #: help.c:225
 #, c-format
 msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
-msgstr "  \\dL[S+] [MODÈLE]     affiche la liste des langages procéduraux\n"
+msgstr "  \\dL[S+] [MODÈLE]     affiche la liste des langages procéduraux\n"
 
 #: help.c:226
 #, c-format
 msgid "  \\dm[S+] [PATTERN]      list materialized views\n"
-msgstr "  \\dm[S+] [MODÈLE]     affiche la liste des vues matérialisées\n"
+msgstr "  \\dm[S+] [MODÈLE]     affiche la liste des vues matérialisées\n"
 
 #: help.c:227
 #, c-format
 msgid "  \\dn[S+] [PATTERN]      list schemas\n"
-msgstr "  \\dn[S+]  [MODÈLE]    affiche la liste des schémas\n"
+msgstr "  \\dn[S+]  [MODÈLE]    affiche la liste des schémas\n"
 
 #: help.c:228
 #, c-format
 msgid "  \\do[S]  [PATTERN]      list operators\n"
-msgstr "  \\do[S]  [MODÈLE]     affiche la liste des opérateurs\n"
+msgstr "  \\do[S]  [MODÈLE]     affiche la liste des opérateurs\n"
 
 #: help.c:229
 #, c-format
 msgid "  \\dO[S+] [PATTERN]      list collations\n"
-msgstr "  \\dO[S+] [MODÈLE]     affiche la liste des collationnements\n"
+msgstr "  \\dO[S+] [MODÈLE]     affiche la liste des collationnements\n"
 
 #: help.c:230
 #, 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"
+"  \\dp     [MODÈLE]     affiche la liste des droits d'accès aux tables,\n"
+"                        vues, séquences\n"
 
 #: help.c:231
 #, 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"
+msgstr "  \\drds [MODEL1 [MODEL2]] liste la configuration utilisateur par base de                           données\n"
 
 #: help.c:232
 #, c-format
 msgid "  \\ds[S+] [PATTERN]      list sequences\n"
-msgstr "  \\ds[S+] [MODÈLE]     affiche la liste des séquences\n"
+msgstr "  \\ds[S+] [MODÈLE]     affiche la liste des séquences\n"
 
 #: help.c:233
 #, c-format
 msgid "  \\dt[S+] [PATTERN]      list tables\n"
-msgstr "  \\dt[S+] [MODÈLE]     affiche la liste des tables\n"
+msgstr "  \\dt[S+] [MODÈLE]     affiche la liste des tables\n"
 
 #: help.c:234
 #, c-format
 msgid "  \\dT[S+] [PATTERN]      list data types\n"
-msgstr "  \\dT[S+] [MODÈLE]     affiche la liste des types de données\n"
+msgstr "  \\dT[S+] [MODÈLE]     affiche la liste des types de données\n"
 
 #: help.c:235
 #, c-format
 msgid "  \\du[+]  [PATTERN]      list roles\n"
-msgstr "  \\du[+]  [MODÈLE]     affiche la liste des rôles (utilisateurs)\n"
+msgstr "  \\du[+]  [MODÈLE]     affiche la liste des rôles (utilisateurs)\n"
 
 #: help.c:236
 #, c-format
 msgid "  \\dv[S+] [PATTERN]      list views\n"
-msgstr "  \\dv[S+] [MODÈLE]     affiche la liste des vues\n"
+msgstr "  \\dv[S+] [MODÈLE]     affiche la liste des vues\n"
 
 #: help.c:237
 #, c-format
 msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
-msgstr "  \\dE[S+] [MODÈLE]     affiche la liste des tables distantes\n"
+msgstr "  \\dE[S+] [MODÈLE]     affiche la liste des tables distantes\n"
 
 #: help.c:238
 #, c-format
 msgid "  \\dx[+]  [PATTERN]      list extensions\n"
-msgstr "  \\dx[+] [MODÈLE]      affiche la liste des extensions\n"
+msgstr "  \\dx[+] [MODÈLE]      affiche la liste des extensions\n"
 
 #: help.c:239
 #, c-format
 msgid "  \\dy     [PATTERN]      list event triggers\n"
-msgstr "  \\dy   [MODÈLE]      affiche les triggers sur évènement\n"
+msgstr "  \\dy   [MODÈLE]      affiche les triggers sur évènement\n"
 
 #: help.c:240
 #, c-format
 msgid "  \\l[+]   [PATTERN]      list databases\n"
-msgstr "  \\l[+] [MODÈLE]     affiche la liste des bases de données\n"
+msgstr "  \\l[+] [MODÈLE]     affiche la liste des bases de données\n"
 
 #: help.c:241
 #, c-format
 msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
-msgstr "  \\sf [FONCTION]       édite la définition d'une fonction\n"
+msgstr "  \\sf [FONCTION]       édite la définition d'une fonction\n"
 
 #: help.c:242
 #, c-format
 msgid "  \\z      [PATTERN]      same as \\dp\n"
-msgstr "  \\z      [MODÈLE]     identique à \\dp\n"
+msgstr "  \\z      [MODÈLE]     identique à \\dp\n"
 
 #: help.c:245
 #, c-format
@@ -2480,22 +2490,22 @@
 #, 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"
+"  \\a                   bascule entre les modes de sortie alignée et non\n"
+"                        alignée\n"
 
 #: help.c:247
 #, 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"
+"  \\C [CHAÎNE]          initialise le titre d'une table, ou le désactive en\n"
 "                        l'absence d'argument\n"
 
 #: help.c:248
 #, 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"
+"  \\f [CHAÎNE]          affiche ou initialise le séparateur de champ pour\n"
+"                        une sortie non alignée des requêtes\n"
 
 #: help.c:249
 #, c-format
@@ -2510,7 +2520,7 @@
 "                         numericlocale|recordsep|recordsep_zero|tuples_only|title|tableattr|pager|\n"
 "                         unicode_border_linestyle|unicode_column_linestyle|unicode_header_linestyle})\n"
 msgstr ""
-"  \\pset [NOM [VALEUR]]   règle l'affichage de la table\n"
+"  \\pset [NOM [VALEUR]]   règle l'affichage de la table\n"
 "                         (NOM := {format|border|expanded|fieldsep|fieldsep_zero|footer|null|\n"
 "                         numericlocale|recordsep|recordsep_zero|tuples_only|title|tableattr|pager|\n"
 "                         unicode_border_linestyle|unicode_column_linestyle|unicode_header_linestyle})\n"
@@ -2524,13 +2534,13 @@
 #, 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"
+"  \\T [CHAÃŽNE]          initialise les attributs HTML de la balise <table>,\n"
 "                        ou l'annule en l'absence d'argument\n"
 
 #: help.c:258
 #, c-format
 msgid "  \\x [on|off|auto]       toggle expanded output (currently %s)\n"
-msgstr "  \\x [on|off|auto]     bascule l'affichage étendu (actuellement %s)\n"
+msgstr "  \\x [on|off|auto]     bascule l'affichage étendu (actuellement %s)\n"
 
 #: help.c:262
 #, c-format
@@ -2544,8 +2554,8 @@
 "                         connect to new database (currently \"%s\")\n"
 msgstr ""
 "  \\c[onnect] {[NOM_BASE|- UTILISATEUR|- HOTE|- PORT|-] | conninfo}\n"
-"                        se connecte à une autre base de données\n"
-"                        (actuellement « %s »)\n"
+"                        se connecte à une autre base de données\n"
+"                        (actuellement « %s »)\n"
 
 #: help.c:268
 #, c-format
@@ -2554,7 +2564,7 @@
 "                         connect to new database (currently no connection)\n"
 msgstr ""
 "  \\c[onnect] {[NOM_BASE|- UTILISATEUR|- HOTE|- PORT|-] | conninfo}\n"
-"                        se connecte à une nouvelle base de données\n"
+"                        se connecte à une nouvelle base de données\n"
 "                        (aucune connexion actuellement)\n"
 
 #: help.c:270
@@ -2567,7 +2577,7 @@
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr ""
 "  \\password [UTILISATEUR]\n"
-"                        modifie de façon sécurisé le mot de passe d'un\n"
+"                        modifie de façon sécurisé le mot de passe d'un\n"
 "                        utilisateur\n"
 
 #: help.c:272
@@ -2578,30 +2588,30 @@
 #: help.c:275
 #, c-format
 msgid "Operating System\n"
-msgstr "Système d'exploitation\n"
+msgstr "Système d'exploitation\n"
 
 #: help.c:276
 #, c-format
 msgid "  \\cd [DIR]              change the current working directory\n"
-msgstr "  \\cd [RÉPERTOIRE]     change de répertoire de travail\n"
+msgstr "  \\cd [RÉPERTOIRE]     change de répertoire de travail\n"
 
 #: help.c:277
 #, c-format
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
-msgstr "  \\setenv NOM [VALEUR] (dés)initialise une variable d'environnement\n"
+msgstr "  \\setenv NOM [VALEUR] (dés)initialise une variable d'environnement\n"
 
 #: help.c:278
 #, 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"
+"  \\timing [on|off]     bascule l'activation du chronométrage des commandes\n"
 "                        (actuellement %s)\n"
 
 #: help.c:280
 #, 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"
+"  \\! [COMMANDE]        exécute la commande dans un shell ou exécute un\n"
 "                        shell interactif\n"
 
 #: help.c:283
@@ -2613,7 +2623,7 @@
 #, 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"
+"  \\prompt [TEXTE] NOM  demande à l'utilisateur de configurer la variable\n"
 "                        interne\n"
 
 #: help.c:285
@@ -2621,17 +2631,17 @@
 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"
+"                        toutes en l'absence de paramètre\n"
 
 #: help.c:286
 #, c-format
 msgid "  \\unset NAME            unset (delete) internal variable\n"
-msgstr "  \\unset NOM           désactive (supprime) la variable interne\n"
+msgstr "  \\unset NOM           désactive (supprime) la variable interne\n"
 
 #: help.c:289
 #, c-format
 msgid "Large Objects\n"
-msgstr "« Large objects »\n"
+msgstr "« Large objects »\n"
 
 #: help.c:290
 #, c-format
@@ -2645,7 +2655,7 @@
 "  \\lo_import FICHIER [COMMENTAIRE]\n"
 "  \\lo_list\n"
 "  \\lo_unlink OIDLOB\n"
-"                        opérations sur les « Large Objects »\n"
+"                        opérations sur les « Large Objects »\n"
 
 #: help.c:311
 #, c-format
@@ -2653,7 +2663,7 @@
 "List of specially treated variables\n"
 "\n"
 msgstr ""
-"Liste des variables traitées spécialement\n"
+"Liste des variables traitées spécialement\n"
 "\n"
 
 #: help.c:313
@@ -2675,7 +2685,7 @@
 #: help.c:317
 #, c-format
 msgid "  AUTOCOMMIT         if set, successful SQL commands are automatically committed\n"
-msgstr "  AUTOCOMMIT         si activé, les commandes SQL réussies sont automatiquement validées\n"
+msgstr "  AUTOCOMMIT         si activé, les commandes SQL réussies sont automatiquement validées\n"
 
 #: help.c:318
 #, c-format
@@ -2683,13 +2693,13 @@
 "  COMP_KEYWORD_CASE  determines the case used to complete SQL key words\n"
 "                     [lower, upper, preserve-lower, preserve-upper]\n"
 msgstr ""
-"  COMP_KEYWORD_CASE  détermine la casse utilisée pour compléter les mots clés SQL\n"
+"  COMP_KEYWORD_CASE  détermine la casse utilisée pour compléter les mots clés SQL\n"
 "                     [lower, upper, preserve-lower, preserve-upper]\n"
 
 #: help.c:320
 #, c-format
 msgid "  DBNAME             the currently connected database name\n"
-msgstr "  DBNAME             le nom de base de données actuel\n"
+msgstr "  DBNAME             le nom de base de données actuel\n"
 
 #: help.c:321
 #, c-format
@@ -2697,7 +2707,7 @@
 "  ECHO               controls what input is written to standard output\n"
 "                     [all, errors, none, queries]\n"
 msgstr ""
-"  ECHO               contrôle ce qui est envoyé sur la sortie standard\n"
+"  ECHO               contrôle ce qui est envoyé sur la sortie standard\n"
 "                     [all, errors, none, queries]\n"
 
 #: help.c:323
@@ -2706,13 +2716,13 @@
 "  ECHO_HIDDEN        if set, display internal queries executed by backslash commands;\n"
 "                     if set to \"noexec\", just show without execution\n"
 msgstr ""
-"  ECHO_HIDDEN        si activé, affiche les requêtes internes exécutées par les méta-commandes ;\n"
-"                     si configuré à « noexec », affiche les requêtes mais ne les exécute pas\n"
+"  ECHO_HIDDEN        si activé, affiche les requêtes internes exécutées par les méta-commandes ;\n"
+"                     si configuré à « noexec », affiche les requêtes mais ne les exécute pas\n"
 
 #: help.c:325
 #, c-format
 msgid "  ENCODING           current client character set encoding\n"
-msgstr "  ENCODING           encodage du jeu de caractères client\n"
+msgstr "  ENCODING           encodage du jeu de caractères client\n"
 
 #: help.c:326
 #, c-format
@@ -2720,48 +2730,48 @@
 "  FETCH_COUNT        the number of result rows to fetch and display at a time\n"
 "                     (default: 0=unlimited)\n"
 msgstr ""
-"  FETCH_COUNT        le nombre de lignes résultats à récupérer et à afficher à la fois\n"
-"                     (par défaut 0 pour illimité)\n"
+"  FETCH_COUNT        le nombre de lignes résultats à récupérer et à afficher à la fois\n"
+"                     (par défaut 0 pour illimité)\n"
 
 #: help.c:328
 #, c-format
 msgid "  HISTCONTROL        controls command history [ignorespace, ignoredups, ignoreboth]\n"
-msgstr "  HISTCONTROL        contrôle l'historique des commandes [ignorespace, ignoredups, ignoreboth]\n"
+msgstr "  HISTCONTROL        contrôle l'historique des commandes [ignorespace, ignoredups, ignoreboth]\n"
 
 #: help.c:329
 #, c-format
 msgid "  HISTFILE           file name used to store the command history\n"
-msgstr "  HISTFILE           nom du fichier utilisé pour stocker l'historique des commandes\n"
+msgstr "  HISTFILE           nom du fichier utilisé pour stocker l'historique des commandes\n"
 
 #: help.c:330
 #, c-format
 msgid "  HISTSIZE           the number of commands to store in the command history\n"
-msgstr "  HISTSIZE           le nombre de commandes à stocker dans l'historique de commandes\n"
+msgstr "  HISTSIZE           le nombre de commandes à stocker dans l'historique de commandes\n"
 
 #: help.c:331
 #, c-format
 msgid "  HOST               the currently connected database server host\n"
-msgstr "  HOST               l'hôte de la base de données\n"
+msgstr "  HOST               l'hôte de la base de données\n"
 
 #: help.c:332
 #, c-format
 msgid "  IGNOREEOF          if unset, sending an EOF to interactive session terminates application\n"
-msgstr "  IGNOREEOF          si non configuré, envoyer un EOF à une session interactive fait quitter l'application\n"
+msgstr "  IGNOREEOF          si non configuré, envoyer un EOF à une session interactive fait quitter l'application\n"
 
 #: help.c:333
 #, c-format
 msgid "  LASTOID            value of the last affected OID\n"
-msgstr "  LASTOID            valeur du dernier OID affecté\n"
+msgstr "  LASTOID            valeur du dernier OID affecté\n"
 
 #: help.c:334
 #, c-format
 msgid "  ON_ERROR_ROLLBACK  if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
-msgstr "  ON_ERROR_ROLLBACK  si activé, une erreur n'arrête pas une transaction (utilise des savepoints implicites)\n"
+msgstr "  ON_ERROR_ROLLBACK  si activé, une erreur n'arrête pas une transaction (utilise des savepoints implicites)\n"
 
 #: help.c:335
 #, c-format
 msgid "  ON_ERROR_STOP      stop batch execution after error\n"
-msgstr "  ON_ERROR_STOP      arrête l'exécution d'un batch après une erreur\n"
+msgstr "  ON_ERROR_STOP      arrête l'exécution d'un batch après une erreur\n"
 
 #: help.c:336
 #, c-format
@@ -2771,42 +2781,42 @@
 #: help.c:337
 #, c-format
 msgid "  PROMPT1            specifies the standard psql prompt\n"
-msgstr "  PROMPT1            spécifie l'invite standard de psql\n"
+msgstr "  PROMPT1            spécifie l'invite standard de psql\n"
 
 #: help.c:338
 #, c-format
 msgid "  PROMPT2            specifies the prompt used when a statement continues from a previous line\n"
-msgstr "  PROMPT2            spécifie l'invite utilisé quand une requête continue après la ligne courante\n"
+msgstr "  PROMPT2            spécifie l'invite utilisé quand une requête continue après la ligne courante\n"
 
 #: help.c:339
 #, c-format
 msgid "  PROMPT3            specifies the prompt used during COPY ... FROM STDIN\n"
-msgstr "  PROMPT3            spécifie l'invite utilisée lors d'un COPY ... FROM STDIN\n"
+msgstr "  PROMPT3            spécifie l'invite utilisée lors d'un COPY ... FROM STDIN\n"
 
 #: help.c:340
 #, c-format
 msgid "  QUIET              run quietly (same as -q option)\n"
-msgstr "  QUIET              s'exécute en silence (identique à l'option -q)\n"
+msgstr "  QUIET              s'exécute en silence (identique à l'option -q)\n"
 
 #: help.c:341
 #, c-format
 msgid "  SINGLELINE         end of line terminates SQL command mode (same as -S option)\n"
-msgstr "  SINGLELINE         une fin de ligne termine le mode de commande SQL (identique à l'option -S)\n"
+msgstr "  SINGLELINE         une fin de ligne termine le mode de commande SQL (identique à l'option -S)\n"
 
 #: help.c:342
 #, c-format
 msgid "  SINGLESTEP         single-step mode (same as -s option)\n"
-msgstr "  SINGLESTEP         mode pas à pas (identique à l'option -s)\n"
+msgstr "  SINGLESTEP         mode pas à pas (identique à l'option -s)\n"
 
 #: help.c:343
 #, c-format
 msgid "  USER               the currently connected database user\n"
-msgstr "  USER               l'utilisateur actuellement connecté\n"
+msgstr "  USER               l'utilisateur actuellement connecté\n"
 
 #: help.c:344
 #, c-format
 msgid "  VERBOSITY          controls verbosity of error reports [default, verbose, terse]\n"
-msgstr "  VERBOSITY          contrôle la verbosité des rapports d'erreurs [default, verbose, terse]\n"
+msgstr "  VERBOSITY          contrôle la verbosité des rapports d'erreurs [default, verbose, terse]\n"
 
 #: help.c:346
 #, c-format
@@ -2815,7 +2825,7 @@
 "Display settings:\n"
 msgstr ""
 "\n"
-"Paramètres d'affichage :\n"
+"Paramètres d'affichage :\n"
 
 #: help.c:348
 #, c-format
@@ -2836,24 +2846,24 @@
 #: help.c:351
 #, c-format
 msgid "  columns            target width for the wrapped format\n"
-msgstr "  columns            largeur cible pour le format encadré\n"
+msgstr "  columns            largeur cible pour le format encadré\n"
 
 #: help.c:352
 #, c-format
 msgid "  expanded (or x)    expanded output [on, off, auto]\n"
-msgstr "  expanded (or x)    sortie étendue [on, off, auto]\n"
+msgstr "  expanded (or x)    sortie étendue [on, off, auto]\n"
 
 #: help.c:353
 #, c-format
 msgid "  fieldsep           field separator for unaligned output (default \"%s\")\n"
-msgstr "  fieldsep           champ séparateur pour l'affichage non aligné (par défaut « %s »)\n"
+msgstr "  fieldsep           champ séparateur pour l'affichage non aligné (par défaut « %s »)\n"
 
 #: help.c:354
 #, c-format
 msgid "  fieldsep_zero      set field separator for unaligned output to zero byte\n"
 msgstr ""
-"  fieldsep_zero      configure le séparateur de champ pour l'affichage non\\n\n"
-"                     aligné à l'octet zéro\n"
+"  fieldsep_zero      configure le séparateur de champ pour l'affichage non\\n\n"
+"                     aligné à l'octet zéro\n"
 
 #: help.c:355
 #, c-format
@@ -2863,7 +2873,7 @@
 #: help.c:356
 #, c-format
 msgid "  footer             enable or disable display of the table footer [on, off]\n"
-msgstr "  footer             active ou désactive l'affiche du bas de tableau [on, off]\n"
+msgstr "  footer             active ou désactive l'affiche du bas de tableau [on, off]\n"
 
 #: help.c:357
 #, c-format
@@ -2873,7 +2883,7 @@
 #: help.c:358
 #, c-format
 msgid "  null               set the string to be printed in place of a null value\n"
-msgstr "  null               configure la chaîne à afficher à la place d'une valeur NULL\n"
+msgstr "  null               configure la chaîne à afficher à la place d'une valeur NULL\n"
 
 #: help.c:359
 #, c-format
@@ -2881,25 +2891,25 @@
 "  numericlocale      enable or disable display of a locale-specific character to separate\n"
 "                     groups of digits [on, off]\n"
 msgstr ""
-"  numericlocale      active ou désactive l'affichage d'un caractère spécigique à la locale pour séparer\n"
+"  numericlocale      active ou désactive l'affichage d'un caractère spécigique à la locale pour séparer\n"
 "                     des groupes de chiffres [on, off]\n"
 
 #: help.c:361
 #, c-format
 msgid "  pager              control when an external pager is used [yes, no, always]\n"
-msgstr "  pager              contrôle quand un paginateur externe est utilisé [yes, no, always]\n"
+msgstr "  pager              contrôle quand un paginateur externe est utilisé [yes, no, always]\n"
 
 #: help.c:362
 #, c-format
 msgid "  recordsep          record (line) separator for unaligned output\n"
-msgstr "  recordsep          enregistre le séparateur de ligne pour les affichages non alignés\n"
+msgstr "  recordsep          enregistre le séparateur de ligne pour les affichages non alignés\n"
 
 #: help.c:363
 #, c-format
 msgid "  recordsep_zero     set record separator for unaligned output to zero byte\n"
 msgstr ""
-"  recordsep_zero     initialise le séparateur d'enregistrements pour un affichage\n"
-"                     non aligné à l'octet zéro\n"
+"  recordsep_zero     initialise le séparateur d'enregistrements pour un affichage\n"
+"                     non aligné à l'octet zéro\n"
 "\n"
 
 #: help.c:364
@@ -2909,17 +2919,17 @@
 "                     column widths for left-aligned data types in latex-longtable format\n"
 msgstr ""
 "  tableattr (or T)   indique les attributs pour la balise de table dans le format html ou les largeurs\n"
-"                     proportionnelles de colonnes pour les types de données alignés à gauche dans le format latex-longtable\n"
+"                     proportionnelles de colonnes pour les types de données alignés à gauche dans le format latex-longtable\n"
 
 #: help.c:366
 #, c-format
 msgid "  title              set the table title for any subsequently printed tables\n"
-msgstr "  title              configure le titre de la table pour toute table affichée\n"
+msgstr "  title              configure le titre de la table pour toute table affichée\n"
 
 #: help.c:367
 #, c-format
 msgid "  tuples_only        if set, only actual table data is shown\n"
-msgstr "  tuples_only        si activé, seules les données de la table sont affichées\n"
+msgstr "  tuples_only        si activé, seules les données de la table sont affichées\n"
 
 #: help.c:368
 #, c-format
@@ -2970,7 +2980,7 @@
 #: help.c:382
 #, c-format
 msgid "  COLUMNS            number of columns for wrapped format\n"
-msgstr "  COLUMNS            nombre de colonnes pour le format encadré\n"
+msgstr "  COLUMNS            nombre de colonnes pour le format encadré\n"
 
 #: help.c:383
 #, c-format
@@ -2980,32 +2990,32 @@
 #: help.c:384
 #, c-format
 msgid "  PGAPPNAME          same as the application_name connection parameter\n"
-msgstr "  PGAPPNAME          identique au paramètre de connexion application_name\n"
+msgstr "  PGAPPNAME          identique au paramètre de connexion application_name\n"
 
 #: help.c:385
 #, c-format
 msgid "  PGDATABASE         same as the dbname connection parameter\n"
-msgstr "  PGDATABASE         identique au paramètre de connexion dbname\n"
+msgstr "  PGDATABASE         identique au paramètre de connexion dbname\n"
 
 #: help.c:386
 #, c-format
 msgid "  PGHOST             same as the host connection parameter\n"
-msgstr "  PGHOST             identique au paramètre de connexion host\n"
+msgstr "  PGHOST             identique au paramètre de connexion host\n"
 
 #: help.c:387
 #, c-format
 msgid "  PGPORT             same as the port connection parameter\n"
-msgstr "  PGPORT             identique au paramètre de connexion port\n"
+msgstr "  PGPORT             identique au paramètre de connexion port\n"
 
 #: help.c:388
 #, c-format
 msgid "  PGUSER             same as the user connection parameter\n"
-msgstr "  PGUSER             identique au paramètre de connexion user\n"
+msgstr "  PGUSER             identique au paramètre de connexion user\n"
 
 #: help.c:389
 #, c-format
 msgid "  PGPASSWORD         connection password (not recommended)\n"
-msgstr "  PGPASSWORD         mot de passe de connexion (non recommendé)\n"
+msgstr "  PGPASSWORD         mot de passe de connexion (non recommendé)\n"
 
 #: help.c:390
 #, c-format
@@ -3019,7 +3029,7 @@
 "                     editor used by the \\e and \\ef commands\n"
 msgstr ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
-"                     éditeur utilisé par les commandes \\e et \\ef\n"
+"                     éditeur utilisé par les commandes \\e et \\ef\n"
 
 #: help.c:393
 #, c-format
@@ -3028,7 +3038,7 @@
 "                     how to specify a line number when invoking the editor\n"
 msgstr ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
-"                     comment spécifier un numéro de ligne lors de l'appel de l'éditeur\n"
+"                     comment spécifier un numéro de ligne lors de l'appel de l'éditeur\n"
 
 #: help.c:395
 #, c-format
@@ -3043,16 +3053,16 @@
 #: help.c:397
 #, c-format
 msgid "  SHELL              shell used by the \\! command\n"
-msgstr "  SHELL              shell utilisé par la commande \\!\n"
+msgstr "  SHELL              shell utilisé par la commande \\!\n"
 
 #: help.c:398
 #, c-format
 msgid "  TMPDIR             directory for temporary files\n"
-msgstr "  TMPDIR             répertoire pour les fichiers temporaires\n"
+msgstr "  TMPDIR             répertoire pour les fichiers temporaires\n"
 
 #: help.c:441
 msgid "Available help:\n"
-msgstr "Aide-mémoire disponible :\n"
+msgstr "Aide-mémoire disponible :\n"
 
 #: help.c:525
 #, c-format
@@ -3075,38 +3085,38 @@
 "No help available for \"%s\".\n"
 "Try \\h with no arguments to see available help.\n"
 msgstr ""
-"Aucun aide-mémoire disponible pour « %s ».\n"
-"Essayez \\h sans arguments pour afficher les aide-mémoires disponibles.\n"
+"Aucun aide-mémoire disponible pour « %s ».\n"
+"Essayez \\h sans arguments pour afficher les aide-mémoires disponibles.\n"
 
 #: input.c:205
 #, 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"
+msgstr "n'a pas pu lire à partir du fichier en entrée : %s\n"
 
 #: input.c:460 input.c:499
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
-msgstr "n'a pas pu sauvegarder l'historique dans le fichier « %s » : %s\n"
+msgstr "n'a pas pu sauvegarder l'historique dans le fichier « %s » : %s\n"
 
 #: input.c:519
 #, c-format
 msgid "history is not supported by this installation\n"
-msgstr "l'historique n'est pas supportée par cette installation\n"
+msgstr "l'historique n'est pas supportée par cette installation\n"
 
 #: large_obj.c:64
 #, c-format
 msgid "%s: not connected to a database\n"
-msgstr "%s : non connecté à une base de données\n"
+msgstr "%s : non connecté à une base de données\n"
 
 #: large_obj.c:83
 #, c-format
 msgid "%s: current transaction is aborted\n"
-msgstr "%s : la transaction en cours est abandonnée\n"
+msgstr "%s : la transaction en cours est abandonnée\n"
 
 #: large_obj.c:86
 #, c-format
 msgid "%s: unknown transaction status\n"
-msgstr "%s : état de la transaction inconnu\n"
+msgstr "%s : état de la transaction inconnu\n"
 
 #: large_obj.c:287 large_obj.c:298
 msgid "ID"
@@ -3114,20 +3124,20 @@
 
 #: large_obj.c:308
 msgid "Large objects"
-msgstr "« Large objects »"
+msgstr "« Large objects »"
 
 #: mainloop.c:161
 #, c-format
 msgid "Use \"\\q\" to leave %s.\n"
-msgstr "Saisissez « \\q » pour quitter %s.\n"
+msgstr "Saisissez « \\q » pour quitter %s.\n"
 
 #: mainloop.c:183
 msgid ""
 "The input is a PostgreSQL custom-format dump.\n"
 "Use the pg_restore command-line client to restore this dump to a database.\n"
 msgstr ""
-"Les données en entrée proviennent d'une sauvegarde PostgreSQL au format custom.\n"
-"Utilisez l'outil en ligne de commande pg_restore pour restaurer cette sauvegarde dans une base de données.\n"
+"Les données en entrée proviennent d'une sauvegarde PostgreSQL au format custom.\n"
+"Utilisez l'outil en ligne de commande pg_restore pour restaurer cette sauvegarde dans une base de données.\n"
 
 #: mainloop.c:203
 msgid "You are using psql, the command-line interface to PostgreSQL."
@@ -3144,9 +3154,9 @@
 msgstr ""
 "Saisissez:\n"
 "    \\copyright pour les termes de distribution\n"
-"    \\h pour l'aide-mémoire des commandes SQL\n"
-"    \\? pour l'aide-mémoire des commandes psql\n"
-"    \\g ou point-virgule en fin d'instruction pour exécuter la requête\n"
+"    \\h pour l'aide-mémoire des commandes SQL\n"
+"    \\? pour l'aide-mémoire des commandes psql\n"
+"    \\g ou point-virgule en fin d'instruction pour exécuter la requête\n"
 "    \\q pour quitter\n"
 
 #: print.c:352
@@ -3156,26 +3166,26 @@
 msgstr[0] "(%lu ligne)"
 msgstr[1] "(%lu lignes)"
 
-#: print.c:2902
+#: print.c:2910
 #, c-format
 msgid "Interrupted\n"
 msgstr "Interrompu\n"
 
-#: print.c:2966
+#: print.c:2974
 #, c-format
 msgid "Cannot add header to table content: column count of %d exceeded.\n"
 msgstr ""
-"Ne peut pas ajouter l'en-tête au contenu de la table : le nombre de colonnes\n"
-"%d est dépassé.\n"
+"Ne peut pas ajouter l'en-tête au contenu de la table : le nombre de colonnes\n"
+"%d est dépassé.\n"
 
-#: print.c:3006
+#: print.c:3014
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
 msgstr ""
 "Ne peut pas ajouter une cellule au contenu de la table : le nombre total des\n"
-"cellules %d est dépassé.\n"
+"cellules %d est dépassé.\n"
 
-#: print.c:3255
+#: print.c:3263
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "format de sortie invalide (erreur interne) : %d"
@@ -3183,19 +3193,19 @@
 #: psqlscan.l:751
 #, c-format
 msgid "skipping recursive expansion of variable \"%s\"\n"
-msgstr "ignore l'expansion récursive de la variable « %s »\n"
+msgstr "ignore l'expansion récursive de la variable « %s »\n"
 
-#: psqlscan.l:1627
+#: psqlscan.l:1628
 #, c-format
 msgid "unterminated quoted string\n"
-msgstr "chaîne entre guillemets non terminée\n"
+msgstr "chaîne entre guillemets non terminée\n"
 
-#: psqlscan.l:1727
+#: psqlscan.l:1728
 #, c-format
 msgid "%s: out of memory\n"
-msgstr "%s : mémoire épuisée\n"
+msgstr "%s : mémoire épuisée\n"
 
-#: psqlscan.l:1956
+#: psqlscan.l:1957
 #, c-format
 msgid "can't escape without active connection\n"
 msgstr "ne peut mettre entre guillemets sans connexion active\n"
@@ -3210,169 +3220,168 @@
 #: sql_help.c:367 sql_help.c:369 sql_help.c:412 sql_help.c:414 sql_help.c:417
 #: sql_help.c:419 sql_help.c:483 sql_help.c:488 sql_help.c:493 sql_help.c:498
 #: sql_help.c:546 sql_help.c:548 sql_help.c:550 sql_help.c:553 sql_help.c:555
-#: sql_help.c:566 sql_help.c:568 sql_help.c:608 sql_help.c:610 sql_help.c:613
-#: sql_help.c:615 sql_help.c:617 sql_help.c:646 sql_help.c:650 sql_help.c:668
-#: sql_help.c:671 sql_help.c:674 sql_help.c:703 sql_help.c:715 sql_help.c:723
-#: sql_help.c:726 sql_help.c:729 sql_help.c:744 sql_help.c:747 sql_help.c:792
-#: sql_help.c:815 sql_help.c:826 sql_help.c:828 sql_help.c:845 sql_help.c:854
-#: sql_help.c:856 sql_help.c:858 sql_help.c:870 sql_help.c:874 sql_help.c:876
-#: sql_help.c:960 sql_help.c:962 sql_help.c:965 sql_help.c:968 sql_help.c:970
-#: sql_help.c:972 sql_help.c:1033 sql_help.c:1035 sql_help.c:1037
-#: sql_help.c:1040 sql_help.c:1061 sql_help.c:1064 sql_help.c:1067
-#: sql_help.c:1070 sql_help.c:1074 sql_help.c:1076 sql_help.c:1078
-#: sql_help.c:1080 sql_help.c:1094 sql_help.c:1097 sql_help.c:1099
-#: sql_help.c:1101 sql_help.c:1111 sql_help.c:1113 sql_help.c:1123
-#: sql_help.c:1125 sql_help.c:1134 sql_help.c:1155 sql_help.c:1157
-#: sql_help.c:1159 sql_help.c:1162 sql_help.c:1164 sql_help.c:1166
-#: sql_help.c:1217 sql_help.c:1255 sql_help.c:1258 sql_help.c:1260
-#: sql_help.c:1262 sql_help.c:1264 sql_help.c:1266 sql_help.c:1269
-#: sql_help.c:1309 sql_help.c:1556 sql_help.c:1572 sql_help.c:1585
-#: sql_help.c:1636 sql_help.c:1640 sql_help.c:1650 sql_help.c:1670
-#: sql_help.c:1695 sql_help.c:1713 sql_help.c:1741 sql_help.c:1815
-#: sql_help.c:1858 sql_help.c:1880 sql_help.c:1900 sql_help.c:1901
-#: sql_help.c:1936 sql_help.c:1956 sql_help.c:1978 sql_help.c:1991
-#: sql_help.c:2023 sql_help.c:2048 sql_help.c:2092 sql_help.c:2278
-#: sql_help.c:2291 sql_help.c:2308 sql_help.c:2324 sql_help.c:2363
-#: sql_help.c:2414 sql_help.c:2418 sql_help.c:2420 sql_help.c:2426
-#: sql_help.c:2444 sql_help.c:2472 sql_help.c:2507 sql_help.c:2519
-#: sql_help.c:2528 sql_help.c:2578 sql_help.c:2606 sql_help.c:2614
-#: sql_help.c:2622 sql_help.c:2630 sql_help.c:2638 sql_help.c:2646
-#: sql_help.c:2654 sql_help.c:2662 sql_help.c:2671 sql_help.c:2682
-#: sql_help.c:2690 sql_help.c:2698 sql_help.c:2706 sql_help.c:2714
-#: sql_help.c:2724 sql_help.c:2733 sql_help.c:2742 sql_help.c:2750
-#: sql_help.c:2759 sql_help.c:2767 sql_help.c:2776 sql_help.c:2784
-#: sql_help.c:2792 sql_help.c:2800 sql_help.c:2808 sql_help.c:2816
-#: sql_help.c:2824 sql_help.c:2832 sql_help.c:2840 sql_help.c:2857
-#: sql_help.c:2866 sql_help.c:2874 sql_help.c:2891 sql_help.c:2906
-#: sql_help.c:3171 sql_help.c:3222 sql_help.c:3251 sql_help.c:3259
-#: sql_help.c:3678 sql_help.c:3726 sql_help.c:3867
+#: sql_help.c:566 sql_help.c:568 sql_help.c:607 sql_help.c:609 sql_help.c:612
+#: sql_help.c:614 sql_help.c:616 sql_help.c:644 sql_help.c:648 sql_help.c:666
+#: sql_help.c:669 sql_help.c:672 sql_help.c:701 sql_help.c:713 sql_help.c:721
+#: sql_help.c:724 sql_help.c:727 sql_help.c:742 sql_help.c:745 sql_help.c:790
+#: sql_help.c:813 sql_help.c:824 sql_help.c:826 sql_help.c:843 sql_help.c:852
+#: sql_help.c:854 sql_help.c:856 sql_help.c:868 sql_help.c:872 sql_help.c:874
+#: sql_help.c:958 sql_help.c:960 sql_help.c:963 sql_help.c:966 sql_help.c:968
+#: sql_help.c:970 sql_help.c:1031 sql_help.c:1033 sql_help.c:1035
+#: sql_help.c:1038 sql_help.c:1059 sql_help.c:1062 sql_help.c:1065
+#: sql_help.c:1068 sql_help.c:1072 sql_help.c:1074 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1092 sql_help.c:1095 sql_help.c:1097
+#: sql_help.c:1099 sql_help.c:1109 sql_help.c:1111 sql_help.c:1121
+#: sql_help.c:1123 sql_help.c:1132 sql_help.c:1153 sql_help.c:1155
+#: sql_help.c:1157 sql_help.c:1160 sql_help.c:1162 sql_help.c:1164
+#: sql_help.c:1215 sql_help.c:1253 sql_help.c:1256 sql_help.c:1258
+#: sql_help.c:1260 sql_help.c:1262 sql_help.c:1264 sql_help.c:1267
+#: sql_help.c:1307 sql_help.c:1554 sql_help.c:1570 sql_help.c:1583
+#: sql_help.c:1634 sql_help.c:1638 sql_help.c:1648 sql_help.c:1668
+#: sql_help.c:1693 sql_help.c:1711 sql_help.c:1739 sql_help.c:1813
+#: sql_help.c:1856 sql_help.c:1878 sql_help.c:1898 sql_help.c:1899
+#: sql_help.c:1934 sql_help.c:1954 sql_help.c:1976 sql_help.c:1989
+#: sql_help.c:2021 sql_help.c:2046 sql_help.c:2090 sql_help.c:2276
+#: sql_help.c:2289 sql_help.c:2306 sql_help.c:2322 sql_help.c:2361
+#: sql_help.c:2412 sql_help.c:2416 sql_help.c:2418 sql_help.c:2424
+#: sql_help.c:2442 sql_help.c:2470 sql_help.c:2505 sql_help.c:2517
+#: sql_help.c:2526 sql_help.c:2576 sql_help.c:2604 sql_help.c:2612
+#: sql_help.c:2620 sql_help.c:2628 sql_help.c:2636 sql_help.c:2644
+#: sql_help.c:2652 sql_help.c:2660 sql_help.c:2669 sql_help.c:2680
+#: sql_help.c:2688 sql_help.c:2696 sql_help.c:2704 sql_help.c:2712
+#: sql_help.c:2722 sql_help.c:2731 sql_help.c:2740 sql_help.c:2748
+#: sql_help.c:2757 sql_help.c:2765 sql_help.c:2774 sql_help.c:2782
+#: sql_help.c:2790 sql_help.c:2798 sql_help.c:2806 sql_help.c:2814
+#: sql_help.c:2822 sql_help.c:2830 sql_help.c:2838 sql_help.c:2855
+#: sql_help.c:2864 sql_help.c:2872 sql_help.c:2889 sql_help.c:2904
+#: sql_help.c:3169 sql_help.c:3220 sql_help.c:3249 sql_help.c:3257
+#: sql_help.c:3676 sql_help.c:3724 sql_help.c:3865
 msgid "name"
 msgstr "nom"
 
-#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1373
-#: sql_help.c:2579 sql_help.c:3474
+#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1371
+#: sql_help.c:2577 sql_help.c:3472
 msgid "aggregate_signature"
-msgstr "signature_agrégat"
+msgstr "signature_agrégat"
 
 #: sql_help.c:35 sql_help.c:62 sql_help.c:77 sql_help.c:113 sql_help.c:233
 #: sql_help.c:251 sql_help.c:370 sql_help.c:418 sql_help.c:492 sql_help.c:533
-#: sql_help.c:547 sql_help.c:567 sql_help.c:614 sql_help.c:670 sql_help.c:725
-#: sql_help.c:746 sql_help.c:793 sql_help.c:817 sql_help.c:827 sql_help.c:857
-#: sql_help.c:877 sql_help.c:969 sql_help.c:1034 sql_help.c:1077
-#: sql_help.c:1098 sql_help.c:1112 sql_help.c:1124 sql_help.c:1136
-#: sql_help.c:1163 sql_help.c:1218 sql_help.c:1263
+#: sql_help.c:547 sql_help.c:567 sql_help.c:613 sql_help.c:668 sql_help.c:723
+#: sql_help.c:744 sql_help.c:791 sql_help.c:815 sql_help.c:825 sql_help.c:855
+#: sql_help.c:875 sql_help.c:967 sql_help.c:1032 sql_help.c:1075
+#: sql_help.c:1096 sql_help.c:1110 sql_help.c:1122 sql_help.c:1134
+#: sql_help.c:1161 sql_help.c:1216 sql_help.c:1261
 msgid "new_name"
 msgstr "nouveau_nom"
 
 #: sql_help.c:38 sql_help.c:64 sql_help.c:79 sql_help.c:115 sql_help.c:231
 #: sql_help.c:249 sql_help.c:368 sql_help.c:454 sql_help.c:497 sql_help.c:569
-#: sql_help.c:578 sql_help.c:633 sql_help.c:649 sql_help.c:673 sql_help.c:728
-#: sql_help.c:829 sql_help.c:855 sql_help.c:875 sql_help.c:1018 sql_help.c:1036
-#: sql_help.c:1079 sql_help.c:1100 sql_help.c:1158 sql_help.c:1261
-#: sql_help.c:2264
+#: sql_help.c:578 sql_help.c:632 sql_help.c:647 sql_help.c:671 sql_help.c:726
+#: sql_help.c:827 sql_help.c:853 sql_help.c:873 sql_help.c:1016 sql_help.c:1034
+#: sql_help.c:1077 sql_help.c:1098 sql_help.c:1156 sql_help.c:1259
+#: sql_help.c:2262
 msgid "new_owner"
-msgstr "nouveau_propriétaire"
+msgstr "nouveau_propriétaire"
 
 #: sql_help.c:41 sql_help.c:66 sql_help.c:81 sql_help.c:235 sql_help.c:299
-#: sql_help.c:420 sql_help.c:502 sql_help.c:616 sql_help.c:653 sql_help.c:676
-#: sql_help.c:731 sql_help.c:859 sql_help.c:971 sql_help.c:1081 sql_help.c:1102
-#: sql_help.c:1114 sql_help.c:1126 sql_help.c:1165 sql_help.c:1265
+#: sql_help.c:420 sql_help.c:502 sql_help.c:615 sql_help.c:651 sql_help.c:674
+#: sql_help.c:729 sql_help.c:857 sql_help.c:969 sql_help.c:1079 sql_help.c:1100
+#: sql_help.c:1112 sql_help.c:1124 sql_help.c:1163 sql_help.c:1263
 msgid "new_schema"
-msgstr "nouveau_schéma"
+msgstr "nouveau_schéma"
 
-#: sql_help.c:42 sql_help.c:1426 sql_help.c:2580 sql_help.c:3493
+#: sql_help.c:42 sql_help.c:1424 sql_help.c:2578 sql_help.c:3491
 msgid "where aggregate_signature is:"
-msgstr "où signature_agrégat est :"
+msgstr "où signature_agrégat est :"
 
 #: sql_help.c:43 sql_help.c:46 sql_help.c:49 sql_help.c:316 sql_help.c:341
 #: sql_help.c:344 sql_help.c:347 sql_help.c:484 sql_help.c:489 sql_help.c:494
-#: sql_help.c:499 sql_help.c:1391 sql_help.c:1427 sql_help.c:1430
-#: sql_help.c:1433 sql_help.c:1557 sql_help.c:1573 sql_help.c:1576
-#: sql_help.c:1816 sql_help.c:2581 sql_help.c:2584 sql_help.c:2587
-#: sql_help.c:2672 sql_help.c:3057 sql_help.c:3389 sql_help.c:3480
-#: sql_help.c:3494 sql_help.c:3497 sql_help.c:3500
+#: sql_help.c:499 sql_help.c:1389 sql_help.c:1425 sql_help.c:1428
+#: sql_help.c:1431 sql_help.c:1555 sql_help.c:1571 sql_help.c:1574
+#: sql_help.c:1814 sql_help.c:2579 sql_help.c:2582 sql_help.c:2585
+#: sql_help.c:2670 sql_help.c:3055 sql_help.c:3387 sql_help.c:3478
+#: sql_help.c:3492 sql_help.c:3495 sql_help.c:3498
 msgid "argmode"
 msgstr "mode_argument"
 
 #: sql_help.c:44 sql_help.c:47 sql_help.c:50 sql_help.c:317 sql_help.c:342
 #: sql_help.c:345 sql_help.c:348 sql_help.c:485 sql_help.c:490 sql_help.c:495
-#: sql_help.c:500 sql_help.c:1392 sql_help.c:1428 sql_help.c:1431
-#: sql_help.c:1434 sql_help.c:1558 sql_help.c:1574 sql_help.c:1577
-#: sql_help.c:1817 sql_help.c:2582 sql_help.c:2585 sql_help.c:2588
-#: sql_help.c:2673 sql_help.c:3481 sql_help.c:3495 sql_help.c:3498
-#: sql_help.c:3501
+#: sql_help.c:500 sql_help.c:1390 sql_help.c:1426 sql_help.c:1429
+#: sql_help.c:1432 sql_help.c:1556 sql_help.c:1572 sql_help.c:1575
+#: sql_help.c:1815 sql_help.c:2580 sql_help.c:2583 sql_help.c:2586
+#: sql_help.c:2671 sql_help.c:3479 sql_help.c:3493 sql_help.c:3496
+#: sql_help.c:3499
 msgid "argname"
-msgstr "nom_agrégat"
+msgstr "nom_agrégat"
 
 #: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:318 sql_help.c:343
 #: sql_help.c:346 sql_help.c:349 sql_help.c:486 sql_help.c:491 sql_help.c:496
-#: sql_help.c:501 sql_help.c:1393 sql_help.c:1429 sql_help.c:1432
-#: sql_help.c:1435 sql_help.c:1818 sql_help.c:2583 sql_help.c:2586
-#: sql_help.c:2589 sql_help.c:2674 sql_help.c:3482 sql_help.c:3496
-#: sql_help.c:3499 sql_help.c:3502
+#: sql_help.c:501 sql_help.c:1391 sql_help.c:1427 sql_help.c:1430
+#: sql_help.c:1433 sql_help.c:1816 sql_help.c:2581 sql_help.c:2584
+#: sql_help.c:2587 sql_help.c:2672 sql_help.c:3480 sql_help.c:3494
+#: sql_help.c:3497 sql_help.c:3500
 msgid "argtype"
 msgstr "type_argument"
 
-#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:787
-#: sql_help.c:872 sql_help.c:1095 sql_help.c:1212 sql_help.c:1240
-#: sql_help.c:1483 sql_help.c:1489 sql_help.c:1744 sql_help.c:1776
-#: sql_help.c:1783 sql_help.c:1859 sql_help.c:2024 sql_help.c:2113
-#: sql_help.c:2293 sql_help.c:2473 sql_help.c:2495 sql_help.c:2925
-#: sql_help.c:3091
+#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:785
+#: sql_help.c:870 sql_help.c:1093 sql_help.c:1210 sql_help.c:1238
+#: sql_help.c:1481 sql_help.c:1487 sql_help.c:1742 sql_help.c:1774
+#: sql_help.c:1781 sql_help.c:1857 sql_help.c:2022 sql_help.c:2111
+#: sql_help.c:2291 sql_help.c:2471 sql_help.c:2493 sql_help.c:2923
+#: sql_help.c:3089
 msgid "option"
 msgstr "option"
 
-#: sql_help.c:108 sql_help.c:788 sql_help.c:1213 sql_help.c:1860
-#: sql_help.c:2025 sql_help.c:2474
+#: sql_help.c:108 sql_help.c:786 sql_help.c:1211 sql_help.c:1858
+#: sql_help.c:2023 sql_help.c:2472
 msgid "where option can be:"
-msgstr "où option peut être :"
+msgstr "où option peut être :"
 
-#: sql_help.c:109 sql_help.c:1677
+#: sql_help.c:109 sql_help.c:1675
 msgid "allowconn"
 msgstr "allowconn"
 
-#: sql_help.c:110 sql_help.c:789 sql_help.c:1214 sql_help.c:1678
-#: sql_help.c:2026 sql_help.c:2475
+#: sql_help.c:110 sql_help.c:787 sql_help.c:1212 sql_help.c:1676
+#: sql_help.c:2024 sql_help.c:2473
 msgid "connlimit"
 msgstr "limite_de_connexion"
 
-#: sql_help.c:111 sql_help.c:1679
+#: sql_help.c:111 sql_help.c:1677
 msgid "istemplate"
 msgstr "istemplate"
 
-#: sql_help.c:117 sql_help.c:557 sql_help.c:619 sql_help.c:634 sql_help.c:974
-#: sql_help.c:1011
+#: sql_help.c:117 sql_help.c:557 sql_help.c:618 sql_help.c:972 sql_help.c:1009
 msgid "new_tablespace"
 msgstr "nouveau_tablespace"
 
 #: sql_help.c:119 sql_help.c:122 sql_help.c:124 sql_help.c:506 sql_help.c:508
-#: sql_help.c:509 sql_help.c:796 sql_help.c:800 sql_help.c:803 sql_help.c:888
-#: sql_help.c:891 sql_help.c:1220 sql_help.c:1223 sql_help.c:1225
-#: sql_help.c:1827 sql_help.c:3276 sql_help.c:3667
+#: sql_help.c:509 sql_help.c:794 sql_help.c:798 sql_help.c:801 sql_help.c:886
+#: sql_help.c:889 sql_help.c:1218 sql_help.c:1221 sql_help.c:1223
+#: sql_help.c:1825 sql_help.c:3274 sql_help.c:3665
 msgid "configuration_parameter"
-msgstr "paramètre_configuration"
+msgstr "paramètre_configuration"
 
 #: sql_help.c:120 sql_help.c:366 sql_help.c:438 sql_help.c:444 sql_help.c:456
-#: sql_help.c:507 sql_help.c:552 sql_help.c:625 sql_help.c:631 sql_help.c:797
-#: sql_help.c:873 sql_help.c:889 sql_help.c:890 sql_help.c:993 sql_help.c:1013
-#: sql_help.c:1039 sql_help.c:1096 sql_help.c:1221 sql_help.c:1241
-#: sql_help.c:1745 sql_help.c:1777 sql_help.c:1784 sql_help.c:1828
-#: sql_help.c:1829 sql_help.c:1888 sql_help.c:1920 sql_help.c:2114
-#: sql_help.c:2188 sql_help.c:2196 sql_help.c:2228 sql_help.c:2250
-#: sql_help.c:2267 sql_help.c:2294 sql_help.c:2496 sql_help.c:3092
-#: sql_help.c:3668 sql_help.c:3669
+#: sql_help.c:507 sql_help.c:552 sql_help.c:624 sql_help.c:630 sql_help.c:795
+#: sql_help.c:871 sql_help.c:887 sql_help.c:888 sql_help.c:991 sql_help.c:1011
+#: sql_help.c:1037 sql_help.c:1094 sql_help.c:1219 sql_help.c:1239
+#: sql_help.c:1743 sql_help.c:1775 sql_help.c:1782 sql_help.c:1826
+#: sql_help.c:1827 sql_help.c:1886 sql_help.c:1918 sql_help.c:2112
+#: sql_help.c:2186 sql_help.c:2194 sql_help.c:2226 sql_help.c:2248
+#: sql_help.c:2265 sql_help.c:2292 sql_help.c:2494 sql_help.c:3090
+#: sql_help.c:3666 sql_help.c:3667
 msgid "value"
 msgstr "valeur"
 
 #: sql_help.c:182
 msgid "target_role"
-msgstr "rôle_cible"
+msgstr "rôle_cible"
 
-#: sql_help.c:183 sql_help.c:1728 sql_help.c:2072 sql_help.c:2077
-#: sql_help.c:3039 sql_help.c:3046 sql_help.c:3060 sql_help.c:3066
-#: sql_help.c:3371 sql_help.c:3378 sql_help.c:3392 sql_help.c:3398
+#: sql_help.c:183 sql_help.c:1726 sql_help.c:2070 sql_help.c:2075
+#: sql_help.c:3037 sql_help.c:3044 sql_help.c:3058 sql_help.c:3064
+#: sql_help.c:3369 sql_help.c:3376 sql_help.c:3390 sql_help.c:3396
 msgid "schema_name"
-msgstr "nom_schéma"
+msgstr "nom_schéma"
 
 #: sql_help.c:184
 msgid "abbreviated_grant_or_revoke"
@@ -3380,36 +3389,36 @@
 
 #: sql_help.c:185
 msgid "where abbreviated_grant_or_revoke is one of:"
-msgstr "où abbreviated_grant_or_revoke fait partie de :"
+msgstr "où abbreviated_grant_or_revoke fait partie de :"
 
 #: sql_help.c:186 sql_help.c:187 sql_help.c:188 sql_help.c:189 sql_help.c:190
 #: sql_help.c:191 sql_help.c:192 sql_help.c:193 sql_help.c:531 sql_help.c:556
-#: sql_help.c:618 sql_help.c:749 sql_help.c:807 sql_help.c:973 sql_help.c:1228
-#: sql_help.c:1863 sql_help.c:1864 sql_help.c:1865 sql_help.c:1866
-#: sql_help.c:1867 sql_help.c:1993 sql_help.c:2029 sql_help.c:2030
-#: sql_help.c:2031 sql_help.c:2032 sql_help.c:2033 sql_help.c:2478
-#: sql_help.c:2479 sql_help.c:2480 sql_help.c:2481 sql_help.c:2482
-#: sql_help.c:3073 sql_help.c:3074 sql_help.c:3075 sql_help.c:3372
-#: sql_help.c:3376 sql_help.c:3379 sql_help.c:3381 sql_help.c:3383
-#: sql_help.c:3385 sql_help.c:3387 sql_help.c:3393 sql_help.c:3395
-#: sql_help.c:3397 sql_help.c:3399 sql_help.c:3401 sql_help.c:3403
-#: sql_help.c:3404 sql_help.c:3405 sql_help.c:3688
+#: sql_help.c:617 sql_help.c:747 sql_help.c:805 sql_help.c:971 sql_help.c:1226
+#: sql_help.c:1861 sql_help.c:1862 sql_help.c:1863 sql_help.c:1864
+#: sql_help.c:1865 sql_help.c:1991 sql_help.c:2027 sql_help.c:2028
+#: sql_help.c:2029 sql_help.c:2030 sql_help.c:2031 sql_help.c:2476
+#: sql_help.c:2477 sql_help.c:2478 sql_help.c:2479 sql_help.c:2480
+#: sql_help.c:3071 sql_help.c:3072 sql_help.c:3073 sql_help.c:3370
+#: sql_help.c:3374 sql_help.c:3377 sql_help.c:3379 sql_help.c:3381
+#: sql_help.c:3383 sql_help.c:3385 sql_help.c:3391 sql_help.c:3393
+#: sql_help.c:3395 sql_help.c:3397 sql_help.c:3399 sql_help.c:3401
+#: sql_help.c:3402 sql_help.c:3403 sql_help.c:3686
 msgid "role_name"
-msgstr "nom_rôle"
+msgstr "nom_rôle"
 
-#: sql_help.c:219 sql_help.c:431 sql_help.c:984 sql_help.c:986 sql_help.c:1257
-#: sql_help.c:1698 sql_help.c:1702 sql_help.c:1787 sql_help.c:1791
-#: sql_help.c:1884 sql_help.c:2200 sql_help.c:2210 sql_help.c:2232
-#: sql_help.c:3122 sql_help.c:3137 sql_help.c:3139 sql_help.c:3553
-#: sql_help.c:3554 sql_help.c:3563 sql_help.c:3604 sql_help.c:3605
-#: sql_help.c:3606 sql_help.c:3607 sql_help.c:3608 sql_help.c:3609
-#: sql_help.c:3642 sql_help.c:3643 sql_help.c:3648 sql_help.c:3653
-#: sql_help.c:3792 sql_help.c:3793 sql_help.c:3802 sql_help.c:3843
-#: sql_help.c:3844 sql_help.c:3845 sql_help.c:3846 sql_help.c:3847
-#: sql_help.c:3848 sql_help.c:3895 sql_help.c:3897 sql_help.c:3930
-#: sql_help.c:3986 sql_help.c:3987 sql_help.c:3996 sql_help.c:4037
-#: sql_help.c:4038 sql_help.c:4039 sql_help.c:4040 sql_help.c:4041
-#: sql_help.c:4042
+#: sql_help.c:219 sql_help.c:431 sql_help.c:982 sql_help.c:984 sql_help.c:1255
+#: sql_help.c:1696 sql_help.c:1700 sql_help.c:1785 sql_help.c:1789
+#: sql_help.c:1882 sql_help.c:2198 sql_help.c:2208 sql_help.c:2230
+#: sql_help.c:3120 sql_help.c:3135 sql_help.c:3137 sql_help.c:3551
+#: sql_help.c:3552 sql_help.c:3561 sql_help.c:3602 sql_help.c:3603
+#: sql_help.c:3604 sql_help.c:3605 sql_help.c:3606 sql_help.c:3607
+#: sql_help.c:3640 sql_help.c:3641 sql_help.c:3646 sql_help.c:3651
+#: sql_help.c:3790 sql_help.c:3791 sql_help.c:3800 sql_help.c:3841
+#: sql_help.c:3842 sql_help.c:3843 sql_help.c:3844 sql_help.c:3845
+#: sql_help.c:3846 sql_help.c:3893 sql_help.c:3895 sql_help.c:3928
+#: sql_help.c:3984 sql_help.c:3985 sql_help.c:3994 sql_help.c:4035
+#: sql_help.c:4036 sql_help.c:4037 sql_help.c:4038 sql_help.c:4039
+#: sql_help.c:4040
 msgid "expression"
 msgstr "expression"
 
@@ -3418,18 +3427,17 @@
 msgstr "contrainte_domaine"
 
 #: sql_help.c:224 sql_help.c:226 sql_help.c:229 sql_help.c:446 sql_help.c:447
-#: sql_help.c:966 sql_help.c:999 sql_help.c:1000 sql_help.c:1001
-#: sql_help.c:1021 sql_help.c:1379 sql_help.c:1381 sql_help.c:1701
-#: sql_help.c:1786 sql_help.c:1790 sql_help.c:2199 sql_help.c:2209
-#: sql_help.c:3134
+#: sql_help.c:964 sql_help.c:997 sql_help.c:998 sql_help.c:999 sql_help.c:1019
+#: sql_help.c:1377 sql_help.c:1379 sql_help.c:1699 sql_help.c:1784
+#: sql_help.c:1788 sql_help.c:2197 sql_help.c:2207 sql_help.c:3132
 msgid "constraint_name"
 msgstr "nom_contrainte"
 
-#: sql_help.c:227 sql_help.c:967
+#: sql_help.c:227 sql_help.c:965
 msgid "new_constraint_name"
 msgstr "nouvelle_nom_contrainte"
 
-#: sql_help.c:297 sql_help.c:871
+#: sql_help.c:297 sql_help.c:869
 msgid "new_version"
 msgstr "nouvelle_version"
 
@@ -3439,19 +3447,19 @@
 
 #: sql_help.c:304
 msgid "where member_object is:"
-msgstr "où objet_membre fait partie de :"
+msgstr "où objet_membre fait partie de :"
 
-#: sql_help.c:305 sql_help.c:1372 sql_help.c:3473
+#: sql_help.c:305 sql_help.c:1370 sql_help.c:3471
 msgid "aggregate_name"
-msgstr "nom_agrégat"
+msgstr "nom_agrégat"
 
-#: sql_help.c:307 sql_help.c:1374 sql_help.c:1616 sql_help.c:1620
-#: sql_help.c:1622 sql_help.c:2597
+#: sql_help.c:307 sql_help.c:1372 sql_help.c:1614 sql_help.c:1618
+#: sql_help.c:1620 sql_help.c:2595
 msgid "source_type"
 msgstr "type_source"
 
-#: sql_help.c:308 sql_help.c:1375 sql_help.c:1617 sql_help.c:1621
-#: sql_help.c:1623 sql_help.c:2598
+#: sql_help.c:308 sql_help.c:1373 sql_help.c:1615 sql_help.c:1619
+#: sql_help.c:1621 sql_help.c:2596
 msgid "target_type"
 msgstr "type_cible"
 
@@ -3459,1108 +3467,1108 @@
 #: sql_help.c:314 sql_help.c:319 sql_help.c:323 sql_help.c:325 sql_help.c:327
 #: sql_help.c:328 sql_help.c:329 sql_help.c:330 sql_help.c:331 sql_help.c:332
 #: sql_help.c:333 sql_help.c:334 sql_help.c:335 sql_help.c:338 sql_help.c:339
-#: sql_help.c:1376 sql_help.c:1383 sql_help.c:1384 sql_help.c:1385
-#: sql_help.c:1386 sql_help.c:1387 sql_help.c:1388 sql_help.c:1389
-#: sql_help.c:1394 sql_help.c:1396 sql_help.c:1400 sql_help.c:1402
-#: sql_help.c:1406 sql_help.c:1407 sql_help.c:1410 sql_help.c:1411
-#: sql_help.c:1412 sql_help.c:1413 sql_help.c:1414 sql_help.c:1415
-#: sql_help.c:1416 sql_help.c:1417 sql_help.c:1418 sql_help.c:1423
-#: sql_help.c:1424 sql_help.c:3470 sql_help.c:3475 sql_help.c:3476
-#: sql_help.c:3477 sql_help.c:3478 sql_help.c:3484 sql_help.c:3485
-#: sql_help.c:3486 sql_help.c:3487 sql_help.c:3488 sql_help.c:3489
-#: sql_help.c:3490 sql_help.c:3491
+#: sql_help.c:1374 sql_help.c:1381 sql_help.c:1382 sql_help.c:1383
+#: sql_help.c:1384 sql_help.c:1385 sql_help.c:1386 sql_help.c:1387
+#: sql_help.c:1392 sql_help.c:1394 sql_help.c:1398 sql_help.c:1400
+#: sql_help.c:1404 sql_help.c:1405 sql_help.c:1408 sql_help.c:1409
+#: sql_help.c:1410 sql_help.c:1411 sql_help.c:1412 sql_help.c:1413
+#: sql_help.c:1414 sql_help.c:1415 sql_help.c:1416 sql_help.c:1421
+#: sql_help.c:1422 sql_help.c:3468 sql_help.c:3473 sql_help.c:3474
+#: sql_help.c:3475 sql_help.c:3476 sql_help.c:3482 sql_help.c:3483
+#: sql_help.c:3484 sql_help.c:3485 sql_help.c:3486 sql_help.c:3487
+#: sql_help.c:3488 sql_help.c:3489
 msgid "object_name"
 msgstr "nom_objet"
 
-#: sql_help.c:315 sql_help.c:713 sql_help.c:1390 sql_help.c:1618
-#: sql_help.c:1653 sql_help.c:1716 sql_help.c:1937 sql_help.c:1968
-#: sql_help.c:2368 sql_help.c:3056 sql_help.c:3388 sql_help.c:3479
-#: sql_help.c:3582 sql_help.c:3586 sql_help.c:3590 sql_help.c:3593
-#: sql_help.c:3821 sql_help.c:3825 sql_help.c:3829 sql_help.c:3832
-#: sql_help.c:4015 sql_help.c:4019 sql_help.c:4023 sql_help.c:4026
+#: sql_help.c:315 sql_help.c:711 sql_help.c:1388 sql_help.c:1616
+#: sql_help.c:1651 sql_help.c:1714 sql_help.c:1935 sql_help.c:1966
+#: sql_help.c:2366 sql_help.c:3054 sql_help.c:3386 sql_help.c:3477
+#: sql_help.c:3580 sql_help.c:3584 sql_help.c:3588 sql_help.c:3591
+#: sql_help.c:3819 sql_help.c:3823 sql_help.c:3827 sql_help.c:3830
+#: sql_help.c:4013 sql_help.c:4017 sql_help.c:4021 sql_help.c:4024
 msgid "function_name"
 msgstr "nom_fonction"
 
-#: sql_help.c:320 sql_help.c:706 sql_help.c:1397 sql_help.c:1961
+#: sql_help.c:320 sql_help.c:704 sql_help.c:1395 sql_help.c:1959
 msgid "operator_name"
-msgstr "nom_opérateur"
+msgstr "nom_opérateur"
 
-#: sql_help.c:321 sql_help.c:647 sql_help.c:651 sql_help.c:1398 sql_help.c:1938
-#: sql_help.c:2715
+#: sql_help.c:321 sql_help.c:645 sql_help.c:649 sql_help.c:1396 sql_help.c:1936
+#: sql_help.c:2713
 msgid "left_type"
 msgstr "type_argument_gauche"
 
-#: sql_help.c:322 sql_help.c:648 sql_help.c:652 sql_help.c:1399 sql_help.c:1939
-#: sql_help.c:2716
+#: sql_help.c:322 sql_help.c:646 sql_help.c:650 sql_help.c:1397 sql_help.c:1937
+#: sql_help.c:2714
 msgid "right_type"
 msgstr "type_argument_droit"
 
-#: sql_help.c:324 sql_help.c:326 sql_help.c:669 sql_help.c:672 sql_help.c:675
-#: sql_help.c:704 sql_help.c:716 sql_help.c:724 sql_help.c:727 sql_help.c:730
-#: sql_help.c:1401 sql_help.c:1403 sql_help.c:1958 sql_help.c:1979
-#: sql_help.c:2215 sql_help.c:2725 sql_help.c:2734
+#: sql_help.c:324 sql_help.c:326 sql_help.c:667 sql_help.c:670 sql_help.c:673
+#: sql_help.c:702 sql_help.c:714 sql_help.c:722 sql_help.c:725 sql_help.c:728
+#: sql_help.c:1399 sql_help.c:1401 sql_help.c:1956 sql_help.c:1977
+#: sql_help.c:2213 sql_help.c:2723 sql_help.c:2732
 msgid "index_method"
-msgstr "méthode_indexage"
+msgstr "méthode_indexage"
 
-#: sql_help.c:336 sql_help.c:1017 sql_help.c:1419 sql_help.c:1824
-#: sql_help.c:2191 sql_help.c:2337 sql_help.c:2848 sql_help.c:3070
-#: sql_help.c:3402
+#: sql_help.c:336 sql_help.c:1015 sql_help.c:1417 sql_help.c:1822
+#: sql_help.c:2189 sql_help.c:2335 sql_help.c:2846 sql_help.c:3068
+#: sql_help.c:3400
 msgid "type_name"
 msgstr "nom_type"
 
-#: sql_help.c:337 sql_help.c:1420 sql_help.c:1823 sql_help.c:2338
-#: sql_help.c:2563 sql_help.c:2849 sql_help.c:3062 sql_help.c:3394
+#: sql_help.c:337 sql_help.c:1418 sql_help.c:1821 sql_help.c:2336
+#: sql_help.c:2561 sql_help.c:2847 sql_help.c:3060 sql_help.c:3392
 msgid "lang_name"
 msgstr "nom_langage"
 
 #: sql_help.c:340
 msgid "and aggregate_signature is:"
-msgstr "et signature_agrégat est :"
+msgstr "et signature_agrégat est :"
 
-#: sql_help.c:363 sql_help.c:1742
+#: sql_help.c:363 sql_help.c:1740
 msgid "handler_function"
 msgstr "fonction_gestionnaire"
 
-#: sql_help.c:364 sql_help.c:1743
+#: sql_help.c:364 sql_help.c:1741
 msgid "validator_function"
 msgstr "fonction_validateur"
 
-#: sql_help.c:413 sql_help.c:487 sql_help.c:609 sql_help.c:961 sql_help.c:1156
-#: sql_help.c:2206 sql_help.c:2207 sql_help.c:2223 sql_help.c:2224
+#: sql_help.c:413 sql_help.c:487 sql_help.c:608 sql_help.c:959 sql_help.c:1154
+#: sql_help.c:2204 sql_help.c:2205 sql_help.c:2221 sql_help.c:2222
 msgid "action"
 msgstr "action"
 
 #: sql_help.c:415 sql_help.c:422 sql_help.c:426 sql_help.c:427 sql_help.c:430
 #: sql_help.c:432 sql_help.c:433 sql_help.c:434 sql_help.c:436 sql_help.c:439
-#: sql_help.c:441 sql_help.c:442 sql_help.c:611 sql_help.c:621 sql_help.c:623
-#: sql_help.c:626 sql_help.c:628 sql_help.c:853 sql_help.c:963 sql_help.c:976
-#: sql_help.c:980 sql_help.c:981 sql_help.c:985 sql_help.c:987 sql_help.c:988
-#: sql_help.c:989 sql_help.c:991 sql_help.c:994 sql_help.c:996 sql_help.c:1256
-#: sql_help.c:1259 sql_help.c:1279 sql_help.c:1378 sql_help.c:1480
-#: sql_help.c:1485 sql_help.c:1499 sql_help.c:1500 sql_help.c:1501
-#: sql_help.c:1774 sql_help.c:1821 sql_help.c:1883 sql_help.c:1918
-#: sql_help.c:2099 sql_help.c:2179 sql_help.c:2192 sql_help.c:2211
-#: sql_help.c:2213 sql_help.c:2220 sql_help.c:2231 sql_help.c:2248
-#: sql_help.c:2371 sql_help.c:2508 sql_help.c:3041 sql_help.c:3042
-#: sql_help.c:3121 sql_help.c:3136 sql_help.c:3138 sql_help.c:3140
-#: sql_help.c:3373 sql_help.c:3374 sql_help.c:3472 sql_help.c:3613
-#: sql_help.c:3852 sql_help.c:3894 sql_help.c:3896 sql_help.c:3898
-#: sql_help.c:3915 sql_help.c:3918 sql_help.c:4046
+#: sql_help.c:441 sql_help.c:442 sql_help.c:610 sql_help.c:620 sql_help.c:622
+#: sql_help.c:625 sql_help.c:627 sql_help.c:851 sql_help.c:961 sql_help.c:974
+#: sql_help.c:978 sql_help.c:979 sql_help.c:983 sql_help.c:985 sql_help.c:986
+#: sql_help.c:987 sql_help.c:989 sql_help.c:992 sql_help.c:994 sql_help.c:1254
+#: sql_help.c:1257 sql_help.c:1277 sql_help.c:1376 sql_help.c:1478
+#: sql_help.c:1483 sql_help.c:1497 sql_help.c:1498 sql_help.c:1499
+#: sql_help.c:1772 sql_help.c:1819 sql_help.c:1881 sql_help.c:1916
+#: sql_help.c:2097 sql_help.c:2177 sql_help.c:2190 sql_help.c:2209
+#: sql_help.c:2211 sql_help.c:2218 sql_help.c:2229 sql_help.c:2246
+#: sql_help.c:2369 sql_help.c:2506 sql_help.c:3039 sql_help.c:3040
+#: sql_help.c:3119 sql_help.c:3134 sql_help.c:3136 sql_help.c:3138
+#: sql_help.c:3371 sql_help.c:3372 sql_help.c:3470 sql_help.c:3611
+#: sql_help.c:3850 sql_help.c:3892 sql_help.c:3894 sql_help.c:3896
+#: sql_help.c:3913 sql_help.c:3916 sql_help.c:4044
 msgid "column_name"
 msgstr "nom_colonne"
 
-#: sql_help.c:416 sql_help.c:612 sql_help.c:964
+#: sql_help.c:416 sql_help.c:611 sql_help.c:962
 msgid "new_column_name"
 msgstr "nouvelle_nom_colonne"
 
-#: sql_help.c:421 sql_help.c:503 sql_help.c:620 sql_help.c:975 sql_help.c:1169
+#: sql_help.c:421 sql_help.c:503 sql_help.c:619 sql_help.c:973 sql_help.c:1167
 msgid "where action is one of:"
-msgstr "où action fait partie de :"
+msgstr "où action fait partie de :"
 
-#: sql_help.c:423 sql_help.c:428 sql_help.c:977 sql_help.c:982 sql_help.c:1171
-#: sql_help.c:1175 sql_help.c:1696 sql_help.c:1775 sql_help.c:1957
-#: sql_help.c:2180 sql_help.c:2416 sql_help.c:3223
+#: sql_help.c:423 sql_help.c:428 sql_help.c:975 sql_help.c:980 sql_help.c:1169
+#: sql_help.c:1173 sql_help.c:1694 sql_help.c:1773 sql_help.c:1955
+#: sql_help.c:2178 sql_help.c:2414 sql_help.c:3221
 msgid "data_type"
-msgstr "type_données"
+msgstr "type_données"
 
-#: sql_help.c:424 sql_help.c:429 sql_help.c:978 sql_help.c:983 sql_help.c:1172
-#: sql_help.c:1176 sql_help.c:1697 sql_help.c:1778 sql_help.c:1885
-#: sql_help.c:2181 sql_help.c:2417 sql_help.c:2423 sql_help.c:3131
+#: sql_help.c:424 sql_help.c:429 sql_help.c:976 sql_help.c:981 sql_help.c:1170
+#: sql_help.c:1174 sql_help.c:1695 sql_help.c:1776 sql_help.c:1883
+#: sql_help.c:2179 sql_help.c:2415 sql_help.c:2421 sql_help.c:3129
 msgid "collation"
 msgstr "collationnement"
 
-#: sql_help.c:425 sql_help.c:979 sql_help.c:1779 sql_help.c:2182
-#: sql_help.c:2193
+#: sql_help.c:425 sql_help.c:977 sql_help.c:1777 sql_help.c:2180
+#: sql_help.c:2191
 msgid "column_constraint"
 msgstr "contrainte_colonne"
 
-#: sql_help.c:435 sql_help.c:622 sql_help.c:990
+#: sql_help.c:435 sql_help.c:621 sql_help.c:988
 msgid "integer"
 msgstr "entier"
 
-#: sql_help.c:437 sql_help.c:440 sql_help.c:624 sql_help.c:627 sql_help.c:992
-#: sql_help.c:995
+#: sql_help.c:437 sql_help.c:440 sql_help.c:623 sql_help.c:626 sql_help.c:990
+#: sql_help.c:993
 msgid "attribute_option"
 msgstr "option_attribut"
 
-#: sql_help.c:445 sql_help.c:997 sql_help.c:1780 sql_help.c:2183
-#: sql_help.c:2194
+#: sql_help.c:445 sql_help.c:995 sql_help.c:1778 sql_help.c:2181
+#: sql_help.c:2192
 msgid "table_constraint"
 msgstr "contrainte_table"
 
-#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:1002
-#: sql_help.c:1003 sql_help.c:1004 sql_help.c:1005 sql_help.c:1421
+#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:1000
+#: sql_help.c:1001 sql_help.c:1002 sql_help.c:1003 sql_help.c:1419
 msgid "trigger_name"
 msgstr "nom_trigger"
 
-#: sql_help.c:452 sql_help.c:453 sql_help.c:1015 sql_help.c:1016
-#: sql_help.c:1781 sql_help.c:2186
+#: sql_help.c:452 sql_help.c:453 sql_help.c:1013 sql_help.c:1014
+#: sql_help.c:1779 sql_help.c:2184
 msgid "parent_table"
 msgstr "table_parent"
 
-#: sql_help.c:504 sql_help.c:1825
+#: sql_help.c:504 sql_help.c:1823
 msgid "execution_cost"
-msgstr "coût_exécution"
+msgstr "coût_exécution"
 
-#: sql_help.c:505 sql_help.c:1826
+#: sql_help.c:505 sql_help.c:1824
 msgid "result_rows"
-msgstr "lignes_de_résultat"
+msgstr "lignes_de_résultat"
 
-#: sql_help.c:526 sql_help.c:528 sql_help.c:786 sql_help.c:794 sql_help.c:798
-#: sql_help.c:801 sql_help.c:804 sql_help.c:1211 sql_help.c:1219
-#: sql_help.c:1222 sql_help.c:1224 sql_help.c:1226 sql_help.c:2073
-#: sql_help.c:2075 sql_help.c:2078 sql_help.c:2079 sql_help.c:3040
-#: sql_help.c:3044 sql_help.c:3047 sql_help.c:3049 sql_help.c:3051
-#: sql_help.c:3053 sql_help.c:3055 sql_help.c:3061 sql_help.c:3063
-#: sql_help.c:3065 sql_help.c:3067 sql_help.c:3069 sql_help.c:3071
+#: sql_help.c:526 sql_help.c:528 sql_help.c:784 sql_help.c:792 sql_help.c:796
+#: sql_help.c:799 sql_help.c:802 sql_help.c:1209 sql_help.c:1217
+#: sql_help.c:1220 sql_help.c:1222 sql_help.c:1224 sql_help.c:2071
+#: sql_help.c:2073 sql_help.c:2076 sql_help.c:2077 sql_help.c:3038
+#: sql_help.c:3042 sql_help.c:3045 sql_help.c:3047 sql_help.c:3049
+#: sql_help.c:3051 sql_help.c:3053 sql_help.c:3059 sql_help.c:3061
+#: sql_help.c:3063 sql_help.c:3065 sql_help.c:3067 sql_help.c:3069
 msgid "role_specification"
 msgstr "specification_role"
 
-#: sql_help.c:527 sql_help.c:529 sql_help.c:1238 sql_help.c:1671
-#: sql_help.c:2081 sql_help.c:2493 sql_help.c:2882 sql_help.c:3698
+#: sql_help.c:527 sql_help.c:529 sql_help.c:1236 sql_help.c:1669
+#: sql_help.c:2079 sql_help.c:2491 sql_help.c:2880 sql_help.c:3696
 msgid "user_name"
 msgstr "nom_utilisateur"
 
-#: sql_help.c:530 sql_help.c:806 sql_help.c:1227 sql_help.c:2080
-#: sql_help.c:3072
+#: sql_help.c:530 sql_help.c:804 sql_help.c:1225 sql_help.c:2078
+#: sql_help.c:3070
 msgid "where role_specification can be:"
-msgstr "où specification_role peut être :"
+msgstr "où specification_role peut être :"
 
 #: sql_help.c:532
 msgid "group_name"
 msgstr "nom_groupe"
 
-#: sql_help.c:549 sql_help.c:1676 sql_help.c:1889 sql_help.c:1921
-#: sql_help.c:2189 sql_help.c:2197 sql_help.c:2229 sql_help.c:2251
-#: sql_help.c:2263 sql_help.c:3068 sql_help.c:3400
+#: sql_help.c:549 sql_help.c:1674 sql_help.c:1887 sql_help.c:1919
+#: sql_help.c:2187 sql_help.c:2195 sql_help.c:2227 sql_help.c:2249
+#: sql_help.c:2261 sql_help.c:3066 sql_help.c:3398
 msgid "tablespace_name"
 msgstr "nom_tablespace"
 
-#: sql_help.c:551 sql_help.c:554 sql_help.c:630 sql_help.c:632 sql_help.c:1012
-#: sql_help.c:1014 sql_help.c:1887 sql_help.c:1919 sql_help.c:2187
-#: sql_help.c:2195 sql_help.c:2227 sql_help.c:2249
+#: sql_help.c:551 sql_help.c:554 sql_help.c:629 sql_help.c:631 sql_help.c:1010
+#: sql_help.c:1012 sql_help.c:1885 sql_help.c:1917 sql_help.c:2185
+#: sql_help.c:2193 sql_help.c:2225 sql_help.c:2247
 msgid "storage_parameter"
-msgstr "paramètre_stockage"
+msgstr "paramètre_stockage"
 
-#: sql_help.c:577 sql_help.c:1395 sql_help.c:3483
+#: sql_help.c:577 sql_help.c:1393 sql_help.c:3481
 msgid "large_object_oid"
 msgstr "oid_large_object"
 
-#: sql_help.c:629 sql_help.c:1010 sql_help.c:1019 sql_help.c:1022
-#: sql_help.c:1319
+#: sql_help.c:628 sql_help.c:1008 sql_help.c:1017 sql_help.c:1020
+#: sql_help.c:1317
 msgid "index_name"
 msgstr "nom_index"
 
-#: sql_help.c:705 sql_help.c:717 sql_help.c:1960
+#: sql_help.c:703 sql_help.c:715 sql_help.c:1958
 msgid "strategy_number"
-msgstr "numéro_de_stratégie"
+msgstr "numéro_de_stratégie"
 
-#: sql_help.c:707 sql_help.c:708 sql_help.c:711 sql_help.c:712 sql_help.c:718
-#: sql_help.c:719 sql_help.c:721 sql_help.c:722 sql_help.c:1962 sql_help.c:1963
-#: sql_help.c:1966 sql_help.c:1967
+#: sql_help.c:705 sql_help.c:706 sql_help.c:709 sql_help.c:710 sql_help.c:716
+#: sql_help.c:717 sql_help.c:719 sql_help.c:720 sql_help.c:1960 sql_help.c:1961
+#: sql_help.c:1964 sql_help.c:1965
 msgid "op_type"
 msgstr "type_op"
 
-#: sql_help.c:709 sql_help.c:1964
+#: sql_help.c:707 sql_help.c:1962
 msgid "sort_family_name"
 msgstr "nom_famille_tri"
 
-#: sql_help.c:710 sql_help.c:720 sql_help.c:1965
+#: sql_help.c:708 sql_help.c:718 sql_help.c:1963
 msgid "support_number"
-msgstr "numéro_de_support"
+msgstr "numéro_de_support"
 
-#: sql_help.c:714 sql_help.c:1619 sql_help.c:1969 sql_help.c:2340
-#: sql_help.c:2342
+#: sql_help.c:712 sql_help.c:1617 sql_help.c:1967 sql_help.c:2338
+#: sql_help.c:2340
 msgid "argument_type"
 msgstr "type_argument"
 
-#: sql_help.c:745 sql_help.c:748 sql_help.c:816 sql_help.c:852 sql_help.c:1135
-#: sql_help.c:1278 sql_help.c:1318 sql_help.c:1380 sql_help.c:1405
-#: sql_help.c:1409 sql_help.c:1422 sql_help.c:1479 sql_help.c:1484
-#: sql_help.c:1773 sql_help.c:1881 sql_help.c:1917 sql_help.c:1992
-#: sql_help.c:2050 sql_help.c:2098 sql_help.c:2178 sql_help.c:2190
-#: sql_help.c:2247 sql_help.c:2365 sql_help.c:2542 sql_help.c:2751
-#: sql_help.c:2768 sql_help.c:2858 sql_help.c:3038 sql_help.c:3043
-#: sql_help.c:3088 sql_help.c:3119 sql_help.c:3370 sql_help.c:3375
-#: sql_help.c:3471 sql_help.c:3568 sql_help.c:3570 sql_help.c:3619
-#: sql_help.c:3658 sql_help.c:3807 sql_help.c:3809 sql_help.c:3858
-#: sql_help.c:3892 sql_help.c:3914 sql_help.c:3916 sql_help.c:3917
-#: sql_help.c:4001 sql_help.c:4003 sql_help.c:4052
+#: sql_help.c:743 sql_help.c:746 sql_help.c:814 sql_help.c:850 sql_help.c:1133
+#: sql_help.c:1276 sql_help.c:1316 sql_help.c:1378 sql_help.c:1403
+#: sql_help.c:1407 sql_help.c:1420 sql_help.c:1477 sql_help.c:1482
+#: sql_help.c:1771 sql_help.c:1879 sql_help.c:1915 sql_help.c:1990
+#: sql_help.c:2048 sql_help.c:2096 sql_help.c:2176 sql_help.c:2188
+#: sql_help.c:2245 sql_help.c:2363 sql_help.c:2540 sql_help.c:2749
+#: sql_help.c:2766 sql_help.c:2856 sql_help.c:3036 sql_help.c:3041
+#: sql_help.c:3086 sql_help.c:3117 sql_help.c:3368 sql_help.c:3373
+#: sql_help.c:3469 sql_help.c:3566 sql_help.c:3568 sql_help.c:3617
+#: sql_help.c:3656 sql_help.c:3805 sql_help.c:3807 sql_help.c:3856
+#: sql_help.c:3890 sql_help.c:3912 sql_help.c:3914 sql_help.c:3915
+#: sql_help.c:3999 sql_help.c:4001 sql_help.c:4050
 msgid "table_name"
 msgstr "nom_table"
 
-#: sql_help.c:750 sql_help.c:1994
+#: sql_help.c:748 sql_help.c:1992
 msgid "using_expression"
 msgstr "expression_using"
 
-#: sql_help.c:751 sql_help.c:1995
+#: sql_help.c:749 sql_help.c:1993
 msgid "check_expression"
 msgstr "expression_check"
 
-#: sql_help.c:790 sql_help.c:1215 sql_help.c:1861 sql_help.c:2027
-#: sql_help.c:2476
+#: sql_help.c:788 sql_help.c:1213 sql_help.c:1859 sql_help.c:2025
+#: sql_help.c:2474
 msgid "password"
 msgstr "mot_de_passe"
 
-#: sql_help.c:791 sql_help.c:1216 sql_help.c:1862 sql_help.c:2028
-#: sql_help.c:2477
+#: sql_help.c:789 sql_help.c:1214 sql_help.c:1860 sql_help.c:2026
+#: sql_help.c:2475
 msgid "timestamp"
 msgstr "horodatage"
 
-#: sql_help.c:795 sql_help.c:799 sql_help.c:802 sql_help.c:805 sql_help.c:3048
-#: sql_help.c:3380
+#: sql_help.c:793 sql_help.c:797 sql_help.c:800 sql_help.c:803 sql_help.c:3046
+#: sql_help.c:3378
 msgid "database_name"
-msgstr "nom_base_de_donnée"
+msgstr "nom_base_de_donnée"
 
-#: sql_help.c:846 sql_help.c:2093
+#: sql_help.c:844 sql_help.c:2091
 msgid "increment"
-msgstr "incrément"
+msgstr "incrément"
 
-#: sql_help.c:847 sql_help.c:2094
+#: sql_help.c:845 sql_help.c:2092
 msgid "minvalue"
 msgstr "valeur_min"
 
-#: sql_help.c:848 sql_help.c:2095
+#: sql_help.c:846 sql_help.c:2093
 msgid "maxvalue"
 msgstr "valeur_max"
 
-#: sql_help.c:849 sql_help.c:2096 sql_help.c:3566 sql_help.c:3656
-#: sql_help.c:3805 sql_help.c:3934 sql_help.c:3999
+#: sql_help.c:847 sql_help.c:2094 sql_help.c:3564 sql_help.c:3654
+#: sql_help.c:3803 sql_help.c:3932 sql_help.c:3997
 msgid "start"
-msgstr "début"
+msgstr "début"
 
-#: sql_help.c:850
+#: sql_help.c:848
 msgid "restart"
-msgstr "nouveau_début"
+msgstr "nouveau_début"
 
-#: sql_help.c:851 sql_help.c:2097
+#: sql_help.c:849 sql_help.c:2095
 msgid "cache"
 msgstr "cache"
 
-#: sql_help.c:998
+#: sql_help.c:996
 msgid "table_constraint_using_index"
 msgstr "contrainte_table_utilisant_index"
 
-#: sql_help.c:1006 sql_help.c:1007 sql_help.c:1008 sql_help.c:1009
+#: sql_help.c:1004 sql_help.c:1005 sql_help.c:1006 sql_help.c:1007
 msgid "rewrite_rule_name"
-msgstr "nom_règle_réécriture"
+msgstr "nom_règle_réécriture"
 
-#: sql_help.c:1020
+#: sql_help.c:1018
 msgid "and table_constraint_using_index is:"
 msgstr "et contrainte_table_utilisant_index est :"
 
-#: sql_help.c:1038 sql_help.c:1041 sql_help.c:2266
+#: sql_help.c:1036 sql_help.c:1039 sql_help.c:2264
 msgid "tablespace_option"
 msgstr "option_tablespace"
 
-#: sql_help.c:1062 sql_help.c:1065 sql_help.c:1071 sql_help.c:1075
+#: sql_help.c:1060 sql_help.c:1063 sql_help.c:1069 sql_help.c:1073
 msgid "token_type"
 msgstr "type_jeton"
 
-#: sql_help.c:1063 sql_help.c:1066
+#: sql_help.c:1061 sql_help.c:1064
 msgid "dictionary_name"
 msgstr "nom_dictionnaire"
 
-#: sql_help.c:1068 sql_help.c:1072
+#: sql_help.c:1066 sql_help.c:1070
 msgid "old_dictionary"
 msgstr "ancien_dictionnaire"
 
-#: sql_help.c:1069 sql_help.c:1073
+#: sql_help.c:1067 sql_help.c:1071
 msgid "new_dictionary"
 msgstr "nouveau_dictionnaire"
 
-#: sql_help.c:1160 sql_help.c:1170 sql_help.c:1173 sql_help.c:1174
-#: sql_help.c:2415
+#: sql_help.c:1158 sql_help.c:1168 sql_help.c:1171 sql_help.c:1172
+#: sql_help.c:2413
 msgid "attribute_name"
 msgstr "nom_attribut"
 
-#: sql_help.c:1161
+#: sql_help.c:1159
 msgid "new_attribute_name"
 msgstr "nouveau_nom_attribut"
 
-#: sql_help.c:1167
+#: sql_help.c:1165
 msgid "new_enum_value"
 msgstr "nouvelle_valeur_enum"
 
-#: sql_help.c:1168
+#: sql_help.c:1166
 msgid "existing_enum_value"
 msgstr "valeur_enum_existante"
 
-#: sql_help.c:1239 sql_help.c:1782 sql_help.c:2109 sql_help.c:2494
-#: sql_help.c:2883 sql_help.c:3054 sql_help.c:3089 sql_help.c:3386
+#: sql_help.c:1237 sql_help.c:1780 sql_help.c:2107 sql_help.c:2492
+#: sql_help.c:2881 sql_help.c:3052 sql_help.c:3087 sql_help.c:3384
 msgid "server_name"
 msgstr "nom_serveur"
 
-#: sql_help.c:1267 sql_help.c:1270 sql_help.c:2509
+#: sql_help.c:1265 sql_help.c:1268 sql_help.c:2507
 msgid "view_option_name"
 msgstr "nom_option_vue"
 
-#: sql_help.c:1268 sql_help.c:2510
+#: sql_help.c:1266 sql_help.c:2508
 msgid "view_option_value"
 msgstr "valeur_option_vue"
 
-#: sql_help.c:1293 sql_help.c:3714 sql_help.c:3716 sql_help.c:3740
+#: sql_help.c:1291 sql_help.c:3712 sql_help.c:3714 sql_help.c:3738
 msgid "transaction_mode"
 msgstr "mode_transaction"
 
-#: sql_help.c:1294 sql_help.c:3717 sql_help.c:3741
+#: sql_help.c:1292 sql_help.c:3715 sql_help.c:3739
 msgid "where transaction_mode is one of:"
-msgstr "où mode_transaction fait partie de :"
+msgstr "où mode_transaction fait partie de :"
 
-#: sql_help.c:1377
+#: sql_help.c:1375
 msgid "relation_name"
 msgstr "nom_relation"
 
-#: sql_help.c:1382 sql_help.c:3050 sql_help.c:3382
+#: sql_help.c:1380 sql_help.c:3048 sql_help.c:3380
 msgid "domain_name"
 msgstr "nom_domaine"
 
-#: sql_help.c:1404
+#: sql_help.c:1402
 msgid "policy_name"
 msgstr "nom_politique"
 
-#: sql_help.c:1408
+#: sql_help.c:1406
 msgid "rule_name"
-msgstr "nom_règle"
+msgstr "nom_règle"
 
-#: sql_help.c:1425
+#: sql_help.c:1423
 msgid "text"
 msgstr "texte"
 
-#: sql_help.c:1450 sql_help.c:3232 sql_help.c:3420
+#: sql_help.c:1448 sql_help.c:3230 sql_help.c:3418
 msgid "transaction_id"
 msgstr "id_transaction"
 
-#: sql_help.c:1481 sql_help.c:1487 sql_help.c:3158
+#: sql_help.c:1479 sql_help.c:1485 sql_help.c:3156
 msgid "filename"
 msgstr "nom_fichier"
 
-#: sql_help.c:1482 sql_help.c:1488 sql_help.c:2052 sql_help.c:2053
-#: sql_help.c:2054
+#: sql_help.c:1480 sql_help.c:1486 sql_help.c:2050 sql_help.c:2051
+#: sql_help.c:2052
 msgid "command"
 msgstr "commande"
 
-#: sql_help.c:1486 sql_help.c:1922 sql_help.c:2252 sql_help.c:2511
-#: sql_help.c:2529 sql_help.c:3123
+#: sql_help.c:1484 sql_help.c:1920 sql_help.c:2250 sql_help.c:2509
+#: sql_help.c:2527 sql_help.c:3121
 msgid "query"
-msgstr "requête"
+msgstr "requête"
 
-#: sql_help.c:1490 sql_help.c:2928
+#: sql_help.c:1488 sql_help.c:2926
 msgid "where option can be one of:"
-msgstr "où option fait partie de :"
+msgstr "où option fait partie de :"
 
-#: sql_help.c:1491
+#: sql_help.c:1489
 msgid "format_name"
 msgstr "nom_format"
 
-#: sql_help.c:1492 sql_help.c:1493 sql_help.c:1496 sql_help.c:2929
-#: sql_help.c:2930 sql_help.c:2931 sql_help.c:2932 sql_help.c:2933
+#: sql_help.c:1490 sql_help.c:1491 sql_help.c:1494 sql_help.c:2927
+#: sql_help.c:2928 sql_help.c:2929 sql_help.c:2930 sql_help.c:2931
 msgid "boolean"
 msgstr "boolean"
 
-#: sql_help.c:1494
+#: sql_help.c:1492
 msgid "delimiter_character"
-msgstr "caractère_délimiteur"
+msgstr "caractère_délimiteur"
 
-#: sql_help.c:1495
+#: sql_help.c:1493
 msgid "null_string"
-msgstr "chaîne_null"
+msgstr "chaîne_null"
 
-#: sql_help.c:1497
+#: sql_help.c:1495
 msgid "quote_character"
-msgstr "caractère_guillemet"
+msgstr "caractère_guillemet"
 
-#: sql_help.c:1498
+#: sql_help.c:1496
 msgid "escape_character"
-msgstr "chaîne_d_échappement"
+msgstr "chaîne_d_échappement"
 
-#: sql_help.c:1502
+#: sql_help.c:1500
 msgid "encoding_name"
 msgstr "nom_encodage"
 
-#: sql_help.c:1559 sql_help.c:1575 sql_help.c:1578
+#: sql_help.c:1557 sql_help.c:1573 sql_help.c:1576
 msgid "arg_data_type"
-msgstr "type_données_arg"
+msgstr "type_données_arg"
 
-#: sql_help.c:1560 sql_help.c:1579 sql_help.c:1587
+#: sql_help.c:1558 sql_help.c:1577 sql_help.c:1585
 msgid "sfunc"
 msgstr "sfunc"
 
-#: sql_help.c:1561 sql_help.c:1580 sql_help.c:1588
+#: sql_help.c:1559 sql_help.c:1578 sql_help.c:1586
 msgid "state_data_type"
-msgstr "type_de_données_statut"
+msgstr "type_de_données_statut"
 
-#: sql_help.c:1562 sql_help.c:1581 sql_help.c:1589
+#: sql_help.c:1560 sql_help.c:1579 sql_help.c:1587
 msgid "state_data_size"
-msgstr "taille_de_données_statut"
+msgstr "taille_de_données_statut"
 
-#: sql_help.c:1563 sql_help.c:1582 sql_help.c:1590
+#: sql_help.c:1561 sql_help.c:1580 sql_help.c:1588
 msgid "ffunc"
 msgstr "ffunc"
 
-#: sql_help.c:1564 sql_help.c:1583 sql_help.c:1591
+#: sql_help.c:1562 sql_help.c:1581 sql_help.c:1589
 msgid "initial_condition"
 msgstr "condition_initiale"
 
-#: sql_help.c:1565 sql_help.c:1592
+#: sql_help.c:1563 sql_help.c:1590
 msgid "msfunc"
 msgstr "msfunc"
 
-#: sql_help.c:1566 sql_help.c:1593
+#: sql_help.c:1564 sql_help.c:1591
 msgid "minvfunc"
 msgstr "minvfunc"
 
-#: sql_help.c:1567 sql_help.c:1594
+#: sql_help.c:1565 sql_help.c:1592
 msgid "mstate_data_type"
-msgstr "m_type_de_données_statut"
+msgstr "m_type_de_données_statut"
 
-#: sql_help.c:1568 sql_help.c:1595
+#: sql_help.c:1566 sql_help.c:1593
 msgid "mstate_data_size"
-msgstr "m_taille_de_données_statut"
+msgstr "m_taille_de_données_statut"
 
-#: sql_help.c:1569 sql_help.c:1596
+#: sql_help.c:1567 sql_help.c:1594
 msgid "mffunc"
 msgstr "mffunc"
 
-#: sql_help.c:1570 sql_help.c:1597
+#: sql_help.c:1568 sql_help.c:1595
 msgid "minitial_condition"
 msgstr "m_condition_initiale"
 
-#: sql_help.c:1571 sql_help.c:1598
+#: sql_help.c:1569 sql_help.c:1596
 msgid "sort_operator"
-msgstr "opérateur_de_tri"
+msgstr "opérateur_de_tri"
 
-#: sql_help.c:1584
+#: sql_help.c:1582
 msgid "or the old syntax"
 msgstr "ou l'ancienne syntaxe"
 
-#: sql_help.c:1586
+#: sql_help.c:1584
 msgid "base_type"
 msgstr "type_base"
 
-#: sql_help.c:1637
+#: sql_help.c:1635
 msgid "locale"
 msgstr "locale"
 
-#: sql_help.c:1638 sql_help.c:1674
+#: sql_help.c:1636 sql_help.c:1672
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:1639 sql_help.c:1675
+#: sql_help.c:1637 sql_help.c:1673
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:1641
+#: sql_help.c:1639
 msgid "existing_collation"
 msgstr "collationnement_existant"
 
-#: sql_help.c:1651
+#: sql_help.c:1649
 msgid "source_encoding"
 msgstr "encodage_source"
 
-#: sql_help.c:1652
+#: sql_help.c:1650
 msgid "dest_encoding"
 msgstr "encodage_destination"
 
-#: sql_help.c:1672 sql_help.c:2292
+#: sql_help.c:1670 sql_help.c:2290
 msgid "template"
-msgstr "modèle"
+msgstr "modèle"
 
-#: sql_help.c:1673
+#: sql_help.c:1671
 msgid "encoding"
 msgstr "encodage"
 
-#: sql_help.c:1699
+#: sql_help.c:1697
 msgid "constraint"
 msgstr "contrainte"
 
-#: sql_help.c:1700
+#: sql_help.c:1698
 msgid "where constraint is:"
-msgstr "où la contrainte est :"
+msgstr "où la contrainte est :"
 
-#: sql_help.c:1714 sql_help.c:2049 sql_help.c:2364
+#: sql_help.c:1712 sql_help.c:2047 sql_help.c:2362
 msgid "event"
-msgstr "événement"
+msgstr "événement"
 
-#: sql_help.c:1715
+#: sql_help.c:1713
 msgid "filter_variable"
 msgstr "filter_variable"
 
-#: sql_help.c:1727
+#: sql_help.c:1725
 msgid "extension_name"
 msgstr "nom_extension"
 
-#: sql_help.c:1729
+#: sql_help.c:1727
 msgid "version"
 msgstr "version"
 
-#: sql_help.c:1730
+#: sql_help.c:1728
 msgid "old_version"
 msgstr "ancienne_version"
 
-#: sql_help.c:1785 sql_help.c:2198
+#: sql_help.c:1783 sql_help.c:2196
 msgid "where column_constraint is:"
-msgstr "où contrainte_colonne est :"
+msgstr "où contrainte_colonne est :"
 
-#: sql_help.c:1788 sql_help.c:1819 sql_help.c:2201
+#: sql_help.c:1786 sql_help.c:1817 sql_help.c:2199
 msgid "default_expr"
-msgstr "expression_par_défaut"
+msgstr "expression_par_défaut"
 
-#: sql_help.c:1789 sql_help.c:2208
+#: sql_help.c:1787 sql_help.c:2206
 msgid "and table_constraint is:"
 msgstr "et contrainte_table est :"
 
-#: sql_help.c:1820
+#: sql_help.c:1818
 msgid "rettype"
 msgstr "type_en_retour"
 
-#: sql_help.c:1822
+#: sql_help.c:1820
 msgid "column_type"
 msgstr "type_colonne"
 
-#: sql_help.c:1830
+#: sql_help.c:1828
 msgid "definition"
-msgstr "définition"
+msgstr "définition"
 
-#: sql_help.c:1831
+#: sql_help.c:1829
 msgid "obj_file"
 msgstr "fichier_objet"
 
-#: sql_help.c:1832
+#: sql_help.c:1830
 msgid "link_symbol"
 msgstr "symbole_link"
 
-#: sql_help.c:1833
+#: sql_help.c:1831
 msgid "attribute"
 msgstr "attribut"
 
-#: sql_help.c:1868 sql_help.c:2034 sql_help.c:2483
+#: sql_help.c:1866 sql_help.c:2032 sql_help.c:2481
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:1882
+#: sql_help.c:1880
 msgid "method"
-msgstr "méthode"
+msgstr "méthode"
 
-#: sql_help.c:1886 sql_help.c:2233 sql_help.c:3132
+#: sql_help.c:1884 sql_help.c:2231 sql_help.c:3130
 msgid "opclass"
-msgstr "classe_d_opérateur"
+msgstr "classe_d_opérateur"
 
-#: sql_help.c:1890 sql_help.c:2219
+#: sql_help.c:1888 sql_help.c:2217
 msgid "predicate"
-msgstr "prédicat"
+msgstr "prédicat"
 
-#: sql_help.c:1902
+#: sql_help.c:1900
 msgid "call_handler"
 msgstr "gestionnaire_d_appel"
 
-#: sql_help.c:1903
+#: sql_help.c:1901
 msgid "inline_handler"
 msgstr "gestionnaire_en_ligne"
 
-#: sql_help.c:1904
+#: sql_help.c:1902
 msgid "valfunction"
 msgstr "fonction_val"
 
-#: sql_help.c:1940
+#: sql_help.c:1938
 msgid "com_op"
 msgstr "com_op"
 
-#: sql_help.c:1941
+#: sql_help.c:1939
 msgid "neg_op"
 msgstr "neg_op"
 
-#: sql_help.c:1942
+#: sql_help.c:1940
 msgid "res_proc"
 msgstr "res_proc"
 
-#: sql_help.c:1943
+#: sql_help.c:1941
 msgid "join_proc"
 msgstr "join_proc"
 
-#: sql_help.c:1959
+#: sql_help.c:1957
 msgid "family_name"
 msgstr "nom_famille"
 
-#: sql_help.c:1970
+#: sql_help.c:1968
 msgid "storage_type"
 msgstr "type_stockage"
 
-#: sql_help.c:2051 sql_help.c:2367 sql_help.c:2545 sql_help.c:3142
-#: sql_help.c:3557 sql_help.c:3559 sql_help.c:3647 sql_help.c:3649
-#: sql_help.c:3796 sql_help.c:3798 sql_help.c:3901 sql_help.c:3990
-#: sql_help.c:3992
+#: sql_help.c:2049 sql_help.c:2365 sql_help.c:2543 sql_help.c:3140
+#: sql_help.c:3555 sql_help.c:3557 sql_help.c:3645 sql_help.c:3647
+#: sql_help.c:3794 sql_help.c:3796 sql_help.c:3899 sql_help.c:3988
+#: sql_help.c:3990
 msgid "condition"
 msgstr "condition"
 
-#: sql_help.c:2055 sql_help.c:2370
+#: sql_help.c:2053 sql_help.c:2368
 msgid "where event can be one of:"
-msgstr "où événement fait partie de :"
+msgstr "où événement fait partie de :"
 
-#: sql_help.c:2074 sql_help.c:2076
+#: sql_help.c:2072 sql_help.c:2074
 msgid "schema_element"
-msgstr "élément_schéma"
+msgstr "élément_schéma"
 
-#: sql_help.c:2110
+#: sql_help.c:2108
 msgid "server_type"
 msgstr "type_serveur"
 
-#: sql_help.c:2111
+#: sql_help.c:2109
 msgid "server_version"
 msgstr "version_serveur"
 
-#: sql_help.c:2112 sql_help.c:3052 sql_help.c:3384
+#: sql_help.c:2110 sql_help.c:3050 sql_help.c:3382
 msgid "fdw_name"
 msgstr "nom_fdw"
 
-#: sql_help.c:2184
+#: sql_help.c:2182
 msgid "source_table"
 msgstr "table_source"
 
-#: sql_help.c:2185
+#: sql_help.c:2183
 msgid "like_option"
 msgstr "option_like"
 
-#: sql_help.c:2202 sql_help.c:2203 sql_help.c:2212 sql_help.c:2214
-#: sql_help.c:2218
+#: sql_help.c:2200 sql_help.c:2201 sql_help.c:2210 sql_help.c:2212
+#: sql_help.c:2216
 msgid "index_parameters"
-msgstr "paramètres_index"
+msgstr "paramètres_index"
 
-#: sql_help.c:2204 sql_help.c:2221
+#: sql_help.c:2202 sql_help.c:2219
 msgid "reftable"
-msgstr "table_référence"
+msgstr "table_référence"
 
-#: sql_help.c:2205 sql_help.c:2222
+#: sql_help.c:2203 sql_help.c:2220
 msgid "refcolumn"
-msgstr "colonne_référence"
+msgstr "colonne_référence"
 
-#: sql_help.c:2216
+#: sql_help.c:2214
 msgid "exclude_element"
-msgstr "élément_exclusion"
+msgstr "élément_exclusion"
 
-#: sql_help.c:2217 sql_help.c:3564 sql_help.c:3654 sql_help.c:3803
-#: sql_help.c:3932 sql_help.c:3997
+#: sql_help.c:2215 sql_help.c:3562 sql_help.c:3652 sql_help.c:3801
+#: sql_help.c:3930 sql_help.c:3995
 msgid "operator"
-msgstr "opérateur"
+msgstr "opérateur"
 
-#: sql_help.c:2225
+#: sql_help.c:2223
 msgid "and like_option is:"
 msgstr "et option_like est :"
 
-#: sql_help.c:2226
+#: sql_help.c:2224
 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 :"
+msgstr "dans les contraintes UNIQUE, PRIMARY KEY et EXCLUDE, les paramètres_index sont :"
 
-#: sql_help.c:2230
+#: sql_help.c:2228
 msgid "exclude_element in an EXCLUDE constraint is:"
-msgstr "élément_exclusion dans une contrainte EXCLUDE est :"
+msgstr "élément_exclusion dans une contrainte EXCLUDE est :"
 
-#: sql_help.c:2265
+#: sql_help.c:2263
 msgid "directory"
-msgstr "répertoire"
+msgstr "répertoire"
 
-#: sql_help.c:2279
+#: sql_help.c:2277
 msgid "parser_name"
 msgstr "nom_analyseur"
 
-#: sql_help.c:2280
+#: sql_help.c:2278
 msgid "source_config"
 msgstr "configuration_source"
 
-#: sql_help.c:2309
+#: sql_help.c:2307
 msgid "start_function"
 msgstr "fonction_start"
 
-#: sql_help.c:2310
+#: sql_help.c:2308
 msgid "gettoken_function"
 msgstr "fonction_gettoken"
 
-#: sql_help.c:2311
+#: sql_help.c:2309
 msgid "end_function"
 msgstr "fonction_end"
 
-#: sql_help.c:2312
+#: sql_help.c:2310
 msgid "lextypes_function"
 msgstr "fonction_lextypes"
 
-#: sql_help.c:2313
+#: sql_help.c:2311
 msgid "headline_function"
 msgstr "fonction_headline"
 
-#: sql_help.c:2325
+#: sql_help.c:2323
 msgid "init_function"
 msgstr "fonction_init"
 
-#: sql_help.c:2326
+#: sql_help.c:2324
 msgid "lexize_function"
 msgstr "fonction_lexize"
 
-#: sql_help.c:2339
+#: sql_help.c:2337
 msgid "from_sql_function_name"
 msgstr "nom_fonction_from_sql"
 
-#: sql_help.c:2341
+#: sql_help.c:2339
 msgid "to_sql_function_name"
 msgstr "nom_fonction_to_sql"
 
-#: sql_help.c:2366
+#: sql_help.c:2364
 msgid "referenced_table_name"
-msgstr "nom_table_référencée"
+msgstr "nom_table_référencée"
 
-#: sql_help.c:2369
+#: sql_help.c:2367
 msgid "arguments"
 msgstr "arguments"
 
-#: sql_help.c:2419 sql_help.c:3492
+#: sql_help.c:2417 sql_help.c:3490
 msgid "label"
 msgstr "label"
 
-#: sql_help.c:2421
+#: sql_help.c:2419
 msgid "subtype"
 msgstr "sous_type"
 
-#: sql_help.c:2422
+#: sql_help.c:2420
 msgid "subtype_operator_class"
-msgstr "classe_opérateur_sous_type"
+msgstr "classe_opérateur_sous_type"
 
-#: sql_help.c:2424
+#: sql_help.c:2422
 msgid "canonical_function"
 msgstr "fonction_canonique"
 
-#: sql_help.c:2425
+#: sql_help.c:2423
 msgid "subtype_diff_function"
 msgstr "fonction_diff_sous_type"
 
-#: sql_help.c:2427
+#: sql_help.c:2425
 msgid "input_function"
 msgstr "fonction_en_sortie"
 
-#: sql_help.c:2428
+#: sql_help.c:2426
 msgid "output_function"
 msgstr "fonction_en_sortie"
 
-#: sql_help.c:2429
+#: sql_help.c:2427
 msgid "receive_function"
 msgstr "fonction_receive"
 
-#: sql_help.c:2430
+#: sql_help.c:2428
 msgid "send_function"
 msgstr "fonction_send"
 
-#: sql_help.c:2431
+#: sql_help.c:2429
 msgid "type_modifier_input_function"
-msgstr "fonction_en_entrée_modificateur_type"
+msgstr "fonction_en_entrée_modificateur_type"
 
-#: sql_help.c:2432
+#: sql_help.c:2430
 msgid "type_modifier_output_function"
 msgstr "fonction_en_sortie_modificateur_type"
 
-#: sql_help.c:2433
+#: sql_help.c:2431
 msgid "analyze_function"
 msgstr "fonction_analyze"
 
-#: sql_help.c:2434
+#: sql_help.c:2432
 msgid "internallength"
 msgstr "longueur_interne"
 
-#: sql_help.c:2435
+#: sql_help.c:2433
 msgid "alignment"
 msgstr "alignement"
 
-#: sql_help.c:2436
+#: sql_help.c:2434
 msgid "storage"
 msgstr "stockage"
 
-#: sql_help.c:2437
+#: sql_help.c:2435
 msgid "like_type"
 msgstr "type_like"
 
-#: sql_help.c:2438
+#: sql_help.c:2436
 msgid "category"
-msgstr "catégorie"
+msgstr "catégorie"
 
-#: sql_help.c:2439
+#: sql_help.c:2437
 msgid "preferred"
-msgstr "préféré"
+msgstr "préféré"
 
-#: sql_help.c:2440
+#: sql_help.c:2438
 msgid "default"
-msgstr "par défaut"
+msgstr "par défaut"
 
-#: sql_help.c:2441
+#: sql_help.c:2439
 msgid "element"
-msgstr "élément"
+msgstr "élément"
 
-#: sql_help.c:2442
+#: sql_help.c:2440
 msgid "delimiter"
-msgstr "délimiteur"
+msgstr "délimiteur"
 
-#: sql_help.c:2443
+#: sql_help.c:2441
 msgid "collatable"
 msgstr "collationnable"
 
-#: sql_help.c:2541 sql_help.c:3118 sql_help.c:3552 sql_help.c:3641
-#: sql_help.c:3791 sql_help.c:3891 sql_help.c:3985
+#: sql_help.c:2539 sql_help.c:3116 sql_help.c:3550 sql_help.c:3639
+#: sql_help.c:3789 sql_help.c:3889 sql_help.c:3983
 msgid "with_query"
-msgstr "requête_with"
+msgstr "requête_with"
 
-#: sql_help.c:2543 sql_help.c:3120 sql_help.c:3571 sql_help.c:3577
-#: sql_help.c:3580 sql_help.c:3584 sql_help.c:3588 sql_help.c:3596
-#: sql_help.c:3810 sql_help.c:3816 sql_help.c:3819 sql_help.c:3823
-#: sql_help.c:3827 sql_help.c:3835 sql_help.c:3893 sql_help.c:4004
-#: sql_help.c:4010 sql_help.c:4013 sql_help.c:4017 sql_help.c:4021
-#: sql_help.c:4029
+#: sql_help.c:2541 sql_help.c:3118 sql_help.c:3569 sql_help.c:3575
+#: sql_help.c:3578 sql_help.c:3582 sql_help.c:3586 sql_help.c:3594
+#: sql_help.c:3808 sql_help.c:3814 sql_help.c:3817 sql_help.c:3821
+#: sql_help.c:3825 sql_help.c:3833 sql_help.c:3891 sql_help.c:4002
+#: sql_help.c:4008 sql_help.c:4011 sql_help.c:4015 sql_help.c:4019
+#: sql_help.c:4027
 msgid "alias"
 msgstr "alias"
 
-#: sql_help.c:2544
+#: sql_help.c:2542
 msgid "using_list"
 msgstr "liste_using"
 
-#: sql_help.c:2546 sql_help.c:2959 sql_help.c:3199 sql_help.c:3902
+#: sql_help.c:2544 sql_help.c:2957 sql_help.c:3197 sql_help.c:3900
 msgid "cursor_name"
 msgstr "nom_curseur"
 
-#: sql_help.c:2547 sql_help.c:3126 sql_help.c:3903
+#: sql_help.c:2545 sql_help.c:3124 sql_help.c:3901
 msgid "output_expression"
 msgstr "expression_en_sortie"
 
-#: sql_help.c:2548 sql_help.c:3127 sql_help.c:3555 sql_help.c:3644
-#: sql_help.c:3794 sql_help.c:3904 sql_help.c:3988
+#: sql_help.c:2546 sql_help.c:3125 sql_help.c:3553 sql_help.c:3642
+#: sql_help.c:3792 sql_help.c:3902 sql_help.c:3986
 msgid "output_name"
 msgstr "nom_en_sortie"
 
-#: sql_help.c:2564
+#: sql_help.c:2562
 msgid "code"
 msgstr "code"
 
-#: sql_help.c:2907
+#: sql_help.c:2905
 msgid "parameter"
-msgstr "paramètre"
+msgstr "paramètre"
 
-#: sql_help.c:2926 sql_help.c:2927 sql_help.c:3224
+#: sql_help.c:2924 sql_help.c:2925 sql_help.c:3222
 msgid "statement"
 msgstr "instruction"
 
-#: sql_help.c:2958 sql_help.c:3198
+#: sql_help.c:2956 sql_help.c:3196
 msgid "direction"
 msgstr "direction"
 
-#: sql_help.c:2960 sql_help.c:3200
+#: sql_help.c:2958 sql_help.c:3198
 msgid "where direction can be empty or one of:"
-msgstr "où direction peut être vide ou faire partie de :"
+msgstr "où direction peut être vide ou faire partie de :"
 
-#: sql_help.c:2961 sql_help.c:2962 sql_help.c:2963 sql_help.c:2964
-#: sql_help.c:2965 sql_help.c:3201 sql_help.c:3202 sql_help.c:3203
-#: sql_help.c:3204 sql_help.c:3205 sql_help.c:3565 sql_help.c:3567
-#: sql_help.c:3655 sql_help.c:3657 sql_help.c:3804 sql_help.c:3806
-#: sql_help.c:3933 sql_help.c:3935 sql_help.c:3998 sql_help.c:4000
+#: sql_help.c:2959 sql_help.c:2960 sql_help.c:2961 sql_help.c:2962
+#: sql_help.c:2963 sql_help.c:3199 sql_help.c:3200 sql_help.c:3201
+#: sql_help.c:3202 sql_help.c:3203 sql_help.c:3563 sql_help.c:3565
+#: sql_help.c:3653 sql_help.c:3655 sql_help.c:3802 sql_help.c:3804
+#: sql_help.c:3931 sql_help.c:3933 sql_help.c:3996 sql_help.c:3998
 msgid "count"
 msgstr "nombre"
 
-#: sql_help.c:3045 sql_help.c:3377
+#: sql_help.c:3043 sql_help.c:3375
 msgid "sequence_name"
-msgstr "nom_séquence"
+msgstr "nom_séquence"
 
-#: sql_help.c:3058 sql_help.c:3390
+#: sql_help.c:3056 sql_help.c:3388
 msgid "arg_name"
 msgstr "nom_argument"
 
-#: sql_help.c:3059 sql_help.c:3391
+#: sql_help.c:3057 sql_help.c:3389
 msgid "arg_type"
 msgstr "type_arg"
 
-#: sql_help.c:3064 sql_help.c:3396
+#: sql_help.c:3062 sql_help.c:3394
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:3087
+#: sql_help.c:3085
 msgid "remote_schema"
 msgstr "schema_distant"
 
-#: sql_help.c:3090
+#: sql_help.c:3088
 msgid "local_schema"
-msgstr "schéma_local"
+msgstr "schéma_local"
 
-#: sql_help.c:3124
+#: sql_help.c:3122
 msgid "conflict_target"
 msgstr "cible_conflit"
 
-#: sql_help.c:3125
+#: sql_help.c:3123
 msgid "conflict_action"
 msgstr "action_conflit"
 
-#: sql_help.c:3128
+#: sql_help.c:3126
 msgid "where conflict_target can be one of:"
-msgstr "où cible_conflit fait partie de :"
+msgstr "où cible_conflit fait partie de :"
 
-#: sql_help.c:3129
+#: sql_help.c:3127
 msgid "index_column_name"
 msgstr "index_nom_colonne"
 
-#: sql_help.c:3130
+#: sql_help.c:3128
 msgid "index_expression"
 msgstr "index_expression"
 
-#: sql_help.c:3133
+#: sql_help.c:3131
 msgid "index_predicate"
-msgstr "index_prédicat"
+msgstr "index_prédicat"
 
-#: sql_help.c:3135
+#: sql_help.c:3133
 msgid "and conflict_action is one of:"
-msgstr "où action_conflit fait partie de :"
+msgstr "où action_conflit fait partie de :"
 
-#: sql_help.c:3141 sql_help.c:3899
+#: sql_help.c:3139 sql_help.c:3897
 msgid "sub-SELECT"
 msgstr "sous-SELECT"
 
-#: sql_help.c:3150 sql_help.c:3213 sql_help.c:3875
+#: sql_help.c:3148 sql_help.c:3211 sql_help.c:3873
 msgid "channel"
 msgstr "canal"
 
-#: sql_help.c:3172
+#: sql_help.c:3170
 msgid "lockmode"
 msgstr "mode_de_verrou"
 
-#: sql_help.c:3173
+#: sql_help.c:3171
 msgid "where lockmode is one of:"
-msgstr "où mode_de_verrou fait partie de :"
+msgstr "où mode_de_verrou fait partie de :"
 
-#: sql_help.c:3214
+#: sql_help.c:3212
 msgid "payload"
 msgstr "contenu"
 
-#: sql_help.c:3241
+#: sql_help.c:3239
 msgid "old_role"
-msgstr "ancien_rôle"
+msgstr "ancien_rôle"
 
-#: sql_help.c:3242
+#: sql_help.c:3240
 msgid "new_role"
-msgstr "nouveau_rôle"
+msgstr "nouveau_rôle"
 
-#: sql_help.c:3267 sql_help.c:3428 sql_help.c:3436
+#: sql_help.c:3265 sql_help.c:3426 sql_help.c:3434
 msgid "savepoint_name"
 msgstr "nom_savepoint"
 
-#: sql_help.c:3469
+#: sql_help.c:3467
 msgid "provider"
 msgstr "fournisseur"
 
-#: sql_help.c:3556 sql_help.c:3598 sql_help.c:3600 sql_help.c:3646
-#: sql_help.c:3795 sql_help.c:3837 sql_help.c:3839 sql_help.c:3989
-#: sql_help.c:4031 sql_help.c:4033
+#: sql_help.c:3554 sql_help.c:3596 sql_help.c:3598 sql_help.c:3644
+#: sql_help.c:3793 sql_help.c:3835 sql_help.c:3837 sql_help.c:3987
+#: sql_help.c:4029 sql_help.c:4031
 msgid "from_item"
-msgstr "élément_from"
+msgstr "élément_from"
 
-#: sql_help.c:3558 sql_help.c:3610 sql_help.c:3797 sql_help.c:3849
-#: sql_help.c:3991 sql_help.c:4043
+#: sql_help.c:3556 sql_help.c:3608 sql_help.c:3795 sql_help.c:3847
+#: sql_help.c:3989 sql_help.c:4041
 msgid "grouping_element"
 msgstr "element_regroupement"
 
-#: sql_help.c:3560 sql_help.c:3650 sql_help.c:3799 sql_help.c:3993
+#: sql_help.c:3558 sql_help.c:3648 sql_help.c:3797 sql_help.c:3991
 msgid "window_name"
 msgstr "nom_window"
 
-#: sql_help.c:3561 sql_help.c:3651 sql_help.c:3800 sql_help.c:3994
+#: sql_help.c:3559 sql_help.c:3649 sql_help.c:3798 sql_help.c:3992
 msgid "window_definition"
-msgstr "définition_window"
+msgstr "définition_window"
 
-#: sql_help.c:3562 sql_help.c:3576 sql_help.c:3614 sql_help.c:3652
-#: sql_help.c:3801 sql_help.c:3815 sql_help.c:3853 sql_help.c:3995
-#: sql_help.c:4009 sql_help.c:4047
+#: sql_help.c:3560 sql_help.c:3574 sql_help.c:3612 sql_help.c:3650
+#: sql_help.c:3799 sql_help.c:3813 sql_help.c:3851 sql_help.c:3993
+#: sql_help.c:4007 sql_help.c:4045
 msgid "select"
-msgstr "sélection"
+msgstr "sélection"
 
-#: sql_help.c:3569 sql_help.c:3808 sql_help.c:4002
+#: sql_help.c:3567 sql_help.c:3806 sql_help.c:4000
 msgid "where from_item can be one of:"
-msgstr "où élément_from fait partie de :"
+msgstr "où élément_from fait partie de :"
 
-#: sql_help.c:3572 sql_help.c:3578 sql_help.c:3581 sql_help.c:3585
-#: sql_help.c:3597 sql_help.c:3811 sql_help.c:3817 sql_help.c:3820
-#: sql_help.c:3824 sql_help.c:3836 sql_help.c:4005 sql_help.c:4011
-#: sql_help.c:4014 sql_help.c:4018 sql_help.c:4030
+#: sql_help.c:3570 sql_help.c:3576 sql_help.c:3579 sql_help.c:3583
+#: sql_help.c:3595 sql_help.c:3809 sql_help.c:3815 sql_help.c:3818
+#: sql_help.c:3822 sql_help.c:3834 sql_help.c:4003 sql_help.c:4009
+#: sql_help.c:4012 sql_help.c:4016 sql_help.c:4028
 msgid "column_alias"
 msgstr "alias_colonne"
 
-#: sql_help.c:3573 sql_help.c:3812 sql_help.c:4006
+#: sql_help.c:3571 sql_help.c:3810 sql_help.c:4004
 msgid "sampling_method"
-msgstr "méthode_echantillonnage"
+msgstr "méthode_echantillonnage"
 
-#: sql_help.c:3574 sql_help.c:3583 sql_help.c:3587 sql_help.c:3591
-#: sql_help.c:3594 sql_help.c:3813 sql_help.c:3822 sql_help.c:3826
-#: sql_help.c:3830 sql_help.c:3833 sql_help.c:4007 sql_help.c:4016
-#: sql_help.c:4020 sql_help.c:4024 sql_help.c:4027
+#: sql_help.c:3572 sql_help.c:3581 sql_help.c:3585 sql_help.c:3589
+#: sql_help.c:3592 sql_help.c:3811 sql_help.c:3820 sql_help.c:3824
+#: sql_help.c:3828 sql_help.c:3831 sql_help.c:4005 sql_help.c:4014
+#: sql_help.c:4018 sql_help.c:4022 sql_help.c:4025
 msgid "argument"
 msgstr "argument"
 
-#: sql_help.c:3575 sql_help.c:3814 sql_help.c:4008
+#: sql_help.c:3573 sql_help.c:3812 sql_help.c:4006
 msgid "seed"
 msgstr "graine"
 
-#: sql_help.c:3579 sql_help.c:3612 sql_help.c:3818 sql_help.c:3851
-#: sql_help.c:4012 sql_help.c:4045
+#: sql_help.c:3577 sql_help.c:3610 sql_help.c:3816 sql_help.c:3849
+#: sql_help.c:4010 sql_help.c:4043
 msgid "with_query_name"
-msgstr "nom_requête_with"
+msgstr "nom_requête_with"
 
-#: sql_help.c:3589 sql_help.c:3592 sql_help.c:3595 sql_help.c:3828
-#: sql_help.c:3831 sql_help.c:3834 sql_help.c:4022 sql_help.c:4025
-#: sql_help.c:4028
+#: sql_help.c:3587 sql_help.c:3590 sql_help.c:3593 sql_help.c:3826
+#: sql_help.c:3829 sql_help.c:3832 sql_help.c:4020 sql_help.c:4023
+#: sql_help.c:4026
 msgid "column_definition"
-msgstr "définition_colonne"
+msgstr "définition_colonne"
 
-#: sql_help.c:3599 sql_help.c:3838 sql_help.c:4032
+#: sql_help.c:3597 sql_help.c:3836 sql_help.c:4030
 msgid "join_type"
 msgstr "type_de_jointure"
 
-#: sql_help.c:3601 sql_help.c:3840 sql_help.c:4034
+#: sql_help.c:3599 sql_help.c:3838 sql_help.c:4032
 msgid "join_condition"
 msgstr "condition_de_jointure"
 
-#: sql_help.c:3602 sql_help.c:3841 sql_help.c:4035
+#: sql_help.c:3600 sql_help.c:3839 sql_help.c:4033
 msgid "join_column"
 msgstr "colonne_de_jointure"
 
-#: sql_help.c:3603 sql_help.c:3842 sql_help.c:4036
+#: sql_help.c:3601 sql_help.c:3840 sql_help.c:4034
 msgid "and grouping_element can be one of:"
-msgstr "où element_regroupement fait partie de :"
+msgstr "où element_regroupement fait partie de :"
 
-#: sql_help.c:3611 sql_help.c:3850 sql_help.c:4044
+#: sql_help.c:3609 sql_help.c:3848 sql_help.c:4042
 msgid "and with_query is:"
-msgstr "et requête_with est :"
+msgstr "et requête_with est :"
 
-#: sql_help.c:3615 sql_help.c:3854 sql_help.c:4048
+#: sql_help.c:3613 sql_help.c:3852 sql_help.c:4046
 msgid "values"
 msgstr "valeurs"
 
-#: sql_help.c:3616 sql_help.c:3855 sql_help.c:4049
+#: sql_help.c:3614 sql_help.c:3853 sql_help.c:4047
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:3617 sql_help.c:3856 sql_help.c:4050
+#: sql_help.c:3615 sql_help.c:3854 sql_help.c:4048
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:3618 sql_help.c:3857 sql_help.c:4051
+#: sql_help.c:3616 sql_help.c:3855 sql_help.c:4049
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:3645
+#: sql_help.c:3643
 msgid "new_table"
 msgstr "nouvelle_table"
 
-#: sql_help.c:3670
+#: sql_help.c:3668
 msgid "timezone"
 msgstr "fuseau_horaire"
 
-#: sql_help.c:3715
+#: sql_help.c:3713
 msgid "snapshot_id"
 msgstr "id_snapshot"
 
-#: sql_help.c:3900
+#: sql_help.c:3898
 msgid "from_list"
 msgstr "liste_from"
 
-#: sql_help.c:3931
+#: sql_help.c:3929
 msgid "sort_expression"
 msgstr "expression_de_tri"
 
@@ -4570,47 +4578,47 @@
 
 #: sql_help.h:202
 msgid "change the definition of an aggregate function"
-msgstr "modifier la définition d'une fonction d'agrégation"
+msgstr "modifier la définition d'une fonction d'agrégation"
 
 #: sql_help.h:207
 msgid "change the definition of a collation"
-msgstr "modifier la définition d'un collationnement"
+msgstr "modifier la définition d'un collationnement"
 
 #: sql_help.h:212
 msgid "change the definition of a conversion"
-msgstr "modifier la définition d'une conversion"
+msgstr "modifier la définition d'une conversion"
 
 #: sql_help.h:217
 msgid "change a database"
-msgstr "modifier une base de données"
+msgstr "modifier une base de données"
 
 #: sql_help.h:222
 msgid "define default access privileges"
-msgstr "définir les droits d'accès par défaut"
+msgstr "définir les droits d'accès par défaut"
 
 #: sql_help.h:227
 msgid "change the definition of a domain"
-msgstr "modifier la définition d'un domaine"
+msgstr "modifier la définition d'un domaine"
 
 #: sql_help.h:232
 msgid "change the definition of an event trigger"
-msgstr "modifier la définition d'un trigger sur évènement"
+msgstr "modifier la définition d'un trigger sur évènement"
 
 #: sql_help.h:237
 msgid "change the definition of an extension"
-msgstr "modifier la définition d'une extension"
+msgstr "modifier la définition d'une extension"
 
 #: sql_help.h:242
 msgid "change the definition of a foreign-data wrapper"
-msgstr "modifier la définition d'un wrapper de données distantes"
+msgstr "modifier la définition d'un wrapper de données distantes"
 
 #: sql_help.h:247
 msgid "change the definition of a foreign table"
-msgstr "modifier la définition d'une table distante"
+msgstr "modifier la définition d'une table distante"
 
 #: sql_help.h:252
 msgid "change the definition of a function"
-msgstr "modifier la définition d'une fonction"
+msgstr "modifier la définition d'une fonction"
 
 #: sql_help.h:257
 msgid "change role name or membership"
@@ -4618,111 +4626,111 @@
 
 #: sql_help.h:262
 msgid "change the definition of an index"
-msgstr "modifier la définition d'un index"
+msgstr "modifier la définition d'un index"
 
 #: sql_help.h:267
 msgid "change the definition of a procedural language"
-msgstr "modifier la définition d'un langage procédural"
+msgstr "modifier la définition d'un langage procédural"
 
 #: sql_help.h:272
 msgid "change the definition of a large object"
-msgstr "modifier la définition d'un « Large Object »"
+msgstr "modifier la définition d'un « Large Object »"
 
 #: sql_help.h:277
 msgid "change the definition of a materialized view"
-msgstr "modifier la définition d'une vue matérialisée"
+msgstr "modifier la définition d'une vue matérialisée"
 
 #: sql_help.h:282
 msgid "change the definition of an operator"
-msgstr "modifier la définition d'un opérateur"
+msgstr "modifier la définition d'un opérateur"
 
 #: sql_help.h:287
 msgid "change the definition of an operator class"
-msgstr "modifier la définition d'une classe d'opérateurs"
+msgstr "modifier la définition d'une classe d'opérateurs"
 
 #: sql_help.h:292
 msgid "change the definition of an operator family"
-msgstr "modifier la définition d'une famille d'opérateur"
+msgstr "modifier la définition d'une famille d'opérateur"
 
 #: sql_help.h:297
 msgid "change the definition of a row level security policy"
-msgstr "modifier la définition d'une politique de sécurité au niveau ligne"
+msgstr "modifier la définition d'une politique de sécurité au niveau ligne"
 
 #: sql_help.h:302 sql_help.h:372
 msgid "change a database role"
-msgstr "modifier un rôle"
+msgstr "modifier un rôle"
 
 #: sql_help.h:307
 msgid "change the definition of a rule"
-msgstr "modifier la définition d'une règle"
+msgstr "modifier la définition d'une règle"
 
 #: sql_help.h:312
 msgid "change the definition of a schema"
-msgstr "modifier la définition d'un schéma"
+msgstr "modifier la définition d'un schéma"
 
 #: sql_help.h:317
 msgid "change the definition of a sequence generator"
-msgstr "modifier la définition d'un générateur de séquence"
+msgstr "modifier la définition d'un générateur de séquence"
 
 #: sql_help.h:322
 msgid "change the definition of a foreign server"
-msgstr "modifier la définition d'un serveur distant"
+msgstr "modifier la définition d'un serveur distant"
 
 #: sql_help.h:327
 msgid "change a server configuration parameter"
-msgstr "modifie un paramètre de configuration du serveur"
+msgstr "modifie un paramètre de configuration du serveur"
 
 #: sql_help.h:332
 msgid "change the definition of a table"
-msgstr "modifier la définition d'une table"
+msgstr "modifier la définition d'une table"
 
 #: sql_help.h:337
 msgid "change the definition of a tablespace"
-msgstr "modifier la définition d'un tablespace"
+msgstr "modifier la définition d'un tablespace"
 
 #: sql_help.h:342
 msgid "change the definition of a text search configuration"
-msgstr "modifier la définition d'une configuration de la recherche de texte"
+msgstr "modifier la définition d'une configuration de la recherche de texte"
 
 #: sql_help.h:347
 msgid "change the definition of a text search dictionary"
-msgstr "modifier la définition d'un dictionnaire de la recherche de texte"
+msgstr "modifier la définition d'un dictionnaire de la recherche de texte"
 
 #: sql_help.h:352
 msgid "change the definition of a text search parser"
-msgstr "modifier la définition d'un analyseur de la recherche de texte"
+msgstr "modifier la définition d'un analyseur de la recherche de texte"
 
 #: sql_help.h:357
 msgid "change the definition of a text search template"
-msgstr "modifier la définition d'un modèle de la recherche de texte"
+msgstr "modifier la définition d'un modèle de la recherche de texte"
 
 #: sql_help.h:362
 msgid "change the definition of a trigger"
-msgstr "modifier la définition d'un trigger"
+msgstr "modifier la définition d'un trigger"
 
 #: sql_help.h:367
 msgid "change the definition of a type"
-msgstr "modifier la définition d'un type"
+msgstr "modifier la définition d'un type"
 
 #: sql_help.h:377
 msgid "change the definition of a user mapping"
-msgstr "modifier la définition d'une correspondance d'utilisateur"
+msgstr "modifier la définition d'une correspondance d'utilisateur"
 
 #: sql_help.h:382
 msgid "change the definition of a view"
-msgstr "modifier la définition d'une vue"
+msgstr "modifier la définition d'une vue"
 
 #: sql_help.h:387
 msgid "collect statistics about a database"
-msgstr "acquérir des statistiques concernant la base de données"
+msgstr "acquérir des statistiques concernant la base de données"
 
 #: sql_help.h:392 sql_help.h:992
 msgid "start a transaction block"
-msgstr "débuter un bloc de transaction"
+msgstr "débuter un bloc de transaction"
 
 #: sql_help.h:397
 msgid "force a transaction log checkpoint"
-msgstr "forcer un point de vérification des journaux de transaction"
+msgstr "forcer un point de vérification des journaux de transaction"
 
 #: sql_help.h:402
 msgid "close a cursor"
@@ -4730,11 +4738,11 @@
 
 #: sql_help.h:407
 msgid "cluster a table according to an index"
-msgstr "réorganiser (cluster) une table en fonction d'un index"
+msgstr "réorganiser (cluster) une table en fonction d'un index"
 
 #: sql_help.h:412
 msgid "define or change the comment of an object"
-msgstr "définir ou modifier les commentaires d'un objet"
+msgstr "définir ou modifier les commentaires d'un objet"
 
 #: sql_help.h:417 sql_help.h:827
 msgid "commit the current transaction"
@@ -4743,40 +4751,40 @@
 #: sql_help.h:422
 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"
+"valider une transaction précédemment préparée pour une validation en deux\n"
 "phases"
 
 #: sql_help.h:427
 msgid "copy data between a file and a table"
-msgstr "copier des données entre un fichier et une table"
+msgstr "copier des données entre un fichier et une table"
 
 #: sql_help.h:432
 msgid "define a new aggregate function"
-msgstr "définir une nouvelle fonction d'agrégation"
+msgstr "définir une nouvelle fonction d'agrégation"
 
 #: sql_help.h:437
 msgid "define a new cast"
-msgstr "définir un nouveau transtypage"
+msgstr "définir un nouveau transtypage"
 
 #: sql_help.h:442
 msgid "define a new collation"
-msgstr "définir un nouveau collationnement"
+msgstr "définir un nouveau collationnement"
 
 #: sql_help.h:447
 msgid "define a new encoding conversion"
-msgstr "définir une nouvelle conversion d'encodage"
+msgstr "définir une nouvelle conversion d'encodage"
 
 #: sql_help.h:452
 msgid "create a new database"
-msgstr "créer une nouvelle base de données"
+msgstr "créer une nouvelle base de données"
 
 #: sql_help.h:457
 msgid "define a new domain"
-msgstr "définir un nouveau domaine"
+msgstr "définir un nouveau domaine"
 
 #: sql_help.h:462
 msgid "define a new event trigger"
-msgstr "définir un nouveau trigger sur évènement"
+msgstr "définir un nouveau trigger sur évènement"
 
 #: sql_help.h:467
 msgid "install an extension"
@@ -4784,119 +4792,119 @@
 
 #: sql_help.h:472
 msgid "define a new foreign-data wrapper"
-msgstr "définir un nouveau wrapper de données distantes"
+msgstr "définir un nouveau wrapper de données distantes"
 
 #: sql_help.h:477
 msgid "define a new foreign table"
-msgstr "définir une nouvelle table distante"
+msgstr "définir une nouvelle table distante"
 
 #: sql_help.h:482
 msgid "define a new function"
-msgstr "définir une nouvelle fonction"
+msgstr "définir une nouvelle fonction"
 
 #: sql_help.h:487 sql_help.h:527 sql_help.h:602
 msgid "define a new database role"
-msgstr "définir un nouveau rôle"
+msgstr "définir un nouveau rôle"
 
 #: sql_help.h:492
 msgid "define a new index"
-msgstr "définir un nouvel index"
+msgstr "définir un nouvel index"
 
 #: sql_help.h:497
 msgid "define a new procedural language"
-msgstr "définir un nouveau langage de procédures"
+msgstr "définir un nouveau langage de procédures"
 
 #: sql_help.h:502
 msgid "define a new materialized view"
-msgstr "définir une nouvelle vue matérialisée"
+msgstr "définir une nouvelle vue matérialisée"
 
 #: sql_help.h:507
 msgid "define a new operator"
-msgstr "définir un nouvel opérateur"
+msgstr "définir un nouvel opérateur"
 
 #: sql_help.h:512
 msgid "define a new operator class"
-msgstr "définir une nouvelle classe d'opérateur"
+msgstr "définir une nouvelle classe d'opérateur"
 
 #: sql_help.h:517
 msgid "define a new operator family"
-msgstr "définir une nouvelle famille d'opérateur"
+msgstr "définir une nouvelle famille d'opérateur"
 
 #: sql_help.h:522
 msgid "define a new row level security policy for a table"
-msgstr "définir une nouvelle politique de sécurité au niveau ligne pour une table"
+msgstr "définir une nouvelle politique de sécurité au niveau ligne pour une table"
 
 #: sql_help.h:532
 msgid "define a new rewrite rule"
-msgstr "définir une nouvelle règle de réécriture"
+msgstr "définir une nouvelle règle de réécriture"
 
 #: sql_help.h:537
 msgid "define a new schema"
-msgstr "définir un nouveau schéma"
+msgstr "définir un nouveau schéma"
 
 #: sql_help.h:542
 msgid "define a new sequence generator"
-msgstr "définir un nouveau générateur de séquence"
+msgstr "définir un nouveau générateur de séquence"
 
 #: sql_help.h:547
 msgid "define a new foreign server"
-msgstr "définir un nouveau serveur distant"
+msgstr "définir un nouveau serveur distant"
 
 #: sql_help.h:552
 msgid "define a new table"
-msgstr "définir une nouvelle table"
+msgstr "définir une nouvelle table"
 
 #: sql_help.h:557 sql_help.h:957
 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"
+msgstr "définir une nouvelle table à partir des résultats d'une requête"
 
 #: sql_help.h:562
 msgid "define a new tablespace"
-msgstr "définir un nouveau tablespace"
+msgstr "définir un nouveau tablespace"
 
 #: sql_help.h:567
 msgid "define a new text search configuration"
-msgstr "définir une nouvelle configuration de la recherche de texte"
+msgstr "définir une nouvelle configuration de la recherche de texte"
 
 #: sql_help.h:572
 msgid "define a new text search dictionary"
-msgstr "définir un nouveau dictionnaire de la recherche de texte"
+msgstr "définir un nouveau dictionnaire de la recherche de texte"
 
 #: sql_help.h:577
 msgid "define a new text search parser"
-msgstr "définir un nouvel analyseur de la recherche de texte"
+msgstr "définir un nouvel analyseur de la recherche de texte"
 
 #: sql_help.h:582
 msgid "define a new text search template"
-msgstr "définir un nouveau modèle de la recherche de texte"
+msgstr "définir un nouveau modèle de la recherche de texte"
 
 #: sql_help.h:587
 msgid "define a new transform"
-msgstr "définir une nouvelle transformation"
+msgstr "définir une nouvelle transformation"
 
 #: sql_help.h:592
 msgid "define a new trigger"
-msgstr "définir un nouveau trigger"
+msgstr "définir un nouveau trigger"
 
 #: sql_help.h:597
 msgid "define a new data type"
-msgstr "définir un nouveau type de données"
+msgstr "définir un nouveau type de données"
 
 #: sql_help.h:607
 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"
+msgstr "définit une nouvelle correspondance d'un utilisateur vers un serveur distant"
 
 #: sql_help.h:612
 msgid "define a new view"
-msgstr "définir une nouvelle vue"
+msgstr "définir une nouvelle vue"
 
 #: sql_help.h:617
 msgid "deallocate a prepared statement"
-msgstr "désallouer une instruction préparée"
+msgstr "désallouer une instruction préparée"
 
 #: sql_help.h:622
 msgid "define a cursor"
-msgstr "définir un curseur"
+msgstr "définir un curseur"
 
 #: sql_help.h:627
 msgid "delete rows of a table"
@@ -4904,15 +4912,15 @@
 
 #: sql_help.h:632
 msgid "discard session state"
-msgstr "annuler l'état de la session"
+msgstr "annuler l'état de la session"
 
 #: sql_help.h:637
 msgid "execute an anonymous code block"
-msgstr "exécute un bloc de code anonyme"
+msgstr "exécute un bloc de code anonyme"
 
 #: sql_help.h:642
 msgid "remove an aggregate function"
-msgstr "supprimer une fonction d'agrégation"
+msgstr "supprimer une fonction d'agrégation"
 
 #: sql_help.h:647
 msgid "remove a cast"
@@ -4928,7 +4936,7 @@
 
 #: sql_help.h:662
 msgid "remove a database"
-msgstr "supprimer une base de données"
+msgstr "supprimer une base de données"
 
 #: sql_help.h:667
 msgid "remove a domain"
@@ -4936,7 +4944,7 @@
 
 #: sql_help.h:672
 msgid "remove an event trigger"
-msgstr "supprimer un trigger sur évènement"
+msgstr "supprimer un trigger sur évènement"
 
 #: sql_help.h:677
 msgid "remove an extension"
@@ -4944,7 +4952,7 @@
 
 #: sql_help.h:682
 msgid "remove a foreign-data wrapper"
-msgstr "supprimer un wrapper de données distantes"
+msgstr "supprimer un wrapper de données distantes"
 
 #: sql_help.h:687
 msgid "remove a foreign table"
@@ -4956,7 +4964,7 @@
 
 #: sql_help.h:697 sql_help.h:742 sql_help.h:812
 msgid "remove a database role"
-msgstr "supprimer un rôle de la base de données"
+msgstr "supprimer un rôle de la base de données"
 
 #: sql_help.h:702
 msgid "remove an index"
@@ -4964,43 +4972,43 @@
 
 #: sql_help.h:707
 msgid "remove a procedural language"
-msgstr "supprimer un langage procédural"
+msgstr "supprimer un langage procédural"
 
 #: sql_help.h:712
 msgid "remove a materialized view"
-msgstr "supprimer une vue matérialisée"
+msgstr "supprimer une vue matérialisée"
 
 #: sql_help.h:717
 msgid "remove an operator"
-msgstr "supprimer un opérateur"
+msgstr "supprimer un opérateur"
 
 #: sql_help.h:722
 msgid "remove an operator class"
-msgstr "supprimer une classe d'opérateur"
+msgstr "supprimer une classe d'opérateur"
 
 #: sql_help.h:727
 msgid "remove an operator family"
-msgstr "supprimer une famille d'opérateur"
+msgstr "supprimer une famille d'opérateur"
 
 #: sql_help.h:732
 msgid "remove database objects owned by a database role"
-msgstr "supprimer les objets appartenant à un rôle"
+msgstr "supprimer les objets appartenant à un rôle"
 
 #: sql_help.h:737
 msgid "remove a row level security policy from a table"
-msgstr "supprimer une nouvelle politique de sécurité au niveau ligne pour une table"
+msgstr "supprimer une nouvelle politique de sécurité au niveau ligne pour une table"
 
 #: sql_help.h:747
 msgid "remove a rewrite rule"
-msgstr "supprimer une règle de réécriture"
+msgstr "supprimer une règle de réécriture"
 
 #: sql_help.h:752
 msgid "remove a schema"
-msgstr "supprimer un schéma"
+msgstr "supprimer un schéma"
 
 #: sql_help.h:757
 msgid "remove a sequence"
-msgstr "supprimer une séquence"
+msgstr "supprimer une séquence"
 
 #: sql_help.h:762
 msgid "remove a foreign server descriptor"
@@ -5028,7 +5036,7 @@
 
 #: sql_help.h:792
 msgid "remove a text search template"
-msgstr "supprimer un modèle de la recherche de texte"
+msgstr "supprimer un modèle de la recherche de texte"
 
 #: sql_help.h:797
 msgid "remove a transform"
@@ -5040,7 +5048,7 @@
 
 #: sql_help.h:807
 msgid "remove a data type"
-msgstr "supprimer un type de données"
+msgstr "supprimer un type de données"
 
 #: sql_help.h:817
 msgid "remove a user mapping for a foreign server"
@@ -5052,35 +5060,35 @@
 
 #: sql_help.h:832
 msgid "execute a prepared statement"
-msgstr "exécuter une instruction préparée"
+msgstr "exécuter une instruction préparée"
 
 #: sql_help.h:837
 msgid "show the execution plan of a statement"
-msgstr "afficher le plan d'exécution d'une instruction"
+msgstr "afficher le plan d'exécution d'une instruction"
 
 #: sql_help.h:842
 msgid "retrieve rows from a query using a cursor"
-msgstr "extraire certaines lignes d'une requête à l'aide d'un curseur"
+msgstr "extraire certaines lignes d'une requête à l'aide d'un curseur"
 
 #: sql_help.h:847
 msgid "define access privileges"
-msgstr "définir des privilèges d'accès"
+msgstr "définir des privilèges d'accès"
 
 #: sql_help.h:852
 msgid "import table definitions from a foreign server"
-msgstr "importer la définition d'une table à partir d'un serveur distant"
+msgstr "importer la définition d'une table à partir d'un serveur distant"
 
 #: sql_help.h:857
 msgid "create new rows in a table"
-msgstr "créer de nouvelles lignes dans une table"
+msgstr "créer de nouvelles lignes dans une table"
 
 #: sql_help.h:862
 msgid "listen for a notification"
-msgstr "se mettre à l'écoute d'une notification"
+msgstr "se mettre à l'écoute d'une notification"
 
 #: sql_help.h:867
 msgid "load a shared library file"
-msgstr "charger un fichier de bibliothèque partagée"
+msgstr "charger un fichier de bibliothèque partagée"
 
 #: sql_help.h:872
 msgid "lock a table"
@@ -5096,19 +5104,19 @@
 
 #: sql_help.h:887
 msgid "prepare a statement for execution"
-msgstr "préparer une instruction pour exécution"
+msgstr "préparer une instruction pour exécution"
 
 #: sql_help.h:892
 msgid "prepare the current transaction for two-phase commit"
-msgstr "préparer la transaction en cours pour une validation en deux phases"
+msgstr "préparer la transaction en cours pour une validation en deux phases"
 
 #: sql_help.h:897
 msgid "change the ownership of database objects owned by a database role"
-msgstr "changer le propriétaire des objets d'un rôle"
+msgstr "changer le propriétaire des objets d'un rôle"
 
 #: sql_help.h:902
 msgid "replace the contents of a materialized view"
-msgstr "remplacer le contenu d'une vue matérialisée"
+msgstr "remplacer le contenu d'une vue matérialisée"
 
 #: sql_help.h:907
 msgid "rebuild indexes"
@@ -5116,20 +5124,20 @@
 
 #: sql_help.h:912
 msgid "destroy a previously defined savepoint"
-msgstr "détruire un point de retournement précédemment défini"
+msgstr "détruire un point de retournement précédemment défini"
 
 #: sql_help.h:917
 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"
+msgstr "réinitialiser un paramètre d'exécution à sa valeur par défaut"
 
 #: sql_help.h:922
 msgid "remove access privileges"
-msgstr "supprimer des privilèges d'accès"
+msgstr "supprimer des privilèges d'accès"
 
 #: sql_help.h:932
 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"
+"annuler une transaction précédemment préparée pour une validation en deux\n"
 "phases"
 
 #: sql_help.h:937
@@ -5138,11 +5146,11 @@
 
 #: sql_help.h:942
 msgid "define a new savepoint within the current transaction"
-msgstr "définir un nouveau point de retournement pour la transaction en cours"
+msgstr "définir un nouveau point de retournement pour la transaction en cours"
 
 #: sql_help.h:947
 msgid "define or change a security label applied to an object"
-msgstr "définir ou modifier un label de sécurité à un objet"
+msgstr "définir ou modifier un label de sécurité à un objet"
 
 #: sql_help.h:952 sql_help.h:997 sql_help.h:1027
 msgid "retrieve rows from a table or view"
@@ -5150,29 +5158,29 @@
 
 #: sql_help.h:962
 msgid "change a run-time parameter"
-msgstr "modifier un paramètre d'exécution"
+msgstr "modifier un paramètre d'exécution"
 
 #: sql_help.h:967
 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"
+msgstr "définir le moment de la vérification des contraintes pour la transaction en cours"
 
 #: sql_help.h:972
 msgid "set the current user identifier of the current session"
-msgstr "définir l'identifiant actuel de l'utilisateur de la session courante"
+msgstr "définir l'identifiant actuel de l'utilisateur de la session courante"
 
 #: sql_help.h:977
 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"
+"définir l'identifiant de l'utilisateur de session et l'identifiant actuel de\n"
 "l'utilisateur de la session courante"
 
 #: sql_help.h:982
 msgid "set the characteristics of the current transaction"
-msgstr "définir les caractéristiques de la transaction en cours"
+msgstr "définir les caractéristiques de la transaction en cours"
 
 #: sql_help.h:987
 msgid "show the value of a run-time parameter"
-msgstr "afficher la valeur d'un paramètre d'exécution"
+msgstr "afficher la valeur d'un paramètre d'exécution"
 
 #: sql_help.h:1002
 msgid "empty a table or set of tables"
@@ -5180,7 +5188,7 @@
 
 #: sql_help.h:1007
 msgid "stop listening for a notification"
-msgstr "arrêter l'écoute d'une notification"
+msgstr "arrêter l'écoute d'une notification"
 
 #: sql_help.h:1012
 msgid "update rows of a table"
@@ -5188,7 +5196,7 @@
 
 #: sql_help.h:1017
 msgid "garbage-collect and optionally analyze a database"
-msgstr "compacter et optionnellement analyser une base de données"
+msgstr "compacter et optionnellement analyser une base de données"
 
 #: sql_help.h:1022
 msgid "compute a set of rows"
@@ -5197,12 +5205,12 @@
 #: startup.c:177
 #, c-format
 msgid "%s: -1 can only be used in non-interactive mode\n"
-msgstr "%s p: -1 peut seulement être utilisé dans un mode non intéractif\n"
+msgstr "%s p: -1 peut seulement être utilisé dans un mode non intéractif\n"
 
 #: startup.c:278
 #, 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"
+msgstr "%s : n'a pas pu ouvrir le journal applicatif « %s » : %s\n"
 
 #: startup.c:342
 #, c-format
@@ -5210,57 +5218,57 @@
 "Type \"help\" for help.\n"
 "\n"
 msgstr ""
-"Saisissez « help » pour l'aide.\n"
+"Saisissez « help » pour l'aide.\n"
 "\n"
 
 #: startup.c:490
 #, 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"
+msgstr "%s : n'a pas pu configurer le paramètre d'impression « %s »\n"
 
 #: startup.c:530
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
-msgstr "%s : n'a pas pu effacer la variable « %s »\n"
+msgstr "%s : n'a pas pu effacer la variable « %s »\n"
 
 #: startup.c:540
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
-msgstr "%s : n'a pas pu initialiser la variable « %s »\n"
+msgstr "%s : n'a pas pu initialiser la variable « %s »\n"
 
 #: startup.c:600
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayez « %s --help » pour plus d'informations.\n"
+msgstr "Essayez « %s --help » pour plus d'informations.\n"
 
 #: startup.c:617
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
-msgstr "%s : attention : option supplémentaire « %s » ignorée\n"
+msgstr "%s : attention : option supplémentaire « %s » ignorée\n"
 
 #: startup.c:639
 #, c-format
 msgid "%s: could not find own program executable\n"
-msgstr "%s : n'a pas pu trouver son propre exécutable\n"
+msgstr "%s : n'a pas pu trouver son propre exécutable\n"
 
 #: startup.c:761 startup.c:808 startup.c:829 startup.c:866 variables.c:121
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\"; assuming \"%s\"\n"
-msgstr "valeur « %s » non reconnue pour « %s » ; suppose « %s »\n"
+msgstr "valeur « %s » non reconnue pour « %s » ; suppose « %s »\n"
 
-#: tab-complete.c:4581
+#: tab-complete.c:4597
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
 "Query was:\n"
 "%s\n"
 msgstr ""
-"la complétion de la requête a échoué : %s\n"
-"La requête était :\n"
+"la complétion de la requête a échoué : %s\n"
+"La requête était :\n"
 "%s\n"
 
 #~ msgid "Showing locale-adjusted numeric output."
-#~ msgstr "Affichage de la sortie numérique adaptée à la locale."
+#~ msgstr "Affichage de la sortie numérique adaptée à la locale."
 
 #~ msgid "Showing only tuples."
 #~ msgstr "Affichage des tuples seuls."
@@ -5269,22 +5277,22 @@
 #~ msgstr "n'a pas pu obtenir le nom d'utilisateur courant : %s\n"
 
 #~ msgid "agg_name"
-#~ msgstr "nom_d_agrégat"
+#~ msgstr "nom_d_agrégat"
 
 #~ msgid "agg_type"
-#~ msgstr "type_aggrégat"
+#~ msgstr "type_aggrégat"
 
 #~ msgid "input_data_type"
-#~ msgstr "type_de_données_en_entrée"
+#~ msgstr "type_de_données_en_entrée"
 
 #~ msgid "could not change directory to \"%s\""
-#~ msgstr "n'a pas pu accéder au répertoire « %s »"
+#~ msgstr "n'a pas pu accéder au répertoire « %s »"
 
 #~ 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"
 
 #~ msgid "  \\l[+]                  list all databases\n"
-#~ msgstr "  \\l[+]                affiche la liste des bases de données\n"
+#~ msgstr "  \\l[+]                affiche la liste des bases de données\n"
 
 #~ msgid "\\%s: error\n"
 #~ msgstr "\\%s : erreur\n"
@@ -5293,7 +5301,7 @@
 #~ msgstr "\\copy : %s"
 
 #~ msgid "\\copy: unexpected response (%d)\n"
-#~ msgstr "\\copy : réponse inattendue (%d)\n"
+#~ msgstr "\\copy : réponse inattendue (%d)\n"
 
 #~ msgid "  --help                   show this help, then exit\n"
 #~ msgstr "  --help          affiche cette aide, puis quitte\n"
@@ -5302,10 +5310,10 @@
 #~ msgstr "  --version       affiche la version, puis quitte\n"
 
 #~ msgid "contains support for command-line editing"
-#~ msgstr "contient une gestion avancée de la ligne de commande"
+#~ msgstr "contient une gestion avancée de la ligne de commande"
 
 #~ msgid "data type"
-#~ msgstr "type de données"
+#~ msgstr "type de données"
 
 #~ msgid "column"
 #~ msgstr "colonne"
@@ -5317,28 +5325,28 @@
 #~ msgstr "tablespace"
 
 #~ msgid "out of memory"
-#~ msgstr "mémoire épuisée"
+#~ msgstr "mémoire épuisée"
 
 #~ msgid " on host \"%s\""
-#~ msgstr " sur l'hôte « %s »"
+#~ msgstr " sur l'hôte « %s »"
 
 #~ msgid " at port \"%s\""
-#~ msgstr " sur le port « %s »"
+#~ msgstr " sur le port « %s »"
 
 #~ msgid " as user \"%s\""
-#~ msgstr " comme utilisateur « %s »"
+#~ msgstr " comme utilisateur « %s »"
 
 #~ msgid "define a new constraint trigger"
-#~ msgstr "définir une nouvelle contrainte de déclenchement"
+#~ msgstr "définir une nouvelle contrainte de déclenchement"
 
 #~ msgid "Exclusion constraints:"
 #~ msgstr "Contraintes d'exclusion :"
 
 #~ msgid "rolename"
-#~ msgstr "nom_rôle"
+#~ msgstr "nom_rôle"
 
 #~ msgid "number"
-#~ msgstr "numéro"
+#~ msgstr "numéro"
 
 #~ msgid "ABORT [ WORK | TRANSACTION ]"
 #~ msgstr "ABORT [ WORK | TRANSACTION ]"
@@ -5349,15 +5357,15 @@
 #~ "ALTER AGGREGATE name ( type [ , ... ] ) SET SCHEMA new_schema"
 #~ msgstr ""
 #~ "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"
+#~ "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"
+#~ "ALTER CONVERSION nom OWNER TO nouveau_propriétaire"
 
 #~ msgid ""
 #~ "ALTER DATABASE name [ [ WITH ] option [ ... ] ]\n"
@@ -5379,19 +5387,19 @@
 #~ msgstr ""
 #~ "ALTER DATABASE nom [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
-#~ "où option peut être:\n"
+#~ "où option peut être:\n"
 #~ "\n"
 #~ "    CONNECTION LIMIT limite_connexion\n"
 #~ "\n"
 #~ "ALTER DATABASE nom RENAME TO nouveau_nom\n"
 #~ "\n"
-#~ "ALTER DATABASE nom OWNER TO nouveau_propriétaire\n"
+#~ "ALTER DATABASE nom OWNER TO nouveau_propriétaire\n"
 #~ "\n"
 #~ "ALTER DATABASE nom SET TABLESPACE nouveau_tablespace\n"
 #~ "\n"
-#~ "ALTER DATABASE nom SET paramètre_configuration { TO | = } { valeur | DEFAULT }\n"
-#~ "ALTER DATABASE nom SET paramètre_configuration FROM CURRENT\n"
-#~ "ALTER DATABASE nom RESET paramètre_configuration\n"
+#~ "ALTER DATABASE nom SET paramètre_configuration { TO | = } { valeur | DEFAULT }\n"
+#~ "ALTER DATABASE nom SET paramètre_configuration FROM CURRENT\n"
+#~ "ALTER DATABASE nom RESET paramètre_configuration\n"
 #~ "ALTER DATABASE nom RESET ALL"
 
 #~ msgid ""
@@ -5417,9 +5425,9 @@
 #~ "ALTER DOMAIN nom\n"
 #~ "    DROP CONSTRAINT nom_contrainte [ RESTRICT | CASCADE ]\n"
 #~ "ALTER DOMAIN nom\n"
-#~ "    OWNER TO nouveau_propriétaire \n"
+#~ "    OWNER TO nouveau_propriétaire \n"
 #~ "ALTER DOMAIN nom\n"
-#~ "    SET SCHEMA nouveau_schéma"
+#~ "    SET SCHEMA nouveau_schéma"
 
 #~ msgid ""
 #~ "ALTER FOREIGN DATA WRAPPER name\n"
@@ -5430,7 +5438,7 @@
 #~ "ALTER FOREIGN DATA WRAPPER nom\n"
 #~ "    [ VALIDATOR fonction_validation | NO VALIDATOR ]\n"
 #~ "    [ OPTIONS ( [ ADD | SET | DROP ] option ['valeur'] [, ... ]) ]\n"
-#~ "ALTER FOREIGN DATA WRAPPER nom OWNER TO nouveau_propriétaire"
+#~ "ALTER FOREIGN DATA WRAPPER nom OWNER TO nouveau_propriétaire"
 
 #~ msgid ""
 #~ "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
@@ -5463,16 +5471,16 @@
 #~ "ALTER FUNCTION nom ( [ [ mode_arg ] [ nom_arg ] type_arg [, ...] ] )\n"
 #~ "    SET SCHEMA nouveau_schema\n"
 #~ "\n"
-#~ "où action peut être :\n"
+#~ "où action peut être :\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 cout_execution\n"
 #~ "    ROWS lignes_resultats\n"
-#~ "    SET paramètre { TO | = } { valeur | DEFAULT }\n"
-#~ "    SET paramètre FROM CURRENT\n"
-#~ "    RESET paramètre\n"
+#~ "    SET paramètre { TO | = } { valeur | DEFAULT }\n"
+#~ "    SET paramètre FROM CURRENT\n"
+#~ "    RESET paramètre\n"
 #~ "    RESET ALL"
 
 #~ msgid ""
@@ -5494,29 +5502,29 @@
 #~ msgstr ""
 #~ "ALTER INDEX nom RENAME TO nouveau_nom\n"
 #~ "ALTER INDEX nom SET TABLESPACE nom_tablespace\n"
-#~ "ALTER INDEX nom SET ( paramètre_stockage = valeur [, ... ] )\n"
-#~ "ALTER INDEX nom RESET ( paramètre_stockage [, ... ] )"
+#~ "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"
+#~ "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"
+#~ "  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"
 #~ msgstr ""
-#~ "ALTER OPERATOR CLASS nom USING méthode_indexation\n"
+#~ "ALTER OPERATOR CLASS nom USING méthode_indexation\n"
 #~ "  RENAME TO nouveau_nom\n"
-#~ "ALTER OPERATOR CLASS nom USING méthode_indexation\n"
-#~ "  OWNER TO nouveau_propriétaire"
+#~ "ALTER OPERATOR CLASS nom USING méthode_indexation\n"
+#~ "  OWNER TO nouveau_propriétaire"
 
 #~ msgid ""
 #~ "ALTER OPERATOR FAMILY name USING index_method ADD\n"
@@ -5530,19 +5538,19 @@
 #~ "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 nom USING méthode_indexage ADD\n"
-#~ "  {  OPERATOR numéro_stratégie nom_opérateur ( type_op, type_op ) \n"
-#~ "    | FUNCTION numéro_support [ ( type_op [ , type_op ] ) ]\n"
+#~ "ALTER OPERATOR FAMILY nom USING méthode_indexage ADD\n"
+#~ "  {  OPERATOR numéro_stratégie nom_opérateur ( type_op, type_op ) \n"
+#~ "    | FUNCTION numéro_support [ ( type_op [ , type_op ] ) ]\n"
 #~ "      nom_fonction ( type_argument [, ...] )\n"
 #~ "  } [, ... ]\n"
-#~ "ALTER OPERATOR FAMILY nom USING méthode_indexage DROP\n"
-#~ "  {  OPERATOR numéro_stratégie ( type_op [ , type_op ] )\n"
-#~ "    | FUNCTION numéro_support ( type_op [ , type_op ] )\n"
+#~ "ALTER OPERATOR FAMILY nom USING méthode_indexage DROP\n"
+#~ "  {  OPERATOR numéro_stratégie ( type_op [ , type_op ] )\n"
+#~ "    | FUNCTION numéro_support ( type_op [ , type_op ] )\n"
 #~ "  } [, ... ]\n"
-#~ "ALTER OPERATOR FAMILY nom USING méthode_indexage\n"
+#~ "ALTER OPERATOR FAMILY nom USING méthode_indexage\n"
 #~ "  RENAME TO nouveau_nom\n"
-#~ "ALTER OPERATOR FAMILY nom USING méthode_indexage\n"
-#~ "  OWNER TO nouveau_propriétaire"
+#~ "ALTER OPERATOR FAMILY nom USING méthode_indexage\n"
+#~ "  OWNER TO nouveau_propriétaire"
 
 #~ msgid ""
 #~ "ALTER ROLE name [ [ WITH ] option [ ... ] ]\n"
@@ -5568,7 +5576,7 @@
 #~ msgstr ""
 #~ "ALTER ROLE nom [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
-#~ "où option peut être :\n"
+#~ "où option peut être :\n"
 #~ "    \n"
 #~ "      SUPERUSER | NOSUPERUSER\n"
 #~ "    | CREATEDB | NOCREATEDB\n"
@@ -5582,9 +5590,9 @@
 #~ "\n"
 #~ "ALTER ROLE nom RENAME TO nouveau_nom\n"
 #~ "\n"
-#~ "ALTER ROLE nom SET paramètre { TO | = } { valeur | DEFAULT }\n"
-#~ "ALTER ROLE name SET paramètre FROM CURRENT\n"
-#~ "ALTER ROLE nom RESET paramètre\n"
+#~ "ALTER ROLE nom SET paramètre { TO | = } { valeur | DEFAULT }\n"
+#~ "ALTER ROLE name SET paramètre FROM CURRENT\n"
+#~ "ALTER ROLE nom RESET paramètre\n"
 #~ "ALTER ROLE name RESET ALL"
 
 #~ msgid ""
@@ -5592,7 +5600,7 @@
 #~ "ALTER SCHEMA name OWNER TO newowner"
 #~ msgstr ""
 #~ "ALTER SCHEMA nom RENAME TO nouveau_nom\n"
-#~ "ALTER SCHEMA nom OWNER TO nouveau_propriétaire"
+#~ "ALTER SCHEMA nom OWNER TO nouveau_propriétaire"
 
 #~ msgid ""
 #~ "ALTER SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
@@ -5605,15 +5613,15 @@
 #~ "ALTER SEQUENCE name RENAME TO new_name\n"
 #~ "ALTER SEQUENCE name SET SCHEMA new_schema"
 #~ msgstr ""
-#~ "ALTER SEQUENCE nom [ INCREMENT [ BY ] incrément ]\n"
+#~ "ALTER SEQUENCE nom [ INCREMENT [ BY ] incrément ]\n"
 #~ "    [ MINVALUE valeur_min | NO MINVALUE ] [ MAXVALUE valeur_max | NO MAXVALUE ]\n"
-#~ "    [ START [ WITH ] valeur_début ]\n"
-#~ "    [ RESTART [ [ WITH ] valeur_redémarrage ] ]\n"
+#~ "    [ START [ WITH ] valeur_début ]\n"
+#~ "    [ RESTART [ [ WITH ] valeur_redémarrage ] ]\n"
 #~ "    [ CACHE cache ] [ [ NO ] CYCLE ]\n"
 #~ "    [ OWNED BY { table.colonne | NONE } ]\n"
-#~ "ALTER SEQUENCE nom OWNER TO new_propriétaire\n"
+#~ "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"
+#~ "ALTER SEQUENCE nom SET SCHEMA new_schéma"
 
 #~ msgid ""
 #~ "ALTER SERVER servername [ VERSION 'newversion' ]\n"
@@ -5622,7 +5630,7 @@
 #~ msgstr ""
 #~ "ALTER SERVER nom [ VERSION 'nouvelleversion' ]\n"
 #~ "    [ OPTIONS ( [ ADD | SET | DROP ] option ['valeur'] [, ... ] ) ]\n"
-#~ "ALTER SERVER nom OWNER TO nouveau_propriétaire"
+#~ "ALTER SERVER nom OWNER TO nouveau_propriétaire"
 
 #~ msgid ""
 #~ "ALTER TABLE [ ONLY ] name [ * ]\n"
@@ -5674,7 +5682,7 @@
 #~ "ALTER TABLE nom\n"
 #~ "    SET SCHEMA nouveau_schema\n"
 #~ "\n"
-#~ "où action peut être :\n"
+#~ "où action peut être :\n"
 #~ "\n"
 #~ "    ADD [ COLUMN ] colonne type [ contrainte_colonne [ ... ] ]\n"
 #~ "    DROP [ COLUMN ] colonne [ RESTRICT | CASCADE ]\n"
@@ -5691,19 +5699,19 @@
 #~ "    ENABLE TRIGGER [ nom_trigger | ALL | USER ]\n"
 #~ "    ENABLE REPLICA TRIGGER nom_trigger\n"
 #~ "    ENABLE ALWAYS TRIGGER nom_trigger\n"
-#~ "    DISABLE RULE nom_règle_réécriture\n"
-#~ "    ENABLE RULE nom_règle_réécriture\n"
-#~ "    ENABLE REPLICA RULE nom_règle_réécriture\n"
-#~ "    ENABLE ALWAYS RULE nom_règle_réécriture\n"
+#~ "    DISABLE RULE nom_règle_réécriture\n"
+#~ "    ENABLE RULE nom_règle_réécriture\n"
+#~ "    ENABLE REPLICA RULE nom_règle_réécriture\n"
+#~ "    ENABLE ALWAYS RULE nom_règle_réécriture\n"
 #~ "    CLUSTER ON nom_index\n"
 #~ "    SET WITHOUT CLUSTER\n"
 #~ "    SET WITH OIDS\n"
 #~ "    SET WITHOUT OIDS\n"
-#~ "    SET ( paramètre_stockage = valeur [, ... ] )\n"
-#~ "    RESET ( paramètre_stockage [, ... ] )\n"
+#~ "    SET ( paramètre_stockage = valeur [, ... ] )\n"
+#~ "    RESET ( paramètre_stockage [, ... ] )\n"
 #~ "    INHERIT table_parent\n"
 #~ "    NO INHERIT table_parent\n"
-#~ "    OWNER TO nouveau_propriétaire\n"
+#~ "    OWNER TO nouveau_propriétaire\n"
 #~ "    SET TABLESPACE nouveau_tablespace"
 
 #~ msgid ""
@@ -5711,7 +5719,7 @@
 #~ "ALTER TABLESPACE name OWNER TO newowner"
 #~ msgstr ""
 #~ "ALTER TABLESPACE nom RENAME TO nouveau_nom\n"
-#~ "ALTER TABLESPACE nom OWNER TO nouveau_propriétaire"
+#~ "ALTER TABLESPACE nom OWNER TO nouveau_propriétaire"
 
 #~ msgid ""
 #~ "ALTER TEXT SEARCH CONFIGURATION name\n"
@@ -5739,7 +5747,7 @@
 #~ "ALTER TEXT SEARCH CONFIGURATION nom\n"
 #~ "    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"
+#~ "ALTER TEXT SEARCH CONFIGURATION nom OWNER TO nouveau_propriétaire"
 
 #~ msgid ""
 #~ "ALTER TEXT SEARCH DICTIONARY name (\n"
@@ -5752,7 +5760,7 @@
 #~ "    option [ = valeur ] [, ... ]\n"
 #~ ")\n"
 #~ "ALTER TEXT SEARCH DICTIONARY nom RENAME TO nouveau_nom\n"
-#~ "ALTER TEXT SEARCH DICTIONARY nom OWNER TO nouveau_propriétaire"
+#~ "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"
@@ -5769,8 +5777,8 @@
 #~ "ALTER TYPE name SET SCHEMA new_schema"
 #~ msgstr ""
 #~ "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"
+#~ "ALTER TYPE nom OWNER TO nouveau_propriétaire\n"
+#~ "ALTER TYPE nom SET SCHEMA nouveau_schéma"
 
 #~ msgid ""
 #~ "ALTER USER name [ [ WITH ] option [ ... ] ]\n"
@@ -5796,7 +5804,7 @@
 #~ msgstr ""
 #~ "ALTER USER nom [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
-#~ "où option peut être :\n"
+#~ "où option peut être :\n"
 #~ "    \n"
 #~ "      SUPERUSER | NOSUPERUSER\n"
 #~ "    | CREATEDB | NOCREATEDB\n"
@@ -5810,9 +5818,9 @@
 #~ "\n"
 #~ "ALTER USER nom RENAME TO nouveau_nom\n"
 #~ "\n"
-#~ "ALTER USER nom SET paramètre { TO | = } { valeur | DEFAULT }\n"
-#~ "ALTER USER name SET paramètre FROM CURRENT\n"
-#~ "ALTER USER nom RESET paramètre\n"
+#~ "ALTER USER nom SET paramètre { TO | = } { valeur | DEFAULT }\n"
+#~ "ALTER USER name SET paramètre FROM CURRENT\n"
+#~ "ALTER USER nom RESET paramètre\n"
 #~ "ALTER USER name RESET ALL"
 
 #~ msgid ""
@@ -5833,9 +5841,9 @@
 #~ msgstr ""
 #~ "ALTER VIEW nom ALTER [ COLUMN ] colonne SET DEFAULT expression\n"
 #~ "ALTER VIEW nom ALTER [ COLUMN ] colonne DROP DEFAULT\n"
-#~ "ALTER VIEW nom OWNER TO nouveau_propriétaire\n"
+#~ "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"
+#~ "ALTER VIEW nom SET SCHEMA nouveau_schéma"
 
 #~ msgid "ANALYZE [ VERBOSE ] [ table [ ( column [, ...] ) ] ]"
 #~ msgstr "ANALYZE [ VERBOSE ] [ table [ ( colonne [, ...] ) ] ]"
@@ -5850,7 +5858,7 @@
 #~ msgstr ""
 #~ "BEGIN [ WORK | TRANSACTION ] [ transaction_mode [, ...] ]\n"
 #~ "\n"
-#~ "où transaction_mode peut être :\n"
+#~ "où transaction_mode peut être :\n"
 #~ "\n"
 #~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ |\n"
 #~ "                      READ COMMITTED | READ UNCOMMITTED }\n"
@@ -5968,23 +5976,23 @@
 #~ "    [ [ WITH ] \n"
 #~ "          [ BINARY ]\n"
 #~ "          [ OIDS ]\n"
-#~ "          [ DELIMITER [ AS ] 'délimiteur' ]\n"
-#~ "          [ NULL [ AS ] 'chaîne null' ]\n"
+#~ "          [ DELIMITER [ AS ] 'délimiteur' ]\n"
+#~ "          [ NULL [ AS ] 'chaîne null' ]\n"
 #~ "          [ CSV [ HEADER ]\n"
 #~ "                [ QUOTE [ AS ] 'guillemet' ] \n"
-#~ "                [ ESCAPE [ AS ] 'échappement' ]\n"
+#~ "                [ ESCAPE [ AS ] 'échappement' ]\n"
 #~ "                [ FORCE NOT NULL colonne [, ...] ]\n"
 #~ "\n"
-#~ "COPY { nom_table [ ( colonne [, ...] ) ] | ( requête ) }\n"
+#~ "COPY { nom_table [ ( colonne [, ...] ) ] | ( requête ) }\n"
 #~ "    TO { 'nom_fichier' | STDOUT }\n"
 #~ "    [ [ WITH ] \n"
 #~ "          [ BINARY ]\n"
 #~ "          [ OIDS ]\n"
-#~ "          [ DELIMITER [ AS ] 'délimiteur' ]\n"
-#~ "          [ NULL [ AS ] 'chaîne null' ]\n"
+#~ "          [ DELIMITER [ AS ] 'délimiteur' ]\n"
+#~ "          [ NULL [ AS ] 'chaîne null' ]\n"
 #~ "          [ CSV [ HEADER ]\n"
 #~ "                [ QUOTE [ AS ] 'guillemet' ] \n"
-#~ "                [ ESCAPE [ AS ] 'échappement' ]\n"
+#~ "                [ ESCAPE [ AS ] 'échappement' ]\n"
 #~ "                [ FORCE QUOTE colonne [, ...] ]"
 
 #~ msgid ""
@@ -6007,12 +6015,12 @@
 #~ "    [ , SORTOP = sort_operator ]\n"
 #~ ")"
 #~ msgstr ""
-#~ "CREATE AGGREGATE nom ( type_données_en_entrée [ , ... ] ) (\n"
+#~ "CREATE AGGREGATE nom ( type_données_en_entrée [ , ... ] ) (\n"
 #~ "    SFUNC = sfonction,\n"
-#~ "    STYPE = type_données_état\n"
+#~ "    STYPE = type_données_état\n"
 #~ "    [ , FINALFUNC = fonction_f ]\n"
 #~ "    [ , INITCOND = condition_initiale ]\n"
-#~ "    [ , SORTOP = opérateur_tri ]\n"
+#~ "    [ , SORTOP = opérateur_tri ]\n"
 #~ ")\n"
 #~ "\n"
 #~ "ou l'ancienne syntaxe\n"
@@ -6020,10 +6028,10 @@
 #~ "CREATE AGGREGATE nom (\n"
 #~ "    BASETYPE = type_base,\n"
 #~ "    SFUNC = fonction_s,\n"
-#~ "    STYPE = type_données_état\n"
+#~ "    STYPE = type_données_état\n"
 #~ "    [ , FINALFUNC = fonction_f ]\n"
 #~ "    [ , INITCOND = condition_initiale ]\n"
-#~ "    [ , SORTOP = opérateur_tri ]\n"
+#~ "    [ , SORTOP = opérateur_tri ]\n"
 #~ ")"
 
 #~ msgid ""
@@ -6061,9 +6069,9 @@
 #~ "    EXECUTE PROCEDURE funcname ( arguments )"
 #~ msgstr ""
 #~ "CREATE CONSTRAINT TRIGGER nom\n"
-#~ "    AFTER événement [ OR ... ]\n"
+#~ "    AFTER événement [ OR ... ]\n"
 #~ "    ON table\n"
-#~ "    [ FROM table_référencée ]\n"
+#~ "    [ FROM table_référencée ]\n"
 #~ "    { NOT DEFERRABLE | [ DEFERRABLE ]        { INITIALLY IMMEDIATE | INITIALLY DEFERRED } }\n"
 #~ "    FOR EACH ROW\n"
 #~ "    EXECUTE PROCEDURE nom_fonction ( arguments )"
@@ -6086,8 +6094,8 @@
 #~ "           [ CONNECTION LIMIT [=] connlimit ] ]"
 #~ msgstr ""
 #~ "CREATE DATABASE nom\n"
-#~ "    [ [ WITH ] [ OWNER [=] nom_propriétaire ]\n"
-#~ "           [ TEMPLATE [=] modèle ]\n"
+#~ "    [ [ WITH ] [ OWNER [=] nom_propriétaire ]\n"
+#~ "           [ TEMPLATE [=] modèle ]\n"
 #~ "           [ ENCODING [=] encodage ]\n"
 #~ "           [ LC_COLLATE [=] tri_caract ]\n"
 #~ "           [ LC_CTYPE [=] type_caract ]\n"
@@ -6104,7 +6112,7 @@
 #~ "[ CONSTRAINT constraint_name ]\n"
 #~ "{ NOT NULL | NULL | CHECK (expression) }"
 #~ msgstr ""
-#~ "CREATE DOMAIN nom [AS] type_données\n"
+#~ "CREATE DOMAIN nom [AS] type_données\n"
 #~ "    [ DEFAULT expression ]\n"
 #~ "    [ contrainte [ ... ] ]\n"
 #~ "\n"
@@ -6141,7 +6149,7 @@
 #~ "    [ WITH ( attribute [, ...] ) ]"
 #~ msgstr ""
 #~ "CREATE [ OR REPLACE ] FUNCTION\n"
-#~ "    nom ( [ [ mode_arg ] [ nom_arg ] type_arg [ { DEFAULT | = } expr_par_défaut ] [, ...] ] )\n"
+#~ "    nom ( [ [ mode_arg ] [ nom_arg ] type_arg [ { DEFAULT | = } expr_par_défaut ] [, ...] ] )\n"
 #~ "    [ RETURNS type_ret\n"
 #~ "      | RETURNS TABLE ( nom_colonne type_colonne [, ...] ) ]\n"
 #~ "  { LANGUAGE nom_lang\n"
@@ -6149,11 +6157,11 @@
 #~ "    | IMMUTABLE | STABLE | VOLATILE\n"
 #~ "    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
 #~ "    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-#~ "    | COST coût_exécution\n"
-#~ "    | ROWS lignes_résultats\n"
-#~ "    | SET paramètre_configuration { TO valeur | = valeur | FROM CURRENT }\n"
-#~ "    | AS 'définition'\n"
-#~ "    | AS 'fichier_obj', 'symbôle_lien'\n"
+#~ "    | COST coût_exécution\n"
+#~ "    | ROWS lignes_résultats\n"
+#~ "    | SET paramètre_configuration { TO valeur | = valeur | FROM CURRENT }\n"
+#~ "    | AS 'définition'\n"
+#~ "    | AS 'fichier_obj', 'symbôle_lien'\n"
 #~ "  } ...\n"
 #~ "    [ WITH ( attribut [, ...] ) ]"
 
@@ -6179,7 +6187,7 @@
 #~ msgstr ""
 #~ "CREATE GROUP nom [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
-#~ "où option peut être :\n"
+#~ "où option peut être :\n"
 #~ "    \n"
 #~ "      SUPERUSER | NOSUPERUSER\n"
 #~ "    | CREATEDB | NOCREATEDB\n"
@@ -6189,11 +6197,11 @@
 #~ "    | LOGIN | NOLOGIN\n"
 #~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'motdepasse'\n"
 #~ "    | VALID UNTIL 'timestamp' \n"
-#~ "    | IN ROLE nom_rôle [, ...]\n"
-#~ "    | IN GROUP nom_rôle [, ...]\n"
-#~ "    | ROLE nom_rôle [, ...]\n"
-#~ "    | ADMIN nom_rôle [, ...]\n"
-#~ "    | USER nom_rôle [, ...]\n"
+#~ "    | IN ROLE nom_rôle [, ...]\n"
+#~ "    | IN GROUP nom_rôle [, ...]\n"
+#~ "    | ROLE nom_rôle [, ...]\n"
+#~ "    | ADMIN nom_rôle [, ...]\n"
+#~ "    | USER nom_rôle [, ...]\n"
 #~ "    | SYSID uid"
 
 #~ msgid ""
@@ -6245,10 +6253,10 @@
 #~ "   | STORAGE storage_type\n"
 #~ "  } [, ... ]"
 #~ msgstr ""
-#~ "CREATE OPERATOR CLASS nom [ DEFAULT ] FOR TYPE type_donnée\n"
-#~ "  USING méthode_indexage [ FAMILY nom_famille ] AS\n"
-#~ "  { OPERATOR numéro_stratégie nom_operateur [ ( op_type, op_type ) ]\n"
-#~ "    | FUNCTION numéro_support [ ( type_op [ , type_op ] ) ]\n"
+#~ "CREATE OPERATOR CLASS nom [ DEFAULT ] FOR TYPE type_donnée\n"
+#~ "  USING méthode_indexage [ FAMILY nom_famille ] AS\n"
+#~ "  { OPERATOR numéro_stratégie nom_operateur [ ( op_type, op_type ) ]\n"
+#~ "    | FUNCTION numéro_support [ ( type_op [ , type_op ] ) ]\n"
 #~ "      nom_fonction ( type_argument [, ...] )\n"
 #~ "    | STORAGE type_stockage\n"
 #~ "  } [, ... ]"
@@ -6279,7 +6287,7 @@
 #~ msgstr ""
 #~ "CREATE ROLE nom [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
-#~ "où option peut être :\n"
+#~ "où option peut être :\n"
 #~ "    \n"
 #~ "      SUPERUSER | NOSUPERUSER\n"
 #~ "    | CREATEDB | NOCREATEDB\n"
@@ -6290,11 +6298,11 @@
 #~ "    | CONNECTION LIMIT limite_connexion\n"
 #~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'motdepasse'\n"
 #~ "    | VALID UNTIL 'timestamp' \n"
-#~ "    | IN ROLE nom_rôle [, ...]\n"
-#~ "    | IN GROUP nom_rôle [, ...]\n"
-#~ "    | ROLE nom_rôle [, ...]\n"
-#~ "    | ADMIN nom_rôle [, ...]\n"
-#~ "    | USER nom_rôle [, ...]\n"
+#~ "    | IN ROLE nom_rôle [, ...]\n"
+#~ "    | IN GROUP nom_rôle [, ...]\n"
+#~ "    | ROLE nom_rôle [, ...]\n"
+#~ "    | ADMIN nom_rôle [, ...]\n"
+#~ "    | USER nom_rôle [, ...]\n"
 #~ "    | SYSID uid"
 
 #~ msgid ""
@@ -6302,7 +6310,7 @@
 #~ "    TO table [ WHERE condition ]\n"
 #~ "    DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; command ... ) }"
 #~ msgstr ""
-#~ "CREATE [ OR REPLACE ] RULE nom AS ON événement\n"
+#~ "CREATE [ OR REPLACE ] RULE nom AS ON événement\n"
 #~ "    TO table [ WHERE condition ]\n"
 #~ "    DO [ ALSO | INSTEAD ] { NOTHING | commande | ( commande ; commande ... ) }"
 
@@ -6320,10 +6328,10 @@
 #~ "    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
 #~ "    [ OWNED BY { table.column | NONE } ]"
 #~ msgstr ""
-#~ "CREATE [ TEMPORARY | TEMP ] SEQUENCE nom [ INCREMENT [ BY ] incrémentation ]\n"
+#~ "CREATE [ TEMPORARY | TEMP ] SEQUENCE nom [ INCREMENT [ BY ] incrémentation ]\n"
 #~ "    [ MINVALUE valeur_mini | NO MINVALUE ]\n"
 #~ "    [ MAXVALUE valeur_maxi | NO MAXVALUE ]\n"
-#~ "    [ START [ WITH ] valeur_départ ]\n"
+#~ "    [ START [ WITH ] valeur_départ ]\n"
 #~ "    [ CACHE en_cache ]\n"
 #~ "    [ [ NO ] CYCLE ]\n"
 #~ "    [ OWNED BY { table.colonne | NONE } ]"
@@ -6377,7 +6385,7 @@
 #~ "[ USING INDEX TABLESPACE tablespace ]"
 #~ msgstr ""
 #~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE nom_table ( [\n"
-#~ "  { nom_colonne type_données [ DEFAULT expr_par_défaut ]\n"
+#~ "  { nom_colonne type_données [ DEFAULT expr_par_défaut ]\n"
 #~ "    [ contrainte_colonne [ ... ] ]\n"
 #~ "    | contrainte_table\n"
 #~ "    | LIKE table_parent [ { INCLUDING | EXCLUDING }\n"
@@ -6385,40 +6393,40 @@
 #~ "    [, ... ]\n"
 #~ "] )\n"
 #~ "[ INHERITS ( table_parent [, ... ] ) ]\n"
-#~ "[ WITH ( paramètre_stockage [= valeur] [, ... ] )  | WITH OIDS | WITHOUT OIDS ]\n"
+#~ "[ WITH ( paramètre_stockage [= valeur] [, ... ] )  | WITH OIDS | WITHOUT OIDS ]\n"
 #~ "[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
 #~ "[ TABLESPACE tablespace ]\n"
 #~ "\n"
-#~ "où colonne_contrainte peut être :\n"
+#~ "où colonne_contrainte peut être :\n"
 #~ "\n"
 #~ "[ CONSTRAINT nom_contrainte ]\n"
 #~ "{ NOT NULL | \n"
 #~ "  NULL | \n"
-#~ "  UNIQUE paramètres_index |\n"
-#~ "  PRIMARY KEY paramètres_index |\n"
+#~ "  UNIQUE paramètres_index |\n"
+#~ "  PRIMARY KEY paramètres_index |\n"
 #~ "  CHECK (expression) |\n"
-#~ "  REFERENCES table_référée [ ( colonne_referrée ) ]\n"
+#~ "  REFERENCES table_référée [ ( colonne_referrée ) ]\n"
 #~ "    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ]\n"
 #~ "    [ ON DELETE action ] [ ON UPDATE action ] }\n"
 #~ "[ DEFERRABLE | NOT DEFERRABLE ]\n"
 #~ "[ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]\n"
 #~ "\n"
-#~ "et contrainte_table peut être :\n"
+#~ "et contrainte_table peut être :\n"
 #~ "\n"
 #~ "[ CONSTRAINT nom_contrainte ]\n"
-#~ "{ UNIQUE ( nom_colonne [, ... ] ) paramètres_index |\n"
-#~ "  PRIMARY KEY ( nom_colonne [, ... ] ) paramètres_index |\n"
+#~ "{ UNIQUE ( nom_colonne [, ... ] ) paramètres_index |\n"
+#~ "  PRIMARY KEY ( nom_colonne [, ... ] ) paramètres_index |\n"
 #~ "  CHECK ( expression ) |\n"
 #~ "  FOREIGN KEY ( nom_colonne [, ... ] ) REFERENCES\n"
-#~ "    table_référée [ ( colonne_référée [, ... ] ) ]\n"
+#~ "    table_référée [ ( colonne_référée [, ... ] ) ]\n"
 #~ "  [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ]\n"
 #~ "  [ ON DELETE action ] [ ON UPDATE action ] }\n"
 #~ "[ DEFERRABLE | NOT DEFERRABLE ]\n"
 #~ "[ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]\n"
 #~ "\n"
-#~ "les paramètres_index dans les contraintes UNIQUE et PRIMARY KEY sont :\n"
+#~ "les paramètres_index dans les contraintes UNIQUE et PRIMARY KEY sont :\n"
 #~ "\n"
-#~ "[ WITH ( paramètre_stockage [= valeur] [, ... ] ) ]\n"
+#~ "[ WITH ( paramètre_stockage [= valeur] [, ... ] ) ]\n"
 #~ "[ USING INDEX TABLESPACE espace_logique ]"
 
 #~ msgid ""
@@ -6432,15 +6440,15 @@
 #~ msgstr ""
 #~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE nom_table\n"
 #~ "    [ (nom_colonne [, ...] ) ]\n"
-#~ "    [ WITH ( paramètre_stockage [= valeur] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]\n"
+#~ "    [ WITH ( paramètre_stockage [= valeur] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]\n"
 #~ "    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
 #~ "    [ TABLESPACE tablespace ]\n"
-#~ "    AS requête    [ WITH [ NO ] DATA ]"
+#~ "    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'"
+#~ "    LOCATION 'répertoire'"
 
 #~ msgid ""
 #~ "CREATE TEXT SEARCH CONFIGURATION name (\n"
@@ -6460,7 +6468,7 @@
 #~ ")"
 #~ msgstr ""
 #~ "CREATE TEXT SEARCH DICTIONARY nom (\n"
-#~ "    TEMPLATE = modèle\n"
+#~ "    TEMPLATE = modèle\n"
 #~ "    [, option = valeur [, ... ]]\n"
 #~ ")"
 
@@ -6497,7 +6505,7 @@
 #~ "    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
 #~ "    EXECUTE PROCEDURE funcname ( arguments )"
 #~ msgstr ""
-#~ "CREATE TRIGGER nom { BEFORE | AFTER } { événement [ OR ... ] }\n"
+#~ "CREATE TRIGGER nom { BEFORE | AFTER } { événement [ OR ... ] }\n"
 #~ "    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
 #~ "    EXECUTE PROCEDURE nom_fonction ( arguments )"
 
@@ -6537,11 +6545,11 @@
 #~ "    ( 'label' [, ... ] )\n"
 #~ "\n"
 #~ "CREATE TYPE nom (\n"
-#~ "    INPUT = fonction_entrée,\n"
+#~ "    INPUT = fonction_entrée,\n"
 #~ "    OUTPUT = fonction_sortie\n"
-#~ "    [ , RECEIVE = fonction_réception ]\n"
+#~ "    [ , RECEIVE = fonction_réception ]\n"
 #~ "    [ , SEND = fonction_envoi ]\n"
-#~ "    [ , TYPMOD_IN = fonction_entrée_modif_type ]\n"
+#~ "    [ , TYPMOD_IN = fonction_entrée_modif_type ]\n"
 #~ "    [ , TYPMOD_OUT = fonction_sortie_modif_type ]\n"
 #~ "    [ , ANALYZE = fonction_analyse ]\n"
 #~ "    [ , INTERNALLENGTH = { longueur_interne | VARIABLE } ]\n"
@@ -6549,11 +6557,11 @@
 #~ "    [ , ALIGNMENT = alignement ]\n"
 #~ "    [ , STORAGE = stockage ]\n"
 #~ "    [ , LIKE = type_like ]\n"
-#~ "    [ , CATEGORY = catégorie ]\n"
-#~ "    [ , PREFERRED = préféré ]\n"
-#~ "    [ , DEFAULT = valeur_par_défaut ]\n"
-#~ "    [ , ELEMENT = élément ]\n"
-#~ "    [ , DELIMITER = délimiteur ]\n"
+#~ "    [ , CATEGORY = catégorie ]\n"
+#~ "    [ , PREFERRED = préféré ]\n"
+#~ "    [ , DEFAULT = valeur_par_défaut ]\n"
+#~ "    [ , ELEMENT = élément ]\n"
+#~ "    [ , DELIMITER = délimiteur ]\n"
 #~ ")\n"
 #~ "\n"
 #~ "CREATE TYPE nom"
@@ -6581,7 +6589,7 @@
 #~ msgstr ""
 #~ "CREATE USER nom [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
-#~ "où option peut être :\n"
+#~ "où option peut être :\n"
 #~ "    \n"
 #~ "      SUPERUSER | NOSUPERUSER\n"
 #~ "    | CREATEDB | NOCREATEDB\n"
@@ -6592,11 +6600,11 @@
 #~ "    | CONNECTION LIMIT limite_connexion\n"
 #~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'motdepasse'\n"
 #~ "    | VALID UNTIL 'timestamp' \n"
-#~ "    | IN ROLE nom_rôle [, ...]\n"
-#~ "    | IN GROUP nom_rôle [, ...]\n"
-#~ "    | ROLE nom_rôle [, ...]\n"
-#~ "    | ADMIN nom_rôle [, ...]\n"
-#~ "    | USER nom_rôle [, ...]\n"
+#~ "    | IN ROLE nom_rôle [, ...]\n"
+#~ "    | IN GROUP nom_rôle [, ...]\n"
+#~ "    | ROLE nom_rôle [, ...]\n"
+#~ "    | ADMIN nom_rôle [, ...]\n"
+#~ "    | USER nom_rôle [, ...]\n"
 #~ "    | SYSID uid"
 
 #~ msgid ""
@@ -6614,7 +6622,7 @@
 #~ msgstr ""
 #~ "CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW nom\n"
 #~ "    [ ( nom_colonne [, ...] ) ]\n"
-#~ "    AS requête"
+#~ "    AS requête"
 
 #~ msgid "DEALLOCATE [ PREPARE ] { name | ALL }"
 #~ msgstr "DEALLOCATE [ PREPARE ] { nom_plan | ALL }"
@@ -6624,7 +6632,7 @@
 #~ "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query"
 #~ msgstr ""
 #~ "DECLARE nom [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
-#~ "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR requête"
+#~ "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR requête"
 
 #~ msgid ""
 #~ "DELETE FROM [ ONLY ] table [ [ AS ] alias ]\n"
@@ -6684,12 +6692,12 @@
 #~ 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 ]"
+#~ "    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 ]"
+#~ "  USING méthode_indexage [ CASCADE | RESTRICT ]"
 
 #~ msgid "DROP OWNED BY name [, ...] [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP OWNED BY nom [, ...] [ CASCADE | RESTRICT ]"
@@ -6746,7 +6754,7 @@
 #~ msgstr "END [ WORK | TRANSACTION ]"
 
 #~ msgid "EXECUTE name [ ( parameter [, ...] ) ]"
-#~ msgstr "EXECUTE nom_plan [ ( paramètre [, ...] ) ]"
+#~ msgstr "EXECUTE nom_plan [ ( paramètre [, ...] ) ]"
 
 #~ msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"
 #~ msgstr "EXPLAIN [ ANALYZE ] [ VERBOSE ] instruction"
@@ -6773,7 +6781,7 @@
 #~ msgstr ""
 #~ "FETCH [ direction { FROM | IN } ] nom_curseur\n"
 #~ "\n"
-#~ "sans préciser de direction ou en choissant une des directions suivantes :\n"
+#~ "sans préciser de direction ou en choissant une des directions suivantes :\n"
 #~ "\n"
 #~ "    NEXT\n"
 #~ "    PRIOR\n"
@@ -6839,47 +6847,47 @@
 #~ "GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
 #~ "    [,...] | ALL [ PRIVILEGES ] }\n"
 #~ "    ON [ TABLE ] nom_table [, ...]\n"
-#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
 #~ "GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( colonne [, ...] )\n"
 #~ "    [,...] | ALL [ PRIVILEGES ] ( colonne [, ...] ) }\n"
 #~ "    ON [ TABLE ] nom_table [, ...]\n"
-#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
 #~ "GRANT { { USAGE | SELECT | UPDATE }\n"
 #~ "    [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SEQUENCE nom_séquence [, ...]\n"
-#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "    ON SEQUENCE nom_séquence [, ...]\n"
+#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
 #~ "GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
 #~ "    ON DATABASE nom_base [, ...]\n"
-#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
 #~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
 #~ "    ON FOREIGN DATA WRAPPER nomfdw [, ...]\n"
-#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
 #~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
 #~ "    ON FOREIGN SERVER nom_serveur [, ...]\n"
-#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
 #~ "GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
 #~ "    ON FUNCTION nom_fonction ( [ [ mode_arg ] [ nom_arg ] type_arg [, ...] ] ) [, ...]\n"
-#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
 #~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
 #~ "    ON LANGUAGE nom_langage [, ...]\n"
-#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
 #~ "GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SCHEMA nom_schéma [, ...]\n"
-#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "    ON SCHEMA nom_schéma [, ...]\n"
+#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
 #~ "GRANT { CREATE | ALL [ PRIVILEGES ] }\n"
 #~ "    ON TABLESPACE nom_tablespace [, ...]\n"
-#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
-#~ "GRANT rôle [, ...] TO nom_rôle [, ...] [ WITH ADMIN OPTION ]"
+#~ "GRANT rôle [, ...] TO nom_rôle [, ...] [ WITH ADMIN OPTION ]"
 
 #~ msgid ""
 #~ "INSERT INTO table [ ( column [, ...] ) ]\n"
@@ -6887,7 +6895,7 @@
 #~ "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
 #~ msgstr ""
 #~ "INSERT INTO table [ ( colonne [, ...] ) ]\n"
-#~ "    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) [, ...] | requête }\n"
+#~ "    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) [, ...] | requête }\n"
 #~ "    [ RETURNING * | expression_sortie [ [ AS ] nom_sortie ] [, ...] ]"
 
 #~ msgid "LISTEN name"
@@ -6918,7 +6926,7 @@
 #~ msgstr "NOTIFY nom"
 
 #~ msgid "PREPARE name [ ( datatype [, ...] ) ] AS statement"
-#~ msgstr "PREPARE nom_plan [ ( type_données [, ...] ) ] AS instruction"
+#~ msgstr "PREPARE nom_plan [ ( type_données [, ...] ) ] AS instruction"
 
 #~ msgid "PREPARE TRANSACTION transaction_id"
 #~ msgstr "PREPARE TRANSACTION id_transaction"
@@ -7004,67 +7012,67 @@
 #~ "    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
 #~ "    [,...] | ALL [ PRIVILEGES ] }\n"
 #~ "    ON [ TABLE ] nom_table [, ...]\n"
-#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
+#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]\n"
 #~ "\n"
 #~ "REVOKE [ GRANT OPTION FOR ]\n"
 #~ "    { { SELECT | INSERT | UPDATE | REFERENCES } ( colonne [, ...] )\n"
 #~ "    [,...] | ALL [ PRIVILEGES ] ( colonne [, ...] ) }\n"
 #~ "    ON [ TABLE ] nom_table [, ...]\n"
-#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
+#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]\n"
 #~ "\n"
 #~ "REVOKE [ GRANT OPTION FOR ]\n"
 #~ "    { { USAGE | SELECT | UPDATE }\n"
 #~ "    [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SEQUENCE nom_séquence [, ...]\n"
-#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
+#~ "    ON SEQUENCE nom_séquence [, ...]\n"
+#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]\n"
 #~ "\n"
 #~ "REVOKE [ GRANT OPTION FOR ]\n"
 #~ "    { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
 #~ "    ON DATABASE nom_base [, ...]\n"
-#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
+#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]\n"
 #~ "\n"
 #~ "REVOKE [ GRANT OPTION FOR ]\n"
 #~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
 #~ "    ON FOREIGN DATA WRAPPER nom_fdw [, ...]\n"
-#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
+#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]\n"
 #~ "\n"
 #~ "REVOKE [ GRANT OPTION FOR ]\n"
 #~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
 #~ "    ON FOREIGN SERVER nom_serveur [, ...]\n"
-#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
+#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]\n"
 #~ "\n"
 #~ "REVOKE [ GRANT OPTION FOR ]\n"
 #~ "    { EXECUTE | ALL [ PRIVILEGES ] }\n"
 #~ "    ON FUNCTION nom_fonction ( [ [ mode_arg ] [ nom_arg ] type_arg [, ...] ] ) [, ...]\n"
-#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
+#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]\n"
 #~ "\n"
 #~ "REVOKE [ GRANT OPTION FOR ]\n"
 #~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
 #~ "    ON LANGUAGE nom_langage [, ...]\n"
-#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
+#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]\n"
 #~ "\n"
 #~ "REVOKE [ GRANT OPTION FOR ]\n"
 #~ "    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SCHEMA nom_schéma [, ...]\n"
-#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
+#~ "    ON SCHEMA nom_schéma [, ...]\n"
+#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]\n"
 #~ "\n"
 #~ "REVOKE [ GRANT OPTION FOR ]\n"
 #~ "    { CREATE | ALL [ PRIVILEGES ] }\n"
 #~ "    ON TABLESPACE nom_tablespace [, ...]\n"
-#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
+#~ "    FROM { [ GROUP ] nom_rôle | PUBLIC } [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]\n"
 #~ "\n"
 #~ "REVOKE [ ADMIN OPTION FOR ]\n"
-#~ "    role [, ...] FROM nom_rôle [, ...]\n"
+#~ "    role [, ...] FROM nom_rôle [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]"
 
 #~ msgid "ROLLBACK [ WORK | TRANSACTION ]"
@@ -7107,35 +7115,35 @@
 #~ "\n"
 #~ "TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
 #~ msgstr ""
-#~ "[ WITH [ RECURSIVE ] requête_with [, ...] ]\n"
+#~ "[ WITH [ RECURSIVE ] requête_with [, ...] ]\n"
 #~ "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
 #~ "    * | expression [ [ AS ] nom_sortie ] [, ...]\n"
-#~ "    [ FROM élément_from [, ...] ]\n"
+#~ "    [ FROM élément_from [, ...] ]\n"
 #~ "    [ WHERE condition ]\n"
 #~ "    [ GROUP BY expression [, ...] ]\n"
 #~ "    [ HAVING condition [, ...] ]\n"
-#~ "    [ WINDOW nom_window AS ( définition_window ) [, ...] ]\n"
+#~ "    [ WINDOW nom_window AS ( définition_window ) [, ...] ]\n"
 #~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-#~ "    [ ORDER BY expression [ ASC | DESC | USING opérateur ] [ NULLS { FIRST | LAST } ] [, ...] ]\n"
+#~ "    [ ORDER BY expression [ ASC | DESC | USING opérateur ] [ NULLS { FIRST | LAST } ] [, ...] ]\n"
 #~ "    [ LIMIT { total | ALL } ]\n"
-#~ "    [ OFFSET début [ ROW | ROWS ] ]\n"
+#~ "    [ OFFSET début [ ROW | ROWS ] ]\n"
 #~ "    [ FETCH { FIRST | NEXT } [ total ] { ROW | ROWS } ONLY ]\n"
 #~ "    [ FOR { UPDATE | SHARE } [ OF nom_table [, ...] ] [ NOWAIT ] [...] ]\n"
 #~ "\n"
-#~ "avec élément_from faisant parti de :\n"
+#~ "avec élément_from faisant parti de :\n"
 #~ "\n"
 #~ "    [ ONLY ] nom_table [ * ] [ [ AS ] alias [ ( alias_colonne [, ...] ) ] ]\n"
 #~ "    ( select ) [ AS ] alias [ ( alias_colonne [, ...] ) ]\n"
-#~ "    nom_requête_with [ [ AS ] alias [ ( alias_colonne [, ...] ) ] ]\n"
-#~ "    nom_fonction ( [ argument [, ...] ] ) [ AS ] alias [ ( alias_colonne [, ...] | définition_colonne [, ...] ) ]\n"
-#~ "    nom_fonction ( [ argument [, ...] ] ) AS ( définition_colonne [, ...] )\n"
-#~ "    élément_from [ NATURAL ] type_jointure élément_from [ ON condition_jointure | USING ( colonne_jointure [, ...] ) ]\n"
+#~ "    nom_requête_with [ [ AS ] alias [ ( alias_colonne [, ...] ) ] ]\n"
+#~ "    nom_fonction ( [ argument [, ...] ] ) [ AS ] alias [ ( alias_colonne [, ...] | définition_colonne [, ...] ) ]\n"
+#~ "    nom_fonction ( [ argument [, ...] ] ) AS ( définition_colonne [, ...] )\n"
+#~ "    élément_from [ NATURAL ] type_jointure élément_from [ ON condition_jointure | USING ( colonne_jointure [, ...] ) ]\n"
 #~ "\n"
-#~ "et requête_with est:\n"
+#~ "et requête_with est:\n"
 #~ "\n"
-#~ "    nom_requête_with [ ( nom_colonne [, ...] ) ] AS ( select )\n"
+#~ "    nom_requête_with [ ( nom_colonne [, ...] ) ] AS ( select )\n"
 #~ "\n"
-#~ "TABLE { [ ONLY ] nom_table [ * ] | nom_requête_with }"
+#~ "TABLE { [ ONLY ] nom_table [ * ] | nom_requête_with }"
 
 #~ msgid ""
 #~ "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
@@ -7154,19 +7162,19 @@
 #~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
 #~ "    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]"
 #~ msgstr ""
-#~ "[ WITH [ RECURSIVE ] requête_with [, ...] ]\n"
+#~ "[ WITH [ RECURSIVE ] requête_with [, ...] ]\n"
 #~ "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
 #~ "    * | expression [ [ AS ] nom_sortie ] [, ...]\n"
 #~ "    INTO [ TEMPORARY | TEMP ] [ TABLE ] nouvelle_table\n"
-#~ "    [ FROM élément_from [, ...] ]\n"
+#~ "    [ FROM élément_from [, ...] ]\n"
 #~ "    [ WHERE condition ]\n"
 #~ "    [ GROUP BY expression [, ...] ]\n"
 #~ "    [ HAVING condition [, ...] ]\n"
-#~ "    [ WINDOW nom_window AS ( définition_window ) [, ...] ]\n"
+#~ "    [ WINDOW nom_window AS ( définition_window ) [, ...] ]\n"
 #~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-#~ "    [ ORDER BY expression [ ASC | DESC | USING opérateur ] [ NULLS { FIRST | LAST } ] [, ...] ]\n"
+#~ "    [ ORDER BY expression [ ASC | DESC | USING opérateur ] [ NULLS { FIRST | LAST } ] [, ...] ]\n"
 #~ "    [ LIMIT { total | ALL } ]\n"
-#~ "    [ OFFSET début [ ROW | ROWS ] ]\n"
+#~ "    [ OFFSET début [ ROW | ROWS ] ]\n"
 #~ "    [ FETCH { FIRST | NEXT } [ total ] { ROW | ROWS } ONLY ]\n"
 #~ "    [ FOR { UPDATE | SHARE } [ OF nom_table [, ...] ] [ NOWAIT ] [...] ]"
 
@@ -7174,7 +7182,7 @@
 #~ "SET [ SESSION | LOCAL ] configuration_parameter { TO | = } { value | 'value' | DEFAULT }\n"
 #~ "SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
 #~ msgstr ""
-#~ "SET [ SESSION | LOCAL ] paramètre { TO | = } { valeur | 'valeur' | DEFAULT }\n"
+#~ "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 }"
@@ -7185,7 +7193,7 @@
 #~ "SET [ SESSION | LOCAL ] ROLE NONE\n"
 #~ "RESET ROLE"
 #~ msgstr ""
-#~ "SET [ SESSION | LOCAL ] ROLE nom_rôle\n"
+#~ "SET [ SESSION | LOCAL ] ROLE nom_rôle\n"
 #~ "SET [ SESSION | LOCAL ] ROLE NONE\n"
 #~ "RESET ROLE"
 
@@ -7210,7 +7218,7 @@
 #~ "SET TRANSACTION mode_transaction [, ...]\n"
 #~ "SET SESSION CHARACTERISTICS AS TRANSACTION mode_transaction [, ...]\n"
 #~ "\n"
-#~ "où mode_transaction peut être :\n"
+#~ "où mode_transaction peut être :\n"
 #~ "\n"
 #~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ |\n"
 #~ "                      READ COMMITTED | READ UNCOMMITTED }\n"
@@ -7233,7 +7241,7 @@
 #~ msgstr ""
 #~ "START TRANSACTION [ mode_transaction [, ...] ]\n"
 #~ "\n"
-#~ "où mode_transaction peut être :\n"
+#~ "où mode_transaction peut être :\n"
 #~ "\n"
 #~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ |\n"
 #~ "                      READ COMMITTED | READ UNCOMMITTED }\n"
@@ -7279,9 +7287,9 @@
 #~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]"
 #~ msgstr ""
 #~ "VALUES ( expression [, ...] ) [, ...]\n"
-#~ "    [ ORDER BY expression_tri [ ASC | DESC | USING opérateur ] [, ...] ]\n"
+#~ "    [ ORDER BY expression_tri [ ASC | DESC | USING opérateur ] [, ...] ]\n"
 #~ "    [ LIMIT { total | ALL } ]\n"
-#~ "    [ OFFSET début [ ROW | ROWS ] ]\n"
+#~ "    [ OFFSET début [ ROW | ROWS ] ]\n"
 #~ "    [ FETCH { FIRST | NEXT } [ total ] { ROW | ROWS } ONLY ]"
 
 #~ msgid "  \"%s\" IN %s %s"
@@ -7296,52 +7304,52 @@
 #~ "  \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
 #~ "                 list tables/indexes/sequences/views/system tables\n"
 #~ msgstr ""
-#~ "  \\d{t|i|s|v|S} [MODÈLE] (ajouter « + » pour plus de détails)\n"
+#~ "  \\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"
+#~ "                       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"
+#~ "  \\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"
+#~ "  \\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"
 #~ msgstr ""
-#~ "  \\dFd [MODÈLE]        affiche la liste des dictionnaires de la recherche\n"
-#~ "                       de texte (ajouter « + » pour plus de détails)\n"
+#~ "  \\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"
+#~ "  \\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"
+#~ "  \\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"
-#~ "                       pour plus de détails)\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"
-#~ "                       pour plus de détails)\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"
 #~ msgstr ""
-#~ "  \\z [MODÈLE]          affiche la liste des privilèges d'accès aux tables,\n"
-#~ "                       vues et séquences (identique à \\dp)\n"
+#~ "  \\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"
+#~ msgstr "Copie, « Large Object »\n"
 
 #~ msgid ""
 #~ "Welcome to %s %s (server %s), the PostgreSQL interactive terminal.\n"
@@ -7363,20 +7371,20 @@
 #~ "such as \\d, might not work properly.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "ATTENTION : vous êtes connecté sur un serveur dont la version majeure est\n"
+#~ "ATTENTION : vous êtes connecté sur un serveur dont la version majeure est\n"
 #~ "%d.%d alors que votre client %s est en version majeure %d.%d. Certaines\n"
 #~ "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 »"
+#~ msgstr "Droits d'accès pour la base de données « %s »"
 
 #~ msgid "?%c? \"%s.%s\""
-#~ msgstr "?%c? « %s.%s »"
+#~ msgstr "?%c? « %s.%s »"
 
 #~ msgid "    \"%s\""
-#~ msgstr "    « %s »"
+#~ msgstr "    « %s »"
 
 #~ msgid "ALTER VIEW name RENAME TO newname"
 #~ msgstr "ALTER VIEW nom RENAME TO nouveau_nom"
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/po/it.po postgresql-9.5-9.5.8/src/bin/psql/po/it.po
--- postgresql-9.5-9.5.2/src/bin/psql/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -24,8 +24,8 @@
 msgstr ""
 "Project-Id-Version: psql (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-19 17:43+0000\n"
-"PO-Revision-Date: 2015-07-07 00:56+0100\n"
+"POT-Creation-Date: 2017-05-22 15:50+0000\n"
+"PO-Revision-Date: 2017-05-29 22:06+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -34,7 +34,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
@@ -72,7 +72,7 @@
 msgstr "pclose fallita: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 command.c:331 input.c:205 mainloop.c:73
+#: ../../common/fe_memutils.c:98 command.c:330 input.c:216 mainloop.c:73
 #: mainloop.c:253
 #, c-format
 msgid "out of memory\n"
@@ -88,7 +88,7 @@
 msgid "could not look up effective user ID %ld: %s"
 msgstr "ID utente effettivo %ld non trovato: %s"
 
-#: ../../common/username.c:47 command.c:286
+#: ../../common/username.c:47 command.c:285
 msgid "user does not exist"
 msgstr "l'utente non esiste"
 
@@ -132,241 +132,226 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "processo figlio uscito con stato non riconosciuto %d"
 
-#: command.c:127
+#: command.c:115
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Comando errato \\%s. Prova \\? per la guida.\n"
 
-#: command.c:129
+#: command.c:117
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "comando errato \\%s\n"
 
-#: command.c:140
+#: command.c:128
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
 msgstr "\\%s: parametro in eccesso \"%s\" ignorato\n"
 
-#: command.c:284
+#: command.c:283
 #, c-format
 msgid "could not get home directory for user ID %ld: %s\n"
 msgstr "directory home non trovata per l'ID utente %ld: %s\n"
 
-#: command.c:302
+#: command.c:301
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s: spostamento della directory a \"%s\" fallito: %s\n"
 
-#: command.c:317 common.c:442 common.c:500 common.c:962
+#: command.c:316 common.c:466 common.c:524 common.c:982
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "Al momento non sei connesso ad un database.\n"
 
-#: command.c:344
+#: command.c:343
 #, c-format
 msgid "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
 msgstr "Sei collegato al database \"%s\" con nome utente \"%s\" tramite il socket in \"%s\" porta \"%s\".\n"
 
-#: command.c:347
+#: command.c:346
 #, c-format
 msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
 msgstr "Sei collegato al database \"%s\" con nome utente \"%s\" sull'host \"%s\" porta \"%s\".\n"
 
-#: command.c:548 command.c:618 command.c:714 command.c:1517
+#: command.c:547 command.c:620 command.c:1423
 #, c-format
 msgid "no query buffer\n"
 msgstr "Nessun buffer query\n"
 
-#: command.c:581 command.c:3364
+#: command.c:580 command.c:3234
 #, c-format
 msgid "invalid line number: %s\n"
 msgstr "numero di riga non valido: \"%s\"\n"
 
-#: command.c:612
+#: command.c:613
 #, c-format
-msgid "The server (version %d.%d) does not support editing function source.\n"
-msgstr "Il server (versione %d.%d) non supporta la modifica dei sorgenti delle funzioni.\n"
+msgid "The server (version %s) does not support editing function source.\n"
+msgstr "Il server (versione %s) non supporta la modifica dei sorgenti delle funzioni.\n"
 
-#: command.c:692 command.c:760
+#: command.c:694
 msgid "No changes"
 msgstr "Nessuna modifica"
 
-#: command.c:708
-#, c-format
-msgid "The server (version %d.%d) does not support editing view definitions.\n"
-msgstr "Il server (versione %d.%d) non supporta la modifica della definizione delle viste.\n"
-
-#: command.c:814
+#: command.c:748
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr "%s: nome codifica errato oppure non esiste una procedura di conversione\n"
 
-#: command.c:911 command.c:961 command.c:975 command.c:992 command.c:1099
-#: command.c:1263 command.c:1497 command.c:1528
+#: command.c:845 command.c:895 command.c:909 command.c:926 command.c:1033
+#: command.c:1197 command.c:1403 command.c:1434
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: parametro richiesto mancante\n"
 
-#: command.c:1024
+#: command.c:958
 msgid "Query buffer is empty."
 msgstr "Il buffer query è vuoto."
 
-#: command.c:1034
+#: command.c:968
 msgid "Enter new password: "
 msgstr "Inserire la nuova password: "
 
-#: command.c:1035
+#: command.c:969
 msgid "Enter it again: "
 msgstr "Conferma password: "
 
-#: command.c:1039
+#: command.c:973
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Le password non corrispondono.\n"
 
-#: command.c:1057
+#: command.c:991
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Criptazione password fallita.\n"
 
-#: command.c:1128 command.c:1244 command.c:1502
+#: command.c:1062 command.c:1178 command.c:1408
 #, c-format
 msgid "\\%s: error while setting variable\n"
 msgstr "\\%s: errore durante l'assegnamento della variabile\n"
 
-#: command.c:1191
+#: command.c:1125
 msgid "Query buffer reset (cleared)."
 msgstr "Buffer query resettato (svuotato)."
 
-#: command.c:1203
+#: command.c:1137
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "Storia scritta nel file \"%s\".\n"
 
-#: command.c:1268
+#: command.c:1202
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\"\n"
 msgstr "\\%s: il nome della variabile d'ambiente non deve contenere \"=\"\n"
 
-#: command.c:1310
+#: command.c:1246
 #, c-format
-msgid "The server (version %d.%d) does not support showing function source.\n"
-msgstr "Il server (versione %d.%d) non supporta mostrare i sorgenti delle funzioni.\n"
+msgid "The server (version %s) does not support showing function source.\n"
+msgstr "Il server (versione %s) non supporta la visualizzazione dei sorgenti delle funzioni.\n"
 
-#: command.c:1316
+#: command.c:1253
 #, c-format
 msgid "function name is required\n"
 msgstr "il nome della funzione è richiesto\n"
 
-#: command.c:1389
-#, c-format
-msgid "The server (version %d.%d) does not support showing view definitions.\n"
-msgstr "Il server (versione %d.%d) non supporta la visualizzazione della definizione delle viste.\n"
-
-#: command.c:1395
-#, c-format
-msgid "view name is required\n"
-msgstr "il nome della vista è richiesto\n"
-
-#: command.c:1482
+#: command.c:1388
 msgid "Timing is on."
 msgstr "Controllo tempo attivato"
 
-#: command.c:1484
+#: command.c:1390
 msgid "Timing is off."
 msgstr "Controllo tempo disattivato."
 
-#: command.c:1545 command.c:1565 command.c:2196 command.c:2199 command.c:2202
-#: command.c:2208 command.c:2210 command.c:2218 command.c:2228 command.c:2237
-#: command.c:2251 command.c:2268 command.c:2327 common.c:74 copy.c:333
-#: copy.c:393 copy.c:408 psqlscan.l:1700 psqlscan.l:1711 psqlscan.l:1721
+#: command.c:1452 command.c:1472 command.c:2153 command.c:2156 command.c:2159
+#: command.c:2165 command.c:2167 command.c:2175 command.c:2185 command.c:2194
+#: command.c:2208 command.c:2225 command.c:2284 common.c:67 copy.c:331
+#: copy.c:391 copy.c:404 psqlscan.l:1701 psqlscan.l:1712 psqlscan.l:1722
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1656
+#: command.c:1566
 #, c-format
 msgid "+ opt(%d) = |%s|\n"
 msgstr "+ opt(%d) = |%s|\n"
 
-#: command.c:1682 startup.c:195
+#: command.c:1592 startup.c:195
 msgid "Password: "
 msgstr "Password: "
 
-#: command.c:1687 startup.c:197
+#: command.c:1597 startup.c:197
 #, c-format
 msgid "Password for user %s: "
 msgstr "Inserisci la password per l'utente %s: "
 
-#: command.c:1734
+#: command.c:1648
 #, c-format
 msgid "All connection parameters must be supplied because no database connection exists\n"
 msgstr "Tutti i parametri di connessione devono essere forniti perché non esiste alcuna connessione di database\n"
 
-#: command.c:1852 command.c:3466 common.c:120 common.c:413 common.c:1005
-#: common.c:1030 common.c:1130 copy.c:492 copy.c:702 large_obj.c:156
-#: large_obj.c:191 large_obj.c:253 psqlscan.l:1972
+#: command.c:1803 command.c:3268 common.c:140 common.c:437 common.c:1025
+#: common.c:1053 common.c:1153 copy.c:488 copy.c:708 large_obj.c:156
+#: large_obj.c:191 large_obj.c:253 psqlscan.l:1973
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1856
+#: command.c:1807
 #, c-format
 msgid "Previous connection kept\n"
 msgstr "Connessione precedente mantenuta\n"
 
-#: command.c:1860
+#: command.c:1811
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1894
+#: command.c:1849
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
 msgstr "Adesso sei collegato al database \"%s\" con nome utente \"%s\" tramite socket \"%s\" porta \"%s\".\n"
 
-#: command.c:1897
+#: command.c:1852
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
 msgstr "Adesso sei collegato al database \"%s\" con nome utente \"%s\" sull'host \"%s\" porta \"%s\".\n"
 
-#: command.c:1901
+#: command.c:1856
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "Sei collegato al database \"%s\" con nome utente \"%s\".\n"
 
-#: command.c:1935
+#: command.c:1889
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, server %s)\n"
 
-#: command.c:1943
+#: command.c:1897
 #, c-format
 msgid ""
-"WARNING: %s major version %d.%d, server major version %d.%d.\n"
+"WARNING: %s major version %s, server major version %s.\n"
 "         Some psql features might not work.\n"
 msgstr ""
-"ATTENZIONE: versione maggiore %s %d.%d, versione maggiore server %d.%d.\n"
-"         Alcune caratteristiche di psql potrebbero non funzionare.\n"
+"ATTENZIONE: versione maggiore %s %s, versione maggiore server %s.\n"
+"            Alcune caratteristiche di psql potrebbero non funzionare.\n"
 
-#: command.c:1977
+#: command.c:1934
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, bits: %s, compression: %s)\n"
 msgstr "connessione SSL (protocollo: %s, cifrario: %s, bit: %s, compressione: %s)\n"
 
-#: command.c:1978 command.c:1979 command.c:1980
+#: command.c:1935 command.c:1936 command.c:1937
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: command.c:1981 help.c:46
+#: command.c:1938 help.c:46
 msgid "off"
 msgstr "disattivato"
 
-#: command.c:1981 help.c:46
+#: command.c:1938 help.c:46
 msgid "on"
 msgstr "attivato"
 
-#: command.c:2001
+#: command.c:1958
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -378,227 +363,234 @@
 "            funzionare correttamente. Vedi le pagine di riferimento\n"
 "            psql \"Note per utenti Windows\" per i dettagli.\n"
 
-#: command.c:2085
+#: command.c:2042
 #, c-format
 msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number\n"
 msgstr "la variabile di ambiente PSQL_EDITOR_LINENUMBER_ARG deve specificare un numero di riga\n"
 
-#: command.c:2114
+#: command.c:2071
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "avvio dell'editor \"%s\" fallito\n"
 
-#: command.c:2116
+#: command.c:2073
 #, c-format
 msgid "could not start /bin/sh\n"
 msgstr "avvio di /bin/sh fallito\n"
 
-#: command.c:2154
+#: command.c:2111
 #, c-format
 msgid "could not locate temporary directory: %s\n"
 msgstr "directory temporanea non trovata: %s\n"
 
-#: command.c:2181
+#: command.c:2138
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "apertura del file temporaneo \"%s\" fallita: %s\n"
 
-#: command.c:2489
+#: command.c:2442
 #, c-format
-msgid "\\pset: allowed formats are unaligned, aligned, wrapped, html, asciidoc, latex, troff-ms\n"
-msgstr "\\pset: i formati consentiti sono unaligned, aligned, wrapped, html, asciidoc, latex, troff-ms\n"
+msgid "\\pset: allowed formats are unaligned, aligned, wrapped, html, asciidoc, latex, latex-longtable, troff-ms\n"
+msgstr "\\pset: i formati consentiti sono unaligned, aligned, wrapped, html, asciidoc, latex, latex-longtable, troff-ms\n"
 
-#: command.c:2508
+#: command.c:2461
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
 msgstr "\\pset: gli stili di linea permessi sono ascii, old-ascii, unicode\n"
 
-#: command.c:2522
+#: command.c:2477
 #, c-format
-msgid "\\pset: allowed unicode border linestyle are single, double\n"
-msgstr "\\pset: gli stili riga unicode dei bordi are single, double\n"
+msgid "\\pset: allowed Unicode border line styles are single, double\n"
+msgstr "\\pset: gli stili riga Unicode dei bordi consentiti sono single, double\n"
 
-#: command.c:2535
+#: command.c:2492
 #, c-format
-msgid "\\pset: allowed unicode column linestyle are single, double\n"
-msgstr "\\pset: gli stili riga unicode delle colonne are single, double\n"
+msgid "\\pset: allowed Unicode column line styles are single, double\n"
+msgstr "\\pset: gli stili riga Unicode delle colonne consentiti sono single, double\n"
 
-#: command.c:2548
+#: command.c:2507
 #, c-format
-msgid "\\pset: allowed unicode header linestyle are single, double\n"
-msgstr "\\pset: gli stili riga unicode delle intestazioni are single, double\n"
+msgid "\\pset: allowed Unicode header line styles are single, double\n"
+msgstr "\\pset: gli stili riga Unicode delle intestazioni consentiti sono single, double\n"
 
-#: command.c:2700 command.c:2877
+#: command.c:2659 command.c:2838
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: opzione sconosciuta: %s\n"
 
-#: command.c:2718
+#: command.c:2677
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Lo stile del bordo è %d.\n"
 
-#: command.c:2724
+#: command.c:2683
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "La lunghezza di destinazione non è impostata.\n"
 
-#: command.c:2726
+#: command.c:2685
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "La larghezza di destinazione è %d.\n"
 
-#: command.c:2733
+#: command.c:2692
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "La visualizzazione espansa è attiva.\n"
 
-#: command.c:2735
+#: command.c:2694
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "La visualizzazione espansa è usata automaticamente.\n"
 
-#: command.c:2737
+#: command.c:2696
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "La visualizzazione espansa è disattivata.\n"
 
-#: command.c:2744 command.c:2752
+#: command.c:2703 command.c:2711
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "Il separatore di campo è il byte zero.\n"
 
-#: command.c:2746
+#: command.c:2705
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Il separatore di campo è \"%s\".\n"
 
-#: command.c:2759
+#: command.c:2718
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "Il piè di pagina di default è attivo.\n"
 
-#: command.c:2761
+#: command.c:2720
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "Il piè di pagina di default è disattivato.\n"
 
-#: command.c:2767
+#: command.c:2726
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Il formato di output è %s.\n"
 
-#: command.c:2773
+#: command.c:2732
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Lo stile della linea è %s.\n"
 
-#: command.c:2780
+#: command.c:2739
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "La visualizzazione dei null è \"%s\".\n"
 
-#: command.c:2788
+#: command.c:2747
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "La correzione dell'output numerico secondo il locale è attiva.\n"
 
-#: command.c:2790
+#: command.c:2749
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "La correzione dell'output numerico secondo il locale è disattivata.\n"
 
-#: command.c:2797
+#: command.c:2756
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "Usa la paginazione per risultati estesi.\n"
 
-#: command.c:2799
+#: command.c:2758
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "Paginazione sempre attiva.\n"
 
-#: command.c:2801
+#: command.c:2760
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "Paginazione disattivata.\n"
 
-#: command.c:2807
+#: command.c:2766
 #, c-format
-msgid "Pager won't be used for less than %d lines\n"
-msgstr "La paginazione non verrà usata per meno di %d righe\n"
+msgid "Pager won't be used for less than %d line.\n"
+msgid_plural "Pager won't be used for less than %d lines.\n"
+msgstr[0] "La paginazione non verrà usata per meno di %d riga.\n"
+msgstr[1] "La paginazione non verrà usata per meno di %d righe.\n"
 
-#: command.c:2815 command.c:2825
+#: command.c:2776 command.c:2786
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "Il separatore di record è il byte zero.\n"
 
-#: command.c:2817
+#: command.c:2778
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "Il separatore di record è <a capo>.\n"
 
-#: command.c:2819
+#: command.c:2780
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Il separatore di record è \"%s\".\n"
 
-#: command.c:2832
+#: command.c:2793
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "Gli attributi di tabella sono \"%s\".\n"
 
-#: command.c:2835
+#: command.c:2796
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Gli attributi di tabella non sono specificati.\n"
 
-#: command.c:2842
+#: command.c:2803
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Il titolo è \"%s\".\n"
 
-#: command.c:2844
+#: command.c:2805
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Il titolo non è assegnato.\n"
 
-#: command.c:2851
+#: command.c:2812
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "La visualizzazione dei soli dati è attiva.\n"
 
-#: command.c:2853
+#: command.c:2814
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "La visualizzazione dei soli dati è disattivata.\n"
 
-#: command.c:2859 command.c:2871
+#: command.c:2820
 #, c-format
-msgid "Unicode border linestyle is \"%s\".\n"
-msgstr "Lo stile riga unicode dei bordi è \"%s\".\n"
+msgid "Unicode border line style is \"%s\".\n"
+msgstr "Lo stile riga Unicode dei bordi è \"%s\".\n"
 
-#: command.c:2865
+#: command.c:2826
 #, c-format
-msgid "Unicode column linestyle is \"%s\".\n"
-msgstr "Lo stile riga unicode delle colonne è \"%s\".\n"
+msgid "Unicode column line style is \"%s\".\n"
+msgstr "Lo stile riga Unicode delle colonne è \"%s\".\n"
 
-#: command.c:3031
+#: command.c:2832
+#, c-format
+msgid "Unicode header line style is \"%s\".\n"
+msgstr "Lo stile riga Unicode delle intestazioni è \"%s\".\n"
+
+#: command.c:2992
 #, c-format
 msgid "\\!: failed\n"
 msgstr "\\!: fallita\n"
 
-#: command.c:3051 common.c:548
+#: command.c:3012 common.c:572
 #, c-format
 msgid "\\watch cannot be used with an empty query\n"
 msgstr "\\watch non può essere usato con una query vuota\n"
 
-#: command.c:3072
+#: command.c:3033
 #, c-format
 msgid "Watch every %lds\t%s"
 msgstr "Esegui ogni %lds\t%s"
 
-#: command.c:3123 command.c:3130 common.c:448 common.c:455 common.c:988
+#: command.c:3084 command.c:3091 common.c:472 common.c:479 common.c:1008
 #, c-format
 msgid ""
 "********* QUERY **********\n"
@@ -611,77 +603,72 @@
 "**************************\n"
 "\n"
 
-#: command.c:3281
-#, c-format
-msgid "%s.%s is not a view\n"
-msgstr "%s.%s non è una vista\n"
-
-#: common.c:287
+#: common.c:311
 #, c-format
 msgid "connection to server was lost\n"
 msgstr "connessione al server persa\n"
 
-#: common.c:291
+#: common.c:315
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "Connessione al server persa. Tentativo di reset: "
 
-#: common.c:296
+#: common.c:320
 #, c-format
 msgid "Failed.\n"
 msgstr "Fallito.\n"
 
-#: common.c:303
+#: common.c:327
 #, c-format
 msgid "Succeeded.\n"
 msgstr "Riuscito.\n"
 
-#: common.c:403 common.c:759 common.c:927
+#: common.c:427 common.c:779 common.c:947
 #, c-format
 msgid "unexpected PQresultStatus: %d\n"
 msgstr "PQresultStatus imprevisto: %d\n"
 
-#: common.c:555
+#: common.c:579
 #, c-format
 msgid "\\watch cannot be used with COPY\n"
 msgstr "\\watch non può essere usato con COPY\n"
 
-#: common.c:560
+#: common.c:584
 #, c-format
 msgid "unexpected result status for \\watch\n"
 msgstr "risultato imprevisto per \\watch\n"
 
-#: common.c:571 common.c:1146
+#: common.c:595 common.c:1169
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Tempo: %.3f ms\n"
 
-#: common.c:589
+#: common.c:613
 #, c-format
 msgid "Asynchronous notification \"%s\" with payload \"%s\" received from server process with PID %d.\n"
 msgstr "Notifica asincrona \"%s\" con payload \"%s\" ricevuta dal processo server con PID %d.\n"
 
-#: common.c:592
+#: common.c:616
 #, c-format
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "Notifica asincrona \"%s\" ricevuta dal processo server con PID %d.\n"
 
-#: common.c:654
+#: common.c:674
 #, c-format
 msgid "no rows returned for \\gset\n"
 msgstr "nessuna riga restituita per \\gset\n"
 
-#: common.c:659
+#: common.c:679
 #, c-format
 msgid "more than one row returned for \\gset\n"
 msgstr "più di una riga restituita per \\gset\n"
 
-#: common.c:685
+#: common.c:705
 #, c-format
 msgid "could not set variable \"%s\"\n"
 msgstr "impostazione della variabile \"%s\" fallita\n"
 
-#: common.c:970
+#: common.c:990
 #, c-format
 msgid ""
 "***(Single step mode: verify command)*******************************************\n"
@@ -692,17 +679,17 @@
 "%s\n"
 "***(premi invio per procedere oppure digita x ed invio per annullare)***********\n"
 
-#: common.c:1021
+#: common.c:1043
 #, c-format
-msgid "The server (version %d.%d) does not support savepoints for ON_ERROR_ROLLBACK.\n"
-msgstr "Questa versione (%d.%d) del server non supporta savepoint per ON_ERROR_ROLLBACK..\n"
+msgid "The server (version %s) does not support savepoints for ON_ERROR_ROLLBACK.\n"
+msgstr "Il server (versione %s) non supporta savepoint per ON_ERROR_ROLLBACK.\n"
 
-#: common.c:1075
+#: common.c:1098
 #, c-format
 msgid "STATEMENT:  %s\n"
 msgstr "COMANDO:  %s\n"
 
-#: common.c:1118
+#: common.c:1141
 #, c-format
 msgid "unexpected transaction status (%d)\n"
 msgstr "stato della transazione imprevisto (%d)\n"
@@ -722,89 +709,89 @@
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: errore di sintassi a fine riga\n"
 
-#: copy.c:330
+#: copy.c:328
 #, c-format
 msgid "could not execute command \"%s\": %s\n"
 msgstr "esecuzione del comando \"%s\" fallito: %s\n"
 
-#: copy.c:346
+#: copy.c:344
 #, c-format
 msgid "could not stat file \"%s\": %s\n"
 msgstr "richiesta informazioni sul file \"%s\" fallita: %s\n"
 
-#: copy.c:350
+#: copy.c:348
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: non è possibile copiare da/a una directory\n"
 
-#: copy.c:387
+#: copy.c:385
 #, c-format
 msgid "could not close pipe to external command: %s\n"
 msgstr "chiusura della pipe verso il comando esterno fallita: %s\n"
 
-#: copy.c:455 copy.c:466
+#: copy.c:451 copy.c:462
 #, c-format
 msgid "could not write COPY data: %s\n"
 msgstr "scrittura dei dati COPY fallita: %s\n"
 
-#: copy.c:473
+#: copy.c:469
 #, c-format
 msgid "COPY data transfer failed: %s"
 msgstr "trasferimento dei dati COPY fallito: %s"
 
-#: copy.c:534
+#: copy.c:530
 msgid "canceled by user"
 msgstr "annullata dall'utente"
 
-#: copy.c:545
+#: copy.c:541
 msgid ""
 "Enter data to be copied followed by a newline.\n"
-"End with a backslash and a period on a line by itself."
+"End with a backslash and a period on a line by itself, or an EOF signal."
 msgstr ""
 "Inserire i dati da copiare seguiti da un \"a capo\".\n"
-"Terminare con un backslash ed un punto su una singola riga."
+"Terminare con un backslash ed un punto su una singola riga, o un segnale EOF."
 
-#: copy.c:674
+#: copy.c:670
 msgid "aborted because of read failure"
 msgstr "interrotto a causa di lettura non riuscita"
 
-#: copy.c:698
+#: copy.c:704
 msgid "trying to exit copy mode"
 msgstr "tentativo di uscita dalla modalità copy"
 
-#: describe.c:71 describe.c:264 describe.c:496 describe.c:626 describe.c:769
-#: describe.c:886 describe.c:956 describe.c:2921 describe.c:3126
-#: describe.c:3216 describe.c:3461 describe.c:3598 describe.c:3827
-#: describe.c:3899 describe.c:3910 describe.c:3969 describe.c:4377
-#: describe.c:4456
+#: describe.c:71 describe.c:270 describe.c:502 describe.c:632 describe.c:775
+#: describe.c:895 describe.c:965 describe.c:2937 describe.c:3142
+#: describe.c:3232 describe.c:3480 describe.c:3620 describe.c:3852
+#: describe.c:3927 describe.c:3938 describe.c:4000 describe.c:4420
+#: describe.c:4503
 msgid "Schema"
 msgstr "Schema"
 
-#: describe.c:72 describe.c:156 describe.c:164 describe.c:265 describe.c:497
-#: describe.c:627 describe.c:688 describe.c:770 describe.c:957 describe.c:2922
-#: describe.c:3048 describe.c:3127 describe.c:3217 describe.c:3296
-#: describe.c:3462 describe.c:3526 describe.c:3599 describe.c:3828
-#: describe.c:3900 describe.c:3911 describe.c:3970 describe.c:4159
-#: describe.c:4240 describe.c:4454
+#: describe.c:72 describe.c:159 describe.c:167 describe.c:271 describe.c:503
+#: describe.c:633 describe.c:694 describe.c:776 describe.c:966 describe.c:2938
+#: describe.c:3064 describe.c:3143 describe.c:3233 describe.c:3312
+#: describe.c:3481 describe.c:3545 describe.c:3621 describe.c:3853
+#: describe.c:3928 describe.c:3939 describe.c:4001 describe.c:4193
+#: describe.c:4277 describe.c:4501
 msgid "Name"
 msgstr "Nome"
 
-#: describe.c:73 describe.c:277 describe.c:323 describe.c:340
+#: describe.c:73 describe.c:283 describe.c:329 describe.c:346
 msgid "Result data type"
 msgstr "Tipo dato del risultato"
 
-#: describe.c:81 describe.c:94 describe.c:98 describe.c:278 describe.c:324
-#: describe.c:341
+#: describe.c:81 describe.c:94 describe.c:98 describe.c:284 describe.c:330
+#: describe.c:347
 msgid "Argument data types"
 msgstr "Tipo dato dei parametri"
 
-#: describe.c:105 describe.c:187 describe.c:370 describe.c:545 describe.c:642
-#: describe.c:713 describe.c:959 describe.c:1570 describe.c:2722
-#: describe.c:2955 describe.c:3079 describe.c:3153 describe.c:3226
-#: describe.c:3309 describe.c:3377 describe.c:3469 describe.c:3535
-#: describe.c:3600 describe.c:3736 describe.c:3776 describe.c:3844
-#: describe.c:3903 describe.c:3912 describe.c:3971 describe.c:4185
-#: describe.c:4262 describe.c:4391 describe.c:4457 large_obj.c:289
+#: describe.c:105 describe.c:190 describe.c:376 describe.c:551 describe.c:648
+#: describe.c:719 describe.c:968 describe.c:1581 describe.c:2738
+#: describe.c:2971 describe.c:3095 describe.c:3169 describe.c:3242
+#: describe.c:3325 describe.c:3393 describe.c:3488 describe.c:3554
+#: describe.c:3622 describe.c:3758 describe.c:3798 describe.c:3869
+#: describe.c:3931 describe.c:3940 describe.c:4002 describe.c:4219
+#: describe.c:4299 describe.c:4434 describe.c:4504 large_obj.c:289
 #: large_obj.c:299
 msgid "Description"
 msgstr "Descrizione"
@@ -813,861 +800,878 @@
 msgid "List of aggregate functions"
 msgstr "Lista delle funzione aggregate"
 
-#: describe.c:144
+#: describe.c:146
 #, c-format
-msgid "The server (version %d.%d) does not support tablespaces.\n"
-msgstr "Il server (versione %d.%d) non supporta i tablespace.\n"
+msgid "The server (version %s) does not support tablespaces.\n"
+msgstr "Il server (versione %s) non supporta i tablespace.\n"
 
-#: describe.c:157 describe.c:165 describe.c:367 describe.c:535 describe.c:689
-#: describe.c:885 describe.c:2931 describe.c:3052 describe.c:3298
-#: describe.c:3527 describe.c:4160 describe.c:4241 large_obj.c:288
+#: describe.c:160 describe.c:168 describe.c:373 describe.c:541 describe.c:695
+#: describe.c:894 describe.c:2947 describe.c:3068 describe.c:3314
+#: describe.c:3546 describe.c:4194 describe.c:4278 large_obj.c:288
 msgid "Owner"
 msgstr "Proprietario"
 
-#: describe.c:158 describe.c:166
+#: describe.c:161 describe.c:169
 msgid "Location"
 msgstr "Posizione"
 
-#: describe.c:177 describe.c:2535
+#: describe.c:180 describe.c:2552
 msgid "Options"
 msgstr "Opzioni"
 
-#: describe.c:182 describe.c:508 describe.c:705 describe.c:2947
-#: describe.c:2951
+#: describe.c:185 describe.c:514 describe.c:711 describe.c:2963 describe.c:2967
 msgid "Size"
 msgstr "Dimensione"
 
-#: describe.c:204
+#: describe.c:207
 msgid "List of tablespaces"
 msgstr "Lista dei tablespace"
 
-#: describe.c:241
+#: describe.c:244
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df accetta come opzione solo [antwS+]\n"
 
-#: describe.c:247
+#: describe.c:252
 #, c-format
-msgid "\\df does not take a \"w\" option with server version %d.%d\n"
-msgstr "\\df non accetta un'opzione \"w\" con la versione del server %d.%d\n"
+msgid "\\df does not take a \"w\" option with server version %s\n"
+msgstr "\\df non accetta un'opzione \"w\" con il server in versione %s\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:280 describe.c:326 describe.c:343
+#: describe.c:286 describe.c:332 describe.c:349
 msgid "agg"
 msgstr "aggr"
 
-#: describe.c:281
+#: describe.c:287
 msgid "window"
 msgstr "finestra"
 
-#: describe.c:282 describe.c:327 describe.c:344 describe.c:1093
+#: describe.c:288 describe.c:333 describe.c:350 describe.c:1102
 msgid "trigger"
 msgstr "trigger"
 
-#: describe.c:283 describe.c:328 describe.c:345
+#: describe.c:289 describe.c:334 describe.c:351
 msgid "normal"
 msgstr "normale"
 
-#: describe.c:284 describe.c:329 describe.c:346 describe.c:776 describe.c:895
-#: describe.c:1539 describe.c:2930 describe.c:3128 describe.c:4259
+#: describe.c:290 describe.c:335 describe.c:352 describe.c:782 describe.c:904
+#: describe.c:1550 describe.c:2946 describe.c:3144 describe.c:4296
 msgid "Type"
 msgstr "Tipo"
 
-#: describe.c:360
+#: describe.c:366
 msgid "definer"
 msgstr "definitore"
 
-#: describe.c:361
+#: describe.c:367
 msgid "invoker"
 msgstr "invocatore"
 
-#: describe.c:362
+#: describe.c:368
 msgid "Security"
 msgstr "Sicurezza"
 
-#: describe.c:363
+#: describe.c:369
 msgid "immutable"
 msgstr "immutabile"
 
-#: describe.c:364
+#: describe.c:370
 msgid "stable"
 msgstr "stabile"
 
-#: describe.c:365
+#: describe.c:371
 msgid "volatile"
 msgstr "volatile"
 
-#: describe.c:366
+#: describe.c:372
 msgid "Volatility"
 msgstr "Volatilità"
 
-#: describe.c:368
+#: describe.c:374
 msgid "Language"
 msgstr "Linguaggio"
 
-#: describe.c:369
+#: describe.c:375
 msgid "Source code"
 msgstr "Codice sorgente"
 
-#: describe.c:467
+#: describe.c:473
 msgid "List of functions"
 msgstr "Lista delle funzioni"
 
-#: describe.c:507
+#: describe.c:513
 msgid "Internal name"
 msgstr "Nome interno"
 
-#: describe.c:529
+#: describe.c:535
 msgid "Elements"
 msgstr "Elementi"
 
-#: describe.c:585
+#: describe.c:591
 msgid "List of data types"
 msgstr "Lista dei tipi di dati"
 
-#: describe.c:628
+#: describe.c:634
 msgid "Left arg type"
 msgstr "Argomento sinistro"
 
-#: describe.c:629
+#: describe.c:635
 msgid "Right arg type"
 msgstr "Argomento destro"
 
-#: describe.c:630
+#: describe.c:636
 msgid "Result type"
 msgstr "Tipo di risultato"
 
-#: describe.c:635 describe.c:3368 describe.c:3735
+#: describe.c:641 describe.c:3384 describe.c:3757
 msgid "Function"
 msgstr "Funzione"
 
-#: describe.c:660
+#: describe.c:666
 msgid "List of operators"
 msgstr "Lista degli operatori"
 
-#: describe.c:690
+#: describe.c:696
 msgid "Encoding"
 msgstr "Codifica"
 
-#: describe.c:695 describe.c:3463
+#: describe.c:701 describe.c:3482
 msgid "Collate"
 msgstr "Ordinamento"
 
-#: describe.c:696 describe.c:3464
+#: describe.c:702 describe.c:3483
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:709
+#: describe.c:715
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:731
+#: describe.c:737
 msgid "List of databases"
 msgstr "Lista dei database"
 
-#: describe.c:771 describe.c:888 describe.c:2923
+#: describe.c:777 describe.c:897 describe.c:2939
 msgid "table"
 msgstr "tabella"
 
-#: describe.c:772 describe.c:2924
+#: describe.c:778 describe.c:2940
 msgid "view"
 msgstr "vista"
 
-#: describe.c:773 describe.c:2925
+#: describe.c:779 describe.c:2941
 msgid "materialized view"
 msgstr "vista materializzata"
 
-#: describe.c:774 describe.c:890 describe.c:2927
+#: describe.c:780 describe.c:899 describe.c:2943
 msgid "sequence"
 msgstr "sequenza"
 
-#: describe.c:775 describe.c:2929
+#: describe.c:781 describe.c:2945
 msgid "foreign table"
 msgstr "tabella esterna"
 
-#: describe.c:787
+#: describe.c:793
 msgid "Column privileges"
 msgstr "Privilegi di colonna"
 
-#: describe.c:818
+#: describe.c:824
 msgid "Policies"
-msgstr "Politiche"
+msgstr "Regole di sicurezza"
 
-#: describe.c:844 describe.c:4601 describe.c:4605
+#: describe.c:850 describe.c:4651 describe.c:4655
 msgid "Access privileges"
 msgstr "Privilegi di accesso"
 
-#: describe.c:873
+#: describe.c:881
 #, c-format
-msgid "The server (version %d.%d) does not support altering default privileges.\n"
-msgstr "Il server (versione %d.%d) non supporta la modifica dei privilegi di default.\n"
+msgid "The server (version %s) does not support altering default privileges.\n"
+msgstr "Il server (versione %s) non supporta la modifica dei privilegi di default.\n"
 
-#: describe.c:892
+#: describe.c:901
 msgid "function"
 msgstr "funzione"
 
-#: describe.c:894
+#: describe.c:903
 msgid "type"
 msgstr "tipo"
 
-#: describe.c:918
+#: describe.c:927
 msgid "Default access privileges"
 msgstr "Privilegi di accesso di default"
 
-#: describe.c:958
+#: describe.c:967
 msgid "Object"
 msgstr "Oggetto"
 
-#: describe.c:972
+#: describe.c:981
 msgid "table constraint"
 msgstr "vincolo di tabella"
 
-#: describe.c:994
+#: describe.c:1003
 msgid "domain constraint"
 msgstr "vincolo di dominio"
 
-#: describe.c:1022
+#: describe.c:1031
 msgid "operator class"
 msgstr "classe operatori"
 
-#: describe.c:1051
+#: describe.c:1060
 msgid "operator family"
 msgstr "famiglia operatori"
 
-#: describe.c:1073
+#: describe.c:1082
 msgid "rule"
 msgstr "regola"
 
-#: describe.c:1115
+#: describe.c:1124
 msgid "Object descriptions"
 msgstr "Descrizioni oggetti"
 
-#: describe.c:1169
+#: describe.c:1178
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Non ho trovato alcuna relazione di nome \"%s\".\n"
 
-#: describe.c:1378
+#: describe.c:1388
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "Non ho trovato nessuna relazione con OID %s.\n"
 
-#: describe.c:1483
+#: describe.c:1494
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "Tabella non loggata \"%s.%s\""
 
-#: describe.c:1486
+#: describe.c:1497
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabella \"%s.%s\""
 
-#: describe.c:1490
+#: describe.c:1501
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vista \"%s.%s\""
 
-#: describe.c:1495
+#: describe.c:1506
 #, c-format
 msgid "Unlogged materialized view \"%s.%s\""
 msgstr "Vista materializzata non loggata \"%s.%s\""
 
-#: describe.c:1498
+#: describe.c:1509
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Vista materializzata \"%s.%s\""
 
-#: describe.c:1502
+#: describe.c:1513
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sequenza \"%s.%s\""
 
-#: describe.c:1507
+#: describe.c:1518
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "Indice non loggato \"%s.%s\""
 
-#: describe.c:1510
+#: describe.c:1521
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Indice \"%s.%s\""
 
-#: describe.c:1515
+#: describe.c:1526
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "relazione speciale \"%s.%s\""
 
-#: describe.c:1519
+#: describe.c:1530
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "Tabella TOAST \"%s.%s\""
 
-#: describe.c:1523
+#: describe.c:1534
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Tipo composito \"%s.%s\""
 
-#: describe.c:1527
+#: describe.c:1538
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "Tabella esterna \"%s.%s\""
 
-#: describe.c:1538
+#: describe.c:1549
 msgid "Column"
 msgstr "Colonna"
 
-#: describe.c:1547
+#: describe.c:1558
 msgid "Modifiers"
 msgstr "Modificatori"
 
-#: describe.c:1552
+#: describe.c:1563
 msgid "Value"
 msgstr "Valore"
 
-#: describe.c:1555
+#: describe.c:1566
 msgid "Definition"
 msgstr "Definizione"
 
-#: describe.c:1558 describe.c:4180 describe.c:4261 describe.c:4329
-#: describe.c:4390
+#: describe.c:1569 describe.c:4214 describe.c:4298 describe.c:4369
+#: describe.c:4433
 msgid "FDW Options"
 msgstr "Opzioni FDW"
 
-#: describe.c:1562
+#: describe.c:1573
 msgid "Storage"
 msgstr "Memorizzazione"
 
-#: describe.c:1565
+#: describe.c:1576
 msgid "Stats target"
 msgstr "Dest. stat."
 
-#: describe.c:1615
+#: describe.c:1626
 #, c-format
 msgid "collate %s"
 msgstr "ordinamento %s"
 
-#: describe.c:1623
+#: describe.c:1634
 msgid "not null"
 msgstr "non null"
 
 #. translator: default values of column definitions
-#: describe.c:1633
+#: describe.c:1644
 #, c-format
 msgid "default %s"
 msgstr "preimpostato %s"
 
-#: describe.c:1748
+#: describe.c:1759
 msgid "primary key, "
 msgstr "chiave primaria, "
 
-#: describe.c:1750
+#: describe.c:1761
 msgid "unique, "
 msgstr "univoco, "
 
-#: describe.c:1756
+#: describe.c:1767
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "per la tabella \"%s.%s\""
 
-#: describe.c:1760
+#: describe.c:1771
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predicato (%s)"
 
-#: describe.c:1763
+#: describe.c:1774
 msgid ", clustered"
 msgstr ", raggruppato"
 
-#: describe.c:1766
+#: describe.c:1777
 msgid ", invalid"
 msgstr ", non valido"
 
-#: describe.c:1769
+#: describe.c:1780
 msgid ", deferrable"
 msgstr ", deferibile"
 
-#: describe.c:1772
+#: describe.c:1783
 msgid ", initially deferred"
 msgstr ", inizialmente deferito"
 
-#: describe.c:1775
+#: describe.c:1786
 msgid ", replica identity"
 msgstr ", identità di replica"
 
-#: describe.c:1810
+#: describe.c:1821
 #, c-format
 msgid "Owned by: %s"
 msgstr "Proprietario: %s"
 
-#: describe.c:1870
+#: describe.c:1881
 msgid "Indexes:"
 msgstr "Indici:"
 
-#: describe.c:1954
+#: describe.c:1965
 msgid "Check constraints:"
 msgstr "Vincoli di controllo:"
 
-#: describe.c:1985
+#: describe.c:1996
 msgid "Foreign-key constraints:"
 msgstr "Vincoli di integrità referenziale"
 
-#: describe.c:2016
+#: describe.c:2027
 msgid "Referenced by:"
 msgstr "Referenziato da:"
 
-#: describe.c:2061
+#: describe.c:2072
 msgid "Policies:"
-msgstr "Politiche:"
+msgstr "Regole di sicurezza:"
+
+#: describe.c:2075
+msgid "Policies (forced row security enabled):"
+msgstr "Regole (sicurezza per riga forzata abilitata):"
 
-#: describe.c:2064
-msgid "Policies (Row Security Enabled): (None)"
-msgstr "Politiche (Sicurezza di Riga Abilitata): (Nessuna)"
+#: describe.c:2078
+msgid "Policies (row security enabled): (none)"
+msgstr "Regole (sicurezza per riga abilitata): (nessuna)"
 
-#: describe.c:2067
-msgid "Policies (Row Security Disabled):"
-msgstr "Politiche (Sicurezza di Riga Disabilitata):"
+#: describe.c:2081
+msgid "Policies (forced row security enabled): (none)"
+msgstr "Regole (sicurezza per riga forzata abilitata): (nessuna)"
 
-#: describe.c:2167 describe.c:2217
+#: describe.c:2084
+msgid "Policies (row security disabled):"
+msgstr "Regole (sicurezza per riga disabilitata):"
+
+#: describe.c:2184 describe.c:2234
 msgid "Rules:"
 msgstr "Regole:"
 
-#: describe.c:2170
+#: describe.c:2187
 msgid "Disabled rules:"
 msgstr "Regole disabilitate:"
 
-#: describe.c:2173
+#: describe.c:2190
 msgid "Rules firing always:"
 msgstr "Regole sempre abilitate:"
 
-#: describe.c:2176
+#: describe.c:2193
 msgid "Rules firing on replica only:"
 msgstr "Regole abilitate solo su replica:"
 
-#: describe.c:2200
+#: describe.c:2217
 msgid "View definition:"
 msgstr "Definizione vista:"
 
-#: describe.c:2335
+#: describe.c:2352
 msgid "Triggers:"
 msgstr "Trigger:"
 
-#: describe.c:2339
+#: describe.c:2356
 msgid "Disabled user triggers:"
 msgstr "Trigger utente disabilitati:"
 
-#: describe.c:2341
+#: describe.c:2358
 msgid "Disabled triggers:"
 msgstr "Trigger disabilitati:"
 
-#: describe.c:2344
+#: describe.c:2361
 msgid "Disabled internal triggers:"
 msgstr "Trigger interni disabilitati:"
 
-#: describe.c:2347
+#: describe.c:2364
 msgid "Triggers firing always:"
 msgstr "Trigger sempre abilitati:"
 
-#: describe.c:2350
+#: describe.c:2367
 msgid "Triggers firing on replica only:"
 msgstr "Trigger abilitati solo su replica."
 
-#: describe.c:2429
+#: describe.c:2424
+#, c-format
+msgid "Server: %s"
+msgstr "Server: %s"
+
+#: describe.c:2432
+#, c-format
+msgid "FDW Options: (%s)"
+msgstr "Opzioni FDW: (%s)"
+
+#: describe.c:2446
 msgid "Inherits"
 msgstr "Eredita"
 
-#: describe.c:2468
+#: describe.c:2485
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Numero di tabelle figlio: %d (Usa \\d+ per elencarle.)"
 
-#: describe.c:2475
+#: describe.c:2492
 msgid "Child tables"
 msgstr "Tabelle figlio"
 
-#: describe.c:2497
+#: describe.c:2514
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Tabella di tipo: %s"
 
-#: describe.c:2511
+#: describe.c:2528
 msgid "Replica Identity"
 msgstr "Identità di replica"
 
-#: describe.c:2524
+#: describe.c:2541
 msgid "Has OIDs: yes"
 msgstr "Ha OID: sì"
 
-#: describe.c:2613
+#: describe.c:2629
 #, 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:2625
+#: describe.c:2641
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace \"%s\""
 
-#: describe.c:2715
+#: describe.c:2731
 msgid "List of roles"
 msgstr "Lista dei ruoli"
 
-#: describe.c:2717
+#: describe.c:2733
 msgid "Role name"
 msgstr "Nome ruolo"
 
-#: describe.c:2718
+#: describe.c:2734
 msgid "Attributes"
 msgstr "Attributi"
 
-#: describe.c:2719
+#: describe.c:2735
 msgid "Member of"
 msgstr "Membro di"
 
-#: describe.c:2730
+#: describe.c:2746
 msgid "Superuser"
 msgstr "Superutente"
 
-#: describe.c:2733
+#: describe.c:2749
 msgid "No inheritance"
 msgstr "Nessuna ereditarietà"
 
-#: describe.c:2736
+#: describe.c:2752
 msgid "Create role"
 msgstr "Crea ruoli"
 
-#: describe.c:2739
+#: describe.c:2755
 msgid "Create DB"
 msgstr "Crea DB"
 
-#: describe.c:2742
+#: describe.c:2758
 msgid "Cannot login"
 msgstr "Login non possibile"
 
-#: describe.c:2746
+#: describe.c:2762
 msgid "Replication"
 msgstr "Replica"
 
-#: describe.c:2750
+#: describe.c:2766
 msgid "Bypass RLS"
 msgstr "Scavalca RLS"
 
-#: describe.c:2759
+#: describe.c:2775
 msgid "No connections"
 msgstr "Niente connessioni"
 
-#: describe.c:2761
+#: describe.c:2777
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d connessione"
 msgstr[1] "%d connessioni"
 
-#: describe.c:2771
+#: describe.c:2787
 msgid "Password valid until "
 msgstr "Password valida fino a "
 
-#: describe.c:2827
+#: describe.c:2843
 msgid "Role"
 msgstr "Ruolo"
 
-#: describe.c:2828
+#: describe.c:2844
 msgid "Database"
 msgstr "Database"
 
-#: describe.c:2829
+#: describe.c:2845
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: describe.c:2839
+#: describe.c:2855
 #, c-format
 msgid "No per-database role settings support in this server version.\n"
 msgstr "Questa versione del server non supporta l'impostazione dei ruoli per database.\n"
 
-#: describe.c:2850
+#: describe.c:2866
 #, c-format
 msgid "No matching settings found.\n"
 msgstr "Nessuna impostazione corrispondente trovata.\n"
 
-#: describe.c:2852
+#: describe.c:2868
 #, c-format
 msgid "No settings found.\n"
 msgstr "Nessuna impostazione trovata.\n"
 
-#: describe.c:2857
+#: describe.c:2873
 msgid "List of settings"
 msgstr "Lista delle impostazioni"
 
-#: describe.c:2926
+#: describe.c:2942
 msgid "index"
 msgstr "indice"
 
-#: describe.c:2928
+#: describe.c:2944
 msgid "special"
 msgstr "speciale"
 
-#: describe.c:2936 describe.c:4378
+#: describe.c:2952 describe.c:4421
 msgid "Table"
 msgstr "Tabella"
 
-#: describe.c:3012
+#: describe.c:3028
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "Nessuna relazione corrispondente trovata.\n"
 
-#: describe.c:3014
+#: describe.c:3030
 #, c-format
 msgid "No relations found.\n"
 msgstr "Nessuna relazione trovata.\n"
 
-#: describe.c:3019
+#: describe.c:3035
 msgid "List of relations"
 msgstr "Lista delle relazioni"
 
-#: describe.c:3056
+#: describe.c:3072
 msgid "Trusted"
 msgstr "Fidato"
 
-#: describe.c:3064
+#: describe.c:3080
 msgid "Internal Language"
 msgstr "Linguaggio interno"
 
-#: describe.c:3065
+#: describe.c:3081
 msgid "Call Handler"
 msgstr "Gestore Chiamate"
 
-#: describe.c:3066 describe.c:4167
+#: describe.c:3082 describe.c:4201
 msgid "Validator"
 msgstr "Validatore"
 
-#: describe.c:3069
+#: describe.c:3085
 msgid "Inline Handler"
 msgstr "Handler Inline"
 
-#: describe.c:3097
+#: describe.c:3113
 msgid "List of languages"
 msgstr "Lista dei linguaggi"
 
-#: describe.c:3141
+#: describe.c:3157
 msgid "Modifier"
 msgstr "Modificatore"
 
-#: describe.c:3142
+#: describe.c:3158
 msgid "Check"
 msgstr "Controllo"
 
-#: describe.c:3184
+#: describe.c:3200
 msgid "List of domains"
 msgstr "Lista dei domini"
 
-#: describe.c:3218
+#: describe.c:3234
 msgid "Source"
 msgstr "Sorgente"
 
-#: describe.c:3219
+#: describe.c:3235
 msgid "Destination"
 msgstr "Destinazione"
 
-#: describe.c:3220 describe.c:3369
+#: describe.c:3236 describe.c:3385
 msgid "no"
 msgstr "no"
 
-#: describe.c:3220 describe.c:3371
+#: describe.c:3236 describe.c:3387
 msgid "yes"
 msgstr "sì"
 
-#: describe.c:3221
+#: describe.c:3237
 msgid "Default?"
 msgstr "Predefinito?"
 
-#: describe.c:3258
+#: describe.c:3274
 msgid "List of conversions"
 msgstr "Lista delle conversioni"
 
-#: describe.c:3297
+#: describe.c:3313
 msgid "Event"
 msgstr "Evento"
 
-#: describe.c:3299
+#: describe.c:3315
 msgid "enabled"
 msgstr "abilitato"
 
-#: describe.c:3300
+#: describe.c:3316
 msgid "replica"
 msgstr "replica"
 
-#: describe.c:3301
+#: describe.c:3317
 msgid "always"
 msgstr "sempre"
 
-#: describe.c:3302
+#: describe.c:3318
 msgid "disabled"
 msgstr "disabilitato"
 
-#: describe.c:3303
+#: describe.c:3319
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: describe.c:3304
+#: describe.c:3320
 msgid "Procedure"
 msgstr "Procedura"
 
-#: describe.c:3305
+#: describe.c:3321
 msgid "Tags"
 msgstr "Tag"
 
-#: describe.c:3324
+#: describe.c:3340
 msgid "List of event triggers"
 msgstr "Lista di trigger di evento"
 
-#: describe.c:3366
+#: describe.c:3382
 msgid "Source type"
 msgstr "Tipo di partenza"
 
-#: describe.c:3367
+#: describe.c:3383
 msgid "Target type"
 msgstr "Tipo di arrivo"
 
-#: describe.c:3370
+#: describe.c:3386
 msgid "in assignment"
 msgstr "in assegnazione"
 
-#: describe.c:3372
+#: describe.c:3388
 msgid "Implicit?"
 msgstr "Implicito?"
 
-#: describe.c:3423
+#: describe.c:3439
 msgid "List of casts"
 msgstr "Lista delle conversioni di tipo"
 
-#: describe.c:3449
+#: describe.c:3467
 #, c-format
-msgid "The server (version %d.%d) does not support collations.\n"
-msgstr "Il server (versione %d.%d) non supporta gli ordinamenti.\n"
+msgid "The server (version %s) does not support collations.\n"
+msgstr "Il server (versione %s) non supporta gli ordinamenti.\n"
 
-#: describe.c:3499
+#: describe.c:3518
 msgid "List of collations"
 msgstr "Lista degli ordinamenti"
 
-#: describe.c:3558
+#: describe.c:3577
 msgid "List of schemas"
 msgstr "Lista degli schemi"
 
-#: describe.c:3581 describe.c:3816 describe.c:3884 describe.c:3952
+#: describe.c:3602 describe.c:3840 describe.c:3911 describe.c:3982
 #, c-format
-msgid "The server (version %d.%d) does not support full text search.\n"
-msgstr "Il server (versione %d.%d) non supporta la ricerca full text.\n"
+msgid "The server (version %s) does not support full text search.\n"
+msgstr "Il server (versione %s) non supporta la ricerca full text.\n"
 
-#: describe.c:3615
+#: describe.c:3637
 msgid "List of text search parsers"
 msgstr "Lista degli analizzatori di ricerca resto"
 
-#: describe.c:3658
+#: describe.c:3680
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "Non ho trovato alcun analizzatore di ricerca testo chiamato \"%s\".\n"
 
-#: describe.c:3733
+#: describe.c:3755
 msgid "Start parse"
 msgstr "Inizio analisi"
 
-#: describe.c:3734
+#: describe.c:3756
 msgid "Method"
 msgstr "Metodo"
 
-#: describe.c:3738
+#: describe.c:3760
 msgid "Get next token"
 msgstr "Ottiene il token successivo"
 
-#: describe.c:3740
+#: describe.c:3762
 msgid "End parse"
 msgstr "Fine analisi"
 
-#: describe.c:3742
+#: describe.c:3764
 msgid "Get headline"
 msgstr "Ottiene intestazione"
 
-#: describe.c:3744
+#: describe.c:3766
 msgid "Get token types"
 msgstr "Ottieni i tipi token"
 
-#: describe.c:3754
+#: describe.c:3776
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analizzatore di ricerca teso \"%s.%s\""
 
-#: describe.c:3756
+#: describe.c:3778
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analizzatore di ricerca testo \"%s\""
 
-#: describe.c:3775
+#: describe.c:3797
 msgid "Token name"
 msgstr "Nome token"
 
-#: describe.c:3786
+#: describe.c:3808
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tipi token per l'analizzatore \"%s.%s\""
 
-#: describe.c:3788
+#: describe.c:3810
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tipi token per l'analizzatore \"%s\""
 
-#: describe.c:3838
+#: describe.c:3863
 msgid "Template"
 msgstr "Modello"
 
-#: describe.c:3839
+#: describe.c:3864
 msgid "Init options"
 msgstr "Opzioni iniziali:"
 
-#: describe.c:3861
+#: describe.c:3886
 msgid "List of text search dictionaries"
 msgstr "Lista dei dizionari di ricerca testo"
 
-#: describe.c:3901
+#: describe.c:3929
 msgid "Init"
 msgstr "Init"
 
-#: describe.c:3902
+#: describe.c:3930
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:3929
+#: describe.c:3957
 msgid "List of text search templates"
 msgstr "Lista dei modelli di ricerca testo"
 
-#: describe.c:3986
+#: describe.c:4017
 msgid "List of text search configurations"
 msgstr "Lista delle configurazioni di ricerca testo"
 
-#: describe.c:4030
+#: describe.c:4061
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "Non trovata alcuna configurazione di ricerca testo chiamata \"%s\".\n"
 
-#: describe.c:4096
+#: describe.c:4127
 msgid "Token"
 msgstr "Token"
 
-#: describe.c:4097
+#: describe.c:4128
 msgid "Dictionaries"
 msgstr "Dizionari"
 
-#: describe.c:4108
+#: describe.c:4139
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Configurazione di ricerca testo \"%s.%s\""
 
-#: describe.c:4111
+#: describe.c:4142
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Configurazione di ricerca testo \"%s\""
 
-#: describe.c:4115
+#: describe.c:4146
 #, c-format
 msgid ""
 "\n"
@@ -1676,7 +1680,7 @@
 "\n"
 "Analizzatore \"%s.%s\""
 
-#: describe.c:4118
+#: describe.c:4149
 #, c-format
 msgid ""
 "\n"
@@ -1685,86 +1689,86 @@
 "\n"
 "Analizzatore: \"%s\""
 
-#: describe.c:4150
+#: describe.c:4183
 #, c-format
-msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
-msgstr "Il server (versione %d.%d) non supporta i wrapper di dati esterni.\n"
+msgid "The server (version %s) does not support foreign-data wrappers.\n"
+msgstr "Il server (versione %s) non supporta i wrapper di dati esterni.\n"
 
-#: describe.c:4164
+#: describe.c:4198
 msgid "Handler"
 msgstr "Handler"
 
-#: describe.c:4207
+#: describe.c:4241
 msgid "List of foreign-data wrappers"
 msgstr "Lista dei wrapper di dati esterni"
 
-#: describe.c:4230
+#: describe.c:4266
 #, c-format
-msgid "The server (version %d.%d) does not support foreign servers.\n"
-msgstr "Il server (versione %d.%d) non supporta server esterni.\n"
+msgid "The server (version %s) does not support foreign servers.\n"
+msgstr "Il server (versione %s) non supporta server esterni.\n"
 
-#: describe.c:4242
+#: describe.c:4279
 msgid "Foreign-data wrapper"
 msgstr "Wrapper per dati esterni"
 
-#: describe.c:4260 describe.c:4455
+#: describe.c:4297 describe.c:4502
 msgid "Version"
 msgstr "Versione"
 
-#: describe.c:4286
+#: describe.c:4323
 msgid "List of foreign servers"
 msgstr "Lista dei server esterni"
 
-#: describe.c:4309
+#: describe.c:4348
 #, c-format
-msgid "The server (version %d.%d) does not support user mappings.\n"
-msgstr "IL server (versione %d.%d) non supporta la mappatura di utenti.\n"
+msgid "The server (version %s) does not support user mappings.\n"
+msgstr "Il server (versione %s) non supporta la mappatura di utenti.\n"
 
-#: describe.c:4318 describe.c:4379
+#: describe.c:4358 describe.c:4422
 msgid "Server"
 msgstr "Server"
 
-#: describe.c:4319
+#: describe.c:4359
 msgid "User name"
 msgstr "Nome utente"
 
-#: describe.c:4344
+#: describe.c:4384
 msgid "List of user mappings"
 msgstr "Lista delle mappature degli utenti"
 
-#: describe.c:4367
+#: describe.c:4409
 #, c-format
-msgid "The server (version %d.%d) does not support foreign tables.\n"
-msgstr "Il server (versione %d.%d) non supporta tabelle esterne.\n"
+msgid "The server (version %s) does not support foreign tables.\n"
+msgstr "Il server (versione %s) non supporta tabelle esterne.\n"
 
-#: describe.c:4418
+#: describe.c:4462
 msgid "List of foreign tables"
 msgstr "Lista delle tabelle esterne"
 
-#: describe.c:4441 describe.c:4495
+#: describe.c:4487 describe.c:4544
 #, c-format
-msgid "The server (version %d.%d) does not support extensions.\n"
-msgstr "Il server (versione %d.%d) non supporta le estensioni.\n"
+msgid "The server (version %s) does not support extensions.\n"
+msgstr "Il server (versione %s) non supporta le estensioni.\n"
 
-#: describe.c:4472
+#: describe.c:4519
 msgid "List of installed extensions"
 msgstr "Lista delle estensioni installate"
 
-#: describe.c:4522
+#: describe.c:4572
 #, c-format
 msgid "Did not find any extension named \"%s\".\n"
 msgstr "Non ho trovato alcuna estensione nominata \"%s\".\n"
 
-#: describe.c:4525
+#: describe.c:4575
 #, c-format
 msgid "Did not find any extensions.\n"
 msgstr "Non ho trovato alcuna estensione.\n"
 
-#: describe.c:4569
+#: describe.c:4619
 msgid "Object Description"
 msgstr "Descrizione Oggetto"
 
-#: describe.c:4578
+#: describe.c:4628
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Oggetti nell'estensione \"%s\""
@@ -1783,7 +1787,7 @@
 "psql è il terminale interattivo per PostgreSQL.\n"
 "\n"
 
-#: help.c:71 help.c:315 help.c:348 help.c:375
+#: help.c:71 help.c:314 help.c:347 help.c:374
 #, c-format
 msgid "Usage:\n"
 msgstr "Utilizzo:\n"
@@ -1830,22 +1834,24 @@
 #, c-format
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
-"                           set psql variable NAME to VALUE e.g.: -v ON_ERROR_STOP=1\n"
+"                           set psql variable NAME to VALUE\n"
+"                           (e.g., -v ON_ERROR_STOP=1)\n"
 msgstr ""
 "  -v, --set=, --variable=NOME=VALORE\n"
-"                           imposta la variablie psql NOME a VALORE, es.: -v ON_ERROR_STOP=1\n"
+"                           imposta la variabile psql NOME a VALORE\n"
+"                           (es.: -v ON_ERROR_STOP=1)\n"
 
-#: help.c:85
+#: help.c:86
 #, c-format
 msgid "  -V, --version            output version information, then exit\n"
 msgstr "  -V, --version            mostra informazioni sulla versione ed esci\n"
 
-#: help.c:86
+#: help.c:87
 #, c-format
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc          non leggere il file di avvio (~/.psqlrc)\n"
 
-#: help.c:87
+#: help.c:88
 #, c-format
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
@@ -1854,22 +1860,22 @@
 "  -1 (\"uno\"), --single-transaction\n"
 "                           esegui in un'unica transazione (se non interattivo)\n"
 
-#: help.c:89
+#: help.c:90
 #, c-format
 msgid "  -?, --help[=options]     show this help, then exit\n"
 msgstr "  -?, --help[=opzioni]     mostra quest'aiuto ed esci\n"
 
-#: help.c:90
+#: help.c:91
 #, c-format
-msgid "      --help=variables     show a list of all specially treated variables, then exit\n"
-msgstr "      --help=variabili     mostra una lista di tutte le variabili speciali ed esci\n"
+msgid "      --help=commands      list backslash commands, then exit\n"
+msgstr "      --help=commands      mostra la lista dei comandi backslash ed esci\n"
 
-#: help.c:91
+#: help.c:92
 #, c-format
-msgid "      --help=commands      show a list of backslash commands, then exit\n"
-msgstr "      --help=comandi       mostra una lista dei comandi backslash ed esci\n"
+msgid "      --help=variables     list special variables, then exit\n"
+msgstr "      --help=variables     mostra la lista delle variabili speciali ed esci\n"
 
-#: help.c:93
+#: help.c:94
 #, c-format
 msgid ""
 "\n"
@@ -1878,65 +1884,65 @@
 "\n"
 "Opzioni di input e output:\n"
 
-#: help.c:94
+#: help.c:95
 #, c-format
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           mostra tutti gli input dallo script\n"
 
-#: help.c:95
+#: help.c:96
 #, c-format
 msgid "  -b, --echo-errors        echo failed commands\n"
 msgstr "  -b, --echo-errors        mostra i comandi falliti\n"
 
-#: help.c:96
+#: help.c:97
 #, c-format
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries       mostra i comandi inviati al server\n"
 
-#: help.c:97
+#: help.c:98
 #, c-format
 msgid "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr "  -E, --echo-hidden        mostra le query generate dai comandi interni\n"
 
-#: help.c:98
+#: help.c:99
 #, c-format
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=NOME_FILE invia log di sessione al file\n"
 
-#: help.c:99
+#: help.c:100
 #, c-format
 msgid "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
 "  -n, --no-readline        disabilita la modifica avanzata della riga\n"
 "                           di comando (readline)\n"
 
-#: help.c:100
+#: help.c:101
 #, c-format
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr ""
 "  -o, --output=NOME_FILE   reindirizza i risultati al file specificato\n"
 "                           (oppure |pipe)\n"
 
-#: help.c:101
+#: help.c:102
 #, c-format
 msgid "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr ""
 "  -q, --quiet              esegui in modo silenzioso (nessun messaggio, solo\n"
 "                           risultati query)\n"
 
-#: help.c:102
+#: help.c:103
 #, c-format
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr "  -s, --single-step        modalità passo singolo (conferma ogni query)\n"
 
-#: help.c:103
+#: help.c:104
 #, c-format
 msgid "  -S, --single-line        single-line mode (end of line terminates SQL command)\n"
 msgstr ""
 "  -S, --single-line        modalità riga singola (la fine riga termina\n"
 "                           il comando SQL)\n"
 
-#: help.c:105
+#: help.c:106
 #, c-format
 msgid ""
 "\n"
@@ -1945,12 +1951,12 @@
 "\n"
 "Opzioni formato output:\n"
 
-#: help.c:106
+#: help.c:107
 #, c-format
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           modo output tabelle disallineato\n"
 
-#: help.c:107
+#: help.c:108
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -1960,19 +1966,19 @@
 "                           separatore di campo per output non allineato\n"
 "                           (default: \"%s\")\n"
 
-#: help.c:110
+#: help.c:111
 #, c-format
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               modo output tabelle in HTML\n"
 
-#: help.c:111
+#: help.c:112
 #, c-format
 msgid "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset command)\n"
 msgstr ""
 "  -P, --pset=VAR[=ARG]     imposta l'opzione di stampa VAR ad ARG (vedi anche\n"
 "                           il comando \\pset)\n"
 
-#: help.c:112
+#: help.c:113
 #, c-format
 msgid ""
 "  -R, --record-separator=STRING\n"
@@ -1982,24 +1988,24 @@
 "                           separatore di record per output non allineato\n"
 "                           (default: \"a capo\")\n"
 
-#: help.c:114
+#: help.c:115
 #, c-format
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        mostra solo le righe\n"
 
-#: help.c:115
+#: help.c:116
 #, c-format
 msgid "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, border)\n"
 msgstr ""
 "  -T, --table-attr=TESTO   imposta gli attributi delle tabelle HTML\n"
 "                           (es: larghezza, bordo)\n"
 
-#: help.c:116
+#: help.c:117
 #, c-format
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded           attiva output tabelle espanso\n"
 
-#: help.c:117
+#: help.c:118
 #, c-format
 msgid ""
 "  -z, --field-separator-zero\n"
@@ -2009,7 +2015,7 @@
 "                           usa il byte zero come separatore di campo per l'output\n"
 "                           non allineato\n"
 
-#: help.c:119
+#: help.c:120
 #, c-format
 msgid ""
 "  -0, --record-separator-zero\n"
@@ -2019,7 +2025,7 @@
 "                           usa il byte zero come separatore di record per l'output\n"
 "                           non allineato\n"
 
-#: help.c:122
+#: help.c:123
 #, c-format
 msgid ""
 "\n"
@@ -2028,40 +2034,40 @@
 "\n"
 "Opzioni di connessione:\n"
 
-#: help.c:125
+#: help.c:126
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory (default: \"%s\")\n"
 msgstr ""
 "  -h, --host=HOSTNAME      host server del database o directory socket\n"
 "                           (default: \"%s\")\n"
 
-#: help.c:126
+#: help.c:127
 msgid "local socket"
 msgstr "sockect locale"
 
-#: help.c:129
+#: help.c:130
 #, c-format
 msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
 msgstr "  -p, --port=PORTA         porta di ascolto del database (default: \"%s\")\n"
 
-#: help.c:135
+#: help.c:136
 #, c-format
 msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
 msgstr "  -U, --username=UTENTE    nome utente del database (default: \"%s\")\n"
 
-#: help.c:136
+#: help.c:137
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        non chiedere mai le password\n"
 
-#: help.c:137
+#: help.c:138
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password           forza la richiesta di una password (dovrebbe essere\n"
 "                           automatico)\n"
 
-#: help.c:139
+#: help.c:140
 #, c-format
 msgid ""
 "\n"
@@ -2076,94 +2082,87 @@
 "documentazione PostgreSQL.\n"
 "\n"
 
-#: help.c:142
+#: help.c:143
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: help.c:165
+#: help.c:166
 #, c-format
 msgid "General\n"
 msgstr "Generali\n"
 
-#: help.c:166
+#: help.c:167
 #, c-format
 msgid "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright             mostra i termini di uso e distribuzione di PostgreSQL\n"
 
-#: help.c:167
+#: help.c:168
 #, c-format
 msgid "  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
 msgstr ""
 "  \\g [FILE] o ;          esegui la query (ed invia i risultati ad un file o\n"
 "                         ad una |pipe)\n"
 
-#: help.c:168
+#: help.c:169
 #, c-format
 msgid "  \\gset [PREFIX]         execute query and store results in psql variables\n"
 msgstr "  \\gset [PREFIX]         esegui la query e salva il risultato in una variabile psql\n"
 
-#: help.c:169
+#: help.c:170
 #, c-format
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                     esci da psql\n"
 
-#: help.c:170
+#: help.c:171
 #, c-format
 msgid "  \\watch [SEC]           execute query every SEC seconds\n"
 msgstr "  \\watch [SEC]           esegui una query ogni SEC secondi\n"
 
-#: help.c:173
+#: help.c:174
 #, c-format
 msgid "Help\n"
 msgstr "Aiuto\n"
 
-#: help.c:175
-#, c-format
-msgid "  \\? [commands]          description of all psql backslash commands\n"
-msgstr "  \\? [comandi]           descrizione di tutti i comandi backslash psql\n"
-
 #: help.c:176
 #, c-format
-msgid "  \\? options             description of all psql commandline options\n"
-msgstr "  \\? opzioni             descrizione di tutte le opzioni di riga di comando psql\n"
+msgid "  \\? [commands]          show help on backslash commands\n"
+msgstr "  \\? [commands]          mostra aiuto sui comandi backslash\n"
 
 #: help.c:177
 #, c-format
-msgid "  \\? variables           description of all psql configuration variables\n"
-msgstr "  \\? variabili           descrizione di tutte le variabili di configurazione psql\n"
+msgid "  \\? options             show help on psql command-line options\n"
+msgstr "  \\? options             mostra aiuto sulle opzioni di riga di comando psql\n"
 
 #: help.c:178
 #, c-format
+msgid "  \\? variables           show help on special variables\n"
+msgstr "  \\? variables           mostra aiusto sulle variabili speciali\n"
+
+#: help.c:179
+#, c-format
 msgid "  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"
 msgstr ""
 "  \\h [NOME]              mostra aiuto sulla sintassi dei comandi SQL, * mostra\n"
 "                         tutti i comandi\n"
 
-#: help.c:181
+#: help.c:182
 #, c-format
 msgid "Query Buffer\n"
 msgstr "Buffer Query\n"
 
-#: help.c:182
+#: help.c:183
 #, c-format
 msgid "  \\e [FILE] [LINE]       edit the query buffer (or file) with external editor\n"
 msgstr ""
 "  \\e [FILE] [RIGA]       modifica il buffer della query (o il file) con\n"
 "                         l'editor esterno\n"
 
-#: help.c:183
-#, c-format
-msgid "  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
-msgstr ""
-"  \\ef [NOME_FUN [RIGA]]  modifica la definizione della funzione con l'editor\n"
-"                         esterno\n"
-
 #: help.c:184
 #, c-format
-msgid "  \\ev [VIEWNAME [LINE]]  edit view definition with external editor\n"
+msgid "  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
 msgstr ""
-"  \\ev [NOMEVISTA [RIGA]] modifica la definizione della vista con l'editor\n"
+"  \\ef [FUNZIONE [RIGA]]  modifica la definizione della funzione con l'editor\n"
 "                         esterno\n"
 
 #: help.c:185
@@ -2426,49 +2425,44 @@
 
 #: help.c:241
 #, c-format
-msgid "  \\sf[+]  FUNCNAME       show a function's definition\n"
-msgstr "  \\sf[+]  NOMEFUNZ       mostra la definizione di una funzione\n"
+msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
+msgstr "  \\sf[+] FUNZIONE        mostra la definizione di una funzione\n"
 
 #: help.c:242
 #, c-format
-msgid "  \\sv[+]  VIEWNAME       show a view's definition\n"
-msgstr "  \\sv[+]  NOMEVISTA      mostra la definizione di una vista\n"
-
-#: help.c:243
-#, c-format
 msgid "  \\z      [PATTERN]      same as \\dp\n"
 msgstr "  \\z      [MODELLO]      uguale a \\dp\n"
 
-#: help.c:246
+#: help.c:245
 #, c-format
 msgid "Formatting\n"
 msgstr "Formattazione\n"
 
-#: help.c:247
+#: help.c:246
 #, c-format
 msgid "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr "  \\a                     alterna tra modalità di output allineata e disallineata\n"
 
-#: help.c:248
+#: help.c:247
 #, c-format
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr ""
 "  \\C [STRINGA]           imposta nome tabella oppure elimina se la stringa\n"
 "                         non è specificata\n"
 
-#: help.c:249
+#: help.c:248
 #, c-format
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
 msgstr ""
 "  \\f [STRINGA]           mostra o imposta il separatore di campo per l'output\n"
 "                         query disallineato\n"
 
-#: help.c:250
+#: help.c:249
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                     cambia modalità HTML (attualmente %s)\n"
 
-#: help.c:252
+#: help.c:251
 #, c-format
 msgid ""
 "  \\pset [NAME [VALUE]]   set table output option\n"
@@ -2481,31 +2475,31 @@
 "                         numericlocale|recordsep|recordsep_zero|tuples_only|title|tableattr|pager|\n"
 "                         unicode_border_linestyle|unicode_column_linestyle|unicode_header_linestyle})\n"
 
-#: help.c:256
+#: help.c:255
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]            mostra solo le righe (attualmente %s)\n"
 
-#: help.c:258
+#: help.c:257
 #, c-format
 msgid "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr ""
 "  \\T [STRINGA]           imposta gli attributi HTML di <table>, se non\n"
 "                         specificato allora annullali\n"
 
-#: help.c:259
+#: help.c:258
 #, c-format
 msgid "  \\x [on|off|auto]       toggle expanded output (currently %s)\n"
 msgstr ""
 "  \\x [on|off|auto]       cambia modalità output espansa\n"
 "                         (attualmente %s)\n"
 
-#: help.c:263
+#: help.c:262
 #, c-format
 msgid "Connection\n"
 msgstr "Connessione\n"
 
-#: help.c:265
+#: help.c:264
 #, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
@@ -2514,7 +2508,7 @@
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connetti ad un nuovo database (attualmente \"%s\")\n"
 
-#: help.c:269
+#: help.c:268
 #, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
@@ -2523,78 +2517,78 @@
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connetti ad un nuovo database (nessuna connessione attiva)\n"
 
-#: help.c:271
+#: help.c:270
 #, c-format
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [CODIFICA]   mostra o imposta la codifica del client\n"
 
-#: help.c:272
+#: help.c:271
 #, c-format
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [UTENTE]     cambia la password per un utente in sicurezza\n"
 
-#: help.c:273
+#: help.c:272
 #, c-format
 msgid "  \\conninfo              display information about current connection\n"
 msgstr "  \\conninfo              mostra le informazioni su la connessione corrente\n"
 
-#: help.c:276
+#: help.c:275
 #, c-format
 msgid "Operating System\n"
 msgstr "Sistema operativo\n"
 
-#: help.c:277
+#: help.c:276
 #, c-format
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [DIRECTORY]        cambia la directory di lavoro\n"
 
-#: help.c:278
+#: help.c:277
 #, c-format
 msgid "  \\setenv NAME [VALUE]   set or unset environment variable\n"
 msgstr "  \\setenv NOME [VALORE]  imposta o elimina una variabile d'ambiente\n"
 
-#: help.c:279
+#: help.c:278
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr ""
 "  \\timing [on|off]       imposta cronometro dei comandi\n"
 "                         (attualmente %s)\n"
 
-#: help.c:281
+#: help.c:280
 #, c-format
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
 msgstr ""
 "  \\! [COMANDO]           esegui un comando in una shell oppure avvia una shell\n"
 "                         interattiva\n"
 
-#: help.c:284
+#: help.c:283
 #, c-format
 msgid "Variables\n"
 msgstr "Variabili\n"
 
-#: help.c:285
+#: help.c:284
 #, c-format
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr "  \\prompt [TESTO] NOME   richiedi all'utente di impostare una variabile interna\n"
 
-#: help.c:286
+#: help.c:285
 #, c-format
 msgid "  \\set [NAME [VALUE]]    set internal variable, or list all if no parameters\n"
 msgstr ""
 "  \\set [NOME [VALORE]]   imposta una variabile interna, oppure mostrale tutte\n"
 "                         se non sono specificati parametri\n"
 
-#: help.c:287
+#: help.c:286
 #, c-format
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset NOME            cancella una variabile interna\n"
 
-#: help.c:290
+#: help.c:289
 #, c-format
 msgid "Large Objects\n"
 msgstr "Large Object\n"
 
-#: help.c:291
+#: help.c:290
 #, c-format
 msgid ""
 "  \\lo_export LOBOID FILE\n"
@@ -2607,70 +2601,74 @@
 "  \\lo_list\n"
 "  \\lo_unlink LOBOID    operazioni sui large object\n"
 
-#: help.c:312
+#: help.c:311
 #, c-format
-msgid "List of specially treated variables.\n"
-msgstr "Lista di variabili speciali.\n"
+msgid ""
+"List of specially treated variables\n"
+"\n"
+msgstr ""
+"Lista delle variabili speciali\n"
+"\n"
 
-#: help.c:314
+#: help.c:313
 #, c-format
 msgid "psql variables:\n"
 msgstr "variabili psql:\n"
 
-#: help.c:316
+#: help.c:315
 #, c-format
 msgid ""
 "  psql --set=NAME=VALUE\n"
-"  or \\set NAME VALUE in interactive mode\n"
+"  or \\set NAME VALUE inside psql\n"
 "\n"
 msgstr ""
 "  psql --set=NOME=VALORE\n"
-"  o \\set NOME VALORE in modalità interattiva\n"
+"  oppure \\set NOME VALORE dentro psql\n"
 "\n"
 
-#: help.c:318
+#: help.c:317
 #, c-format
 msgid "  AUTOCOMMIT         if set, successful SQL commands are automatically committed\n"
 msgstr "  AUTOCOMMIT         se impostato, i comandi SQL riusciti sono salvati automaticamente\n"
 
-#: help.c:319
+#: help.c:318
 #, c-format
 msgid ""
-"  COMP_KEYWORD_CASE  determine the case used to complete SQL keywords\n"
+"  COMP_KEYWORD_CASE  determines the case used to complete SQL key words\n"
 "                     [lower, upper, preserve-lower, preserve-upper]\n"
 msgstr ""
 "  COMP_KEYWORD_CASE  determina il caso usato per completare le parole chiave SQL\n"
 "                     [lower, upper, preserve-lower, preserve-upper]\n"
 
-#: help.c:321
+#: help.c:320
 #, c-format
 msgid "  DBNAME             the currently connected database name\n"
 msgstr "  DBNAME             il nome del database attualmente connesso\n"
 
-#: help.c:322
+#: help.c:321
 #, c-format
 msgid ""
-"  ECHO               control what input is written to standard output\n"
+"  ECHO               controls what input is written to standard output\n"
 "                     [all, errors, none, queries]\n"
 msgstr ""
 "  ECHO               controlla quale input è scritto su stardard output\n"
 "                     [all, errors, none, queries]\n"
 
-#: help.c:324
+#: help.c:323
 #, c-format
 msgid ""
-"  ECHO_HIDDEN        display internal queries executed by backslash commands when it is set\n"
-"                     or with [noexec] just show without execution\n"
+"  ECHO_HIDDEN        if set, display internal queries executed by backslash commands;\n"
+"                     if set to \"noexec\", just show without execution\n"
 msgstr ""
-"  ECHO_HIDDEN        mostra le query interne eseguite dai comandi backslash quando impostato\n"
-"                     o con [noexec] mostrali solo senza eseguirli\n"
+"  ECHO_HIDDEN        se impostato, mostra le query interne dei comandi backslash;\n"
+"                     se impostato a \"noexec\", mostrale solo senza eseguirle\n"
 
-#: help.c:326
+#: help.c:325
 #, c-format
 msgid "  ENCODING           current client character set encoding\n"
 msgstr "  ENCODING           codifica del set di caratteri del client corrente\n"
 
-#: help.c:327
+#: help.c:326
 #, c-format
 msgid ""
 "  FETCH_COUNT        the number of result rows to fetch and display at a time\n"
@@ -2679,157 +2677,157 @@
 "  FETCH_COUNT        il numero di righe del risultato da leggere e mostrare pr volta\n"
 "                     (default: 0=tutte)\n"
 
+#: help.c:328
+#, c-format
+msgid "  HISTCONTROL        controls command history [ignorespace, ignoredups, ignoreboth]\n"
+msgstr "  HISTCONTROL        controlla la storia dei comandi [ignorespace, ignoredups, ignoreboth]\n"
+
 #: help.c:329
 #, c-format
-msgid "  HISTCONTROL        control history list [ignorespace, ignoredups, ignoreboth]\n"
-msgstr "  HISTCONTROL        lista di controllo storia [ignorespace, ignoredups, ignoreboth]\n"
+msgid "  HISTFILE           file name used to store the command history\n"
+msgstr "  HISTFILE           nome del file usato per memorizzare la storia dei comandi\n"
 
 #: help.c:330
 #, c-format
-msgid "  HISTFILE           file name used to store the history list\n"
-msgstr "  HISTFILE           nome del file usato per memorizzare la lista della storia\n"
+msgid "  HISTSIZE           the number of commands to store in the command history\n"
+msgstr "  HISTSIZE           il numero di comandi da memorizzare nella storia dei comandi\n"
 
 #: help.c:331
 #, c-format
-msgid "  HISTSIZE           the number of commands to store in the command history\n"
-msgstr "  HISTSIZE           il numero di comandi da memorizzare nella storia dei comandi\n"
+msgid "  HOST               the currently connected database server host\n"
+msgstr "  HOST               l'host del server del database attualmente connesso\n"
 
 #: help.c:332
 #, c-format
-msgid "  HOST               the currently connected database server\n"
-msgstr "  HOST               il server del database attualmente connesso\n"
+msgid "  IGNOREEOF          if unset, sending an EOF to interactive session terminates application\n"
+msgstr "  IGNOREEOF          se non impostato, invare un EOF alla sessione interattiva termina l'applicazione\n"
 
 #: help.c:333
 #, c-format
-msgid "  IGNOREEOF          if unset, sending an EOF to interactive session terminates application\n"
-msgstr "  IGNOREEOF          se non impostato, invare un EOF alla sessione interattiva termina l'applicazione\n"
+msgid "  LASTOID            value of the last affected OID\n"
+msgstr "  LASTOID            valore dell'ultimo OID interessato\n"
 
 #: help.c:334
 #, c-format
-msgid "  LASTOID            the value of last affected OID\n"
-msgstr "  LASTOID            il valore dell'ultimo OID interessato\n"
+msgid "  ON_ERROR_ROLLBACK  if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
+msgstr "  ON_ERROR_ROLLBACK  se impostato, un errore non termina una transazione (usa punti di salvataggio impliciti)\n"
 
 #: help.c:335
 #, c-format
-msgid "  ON_ERROR_ROLLBACK  if set, an error doesn't stop a transaction (uses implicit SAVEPOINTs)\n"
-msgstr "  ON_ERROR_ROLLBACK  se impostato, un errore non termina una transazione (usa SAVEPOINT impliciti)\n"
-
-#: help.c:336
-#, c-format
 msgid "  ON_ERROR_STOP      stop batch execution after error\n"
 msgstr "  ON_ERROR_STOP      termina l'esecuzione batch dopo un errore\n"
 
-#: help.c:337
+#: help.c:336
 #, c-format
 msgid "  PORT               server port of the current connection\n"
 msgstr "  PORT               porta del server attualmente connesso\n"
 
-#: help.c:338
+#: help.c:337
 #, c-format
-msgid "  PROMPT1            specify the standard psql prompt\n"
+msgid "  PROMPT1            specifies the standard psql prompt\n"
 msgstr "  PROMPT1            specifica il prompt psql standard\n"
 
-#: help.c:339
+#: help.c:338
 #, c-format
-msgid "  PROMPT2            specify the prompt used when a statement continues from a previous line\n"
+msgid "  PROMPT2            specifies the prompt used when a statement continues from a previous line\n"
 msgstr "  PROMPT2            specifica il prompt usato quando un'istruzione continua da una riga precedente\n"
 
-#: help.c:340
+#: help.c:339
 #, c-format
-msgid "  PROMPT3            specify the prompt used during COPY ... FROM STDIN\n"
+msgid "  PROMPT3            specifies the prompt used during COPY ... FROM STDIN\n"
 msgstr "  PROMPT3            specifica il prompt usato in COPY ... FROM STDIN\n"
 
-#: help.c:341
+#: help.c:340
 #, c-format
 msgid "  QUIET              run quietly (same as -q option)\n"
 msgstr "  QUIET              esegui silenziosamente (come con l'opzione -q)\n"
 
-#: help.c:342
+#: help.c:341
 #, c-format
 msgid "  SINGLELINE         end of line terminates SQL command mode (same as -S option)\n"
 msgstr "  SINGLELINE         la fine riga termina i comandi SQL (come con l'opzione -S)\n"
 
-#: help.c:343
+#: help.c:342
 #, c-format
 msgid "  SINGLESTEP         single-step mode (same as -s option)\n"
 msgstr "  SINGLESTEP         modalità passo singolo (come con l'opzione -s)\n"
 
-#: help.c:344
+#: help.c:343
 #, c-format
 msgid "  USER               the currently connected database user\n"
 msgstr "  USER               l'utente database attualmente connesso\n"
 
-#: help.c:345
+#: help.c:344
 #, c-format
-msgid "  VERBOSITY          control verbosity of error reports [default, verbose, terse]\n"
-msgstr "  VERBOSITY          controlla la loquacità dei report degli errori [default, verbose, terse]\n"
+msgid "  VERBOSITY          controls verbosity of error reports [default, verbose, terse]\n"
+msgstr "  VERBOSITY          controlla la loquacità della visualizzazione degli errori [default, verbose, terse]\n"
 
-#: help.c:347
+#: help.c:346
 #, c-format
 msgid ""
 "\n"
-"Display influencing variables:\n"
+"Display settings:\n"
 msgstr ""
 "\n"
-"Variabili che influenzano la visualizzazione:\n"
+"Impostazioni di visualizzazione:\n"
 
-#: help.c:349
+#: help.c:348
 #, c-format
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
-"  or \\pset NAME [VALUE] in interactive mode\n"
+"  or \\pset NAME [VALUE] inside psql\n"
 "\n"
 msgstr ""
 "  psql --pset=NOME[=VALORE]\n"
-"  or \\pset NOME [VALORE] in modo interattivo\n"
+"  oppure \\pset NOME [VALORE] dentro psql\n"
 "\n"
 
-#: help.c:351
+#: help.c:350
 #, c-format
 msgid "  border             border style (number)\n"
 msgstr "  border             stile bordo (numero)\n"
 
+#: help.c:351
+#, c-format
+msgid "  columns            target width for the wrapped format\n"
+msgstr "  columns            larghezza destinazione per il formato wrapped\n"
+
 #: help.c:352
 #, c-format
-msgid "  columns            set the target width for the wrapped format\n"
-msgstr "  columns            imposta la larghezza obiettivo per il formato wrapped\n"
+msgid "  expanded (or x)    expanded output [on, off, auto]\n"
+msgstr "  expanded (o x)     output espanso [on, off, auto]\n"
 
 #: help.c:353
 #, c-format
-msgid "  expanded (or x)    toggle expanded output\n"
-msgstr "  expanded (or x)    attiva/disattiva l'output espanso\n"
+msgid "  fieldsep           field separator for unaligned output (default \"%s\")\n"
+msgstr "  fieldsep           separatore di campo per l'output non allineato (default \"%s\")\n"
 
 #: help.c:354
 #, c-format
-msgid "  fieldsep           field separator for unaligned output (default '|')\n"
-msgstr "  fieldsep           separatore di caompo per l'output non allineato (default '|')\n"
+msgid "  fieldsep_zero      set field separator for unaligned output to zero byte\n"
+msgstr "  fieldsep_zero      imposta il separatore di campo per l'output non allineato al byte zero\n"
 
 #: help.c:355
 #, c-format
-msgid "  fieldsep_zero      set field separator in unaligned mode to zero\n"
-msgstr "  fieldsep_zero      imposta il separatore di campo in modo non allineato a zero\n"
-
-#: help.c:356
-#, c-format
 msgid "  format             set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 msgstr "  format             imposta il formato di output [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 
-#: help.c:357
+#: help.c:356
 #, c-format
 msgid "  footer             enable or disable display of the table footer [on, off]\n"
 msgstr "  footer             abilita o disabilita la visualizzazione del piè di pagina [on, off]\n"
 
-#: help.c:358
+#: help.c:357
 #, c-format
 msgid "  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"
 msgstr "  linestyle          imposta lo stile di disegno delle righe dei bordi [ascii, old-ascii, unicode]\n"
 
-#: help.c:359
+#: help.c:358
 #, c-format
 msgid "  null               set the string to be printed in place of a null value\n"
 msgstr "  null               imposta la stringa da visualizzare al posto dei valori null\n"
 
-#: help.c:360
+#: help.c:359
 #, c-format
 msgid ""
 "  numericlocale      enable or disable display of a locale-specific character to separate\n"
@@ -2838,62 +2836,55 @@
 "  numericlocale      abilita o disabilita i caratteri specifici per il locale per separare\n"
 "                     i gruppi di cifre [on, off]\n"
 
-#: help.c:362
+#: help.c:361
 #, c-format
 msgid "  pager              control when an external pager is used [yes, no, always]\n"
 msgstr "  pager              controlla quando usare la paginazione esterna [yes, no, always]\n"
 
-#: help.c:363
+#: help.c:362
 #, c-format
-msgid "  recordsep          specify the record (line) separator to use in unaligned output format\n"
-msgstr ""
-"  recordsep          specifica il separatore di record (riga) da usare nel formato di output\n"
-"                     non allneato\n"
+msgid "  recordsep          record (line) separator for unaligned output\n"
+msgstr "  recordsep          separatore di record (riga) per l'output non allineato\n"
 
-#: help.c:364
+#: help.c:363
 #, c-format
-msgid "  recordsep_zero     set the record separator to use in unaligned output format to a zero byte.\n"
-msgstr "  recordsep_zero     imposta il separatore di record da usare in output non allineato al byte zero.\n"
+msgid "  recordsep_zero     set record separator for unaligned output to zero byte\n"
+msgstr "  recordsep_zero     imposta il separatore di campo per l'output non allineato al byte zero\n"
 
-#: help.c:365
+#: help.c:364
 #, c-format
 msgid ""
 "  tableattr (or T)   specify attributes for table tag in html format or proportional\n"
-"                     column width of left aligned data type in latex format\n"
+"                     column widths for left-aligned data types in latex-longtable format\n"
 msgstr ""
 "  tableattr (or T)   specifica gli attributi per il tag table in formato html o la\n"
-"                     larghezza colonna proporzionale dei dati allineati a sx in latex\n"
+"                     larghezza colonna proporzionale dei dati allineati a sinistra\n"
+"                     in formato latex-longtable\n"
 
-#: help.c:367
+#: help.c:366
 #, c-format
 msgid "  title              set the table title for any subsequently printed tables\n"
 msgstr "  title              imposta il titolo della tabella per ogni tabella stampata in seguto\n"
 
-#: help.c:368
+#: help.c:367
 #, c-format
 msgid "  tuples_only        if set, only actual table data is shown\n"
 msgstr "  tuples_only        se impostato, mostra solo i dati della tabella\n"
 
-#: help.c:369
-#, c-format
-msgid "  unicode_border_linestyle\n"
-msgstr "  unicode_border_linestyle\n"
-
-#: help.c:370
-#, c-format
-msgid "  unicode_column_linestyle\n"
-msgstr "  unicode_column_linestyle\n"
-
-#: help.c:371
+#: help.c:368
 #, c-format
 msgid ""
+"  unicode_border_linestyle\n"
+"  unicode_column_linestyle\n"
 "  unicode_header_linestyle\n"
-"                     set the style of unicode line drawing [single, double]\n"
+"                     set the style of Unicode line drawing [single, double]\n"
 msgstr ""
+"  unicode_border_linestyle\n"
+"  unicode_column_linestyle\n"
 "  unicode_header_linestyle\n"
-"                     imposta lo stile di disegno delle righe unicode [single, double]\n"
+"                     imposta lo stile di disegno delle righe Unicode [single, double]\n"
 
-#: help.c:374
+#: help.c:373
 #, c-format
 msgid ""
 "\n"
@@ -2902,85 +2893,85 @@
 "\n"
 "Variabili d'ambiente:\n"
 
-#: help.c:378
+#: help.c:377
 #, c-format
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
-"  or \\setenv NAME [VALUE] in interactive mode\n"
+"  or \\setenv NAME [VALUE] inside psql\n"
 "\n"
 msgstr ""
 "  NOME=VALORE [NOME=VALORE] psql ...\n"
-"  o \\setenv NOME [VALORE] in modalità interattiva\n"
+"  oppure \\setenv NOME [VALORE] dentro psql\n"
 "\n"
 
-#: help.c:380
+#: help.c:379
 #, c-format
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
-"  or \\setenv NAME VALUE in interactive mode\n"
+"  or \\setenv NAME [VALUE] inside psql\n"
 "\n"
 msgstr ""
-"  imposta NOME=VALORE\n"
+"  set NOME=VALORE\n"
 "  psql ...\n"
-"  o \\setenv NOME VALORE in modalità interattiva\n"
+"  oppure \\setenv NOME [VALORE] dentro psql\n"
 "\n"
 
-#: help.c:383
+#: help.c:382
 #, c-format
 msgid "  COLUMNS            number of columns for wrapped format\n"
 msgstr "  COLUMNS            numero di colonne per il formato wrapped\n"
 
-#: help.c:384
+#: help.c:383
 #, c-format
 msgid "  PAGER              name of external pager program\n"
 msgstr "  PAGER              nome del programma di paginazione esterno\n"
 
-#: help.c:385
+#: help.c:384
 #, c-format
 msgid "  PGAPPNAME          same as the application_name connection parameter\n"
 msgstr "  PGAPPNAME          come il parametro di connessione application_name\n"
 
-#: help.c:386
+#: help.c:385
 #, c-format
 msgid "  PGDATABASE         same as the dbname connection parameter\n"
 msgstr "  PGDATABASE         come il parametro di connessione dbname\n"
 
-#: help.c:387
+#: help.c:386
 #, c-format
 msgid "  PGHOST             same as the host connection parameter\n"
 msgstr "  PGHOST             come il parametro di connessione host\n"
 
-#: help.c:388
+#: help.c:387
 #, c-format
 msgid "  PGPORT             same as the port connection parameter\n"
 msgstr "  PGPORT             come il parametro di connessione port\n"
 
-#: help.c:389
+#: help.c:388
 #, c-format
 msgid "  PGUSER             same as the user connection parameter\n"
 msgstr "  PGUSER             come il parametro di connessione user\n"
 
-#: help.c:390
+#: help.c:389
 #, c-format
 msgid "  PGPASSWORD         connection password (not recommended)\n"
 msgstr "  PGPASSWORD         password di connessione (uso non raccomandato)\n"
 
-#: help.c:391
+#: help.c:390
 #, c-format
 msgid "  PGPASSFILE         password file name\n"
 msgstr "  PGPASSFILE         nome del file delle password\n"
 
-#: help.c:392
+#: help.c:391
 #, c-format
 msgid ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
-"                     editor used by the \\e, \\ef, and \\ev commands\n"
+"                     editor used by the \\e and \\ef commands\n"
 msgstr ""
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
-"                     editor usato dai comandi \\e, \\ef, \\ev\n"
+"                     editor usato dai comandi \\e ed \\ef\n"
 
-#: help.c:394
+#: help.c:393
 #, c-format
 msgid ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
@@ -2989,31 +2980,31 @@
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "                     come specificare un numero di riga quando si invoca l'editor\n"
 
-#: help.c:396
+#: help.c:395
 #, c-format
 msgid "  PSQL_HISTORY       alternative location for the command history file\n"
 msgstr "  PSQL_HISTORY       posizione alternativa del file della storia dei comandi\n"
 
-#: help.c:397
+#: help.c:396
 #, c-format
 msgid "  PSQLRC             alternative location for the user's .psqlrc file\n"
 msgstr "  PSQLRC             posizione alternativa del file .psqlrc dell'utente\n"
 
-#: help.c:398
+#: help.c:397
 #, c-format
 msgid "  SHELL              shell used by the \\! command\n"
 msgstr "  SHELL              shell usata dal comando \\!\n"
 
-#: help.c:399
+#: help.c:398
 #, c-format
 msgid "  TMPDIR             directory for temporary files\n"
 msgstr "  TMPDIR             directory per i file temporanei\n"
 
-#: help.c:442
+#: help.c:441
 msgid "Available help:\n"
 msgstr "Aiuti disponibili:\n"
 
-#: help.c:526
+#: help.c:525
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -3028,7 +3019,7 @@
 "%s\n"
 "\n"
 
-#: help.c:542
+#: help.c:541
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -3037,17 +3028,17 @@
 "Nessun aiuto disponibile per \"%s\".\n"
 "Prova a digitare \\h senza parametri per vedere gli aiuti disponibili.\n"
 
-#: input.c:194
+#: input.c:205
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "lettura dal file di input fallita: %s\n"
 
-#: input.c:446 input.c:485
+#: input.c:460 input.c:499
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
 msgstr "salvataggio della cronologia nel file \"%s\" fallita: %s\n"
 
-#: input.c:505
+#: input.c:519
 #, c-format
 msgid "history is not supported by this installation\n"
 msgstr "history non è supportata da questa installazione\n"
@@ -3107,29 +3098,29 @@
 "         \\g o termina con punto e virgola per eseguire la query\n"
 "         \\q per uscire\n"
 
-#: print.c:338
+#: print.c:352
 #, c-format
 msgid "(%lu row)"
 msgid_plural "(%lu rows)"
 msgstr[0] "(%lu riga)"
 msgstr[1] "(%lu righe)"
 
-#: print.c:2795
+#: print.c:2910
 #, c-format
 msgid "Interrupted\n"
 msgstr "Interrotto\n"
 
-#: print.c:2861
+#: print.c:2974
 #, c-format
 msgid "Cannot add header to table content: column count of %d exceeded.\n"
 msgstr "Non è possibile aggiungere l'intestazione al contenuto della tabella: il numero di colonne %d è stato superato.\n"
 
-#: print.c:2901
+#: print.c:3014
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
 msgstr "Non è possibile aggiungere celle al contenuto della tabella: il numero totale di celle %d è stato superato.\n"
 
-#: print.c:3133
+#: print.c:3263
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "il formato di output non è valido (errore interno): %d"
@@ -3139,17 +3130,17 @@
 msgid "skipping recursive expansion of variable \"%s\"\n"
 msgstr "espansione ricorsiva della variabile \"%s\" evitata\n"
 
-#: psqlscan.l:1627
+#: psqlscan.l:1628
 #, c-format
 msgid "unterminated quoted string\n"
 msgstr "stringa tra virgolette non terminata\n"
 
-#: psqlscan.l:1727
+#: psqlscan.l:1728
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria esaurita\n"
 
-#: psqlscan.l:1956
+#: psqlscan.l:1957
 #, c-format
 msgid "can't escape without active connection\n"
 msgstr "non è possibile effettuare l'escape senza una connessione attiva\n"
@@ -3164,158 +3155,156 @@
 #: sql_help.c:367 sql_help.c:369 sql_help.c:412 sql_help.c:414 sql_help.c:417
 #: sql_help.c:419 sql_help.c:483 sql_help.c:488 sql_help.c:493 sql_help.c:498
 #: sql_help.c:546 sql_help.c:548 sql_help.c:550 sql_help.c:553 sql_help.c:555
-#: sql_help.c:566 sql_help.c:568 sql_help.c:608 sql_help.c:610 sql_help.c:613
-#: sql_help.c:615 sql_help.c:617 sql_help.c:651 sql_help.c:655 sql_help.c:659
-#: sql_help.c:678 sql_help.c:681 sql_help.c:684 sql_help.c:713 sql_help.c:725
-#: sql_help.c:733 sql_help.c:736 sql_help.c:739 sql_help.c:753 sql_help.c:799
-#: sql_help.c:822 sql_help.c:833 sql_help.c:835 sql_help.c:852 sql_help.c:861
-#: sql_help.c:863 sql_help.c:865 sql_help.c:877 sql_help.c:881 sql_help.c:883
-#: sql_help.c:965 sql_help.c:967 sql_help.c:970 sql_help.c:973 sql_help.c:975
-#: sql_help.c:977 sql_help.c:1038 sql_help.c:1040 sql_help.c:1042
-#: sql_help.c:1045 sql_help.c:1066 sql_help.c:1069 sql_help.c:1072
-#: sql_help.c:1075 sql_help.c:1079 sql_help.c:1081 sql_help.c:1083
-#: sql_help.c:1085 sql_help.c:1099 sql_help.c:1102 sql_help.c:1104
-#: sql_help.c:1106 sql_help.c:1116 sql_help.c:1118 sql_help.c:1128
-#: sql_help.c:1130 sql_help.c:1139 sql_help.c:1160 sql_help.c:1162
-#: sql_help.c:1164 sql_help.c:1167 sql_help.c:1169 sql_help.c:1171
-#: sql_help.c:1221 sql_help.c:1259 sql_help.c:1262 sql_help.c:1264
-#: sql_help.c:1266 sql_help.c:1268 sql_help.c:1270 sql_help.c:1273
-#: sql_help.c:1313 sql_help.c:1557 sql_help.c:1573 sql_help.c:1586
-#: sql_help.c:1637 sql_help.c:1641 sql_help.c:1651 sql_help.c:1671
-#: sql_help.c:1696 sql_help.c:1714 sql_help.c:1742 sql_help.c:1816
-#: sql_help.c:1859 sql_help.c:1881 sql_help.c:1901 sql_help.c:1902
-#: sql_help.c:1937 sql_help.c:1957 sql_help.c:1979 sql_help.c:1992
-#: sql_help.c:2024 sql_help.c:2049 sql_help.c:2093 sql_help.c:2279
-#: sql_help.c:2292 sql_help.c:2309 sql_help.c:2325 sql_help.c:2364
-#: sql_help.c:2415 sql_help.c:2419 sql_help.c:2421 sql_help.c:2427
-#: sql_help.c:2445 sql_help.c:2472 sql_help.c:2507 sql_help.c:2519
-#: sql_help.c:2528 sql_help.c:2578 sql_help.c:2606 sql_help.c:2614
-#: sql_help.c:2622 sql_help.c:2630 sql_help.c:2638 sql_help.c:2646
-#: sql_help.c:2654 sql_help.c:2662 sql_help.c:2671 sql_help.c:2682
-#: sql_help.c:2690 sql_help.c:2698 sql_help.c:2706 sql_help.c:2714
-#: sql_help.c:2724 sql_help.c:2733 sql_help.c:2742 sql_help.c:2750
-#: sql_help.c:2759 sql_help.c:2767 sql_help.c:2776 sql_help.c:2784
-#: sql_help.c:2792 sql_help.c:2800 sql_help.c:2808 sql_help.c:2816
-#: sql_help.c:2824 sql_help.c:2832 sql_help.c:2840 sql_help.c:2857
-#: sql_help.c:2866 sql_help.c:2874 sql_help.c:2891 sql_help.c:2906
-#: sql_help.c:3171 sql_help.c:3222 sql_help.c:3251 sql_help.c:3259
-#: sql_help.c:3677 sql_help.c:3725 sql_help.c:3865
+#: sql_help.c:566 sql_help.c:568 sql_help.c:607 sql_help.c:609 sql_help.c:612
+#: sql_help.c:614 sql_help.c:616 sql_help.c:644 sql_help.c:648 sql_help.c:666
+#: sql_help.c:669 sql_help.c:672 sql_help.c:701 sql_help.c:713 sql_help.c:721
+#: sql_help.c:724 sql_help.c:727 sql_help.c:742 sql_help.c:745 sql_help.c:790
+#: sql_help.c:813 sql_help.c:824 sql_help.c:826 sql_help.c:843 sql_help.c:852
+#: sql_help.c:854 sql_help.c:856 sql_help.c:868 sql_help.c:872 sql_help.c:874
+#: sql_help.c:958 sql_help.c:960 sql_help.c:963 sql_help.c:966 sql_help.c:968
+#: sql_help.c:970 sql_help.c:1031 sql_help.c:1033 sql_help.c:1035
+#: sql_help.c:1038 sql_help.c:1059 sql_help.c:1062 sql_help.c:1065
+#: sql_help.c:1068 sql_help.c:1072 sql_help.c:1074 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1092 sql_help.c:1095 sql_help.c:1097
+#: sql_help.c:1099 sql_help.c:1109 sql_help.c:1111 sql_help.c:1121
+#: sql_help.c:1123 sql_help.c:1132 sql_help.c:1153 sql_help.c:1155
+#: sql_help.c:1157 sql_help.c:1160 sql_help.c:1162 sql_help.c:1164
+#: sql_help.c:1215 sql_help.c:1253 sql_help.c:1256 sql_help.c:1258
+#: sql_help.c:1260 sql_help.c:1262 sql_help.c:1264 sql_help.c:1267
+#: sql_help.c:1307 sql_help.c:1554 sql_help.c:1570 sql_help.c:1583
+#: sql_help.c:1634 sql_help.c:1638 sql_help.c:1648 sql_help.c:1668
+#: sql_help.c:1693 sql_help.c:1711 sql_help.c:1739 sql_help.c:1813
+#: sql_help.c:1856 sql_help.c:1878 sql_help.c:1898 sql_help.c:1899
+#: sql_help.c:1934 sql_help.c:1954 sql_help.c:1976 sql_help.c:1989
+#: sql_help.c:2021 sql_help.c:2046 sql_help.c:2090 sql_help.c:2276
+#: sql_help.c:2289 sql_help.c:2306 sql_help.c:2322 sql_help.c:2361
+#: sql_help.c:2412 sql_help.c:2416 sql_help.c:2418 sql_help.c:2424
+#: sql_help.c:2442 sql_help.c:2470 sql_help.c:2505 sql_help.c:2517
+#: sql_help.c:2526 sql_help.c:2576 sql_help.c:2604 sql_help.c:2612
+#: sql_help.c:2620 sql_help.c:2628 sql_help.c:2636 sql_help.c:2644
+#: sql_help.c:2652 sql_help.c:2660 sql_help.c:2669 sql_help.c:2680
+#: sql_help.c:2688 sql_help.c:2696 sql_help.c:2704 sql_help.c:2712
+#: sql_help.c:2722 sql_help.c:2731 sql_help.c:2740 sql_help.c:2748
+#: sql_help.c:2757 sql_help.c:2765 sql_help.c:2774 sql_help.c:2782
+#: sql_help.c:2790 sql_help.c:2798 sql_help.c:2806 sql_help.c:2814
+#: sql_help.c:2822 sql_help.c:2830 sql_help.c:2838 sql_help.c:2855
+#: sql_help.c:2864 sql_help.c:2872 sql_help.c:2889 sql_help.c:2904
+#: sql_help.c:3169 sql_help.c:3220 sql_help.c:3249 sql_help.c:3257
+#: sql_help.c:3676 sql_help.c:3724 sql_help.c:3865
 msgid "name"
 msgstr "nome"
 
-#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1376
-#: sql_help.c:2579 sql_help.c:3474
+#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1371
+#: sql_help.c:2577 sql_help.c:3472
 msgid "aggregate_signature"
 msgstr "signature_aggregato"
 
 #: sql_help.c:35 sql_help.c:62 sql_help.c:77 sql_help.c:113 sql_help.c:233
 #: sql_help.c:251 sql_help.c:370 sql_help.c:418 sql_help.c:492 sql_help.c:533
-#: sql_help.c:547 sql_help.c:567 sql_help.c:614 sql_help.c:680 sql_help.c:735
-#: sql_help.c:755 sql_help.c:800 sql_help.c:824 sql_help.c:834 sql_help.c:864
-#: sql_help.c:884 sql_help.c:974 sql_help.c:1039 sql_help.c:1082
-#: sql_help.c:1103 sql_help.c:1117 sql_help.c:1129 sql_help.c:1141
-#: sql_help.c:1168 sql_help.c:1222 sql_help.c:1267
+#: sql_help.c:547 sql_help.c:567 sql_help.c:613 sql_help.c:668 sql_help.c:723
+#: sql_help.c:744 sql_help.c:791 sql_help.c:815 sql_help.c:825 sql_help.c:855
+#: sql_help.c:875 sql_help.c:967 sql_help.c:1032 sql_help.c:1075
+#: sql_help.c:1096 sql_help.c:1110 sql_help.c:1122 sql_help.c:1134
+#: sql_help.c:1161 sql_help.c:1216 sql_help.c:1261
 msgid "new_name"
 msgstr "nuovo_nome"
 
 #: sql_help.c:38 sql_help.c:64 sql_help.c:79 sql_help.c:115 sql_help.c:231
 #: sql_help.c:249 sql_help.c:368 sql_help.c:454 sql_help.c:497 sql_help.c:569
-#: sql_help.c:578 sql_help.c:633 sql_help.c:654 sql_help.c:683 sql_help.c:738
-#: sql_help.c:836 sql_help.c:862 sql_help.c:882 sql_help.c:1023
-#: sql_help.c:1041 sql_help.c:1084 sql_help.c:1105 sql_help.c:1163
-#: sql_help.c:1265 sql_help.c:2265
+#: sql_help.c:578 sql_help.c:632 sql_help.c:647 sql_help.c:671 sql_help.c:726
+#: sql_help.c:827 sql_help.c:853 sql_help.c:873 sql_help.c:1016 sql_help.c:1034
+#: sql_help.c:1077 sql_help.c:1098 sql_help.c:1156 sql_help.c:1259
+#: sql_help.c:2262
 msgid "new_owner"
 msgstr "nuovo_proprietario"
 
 #: sql_help.c:41 sql_help.c:66 sql_help.c:81 sql_help.c:235 sql_help.c:299
-#: sql_help.c:420 sql_help.c:502 sql_help.c:616 sql_help.c:658 sql_help.c:686
-#: sql_help.c:741 sql_help.c:866 sql_help.c:976 sql_help.c:1086
-#: sql_help.c:1107 sql_help.c:1119 sql_help.c:1131 sql_help.c:1170
-#: sql_help.c:1269
+#: sql_help.c:420 sql_help.c:502 sql_help.c:615 sql_help.c:651 sql_help.c:674
+#: sql_help.c:729 sql_help.c:857 sql_help.c:969 sql_help.c:1079 sql_help.c:1100
+#: sql_help.c:1112 sql_help.c:1124 sql_help.c:1163 sql_help.c:1263
 msgid "new_schema"
 msgstr "nuovo_schema"
 
-#: sql_help.c:42 sql_help.c:1427 sql_help.c:2580 sql_help.c:3493
+#: sql_help.c:42 sql_help.c:1424 sql_help.c:2578 sql_help.c:3491
 msgid "where aggregate_signature is:"
 msgstr "dove signature_aggregato è:"
 
 #: sql_help.c:43 sql_help.c:46 sql_help.c:49 sql_help.c:316 sql_help.c:341
 #: sql_help.c:344 sql_help.c:347 sql_help.c:484 sql_help.c:489 sql_help.c:494
-#: sql_help.c:499 sql_help.c:1394 sql_help.c:1428 sql_help.c:1431
-#: sql_help.c:1434 sql_help.c:1558 sql_help.c:1574 sql_help.c:1577
-#: sql_help.c:1817 sql_help.c:2581 sql_help.c:2584 sql_help.c:2587
-#: sql_help.c:2672 sql_help.c:3057 sql_help.c:3389 sql_help.c:3480
-#: sql_help.c:3494 sql_help.c:3497 sql_help.c:3500
+#: sql_help.c:499 sql_help.c:1389 sql_help.c:1425 sql_help.c:1428
+#: sql_help.c:1431 sql_help.c:1555 sql_help.c:1571 sql_help.c:1574
+#: sql_help.c:1814 sql_help.c:2579 sql_help.c:2582 sql_help.c:2585
+#: sql_help.c:2670 sql_help.c:3055 sql_help.c:3387 sql_help.c:3478
+#: sql_help.c:3492 sql_help.c:3495 sql_help.c:3498
 msgid "argmode"
 msgstr "modo_arg"
 
 #: sql_help.c:44 sql_help.c:47 sql_help.c:50 sql_help.c:317 sql_help.c:342
 #: sql_help.c:345 sql_help.c:348 sql_help.c:485 sql_help.c:490 sql_help.c:495
-#: sql_help.c:500 sql_help.c:1395 sql_help.c:1429 sql_help.c:1432
-#: sql_help.c:1435 sql_help.c:1559 sql_help.c:1575 sql_help.c:1578
-#: sql_help.c:1818 sql_help.c:2582 sql_help.c:2585 sql_help.c:2588
-#: sql_help.c:2673 sql_help.c:3481 sql_help.c:3495 sql_help.c:3498
-#: sql_help.c:3501
+#: sql_help.c:500 sql_help.c:1390 sql_help.c:1426 sql_help.c:1429
+#: sql_help.c:1432 sql_help.c:1556 sql_help.c:1572 sql_help.c:1575
+#: sql_help.c:1815 sql_help.c:2580 sql_help.c:2583 sql_help.c:2586
+#: sql_help.c:2671 sql_help.c:3479 sql_help.c:3493 sql_help.c:3496
+#: sql_help.c:3499
 msgid "argname"
 msgstr "nome_arg"
 
 #: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:318 sql_help.c:343
 #: sql_help.c:346 sql_help.c:349 sql_help.c:486 sql_help.c:491 sql_help.c:496
-#: sql_help.c:501 sql_help.c:1396 sql_help.c:1430 sql_help.c:1433
-#: sql_help.c:1436 sql_help.c:1819 sql_help.c:2583 sql_help.c:2586
-#: sql_help.c:2589 sql_help.c:2674 sql_help.c:3482 sql_help.c:3496
-#: sql_help.c:3499 sql_help.c:3502
+#: sql_help.c:501 sql_help.c:1391 sql_help.c:1427 sql_help.c:1430
+#: sql_help.c:1433 sql_help.c:1816 sql_help.c:2581 sql_help.c:2584
+#: sql_help.c:2587 sql_help.c:2672 sql_help.c:3480 sql_help.c:3494
+#: sql_help.c:3497 sql_help.c:3500
 msgid "argtype"
 msgstr "tipo_arg"
 
-#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:794
-#: sql_help.c:879 sql_help.c:1100 sql_help.c:1216 sql_help.c:1244
-#: sql_help.c:1484 sql_help.c:1490 sql_help.c:1745 sql_help.c:1777
-#: sql_help.c:1784 sql_help.c:1860 sql_help.c:2025 sql_help.c:2114
-#: sql_help.c:2294 sql_help.c:2473 sql_help.c:2495 sql_help.c:2925
-#: sql_help.c:3091
+#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:785
+#: sql_help.c:870 sql_help.c:1093 sql_help.c:1210 sql_help.c:1238
+#: sql_help.c:1481 sql_help.c:1487 sql_help.c:1742 sql_help.c:1774
+#: sql_help.c:1781 sql_help.c:1857 sql_help.c:2022 sql_help.c:2111
+#: sql_help.c:2291 sql_help.c:2471 sql_help.c:2493 sql_help.c:2923
+#: sql_help.c:3089
 msgid "option"
 msgstr "opzione"
 
-#: sql_help.c:108 sql_help.c:795 sql_help.c:1217 sql_help.c:1861
-#: sql_help.c:2026 sql_help.c:2474
+#: sql_help.c:108 sql_help.c:786 sql_help.c:1211 sql_help.c:1858
+#: sql_help.c:2023 sql_help.c:2472
 msgid "where option can be:"
 msgstr "dove opzione può essere:"
 
-#: sql_help.c:109 sql_help.c:1678
-msgid "istemplate"
-msgstr "è_template"
-
-#: sql_help.c:110 sql_help.c:1679
+#: sql_help.c:109 sql_help.c:1675
 msgid "allowconn"
 msgstr "permetti_conn"
 
-#: sql_help.c:111 sql_help.c:796 sql_help.c:1218 sql_help.c:1680
-#: sql_help.c:2027 sql_help.c:2475
+#: sql_help.c:110 sql_help.c:787 sql_help.c:1212 sql_help.c:1676
+#: sql_help.c:2024 sql_help.c:2473
 msgid "connlimit"
 msgstr "limite_conn"
 
-#: sql_help.c:117 sql_help.c:557 sql_help.c:619 sql_help.c:634 sql_help.c:979
-#: sql_help.c:1016
+#: sql_help.c:111 sql_help.c:1677
+msgid "istemplate"
+msgstr "è_template"
+
+#: sql_help.c:117 sql_help.c:557 sql_help.c:618 sql_help.c:972 sql_help.c:1009
 msgid "new_tablespace"
 msgstr "nuovo_tablespace"
 
 #: sql_help.c:119 sql_help.c:122 sql_help.c:124 sql_help.c:506 sql_help.c:508
-#: sql_help.c:509 sql_help.c:803 sql_help.c:807 sql_help.c:810 sql_help.c:895
-#: sql_help.c:898 sql_help.c:1224 sql_help.c:1227 sql_help.c:1229
-#: sql_help.c:1828 sql_help.c:3276 sql_help.c:3666
+#: sql_help.c:509 sql_help.c:794 sql_help.c:798 sql_help.c:801 sql_help.c:886
+#: sql_help.c:889 sql_help.c:1218 sql_help.c:1221 sql_help.c:1223
+#: sql_help.c:1825 sql_help.c:3274 sql_help.c:3665
 msgid "configuration_parameter"
 msgstr "parametro_config"
 
 #: sql_help.c:120 sql_help.c:366 sql_help.c:438 sql_help.c:444 sql_help.c:456
-#: sql_help.c:507 sql_help.c:552 sql_help.c:625 sql_help.c:631 sql_help.c:804
-#: sql_help.c:880 sql_help.c:896 sql_help.c:897 sql_help.c:998 sql_help.c:1018
-#: sql_help.c:1044 sql_help.c:1101 sql_help.c:1225 sql_help.c:1245
-#: sql_help.c:1746 sql_help.c:1778 sql_help.c:1785 sql_help.c:1829
-#: sql_help.c:1830 sql_help.c:1889 sql_help.c:1921 sql_help.c:2115
-#: sql_help.c:2189 sql_help.c:2197 sql_help.c:2229 sql_help.c:2251
-#: sql_help.c:2268 sql_help.c:2295 sql_help.c:2496 sql_help.c:3092
-#: sql_help.c:3667 sql_help.c:3668
+#: sql_help.c:507 sql_help.c:552 sql_help.c:624 sql_help.c:630 sql_help.c:795
+#: sql_help.c:871 sql_help.c:887 sql_help.c:888 sql_help.c:991 sql_help.c:1011
+#: sql_help.c:1037 sql_help.c:1094 sql_help.c:1219 sql_help.c:1239
+#: sql_help.c:1743 sql_help.c:1775 sql_help.c:1782 sql_help.c:1826
+#: sql_help.c:1827 sql_help.c:1886 sql_help.c:1918 sql_help.c:2112
+#: sql_help.c:2186 sql_help.c:2194 sql_help.c:2226 sql_help.c:2248
+#: sql_help.c:2265 sql_help.c:2292 sql_help.c:2494 sql_help.c:3090
+#: sql_help.c:3666 sql_help.c:3667
 msgid "value"
 msgstr "valore"
 
@@ -3323,9 +3312,9 @@
 msgid "target_role"
 msgstr "ruolo_destinazione"
 
-#: sql_help.c:183 sql_help.c:1729 sql_help.c:2073 sql_help.c:2078
-#: sql_help.c:3039 sql_help.c:3046 sql_help.c:3060 sql_help.c:3066
-#: sql_help.c:3371 sql_help.c:3378 sql_help.c:3392 sql_help.c:3398
+#: sql_help.c:183 sql_help.c:1726 sql_help.c:2070 sql_help.c:2075
+#: sql_help.c:3037 sql_help.c:3044 sql_help.c:3058 sql_help.c:3064
+#: sql_help.c:3369 sql_help.c:3376 sql_help.c:3390 sql_help.c:3396
 msgid "schema_name"
 msgstr "nome_schema"
 
@@ -3339,32 +3328,32 @@
 
 #: sql_help.c:186 sql_help.c:187 sql_help.c:188 sql_help.c:189 sql_help.c:190
 #: sql_help.c:191 sql_help.c:192 sql_help.c:193 sql_help.c:531 sql_help.c:556
-#: sql_help.c:618 sql_help.c:756 sql_help.c:814 sql_help.c:978 sql_help.c:1232
-#: sql_help.c:1864 sql_help.c:1865 sql_help.c:1866 sql_help.c:1867
-#: sql_help.c:1868 sql_help.c:1994 sql_help.c:2030 sql_help.c:2031
-#: sql_help.c:2032 sql_help.c:2033 sql_help.c:2034 sql_help.c:2478
-#: sql_help.c:2479 sql_help.c:2480 sql_help.c:2481 sql_help.c:2482
-#: sql_help.c:3073 sql_help.c:3074 sql_help.c:3075 sql_help.c:3372
-#: sql_help.c:3376 sql_help.c:3379 sql_help.c:3381 sql_help.c:3383
-#: sql_help.c:3385 sql_help.c:3387 sql_help.c:3393 sql_help.c:3395
-#: sql_help.c:3397 sql_help.c:3399 sql_help.c:3401 sql_help.c:3403
-#: sql_help.c:3404 sql_help.c:3405 sql_help.c:3687
+#: sql_help.c:617 sql_help.c:747 sql_help.c:805 sql_help.c:971 sql_help.c:1226
+#: sql_help.c:1861 sql_help.c:1862 sql_help.c:1863 sql_help.c:1864
+#: sql_help.c:1865 sql_help.c:1991 sql_help.c:2027 sql_help.c:2028
+#: sql_help.c:2029 sql_help.c:2030 sql_help.c:2031 sql_help.c:2476
+#: sql_help.c:2477 sql_help.c:2478 sql_help.c:2479 sql_help.c:2480
+#: sql_help.c:3071 sql_help.c:3072 sql_help.c:3073 sql_help.c:3370
+#: sql_help.c:3374 sql_help.c:3377 sql_help.c:3379 sql_help.c:3381
+#: sql_help.c:3383 sql_help.c:3385 sql_help.c:3391 sql_help.c:3393
+#: sql_help.c:3395 sql_help.c:3397 sql_help.c:3399 sql_help.c:3401
+#: sql_help.c:3402 sql_help.c:3403 sql_help.c:3686
 msgid "role_name"
 msgstr "nome_ruolo"
 
-#: sql_help.c:219 sql_help.c:431 sql_help.c:989 sql_help.c:991 sql_help.c:1261
-#: sql_help.c:1699 sql_help.c:1703 sql_help.c:1788 sql_help.c:1792
-#: sql_help.c:1885 sql_help.c:2201 sql_help.c:2211 sql_help.c:2233
-#: sql_help.c:3122 sql_help.c:3137 sql_help.c:3139 sql_help.c:3552
-#: sql_help.c:3553 sql_help.c:3562 sql_help.c:3603 sql_help.c:3604
-#: sql_help.c:3605 sql_help.c:3606 sql_help.c:3607 sql_help.c:3608
-#: sql_help.c:3641 sql_help.c:3642 sql_help.c:3647 sql_help.c:3652
+#: sql_help.c:219 sql_help.c:431 sql_help.c:982 sql_help.c:984 sql_help.c:1255
+#: sql_help.c:1696 sql_help.c:1700 sql_help.c:1785 sql_help.c:1789
+#: sql_help.c:1882 sql_help.c:2198 sql_help.c:2208 sql_help.c:2230
+#: sql_help.c:3120 sql_help.c:3135 sql_help.c:3137 sql_help.c:3551
+#: sql_help.c:3552 sql_help.c:3561 sql_help.c:3602 sql_help.c:3603
+#: sql_help.c:3604 sql_help.c:3605 sql_help.c:3606 sql_help.c:3607
+#: sql_help.c:3640 sql_help.c:3641 sql_help.c:3646 sql_help.c:3651
 #: sql_help.c:3790 sql_help.c:3791 sql_help.c:3800 sql_help.c:3841
 #: sql_help.c:3842 sql_help.c:3843 sql_help.c:3844 sql_help.c:3845
 #: sql_help.c:3846 sql_help.c:3893 sql_help.c:3895 sql_help.c:3928
-#: sql_help.c:3983 sql_help.c:3984 sql_help.c:3993 sql_help.c:4034
-#: sql_help.c:4035 sql_help.c:4036 sql_help.c:4037 sql_help.c:4038
-#: sql_help.c:4039
+#: sql_help.c:3984 sql_help.c:3985 sql_help.c:3994 sql_help.c:4035
+#: sql_help.c:4036 sql_help.c:4037 sql_help.c:4038 sql_help.c:4039
+#: sql_help.c:4040
 msgid "expression"
 msgstr "espressione"
 
@@ -3373,18 +3362,17 @@
 msgstr "vincolo_di_dominio"
 
 #: sql_help.c:224 sql_help.c:226 sql_help.c:229 sql_help.c:446 sql_help.c:447
-#: sql_help.c:971 sql_help.c:1004 sql_help.c:1005 sql_help.c:1006
-#: sql_help.c:1026 sql_help.c:1382 sql_help.c:1384 sql_help.c:1702
-#: sql_help.c:1787 sql_help.c:1791 sql_help.c:2200 sql_help.c:2210
-#: sql_help.c:3134
+#: sql_help.c:964 sql_help.c:997 sql_help.c:998 sql_help.c:999 sql_help.c:1019
+#: sql_help.c:1377 sql_help.c:1379 sql_help.c:1699 sql_help.c:1784
+#: sql_help.c:1788 sql_help.c:2197 sql_help.c:2207 sql_help.c:3132
 msgid "constraint_name"
 msgstr "nome_vincolo"
 
-#: sql_help.c:227 sql_help.c:972
+#: sql_help.c:227 sql_help.c:965
 msgid "new_constraint_name"
 msgstr "nuovo_nome_vincolo"
 
-#: sql_help.c:297 sql_help.c:878
+#: sql_help.c:297 sql_help.c:869
 msgid "new_version"
 msgstr "nuova_versione"
 
@@ -3396,17 +3384,17 @@
 msgid "where member_object is:"
 msgstr "dove oggetto_membro è:"
 
-#: sql_help.c:305 sql_help.c:1375 sql_help.c:3473
+#: sql_help.c:305 sql_help.c:1370 sql_help.c:3471
 msgid "aggregate_name"
 msgstr "nome_aggregato"
 
-#: sql_help.c:307 sql_help.c:1377 sql_help.c:1617 sql_help.c:1621
-#: sql_help.c:1623 sql_help.c:2597
+#: sql_help.c:307 sql_help.c:1372 sql_help.c:1614 sql_help.c:1618
+#: sql_help.c:1620 sql_help.c:2595
 msgid "source_type"
 msgstr "tipo_sorgente"
 
-#: sql_help.c:308 sql_help.c:1378 sql_help.c:1618 sql_help.c:1622
-#: sql_help.c:1624 sql_help.c:2598
+#: sql_help.c:308 sql_help.c:1373 sql_help.c:1615 sql_help.c:1619
+#: sql_help.c:1621 sql_help.c:2596
 msgid "target_type"
 msgstr "tipo_destinazione"
 
@@ -3414,57 +3402,57 @@
 #: sql_help.c:314 sql_help.c:319 sql_help.c:323 sql_help.c:325 sql_help.c:327
 #: sql_help.c:328 sql_help.c:329 sql_help.c:330 sql_help.c:331 sql_help.c:332
 #: sql_help.c:333 sql_help.c:334 sql_help.c:335 sql_help.c:338 sql_help.c:339
-#: sql_help.c:1379 sql_help.c:1386 sql_help.c:1387 sql_help.c:1388
-#: sql_help.c:1389 sql_help.c:1390 sql_help.c:1391 sql_help.c:1392
-#: sql_help.c:1397 sql_help.c:1399 sql_help.c:1403 sql_help.c:1405
-#: sql_help.c:1407 sql_help.c:1408 sql_help.c:1411 sql_help.c:1412
-#: sql_help.c:1413 sql_help.c:1414 sql_help.c:1415 sql_help.c:1416
-#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1419 sql_help.c:1424
-#: sql_help.c:1425 sql_help.c:3470 sql_help.c:3475 sql_help.c:3476
-#: sql_help.c:3477 sql_help.c:3478 sql_help.c:3484 sql_help.c:3485
-#: sql_help.c:3486 sql_help.c:3487 sql_help.c:3488 sql_help.c:3489
-#: sql_help.c:3490 sql_help.c:3491
+#: sql_help.c:1374 sql_help.c:1381 sql_help.c:1382 sql_help.c:1383
+#: sql_help.c:1384 sql_help.c:1385 sql_help.c:1386 sql_help.c:1387
+#: sql_help.c:1392 sql_help.c:1394 sql_help.c:1398 sql_help.c:1400
+#: sql_help.c:1404 sql_help.c:1405 sql_help.c:1408 sql_help.c:1409
+#: sql_help.c:1410 sql_help.c:1411 sql_help.c:1412 sql_help.c:1413
+#: sql_help.c:1414 sql_help.c:1415 sql_help.c:1416 sql_help.c:1421
+#: sql_help.c:1422 sql_help.c:3468 sql_help.c:3473 sql_help.c:3474
+#: sql_help.c:3475 sql_help.c:3476 sql_help.c:3482 sql_help.c:3483
+#: sql_help.c:3484 sql_help.c:3485 sql_help.c:3486 sql_help.c:3487
+#: sql_help.c:3488 sql_help.c:3489
 msgid "object_name"
 msgstr "nome_oggetto"
 
-#: sql_help.c:315 sql_help.c:723 sql_help.c:1393 sql_help.c:1619
-#: sql_help.c:1654 sql_help.c:1717 sql_help.c:1938 sql_help.c:1969
-#: sql_help.c:2369 sql_help.c:3056 sql_help.c:3388 sql_help.c:3479
-#: sql_help.c:3581 sql_help.c:3585 sql_help.c:3589 sql_help.c:3592
+#: sql_help.c:315 sql_help.c:711 sql_help.c:1388 sql_help.c:1616
+#: sql_help.c:1651 sql_help.c:1714 sql_help.c:1935 sql_help.c:1966
+#: sql_help.c:2366 sql_help.c:3054 sql_help.c:3386 sql_help.c:3477
+#: sql_help.c:3580 sql_help.c:3584 sql_help.c:3588 sql_help.c:3591
 #: sql_help.c:3819 sql_help.c:3823 sql_help.c:3827 sql_help.c:3830
-#: sql_help.c:4012 sql_help.c:4016 sql_help.c:4020 sql_help.c:4023
+#: sql_help.c:4013 sql_help.c:4017 sql_help.c:4021 sql_help.c:4024
 msgid "function_name"
 msgstr "nome_funzione"
 
-#: sql_help.c:320 sql_help.c:716 sql_help.c:1400 sql_help.c:1962
+#: sql_help.c:320 sql_help.c:704 sql_help.c:1395 sql_help.c:1959
 msgid "operator_name"
 msgstr "nome_operatore"
 
-#: sql_help.c:321 sql_help.c:652 sql_help.c:656 sql_help.c:660 sql_help.c:1401
-#: sql_help.c:1939 sql_help.c:2715
+#: sql_help.c:321 sql_help.c:645 sql_help.c:649 sql_help.c:1396 sql_help.c:1936
+#: sql_help.c:2713
 msgid "left_type"
 msgstr "tipo_sx"
 
-#: sql_help.c:322 sql_help.c:653 sql_help.c:657 sql_help.c:661 sql_help.c:1402
-#: sql_help.c:1940 sql_help.c:2716
+#: sql_help.c:322 sql_help.c:646 sql_help.c:650 sql_help.c:1397 sql_help.c:1937
+#: sql_help.c:2714
 msgid "right_type"
 msgstr "tipo_dx"
 
-#: sql_help.c:324 sql_help.c:326 sql_help.c:679 sql_help.c:682 sql_help.c:685
-#: sql_help.c:714 sql_help.c:726 sql_help.c:734 sql_help.c:737 sql_help.c:740
-#: sql_help.c:1404 sql_help.c:1406 sql_help.c:1959 sql_help.c:1980
-#: sql_help.c:2216 sql_help.c:2725 sql_help.c:2734
+#: sql_help.c:324 sql_help.c:326 sql_help.c:667 sql_help.c:670 sql_help.c:673
+#: sql_help.c:702 sql_help.c:714 sql_help.c:722 sql_help.c:725 sql_help.c:728
+#: sql_help.c:1399 sql_help.c:1401 sql_help.c:1956 sql_help.c:1977
+#: sql_help.c:2213 sql_help.c:2723 sql_help.c:2732
 msgid "index_method"
 msgstr "metodo_indice"
 
-#: sql_help.c:336 sql_help.c:1022 sql_help.c:1420 sql_help.c:1825
-#: sql_help.c:2192 sql_help.c:2338 sql_help.c:2848 sql_help.c:3070
-#: sql_help.c:3402
+#: sql_help.c:336 sql_help.c:1015 sql_help.c:1417 sql_help.c:1822
+#: sql_help.c:2189 sql_help.c:2335 sql_help.c:2846 sql_help.c:3068
+#: sql_help.c:3400
 msgid "type_name"
 msgstr "nome_di_tipo"
 
-#: sql_help.c:337 sql_help.c:1421 sql_help.c:1824 sql_help.c:2339
-#: sql_help.c:2563 sql_help.c:2849 sql_help.c:3062 sql_help.c:3394
+#: sql_help.c:337 sql_help.c:1418 sql_help.c:1821 sql_help.c:2336
+#: sql_help.c:2561 sql_help.c:2847 sql_help.c:3060 sql_help.c:3392
 msgid "lang_name"
 msgstr "nome_linguaggio"
 
@@ -3472,112 +3460,112 @@
 msgid "and aggregate_signature is:"
 msgstr "e signature_aggregato è:"
 
-#: sql_help.c:363 sql_help.c:1743
+#: sql_help.c:363 sql_help.c:1740
 msgid "handler_function"
 msgstr "funzione_handler"
 
-#: sql_help.c:364 sql_help.c:1744
+#: sql_help.c:364 sql_help.c:1741
 msgid "validator_function"
 msgstr "funzione_validazione"
 
-#: sql_help.c:413 sql_help.c:487 sql_help.c:609 sql_help.c:966 sql_help.c:1161
-#: sql_help.c:2207 sql_help.c:2208 sql_help.c:2224 sql_help.c:2225
+#: sql_help.c:413 sql_help.c:487 sql_help.c:608 sql_help.c:959 sql_help.c:1154
+#: sql_help.c:2204 sql_help.c:2205 sql_help.c:2221 sql_help.c:2222
 msgid "action"
 msgstr "azione"
 
 #: sql_help.c:415 sql_help.c:422 sql_help.c:426 sql_help.c:427 sql_help.c:430
 #: sql_help.c:432 sql_help.c:433 sql_help.c:434 sql_help.c:436 sql_help.c:439
-#: sql_help.c:441 sql_help.c:442 sql_help.c:611 sql_help.c:621 sql_help.c:623
-#: sql_help.c:626 sql_help.c:628 sql_help.c:860 sql_help.c:968 sql_help.c:981
-#: sql_help.c:985 sql_help.c:986 sql_help.c:990 sql_help.c:992 sql_help.c:993
-#: sql_help.c:994 sql_help.c:996 sql_help.c:999 sql_help.c:1001
-#: sql_help.c:1260 sql_help.c:1263 sql_help.c:1283 sql_help.c:1381
-#: sql_help.c:1481 sql_help.c:1486 sql_help.c:1500 sql_help.c:1501
-#: sql_help.c:1502 sql_help.c:1775 sql_help.c:1822 sql_help.c:1884
-#: sql_help.c:1919 sql_help.c:2100 sql_help.c:2180 sql_help.c:2193
-#: sql_help.c:2212 sql_help.c:2214 sql_help.c:2221 sql_help.c:2232
-#: sql_help.c:2249 sql_help.c:2372 sql_help.c:2508 sql_help.c:3041
-#: sql_help.c:3042 sql_help.c:3121 sql_help.c:3136 sql_help.c:3138
-#: sql_help.c:3140 sql_help.c:3373 sql_help.c:3374 sql_help.c:3472
-#: sql_help.c:3612 sql_help.c:3850 sql_help.c:3892 sql_help.c:3894
-#: sql_help.c:3896 sql_help.c:3913 sql_help.c:3916 sql_help.c:4043
+#: sql_help.c:441 sql_help.c:442 sql_help.c:610 sql_help.c:620 sql_help.c:622
+#: sql_help.c:625 sql_help.c:627 sql_help.c:851 sql_help.c:961 sql_help.c:974
+#: sql_help.c:978 sql_help.c:979 sql_help.c:983 sql_help.c:985 sql_help.c:986
+#: sql_help.c:987 sql_help.c:989 sql_help.c:992 sql_help.c:994 sql_help.c:1254
+#: sql_help.c:1257 sql_help.c:1277 sql_help.c:1376 sql_help.c:1478
+#: sql_help.c:1483 sql_help.c:1497 sql_help.c:1498 sql_help.c:1499
+#: sql_help.c:1772 sql_help.c:1819 sql_help.c:1881 sql_help.c:1916
+#: sql_help.c:2097 sql_help.c:2177 sql_help.c:2190 sql_help.c:2209
+#: sql_help.c:2211 sql_help.c:2218 sql_help.c:2229 sql_help.c:2246
+#: sql_help.c:2369 sql_help.c:2506 sql_help.c:3039 sql_help.c:3040
+#: sql_help.c:3119 sql_help.c:3134 sql_help.c:3136 sql_help.c:3138
+#: sql_help.c:3371 sql_help.c:3372 sql_help.c:3470 sql_help.c:3611
+#: sql_help.c:3850 sql_help.c:3892 sql_help.c:3894 sql_help.c:3896
+#: sql_help.c:3913 sql_help.c:3916 sql_help.c:4044
 msgid "column_name"
 msgstr "nome_colonna"
 
-#: sql_help.c:416 sql_help.c:612 sql_help.c:969
+#: sql_help.c:416 sql_help.c:611 sql_help.c:962
 msgid "new_column_name"
 msgstr "nuovo_nome_colonna"
 
-#: sql_help.c:421 sql_help.c:503 sql_help.c:620 sql_help.c:980 sql_help.c:1174
+#: sql_help.c:421 sql_help.c:503 sql_help.c:619 sql_help.c:973 sql_help.c:1167
 msgid "where action is one of:"
 msgstr "dove azione è una di:"
 
-#: sql_help.c:423 sql_help.c:428 sql_help.c:982 sql_help.c:987 sql_help.c:1176
-#: sql_help.c:1180 sql_help.c:1697 sql_help.c:1776 sql_help.c:1958
-#: sql_help.c:2181 sql_help.c:2417 sql_help.c:3223
+#: sql_help.c:423 sql_help.c:428 sql_help.c:975 sql_help.c:980 sql_help.c:1169
+#: sql_help.c:1173 sql_help.c:1694 sql_help.c:1773 sql_help.c:1955
+#: sql_help.c:2178 sql_help.c:2414 sql_help.c:3221
 msgid "data_type"
 msgstr "tipo_di_dato"
 
-#: sql_help.c:424 sql_help.c:429 sql_help.c:983 sql_help.c:988 sql_help.c:1177
-#: sql_help.c:1181 sql_help.c:1698 sql_help.c:1779 sql_help.c:1886
-#: sql_help.c:2182 sql_help.c:2418 sql_help.c:2424 sql_help.c:3131
+#: sql_help.c:424 sql_help.c:429 sql_help.c:976 sql_help.c:981 sql_help.c:1170
+#: sql_help.c:1174 sql_help.c:1695 sql_help.c:1776 sql_help.c:1883
+#: sql_help.c:2179 sql_help.c:2415 sql_help.c:2421 sql_help.c:3129
 msgid "collation"
 msgstr "ordinamento"
 
-#: sql_help.c:425 sql_help.c:984 sql_help.c:1780 sql_help.c:2183
-#: sql_help.c:2194
+#: sql_help.c:425 sql_help.c:977 sql_help.c:1777 sql_help.c:2180
+#: sql_help.c:2191
 msgid "column_constraint"
 msgstr "vincolo_di_colonna"
 
-#: sql_help.c:435 sql_help.c:622 sql_help.c:995
+#: sql_help.c:435 sql_help.c:621 sql_help.c:988
 msgid "integer"
 msgstr "intero"
 
-#: sql_help.c:437 sql_help.c:440 sql_help.c:624 sql_help.c:627 sql_help.c:997
-#: sql_help.c:1000
+#: sql_help.c:437 sql_help.c:440 sql_help.c:623 sql_help.c:626 sql_help.c:990
+#: sql_help.c:993
 msgid "attribute_option"
 msgstr "opzione_attributo"
 
-#: sql_help.c:445 sql_help.c:1002 sql_help.c:1781 sql_help.c:2184
-#: sql_help.c:2195
+#: sql_help.c:445 sql_help.c:995 sql_help.c:1778 sql_help.c:2181
+#: sql_help.c:2192
 msgid "table_constraint"
 msgstr "vincoli_di_tabella"
 
-#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:1007
-#: sql_help.c:1008 sql_help.c:1009 sql_help.c:1010 sql_help.c:1422
+#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:1000
+#: sql_help.c:1001 sql_help.c:1002 sql_help.c:1003 sql_help.c:1419
 msgid "trigger_name"
 msgstr "nome_trigger"
 
-#: sql_help.c:452 sql_help.c:453 sql_help.c:1020 sql_help.c:1021
-#: sql_help.c:1782 sql_help.c:2187
+#: sql_help.c:452 sql_help.c:453 sql_help.c:1013 sql_help.c:1014
+#: sql_help.c:1779 sql_help.c:2184
 msgid "parent_table"
 msgstr "tabella_padre"
 
-#: sql_help.c:504 sql_help.c:1826
+#: sql_help.c:504 sql_help.c:1823
 msgid "execution_cost"
 msgstr "costo_di_esecuzione"
 
-#: sql_help.c:505 sql_help.c:1827
+#: sql_help.c:505 sql_help.c:1824
 msgid "result_rows"
 msgstr "righe_risultato"
 
-#: sql_help.c:526 sql_help.c:528 sql_help.c:793 sql_help.c:801 sql_help.c:805
-#: sql_help.c:808 sql_help.c:811 sql_help.c:1215 sql_help.c:1223
-#: sql_help.c:1226 sql_help.c:1228 sql_help.c:1230 sql_help.c:2074
-#: sql_help.c:2076 sql_help.c:2079 sql_help.c:2080 sql_help.c:3040
-#: sql_help.c:3044 sql_help.c:3047 sql_help.c:3049 sql_help.c:3051
-#: sql_help.c:3053 sql_help.c:3055 sql_help.c:3061 sql_help.c:3063
-#: sql_help.c:3065 sql_help.c:3067 sql_help.c:3069 sql_help.c:3071
+#: sql_help.c:526 sql_help.c:528 sql_help.c:784 sql_help.c:792 sql_help.c:796
+#: sql_help.c:799 sql_help.c:802 sql_help.c:1209 sql_help.c:1217
+#: sql_help.c:1220 sql_help.c:1222 sql_help.c:1224 sql_help.c:2071
+#: sql_help.c:2073 sql_help.c:2076 sql_help.c:2077 sql_help.c:3038
+#: sql_help.c:3042 sql_help.c:3045 sql_help.c:3047 sql_help.c:3049
+#: sql_help.c:3051 sql_help.c:3053 sql_help.c:3059 sql_help.c:3061
+#: sql_help.c:3063 sql_help.c:3065 sql_help.c:3067 sql_help.c:3069
 msgid "role_specification"
 msgstr "specifica_ruolo"
 
-#: sql_help.c:527 sql_help.c:529 sql_help.c:1242 sql_help.c:1672
-#: sql_help.c:2082 sql_help.c:2493 sql_help.c:2882 sql_help.c:3697
+#: sql_help.c:527 sql_help.c:529 sql_help.c:1236 sql_help.c:1669
+#: sql_help.c:2079 sql_help.c:2491 sql_help.c:2880 sql_help.c:3696
 msgid "user_name"
 msgstr "nome_utente"
 
-#: sql_help.c:530 sql_help.c:813 sql_help.c:1231 sql_help.c:2081
-#: sql_help.c:3072
+#: sql_help.c:530 sql_help.c:804 sql_help.c:1225 sql_help.c:2078
+#: sql_help.c:3070
 msgid "where role_specification can be:"
 msgstr "dove specifica_ruolo può essere:"
 
@@ -3585,925 +3573,929 @@
 msgid "group_name"
 msgstr "nome_gruppo"
 
-#: sql_help.c:549 sql_help.c:1677 sql_help.c:1890 sql_help.c:1922
-#: sql_help.c:2190 sql_help.c:2198 sql_help.c:2230 sql_help.c:2252
-#: sql_help.c:2264 sql_help.c:3068 sql_help.c:3400
+#: sql_help.c:549 sql_help.c:1674 sql_help.c:1887 sql_help.c:1919
+#: sql_help.c:2187 sql_help.c:2195 sql_help.c:2227 sql_help.c:2249
+#: sql_help.c:2261 sql_help.c:3066 sql_help.c:3398
 msgid "tablespace_name"
 msgstr "nome_tablespace"
 
-#: sql_help.c:551 sql_help.c:554 sql_help.c:630 sql_help.c:632 sql_help.c:1017
-#: sql_help.c:1019 sql_help.c:1888 sql_help.c:1920 sql_help.c:2188
-#: sql_help.c:2196 sql_help.c:2228 sql_help.c:2250
+#: sql_help.c:551 sql_help.c:554 sql_help.c:629 sql_help.c:631 sql_help.c:1010
+#: sql_help.c:1012 sql_help.c:1885 sql_help.c:1917 sql_help.c:2185
+#: sql_help.c:2193 sql_help.c:2225 sql_help.c:2247
 msgid "storage_parameter"
 msgstr "parametro_di_memorizzazione"
 
-#: sql_help.c:577 sql_help.c:1398 sql_help.c:3483
+#: sql_help.c:577 sql_help.c:1393 sql_help.c:3481
 msgid "large_object_oid"
 msgstr "oid_large_object"
 
-#: sql_help.c:629 sql_help.c:1015 sql_help.c:1024 sql_help.c:1027
-#: sql_help.c:1323
+#: sql_help.c:628 sql_help.c:1008 sql_help.c:1017 sql_help.c:1020
+#: sql_help.c:1317
 msgid "index_name"
 msgstr "nome_indice"
 
-#: sql_help.c:662 sql_help.c:1943
-msgid "res_proc"
-msgstr "res_proc"
-
-#: sql_help.c:663 sql_help.c:1944
-msgid "join_proc"
-msgstr "proc_join"
-
-#: sql_help.c:715 sql_help.c:727 sql_help.c:1961
+#: sql_help.c:703 sql_help.c:715 sql_help.c:1958
 msgid "strategy_number"
 msgstr "strategia_num"
 
-#: sql_help.c:717 sql_help.c:718 sql_help.c:721 sql_help.c:722 sql_help.c:728
-#: sql_help.c:729 sql_help.c:731 sql_help.c:732 sql_help.c:1963
-#: sql_help.c:1964 sql_help.c:1967 sql_help.c:1968
+#: sql_help.c:705 sql_help.c:706 sql_help.c:709 sql_help.c:710 sql_help.c:716
+#: sql_help.c:717 sql_help.c:719 sql_help.c:720 sql_help.c:1960 sql_help.c:1961
+#: sql_help.c:1964 sql_help.c:1965
 msgid "op_type"
 msgstr "tipo_op"
 
-#: sql_help.c:719 sql_help.c:1965
+#: sql_help.c:707 sql_help.c:1962
 msgid "sort_family_name"
 msgstr "nome_famiglia_sort"
 
-#: sql_help.c:720 sql_help.c:730 sql_help.c:1966
+#: sql_help.c:708 sql_help.c:718 sql_help.c:1963
 msgid "support_number"
 msgstr "num_supporto"
 
-#: sql_help.c:724 sql_help.c:1620 sql_help.c:1970 sql_help.c:2341
-#: sql_help.c:2343
+#: sql_help.c:712 sql_help.c:1617 sql_help.c:1967 sql_help.c:2338
+#: sql_help.c:2340
 msgid "argument_type"
 msgstr "tipo_argomento"
 
-#: sql_help.c:754 sql_help.c:823 sql_help.c:859 sql_help.c:1140
-#: sql_help.c:1282 sql_help.c:1322 sql_help.c:1383 sql_help.c:1410
-#: sql_help.c:1423 sql_help.c:1480 sql_help.c:1485 sql_help.c:1774
-#: sql_help.c:1882 sql_help.c:1918 sql_help.c:1993 sql_help.c:2051
-#: sql_help.c:2099 sql_help.c:2179 sql_help.c:2191 sql_help.c:2248
-#: sql_help.c:2366 sql_help.c:2542 sql_help.c:2751 sql_help.c:2768
-#: sql_help.c:2858 sql_help.c:3038 sql_help.c:3043 sql_help.c:3088
-#: sql_help.c:3119 sql_help.c:3370 sql_help.c:3375 sql_help.c:3471
-#: sql_help.c:3567 sql_help.c:3569 sql_help.c:3618 sql_help.c:3657
-#: sql_help.c:3805 sql_help.c:3807 sql_help.c:3856 sql_help.c:3890
-#: sql_help.c:3912 sql_help.c:3914 sql_help.c:3915 sql_help.c:3998
-#: sql_help.c:4000 sql_help.c:4049
+#: sql_help.c:743 sql_help.c:746 sql_help.c:814 sql_help.c:850 sql_help.c:1133
+#: sql_help.c:1276 sql_help.c:1316 sql_help.c:1378 sql_help.c:1403
+#: sql_help.c:1407 sql_help.c:1420 sql_help.c:1477 sql_help.c:1482
+#: sql_help.c:1771 sql_help.c:1879 sql_help.c:1915 sql_help.c:1990
+#: sql_help.c:2048 sql_help.c:2096 sql_help.c:2176 sql_help.c:2188
+#: sql_help.c:2245 sql_help.c:2363 sql_help.c:2540 sql_help.c:2749
+#: sql_help.c:2766 sql_help.c:2856 sql_help.c:3036 sql_help.c:3041
+#: sql_help.c:3086 sql_help.c:3117 sql_help.c:3368 sql_help.c:3373
+#: sql_help.c:3469 sql_help.c:3566 sql_help.c:3568 sql_help.c:3617
+#: sql_help.c:3656 sql_help.c:3805 sql_help.c:3807 sql_help.c:3856
+#: sql_help.c:3890 sql_help.c:3912 sql_help.c:3914 sql_help.c:3915
+#: sql_help.c:3999 sql_help.c:4001 sql_help.c:4050
 msgid "table_name"
 msgstr "nome_tabella"
 
-#: sql_help.c:757 sql_help.c:1995
+#: sql_help.c:748 sql_help.c:1992
 msgid "using_expression"
 msgstr "espressione_using"
 
-#: sql_help.c:758 sql_help.c:1996
+#: sql_help.c:749 sql_help.c:1993
 msgid "check_expression"
 msgstr "espressione_check"
 
-#: sql_help.c:797 sql_help.c:1219 sql_help.c:1862 sql_help.c:2028
-#: sql_help.c:2476
+#: sql_help.c:788 sql_help.c:1213 sql_help.c:1859 sql_help.c:2025
+#: sql_help.c:2474
 msgid "password"
 msgstr "password"
 
-#: sql_help.c:798 sql_help.c:1220 sql_help.c:1863 sql_help.c:2029
-#: sql_help.c:2477
+#: sql_help.c:789 sql_help.c:1214 sql_help.c:1860 sql_help.c:2026
+#: sql_help.c:2475
 msgid "timestamp"
 msgstr "timestamp"
 
-#: sql_help.c:802 sql_help.c:806 sql_help.c:809 sql_help.c:812 sql_help.c:3048
-#: sql_help.c:3380
+#: sql_help.c:793 sql_help.c:797 sql_help.c:800 sql_help.c:803 sql_help.c:3046
+#: sql_help.c:3378
 msgid "database_name"
 msgstr "nome_database"
 
-#: sql_help.c:853 sql_help.c:2094
+#: sql_help.c:844 sql_help.c:2091
 msgid "increment"
 msgstr "incremento"
 
-#: sql_help.c:854 sql_help.c:2095
+#: sql_help.c:845 sql_help.c:2092
 msgid "minvalue"
 msgstr "valoremin"
 
-#: sql_help.c:855 sql_help.c:2096
+#: sql_help.c:846 sql_help.c:2093
 msgid "maxvalue"
 msgstr "valoremax"
 
-#: sql_help.c:856 sql_help.c:2097 sql_help.c:3565 sql_help.c:3655
-#: sql_help.c:3803 sql_help.c:3932 sql_help.c:3996
+#: sql_help.c:847 sql_help.c:2094 sql_help.c:3564 sql_help.c:3654
+#: sql_help.c:3803 sql_help.c:3932 sql_help.c:3997
 msgid "start"
 msgstr "inizio"
 
-#: sql_help.c:857
+#: sql_help.c:848
 msgid "restart"
 msgstr "riavvio"
 
-#: sql_help.c:858 sql_help.c:2098
+#: sql_help.c:849 sql_help.c:2095
 msgid "cache"
 msgstr "cache"
 
-#: sql_help.c:1003
+#: sql_help.c:996
 msgid "table_constraint_using_index"
 msgstr "vincoli_di_tabella_con_indice"
 
-#: sql_help.c:1011 sql_help.c:1012 sql_help.c:1013 sql_help.c:1014
+#: sql_help.c:1004 sql_help.c:1005 sql_help.c:1006 sql_help.c:1007
 msgid "rewrite_rule_name"
 msgstr "nome_regola_di_riscrittura"
 
-#: sql_help.c:1025
+#: sql_help.c:1018
 msgid "and table_constraint_using_index is:"
 msgstr "e vincolo_di_tabella_con_indice è:"
 
-#: sql_help.c:1043 sql_help.c:1046 sql_help.c:2267
+#: sql_help.c:1036 sql_help.c:1039 sql_help.c:2264
 msgid "tablespace_option"
 msgstr "opzione_tablespace"
 
-#: sql_help.c:1067 sql_help.c:1070 sql_help.c:1076 sql_help.c:1080
+#: sql_help.c:1060 sql_help.c:1063 sql_help.c:1069 sql_help.c:1073
 msgid "token_type"
 msgstr "tipo_di_token"
 
-#: sql_help.c:1068 sql_help.c:1071
+#: sql_help.c:1061 sql_help.c:1064
 msgid "dictionary_name"
 msgstr "nome_dizionario"
 
-#: sql_help.c:1073 sql_help.c:1077
+#: sql_help.c:1066 sql_help.c:1070
 msgid "old_dictionary"
 msgstr "vecchio_dizionario"
 
-#: sql_help.c:1074 sql_help.c:1078
+#: sql_help.c:1067 sql_help.c:1071
 msgid "new_dictionary"
 msgstr "nuovo_dizionario"
 
-#: sql_help.c:1165 sql_help.c:1175 sql_help.c:1178 sql_help.c:1179
-#: sql_help.c:2416
+#: sql_help.c:1158 sql_help.c:1168 sql_help.c:1171 sql_help.c:1172
+#: sql_help.c:2413
 msgid "attribute_name"
 msgstr "nome_attributo"
 
-#: sql_help.c:1166
+#: sql_help.c:1159
 msgid "new_attribute_name"
 msgstr "nuovo_nome_attributo"
 
-#: sql_help.c:1172
+#: sql_help.c:1165
 msgid "new_enum_value"
 msgstr "nuovo_valore_enum"
 
-#: sql_help.c:1173
+#: sql_help.c:1166
 msgid "existing_enum_value"
 msgstr "valore_enum_esistente"
 
-#: sql_help.c:1243 sql_help.c:1783 sql_help.c:2110 sql_help.c:2494
-#: sql_help.c:2883 sql_help.c:3054 sql_help.c:3089 sql_help.c:3386
+#: sql_help.c:1237 sql_help.c:1780 sql_help.c:2107 sql_help.c:2492
+#: sql_help.c:2881 sql_help.c:3052 sql_help.c:3087 sql_help.c:3384
 msgid "server_name"
 msgstr "nome_server"
 
-#: sql_help.c:1271 sql_help.c:1274 sql_help.c:2509
+#: sql_help.c:1265 sql_help.c:1268 sql_help.c:2507
 msgid "view_option_name"
 msgstr "nome_opzione_vista"
 
-#: sql_help.c:1272 sql_help.c:2510
+#: sql_help.c:1266 sql_help.c:2508
 msgid "view_option_value"
 msgstr "valore_opzione_vista"
 
-#: sql_help.c:1297 sql_help.c:3713 sql_help.c:3715 sql_help.c:3739
+#: sql_help.c:1291 sql_help.c:3712 sql_help.c:3714 sql_help.c:3738
 msgid "transaction_mode"
 msgstr "modalità_transazione"
 
-#: sql_help.c:1298 sql_help.c:3716 sql_help.c:3740
+#: sql_help.c:1292 sql_help.c:3715 sql_help.c:3739
 msgid "where transaction_mode is one of:"
 msgstr "dove modalità_transazione è una di:"
 
-#: sql_help.c:1380
+#: sql_help.c:1375
 msgid "relation_name"
 msgstr "nome_relazione"
 
-#: sql_help.c:1385 sql_help.c:3050 sql_help.c:3382
+#: sql_help.c:1380 sql_help.c:3048 sql_help.c:3380
 msgid "domain_name"
 msgstr "nome_dominio"
 
-#: sql_help.c:1409
+#: sql_help.c:1402
+msgid "policy_name"
+msgstr "nome_regola"
+
+#: sql_help.c:1406
 msgid "rule_name"
 msgstr "nome_ruolo"
 
-#: sql_help.c:1426
+#: sql_help.c:1423
 msgid "text"
 msgstr "testo"
 
-#: sql_help.c:1451 sql_help.c:3232 sql_help.c:3420
+#: sql_help.c:1448 sql_help.c:3230 sql_help.c:3418
 msgid "transaction_id"
 msgstr "id_transazione"
 
-#: sql_help.c:1482 sql_help.c:1488 sql_help.c:3158
+#: sql_help.c:1479 sql_help.c:1485 sql_help.c:3156
 msgid "filename"
 msgstr "nome_file"
 
-#: sql_help.c:1483 sql_help.c:1489 sql_help.c:2053 sql_help.c:2054
-#: sql_help.c:2055
+#: sql_help.c:1480 sql_help.c:1486 sql_help.c:2050 sql_help.c:2051
+#: sql_help.c:2052
 msgid "command"
 msgstr "comando"
 
-#: sql_help.c:1487 sql_help.c:1923 sql_help.c:2253 sql_help.c:2511
-#: sql_help.c:2529 sql_help.c:3123
+#: sql_help.c:1484 sql_help.c:1920 sql_help.c:2250 sql_help.c:2509
+#: sql_help.c:2527 sql_help.c:3121
 msgid "query"
 msgstr "query"
 
-#: sql_help.c:1491 sql_help.c:2928
+#: sql_help.c:1488 sql_help.c:2926
 msgid "where option can be one of:"
 msgstr "dove opzione può essere una di:"
 
-#: sql_help.c:1492
+#: sql_help.c:1489
 msgid "format_name"
 msgstr "nome_formato"
 
-#: sql_help.c:1493 sql_help.c:1494 sql_help.c:1497 sql_help.c:2929
-#: sql_help.c:2930 sql_help.c:2931 sql_help.c:2932 sql_help.c:2933
+#: sql_help.c:1490 sql_help.c:1491 sql_help.c:1494 sql_help.c:2927
+#: sql_help.c:2928 sql_help.c:2929 sql_help.c:2930 sql_help.c:2931
 msgid "boolean"
 msgstr "booleano"
 
-#: sql_help.c:1495
+#: sql_help.c:1492
 msgid "delimiter_character"
 msgstr "carattere_delimitatore"
 
-#: sql_help.c:1496
+#: sql_help.c:1493
 msgid "null_string"
 msgstr "stringa_nulla"
 
-#: sql_help.c:1498
+#: sql_help.c:1495
 msgid "quote_character"
 msgstr "carattere_virgolette"
 
-#: sql_help.c:1499
+#: sql_help.c:1496
 msgid "escape_character"
 msgstr "carattere_di_escape"
 
-#: sql_help.c:1503
+#: sql_help.c:1500
 msgid "encoding_name"
 msgstr "nome_codifica"
 
-#: sql_help.c:1560 sql_help.c:1576 sql_help.c:1579
+#: sql_help.c:1557 sql_help.c:1573 sql_help.c:1576
 msgid "arg_data_type"
 msgstr "topo_dato_argomento"
 
-#: sql_help.c:1561 sql_help.c:1580 sql_help.c:1588
+#: sql_help.c:1558 sql_help.c:1577 sql_help.c:1585
 msgid "sfunc"
 msgstr "sfunz"
 
-#: sql_help.c:1562 sql_help.c:1581 sql_help.c:1589
+#: sql_help.c:1559 sql_help.c:1578 sql_help.c:1586
 msgid "state_data_type"
 msgstr "tipo_dato_stato"
 
-#: sql_help.c:1563 sql_help.c:1582 sql_help.c:1590
+#: sql_help.c:1560 sql_help.c:1579 sql_help.c:1587
 msgid "state_data_size"
 msgstr "dimensione_dato_stato"
 
-#: sql_help.c:1564 sql_help.c:1583 sql_help.c:1591
+#: sql_help.c:1561 sql_help.c:1580 sql_help.c:1588
 msgid "ffunc"
 msgstr "ffunz"
 
-#: sql_help.c:1565 sql_help.c:1584 sql_help.c:1592
+#: sql_help.c:1562 sql_help.c:1581 sql_help.c:1589
 msgid "initial_condition"
 msgstr "condizione_iniziale"
 
-#: sql_help.c:1566 sql_help.c:1593
+#: sql_help.c:1563 sql_help.c:1590
 msgid "msfunc"
 msgstr "msfunz"
 
-#: sql_help.c:1567 sql_help.c:1594
+#: sql_help.c:1564 sql_help.c:1591
 msgid "minvfunc"
 msgstr "minvfunz"
 
-#: sql_help.c:1568 sql_help.c:1595
+#: sql_help.c:1565 sql_help.c:1592
 msgid "mstate_data_type"
 msgstr "tipo_dato_mstato"
 
-#: sql_help.c:1569 sql_help.c:1596
+#: sql_help.c:1566 sql_help.c:1593
 msgid "mstate_data_size"
 msgstr "tipo_dato_mstato"
 
-#: sql_help.c:1570 sql_help.c:1597
+#: sql_help.c:1567 sql_help.c:1594
 msgid "mffunc"
 msgstr "mffunz"
 
-#: sql_help.c:1571 sql_help.c:1598
+#: sql_help.c:1568 sql_help.c:1595
 msgid "minitial_condition"
 msgstr "condizione_minima"
 
-#: sql_help.c:1572 sql_help.c:1599
+#: sql_help.c:1569 sql_help.c:1596
 msgid "sort_operator"
 msgstr "operatore_di_ordinamento"
 
-#: sql_help.c:1585
+#: sql_help.c:1582
 msgid "or the old syntax"
 msgstr "o la vecchia sintassi"
 
-#: sql_help.c:1587
+#: sql_help.c:1584
 msgid "base_type"
 msgstr "tipo_base"
 
-#: sql_help.c:1638
+#: sql_help.c:1635
 msgid "locale"
 msgstr "locale"
 
-#: sql_help.c:1639 sql_help.c:1675
+#: sql_help.c:1636 sql_help.c:1672
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:1640 sql_help.c:1676
+#: sql_help.c:1637 sql_help.c:1673
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:1642
+#: sql_help.c:1639
 msgid "existing_collation"
 msgstr "ordinamento_esistente"
 
-#: sql_help.c:1652
+#: sql_help.c:1649
 msgid "source_encoding"
 msgstr "codifica_origine"
 
-#: sql_help.c:1653
+#: sql_help.c:1650
 msgid "dest_encoding"
 msgstr "codifica_destinazione"
 
-#: sql_help.c:1673 sql_help.c:2293
+#: sql_help.c:1670 sql_help.c:2290
 msgid "template"
 msgstr "template"
 
-#: sql_help.c:1674
+#: sql_help.c:1671
 msgid "encoding"
 msgstr "codifica"
 
-#: sql_help.c:1700
+#: sql_help.c:1697
 msgid "constraint"
 msgstr "vincolo"
 
-#: sql_help.c:1701
+#: sql_help.c:1698
 msgid "where constraint is:"
 msgstr "dove vincolo di è:"
 
-#: sql_help.c:1715 sql_help.c:2050 sql_help.c:2365
+#: sql_help.c:1712 sql_help.c:2047 sql_help.c:2362
 msgid "event"
 msgstr "evento"
 
-#: sql_help.c:1716
+#: sql_help.c:1713
 msgid "filter_variable"
 msgstr "valiabile_filtro"
 
-#: sql_help.c:1728
+#: sql_help.c:1725
 msgid "extension_name"
 msgstr "nome_estensione"
 
-#: sql_help.c:1730
+#: sql_help.c:1727
 msgid "version"
 msgstr "versione"
 
-#: sql_help.c:1731
+#: sql_help.c:1728
 msgid "old_version"
 msgstr "vecchia_versione"
 
-#: sql_help.c:1786 sql_help.c:2199
+#: sql_help.c:1783 sql_help.c:2196
 msgid "where column_constraint is:"
 msgstr "dove vincolo_di_colonna è:"
 
-#: sql_help.c:1789 sql_help.c:1820 sql_help.c:2202
+#: sql_help.c:1786 sql_help.c:1817 sql_help.c:2199
 msgid "default_expr"
 msgstr "expr_default"
 
-#: sql_help.c:1790 sql_help.c:2209
+#: sql_help.c:1787 sql_help.c:2206
 msgid "and table_constraint is:"
 msgstr "e vincolo_di_tabella è:"
 
-#: sql_help.c:1821
+#: sql_help.c:1818
 msgid "rettype"
 msgstr "tipo_ritorno"
 
-#: sql_help.c:1823
+#: sql_help.c:1820
 msgid "column_type"
 msgstr "tipo_colonna"
 
-#: sql_help.c:1831
+#: sql_help.c:1828
 msgid "definition"
 msgstr "definizione"
 
-#: sql_help.c:1832
+#: sql_help.c:1829
 msgid "obj_file"
 msgstr "file_obj"
 
-#: sql_help.c:1833
+#: sql_help.c:1830
 msgid "link_symbol"
 msgstr "simbolo_link"
 
-#: sql_help.c:1834
+#: sql_help.c:1831
 msgid "attribute"
 msgstr "attributo"
 
-#: sql_help.c:1869 sql_help.c:2035 sql_help.c:2483
+#: sql_help.c:1866 sql_help.c:2032 sql_help.c:2481
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:1883
+#: sql_help.c:1880
 msgid "method"
 msgstr "metodo"
 
-#: sql_help.c:1887 sql_help.c:2234 sql_help.c:3132
+#: sql_help.c:1884 sql_help.c:2231 sql_help.c:3130
 msgid "opclass"
 msgstr "classe_op"
 
-#: sql_help.c:1891 sql_help.c:2220
+#: sql_help.c:1888 sql_help.c:2217
 msgid "predicate"
 msgstr "predicato"
 
-#: sql_help.c:1903
+#: sql_help.c:1900
 msgid "call_handler"
 msgstr "handler_chiamata"
 
-#: sql_help.c:1904
+#: sql_help.c:1901
 msgid "inline_handler"
 msgstr "handler_inline"
 
-#: sql_help.c:1905
+#: sql_help.c:1902
 msgid "valfunction"
 msgstr "funzione_valid"
 
-#: sql_help.c:1941
+#: sql_help.c:1938
 msgid "com_op"
 msgstr "com_op"
 
-#: sql_help.c:1942
+#: sql_help.c:1939
 msgid "neg_op"
 msgstr "neg_op"
 
-#: sql_help.c:1960
+#: sql_help.c:1940
+msgid "res_proc"
+msgstr "res_proc"
+
+#: sql_help.c:1941
+msgid "join_proc"
+msgstr "proc_join"
+
+#: sql_help.c:1957
 msgid "family_name"
 msgstr "nome_famiglia"
 
-#: sql_help.c:1971
+#: sql_help.c:1968
 msgid "storage_type"
 msgstr "tipo_memorizzazione"
 
-#: sql_help.c:2052 sql_help.c:2368 sql_help.c:2545 sql_help.c:3142
-#: sql_help.c:3556 sql_help.c:3558 sql_help.c:3646 sql_help.c:3648
-#: sql_help.c:3794 sql_help.c:3796 sql_help.c:3899 sql_help.c:3987
-#: sql_help.c:3989
+#: sql_help.c:2049 sql_help.c:2365 sql_help.c:2543 sql_help.c:3140
+#: sql_help.c:3555 sql_help.c:3557 sql_help.c:3645 sql_help.c:3647
+#: sql_help.c:3794 sql_help.c:3796 sql_help.c:3899 sql_help.c:3988
+#: sql_help.c:3990
 msgid "condition"
 msgstr "condizione"
 
-#: sql_help.c:2056 sql_help.c:2371
+#: sql_help.c:2053 sql_help.c:2368
 msgid "where event can be one of:"
 msgstr "dove evento può essere uno di:"
 
-#: sql_help.c:2075 sql_help.c:2077
+#: sql_help.c:2072 sql_help.c:2074
 msgid "schema_element"
 msgstr "elemento_di_schema"
 
-#: sql_help.c:2111
+#: sql_help.c:2108
 msgid "server_type"
 msgstr "tipo_di_server"
 
-#: sql_help.c:2112
+#: sql_help.c:2109
 msgid "server_version"
 msgstr "versione_server"
 
-#: sql_help.c:2113 sql_help.c:3052 sql_help.c:3384
+#: sql_help.c:2110 sql_help.c:3050 sql_help.c:3382
 msgid "fdw_name"
 msgstr "nome_fdw"
 
-#: sql_help.c:2185
+#: sql_help.c:2182
 msgid "source_table"
 msgstr "tabella_origine"
 
-#: sql_help.c:2186
+#: sql_help.c:2183
 msgid "like_option"
 msgstr "opzioni_di_like"
 
-#: sql_help.c:2203 sql_help.c:2204 sql_help.c:2213 sql_help.c:2215
-#: sql_help.c:2219
+#: sql_help.c:2200 sql_help.c:2201 sql_help.c:2210 sql_help.c:2212
+#: sql_help.c:2216
 msgid "index_parameters"
 msgstr "parametri_di_indice"
 
-#: sql_help.c:2205 sql_help.c:2222
+#: sql_help.c:2202 sql_help.c:2219
 msgid "reftable"
 msgstr "tabella_ref"
 
-#: sql_help.c:2206 sql_help.c:2223
+#: sql_help.c:2203 sql_help.c:2220
 msgid "refcolumn"
 msgstr "colonna_ref"
 
-#: sql_help.c:2217
+#: sql_help.c:2214
 msgid "exclude_element"
 msgstr "elemento_di_esclusione"
 
-#: sql_help.c:2218 sql_help.c:3563 sql_help.c:3653 sql_help.c:3801
-#: sql_help.c:3930 sql_help.c:3994
+#: sql_help.c:2215 sql_help.c:3562 sql_help.c:3652 sql_help.c:3801
+#: sql_help.c:3930 sql_help.c:3995
 msgid "operator"
 msgstr "operatore"
 
-#: sql_help.c:2226
+#: sql_help.c:2223
 msgid "and like_option is:"
 msgstr "e opzione_like è:"
 
-#: sql_help.c:2227
+#: sql_help.c:2224
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "parametri_di_indice nei vincoli UNIQUE, PRIMARY KEY e EXCLUDE sono:"
 
-#: sql_help.c:2231
+#: sql_help.c:2228
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "elemento_di_esclusione in un vincolo EXCLUDE è:"
 
-#: sql_help.c:2266
+#: sql_help.c:2263
 msgid "directory"
 msgstr "directory"
 
-#: sql_help.c:2280
+#: sql_help.c:2277
 msgid "parser_name"
 msgstr "nome_parser"
 
-#: sql_help.c:2281
+#: sql_help.c:2278
 msgid "source_config"
 msgstr "config_origine"
 
-#: sql_help.c:2310
+#: sql_help.c:2307
 msgid "start_function"
 msgstr "funzione_inizio"
 
-#: sql_help.c:2311
+#: sql_help.c:2308
 msgid "gettoken_function"
 msgstr "funzione_gettoken"
 
-#: sql_help.c:2312
+#: sql_help.c:2309
 msgid "end_function"
 msgstr "funzione_fine"
 
-#: sql_help.c:2313
+#: sql_help.c:2310
 msgid "lextypes_function"
 msgstr "funzione_lextypes"
 
-#: sql_help.c:2314
+#: sql_help.c:2311
 msgid "headline_function"
 msgstr "funzione_headline"
 
-#: sql_help.c:2326
+#: sql_help.c:2323
 msgid "init_function"
 msgstr "funzione_init"
 
-#: sql_help.c:2327
+#: sql_help.c:2324
 msgid "lexize_function"
 msgstr "funzione_lexize"
 
-#: sql_help.c:2340
+#: sql_help.c:2337
 msgid "from_sql_function_name"
 msgstr "nome_funzione_from_sql"
 
-#: sql_help.c:2342
+#: sql_help.c:2339
 msgid "to_sql_function_name"
 msgstr "nome_funzione_to_sql"
 
-#: sql_help.c:2367
+#: sql_help.c:2364
 msgid "referenced_table_name"
 msgstr "nome_tabella_referenziata"
 
-#: sql_help.c:2370
+#: sql_help.c:2367
 msgid "arguments"
 msgstr "argomenti"
 
-#: sql_help.c:2420 sql_help.c:3492
+#: sql_help.c:2417 sql_help.c:3490
 msgid "label"
 msgstr "etichetta"
 
-#: sql_help.c:2422
+#: sql_help.c:2419
 msgid "subtype"
 msgstr "sottotipo"
 
-#: sql_help.c:2423
+#: sql_help.c:2420
 msgid "subtype_operator_class"
 msgstr "classe_operatore_sottotipo"
 
-#: sql_help.c:2425
+#: sql_help.c:2422
 msgid "canonical_function"
 msgstr "funzione_canonica"
 
-#: sql_help.c:2426
+#: sql_help.c:2423
 msgid "subtype_diff_function"
 msgstr "funzione_diff_sottotipo"
 
-#: sql_help.c:2428
+#: sql_help.c:2425
 msgid "input_function"
 msgstr "funzione_input"
 
-#: sql_help.c:2429
+#: sql_help.c:2426
 msgid "output_function"
 msgstr "funzione_output"
 
-#: sql_help.c:2430
+#: sql_help.c:2427
 msgid "receive_function"
 msgstr "funzione_receive"
 
-#: sql_help.c:2431
+#: sql_help.c:2428
 msgid "send_function"
 msgstr "funzione_send"
 
-#: sql_help.c:2432
+#: sql_help.c:2429
 msgid "type_modifier_input_function"
 msgstr "funzione_input_modificatore_tipo"
 
-#: sql_help.c:2433
+#: sql_help.c:2430
 msgid "type_modifier_output_function"
 msgstr "funzione_output_modificatore_tipo"
 
-#: sql_help.c:2434
+#: sql_help.c:2431
 msgid "analyze_function"
 msgstr "funzione_analyze"
 
-#: sql_help.c:2435
+#: sql_help.c:2432
 msgid "internallength"
 msgstr "lunghezza_interna"
 
-#: sql_help.c:2436
+#: sql_help.c:2433
 msgid "alignment"
 msgstr "allineamento"
 
-#: sql_help.c:2437
+#: sql_help.c:2434
 msgid "storage"
 msgstr "memorizzazione"
 
-#: sql_help.c:2438
+#: sql_help.c:2435
 msgid "like_type"
 msgstr "tipo_like"
 
-#: sql_help.c:2439
+#: sql_help.c:2436
 msgid "category"
 msgstr "categoria"
 
-#: sql_help.c:2440
+#: sql_help.c:2437
 msgid "preferred"
 msgstr "preferito"
 
-#: sql_help.c:2441
+#: sql_help.c:2438
 msgid "default"
 msgstr "predefinito"
 
-#: sql_help.c:2442
+#: sql_help.c:2439
 msgid "element"
 msgstr "elemento"
 
-#: sql_help.c:2443
+#: sql_help.c:2440
 msgid "delimiter"
 msgstr "delimitatore"
 
-#: sql_help.c:2444
+#: sql_help.c:2441
 msgid "collatable"
 msgstr "ordinabile"
 
-#: sql_help.c:2541 sql_help.c:3118 sql_help.c:3551 sql_help.c:3640
-#: sql_help.c:3789 sql_help.c:3889 sql_help.c:3982
+#: sql_help.c:2539 sql_help.c:3116 sql_help.c:3550 sql_help.c:3639
+#: sql_help.c:3789 sql_help.c:3889 sql_help.c:3983
 msgid "with_query"
 msgstr "query_with"
 
-#: sql_help.c:2543 sql_help.c:3120 sql_help.c:3570 sql_help.c:3576
-#: sql_help.c:3579 sql_help.c:3583 sql_help.c:3587 sql_help.c:3595
+#: sql_help.c:2541 sql_help.c:3118 sql_help.c:3569 sql_help.c:3575
+#: sql_help.c:3578 sql_help.c:3582 sql_help.c:3586 sql_help.c:3594
 #: sql_help.c:3808 sql_help.c:3814 sql_help.c:3817 sql_help.c:3821
-#: sql_help.c:3825 sql_help.c:3833 sql_help.c:3891 sql_help.c:4001
-#: sql_help.c:4007 sql_help.c:4010 sql_help.c:4014 sql_help.c:4018
-#: sql_help.c:4026
+#: sql_help.c:3825 sql_help.c:3833 sql_help.c:3891 sql_help.c:4002
+#: sql_help.c:4008 sql_help.c:4011 sql_help.c:4015 sql_help.c:4019
+#: sql_help.c:4027
 msgid "alias"
 msgstr "alias"
 
-#: sql_help.c:2544
+#: sql_help.c:2542
 msgid "using_list"
 msgstr "lista_using"
 
-#: sql_help.c:2546 sql_help.c:2959 sql_help.c:3199 sql_help.c:3900
+#: sql_help.c:2544 sql_help.c:2957 sql_help.c:3197 sql_help.c:3900
 msgid "cursor_name"
 msgstr "nome_cursore"
 
-#: sql_help.c:2547 sql_help.c:3126 sql_help.c:3901
+#: sql_help.c:2545 sql_help.c:3124 sql_help.c:3901
 msgid "output_expression"
 msgstr "espressione_output"
 
-#: sql_help.c:2548 sql_help.c:3127 sql_help.c:3554 sql_help.c:3643
-#: sql_help.c:3792 sql_help.c:3902 sql_help.c:3985
+#: sql_help.c:2546 sql_help.c:3125 sql_help.c:3553 sql_help.c:3642
+#: sql_help.c:3792 sql_help.c:3902 sql_help.c:3986
 msgid "output_name"
 msgstr "nome_output"
 
-#: sql_help.c:2564
+#: sql_help.c:2562
 msgid "code"
 msgstr "codice"
 
-#: sql_help.c:2907
+#: sql_help.c:2905
 msgid "parameter"
 msgstr "parametro"
 
-#: sql_help.c:2926 sql_help.c:2927 sql_help.c:3224
+#: sql_help.c:2924 sql_help.c:2925 sql_help.c:3222
 msgid "statement"
 msgstr "istruzione"
 
-#: sql_help.c:2958 sql_help.c:3198
+#: sql_help.c:2956 sql_help.c:3196
 msgid "direction"
 msgstr "direzione"
 
-#: sql_help.c:2960 sql_help.c:3200
+#: sql_help.c:2958 sql_help.c:3198
 msgid "where direction can be empty or one of:"
 msgstr "dove direzione può essere vuota o una di:"
 
-#: sql_help.c:2961 sql_help.c:2962 sql_help.c:2963 sql_help.c:2964
-#: sql_help.c:2965 sql_help.c:3201 sql_help.c:3202 sql_help.c:3203
-#: sql_help.c:3204 sql_help.c:3205 sql_help.c:3564 sql_help.c:3566
-#: sql_help.c:3654 sql_help.c:3656 sql_help.c:3802 sql_help.c:3804
-#: sql_help.c:3931 sql_help.c:3933 sql_help.c:3995 sql_help.c:3997
+#: sql_help.c:2959 sql_help.c:2960 sql_help.c:2961 sql_help.c:2962
+#: sql_help.c:2963 sql_help.c:3199 sql_help.c:3200 sql_help.c:3201
+#: sql_help.c:3202 sql_help.c:3203 sql_help.c:3563 sql_help.c:3565
+#: sql_help.c:3653 sql_help.c:3655 sql_help.c:3802 sql_help.c:3804
+#: sql_help.c:3931 sql_help.c:3933 sql_help.c:3996 sql_help.c:3998
 msgid "count"
 msgstr "conteggio"
 
-#: sql_help.c:3045 sql_help.c:3377
+#: sql_help.c:3043 sql_help.c:3375
 msgid "sequence_name"
 msgstr "nome_sequenza"
 
-#: sql_help.c:3058 sql_help.c:3390
+#: sql_help.c:3056 sql_help.c:3388
 msgid "arg_name"
 msgstr "nome_arg"
 
-#: sql_help.c:3059 sql_help.c:3391
+#: sql_help.c:3057 sql_help.c:3389
 msgid "arg_type"
 msgstr "tipo_arg"
 
-#: sql_help.c:3064 sql_help.c:3396
+#: sql_help.c:3062 sql_help.c:3394
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:3087
+#: sql_help.c:3085
 msgid "remote_schema"
 msgstr "schema_remoto"
 
-#: sql_help.c:3090
+#: sql_help.c:3088
 msgid "local_schema"
 msgstr "schema_locale"
 
-#: sql_help.c:3124
+#: sql_help.c:3122
 msgid "conflict_target"
 msgstr "target_conflitto"
 
-#: sql_help.c:3125
+#: sql_help.c:3123
 msgid "conflict_action"
 msgstr "azione_conflitto"
 
-#: sql_help.c:3128
+#: sql_help.c:3126
 msgid "where conflict_target can be one of:"
 msgstr "dove target_conflitto può essere uno di:"
 
-#: sql_help.c:3129
-msgid "column_name_index"
-msgstr "indice_nome_colonna"
-
-#: sql_help.c:3130
-msgid "expression_index"
-msgstr "indice_espressione"
+#: sql_help.c:3127
+msgid "index_column_name"
+msgstr "nome_colonna_indice"
 
-#: sql_help.c:3133
+#: sql_help.c:3128
+msgid "index_expression"
+msgstr "espressione_indice"
+
+#: sql_help.c:3131
 msgid "index_predicate"
 msgstr "indice_predicato"
 
-#: sql_help.c:3135
+#: sql_help.c:3133
 msgid "and conflict_action is one of:"
 msgstr "e azione_conflitto è una di:"
 
-#: sql_help.c:3141 sql_help.c:3897
+#: sql_help.c:3139 sql_help.c:3897
 msgid "sub-SELECT"
 msgstr "sub-SELECT"
 
-#: sql_help.c:3150 sql_help.c:3213 sql_help.c:3873
+#: sql_help.c:3148 sql_help.c:3211 sql_help.c:3873
 msgid "channel"
 msgstr "canale"
 
-#: sql_help.c:3172
+#: sql_help.c:3170
 msgid "lockmode"
 msgstr "modalità_lock"
 
-#: sql_help.c:3173
+#: sql_help.c:3171
 msgid "where lockmode is one of:"
 msgstr "dove modalità_lock è una di:"
 
-#: sql_help.c:3214
+#: sql_help.c:3212
 msgid "payload"
 msgstr "payload"
 
-#: sql_help.c:3241
+#: sql_help.c:3239
 msgid "old_role"
 msgstr "vecchio_ruolo"
 
-#: sql_help.c:3242
+#: sql_help.c:3240
 msgid "new_role"
 msgstr "nuovo_ruolo"
 
-#: sql_help.c:3267 sql_help.c:3428 sql_help.c:3436
+#: sql_help.c:3265 sql_help.c:3426 sql_help.c:3434
 msgid "savepoint_name"
 msgstr "nome_punto_salvataggio"
 
-#: sql_help.c:3469
+#: sql_help.c:3467
 msgid "provider"
 msgstr "provider"
 
-#: sql_help.c:3555 sql_help.c:3597 sql_help.c:3599 sql_help.c:3645
-#: sql_help.c:3793 sql_help.c:3835 sql_help.c:3837 sql_help.c:3986
-#: sql_help.c:4028 sql_help.c:4030
+#: sql_help.c:3554 sql_help.c:3596 sql_help.c:3598 sql_help.c:3644
+#: sql_help.c:3793 sql_help.c:3835 sql_help.c:3837 sql_help.c:3987
+#: sql_help.c:4029 sql_help.c:4031
 msgid "from_item"
 msgstr "elemento_from"
 
-#: sql_help.c:3557 sql_help.c:3609 sql_help.c:3795 sql_help.c:3847
-#: sql_help.c:3988 sql_help.c:4040
+#: sql_help.c:3556 sql_help.c:3608 sql_help.c:3795 sql_help.c:3847
+#: sql_help.c:3989 sql_help.c:4041
 msgid "grouping_element"
 msgstr "elemento_raggruppante"
 
-#: sql_help.c:3559 sql_help.c:3649 sql_help.c:3797 sql_help.c:3990
+#: sql_help.c:3558 sql_help.c:3648 sql_help.c:3797 sql_help.c:3991
 msgid "window_name"
 msgstr "nome_finestra"
 
-#: sql_help.c:3560 sql_help.c:3650 sql_help.c:3798 sql_help.c:3991
+#: sql_help.c:3559 sql_help.c:3649 sql_help.c:3798 sql_help.c:3992
 msgid "window_definition"
 msgstr "definizione_finestra"
 
-#: sql_help.c:3561 sql_help.c:3575 sql_help.c:3613 sql_help.c:3651
-#: sql_help.c:3799 sql_help.c:3813 sql_help.c:3851 sql_help.c:3992
-#: sql_help.c:4006 sql_help.c:4044
+#: sql_help.c:3560 sql_help.c:3574 sql_help.c:3612 sql_help.c:3650
+#: sql_help.c:3799 sql_help.c:3813 sql_help.c:3851 sql_help.c:3993
+#: sql_help.c:4007 sql_help.c:4045
 msgid "select"
 msgstr "select"
 
-#: sql_help.c:3568 sql_help.c:3806 sql_help.c:3999
+#: sql_help.c:3567 sql_help.c:3806 sql_help.c:4000
 msgid "where from_item can be one of:"
 msgstr "dove from_item può essere uno di:"
 
-#: sql_help.c:3571 sql_help.c:3577 sql_help.c:3580 sql_help.c:3584
-#: sql_help.c:3596 sql_help.c:3809 sql_help.c:3815 sql_help.c:3818
-#: sql_help.c:3822 sql_help.c:3834 sql_help.c:4002 sql_help.c:4008
-#: sql_help.c:4011 sql_help.c:4015 sql_help.c:4027
+#: sql_help.c:3570 sql_help.c:3576 sql_help.c:3579 sql_help.c:3583
+#: sql_help.c:3595 sql_help.c:3809 sql_help.c:3815 sql_help.c:3818
+#: sql_help.c:3822 sql_help.c:3834 sql_help.c:4003 sql_help.c:4009
+#: sql_help.c:4012 sql_help.c:4016 sql_help.c:4028
 msgid "column_alias"
 msgstr "alias_colonna"
 
-#: sql_help.c:3572 sql_help.c:3810 sql_help.c:4003
+#: sql_help.c:3571 sql_help.c:3810 sql_help.c:4004
 msgid "sampling_method"
 msgstr "metodo_di_campionamento"
 
-#: sql_help.c:3573 sql_help.c:3582 sql_help.c:3586 sql_help.c:3590
-#: sql_help.c:3593 sql_help.c:3811 sql_help.c:3820 sql_help.c:3824
-#: sql_help.c:3828 sql_help.c:3831 sql_help.c:4004 sql_help.c:4013
-#: sql_help.c:4017 sql_help.c:4021 sql_help.c:4024
+#: sql_help.c:3572 sql_help.c:3581 sql_help.c:3585 sql_help.c:3589
+#: sql_help.c:3592 sql_help.c:3811 sql_help.c:3820 sql_help.c:3824
+#: sql_help.c:3828 sql_help.c:3831 sql_help.c:4005 sql_help.c:4014
+#: sql_help.c:4018 sql_help.c:4022 sql_help.c:4025
 msgid "argument"
 msgstr "argomento"
 
-#: sql_help.c:3574 sql_help.c:3812 sql_help.c:4005
+#: sql_help.c:3573 sql_help.c:3812 sql_help.c:4006
 msgid "seed"
 msgstr "seme"
 
-#: sql_help.c:3578 sql_help.c:3611 sql_help.c:3816 sql_help.c:3849
-#: sql_help.c:4009 sql_help.c:4042
+#: sql_help.c:3577 sql_help.c:3610 sql_help.c:3816 sql_help.c:3849
+#: sql_help.c:4010 sql_help.c:4043
 msgid "with_query_name"
 msgstr "nome_query_with"
 
-#: sql_help.c:3588 sql_help.c:3591 sql_help.c:3594 sql_help.c:3826
-#: sql_help.c:3829 sql_help.c:3832 sql_help.c:4019 sql_help.c:4022
-#: sql_help.c:4025
+#: sql_help.c:3587 sql_help.c:3590 sql_help.c:3593 sql_help.c:3826
+#: sql_help.c:3829 sql_help.c:3832 sql_help.c:4020 sql_help.c:4023
+#: sql_help.c:4026
 msgid "column_definition"
 msgstr "definizione_colonna"
 
-#: sql_help.c:3598 sql_help.c:3836 sql_help.c:4029
+#: sql_help.c:3597 sql_help.c:3836 sql_help.c:4030
 msgid "join_type"
 msgstr "tipo_join"
 
-#: sql_help.c:3600 sql_help.c:3838 sql_help.c:4031
+#: sql_help.c:3599 sql_help.c:3838 sql_help.c:4032
 msgid "join_condition"
 msgstr "condizione_join"
 
-#: sql_help.c:3601 sql_help.c:3839 sql_help.c:4032
+#: sql_help.c:3600 sql_help.c:3839 sql_help.c:4033
 msgid "join_column"
 msgstr "colonna_join"
 
-#: sql_help.c:3602 sql_help.c:3840 sql_help.c:4033
+#: sql_help.c:3601 sql_help.c:3840 sql_help.c:4034
 msgid "and grouping_element can be one of:"
 msgstr "e elemento_raggruppante può essere uno di:"
 
-#: sql_help.c:3610 sql_help.c:3848 sql_help.c:4041
+#: sql_help.c:3609 sql_help.c:3848 sql_help.c:4042
 msgid "and with_query is:"
 msgstr "e with_query è:"
 
-#: sql_help.c:3614 sql_help.c:3852 sql_help.c:4045
+#: sql_help.c:3613 sql_help.c:3852 sql_help.c:4046
 msgid "values"
 msgstr "valori"
 
-#: sql_help.c:3615 sql_help.c:3853 sql_help.c:4046
+#: sql_help.c:3614 sql_help.c:3853 sql_help.c:4047
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:3616 sql_help.c:3854 sql_help.c:4047
+#: sql_help.c:3615 sql_help.c:3854 sql_help.c:4048
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:3617 sql_help.c:3855 sql_help.c:4048
+#: sql_help.c:3616 sql_help.c:3855 sql_help.c:4049
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:3644
+#: sql_help.c:3643
 msgid "new_table"
 msgstr "nuova_tabella"
 
-#: sql_help.c:3669
+#: sql_help.c:3668
 msgid "timezone"
 msgstr "timezone"
 
-#: sql_help.c:3714
+#: sql_help.c:3713
 msgid "snapshot_id"
 msgstr "id_snapshot"
 
@@ -4596,8 +4588,8 @@
 msgstr "cambia la definizione di una famiglia di operatori"
 
 #: sql_help.h:297
-msgid "change the definition of a policy"
-msgstr "cambia la definizione di una politica"
+msgid "change the definition of a row level security policy"
+msgstr "cambia la definizione di una regola di sicurezza per riga"
 
 #: sql_help.h:302 sql_help.h:372
 msgid "change a database role"
@@ -4772,8 +4764,8 @@
 msgstr "definisci una nuova famiglia operatore"
 
 #: sql_help.h:522
-msgid "define a new policy for a table"
-msgstr "definisci una nuova politica per una tabella"
+msgid "define a new row level security policy for a table"
+msgstr "definisci una nuova regola di sicurezza per riga per una tabella"
 
 #: sql_help.h:532
 msgid "define a new rewrite rule"
@@ -4936,8 +4928,8 @@
 msgstr "elimina gli oggetti database di proprietà di un ruolo di database"
 
 #: sql_help.h:737
-msgid "remove a policy from a table"
-msgstr "elimina una politica da una tabella"
+msgid "remove a row level security policy from a table"
+msgstr "rimuovi una regola di sicurezza per riga da una tabella"
 
 #: sql_help.h:747
 msgid "remove a rewrite rule"
@@ -5144,12 +5136,12 @@
 msgid "%s: -1 can only be used in non-interactive mode\n"
 msgstr "%s: -1 può essere usato solo in modalità non interattiva\n"
 
-#: startup.c:277
+#: startup.c:278
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s: apertura del file di log \"%s\" fallita: %s\n"
 
-#: startup.c:339
+#: startup.c:342
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -5158,42 +5150,42 @@
 "Digita \"help\" per avere un aiuto.\n"
 "\n"
 
-#: startup.c:486
+#: startup.c:490
 #, c-format
 msgid "%s: could not set printing parameter \"%s\"\n"
 msgstr "%s: impostazione del parametro di stampa \"%s\" fallito\n"
 
-#: startup.c:526
+#: startup.c:530
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: cancellazione della variabile \"%s\" fallita\n"
 
-#: startup.c:536
+#: startup.c:540
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: impostazione della variabile \"%s\" fallita\n"
 
-#: startup.c:596
+#: startup.c:600
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
 
-#: startup.c:613
+#: startup.c:617
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: attenzione: parametro in eccesso \"%s\" nella riga di comando ignorato\n"
 
-#: startup.c:635
+#: startup.c:639
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: il proprio programma eseguibile non è stato trovato\n"
 
-#: startup.c:757 startup.c:804 startup.c:825 startup.c:862 variables.c:121
+#: startup.c:761 startup.c:808 startup.c:829 startup.c:866 variables.c:121
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\"; assuming \"%s\"\n"
 msgstr "valore \"%s\" non riconosciuto per \"%s\"; interpretato come \"%s\"\n"
 
-#: tab-complete.c:4543
+#: tab-complete.c:4597
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/po/pt_BR.po postgresql-9.5-9.5.8/src/bin/psql/po/pt_BR.po
--- postgresql-9.5-9.5.2/src/bin/psql/po/pt_BR.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/po/pt_BR.po	2017-08-07 21:13:41.000000000 +0000
@@ -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-2015.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-09-17 22:32-0300\n"
+"POT-Creation-Date: 2017-08-06 01:45-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"
@@ -53,7 +53,7 @@
 msgstr "pclose falhou: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 command.c:318 input.c:205 mainloop.c:73
+#: ../../common/fe_memutils.c:98 command.c:330 input.c:216 mainloop.c:73
 #: mainloop.c:253
 #, c-format
 msgid "out of memory\n"
@@ -69,7 +69,7 @@
 msgid "could not look up effective user ID %ld: %s"
 msgstr "não pôde encontrar ID de usuário efetivo %ld: %s"
 
-#: ../../common/username.c:47 command.c:273
+#: ../../common/username.c:47 command.c:285
 msgid "user does not exist"
 msgstr "usuário não existe"
 
@@ -113,226 +113,226 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "processo filho terminou com status desconhecido %d"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Comando inválido \\%s. Tente \\? para ajuda.\n"
 
-#: command.c:116
+#: command.c:117
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "comando inválido \\%s\n"
 
-#: command.c:127
+#: command.c:128
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
 msgstr "\\%s: argumento extra \"%s\" ignorado\n"
 
-#: command.c:271
+#: command.c:283
 #, c-format
 msgid "could not get home directory for user ID %ld: %s\n"
 msgstr "não pôde obter diretório base para ID de usuário %ld: %s\n"
 
-#: command.c:289
+#: command.c:301
 #, 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:304 common.c:442 common.c:500 common.c:962
+#: command.c:316 common.c:466 common.c:524 common.c:982
 #, 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:331
+#: command.c:343
 #, 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:334
+#: command.c:346
 #, 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:535 command.c:605 command.c:1405
+#: command.c:547 command.c:620 command.c:1423
 #, c-format
 msgid "no query buffer\n"
 msgstr "nenhum buffer de consulta\n"
 
-#: command.c:568 command.c:3161
+#: command.c:580 command.c:3234
 #, c-format
 msgid "invalid line number: %s\n"
 msgstr "número de linha inválido: %s\n"
 
-#: command.c:599
+#: command.c:613
 #, 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"
+msgid "The server (version %s) does not support editing function source.\n"
+msgstr "O servidor (versão %s) não suporta edição do código da função.\n"
 
-#: command.c:679
+#: command.c:694
 msgid "No changes"
 msgstr "Nenhuma alteração"
 
-#: command.c:733
+#: command.c:748
 #, 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:830 command.c:880 command.c:894 command.c:911 command.c:1018
-#: command.c:1182 command.c:1385 command.c:1416
+#: command.c:845 command.c:895 command.c:909 command.c:926 command.c:1033
+#: command.c:1197 command.c:1403 command.c:1434
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: faltando argumento requerido\n"
 
-#: command.c:943
+#: command.c:958
 msgid "Query buffer is empty."
 msgstr "Buffer de consulta está vazio."
 
-#: command.c:953
+#: command.c:968
 msgid "Enter new password: "
 msgstr "Digite nova senha: "
 
-#: command.c:954
+#: command.c:969
 msgid "Enter it again: "
 msgstr "Digite-a novamente: "
 
-#: command.c:958
+#: command.c:973
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Senhas não correspondem.\n"
 
-#: command.c:976
+#: command.c:991
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Criptografia de senha falhou.\n"
 
-#: command.c:1047 command.c:1163 command.c:1390
+#: command.c:1062 command.c:1178 command.c:1408
 #, c-format
 msgid "\\%s: error while setting variable\n"
 msgstr "\\%s: erro ao definir variável\n"
 
-#: command.c:1110
+#: command.c:1125
 msgid "Query buffer reset (cleared)."
 msgstr "Buffer de consulta reiniciado (limpo)."
 
-#: command.c:1122
+#: command.c:1137
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "Histórico escrito para arquivo \"%s\".\n"
 
-#: command.c:1187
+#: command.c:1202
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\"\n"
 msgstr "\\%s: nome de variável de ambiente não deve conter \"=\"\n"
 
-#: command.c:1229
+#: command.c:1246
 #, 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"
+msgid "The server (version %s) does not support showing function source.\n"
+msgstr "O servidor (versão %s) não suporta exibição do código da função.\n"
 
-#: command.c:1235
+#: command.c:1253
 #, c-format
 msgid "function name is required\n"
 msgstr "nome de função é requerido\n"
 
-#: command.c:1370
+#: command.c:1388
 msgid "Timing is on."
 msgstr "Tempo de execução está habilitado."
 
-#: command.c:1372
+#: command.c:1390
 msgid "Timing is off."
 msgstr "Tempo de execução está desabilitado."
 
-#: command.c:1433 command.c:1453 command.c:2084 command.c:2087 command.c:2090
-#: command.c:2096 command.c:2098 command.c:2106 command.c:2116 command.c:2125
-#: command.c:2139 command.c:2156 command.c:2215 common.c:74 copy.c:333
-#: copy.c:393 copy.c:408 psqlscan.l:1700 psqlscan.l:1711 psqlscan.l:1721
+#: command.c:1452 command.c:1472 command.c:2153 command.c:2156 command.c:2159
+#: command.c:2165 command.c:2167 command.c:2175 command.c:2185 command.c:2194
+#: command.c:2208 command.c:2225 command.c:2284 common.c:67 copy.c:331
+#: copy.c:391 copy.c:404 psqlscan.l:1701 psqlscan.l:1712 psqlscan.l:1722
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1544
+#: command.c:1566
 #, c-format
 msgid "+ opt(%d) = |%s|\n"
 msgstr "+ opt(%d) = |%s|\n"
 
-#: command.c:1570 startup.c:195
+#: command.c:1592 startup.c:195
 msgid "Password: "
 msgstr "Senha: "
 
-#: command.c:1575 startup.c:197
+#: command.c:1597 startup.c:197
 #, c-format
 msgid "Password for user %s: "
 msgstr "Senha para usuário %s: "
 
-#: command.c:1622
+#: command.c:1648
 #, c-format
 msgid "All connection parameters must be supplied because no database connection exists\n"
 msgstr "Todos os parâmetros de conexão devem ser fornecidos porque nenhuma conexão de banco de dados existe\n"
 
-#: command.c:1740 command.c:3195 common.c:120 common.c:413 common.c:1005
-#: common.c:1030 common.c:1130 copy.c:492 copy.c:702 large_obj.c:156
-#: large_obj.c:191 large_obj.c:253 psqlscan.l:1972
+#: command.c:1803 command.c:3268 common.c:140 common.c:437 common.c:1025
+#: common.c:1053 common.c:1153 copy.c:488 copy.c:708 large_obj.c:156
+#: large_obj.c:191 large_obj.c:253 psqlscan.l:1973
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1744
+#: command.c:1807
 #, c-format
 msgid "Previous connection kept\n"
 msgstr "Conexão anterior mantida\n"
 
-#: command.c:1748
+#: command.c:1811
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1782
+#: command.c:1849
 #, c-format
 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:1785
+#: command.c:1852
 #, c-format
 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:1789
+#: command.c:1856
 #, c-format
 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:1823
+#: command.c:1889
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, servidor %s)\n"
 
-#: command.c:1831
+#: command.c:1897
 #, c-format
 msgid ""
-"WARNING: %s major version %d.%d, server major version %d.%d.\n"
+"WARNING: %s major version %s, server major version %s.\n"
 "         Some psql features might not work.\n"
 msgstr ""
-"AVISO: %s versão %d.%d, servidor versão %d.%d.\n"
+"AVISO: %s versão %s, servidor versão %s.\n"
 "         Algumas funcionalidades do psql podem não funcionar.\n"
 
-#: command.c:1865
+#: command.c:1934
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, bits: %s, compression: %s)\n"
 msgstr "conexão SSL (protocolo: %s, cifra: %s, bits: %s, compressão: %s)\n"
 
-#: command.c:1866 command.c:1867 command.c:1868
+#: command.c:1935 command.c:1936 command.c:1937
 msgid "unknown"
 msgstr "desconhecido"
 
-#: command.c:1869 help.c:46
+#: command.c:1938 help.c:46
 msgid "off"
 msgstr "desabilitado"
 
-#: command.c:1869 help.c:46
+#: command.c:1938 help.c:46
 msgid "on"
 msgstr "habilitado"
 
-#: command.c:1889
+#: command.c:1958
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -343,227 +343,234 @@
 "         caracteres de 8 bits podem não funcionar corretamente. Veja página de\n"
 "         referência do psql \"Notes for Windows users\" para obter detalhes.\n"
 
-#: command.c:1973
+#: command.c:2042
 #, c-format
 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:2002
+#: command.c:2071
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "não pôde iniciar o editor \"%s\"\n"
 
-#: command.c:2004
+#: command.c:2073
 #, c-format
 msgid "could not start /bin/sh\n"
 msgstr "não pôde iniciar /bin/sh\n"
 
-#: command.c:2042
+#: command.c:2111
 #, c-format
 msgid "could not locate temporary directory: %s\n"
 msgstr "não pôde localizar diretório temporário: %s\n"
 
-#: command.c:2069
+#: command.c:2138
 #, 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:2377
+#: command.c:2442
 #, c-format
 msgid "\\pset: allowed formats are unaligned, aligned, wrapped, html, asciidoc, latex, latex-longtable, troff-ms\n"
 msgstr "\\pset: formatos permitidos são unaligned, aligned, wrapped, html, asciidoc, latex, latex-longtable, troff-ms\n"
 
-#: command.c:2396
+#: command.c:2461
 #, c-format
 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:2410
-#, fuzzy, c-format
-msgid "\\pset: allowed unicode border linestyle are single, double\n"
-msgstr "\\pset: estilos de linha de borda unicode permitidos são single, double\n"
-
-#: command.c:2423
-#, fuzzy, c-format
-msgid "\\pset: allowed unicode column linestyle are single, double\n"
-msgstr "\\pset: estilos de linha de coluna unicode permitidos são single, double\n"
-
-#: command.c:2436
-#, fuzzy, c-format
-msgid "\\pset: allowed unicode header linestyle are single, double\n"
-msgstr "\\pset: estilos de linha de cabeçalho unicode permitidos são single, double\n"
+#: command.c:2477
+#, c-format
+msgid "\\pset: allowed Unicode border line styles are single, double\n"
+msgstr "\\pset: estilos de linha de borda Unicode permitidos são single, double\n"
 
-#: command.c:2588 command.c:2765
+#: command.c:2492
+#, c-format
+msgid "\\pset: allowed Unicode column line styles are single, double\n"
+msgstr "\\pset: estilos de linha de coluna Unicode permitidos são single, double\n"
+
+#: command.c:2507
+#, c-format
+msgid "\\pset: allowed Unicode header line styles are single, double\n"
+msgstr "\\pset: estilos de linha de cabeçalho Unicode permitidos são single, double\n"
+
+#: command.c:2659 command.c:2838
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: opção desconhecida: %s\n"
 
-#: command.c:2606
+#: command.c:2677
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Estilo de borda é %d.\n"
 
-#: command.c:2612
+#: command.c:2683
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "Largura não está definida.\n"
 
-#: command.c:2614
+#: command.c:2685
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "Largura é %d.\n"
 
-#: command.c:2621
+#: command.c:2692
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Exibição expandida está habilitada.\n"
 
-#: command.c:2623
+#: command.c:2694
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "Exibição expandida é utilizada automaticamente.\n"
 
-#: command.c:2625
+#: command.c:2696
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Exibição expandida está desabilitada.\n"
 
-#: command.c:2632 command.c:2640
+#: command.c:2703 command.c:2711
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "Separador de campos é byte zero.\n"
 
-#: command.c:2634
+#: command.c:2705
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Separador de campos é \"%s\".\n"
 
-#: command.c:2647
+#: command.c:2718
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "Rodapé padrão está habilitado.\n"
 
-#: command.c:2649
+#: command.c:2720
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "Rodapé padrão está desabilitado.\n"
 
-#: command.c:2655
+#: command.c:2726
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Formato de saída é %s.\n"
 
-#: command.c:2661
+#: command.c:2732
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Estilo de linha é %s.\n"
 
-#: command.c:2668
+#: command.c:2739
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Exibição nula é \"%s\".\n"
 
-#: command.c:2676
+#: command.c:2747
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "Formato numérico baseado no idioma está habilitado.\n"
 
-#: command.c:2678
+#: command.c:2749
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "Formato numérico baseado no idioma está desabilitado.\n"
 
-#: command.c:2685
+#: command.c:2756
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "Paginação é usada para saída longa.\n"
 
-#: command.c:2687
+#: command.c:2758
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "Paginação é sempre utilizada.\n"
 
-#: command.c:2689
+#: command.c:2760
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "Uso de paginação está desabilitado.\n"
 
-#: command.c:2695
+#: command.c:2766
 #, c-format
-msgid "Pager won't be used for less than %d lines\n"
-msgstr "Paginação não será utilizada para menos do que %d linhas\n"
+msgid "Pager won't be used for less than %d line.\n"
+msgid_plural "Pager won't be used for less than %d lines.\n"
+msgstr[0] "Paginação não será utilizada para menos do que %d linha.\n"
+msgstr[1] "Paginação não será utilizada para menos do que %d linhas.\n"
 
-#: command.c:2703 command.c:2713
+#: command.c:2776 command.c:2786
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "Separador de registros é byte zero.\n"
 
-#: command.c:2705
+#: command.c:2778
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "Separador de registros é <novalinha>.\n"
 
-#: command.c:2707
+#: command.c:2780
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Separador de registros é \"%s\".\n"
 
-#: command.c:2720
+#: command.c:2793
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "Atributos de tabela são \"%s\".\n"
 
-#: command.c:2723
+#: command.c:2796
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Atributos de tabela não estão definidos.\n"
 
-#: command.c:2730
+#: command.c:2803
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Título é \"%s\".\n"
 
-#: command.c:2732
+#: command.c:2805
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Título não está definido.\n"
 
-#: command.c:2739
+#: command.c:2812
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "Somente tuplas está habilitado.\n"
 
-#: command.c:2741
+#: command.c:2814
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "Somente tuplas está desabilitado.\n"
 
-#: command.c:2747 command.c:2759
-#, fuzzy, c-format
-msgid "Unicode border linestyle is \"%s\".\n"
-msgstr "Estilo de linha de borda unicode é \"%s\".\n"
-
-#: command.c:2753
-#, fuzzy, c-format
-msgid "Unicode column linestyle is \"%s\".\n"
-msgstr "Estilo de linha de coluna unicode é \"%s\".\n"
+#: command.c:2820
+#, c-format
+msgid "Unicode border line style is \"%s\".\n"
+msgstr "Estilo de linha de borda Unicode é \"%s\".\n"
+
+#: command.c:2826
+#, c-format
+msgid "Unicode column line style is \"%s\".\n"
+msgstr "Estilo de linha de coluna Unicode é \"%s\".\n"
 
-#: command.c:2919
+#: command.c:2832
+#, c-format
+msgid "Unicode header line style is \"%s\".\n"
+msgstr "Estilo de linha de cabeçalho Unicode é \"%s\".\n"
+
+#: command.c:2992
 #, c-format
 msgid "\\!: failed\n"
 msgstr "\\!: falhou\n"
 
-#: command.c:2939 common.c:548
+#: command.c:3012 common.c:572
 #, c-format
 msgid "\\watch cannot be used with an empty query\n"
 msgstr "\\watch não pode ser utilizado com uma consulta vazia\n"
 
-#: command.c:2960
+#: command.c:3033
 #, c-format
 msgid "Watch every %lds\t%s"
 msgstr "Observar a cada %lds\t%s"
 
-#: command.c:3011 command.c:3018 common.c:448 common.c:455 common.c:988
+#: command.c:3084 command.c:3091 common.c:472 common.c:479 common.c:1008
 #, c-format
 msgid ""
 "********* QUERY **********\n"
@@ -576,72 +583,72 @@
 "**************************\n"
 "\n"
 
-#: common.c:287
+#: common.c:311
 #, c-format
 msgid "connection to server was lost\n"
 msgstr "conexão com servidor foi perdida\n"
 
-#: common.c:291
+#: common.c:315
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "A conexão com servidor foi perdida. Tentando reiniciar: "
 
-#: common.c:296
+#: common.c:320
 #, c-format
 msgid "Failed.\n"
 msgstr "Falhou.\n"
 
-#: common.c:303
+#: common.c:327
 #, c-format
 msgid "Succeeded.\n"
 msgstr "Sucedido.\n"
 
-#: common.c:403 common.c:759 common.c:927
+#: common.c:427 common.c:779 common.c:947
 #, c-format
 msgid "unexpected PQresultStatus: %d\n"
 msgstr "PQresultStatus inesperado: %d\n"
 
-#: common.c:555
+#: common.c:579
 #, c-format
 msgid "\\watch cannot be used with COPY\n"
 msgstr "\\watch não pode ser utilizado com COPY\n"
 
-#: common.c:560
+#: common.c:584
 #, c-format
 msgid "unexpected result status for \\watch\n"
 msgstr "status de resultado inesperado para \\watch\n"
 
-#: common.c:571 common.c:1146
+#: common.c:595 common.c:1169
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Tempo: %.3f ms\n"
 
-#: common.c:589
+#: common.c:613
 #, c-format
 msgid "Asynchronous notification \"%s\" with payload \"%s\" received from server process with PID %d.\n"
 msgstr "Notificação assíncrona \"%s\" com mensagem \"%s\" recebida do processo do servidor com PID %d.\n"
 
-#: common.c:592
+#: common.c:616
 #, c-format
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "Notificação assíncrona \"%s\" recebida do processo do servidor com PID %d.\n"
 
-#: common.c:654
+#: common.c:674
 #, c-format
 msgid "no rows returned for \\gset\n"
 msgstr "nenhum registro foi retornado para \\gset\n"
 
-#: common.c:659
+#: common.c:679
 #, c-format
 msgid "more than one row returned for \\gset\n"
 msgstr "mais de um registro foi retornado para \\gset\n"
 
-#: common.c:685
+#: common.c:705
 #, c-format
 msgid "could not set variable \"%s\"\n"
 msgstr "não pôde definir variável \"%s\"\n"
 
-#: common.c:970
+#: common.c:990
 #, c-format
 msgid ""
 "***(Single step mode: verify command)*******************************************\n"
@@ -652,17 +659,17 @@
 "%s\n"
 "***(pressione Enter para prosseguir ou digite x e Enter para cancelar)********************\n"
 
-#: common.c:1021
+#: common.c:1043
 #, c-format
-msgid "The server (version %d.%d) does not support savepoints for ON_ERROR_ROLLBACK.\n"
-msgstr "O servidor (versão %d.%d) não suporta pontos de salvamento para ON_ERROR_ROLLBACK.\n"
+msgid "The server (version %s) does not support savepoints for ON_ERROR_ROLLBACK.\n"
+msgstr "O servidor (versão %s) não suporta pontos de salvamento para ON_ERROR_ROLLBACK.\n"
 
-#: common.c:1075
+#: common.c:1098
 #, c-format
 msgid "STATEMENT:  %s\n"
 msgstr "COMANDO:  %s\n"
 
-#: common.c:1118
+#: common.c:1141
 #, c-format
 msgid "unexpected transaction status (%d)\n"
 msgstr "status de transação inesperado (%d)\n"
@@ -682,89 +689,89 @@
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: erro de análise no fim da linha\n"
 
-#: copy.c:330
+#: copy.c:328
 #, c-format
 msgid "could not execute command \"%s\": %s\n"
 msgstr "não pôde executar comando \"%s\": %s\n"
 
-#: copy.c:346
+#: copy.c:344
 #, c-format
 msgid "could not stat file \"%s\": %s\n"
 msgstr "não pôde executar stat no arquivo \"%s\": %s\n"
 
-#: copy.c:350
+#: copy.c:348
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: não pode copiar de/para o diretório\n"
 
-#: copy.c:387
+#: copy.c:385
 #, c-format
 msgid "could not close pipe to external command: %s\n"
 msgstr "não pôde fechar pipe para comando externo: %s\n"
 
-#: copy.c:455 copy.c:466
+#: copy.c:451 copy.c:462
 #, c-format
 msgid "could not write COPY data: %s\n"
 msgstr "não pôde escrever dados utilizando COPY: %s\n"
 
-#: copy.c:473
+#: copy.c:469
 #, c-format
 msgid "COPY data transfer failed: %s"
 msgstr "transferência de dados utilizando COPY falhou: %s"
 
-#: copy.c:534
+#: copy.c:530
 msgid "canceled by user"
 msgstr "cancelado pelo usuário"
 
-#: copy.c:545
+#: copy.c:541
 msgid ""
 "Enter data to be copied followed by a newline.\n"
-"End with a backslash and a period on a line by itself."
+"End with a backslash and a period on a line by itself, or an EOF signal."
 msgstr ""
 "Informe os dados a serem copiados seguido pelo caracter de nova linha.\n"
-"Finalize com uma barra invertida e um ponto na linha."
+"Finalize com uma barra invertida e um ponto na linha ou um sinal EOF."
 
-#: copy.c:674
+#: copy.c:670
 msgid "aborted because of read failure"
 msgstr "interrompido devido a falha de leitura"
 
-#: copy.c:698
+#: copy.c:704
 msgid "trying to exit copy mode"
 msgstr "tentando sair do modo copy"
 
-#: describe.c:71 describe.c:264 describe.c:496 describe.c:626 describe.c:769
-#: describe.c:886 describe.c:956 describe.c:2921 describe.c:3126
-#: describe.c:3216 describe.c:3461 describe.c:3598 describe.c:3827
-#: describe.c:3899 describe.c:3910 describe.c:3969 describe.c:4377
-#: describe.c:4456
+#: describe.c:71 describe.c:270 describe.c:502 describe.c:632 describe.c:775
+#: describe.c:895 describe.c:965 describe.c:2937 describe.c:3142
+#: describe.c:3232 describe.c:3480 describe.c:3620 describe.c:3852
+#: describe.c:3927 describe.c:3938 describe.c:4000 describe.c:4420
+#: describe.c:4503
 msgid "Schema"
 msgstr "Esquema"
 
-#: describe.c:72 describe.c:156 describe.c:164 describe.c:265 describe.c:497
-#: describe.c:627 describe.c:688 describe.c:770 describe.c:957 describe.c:2922
-#: describe.c:3048 describe.c:3127 describe.c:3217 describe.c:3296
-#: describe.c:3462 describe.c:3526 describe.c:3599 describe.c:3828
-#: describe.c:3900 describe.c:3911 describe.c:3970 describe.c:4159
-#: describe.c:4240 describe.c:4454
+#: describe.c:72 describe.c:159 describe.c:167 describe.c:271 describe.c:503
+#: describe.c:633 describe.c:694 describe.c:776 describe.c:966 describe.c:2938
+#: describe.c:3064 describe.c:3143 describe.c:3233 describe.c:3312
+#: describe.c:3481 describe.c:3545 describe.c:3621 describe.c:3853
+#: describe.c:3928 describe.c:3939 describe.c:4001 describe.c:4193
+#: describe.c:4277 describe.c:4501
 msgid "Name"
 msgstr "Nome"
 
-#: describe.c:73 describe.c:277 describe.c:323 describe.c:340
+#: describe.c:73 describe.c:283 describe.c:329 describe.c:346
 msgid "Result data type"
 msgstr "Tipo de dado do resultado"
 
-#: describe.c:81 describe.c:94 describe.c:98 describe.c:278 describe.c:324
-#: describe.c:341
+#: describe.c:81 describe.c:94 describe.c:98 describe.c:284 describe.c:330
+#: describe.c:347
 msgid "Argument data types"
 msgstr "Tipos de dado do argumento"
 
-#: describe.c:105 describe.c:187 describe.c:370 describe.c:545 describe.c:642
-#: describe.c:713 describe.c:959 describe.c:1570 describe.c:2722
-#: describe.c:2955 describe.c:3079 describe.c:3153 describe.c:3226
-#: describe.c:3309 describe.c:3377 describe.c:3469 describe.c:3535
-#: describe.c:3600 describe.c:3736 describe.c:3776 describe.c:3844
-#: describe.c:3903 describe.c:3912 describe.c:3971 describe.c:4185
-#: describe.c:4262 describe.c:4391 describe.c:4457 large_obj.c:289
+#: describe.c:105 describe.c:190 describe.c:376 describe.c:551 describe.c:648
+#: describe.c:719 describe.c:968 describe.c:1581 describe.c:2738
+#: describe.c:2971 describe.c:3095 describe.c:3169 describe.c:3242
+#: describe.c:3325 describe.c:3393 describe.c:3488 describe.c:3554
+#: describe.c:3622 describe.c:3758 describe.c:3798 describe.c:3869
+#: describe.c:3931 describe.c:3940 describe.c:4002 describe.c:4219
+#: describe.c:4299 describe.c:4434 describe.c:4504 large_obj.c:289
 #: large_obj.c:299
 msgid "Description"
 msgstr "Descrição"
@@ -773,863 +780,879 @@
 msgid "List of aggregate functions"
 msgstr "Lista das funções de agregação"
 
-#: describe.c:144
+#: describe.c:146
 #, 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"
+msgid "The server (version %s) does not support tablespaces.\n"
+msgstr "O servidor (versão %s) não suporta tablespaces.\n"
 
-#: describe.c:157 describe.c:165 describe.c:367 describe.c:535 describe.c:689
-#: describe.c:885 describe.c:2931 describe.c:3052 describe.c:3298
-#: describe.c:3527 describe.c:4160 describe.c:4241 large_obj.c:288
+#: describe.c:160 describe.c:168 describe.c:373 describe.c:541 describe.c:695
+#: describe.c:894 describe.c:2947 describe.c:3068 describe.c:3314
+#: describe.c:3546 describe.c:4194 describe.c:4278 large_obj.c:288
 msgid "Owner"
 msgstr "Dono"
 
-#: describe.c:158 describe.c:166
+#: describe.c:161 describe.c:169
 msgid "Location"
 msgstr "Local"
 
-#: describe.c:177 describe.c:2535
+#: describe.c:180 describe.c:2552
 msgid "Options"
 msgstr "Opções"
 
-#: describe.c:182 describe.c:508 describe.c:705 describe.c:2947
-#: describe.c:2951
+#: describe.c:185 describe.c:514 describe.c:711 describe.c:2963
+#: describe.c:2967
 msgid "Size"
 msgstr "Tamanho"
 
-#: describe.c:204
+#: describe.c:207
 msgid "List of tablespaces"
 msgstr "Lista das tablespaces"
 
-#: describe.c:241
+#: describe.c:244
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df só possui as opções [antwS+]\n"
 
-#: describe.c:247
+#: describe.c:252
 #, 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"
+msgid "\\df does not take a \"w\" option with server version %s\n"
+msgstr "\\df não possui a opção \"w\" em um servidor na versão %s.\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:280 describe.c:326 describe.c:343
+#: describe.c:286 describe.c:332 describe.c:349
 msgid "agg"
 msgstr "agr"
 
-#: describe.c:281
+#: describe.c:287
 msgid "window"
 msgstr "deslizante"
 
-#: describe.c:282 describe.c:327 describe.c:344 describe.c:1093
+#: describe.c:288 describe.c:333 describe.c:350 describe.c:1102
 msgid "trigger"
 msgstr "gatilho"
 
-#: describe.c:283 describe.c:328 describe.c:345
+#: describe.c:289 describe.c:334 describe.c:351
 msgid "normal"
 msgstr "normal"
 
-#: describe.c:284 describe.c:329 describe.c:346 describe.c:776 describe.c:895
-#: describe.c:1539 describe.c:2930 describe.c:3128 describe.c:4259
+#: describe.c:290 describe.c:335 describe.c:352 describe.c:782 describe.c:904
+#: describe.c:1550 describe.c:2946 describe.c:3144 describe.c:4296
 msgid "Type"
 msgstr "Tipo"
 
-#: describe.c:360
+#: describe.c:366
 msgid "definer"
 msgstr "definidor"
 
-#: describe.c:361
+#: describe.c:367
 msgid "invoker"
 msgstr "invocador"
 
-#: describe.c:362
+#: describe.c:368
 msgid "Security"
 msgstr "Segurança"
 
-#: describe.c:363
+#: describe.c:369
 msgid "immutable"
 msgstr "imutável"
 
-#: describe.c:364
+#: describe.c:370
 msgid "stable"
 msgstr "estável"
 
-#: describe.c:365
+#: describe.c:371
 msgid "volatile"
 msgstr "volátil"
 
-#: describe.c:366
+#: describe.c:372
 msgid "Volatility"
 msgstr "Volatilidade"
 
-#: describe.c:368
+#: describe.c:374
 msgid "Language"
 msgstr "Linguagem"
 
-#: describe.c:369
+#: describe.c:375
 msgid "Source code"
 msgstr "Código fonte"
 
-#: describe.c:467
+#: describe.c:473
 msgid "List of functions"
 msgstr "Lista de funções"
 
-#: describe.c:507
+#: describe.c:513
 msgid "Internal name"
 msgstr "Nome interno"
 
-#: describe.c:529
+#: describe.c:535
 msgid "Elements"
 msgstr "Elementos"
 
-#: describe.c:585
+#: describe.c:591
 msgid "List of data types"
 msgstr "Lista de tipos de dado"
 
-#: describe.c:628
+#: describe.c:634
 msgid "Left arg type"
 msgstr "Tipo de argumento à esquerda"
 
-#: describe.c:629
+#: describe.c:635
 msgid "Right arg type"
 msgstr "Tipo de argumento à direita"
 
-#: describe.c:630
+#: describe.c:636
 msgid "Result type"
 msgstr "Tipo resultante"
 
-#: describe.c:635 describe.c:3368 describe.c:3735
+#: describe.c:641 describe.c:3384 describe.c:3757
 msgid "Function"
 msgstr "Função"
 
-#: describe.c:660
+#: describe.c:666
 msgid "List of operators"
 msgstr "Lista de operadores"
 
-#: describe.c:690
+#: describe.c:696
 msgid "Encoding"
 msgstr "Codificação"
 
-#: describe.c:695 describe.c:3463
+#: describe.c:701 describe.c:3482
 msgid "Collate"
 msgstr "Collate"
 
-#: describe.c:696 describe.c:3464
+#: describe.c:702 describe.c:3483
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:709
+#: describe.c:715
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:731
+#: describe.c:737
 msgid "List of databases"
 msgstr "Lista dos bancos de dados"
 
-#: describe.c:771 describe.c:888 describe.c:2923
+#: describe.c:777 describe.c:897 describe.c:2939
 msgid "table"
 msgstr "tabela"
 
-#: describe.c:772 describe.c:2924
+#: describe.c:778 describe.c:2940
 msgid "view"
 msgstr "visão"
 
-#: describe.c:773 describe.c:2925
+#: describe.c:779 describe.c:2941
 msgid "materialized view"
 msgstr "visão materializada"
 
-#: describe.c:774 describe.c:890 describe.c:2927
+#: describe.c:780 describe.c:899 describe.c:2943
 msgid "sequence"
 msgstr "sequência"
 
-#: describe.c:775 describe.c:2929
+#: describe.c:781 describe.c:2945
 msgid "foreign table"
 msgstr "tabela externa"
 
-#: describe.c:787
-#, fuzzy
-#| msgid "Column access privileges"
+#: describe.c:793
 msgid "Column privileges"
 msgstr "Privilégios de coluna"
 
-#: describe.c:818
+#: describe.c:824
 msgid "Policies"
 msgstr "Políticas"
 
-#: describe.c:844 describe.c:4601 describe.c:4605
+#: describe.c:850 describe.c:4651 describe.c:4655
 msgid "Access privileges"
 msgstr "Privilégios de acesso"
 
-#: describe.c:873
+#: describe.c:881
 #, 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"
+msgid "The server (version %s) does not support altering default privileges.\n"
+msgstr "O servidor (versão %s) não suporta alteração de privilégios padrão.\n"
 
-#: describe.c:892
+#: describe.c:901
 msgid "function"
 msgstr "função"
 
-#: describe.c:894
+#: describe.c:903
 msgid "type"
 msgstr "tipo"
 
-#: describe.c:918
+#: describe.c:927
 msgid "Default access privileges"
 msgstr "Privilégios de acesso padrão"
 
-#: describe.c:958
+#: describe.c:967
 msgid "Object"
 msgstr "Objeto"
 
-#: describe.c:972
+#: describe.c:981
 msgid "table constraint"
 msgstr "restrição de tabela"
 
-#: describe.c:994
+#: describe.c:1003
 msgid "domain constraint"
 msgstr "restrição de domínio"
 
-#: describe.c:1022
+#: describe.c:1031
 msgid "operator class"
 msgstr "classe de operadores"
 
-#: describe.c:1051
+#: describe.c:1060
 msgid "operator family"
 msgstr "família de operadores"
 
-#: describe.c:1073
+#: describe.c:1082
 msgid "rule"
 msgstr "regra"
 
-#: describe.c:1115
+#: describe.c:1124
 msgid "Object descriptions"
 msgstr "Descrições dos Objetos"
 
-#: describe.c:1169
+#: describe.c:1178
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Não encontrou nenhuma relação chamada \"%s\".\n"
 
-#: describe.c:1378
+#: describe.c:1388
 #, 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:1483
+#: describe.c:1494
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "Tabela unlogged \"%s.%s\""
 
-#: describe.c:1486
+#: describe.c:1497
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabela \"%s.%s\""
 
-#: describe.c:1490
+#: describe.c:1501
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Visão \"%s.%s\""
 
-#: describe.c:1495
+#: describe.c:1506
 #, c-format
 msgid "Unlogged materialized view \"%s.%s\""
 msgstr "Visão materializada unlogged \"%s.%s\""
 
-#: describe.c:1498
+#: describe.c:1509
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Visão materializada \"%s.%s\""
 
-#: describe.c:1502
+#: describe.c:1513
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sequência \"%s.%s\""
 
-#: describe.c:1507
+#: describe.c:1518
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "�ndice unlogged \"%s.%s\""
 
-#: describe.c:1510
+#: describe.c:1521
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "�ndice \"%s.%s\""
 
-#: describe.c:1515
+#: describe.c:1526
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Relação especial \"%s.%s\""
 
-#: describe.c:1519
+#: describe.c:1530
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "tabela TOAST \"%s.%s\""
 
-#: describe.c:1523
+#: describe.c:1534
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Tipo composto \"%s.%s\""
 
-#: describe.c:1527
+#: describe.c:1538
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "Tabela externa \"%s.%s\""
 
-#: describe.c:1538
+#: describe.c:1549
 msgid "Column"
 msgstr "Coluna"
 
-#: describe.c:1547
+#: describe.c:1558
 msgid "Modifiers"
 msgstr "Modificadores"
 
-#: describe.c:1552
+#: describe.c:1563
 msgid "Value"
 msgstr "Valor"
 
-#: describe.c:1555
+#: describe.c:1566
 msgid "Definition"
 msgstr "Definição"
 
-#: describe.c:1558 describe.c:4180 describe.c:4261 describe.c:4329
-#: describe.c:4390
+#: describe.c:1569 describe.c:4214 describe.c:4298 describe.c:4369
+#: describe.c:4433
 msgid "FDW Options"
 msgstr "Opções FDW"
 
-#: describe.c:1562
+#: describe.c:1573
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: describe.c:1565
+#: describe.c:1576
 msgid "Stats target"
 msgstr "Estatísticas"
 
-#: describe.c:1615
+#: describe.c:1626
 #, c-format
 msgid "collate %s"
 msgstr "collate %s"
 
-#: describe.c:1623
+#: describe.c:1634
 msgid "not null"
 msgstr "não nulo"
 
 #. translator: default values of column definitions
-#: describe.c:1633
+#: describe.c:1644
 #, c-format
 msgid "default %s"
 msgstr "valor padrão de %s"
 
-#: describe.c:1748
+#: describe.c:1759
 msgid "primary key, "
 msgstr "chave primária, "
 
-#: describe.c:1750
+#: describe.c:1761
 msgid "unique, "
 msgstr "unicidade, "
 
-#: describe.c:1756
+#: describe.c:1767
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "para tabela \"%s.%s\""
 
-#: describe.c:1760
+#: describe.c:1771
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predicado (%s)"
 
-#: describe.c:1763
+#: describe.c:1774
 msgid ", clustered"
 msgstr ", agrupada"
 
-#: describe.c:1766
+#: describe.c:1777
 msgid ", invalid"
 msgstr ", inválido"
 
-#: describe.c:1769
+#: describe.c:1780
 msgid ", deferrable"
 msgstr ", postergável"
 
-#: describe.c:1772
+#: describe.c:1783
 msgid ", initially deferred"
 msgstr ", inicialmente postergada"
 
-#: describe.c:1775
+#: describe.c:1786
 msgid ", replica identity"
 msgstr ", identidade da réplica"
 
-#: describe.c:1810
+#: describe.c:1821
 #, c-format
 msgid "Owned by: %s"
 msgstr "Dono: %s"
 
-#: describe.c:1870
+#: describe.c:1881
 msgid "Indexes:"
 msgstr "�ndices:"
 
-#: describe.c:1954
+#: describe.c:1965
 msgid "Check constraints:"
 msgstr "Restrições de verificação:"
 
-#: describe.c:1985
+#: describe.c:1996
 msgid "Foreign-key constraints:"
 msgstr "Restrições de chave estrangeira:"
 
-#: describe.c:2016
+#: describe.c:2027
 msgid "Referenced by:"
 msgstr "Referenciada por:"
 
-#: describe.c:2061
+#: describe.c:2072
 msgid "Policies:"
 msgstr "Políticas:"
 
-#: describe.c:2064
-msgid "Policies (Row Security Enabled): (None)"
-msgstr ""
-
-#: describe.c:2067
-msgid "Policies (Row Security Disabled):"
-msgstr ""
+#: describe.c:2075
+msgid "Policies (forced row security enabled):"
+msgstr "Políticas (segurança de registros forçada está habilitada):"
+
+#: describe.c:2078
+msgid "Policies (row security enabled): (none)"
+msgstr "Políticas (segurança de registros está habilitada): (nenhum)"
+
+#: describe.c:2081
+msgid "Policies (forced row security enabled): (none)"
+msgstr "Políticas (segurança de registros forçada está habilitada): (nenhum)"
+
+#: describe.c:2084
+msgid "Policies (row security disabled):"
+msgstr "Políticas (segurança de registros está desabilitada):"
 
-#: describe.c:2167 describe.c:2217
+#: describe.c:2184 describe.c:2234
 msgid "Rules:"
 msgstr "Regras:"
 
-#: describe.c:2170
+#: describe.c:2187
 msgid "Disabled rules:"
 msgstr "Regras desabilitadas:"
 
-#: describe.c:2173
+#: describe.c:2190
 msgid "Rules firing always:"
 msgstr "Regras sempre disparadas:"
 
-#: describe.c:2176
+#: describe.c:2193
 msgid "Rules firing on replica only:"
 msgstr "Regras somente disparadas na réplica:"
 
-#: describe.c:2200
+#: describe.c:2217
 msgid "View definition:"
 msgstr "Definição da visão:"
 
-#: describe.c:2335
+#: describe.c:2352
 msgid "Triggers:"
 msgstr "Gatilhos:"
 
-#: describe.c:2339
+#: describe.c:2356
 msgid "Disabled user triggers:"
 msgstr "Gatilhos de usuário desabilitados:"
 
-#: describe.c:2341
+#: describe.c:2358
 msgid "Disabled triggers:"
 msgstr "Gatilhos desabilitados:"
 
-#: describe.c:2344
+#: describe.c:2361
 msgid "Disabled internal triggers:"
 msgstr "Gatilhos internos desabilitados:"
 
-#: describe.c:2347
+#: describe.c:2364
 msgid "Triggers firing always:"
 msgstr "Gatilhos sempre disparados:"
 
-#: describe.c:2350
+#: describe.c:2367
 msgid "Triggers firing on replica only:"
 msgstr "Gatilhos disparados somente na réplica:"
 
-#: describe.c:2429
+#: describe.c:2424
+#, c-format
+msgid "Server: %s"
+msgstr "Servidor: %s"
+
+#: describe.c:2432
+#, c-format
+msgid "FDW Options: (%s)"
+msgstr "Opções FDW: (%s)"
+
+#: describe.c:2446
 msgid "Inherits"
 msgstr "Heranças"
 
-#: describe.c:2468
+#: describe.c:2485
 #, 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:2475
+#: describe.c:2492
 msgid "Child tables"
 msgstr "Tabelas descendentes"
 
-#: describe.c:2497
+#: describe.c:2514
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Tabela protótipo de tipo: %s"
 
-#: describe.c:2511
+#: describe.c:2528
 msgid "Replica Identity"
 msgstr "Identidade da Réplica"
 
-#: describe.c:2524
+#: describe.c:2541
 msgid "Has OIDs: yes"
 msgstr "Têm OIDs: sim"
 
-#: describe.c:2613
+#: describe.c:2629
 #, 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:2625
+#: describe.c:2641
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace \"%s\""
 
-#: describe.c:2715
+#: describe.c:2731
 msgid "List of roles"
 msgstr "Lista de roles"
 
-#: describe.c:2717
+#: describe.c:2733
 msgid "Role name"
 msgstr "Nome da role"
 
-#: describe.c:2718
+#: describe.c:2734
 msgid "Attributes"
 msgstr "Atributos"
 
-#: describe.c:2719
+#: describe.c:2735
 msgid "Member of"
 msgstr "Membro de"
 
-#: describe.c:2730
+#: describe.c:2746
 msgid "Superuser"
 msgstr "Super-usuário"
 
-#: describe.c:2733
+#: describe.c:2749
 msgid "No inheritance"
 msgstr "Nenhuma herança"
 
-#: describe.c:2736
+#: describe.c:2752
 msgid "Create role"
 msgstr "Cria role"
 
-#: describe.c:2739
+#: describe.c:2755
 msgid "Create DB"
 msgstr "Cria BD"
 
-#: describe.c:2742
+#: describe.c:2758
 msgid "Cannot login"
 msgstr "Não pode efetuar login"
 
-#: describe.c:2746
+#: describe.c:2762
 msgid "Replication"
 msgstr "Replicação"
 
-#: describe.c:2750
+#: describe.c:2766
 msgid "Bypass RLS"
-msgstr ""
+msgstr "Ignora RLS"
 
-#: describe.c:2759
+#: describe.c:2775
 msgid "No connections"
 msgstr "Nenhuma conexão"
 
-#: describe.c:2761
+#: describe.c:2777
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d conexão"
 msgstr[1] "%d conexões"
 
-#: describe.c:2771
+#: describe.c:2787
 msgid "Password valid until "
 msgstr "Senha valida até "
 
-#: describe.c:2827
+#: describe.c:2843
 msgid "Role"
 msgstr "Role"
 
-#: describe.c:2828
+#: describe.c:2844
 msgid "Database"
 msgstr "Banco de Dados"
 
-#: describe.c:2829
+#: describe.c:2845
 msgid "Settings"
 msgstr "Definições"
 
-#: describe.c:2839
+#: describe.c:2855
 #, 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:2850
+#: describe.c:2866
 #, c-format
 msgid "No matching settings found.\n"
 msgstr "Nenhuma configuração correspondente foi encontrada.\n"
 
-#: describe.c:2852
+#: describe.c:2868
 #, c-format
 msgid "No settings found.\n"
 msgstr "Nenhuma configuração foi encontrada.\n"
 
-#: describe.c:2857
+#: describe.c:2873
 msgid "List of settings"
 msgstr "Lista de configurações"
 
-#: describe.c:2926
+#: describe.c:2942
 msgid "index"
 msgstr "índice"
 
-#: describe.c:2928
+#: describe.c:2944
 msgid "special"
 msgstr "especial"
 
-#: describe.c:2936 describe.c:4378
+#: describe.c:2952 describe.c:4421
 msgid "Table"
 msgstr "Tabela"
 
-#: describe.c:3012
+#: describe.c:3028
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "Nenhuma relação correspondente foi encontrada.\n"
 
-#: describe.c:3014
+#: describe.c:3030
 #, c-format
 msgid "No relations found.\n"
 msgstr "Nenhuma relação foi encontrada.\n"
 
-#: describe.c:3019
+#: describe.c:3035
 msgid "List of relations"
 msgstr "Lista de relações"
 
-#: describe.c:3056
+#: describe.c:3072
 msgid "Trusted"
 msgstr "Confiável"
 
-#: describe.c:3064
+#: describe.c:3080
 msgid "Internal Language"
 msgstr "Linguagem Interna"
 
-#: describe.c:3065
+#: describe.c:3081
 msgid "Call Handler"
 msgstr "Manipulador de Chamada"
 
-#: describe.c:3066 describe.c:4167
+#: describe.c:3082 describe.c:4201
 msgid "Validator"
 msgstr "Validador"
 
-#: describe.c:3069
+#: describe.c:3085
 msgid "Inline Handler"
 msgstr "Manipulador de Código Embutido"
 
-#: describe.c:3097
+#: describe.c:3113
 msgid "List of languages"
 msgstr "Lista de linguagens"
 
-#: describe.c:3141
+#: describe.c:3157
 msgid "Modifier"
 msgstr "Modificador"
 
-#: describe.c:3142
+#: describe.c:3158
 msgid "Check"
 msgstr "Verificação"
 
-#: describe.c:3184
+#: describe.c:3200
 msgid "List of domains"
 msgstr "Lista de domínios"
 
-#: describe.c:3218
+#: describe.c:3234
 msgid "Source"
 msgstr "Fonte"
 
-#: describe.c:3219
+#: describe.c:3235
 msgid "Destination"
 msgstr "Destino"
 
-#: describe.c:3220 describe.c:3369
+#: describe.c:3236 describe.c:3385
 msgid "no"
 msgstr "não"
 
-#: describe.c:3220 describe.c:3371
+#: describe.c:3236 describe.c:3387
 msgid "yes"
 msgstr "sim"
 
-#: describe.c:3221
+#: describe.c:3237
 msgid "Default?"
 msgstr "Padrão?"
 
-#: describe.c:3258
+#: describe.c:3274
 msgid "List of conversions"
 msgstr "Lista de conversões"
 
-#: describe.c:3297
+#: describe.c:3313
 msgid "Event"
 msgstr "Evento"
 
-#: describe.c:3299
+#: describe.c:3315
 msgid "enabled"
 msgstr "habilitado"
 
-#: describe.c:3300
+#: describe.c:3316
 msgid "replica"
 msgstr "réplica"
 
-#: describe.c:3301
+#: describe.c:3317
 msgid "always"
 msgstr "sempre"
 
-#: describe.c:3302
+#: describe.c:3318
 msgid "disabled"
 msgstr "desabilitado"
 
-#: describe.c:3303
+#: describe.c:3319
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: describe.c:3304
+#: describe.c:3320
 msgid "Procedure"
 msgstr "Procedimento"
 
-#: describe.c:3305
+#: describe.c:3321
 msgid "Tags"
 msgstr "Marcadores"
 
-#: describe.c:3324
+#: describe.c:3340
 msgid "List of event triggers"
 msgstr "Lista de gatilhos de eventos"
 
-#: describe.c:3366
+#: describe.c:3382
 msgid "Source type"
 msgstr "Tipo fonte"
 
-#: describe.c:3367
+#: describe.c:3383
 msgid "Target type"
 msgstr "Tipo alvo"
 
-#: describe.c:3370
+#: describe.c:3386
 msgid "in assignment"
 msgstr "em atribuição"
 
-#: describe.c:3372
+#: describe.c:3388
 msgid "Implicit?"
 msgstr "Implícito?"
 
-#: describe.c:3423
+#: describe.c:3439
 msgid "List of casts"
 msgstr "Lista de conversões de tipos"
 
-#: describe.c:3449
+#: describe.c:3467
 #, c-format
-msgid "The server (version %d.%d) does not support collations.\n"
-msgstr "O servidor (versão %d.%d) não suporta ordenações.\n"
+msgid "The server (version %s) does not support collations.\n"
+msgstr "O servidor (versão %s) não suporta ordenações (collations).\n"
 
-#: describe.c:3499
+#: describe.c:3518
 msgid "List of collations"
 msgstr "Lista de ordenações"
 
-#: describe.c:3558
+#: describe.c:3577
 msgid "List of schemas"
 msgstr "Lista de esquemas"
 
-#: describe.c:3581 describe.c:3816 describe.c:3884 describe.c:3952
+#: describe.c:3602 describe.c:3840 describe.c:3911 describe.c:3982
 #, 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"
+msgid "The server (version %s) does not support full text search.\n"
+msgstr "O servidor (versão %s) não suporta busca textual.\n"
 
-#: describe.c:3615
+#: describe.c:3637
 msgid "List of text search parsers"
 msgstr "Lista de analisadores de busca textual"
 
-#: describe.c:3658
+#: describe.c:3680
 #, 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:3733
+#: describe.c:3755
 msgid "Start parse"
 msgstr "Iniciar análise"
 
-#: describe.c:3734
+#: describe.c:3756
 msgid "Method"
 msgstr "Método"
 
-#: describe.c:3738
+#: describe.c:3760
 msgid "Get next token"
 msgstr "Obter próximo elemento"
 
-#: describe.c:3740
+#: describe.c:3762
 msgid "End parse"
 msgstr "Terminar análise"
 
-#: describe.c:3742
+#: describe.c:3764
 msgid "Get headline"
 msgstr "Obter destaque"
 
-#: describe.c:3744
+#: describe.c:3766
 msgid "Get token types"
 msgstr "Obter tipos de elemento"
 
-#: describe.c:3754
+#: describe.c:3776
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analisador de busca textual \"%s.%s\""
 
-#: describe.c:3756
+#: describe.c:3778
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analisador de busca textual \"%s\""
 
-#: describe.c:3775
+#: describe.c:3797
 msgid "Token name"
 msgstr "Nome do elemento"
 
-#: describe.c:3786
+#: describe.c:3808
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tipos de elemento para analisador \"%s.%s\""
 
-#: describe.c:3788
+#: describe.c:3810
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tipos de elemento para analisador \"%s\""
 
-#: describe.c:3838
+#: describe.c:3863
 msgid "Template"
 msgstr "Modelo"
 
-#: describe.c:3839
+#: describe.c:3864
 msgid "Init options"
 msgstr "Opções de inicialização"
 
-#: describe.c:3861
+#: describe.c:3886
 msgid "List of text search dictionaries"
 msgstr "Lista de dicionários de busca textual"
 
-#: describe.c:3901
+#: describe.c:3929
 msgid "Init"
 msgstr "Inicializador"
 
-#: describe.c:3902
+#: describe.c:3930
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:3929
+#: describe.c:3957
 msgid "List of text search templates"
 msgstr "Lista de modelos de busca textual"
 
-#: describe.c:3986
+#: describe.c:4017
 msgid "List of text search configurations"
 msgstr "Lista de configurações de busca textual"
 
-#: describe.c:4030
+#: describe.c:4061
 #, 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:4096
+#: describe.c:4127
 msgid "Token"
 msgstr "Elemento"
 
-#: describe.c:4097
+#: describe.c:4128
 msgid "Dictionaries"
 msgstr "Dicionários"
 
-#: describe.c:4108
+#: describe.c:4139
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Configuração de busca textual \"%s.%s\""
 
-#: describe.c:4111
+#: describe.c:4142
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Configuração de busca textual \"%s\""
 
-#: describe.c:4115
+#: describe.c:4146
 #, c-format
 msgid ""
 "\n"
@@ -1638,7 +1661,7 @@
 "\n"
 "Analisador: \"%s.%s\""
 
-#: describe.c:4118
+#: describe.c:4149
 #, c-format
 msgid ""
 "\n"
@@ -1647,86 +1670,86 @@
 "\n"
 "Analisador: \"%s\""
 
-#: describe.c:4150
+#: describe.c:4183
 #, 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"
+msgid "The server (version %s) does not support foreign-data wrappers.\n"
+msgstr "O servidor (versão %s) não suporta adaptadores de dados externos.\n"
 
-#: describe.c:4164
+#: describe.c:4198
 msgid "Handler"
 msgstr "Manipulador"
 
-#: describe.c:4207
+#: describe.c:4241
 msgid "List of foreign-data wrappers"
 msgstr "Lista de adaptadores de dados externos"
 
-#: describe.c:4230
+#: describe.c:4266
 #, 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"
+msgid "The server (version %s) does not support foreign servers.\n"
+msgstr "O servidor (versão %s) não suporta servidores externos.\n"
 
-#: describe.c:4242
+#: describe.c:4279
 msgid "Foreign-data wrapper"
 msgstr "Adaptador de dados externos"
 
-#: describe.c:4260 describe.c:4455
+#: describe.c:4297 describe.c:4502
 msgid "Version"
 msgstr "Versão"
 
-#: describe.c:4286
+#: describe.c:4323
 msgid "List of foreign servers"
 msgstr "Lista de servidores externos"
 
-#: describe.c:4309
+#: describe.c:4348
 #, 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"
+msgid "The server (version %s) does not support user mappings.\n"
+msgstr "O servidor (versão %s) não suporta mapeamentos de usuários.\n"
 
-#: describe.c:4318 describe.c:4379
+#: describe.c:4358 describe.c:4422
 msgid "Server"
 msgstr "Servidor"
 
-#: describe.c:4319
+#: describe.c:4359
 msgid "User name"
 msgstr "Nome de usuário"
 
-#: describe.c:4344
+#: describe.c:4384
 msgid "List of user mappings"
 msgstr "Lista de mapeamentos de usuários"
 
-#: describe.c:4367
+#: describe.c:4409
 #, 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"
+msgid "The server (version %s) does not support foreign tables.\n"
+msgstr "O servidor (versão %s) não suporta tabelas externas.\n"
 
-#: describe.c:4418
+#: describe.c:4462
 msgid "List of foreign tables"
 msgstr "Lista de tabelas externas"
 
-#: describe.c:4441 describe.c:4495
+#: describe.c:4487 describe.c:4544
 #, 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"
+msgid "The server (version %s) does not support extensions.\n"
+msgstr "O servidor (versão %s) não suporta extensões.\n"
 
-#: describe.c:4472
+#: describe.c:4519
 msgid "List of installed extensions"
 msgstr "Lista de extensões instaladas"
 
-#: describe.c:4522
+#: describe.c:4572
 #, c-format
 msgid "Did not find any extension named \"%s\".\n"
 msgstr "Não encontrou nenhuma extensão chamada \"%s\".\n"
 
-#: describe.c:4525
+#: describe.c:4575
 #, c-format
 msgid "Did not find any extensions.\n"
 msgstr "Não encontrou nenhuma extensão.\n"
 
-#: describe.c:4569
+#: describe.c:4619
 msgid "Object Description"
 msgstr "Descrição do Objeto"
 
-#: describe.c:4578
+#: describe.c:4628
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Objetos na extensão \"%s\""
@@ -1742,7 +1765,7 @@
 "psql is the PostgreSQL interactive terminal.\n"
 "\n"
 msgstr ""
-"psql é o terminal iterativo do PostgreSQL.\n"
+"psql é o terminal interativo do PostgreSQL.\n"
 "\n"
 
 #: help.c:71 help.c:314 help.c:347 help.c:374
@@ -1785,10 +1808,7 @@
 msgstr "  -l, --list               lista os bancos de dados disponíveis e termina\n"
 
 #: help.c:83
-#, fuzzy, c-format
-#| msgid ""
-#| "  -v, --set=, --variable=NAME=VALUE\n"
-#| "                           set psql variable NAME to VALUE\n"
+#, c-format
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
 "                           set psql variable NAME to VALUE\n"
@@ -1796,6 +1816,7 @@
 msgstr ""
 "  -v, --set=, --variable=NOME=VALOR\n"
 "                           define variável do psql NOME como VALOR\n"
+"                           (e.g., -v ON_ERROR_STOP=1)\n"
 
 #: help.c:86
 #, c-format
@@ -1817,21 +1838,19 @@
 "                           executa como uma transação única (se não interativo)\n"
 
 #: help.c:90
-#, fuzzy, c-format
+#, c-format
 msgid "  -?, --help[=options]     show this help, then exit\n"
-msgstr "  -?, --help[=opções]      mostra essa ajuda e termina\n"
+msgstr "  -?, --help[=options]     mostra essa ajuda e termina\n"
 
 #: help.c:91
-#, fuzzy, c-format
-#| msgid "  -?, --help       show this help, then exit\n"
+#, c-format
 msgid "      --help=commands      list backslash commands, then exit\n"
-msgstr "  -?, --help       mostra essa ajuda e termina\n"
+msgstr "  -?, --help=commands      mostra comandos de barra invertida e termina\n"
 
 #: help.c:92
-#, fuzzy, c-format
-#| msgid "  -?, --help       show this help, then exit\n"
+#, c-format
 msgid "      --help=variables     list special variables, then exit\n"
-msgstr "  -?, --help       mostra essa ajuda e termina\n"
+msgstr "  -?, --help=variables     mostra variáveis especiais e termina\n"
 
 #: help.c:94
 #, c-format
@@ -1848,8 +1867,7 @@
 msgstr "  -a, --echo-all           mostra toda entrada do script\n"
 
 #: help.c:96
-#, fuzzy, c-format
-#| msgid "  -e, --echo-queries       echo commands sent to server\n"
+#, c-format
 msgid "  -b, --echo-errors        echo failed commands\n"
 msgstr "  -b, --echo-errors        mostra comandos que falharam\n"
 
@@ -2063,19 +2081,18 @@
 
 #: help.c:176
 #, c-format
-msgid "  \\? [commands]          description of all psql backslash commands\n"
-msgstr ""
+msgid "  \\? [commands]          show help on backslash commands\n"
+msgstr "  \\? [commands]          mostra ajuda sobre comandos de barra invertida\n"
 
 #: help.c:177
 #, c-format
-msgid "  \\? options             description of all psql commandline options\n"
-msgstr ""
+msgid "  \\? options             show help on psql command-line options\n"
+msgstr "  \\? options             mostra ajuda sobre opções de linha de comando do psql\n"
 
 #: help.c:178
-#, fuzzy, c-format
-#| msgid "  --sysconfdir          show location of system-wide configuration files\n"
-msgid "  \\? variables           description of all psql configuration variables\n"
-msgstr "  \\? variáveis           descrição de todas as variáveis de configuração do psql\n"
+#, c-format
+msgid "  \\? variables           show help on special variables\n"
+msgstr "  \\? variables           mostra ajuda sobre variáveis especiais\n"
 
 #: help.c:179
 #, c-format
@@ -2130,7 +2147,7 @@
 #: help.c:195
 #, c-format
 msgid "  \\echo [STRING]         write string to standard output\n"
-msgstr "  \\echo [TEXTO]         escreve cadeia de caracteres na saída padrão\n"
+msgstr "  \\echo [TEXTO]          escreve cadeia de caracteres na saída padrão\n"
 
 #: help.c:196
 #, c-format
@@ -2300,7 +2317,7 @@
 #: help.c:231
 #, 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"
+msgstr "  \\drds  [MOD1 [MOD2]]   lista configurações de roles por banco de dados\n"
 
 #: help.c:232
 #, c-format
@@ -2390,7 +2407,7 @@
 "                         numericlocale|recordsep|recordsep_zero|tuples_only|title|tableattr|pager|\n"
 "                         unicode_border_linestyle|unicode_column_linestyle|unicode_header_linestyle})\n"
 msgstr ""
-"  \\pset [NOME [VALOR]]  define opção de saída da tabela\n"
+"  \\pset [NOME [VALOR]]   define opção de saída da tabela\n"
 "                         (NOME := {format|border|expanded|fieldsep|fieldsep_zero|footer|null|\n"
 "                         numericlocale|recordsep|recordsep_zero|tuples_only|title|tableattr|pager|\n"
 "                         unicode_border_linestyle|unicode_column_linestyle|unicode_header_linestyle})\n"
@@ -2416,28 +2433,22 @@
 msgstr "Conexão\n"
 
 #: help.c:264
-#, fuzzy, c-format
-#| msgid ""
-#| "  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
-#| "                         connect to new database (currently \"%s\")\n"
+#, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently \"%s\")\n"
 msgstr ""
 "  \\c[onnect] {[NOMEBD|- USU�RIO|- M�QUINA|- PORTA|-] | conninfo}\n"
-"                         conecta a um outro banco de dados (atual \"%s\")\n"
+"                         conecta a um novo banco de dados (atualmente \"%s\")\n"
 
 #: help.c:268
-#, fuzzy, c-format
-#| msgid ""
-#| "  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
-#| "                         connect to new database (currently no connection)\n"
+#, c-format
 msgid ""
 "  \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
 "                         connect to new database (currently no connection)\n"
 msgstr ""
 "  \\c[onnect] {[NOMEBD|- USU�RIO|- M�QUINA|- PORTA|-] | conninfo}\n"
-"                         conecta a um banco de dados novo (atualmente nenhuma conexão)\n"
+"                         conecta a um novo banco de dados (atualmente nenhuma conexão)\n"
 
 #: help.c:270
 #, c-format
@@ -2477,7 +2488,7 @@
 #: help.c:280
 #, c-format
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
-msgstr "  \\! [COMANDO]           executa comando na shell ou inicia shell iterativa\n"
+msgstr "  \\! [COMANDO]           executa comando na shell ou inicia shell interativa\n"
 
 #: help.c:283
 #, c-format
@@ -2519,8 +2530,12 @@
 
 #: help.c:311
 #, c-format
-msgid "List of specially treated variables.\n"
+msgid ""
+"List of specially treated variables\n"
+"\n"
 msgstr ""
+"Lista de variáveis com tratamento especial\n"
+"\n"
 
 #: help.c:313
 #, c-format
@@ -2531,50 +2546,54 @@
 #, c-format
 msgid ""
 "  psql --set=NAME=VALUE\n"
-"  or \\set NAME VALUE in interactive mode\n"
+"  or \\set NAME VALUE inside psql\n"
 "\n"
 msgstr ""
 "  psql --set=NOME=VALOR\n"
-"  ou \\set NOME VALOR no modo interativo\n"
+"  ou \\set NOME VALOR no psql\n"
 "\n"
 
 #: help.c:317
 #, c-format
 msgid "  AUTOCOMMIT         if set, successful SQL commands are automatically committed\n"
-msgstr ""
+msgstr "  AUTOCOMMIT         se definido, comandos SQL bem sucedidos são automaticamente efetivados\n"
 
 #: help.c:318
 #, c-format
 msgid ""
-"  COMP_KEYWORD_CASE  determine the case used to complete SQL keywords\n"
+"  COMP_KEYWORD_CASE  determines the case used to complete SQL key words\n"
 "                     [lower, upper, preserve-lower, preserve-upper]\n"
 msgstr ""
+"  COMP_KEYWORD_CASE  determina o uso de maiúsculas/minúsculas para completar palavras chave SQL\n"
+"                     [lower, upper, preserve-lower, preserve-upper]\n"
 
 #: help.c:320
-#, fuzzy, c-format
-#| msgid "  -d, --dbname=NAME        connect to database name\n"
+#, c-format
 msgid "  DBNAME             the currently connected database name\n"
-msgstr "  -d, --dbname=NOME        conecta ao banco de dados informado\n"
+msgstr "  NOMEBD             o nome do banco de dados atualmente conectado\n"
 
 #: help.c:321
 #, c-format
 msgid ""
-"  ECHO               control what input is written to standard output\n"
+"  ECHO               controls what input is written to standard output\n"
 "                     [all, errors, none, queries]\n"
 msgstr ""
+"  ECHO               controla que entrada é escrita na saída padrão\n"
+"                     [all, errors, none, queries]\n"
 
 #: help.c:323
 #, c-format
 msgid ""
-"  ECHO_HIDDEN        display internal queries executed by backslash commands when it is set\n"
-"                     or with [noexec] just show without execution\n"
+"  ECHO_HIDDEN        if set, display internal queries executed by backslash commands;\n"
+"                     if set to \"noexec\", just show without execution\n"
 msgstr ""
+"  ECHO_HIDDEN        se definido, mostra consultas internas executadas por comandos de barra invertida;\n"
+"                     se definido para \"noexec\", apenas mostre sem executar\n"
 
 #: help.c:325
-#, fuzzy, c-format
-#| msgid "Sets the client's character set encoding."
+#, c-format
 msgid "  ENCODING           current client character set encoding\n"
-msgstr "Define a codificação do conjunto de caracteres do cliente."
+msgstr "  ENCODING           codificação do conjunto de caracteres do cliente atual\n"
 
 #: help.c:326
 #, c-format
@@ -2582,169 +2601,158 @@
 "  FETCH_COUNT        the number of result rows to fetch and display at a time\n"
 "                     (default: 0=unlimited)\n"
 msgstr ""
+"  FETCH_COUNT        o número de registros a serem buscados e mostrados por vez\n"
+"                     (padrão: 0=ilimitado)\n"
 
 #: help.c:328
 #, c-format
-msgid "  HISTCONTROL        control history list [ignorespace, ignoredups, ignoreboth]\n"
-msgstr ""
+msgid "  HISTCONTROL        controls command history [ignorespace, ignoredups, ignoreboth]\n"
+msgstr "  HISTCONTROL        controla histórico de comandos [ignorespace, ignoredups, ignoreboth]\n"
 
 #: help.c:329
 #, c-format
-msgid "  HISTFILE           file name used to store the history list\n"
-msgstr ""
+msgid "  HISTFILE           file name used to store the command history\n"
+msgstr "  HISTFILE           nome do arquivo utilizado para armazenar o histórico de comandos\n"
 
 #: help.c:330
 #, c-format
 msgid "  HISTSIZE           the number of commands to store in the command history\n"
-msgstr ""
+msgstr "  HISTSIZE           o número de comandos para armazenar no histórico de comandos\n"
 
 #: help.c:331
-#, fuzzy, c-format
-#| msgid "  -C, --create                 create the target database\n"
-msgid "  HOST               the currently connected database server\n"
-msgstr "  -C, --create                 cria o banco de dados informado\n"
+#, c-format
+msgid "  HOST               the currently connected database server host\n"
+msgstr "  HOST               a máquina do servidor de banco de dados atualmente conectado\n"
 
 #: help.c:332
 #, c-format
 msgid "  IGNOREEOF          if unset, sending an EOF to interactive session terminates application\n"
-msgstr ""
+msgstr "  IGNOREEOF          se não for definido, enviar um EOF para sessão interativa termina a aplicação\n"
 
 #: help.c:333
-#, fuzzy, c-format
-#| msgid "  -o OID           set next OID\n"
-msgid "  LASTOID            the value of last affected OID\n"
-msgstr "  -o OID           define próximo OID\n"
+#, c-format
+msgid "  LASTOID            value of the last affected OID\n"
+msgstr "  LASTOID            valor do último OID afetado\n"
 
 #: help.c:334
 #, c-format
-msgid "  ON_ERROR_ROLLBACK  if set, an error doesn't stop a transaction (uses implicit SAVEPOINTs)\n"
-msgstr ""
+msgid "  ON_ERROR_ROLLBACK  if set, an error doesn't stop a transaction (uses implicit savepoints)\n"
+msgstr "  ON_ERROR_ROLLBACK  se definido, um erro não termina a transação (usa pontos de salvamento implícitos)\n"
 
 #: help.c:335
 #, c-format
 msgid "  ON_ERROR_STOP      stop batch execution after error\n"
-msgstr ""
+msgstr "  ON_ERROR_STOP      termina a execução em lote após erro\n"
 
 #: help.c:336
-#, fuzzy, c-format
-#| msgid "  \\conninfo              display information about current connection\n"
+#, c-format
 msgid "  PORT               server port of the current connection\n"
-msgstr "  \\conninfo              mostra informação sobre conexão atual\n"
+msgstr "  PORT               porta do servidor da conexão atual\n"
 
 #: help.c:337
 #, c-format
-msgid "  PROMPT1            specify the standard psql prompt\n"
-msgstr ""
+msgid "  PROMPT1            specifies the standard psql prompt\n"
+msgstr "  PROMPT1            especifica o prompt padrão do psql\n"
 
 #: help.c:338
 #, c-format
-msgid "  PROMPT2            specify the prompt used when a statement continues from a previous line\n"
-msgstr ""
+msgid "  PROMPT2            specifies the prompt used when a statement continues from a previous line\n"
+msgstr "  PROMPT2            especifica o prompt utilizado quando o comando continua a partir de uma linha anterior\n"
 
 #: help.c:339
 #, c-format
-msgid "  PROMPT3            specify the prompt used during COPY ... FROM STDIN\n"
-msgstr ""
+msgid "  PROMPT3            specifies the prompt used during COPY ... FROM STDIN\n"
+msgstr "  PROMPT3            especifica o prompt utilizado durante COPY ... FROM STDIN\n"
 
 #: help.c:340
-#, fuzzy, c-format
-#| msgid "  -q, --quiet              run quietly (no messages, only query output)\n"
+#, c-format
 msgid "  QUIET              run quietly (same as -q option)\n"
-msgstr "  -q, --quiet              executa silenciosamente (sem mensagens, somente saída da consulta)\n"
+msgstr "  QUIET              executa silenciosamente (mesmo que a opção -q)\n"
 
 #: help.c:341
 #, c-format
 msgid "  SINGLELINE         end of line terminates SQL command mode (same as -S option)\n"
-msgstr ""
+msgstr "  SINGLELINE         modo cujo fim da linha termina comando SQL (mesmo que a opção -S)\n"
 
 #: help.c:342
 #, c-format
 msgid "  SINGLESTEP         single-step mode (same as -s option)\n"
-msgstr ""
+msgstr "  SINGLESTEP         modo passo-a-passo (mesmo que a opção -s)\n"
 
 #: help.c:343
-#, fuzzy, c-format
-#| msgid "  -C, --create                 create the target database\n"
+#, c-format
 msgid "  USER               the currently connected database user\n"
-msgstr "  -C, --create                 cria o banco de dados informado\n"
+msgstr "  USER               o usuário de banco de dados atualmente contectado\n"
 
 #: help.c:344
 #, c-format
-msgid "  VERBOSITY          control verbosity of error reports [default, verbose, terse]\n"
-msgstr ""
+msgid "  VERBOSITY          controls verbosity of error reports [default, verbose, terse]\n"
+msgstr "  VERBOSITY          controla detalhamento das mensagens de erro [default, verbose, terse]\n"
 
 #: help.c:346
 #, c-format
 msgid ""
 "\n"
-"Display influencing variables:\n"
+"Display settings:\n"
 msgstr ""
+"\n"
+"Exibe configurações:\n"
 
 #: help.c:348
 #, c-format
 msgid ""
 "  psql --pset=NAME[=VALUE]\n"
-"  or \\pset NAME [VALUE] in interactive mode\n"
+"  or \\pset NAME [VALUE] inside psql\n"
 "\n"
 msgstr ""
+"  psql --pset=NOME[=VALOR]\n"
+"  ou \\pset NOME [VALOR] no psql\n"
+"\n"
 
 #: help.c:350
 #, c-format
 msgid "  border             border style (number)\n"
-msgstr ""
+msgstr "  border             estilo de borda (número)\n"
 
 #: help.c:351
 #, c-format
-msgid "  columns            set the target width for the wrapped format\n"
-msgstr ""
+msgid "  columns            target width for the wrapped format\n"
+msgstr "  columns            largura para o formato de quebra automática\n"
 
 #: help.c:352
-#, fuzzy, c-format
-#| msgid "  -x, --expanded           turn on expanded table output\n"
-msgid "  expanded (or x)    toggle expanded output\n"
-msgstr "  -x, --expanded           habilita saída em tabela expandida\n"
+#, c-format
+msgid "  expanded (or x)    expanded output [on, off, auto]\n"
+msgstr "  expanded (ou x)    saída em tabela expandida [on, off, auto]\n"
 
 #: help.c:353
-#, fuzzy, c-format
-#| msgid ""
-#| "  -F, --field-separator=STRING\n"
-#| "                           field separator for unaligned output (default: \"%s\")\n"
-msgid "  fieldsep           field separator for unaligned output (default '|')\n"
-msgstr ""
-"  -F, --field-separator=SEPARADOR\n"
-"                           define separador de campos para modo de saída desalinhado (padrão: \"%s\")\n"
+#, c-format
+msgid "  fieldsep           field separator for unaligned output (default \"%s\")\n"
+msgstr "  fieldsep           separador de campos para modo de saída desalinhado (padrão \"%s\")\n"
 
 #: help.c:354
-#, fuzzy, c-format
-#| msgid ""
-#| "  -z, --field-separator-zero\n"
-#| "                           set field separator for unaligned output to zero byte\n"
-msgid "  fieldsep_zero      set field separator in unaligned mode to zero\n"
-msgstr ""
-"  -z, --field-separator-zero\n"
-"                           define separador de campos para modo de saída desalinhado como byte zero\n"
+#, c-format
+msgid "  fieldsep_zero      set field separator for unaligned output to zero byte\n"
+msgstr "  fieldsep_zero      define separador de campos para modo de saída desalinhado como byte zero\n"
 
 #: help.c:355
-#, fuzzy, c-format
-#| msgid "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n"
+#, c-format
 msgid "  format             set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
-msgstr "\\pset: formatos permitidos são unaligned, aligned, wrapped, html, latex, troff-ms\n"
+msgstr "  format             define formato de saída [unaligned, aligned, wrapped, html, asciidoc, ...]\n"
 
 #: help.c:356
 #, c-format
 msgid "  footer             enable or disable display of the table footer [on, off]\n"
-msgstr ""
+msgstr "  footer             habilita ou desabilita a exibição do rodapé da tabela [on, off]\n"
 
 #: help.c:357
-#, fuzzy, c-format
-#| msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
+#, c-format
 msgid "  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"
-msgstr "\\pset: estilos de linha permitidos são ascii, old-ascii, unicode\n"
+msgstr "  linestyle          define o estilo de linha da borda [ascii, old-ascii, unicode]\n"
 
 #: help.c:358
 #, c-format
 msgid "  null               set the string to be printed in place of a null value\n"
-msgstr ""
+msgstr "  null               define a cadeia de caracteres a ser impressa no lugar do valor nulo\n"
 
 #: help.c:359
 #, c-format
@@ -2752,66 +2760,55 @@
 "  numericlocale      enable or disable display of a locale-specific character to separate\n"
 "                     groups of digits [on, off]\n"
 msgstr ""
+"  numericlocale      habilita e desabilita a exibição de um caracter definido pela configuração regional\n"
+"                     para separar grupos de dígitos [on, off]\n"
 
 #: help.c:361
 #, c-format
 msgid "  pager              control when an external pager is used [yes, no, always]\n"
-msgstr ""
+msgstr "  pager              controla quando um paginador externo é utilizado [yes, no, always]\n"
 
 #: help.c:362
-#, fuzzy, c-format
-#| msgid ""
-#| "  -0, --record-separator-zero\n"
-#| "                           set record separator for unaligned output to zero byte\n"
-msgid "  recordsep          specify the record (line) separator to use in unaligned output format\n"
-msgstr ""
-"  -0, --record-separator-zero\n"
-"                           define separador de registros para modo de saída desalinhado como byte zero\n"
+#, c-format
+msgid "  recordsep          record (line) separator for unaligned output\n"
+msgstr "  recordsep          separador de registros para modo de saída desalinhado\n"
 
 #: help.c:363
-#, fuzzy, c-format
-#| msgid ""
-#| "  -0, --record-separator-zero\n"
-#| "                           set record separator for unaligned output to zero byte\n"
-msgid "  recordsep_zero     set the record separator to use in unaligned output format to a zero byte.\n"
-msgstr ""
-"  -0, --record-separator-zero\n"
-"                           define separador de registros para modo de saída desalinhado como byte zero\n"
+#, c-format
+msgid "  recordsep_zero     set record separator for unaligned output to zero byte\n"
+msgstr "  recordsep_zero     define separador de registros para modo de saída desalinhado como byte zero\n"
 
 #: help.c:364
 #, c-format
 msgid ""
 "  tableattr (or T)   specify attributes for table tag in html format or proportional\n"
-"                     column width of left aligned data type in latex format\n"
+"                     column widths for left-aligned data types in latex-longtable format\n"
 msgstr ""
+"  tableattr (ou T)   especifica atributos para marcador table no formato html ou larguras de\n"
+"                     colunas proporcionais para tipos de dados alinhados à esquerda no formato latex-longtable\n"
 
 #: help.c:366
-#, fuzzy, c-format
-#| msgid "  \\C [STRING]            set table title, or unset if none\n"
+#, c-format
 msgid "  title              set the table title for any subsequently printed tables\n"
-msgstr "  \\C [TEXTO]             define o título da tabela, ou apaga caso nada seja especificado\n"
+msgstr "  title              define o título da tabela para as próximas tabelas a serem exibidas\n"
 
 #: help.c:367
 #, c-format
 msgid "  tuples_only        if set, only actual table data is shown\n"
-msgstr ""
+msgstr "  tuples_only        se definido, somente dados da tabela atual são mostrados\n"
 
 #: help.c:368
 #, c-format
-msgid "  unicode_border_linestyle\n"
-msgstr ""
-
-#: help.c:369
-#, c-format
-msgid "  unicode_column_linestyle\n"
-msgstr ""
-
-#: help.c:370
-#, c-format
 msgid ""
+"  unicode_border_linestyle\n"
+"  unicode_column_linestyle\n"
 "  unicode_header_linestyle\n"
-"                     set the style of unicode line drawing [single, double]\n"
+"                     set the style of Unicode line drawing [single, double]\n"
 msgstr ""
+"  unicode_border_linestyle\n"
+"  unicode_column_linestyle\n"
+"  unicode_header_linestyle\n"
+"                     define o estilo de linha Unicode [single, double]\n"
 
 #: help.c:373
 #, c-format
@@ -2819,73 +2816,76 @@
 "\n"
 "Environment variables:\n"
 msgstr ""
+"\n"
+"Variáveis de ambiente:\n"
 
 #: help.c:377
 #, c-format
 msgid ""
 "  NAME=VALUE [NAME=VALUE] psql ...\n"
-"  or \\setenv NAME [VALUE] in interactive mode\n"
+"  or \\setenv NAME [VALUE] inside psql\n"
 "\n"
 msgstr ""
+"  NOME=VALOR [NOME=VALOR] psql ...\n"
+"  ou \\setenv NOME [VALOR] no psql\n"
+"\n"
 
 #: help.c:379
 #, c-format
 msgid ""
 "  set NAME=VALUE\n"
 "  psql ...\n"
-"  or \\setenv NAME VALUE in interactive mode\n"
+"  or \\setenv NAME [VALUE] inside psql\n"
 "\n"
 msgstr ""
+"  set=NOME=VALOR\n"
+"  ou \\setenv NOME [VALOR] no psql\n"
+"\n"
 
 #: help.c:382
 #, c-format
 msgid "  COLUMNS            number of columns for wrapped format\n"
-msgstr ""
+msgstr "  COLUMNS            número de colunas para formato de quebra automática\n"
 
 #: help.c:383
-#, fuzzy, c-format
-#| msgid "  -x NUM             internal use\n"
+#, c-format
 msgid "  PAGER              name of external pager program\n"
-msgstr "  -x NUM             uso interno\n"
+msgstr "  PAGER              nome do programa de paginação externo\n"
 
 #: help.c:384
 #, c-format
 msgid "  PGAPPNAME          same as the application_name connection parameter\n"
-msgstr ""
+msgstr "  PGAPPNAME          mesmo que o parâmetro de conexão application_name\n"
 
 #: help.c:385
 #, c-format
 msgid "  PGDATABASE         same as the dbname connection parameter\n"
-msgstr ""
+msgstr "  PGDATABASE         mesmo que o parâmetro de conexão dbname\n"
 
 #: help.c:386
-#, fuzzy, c-format
-#| msgid "  -l                 enable SSL connections\n"
+#, c-format
 msgid "  PGHOST             same as the host connection parameter\n"
-msgstr "  -l                 habilita conexões SSL\n"
+msgstr "  PGHOST             mesmo que o parâmetro de conexão host\n"
 
 #: help.c:387
-#, fuzzy, c-format
-#| msgid "  -l                 enable SSL connections\n"
+#, c-format
 msgid "  PGPORT             same as the port connection parameter\n"
-msgstr "  -l                 habilita conexões SSL\n"
+msgstr "  PGPORT             mesmo que o parâmetro de conexão port\n"
 
 #: help.c:388
-#, fuzzy, c-format
-#| msgid "  DBNAME             database name (defaults to user name)\n"
+#, c-format
 msgid "  PGUSER             same as the user connection parameter\n"
-msgstr "  NOMEBD             nome do banco de dados (padrão é o nome do usuário)\n"
+msgstr "  PGUSER             mesmo que o parâmetro de conexão user\n"
 
 #: help.c:389
 #, c-format
 msgid "  PGPASSWORD         connection password (not recommended)\n"
-msgstr ""
+msgstr "  PGPASSWORD         senha da conexão (não é recomendado)\n"
 
 #: help.c:390
-#, fuzzy, c-format
-#| msgid "  -f, --file=FILENAME          output file name\n"
+#, c-format
 msgid "  PGPASSFILE         password file name\n"
-msgstr "  -f, --file=ARQUIVO           nome do arquivo de saída\n"
+msgstr "  PGPASSFILE         nome do arquivo de senhas\n"
 
 #: help.c:391
 #, c-format
@@ -2893,35 +2893,37 @@
 "  PSQL_EDITOR, EDITOR, VISUAL\n"
 "                     editor used by the \\e and \\ef commands\n"
 msgstr ""
+"  PSQL_EDITOR, EDITOR, VISUAL\n"
+"                     editor utilizado pelos comandos \\e e \\ef\n"
 
 #: help.c:393
-#, fuzzy, c-format
-#| msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number\n"
+#, c-format
 msgid ""
 "  PSQL_EDITOR_LINENUMBER_ARG\n"
 "                     how to specify a line number when invoking the editor\n"
-msgstr "variável de ambiente PSQL_EDITOR_LINENUMBER_ARG deve ser definida para especificar um número de linha\n"
+msgstr ""
+"  PSQL_EDITOR_LINENUMBER_ARG\n"
+"                     como especificar um número de linha ao invocar o editor\n"
 
 #: help.c:395
 #, c-format
 msgid "  PSQL_HISTORY       alternative location for the command history file\n"
-msgstr ""
+msgstr "  PSQL_HISTORY       local alternativo para arquivo de histórico de comandos\n"
 
 #: help.c:396
 #, c-format
 msgid "  PSQLRC             alternative location for the user's .psqlrc file\n"
-msgstr ""
+msgstr "  PSQLRC             local alternativo para arquivo .psqlrc do usuário\n"
 
 #: help.c:397
 #, c-format
 msgid "  SHELL              shell used by the \\! command\n"
-msgstr ""
+msgstr "  SHELL              shell utilizada pelo comando \\!\n"
 
 #: help.c:398
-#, fuzzy, c-format
-#| msgid "  -L DIRECTORY              where to find the input files\n"
+#, c-format
 msgid "  TMPDIR             directory for temporary files\n"
-msgstr "  -L DIRETÓRIO                 onde encontrar os arquivos de entrada\n"
+msgstr "  TMPDIR             diretório para arquivos temporários\n"
 
 #: help.c:441
 msgid "Available help:\n"
@@ -2951,17 +2953,17 @@
 "Nenhuma ajuda disponível para \"%s\".\n"
 "Tente \\h sem argumentos para ver a ajuda disponível.\n"
 
-#: input.c:194
+#: input.c:205
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "não pôde ler arquivo de entrada: %s\n"
 
-#: input.c:446 input.c:485
+#: input.c:460 input.c:499
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
 msgstr "não pôde gravar histórico no arquivo \"%s\": %s\n"
 
-#: input.c:505
+#: input.c:519
 #, c-format
 msgid "history is not supported by this installation\n"
 msgstr "histórico não é suportado por esta instalação\n"
@@ -2999,6 +3001,8 @@
 "The input is a PostgreSQL custom-format dump.\n"
 "Use the pg_restore command-line client to restore this dump to a database.\n"
 msgstr ""
+"A entrada é uma cópia de segurança no formato personalizado do PostgreSQL.\n"
+"Utilize o cliente de linha de comando pg_restore para restaurar essa cópia de segurança para um banco de dados.\n"
 
 #: mainloop.c:203
 msgid "You are using psql, the command-line interface to PostgreSQL."
@@ -3019,29 +3023,29 @@
 "         \\g ou terminar com ponto-e-vírgula para executar a consulta\n"
 "         \\q para sair\n"
 
-#: print.c:338
+#: print.c:352
 #, c-format
 msgid "(%lu row)"
 msgid_plural "(%lu rows)"
 msgstr[0] "(%lu registro)"
 msgstr[1] "(%lu registros)"
 
-#: print.c:2795
+#: print.c:2910
 #, c-format
 msgid "Interrupted\n"
 msgstr "Interrompido\n"
 
-#: print.c:2861
+#: print.c:2974
 #, c-format
 msgid "Cannot add header to table content: column count of %d exceeded.\n"
 msgstr "Não pode adicionar cabeçalho a conteúdo de tabela: quantidade de colunas %d foi excedida.\n"
 
-#: print.c:2901
+#: print.c:3014
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
 msgstr "Não pode adicionar célula a conteúdo de tabela: quantidade total de células %d foi excedida.\n"
 
-#: print.c:3133
+#: print.c:3263
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "formato de saída inválido (erro interno): %d"
@@ -3051,17 +3055,17 @@
 msgid "skipping recursive expansion of variable \"%s\"\n"
 msgstr "ignorando expansão recursiva da variável \"%s\"\n"
 
-#: psqlscan.l:1627
+#: psqlscan.l:1628
 #, c-format
 msgid "unterminated quoted string\n"
 msgstr "cadeia de caracteres entre aspas não foi terminada\n"
 
-#: psqlscan.l:1727
+#: psqlscan.l:1728
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: sem memória\n"
 
-#: psqlscan.l:1956
+#: psqlscan.l:1957
 #, c-format
 msgid "can't escape without active connection\n"
 msgstr "não pode fazer escape sem uma conexão ativa\n"
@@ -3076,161 +3080,157 @@
 #: sql_help.c:367 sql_help.c:369 sql_help.c:412 sql_help.c:414 sql_help.c:417
 #: sql_help.c:419 sql_help.c:483 sql_help.c:488 sql_help.c:493 sql_help.c:498
 #: sql_help.c:546 sql_help.c:548 sql_help.c:550 sql_help.c:553 sql_help.c:555
-#: sql_help.c:566 sql_help.c:568 sql_help.c:608 sql_help.c:610 sql_help.c:613
-#: sql_help.c:615 sql_help.c:617 sql_help.c:646 sql_help.c:650 sql_help.c:668
-#: sql_help.c:671 sql_help.c:674 sql_help.c:703 sql_help.c:715 sql_help.c:723
-#: sql_help.c:726 sql_help.c:729 sql_help.c:743 sql_help.c:789 sql_help.c:812
-#: sql_help.c:823 sql_help.c:825 sql_help.c:842 sql_help.c:851 sql_help.c:853
-#: sql_help.c:855 sql_help.c:867 sql_help.c:871 sql_help.c:873 sql_help.c:955
-#: sql_help.c:957 sql_help.c:960 sql_help.c:963 sql_help.c:965 sql_help.c:967
-#: sql_help.c:1028 sql_help.c:1030 sql_help.c:1032 sql_help.c:1035
-#: sql_help.c:1056 sql_help.c:1059 sql_help.c:1062 sql_help.c:1065
-#: sql_help.c:1069 sql_help.c:1071 sql_help.c:1073 sql_help.c:1075
-#: sql_help.c:1089 sql_help.c:1092 sql_help.c:1094 sql_help.c:1096
-#: sql_help.c:1106 sql_help.c:1108 sql_help.c:1118 sql_help.c:1120
-#: sql_help.c:1129 sql_help.c:1150 sql_help.c:1152 sql_help.c:1154
-#: sql_help.c:1157 sql_help.c:1159 sql_help.c:1161 sql_help.c:1211
-#: sql_help.c:1249 sql_help.c:1252 sql_help.c:1254 sql_help.c:1256
-#: sql_help.c:1258 sql_help.c:1260 sql_help.c:1263 sql_help.c:1303
-#: sql_help.c:1550 sql_help.c:1566 sql_help.c:1579 sql_help.c:1630
-#: sql_help.c:1634 sql_help.c:1644 sql_help.c:1664 sql_help.c:1689
-#: sql_help.c:1707 sql_help.c:1735 sql_help.c:1809 sql_help.c:1852
-#: sql_help.c:1874 sql_help.c:1894 sql_help.c:1895 sql_help.c:1930
-#: sql_help.c:1950 sql_help.c:1972 sql_help.c:1985 sql_help.c:2017
-#: sql_help.c:2042 sql_help.c:2086 sql_help.c:2272 sql_help.c:2285
-#: sql_help.c:2302 sql_help.c:2318 sql_help.c:2357 sql_help.c:2408
-#: sql_help.c:2412 sql_help.c:2414 sql_help.c:2420 sql_help.c:2438
-#: sql_help.c:2465 sql_help.c:2500 sql_help.c:2512 sql_help.c:2521
-#: sql_help.c:2571 sql_help.c:2599 sql_help.c:2607 sql_help.c:2615
-#: sql_help.c:2623 sql_help.c:2631 sql_help.c:2639 sql_help.c:2647
-#: sql_help.c:2655 sql_help.c:2664 sql_help.c:2675 sql_help.c:2683
-#: sql_help.c:2691 sql_help.c:2699 sql_help.c:2707 sql_help.c:2717
-#: sql_help.c:2726 sql_help.c:2735 sql_help.c:2743 sql_help.c:2752
-#: sql_help.c:2760 sql_help.c:2769 sql_help.c:2777 sql_help.c:2785
-#: sql_help.c:2793 sql_help.c:2801 sql_help.c:2809 sql_help.c:2817
-#: sql_help.c:2825 sql_help.c:2833 sql_help.c:2850 sql_help.c:2859
-#: sql_help.c:2867 sql_help.c:2884 sql_help.c:2899 sql_help.c:3164
-#: sql_help.c:3215 sql_help.c:3244 sql_help.c:3252 sql_help.c:3671
-#: sql_help.c:3719 sql_help.c:3860
+#: sql_help.c:566 sql_help.c:568 sql_help.c:607 sql_help.c:609 sql_help.c:612
+#: sql_help.c:614 sql_help.c:616 sql_help.c:644 sql_help.c:648 sql_help.c:666
+#: sql_help.c:669 sql_help.c:672 sql_help.c:701 sql_help.c:713 sql_help.c:721
+#: sql_help.c:724 sql_help.c:727 sql_help.c:742 sql_help.c:745 sql_help.c:790
+#: sql_help.c:813 sql_help.c:824 sql_help.c:826 sql_help.c:843 sql_help.c:852
+#: sql_help.c:854 sql_help.c:856 sql_help.c:868 sql_help.c:872 sql_help.c:874
+#: sql_help.c:958 sql_help.c:960 sql_help.c:963 sql_help.c:966 sql_help.c:968
+#: sql_help.c:970 sql_help.c:1031 sql_help.c:1033 sql_help.c:1035
+#: sql_help.c:1038 sql_help.c:1059 sql_help.c:1062 sql_help.c:1065
+#: sql_help.c:1068 sql_help.c:1072 sql_help.c:1074 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1092 sql_help.c:1095 sql_help.c:1097
+#: sql_help.c:1099 sql_help.c:1109 sql_help.c:1111 sql_help.c:1121
+#: sql_help.c:1123 sql_help.c:1132 sql_help.c:1153 sql_help.c:1155
+#: sql_help.c:1157 sql_help.c:1160 sql_help.c:1162 sql_help.c:1164
+#: sql_help.c:1215 sql_help.c:1257 sql_help.c:1260 sql_help.c:1262
+#: sql_help.c:1264 sql_help.c:1266 sql_help.c:1268 sql_help.c:1271
+#: sql_help.c:1311 sql_help.c:1558 sql_help.c:1574 sql_help.c:1587
+#: sql_help.c:1638 sql_help.c:1642 sql_help.c:1652 sql_help.c:1672
+#: sql_help.c:1697 sql_help.c:1715 sql_help.c:1743 sql_help.c:1817
+#: sql_help.c:1860 sql_help.c:1882 sql_help.c:1902 sql_help.c:1903
+#: sql_help.c:1938 sql_help.c:1958 sql_help.c:1980 sql_help.c:1993
+#: sql_help.c:2025 sql_help.c:2050 sql_help.c:2094 sql_help.c:2280
+#: sql_help.c:2293 sql_help.c:2310 sql_help.c:2326 sql_help.c:2365
+#: sql_help.c:2416 sql_help.c:2420 sql_help.c:2422 sql_help.c:2428
+#: sql_help.c:2446 sql_help.c:2474 sql_help.c:2509 sql_help.c:2521
+#: sql_help.c:2530 sql_help.c:2580 sql_help.c:2608 sql_help.c:2616
+#: sql_help.c:2624 sql_help.c:2632 sql_help.c:2640 sql_help.c:2648
+#: sql_help.c:2656 sql_help.c:2664 sql_help.c:2673 sql_help.c:2684
+#: sql_help.c:2692 sql_help.c:2700 sql_help.c:2708 sql_help.c:2716
+#: sql_help.c:2726 sql_help.c:2735 sql_help.c:2744 sql_help.c:2752
+#: sql_help.c:2761 sql_help.c:2769 sql_help.c:2778 sql_help.c:2786
+#: sql_help.c:2794 sql_help.c:2802 sql_help.c:2810 sql_help.c:2818
+#: sql_help.c:2826 sql_help.c:2834 sql_help.c:2842 sql_help.c:2859
+#: sql_help.c:2868 sql_help.c:2876 sql_help.c:2893 sql_help.c:2908
+#: sql_help.c:3173 sql_help.c:3224 sql_help.c:3253 sql_help.c:3261
+#: sql_help.c:3680 sql_help.c:3728 sql_help.c:3869
 msgid "name"
 msgstr "nome"
 
-#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1367
-#: sql_help.c:2572 sql_help.c:3467
+#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1375
+#: sql_help.c:2581 sql_help.c:3476
 msgid "aggregate_signature"
 msgstr "assinatura_agregação"
 
 #: sql_help.c:35 sql_help.c:62 sql_help.c:77 sql_help.c:113 sql_help.c:233
 #: sql_help.c:251 sql_help.c:370 sql_help.c:418 sql_help.c:492 sql_help.c:533
-#: sql_help.c:547 sql_help.c:567 sql_help.c:614 sql_help.c:670 sql_help.c:725
-#: sql_help.c:745 sql_help.c:790 sql_help.c:814 sql_help.c:824 sql_help.c:854
-#: sql_help.c:874 sql_help.c:964 sql_help.c:1029 sql_help.c:1072
-#: sql_help.c:1093 sql_help.c:1107 sql_help.c:1119 sql_help.c:1131
-#: sql_help.c:1158 sql_help.c:1212 sql_help.c:1257
+#: sql_help.c:547 sql_help.c:567 sql_help.c:613 sql_help.c:668 sql_help.c:723
+#: sql_help.c:744 sql_help.c:791 sql_help.c:815 sql_help.c:825 sql_help.c:855
+#: sql_help.c:875 sql_help.c:967 sql_help.c:1032 sql_help.c:1075
+#: sql_help.c:1096 sql_help.c:1110 sql_help.c:1122 sql_help.c:1134
+#: sql_help.c:1161 sql_help.c:1216 sql_help.c:1265
 msgid "new_name"
 msgstr "novo_nome"
 
 #: sql_help.c:38 sql_help.c:64 sql_help.c:79 sql_help.c:115 sql_help.c:231
 #: sql_help.c:249 sql_help.c:368 sql_help.c:454 sql_help.c:497 sql_help.c:569
-#: sql_help.c:578 sql_help.c:633 sql_help.c:649 sql_help.c:673 sql_help.c:728
-#: sql_help.c:826 sql_help.c:852 sql_help.c:872 sql_help.c:1013
-#: sql_help.c:1031 sql_help.c:1074 sql_help.c:1095 sql_help.c:1153
-#: sql_help.c:1255 sql_help.c:2258
+#: sql_help.c:578 sql_help.c:632 sql_help.c:647 sql_help.c:671 sql_help.c:726
+#: sql_help.c:827 sql_help.c:853 sql_help.c:873 sql_help.c:1016
+#: sql_help.c:1034 sql_help.c:1077 sql_help.c:1098 sql_help.c:1156
+#: sql_help.c:1263 sql_help.c:2266
 msgid "new_owner"
 msgstr "novo_dono"
 
 #: sql_help.c:41 sql_help.c:66 sql_help.c:81 sql_help.c:235 sql_help.c:299
-#: sql_help.c:420 sql_help.c:502 sql_help.c:616 sql_help.c:653 sql_help.c:676
-#: sql_help.c:731 sql_help.c:856 sql_help.c:966 sql_help.c:1076
-#: sql_help.c:1097 sql_help.c:1109 sql_help.c:1121 sql_help.c:1160
-#: sql_help.c:1259
+#: sql_help.c:420 sql_help.c:502 sql_help.c:615 sql_help.c:651 sql_help.c:674
+#: sql_help.c:729 sql_help.c:857 sql_help.c:969 sql_help.c:1079
+#: sql_help.c:1100 sql_help.c:1112 sql_help.c:1124 sql_help.c:1163
+#: sql_help.c:1267
 msgid "new_schema"
 msgstr "novo_esquema"
 
-#: sql_help.c:42 sql_help.c:1420 sql_help.c:2573 sql_help.c:3486
+#: sql_help.c:42 sql_help.c:1428 sql_help.c:2582 sql_help.c:3495
 msgid "where aggregate_signature is:"
 msgstr "onde assinatura_agregação é:"
 
 #: sql_help.c:43 sql_help.c:46 sql_help.c:49 sql_help.c:316 sql_help.c:341
 #: sql_help.c:344 sql_help.c:347 sql_help.c:484 sql_help.c:489 sql_help.c:494
-#: sql_help.c:499 sql_help.c:1385 sql_help.c:1421 sql_help.c:1424
-#: sql_help.c:1427 sql_help.c:1551 sql_help.c:1567 sql_help.c:1570
-#: sql_help.c:1810 sql_help.c:2574 sql_help.c:2577 sql_help.c:2580
-#: sql_help.c:2665 sql_help.c:3050 sql_help.c:3382 sql_help.c:3473
-#: sql_help.c:3487 sql_help.c:3490 sql_help.c:3493
+#: sql_help.c:499 sql_help.c:1393 sql_help.c:1429 sql_help.c:1432
+#: sql_help.c:1435 sql_help.c:1559 sql_help.c:1575 sql_help.c:1578
+#: sql_help.c:1818 sql_help.c:2583 sql_help.c:2586 sql_help.c:2589
+#: sql_help.c:2674 sql_help.c:3059 sql_help.c:3391 sql_help.c:3482
+#: sql_help.c:3496 sql_help.c:3499 sql_help.c:3502
 msgid "argmode"
 msgstr "modo_argumento"
 
 #: sql_help.c:44 sql_help.c:47 sql_help.c:50 sql_help.c:317 sql_help.c:342
 #: sql_help.c:345 sql_help.c:348 sql_help.c:485 sql_help.c:490 sql_help.c:495
-#: sql_help.c:500 sql_help.c:1386 sql_help.c:1422 sql_help.c:1425
-#: sql_help.c:1428 sql_help.c:1552 sql_help.c:1568 sql_help.c:1571
-#: sql_help.c:1811 sql_help.c:2575 sql_help.c:2578 sql_help.c:2581
-#: sql_help.c:2666 sql_help.c:3474 sql_help.c:3488 sql_help.c:3491
-#: sql_help.c:3494
+#: sql_help.c:500 sql_help.c:1394 sql_help.c:1430 sql_help.c:1433
+#: sql_help.c:1436 sql_help.c:1560 sql_help.c:1576 sql_help.c:1579
+#: sql_help.c:1819 sql_help.c:2584 sql_help.c:2587 sql_help.c:2590
+#: sql_help.c:2675 sql_help.c:3483 sql_help.c:3497 sql_help.c:3500
+#: sql_help.c:3503
 msgid "argname"
 msgstr "nome_argumento"
 
 #: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:318 sql_help.c:343
 #: sql_help.c:346 sql_help.c:349 sql_help.c:486 sql_help.c:491 sql_help.c:496
-#: sql_help.c:501 sql_help.c:1387 sql_help.c:1423 sql_help.c:1426
-#: sql_help.c:1429 sql_help.c:1812 sql_help.c:2576 sql_help.c:2579
-#: sql_help.c:2582 sql_help.c:2667 sql_help.c:3475 sql_help.c:3489
-#: sql_help.c:3492 sql_help.c:3495
+#: sql_help.c:501 sql_help.c:1395 sql_help.c:1431 sql_help.c:1434
+#: sql_help.c:1437 sql_help.c:1820 sql_help.c:2585 sql_help.c:2588
+#: sql_help.c:2591 sql_help.c:2676 sql_help.c:3484 sql_help.c:3498
+#: sql_help.c:3501 sql_help.c:3504
 msgid "argtype"
 msgstr "tipo_argumento"
 
-#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:784
-#: sql_help.c:869 sql_help.c:1090 sql_help.c:1206 sql_help.c:1234
-#: sql_help.c:1477 sql_help.c:1483 sql_help.c:1738 sql_help.c:1770
-#: sql_help.c:1777 sql_help.c:1853 sql_help.c:2018 sql_help.c:2107
-#: sql_help.c:2287 sql_help.c:2466 sql_help.c:2488 sql_help.c:2918
-#: sql_help.c:3084
+#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:785
+#: sql_help.c:870 sql_help.c:1093 sql_help.c:1210 sql_help.c:1242
+#: sql_help.c:1485 sql_help.c:1491 sql_help.c:1746 sql_help.c:1778
+#: sql_help.c:1785 sql_help.c:1861 sql_help.c:2026 sql_help.c:2115
+#: sql_help.c:2295 sql_help.c:2475 sql_help.c:2497 sql_help.c:2927
+#: sql_help.c:3093
 msgid "option"
 msgstr "opção"
 
-#: sql_help.c:108 sql_help.c:785 sql_help.c:1207 sql_help.c:1854
-#: sql_help.c:2019 sql_help.c:2467
+#: sql_help.c:108 sql_help.c:786 sql_help.c:1211 sql_help.c:1862
+#: sql_help.c:2027 sql_help.c:2476
 msgid "where option can be:"
 msgstr "onde opção pode ser:"
 
-#: sql_help.c:109 sql_help.c:1671
-#, fuzzy
+#: sql_help.c:109 sql_help.c:1679
 msgid "allowconn"
 msgstr "permite_conexão"
 
-#: sql_help.c:110 sql_help.c:786 sql_help.c:1208 sql_help.c:1672
-#: sql_help.c:2020 sql_help.c:2468
+#: sql_help.c:110 sql_help.c:787 sql_help.c:1212 sql_help.c:1680
+#: sql_help.c:2028 sql_help.c:2477
 msgid "connlimit"
 msgstr "limite_conexão"
 
-#: sql_help.c:111 sql_help.c:1673
-#, fuzzy
-#| msgid "template"
+#: sql_help.c:111 sql_help.c:1681
 msgid "istemplate"
 msgstr "é_modelo"
 
-#: sql_help.c:117 sql_help.c:557 sql_help.c:619 sql_help.c:634 sql_help.c:969
-#: sql_help.c:1006
+#: sql_help.c:117 sql_help.c:557 sql_help.c:618 sql_help.c:972 sql_help.c:1009
 msgid "new_tablespace"
 msgstr "nova_tablespace"
 
 #: sql_help.c:119 sql_help.c:122 sql_help.c:124 sql_help.c:506 sql_help.c:508
-#: sql_help.c:509 sql_help.c:793 sql_help.c:797 sql_help.c:800 sql_help.c:885
-#: sql_help.c:888 sql_help.c:1214 sql_help.c:1217 sql_help.c:1219
-#: sql_help.c:1821 sql_help.c:3269 sql_help.c:3660
+#: sql_help.c:509 sql_help.c:794 sql_help.c:798 sql_help.c:801 sql_help.c:886
+#: sql_help.c:889 sql_help.c:1219 sql_help.c:1223 sql_help.c:1226
+#: sql_help.c:1829 sql_help.c:3278 sql_help.c:3669
 msgid "configuration_parameter"
 msgstr "parâmetro_de_configuração"
 
 #: sql_help.c:120 sql_help.c:366 sql_help.c:438 sql_help.c:444 sql_help.c:456
-#: sql_help.c:507 sql_help.c:552 sql_help.c:625 sql_help.c:631 sql_help.c:794
-#: sql_help.c:870 sql_help.c:886 sql_help.c:887 sql_help.c:988 sql_help.c:1008
-#: sql_help.c:1034 sql_help.c:1091 sql_help.c:1215 sql_help.c:1235
-#: sql_help.c:1739 sql_help.c:1771 sql_help.c:1778 sql_help.c:1822
-#: sql_help.c:1823 sql_help.c:1882 sql_help.c:1914 sql_help.c:2108
-#: sql_help.c:2182 sql_help.c:2190 sql_help.c:2222 sql_help.c:2244
-#: sql_help.c:2261 sql_help.c:2288 sql_help.c:2489 sql_help.c:3085
-#: sql_help.c:3661 sql_help.c:3662
+#: sql_help.c:507 sql_help.c:552 sql_help.c:624 sql_help.c:630 sql_help.c:795
+#: sql_help.c:871 sql_help.c:887 sql_help.c:888 sql_help.c:991 sql_help.c:1011
+#: sql_help.c:1037 sql_help.c:1094 sql_help.c:1220 sql_help.c:1243
+#: sql_help.c:1747 sql_help.c:1779 sql_help.c:1786 sql_help.c:1830
+#: sql_help.c:1831 sql_help.c:1890 sql_help.c:1922 sql_help.c:2116
+#: sql_help.c:2190 sql_help.c:2198 sql_help.c:2230 sql_help.c:2252
+#: sql_help.c:2269 sql_help.c:2296 sql_help.c:2498 sql_help.c:3094
+#: sql_help.c:3670 sql_help.c:3671
 msgid "value"
 msgstr "valor"
 
@@ -3238,9 +3238,9 @@
 msgid "target_role"
 msgstr "role_alvo"
 
-#: sql_help.c:183 sql_help.c:1722 sql_help.c:2066 sql_help.c:2071
-#: sql_help.c:3032 sql_help.c:3039 sql_help.c:3053 sql_help.c:3059
-#: sql_help.c:3364 sql_help.c:3371 sql_help.c:3385 sql_help.c:3391
+#: sql_help.c:183 sql_help.c:1730 sql_help.c:2074 sql_help.c:2079
+#: sql_help.c:3041 sql_help.c:3048 sql_help.c:3062 sql_help.c:3068
+#: sql_help.c:3373 sql_help.c:3380 sql_help.c:3394 sql_help.c:3400
 msgid "schema_name"
 msgstr "nome_esquema"
 
@@ -3254,32 +3254,32 @@
 
 #: sql_help.c:186 sql_help.c:187 sql_help.c:188 sql_help.c:189 sql_help.c:190
 #: sql_help.c:191 sql_help.c:192 sql_help.c:193 sql_help.c:531 sql_help.c:556
-#: sql_help.c:618 sql_help.c:746 sql_help.c:804 sql_help.c:968 sql_help.c:1222
-#: sql_help.c:1857 sql_help.c:1858 sql_help.c:1859 sql_help.c:1860
-#: sql_help.c:1861 sql_help.c:1987 sql_help.c:2023 sql_help.c:2024
-#: sql_help.c:2025 sql_help.c:2026 sql_help.c:2027 sql_help.c:2471
-#: sql_help.c:2472 sql_help.c:2473 sql_help.c:2474 sql_help.c:2475
-#: sql_help.c:3066 sql_help.c:3067 sql_help.c:3068 sql_help.c:3365
-#: sql_help.c:3369 sql_help.c:3372 sql_help.c:3374 sql_help.c:3376
-#: sql_help.c:3378 sql_help.c:3380 sql_help.c:3386 sql_help.c:3388
-#: sql_help.c:3390 sql_help.c:3392 sql_help.c:3394 sql_help.c:3396
-#: sql_help.c:3397 sql_help.c:3398 sql_help.c:3681
+#: sql_help.c:617 sql_help.c:747 sql_help.c:805 sql_help.c:971 sql_help.c:1230
+#: sql_help.c:1865 sql_help.c:1866 sql_help.c:1867 sql_help.c:1868
+#: sql_help.c:1869 sql_help.c:1995 sql_help.c:2031 sql_help.c:2032
+#: sql_help.c:2033 sql_help.c:2034 sql_help.c:2035 sql_help.c:2480
+#: sql_help.c:2481 sql_help.c:2482 sql_help.c:2483 sql_help.c:2484
+#: sql_help.c:3075 sql_help.c:3076 sql_help.c:3077 sql_help.c:3374
+#: sql_help.c:3378 sql_help.c:3381 sql_help.c:3383 sql_help.c:3385
+#: sql_help.c:3387 sql_help.c:3389 sql_help.c:3395 sql_help.c:3397
+#: sql_help.c:3399 sql_help.c:3401 sql_help.c:3403 sql_help.c:3405
+#: sql_help.c:3406 sql_help.c:3407 sql_help.c:3690
 msgid "role_name"
 msgstr "nome_role"
 
-#: sql_help.c:219 sql_help.c:431 sql_help.c:979 sql_help.c:981 sql_help.c:1251
-#: sql_help.c:1692 sql_help.c:1696 sql_help.c:1781 sql_help.c:1785
-#: sql_help.c:1878 sql_help.c:2194 sql_help.c:2204 sql_help.c:2226
-#: sql_help.c:3115 sql_help.c:3130 sql_help.c:3132 sql_help.c:3546
-#: sql_help.c:3547 sql_help.c:3556 sql_help.c:3597 sql_help.c:3598
-#: sql_help.c:3599 sql_help.c:3600 sql_help.c:3601 sql_help.c:3602
-#: sql_help.c:3635 sql_help.c:3636 sql_help.c:3641 sql_help.c:3646
-#: sql_help.c:3785 sql_help.c:3786 sql_help.c:3795 sql_help.c:3836
-#: sql_help.c:3837 sql_help.c:3838 sql_help.c:3839 sql_help.c:3840
-#: sql_help.c:3841 sql_help.c:3888 sql_help.c:3890 sql_help.c:3923
-#: sql_help.c:3979 sql_help.c:3980 sql_help.c:3989 sql_help.c:4030
-#: sql_help.c:4031 sql_help.c:4032 sql_help.c:4033 sql_help.c:4034
-#: sql_help.c:4035
+#: sql_help.c:219 sql_help.c:431 sql_help.c:982 sql_help.c:984 sql_help.c:1259
+#: sql_help.c:1700 sql_help.c:1704 sql_help.c:1789 sql_help.c:1793
+#: sql_help.c:1886 sql_help.c:2202 sql_help.c:2212 sql_help.c:2234
+#: sql_help.c:3124 sql_help.c:3139 sql_help.c:3141 sql_help.c:3555
+#: sql_help.c:3556 sql_help.c:3565 sql_help.c:3606 sql_help.c:3607
+#: sql_help.c:3608 sql_help.c:3609 sql_help.c:3610 sql_help.c:3611
+#: sql_help.c:3644 sql_help.c:3645 sql_help.c:3650 sql_help.c:3655
+#: sql_help.c:3794 sql_help.c:3795 sql_help.c:3804 sql_help.c:3845
+#: sql_help.c:3846 sql_help.c:3847 sql_help.c:3848 sql_help.c:3849
+#: sql_help.c:3850 sql_help.c:3897 sql_help.c:3899 sql_help.c:3932
+#: sql_help.c:3988 sql_help.c:3989 sql_help.c:3998 sql_help.c:4039
+#: sql_help.c:4040 sql_help.c:4041 sql_help.c:4042 sql_help.c:4043
+#: sql_help.c:4044
 msgid "expression"
 msgstr "expressão"
 
@@ -3288,17 +3288,17 @@
 msgstr "restrição_domínio"
 
 #: sql_help.c:224 sql_help.c:226 sql_help.c:229 sql_help.c:446 sql_help.c:447
-#: sql_help.c:961 sql_help.c:994 sql_help.c:995 sql_help.c:996 sql_help.c:1016
-#: sql_help.c:1373 sql_help.c:1375 sql_help.c:1695 sql_help.c:1780
-#: sql_help.c:1784 sql_help.c:2193 sql_help.c:2203 sql_help.c:3127
+#: sql_help.c:964 sql_help.c:997 sql_help.c:998 sql_help.c:999 sql_help.c:1019
+#: sql_help.c:1381 sql_help.c:1383 sql_help.c:1703 sql_help.c:1788
+#: sql_help.c:1792 sql_help.c:2201 sql_help.c:2211 sql_help.c:3136
 msgid "constraint_name"
 msgstr "nome_restrição"
 
-#: sql_help.c:227 sql_help.c:962
+#: sql_help.c:227 sql_help.c:965
 msgid "new_constraint_name"
 msgstr "novo_nome_restrição"
 
-#: sql_help.c:297 sql_help.c:868
+#: sql_help.c:297 sql_help.c:869
 msgid "new_version"
 msgstr "nova_versão"
 
@@ -3310,17 +3310,17 @@
 msgid "where member_object is:"
 msgstr "onde objeto_membro é:"
 
-#: sql_help.c:305 sql_help.c:1366 sql_help.c:3466
+#: sql_help.c:305 sql_help.c:1374 sql_help.c:3475
 msgid "aggregate_name"
 msgstr "nome_agregação"
 
-#: sql_help.c:307 sql_help.c:1368 sql_help.c:1610 sql_help.c:1614
-#: sql_help.c:1616 sql_help.c:2590
+#: sql_help.c:307 sql_help.c:1376 sql_help.c:1618 sql_help.c:1622
+#: sql_help.c:1624 sql_help.c:2599
 msgid "source_type"
 msgstr "tipo_origem"
 
-#: sql_help.c:308 sql_help.c:1369 sql_help.c:1611 sql_help.c:1615
-#: sql_help.c:1617 sql_help.c:2591
+#: sql_help.c:308 sql_help.c:1377 sql_help.c:1619 sql_help.c:1623
+#: sql_help.c:1625 sql_help.c:2600
 msgid "target_type"
 msgstr "tipo_destino"
 
@@ -3328,57 +3328,57 @@
 #: sql_help.c:314 sql_help.c:319 sql_help.c:323 sql_help.c:325 sql_help.c:327
 #: sql_help.c:328 sql_help.c:329 sql_help.c:330 sql_help.c:331 sql_help.c:332
 #: sql_help.c:333 sql_help.c:334 sql_help.c:335 sql_help.c:338 sql_help.c:339
-#: sql_help.c:1370 sql_help.c:1377 sql_help.c:1378 sql_help.c:1379
-#: sql_help.c:1380 sql_help.c:1381 sql_help.c:1382 sql_help.c:1383
-#: sql_help.c:1388 sql_help.c:1390 sql_help.c:1394 sql_help.c:1396
-#: sql_help.c:1400 sql_help.c:1401 sql_help.c:1404 sql_help.c:1405
-#: sql_help.c:1406 sql_help.c:1407 sql_help.c:1408 sql_help.c:1409
-#: sql_help.c:1410 sql_help.c:1411 sql_help.c:1412 sql_help.c:1417
-#: sql_help.c:1418 sql_help.c:3463 sql_help.c:3468 sql_help.c:3469
-#: sql_help.c:3470 sql_help.c:3471 sql_help.c:3477 sql_help.c:3478
-#: sql_help.c:3479 sql_help.c:3480 sql_help.c:3481 sql_help.c:3482
-#: sql_help.c:3483 sql_help.c:3484
+#: sql_help.c:1378 sql_help.c:1385 sql_help.c:1386 sql_help.c:1387
+#: sql_help.c:1388 sql_help.c:1389 sql_help.c:1390 sql_help.c:1391
+#: sql_help.c:1396 sql_help.c:1398 sql_help.c:1402 sql_help.c:1404
+#: sql_help.c:1408 sql_help.c:1409 sql_help.c:1412 sql_help.c:1413
+#: sql_help.c:1414 sql_help.c:1415 sql_help.c:1416 sql_help.c:1417
+#: sql_help.c:1418 sql_help.c:1419 sql_help.c:1420 sql_help.c:1425
+#: sql_help.c:1426 sql_help.c:3472 sql_help.c:3477 sql_help.c:3478
+#: sql_help.c:3479 sql_help.c:3480 sql_help.c:3486 sql_help.c:3487
+#: sql_help.c:3488 sql_help.c:3489 sql_help.c:3490 sql_help.c:3491
+#: sql_help.c:3492 sql_help.c:3493
 msgid "object_name"
 msgstr "nome_objeto"
 
-#: sql_help.c:315 sql_help.c:713 sql_help.c:1384 sql_help.c:1612
-#: sql_help.c:1647 sql_help.c:1710 sql_help.c:1931 sql_help.c:1962
-#: sql_help.c:2362 sql_help.c:3049 sql_help.c:3381 sql_help.c:3472
-#: sql_help.c:3575 sql_help.c:3579 sql_help.c:3583 sql_help.c:3586
-#: sql_help.c:3814 sql_help.c:3818 sql_help.c:3822 sql_help.c:3825
-#: sql_help.c:4008 sql_help.c:4012 sql_help.c:4016 sql_help.c:4019
+#: sql_help.c:315 sql_help.c:711 sql_help.c:1392 sql_help.c:1620
+#: sql_help.c:1655 sql_help.c:1718 sql_help.c:1939 sql_help.c:1970
+#: sql_help.c:2370 sql_help.c:3058 sql_help.c:3390 sql_help.c:3481
+#: sql_help.c:3584 sql_help.c:3588 sql_help.c:3592 sql_help.c:3595
+#: sql_help.c:3823 sql_help.c:3827 sql_help.c:3831 sql_help.c:3834
+#: sql_help.c:4017 sql_help.c:4021 sql_help.c:4025 sql_help.c:4028
 msgid "function_name"
 msgstr "nome_função"
 
-#: sql_help.c:320 sql_help.c:706 sql_help.c:1391 sql_help.c:1955
+#: sql_help.c:320 sql_help.c:704 sql_help.c:1399 sql_help.c:1963
 msgid "operator_name"
 msgstr "nome_operador"
 
-#: sql_help.c:321 sql_help.c:647 sql_help.c:651 sql_help.c:1392
-#: sql_help.c:1932 sql_help.c:2708
+#: sql_help.c:321 sql_help.c:645 sql_help.c:649 sql_help.c:1400
+#: sql_help.c:1940 sql_help.c:2717
 msgid "left_type"
 msgstr "tipo_esquerda"
 
-#: sql_help.c:322 sql_help.c:648 sql_help.c:652 sql_help.c:1393
-#: sql_help.c:1933 sql_help.c:2709
+#: sql_help.c:322 sql_help.c:646 sql_help.c:650 sql_help.c:1401
+#: sql_help.c:1941 sql_help.c:2718
 msgid "right_type"
 msgstr "tipo_direita"
 
-#: sql_help.c:324 sql_help.c:326 sql_help.c:669 sql_help.c:672 sql_help.c:675
-#: sql_help.c:704 sql_help.c:716 sql_help.c:724 sql_help.c:727 sql_help.c:730
-#: sql_help.c:1395 sql_help.c:1397 sql_help.c:1952 sql_help.c:1973
-#: sql_help.c:2209 sql_help.c:2718 sql_help.c:2727
+#: sql_help.c:324 sql_help.c:326 sql_help.c:667 sql_help.c:670 sql_help.c:673
+#: sql_help.c:702 sql_help.c:714 sql_help.c:722 sql_help.c:725 sql_help.c:728
+#: sql_help.c:1403 sql_help.c:1405 sql_help.c:1960 sql_help.c:1981
+#: sql_help.c:2217 sql_help.c:2727 sql_help.c:2736
 msgid "index_method"
 msgstr "método_índice"
 
-#: sql_help.c:336 sql_help.c:1012 sql_help.c:1413 sql_help.c:1818
-#: sql_help.c:2185 sql_help.c:2331 sql_help.c:2841 sql_help.c:3063
-#: sql_help.c:3395
+#: sql_help.c:336 sql_help.c:1015 sql_help.c:1421 sql_help.c:1826
+#: sql_help.c:2193 sql_help.c:2339 sql_help.c:2850 sql_help.c:3072
+#: sql_help.c:3404
 msgid "type_name"
 msgstr "nome_tipo"
 
-#: sql_help.c:337 sql_help.c:1414 sql_help.c:1817 sql_help.c:2332
-#: sql_help.c:2556 sql_help.c:2842 sql_help.c:3055 sql_help.c:3387
+#: sql_help.c:337 sql_help.c:1422 sql_help.c:1825 sql_help.c:2340
+#: sql_help.c:2565 sql_help.c:2851 sql_help.c:3064 sql_help.c:3396
 msgid "lang_name"
 msgstr "nome_linguagem"
 
@@ -3386,116 +3386,112 @@
 msgid "and aggregate_signature is:"
 msgstr "e assinatura_agregação é:"
 
-#: sql_help.c:363 sql_help.c:1736
+#: sql_help.c:363 sql_help.c:1744
 msgid "handler_function"
 msgstr "função_manipulação"
 
-#: sql_help.c:364 sql_help.c:1737
+#: sql_help.c:364 sql_help.c:1745
 msgid "validator_function"
 msgstr "função_validação"
 
-#: sql_help.c:413 sql_help.c:487 sql_help.c:609 sql_help.c:956 sql_help.c:1151
-#: sql_help.c:2200 sql_help.c:2201 sql_help.c:2217 sql_help.c:2218
+#: sql_help.c:413 sql_help.c:487 sql_help.c:608 sql_help.c:959 sql_help.c:1154
+#: sql_help.c:2208 sql_help.c:2209 sql_help.c:2225 sql_help.c:2226
 msgid "action"
 msgstr "ação"
 
 #: sql_help.c:415 sql_help.c:422 sql_help.c:426 sql_help.c:427 sql_help.c:430
 #: sql_help.c:432 sql_help.c:433 sql_help.c:434 sql_help.c:436 sql_help.c:439
-#: sql_help.c:441 sql_help.c:442 sql_help.c:611 sql_help.c:621 sql_help.c:623
-#: sql_help.c:626 sql_help.c:628 sql_help.c:850 sql_help.c:958 sql_help.c:971
-#: sql_help.c:975 sql_help.c:976 sql_help.c:980 sql_help.c:982 sql_help.c:983
-#: sql_help.c:984 sql_help.c:986 sql_help.c:989 sql_help.c:991 sql_help.c:1250
-#: sql_help.c:1253 sql_help.c:1273 sql_help.c:1372 sql_help.c:1474
-#: sql_help.c:1479 sql_help.c:1493 sql_help.c:1494 sql_help.c:1495
-#: sql_help.c:1768 sql_help.c:1815 sql_help.c:1877 sql_help.c:1912
-#: sql_help.c:2093 sql_help.c:2173 sql_help.c:2186 sql_help.c:2205
-#: sql_help.c:2207 sql_help.c:2214 sql_help.c:2225 sql_help.c:2242
-#: sql_help.c:2365 sql_help.c:2501 sql_help.c:3034 sql_help.c:3035
-#: sql_help.c:3114 sql_help.c:3129 sql_help.c:3131 sql_help.c:3133
-#: sql_help.c:3366 sql_help.c:3367 sql_help.c:3465 sql_help.c:3606
-#: sql_help.c:3845 sql_help.c:3887 sql_help.c:3889 sql_help.c:3891
-#: sql_help.c:3908 sql_help.c:3911 sql_help.c:4039
+#: sql_help.c:441 sql_help.c:442 sql_help.c:610 sql_help.c:620 sql_help.c:622
+#: sql_help.c:625 sql_help.c:627 sql_help.c:851 sql_help.c:961 sql_help.c:974
+#: sql_help.c:978 sql_help.c:979 sql_help.c:983 sql_help.c:985 sql_help.c:986
+#: sql_help.c:987 sql_help.c:989 sql_help.c:992 sql_help.c:994 sql_help.c:1258
+#: sql_help.c:1261 sql_help.c:1281 sql_help.c:1380 sql_help.c:1482
+#: sql_help.c:1487 sql_help.c:1501 sql_help.c:1502 sql_help.c:1503
+#: sql_help.c:1776 sql_help.c:1823 sql_help.c:1885 sql_help.c:1920
+#: sql_help.c:2101 sql_help.c:2181 sql_help.c:2194 sql_help.c:2213
+#: sql_help.c:2215 sql_help.c:2222 sql_help.c:2233 sql_help.c:2250
+#: sql_help.c:2373 sql_help.c:2510 sql_help.c:3043 sql_help.c:3044
+#: sql_help.c:3123 sql_help.c:3138 sql_help.c:3140 sql_help.c:3142
+#: sql_help.c:3375 sql_help.c:3376 sql_help.c:3474 sql_help.c:3615
+#: sql_help.c:3854 sql_help.c:3896 sql_help.c:3898 sql_help.c:3900
+#: sql_help.c:3917 sql_help.c:3920 sql_help.c:4048
 msgid "column_name"
 msgstr "nome_coluna"
 
-#: sql_help.c:416 sql_help.c:612 sql_help.c:959
+#: sql_help.c:416 sql_help.c:611 sql_help.c:962
 msgid "new_column_name"
 msgstr "novo_nome_coluna"
 
-#: sql_help.c:421 sql_help.c:503 sql_help.c:620 sql_help.c:970 sql_help.c:1164
+#: sql_help.c:421 sql_help.c:503 sql_help.c:619 sql_help.c:973 sql_help.c:1167
 msgid "where action is one of:"
 msgstr "onde ação é uma das:"
 
-#: sql_help.c:423 sql_help.c:428 sql_help.c:972 sql_help.c:977 sql_help.c:1166
-#: sql_help.c:1170 sql_help.c:1690 sql_help.c:1769 sql_help.c:1951
-#: sql_help.c:2174 sql_help.c:2410 sql_help.c:3216
+#: sql_help.c:423 sql_help.c:428 sql_help.c:975 sql_help.c:980 sql_help.c:1169
+#: sql_help.c:1173 sql_help.c:1698 sql_help.c:1777 sql_help.c:1959
+#: sql_help.c:2182 sql_help.c:2418 sql_help.c:3225
 msgid "data_type"
 msgstr "tipo_de_dado"
 
-#: sql_help.c:424 sql_help.c:429 sql_help.c:973 sql_help.c:978 sql_help.c:1167
-#: sql_help.c:1171 sql_help.c:1691 sql_help.c:1772 sql_help.c:1879
-#: sql_help.c:2175 sql_help.c:2411 sql_help.c:2417 sql_help.c:3124
+#: sql_help.c:424 sql_help.c:429 sql_help.c:976 sql_help.c:981 sql_help.c:1170
+#: sql_help.c:1174 sql_help.c:1699 sql_help.c:1780 sql_help.c:1887
+#: sql_help.c:2183 sql_help.c:2419 sql_help.c:2425 sql_help.c:3133
 msgid "collation"
 msgstr "ordenação"
 
-#: sql_help.c:425 sql_help.c:974 sql_help.c:1773 sql_help.c:2176
-#: sql_help.c:2187
+#: sql_help.c:425 sql_help.c:977 sql_help.c:1781 sql_help.c:2184
+#: sql_help.c:2195
 msgid "column_constraint"
 msgstr "restrição_coluna"
 
-#: sql_help.c:435 sql_help.c:622 sql_help.c:985
+#: sql_help.c:435 sql_help.c:621 sql_help.c:988
 msgid "integer"
 msgstr "inteiro"
 
-#: sql_help.c:437 sql_help.c:440 sql_help.c:624 sql_help.c:627 sql_help.c:987
-#: sql_help.c:990
+#: sql_help.c:437 sql_help.c:440 sql_help.c:623 sql_help.c:626 sql_help.c:990
+#: sql_help.c:993
 msgid "attribute_option"
 msgstr "opção_atributo"
 
-#: sql_help.c:445 sql_help.c:992 sql_help.c:1774 sql_help.c:2177
-#: sql_help.c:2188
+#: sql_help.c:445 sql_help.c:995 sql_help.c:1782 sql_help.c:2185
+#: sql_help.c:2196
 msgid "table_constraint"
 msgstr "restrição_tabela"
 
-#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:997
-#: sql_help.c:998 sql_help.c:999 sql_help.c:1000 sql_help.c:1415
+#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:1000
+#: sql_help.c:1001 sql_help.c:1002 sql_help.c:1003 sql_help.c:1423
 msgid "trigger_name"
 msgstr "nome_gatilho"
 
-#: sql_help.c:452 sql_help.c:453 sql_help.c:1010 sql_help.c:1011
-#: sql_help.c:1775 sql_help.c:2180
+#: sql_help.c:452 sql_help.c:453 sql_help.c:1013 sql_help.c:1014
+#: sql_help.c:1783 sql_help.c:2188
 msgid "parent_table"
 msgstr "tabela_ancestral"
 
-#: sql_help.c:504 sql_help.c:1819
+#: sql_help.c:504 sql_help.c:1827
 msgid "execution_cost"
 msgstr "custo_execução"
 
-#: sql_help.c:505 sql_help.c:1820
+#: sql_help.c:505 sql_help.c:1828
 msgid "result_rows"
 msgstr "registros_retornados"
 
-#: sql_help.c:526 sql_help.c:528 sql_help.c:783 sql_help.c:791 sql_help.c:795
-#: sql_help.c:798 sql_help.c:801 sql_help.c:1205 sql_help.c:1213
-#: sql_help.c:1216 sql_help.c:1218 sql_help.c:1220 sql_help.c:2067
-#: sql_help.c:2069 sql_help.c:2072 sql_help.c:2073 sql_help.c:3033
-#: sql_help.c:3037 sql_help.c:3040 sql_help.c:3042 sql_help.c:3044
-#: sql_help.c:3046 sql_help.c:3048 sql_help.c:3054 sql_help.c:3056
-#: sql_help.c:3058 sql_help.c:3060 sql_help.c:3062 sql_help.c:3064
-#, fuzzy
-#| msgid "Replication"
+#: sql_help.c:526 sql_help.c:528 sql_help.c:784 sql_help.c:792 sql_help.c:796
+#: sql_help.c:799 sql_help.c:802 sql_help.c:1209 sql_help.c:1217
+#: sql_help.c:1221 sql_help.c:1224 sql_help.c:1227 sql_help.c:2075
+#: sql_help.c:2077 sql_help.c:2080 sql_help.c:2081 sql_help.c:3042
+#: sql_help.c:3046 sql_help.c:3049 sql_help.c:3051 sql_help.c:3053
+#: sql_help.c:3055 sql_help.c:3057 sql_help.c:3063 sql_help.c:3065
+#: sql_help.c:3067 sql_help.c:3069 sql_help.c:3071 sql_help.c:3073
 msgid "role_specification"
 msgstr "especificação_role"
 
-#: sql_help.c:527 sql_help.c:529 sql_help.c:1232 sql_help.c:1665
-#: sql_help.c:2075 sql_help.c:2486 sql_help.c:2875 sql_help.c:3691
+#: sql_help.c:527 sql_help.c:529 sql_help.c:1240 sql_help.c:1673
+#: sql_help.c:2083 sql_help.c:2495 sql_help.c:2884 sql_help.c:3700
 msgid "user_name"
 msgstr "nome_usuário"
 
-#: sql_help.c:530 sql_help.c:803 sql_help.c:1221 sql_help.c:2074
-#: sql_help.c:3065
-#, fuzzy
-#| msgid "where option can be:"
+#: sql_help.c:530 sql_help.c:804 sql_help.c:1229 sql_help.c:2082
+#: sql_help.c:3074
 msgid "where role_specification can be:"
 msgstr "onde especificação_role pode ser:"
 
@@ -3503,969 +3499,938 @@
 msgid "group_name"
 msgstr "nome_grupo"
 
-#: sql_help.c:549 sql_help.c:1670 sql_help.c:1883 sql_help.c:1915
-#: sql_help.c:2183 sql_help.c:2191 sql_help.c:2223 sql_help.c:2245
-#: sql_help.c:2257 sql_help.c:3061 sql_help.c:3393
+#: sql_help.c:549 sql_help.c:1678 sql_help.c:1891 sql_help.c:1923
+#: sql_help.c:2191 sql_help.c:2199 sql_help.c:2231 sql_help.c:2253
+#: sql_help.c:2265 sql_help.c:3070 sql_help.c:3402
 msgid "tablespace_name"
 msgstr "nome_tablespace"
 
-#: sql_help.c:551 sql_help.c:554 sql_help.c:630 sql_help.c:632 sql_help.c:1007
-#: sql_help.c:1009 sql_help.c:1881 sql_help.c:1913 sql_help.c:2181
-#: sql_help.c:2189 sql_help.c:2221 sql_help.c:2243
+#: sql_help.c:551 sql_help.c:554 sql_help.c:629 sql_help.c:631 sql_help.c:1010
+#: sql_help.c:1012 sql_help.c:1889 sql_help.c:1921 sql_help.c:2189
+#: sql_help.c:2197 sql_help.c:2229 sql_help.c:2251
 msgid "storage_parameter"
 msgstr "parâmetro_armazenamento"
 
-#: sql_help.c:577 sql_help.c:1389 sql_help.c:3476
+#: sql_help.c:577 sql_help.c:1397 sql_help.c:3485
 msgid "large_object_oid"
 msgstr "oid_objeto_grande"
 
-#: sql_help.c:629 sql_help.c:1005 sql_help.c:1014 sql_help.c:1017
-#: sql_help.c:1313
+#: sql_help.c:628 sql_help.c:1008 sql_help.c:1017 sql_help.c:1020
+#: sql_help.c:1321
 msgid "index_name"
 msgstr "nome_índice"
 
-#: sql_help.c:705 sql_help.c:717 sql_help.c:1954
+#: sql_help.c:703 sql_help.c:715 sql_help.c:1962
 msgid "strategy_number"
 msgstr "número_estratégia"
 
-#: sql_help.c:707 sql_help.c:708 sql_help.c:711 sql_help.c:712 sql_help.c:718
-#: sql_help.c:719 sql_help.c:721 sql_help.c:722 sql_help.c:1956
-#: sql_help.c:1957 sql_help.c:1960 sql_help.c:1961
+#: sql_help.c:705 sql_help.c:706 sql_help.c:709 sql_help.c:710 sql_help.c:716
+#: sql_help.c:717 sql_help.c:719 sql_help.c:720 sql_help.c:1964
+#: sql_help.c:1965 sql_help.c:1968 sql_help.c:1969
 msgid "op_type"
 msgstr "tipo_operador"
 
-#: sql_help.c:709 sql_help.c:1958
+#: sql_help.c:707 sql_help.c:1966
 msgid "sort_family_name"
 msgstr "nome_família_ordenação"
 
-#: sql_help.c:710 sql_help.c:720 sql_help.c:1959
+#: sql_help.c:708 sql_help.c:718 sql_help.c:1967
 msgid "support_number"
 msgstr "número_suporte"
 
-#: sql_help.c:714 sql_help.c:1613 sql_help.c:1963 sql_help.c:2334
-#: sql_help.c:2336
+#: sql_help.c:712 sql_help.c:1621 sql_help.c:1971 sql_help.c:2342
+#: sql_help.c:2344
 msgid "argument_type"
 msgstr "tipo_argumento"
 
-#: sql_help.c:744 sql_help.c:813 sql_help.c:849 sql_help.c:1130
-#: sql_help.c:1272 sql_help.c:1312 sql_help.c:1374 sql_help.c:1399
-#: sql_help.c:1403 sql_help.c:1416 sql_help.c:1473 sql_help.c:1478
-#: sql_help.c:1767 sql_help.c:1875 sql_help.c:1911 sql_help.c:1986
-#: sql_help.c:2044 sql_help.c:2092 sql_help.c:2172 sql_help.c:2184
-#: sql_help.c:2241 sql_help.c:2359 sql_help.c:2535 sql_help.c:2744
-#: sql_help.c:2761 sql_help.c:2851 sql_help.c:3031 sql_help.c:3036
-#: sql_help.c:3081 sql_help.c:3112 sql_help.c:3363 sql_help.c:3368
-#: sql_help.c:3464 sql_help.c:3561 sql_help.c:3563 sql_help.c:3612
-#: sql_help.c:3651 sql_help.c:3800 sql_help.c:3802 sql_help.c:3851
-#: sql_help.c:3885 sql_help.c:3907 sql_help.c:3909 sql_help.c:3910
-#: sql_help.c:3994 sql_help.c:3996 sql_help.c:4045
+#: sql_help.c:743 sql_help.c:746 sql_help.c:814 sql_help.c:850 sql_help.c:1133
+#: sql_help.c:1280 sql_help.c:1320 sql_help.c:1382 sql_help.c:1407
+#: sql_help.c:1411 sql_help.c:1424 sql_help.c:1481 sql_help.c:1486
+#: sql_help.c:1775 sql_help.c:1883 sql_help.c:1919 sql_help.c:1994
+#: sql_help.c:2052 sql_help.c:2100 sql_help.c:2180 sql_help.c:2192
+#: sql_help.c:2249 sql_help.c:2367 sql_help.c:2544 sql_help.c:2753
+#: sql_help.c:2770 sql_help.c:2860 sql_help.c:3040 sql_help.c:3045
+#: sql_help.c:3090 sql_help.c:3121 sql_help.c:3372 sql_help.c:3377
+#: sql_help.c:3473 sql_help.c:3570 sql_help.c:3572 sql_help.c:3621
+#: sql_help.c:3660 sql_help.c:3809 sql_help.c:3811 sql_help.c:3860
+#: sql_help.c:3894 sql_help.c:3916 sql_help.c:3918 sql_help.c:3919
+#: sql_help.c:4003 sql_help.c:4005 sql_help.c:4054
 msgid "table_name"
 msgstr "nome_tabela"
 
-#: sql_help.c:747 sql_help.c:1988
-#, fuzzy
-#| msgid "missing expression"
+#: sql_help.c:748 sql_help.c:1996
 msgid "using_expression"
 msgstr "expressão_using"
 
-#: sql_help.c:748 sql_help.c:1989
-#, fuzzy
-#| msgid "expression"
+#: sql_help.c:749 sql_help.c:1997
 msgid "check_expression"
 msgstr "expressão_check"
 
-#: sql_help.c:787 sql_help.c:1209 sql_help.c:1855 sql_help.c:2021
-#: sql_help.c:2469
+#: sql_help.c:788 sql_help.c:1213 sql_help.c:1863 sql_help.c:2029
+#: sql_help.c:2478
 msgid "password"
 msgstr "senha"
 
-#: sql_help.c:788 sql_help.c:1210 sql_help.c:1856 sql_help.c:2022
-#: sql_help.c:2470
+#: sql_help.c:789 sql_help.c:1214 sql_help.c:1864 sql_help.c:2030
+#: sql_help.c:2479
 msgid "timestamp"
 msgstr "tempo_absoluto"
 
-#: sql_help.c:792 sql_help.c:796 sql_help.c:799 sql_help.c:802 sql_help.c:3041
-#: sql_help.c:3373
+#: sql_help.c:793 sql_help.c:797 sql_help.c:800 sql_help.c:803 sql_help.c:1218
+#: sql_help.c:1222 sql_help.c:1225 sql_help.c:1228 sql_help.c:3050
+#: sql_help.c:3382
 msgid "database_name"
 msgstr "nome_banco_de_dados"
 
-#: sql_help.c:843 sql_help.c:2087
+#: sql_help.c:844 sql_help.c:2095
 msgid "increment"
 msgstr "incremento"
 
-#: sql_help.c:844 sql_help.c:2088
+#: sql_help.c:845 sql_help.c:2096
 msgid "minvalue"
 msgstr "valor_mínimo"
 
-#: sql_help.c:845 sql_help.c:2089
+#: sql_help.c:846 sql_help.c:2097
 msgid "maxvalue"
 msgstr "valor_máximo"
 
-#: sql_help.c:846 sql_help.c:2090 sql_help.c:3559 sql_help.c:3649
-#: sql_help.c:3798 sql_help.c:3927 sql_help.c:3992
+#: sql_help.c:847 sql_help.c:2098 sql_help.c:3568 sql_help.c:3658
+#: sql_help.c:3807 sql_help.c:3936 sql_help.c:4001
 msgid "start"
 msgstr "início"
 
-#: sql_help.c:847
+#: sql_help.c:848
 msgid "restart"
 msgstr "reinício"
 
-#: sql_help.c:848 sql_help.c:2091
+#: sql_help.c:849 sql_help.c:2099
 msgid "cache"
 msgstr "cache"
 
-#: sql_help.c:993
+#: sql_help.c:996
 msgid "table_constraint_using_index"
 msgstr "restrição_tabela_utilizando_índice"
 
-#: sql_help.c:1001 sql_help.c:1002 sql_help.c:1003 sql_help.c:1004
+#: sql_help.c:1004 sql_help.c:1005 sql_help.c:1006 sql_help.c:1007
 msgid "rewrite_rule_name"
 msgstr "nome_regra_reescrita"
 
-#: sql_help.c:1015
+#: sql_help.c:1018
 msgid "and table_constraint_using_index is:"
 msgstr "e restrição_tabela_utilizando_índice é:"
 
-#: sql_help.c:1033 sql_help.c:1036 sql_help.c:2260
+#: sql_help.c:1036 sql_help.c:1039 sql_help.c:2268
 msgid "tablespace_option"
 msgstr "opção_tablespace"
 
-#: sql_help.c:1057 sql_help.c:1060 sql_help.c:1066 sql_help.c:1070
+#: sql_help.c:1060 sql_help.c:1063 sql_help.c:1069 sql_help.c:1073
 msgid "token_type"
 msgstr "tipo_elemento"
 
-#: sql_help.c:1058 sql_help.c:1061
+#: sql_help.c:1061 sql_help.c:1064
 msgid "dictionary_name"
 msgstr "nome_dicionário"
 
-#: sql_help.c:1063 sql_help.c:1067
+#: sql_help.c:1066 sql_help.c:1070
 msgid "old_dictionary"
 msgstr "dicionário_antigo"
 
-#: sql_help.c:1064 sql_help.c:1068
+#: sql_help.c:1067 sql_help.c:1071
 msgid "new_dictionary"
 msgstr "novo_dicionário"
 
-#: sql_help.c:1155 sql_help.c:1165 sql_help.c:1168 sql_help.c:1169
-#: sql_help.c:2409
+#: sql_help.c:1158 sql_help.c:1168 sql_help.c:1171 sql_help.c:1172
+#: sql_help.c:2417
 msgid "attribute_name"
 msgstr "nome_atributo"
 
-#: sql_help.c:1156
+#: sql_help.c:1159
 msgid "new_attribute_name"
 msgstr "novo_nome_atributo"
 
-#: sql_help.c:1162
+#: sql_help.c:1165
 msgid "new_enum_value"
 msgstr "novo_valor_enum"
 
-#: sql_help.c:1163
+#: sql_help.c:1166
 msgid "existing_enum_value"
 msgstr "valor_enum_existente"
 
-#: sql_help.c:1233 sql_help.c:1776 sql_help.c:2103 sql_help.c:2487
-#: sql_help.c:2876 sql_help.c:3047 sql_help.c:3082 sql_help.c:3379
+#: sql_help.c:1241 sql_help.c:1784 sql_help.c:2111 sql_help.c:2496
+#: sql_help.c:2885 sql_help.c:3056 sql_help.c:3091 sql_help.c:3388
 msgid "server_name"
 msgstr "nome_servidor"
 
-#: sql_help.c:1261 sql_help.c:1264 sql_help.c:2502
+#: sql_help.c:1269 sql_help.c:1272 sql_help.c:2511
 msgid "view_option_name"
 msgstr "nome_opção_visão"
 
-#: sql_help.c:1262 sql_help.c:2503
+#: sql_help.c:1270 sql_help.c:2512
 msgid "view_option_value"
 msgstr "valor_opção_visão"
 
-#: sql_help.c:1287 sql_help.c:3707 sql_help.c:3709 sql_help.c:3733
+#: sql_help.c:1295 sql_help.c:3716 sql_help.c:3718 sql_help.c:3742
 msgid "transaction_mode"
 msgstr "modo_transação"
 
-#: sql_help.c:1288 sql_help.c:3710 sql_help.c:3734
+#: sql_help.c:1296 sql_help.c:3719 sql_help.c:3743
 msgid "where transaction_mode is one of:"
 msgstr "onde modo_transação é um dos:"
 
-#: sql_help.c:1371
+#: sql_help.c:1379
 msgid "relation_name"
 msgstr "nome_relação"
 
-#: sql_help.c:1376 sql_help.c:3043 sql_help.c:3375
+#: sql_help.c:1384 sql_help.c:3052 sql_help.c:3384
 msgid "domain_name"
 msgstr "nome_domínio"
 
-#: sql_help.c:1398
-#, fuzzy
-#| msgid "role_name"
+#: sql_help.c:1406
 msgid "policy_name"
-msgstr "nome_role"
+msgstr "nome_política"
 
-#: sql_help.c:1402
+#: sql_help.c:1410
 msgid "rule_name"
 msgstr "nome_regra"
 
-#: sql_help.c:1419
+#: sql_help.c:1427
 msgid "text"
 msgstr "texto"
 
-#: sql_help.c:1444 sql_help.c:3225 sql_help.c:3413
+#: sql_help.c:1452 sql_help.c:3234 sql_help.c:3422
 msgid "transaction_id"
 msgstr "id_transação"
 
-#: sql_help.c:1475 sql_help.c:1481 sql_help.c:3151
+#: sql_help.c:1483 sql_help.c:1489 sql_help.c:3160
 msgid "filename"
 msgstr "arquivo"
 
-#: sql_help.c:1476 sql_help.c:1482 sql_help.c:2046 sql_help.c:2047
-#: sql_help.c:2048
+#: sql_help.c:1484 sql_help.c:1490 sql_help.c:2054 sql_help.c:2055
+#: sql_help.c:2056
 msgid "command"
 msgstr "comando"
 
-#: sql_help.c:1480 sql_help.c:1916 sql_help.c:2246 sql_help.c:2504
-#: sql_help.c:2522 sql_help.c:3116
+#: sql_help.c:1488 sql_help.c:1924 sql_help.c:2254 sql_help.c:2513
+#: sql_help.c:2531 sql_help.c:3125
 msgid "query"
 msgstr "consulta"
 
-#: sql_help.c:1484 sql_help.c:2921
+#: sql_help.c:1492 sql_help.c:2930
 msgid "where option can be one of:"
 msgstr "onde opção pode ser um das:"
 
-#: sql_help.c:1485
+#: sql_help.c:1493
 msgid "format_name"
 msgstr "nome_formato"
 
-#: sql_help.c:1486 sql_help.c:1487 sql_help.c:1490 sql_help.c:2922
-#: sql_help.c:2923 sql_help.c:2924 sql_help.c:2925 sql_help.c:2926
+#: sql_help.c:1494 sql_help.c:1495 sql_help.c:1498 sql_help.c:2931
+#: sql_help.c:2932 sql_help.c:2933 sql_help.c:2934 sql_help.c:2935
 msgid "boolean"
 msgstr "booleano"
 
-#: sql_help.c:1488
+#: sql_help.c:1496
 msgid "delimiter_character"
 msgstr "caracter_delimitador"
 
-#: sql_help.c:1489
+#: sql_help.c:1497
 msgid "null_string"
 msgstr "cadeia_nula"
 
-#: sql_help.c:1491
+#: sql_help.c:1499
 msgid "quote_character"
 msgstr "caracter_separador"
 
-#: sql_help.c:1492
+#: sql_help.c:1500
 msgid "escape_character"
 msgstr "caracter_escape"
 
-#: sql_help.c:1496
+#: sql_help.c:1504
 msgid "encoding_name"
 msgstr "nome_codificação"
 
-#: sql_help.c:1553 sql_help.c:1569 sql_help.c:1572
+#: sql_help.c:1561 sql_help.c:1577 sql_help.c:1580
 msgid "arg_data_type"
 msgstr "tipo_de_dado_arg"
 
-#: sql_help.c:1554 sql_help.c:1573 sql_help.c:1581
+#: sql_help.c:1562 sql_help.c:1581 sql_help.c:1589
 msgid "sfunc"
 msgstr "função_trans_estado"
 
-#: sql_help.c:1555 sql_help.c:1574 sql_help.c:1582
+#: sql_help.c:1563 sql_help.c:1582 sql_help.c:1590
 msgid "state_data_type"
 msgstr "tipo_de_dado_estado"
 
-#: sql_help.c:1556 sql_help.c:1575 sql_help.c:1583
+#: sql_help.c:1564 sql_help.c:1583 sql_help.c:1591
 msgid "state_data_size"
 msgstr "tamanho_de_dado_estado"
 
-#: sql_help.c:1557 sql_help.c:1576 sql_help.c:1584
+#: sql_help.c:1565 sql_help.c:1584 sql_help.c:1592
 msgid "ffunc"
 msgstr "função_final"
 
-#: sql_help.c:1558 sql_help.c:1577 sql_help.c:1585
+#: sql_help.c:1566 sql_help.c:1585 sql_help.c:1593
 msgid "initial_condition"
 msgstr "condição_inicial"
 
-#: sql_help.c:1559 sql_help.c:1586
+#: sql_help.c:1567 sql_help.c:1594
 msgid "msfunc"
 msgstr "função_mestado"
 
-#: sql_help.c:1560 sql_help.c:1587
+#: sql_help.c:1568 sql_help.c:1595
 msgid "minvfunc"
 msgstr "função_minv"
 
-#: sql_help.c:1561 sql_help.c:1588
+#: sql_help.c:1569 sql_help.c:1596
 msgid "mstate_data_type"
 msgstr "tipo_de_dado_mestado"
 
-#: sql_help.c:1562 sql_help.c:1589
+#: sql_help.c:1570 sql_help.c:1597
 msgid "mstate_data_size"
 msgstr "tamanho_de_dado_mestado"
 
-#: sql_help.c:1563 sql_help.c:1590
+#: sql_help.c:1571 sql_help.c:1598
 msgid "mffunc"
 msgstr "função_mfinal"
 
-#: sql_help.c:1564 sql_help.c:1591
+#: sql_help.c:1572 sql_help.c:1599
 msgid "minitial_condition"
 msgstr "condição_minicial"
 
-#: sql_help.c:1565 sql_help.c:1592
+#: sql_help.c:1573 sql_help.c:1600
 msgid "sort_operator"
 msgstr "operador_ordenação"
 
-#: sql_help.c:1578
+#: sql_help.c:1586
 msgid "or the old syntax"
 msgstr "ou a sintaxe antiga"
 
-#: sql_help.c:1580
+#: sql_help.c:1588
 msgid "base_type"
 msgstr "tipo_base"
 
-#: sql_help.c:1631
+#: sql_help.c:1639
 msgid "locale"
 msgstr "configuração regional"
 
-#: sql_help.c:1632 sql_help.c:1668
+#: sql_help.c:1640 sql_help.c:1676
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:1633 sql_help.c:1669
+#: sql_help.c:1641 sql_help.c:1677
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:1635
+#: sql_help.c:1643
 msgid "existing_collation"
 msgstr "ordenação_existente"
 
-#: sql_help.c:1645
+#: sql_help.c:1653
 msgid "source_encoding"
 msgstr "codificação_origem"
 
-#: sql_help.c:1646
+#: sql_help.c:1654
 msgid "dest_encoding"
 msgstr "codificação_destino"
 
-#: sql_help.c:1666 sql_help.c:2286
+#: sql_help.c:1674 sql_help.c:2294
 msgid "template"
 msgstr "modelo"
 
-#: sql_help.c:1667
+#: sql_help.c:1675
 msgid "encoding"
 msgstr "codificação"
 
-#: sql_help.c:1693
+#: sql_help.c:1701
 msgid "constraint"
 msgstr "restrição"
 
-#: sql_help.c:1694
+#: sql_help.c:1702
 msgid "where constraint is:"
 msgstr "onde restrição é:"
 
-#: sql_help.c:1708 sql_help.c:2043 sql_help.c:2358
+#: sql_help.c:1716 sql_help.c:2051 sql_help.c:2366
 msgid "event"
 msgstr "evento"
 
-#: sql_help.c:1709
+#: sql_help.c:1717
 msgid "filter_variable"
 msgstr "variável_filtro"
 
-#: sql_help.c:1721
+#: sql_help.c:1729
 msgid "extension_name"
 msgstr "nome_extensão"
 
-#: sql_help.c:1723
+#: sql_help.c:1731
 msgid "version"
 msgstr "versão"
 
-#: sql_help.c:1724
+#: sql_help.c:1732
 msgid "old_version"
 msgstr "versão_antiga"
 
-#: sql_help.c:1779 sql_help.c:2192
+#: sql_help.c:1787 sql_help.c:2200
 msgid "where column_constraint is:"
 msgstr "onde restrição_coluna é:"
 
-#: sql_help.c:1782 sql_help.c:1813 sql_help.c:2195
+#: sql_help.c:1790 sql_help.c:1821 sql_help.c:2203
 msgid "default_expr"
 msgstr "expressão_padrão"
 
-#: sql_help.c:1783 sql_help.c:2202
+#: sql_help.c:1791 sql_help.c:2210
 msgid "and table_constraint is:"
 msgstr "e restrição_tabela é:"
 
-#: sql_help.c:1814
+#: sql_help.c:1822
 msgid "rettype"
 msgstr "tipo_retorno"
 
-#: sql_help.c:1816
+#: sql_help.c:1824
 msgid "column_type"
 msgstr "tipo_coluna"
 
-#: sql_help.c:1824
+#: sql_help.c:1832
 msgid "definition"
 msgstr "definição"
 
-#: sql_help.c:1825
+#: sql_help.c:1833
 msgid "obj_file"
 msgstr "arquivo_objeto"
 
-#: sql_help.c:1826
+#: sql_help.c:1834
 msgid "link_symbol"
 msgstr "símbolo_ligação"
 
-#: sql_help.c:1827
+#: sql_help.c:1835
 msgid "attribute"
 msgstr "atributo"
 
-#: sql_help.c:1862 sql_help.c:2028 sql_help.c:2476
+#: sql_help.c:1870 sql_help.c:2036 sql_help.c:2485
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:1876
+#: sql_help.c:1884
 msgid "method"
 msgstr "método"
 
-#: sql_help.c:1880 sql_help.c:2227 sql_help.c:3125
+#: sql_help.c:1888 sql_help.c:2235 sql_help.c:3134
 msgid "opclass"
 msgstr "classe_operadores"
 
-#: sql_help.c:1884 sql_help.c:2213
+#: sql_help.c:1892 sql_help.c:2221
 msgid "predicate"
 msgstr "predicado"
 
-#: sql_help.c:1896
+#: sql_help.c:1904
 msgid "call_handler"
 msgstr "manipulador_chamada"
 
-#: sql_help.c:1897
+#: sql_help.c:1905
 msgid "inline_handler"
 msgstr "manipulador_em_linha"
 
-#: sql_help.c:1898
+#: sql_help.c:1906
 msgid "valfunction"
 msgstr "função_validação"
 
-#: sql_help.c:1934
+#: sql_help.c:1942
 msgid "com_op"
 msgstr "operador_comutação"
 
-#: sql_help.c:1935
+#: sql_help.c:1943
 msgid "neg_op"
 msgstr "operador_negação"
 
-#: sql_help.c:1936
+#: sql_help.c:1944
 msgid "res_proc"
 msgstr "proc_restrição"
 
-#: sql_help.c:1937
+#: sql_help.c:1945
 msgid "join_proc"
 msgstr "proc_junção"
 
-#: sql_help.c:1953
+#: sql_help.c:1961
 msgid "family_name"
 msgstr "nome_família"
 
-#: sql_help.c:1964
+#: sql_help.c:1972
 msgid "storage_type"
 msgstr "tipo_armazenamento"
 
-#: sql_help.c:2045 sql_help.c:2361 sql_help.c:2538 sql_help.c:3135
-#: sql_help.c:3550 sql_help.c:3552 sql_help.c:3640 sql_help.c:3642
-#: sql_help.c:3789 sql_help.c:3791 sql_help.c:3894 sql_help.c:3983
-#: sql_help.c:3985
+#: sql_help.c:2053 sql_help.c:2369 sql_help.c:2547 sql_help.c:3144
+#: sql_help.c:3559 sql_help.c:3561 sql_help.c:3649 sql_help.c:3651
+#: sql_help.c:3798 sql_help.c:3800 sql_help.c:3903 sql_help.c:3992
+#: sql_help.c:3994
 msgid "condition"
 msgstr "condição"
 
-#: sql_help.c:2049 sql_help.c:2364
+#: sql_help.c:2057 sql_help.c:2372
 msgid "where event can be one of:"
 msgstr "onde evento pode ser um dos:"
 
-#: sql_help.c:2068 sql_help.c:2070
+#: sql_help.c:2076 sql_help.c:2078
 msgid "schema_element"
 msgstr "elemento_esquema"
 
-#: sql_help.c:2104
+#: sql_help.c:2112
 msgid "server_type"
 msgstr "tipo_servidor"
 
-#: sql_help.c:2105
+#: sql_help.c:2113
 msgid "server_version"
 msgstr "versão_servidor"
 
-#: sql_help.c:2106 sql_help.c:3045 sql_help.c:3377
+#: sql_help.c:2114 sql_help.c:3054 sql_help.c:3386
 msgid "fdw_name"
 msgstr "nome_fdw"
 
-#: sql_help.c:2178
+#: sql_help.c:2186
 msgid "source_table"
 msgstr "tabela_origem"
 
-#: sql_help.c:2179
+#: sql_help.c:2187
 msgid "like_option"
 msgstr "opção_like"
 
-#: sql_help.c:2196 sql_help.c:2197 sql_help.c:2206 sql_help.c:2208
-#: sql_help.c:2212
+#: sql_help.c:2204 sql_help.c:2205 sql_help.c:2214 sql_help.c:2216
+#: sql_help.c:2220
 msgid "index_parameters"
 msgstr "parâmetros_índice"
 
-#: sql_help.c:2198 sql_help.c:2215
+#: sql_help.c:2206 sql_help.c:2223
 msgid "reftable"
 msgstr "tabela_ref"
 
-#: sql_help.c:2199 sql_help.c:2216
+#: sql_help.c:2207 sql_help.c:2224
 msgid "refcolumn"
 msgstr "coluna_ref"
 
-#: sql_help.c:2210
+#: sql_help.c:2218
 msgid "exclude_element"
 msgstr "elemento_exclusão"
 
-#: sql_help.c:2211 sql_help.c:3557 sql_help.c:3647 sql_help.c:3796
-#: sql_help.c:3925 sql_help.c:3990
+#: sql_help.c:2219 sql_help.c:3566 sql_help.c:3656 sql_help.c:3805
+#: sql_help.c:3934 sql_help.c:3999
 msgid "operator"
 msgstr "operador"
 
-#: sql_help.c:2219
+#: sql_help.c:2227
 msgid "and like_option is:"
 msgstr "e opção_like é:"
 
-#: sql_help.c:2220
+#: sql_help.c:2228
 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:2224
+#: sql_help.c:2232
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "elemento_exclusão em uma restrição EXCLUDE é:"
 
-#: sql_help.c:2259
+#: sql_help.c:2267
 msgid "directory"
 msgstr "diretório"
 
-#: sql_help.c:2273
+#: sql_help.c:2281
 msgid "parser_name"
 msgstr "nome_analisador"
 
-#: sql_help.c:2274
+#: sql_help.c:2282
 msgid "source_config"
 msgstr "configuração_origem"
 
-#: sql_help.c:2303
+#: sql_help.c:2311
 msgid "start_function"
 msgstr "função_início"
 
-#: sql_help.c:2304
+#: sql_help.c:2312
 msgid "gettoken_function"
 msgstr "função_gettoken"
 
-#: sql_help.c:2305
+#: sql_help.c:2313
 msgid "end_function"
 msgstr "função_fim"
 
-#: sql_help.c:2306
+#: sql_help.c:2314
 msgid "lextypes_function"
 msgstr "função_lextypes"
 
-#: sql_help.c:2307
+#: sql_help.c:2315
 msgid "headline_function"
 msgstr "função_headline"
 
-#: sql_help.c:2319
+#: sql_help.c:2327
 msgid "init_function"
 msgstr "função_init"
 
-#: sql_help.c:2320
+#: sql_help.c:2328
 msgid "lexize_function"
 msgstr "função_lexize"
 
-#: sql_help.c:2333
-#, fuzzy
-#| msgid "function_name"
+#: sql_help.c:2341
 msgid "from_sql_function_name"
-msgstr "nome_função"
+msgstr "nome_função_do_sql"
 
-#: sql_help.c:2335
-#, fuzzy
-#| msgid "function_name"
+#: sql_help.c:2343
 msgid "to_sql_function_name"
-msgstr "nome_função"
+msgstr "nome_função_para_sql"
 
-#: sql_help.c:2360
+#: sql_help.c:2368
 msgid "referenced_table_name"
 msgstr "nome_tabela_referenciada"
 
-#: sql_help.c:2363
+#: sql_help.c:2371
 msgid "arguments"
 msgstr "argumentos"
 
-#: sql_help.c:2413 sql_help.c:3485
+#: sql_help.c:2421 sql_help.c:3494
 msgid "label"
 msgstr "rótulo"
 
-#: sql_help.c:2415
+#: sql_help.c:2423
 msgid "subtype"
 msgstr "subtipo"
 
-#: sql_help.c:2416
+#: sql_help.c:2424
 msgid "subtype_operator_class"
 msgstr "classe_operadores_subtipo"
 
-#: sql_help.c:2418
+#: sql_help.c:2426
 msgid "canonical_function"
 msgstr "função_canônica"
 
-#: sql_help.c:2419
+#: sql_help.c:2427
 msgid "subtype_diff_function"
 msgstr "função_diff_subtipo"
 
-#: sql_help.c:2421
+#: sql_help.c:2429
 msgid "input_function"
 msgstr "função_entrada"
 
-#: sql_help.c:2422
+#: sql_help.c:2430
 msgid "output_function"
 msgstr "função_saída"
 
-#: sql_help.c:2423
+#: sql_help.c:2431
 msgid "receive_function"
 msgstr "função_recepção"
 
-#: sql_help.c:2424
+#: sql_help.c:2432
 msgid "send_function"
 msgstr "função_envio"
 
-#: sql_help.c:2425
+#: sql_help.c:2433
 msgid "type_modifier_input_function"
 msgstr "função_entrada_modificador_tipo"
 
-#: sql_help.c:2426
+#: sql_help.c:2434
 msgid "type_modifier_output_function"
 msgstr "função_saída_modificador_tipo"
 
-#: sql_help.c:2427
+#: sql_help.c:2435
 msgid "analyze_function"
 msgstr "função_análise"
 
-#: sql_help.c:2428
+#: sql_help.c:2436
 msgid "internallength"
 msgstr "tamanho_interno"
 
-#: sql_help.c:2429
+#: sql_help.c:2437
 msgid "alignment"
 msgstr "alinhamento"
 
-#: sql_help.c:2430
+#: sql_help.c:2438
 msgid "storage"
 msgstr "armazenamento"
 
-#: sql_help.c:2431
+#: sql_help.c:2439
 msgid "like_type"
 msgstr "tipo_like"
 
-#: sql_help.c:2432
+#: sql_help.c:2440
 msgid "category"
 msgstr "categoria"
 
-#: sql_help.c:2433
+#: sql_help.c:2441
 msgid "preferred"
 msgstr "tipo_preferido"
 
-#: sql_help.c:2434
+#: sql_help.c:2442
 msgid "default"
 msgstr "valor_padrão"
 
-#: sql_help.c:2435
+#: sql_help.c:2443
 msgid "element"
 msgstr "elemento"
 
-#: sql_help.c:2436
+#: sql_help.c:2444
 msgid "delimiter"
 msgstr "delimitador"
 
-#: sql_help.c:2437
+#: sql_help.c:2445
 msgid "collatable"
 msgstr "collatable"
 
-#: sql_help.c:2534 sql_help.c:3111 sql_help.c:3545 sql_help.c:3634
-#: sql_help.c:3784 sql_help.c:3884 sql_help.c:3978
+#: sql_help.c:2543 sql_help.c:3120 sql_help.c:3554 sql_help.c:3643
+#: sql_help.c:3793 sql_help.c:3893 sql_help.c:3987
 msgid "with_query"
 msgstr "consulta_with"
 
-#: sql_help.c:2536 sql_help.c:3113 sql_help.c:3564 sql_help.c:3570
-#: sql_help.c:3573 sql_help.c:3577 sql_help.c:3581 sql_help.c:3589
-#: sql_help.c:3803 sql_help.c:3809 sql_help.c:3812 sql_help.c:3816
-#: sql_help.c:3820 sql_help.c:3828 sql_help.c:3886 sql_help.c:3997
-#: sql_help.c:4003 sql_help.c:4006 sql_help.c:4010 sql_help.c:4014
-#: sql_help.c:4022
+#: sql_help.c:2545 sql_help.c:3122 sql_help.c:3573 sql_help.c:3579
+#: sql_help.c:3582 sql_help.c:3586 sql_help.c:3590 sql_help.c:3598
+#: sql_help.c:3812 sql_help.c:3818 sql_help.c:3821 sql_help.c:3825
+#: sql_help.c:3829 sql_help.c:3837 sql_help.c:3895 sql_help.c:4006
+#: sql_help.c:4012 sql_help.c:4015 sql_help.c:4019 sql_help.c:4023
+#: sql_help.c:4031
 msgid "alias"
 msgstr "aliás"
 
-#: sql_help.c:2537
+#: sql_help.c:2546
 msgid "using_list"
 msgstr "lista_using"
 
-#: sql_help.c:2539 sql_help.c:2952 sql_help.c:3192 sql_help.c:3895
+#: sql_help.c:2548 sql_help.c:2961 sql_help.c:3201 sql_help.c:3904
 msgid "cursor_name"
 msgstr "nome_cursor"
 
-#: sql_help.c:2540 sql_help.c:3119 sql_help.c:3896
+#: sql_help.c:2549 sql_help.c:3128 sql_help.c:3905
 msgid "output_expression"
 msgstr "expressão_saída"
 
-#: sql_help.c:2541 sql_help.c:3120 sql_help.c:3548 sql_help.c:3637
-#: sql_help.c:3787 sql_help.c:3897 sql_help.c:3981
+#: sql_help.c:2550 sql_help.c:3129 sql_help.c:3557 sql_help.c:3646
+#: sql_help.c:3796 sql_help.c:3906 sql_help.c:3990
 msgid "output_name"
 msgstr "nome_saída"
 
-#: sql_help.c:2557
+#: sql_help.c:2566
 msgid "code"
 msgstr "código"
 
-#: sql_help.c:2900
+#: sql_help.c:2909
 msgid "parameter"
 msgstr "parâmetro"
 
-#: sql_help.c:2919 sql_help.c:2920 sql_help.c:3217
+#: sql_help.c:2928 sql_help.c:2929 sql_help.c:3226
 msgid "statement"
 msgstr "comando"
 
-#: sql_help.c:2951 sql_help.c:3191
+#: sql_help.c:2960 sql_help.c:3200
 msgid "direction"
 msgstr "direção"
 
-#: sql_help.c:2953 sql_help.c:3193
+#: sql_help.c:2962 sql_help.c:3202
 msgid "where direction can be empty or one of:"
 msgstr "onde direção pode ser vazio ou um dos:"
 
-#: sql_help.c:2954 sql_help.c:2955 sql_help.c:2956 sql_help.c:2957
-#: sql_help.c:2958 sql_help.c:3194 sql_help.c:3195 sql_help.c:3196
-#: sql_help.c:3197 sql_help.c:3198 sql_help.c:3558 sql_help.c:3560
-#: sql_help.c:3648 sql_help.c:3650 sql_help.c:3797 sql_help.c:3799
-#: sql_help.c:3926 sql_help.c:3928 sql_help.c:3991 sql_help.c:3993
+#: sql_help.c:2963 sql_help.c:2964 sql_help.c:2965 sql_help.c:2966
+#: sql_help.c:2967 sql_help.c:3203 sql_help.c:3204 sql_help.c:3205
+#: sql_help.c:3206 sql_help.c:3207 sql_help.c:3567 sql_help.c:3569
+#: sql_help.c:3657 sql_help.c:3659 sql_help.c:3806 sql_help.c:3808
+#: sql_help.c:3935 sql_help.c:3937 sql_help.c:4000 sql_help.c:4002
 msgid "count"
 msgstr "contador"
 
-#: sql_help.c:3038 sql_help.c:3370
+#: sql_help.c:3047 sql_help.c:3379
 msgid "sequence_name"
 msgstr "nome_sequência"
 
-#: sql_help.c:3051 sql_help.c:3383
+#: sql_help.c:3060 sql_help.c:3392
 msgid "arg_name"
 msgstr "nome_argumento"
 
-#: sql_help.c:3052 sql_help.c:3384
+#: sql_help.c:3061 sql_help.c:3393
 msgid "arg_type"
 msgstr "tipo_argumento"
 
-#: sql_help.c:3057 sql_help.c:3389
+#: sql_help.c:3066 sql_help.c:3398
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:3080
-#, fuzzy
-#| msgid "remove a schema"
+#: sql_help.c:3089
 msgid "remote_schema"
 msgstr "esquema_remoto"
 
-#: sql_help.c:3083
-#, fuzzy
-#| msgid "local socket"
+#: sql_help.c:3092
 msgid "local_schema"
 msgstr "esquema_local"
 
-#: sql_help.c:3117
+#: sql_help.c:3126
 msgid "conflict_target"
-msgstr ""
+msgstr "alvo_conflito"
 
-#: sql_help.c:3118
-#, fuzzy
-#| msgid "canonical_function"
+#: sql_help.c:3127
 msgid "conflict_action"
-msgstr "função_canônica"
+msgstr "ação_conflito"
 
-#: sql_help.c:3121
-#, fuzzy
-#| msgid "where from_item can be one of:"
+#: sql_help.c:3130
 msgid "where conflict_target can be one of:"
-msgstr "onde item_from pode ser um dos:"
+msgstr "onde alvo_conflito pode ser um dos:"
 
-#: sql_help.c:3122
-#, fuzzy
-#| msgid "column_name"
-msgid "column_name_index"
-msgstr "nome_coluna"
+#: sql_help.c:3131
+msgid "index_column_name"
+msgstr "nome_coluna_índice"
 
-#: sql_help.c:3123
-#, fuzzy
-#| msgid "expression"
-msgid "expression_index"
-msgstr "expressão"
+#: sql_help.c:3132
+msgid "index_expression"
+msgstr "expressão_índice"
 
-#: sql_help.c:3126
-#, fuzzy
-#| msgid "predicate"
+#: sql_help.c:3135
 msgid "index_predicate"
 msgstr "predicado_índice"
 
-#: sql_help.c:3128
-#, fuzzy
-#| msgid "where action is one of:"
+#: sql_help.c:3137
 msgid "and conflict_action is one of:"
-msgstr "onde ação é uma das:"
+msgstr "onde ação_conflito é uma das:"
 
-#: sql_help.c:3134 sql_help.c:3892
+#: sql_help.c:3143 sql_help.c:3901
 msgid "sub-SELECT"
 msgstr "sub-SELECT"
 
-#: sql_help.c:3143 sql_help.c:3206 sql_help.c:3868
+#: sql_help.c:3152 sql_help.c:3215 sql_help.c:3877
 msgid "channel"
 msgstr "canal"
 
-#: sql_help.c:3165
+#: sql_help.c:3174
 msgid "lockmode"
 msgstr "modo_bloqueio"
 
-#: sql_help.c:3166
+#: sql_help.c:3175
 msgid "where lockmode is one of:"
 msgstr "onde modo_bloqueio é um dos:"
 
-#: sql_help.c:3207
+#: sql_help.c:3216
 msgid "payload"
 msgstr "informação"
 
-#: sql_help.c:3234
+#: sql_help.c:3243
 msgid "old_role"
 msgstr "role_antiga"
 
-#: sql_help.c:3235
+#: sql_help.c:3244
 msgid "new_role"
 msgstr "nova_role"
 
-#: sql_help.c:3260 sql_help.c:3421 sql_help.c:3429
+#: sql_help.c:3269 sql_help.c:3430 sql_help.c:3438
 msgid "savepoint_name"
 msgstr "nome_ponto_de_salvamento"
 
-#: sql_help.c:3462
+#: sql_help.c:3471
 msgid "provider"
 msgstr "fornecedor"
 
-#: sql_help.c:3549 sql_help.c:3591 sql_help.c:3593 sql_help.c:3639
-#: sql_help.c:3788 sql_help.c:3830 sql_help.c:3832 sql_help.c:3982
-#: sql_help.c:4024 sql_help.c:4026
+#: sql_help.c:3558 sql_help.c:3600 sql_help.c:3602 sql_help.c:3648
+#: sql_help.c:3797 sql_help.c:3839 sql_help.c:3841 sql_help.c:3991
+#: sql_help.c:4033 sql_help.c:4035
 msgid "from_item"
 msgstr "item_from"
 
-#: sql_help.c:3551 sql_help.c:3603 sql_help.c:3790 sql_help.c:3842
-#: sql_help.c:3984 sql_help.c:4036
-#, fuzzy
-#| msgid "wrong element type"
+#: sql_help.c:3560 sql_help.c:3612 sql_help.c:3799 sql_help.c:3851
+#: sql_help.c:3993 sql_help.c:4045
 msgid "grouping_element"
 msgstr "elemento_agrupamento"
 
-#: sql_help.c:3553 sql_help.c:3643 sql_help.c:3792 sql_help.c:3986
+#: sql_help.c:3562 sql_help.c:3652 sql_help.c:3801 sql_help.c:3995
 msgid "window_name"
 msgstr "nome_deslizante"
 
-#: sql_help.c:3554 sql_help.c:3644 sql_help.c:3793 sql_help.c:3987
+#: sql_help.c:3563 sql_help.c:3653 sql_help.c:3802 sql_help.c:3996
 msgid "window_definition"
 msgstr "definição_deslizante"
 
-#: sql_help.c:3555 sql_help.c:3569 sql_help.c:3607 sql_help.c:3645
-#: sql_help.c:3794 sql_help.c:3808 sql_help.c:3846 sql_help.c:3988
-#: sql_help.c:4002 sql_help.c:4040
+#: sql_help.c:3564 sql_help.c:3578 sql_help.c:3616 sql_help.c:3654
+#: sql_help.c:3803 sql_help.c:3817 sql_help.c:3855 sql_help.c:3997
+#: sql_help.c:4011 sql_help.c:4049
 msgid "select"
 msgstr "seleção"
 
-#: sql_help.c:3562 sql_help.c:3801 sql_help.c:3995
+#: sql_help.c:3571 sql_help.c:3810 sql_help.c:4004
 msgid "where from_item can be one of:"
 msgstr "onde item_from pode ser um dos:"
 
-#: sql_help.c:3565 sql_help.c:3571 sql_help.c:3574 sql_help.c:3578
-#: sql_help.c:3590 sql_help.c:3804 sql_help.c:3810 sql_help.c:3813
-#: sql_help.c:3817 sql_help.c:3829 sql_help.c:3998 sql_help.c:4004
-#: sql_help.c:4007 sql_help.c:4011 sql_help.c:4023
+#: sql_help.c:3574 sql_help.c:3580 sql_help.c:3583 sql_help.c:3587
+#: sql_help.c:3599 sql_help.c:3813 sql_help.c:3819 sql_help.c:3822
+#: sql_help.c:3826 sql_help.c:3838 sql_help.c:4007 sql_help.c:4013
+#: sql_help.c:4016 sql_help.c:4020 sql_help.c:4032
 msgid "column_alias"
 msgstr "aliás_coluna"
 
-#: sql_help.c:3566 sql_help.c:3805 sql_help.c:3999
-#, fuzzy
-#| msgid "index_method"
+#: sql_help.c:3575 sql_help.c:3814 sql_help.c:4008
 msgid "sampling_method"
 msgstr "método_amostragem"
 
-#: sql_help.c:3567 sql_help.c:3576 sql_help.c:3580 sql_help.c:3584
-#: sql_help.c:3587 sql_help.c:3806 sql_help.c:3815 sql_help.c:3819
-#: sql_help.c:3823 sql_help.c:3826 sql_help.c:4000 sql_help.c:4009
-#: sql_help.c:4013 sql_help.c:4017 sql_help.c:4020
+#: sql_help.c:3576 sql_help.c:3585 sql_help.c:3589 sql_help.c:3593
+#: sql_help.c:3596 sql_help.c:3815 sql_help.c:3824 sql_help.c:3828
+#: sql_help.c:3832 sql_help.c:3835 sql_help.c:4009 sql_help.c:4018
+#: sql_help.c:4022 sql_help.c:4026 sql_help.c:4029
 msgid "argument"
 msgstr "argumento"
 
-#: sql_help.c:3568 sql_help.c:3807 sql_help.c:4001
+#: sql_help.c:3577 sql_help.c:3816 sql_help.c:4010
 msgid "seed"
 msgstr "semente"
 
-#: sql_help.c:3572 sql_help.c:3605 sql_help.c:3811 sql_help.c:3844
-#: sql_help.c:4005 sql_help.c:4038
+#: sql_help.c:3581 sql_help.c:3614 sql_help.c:3820 sql_help.c:3853
+#: sql_help.c:4014 sql_help.c:4047
 msgid "with_query_name"
 msgstr "nome_consulta_with"
 
-#: sql_help.c:3582 sql_help.c:3585 sql_help.c:3588 sql_help.c:3821
-#: sql_help.c:3824 sql_help.c:3827 sql_help.c:4015 sql_help.c:4018
-#: sql_help.c:4021
+#: sql_help.c:3591 sql_help.c:3594 sql_help.c:3597 sql_help.c:3830
+#: sql_help.c:3833 sql_help.c:3836 sql_help.c:4024 sql_help.c:4027
+#: sql_help.c:4030
 msgid "column_definition"
 msgstr "definição_coluna"
 
-#: sql_help.c:3592 sql_help.c:3831 sql_help.c:4025
+#: sql_help.c:3601 sql_help.c:3840 sql_help.c:4034
 msgid "join_type"
 msgstr "tipo_junção"
 
-#: sql_help.c:3594 sql_help.c:3833 sql_help.c:4027
+#: sql_help.c:3603 sql_help.c:3842 sql_help.c:4036
 msgid "join_condition"
 msgstr "condição_junção"
 
-#: sql_help.c:3595 sql_help.c:3834 sql_help.c:4028
+#: sql_help.c:3604 sql_help.c:3843 sql_help.c:4037
 msgid "join_column"
 msgstr "coluna_junção"
 
-#: sql_help.c:3596 sql_help.c:3835 sql_help.c:4029
-#, fuzzy
-#| msgid "where event can be one of:"
+#: sql_help.c:3605 sql_help.c:3844 sql_help.c:4038
 msgid "and grouping_element can be one of:"
 msgstr "onde elemento_agrupamento pode ser um dos:"
 
-#: sql_help.c:3604 sql_help.c:3843 sql_help.c:4037
+#: sql_help.c:3613 sql_help.c:3852 sql_help.c:4046
 msgid "and with_query is:"
 msgstr "e consulta_with é:"
 
-#: sql_help.c:3608 sql_help.c:3847 sql_help.c:4041
+#: sql_help.c:3617 sql_help.c:3856 sql_help.c:4050
 msgid "values"
 msgstr "valores"
 
-#: sql_help.c:3609 sql_help.c:3848 sql_help.c:4042
+#: sql_help.c:3618 sql_help.c:3857 sql_help.c:4051
 msgid "insert"
 msgstr "inserção"
 
-#: sql_help.c:3610 sql_help.c:3849 sql_help.c:4043
+#: sql_help.c:3619 sql_help.c:3858 sql_help.c:4052
 msgid "update"
 msgstr "atualização"
 
-#: sql_help.c:3611 sql_help.c:3850 sql_help.c:4044
+#: sql_help.c:3620 sql_help.c:3859 sql_help.c:4053
 msgid "delete"
 msgstr "exclusão"
 
-#: sql_help.c:3638
+#: sql_help.c:3647
 msgid "new_table"
 msgstr "nova_tabela"
 
-#: sql_help.c:3663
+#: sql_help.c:3672
 msgid "timezone"
 msgstr "zona_horária"
 
-#: sql_help.c:3708
+#: sql_help.c:3717
 msgid "snapshot_id"
 msgstr "id_snapshot"
 
-#: sql_help.c:3893
+#: sql_help.c:3902
 msgid "from_list"
 msgstr "lista_from"
 
-#: sql_help.c:3924
+#: sql_help.c:3933
 msgid "sort_expression"
 msgstr "expressão_ordenação"
 
@@ -4550,9 +4515,8 @@
 msgstr "muda a definição de uma família de operadores"
 
 #: sql_help.h:297
-#, fuzzy
-msgid "change the definition of a policy"
-msgstr "muda a definição de uma política"
+msgid "change the definition of a row level security policy"
+msgstr "muda a definição de uma política de segurança a nível de registros"
 
 #: sql_help.h:302 sql_help.h:372
 msgid "change a database role"
@@ -4727,10 +4691,8 @@
 msgstr "define uma nova família de operadores"
 
 #: sql_help.h:522
-#, fuzzy
-#| msgid "define a new foreign table"
-msgid "define a new policy for a table"
-msgstr "define uma nova política para uma tabela"
+msgid "define a new row level security policy for a table"
+msgstr "define uma nova política de segurança a nível de registros para uma tabela"
 
 #: sql_help.h:532
 msgid "define a new rewrite rule"
@@ -4777,10 +4739,8 @@
 msgstr "define um novo modelo de busca textual"
 
 #: sql_help.h:587
-#, fuzzy
-#| msgid "define a new operator"
 msgid "define a new transform"
-msgstr "define um novo transformador"
+msgstr "define uma nova transformação"
 
 #: sql_help.h:592
 msgid "define a new trigger"
@@ -4895,10 +4855,8 @@
 msgstr "remove objetos do banco de dados cujo dono é uma role do banco de dados"
 
 #: sql_help.h:737
-#, fuzzy
-#| msgid "remove a foreign table"
-msgid "remove a policy from a table"
-msgstr "remove uma política de uma tabela"
+msgid "remove a row level security policy from a table"
+msgstr "remove uma política de segurança a nível de registros de uma tabela"
 
 #: sql_help.h:747
 msgid "remove a rewrite rule"
@@ -4941,10 +4899,8 @@
 msgstr "remove um modelo de busca textual"
 
 #: sql_help.h:797
-#, fuzzy
-#| msgid "remove an operator"
 msgid "remove a transform"
-msgstr "remove um transformador"
+msgstr "remove uma transformação"
 
 #: sql_help.h:802
 msgid "remove a trigger"
@@ -4979,8 +4935,6 @@
 msgstr "define privilégios de acesso"
 
 #: sql_help.h:852
-#, fuzzy
-#| msgid "change the definition of a foreign server"
 msgid "import table definitions from a foreign server"
 msgstr "importa definições de tabelas de um servidor externo"
 
@@ -5109,12 +5063,12 @@
 msgid "%s: -1 can only be used in non-interactive mode\n"
 msgstr "%s: -1 só pode ser utilizado em modo não interativo\n"
 
-#: startup.c:277
+#: startup.c:278
 #, 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:339
+#: startup.c:342
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -5123,42 +5077,42 @@
 "Digite \"help\" para ajuda.\n"
 "\n"
 
-#: startup.c:486
+#: startup.c:490
 #, 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:526
+#: startup.c:530
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: não pôde apagar variável \"%s\"\n"
 
-#: startup.c:536
+#: startup.c:540
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: não pôde definir variável \"%s\"\n"
 
-#: startup.c:596
+#: startup.c:600
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: startup.c:613
+#: startup.c:617
 #, 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:635
+#: startup.c:639
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: não pôde encontrar executável\n"
 
-#: startup.c:757 startup.c:804 startup.c:825 startup.c:862 variables.c:121
+#: startup.c:761 startup.c:808 startup.c:829 startup.c:866 variables.c:121
 #, c-format
 msgid "unrecognized value \"%s\" for \"%s\"; assuming \"%s\"\n"
 msgstr "valor desconhecido \"%s\" para \"%s\"; definindo \"%s\"\n"
 
-#: tab-complete.c:4566
+#: tab-complete.c:4593
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/po/ru.po postgresql-9.5-9.5.8/src/bin/psql/po/ru.po
--- postgresql-9.5-9.5.2/src/bin/psql/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,42 +1,25 @@
 # Russian message translation file for psql
-#
-# Copyright (C) 2012 PostgreSQL Global Development Group
-# Copyright (c) 2001-2005 Serguei A. Mokhov, mokhov@cs.concordia.ca
-# Copyright (c) 2012-2013 Alexander Lakhin, exclusion@gmail.com
+# Copyright (C) 2001-2016 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
+# Serguei A. Mokhov <mokhov@cs.concordia.ca>, 2001-2005.
+# Oleg Bartunov <oleg@sai.msu.su>, 2004-2005.
+# Sergey Burladyan <eshkinkot@gmail.com>, 2012.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# ChangeLog:
-#   - August 24, 2014: Updates for 9.4. Alexander Lakhin <exclusion@gmail.com>.
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 22, 2012: Minor fixes: Alexander Lakhin <exclusion@gmail.com>
-#     - With corrections from Sergey Burladyan <eshkinkot@gmail.com>
-#   - January 29 - February 13, 2012: Fixes, completion, and updates for 9.1: Alexander Lakhin <exclusion@gmail.com>
-#   - January 17, 2005: Complete translation for 8.0, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - December, 2004 - January, 2005: New translation by Oleg Bartunov <oleg@sai.msu.su>.
-#   - March 27 - December 10, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>.
-#   - July 26 - October 12, 2003: Updates for 7.4.x; <mokhov@cs.concordia.ca>.
-#   - October 12, 2002: Complete post-7.3beta2 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - August 2001 - August 2002: Initial translation and maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: psql (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-01-15 04:42+0000\n"
-"PO-Revision-Date: 2016-01-17 08:09+0300\n"
-"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"POT-Creation-Date: 2017-05-26 20:50+0000\n"
+"PO-Revision-Date: 2017-05-27 15:09+0300\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
-"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
@@ -74,7 +57,7 @@
 msgstr "ошибка pclose: %s"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
-#: ../../common/fe_memutils.c:98 command.c:318 input.c:216 mainloop.c:73
+#: ../../common/fe_memutils.c:98 command.c:330 input.c:216 mainloop.c:73
 #: mainloop.c:253
 #, c-format
 msgid "out of memory\n"
@@ -90,7 +73,7 @@
 msgid "could not look up effective user ID %ld: %s"
 msgstr "вы��нить �ффективный идентификатор пользовател� (%ld) не удало�ь: %s"
 
-#: ../../common/username.c:47 command.c:273
+#: ../../common/username.c:47 command.c:285
 msgid "user does not exist"
 msgstr "пользователь не �уще�твует"
 
@@ -134,37 +117,37 @@
 msgid "child process exited with unrecognized status %d"
 msgstr "дочерний проце�� завершил�� � нера�познанным �о�то�нием %d"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "�еверна� команда \\%s. Справка по командам: \\?\n"
 
-#: command.c:116
+#: command.c:117
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "неверна� команда \\%s\n"
 
-#: command.c:127
+#: command.c:128
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
 msgstr "\\%s: лишний аргумент \"%s\" пропущен\n"
 
-#: command.c:271
+#: command.c:283
 #, c-format
 msgid "could not get home directory for user ID %ld: %s\n"
 msgstr "не удало�ь получить домашний каталог пользовател� c ид. %ld: %s\n"
 
-#: command.c:289
+#: command.c:301
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s: не удало�ь перейти в каталог \"%s\": %s\n"
 
-#: command.c:304 common.c:461 common.c:519 common.c:977
+#: command.c:316 common.c:466 common.c:524 common.c:982
 #, c-format
 msgid "You are currently not connected to a database.\n"
 msgstr "В данный момент вы не подключены к базе данных.\n"
 
-#: command.c:331
+#: command.c:343
 #, c-format
 msgid ""
 "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
@@ -173,7 +156,7 @@
 "Вы подключены к базе данных \"%s\" как пользователь \"%s\" через �окет в \"%s"
 "\", порт \"%s\".\n"
 
-#: command.c:334
+#: command.c:346
 #, c-format
 msgid ""
 "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
@@ -182,122 +165,121 @@
 "Вы подключены к базе данных \"%s\" как пользователь \"%s\" (�ервер \"%s\", "
 "порт \"%s\").\n"
 
-#: command.c:535 command.c:605 command.c:1405
+#: command.c:547 command.c:620 command.c:1423
 #, c-format
 msgid "no query buffer\n"
 msgstr "нет буфера запро�ов\n"
 
-#: command.c:568 command.c:3172
+#: command.c:580 command.c:3234
 #, c-format
 msgid "invalid line number: %s\n"
 msgstr "неверный номер �троки: %s\n"
 
-#: command.c:599
+#: command.c:613
 #, c-format
-msgid "The server (version %d.%d) does not support editing function source.\n"
+msgid "The server (version %s) does not support editing function source.\n"
 msgstr ""
-"Сервер (вер�и� %d.%d) не поддерживает редактирование и�ходного кода "
-"функции.\n"
+"Сервер (вер�и� %s) не поддерживает редактирование и�ходного кода функции.\n"
 
-#: command.c:679
+#: command.c:694
 msgid "No changes"
 msgstr "Изменений нет"
 
-#: command.c:733
+#: command.c:748
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
 "%s: неверное название кодировки �имволов или не найдена процедура "
 "перекодировки\n"
 
-#: command.c:830 command.c:880 command.c:894 command.c:911 command.c:1018
-#: command.c:1182 command.c:1385 command.c:1416
+#: command.c:845 command.c:895 command.c:909 command.c:926 command.c:1033
+#: command.c:1197 command.c:1403 command.c:1434
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "от�ут�твует необходимый аргумент \\%s\n"
 
-#: command.c:943
+#: command.c:958
 msgid "Query buffer is empty."
 msgstr "Буфер запро�а пу�т."
 
-#: command.c:953
+#: command.c:968
 msgid "Enter new password: "
 msgstr "Введите новый пароль: "
 
-#: command.c:954
+#: command.c:969
 msgid "Enter it again: "
 msgstr "Повторите его: "
 
-#: command.c:958
+#: command.c:973
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Пароли не �овпадают.\n"
 
-#: command.c:976
+#: command.c:991
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Ошибка при шифровании парол�.\n"
 
-#: command.c:1047 command.c:1163 command.c:1390
+#: command.c:1062 command.c:1178 command.c:1408
 #, c-format
 msgid "\\%s: error while setting variable\n"
 msgstr "\\%s: не удало�ь у�тановить переменную\n"
 
-#: command.c:1110
+#: command.c:1125
 msgid "Query buffer reset (cleared)."
 msgstr "Буфер запро�а �брошен (очищен)."
 
-#: command.c:1122
+#: command.c:1137
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "И�тори� запи�ана в файл \"%s\".\n"
 
-#: command.c:1187
+#: command.c:1202
 #, c-format
 msgid "\\%s: environment variable name must not contain \"=\"\n"
 msgstr "\\%s: им� переменной окружени� не может �одержать знак \"=\"\n"
 
-#: command.c:1229
+#: command.c:1246
 #, c-format
-msgid "The server (version %d.%d) does not support showing function source.\n"
-msgstr "Сервер (вер�и� %d.%d) не поддерживает вывод и�ходного кода функции.\n"
+msgid "The server (version %s) does not support showing function source.\n"
+msgstr "Сервер (вер�и� %s) не поддерживает вывод и�ходного кода функции.\n"
 
-#: command.c:1235
+#: command.c:1253
 #, c-format
 msgid "function name is required\n"
 msgstr "требует�� им� функции\n"
 
-#: command.c:1370
+#: command.c:1388
 msgid "Timing is on."
-msgstr "Секундомер включен."
+msgstr "Секундомер включён."
 
-#: command.c:1372
+#: command.c:1390
 msgid "Timing is off."
 msgstr "Секундомер выключен."
 
-#: command.c:1434 command.c:1454 command.c:2091 command.c:2094 command.c:2097
-#: command.c:2103 command.c:2105 command.c:2113 command.c:2123 command.c:2132
-#: command.c:2146 command.c:2163 command.c:2222 common.c:66 copy.c:331
-#: copy.c:391 copy.c:404 psqlscan.l:1700 psqlscan.l:1711 psqlscan.l:1721
+#: command.c:1452 command.c:1472 command.c:2153 command.c:2156 command.c:2159
+#: command.c:2165 command.c:2167 command.c:2175 command.c:2185 command.c:2194
+#: command.c:2208 command.c:2225 command.c:2284 common.c:67 copy.c:331
+#: copy.c:391 copy.c:404 psqlscan.l:1701 psqlscan.l:1712 psqlscan.l:1722
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1548
+#: command.c:1566
 #, c-format
 msgid "+ opt(%d) = |%s|\n"
 msgstr "+ opt(%d) = |%s|\n"
 
-#: command.c:1574 startup.c:195
+#: command.c:1592 startup.c:195
 msgid "Password: "
 msgstr "Пароль: "
 
-#: command.c:1579 startup.c:197
+#: command.c:1597 startup.c:197
 #, c-format
 msgid "Password for user %s: "
 msgstr "Пароль пользовател� %s: "
 
-#: command.c:1626
+#: command.c:1648
 #, c-format
 msgid ""
 "All connection parameters must be supplied because no database connection "
@@ -306,24 +288,24 @@
 "Без подключени� к базе данных необходимо указывать в�е параметры "
 "подключени�\n"
 
-#: command.c:1747 command.c:3206 common.c:139 common.c:432 common.c:1020
-#: common.c:1045 common.c:1145 copy.c:488 copy.c:698 large_obj.c:156
-#: large_obj.c:191 large_obj.c:253 psqlscan.l:1972
+#: command.c:1803 command.c:3268 common.c:140 common.c:437 common.c:1025
+#: common.c:1053 common.c:1153 copy.c:488 copy.c:708 large_obj.c:156
+#: large_obj.c:191 large_obj.c:253 psqlscan.l:1973
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1751
+#: command.c:1807
 #, c-format
 msgid "Previous connection kept\n"
 msgstr "Сохранено предыдущее подключение\n"
 
-#: command.c:1755
+#: command.c:1811
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1789
+#: command.c:1849
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
@@ -332,7 +314,7 @@
 "Вы подключены к базе данных \"%s\" как пользователь \"%s\" через �окет в \"%s"
 "\", порт \"%s\".\n"
 
-#: command.c:1792
+#: command.c:1852
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
@@ -341,43 +323,43 @@
 "Вы подключены к базе данных \"%s\" как пользователь \"%s\" (�ервер \"%s\", "
 "порт \"%s\") .\n"
 
-#: command.c:1796
+#: command.c:1856
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "Вы подключены к базе данных \"%s\" как пользователь \"%s\".\n"
 
-#: command.c:1830
+#: command.c:1889
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, �ервер %s)\n"
 
-#: command.c:1838
+#: command.c:1897
 #, c-format
 msgid ""
-"WARNING: %s major version %d.%d, server major version %d.%d.\n"
+"WARNING: %s major version %s, server major version %s.\n"
 "         Some psql features might not work.\n"
 msgstr ""
-"ПРЕДУПРЕЖДЕ�ИЕ: %s имеет базовую вер�ию %d.%d, а �ервер - %d.%d.\n"
+"ПРЕДУПРЕЖДЕ�ИЕ: %s имеет базовую вер�ию %s, а �ервер - %s.\n"
 "                Ча�ть функций psql может не работать.\n"
 
-#: command.c:1872
+#: command.c:1934
 #, c-format
 msgid "SSL connection (protocol: %s, cipher: %s, bits: %s, compression: %s)\n"
 msgstr "SSL-�оединение (протокол: %s, шифр: %s, бит: %s, �жатие: %s)\n"
 
-#: command.c:1873 command.c:1874 command.c:1875
+#: command.c:1935 command.c:1936 command.c:1937
 msgid "unknown"
 msgstr "неизве�тно"
 
-#: command.c:1876 help.c:46
+#: command.c:1938 help.c:46
 msgid "off"
 msgstr "выкл."
 
-#: command.c:1876 help.c:46
+#: command.c:1938 help.c:46
 msgid "on"
 msgstr "вкл."
 
-#: command.c:1896
+#: command.c:1958
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -390,7 +372,7 @@
 "                Подробнее об �том �мотрите документацию psql, раздел\n"
 "                \"Notes for Windows users\".\n"
 
-#: command.c:1980
+#: command.c:2042
 #, c-format
 msgid ""
 "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
@@ -399,27 +381,27 @@
 "в переменной окружени� PSQL_EDITOR_LINENUMBER_ARG должен быть указан номер "
 "�троки\n"
 
-#: command.c:2009
+#: command.c:2071
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "не удало�ь запу�тить редактор \"%s\"\n"
 
-#: command.c:2011
+#: command.c:2073
 #, c-format
 msgid "could not start /bin/sh\n"
 msgstr "не удало�ь запу�тить /bin/sh\n"
 
-#: command.c:2049
+#: command.c:2111
 #, c-format
 msgid "could not locate temporary directory: %s\n"
 msgstr "не удало�ь найти временный каталог: %s\n"
 
-#: command.c:2076
+#: command.c:2138
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "не удало�ь открыть временный файл \"%s\": %s\n"
 
-#: command.c:2380
+#: command.c:2442
 #, c-format
 msgid ""
 "\\pset: allowed formats are unaligned, aligned, wrapped, html, asciidoc, "
@@ -428,122 +410,122 @@
 "допу�тимые форматы \\pset: unaligned, aligned, wrapped, html, asciidoc, "
 "latex, latex-longtable, troff-ms\n"
 
-#: command.c:2399
+#: command.c:2461
 #, c-format
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
 msgstr "допу�тимые �тили линий дл� \\pset: ascii, old-ascii, unicode\n"
 
-#: command.c:2415
+#: command.c:2477
 #, c-format
 msgid "\\pset: allowed Unicode border line styles are single, double\n"
 msgstr "допу�тимые �тили Unicode-линий границ дл� \\pset: single, double\n"
 
-#: command.c:2430
+#: command.c:2492
 #, c-format
 msgid "\\pset: allowed Unicode column line styles are single, double\n"
 msgstr "допу�тимые �тили Unicode-линий �толбцов дл� \\pset: single, double\n"
 
-#: command.c:2445
+#: command.c:2507
 #, c-format
 msgid "\\pset: allowed Unicode header line styles are single, double\n"
 msgstr "допу�тимые �тили Unicode-линий заголовков дл� \\pset: single, double\n"
 
-#: command.c:2597 command.c:2776
+#: command.c:2659 command.c:2838
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "неизве�тный параметр \\pset: %s\n"
 
-#: command.c:2615
+#: command.c:2677
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Стиль границ: %d.\n"
 
-#: command.c:2621
+#: command.c:2683
 #, c-format
 msgid "Target width is unset.\n"
 msgstr "Ширина вывода �брошена.\n"
 
-#: command.c:2623
+#: command.c:2685
 #, c-format
 msgid "Target width is %d.\n"
 msgstr "Ширина вывода: %d.\n"
 
-#: command.c:2630
+#: command.c:2692
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Ра�ширенный вывод включён.\n"
 
-#: command.c:2632
+#: command.c:2694
 #, c-format
 msgid "Expanded display is used automatically.\n"
 msgstr "Ра�ширенный вывод примен�ет�� автоматиче�ки.\n"
 
-#: command.c:2634
+#: command.c:2696
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Ра�ширенный вывод выключен.\n"
 
-#: command.c:2641 command.c:2649
+#: command.c:2703 command.c:2711
 #, c-format
 msgid "Field separator is zero byte.\n"
 msgstr "Разделитель полей - нулевой байт.\n"
 
-#: command.c:2643
+#: command.c:2705
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Разделитель полей: \"%s\".\n"
 
-#: command.c:2656
+#: command.c:2718
 #, c-format
 msgid "Default footer is on.\n"
 msgstr "Строка итогов включена.\n"
 
-#: command.c:2658
+#: command.c:2720
 #, c-format
 msgid "Default footer is off.\n"
 msgstr "Строка итогов выключена.\n"
 
-#: command.c:2664
+#: command.c:2726
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Формат вывода: %s.\n"
 
-#: command.c:2670
+#: command.c:2732
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "У�тановлен �тиль линий: %s.\n"
 
-#: command.c:2677
+#: command.c:2739
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null выводит�� как: \"%s\".\n"
 
-#: command.c:2685
+#: command.c:2747
 #, c-format
 msgid "Locale-adjusted numeric output is on.\n"
 msgstr "Локализованный вывод чи�ел включён.\n"
 
-#: command.c:2687
+#: command.c:2749
 #, c-format
 msgid "Locale-adjusted numeric output is off.\n"
 msgstr "Локализованный вывод чи�ел выключен.\n"
 
-#: command.c:2694
+#: command.c:2756
 #, c-format
 msgid "Pager is used for long output.\n"
 msgstr "По�траничник и�пользует�� дл� вывода длинного тек�та.\n"
 
-#: command.c:2696
+#: command.c:2758
 #, c-format
 msgid "Pager is always used.\n"
 msgstr "По�траничник и�пользует�� в�егда.\n"
 
-#: command.c:2698
+#: command.c:2760
 #, c-format
 msgid "Pager usage is off.\n"
 msgstr "По�траничник выключен.\n"
 
-#: command.c:2704
+#: command.c:2766
 #, c-format
 msgid "Pager won't be used for less than %d line.\n"
 msgid_plural "Pager won't be used for less than %d lines.\n"
@@ -551,82 +533,82 @@
 msgstr[1] "По�траничник не будет и�пользовать��, е�ли �трок меньше %d\n"
 msgstr[2] "По�траничник не будет и�пользовать��, е�ли �трок меньше %d\n"
 
-#: command.c:2714 command.c:2724
+#: command.c:2776 command.c:2786
 #, c-format
 msgid "Record separator is zero byte.\n"
 msgstr "Разделитель запи�ей - нулевой байт.\n"
 
-#: command.c:2716
+#: command.c:2778
 #, c-format
 msgid "Record separator is <newline>.\n"
 msgstr "Разделитель запи�ей: <нова� �трока>.\n"
 
-#: command.c:2718
+#: command.c:2780
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Разделитель запи�ей: \"%s\".\n"
 
-#: command.c:2731
+#: command.c:2793
 #, c-format
 msgid "Table attributes are \"%s\".\n"
 msgstr "�трибуты HTML-таблицы: \"%s\".\n"
 
-#: command.c:2734
+#: command.c:2796
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "�трибуты HTML-таблицы не заданы.\n"
 
-#: command.c:2741
+#: command.c:2803
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Заголовок: \"%s\".\n"
 
-#: command.c:2743
+#: command.c:2805
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Заголовок не задан.\n"
 
-#: command.c:2750
+#: command.c:2812
 #, c-format
 msgid "Tuples only is on.\n"
 msgstr "Режим вывода только кортежей включён.\n"
 
-#: command.c:2752
+#: command.c:2814
 #, c-format
 msgid "Tuples only is off.\n"
 msgstr "Режим вывода только кортежей выключен.\n"
 
-#: command.c:2758
+#: command.c:2820
 #, c-format
 msgid "Unicode border line style is \"%s\".\n"
 msgstr "Стиль Unicode-линий границ: \"%s\".\n"
 
-#: command.c:2764
+#: command.c:2826
 #, c-format
 msgid "Unicode column line style is \"%s\".\n"
 msgstr "Стиль Unicode-линий �толбцов: \"%s\".\n"
 
-#: command.c:2770
+#: command.c:2832
 #, c-format
 msgid "Unicode header line style is \"%s\".\n"
 msgstr "Стиль Unicode-линий границ: \"%s\".\n"
 
-#: command.c:2930
+#: command.c:2992
 #, c-format
 msgid "\\!: failed\n"
 msgstr "\\!: ошибка\n"
 
-#: command.c:2950 common.c:567
+#: command.c:3012 common.c:572
 #, c-format
 msgid "\\watch cannot be used with an empty query\n"
 msgstr "\\watch нельз� и�пользовать � пу�тым запро�ом\n"
 
-#: command.c:2971
+#: command.c:3033
 #, c-format
 msgid "Watch every %lds\t%s"
 msgstr "Повтор запро� через %ld �ек.\t%s"
 
-#: command.c:3022 command.c:3029 common.c:467 common.c:474 common.c:1003
+#: command.c:3084 command.c:3091 common.c:472 common.c:479 common.c:1008
 #, c-format
 msgid ""
 "********* QUERY **********\n"
@@ -639,47 +621,47 @@
 "**************************\n"
 "\n"
 
-#: common.c:306
+#: common.c:311
 #, c-format
 msgid "connection to server was lost\n"
 msgstr "подключение к �ерверу было потер�но\n"
 
-#: common.c:310
+#: common.c:315
 #, c-format
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "Подключение к �ерверу потер�но. Попытка во��тановлени� "
 
-#: common.c:315
+#: common.c:320
 #, c-format
 msgid "Failed.\n"
 msgstr "неудачна.\n"
 
-#: common.c:322
+#: common.c:327
 #, c-format
 msgid "Succeeded.\n"
 msgstr "удачна.\n"
 
-#: common.c:422 common.c:774 common.c:942
+#: common.c:427 common.c:779 common.c:947
 #, c-format
 msgid "unexpected PQresultStatus: %d\n"
 msgstr "неожиданное значение PQresultStatus: %d\n"
 
-#: common.c:574
+#: common.c:579
 #, c-format
 msgid "\\watch cannot be used with COPY\n"
 msgstr "\\watch нельз� и�пользовать � COPY\n"
 
-#: common.c:579
+#: common.c:584
 #, c-format
 msgid "unexpected result status for \\watch\n"
 msgstr "неожиданное �о�то�ние результата дл� \\watch\n"
 
-#: common.c:590 common.c:1161
+#: common.c:595 common.c:1169
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Врем�: %.3f м�\n"
 
-#: common.c:608
+#: common.c:613
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" with payload \"%s\" received from server "
@@ -688,29 +670,29 @@
 "Получено а�инхронное уведомление \"%s\" � �ообщением-нагрузкой \"%s\" от "
 "�ерверного проце��а � PID %d.\n"
 
-#: common.c:611
+#: common.c:616
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr ""
 "Получено а�инхронное уведомление \"%s\" от �ерверного проце��а � PID %d.\n"
 
-#: common.c:669
+#: common.c:674
 #, c-format
 msgid "no rows returned for \\gset\n"
 msgstr "�ервер не возвратил �трок дл� \\gset\n"
 
-#: common.c:674
+#: common.c:679
 #, c-format
 msgid "more than one row returned for \\gset\n"
 msgstr "�ервер возвратил больше одной �троки дл� \\gset\n"
 
-#: common.c:700
+#: common.c:705
 #, c-format
 msgid "could not set variable \"%s\"\n"
 msgstr "не удало�ь у�тановить переменную \"%s\"\n"
 
-#: common.c:985
+#: common.c:990
 #, c-format
 msgid ""
 "***(Single step mode: verify "
@@ -724,21 +706,19 @@
 "%s\n"
 "***(Enter - выполнение; x и Enter - отмена)**************\n"
 
-#: common.c:1036
+#: common.c:1043
 #, c-format
 msgid ""
-"The server (version %d.%d) does not support savepoints for "
-"ON_ERROR_ROLLBACK.\n"
+"The server (version %s) does not support savepoints for ON_ERROR_ROLLBACK.\n"
 msgstr ""
-"Сервер (вер�и� %d.%d) не поддерживает точки �охранени� дл� "
-"ON_ERROR_ROLLBACK.\n"
+"Сервер (вер�и� %s) не поддерживает точки �охранени� дл� ON_ERROR_ROLLBACK.\n"
 
-#: common.c:1090
+#: common.c:1098
 #, c-format
 msgid "STATEMENT:  %s\n"
 msgstr "ОПЕР�ТОР:  %s\n"
 
-#: common.c:1133
+#: common.c:1141
 #, c-format
 msgid "unexpected transaction status (%d)\n"
 msgstr "неожиданное �о�то�ние транзакции (%d)\n"
@@ -795,52 +775,52 @@
 #: copy.c:541
 msgid ""
 "Enter data to be copied followed by a newline.\n"
-"End with a backslash and a period on a line by itself."
+"End with a backslash and a period on a line by itself, or an EOF signal."
 msgstr ""
 "Вводите данные дл� копировани�, раздел�� �троки переводом �троки.\n"
-"Закончите ввод �трокой '\\.'."
+"Закончите ввод �трокой '\\.' или �игналом EOF."
 
 #: copy.c:670
 msgid "aborted because of read failure"
 msgstr "прерывание из-за ошибки чтени�"
 
-#: copy.c:694
+#: copy.c:704
 msgid "trying to exit copy mode"
 msgstr "попытка выйти из режима копировани�"
 
-#: describe.c:71 describe.c:264 describe.c:496 describe.c:626 describe.c:769
-#: describe.c:886 describe.c:956 describe.c:2928 describe.c:3133
-#: describe.c:3223 describe.c:3468 describe.c:3605 describe.c:3834
-#: describe.c:3906 describe.c:3917 describe.c:3976 describe.c:4384
-#: describe.c:4463
+#: describe.c:71 describe.c:270 describe.c:502 describe.c:632 describe.c:775
+#: describe.c:895 describe.c:965 describe.c:2937 describe.c:3142
+#: describe.c:3232 describe.c:3480 describe.c:3620 describe.c:3852
+#: describe.c:3927 describe.c:3938 describe.c:4000 describe.c:4420
+#: describe.c:4503
 msgid "Schema"
 msgstr "Схема"
 
-#: describe.c:72 describe.c:156 describe.c:164 describe.c:265 describe.c:497
-#: describe.c:627 describe.c:688 describe.c:770 describe.c:957 describe.c:2929
-#: describe.c:3055 describe.c:3134 describe.c:3224 describe.c:3303
-#: describe.c:3469 describe.c:3533 describe.c:3606 describe.c:3835
-#: describe.c:3907 describe.c:3918 describe.c:3977 describe.c:4166
-#: describe.c:4247 describe.c:4461
+#: describe.c:72 describe.c:159 describe.c:167 describe.c:271 describe.c:503
+#: describe.c:633 describe.c:694 describe.c:776 describe.c:966 describe.c:2938
+#: describe.c:3064 describe.c:3143 describe.c:3233 describe.c:3312
+#: describe.c:3481 describe.c:3545 describe.c:3621 describe.c:3853
+#: describe.c:3928 describe.c:3939 describe.c:4001 describe.c:4193
+#: describe.c:4277 describe.c:4501
 msgid "Name"
 msgstr "Им�"
 
-#: describe.c:73 describe.c:277 describe.c:323 describe.c:340
+#: describe.c:73 describe.c:283 describe.c:329 describe.c:346
 msgid "Result data type"
 msgstr "Тип данных результата"
 
-#: describe.c:81 describe.c:94 describe.c:98 describe.c:278 describe.c:324
-#: describe.c:341
+#: describe.c:81 describe.c:94 describe.c:98 describe.c:284 describe.c:330
+#: describe.c:347
 msgid "Argument data types"
 msgstr "Типы данных аргументов"
 
-#: describe.c:105 describe.c:187 describe.c:370 describe.c:545 describe.c:642
-#: describe.c:713 describe.c:959 describe.c:1572 describe.c:2729
-#: describe.c:2962 describe.c:3086 describe.c:3160 describe.c:3233
-#: describe.c:3316 describe.c:3384 describe.c:3476 describe.c:3542
-#: describe.c:3607 describe.c:3743 describe.c:3783 describe.c:3851
-#: describe.c:3910 describe.c:3919 describe.c:3978 describe.c:4192
-#: describe.c:4269 describe.c:4398 describe.c:4464 large_obj.c:289
+#: describe.c:105 describe.c:190 describe.c:376 describe.c:551 describe.c:648
+#: describe.c:719 describe.c:968 describe.c:1581 describe.c:2738
+#: describe.c:2971 describe.c:3095 describe.c:3169 describe.c:3242
+#: describe.c:3325 describe.c:3393 describe.c:3488 describe.c:3554
+#: describe.c:3622 describe.c:3758 describe.c:3798 describe.c:3869
+#: describe.c:3931 describe.c:3940 describe.c:4002 describe.c:4219
+#: describe.c:4299 describe.c:4434 describe.c:4504 large_obj.c:289
 #: large_obj.c:299
 msgid "Description"
 msgstr "Опи�ание"
@@ -849,561 +829,572 @@
 msgid "List of aggregate functions"
 msgstr "Спи�ок агрегатных функций"
 
-#: describe.c:144
+#: describe.c:146
 #, c-format
-msgid "The server (version %d.%d) does not support tablespaces.\n"
-msgstr "Сервер (вер�и� %d.%d) не поддерживает табличные про�тран�тва.\n"
+msgid "The server (version %s) does not support tablespaces.\n"
+msgstr "Сервер (вер�и� %s) не поддерживает табличные про�тран�тва.\n"
 
-#: describe.c:157 describe.c:165 describe.c:367 describe.c:535 describe.c:689
-#: describe.c:885 describe.c:2938 describe.c:3059 describe.c:3305
-#: describe.c:3534 describe.c:4167 describe.c:4248 large_obj.c:288
+#: describe.c:160 describe.c:168 describe.c:373 describe.c:541 describe.c:695
+#: describe.c:894 describe.c:2947 describe.c:3068 describe.c:3314
+#: describe.c:3546 describe.c:4194 describe.c:4278 large_obj.c:288
 msgid "Owner"
 msgstr "Владелец"
 
-#: describe.c:158 describe.c:166
+#: describe.c:161 describe.c:169
 msgid "Location"
 msgstr "Ра�положение"
 
-#: describe.c:177 describe.c:2543
+#: describe.c:180 describe.c:2552
 msgid "Options"
 msgstr "Параметры"
 
-#: describe.c:182 describe.c:508 describe.c:705 describe.c:2954
-#: describe.c:2958
+#: describe.c:185 describe.c:514 describe.c:711 describe.c:2963 describe.c:2967
 msgid "Size"
 msgstr "Размер"
 
-#: describe.c:204
+#: describe.c:207
 msgid "List of tablespaces"
 msgstr "Спи�ок табличных про�тран�тв"
 
-#: describe.c:241
+#: describe.c:244
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df принимает в каче�тве параметров только [antwS+]\n"
 
-#: describe.c:247
+#: describe.c:252
 #, c-format
-msgid "\\df does not take a \"w\" option with server version %d.%d\n"
-msgstr "\\df не поддерживает параметр \"w\" � �ервером вер�ии %d.%d\n"
+msgid "\\df does not take a \"w\" option with server version %s\n"
+msgstr "\\df не поддерживает параметр \"w\" � �ервером вер�ии %s\n"
 
+# well-spelled: агр
 #. translator: "agg" is short for "aggregate"
-#: describe.c:280 describe.c:326 describe.c:343
+#: describe.c:286 describe.c:332 describe.c:349
 msgid "agg"
 msgstr "агр."
 
-#: describe.c:281
+#: describe.c:287
 msgid "window"
 msgstr "оконна�"
 
-#: describe.c:282 describe.c:327 describe.c:344 describe.c:1093
+#: describe.c:288 describe.c:333 describe.c:350 describe.c:1102
 msgid "trigger"
 msgstr "триггерна�"
 
-#: describe.c:283 describe.c:328 describe.c:345
+#: describe.c:289 describe.c:334 describe.c:351
 msgid "normal"
 msgstr "обычна�"
 
-#: describe.c:284 describe.c:329 describe.c:346 describe.c:776 describe.c:895
-#: describe.c:1541 describe.c:2937 describe.c:3135 describe.c:4266
+#: describe.c:290 describe.c:335 describe.c:352 describe.c:782 describe.c:904
+#: describe.c:1550 describe.c:2946 describe.c:3144 describe.c:4296
 msgid "Type"
 msgstr "Тип"
 
-#: describe.c:360
+#: describe.c:366
 msgid "definer"
 msgstr "определившего"
 
-#: describe.c:361
+#: describe.c:367
 msgid "invoker"
 msgstr "вызывающего"
 
-#: describe.c:362
+#: describe.c:368
 msgid "Security"
 msgstr "Безопа�но�ть"
 
-#: describe.c:363
+#: describe.c:369
 msgid "immutable"
-msgstr "по�то�нна� "
+msgstr "по�то�нна�"
 
-#: describe.c:364
+#: describe.c:370
 msgid "stable"
 msgstr "�табильна�"
 
-#: describe.c:365
+#: describe.c:371
 msgid "volatile"
 msgstr "изменчива�"
 
-#: describe.c:366
+#: describe.c:372
 msgid "Volatility"
 msgstr "Изменчиво�ть"
 
-#: describe.c:368
+#: describe.c:374
 msgid "Language"
 msgstr "Язык"
 
-#: describe.c:369
+#: describe.c:375
 msgid "Source code"
 msgstr "И�ходный код"
 
-#: describe.c:467
+#: describe.c:473
 msgid "List of functions"
 msgstr "Спи�ок функций"
 
-#: describe.c:507
+#: describe.c:513
 msgid "Internal name"
 msgstr "Внутреннее им�"
 
-#: describe.c:529
+#: describe.c:535
 msgid "Elements"
 msgstr "Элементы"
 
-#: describe.c:585
+#: describe.c:591
 msgid "List of data types"
 msgstr "Спи�ок типов данных"
 
-#: describe.c:628
+#: describe.c:634
 msgid "Left arg type"
 msgstr "Тип левого аргумента"
 
-#: describe.c:629
+#: describe.c:635
 msgid "Right arg type"
 msgstr "Тип правого аргумента"
 
-#: describe.c:630
+#: describe.c:636
 msgid "Result type"
 msgstr "Результирующий тип"
 
-#: describe.c:635 describe.c:3375 describe.c:3742
+#: describe.c:641 describe.c:3384 describe.c:3757
 msgid "Function"
 msgstr "Функци�"
 
-#: describe.c:660
+#: describe.c:666
 msgid "List of operators"
 msgstr "Спи�ок операторов"
 
-#: describe.c:690
+#: describe.c:696
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: describe.c:695 describe.c:3470
+#: describe.c:701 describe.c:3482
 msgid "Collate"
 msgstr "LC_COLLATE"
 
-#: describe.c:696 describe.c:3471
+#: describe.c:702 describe.c:3483
 msgid "Ctype"
 msgstr "LC_CTYPE"
 
-#: describe.c:709
+#: describe.c:715
 msgid "Tablespace"
 msgstr "Табл. про�тран�тво"
 
-#: describe.c:731
+#: describe.c:737
 msgid "List of databases"
 msgstr "Спи�ок баз данных"
 
-#: describe.c:771 describe.c:888 describe.c:2930
+#: describe.c:777 describe.c:897 describe.c:2939
 msgid "table"
 msgstr "таблица"
 
-#: describe.c:772 describe.c:2931
+#: describe.c:778 describe.c:2940
 msgid "view"
 msgstr "пред�тавление"
 
-#: describe.c:773 describe.c:2932
+#: describe.c:779 describe.c:2941
 msgid "materialized view"
 msgstr "материализованное пред�тавление"
 
-#: describe.c:774 describe.c:890 describe.c:2934
+#: describe.c:780 describe.c:899 describe.c:2943
 msgid "sequence"
 msgstr "по�ледовательно�ть"
 
-#: describe.c:775 describe.c:2936
+#: describe.c:781 describe.c:2945
 msgid "foreign table"
 msgstr "�торонн�� таблица"
 
-#: describe.c:787
+#: describe.c:793
 msgid "Column privileges"
 msgstr "Права дл� �толбцов"
 
-#: describe.c:818
+#: describe.c:824
 msgid "Policies"
 msgstr "Политики"
 
-#: describe.c:844 describe.c:4608 describe.c:4612
+#: describe.c:850 describe.c:4651 describe.c:4655
 msgid "Access privileges"
 msgstr "Права до�тупа"
 
-#: describe.c:873
+#: describe.c:881
 #, c-format
-msgid ""
-"The server (version %d.%d) does not support altering default privileges.\n"
-msgstr "Сервер (вер�и� %d.%d) не поддерживает изменение прав по умолчанию.\n"
+msgid "The server (version %s) does not support altering default privileges.\n"
+msgstr "Сервер (вер�и� %s) не поддерживает изменение прав по умолчанию.\n"
 
-#: describe.c:892
+#: describe.c:901
 msgid "function"
 msgstr "функци�"
 
-#: describe.c:894
+#: describe.c:903
 msgid "type"
 msgstr "тип"
 
-#: describe.c:918
+#: describe.c:927
 msgid "Default access privileges"
 msgstr "Права до�тупа по умолчанию"
 
-#: describe.c:958
+#: describe.c:967
 msgid "Object"
 msgstr "Объект"
 
-#: describe.c:972
+#: describe.c:981
 msgid "table constraint"
 msgstr "ограничение таблицы"
 
-#: describe.c:994
+#: describe.c:1003
 msgid "domain constraint"
 msgstr "ограничение домена"
 
-#: describe.c:1022
+#: describe.c:1031
 msgid "operator class"
 msgstr "кла�� операторов"
 
-#: describe.c:1051
+#: describe.c:1060
 msgid "operator family"
 msgstr "�емей�тво операторов"
 
-#: describe.c:1073
+#: describe.c:1082
 msgid "rule"
 msgstr "правило"
 
-#: describe.c:1115
+#: describe.c:1124
 msgid "Object descriptions"
 msgstr "Опи�ание объекта"
 
-#: describe.c:1169
+#: describe.c:1178
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Отношение \"%s\" не найдено.\n"
 
-#: describe.c:1379
+#: describe.c:1388
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "Отношение � OID %s не найдено.\n"
 
-#: describe.c:1485
+#: describe.c:1494
 #, c-format
 msgid "Unlogged table \"%s.%s\""
 msgstr "�ежурналируема� таблица \"%s.%s\""
 
-#: describe.c:1488
+#: describe.c:1497
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Таблица \"%s.%s\""
 
-#: describe.c:1492
+#: describe.c:1501
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Пред�тавление \"%s.%s\""
 
-#: describe.c:1497
+#: describe.c:1506
 #, c-format
 msgid "Unlogged materialized view \"%s.%s\""
 msgstr "�ежурналируемое материализованное пред�тавление \"%s.%s\""
 
-#: describe.c:1500
+#: describe.c:1509
 #, c-format
 msgid "Materialized view \"%s.%s\""
 msgstr "Материализованное пред�тавление \"%s.%s\""
 
-#: describe.c:1504
+#: describe.c:1513
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "По�ледовательно�ть \"%s.%s\""
 
-#: describe.c:1509
+#: describe.c:1518
 #, c-format
 msgid "Unlogged index \"%s.%s\""
 msgstr "�ежурналируемый индек� \"%s.%s\""
 
-#: describe.c:1512
+#: describe.c:1521
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Индек� \"%s.%s\""
 
-#: describe.c:1517
+#: describe.c:1526
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Специальное отношение \"%s.%s\""
 
-#: describe.c:1521
+#: describe.c:1530
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST-таблица \"%s.%s\""
 
-#: describe.c:1525
+#: describe.c:1534
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Со�тавной тип \"%s.%s\""
 
-#: describe.c:1529
+#: describe.c:1538
 #, c-format
 msgid "Foreign table \"%s.%s\""
 msgstr "Сторонн�� таблица \"%s.%s\""
 
-#: describe.c:1540
+#: describe.c:1549
 msgid "Column"
 msgstr "Столбец"
 
-#: describe.c:1549
+#: describe.c:1558
 msgid "Modifiers"
 msgstr "Модификаторы"
 
-#: describe.c:1554
+#: describe.c:1563
 msgid "Value"
 msgstr "Значение"
 
-#: describe.c:1557
+#: describe.c:1566
 msgid "Definition"
 msgstr "Определение"
 
-#: describe.c:1560 describe.c:4187 describe.c:4268 describe.c:4336
-#: describe.c:4397
+# well-spelled: ОСД
+#: describe.c:1569 describe.c:4214 describe.c:4298 describe.c:4369
+#: describe.c:4433
 msgid "FDW Options"
 msgstr "Параметры ОСД"
 
-#: describe.c:1564
+#: describe.c:1573
 msgid "Storage"
 msgstr "Хранилище"
 
-#: describe.c:1567
+#: describe.c:1576
 msgid "Stats target"
 msgstr "Цель дл� �тати�тики"
 
-#: describe.c:1617
+#: describe.c:1626
 #, c-format
 msgid "collate %s"
 msgstr "правило �ортировки %s"
 
-#: describe.c:1625
+#: describe.c:1634
 msgid "not null"
 msgstr "NOT NULL"
 
 #. translator: default values of column definitions
-#: describe.c:1635
+#: describe.c:1644
 #, c-format
 msgid "default %s"
 msgstr "DEFAULT %s"
 
-#: describe.c:1750
+#: describe.c:1759
 msgid "primary key, "
 msgstr "первичный ключ, "
 
-#: describe.c:1752
+#: describe.c:1761
 msgid "unique, "
 msgstr "уникальный, "
 
-#: describe.c:1758
+#: describe.c:1767
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "дл� таблицы \"%s.%s\""
 
-#: describe.c:1762
+#: describe.c:1771
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", предикат (%s)"
 
-#: describe.c:1765
+#: describe.c:1774
 msgid ", clustered"
 msgstr ", кла�теризованный"
 
-#: describe.c:1768
+#: describe.c:1777
 msgid ", invalid"
 msgstr ", нерабочий"
 
-#: describe.c:1771
+#: describe.c:1780
 msgid ", deferrable"
 msgstr ", откладываемый"
 
-#: describe.c:1774
+#: describe.c:1783
 msgid ", initially deferred"
 msgstr ", изначально отложенный"
 
-#: describe.c:1777
+#: describe.c:1786
 msgid ", replica identity"
 msgstr ", репликационный"
 
-#: describe.c:1812
+#: describe.c:1821
 #, c-format
 msgid "Owned by: %s"
 msgstr "Владелец: %s"
 
-#: describe.c:1872
+#: describe.c:1881
 msgid "Indexes:"
 msgstr "Индек�ы:"
 
-#: describe.c:1956
+#: describe.c:1965
 msgid "Check constraints:"
 msgstr "Ограничени�-проверки:"
 
 # TO REWVIEW
-#: describe.c:1987
+#: describe.c:1996
 msgid "Foreign-key constraints:"
 msgstr "Ограничени� внешнего ключа:"
 
-#: describe.c:2018
+#: describe.c:2027
 msgid "Referenced by:"
 msgstr "С�ылки извне:"
 
-#: describe.c:2063
+#: describe.c:2072
 msgid "Policies:"
 msgstr "Политики:"
 
-#: describe.c:2066
+#: describe.c:2075
 msgid "Policies (forced row security enabled):"
 msgstr "Политики (у�иленна� защита �трок включена):"
 
-#: describe.c:2069
+#: describe.c:2078
 msgid "Policies (row security enabled): (none)"
 msgstr "Политики (защита �трок включена): (�ет)"
 
-#: describe.c:2072
+#: describe.c:2081
 msgid "Policies (forced row security enabled): (none)"
 msgstr "Политики (у�иленна� защита �трок включена): (�ет)"
 
-#: describe.c:2075
+#: describe.c:2084
 msgid "Policies (row security disabled):"
 msgstr "Политики (защита �трок выключена):"
 
-#: describe.c:2175 describe.c:2225
+#: describe.c:2184 describe.c:2234
 msgid "Rules:"
 msgstr "Правила:"
 
-#: describe.c:2178
+#: describe.c:2187
 msgid "Disabled rules:"
-msgstr "Отключенные правила:"
+msgstr "Отключённые правила:"
 
-#: describe.c:2181
+#: describe.c:2190
 msgid "Rules firing always:"
 msgstr "Правила, �рабатывающие в�егда:"
 
-#: describe.c:2184
+#: describe.c:2193
 msgid "Rules firing on replica only:"
 msgstr "Правила, �рабатывающие только в реплике:"
 
-#: describe.c:2208
+#: describe.c:2217
 msgid "View definition:"
 msgstr "Определение пред�тавлени�:"
 
-#: describe.c:2343
+#: describe.c:2352
 msgid "Triggers:"
 msgstr "Триггеры:"
 
-#: describe.c:2347
+#: describe.c:2356
 msgid "Disabled user triggers:"
-msgstr "Отключенные пользователь�кие триггеры:"
+msgstr "Отключённые пользователь�кие триггеры:"
 
-#: describe.c:2349
+#: describe.c:2358
 msgid "Disabled triggers:"
-msgstr "Отключенные триггеры:"
+msgstr "Отключённые триггеры:"
 
-#: describe.c:2352
+#: describe.c:2361
 msgid "Disabled internal triggers:"
-msgstr "Отключенные внутренние триггеры:"
+msgstr "Отключённые внутренние триггеры:"
 
-#: describe.c:2355
+#: describe.c:2364
 msgid "Triggers firing always:"
 msgstr "Триггеры, �рабатывающие в�егда:"
 
-#: describe.c:2358
+#: describe.c:2367
 msgid "Triggers firing on replica only:"
 msgstr "Триггеры, �рабатывающие только в реплике:"
 
-#: describe.c:2437
+#: describe.c:2424
+#, c-format
+msgid "Server: %s"
+msgstr "Сервер: %s"
+
+# well-spelled: ОСД
+#: describe.c:2432
+#, c-format
+msgid "FDW Options: (%s)"
+msgstr "Параметр ОСД: (%s)"
+
+#: describe.c:2446
 msgid "Inherits"
 msgstr "�а�ледует"
 
-#: describe.c:2476
+#: describe.c:2485
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Дочерних таблиц: %d (чтобы про�мотреть и их, во�пользуйте�ь \\d+)"
 
-#: describe.c:2483
+#: describe.c:2492
 msgid "Child tables"
 msgstr "Дочерние таблицы"
 
-#: describe.c:2505
+#: describe.c:2514
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Типизированна� таблица типа: %s"
 
-#: describe.c:2519
+#: describe.c:2528
 msgid "Replica Identity"
 msgstr "Идентификаци� реплики"
 
-#: describe.c:2532
+#: describe.c:2541
 msgid "Has OIDs: yes"
 msgstr "Содержит OID: да"
 
-#: describe.c:2620
+#: describe.c:2629
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Табличное про�тран�тво: \"%s\""
 
 #. translator: before this string there's an index description like
 #. '"foo_pkey" PRIMARY KEY, btree (a)'
-#: describe.c:2632
+#: describe.c:2641
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", табл. про�тран�тво \"%s\""
 
-#: describe.c:2722
+#: describe.c:2731
 msgid "List of roles"
 msgstr "Спи�ок ролей"
 
-#: describe.c:2724
+#: describe.c:2733
 msgid "Role name"
 msgstr "Им� роли"
 
-#: describe.c:2725
+#: describe.c:2734
 msgid "Attributes"
 msgstr "�трибуты"
 
-#: describe.c:2726
+#: describe.c:2735
 msgid "Member of"
 msgstr "Член ролей"
 
-#: describe.c:2737
+#: describe.c:2746
 msgid "Superuser"
 msgstr "Суперпользователь"
 
-#: describe.c:2740
+#: describe.c:2749
 msgid "No inheritance"
 msgstr "�е на�ледует��"
 
-#: describe.c:2743
+#: describe.c:2752
 msgid "Create role"
 msgstr "Создаёт роли"
 
-#: describe.c:2746
+#: describe.c:2755
 msgid "Create DB"
 msgstr "Создаёт БД"
 
-#: describe.c:2749
+#: describe.c:2758
 msgid "Cannot login"
 msgstr "Вход запрещён"
 
-#: describe.c:2753
+#: describe.c:2762
 msgid "Replication"
 msgstr "Репликаци�"
 
-#: describe.c:2757
+#: describe.c:2766
 msgid "Bypass RLS"
 msgstr "Пропу�кать RLS"
 
-#: describe.c:2766
+#: describe.c:2775
 msgid "No connections"
 msgstr "�ет подключений"
 
-#: describe.c:2768
+#: describe.c:2777
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
@@ -1411,311 +1402,312 @@
 msgstr[1] "%d подключени�"
 msgstr[2] "%d подключений"
 
-#: describe.c:2778
+#: describe.c:2787
 msgid "Password valid until "
 msgstr "Пароль дей�твует до "
 
-#: describe.c:2834
+#: describe.c:2843
 msgid "Role"
 msgstr "Роль"
 
-#: describe.c:2835
+#: describe.c:2844
 msgid "Database"
 msgstr "БД"
 
-#: describe.c:2836
+#: describe.c:2845
 msgid "Settings"
 msgstr "Параметры"
 
-#: describe.c:2846
+#: describe.c:2855
 #, c-format
 msgid "No per-database role settings support in this server version.\n"
 msgstr ""
 "Это вер�и� �ервера не поддерживает параметры ролей на уровне базы данных.\n"
 
-#: describe.c:2857
+#: describe.c:2866
 #, c-format
 msgid "No matching settings found.\n"
 msgstr "Соответ�твующие параметры не найдены.\n"
 
-#: describe.c:2859
+#: describe.c:2868
 #, c-format
 msgid "No settings found.\n"
 msgstr "Параметры не найдены.\n"
 
-#: describe.c:2864
+#: describe.c:2873
 msgid "List of settings"
 msgstr "Спи�ок параметров"
 
-#: describe.c:2933
+#: describe.c:2942
 msgid "index"
 msgstr "индек�"
 
-#: describe.c:2935
+# skip-rule: capital-letter-first
+#: describe.c:2944
 msgid "special"
 msgstr "�пец. отношение"
 
-#: describe.c:2943 describe.c:4385
+#: describe.c:2952 describe.c:4421
 msgid "Table"
 msgstr "Таблица"
 
-#: describe.c:3019
+#: describe.c:3028
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "Соответ�твующие отношени� не найдены.\n"
 
-#: describe.c:3021
+#: describe.c:3030
 #, c-format
 msgid "No relations found.\n"
 msgstr "Отношени� не найдены.\n"
 
-#: describe.c:3026
+#: describe.c:3035
 msgid "List of relations"
 msgstr "Спи�ок отношений"
 
-#: describe.c:3063
+#: describe.c:3072
 msgid "Trusted"
 msgstr "Доверенный"
 
-#: describe.c:3071
+#: describe.c:3080
 msgid "Internal Language"
 msgstr "Внутренний �зык"
 
-#: describe.c:3072
+#: describe.c:3081
 msgid "Call Handler"
 msgstr "Обработчик вызова"
 
-#: describe.c:3073 describe.c:4174
+#: describe.c:3082 describe.c:4201
 msgid "Validator"
 msgstr "Функци� проверки"
 
-#: describe.c:3076
+#: describe.c:3085
 msgid "Inline Handler"
 msgstr "Обработчик внедрённого кода"
 
-#: describe.c:3104
+#: describe.c:3113
 msgid "List of languages"
 msgstr "Спи�ок �зыков"
 
-#: describe.c:3148
+#: describe.c:3157
 msgid "Modifier"
 msgstr "Модификатор"
 
-#: describe.c:3149
+#: describe.c:3158
 msgid "Check"
 msgstr "Проверка"
 
-#: describe.c:3191
+#: describe.c:3200
 msgid "List of domains"
 msgstr "Спи�ок доменов"
 
-#: describe.c:3225
+#: describe.c:3234
 msgid "Source"
 msgstr "И�точник"
 
-#: describe.c:3226
+#: describe.c:3235
 msgid "Destination"
 msgstr "�азначение"
 
-#: describe.c:3227 describe.c:3376
+#: describe.c:3236 describe.c:3385
 msgid "no"
 msgstr "нет"
 
-#: describe.c:3227 describe.c:3378
+#: describe.c:3236 describe.c:3387
 msgid "yes"
 msgstr "да"
 
-#: describe.c:3228
+#: describe.c:3237
 msgid "Default?"
 msgstr "По умолчанию?"
 
-#: describe.c:3265
+#: describe.c:3274
 msgid "List of conversions"
 msgstr "Спи�ок преобразований"
 
-#: describe.c:3304
+#: describe.c:3313
 msgid "Event"
 msgstr "Событие"
 
-#: describe.c:3306
+#: describe.c:3315
 msgid "enabled"
 msgstr "включён"
 
-#: describe.c:3307
+#: describe.c:3316
 msgid "replica"
 msgstr "реплика"
 
-#: describe.c:3308
+#: describe.c:3317
 msgid "always"
 msgstr "в�егда"
 
-#: describe.c:3309
+#: describe.c:3318
 msgid "disabled"
 msgstr "отключён"
 
-#: describe.c:3310
+#: describe.c:3319
 msgid "Enabled"
-msgstr "Включен"
+msgstr "Включён"
 
-#: describe.c:3311
+#: describe.c:3320
 msgid "Procedure"
 msgstr "Процедура"
 
-#: describe.c:3312
+#: describe.c:3321
 msgid "Tags"
 msgstr "Теги"
 
-#: describe.c:3331
+#: describe.c:3340
 msgid "List of event triggers"
 msgstr "Спи�ок �обытийных триггеров"
 
-#: describe.c:3373
+#: describe.c:3382
 msgid "Source type"
 msgstr "И�ходный тип"
 
-#: describe.c:3374
+#: describe.c:3383
 msgid "Target type"
 msgstr "Целевой тип"
 
-#: describe.c:3377
+#: describe.c:3386
 msgid "in assignment"
 msgstr "в при�ваивании"
 
-#: describe.c:3379
+#: describe.c:3388
 msgid "Implicit?"
 msgstr "�е�вное?"
 
-#: describe.c:3430
+#: describe.c:3439
 msgid "List of casts"
 msgstr "Спи�ок приведений типов"
 
-#: describe.c:3456
+#: describe.c:3467
 #, c-format
-msgid "The server (version %d.%d) does not support collations.\n"
-msgstr "Сервер (вер�и� %d.%d) не поддерживает правила �равнени�.\n"
+msgid "The server (version %s) does not support collations.\n"
+msgstr "Сервер (вер�и� %s) не поддерживает правила �равнени�.\n"
 
-#: describe.c:3506
+#: describe.c:3518
 msgid "List of collations"
 msgstr "Спи�ок правил �ортировки"
 
-#: describe.c:3565
+#: describe.c:3577
 msgid "List of schemas"
 msgstr "Спи�ок �хем"
 
-#: describe.c:3588 describe.c:3823 describe.c:3891 describe.c:3959
+#: describe.c:3602 describe.c:3840 describe.c:3911 describe.c:3982
 #, c-format
-msgid "The server (version %d.%d) does not support full text search.\n"
-msgstr "Сервер (вер�и� %d.%d) не поддерживает полнотек�товый пои�к.\n"
+msgid "The server (version %s) does not support full text search.\n"
+msgstr "Сервер (вер�и� %s) не поддерживает полнотек�товый пои�к.\n"
 
-#: describe.c:3622
+#: describe.c:3637
 msgid "List of text search parsers"
 msgstr "Спи�ок анализаторов тек�тового пои�ка"
 
-#: describe.c:3665
+#: describe.c:3680
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "�нализатор тек�тового пои�ка \"%s\" не найден.\n"
 
-#: describe.c:3740
+#: describe.c:3755
 msgid "Start parse"
 msgstr "�ачало разбора"
 
-#: describe.c:3741
+#: describe.c:3756
 msgid "Method"
 msgstr "Метод"
 
-#: describe.c:3745
+#: describe.c:3760
 msgid "Get next token"
 msgstr "Получение �ледующего фрагмента"
 
-#: describe.c:3747
+#: describe.c:3762
 msgid "End parse"
 msgstr "Окончание разбора"
 
-#: describe.c:3749
+#: describe.c:3764
 msgid "Get headline"
 msgstr "Получение выдержки"
 
-#: describe.c:3751
+#: describe.c:3766
 msgid "Get token types"
 msgstr "Получение типов фрагментов"
 
-#: describe.c:3761
+#: describe.c:3776
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "�нализатор тек�тового пои�ка \"%s.%s\""
 
-#: describe.c:3763
+#: describe.c:3778
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "�нализатор тек�тового пои�ка \"%s\""
 
-#: describe.c:3782
+#: describe.c:3797
 msgid "Token name"
 msgstr "Им� фрагмента"
 
-#: describe.c:3793
+#: describe.c:3808
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Типы фрагментов дл� анализатора \"%s.%s\""
 
-#: describe.c:3795
+#: describe.c:3810
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Типы фрагментов дл� анализатора \"%s\""
 
-#: describe.c:3845
+#: describe.c:3863
 msgid "Template"
 msgstr "Шаблон"
 
-#: describe.c:3846
+#: describe.c:3864
 msgid "Init options"
 msgstr "Параметры инициализации"
 
-#: describe.c:3868
+#: describe.c:3886
 msgid "List of text search dictionaries"
 msgstr "Спи�ок �ловарей тек�тового пои�ка"
 
-#: describe.c:3908
+#: describe.c:3929
 msgid "Init"
 msgstr "Инициализаци�"
 
-#: describe.c:3909
+#: describe.c:3930
 msgid "Lexize"
 msgstr "Выделение лек�ем"
 
-#: describe.c:3936
+#: describe.c:3957
 msgid "List of text search templates"
 msgstr "Спи�ок шаблонов тек�тового пои�ка"
 
-#: describe.c:3993
+#: describe.c:4017
 msgid "List of text search configurations"
 msgstr "Спи�ок конфигураций тек�тового пои�ка"
 
-#: describe.c:4037
+#: describe.c:4061
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "Конфигураци� тек�тового пои�ка \"%s\" не найдена.\n"
 
-#: describe.c:4103
+#: describe.c:4127
 msgid "Token"
 msgstr "Фрагмент"
 
-#: describe.c:4104
+#: describe.c:4128
 msgid "Dictionaries"
 msgstr "Словари"
 
-#: describe.c:4115
+#: describe.c:4139
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Конфигураци� тек�тового пои�ка \"%s.%s\""
 
-#: describe.c:4118
+#: describe.c:4142
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Конфигураци� тек�тового пои�ка \"%s\""
 
-#: describe.c:4122
+#: describe.c:4146
 #, c-format
 msgid ""
 "\n"
@@ -1724,7 +1716,7 @@
 "\n"
 "�нализатор: \"%s.%s\""
 
-#: describe.c:4125
+#: describe.c:4149
 #, c-format
 msgid ""
 "\n"
@@ -1733,86 +1725,86 @@
 "\n"
 "�нализатор: \"%s\""
 
-#: describe.c:4157
+#: describe.c:4183
 #, c-format
-msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
-msgstr "Сервер (вер�и� %d.%d) не поддерживает обёртки �торонних данных.\n"
+msgid "The server (version %s) does not support foreign-data wrappers.\n"
+msgstr "Сервер (вер�и� %s) не поддерживает обёртки �торонних данных.\n"
 
-#: describe.c:4171
+#: describe.c:4198
 msgid "Handler"
 msgstr "Обработчик"
 
-#: describe.c:4214
+#: describe.c:4241
 msgid "List of foreign-data wrappers"
 msgstr "Спи�ок обёрток �торонних данных"
 
-#: describe.c:4237
+#: describe.c:4266
 #, c-format
-msgid "The server (version %d.%d) does not support foreign servers.\n"
-msgstr "Сервер (вер�и� %d.%d) не поддерживает �торонние �ерверы.\n"
+msgid "The server (version %s) does not support foreign servers.\n"
+msgstr "Сервер (вер�и� %s) не поддерживает �торонние �ерверы.\n"
 
-#: describe.c:4249
+#: describe.c:4279
 msgid "Foreign-data wrapper"
 msgstr "Обёртка �торонних данных"
 
-#: describe.c:4267 describe.c:4462
+#: describe.c:4297 describe.c:4502
 msgid "Version"
 msgstr "Вер�и�"
 
-#: describe.c:4293
+#: describe.c:4323
 msgid "List of foreign servers"
 msgstr "Спи�ок �торонних �ерверов"
 
-#: describe.c:4316
+#: describe.c:4348
 #, c-format
-msgid "The server (version %d.%d) does not support user mappings.\n"
-msgstr "Сервер (вер�и� %d.%d) не поддерживает �опо�тавлени� пользователей.\n"
+msgid "The server (version %s) does not support user mappings.\n"
+msgstr "Сервер (вер�и� %s) не поддерживает �опо�тавлени� пользователей.\n"
 
-#: describe.c:4325 describe.c:4386
+#: describe.c:4358 describe.c:4422
 msgid "Server"
 msgstr "Сервер"
 
-#: describe.c:4326
+#: describe.c:4359
 msgid "User name"
 msgstr "Им� пользовател�"
 
-#: describe.c:4351
+#: describe.c:4384
 msgid "List of user mappings"
 msgstr "Спи�ок �опо�тавлений пользователей"
 
-#: describe.c:4374
+#: describe.c:4409
 #, c-format
-msgid "The server (version %d.%d) does not support foreign tables.\n"
-msgstr "Сервер (вер�и� %d.%d) не поддерживает �торонние таблицы.\n"
+msgid "The server (version %s) does not support foreign tables.\n"
+msgstr "Сервер (вер�и� %s) не поддерживает �торонние таблицы.\n"
 
-#: describe.c:4425
+#: describe.c:4462
 msgid "List of foreign tables"
 msgstr "Спи�ок �торонних таблиц"
 
-#: describe.c:4448 describe.c:4502
+#: describe.c:4487 describe.c:4544
 #, c-format
-msgid "The server (version %d.%d) does not support extensions.\n"
-msgstr "Сервер (вер�и� %d.%d) не поддерживает ра�ширени�.\n"
+msgid "The server (version %s) does not support extensions.\n"
+msgstr "Сервер (вер�и� %s) не поддерживает ра�ширени�.\n"
 
-#: describe.c:4479
+#: describe.c:4519
 msgid "List of installed extensions"
 msgstr "Спи�ок у�тановленных ра�ширений"
 
-#: describe.c:4529
+#: describe.c:4572
 #, c-format
 msgid "Did not find any extension named \"%s\".\n"
 msgstr "Ра�ширение \"%s\" не найдено.\n"
 
-#: describe.c:4532
+#: describe.c:4575
 #, c-format
 msgid "Did not find any extensions.\n"
 msgstr "Ра�ширени� не найдены.\n"
 
-#: describe.c:4576
+#: describe.c:4619
 msgid "Object Description"
 msgstr "Опи�ание объекта"
 
-#: describe.c:4585
+#: describe.c:4628
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Объекты в ра�ширении \"%s\""
@@ -2164,6 +2156,7 @@
 msgid "General\n"
 msgstr "Общие\n"
 
+# skip-rule: copyright
 #: help.c:167
 #, c-format
 msgid ""
@@ -2326,7 +2319,8 @@
 #, c-format
 msgid "  (options: S = show system objects, + = additional detail)\n"
 msgstr ""
-"  (опции: S = показывать �и�темные объекты, + = дополнительные подробно�ти)\n"
+"  (дополнени�: S = показывать �и�темные объекты, + = дополнительные "
+"подробно�ти)\n"
 
 #: help.c:204
 #, c-format
@@ -2477,10 +2471,11 @@
 "  \\dp     [М�СК�]        �пи�ок прав до�тупа к таблицам, пред�тавлени�м и\n"
 "                         по�ледовательно�т�м\n"
 
+# well-spelled: М�СК
 #: help.c:231
 #, c-format
 msgid "  \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
-msgstr "  \\drds [МAСК1 [М�СК2]]  �пи�ок параметров роли на уровне БД\n"
+msgstr "  \\drds [М�СК1 [М�СК2]]  �пи�ок параметров роли на уровне БД\n"
 
 #: help.c:232
 #, c-format
@@ -2775,7 +2770,7 @@
 #: help.c:320
 #, c-format
 msgid "  DBNAME             the currently connected database name\n"
-msgstr "  DBNAME             им� текущей подключенной базы данных\n"
+msgstr "  DBNAME             им� текущей подключённой базы данных\n"
 
 #: help.c:321
 #, c-format
@@ -2924,7 +2919,7 @@
 #: help.c:343
 #, c-format
 msgid "  USER               the currently connected database user\n"
-msgstr "  USER               текущий пользователь, подключенный к БД\n"
+msgstr "  USER               текущий пользователь, подключённый к БД\n"
 
 #: help.c:344
 #, c-format
@@ -3308,6 +3303,7 @@
 msgid "You are using psql, the command-line interface to PostgreSQL."
 msgstr "Вы и�пользуете psql - интерфей� командной �троки к PostgreSQL."
 
+# skip-rule: copyright
 #: mainloop.c:204
 #, c-format
 msgid ""
@@ -3331,24 +3327,24 @@
 msgstr[1] "(%lu �троки)"
 msgstr[2] "(%lu �трок)"
 
-#: print.c:2902
+#: print.c:2910
 #, c-format
 msgid "Interrupted\n"
 msgstr "Прервано\n"
 
-#: print.c:2966
+#: print.c:2974
 #, c-format
 msgid "Cannot add header to table content: column count of %d exceeded.\n"
 msgstr ""
 "Ошибка добавлени� заголовка таблицы: превышен предел чи�ла �толбцов (%d).\n"
 
-#: print.c:3006
+#: print.c:3014
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
 msgstr ""
 "Ошибка добавлени� �чейки в таблицу: превышен предел чи�ла �чеек (%d).\n"
 
-#: print.c:3255
+#: print.c:3263
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "неверный формат вывода (внутренн�� ошибка): %d"
@@ -3358,17 +3354,17 @@
 msgid "skipping recursive expansion of variable \"%s\"\n"
 msgstr "рекур�ивное ра�ширение переменной \"%s\" пропу�кает��\n"
 
-#: psqlscan.l:1627
+#: psqlscan.l:1628
 #, c-format
 msgid "unterminated quoted string\n"
 msgstr "незавершённа� �трока в кавычках\n"
 
-#: psqlscan.l:1727
+#: psqlscan.l:1728
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: нехватка пам�ти\n"
 
-#: psqlscan.l:1956
+#: psqlscan.l:1957
 #, c-format
 msgid "can't escape without active connection\n"
 msgstr "�кранирование �трок не работает без подключени� к БД\n"
@@ -3383,31 +3379,31 @@
 #: sql_help.c:367 sql_help.c:369 sql_help.c:412 sql_help.c:414 sql_help.c:417
 #: sql_help.c:419 sql_help.c:483 sql_help.c:488 sql_help.c:493 sql_help.c:498
 #: sql_help.c:546 sql_help.c:548 sql_help.c:550 sql_help.c:553 sql_help.c:555
-#: sql_help.c:566 sql_help.c:568 sql_help.c:608 sql_help.c:610 sql_help.c:613
-#: sql_help.c:615 sql_help.c:617 sql_help.c:646 sql_help.c:650 sql_help.c:668
-#: sql_help.c:671 sql_help.c:674 sql_help.c:703 sql_help.c:715 sql_help.c:723
-#: sql_help.c:726 sql_help.c:729 sql_help.c:744 sql_help.c:747 sql_help.c:792
-#: sql_help.c:815 sql_help.c:826 sql_help.c:828 sql_help.c:845 sql_help.c:854
-#: sql_help.c:856 sql_help.c:858 sql_help.c:870 sql_help.c:874 sql_help.c:876
-#: sql_help.c:960 sql_help.c:962 sql_help.c:965 sql_help.c:968 sql_help.c:970
-#: sql_help.c:972 sql_help.c:1033 sql_help.c:1035 sql_help.c:1037
-#: sql_help.c:1040 sql_help.c:1061 sql_help.c:1064 sql_help.c:1067
-#: sql_help.c:1070 sql_help.c:1074 sql_help.c:1076 sql_help.c:1078
-#: sql_help.c:1080 sql_help.c:1094 sql_help.c:1097 sql_help.c:1099
-#: sql_help.c:1101 sql_help.c:1111 sql_help.c:1113 sql_help.c:1123
-#: sql_help.c:1125 sql_help.c:1134 sql_help.c:1155 sql_help.c:1157
-#: sql_help.c:1159 sql_help.c:1162 sql_help.c:1164 sql_help.c:1166
-#: sql_help.c:1216 sql_help.c:1254 sql_help.c:1257 sql_help.c:1259
-#: sql_help.c:1261 sql_help.c:1263 sql_help.c:1265 sql_help.c:1268
-#: sql_help.c:1308 sql_help.c:1555 sql_help.c:1571 sql_help.c:1584
-#: sql_help.c:1635 sql_help.c:1639 sql_help.c:1649 sql_help.c:1669
-#: sql_help.c:1694 sql_help.c:1712 sql_help.c:1740 sql_help.c:1814
-#: sql_help.c:1857 sql_help.c:1879 sql_help.c:1899 sql_help.c:1900
-#: sql_help.c:1935 sql_help.c:1955 sql_help.c:1977 sql_help.c:1990
-#: sql_help.c:2022 sql_help.c:2047 sql_help.c:2091 sql_help.c:2277
-#: sql_help.c:2290 sql_help.c:2307 sql_help.c:2323 sql_help.c:2362
-#: sql_help.c:2413 sql_help.c:2417 sql_help.c:2419 sql_help.c:2425
-#: sql_help.c:2443 sql_help.c:2470 sql_help.c:2505 sql_help.c:2517
+#: sql_help.c:566 sql_help.c:568 sql_help.c:607 sql_help.c:609 sql_help.c:612
+#: sql_help.c:614 sql_help.c:616 sql_help.c:644 sql_help.c:648 sql_help.c:666
+#: sql_help.c:669 sql_help.c:672 sql_help.c:701 sql_help.c:713 sql_help.c:721
+#: sql_help.c:724 sql_help.c:727 sql_help.c:742 sql_help.c:745 sql_help.c:790
+#: sql_help.c:813 sql_help.c:824 sql_help.c:826 sql_help.c:843 sql_help.c:852
+#: sql_help.c:854 sql_help.c:856 sql_help.c:868 sql_help.c:872 sql_help.c:874
+#: sql_help.c:958 sql_help.c:960 sql_help.c:963 sql_help.c:966 sql_help.c:968
+#: sql_help.c:970 sql_help.c:1031 sql_help.c:1033 sql_help.c:1035
+#: sql_help.c:1038 sql_help.c:1059 sql_help.c:1062 sql_help.c:1065
+#: sql_help.c:1068 sql_help.c:1072 sql_help.c:1074 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1092 sql_help.c:1095 sql_help.c:1097
+#: sql_help.c:1099 sql_help.c:1109 sql_help.c:1111 sql_help.c:1121
+#: sql_help.c:1123 sql_help.c:1132 sql_help.c:1153 sql_help.c:1155
+#: sql_help.c:1157 sql_help.c:1160 sql_help.c:1162 sql_help.c:1164
+#: sql_help.c:1215 sql_help.c:1253 sql_help.c:1256 sql_help.c:1258
+#: sql_help.c:1260 sql_help.c:1262 sql_help.c:1264 sql_help.c:1267
+#: sql_help.c:1307 sql_help.c:1554 sql_help.c:1570 sql_help.c:1583
+#: sql_help.c:1634 sql_help.c:1638 sql_help.c:1648 sql_help.c:1668
+#: sql_help.c:1693 sql_help.c:1711 sql_help.c:1739 sql_help.c:1813
+#: sql_help.c:1856 sql_help.c:1878 sql_help.c:1898 sql_help.c:1899
+#: sql_help.c:1934 sql_help.c:1954 sql_help.c:1976 sql_help.c:1989
+#: sql_help.c:2021 sql_help.c:2046 sql_help.c:2090 sql_help.c:2276
+#: sql_help.c:2289 sql_help.c:2306 sql_help.c:2322 sql_help.c:2361
+#: sql_help.c:2412 sql_help.c:2416 sql_help.c:2418 sql_help.c:2424
+#: sql_help.c:2442 sql_help.c:2470 sql_help.c:2505 sql_help.c:2517
 #: sql_help.c:2526 sql_help.c:2576 sql_help.c:2604 sql_help.c:2612
 #: sql_help.c:2620 sql_help.c:2628 sql_help.c:2636 sql_help.c:2644
 #: sql_help.c:2652 sql_help.c:2660 sql_help.c:2669 sql_help.c:2680
@@ -3422,47 +3418,46 @@
 msgid "name"
 msgstr "им�"
 
-#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1372
+#: sql_help.c:34 sql_help.c:37 sql_help.c:40 sql_help.c:306 sql_help.c:1371
 #: sql_help.c:2577 sql_help.c:3472
 msgid "aggregate_signature"
 msgstr "�игнатура_агр_функции"
 
 #: sql_help.c:35 sql_help.c:62 sql_help.c:77 sql_help.c:113 sql_help.c:233
 #: sql_help.c:251 sql_help.c:370 sql_help.c:418 sql_help.c:492 sql_help.c:533
-#: sql_help.c:547 sql_help.c:567 sql_help.c:614 sql_help.c:670 sql_help.c:725
-#: sql_help.c:746 sql_help.c:793 sql_help.c:817 sql_help.c:827 sql_help.c:857
-#: sql_help.c:877 sql_help.c:969 sql_help.c:1034 sql_help.c:1077
-#: sql_help.c:1098 sql_help.c:1112 sql_help.c:1124 sql_help.c:1136
-#: sql_help.c:1163 sql_help.c:1217 sql_help.c:1262
+#: sql_help.c:547 sql_help.c:567 sql_help.c:613 sql_help.c:668 sql_help.c:723
+#: sql_help.c:744 sql_help.c:791 sql_help.c:815 sql_help.c:825 sql_help.c:855
+#: sql_help.c:875 sql_help.c:967 sql_help.c:1032 sql_help.c:1075
+#: sql_help.c:1096 sql_help.c:1110 sql_help.c:1122 sql_help.c:1134
+#: sql_help.c:1161 sql_help.c:1216 sql_help.c:1261
 msgid "new_name"
 msgstr "новое_им�"
 
 #: sql_help.c:38 sql_help.c:64 sql_help.c:79 sql_help.c:115 sql_help.c:231
 #: sql_help.c:249 sql_help.c:368 sql_help.c:454 sql_help.c:497 sql_help.c:569
-#: sql_help.c:578 sql_help.c:633 sql_help.c:649 sql_help.c:673 sql_help.c:728
-#: sql_help.c:829 sql_help.c:855 sql_help.c:875 sql_help.c:1018
-#: sql_help.c:1036 sql_help.c:1079 sql_help.c:1100 sql_help.c:1158
-#: sql_help.c:1260 sql_help.c:2263
+#: sql_help.c:578 sql_help.c:632 sql_help.c:647 sql_help.c:671 sql_help.c:726
+#: sql_help.c:827 sql_help.c:853 sql_help.c:873 sql_help.c:1016 sql_help.c:1034
+#: sql_help.c:1077 sql_help.c:1098 sql_help.c:1156 sql_help.c:1259
+#: sql_help.c:2262
 msgid "new_owner"
 msgstr "новый_владелец"
 
 #: sql_help.c:41 sql_help.c:66 sql_help.c:81 sql_help.c:235 sql_help.c:299
-#: sql_help.c:420 sql_help.c:502 sql_help.c:616 sql_help.c:653 sql_help.c:676
-#: sql_help.c:731 sql_help.c:859 sql_help.c:971 sql_help.c:1081
-#: sql_help.c:1102 sql_help.c:1114 sql_help.c:1126 sql_help.c:1165
-#: sql_help.c:1264
+#: sql_help.c:420 sql_help.c:502 sql_help.c:615 sql_help.c:651 sql_help.c:674
+#: sql_help.c:729 sql_help.c:857 sql_help.c:969 sql_help.c:1079 sql_help.c:1100
+#: sql_help.c:1112 sql_help.c:1124 sql_help.c:1163 sql_help.c:1263
 msgid "new_schema"
 msgstr "нова�_�хема"
 
-#: sql_help.c:42 sql_help.c:1425 sql_help.c:2578 sql_help.c:3491
+#: sql_help.c:42 sql_help.c:1424 sql_help.c:2578 sql_help.c:3491
 msgid "where aggregate_signature is:"
 msgstr "где �игнатура_агр_функции:"
 
 #: sql_help.c:43 sql_help.c:46 sql_help.c:49 sql_help.c:316 sql_help.c:341
 #: sql_help.c:344 sql_help.c:347 sql_help.c:484 sql_help.c:489 sql_help.c:494
-#: sql_help.c:499 sql_help.c:1390 sql_help.c:1426 sql_help.c:1429
-#: sql_help.c:1432 sql_help.c:1556 sql_help.c:1572 sql_help.c:1575
-#: sql_help.c:1815 sql_help.c:2579 sql_help.c:2582 sql_help.c:2585
+#: sql_help.c:499 sql_help.c:1389 sql_help.c:1425 sql_help.c:1428
+#: sql_help.c:1431 sql_help.c:1555 sql_help.c:1571 sql_help.c:1574
+#: sql_help.c:1814 sql_help.c:2579 sql_help.c:2582 sql_help.c:2585
 #: sql_help.c:2670 sql_help.c:3055 sql_help.c:3387 sql_help.c:3478
 #: sql_help.c:3492 sql_help.c:3495 sql_help.c:3498
 msgid "argmode"
@@ -3470,9 +3465,9 @@
 
 #: sql_help.c:44 sql_help.c:47 sql_help.c:50 sql_help.c:317 sql_help.c:342
 #: sql_help.c:345 sql_help.c:348 sql_help.c:485 sql_help.c:490 sql_help.c:495
-#: sql_help.c:500 sql_help.c:1391 sql_help.c:1427 sql_help.c:1430
-#: sql_help.c:1433 sql_help.c:1557 sql_help.c:1573 sql_help.c:1576
-#: sql_help.c:1816 sql_help.c:2580 sql_help.c:2583 sql_help.c:2586
+#: sql_help.c:500 sql_help.c:1390 sql_help.c:1426 sql_help.c:1429
+#: sql_help.c:1432 sql_help.c:1556 sql_help.c:1572 sql_help.c:1575
+#: sql_help.c:1815 sql_help.c:2580 sql_help.c:2583 sql_help.c:2586
 #: sql_help.c:2671 sql_help.c:3479 sql_help.c:3493 sql_help.c:3496
 #: sql_help.c:3499
 msgid "argname"
@@ -3480,60 +3475,59 @@
 
 #: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:318 sql_help.c:343
 #: sql_help.c:346 sql_help.c:349 sql_help.c:486 sql_help.c:491 sql_help.c:496
-#: sql_help.c:501 sql_help.c:1392 sql_help.c:1428 sql_help.c:1431
-#: sql_help.c:1434 sql_help.c:1817 sql_help.c:2581 sql_help.c:2584
+#: sql_help.c:501 sql_help.c:1391 sql_help.c:1427 sql_help.c:1430
+#: sql_help.c:1433 sql_help.c:1816 sql_help.c:2581 sql_help.c:2584
 #: sql_help.c:2587 sql_help.c:2672 sql_help.c:3480 sql_help.c:3494
 #: sql_help.c:3497 sql_help.c:3500
 msgid "argtype"
 msgstr "тип_аргумента"
 
-#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:787
-#: sql_help.c:872 sql_help.c:1095 sql_help.c:1211 sql_help.c:1239
-#: sql_help.c:1482 sql_help.c:1488 sql_help.c:1743 sql_help.c:1775
-#: sql_help.c:1782 sql_help.c:1858 sql_help.c:2023 sql_help.c:2112
-#: sql_help.c:2292 sql_help.c:2471 sql_help.c:2493 sql_help.c:2923
+#: sql_help.c:107 sql_help.c:365 sql_help.c:443 sql_help.c:455 sql_help.c:785
+#: sql_help.c:870 sql_help.c:1093 sql_help.c:1210 sql_help.c:1238
+#: sql_help.c:1481 sql_help.c:1487 sql_help.c:1742 sql_help.c:1774
+#: sql_help.c:1781 sql_help.c:1857 sql_help.c:2022 sql_help.c:2111
+#: sql_help.c:2291 sql_help.c:2471 sql_help.c:2493 sql_help.c:2923
 #: sql_help.c:3089
 msgid "option"
 msgstr "параметр"
 
-#: sql_help.c:108 sql_help.c:788 sql_help.c:1212 sql_help.c:1859
-#: sql_help.c:2024 sql_help.c:2472
+#: sql_help.c:108 sql_help.c:786 sql_help.c:1211 sql_help.c:1858
+#: sql_help.c:2023 sql_help.c:2472
 msgid "where option can be:"
 msgstr "где допу�тимые параметры:"
 
-#: sql_help.c:109 sql_help.c:1676
+#: sql_help.c:109 sql_help.c:1675
 msgid "allowconn"
 msgstr "разр_подключени�"
 
-#: sql_help.c:110 sql_help.c:789 sql_help.c:1213 sql_help.c:1677
-#: sql_help.c:2025 sql_help.c:2473
+#: sql_help.c:110 sql_help.c:787 sql_help.c:1212 sql_help.c:1676
+#: sql_help.c:2024 sql_help.c:2473
 msgid "connlimit"
 msgstr "предел_подключений"
 
-#: sql_help.c:111 sql_help.c:1678
+#: sql_help.c:111 sql_help.c:1677
 msgid "istemplate"
 msgstr "�то_шаблон"
 
-#: sql_help.c:117 sql_help.c:557 sql_help.c:619 sql_help.c:634 sql_help.c:974
-#: sql_help.c:1011
+#: sql_help.c:117 sql_help.c:557 sql_help.c:618 sql_help.c:972 sql_help.c:1009
 msgid "new_tablespace"
 msgstr "новое_табл_про�тран�тво"
 
 #: sql_help.c:119 sql_help.c:122 sql_help.c:124 sql_help.c:506 sql_help.c:508
-#: sql_help.c:509 sql_help.c:796 sql_help.c:800 sql_help.c:803 sql_help.c:888
-#: sql_help.c:891 sql_help.c:1219 sql_help.c:1222 sql_help.c:1224
-#: sql_help.c:1826 sql_help.c:3274 sql_help.c:3665
+#: sql_help.c:509 sql_help.c:794 sql_help.c:798 sql_help.c:801 sql_help.c:886
+#: sql_help.c:889 sql_help.c:1218 sql_help.c:1221 sql_help.c:1223
+#: sql_help.c:1825 sql_help.c:3274 sql_help.c:3665
 msgid "configuration_parameter"
 msgstr "параметр_конфигурации"
 
 #: sql_help.c:120 sql_help.c:366 sql_help.c:438 sql_help.c:444 sql_help.c:456
-#: sql_help.c:507 sql_help.c:552 sql_help.c:625 sql_help.c:631 sql_help.c:797
-#: sql_help.c:873 sql_help.c:889 sql_help.c:890 sql_help.c:993 sql_help.c:1013
-#: sql_help.c:1039 sql_help.c:1096 sql_help.c:1220 sql_help.c:1240
-#: sql_help.c:1744 sql_help.c:1776 sql_help.c:1783 sql_help.c:1827
-#: sql_help.c:1828 sql_help.c:1887 sql_help.c:1919 sql_help.c:2113
-#: sql_help.c:2187 sql_help.c:2195 sql_help.c:2227 sql_help.c:2249
-#: sql_help.c:2266 sql_help.c:2293 sql_help.c:2494 sql_help.c:3090
+#: sql_help.c:507 sql_help.c:552 sql_help.c:624 sql_help.c:630 sql_help.c:795
+#: sql_help.c:871 sql_help.c:887 sql_help.c:888 sql_help.c:991 sql_help.c:1011
+#: sql_help.c:1037 sql_help.c:1094 sql_help.c:1219 sql_help.c:1239
+#: sql_help.c:1743 sql_help.c:1775 sql_help.c:1782 sql_help.c:1826
+#: sql_help.c:1827 sql_help.c:1886 sql_help.c:1918 sql_help.c:2112
+#: sql_help.c:2186 sql_help.c:2194 sql_help.c:2226 sql_help.c:2248
+#: sql_help.c:2265 sql_help.c:2292 sql_help.c:2494 sql_help.c:3090
 #: sql_help.c:3666 sql_help.c:3667
 msgid "value"
 msgstr "значение"
@@ -3542,7 +3536,7 @@
 msgid "target_role"
 msgstr "целева�_роль"
 
-#: sql_help.c:183 sql_help.c:1727 sql_help.c:2071 sql_help.c:2076
+#: sql_help.c:183 sql_help.c:1726 sql_help.c:2070 sql_help.c:2075
 #: sql_help.c:3037 sql_help.c:3044 sql_help.c:3058 sql_help.c:3064
 #: sql_help.c:3369 sql_help.c:3376 sql_help.c:3390 sql_help.c:3396
 msgid "schema_name"
@@ -3558,10 +3552,10 @@
 
 #: sql_help.c:186 sql_help.c:187 sql_help.c:188 sql_help.c:189 sql_help.c:190
 #: sql_help.c:191 sql_help.c:192 sql_help.c:193 sql_help.c:531 sql_help.c:556
-#: sql_help.c:618 sql_help.c:749 sql_help.c:807 sql_help.c:973 sql_help.c:1227
-#: sql_help.c:1862 sql_help.c:1863 sql_help.c:1864 sql_help.c:1865
-#: sql_help.c:1866 sql_help.c:1992 sql_help.c:2028 sql_help.c:2029
-#: sql_help.c:2030 sql_help.c:2031 sql_help.c:2032 sql_help.c:2476
+#: sql_help.c:617 sql_help.c:747 sql_help.c:805 sql_help.c:971 sql_help.c:1226
+#: sql_help.c:1861 sql_help.c:1862 sql_help.c:1863 sql_help.c:1864
+#: sql_help.c:1865 sql_help.c:1991 sql_help.c:2027 sql_help.c:2028
+#: sql_help.c:2029 sql_help.c:2030 sql_help.c:2031 sql_help.c:2476
 #: sql_help.c:2477 sql_help.c:2478 sql_help.c:2479 sql_help.c:2480
 #: sql_help.c:3071 sql_help.c:3072 sql_help.c:3073 sql_help.c:3370
 #: sql_help.c:3374 sql_help.c:3377 sql_help.c:3379 sql_help.c:3381
@@ -3571,9 +3565,9 @@
 msgid "role_name"
 msgstr "им�_роли"
 
-#: sql_help.c:219 sql_help.c:431 sql_help.c:984 sql_help.c:986 sql_help.c:1256
-#: sql_help.c:1697 sql_help.c:1701 sql_help.c:1786 sql_help.c:1790
-#: sql_help.c:1883 sql_help.c:2199 sql_help.c:2209 sql_help.c:2231
+#: sql_help.c:219 sql_help.c:431 sql_help.c:982 sql_help.c:984 sql_help.c:1255
+#: sql_help.c:1696 sql_help.c:1700 sql_help.c:1785 sql_help.c:1789
+#: sql_help.c:1882 sql_help.c:2198 sql_help.c:2208 sql_help.c:2230
 #: sql_help.c:3120 sql_help.c:3135 sql_help.c:3137 sql_help.c:3551
 #: sql_help.c:3552 sql_help.c:3561 sql_help.c:3602 sql_help.c:3603
 #: sql_help.c:3604 sql_help.c:3605 sql_help.c:3606 sql_help.c:3607
@@ -3592,18 +3586,17 @@
 msgstr "ограничение_домена"
 
 #: sql_help.c:224 sql_help.c:226 sql_help.c:229 sql_help.c:446 sql_help.c:447
-#: sql_help.c:966 sql_help.c:999 sql_help.c:1000 sql_help.c:1001
-#: sql_help.c:1021 sql_help.c:1378 sql_help.c:1380 sql_help.c:1700
-#: sql_help.c:1785 sql_help.c:1789 sql_help.c:2198 sql_help.c:2208
-#: sql_help.c:3132
+#: sql_help.c:964 sql_help.c:997 sql_help.c:998 sql_help.c:999 sql_help.c:1019
+#: sql_help.c:1377 sql_help.c:1379 sql_help.c:1699 sql_help.c:1784
+#: sql_help.c:1788 sql_help.c:2197 sql_help.c:2207 sql_help.c:3132
 msgid "constraint_name"
 msgstr "им�_ограничени�"
 
-#: sql_help.c:227 sql_help.c:967
+#: sql_help.c:227 sql_help.c:965
 msgid "new_constraint_name"
 msgstr "им�_нового_ограничени�"
 
-#: sql_help.c:297 sql_help.c:871
+#: sql_help.c:297 sql_help.c:869
 msgid "new_version"
 msgstr "нова�_вер�и�"
 
@@ -3615,17 +3608,18 @@
 msgid "where member_object is:"
 msgstr "где �лемент_объект:"
 
-#: sql_help.c:305 sql_help.c:1371 sql_help.c:3471
+# well-spelled: агр
+#: sql_help.c:305 sql_help.c:1370 sql_help.c:3471
 msgid "aggregate_name"
 msgstr "им�_агр_функции"
 
-#: sql_help.c:307 sql_help.c:1373 sql_help.c:1615 sql_help.c:1619
-#: sql_help.c:1621 sql_help.c:2595
+#: sql_help.c:307 sql_help.c:1372 sql_help.c:1614 sql_help.c:1618
+#: sql_help.c:1620 sql_help.c:2595
 msgid "source_type"
 msgstr "и�ходный_тип"
 
-#: sql_help.c:308 sql_help.c:1374 sql_help.c:1616 sql_help.c:1620
-#: sql_help.c:1622 sql_help.c:2596
+#: sql_help.c:308 sql_help.c:1373 sql_help.c:1615 sql_help.c:1619
+#: sql_help.c:1621 sql_help.c:2596
 msgid "target_type"
 msgstr "целевой_тип"
 
@@ -3633,56 +3627,56 @@
 #: sql_help.c:314 sql_help.c:319 sql_help.c:323 sql_help.c:325 sql_help.c:327
 #: sql_help.c:328 sql_help.c:329 sql_help.c:330 sql_help.c:331 sql_help.c:332
 #: sql_help.c:333 sql_help.c:334 sql_help.c:335 sql_help.c:338 sql_help.c:339
-#: sql_help.c:1375 sql_help.c:1382 sql_help.c:1383 sql_help.c:1384
-#: sql_help.c:1385 sql_help.c:1386 sql_help.c:1387 sql_help.c:1388
-#: sql_help.c:1393 sql_help.c:1395 sql_help.c:1399 sql_help.c:1401
-#: sql_help.c:1405 sql_help.c:1406 sql_help.c:1409 sql_help.c:1410
-#: sql_help.c:1411 sql_help.c:1412 sql_help.c:1413 sql_help.c:1414
-#: sql_help.c:1415 sql_help.c:1416 sql_help.c:1417 sql_help.c:1422
-#: sql_help.c:1423 sql_help.c:3468 sql_help.c:3473 sql_help.c:3474
+#: sql_help.c:1374 sql_help.c:1381 sql_help.c:1382 sql_help.c:1383
+#: sql_help.c:1384 sql_help.c:1385 sql_help.c:1386 sql_help.c:1387
+#: sql_help.c:1392 sql_help.c:1394 sql_help.c:1398 sql_help.c:1400
+#: sql_help.c:1404 sql_help.c:1405 sql_help.c:1408 sql_help.c:1409
+#: sql_help.c:1410 sql_help.c:1411 sql_help.c:1412 sql_help.c:1413
+#: sql_help.c:1414 sql_help.c:1415 sql_help.c:1416 sql_help.c:1421
+#: sql_help.c:1422 sql_help.c:3468 sql_help.c:3473 sql_help.c:3474
 #: sql_help.c:3475 sql_help.c:3476 sql_help.c:3482 sql_help.c:3483
 #: sql_help.c:3484 sql_help.c:3485 sql_help.c:3486 sql_help.c:3487
 #: sql_help.c:3488 sql_help.c:3489
 msgid "object_name"
 msgstr "им�_объекта"
 
-#: sql_help.c:315 sql_help.c:713 sql_help.c:1389 sql_help.c:1617
-#: sql_help.c:1652 sql_help.c:1715 sql_help.c:1936 sql_help.c:1967
-#: sql_help.c:2367 sql_help.c:3054 sql_help.c:3386 sql_help.c:3477
+#: sql_help.c:315 sql_help.c:711 sql_help.c:1388 sql_help.c:1616
+#: sql_help.c:1651 sql_help.c:1714 sql_help.c:1935 sql_help.c:1966
+#: sql_help.c:2366 sql_help.c:3054 sql_help.c:3386 sql_help.c:3477
 #: sql_help.c:3580 sql_help.c:3584 sql_help.c:3588 sql_help.c:3591
 #: sql_help.c:3819 sql_help.c:3823 sql_help.c:3827 sql_help.c:3830
 #: sql_help.c:4013 sql_help.c:4017 sql_help.c:4021 sql_help.c:4024
 msgid "function_name"
 msgstr "им�_функции"
 
-#: sql_help.c:320 sql_help.c:706 sql_help.c:1396 sql_help.c:1960
+#: sql_help.c:320 sql_help.c:704 sql_help.c:1395 sql_help.c:1959
 msgid "operator_name"
 msgstr "им�_оператора"
 
-#: sql_help.c:321 sql_help.c:647 sql_help.c:651 sql_help.c:1397
-#: sql_help.c:1937 sql_help.c:2713
+#: sql_help.c:321 sql_help.c:645 sql_help.c:649 sql_help.c:1396 sql_help.c:1936
+#: sql_help.c:2713
 msgid "left_type"
 msgstr "тип_�лева"
 
-#: sql_help.c:322 sql_help.c:648 sql_help.c:652 sql_help.c:1398
-#: sql_help.c:1938 sql_help.c:2714
+#: sql_help.c:322 sql_help.c:646 sql_help.c:650 sql_help.c:1397 sql_help.c:1937
+#: sql_help.c:2714
 msgid "right_type"
 msgstr "тип_�права"
 
-#: sql_help.c:324 sql_help.c:326 sql_help.c:669 sql_help.c:672 sql_help.c:675
-#: sql_help.c:704 sql_help.c:716 sql_help.c:724 sql_help.c:727 sql_help.c:730
-#: sql_help.c:1400 sql_help.c:1402 sql_help.c:1957 sql_help.c:1978
-#: sql_help.c:2214 sql_help.c:2723 sql_help.c:2732
+#: sql_help.c:324 sql_help.c:326 sql_help.c:667 sql_help.c:670 sql_help.c:673
+#: sql_help.c:702 sql_help.c:714 sql_help.c:722 sql_help.c:725 sql_help.c:728
+#: sql_help.c:1399 sql_help.c:1401 sql_help.c:1956 sql_help.c:1977
+#: sql_help.c:2213 sql_help.c:2723 sql_help.c:2732
 msgid "index_method"
 msgstr "метод_индек�а"
 
-#: sql_help.c:336 sql_help.c:1017 sql_help.c:1418 sql_help.c:1823
-#: sql_help.c:2190 sql_help.c:2336 sql_help.c:2846 sql_help.c:3068
+#: sql_help.c:336 sql_help.c:1015 sql_help.c:1417 sql_help.c:1822
+#: sql_help.c:2189 sql_help.c:2335 sql_help.c:2846 sql_help.c:3068
 #: sql_help.c:3400
 msgid "type_name"
 msgstr "им�_типа"
 
-#: sql_help.c:337 sql_help.c:1419 sql_help.c:1822 sql_help.c:2337
+#: sql_help.c:337 sql_help.c:1418 sql_help.c:1821 sql_help.c:2336
 #: sql_help.c:2561 sql_help.c:2847 sql_help.c:3060 sql_help.c:3392
 msgid "lang_name"
 msgstr "им�_�зыка"
@@ -3691,31 +3685,31 @@
 msgid "and aggregate_signature is:"
 msgstr "и �игнатура_агр_функции:"
 
-#: sql_help.c:363 sql_help.c:1741
+#: sql_help.c:363 sql_help.c:1740
 msgid "handler_function"
 msgstr "функци�_обработчик"
 
-#: sql_help.c:364 sql_help.c:1742
+#: sql_help.c:364 sql_help.c:1741
 msgid "validator_function"
 msgstr "функци�_проверки"
 
-#: sql_help.c:413 sql_help.c:487 sql_help.c:609 sql_help.c:961 sql_help.c:1156
-#: sql_help.c:2205 sql_help.c:2206 sql_help.c:2222 sql_help.c:2223
+#: sql_help.c:413 sql_help.c:487 sql_help.c:608 sql_help.c:959 sql_help.c:1154
+#: sql_help.c:2204 sql_help.c:2205 sql_help.c:2221 sql_help.c:2222
 msgid "action"
 msgstr "дей�твие"
 
 #: sql_help.c:415 sql_help.c:422 sql_help.c:426 sql_help.c:427 sql_help.c:430
 #: sql_help.c:432 sql_help.c:433 sql_help.c:434 sql_help.c:436 sql_help.c:439
-#: sql_help.c:441 sql_help.c:442 sql_help.c:611 sql_help.c:621 sql_help.c:623
-#: sql_help.c:626 sql_help.c:628 sql_help.c:853 sql_help.c:963 sql_help.c:976
-#: sql_help.c:980 sql_help.c:981 sql_help.c:985 sql_help.c:987 sql_help.c:988
-#: sql_help.c:989 sql_help.c:991 sql_help.c:994 sql_help.c:996 sql_help.c:1255
-#: sql_help.c:1258 sql_help.c:1278 sql_help.c:1377 sql_help.c:1479
-#: sql_help.c:1484 sql_help.c:1498 sql_help.c:1499 sql_help.c:1500
-#: sql_help.c:1773 sql_help.c:1820 sql_help.c:1882 sql_help.c:1917
-#: sql_help.c:2098 sql_help.c:2178 sql_help.c:2191 sql_help.c:2210
-#: sql_help.c:2212 sql_help.c:2219 sql_help.c:2230 sql_help.c:2247
-#: sql_help.c:2370 sql_help.c:2506 sql_help.c:3039 sql_help.c:3040
+#: sql_help.c:441 sql_help.c:442 sql_help.c:610 sql_help.c:620 sql_help.c:622
+#: sql_help.c:625 sql_help.c:627 sql_help.c:851 sql_help.c:961 sql_help.c:974
+#: sql_help.c:978 sql_help.c:979 sql_help.c:983 sql_help.c:985 sql_help.c:986
+#: sql_help.c:987 sql_help.c:989 sql_help.c:992 sql_help.c:994 sql_help.c:1254
+#: sql_help.c:1257 sql_help.c:1277 sql_help.c:1376 sql_help.c:1478
+#: sql_help.c:1483 sql_help.c:1497 sql_help.c:1498 sql_help.c:1499
+#: sql_help.c:1772 sql_help.c:1819 sql_help.c:1881 sql_help.c:1916
+#: sql_help.c:2097 sql_help.c:2177 sql_help.c:2190 sql_help.c:2209
+#: sql_help.c:2211 sql_help.c:2218 sql_help.c:2229 sql_help.c:2246
+#: sql_help.c:2369 sql_help.c:2506 sql_help.c:3039 sql_help.c:3040
 #: sql_help.c:3119 sql_help.c:3134 sql_help.c:3136 sql_help.c:3138
 #: sql_help.c:3371 sql_help.c:3372 sql_help.c:3470 sql_help.c:3611
 #: sql_help.c:3850 sql_help.c:3892 sql_help.c:3894 sql_help.c:3896
@@ -3723,79 +3717,79 @@
 msgid "column_name"
 msgstr "им�_�толбца"
 
-#: sql_help.c:416 sql_help.c:612 sql_help.c:964
+#: sql_help.c:416 sql_help.c:611 sql_help.c:962
 msgid "new_column_name"
 msgstr "новое_им�_�толбца"
 
-#: sql_help.c:421 sql_help.c:503 sql_help.c:620 sql_help.c:975 sql_help.c:1169
+#: sql_help.c:421 sql_help.c:503 sql_help.c:619 sql_help.c:973 sql_help.c:1167
 msgid "where action is one of:"
 msgstr "где допу�тимое дей�твие:"
 
-#: sql_help.c:423 sql_help.c:428 sql_help.c:977 sql_help.c:982 sql_help.c:1171
-#: sql_help.c:1175 sql_help.c:1695 sql_help.c:1774 sql_help.c:1956
-#: sql_help.c:2179 sql_help.c:2415 sql_help.c:3221
+#: sql_help.c:423 sql_help.c:428 sql_help.c:975 sql_help.c:980 sql_help.c:1169
+#: sql_help.c:1173 sql_help.c:1694 sql_help.c:1773 sql_help.c:1955
+#: sql_help.c:2178 sql_help.c:2414 sql_help.c:3221
 msgid "data_type"
 msgstr "тип_данных"
 
-#: sql_help.c:424 sql_help.c:429 sql_help.c:978 sql_help.c:983 sql_help.c:1172
-#: sql_help.c:1176 sql_help.c:1696 sql_help.c:1777 sql_help.c:1884
-#: sql_help.c:2180 sql_help.c:2416 sql_help.c:2422 sql_help.c:3129
+#: sql_help.c:424 sql_help.c:429 sql_help.c:976 sql_help.c:981 sql_help.c:1170
+#: sql_help.c:1174 sql_help.c:1695 sql_help.c:1776 sql_help.c:1883
+#: sql_help.c:2179 sql_help.c:2415 sql_help.c:2421 sql_help.c:3129
 msgid "collation"
 msgstr "правило_�ортировки"
 
-#: sql_help.c:425 sql_help.c:979 sql_help.c:1778 sql_help.c:2181
-#: sql_help.c:2192
+#: sql_help.c:425 sql_help.c:977 sql_help.c:1777 sql_help.c:2180
+#: sql_help.c:2191
 msgid "column_constraint"
 msgstr "ограничение_�толбца"
 
-#: sql_help.c:435 sql_help.c:622 sql_help.c:990
+#: sql_help.c:435 sql_help.c:621 sql_help.c:988
 msgid "integer"
 msgstr "целое"
 
-#: sql_help.c:437 sql_help.c:440 sql_help.c:624 sql_help.c:627 sql_help.c:992
-#: sql_help.c:995
+#: sql_help.c:437 sql_help.c:440 sql_help.c:623 sql_help.c:626 sql_help.c:990
+#: sql_help.c:993
 msgid "attribute_option"
 msgstr "атрибут"
 
-#: sql_help.c:445 sql_help.c:997 sql_help.c:1779 sql_help.c:2182
-#: sql_help.c:2193
+#: sql_help.c:445 sql_help.c:995 sql_help.c:1778 sql_help.c:2181
+#: sql_help.c:2192
 msgid "table_constraint"
 msgstr "ограничение_таблицы"
 
-#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:1002
-#: sql_help.c:1003 sql_help.c:1004 sql_help.c:1005 sql_help.c:1420
+#: sql_help.c:448 sql_help.c:449 sql_help.c:450 sql_help.c:451 sql_help.c:1000
+#: sql_help.c:1001 sql_help.c:1002 sql_help.c:1003 sql_help.c:1419
 msgid "trigger_name"
 msgstr "им�_триггера"
 
-#: sql_help.c:452 sql_help.c:453 sql_help.c:1015 sql_help.c:1016
-#: sql_help.c:1780 sql_help.c:2185
+#: sql_help.c:452 sql_help.c:453 sql_help.c:1013 sql_help.c:1014
+#: sql_help.c:1779 sql_help.c:2184
 msgid "parent_table"
 msgstr "таблица_родитель"
 
-#: sql_help.c:504 sql_help.c:1824
+#: sql_help.c:504 sql_help.c:1823
 msgid "execution_cost"
 msgstr "�тоимо�ть_выполнени�"
 
-#: sql_help.c:505 sql_help.c:1825
+#: sql_help.c:505 sql_help.c:1824
 msgid "result_rows"
 msgstr "�трок_в_результате"
 
-#: sql_help.c:526 sql_help.c:528 sql_help.c:786 sql_help.c:794 sql_help.c:798
-#: sql_help.c:801 sql_help.c:804 sql_help.c:1210 sql_help.c:1218
-#: sql_help.c:1221 sql_help.c:1223 sql_help.c:1225 sql_help.c:2072
-#: sql_help.c:2074 sql_help.c:2077 sql_help.c:2078 sql_help.c:3038
+#: sql_help.c:526 sql_help.c:528 sql_help.c:784 sql_help.c:792 sql_help.c:796
+#: sql_help.c:799 sql_help.c:802 sql_help.c:1209 sql_help.c:1217
+#: sql_help.c:1220 sql_help.c:1222 sql_help.c:1224 sql_help.c:2071
+#: sql_help.c:2073 sql_help.c:2076 sql_help.c:2077 sql_help.c:3038
 #: sql_help.c:3042 sql_help.c:3045 sql_help.c:3047 sql_help.c:3049
 #: sql_help.c:3051 sql_help.c:3053 sql_help.c:3059 sql_help.c:3061
 #: sql_help.c:3063 sql_help.c:3065 sql_help.c:3067 sql_help.c:3069
 msgid "role_specification"
 msgstr "указание_роли"
 
-#: sql_help.c:527 sql_help.c:529 sql_help.c:1237 sql_help.c:1670
-#: sql_help.c:2080 sql_help.c:2491 sql_help.c:2880 sql_help.c:3696
+#: sql_help.c:527 sql_help.c:529 sql_help.c:1236 sql_help.c:1669
+#: sql_help.c:2079 sql_help.c:2491 sql_help.c:2880 sql_help.c:3696
 msgid "user_name"
 msgstr "им�_пользовател�"
 
-#: sql_help.c:530 sql_help.c:806 sql_help.c:1226 sql_help.c:2079
+#: sql_help.c:530 sql_help.c:804 sql_help.c:1225 sql_help.c:2078
 #: sql_help.c:3070
 msgid "where role_specification can be:"
 msgstr "где допу�тимое указание_роли:"
@@ -3804,56 +3798,56 @@
 msgid "group_name"
 msgstr "им�_группы"
 
-#: sql_help.c:549 sql_help.c:1675 sql_help.c:1888 sql_help.c:1920
-#: sql_help.c:2188 sql_help.c:2196 sql_help.c:2228 sql_help.c:2250
-#: sql_help.c:2262 sql_help.c:3066 sql_help.c:3398
+#: sql_help.c:549 sql_help.c:1674 sql_help.c:1887 sql_help.c:1919
+#: sql_help.c:2187 sql_help.c:2195 sql_help.c:2227 sql_help.c:2249
+#: sql_help.c:2261 sql_help.c:3066 sql_help.c:3398
 msgid "tablespace_name"
 msgstr "табл_про�тран�тво"
 
-#: sql_help.c:551 sql_help.c:554 sql_help.c:630 sql_help.c:632 sql_help.c:1012
-#: sql_help.c:1014 sql_help.c:1886 sql_help.c:1918 sql_help.c:2186
-#: sql_help.c:2194 sql_help.c:2226 sql_help.c:2248
+#: sql_help.c:551 sql_help.c:554 sql_help.c:629 sql_help.c:631 sql_help.c:1010
+#: sql_help.c:1012 sql_help.c:1885 sql_help.c:1917 sql_help.c:2185
+#: sql_help.c:2193 sql_help.c:2225 sql_help.c:2247
 msgid "storage_parameter"
 msgstr "параметр_хранени�"
 
-#: sql_help.c:577 sql_help.c:1394 sql_help.c:3481
+#: sql_help.c:577 sql_help.c:1393 sql_help.c:3481
 msgid "large_object_oid"
 msgstr "oid_большого_объекта"
 
-#: sql_help.c:629 sql_help.c:1010 sql_help.c:1019 sql_help.c:1022
-#: sql_help.c:1318
+#: sql_help.c:628 sql_help.c:1008 sql_help.c:1017 sql_help.c:1020
+#: sql_help.c:1317
 msgid "index_name"
 msgstr "им�_индек�а"
 
-#: sql_help.c:705 sql_help.c:717 sql_help.c:1959
+#: sql_help.c:703 sql_help.c:715 sql_help.c:1958
 msgid "strategy_number"
 msgstr "номер_�тратегии"
 
-#: sql_help.c:707 sql_help.c:708 sql_help.c:711 sql_help.c:712 sql_help.c:718
-#: sql_help.c:719 sql_help.c:721 sql_help.c:722 sql_help.c:1961
-#: sql_help.c:1962 sql_help.c:1965 sql_help.c:1966
+#: sql_help.c:705 sql_help.c:706 sql_help.c:709 sql_help.c:710 sql_help.c:716
+#: sql_help.c:717 sql_help.c:719 sql_help.c:720 sql_help.c:1960 sql_help.c:1961
+#: sql_help.c:1964 sql_help.c:1965
 msgid "op_type"
 msgstr "тип_операции"
 
-#: sql_help.c:709 sql_help.c:1963
+#: sql_help.c:707 sql_help.c:1962
 msgid "sort_family_name"
 msgstr "�емей�тво_�ортировки"
 
-#: sql_help.c:710 sql_help.c:720 sql_help.c:1964
+#: sql_help.c:708 sql_help.c:718 sql_help.c:1963
 msgid "support_number"
 msgstr "номер_опорной_процедуры"
 
-#: sql_help.c:714 sql_help.c:1618 sql_help.c:1968 sql_help.c:2339
-#: sql_help.c:2341
+#: sql_help.c:712 sql_help.c:1617 sql_help.c:1967 sql_help.c:2338
+#: sql_help.c:2340
 msgid "argument_type"
 msgstr "тип_аргумента"
 
-#: sql_help.c:745 sql_help.c:748 sql_help.c:816 sql_help.c:852 sql_help.c:1135
-#: sql_help.c:1277 sql_help.c:1317 sql_help.c:1379 sql_help.c:1404
-#: sql_help.c:1408 sql_help.c:1421 sql_help.c:1478 sql_help.c:1483
-#: sql_help.c:1772 sql_help.c:1880 sql_help.c:1916 sql_help.c:1991
-#: sql_help.c:2049 sql_help.c:2097 sql_help.c:2177 sql_help.c:2189
-#: sql_help.c:2246 sql_help.c:2364 sql_help.c:2540 sql_help.c:2749
+#: sql_help.c:743 sql_help.c:746 sql_help.c:814 sql_help.c:850 sql_help.c:1133
+#: sql_help.c:1276 sql_help.c:1316 sql_help.c:1378 sql_help.c:1403
+#: sql_help.c:1407 sql_help.c:1420 sql_help.c:1477 sql_help.c:1482
+#: sql_help.c:1771 sql_help.c:1879 sql_help.c:1915 sql_help.c:1990
+#: sql_help.c:2048 sql_help.c:2096 sql_help.c:2176 sql_help.c:2188
+#: sql_help.c:2245 sql_help.c:2363 sql_help.c:2540 sql_help.c:2749
 #: sql_help.c:2766 sql_help.c:2856 sql_help.c:3036 sql_help.c:3041
 #: sql_help.c:3086 sql_help.c:3117 sql_help.c:3368 sql_help.c:3373
 #: sql_help.c:3469 sql_help.c:3566 sql_help.c:3568 sql_help.c:3617
@@ -3863,613 +3857,613 @@
 msgid "table_name"
 msgstr "им�_таблицы"
 
-#: sql_help.c:750 sql_help.c:1993
+#: sql_help.c:748 sql_help.c:1992
 msgid "using_expression"
 msgstr "выражение_и�пользовани�"
 
-#: sql_help.c:751 sql_help.c:1994
+#: sql_help.c:749 sql_help.c:1993
 msgid "check_expression"
 msgstr "выражение_проверки"
 
-#: sql_help.c:790 sql_help.c:1214 sql_help.c:1860 sql_help.c:2026
+#: sql_help.c:788 sql_help.c:1213 sql_help.c:1859 sql_help.c:2025
 #: sql_help.c:2474
 msgid "password"
 msgstr "пароль"
 
-#: sql_help.c:791 sql_help.c:1215 sql_help.c:1861 sql_help.c:2027
+#: sql_help.c:789 sql_help.c:1214 sql_help.c:1860 sql_help.c:2026
 #: sql_help.c:2475
 msgid "timestamp"
 msgstr "timestamp"
 
-#: sql_help.c:795 sql_help.c:799 sql_help.c:802 sql_help.c:805 sql_help.c:3046
+#: sql_help.c:793 sql_help.c:797 sql_help.c:800 sql_help.c:803 sql_help.c:3046
 #: sql_help.c:3378
 msgid "database_name"
 msgstr "им�_БД"
 
-#: sql_help.c:846 sql_help.c:2092
+#: sql_help.c:844 sql_help.c:2091
 msgid "increment"
 msgstr "шаг"
 
-#: sql_help.c:847 sql_help.c:2093
+#: sql_help.c:845 sql_help.c:2092
 msgid "minvalue"
 msgstr "мин_значение"
 
-#: sql_help.c:848 sql_help.c:2094
+#: sql_help.c:846 sql_help.c:2093
 msgid "maxvalue"
 msgstr "мак�_значение"
 
-#: sql_help.c:849 sql_help.c:2095 sql_help.c:3564 sql_help.c:3654
+#: sql_help.c:847 sql_help.c:2094 sql_help.c:3564 sql_help.c:3654
 #: sql_help.c:3803 sql_help.c:3932 sql_help.c:3997
 msgid "start"
 msgstr "начальное_значение"
 
-#: sql_help.c:850
+#: sql_help.c:848
 msgid "restart"
 msgstr "значение_перезапу�ка"
 
-#: sql_help.c:851 sql_help.c:2096
+#: sql_help.c:849 sql_help.c:2095
 msgid "cache"
 msgstr "кеш"
 
-#: sql_help.c:998
+#: sql_help.c:996
 msgid "table_constraint_using_index"
 msgstr "ограничение_таблицы_�_индек�ом"
 
-#: sql_help.c:1006 sql_help.c:1007 sql_help.c:1008 sql_help.c:1009
+#: sql_help.c:1004 sql_help.c:1005 sql_help.c:1006 sql_help.c:1007
 msgid "rewrite_rule_name"
 msgstr "им�_правила_перезапи�и"
 
-#: sql_help.c:1020
+#: sql_help.c:1018
 msgid "and table_constraint_using_index is:"
 msgstr "и ограничение_таблицы_�_индек�ом:"
 
-#: sql_help.c:1038 sql_help.c:1041 sql_help.c:2265
+#: sql_help.c:1036 sql_help.c:1039 sql_help.c:2264
 msgid "tablespace_option"
 msgstr "параметр_табл_про�тран�тва"
 
-#: sql_help.c:1062 sql_help.c:1065 sql_help.c:1071 sql_help.c:1075
+#: sql_help.c:1060 sql_help.c:1063 sql_help.c:1069 sql_help.c:1073
 msgid "token_type"
 msgstr "тип_фрагмента"
 
-#: sql_help.c:1063 sql_help.c:1066
+#: sql_help.c:1061 sql_help.c:1064
 msgid "dictionary_name"
 msgstr "им�_�ловар�"
 
-#: sql_help.c:1068 sql_help.c:1072
+#: sql_help.c:1066 sql_help.c:1070
 msgid "old_dictionary"
 msgstr "�тарый_�ловарь"
 
-#: sql_help.c:1069 sql_help.c:1073
+#: sql_help.c:1067 sql_help.c:1071
 msgid "new_dictionary"
 msgstr "новый_�ловарь"
 
-#: sql_help.c:1160 sql_help.c:1170 sql_help.c:1173 sql_help.c:1174
-#: sql_help.c:2414
+#: sql_help.c:1158 sql_help.c:1168 sql_help.c:1171 sql_help.c:1172
+#: sql_help.c:2413
 msgid "attribute_name"
 msgstr "им�_атрибута"
 
-#: sql_help.c:1161
+#: sql_help.c:1159
 msgid "new_attribute_name"
 msgstr "новое_им�_атрибута"
 
-#: sql_help.c:1167
+#: sql_help.c:1165
 msgid "new_enum_value"
 msgstr "новое_значение_перечи�лени�"
 
-#: sql_help.c:1168
+#: sql_help.c:1166
 msgid "existing_enum_value"
 msgstr "�уще�твующее_значение_перечи�лени�"
 
-#: sql_help.c:1238 sql_help.c:1781 sql_help.c:2108 sql_help.c:2492
+#: sql_help.c:1237 sql_help.c:1780 sql_help.c:2107 sql_help.c:2492
 #: sql_help.c:2881 sql_help.c:3052 sql_help.c:3087 sql_help.c:3384
 msgid "server_name"
 msgstr "им�_�ервера"
 
-#: sql_help.c:1266 sql_help.c:1269 sql_help.c:2507
+#: sql_help.c:1265 sql_help.c:1268 sql_help.c:2507
 msgid "view_option_name"
 msgstr "им�_параметра_пред�тавлени�"
 
-#: sql_help.c:1267 sql_help.c:2508
+#: sql_help.c:1266 sql_help.c:2508
 msgid "view_option_value"
 msgstr "значение_параметра_пред�тавлени�"
 
-#: sql_help.c:1292 sql_help.c:3712 sql_help.c:3714 sql_help.c:3738
+#: sql_help.c:1291 sql_help.c:3712 sql_help.c:3714 sql_help.c:3738
 msgid "transaction_mode"
 msgstr "режим_транзакции"
 
-#: sql_help.c:1293 sql_help.c:3715 sql_help.c:3739
+#: sql_help.c:1292 sql_help.c:3715 sql_help.c:3739
 msgid "where transaction_mode is one of:"
 msgstr "где допу�тимый режим_транзакции:"
 
-#: sql_help.c:1376
+#: sql_help.c:1375
 msgid "relation_name"
 msgstr "им�_отношени�"
 
-#: sql_help.c:1381 sql_help.c:3048 sql_help.c:3380
+#: sql_help.c:1380 sql_help.c:3048 sql_help.c:3380
 msgid "domain_name"
 msgstr "им�_домена"
 
-#: sql_help.c:1403
+#: sql_help.c:1402
 msgid "policy_name"
 msgstr "им�_политики"
 
-#: sql_help.c:1407
+#: sql_help.c:1406
 msgid "rule_name"
 msgstr "им�_правила"
 
-#: sql_help.c:1424
+#: sql_help.c:1423
 msgid "text"
 msgstr "тек�т"
 
-#: sql_help.c:1449 sql_help.c:3230 sql_help.c:3418
+#: sql_help.c:1448 sql_help.c:3230 sql_help.c:3418
 msgid "transaction_id"
 msgstr "код_транзакции"
 
-#: sql_help.c:1480 sql_help.c:1486 sql_help.c:3156
+#: sql_help.c:1479 sql_help.c:1485 sql_help.c:3156
 msgid "filename"
 msgstr "им�_файла"
 
-#: sql_help.c:1481 sql_help.c:1487 sql_help.c:2051 sql_help.c:2052
-#: sql_help.c:2053
+#: sql_help.c:1480 sql_help.c:1486 sql_help.c:2050 sql_help.c:2051
+#: sql_help.c:2052
 msgid "command"
 msgstr "команда"
 
-#: sql_help.c:1485 sql_help.c:1921 sql_help.c:2251 sql_help.c:2509
+#: sql_help.c:1484 sql_help.c:1920 sql_help.c:2250 sql_help.c:2509
 #: sql_help.c:2527 sql_help.c:3121
 msgid "query"
 msgstr "запро�"
 
-#: sql_help.c:1489 sql_help.c:2926
+#: sql_help.c:1488 sql_help.c:2926
 msgid "where option can be one of:"
 msgstr "где допу�тимый параметр:"
 
-#: sql_help.c:1490
+#: sql_help.c:1489
 msgid "format_name"
 msgstr "им�_формата"
 
-#: sql_help.c:1491 sql_help.c:1492 sql_help.c:1495 sql_help.c:2927
+#: sql_help.c:1490 sql_help.c:1491 sql_help.c:1494 sql_help.c:2927
 #: sql_help.c:2928 sql_help.c:2929 sql_help.c:2930 sql_help.c:2931
 msgid "boolean"
 msgstr "логиче�кое_значение"
 
-#: sql_help.c:1493
+#: sql_help.c:1492
 msgid "delimiter_character"
 msgstr "�имвол_разделитель"
 
-#: sql_help.c:1494
+#: sql_help.c:1493
 msgid "null_string"
 msgstr "пред�тавление_NULL"
 
-#: sql_help.c:1496
+#: sql_help.c:1495
 msgid "quote_character"
 msgstr "�имвол_кавычек"
 
-#: sql_help.c:1497
+#: sql_help.c:1496
 msgid "escape_character"
 msgstr "�пец�имвол"
 
-#: sql_help.c:1501
+#: sql_help.c:1500
 msgid "encoding_name"
 msgstr "им�_кодировки"
 
-#: sql_help.c:1558 sql_help.c:1574 sql_help.c:1577
+#: sql_help.c:1557 sql_help.c:1573 sql_help.c:1576
 msgid "arg_data_type"
 msgstr "тип_данных_аргумента"
 
-#: sql_help.c:1559 sql_help.c:1578 sql_help.c:1586
+#: sql_help.c:1558 sql_help.c:1577 sql_help.c:1585
 msgid "sfunc"
 msgstr "функци�_�о�то�ни�"
 
-#: sql_help.c:1560 sql_help.c:1579 sql_help.c:1587
+#: sql_help.c:1559 sql_help.c:1578 sql_help.c:1586
 msgid "state_data_type"
 msgstr "тип_данных_�о�то�ни�"
 
-#: sql_help.c:1561 sql_help.c:1580 sql_help.c:1588
+#: sql_help.c:1560 sql_help.c:1579 sql_help.c:1587
 msgid "state_data_size"
 msgstr "размер_данных_�о�то�ни�"
 
-#: sql_help.c:1562 sql_help.c:1581 sql_help.c:1589
+#: sql_help.c:1561 sql_help.c:1580 sql_help.c:1588
 msgid "ffunc"
 msgstr "функци�_завершени�"
 
-#: sql_help.c:1563 sql_help.c:1582 sql_help.c:1590
+#: sql_help.c:1562 sql_help.c:1581 sql_help.c:1589
 msgid "initial_condition"
 msgstr "начальное_у�ловие"
 
-#: sql_help.c:1564 sql_help.c:1591
+#: sql_help.c:1563 sql_help.c:1590
 msgid "msfunc"
-msgstr "функци�_�о�то�ни�_дв"
+msgstr "функци�_�о�то�ни�_движ"
 
-#: sql_help.c:1565 sql_help.c:1592
+#: sql_help.c:1564 sql_help.c:1591
 msgid "minvfunc"
-msgstr "обр_функци�_дв"
+msgstr "обратна�_функци�_движ"
 
-#: sql_help.c:1566 sql_help.c:1593
+#: sql_help.c:1565 sql_help.c:1592
 msgid "mstate_data_type"
-msgstr "тип_данных_�о�то�ни�_дв"
+msgstr "тип_данных_�о�то�ни�_движ"
 
-#: sql_help.c:1567 sql_help.c:1594
+#: sql_help.c:1566 sql_help.c:1593
 msgid "mstate_data_size"
-msgstr "размер_данных_�о�то�ни�_дв"
+msgstr "размер_данных_�о�то�ни�_движ"
 
-#: sql_help.c:1568 sql_help.c:1595
+#: sql_help.c:1567 sql_help.c:1594
 msgid "mffunc"
-msgstr "функци�_завершени�_дв"
+msgstr "функци�_завершени�_движ"
 
-#: sql_help.c:1569 sql_help.c:1596
+#: sql_help.c:1568 sql_help.c:1595
 msgid "minitial_condition"
-msgstr "начальное_у�ловие_дв"
+msgstr "начальное_у�ловие_движ"
 
-#: sql_help.c:1570 sql_help.c:1597
+#: sql_help.c:1569 sql_help.c:1596
 msgid "sort_operator"
 msgstr "оператор_�ортировки"
 
-#: sql_help.c:1583
+#: sql_help.c:1582
 msgid "or the old syntax"
 msgstr "или �тарый �интак�и�"
 
-#: sql_help.c:1585
+#: sql_help.c:1584
 msgid "base_type"
 msgstr "базовый_тип"
 
-#: sql_help.c:1636
+#: sql_help.c:1635
 msgid "locale"
 msgstr "код_локали"
 
-#: sql_help.c:1637 sql_help.c:1673
+#: sql_help.c:1636 sql_help.c:1672
 msgid "lc_collate"
 msgstr "код_правила_�ортировки"
 
-#: sql_help.c:1638 sql_help.c:1674
+#: sql_help.c:1637 sql_help.c:1673
 msgid "lc_ctype"
 msgstr "код_кла��ификации_�имволов"
 
-#: sql_help.c:1640
+#: sql_help.c:1639
 msgid "existing_collation"
 msgstr "�уще�твующее_правило_�ортировки"
 
-#: sql_help.c:1650
+#: sql_help.c:1649
 msgid "source_encoding"
 msgstr "и�ходна�_кодировка"
 
-#: sql_help.c:1651
+#: sql_help.c:1650
 msgid "dest_encoding"
 msgstr "целева�_кодировка"
 
-#: sql_help.c:1671 sql_help.c:2291
+#: sql_help.c:1670 sql_help.c:2290
 msgid "template"
 msgstr "шаблон"
 
-#: sql_help.c:1672
+#: sql_help.c:1671
 msgid "encoding"
 msgstr "кодировка"
 
-#: sql_help.c:1698
+#: sql_help.c:1697
 msgid "constraint"
 msgstr "ограничение"
 
-#: sql_help.c:1699
+#: sql_help.c:1698
 msgid "where constraint is:"
 msgstr "где ограничение:"
 
-#: sql_help.c:1713 sql_help.c:2048 sql_help.c:2363
+#: sql_help.c:1712 sql_help.c:2047 sql_help.c:2362
 msgid "event"
 msgstr "�обытие"
 
-#: sql_help.c:1714
+#: sql_help.c:1713
 msgid "filter_variable"
 msgstr "переменна�_фильтра"
 
-#: sql_help.c:1726
+#: sql_help.c:1725
 msgid "extension_name"
 msgstr "им�_ра�ширени�"
 
-#: sql_help.c:1728
+#: sql_help.c:1727
 msgid "version"
 msgstr "вер�и�"
 
-#: sql_help.c:1729
+#: sql_help.c:1728
 msgid "old_version"
 msgstr "�тара�_вер�и�"
 
-#: sql_help.c:1784 sql_help.c:2197
+#: sql_help.c:1783 sql_help.c:2196
 msgid "where column_constraint is:"
 msgstr "где ограничение_�толбца:"
 
-#: sql_help.c:1787 sql_help.c:1818 sql_help.c:2200
+#: sql_help.c:1786 sql_help.c:1817 sql_help.c:2199
 msgid "default_expr"
 msgstr "выражение_по_умолчанию"
 
-#: sql_help.c:1788 sql_help.c:2207
+#: sql_help.c:1787 sql_help.c:2206
 msgid "and table_constraint is:"
 msgstr "и ограничение_таблицы:"
 
-#: sql_help.c:1819
+#: sql_help.c:1818
 msgid "rettype"
 msgstr "тип_возврата"
 
-#: sql_help.c:1821
+#: sql_help.c:1820
 msgid "column_type"
 msgstr "тип_�толбца"
 
-#: sql_help.c:1829
+#: sql_help.c:1828
 msgid "definition"
 msgstr "определение"
 
-#: sql_help.c:1830
+#: sql_help.c:1829
 msgid "obj_file"
 msgstr "объектный_файл"
 
-#: sql_help.c:1831
+#: sql_help.c:1830
 msgid "link_symbol"
 msgstr "�имвол_в_�к�порте"
 
-#: sql_help.c:1832
+#: sql_help.c:1831
 msgid "attribute"
 msgstr "атрибут"
 
-#: sql_help.c:1867 sql_help.c:2033 sql_help.c:2481
+#: sql_help.c:1866 sql_help.c:2032 sql_help.c:2481
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:1881
+#: sql_help.c:1880
 msgid "method"
 msgstr "метод"
 
-#: sql_help.c:1885 sql_help.c:2232 sql_help.c:3130
+#: sql_help.c:1884 sql_help.c:2231 sql_help.c:3130
 msgid "opclass"
 msgstr "кла��_оператора"
 
-#: sql_help.c:1889 sql_help.c:2218
+#: sql_help.c:1888 sql_help.c:2217
 msgid "predicate"
 msgstr "предикат"
 
-#: sql_help.c:1901
+#: sql_help.c:1900
 msgid "call_handler"
 msgstr "обработчик_вызова"
 
-#: sql_help.c:1902
+#: sql_help.c:1901
 msgid "inline_handler"
 msgstr "обработчик_внедрённого_кода"
 
-#: sql_help.c:1903
+#: sql_help.c:1902
 msgid "valfunction"
 msgstr "функци�_проверки"
 
-#: sql_help.c:1939
+#: sql_help.c:1938
 msgid "com_op"
 msgstr "коммут_оператор"
 
-#: sql_help.c:1940
+#: sql_help.c:1939
 msgid "neg_op"
 msgstr "обратный_оператор"
 
-#: sql_help.c:1941
+#: sql_help.c:1940
 msgid "res_proc"
 msgstr "процедура_ограничени�"
 
-#: sql_help.c:1942
+#: sql_help.c:1941
 msgid "join_proc"
 msgstr "процедура_�оединени�"
 
-#: sql_help.c:1958
+#: sql_help.c:1957
 msgid "family_name"
 msgstr "им�_�емей�тва"
 
-#: sql_help.c:1969
+#: sql_help.c:1968
 msgid "storage_type"
 msgstr "тип_хранени�"
 
-#: sql_help.c:2050 sql_help.c:2366 sql_help.c:2543 sql_help.c:3140
+#: sql_help.c:2049 sql_help.c:2365 sql_help.c:2543 sql_help.c:3140
 #: sql_help.c:3555 sql_help.c:3557 sql_help.c:3645 sql_help.c:3647
 #: sql_help.c:3794 sql_help.c:3796 sql_help.c:3899 sql_help.c:3988
 #: sql_help.c:3990
 msgid "condition"
 msgstr "у�ловие"
 
-#: sql_help.c:2054 sql_help.c:2369
+#: sql_help.c:2053 sql_help.c:2368
 msgid "where event can be one of:"
 msgstr "где допу�тимое �обытие:"
 
-#: sql_help.c:2073 sql_help.c:2075
+#: sql_help.c:2072 sql_help.c:2074
 msgid "schema_element"
 msgstr "�лемент_�хемы"
 
-#: sql_help.c:2109
+#: sql_help.c:2108
 msgid "server_type"
 msgstr "тип_�ервера"
 
-#: sql_help.c:2110
+#: sql_help.c:2109
 msgid "server_version"
 msgstr "вер�и�_�ервера"
 
-#: sql_help.c:2111 sql_help.c:3050 sql_help.c:3382
+#: sql_help.c:2110 sql_help.c:3050 sql_help.c:3382
 msgid "fdw_name"
 msgstr "им�_обёртки_�торонних_данных"
 
-#: sql_help.c:2183
+#: sql_help.c:2182
 msgid "source_table"
 msgstr "и�ходна�_таблица"
 
-#: sql_help.c:2184
+#: sql_help.c:2183
 msgid "like_option"
 msgstr "параметр_порождени�"
 
-#: sql_help.c:2201 sql_help.c:2202 sql_help.c:2211 sql_help.c:2213
-#: sql_help.c:2217
+#: sql_help.c:2200 sql_help.c:2201 sql_help.c:2210 sql_help.c:2212
+#: sql_help.c:2216
 msgid "index_parameters"
 msgstr "параметры_индек�а"
 
-#: sql_help.c:2203 sql_help.c:2220
+#: sql_help.c:2202 sql_help.c:2219
 msgid "reftable"
 msgstr "целева�_таблица"
 
-#: sql_help.c:2204 sql_help.c:2221
+#: sql_help.c:2203 sql_help.c:2220
 msgid "refcolumn"
 msgstr "целевой_�толбец"
 
-#: sql_help.c:2215
+#: sql_help.c:2214
 msgid "exclude_element"
 msgstr "объект_и�ключени�"
 
-#: sql_help.c:2216 sql_help.c:3562 sql_help.c:3652 sql_help.c:3801
+#: sql_help.c:2215 sql_help.c:3562 sql_help.c:3652 sql_help.c:3801
 #: sql_help.c:3930 sql_help.c:3995
 msgid "operator"
 msgstr "оператор"
 
-#: sql_help.c:2224
+#: sql_help.c:2223
 msgid "and like_option is:"
 msgstr "и параметр_порождени�:"
 
-#: sql_help.c:2225
+#: sql_help.c:2224
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "параметры_индек�а в ограничени�х UNIQUE, PRIMARY KEY и EXCLUDE:"
 
-#: sql_help.c:2229
+#: sql_help.c:2228
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "объект_и�ключени� в ограничении EXCLUDE:"
 
-#: sql_help.c:2264
+#: sql_help.c:2263
 msgid "directory"
 msgstr "каталог"
 
-#: sql_help.c:2278
+#: sql_help.c:2277
 msgid "parser_name"
 msgstr "им�_анализатора"
 
-#: sql_help.c:2279
+#: sql_help.c:2278
 msgid "source_config"
 msgstr "и�ходна�_конфигураци�"
 
-#: sql_help.c:2308
+#: sql_help.c:2307
 msgid "start_function"
 msgstr "функци�_начала"
 
-#: sql_help.c:2309
+#: sql_help.c:2308
 msgid "gettoken_function"
 msgstr "функци�_выдачи_фрагмента"
 
-#: sql_help.c:2310
+#: sql_help.c:2309
 msgid "end_function"
 msgstr "функци�_окончани�"
 
-#: sql_help.c:2311
+#: sql_help.c:2310
 msgid "lextypes_function"
 msgstr "функци�_лек�_типов"
 
-#: sql_help.c:2312
+#: sql_help.c:2311
 msgid "headline_function"
 msgstr "функци�_�оздани�_выдержек"
 
-#: sql_help.c:2324
+#: sql_help.c:2323
 msgid "init_function"
 msgstr "функци�_инициализации"
 
-#: sql_help.c:2325
+#: sql_help.c:2324
 msgid "lexize_function"
 msgstr "функци�_выделени�_лек�ем"
 
-#: sql_help.c:2338
+#: sql_help.c:2337
 msgid "from_sql_function_name"
 msgstr "им�_функции_из_sql"
 
-#: sql_help.c:2340
+#: sql_help.c:2339
 msgid "to_sql_function_name"
 msgstr "им�_функции_в_sql"
 
-#: sql_help.c:2365
+#: sql_help.c:2364
 msgid "referenced_table_name"
 msgstr "��ылающа���_таблица"
 
-#: sql_help.c:2368
+#: sql_help.c:2367
 msgid "arguments"
 msgstr "аргументы"
 
-#: sql_help.c:2418 sql_help.c:3490
+#: sql_help.c:2417 sql_help.c:3490
 msgid "label"
 msgstr "метка"
 
-#: sql_help.c:2420
+#: sql_help.c:2419
 msgid "subtype"
 msgstr "подтип"
 
-#: sql_help.c:2421
+#: sql_help.c:2420
 msgid "subtype_operator_class"
 msgstr "кла��_оператора_подтипа"
 
-#: sql_help.c:2423
+#: sql_help.c:2422
 msgid "canonical_function"
 msgstr "канониче�ка�_функци�"
 
-#: sql_help.c:2424
+#: sql_help.c:2423
 msgid "subtype_diff_function"
 msgstr "функци�_различий_подтипа"
 
-#: sql_help.c:2426
+#: sql_help.c:2425
 msgid "input_function"
 msgstr "функци�_ввода"
 
-#: sql_help.c:2427
+#: sql_help.c:2426
 msgid "output_function"
 msgstr "функци�_вывода"
 
-#: sql_help.c:2428
+#: sql_help.c:2427
 msgid "receive_function"
 msgstr "функци�_получени�"
 
-#: sql_help.c:2429
+#: sql_help.c:2428
 msgid "send_function"
 msgstr "функци�_отправки"
 
-#: sql_help.c:2430
+#: sql_help.c:2429
 msgid "type_modifier_input_function"
 msgstr "функци�_ввода_модификатора_типа"
 
-#: sql_help.c:2431
+#: sql_help.c:2430
 msgid "type_modifier_output_function"
 msgstr "функци�_вывода_модификатора_типа"
 
-#: sql_help.c:2432
+#: sql_help.c:2431
 msgid "analyze_function"
 msgstr "функци�_анализа"
 
-#: sql_help.c:2433
+#: sql_help.c:2432
 msgid "internallength"
 msgstr "внутр_длина"
 
-#: sql_help.c:2434
+#: sql_help.c:2433
 msgid "alignment"
 msgstr "выравнивание"
 
-#: sql_help.c:2435
+#: sql_help.c:2434
 msgid "storage"
 msgstr "хранение"
 
-#: sql_help.c:2436
+#: sql_help.c:2435
 msgid "like_type"
 msgstr "тип_образец"
 
-#: sql_help.c:2437
+#: sql_help.c:2436
 msgid "category"
 msgstr "категори�"
 
-#: sql_help.c:2438
+#: sql_help.c:2437
 msgid "preferred"
 msgstr "предпочитаемый"
 
-#: sql_help.c:2439
+#: sql_help.c:2438
 msgid "default"
 msgstr "по_умолчанию"
 
-#: sql_help.c:2440
+#: sql_help.c:2439
 msgid "element"
 msgstr "�лемент"
 
-#: sql_help.c:2441
+#: sql_help.c:2440
 msgid "delimiter"
 msgstr "разделитель"
 
-#: sql_help.c:2442
+#: sql_help.c:2441
 msgid "collatable"
 msgstr "�ортируемый"
 
@@ -4896,7 +4890,7 @@
 
 #: sql_help.h:397
 msgid "force a transaction log checkpoint"
-msgstr "отметить контрольную точку в журнале транзакций"
+msgstr "произве�ти контрольную точку в журнале транзакций"
 
 #: sql_help.h:402
 msgid "close a cursor"
@@ -5420,7 +5414,7 @@
 msgid "unrecognized value \"%s\" for \"%s\"; assuming \"%s\"\n"
 msgstr "нера�познанное значение \"%s\" дл� \"%s\"; подразумевает�� \"%s\"\n"
 
-#: tab-complete.c:4581
+#: tab-complete.c:4597
 #, c-format
 msgid ""
 "tab completion query failed: %s\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/print.c postgresql-9.5-9.5.8/src/bin/psql/print.c
--- postgresql-9.5-9.5.2/src/bin/psql/print.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/print.c	2017-08-07 21:13:41.000000000 +0000
@@ -2870,10 +2870,18 @@
 			pagerprog = getenv("PAGER");
 			if (!pagerprog)
 				pagerprog = DEFAULT_PAGER;
+			else
+			{
+				/* if PAGER is empty or all-white-space, don't use pager */
+				if (strspn(pagerprog, " \t\r\n") == strlen(pagerprog))
+					return stdout;
+			}
 			disable_sigpipe_trap();
 			pagerpipe = popen(pagerprog, "w");
 			if (pagerpipe)
 				return pagerpipe;
+			/* if popen fails, silently proceed without pager */
+			restore_sigpipe_trap();
 		}
 	}
 
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/psqlscan.c postgresql-9.5-9.5.8/src/bin/psql/psqlscan.c
--- postgresql-9.5-9.5.2/src/bin/psql/psqlscan.c	2016-03-28 20:23:04.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/psqlscan.c	2017-08-07 21:34:43.000000000 +0000
@@ -3853,7 +3853,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -3866,7 +3866,7 @@
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -5370,7 +5370,7 @@
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -6536,7 +6536,8 @@
 							/* Keep the first quote, remove the second */
 							cp++;
 						}
-						inquotes = !inquotes;
+						else
+							inquotes = !inquotes;
 						/* Collapse out quote at *cp */
 						memmove(cp, cp + 1, strlen(cp));
 						mybuf.len--;
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/psqlscan.l postgresql-9.5-9.5.8/src/bin/psql/psqlscan.l
--- postgresql-9.5-9.5.2/src/bin/psql/psqlscan.l	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/psqlscan.l	2017-08-07 21:13:41.000000000 +0000
@@ -1605,7 +1605,8 @@
 							/* Keep the first quote, remove the second */
 							cp++;
 						}
-						inquotes = !inquotes;
+						else
+							inquotes = !inquotes;
 						/* Collapse out quote at *cp */
 						memmove(cp, cp + 1, strlen(cp));
 						mybuf.len--;
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/sql_help.c postgresql-9.5-9.5.8/src/bin/psql/sql_help.c
--- postgresql-9.5-9.5.2/src/bin/psql/sql_help.c	2016-03-28 20:23:04.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/sql_help.c	2017-08-07 21:34:43.000000000 +0000
@@ -603,8 +603,7 @@
 					  "    SET WITHOUT CLUSTER\n"
 					  "    SET ( %s = %s [, ... ] )\n"
 					  "    RESET ( %s [, ... ] )\n"
-					  "    OWNER TO { %s | CURRENT_USER | SESSION_USER }\n"
-					  "    SET TABLESPACE %s",
+					  "    OWNER TO { %s | CURRENT_USER | SESSION_USER }",
 					  _("name"),
 					  _("action"),
 					  _("name"),
@@ -630,8 +629,7 @@
 					  _("storage_parameter"),
 					  _("value"),
 					  _("storage_parameter"),
-					  _("new_owner"),
-					  _("new_tablespace"));
+					  _("new_owner"));
 }
 
 void
@@ -1198,10 +1196,10 @@
 					  "\n"
 					  "ALTER USER %s RENAME TO %s\n"
 					  "\n"
-					  "ALTER USER %s SET %s { TO | = } { %s | DEFAULT }\n"
-					  "ALTER USER %s SET %s FROM CURRENT\n"
-					  "ALTER USER %s RESET %s\n"
-					  "ALTER USER %s RESET ALL\n"
+					  "ALTER USER { %s | ALL } [ IN DATABASE %s ] SET %s { TO | = } { %s | DEFAULT }\n"
+					  "ALTER USER { %s | ALL } [ IN DATABASE %s ] SET %s FROM CURRENT\n"
+					  "ALTER USER { %s | ALL } [ IN DATABASE %s ] RESET %s\n"
+					  "ALTER USER { %s | ALL } [ IN DATABASE %s ] RESET ALL\n"
 					  "\n"
 					  "%s\n"
 					  "\n"
@@ -1217,13 +1215,17 @@
 					  _("name"),
 					  _("new_name"),
 					  _("role_specification"),
+					  _("database_name"),
 					  _("configuration_parameter"),
 					  _("value"),
 					  _("role_specification"),
+					  _("database_name"),
 					  _("configuration_parameter"),
 					  _("role_specification"),
+					  _("database_name"),
 					  _("configuration_parameter"),
 					  _("role_specification"),
+					  _("database_name"),
 					  _("where role_specification can be:"),
 					  _("role_name"));
 }
@@ -1665,8 +1667,8 @@
 					  "           [ LC_CTYPE [=] %s ]\n"
 					  "           [ TABLESPACE [=] %s ]\n"
 					  "           [ ALLOW_CONNECTIONS [=] %s ]\n"
-					  "           [ CONNECTION LIMIT [=] %s ] ]\n"
-					  "           [ IS_TEMPLATE [=] %s ]",
+					  "           [ CONNECTION LIMIT [=] %s ]\n"
+					  "           [ IS_TEMPLATE [=] %s ] ]",
 					  _("name"),
 					  _("user_name"),
 					  _("template"),
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/sql_help.h postgresql-9.5-9.5.8/src/bin/psql/sql_help.h
--- postgresql-9.5-9.5.2/src/bin/psql/sql_help.h	2016-03-28 20:23:04.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/sql_help.h	2017-08-07 21:34:43.000000000 +0000
@@ -276,7 +276,7 @@
     { "ALTER MATERIALIZED VIEW",
       N_("change the definition of a materialized view"),
       sql_help_ALTER_MATERIALIZED_VIEW,
-      22 },
+      21 },
 
     { "ALTER OPERATOR",
       N_("change the definition of an operator"),
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/startup.c postgresql-9.5-9.5.8/src/bin/psql/startup.c
--- postgresql-9.5-9.5.2/src/bin/psql/startup.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/startup.c	2017-08-07 21:13:41.000000000 +0000
@@ -215,7 +215,7 @@
 		values[2] = options.username;
 		keywords[3] = "password";
 		values[3] = password;
-		keywords[4] = "dbname";
+		keywords[4] = "dbname"; /* see do_connect() */
 		values[4] = (options.action == ACT_LIST_DB &&
 					 options.dbname == NULL) ?
 			"postgres" : options.dbname;
diff -Nru postgresql-9.5-9.5.2/src/bin/psql/tab-complete.c postgresql-9.5-9.5.8/src/bin/psql/tab-complete.c
--- postgresql-9.5-9.5.2/src/bin/psql/tab-complete.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/psql/tab-complete.c	2017-08-07 21:13:41.000000000 +0000
@@ -818,7 +818,7 @@
 	{"UNIQUE", NULL, NULL, THING_NO_DROP},		/* for CREATE UNIQUE INDEX ... */
 	{"UNLOGGED", NULL, NULL, THING_NO_DROP},	/* for CREATE UNLOGGED TABLE
 												 * ... */
-	{"USER", Query_for_list_of_roles},
+	{"USER", Query_for_list_of_roles " UNION SELECT 'MAPPING FOR'"},
 	{"USER MAPPING FOR", NULL, NULL},
 	{"VIEW", NULL, &Query_for_list_of_views},
 	{NULL}						/* end of list */
@@ -1288,7 +1288,7 @@
 			 pg_strcasecmp(prev_wd, "PRIVILEGES") == 0)
 	{
 		static const char *const list_ALTER_DEFAULT_PRIVILEGES[] =
-		{"FOR ROLE", "FOR USER", "IN SCHEMA", NULL};
+		{"FOR ROLE", "IN SCHEMA", NULL};
 
 		COMPLETE_WITH_LIST(list_ALTER_DEFAULT_PRIVILEGES);
 	}
@@ -1298,19 +1298,26 @@
 			 pg_strcasecmp(prev2_wd, "PRIVILEGES") == 0 &&
 			 pg_strcasecmp(prev_wd, "FOR") == 0)
 	{
-		static const char *const list_ALTER_DEFAULT_PRIVILEGES_FOR[] =
-		{"ROLE", "USER", NULL};
+		COMPLETE_WITH_CONST("ROLE");
+	}
+	/* ALTER DEFAULT PRIVILEGES FOR ROLE ... } */
+	else if (pg_strcasecmp(prev5_wd, "DEFAULT") == 0 &&
+			 pg_strcasecmp(prev4_wd, "PRIVILEGES") == 0 &&
+			 pg_strcasecmp(prev3_wd, "FOR") == 0)
+	{
+		static const char *const list_ALTER_DEFAULT_PRIVILEGES_REST[] =
+		{"GRANT", "REVOKE", "IN SCHEMA", NULL};
 
-		COMPLETE_WITH_LIST(list_ALTER_DEFAULT_PRIVILEGES_FOR);
+		COMPLETE_WITH_LIST(list_ALTER_DEFAULT_PRIVILEGES_REST);
 	}
-	/* ALTER DEFAULT PRIVILEGES { FOR ROLE ... | IN SCHEMA ... } */
+	/* ALTER DEFAULT PRIVILEGES IN SCHEMA ... } */
 	else if (pg_strcasecmp(prev5_wd, "DEFAULT") == 0 &&
 			 pg_strcasecmp(prev4_wd, "PRIVILEGES") == 0 &&
-			 (pg_strcasecmp(prev3_wd, "FOR") == 0 ||
-			  pg_strcasecmp(prev3_wd, "IN") == 0))
+			 pg_strcasecmp(prev3_wd, "IN") == 0 &&
+			 pg_strcasecmp(prev2_wd, "SCHEMA") == 0)
 	{
 		static const char *const list_ALTER_DEFAULT_PRIVILEGES_REST[] =
-		{"GRANT", "REVOKE", NULL};
+		{"GRANT", "REVOKE", "FOR ROLE", NULL};
 
 		COMPLETE_WITH_LIST(list_ALTER_DEFAULT_PRIVILEGES_REST);
 	}
@@ -3053,8 +3060,9 @@
 
 /* GRANT && REVOKE */
 	/* Complete GRANT/REVOKE with a list of roles and privileges */
-	else if (pg_strcasecmp(prev_wd, "GRANT") == 0 ||
-			 pg_strcasecmp(prev_wd, "REVOKE") == 0)
+	else if (prev2_wd[0] == '\0' &&
+			 (pg_strcasecmp(prev_wd, "GRANT") == 0 ||
+			  pg_strcasecmp(prev_wd, "REVOKE") == 0))
 	{
 		COMPLETE_WITH_QUERY(Query_for_list_of_roles
 							" UNION SELECT 'SELECT'"
@@ -3858,8 +3866,8 @@
 		static const char *const my_list[] =
 		{"border", "columns", "expanded", "fieldsep", "fieldsep_zero",
 			"footer", "format", "linestyle", "null", "numericlocale",
-			"pager", "recordsep", "recordsep_zero", "tableattr", "title",
-			"tuples_only", "unicode_border_linestyle",
+			"pager", "pager_min_lines", "recordsep", "recordsep_zero",
+			"tableattr", "title", "tuples_only", "unicode_border_linestyle",
 		"unicode_column_linestyle", "unicode_header_linestyle", NULL};
 
 		COMPLETE_WITH_LIST_CS(my_list);
@@ -3893,13 +3901,9 @@
 		}
 	}
 	else if (strcmp(prev_wd, "\\unset") == 0)
-	{
 		matches = complete_from_variables(text, "", "", true);
-	}
 	else if (strcmp(prev_wd, "\\set") == 0)
-	{
 		matches = complete_from_variables(text, "", "", false);
-	}
 	else if (strcmp(prev2_wd, "\\set") == 0)
 	{
 		static const char *const boolean_value_list[] =
diff -Nru postgresql-9.5-9.5.2/src/bin/scripts/clusterdb.c postgresql-9.5-9.5.8/src/bin/scripts/clusterdb.c
--- postgresql-9.5-9.5.2/src/bin/scripts/clusterdb.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/scripts/clusterdb.c	2017-08-07 21:13:41.000000000 +0000
@@ -209,10 +209,10 @@
 	{
 		if (table)
 			fprintf(stderr, _("%s: clustering of table \"%s\" in database \"%s\" failed: %s"),
-					progname, table, dbname, PQerrorMessage(conn));
+					progname, table, PQdb(conn), PQerrorMessage(conn));
 		else
 			fprintf(stderr, _("%s: clustering of database \"%s\" failed: %s"),
-					progname, dbname, PQerrorMessage(conn));
+					progname, PQdb(conn), PQerrorMessage(conn));
 		PQfinish(conn);
 		exit(1);
 	}
@@ -229,6 +229,7 @@
 {
 	PGconn	   *conn;
 	PGresult   *result;
+	PQExpBufferData connstr;
 	int			i;
 
 	conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
@@ -236,6 +237,7 @@
 	result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
 	PQfinish(conn);
 
+	initPQExpBuffer(&connstr);
 	for (i = 0; i < PQntuples(result); i++)
 	{
 		char	   *dbname = PQgetvalue(result, i, 0);
@@ -246,10 +248,15 @@
 			fflush(stdout);
 		}
 
-		cluster_one_database(dbname, verbose, NULL,
+		resetPQExpBuffer(&connstr);
+		appendPQExpBuffer(&connstr, "dbname=");
+		appendConnStrVal(&connstr, dbname);
+
+		cluster_one_database(connstr.data, verbose, NULL,
 							 host, port, username, prompt_password,
 							 progname, echo);
 	}
+	termPQExpBuffer(&connstr);
 
 	PQclear(result);
 }
diff -Nru postgresql-9.5-9.5.2/src/bin/scripts/createlang.c postgresql-9.5-9.5.8/src/bin/scripts/createlang.c
--- postgresql-9.5-9.5.2/src/bin/scripts/createlang.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/scripts/createlang.c	2017-08-07 21:13:41.000000000 +0000
@@ -192,10 +192,10 @@
 	result = executeQuery(conn, sql.data, progname, echo);
 	if (PQntuples(result) > 0)
 	{
-		PQfinish(conn);
 		fprintf(stderr,
 		  _("%s: language \"%s\" is already installed in database \"%s\"\n"),
-				progname, langname, dbname);
+				progname, langname, PQdb(conn));
+		PQfinish(conn);
 		/* separate exit status for "already installed" */
 		exit(2);
 	}
diff -Nru postgresql-9.5-9.5.2/src/bin/scripts/droplang.c postgresql-9.5-9.5.8/src/bin/scripts/droplang.c
--- postgresql-9.5-9.5.2/src/bin/scripts/droplang.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/scripts/droplang.c	2017-08-07 21:13:41.000000000 +0000
@@ -199,10 +199,10 @@
 	result = executeQuery(conn, sql.data, progname, echo);
 	if (PQntuples(result) == 0)
 	{
-		PQfinish(conn);
 		fprintf(stderr, _("%s: language \"%s\" is not installed in "
 						  "database \"%s\"\n"),
-				progname, langname, dbname);
+				progname, langname, PQdb(conn));
+		PQfinish(conn);
 		exit(1);
 	}
 	PQclear(result);
diff -Nru postgresql-9.5-9.5.2/src/bin/scripts/po/de.po postgresql-9.5-9.5.8/src/bin/scripts/po/de.po
--- postgresql-9.5-9.5.2/src/bin/scripts/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/scripts/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,7 +1,7 @@
 # German message translation file for "scripts".
 # Peter Eisentraut <peter_e@gmx.net>, 2003 - 2015.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
@@ -49,14 +49,14 @@
 #: vacuumdb.c:209 vacuumdb.c:228
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
 #: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:181
 #: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:147
 #: vacuumdb.c:226
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: zu viele Kommandozeilenargumente (das erste ist „%s“)\n"
+msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
 #: clusterdb.c:139
 #, c-format
@@ -71,17 +71,17 @@
 #: clusterdb.c:211
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: Clustern der Tabelle „%s“ in Datenbank „%s“ fehlgeschlagen: %s"
+msgstr "%s: Clustern der Tabelle »%s« in Datenbank »%s« fehlgeschlagen: %s"
 
 #: clusterdb.c:214
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
-msgstr "%s: Clustern der Datenbank „%s“ fehlgeschlagen: %s"
+msgstr "%s: Clustern der Datenbank »%s« fehlgeschlagen: %s"
 
 #: clusterdb.c:245
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
-msgstr "%s: clustere Datenbank „%s“\n"
+msgstr "%s: clustere Datenbank »%s«\n"
 
 #: clusterdb.c:261
 #, c-format
@@ -271,7 +271,7 @@
 #: common.c:292
 #, c-format
 msgid "Please answer \"%s\" or \"%s\".\n"
-msgstr "Bitte antworten Sie „%s“ oder „%s“.\n"
+msgstr "Bitte antworten Sie »%s« oder »%s«.\n"
 
 #: common.c:371 common.c:408
 #, c-format
@@ -296,7 +296,7 @@
 #: createdb.c:164
 #, c-format
 msgid "%s: \"%s\" is not a valid encoding name\n"
-msgstr "%s: „%s“ ist kein gültiger Kodierungsname\n"
+msgstr "%s: »%s« ist kein gültiger Kodierungsname\n"
 
 #: createdb.c:213
 #, c-format
@@ -442,7 +442,7 @@
 #: createlang.c:197
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
-msgstr "%s: Sprache „%s“ ist bereits in Datenbank „%s“ installiert\n"
+msgstr "%s: Sprache »%s« ist bereits in Datenbank »%s« installiert\n"
 
 #: createlang.c:219
 #, c-format
@@ -643,7 +643,7 @@
 #: dropdb.c:117
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
-msgstr "Datenbank „%s“ wird unwiderruflich gelöscht werden.\n"
+msgstr "Datenbank »%s« wird unwiderruflich gelöscht werden.\n"
 
 #: dropdb.c:118 dropuser.c:123
 msgid "Are you sure?"
@@ -681,7 +681,7 @@
 #: droplang.c:203
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
-msgstr "%s: Sprache „%s“ ist nicht in Datenbank „%s“ installiert\n"
+msgstr "%s: Sprache »%s« ist nicht in Datenbank »%s« installiert\n"
 
 #: droplang.c:221
 #, c-format
@@ -716,12 +716,12 @@
 #: dropuser.c:122
 #, c-format
 msgid "Role \"%s\" will be permanently removed.\n"
-msgstr "Rolle „%s“ wird unwiderruflich gelöscht werden.\n"
+msgstr "Rolle »%s« wird unwiderruflich gelöscht werden.\n"
 
 #: dropuser.c:140
 #, c-format
 msgid "%s: removal of role \"%s\" failed: %s"
-msgstr "%s: Löschen der Rolle „%s“ fehlgeschlagen: %s"
+msgstr "%s: Löschen der Rolle »%s« fehlgeschlagen: %s"
 
 #: dropuser.c:155
 #, c-format
@@ -885,27 +885,27 @@
 #: reindexdb.c:306
 #, c-format
 msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: Reindizieren der Tabelle „%s“ in Datenbank „%s“ fehlgeschlagen: %s"
+msgstr "%s: Reindizieren der Tabelle »%s« in Datenbank »%s« fehlgeschlagen: %s"
 
 #: reindexdb.c:309
 #, c-format
 msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: Reindizieren des Index „%s“ in Datenbank „%s“ fehlgeschlagen: %s"
+msgstr "%s: Reindizieren des Index »%s« in Datenbank »%s« fehlgeschlagen: %s"
 
 #: reindexdb.c:312
 #, c-format
 msgid "%s: reindexing of schema \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: Reindizieren des Schemas „%s“ in Datenbank „%s“ fehlgeschlagen: %s"
+msgstr "%s: Reindizieren des Schemas »%s« in Datenbank »%s« fehlgeschlagen: %s"
 
 #: reindexdb.c:315
 #, c-format
 msgid "%s: reindexing of database \"%s\" failed: %s"
-msgstr "%s: Reindizieren der Datenbank „%s“ fehlgeschlagen: %s"
+msgstr "%s: Reindizieren der Datenbank »%s« fehlgeschlagen: %s"
 
 #: reindexdb.c:346
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
-msgstr "%s: reindiziere Datenbank „%s“\n"
+msgstr "%s: reindiziere Datenbank »%s«\n"
 
 #: reindexdb.c:379
 #, c-format
@@ -974,7 +974,7 @@
 #: vacuumdb.c:236 vacuumdb.c:242
 #, c-format
 msgid "%s: cannot use the \"%s\" option when performing only analyze\n"
-msgstr "%s: kann Option „%s“ nicht verwenden, wenn nur Analyze durchgeführt wird\n"
+msgstr "%s: kann Option »%s« nicht verwenden, wenn nur Analyze durchgeführt wird\n"
 
 #: vacuumdb.c:259
 #, c-format
@@ -1001,22 +1001,22 @@
 #: vacuumdb.c:374
 #, c-format
 msgid "%s: processing database \"%s\": %s\n"
-msgstr "%s: bearbeite Datenbank „%s“: %s\n"
+msgstr "%s: bearbeite Datenbank »%s«: %s\n"
 
 #: vacuumdb.c:377
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
-msgstr "%s: führe Vacuum in Datenbank „%s“ aus\n"
+msgstr "%s: führe Vacuum in Datenbank »%s« aus\n"
 
 #: vacuumdb.c:738
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%s: Vacuum der Tabelle „%s“ in Datenbank „%s“ fehlgeschlagen: %s"
+msgstr "%s: Vacuum der Tabelle »%s« in Datenbank »%s« fehlgeschlagen: %s"
 
 #: vacuumdb.c:741 vacuumdb.c:858
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
-msgstr "%s: Vacuum der Datenbank „%s“ fehlgeschlagen: %s"
+msgstr "%s: Vacuum der Datenbank »%s« fehlgeschlagen: %s"
 
 #: vacuumdb.c:974
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/bin/scripts/po/es.po postgresql-9.5-9.5.8/src/bin/scripts/po/es.po
--- postgresql-9.5-9.5.2/src/bin/scripts/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/scripts/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: pgscripts (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:43+0000\n"
+"POT-Creation-Date: 2017-05-21 17:32+0000\n"
 "PO-Revision-Date: 2015-09-30 13:18-0300\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: Castellano <pgsql-es-ayuda@postgresql.org>\n"
@@ -52,14 +52,14 @@
 #: createuser.c:183 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
 #: droplang.c:118 droplang.c:174 dropuser.c:89 dropuser.c:104 dropuser.c:115
 #: pg_isready.c:93 pg_isready.c:107 reindexdb.c:130 reindexdb.c:149
-#: vacuumdb.c:208 vacuumdb.c:227
+#: vacuumdb.c:210 vacuumdb.c:229
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para mayor información.\n"
 
 #: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:181
 #: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:147
-#: vacuumdb.c:225
+#: vacuumdb.c:227
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: demasiados argumentos (el primero es «%s»)\n"
@@ -91,12 +91,12 @@
 "%s: falló el reordenamiento de la base de datos «%s»:\n"
 "%s"
 
-#: clusterdb.c:245
+#: clusterdb.c:247
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: reordenando la base de datos «%s»\n"
 
-#: clusterdb.c:261
+#: clusterdb.c:268
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -106,21 +106,21 @@
 "en una base de datos.\n"
 "\n"
 
-#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
-#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:392
-#: vacuumdb.c:931
+#: clusterdb.c:269 createdb.c:252 createlang.c:236 createuser.c:348
+#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:400
+#: vacuumdb.c:938
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: clusterdb.c:263 reindexdb.c:393 vacuumdb.c:932
+#: clusterdb.c:270 reindexdb.c:401 vacuumdb.c:939
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPCIÓN]... [BASE-DE-DATOS]\n"
 
-#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
-#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:394
-#: vacuumdb.c:933
+#: clusterdb.c:271 createdb.c:254 createlang.c:238 createuser.c:350
+#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:402
+#: vacuumdb.c:940
 #, c-format
 msgid ""
 "\n"
@@ -129,52 +129,52 @@
 "\n"
 "Opciones:\n"
 
-#: clusterdb.c:265
+#: clusterdb.c:272
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 reordenar todas las bases de datos\n"
 
-#: clusterdb.c:266
+#: clusterdb.c:273
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=BASE         base de datos a reordenar\n"
 
-#: clusterdb.c:267 createlang.c:240 createuser.c:354 dropdb.c:158
-#: droplang.c:241 dropuser.c:159 reindexdb.c:397
+#: clusterdb.c:274 createlang.c:240 createuser.c:354 dropdb.c:158
+#: droplang.c:241 dropuser.c:159 reindexdb.c:405
 #, c-format
 msgid "  -e, --echo                show the commands being sent to the server\n"
 msgstr "  -e, --echo                mostrar las órdenes a medida que se ejecutan\n"
 
-#: clusterdb.c:268 reindexdb.c:399
+#: clusterdb.c:275 reindexdb.c:407
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet               no escribir ningún mensaje\n"
 
-#: clusterdb.c:269
+#: clusterdb.c:276
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table(s) only\n"
 msgstr "  -t, --table=TABLA         reordenar sólo esta(s) tabla(s)\n"
 
-#: clusterdb.c:270 reindexdb.c:403
+#: clusterdb.c:277 reindexdb.c:411
 #, c-format
 msgid "  -v, --verbose             write a lot of output\n"
 msgstr "  -v, --verbose             desplegar varios mensajes informativos\n"
 
-#: clusterdb.c:271 createlang.c:242 createuser.c:368 dropdb.c:160
-#: droplang.c:243 dropuser.c:162 reindexdb.c:404
+#: clusterdb.c:278 createlang.c:242 createuser.c:368 dropdb.c:160
+#: droplang.c:243 dropuser.c:162 reindexdb.c:412
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             mostrar información de versión y salir\n"
 
-#: clusterdb.c:272 createlang.c:243 createuser.c:373 dropdb.c:162
-#: droplang.c:244 dropuser.c:164 reindexdb.c:405
+#: clusterdb.c:279 createlang.c:243 createuser.c:373 dropdb.c:162
+#: droplang.c:244 dropuser.c:164 reindexdb.c:413
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                mostrar esta ayuda y salir\n"
 
-#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
-#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:406
-#: vacuumdb.c:949
+#: clusterdb.c:280 createdb.c:265 createlang.c:244 createuser.c:374
+#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:414
+#: vacuumdb.c:956
 #, c-format
 msgid ""
 "\n"
@@ -183,42 +183,42 @@
 "\n"
 "Opciones de conexión:\n"
 
-#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
-#: droplang.c:246 dropuser.c:166 reindexdb.c:407 vacuumdb.c:950
+#: clusterdb.c:281 createlang.c:245 createuser.c:375 dropdb.c:164
+#: droplang.c:246 dropuser.c:166 reindexdb.c:415 vacuumdb.c:957
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr "  -h, --host=ANFITRIÓN      nombre del servidor o directorio del socket\n"
 
-#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
-#: droplang.c:247 dropuser.c:167 reindexdb.c:408 vacuumdb.c:951
+#: clusterdb.c:282 createlang.c:246 createuser.c:376 dropdb.c:165
+#: droplang.c:247 dropuser.c:167 reindexdb.c:416 vacuumdb.c:958
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PUERTO         puerto del servidor\n"
 
-#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:409 vacuumdb.c:952
+#: clusterdb.c:283 createlang.c:247 dropdb.c:166 droplang.c:248
+#: reindexdb.c:417 vacuumdb.c:959
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=USUARIO    nombre de usuario para la conexión\n"
 
-#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
-#: droplang.c:249 dropuser.c:169 reindexdb.c:410 vacuumdb.c:953
+#: clusterdb.c:284 createlang.c:248 createuser.c:378 dropdb.c:167
+#: droplang.c:249 dropuser.c:169 reindexdb.c:418 vacuumdb.c:960
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
 msgstr "  -w, --no-password         nunca pedir contraseña\n"
 
-#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
-#: droplang.c:250 dropuser.c:170 reindexdb.c:411 vacuumdb.c:954
+#: clusterdb.c:285 createlang.c:249 createuser.c:379 dropdb.c:168
+#: droplang.c:250 dropuser.c:170 reindexdb.c:419 vacuumdb.c:961
 #, c-format
 msgid "  -W, --password            force password prompt\n"
 msgstr "  -W, --password            forzar la petición de contraseña\n"
 
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:412 vacuumdb.c:955
+#: clusterdb.c:286 dropdb.c:169 reindexdb.c:420 vacuumdb.c:962
 #, c-format
 msgid "  --maintenance-db=DBNAME   alternate maintenance database\n"
 msgstr "  --maintenance-db=BASE     base de datos de mantención alternativa\n"
 
-#: clusterdb.c:280
+#: clusterdb.c:287
 #, c-format
 msgid ""
 "\n"
@@ -227,9 +227,9 @@
 "\n"
 "Lea la descripción de la orden CLUSTER de SQL para obtener mayores detalles.\n"
 
-#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
-#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:414
-#: vacuumdb.c:957
+#: clusterdb.c:288 createdb.c:273 createlang.c:250 createuser.c:380
+#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:422
+#: vacuumdb.c:964
 #, c-format
 msgid ""
 "\n"
@@ -238,58 +238,58 @@
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: common.c:68 common.c:114
+#: common.c:82 common.c:128
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: common.c:103
+#: common.c:113
 #, c-format
-msgid "%s: could not connect to database %s\n"
-msgstr "%s: no se pudo conectar a la base de datos %s\n"
+msgid "%s: could not connect to database %s: out of memory\n"
+msgstr "%s: no se pudo conectar a la base de datos %s: memoria agotada\n"
 
-#: common.c:130
+#: common.c:141
 #, c-format
 msgid "%s: could not connect to database %s: %s"
 msgstr "%s: no se pudo conectar a la base de datos %s: %s"
 
-#: common.c:179 common.c:207
+#: common.c:190 common.c:218
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: la consulta falló: %s"
 
-#: common.c:181 common.c:209
+#: common.c:192 common.c:220
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: la consulta era: %s\n"
 
 #. translator: abbreviation for "yes"
-#: common.c:250
+#: common.c:261
 msgid "y"
 msgstr "s"
 
 #. translator: abbreviation for "no"
-#: common.c:252
+#: common.c:263
 msgid "n"
 msgstr "n"
 
 #. translator: This is a question followed by the translated options for
 #. "yes" and "no".
-#: common.c:262
+#: common.c:273
 #, c-format
 msgid "%s (%s/%s) "
 msgstr "%s (%s/%s) "
 
-#: common.c:283
+#: common.c:294
 #, c-format
 msgid "Please answer \"%s\" or \"%s\".\n"
 msgstr "Por favor conteste «%s» o «%s».\n"
 
-#: common.c:362 common.c:399
+#: common.c:373 common.c:410
 #, c-format
 msgid "Cancel request sent\n"
 msgstr "Petición de cancelación enviada\n"
 
-#: common.c:365 common.c:403
+#: common.c:376 common.c:414
 #, c-format
 msgid "Could not send cancel request: %s"
 msgstr "No se pudo enviar el paquete de cancelación: %s"
@@ -452,7 +452,7 @@
 msgid "%s: missing required argument language name\n"
 msgstr "%s: falta el nombre de lenguaje requerido\n"
 
-#: createlang.c:197
+#: createlang.c:196
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
 msgstr "%s: el lenguaje «%s» ya está instalado en la base de datos «%s»\n"
@@ -693,7 +693,7 @@
 msgid "  --if-exists               don't report error if database doesn't exist\n"
 msgstr "  --if-exists               no reportar error si la base de datos no existe\n"
 
-#: droplang.c:203
+#: droplang.c:202
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
 msgstr "%s: el lenguaje «%s» no está instalado en la base de datos «%s»\n"
@@ -931,17 +931,17 @@
 msgid "%s: reindexing of database \"%s\" failed: %s"
 msgstr "%s: falló la reindexación de la base de datos «%s»: %s"
 
-#: reindexdb.c:346
+#: reindexdb.c:348
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
 msgstr "%s: reindexando la base de datos «%s»\n"
 
-#: reindexdb.c:379
+#: reindexdb.c:387
 #, c-format
 msgid "%s: reindexing of system catalogs failed: %s"
 msgstr "%s: falló la reindexación de los catálogos del sistema: %s"
 
-#: reindexdb.c:391
+#: reindexdb.c:399
 #, c-format
 msgid ""
 "%s reindexes a PostgreSQL database.\n"
@@ -950,37 +950,37 @@
 "%s reindexa una base de datos PostgreSQL.\n"
 "\n"
 
-#: reindexdb.c:395
+#: reindexdb.c:403
 #, c-format
 msgid "  -a, --all                 reindex all databases\n"
 msgstr "  -a, --all                 reindexar todas las bases de datos\n"
 
-#: reindexdb.c:396
+#: reindexdb.c:404
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to reindex\n"
 msgstr "  -d, --dbname=DBNAME       base de datos a reindexar\n"
 
-#: reindexdb.c:398
+#: reindexdb.c:406
 #, c-format
 msgid "  -i, --index=INDEX         recreate specific index(es) only\n"
 msgstr "  -i, --index=INDEX         recrear sólo este o estos índice(s)\n"
 
-#: reindexdb.c:400
+#: reindexdb.c:408
 #, c-format
 msgid "  -s, --system              reindex system catalogs\n"
 msgstr "  -s, --system              reindexa los catálogos del sistema\n"
 
-#: reindexdb.c:401
+#: reindexdb.c:409
 #, c-format
 msgid "  -S, --schema=SCHEMA       reindex specific schema(s) only\n"
 msgstr "  -S, --schema=ESQUEMA      reindexar sólo este o estos esquemas\n"
 
-#: reindexdb.c:402
+#: reindexdb.c:410
 #, c-format
 msgid "  -t, --table=TABLE         reindex specific table(s) only\n"
 msgstr "  -t, --table=TABLE         reindexar sólo esta(s) tabla(s)\n"
 
-#: reindexdb.c:413
+#: reindexdb.c:421
 #, c-format
 msgid ""
 "\n"
@@ -989,74 +989,74 @@
 "\n"
 "Lea la descripción de la orden REINDEX de SQL para obtener mayores detalles.\n"
 
-#: vacuumdb.c:190
+#: vacuumdb.c:192
 #, c-format
-msgid "%s: number of parallel \"jobs\" must be at least 1\n"
+msgid "%s: number of parallel jobs must be at least 1\n"
 msgstr "%s: número de trabajos en paralelo debe ser al menos 1\n"
 
-#: vacuumdb.c:196
+#: vacuumdb.c:198
 #, c-format
 msgid "%s: too many parallel jobs requested (maximum: %d)\n"
 msgstr "%s: demasiados trabajos paralelos solicitados (máximo: %d)\n"
 
-#: vacuumdb.c:235 vacuumdb.c:241
+#: vacuumdb.c:237 vacuumdb.c:243
 #, c-format
 msgid "%s: cannot use the \"%s\" option when performing only analyze\n"
 msgstr ""
 "%s: no se puede usar la opción «%s» cuando se está sólo\n"
 "actualizando estadísticas\n"
 
-#: vacuumdb.c:258
+#: vacuumdb.c:260
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr ""
 "%s: no se pueden limpiar todas las bases de datos y una de ellas\n"
 "en particular simultáneamente\n"
 
-#: vacuumdb.c:264
+#: vacuumdb.c:266
 #, c-format
 msgid "%s: cannot vacuum specific table(s) in all databases\n"
 msgstr ""
 "%s: no es posible limpiar tablas específicas en todas\n"
 "las bases de datos\n"
 
-#: vacuumdb.c:350
+#: vacuumdb.c:352
 msgid "Generating minimal optimizer statistics (1 target)"
 msgstr "Generando estadísticas mínimas para el optimizador (tamaño = 1)"
 
-#: vacuumdb.c:351
+#: vacuumdb.c:353
 msgid "Generating medium optimizer statistics (10 targets)"
 msgstr "Generando estadísticas medias para el optimizador (tamaño = 10)"
 
-#: vacuumdb.c:352
+#: vacuumdb.c:354
 msgid "Generating default (full) optimizer statistics"
 msgstr "Generando estadísticas predeterminadas (completas) para el optimizador"
 
-#: vacuumdb.c:361
+#: vacuumdb.c:366
 #, c-format
 msgid "%s: processing database \"%s\": %s\n"
 msgstr "%s: procesando la base de datos «%s»: %s\n"
 
-#: vacuumdb.c:364
+#: vacuumdb.c:369
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: limpiando la base de datos «%s»\n"
 
-#: vacuumdb.c:694
+#: vacuumdb.c:701
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr ""
 "%s: falló la limpieza de la tabla «%s» en la base de datos «%s»:\n"
 "%s"
 
-#: vacuumdb.c:697 vacuumdb.c:814
+#: vacuumdb.c:704 vacuumdb.c:821
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr ""
 "%s: falló la limpieza de la base de datos «%s»:\n"
 "%s"
 
-#: vacuumdb.c:930
+#: vacuumdb.c:937
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -1065,71 +1065,71 @@
 "%s limpia (VACUUM) y analiza una base de datos PostgreSQL.\n"
 "\n"
 
-#: vacuumdb.c:934
+#: vacuumdb.c:941
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                 limpia todas las bases de datos\n"
 
-#: vacuumdb.c:935
+#: vacuumdb.c:942
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=BASE         base de datos a limpiar\n"
 
-#: vacuumdb.c:936
+#: vacuumdb.c:943
 #, c-format
 msgid "  -e, --echo                      show the commands being sent to the server\n"
 msgstr "  -e, --echo                mostrar las órdenes enviadas al servidor\n"
 
-#: vacuumdb.c:937
+#: vacuumdb.c:944
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                usar «vacuum full»\n"
 
-#: vacuumdb.c:938
+#: vacuumdb.c:945
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
 msgstr "  -F, --freeze              usar «vacuum freeze»\n"
 
-#: vacuumdb.c:939
+#: vacuumdb.c:946
 #, c-format
 msgid "  -j, --jobs=NUM                  use this many concurrent connections to vacuum\n"
 msgstr "  -j, --jobs=NUM            usar esta cantidad de conexiones concurrentes\n"
 
-#: vacuumdb.c:940
+#: vacuumdb.c:947
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet               no desplegar mensajes\n"
 
-#: vacuumdb.c:941
+#: vacuumdb.c:948
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table(s) only\n"
 msgstr ""
 "  -t, --table='TABLA[(COLUMNAS)]'\n"
 "                            limpiar sólo esta(s) tabla(s)\n"
 
-#: vacuumdb.c:942
+#: vacuumdb.c:949
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose             desplegar varios mensajes informativos\n"
 
-#: vacuumdb.c:943
+#: vacuumdb.c:950
 #, c-format
 msgid "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version             mostrar información de versión y salir\n"
 
-#: vacuumdb.c:944
+#: vacuumdb.c:951
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
 msgstr "  -z, --analyze             actualizar las estadísticas del optimizador\n"
 
-#: vacuumdb.c:945
+#: vacuumdb.c:952
 #, c-format
 msgid "  -Z, --analyze-only              only update optimizer statistics; no vacuum\n"
 msgstr ""
 "  -Z, --analyze-only        sólo actualizar las estadísticas del optimizador;\n"
 "                            no hacer vacuum\n"
 
-#: vacuumdb.c:946
+#: vacuumdb.c:953
 #, c-format
 msgid ""
 "      --analyze-in-stages         only update optimizer statistics, in multiple\n"
@@ -1139,12 +1139,12 @@
 "                            en múltiples etapas para resultados más rápidos;\n"
 "                            no hacer vacuum\n"
 
-#: vacuumdb.c:948
+#: vacuumdb.c:955
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                mostrar esta ayuda y salir\n"
 
-#: vacuumdb.c:956
+#: vacuumdb.c:963
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/scripts/po/fr.po postgresql-9.5-9.5.8/src/bin/scripts/po/fr.po
--- postgresql-9.5-9.5.2/src/bin/scripts/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/scripts/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 # translation of pgscripts.po to fr_fr
 # french message translation file for pgscripts
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 #
 # Guillaume Lelarge <guillaume@lelarge.info>, 2004-2009.
-# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
+# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2016-02-17 02:43+0000\n"
 "PO-Revision-Date: 2016-02-21 15:58+0100\n"
@@ -15,7 +15,7 @@
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
@@ -23,7 +23,7 @@
 #: ../../common/fe_memutils.c:98
 #, c-format
 msgid "out of memory\n"
-msgstr "mémoire épuisée\n"
+msgstr "mémoire épuisée\n"
 
 #: ../../common/fe_memutils.c:92
 #, c-format
@@ -33,7 +33,7 @@
 #: ../../common/username.c:45
 #, c-format
 msgid "could not look up effective user ID %ld: %s"
-msgstr "n'a pas pu trouver l'identifiant réel %ld de l'utilisateur : %s"
+msgstr "n'a pas pu trouver l'identifiant réel %ld de l'utilisateur : %s"
 
 #: ../../common/username.c:47
 msgid "user does not exist"
@@ -42,7 +42,7 @@
 #: ../../common/username.c:62
 #, c-format
 msgid "user name lookup failure: error code %lu"
-msgstr "échec lors de la recherche du nom d'utilisateur : code erreur %lu"
+msgstr "échec lors de la recherche du nom d'utilisateur : code erreur %lu"
 
 #: clusterdb.c:110 clusterdb.c:129 createdb.c:119 createdb.c:138
 #: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:168
@@ -52,45 +52,45 @@
 #: vacuumdb.c:208 vacuumdb.c:227
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayer « %s --help » pour plus d'informations.\n"
+msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
 #: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:181
 #: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:147
 #: vacuumdb.c:225
 #, 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"
+msgstr "%s : trop d'arguments en ligne de commande (le premier étant « %s »)\n"
 
 #: clusterdb.c:139
 #, c-format
 msgid "%s: cannot cluster all databases and a specific one at the same time\n"
 msgstr ""
-"%s : ne réorganise pas à la fois toutes les bases de données et une base\n"
-"spécifique via la commande CLUSTER\n"
+"%s : ne réorganise pas à la fois toutes les bases de données et une base\n"
+"spécifique via la commande CLUSTER\n"
 
 #: clusterdb.c:146
 #, c-format
 msgid "%s: cannot cluster specific table(s) in all databases\n"
-msgstr "%s : impossible de réorganiser la(les) table(s) spécifique(s) dans toutes les bases de données\n"
+msgstr "%s : impossible de réorganiser la(les) table(s) spécifique(s) dans toutes les bases de données\n"
 
 #: clusterdb.c:211
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr ""
-"%s : la réorganisation de la table « %s » de la base de données « %s » avec\n"
-"la commande CLUSTER a échoué : %s"
+"%s : la réorganisation de la table « %s » de la base de données « %s » avec\n"
+"la commande CLUSTER a échoué : %s"
 
 #: clusterdb.c:214
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
 msgstr ""
-"%s : la réorganisation de la base de données « %s » via la commande\n"
-"CLUSTER a échoué : %s"
+"%s : la réorganisation de la base de données « %s » via la commande\n"
+"CLUSTER a échoué : %s"
 
 #: clusterdb.c:245
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
-msgstr "%s : réorganisation de la base de données « %s » via la commande CLUSTER\n"
+msgstr "%s : réorganisation de la base de données « %s » via la commande CLUSTER\n"
 
 #: clusterdb.c:261
 #, c-format
@@ -98,8 +98,8 @@
 "%s clusters all previously clustered tables in a database.\n"
 "\n"
 msgstr ""
-"%s réorganise toutes les tables précédemment réorganisées au sein d'une base\n"
-"de données via la commande CLUSTER.\n"
+"%s réorganise toutes les tables précédemment réorganisées au sein d'une base\n"
+"de données via la commande CLUSTER.\n"
 "\n"
 
 #: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
@@ -128,28 +128,28 @@
 #: clusterdb.c:265
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
-msgstr "  -a, --all                 réorganise toutes les bases de données\n"
+msgstr "  -a, --all                 réorganise toutes les bases de données\n"
 
 #: clusterdb.c:266
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
-msgstr "  -d, --dbname=NOMBASE      base de données à réorganiser\n"
+msgstr "  -d, --dbname=NOMBASE      base de données à réorganiser\n"
 
 #: clusterdb.c:267 createlang.c:240 createuser.c:354 dropdb.c:158
 #: droplang.c:241 dropuser.c:159 reindexdb.c:397
 #, c-format
 msgid "  -e, --echo                show the commands being sent to the server\n"
-msgstr "  -e, --echo                     affiche les commandes envoyées au serveur\n"
+msgstr "  -e, --echo                     affiche les commandes envoyées au serveur\n"
 
 #: clusterdb.c:268 reindexdb.c:399
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
-msgstr "  -q, --quiet               n'écrit aucun message\n"
+msgstr "  -q, --quiet               n'écrit aucun message\n"
 
 #: clusterdb.c:269
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table(s) only\n"
-msgstr "  -t, --table=TABLE         réorganise uniquement cette(ces) table(s)\n"
+msgstr "  -t, --table=TABLE         réorganise uniquement cette(ces) table(s)\n"
 
 #: clusterdb.c:270 reindexdb.c:403
 #, c-format
@@ -184,14 +184,14 @@
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr ""
-"  -h, --host=HOTE                hôte du serveur de bases de données ou\n"
-"                                 répertoire des sockets\n"
+"  -h, --host=HOTE                hôte du serveur de bases de données ou\n"
+"                                 répertoire des sockets\n"
 
 #: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
 #: droplang.c:247 dropuser.c:167 reindexdb.c:408 vacuumdb.c:951
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
-msgstr "  -p, --port=PORT                port du serveur de bases de données\n"
+msgstr "  -p, --port=PORT                port du serveur de bases de données\n"
 
 #: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248 reindexdb.c:409
 #: vacuumdb.c:952
@@ -203,7 +203,7 @@
 #: droplang.c:249 dropuser.c:169 reindexdb.c:410 vacuumdb.c:953
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
-msgstr "  -w, --no-password             empêche la demande d'un mot de passe\n"
+msgstr "  -w, --no-password             empêche la demande d'un mot de passe\n"
 
 #: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
 #: droplang.c:250 dropuser.c:170 reindexdb.c:411 vacuumdb.c:954
@@ -214,7 +214,7 @@
 #: clusterdb.c:279 dropdb.c:169 reindexdb.c:412 vacuumdb.c:955
 #, c-format
 msgid "  --maintenance-db=DBNAME   alternate maintenance database\n"
-msgstr "  --maintenance-db=NOM_BASE    indique une autre base par défaut\n"
+msgstr "  --maintenance-db=NOM_BASE    indique une autre base par défaut\n"
 
 #: clusterdb.c:280
 #, c-format
@@ -223,7 +223,7 @@
 "Read the description of the SQL command CLUSTER for details.\n"
 msgstr ""
 "\n"
-"Lire la description de la commande SQL CLUSTER pour de plus amples détails.\n"
+"Lire la description de la commande SQL CLUSTER pour de plus amples détails.\n"
 
 #: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
 #: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:414
@@ -234,7 +234,7 @@
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
+"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
 #: common.c:82 common.c:128
 msgid "Password: "
@@ -243,22 +243,22 @@
 #: common.c:113
 #, c-format
 msgid "%s: could not connect to database %s: out of memory\n"
-msgstr "%s : n'a pas pu se connecter à la base de données %s : plus de mémoire\n"
+msgstr "%s : n'a pas pu se connecter à la base de données %s : plus de mémoire\n"
 
 #: common.c:141
 #, c-format
 msgid "%s: could not connect to database %s: %s"
-msgstr "%s : n'a pas pu se connecter à la base de données %s : %s"
+msgstr "%s : n'a pas pu se connecter à la base de données %s : %s"
 
 #: common.c:190 common.c:218
 #, c-format
 msgid "%s: query failed: %s"
-msgstr "%s : échec de la requête : %s"
+msgstr "%s : échec de la requête : %s"
 
 #: common.c:192 common.c:220
 #, c-format
 msgid "%s: query was: %s\n"
-msgstr "%s : la requête était : %s\n"
+msgstr "%s : la requête était : %s\n"
 
 #. translator: abbreviation for "yes"
 #: common.c:261
@@ -280,42 +280,42 @@
 #: common.c:294
 #, c-format
 msgid "Please answer \"%s\" or \"%s\".\n"
-msgstr "Merci de répondre « %s » ou « %s ».\n"
+msgstr "Merci de répondre « %s » ou « %s ».\n"
 
 #: common.c:373 common.c:410
 #, c-format
 msgid "Cancel request sent\n"
-msgstr "Requête d'annulation envoyée\n"
+msgstr "Requête d'annulation envoyée\n"
 
 #: common.c:376 common.c:414
 #, c-format
 msgid "Could not send cancel request: %s"
-msgstr "N'a pas pu envoyer la requête d'annulation : %s"
+msgstr "N'a pas pu envoyer la requête d'annulation : %s"
 
 #: createdb.c:146
 #, c-format
 msgid "%s: only one of --locale and --lc-ctype can be specified\n"
-msgstr "%s : une seule des options --locale et --lc-ctype peut être indiquée\n"
+msgstr "%s : une seule des options --locale et --lc-ctype peut être indiquée\n"
 
 #: createdb.c:152
 #, c-format
 msgid "%s: only one of --locale and --lc-collate can be specified\n"
-msgstr "%s : une seule des options --locale et --lc-collate peut être indiquée\n"
+msgstr "%s : une seule des options --locale et --lc-collate peut être indiquée\n"
 
 #: createdb.c:164
 #, c-format
 msgid "%s: \"%s\" is not a valid encoding name\n"
-msgstr "%s : « %s » n'est pas un nom d'encodage valide\n"
+msgstr "%s : « %s » n'est pas un nom d'encodage valide\n"
 
 #: createdb.c:213
 #, c-format
 msgid "%s: database creation failed: %s"
-msgstr "%s : la création de la base de données a échoué : %s"
+msgstr "%s : la création de la base de données a échoué : %s"
 
 #: createdb.c:233
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
-msgstr "%s: l'ajout du commentaire a échoué (la base de données a été créée) : %s"
+msgstr "%s: l'ajout du commentaire a échoué (la base de données a été créée) : %s"
 
 #: createdb.c:251
 #, c-format
@@ -323,7 +323,7 @@
 "%s creates a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s crée une base de données PostgreSQL.\n"
+"%s crée une base de données PostgreSQL.\n"
 "\n"
 
 #: createdb.c:253
@@ -334,46 +334,46 @@
 #: createdb.c:255
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
-msgstr "  -D, --tablespace=TABLESPACE   tablespace par défaut de la base de données\n"
+msgstr "  -D, --tablespace=TABLESPACE   tablespace par défaut de la base de données\n"
 
 #: createdb.c:256
 #, c-format
 msgid "  -e, --echo                   show the commands being sent to the server\n"
-msgstr "  -e, --echo                    affiche les commandes envoyées au serveur\n"
+msgstr "  -e, --echo                    affiche les commandes envoyées au serveur\n"
 
 #: createdb.c:257
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
-msgstr "  -E, --encoding=ENC            encodage de la base de données\n"
+msgstr "  -E, --encoding=ENC            encodage de la base de données\n"
 
 #: createdb.c:258
 #, c-format
 msgid "  -l, --locale=LOCALE          locale settings for the database\n"
 msgstr ""
-"  -l, --locale=LOCALE           paramètre de la locale pour la base de\n"
-"                                données\n"
+"  -l, --locale=LOCALE           paramètre de la locale pour la base de\n"
+"                                données\n"
 
 #: createdb.c:259
 #, c-format
 msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
-msgstr "      --lc-collate=LOCALE       paramètre LC_COLLATE pour la base de données\n"
+msgstr "      --lc-collate=LOCALE       paramètre LC_COLLATE pour la base de données\n"
 
 #: createdb.c:260
 #, c-format
 msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
-msgstr "      --lc-ctype=LOCALE         paramètre LC_CTYPE pour la base de données\n"
+msgstr "      --lc-ctype=LOCALE         paramètre LC_CTYPE pour la base de données\n"
 
 #: createdb.c:261
 #, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
 msgstr ""
-"  -O, --owner=PROPRIÉTAIRE      nom du propriétaire de la nouvelle base de\n"
-"                                données\n"
+"  -O, --owner=PROPRIÉTAIRE      nom du propriétaire de la nouvelle base de\n"
+"                                données\n"
 
 #: createdb.c:262
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
-msgstr "  -T, --template=MODÈLE         base de données modèle à copier\n"
+msgstr "  -T, --template=MODÈLE         base de données modèle à copier\n"
 
 #: createdb.c:263
 #, c-format
@@ -389,13 +389,13 @@
 #, c-format
 msgid "  -h, --host=HOSTNAME          database server host or socket directory\n"
 msgstr ""
-"  -h, --host=HOTE               hôte du serveur de bases de données\n"
-"                                ou répertoire des sockets\n"
+"  -h, --host=HOTE               hôte du serveur de bases de données\n"
+"                                ou répertoire des sockets\n"
 
 #: createdb.c:267
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
-msgstr "  -p, --port=PORT               port du serveur de bases de données\n"
+msgstr "  -p, --port=PORT               port du serveur de bases de données\n"
 
 #: createdb.c:268
 #, c-format
@@ -405,7 +405,7 @@
 #: createdb.c:269
 #, c-format
 msgid "  -w, --no-password            never prompt for password\n"
-msgstr "  -w, --no-password             empêche la demande d'un mot de passe\n"
+msgstr "  -w, --no-password             empêche la demande d'un mot de passe\n"
 
 #: createdb.c:270
 #, c-format
@@ -415,7 +415,7 @@
 #: createdb.c:271
 #, c-format
 msgid "  --maintenance-db=DBNAME      alternate maintenance database\n"
-msgstr "  --maintenance-db=NOM_BASE    indique une autre base par défaut\n"
+msgstr "  --maintenance-db=NOM_BASE    indique une autre base par défaut\n"
 
 #: createdb.c:272
 #, c-format
@@ -424,7 +424,7 @@
 "By default, a database with the same name as the current user is created.\n"
 msgstr ""
 "\n"
-"Par défaut, la base de donnée créée porte le nom de l'utilisateur courant.\n"
+"Par défaut, la base de donnée créée porte le nom de l'utilisateur courant.\n"
 
 #: createlang.c:149 droplang.c:148
 msgid "Name"
@@ -444,7 +444,7 @@
 
 #: createlang.c:160 droplang.c:159
 msgid "Procedural Languages"
-msgstr "Langages procéduraux"
+msgstr "Langages procéduraux"
 
 #: createlang.c:173 droplang.c:172
 #, c-format
@@ -454,12 +454,12 @@
 #: createlang.c:197
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
-msgstr "%s : le langage « %s » est déjà installé sur la base de données « %s »\n"
+msgstr "%s : le langage « %s » est déjà installé sur la base de données « %s »\n"
 
 #: createlang.c:219
 #, c-format
 msgid "%s: language installation failed: %s"
-msgstr "%s : l'installation du langage a échoué : %s"
+msgstr "%s : l'installation du langage a échoué : %s"
 
 #: createlang.c:235
 #, c-format
@@ -467,7 +467,7 @@
 "%s installs a procedural language into a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s installe un langage de procédures dans une base de données PostgreSQL.\n"
+"%s installe un langage de procédures dans une base de données PostgreSQL.\n"
 "\n"
 
 #: createlang.c:237 droplang.c:238
@@ -484,16 +484,16 @@
 #, c-format
 msgid "  -l, --list                show a list of currently installed languages\n"
 msgstr ""
-"  -l, --list                     affiche la liste des langages déjà\n"
-"                                 installés\n"
+"  -l, --list                     affiche la liste des langages déjà\n"
+"                                 installés\n"
 
 #: createuser.c:190
 msgid "Enter name of role to add: "
-msgstr "Saisir le nom du rôle à ajouter : "
+msgstr "Saisir le nom du rôle à ajouter : "
 
 #: createuser.c:205
 msgid "Enter password for new role: "
-msgstr "Saisir le mot de passe pour le nouveau rôle : "
+msgstr "Saisir le mot de passe pour le nouveau rôle : "
 
 #: createuser.c:206
 msgid "Enter it again: "
@@ -506,25 +506,25 @@
 
 #: createuser.c:218
 msgid "Shall the new role be a superuser?"
-msgstr "Le nouveau rôle est-il super-utilisateur ?"
+msgstr "Le nouveau rôle est-il super-utilisateur ?"
 
 #: createuser.c:233
 msgid "Shall the new role be allowed to create databases?"
-msgstr "Le nouveau rôle est-il autorisé à créer des bases de données ?"
+msgstr "Le nouveau rôle est-il autorisé à créer des bases de données ?"
 
 #: createuser.c:241
 msgid "Shall the new role be allowed to create more new roles?"
-msgstr "Le nouveau rôle est-il autorisé à créer de nouveaux rôles ?"
+msgstr "Le nouveau rôle est-il autorisé à créer de nouveaux rôles ?"
 
 #: createuser.c:275
 #, c-format
 msgid "Password encryption failed.\n"
-msgstr "Échec du chiffrement du mot de passe.\n"
+msgstr "Échec du chiffrement du mot de passe.\n"
 
 #: createuser.c:332
 #, c-format
 msgid "%s: creation of new role failed: %s"
-msgstr "%s : la création du nouvel rôle a échoué : %s"
+msgstr "%s : la création du nouvel rôle a échoué : %s"
 
 #: createuser.c:347
 #, c-format
@@ -532,7 +532,7 @@
 "%s creates a new PostgreSQL role.\n"
 "\n"
 msgstr ""
-"%s crée un nouvel rôle PostgreSQL.\n"
+"%s crée un nouvel rôle PostgreSQL.\n"
 "\n"
 
 #: createuser.c:349 dropuser.c:157
@@ -544,32 +544,32 @@
 #, c-format
 msgid "  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
 msgstr ""
-"  -c, --connection-limit=N       nombre maximal de connexions pour le rôle\n"
-"                                 (par défaut sans limite)\n"
+"  -c, --connection-limit=N       nombre maximal de connexions pour le rôle\n"
+"                                 (par défaut sans limite)\n"
 
 #: createuser.c:352
 #, c-format
 msgid "  -d, --createdb            role can create new databases\n"
 msgstr ""
-"  -d, --createdb                 l'utilisateur peut créer des bases de\n"
-"                                 données\n"
+"  -d, --createdb                 l'utilisateur peut créer des bases de\n"
+"                                 données\n"
 
 #: createuser.c:353
 #, c-format
 msgid "  -D, --no-createdb         role cannot create databases (default)\n"
 msgstr ""
-"  -D, --no-createdb              le rôle ne peut pas créer de bases de\n"
-"                                 données (par défaut)\n"
+"  -D, --no-createdb              le rôle ne peut pas créer de bases de\n"
+"                                 données (par défaut)\n"
 
 #: createuser.c:355
 #, c-format
 msgid "  -E, --encrypted           encrypt stored password\n"
-msgstr "  -E, --encrypted                chiffre le mot de passe stocké\n"
+msgstr "  -E, --encrypted                chiffre le mot de passe stocké\n"
 
 #: createuser.c:356
 #, c-format
 msgid "  -g, --role=ROLE           new role will be a member of this role\n"
-msgstr "  -g, --role=ROLE                le nouveau rôle sera un membre de ce rôle\n"
+msgstr "  -g, --role=ROLE                le nouveau rôle sera un membre de ce rôle\n"
 
 #: createuser.c:357
 #, c-format
@@ -577,53 +577,53 @@
 "  -i, --inherit             role inherits privileges of roles it is a\n"
 "                            member of (default)\n"
 msgstr ""
-"  -i, --inherit                  le rôle hérite des droits des rôles dont il\n"
-"                                 est membre (par défaut)\n"
+"  -i, --inherit                  le rôle hérite des droits des rôles dont il\n"
+"                                 est membre (par défaut)\n"
 
 #: createuser.c:359
 #, c-format
 msgid "  -I, --no-inherit          role does not inherit privileges\n"
-msgstr "  -I, --no-inherit               le rôle n'hérite pas des droits\n"
+msgstr "  -I, --no-inherit               le rôle n'hérite pas des droits\n"
 
 #: createuser.c:360
 #, c-format
 msgid "  -l, --login               role can login (default)\n"
-msgstr "  -l, --login                    le rôle peut se connecter (par défaut)\n"
+msgstr "  -l, --login                    le rôle peut se connecter (par défaut)\n"
 
 #: createuser.c:361
 #, c-format
 msgid "  -L, --no-login            role cannot login\n"
-msgstr "  -L, --no-login                 le rôle ne peut pas se connecter\n"
+msgstr "  -L, --no-login                 le rôle ne peut pas se connecter\n"
 
 #: createuser.c:362
 #, c-format
 msgid "  -N, --unencrypted         do not encrypt stored password\n"
-msgstr "  -N, --unencrypted              ne chiffre pas le mot de passe stocké\n"
+msgstr "  -N, --unencrypted              ne chiffre pas le mot de passe stocké\n"
 
 #: createuser.c:363
 #, c-format
 msgid "  -P, --pwprompt            assign a password to new role\n"
-msgstr "  -P, --pwprompt                 affecte un mot de passe au nouveau rôle\n"
+msgstr "  -P, --pwprompt                 affecte un mot de passe au nouveau rôle\n"
 
 #: createuser.c:364
 #, c-format
 msgid "  -r, --createrole          role can create new roles\n"
-msgstr "  -r, --createrole               le rôle peut créer des rôles\n"
+msgstr "  -r, --createrole               le rôle peut créer des rôles\n"
 
 #: createuser.c:365
 #, c-format
 msgid "  -R, --no-createrole       role cannot create roles (default)\n"
-msgstr "  -R, --no-createrole            le rôle ne peut pas créer de rôles (par défaut)\n"
+msgstr "  -R, --no-createrole            le rôle ne peut pas créer de rôles (par défaut)\n"
 
 #: createuser.c:366
 #, c-format
 msgid "  -s, --superuser           role will be superuser\n"
-msgstr "  -s, --superuser                le rôle est super-utilisateur\n"
+msgstr "  -s, --superuser                le rôle est super-utilisateur\n"
 
 #: createuser.c:367
 #, c-format
 msgid "  -S, --no-superuser        role will not be superuser (default)\n"
-msgstr "  -S, --no-superuser             le rôle ne sera pas super-utilisateur (par défaut)\n"
+msgstr "  -S, --no-superuser             le rôle ne sera pas super-utilisateur (par défaut)\n"
 
 #: createuser.c:369
 #, c-format
@@ -631,48 +631,48 @@
 "  --interactive             prompt for missing role name and attributes rather\n"
 "                            than using defaults\n"
 msgstr ""
-"  --interactive                  demande le nom du rôle et les attributs\n"
-"                                 plutôt qu'utiliser des valeurs par défaut\n"
+"  --interactive                  demande le nom du rôle et les attributs\n"
+"                                 plutôt qu'utiliser des valeurs par défaut\n"
 
 #: createuser.c:371
 #, c-format
 msgid "  --replication             role can initiate replication\n"
 msgstr ""
-"  --replication                le rôle peut initier une connexion de\n"
-"                               réplication\n"
+"  --replication                le rôle peut initier une connexion de\n"
+"                               réplication\n"
 
 #: createuser.c:372
 #, c-format
 msgid "  --no-replication          role cannot initiate replication\n"
 msgstr ""
-"  --no-replication             le rôle ne peut pas initier de connexion de\n"
-"                               réplication\n"
+"  --no-replication             le rôle ne peut pas initier de connexion de\n"
+"                               réplication\n"
 
 #: createuser.c:377
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
 msgstr ""
 "  -U, --username=NOMUTILISATEUR  nom de l'utilisateur pour la connexion (pas\n"
-"                                 celui à créer)\n"
+"                                 celui à créer)\n"
 
 #: dropdb.c:102
 #, c-format
 msgid "%s: missing required argument database name\n"
-msgstr "%s : argument nom de la base de données requis mais manquant\n"
+msgstr "%s : argument nom de la base de données requis mais manquant\n"
 
 #: dropdb.c:117
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
-msgstr "La base de données « %s » sera définitivement supprimée.\n"
+msgstr "La base de données « %s » sera définitivement supprimée.\n"
 
 #: dropdb.c:118 dropuser.c:123
 msgid "Are you sure?"
-msgstr "Êtes-vous sûr ?"
+msgstr "Êtes-vous sûr ?"
 
 #: dropdb.c:139
 #, c-format
 msgid "%s: database removal failed: %s"
-msgstr "%s: la suppression de la base de données a échoué : %s"
+msgstr "%s: la suppression de la base de données a échoué : %s"
 
 #: dropdb.c:154
 #, c-format
@@ -680,7 +680,7 @@
 "%s removes a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s supprime une base de données PostgreSQL.\n"
+"%s supprime une base de données PostgreSQL.\n"
 "\n"
 
 #: dropdb.c:156
@@ -705,12 +705,12 @@
 #: droplang.c:203
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
-msgstr "%s : le langage « %s » n'est pas installé dans la base de données « %s »\n"
+msgstr "%s : le langage « %s » n'est pas installé dans la base de données « %s »\n"
 
 #: droplang.c:221
 #, c-format
 msgid "%s: language removal failed: %s"
-msgstr "%s : la suppression du langage a échoué : %s"
+msgstr "%s : la suppression du langage a échoué : %s"
 
 #: droplang.c:236
 #, c-format
@@ -718,34 +718,34 @@
 "%s removes a procedural language from a database.\n"
 "\n"
 msgstr ""
-"%s supprime un langage procédural d'une base de données.\n"
+"%s supprime un langage procédural d'une base de données.\n"
 "\n"
 
 #: droplang.c:240
 #, c-format
 msgid "  -d, --dbname=DBNAME       database from which to remove the language\n"
 msgstr ""
-"  -d, --dbname=NOMBASE           base de données à partir de laquelle\n"
+"  -d, --dbname=NOMBASE           base de données à partir de laquelle\n"
 "                                 supprimer le langage\n"
 
 #: dropuser.c:111
 msgid "Enter name of role to drop: "
-msgstr "Saisir le nom du rôle à supprimer : "
+msgstr "Saisir le nom du rôle à supprimer : "
 
 #: dropuser.c:114
 #, c-format
 msgid "%s: missing required argument role name\n"
-msgstr "%s : argument nom du rôle requis mais manquant\n"
+msgstr "%s : argument nom du rôle requis mais manquant\n"
 
 #: dropuser.c:122
 #, c-format
 msgid "Role \"%s\" will be permanently removed.\n"
-msgstr "Le rôle « %s » sera définitivement supprimé.\n"
+msgstr "Le rôle « %s » sera définitivement supprimé.\n"
 
 #: dropuser.c:140
 #, c-format
 msgid "%s: removal of role \"%s\" failed: %s"
-msgstr "%s : la suppression du rôle « %s » a échoué : %s"
+msgstr "%s : la suppression du rôle « %s » a échoué : %s"
 
 #: dropuser.c:155
 #, c-format
@@ -753,7 +753,7 @@
 "%s removes a PostgreSQL role.\n"
 "\n"
 msgstr ""
-"%s supprime un rôle PostgreSQL.\n"
+"%s supprime un rôle PostgreSQL.\n"
 "\n"
 
 #: dropuser.c:160
@@ -763,8 +763,8 @@
 "                            role name if not specified\n"
 msgstr ""
 "  -i, --interactive         demande confirmation avant de supprimer quoi que\n"
-"                            ce soit, et demande le nom du rôle s'il n'est pas\n"
-"                            indiqué\n"
+"                            ce soit, et demande le nom du rôle s'il n'est pas\n"
+"                            indiqué\n"
 
 #: dropuser.c:163
 #, c-format
@@ -778,7 +778,7 @@
 msgid "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
 msgstr ""
 "  -U, --username=NOMUTILISATEUR  nom de l'utilisateur pour la connexion (pas\n"
-"                                 celui à supprimer)\n"
+"                                 celui à supprimer)\n"
 
 #: pg_isready.c:142
 #, c-format
@@ -788,7 +788,7 @@
 #: pg_isready.c:150
 #, c-format
 msgid "%s: could not fetch default options\n"
-msgstr "%s : n'a pas pu récupérer les options par défaut\n"
+msgstr "%s : n'a pas pu récupérer les options par défaut\n"
 
 #: pg_isready.c:199
 #, c-format
@@ -803,7 +803,7 @@
 #: pg_isready.c:205
 #, c-format
 msgid "no response\n"
-msgstr "pas de réponse\n"
+msgstr "pas de réponse\n"
 
 #: pg_isready.c:208
 #, c-format
@@ -821,7 +821,7 @@
 "%s issues a connection check to a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s produitun test de connexion à une base de données PostgreSQL.\n"
+"%s produitun test de connexion à une base de données PostgreSQL.\n"
 "\n"
 
 #: pg_isready.c:223
@@ -832,12 +832,12 @@
 #: pg_isready.c:226
 #, c-format
 msgid "  -d, --dbname=DBNAME      database name\n"
-msgstr "  -d, --dbname=NOMBASE     base de données\n"
+msgstr "  -d, --dbname=NOMBASE     base de données\n"
 
 #: pg_isready.c:227
 #, c-format
 msgid "  -q, --quiet              run quietly\n"
-msgstr "  -q, --quiet               s'exécute sans affichage\n"
+msgstr "  -q, --quiet               s'exécute sans affichage\n"
 
 #: pg_isready.c:228
 #, c-format
@@ -853,20 +853,20 @@
 #, 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"
+"  -h, --host=NOMHÔTE           hôte du serveur de bases de données ou\n"
+"                               répertoire des sockets\n"
 
 #: pg_isready.c:233
 #, c-format
 msgid "  -p, --port=PORT          database server port\n"
-msgstr "  -p, --port=PORT                port du serveur de bases de données\n"
+msgstr "  -p, --port=PORT                port du serveur de bases de données\n"
 
 #: pg_isready.c:234
 #, c-format
 msgid "  -t, --timeout=SECS       seconds to wait when attempting connection, 0 disables (default: %s)\n"
 msgstr ""
-"  -t, --timeout=SECS       durée en secondes à attendre lors d'une tentative de connexion\n"
-"                           0 pour désactiver (défaut: %s)\n"
+"  -t, --timeout=SECS       durée en secondes à attendre lors d'une tentative de connexion\n"
+"                           0 pour désactiver (défaut: %s)\n"
 
 #: pg_isready.c:235
 #, c-format
@@ -877,89 +877,89 @@
 #, c-format
 msgid "%s: cannot reindex all databases and a specific one at the same time\n"
 msgstr ""
-"%s : ne peut pas réindexer toutes les bases de données et une base\n"
-"spécifique en même temps\n"
+"%s : ne peut pas réindexer toutes les bases de données et une base\n"
+"spécifique en même temps\n"
 
 #: reindexdb.c:164
 #, c-format
 msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
 msgstr ""
-"%s : ne peut pas réindexer toutes les bases de données et les catalogues\n"
-"système en même temps\n"
+"%s : ne peut pas réindexer toutes les bases de données et les catalogues\n"
+"système en même temps\n"
 
 #: reindexdb.c:169
 #, c-format
 msgid "%s: cannot reindex specific schema(s) in all databases\n"
 msgstr ""
-"%s : ne peut pas réindexer un (des) schéma(s) spécifique(s) dans toutes\n"
-"les bases de données\n"
+"%s : ne peut pas réindexer un (des) schéma(s) spécifique(s) dans toutes\n"
+"les bases de données\n"
 
 #: reindexdb.c:174
 #, c-format
 msgid "%s: cannot reindex specific table(s) in all databases\n"
 msgstr ""
-"%s : ne peut pas réindexer une (des) table(s) spécifique(s) dans toutes\n"
-"les bases de données\n"
+"%s : ne peut pas réindexer une (des) table(s) spécifique(s) dans toutes\n"
+"les bases de données\n"
 
 #: reindexdb.c:179
 #, c-format
 msgid "%s: cannot reindex specific index(es) in all databases\n"
 msgstr ""
-"%s : ne peut pas réindexer un (des) index spécifique(s) dans toutes les\n"
-"bases de données\n"
+"%s : ne peut pas réindexer un (des) index spécifique(s) dans toutes les\n"
+"bases de données\n"
 
 #: reindexdb.c:190
 #, c-format
 msgid "%s: cannot reindex specific schema(s) and system catalogs at the same time\n"
-msgstr "%s : ne peut pas réindexer une (des) schéma(s) spécifique(s) et les catalogues système en même temps\n"
+msgstr "%s : ne peut pas réindexer une (des) schéma(s) spécifique(s) et les catalogues système en même temps\n"
 
 #: reindexdb.c:195
 #, c-format
 msgid "%s: cannot reindex specific table(s) and system catalogs at the same time\n"
-msgstr "%s : ne peut pas réindexer une (des) table(s) spécifique(s) etles catalogues système en même temps\n"
+msgstr "%s : ne peut pas réindexer une (des) table(s) spécifique(s) etles catalogues système en même temps\n"
 
 #: reindexdb.c:200
 #, c-format
 msgid "%s: cannot reindex specific index(es) and system catalogs at the same time\n"
 msgstr ""
-"%s : ne peut pas réindexer un (des) index spécifique(s) et\n"
-"les catalogues système en même temps\n"
+"%s : ne peut pas réindexer un (des) index spécifique(s) et\n"
+"les catalogues système en même temps\n"
 
 #: reindexdb.c:306
 #, c-format
 msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
 msgstr ""
-"%s : la réindexation de la table « %s » dans la base de données « %s » a\n"
-"échoué : %s"
+"%s : la réindexation de la table « %s » dans la base de données « %s » a\n"
+"échoué : %s"
 
 #: reindexdb.c:309
 #, c-format
 msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
 msgstr ""
-"%s : la réindexation de l'index « %s » dans la base de données « %s » a\n"
-"échoué : %s"
+"%s : la réindexation de l'index « %s » dans la base de données « %s » a\n"
+"échoué : %s"
 
 #: reindexdb.c:312
 #, c-format
 msgid "%s: reindexing of schema \"%s\" in database \"%s\" failed: %s"
 msgstr ""
-"%s : la réindexation du schéma « %s » dans la base de données « %s » a\n"
-"échoué : %s"
+"%s : la réindexation du schéma « %s » dans la base de données « %s » a\n"
+"échoué : %s"
 
 #: reindexdb.c:315
 #, c-format
 msgid "%s: reindexing of database \"%s\" failed: %s"
-msgstr "%s : la réindexation de la base de données « %s » a échoué : %s"
+msgstr "%s : la réindexation de la base de données « %s » a échoué : %s"
 
 #: reindexdb.c:346
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
-msgstr "%s : réindexation de la base de données « %s »\n"
+msgstr "%s : réindexation de la base de données « %s »\n"
 
 #: reindexdb.c:379
 #, c-format
 msgid "%s: reindexing of system catalogs failed: %s"
-msgstr "%s : la réindexation des catalogues système a échoué : %s"
+msgstr "%s : la réindexation des catalogues système a échoué : %s"
 
 #: reindexdb.c:391
 #, c-format
@@ -967,38 +967,38 @@
 "%s reindexes a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s réindexe une base de données PostgreSQL.\n"
+"%s réindexe une base de données PostgreSQL.\n"
 "\n"
 
 #: reindexdb.c:395
 #, c-format
 msgid "  -a, --all                 reindex all databases\n"
-msgstr "  -a, --all                réindexe toutes les bases de données\n"
+msgstr "  -a, --all                réindexe toutes les bases de données\n"
 
 #: reindexdb.c:396
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to reindex\n"
-msgstr "  -d, --dbname=NOMBASE     base de données à réindexer\n"
+msgstr "  -d, --dbname=NOMBASE     base de données à réindexer\n"
 
 #: reindexdb.c:398
 #, c-format
 msgid "  -i, --index=INDEX         recreate specific index(es) only\n"
-msgstr "  -i, --index=INDEX        recrée uniquement cet (ces) index\n"
+msgstr "  -i, --index=INDEX        recrée uniquement cet (ces) index\n"
 
 #: reindexdb.c:400
 #, c-format
 msgid "  -s, --system              reindex system catalogs\n"
-msgstr "  -s, --system             réindexe les catalogues système\n"
+msgstr "  -s, --system             réindexe les catalogues système\n"
 
 #: reindexdb.c:401
 #, c-format
 msgid "  -S, --schema=SCHEMA       reindex specific schema(s) only\n"
-msgstr "  -S, --schema=SCHEMA       réindexe seulement le(s) schéma(s) indiqué(s)\n"
+msgstr "  -S, --schema=SCHEMA       réindexe seulement le(s) schéma(s) indiqué(s)\n"
 
 #: reindexdb.c:402
 #, c-format
 msgid "  -t, --table=TABLE         reindex specific table(s) only\n"
-msgstr "  -t, --table=TABLE        réindexe uniquement cette (ces) table(s)\n"
+msgstr "  -t, --table=TABLE        réindexe uniquement cette (ces) table(s)\n"
 
 #: reindexdb.c:413
 #, c-format
@@ -1012,65 +1012,65 @@
 #: vacuumdb.c:190
 #, c-format
 msgid "%s: number of parallel jobs must be at least 1\n"
-msgstr "%s : le nombre maximum de jobs en parallèle doit être au moins de 1\n"
+msgstr "%s : le nombre maximum de jobs en parallèle doit être au moins de 1\n"
 
 #: vacuumdb.c:196
 #, c-format
 msgid "%s: too many parallel jobs requested (maximum: %d)\n"
-msgstr "%s : trop de jobs en parallèle demandés (maximum %d)\n"
+msgstr "%s : trop de jobs en parallèle demandés (maximum %d)\n"
 
 #: vacuumdb.c:235 vacuumdb.c:241
 #, c-format
 msgid "%s: cannot use the \"%s\" option when performing only analyze\n"
-msgstr "%s : ne peut utiliser l'option « %s » lors de l'exécution d'un ANALYZE seul\n"
+msgstr "%s : ne peut utiliser l'option « %s » lors de l'exécution d'un ANALYZE seul\n"
 
 #: vacuumdb.c:258
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr ""
-"%s : ne peut pas exécuter VACUUM sur toutes les bases de données et sur une\n"
-"base spécifique en même temps\n"
+"%s : ne peut pas exécuter VACUUM sur toutes les bases de données et sur une\n"
+"base spécifique en même temps\n"
 
 #: vacuumdb.c:264
 #, c-format
 msgid "%s: cannot vacuum specific table(s) in all databases\n"
 msgstr ""
-"%s : ne peut pas exécuter VACUUM sur une(des)  table(s) spécifique(s)\n"
-"dans toutes les bases de données\n"
+"%s : ne peut pas exécuter VACUUM sur une(des)  table(s) spécifique(s)\n"
+"dans toutes les bases de données\n"
 
 #: vacuumdb.c:350
 msgid "Generating minimal optimizer statistics (1 target)"
-msgstr "Génération de statistiques minimales pour l'optimiseur (une cible)"
+msgstr "Génération de statistiques minimales pour l'optimiseur (une cible)"
 
 #: vacuumdb.c:351
 msgid "Generating medium optimizer statistics (10 targets)"
-msgstr "Génération de statistiques moyennes pour l'optimiseur (dix cibles)"
+msgstr "Génération de statistiques moyennes pour l'optimiseur (dix cibles)"
 
 #: vacuumdb.c:352
 msgid "Generating default (full) optimizer statistics"
-msgstr "Génération de statistiques complètes pour l'optimiseur"
+msgstr "Génération de statistiques complètes pour l'optimiseur"
 
 #: vacuumdb.c:361
 #, c-format
 msgid "%s: processing database \"%s\": %s\n"
-msgstr "%s : traitement de la base de données « %s » %s\n"
+msgstr "%s : traitement de la base de données « %s » %s\n"
 
 #: vacuumdb.c:364
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
-msgstr "%s : exécution de VACUUM sur la base de données « %s »\n"
+msgstr "%s : exécution de VACUUM sur la base de données « %s »\n"
 
 #: vacuumdb.c:694
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr ""
-"%s : l'exécution de VACUUM sur la table « %s » dans la base de données\n"
-"« %s » a échoué : %s"
+"%s : l'exécution de VACUUM sur la table « %s » dans la base de données\n"
+"« %s » a échoué : %s"
 
 #: vacuumdb.c:697 vacuumdb.c:814
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
-msgstr "%s : l'exécution de VACUUM sur la base de données « %s » a échoué : %s"
+msgstr "%s : l'exécution de VACUUM sur la base de données « %s » a échoué : %s"
 
 #: vacuumdb.c:930
 #, c-format
@@ -1078,36 +1078,36 @@
 "%s cleans and analyzes a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s nettoie et analyse une base de données PostgreSQL.\n"
+"%s nettoie et analyse une base de données PostgreSQL.\n"
 "\n"
 
 #: vacuumdb.c:934
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr ""
-"  -a, --all                       exécute VACUUM sur toutes les bases de\n"
-"                                  données\n"
+"  -a, --all                       exécute VACUUM sur toutes les bases de\n"
+"                                  données\n"
 
 #: vacuumdb.c:935
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
-msgstr "  -d, --dbname=NOMBASE            exécute VACUUM sur cette base de données\n"
+msgstr "  -d, --dbname=NOMBASE            exécute VACUUM sur cette base de données\n"
 
 #: vacuumdb.c:936
 #, c-format
 msgid "  -e, --echo                      show the commands being sent to the server\n"
-msgstr "  -e, --echo                      affiche les commandes envoyées au serveur\n"
+msgstr "  -e, --echo                      affiche les commandes envoyées au serveur\n"
 
 #: vacuumdb.c:937
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
-msgstr "  -f, --full                      exécute VACUUM en mode FULL\n"
+msgstr "  -f, --full                      exécute VACUUM en mode FULL\n"
 
 #: vacuumdb.c:938
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
 msgstr ""
-"  -F, --freeze                  gèle les informations de transactions des\n"
+"  -F, --freeze                  gèle les informations de transactions des\n"
 "                                lignes\n"
 
 #: vacuumdb.c:939
@@ -1120,12 +1120,12 @@
 #: vacuumdb.c:940
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
-msgstr "  -q, --quiet                     n'écrit aucun message\n"
+msgstr "  -q, --quiet                     n'écrit aucun message\n"
 
 #: vacuumdb.c:941
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table(s) only\n"
-msgstr "  -t, --table='TABLE[(COLONNES)]' exécute VACUUM sur cette (ces) tables\n"
+msgstr "  -t, --table='TABLE[(COLONNES)]' exécute VACUUM sur cette (ces) tables\n"
 
 #: vacuumdb.c:942
 #, c-format
@@ -1140,13 +1140,13 @@
 #: vacuumdb.c:944
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
-msgstr "  -z, --analyze                 met à jour les statistiques de l'optimiseur\n"
+msgstr "  -z, --analyze                 met à jour les statistiques de l'optimiseur\n"
 
 #: vacuumdb.c:945
 #, c-format
 msgid "  -Z, --analyze-only              only update optimizer statistics; no vacuum\n"
 msgstr ""
-"  -Z, --analyze-only            met seulement à jour les statistiques de\n"
+"  -Z, --analyze-only            met seulement à jour les statistiques de\n"
 "                                l'optimiseur ; pas de VACUUM\n"
 
 #: vacuumdb.c:946
@@ -1155,9 +1155,9 @@
 "      --analyze-in-stages         only update optimizer statistics, in multiple\n"
 "                                  stages for faster results; no vacuum\n"
 msgstr ""
-"  --analyze-in-stages            met seulement à jour les statistiques de\n"
-"                                 l'optimiseur, en plusieurs étapes pour de\n"
-"                                 meilleurs résultats ; pas de VACUUM\n"
+"  --analyze-in-stages            met seulement à jour les statistiques de\n"
+"                                 l'optimiseur, en plusieurs étapes pour de\n"
+"                                 meilleurs résultats ; pas de VACUUM\n"
 
 #: vacuumdb.c:948
 #, c-format
@@ -1177,7 +1177,7 @@
 #~ msgstr "%s : n'a pas pu obtenir les informations concernant l'utilisateur actuel : %s\n"
 
 #~ msgid "%s: could not get current user name: %s\n"
-#~ msgstr "%s : n'a pas pu récupérer le nom de l'utilisateur actuel : %s\n"
+#~ msgstr "%s : n'a pas pu récupérer le nom de l'utilisateur actuel : %s\n"
 
 #~ msgid "  --version                       output version information, then exit\n"
 #~ msgstr "  --version                       affiche la version et quitte\n"
@@ -1187,8 +1187,8 @@
 
 #~ msgid "%s: still %s functions declared in language \"%s\"; language not removed\n"
 #~ msgstr ""
-#~ "%s : il existe encore %s fonctions déclarées dans le langage « %s » ;\n"
-#~ "langage non supprimé\n"
+#~ "%s : il existe encore %s fonctions déclarées dans le langage « %s » ;\n"
+#~ "langage non supprimé\n"
 
 #~ msgid ""
 #~ "\n"
@@ -1196,8 +1196,8 @@
 #~ "be prompted interactively.\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Si une des options -d, -D, -r, -R, -s, -S et NOMROLE n'est pas précisée,\n"
-#~ "elle sera demandée interactivement.\n"
+#~ "Si une des options -d, -D, -r, -R, -s, -S et NOMROLE n'est pas précisée,\n"
+#~ "elle sera demandée interactivement.\n"
 
 #~ msgid "  --version                 output version information, then exit\n"
 #~ msgstr "  --version                      affiche la version et quitte\n"
@@ -1215,9 +1215,9 @@
 #~ msgstr "pg_strdup : ne peut pas dupliquer un pointeur nul (erreur interne)\n"
 
 #~ msgid "%s: out of memory\n"
-#~ msgstr "%s : mémoire épuisée\n"
+#~ msgstr "%s : mémoire épuisée\n"
 
 #~ msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
 #~ msgstr ""
-#~ "%s : ne peut utiliser l'option « freeze » lors de l'exécution d'un ANALYZE\n"
+#~ "%s : ne peut utiliser l'option « freeze » lors de l'exécution d'un ANALYZE\n"
 #~ "seul\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/scripts/po/it.po postgresql-9.5-9.5.8/src/bin/scripts/po/it.po
--- postgresql-9.5-9.5.2/src/bin/scripts/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/scripts/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -27,8 +27,8 @@
 msgstr ""
 "Project-Id-Version: pgscripts (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-06 14:43+0000\n"
-"PO-Revision-Date: 2015-07-07 03:07+0100\n"
+"POT-Creation-Date: 2016-04-12 00:43+0000\n"
+"PO-Revision-Date: 2016-04-17 20:55+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -36,6 +36,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
@@ -116,19 +117,19 @@
 
 #: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
 #: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:392
-#: vacuumdb.c:930
+#: vacuumdb.c:931
 #, c-format
 msgid "Usage:\n"
 msgstr "Utilizzo:\n"
 
-#: clusterdb.c:263 reindexdb.c:393 vacuumdb.c:931
+#: clusterdb.c:263 reindexdb.c:393 vacuumdb.c:932
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPZIONE]... [NOMEDB]\n"
 
 #: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
 #: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:394
-#: vacuumdb.c:932
+#: vacuumdb.c:933
 #, c-format
 msgid ""
 "\n"
@@ -182,7 +183,7 @@
 
 #: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
 #: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:406
-#: vacuumdb.c:948
+#: vacuumdb.c:949
 #, c-format
 msgid ""
 "\n"
@@ -192,36 +193,36 @@
 "Opzioni di connessione:\n"
 
 #: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
-#: droplang.c:246 dropuser.c:166 reindexdb.c:407 vacuumdb.c:949
+#: droplang.c:246 dropuser.c:166 reindexdb.c:407 vacuumdb.c:950
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME       host del server database o directory socket\n"
 
 #: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
-#: droplang.c:247 dropuser.c:167 reindexdb.c:408 vacuumdb.c:950
+#: droplang.c:247 dropuser.c:167 reindexdb.c:408 vacuumdb.c:951
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORTA          porta del server database\n"
 
 #: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:409 vacuumdb.c:951
+#: reindexdb.c:409 vacuumdb.c:952
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=UTENTE     nome utente da utilizzare per la connessione\n"
 
 #: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
-#: droplang.c:249 dropuser.c:169 reindexdb.c:410 vacuumdb.c:952
+#: droplang.c:249 dropuser.c:169 reindexdb.c:410 vacuumdb.c:953
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
 msgstr "  -w, --no-password         non richiedere mai una password\n"
 
 #: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
-#: droplang.c:250 dropuser.c:170 reindexdb.c:411 vacuumdb.c:953
+#: droplang.c:250 dropuser.c:170 reindexdb.c:411 vacuumdb.c:954
 #, c-format
 msgid "  -W, --password            force password prompt\n"
 msgstr "  -W, --password            forza la richiesta di una password\n"
 
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:412 vacuumdb.c:954
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:412 vacuumdb.c:955
 #, c-format
 msgid "  --maintenance-db=DBNAME   alternate maintenance database\n"
 msgstr "  --maintenance-db=NOMEDB   database di manutenzione alternativo\n"
@@ -237,7 +238,7 @@
 
 #: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
 #: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:414
-#: vacuumdb.c:956
+#: vacuumdb.c:957
 #, c-format
 msgid ""
 "\n"
@@ -246,58 +247,58 @@
 "\n"
 "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: common.c:68 common.c:114
+#: common.c:82 common.c:128
 msgid "Password: "
 msgstr "Password: "
 
-#: common.c:103
+#: common.c:113
 #, c-format
-msgid "%s: could not connect to database %s\n"
-msgstr "%s: connessione al database %s fallita\n"
+msgid "%s: could not connect to database %s: out of memory\n"
+msgstr "%s: connessione al database %s fallita: memoria esaurita\n"
 
-#: common.c:130
+#: common.c:141
 #, c-format
 msgid "%s: could not connect to database %s: %s"
 msgstr "%s: connessione al database %s fallita: %s"
 
-#: common.c:179 common.c:207
+#: common.c:190 common.c:218
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: query fallita: %s"
 
-#: common.c:181 common.c:209
+#: common.c:192 common.c:220
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: la query era: %s\n"
 
 #. translator: abbreviation for "yes"
-#: common.c:250
+#: common.c:261
 msgid "y"
 msgstr "s"
 
 #. translator: abbreviation for "no"
-#: common.c:252
+#: common.c:263
 msgid "n"
 msgstr "n"
 
 #. translator: This is a question followed by the translated options for
 #. "yes" and "no".
-#: common.c:262
+#: common.c:273
 #, c-format
 msgid "%s (%s/%s) "
 msgstr "%s (%s/%s) "
 
-#: common.c:283
+#: common.c:294
 #, c-format
 msgid "Please answer \"%s\" or \"%s\".\n"
 msgstr "Prego rispondere \"%s\" o \"%s\".\n"
 
-#: common.c:362 common.c:399
+#: common.c:373 common.c:410
 #, c-format
 msgid "Cancel request sent\n"
 msgstr "Richiesta di annullamento inviata\n"
 
-#: common.c:365 common.c:403
+#: common.c:376 common.c:414
 #, c-format
 msgid "Could not send cancel request: %s"
 msgstr "Invio della richiesta di annullamento fallita: %s"
@@ -954,8 +955,8 @@
 
 #: reindexdb.c:401
 #, c-format
-msgid "  -S, --schema=SCHEMA       recreate specific schema(s) only\n"
-msgstr "  -S, --schema=SCHEMA       ricrea solo gli schemi specificati\n"
+msgid "  -S, --schema=SCHEMA       reindex specific schema(s) only\n"
+msgstr "  -S, --schema=SCHEMA       reindicizza solo gli schemi specificati\n"
 
 #: reindexdb.c:402
 #, c-format
@@ -973,8 +974,8 @@
 
 #: vacuumdb.c:190
 #, c-format
-msgid "%s: number of parallel \"jobs\" must be at least 1\n"
-msgstr "%s: il mumero dei \"lavori\" in parallelo dev'essere almeno 1\n"
+msgid "%s: number of parallel jobs must be at least 1\n"
+msgstr "%s: il numero dei lavori paralleli dev'essere almeno 1\n"
 
 #: vacuumdb.c:196
 #, c-format
@@ -1018,17 +1019,17 @@
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: pulizia del database \"%s\"\n"
 
-#: vacuumdb.c:693
+#: vacuumdb.c:694
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%s: la pulizia della tabella \"%s\" nel database \"%s\" è fallita: %s"
 
-#: vacuumdb.c:696 vacuumdb.c:813
+#: vacuumdb.c:697 vacuumdb.c:814
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr "%s: la pulizia del database \"%s\" è fallita: %s"
 
-#: vacuumdb.c:929
+#: vacuumdb.c:930
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -1037,87 +1038,85 @@
 "%s pulisce ed analizza un database PostgreSQL.\n"
 "\n"
 
-#: vacuumdb.c:933
+#: vacuumdb.c:934
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       pulisci tutti i database\n"
 
-#: vacuumdb.c:934
+#: vacuumdb.c:935
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=NOMEDB             database da pulire\n"
 
-#: vacuumdb.c:935
+#: vacuumdb.c:936
 #, c-format
 msgid "  -e, --echo                      show the commands being sent to the server\n"
 msgstr "  -e, --echo                      mostra i comandi inviati al server\n"
 
-#: vacuumdb.c:936
+#: vacuumdb.c:937
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      esegui una pulizia completa\n"
 
-#: vacuumdb.c:937
+#: vacuumdb.c:938
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
 msgstr ""
 "  -F, --freeze                    congela le informazioni per la transazione\n"
 "                                  sulla riga\n"
 
-#: vacuumdb.c:938
+#: vacuumdb.c:939
+#, c-format
+msgid "  -j, --jobs=NUM                  use this many concurrent connections to vacuum\n"
+msgstr ""
+"  -j, --jobs=NUM                  usa questo numero di connessioni concorrenti\n"
+"                                  per effetturare il vacuum\n"
+
+#: vacuumdb.c:940
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     non stampare alcun messaggio\n"
 
-#: vacuumdb.c:939
+#: vacuumdb.c:941
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table(s) only\n"
 msgstr "  -t, --table='TABELLA[(COLONNE)]' ripulisci solo le tabelle specificate\n"
 
-#: vacuumdb.c:940
+#: vacuumdb.c:942
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   mostra molti messaggi\n"
 
-#: vacuumdb.c:941
+#: vacuumdb.c:943
 #, c-format
 msgid "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   mostra informazioni sulla versione ed esci\n"
 
-#: vacuumdb.c:942
+#: vacuumdb.c:944
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
 msgstr "  -z, --analyze                   aggiorna le statistiche per l'ottimizzatore\n"
 
-#: vacuumdb.c:943
-#, c-format
-msgid "  -Z, --analyze-only              only update optimizer statistics;  no vacuum\n"
-msgstr ""
-"  -Z, --analyze-only              aggiorna solo le statistiche per l'ottimizzatore;\n"
-"                                  nessun vacuum\n"
-
-#: vacuumdb.c:944
+#: vacuumdb.c:945
 #, c-format
-msgid "  -j, --jobs=NUM                  use this many concurrent connections to vacuum\n"
-msgstr ""
-"  -j, --jobs=NUM                  usa questo numero di connessioni concorrenti\n"
-"                                  per effetturare il vacuum\n"
+msgid "  -Z, --analyze-only              only update optimizer statistics; no vacuum\n"
+msgstr "  -Z, --analyze-only              aggiorna solo le statistiche; niente vacuum\n"
 
-#: vacuumdb.c:945
+#: vacuumdb.c:946
 #, c-format
 msgid ""
 "      --analyze-in-stages         only update optimizer statistics, in multiple\n"
-"                                  stages for faster results;  no vacuum\n"
+"                                  stages for faster results; no vacuum\n"
 msgstr ""
-"      --analyze-in-stages         aggiorna solo le statistiche dell'ottimizzatore,\n"
-"                                  in fasi multiple per maggiore velocità, nessun vacuum\n"
+"      --analyze-in-stages         aggiorna solo le statistiche, in fasi multiple\n"
+"                                  per maggiore velocità, niente vacuum\n"
 
-#: vacuumdb.c:947
+#: vacuumdb.c:948
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      mostra questo aiuto ed esci\n"
 
-#: vacuumdb.c:955
+#: vacuumdb.c:956
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/scripts/po/ru.po postgresql-9.5-9.5.8/src/bin/scripts/po/ru.po
--- postgresql-9.5-9.5.2/src/bin/scripts/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/scripts/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,41 +1,24 @@
-# PGSCRIPTS Translated Messages into the Russian Language (UTF-8)
+# Russian message translation file for pgscripts
+# Copyright (C) 2003-2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Serguei A. Mokhov, <mokhov@cs.concordia.ca>, 2003-2004.
+# Oleg Bartunov <oleg@sai.msu.su>, 2004.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# Copyright (c) 2003-2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
-# Copyright (c) 2012-2013 Alexander Lakhin, exclusion@gmail.com
-# Distributed under the same licensing terms as PostgreSQL itself.
-#
-# pgtranslation Id: pgscripts.po,v 1.2 2009/10/14 21:08:40 petere Exp $
-#
-# To the new translator:
-#   PG Russian Translation Discussion Group: <http://groups.yahoo.com/group/pgsql-rus/>
-#   PG Glossary: <http://www.sai.msu.su/~megera/oddmuse/index.cgi?Pgsql_Glossary>
-#
-# ChangeLog:
-#   - August 24, 2014: Updates for 9.4. Alexander Lakhin <exclusion@gmail.com>.
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 3, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 20, 2012: Complete translation for 9.1. Alexander Lakhin <exclusion@gmail.com>.
-#   - December, 2004: Corrections and improvements by Oleg Bartunov <oleg@sai.msu.su>.
-#   - May 28 - November 14, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>.
-#   - July 24 - August 25, 2003: Complete Initial Translation for 7.4.*; Serguei A. Mokhov, <mokhov@cs.concordia.ca>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: pgscripts (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-12-08 22:43+0000\n"
-"PO-Revision-Date: 2015-12-09 13:40+0300\n"
+"POT-Creation-Date: 2017-01-30 17:21+0000\n"
+"PO-Revision-Date: 2016-11-24 14:26+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 2.0\n"
 
 #: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
 #: ../../common/fe_memutils.c:98
@@ -67,14 +50,14 @@
 #: createuser.c:183 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
 #: droplang.c:118 droplang.c:174 dropuser.c:89 dropuser.c:104 dropuser.c:115
 #: pg_isready.c:93 pg_isready.c:107 reindexdb.c:130 reindexdb.c:149
-#: vacuumdb.c:209 vacuumdb.c:228
+#: vacuumdb.c:210 vacuumdb.c:229
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Дл� дополнительной информации попробуйте \"%s --help\".\n"
 
 #: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:181
 #: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:147
-#: vacuumdb.c:226
+#: vacuumdb.c:227
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: �лишком много аргументов командной �троки (первый: \"%s\")\n"
@@ -87,7 +70,7 @@
 #: clusterdb.c:146
 #, c-format
 msgid "%s: cannot cluster specific table(s) in all databases\n"
-msgstr "%s: нельз�  кла�теризовать указанную таблицу(ы) во в�ех базах\n"
+msgstr "%s: нельз� кла�теризовать указанную таблицу(ы) во в�ех базах\n"
 
 #: clusterdb.c:211
 #, c-format
@@ -99,12 +82,12 @@
 msgid "%s: clustering of database \"%s\" failed: %s"
 msgstr "%s: кла�теризовать базу \"%s\" не удало�ь: %s"
 
-#: clusterdb.c:245
+#: clusterdb.c:247
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: кла�теризаци� базы \"%s\"\n"
 
-#: clusterdb.c:261
+#: clusterdb.c:268
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -113,21 +96,21 @@
 "%s упор�дочивает данные в�ех кла�теризованных таблиц в базе данных.\n"
 "\n"
 
-#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
-#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:392
-#: vacuumdb.c:975
+#: clusterdb.c:269 createdb.c:252 createlang.c:236 createuser.c:348
+#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:400
+#: vacuumdb.c:938
 #, c-format
 msgid "Usage:\n"
 msgstr "И�пользование:\n"
 
-#: clusterdb.c:263 reindexdb.c:393 vacuumdb.c:976
+#: clusterdb.c:270 reindexdb.c:401 vacuumdb.c:939
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [П�Р�МЕТР]... [ИМЯ_БД]\n"
 
-#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
-#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:394
-#: vacuumdb.c:977
+#: clusterdb.c:271 createdb.c:254 createlang.c:238 createuser.c:350
+#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:402
+#: vacuumdb.c:940
 #, c-format
 msgid ""
 "\n"
@@ -136,54 +119,54 @@
 "\n"
 "Параметры:\n"
 
-#: clusterdb.c:265
+#: clusterdb.c:272
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 кла�теризовать в�е базы\n"
 
-#: clusterdb.c:266
+#: clusterdb.c:273
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=ИМЯ_БД       им� базы данных дл� кла�теризации\n"
 
-#: clusterdb.c:267 createlang.c:240 createuser.c:354 dropdb.c:158
-#: droplang.c:241 dropuser.c:159 reindexdb.c:397
+#: clusterdb.c:274 createlang.c:240 createuser.c:354 dropdb.c:158
+#: droplang.c:241 dropuser.c:159 reindexdb.c:405
 #, c-format
 msgid ""
 "  -e, --echo                show the commands being sent to the server\n"
 msgstr "  -e, --echo                отображать команды, отправл�емые �ерверу\n"
 
-#: clusterdb.c:268 reindexdb.c:399
+#: clusterdb.c:275 reindexdb.c:407
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet               не выводить никакие �ообщени�\n"
 
-#: clusterdb.c:269
+#: clusterdb.c:276
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table(s) only\n"
 msgstr ""
 "  -t, --table=Т�БЛИЦ�       кла�теризовать только указанную таблицу(ы)\n"
 
-#: clusterdb.c:270 reindexdb.c:403
+#: clusterdb.c:277 reindexdb.c:411
 #, c-format
 msgid "  -v, --verbose             write a lot of output\n"
 msgstr "  -v, --verbose             выводить и�черпывающие �ообщени�\n"
 
-#: clusterdb.c:271 createlang.c:242 createuser.c:368 dropdb.c:160
-#: droplang.c:243 dropuser.c:162 reindexdb.c:404
+#: clusterdb.c:278 createlang.c:242 createuser.c:368 dropdb.c:160
+#: droplang.c:243 dropuser.c:162 reindexdb.c:412
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             показать вер�ию и выйти\n"
 
-#: clusterdb.c:272 createlang.c:243 createuser.c:373 dropdb.c:162
-#: droplang.c:244 dropuser.c:164 reindexdb.c:405
+#: clusterdb.c:279 createlang.c:243 createuser.c:373 dropdb.c:162
+#: droplang.c:244 dropuser.c:164 reindexdb.c:413
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                показать �ту �правку и выйти\n"
 
-#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
-#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:406
-#: vacuumdb.c:993
+#: clusterdb.c:280 createdb.c:265 createlang.c:244 createuser.c:374
+#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:414
+#: vacuumdb.c:956
 #, c-format
 msgid ""
 "\n"
@@ -192,44 +175,44 @@
 "\n"
 "Параметры подключени�:\n"
 
-#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
-#: droplang.c:246 dropuser.c:166 reindexdb.c:407 vacuumdb.c:994
+#: clusterdb.c:281 createlang.c:245 createuser.c:375 dropdb.c:164
+#: droplang.c:246 dropuser.c:166 reindexdb.c:415 vacuumdb.c:957
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr ""
 "  -h, --host=ИМЯ            им� �ервера баз данных или каталог �окетов\n"
 
-#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
-#: droplang.c:247 dropuser.c:167 reindexdb.c:408 vacuumdb.c:995
+#: clusterdb.c:282 createlang.c:246 createuser.c:376 dropdb.c:165
+#: droplang.c:247 dropuser.c:167 reindexdb.c:416 vacuumdb.c:958
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=ПОРТ           порт �ервера баз данных\n"
 
-#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:409 vacuumdb.c:996
+#: clusterdb.c:283 createlang.c:247 dropdb.c:166 droplang.c:248 reindexdb.c:417
+#: vacuumdb.c:959
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr ""
 "  -U, --username=ИМЯ        им� пользовател� дл� подключени� к �ерверу\n"
 
-#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
-#: droplang.c:249 dropuser.c:169 reindexdb.c:410 vacuumdb.c:997
+#: clusterdb.c:284 createlang.c:248 createuser.c:378 dropdb.c:167
+#: droplang.c:249 dropuser.c:169 reindexdb.c:418 vacuumdb.c:960
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
 msgstr "  -w, --no-password         не запрашивать пароль\n"
 
-#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
-#: droplang.c:250 dropuser.c:170 reindexdb.c:411 vacuumdb.c:998
+#: clusterdb.c:285 createlang.c:249 createuser.c:379 dropdb.c:168
+#: droplang.c:250 dropuser.c:170 reindexdb.c:419 vacuumdb.c:961
 #, c-format
 msgid "  -W, --password            force password prompt\n"
 msgstr "  -W, --password            запро�ить пароль\n"
 
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:412 vacuumdb.c:999
+#: clusterdb.c:286 dropdb.c:169 reindexdb.c:420 vacuumdb.c:962
 #, c-format
 msgid "  --maintenance-db=DBNAME   alternate maintenance database\n"
 msgstr "  --maintenance-db=ИМЯ_БД   выбор другой об�луживаемой базы данных\n"
 
-#: clusterdb.c:280
+#: clusterdb.c:287
 #, c-format
 msgid ""
 "\n"
@@ -238,9 +221,9 @@
 "\n"
 "Подробнее о кла�теризации вы можете узнать в опи�ании SQL-команды CLUSTER.\n"
 
-#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
-#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:414
-#: vacuumdb.c:1001
+#: clusterdb.c:288 createdb.c:273 createlang.c:250 createuser.c:380
+#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:422
+#: vacuumdb.c:964
 #, c-format
 msgid ""
 "\n"
@@ -249,58 +232,58 @@
 "\n"
 "Об ошибках �ообщайте по адре�у <pgsql-bugs@postgresql.org>.\n"
 
-#: common.c:73 common.c:123
+#: common.c:82 common.c:128
 msgid "Password: "
 msgstr "Пароль: "
 
-#: common.c:105
+#: common.c:113
 #, c-format
 msgid "%s: could not connect to database %s: out of memory\n"
 msgstr "%s: не удало�ь подключить�� к базе %s (нехватка пам�ти)\n"
 
-#: common.c:139
+#: common.c:141
 #, c-format
 msgid "%s: could not connect to database %s: %s"
 msgstr "%s: не удало�ь подключить�� к базе %s: %s"
 
-#: common.c:188 common.c:216
+#: common.c:190 common.c:218
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: ошибка при выполнении запро�а: %s"
 
-#: common.c:190 common.c:218
+#: common.c:192 common.c:220
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: запро�: %s\n"
 
 #. translator: abbreviation for "yes"
-#: common.c:259
+#: common.c:261
 msgid "y"
 msgstr "y"
 
 #. translator: abbreviation for "no"
-#: common.c:261
+#: common.c:263
 msgid "n"
 msgstr "n"
 
 #. translator: This is a question followed by the translated options for
 #. "yes" and "no".
-#: common.c:271
+#: common.c:273
 #, c-format
 msgid "%s (%s/%s) "
 msgstr "%s (%s - да/%s - нет) "
 
-#: common.c:292
+#: common.c:294
 #, c-format
 msgid "Please answer \"%s\" or \"%s\".\n"
 msgstr "Пожалуй�та, введите \"%s\" или \"%s\".\n"
 
-#: common.c:371 common.c:408
+#: common.c:373 common.c:410
 #, c-format
 msgid "Cancel request sent\n"
 msgstr "Сигнал отмены отправлен\n"
 
-#: common.c:374 common.c:412
+#: common.c:376 common.c:414
 #, c-format
 msgid "Could not send cancel request: %s"
 msgstr "Отправить �игнал отмены не удало�ь: %s"
@@ -344,6 +327,7 @@
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [П�Р�МЕТР]... [ИМЯ_БД] [ОПИС��ИЕ]\n"
 
+# well-spelled: ПРОСТР
 #: createdb.c:255
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
@@ -467,7 +451,7 @@
 msgid "%s: missing required argument language name\n"
 msgstr "%s: от�ут�твует необходимый аргумент: название �зыка\n"
 
-#: createlang.c:197
+#: createlang.c:196
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
 msgstr "%s: поддержка �зыка \"%s\" уже имеет�� в базе \"%s\"\n"
@@ -718,7 +702,7 @@
 msgstr ""
 "  --if-exists               не �читать ошибкой от�ут�твие базы данных\n"
 
-#: droplang.c:203
+#: droplang.c:202
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
 msgstr "%s: поддержка �зыка \"%s\" не у�тановлена в базе данных\"%s\"\n"
@@ -962,17 +946,17 @@
 msgid "%s: reindexing of database \"%s\" failed: %s"
 msgstr "%s: переиндек�ировать базу данных \"%s\" не удало�ь: %s"
 
-#: reindexdb.c:346
+#: reindexdb.c:348
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
 msgstr "%s: переиндек�аци� базы данных \"%s\"\n"
 
-#: reindexdb.c:379
+#: reindexdb.c:387
 #, c-format
 msgid "%s: reindexing of system catalogs failed: %s"
 msgstr "%s: переиндек�ировать �и�темные каталоги не удало�ь: %s"
 
-#: reindexdb.c:391
+#: reindexdb.c:399
 #, c-format
 msgid ""
 "%s reindexes a PostgreSQL database.\n"
@@ -981,39 +965,39 @@
 "%s переиндек�ирует базу данных PostgreSQL.\n"
 "\n"
 
-#: reindexdb.c:395
+#: reindexdb.c:403
 #, c-format
 msgid "  -a, --all                 reindex all databases\n"
 msgstr "  -a, --all                 переиндек�ировать в�е базы данных\n"
 
-#: reindexdb.c:396
+#: reindexdb.c:404
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to reindex\n"
 msgstr "  -d, --dbname=БД           им� базы дл� переиндек�ации\n"
 
-#: reindexdb.c:398
+#: reindexdb.c:406
 #, c-format
 msgid "  -i, --index=INDEX         recreate specific index(es) only\n"
 msgstr "  -i, --index=И�ДЕКС        пере�оздать только указанный индек�(ы)\n"
 
-#: reindexdb.c:400
+#: reindexdb.c:408
 #, c-format
 msgid "  -s, --system              reindex system catalogs\n"
 msgstr "  -s, --system              переиндек�ировать �и�темные каталоги\n"
 
-#: reindexdb.c:401
+#: reindexdb.c:409
 #, c-format
 msgid "  -S, --schema=SCHEMA       reindex specific schema(s) only\n"
 msgstr ""
 "  -S, --schema=СХЕМ�        переиндек�ировать только указанную �хему(ы)\n"
 
-#: reindexdb.c:402
+#: reindexdb.c:410
 #, c-format
 msgid "  -t, --table=TABLE         reindex specific table(s) only\n"
 msgstr ""
 "  -t, --table=Т�БЛИЦ�       переиндек�ировать только указанную таблицу(ы)\n"
 
-#: reindexdb.c:413
+#: reindexdb.c:421
 #, c-format
 msgid ""
 "\n"
@@ -1022,65 +1006,65 @@
 "\n"
 "Подробнее о переиндек�ации вы можете узнать в опи�ании SQL-команды REINDEX.\n"
 
-#: vacuumdb.c:191
+#: vacuumdb.c:192
 #, c-format
 msgid "%s: number of parallel jobs must be at least 1\n"
 msgstr "%s: чи�ло параллельных заданий должно быть не меньше 1\n"
 
-#: vacuumdb.c:197
+#: vacuumdb.c:198
 #, c-format
 msgid "%s: too many parallel jobs requested (maximum: %d)\n"
 msgstr "%s: запрошено �лишком много параллельных заданий (при мак�имуме: %d)\n"
 
-#: vacuumdb.c:236 vacuumdb.c:242
+#: vacuumdb.c:237 vacuumdb.c:243
 #, c-format
 msgid "%s: cannot use the \"%s\" option when performing only analyze\n"
 msgstr ""
 "%s: при выполнении только анализа нельз� и�пользовать параметр \"%s\"\n"
 
-#: vacuumdb.c:259
+#: vacuumdb.c:260
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr "%s: нельз� очи�тить в�е базы данных и одну конкретную одновременно\n"
 
-#: vacuumdb.c:265
+#: vacuumdb.c:266
 #, c-format
 msgid "%s: cannot vacuum specific table(s) in all databases\n"
 msgstr "%s: нельз� очи�тить одну указанную таблицу(ы) во в�ех базах\n"
 
-#: vacuumdb.c:363
+#: vacuumdb.c:352
 msgid "Generating minimal optimizer statistics (1 target)"
 msgstr "Вычи�ление минимальной �тати�тики дл� оптимизатора (1 запи�ь)"
 
-#: vacuumdb.c:364
+#: vacuumdb.c:353
 msgid "Generating medium optimizer statistics (10 targets)"
 msgstr "Вычи�ление �редней �тати�тики дл� оптимизатора (10 запи�ей)"
 
-#: vacuumdb.c:365
+#: vacuumdb.c:354
 msgid "Generating default (full) optimizer statistics"
 msgstr "Вычи�ление �тандартной (полной) �тати�тики дл� оптимизатора"
 
-#: vacuumdb.c:374
+#: vacuumdb.c:366
 #, c-format
 msgid "%s: processing database \"%s\": %s\n"
 msgstr "%s: обработка базы данных \"%s\": %s\n"
 
-#: vacuumdb.c:377
+#: vacuumdb.c:369
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: очи�тка базы данных \"%s\"\n"
 
-#: vacuumdb.c:738
+#: vacuumdb.c:701
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%s: очи�тить таблицу \"%s\" в базе \"%s\" не удало�ь: %s"
 
-#: vacuumdb.c:741 vacuumdb.c:858
+#: vacuumdb.c:704 vacuumdb.c:821
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr "%s: очи�тить базу данных \"%s\" не удало�ь: %s"
 
-#: vacuumdb.c:974
+#: vacuumdb.c:937
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -1089,17 +1073,17 @@
 "%s очищает и анализирует базу данных PostgreSQL.\n"
 "\n"
 
-#: vacuumdb.c:978
+#: vacuumdb.c:941
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       очи�тить в�е базы данных\n"
 
-#: vacuumdb.c:979
+#: vacuumdb.c:942
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=ИМЯ_БД             очи�тить указанную базу данных\n"
 
-#: vacuumdb.c:980
+#: vacuumdb.c:943
 #, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
@@ -1107,19 +1091,19 @@
 msgstr ""
 "  -e, --echo                      отображать команды, отправл�емые �ерверу\n"
 
-#: vacuumdb.c:981
+#: vacuumdb.c:944
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      произве�ти полную очи�тку\n"
 
-#: vacuumdb.c:982
+#: vacuumdb.c:945
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
 msgstr ""
 "  -F, --freeze                    заморозить информацию о транзакци�х в "
 "�троках\n"
 
-#: vacuumdb.c:983
+#: vacuumdb.c:946
 #, c-format
 msgid ""
 "  -j, --jobs=NUM                  use this many concurrent connections to "
@@ -1128,34 +1112,34 @@
 "  -j, --jobs=ЧИСЛО                запу�кать дл� очи�тки заданное чи�ло "
 "заданий\n"
 
-#: vacuumdb.c:984
+#: vacuumdb.c:947
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     не выводить �ообщени�\n"
 
-#: vacuumdb.c:985
+#: vacuumdb.c:948
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table(s) only\n"
 msgstr ""
 "  -t, --table='Т�БЛ[(СТОЛБЦЫ)]'   очи�тить только указанную таблицу(ы)\n"
 
-#: vacuumdb.c:986
+#: vacuumdb.c:949
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   выводить и�черпывающие �ообщени�\n"
 
-#: vacuumdb.c:987
+#: vacuumdb.c:950
 #, c-format
 msgid ""
 "  -V, --version                   output version information, then exit\n"
 msgstr "  -V, --version                   показать вер�ию и выйти\n"
 
-#: vacuumdb.c:988
+#: vacuumdb.c:951
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
 msgstr "  -z, --analyze                   обновить �тати�тику оптимизатора\n"
 
-#: vacuumdb.c:989
+#: vacuumdb.c:952
 #, c-format
 msgid ""
 "  -Z, --analyze-only              only update optimizer statistics; no "
@@ -1164,7 +1148,7 @@
 "  -Z, --analyze-only              только обновить �тати�тику оптимизатора,\n"
 "                                  не очищать БД\n"
 
-#: vacuumdb.c:990
+#: vacuumdb.c:953
 #, c-format
 msgid ""
 "      --analyze-in-stages         only update optimizer statistics, in "
@@ -1176,12 +1160,12 @@
 "                                  (в не�колько проходов дл� большей "
 "�коро�ти), без очи�тки\n"
 
-#: vacuumdb.c:992
+#: vacuumdb.c:955
 #, c-format
 msgid "  -?, --help                      show this help, then exit\n"
 msgstr "  -?, --help                      показать �ту �правку и выйти\n"
 
-#: vacuumdb.c:1000
+#: vacuumdb.c:963
 #, c-format
 msgid ""
 "\n"
diff -Nru postgresql-9.5-9.5.2/src/bin/scripts/reindexdb.c postgresql-9.5-9.5.8/src/bin/scripts/reindexdb.c
--- postgresql-9.5-9.5.2/src/bin/scripts/reindexdb.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/scripts/reindexdb.c	2017-08-07 21:13:41.000000000 +0000
@@ -263,7 +263,7 @@
 		 * specified
 		 */
 		if (indexes.head == NULL && tables.head == NULL && schemas.head == NULL)
-			reindex_one_database(dbname, dbname, "DATABASE", host, port,
+			reindex_one_database(NULL, dbname, "DATABASE", host, port,
 						 username, prompt_password, progname, echo, verbose);
 	}
 
@@ -280,6 +280,9 @@
 
 	PGconn	   *conn;
 
+	conn = connectDatabase(dbname, host, port, username, prompt_password,
+						   progname, false, false);
+
 	initPQExpBuffer(&sql);
 
 	appendPQExpBufferStr(&sql, "REINDEX");
@@ -294,26 +297,23 @@
 	else if (strcmp(type, "SCHEMA") == 0)
 		appendPQExpBuffer(&sql, " SCHEMA %s", name);
 	else if (strcmp(type, "DATABASE") == 0)
-		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
+		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(PQdb(conn)));
 	appendPQExpBufferChar(&sql, ';');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false, false);
-
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
 		if (strcmp(type, "TABLE") == 0)
 			fprintf(stderr, _("%s: reindexing of table \"%s\" in database \"%s\" failed: %s"),
-					progname, name, dbname, PQerrorMessage(conn));
+					progname, name, PQdb(conn), PQerrorMessage(conn));
 		if (strcmp(type, "INDEX") == 0)
 			fprintf(stderr, _("%s: reindexing of index \"%s\" in database \"%s\" failed: %s"),
-					progname, name, dbname, PQerrorMessage(conn));
+					progname, name, PQdb(conn), PQerrorMessage(conn));
 		if (strcmp(type, "SCHEMA") == 0)
 			fprintf(stderr, _("%s: reindexing of schema \"%s\" in database \"%s\" failed: %s"),
-					progname, name, dbname, PQerrorMessage(conn));
+					progname, name, PQdb(conn), PQerrorMessage(conn));
 		else
 			fprintf(stderr, _("%s: reindexing of database \"%s\" failed: %s"),
-					progname, dbname, PQerrorMessage(conn));
+					progname, PQdb(conn), PQerrorMessage(conn));
 		PQfinish(conn);
 		exit(1);
 	}
@@ -330,6 +330,7 @@
 {
 	PGconn	   *conn;
 	PGresult   *result;
+	PQExpBufferData connstr;
 	int			i;
 
 	conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
@@ -337,6 +338,7 @@
 	result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
 	PQfinish(conn);
 
+	initPQExpBuffer(&connstr);
 	for (i = 0; i < PQntuples(result); i++)
 	{
 		char	   *dbname = PQgetvalue(result, i, 0);
@@ -347,9 +349,15 @@
 			fflush(stdout);
 		}
 
-		reindex_one_database(dbname, dbname, "DATABASE", host, port, username,
-							 prompt_password, progname, echo, verbose);
+		resetPQExpBuffer(&connstr);
+		appendPQExpBuffer(&connstr, "dbname=");
+		appendConnStrVal(&connstr, dbname);
+
+		reindex_one_database(NULL, connstr.data, "DATABASE", host,
+							 port, username, prompt_password,
+							 progname, echo, verbose);
 	}
+	termPQExpBuffer(&connstr);
 
 	PQclear(result);
 }
@@ -359,9 +367,11 @@
 						const char *username, enum trivalue prompt_password,
 						const char *progname, bool echo, bool verbose)
 {
+	PGconn	   *conn;
 	PQExpBufferData sql;
 
-	PGconn	   *conn;
+	conn = connectDatabase(dbname, host, port, username, prompt_password,
+						   progname, false, false);
 
 	initPQExpBuffer(&sql);
 
@@ -370,10 +380,8 @@
 	if (verbose)
 		appendPQExpBuffer(&sql, " (VERBOSE)");
 
-	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
+	appendPQExpBuffer(&sql, " SYSTEM %s;", fmtId(PQdb(conn)));
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false, false);
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
 		fprintf(stderr, _("%s: reindexing of system catalogs failed: %s"),
diff -Nru postgresql-9.5-9.5.2/src/bin/scripts/vacuumdb.c postgresql-9.5-9.5.8/src/bin/scripts/vacuumdb.c
--- postgresql-9.5-9.5.2/src/bin/scripts/vacuumdb.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/bin/scripts/vacuumdb.c	2017-08-07 21:13:41.000000000 +0000
@@ -12,6 +12,10 @@
 
 #include "postgres_fe.h"
 
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 #include "common.h"
 #include "dumputils.h"
 
@@ -57,14 +61,12 @@
 					   vacuumingOptions *vacopts, const char *table);
 
 static void run_vacuum_command(PGconn *conn, const char *sql, bool echo,
-				   const char *dbname, const char *table,
-				   const char *progname, bool async);
+				   const char *table, const char *progname, bool async);
 
 static ParallelSlot *GetIdleSlot(ParallelSlot slots[], int numslots,
-			const char *dbname, const char *progname);
+			const char *progname);
 
-static bool GetQueryResult(PGconn *conn, const char *dbname,
-			   const char *progname);
+static bool GetQueryResult(PGconn *conn, const char *progname);
 
 static void DisconnectDatabase(ParallelSlot *slot);
 
@@ -355,19 +357,20 @@
 	Assert(stage == ANALYZE_NO_STAGE ||
 		   (stage >= 0 && stage < ANALYZE_NUM_STAGES));
 
+	conn = connectDatabase(dbname, host, port, username, prompt_password,
+						   progname, false, true);
+
 	if (!quiet)
 	{
 		if (stage != ANALYZE_NO_STAGE)
-			printf(_("%s: processing database \"%s\": %s\n"), progname, dbname,
-				   stage_messages[stage]);
+			printf(_("%s: processing database \"%s\": %s\n"),
+				   progname, PQdb(conn), stage_messages[stage]);
 		else
-			printf(_("%s: vacuuming database \"%s\"\n"), progname, dbname);
+			printf(_("%s: vacuuming database \"%s\"\n"),
+				   progname, PQdb(conn));
 		fflush(stdout);
 	}
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false, true);
-
 	initPQExpBuffer(&sql);
 
 	/*
@@ -473,7 +476,7 @@
 			 * Get a free slot, waiting until one becomes free if none
 			 * currently is.
 			 */
-			free_slot = GetIdleSlot(slots, concurrentCons, dbname, progname);
+			free_slot = GetIdleSlot(slots, concurrentCons, progname);
 			if (!free_slot)
 			{
 				failed = true;
@@ -491,7 +494,7 @@
 		 * errors in GetQueryResult through GetIdleSlot.)
 		 */
 		run_vacuum_command(free_slot->connection, sql.data,
-						   echo, dbname, tabname, progname, parallel);
+						   echo, tabname, progname, parallel);
 
 		if (cell)
 			cell = cell->next;
@@ -504,7 +507,7 @@
 		for (j = 0; j < concurrentCons; j++)
 		{
 			/* wait for all connection to return the results */
-			if (!GetQueryResult((slots + j)->connection, dbname, progname))
+			if (!GetQueryResult((slots + j)->connection, progname))
 				goto finish;
 
 			(slots + j)->isFree = true;
@@ -540,6 +543,7 @@
 {
 	PGconn	   *conn;
 	PGresult   *result;
+	PQExpBufferData connstr;
 	int			stage;
 	int			i;
 
@@ -550,6 +554,7 @@
 						  progname, echo);
 	PQfinish(conn);
 
+	initPQExpBuffer(&connstr);
 	if (analyze_in_stages)
 	{
 		/*
@@ -564,10 +569,11 @@
 		{
 			for (i = 0; i < PQntuples(result); i++)
 			{
-				const char *dbname;
+				resetPQExpBuffer(&connstr);
+				appendPQExpBuffer(&connstr, "dbname=");
+				appendConnStrVal(&connstr, PQgetvalue(result, i, 0));
 
-				dbname = PQgetvalue(result, i, 0);
-				vacuum_one_database(dbname, vacopts,
+				vacuum_one_database(connstr.data, vacopts,
 									stage,
 									NULL,
 									host, port, username, prompt_password,
@@ -580,10 +586,11 @@
 	{
 		for (i = 0; i < PQntuples(result); i++)
 		{
-			const char *dbname;
+			resetPQExpBuffer(&connstr);
+			appendPQExpBuffer(&connstr, "dbname=");
+			appendConnStrVal(&connstr, PQgetvalue(result, i, 0));
 
-			dbname = PQgetvalue(result, i, 0);
-			vacuum_one_database(dbname, vacopts,
+			vacuum_one_database(connstr.data, vacopts,
 								ANALYZE_NO_STAGE,
 								NULL,
 								host, port, username, prompt_password,
@@ -591,6 +598,7 @@
 								progname, echo, quiet);
 		}
 	}
+	termPQExpBuffer(&connstr);
 
 	PQclear(result);
 }
@@ -672,8 +680,7 @@
  */
 static void
 run_vacuum_command(PGconn *conn, const char *sql, bool echo,
-				   const char *dbname, const char *table,
-				   const char *progname, bool async)
+				   const char *table, const char *progname, bool async)
 {
 	bool		status;
 
@@ -692,10 +699,10 @@
 		if (table)
 			fprintf(stderr,
 			_("%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"),
-					progname, table, dbname, PQerrorMessage(conn));
+					progname, table, PQdb(conn), PQerrorMessage(conn));
 		else
 			fprintf(stderr, _("%s: vacuuming of database \"%s\" failed: %s"),
-					progname, dbname, PQerrorMessage(conn));
+					progname, PQdb(conn), PQerrorMessage(conn));
 
 		if (!async)
 		{
@@ -721,7 +728,7 @@
  * If an error occurs, NULL is returned.
  */
 static ParallelSlot *
-GetIdleSlot(ParallelSlot slots[], int numslots, const char *dbname,
+GetIdleSlot(ParallelSlot slots[], int numslots,
 			const char *progname)
 {
 	int			i;
@@ -761,7 +768,7 @@
 			 * We set the cancel-receiving connection to the one in the zeroth
 			 * slot above, so fetch the error from there.
 			 */
-			GetQueryResult(slots->connection, dbname, progname);
+			GetQueryResult(slots->connection, progname);
 			return NULL;
 		}
 		Assert(i != 0);
@@ -777,7 +784,7 @@
 
 			(slots + i)->isFree = true;
 
-			if (!GetQueryResult((slots + i)->connection, dbname, progname))
+			if (!GetQueryResult((slots + i)->connection, progname))
 				return NULL;
 
 			if (firstFree < 0)
@@ -796,7 +803,7 @@
  * reported and subsequently ignored.
  */
 static bool
-GetQueryResult(PGconn *conn, const char *dbname, const char *progname)
+GetQueryResult(PGconn *conn, const char *progname)
 {
 	PGresult   *result;
 
@@ -812,7 +819,7 @@
 			char	   *sqlState = PQresultErrorField(result, PG_DIAG_SQLSTATE);
 
 			fprintf(stderr, _("%s: vacuuming of database \"%s\" failed: %s"),
-					progname, dbname, PQerrorMessage(conn));
+					progname, PQdb(conn), PQerrorMessage(conn));
 
 			if (sqlState && strcmp(sqlState, ERRCODE_UNDEFINED_TABLE) != 0)
 			{
@@ -846,7 +853,7 @@
 
 		if ((cancel = PQgetCancel(slot->connection)))
 		{
-			PQcancel(cancel, errbuf, sizeof(errbuf));
+			(void) PQcancel(cancel, errbuf, sizeof(errbuf));
 			PQfreeCancel(cancel);
 		}
 	}
diff -Nru postgresql-9.5-9.5.2/src/include/access/gin_private.h postgresql-9.5-9.5.8/src/include/access/gin_private.h
--- postgresql-9.5-9.5.2/src/include/access/gin_private.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/access/gin_private.h	2017-08-07 21:13:41.000000000 +0000
@@ -420,14 +420,14 @@
 
 typedef struct
 {
-	uint16		flags;			/* GIN_SPLIT_ISLEAF and/or GIN_SPLIT_ISDATA */
+	uint16		flags;			/* GIN_INSERT_ISLEAF and/or GIN_INSERT_ISDATA */
 
 	/*
 	 * FOLLOWS:
 	 *
 	 * 1. if not leaf page, block numbers of the left and right child pages
-	 * whose split this insertion finishes. As BlockIdData[2] (beware of
-	 * adding fields before this that would make them not 16-bit aligned)
+	 * whose split this insertion finishes, as BlockIdData[2] (beware of
+	 * adding fields in this struct that would make them not 16-bit aligned)
 	 *
 	 * 2. a ginxlogInsertEntry or ginxlogRecompressDataLeaf struct, depending
 	 * on tree type.
@@ -499,21 +499,19 @@
 								 * split */
 	BlockNumber leftChildBlkno; /* valid on a non-leaf split */
 	BlockNumber rightChildBlkno;
-	uint16		flags;
-
-	/* follows: one of the following structs */
+	uint16		flags;			/* see below */
 } ginxlogSplit;
 
 /*
  * Flags used in ginxlogInsert and ginxlogSplit records
  */
 #define GIN_INSERT_ISDATA	0x01	/* for both insert and split records */
-#define GIN_INSERT_ISLEAF	0x02	/* .. */
+#define GIN_INSERT_ISLEAF	0x02	/* ditto */
 #define GIN_SPLIT_ROOT		0x04	/* only for split records */
 
 /*
  * Vacuum simply WAL-logs the whole page, when anything is modified. This
- * functionally identical heap_newpage records, but is kept separate for
+ * is functionally identical to heap_newpage records, but is kept separate for
  * debugging purposes. (When inspecting the WAL stream, it's easier to see
  * what's going on when GIN vacuum records are marked as such, not as heap
  * records.) This is currently only used for entry tree leaf pages.
@@ -637,12 +635,12 @@
 
 typedef struct GinBtreeData *GinBtree;
 
-/* Return codes for GinBtreeData.placeToPage method */
+/* Return codes for GinBtreeData.beginPlaceToPage method */
 typedef enum
 {
-	UNMODIFIED,
-	INSERTED,
-	SPLIT
+	GPTP_NO_WORK,
+	GPTP_INSERT,
+	GPTP_SPLIT
 } GinPlaceToPageRC;
 
 typedef struct GinBtreeData
@@ -655,7 +653,8 @@
 
 	/* insert methods */
 	OffsetNumber (*findChildPtr) (GinBtree, Page, BlockNumber, OffsetNumber);
-	GinPlaceToPageRC (*placeToPage) (GinBtree, Buffer, GinBtreeStack *, void *, BlockNumber, Page *, Page *);
+	GinPlaceToPageRC (*beginPlaceToPage) (GinBtree, Buffer, GinBtreeStack *, void *, BlockNumber, void **, Page *, Page *);
+	void		(*execPlaceToPage) (GinBtree, Buffer, GinBtreeStack *, void *, BlockNumber, void *);
 	void	   *(*prepareDownlink) (GinBtree, Buffer);
 	void		(*fillRoot) (GinBtree, Page, BlockNumber, Page, BlockNumber, Page);
 
diff -Nru postgresql-9.5-9.5.2/src/include/access/gist_private.h postgresql-9.5-9.5.8/src/include/access/gist_private.h
--- postgresql-9.5-9.5.2/src/include/access/gist_private.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/access/gist_private.h	2017-08-07 21:13:41.000000000 +0000
@@ -105,15 +105,11 @@
  * upper index pages; this rule avoids doing extra work during a search that
  * ends early due to LIMIT.
  *
- * To perform an ordered search, we use an RBTree to manage the distance-order
- * queue.  Each GISTSearchTreeItem stores all unvisited items of the same
- * distance; they are GISTSearchItems chained together via their next fields.
- *
- * In a non-ordered search (no order-by operators), the RBTree degenerates
- * to a single item, which we use as a queue of unvisited index pages only.
- * In this case matched heap items from the current index leaf page are
- * remembered in GISTScanOpaqueData.pageData[] and returned directly from
- * there, instead of building a separate GISTSearchItem for each one.
+ * To perform an ordered search, we use a pairing heap to manage the
+ * distance-order queue.  In a non-ordered search (no order-by operators),
+ * we use it to return heap tuples before unvisited index pages, to
+ * ensure depth-first order, but all entries are otherwise considered
+ * equal.
  */
 
 /* Individual heap tuple to be visited */
@@ -288,8 +284,8 @@
 #define GIST_ROOT_BLKNO				0
 
 /*
- * Before PostgreSQL 9.1, we used rely on so-called "invalid tuples" on inner
- * pages to finish crash recovery of incomplete page splits. If a crash
+ * Before PostgreSQL 9.1, we used to rely on so-called "invalid tuples" on
+ * inner pages to finish crash recovery of incomplete page splits. If a crash
  * happened in the middle of a page split, so that the downlink pointers were
  * not yet inserted, crash recovery inserted a special downlink pointer. The
  * semantics of an invalid tuple was that it if you encounter one in a scan,
diff -Nru postgresql-9.5-9.5.2/src/include/access/hash.h postgresql-9.5-9.5.8/src/include/access/hash.h
--- postgresql-9.5-9.5.2/src/include/access/hash.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/access/hash.h	2017-08-07 21:13:41.000000000 +0000
@@ -350,8 +350,9 @@
 extern uint32 _hash_log2(uint32 num);
 extern void _hash_checkpage(Relation rel, Buffer buf, int flags);
 extern uint32 _hash_get_indextuple_hashkey(IndexTuple itup);
-extern IndexTuple _hash_form_tuple(Relation index,
-				 Datum *values, bool *isnull);
+extern bool _hash_convert_tuple(Relation index,
+					Datum *user_values, bool *user_isnull,
+					Datum *index_values, bool *index_isnull);
 extern OffsetNumber _hash_binsearch(Page page, uint32 hash_value);
 extern OffsetNumber _hash_binsearch_last(Page page, uint32 hash_value);
 
diff -Nru postgresql-9.5-9.5.2/src/include/access/htup_details.h postgresql-9.5-9.5.8/src/include/access/htup_details.h
--- postgresql-9.5-9.5.2/src/include/access/htup_details.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/access/htup_details.h	2017-08-07 21:13:41.000000000 +0000
@@ -218,6 +218,31 @@
 	 (((infomask) & (HEAP_XMAX_IS_MULTI | HEAP_LOCK_MASK)) == HEAP_XMAX_EXCL_LOCK))
 
 /*
+ * A tuple that has HEAP_XMAX_IS_MULTI and HEAP_XMAX_LOCK_ONLY but neither of
+ * XMAX_EXCL_LOCK and XMAX_KEYSHR_LOCK must come from a tuple that was
+ * share-locked in 9.2 or earlier and then pg_upgrade'd.
+ *
+ * In 9.2 and prior, HEAP_XMAX_IS_MULTI was only set when there were multiple
+ * FOR SHARE lockers of that tuple.  That set HEAP_XMAX_LOCK_ONLY (with a
+ * different name back then) but neither of HEAP_XMAX_EXCL_LOCK and
+ * HEAP_XMAX_KEYSHR_LOCK.  That combination is no longer possible in 9.3 and
+ * up, so if we see that combination we know for certain that the tuple was
+ * locked in an earlier release; since all such lockers are gone (they cannot
+ * survive through pg_upgrade), such tuples can safely be considered not
+ * locked.
+ *
+ * We must not resolve such multixacts locally, because the result would be
+ * bogus, regardless of where they stand with respect to the current valid
+ * multixact range.
+ */
+#define HEAP_LOCKED_UPGRADED(infomask) \
+( \
+	 ((infomask) & HEAP_XMAX_IS_MULTI) != 0 && \
+	 ((infomask) & HEAP_XMAX_LOCK_ONLY) != 0 && \
+	 (((infomask) & (HEAP_XMAX_EXCL_LOCK | HEAP_XMAX_KEYSHR_LOCK)) == 0) \
+)
+
+/*
  * Use these to test whether a particular lock is applied to a tuple
  */
 #define HEAP_XMAX_IS_SHR_LOCKED(infomask) \
@@ -292,7 +317,7 @@
 
 #define HeapTupleHeaderXminCommitted(tup) \
 ( \
-	(tup)->t_infomask & HEAP_XMIN_COMMITTED \
+	((tup)->t_infomask & HEAP_XMIN_COMMITTED) != 0 \
 )
 
 #define HeapTupleHeaderXminInvalid(tup) \
@@ -476,7 +501,7 @@
 
 #define HeapTupleHeaderIsHeapOnly(tup) \
 ( \
-  (tup)->t_infomask2 & HEAP_ONLY_TUPLE \
+  ((tup)->t_infomask2 & HEAP_ONLY_TUPLE) != 0 \
 )
 
 #define HeapTupleHeaderSetHeapOnly(tup) \
@@ -491,7 +516,7 @@
 
 #define HeapTupleHeaderHasMatch(tup) \
 ( \
-  (tup)->t_infomask2 & HEAP_TUPLE_HAS_MATCH \
+  ((tup)->t_infomask2 & HEAP_TUPLE_HAS_MATCH) != 0 \
 )
 
 #define HeapTupleHeaderSetMatch(tup) \
diff -Nru postgresql-9.5-9.5.2/src/include/access/nbtree.h postgresql-9.5-9.5.8/src/include/access/nbtree.h
--- postgresql-9.5-9.5.2/src/include/access/nbtree.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/access/nbtree.h	2017-08-07 21:13:41.000000000 +0000
@@ -331,8 +331,10 @@
  * The WAL record can represent deletion of any number of index tuples on a
  * single index page when executed by VACUUM.
  *
- * The correctness requirement for applying these changes during recovery is
- * that we must do one of these two things for every block in the index:
+ * For MVCC scans, lastBlockVacuumed will be set to InvalidBlockNumber.
+ * For a non-MVCC index scans there is an additional correctness requirement
+ * for applying these changes during recovery, which is that we must do one
+ * of these two things for every block in the index:
  *		* lock the block for cleanup and apply any required changes
  *		* EnsureBlockUnpinned()
  * The purpose of this is to ensure that no index scans started before we
diff -Nru postgresql-9.5-9.5.2/src/include/access/parallel.h postgresql-9.5-9.5.8/src/include/access/parallel.h
--- postgresql-9.5-9.5.2/src/include/access/parallel.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/access/parallel.h	2017-08-07 21:13:41.000000000 +0000
@@ -19,7 +19,6 @@
 #include "postmaster/bgworker.h"
 #include "storage/shm_mq.h"
 #include "storage/shm_toc.h"
-#include "utils/elog.h"
 
 typedef void (*parallel_worker_main_type) (dsm_segment *seg, shm_toc *toc);
 
@@ -46,7 +45,7 @@
 	ParallelWorkerInfo *worker;
 } ParallelContext;
 
-extern bool ParallelMessagePending;
+extern volatile bool ParallelMessagePending;
 extern int	ParallelWorkerNumber;
 extern bool InitializingParallelWorker;
 
@@ -54,16 +53,18 @@
 
 extern ParallelContext *CreateParallelContext(parallel_worker_main_type entrypoint, int nworkers);
 extern ParallelContext *CreateParallelContextForExternalFunction(char *library_name, char *function_name, int nworkers);
-extern void InitializeParallelDSM(ParallelContext *);
-extern void LaunchParallelWorkers(ParallelContext *);
-extern void WaitForParallelWorkersToFinish(ParallelContext *);
-extern void DestroyParallelContext(ParallelContext *);
+extern void InitializeParallelDSM(ParallelContext *pcxt);
+extern void LaunchParallelWorkers(ParallelContext *pcxt);
+extern void WaitForParallelWorkersToFinish(ParallelContext *pcxt);
+extern void DestroyParallelContext(ParallelContext *pcxt);
 extern bool ParallelContextActive(void);
 
 extern void HandleParallelMessageInterrupt(void);
 extern void HandleParallelMessages(void);
 extern void AtEOXact_Parallel(bool isCommit);
 extern void AtEOSubXact_Parallel(bool isCommit, SubTransactionId mySubId);
-extern void ParallelWorkerReportLastRecEnd(XLogRecPtr);
+extern void ParallelWorkerReportLastRecEnd(XLogRecPtr last_xlog_end);
+
+extern void ParallelWorkerMain(Datum main_arg);
 
 #endif   /* PARALLEL_H */
diff -Nru postgresql-9.5-9.5.2/src/include/access/tupconvert.h postgresql-9.5-9.5.8/src/include/access/tupconvert.h
--- postgresql-9.5-9.5.2/src/include/access/tupconvert.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/access/tupconvert.h	2017-08-07 21:13:41.000000000 +0000
@@ -38,6 +38,10 @@
 					   TupleDesc outdesc,
 					   const char *msg);
 
+extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
+						   TupleDesc outdesc,
+						   const char *msg);
+
 extern HeapTuple do_convert_tuple(HeapTuple tuple, TupleConversionMap *map);
 
 extern void free_conversion_map(TupleConversionMap *map);
diff -Nru postgresql-9.5-9.5.2/src/include/access/tuptoaster.h postgresql-9.5-9.5.8/src/include/access/tuptoaster.h
--- postgresql-9.5-9.5.2/src/include/access/tuptoaster.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/access/tuptoaster.h	2017-08-07 21:13:41.000000000 +0000
@@ -142,7 +142,7 @@
  *	Called by heap_delete().
  * ----------
  */
-extern void toast_delete(Relation rel, HeapTuple oldtup);
+extern void toast_delete(Relation rel, HeapTuple oldtup, bool is_speculative);
 
 /* ----------
  * heap_tuple_fetch_attr() -
diff -Nru postgresql-9.5-9.5.2/src/include/access/xact.h postgresql-9.5-9.5.8/src/include/access/xact.h
--- postgresql-9.5-9.5.2/src/include/access/xact.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/access/xact.h	2017-08-07 21:13:41.000000000 +0000
@@ -63,7 +63,7 @@
 	SYNCHRONOUS_COMMIT_REMOTE_FLUSH		/* wait for local and remote flush */
 }	SyncCommitLevel;
 
-/* Define the default setting for synchonous_commit */
+/* Define the default setting for synchronous_commit */
 #define SYNCHRONOUS_COMMIT_ON	SYNCHRONOUS_COMMIT_REMOTE_FLUSH
 
 /* Synchronous commit level */
@@ -220,7 +220,6 @@
 {
 	TransactionId xid;
 } xl_xact_twophase;
-#define MinSizeOfXactInvals offsetof(xl_xact_invals, msgs)
 
 typedef struct xl_xact_origin
 {
diff -Nru postgresql-9.5-9.5.2/src/include/access/xlog_internal.h postgresql-9.5-9.5.8/src/include/access/xlog_internal.h
--- postgresql-9.5-9.5.2/src/include/access/xlog_internal.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/access/xlog_internal.h	2017-08-07 21:13:41.000000000 +0000
@@ -96,7 +96,7 @@
 		(dest) = (segno) * XLOG_SEG_SIZE + (offset)
 
 /*
- * Compute ID and segment from an XLogRecPtr.
+ * Compute a segment number from an XLogRecPtr.
  *
  * For XLByteToSeg, do the computation at face value.  For XLByteToPrevSeg,
  * a boundary byte is taken to be in the previous segment.  This is suitable
@@ -252,7 +252,7 @@
 {
 	RECOVERY_TARGET_ACTION_PAUSE,
 	RECOVERY_TARGET_ACTION_PROMOTE,
-	RECOVERY_TARGET_ACTION_SHUTDOWN,
+	RECOVERY_TARGET_ACTION_SHUTDOWN
 } RecoveryTargetAction;
 
 /*
diff -Nru postgresql-9.5-9.5.2/src/include/catalog/binary_upgrade.h postgresql-9.5-9.5.8/src/include/catalog/binary_upgrade.h
--- postgresql-9.5-9.5.2/src/include/catalog/binary_upgrade.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/catalog/binary_upgrade.h	2017-08-07 21:13:41.000000000 +0000
@@ -14,11 +14,6 @@
 #ifndef BINARY_UPGRADE_H
 #define BINARY_UPGRADE_H
 
-#include "catalog/pg_authid.h"
-
-/* pick a OID that will never be used for TOAST tables */
-#define OPTIONALLY_CREATE_TOAST_OID BOOTSTRAP_SUPERUSERID
-
 extern PGDLLIMPORT Oid binary_upgrade_next_pg_type_oid;
 extern PGDLLIMPORT Oid binary_upgrade_next_array_pg_type_oid;
 extern PGDLLIMPORT Oid binary_upgrade_next_toast_pg_type_oid;
diff -Nru postgresql-9.5-9.5.2/src/include/catalog/pg_cast.h postgresql-9.5-9.5.8/src/include/catalog/pg_cast.h
--- postgresql-9.5-9.5.2/src/include/catalog/pg_cast.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/catalog/pg_cast.h	2017-08-07 21:13:41.000000000 +0000
@@ -59,7 +59,7 @@
 
 /*
  * The allowable values for pg_cast.castmethod are specified by this enum.
- * Since castcontext is stored as a "char", we use ASCII codes for human
+ * Since castmethod is stored as a "char", we use ASCII codes for human
  * convenience in reading the table.
  */
 typedef enum CoercionMethod
diff -Nru postgresql-9.5-9.5.2/src/include/catalog/pg_proc.h postgresql-9.5-9.5.8/src/include/catalog/pg_proc.h
--- postgresql-9.5-9.5.2/src/include/catalog/pg_proc.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/catalog/pg_proc.h	2017-08-07 21:13:41.000000000 +0000
@@ -411,11 +411,11 @@
 DATA(insert OID = 229 (  dtrunc			   PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_	dtrunc _null_ _null_ _null_ ));
 DESCR("truncate to integer");
 DATA(insert OID = 2308 ( ceil			   PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_	dceil _null_ _null_ _null_ ));
-DESCR("smallest integer >= value");
+DESCR("nearest integer >= value");
 DATA(insert OID = 2320 ( ceiling		   PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_	dceil _null_ _null_ _null_ ));
-DESCR("smallest integer >= value");
+DESCR("nearest integer >= value");
 DATA(insert OID = 2309 ( floor			   PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_	dfloor _null_ _null_ _null_ ));
-DESCR("largest integer <= value");
+DESCR("nearest integer <= value");
 DATA(insert OID = 2310 ( sign			   PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_	dsign _null_ _null_ _null_ ));
 DESCR("sign of value");
 DATA(insert OID = 230 (  dsqrt			   PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "701" _null_ _null_ _null_ _null_ _null_	dsqrt _null_ _null_ _null_ ));
@@ -2318,11 +2318,11 @@
 DATA(insert OID = 1710 ( trunc					PGNSP PGUID 14 1 0 0 0 f f f f t f i 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ "select pg_catalog.trunc($1,0)" _null_ _null_ _null_ ));
 DESCR("value truncated to 'scale' of zero");
 DATA(insert OID = 1711 ( ceil					PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ numeric_ceil _null_ _null_ _null_ ));
-DESCR("smallest integer >= value");
+DESCR("nearest integer >= value");
 DATA(insert OID = 2167 ( ceiling				PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ numeric_ceil _null_ _null_ _null_ ));
-DESCR("smallest integer >= value");
+DESCR("nearest integer >= value");
 DATA(insert OID = 1712 ( floor					PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 1700 "1700" _null_ _null_ _null_ _null_ _null_ numeric_floor _null_ _null_ _null_ ));
-DESCR("largest integer <= value");
+DESCR("nearest integer <= value");
 DATA(insert OID = 1718 ( numeric_eq				PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "1700 1700" _null_ _null_ _null_ _null_ _null_ numeric_eq _null_ _null_ _null_ ));
 DATA(insert OID = 1719 ( numeric_ne				PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "1700 1700" _null_ _null_ _null_ _null_ _null_ numeric_ne _null_ _null_ _null_ ));
 DATA(insert OID = 1720 ( numeric_gt				PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "1700 1700" _null_ _null_ _null_ _null_ _null_ numeric_gt _null_ _null_ _null_ ));
diff -Nru postgresql-9.5-9.5.2/src/include/catalog/pg_statistic.h postgresql-9.5-9.5.8/src/include/catalog/pg_statistic.h
--- postgresql-9.5-9.5.2/src/include/catalog/pg_statistic.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/catalog/pg_statistic.h	2017-08-07 21:13:41.000000000 +0000
@@ -57,13 +57,14 @@
 	 *		> 0		actual number of distinct values
 	 *		< 0		negative of multiplier for number of rows
 	 * The special negative case allows us to cope with columns that are
-	 * unique (stadistinct = -1) or nearly so (for example, a column in
-	 * which values appear about twice on the average could be represented
-	 * by stadistinct = -0.5).  Because the number-of-rows statistic in
-	 * pg_class may be updated more frequently than pg_statistic is, it's
-	 * important to be able to describe such situations as a multiple of
-	 * the number of rows, rather than a fixed number of distinct values.
-	 * But in other cases a fixed number is correct (eg, a boolean column).
+	 * unique (stadistinct = -1) or nearly so (for example, a column in which
+	 * non-null values appear about twice on the average could be represented
+	 * by stadistinct = -0.5 if there are no nulls, or -0.4 if 20% of the
+	 * column is nulls).  Because the number-of-rows statistic in pg_class may
+	 * be updated more frequently than pg_statistic is, it's important to be
+	 * able to describe such situations as a multiple of the number of rows,
+	 * rather than a fixed number of distinct values.  But in other cases a
+	 * fixed number is correct (eg, a boolean column).
 	 * ----------------
 	 */
 	float4		stadistinct;
@@ -274,7 +275,7 @@
  * fraction of empty ranges. stavalues is a histogram of non-empty lengths, in
  * a format similar to STATISTIC_KIND_HISTOGRAM: it contains M (>=2) range
  * values that divide the column data values into M-1 bins of approximately
- * equal population. The lengths are stores as float8s, as measured by the
+ * equal population. The lengths are stored as float8s, as measured by the
  * range type's subdiff function. Only non-null rows are considered.
  */
 #define STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM  6
diff -Nru postgresql-9.5-9.5.2/src/include/c.h postgresql-9.5-9.5.8/src/include/c.h
--- postgresql-9.5-9.5.2/src/include/c.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/c.h	2017-08-07 21:13:41.000000000 +0000
@@ -979,7 +979,7 @@
 /* gettext domain name mangling */
 
 /*
- * To better support parallel installations of major PostgeSQL
+ * To better support parallel installations of major PostgreSQL
  * versions as well as parallel installations of major library soname
  * versions, we mangle the gettext domain name by appending those
  * version numbers.  The coding rule ought to be that wherever the
diff -Nru postgresql-9.5-9.5.2/src/include/common/int128.h postgresql-9.5-9.5.8/src/include/common/int128.h
--- postgresql-9.5-9.5.2/src/include/common/int128.h	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/common/int128.h	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,231 @@
+/*-------------------------------------------------------------------------
+ *
+ * int128.h
+ *	  Roll-our-own 128-bit integer arithmetic.
+ *
+ * We make use of the native int128 type if there is one, otherwise
+ * implement things the hard way based on two int64 halves.
+ *
+ * See src/tools/testint128.c for a simple test harness for this file.
+ *
+ * Copyright (c) 2017, PostgreSQL Global Development Group
+ *
+ * src/include/common/int128.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef INT128_H
+#define INT128_H
+
+/*
+ * For testing purposes, use of native int128 can be switched on/off by
+ * predefining USE_NATIVE_INT128.
+ */
+#ifndef USE_NATIVE_INT128
+#ifdef HAVE_INT128
+#define USE_NATIVE_INT128 1
+#else
+#define USE_NATIVE_INT128 0
+#endif
+#endif
+
+
+#if USE_NATIVE_INT128
+
+typedef int128 INT128;
+
+/*
+ * Add the 128-bit product of two int64 values into an INT128 variable.
+ *
+ * XXX with a stupid compiler, this could actually be less efficient than
+ * the other implementation; maybe we should do it by hand always?
+ */
+static inline void
+int128_add_int64_mul_int64(INT128 *i128, int64 x, int64 y)
+{
+	*i128 += (int128) x *(int128) y;
+}
+
+/*
+ * Compare two INT128 values, return -1, 0, or +1.
+ */
+static inline int
+int128_compare(INT128 x, INT128 y)
+{
+	if (x < y)
+		return -1;
+	if (x > y)
+		return 1;
+	return 0;
+}
+
+/*
+ * Widen int64 to INT128.
+ */
+static inline INT128
+int64_to_int128(int64 v)
+{
+	return (INT128) v;
+}
+
+/*
+ * Convert INT128 to int64 (losing any high-order bits).
+ * This also works fine for casting down to uint64.
+ */
+static inline int64
+int128_to_int64(INT128 val)
+{
+	return (int64) val;
+}
+
+#else							/* !USE_NATIVE_INT128 */
+
+/*
+ * We lay out the INT128 structure with the same content and byte ordering
+ * that a native int128 type would (probably) have.  This makes no difference
+ * for ordinary use of INT128, but allows union'ing INT128 with int128 for
+ * testing purposes.
+ */
+typedef struct
+{
+#ifdef WORDS_BIGENDIAN
+	int64		hi;				/* most significant 64 bits, including sign */
+	uint64		lo;				/* least significant 64 bits, without sign */
+#else
+	uint64		lo;				/* least significant 64 bits, without sign */
+	int64		hi;				/* most significant 64 bits, including sign */
+#endif
+} INT128;
+
+/*
+ * Add an unsigned int64 value into an INT128 variable.
+ */
+static inline void
+int128_add_uint64(INT128 *i128, uint64 v)
+{
+	/*
+	 * First add the value to the .lo part, then check to see if a carry needs
+	 * to be propagated into the .hi part.  A carry is needed if both inputs
+	 * have high bits set, or if just one input has high bit set while the new
+	 * .lo part doesn't.  Remember that .lo part is unsigned; we cast to
+	 * signed here just as a cheap way to check the high bit.
+	 */
+	uint64		oldlo = i128->lo;
+
+	i128->lo += v;
+	if (((int64) v < 0 && (int64) oldlo < 0) ||
+		(((int64) v < 0 || (int64) oldlo < 0) && (int64) i128->lo >= 0))
+		i128->hi++;
+}
+
+/*
+ * INT64_AU32 extracts the most significant 32 bits of int64 as int64, while
+ * INT64_AL32 extracts the least significant 32 bits as uint64.
+ */
+#define INT64_AU32(i64) ((i64) >> 32)
+#define INT64_AL32(i64) ((i64) & UINT64CONST(0xFFFFFFFF))
+
+/*
+ * Add the 128-bit product of two int64 values into an INT128 variable.
+ */
+static inline void
+int128_add_int64_mul_int64(INT128 *i128, int64 x, int64 y)
+{
+	/* INT64_AU32 must use arithmetic right shift */
+	StaticAssertStmt(((int64) -1 >> 1) == (int64) -1,
+					 "arithmetic right shift is needed");
+
+	/*----------
+	 * Form the 128-bit product x * y using 64-bit arithmetic.
+	 * Considering each 64-bit input as having 32-bit high and low parts,
+	 * we can compute
+	 *
+	 *	 x * y = ((x.hi << 32) + x.lo) * (((y.hi << 32) + y.lo)
+	 *		   = (x.hi * y.hi) << 64 +
+	 *			 (x.hi * y.lo) << 32 +
+	 *			 (x.lo * y.hi) << 32 +
+	 *			 x.lo * y.lo
+	 *
+	 * Each individual product is of 32-bit terms so it won't overflow when
+	 * computed in 64-bit arithmetic.  Then we just have to shift it to the
+	 * correct position while adding into the 128-bit result.  We must also
+	 * keep in mind that the "lo" parts must be treated as unsigned.
+	 *----------
+	 */
+
+	/* No need to work hard if product must be zero */
+	if (x != 0 && y != 0)
+	{
+		int64		x_u32 = INT64_AU32(x);
+		uint64		x_l32 = INT64_AL32(x);
+		int64		y_u32 = INT64_AU32(y);
+		uint64		y_l32 = INT64_AL32(y);
+		int64		tmp;
+
+		/* the first term */
+		i128->hi += x_u32 * y_u32;
+
+		/* the second term: sign-extend it only if x is negative */
+		tmp = x_u32 * y_l32;
+		if (x < 0)
+			i128->hi += INT64_AU32(tmp);
+		else
+			i128->hi += ((uint64) tmp) >> 32;
+		int128_add_uint64(i128, ((uint64) INT64_AL32(tmp)) << 32);
+
+		/* the third term: sign-extend it only if y is negative */
+		tmp = x_l32 * y_u32;
+		if (y < 0)
+			i128->hi += INT64_AU32(tmp);
+		else
+			i128->hi += ((uint64) tmp) >> 32;
+		int128_add_uint64(i128, ((uint64) INT64_AL32(tmp)) << 32);
+
+		/* the fourth term: always unsigned */
+		int128_add_uint64(i128, x_l32 * y_l32);
+	}
+}
+
+/*
+ * Compare two INT128 values, return -1, 0, or +1.
+ */
+static inline int
+int128_compare(INT128 x, INT128 y)
+{
+	if (x.hi < y.hi)
+		return -1;
+	if (x.hi > y.hi)
+		return 1;
+	if (x.lo < y.lo)
+		return -1;
+	if (x.lo > y.lo)
+		return 1;
+	return 0;
+}
+
+/*
+ * Widen int64 to INT128.
+ */
+static inline INT128
+int64_to_int128(int64 v)
+{
+	INT128		val;
+
+	val.lo = (uint64) v;
+	val.hi = (v < 0) ? -INT64CONST(1) : INT64CONST(0);
+	return val;
+}
+
+/*
+ * Convert INT128 to int64 (losing any high-order bits).
+ * This also works fine for casting down to uint64.
+ */
+static inline int64
+int128_to_int64(INT128 val)
+{
+	return (int64) val.lo;
+}
+
+#endif   /* USE_NATIVE_INT128 */
+
+#endif   /* INT128_H */
diff -Nru postgresql-9.5-9.5.2/src/include/executor/executor.h postgresql-9.5-9.5.8/src/include/executor/executor.h
--- postgresql-9.5-9.5.2/src/include/executor/executor.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/executor/executor.h	2017-08-07 21:13:41.000000000 +0000
@@ -283,7 +283,7 @@
 extern TupOutputState *begin_tup_output_tupdesc(DestReceiver *dest,
 						 TupleDesc tupdesc);
 extern void do_tup_output(TupOutputState *tstate, Datum *values, bool *isnull);
-extern void do_text_output_multiline(TupOutputState *tstate, char *text);
+extern void do_text_output_multiline(TupOutputState *tstate, const char *txt);
 extern void end_tup_output(TupOutputState *tstate);
 
 /*
diff -Nru postgresql-9.5-9.5.2/src/include/executor/tuptable.h postgresql-9.5-9.5.8/src/include/executor/tuptable.h
--- postgresql-9.5-9.5.2/src/include/executor/tuptable.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/executor/tuptable.h	2017-08-07 21:13:41.000000000 +0000
@@ -163,7 +163,6 @@
 extern HeapTuple ExecMaterializeSlot(TupleTableSlot *slot);
 extern TupleTableSlot *ExecCopySlot(TupleTableSlot *dstslot,
 			 TupleTableSlot *srcslot);
-extern TupleTableSlot *ExecMakeSlotContentsReadOnly(TupleTableSlot *slot);
 
 /* in access/common/heaptuple.c */
 extern Datum slot_getattr(TupleTableSlot *slot, int attnum, bool *isnull);
diff -Nru postgresql-9.5-9.5.2/src/include/fmgr.h postgresql-9.5-9.5.8/src/include/fmgr.h
--- postgresql-9.5-9.5.2/src/include/fmgr.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/fmgr.h	2017-08-07 21:13:41.000000000 +0000
@@ -344,11 +344,18 @@
 
 /*
  *	Macro to build an info function associated with the given function name.
- *	Win32 loadable functions usually link with 'dlltool --export-all', but it
- *	doesn't hurt to add PGDLLIMPORT in case they don't.
+ *
+ *	As a convenience, also provide an "extern" declaration for the given
+ *	function name, so that writers of C functions need not write that too.
+ *
+ *	On Windows, the function and info function must be exported.  Our normal
+ *	build processes take care of that via .DEF files or --export-all-symbols.
+ *	Module authors using a different build process might need to manually
+ *	declare the function PGDLLEXPORT.  We do that automatically here for the
+ *	info function, since authors shouldn't need to be explicitly aware of it.
  */
 #define PG_FUNCTION_INFO_V1(funcname) \
-Datum funcname(PG_FUNCTION_ARGS); \
+extern Datum funcname(PG_FUNCTION_ARGS); \
 extern PGDLLEXPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \
 const Pg_finfo_record * \
 CppConcat(pg_finfo_,funcname) (void) \
diff -Nru postgresql-9.5-9.5.2/src/include/libpq/libpq.h postgresql-9.5-9.5.8/src/include/libpq/libpq.h
--- postgresql-9.5-9.5.2/src/include/libpq/libpq.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/libpq/libpq.h	2017-08-07 21:13:41.000000000 +0000
@@ -42,7 +42,7 @@
 #define pq_putmessage(msgtype, s, len) \
 	(PqCommMethods->putmessage(msgtype, s, len))
 #define pq_putmessage_noblock(msgtype, s, len) \
-	(PqCommMethods->putmessage(msgtype, s, len))
+	(PqCommMethods->putmessage_noblock(msgtype, s, len))
 #define pq_startcopyout() (PqCommMethods->startcopyout())
 #define pq_endcopyout(errorAbort) (PqCommMethods->endcopyout(errorAbort))
 
diff -Nru postgresql-9.5-9.5.2/src/include/libpq/pqcomm.h postgresql-9.5-9.5.8/src/include/libpq/pqcomm.h
--- postgresql-9.5-9.5.2/src/include/libpq/pqcomm.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/libpq/pqcomm.h	2017-08-07 21:13:41.000000000 +0000
@@ -172,6 +172,8 @@
 #define AUTH_REQ_GSS		7	/* GSSAPI without wrap() */
 #define AUTH_REQ_GSS_CONT	8	/* Continue GSS exchanges */
 #define AUTH_REQ_SSPI		9	/* SSPI negotiate without wrap() */
+#define AUTH_REQ_SASL	   10	/* SASL authentication. Not supported before
+								 * libpq version 10. */
 
 typedef uint32 AuthRequest;
 
diff -Nru postgresql-9.5-9.5.2/src/include/miscadmin.h postgresql-9.5-9.5.8/src/include/miscadmin.h
--- postgresql-9.5-9.5.2/src/include/miscadmin.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/miscadmin.h	2017-08-07 21:13:41.000000000 +0000
@@ -23,6 +23,8 @@
 #ifndef MISCADMIN_H
 #define MISCADMIN_H
 
+#include <signal.h>
+
 #include "pgtime.h"				/* for pg_time_t */
 
 
@@ -80,6 +82,7 @@
 extern PGDLLIMPORT volatile bool InterruptPending;
 extern PGDLLIMPORT volatile bool QueryCancelPending;
 extern PGDLLIMPORT volatile bool ProcDiePending;
+extern PGDLLIMPORT volatile sig_atomic_t ConfigReloadPending;
 
 extern volatile bool ClientConnectionLost;
 
@@ -270,6 +273,8 @@
 extern void check_stack_depth(void);
 extern bool stack_is_too_deep(void);
 
+extern void PostgresSigHupHandler(SIGNAL_ARGS);
+
 /* in tcop/utility.c */
 extern void PreventCommandIfReadOnly(const char *cmdname);
 extern void PreventCommandIfParallelMode(const char *cmdname);
diff -Nru postgresql-9.5-9.5.2/src/include/nodes/execnodes.h postgresql-9.5-9.5.8/src/include/nodes/execnodes.h
--- postgresql-9.5-9.5.2/src/include/nodes/execnodes.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/nodes/execnodes.h	2017-08-07 21:13:41.000000000 +0000
@@ -874,6 +874,7 @@
 	ExprState  *arg;			/* implicit equality comparison argument */
 	List	   *args;			/* the arguments (list of WHEN clauses) */
 	ExprState  *defresult;		/* the default result (ELSE clause) */
+	int16		argtyplen;		/* if arg is provided, its typlen */
 } CaseExprState;
 
 /* ----------------
diff -Nru postgresql-9.5-9.5.2/src/include/nodes/makefuncs.h postgresql-9.5-9.5.8/src/include/nodes/makefuncs.h
--- postgresql-9.5-9.5.2/src/include/nodes/makefuncs.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/nodes/makefuncs.h	2017-08-07 21:13:41.000000000 +0000
@@ -72,6 +72,9 @@
 extern TypeName *makeTypeNameFromNameList(List *names);
 extern TypeName *makeTypeNameFromOid(Oid typeOid, int32 typmod);
 
+extern ColumnDef *makeColumnDef(const char *colname,
+			  Oid typeOid, int32 typmod, Oid collOid);
+
 extern FuncExpr *makeFuncExpr(Oid funcid, Oid rettype, List *args,
 			 Oid funccollid, Oid inputcollid, CoercionForm fformat);
 
diff -Nru postgresql-9.5-9.5.2/src/include/nodes/nodes.h postgresql-9.5-9.5.8/src/include/nodes/nodes.h
--- postgresql-9.5-9.5.2/src/include/nodes/nodes.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/nodes/nodes.h	2017-08-07 21:13:41.000000000 +0000
@@ -512,6 +512,28 @@
 
 #define IsA(nodeptr,_type_)		(nodeTag(nodeptr) == T_##_type_)
 
+/*
+ * castNode(type, ptr) casts ptr to "type *", and if assertions are enabled,
+ * verifies that the node has the appropriate type (using its nodeTag()).
+ *
+ * Use an inline function when assertions are enabled, to avoid multiple
+ * evaluations of the ptr argument (which could e.g. be a function call).
+ * If inline functions are not available - only a small number of platforms -
+ * don't Assert, but use the non-checking version.
+ */
+#if defined(USE_ASSERT_CHECKING) && defined(PG_USE_INLINE)
+static inline Node *
+castNodeImpl(NodeTag type, void *ptr)
+{
+	Assert(ptr == NULL || nodeTag(ptr) == type);
+	return (Node *) ptr;
+}
+#define castNode(_type_, nodeptr) ((_type_ *) castNodeImpl(T_##_type_, nodeptr))
+#else
+#define castNode(_type_, nodeptr) ((_type_ *) (nodeptr))
+#endif   /* USE_ASSERT_CHECKING && PG_USE_INLINE */
+
+
 /* ----------------------------------------------------------------
  *					  extern declarations follow
  * ----------------------------------------------------------------
diff -Nru postgresql-9.5-9.5.2/src/include/nodes/pg_list.h postgresql-9.5-9.5.8/src/include/nodes/pg_list.h
--- postgresql-9.5-9.5.2/src/include/nodes/pg_list.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/nodes/pg_list.h	2017-08-07 21:13:41.000000000 +0000
@@ -115,26 +115,32 @@
 #define lfirst(lc)				((lc)->data.ptr_value)
 #define lfirst_int(lc)			((lc)->data.int_value)
 #define lfirst_oid(lc)			((lc)->data.oid_value)
+#define lfirst_node(type,lc)	castNode(type, lfirst(lc))
 
 #define linitial(l)				lfirst(list_head(l))
 #define linitial_int(l)			lfirst_int(list_head(l))
 #define linitial_oid(l)			lfirst_oid(list_head(l))
+#define linitial_node(type,l)	castNode(type, linitial(l))
 
 #define lsecond(l)				lfirst(lnext(list_head(l)))
 #define lsecond_int(l)			lfirst_int(lnext(list_head(l)))
 #define lsecond_oid(l)			lfirst_oid(lnext(list_head(l)))
+#define lsecond_node(type,l)	castNode(type, lsecond(l))
 
 #define lthird(l)				lfirst(lnext(lnext(list_head(l))))
 #define lthird_int(l)			lfirst_int(lnext(lnext(list_head(l))))
 #define lthird_oid(l)			lfirst_oid(lnext(lnext(list_head(l))))
+#define lthird_node(type,l)		castNode(type, lthird(l))
 
 #define lfourth(l)				lfirst(lnext(lnext(lnext(list_head(l)))))
 #define lfourth_int(l)			lfirst_int(lnext(lnext(lnext(list_head(l)))))
 #define lfourth_oid(l)			lfirst_oid(lnext(lnext(lnext(list_head(l)))))
+#define lfourth_node(type,l)	castNode(type, lfourth(l))
 
 #define llast(l)				lfirst(list_tail(l))
 #define llast_int(l)			lfirst_int(list_tail(l))
 #define llast_oid(l)			lfirst_oid(list_tail(l))
+#define llast_node(type,l)		castNode(type, llast(l))
 
 /*
  * Convenience macros for building fixed-length lists
@@ -210,6 +216,7 @@
 extern void *list_nth(const List *list, int n);
 extern int	list_nth_int(const List *list, int n);
 extern Oid	list_nth_oid(const List *list, int n);
+#define list_nth_node(type,list,n)	castNode(type, list_nth(list, n))
 
 extern bool list_member(const List *list, const void *datum);
 extern bool list_member_ptr(const List *list, const void *datum);
diff -Nru postgresql-9.5-9.5.2/src/include/nodes/plannodes.h postgresql-9.5-9.5.8/src/include/nodes/plannodes.h
--- postgresql-9.5-9.5.2/src/include/nodes/plannodes.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/nodes/plannodes.h	2017-08-07 21:13:41.000000000 +0000
@@ -721,6 +721,8 @@
 	AttrNumber *grpColIdx;		/* their indexes in the target list */
 	Oid		   *grpOperators;	/* equality operators to compare with */
 	long		numGroups;		/* estimated number of groups in input */
+	Bitmapset  *aggParams;		/* IDs of Params used in Aggref inputs */
+	/* Note: planner provides numGroups & aggParams only in AGG_HASHED case */
 	List	   *groupingSets;	/* grouping sets to use */
 	List	   *chain;			/* chained Agg/Sort nodes */
 } Agg;
diff -Nru postgresql-9.5-9.5.2/src/include/nodes/primnodes.h postgresql-9.5-9.5.8/src/include/nodes/primnodes.h
--- postgresql-9.5-9.5.2/src/include/nodes/primnodes.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/nodes/primnodes.h	2017-08-07 21:13:41.000000000 +0000
@@ -1076,8 +1076,16 @@
  * NullTest represents the operation of testing a value for NULLness.
  * The appropriate test is performed and returned as a boolean Datum.
  *
- * NOTE: the semantics of this for rowtype inputs are noticeably different
- * from the scalar case.  We provide an "argisrow" flag to reflect that.
+ * When argisrow is false, this simply represents a test for the null value.
+ *
+ * When argisrow is true, the input expression must yield a rowtype, and
+ * the node implements "row IS [NOT] NULL" per the SQL standard.  This
+ * includes checking individual fields for NULLness when the row datum
+ * itself isn't NULL.
+ *
+ * NOTE: the combination of a rowtype input and argisrow==false does NOT
+ * correspond to the SQL notation "row IS [NOT] NULL"; instead, this case
+ * represents the SQL notation "row IS [NOT] DISTINCT FROM NULL".
  * ----------------
  */
 
@@ -1091,7 +1099,7 @@
 	Expr		xpr;
 	Expr	   *arg;			/* input expression */
 	NullTestType nulltesttype;	/* IS NULL, IS NOT NULL */
-	bool		argisrow;		/* T if input is of a composite type */
+	bool		argisrow;		/* T to perform field-by-field null checks */
 	int			location;		/* token location, or -1 if unknown */
 } NullTest;
 
diff -Nru postgresql-9.5-9.5.2/src/include/optimizer/paths.h postgresql-9.5-9.5.8/src/include/optimizer/paths.h
--- postgresql-9.5-9.5.2/src/include/optimizer/paths.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/optimizer/paths.h	2017-08-07 21:13:41.000000000 +0000
@@ -130,6 +130,11 @@
 								 Relids join_relids,
 								 Relids outer_relids,
 								 RelOptInfo *inner_rel);
+extern List *generate_join_implied_equalities_for_ecs(PlannerInfo *root,
+										 List *eclasses,
+										 Relids join_relids,
+										 Relids outer_relids,
+										 RelOptInfo *inner_rel);
 extern bool exprs_known_equal(PlannerInfo *root, Node *item1, Node *item2);
 extern void add_child_rel_equivalences(PlannerInfo *root,
 						   AppendRelInfo *appinfo,
diff -Nru postgresql-9.5-9.5.2/src/include/pg_config.h.in postgresql-9.5-9.5.8/src/include/pg_config.h.in
--- postgresql-9.5-9.5.2/src/include/pg_config.h.in	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/pg_config.h.in	2017-08-07 21:13:41.000000000 +0000
@@ -84,12 +84,21 @@
 /* Define to 1 if you have the `append_history' function. */
 #undef HAVE_APPEND_HISTORY
 
+/* Define to 1 if you have the `ASN1_STRING_get0_data' function. */
+#undef HAVE_ASN1_STRING_GET0_DATA
+
 /* Define to 1 if you want to use atomics if available. */
 #undef HAVE_ATOMICS
 
 /* Define to 1 if you have the <atomic.h> header file. */
 #undef HAVE_ATOMIC_H
 
+/* Define to 1 if you have the `BIO_get_data' function. */
+#undef HAVE_BIO_GET_DATA
+
+/* Define to 1 if you have the `BIO_meth_new' function. */
+#undef HAVE_BIO_METH_NEW
+
 /* Define to 1 if you have the `cbrt' function. */
 #undef HAVE_CBRT
 
@@ -102,6 +111,9 @@
 /* Define to 1 if you have the `crypt' function. */
 #undef HAVE_CRYPT
 
+/* Define to 1 if you have the `CRYPTO_lock' function. */
+#undef HAVE_CRYPTO_LOCK
+
 /* Define to 1 if you have the <crypt.h> header file. */
 #undef HAVE_CRYPT_H
 
@@ -364,6 +376,9 @@
 /* Define to 1 if you have the <net/if.h> header file. */
 #undef HAVE_NET_IF_H
 
+/* Define to 1 if you have the `OPENSSL_init_ssl' function. */
+#undef HAVE_OPENSSL_INIT_SSL
+
 /* Define to 1 if you have the <ossp/uuid.h> header file. */
 #undef HAVE_OSSP_UUID_H
 
@@ -400,6 +415,9 @@
 /* Define to 1 if you have the `random' function. */
 #undef HAVE_RANDOM
 
+/* Define to 1 if you have the `RAND_OpenSSL' function. */
+#undef HAVE_RAND_OPENSSL
+
 /* Define to 1 if you have the <readline.h> header file. */
 #undef HAVE_READLINE_H
 
diff -Nru postgresql-9.5-9.5.2/src/include/pg_config.h.win32 postgresql-9.5-9.5.8/src/include/pg_config.h.win32
--- postgresql-9.5-9.5.2/src/include/pg_config.h.win32	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/pg_config.h.win32	2017-08-07 21:13:41.000000000 +0000
@@ -563,10 +563,10 @@
 #define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 9.5.2"
+#define PACKAGE_STRING "PostgreSQL 9.5.8"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "9.5.2"
+#define PACKAGE_VERSION "9.5.8"
 
 /* Define to the name of a signed 128-bit integer type. */
 #undef PG_INT128_TYPE
@@ -575,10 +575,10 @@
 #define PG_INT64_TYPE long long int
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "9.5.2"
+#define PG_VERSION "9.5.8"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 90502
+#define PG_VERSION_NUM 90508
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "postgresql"
diff -Nru postgresql-9.5-9.5.2/src/include/pg_config_manual.h postgresql-9.5-9.5.8/src/include/pg_config_manual.h
--- postgresql-9.5-9.5.2/src/include/pg_config_manual.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/pg_config_manual.h	2017-08-07 21:13:41.000000000 +0000
@@ -62,7 +62,7 @@
  * may improve performance, but supplying a real spinlock implementation is
  * probably far better.
  */
-#define NUM_SPINLOCK_SEMAPHORES		1024
+#define NUM_SPINLOCK_SEMAPHORES		128
 
 /*
  * When we have neither spinlocks nor atomic operations support we're
diff -Nru postgresql-9.5-9.5.2/src/include/pgstat.h postgresql-9.5-9.5.8/src/include/pgstat.h
--- postgresql-9.5-9.5.2/src/include/pgstat.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/pgstat.h	2017-08-07 21:13:41.000000000 +0000
@@ -218,7 +218,20 @@
 
 /* ----------
  * PgStat_MsgInquiry			Sent by a backend to ask the collector
- *								to write the stats file.
+ *								to write the stats file(s).
+ *
+ * Ordinarily, an inquiry message prompts writing of the global stats file,
+ * the stats file for shared catalogs, and the stats file for the specified
+ * database.  If databaseid is InvalidOid, only the first two are written.
+ *
+ * New file(s) will be written only if the existing file has a timestamp
+ * older than the specified cutoff_time; this prevents duplicated effort
+ * when multiple requests arrive at nearly the same time, assuming that
+ * backends send requests with cutoff_times a little bit in the past.
+ *
+ * clock_time should be the requestor's current local time; the collector
+ * uses this to check for the system clock going backward, but it has no
+ * effect unless that occurs.  We assume clock_time >= cutoff_time, though.
  * ----------
  */
 
@@ -227,7 +240,7 @@
 	PgStat_MsgHdr m_hdr;
 	TimestampTz clock_time;		/* observed local clock time */
 	TimestampTz cutoff_time;	/* minimum acceptable file timestamp */
-	Oid			databaseid;		/* requested DB (InvalidOid => all DBs) */
+	Oid			databaseid;		/* requested DB (InvalidOid => shared only) */
 } PgStat_MsgInquiry;
 
 
@@ -369,6 +382,7 @@
 	Oid			m_databaseid;
 	Oid			m_tableoid;
 	bool		m_autovacuum;
+	bool		m_resetcounter;
 	TimestampTz m_analyzetime;
 	PgStat_Counter m_live_tuples;
 	PgStat_Counter m_dead_tuples;
@@ -919,7 +933,8 @@
 extern void pgstat_report_vacuum(Oid tableoid, bool shared,
 					 PgStat_Counter livetuples, PgStat_Counter deadtuples);
 extern void pgstat_report_analyze(Relation rel,
-					  PgStat_Counter livetuples, PgStat_Counter deadtuples);
+					  PgStat_Counter livetuples, PgStat_Counter deadtuples,
+					  bool resetcounter);
 
 extern void pgstat_report_recovery_conflict(int reason);
 extern void pgstat_report_deadlock(void);
diff -Nru postgresql-9.5-9.5.2/src/include/port/atomics/fallback.h postgresql-9.5-9.5.8/src/include/port/atomics/fallback.h
--- postgresql-9.5-9.5.2/src/include/port/atomics/fallback.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/port/atomics/fallback.h	2017-08-07 21:13:41.000000000 +0000
@@ -135,6 +135,9 @@
 #define PG_HAVE_ATOMIC_INIT_U32
 extern void pg_atomic_init_u32_impl(volatile pg_atomic_uint32 *ptr, uint32 val_);
 
+#define PG_HAVE_ATOMIC_WRITE_U32
+extern void pg_atomic_write_u32_impl(volatile pg_atomic_uint32 *ptr, uint32 val);
+
 #define PG_HAVE_ATOMIC_COMPARE_EXCHANGE_U32
 extern bool pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
 												uint32 *expected, uint32 newval);
diff -Nru postgresql-9.5-9.5.2/src/include/port/atomics/generic-gcc.h postgresql-9.5-9.5.8/src/include/port/atomics/generic-gcc.h
--- postgresql-9.5-9.5.2/src/include/port/atomics/generic-gcc.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/port/atomics/generic-gcc.h	2017-08-07 21:13:41.000000000 +0000
@@ -66,12 +66,15 @@
 #define PG_HAVE_ATOMIC_FLAG_SUPPORT
 typedef struct pg_atomic_flag
 {
-	/* some platforms only have a 8 bit wide TAS */
-#ifdef HAVE_GCC__SYNC_CHAR_TAS
-	volatile char value;
-#else
-	/* but an int works on more platforms */
+	/*
+	 * If we have a choice, use int-width TAS, because that is more efficient
+	 * and/or more reliably implemented on most non-Intel platforms.  (Note
+	 * that this code isn't used on x86[_64]; see arch-x86.h for that.)
+	 */
+#ifdef HAVE_GCC__SYNC_INT32_TAS
 	volatile int value;
+#else
+	volatile char value;
 #endif
 } pg_atomic_flag;
 
diff -Nru postgresql-9.5-9.5.2/src/include/port/atomics/generic.h postgresql-9.5-9.5.8/src/include/port/atomics/generic.h
--- postgresql-9.5-9.5.2/src/include/port/atomics/generic.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/port/atomics/generic.h	2017-08-07 21:13:41.000000000 +0000
@@ -60,6 +60,15 @@
 }
 #endif
 
+#ifndef PG_HAVE_ATOMIC_UNLOCKED_WRITE_U32
+#define PG_HAVE_ATOMIC_UNLOCKED_WRITE_U32
+static inline void
+pg_atomic_unlocked_write_u32_impl(volatile pg_atomic_uint32 *ptr, uint32 val)
+{
+	ptr->value = val;
+}
+#endif
+
 /*
  * provide fallback for test_and_set using atomic_exchange if available
  */
diff -Nru postgresql-9.5-9.5.2/src/include/port/atomics/generic-xlc.h postgresql-9.5-9.5.8/src/include/port/atomics/generic-xlc.h
--- postgresql-9.5-9.5.2/src/include/port/atomics/generic-xlc.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/port/atomics/generic-xlc.h	2017-08-07 21:13:41.000000000 +0000
@@ -46,12 +46,22 @@
 pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
 									uint32 *expected, uint32 newval)
 {
+	bool		ret;
+
+	/*
+	 * atomics.h specifies sequential consistency ("full barrier semantics")
+	 * for this interface.  Since "lwsync" provides acquire/release
+	 * consistency only, do not use it here.  GCC atomics observe the same
+	 * restriction; see its rs6000_pre_atomic_barrier().
+	 */
+	__asm__ __volatile__ ("	sync \n" ::: "memory");
+
 	/*
 	 * XXX: __compare_and_swap is defined to take signed parameters, but that
 	 * shouldn't matter since we don't perform any arithmetic operations.
 	 */
-	bool		ret = __compare_and_swap((volatile int*)&ptr->value,
-										 (int *)expected, (int)newval);
+	ret = __compare_and_swap((volatile int*)&ptr->value,
+							 (int *)expected, (int)newval);
 
 	/*
 	 * xlc's documentation tells us:
@@ -69,6 +79,10 @@
 static inline uint32
 pg_atomic_fetch_add_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_)
 {
+	/*
+	 * __fetch_and_add() emits a leading "sync" and trailing "isync", thereby
+	 * providing sequential consistency.  This is undocumented.
+	 */
 	return __fetch_and_add((volatile int *)&ptr->value, add_);
 }
 
@@ -79,8 +93,12 @@
 pg_atomic_compare_exchange_u64_impl(volatile pg_atomic_uint64 *ptr,
 									uint64 *expected, uint64 newval)
 {
-	bool		ret = __compare_and_swaplp((volatile long*)&ptr->value,
-										   (long *)expected, (long)newval);
+	bool		ret;
+
+	__asm__ __volatile__ ("	sync \n" ::: "memory");
+
+	ret = __compare_and_swaplp((volatile long*)&ptr->value,
+							   (long *)expected, (long)newval);
 
 	__isync();
 
diff -Nru postgresql-9.5-9.5.2/src/include/port/atomics.h postgresql-9.5-9.5.8/src/include/port/atomics.h
--- postgresql-9.5-9.5.2/src/include/port/atomics.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/port/atomics.h	2017-08-07 21:13:41.000000000 +0000
@@ -297,10 +297,12 @@
 }
 
 /*
- * pg_atomic_write_u32 - unlocked write to atomic variable.
+ * pg_atomic_write_u32 - write to atomic variable.
  *
  * The write is guaranteed to succeed as a whole, i.e. it's not possible to
- * observe a partial write for any reader.
+ * observe a partial write for any reader.  Note that this correctly interacts
+ * with pg_atomic_compare_exchange_u32, in contrast to
+ * pg_atomic_unlocked_write_u32().
  *
  * No barrier semantics.
  */
@@ -313,6 +315,25 @@
 }
 
 /*
+ * pg_atomic_unlocked_write_u32 - unlocked write to atomic variable.
+ *
+ * The write is guaranteed to succeed as a whole, i.e. it's not possible to
+ * observe a partial write for any reader.  But note that writing this way is
+ * not guaranteed to correctly interact with read-modify-write operations like
+ * pg_atomic_compare_exchange_u32.  This should only be used in cases where
+ * minor performance regressions due to atomics emulation are unacceptable.
+ *
+ * No barrier semantics.
+ */
+static inline void
+pg_atomic_unlocked_write_u32(volatile pg_atomic_uint32 *ptr, uint32 val)
+{
+	AssertPointerAlignment(ptr, 4);
+
+	pg_atomic_unlocked_write_u32_impl(ptr, val);
+}
+
+/*
  * pg_atomic_exchange_u32 - exchange newval with current value
  *
  * Returns the old value of 'ptr' before the swap.
diff -Nru postgresql-9.5-9.5.2/src/include/port/win32.h postgresql-9.5-9.5.8/src/include/port/win32.h
--- postgresql-9.5-9.5.2/src/include/port/win32.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/port/win32.h	2017-08-07 21:13:41.000000000 +0000
@@ -6,14 +6,28 @@
 
 /*
  * Make sure _WIN32_WINNT has the minimum required value.
- * Leave a higher value in place.
-*/
-#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0501
+ * Leave a higher value in place. When building with at least Visual
+ * Studio 2015 the minimum requirement is Windows Vista (0x0600) to
+ * get support for GetLocaleInfoEx() with locales. For everything else
+ * the minumum version is Windows XP (0x0501).
+ * Also for VS2015, add a define that stops compiler complaints about
+ * using the old Winsock API.
+ */
+#if defined(_MSC_VER) && _MSC_VER >= 1900
+#define  _WINSOCK_DEPRECATED_NO_WARNINGS
+#define MIN_WINNT 0x0600
+#else
+#define MIN_WINNT 0x0501
+#endif
+
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < MIN_WINNT
 #undef _WIN32_WINNT
 #endif
+
 #ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT MIN_WINNT
 #endif
+
 /*
  * Always build with SSPI support. Keep it as a #define in case
  * we want a switch to disable it sometime in the future.
@@ -267,51 +281,50 @@
 
 /*
  * Supplement to <errno.h>.
+ *
+ * We redefine network-related Berkeley error symbols as the corresponding WSA
+ * constants.  This allows elog.c to recognize them as being in the Winsock
+ * error code range and pass them off to pgwin32_socket_strerror(), since
+ * Windows' version of plain strerror() won't cope.  Note that this will break
+ * if these names are used for anything else besides Windows Sockets errors.
+ * See TranslateSocketError() when changing this list.
  */
 #undef EAGAIN
+#define EAGAIN WSAEWOULDBLOCK
 #undef EINTR
 #define EINTR WSAEINTR
-#define EAGAIN WSAEWOULDBLOCK
 #undef EMSGSIZE
 #define EMSGSIZE WSAEMSGSIZE
 #undef EAFNOSUPPORT
 #define EAFNOSUPPORT WSAEAFNOSUPPORT
 #undef EWOULDBLOCK
 #define EWOULDBLOCK WSAEWOULDBLOCK
+#undef ECONNABORTED
+#define ECONNABORTED WSAECONNABORTED
 #undef ECONNRESET
 #define ECONNRESET WSAECONNRESET
 #undef EINPROGRESS
 #define EINPROGRESS WSAEINPROGRESS
+#undef EISCONN
+#define EISCONN WSAEISCONN
 #undef ENOBUFS
 #define ENOBUFS WSAENOBUFS
 #undef EPROTONOSUPPORT
 #define EPROTONOSUPPORT WSAEPROTONOSUPPORT
 #undef ECONNREFUSED
 #define ECONNREFUSED WSAECONNREFUSED
-#undef EBADFD
-#define EBADFD WSAENOTSOCK
+#undef ENOTSOCK
+#define ENOTSOCK WSAENOTSOCK
 #undef EOPNOTSUPP
 #define EOPNOTSUPP WSAEOPNOTSUPP
-
-/*
- * For Microsoft Visual Studio 2010 and above we intentionally redefine
- * the regular Berkeley error constants and set them to the WSA constants.
- * Note that this will break if those constants are used for anything else
- * than Windows Sockets errors.
- */
-#if _MSC_VER >= 1600
-#pragma warning(disable:4005)
-#define EMSGSIZE WSAEMSGSIZE
-#define EAFNOSUPPORT WSAEAFNOSUPPORT
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
-#define ECONNRESET WSAECONNRESET
-#define EINPROGRESS WSAEINPROGRESS
-#define ENOBUFS WSAENOBUFS
-#define ECONNREFUSED WSAECONNREFUSED
-#define EOPNOTSUPP WSAEOPNOTSUPP
-#pragma warning(default:4005)
-#endif
+#undef EADDRINUSE
+#define EADDRINUSE WSAEADDRINUSE
+#undef EADDRNOTAVAIL
+#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+#undef EHOSTUNREACH
+#define EHOSTUNREACH WSAEHOSTUNREACH
+#undef ENOTCONN
+#define ENOTCONN WSAENOTCONN
 
 /*
  * Extended locale functions with gratuitous underscore prefixes.
@@ -364,6 +377,8 @@
 /* In backend/port/win32/socket.c */
 #ifndef FRONTEND
 #define socket(af, type, protocol) pgwin32_socket(af, type, protocol)
+#define bind(s, addr, addrlen) pgwin32_bind(s, addr, addrlen)
+#define listen(s, backlog) pgwin32_listen(s, backlog)
 #define accept(s, addr, addrlen) pgwin32_accept(s, addr, addrlen)
 #define connect(s, name, namelen) pgwin32_connect(s, name, namelen)
 #define select(n, r, w, e, timeout) pgwin32_select(n, r, w, e, timeout)
@@ -371,6 +386,8 @@
 #define send(s, buf, len, flags) pgwin32_send(s, buf, len, flags)
 
 SOCKET		pgwin32_socket(int af, int type, int protocol);
+int			pgwin32_bind(SOCKET s, struct sockaddr * addr, int addrlen);
+int			pgwin32_listen(SOCKET s, int backlog);
 SOCKET		pgwin32_accept(SOCKET s, struct sockaddr * addr, int *addrlen);
 int			pgwin32_connect(SOCKET s, const struct sockaddr * name, int namelen);
 int			pgwin32_select(int nfds, fd_set *readfs, fd_set *writefds, fd_set *exceptfds, const struct timeval * timeout);
diff -Nru postgresql-9.5-9.5.2/src/include/postgres.h postgresql-9.5-9.5.8/src/include/postgres.h
--- postgresql-9.5-9.5.2/src/include/postgres.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/postgres.h	2017-08-07 21:13:41.000000000 +0000
@@ -398,7 +398,7 @@
  * the left of the width of bool, per comment above.
  */
 
-#define DatumGetBool(X) ((bool) (((bool) (X)) != 0))
+#define DatumGetBool(X) ((bool) (GET_1_BYTE(X) != 0))
 
 /*
  * BoolGetDatum
diff -Nru postgresql-9.5-9.5.2/src/include/replication/logical.h postgresql-9.5-9.5.8/src/include/replication/logical.h
--- postgresql-9.5-9.5.2/src/include/replication/logical.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/replication/logical.h	2017-08-07 21:13:41.000000000 +0000
@@ -79,6 +79,7 @@
 
 extern LogicalDecodingContext *CreateInitDecodingContext(char *plugin,
 						  List *output_plugin_options,
+						  bool need_full_snapshot,
 						  XLogPageReadCB read_page,
 						  LogicalOutputPluginWriterPrepareWrite prepare_write,
 						  LogicalOutputPluginWriterWrite do_write);
diff -Nru postgresql-9.5-9.5.2/src/include/replication/output_plugin.h postgresql-9.5-9.5.8/src/include/replication/output_plugin.h
--- postgresql-9.5-9.5.2/src/include/replication/output_plugin.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/replication/output_plugin.h	2017-08-07 21:13:41.000000000 +0000
@@ -41,51 +41,42 @@
  * "is_init" will be set to "true" if the decoding slot just got defined. When
  * the same slot is used from there one, it will be "false".
  */
-typedef void (*LogicalDecodeStartupCB) (
-										  struct LogicalDecodingContext *ctx,
+typedef void (*LogicalDecodeStartupCB) (struct LogicalDecodingContext *ctx,
 												OutputPluginOptions *options,
-													bool is_init
-);
+													bool is_init);
 
 /*
  * Callback called for every (explicit or implicit) BEGIN of a successful
  * transaction.
  */
-typedef void (*LogicalDecodeBeginCB) (
-											 struct LogicalDecodingContext *,
+typedef void (*LogicalDecodeBeginCB) (struct LogicalDecodingContext *ctx,
 												  ReorderBufferTXN *txn);
 
 /*
  * Callback for every individual change in a successful transaction.
  */
-typedef void (*LogicalDecodeChangeCB) (
-											 struct LogicalDecodingContext *,
+typedef void (*LogicalDecodeChangeCB) (struct LogicalDecodingContext *ctx,
 												   ReorderBufferTXN *txn,
 												   Relation relation,
-												   ReorderBufferChange *change
-);
+												ReorderBufferChange *change);
 
 /*
  * Called for every (explicit or implicit) COMMIT of a successful transaction.
  */
-typedef void (*LogicalDecodeCommitCB) (
-											 struct LogicalDecodingContext *,
+typedef void (*LogicalDecodeCommitCB) (struct LogicalDecodingContext *ctx,
 												   ReorderBufferTXN *txn,
 												   XLogRecPtr commit_lsn);
 
 /*
  * Filter changes by origin.
  */
-typedef bool (*LogicalDecodeFilterByOriginCB) (
-											 struct LogicalDecodingContext *,
+typedef bool (*LogicalDecodeFilterByOriginCB) (struct LogicalDecodingContext *ctx,
 													  RepOriginId origin_id);
 
 /*
  * Called to shutdown an output plugin.
  */
-typedef void (*LogicalDecodeShutdownCB) (
-											  struct LogicalDecodingContext *
-);
+typedef void (*LogicalDecodeShutdownCB) (struct LogicalDecodingContext *ctx);
 
 /*
  * Output plugin callbacks
@@ -100,7 +91,8 @@
 	LogicalDecodeShutdownCB shutdown_cb;
 } OutputPluginCallbacks;
 
-void		OutputPluginPrepareWrite(struct LogicalDecodingContext *ctx, bool last_write);
-void		OutputPluginWrite(struct LogicalDecodingContext *ctx, bool last_write);
+/* Functions in replication/logical/logical.c */
+extern void OutputPluginPrepareWrite(struct LogicalDecodingContext *ctx, bool last_write);
+extern void OutputPluginWrite(struct LogicalDecodingContext *ctx, bool last_write);
 
 #endif   /* OUTPUT_PLUGIN_H */
diff -Nru postgresql-9.5-9.5.2/src/include/replication/reorderbuffer.h postgresql-9.5-9.5.8/src/include/replication/reorderbuffer.h
--- postgresql-9.5-9.5.2/src/include/replication/reorderbuffer.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/replication/reorderbuffer.h	2017-08-07 21:13:41.000000000 +0000
@@ -207,6 +207,15 @@
 	uint64		nentries_mem;
 
 	/*
+	 * Has this transaction been spilled to disk?  It's not always possible to
+	 * deduce that fact by comparing nentries with nentries_mem, because
+	 * e.g. subtransactions of a large transaction might get serialized
+	 * together with the parent - if they're restored to memory they'd have
+	 * nentries_mem == nentries.
+	 */
+	bool		serialized;
+
+	/*
 	 * List of ReorderBufferChange structs, including new Snapshots and new
 	 * CommandIds
 	 */
diff -Nru postgresql-9.5-9.5.2/src/include/replication/snapbuild.h postgresql-9.5-9.5.8/src/include/replication/snapbuild.h
--- postgresql-9.5-9.5.2/src/include/replication/snapbuild.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/replication/snapbuild.h	2017-08-07 21:13:41.000000000 +0000
@@ -20,24 +20,30 @@
 	/*
 	 * Initial state, we can't do much yet.
 	 */
-	SNAPBUILD_START,
+	SNAPBUILD_START = -1,
+
+	/*
+	 * Collecting committed transactions, to build the initial catalog
+	 * snapshot.
+	 */
+	SNAPBUILD_BUILDING_SNAPSHOT = 0,
 
 	/*
 	 * We have collected enough information to decode tuples in transactions
 	 * that started after this.
 	 *
 	 * Once we reached this we start to collect changes. We cannot apply them
-	 * yet because the might be based on transactions that were still running
-	 * when we reached them yet.
+	 * yet, because they might be based on transactions that were still running
+	 * when FULL_SNAPSHOT was reached.
 	 */
-	SNAPBUILD_FULL_SNAPSHOT,
+	SNAPBUILD_FULL_SNAPSHOT = 1,
 
 	/*
-	 * Found a point after hitting built_full_snapshot where all transactions
-	 * that were running at that point finished. Till we reach that we hold
-	 * off calling any commit callbacks.
+	 * Found a point after SNAPBUILD_FULL_SNAPSHOT where all transactions that
+	 * were running at that point finished. Till we reach that we hold off
+	 * calling any commit callbacks.
 	 */
-	SNAPBUILD_CONSISTENT
+	SNAPBUILD_CONSISTENT = 2
 } SnapBuildState;
 
 /* forward declare so we don't have to expose the struct to the public */
@@ -54,7 +60,8 @@
 extern void CheckPointSnapBuild(void);
 
 extern SnapBuild *AllocateSnapshotBuilder(struct ReorderBuffer *cache,
-						TransactionId xmin_horizon, XLogRecPtr start_lsn);
+						TransactionId xmin_horizon, XLogRecPtr start_lsn,
+						bool need_full_snapshot);
 extern void FreeSnapshotBuilder(SnapBuild *cache);
 
 extern void SnapBuildSnapDecRefcount(Snapshot snap);
@@ -69,9 +76,6 @@
 extern void SnapBuildCommitTxn(SnapBuild *builder, XLogRecPtr lsn,
 				   TransactionId xid, int nsubxacts,
 				   TransactionId *subxacts);
-extern void SnapBuildAbortTxn(SnapBuild *builder, XLogRecPtr lsn,
-				  TransactionId xid, int nsubxacts,
-				  TransactionId *subxacts);
 extern bool SnapBuildProcessChange(SnapBuild *builder, TransactionId xid,
 					   XLogRecPtr lsn);
 extern void SnapBuildProcessNewCid(SnapBuild *builder, TransactionId xid,
diff -Nru postgresql-9.5-9.5.2/src/include/replication/walsender.h postgresql-9.5-9.5.8/src/include/replication/walsender.h
--- postgresql-9.5-9.5.2/src/include/replication/walsender.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/replication/walsender.h	2017-08-07 21:13:41.000000000 +0000
@@ -34,6 +34,9 @@
 extern Size WalSndShmemSize(void);
 extern void WalSndShmemInit(void);
 extern void WalSndWakeup(void);
+extern void WalSndInitStopping(void);
+extern void WalSndWaitStopping(void);
+extern void HandleWalSndInitStopping(void);
 extern void WalSndRqstFileReload(void);
 
 extern Datum pg_stat_get_wal_senders(PG_FUNCTION_ARGS);
diff -Nru postgresql-9.5-9.5.2/src/include/replication/walsender_private.h postgresql-9.5-9.5.8/src/include/replication/walsender_private.h
--- postgresql-9.5-9.5.2/src/include/replication/walsender_private.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/replication/walsender_private.h	2017-08-07 21:13:41.000000000 +0000
@@ -24,7 +24,8 @@
 	WALSNDSTATE_STARTUP = 0,
 	WALSNDSTATE_BACKUP,
 	WALSNDSTATE_CATCHUP,
-	WALSNDSTATE_STREAMING
+	WALSNDSTATE_STREAMING,
+	WALSNDSTATE_STOPPING
 } WalSndState;
 
 /*
diff -Nru postgresql-9.5-9.5.2/src/include/storage/buf_internals.h postgresql-9.5-9.5.8/src/include/storage/buf_internals.h
--- postgresql-9.5-9.5.2/src/include/storage/buf_internals.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/storage/buf_internals.h	2017-08-07 21:13:41.000000000 +0000
@@ -39,7 +39,7 @@
 #define BM_PIN_COUNT_WAITER		(1 << 6)		/* have waiter for sole pin */
 #define BM_CHECKPOINT_NEEDED	(1 << 7)		/* must write for checkpoint */
 #define BM_PERMANENT			(1 << 8)		/* permanent relation (not
-												 * unlogged) */
+												 * unlogged, or init fork) */
 
 typedef bits16 BufFlags;
 
diff -Nru postgresql-9.5-9.5.2/src/include/storage/bufpage.h postgresql-9.5-9.5.8/src/include/storage/bufpage.h
--- postgresql-9.5-9.5.2/src/include/storage/bufpage.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/storage/bufpage.h	2017-08-07 21:13:41.000000000 +0000
@@ -390,11 +390,16 @@
  *		extern declarations
  * ----------------------------------------------------------------
  */
+#define PAI_OVERWRITE			(1 << 0)
+#define PAI_IS_HEAP				(1 << 1)
+#define PAI_ALLOW_FAR_OFFSET	(1 << 2)
 
 extern void PageInit(Page page, Size pageSize, Size specialSize);
 extern bool PageIsVerified(Page page, BlockNumber blkno);
 extern OffsetNumber PageAddItem(Page page, Item item, Size size,
 			OffsetNumber offsetNumber, bool overwrite, bool is_heap);
+extern OffsetNumber PageAddItemExtended(Page page, Item item, Size size,
+					OffsetNumber offsetNumber, int flags);
 extern Page PageGetTempPage(Page page);
 extern Page PageGetTempPageCopy(Page page);
 extern Page PageGetTempPageCopySpecial(Page page);
diff -Nru postgresql-9.5-9.5.2/src/include/storage/latch.h postgresql-9.5-9.5.8/src/include/storage/latch.h
--- postgresql-9.5-9.5.2/src/include/storage/latch.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/storage/latch.h	2017-08-07 21:13:41.000000000 +0000
@@ -52,6 +52,22 @@
  * do. Otherwise, if someone sets the latch between the check and the
  * ResetLatch call, you will miss it and Wait will incorrectly block.
  *
+ * Another valid coding pattern looks like:
+ *
+ * for (;;)
+ * {
+ *	   if (work to do)
+ *		   Do Stuff(); // in particular, exit loop if some condition satisfied
+ *	   WaitLatch();
+ *	   ResetLatch();
+ * }
+ *
+ * This is useful to reduce latch traffic if it's expected that the loop's
+ * termination condition will often be satisfied in the first iteration;
+ * the cost is an extra loop iteration before blocking when it is not.
+ * What must be avoided is placing any checks for asynchronous events after
+ * WaitLatch and before ResetLatch, as that creates a race condition.
+ *
  * 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
diff -Nru postgresql-9.5-9.5.2/src/include/storage/procarray.h postgresql-9.5-9.5.8/src/include/storage/procarray.h
--- postgresql-9.5-9.5.2/src/include/storage/procarray.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/storage/procarray.h	2017-08-07 21:13:41.000000000 +0000
@@ -54,7 +54,7 @@
 extern bool TransactionIdIsActive(TransactionId xid);
 extern TransactionId GetOldestXmin(Relation rel, bool ignoreVacuum);
 extern TransactionId GetOldestActiveTransactionId(void);
-extern TransactionId GetOldestSafeDecodingTransactionId(void);
+extern TransactionId GetOldestSafeDecodingTransactionId(bool catalogOnly);
 
 extern VirtualTransactionId *GetVirtualXIDsDelayingChkpt(int *nvxids);
 extern bool HaveVirtualXIDsDelayingChkpt(VirtualTransactionId *vxids, int nvxids);
diff -Nru postgresql-9.5-9.5.2/src/include/storage/procsignal.h postgresql-9.5-9.5.8/src/include/storage/procsignal.h
--- postgresql-9.5-9.5.2/src/include/storage/procsignal.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/storage/procsignal.h	2017-08-07 21:13:41.000000000 +0000
@@ -32,6 +32,7 @@
 	PROCSIG_CATCHUP_INTERRUPT,	/* sinval catchup interrupt */
 	PROCSIG_NOTIFY_INTERRUPT,	/* listen/notify interrupt */
 	PROCSIG_PARALLEL_MESSAGE,	/* message from cooperating parallel backend */
+	PROCSIG_WALSND_INIT_STOPPING,	/* ask walsenders to prepare for shutdown  */
 
 	/* Recovery conflict reasons */
 	PROCSIG_RECOVERY_CONFLICT_DATABASE,
diff -Nru postgresql-9.5-9.5.2/src/include/storage/s_lock.h postgresql-9.5-9.5.8/src/include/storage/s_lock.h
--- postgresql-9.5-9.5.2/src/include/storage/s_lock.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/storage/s_lock.h	2017-08-07 21:13:41.000000000 +0000
@@ -856,7 +856,7 @@
 #define SPIN_DELAY() spin_delay()
 
 /* If using Visual C++ on Win64, inline assembly is unavailable.
- * Use a _mm_pause instrinsic instead of rep nop.
+ * Use a _mm_pause intrinsic instead of rep nop.
  */
 #if defined(_WIN64)
 static __forceinline void
diff -Nru postgresql-9.5-9.5.2/src/include/tcop/fastpath.h postgresql-9.5-9.5.8/src/include/tcop/fastpath.h
--- postgresql-9.5-9.5.2/src/include/tcop/fastpath.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/tcop/fastpath.h	2017-08-07 21:13:41.000000000 +0000
@@ -16,6 +16,6 @@
 #include "lib/stringinfo.h"
 
 extern int	GetOldFunctionMessage(StringInfo buf);
-extern int	HandleFunctionRequest(StringInfo msgBuf);
+extern void HandleFunctionRequest(StringInfo msgBuf);
 
 #endif   /* FASTPATH_H */
diff -Nru postgresql-9.5-9.5.2/src/include/utils/array.h postgresql-9.5-9.5.8/src/include/utils/array.h
--- postgresql-9.5-9.5.2/src/include/utils/array.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/array.h	2017-08-07 21:13:41.000000000 +0000
@@ -36,7 +36,7 @@
  *
  * The OIDVECTOR and INT2VECTOR datatypes are storage-compatible with
  * generic arrays, but they support only one-dimensional arrays with no
- * nulls (and no null bitmap).
+ * nulls (and no null bitmap).  They don't support being toasted, either.
  *
  * There are also some "fixed-length array" datatypes, such as NAME and
  * POINT.  These are simply a sequence of a fixed number of items each
diff -Nru postgresql-9.5-9.5.2/src/include/utils/builtins.h postgresql-9.5-9.5.8/src/include/utils/builtins.h
--- postgresql-9.5-9.5.2/src/include/utils/builtins.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/builtins.h	2017-08-07 21:13:41.000000000 +0000
@@ -339,6 +339,8 @@
 extern double get_float8_nan(void);
 extern float get_float4_nan(void);
 extern int	is_infinite(double val);
+extern int	float4_cmp_internal(float4 a, float4 b);
+extern int	float8_cmp_internal(float8 a, float8 b);
 
 extern Datum float4in(PG_FUNCTION_ARGS);
 extern Datum float4out(PG_FUNCTION_ARGS);
diff -Nru postgresql-9.5-9.5.2/src/include/utils/catcache.h postgresql-9.5-9.5.8/src/include/utils/catcache.h
--- postgresql-9.5-9.5.2/src/include/utils/catcache.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/catcache.h	2017-08-07 21:13:41.000000000 +0000
@@ -185,7 +185,7 @@
 
 extern void ResetCatalogCaches(void);
 extern void CatalogCacheFlushCatalog(Oid catId);
-extern void CatalogCacheIdInvalidate(int cacheId, uint32 hashValue);
+extern void CatCacheInvalidate(CatCache *cache, uint32 hashValue);
 extern void PrepareToInvalidateCacheTuple(Relation relation,
 							  HeapTuple tuple,
 							  HeapTuple newtuple,
diff -Nru postgresql-9.5-9.5.2/src/include/utils/elog.h postgresql-9.5-9.5.8/src/include/utils/elog.h
--- postgresql-9.5-9.5.2/src/include/utils/elog.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/elog.h	2017-08-07 21:13:41.000000000 +0000
@@ -216,12 +216,13 @@
 #else							/* !HAVE__BUILTIN_CONSTANT_P */
 #define elog(elevel, ...)  \
 	do { \
-		int		elevel_; \
 		elog_start(__FILE__, __LINE__, PG_FUNCNAME_MACRO); \
-		elevel_ = (elevel); \
-		elog_finish(elevel_, __VA_ARGS__); \
-		if (elevel_ >= ERROR) \
-			pg_unreachable(); \
+		{ \
+			const int elevel_ = (elevel); \
+			elog_finish(elevel_, __VA_ARGS__); \
+			if (elevel_ >= ERROR) \
+				pg_unreachable(); \
+		} \
 	} while(0)
 #endif   /* HAVE__BUILTIN_CONSTANT_P */
 #else							/* !HAVE__VA_ARGS */
diff -Nru postgresql-9.5-9.5.2/src/include/utils/guc.h postgresql-9.5-9.5.8/src/include/utils/guc.h
--- postgresql-9.5-9.5.2/src/include/utils/guc.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/guc.h	2017-08-07 21:13:41.000000000 +0000
@@ -219,12 +219,12 @@
 #define GUC_UNIT_BLOCKS			0x2000	/* value is in blocks */
 #define GUC_UNIT_XBLOCKS		0x3000	/* value is in xlog blocks */
 #define GUC_UNIT_XSEGS			0x4000	/* value is in xlog segments */
-#define GUC_UNIT_MEMORY			0xF000	/* mask for KB, BLOCKS, XBLOCKS */
+#define GUC_UNIT_MEMORY			0xF000	/* mask for size-related units */
 
 #define GUC_UNIT_MS			   0x10000	/* value is in milliseconds */
 #define GUC_UNIT_S			   0x20000	/* value is in seconds */
 #define GUC_UNIT_MIN		   0x30000	/* value is in minutes */
-#define GUC_UNIT_TIME		   0xF0000	/* mask for MS, S, MIN */
+#define GUC_UNIT_TIME		   0xF0000	/* mask for time-related units */
 
 #define GUC_UNIT				(GUC_UNIT_MEMORY | GUC_UNIT_TIME)
 
diff -Nru postgresql-9.5-9.5.2/src/include/utils/numeric.h postgresql-9.5-9.5.8/src/include/utils/numeric.h
--- postgresql-9.5-9.5.2/src/include/utils/numeric.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/numeric.h	2017-08-07 21:13:41.000000000 +0000
@@ -17,8 +17,9 @@
 #include "fmgr.h"
 
 /*
- * Hardcoded precision limit - arbitrary, but must be small enough that
- * dscale values will fit in 14 bits.
+ * Limit on the precision (and hence scale) specifiable in a NUMERIC typmod.
+ * Note that the implementation limit on the length of a numeric value is
+ * much larger --- beware of what you use this for!
  */
 #define NUMERIC_MAX_PRECISION		1000
 
diff -Nru postgresql-9.5-9.5.2/src/include/utils/rel.h postgresql-9.5-9.5.8/src/include/utils/rel.h
--- postgresql-9.5-9.5.2/src/include/utils/rel.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/rel.h	2017-08-07 21:13:41.000000000 +0000
@@ -253,7 +253,9 @@
  *		from the pov of logical decoding.  Note multiple eval or argument!
  */
 #define RelationIsUsedAsCatalogTable(relation)	\
-	((relation)->rd_options ?				\
+	((relation)->rd_options && \
+	 ((relation)->rd_rel->relkind == RELKIND_RELATION || \
+	  (relation)->rd_rel->relkind == RELKIND_MATVIEW) ? \
 	 ((StdRdOptions *) (relation)->rd_options)->user_catalog_table : false)
 
 
diff -Nru postgresql-9.5-9.5.2/src/include/utils/selfuncs.h postgresql-9.5-9.5.8/src/include/utils/selfuncs.h
--- postgresql-9.5-9.5.2/src/include/utils/selfuncs.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/selfuncs.h	2017-08-07 21:13:41.000000000 +0000
@@ -75,6 +75,7 @@
 	Oid			atttype;		/* type to pass to get_attstatsslot */
 	int32		atttypmod;		/* typmod to pass to get_attstatsslot */
 	bool		isunique;		/* matches unique index or DISTINCT clause */
+	bool		acl_ok;			/* result of ACL check on table or column */
 } VariableStatData;
 
 #define ReleaseVariableStats(vardata)  \
@@ -111,6 +112,7 @@
 
 extern void examine_variable(PlannerInfo *root, Node *node, int varRelid,
 				 VariableStatData *vardata);
+extern bool statistic_proc_security_check(VariableStatData *vardata, Oid func_oid);
 extern bool get_restriction_variable(PlannerInfo *root, List *args,
 						 int varRelid,
 						 VariableStatData *vardata, Node **other,
diff -Nru postgresql-9.5-9.5.2/src/include/utils/snapmgr.h postgresql-9.5-9.5.8/src/include/utils/snapmgr.h
--- postgresql-9.5-9.5.2/src/include/utils/snapmgr.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/snapmgr.h	2017-08-07 21:13:41.000000000 +0000
@@ -32,6 +32,7 @@
 extern Snapshot GetCatalogSnapshot(Oid relid);
 extern Snapshot GetNonHistoricCatalogSnapshot(Oid relid);
 extern void InvalidateCatalogSnapshot(void);
+extern void InvalidateCatalogSnapshotConditionally(void);
 
 extern void PushActiveSnapshot(Snapshot snapshot);
 extern void PushCopiedSnapshot(Snapshot snapshot);
diff -Nru postgresql-9.5-9.5.2/src/include/utils/syscache.h postgresql-9.5-9.5.8/src/include/utils/syscache.h
--- postgresql-9.5-9.5.2/src/include/utils/syscache.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/syscache.h	2017-08-07 21:13:41.000000000 +0000
@@ -97,6 +97,8 @@
 	TYPEOID,
 	USERMAPPINGOID,
 	USERMAPPINGUSERSERVER
+
+#define SysCacheSize (USERMAPPINGUSERSERVER + 1)
 };
 
 extern void InitCatalogCache(void);
@@ -129,6 +131,8 @@
 extern struct catclist *SearchSysCacheList(int cacheId, int nkeys,
 				   Datum key1, Datum key2, Datum key3, Datum key4);
 
+extern void SysCacheInvalidate(int cacheId, uint32 hashValue);
+
 extern bool RelationInvalidatesSnapshotsOnly(Oid relid);
 extern bool RelationHasSysCache(Oid relid);
 extern bool RelationSupportsSysCache(Oid relid);
diff -Nru postgresql-9.5-9.5.2/src/include/utils/timeout.h postgresql-9.5-9.5.8/src/include/utils/timeout.h
--- postgresql-9.5-9.5.2/src/include/utils/timeout.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/timeout.h	2017-08-07 21:13:41.000000000 +0000
@@ -80,5 +80,6 @@
 /* accessors */
 extern bool get_timeout_indicator(TimeoutId id, bool reset_indicator);
 extern TimestampTz get_timeout_start_time(TimeoutId id);
+extern TimestampTz get_timeout_finish_time(TimeoutId id);
 
 #endif   /* TIMEOUT_H */
diff -Nru postgresql-9.5-9.5.2/src/include/utils/typcache.h postgresql-9.5-9.5.8/src/include/utils/typcache.h
--- postgresql-9.5-9.5.2/src/include/utils/typcache.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/include/utils/typcache.h	2017-08-07 21:13:41.000000000 +0000
@@ -131,9 +131,9 @@
 {
 	List	   *constraints;	/* list of DomainConstraintState nodes */
 	MemoryContext refctx;		/* context holding DomainConstraintRef */
+	TypeCacheEntry *tcache;		/* typcache entry for domain type */
 
 	/* Management data --- treat these fields as private to typcache.c */
-	TypeCacheEntry *tcache;		/* owning typcache entry */
 	DomainConstraintCache *dcc; /* current constraints, or NULL if none */
 	MemoryContextCallback callback;		/* used to release refcount when done */
 } DomainConstraintRef;
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/data.c postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/data.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/data.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/data.c	2017-08-07 21:13:41.000000000 +0000
@@ -375,8 +375,7 @@
 #ifdef HAVE_STRTOULL
 				case ECPGt_unsigned_long_long:
 					*((unsigned long long int *) (var + offset * act_tuple)) = strtoull(pval, &scan_length, 10);
-					if ((isarray && *scan_length != ',' && *scan_length != '}')
-						|| (!isarray && !(INFORMIX_MODE(compat) && *scan_length == '.') && *scan_length != '\0' && *scan_length != ' '))		/* Garbage left */
+					if (garbage_left(isarray, scan_length, compat))
 					{
 						ecpg_raise(lineno, ECPG_UINT_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 						return (false);
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/execute.c postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/execute.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/execute.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/execute.c	2017-08-07 21:13:41.000000000 +0000
@@ -1,8 +1,8 @@
 /* src/interfaces/ecpg/ecpglib/execute.c */
 
 /*
- * The aim is to get a simpler inteface to the database routines.
- * All the tidieous messing around with tuples is supposed to be hidden
+ * The aim is to get a simpler interface to the database routines.
+ * All the tedious messing around with tuples is supposed to be hidden
  * by this function.
  */
 /* Author: Linus Tolke
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/misc.c postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/misc.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/misc.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/misc.c	2017-08-07 21:13:41.000000000 +0000
@@ -213,9 +213,15 @@
 		 * If we got a transaction command but have no open transaction, we
 		 * have to start one, unless we are in autocommit, where the
 		 * developers have to take care themselves. However, if the command is
-		 * a begin statement, we just execute it once.
+		 * a begin statement, we just execute it once. And if the command is
+		 * commit or rollback prepared, we don't execute it.
 		 */
-		if (PQtransactionStatus(con->connection) == PQTRANS_IDLE && !con->autocommit && strncmp(transaction, "begin", 5) != 0 && strncmp(transaction, "start", 5) != 0)
+		if (PQtransactionStatus(con->connection) == PQTRANS_IDLE &&
+			!con->autocommit &&
+			strncmp(transaction, "begin", 5) != 0 &&
+			strncmp(transaction, "start", 5) != 0 &&
+			strncmp(transaction, "commit prepared", 15) != 0 &&
+			strncmp(transaction, "rollback prepared", 17) != 0)
 		{
 			res = PQexec(con->connection, "begin transaction");
 			if (!ecpg_check_PQresult(res, lineno, con->connection, ECPG_COMPAT_PGSQL))
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/po/de.po postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/po/de.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PostgreSQL package.
 # Peter Eisentraut, 2009 - 2013.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
@@ -39,7 +39,7 @@
 #: error.c:49
 #, c-format
 msgid "unsupported type \"%s\" on line %d"
-msgstr "nicht unterstützter Typ „%s“ auf Zeile %d"
+msgstr "nicht unterstützter Typ »%s« auf Zeile %d"
 
 #: error.c:59
 #, c-format
@@ -54,22 +54,22 @@
 #: error.c:79
 #, c-format
 msgid "invalid input syntax for type int: \"%s\", on line %d"
-msgstr "ungültige Eingabesyntax für Typ int: „%s“, auf Zeile %d"
+msgstr "ungültige Eingabesyntax für Typ int: »%s«, auf Zeile %d"
 
 #: error.c:89
 #, c-format
 msgid "invalid input syntax for type unsigned int: \"%s\", on line %d"
-msgstr "ungültige Eingabesyntax für Typ unsigned int: „%s“, auf Zeile %d"
+msgstr "ungültige Eingabesyntax für Typ unsigned int: »%s«, auf Zeile %d"
 
 #: error.c:99
 #, c-format
 msgid "invalid input syntax for floating-point type: \"%s\", on line %d"
-msgstr "ungültige Eingabesyntax für Gleitkommatyp: „%s“, auf Zeile %d"
+msgstr "ungültige Eingabesyntax für Gleitkommatyp: »%s«, auf Zeile %d"
 
 #: error.c:110
 #, c-format
 msgid "invalid syntax for type boolean: \"%s\", on line %d"
-msgstr "ungültige Syntax für Typ boolean: „%s“, auf Zeile %d"
+msgstr "ungültige Syntax für Typ boolean: »%s«, auf Zeile %d"
 
 #: error.c:118
 #, c-format
@@ -106,22 +106,22 @@
 #: error.c:178
 #, c-format
 msgid "connection \"%s\" does not exist on line %d"
-msgstr "Verbindung „%s“ existiert nicht auf Zeile %d"
+msgstr "Verbindung »%s« existiert nicht auf Zeile %d"
 
 #: error.c:188
 #, c-format
 msgid "not connected to connection \"%s\" on line %d"
-msgstr "nicht mit Verbindung „%s“ verbunden auf Zeile %d"
+msgstr "nicht mit Verbindung »%s« verbunden auf Zeile %d"
 
 #: error.c:198
 #, c-format
 msgid "invalid statement name \"%s\" on line %d"
-msgstr "ungültiger Anweisungsname „%s“ auf Zeile %d"
+msgstr "ungültiger Anweisungsname »%s« auf Zeile %d"
 
 #: error.c:208
 #, c-format
 msgid "descriptor \"%s\" not found on line %d"
-msgstr "Deskriptor „%s“ nicht gefunden auf Zeile %d"
+msgstr "Deskriptor »%s« nicht gefunden auf Zeile %d"
 
 #: error.c:218
 #, c-format
@@ -131,7 +131,7 @@
 #: error.c:228
 #, c-format
 msgid "unrecognized descriptor item \"%s\" on line %d"
-msgstr "unbekanntes Deskriptorelement „%s“ auf Zeile %d"
+msgstr "unbekanntes Deskriptorelement »%s« auf Zeile %d"
 
 #: error.c:238
 #, c-format
@@ -151,7 +151,7 @@
 #: error.c:268
 #, c-format
 msgid "could not connect to database \"%s\" on line %d"
-msgstr "konnte nicht mit Datenbank „%s“ verbinden auf Zeile %d"
+msgstr "konnte nicht mit Datenbank »%s« verbinden auf Zeile %d"
 
 #: error.c:278
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/po/es.po postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/po/es.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: ecpglib (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:37+0000\n"
+"POT-Creation-Date: 2017-05-21 17:26+0000\n"
 "PO-Revision-Date: 2014-12-16 12:12-0300\n"
 "Last-Translator: Emanuel Calvo Franco <postgres-arg@gmail.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/po/fr.po postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/po/fr.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 # translation of ecpglib.po to fr_fr
 # french message translation file for ecpglib
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 #
 # Guillaume Lelarge <guillaume@lelarge.info>, 2009.
-# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
+# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2010-03-06 17:22+0000\n"
 "PO-Revision-Date: 2013-09-04 20:31-0400\n"
@@ -15,7 +15,7 @@
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: connect.c:226
@@ -26,22 +26,22 @@
 #: connect.c:407
 #: connect.c:520
 msgid "<DEFAULT>"
-msgstr "<DÉFAUT>"
+msgstr "<DÉFAUT>"
 
 #: error.c:29
 #, c-format
 msgid "no data found on line %d"
-msgstr "aucune donnée trouvée sur la ligne %d"
+msgstr "aucune donnée trouvée sur la ligne %d"
 
 #: error.c:39
 #, c-format
 msgid "out of memory on line %d"
-msgstr "mémoire épuisée à la ligne %d"
+msgstr "mémoire épuisée à la ligne %d"
 
 #: error.c:49
 #, c-format
 msgid "unsupported type \"%s\" on line %d"
-msgstr "type « %s » non supporté sur la ligne %d"
+msgstr "type « %s » non supporté sur la ligne %d"
 
 #: error.c:59
 #, c-format
@@ -56,34 +56,34 @@
 #: error.c:79
 #, c-format
 msgid "invalid input syntax for type int: \"%s\", on line %d"
-msgstr "syntaxe invalide en entrée pour le type int : « %s » sur la ligne %d"
+msgstr "syntaxe invalide en entrée pour le type int : « %s » sur la ligne %d"
 
 #: error.c:89
 #, c-format
 msgid "invalid input syntax for type unsigned int: \"%s\", on line %d"
-msgstr "syntaxe invalide en entrée pour le type unisgned int : « %s » sur la ligne %d"
+msgstr "syntaxe invalide en entrée pour le type unisgned int : « %s » sur la ligne %d"
 
 #: error.c:99
 #, c-format
 msgid "invalid input syntax for floating-point type: \"%s\", on line %d"
-msgstr "syntaxe invalide en entrée pour le type float : « %s » sur la ligne %d"
+msgstr "syntaxe invalide en entrée pour le type float : « %s » sur la ligne %d"
 
 #: error.c:110
 #, c-format
 msgid "invalid syntax for type boolean: \"%s\", on line %d"
-msgstr "syntaxe invalide en entrée pour le type booléen : « %s » sur la ligne %d"
+msgstr "syntaxe invalide en entrée pour le type booléen : « %s » sur la ligne %d"
 
 #: error.c:118
 #, c-format
 msgid "could not convert boolean value: size mismatch, on line %d"
 msgstr ""
-"n'a pas pu convertir la valeur booléenne : différence de taille sur la\n"
+"n'a pas pu convertir la valeur booléenne : différence de taille sur la\n"
 "ligne %d"
 
 #: error.c:128
 #, c-format
 msgid "empty query on line %d"
-msgstr "requête vide sur la ligne %d"
+msgstr "requête vide sur la ligne %d"
 
 #: error.c:138
 #, c-format
@@ -98,42 +98,42 @@
 #: error.c:158
 #, c-format
 msgid "data read from server is not an array on line %d"
-msgstr "la donnée lue du serveur n'est pas un tableau sur la ligne %d"
+msgstr "la donnée lue du serveur n'est pas un tableau sur la ligne %d"
 
 #: error.c:168
 #, c-format
 msgid "inserting an array of variables is not supported on line %d"
-msgstr "l'insertion d'un tableau de variables n'est pas supportée, sur la ligne %d"
+msgstr "l'insertion d'un tableau de variables n'est pas supportée, sur la ligne %d"
 
 #: error.c:178
 #, c-format
 msgid "connection \"%s\" does not exist on line %d"
-msgstr "la connexion « %s » n'existe pas en ligne %d"
+msgstr "la connexion « %s » n'existe pas en ligne %d"
 
 #: error.c:188
 #, c-format
 msgid "not connected to connection \"%s\" on line %d"
-msgstr "non connecté à la connexion « %s » en ligne %d"
+msgstr "non connecté à la connexion « %s » en ligne %d"
 
 #: error.c:198
 #, c-format
 msgid "invalid statement name \"%s\" on line %d"
-msgstr "nom d'instruction « %s » invalide sur la ligne %d"
+msgstr "nom d'instruction « %s » invalide sur la ligne %d"
 
 #: error.c:208
 #, c-format
 msgid "descriptor \"%s\" not found on line %d"
-msgstr "descripteur « %s » introuvable sur la ligne %d"
+msgstr "descripteur « %s » introuvable sur la ligne %d"
 
 #: error.c:218
 #, c-format
 msgid "descriptor index out of range on line %d"
-msgstr "index de descripteur hors d'échelle sur la ligne %d"
+msgstr "index de descripteur hors d'échelle sur la ligne %d"
 
 #: error.c:228
 #, c-format
 msgid "unrecognized descriptor item \"%s\" on line %d"
-msgstr "élément descripteur « %s » non reconnu sur la ligne %d"
+msgstr "élément descripteur « %s » non reconnu sur la ligne %d"
 
 #: error.c:238
 #, c-format
@@ -143,7 +143,7 @@
 #: error.c:248
 #, c-format
 msgid "variable does not have a character type on line %d"
-msgstr "la variable n'est pas de type caractère sur la ligne %d"
+msgstr "la variable n'est pas de type caractère sur la ligne %d"
 
 #: error.c:258
 #, c-format
@@ -153,7 +153,7 @@
 #: error.c:268
 #, c-format
 msgid "could not connect to database \"%s\" on line %d"
-msgstr "n'a pas pu se connecter à la base de données « %s » en ligne %d"
+msgstr "n'a pas pu se connecter à la base de données « %s » en ligne %d"
 
 #: error.c:278
 #, c-format
@@ -162,7 +162,7 @@
 
 #: error.c:316
 msgid "the connection to the server was lost"
-msgstr "la connexion au serveur a été perdue"
+msgstr "la connexion au serveur a été perdue"
 
 #: error.c:402
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/po/ru.po postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/po/ru.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/ecpglib/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/ecpglib/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,181 +1,202 @@
 # Russian message translation file for ecpglib
-# Copyright (C) 2012 PostgreSQL Global Development Group
+# Copyright (C) 2012-2016 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Alexander Lakhin <exclusion@gmail.com>, 2012.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# ChangeLog:
-#   - February 14, 2012: Complete translation for 9.1, Alexander Lakhin <exclusion@gmail.com>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.2\n"
+"Project-Id-Version: ecpglib (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2012-07-11 03:40+0000\n"
-"PO-Revision-Date: 2012-02-14 21:39+0400\n"
+"POT-Creation-Date: 2016-09-20 18:16+0000\n"
+"PO-Revision-Date: 2016-09-20 12:00+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgtranslation-translators@pgfoundry.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
-"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: connect.c:231
+#: connect.c:237
 msgid "empty message text"
 msgstr "пу�тое �ообщение"
 
-#: connect.c:384 connect.c:413 connect.c:618
+#: connect.c:401 connect.c:430 connect.c:638
 msgid "<DEFAULT>"
 msgstr "<ПО_УМОЛЧ��ИЮ>"
 
-#: descriptor.c:807 misc.c:113
+#: descriptor.c:833 misc.c:120
 msgid "NULL"
 msgstr "NULL"
 
-#: error.c:29
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:33
 #, c-format
 msgid "no data found on line %d"
 msgstr "нет данных (�трока %d)"
 
-#: error.c:39
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:40
 #, c-format
 msgid "out of memory on line %d"
 msgstr "нехватка пам�ти (�трока %d)"
 
-#: error.c:49
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:47
 #, c-format
 msgid "unsupported type \"%s\" on line %d"
 msgstr "неподдерживаемый тип \"%s\" в �троке %d"
 
-#: error.c:59
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:54
 #, c-format
 msgid "too many arguments on line %d"
 msgstr "�лишком много аргументов в �троке %d"
 
-#: error.c:69
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:61
 #, c-format
 msgid "too few arguments on line %d"
 msgstr "недо�таточно аргументов в �троке %d"
 
-#: error.c:79
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:68
 #, c-format
 msgid "invalid input syntax for type int: \"%s\", on line %d"
 msgstr "неверный �интак�и� дл� целого чи�ла: \"%s\" (�трока %d)"
 
-#: error.c:89
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:75
 #, c-format
 msgid "invalid input syntax for type unsigned int: \"%s\", on line %d"
 msgstr "неверный �интак�и� дл� беззнакового целого: \"%s\" (�трока %d)"
 
-#: error.c:99
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:82
 #, c-format
 msgid "invalid input syntax for floating-point type: \"%s\", on line %d"
 msgstr "неверный �интак�и� дл� чи�ла � плавающей точкой: \"%s\" (�трока %d)"
 
-#: error.c:110
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:90
 #, c-format
 msgid "invalid syntax for type boolean: \"%s\", on line %d"
 msgstr "неверный �интак�и� дл� логиче�кого значени�: \"%s\" (�трока %d)"
 
-#: error.c:118
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:95
 #, c-format
 msgid "could not convert boolean value: size mismatch, on line %d"
 msgstr ""
 "не удало�ь преобразовать логиче�кое значение: не�овпадение размера (�трока "
 "%d)"
 
-#: error.c:128
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:102
 #, c-format
 msgid "empty query on line %d"
 msgstr "пу�той запро� в �троке %d"
 
-#: error.c:138
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:109
 #, c-format
 msgid "null value without indicator on line %d"
 msgstr "значение NULL без индикатора в �троке %d"
 
-#: error.c:148
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:116
 #, c-format
 msgid "variable does not have an array type on line %d"
 msgstr "переменна� должна иметь тип ма��ива (�трока %d)"
 
-#: error.c:158
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:123
 #, c-format
 msgid "data read from server is not an array on line %d"
 msgstr "полученные � �ервера данные - не ма��ив (%d)"
 
-#: error.c:168
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:130
 #, c-format
 msgid "inserting an array of variables is not supported on line %d"
 msgstr "добавление ма��ива переменных не поддерживает�� (�трока %d)"
 
-#: error.c:178
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:137
 #, c-format
 msgid "connection \"%s\" does not exist on line %d"
 msgstr "подключение \"%s\" не �уще�твует (�трока %d)"
 
-#: error.c:188
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:144
 #, c-format
 msgid "not connected to connection \"%s\" on line %d"
 msgstr "подключение \"%s\" не у�тановлено (�трока %d)"
 
-#: error.c:198
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:151
 #, c-format
 msgid "invalid statement name \"%s\" on line %d"
 msgstr "неверный оператор \"%s\" в �троке %d"
 
-#: error.c:208
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:158
 #, c-format
 msgid "descriptor \"%s\" not found on line %d"
 msgstr "де�криптор \"%s\" не найден (�трока %d)"
 
-#: error.c:218
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:165
 #, c-format
 msgid "descriptor index out of range on line %d"
 msgstr "индек� де�криптора вне диапазона (�трока %d)"
 
-#: error.c:228
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:172
 #, c-format
 msgid "unrecognized descriptor item \"%s\" on line %d"
 msgstr "нера�познанный �лемент де�криптора \"%s\" (�трока %d)"
 
-#: error.c:238
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:179
 #, c-format
 msgid "variable does not have a numeric type on line %d"
 msgstr "переменна� должна быть чи�ловой (�трока %d)"
 
-#: error.c:248
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:186
 #, c-format
 msgid "variable does not have a character type on line %d"
 msgstr "переменна� должна быть �имвольной (�трока %d)"
 
-#: error.c:258
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:193
 #, c-format
 msgid "error in transaction processing on line %d"
 msgstr "ошибка при обработке транзакции в �троке %d"
 
-#: error.c:268
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:200
 #, c-format
 msgid "could not connect to database \"%s\" on line %d"
 msgstr "ошибка подключени� к базе данных \"%s\" (�трока %d)"
 
-#: error.c:278
+#. translator: this string will be truncated at 149 characters expanded.
+#: error.c:207
 #, c-format
 msgid "SQL error %d on line %d"
 msgstr "SQL-ошибка %d в �троке %d"
 
-#: error.c:318
+#: error.c:254
 msgid "the connection to the server was lost"
 msgstr "подключение к �ерверу потер�но"
 
-#: error.c:405
+#: error.c:347
 #, c-format
 msgid "SQL error: %s\n"
 msgstr "ошибка SQL: %s\n"
 
-#: execute.c:1921
+#: execute.c:1962
 msgid "<empty>"
 msgstr "<>"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/pgtypeslib/datetime.c postgresql-9.5-9.5.8/src/interfaces/ecpg/pgtypeslib/datetime.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/pgtypeslib/datetime.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/pgtypeslib/datetime.c	2017-08-07 21:13:41.000000000 +0000
@@ -324,7 +324,7 @@
  *
  * function works as follows:
  *	 - first we analyze the parameters
- *	 - if this is a special case with no delimiters, add delimters
+ *	 - if this is a special case with no delimiters, add delimiters
  *	 - find the tokens. First we look for numerical values. If we have found
  *	   less than 3 tokens, we check for the months' names and thereafter for
  *	   the abbreviations of the months' names.
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/pgtypeslib/interval.c postgresql-9.5-9.5.8/src/interfaces/ecpg/pgtypeslib/interval.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/pgtypeslib/interval.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/pgtypeslib/interval.c	2017-08-07 21:13:41.000000000 +0000
@@ -16,7 +16,7 @@
 
 /* copy&pasted from .../src/backend/utils/adt/datetime.c */
 static int
-strtoi(const char *nptr, char **endptr, int base)
+strtoint(const char *nptr, char **endptr, int base)
 {
 	long		val;
 
@@ -448,7 +448,7 @@
 				}
 
 				errno = 0;
-				val = strtoi(field[i], &cp, 10);
+				val = strtoint(field[i], &cp, 10);
 				if (errno == ERANGE)
 					return DTERR_FIELD_OVERFLOW;
 
@@ -457,7 +457,7 @@
 					/* SQL "years-months" syntax */
 					int			val2;
 
-					val2 = strtoi(cp + 1, &cp, 10);
+					val2 = strtoint(cp + 1, &cp, 10);
 					if (errno == ERANGE || val2 < 0 || val2 >= MONTHS_PER_YEAR)
 						return DTERR_FIELD_OVERFLOW;
 					if (*cp != '\0')
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/pgtypeslib/numeric.c postgresql-9.5-9.5.8/src/interfaces/ecpg/pgtypeslib/numeric.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/pgtypeslib/numeric.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/pgtypeslib/numeric.c	2017-08-07 21:13:41.000000000 +0000
@@ -263,8 +263,7 @@
 			return -1;
 		}
 		(*ptr) = endptr;
-		if (exponent > NUMERIC_MAX_PRECISION ||
-			exponent < -NUMERIC_MAX_PRECISION)
+		if (exponent >= INT_MAX / 2 || exponent <= -(INT_MAX / 2))
 		{
 			errno = PGTYPES_NUM_BAD_NUMERIC;
 			return -1;
@@ -1369,11 +1368,11 @@
 {
 	/* use cmp_abs function to calculate the result */
 
-	/* both are positive: normal comparation with cmp_abs */
+	/* both are positive: normal comparison with cmp_abs */
 	if (var1->sign == NUMERIC_POS && var2->sign == NUMERIC_POS)
 		return cmp_abs(var1, var2);
 
-	/* both are negative: return the inverse of the normal comparation */
+	/* both are negative: return the inverse of the normal comparison */
 	if (var1->sign == NUMERIC_NEG && var2->sign == NUMERIC_NEG)
 	{
 		/*
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/descriptor.c postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/descriptor.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/descriptor.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/descriptor.c	2017-08-07 21:13:41.000000000 +0000
@@ -58,7 +58,7 @@
 		case ECPGt_unsigned_long:
 		case ECPGt_unsigned_long_long:
 		case ECPGt_const:
-			fputs(name, yyout);
+			fputs(name, base_yyout);
 			break;
 		default:
 			mmerror(PARSE_ERROR, ET_ERROR, "variable \"%s\" must have a numeric type", name);
@@ -152,7 +152,7 @@
 {
 	struct assignment *results;
 
-	fprintf(yyout, "{ ECPGget_desc_header(__LINE__, %s, &(", desc_name);
+	fprintf(base_yyout, "{ ECPGget_desc_header(__LINE__, %s, &(", desc_name);
 	for (results = assignments; results != NULL; results = results->next)
 	{
 		if (results->value == ECPGd_count)
@@ -162,7 +162,7 @@
 	}
 
 	drop_assignments();
-	fprintf(yyout, "));\n");
+	fprintf(base_yyout, "));\n");
 	whenever_action(3);
 }
 
@@ -171,7 +171,7 @@
 {
 	struct assignment *results;
 
-	fprintf(yyout, "{ ECPGget_desc(__LINE__, %s, %s,", desc_name, index);
+	fprintf(base_yyout, "{ ECPGget_desc(__LINE__, %s, %s,", desc_name, index);
 	for (results = assignments; results != NULL; results = results->next)
 	{
 		const struct variable *v = find_variable(results->variable);
@@ -188,12 +188,13 @@
 			default:
 				break;
 		}
-		fprintf(yyout, "%s,", get_dtype(results->value));
-		ECPGdump_a_type(yyout, v->name, v->type, v->brace_level, NULL, NULL, -1, NULL, NULL, str_zero, NULL, NULL);
+		fprintf(base_yyout, "%s,", get_dtype(results->value));
+		ECPGdump_a_type(base_yyout, v->name, v->type, v->brace_level,
+						NULL, NULL, -1, NULL, NULL, str_zero, NULL, NULL);
 		free(str_zero);
 	}
 	drop_assignments();
-	fputs("ECPGd_EODT);\n", yyout);
+	fputs("ECPGd_EODT);\n", base_yyout);
 
 	whenever_action(2 | 1);
 }
@@ -203,7 +204,7 @@
 {
 	struct assignment *results;
 
-	fprintf(yyout, "{ ECPGset_desc_header(__LINE__, %s, (int)(", desc_name);
+	fprintf(base_yyout, "{ ECPGset_desc_header(__LINE__, %s, (int)(", desc_name);
 	for (results = assignments; results != NULL; results = results->next)
 	{
 		if (results->value == ECPGd_count)
@@ -213,7 +214,7 @@
 	}
 
 	drop_assignments();
-	fprintf(yyout, "));\n");
+	fprintf(base_yyout, "));\n");
 	whenever_action(3);
 }
 
@@ -264,7 +265,7 @@
 {
 	struct assignment *results;
 
-	fprintf(yyout, "{ ECPGset_desc(__LINE__, %s, %s,", desc_name, index);
+	fprintf(base_yyout, "{ ECPGset_desc(__LINE__, %s, %s,", desc_name, index);
 	for (results = assignments; results != NULL; results = results->next)
 	{
 		const struct variable *v = find_variable(results->variable);
@@ -295,9 +296,11 @@
 			case ECPGd_length:
 			case ECPGd_type:
 				{
-					char *str_zero = mm_strdup("0");
-					fprintf(yyout, "%s,", get_dtype(results->value));
-					ECPGdump_a_type(yyout, v->name, v->type, v->brace_level, NULL, NULL, -1, NULL, NULL, str_zero, NULL, NULL);
+					char	   *str_zero = mm_strdup("0");
+
+					fprintf(base_yyout, "%s,", get_dtype(results->value));
+					ECPGdump_a_type(base_yyout, v->name, v->type, v->brace_level,
+						   NULL, NULL, -1, NULL, NULL, str_zero, NULL, NULL);
 					free(str_zero);
 				}
 				break;
@@ -307,7 +310,7 @@
 		}
 	}
 	drop_assignments();
-	fputs("ECPGd_EODT);\n", yyout);
+	fputs("ECPGd_EODT);\n", base_yyout);
 
 	whenever_action(2 | 1);
 }
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/ecpg.addons postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/ecpg.addons
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/ecpg.addons	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/ecpg.addons	2017-08-07 21:13:41.000000000 +0000
@@ -8,7 +8,7 @@
 				if (connection)
 					mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in CLOSE DATABASE statement");
 
-				fprintf(yyout, "{ ECPGdisconnect(__LINE__, \"CURRENT\");");
+				fprintf(base_yyout, "{ ECPGdisconnect(__LINE__, \"CURRENT\");");
 				whenever_action(2);
 				free($1);
 				break;
@@ -42,14 +42,14 @@
 	}
 ECPG: stmtTransactionStmt block
 	{
-		fprintf(yyout, "{ ECPGtrans(__LINE__, %s, \"%s\");", connection ? connection : "NULL", $1);
+		fprintf(base_yyout, "{ ECPGtrans(__LINE__, %s, \"%s\");", connection ? connection : "NULL", $1);
 		whenever_action(2);
 		free($1);
 	}
 ECPG: stmtViewStmt rule
 	| ECPGAllocateDescr
 	{
-		fprintf(yyout,"ECPGallocate_desc(__LINE__, %s);",$1);
+		fprintf(base_yyout,"ECPGallocate_desc(__LINE__, %s);",$1);
 		whenever_action(0);
 		free($1);
 	}
@@ -58,7 +58,7 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in CONNECT statement");
 
-		fprintf(yyout, "{ ECPGconnect(__LINE__, %d, %s, %d); ", compat, $1, autocommit);
+		fprintf(base_yyout, "{ ECPGconnect(__LINE__, %d, %s, %d); ", compat, $1, autocommit);
 		reset_variables();
 		whenever_action(2);
 		free($1);
@@ -69,7 +69,7 @@
 	}
 	| ECPGDeallocateDescr
 	{
-		fprintf(yyout,"ECPGdeallocate_desc(__LINE__, %s);",$1);
+		fprintf(base_yyout,"ECPGdeallocate_desc(__LINE__, %s);",$1);
 		whenever_action(0);
 		free($1);
 	}
@@ -79,10 +79,10 @@
 	}
 	| ECPGDescribe
 	{
-		fprintf(yyout, "{ ECPGdescribe(__LINE__, %d, %s,", compat, $1);
+		fprintf(base_yyout, "{ ECPGdescribe(__LINE__, %d, %s,", compat, $1);
 		dump_variables(argsresult, 1);
-		fputs("ECPGt_EORT);", yyout);
-		fprintf(yyout, "}");
+		fputs("ECPGt_EORT);", base_yyout);
+		fprintf(base_yyout, "}");
 		output_line_number();
 
 		free($1);
@@ -92,7 +92,7 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in DISCONNECT statement");
 
-		fprintf(yyout, "{ ECPGdisconnect(__LINE__, %s);",
+		fprintf(base_yyout, "{ ECPGdisconnect(__LINE__, %s);",
 				$1 ? $1 : "\"CURRENT\"");
 		whenever_action(2);
 		free($1);
@@ -103,11 +103,11 @@
 		const char *con = connection ? connection : "NULL";
 
 		if (strcmp($1, "all") == 0)
-			fprintf(yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
+			fprintf(base_yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
 		else if ($1[0] == ':')
-			fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, $1+1);
+			fprintf(base_yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, $1+1);
 		else
-			fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1);
+			fprintf(base_yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1);
 
 		whenever_action(2);
 		free($1);
@@ -138,7 +138,7 @@
 	}
 	| ECPGSetAutocommit
 	{
-		fprintf(yyout, "{ ECPGsetcommit(__LINE__, \"%s\", %s);", $1, connection ? connection : "NULL");
+		fprintf(base_yyout, "{ ECPGsetcommit(__LINE__, \"%s\", %s);", $1, connection ? connection : "NULL");
 		whenever_action(2);
 		free($1);
 	}
@@ -147,7 +147,7 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in SET CONNECTION statement");
 
-		fprintf(yyout, "{ ECPGsetconn(__LINE__, %s);", $1);
+		fprintf(base_yyout, "{ ECPGsetconn(__LINE__, %s);", $1);
 		whenever_action(2);
 		free($1);
 	}
@@ -169,7 +169,7 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in TYPE statement");
 
-		fprintf(yyout, "%s", $1);
+		fprintf(base_yyout, "%s", $1);
 		free($1);
 		output_line_number();
 	}
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/ecpg.c postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/ecpg.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/ecpg.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/ecpg.c	2017-08-07 21:13:41.000000000 +0000
@@ -54,7 +54,7 @@
 	 "                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"));
 	printf(_("  --regression   run in regression testing mode\n"));
 	printf(_("  -t             turn on autocommit of transactions\n"));
-	printf(_("  --version      output version information, then exit\n"));
+	printf(_("  -V, --version  output version information, then exit\n"));
 	printf(_("  -?, --help     show this help, then exit\n"));
 	printf(_("\nIf 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"));
@@ -111,15 +111,11 @@
 	defines->next = pd;
 }
 
-#define ECPG_GETOPT_LONG_HELP			1
-#define ECPG_GETOPT_LONG_VERSION		2
-#define ECPG_GETOPT_LONG_REGRESSION		3
+#define ECPG_GETOPT_LONG_REGRESSION		1
 int
 main(int argc, char *const argv[])
 {
 	static struct option ecpg_options[] = {
-		{"help", no_argument, NULL, ECPG_GETOPT_LONG_HELP},
-		{"version", no_argument, NULL, ECPG_GETOPT_LONG_VERSION},
 		{"regression", no_argument, NULL, ECPG_GETOPT_LONG_REGRESSION},
 		{NULL, 0, NULL, 0}
 	};
@@ -144,44 +140,37 @@
 		return (ILLEGAL_OPTION);
 	}
 
+	if (argc > 1)
+	{
+		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
+		{
+			help(progname);
+			exit(0);
+		}
+		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
+		{
+			printf("ecpg (PostgreSQL %s) %d.%d.%d\n", PG_VERSION,
+				   MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL);
+			exit(0);
+		}
+	}
+
 	output_filename = NULL;
-	while ((c = getopt_long(argc, argv, "vcio:I:tD:dC:r:h?", ecpg_options, NULL)) != -1)
+	while ((c = getopt_long(argc, argv, "vcio:I:tD:dC:r:h", ecpg_options, NULL)) != -1)
 	{
 		switch (c)
 		{
-			case ECPG_GETOPT_LONG_VERSION:
-				printf("ecpg (PostgreSQL %s) %d.%d.%d\n", PG_VERSION,
-					   MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL);
-				exit(0);
-			case ECPG_GETOPT_LONG_HELP:
-				help(progname);
-				exit(0);
-
-				/*
-				 * -? is an alternative spelling of --help. However it is also
-				 * returned by getopt_long for unknown options. We can
-				 * distinguish both cases by means of the optopt variable
-				 * which is set to 0 if it was really -? and not an unknown
-				 * option character.
-				 */
-			case '?':
-				if (optopt == 0)
-				{
-					help(progname);
-					exit(0);
-				}
-				break;
 			case ECPG_GETOPT_LONG_REGRESSION:
 				regression_mode = true;
 				break;
 			case 'o':
 				output_filename = mm_strdup(optarg);
 				if (strcmp(output_filename, "-") == 0)
-					yyout = stdout;
+					base_yyout = stdout;
 				else
-					yyout = fopen(output_filename, PG_BINARY_W);
+					base_yyout = fopen(output_filename, PG_BINARY_W);
 
-				if (yyout == NULL)
+				if (base_yyout == NULL)
 				{
 					fprintf(stderr, _("%s: could not open file \"%s\": %s\n"),
 							progname, output_filename, strerror(errno));
@@ -244,7 +233,7 @@
 				break;
 			case 'd':
 #ifdef YYDEBUG
-				yydebug = 1;
+				base_yydebug = 1;
 #else
 				fprintf(stderr, _("%s: parser debug support (-d) not available\n"),
 						progname);
@@ -291,7 +280,7 @@
 			{
 				input_filename = mm_alloc(strlen("stdin") + 1);
 				strcpy(input_filename, "stdin");
-				yyin = stdin;
+				base_yyin = stdin;
 			}
 			else
 			{
@@ -315,24 +304,25 @@
 					ptr2ext[4] = '\0';
 				}
 
-				yyin = fopen(input_filename, PG_BINARY_R);
+				base_yyin = fopen(input_filename, PG_BINARY_R);
 			}
 
 			if (out_option == 0)	/* calculate the output name */
 			{
 				if (strcmp(input_filename, "stdin") == 0)
-					yyout = stdout;
+					base_yyout = stdout;
 				else
 				{
-					output_filename = mm_strdup(input_filename);
+					output_filename = mm_alloc(strlen(input_filename) + 3);
+					strcpy(output_filename, input_filename);
 
 					ptr2ext = strrchr(output_filename, '.');
 					/* make extension = .c resp. .h */
 					ptr2ext[1] = (header_mode == true) ? 'h' : 'c';
 					ptr2ext[2] = '\0';
 
-					yyout = fopen(output_filename, PG_BINARY_W);
-					if (yyout == NULL)
+					base_yyout = fopen(output_filename, PG_BINARY_W);
+					if (base_yyout == NULL)
 					{
 						fprintf(stderr, _("%s: could not open file \"%s\": %s\n"),
 								progname, output_filename, strerror(errno));
@@ -343,7 +333,7 @@
 				}
 			}
 
-			if (yyin == NULL)
+			if (base_yyin == NULL)
 				fprintf(stderr, _("%s: could not open file \"%s\": %s\n"),
 						progname, argv[fnr], strerror(errno));
 			else
@@ -438,23 +428,23 @@
 				/* we need several includes */
 				/* but not if we are in header mode */
 				if (regression_mode)
-					fprintf(yyout, "/* Processed by ecpg (regression mode) */\n");
+					fprintf(base_yyout, "/* Processed by ecpg (regression mode) */\n");
 				else
-					fprintf(yyout, "/* Processed by ecpg (%d.%d.%d) */\n", MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL);
+					fprintf(base_yyout, "/* Processed by ecpg (%d.%d.%d) */\n", MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL);
 
 				if (header_mode == false)
 				{
-					fprintf(yyout, "/* These include files are added by the preprocessor */\n#include <ecpglib.h>\n#include <ecpgerrno.h>\n#include <sqlca.h>\n");
+					fprintf(base_yyout, "/* These include files are added by the preprocessor */\n#include <ecpglib.h>\n#include <ecpgerrno.h>\n#include <sqlca.h>\n");
 
 					/* add some compatibility headers */
 					if (INFORMIX_MODE)
-						fprintf(yyout, "/* Needed for informix compatibility */\n#include <ecpg_informix.h>\n");
+						fprintf(base_yyout, "/* Needed for informix compatibility */\n#include <ecpg_informix.h>\n");
 
-					fprintf(yyout, "/* End of automatic include section */\n");
+					fprintf(base_yyout, "/* End of automatic include section */\n");
 				}
 
 				if (regression_mode)
-					fprintf(yyout, "#define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y))\n");
+					fprintf(base_yyout, "#define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y))\n");
 
 				output_line_number();
 
@@ -469,10 +459,10 @@
 					if (!(ptr->opened))
 						mmerror(PARSE_ERROR, ET_WARNING, "cursor \"%s\" has been declared but not opened", ptr->name);
 
-				if (yyin != NULL && yyin != stdin)
-					fclose(yyin);
-				if (out_option == 0 && yyout != stdout)
-					fclose(yyout);
+				if (base_yyin != NULL && base_yyin != stdin)
+					fclose(base_yyin);
+				if (out_option == 0 && base_yyout != stdout)
+					fclose(base_yyout);
 
 				/*
 				 * If there was an error, delete the output file.
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/ecpg.header postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/ecpg.header
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/ecpg.header	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/ecpg.header	2017-08-07 21:13:41.000000000 +0000
@@ -72,7 +72,7 @@
 	/* localize the error message string */
 	error = _(error);
 
-	fprintf(stderr, "%s:%d: ", input_filename, yylineno);
+	fprintf(stderr, "%s:%d: ", input_filename, base_yylineno);
 
 	switch(type)
 	{
@@ -117,10 +117,10 @@
 	vmmerror(error_code, ET_ERROR, error, ap);
 	va_end(ap);
 
-	if (yyin)
-		fclose(yyin);
-	if (yyout)
-		fclose(yyout);
+	if (base_yyin)
+		fclose(base_yyin);
+	if (base_yyout)
+		fclose(base_yyout);
 
 	if (strcmp(output_filename, "-") != 0 && unlink(output_filename) != 0)
 		fprintf(stderr, _("could not remove output file \"%s\"\n"), output_filename);
@@ -195,7 +195,7 @@
 static char *
 make_name(void)
 {
-	return mm_strdup(yytext);
+	return mm_strdup(base_yytext);
 }
 
 static char *
@@ -207,7 +207,7 @@
 
 	/* In case we have a struct, we have to print as many "?" as there are attributes in the struct
 	 * An array is only allowed together with an element argument
-	 * This is essantially only used for inserts, but using a struct as input parameter is an error anywhere else
+	 * This is essentially only used for inserts, but using a struct as input parameter is an error anywhere else
 	 * so we don't have to worry here. */
 
 	if (p->type->type == ECPGt_struct || (array && p->type->type == ECPGt_array && p->type->u.element->type == ECPGt_struct))
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/ecpg.trailer postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/ecpg.trailer
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/ecpg.trailer	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/ecpg.trailer	2017-08-07 21:13:41.000000000 +0000
@@ -8,14 +8,14 @@
 				| ecpgstart stmt ';'
 				| ecpgstart ECPGVarDeclaration
 				{
-					fprintf(yyout, "%s", $2);
+					fprintf(base_yyout, "%s", $2);
 					free($2);
 					output_line_number();
 				}
 				| ECPGDeclaration
-				| c_thing               { fprintf(yyout, "%s", $1); free($1); }
-				| CPP_LINE              { fprintf(yyout, "%s", $1); free($1); }
-				| '{'                   { braces_open++; fputs("{", yyout); }
+				| c_thing               { fprintf(base_yyout, "%s", $1); free($1); }
+				| CPP_LINE              { fprintf(base_yyout, "%s", $1); free($1); }
+				| '{'                   { braces_open++; fputs("{", base_yyout); }
 				| '}'
 		{
 			remove_typedefs(braces_open);
@@ -25,7 +25,7 @@
 				free(current_function);
 				current_function = NULL;
 			}
-			fputs("}", yyout);
+			fputs("}", base_yyout);
 		}
 		;
 
@@ -355,7 +355,7 @@
 			  $$ = $3;
 			};
 /*
- * variable decalartion outside exec sql declare block
+ * variable declaration outside exec sql declare block
  */
 ECPGVarDeclaration: single_vt_declaration;
 
@@ -380,10 +380,10 @@
  * variable declaration inside exec sql declare block
  */
 ECPGDeclaration: sql_startdeclare
-		{ fputs("/* exec sql begin declare section */", yyout); }
+		{ fputs("/* exec sql begin declare section */", base_yyout); }
 		var_type_declarations sql_enddeclare
 		{
-			fprintf(yyout, "%s/* exec sql end declare section */", $3);
+			fprintf(base_yyout, "%s/* exec sql end declare section */", $3);
 			free($3);
 			output_line_number();
 		}
@@ -417,7 +417,7 @@
 	{
 		add_typedef($5, $6.index1, $6.index2, $3.type_enum, $3.type_dimension, $3.type_index, initializer, *$4 ? 1 : 0);
 
-		fprintf(yyout, "typedef %s %s %s %s;\n", $3.type_str, *$4 ? "*" : "", $5, $6.str);
+		fprintf(base_yyout, "typedef %s %s %s %s;\n", $3.type_str, *$4 ? "*" : "", $5, $6.str);
 		output_line_number();
 		$$ = mm_strdup("");
 	};
@@ -707,7 +707,7 @@
 			free(forward_name);
 			forward_name = NULL;
 
-			/* This is essantially a typedef but needs the keyword struct/union as well.
+			/* This is essentially a typedef but needs the keyword struct/union as well.
 			 * So we create the typedef for each struct definition with symbol */
 			for (ptr = types; ptr != NULL; ptr = ptr->next)
 			{
@@ -1275,7 +1275,7 @@
 		;
 
 /*
- * set/reset the automatic transaction mode, this needs a differnet handling
+ * set/reset the automatic transaction mode, this needs a different handling
  * as the other set commands
  */
 ECPGSetAutocommit:	SET SQL_AUTOCOMMIT '=' on_off	{ $$ = $4; }
@@ -1287,7 +1287,7 @@
 		;
 
 /*
- * set the actual connection, this needs a differnet handling as the other
+ * set the actual connection, this needs a different handling as the other
  * set commands
  */
 ECPGSetConnection:	SET CONNECTION TO connection_object { $$ = $4; }
@@ -1909,18 +1909,10 @@
 {
 	/* translator: %s is typically the translation of "syntax error" */
 	mmerror(PARSE_ERROR, ET_ERROR, "%s at or near \"%s\"",
-			_(error), token_start ? token_start : yytext);
+			_(error), token_start ? token_start : base_yytext);
 }
 
 void parser_init(void)
 {
  /* This function is empty. It only exists for compatibility with the backend parser right now. */
 }
-
-/*
- * Must undefine base_yylex before including pgc.c, since we want it
- * to create the function base_yylex not filtered_base_yylex.
- */
-#undef base_yylex
-
-#include "pgc.c"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/extern.h postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/extern.h
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/extern.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/extern.h	2017-08-07 21:13:41.000000000 +0000
@@ -34,15 +34,15 @@
 extern char *descriptor_name;
 extern char *connection;
 extern char *input_filename;
-extern char *yytext,
+extern char *base_yytext,
 		   *token_start;
 
 #ifdef YYDEBUG
-extern int	yydebug;
+extern int	base_yydebug;
 #endif
-extern int	yylineno;
-extern FILE *yyin,
-		   *yyout;
+extern int	base_yylineno;
+extern FILE *base_yyin,
+		   *base_yyout;
 extern char *output_filename;
 
 extern struct _include_path *include_paths;
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/Makefile postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/Makefile
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -26,7 +26,7 @@
 
 override CFLAGS += $(PTHREAD_CFLAGS) -DECPG_COMPILE
 
-OBJS=	preproc.o type.o ecpg.o output.o parser.o \
+OBJS=	preproc.o pgc.o type.o ecpg.o output.o parser.o \
 	keywords.o c_keywords.o ecpg_keywords.o kwlookup.o ../ecpglib/typename.o descriptor.o variable.o \
 	$(WIN32RES)
 
@@ -44,9 +44,6 @@
 ../ecpglib/typename.o: ../ecpglib/typename.c
 	$(MAKE) -C $(dir $@) $(notdir $@)
 
-# pgc is compiled as part of preproc
-preproc.o: pgc.c
-
 preproc.h: preproc.c ;
 preproc.c: BISONFLAGS += -d
 
@@ -54,7 +51,7 @@
 	$(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
+ecpg_keywords.o c_keywords.o keywords.o preproc.o pgc.o parser.o: preproc.h
 
 kwlookup.c: % : $(top_srcdir)/src/backend/parser/%
 	rm -f $@ && $(LN_S) $< .
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/output.c postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/output.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/output.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/output.c	2017-08-07 21:13:41.000000000 +0000
@@ -11,7 +11,7 @@
 {
 	char	   *line = hashline_number();
 
-	fprintf(yyout, "%s", line);
+	fprintf(base_yyout, "%s", line);
 	free(line);
 }
 
@@ -37,22 +37,22 @@
 	switch (w->code)
 	{
 		case W_SQLPRINT:
-			fprintf(yyout, "sqlprint();");
+			fprintf(base_yyout, "sqlprint();");
 			break;
 		case W_GOTO:
-			fprintf(yyout, "goto %s;", w->command);
+			fprintf(base_yyout, "goto %s;", w->command);
 			break;
 		case W_DO:
-			fprintf(yyout, "%s;", w->command);
+			fprintf(base_yyout, "%s;", w->command);
 			break;
 		case W_STOP:
-			fprintf(yyout, "exit (1);");
+			fprintf(base_yyout, "exit (1);");
 			break;
 		case W_BREAK:
-			fprintf(yyout, "break;");
+			fprintf(base_yyout, "break;");
 			break;
 		default:
-			fprintf(yyout, "{/* %d not implemented yet */}", w->code);
+			fprintf(base_yyout, "{/* %d not implemented yet */}", w->code);
 			break;
 	}
 }
@@ -63,24 +63,24 @@
 	if ((mode & 1) == 1 && when_nf.code != W_NOTHING)
 	{
 		output_line_number();
-		fprintf(yyout, "\nif (sqlca.sqlcode == ECPG_NOT_FOUND) ");
+		fprintf(base_yyout, "\nif (sqlca.sqlcode == ECPG_NOT_FOUND) ");
 		print_action(&when_nf);
 	}
 	if (when_warn.code != W_NOTHING)
 	{
 		output_line_number();
-		fprintf(yyout, "\nif (sqlca.sqlwarn[0] == 'W') ");
+		fprintf(base_yyout, "\nif (sqlca.sqlwarn[0] == 'W') ");
 		print_action(&when_warn);
 	}
 	if (when_error.code != W_NOTHING)
 	{
 		output_line_number();
-		fprintf(yyout, "\nif (sqlca.sqlcode < 0) ");
+		fprintf(base_yyout, "\nif (sqlca.sqlcode < 0) ");
 		print_action(&when_error);
 	}
 
 	if ((mode & 2) == 2)
-		fputc('}', yyout);
+		fputc('}', base_yyout);
 
 	output_line_number();
 }
@@ -91,7 +91,7 @@
 	/* do not print line numbers if we are in debug mode */
 	if (input_filename
 #ifdef YYDEBUG
-		&& !yydebug
+		&& !base_yydebug
 #endif
 		)
 	{
@@ -100,7 +100,7 @@
 		char	   *src,
 				   *dest;
 
-		sprintf(line, "\n#line %d \"", yylineno);
+		sprintf(line, "\n#line %d \"", base_yylineno);
 		src = input_filename;
 		dest = line + strlen(line);
 		while (*src)
@@ -128,27 +128,27 @@
 void
 output_statement(char *stmt, int whenever_mode, enum ECPG_statement_type st)
 {
-	fprintf(yyout, "{ ECPGdo(__LINE__, %d, %d, %s, %d, ", compat, force_indicator, connection ? connection : "NULL", questionmarks);
+	fprintf(base_yyout, "{ ECPGdo(__LINE__, %d, %d, %s, %d, ", compat, force_indicator, connection ? connection : "NULL", questionmarks);
 	if (st == ECPGst_execute || st == ECPGst_exec_immediate)
 	{
-		fprintf(yyout, "%s, %s, ", ecpg_statement_type_name[st], stmt);
+		fprintf(base_yyout, "%s, %s, ", ecpg_statement_type_name[st], stmt);
 	}
 	else
 	{
 		if (st == ECPGst_prepnormal && auto_prepare)
-			fputs("ECPGst_prepnormal, \"", yyout);
+			fputs("ECPGst_prepnormal, \"", base_yyout);
 		else
-			fputs("ECPGst_normal, \"", yyout);
+			fputs("ECPGst_normal, \"", base_yyout);
 
 		output_escaped_str(stmt, false);
-		fputs("\", ", yyout);
+		fputs("\", ", base_yyout);
 	}
 
 	/* dump variables to C file */
 	dump_variables(argsinsert, 1);
-	fputs("ECPGt_EOIT, ", yyout);
+	fputs("ECPGt_EOIT, ", base_yyout);
 	dump_variables(argsresult, 1);
-	fputs("ECPGt_EORT);", yyout);
+	fputs("ECPGt_EORT);", base_yyout);
 	reset_variables();
 
 	whenever_action(whenever_mode | 2);
@@ -160,11 +160,11 @@
 void
 output_prepare_statement(char *name, char *stmt)
 {
-	fprintf(yyout, "{ ECPGprepare(__LINE__, %s, %d, ", connection ? connection : "NULL", questionmarks);
+	fprintf(base_yyout, "{ ECPGprepare(__LINE__, %s, %d, ", connection ? connection : "NULL", questionmarks);
 	output_escaped_str(name, true);
-	fputs(", ", yyout);
+	fputs(", ", base_yyout);
 	output_escaped_str(stmt, true);
-	fputs(");", yyout);
+	fputs(");", base_yyout);
 	whenever_action(2);
 	free(name);
 	if (connection != NULL)
@@ -178,12 +178,12 @@
 
 	if (strcmp(name, "all") != 0)
 	{
-		fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, ", compat, con);
+		fprintf(base_yyout, "{ ECPGdeallocate(__LINE__, %d, %s, ", compat, con);
 		output_escaped_str(name, true);
-		fputs(");", yyout);
+		fputs(");", base_yyout);
 	}
 	else
-		fprintf(yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
+		fprintf(base_yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
 
 	whenever_action(2);
 	free(name);
@@ -203,16 +203,16 @@
 	{
 		i = 1;
 		len--;
-		fputs("\"", yyout);
+		fputs("\"", base_yyout);
 	}
 
 	/* output this char by char as we have to filter " and \n */
 	for (; i < len; i++)
 	{
 		if (str[i] == '"')
-			fputs("\\\"", yyout);
+			fputs("\\\"", base_yyout);
 		else if (str[i] == '\n')
-			fputs("\\\n", yyout);
+			fputs("\\\n", base_yyout);
 		else if (str[i] == '\\')
 		{
 			int			j = i;
@@ -230,17 +230,17 @@
 
 			if ((str[j] != '\n') && (str[j] != '\r' || str[j + 1] != '\n'))		/* not followed by a
 																				 * newline */
-				fputs("\\\\", yyout);
+				fputs("\\\\", base_yyout);
 		}
 		else if (str[i] == '\r' && str[i + 1] == '\n')
 		{
-			fputs("\\\r\n", yyout);
+			fputs("\\\r\n", base_yyout);
 			i++;
 		}
 		else
-			fputc(str[i], yyout);
+			fputc(str[i], base_yyout);
 	}
 
 	if (quoted && str[0] == '\"' && str[len] == '\"')
-		fputs("\"", yyout);
+		fputs("\"", base_yyout);
 }
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/parse.pl postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/parse.pl
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/parse.pl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/parse.pl	2017-08-07 21:13:41.000000000 +0000
@@ -550,7 +550,7 @@
 			if ($len == 1)
 			{
 
-				# Straight assignement
+				# Straight assignment
 				$str = ' $$ = ' . $flds_new[0] . ';';
 				add_to_buffer('rules', $str);
 			}
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/parser.c postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/parser.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/parser.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/parser.c	2017-08-07 21:13:41.000000000 +0000
@@ -60,7 +60,7 @@
 		cur_token = lookahead_token;
 		base_yylval = lookahead_yylval;
 		base_yylloc = lookahead_yylloc;
-		yytext = lookahead_yytext;
+		base_yytext = lookahead_yytext;
 		*lookahead_end = lookahead_hold_char;
 		have_lookahead = false;
 	}
@@ -93,13 +93,13 @@
 	 * '\0' here, and will undo that when we call it again.  We need to redo
 	 * it to fully revert the lookahead call for error reporting purposes.
 	 */
-	lookahead_end = yytext + cur_token_length;
+	lookahead_end = base_yytext + cur_token_length;
 	Assert(*lookahead_end == '\0');
 
 	/* Save and restore lexer output variables around the call */
 	cur_yylval = base_yylval;
 	cur_yylloc = base_yylloc;
-	cur_yytext = yytext;
+	cur_yytext = base_yytext;
 
 	/* Get next token, saving outputs into lookahead variables */
 	next_token = base_yylex();
@@ -107,11 +107,11 @@
 	lookahead_token = next_token;
 	lookahead_yylval = base_yylval;
 	lookahead_yylloc = base_yylloc;
-	lookahead_yytext = yytext;
+	lookahead_yytext = base_yytext;
 
 	base_yylval = cur_yylval;
 	base_yylloc = cur_yylloc;
-	yytext = cur_yytext;
+	base_yytext = cur_yytext;
 
 	/* Now revert the un-truncation of the current token */
 	lookahead_hold_char = *lookahead_end;
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/pgc.c postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/pgc.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/pgc.c	2016-03-28 20:23:04.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/pgc.c	2017-08-07 21:34:42.000000000 +0000
@@ -1,11 +1,58 @@
 #line 2 "pgc.c"
+#line 2 "pgc.l"
+/*-------------------------------------------------------------------------
+ *
+ * pgc.l
+ *	  lexical scanner for ecpg
+ *
+ * This is a modified version of src/backend/parser/scan.l
+ *
+ *
+ * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/interfaces/ecpg/preproc/pgc.l
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres_fe.h"
+
+#include <ctype.h>
+#include <sys/types.h>
+#include <limits.h>
+
+#include "extern.h"
+#include "preproc.h"
+
 
-#line 4 "pgc.c"
+
+#line 32 "pgc.c"
 
 #define  YY_INT_ALIGNED short int
 
 /* A lexical scanner generated by flex */
 
+#define yy_create_buffer base_yy_create_buffer
+#define yy_delete_buffer base_yy_delete_buffer
+#define yy_flex_debug base_yy_flex_debug
+#define yy_init_buffer base_yy_init_buffer
+#define yy_flush_buffer base_yy_flush_buffer
+#define yy_load_buffer_state base_yy_load_buffer_state
+#define yy_switch_to_buffer base_yy_switch_to_buffer
+#define yyin base_yyin
+#define yyleng base_yyleng
+#define yylex base_yylex
+#define yylineno base_yylineno
+#define yyout base_yyout
+#define yyrestart base_yyrestart
+#define yytext base_yytext
+#define yywrap base_yywrap
+#define yyalloc base_yyalloc
+#define yyrealloc base_yyrealloc
+#define yyfree base_yyfree
+
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
@@ -136,7 +183,7 @@
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
+#define YY_NEW_FILE base_yyrestart(base_yyin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
@@ -167,9 +214,9 @@
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t yyleng;
+extern yy_size_t base_yyleng;
 
-extern FILE *yyin, *yyout;
+extern FILE *base_yyin, *base_yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
@@ -177,37 +224,37 @@
 
     /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
      *       access to the local variable yy_act. Since yyless() is a macro, it would break
-     *       existing scanners that call yyless() from OUTSIDE yylex. 
+     *       existing scanners that call yyless() from OUTSIDE base_yylex. 
      *       One obvious solution it to make yy_act a global. I tried that, and saw
-     *       a 5% performance hit in a non-yylineno scanner, because yy_act is
+     *       a 5% performance hit in a non-base_yylineno scanner, because yy_act is
      *       normally declared as a register variable-- so it is not worth it.
      */
     #define  YY_LESS_LINENO(n) \
             do { \
                 int yyl;\
-                for ( yyl = n; yyl < yyleng; ++yyl )\
-                    if ( yytext[yyl] == '\n' )\
-                        --yylineno;\
+                for ( yyl = n; yyl < base_yyleng; ++yyl )\
+                    if ( base_yytext[yyl] == '\n' )\
+                        --base_yylineno;\
             }while(0)
     #define YY_LINENO_REWIND_TO(dst) \
             do {\
                 const char *p;\
                 for ( p = yy_cp-1; p >= (dst); --p)\
                     if ( *p == '\n' )\
-                        --yylineno;\
+                        --base_yylineno;\
             }while(0)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up yytext. */ \
+		/* Undo effects of setting up base_yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
 		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
 		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		YY_DO_BEFORE_ACTION; /* set up base_yytext again */ \
 		} \
 	while ( 0 )
 
@@ -270,8 +317,8 @@
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
+	 * (via base_yyrestart()), so that the user can continue scanning by
+	 * just pointing base_yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
 
@@ -298,51 +345,51 @@
  */
 #define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when yytext is formed. */
+/* yy_hold_char holds the character lost when base_yytext is formed. */
 static char yy_hold_char;
 static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
+yy_size_t base_yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
 static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
+/* Flag which is used to allow base_yywrap()'s to do buffer switches
+ * instead of setting up a fresh base_yyin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
-
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+void base_yyrestart (FILE *input_file  );
+void base_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE base_yy_create_buffer (FILE *file,int size  );
+void base_yy_delete_buffer (YY_BUFFER_STATE b  );
+void base_yy_flush_buffer (YY_BUFFER_STATE b  );
+void base_yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void base_yypop_buffer_state (void );
+
+static void base_yyensure_buffer_stack (void );
+static void base_yy_load_buffer_state (void );
+static void base_yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER base_yy_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE base_yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE base_yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE base_yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+void *base_yyalloc (yy_size_t  );
+void *base_yyrealloc (void *,yy_size_t  );
+void base_yyfree (void *  );
 
-#define yy_new_buffer yy_create_buffer
+#define yy_new_buffer base_yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
+        base_yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+            base_yy_create_buffer(base_yyin,YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
@@ -350,9 +397,9 @@
 #define yy_set_bol(at_bol) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
+        base_yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+            base_yy_create_buffer(base_yyin,YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
@@ -361,21 +408,21 @@
 
 /* Begin user sect3 */
 
-#define yywrap() 1
+#define base_yywrap() 1
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
 
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+FILE *base_yyin = (FILE *) 0, *base_yyout = (FILE *) 0;
 
 typedef int yy_state_type;
 
-extern int yylineno;
+extern int base_yylineno;
 
-int yylineno = 1;
+int base_yylineno = 1;
 
-extern char *yytext;
-#define yytext_ptr yytext
+extern char *base_yytext;
+#define yytext_ptr base_yytext
 
 static yy_state_type yy_get_previous_state (void );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
@@ -383,11 +430,11 @@
 static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
+ * corresponding action - sets up base_yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
+	base_yyleng = (size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
@@ -1872,8 +1919,8 @@
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
+extern int base_yy_flex_debug;
+int base_yy_flex_debug = 0;
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
@@ -1882,35 +1929,11 @@
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
+char *base_yytext;
 #line 1 "pgc.l"
-#line 2 "pgc.l"
-/*-------------------------------------------------------------------------
- *
- * pgc.l
- *	  lexical scanner for ecpg
- *
- * This is a modified version of src/backend/parser/scan.l
- *
- *
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *	  src/interfaces/ecpg/preproc/pgc.l
- *
- *-------------------------------------------------------------------------
- */
-#include "postgres_fe.h"
-
-#include <ctype.h>
-#include <sys/types.h>
-#include <limits.h>
 
-#include "extern.h"
-
-extern YYSTYPE yylval;
+#line 30 "pgc.l"
+extern YYSTYPE base_yylval;
 
 static int		xcdepth = 0;	/* depth of nesting in slash-star comments */
 static char	   *dolqstart = NULL;	/* current $foo$ quote start string */
@@ -2109,7 +2132,7 @@
  * Note that xcstart must appear before operator, as explained above!
  *	Also whitespace (comment) must appear before operator.
  */
-#line 2113 "pgc.c"
+#line 2136 "pgc.c"
 
 #define INITIAL 0
 #define C 1
@@ -2151,31 +2174,31 @@
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int yylex_destroy (void );
+int base_yylex_destroy (void );
 
-int yyget_debug (void );
+int base_yyget_debug (void );
 
-void yyset_debug (int debug_flag  );
+void base_yyset_debug (int debug_flag  );
 
-YY_EXTRA_TYPE yyget_extra (void );
+YY_EXTRA_TYPE base_yyget_extra (void );
 
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
+void base_yyset_extra (YY_EXTRA_TYPE user_defined  );
 
-FILE *yyget_in (void );
+FILE *base_yyget_in (void );
 
-void yyset_in  (FILE * in_str  );
+void base_yyset_in  (FILE * in_str  );
 
-FILE *yyget_out (void );
+FILE *base_yyget_out (void );
 
-void yyset_out  (FILE * out_str  );
+void base_yyset_out  (FILE * out_str  );
 
-yy_size_t yyget_leng (void );
+yy_size_t base_yyget_leng (void );
 
-char *yyget_text (void );
+char *base_yyget_text (void );
 
-int yyget_lineno (void );
+int base_yyget_lineno (void );
 
-void yyset_lineno (int line_number  );
+void base_yyset_lineno (int line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -2183,9 +2206,9 @@
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int base_yywrap (void );
 #else
-extern int yywrap (void );
+extern int base_yywrap (void );
 #endif
 #endif
 
@@ -2224,7 +2247,7 @@
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO do { if (fwrite( base_yytext, base_yyleng, 1, base_yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -2235,20 +2258,20 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			     (c = getc( base_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
+		if ( c == EOF && ferror( base_yyin ) ) \
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, base_yyin)) == 0 && ferror(base_yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -2256,7 +2279,7 @@
 				break; \
 				} \
 			errno=0; \
-			clearerr(yyin); \
+			clearerr(base_yyin); \
 			} \
 		}\
 \
@@ -2289,12 +2312,12 @@
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int yylex (void);
+extern int base_yylex (void);
 
-#define YY_DECL int yylex (void)
+#define YY_DECL int base_yylex (void)
 #endif /* !YY_DECL */
 
-/* Code executed at the beginning of each rule, after yytext and yyleng
+/* Code executed at the beginning of each rule, after base_yytext and base_yyleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -2328,37 +2351,37 @@
 		if ( ! (yy_start) )
 			(yy_start) = 1;	/* first start state */
 
-		if ( ! yyin )
-			yyin = stdin;
+		if ( ! base_yyin )
+			base_yyin = stdin;
 
-		if ( ! yyout )
-			yyout = stdout;
+		if ( ! base_yyout )
+			base_yyout = stdout;
 
 		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
+			base_yyensure_buffer_stack ();
 			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
+				base_yy_create_buffer(base_yyin,YY_BUF_SIZE );
 		}
 
-		yy_load_buffer_state( );
+		base_yy_load_buffer_state( );
 		}
 
 	{
-#line 372 "pgc.l"
+#line 376 "pgc.l"
 
 
 
-		/* code to execute during start of each call of yylex() */
+		/* code to execute during start of each call of base_yylex() */
 		token_start = NULL;
 
 
-#line 2356 "pgc.c"
+#line 2379 "pgc.c"
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
-		/* Support of yytext. */
+		/* Support of base_yytext. */
 		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
@@ -2397,10 +2420,10 @@
 		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
 			yy_size_t yyl;
-			for ( yyl = 0; yyl < yyleng; ++yyl )
-				if ( yytext[yyl] == '\n' )
+			for ( yyl = 0; yyl < base_yyleng; ++yyl )
+				if ( base_yytext[yyl] == '\n' )
 					   
-    yylineno++;
+    base_yylineno++;
 ;
 			}
 
@@ -2418,53 +2441,53 @@
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 379 "pgc.l"
+#line 383 "pgc.l"
 { /* ignore */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 381 "pgc.l"
+#line 385 "pgc.l"
 {
-					token_start = yytext;
+					token_start = base_yytext;
 					state_before = YYSTATE;
 					xcdepth = 0;
 					BEGIN(xcc);
 					/* Put back any characters past slash-star; see above */
 					yyless(2);
-					fputs("/*", yyout);
+					fputs("/*", base_yyout);
 				}
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 390 "pgc.l"
+#line 394 "pgc.l"
 {
-					token_start = yytext;
+					token_start = base_yytext;
 					state_before = YYSTATE;
 					xcdepth = 0;
 					BEGIN(xcsql);
 					/* Put back any characters past slash-star; see above */
 					yyless(2);
-					fputs("/*", yyout);
+					fputs("/*", base_yyout);
 				}
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 399 "pgc.l"
+#line 403 "pgc.l"
 { ECHO; }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 400 "pgc.l"
+#line 404 "pgc.l"
 {
 					xcdepth++;
 					/* Put back any characters past slash-star; see above */
 					yyless(2);
-					fputs("/_*", yyout);
+					fputs("/_*", base_yyout);
 				}
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 406 "pgc.l"
+#line 410 "pgc.l"
 {
 					if (xcdepth <= 0)
 					{
@@ -2475,13 +2498,13 @@
 					else
 					{
 						xcdepth--;
-						fputs("*_/", yyout);
+						fputs("*_/", base_yyout);
 					}
 				}
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 419 "pgc.l"
+#line 423 "pgc.l"
 {
 					ECHO;
 					BEGIN(state_before);
@@ -2491,29 +2514,29 @@
 case 8:
 /* rule 8 can match eol */
 YY_RULE_SETUP
-#line 424 "pgc.l"
+#line 428 "pgc.l"
 { ECHO; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 425 "pgc.l"
+#line 429 "pgc.l"
 { ECHO; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 426 "pgc.l"
+#line 430 "pgc.l"
 { ECHO; }
 	YY_BREAK
 case YY_STATE_EOF(xcc):
 case YY_STATE_EOF(xcsql):
-#line 428 "pgc.l"
+#line 432 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated /* comment"); }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 430 "pgc.l"
+#line 434 "pgc.l"
 {
-					token_start = yytext;
+					token_start = base_yytext;
 					BEGIN(xb);
 					startlit();
 					addlitchar('b');
@@ -2521,47 +2544,47 @@
 	YY_BREAK
 case 12:
 /* rule 12 can match eol */
-#line 437 "pgc.l"
+#line 441 "pgc.l"
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP
-#line 437 "pgc.l"
+#line 441 "pgc.l"
 {
 					yyless(1);
 					BEGIN(SQL);
 					if (literalbuf[strspn(literalbuf, "01") + 1] != '\0')
 						mmerror(PARSE_ERROR, ET_ERROR, "invalid bit string literal");
-					yylval.str = mm_strdup(literalbuf);
+					base_yylval.str = mm_strdup(literalbuf);
 					return BCONST;
 				}
 	YY_BREAK
 case 14:
 /* rule 14 can match eol */
-#line 447 "pgc.l"
+#line 451 "pgc.l"
 case 15:
 /* rule 15 can match eol */
 YY_RULE_SETUP
-#line 447 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 451 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 16:
 /* rule 16 can match eol */
-#line 449 "pgc.l"
+#line 453 "pgc.l"
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 449 "pgc.l"
+#line 453 "pgc.l"
 { /* ignore */ }
 	YY_BREAK
 case YY_STATE_EOF(xb):
-#line 450 "pgc.l"
+#line 454 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated bit string literal"); }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 452 "pgc.l"
+#line 456 "pgc.l"
 {
-					token_start = yytext;
+					token_start = base_yytext;
 					BEGIN(xh);
 					startlit();
 					addlitchar('x');
@@ -2569,30 +2592,30 @@
 	YY_BREAK
 case 19:
 /* rule 19 can match eol */
-#line 459 "pgc.l"
+#line 463 "pgc.l"
 case 20:
 /* rule 20 can match eol */
 YY_RULE_SETUP
-#line 459 "pgc.l"
+#line 463 "pgc.l"
 {
 				yyless(1);
 				BEGIN(SQL);
-				yylval.str = mm_strdup(literalbuf);
+				base_yylval.str = mm_strdup(literalbuf);
 				return XCONST;
 			}
 	YY_BREAK
 case YY_STATE_EOF(xh):
-#line 466 "pgc.l"
+#line 470 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated hexadecimal string literal"); }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 467 "pgc.l"
+#line 471 "pgc.l"
 {
 				/* National character.
 				 * Transfer it as-is to the backend.
 				 */
-				token_start = yytext;
+				token_start = base_yytext;
 				state_before = YYSTATE;
 				BEGIN(xn);
 				startlit();
@@ -2600,9 +2623,9 @@
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 476 "pgc.l"
+#line 480 "pgc.l"
 {
-				token_start = yytext;
+				token_start = base_yytext;
 				state_before = YYSTATE;
 				BEGIN(xqc);
 				startlit();
@@ -2610,9 +2633,9 @@
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 482 "pgc.l"
+#line 486 "pgc.l"
 {
-				token_start = yytext;
+				token_start = base_yytext;
 				state_before = YYSTATE;
 				BEGIN(xq);
 				startlit();
@@ -2620,9 +2643,9 @@
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 488 "pgc.l"
+#line 492 "pgc.l"
 {
-				token_start = yytext;
+				token_start = base_yytext;
 				state_before = YYSTATE;
 				BEGIN(xe);
 				startlit();
@@ -2630,76 +2653,76 @@
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 494 "pgc.l"
+#line 498 "pgc.l"
 {
-				token_start = yytext;
+				token_start = base_yytext;
 				state_before = YYSTATE;
 				BEGIN(xus);
 				startlit();
-				addlit(yytext, yyleng);
+				addlit(base_yytext, base_yyleng);
 			}
 	YY_BREAK
 case 26:
 /* rule 26 can match eol */
-#line 502 "pgc.l"
+#line 506 "pgc.l"
 case 27:
 /* rule 27 can match eol */
 YY_RULE_SETUP
-#line 502 "pgc.l"
+#line 506 "pgc.l"
 {
 				yyless(1);
 				BEGIN(state_before);
-				yylval.str = mm_strdup(literalbuf);
+				base_yylval.str = mm_strdup(literalbuf);
 				return SCONST;
 			}
 	YY_BREAK
 case 28:
 /* rule 28 can match eol */
-#line 509 "pgc.l"
+#line 513 "pgc.l"
 case 29:
 /* rule 29 can match eol */
 YY_RULE_SETUP
-#line 509 "pgc.l"
+#line 513 "pgc.l"
 {
 				yyless(1);
 				BEGIN(state_before);
-				yylval.str = mm_strdup(literalbuf);
+				base_yylval.str = mm_strdup(literalbuf);
 				return ECONST;
 			}
 	YY_BREAK
 case 30:
 /* rule 30 can match eol */
-#line 516 "pgc.l"
+#line 520 "pgc.l"
 case 31:
 /* rule 31 can match eol */
 YY_RULE_SETUP
-#line 516 "pgc.l"
+#line 520 "pgc.l"
 {
 				yyless(1);
 				BEGIN(state_before);
-				yylval.str = mm_strdup(literalbuf);
+				base_yylval.str = mm_strdup(literalbuf);
 				return NCONST;
 			}
 	YY_BREAK
 case 32:
 /* rule 32 can match eol */
 YY_RULE_SETUP
-#line 522 "pgc.l"
+#line 526 "pgc.l"
 {
-				addlit(yytext, yyleng);
+				addlit(base_yytext, base_yyleng);
 				BEGIN(state_before);
-				yylval.str = mm_strdup(literalbuf);
+				base_yylval.str = mm_strdup(literalbuf);
 				return UCONST;
 			}
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 528 "pgc.l"
+#line 532 "pgc.l"
 { addlitchar('\''); }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 529 "pgc.l"
+#line 533 "pgc.l"
 {
 				addlitchar('\\');
 				addlitchar('\'');
@@ -2708,48 +2731,48 @@
 case 35:
 /* rule 35 can match eol */
 YY_RULE_SETUP
-#line 533 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 537 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 36:
 /* rule 36 can match eol */
 YY_RULE_SETUP
-#line 534 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 538 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 535 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 539 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 38:
 /* rule 38 can match eol */
 YY_RULE_SETUP
-#line 536 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 540 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 537 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 541 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 538 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 542 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 41:
 /* rule 41 can match eol */
 YY_RULE_SETUP
-#line 539 "pgc.l"
+#line 543 "pgc.l"
 { /* ignore */ }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 540 "pgc.l"
+#line 544 "pgc.l"
 {
 			   /* This is only needed for \ just before EOF */
-			   addlitchar(yytext[0]);
+			   addlitchar(base_yytext[0]);
 			}
 	YY_BREAK
 case YY_STATE_EOF(xq):
@@ -2757,42 +2780,43 @@
 case YY_STATE_EOF(xe):
 case YY_STATE_EOF(xn):
 case YY_STATE_EOF(xus):
-#line 544 "pgc.l"
+#line 548 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated quoted string"); }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 545 "pgc.l"
+#line 549 "pgc.l"
 {
 				/* throw back all but the initial "$" */
 				yyless(1);
 				/* and treat it as {other} */
-				return yytext[0];
+				return base_yytext[0];
 			}
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 551 "pgc.l"
+#line 555 "pgc.l"
 {
-				token_start = yytext;
+				token_start = base_yytext;
 				if (dolqstart)
 					free(dolqstart);
-				dolqstart = mm_strdup(yytext);
+				dolqstart = mm_strdup(base_yytext);
 				BEGIN(xdolq);
 				startlit();
-				addlit(yytext, yyleng);
+				addlit(base_yytext, base_yyleng);
 			}
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 560 "pgc.l"
+#line 564 "pgc.l"
 {
-				if (strcmp(yytext, dolqstart) == 0)
+				if (strcmp(base_yytext, dolqstart) == 0)
 				{
-					addlit(yytext, yyleng);
+					addlit(base_yytext, base_yyleng);
 					free(dolqstart);
+					dolqstart = NULL;
 					BEGIN(SQL);
-					yylval.str = mm_strdup(literalbuf);
+					base_yylval.str = mm_strdup(literalbuf);
 					return DOLCONST;
 				}
 				else
@@ -2802,37 +2826,37 @@
 					 * the $... part to the output, but put back the final
 					 * $ for rescanning.  Consider $delim$...$junk$delim$
 					 */
-					addlit(yytext, yyleng-1);
-					yyless(yyleng-1);
+					addlit(base_yytext, base_yyleng-1);
+					yyless(base_yyleng-1);
 				}
 			}
 	YY_BREAK
 case 46:
 /* rule 46 can match eol */
 YY_RULE_SETUP
-#line 580 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 585 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 581 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 586 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 582 "pgc.l"
+#line 587 "pgc.l"
 {
 				/* single quote or dollar sign */
-				addlitchar(yytext[0]);
+				addlitchar(base_yytext[0]);
 			}
 	YY_BREAK
 case YY_STATE_EOF(xdolq):
-#line 586 "pgc.l"
+#line 591 "pgc.l"
 { base_yyerror("unterminated dollar-quoted string"); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 587 "pgc.l"
+#line 592 "pgc.l"
 {
 						state_before = YYSTATE;
 						BEGIN(xd);
@@ -2841,69 +2865,69 @@
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 592 "pgc.l"
+#line 597 "pgc.l"
 {
 						state_before = YYSTATE;
 						BEGIN(xui);
 						startlit();
-						addlit(yytext, yyleng);
+						addlit(base_yytext, base_yyleng);
 					}
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 598 "pgc.l"
+#line 603 "pgc.l"
 {
 						BEGIN(state_before);
 						if (literallen == 0)
 							mmerror(PARSE_ERROR, ET_ERROR, "zero-length delimited identifier");
 						/* The backend will truncate the identifier here. We do not as it does not change the result. */
-						yylval.str = mm_strdup(literalbuf);
+						base_yylval.str = mm_strdup(literalbuf);
 						return CSTRING;
 					}
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 606 "pgc.l"
+#line 611 "pgc.l"
 {
 						BEGIN(state_before);
-						yylval.str = mm_strdup(literalbuf);
+						base_yylval.str = mm_strdup(literalbuf);
 						return CSTRING;
 					}
 	YY_BREAK
 case 53:
 /* rule 53 can match eol */
 YY_RULE_SETUP
-#line 611 "pgc.l"
+#line 616 "pgc.l"
 {
 						BEGIN(state_before);
 						if (literallen == 2) /* "U&" */
 							mmerror(PARSE_ERROR, ET_ERROR, "zero-length delimited identifier");
 						/* The backend will truncate the identifier here. We do not as it does not change the result. */
-						addlit(yytext, yyleng);
-						yylval.str = mm_strdup(literalbuf);
+						addlit(base_yytext, base_yyleng);
+						base_yylval.str = mm_strdup(literalbuf);
 						return UIDENT;
 					}
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 620 "pgc.l"
+#line 625 "pgc.l"
 { addlitchar('"'); }
 	YY_BREAK
 case 55:
 /* rule 55 can match eol */
 YY_RULE_SETUP
-#line 621 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 626 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case YY_STATE_EOF(xd):
 case YY_STATE_EOF(xdc):
 case YY_STATE_EOF(xui):
-#line 622 "pgc.l"
+#line 627 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated quoted identifier"); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 623 "pgc.l"
+#line 628 "pgc.l"
 {
 						state_before = YYSTATE;
 						BEGIN(xdc);
@@ -2913,52 +2937,52 @@
 case 57:
 /* rule 57 can match eol */
 YY_RULE_SETUP
-#line 628 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 633 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 629 "pgc.l"
+#line 634 "pgc.l"
 { return TYPECAST; }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 630 "pgc.l"
+#line 635 "pgc.l"
 { return DOT_DOT; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 631 "pgc.l"
+#line 636 "pgc.l"
 { return COLON_EQUALS; }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 632 "pgc.l"
+#line 637 "pgc.l"
 { return EQUALS_GREATER; }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 633 "pgc.l"
+#line 638 "pgc.l"
 { return LESS_EQUALS; }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 634 "pgc.l"
+#line 639 "pgc.l"
 { return GREATER_EQUALS; }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 635 "pgc.l"
+#line 640 "pgc.l"
 { return NOT_EQUALS; }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 636 "pgc.l"
+#line 641 "pgc.l"
 { return NOT_EQUALS; }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 637 "pgc.l"
+#line 642 "pgc.l"
 {
 			  /* are we simulating Informix? */
 				if (INFORMIX_MODE)
@@ -2966,25 +2990,25 @@
 					unput(':');
 				}
 				else
-					return yytext[0];
+					return base_yytext[0];
 				}
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 646 "pgc.l"
+#line 651 "pgc.l"
 { /*
 					   * We may find a ';' inside a structure
 					   * definition in a TYPE or VAR statement.
 					   * This is not an EOL marker.
 					   */
-					  if (yytext[0] == ';' && struct_level == 0)
+					  if (base_yytext[0] == ';' && struct_level == 0)
 						 BEGIN(C);
-					  return yytext[0];
+					  return base_yytext[0];
 					}
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 655 "pgc.l"
+#line 660 "pgc.l"
 {
 						/*
 						 * Check for embedded slash-star or dash-dash; those
@@ -2992,9 +3016,9 @@
 						 * Note that slash-star or dash-dash at the first
 						 * character will match a prior rule, not this one.
 						 */
-						int		nchars = yyleng;
-						char   *slashstar = strstr(yytext, "/*");
-						char   *dashdash = strstr(yytext, "--");
+						int		nchars = base_yyleng;
+						char   *slashstar = strstr(base_yytext, "/*");
+						char   *dashdash = strstr(base_yytext, "--");
 
 						if (slashstar && dashdash)
 						{
@@ -3005,7 +3029,7 @@
 						else if (!slashstar)
 							slashstar = dashdash;
 						if (slashstar)
-							nchars = slashstar - yytext;
+							nchars = slashstar - base_yytext;
 
 						/*
 						 * For SQL compatibility, '+' and '-' cannot be the
@@ -3016,14 +3040,14 @@
 						 * sequences of SQL operators.
 						 */
 						while (nchars > 1 &&
-							   (yytext[nchars-1] == '+' ||
-								yytext[nchars-1] == '-'))
+							   (base_yytext[nchars-1] == '+' ||
+								base_yytext[nchars-1] == '-'))
 						{
 							int		ic;
 
 							for (ic = nchars-2; ic >= 0; ic--)
 							{
-								if (strchr("~!@#^&|`?%", yytext[ic]))
+								if (strchr("~!@#^&|`?%", base_yytext[ic]))
 									break;
 							}
 							if (ic >= 0)
@@ -3031,7 +3055,7 @@
 							nchars--; /* else remove the +/-, and check again */
 						}
 
-						if (nchars < yyleng)
+						if (nchars < base_yyleng)
 						{
 							/* Strip the unwanted chars from the token */
 							yyless(nchars);
@@ -3042,31 +3066,31 @@
 							 * that the "self" rule would have.
 							 */
 							if (nchars == 1 &&
-								strchr(",()[].;:+-*/%^<>=", yytext[0]))
-								return yytext[0];
+								strchr(",()[].;:+-*/%^<>=", base_yytext[0]))
+								return base_yytext[0];
 						}
 
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(base_yytext);
 						return Op;
 					}
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 719 "pgc.l"
+#line 724 "pgc.l"
 {
-						yylval.ival = atol(yytext+1);
+						base_yylval.ival = atol(base_yytext+1);
 						return PARAM;
 					}
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 723 "pgc.l"
+#line 728 "pgc.l"
 {
 						long val;
 						char* endptr;
 
 						errno = 0;
-						val = strtol((char *)yytext, &endptr,10);
+						val = strtol((char *)base_yytext, &endptr,10);
 						if (*endptr != '\0' || errno == ERANGE
 #ifdef HAVE_LONG_INT_64
 							/* if long > 32 bits, check for overflow of int4 */
@@ -3075,79 +3099,79 @@
 							)
 						{
 							errno = 0;
-							yylval.str = mm_strdup(yytext);
+							base_yylval.str = mm_strdup(base_yytext);
 							return FCONST;
 						}
-						yylval.ival = val;
+						base_yylval.ival = val;
 						return ICONST;
 					}
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 743 "pgc.l"
+#line 748 "pgc.l"
 {
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(base_yytext);
 						return IP;
 				}
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 747 "pgc.l"
+#line 752 "pgc.l"
 {
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(base_yytext);
 						return FCONST;
 			}
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 751 "pgc.l"
+#line 756 "pgc.l"
 {
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(base_yytext);
 						return FCONST;
 			}
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 755 "pgc.l"
+#line 760 "pgc.l"
 {
-						yyless(yyleng-1);
-						yylval.str = mm_strdup(yytext);
+						yyless(base_yyleng-1);
+						base_yylval.str = mm_strdup(base_yytext);
 						return FCONST;
 					}
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 760 "pgc.l"
+#line 765 "pgc.l"
 {
-						yyless(yyleng-2);
-						yylval.str = mm_strdup(yytext);
+						yyless(base_yyleng-2);
+						base_yylval.str = mm_strdup(base_yytext);
 						return FCONST;
 					}
 	YY_BREAK
 case 76:
 /* rule 76 can match eol */
 YY_RULE_SETUP
-#line 765 "pgc.l"
+#line 770 "pgc.l"
 {
-						yylval.str = mm_strdup(yytext+1);
+						base_yylval.str = mm_strdup(base_yytext+1);
 						return(CVARIABLE);
 					}
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 769 "pgc.l"
+#line 774 "pgc.l"
 {
 						const ScanKeyword  *keyword;
 
 						if (!isdefine())
 						{
 							/* Is it an SQL/ECPG keyword? */
-							keyword = ScanECPGKeywordLookup(yytext);
+							keyword = ScanECPGKeywordLookup(base_yytext);
 							if (keyword != NULL)
 								return keyword->value;
 
 							/* Is it a C keyword? */
-							keyword = ScanCKeywordLookup(yytext);
+							keyword = ScanCKeywordLookup(base_yytext);
 							if (keyword != NULL)
 								return keyword->value;
 
@@ -3159,25 +3183,25 @@
 							 * to do so; that's just another way that ecpg could get
 							 * out of step with the backend.
 							 */
-							yylval.str = mm_strdup(yytext);
+							base_yylval.str = mm_strdup(base_yytext);
 							return IDENT;
 						}
 					}
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 796 "pgc.l"
-{ return yytext[0]; }
+#line 801 "pgc.l"
+{ return base_yytext[0]; }
 	YY_BREAK
 case 79:
 /* rule 79 can match eol */
 YY_RULE_SETUP
-#line 797 "pgc.l"
+#line 802 "pgc.l"
 { BEGIN(SQL); return SQL_START; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 798 "pgc.l"
+#line 803 "pgc.l"
 {
 						/* are we simulating Informix? */
 						if (INFORMIX_MODE)
@@ -3192,21 +3216,21 @@
 case 81:
 /* rule 81 can match eol */
 YY_RULE_SETUP
-#line 808 "pgc.l"
+#line 813 "pgc.l"
 { ECHO; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 809 "pgc.l"
+#line 814 "pgc.l"
 {
 						char* endptr;
 
 						errno = 0;
-						yylval.ival = strtoul((char *)yytext,&endptr,16);
+						base_yylval.ival = strtoul((char *)base_yytext,&endptr,16);
 						if (*endptr != '\0' || errno == ERANGE)
 						{
 							errno = 0;
-							yylval.str = mm_strdup(yytext);
+							base_yylval.str = mm_strdup(base_yytext);
 							return SCONST;
 						}
 						return ICONST;
@@ -3215,7 +3239,7 @@
 case 83:
 /* rule 83 can match eol */
 YY_RULE_SETUP
-#line 822 "pgc.l"
+#line 827 "pgc.l"
 {
 						if (system_includes)
 						{
@@ -3224,7 +3248,7 @@
 						}
 						else
 						{
-							yylval.str = mm_strdup(yytext);
+							base_yylval.str = mm_strdup(base_yytext);
 							return(CPP_LINE);
 						}
 					}
@@ -3232,7 +3256,7 @@
 case 84:
 /* rule 84 can match eol */
 YY_RULE_SETUP
-#line 834 "pgc.l"
+#line 839 "pgc.l"
 {
 						if (system_includes)
 						{
@@ -3241,7 +3265,7 @@
 						}
 						else
 						{
-							yylval.str = mm_strdup(yytext);
+							base_yylval.str = mm_strdup(base_yytext);
 							return(CPP_LINE);
 						}
 					}
@@ -3249,15 +3273,15 @@
 case 85:
 /* rule 85 can match eol */
 YY_RULE_SETUP
-#line 846 "pgc.l"
+#line 851 "pgc.l"
 {
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(base_yytext);
 						return(CPP_LINE);
 					}
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 850 "pgc.l"
+#line 855 "pgc.l"
 {
 						const ScanKeyword		*keyword;
 
@@ -3269,18 +3293,18 @@
 						{
 							if (current_function)
 								free(current_function);
-							current_function = mm_strdup(yytext);
+							current_function = mm_strdup(base_yytext);
 						}
 						/* Informix uses SQL defines only in SQL space */
 						/* however, some defines have to be taken care of for compatibility */
 						if ((!INFORMIX_MODE || !isinformixdefine()) && !isdefine())
 						{
-							keyword = ScanCKeywordLookup(yytext);
+							keyword = ScanCKeywordLookup(base_yytext);
 							if (keyword != NULL)
 								return keyword->value;
 							else
 							{
-								yylval.str = mm_strdup(yytext);
+								base_yylval.str = mm_strdup(base_yytext);
 								return IDENT;
 							}
 						}
@@ -3288,185 +3312,185 @@
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 877 "pgc.l"
+#line 882 "pgc.l"
 { mmerror(PARSE_ERROR, ET_ERROR, "nested /* ... */ comments"); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 878 "pgc.l"
+#line 883 "pgc.l"
 { return(':'); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 879 "pgc.l"
+#line 884 "pgc.l"
 { return(';'); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 880 "pgc.l"
+#line 885 "pgc.l"
 { return(','); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 881 "pgc.l"
+#line 886 "pgc.l"
 { return('*'); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 882 "pgc.l"
+#line 887 "pgc.l"
 { return('%'); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 883 "pgc.l"
+#line 888 "pgc.l"
 { return('/'); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 884 "pgc.l"
+#line 889 "pgc.l"
 { return('+'); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 885 "pgc.l"
+#line 890 "pgc.l"
 { return('-'); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 886 "pgc.l"
+#line 891 "pgc.l"
 { parenths_open++; return('('); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 887 "pgc.l"
+#line 892 "pgc.l"
 { parenths_open--; return(')'); }
 	YY_BREAK
 case 98:
 /* rule 98 can match eol */
 YY_RULE_SETUP
-#line 888 "pgc.l"
+#line 893 "pgc.l"
 { ECHO; }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 889 "pgc.l"
+#line 894 "pgc.l"
 { return('{'); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 890 "pgc.l"
+#line 895 "pgc.l"
 { return('}'); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 891 "pgc.l"
+#line 896 "pgc.l"
 { return('['); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 892 "pgc.l"
+#line 897 "pgc.l"
 { return(']'); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 893 "pgc.l"
+#line 898 "pgc.l"
 { return('='); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 894 "pgc.l"
+#line 899 "pgc.l"
 { return(S_MEMBER); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 895 "pgc.l"
+#line 900 "pgc.l"
 { return(S_RSHIFT); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 896 "pgc.l"
+#line 901 "pgc.l"
 { return(S_LSHIFT); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 897 "pgc.l"
+#line 902 "pgc.l"
 { return(S_OR); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 898 "pgc.l"
+#line 903 "pgc.l"
 { return(S_AND); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 899 "pgc.l"
+#line 904 "pgc.l"
 { return(S_INC); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 900 "pgc.l"
+#line 905 "pgc.l"
 { return(S_DEC); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 901 "pgc.l"
+#line 906 "pgc.l"
 { return(S_EQUAL); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 902 "pgc.l"
+#line 907 "pgc.l"
 { return(S_NEQUAL); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 903 "pgc.l"
+#line 908 "pgc.l"
 { return(S_ADD); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 904 "pgc.l"
+#line 909 "pgc.l"
 { return(S_SUB); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 905 "pgc.l"
+#line 910 "pgc.l"
 { return(S_MUL); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 906 "pgc.l"
+#line 911 "pgc.l"
 { return(S_DIV); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 907 "pgc.l"
+#line 912 "pgc.l"
 { return(S_MOD); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 908 "pgc.l"
+#line 913 "pgc.l"
 { return(S_MEMPOINT); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 909 "pgc.l"
+#line 914 "pgc.l"
 { return(S_DOTPOINT); }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 910 "pgc.l"
+#line 915 "pgc.l"
 { return S_ANYTHING; }
 	YY_BREAK
 case 121:
 /* rule 121 can match eol */
 YY_RULE_SETUP
-#line 911 "pgc.l"
+#line 916 "pgc.l"
 { BEGIN(def_ident); }
 	YY_BREAK
 case 122:
 /* rule 122 can match eol */
 YY_RULE_SETUP
-#line 912 "pgc.l"
+#line 917 "pgc.l"
 {
 						/* are we simulating Informix? */
 						if (INFORMIX_MODE)
@@ -3483,13 +3507,13 @@
 case 123:
 /* rule 123 can match eol */
 YY_RULE_SETUP
-#line 924 "pgc.l"
+#line 929 "pgc.l"
 { BEGIN(undef); }
 	YY_BREAK
 case 124:
 /* rule 124 can match eol */
 YY_RULE_SETUP
-#line 925 "pgc.l"
+#line 930 "pgc.l"
 {
 						/* are we simulating Informix? */
 						if (INFORMIX_MODE)
@@ -3506,25 +3530,25 @@
 case 125:
 /* rule 125 can match eol */
 YY_RULE_SETUP
-#line 937 "pgc.l"
+#line 942 "pgc.l"
 {
 					struct _defines *ptr, *ptr2 = NULL;
 					int i;
 
 					/*
-					 *	Skip the ";" and trailing whitespace. Note that yytext
+					 *	Skip the ";" and trailing whitespace. Note that base_yytext
 					 *	contains at least one non-space character plus the ";"
 					 */
-					for (i = strlen(yytext)-2;
-						 i > 0 && ecpg_isspace(yytext[i]);
+					for (i = strlen(base_yytext)-2;
+						 i > 0 && ecpg_isspace(base_yytext[i]);
 						 i-- )
 						;
-					yytext[i+1] = '\0';
+					base_yytext[i+1] = '\0';
 
 
 					for (ptr = defines; ptr != NULL; ptr2 = ptr, ptr = ptr->next)
 					{
-						if (strcmp(yytext, ptr->old) == 0)
+						if (strcmp(base_yytext, ptr->old) == 0)
 						{
 							if (ptr2 == NULL)
 								defines = ptr->next;
@@ -3543,7 +3567,7 @@
 case 126:
 /* rule 126 can match eol */
 YY_RULE_SETUP
-#line 969 "pgc.l"
+#line 974 "pgc.l"
 {
 						mmfatal(PARSE_ERROR, "missing identifier in EXEC SQL UNDEF command");
 						yyterminate();
@@ -3552,13 +3576,13 @@
 case 127:
 /* rule 127 can match eol */
 YY_RULE_SETUP
-#line 973 "pgc.l"
+#line 978 "pgc.l"
 { BEGIN(incl); }
 	YY_BREAK
 case 128:
 /* rule 128 can match eol */
 YY_RULE_SETUP
-#line 974 "pgc.l"
+#line 979 "pgc.l"
 {
 					  /* are we simulating Informix? */
 					  if (INFORMIX_MODE)
@@ -3575,13 +3599,13 @@
 case 129:
 /* rule 129 can match eol */
 YY_RULE_SETUP
-#line 986 "pgc.l"
+#line 991 "pgc.l"
 { ifcond = TRUE; BEGIN(xcond); }
 	YY_BREAK
 case 130:
 /* rule 130 can match eol */
 YY_RULE_SETUP
-#line 987 "pgc.l"
+#line 992 "pgc.l"
 {
 					  /* are we simulating Informix? */
 					  if (INFORMIX_MODE)
@@ -3599,13 +3623,13 @@
 case 131:
 /* rule 131 can match eol */
 YY_RULE_SETUP
-#line 1000 "pgc.l"
+#line 1005 "pgc.l"
 { ifcond = FALSE; BEGIN(xcond); }
 	YY_BREAK
 case 132:
 /* rule 132 can match eol */
 YY_RULE_SETUP
-#line 1001 "pgc.l"
+#line 1006 "pgc.l"
 {
 					  /* are we simulating Informix? */
 					  if (INFORMIX_MODE)
@@ -3623,7 +3647,7 @@
 case 133:
 /* rule 133 can match eol */
 YY_RULE_SETUP
-#line 1014 "pgc.l"
+#line 1019 "pgc.l"
 {	/* pop stack */
 						if ( preproc_tos == 0 ) {
 							mmfatal(PARSE_ERROR, "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\"");
@@ -3639,7 +3663,7 @@
 case 134:
 /* rule 134 can match eol */
 YY_RULE_SETUP
-#line 1025 "pgc.l"
+#line 1030 "pgc.l"
 {
 					/* are we simulating Informix? */
 					if (INFORMIX_MODE)
@@ -3664,7 +3688,7 @@
 case 135:
 /* rule 135 can match eol */
 YY_RULE_SETUP
-#line 1046 "pgc.l"
+#line 1051 "pgc.l"
 {	/* only exec sql endif pops the stack, so take care of duplicated 'else' */
 					if (stacked_if_value[preproc_tos].else_branch)
 						mmfatal(PARSE_ERROR, "more than one EXEC SQL ELSE");
@@ -3685,7 +3709,7 @@
 case 136:
 /* rule 136 can match eol */
 YY_RULE_SETUP
-#line 1062 "pgc.l"
+#line 1067 "pgc.l"
 {
 					/* are we simulating Informix? */
 					if (INFORMIX_MODE)
@@ -3715,7 +3739,7 @@
 case 137:
 /* rule 137 can match eol */
 YY_RULE_SETUP
-#line 1087 "pgc.l"
+#line 1092 "pgc.l"
 {
 					if (preproc_tos == 0)
 						mmfatal(PARSE_ERROR, "unmatched EXEC SQL ENDIF");
@@ -3731,7 +3755,7 @@
 case 138:
 /* rule 138 can match eol */
 YY_RULE_SETUP
-#line 1098 "pgc.l"
+#line 1103 "pgc.l"
 {
 					/* are we simulating Informix? */
 					if (INFORMIX_MODE)
@@ -3755,13 +3779,13 @@
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 1119 "pgc.l"
+#line 1124 "pgc.l"
 { /* ignore */ }
 	YY_BREAK
 case 140:
 /* rule 140 can match eol */
 YY_RULE_SETUP
-#line 1121 "pgc.l"
+#line 1126 "pgc.l"
 {
 					if (preproc_tos >= MAX_NESTED_IF-1)
 						mmfatal(PARSE_ERROR, "too many nested EXEC SQL IFDEF conditions");
@@ -3771,17 +3795,17 @@
 						unsigned int i;
 
 						/*
-						 *	Skip the ";" and trailing whitespace. Note that yytext
+						 *	Skip the ";" and trailing whitespace. Note that base_yytext
 						 *	contains at least one non-space character plus the ";"
 						 */
-						for (i = strlen(yytext)-2;
-							 i > 0 && ecpg_isspace(yytext[i]);
+						for (i = strlen(base_yytext)-2;
+							 i > 0 && ecpg_isspace(base_yytext[i]);
 							 i-- )
 							;
-						yytext[i+1] = '\0';
+						base_yytext[i+1] = '\0';
 
 						for (defptr = defines;
-							 defptr != NULL && strcmp(yytext, defptr->old) != 0;
+							 defptr != NULL && strcmp(base_yytext, defptr->old) != 0;
 							 defptr = defptr->next);
 
 						preproc_tos++;
@@ -3799,7 +3823,7 @@
 case 141:
 /* rule 141 can match eol */
 YY_RULE_SETUP
-#line 1155 "pgc.l"
+#line 1160 "pgc.l"
 {
 				mmfatal(PARSE_ERROR, "missing identifier in EXEC SQL IFDEF command");
 				yyterminate();
@@ -3807,9 +3831,9 @@
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 1159 "pgc.l"
+#line 1164 "pgc.l"
 {
-				old = mm_strdup(yytext);
+				old = mm_strdup(base_yytext);
 				BEGIN(def);
 				startlit();
 			}
@@ -3817,7 +3841,7 @@
 case 143:
 /* rule 143 can match eol */
 YY_RULE_SETUP
-#line 1164 "pgc.l"
+#line 1169 "pgc.l"
 {
 				mmfatal(PARSE_ERROR, "missing identifier in EXEC SQL DEFINE command");
 				yyterminate();
@@ -3826,7 +3850,7 @@
 case 144:
 /* rule 144 can match eol */
 YY_RULE_SETUP
-#line 1168 "pgc.l"
+#line 1173 "pgc.l"
 {
 						struct _defines *ptr, *this;
 
@@ -3856,31 +3880,31 @@
 case 145:
 /* rule 145 can match eol */
 YY_RULE_SETUP
-#line 1193 "pgc.l"
-{ addlit(yytext, yyleng); }
+#line 1198 "pgc.l"
+{ addlit(base_yytext, base_yyleng); }
 	YY_BREAK
 case 146:
 /* rule 146 can match eol */
 YY_RULE_SETUP
-#line 1194 "pgc.l"
+#line 1199 "pgc.l"
 {	parse_include(); }
 	YY_BREAK
 case 147:
 /* rule 147 can match eol */
 YY_RULE_SETUP
-#line 1195 "pgc.l"
+#line 1200 "pgc.l"
 {	parse_include(); }
 	YY_BREAK
 case 148:
 /* rule 148 can match eol */
 YY_RULE_SETUP
-#line 1196 "pgc.l"
+#line 1201 "pgc.l"
 { parse_include(); }
 	YY_BREAK
 case 149:
 /* rule 149 can match eol */
 YY_RULE_SETUP
-#line 1197 "pgc.l"
+#line 1202 "pgc.l"
 {
 					mmfatal(PARSE_ERROR, "syntax error in EXEC SQL INCLUDE command");
 					yyterminate();
@@ -3895,7 +3919,7 @@
 case YY_STATE_EOF(undef):
 case YY_STATE_EOF(xcond):
 case YY_STATE_EOF(xskip):
-#line 1202 "pgc.l"
+#line 1207 "pgc.l"
 {
 					if (yy_buffer == NULL)
 					{
@@ -3919,13 +3943,13 @@
 								break;
 							}
 
-						if (yyin != NULL)
-							fclose(yyin);
+						if (base_yyin != NULL)
+							fclose(base_yyin);
 
-						yy_delete_buffer(YY_CURRENT_BUFFER );
-						yy_switch_to_buffer(yy_buffer->buffer);
+						base_yy_delete_buffer(YY_CURRENT_BUFFER );
+						base_yy_switch_to_buffer(yy_buffer->buffer);
 
-						yylineno = yy_buffer->lineno;
+						base_yylineno = yy_buffer->lineno;
 
 						/* We have to output the filename only if we change files here */
 						i = strcmp(input_filename, yy_buffer->filename);
@@ -3945,15 +3969,15 @@
 case 150:
 /* rule 150 can match eol */
 YY_RULE_SETUP
-#line 1247 "pgc.l"
+#line 1252 "pgc.l"
 { mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"); }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 1248 "pgc.l"
+#line 1253 "pgc.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 3957 "pgc.c"
+#line 3981 "pgc.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -3968,15 +3992,15 @@
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
+			 * just pointed base_yyin at a new source and called
+			 * base_yylex().  If so, then we have to assure
 			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
 			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = base_yyin;
 			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
@@ -4030,11 +4054,11 @@
 				{
 				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( yywrap( ) )
+				if ( base_yywrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
+					 * base_yytext, we can now set up
 					 * yy_c_buf_p so that if some total
 					 * hoser (like flex itself) wants to
 					 * call the scanner after we return the
@@ -4084,7 +4108,7 @@
 	} /* end of action switch */
 		} /* end of scanning one token */
 	} /* end of user's declarations */
-} /* end of yylex */
+} /* end of base_yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -4139,7 +4163,7 @@
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -4162,7 +4186,7 @@
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					base_yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -4194,7 +4218,7 @@
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart(yyin  );
+			base_yyrestart(base_yyin  );
 			}
 
 		else
@@ -4211,7 +4235,7 @@
 	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
 		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) base_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
 	}
@@ -4288,7 +4312,7 @@
     
     yy_cp = (yy_c_buf_p);
 
-	/* undo effects of setting up yytext */
+	/* undo effects of setting up base_yytext */
 	*yy_cp = (yy_hold_char);
 
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
@@ -4315,7 +4339,7 @@
 	*--yy_cp = (char) c;
 
     if ( c == '\n' ){
-        --yylineno;
+        --base_yylineno;
     }
 
 	(yytext_ptr) = yy_bp;
@@ -4364,13 +4388,13 @@
 					 */
 
 					/* Reset buffer status. */
-					yyrestart(yyin );
+					base_yyrestart(base_yyin );
 
 					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap( ) )
+					if ( base_yywrap( ) )
 						return EOF;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
@@ -4390,12 +4414,12 @@
 		}
 
 	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve yytext */
+	*(yy_c_buf_p) = '\0';	/* preserve base_yytext */
 	(yy_hold_char) = *++(yy_c_buf_p);
 
 	if ( c == '\n' )
 		   
-    yylineno++;
+    base_yylineno++;
 ;
 
 	return c;
@@ -4407,32 +4431,32 @@
  * 
  * @note This function does not reset the start condition to @c INITIAL .
  */
-    void yyrestart  (FILE * input_file )
+    void base_yyrestart  (FILE * input_file )
 {
     
 	if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
+        base_yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
+            base_yy_create_buffer(base_yyin,YY_BUF_SIZE );
 	}
 
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
+	base_yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	base_yy_load_buffer_state( );
 }
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
  * 
  */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+    void base_yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
     
 	/* TODO. We should be able to replace this entire function body
 	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
+	 *		base_yypop_buffer_state();
+	 *		base_yypush_buffer_state(new_buffer);
      */
-	yyensure_buffer_stack ();
+	base_yyensure_buffer_stack ();
 	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
@@ -4445,21 +4469,21 @@
 		}
 
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
+	base_yy_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
+	 * EOF (base_yywrap()) processing, but the only time this flag
+	 * is looked at is after base_yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
-static void yy_load_buffer_state  (void)
+static void base_yy_load_buffer_state  (void)
 {
     	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
 	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	base_yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
 	(yy_hold_char) = *(yy_c_buf_p);
 }
 
@@ -4469,35 +4493,35 @@
  * 
  * @return the allocated buffer state.
  */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+    YY_BUFFER_STATE base_yy_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
     
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) base_yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in base_yy_create_buffer()" );
 
 	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) base_yyalloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in base_yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer(b,file );
+	base_yy_init_buffer(b,file );
 
 	return b;
 }
 
 /** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
+ * @param b a buffer created with base_yy_create_buffer()
  * 
  */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
+    void base_yy_delete_buffer (YY_BUFFER_STATE  b )
 {
     
 	if ( ! b )
@@ -4507,27 +4531,27 @@
 		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
+		base_yyfree((void *) b->yy_ch_buf  );
 
-	yyfree((void *) b  );
+	base_yyfree((void *) b  );
 }
 
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
+ * such as during a base_yyrestart() or at EOF.
  */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+    static void base_yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
 {
 	int oerrno = errno;
     
-	yy_flush_buffer(b );
+	base_yy_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
+    /* If b is the current buffer, then base_yy_init_buffer was _probably_
+     * called from base_yyrestart() or through yy_get_next_buffer.
      * In that case, we don't want to reset the lineno or column.
      */
     if (b != YY_CURRENT_BUFFER){
@@ -4544,7 +4568,7 @@
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
  * 
  */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
+    void base_yy_flush_buffer (YY_BUFFER_STATE  b )
 {
     	if ( ! b )
 		return;
@@ -4564,7 +4588,7 @@
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
 	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state( );
+		base_yy_load_buffer_state( );
 }
 
 /** Pushes the new state onto the stack. The new state becomes
@@ -4573,14 +4597,14 @@
  *  @param new_buffer The new state.
  *  
  */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+void base_yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
     	if (new_buffer == NULL)
 		return;
 
-	yyensure_buffer_stack();
+	base_yyensure_buffer_stack();
 
-	/* This block is copied from yy_switch_to_buffer. */
+	/* This block is copied from base_yy_switch_to_buffer. */
 	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
@@ -4594,8 +4618,8 @@
 		(yy_buffer_stack_top)++;
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
 
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state( );
+	/* copied from base_yy_switch_to_buffer. */
+	base_yy_load_buffer_state( );
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
@@ -4603,18 +4627,18 @@
  *  The next element becomes the new top.
  *  
  */
-void yypop_buffer_state (void)
+void base_yypop_buffer_state (void)
 {
     	if (!YY_CURRENT_BUFFER)
 		return;
 
-	yy_delete_buffer(YY_CURRENT_BUFFER );
+	base_yy_delete_buffer(YY_CURRENT_BUFFER );
 	YY_CURRENT_BUFFER_LVALUE = NULL;
 	if ((yy_buffer_stack_top) > 0)
 		--(yy_buffer_stack_top);
 
 	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state( );
+		base_yy_load_buffer_state( );
 		(yy_did_buffer_switch_on_eof) = 1;
 	}
 }
@@ -4622,7 +4646,7 @@
 /* Allocates the stack if it does not exist.
  *  Guarantees space for at least one push.
  */
-static void yyensure_buffer_stack (void)
+static void base_yyensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
     
@@ -4633,11 +4657,11 @@
 		 * immediate realloc on the next call.
          */
 		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+		(yy_buffer_stack) = (struct yy_buffer_state**)base_yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+			YY_FATAL_ERROR( "out of dynamic memory in base_yyensure_buffer_stack()" );
 								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
@@ -4652,12 +4676,12 @@
 		int grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+		(yy_buffer_stack) = (struct yy_buffer_state**)base_yyrealloc
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+			YY_FATAL_ERROR( "out of dynamic memory in base_yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -4671,7 +4695,7 @@
  * 
  * @return the newly allocated buffer state object. 
  */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+YY_BUFFER_STATE base_yy_scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
     
@@ -4681,9 +4705,9 @@
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) base_yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in base_yy_scan_buffer()" );
 
 	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
@@ -4695,33 +4719,33 @@
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer(b  );
+	base_yy_switch_to_buffer(b  );
 
 	return b;
 }
 
-/** Setup the input buffer state to scan a string. The next call to yylex() will
+/** Setup the input buffer state to scan a string. The next call to base_yylex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
+ *       base_yy_scan_bytes() instead.
  */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+YY_BUFFER_STATE base_yy_scan_string (yyconst char * yystr )
 {
     
-	return yy_scan_bytes(yystr,strlen(yystr) );
+	return base_yy_scan_bytes(yystr,strlen(yystr) );
 }
 
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+/** Setup the input buffer state to scan the given bytes. The next call to base_yylex() will
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE base_yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
@@ -4730,18 +4754,18 @@
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
-	buf = (char *) yyalloc(n  );
+	buf = (char *) base_yyalloc(n  );
 	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+		YY_FATAL_ERROR( "out of dynamic memory in base_yy_scan_bytes()" );
 
 	for ( i = 0; i < _yybytes_len; ++i )
 		buf[i] = yybytes[i];
 
 	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer(buf,n );
+	b = base_yy_scan_buffer(buf,n );
 	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+		YY_FATAL_ERROR( "bad buffer in base_yy_scan_bytes()" );
 
 	/* It's okay to grow etc. this buffer, and we should throw it
 	 * away when we're done.
@@ -4767,14 +4791,14 @@
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up yytext. */ \
+		/* Undo effects of setting up base_yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = (yy_hold_char); \
-		(yy_c_buf_p) = yytext + yyless_macro_arg; \
+		base_yytext[base_yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = base_yytext + yyless_macro_arg; \
 		(yy_hold_char) = *(yy_c_buf_p); \
 		*(yy_c_buf_p) = '\0'; \
-		yyleng = yyless_macro_arg; \
+		base_yyleng = yyless_macro_arg; \
 		} \
 	while ( 0 )
 
@@ -4783,89 +4807,89 @@
 /** Get the current line number.
  * 
  */
-int yyget_lineno  (void)
+int base_yyget_lineno  (void)
 {
         
-    return yylineno;
+    return base_yylineno;
 }
 
 /** Get the input stream.
  * 
  */
-FILE *yyget_in  (void)
+FILE *base_yyget_in  (void)
 {
-        return yyin;
+        return base_yyin;
 }
 
 /** Get the output stream.
  * 
  */
-FILE *yyget_out  (void)
+FILE *base_yyget_out  (void)
 {
-        return yyout;
+        return base_yyout;
 }
 
 /** Get the length of the current token.
  * 
  */
-yy_size_t yyget_leng  (void)
+yy_size_t base_yyget_leng  (void)
 {
-        return yyleng;
+        return base_yyleng;
 }
 
 /** Get the current token.
  * 
  */
 
-char *yyget_text  (void)
+char *base_yyget_text  (void)
 {
-        return yytext;
+        return base_yytext;
 }
 
 /** Set the current line number.
  * @param line_number
  * 
  */
-void yyset_lineno (int  line_number )
+void base_yyset_lineno (int  line_number )
 {
     
-    yylineno = line_number;
+    base_yylineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.
  * 
- * @see yy_switch_to_buffer
+ * @see base_yy_switch_to_buffer
  */
-void yyset_in (FILE *  in_str )
+void base_yyset_in (FILE *  in_str )
 {
-        yyin = in_str ;
+        base_yyin = in_str ;
 }
 
-void yyset_out (FILE *  out_str )
+void base_yyset_out (FILE *  out_str )
 {
-        yyout = out_str ;
+        base_yyout = out_str ;
 }
 
-int yyget_debug  (void)
+int base_yyget_debug  (void)
 {
-        return yy_flex_debug;
+        return base_yy_flex_debug;
 }
 
-void yyset_debug (int  bdebug )
+void base_yyset_debug (int  bdebug )
 {
-        yy_flex_debug = bdebug ;
+        base_yy_flex_debug = bdebug ;
 }
 
 static int yy_init_globals (void)
 {
         /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from yylex_destroy(), so don't allocate here.
+     * This function is called from base_yylex_destroy(), so don't allocate here.
      */
 
-    /* We do not touch yylineno unless the option is enabled. */
-    yylineno =  1;
+    /* We do not touch base_yylineno unless the option is enabled. */
+    base_yylineno =  1;
     
     (yy_buffer_stack) = 0;
     (yy_buffer_stack_top) = 0;
@@ -4876,36 +4900,36 @@
 
 /* Defined in main.c */
 #ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
+    base_yyin = stdin;
+    base_yyout = stdout;
 #else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
+    base_yyin = (FILE *) 0;
+    base_yyout = (FILE *) 0;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
-     * yylex_init()
+     * base_yylex_init()
      */
     return 0;
 }
 
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
+/* base_yylex_destroy is for both reentrant and non-reentrant scanners. */
+int base_yylex_destroy  (void)
 {
     
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer(YY_CURRENT_BUFFER  );
+		base_yy_delete_buffer(YY_CURRENT_BUFFER  );
 		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state();
+		base_yypop_buffer_state();
 	}
 
 	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
+	base_yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * yylex() is called, initialization will occur. */
+     * base_yylex() is called, initialization will occur. */
     yy_init_globals( );
 
     return 0;
@@ -4935,12 +4959,12 @@
 }
 #endif
 
-void *yyalloc (yy_size_t  size )
+void *base_yyalloc (yy_size_t  size )
 {
 	return (void *) malloc( size );
 }
 
-void *yyrealloc  (void * ptr, yy_size_t  size )
+void *base_yyrealloc  (void * ptr, yy_size_t  size )
 {
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
@@ -4952,14 +4976,14 @@
 	return (void *) realloc( (char *) ptr, size );
 }
 
-void yyfree (void * ptr )
+void base_yyfree (void * ptr )
 {
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+	free( (char *) ptr );	/* see base_yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
 
-#line 1247 "pgc.l"
+#line 1252 "pgc.l"
 
 
 void
@@ -4970,7 +4994,7 @@
 	current_function = NULL;
 
 	preproc_tos = 0;
-	yylineno = 1;
+	base_yylineno = 1;
 	ifcond = TRUE;
 	stacked_if_value[preproc_tos].condition = ifcond;
 	stacked_if_value[preproc_tos].else_branch = FALSE;
@@ -5030,7 +5054,7 @@
 	yb = mm_alloc(sizeof(struct _yy_buffer));
 
 	yb->buffer =	YY_CURRENT_BUFFER;
-	yb->lineno = yylineno;
+	yb->lineno = base_yylineno;
 	yb->filename = input_filename;
 	yb->next = yy_buffer;
 
@@ -5038,80 +5062,80 @@
 
 	/*
 	 * skip the ";" if there is one and trailing whitespace. Note that
-	 * yytext contains at least one non-space character plus the ";"
+	 * base_yytext contains at least one non-space character plus the ";"
 	 */
-	for (i = strlen(yytext)-2;
-		 i > 0 && ecpg_isspace(yytext[i]);
+	for (i = strlen(base_yytext)-2;
+		 i > 0 && ecpg_isspace(base_yytext[i]);
 		 i--)
 		;
 
-	if (yytext[i] == ';')
+	if (base_yytext[i] == ';')
 		i--;
 
-	yytext[i+1] = '\0';
+	base_yytext[i+1] = '\0';
 
-	yyin = NULL;
+	base_yyin = NULL;
 
 	/* If file name is enclosed in '"' remove these and look only in '.' */
 	/* Informix does look into all include paths though, except filename starts with '/' */
-	if (yytext[0] == '"' && yytext[i] == '"' &&
-		((compat != ECPG_COMPAT_INFORMIX && compat != ECPG_COMPAT_INFORMIX_SE) || yytext[1] == '/'))
+	if (base_yytext[0] == '"' && base_yytext[i] == '"' &&
+		((compat != ECPG_COMPAT_INFORMIX && compat != ECPG_COMPAT_INFORMIX_SE) || base_yytext[1] == '/'))
 	{
-		yytext[i] = '\0';
-		memmove(yytext, yytext+1, strlen(yytext));
+		base_yytext[i] = '\0';
+		memmove(base_yytext, base_yytext+1, strlen(base_yytext));
 
-		strlcpy(inc_file, yytext, sizeof(inc_file));
-		yyin = fopen(inc_file, "r");
-		if (!yyin)
+		strlcpy(inc_file, base_yytext, sizeof(inc_file));
+		base_yyin = fopen(inc_file, "r");
+		if (!base_yyin)
 		{
 			if (strcmp(inc_file + strlen(inc_file) - 2, ".h") != 0)
 			{
 				strcat(inc_file, ".h");
-				yyin = fopen(inc_file, "r");
+				base_yyin = fopen(inc_file, "r");
 			}
 		}
 
 	}
 	else
 	{
-		if ((yytext[0] == '"' && yytext[i] == '"') || (yytext[0] == '<' && yytext[i] == '>'))
+		if ((base_yytext[0] == '"' && base_yytext[i] == '"') || (base_yytext[0] == '<' && base_yytext[i] == '>'))
 		{
-			yytext[i] = '\0';
-			memmove(yytext, yytext+1, strlen(yytext));
+			base_yytext[i] = '\0';
+			memmove(base_yytext, base_yytext+1, strlen(base_yytext));
 		}
 
-		for (ip = include_paths; yyin == NULL && ip != NULL; ip = ip->next)
+		for (ip = include_paths; base_yyin == NULL && ip != NULL; ip = ip->next)
 		{
-			if (strlen(ip->path) + strlen(yytext) + 3 > MAXPGPATH)
+			if (strlen(ip->path) + strlen(base_yytext) + 3 > MAXPGPATH)
 			{
-				fprintf(stderr, _("Error: include path \"%s/%s\" is too long on line %d, skipping\n"), ip->path, yytext, yylineno);
+				fprintf(stderr, _("Error: include path \"%s/%s\" is too long on line %d, skipping\n"), ip->path, base_yytext, base_yylineno);
 				continue;
 			}
-			snprintf (inc_file, sizeof(inc_file), "%s/%s", ip->path, yytext);
-			yyin = fopen(inc_file, "r");
-			if (!yyin)
+			snprintf (inc_file, sizeof(inc_file), "%s/%s", ip->path, base_yytext);
+			base_yyin = fopen(inc_file, "r");
+			if (!base_yyin)
 			{
 				if (strcmp(inc_file + strlen(inc_file) - 2, ".h") != 0)
 				{
 					strcat(inc_file, ".h");
-					yyin = fopen( inc_file, "r" );
+					base_yyin = fopen( inc_file, "r" );
 				}
 			}
 			/* if the command was "include_next" we have to disregard the first hit */
-			if (yyin && include_next)
+			if (base_yyin && include_next)
 			{
-				fclose (yyin);
-				yyin = NULL;
+				fclose (base_yyin);
+				base_yyin = NULL;
 				include_next = false;
 			}
 		}
 	}
-	if (!yyin)
-		mmfatal(NO_INCLUDE_FILE, "could not open include file \"%s\" on line %d", yytext, yylineno);
+	if (!base_yyin)
+		mmfatal(NO_INCLUDE_FILE, "could not open include file \"%s\" on line %d", base_yytext, base_yylineno);
 
 	input_filename = mm_strdup(inc_file);
-	yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE ));
-	yylineno = 1;
+	base_yy_switch_to_buffer(base_yy_create_buffer(base_yyin,YY_BUF_SIZE ));
+	base_yylineno = 1;
 	output_line_number();
 
 	BEGIN(C);
@@ -5139,20 +5163,20 @@
 	/* is it a define? */
 	for (ptr = defines; ptr; ptr = ptr->next)
 	{
-		if (strcmp(yytext, ptr->old) == 0 && ptr->used == NULL)
+		if (strcmp(base_yytext, ptr->old) == 0 && ptr->used == NULL)
 		{
 			struct _yy_buffer *yb;
 
 			yb = mm_alloc(sizeof(struct _yy_buffer));
 
 			yb->buffer =  YY_CURRENT_BUFFER;
-			yb->lineno = yylineno;
+			yb->lineno = base_yylineno;
 			yb->filename = mm_strdup(input_filename);
 			yb->next = yy_buffer;
 
 			ptr->used = yy_buffer = yb;
 
-			yy_scan_string(ptr->new);
+			base_yy_scan_string(ptr->new);
 			return true;
 		}
 	}
@@ -5164,11 +5188,11 @@
 {
 	const char *new = NULL;
 
-	if (strcmp(yytext, "dec_t") == 0)
+	if (strcmp(base_yytext, "dec_t") == 0)
 		new = "decimal";
-	else if (strcmp(yytext, "intrvl_t") == 0)
+	else if (strcmp(base_yytext, "intrvl_t") == 0)
 		new = "interval";
-	else if (strcmp(yytext, "dtime_t") == 0)
+	else if (strcmp(base_yytext, "dtime_t") == 0)
 		new = "timestamp";
 
 	if (new)
@@ -5178,12 +5202,12 @@
 		yb = mm_alloc(sizeof(struct _yy_buffer));
 
 		yb->buffer =  YY_CURRENT_BUFFER;
-		yb->lineno = yylineno;
+		yb->lineno = base_yylineno;
 		yb->filename = mm_strdup(input_filename);
 		yb->next = yy_buffer;
 		yy_buffer = yb;
 
-		yy_scan_string(new);
+		base_yy_scan_string(new);
 		return true;
 	}
 
@@ -5202,7 +5226,7 @@
 	 * Might be left over after ereport()
 	 */
 	if (YY_CURRENT_BUFFER)
-		yy_delete_buffer(YY_CURRENT_BUFFER);
+		base_yy_delete_buffer(YY_CURRENT_BUFFER);
 
 	/*
 	 * Make a scan buffer with special termination needed by flex.
@@ -5210,7 +5234,7 @@
 	scanbuf = mm_alloc(slen + 2);
 	memcpy(scanbuf, str, slen);
 	scanbuf[slen] = scanbuf[slen + 1] = YY_END_OF_BUFFER_CHAR;
-	scanbufhandle = yy_scan_buffer(scanbuf,slen + 2);
+	scanbufhandle = base_yy_scan_buffer(scanbuf,slen + 2);
 
 	/* initialize literal buffer to a reasonable but expansible size */
 	literalalloc = 128;
@@ -5227,7 +5251,7 @@
 void
 scanner_finish(void)
 {
-	yy_delete_buffer(scanbufhandle);
+	base_yy_delete_buffer(scanbufhandle);
 	free(scanbuf);
 }
 
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/pgc.l postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/pgc.l
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/pgc.l	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/pgc.l	2017-08-07 21:13:41.000000000 +0000
@@ -1,4 +1,4 @@
-%{
+%top{
 /*-------------------------------------------------------------------------
  *
  * pgc.l
@@ -23,8 +23,11 @@
 #include <limits.h>
 
 #include "extern.h"
+#include "preproc.h"
+}
 
-extern YYSTYPE yylval;
+%{
+extern YYSTYPE base_yylval;
 
 static int		xcdepth = 0;	/* depth of nesting in slash-star comments */
 static char	   *dolqstart = NULL;	/* current $foo$ quote start string */
@@ -85,6 +88,7 @@
 %option noinput
 %option noyywrap
 %option warn
+%option prefix="base_yy"
 
 %option yylineno
 
@@ -439,7 +443,7 @@
 					BEGIN(SQL);
 					if (literalbuf[strspn(literalbuf, "01") + 1] != '\0')
 						mmerror(PARSE_ERROR, ET_ERROR, "invalid bit string literal");
-					yylval.str = mm_strdup(literalbuf);
+					base_yylval.str = mm_strdup(literalbuf);
 					return BCONST;
 				}
 
@@ -459,7 +463,7 @@
 <xh>{quotefail}	{
 				yyless(1);
 				BEGIN(SQL);
-				yylval.str = mm_strdup(literalbuf);
+				base_yylval.str = mm_strdup(literalbuf);
 				return XCONST;
 			}
 
@@ -502,27 +506,27 @@
 <xq,xqc>{quotefail} {
 				yyless(1);
 				BEGIN(state_before);
-				yylval.str = mm_strdup(literalbuf);
+				base_yylval.str = mm_strdup(literalbuf);
 				return SCONST;
 			}
 <xe>{quotestop} |
 <xe>{quotefail} {
 				yyless(1);
 				BEGIN(state_before);
-				yylval.str = mm_strdup(literalbuf);
+				base_yylval.str = mm_strdup(literalbuf);
 				return ECONST;
 			}
 <xn>{quotestop} |
 <xn>{quotefail} {
 				yyless(1);
 				BEGIN(state_before);
-				yylval.str = mm_strdup(literalbuf);
+				base_yylval.str = mm_strdup(literalbuf);
 				return NCONST;
 			}
 <xus>{xusstop} {
 				addlit(yytext, yyleng);
 				BEGIN(state_before);
-				yylval.str = mm_strdup(literalbuf);
+				base_yylval.str = mm_strdup(literalbuf);
 				return UCONST;
 			}
 <xq,xe,xn,xus>{xqdouble}	{ addlitchar('\''); }
@@ -562,8 +566,9 @@
 				{
 					addlit(yytext, yyleng);
 					free(dolqstart);
+					dolqstart = NULL;
 					BEGIN(SQL);
-					yylval.str = mm_strdup(literalbuf);
+					base_yylval.str = mm_strdup(literalbuf);
 					return DOLCONST;
 				}
 				else
@@ -600,12 +605,12 @@
 						if (literallen == 0)
 							mmerror(PARSE_ERROR, ET_ERROR, "zero-length delimited identifier");
 						/* The backend will truncate the identifier here. We do not as it does not change the result. */
-						yylval.str = mm_strdup(literalbuf);
+						base_yylval.str = mm_strdup(literalbuf);
 						return CSTRING;
 					}
 <xdc>{xdstop}		{
 						BEGIN(state_before);
-						yylval.str = mm_strdup(literalbuf);
+						base_yylval.str = mm_strdup(literalbuf);
 						return CSTRING;
 					}
 <xui>{xuistop}		{
@@ -614,7 +619,7 @@
 							mmerror(PARSE_ERROR, ET_ERROR, "zero-length delimited identifier");
 						/* The backend will truncate the identifier here. We do not as it does not change the result. */
 						addlit(yytext, yyleng);
-						yylval.str = mm_strdup(literalbuf);
+						base_yylval.str = mm_strdup(literalbuf);
 						return UIDENT;
 					}
 <xd,xui>{xddouble}		{ addlitchar('"'); }
@@ -713,11 +718,11 @@
 								return yytext[0];
 						}
 
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(yytext);
 						return Op;
 					}
 <SQL>{param}		{
-						yylval.ival = atol(yytext+1);
+						base_yylval.ival = atol(yytext+1);
 						return PARAM;
 					}
 <C,SQL>{integer}	{
@@ -734,36 +739,36 @@
 							)
 						{
 							errno = 0;
-							yylval.str = mm_strdup(yytext);
+							base_yylval.str = mm_strdup(yytext);
 							return FCONST;
 						}
-						yylval.ival = val;
+						base_yylval.ival = val;
 						return ICONST;
 					}
 <SQL>{ip}			{
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(yytext);
 						return IP;
 				}
 <C,SQL>{decimal}	{
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(yytext);
 						return FCONST;
 			}
 <C,SQL>{real}		{
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(yytext);
 						return FCONST;
 			}
 <SQL>{realfail1}	{
 						yyless(yyleng-1);
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(yytext);
 						return FCONST;
 					}
 <SQL>{realfail2}	{
 						yyless(yyleng-2);
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(yytext);
 						return FCONST;
 					}
 <SQL>:{identifier}((("->"|\.){identifier})|(\[{array}\]))*	{
-						yylval.str = mm_strdup(yytext+1);
+						base_yylval.str = mm_strdup(yytext+1);
 						return(CVARIABLE);
 					}
 <SQL>{identifier}	{
@@ -789,7 +794,7 @@
 							 * to do so; that's just another way that ecpg could get
 							 * out of step with the backend.
 							 */
-							yylval.str = mm_strdup(yytext);
+							base_yylval.str = mm_strdup(yytext);
 							return IDENT;
 						}
 					}
@@ -810,11 +815,11 @@
 						char* endptr;
 
 						errno = 0;
-						yylval.ival = strtoul((char *)yytext,&endptr,16);
+						base_yylval.ival = strtoul((char *)yytext,&endptr,16);
 						if (*endptr != '\0' || errno == ERANGE)
 						{
 							errno = 0;
-							yylval.str = mm_strdup(yytext);
+							base_yylval.str = mm_strdup(yytext);
 							return SCONST;
 						}
 						return ICONST;
@@ -827,7 +832,7 @@
 						}
 						else
 						{
-							yylval.str = mm_strdup(yytext);
+							base_yylval.str = mm_strdup(yytext);
 							return(CPP_LINE);
 						}
 					}
@@ -839,12 +844,12 @@
 						}
 						else
 						{
-							yylval.str = mm_strdup(yytext);
+							base_yylval.str = mm_strdup(yytext);
 							return(CPP_LINE);
 						}
 					}
 <C,SQL>{cppline}	{
-						yylval.str = mm_strdup(yytext);
+						base_yylval.str = mm_strdup(yytext);
 						return(CPP_LINE);
 					}
 <C>{identifier}		{
@@ -869,7 +874,7 @@
 								return keyword->value;
 							else
 							{
-								yylval.str = mm_strdup(yytext);
+								base_yylval.str = mm_strdup(yytext);
 								return IDENT;
 							}
 						}
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/de.po postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/de.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PostgreSQL package.
 # Peter Eisentraut <peter_e@gmx.net>, 2009-2014.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-07-20 02:37+0000\n"
+"POT-Creation-Date: 2016-10-21 01:45+0000\n"
 "PO-Revision-Date: 2014-07-20 21:08-0400\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
@@ -22,37 +22,37 @@
 #: descriptor.c:64
 #, c-format
 msgid "variable \"%s\" must have a numeric type"
-msgstr "Variable „%s“ muss einen numerischen Typ haben"
+msgstr "Variable »%s« muss einen numerischen Typ haben"
 
 #: descriptor.c:124 descriptor.c:146
 #, c-format
 msgid "descriptor \"%s\" does not exist"
-msgstr "Deskriptor „%s“ existiert nicht"
+msgstr "Deskriptor »%s« existiert nicht"
 
-#: descriptor.c:161 descriptor.c:210
+#: descriptor.c:161 descriptor.c:212
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
-msgstr "Deskriptorkopfelement „%d“ existiert nicht"
+msgstr "Deskriptorkopfelement »%d« existiert nicht"
 
-#: descriptor.c:182
+#: descriptor.c:183
 #, c-format
 msgid "nullable is always 1"
 msgstr "nullable ist immer 1"
 
-#: descriptor.c:185
+#: descriptor.c:186
 #, c-format
 msgid "key_member is always 0"
 msgstr "key_member ist immer 0"
 
-#: descriptor.c:277
+#: descriptor.c:279
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
-msgstr "Deskriptorelement „%s“ ist nicht implementiert"
+msgstr "Deskriptorelement »%s« ist nicht implementiert"
 
-#: descriptor.c:287
+#: descriptor.c:289
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
-msgstr "Deskriptorelement „%s“ kann nicht gesetzt werden"
+msgstr "Deskriptorelement »%s« kann nicht gesetzt werden"
 
 #: ecpg.c:35
 #, c-format
@@ -95,7 +95,7 @@
 "                 \"INFORMIX\", \"INFORMIX_SE\"\n"
 msgstr ""
 "  -C MODUS       Kompatibilitätsmodus setzen; MODUS kann sein:\n"
-"                 „INFORMIX“ oder „INFORMIX_SE“\n"
+"                 »INFORMIX« oder »INFORMIX_SE«\n"
 
 #: ecpg.c:46
 #, c-format
@@ -110,7 +110,7 @@
 #: ecpg.c:49
 #, c-format
 msgid "  -h             parse a header file, this option includes option \"-c\"\n"
-msgstr "  -h             eine Headerdatei parsen, schließt Option „-c“ ein\n"
+msgstr "  -h             eine Headerdatei parsen, schließt Option »-c« ein\n"
 
 #: ecpg.c:50
 #, c-format
@@ -134,7 +134,7 @@
 "                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"
 msgstr ""
 "  -r OPTION      Laufzeitverhalten bestimmen; OPTION kann sein:\n"
-"                 „no_indicator“, „prepare“, „questionmarks“\n"
+"                 »no_indicator«, »prepare«, »questionmarks«\n"
 
 #: ecpg.c:55
 #, c-format
@@ -148,8 +148,8 @@
 
 #: ecpg.c:57
 #, c-format
-msgid "  --version      output version information, then exit\n"
-msgstr "  --version      Versionsinformationen anzeigen, dann beenden\n"
+msgid "  -V, --version  output version information, then exit\n"
+msgstr "  -V, --version  Versionsinformationen anzeigen, dann beenden\n"
 
 #: ecpg.c:58
 #, c-format
@@ -176,367 +176,367 @@
 "\n"
 "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: ecpg.c:143
+#: ecpg.c:139
 #, c-format
 msgid "%s: could not locate my own executable path\n"
 msgstr "%s: konnte Pfad des eigenen Programs nicht finden\n"
 
-#: ecpg.c:186 ecpg.c:337 ecpg.c:347
+#: ecpg.c:175 ecpg.c:326 ecpg.c:336
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht öffnen: %s\n"
 
-#: ecpg.c:225 ecpg.c:238 ecpg.c:254 ecpg.c:279
+#: ecpg.c:214 ecpg.c:227 ecpg.c:243 ecpg.c:268
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
-#: ecpg.c:249
+#: ecpg.c:238
 #, c-format
 msgid "%s: parser debug support (-d) not available\n"
 msgstr "%s: Unterstützung für Parserdebugging (-d) nicht verfügbar\n"
 
-#: ecpg.c:267
+#: ecpg.c:256
 #, c-format
 msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
 msgstr "%s, der PostgreSQL-Embedded-C-Präprozessor, Version %d.%d.%d\n"
 
-#: ecpg.c:269
+#: ecpg.c:258
 #, c-format
 msgid "EXEC SQL INCLUDE ... search starts here:\n"
 msgstr "EXEC SQL INCLUDE ... Suche beginnt hier:\n"
 
-#: ecpg.c:272
+#: ecpg.c:261
 #, c-format
 msgid "end of search list\n"
 msgstr "Ende der Suchliste\n"
 
-#: ecpg.c:278
+#: ecpg.c:267
 #, c-format
 msgid "%s: no input files specified\n"
 msgstr "%s: keine Eingabedateien angegeben\n"
 
-#: ecpg.c:470
+#: ecpg.c:459
 #, c-format
 msgid "cursor \"%s\" has been declared but not opened"
-msgstr "Cursor „%s“ wurde deklariert aber nicht geöffnet"
+msgstr "Cursor »%s« wurde deklariert aber nicht geöffnet"
 
-#: ecpg.c:483 preproc.y:125
+#: ecpg.c:472 preproc.y:127
 #, c-format
 msgid "could not remove output file \"%s\"\n"
-msgstr "konnte Ausgabedatei „%s“ nicht entfernen\n"
+msgstr "konnte Ausgabedatei »%s« nicht entfernen\n"
 
-#: pgc.l:421
+#: pgc.l:428
 #, c-format
 msgid "unterminated /* comment"
 msgstr "/*-Kommentar nicht abgeschlossen"
 
-#: pgc.l:434
+#: pgc.l:441
 #, c-format
 msgid "invalid bit string literal"
 msgstr "ungültige Bitkettenkonstante"
 
-#: pgc.l:443
+#: pgc.l:450
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "Bitkettenkonstante nicht abgeschlossen"
 
-#: pgc.l:459
+#: pgc.l:466
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "hexadezimale Zeichenkette nicht abgeschlossen"
 
-#: pgc.l:537
+#: pgc.l:544
 #, c-format
 msgid "unterminated quoted string"
 msgstr "Zeichenkette in Anführungszeichen nicht abgeschlossen"
 
-#: pgc.l:592 pgc.l:605
+#: pgc.l:601 pgc.l:614
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "Bezeichner in Anführungszeichen hat Länge null"
 
-#: pgc.l:613
+#: pgc.l:622
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "Bezeichner in Anführungszeichen nicht abgeschlossen"
 
-#: pgc.l:867
+#: pgc.l:877
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "geschachtelte /* ... */-Kommentare"
 
-#: pgc.l:960
+#: pgc.l:970
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "fehlender Bezeichner im Befehl EXEC SQL UNDEF"
 
-#: pgc.l:1006 pgc.l:1020
+#: pgc.l:1016 pgc.l:1030
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
-msgstr "passendes „EXEC SQL IFDEF“ / „EXEC SQL IFNDEF“ fehlt"
+msgstr "passendes »EXEC SQL IFDEF« / »EXEC SQL IFNDEF« fehlt"
 
-#: pgc.l:1009 pgc.l:1022 pgc.l:1198
+#: pgc.l:1019 pgc.l:1032 pgc.l:1208
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
-msgstr "„EXEC SQL ENDIF;“ fehlt"
+msgstr "»EXEC SQL ENDIF;« fehlt"
 
-#: pgc.l:1038 pgc.l:1057
+#: pgc.l:1048 pgc.l:1067
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "mehr als ein EXEC SQL ENDIF"
 
-#: pgc.l:1079 pgc.l:1093
+#: pgc.l:1089 pgc.l:1103
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "unzusammenhängendes EXEC SQL ENDIF"
 
-#: pgc.l:1113
+#: pgc.l:1123
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "zu viele verschachtelte EXEC SQL IFDEF-Bedingungen"
 
-#: pgc.l:1146
+#: pgc.l:1156
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "fehlender Bezeichner im Befehl EXEC SQL IFDEF"
 
-#: pgc.l:1155
+#: pgc.l:1165
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "fehlender Bezeichner im Befehl EXEC SQL DEFINE"
 
-#: pgc.l:1188
+#: pgc.l:1198
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "Syntaxfehler im Befehl EXEC SQL INCLUDE"
 
-#: pgc.l:1237
+#: pgc.l:1247
 #, c-format
 msgid "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"
 msgstr "interner Fehler: unerreichbarer Zustand; bitte an <pgsql-bugs@postgresql.org> berichten"
 
-#: pgc.l:1362
+#: pgc.l:1371
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
-msgstr "Fehler: Include-Pfad „%s/%s“ ist zu lang auf Zeile %d, wird übersprungen\n"
+msgstr "Fehler: Include-Pfad »%s/%s« ist zu lang auf Zeile %d, wird übersprungen\n"
 
-#: pgc.l:1385
+#: pgc.l:1394
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
-msgstr "konnte Include-Datei „%s“ nicht öffnen auf Zeile %d"
+msgstr "konnte Include-Datei »%s« nicht öffnen auf Zeile %d"
 
 #: preproc.y:31
 msgid "syntax error"
 msgstr "Syntaxfehler"
 
-#: preproc.y:79
+#: preproc.y:81
 #, c-format
 msgid "WARNING: "
 msgstr "WARNUNG: "
 
-#: preproc.y:82
+#: preproc.y:84
 #, c-format
 msgid "ERROR: "
 msgstr "FEHLER: "
 
-#: preproc.y:506
+#: preproc.y:508
 #, c-format
 msgid "cursor \"%s\" does not exist"
-msgstr "Cursor „%s“ existiert nicht"
+msgstr "Cursor »%s« existiert nicht"
 
-#: preproc.y:535
+#: preproc.y:537
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "Initialisierungswert nicht erlaubt in Typdefinition"
 
-#: preproc.y:537
+#: preproc.y:539
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
-msgstr "Typname „string“ ist im Informix-Modus reserviert"
+msgstr "Typname »string« ist im Informix-Modus reserviert"
 
-#: preproc.y:544 preproc.y:13853
+#: preproc.y:546 preproc.y:14503
 #, c-format
 msgid "type \"%s\" is already defined"
-msgstr "Typ „%s“ ist bereits definiert"
+msgstr "Typ »%s« ist bereits definiert"
 
-#: preproc.y:568 preproc.y:14511 preproc.y:14832 variable.c:618
+#: preproc.y:570 preproc.y:15161 preproc.y:15481 variable.c:620
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "mehrdimensionale Arrays für einfache Datentypen werden nicht unterstützt"
 
-#: preproc.y:1577
+#: preproc.y:1624
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "AT-Option ist nicht erlaubt im Befehl CLOSE DATABASE"
 
-#: preproc.y:1780
+#: preproc.y:1837
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "AT-Option ist nicht erlaubt im Befehl CONNECT"
 
-#: preproc.y:1814
+#: preproc.y:1871
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "AT-Option ist nicht erlaubt im Befehl DISCONNECT"
 
-#: preproc.y:1869
+#: preproc.y:1926
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "AT-Option ist nicht erlaubt im Befehl SET CONNECTION"
 
-#: preproc.y:1891
+#: preproc.y:1948
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "AT-Option ist nicht erlaubt im TYPE-Befehl"
 
-#: preproc.y:1900
+#: preproc.y:1957
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "AT-Option ist nicht erlaubt im VAR-Befehl"
 
-#: preproc.y:1907
+#: preproc.y:1964
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "AT-Option ist nicht erlaubt im WHENEVER-Befehl"
 
-#: preproc.y:2155 preproc.y:2160 preproc.y:2276 preproc.y:3614 preproc.y:4866
-#: preproc.y:4875 preproc.y:5159 preproc.y:6562 preproc.y:7683 preproc.y:7688
-#: preproc.y:10142 preproc.y:10739
+#: preproc.y:2216 preproc.y:2221 preproc.y:2337 preproc.y:3739 preproc.y:5137
+#: preproc.y:5146 preproc.y:5430 preproc.y:6862 preproc.y:8044 preproc.y:8049
+#: preproc.y:10676 preproc.y:11293
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "nicht mehr unterstütztes Feature wird an Server weitergereicht werden"
 
-#: preproc.y:2518
+#: preproc.y:2595
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL ist nicht implementiert"
 
-#: preproc.y:3002
+#: preproc.y:3127
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDIN ist nicht implementiert"
 
-#: preproc.y:8520 preproc.y:13442
+#: preproc.y:8935 preproc.y:14092
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
-msgstr "Verwendung der Variable „%s“ in verschiedenen DECLARE-Anweisungen wird nicht unterstützt"
+msgstr "Verwendung der Variable »%s« in verschiedenen DECLARE-Anweisungen wird nicht unterstützt"
 
-#: preproc.y:8522 preproc.y:13444
+#: preproc.y:8937 preproc.y:14094
 #, c-format
 msgid "cursor \"%s\" is already defined"
-msgstr "Cursor „%s“ ist bereits definiert"
+msgstr "Cursor »%s« ist bereits definiert"
 
-#: preproc.y:8940
+#: preproc.y:9367
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "nicht mehr unterstützte Syntax LIMIT x,y wird an Server weitergereicht"
 
-#: preproc.y:9176 preproc.y:9183
+#: preproc.y:9675 preproc.y:9682
 #, c-format
 msgid "subquery in FROM must have an alias"
 msgstr "Unteranfrage in FROM muss Aliasnamen erhalten"
 
-#: preproc.y:13172
+#: preproc.y:13822
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS kann INTO nicht verwenden"
 
-#: preproc.y:13208
+#: preproc.y:13858
 #, c-format
 msgid "expected \"@\", found \"%s\""
-msgstr "„@“ erwartet, „%s“ gefunden"
+msgstr "»@« erwartet, »%s« gefunden"
 
-#: preproc.y:13220
+#: preproc.y:13870
 #, c-format
 msgid "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are supported"
-msgstr "er werden nur die Protokolle „tcp“ und „unix“ und der Datenbanktyp „postgresql“ unterstützt"
+msgstr "er werden nur die Protokolle »tcp« und »unix« und der Datenbanktyp »postgresql« unterstützt"
 
-#: preproc.y:13223
+#: preproc.y:13873
 #, c-format
 msgid "expected \"://\", found \"%s\""
-msgstr "„://“ erwartet, „%s“ gefunden"
+msgstr "»://« erwartet, »%s« gefunden"
 
-#: preproc.y:13228
+#: preproc.y:13878
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
-msgstr "Unix-Domain-Sockets funktionieren nur mit „localhost“, aber nicht mit „%s“"
+msgstr "Unix-Domain-Sockets funktionieren nur mit »localhost«, aber nicht mit »%s«"
 
-#: preproc.y:13254
+#: preproc.y:13904
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
-msgstr "„postgresql“ erwartet, „%s“ gefunden"
+msgstr "»postgresql« erwartet, »%s« gefunden"
 
-#: preproc.y:13257
+#: preproc.y:13907
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "ungültiger Verbindungstyp: %s"
 
-#: preproc.y:13266
+#: preproc.y:13916
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
-msgstr "„@“ oder „://“ erwartet, „%s“ gefunden"
+msgstr "»@« oder »://« erwartet, »%s« gefunden"
 
-#: preproc.y:13341 preproc.y:13359
+#: preproc.y:13991 preproc.y:14009
 #, c-format
 msgid "invalid data type"
 msgstr "ungültiger Datentyp"
 
-#: preproc.y:13370 preproc.y:13387
+#: preproc.y:14020 preproc.y:14037
 #, c-format
 msgid "incomplete statement"
 msgstr "unvollständige Anweisung"
 
-#: preproc.y:13373 preproc.y:13390
+#: preproc.y:14023 preproc.y:14040
 #, c-format
 msgid "unrecognized token \"%s\""
-msgstr "nicht erkanntes Token „%s“"
+msgstr "nicht erkanntes Token »%s«"
 
-#: preproc.y:13664
+#: preproc.y:14314
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr "nur die Datentypen NUMERIC und DECIMAL haben Argumente für Präzision und Skala"
 
-#: preproc.y:13676
+#: preproc.y:14326
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "Intervallangabe hier nicht erlaubt"
 
-#: preproc.y:13828 preproc.y:13880
+#: preproc.y:14478 preproc.y:14530
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "zu viele Ebenen in verschachtelter Definition von Struktur/Union"
 
-#: preproc.y:14019
+#: preproc.y:14669
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "Zeiger auf varchar sind nicht implementiert"
 
-#: preproc.y:14206 preproc.y:14231
+#: preproc.y:14856 preproc.y:14881
 #, c-format
 msgid "using unsupported DESCRIBE statement"
 msgstr "nicht unterstützter DESCRIBE-Befehl wird verwendet"
 
-#: preproc.y:14478
+#: preproc.y:15128
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "Initialisierungswert nicht erlaubt in Befehl EXEC SQL VAR"
 
-#: preproc.y:14790
+#: preproc.y:15439
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "Array aus Indikatoren bei der Eingabe nicht erlaubt"
 
-#: preproc.y:15011
+#: preproc.y:15660
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "Operator nicht erlaubt in Variablendefinition"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:15049
+#: preproc.y:15698
 #, c-format
 msgid "%s at or near \"%s\""
-msgstr "%s bei „%s“"
+msgstr "%s bei »%s«"
 
 #: type.c:18 type.c:30
 #, c-format
@@ -551,22 +551,22 @@
 #: type.c:261
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable of a different type"
-msgstr "Variable „%s“ wird durch eine lokale Variable eines anderen Typs versteckt"
+msgstr "Variable »%s« wird durch eine lokale Variable eines anderen Typs versteckt"
 
 #: type.c:263
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable"
-msgstr "Variable „%s“ wird durch eine lokale Variable versteckt"
+msgstr "Variable »%s« wird durch eine lokale Variable versteckt"
 
 #: type.c:275
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable of a different type"
-msgstr "Indikatorvariable „%s“ wird durch eine lokale Variable eines anderen Typs versteckt"
+msgstr "Indikatorvariable »%s« wird durch eine lokale Variable eines anderen Typs versteckt"
 
 #: type.c:277
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable"
-msgstr "Indikatorvariable „%s“ wird durch eine lokale Variable versteckt"
+msgstr "Indikatorvariable »%s« wird durch eine lokale Variable versteckt"
 
 #: type.c:285
 #, c-format
@@ -596,61 +596,64 @@
 #: variable.c:89 variable.c:116
 #, c-format
 msgid "incorrectly formed variable \"%s\""
-msgstr "falsch geformte Variable „%s“"
+msgstr "falsch geformte Variable »%s«"
 
 #: variable.c:139
 #, c-format
 msgid "variable \"%s\" is not a pointer"
-msgstr "Variable „%s“ ist kein Zeiger"
+msgstr "Variable »%s« ist kein Zeiger"
 
 #: variable.c:142 variable.c:167
 #, c-format
 msgid "variable \"%s\" is not a pointer to a structure or a union"
-msgstr "Variable „%s“ ist kein Zeiger auf eine Struktur oder Union"
+msgstr "Variable »%s« ist kein Zeiger auf eine Struktur oder Union"
 
 #: variable.c:154
 #, c-format
 msgid "variable \"%s\" is neither a structure nor a union"
-msgstr "Variable „%s“ ist keine Struktur oder Union"
+msgstr "Variable »%s« ist keine Struktur oder Union"
 
 #: variable.c:164
 #, c-format
 msgid "variable \"%s\" is not an array"
-msgstr "Variable „%s“ ist kein Array"
+msgstr "Variable »%s« ist kein Array"
 
 #: variable.c:233 variable.c:255
 #, c-format
 msgid "variable \"%s\" is not declared"
-msgstr "Variable „%s“ ist nicht deklariert"
+msgstr "Variable »%s« ist nicht deklariert"
 
-#: variable.c:492
+#: variable.c:494
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "Indikatorvariable muss einen ganzzahligen Typ haben"
 
-#: variable.c:504
+#: variable.c:506
 #, c-format
 msgid "unrecognized data type name \"%s\""
-msgstr "unbekannter Datentypname „%s“"
+msgstr "unbekannter Datentypname »%s«"
 
-#: variable.c:515 variable.c:523 variable.c:540 variable.c:543
+#: variable.c:517 variable.c:525 variable.c:542 variable.c:545
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "mehrdimensionale Arrays werden nicht unterstützt"
 
-#: variable.c:532
+#: variable.c:534
 #, 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] "Zeiger mit mehr als 2 Ebenen werden nicht unterstützt; %d Ebene gefunden"
 msgstr[1] "Zeiger mit mehr als 2 Ebenen werden nicht unterstützt; %d Ebenen gefunden"
 
-#: variable.c:537
+#: variable.c:539
 #, c-format
 msgid "pointer to pointer is not supported for this data type"
 msgstr "Zeiger auf Zeiger wird für diesen Datentyp nicht unterstützt"
 
-#: variable.c:557
+#: variable.c:559
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "mehrdimensionale Arrays für Strukturen werden nicht unterstützt"
+
+#~ msgid "  --version      output version information, then exit\n"
+#~ msgstr "  --version      Versionsinformationen anzeigen, dann beenden\n"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/es.po postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/es.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: ecpg (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:38+0000\n"
+"POT-Creation-Date: 2017-05-21 17:26+0000\n"
 "PO-Revision-Date: 2014-12-15 15:22-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
@@ -31,7 +31,7 @@
 msgid "descriptor \"%s\" does not exist"
 msgstr "no existe el descriptor «%s»"
 
-#: descriptor.c:161 descriptor.c:212
+#: descriptor.c:161 descriptor.c:213
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "no existe el descriptor del elemento de cabecera «%d»"
@@ -46,12 +46,12 @@
 msgid "key_member is always 0"
 msgstr "key_member es siempre 0"
 
-#: descriptor.c:279
+#: descriptor.c:280
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "elemento del descriptor «%s» no está implementado"
 
-#: descriptor.c:289
+#: descriptor.c:290
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "no se puede establecer el elemento del descriptor «%s»"
@@ -151,8 +151,8 @@
 
 #: ecpg.c:57
 #, c-format
-msgid "  --version      output version information, then exit\n"
-msgstr "  --version      muestra información de la versión, luego sale\n"
+msgid "  -V, --version  output version information, then exit\n"
+msgstr "  -V, --version  muestra información de la versión, luego sale\n"
 
 #: ecpg.c:58
 #, c-format
@@ -179,152 +179,152 @@
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: ecpg.c:143
+#: ecpg.c:139
 #, c-format
 msgid "%s: could not locate my own executable path\n"
 msgstr "%s: no se pudo localizar la ruta de mi propio ejecutable\n"
 
-#: ecpg.c:186 ecpg.c:337 ecpg.c:347
+#: ecpg.c:175 ecpg.c:327 ecpg.c:337
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: no se pudo abrir el archivo «%s»: %s\n"
 
-#: ecpg.c:225 ecpg.c:238 ecpg.c:254 ecpg.c:279
+#: ecpg.c:214 ecpg.c:227 ecpg.c:243 ecpg.c:268
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Utilice «%s --help» para obtener mayor información.\n"
 
-#: ecpg.c:249
+#: ecpg.c:238
 #, c-format
 msgid "%s: parser debug support (-d) not available\n"
 msgstr "%s: la depuración del analizador (parser, -d) no está disponible)\n"
 
-#: ecpg.c:267
+#: ecpg.c:256
 #, c-format
 msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
 msgstr "%s, el preprocesador de C incrustado de PostgreSQL, versión %d.%d.%d\n"
 
-#: ecpg.c:269
+#: ecpg.c:258
 #, c-format
 msgid "EXEC SQL INCLUDE ... search starts here:\n"
 msgstr "EXEC SQL INCLUDE ... la búsqueda comienza aquí:\n"
 
-#: ecpg.c:272
+#: ecpg.c:261
 #, c-format
 msgid "end of search list\n"
 msgstr "fin de la lista de búsqueda\n"
 
-#: ecpg.c:278
+#: ecpg.c:267
 #, c-format
 msgid "%s: no input files specified\n"
 msgstr "%s: no se especificaron archivos de entrada\n"
 
-#: ecpg.c:470
+#: ecpg.c:460
 #, c-format
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "el cursor «%s» fue declarado pero no abierto"
 
-#: ecpg.c:483 preproc.y:127
+#: ecpg.c:473 preproc.y:127
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "no se pudo eliminar el archivo de salida «%s»\n"
 
-#: pgc.l:428
+#: pgc.l:432
 #, c-format
 msgid "unterminated /* comment"
 msgstr "comentario /* no cerrado"
 
-#: pgc.l:441
+#: pgc.l:445
 #, c-format
 msgid "invalid bit string literal"
 msgstr "cadena de bits no válida"
 
-#: pgc.l:450
+#: pgc.l:454
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "una cadena de bits está inconclusa"
 
-#: pgc.l:466
+#: pgc.l:470
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "una cadena hexadecimal está inconclusa"
 
-#: pgc.l:544
+#: pgc.l:548
 #, c-format
 msgid "unterminated quoted string"
 msgstr "una cadena en comillas está inconclusa"
 
-#: pgc.l:601 pgc.l:614
+#: pgc.l:606 pgc.l:619
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "identificador delimitado de longitud cero"
 
-#: pgc.l:622
+#: pgc.l:627
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "un identificador en comillas está inconcluso"
 
-#: pgc.l:877
+#: pgc.l:882
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "comentarios /* ... */ anidados"
 
-#: pgc.l:970
+#: pgc.l:975
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "falta un identificador en la orden EXEC SQL UNDEF"
 
-#: pgc.l:1016 pgc.l:1030
+#: pgc.l:1021 pgc.l:1035
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "falta el «EXEC SQL IFDEF» / «EXEC SQL IFNDEF»"
 
-#: pgc.l:1019 pgc.l:1032 pgc.l:1208
+#: pgc.l:1024 pgc.l:1037 pgc.l:1213
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "falta el «EXEC SQL ENDIF;»"
 
-#: pgc.l:1048 pgc.l:1067
+#: pgc.l:1053 pgc.l:1072
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "hay más de un EXEC SQL ELSE"
 
-#: pgc.l:1089 pgc.l:1103
+#: pgc.l:1094 pgc.l:1108
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "EXEC SQL ENDIF sin coincidencia"
 
-#: pgc.l:1123
+#: pgc.l:1128
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "demasiadas condiciones EXEC SQL IFDEF anidadas"
 
-#: pgc.l:1156
+#: pgc.l:1161
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "identificador faltante en la orden EXEC SQL IFDEF"
 
-#: pgc.l:1165
+#: pgc.l:1170
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "identificador faltante en la orden EXEC SQL DEFINE"
 
-#: pgc.l:1198
+#: pgc.l:1203
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "error de sintaxis en orden EXEC SQL INCLUDE"
 
-#: pgc.l:1247
+#: pgc.l:1252
 #, c-format
 msgid "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"
 msgstr "Error Interno: estado no esperado; por favor reporte a <pgsql-bugs@postgresql.org>"
 
-#: pgc.l:1371
+#: pgc.l:1376
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr "Error: ruta de inclusión «%s/%s» es demasiada larga en la línea %d, omitiendo\n"
 
-#: pgc.l:1394
+#: pgc.l:1399
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "no se pudo abrir el archivo a incluir «%s» en la línea %d"
@@ -358,12 +358,12 @@
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "el nombre de tipo «string» está reservado en modo Informix"
 
-#: preproc.y:546 preproc.y:14495
+#: preproc.y:546 preproc.y:14503
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "el tipo «%s» ya está definido"
 
-#: preproc.y:570 preproc.y:15153 preproc.y:15473 variable.c:620
+#: preproc.y:570 preproc.y:15161 preproc.y:15481 variable.c:620
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "los arrays multidimensionales para tipos de datos simples no están soportados"
@@ -403,9 +403,9 @@
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "la opción AT no está permitida en la sentencia WHENEVER"
 
-#: preproc.y:2216 preproc.y:2221 preproc.y:2337 preproc.y:3731 preproc.y:5129
-#: preproc.y:5138 preproc.y:5422 preproc.y:6854 preproc.y:8036 preproc.y:8041
-#: preproc.y:10668 preproc.y:11285
+#: preproc.y:2216 preproc.y:2221 preproc.y:2337 preproc.y:3739 preproc.y:5137
+#: preproc.y:5146 preproc.y:5430 preproc.y:6862 preproc.y:8044 preproc.y:8049
+#: preproc.y:10676 preproc.y:11293
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "característica no soportada será pasada al servidor"
@@ -415,128 +415,128 @@
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL no está implementado"
 
-#: preproc.y:3119
+#: preproc.y:3127
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDIN no está implementado"
 
-#: preproc.y:8927 preproc.y:14084
+#: preproc.y:8935 preproc.y:14092
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr "el uso de la variable «%s» en diferentes sentencias declare no está soportado"
 
-#: preproc.y:8929 preproc.y:14086
+#: preproc.y:8937 preproc.y:14094
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "el cursor «%s» ya está definido"
 
-#: preproc.y:9359
+#: preproc.y:9367
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "la sintaxis LIMIT #,# que ya no está soportada ha sido pasada al servidor"
 
-#: preproc.y:9667 preproc.y:9674
+#: preproc.y:9675 preproc.y:9682
 #, c-format
 msgid "subquery in FROM must have an alias"
 msgstr "las subconsultas en FROM deben tener un alias"
 
-#: preproc.y:13814
+#: preproc.y:13822
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS no puede especificar INTO"
 
-#: preproc.y:13850
+#: preproc.y:13858
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "se esperaba «@», se encontró «%s»"
 
-#: preproc.y:13862
+#: preproc.y:13870
 #, c-format
 msgid "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are supported"
 msgstr "sólo los protocolos «tcp» y «unix» y tipo de bases de datos «postgresql» están soportados"
 
-#: preproc.y:13865
+#: preproc.y:13873
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "se esperaba «://», se encontró «%s»"
 
-#: preproc.y:13870
+#: preproc.y:13878
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr "los sockets de dominio unix sólo trabajan en «localhost» pero no en «%s»"
 
-#: preproc.y:13896
+#: preproc.y:13904
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "se esperaba «postgresql», se encontró «%s»"
 
-#: preproc.y:13899
+#: preproc.y:13907
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "tipo de conexión no válido: %s"
 
-#: preproc.y:13908
+#: preproc.y:13916
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "se esperaba «@» o «://», se encontró «%s»"
 
-#: preproc.y:13983 preproc.y:14001
+#: preproc.y:13991 preproc.y:14009
 #, c-format
 msgid "invalid data type"
 msgstr "tipo de dato no válido"
 
-#: preproc.y:14012 preproc.y:14029
+#: preproc.y:14020 preproc.y:14037
 #, c-format
 msgid "incomplete statement"
 msgstr "sentencia incompleta"
 
-#: preproc.y:14015 preproc.y:14032
+#: preproc.y:14023 preproc.y:14040
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "elemento «%s» no reconocido"
 
-#: preproc.y:14306
+#: preproc.y:14314
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr "sólo los tipos de dato numeric y decimal tienen argumento de precisión/escala"
 
-#: preproc.y:14318
+#: preproc.y:14326
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "la especificación de intervalo no está permitida aquí"
 
-#: preproc.y:14470 preproc.y:14522
+#: preproc.y:14478 preproc.y:14530
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "demasiados niveles en la definición anidada de estructura/unión"
 
-#: preproc.y:14661
+#: preproc.y:14669
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "los punteros a varchar no están implementados"
 
-#: preproc.y:14848 preproc.y:14873
+#: preproc.y:14856 preproc.y:14881
 #, c-format
 msgid "using unsupported DESCRIBE statement"
 msgstr "utilizando sentencia DESCRIBE no soportada"
 
-#: preproc.y:15120
+#: preproc.y:15128
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "inicializador no permitido en la orden EXEC SQL VAR"
 
-#: preproc.y:15431
+#: preproc.y:15439
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "no se permiten los arrays de indicadores en la entrada"
 
-#: preproc.y:15652
+#: preproc.y:15660
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "operador no permitido en definición de variable"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:15690
+#: preproc.y:15698
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s en o cerca de «%s»"
@@ -657,3 +657,6 @@
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "los arrays multidimensionales para estructuras no están soportados"
+
+#~ msgid "  --version      output version information, then exit\n"
+#~ msgstr "  --version      muestra información de la versión, luego sale\n"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/fr.po postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/fr.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,21 +1,21 @@
 # translation of ecpg.po to fr_fr
 # french message translation file for ecpg
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 #
 # Guillaume Lelarge <guillaume@lelarge.info>, 2009.
-# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
+# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-05-17 11:07+0000\n"
+"POT-Creation-Date: 2016-10-21 01:45+0000\n"
 "PO-Revision-Date: 2014-05-17 15:23+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.5.4\n"
@@ -23,37 +23,37 @@
 #: descriptor.c:64
 #, c-format
 msgid "variable \"%s\" must have a numeric type"
-msgstr "la variable « %s » doit avoir un type numeric"
+msgstr "la variable « %s » doit avoir un type numeric"
 
 #: descriptor.c:124 descriptor.c:146
 #, c-format
 msgid "descriptor \"%s\" does not exist"
-msgstr "le descripteur « %s » n'existe pas"
+msgstr "le descripteur « %s » n'existe pas"
 
-#: descriptor.c:161 descriptor.c:210
+#: descriptor.c:161 descriptor.c:212
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
-msgstr "l'élément d'en-tête du descripteur « %d » n'existe pas"
+msgstr "l'élément d'en-tête du descripteur « %d » n'existe pas"
 
-#: descriptor.c:182
+#: descriptor.c:183
 #, c-format
 msgid "nullable is always 1"
 msgstr "nullable vaut toujours 1"
 
-#: descriptor.c:185
+#: descriptor.c:186
 #, c-format
 msgid "key_member is always 0"
 msgstr "key_member vaut toujours 0"
 
-#: descriptor.c:277
+#: descriptor.c:279
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
-msgstr "l'élément du descripteur « %s » n'est pas implanté"
+msgstr "l'élément du descripteur « %s » n'est pas implanté"
 
-#: descriptor.c:287
+#: descriptor.c:289
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
-msgstr "l'élément du descripteur « %s » ne peut pas être initialisé"
+msgstr "l'élément du descripteur « %s » ne peut pas être initialisé"
 
 #: ecpg.c:35
 #, c-format
@@ -61,7 +61,7 @@
 "%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
 "\n"
 msgstr ""
-"%s est le préprocesseur SQL embarqué de PostgreSQL pour les programmes C.\n"
+"%s est le préprocesseur SQL embarqué de PostgreSQL pour les programmes C.\n"
 "\n"
 
 #: ecpg.c:37
@@ -86,8 +86,7 @@
 "  -c             automatically generate C code from embedded SQL code;\n"
 "                 this affects EXEC SQL TYPE\n"
 msgstr ""
-"  -c             produit automatiquement le code C à partir du code SQL "
-"embarqué ;\n"
+"  -c             produit automatiquement le code C à partir du code SQL embarqué ;\n"
 "                 ceci affecte EXEC SQL TYPE\n"
 
 #: ecpg.c:43
@@ -96,41 +95,38 @@
 "  -C MODE        set compatibility mode; MODE can be one of\n"
 "                 \"INFORMIX\", \"INFORMIX_SE\"\n"
 msgstr ""
-"  -C MODE        configure le mode de compatibilité ; MODE peut être\n"
-"                 « INFORMIX » ou « INFORMIX_SE »\n"
+"  -C MODE        configure le mode de compatibilité ; MODE peut être\n"
+"                 « INFORMIX » ou « INFORMIX_SE »\n"
 
 #: ecpg.c:46
 #, c-format
 msgid "  -d             generate parser debug output\n"
-msgstr "  -d             produit la sortie de débogage de l'analyseur\n"
+msgstr "  -d             produit la sortie de débogage de l'analyseur\n"
 
 #: ecpg.c:48
 #, c-format
 msgid "  -D SYMBOL      define SYMBOL\n"
-msgstr "  -D SYMBOLE     définit SYMBOLE\n"
+msgstr "  -D SYMBOLE     définit SYMBOLE\n"
 
 #: ecpg.c:49
 #, c-format
-msgid ""
-"  -h             parse a header file, this option includes option \"-c\"\n"
-msgstr ""
-"  -h             analyse un fichier d'en-tête, cette option inclut l'option "
-"« -c »\n"
+msgid "  -h             parse a header file, this option includes option \"-c\"\n"
+msgstr "  -h             analyse un fichier d'en-tête, cette option inclut l'option « -c »\n"
 
 #: ecpg.c:50
 #, c-format
 msgid "  -i             parse system include files as well\n"
-msgstr "  -i             analyse en plus les fichiers d'en-tête systèmes\n"
+msgstr "  -i             analyse en plus les fichiers d'en-tête systèmes\n"
 
 #: ecpg.c:51
 #, c-format
 msgid "  -I DIRECTORY   search DIRECTORY for include files\n"
-msgstr "  -I RÉPERTOIRE  recherche les fichiers d'en-têtes dans RÉPERTOIRE\n"
+msgstr "  -I RÉPERTOIRE  recherche les fichiers d'en-têtes dans RÉPERTOIRE\n"
 
 #: ecpg.c:52
 #, c-format
 msgid "  -o OUTFILE     write result to OUTFILE\n"
-msgstr "  -o FICHIER     écrit le résultat dans FICHIER\n"
+msgstr "  -o FICHIER     écrit le résultat dans FICHIER\n"
 
 #: ecpg.c:53
 #, c-format
@@ -138,14 +134,13 @@
 "  -r OPTION      specify run-time behavior; OPTION can be:\n"
 "                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"
 msgstr ""
-"  -r OPTION      indique le comportement à l'exécution ; OPTION peut "
-"valoir :\n"
-"                 « no_indicator », « prepare », « questionmarks »\n"
+"  -r OPTION      indique le comportement à l'exécution ; OPTION peut valoir :\n"
+"                 « no_indicator », « prepare », « questionmarks »\n"
 
 #: ecpg.c:55
 #, c-format
 msgid "  --regression   run in regression testing mode\n"
-msgstr "  --regression   s'exécute en mode de tests des régressions\n"
+msgstr "  --regression   s'exécute en mode de tests des régressions\n"
 
 #: ecpg.c:56
 #, c-format
@@ -154,8 +149,8 @@
 
 #: ecpg.c:57
 #, c-format
-msgid "  --version      output version information, then exit\n"
-msgstr "  --version      affiche la version et quitte\n"
+msgid "  -V, --version  output version information, then exit\n"
+msgstr "  -V, --version  affiche la version et quitte\n"
 
 #: ecpg.c:58
 #, c-format
@@ -170,9 +165,9 @@
 "input file name, after stripping off .pgc if present.\n"
 msgstr ""
 "\n"
-"Si aucun nom de fichier en sortie n'est fourni, le nom est formaté en\n"
-"ajoutant le suffixe .c au nom du fichier en entrée après avoir supprimé le\n"
-"suffixe .pgc s'il est présent\n"
+"Si aucun nom de fichier en sortie n'est fourni, le nom est formaté en\n"
+"ajoutant le suffixe .c au nom du fichier en entrée après avoir supprimé le\n"
+"suffixe .pgc s'il est présent\n"
 
 #: ecpg.c:61
 #, c-format
@@ -181,397 +176,386 @@
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
+"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
-#: ecpg.c:143
+#: ecpg.c:139
 #, c-format
-#| msgid "%s: could not locate matching postgres executable"
 msgid "%s: could not locate my own executable path\n"
-msgstr "%s : n'a pas pu localiser mon propre exécutable\n"
+msgstr "%s : n'a pas pu localiser mon propre exécutable\n"
 
-#: ecpg.c:186 ecpg.c:337 ecpg.c:347
+#: ecpg.c:175 ecpg.c:326 ecpg.c:336
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s : n'a pas pu ouvrir le fichier « %s » : %s\n"
+msgstr "%s : n'a pas pu ouvrir le fichier « %s » : %s\n"
 
-#: ecpg.c:225 ecpg.c:238 ecpg.c:254 ecpg.c:279
+#: ecpg.c:214 ecpg.c:227 ecpg.c:243 ecpg.c:268
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayer « %s --help » pour plus d'informations.\n"
+msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
-#: ecpg.c:249
+#: ecpg.c:238
 #, c-format
 msgid "%s: parser debug support (-d) not available\n"
-msgstr "%s : support de débogage de l'analyseur (-d) non disponible\n"
+msgstr "%s : support de débogage de l'analyseur (-d) non disponible\n"
 
-#: ecpg.c:267
+#: ecpg.c:256
 #, c-format
 msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
-msgstr "%s, le préprocesseur C embarqué de PostgreSQL, version %d.%d.%d\n"
+msgstr "%s, le préprocesseur C embarqué de PostgreSQL, version %d.%d.%d\n"
 
-#: ecpg.c:269
+#: ecpg.c:258
 #, c-format
 msgid "EXEC SQL INCLUDE ... search starts here:\n"
 msgstr "la recherche EXEC SQL INCLUDE ... commence ici :\n"
 
-#: ecpg.c:272
+#: ecpg.c:261
 #, c-format
 msgid "end of search list\n"
 msgstr "fin de la liste de recherche\n"
 
-#: ecpg.c:278
+#: ecpg.c:267
 #, c-format
 msgid "%s: no input files specified\n"
-msgstr "%s : aucun fichier précisé en entrée\n"
+msgstr "%s : aucun fichier précisé en entrée\n"
 
-#: ecpg.c:470
+#: ecpg.c:459
 #, c-format
 msgid "cursor \"%s\" has been declared but not opened"
-msgstr "le curseur « %s » est déclaré mais non ouvert"
+msgstr "le curseur « %s » est déclaré mais non ouvert"
 
-#: ecpg.c:483 preproc.y:125
+#: ecpg.c:472 preproc.y:127
 #, c-format
 msgid "could not remove output file \"%s\"\n"
-msgstr "n'a pas pu supprimer le fichier « %s » en sortie\n"
+msgstr "n'a pas pu supprimer le fichier « %s » en sortie\n"
 
-#: pgc.l:421
+#: pgc.l:428
 #, c-format
 msgid "unterminated /* comment"
-msgstr "commentaire /* non terminé"
+msgstr "commentaire /* non terminé"
 
-#: pgc.l:434
+#: pgc.l:441
 #, c-format
 msgid "invalid bit string literal"
-msgstr "chaîne bit litéral invalide"
+msgstr "chaîne bit litéral invalide"
 
-#: pgc.l:443
+#: pgc.l:450
 #, c-format
 msgid "unterminated bit string literal"
-msgstr "chaîne bit litéral non terminée"
+msgstr "chaîne bit litéral non terminée"
 
-#: pgc.l:459
+#: pgc.l:466
 #, c-format
 msgid "unterminated hexadecimal string literal"
-msgstr "chaîne hexadécimale litéralle non terminée"
+msgstr "chaîne hexadécimale litéralle non terminée"
 
-#: pgc.l:537
+#: pgc.l:544
 #, c-format
 msgid "unterminated quoted string"
-msgstr "chaîne entre guillemets non terminée"
+msgstr "chaîne entre guillemets non terminée"
 
-#: pgc.l:592 pgc.l:605
+#: pgc.l:601 pgc.l:614
 #, c-format
 msgid "zero-length delimited identifier"
-msgstr "identifiant délimité de taille zéro"
+msgstr "identifiant délimité de taille zéro"
 
-#: pgc.l:613
+#: pgc.l:622
 #, c-format
 msgid "unterminated quoted identifier"
-msgstr "identifiant entre guillemet non terminé"
+msgstr "identifiant entre guillemet non terminé"
 
-#: pgc.l:867
+#: pgc.l:877
 #, c-format
-#| msgid "unterminated /* comment"
 msgid "nested /* ... */ comments"
-msgstr "commentaires /* ... */ imbriqués"
+msgstr "commentaires /* ... */ imbriqués"
 
-#: pgc.l:960
+#: pgc.l:970
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "identifiant manquant dans la commande EXEC SQL UNDEF"
 
-#: pgc.l:1006 pgc.l:1020
+#: pgc.l:1016 pgc.l:1030
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
-msgstr "correspondance manquante « EXEC SQL IFDEF » / « EXEC SQL IFNDEF »"
+msgstr "correspondance manquante « EXEC SQL IFDEF » / « EXEC SQL IFNDEF »"
 
-#: pgc.l:1009 pgc.l:1022 pgc.l:1198
+#: pgc.l:1019 pgc.l:1032 pgc.l:1208
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
-msgstr "« EXEC SQL ENDIF; » manquant"
+msgstr "« EXEC SQL ENDIF; » manquant"
 
-#: pgc.l:1038 pgc.l:1057
+#: pgc.l:1048 pgc.l:1067
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "plusieurs EXEC SQL ELSE"
 
-#: pgc.l:1079 pgc.l:1093
+#: pgc.l:1089 pgc.l:1103
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
-msgstr "EXEC SQL ENDIF différent"
+msgstr "EXEC SQL ENDIF différent"
 
-#: pgc.l:1113
+#: pgc.l:1123
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
-msgstr "trop de conditions EXEC SQL IFDEF imbriquées"
+msgstr "trop de conditions EXEC SQL IFDEF imbriquées"
 
-#: pgc.l:1146
+#: pgc.l:1156
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "identifiant manquant dans la commande EXEC SQL IFDEF"
 
-#: pgc.l:1155
+#: pgc.l:1165
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "identifiant manquant dans la commande EXEC SQL DEFINE"
 
-#: pgc.l:1188
+#: pgc.l:1198
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "erreur de syntaxe dans la commande EXEC SQL INCLUDE"
 
-#: pgc.l:1237
+#: pgc.l:1247
 #, c-format
-msgid ""
-"internal error: unreachable state; please report this to <pgsql-"
-"bugs@postgresql.org>"
+msgid "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"
 msgstr ""
-"erreur interne : l'état ne peut être atteint ; merci de rapporter ceci à\n"
+"erreur interne : l'état ne peut être atteint ; merci de rapporter ceci à\n"
 "<pgsql-bugs@postgresql.org>"
 
-#: pgc.l:1362
+#: pgc.l:1371
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr ""
-"Erreur : le chemin d'en-tête « %s/%s » est trop long sur la ligne %d,\n"
-"ignoré\n"
+"Erreur : le chemin d'en-tête « %s/%s » est trop long sur la ligne %d,\n"
+"ignoré\n"
 
-#: pgc.l:1385
+#: pgc.l:1394
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
-msgstr "n'a pas pu ouvrir le fichier d'en-tête « %s » sur la ligne %d"
+msgstr "n'a pas pu ouvrir le fichier d'en-tête « %s » sur la ligne %d"
 
 #: preproc.y:31
 msgid "syntax error"
 msgstr "erreur de syntaxe"
 
-#: preproc.y:79
+#: preproc.y:81
 #, c-format
 msgid "WARNING: "
 msgstr "ATTENTION : "
 
-#: preproc.y:82
+#: preproc.y:84
 #, c-format
 msgid "ERROR: "
 msgstr "ERREUR : "
 
-#: preproc.y:506
+#: preproc.y:508
 #, c-format
 msgid "cursor \"%s\" does not exist"
-msgstr "le curseur « %s » n'existe pas"
+msgstr "le curseur « %s » n'existe pas"
 
-#: preproc.y:535
+#: preproc.y:537
 #, c-format
 msgid "initializer not allowed in type definition"
-msgstr "initialiseur non autorisé dans la définition du type"
+msgstr "initialiseur non autorisé dans la définition du type"
 
-#: preproc.y:537
+#: preproc.y:539
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
-msgstr "le nom du type « string » est réservé dans le mode Informix"
+msgstr "le nom du type « string » est réservé dans le mode Informix"
 
-#: preproc.y:544 preproc.y:13853
+#: preproc.y:546 preproc.y:14503
 #, c-format
 msgid "type \"%s\" is already defined"
-msgstr "le type « %s » est déjà défini"
+msgstr "le type « %s » est déjà défini"
 
-#: preproc.y:568 preproc.y:14511 preproc.y:14832 variable.c:618
+#: preproc.y:570 preproc.y:15161 preproc.y:15481 variable.c:620
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr ""
-"les tableaux multi-dimensionnels pour les types de données simples ne sont\n"
-"pas supportés"
+"les tableaux multi-dimensionnels pour les types de données simples ne sont\n"
+"pas supportés"
 
-#: preproc.y:1577
+#: preproc.y:1624
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
-msgstr "option AT non autorisée dans une instruction CLOSE DATABASE"
+msgstr "option AT non autorisée dans une instruction CLOSE DATABASE"
 
-#: preproc.y:1780
+#: preproc.y:1837
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
-msgstr "option AT non autorisée dans une instruction CONNECT"
+msgstr "option AT non autorisée dans une instruction CONNECT"
 
-#: preproc.y:1814
+#: preproc.y:1871
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
-msgstr "option AT non autorisée dans une instruction DISCONNECT"
+msgstr "option AT non autorisée dans une instruction DISCONNECT"
 
-#: preproc.y:1869
+#: preproc.y:1926
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
-msgstr "option AT non autorisée dans une instruction SET CONNECTION"
+msgstr "option AT non autorisée dans une instruction SET CONNECTION"
 
-#: preproc.y:1891
+#: preproc.y:1948
 #, c-format
 msgid "AT option not allowed in TYPE statement"
-msgstr "option AT non autorisée dans une instruction TYPE"
+msgstr "option AT non autorisée dans une instruction TYPE"
 
-#: preproc.y:1900
+#: preproc.y:1957
 #, c-format
 msgid "AT option not allowed in VAR statement"
-msgstr "option AT non autorisée dans une instruction VAR"
+msgstr "option AT non autorisée dans une instruction VAR"
 
-#: preproc.y:1907
+#: preproc.y:1964
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
-msgstr "option AT non autorisée dans une instruction WHENEVER"
+msgstr "option AT non autorisée dans une instruction WHENEVER"
 
-#: preproc.y:2155 preproc.y:2160 preproc.y:2276 preproc.y:3614 preproc.y:4866
-#: preproc.y:4875 preproc.y:5159 preproc.y:6562 preproc.y:7683 preproc.y:7688
-#: preproc.y:10142 preproc.y:10739
+#: preproc.y:2216 preproc.y:2221 preproc.y:2337 preproc.y:3739 preproc.y:5137
+#: preproc.y:5146 preproc.y:5430 preproc.y:6862 preproc.y:8044 preproc.y:8049
+#: preproc.y:10676 preproc.y:11293
 #, c-format
 msgid "unsupported feature will be passed to server"
-msgstr "la fonctionnalité non supportée sera passée au serveur"
+msgstr "la fonctionnalité non supportée sera passée au serveur"
 
-#: preproc.y:2518
+#: preproc.y:2595
 #, c-format
 msgid "SHOW ALL is not implemented"
-msgstr "SHOW ALL n'est pas implanté"
+msgstr "SHOW ALL n'est pas implanté"
 
-#: preproc.y:3002
+#: preproc.y:3127
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
-msgstr "COPY FROM STDIN n'est pas implanté"
+msgstr "COPY FROM STDIN n'est pas implanté"
 
-#: preproc.y:8520 preproc.y:13442
+#: preproc.y:8935 preproc.y:14092
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr ""
-"l'utilisation de la variable « %s » dans différentes instructions de "
-"déclaration\n"
-"n'est pas supportée"
+"l'utilisation de la variable « %s » dans différentes instructions de déclaration\n"
+"n'est pas supportée"
 
-#: preproc.y:8522 preproc.y:13444
+#: preproc.y:8937 preproc.y:14094
 #, c-format
 msgid "cursor \"%s\" is already defined"
-msgstr "le curseur « %s » est déjà défini"
+msgstr "le curseur « %s » est déjà défini"
 
-#: preproc.y:8940
+#: preproc.y:9367
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
-msgstr "la syntaxe obsolète LIMIT #,# a été passée au serveur"
+msgstr "la syntaxe obsolète LIMIT #,# a été passée au serveur"
 
-#: preproc.y:9176 preproc.y:9183
+#: preproc.y:9675 preproc.y:9682
 #, c-format
 msgid "subquery in FROM must have an alias"
-msgstr "la sous-requête du FROM doit avoir un alias"
+msgstr "la sous-requête du FROM doit avoir un alias"
 
-#: preproc.y:13172
+#: preproc.y:13822
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS ne peut pas indiquer INTO"
 
-#: preproc.y:13208
+#: preproc.y:13858
 #, c-format
 msgid "expected \"@\", found \"%s\""
-msgstr "« @ » attendu, « %s » trouvé"
+msgstr "« @ » attendu, « %s » trouvé"
 
-#: preproc.y:13220
+#: preproc.y:13870
 #, c-format
-msgid ""
-"only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
-"supported"
+msgid "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are supported"
 msgstr ""
-"seuls les protocoles « tcp » et « unix » et les types de base de données\n"
-"« postgresql » sont supportés"
+"seuls les protocoles « tcp » et « unix » et les types de base de données\n"
+"« postgresql » sont supportés"
 
-#: preproc.y:13223
+#: preproc.y:13873
 #, c-format
 msgid "expected \"://\", found \"%s\""
-msgstr "« :// » attendu, « %s » trouvé"
+msgstr "« :// » attendu, « %s » trouvé"
 
-#: preproc.y:13228
+#: preproc.y:13878
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
-msgstr ""
-"les sockets de domaine Unix fonctionnent seulement sur « localhost », mais "
-"pas sur « %s »"
+msgstr "les sockets de domaine Unix fonctionnent seulement sur « localhost », mais pas sur « %s »"
 
-#: preproc.y:13254
+#: preproc.y:13904
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
-msgstr "« postgresql » attendu, « %s » trouvé"
+msgstr "« postgresql » attendu, « %s » trouvé"
 
-#: preproc.y:13257
+#: preproc.y:13907
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "type de connexion invalide : %s"
 
-#: preproc.y:13266
+#: preproc.y:13916
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
-msgstr "« @ » ou « :// » attendu, « %s » trouvé"
+msgstr "« @ » ou « :// » attendu, « %s » trouvé"
 
-#: preproc.y:13341 preproc.y:13359
+#: preproc.y:13991 preproc.y:14009
 #, c-format
 msgid "invalid data type"
-msgstr "type de données invalide"
+msgstr "type de données invalide"
 
-#: preproc.y:13370 preproc.y:13387
+#: preproc.y:14020 preproc.y:14037
 #, c-format
 msgid "incomplete statement"
-msgstr "instruction incomplète"
+msgstr "instruction incomplète"
 
-#: preproc.y:13373 preproc.y:13390
+#: preproc.y:14023 preproc.y:14040
 #, c-format
 msgid "unrecognized token \"%s\""
-msgstr "jeton « %s » non reconnu"
+msgstr "jeton « %s » non reconnu"
 
-#: preproc.y:13664
+#: preproc.y:14314
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr ""
-"seuls les types de données numeric et decimal ont des arguments de\n"
-"précision et d'échelle"
+"seuls les types de données numeric et decimal ont des arguments de\n"
+"précision et d'échelle"
 
-#: preproc.y:13676
+#: preproc.y:14326
 #, c-format
 msgid "interval specification not allowed here"
-msgstr "interval de spécification non autorisé ici"
+msgstr "interval de spécification non autorisé ici"
 
-#: preproc.y:13828 preproc.y:13880
+#: preproc.y:14478 preproc.y:14530
 #, c-format
 msgid "too many levels in nested structure/union definition"
-msgstr "trop de niveaux dans la définition de structure/union imbriquée"
+msgstr "trop de niveaux dans la définition de structure/union imbriquée"
 
-#: preproc.y:14019
+#: preproc.y:14669
 #, c-format
 msgid "pointers to varchar are not implemented"
-msgstr ""
-"les pointeurs sur des chaînes de caractères (varchar) ne sont pas implantés"
+msgstr "les pointeurs sur des chaînes de caractères (varchar) ne sont pas implantés"
 
-#: preproc.y:14206 preproc.y:14231
+#: preproc.y:14856 preproc.y:14881
 #, c-format
 msgid "using unsupported DESCRIBE statement"
-msgstr "utilisation de l'instruction DESCRIBE non supporté"
+msgstr "utilisation de l'instruction DESCRIBE non supporté"
 
-#: preproc.y:14478
+#: preproc.y:15128
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
-msgstr "initialiseur non autorisé dans la commande EXEC SQL VAR"
+msgstr "initialiseur non autorisé dans la commande EXEC SQL VAR"
 
-#: preproc.y:14790
+#: preproc.y:15439
 #, c-format
 msgid "arrays of indicators are not allowed on input"
-msgstr "les tableaux d'indicateurs ne sont pas autorisés en entrée"
+msgstr "les tableaux d'indicateurs ne sont pas autorisés en entrée"
 
-#: preproc.y:15011
+#: preproc.y:15660
 #, c-format
-#| msgid "initializer not allowed in type definition"
 msgid "operator not allowed in variable definition"
-msgstr "opérateur non autorisé dans la définition de la variable"
+msgstr "opérateur non autorisé dans la définition de la variable"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:15049
+#: preproc.y:15698
 #, c-format
 msgid "%s at or near \"%s\""
-msgstr "%s sur ou près de « %s »"
+msgstr "%s sur ou près de « %s »"
 
 #: type.c:18 type.c:30
 #, c-format
 msgid "out of memory"
-msgstr "mémoire épuisée"
+msgstr "mémoire épuisée"
 
 #: type.c:212 type.c:664
 #, c-format
@@ -581,138 +565,135 @@
 #: type.c:261
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable of a different type"
-msgstr ""
-"la variable « %s » est cachée par une variable locale d'un type différent"
+msgstr "la variable « %s » est cachée par une variable locale d'un type différent"
 
 #: type.c:263
 #, c-format
 msgid "variable \"%s\" is hidden by a local variable"
-msgstr "la variable « %s » est cachée par une variable locale"
+msgstr "la variable « %s » est cachée par une variable locale"
 
 #: type.c:275
 #, c-format
-msgid ""
-"indicator variable \"%s\" is hidden by a local variable of a different type"
+msgid "indicator variable \"%s\" is hidden by a local variable of a different type"
 msgstr ""
-"la variable indicateur « %s » est caché par une variable locale d'un type\n"
-"différent"
+"la variable indicateur « %s » est caché par une variable locale d'un type\n"
+"différent"
 
 #: type.c:277
 #, c-format
 msgid "indicator variable \"%s\" is hidden by a local variable"
-msgstr "la variable indicateur « %s » est cachée par une variable locale"
+msgstr "la variable indicateur « %s » est cachée par une variable locale"
 
 #: type.c:285
 #, c-format
 msgid "indicator for array/pointer has to be array/pointer"
-msgstr "l'indicateur pour le tableau/pointeur doit être tableau/pointeur"
+msgstr "l'indicateur pour le tableau/pointeur doit être tableau/pointeur"
 
 #: type.c:289
 #, c-format
 msgid "nested arrays are not supported (except strings)"
 msgstr ""
-"les tableaux imbriqués ne sont pas supportés (sauf les chaînes de\n"
-"caractères)"
+"les tableaux imbriqués ne sont pas supportés (sauf les chaînes de\n"
+"caractères)"
 
 #: type.c:331
 #, c-format
 msgid "indicator for struct has to be a struct"
-msgstr "l'indicateur d'un struct doit être un struct"
+msgstr "l'indicateur d'un struct doit être un struct"
 
 #: type.c:351 type.c:372 type.c:392
 #, c-format
 msgid "indicator for simple data type has to be simple"
-msgstr "l'indicateur d'un type de données simple doit être simple"
+msgstr "l'indicateur d'un type de données simple doit être simple"
 
 #: type.c:723
 #, c-format
 msgid "unrecognized descriptor item code %d"
-msgstr "code %d de l'élément du descripteur non reconnu"
+msgstr "code %d de l'élément du descripteur non reconnu"
 
 #: variable.c:89 variable.c:116
 #, c-format
 msgid "incorrectly formed variable \"%s\""
-msgstr "variable « %s » mal formée"
+msgstr "variable « %s » mal formée"
 
 #: variable.c:139
 #, c-format
 msgid "variable \"%s\" is not a pointer"
-msgstr "la variable « %s » n'est pas un pointeur"
+msgstr "la variable « %s » n'est pas un pointeur"
 
 #: variable.c:142 variable.c:167
 #, c-format
 msgid "variable \"%s\" is not a pointer to a structure or a union"
-msgstr ""
-"la variable « %s » n'est pas un pointeur vers une structure ou une union"
+msgstr "la variable « %s » n'est pas un pointeur vers une structure ou une union"
 
 #: variable.c:154
 #, c-format
 msgid "variable \"%s\" is neither a structure nor a union"
-msgstr "la variable « %s » n'est ni une structure ni une union"
+msgstr "la variable « %s » n'est ni une structure ni une union"
 
 #: variable.c:164
 #, c-format
 msgid "variable \"%s\" is not an array"
-msgstr "la variable « %s » n'est pas un tableau"
+msgstr "la variable « %s » n'est pas un tableau"
 
 #: variable.c:233 variable.c:255
 #, c-format
 msgid "variable \"%s\" is not declared"
-msgstr "la variable « %s » n'est pas déclarée"
+msgstr "la variable « %s » n'est pas déclarée"
 
-#: variable.c:492
+#: variable.c:494
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "la variable d'indicateur doit avoir un type integer"
 
-#: variable.c:504
+#: variable.c:506
 #, c-format
 msgid "unrecognized data type name \"%s\""
-msgstr "nom « %s » non reconnu pour un type de données"
+msgstr "nom « %s » non reconnu pour un type de données"
 
-#: variable.c:515 variable.c:523 variable.c:540 variable.c:543
+#: variable.c:517 variable.c:525 variable.c:542 variable.c:545
 #, c-format
 msgid "multidimensional arrays are not supported"
-msgstr "les tableaux multidimensionnels ne sont pas supportés"
+msgstr "les tableaux multidimensionnels ne sont pas supportés"
 
-#: variable.c:532
+#: variable.c:534
 #, 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"
+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] ""
-"les pointeurs multi-niveaux (plus de deux) ne sont pas supportés :\n"
-"%d niveau trouvé"
+"les pointeurs multi-niveaux (plus de deux) ne sont pas supportés :\n"
+"%d niveau trouvé"
 msgstr[1] ""
-"les pointeurs multi-niveaux (plus de deux) ne sont pas supportés :\n"
-"%d niveaux trouvés"
+"les pointeurs multi-niveaux (plus de deux) ne sont pas supportés :\n"
+"%d niveaux trouvés"
 
-#: variable.c:537
+#: variable.c:539
 #, c-format
 msgid "pointer to pointer is not supported for this data type"
-msgstr "ce type de données ne supporte pas les pointeurs de pointeur"
+msgstr "ce type de données ne supporte pas les pointeurs de pointeur"
 
-#: variable.c:557
+#: variable.c:559
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
-msgstr ""
-"les tableaux multidimensionnels ne sont pas supportés pour les structures"
+msgstr "les tableaux multidimensionnels ne sont pas supportés pour les structures"
 
-#~ msgid "AT option not allowed in DEALLOCATE statement"
-#~ msgstr "option AT non autorisée dans une instruction DEALLOCATE"
+#~ msgid "COPY TO STDIN is not possible"
+#~ msgstr "COPY TO STDIN n'est pas possible"
 
-#~ msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
-#~ msgstr "une contrainte déclarée INITIALLY DEFERRED doit être DEFERRABLE"
+#~ msgid "COPY FROM STDOUT is not possible"
+#~ msgstr "COPY FROM STDOUT n'est pas possible"
+
+#~ msgid "NEW used in query that is not in a rule"
+#~ msgstr "NEW utilisé dans une requête qui n'est pas dans une règle"
 
 #~ msgid "OLD used in query that is not in a rule"
-#~ msgstr "OLD utilisé dans une requête qui n'est pas dans une règle"
+#~ msgstr "OLD utilisé dans une requête qui n'est pas dans une règle"
 
-#~ msgid "NEW used in query that is not in a rule"
-#~ msgstr "NEW utilisé dans une requête qui n'est pas dans une règle"
+#~ msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
+#~ msgstr "une contrainte déclarée INITIALLY DEFERRED doit être DEFERRABLE"
 
-#~ msgid "COPY FROM STDOUT is not possible"
-#~ msgstr "COPY FROM STDOUT n'est pas possible"
+#~ msgid "AT option not allowed in DEALLOCATE statement"
+#~ msgstr "option AT non autorisée dans une instruction DEALLOCATE"
 
-#~ msgid "COPY TO STDIN is not possible"
-#~ msgstr "COPY TO STDIN n'est pas possible"
+#~ msgid "  --version      output version information, then exit\n"
+#~ msgstr "  --version      affiche la version et quitte\n"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/it.po postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/it.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ecpg (PostgreSQL) 9.4\n"
+"Project-Id-Version: ecpg (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-07-30 04:08+0000\n"
-"PO-Revision-Date: 2014-07-30 22:37+0100\n"
+"POT-Creation-Date: 2017-02-09 21:16+0000\n"
+"PO-Revision-Date: 2017-04-23 03:03+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -30,7 +30,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: descriptor.c:64
 #, c-format
@@ -42,27 +42,27 @@
 msgid "descriptor \"%s\" does not exist"
 msgstr "il descrittore \"%s\" non esiste"
 
-#: descriptor.c:161 descriptor.c:210
+#: descriptor.c:161 descriptor.c:213
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "la voce \"%d\" dell'header del descrittore non esiste"
 
-#: descriptor.c:182
+#: descriptor.c:183
 #, c-format
 msgid "nullable is always 1"
 msgstr "nullable è sempre 1"
 
-#: descriptor.c:185
+#: descriptor.c:186
 #, c-format
 msgid "key_member is always 0"
 msgstr "key_member è sempre 0"
 
-#: descriptor.c:277
+#: descriptor.c:280
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "la voce \"%s\" del descrittore non è implementata"
 
-#: descriptor.c:287
+#: descriptor.c:290
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "la voce \"%s\" del descrittore non può essere impostata"
@@ -161,8 +161,8 @@
 
 #: ecpg.c:57
 #, c-format
-msgid "  --version      output version information, then exit\n"
-msgstr "  --version      mostra informazioni sulla versione ed esci\n"
+msgid "  -V, --version  output version information, then exit\n"
+msgstr "  -V --version   mostra informazioni sulla versione ed esci\n"
 
 #: ecpg.c:58
 #, c-format
@@ -189,154 +189,154 @@
 "\n"
 "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: ecpg.c:143
+#: ecpg.c:139
 #, c-format
 msgid "%s: could not locate my own executable path\n"
 msgstr "%s: percorso del proprio eseguibile non trovato\n"
 
-#: ecpg.c:186 ecpg.c:337 ecpg.c:347
+#: ecpg.c:175 ecpg.c:327 ecpg.c:337
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: apertura del file \"%s\" fallita: %s\n"
 
-#: ecpg.c:225 ecpg.c:238 ecpg.c:254 ecpg.c:279
+#: ecpg.c:214 ecpg.c:227 ecpg.c:243 ecpg.c:268
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
 
-#: ecpg.c:249
+#: ecpg.c:238
 #, c-format
 msgid "%s: parser debug support (-d) not available\n"
 msgstr "%s: il supporto al debug del parser (-d) non è disponibile\n"
 
-#: ecpg.c:267
+#: ecpg.c:256
 #, c-format
 msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
 msgstr "%s, preprocessore embedded C PostgreSQL, versione %d.%d.%d\n"
 
-#: ecpg.c:269
+#: ecpg.c:258
 #, c-format
 msgid "EXEC SQL INCLUDE ... search starts here:\n"
 msgstr "EXEC SQL INCLUDE ... la ricerca inizia da qui:\n"
 
-#: ecpg.c:272
+#: ecpg.c:261
 #, c-format
 msgid "end of search list\n"
 msgstr "fine della lista di ricerca\n"
 
-#: ecpg.c:278
+#: ecpg.c:267
 #, c-format
 msgid "%s: no input files specified\n"
 msgstr "%s: non è stato specificato nessun file di input\n"
 
-#: ecpg.c:470
+#: ecpg.c:460
 #, c-format
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "il cursore \"%s\" è stato dichiarato, ma non aperto"
 
-#: ecpg.c:483 preproc.y:125
+#: ecpg.c:473 preproc.y:127
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "rimozione del file di output \"%s\" fallita\n"
 
-#: pgc.l:421
+#: pgc.l:432
 #, c-format
 msgid "unterminated /* comment"
 msgstr "commento /* non terminato"
 
 # string literal sarebbe intraducubile infatti è come la stringa viene rappresentata nel linguaggio di programmazione, ma come si fa a tradurlo?....
 # Secondo me "stringa letterale" -- Daniele
-#: pgc.l:434
+#: pgc.l:445
 #, c-format
 msgid "invalid bit string literal"
 msgstr "bit nella stringa letterale non valido"
 
-#: pgc.l:443
+#: pgc.l:454
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "letterale di stringa di bit non terminato"
 
-#: pgc.l:459
+#: pgc.l:470
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "letterale di stringa esadecimale non terminato"
 
-#: pgc.l:537
+#: pgc.l:548
 #, c-format
 msgid "unterminated quoted string"
 msgstr "stringa tra virgolette non terminata"
 
-#: pgc.l:592 pgc.l:605
+#: pgc.l:605 pgc.l:618
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "identificativo delimitato di lunghezza zero"
 
-#: pgc.l:613
+#: pgc.l:626
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "identificativo tra virgolette non terminato"
 
-#: pgc.l:867
+#: pgc.l:881
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "commenti /* ... */ annidati"
 
-#: pgc.l:960
+#: pgc.l:974
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "identificativo mancante nel comando EXEC SQL UNDEF"
 
-#: pgc.l:1006 pgc.l:1020
+#: pgc.l:1020 pgc.l:1034
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "mancata corrispondenza fra \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 
-#: pgc.l:1009 pgc.l:1022 pgc.l:1198
+#: pgc.l:1023 pgc.l:1036 pgc.l:1212
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "manca \"EXEC SQL ENDIF;\""
 
-#: pgc.l:1038 pgc.l:1057
+#: pgc.l:1052 pgc.l:1071
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "più di un EXEC SQL ELSE"
 
-#: pgc.l:1079 pgc.l:1093
+#: pgc.l:1093 pgc.l:1107
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "EXEC SQL ENDIF non corrispondente"
 
-#: pgc.l:1113
+#: pgc.l:1127
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "troppe condizioni EXEC SQL IFDEF annidate"
 
-#: pgc.l:1146
+#: pgc.l:1160
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "identificativo mancante nel comando EXEC SQL IFDEF"
 
-#: pgc.l:1155
+#: pgc.l:1169
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "identificativo mancante nel comando EXEC SQL DEFINE"
 
-#: pgc.l:1188
+#: pgc.l:1202
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "errore di sintassi nel comando EXEC SQL INCLUDE"
 
-#: pgc.l:1237
+#: pgc.l:1251
 #, c-format
 msgid "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"
 msgstr "errore interno: stato non raggiungibile, si prega di segnalarlo a <pgsql-bugs@postgresql.org>"
 
-#: pgc.l:1362
+#: pgc.l:1375
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr "Errore: il percorso delle inclusioni \"%s/%s\" è troppo lungo alla riga %d, perciò viene saltato\n"
 
-#: pgc.l:1385
+#: pgc.l:1398
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "apertura del file di include \"%s\" alla riga %d fallita"
@@ -345,210 +345,210 @@
 msgid "syntax error"
 msgstr "errore di sintassi"
 
-#: preproc.y:79
+#: preproc.y:81
 #, c-format
 msgid "WARNING: "
 msgstr "ATTENZIONE: "
 
-#: preproc.y:82
+#: preproc.y:84
 #, c-format
 msgid "ERROR: "
 msgstr "ERRORE: "
 
-#: preproc.y:506
+#: preproc.y:508
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "il cursore \"%s\" non esiste"
 
-#: preproc.y:535
+#: preproc.y:537
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "l'inizializzatore non è permesso nella definizione del tipo di dato"
 
-#: preproc.y:537
+#: preproc.y:539
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "il nome di tipo \"string\" è riservato alla modalità Informix"
 
-#: preproc.y:544 preproc.y:13853
+#: preproc.y:546 preproc.y:14503
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "il tipo \"%s\" è già definito"
 
-#: preproc.y:568 preproc.y:14511 preproc.y:14832 variable.c:618
+#: preproc.y:570 preproc.y:15161 preproc.y:15481 variable.c:620
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "gli array multidimensionali per tipi dato semplici non sono supportati"
 
-#: preproc.y:1577
+#: preproc.y:1624
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "l'opzione AT non è permessa nell'istruzione CLOSE DATABASE"
 
-#: preproc.y:1780
+#: preproc.y:1837
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "l'opzione AT non è permessa nell'istruzione CONNECT"
 
-#: preproc.y:1814
+#: preproc.y:1871
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "l'opzione AT non è permessa nell'istruzione DISCONNECT"
 
-#: preproc.y:1869
+#: preproc.y:1926
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "l'opzione AT non è permessa nell'istruzione SET CONNECTION"
 
-#: preproc.y:1891
+#: preproc.y:1948
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "l'opzione AT non è permessa nell'istruzione TYPE"
 
-#: preproc.y:1900
+#: preproc.y:1957
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "l'opzione AT non è permessa nell'istruzione VAR"
 
-#: preproc.y:1907
+#: preproc.y:1964
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "l'opzione AT non è permessa nell'istruzione WHENEVER"
 
-#: preproc.y:2155 preproc.y:2160 preproc.y:2276 preproc.y:3614 preproc.y:4866
-#: preproc.y:4875 preproc.y:5159 preproc.y:6562 preproc.y:7683 preproc.y:7688
-#: preproc.y:10142 preproc.y:10739
+#: preproc.y:2216 preproc.y:2221 preproc.y:2337 preproc.y:3739 preproc.y:5137
+#: preproc.y:5146 preproc.y:5430 preproc.y:6862 preproc.y:8044 preproc.y:8049
+#: preproc.y:10676 preproc.y:11293
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "al server è stata richiesta una funzionalità non supportata"
 
-#: preproc.y:2518
+#: preproc.y:2595
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL non è implementato"
 
-#: preproc.y:3002
+#: preproc.y:3127
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDIN non è implementato"
 
-#: preproc.y:8520 preproc.y:13442
+#: preproc.y:8935 preproc.y:14092
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr "usare la variabile \"%s\" in una diversa istruzione declare non è supportato"
 
-#: preproc.y:8522 preproc.y:13444
+#: preproc.y:8937 preproc.y:14094
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "il cursore \"%s\" è già definito"
 
-#: preproc.y:8940
+#: preproc.y:9367
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "la sintassi LIMIT #,# passata al server non è più supportata"
 
-#: preproc.y:9176 preproc.y:9183
+#: preproc.y:9675 preproc.y:9682
 #, c-format
 msgid "subquery in FROM must have an alias"
 msgstr "la sottoquery in FROM deve avere un alias"
 
-#: preproc.y:13172
+#: preproc.y:13822
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS non può specificare INTO"
 
-#: preproc.y:13208
+#: preproc.y:13858
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "atteso \"@\", trovato \"%s\""
 
-#: preproc.y:13220
+#: preproc.y:13870
 #, c-format
 msgid "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are supported"
 msgstr "soltanto i protocolli \"tcp\" e \"unix\" ed il tipo database \"postgresql\" sono supportati"
 
-#: preproc.y:13223
+#: preproc.y:13873
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "atteso \"://\", trovato \"%s\""
 
-#: preproc.y:13228
+#: preproc.y:13878
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr "i socket di dominio Unix funzionano solo con \"localhost\" ma non con \"%s\""
 
-#: preproc.y:13254
+#: preproc.y:13904
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "atteso \"postgresql\", trovato \"%s\""
 
-#: preproc.y:13257
+#: preproc.y:13907
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "tipo di connessione non valido: %s"
 
-#: preproc.y:13266
+#: preproc.y:13916
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "atteso \"@\" oppure \"://\", trovato \"%s\""
 
-#: preproc.y:13341 preproc.y:13359
+#: preproc.y:13991 preproc.y:14009
 #, c-format
 msgid "invalid data type"
 msgstr "tipo dato non valido"
 
-#: preproc.y:13370 preproc.y:13387
+#: preproc.y:14020 preproc.y:14037
 #, c-format
 msgid "incomplete statement"
 msgstr "istruzione incompleta"
 
-#: preproc.y:13373 preproc.y:13390
+#: preproc.y:14023 preproc.y:14040
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "token \"%s\" sconosciuto"
 
-#: preproc.y:13664
+#: preproc.y:14314
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr "solo i dati di tipo numeric e decimal hanno argomento precisione/scala"
 
-#: preproc.y:13676
+#: preproc.y:14326
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "specificazione di intervallo non permessa qui"
 
-#: preproc.y:13828 preproc.y:13880
+#: preproc.y:14478 preproc.y:14530
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "troppi livelli nidificati nella definizione della struttura/unione"
 
-#: preproc.y:14019
+#: preproc.y:14669
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "i puntatori a varchar non sono implementati"
 
-#: preproc.y:14206 preproc.y:14231
+#: preproc.y:14856 preproc.y:14881
 #, c-format
 msgid "using unsupported DESCRIBE statement"
 msgstr "si sta utilizzando una istruzione DESCRIBE non supportata"
 
-#: preproc.y:14478
+#: preproc.y:15128
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "initializer non è permesso nel comando EXEC SQL VAR"
 
-#: preproc.y:14790
+#: preproc.y:15439
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "array di indicatori non sono permessi"
 
-#: preproc.y:15011
+#: preproc.y:15660
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "operatore non permesso nella definizione di variabile"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:15049
+#: preproc.y:15698
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s a o presso \"%s\""
@@ -639,34 +639,34 @@
 msgid "variable \"%s\" is not declared"
 msgstr "la variabile \"%s\" non è stata dichiarata"
 
-#: variable.c:492
+#: variable.c:494
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "il tipo di variabile di un indicatore deve essere intero"
 
-#: variable.c:504
+#: variable.c:506
 #, c-format
 msgid "unrecognized data type name \"%s\""
 msgstr "tipo di dato chiamato \"%s\" è sconosciuto"
 
-#: variable.c:515 variable.c:523 variable.c:540 variable.c:543
+#: variable.c:517 variable.c:525 variable.c:542 variable.c:545
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "gli array multidimensionali non sono supportati"
 
-#: variable.c:532
+#: variable.c:534
 #, 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] "puntatori a più livelli (più di 2) non sono supportati; trovato %d livello"
 msgstr[1] "puntatori a più livelli (più di 2) non sono supportati; trovati %d livelli"
 
-#: variable.c:537
+#: variable.c:539
 #, c-format
 msgid "pointer to pointer is not supported for this data type"
 msgstr "il puntatore a puntatore non è supportato per questo tipo di dato"
 
-#: variable.c:557
+#: variable.c:559
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "gli array multidimensionali per strutture non sono supportati"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/pl.po postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/pl.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/pl.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/pl.po	2017-08-07 21:13:41.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ecpg (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-11-10 20:37+0000\n"
+"POT-Creation-Date: 2016-10-20 21:46+0000\n"
 "PO-Revision-Date: 2014-11-10 23:25+0200\n"
 "Last-Translator: grzegorz <begina.felicysym@wp.eu>\n"
 "Language-Team: begina.felicysym@wp.eu\n"
@@ -15,8 +15,7 @@
 "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"
+"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\n"
 
 #: descriptor.c:64
@@ -29,27 +28,27 @@
 msgid "descriptor \"%s\" does not exist"
 msgstr "deskryptor \"%s\" nie istnieje"
 
-#: descriptor.c:161 descriptor.c:210
+#: descriptor.c:161 descriptor.c:212
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "element nagłówka deskryptora \"%d\" nie istnieje"
 
-#: descriptor.c:182
+#: descriptor.c:183
 #, c-format
 msgid "nullable is always 1"
 msgstr "nullable jest zawsze 1"
 
-#: descriptor.c:185
+#: descriptor.c:186
 #, c-format
 msgid "key_member is always 0"
 msgstr "key_member jest zawsze 0"
 
-#: descriptor.c:277
+#: descriptor.c:279
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "element deskryptora \"%s\" nie jest zaimplementowany"
 
-#: descriptor.c:287
+#: descriptor.c:289
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "element deskryptora \"%s\" nie może zostać ustawiony"
@@ -148,8 +147,8 @@
 
 #: ecpg.c:57
 #, c-format
-msgid "  --version      output version information, then exit\n"
-msgstr "  --version      wypisuje informacje o wersji i kończy\n"
+msgid "  -V, --version  output version information, then exit\n"
+msgstr "  -V, --version  wypisuje informacje o wersji i kończy\n"
 
 #: ecpg.c:58
 #, c-format
@@ -176,154 +175,152 @@
 "\n"
 "Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
 
-#: ecpg.c:143
+#: ecpg.c:139
 #, c-format
-#| msgid "%s: could not locate matching postgres executable"
 msgid "%s: could not locate my own executable path\n"
 msgstr "%s: nie można odnaleźć własnej ścieżki programu wykonywalnego\n"
 
-#: ecpg.c:186 ecpg.c:337 ecpg.c:347
+#: ecpg.c:175 ecpg.c:326 ecpg.c:336
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: nie można otworzyć pliku \"%s\": %s\n"
 
-#: ecpg.c:225 ecpg.c:238 ecpg.c:254 ecpg.c:279
+#: ecpg.c:214 ecpg.c:227 ecpg.c:243 ecpg.c:268
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
 
-#: ecpg.c:249
+#: ecpg.c:238
 #, c-format
 msgid "%s: parser debug support (-d) not available\n"
 msgstr "%s: wsparcie debugu analizatora (-d) niedostępne\n"
 
-#: ecpg.c:267
+#: ecpg.c:256
 #, 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:269
+#: ecpg.c:258
 #, c-format
 msgid "EXEC SQL INCLUDE ... search starts here:\n"
 msgstr "EXEC SQL INCLUDE ... wyszukiwanie zaczyna siÄ™ tutaj:\n"
 
-#: ecpg.c:272
+#: ecpg.c:261
 #, c-format
 msgid "end of search list\n"
 msgstr "koniec listy wyszukiwania\n"
 
-#: ecpg.c:278
+#: ecpg.c:267
 #, c-format
 msgid "%s: no input files specified\n"
 msgstr "%s: nie wskazano pliku wejściowego\n"
 
-#: ecpg.c:470
+#: ecpg.c:459
 #, c-format
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "kursor \"%s\" został zadeklarowany, ale nie otwarty"
 
-#: ecpg.c:483 preproc.y:125
+#: ecpg.c:472 preproc.y:127
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "nie można usunąć pliku wyjścia \"%s\"\n"
 
-#: pgc.l:421
+#: pgc.l:428
 #, c-format
 msgid "unterminated /* comment"
 msgstr "nie zakończony komentarz /*"
 
-#: pgc.l:434
+#: pgc.l:441
 #, c-format
 msgid "invalid bit string literal"
 msgstr "nieprawidłowa stała łańcucha bitów"
 
-#: pgc.l:443
+#: pgc.l:450
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "niezakończona stała łańcucha bitów"
 
-#: pgc.l:459
+#: pgc.l:466
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "niezakończona stała łańcucha szesnastkowego"
 
-#: pgc.l:537
+#: pgc.l:544
 #, c-format
 msgid "unterminated quoted string"
 msgstr "niezakończona stała łańcuchowa"
 
-#: pgc.l:592 pgc.l:605
+#: pgc.l:601 pgc.l:614
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "ograniczony identyfikator o długości zero"
 
-#: pgc.l:613
+#: pgc.l:622
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "niezakończony łańcuch identyfikatora"
 
-#: pgc.l:867
+#: pgc.l:877
 #, c-format
-#| msgid "unterminated /* comment"
 msgid "nested /* ... */ comments"
 msgstr "zagnieżdżone komentarze /* ... */"
 
-#: pgc.l:960
+#: pgc.l:970
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "brakujÄ…cy identyfikator w poleceniu EXEC SQL UNDEF"
 
-#: pgc.l:1006 pgc.l:1020
+#: pgc.l:1016 pgc.l:1030
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "brak pasujÄ…cego \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 
-#: pgc.l:1009 pgc.l:1022 pgc.l:1198
+#: pgc.l:1019 pgc.l:1032 pgc.l:1208
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "brak \"EXEC SQL ENDIF;\""
 
-#: pgc.l:1038 pgc.l:1057
+#: pgc.l:1048 pgc.l:1067
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "więcej niż jeden EXEC SQL ELSE"
 
-#: pgc.l:1079 pgc.l:1093
+#: pgc.l:1089 pgc.l:1103
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "niedopasowany EXEC SQL ENDIF"
 
-#: pgc.l:1113
+#: pgc.l:1123
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "zbyt wiele zagłębień warunków EXEC SQL IFDEF"
 
-#: pgc.l:1146
+#: pgc.l:1156
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "brakujÄ…cy identyfikator w poleceniu EXEC SQL IFDEF"
 
-#: pgc.l:1155
+#: pgc.l:1165
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "brakujÄ…cy identyfikator w poleceniu EXEC SQL DEFINE"
 
-#: pgc.l:1188
+#: pgc.l:1198
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "błąd składni w poleceniu EXEC SQL INCLUDE"
 
-#: pgc.l:1237
+#: pgc.l:1247
 #, c-format
 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:1362
+#: pgc.l:1371
 #, 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:1385
+#: pgc.l:1394
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "nie można otworzyć załączonego pliku \"%s\" w linii %d"
@@ -332,211 +329,210 @@
 msgid "syntax error"
 msgstr "błąd składni"
 
-#: preproc.y:79
+#: preproc.y:81
 #, c-format
 msgid "WARNING: "
 msgstr "OSTRZEŻENIE: "
 
-#: preproc.y:82
+#: preproc.y:84
 #, c-format
 msgid "ERROR: "
 msgstr "B�ĄD: "
 
-#: preproc.y:506
+#: preproc.y:508
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "kursor \"%s\" nie istnieje"
 
-#: preproc.y:535
+#: preproc.y:537
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "inicjator niedozwolony w definicji typu"
 
-#: preproc.y:537
+#: preproc.y:539
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "nazwa typu \"string\" jest zarezerwowana w trybie Informix"
 
-#: preproc.y:544 preproc.y:13867
+#: preproc.y:546 preproc.y:14503
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "typ \"%s\" już istnieje"
 
-#: preproc.y:568 preproc.y:14525 preproc.y:14846 variable.c:618
+#: preproc.y:570 preproc.y:15161 preproc.y:15481 variable.c:620
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "wielowymiarowe tablice dla prostych typów danych nie są wspierane"
 
-#: preproc.y:1579
+#: preproc.y:1624
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "opcja AT niedozwolona w wyrażeniu CLOSE DATABASE"
 
-#: preproc.y:1782
+#: preproc.y:1837
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "opcja AT niedozwolona w wyrażeniu CONNECT"
 
-#: preproc.y:1816
+#: preproc.y:1871
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "opcja AT niedozwolona w wyrażeniu DISCONNECT"
 
-#: preproc.y:1871
+#: preproc.y:1926
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "opcja AT niedozwolona w wyrażeniu SET CONNECTION"
 
-#: preproc.y:1893
+#: preproc.y:1948
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "opcja AT niedozwolona w wyrażeniu TYPE"
 
-#: preproc.y:1902
+#: preproc.y:1957
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "opcja AT niedozwolona w wyrażeniu VAR"
 
-#: preproc.y:1909
+#: preproc.y:1964
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "opcja AT niedozwolona w wyrażeniu WHENEVER"
 
-#: preproc.y:2157 preproc.y:2162 preproc.y:2278 preproc.y:3656 preproc.y:4908
-#: preproc.y:4917 preproc.y:5201 preproc.y:6604 preproc.y:7693 preproc.y:7698
-#: preproc.y:10156 preproc.y:10753
+#: preproc.y:2216 preproc.y:2221 preproc.y:2337 preproc.y:3739 preproc.y:5137
+#: preproc.y:5146 preproc.y:5430 preproc.y:6862 preproc.y:8044 preproc.y:8049
+#: preproc.y:10676 preproc.y:11293
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "niewspierana cecha zostanie przekazana na serwer"
 
-#: preproc.y:2536
+#: preproc.y:2595
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL nie jest zaimplementowane"
 
-#: preproc.y:3044
+#: preproc.y:3127
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDIN nie zostało zaimplementowane"
 
-#: preproc.y:8534 preproc.y:13456
+#: preproc.y:8935 preproc.y:14092
 #, 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:8536 preproc.y:13458
+#: preproc.y:8937 preproc.y:14094
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "kursor \"%s\" już istnieje"
 
-#: preproc.y:8954
+#: preproc.y:9367
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "już nie wspierana składnia LIMIT #,# przesłana na serwer"
 
-#: preproc.y:9190 preproc.y:9197
+#: preproc.y:9675 preproc.y:9682
 #, c-format
 msgid "subquery in FROM must have an alias"
 msgstr "podzapytanie z FROM musi mieć alias"
 
-#: preproc.y:13186
+#: preproc.y:13822
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS nie może zawierać INTO"
 
-#: preproc.y:13222
+#: preproc.y:13858
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "oczekiwano \"@\", znaleziono \"%s\""
 
-#: preproc.y:13234
+#: preproc.y:13870
 #, c-format
 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:13237
+#: preproc.y:13873
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "oczekiwano \"://\", znaleziono \"%s\""
 
-#: preproc.y:13242
+#: preproc.y:13878
 #, 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:13268
+#: preproc.y:13904
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "oczekiwano \"postgresql\", znaleziono \"%s\""
 
-#: preproc.y:13271
+#: preproc.y:13907
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "niepoprawny typ połączenia: %s"
 
-#: preproc.y:13280
+#: preproc.y:13916
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "oczekiwano \"@\" lub \"://\", znaleziono \"%s\""
 
-#: preproc.y:13355 preproc.y:13373
+#: preproc.y:13991 preproc.y:14009
 #, c-format
 msgid "invalid data type"
 msgstr "niepoprawny typ danych"
 
-#: preproc.y:13384 preproc.y:13401
+#: preproc.y:14020 preproc.y:14037
 #, c-format
 msgid "incomplete statement"
 msgstr "niepełne wyrażenie"
 
-#: preproc.y:13387 preproc.y:13404
+#: preproc.y:14023 preproc.y:14040
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "niezrozumiały token \"%s\""
 
-#: preproc.y:13678
+#: preproc.y:14314
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr "tylko typy danych numeric i decimal majÄ… argument precyzji/skali"
 
-#: preproc.y:13690
+#: preproc.y:14326
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "specyfikacja interwału niedozwolona tutaj"
 
-#: preproc.y:13842 preproc.y:13894
+#: preproc.y:14478 preproc.y:14530
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "zbyt wiele poziomów w zagnieżdżonej definicji structure/union"
 
-#: preproc.y:14033
+#: preproc.y:14669
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "wskazania na varchar nie sÄ… zaimplementowane"
 
-#: preproc.y:14220 preproc.y:14245
+#: preproc.y:14856 preproc.y:14881
 #, c-format
 msgid "using unsupported DESCRIBE statement"
 msgstr "użycie niewspieranego wyrażenia DESCRIBE"
 
-#: preproc.y:14492
+#: preproc.y:15128
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "inicjator niedopuszczalny w poleceniu EXEC SQL VAR"
 
-#: preproc.y:14804
+#: preproc.y:15439
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "tabele wskazań nie są dozwolone w wejściu"
 
-#: preproc.y:15025
+#: preproc.y:15660
 #, c-format
-#| msgid "initializer not allowed in type definition"
 msgid "operator not allowed in variable definition"
 msgstr "operator niedozwolony w definicji zmiennej"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:15063
+#: preproc.y:15698
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s w lub pobliżu \"%s\""
@@ -626,22 +622,22 @@
 msgid "variable \"%s\" is not declared"
 msgstr "zmienna \"%s\" nie została zadeklarowana"
 
-#: variable.c:492
+#: variable.c:494
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "zmienna wskaźnikowa musi mieć typ integer"
 
-#: variable.c:504
+#: variable.c:506
 #, c-format
 msgid "unrecognized data type name \"%s\""
 msgstr "niezrozumiała nazwa typu danych \"%s\""
 
-#: variable.c:515 variable.c:523 variable.c:540 variable.c:543
+#: variable.c:517 variable.c:525 variable.c:542 variable.c:545
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "wielowymiarowe tablice nie sÄ… wspierane"
 
-#: variable.c:532
+#: variable.c:534
 #, 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"
@@ -649,18 +645,21 @@
 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:537
+#: variable.c:539
 #, c-format
 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:557
+#: variable.c:559
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "wielowymiarowe tablice dla struktur nie sÄ… wspierane"
 
+#~ msgid "COPY TO STDIN is not possible"
+#~ msgstr "COPY TO STDIN nie jest możliwe"
+
 #~ msgid "COPY FROM STDOUT is not possible"
 #~ msgstr "COPY FROM STDOUT nie jest możliwe"
 
-#~ msgid "COPY TO STDIN is not possible"
-#~ msgstr "COPY TO STDIN nie jest możliwe"
+#~ msgid "  --version      output version information, then exit\n"
+#~ msgstr "  --version      wypisuje informacje o wersji i kończy\n"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/pt_BR.po postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/pt_BR.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/pt_BR.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/pt_BR.po	2017-08-07 21:13:41.000000000 +0000
@@ -2,13 +2,13 @@
 # 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-2014.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2010-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-09-17 22:32-0300\n"
+"POT-Creation-Date: 2017-08-06 01:46-0300\n"
 "PO-Revision-Date: 2009-02-09 12:59-0200\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -28,7 +28,7 @@
 msgid "descriptor \"%s\" does not exist"
 msgstr "descritor \"%s\" não existe"
 
-#: descriptor.c:161 descriptor.c:212
+#: descriptor.c:161 descriptor.c:213
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "item do cabeçalho do descritor \"%d\" não existe"
@@ -43,12 +43,12 @@
 msgid "key_member is always 0"
 msgstr "key_member é sempre 0"
 
-#: descriptor.c:279
+#: descriptor.c:280
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "item do descritor \"%s\" não está implementado"
 
-#: descriptor.c:289
+#: descriptor.c:290
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "item do descritor \"%s\" não pode ser definido"
@@ -59,7 +59,7 @@
 "%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
 "\n"
 msgstr ""
-"%s é o pré-processador SQL embutido do PostgeSQL para programas em C.\n"
+"%s é o pré-processador SQL embutido do PostgreSQL para programas em C.\n"
 "\n"
 
 #: ecpg.c:37
@@ -147,8 +147,8 @@
 
 #: ecpg.c:57
 #, c-format
-msgid "  --version      output version information, then exit\n"
-msgstr "  --version      mostra informação sobre a versão e termina\n"
+msgid "  -V, --version  output version information, then exit\n"
+msgstr "  -V, --version  mostra informação sobre a versão e termina\n"
 
 #: ecpg.c:58
 #, c-format
@@ -175,152 +175,152 @@
 "\n"
 "Relate erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: ecpg.c:143
+#: ecpg.c:139
 #, c-format
 msgid "%s: could not locate my own executable path\n"
 msgstr "%s: não pôde localizar meu próprio caminho executável\n"
 
-#: ecpg.c:186 ecpg.c:337 ecpg.c:347
+#: ecpg.c:175 ecpg.c:327 ecpg.c:337
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: não pôde abrir arquivo \"%s\": %s\n"
 
-#: ecpg.c:225 ecpg.c:238 ecpg.c:254 ecpg.c:279
+#: ecpg.c:214 ecpg.c:227 ecpg.c:243 ecpg.c:268
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: ecpg.c:249
+#: ecpg.c:238
 #, c-format
 msgid "%s: parser debug support (-d) not available\n"
 msgstr "%s: suporte a depuração do analisador (-d) não está disponível\n"
 
-#: ecpg.c:267
+#: ecpg.c:256
 #, c-format
 msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
 msgstr "%s, the pré-processador C embutido do PostgreSQL, versão %d.%d.%d\n"
 
-#: ecpg.c:269
+#: ecpg.c:258
 #, c-format
 msgid "EXEC SQL INCLUDE ... search starts here:\n"
 msgstr "EXEC SQL INCLUDE ... pesquisa inicia aqui:\n"
 
-#: ecpg.c:272
+#: ecpg.c:261
 #, c-format
 msgid "end of search list\n"
 msgstr "fim da lista de pesquisa\n"
 
-#: ecpg.c:278
+#: ecpg.c:267
 #, c-format
 msgid "%s: no input files specified\n"
 msgstr "%s: nenhum arquivo de entrada foi especificado\n"
 
-#: ecpg.c:470
+#: ecpg.c:460
 #, c-format
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "cursor \"%s\" foi declarado mas não foi aberto"
 
-#: ecpg.c:483 preproc.y:127
+#: ecpg.c:473 preproc.y:127
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "não pôde remover arquivo de saída \"%s\"\n"
 
-#: pgc.l:428
+#: pgc.l:432
 #, c-format
 msgid "unterminated /* comment"
 msgstr "comentário /* não foi terminado"
 
-#: pgc.l:441
+#: pgc.l:445
 #, c-format
 msgid "invalid bit string literal"
 msgstr "cadeia de bits inválida"
 
-#: pgc.l:450
+#: pgc.l:454
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "cadeia de bits não foi terminada"
 
-#: pgc.l:466
+#: pgc.l:470
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "cadeia de caracteres hexadecimal não foi terminada"
 
-#: pgc.l:544
+#: pgc.l:548
 #, c-format
 msgid "unterminated quoted string"
 msgstr "cadeia de caracteres entre aspas não foi terminada"
 
-#: pgc.l:601 pgc.l:614
+#: pgc.l:606 pgc.l:619
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "identificador delimitado tem tamanho zero"
 
-#: pgc.l:622
+#: pgc.l:627
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "identificador entre aspas não foi terminado"
 
-#: pgc.l:877
+#: pgc.l:882
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "comentários /* ... */ aninhados"
 
-#: pgc.l:970
+#: pgc.l:975
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "faltando identificador no comando EXEC SQL UNDEF"
 
-#: pgc.l:1016 pgc.l:1030
+#: pgc.l:1021 pgc.l:1035
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "faltando correspondente \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 
-#: pgc.l:1019 pgc.l:1032 pgc.l:1208
+#: pgc.l:1024 pgc.l:1037 pgc.l:1213
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "faltando \"EXEC SQL ENDIF;\""
 
-#: pgc.l:1048 pgc.l:1067
+#: pgc.l:1053 pgc.l:1072
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "mais de um EXEC SQL ELSE"
 
-#: pgc.l:1089 pgc.l:1103
+#: pgc.l:1094 pgc.l:1108
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "EXEC SQL ENDIF não tem correspondente"
 
-#: pgc.l:1123
+#: pgc.l:1128
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "muitas condições EXEC SQL IFDEF aninhadas"
 
-#: pgc.l:1156
+#: pgc.l:1161
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "faltando identificador no comando EXEC SQL IFDEF"
 
-#: pgc.l:1165
+#: pgc.l:1170
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "faltando identificador no comando EXEC SQL IFDEF"
 
-#: pgc.l:1198
+#: pgc.l:1203
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "erro de sintaxe no comando EXEC SQL INCLUDE"
 
-#: pgc.l:1247
+#: pgc.l:1252
 #, c-format
 msgid "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"
 msgstr "erro interno: estado inacessível; por favor relato isso a <pgsql-bugs@postgresql.org>"
 
-#: pgc.l:1371
+#: pgc.l:1376
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr "Erro: caminho de inclusão \"%s/%s\" é muito longo na linha %d, ignorando\n"
 
-#: pgc.l:1394
+#: pgc.l:1399
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "não pôde abrir arquivo de inclusão \"%s\" na linha %d"
@@ -354,12 +354,12 @@
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "nome de tipo \"string\" é reservado no modo Informix"
 
-#: preproc.y:546 preproc.y:14495
+#: preproc.y:546 preproc.y:14511
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "tipo \"%s\" já está definido"
 
-#: preproc.y:570 preproc.y:15153 preproc.y:15473 variable.c:620
+#: preproc.y:570 preproc.y:15169 preproc.y:15489 variable.c:620
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "matrizes multidimensionais para tipo de dados simples não são suportadas"
@@ -399,140 +399,140 @@
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "opção AT não é permitida no comando WHENEVER"
 
-#: preproc.y:2216 preproc.y:2221 preproc.y:2337 preproc.y:3731 preproc.y:5129
-#: preproc.y:5138 preproc.y:5422 preproc.y:6854 preproc.y:8036 preproc.y:8041
-#: preproc.y:10668 preproc.y:11285
+#: preproc.y:2220 preproc.y:2225 preproc.y:2341 preproc.y:3743 preproc.y:5145
+#: preproc.y:5154 preproc.y:5438 preproc.y:6870 preproc.y:8052 preproc.y:8057
+#: preproc.y:10684 preproc.y:11301
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "funcionalidade não suportada será enviada ao servidor"
 
-#: preproc.y:2595
+#: preproc.y:2599
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL não está implementado"
 
-#: preproc.y:3119
+#: preproc.y:3131
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "COPY FROM STDIN não está implementado"
 
-#: preproc.y:8927 preproc.y:14084
+#: preproc.y:8943 preproc.y:14100
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr "utilizar variável \"%s\" em comandos de declaração diferentes não é suportado"
 
-#: preproc.y:8929 preproc.y:14086
+#: preproc.y:8945 preproc.y:14102
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "cursor \"%s\" já está definido"
 
-#: preproc.y:9359
+#: preproc.y:9375
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "sintaxe LIMIT #,# que não é suportada foi enviada ao servidor"
 
-#: preproc.y:9667 preproc.y:9674
+#: preproc.y:9683 preproc.y:9690
 #, c-format
 msgid "subquery in FROM must have an alias"
 msgstr "subconsulta no FROM deve ter um aliás"
 
-#: preproc.y:13814
+#: preproc.y:13830
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS não pode especificar INTO"
 
-#: preproc.y:13850
+#: preproc.y:13866
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "esperado \"@\", encontrado \"%s\""
 
-#: preproc.y:13862
+#: preproc.y:13878
 #, c-format
 msgid "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are supported"
 msgstr "somente os protocolos \"tcp\" e \"unix\" e tipo banco de dados \"postgressql\" sãosuportados"
 
-#: preproc.y:13865
+#: preproc.y:13881
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "esperado \"://\", encontrado \"%s\""
 
-#: preproc.y:13870
+#: preproc.y:13886
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr "Soquetes de domínio Unix trabalham somente com \"localhost\" e não com \"%s\""
 
-#: preproc.y:13896
+#: preproc.y:13912
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "esperado \"postgresql\", encontrado \"%s\""
 
-#: preproc.y:13899
+#: preproc.y:13915
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "tipo de conexão inválido: %s"
 
-#: preproc.y:13908
+#: preproc.y:13924
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "esperado \"@\" ou \"://\", encontrado \"%s\""
 
-#: preproc.y:13983 preproc.y:14001
+#: preproc.y:13999 preproc.y:14017
 #, c-format
 msgid "invalid data type"
 msgstr "tipo de dado inválido"
 
-#: preproc.y:14012 preproc.y:14029
+#: preproc.y:14028 preproc.y:14045
 #, c-format
 msgid "incomplete statement"
 msgstr "comando incompleto"
 
-#: preproc.y:14015 preproc.y:14032
+#: preproc.y:14031 preproc.y:14048
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "informação desconhecida \"%s\""
 
-#: preproc.y:14306
+#: preproc.y:14322
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr "somente os tipos de dados numeric e decimal possuem argumento de precisão/escala"
 
-#: preproc.y:14318
+#: preproc.y:14334
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "especificação de intervalo não é permitida aqui"
 
-#: preproc.y:14470 preproc.y:14522
+#: preproc.y:14486 preproc.y:14538
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "muitos níveis em definição aninhada de estrutura/união"
 
-#: preproc.y:14661
+#: preproc.y:14677
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "ponteiros para varchar não estão implentados"
 
-#: preproc.y:14848 preproc.y:14873
+#: preproc.y:14864 preproc.y:14889
 #, c-format
 msgid "using unsupported DESCRIBE statement"
 msgstr "utilizando comando DESCRIBE que não é suportado"
 
-#: preproc.y:15120
+#: preproc.y:15136
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "inicilização não é permitido no comando EXEC SQL VAR"
 
-#: preproc.y:15431
+#: preproc.y:15447
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "matrizes do indicadores não são permitidas na entrada"
 
-#: preproc.y:15652
+#: preproc.y:15668
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "operador não é permitido na definição da variável"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:15690
+#: preproc.y:15706
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s em ou próximo a \"%s\""
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/ru.po postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/ru.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,27 +1,22 @@
 # Russian message translation file for ecpg
-# Copyright (C) 2011 PostgreSQL Global Development Group
+# Copyright (C) 2012-2016 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Alexander Lakhin <exclusion@gmail.com>, 2012.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# ChangeLog:
-#   - June 28, 2014: Alexander Lakhin <exclusion@gmail.com>.
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 22, 2012: Complete translation for 9.0, Alexander Lakhin <exclusion@gmail.com>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.2\n"
+"Project-Id-Version: ecpg (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-08-02 06:37+0000\n"
-"PO-Revision-Date: 2014-08-14 22:40+0400\n"
-"Last-Translator: Dmitriy Olshevskiy <olshevskiy87@bk.ru>\n"
-"Language-Team: Russian <pgtranslation-translators@pgfoundry.org>\n"
+"POT-Creation-Date: 2017-05-26 20:45+0000\n"
+"PO-Revision-Date: 2016-11-24 16:01+0300\n"
+"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Poedit 1.6.7\n"
 
 #: descriptor.c:64
 #, c-format
@@ -33,27 +28,27 @@
 msgid "descriptor \"%s\" does not exist"
 msgstr "де�криптор \"%s\" не �уще�твует"
 
-#: descriptor.c:161 descriptor.c:210
+#: descriptor.c:161 descriptor.c:213
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "заголовок де�криптора не �одержит �лемент \"%d\""
 
-#: descriptor.c:182
+#: descriptor.c:183
 #, c-format
 msgid "nullable is always 1"
 msgstr "NULLABLE в�егда равно 1"
 
-#: descriptor.c:185
+#: descriptor.c:186
 #, c-format
 msgid "key_member is always 0"
 msgstr "KEY_MEMBER в�егда равно 0"
 
-#: descriptor.c:277
+#: descriptor.c:280
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "поле \"%s\" в де�крипторе не реализовано"
 
-#: descriptor.c:287
+#: descriptor.c:290
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "у�тановить поле \"%s\" в де�крипторе нельз�"
@@ -153,14 +148,15 @@
 
 #: ecpg.c:57
 #, c-format
-msgid "  --version      output version information, then exit\n"
-msgstr "  --version      выве�ти вер�ию и выйти\n"
+msgid "  -V, --version  output version information, then exit\n"
+msgstr "  -V, --version  показать вер�ию и выйти\n"
 
 #: ecpg.c:58
 #, c-format
 msgid "  -?, --help     show this help, then exit\n"
 msgstr "  -?, --help     показать �ту �правку и выйти\n"
 
+# skip-rule: space-before-period
 #: ecpg.c:59
 #, c-format
 msgid ""
@@ -181,143 +177,143 @@
 "\n"
 "Об ошибках �ообщайте по адре�у <pgsql-bugs@postgresql.org>.\n"
 
-#: ecpg.c:143
+#: ecpg.c:139
 #, c-format
 msgid "%s: could not locate my own executable path\n"
 msgstr "%s: не удало�ь найти �вой путь к и�полн�емым файлам\n"
 
-#: ecpg.c:186 ecpg.c:337 ecpg.c:347
+#: ecpg.c:175 ecpg.c:327 ecpg.c:337
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: не удало�ь открыть файл \"%s\": %s\n"
 
-#: ecpg.c:225 ecpg.c:238 ecpg.c:254 ecpg.c:279
+#: ecpg.c:214 ecpg.c:227 ecpg.c:243 ecpg.c:268
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Дл� дополнительной информации попробуйте \"%s --help\".\n"
 
-#: ecpg.c:249
+#: ecpg.c:238
 #, c-format
 msgid "%s: parser debug support (-d) not available\n"
 msgstr "%s: отладочные �ообщени� при разборе (-d) не поддерживают��\n"
 
-#: ecpg.c:267
+#: ecpg.c:256
 #, c-format
 msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
 msgstr ""
 "%s, препроце��ор внедрённого в С �зыка СУБД PostgreSQL, вер�и� %d.%d.%d\n"
 
-#: ecpg.c:269
+#: ecpg.c:258
 #, c-format
 msgid "EXEC SQL INCLUDE ... search starts here:\n"
 msgstr "пои�к файлов дл� EXEC SQL INCLUDE ... начинает�� в каталогах:\n"
 
-#: ecpg.c:272
+#: ecpg.c:261
 #, c-format
 msgid "end of search list\n"
 msgstr "конец �пи�ка пои�ка\n"
 
-#: ecpg.c:278
+#: ecpg.c:267
 #, c-format
 msgid "%s: no input files specified\n"
 msgstr "%s: нет входных файлов\n"
 
-#: ecpg.c:470
+#: ecpg.c:460
 #, c-format
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "кур�ор \"%s\" был объ�влен, но не открыт"
 
-#: ecpg.c:483 preproc.y:125
+#: ecpg.c:473 preproc.y:127
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "ошибка при удалении выходного файла \"%s\"\n"
 
-#: pgc.l:421
+#: pgc.l:432
 #, c-format
 msgid "unterminated /* comment"
 msgstr "незавершённый комментарий /*"
 
-#: pgc.l:434
+#: pgc.l:445
 #, c-format
 msgid "invalid bit string literal"
 msgstr "неверна� битова� �трока"
 
-#: pgc.l:443
+#: pgc.l:454
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "оборванна� битова� �трока"
 
-#: pgc.l:459
+#: pgc.l:470
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "оборванна� ше�тнадцатерична� �трока"
 
-#: pgc.l:537
+#: pgc.l:548
 #, c-format
 msgid "unterminated quoted string"
 msgstr "незавершённа� �трока в кавычках"
 
-#: pgc.l:592 pgc.l:605
+#: pgc.l:606 pgc.l:619
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "пу�той идентификатор в кавычках"
 
-#: pgc.l:613
+#: pgc.l:627
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "незавершённый идентификатор в кавычках"
 
-#: pgc.l:867
+#: pgc.l:882
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "вложенные комментарии /* ... */"
 
-#: pgc.l:960
+#: pgc.l:975
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "в команде EXEC SQL UNDEF от�ут�твует идентификатор"
 
-#: pgc.l:1006 pgc.l:1020
+#: pgc.l:1021 pgc.l:1035
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "нет �оответ�твующего \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 
-#: pgc.l:1009 pgc.l:1022 pgc.l:1198
+#: pgc.l:1024 pgc.l:1037 pgc.l:1213
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "от�ут�твует \"EXEC SQL ENDIF;\""
 
-#: pgc.l:1038 pgc.l:1057
+#: pgc.l:1053 pgc.l:1072
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "неоднократна� команда EXEC SQL ELSE"
 
-#: pgc.l:1079 pgc.l:1093
+#: pgc.l:1094 pgc.l:1108
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "непарна� команда EXEC SQL ENDIF"
 
-#: pgc.l:1113
+#: pgc.l:1128
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "�лишком много вложенных у�ловий EXEC SQL IFDEF"
 
-#: pgc.l:1146
+#: pgc.l:1161
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "в команде EXEC SQL IFDEF от�ут�твует идентификатор"
 
-#: pgc.l:1155
+#: pgc.l:1170
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "в команде EXEC SQL DEFINE от�ут�твует идентификатор"
 
-#: pgc.l:1188
+#: pgc.l:1203
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "ошибка �интак�и�а в команде EXEC SQL INCLUDE"
 
-#: pgc.l:1237
+#: pgc.l:1252
 #, c-format
 msgid ""
 "internal error: unreachable state; please report this to <pgsql-"
@@ -326,14 +322,14 @@
 "внутренн�� ошибка: недо�тижимое �о�то�ние; пожалуй�та, �ообщите в <pgsql-"
 "bugs@postgresql.org>"
 
-#: pgc.l:1362
+#: pgc.l:1376
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr ""
 "Ошибка: путь включаемых файлов \"%s/%s\" в �троке %d �лишком длинный, "
 "пропу�кает��\n"
 
-#: pgc.l:1385
+#: pgc.l:1399
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "не удало�ь открыть включаемый файл \"%s\" (�трока %d)"
@@ -342,125 +338,125 @@
 msgid "syntax error"
 msgstr "ошибка �интак�и�а"
 
-#: preproc.y:79
+#: preproc.y:81
 #, c-format
 msgid "WARNING: "
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: "
 
-#: preproc.y:82
+#: preproc.y:84
 #, c-format
 msgid "ERROR: "
 msgstr "ОШИБК�: "
 
-#: preproc.y:506
+#: preproc.y:508
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "кур�ор \"%s\" не �уще�твует"
 
-#: preproc.y:535
+#: preproc.y:537
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "определение типа не может включать инициализатор"
 
-#: preproc.y:537
+#: preproc.y:539
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "им� типа \"string\" в режиме Informix зарезервировано"
 
-#: preproc.y:544 preproc.y:13853
+#: preproc.y:546 preproc.y:14503
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "тип \"%s\" уже определён"
 
-#: preproc.y:568 preproc.y:14511 preproc.y:14832 variable.c:618
+#: preproc.y:570 preproc.y:15161 preproc.y:15481 variable.c:620
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "многомерные ма��ивы � про�тыми типами данных не поддерживают��"
 
-#: preproc.y:1577
+#: preproc.y:1624
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "оператор CLOSE DATABASE � параметром AT не поддерживает��"
 
-#: preproc.y:1780
+#: preproc.y:1837
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "оператор CONNECT � параметром AT не поддерживает��"
 
-#: preproc.y:1814
+#: preproc.y:1871
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "оператор DISCONNECT � параметром AT не поддерживает��"
 
-#: preproc.y:1869
+#: preproc.y:1926
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "оператор SET CONNECTION � параметром AT не поддерживает��"
 
-#: preproc.y:1891
+#: preproc.y:1948
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "оператор TYPE � параметром AT не поддерживает��"
 
-#: preproc.y:1900
+#: preproc.y:1957
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "оператор VAR � параметром AT не поддерживает��"
 
-#: preproc.y:1907
+#: preproc.y:1964
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "оператор WHENEVER � параметром AT не поддерживает��"
 
-#: preproc.y:2155 preproc.y:2160 preproc.y:2276 preproc.y:3614 preproc.y:4866
-#: preproc.y:4875 preproc.y:5159 preproc.y:6562 preproc.y:7683 preproc.y:7688
-#: preproc.y:10142 preproc.y:10739
+#: preproc.y:2216 preproc.y:2221 preproc.y:2337 preproc.y:3739 preproc.y:5137
+#: preproc.y:5146 preproc.y:5430 preproc.y:6862 preproc.y:8044 preproc.y:8049
+#: preproc.y:10676 preproc.y:11293
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "неподдерживаема� функци� будет передана �ерверу"
 
-#: preproc.y:2518
+#: preproc.y:2595
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL не реализовано"
 
-#: preproc.y:3002
+#: preproc.y:3127
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "операци� COPY FROM STDIN не реализована"
 
-#: preproc.y:8520 preproc.y:13442
+#: preproc.y:8935 preproc.y:14092
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr ""
 "и�пользование переменной \"%s\" в разных операторах DECLARE не поддерживает��"
 
-#: preproc.y:8522 preproc.y:13444
+#: preproc.y:8937 preproc.y:14094
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "кур�ор \"%s\" уже определён"
 
-#: preproc.y:8940
+#: preproc.y:9367
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "не поддерживаемое более предложение LIMIT #,# передано на �ервер"
 
-#: preproc.y:9176 preproc.y:9183
+#: preproc.y:9675 preproc.y:9682
 #, c-format
 msgid "subquery in FROM must have an alias"
 msgstr "подзапро� во FROM должен иметь п�евдоним"
 
-#: preproc.y:13172
+#: preproc.y:13822
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "в CREATE TABLE AS нельз� указать INTO"
 
-#: preproc.y:13208
+#: preproc.y:13858
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "ожидал�� знак \"@\", но на �том ме�те \"%s\""
 
-#: preproc.y:13220
+#: preproc.y:13870
 #, c-format
 msgid ""
 "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
@@ -469,90 +465,90 @@
 "поддерживают�� только протоколы \"tcp\" и \"unix\", а тип базы данных - "
 "\"postgresql\""
 
-#: preproc.y:13223
+#: preproc.y:13873
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "ожидало�ь \"://\", но на �том ме�те \"%s\""
 
-#: preproc.y:13228
+#: preproc.y:13878
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr ""
 "Доменные �океты Unix работают только � \"localhost\", но не � адре�ом \"%s\""
 
-#: preproc.y:13254
+#: preproc.y:13904
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "ожидал�� тип \"postgresql\", но на �том ме�те \"%s\""
 
-#: preproc.y:13257
+#: preproc.y:13907
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "неверный тип подключени�: %s"
 
-#: preproc.y:13266
+#: preproc.y:13916
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "ожидало�ь \"@\" или \"://\", но на �том ме�те \"%s\""
 
-#: preproc.y:13341 preproc.y:13359
+#: preproc.y:13991 preproc.y:14009
 #, c-format
 msgid "invalid data type"
 msgstr "неверный тип данных"
 
-#: preproc.y:13370 preproc.y:13387
+#: preproc.y:14020 preproc.y:14037
 #, c-format
 msgid "incomplete statement"
 msgstr "неполный оператор"
 
-#: preproc.y:13373 preproc.y:13390
+#: preproc.y:14023 preproc.y:14040
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "нера�познанное ключевое �лово \"%s\""
 
-#: preproc.y:13664
+#: preproc.y:14314
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr ""
 "точно�ть/ма�штаб можно указать только дл� типов данных numeric и decimal"
 
-#: preproc.y:13676
+#: preproc.y:14326
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "определение интервала зде�ь не допу�кает��"
 
-#: preproc.y:13828 preproc.y:13880
+#: preproc.y:14478 preproc.y:14530
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "�лишком много уровней в определении вложенной �труктуры/объединени�"
 
-#: preproc.y:14019
+#: preproc.y:14669
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "указатели на varchar не реализованы"
 
-#: preproc.y:14206 preproc.y:14231
+#: preproc.y:14856 preproc.y:14881
 #, c-format
 msgid "using unsupported DESCRIBE statement"
 msgstr "и�пользует�� неподдерживаемый оператор DESCRIBE"
 
-#: preproc.y:14478
+#: preproc.y:15128
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "команда EXEC SQL VAR не может включать инициализатор"
 
-#: preproc.y:14790
+#: preproc.y:15439
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "ма��ивы индикаторов на входе недопу�тимы"
 
-#: preproc.y:15011
+#: preproc.y:15660
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "недопу�тимый оператор в определении переменной"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:15049
+#: preproc.y:15698
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s (примерное положение: \"%s\")"
@@ -643,22 +639,22 @@
 msgid "variable \"%s\" is not declared"
 msgstr "переменна� \"%s\" не объ�влена"
 
-#: variable.c:492
+#: variable.c:494
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "переменна�-индикатор должна быть целочи�ленной"
 
-#: variable.c:504
+#: variable.c:506
 #, c-format
 msgid "unrecognized data type name \"%s\""
 msgstr "нера�познанное им� типа данных \"%s\""
 
-#: variable.c:515 variable.c:523 variable.c:540 variable.c:543
+#: variable.c:517 variable.c:525 variable.c:542 variable.c:545
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "многомерные ма��ивы не поддерживают��"
 
-#: variable.c:532
+#: variable.c:534
 #, c-format
 msgid ""
 "multilevel pointers (more than 2 levels) are not supported; found %d level"
@@ -674,12 +670,12 @@
 "многоуровневые указатели (больше 2 уровней) не поддерживают��, обнаружено %d "
 "уровней"
 
-#: variable.c:537
+#: variable.c:539
 #, c-format
 msgid "pointer to pointer is not supported for this data type"
 msgstr "дл� �того типа данных указатели на указатели не поддерживают��"
 
-#: variable.c:557
+#: variable.c:559
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "многомерные ма��ивы �труктур не поддерживают��"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/zh_CN.po postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/zh_CN.po
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/po/zh_CN.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/po/zh_CN.po	2017-08-07 21:13:41.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ecpg (PostgreSQL 9.0)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-11-22 21:07+0000\n"
+"POT-Creation-Date: 2016-10-21 01:45+0000\n"
 "PO-Revision-Date: 2014-11-24 15:21+0800\n"
 "Last-Translator: Xiong He <iihero@qq.com>\n"
 "Language-Team: Chinese (Simplified)\n"
@@ -28,27 +28,27 @@
 msgid "descriptor \"%s\" does not exist"
 msgstr "�述符\"%s\"�存在"
 
-#: descriptor.c:161 descriptor.c:210
+#: descriptor.c:161 descriptor.c:212
 #, c-format
 msgid "descriptor header item \"%d\" does not exist"
 msgstr "�述符标题�员\"%d\"�存在"
 
-#: descriptor.c:182
+#: descriptor.c:183
 #, c-format
 msgid "nullable is always 1"
 msgstr "�为空永远用1表示"
 
-#: descriptor.c:185
+#: descriptor.c:186
 #, c-format
 msgid "key_member is always 0"
 msgstr "key_member永远是0"
 
-#: descriptor.c:277
+#: descriptor.c:279
 #, c-format
 msgid "descriptor item \"%s\" is not implemented"
 msgstr "没有使用�述符�员\"%s\"."
 
-#: descriptor.c:287
+#: descriptor.c:289
 #, c-format
 msgid "descriptor item \"%s\" cannot be set"
 msgstr "无法设置�述符�员 \"%s\""
@@ -108,8 +108,7 @@
 
 #: ecpg.c:49
 #, c-format
-msgid ""
-"  -h             parse a header file, this option includes option \"-c\"\n"
+msgid "  -h             parse a header file, this option includes option \"-c\"\n"
 msgstr "-h             分�一个头文件,这个选项包�选项\"-c\"\n"
 
 #: ecpg.c:50
@@ -148,8 +147,8 @@
 
 #: ecpg.c:57
 #, c-format
-msgid "  --version      output version information, then exit\n"
-msgstr " --version       输出版本信�，然�退出\n"
+msgid "  -V, --version  output version information, then exit\n"
+msgstr " -V, --version 输出版本信�，然�退出\n"
 
 #: ecpg.c:58
 #, c-format
@@ -164,8 +163,7 @@
 "input file name, after stripping off .pgc if present.\n"
 msgstr ""
 "\n"
-"如果没有指定输出文件，那么输出文件�将由输入文件�（如果有�缀，那么去掉."
-"pgc)\n"
+"如果没有指定输出文件，那么输出文件�将由输入文件�（如果有�缀，那么去掉.pgc)\n"
 "加上.c的�缀�组�.\n"
 
 #: ecpg.c:61
@@ -177,156 +175,152 @@
 "\n"
 "错误报告至 <pgsql-bugs@postgresql.org>.\n"
 
-#: ecpg.c:143
+#: ecpg.c:139
 #, c-format
-#| msgid "%s: could not find own executable\n"
 msgid "%s: could not locate my own executable path\n"
 msgstr "%s: 找�到我的�执行文件路径\n"
 
-#: ecpg.c:186 ecpg.c:337 ecpg.c:347
+#: ecpg.c:175 ecpg.c:326 ecpg.c:336
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: 无法打开文件 \"%s\": %s\n"
 
-#: ecpg.c:225 ecpg.c:238 ecpg.c:254 ecpg.c:279
+#: ecpg.c:214 ecpg.c:227 ecpg.c:243 ecpg.c:268
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "请用 \"%s --help\" 获�更多的信�.\n"
 
-#: ecpg.c:249
+#: ecpg.c:238
 #, c-format
 msgid "%s: parser debug support (-d) not available\n"
 msgstr "%s: 解�器跟踪调试支�(-d)无效\n"
 
-#: ecpg.c:267
+#: ecpg.c:256
 #, c-format
 msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
 msgstr "%s, PostgreSQL嵌入�C语言预处�器, 版本%d.%d.%d\n"
 
-#: ecpg.c:269
+#: ecpg.c:258
 #, c-format
 msgid "EXEC SQL INCLUDE ... search starts here:\n"
 msgstr "EXEC SQL INCLUDE ... 从这里开始�索:\n"
 
-#: ecpg.c:272
+#: ecpg.c:261
 #, c-format
 msgid "end of search list\n"
 msgstr "�索列表的结�部分\n"
 
-#: ecpg.c:278
+#: ecpg.c:267
 #, c-format
 msgid "%s: no input files specified\n"
 msgstr "%s: 没有指定输入文件\n"
 
-#: ecpg.c:470
+#: ecpg.c:459
 #, c-format
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "已�声明了游标\"%s\",但是没有打开"
 
-#: ecpg.c:483 preproc.y:125
+#: ecpg.c:472 preproc.y:127
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "无法删除输出文件 \"%s\"\n"
 
-#: pgc.l:421
+#: pgc.l:428
 #, c-format
 msgid "unterminated /* comment"
 msgstr "/* 注释没有结�"
 
-#: pgc.l:434
+#: pgc.l:441
 #, c-format
 msgid "invalid bit string literal"
 msgstr "无效的bit字符串常�"
 
-#: pgc.l:443
+#: pgc.l:450
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "未结�的bit字符串常�"
 
-#: pgc.l:459
+#: pgc.l:466
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "未结�的16进制字符串常�"
 
-#: pgc.l:537
+#: pgc.l:544
 #, c-format
 msgid "unterminated quoted string"
 msgstr "未结�的引用字符串"
 
-#: pgc.l:592 pgc.l:605
+#: pgc.l:601 pgc.l:614
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "长度为0的分隔标识符"
 
-#: pgc.l:613
+#: pgc.l:622
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "未结�的引用标识符"
 
-#: pgc.l:867
+#: pgc.l:877
 #, c-format
-#| msgid "unterminated /* comment"
 msgid "nested /* ... */ comments"
 msgstr "有嵌套注释/*...*/"
 
-#: pgc.l:960
+#: pgc.l:970
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "在EXEC SQL UNDEF命令中丢失标识符"
 
-#: pgc.l:1006 pgc.l:1020
+#: pgc.l:1016 pgc.l:1030
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "丢失匹� \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 
-#: pgc.l:1009 pgc.l:1022 pgc.l:1198
+#: pgc.l:1019 pgc.l:1032 pgc.l:1208
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "\"EXEC SQL ENDIF;\"丢失"
 
-#: pgc.l:1038 pgc.l:1057
+#: pgc.l:1048 pgc.l:1067
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "多个EXEC SQL ELSE"
 
-#: pgc.l:1079 pgc.l:1093
+#: pgc.l:1089 pgc.l:1103
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "EXEC SQL ENDIF�匹�"
 
-#: pgc.l:1113
+#: pgc.l:1123
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "嵌套EXEC SQL IFDEF�件太多"
 
-#: pgc.l:1146
+#: pgc.l:1156
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "在EXEC SQL IFDEF命令中丢失标识符"
 
-#: pgc.l:1155
+#: pgc.l:1165
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "在EXEC SQL DEFINE命令中丢失标识符"
 
-#: pgc.l:1188
+#: pgc.l:1198
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "在EXEC SQL INCLUDE命令中出现语法错误"
 
-#: pgc.l:1237
+#: pgc.l:1247
 #, c-format
-msgid ""
-"internal error: unreachable state; please report this to <pgsql-"
-"bugs@postgresql.org>"
+msgid "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"
 msgstr "内部错误：��到达的状�；请�<pgsql-bugs@postgresql.org>��报告"
 
-#: pgc.l:1362
+#: pgc.l:1371
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr "错误:在第%3$d行上包�路径\"%1$s/%2$s\"太长，跳过\n"
 
-#: pgc.l:1385
+#: pgc.l:1394
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "在第%2$d行无法打开应用文件\"%1$s\""
@@ -335,213 +329,210 @@
 msgid "syntax error"
 msgstr "语法错误"
 
-#: preproc.y:79
+#: preproc.y:81
 #, c-format
 msgid "WARNING: "
 msgstr "警告:"
 
-#: preproc.y:82
+#: preproc.y:84
 #, c-format
 msgid "ERROR: "
 msgstr "错误:"
 
-#: preproc.y:506
+#: preproc.y:508
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "游标 \"%s\" �存在"
 
-#: preproc.y:535
+#: preproc.y:537
 #, c-format
 msgid "initializer not allowed in type definition"
 msgstr "在类型定义中��许进行�始化"
 
-#: preproc.y:537
+#: preproc.y:539
 #, c-format
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "在Informix模�中类型�称\"string\" 是被�留的"
 
-#: preproc.y:544 preproc.y:13867
+#: preproc.y:546 preproc.y:14503
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "已定义类型\"%s\" "
 
-#: preproc.y:568 preproc.y:14525 preproc.y:14846 variable.c:618
+#: preproc.y:570 preproc.y:15161 preproc.y:15481 variable.c:620
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "�支�针对简�数�类型的多维数组"
 
-#: preproc.y:1579
+#: preproc.y:1624
 #, c-format
 msgid "AT option not allowed in CLOSE DATABASE statement"
 msgstr "在CLOSE DATABASE语�中��许使用AT选项"
 
-#: preproc.y:1782
+#: preproc.y:1837
 #, c-format
 msgid "AT option not allowed in CONNECT statement"
 msgstr "在CONNECT语�中��许使用AT选项"
 
-#: preproc.y:1816
+#: preproc.y:1871
 #, c-format
 msgid "AT option not allowed in DISCONNECT statement"
 msgstr "在DISCONNECT语�中��许使用AT选项"
 
-#: preproc.y:1871
+#: preproc.y:1926
 #, c-format
 msgid "AT option not allowed in SET CONNECTION statement"
 msgstr "在SET CONNECTION语�中��许使用AT选项"
 
-#: preproc.y:1893
+#: preproc.y:1948
 #, c-format
 msgid "AT option not allowed in TYPE statement"
 msgstr "在TYPE语�中��许使用AT选项"
 
-#: preproc.y:1902
+#: preproc.y:1957
 #, c-format
 msgid "AT option not allowed in VAR statement"
 msgstr "在VAR语�中��许使用AT选项"
 
-#: preproc.y:1909
+#: preproc.y:1964
 #, c-format
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "在WHENEVER语�中��许使用AT选项"
 
-#: preproc.y:2157 preproc.y:2162 preproc.y:2278 preproc.y:3656 preproc.y:4908
-#: preproc.y:4917 preproc.y:5201 preproc.y:6604 preproc.y:7693 preproc.y:7698
-#: preproc.y:10156 preproc.y:10753
+#: preproc.y:2216 preproc.y:2221 preproc.y:2337 preproc.y:3739 preproc.y:5137
+#: preproc.y:5146 preproc.y:5430 preproc.y:6862 preproc.y:8044 preproc.y:8049
+#: preproc.y:10676 preproc.y:11293
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "�支�的功能特性将会传递给�务器"
 
-#: preproc.y:2536
+#: preproc.y:2595
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "没有使用SHOW ALL"
 
-#: preproc.y:3044
+#: preproc.y:3127
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "�能进行COPY FROM STDIN的�作"
 
-#: preproc.y:8534 preproc.y:13456
+#: preproc.y:8935 preproc.y:14092
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr "�支�在��的声明语�中使用��\"%s\""
 
-#: preproc.y:8536 preproc.y:13458
+#: preproc.y:8937 preproc.y:14094
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "已�定义了游标\"%s\""
 
-#: preproc.y:8954
+#: preproc.y:9367
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "��支�将LIMIT #,#语法传递给�务器"
 
-#: preproc.y:9190 preproc.y:9197
+#: preproc.y:9675 preproc.y:9682
 #, c-format
 msgid "subquery in FROM must have an alias"
 msgstr "FROM 中的�查询必须有一个别�"
 
-#: preproc.y:13186
+#: preproc.y:13822
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "在CREATE TABLE AS语�中�能指定INTO��"
 
-#: preproc.y:13222
+#: preproc.y:13858
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "期望 \"@\", 但是找到了\"%s\""
 
-#: preproc.y:13234
+#: preproc.y:13870
 #, c-format
-msgid ""
-"only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
-"supported"
+msgid "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are supported"
 msgstr "�支��议\"tcp\"和 \"unix\"以�数�库类型 \"postgresql\""
 
-#: preproc.y:13237
+#: preproc.y:13873
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "期望得到 \"://\"，但是找到了\"%s\""
 
-#: preproc.y:13242
+#: preproc.y:13878
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr "Unix-域的sockets�能在\"localhost\"上�行，而�能在\"%s\"上�行"
 
-#: preproc.y:13268
+#: preproc.y:13904
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "期望\"postgresql\", 但是�找到了\"%s\""
 
-#: preproc.y:13271
+#: preproc.y:13907
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "无效的连接类型: %s"
 
-#: preproc.y:13280
+#: preproc.y:13916
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "期望\"@\"或\"://\"，但是�找到了\"%s\""
 
-#: preproc.y:13355 preproc.y:13373
+#: preproc.y:13991 preproc.y:14009
 #, c-format
 msgid "invalid data type"
 msgstr "无效数�类型"
 
-#: preproc.y:13384 preproc.y:13401
+#: preproc.y:14020 preproc.y:14037
 #, c-format
 msgid "incomplete statement"
 msgstr "未结�的语�"
 
-#: preproc.y:13387 preproc.y:13404
+#: preproc.y:14023 preproc.y:14040
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "无法识别的符�\"%s\""
 
-#: preproc.y:13678
+#: preproc.y:14314
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr "�有数�类型numeric和decimal有精度/范围�数"
 
-#: preproc.y:13690
+#: preproc.y:14326
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "在这里��许使用间隔定义"
 
-#: preproc.y:13842 preproc.y:13894
+#: preproc.y:14478 preproc.y:14530
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "在嵌套结构/��定义中存在太多的层次"
 
-#: preproc.y:14033
+#: preproc.y:14669
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "没有实现指�varchar类型值的指针"
 
-#: preproc.y:14220 preproc.y:14245
+#: preproc.y:14856 preproc.y:14881
 #, c-format
 msgid "using unsupported DESCRIBE statement"
 msgstr "使用�支�的DESCRIBE语�"
 
-#: preproc.y:14492
+#: preproc.y:15128
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "在EXEC SQL VAR命令中��许�始化"
 
-#: preproc.y:14804
+#: preproc.y:15439
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "在输入上��许使用标识数组"
 
-#: preproc.y:15025
+#: preproc.y:15660
 #, c-format
-#| msgid "initializer not allowed in type definition"
 msgid "operator not allowed in variable definition"
 msgstr "�作符��许出现在��定义当中"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:15063
+#: preproc.y:15698
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s 在 \"%s\" 或附近的"
@@ -568,8 +559,7 @@
 
 #: type.c:275
 #, c-format
-msgid ""
-"indicator variable \"%s\" is hidden by a local variable of a different type"
+msgid "indicator variable \"%s\" is hidden by a local variable of a different type"
 msgstr "标记��(indicator variable)\"%s\"是由一个��类型的局部����的。"
 
 #: type.c:277
@@ -632,53 +622,54 @@
 msgid "variable \"%s\" is not declared"
 msgstr "没有声明��\"%s\""
 
-#: variable.c:492
+#: variable.c:494
 #, c-format
 msgid "indicator variable must have an integer type"
 msgstr "标记��必须有一个整数类型"
 
-#: variable.c:504
+#: variable.c:506
 #, c-format
 msgid "unrecognized data type name \"%s\""
 msgstr "无法识别的数�类型�称 \"%s\""
 
-#: variable.c:515 variable.c:523 variable.c:540 variable.c:543
+#: variable.c:517 variable.c:525 variable.c:542 variable.c:545
 #, c-format
 msgid "multidimensional arrays are not supported"
 msgstr "�支�多维数组"
 
-#: variable.c:532
+#: variable.c:534
 #, 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"
+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] "�支�多级指针（超过2级）；找到了%d级指针."
 
-#: variable.c:537
+#: variable.c:539
 #, c-format
 msgid "pointer to pointer is not supported for this data type"
 msgstr "对于这�数�类型�支�指�指针的指针"
 
-#: variable.c:557
+#: variable.c:559
 #, c-format
 msgid "multidimensional arrays for structures are not supported"
 msgstr "�支�结构类型的多维数组"
 
-#~ msgid "AT option not allowed in DEALLOCATE statement"
-#~ msgstr "在DEALLOCATE语�中��许使用AT选项"
+#~ msgid "COPY TO STDIN is not possible"
+#~ msgstr "�能进行COPY TO STDIN的�作"
 
-#~ msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
-#~ msgstr "约�声明 INITIALLY DEFERRED 必须为 DEFERRABLE"
+#~ msgid "COPY FROM STDOUT is not possible"
+#~ msgstr "�能进行COPY FROM STDOUT的�作"
+
+#~ msgid "NEW used in query that is not in a rule"
+#~ msgstr "查询中使用的 NEW �在一个规则中"
 
 #~ msgid "OLD used in query that is not in a rule"
 #~ msgstr "查询中使用的 OLD �在一个规则中"
 
-#~ msgid "NEW used in query that is not in a rule"
-#~ msgstr "查询中使用的 NEW �在一个规则中"
+#~ msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
+#~ msgstr "约�声明 INITIALLY DEFERRED 必须为 DEFERRABLE"
 
-#~ msgid "COPY FROM STDOUT is not possible"
-#~ msgstr "�能进行COPY FROM STDOUT的�作"
+#~ msgid "AT option not allowed in DEALLOCATE statement"
+#~ msgstr "在DEALLOCATE语�中��许使用AT选项"
 
-#~ msgid "COPY TO STDIN is not possible"
-#~ msgstr "�能进行COPY TO STDIN的�作"
+#~ msgid "  --version      output version information, then exit\n"
+#~ msgstr " --version       输出版本信�，然�退出\n"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/preproc.c postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/preproc.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/preproc.c	2016-03-28 20:23:04.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/preproc.c	2017-08-07 21:34:42.000000000 +0000
@@ -143,7 +143,7 @@
 	/* localize the error message string */
 	error = _(error);
 
-	fprintf(stderr, "%s:%d: ", input_filename, yylineno);
+	fprintf(stderr, "%s:%d: ", input_filename, base_yylineno);
 
 	switch(type)
 	{
@@ -188,10 +188,10 @@
 	vmmerror(error_code, ET_ERROR, error, ap);
 	va_end(ap);
 
-	if (yyin)
-		fclose(yyin);
-	if (yyout)
-		fclose(yyout);
+	if (base_yyin)
+		fclose(base_yyin);
+	if (base_yyout)
+		fclose(base_yyout);
 
 	if (strcmp(output_filename, "-") != 0 && unlink(output_filename) != 0)
 		fprintf(stderr, _("could not remove output file \"%s\"\n"), output_filename);
@@ -266,7 +266,7 @@
 static char *
 make_name(void)
 {
-	return mm_strdup(yytext);
+	return mm_strdup(base_yytext);
 }
 
 static char *
@@ -278,7 +278,7 @@
 
 	/* In case we have a struct, we have to print as many "?" as there are attributes in the struct
 	 * An array is only allowed together with an element argument
-	 * This is essantially only used for inserts, but using a struct as input parameter is an error anywhere else
+	 * This is essentially only used for inserts, but using a struct as input parameter is an error anywhere else
 	 * so we don't have to worry here. */
 
 	if (p->type->type == ECPGt_struct || (array && p->type->type == ECPGt_array && p->type->u.element->type == ECPGt_struct))
@@ -1486,16 +1486,16 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   124624
+#define YYLAST   124785
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  534
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  754
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  2959
+#define YYNRULES  2961
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  5568
+#define YYNSTATES  5574
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
@@ -1609,198 +1609,198 @@
     1939,  1945,  1954,  1961,  1969,  1974,  1982,  1986,  1991,  1997,
     2002,  2008,  2013,  2019,  2023,  2027,  2031,  2035,  2039,  2043,
     2047,  2051,  2059,  2063,  2067,  2071,  2075,  2079,  2087,  2095,
-    2104,  2106,  2114,  2118,  2126,  2134,  2142,  2146,  2154,  2158,
-    2166,  2174,  2182,  2186,  2194,  2198,  2206,  2210,  2214,  2219,
-    2228,  2233,  2239,  2244,  2250,  2254,  2258,  2262,  2266,  2270,
-    2278,  2282,  2286,  2294,  2298,  2302,  2310,  2314,  2318,  2322,
-    2323,  2327,  2331,  2335,  2340,  2344,  2348,  2352,  2356,  2360,
-    2364,  2372,  2376,  2384,  2388,  2396,  2400,  2414,  2418,  2422,
-    2426,  2434,  2438,  2442,  2446,  2454,  2458,  2462,  2466,  2470,
-    2474,  2478,  2486,  2490,  2495,  2501,  2505,  2513,  2521,  2525,
-    2529,  2533,  2541,  2545,  2553,  2557,  2565,  2569,  2577,  2581,
-    2585,  2589,  2593,  2602,  2610,  2614,  2622,  2626,  2634,  2642,
-    2646,  2650,  2654,  2658,  2666,  2670,  2674,  2678,  2682,  2686,
+    2104,  2106,  2114,  2118,  2126,  2134,  2138,  2146,  2150,  2158,
+    2162,  2170,  2178,  2186,  2190,  2198,  2202,  2210,  2214,  2218,
+    2223,  2232,  2237,  2243,  2248,  2254,  2258,  2262,  2266,  2270,
+    2274,  2282,  2286,  2290,  2298,  2302,  2306,  2314,  2318,  2322,
+    2326,  2327,  2331,  2335,  2339,  2344,  2348,  2352,  2356,  2360,
+    2364,  2368,  2376,  2380,  2388,  2392,  2400,  2404,  2418,  2422,
+    2426,  2430,  2438,  2442,  2446,  2450,  2458,  2462,  2466,  2470,
+    2474,  2478,  2482,  2490,  2494,  2499,  2505,  2509,  2517,  2525,
+    2529,  2533,  2537,  2545,  2549,  2557,  2561,  2569,  2573,  2581,
+    2585,  2589,  2593,  2597,  2606,  2614,  2618,  2626,  2630,  2638,
+    2646,  2650,  2654,  2658,  2662,  2670,  2674,  2678,  2682,  2686,
     2690,  2694,  2698,  2702,  2706,  2710,  2714,  2718,  2722,  2726,
-    2734,  2738,  2746,  2750,  2754,  2758,  2762,  2766,  2770,  2774,
+    2730,  2738,  2742,  2750,  2754,  2758,  2762,  2766,  2770,  2774,
     2778,  2782,  2786,  2790,  2794,  2798,  2802,  2806,  2810,  2814,
     2818,  2822,  2826,  2830,  2834,  2838,  2842,  2846,  2850,  2854,
     2858,  2862,  2866,  2870,  2874,  2878,  2882,  2886,  2890,  2894,
     2898,  2902,  2906,  2910,  2914,  2918,  2922,  2926,  2930,  2934,
-    2938,  2942,  2950,  2954,  2962,  2966,  2971,  2977,  2982,  2988,
-    2993,  2999,  3003,  3007,  3011,  3019,  3027,  3032,  3038,  3042,
-    3050,  3054,  3058,  3062,  3070,  3078,  3082,  3090,  3094,  3098,
-    3102,  3110,  3115,  3123,  3131,  3139,  3143,  3151,  3156,  3162,
-    3166,  3170,  3178,  3182,  3190,  3195,  3201,  3205,  3209,  3213,
+    2938,  2942,  2946,  2954,  2958,  2966,  2970,  2975,  2981,  2986,
+    2992,  2997,  3003,  3007,  3011,  3015,  3023,  3031,  3036,  3042,
+    3046,  3054,  3058,  3062,  3066,  3074,  3082,  3086,  3094,  3098,
+    3102,  3106,  3114,  3119,  3127,  3135,  3143,  3147,  3155,  3160,
+    3166,  3170,  3174,  3182,  3186,  3194,  3199,  3205,  3209,  3213,
     3217,  3221,  3225,  3229,  3233,  3237,  3241,  3245,  3249,  3253,
-    3261,  3266,  3272,  3277,  3283,  3288,  3294,  3299,  3305,  3309,
-    3317,  3325,  3329,  3333,  3337,  3342,  3348,  3352,  3360,  3368,
-    3372,  3376,  3380,  3388,  3392,  3396,  3400,  3404,  3408,  3412,
-    3417,  3423,  3428,  3434,  3439,  3445,  3449,  3457,  3461,  3469,
-    3473,  3477,  3485,  3489,  3497,  3505,  3513,  3518,  3524,  3528,
-    3532,  3536,  3544,  3548,  3552,  3556,  3560,  3564,  3568,  3576,
-    3580,  3584,  3588,  3596,  3604,  3608,  3613,  3619,  3623,  3627,
-    3631,  3635,  3639,  3647,  3651,  3659,  3663,  3667,  3671,  3675,
-    3679,  3683,  3691,  3696,  3702,  3707,  3713,  3717,  3725,  3733,
-    3737,  3742,  3747,  3753,  3757,  3765,  3769,  3777,  3782,  3788,
-    3792,  3796,  3800,  3805,  3811,  3819,  3827,  3831,  3835,  3839,
-    3843,  3851,  3856,  3862,  3866,  3870,  3875,  3881,  3885,  3889,
-    3894,  3900,  3905,  3911,  3916,  3922,  3930,  3938,  3942,  3947,
-    3953,  3957,  3965,  3973,  3978,  3984,  3992,  3996,  4004,  4008,
-    4016,  4021,  4027,  4031,  4039,  4043,  4047,  4051,  4055,  4059,
-    4063,  4067,  4071,  4075,  4079,  4083,  4091,  4096,  4102,  4106,
-    4110,  4118,  4122,  4130,  4134,  4142,  4147,  4153,  4157,  4165,
-    4170,  4176,  4180,  4188,  4193,  4199,  4203,  4211,  4216,  4222,
-    4230,  4235,  4241,  4245,  4253,  4257,  4265,  4270,  4276,  4280,
-    4284,  4292,  4300,  4305,  4311,  4319,  4323,  4327,  4331,  4335,
+    3257,  3265,  3270,  3276,  3281,  3287,  3292,  3298,  3303,  3309,
+    3313,  3321,  3329,  3333,  3337,  3341,  3346,  3352,  3356,  3364,
+    3372,  3376,  3380,  3384,  3392,  3396,  3400,  3404,  3408,  3412,
+    3416,  3421,  3427,  3432,  3438,  3443,  3449,  3453,  3461,  3465,
+    3473,  3477,  3481,  3489,  3493,  3501,  3509,  3517,  3522,  3528,
+    3532,  3536,  3540,  3548,  3552,  3556,  3560,  3564,  3568,  3572,
+    3580,  3584,  3588,  3592,  3600,  3608,  3612,  3617,  3623,  3627,
+    3631,  3635,  3639,  3643,  3651,  3655,  3663,  3667,  3671,  3675,
+    3679,  3683,  3687,  3695,  3700,  3706,  3711,  3717,  3721,  3729,
+    3737,  3741,  3746,  3751,  3757,  3761,  3769,  3773,  3781,  3786,
+    3792,  3796,  3800,  3804,  3809,  3815,  3823,  3831,  3835,  3839,
+    3843,  3847,  3855,  3860,  3866,  3870,  3874,  3879,  3885,  3889,
+    3893,  3898,  3904,  3909,  3915,  3920,  3926,  3934,  3942,  3946,
+    3951,  3957,  3961,  3969,  3977,  3982,  3988,  3996,  4000,  4008,
+    4012,  4020,  4025,  4031,  4035,  4043,  4047,  4051,  4055,  4059,
+    4063,  4067,  4071,  4075,  4079,  4083,  4087,  4095,  4100,  4106,
+    4110,  4114,  4118,  4126,  4130,  4138,  4142,  4150,  4155,  4161,
+    4165,  4173,  4178,  4184,  4188,  4196,  4201,  4207,  4211,  4219,
+    4224,  4230,  4238,  4243,  4249,  4253,  4261,  4265,  4273,  4278,
+    4284,  4288,  4292,  4300,  4308,  4313,  4319,  4327,  4331,  4335,
     4339,  4343,  4347,  4351,  4355,  4359,  4363,  4367,  4371,  4375,
     4379,  4383,  4387,  4391,  4395,  4399,  4403,  4407,  4411,  4415,
-    4423,  4431,  4435,  4439,  4443,  4451,  4455,  4463,  4468,  4474,
-    4478,  4486,  4490,  4498,  4503,  4509,  4513,  4521,  4529,  4533,
-    4541,  4545,  4549,  4553,  4561,  4569,  4577,  4585,  4593,  4598,
-    4604,  4608,  4616,  4621,  4627,  4631,  4639,  4643,  4647,  4655,
-    4659,  4667,  4671,  4679,  4687,  4691,  4699,  4704,  4710,  4718,
-    4722,  4730,  4734,  4742,  4750,  4758,  4766,  4770,  4778,  4783,
-    4789,  4794,  4800,  4805,  4811,  4816,  4822,  4827,  4833,  4837,
-    4841,  4845,  4849,  4857,  4861,  4869,  4873,  4877,  4885,  4889,
-    4897,  4901,  4905,  4909,  4913,  4921,  4926,  4932,  4937,  4943,
-    4947,  4955,  4960,  4966,  4970,  4975,  4981,  4985,  4989,  4993,
-    5001,  5006,  5013,  5015,  5023,  5027,  5031,  5035,  5039,  5043,
-    5051,  5055,  5063,  5067,  5075,  5079,  5087,  5095,  5099,  5107,
-    5115,  5119,  5123,  5127,  5135,  5144,  5153,  5157,  5161,  5165,
+    4419,  4423,  4431,  4439,  4443,  4447,  4451,  4459,  4463,  4471,
+    4476,  4482,  4486,  4494,  4498,  4506,  4511,  4517,  4521,  4529,
+    4537,  4541,  4549,  4553,  4557,  4561,  4569,  4577,  4585,  4593,
+    4601,  4606,  4612,  4616,  4624,  4629,  4635,  4639,  4647,  4651,
+    4655,  4663,  4667,  4675,  4679,  4687,  4695,  4699,  4707,  4712,
+    4718,  4726,  4730,  4738,  4742,  4750,  4758,  4766,  4774,  4778,
+    4786,  4791,  4797,  4802,  4808,  4813,  4819,  4824,  4830,  4835,
+    4841,  4845,  4849,  4853,  4857,  4865,  4869,  4877,  4881,  4885,
+    4893,  4897,  4905,  4909,  4913,  4917,  4921,  4929,  4934,  4940,
+    4945,  4951,  4955,  4963,  4968,  4974,  4978,  4983,  4989,  4993,
+    4997,  5001,  5009,  5014,  5021,  5023,  5031,  5035,  5039,  5043,
+    5047,  5051,  5059,  5063,  5071,  5075,  5083,  5087,  5095,  5103,
+    5107,  5115,  5123,  5127,  5131,  5135,  5143,  5152,  5161,  5165,
     5169,  5173,  5177,  5181,  5185,  5189,  5193,  5197,  5201,  5205,
-    5213,  5221,  5225,  5233,  5237,  5245,  5249,  5253,  5257,  5261,
-    5269,  5277,  5281,  5289,  5297,  5302,  5308,  5312,  5320,  5324,
-    5328,  5336,  5341,  5347,  5355,  5359,  5367,  5371,  5375,  5379,
-    5383,  5391,  5396,  5402,  5407,  5413,  5417,  5422,  5428,  5434,
-    5440,  5448,  5452,  5460,  5464,  5472,  5476,  5484,  5488,  5496,
-    5500,  5508,  5516,  5524,  5528,  5532,  5536,  5540,  5544,  5548,
-    5552,  5560,  5564,  5568,  5572,  5576,  5580,  5584,  5588,  5592,
-    5596,  5600,  5604,  5608,  5612,  5616,  5624,  5628,  5636,  5640,
-    5648,  5652,  5660,  5664,  5665,  5673,  5677,  5682,  5688,  5692,
+    5209,  5213,  5221,  5229,  5233,  5241,  5245,  5253,  5257,  5261,
+    5265,  5269,  5277,  5285,  5289,  5297,  5305,  5310,  5316,  5320,
+    5328,  5332,  5336,  5344,  5349,  5355,  5363,  5367,  5375,  5379,
+    5383,  5387,  5391,  5399,  5404,  5410,  5415,  5421,  5425,  5430,
+    5436,  5442,  5448,  5456,  5460,  5468,  5472,  5480,  5484,  5492,
+    5496,  5504,  5508,  5516,  5524,  5532,  5536,  5540,  5544,  5548,
+    5552,  5556,  5560,  5568,  5572,  5576,  5580,  5584,  5588,  5592,
+    5596,  5600,  5604,  5608,  5612,  5616,  5620,  5624,  5632,  5636,
+    5644,  5648,  5656,  5660,  5668,  5672,  5673,  5681,  5685,  5690,
     5696,  5700,  5704,  5708,  5712,  5716,  5720,  5724,  5728,  5732,
-    5736,  5740,  5744,  5748,  5752,  5756,  5764,  5768,  5772,  5776,
+    5736,  5740,  5744,  5748,  5752,  5756,  5760,  5764,  5772,  5776,
     5780,  5784,  5788,  5792,  5796,  5800,  5804,  5808,  5812,  5816,
-    5820,  5824,  5828,  5832,  5836,  5840,  5844,  5852,  5856,  5864,
-    5868,  5872,  5876,  5880,  5884,  5888,  5896,  5901,  5907,  5911,
-    5915,  5919,  5923,  5927,  5931,  5935,  5939,  5943,  5947,  5955,
-    5959,  5967,  5971,  5975,  5979,  5985,  5991,  5997,  6003,  6009,
-    6015,  6021,  6031,  6042,  6053,  6064,  6075,  6086,  6097,  6113,
-    6129,  6145,  6156,  6172,  6183,  6199,  6214,  6218,  6226,  6231,
-    6237,  6245,  6249,  6257,  6261,  6265,  6269,  6273,  6281,  6285,
-    6293,  6297,  6301,  6305,  6313,  6317,  6321,  6325,  6329,  6333,
+    5820,  5824,  5828,  5832,  5836,  5840,  5844,  5848,  5852,  5860,
+    5864,  5872,  5876,  5880,  5884,  5888,  5892,  5896,  5904,  5909,
+    5915,  5919,  5923,  5927,  5931,  5935,  5939,  5943,  5947,  5951,
+    5955,  5963,  5967,  5975,  5979,  5983,  5987,  5993,  5999,  6005,
+    6011,  6017,  6023,  6029,  6039,  6050,  6061,  6072,  6083,  6094,
+    6105,  6121,  6137,  6153,  6164,  6180,  6191,  6207,  6222,  6226,
+    6234,  6239,  6245,  6253,  6257,  6265,  6269,  6273,  6277,  6281,
+    6289,  6293,  6301,  6305,  6309,  6313,  6321,  6325,  6329,  6333,
     6337,  6341,  6345,  6349,  6353,  6357,  6361,  6365,  6369,  6373,
-    6381,  6385,  6393,  6397,  6405,  6410,  6416,  6420,  6428,  6436,
-    6444,  6448,  6456,  6461,  6467,  6472,  6478,  6486,  6491,  6497,
-    6501,  6505,  6513,  6517,  6521,  6529,  6533,  6537,  6541,  6549,
-    6553,  6561,  6566,  6572,  6577,  6583,  6588,  6594,  6599,  6605,
-    6609,  6617,  6621,  6625,  6633,  6638,  6644,  6648,  6653,  6659,
-    6663,  6668,  6674,  6678,  6683,  6689,  6693,  6697,  6705,  6710,
-    6716,  6720,  6728,  6732,  6740,  6744,  6752,  6756,  6764,  6768,
-    6772,  6776,  6780,  6788,  6792,  6796,  6800,  6804,  6812,  6820,
-    6828,  6832,  6836,  6844,  6848,  6852,  6860,  6869,  6873,  6877,
-    6881,  6889,  6893,  6901,  6905,  6913,  6917,  6921,  6925,  6929,
+    6377,  6381,  6389,  6393,  6401,  6405,  6413,  6418,  6424,  6428,
+    6436,  6444,  6452,  6456,  6464,  6469,  6475,  6480,  6486,  6494,
+    6499,  6505,  6509,  6513,  6521,  6525,  6529,  6537,  6541,  6545,
+    6549,  6557,  6561,  6569,  6574,  6580,  6585,  6591,  6596,  6602,
+    6607,  6613,  6617,  6625,  6629,  6633,  6641,  6646,  6652,  6656,
+    6661,  6667,  6671,  6676,  6682,  6686,  6691,  6697,  6701,  6705,
+    6713,  6718,  6724,  6728,  6736,  6740,  6748,  6752,  6760,  6764,
+    6772,  6776,  6780,  6784,  6788,  6796,  6800,  6804,  6808,  6812,
+    6820,  6828,  6836,  6840,  6844,  6852,  6856,  6860,  6868,  6877,
+    6881,  6885,  6889,  6897,  6901,  6909,  6913,  6921,  6925,  6929,
     6933,  6937,  6941,  6945,  6949,  6953,  6957,  6961,  6965,  6969,
-    6977,  6981,  6985,  6989,  6993,  7001,  7005,  7013,  7017,  7025,
-    7030,  7036,  7044,  7048,  7056,  7064,  7068,  7076,  7081,  7087,
-    7091,  7099,  7103,  7111,  7115,  7123,  7127,  7131,  7135,  7143,
-    7147,  7155,  7163,  7167,  7175,  7179,  7187,  7191,  7195,  7203,
-    7207,  7212,  7218,  7226,  7231,  7237,  7245,  7249,  7253,  7257,
-    7265,  7273,  7277,  7281,  7285,  7293,  7297,  7305,  7309,  7313,
-    7321,  7325,  7333,  7341,  7345,  7353,  7357,  7361,  7365,  7369,
+    6973,  6977,  6985,  6989,  6993,  6997,  7001,  7009,  7013,  7021,
+    7025,  7033,  7038,  7044,  7052,  7056,  7064,  7072,  7076,  7084,
+    7089,  7095,  7099,  7107,  7111,  7119,  7123,  7131,  7135,  7139,
+    7143,  7151,  7155,  7163,  7171,  7175,  7183,  7187,  7195,  7199,
+    7203,  7211,  7215,  7220,  7226,  7234,  7239,  7245,  7253,  7257,
+    7261,  7265,  7273,  7281,  7285,  7289,  7293,  7301,  7305,  7313,
+    7317,  7321,  7329,  7333,  7341,  7349,  7353,  7361,  7365,  7369,
     7373,  7377,  7381,  7385,  7389,  7393,  7397,  7401,  7405,  7409,
     7413,  7417,  7421,  7425,  7429,  7433,  7437,  7441,  7445,  7449,
     7453,  7457,  7461,  7465,  7469,  7473,  7477,  7481,  7485,  7489,
     7493,  7497,  7501,  7505,  7509,  7513,  7517,  7521,  7525,  7529,
-    7533,  7537,  7541,  7549,  7554,  7560,  7565,  7571,  7575,  7579,
+    7533,  7537,  7541,  7545,  7549,  7557,  7562,  7568,  7573,  7579,
     7583,  7587,  7591,  7595,  7599,  7603,  7607,  7611,  7615,  7619,
     7623,  7627,  7631,  7635,  7639,  7643,  7647,  7651,  7655,  7659,
-    7663,  7671,  7675,  7679,  7683,  7687,  7691,  7695,  7699,  7703,
+    7663,  7667,  7671,  7679,  7683,  7687,  7691,  7695,  7699,  7703,
     7707,  7711,  7715,  7719,  7723,  7727,  7731,  7735,  7739,  7743,
-    7751,  7759,  7763,  7767,  7775,  7779,  7787,  7791,  7795,  7799,
-    7803,  7811,  7816,  7822,  7826,  7830,  7834,  7842,  7846,  7851,
-    7857,  7861,  7869,  7877,  7882,  7888,  7896,  7900,  7908,  7912,
+    7747,  7751,  7759,  7767,  7771,  7775,  7783,  7787,  7795,  7799,
+    7803,  7807,  7811,  7819,  7824,  7830,  7834,  7838,  7842,  7850,
+    7854,  7859,  7865,  7869,  7877,  7885,  7890,  7896,  7904,  7908,
     7916,  7920,  7924,  7928,  7932,  7936,  7940,  7944,  7948,  7952,
-    7956,  7960,  7968,  7972,  7977,  7983,  7987,  7991,  7995,  7999,
-    8007,  8011,  8015,  8023,  8028,  8034,  8038,  8042,  8047,  8056,
-    8060,  8064,  8069,  8075,  8083,  8091,  8096,  8102,  8106,  8114,
-    8118,  8122,  8130,  8134,  8138,  8142,  8146,  8150,  8154,  8162,
-    8167,  8173,  8177,  8181,  8189,  8197,  8201,  8209,  8213,  8221,
-    8229,  8233,  8237,  8241,  8245,  8249,  8253,  8261,  8266,  8272,
-    8280,  8284,  8288,  8292,  8296,  8300,  8308,  8312,  8320,  8328,
-    8332,  8336,  8344,  8349,  8355,  8359,  8363,  8367,  8371,  8379,
-    8383,  8391,  8395,  8399,  8403,  8411,  8415,  8423,  8427,  8435,
-    8440,  8446,  8451,  8457,  8462,  8468,  8473,  8479,  8483,  8487,
-    8491,  8499,  8503,  8507,  8511,  8515,  8519,  8523,  8527,  8531,
-    8539,  8543,  8551,  8559,  8563,  8571,  8575,  8580,  8586,  8592,
-    8602,  8607,  8613,  8617,  8621,  8625,  8633,  8635,  8643,  8648,
-    8654,  8662,  8666,  8674,  8678,  8682,  8690,  8694,  8702,  8710,
-    8714,  8719,  8725,  8729,  8734,  8740,  8745,  8751,  8759,  8764,
-    8770,  8778,  8783,  8789,  8793,  8797,  8801,  8805,  8809,  8813,
-    8817,  8825,  8830,  8836,  8840,  8845,  8851,  8859,  8863,  8871,
-    8875,  8883,  8891,  8895,  8903,  8911,  8915,  8923,  8976,  8980,
-    8993,  8995,  8999,  9003,  9007,  9016,  9022,  9026,  9034,  9038,
-    9046,  9050,  9058,  9062,  9066,  9070,  9074,  9078,  9082,  9086,
-    9094,  9098,  9106,  9110,  9114,  9118,  9122,  9126,  9130,  9138,
-    9142,  9146,  9154,  9158,  9166,  9174,  9179,  9185,  9190,  9192,
-    9198,  9202,  9206,  9210,  9214,  9218,  9222,  9226,  9230,  9238,
-    9243,  9249,  9253,  9258,  9264,  9268,  9276,  9281,  9287,  9292,
-    9298,  9306,  9310,  9318,  9322,  9330,  9334,  9338,  9342,  9350,
-    9355,  9361,  9365,  9370,  9378,  9382,  9390,  9394,  9402,  9410,
-    9414,  9419,  9425,  9433,  9437,  9445,  9449,  9457,  9462,  9468,
-    9472,  9480,  9484,  9488,  9492,  9496,  9504,  9512,  9520,  9528,
-    9536,  9541,  9547,  9551,  9559,  9564,  9570,  9574,  9582,  9590,
-    9594,  9598,  9602,  9610,  9615,  9621,  9625,  9633,  9638,  9644,
-    9648,  9656,  9660,  9664,  9668,  9672,  9679,  9686,  9690,  9698,
-    9702,  9706,  9710,  9714,  9718,  9726,  9730,  9734,  9738,  9746,
-    9751,  9757,  9761,  9765,  9769,  9774,  9780,  9784,  9788,  9792,
-    9800,  9805,  9811,  9815,  9823,  9827,  9831,  9835,  9843,  9847,
-    9855,  9859,  9863,  9871,  9879,  9884,  9890,  9894,  9902,  9910,
-    9914,  9922,  9927,  9933,  9938,  9944,  9949,  9955,  9959,  9965,
-    9971,  9976,  9982,  9986,  9994, 10002, 10004, 10006, 10010, 10014,
-   10018, 10026, 10036, 10047, 10056, 10060, 10064, 10068, 10072, 10076,
-   10080, 10088, 10092, 10096, 10100, 10108, 10112, 10120, 10125, 10131,
-   10135, 10139, 10143, 10147, 10151, 10155, 10159, 10163, 10167, 10171,
-   10179, 10184, 10190, 10194, 10202, 10206, 10214, 10222, 10230, 10234,
-   10242, 10246, 10254, 10262, 10270, 10274, 10278, 10282, 10286, 10290,
-   10298, 10303, 10309, 10314, 10320, 10324, 10328, 10332, 10340, 10348,
-   10352, 10357, 10363, 10367, 10371, 10375, 10379, 10383, 10387, 10391,
-   10395, 10399, 10403, 10407, 10411, 10416, 10422, 10426, 10434, 10438,
+    7956,  7960,  7964,  7968,  7976,  7980,  7985,  7991,  7995,  7999,
+    8003,  8007,  8015,  8019,  8023,  8031,  8036,  8042,  8046,  8050,
+    8055,  8064,  8068,  8072,  8077,  8083,  8091,  8099,  8104,  8110,
+    8114,  8122,  8126,  8130,  8138,  8142,  8146,  8150,  8154,  8158,
+    8162,  8170,  8175,  8181,  8185,  8189,  8197,  8205,  8209,  8217,
+    8221,  8229,  8237,  8241,  8245,  8249,  8253,  8257,  8261,  8269,
+    8274,  8280,  8288,  8292,  8296,  8300,  8304,  8308,  8316,  8320,
+    8328,  8336,  8340,  8344,  8352,  8357,  8363,  8367,  8371,  8375,
+    8379,  8387,  8391,  8399,  8403,  8407,  8411,  8419,  8423,  8431,
+    8435,  8443,  8448,  8454,  8459,  8465,  8470,  8476,  8481,  8487,
+    8491,  8495,  8499,  8507,  8511,  8515,  8519,  8523,  8527,  8531,
+    8535,  8539,  8547,  8551,  8559,  8567,  8571,  8579,  8583,  8588,
+    8594,  8600,  8610,  8615,  8621,  8625,  8629,  8633,  8641,  8643,
+    8651,  8656,  8662,  8670,  8674,  8682,  8686,  8690,  8698,  8702,
+    8710,  8718,  8722,  8727,  8733,  8737,  8742,  8748,  8753,  8759,
+    8767,  8772,  8778,  8786,  8791,  8797,  8801,  8805,  8809,  8813,
+    8817,  8821,  8825,  8833,  8838,  8844,  8848,  8853,  8859,  8867,
+    8871,  8879,  8883,  8891,  8899,  8903,  8911,  8919,  8923,  8931,
+    8984,  8988,  9001,  9003,  9007,  9011,  9015,  9024,  9030,  9034,
+    9042,  9046,  9054,  9058,  9066,  9070,  9074,  9078,  9082,  9086,
+    9090,  9094,  9102,  9106,  9114,  9118,  9122,  9126,  9130,  9134,
+    9138,  9146,  9150,  9154,  9162,  9166,  9174,  9182,  9187,  9193,
+    9198,  9200,  9206,  9210,  9214,  9218,  9222,  9226,  9230,  9234,
+    9238,  9246,  9251,  9257,  9261,  9266,  9272,  9276,  9284,  9289,
+    9295,  9300,  9306,  9314,  9318,  9326,  9330,  9338,  9342,  9346,
+    9350,  9358,  9363,  9369,  9373,  9378,  9386,  9390,  9398,  9402,
+    9410,  9418,  9422,  9427,  9433,  9441,  9445,  9453,  9457,  9465,
+    9470,  9476,  9480,  9488,  9492,  9496,  9500,  9504,  9512,  9520,
+    9528,  9536,  9544,  9549,  9555,  9559,  9567,  9572,  9578,  9582,
+    9590,  9598,  9602,  9606,  9610,  9618,  9623,  9629,  9633,  9641,
+    9646,  9652,  9656,  9664,  9668,  9672,  9676,  9680,  9687,  9694,
+    9698,  9706,  9710,  9714,  9718,  9722,  9726,  9734,  9738,  9742,
+    9746,  9754,  9759,  9765,  9769,  9773,  9777,  9782,  9788,  9792,
+    9796,  9800,  9808,  9813,  9819,  9823,  9831,  9835,  9839,  9843,
+    9851,  9855,  9863,  9867,  9871,  9879,  9887,  9892,  9898,  9902,
+    9910,  9918,  9922,  9930,  9935,  9941,  9946,  9952,  9957,  9963,
+    9967,  9973,  9979,  9984,  9990,  9994, 10002, 10010, 10012, 10014,
+   10018, 10022, 10026, 10034, 10044, 10055, 10064, 10068, 10072, 10076,
+   10080, 10084, 10088, 10096, 10100, 10104, 10108, 10116, 10120, 10128,
+   10133, 10139, 10143, 10147, 10151, 10155, 10159, 10163, 10167, 10171,
+   10175, 10179, 10187, 10192, 10198, 10202, 10210, 10214, 10222, 10230,
+   10238, 10242, 10250, 10254, 10262, 10270, 10278, 10282, 10286, 10290,
+   10294, 10298, 10306, 10311, 10317, 10322, 10328, 10332, 10336, 10340,
+   10348, 10356, 10360, 10365, 10371, 10375, 10379, 10383, 10387, 10391,
+   10395, 10399, 10403, 10407, 10411, 10415, 10419, 10424, 10430, 10434,
    10442, 10446, 10450, 10454, 10458, 10462, 10466, 10470, 10474, 10478,
    10482, 10486, 10490, 10494, 10498, 10502, 10506, 10510, 10514, 10518,
    10522, 10526, 10530, 10534, 10538, 10542, 10546, 10550, 10554, 10558,
    10562, 10566, 10570, 10574, 10578, 10582, 10586, 10590, 10594, 10598,
    10602, 10606, 10610, 10614, 10618, 10622, 10626, 10630, 10634, 10638,
-   10642, 10646, 10650, 10654, 10658, 10662, 10666, 10670, 10674, 10679,
-   10683, 10691, 10695, 10699, 10703, 10707, 10711, 10715, 10719, 10723,
+   10642, 10646, 10650, 10654, 10658, 10662, 10666, 10670, 10674, 10678,
+   10682, 10687, 10691, 10699, 10703, 10707, 10711, 10715, 10719, 10723,
    10727, 10731, 10735, 10739, 10743, 10747, 10751, 10755, 10759, 10763,
-   10767, 10771, 10775, 10779, 10783, 10787, 10795, 10799, 10803, 10807,
+   10767, 10771, 10775, 10779, 10783, 10787, 10791, 10795, 10803, 10807,
    10811, 10815, 10819, 10823, 10827, 10831, 10835, 10839, 10843, 10847,
-   10855, 10859, 10863, 10867, 10871, 10875, 10879, 10887, 10891, 10899,
-   10903, 10911, 10915, 10919, 10923, 10927, 10931, 10935, 10939, 10943,
+   10851, 10855, 10863, 10867, 10871, 10875, 10879, 10883, 10887, 10895,
+   10899, 10907, 10911, 10919, 10923, 10927, 10931, 10935, 10939, 10943,
    10947, 10951, 10955, 10959, 10963, 10967, 10971, 10975, 10979, 10983,
    10987, 10991, 10995, 10999, 11003, 11007, 11011, 11015, 11019, 11023,
    11027, 11031, 11035, 11039, 11043, 11047, 11051, 11055, 11059, 11063,
-   11067, 11071, 11075, 11083, 11087, 11095, 11099, 11103, 11108, 11114,
-   11122, 11126, 11134, 11138, 11146, 11150, 11158, 11162, 11167, 11173,
-   11177, 11181, 11185, 11193, 11198, 11204, 11209, 11215, 11220, 11226,
-   11230, 11238, 11246, 11250, 11255, 11261, 11269, 11273, 11280, 11285,
-   11291, 11296, 11301, 11307, 11311, 11319, 11323, 11327, 11331, 11335,
-   11343, 11347, 11351, 11359, 11363, 11371, 11379, 11383, 11387, 11395,
-   11399, 11407, 11411, 11415, 11419, 11423, 11427, 11431, 11435, 11439,
-   11443, 11447, 11451, 11459, 11463, 11471, 11475, 11483, 11487, 11491,
-   11495, 11499, 11503, 11511, 11515, 11523, 11527, 11535, 11539, 11543,
-   11551, 11555, 11563, 11567, 11571, 11579, 11583, 11591, 11596, 11602,
-   11606, 11610, 11614, 11618, 11622, 11626, 11630, 11638, 11642, 11650,
-   11658, 11663, 11669, 11673, 11677, 11681, 11685, 11690, 11696, 11704,
-   11712, 11716, 11720, 11728, 11732, 11740, 11748, 11752, 11760, 11768,
-   11773, 11779, 11784, 11790, 11794, 11802, 11806, 11810, 11814, 11822,
-   11826, 11835, 11837, 11845, 11850, 11856, 11860, 11868, 11872, 11880,
-   11888, 11893, 11899, 11903, 11911, 11915, 11919, 11923, 11931, 11935,
-   11943, 11947, 11955, 11959, 11967, 11975, 11983, 11991, 11999, 12007,
-   12015, 12019, 12027, 12031, 12035, 12039, 12043, 12047, 12051, 12055,
-   12059, 12063, 12067, 12071, 12075, 12079, 12080, 12085, 12091, 12095,
-   12096, 12100, 12108, 12116, 12120, 12124, 12132, 12136, 12144, 12148,
-   12152, 12156, 12164, 12168, 12172, 12176, 12180, 12184, 12188, 12192,
+   11067, 11071, 11075, 11079, 11083, 11091, 11095, 11103, 11107, 11111,
+   11116, 11122, 11130, 11134, 11142, 11146, 11154, 11158, 11166, 11170,
+   11175, 11181, 11185, 11189, 11193, 11201, 11206, 11212, 11217, 11223,
+   11228, 11234, 11238, 11246, 11254, 11258, 11263, 11269, 11277, 11281,
+   11288, 11293, 11299, 11304, 11309, 11315, 11319, 11327, 11331, 11335,
+   11339, 11343, 11351, 11355, 11359, 11367, 11371, 11379, 11387, 11391,
+   11395, 11403, 11407, 11415, 11419, 11423, 11427, 11431, 11435, 11439,
+   11443, 11447, 11451, 11455, 11459, 11467, 11471, 11479, 11483, 11491,
+   11495, 11499, 11503, 11507, 11511, 11519, 11523, 11531, 11535, 11543,
+   11547, 11551, 11559, 11563, 11571, 11575, 11579, 11587, 11591, 11599,
+   11604, 11610, 11614, 11618, 11622, 11626, 11630, 11634, 11638, 11646,
+   11650, 11658, 11666, 11671, 11677, 11681, 11685, 11689, 11693, 11698,
+   11704, 11712, 11720, 11724, 11728, 11736, 11740, 11748, 11756, 11760,
+   11768, 11776, 11781, 11787, 11792, 11798, 11802, 11810, 11814, 11818,
+   11822, 11830, 11834, 11843, 11845, 11853, 11858, 11864, 11868, 11876,
+   11880, 11888, 11896, 11901, 11907, 11911, 11919, 11923, 11927, 11931,
+   11939, 11943, 11951, 11955, 11963, 11967, 11975, 11983, 11991, 11999,
+   12007, 12015, 12023, 12027, 12035, 12039, 12043, 12047, 12051, 12055,
+   12059, 12063, 12067, 12071, 12075, 12079, 12083, 12087, 12088, 12093,
+   12099, 12103, 12104, 12108, 12116, 12124, 12128, 12132, 12140, 12144,
+   12152, 12156, 12160, 12164, 12172, 12176, 12180, 12184, 12188, 12192,
    12196, 12200, 12204, 12208, 12212, 12216, 12220, 12224, 12228, 12232,
    12236, 12240, 12244, 12248, 12252, 12256, 12260, 12264, 12268, 12272,
    12276, 12280, 12284, 12288, 12292, 12296, 12300, 12304, 12308, 12312,
@@ -1826,68 +1826,69 @@
    13076, 13080, 13084, 13088, 13092, 13096, 13100, 13104, 13108, 13112,
    13116, 13120, 13124, 13128, 13132, 13136, 13140, 13144, 13148, 13152,
    13156, 13160, 13164, 13168, 13172, 13176, 13180, 13184, 13188, 13192,
-   13196, 13204, 13208, 13212, 13216, 13220, 13224, 13228, 13232, 13236,
+   13196, 13200, 13204, 13212, 13216, 13220, 13224, 13228, 13232, 13236,
    13240, 13244, 13248, 13252, 13256, 13260, 13264, 13268, 13272, 13276,
    13280, 13284, 13288, 13292, 13296, 13300, 13304, 13308, 13312, 13316,
    13320, 13324, 13328, 13332, 13336, 13340, 13344, 13348, 13352, 13356,
-   13360, 13364, 13368, 13372, 13376, 13380, 13388, 13392, 13396, 13400,
+   13360, 13364, 13368, 13372, 13376, 13380, 13384, 13388, 13396, 13400,
    13404, 13408, 13412, 13416, 13420, 13424, 13428, 13432, 13436, 13440,
-   13444, 13448, 13452, 13456, 13460, 13464, 13468, 13472, 13476, 13484,
-   13488, 13492, 13496, 13500, 13504, 13508, 13512, 13516, 13520, 13524,
+   13444, 13448, 13452, 13456, 13460, 13464, 13468, 13472, 13476, 13480,
+   13484, 13492, 13496, 13500, 13504, 13508, 13512, 13516, 13520, 13524,
    13528, 13532, 13536, 13540, 13544, 13548, 13552, 13556, 13560, 13564,
    13568, 13572, 13576, 13580, 13584, 13588, 13592, 13596, 13600, 13604,
    13608, 13612, 13616, 13620, 13624, 13628, 13632, 13636, 13640, 13644,
    13648, 13652, 13656, 13660, 13664, 13668, 13672, 13676, 13680, 13684,
    13688, 13692, 13696, 13700, 13704, 13708, 13712, 13716, 13720, 13724,
    13728, 13732, 13736, 13740, 13744, 13748, 13752, 13756, 13760, 13764,
-   13768, 13772, 13776, 13780, 13790, 13791, 13794, 13795, 13796, 13802,
-   13803, 13804, 13805, 13806, 13819, 13819, 13828, 13843, 13845, 13848,
-   13850, 13854, 13866, 13882, 13886, 13897, 13898, 13901, 13913, 13922,
-   13923, 13926, 13927, 13928, 13931, 13932, 13935, 13936, 13939, 13940,
-   13943, 13945, 13947, 13949, 13953, 13960, 13967, 13983, 14017, 14027,
-   14030, 14034, 14047, 14048, 14050, 14052, 14056, 14070, 14077, 14138,
-   14147, 14149, 14150, 14153, 14155, 14156, 14159, 14160, 14161, 14162,
-   14163, 14170, 14169, 14179, 14181, 14183, 14184, 14187, 14188, 14189,
-   14190, 14193, 14194, 14198, 14197, 14214, 14212, 14228, 14227, 14241,
-   14247, 14248, 14251, 14253, 14254, 14257, 14258, 14259, 14260, 14263,
-   14264, 14267, 14275, 14292, 14300, 14323, 14429, 14463, 14465, 14467,
-   14471, 14475, 14474, 14525, 14527, 14526, 14541, 14547, 14554, 14559,
-   14565, 14566, 14569, 14570, 14571, 14572, 14573, 14574, 14575, 14583,
-   14591, 14594, 14595, 14596, 14597, 14598, 14599, 14607, 14615, 14616,
-   14617, 14620, 14621, 14624, 14626, 14635, 14723, 14724, 14731, 14732,
-   14733, 14739, 14748, 14751, 14752, 14753, 14754, 14757, 14758, 14759,
-   14762, 14764, 14772, 14773, 14779, 14787, 14788, 14791, 14792, 14795,
-   14800, 14807, 14812, 14819, 14826, 14826, 14828, 14835, 14836, 14839,
-   14840, 14841, 14842, 14843, 14844, 14845, 14846, 14847, 14853, 14860,
-   14872, 14878, 14885, 14893, 14894, 14906, 14917, 14928, 14932, 14933,
-   14936, 14941, 14945, 14946, 14949, 14955, 14963, 14969, 14976, 14980,
-   14981, 14984, 14987, 14991, 14992, 14995, 15001, 15010, 15015, 15025,
-   15035, 15047, 15048, 15049, 15050, 15051, 15052, 15053, 15054, 15055,
-   15056, 15057, 15058, 15059, 15060, 15061, 15068, 15069, 15072, 15073,
-   15080, 15081, 15082, 15089, 15088, 15105, 15106, 15113, 15112, 15182,
-   15188, 15194, 15202, 15208, 15214, 15220, 15226, 15232, 15238, 15244,
-   15250, 15261, 15262, 15265, 15266, 15267, 15268, 15269, 15270, 15271,
-   15272, 15273, 15274, 15275, 15276, 15277, 15278, 15279, 15280, 15281,
-   15282, 15283, 15284, 15285, 15286, 15287, 15290, 15291, 15292, 15293,
-   15294, 15295, 15299, 15300, 15301, 15302, 15303, 15304, 15305, 15308,
-   15311, 15312, 15313, 15314, 15315, 15316, 15317, 15318, 15331, 15332,
-   15333, 15334, 15335, 15336, 15337, 15342, 15343, 15344, 15345, 15346,
-   15347, 15353, 15354, 15355, 15356, 15357, 15358, 15359, 15360, 15361,
-   15362, 15363, 15366, 15367, 15368, 15369, 15370, 15373, 15374, 15375,
-   15376, 15379, 15380, 15381, 15382, 15383, 15384, 15385, 15402, 15403,
-   15404, 15407, 15408, 15409, 15410, 15411, 15412, 15416, 15416, 15419,
-   15425, 15426, 15429, 15431, 15436, 15446, 15457, 15464, 15465, 15466,
-   15469, 15502, 15504, 15506, 15509, 15519, 15529, 15539, 15540, 15543,
-   15545, 15546, 15547, 15550, 15552, 15560, 15561, 15562, 15566, 15567,
-   15571, 15572, 15575, 15576, 15579, 15580, 15581, 15582, 15583, 15586,
-   15587, 15588, 15589, 15590, 15591, 15592, 15593, 15594, 15595, 15596,
-   15597, 15598, 15599, 15600, 15601, 15602, 15603, 15604, 15605, 15606,
-   15607, 15608, 15609, 15610, 15611, 15612, 15613, 15614, 15615, 15616,
-   15617, 15618, 15619, 15620, 15621, 15622, 15623, 15624, 15625, 15626,
-   15627, 15628, 15629, 15630, 15631, 15632, 15633, 15634, 15635, 15636,
-   15637, 15638, 15639, 15640, 15641, 15644, 15645, 15646, 15647, 15650,
-   15651, 15652, 15653, 15654, 15655, 15656, 15657, 15658, 15659, 15666,
-   15667, 15668, 15669, 15670, 15673, 15674, 15677, 15678, 15689, 15690
+   13768, 13772, 13776, 13780, 13784, 13788, 13798, 13799, 13802, 13803,
+   13804, 13810, 13811, 13812, 13813, 13814, 13827, 13827, 13836, 13851,
+   13853, 13856, 13858, 13862, 13874, 13890, 13894, 13905, 13906, 13909,
+   13921, 13930, 13931, 13934, 13935, 13936, 13939, 13940, 13943, 13944,
+   13947, 13948, 13951, 13953, 13955, 13957, 13961, 13968, 13975, 13991,
+   14025, 14035, 14038, 14042, 14055, 14056, 14058, 14060, 14064, 14078,
+   14085, 14146, 14155, 14157, 14158, 14161, 14163, 14164, 14167, 14168,
+   14169, 14170, 14171, 14178, 14177, 14187, 14189, 14191, 14192, 14195,
+   14196, 14197, 14198, 14201, 14202, 14206, 14205, 14222, 14220, 14236,
+   14235, 14249, 14255, 14256, 14259, 14261, 14262, 14265, 14266, 14267,
+   14268, 14271, 14272, 14275, 14283, 14300, 14308, 14331, 14437, 14471,
+   14473, 14475, 14479, 14483, 14482, 14533, 14535, 14534, 14549, 14555,
+   14562, 14567, 14573, 14574, 14577, 14578, 14579, 14580, 14581, 14582,
+   14583, 14591, 14599, 14602, 14603, 14604, 14605, 14606, 14607, 14615,
+   14623, 14624, 14625, 14628, 14629, 14632, 14634, 14643, 14731, 14732,
+   14739, 14740, 14741, 14747, 14756, 14759, 14760, 14761, 14762, 14765,
+   14766, 14767, 14770, 14772, 14780, 14781, 14787, 14795, 14796, 14799,
+   14800, 14803, 14808, 14815, 14820, 14827, 14834, 14834, 14836, 14843,
+   14844, 14847, 14848, 14849, 14850, 14851, 14852, 14853, 14854, 14855,
+   14861, 14868, 14880, 14886, 14893, 14901, 14902, 14914, 14925, 14936,
+   14940, 14941, 14944, 14949, 14953, 14954, 14957, 14963, 14971, 14977,
+   14984, 14988, 14989, 14992, 14995, 14999, 15000, 15003, 15009, 15018,
+   15023, 15033, 15043, 15055, 15056, 15057, 15058, 15059, 15060, 15061,
+   15062, 15063, 15064, 15065, 15066, 15067, 15068, 15069, 15076, 15077,
+   15080, 15081, 15088, 15089, 15090, 15097, 15096, 15113, 15114, 15121,
+   15120, 15190, 15196, 15202, 15210, 15216, 15222, 15228, 15234, 15240,
+   15246, 15252, 15258, 15269, 15270, 15273, 15274, 15275, 15276, 15277,
+   15278, 15279, 15280, 15281, 15282, 15283, 15284, 15285, 15286, 15287,
+   15288, 15289, 15290, 15291, 15292, 15293, 15294, 15295, 15298, 15299,
+   15300, 15301, 15302, 15303, 15307, 15308, 15309, 15310, 15311, 15312,
+   15313, 15316, 15319, 15320, 15321, 15322, 15323, 15324, 15325, 15326,
+   15339, 15340, 15341, 15342, 15343, 15344, 15345, 15350, 15351, 15352,
+   15353, 15354, 15355, 15361, 15362, 15363, 15364, 15365, 15366, 15367,
+   15368, 15369, 15370, 15371, 15374, 15375, 15376, 15377, 15378, 15381,
+   15382, 15383, 15384, 15387, 15388, 15389, 15390, 15391, 15392, 15393,
+   15410, 15411, 15412, 15415, 15416, 15417, 15418, 15419, 15420, 15424,
+   15424, 15427, 15433, 15434, 15437, 15439, 15444, 15454, 15465, 15472,
+   15473, 15474, 15477, 15510, 15512, 15514, 15517, 15527, 15537, 15547,
+   15548, 15551, 15553, 15554, 15555, 15558, 15560, 15568, 15569, 15570,
+   15574, 15575, 15579, 15580, 15583, 15584, 15587, 15588, 15589, 15590,
+   15591, 15594, 15595, 15596, 15597, 15598, 15599, 15600, 15601, 15602,
+   15603, 15604, 15605, 15606, 15607, 15608, 15609, 15610, 15611, 15612,
+   15613, 15614, 15615, 15616, 15617, 15618, 15619, 15620, 15621, 15622,
+   15623, 15624, 15625, 15626, 15627, 15628, 15629, 15630, 15631, 15632,
+   15633, 15634, 15635, 15636, 15637, 15638, 15639, 15640, 15641, 15642,
+   15643, 15644, 15645, 15646, 15647, 15648, 15649, 15652, 15653, 15654,
+   15655, 15658, 15659, 15660, 15661, 15662, 15663, 15664, 15665, 15666,
+   15667, 15674, 15675, 15676, 15677, 15678, 15681, 15682, 15685, 15686,
+   15697, 15698
 };
 #endif
 
@@ -2259,577 +2260,578 @@
 };
 # endif
 
-#define YYPACT_NINF -4744
+#define YYPACT_NINF -4850
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-4744)))
+  (!!((Yystate) == (-4850)))
 
-#define YYTABLE_NINF -2800
+#define YYTABLE_NINF -2802
 
 #define yytable_value_is_error(Yytable_value) \
-  (!!((Yytable_value) == (-2800)))
+  (!!((Yytable_value) == (-2802)))
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const int yypact[] =
 {
-   -4744,   433, 11052, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, 31351, -4744,
-   -4744, -4744, -4744, -4744,112459,   522, -4744, -4744, -4744,117557,
-   -4744, -4744, -4744,   938, 77179, -4744, 80203,  1306, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, 84235, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, 64564,  1268, -4744,   957,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744,  1597,  8728, -4744,
-   -4744, 80707, -4744,   217, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, 81211,   966, -4744, -4744,  1227,  1329, -4744,   133,  8278,
-   -4744, -4744, 73651, 78187, -4744, -4744, 84739,   671,  1875, 16788,
-    1597, 32119, 85243, -4744,  1972, -4744, 60992, -4744, -4744, -4744,
-   77683, -4744, -4744, -4744,  1354, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, 91291,  2639,  1326, 61505, -4744,
-   -4744, -4744, -4744, 91291, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, 85747, -4744,  1428,  1538,   956, 91795, 92299,
-   75163, -4744,  1472, -4744, 91291,  1622,  1449, 63554, -4744, 92803,
-   -4744, -4744,  1468, -4744, 86251, -4744, -4744, -4744, -4744, -4744,
-    1326, -4744, 64564, 59982,    49,  1401, -4744, -4744, 93307, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, 91291,  1961,
-    1551, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744,   966, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744,   795, -4744,  1093,  1088,  1437,   810,  1669, -4744,
-   -4744, -4744, 29834, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-  113962,   371, -4744, -4744, -4744,  1708, -4744,  1684, -4744, -4744,
-   -4744,  2164, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,   430,
-   -4744, -4744, -4744, -4744,  2218,112960, 84235, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, 73147, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744,   198, -4744, -4744,
-   -4744, -4744, -4744, 84235, 84235, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, 84235,  1800, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744,   887,  2038, -4744, -4744, 64564,  2523,  2523,
-    2321,113962, -4744, -4744, -4744, 66079, 91291, 91291, 91291,  2020,
-   91291,  1950, 91291,   346, 66079,121493, 86755,  2115,  2010, 55352,
-   93811, -4744,120182, 91291, 91291, 94315, 91291,   583, 81715, 91291,
-    2034, 91291, 91291,121930, 94819,  2199, -4744,  2473,  1427, -4744,
-   -4744, -4744, 91291, 17874,  2639, -4744, -4744, 91291,  2054, 66079,
-   91291,  2002, 91291,  2059, 91291, -4744, 91291,  2084, 95323,   658,
-    1663,121493,  1984, 55869,  2170, 91291,121493, 95827, 91291, 91291,
-   -4744, -4744,  2156, 91291, 91291, -4744,  2264,122367,  1527,  2294,
-    2464,  2347,   972, -4744, -4744,  2496,  2102, -4744, -4744,  2566,
-   84235, -4744, 82219, -4744, -4744, -4744,  2236, -4744, -4744, -4744,
-   -4744, -4744, -4744,119308,  1875, -4744, -4744, 66584, 91291,  2394,
-   -4744, -4744, 96331, 69614,  2211, -4744,   687, 67089,122804,  2513,
-    2186, 56386,  2545, 96835,123241, 97339, -4744, -4744, 97843, -4744,
-   98347,  2272,  2394, 98851, 70119,123678, -4744,  2395, 99355, -4744,
-    9546, -4744,  2145,  2092,  2175,  1965, 84235, 84235,  1841,115337,
-   -4744, -4744,   966, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744,   164,  1925, 62018,  1090, 62531, -4744, -4744,  1256,  1413,
-    1423,   164,  2597,  2597,   534, 84235, -4744, -4744,  1925, -4744,
-    1017,   881,  2179,  2179,  2179,  2352,  1163, -4744,  2179,  2306,
-   -4744, -4744, -4744, -4744, 86251, 62018, 62531, -4744,  2180,  2639,
-     163,  2591,  2234, -4744, -4744, -4744, -4744, -4744,  2246, 91291,
-   91291, 91291, -4744, -4744, -4744,  2606,  2226,  2468, -4744,  2215,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,  2411,
-    2427,  2420,    66,  2639,  2323, -4744,  2544, -4744,  2452, 38354,
-   38354,   474, 84235,  2639, 63044, 87259,109435,   289,119308,  2639,
-   99859,  2289,  1587,  2457, -4744, -4744, -4744,   653, -4744,  2683,
-    2296,  2557,   608,  1427, 52803, -4744,  2320,  1580, 86251,114463,
-   -4744, -4744, -4744, -4744,   262,  2612, 38876, -4744, 91291,  2326,
-   -4744,  2334,  2326,  2325,  2336,  1437, -4744, 91291,  1519,  1519,
-    2721,  1519,  2047,  2147, -4744,  2168, -4744,  2630,  2596, 86251,
-    1401,  1597,  2346, -4744, -4744, -4744,  2358, -4744,  2361,  2362,
-   -4744,   901,  2619, -4744, -4744, -4744, -4744,  2454,  2462,  2463,
-    2467,  2397,  2480,   323, -4744, -4744, -4744, -4744,  2718, -4744,
-   -4744, -4744, -4744, -4744, -4744,  2795,  2804,117997,117997,   689,
-     842,   216,   277, -4744, -4744, -4744,  2666, -4744, -4744,  2656,
-   91291,  2498, 91291, -4744, -4744, -4744,100363, -4744, -4744,  2523,
-    2358,  2424, -4744,   179, -4744,  1580, -4744,   204,   309,   391,
-    1829,  2429,  1872,  1033, -4744,   768, 91291,  2549,   177,   975,
-    2476, 87763,  2711,  2436,  2599,  1403,  2728,  2770,  6752,   323,
-   88267, -4744, -4744, -4744, -4744, 91291, 91291, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744,  2485, -4744, -4744,  2474,
-    2778,  2669,  2751,  2636,  1308,  2687,    74,  2807,  8837,  1477,
-  100867,109939,  2769,  2811,  7987,  1685,   926,  2704,   965,  2818,
-    2671,  1882,  2841,  8435, 91291,  2541, -4744,  2781,  2893,  1054,
-   -4744,   194, -4744,  2611,  2745,   604, 66079,  2562, -4744, -4744,
-   91291, -4744, -4744, 70624,  2641, -4744,   706, 66079, -4744,  2771,
-    2615, 56903, 91291, -4744, 91291, -4744, -4744, -4744, -4744, -4744,
-    2723,  2884, 91291, 70624, -4744,  2835, 91291, -4744,  2179,  2762,
-    2616,  2993, 70624,   219, 91291,  1512,  3030, 91291,  2830,  1512,
-    2675,101371, -4744, -4744,  1512, -4744, -4744, 91291, 91291,  2638,
-    1651,  2842,  1512,  2870,  3075,  3080,  2740,  2857,  1218,  1223,
-     159,  2979,  1512,  2731,101875,102379, 91291,  2738, 91291,  3097,
-   66079, 91291,  3027, -4744,  2905, 88771, -4744,  2749,  2496, -4744,
-   -4744, -4744, -4744, -4744,   873, -4744, -4744, -4744, -4744,  3064,
-    2424,   672,  3073,  2768,  3088, -4744, -4744,  2827, -4744,  2827,
-    2827,  2783,  2783,  2956,  2793,  3109, -4744, -4744, -4744,  2067,
-    2827,  2783, -4744, 71634, -4744,  1930,  1939, -4744,   210, -4744,
-    3218, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,   138,
-   -4744,  1023, -4744,  1955, -4744, -4744, -4744, -4744,  2834, -4744,
-    3114,  2436,  3115, -4744,  2805,102883, -4744,103387,103891,  3122,
-    2485,121493,  3123,  3008,  3127,  2805,  3130,  3014,  3132,   672,
-    3139, -4744,  1327,  3129,  3142,  3026,  3144,   210,  3146,  1921,
-    2805,119745,  3147,   224, -4744, 13021,  9546, -4744, 17779,   444,
-   -4744, -4744, -4744, -4744, -4744, -4744, 42530,   910,  2927, -4744,
-   -4744, -4744,  2046, -4744,116667, -4744,  1841,  1925, -4744, 84235,
-    1925, 84235,   534,  1925, 84235,  1925, 84235,   534,  1925, 84235,
-   84235, 84235,  1925, -4744, -4744,   269,   226, -4744, -4744, -4744,
-   -4744, -4744, 84235,  2840, 91291, 91291, -4744, -4744, -4744, 78691,
-  121493, 79195, -4744, 91291, -4744,    63, 84235, -4744, 84235, -4744,
-    2639, -4744, -4744,  2092, 70624,  3256,121493,  3097, -4744,  2052,
-   -4744, -4744, -4744, -4744, -4744, -4744,  3078, 91291,  3141,  3148,
-   78691,121493, -4744,104395,119308,  3037,  2849, -4744, -4744, -4744,
-   -4744,  2062,  2694,   222,  2808, 42530,  2850,   424,   424,  2852,
-    3151, -4744, -4744, -4744,   436,  2858,  2860, -4744,   261,   261,
-    2862,  2868, -4744,   343,  2869,  2871,  2824,   465,  2872,  2873,
-    2874,  2067,   424, 42530, -4744,  2876,   261,  2877,  2878,  2880,
-    2892,  2881, -4744,  3071,  2883,   454,   532,  2885,  2889, -4744,
-    2862, -4744,   234,  2890,  2891,  2894,  2897,  2900,  2901,  2902,
-    2904, 42530, 42530, 42530, -4744, 36788,  1580,  2639, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744,   541,  4344, -4744,  2918,
-   -4744, -4744,  3038, -4744, -4744, 42530, -4744, -4744,    41, -4744,
-     549, -4744, -4744,  1580, -4744, -4744,  2019, -4744, -4744, -4744,
-   -4744,  3121,  2907,  1905,  1905,   214, -4744, 80707, 80707, -4744,
-   -4744,  1517,  2911, -4744,  1220, -4744, -4744, -4744, -4744, -4744,
-   -4744,118871,  3307, -4744,  2864,  2639,   194,   255,  3263,115777,
-  116222,  3166,  3166,  3152, -4744, -4744, 91291, -4744, -4744, 42530,
-   58972, -4744,  1580,   117,  3170, -4744, -4744, -4744,  2107, -4744,
-   -4744, -4744,   966, -4744, 17226, -4744,  2123,  2326, 91291, 91291,
-    3337, -4744, -4744,  2334, -4744, -4744,  1437,  1437, 42530,  1437,
-     725,  1278, 39398, 42530,  3221,  3120,   748,  1339,  3224, -4744,
-    3124,  2047,  2147, 86251, 91291,104899,  3043, -4744, -4744,  2358,
-    2940,  1866, -4744, 72643,113461,113461,  3190, -4744, -4744,   148,
-    1249,  3059,  3153,  2597,  1631,  2417, -4744, -4744,  2938, -4744,
-    3284, 80707,  2998,117997, -4744, -4744, 91291, -4744, -4744, 89275,
-   -4744, -4744, -4744,  1943,  2941, -4744,  2958, 91291, -4744,  3457,
-    2417,  2417, -4744, -4744,  2945, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744,113962,  2949, 91291, -4744,  2953,  2954, -4744,
-  114463, 59477,  1986,  1580,  3032,  3035,  3085, 64564,  2962,  3045,
-    3046,  3086,  3203, -4744, -4744,  3050,  3051,110443, -4744, -4744,
-    1674, -4744, -4744, -4744,  1674, -4744,  2986, -4744,  1431,  1132,
-     920,  3054,   319,   751,  3347, -4744,  1491,  3105, -4744, -4744,
-   -4744,  4251, 91291,  3289,  8998,  3173,   323,  3107, -4744, -4744,
-    3225,  3063,  3065,  3191,   323,  1469,110947, -4744, -4744, -4744,
-   -4744, -4744, -4744,  4856, 35248, -4744,  3066,  3047,  3081, 91291,
-   74155,  1755,  3185,  1686,  2064,   631,  3128, 91291,  1506,  3193,
-   91291,  2999,  3079,  3083,  3278,  3003,  2135,  3373,  3006, -4744,
-   -4744,  3188,  3281,  3323,  9442,  3070,  3076, 68604,  1476, 57420,
-   91291, 91291,  3364,  1630,  3101, -4744, -4744, -4744,  1630, 91291,
-    3102,  3103, 91291,   323, -4744,  3426,   323,   323,  1762,  3428,
-    3110,   331,  2091,  1512,  3006,  2390, -4744,  3112,  3116,  1854,
-   -4744,  3226, -4744, -4744,  1359,  3125, 86251,   395,  2109,  3006,
-    3118,  3119,  3003,  3003, 91291, 91291, 91291, 91291, 91291,   150,
-    3452,  3453,  3126,   172,  3171,  3044, -4744,120619,  3133,109435,
-   -4744, -4744, 91291,  3134,  2285,  3006,  1746, -4744,  1998, -4744,
-   -4744, -4744,  1427, -4744, 91291, -4744, 91291,  2424, 70624,  3238,
-    3297, -4744,  3089, -4744,  2436,   323, -4744, 91291, 91291,  2485,
-    3242,  1716,  1333, 70624,  3244,  3308, 91291,  3309,  3098, -4744,
-    1151, 59477, -4744,  2638,  3062,  3479, 91291, 64564, -4744,  3491,
-    1674, -4744, 70624,  3258,  3377, -4744, 91291,  3275,  3074, -4744,
-    3411,  3131, -4744, -4744,   559, 91291, -4744,  3384,121493,  1045,
-    2639,  3135,121493,  3303, 91291, 91291, 91291, 91291, -4744, -4744,
-    3274,   894,   297, -4744,120619, -4744, 91291,  3285,  2390,  3286,
-    3496,   614,  2179,105403,  3379, -4744,105907,  3084,  3498, 70624,
-    3328, -4744, -4744,  3091,  2597, -4744,  2749, -4744,  2127, -4744,
-    3215, -4744, 66079,   672, -4744, -4744, -4744, -4744, 70624, 91291,
-   -4744,  3094, -4744, -4744, 42530, -4744, -4744, -4744,  2597, -4744,
-   70624,  2827,  2827, -4744, -4744,  3507,  3174,  3176,  2597, -4744,
-    2597, -4744, 70624, -4744,  3100,  3104,  3214,  2597, -4744,  3178,
-   -4744,  3180,  2597, -4744,  2136, -4744,106411, 66079,   672,121493,
-  121493,  3414,   224,  3415,  3165,  3421,  3167, 57420,   672,   243,
-   91291, 91291,121493, 91291, 91291, 91291, -4744, 91291, -4744, -4744,
-   -4744, -4744, 70624, 91291, 91291, 70624, -4744,121493,120619,  3423,
-    3424,   672, 91291, 91291, -4744, -4744, 16688,  1828, -4744,  9546,
-   -4744, 17226,  2142,  3166, -4744,  1800, 91291,  1608,  1841,124115,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, 84235, -4744,
-   84235,   534, -4744, -4744, 84235, -4744, 84235,   534, -4744, 84235,
-   -4744, -4744, -4744, 84235, 91291,  3628,  3117, -4744,  2019, -4744,
-   91291,  2160, -4744, -4744,  2166,  1121, 91291, 91291,   738, 66079,
-   91291,  3315, 91291, 91291, 91291, 91291, 91291,  3196,  2911,  1109,
-   -4744,  1514,   317, 86251,  3324, -4744, -4744, -4744, -4744, -4744,
-    2198,  1961,  1280, 91291,  1524,  2246, -4744, -4744, 79195, 77683,
-    3416,   281, 91291, -4744, -4744,  4238, 42530, 37832, -4744, -4744,
-   17226,  3162, 42530, 42530,  3136,  2597,  2597, -4744,   934, 42530,
-   42530, 42530,  2597,  2597, 10264, 42530, 57420, 42530, 45140, 33679,
-   42530, 42530, 37310, -4744, 42530,  3339, 46184, 42530,   255,  3340,
-   42530,   255, 10264,  3566,  3566,  1401,  2690,  5606,  3138,  1580,
-   -4744,  2597,  1168,   360, 70624, 42530, 42530, 42530, 42530, 64564,
-    3207,   203, 91291, 42530,  3137,  1935, -4744, 42530, -4744,  3149,
-   42530,  3206,   973, 42530, 42530, 42530, 42530, 42530, 42530, 42530,
-   42530, 42530, -4744, 47200,   361, -4744,  3418,  3432,   -47,   155,
-   79699, 38354,  3427, -4744, 32633, -4744,   353, 84235, -4744, -4744,
-    1580,  3427, -4744, -4744, -4744, -4744, -4744,  1943,  3143, -4744,
-    3150, -4744, -4744, -4744, -4744, -4744, 91291,  3307, -4744, -4744,
-    3213, -4744, -4744, -4744, -4744,   560, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744,  3145, -4744, -4744, -4744, -4744,  3145,
-   -4744, -4744,  3166,  3158,  4621, -4744, -4744, -4744, -4744,  3409,
-    3419,   672,113962, 91291,   262, 82723, -4744, 38876, -4744,  2212,
-   -4744,  3154, -4744,  3397, -4744,  3159, -4744, 12421,  3397, -4744,
-   -4744,   162,  3261,  3396,  3343, -4744, -4744, -4744,  3168, 17226,
-   -4744,  2128, 17226,  2197, -4744, -4744, -4744, -4744, -4744, -4744,
-    1230, -4744, 91291,  1343,  3221,  1339,  3219,  1422,  3568, 91291,
-   -4744, 53311,  2033, -4744,  2358, -4744, -4744, 16158, -4744, 19532,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,  3160,
-   -4744, -4744, -4744, -4744,   323,  3169,  3659, -4744,117997, -4744,
-   -4744, -4744,  3628, -4744,  2566, -4744,  2566,  3684, -4744, 84235,
-   -4744, -4744, -4744, -4744,  1136, -4744,  9546, -4744,  9546, -4744,
-    3356, -4744,  3572, -4744, 71634, -4744,  3175, -4744, 71129, 67594,
-   -4744, -4744,   981, -4744,   847,  3254,  3255,  3306,121493, 91291,
-   91291, -4744, 64564,121493, 91291, 91291, -4744,121493, 91291, 91291,
-   -4744, -4744, -4744, -4744, -4744,117112,   528, 77683,  3310, 75667,
-   -4744, -4744,  3181, 91291,  3237,  3437,  3438,  1523, -4744, -4744,
-  106915, -4744,  3395,121493, 91291, 91291, 42530,  3398, 91291, 91291,
-   -4744,   183,  3273,  3277, -4744, 91291,  3280, 66079,  3198, 91291,
-   91291, 70624,  3276,   708, 66079,  3243, 57937, 91291, 91291, 91291,
-   91291,  3330,  3504, 70624, 91291,  3451,   806, 86251,   303,  2288,
-    3006,  3410, -4744,  1485, -4744,121493, 91291,  3402, -4744, -4744,
-   -4744, 76171,  3620,  3318, -4744, -4744,111451, -4744, -4744, -4744,
-    2253, -4744,121493,121493, 91291,  9562, 91291,  1535, -4744, -4744,
-   70624, -4744, 91291, 91291, 91291,  3449, 91291, 83227,107419,107923,
-    1287,  1619,  3455, 91291, 83731,  3458, -4744,  3346, 91291, -4744,
-   -4744, 65069,121493, 91291,  1083, 64564, -4744, -4744, 91291, -4744,
-    3417,  1155, -4744, 91291,  3007,  3295,  3316, 91291,   344,  2317,
-    3006, 91291, 91291,  3222,  2260,  3321,  3358, -4744,  3440,   946,
-   91291, -4744,121493,  1556, -4744,  3393,121493, 91291,  9052, -4744,
-   -4744,   323, -4744, -4744, -4744, -4744, -4744, 91291, 91291,   323,
-   91291,   323,  1158, -4744,121493, 91291, -4744, -4744, -4744, 91291,
-   11716, 91291, 91291, 91291, 91291,121493, 91291, -4744, -4744,  1035,
-    1367,    28,  1482,  3394, 91291,  3528, 91291,108427,121493, 91291,
-   91291, 91291,   291, -4744,  3370, -4744,121493,  1556, 11860, 91291,
-   91291,  3331,  3332,   170,  3412, -4744, -4744, -4744, -4744, -4744,
-   -4744,  3508,  3673,108931,  1901, -4744,  3510,  3512,  3319,  3320,
-    3517, 91291,  1901, 91291, -4744, -4744, -4744, -4744,  3513, 91291,
-    1901,  3518,  1901,  3466,    96, -4744, -4744,  1512, -4744,  2268,
-   -4744,  3287, -4744, 42530, 70624, -4744,  2275, -4744,  3290,   894,
-   -4744, -4744, 64564, 91291,   624,   812,  3583, 74659,  2577,  3575,
-   91291,  3322, 91291,  3578,  2577, 91291, -4744,  1741, 77683, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,  3577, -4744,
-    2639,  2638,  2638,  2638,  2638, -4744, -4744, -4744, -4744,  3483,
-    2171, -4744,  3283,  2638, 91291,  3405,  2577,  3291,  3606, -4744,
-    2390,  3607,  3609, 91291, 74659,  2322,  3335,  3509,  3717,  2179,
-    2639,  3511,  3499, -4744, 35757,  6867,  3500,  3547,119308, 88771,
-   -4744,  3325,  3589,  3593,  3612, -4744,  2424, -4744,  3735, -4744,
-   42530,  2308,  3326,   210, -4744, -4744,  3336,  3104,  3338,  3345,
-    3329,  3341, -4744,  2597, 50771, 91291,  3342,  1270,  3539,  3349,
-   -4744,  3635,   672,  2436, -4744,  2805, -4744, 91291, -4744, 91291,
-   91291, 91291, 91291,  2485, -4744, -4744,  3521,   672,  2805,  3530,
-     672,   672, -4744,  3579,  3532,   672,   210,  2805,  3461,  3643,
-  119308, -4744,   224, -4744, -4744, -4744, -4744, -4744, 42530, -4744,
-   -4744,  2179,  2127, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, 84235,  2566, -4744,  2319, -4744, 91291,
-   -4744,  3618,  3621,  3622,  3350,  3351,  3386, 91291,  3353, -4744,
-    3350,   323,  3350,  2911,  2911,  3350,  3351,121056,  3785,  3645,
-   -4744,  3439,  3360,  3655,   129, -4744,   734,    16,  3581, -4744,
-   -4744, -4744, -4744, 70624, -4744, -4744, -4744, -4744, -4744,121493,
-    3400, 91291, 91291, -4744,    70,  3558,  3365,121056,  3767,   672,
-   -4744, 66079, -4744, -4744, 70624,  3442,  3460, 66079,  3571,  3425,
-   -4744, -4744, -4744, -4744, -4744, 70624, -4744,  3627, 91291,  2324,
-   -4744,  1835, -4744,  1887, 42530,   169, -4744, 14453,  2329, 42530,
-    3374,  3376, -4744, -4744, -4744, -4744, -4744, -4744,  3378,  3677,
-   -4744, -4744,  2341,  2359,  2380,  3385,  3388,  3815,  3389, 14503,
-    3391,  3387, 45140, 45140, 36788,  1073, -4744, 45140,  3392,  3576,
-    2388, 13180,  3399,  3408, 15049, 39920, 42530, 39920, 39920, 15202,
-    3399,  3413,  2393, 64564,  3570, 15500,  2419, -4744, 42530, 64564,
-    5549, 42530, -4744, 42530,  3420, -4744, -4744,  3751,  3751,  3751,
-   10264, -4744,  3430, -4744, 45140, 45140, -4744,  3195, 36788, -4744,
-   -4744,  3686, -4744, -4744,  1952, -4744,  3401, -4744, -4744,  3433,
-   57420,  6098, 42530,   252, 42530,  3137, 42530,  3475,  3751,  3751,
-    3751,   655,   655,   149,   149,   149,  2313,   155, -4744, -4744,
-   -4744,  3406,  3431,  3434,  3582,  3443, 42530, -4744,  2398,  2516,
-   91291, 10999, 12965, 13874, -4744, -4744, -4744, 48230,  3454, 42530,
-   42530, 42530,  3422, -4744,  2564, 17226,   936, -4744,  2568, -4744,
-   -4744, -4744,  3454,   555,  3684,  1943, -4744,  1427,  2597,  1168,
-  116667, -4744, -4744, -4744, 42530, -4744, -4744, -4744, -4744,  2334,
-   -4744, -4744, -4744, -4744, -4744, 91291,  1961, 42530, -4744, -4744,
-    1710,  3435, 42530,  2128, -4744, -4744,  3471, -4744, 42530, -4744,
-   -4744, -4744,  2911, -4744,  3624, -4744, -4744, -4744, 48230,  3456,
-    3467, 52295,  3629, -4744, 91291, -4744, 91291,   241, -4744, -4744,
-   -4744,  3441, -4744, -4744, -4744,  1761, -4744, -4744, -4744, -4744,
-   -4744, -4744,  3445, -4744,  3429, -4744,  3450, -4744, -4744, -4744,
-   -4744,   201,  3444,  3447,  3446,  1858, -4744, 67594,  1955, -4744,
-   71129, -4744, 71129, -4744,  1955,  3836, -4744, 67594,  1790,121493,
-   91291, 91291, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744,121493,121493,  3636, 91291,  3641,
-    3648, 42530,  1166, 91291,  3459,  3462,  1559,  3720, 91291, -4744,
-    3769,   672, -4744, -4744,  3535, -4744, 17226, -4744, -4744, -4744,
-   -4744, -4744,121493, 91291, -4744,119308, -4744,  2424, 70624, -4744,
-   -4744, -4744, 91291,  3492, 91291, -4744, 91291, 91291, 91291,  2485,
-   -4744, -4744, -4744, -4744,  1346, 70624, -4744, -4744, 91291, 91291,
-      58,  3541,  3542, 91291, -4744,   564,  3226, 11935, 91291, 91291,
-   91291,  3725, -4744, -4744, -4744, -4744,  3668, -4744, -4744, 67594,
-   -4744,  2805,  1297,  3545,  3006, -4744,  3657, -4744,  1236, -4744,
-    3592, -4744, -4744, -4744, -4744,  3781,   672,  3783,   672, 91291,
-   91291, 91291, 91291,  3597, -4744, -4744, -4744, -4744,  3599,  3713,
-   -4744, 64564, 64564, 64564,  2445, -4744, -4744,  2639, -4744, -4744,
-   -4744, -4744, -4744, -4744,  3747, -4744,  2450, -4744,  1102, -4744,
-   -4744, -4744, -4744, -4744, -4744,121493, 91291, 12387, 91291, 91291,
-   91291,  2073, -4744,  1196, 70624, -4744, 69109,121493, 91291, 91291,
-    3559,121493,  3543, -4744, -4744,  3718,  3664, -4744,  1978,  3665,
-  121493,  3550, -4744, -4744,  3574, -4744, -4744,  3584,  2366,  3006,
-    2390, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,  1435,
-     643,  2552,  3006,  3585, -4744,  3586, -4744, -4744, -4744,  3722,
-    3723,  3727,  3588,  3590,  3631,  3591,  3595,  3642, -4744,  3596,
-    3646,  3598,  3649,  3601,   672, 70624,  3700,  2639,  3640,  3824,
-     672, -4744,  3604, -4744, -4744,  3931, -4744, 91291, -4744,  3605,
-    2559,  3006, -4744, -4744,121493, 91291, -4744, -4744, -4744,  1901,
-   70624, 91291,  3778, -4744, -4744, -4744,  1901,  1901, 91291, 91291,
-    1901,  3779, -4744,  3780, 91291,  3782, -4744,  1901, -4744, -4744,
-   -4744, -4744,  2762,  3534, -4744,  2236, 54835,  5657,  3531, -4744,
-   64564, 54835,  2172,  2232,   113,  1512,119308, 91291,119308, -4744,
-     812,  3657, 91291, 91291,  3536,  3533, -4744, -4744, -4744, -4744,
-  121493,  1149,121493,  2597, -4744, -4744,  3602, -4744, 91291,  2179,
-     400,  3615,  3947,  3080,  1045,  3685,  1807,  3890,  3335, -4744,
-   -4744, -4744, -4744, 91291, 91291,   894,  2639, -4744,  3546,  3549,
-   -4744, 91291, 91291, 91291, 91291, 91291,  1961,  3548,  3552, 70624,
-     630,  3739,  3741,  3003,  3970,  3865,  1961,  3335,  3634,  3867,
-   91291, -4744,  2453,   136, -4744,  2639,119308, 68099,  3856, -4744,
-    6563, -4744, -4744,   830, 91291,  3842, -4744, 91291, -4744, -4744,
-   51787,   672, 70624,  2469, -4744, -4744, -4744,  2597, -4744, -4744,
-    1599,  1599,  3564, -4744, 51279, -4744,  3565, -4744,  2242, -4744,
-    3952, -4744, 91291, -4744,   672,   224,  3623,   672,  3626,   672,
-     672, 91291, -4744, 91291, -4744, -4744, 91291, 91291, -4744, -4744,
-   91291,120619,   672, -4744, 17226,  3872, -4744, -4744, -4744, -4744,
-    3694,  3696,  3703, 91291,  3350, 66079, -4744,  3594,121493,  1636,
-   -4744, -4744,  3773, -4744, -4744, 86251,  3697, -4744, -4744, -4744,
-   -4744,  3896,  3897, -4744, -4744, -4744,   215, -4744, -4744, -4744,
-  121493, 78691,   273,121493, -4744,  2424,  3838, -4744, -4744,  2436,
-     323, -4744,  3841, 91291,  3843, -4744, -4744, -4744,  3603, 15641,
-   42530, -4744,  3905, 70624, -4744,  5910, -4744, -4744, -4744, 42530,
-   -4744, -4744, -4744, -4744, -4744, 42530, -4744, 42530,  3885, -4744,
-   34202,  4034,  4034,  3608, 70624, 45140, 45140, 45140, 45140,  1664,
-    2877, 45140, 45140, 45140, 45140, 45140, 45140, 45140, 45140, 45140,
-   45662,   680, -4744,  3777, 42530, 42530,  3899,  3885, -4744, 70624,
-    3613,  3399,  3614,  3616, 42530, -4744, -4744,  2477, 46692,  3617,
-   64564, -4744, 42530, 13279,  2481,  3647, 16560,  1580,  6546,  2639,
-   42530,  3875,  4990, 42530,  2487, 42530,  3891, -4744, -4744, -4744,
-    3610, -4744, -4744, 70624, 42530,  3619,  3983, 45140, 45140,  4261,
-   -4744,  4971, 42530, 36788, -4744,  3791,  3644, 53819, -4744, 34725,
-    3630,  1326,  1326,  1326,  1326, -4744, 91291, 91291, 91291, 48738,
-    3900, 47722, 89779,  3632,  2475, -4744, 89779, 90283, -4744,  3633,
-   -4744,  3650,  1580, 42530,  3893,   967,   967,  3791, -4744, 42530,
-   42530, 40442,  3651, -4744,  3893, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-    3638, -4744,  3654, -4744, -4744,   194,  3652, -4744, -4744, 11705,
-     201, -4744, -4744,  3653, -4744,  3656, -4744,  3435,  1511, -4744,
-    6663,  3798, -4744, -4744, -4744,  3632, 40964,  3753, -4744,  2490,
-   -4744, -4744,  3993,  3753, -4744, -4744,  2506, 53311,  3456, 38876,
-    1580,  2597,  3658, -4744,  2566,   555, -4744, -4744, -4744, -4744,
-   -4744,  2507,  1936, -4744, -4744, 67594, -4744,  3690, -4744, -4744,
-   -4744,  2805,  2805,  1217,  3350,  3921,  1217,  7128, -4744, -4744,
-   49246, 91291, 91291, -4744, 91291,  2512,  1547, 91291, -4744, 91291,
-   -4744, -4744, -4744, -4744,  4042, -4744, 91291, -4744, -4744,  3683,
-    3688, -4744, 91291, 91291, 91291, 91291,  3873, -4744, -4744,  2429,
-   -4744, -4744,121493, 91291, -4744, -4744, -4744,   426,  2810,  3006,
-   -4744,  3708, -4744, -4744,  3903, -4744,  4030,  3730, 91291,  3660,
-   -4744,  1547,  1221,  3003,   870, -4744, -4744,  3715, -4744, 91291,
-   -4744, 91291, -4744, -4744, -4744, -4744, -4744, -4744, -4744,  3768,
-   -4744, -4744, -4744, -4744, 65069, -4744, -4744, 91291, -4744, 64564,
-   54835, 64564, -4744,  1569,   579,  2946,  3006, -4744,  3732, -4744,
-    3742,  3745,  3788,   886,  1330,  3749,  3750,  3790,  3674,  3675,
-    3676, -4744, -4744,  3818, 91291,  2805,  3679,  3716,   164,  2639,
-   -4744, -4744,  2639,  2805,  2639, 91291, 91291, 91291,  4078,  3771,
-   91291, 91291, 91291, 91291, 91291, 91291,  3979,    98,  1993,121493,
-   91291, 91291,121493, 91291, 91291, 91291, 91291, 91291, 91291, 91291,
-   -4744,  4063,  3996,   325,  4032,  3758, 91291, -4744, 91291,  3226,
-   91291, 91291, -4744, -4744, -4744,  3691,  3944,  1901, -4744, -4744,
-    3945,  3946, -4744,  1901,  1901,  3948,  1901, -4744,  1151, 64564,
-   -4744,  2974, -4744,  3287,  3656,  2597,  2417, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744,  2553, -4744, -4744, 91291,  3698, 91291,
-   91291, 45140, -4744,  1702,   244, -4744,  3949, 91291,  3736, -4744,
-   -4744, -4744,  3859, 91291, -4744, -4744, -4744, -4744, -4744,  3705,
-   -4744,  3971, 74659,  2805,121493,121493,  2805, -4744, 70624,  3709,
-    3335, -4744, -4744, -4744, -4744, -4744, -4744,121493,  3543,121493,
-    1045,  1805,102379,  3743, -4744,  3707,  4008, -4744,  3714,  3711,
-   -4744, -4744, 91291,  3657,  2527,  2390,   716,  2175,  3400, 76675,
-    2322,  3971, -4744, -4744, -4744,  4091,  3802, -4744,  1961, 91291,
-    3400,  3802,  2639, 91291,  3237, -4744, 67594, 42530, 42530, -4744,
-    3719, -4744,  3721,  7408, -4744,  3786,  3724,  2638, -4744, -4744,
-   -4744, -4744, -4744, -4744,  3795,  3726, 91291,  4165, -4744, -4744,
-   -4744,  3728, -4744,  3729, -4744, -4744, -4744,  1949,113962, 51279,
-   51279, 51279, 51279, 51279, -4744, -4744,   672, -4744, -4744, 91291,
-   -4744, 91291, -4744, -4744,   672,   672,   672,   672, -4744,  3847,
-   -4744,  1961, 91291, 91291, 91291,  3350, -4744,   323, -4744,  4011,
-  121056, -4744, -4744,  2528, 91291, -4744, -4744, -4744,  4073,   281,
-    4024, -4744, -4744,  3982,  2176,  3985,  3986,  2176,  3999,  2176,
-   -4744, 42530, 17226, -4744,  3733, -4744, 17226,  7441, 17226,  3899,
-   -4744,  2539, 42530, -4744,  4490,  4490,  4490,  1336,  4043, -4744,
-    1672,  3754,  4490,  4490,  4490,   237,   237,   161,   161,   161,
-    4034,   680, 17226, 17226, -4744, -4744,  3755, -4744, -4744, -4744,
-    3399, -4744, 43052,  3907,  4153, -4744, -4744, -4744,  3796,  3800,
-    3763, -4744, 42530, 43574,  3762, 71634,  3950, -4744,  1791, 42530,
-   42530,  5631, -4744, 10408, 42530, 70624,  2540,  5631,   394, 42530,
-    5302,  5315, 42530, 42530,  6241,  7653,  3765, 42530,111955, -4744,
-   -4744, -4744,  2555, 42530, 91291, 91291, 91291, 91291, -4744, -4744,
-   -4744, 89779, 90283,  3770, 50262,  2475,  3766, 91291, -4744, -4744,
-    3774, 48230,  4014,  3954, -4744, 48230,  3954,  1823,  3954,  4021,
-    3863, 54327, -4744, -4744,  3787,  3964, -4744, 32633,  2117, 17226,
-    4179,  4064, 42530,  3784,  3789,  3793, 17226, 17226, 42530, -4744,
-    2639,  4064,   555,   367,  2639, -4744, -4744, -4744, 57420, -4744,
-   -4744, -4744, -4744, -4744,  3978, 17226, 38354, -4744,  1961, 91291,
-    1580,    12, -4744,  3797, 91291, -4744,  3753, -4744, -4744,  9546,
-   -4744, -4744, -4744, -4744,  3855,  2565, -4744, -4744, -4744, -4744,
-   -4744,  3866, 77683,  4084, -4744, 42530,  2580, -4744,  3830,  4176,
-     120,  2587,  2590,  1547, -4744,  3736, -4744,  1822,  4062,    99,
-   -4744,   672, -4744, 70624, -4744, 91291, 91291, -4744, -4744, -4744,
-   -4744, 91291,  2962, -4744, -4744, 91291, 91291, 91291, 91291, -4744,
-  121493, 91291, -4744, 64564,  2232,  4001, -4744, -4744,  4002,   164,
-   91291, -4744, 70624,   672,   672, -4744, -4744, -4744, -4744, -4744,
-    3809,  4210,  3901, 91291, 91291, 91291, 91291,121493, 91291, 91291,
-    2597,  2597, 70624,  3812, -4744,  2597,  2597,  3817, -4744,121493,
-   91291, 91291, -4744, -4744, -4744,  3906, -4744, 42530,  4209, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744,121493, 91291,  3911,
-   -4744,  3912, -4744, -4744, -4744, 91291, 91291, 91291, 91291,  4137,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, 91291, -4744, -4744,  2639,  2639, 70624,   672,   672, -4744,
-   -4744, -4744,  4079,  1901, -4744,  1901,  1901, -4744, -4744,  1901,
-   -4744,   582,  2602, -4744,114900, -4744, -4744,  3030,  2639,  3030,
-    1987, -4744, -4744,  3030, -4744,  3030, -4744,  1547,  1655,  4128,
-    4131, 42530, -4744,  1418,  1336, -4744, -4744, -4744, -4744,  3736,
-    2179,  3904, 66079,   860, -4744,  4112,   624, 74659,  1869,  3852,
-    3960, -4744,  2805,  2805,  3908, 91291,  4262,  2805,  3716, -4744,
-     771, 91291,  4181,  3892, -4744,  2639, -4744, -4744,  3335, -4744,
-   91291, 74659,  3400, -4744,  2607, -4744, -4744, -4744,  3910,  3741,
-    2322,  1302, 91291, -4744,  3913,  4271, -4744, -4744,  4168,  4053,
-    3880, -4744, 17226, 17226,  2639, 72139,  6563, 70624,  4182, -4744,
-   91291,   111,  4144, 91291, -4744,   672, -4744, -4744,  3889,  1809,
-    1809, -4744, -4744, -4744, -4744,   672,   672, -4744, -4744, -4744,
-   -4744, 91291,  3350,  3350,  3350, -4744,  4082, -4744, -4744,  4146,
-   -4744,   672,121056,  2176, -4744, -4744, -4744,  2176,  2176, -4744,
-    2176, -4744, 17226, -4744, -4744, -4744, -4744,  7761, 45140,  4190,
-   -4744,  3914, 70624, -4744,  3915,  2610,  2634, 46184,  4051, -4744,
-   -4744, -4744,  8272,  3953, 17226,  4004,  3916,  3918,  5631,  5631,
-   10408,  2644, -4744,  5631, 42530, 42530,  5631,  5631, 42530, -4744,
-   -4744,  8723,  4081, -4744, -4744,  9401, -4744, -4744, -4744, -4744,
-   -4744, -4744, 65574, 89779,  3920, 91291,  2475, 48230, -4744, -4744,
-    1424, -4744, 48230,  4154, -4744, 48230, 66079, -4744, 91291,  3922,
-   91291, -4744,   936, 44096, 42530,  3943, -4744, -4744, -4744,  3791,
-   -4744,  3943, -4744,  2417, -4744, -4744, -4744, -4744, -4744,  3923,
-   84235,   633, -4744, -4744,  4282, 49246,  4244,  3927, -4744, -4744,
-   -4744, -4744, -4744,121056,  4113,121056,  1547,  9880,  3736, 49246,
-   58454, 91291, 90787, 90787,  4086,  3736,  3904, -4744, -4744, -4744,
-   -4744, -4744, -4744,  3929, -4744, -4744, -4744, -4744,  4009, -4744,
-   -4744,   -35,  3324,  2650, -4744, -4744, -4744, -4744, -4744,  4063,
-   -4744, -4744, 54835,121493, 91291, -4744,  4010, -4744, -4744, -4744,
-   -4744, -4744, 49754, 57420, -4744,   886,  3935,  3938,  1330, -4744,
-   -4744, -4744, 91291,  9992,  3939,   -20,  3324, 91291, 91291,  1893,
-    1107,  1771,  3350,  4239, -4744, -4744, -4744,  4063, -4744, -4744,
-    1901, -4744, -4744, -4744, -4744, -4744,  1512,  4275, -4744, 64564,
-   -4744,118434, -4744, -4744, -4744,  2639, -4744,  2639,  4145, 91291,
-   60487,  2639,  2639, 66079,  4361,  4361, 91291, -4744, 10330,  4150,
-   -4744,  3904,  4173,  4219, -4744,  3955, 91291,  4116,  3958,  3959,
-     333,   333, 91291, 91291, 91291,  2654,  1961, -4744,  1045, 74659,
-    3657, -4744,  1593,  3962,  4263, -4744,  4374,  3548,  3965, -4744,
-   -4744, 76675,  4151,  3802,  3741,  4098, -4744,  4099, -4744,   813,
-   -4744,  1961, 91291, 91291, 49246, -4744, 71129, -4744,  2658, -4744,
-   -4744, -4744,  4038,  3454,  4075,  4076,  3980, 91291,  1067, -4744,
-    3991, -4744, -4744, -4744, -4744, -4744, -4744, 91291, -4744,   273,
-   -4744, -4744, -4744, -4744, -4744,  4647, 45140, 70624,  2659, 42530,
-   -4744, 42530, -4744,  4381, -4744, -4744, -4744,   685, -4744, -4744,
-   -4744,  5631,  5631,  5631, -4744,  4382,  3791, -4744, -4744,  2662,
-    4402, -4744, 91291,  2667, -4744, 42530,  3988, -4744, -4744, 48230,
-    1424,  3989,  2684, 91291,  2692, 70624,  3992,  3990,  1124,  3995,
-   33156,  3994, -4744, -4744, -4744, -4744, -4744, 17226, 17226, 91291,
-   -4744,  3997, -4744, -4744, -4744, -4744, -4744, -4744, 91291,  2698,
-   -4744,   948, 36266, -4744, -4744,  1636,  1217,   273,  4176,  3904,
-   -4744,  4000, -4744, -4744, 91291, -4744,  1653,  1653, 91291,  3904,
-   -4744, -4744, 91291,  4077, -4744, -4744, 64564,  4055, -4744,    -7,
-    3324, 91291, 70624,  2436,   102, -4744, 70624, 70624, -4744, -4744,
-   -4744, 42530,  4087, -4744, -4744, -4744, -4744, -4744, 91291, 91291,
-   91291, 91291, 91291,   672, -4744,  3534,  2639, -4744, -4744,  2699,
-   -4744, -4744, -4744, 91291,  3707, -4744,  3707, -4744, -4744,  4361,
-     236, -4744, -4744, -4744,  1915,  4207, -4744,  1117,  4195,  4089,
-    4005, -4744, 66079,  4450,  3971, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744,  2702,  3657,  4310,  3335,  3913, -4744, -4744,
-   -4744, -4744, 42530,  4167,  1961,  2322,  3971, -4744, -4744, -4744,
-    3802, -4744, -4744,  4396,  4200,  4398,  3400, -4744,  3237,  2703,
-   -4744,  7408, 72139, 70624,  4341,  4054,  4057, -4744, -4744,  4066,
-   91291, -4744, -4744,  2526,  4460,  3657, -4744,  4647,  2706, -4744,
-    2707,  2712,  4170,  4072, -4744, 42530,  1509,  3633, 65574,  4025,
-   -4744,  2713, -4744, 17226, 91291, -4744, -4744, 42530, -4744,  2716,
-   -4744, -4744, 42530,  4028, 42530, -4744, 44096,  4029, -4744,  4439,
-   -4744, -4744,  3454, 49246, -4744,  4147, -4744,  4323, -4744, 90787,
-    4074, 57420, -4744,  3435,  3435,  2179, -4744,  1547, -4744, 91291,
-   -4744, 42530, -4744,  4120, -4744, -4744,  2717, -4744,  1266,  4189,
-    4335,  2720,  2730, 10348, 91291,  3351,  1771,  3351, -4744,  3350,
-   -4744, -4744, -4744, -4744,118434,  3707, -4744, -4744, -4744,  4363,
-    4306, -4744, -4744, -4744, -4744,   678, -4744,  4235,  4237, 91291,
-   -4744,  4046, -4744,  2734,  4164, -4744, -4744, 91291,  4464,  4465,
-   -4744, 11086, 66079,  3913,  3741,  2322,  2232, -4744,  4241, -4744,
-    4242, -4744,  4058,  3335,  6563, -4744, -4744,   882,  4349,  4352,
-   -4744, -4744, -4744, -4744, -4744, 91291, -4744, -4744, -4744, -4744,
-   -4744, -4744,  3399, 41486, 41486,  4065, -4744, -4744, 91291, -4744,
-    2735,  2743, -4744,  2748, 44096,  2758, -4744, 91291,  4067, -4744,
-   -4744, 53311,121056,  1653,  4070, -4744,  4080, -4744, -4744,  4173,
-    1547,  3324, 17226, 91291, 66079,  4452, -4744, -4744, -4744,  4189,
-   -4744, -4744, -4744,  3324, 91291, -4744,  4193, -4744,   782,   782,
-    4400, -4744,  4121, -4744, -4744,  4083, -4744,  4518, 91291, -4744,
-     886,  1961, -4744,  4085, -4744,  3802,  3741, -4744, -4744, 49246,
-    3802, -4744, -4744, -4744,  2551, 66079, 66079, -4744, 44618,  4205,
-    1091, 13903, -4744, -4744, -4744, -4744,  2759, -4744,  4220, -4744,
-    2764, -4744, -4744, -4744,  1665,   273,  3435, 42530,  1547, -4744,
-    4195, -4744,  3324,  2436, 91291, -4744, -4744, -4744,  3892, -4744,
-    4505, -4744,  1100, -4744, -4744, -4744, -4744,  3657,  3812,  3913,
-   64059, -4744,  3802,  2773,  3454, -4744,  2930, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744,  4090,  4094,  4497, -4744, -4744, -4744,
-   -4744, -4744, -4744,  4088, -4744, -4744, -4744, -4744, -4744, 11123,
-   -4744, -4744, -4744, -4744,  4390, -4744, -4744, -4744, -4744, -4744,
-    2777, -4744, -4744, -4744, -4744, -4744, -4744,  3335, -4744,  2017,
-   -4744, -4744,  2080,  2336,  4159,  4375, 42008, 42530, -4744,  1547,
-    4246, -4744, 64059,  3802, -4744,  2930,  4192,  4197, -4744, 11420,
-   66079, -4744,  3454, -4744,  4125,  4133, -4744,  4100, -4744,  4389,
-    4391, 64059, 66079, 66079,  2785, -4744, -4744, -4744
+   -4850,   383, 16026, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, 31512, -4850,
+   -4850, -4850, -4850, -4850,112620,   528, -4850, -4850, -4850,117718,
+   -4850, -4850, -4850,   798, 77340, -4850, 80364,   779, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, 84396, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, 64725,  1296, -4850,   877,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850,  1565,  8493, -4850,
+   -4850, 80868, -4850,   111, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, 81372,   408, -4850, -4850,   819,  1316, -4850,   123, 17649,
+   -4850, -4850, 73812, 78348, -4850, -4850, 84900,   539,  1615, 12352,
+    1565, 32280, 85404, -4850,  2405, -4850, 61153, -4850, -4850, -4850,
+   77844, -4850, -4850, -4850,  1036, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, 91452,  2410,   857, 61666, -4850,
+   -4850, -4850, -4850, 91452, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, 85908, -4850,  1128,  1285,   188, 91956, 92460,
+   75324, -4850,  1480, -4850, 91452,  1429,  1412, 63715, -4850, 92964,
+   -4850, -4850,  1425, -4850, 86412, -4850, -4850, -4850, -4850, -4850,
+     857, -4850, 64725, 60143,   251,  1504, -4850, -4850, 93468, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, 91452,  2040,
+    1360, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850,   408, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850,   756, -4850,   920,   761,  1659,   344,  1468, -4850,
+   -4850, -4850, 16902, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+  114123,  2324, -4850, -4850, -4850,  1756, -4850,  1652, -4850, -4850,
+   -4850,  1578, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,   746,
+   -4850, -4850, -4850, -4850,  2272,113121, 84396, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, 73308, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850,   207, -4850, -4850,
+   -4850, -4850, -4850, 84396, 84396, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, 84396,  1896, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850,   610,  2070, -4850, -4850, 64725,  1805,  1805,
+    2364,114123, -4850, -4850, -4850, 66240, 91452, 91452, 91452,  2031,
+   91452,  1952, 91452,   185, 66240,122091, 86916,  2088,  1984, 55513,
+   93972, -4850,120343, 91452, 91452, 94476, 91452,  1369, 81876, 91452,
+    2080, 91452, 91452,120780, 94980,  2214, -4850,  2470,  1562, -4850,
+   -4850, -4850, 91452, 10205,  2410, -4850, -4850, 91452,  2101, 66240,
+   91452,  2006, 91452,  2087, 91452, -4850, 91452,  2104, 95484,   566,
+    1644,122091,  1785, 56030,  2181, 91452,122091, 95988, 91452, 91452,
+   -4850, -4850,  2170, 91452, 91452, -4850,  2271,122528,  1750,  2367,
+    2441,  2396,  1003, -4850, -4850,  2580,  2137, -4850, -4850,  2608,
+   84396, -4850, 82380, -4850, -4850, -4850,  2154, -4850, -4850, -4850,
+   -4850, -4850, -4850,119469,  1615, -4850, -4850, 66745, 91452,  2435,
+   -4850, -4850, 96492, 69775,  2236, -4850,   580, 67250,122965,  2547,
+    2213, 56547,  2578, 96996,123402, 97500, -4850, -4850, 98004, -4850,
+   98508,  2307,  2435, 99012, 70280,123839, -4850,  2438, 99516, -4850,
+   12969, -4850,  2186,  2379,  2199,   960, 84396, 84396,  2436,115498,
+   -4850, -4850,   408, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850,   180,  1872, 62179,   828, 62692, -4850, -4850,   928,   952,
+    1116,   180,  2644,  2644,   783, 84396, -4850, -4850,  1872, -4850,
+     659,   736,  2209,  2209,  2209,  2421,   552, -4850,  2209,  2346,
+   -4850, -4850, -4850, -4850, 86412, 62179, 62692, -4850,  2234,  2410,
+     117,  2640,  2291, -4850, -4850, -4850, -4850, -4850,  2302, 91452,
+   91452, 91452, -4850, -4850, -4850,  2674,  2304,  2537, -4850,  2295,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,  2491,
+    2496,  2510,   128,  2410,  2404, -4850,  2616, -4850,  2518, 38515,
+   38515,   903, 84396,  2410, 63205, 87420,109596,   179,119469,  2410,
+  100020,  2355,  1354,  2532, -4850, -4850, -4850,   517, -4850,  2755,
+    2369,  2602,    33,  1562, 52964, -4850,  2370,   914, 86412,114624,
+   -4850, -4850, -4850, -4850,   252,  2649, 39037, -4850, 91452,  2356,
+   -4850,  2372,  2356,  2376,  2381,  1659, -4850, 91452,  1490,  1490,
+    2787,  1490,  1942,  2027, -4850,  1712, -4850,  2706,  2650, 86412,
+    1504,  1565,  2394, -4850, -4850, -4850,  2422, -4850,  2397,  2418,
+   -4850,   938,  2676, -4850, -4850, -4850, -4850,  2526,  2531,  2555,
+    2559,  2457,  2564,   529, -4850, -4850, -4850, -4850,  2776, -4850,
+   -4850, -4850, -4850, -4850, -4850,  2903,  2904,118158,118158,   975,
+    1072,   208,   257, -4850, -4850, -4850,  2760, -4850, -4850,  2759,
+   91452,  2600, 91452, -4850, -4850, -4850,100524, -4850, -4850,  1805,
+    2422,  2524, -4850,   246, -4850,   914, -4850,   280,   297,   317,
+    1627,  2530,  1825,  2867, -4850,   307, 91452,  2652,   254,    56,
+    2570, 87924,  5610,  2543,  2708,  1495,  2820,  2860,  5986,   529,
+   88428, -4850, -4850, -4850, -4850, 91452, 91452, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850,  2560, -4850, -4850,  2566,
+    2882,  2771,  2855,  2734,  1502,  2790,  1409,  2925,  9759,  1372,
+  101028,110100,  2887,  2930,  6715,  1834,   764,  2818,  1257,  2855,
+    2938,  2777,  1502,  2951,  7682, 91452,  2663, -4850,  2886,  2993,
+    1054, -4850,   550, -4850,  2725,  2866,  1213, 66240,  2677, -4850,
+   -4850, 91452, -4850, -4850, 70785,  2770, -4850,   584, 66240, -4850,
+    2884,  2730, 57064, 91452, -4850, 91452, -4850, -4850, -4850, -4850,
+   -4850,  2823,  3006, 91452, 70785, -4850,  2959, 91452, -4850,  2209,
+    2870,  2717,  3107, 70785,   330, 91452,  1636,  3137, 91452,  2931,
+    1636,  2763,101532, -4850, -4850,  1636, -4850, -4850, 91452, 91452,
+    2733,  1696,  2926,  1636,  2942,  3145,  3147,  2808,  2920,   971,
+    1286,   135,  3040,  1636,  2786,102036,102540, 91452,  2788, 91452,
+    3121, 66240, 91452,  3046, -4850,  2910, 88932, -4850,  2747,  2580,
+   -4850, -4850, -4850, -4850, -4850,   893, -4850, -4850, -4850, -4850,
+    3064,  2524,   428,  3065,  2758,  3068, -4850, -4850,  2805, -4850,
+    2805,  2805,  2761,  2761,  2929,  2766,  3076, -4850, -4850, -4850,
+    2408,  2805,  2761, -4850, 71795, -4850,  1869,  1877, -4850,   131,
+   -4850,  3184, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+     119, -4850,   789, -4850,  1998, -4850, -4850, -4850, -4850,  2804,
+   -4850,  3083,  2543,  3085, -4850,  2774,103044, -4850,103548,104052,
+    3087,  2560,122091,  3088,  2972,  3090,  2774,  3092,  2977,  3096,
+     428,  3098, -4850,   988,  3089,  3100,  2989,  3110,   131,  3111,
+    2144,  2774,119906,  3112,   137, -4850,  6375, 12969, -4850, 20326,
+    1806, -4850, -4850, -4850, -4850, -4850, -4850, 42691,  1115,  2894,
+   -4850, -4850, -4850,  2032, -4850,116828, -4850,  2436,  1872, -4850,
+   84396,  1872, 84396,   783,  1872, 84396,  1872, 84396,   783,  1872,
+   84396, 84396, 84396,  1872, -4850, -4850,   245,   229, -4850, -4850,
+   -4850, -4850, -4850, 84396,  2798, 91452, 91452, -4850, -4850, -4850,
+   78852,122091, 79356, -4850, 91452, -4850,   384, 84396, -4850, 84396,
+   -4850,  2410, -4850, -4850,  2379, 70785,  3222,122091,  3121, -4850,
+    2041, -4850, -4850, -4850, -4850, -4850, -4850,  3043, 91452,  3106,
+    3108, 78852,122091, -4850,104556,119469,  3002,  2812, -4850, -4850,
+   -4850, -4850,  2058,  2446,   353,  2612, 42691,  2814,   361,   361,
+    2815,  3113, -4850, -4850, -4850,   343,  2819,  2821, -4850,   369,
+     369,  2822,  2825, -4850,   377,  2826,  2829,  2667,   389,  2830,
+    2833,  2834,  2408,   361, 42691, -4850,  2835,   369,  2838,  2840,
+    2841,  2719,  2844, -4850,  2727,  2845,   200,   436,  2847,  2848,
+   -4850,  2822, -4850,   222,  2849,  2850,  2851,  2852,  2858,  2859,
+    2862,  2865, 42691, 42691, 42691, -4850, 36949,   914,  2410, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850,   419,  5548, -4850,
+    2854, -4850, -4850,  2999, -4850, -4850, 42691, -4850, -4850,    91,
+   -4850,   446, -4850, -4850,   914, -4850, -4850,   962, -4850, -4850,
+   -4850, -4850,  3074,  2857,  2105,  2105,   223, -4850, 80868, 80868,
+   -4850, -4850,  1612,  2864, -4850,  2260, -4850, -4850, -4850, -4850,
+   -4850, -4850,119032,  3270, -4850,  1289,  2410,   550,  1851,  3226,
+  115938,116383,  3124,  3124,  3109, -4850, -4850, 91452, -4850, -4850,
+   42691, 59133, -4850,   914,   127,  3125, -4850, -4850, -4850,  2069,
+   -4850, -4850, -4850,   408, -4850, 16078, -4850,  2072,  2356, 91452,
+   91452,  3290, -4850, -4850,  2372, -4850, -4850,  1659,  1659, 42691,
+    1659,  1378,  1697, 39559, 42691,  3174,  3072,  1646,  1728,  3178,
+   -4850,  3078,  1942,  2027, 86412, 91452,105060,  2997, -4850, -4850,
+    2422,  2891,  2081, -4850, 72804,113622,113622,  3140, -4850, -4850,
+    1078,   996,  3009,  3103,  2644,  1847,  1822,  1822, -4850, -4850,
+    2885, -4850,  3231, 80868,  2945,118158, -4850, -4850, 91452, -4850,
+   -4850, 89436, -4850, -4850, -4850,  2331,  2888, -4850,  2905, 91452,
+   -4850,  3408,  1822,  1822, -4850, -4850,  2895, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850,114123,  2906, 91452, -4850,  2907,
+    2908, -4850,114624, 59638,  1960,   914,  2980,  2987,  3041, 64725,
+    2912,  2994,  2998,  3049,  3153, -4850, -4850,  3001,  3003,110604,
+   -4850, -4850,  1356, -4850, -4850, -4850,  1356, -4850,  2941, -4850,
+    1280,   917,   981,  3004,   444,   934,  3301, -4850,  1471,  3059,
+   -4850, -4850, -4850,  5413, 91452,  3244,  8325,  3130,   529,  3061,
+   -4850, -4850,  3179,  3019,  3020,  3146,   529,  1226,111108, -4850,
+   -4850, -4850, -4850, -4850, -4850,  3396, 35409, -4850,  3021,  3005,
+    3032, 91452, 74316,  2083,  3141,  1849,  2210,   543,  3082, 91452,
+    1862,  3144, 91452,  2953,  3036,  3039,  3241,  2965,  1626,  3336,
+    2966, -4850, -4850,  3148,  3238,  3280,  8642,  3026,  3027, 68765,
+    1523, 57581, 91452, 91452,  3321,  1717,  3053, -4850, -4850, -4850,
+    1717, 91452,  3054,  3055, 91452,   529, -4850,  3377,   529,   529,
+    1857,  3378,  3058,   532,  1643,  1636,  2966,  1569, -4850,  3060,
+    3063,  1233, -4850,  3172, -4850, -4850,  1283,  3075, 86412,   274,
+    1979,  2966,  3069,  3071,  2965,  2965, 91452, 91452, 91452, 91452,
+   91452,   150,  3400,  3402,  3073,   161,  3127,  2984, -4850,  1717,
+  121217,  3080, -4850,  1717, 91452,  3081,  2007,  2966,  1722, -4850,
+    1473, -4850, -4850, -4850,  1562, -4850, 91452, -4850, 91452,  2524,
+   70785,  3187,  3255, -4850,  3042, -4850,  2543,   529, -4850, 91452,
+   91452,  2560,  3200,   195,  1024, 70785,  3201,  3259, 91452,  3261,
+    3051, -4850,   403, 59638, -4850,  2733,  3017,  3435, 91452, 64725,
+   -4850,  3447,  1356, -4850, 70785,  3214,  3332, -4850, 91452,  3233,
+    3025, -4850,  3372,  3086, -4850, -4850,    82, 91452, -4850,  3343,
+  122091,  1579,  2410,  3079,122091,  3262, 91452, 91452, 91452, 91452,
+   -4850, -4850,  3237,   115,   190, -4850,121217, -4850, 91452,  3243,
+    1569,  3249,  3459,   910,  2209,105564,  3342, -4850,106068,  3047,
+    3461, 70785,  3291, -4850, -4850,  3048,  2644, -4850,  2747, -4850,
+    2112, -4850,  3176, -4850, 66240,   428, -4850, -4850, -4850, -4850,
+   70785, 91452, -4850,  3052, -4850, -4850, 42691, -4850, -4850, -4850,
+    2644, -4850, 70785,  2805,  2805, -4850, -4850,  3465,  3135,  3136,
+    2644, -4850,  2644, -4850, 70785, -4850,  3084,  3091,  3181,  2644,
+   -4850,  3151, -4850,  3155,  2644, -4850,  2109, -4850,106572, 66240,
+     428,122091,122091,  3367,   137,  3379,  3122,  3380,  3123, 57581,
+     428,   158, 91452, 91452,122091, 91452, 91452, 91452, -4850, 91452,
+   -4850, -4850, -4850, -4850, 70785, 91452, 91452, 70785, -4850,122091,
+  121217,  3385,  3388,   428, 91452, 91452, -4850, -4850, 17546,  1890,
+   -4850, 12969, -4850, 16078,  2120,  3124, -4850,  1896, 91452,  1404,
+    2436,124276, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   84396, -4850, 84396,   783, -4850, -4850, 84396, -4850, 84396,   783,
+   -4850, 84396, -4850, -4850, -4850, 84396, 91452,  3592,  3093, -4850,
+     962, -4850, 91452,  2121, -4850, -4850,  2131,  1082, 91452, 91452,
+     837, 66240, 91452,  3278, 91452, 91452, 91452, 91452, 91452,  3160,
+    2864,  1435, -4850,  1414,   375, 86412,  3288, -4850, -4850, -4850,
+   -4850, -4850,  2132,  2040,  1204, 91452,  1197,  2302, -4850, -4850,
+   79356, 77844,  3384,   125, 91452, -4850, -4850,  5217, 42691, 37993,
+   -4850, -4850, 16078,  3126, 42691, 42691,  3097,  2644,  2644, -4850,
+    2695, 42691, 42691, 42691,  2644,  2644,  9069, 42691, 57581, 42691,
+   45301, 33840, 42691, 42691, 37471, -4850, 42691,  3307, 46345, 42691,
+    1851,  3312, 42691,  1851,  9069,  3538,  3538,  1504,  1345,  6207,
+    3099,   914, -4850,  2644,   922,   358, 70785, 42691, 42691, 42691,
+   42691, 64725,  3180,   169, 91452, 42691,  3104,  1464, -4850, 42691,
+   -4850,  3105, 42691,  3183,   918, 42691, 42691, 42691, 42691, 42691,
+   42691, 42691, 42691, 42691, -4850, 47361,   396, -4850,  3391,  3409,
+     984,   890, 79860, 38515,  3401, -4850, 32794, -4850,   272, 84396,
+   -4850, -4850,   914,  3401, -4850, -4850, -4850, -4850, -4850,  2331,
+    3114, -4850,  3129, -4850, -4850, -4850, -4850, -4850, 91452,  3270,
+   -4850, -4850,  3186, -4850, -4850, -4850, -4850,   462, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850,  3116, -4850, -4850, -4850,
+   -4850,  3116, -4850, -4850,  3124,  3115,  4441, -4850, -4850, -4850,
+   -4850,  3397,  3398,   428,114123, 91452,   252, 82884, -4850, 39037,
+   -4850,  2138, -4850,  3128, -4850,  3375, -4850,  3131, -4850, 12148,
+    3375, -4850, -4850,   165,  3235,  3370,  3317, -4850, -4850, -4850,
+    3132, 16078, -4850,  2218, 16078,  2228, -4850, -4850, -4850, -4850,
+   -4850, -4850,  1298, -4850, 91452,  1297,  3174,  1728,  3185,  1133,
+    3542, 91452, -4850, 53472,  2100, -4850,  2422, -4850, -4850, 19424,
+   -4850, 22745, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850,  3139, -4850, -4850, -4850, -4850, -4850,   529,  3142,  3621,
+   -4850,118158, -4850, -4850, -4850,  3592, -4850,  2608, -4850,  2608,
+    3648, -4850, 84396, -4850, -4850, -4850, -4850,   473, -4850, 12969,
+   -4850, 12969, -4850,  3320, -4850,  3531, -4850, 71795, -4850,  3150,
+   -4850, 71290, 67755, -4850, -4850,  1274, -4850,   742,  3215,  3218,
+    3263,122091, 91452, 91452, -4850, 64725,122091, 91452, 91452, -4850,
+  122091, 91452, 91452, -4850, -4850, -4850, -4850, -4850,117273,  1309,
+   77844,  3272, 75828, -4850, -4850,  3154, 91452,  3210,  3392,  3393,
+    1528, -4850, -4850,107076, -4850,  3358,122091, 91452, 91452, 42691,
+    3360, 91452, 91452, -4850,   399,  3239,  3245, -4850, 91452,  3247,
+   66240,  3161, 91452, 91452, 70785,  3236,   650, 66240,  3209, 58098,
+   91452, 91452, 91452, 91452,  3295,  3469, 70785, 91452,  3416,  1571,
+   86412,   159,  2429,  2966,  3381, -4850,  1441, -4850,122091, 91452,
+    3368, -4850, -4850, -4850, 76332,  3586,  3284, -4850, -4850,111612,
+   -4850, -4850, -4850,  2153, -4850,122091,122091, 91452,  9516, 91452,
+    1530, -4850, -4850, 70785, -4850, 91452, 91452, 91452,  3417, 91452,
+   83388,107580,108084,  1015,  1163,  3419, 91452, 83892,  3422, -4850,
+    3319, 91452, -4850, -4850, 65230,122091, 91452,   160, 64725, -4850,
+   -4850, 91452, -4850,  3386,   842, -4850, 91452,  5877,  3269,  3281,
+   91452,   182,  2460,  2966, 91452, 91452,  3192,  2176,  3274,  3324,
+   -4850,  3394,    77, 91452,109596, -4850,122091,  1077, -4850,  3344,
+  122091, 91452, 11722, -4850, -4850,   529, -4850, -4850, -4850, -4850,
+   -4850, 91452, 91452,   529, 91452,   529,  1086, -4850,122091, 91452,
+   -4850, -4850, -4850, 91452, 10224, 91452, 91452, 91452, 91452,122091,
+   91452, -4850, -4850,  1396,  1547,  1637,  1801,  3345, 91452,  3475,
+   91452,108588,122091, 91452, 91452, 91452,  1879, -4850, -4850,  3322,
+   -4850,122091,  1077, -4850, 10608, 91452, 91452,  3283,  3286,   149,
+    3359, -4850, -4850, -4850, -4850, -4850, -4850,  3452,  3627,109092,
+    1654, -4850,  3462,  3463,  3273,  3275,  3467, 91452,  1654, 91452,
+   -4850, -4850, -4850, -4850,  3470, 91452,  1654,  3471,  1654,  3413,
+     167, -4850, -4850,  1636, -4850,  2183, -4850,  3227, -4850, 42691,
+   70785, -4850,  2203, -4850,  3240,   115, -4850, -4850, 64725, 91452,
+     717,  1031,  3533, 74820,  2384,  3523, 91452,  3279, 91452,  3527,
+    2384, 91452, -4850,  3018, 77844, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850,  3526, -4850,  2410,  2733,  2733,  2733,
+    2733, -4850, -4850, -4850, -4850,  3434,  2092, -4850,  3250,  2733,
+   91452,  3366,  2384,  3251,  3563, -4850,  1569,  3564,  3569, 91452,
+   74820,  2245,  3296,  3477,  3678,  2209,  2410,  3478,  3456, -4850,
+   35918,  6284,  3457,  3512,119469, 88932, -4850,  3282,  3552,  3554,
+    3574, -4850,  2524, -4850,  3694, -4850, 42691,  2237,  3285,   131,
+   -4850, -4850,  3287,  3091,  3297,  3304,  3289,  3292, -4850,  2644,
+   50932, 91452,  3298,  1088,  3500,  3302, -4850,  3597,   428,  2543,
+   -4850,  2774, -4850, 91452, -4850, 91452, 91452, 91452, 91452,  2560,
+   -4850, -4850,  3481,   428,  2774,  3489,   428,   428, -4850,  3541,
+    3496,   428,   131,  2774,  3423,  3605,119469, -4850,   137, -4850,
+   -4850, -4850, -4850, -4850, 42691, -4850, -4850,  2209,  2112, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   84396,  2608, -4850,  2252, -4850, 91452, -4850,  3575,  3579,  3581,
+    3309,  3311,  3346, 91452,  3313, -4850,  3309,   529,  3309,  2864,
+    2864,  3309,  3311,121654,  3745,  3606, -4850,  3411,  3335,  3616,
+     651, -4850,   862,  1430,  3549, -4850, -4850, -4850, -4850, 70785,
+   -4850, -4850, -4850, -4850, -4850,122091,  3376, 91452, 91452, -4850,
+     214,  3535,  3341,121654,  3743,   428, -4850, 66240, -4850, -4850,
+   70785,  3418,  3436, 66240,  3544,  3399, -4850, -4850, -4850, -4850,
+   -4850, 70785, -4850,  3593, 91452,  2253, -4850,  1868, -4850,  1967,
+   42691,   235, -4850, 14467,  2258, 42691,  3351,  3353, -4850, -4850,
+   -4850, -4850, -4850, -4850,  3354,  3650, -4850, -4850,  2278,  2282,
+    2290,  3364,  3365,  5716,  3387, 14553,  3389,  3382, 45301, 45301,
+   36949,  2317, -4850, 45301,  3395,  3540,  2297, 13136,  3357,  3403,
+   15024, 40081, 42691, 40081, 40081, 15160,  3357,  3405,  2313, 64725,
+    3551, 15483,  2322, -4850, 42691, 64725,  5827, 42691, -4850, 42691,
+    3406, -4850, -4850,  3879,  3879,  3879,  9069, -4850,  3412, -4850,
+   45301, 45301, -4850,  2535, 36949, -4850, -4850,  3670, -4850, -4850,
+    1566, -4850,  3414, -4850, -4850,  3070, 57581, 16520, 42691,   270,
+   42691,  3104, 42691,  3458,  3879,  3879,  3879,   590,   590,   147,
+     147,   147,  2054,   890, -4850, -4850, -4850,  3415,  3421,  3426,
+    3561,  3430, 42691, -4850,  2412,  2415, 91452,  7035, 11544, 12448,
+   -4850, -4850, -4850, 48391,  3424, 42691, 42691, 42691,  3410, -4850,
+    2553, 16078,    28, -4850,  2699, -4850, -4850, -4850,  3424,  1193,
+    3648,  2331, -4850,  1562,  2644,   922,116828, -4850, -4850, -4850,
+   42691, -4850, -4850, -4850, -4850,  2372, -4850, -4850, -4850, -4850,
+   -4850, 91452,  2040, 42691, -4850, -4850,  2239,  3404, 42691,  2218,
+   -4850, -4850,  3441, -4850, 42691, -4850, -4850, -4850,  2864, -4850,
+    3623, -4850, -4850, -4850, 48391,  3437,  3448, 52456,  3594, -4850,
+   91452, -4850, 91452,   240, -4850, -4850, -4850,  3427, -4850, -4850,
+   -4850,  1949, -4850, -4850, -4850, -4850, -4850, -4850,  3428, -4850,
+    3431, -4850,  3442, -4850, -4850, -4850, -4850,   197,  3432,  3433,
+    3438,  1052, -4850, 67755,  1998, -4850, 71290, -4850, 71290, -4850,
+    1998,  3799, -4850, 67755,  1932,122091, 91452, 91452, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850,122091,122091,  3609, 91452,  3624,  3630, 42691,   275, 91452,
+    3443,  3449,  1540,  3708, 91452, -4850,  3756,   428, -4850, -4850,
+    3525, -4850, 16078, -4850, -4850, -4850, -4850, -4850,122091, 91452,
+   -4850,119469, -4850,  2524, 70785, -4850, -4850, -4850, 91452,  3482,
+   91452, -4850, 91452, 91452, 91452,  2560, -4850, -4850, -4850, -4850,
+    1029, 70785, -4850, -4850, 91452, 91452,   638,  3529,  3530, 91452,
+   -4850,   797,  3172, 11129, 91452, 91452, 91452,  3709, -4850, -4850,
+   -4850, -4850,  3656, -4850, -4850, 67755, -4850,  2774,    57,  3534,
+    2966, -4850,  3644, -4850,  1281, -4850,  3580, -4850, -4850, -4850,
+   -4850,  3768,   428,  3770,   428, 91452, 91452, 91452, 91452,  3585,
+   -4850, -4850, -4850, -4850,  3587,  3699, -4850, 64725, 64725, 64725,
+    2334, -4850, -4850,  2410, -4850, -4850, -4850, -4850, -4850, -4850,
+    3734, -4850,  2338, -4850,  1708, -4850, -4850, -4850, -4850, -4850,
+   -4850,122091, 91452, 12109, 91452, 91452, 91452,  1974, -4850,   969,
+   70785, -4850, 69270,122091, 91452, 91452,  3545,122091,  3524, -4850,
+   -4850,  3704,  3645, -4850,  1758,  3646,122091,  3536, -4850, -4850,
+    3553, -4850, -4850,  3555,  2544,  2966,  1569, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850,   942,   450,  2592,  2966,  3557,
+   -4850,  3558, -4850, -4850, -4850,  3697,  3700,  3705,  3560,  3562,
+    3612,  3566,  3567,  3613, -4850,  3568,  3618,  3571,  3622,  3572,
+     428, 70785,  3703,  2410,  3614,  3810,   428, -4850,  3588, -4850,
+   -4850,  3913, -4850, 91452, -4850,  3589,  2610,  2966, -4850, -4850,
+  122091, 91452, -4850, -4850, -4850,  1654, 70785, 91452,  3762, -4850,
+   -4850, -4850,  1654,  1654, 91452, 91452,  1654,  3763, -4850,  3764,
+   91452,  3766, -4850,  1654, -4850, -4850, -4850, -4850,  2870,  3518,
+   -4850,  2154, 54996,  6839,  3519, -4850, 64725, 54996,  2142,  1497,
+     314,  1636,119469, 91452,119469, -4850,  1031,  3644, 91452, 91452,
+    3520,  3516, -4850, -4850, -4850, -4850,122091,   792,122091,  2644,
+   -4850, -4850,  3591, -4850, 91452,  2209,   687,  3608,  3933,  3147,
+    1579,  3681,  1835,  3876,  3296, -4850, -4850, -4850, -4850, 91452,
+   91452,   115,  2410, -4850,  3547,  3539, -4850, 91452, 91452, 91452,
+   91452, 91452,  2040,  3543,  3565, 70785,    44,  3738,  3733,  2965,
+    3961,  3862,  2040,  3296,  3631,  3864, 91452, -4850,  2350,   100,
+   -4850,  2410,119469, 68260,  3853, -4850,  5869, -4850, -4850,   681,
+   91452,  3840, -4850, 91452, -4850, -4850, 51948,   428, 70785,  2359,
+   -4850, -4850, -4850,  2644, -4850, -4850,  1675,  1675,  3570, -4850,
+   51440, -4850,  3559, -4850,  2017, -4850,  3949, -4850, 91452, -4850,
+     428,   137,  3617,   428,  3619,   428,   428, 91452, -4850, 91452,
+   -4850, -4850, 91452, 91452, -4850, -4850, 91452,121217,   428, -4850,
+   16078,  3859, -4850, -4850, -4850, -4850,  3693,  3696,  3698, 91452,
+    3309, 66240, -4850,  3573,122091,  1586, -4850, -4850,  3757, -4850,
+   -4850, 86412,  3688, -4850, -4850, -4850, -4850,  3884,  3885, -4850,
+   -4850, -4850,   850, -4850, -4850, -4850,122091, 78852,   175,122091,
+   -4850,  2524,  3824, -4850, -4850,  2543,   529, -4850,  3826, 91452,
+    3827, -4850, -4850, -4850,  3582, 15625, 42691, -4850,  3897, 70785,
+   -4850,  7197, -4850, -4850, -4850, 42691, -4850, -4850, -4850, -4850,
+   -4850, 42691, -4850, 42691,  3873, -4850, 34363,  4021,  4021,  3583,
+   70785, 45301, 45301, 45301, 45301,  1664,  2838, 45301, 45301, 45301,
+   45301, 45301, 45301, 45301, 45301, 45301, 45823,   153, -4850,  3765,
+   42691, 42691,  3880,  3873, -4850, 70785,  3584,  3357,  3590,  3595,
+   42691, -4850, -4850,  2363, 46853,  3598, 64725, -4850, 42691, 13815,
+    2366,  3632, 15924,   914,  7347,  2410, 42691,  3334,  3968, 42691,
+    2375, 42691,  3882, -4850, -4850, -4850,  3600, -4850, -4850, 70785,
+   42691,  3601,  3822, 45301, 45301,  4206, -4850,  4421, 42691, 36949,
+   -4850,  3779,  3633, 53980, -4850, 34886,  3603,   857,   857,   857,
+     857, -4850, 91452, 91452, 91452, 48899,  3890, 47883, 89940,  3604,
+    1811, -4850, 89940, 90444, -4850,  3615, -4850,  3610,   914, 42691,
+    3887,   936,   936,  3779, -4850, 42691, 42691, 40603,  3607, -4850,
+    3887, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850,  3611, -4850,  3626, -4850,
+   -4850,   550,  3628, -4850, -4850, 13429,   197, -4850, -4850,  3629,
+   -4850,  3620, -4850,  3404,  1666, -4850,  7659,  3796, -4850, -4850,
+   -4850,  3604, 41125,  3748, -4850,  2389, -4850, -4850,  3983,  3748,
+   -4850, -4850,  2392, 53472,  3437, 39037,   914,  2644,  3635, -4850,
+    2608,  1193, -4850, -4850, -4850, -4850, -4850,  2403,  1943, -4850,
+   -4850, 67755, -4850,  3683, -4850, -4850, -4850,  2774,  2774,  1208,
+    3309,  3915,  1208,  7709, -4850, -4850, 49407, 91452, 91452, -4850,
+   91452,  2406,  1833, 91452, -4850, 91452, -4850, -4850, -4850, -4850,
+    4037, -4850, 91452, -4850, -4850,  3679,  3682, -4850, 91452, 91452,
+   91452, 91452,  3877, -4850, -4850,  2530, -4850, -4850,122091, 91452,
+   -4850, -4850, -4850,   260,  2647,  2966, -4850,  3710, -4850, -4850,
+    3894, -4850,  4034,  3722, 91452,  3638, -4850,  1833,   826,  2965,
+     231, -4850, -4850,  3707, -4850, 91452, -4850, 91452, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850,  3769, -4850, -4850, -4850, -4850,
+   65230, -4850, -4850, 91452, -4850, 64725, 54996, 64725, -4850,  1261,
+     293,  2714,  2966, -4850,  3718, -4850,  3721,  3725,  3775,  1218,
+     753,  3727,  3728,  3778,  3652,  3653,  3655, -4850, -4850,  3803,
+   91452,  2774,  3660,  3702,   180,  2410, -4850, -4850,  2410,  2774,
+    2410, 91452, 91452, 91452,  4060,  3749, 91452, 91452, 91452, 91452,
+   91452, 91452,  3960,   774,  2155,122091, 91452, 91452,122091, 91452,
+   91452, 91452, 91452, 91452, 91452, 91452, -4850,  4045,  3978,  2193,
+    4019,  3739, 91452, -4850, 91452,  3172, 91452, 91452, -4850, -4850,
+   -4850,  3672,  3923,  1654, -4850, -4850,  3927,  3930, -4850,  1654,
+    1654,  3932,  1654, -4850,   403, 64725, -4850,  3159, -4850,  3227,
+    3620,  1822,  1822, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+    2445, -4850, -4850, 91452,  3684, 91452, 91452, 45301, -4850,  1799,
+     203, -4850,  3931, 91452,  3720, -4850, -4850, -4850,  3846, 91452,
+   -4850, -4850, -4850, -4850, -4850,  3690, -4850,  3952, 74820,  2774,
+  122091,122091,  2774, -4850, 70785,  3691,  3296, -4850, -4850, -4850,
+   -4850, -4850, -4850,122091,  3524,122091,  1579,  1183,102540,  3723,
+   -4850,  3695,  3990, -4850,  3701,  3711, -4850, -4850, 91452,  3644,
+    2427,  1569,   944,  2199,  3376, 76836,  2245,  3952, -4850, -4850,
+   -4850,  4075,  3788, -4850,  2040, 91452,  3376,  3788,  2410, 91452,
+    3210, -4850, 67755, 42691, 42691, -4850,  3712, -4850,  3706,  6418,
+   -4850,  3772,  3713,  2733, -4850, -4850, -4850, -4850, -4850, -4850,
+    3787,  3717, 91452,  4153, -4850, -4850, -4850,  3719, -4850,  3724,
+   -4850, -4850, -4850,  2157,114123, 51440, 51440, 51440, 51440, 51440,
+   -4850, -4850,   428, -4850, -4850, 91452, -4850, 91452, -4850, -4850,
+     428,   428,   428,   428, -4850,  3829, -4850,  2040, 91452, 91452,
+   91452,  3309, -4850,   529, -4850,  4005,121654, -4850, -4850,  2434,
+   91452, -4850, -4850, -4850,  4069,   125,  4014, -4850, -4850,  3973,
+    1836,  3974,  3976,  1836,  3977,  1836, -4850, 42691, 16078, -4850,
+    3729, -4850, 16078,  8296, 16078,  3880, -4850,  2437, 42691, -4850,
+    4711,  4711,  4711,  5014,  4025, -4850,   215,  3736,  4711,  4711,
+    4711,   288,   288,   154,   154,   154,  4021,   153, 16078, 16078,
+   -4850, -4850,  3737, -4850, -4850, -4850,  3357, -4850, 43213,  3889,
+    4127, -4850, -4850, -4850,  3771,  3774,  3740, -4850, 42691, 43735,
+    3742, 71795,  3921, -4850,  1895, 42691, 42691,  1450, -4850, 17211,
+   42691, 70785,  2440,  1450,   422, 42691,  4226,  4491, 42691, 42691,
+    4532,  8402,  3741, 42691,112116, -4850, -4850, -4850,  2443, 42691,
+   91452, 91452, 91452, 91452, -4850, -4850, -4850, 89940, 90444,  3746,
+   50423,  1811,  3747, 91452, -4850, -4850,  3750, 48391,  3989,  3934,
+   -4850, 48391,  3934,  1505,  3934,  3995,  3838, 54488, -4850, -4850,
+    3753,  3939, -4850, 32794,  2025, 16078,  4157,  4036, 42691,  3759,
+    3760,  3761, 16078, 16078, 42691, -4850,  2410,  4036,  1193,   506,
+    2410, -4850, -4850, -4850, 57581, -4850, -4850, -4850, -4850, -4850,
+    3962, 16078, 38515, -4850,  2040, 91452,   914,   738, -4850,  3776,
+   91452, -4850,  3748, -4850, -4850, 12969, -4850, -4850, -4850, -4850,
+    3835,  2444, -4850, -4850, -4850, -4850, -4850,  3848, 77844,  4064,
+   -4850, 42691,  2449, -4850,  3811,  4160,   118,  2464,  2469,  1833,
+   -4850,  3720, -4850,  1813,  4042,   163, -4850,   428, -4850, 70785,
+   -4850, 91452, 91452, -4850, -4850, -4850, -4850, 91452,  2912, -4850,
+   -4850, 91452, 91452, 91452, 91452, -4850,122091, 91452, -4850, 64725,
+    1497,  3982, -4850, -4850,  3984,   180, 91452, -4850, 70785,   428,
+     428, -4850, -4850, -4850, -4850, -4850,  3793,  4183,  3871, 91452,
+   91452, 91452, 91452,122091, 91452, 91452,  2644,  2644, 70785,  3785,
+   -4850,  2644,  2644,  3786, -4850,122091, 91452, 91452, -4850, -4850,
+   -4850,  3872, -4850, 42691,  4180, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850,122091, 91452,  3874, -4850,  3875, -4850, -4850,
+   -4850, 91452, 91452, 91452, 91452,  4112, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, 91452, -4850, -4850,
+    2410,  2410, 70785,   428,   428, -4850, -4850, -4850,  4053,  1654,
+   -4850,  1654,  1654, -4850, -4850,  1654, -4850,   558,  2472, -4850,
+  115061, -4850, -4850,  3137,  2410,  3137,  1923, -4850, -4850,  3137,
+   -4850,  3137, -4850,  1833,  2013,  4095,  4099, 42691, -4850,   967,
+    5014, -4850, -4850, -4850, -4850,  3720,  2209,  3863, 66240,  1498,
+   -4850,  4080,   717, 74820,  1864,  3812,  3936, -4850,  2774,  2774,
+    3878, 91452,  4236,  2774,  3702, -4850,   951, 91452,  4145,  3866,
+   -4850,  2410, -4850, -4850,  3296, -4850, 91452, 74820,  3376, -4850,
+    2480, -4850, -4850, -4850,  3858,  3733,  2245,  1155, 91452, -4850,
+    3860,  4243, -4850, -4850,  4121,  4024,  3834, -4850, 16078, 16078,
+    2410, 72300,  5869, 70785,  4132, -4850, 91452,   284,  4098, 91452,
+   -4850,   428, -4850, -4850,  3843,  1995,  1995, -4850, -4850, -4850,
+   -4850,   428,   428, -4850, -4850, -4850, -4850, 91452,  3309,  3309,
+    3309, -4850,  4028, -4850, -4850,  4092, -4850,   428,121654,  1836,
+   -4850, -4850, -4850,  1836,  1836, -4850,  1836, -4850, 16078, -4850,
+   -4850, -4850, -4850,  8917, 45301,  4137, -4850,  3849, 70785, -4850,
+    3854,  2490,  2497, 46345,  3998, -4850, -4850, -4850,  8990,  3902,
+   16078,  3957,  3857,  3861,  1450,  1450, 17211,  2498, -4850,  1450,
+   42691, 42691,  1450,  1450, 42691, -4850, -4850,  9126,  4035, -4850,
+   -4850,  9704, -4850, -4850, -4850, -4850, -4850, -4850, 65735, 89940,
+    3865, 91452,  1811, 48391, -4850, -4850,  1683, -4850, 48391,  4110,
+   -4850, 48391, 66240, -4850, 91452,  3869, 91452, -4850,    28, 44257,
+   42691,  3916, -4850, -4850, -4850,  3779, -4850,  3916, -4850,  1822,
+   -4850, -4850, -4850, -4850, -4850,  3881, 84396,   435, -4850, -4850,
+    4246, 49407,  4209,  3886, -4850, -4850, -4850, -4850, -4850,121654,
+    4076,121654,  1833, 10210,  3720, 49407, 58615, 91452, 90948, 90948,
+    4038,  3720,  3863, -4850, -4850, -4850, -4850, -4850, -4850,  3892,
+   -4850, -4850, -4850, -4850,  3964, -4850, -4850,   648,  3288,  2501,
+   -4850, -4850, -4850, -4850, -4850,  4045, -4850, -4850, 54996,122091,
+   91452, -4850,  3965, -4850, -4850, -4850, -4850, -4850, 49915, 57581,
+   -4850,  1218,  3891,  3896,   753, -4850, -4850, -4850, 91452, 10253,
+    3898,   894,  3288, 91452, 91452,  1826,  1570,  1900,  3309,  4194,
+   -4850, -4850, -4850,  4045, -4850, -4850,  1654, -4850, -4850, -4850,
+   -4850, -4850,  1636,  4233, -4850, 64725, -4850,118595, -4850, -4850,
+   -4850,  2410, -4850,  2410,  4102, 91452, 60648,  2410,  2410, 66240,
+    4318,  4318, 91452, -4850, 10731,  4108, -4850,  3863,  4130,  4176,
+   -4850,  3910, 91452,  4071,  3914,  3912,   810,   810, 91452, 91452,
+   91452,  2512,  2040, -4850,  1579, 74820,  3644, -4850,  1778,  3919,
+    4230, -4850,  4336,  3543,  3922, -4850, -4850, 76836,  4114,  3788,
+    3733,  4051, -4850,  4056, -4850,  1496, -4850,  2040, 91452, 91452,
+   49407, -4850, 71290, -4850,  2513, -4850, -4850, -4850,  3996,  3424,
+    4031,  4033,  3937, 91452,   806, -4850,  3943, -4850, -4850, -4850,
+   -4850, -4850, -4850, 91452, -4850,   175, -4850, -4850, -4850, -4850,
+   -4850,  5077, 45301, 70785,  2519, 42691, -4850, 42691, -4850,  4331,
+   -4850, -4850, -4850,   698, -4850, -4850, -4850,  1450,  1450,  1450,
+   -4850,  4333,  3779, -4850, -4850,  2534,  4354, -4850, 91452,  2545,
+   -4850, 42691,  3940, -4850, -4850, 48391,  1683,  3942,  2562, 91452,
+    2573, 70785,  3944,  3946,   -10,  3947, 33317,  3941, -4850, -4850,
+   -4850, -4850, -4850, 16078, 16078, 91452, -4850,  3948, -4850, -4850,
+   -4850, -4850, -4850, -4850, 91452,  2577, -4850,   646, 36427, -4850,
+   -4850,  1586,  1208,   175,  4160,  3863, -4850,  3954, -4850, -4850,
+   91452, -4850,  1609,  1609, 91452,  3863, -4850, -4850, 91452,  4043,
+   -4850, -4850, 64725,  3997, -4850,   911,  3288, 91452, 70785,  2543,
+     173, -4850, 70785, 70785, -4850, -4850, -4850, 42691,  4050, -4850,
+   -4850, -4850, -4850, -4850, 91452, 91452, 91452, 91452, 91452,   428,
+   -4850,  3518,  2410, -4850, -4850,  2590, -4850, -4850, -4850, 91452,
+    3695, -4850,  3695, -4850, -4850,  4318,   286, -4850, -4850, -4850,
+    1861,  4156, -4850,   979,  4144,  4052,  3967, -4850, 66240,  4411,
+    3952, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,  2593,
+    3644,  4272,  3296,  3860, -4850, -4850, -4850, -4850, 42691,  4129,
+    2040,  2245,  3952, -4850, -4850, -4850,  3788, -4850, -4850,  4359,
+    4163,  4361,  3376, -4850,  3210,  2594, -4850,  6418, 72300, 70785,
+    4304,  4013,  4016, -4850, -4850,  4039, 91452, -4850, -4850,  2423,
+    4425,  3644, -4850,  5077,  2598, -4850,  2619,  2624,  4134,  4041,
+   -4850, 42691,  1821,  3615, 65735,  3986, -4850,  2629, -4850, 16078,
+   91452, -4850, -4850, 42691, -4850,  2633, -4850, -4850, 42691,  3987,
+   42691, -4850, 44257,  3991, -4850,  4405, -4850, -4850,  3424, 49407,
+   -4850,  4107, -4850,  4287, -4850, 90948,  4047, 57581, -4850,  3404,
+    3404,  2209, -4850,  1833, -4850, 91452, -4850, 42691, -4850,  4081,
+   -4850, -4850,  2654, -4850,   689,  4149,  4295,  2658,  2662, 11038,
+   91452,  3311,  1900,  3311, -4850,  3309, -4850, -4850, -4850, -4850,
+  118595,  3695, -4850, -4850, -4850,  4324,  4268, -4850, -4850, -4850,
+   -4850,   598, -4850,  4197,  4202, 91452, -4850,  4012, -4850,  2669,
+    4131, -4850, -4850, 91452,  4428,  4433, -4850, 11115, 66240,  3860,
+    3733,  2245,  1497, -4850,  4208, -4850,  4210, -4850,  4022,  3296,
+    5869, -4850, -4850,   852,  4314,  4315, -4850, -4850, -4850, -4850,
+   -4850, 91452, -4850, -4850, -4850, -4850, -4850, -4850,  3357, 41647,
+   41647,  4027, -4850, -4850, 91452, -4850,  2681,  2682, -4850,  2690,
+   44257,  2691, -4850, 91452,  4026, -4850, -4850, 53472,121654,  1609,
+    4029, -4850,  4046, -4850, -4850,  4130,  1833,  3288, 16078, 91452,
+   66240,  4430, -4850, -4850, -4850,  4149, -4850, -4850, -4850,  3288,
+   91452, -4850,  4164, -4850,   849,   849,  4366, -4850,  4094, -4850,
+   -4850,  4049, -4850,  4484, 91452, -4850,  1218,  2040, -4850,  4040,
+   -4850,  3788,  3733, -4850, -4850, 49407,  3788, -4850, -4850, -4850,
+    2584, 66240, 66240, -4850, 44779,  4172,  1307, 14263, -4850, -4850,
+   -4850, -4850,  2694, -4850,  4187, -4850,  2701, -4850, -4850, -4850,
+    1364,   175,  3404, 42691,  1833, -4850,  4144, -4850,  3288,  2543,
+   91452, -4850, -4850, -4850,  3866, -4850,  4475, -4850,  1143, -4850,
+   -4850, -4850, -4850,  3644,  3785,  3860, 64220, -4850,  3788,  2704,
+    3424, -4850,  1983, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+    4048,  4057,  4466, -4850, -4850, -4850, -4850, -4850, -4850,  4054,
+   -4850, -4850, -4850, -4850, -4850, 11401, -4850, -4850, -4850, -4850,
+    4365, -4850, -4850, -4850, -4850, -4850,  2705, -4850, -4850, -4850,
+   -4850, -4850, -4850,  3296, -4850,  1239, -4850, -4850,  1976,  2381,
+    4136,  4355, 42169, 42691, -4850,  1833,  4221, -4850, 64220,  3788,
+   -4850,  1983,  4167,  4168, -4850, 11480, 66240, -4850,  3424, -4850,
+    4101,  4103, -4850,  4067, -4850,  4360,  4362, 64220, 66240, 66240,
+    2712, -4850, -4850, -4850
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -2837,31 +2839,31 @@
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-    2484,     0,     2,     1,  2913,  2917,  2921,  2922,  2839,  2923,
-    2924,  2889,  2890,  2891,  2892,  2893,  2894,  2895,  2896,  2897,
-    2898,  2899,  2900,  2902,  2901,  2903,  2904,  2905,  2906,  2907,
-    2908,  2909,  2910,  2912,  2911,  2861,  2491,  2858,  2855,  2856,
-    2857,  2862,  2860,  2853,  2854,  2067,  2926,  2914,  2927,  2915,
-    2916,  2918,  2919,  2888,  2920,  2928,  2929,  2930,  2925,  2933,
-    2884,  2885,  2883,  2886,  2887,  2931,  2932,  2875,  2876,  2877,
-    2878,  2934,  2492,  2493,  2880,  2485,  2489,  2551,  2622,  2881,
-    2882,  2879,  2490,  2874,  2622,     0,  2743,  2744,  2745,     0,
-    2746,  2747,  2748,  2674,  2636,  2749,     0,     0,  2750,  2751,
-    2752,  2753,  2754,  2755,  2756,  2757,     0,  2758,  2759,  2760,
-    2761,  2621,  2762,  2763,  2764,  2765,  2598,  2604,  2727,     0,
-    2578,  2579,  2575,  2577,  2576,  2580,  2563,  1284,   578,  1368,
-    1367,     0,  2386,  1284,  2341,  2342,  2387,  2343,  2344,  2345,
-     268,     0,  1370,  2346,  2388,     0,  1284,  2389,   401,  1029,
-    2390,  2391,  2506,     0,  2347,  2348,     0,     0,     0,   578,
-    1284,     0,     0,  2349,  1496,  2350,     0,  2351,  2392,  2393,
-       0,  2352,  2353,  2394,     0,  2395,  2354,  2355,  2356,  2396,
-    2397,  2398,  2357,  2399,  2400,     0,     0,  1510,     0,  2358,
-    2401,  2359,  2360,     0,  2402,  2361,  2362,  2363,  2403,  2404,
-    2364,  2365,  2366,     0,  2367,     0,     0,     0,     0,     0,
-       0,  2405,  1284,  2368,     0,     0,  1517,     0,  2369,     0,
-    2406,  2370,     0,  2371,     0,  2407,  2372,  2373,  2374,  2375,
-    1510,  2723,  2599,     0,  1372,     0,  2376,  2408,     0,  2377,
-    2378,  2379,  2380,  2381,  2382,  2383,  2384,  2385,     0,     0,
+    2486,     0,     2,     1,  2915,  2919,  2923,  2924,  2841,  2925,
+    2926,  2891,  2892,  2893,  2894,  2895,  2896,  2897,  2898,  2899,
+    2900,  2901,  2902,  2904,  2903,  2905,  2906,  2907,  2908,  2909,
+    2910,  2911,  2912,  2914,  2913,  2863,  2493,  2860,  2857,  2858,
+    2859,  2864,  2862,  2855,  2856,  2069,  2928,  2916,  2929,  2917,
+    2918,  2920,  2921,  2890,  2922,  2930,  2931,  2932,  2927,  2935,
+    2886,  2887,  2885,  2888,  2889,  2933,  2934,  2877,  2878,  2879,
+    2880,  2936,  2494,  2495,  2882,  2487,  2491,  2553,  2624,  2883,
+    2884,  2881,  2492,  2876,  2624,     0,  2745,  2746,  2747,     0,
+    2748,  2749,  2750,  2676,  2638,  2751,     0,     0,  2752,  2753,
+    2754,  2755,  2756,  2757,  2758,  2759,     0,  2760,  2761,  2762,
+    2763,  2623,  2764,  2765,  2766,  2767,  2600,  2606,  2729,     0,
+    2580,  2581,  2577,  2579,  2578,  2582,  2565,  1286,   580,  1370,
+    1369,     0,  2388,  1286,  2343,  2344,  2389,  2345,  2346,  2347,
+     269,     0,  1372,  2348,  2390,     0,  1286,  2391,   402,  1031,
+    2392,  2393,  2508,     0,  2349,  2350,     0,     0,     0,   580,
+    1286,     0,     0,  2351,  1498,  2352,     0,  2353,  2394,  2395,
+       0,  2354,  2355,  2396,     0,  2397,  2356,  2357,  2358,  2398,
+    2399,  2400,  2359,  2401,  2402,     0,     0,  1512,     0,  2360,
+    2403,  2361,  2362,     0,  2404,  2363,  2364,  2365,  2405,  2406,
+    2366,  2367,  2368,     0,  2369,     0,     0,     0,     0,     0,
+       0,  2407,  1286,  2370,     0,     0,  1519,     0,  2371,     0,
+    2408,  2372,     0,  2373,     0,  2409,  2374,  2375,  2376,  2377,
+    1512,  2725,  2601,     0,  1374,     0,  2378,  2410,     0,  2379,
+    2380,  2381,  2382,  2383,  2384,  2385,  2386,  2387,     0,     0,
        0,    62,    63,    25,    24,    30,    29,    87,    88,    48,
       15,    76,    55,   122,   121,   123,    36,    32,    70,    21,
       23,    33,    37,    57,    49,   100,    56,    19,    54,    81,
@@ -2873,689 +2875,690 @@
      109,    71,    40,    73,    59,    85,   106,    22,   110,    16,
       17,   113,    82,   103,    99,   118,   116,   124,   101,    65,
        4,     5,    90,    20,    42,     7,    27,    26,    41,    34,
-     120,    31,  1370,    92,   104,    91,    98,    69,   102,   119,
-      67,   115,  1481,  1468,  1519,  1480,  1495,     0,  1484,  2818,
-    2819,    38,  1496,   126,   127,   132,  2488,  2540,  2541,  2542,
-    2622,  2573,  2574,  2567,  2583,  2593,  2582,  2586,  2594,  2581,
-    2600,     0,   129,   131,   133,   136,   130,   125,   128,   135,
-     140,   134,   139,   137,   138,   141,   142,   143,  2820,  1725,
-    2817,    66,  2558,  2557,     0,  2622,     0,  2850,  2082,  2083,
-    2084,  2085,  2086,  2087,  2088,  2089,  2090,  2091,  2092,  2093,
-    2094,  2095,  2096,  2097,  2098,  2099,  2100,  2101,  2102,  2103,
-    2104,  2105,  2106,  2107,  2108,  2109,  2110,  2111,  2112,  2113,
-    2114,  2115,  2116,  2117,  2118,  2119,  2120,  2121,  2122,  2123,
-    2124,  2125,  2074,  2126,  2127,  2128,  2129,  2130,  2131,  2132,
-    2133,  2134,  2135,  2136,  2137,  2138,  2139,  2140,  2141,  2142,
-    2143,  2144,  2145,  2146,  2147,  2148,  2149,  2150,  2151,  2152,
-    2153,  2154,  2155,  2156,  2157,  2158,  2159,  2160,  2161,  2162,
-    2163,  2164,  2165,  2166,  2167,  2168,  2169,  2170,  2171,  2172,
-    2173,  2174,  2175,  2176,  2177,  2178,  2179,  2180,  2181,  2182,
-    2183,  2184,  2185,  2186,  2187,  2188,  2189,  2190,  2191,  2192,
-    2193,  2194,  2195,  2196,  2197,  2198,  2199,  2200,  2201,  2202,
-    2203,  2204,  2205,  2206,  2207,  2208,  2209,  2210,  2211,  2212,
-    2213,  2214,  2215,  2216,  2217,  2218,  2219,  2220,  2221,  2222,
-    2223,  2224,  2225,  2226,  2227,  2228,  2229,  2230,  2231,  2232,
-    2233,  2234,  2235,  2236,  2237,  2240,  2238,  2239,  2241,  2242,
-    2243,  2244,  2245,  2246,  2247,  2248,  2249,  2250,  2251,  2252,
-    2253,  2254,  2255,  2256,  2257,  2258,  2259,  2260,  2261,  2262,
-    2263,  2264,  2265,  2266,  2267,  2268,  2269,  2270,  2271,  2272,
-    2273,  2274,  2275,  2276,  2277,  2278,  2279,  2280,  2075,  2281,
-    2282,  2283,  2284,  2285,  2286,  2287,  2288,  2289,  2290,  2291,
-    2292,  2293,  2294,  2295,  2296,  2297,  2298,  2299,  2300,  2301,
-    2302,  2303,  2304,  2305,  2306,  2506,  2307,  2308,  2309,  2310,
-    2311,  2312,  2313,  2314,  2315,  2316,  2317,  2318,  2319,  2320,
-    2321,  2322,  2323,  2324,  2325,  2326,  2327,  2328,  2329,  2330,
-    2331,  2332,  2333,  2334,  2335,  2336,  2337,  2338,  2339,  2340,
-    2524,  2072,  2073,  2079,  2080,  2081,  2499,  2520,  2526,  2846,
-    2525,  2078,  2673,     0,     0,  2766,  2767,  2768,  2769,  2770,
-    2771,  2821,  2822,  2823,  2824,  2825,  2827,  2826,  2635,  2793,
-    2830,  2634,  2831,  2638,  2832,  2833,  2834,  2835,  2794,  2836,
-    2637,  2828,  2790,  2639,  2632,  2633,  2791,  2741,  2742,  2045,
-    2792,  2789,  2829,  2527,  2788,  2643,  2642,  1458,  2845,  2044,
-    1459,     0,  2645,  2772,  2773,  2774,  2775,  2777,  2776,  2778,
-    2409,  2410,  2411,  2412,  2413,  2414,  2415,  2416,  2417,  2418,
-    2419,  2420,  2803,  2421,  2422,  2423,  2816,  2424,  2425,  2804,
-    2426,  2427,  2428,  2429,  2430,  2431,  2432,  2433,  2434,  2435,
-    2436,  2437,  2438,  2439,  2440,  2441,  2442,  2443,  2444,  2445,
-    2446,  2447,  2448,  2449,  2805,  2806,  2450,  2451,  2452,  2453,
-    2454,  2455,  2456,  2457,  2458,  2459,  2460,  2461,  2462,  2463,
-    2464,  2465,  2466,  2467,  2468,  2469,  2470,  2471,  2472,  2473,
-    2807,  2474,  2475,  2808,  2476,  2477,  2478,  2809,  2479,  2480,
-    2481,  2482,  2483,  2813,  2814,  2815,  2802,  2596,  2779,  2801,
-    2812,  2810,  2811,  2606,  2602,  2610,  2605,     0,     0,     0,
-       0,  2622,  1283,  1282,  1268,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   577,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2496,     0,  1294,   372,
-     371,  1369,  1350,   578,     0,  1271,   400,     0,     0,     0,
-       0,     0,     0,     0,     0,   791,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   191,     0,     0,
-     424,   423,     0,     0,     0,  1001,   429,     0,     0,     0,
-       0,     0,   566,  2505,  2500,  2510,     0,  2503,  2504,  2788,
-       0,  2937,  2238,  2536,  2537,  2935,  2292,  1460,   269,   272,
-     273,   270,   271,     0,  1111,  1112,  1114,     0,     0,  1124,
-     828,   829,     0,     0,     0,   831,     0,     0,     0,   825,
-       0,     0,     0,     0,     0,     0,   830,   822,     0,   821,
-       0,     0,  1124,     0,     0,     0,   823,     0,     0,  1272,
-       0,  2588,  2589,  2174,  1409,   430,     0,     0,  1496,     0,
-    1387,  1388,  1370,  1377,  1389,  1382,  1384,  1383,  1385,  1381,
-    1386,  2083,   939,  2097,   939,  2164,   936,   937,   939,   939,
-     939,  2255,     0,     0,   911,     0,   922,  2068,   939,  2069,
-    2846,   944,   485,   485,   485,     0,   943,   948,   485,     0,
-    1265,  1303,  2049,  1509,     0,  2097,  2164,   912,  1264,  2307,
-    1401,     0,     0,  1139,  1135,  1137,  1138,  1136,     0,     0,
-       0,  2271,  1276,   253,  2786,  2280,  2372,  2307,  2787,   252,
-     247,   248,  2781,  2782,  2784,   221,  2785,  2783,  2780,  2087,
-       0,     0,   943,     0,  1273,  1274,   897,  1516,  1514,     0,
-    2031,     0,     0,  2105,     0,  2118,  2199,   244,  2266,  2272,
-    2280,  2372,  2307,  2338,   200,   210,   205,     0,   262,  2280,
-    2372,  2307,     0,  1294,     0,  1485,  1614,  2040,     0,     0,
-    2597,  1267,  1266,  1371,     0,  1374,     0,  1575,  2251,  1489,
-    1492,  1376,  1490,  1481,     0,     0,  2487,  1365,  1513,  1513,
-       0,  1513,     0,  1473,  1481,  1476,  1480,     0,     0,     0,
-       0,  1284,     0,  2565,  2593,  2572,  2628,  2569,     0,     0,
-    2618,  2614,  2611,  2619,  2620,  2613,  2601,  1714,  1715,  1716,
-    1713,  1726,  1712,     0,  2546,  1717,  2585,  2552,     0,  2560,
-    2559,  2863,  2864,  2675,  2498,  2517,     0,     0,     0,     0,
-       0,     0,     0,  2644,  2646,  2648,  2608,  2607,  2603,     0,
-       0,     0,     0,  2733,  2734,  2732,     0,  2729,  2731,     0,
-    2628,     0,  2797,  2791,  2800,     0,  2050,  2792,  2789,  2788,
-       0,   838,     0,  1306,   988,     0,     0,     0,     0,  2044,
-       0,     0,     0,     0,     0,  2072,     0,  2173,     0,     0,
-       0,  1939,  1950,  1951,  1952,  2109,  2159,  1947,  1948,  1949,
-    1941,  1942,  1943,  1944,  1945,  1946,     0,  1109,  1940,     0,
-    2173,     0,   170,     0,   148,     0,     0,  2173,     0,     0,
-       0,     0,     0,  2173,     0,     0,     0,     0,     0,  2204,
-       0,   148,  2173,     0,     0,     0,  1288,     0,     0,     0,
-    1290,  1293,  1269,  1353,     0,  2040,     0,     0,   874,   866,
-       0,   875,   867,     0,     0,   877,     0,     0,   869,     0,
-       0,     0,     0,   878,     0,   868,   870,   880,   871,   876,
-       0,     0,     0,     0,   872,     0,     0,  1280,   485,   378,
-       0,     0,     0,     0,     0,   148,  1338,     0,  2173,   148,
-       0,     0,   428,   427,   148,   426,   425,  2109,  2159,     0,
-    1028,     0,   148,  2173,     0,   193,   649,   581,     0,     0,
-     750,  2204,   148,     0,     0,     0,     0,     0,     0,  1004,
-       0,     0,     0,   565,   578,     0,  2509,  2515,     0,  2507,
-    2676,  2938,  2936,  2631,     0,  1115,   245,   246,  1113,  2173,
-       0,   346,     0,     0,  2173,  1325,  1672,  1701,  1679,  1701,
-    1701,  1668,  1668,  2143,  1681,  2173,  1669,  1670,  1708,     0,
-    1701,  1668,  1673,     0,  1671,  1711,  1711,  1696,   346,   842,
-    1653,  1654,  1655,  1656,  1682,  1683,  1657,  1688,  1689,  1703,
-    1658,  1725,  2798,  1668,  2799,  2796,  2795,   827,     0,   826,
-    2173,     0,  2173,  2076,   184,     0,   824,  2109,  2159,  2173,
-       0,     0,  2173,     0,  2173,   176,  2173,     0,  2173,   346,
-    2173,   582,     0,     0,  2173,     0,  2173,   346,  2173,  2204,
-     178,     0,  2173,   346,   836,     0,     0,  2868,  2872,     0,
-    2870,  2865,  2587,  2641,  2640,  2539,     0,  2949,     0,  1460,
-    1379,  1394,     0,  1390,  1397,  1393,  1496,   939,   938,     0,
-     939,     0,  2958,   939,     0,   939,     0,  2958,   939,     0,
-       0,     0,   939,  2070,  2071,     0,     0,  2957,  2955,  2956,
-     913,   923,     0,   945,     0,     0,   952,   951,   950,     0,
-       0,     0,   953,     0,  1618,  1432,     0,   920,     0,   918,
-       0,  1262,  1279,     0,     0,     0,     0,  1004,  1142,     0,
-    1140,  1131,  1132,  1275,   251,   249,     0,     0,     0,     0,
-       0,     0,  1281,     0,     0,     0,     0,  2852,  2056,  1953,
-    2851,     0,  2342,  2343,  2344,  2012,     0,  2793,  2345,  2346,
-    2388,  1855,  1842,  1851,  1856,  1843,  1845,  1852,  2347,  2348,
-    2349,  2350,  2063,  2351,  2352,  2353,  2355,  2356,  2357,  1847,
-    1849,  2358,  2359,     0,  2064,  2361,  2362,  2223,  2364,  2365,
-    2367,  2368,  1853,  2370,  2371,  2372,  2373,  2374,  2375,  2062,
-       0,  1854,  2376,  2378,  2379,  2380,  2381,  2382,  2383,  2384,
-    2385,     0,     0,     0,  2037,     0,  1822,     0,  1661,  1662,
-    1684,  1685,  1663,  1690,  1691,  1664,     0,  2036,  1728,  1904,
-    1821,  1838,     0,  1827,  1828,     0,  1820,  1816,  1499,  2032,
-       0,  1817,  2052,  2013,  2066,  2065,  2846,  2021,  2055,  2053,
-    2054,  1499,  2030,     0,     0,     0,   213,     0,     0,  2722,
-     264,     0,   265,  2038,  2280,   201,   243,   215,   242,   216,
-     214,     0,  2107,   202,     0,     0,   203,     0,     0,     0,
-       0,     0,     0,     0,   258,  1270,     0,  1616,  1615,     0,
-       0,  2019,  2041,   847,     0,  1363,  1364,  1362,     0,  1359,
-    1361,  1373,  1370,  2026,  2025,  2027,     0,  1491,     0,     0,
-       0,  1471,  1470,  1376,  1511,  1512,     0,     0,     0,     0,
-       0,     0,     0,     0,  1565,  1527,  1528,  1530,  1562,  1566,
-    1574,     0,  1477,     0,     0,  1620,     0,  1576,  2486,  2628,
-    2629,     0,  2623,     0,  2622,  2622,  2616,  2615,  2612,     0,
-       0,     0,     0,     0,     0,     0,  2543,   560,  2545,   558,
-       0,     0,  2519,     0,  2523,  2521,     0,  2668,  2671,     0,
-    2669,  2670,  2672,     0,  2677,  2678,     0,     0,  2859,     0,
-       0,     0,  2659,  2647,  2654,  2656,  2658,  2657,  2666,  2662,
-    2665,  2667,  2609,  2622,  2740,     0,  2735,  2738,     0,  2730,
-       0,     0,     0,  2051,     0,     0,     0,     0,   839,     0,
-       0,     0,     0,  1314,  1315,  1316,     0,     0,  1317,  1318,
-    1306,   255,  1324,  1322,  1305,  1307,  1320,  1312,     0,     0,
-       0,     0,     0,     0,     0,  1330,     0,     0,   182,   183,
-     593,   578,     0,  2173,     0,     0,     0,     0,  1068,  1075,
-       0,     0,     0,     0,     0,     0,     0,  1069,  1067,  1070,
-     257,  1079,  1095,  1098,     0,   978,     0,     0,     0,     0,
-       0,  1194,     0,     0,  1194,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   278,   290,
-     341,     0,     0,  2173,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   146,   147,   152,     0,     0,
-       0,     0,     0,     0,   545,   557,     0,     0,     0,     0,
-       0,   554,     0,   148,   282,   538,   542,     0,     0,     0,
-     658,   657,  1328,  1327,     0,     0,     0,  1194,     0,   274,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   364,   365,     0,     0,     0,
-     152,   175,     0,     0,     0,   284,     0,  2553,     0,  1289,
-    1286,  1287,     0,  1292,     0,  1349,     0,     0,     0,     0,
-       0,   882,     0,   879,     0,     0,   873,  2109,  2159,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   403,   377,
-       0,     0,   747,     0,     0,     0,     0,     0,   758,     0,
-    1306,  1337,     0,     0,     0,   587,     0,  2173,     0,   150,
-     792,     0,   748,   429,     0,     0,   150,     0,     0,   187,
-       0,   653,     0,     0,     0,     0,     0,     0,   696,   695,
-       0,     0,     0,   749,     0,   150,     0,  2173,   541,  2173,
-       0,   485,   485,     0,     0,  1003,  1006,     0,     0,     0,
-       0,  2513,  2508,  2511,     0,  2501,  2515,  1463,  1465,  1464,
-       0,  1462,     0,   346,   344,   345,   745,  1123,     0,     0,
-    1700,  1687,  1695,  1694,     0,  1677,  1676,  1675,     0,  1674,
-       0,  1701,  1701,  1699,  1678,  1653,     0,     0,     0,  1707,
-       0,  1705,     0,   817,  1649,  1645,     0,     0,  1693,  1714,
-    1713,  1712,     0,  1659,  1668,  1665,     0,     0,   346,     0,
-       0,  2173,   346,  2173,     0,  2173,     0,     0,   346,   346,
-       0,     0,     0,     0,     0,     0,   654,     0,   835,   833,
-     832,   834,     0,     0,     0,     0,   815,     0,     0,     0,
-    2173,   346,     0,     0,   814,  2866,     0,     0,  2869,     0,
-    2590,  1963,     0,  2952,  1406,  2953,     0,     0,  1496,     0,
-     232,   233,   231,  1395,   234,  1396,  1392,  1378,     0,   931,
-       0,  2958,  2959,   916,     0,   926,     0,  2958,   914,     0,
-     927,   924,   925,     0,     0,     0,  2954,  2837,  2843,   930,
-       0,     0,   486,   488,     0,     0,  2129,  2142,     0,  2165,
-    2192,  2193,  2272,  2276,     0,  2302,  2312,     0,   954,   983,
-     949,   667,     0,     0,  1442,   921,   919,  1263,  1399,  1970,
-       0,  1496,     0,     0,     0,     0,   250,   222,     0,     0,
-       0,   985,  2271,  1278,   896,   578,     0,     0,  1825,  1826,
-    2011,     0,     0,     0,     0,     0,     0,  1824,  1978,     0,
-       0,     0,     0,     0,  1751,     0,     0,     0,  1991,     0,
-    1997,     0,     0,  1788,     0,     0,     0,     0,     0,     0,
-       0,     0,  1752,  1732,  1733,  2794,  1822,  1963,     0,  1823,
-    2059,     0,  1725,  1953,     0,  1950,  1951,  1952,     0,     0,
-       0,  2024,     0,  1961,     0,     0,  1766,  1959,  1768,     0,
-       0,     0,     0,  1947,  1948,  1949,  1941,  1942,  1943,  1944,
-    1945,  1946,  1957,  1748,     0,  2035,     0,  1906,     0,  1747,
-       0,     0,  1578,  1498,     0,  2057,  2014,     0,  2844,  2847,
-    1818,  1578,  2719,  2718,  2717,  2716,  2687,     0,  2681,  2682,
-       0,  2720,  2721,   266,   267,   263,     0,     0,   218,   217,
-       0,   240,   241,   212,   239,     0,   235,   236,   220,  1895,
-    1894,   219,   211,   208,   206,   223,   225,   226,   209,   207,
-     261,   259,     0,     0,     0,  2016,  2015,  2047,  2020,     0,
-       0,   346,  2622,  1357,     0,  1354,  2029,     0,  1493,     0,
-    2042,     0,  1366,  1488,  1487,  1520,  1521,  1021,  1486,  1545,
-    1546,  1541,     0,     0,     0,  1571,  1569,  1537,  1531,  1536,
-    1534,     0,  1538,  1728,  1564,  1475,  1525,  1526,  1529,  1474,
-       0,  1567,     0,  1445,  1565,  1530,  1429,     0,  1411,     0,
-    1621,     0,     0,  2630,  2628,  2568,  1653,  2622,  2561,  2622,
-    2617,  2549,  1719,  1720,  1721,  1722,  1723,  1724,  2550,     0,
-    2547,  1718,  2548,   559,     0,     0,     0,  2516,     0,  2497,
-    2522,  2653,  2288,  2685,     0,  2686,     0,     0,  2650,     0,
-    2660,  2663,  2661,  2664,     0,  1653,  2840,  2736,  2840,  1653,
-    1043,  1045,     0,  1044,     0,  1047,     0,  1056,     0,     0,
-    1042,  1061,     0,  1050,  1048,     0,     0,     0,     0,     0,
-       0,   840,     0,     0,     0,     0,  1313,     0,     0,  2302,
-     254,  1316,  1321,  1308,  1319,     0,     0,     0,     0,     0,
-     987,   986,     0,     0,  1008,     0,     0,     0,  1333,   474,
-       0,   343,     0,     0,     0,     0,     0,     0,     0,     0,
-     743,   740,     0,     0,   739,     0,   591,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   628,     0,  1194,     0,
-     661,     0,  1077,     0,  1076,     0,     0,     0,  1078,  1073,
-    1074,  2272,  2280,  2307,   256,  1097,     0,  1096,  1094,  1031,
-       0,  1032,     0,     0,     0,     0,     0,  2152,   292,   305,
-       0,  1193,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   328,     0,     0,   331,
-     330,     0,     0,     0,     0,     0,   335,   314,     0,   315,
-       0,     0,   334,     0,     0,     0,     0,     0,  1194,     0,
-     286,     0,     0,     0,     0,     0,     0,  1110,     0,   685,
-       0,   173,     0,   169,   172,     0,     0,     0,     0,   544,
-     556,     0,   548,   549,   546,   550,   551,     0,     0,     0,
-       0,     0,     0,   543,     0,     0,   651,   650,   656,     0,
-       0,     0,     0,     0,     0,     0,     0,  1144,  1143,     0,
-       0,     0,     0,     0,     0,   782,     0,     0,     0,     0,
-       0,     0,     0,   670,     0,   669,     0,   174,     0,     0,
-       0,     0,     0,     0,     0,   230,  1285,  1291,  1352,  2048,
-    1351,     0,     0,     0,     0,   881,     0,     0,     0,     0,
-       0,     0,     0,     0,   883,   884,   885,   886,     0,     0,
-       0,     0,     0,     0,     0,   380,   381,   148,   379,     0,
-     771,  2795,   746,     0,     0,   759,     0,   761,   764,     0,
-    1304,   447,     0,     0,   584,   628,     0,   432,   180,     0,
-       0,     0,     0,   687,   145,   191,   193,   430,     0,   192,
-     194,   196,   197,   198,   195,   199,   648,   652,     0,   580,
-       0,     0,     0,     0,     0,   697,   701,   700,   704,   702,
-       0,   698,     0,     0,  1641,     0,   168,     0,     0,   536,
-     540,     0,  2494,     0,   432,   516,   357,  2173,     0,   485,
-       0,  2173,     0,  1005,     0,     0,     0,     0,     0,     0,
-    2514,     0,     0,     0,     0,  1461,     0,  1101,     0,  1326,
-       0,     0,     0,   346,  1698,  1697,  1650,  1646,     0,     0,
-       0,     0,   843,     0,     0,     0,     0,     0,     0,     0,
-    1666,  2173,   346,     0,  1099,   185,  2077,     0,   819,     0,
-       0,     0,     0,     0,  1103,   811,     0,   346,   177,     0,
-     346,   346,   583,     0,     0,   346,   346,   179,     0,     0,
-       0,   575,   346,   837,  2867,  2873,  2871,  1408,     0,  2950,
-    2951,   485,  1465,  1380,  1391,   928,   935,   917,   934,   933,
-     915,   932,   929,  2652,     0,     0,  2842,     0,   946,     0,
-     484,     0,     0,     0,   960,   961,     0,     0,   959,   976,
-     962,     0,   964,   956,   955,   965,   966,     0,     0,   985,
-     665,     0,     0,     0,     0,  1439,     0,  1437,     0,  1619,
-    1441,  1430,  1400,     0,  1398,  1403,  1405,  1404,  1402,     0,
-     529,     0,     0,  1141,     0,     0,   943,     0,     0,   346,
-    1277,     0,   898,   899,     0,     0,     0,     0,     0,     0,
-     905,   902,   903,   904,   906,     0,   907,     0,     0,     0,
-    1974,     0,  1975,     0,     0,  2010,  2006,     0,     0,     0,
-       0,     0,  1982,  1983,  1984,  1981,  1985,  1980,     0,     0,
-    1986,  1979,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  2368,     0,     0,     0,     0,  1791,     0,     0,  1934,
-       0,  1963,  1996,     0,     0,     0,     0,     0,     0,  1963,
-    2002,     0,     0,     0,     0,  1893,     0,  1890,     0,     0,
-       0,     0,  2021,     0,     0,  2060,  1729,  1743,  1744,  1745,
-    1749,  2034,     0,  2023,     0,     0,  1730,  1757,     0,  2003,
-    1784,     0,  1789,  1772,     0,  1765,     0,  1770,  1774,  1753,
-       0,  1750,     0,  2024,  1962,     0,  1960,     0,  1740,  1741,
-    1742,  1734,  1735,  1736,  1737,  1738,  1739,  1746,  1938,  1936,
-    1937,     0,     0,     0,  1914,     0,     0,  1769,  2167,  2199,
-       0,  1510,  1510,  1510,  1497,  1508,  2033,     0,  1636,     0,
-       0,     0,     0,  1830,     0,  1967,  1519,  1965,  2050,  2849,
-    2848,  2022,  1636,     0,     0,     0,  2039,     0,     0,  1725,
-       0,   260,  1617,  2017,     0,   845,   846,   844,  1653,  1376,
-    1360,  1356,  1355,  2028,  1375,     0,  1496,     0,  1019,  1020,
-       0,  1024,     0,     0,  1539,  1572,     0,  1563,     0,  1543,
-    1544,  1535,  1573,  1443,     0,  1568,  1479,  1478,     0,  1639,
-       0,     0,  1421,  1413,     0,  1622,     0,  1578,  1447,  1449,
-    1450,     0,  2021,  2566,  2624,  2571,  2592,  2562,  2595,  1727,
-    2544,  2584,     0,  2518,  2688,  2689,     0,  2679,  2680,  2649,
-    2655,  2726,     0,  2841,     0,     0,  1046,     0,  1668,  1057,
-       0,  1041,     0,  1040,  1668,     0,  1058,     0,  1668,     0,
-       0,     0,  1222,  1146,  1198,   841,  1223,  1147,  1199,  1224,
-    1148,  1323,  1311,  1310,  1309,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   722,
-    2173,   346,  1331,  1225,     0,  1149,   342,  1332,  1200,  1336,
-     742,   741,     0,     0,  1201,     0,   592,     0,     0,   597,
-     598,   599,     0,     0,     0,   600,     0,  2109,  2159,     0,
-     605,   612,   617,   607,     0,     0,   619,   613,     0,     0,
-       0,     0,     0,     0,   625,   627,     0,     0,     0,     0,
-       0,     0,  1071,  1072,  1226,  1152,     0,  1202,  1030,     0,
-    1153,   181,     0,     0,   279,   293,   634,   722,  1196,   312,
-       0,   327,   322,   323,   321,  2173,   346,  2173,   346,     0,
-       0,     0,     0,     0,   324,   319,   320,   316,     0,     0,
-     329,  2086,  2144,  2281,     0,   638,   640,     0,   645,   332,
-    1169,   353,   352,   351,     0,   336,     0,   358,   361,   333,
-     310,   313,   311,   307,   291,     0,     0,     0,     0,     0,
-       0,     0,  2046,     0,     0,  1105,     0,     0,     0,     0,
-       0,     0,   679,   171,  1184,     0,     0,   157,     0,     0,
-       0,     0,   151,   161,     0,  1232,  1159,     0,     0,   283,
-     539,   547,   552,  1163,   555,  1212,   553,  1238,  1160,     0,
-    1194,     0,   275,     0,  1161,     0,  1206,  1234,  1186,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1339,     0,
-       0,     0,     0,     0,   346,     0,     0,     0,  1196,  2173,
-     346,  1233,     0,  1191,  1220,     0,   366,     0,  1185,     0,
-       0,   285,  1165,  1214,     0,     0,   228,   227,   229,     0,
-       0,  2142,     0,   888,   850,   887,     0,     0,     0,     0,
-       0,     0,   858,     0,     0,     0,   849,     0,   848,   402,
-     375,   376,   378,   385,   770,     0,     0,     0,     0,   760,
-       0,     0,     0,  1329,     0,   148,     0,     0,     0,   586,
-     627,   634,     0,     0,     0,   431,   435,   439,   440,   441,
-       0,     0,     0,     0,   162,   149,     0,   800,     0,   485,
-       0,   683,     0,   193,   186,     0,     0,     0,   357,   757,
-     755,   754,   756,     0,     0,     0,   775,   753,     0,  1640,
-    1642,     0,     0,     0,     0,     0,     0,   434,     0,   488,
-       0,     0,   520,     0,     0,     0,     0,   357,     0,     0,
-       0,  1035,     0,  1053,  1036,     0,     0,     0,     0,  1083,
-    1090,  1084,  1063,     0,     0,   563,  2512,  2506,  1466,  1467,
-       0,   346,     0,     0,  1667,  1680,   818,     0,  1710,  1709,
-    1711,  1711,     0,  1651,     0,  2939,  2947,  2946,     0,  1702,
-    1703,  1660,     0,   629,   346,   346,     0,   346,     0,   346,
-     346,     0,   676,     0,  1260,   655,     0,     0,   730,   816,
-       0,     0,   346,   813,  1964,     0,  2651,  2838,   947,   487,
-       0,     0,     0,     0,   958,     0,   561,   963,     0,   975,
-     970,   972,     0,   979,   664,     0,     0,  1440,  1433,  1435,
-    1434,     0,     0,  1431,  1971,   812,     0,   535,  1133,  1134,
-       0,     0,   346,     0,   980,     0,     0,   900,   901,     0,
-       0,   908,     0,     0,     0,  1515,  1972,  1973,     0,     0,
-       0,  2007,     0,     0,  1868,     0,  1844,  1846,  1858,     0,
-    1869,  1829,  1870,  1848,  1850,     0,  1954,     0,     0,  1859,
-       0,  1793,  1794,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1809,  1808,  1860,  1933,     0,     0,  1994,  1995,  1861,     0,
-       0,  2001,     0,     0,     0,  1866,  1871,     0,     0,     0,
-       0,  1877,     0,  1898,     0,     0,     0,  1819,  1964,     0,
-       0,     0,     0,     0,     0,     0,     0,  1790,  1773,  1767,
-       0,  1771,  1775,     0,     0,     0,  1761,     0,     0,  1759,
-    1785,  1755,     0,     0,  1786,     0,     0,     0,  1837,     0,
-       0,  1510,  1510,  1510,  1510,  1507,     0,     0,     0,     0,
-    2269,     0,  1600,  1577,  1579,  1587,  1600,  1605,  1839,  1634,
-    1840,     0,  2040,     0,  1548,  1519,  1519,  1519,  1836,     0,
-       0,     0,     0,  1518,  1548,  2701,  2703,  2704,  2705,  2706,
-    2707,  2709,  2710,  2712,  2713,  2714,  2702,  2708,  2711,  2715,
-    2692,  2693,     0,  2683,  2684,   204,     0,   237,   224,     0,
-    2726,  1358,  2043,     0,  1522,     0,  1955,  1024,     0,  1524,
-       0,     0,  1570,  1532,  1444,  1428,     0,  1426,  1415,     0,
-    1416,  2021,     0,  1426,  1412,  1455,     0,     0,  1639,     0,
-    1454,     0,  2626,  2554,     0,     0,  2725,  2728,  2739,  2737,
-    2564,     0,  1668,  1038,  1039,     0,  1062,     0,  1221,  1145,
-    1197,   990,   991,     0,   989,     0,     0,     0,   473,  1007,
-       0,     0,     0,   722,     0,     0,   477,     0,  1334,     0,
-    1239,  1183,   594,   595,     0,   606,     0,   615,   614,     0,
-       0,   602,     0,     0,     0,     0,     0,   601,   621,   567,
-     622,   624,     0,     0,   623,   626,   631,  1194,     0,   662,
-    1171,     0,  1218,  1065,     0,  1033,     0,     0,     0,     0,
-     447,   306,     0,     0,     0,   294,   304,     0,   338,     0,
-     309,     0,   302,   325,   317,   326,   318,   337,   339,     0,
-     642,   643,   641,   637,     0,   644,   646,     0,   355,     0,
-       0,     0,  1228,     0,  1194,     0,   287,  1167,     0,  1216,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1229,  1203,     0,     0,   684,     0,   681,     0,     0,
-     154,   153,     0,   160,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     367,   348,     0,   778,     0,     0,     0,   369,     0,     0,
-       0,     0,  1227,  1154,   851,     0,     0,     0,   852,   863,
-       0,     0,   853,     0,     0,     0,     0,   865,     0,     0,
-     374,   382,   772,     0,  2223,  1941,  1942,   768,   773,   765,
-     767,   766,   769,   722,     0,   762,   763,     0,     0,     0,
-       0,     0,   459,     0,     0,   453,     0,     0,  1090,   446,
-     449,   450,     0,     0,   587,   590,   588,   589,   620,     0,
-     466,   512,     0,   164,     0,     0,   165,   163,     0,     0,
-     357,   688,   692,   690,   689,   691,   686,     0,   679,     0,
-     189,   430,     0,     0,   579,   703,   706,   699,     0,   774,
-     776,   751,     0,   634,     0,   541,     0,  1409,   529,     0,
-     516,   512,   514,   513,   515,     0,   522,   356,     0,     0,
-     529,   522,     0,     0,  1008,  1034,     0,     0,     0,  1080,
-    1085,  1081,     0,     0,  1049,     0,  1082,     0,  1064,  1027,
-    1255,  1256,  1253,  1254,     0,     0,     0,  2529,  1457,  2538,
-    1102,     0,  1686,     0,  1706,  1704,  1647,     0,  2622,     0,
-       0,     0,     0,     0,  1652,  1692,   346,  1100,   820,     0,
-     807,     0,   809,  1104,   346,   346,   346,   346,   671,     0,
-     576,     0,     0,     0,     0,   957,   977,     0,   973,     0,
-       0,   940,   982,     0,     0,  1438,  1436,   527,     0,   985,
-       0,   941,   984,     0,     0,     0,     0,     0,     0,     0,
-    1976,     0,  2009,  2005,     0,  1841,  1977,     0,  1989,  1988,
-    1934,     0,     0,  1792,  1804,  1805,  1806,  1990,     0,  1814,
-       0,     0,  1801,  1802,  1803,  1795,  1796,  1797,  1798,  1799,
-    1800,  1807,  1999,  1998,  1992,  1993,     0,  1863,  1864,  1865,
-    2000,  1872,     0,  2100,  1899,  1876,  1892,  1891,     0,     0,
-       0,  1879,     0,     0,  1888,     0,  1935,  2061,  1731,     0,
-       0,  1758,  2004,  1776,     0,     0,     0,  1754,  1954,     0,
-       0,     0,     0,     0,  1763,     0,     0,     0,  1917,  1912,
-    1913,  1931,     0,     0,     0,     0,     0,     0,  1501,  1500,
-    1506,  1600,  1605,     0,  1481,     0,  1587,     0,  1599,  1585,
-    1598,     0,     0,  1611,  1609,     0,  1611,     0,  1611,     0,
-    1581,     0,  1601,  1583,  1598,     0,  1626,     0,  2041,  1635,
-       0,  1561,     0,     0,     0,     0,  1968,  1969,     0,  1966,
-    1831,  1561,     0,     0,     0,  2018,  2724,  1494,     0,  1523,
-    1022,  1023,  1540,  1533,     0,  1637,     0,  1427,     0,     0,
-    1418,  1424,  1410,     0,     0,  1448,  1426,  1451,  2570,     0,
-    2625,  2690,  2691,  1059,     0,     0,  1051,   996,   997,   995,
-     998,     0,     0,     0,   722,     0,     0,   493,     0,  1015,
-    1015,     0,     0,   479,   525,  1090,   725,     0,     0,     0,
-     723,   346,  1150,     0,   616,     0,     0,   611,   609,   608,
-     610,     0,   568,  1237,  1151,     0,     0,     0,     0,  1066,
-       0,     0,  1170,     0,   444,     0,   299,  1195,     0,     0,
-       0,   298,     0,   346,   346,   340,   639,   354,   359,   360,
-     363,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   801,   784,     0,     0,   802,   803,     0,
-       0,     0,  1107,  1108,  1106,     0,  1157,     0,     0,   675,
-     158,   155,   156,   159,  1181,  1164,  1213,     0,     0,     0,
-    1162,     0,  1207,  1177,  1173,     0,     0,     0,     0,     0,
-    1236,  1190,  1211,  1235,  1188,  1209,  1187,  1208,  1189,  1210,
-    1182,     0,  1644,   781,     0,     0,     0,   346,   346,   673,
-    1166,  1215,     0,     0,   854,     0,     0,   856,   857,     0,
-     860,   405,     0,   408,   415,   386,   391,  1338,     0,  1338,
-       0,   388,   392,  1338,   387,  1338,   384,   744,     0,     0,
-     721,     0,   451,     0,   457,   461,   462,   460,   452,  1090,
-     485,   524,     0,     0,   734,     0,   585,   432,   463,     0,
-       0,   436,   167,   166,     0,     0,     0,   682,   681,   193,
-       0,     0,   708,   712,   752,     0,  1643,   668,   357,   537,
-       0,   432,   529,  2495,     0,   437,   442,   443,     0,   520,
-     516,     0,     0,   526,  1302,     0,   530,   532,     0,     0,
-       0,  1037,  1054,  1055,     0,     0,  1090,     0,     0,  1089,
-       0,     0,   570,     0,  2502,   346,  1648,  2940,     0,  2941,
-    2942,  2943,  2944,  2945,   630,   346,   346,   677,  1261,  1130,
-     731,     0,   969,   968,   967,   562,     0,   971,   666,     0,
-     528,   346,     0,     0,   910,   891,   909,     0,     0,   890,
-       0,   889,  2008,  1857,  1867,  1987,  1933,  1964,     0,     0,
-    1815,     0,     0,  1862,  2377,     0,     0,     0,     0,  1896,
-    1897,  1878,     0,  2214,  1883,     0,     0,     0,  1782,  1780,
-    1777,     0,  1778,  1762,     0,     0,  1760,  1756,     0,  1787,
-    1903,     0,  1919,  1916,  1930,  1964,  1505,  1504,  1503,  1502,
-    1586,  1584,     0,  1589,  1596,     0,  1580,     0,  1610,  1606,
-       0,  1607,     0,     0,  1608,     0,     0,  1582,     0,  1596,
-       0,  1633,  1519,     0,     0,  1908,  1834,  1835,  1832,  1519,
-    2058,  1908,  2694,     0,  2697,  2695,  2696,  2700,   238,     0,
-       0,     0,  1414,  1417,     0,     0,     0,     0,  1456,  1446,
-    2627,  1052,  1060,     0,     0,     0,   475,     0,  1090,     0,
-       0,     0,  1018,  1018,     0,  1090,   524,   727,   726,   729,
-     724,   728,  1335,     0,   603,   604,   618,  1172,     0,  1219,
-    1179,     0,  1442,     0,   635,   295,   296,   297,   300,   348,
-     308,   301,     0,     0,     0,  1168,     0,  1217,  1175,  1230,
-    1155,  1204,     0,     0,   790,     0,     0,     0,     0,  1231,
-    1156,  1205,     0,     0,     0,     0,  1442,     0,     0,     0,
-       0,     0,  1344,     0,   347,   780,   779,   348,   368,  1192,
-       0,   855,   861,   862,   859,   406,   148,     0,   383,     0,
-     413,     0,   411,   410,   412,     0,   399,     0,     0,     0,
-       0,     0,     0,     0,  1121,  1121,     0,   722,     0,     0,
-     448,   524,   492,     0,   454,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   674,   188,   432,
-     634,   707,     0,     0,     0,   777,     0,   434,     0,  1407,
-     433,     0,     0,   522,   520,     0,   517,     0,   521,     0,
-    1295,     0,     0,     0,     0,  1086,     0,  1092,     0,  1048,
-    1025,  1087,     0,  1636,     0,     0,     0,     0,   574,  2528,
-    2532,  1122,  2948,   808,   810,   672,   974,     0,   981,   346,
-     892,   893,   894,   895,  1935,  1810,     0,     0,     0,     0,
-    1873,     0,  1874,  1901,  1900,  1880,  1884,     0,  1881,  1882,
-    1779,  1783,  1781,  1764,  1905,     0,  1519,  1932,  1629,     0,
-    1632,  1588,     0,     0,  1590,     0,     0,  1592,  1594,     0,
-       0,     0,     0,     0,     0,  2044,     0,  2125,  2353,  2268,
-       0,  1547,  1549,  1552,  1554,  1553,  1555,  1551,  1560,     0,
-    1483,     0,  1482,  2699,  2698,  1956,  1638,  1425,     0,     0,
-    1009,     0,     0,  1453,  1452,   975,     0,   346,  1015,   524,
-     494,  2223,   495,  1014,     0,  1016,  1021,  1021,     0,   524,
-     722,   596,     0,     0,   280,   633,     0,   350,   362,     0,
-    1442,     0,     0,     0,   797,   785,     0,     0,   804,  1158,
-     678,     0,     0,   276,  1178,  1174,  1346,  1347,     0,     0,
-       0,     0,     0,   346,   864,   385,     0,   409,   418,     0,
-     416,   389,   394,     0,   398,   396,   395,   390,   393,  1121,
-       0,  1118,  1117,   720,     0,   483,   455,     0,   503,     0,
-       0,   735,     0,     0,   512,   472,   471,   468,   467,   469,
-     470,   465,   464,     0,   634,   794,   357,  1302,   647,   709,
-     710,   705,     0,     0,     0,   516,   512,   438,   447,   421,
-     522,   518,   519,     0,     0,     0,   529,  1348,  1008,     0,
-    1091,     0,     0,     0,     0,     0,     0,  1125,   569,     0,
-       0,   573,   564,     0,  2530,   634,   942,  1811,     0,  1812,
-       0,     0,     0,  1886,  1885,     0,  1922,  1634,     0,     0,
-    1628,     0,  1597,  1613,     0,  1593,  1591,     0,  1602,     0,
-    1604,  1831,     0,     0,     0,  1556,     0,  1907,  1909,     0,
-    1833,  1423,  1636,     0,  1420,     0,   992,     0,   993,  1018,
-     498,     0,  1017,  1024,  1024,   485,   722,   476,  1180,     0,
-     636,     0,   303,     0,   288,  1176,     0,   788,     0,   799,
-     797,     0,     0,     0,     0,  1340,     0,  1341,  1342,  1345,
-     370,   373,   404,   414,     0,   397,  1116,  1120,  1119,     0,
-       0,   456,   489,   490,   491,     0,   458,   499,   500,     0,
-     732,     0,   737,     0,     0,   511,   659,     0,     0,     0,
-    1296,     0,     0,  1302,   520,   516,   445,   419,     0,  1299,
-       0,   531,     0,   357,  1090,  1093,  1088,  1259,     0,     0,
-     572,   571,  2533,  2535,  2534,     0,   663,  1813,  1889,  1875,
-    1902,  1887,  1918,     0,     0,     0,  1627,  1630,     0,  1595,
-       0,     0,  1603,     0,     0,     0,  1550,     0,     0,  1422,
-    1010,     0,     0,  1021,     0,   722,     0,  1012,  1011,   492,
-     478,  1442,   349,     0,     0,     0,   795,   798,   786,   799,
-     806,   805,   680,  1442,     0,   417,     0,   482,     0,     0,
-       0,   501,     0,   502,   523,     0,   736,     0,     0,   793,
-       0,     0,   711,     0,  1297,   522,   520,  1300,  1301,     0,
-     522,  1026,  1258,  1257,  1496,     0,     0,  2531,  2341,     0,
-    2314,     0,  1920,  1923,  1921,  1915,     0,  1612,  1625,  1558,
-       0,  1557,  1910,  1911,  1636,   346,  1024,     0,   480,   496,
-     503,   281,  1442,     0,     0,   787,   277,  1343,   712,   508,
-       0,   507,     0,   505,   504,   733,   738,   634,   783,  1302,
-     715,   422,   522,     0,  1636,  1241,  1496,  1240,  1242,  1250,
-    1247,  1249,  1248,  1246,  1128,  1129,     0,  1927,  1926,  1925,
-    1929,  1928,  1631,     0,  1623,  1559,  1419,   994,  1013,     0,
-     722,   289,   789,   796,     0,   506,   510,   509,   660,  1298,
-       0,   713,   716,   719,   717,   718,   420,   357,   999,     0,
-    1251,  1245,  1481,  1468,     0,     0,     0,     0,   497,   481,
-       0,   693,     0,   522,  1243,  1496,     0,     0,  1924,     0,
-       0,   714,  1636,  1244,     0,     0,  1624,     0,  1000,     0,
-       0,   715,     0,     0,     0,  1126,  1127,   694
+     120,    31,  1372,    92,   104,    91,    98,    69,   102,   119,
+      67,   115,  1483,  1470,  1521,  1482,  1497,     0,  1486,  2820,
+    2821,    38,  1498,   126,   127,   132,  2490,  2542,  2543,  2544,
+    2624,  2575,  2576,  2569,  2585,  2595,  2584,  2588,  2596,  2583,
+    2602,     0,   129,   131,   133,   136,   130,   125,   128,   135,
+     140,   134,   139,   137,   138,   141,   142,   143,  2822,  1727,
+    2819,    66,  2560,  2559,     0,  2624,     0,  2852,  2084,  2085,
+    2086,  2087,  2088,  2089,  2090,  2091,  2092,  2093,  2094,  2095,
+    2096,  2097,  2098,  2099,  2100,  2101,  2102,  2103,  2104,  2105,
+    2106,  2107,  2108,  2109,  2110,  2111,  2112,  2113,  2114,  2115,
+    2116,  2117,  2118,  2119,  2120,  2121,  2122,  2123,  2124,  2125,
+    2126,  2127,  2076,  2128,  2129,  2130,  2131,  2132,  2133,  2134,
+    2135,  2136,  2137,  2138,  2139,  2140,  2141,  2142,  2143,  2144,
+    2145,  2146,  2147,  2148,  2149,  2150,  2151,  2152,  2153,  2154,
+    2155,  2156,  2157,  2158,  2159,  2160,  2161,  2162,  2163,  2164,
+    2165,  2166,  2167,  2168,  2169,  2170,  2171,  2172,  2173,  2174,
+    2175,  2176,  2177,  2178,  2179,  2180,  2181,  2182,  2183,  2184,
+    2185,  2186,  2187,  2188,  2189,  2190,  2191,  2192,  2193,  2194,
+    2195,  2196,  2197,  2198,  2199,  2200,  2201,  2202,  2203,  2204,
+    2205,  2206,  2207,  2208,  2209,  2210,  2211,  2212,  2213,  2214,
+    2215,  2216,  2217,  2218,  2219,  2220,  2221,  2222,  2223,  2224,
+    2225,  2226,  2227,  2228,  2229,  2230,  2231,  2232,  2233,  2234,
+    2235,  2236,  2237,  2238,  2239,  2242,  2240,  2241,  2243,  2244,
+    2245,  2246,  2247,  2248,  2249,  2250,  2251,  2252,  2253,  2254,
+    2255,  2256,  2257,  2258,  2259,  2260,  2261,  2262,  2263,  2264,
+    2265,  2266,  2267,  2268,  2269,  2270,  2271,  2272,  2273,  2274,
+    2275,  2276,  2277,  2278,  2279,  2280,  2281,  2282,  2077,  2283,
+    2284,  2285,  2286,  2287,  2288,  2289,  2290,  2291,  2292,  2293,
+    2294,  2295,  2296,  2297,  2298,  2299,  2300,  2301,  2302,  2303,
+    2304,  2305,  2306,  2307,  2308,  2508,  2309,  2310,  2311,  2312,
+    2313,  2314,  2315,  2316,  2317,  2318,  2319,  2320,  2321,  2322,
+    2323,  2324,  2325,  2326,  2327,  2328,  2329,  2330,  2331,  2332,
+    2333,  2334,  2335,  2336,  2337,  2338,  2339,  2340,  2341,  2342,
+    2526,  2074,  2075,  2081,  2082,  2083,  2501,  2522,  2528,  2848,
+    2527,  2080,  2675,     0,     0,  2768,  2769,  2770,  2771,  2772,
+    2773,  2823,  2824,  2825,  2826,  2827,  2829,  2828,  2637,  2795,
+    2832,  2636,  2833,  2640,  2834,  2835,  2836,  2837,  2796,  2838,
+    2639,  2830,  2792,  2641,  2634,  2635,  2793,  2743,  2744,  2047,
+    2794,  2791,  2831,  2529,  2790,  2645,  2644,  1460,  2847,  2046,
+    1461,     0,  2647,  2774,  2775,  2776,  2777,  2779,  2778,  2780,
+    2411,  2412,  2413,  2414,  2415,  2416,  2417,  2418,  2419,  2420,
+    2421,  2422,  2805,  2423,  2424,  2425,  2818,  2426,  2427,  2806,
+    2428,  2429,  2430,  2431,  2432,  2433,  2434,  2435,  2436,  2437,
+    2438,  2439,  2440,  2441,  2442,  2443,  2444,  2445,  2446,  2447,
+    2448,  2449,  2450,  2451,  2807,  2808,  2452,  2453,  2454,  2455,
+    2456,  2457,  2458,  2459,  2460,  2461,  2462,  2463,  2464,  2465,
+    2466,  2467,  2468,  2469,  2470,  2471,  2472,  2473,  2474,  2475,
+    2809,  2476,  2477,  2810,  2478,  2479,  2480,  2811,  2481,  2482,
+    2483,  2484,  2485,  2815,  2816,  2817,  2804,  2598,  2781,  2803,
+    2814,  2812,  2813,  2608,  2604,  2612,  2607,     0,     0,     0,
+       0,  2624,  1285,  1284,  1270,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   579,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2498,     0,  1296,   373,
+     372,  1371,  1352,   580,     0,  1273,   401,     0,     0,     0,
+       0,     0,     0,     0,     0,   793,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   192,     0,     0,
+     425,   424,     0,     0,     0,  1003,   430,     0,     0,     0,
+       0,     0,   568,  2507,  2502,  2512,     0,  2505,  2506,  2790,
+       0,  2939,  2240,  2538,  2539,  2937,  2294,  1462,   270,   273,
+     274,   271,   272,     0,  1113,  1114,  1116,     0,     0,  1126,
+     830,   831,     0,     0,     0,   833,     0,     0,     0,   827,
+       0,     0,     0,     0,     0,     0,   832,   824,     0,   823,
+       0,     0,  1126,     0,     0,     0,   825,     0,     0,  1274,
+       0,  2590,  2591,  2176,  1411,   431,     0,     0,  1498,     0,
+    1389,  1390,  1372,  1379,  1391,  1384,  1386,  1385,  1387,  1383,
+    1388,  2085,   941,  2099,   941,  2166,   938,   939,   941,   941,
+     941,  2257,     0,     0,   913,     0,   924,  2070,   941,  2071,
+    2848,   946,   486,   486,   486,     0,   945,   950,   486,     0,
+    1267,  1305,  2051,  1511,     0,  2099,  2166,   914,  1266,  2309,
+    1403,     0,     0,  1141,  1137,  1139,  1140,  1138,     0,     0,
+       0,  2273,  1278,   254,  2788,  2282,  2374,  2309,  2789,   253,
+     248,   249,  2783,  2784,  2786,   222,  2787,  2785,  2782,  2089,
+       0,     0,   945,     0,  1275,  1276,   899,  1518,  1516,     0,
+    2033,     0,     0,  2107,     0,  2120,  2201,   245,  2268,  2274,
+    2282,  2374,  2309,  2340,   201,   211,   206,     0,   263,  2282,
+    2374,  2309,     0,  1296,     0,  1487,  1616,  2042,     0,     0,
+    2599,  1269,  1268,  1373,     0,  1376,     0,  1577,  2253,  1491,
+    1494,  1378,  1492,  1483,     0,     0,  2489,  1367,  1515,  1515,
+       0,  1515,     0,  1475,  1483,  1478,  1482,     0,     0,     0,
+       0,  1286,     0,  2567,  2595,  2574,  2630,  2571,     0,     0,
+    2620,  2616,  2613,  2621,  2622,  2615,  2603,  1716,  1717,  1718,
+    1715,  1728,  1714,     0,  2548,  1719,  2587,  2554,     0,  2562,
+    2561,  2865,  2866,  2677,  2500,  2519,     0,     0,     0,     0,
+       0,     0,     0,  2646,  2648,  2650,  2610,  2609,  2605,     0,
+       0,     0,     0,  2735,  2736,  2734,     0,  2731,  2733,     0,
+    2630,     0,  2799,  2793,  2802,     0,  2052,  2794,  2791,  2790,
+       0,   840,     0,  1308,   990,     0,     0,     0,     0,  2046,
+       0,     0,     0,     0,     0,  2074,     0,  2175,     0,     0,
+       0,  1941,  1952,  1953,  1954,  2111,  2161,  1949,  1950,  1951,
+    1943,  1944,  1945,  1946,  1947,  1948,     0,  1111,  1942,     0,
+    2175,     0,   170,     0,   148,     0,     0,  2175,     0,     0,
+       0,     0,     0,  2175,     0,     0,     0,     0,     0,   170,
+    2206,     0,   148,  2175,     0,     0,     0,  1290,     0,     0,
+       0,  1292,  1295,  1271,  1355,     0,  2042,     0,     0,   876,
+     868,     0,   877,   869,     0,     0,   879,     0,     0,   871,
+       0,     0,     0,     0,   880,     0,   870,   872,   882,   873,
+     878,     0,     0,     0,     0,   874,     0,     0,  1282,   486,
+     379,     0,     0,     0,     0,     0,   148,  1340,     0,  2175,
+     148,     0,     0,   429,   428,   148,   427,   426,  2111,  2161,
+       0,  1030,     0,   148,  2175,     0,   194,   651,   583,     0,
+       0,   752,  2206,   148,     0,     0,     0,     0,     0,     0,
+    1006,     0,     0,     0,   567,   580,     0,  2511,  2517,     0,
+    2509,  2678,  2940,  2938,  2633,     0,  1117,   246,   247,  1115,
+    2175,     0,   347,     0,     0,  2175,  1327,  1674,  1703,  1681,
+    1703,  1703,  1670,  1670,  2145,  1683,  2175,  1671,  1672,  1710,
+       0,  1703,  1670,  1675,     0,  1673,  1713,  1713,  1698,   347,
+     844,  1655,  1656,  1657,  1658,  1684,  1685,  1659,  1690,  1691,
+    1705,  1660,  1727,  2800,  1670,  2801,  2798,  2797,   829,     0,
+     828,  2175,     0,  2175,  2078,   185,     0,   826,  2111,  2161,
+    2175,     0,     0,  2175,     0,  2175,   177,  2175,     0,  2175,
+     347,  2175,   584,     0,     0,  2175,     0,  2175,   347,  2175,
+    2206,   179,     0,  2175,   347,   838,     0,     0,  2870,  2874,
+       0,  2872,  2867,  2589,  2643,  2642,  2541,     0,  2951,     0,
+    1462,  1381,  1396,     0,  1392,  1399,  1395,  1498,   941,   940,
+       0,   941,     0,  2960,   941,     0,   941,     0,  2960,   941,
+       0,     0,     0,   941,  2072,  2073,     0,     0,  2959,  2957,
+    2958,   915,   925,     0,   947,     0,     0,   954,   953,   952,
+       0,     0,     0,   955,     0,  1620,  1434,     0,   922,     0,
+     920,     0,  1264,  1281,     0,     0,     0,     0,  1006,  1144,
+       0,  1142,  1133,  1134,  1277,   252,   250,     0,     0,     0,
+       0,     0,     0,  1283,     0,     0,     0,     0,  2854,  2058,
+    1955,  2853,     0,  2344,  2345,  2346,  2014,     0,  2795,  2347,
+    2348,  2390,  1857,  1844,  1853,  1858,  1845,  1847,  1854,  2349,
+    2350,  2351,  2352,  2065,  2353,  2354,  2355,  2357,  2358,  2359,
+    1849,  1851,  2360,  2361,     0,  2066,  2363,  2364,  2225,  2366,
+    2367,  2369,  2370,  1855,  2372,  2373,  2374,  2375,  2376,  2377,
+    2064,     0,  1856,  2378,  2380,  2381,  2382,  2383,  2384,  2385,
+    2386,  2387,     0,     0,     0,  2039,     0,  1824,     0,  1663,
+    1664,  1686,  1687,  1665,  1692,  1693,  1666,     0,  2038,  1730,
+    1906,  1823,  1840,     0,  1829,  1830,     0,  1822,  1818,  1501,
+    2034,     0,  1819,  2054,  2015,  2068,  2067,  2848,  2023,  2057,
+    2055,  2056,  1501,  2032,     0,     0,     0,   214,     0,     0,
+    2724,   265,     0,   266,  2040,  2282,   202,   244,   216,   243,
+     217,   215,     0,  2109,   203,     0,     0,   204,     0,     0,
+       0,     0,     0,     0,     0,   259,  1272,     0,  1618,  1617,
+       0,     0,  2021,  2043,   849,     0,  1365,  1366,  1364,     0,
+    1361,  1363,  1375,  1372,  2028,  2027,  2029,     0,  1493,     0,
+       0,     0,  1473,  1472,  1378,  1513,  1514,     0,     0,     0,
+       0,     0,     0,     0,     0,  1567,  1529,  1530,  1532,  1564,
+    1568,  1576,     0,  1479,     0,     0,  1622,     0,  1578,  2488,
+    2630,  2631,     0,  2625,     0,  2624,  2624,  2618,  2617,  2614,
+       0,     0,     0,     0,     0,     0,     0,     0,  2545,   562,
+    2547,   559,     0,     0,  2521,     0,  2525,  2523,     0,  2670,
+    2673,     0,  2671,  2672,  2674,     0,  2679,  2680,     0,     0,
+    2861,     0,     0,     0,  2661,  2649,  2656,  2658,  2660,  2659,
+    2668,  2664,  2667,  2669,  2611,  2624,  2742,     0,  2737,  2740,
+       0,  2732,     0,     0,     0,  2053,     0,     0,     0,     0,
+     841,     0,     0,     0,     0,  1316,  1317,  1318,     0,     0,
+    1319,  1320,  1308,   256,  1326,  1324,  1307,  1309,  1322,  1314,
+       0,     0,     0,     0,     0,     0,     0,  1332,     0,     0,
+     183,   184,   595,   580,     0,  2175,     0,     0,     0,     0,
+    1070,  1077,     0,     0,     0,     0,     0,     0,     0,  1071,
+    1069,  1072,   258,  1081,  1097,  1100,     0,   980,     0,     0,
+       0,     0,     0,  1196,     0,     0,  1196,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     279,   291,   342,     0,     0,  2175,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   146,   147,   152,
+       0,     0,     0,     0,     0,     0,   546,   558,     0,     0,
+       0,     0,     0,   555,     0,   148,   283,   539,   543,     0,
+       0,     0,   660,   659,  1330,  1329,     0,     0,     0,  1196,
+       0,   275,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   365,   366,     0,
+       0,     0,   152,     0,     0,     0,     0,   285,     0,  2555,
+       0,  1291,  1288,  1289,     0,  1294,     0,  1351,     0,     0,
+       0,     0,     0,   884,     0,   881,     0,     0,   875,  2111,
+    2161,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     404,   378,     0,     0,   749,     0,     0,     0,     0,     0,
+     760,     0,  1308,  1339,     0,     0,     0,   589,     0,  2175,
+       0,   150,   794,     0,   750,   430,     0,     0,   150,     0,
+       0,   188,     0,   655,     0,     0,     0,     0,     0,     0,
+     698,   697,     0,     0,     0,   751,     0,   150,     0,  2175,
+     542,  2175,     0,   486,   486,     0,     0,  1005,  1008,     0,
+       0,     0,     0,  2515,  2510,  2513,     0,  2503,  2517,  1465,
+    1467,  1466,     0,  1464,     0,   347,   345,   346,   747,  1125,
+       0,     0,  1702,  1689,  1697,  1696,     0,  1679,  1678,  1677,
+       0,  1676,     0,  1703,  1703,  1701,  1680,  1655,     0,     0,
+       0,  1709,     0,  1707,     0,   819,  1651,  1647,     0,     0,
+    1695,  1716,  1715,  1714,     0,  1661,  1670,  1667,     0,     0,
+     347,     0,     0,  2175,   347,  2175,     0,  2175,     0,     0,
+     347,   347,     0,     0,     0,     0,     0,     0,   656,     0,
+     837,   835,   834,   836,     0,     0,     0,     0,   817,     0,
+       0,     0,  2175,   347,     0,     0,   816,  2868,     0,     0,
+    2871,     0,  2592,  1965,     0,  2954,  1408,  2955,     0,     0,
+    1498,     0,   233,   234,   232,  1397,   235,  1398,  1394,  1380,
+       0,   933,     0,  2960,  2961,   918,     0,   928,     0,  2960,
+     916,     0,   929,   926,   927,     0,     0,     0,  2956,  2839,
+    2845,   932,     0,     0,   487,   489,     0,     0,  2131,  2144,
+       0,  2167,  2194,  2195,  2274,  2278,     0,  2304,  2314,     0,
+     956,   985,   951,   669,     0,     0,  1444,   923,   921,  1265,
+    1401,  1972,     0,  1498,     0,     0,     0,     0,   251,   223,
+       0,     0,     0,   987,  2273,  1280,   898,   580,     0,     0,
+    1827,  1828,  2013,     0,     0,     0,     0,     0,     0,  1826,
+    1980,     0,     0,     0,     0,     0,  1753,     0,     0,     0,
+    1993,     0,  1999,     0,     0,  1790,     0,     0,     0,     0,
+       0,     0,     0,     0,  1754,  1734,  1735,  2796,  1824,  1965,
+       0,  1825,  2061,     0,  1727,  1955,     0,  1952,  1953,  1954,
+       0,     0,     0,  2026,     0,  1963,     0,     0,  1768,  1961,
+    1770,     0,     0,     0,     0,  1949,  1950,  1951,  1943,  1944,
+    1945,  1946,  1947,  1948,  1959,  1750,     0,  2037,     0,  1908,
+       0,  1749,     0,     0,  1580,  1500,     0,  2059,  2016,     0,
+    2846,  2849,  1820,  1580,  2721,  2720,  2719,  2718,  2689,     0,
+    2683,  2684,     0,  2722,  2723,   267,   268,   264,     0,     0,
+     219,   218,     0,   241,   242,   213,   240,     0,   236,   237,
+     221,  1897,  1896,   220,   212,   209,   207,   224,   226,   227,
+     210,   208,   262,   260,     0,     0,     0,  2018,  2017,  2049,
+    2022,     0,     0,   347,  2624,  1359,     0,  1356,  2031,     0,
+    1495,     0,  2044,     0,  1368,  1490,  1489,  1522,  1523,  1023,
+    1488,  1547,  1548,  1543,     0,     0,     0,  1573,  1571,  1539,
+    1533,  1538,  1536,     0,  1540,  1730,  1566,  1477,  1527,  1528,
+    1531,  1476,     0,  1569,     0,  1447,  1567,  1532,  1431,     0,
+    1413,     0,  1623,     0,     0,  2632,  2630,  2570,  1655,  2624,
+    2563,  2624,  2619,  2551,  1721,  1722,  1723,  1724,  1725,  1726,
+    2552,     0,  2549,  1720,  2550,   560,   561,     0,     0,     0,
+    2518,     0,  2499,  2524,  2655,  2290,  2687,     0,  2688,     0,
+       0,  2652,     0,  2662,  2665,  2663,  2666,     0,  1655,  2842,
+    2738,  2842,  1655,  1045,  1047,     0,  1046,     0,  1049,     0,
+    1058,     0,     0,  1044,  1063,     0,  1052,  1050,     0,     0,
+       0,     0,     0,     0,   842,     0,     0,     0,     0,  1315,
+       0,     0,  2304,   255,  1318,  1323,  1310,  1321,     0,     0,
+       0,     0,     0,   989,   988,     0,     0,  1010,     0,     0,
+       0,  1335,   475,     0,   344,     0,     0,     0,     0,     0,
+       0,     0,     0,   745,   742,     0,     0,   741,     0,   593,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   630,
+       0,  1196,     0,   663,     0,  1079,     0,  1078,     0,     0,
+       0,  1080,  1075,  1076,  2274,  2282,  2309,   257,  1099,     0,
+    1098,  1096,  1033,     0,  1034,     0,     0,     0,     0,     0,
+    2154,   293,   306,     0,  1195,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   329,
+       0,     0,   332,   331,     0,     0,     0,     0,     0,   336,
+     315,     0,   316,     0,     0,   335,     0,     0,     0,     0,
+       0,  1196,     0,   287,     0,     0,     0,     0,     0,     0,
+    1112,     0,   687,     0,     0,   173,     0,   169,   172,     0,
+       0,     0,     0,   545,   557,     0,   549,   550,   547,   551,
+     552,     0,     0,     0,     0,     0,     0,   544,     0,     0,
+     653,   652,   658,     0,     0,     0,     0,     0,     0,     0,
+       0,  1146,  1145,     0,     0,     0,     0,     0,     0,   784,
+       0,     0,     0,     0,     0,     0,     0,   176,   672,     0,
+     671,     0,   174,   175,     0,     0,     0,     0,     0,     0,
+       0,   231,  1287,  1293,  1354,  2050,  1353,     0,     0,     0,
+       0,   883,     0,     0,     0,     0,     0,     0,     0,     0,
+     885,   886,   887,   888,     0,     0,     0,     0,     0,     0,
+       0,   381,   382,   148,   380,     0,   773,  2797,   748,     0,
+       0,   761,     0,   763,   766,     0,  1306,   448,     0,     0,
+     586,   630,     0,   433,   181,     0,     0,     0,     0,   689,
+     145,   192,   194,   431,     0,   193,   195,   197,   198,   199,
+     196,   200,   650,   654,     0,   582,     0,     0,     0,     0,
+       0,   699,   703,   702,   706,   704,     0,   700,     0,     0,
+    1643,     0,   168,     0,     0,   537,   541,     0,  2496,     0,
+     433,   517,   358,  2175,     0,   486,     0,  2175,     0,  1007,
+       0,     0,     0,     0,     0,     0,  2516,     0,     0,     0,
+       0,  1463,     0,  1103,     0,  1328,     0,     0,     0,   347,
+    1700,  1699,  1652,  1648,     0,     0,     0,     0,   845,     0,
+       0,     0,     0,     0,     0,     0,  1668,  2175,   347,     0,
+    1101,   186,  2079,     0,   821,     0,     0,     0,     0,     0,
+    1105,   813,     0,   347,   178,     0,   347,   347,   585,     0,
+       0,   347,   347,   180,     0,     0,     0,   577,   347,   839,
+    2869,  2875,  2873,  1410,     0,  2952,  2953,   486,  1467,  1382,
+    1393,   930,   937,   919,   936,   935,   917,   934,   931,  2654,
+       0,     0,  2844,     0,   948,     0,   485,     0,     0,     0,
+     962,   963,     0,     0,   961,   978,   964,     0,   966,   958,
+     957,   967,   968,     0,     0,   987,   667,     0,     0,     0,
+       0,  1441,     0,  1439,     0,  1621,  1443,  1432,  1402,     0,
+    1400,  1405,  1407,  1406,  1404,     0,   530,     0,     0,  1143,
+       0,     0,   945,     0,     0,   347,  1279,     0,   900,   901,
+       0,     0,     0,     0,     0,     0,   907,   904,   905,   906,
+     908,     0,   909,     0,     0,     0,  1976,     0,  1977,     0,
+       0,  2012,  2008,     0,     0,     0,     0,     0,  1984,  1985,
+    1986,  1983,  1987,  1982,     0,     0,  1988,  1981,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2370,     0,     0,
+       0,     0,  1793,     0,     0,  1936,     0,  1965,  1998,     0,
+       0,     0,     0,     0,     0,  1965,  2004,     0,     0,     0,
+       0,  1895,     0,  1892,     0,     0,     0,     0,  2023,     0,
+       0,  2062,  1731,  1745,  1746,  1747,  1751,  2036,     0,  2025,
+       0,     0,  1732,  1759,     0,  2005,  1786,     0,  1791,  1774,
+       0,  1767,     0,  1772,  1776,  1755,     0,  1752,     0,  2026,
+    1964,     0,  1962,     0,  1742,  1743,  1744,  1736,  1737,  1738,
+    1739,  1740,  1741,  1748,  1940,  1938,  1939,     0,     0,     0,
+    1916,     0,     0,  1771,  2169,  2201,     0,  1512,  1512,  1512,
+    1499,  1510,  2035,     0,  1638,     0,     0,     0,     0,  1832,
+       0,  1969,  1521,  1967,  2052,  2851,  2850,  2024,  1638,     0,
+       0,     0,  2041,     0,     0,  1727,     0,   261,  1619,  2019,
+       0,   847,   848,   846,  1655,  1378,  1362,  1358,  1357,  2030,
+    1377,     0,  1498,     0,  1021,  1022,     0,  1026,     0,     0,
+    1541,  1574,     0,  1565,     0,  1545,  1546,  1537,  1575,  1445,
+       0,  1570,  1481,  1480,     0,  1641,     0,     0,  1423,  1415,
+       0,  1624,     0,  1580,  1449,  1451,  1452,     0,  2023,  2568,
+    2626,  2573,  2594,  2564,  2597,  1729,  2546,  2586,     0,  2520,
+    2690,  2691,     0,  2681,  2682,  2651,  2657,  2728,     0,  2843,
+       0,     0,  1048,     0,  1670,  1059,     0,  1043,     0,  1042,
+    1670,     0,  1060,     0,  1670,     0,     0,     0,  1224,  1148,
+    1200,   843,  1225,  1149,  1201,  1226,  1150,  1325,  1313,  1312,
+    1311,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   724,  2175,   347,  1333,  1227,
+       0,  1151,   343,  1334,  1202,  1338,   744,   743,     0,     0,
+    1203,     0,   594,     0,     0,   599,   600,   601,     0,     0,
+       0,   602,     0,  2111,  2161,     0,   607,   614,   619,   609,
+       0,     0,   621,   615,     0,     0,     0,     0,     0,     0,
+     627,   629,     0,     0,     0,     0,     0,     0,  1073,  1074,
+    1228,  1154,     0,  1204,  1032,     0,  1155,   182,     0,     0,
+     280,   294,   636,   724,  1198,   313,     0,   328,   323,   324,
+     322,  2175,   347,  2175,   347,     0,     0,     0,     0,     0,
+     325,   320,   321,   317,     0,     0,   330,  2088,  2146,  2283,
+       0,   640,   642,     0,   647,   333,  1171,   354,   353,   352,
+       0,   337,     0,   359,   362,   334,   311,   314,   312,   308,
+     292,     0,     0,     0,     0,     0,     0,     0,  2048,     0,
+       0,  1107,     0,     0,     0,     0,     0,     0,   681,   171,
+    1186,     0,     0,   157,     0,     0,     0,     0,   151,   161,
+       0,  1234,  1161,     0,     0,   284,   540,   548,   553,  1165,
+     556,  1214,   554,  1240,  1162,     0,  1196,     0,   276,     0,
+    1163,     0,  1208,  1236,  1188,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1341,     0,     0,     0,     0,     0,
+     347,     0,     0,     0,  1198,  2175,   347,  1235,     0,  1193,
+    1222,     0,   367,     0,  1187,     0,     0,   286,  1167,  1216,
+       0,     0,   229,   228,   230,     0,     0,  2144,     0,   890,
+     852,   889,     0,     0,     0,     0,     0,     0,   860,     0,
+       0,     0,   851,     0,   850,   403,   376,   377,   379,   386,
+     772,     0,     0,     0,     0,   762,     0,     0,     0,  1331,
+       0,   148,     0,     0,     0,   588,   629,   636,     0,     0,
+       0,   432,   436,   440,   441,   442,     0,     0,     0,     0,
+     162,   149,     0,   802,     0,   486,     0,   685,     0,   194,
+     187,     0,     0,     0,   358,   759,   757,   756,   758,     0,
+       0,     0,   777,   755,     0,  1642,  1644,     0,     0,     0,
+       0,     0,     0,   435,     0,   489,     0,     0,   521,     0,
+       0,     0,     0,   358,     0,     0,     0,  1037,     0,  1055,
+    1038,     0,     0,     0,     0,  1085,  1092,  1086,  1065,     0,
+       0,   565,  2514,  2508,  1468,  1469,     0,   347,     0,     0,
+    1669,  1682,   820,     0,  1712,  1711,  1713,  1713,     0,  1653,
+       0,  2941,  2949,  2948,     0,  1704,  1705,  1662,     0,   631,
+     347,   347,     0,   347,     0,   347,   347,     0,   678,     0,
+    1262,   657,     0,     0,   732,   818,     0,     0,   347,   815,
+    1966,     0,  2653,  2840,   949,   488,     0,     0,     0,     0,
+     960,     0,   563,   965,     0,   977,   972,   974,     0,   981,
+     666,     0,     0,  1442,  1435,  1437,  1436,     0,     0,  1433,
+    1973,   814,     0,   536,  1135,  1136,     0,     0,   347,     0,
+     982,     0,     0,   902,   903,     0,     0,   910,     0,     0,
+       0,  1517,  1974,  1975,     0,     0,     0,  2009,     0,     0,
+    1870,     0,  1846,  1848,  1860,     0,  1871,  1831,  1872,  1850,
+    1852,     0,  1956,     0,     0,  1861,     0,  1795,  1796,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1811,  1810,  1862,  1935,
+       0,     0,  1996,  1997,  1863,     0,     0,  2003,     0,     0,
+       0,  1868,  1873,     0,     0,     0,     0,  1879,     0,  1900,
+       0,     0,     0,  1821,  1966,     0,     0,     0,     0,     0,
+       0,     0,     0,  1792,  1775,  1769,     0,  1773,  1777,     0,
+       0,     0,  1763,     0,     0,  1761,  1787,  1757,     0,     0,
+    1788,     0,     0,     0,  1839,     0,     0,  1512,  1512,  1512,
+    1512,  1509,     0,     0,     0,     0,  2271,     0,  1602,  1579,
+    1581,  1589,  1602,  1607,  1841,  1636,  1842,     0,  2042,     0,
+    1550,  1521,  1521,  1521,  1838,     0,     0,     0,     0,  1520,
+    1550,  2703,  2705,  2706,  2707,  2708,  2709,  2711,  2712,  2714,
+    2715,  2716,  2704,  2710,  2713,  2717,  2694,  2695,     0,  2685,
+    2686,   205,     0,   238,   225,     0,  2728,  1360,  2045,     0,
+    1524,     0,  1957,  1026,     0,  1526,     0,     0,  1572,  1534,
+    1446,  1430,     0,  1428,  1417,     0,  1418,  2023,     0,  1428,
+    1414,  1457,     0,     0,  1641,     0,  1456,     0,  2628,  2556,
+       0,     0,  2727,  2730,  2741,  2739,  2566,     0,  1670,  1040,
+    1041,     0,  1064,     0,  1223,  1147,  1199,   992,   993,     0,
+     991,     0,     0,     0,   474,  1009,     0,     0,     0,   724,
+       0,     0,   478,     0,  1336,     0,  1241,  1185,   596,   597,
+       0,   608,     0,   617,   616,     0,     0,   604,     0,     0,
+       0,     0,     0,   603,   623,   569,   624,   626,     0,     0,
+     625,   628,   633,  1196,     0,   664,  1173,     0,  1220,  1067,
+       0,  1035,     0,     0,     0,     0,   448,   307,     0,     0,
+       0,   295,   305,     0,   339,     0,   310,     0,   303,   326,
+     318,   327,   319,   338,   340,     0,   644,   645,   643,   639,
+       0,   646,   648,     0,   356,     0,     0,     0,  1230,     0,
+    1196,     0,   288,  1169,     0,  1218,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1231,  1205,     0,
+       0,   686,     0,   683,     0,     0,   154,   153,     0,   160,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   368,   349,     0,   780,
+       0,     0,     0,   370,     0,     0,     0,     0,  1229,  1156,
+     853,     0,     0,     0,   854,   865,     0,     0,   855,     0,
+       0,     0,     0,   867,     0,     0,   375,   383,   774,     0,
+    2225,  1943,  1944,   770,   775,   767,   769,   768,   771,   724,
+       0,   764,   765,     0,     0,     0,     0,     0,   460,     0,
+       0,   454,     0,     0,  1092,   447,   450,   451,     0,     0,
+     589,   592,   590,   591,   622,     0,   467,   513,     0,   164,
+       0,     0,   165,   163,     0,     0,   358,   690,   694,   692,
+     691,   693,   688,     0,   681,     0,   190,   431,     0,     0,
+     581,   705,   708,   701,     0,   776,   778,   753,     0,   636,
+       0,   542,     0,  1411,   530,     0,   517,   513,   515,   514,
+     516,     0,   523,   357,     0,     0,   530,   523,     0,     0,
+    1010,  1036,     0,     0,     0,  1082,  1087,  1083,     0,     0,
+    1051,     0,  1084,     0,  1066,  1029,  1257,  1258,  1255,  1256,
+       0,     0,     0,  2531,  1459,  2540,  1104,     0,  1688,     0,
+    1708,  1706,  1649,     0,  2624,     0,     0,     0,     0,     0,
+    1654,  1694,   347,  1102,   822,     0,   809,     0,   811,  1106,
+     347,   347,   347,   347,   673,     0,   578,     0,     0,     0,
+       0,   959,   979,     0,   975,     0,     0,   942,   984,     0,
+       0,  1440,  1438,   528,     0,   987,     0,   943,   986,     0,
+       0,     0,     0,     0,     0,     0,  1978,     0,  2011,  2007,
+       0,  1843,  1979,     0,  1991,  1990,  1936,     0,     0,  1794,
+    1806,  1807,  1808,  1992,     0,  1816,     0,     0,  1803,  1804,
+    1805,  1797,  1798,  1799,  1800,  1801,  1802,  1809,  2001,  2000,
+    1994,  1995,     0,  1865,  1866,  1867,  2002,  1874,     0,  2102,
+    1901,  1878,  1894,  1893,     0,     0,     0,  1881,     0,     0,
+    1890,     0,  1937,  2063,  1733,     0,     0,  1760,  2006,  1778,
+       0,     0,     0,  1756,  1956,     0,     0,     0,     0,     0,
+    1765,     0,     0,     0,  1919,  1914,  1915,  1933,     0,     0,
+       0,     0,     0,     0,  1503,  1502,  1508,  1602,  1607,     0,
+    1483,     0,  1589,     0,  1601,  1587,  1600,     0,     0,  1613,
+    1611,     0,  1613,     0,  1613,     0,  1583,     0,  1603,  1585,
+    1600,     0,  1628,     0,  2043,  1637,     0,  1563,     0,     0,
+       0,     0,  1970,  1971,     0,  1968,  1833,  1563,     0,     0,
+       0,  2020,  2726,  1496,     0,  1525,  1024,  1025,  1542,  1535,
+       0,  1639,     0,  1429,     0,     0,  1420,  1426,  1412,     0,
+       0,  1450,  1428,  1453,  2572,     0,  2627,  2692,  2693,  1061,
+       0,     0,  1053,   998,   999,   997,  1000,     0,     0,     0,
+     724,     0,     0,   494,     0,  1017,  1017,     0,     0,   480,
+     526,  1092,   727,     0,     0,     0,   725,   347,  1152,     0,
+     618,     0,     0,   613,   611,   610,   612,     0,   570,  1239,
+    1153,     0,     0,     0,     0,  1068,     0,     0,  1172,     0,
+     445,     0,   300,  1197,     0,     0,     0,   299,     0,   347,
+     347,   341,   641,   355,   360,   361,   364,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   803,
+     786,     0,     0,   804,   805,     0,     0,     0,  1109,  1110,
+    1108,     0,  1159,     0,     0,   677,   158,   155,   156,   159,
+    1183,  1166,  1215,     0,     0,     0,  1164,     0,  1209,  1179,
+    1175,     0,     0,     0,     0,     0,  1238,  1192,  1213,  1237,
+    1190,  1211,  1189,  1210,  1191,  1212,  1184,     0,  1646,   783,
+       0,     0,     0,   347,   347,   675,  1168,  1217,     0,     0,
+     856,     0,     0,   858,   859,     0,   862,   406,     0,   409,
+     416,   387,   392,  1340,     0,  1340,     0,   389,   393,  1340,
+     388,  1340,   385,   746,     0,     0,   723,     0,   452,     0,
+     458,   462,   463,   461,   453,  1092,   486,   525,     0,     0,
+     736,     0,   587,   433,   464,     0,     0,   437,   167,   166,
+       0,     0,     0,   684,   683,   194,     0,     0,   710,   714,
+     754,     0,  1645,   670,   358,   538,     0,   433,   530,  2497,
+       0,   438,   443,   444,     0,   521,   517,     0,     0,   527,
+    1304,     0,   531,   533,     0,     0,     0,  1039,  1056,  1057,
+       0,     0,  1092,     0,     0,  1091,     0,     0,   572,     0,
+    2504,   347,  1650,  2942,     0,  2943,  2944,  2945,  2946,  2947,
+     632,   347,   347,   679,  1263,  1132,   733,     0,   971,   970,
+     969,   564,     0,   973,   668,     0,   529,   347,     0,     0,
+     912,   893,   911,     0,     0,   892,     0,   891,  2010,  1859,
+    1869,  1989,  1935,  1966,     0,     0,  1817,     0,     0,  1864,
+    2379,     0,     0,     0,     0,  1898,  1899,  1880,     0,  2216,
+    1885,     0,     0,     0,  1784,  1782,  1779,     0,  1780,  1764,
+       0,     0,  1762,  1758,     0,  1789,  1905,     0,  1921,  1918,
+    1932,  1966,  1507,  1506,  1505,  1504,  1588,  1586,     0,  1591,
+    1598,     0,  1582,     0,  1612,  1608,     0,  1609,     0,     0,
+    1610,     0,     0,  1584,     0,  1598,     0,  1635,  1521,     0,
+       0,  1910,  1836,  1837,  1834,  1521,  2060,  1910,  2696,     0,
+    2699,  2697,  2698,  2702,   239,     0,     0,     0,  1416,  1419,
+       0,     0,     0,     0,  1458,  1448,  2629,  1054,  1062,     0,
+       0,     0,   476,     0,  1092,     0,     0,     0,  1020,  1020,
+       0,  1092,   525,   729,   728,   731,   726,   730,  1337,     0,
+     605,   606,   620,  1174,     0,  1221,  1181,     0,  1444,     0,
+     637,   296,   297,   298,   301,   349,   309,   302,     0,     0,
+       0,  1170,     0,  1219,  1177,  1232,  1157,  1206,     0,     0,
+     792,     0,     0,     0,     0,  1233,  1158,  1207,     0,     0,
+       0,     0,  1444,     0,     0,     0,     0,     0,  1346,     0,
+     348,   782,   781,   349,   369,  1194,     0,   857,   863,   864,
+     861,   407,   148,     0,   384,     0,   414,     0,   412,   411,
+     413,     0,   400,     0,     0,     0,     0,     0,     0,     0,
+    1123,  1123,     0,   724,     0,     0,   449,   525,   493,     0,
+     455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   676,   189,   433,   636,   709,     0,     0,
+       0,   779,     0,   435,     0,  1409,   434,     0,     0,   523,
+     521,     0,   518,     0,   522,     0,  1297,     0,     0,     0,
+       0,  1088,     0,  1094,     0,  1050,  1027,  1089,     0,  1638,
+       0,     0,     0,     0,   576,  2530,  2534,  1124,  2950,   810,
+     812,   674,   976,     0,   983,   347,   894,   895,   896,   897,
+    1937,  1812,     0,     0,     0,     0,  1875,     0,  1876,  1903,
+    1902,  1882,  1886,     0,  1883,  1884,  1781,  1785,  1783,  1766,
+    1907,     0,  1521,  1934,  1631,     0,  1634,  1590,     0,     0,
+    1592,     0,     0,  1594,  1596,     0,     0,     0,     0,     0,
+       0,  2046,     0,  2127,  2355,  2270,     0,  1549,  1551,  1554,
+    1556,  1555,  1557,  1553,  1562,     0,  1485,     0,  1484,  2701,
+    2700,  1958,  1640,  1427,     0,     0,  1011,     0,     0,  1455,
+    1454,   977,     0,   347,  1017,   525,   495,  2225,   496,  1016,
+       0,  1018,  1023,  1023,     0,   525,   724,   598,     0,     0,
+     281,   635,     0,   351,   363,     0,  1444,     0,     0,     0,
+     799,   787,     0,     0,   806,  1160,   680,     0,     0,   277,
+    1180,  1176,  1348,  1349,     0,     0,     0,     0,     0,   347,
+     866,   386,     0,   410,   419,     0,   417,   390,   395,     0,
+     399,   397,   396,   391,   394,  1123,     0,  1120,  1119,   722,
+       0,   484,   456,     0,   504,     0,     0,   737,     0,     0,
+     513,   473,   472,   469,   468,   470,   471,   466,   465,     0,
+     636,   796,   358,  1304,   649,   711,   712,   707,     0,     0,
+       0,   517,   513,   439,   448,   422,   523,   519,   520,     0,
+       0,     0,   530,  1350,  1010,     0,  1093,     0,     0,     0,
+       0,     0,     0,  1127,   571,     0,     0,   575,   566,     0,
+    2532,   636,   944,  1813,     0,  1814,     0,     0,     0,  1888,
+    1887,     0,  1924,  1636,     0,     0,  1630,     0,  1599,  1615,
+       0,  1595,  1593,     0,  1604,     0,  1606,  1833,     0,     0,
+       0,  1558,     0,  1909,  1911,     0,  1835,  1425,  1638,     0,
+    1422,     0,   994,     0,   995,  1020,   499,     0,  1019,  1026,
+    1026,   486,   724,   477,  1182,     0,   638,     0,   304,     0,
+     289,  1178,     0,   790,     0,   801,   799,     0,     0,     0,
+       0,  1342,     0,  1343,  1344,  1347,   371,   374,   405,   415,
+       0,   398,  1118,  1122,  1121,     0,     0,   457,   490,   491,
+     492,     0,   459,   500,   501,     0,   734,     0,   739,     0,
+       0,   512,   661,     0,     0,     0,  1298,     0,     0,  1304,
+     521,   517,   446,   420,     0,  1301,     0,   532,     0,   358,
+    1092,  1095,  1090,  1261,     0,     0,   574,   573,  2535,  2537,
+    2536,     0,   665,  1815,  1891,  1877,  1904,  1889,  1920,     0,
+       0,     0,  1629,  1632,     0,  1597,     0,     0,  1605,     0,
+       0,     0,  1552,     0,     0,  1424,  1012,     0,     0,  1023,
+       0,   724,     0,  1014,  1013,   493,   479,  1444,   350,     0,
+       0,     0,   797,   800,   788,   801,   808,   807,   682,  1444,
+       0,   418,     0,   483,     0,     0,     0,   502,     0,   503,
+     524,     0,   738,     0,     0,   795,     0,     0,   713,     0,
+    1299,   523,   521,  1302,  1303,     0,   523,  1028,  1260,  1259,
+    1498,     0,     0,  2533,  2343,     0,  2316,     0,  1922,  1925,
+    1923,  1917,     0,  1614,  1627,  1560,     0,  1559,  1912,  1913,
+    1638,   347,  1026,     0,   481,   497,   504,   282,  1444,     0,
+       0,   789,   278,  1345,   714,   509,     0,   508,     0,   506,
+     505,   735,   740,   636,   785,  1304,   717,   423,   523,     0,
+    1638,  1243,  1498,  1242,  1244,  1252,  1249,  1251,  1250,  1248,
+    1130,  1131,     0,  1929,  1928,  1927,  1931,  1930,  1633,     0,
+    1625,  1561,  1421,   996,  1015,     0,   724,   290,   791,   798,
+       0,   507,   511,   510,   662,  1300,     0,   715,   718,   721,
+     719,   720,   421,   358,  1001,     0,  1253,  1247,  1483,  1470,
+       0,     0,     0,     0,   498,   482,     0,   695,     0,   523,
+    1245,  1498,     0,     0,  1926,     0,     0,   716,  1638,  1246,
+       0,     0,  1626,     0,  1002,     0,     0,   717,     0,     0,
+       0,  1128,  1129,   696
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-   -4744, -4744,  4248, -4744, -1255,   105,  2642,  -595, -4744, -4744,
-   -4744,  3354, -4744, -4744, -4744, -4744, -4744, -4744, -4744,  3436,
-   -4744, -4744,  1818, -2748, -4744, -4744,   -36,  3361, -1701,   -17,
-    2924,  1457, -4744, -1482, -4744, -4744,  -867,    50, -4744,  3359,
-   -1077, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -1175,
-    1967,  1275,  4810, -3139, -4744, -4744, -1803, -3462, -4744,   616,
-   -4744, -4744,  1904, -4744, -4744, -4744,  1115,   535,  -490, -4744,
-   -4744, -4744, -4744, -4744, -4744, -4744,  -271, -4744, -4744,  -645,
-     302,  -106, -2702,  -316, -4744, -4744,   500,  -318, -1714, -4744,
-   -3859, -4744,    31, -4744, -4744, -4744,  -296, -1809,  1374, -4744,
-   -1018, -1506,  1711,  -720, -4744,  -178, -4744,  -788,  -644,  -642,
-    -736, -4037, -4040, -4495, -4081, -3376,  1381, -4744, -4020,   379,
-     476, -4744,   393,   399, -4744,   489, -1152, -1849, -4744,  -924,
-   -4744, -4744, -4744, -3250, -4744, -4744, -4744, -4744,   -58, -4744,
-   -4744, -4744, -4744,   536, -4744, -4744, -4744, -4744, -4744, -4744,
-   -3002,  1881,  1886, -4744, -4744, -3465, -4744, -1230, -4744,   663,
-   -3280,  1300, -4744, -4744, -4744,  2633, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -1974, -4744, -4744, -4744, -4744,
-   -4744,   520,    42, -4744, -4744, -4744, -4744,   407, -4744,  1900,
-    1116, -4744, -4744, -4744,  -766,  -857,  -836, -4744, -3296, -4744,
-   -4744, -4744, -4744,  -249, -4744, -4744, -4744, -4744, -4744, -4744,
-   -1317, -4744,  1169, -3410, -4744, -4744,  1176, -4744, -4744, -4744,
-   -4744, -4744,  -705,  -179,  2673, -4744,  -573,  -680, -4744, -4744,
-   -4744,  -177, -4744, -4744, -4744, -4744, -4744, -4744, -1439,  8171,
-   -1396,  -839, -4744, -4744, -4744, -4744, -2117, -4744, -4744, -4744,
-   -4036, -4744,  4536,    34,  -801,   429, -4744,  -205,   -78,  3184,
-   -1515, -2944,   446,  -368, -4744, -2212, -4744, -4744, -4744, -2839,
-   -4744, -4744, -4744, -4744, -3788,   442, -4744,  3179, -4744, -4035,
-   -4743, -3812, -4285, -4615, -4591, -3776, -4744, -4744, -1450, -4744,
-   -4744, -4744, -1846,  2203, -2308, -4744, -2448,   512,  1466, -1266,
-   -3061, -4058, -1043, -3525, -4744, -4744, -3977,  -471, -4744, -4744,
-   -4744, -4744, -4744, -4744, -4744, -1443,  -912, -4744, -4744,  3792,
-   -4744, -4612, -4744,  3752, -4744, -4744, -4744, -4744,  2478,  2483,
-   -4744,  2484, -4744, -4744, -1832,  1260, -4744, -4744, -4744, -4744,
-   -4744,  -683,  -793, -4744, -4744, -4744,   449, -4744, -4744, -4744,
-   -4744,  2344, -1256, -1034,  3637,   475, -4568, -4744, -4744,  -820,
-   -4744,  2903, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-   -2145, -4744, -4744, -4638, -4744, -4744, -4744, -4744, -4744,  2330,
-    2333,  -103,  -233, -4744, -4744, -1624, -4744,  -856, -4744,  2560,
-   -4744, -4744, -4744, -4744,  1566,   478,   566,   -70, -4744, -4744,
-   -4744,   315, -4744, -4744, -3701,   -69, -4744, -4744, -4744, -4744,
-   -4656, -4744,   -68,  -615,   851, -4744, -4744, -3099, -4744,   533,
-     -77,  3270,  1832,   -43,  5290,  -243,  -227,  -213,   -75,   -66,
-    3039, -4744,  3108, -4744,  -198,  2169, -4744, -4744, -1153,  -337,
-   -4744,  1573,  -942,  2310,  3028,  3031, -4744,  1577, -4744, -4744,
-    1585, -4744,   927,  -582,  -463, -4744, -4744, -4744, -4744,   363,
-    -941,  2332, -4744,  3040, -4744, -4744, -4744, -2191,  1579, -3679,
-     958, -3672, -3637,   409,   398, -1084,  -258,  -154, -1087,  3052,
-   -4744, -4744,   968,  -432, -4744, -4744,  -429, -3121,   891, -4744,
-   -4605, -2624,  5501, -1958, -1379, -4744, -4744, -1354, 21794, -4744,
-   -4744, -4744, 23447, 24471, -4744, -4744, 25021, 25230, -4744, -1212,
-    1160, 25846, 10794, -1374, -1339, -1607, 23159, -2508,  -938, -2237,
-   -4744, -3802, -1884, -4744, -4744, -4744,  -216,  1024,     9, -4744,
-   -4744, -4744, -4744,    -4, -4744,  -559, -4744,  -558, -4744, -4744,
-   -4744,  -545, -4224,  2465, -4744, -4744, -4744,  -861, -4744, 26663,
-    1621, -4744, -1238, -3006, -3014, -3670, -2152, -4744, -4744, -4744,
-   -4744, -4744, -4744, -4744, -2793, -3558,  -544,  1697, -4744, -4744,
-    1789, -4744, -4744, -4744, -1676, -1185, -2909,  1705, -2303, -4744,
-   -1145, -4744, -1061,  2470, -1101, 13267, -1651, 19272,  -118, -2578,
-   -1644, -1950, -4744,  -518, -4744,  3164,  -128,  -760,  4019,  -911,
-    -932,  7143,  4830,  5337, -3397, -4744, -4744,   561, -4744, -4744,
-   -4744,  4174,  1198, -4744,  3448, -4744,  1963,  2739, -4744, -4744,
-    2339,  -972,   284, -4744,  -525, -4744,  -120, -4744, -4744, -4744,
-     180, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,
-    3067, -4744, -4744, -1587, -4744, -4744, -4744, -4744, -4744,  4447,
-    -383, -4744,  3837,  -377, -4744, -4744, -4744, -4744, -4744, -4744,
-   -4744, -4744, -4744,  3077,  2371, -4744,  3662, -4744, -4744, -4744,
-     -23,  3298, -4744, -4744, -4744, -1306,  -596,  3667,  3669,  2338,
-   -4744, -4744, -4744, -4744, -4744, -4744, -4744, -4744,  2342, -4744,
-   -4744,  1666, -2279,  2343, -4744, -4744,   929, -4744, -4744,   423,
-   -4744,   931, -4744,  3186, -4744, -4744, -4744,   970, -4744, -4744,
-   -4744,  -553, 16328,   -19,   -95,    85,  1783, -4744, 10093, 19165,
-       7,  3106,   -64, 13766, 22105,    73, -4744,  4451,  2353,  1923,
-   -1056, -4744,  4599,  2655, 21200, -4744, -1051,    21,  1788, -4744,
-      -2,  -676, -1282,  3403,  -757, -2104, -4744,  4882, -4744, -3423,
-   -4744, -1110,  3851, -1323
+   -4850, -4850,  4213, -4850, -1267,   217,  2605, -1698, -4850, -4850,
+   -4850,  1126, -4850, -4850, -4850, -4850, -4850, -4850, -4850,  3361,
+   -4850, -4850,  1783, -2744, -4850, -4850,   -35,  3326, -1696,   -38,
+    2897,  1419, -4850, -1471, -4850, -4850,  -883,    -3, -4850,  3329,
+     376, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,  -990,
+    1933,  1237,  5637, -2695, -4850, -4850, -1850, -3498, -4850,   578,
+   -4850, -4850,  1871, -4850, -4850, -4850,  1076,   491,  -530, -4850,
+   -4850, -4850, -4850, -4850, -4850, -4850,  -313, -4850, -4850,  -686,
+     224,  -103, -2728,  -358, -4850, -4850,   459,  -359, -1709, -4850,
+   -3858, -4850,    -9, -4850, -4850, -4850,  -338, -1818,  1334, -4850,
+   -1020, -1491,  1669,  -757, -4850,  -218, -4850,  -827,  -684,  -682,
+    -773, -4039, -4042, -4475, -4083, -3540,  1341, -4850, -4013,   247,
+     430, -4850,   265,   302, -4850,   443, -1156, -1846, -4850,  -758,
+   -4850, -4850, -4850, -3268, -4850, -4850, -4850, -4850,   -52, -4850,
+   -4850, -4850, -4850,   487, -4850, -4850, -4850, -4850, -4850, -4850,
+   -2402,  1838,  1839, -4850, -4850, -3454, -4850, -1243, -4850,   621,
+   -3306,  1254, -4850, -4850, -4850,  2595, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -1972, -4850, -4850, -4850, -4850,
+   -4850,   469,    -8, -4850, -4850, -4850, -4850,   348, -4850,  1850,
+    1071, -4850, -4850, -4850,  -811,  -903,  -881, -4850, -3278, -4850,
+   -4850, -4850, -4850,  -293, -4850, -4850, -4850, -4850, -4850, -4850,
+   -1307, -4850,  1124, -3415, -4850, -4850,  1130, -4850, -4850, -4850,
+   -4850, -4850,  -753,  -227,  2623, -4850,  -617,  -725, -4850, -4850,
+   -4850,  -222, -4850, -4850, -4850, -4850, -4850, -4850, -1435, 10788,
+   -1402,  -837, -4850, -4850, -4850, -4850, -2669, -4850, -4850, -4850,
+   -3979, -4850,  4493,    38,  -738,   371, -4850,  -208,  -112,  3143,
+   -1508, -2948,   397,  -417, -4850, -2215, -4850, -4850, -4850, -2847,
+   -4850, -4850, -4850, -4850, -3798,   423, -4850,  3138, -4850, -4050,
+   -4739, -3820, -4284, -4617, -4610, -3783, -4850, -4850, -1438, -4850,
+   -4850, -4850, -1845,  2158, -2318, -4850, -2442,   464,  1420, -1296,
+   -3058, -4057, -1033, -3514, -4850, -4850, -3994,  -531, -4850, -4850,
+   -4850, -4850, -4850, -4850, -4850, -1429,  -911, -4850, -4850,  3730,
+   -4850, -3992, -4850,  3714, -4850, -4850, -4850, -4850,  2432,  2439,
+   -4850,  2428, -4850, -4850, -1796,  1206, -4850, -4850, -4850, -4850,
+   -4850,  -737,  -849, -4850, -4850, -4850,   429, -4850, -4850, -4850,
+   -4850,  2230, -1252, -1038,  3599,   463, -4849, -4850, -4850,  -804,
+   -4850,  2853, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+   -2188, -4850, -4850, -4607, -4850, -4850, -4850, -4850, -4850,  2284,
+    2277,  -108,  -229, -4850, -4850, -1618, -4850,  -857, -4850,  2507,
+   -4850, -4850, -4850, -4850,  1509,   541,   509,   -69, -4850, -4850,
+   -4850,   259, -4850, -4850, -3699,   -68, -4850, -4850, -4850, -4850,
+   -4643, -4850,   -65,  -672,   794, -4850, -4850, -3085, -4850,   555,
+      -4,  3220,  1773,   -71,   454,  -248,  -249,  -223,   -70,   -62,
+    2990, -4850,  3050, -4850,  -199,  2106, -4850, -4850, -1139,  -368,
+   -4850,  1527,  -940,  2267,  2978,  2981, -4850,  1524, -4850, -4850,
+    1542, -4850,   879,  -627,  -508, -4850, -4850, -4850, -4850,   318,
+    -931,  2292, -4850,  3000, -4850, -4850, -4850, -2190,  1536, -3682,
+     915, -3663, -3638,   365,   352, -1238,  -300,  -186, -1089,  3007,
+   -4850, -4850,   924,  -477, -4850, -4850,  -473, -3124,   848, -4850,
+   -4577, -2617,  5964, -1943, -1387, -4850, -4850, -1351, 23303, -4850,
+   -4850, -4850, 23539, 25148, -4850, -4850, 25246, 25605, -4850, -1192,
+    1117, 25897,  6342, -1375, -1345, -1605, 23182,   126, -1509, -2185,
+   -4850, -3828, -1821, -4850, -4850, -4850,  -261,   977,   244, -4850,
+   -4850, -4850, -4850,   -51, -4850,  -602, -4850,  -600, -4850, -4850,
+   -4850,  -585, -4154,  2426, -4850, -4850, -4850,  -846, -4850, 26818,
+    1581, -4850, -1057, -3003, -3009, -3640, -2166, -4850, -4850, -4850,
+   -4850, -4850, -4850, -4850, -1874, -3560,  -503,  1658, -4850, -4850,
+    1749, -4850, -4850, -4850, -1657, -1185, -2909,  1662, -2330, -4850,
+   -1143, -4850, -1080,  2430, -1102,  9143, -1671, 19987,  -122, -2636,
+   -1641, -1949, -4850,  3602, -4850,  3202,  -147,  -752,  5582,  -840,
+    -908,  7187,  4211,  6125, -3402, -4850, -4850,   561, -4850, -4850,
+   -4850,  4139,  1159, -4850,  3440, -4850,  1922,  2702, -4850, -4850,
+    2298,  -974,    35, -4850,  -556, -4850,  -135, -4850, -4850, -4850,
+     199, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,
+    3031, -4850, -4850, -1581, -4850, -4850, -4850, -4850, -4850,  4417,
+    -386, -4850,  3809,  -379, -4850, -4850, -4850, -4850, -4850, -4850,
+   -4850, -4850, -4850,  3045,  2336, -4850,  3596, -4850, -4850, -4850,
+     -31,  3265, -4850, -4850, -4850, -1292,  -606,  3625,  3636,  2296,
+   -4850, -4850, -4850, -4850, -4850, -4850, -4850, -4850,  2311, -4850,
+   -4850,  1641, -2306,  2312, -4850, -4850,   896, -4850, -4850,   385,
+   -4850,   899, -4850,  3152, -4850, -4850, -4850,   935, -4850, -4850,
+   -4850,  -589, 16989,    83,    40,   157,   851, -4850, 10045, 13317,
+     -89,  3066,   -49, 13628, 22076,  -101, -4850,  4409,  2314,  1880,
+   -1060, -4850,  1434,  2613, 18772, -4850, -1053,   194,  2955, -4850,
+      -2,  -692, -1278,  3356,  -769, -2144, -4850,  4842, -4850, -3418,
+   -4850, -1117,  3814, -1302
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,   250,   251,  1937,  2808,  2693,  3564,  3565,   252,
-     253,  1933,   254,   255,   256,   257,   258,   259,   260,  1871,
-     261,   262,  1364,  2059,  2819,   263,  2550,  1115,  1116,  1117,
-    2404,  2405,  2756,  2406,  2393,  1697,  2204,  1890,  1080,  1081,
-    1852,  1891,   265,   266,  1691,  2385,   267,   268,   269,  1918,
-    1919,  1865,  2106,  4592,  5282,  3405,  2672,  3604,  3406,  3407,
-     270,  1985,  1986,   271,   272,  3532,  2030,  2787,  4120,  4121,
-    4626,   907,  2784,  4926,  4927,  4612,  4613,  4933,  5149,  5150,
-    2820,  2054,  3598,  4200,  3555,  4674,  3556,  4675,  3557,  4676,
-    3543,  4149,  4150,  4151,  3558,  4648,  5181,  3559,  2569,  5311,
-    2855,  2234,  2232,  5168,  4476,  4477,  5385,  5316,  5317,  5318,
-    5473,  4650,  3602,  4206,  4683,  4954,  3299,  2080,  3707,  1010,
-    2858,   939,  1011,  2821,   277,  2849,  2850,  1956,  2701,  4127,
-    3687,   278,  1384,  3978,  5008,  5221,  5222,   279,   895,   280,
-    2063,   281,   282,  2804,  3549,   283,  2586,  3316,   284,   285,
-    3344,  3345,  3346,   286,   287,  4000,  4873,  1920,  3394,  3395,
-    3396,  3397,  4025,   288,  2061,  1961,  2828,   289,   290,   291,
-     292,   293,  2982,  2983,   294,  2744,   295,   296,   297,   298,
-     299,  4057,  4559,  4178,  3432,  3571,  4176,  2822,  2071,  2840,
-    2841,  4663,  4972,  5191,  4974,  5520,  5521,  4947,  3956,  4490,
-     301,   302,  4643,  4644,  5323,   303,  2584,   304,   305,   306,
-    2038,  2796,  2797,  4128,  2032,  2789,  2790,  4188,  4189,   307,
-    3487,   308,  4543,  4544,   940,  5328,  5289,  5398,   309,   310,
-    4547,  4548,   311,   312,   313,   314,   315,   998,  1483,  1484,
-    1838,  1428,   316,  2421,   317,  1336,  3514,   318,  1575,  3028,
-    4735,   319,  1034,  1508,  1509,  2823,   321,  1045,  3006,  1047,
-    2247,  3689,  3690,  4281,  2968,  1242,   322,   323,  2979,  3009,
-     324,  1858,  2560,  2561,  4471,  2824,   941,  2086,  2862,  3294,
-    5089,  5090,  4852,  5106,  3201,  3899,   326,   942,  1895,  2630,
-    2865,  3612,  2527,  2528,  2529,  4223,  2530,  3614,  2531,  1832,
-    2532,  3620,  3621,  3622,  4219,  4226,  4229,  4997,  4998,   327,
-    1893,  2628,   328,   329,   330,  1928,  1266,   331,   964,   965,
-     332,  5161,   333,  1403,   334,  5006,   335,   336,  1069,  1070,
-    1559,  1560,   337,   338,  2643,  4007,   339,   340,   341,  5487,
-    5529,  5530,  5531,  4234,  5434,   342,  5489,  1551,   344,   345,
-     346,   898,  1300,  1301,  1302,  2825,  4990,   348,   349,  1853,
-    1854,  1855,  1856,  2555,   350,   351,   352,   353,   354,   355,
-    2042,   356,   357,  5138,   358,   359,  2005,   360,  1728,  1729,
-     361,   362,   902,  1135,  1732,  1740,   363,  1013,  1502,  1503,
-    1504,  2206,   364,  1555,  2994,  1014,  1497,  1015,  2467,  3222,
-    3909,  3910,  3913,  4836,  4447,  1016,  3219,   368,  2254,  2988,
-    2991,  3215,  1017,  3227,  3228,  3229,  3230,  3231,  3916,  1018,
-    1036,  1394,  2874,  1019,  1646,   373,   374,   375,  1145,  1139,
-    1140,   377,  2362,  3154,  1054,  1746,  1099,  1100,  1152,  3863,
-    2435,  2436,  2458,  2459,  1755,  1756,  2448,  2450,  3203,  2451,
-    3211,  2441,  4421,  5071,  5072,  5073,  5074,  5075,  5076,  4815,
-    2454,  2455,  1758,  1759,  1760,  2463,   378,  3158,  3843,  3844,
-    3845,  4398,  4399,  4413,  4409,  4799,  5057,  3846,  1545,  1766,
-    4807,  5504,  3847,  5048,  5049,  5240,  4416,  3854,  3907,  3588,
-    3589,  3590,  2533,  2135,  1430,  1647,  1431,  2145,  1648,  2119,
-    1433,  1649,  1650,  1651,  1436,  1652,  1653,  1654,  1439,  2111,
-    2138,  1655,  1656,  2129,  1184,  1185,  2191,  3065,  1658,  1659,
-    1660,  3849,  1661,  4354,  4766,  4755,  3086,  3087,  2401,  4350,
-    3789,  2357,  3144,  5080,  5257,  5258,  3828,  4379,  4782,  5046,
-    5365,  5442,  5443,  1662,  1663,  1664,  3141,  2352,  1268,  1665,
-    4130,  2354,  3080,  3166,  3167,  2260,  2279,  3033,  3048,  3049,
-    3060,  3748,  3068,  3073,  3776,  3777,  3081,  3110,  1666,  3035,
-    3036,  3732,  2281,  1667,  1721,  1722,  2370,  3105,  1735,  1736,
-    1137,  1681,  1668,  1669,  2248,  1126,  5053,   747,   730,  3421,
-    2416,  1304,  1051,  1670,  1671,  1672,  1787,   690,  1453,  1454,
-     692,   731,   732,  1222,   844,     2,    75,  1020,  3596,   382,
-     383,   944,   945,   946,  1386,  1387,  2092,  2095,  1792,  2499,
-     696,   697,   748,  4704,  5009,  5224,  1004,   384,   385,   386,
-     387,  1788,  2495,  1186,    76,    84,    77,  1187,   424,   425,
-    2477,   388,   861,   389,  1769,  1166,  3922,   390,   391,   392,
+      -1,     1,   250,   251,  1939,  2814,  2697,  3570,  3571,   252,
+     253,  1935,   254,   255,   256,   257,   258,   259,   260,  1873,
+     261,   262,  1365,  2061,  2825,   263,  2553,  1115,  1116,  1117,
+    2406,  2407,  2762,  2408,  2395,  1698,  2206,  1892,  1080,  1081,
+    1854,  1893,   265,   266,  1692,  2387,   267,   268,   269,  1920,
+    1921,  1867,  2108,  4598,  5288,  3411,  2675,  3610,  3412,  3413,
+     270,  1987,  1988,   271,   272,  3538,  2032,  2793,  4126,  4127,
+    4632,   907,  2790,  4932,  4933,  4618,  4619,  4939,  5155,  5156,
+    2826,  2056,  3604,  4206,  3561,  4680,  3562,  4681,  3563,  4682,
+    3549,  4155,  4156,  4157,  3564,  4654,  5187,  3565,  2572,  5317,
+    2861,  2236,  2234,  5174,  4482,  4483,  5391,  5322,  5323,  5324,
+    5479,  4656,  3608,  4212,  4689,  4960,  3305,  2082,  3713,  1010,
+    2864,   939,  1011,  2827,   277,  2855,  2856,  1958,  2705,  4133,
+    3693,   278,  1385,  3984,  5014,  5227,  5228,   279,   895,   280,
+    2065,   281,   282,  2810,  3555,   283,  2589,  3322,   284,   285,
+    3350,  3351,  3352,   286,   287,  4006,  4879,  1922,  3400,  3401,
+    3402,  3403,  4031,   288,  2063,  1963,  2834,   289,   290,   291,
+     292,   293,  2988,  2989,   294,  2749,   295,   296,   297,   298,
+     299,  4063,  4565,  4184,  3438,  3577,  4182,  2828,  2073,  2846,
+    2847,  4669,  4978,  5197,  4980,  5526,  5527,  4953,  3962,  4496,
+     301,   302,  4649,  4650,  5329,   303,  2587,   304,   305,   306,
+    2040,  2802,  2803,  4134,  2034,  2795,  2796,  4194,  4195,   307,
+    3493,   308,  4549,  4550,   940,  5334,  5295,  5404,   309,   310,
+    4553,  4554,   311,   312,   313,   314,   315,   998,  1484,  1485,
+    1840,  1429,   316,  2423,   317,  1337,  3520,   318,  1576,  3034,
+    4741,   319,  1034,  1509,  1510,  2829,   321,  1045,  3012,  1047,
+    2249,  3695,  3696,  4287,  2974,  1242,   322,   323,  2985,  3015,
+     324,  1860,  2563,  2564,  4477,  2830,   941,  2088,  2868,  3300,
+    5095,  5096,  4858,  5112,  3207,  3905,   326,   942,  1897,  2633,
+    2871,  3618,  2530,  2531,  2532,  4229,  2533,  3620,  2534,  1834,
+    2535,  3626,  3627,  3628,  4225,  4232,  4235,  5003,  5004,   327,
+    1895,  2631,   328,   329,   330,  1930,  1266,   331,   964,   965,
+     332,  5167,   333,  1404,   334,  5012,   335,   336,  1069,  1070,
+    1560,  1561,   337,   338,  2646,  4013,   339,   340,   341,  5493,
+    5535,  5536,  5537,  4240,  5440,   342,  5495,  1552,   344,   345,
+     346,   898,  1301,  1302,  1303,  2831,  4996,   348,   349,  1855,
+    1856,  1857,  1858,  2558,   350,   351,   352,   353,   354,   355,
+    2044,   356,   357,  5144,   358,   359,  2007,   360,  1729,  1730,
+     361,   362,   902,  1135,  1733,  1741,   363,  1013,  1503,  1504,
+    1505,  2208,   364,  1556,  3000,  1014,  1498,  1015,  2469,  3228,
+    3915,  3916,  3919,  4842,  4453,  1016,  3225,   368,  2256,  2994,
+    2997,  3221,  1017,  3233,  3234,  3235,  3236,  3237,  3922,  1018,
+    1036,  1395,  2880,  1019,  1647,   373,   374,   375,  1145,  1139,
+    1140,   377,  2364,  3160,  1054,  1747,  1099,  1100,  1152,  3869,
+    2437,  2438,  2460,  2461,  1756,  1757,  2450,  2452,  3209,  2453,
+    3217,  2443,  4427,  5077,  5078,  5079,  5080,  5081,  5082,  4821,
+    2456,  2457,  1759,  1760,  1761,  2465,   378,  3164,  3849,  3850,
+    3851,  4404,  4405,  4419,  4415,  4805,  5063,  3852,  1546,  1767,
+    4813,  5510,  3853,  5054,  5055,  5246,  4422,  3860,  3913,  3594,
+    3595,  3596,  2536,  2137,  1431,  1648,  1432,  2147,  1649,  2121,
+    1434,  1650,  1651,  1652,  1437,  1653,  1654,  1655,  1440,  2113,
+    2140,  1656,  1657,  2131,  1184,  1185,  2193,  3071,  1659,  1660,
+    1661,  3855,  1662,  4360,  4772,  4761,  3092,  3093,  2403,  4356,
+    3795,  2359,  3150,  5086,  5263,  5264,  3834,  4385,  4788,  5052,
+    5371,  5448,  5449,  1663,  1664,  1665,  3147,  2354,  1268,  1666,
+    4136,  2356,  3086,  3172,  3173,  2262,  2281,  3039,  3054,  3055,
+    3066,  3754,  3074,  3079,  3782,  3783,  3087,  3116,  1667,  3041,
+    3042,  3738,  2283,  1668,  1722,  1723,  2372,  3111,  1736,  1737,
+    1137,  1682,  1669,  1670,  2250,  1126,  5059,   747,   730,  3427,
+    2418,  1305,  1051,  1671,  1672,  1673,  1789,   690,  1454,  1455,
+     692,   731,   732,  1222,   844,     2,    75,  1020,  3602,   382,
+     383,   944,   945,   946,  1387,  1388,  2094,  2097,  1794,  2502,
+     696,   697,   748,  4710,  5015,  5230,  1004,   384,   385,   386,
+     387,  1790,  2498,  1186,    76,    84,    77,  1187,   424,   425,
+    2479,   388,   861,   389,  1770,  1166,  3928,   390,   391,   392,
      393,   394,  1001,   395,  1168,   396,  1169,   397,   398,   399,
-     400,  1176,   401,  1771,  1772,  4460,  1773,   402,   403,   734,
-     735,  1495,   404,   405,  1203,  1204,  1527,  1528,  1798,  1813,
-    1814,  1815,   406,   704,   407,   408,   409,  1804,  1805,   410,
-    2378,  2379,  2504,  2380,   411,  3244,  3245,   412,  3880,  3881,
-    4825,  3882,   413,  2374,   414,   415,  1129,  3927,   416,   857,
+     400,  1176,   401,  1772,  1773,  4466,  1774,   402,   403,   734,
+     735,  1496,   404,   405,  1203,  1204,  1528,  1529,  1800,  1815,
+    1816,  1817,   406,   704,   407,   408,   409,  1806,  1807,   410,
+    2380,  2381,  2507,  2382,   411,  3250,  3251,   412,  3886,  3887,
+    4831,  3888,   413,  2376,   414,   415,  1129,  3933,   416,   857,
      417,  1217,   736,   737,   738,  1224,   847,  1085,   749,  1226,
-    3398,   849,   850,   740,   741,   742,  2226,    78,  3252,  2227,
-    1674,   750,  1675,  2368,  1676,  1677,  1678,  1679,  1680,  1821,
-     744,  1193,  1487,  1488,  3253,  1490,    82,  1491,   421,  3648,
-    2194,  1529,  2212,  2213
+    3404,   849,   850,   740,   741,   742,  2228,    78,  3258,  2229,
+    1675,   750,  1676,  2370,  1677,  1678,  1679,  1680,  1681,  1823,
+     744,  1193,  1488,  1489,  3259,  1491,    82,  1492,   421,  3654,
+    2196,  1530,  2214,  2215
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -3563,3117 +3566,3134 @@
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      81,  2148,  1761,   376,  1692,  1091,  1144,  1163,   366,   367,
-     369,  1359,  1714,  1164,   419,  1767,  2152,  2158,  1267,   746,
-     419,   845,  2203,    79,  1536,  1537,  1538,  2969,  2231,   752,
-    1542,  1396,  1128,   955,   943,   371,  1990,  1153,  1038,  1682,
-    1833,  1723,  2052,   938,  2125,  2003,  2418,  2144,  2631,  1960,
-    2568,  3864,  2131,  2073,  2758,  2270,  3164,  2115,  2116,   418,
-    1038,  1012,  1267,  3712,   900,   418,   845,  2124,  3574,  1460,
-    1125,  4001,  2649,  1465,  2033,  1201,   420,  1505,  1706,   957,
-    3261,  3263,   420,  1060,  1480,  2936,  4158,   701,  2429,   376,
-    2040,  2639,  1046,  3984,  2045,  4228,  1395,   418,  3173,  2049,
-    2845,   997,  2143,  1954,  3423,  3554,  2713,  2056,   896,  1969,
-    3484,  4020,  2666,  4022,   420,  1244,  4184,  2075,  1995,  2432,
-    1267,  4439,  1273,   848,  3193,  3032,  1955,  3915,   264,  1147,
-    4687,  4136,  1092,  1290,  2103,  2723,  2863,   845,  4478,  4131,
-    3693,  4514,   418,  4366,  4131,  4211,  1816,  3857,  4479,  1155,
-     949,  1818,  1500,  3855,  3856,  1477,  1205,  2418,  4473,   420,
-    4679,  1354,  4395,  1156,  4680,  4696,  1362,  2887,   848,  2727,
-    2728,  4641,  2484,  2486,  2487,  4412,  1396,  1372,  4673,  4690,
-    3172,  1114,  1142,  3797,  4983,  2624,  2638,  2478,  2478,   852,
-    4686,  2193,  1079,  2541,  2218,  4853,  3931,  2112,  2113,  1892,
-    1035,   846,  1122,  5062,  2928,  5064,  2188,  1088,  2123,  4410,
-    1754,  1757,  4452,   418,  1991,  1088,  5114,  1088,  4334,  1196,
-    3260,  4247,  1035,  1514,  2376,  1794,  1795,  1519,  1520,  1521,
-     420,  3926,  3567,   427,   852,   427,  2324,  1532,  5107,   848,
-    1807,  1699,  2324,  1489,  2115,  2116,   846,    45,  3754,    45,
-    5133,  5209,  2131, -2798, -2798, -2798, -2798,   906,  2192,  1786,
-   -2798,  4739,  2124,  4741,   423,  2330,  4851,  2734, -2798, -2798,
-    2072,  2330,  5140,  5141,  1390,  1868,  2136,  2419, -2799, -2799,
-   -2799, -2799,  1087,  2224,  1133, -2799,  4860,   427,  3310,  2739,
-    1087,  1807,  1087, -2799, -2799,  2332, -1701, -1701, -1701, -1701,
-    1571,  2332,  3980, -1701,  3710,   852,  1218,   376, -1696, -1696,
-   -1696, -1696,   366,   367,   369, -1696,  2360,   846,  3103,  2252,
-    2028,  4217,  3506,  3920,  3754,  1921,   419,  4576,  2481,  4152,
-    3530,  5288,  3657,  5162,  3659, -1668, -1668, -1668, -1668,   371,
-     427,  2104, -1668,  3985,  3697,  5004,  4834,  1221,   427,  3145,
-    5307,    37,    38,    39,    40,  2104,  1243,    43,    44,  1577,
-    1808,   419,    45,    37,    38,    39,    40,  3103,   129,   130,
-      44,   418, -1696,  3730,  2104,  2112,  2113,  5113,   733,  1869,
-     273,  1296,  3325, -2796, -2796, -2796, -2796,  2195,   420,  3495,
-   -2796,  1340,  5132,  4287,   427,  1980,  2482,  1553, -2796, -2796,
-    2123,   897,  -148,    43,  2104,  5283,   418,  2318,    45,  2019,
-    3479,  -148,  3701,  2984,  2399,   733,  -148, -1681, -1681, -1681,
-   -1681,   121,  1940,   420, -1681,  4594,  1685, -2051, -2051, -2051,
-   -2051,  4637,   264,     3, -2051,  5175,   947,   954,   427,   125,
-    3480,    37,    38,    39,    40,  4595,   954,    43,    44,  1400,
-    2003,  2641,    45,  2036,  2400,  2483,  1941,   274,  5249,  1451,
-    1267,  2319, -1939,  3138,  5284, -2795, -2795, -2795, -2795, -1939,
-    3139,   275, -2795,  1297,  1696,  3157,  2574,   276,  1220,  3146,
-   -2795, -2795,  4577,  5176,  1164,   300,  3702,   954,  2366,  5200,
-    5308,  5177,  2641,  1981,  2150,  1725, -1958,  1726, -1701, -1701,
-   -1701, -1701,  4171, -1958,  2420, -1701,  2842,   320,  4856,  2150,
-   -2391, -2391, -2391, -2391,  1298,  5273,  5274, -2391,  3235,  5178,
-     325,  3008,  2150, -2212,  1240, -2391, -2391,   343, -1711, -1711,
-   -1711, -1711,  2985,  4288,  3981, -1711,   426,   943,  4835, -1708,
-   -1708, -1708, -1708,  2641,  3698,  3531, -1708,  5306,  3985,  1396,
-    2159,  1181,  2721,   347,  3751,  3752,   365,  3251,  2363,  3771,
-    5005,  3255, -1701,  3865,  2766,  1299,  3866,  3867,  3311,  4638,
-    2361,  2363,  1396,  4861,  2641,  1134,  2770,  3868,  3869,  3870,
-    2205,  3871,  3872,  1199,  1200,  2964,  3873,  3874,  3875,  2970,
-    4172,  2972,  2253,  5179,  2975,  1541,  3801,  3802,  2105,  1541,
-    4153,  2410,  2411,  1797,  1800,  1190, -1711, -1711, -1711, -1711,
-    1177,   370,  2105, -1711,  2181,    37,    38,    39,    40,  5330,
-    4529,  2740,    44,    37,    38,    39,    40,  2735,  1927,  2249,
-      44,  2105,  3507,  4131,    37,    38,    39,    40,  3104,   381,
-    4984,    44,  1396,  2418,  1719,  2262,  2253,  1870,  1720,  1809,
-    2207,  4218,  4979,   949,  5383,  3522,  3034,  4483,  5404,   249,
-    2271,  2105,  4951,  3526,  2137,  3528,  1829,  2843,   862,  4173,
-    1197,  2351,  2346,  2347,  2348,  2349,  2350,  2351,  1178,  1032,
-    1033,  1032,  1033,  3769,   273,  2037,  5483,  3817,  3202,  1554,
-    2418,  2377,  2225,  1803,  3171,  4771,  2709,  5020,  2711,  2610,
-    1809,  5021,  5022,  2110,  5023, -2798,  2208,  2274,  4656,  2210,
-    1192,   863,  2214,  2986,  2216,  3949,  2792,  2219,  1198,  5000,
-    4412,  2223,  4796,  2002,  2957,  2894,  4800,  2641,  4667,  2187,
-   -2799,  2718,  2987,  3876,  1284,  5461,  2650,  1179, -2212,  2132,
-    1180,  2761,  2324,  2932,  1727,  2037,  2757,  5466, -1701,  2680,
-    1233,  4745,  3348,  2183,  4790,  4839,  3766,  3767,  3768,  3769,
-   -1696,   274,   845,  5446,  5180,  5424,  1144,  3754,  2575,  1396,
-    3917,  2330,  2150,   958,  -407,   275,  3349,  1396,  1396,  1506,
-    2394,   276, -1939,  3140,  1241,  2407,  2407,  2114,  2007,   300,
-    2900,  2641,  5456,  3418,  1810,  1811,  1345,   419,  2965,  2014,
-    4070,  2332,  4280,  2104, -2212,  4174,  5511,  2976,  3339,  1525,
-    2150,   320,  3933,  5269,  3934,  2453, -1958, -2212,  1762,  2464,
-    2465,  2500,  1935,  2844,   325,  4180,  4709,  4710,  4711,  4712,
-    4713,   343,  1392,  1181,  2389, -2796,  1350,  4627,   418,  5425,
-    1032,  1785,   418,  1936,  2722,  1335,  3419,  4429,  -148,  -148,
-    2627,  3164,  3164,  3164,  1405,   420,  2691,   347,  3546,   420,
-     365,  2694,  2087,  1229,  1209,  1448,  1859,  3877,  5408,  2118,
-    4175,  5099,  1229,   701,  4465,  4505,  2881,  1719,  5109, -2051,
-     701,  1720,  3340,  1525,  2012,  4823,  3323,  1708,  2947,  2940,
-    3237,   701,  3237,  1507,  2950,  1513,  3884,  1518,  3275,  1498,
-    1544,  1205,  5199,  1522,  2188,  2110,  1501,  1229,  1525,  2884,
-    2885,  5519,  1206,  5469,  3878,   370,  2966, -2795,  1155,   701,
-    3848,  3285,  3365,  1683,   701,  2624,  1776,  1513,  1518,  1499,
-     852,  5482,  1156,   376,  2811,   701,  2576,  1182, -2048,   947,
-    4110,  4111,   846,   381,  2853,  5203,  1512,  2126,  1517,  3699,
-   -1701,  2439,  2612,  5204,  1393,  4309,  1183, -1668,  1531, -1469,
-    2618,   701, -2391,  4202,  1796,  1229,  2127,   702,  4956,  1280,
-    1860,  1446,  1750,  2189,  1544,  1229,   701,  2190,  1547,  1549,
-    2128,  3848,   701,  3095,  4335,  5432,  4702,   954,   954,  1684,
-    5050, -1708,  1446,   701,   858,  1281,   859,  2097,    81,  3286,
-    1157,  2713,  4450,  5233,    35,  1765,  1526,   701,    37,    38,
-      39,    40,    41,    42,  3879,    44,  2651,  2687,  3613,  2699,
-    4230,    79,  2702,  2703,  3547,  2126,   959,  2652,  4533,  2653,
-    2552,  1730, -1668,  4479, -1469,  1192,  3918,  4478,  3029,  3031,
-    3343,  1752,  2440,  2812,  2127,  3038,  4670,  4479,  4517,  2098,
-    3339,  3052,  3053,  3054,  4925,  2576,  3339,  1511,  2130,  1516,
-    2105,  3070,  3072,  1979,  2856,  1724,  3082,  2321,  1267,  1980,
-    1695,  2577,  1737,  3283,  1703,  2364,  4957,  2570,   960,  1158,
-    1974,  1689,  5028,  2939,  2836,  2654,  3178,  1874,  4129,  1546,
-    1548,  2767,  4071,  4129,  -632,  3123,  1351,  1229,  1229,  4231,
-    5470,  2853,  1709,    35,  1088,  2571,   701,  3548,  1088,  5205,
-     418,    41,    42,   961,  3042,   962,  1861,  1799,  5054,  5337,
-    1975,  5051,  4540,  5058,  3340,  1449,  5060,   420,  1719, -1469,
-    3340,  2319,  1720,  3469,  1229,  1063,  1567,  5324,  3268,  3470,
-    2854,  2099,  2973,  2974,  2013,  2125,  3324,  2967,  5409,  3700,
-    1862,  2578,  5433,  5344,  3341,  5334,  2665,  1579,  1207,  5335,
-    3754,  1526,  2361,  2837,  3755,  3756,  3757,  1981,  1710,  4224,
-    5471,  4228,  1777,  5342,  2348,  2349,  2350,  2351,  4846,  1087,
-    1863,  1567,  3043,  1087, -1469,  1525,  5341, -1668,  3342,  1842,
-    4518,  2100,  4479,  5234,  5472,   701,   701,  3764,  3765,  3766,
-    3767,  3768,  3769,  2139,  1789,   703,  4976,   427,  1380,  2817,
-      37,    38,    39,    40,  5496,  1064,    43,    44,  1577,  1808,
-    2800,    45,  4541,  1819,  3124,    37,    38,    39,    40,  3125,
-    3890,  1857,    44,  4874,  1192,  4232,   954,  3471,  2905,  1843,
-    2572,  3044,  4671,  1864,  3045,  2913,  1533,  4314,  4315,  4316,
-    4317,  2918, -1472,  4322,  4323,  4324,  4325,  4326,  4327,  4328,
-    4329,  4330,  4331,  1079,  1964,  3126,  2927,  1505,  3401,  5264,
-    1789,  1178,  2562,  3850,  2101,  1976,  1150,   860,  1088,  1088,
-    1159,  2883,  3343,  1851,  2818,  5516, -1469,  1494,  3343,  2563,
-    2484,   954, -2527,   853,  4043,  5426,  1267,  4969,  4519,  3411,
-    4233,  4520,  3181,   854,  1229,  1148,  2562,  1150,  5267,  4370,
-    4371,  1446,  5548,  1982,  1526,  1229,  3684,  4542,  3402,  5498,
-     751,  3265, -1469,  2068,  1026, -1469,  2090, -1472,  3430,  3758,
-    1179,  1446,  1844,  2140,  3850,  2704,  2926,  3046,  1701,  5336,
-    1446,  1851,  2943,  2069,  5481,  2564,  1027,  1983,  2139,  5484,
-    3759,  2838,  5312,  1087,  1087,  4838,  1065,  5228,  2961,  2387,
-    3066,  3212, -1668,  2565,  2839, -2161,  1149,  5431,  3084,  1977,
-    1381, -1668,  2064,  2114, -1668,  1837, -1668,  1984,  1229,  2564,
-    5245,  1845,  1202,  3472,  3058,  5219,  1192,  -838,   733,  2000,
-    3127,  4164,  4104,  1066,  1067,  3431,  2665,  2565,  4044,  4108,
-    4109,  5526,  1144,  4112,  3403,   855,  2571,  1534,  4429,  3760,
-    4117,  4812,  2065,  3478,  4819,  1846,  1178,  3473,  5265,   209,
-    1579,  1446, -1472,  3754,  1382,  5517,  1181,  3755,  3756,  3757,
-    1383,   376,  2209,  1150,  2211,  1267,  5050,  2215,  4002,  2217,
-    2515,  3047,  2220,  2221,  2222,  1847,  1164,  3474,   901,  5499,
-    4731,  5380,  5286,  3654,  4467,  2229,  5291,  5292,  1816,   701,
-    3364,  4479,  5552,  1818,  2705,  3861,  2706,  5313,  3655,  2255,
-    3660,  2256,  5118,  4276,  1848,  1179,  1849, -1472,  2140,   701,
-    5110,  2168,  1068,    81,    81,  4131,    81,  2774,  3412, -2527,
-    1026,  5139,  4985,  2070,  1229,  2566,  4422,  5387,  5388,  2425,
-    3972,  1868,   701,  1837,  4986,  5188,    79,    79,  3266,    79,
-    3267,  2442,  1027,  3995,  3579,  3580,  3581,  3582,  2482,  2433,
-    2434,  2169,  2438,  3449,  1850,  1789,  3587,  2775,  2962,  2566,
-    2141, -2194,  3533,  1156,  1156,  5314,  1156,  5253,   701,   856,
-    3973,  4515,  4165,  5220,  4045,  3462,  3450, -2527,  2443,  2142,
-    2001,  1097,  1446,  3164,   701,  3404,  2485,  1151,  4138,  2442,
-    2963,   903, -2161,  1750,  1932,  3891,  4545,  2066,  4666,   701,
-    3240,  1181,   701,  3501,  1911,  5166,  4300,  2483,  4046, -1472,
-    2785,  2786,  4129,  1229,  2876,  1049,  3761,  3762,  3763,  4402,
-    3764,  3765,  3766,  3767,  3768,  3769,  2443,  2567,  5136,  1205,
-    2978,  2713,  3848,  4141,  3848,  1869,  5395,  3220,  4047,  1765,
-    3631,  1229,  1540,  3759,  1296, -1472,  4457,  4030, -1472,  5137,
-   -2161,  1744,  4003,  1396,  4468,   845,    35,  4479,  4072,  2903,
-    4031,  2567,  1752,  4634,    41,    42,  3195,  3944,  2150,  1229,
-    1229,  1229,  3633,  1229,  3996,  2445,  1098,  1026,  4004,  2444,
-    2290,  5164,  1181,  1810,  1811,  2355,  4469,  1026,  2619,  4403,
-    2556,  2067,  4987,  1229,  2381,  2382,  4546,  3213,  5396,  1027,
-    2557,  1753,  3760,  1181,  3352,  2141,  2170,  4470,   845,  1027,
-    5508,  4715,  2776,  4716,  3329,  3379,  2580,  2558, -2213,  4404,
-   -2072,   904,  1541,  2445,  -170,  3974,  2581,  4269, -2241,   701,
-    2446,   418,  2397,  1063,  4405,  2383,  1297,   701,   701,  3997,
-     419,   419,  3435,  3848,  4406,  3475,  1745,  1229,   420,  5326,
-    -170,  1243,  3361,  5270,  5329,  1789,  2980,  2417, -2194,  2999,
-    1789,  1789,  2097,  5276,  4486,  1267,  2657,  4440,  4949,  4407,
-    5117,  3380,   845,  4145,    35,  2620,  1229,  1298,  2446,  3476,
-    1229,  1229,    41,    42,   418,   418,   418,  5218,  5055,   419,
-    5356,  3353,  3214,  3436,  1053,  3198,  2519,  2658,  2497,  2384,
-    2171,   420,   420,   420,  1296,  1061,  2777,  3451,  5143,  3477,
-     862,  4146,  4068,  1064,  2942,  3454, -2194,  3456,  5019,  3975,
-      80,   701,  3955,   852,  1251,  4147,  4441,  4203,  1299,  1935,
-    4207,  1252,  1253,  1254,   418,   846,  2493,  2981,  1709,  2150,
-    4487,   418,  2720,  2605,  5277,  1911,  4408,  3437,   418,  4228,
-    1936,   420,  2559,   863,  2685,  1957,  3753,   216,   420,  1446,
-    1842,  2511,  2513,  3249,  1093,   420,  5280,  1494,  3781,  2582,
-    3887,  3607,   216,  1062,  2417,  1088,  3199,  4069,  1857,  3761,
-    3762,  3763,  1857,  3764,  3765,  3766,  3767,  3768,  3769,  1958,
-     224,  4318,  3932,  4319,  3481,  4488,  1297,  4489,  3268,  4749,
-    3804,  4750,  3360,  2583,  1710,   224,  2099,   700,  2324,  5363,
-    1843,  5430,  5214,  4148,  1088, -2213,  3971,  1567,  2686,   920,
-    4635,  4943,  1446,  2037,  3482, -2241,  5056,  1789,   913,  5095,
-     235,  5097,  1373,  2641,  1096,  1789,  5364,  1298,  3830,  3438,
-     852,  4968,  2642,   238,  2900,   235,  4531,  4864,  4865,  1123,
-    1087,  4944,   846,   862,  1065,  1446,  2100,  1136,    37,    38,
-      39,    40,  3434,  1374,   248,    44,  1396,  2332,  2490,  2704,
-     948,  2491,   845, -2213,  1002,  4959,   966,   922,  3221,    37,
-      38,    39,    40, -2241,  4636,  3850,    44,  3850,  1299,  1087,
-    1959,  1066,  1067,   249,  1789,  1375,   863,  1789,  1789,  4978,
-    5351,   733,   733,  1844,  1052,    37,    38,    39,    40,   920,
-    5390,  4532,    44,  1851,  4320,   701,  3498,  1088,  1851,  5189,
-    4604,  2879,  2657,  2772,  4321,  3297,  4607,  4608,  1396,  4610,
-   -1002,  3625,  4751,  1935,  4484,  1005,  1446,  3293,  1705,  2101,
-    4857,  1376,  5518,  3862,   427,  1130,   209,  3381,   418,  3439,
-    5190,  1446,  2551,  2658,  1936,  1006,  -430,  3440,    45,  2791,
-    3441,  3297,  4275,  1970,  2492,   420,  1789,   922,  1857,  3188,
-    1446,  2367,  1989,   920,  2798,  1164,  3895,  3686,   862,  3298,
-    2773,  3963,    37,    38,    39,    40,   701,  1007,  4403,    44,
-     701, -1008,  1087,  3672,  3005,  5543,  3850,  1971,  2705,  3317,
-    2706,  1972,   701,  3382,  4858,   733,  1243,  4185,   129,   130,
-    3575,  1146,  2645,  4960,  2646,  3952,  4194,  1446,  4404,  5458,
-     427,   863,  2126,   930,  2751,   931,  1501,  1973,  3442,  2989,
-    1229,   922,  4486,  4802,  1719,  1352,  1446,  1353,  1720,  3164,
-     852,  2127,  1229,  4406,  3164,  1848,  3986,  1849,  1446,  2053,
-    3164,  3171,   846,   376,  3066,  3066,  4961,  4279,  2752,  3066,
-    1446,  2945,  3111,  2946,  3112,  -430,  1005,  2948,  4006,  2949,
-    2647,  5379,  2951,  3885,  5309,  1229,  2952,   701,   701,  3806,
-    2178,  3807,  3442,  3853,  4824,  4506,  1006,  3113,   963,  1026,
-     701,  2814,  1493,   427,  3848,  4280,  3066,  3066,  3848,  1170,
-    1446,  2179,  3989,  1446,  3808,   701,   701,  1834,  4487,  2716,
-    2846,  1027,  1373,   930,    81,   931,   376,    81,  1007,  1171,
-    3004,  2995,  2996,  2997,  3917,   933,  4290,   701,  1160,  1172,
-    4516,  4521,  4534,   920,  2121,  2122,   935,    79,  3815,  2053,
-      79,  1835,  2641,  1374,  5539,  4408, -2591,  3027,  2998,   206,
-    1839,  2648,  4578,  1257,  1258,  1259,  3513,  1260,  1261,  1262,
-    1263,  1264,  1265,  4488,   845,  4489,  2372,  1229,  1167,  2373,
-    5025,  1836,  4036,  4579,  3171,  4182,   216,   930,  1396,   931,
-      37,    38,    39,    40,  1840,  3114,  2407,    44,     8,  1267,
-    3115,   922,  5136,  4689, -2072,  3116,  4244,  4245,   209,  4295,
-    -534,  1750,  1202,  2053,  1229,  1229,  1751,  3809,  3676,   224,
-    1229,  1229,  3810,  5137,  1841,  2894,  3051,  1229,  1229,  1229,
-    4154,  1376,  3921,  1229,  1989,  1229,  1229,  1229,  1229,  1229,
-    1229,  1173,  1229,  4060,  1229,  1229,    35,  4938,  1229,  1208,
-     418,  3937,  4939,  3204,    41,    42,  2114,  3088,  2542,   235,
-    3091,  1730,  1446,  1229,  1229,  1229,  1229,   420,  4251,  4252,
-    4253,  1229,   238,  5506,  2535,  1229,  3101,  1219,  1229,  3896,
-    1752,  1229,  1229,  1229,  1229,  1229,  1229,  1229,  1229,  1229,
-     206,  1229,  3287,   248,  3290,  4840,  4940,  2189,   419,  1229,
-    3726,  2935,  1229,  5528,  2938,  1174,   216,   249,  2536,  2753,
-    3613, -1518,  4138,  1935,  3941,  3942, -1518,   216,  4139,  1753,
-    1148,  2754,  2894,  1396,  5136,  1234,  5185,  4996,  3930,  4140,
-    4677,  3117, -1519,  2667,  1936,  2474,  2475, -1519,  2537,   224,
-    2324,  3118,   852,   418,  1236,  5137,  2755,   930,  3811,   931,
-     224,  2667,  3727,   419,   846,   419,  3728,  4141,  3812,  4142,
-     420,  4040,  3195,  2126,  3223,  1229,  1355,  3284,  1356,  2330,
-    3280,  5558,  2126,   936,  4129,  1175,  1286,  2667,  5455,   235,
-   -1518,  1149,  2127,   948,  1249,  4481,  4482,   845,  3962,  4293,
-     235,  2127,   238,  3347,  1008,  4041,  2128,  4464,   418,  2332,
-     418, -1519,  2114,   238,  2542,  2130,  4249,  4250,  4251,  4252,
-    4253,   864,  4935,   248,  4937,   420,  4707,   420,  4941, -1518,
-    4942,  2114,  1294,  1837,   248,  4042,  4921,   249,  4922,  4923,
-     905,  2710,  4924,  3715,  1250,  4143,   701,    43,  1009,  3719,
-   -1519,  4734,    45,  1339,   999,  3584,  4137,  1295,  1150,  2724,
-    3585,  3585,  4311,  1344,    81,  1789,    81,  3850,  5227,  1943,
-    4055,  3850,  1446,   418,  3209,  3210,  1446,  1446,  1342,  4063,
-    1210,  3780,  2668,  3782,  3783,  1819,   701,    79,  1347,    79,
-     420,   701,  1211,  1212,  5544,   701,  4340,  5545,  5210,  2417,
-    2668,  4170,  4144,   701,  1360,  3848,  1094,  4145,  1368,  2669,
-    3848,  1213,  2474,  3233,  1214,  3848,   845,  1944,  3848,  -533,
-     845,   701,  3433,  2198,  1229,  2199,  2668,  2669,  2900,  2264,
-    1385,  2265,  2670,  4502,  2671,  1229,  2277,  2667,   249,  1446,
-    2667,  4382,  1229, -1542, -1542,  4146,    35,   427,  3848,  1377,
-    2670,  1446,  2671,  2669,    41,    42,  1379,  1741,  4283,  4147,
-   -1469,    45,  3848,   701,  1396,   852,  1396,  2665,  2872,  2667,
-    2873,  4722,  4723,  4724,  1088,  1378,  2670,   846,  2671,  2003,
-     701,   701,  1151,  1388,  2423,  2665,  2424,   427,  1446,  3851,
-    4402,  1719,   418, -2051,  1402,  1720,   418,    35,  1945,  4163,
-    2426,  4166,  2427,  3859,  3860,    41,    42, -1048, -1048,   420,
-     701,  2665,  2114,   420,  2542,  1447,  1455,  4418,  2667,  2937,
-    1456,  2938,  3408,  1461,  1472,  3896,  3560,  1000,  1481,  4155,
-    3896,  4157,    45,  1215,  1396,  2750,  1539,  2958,  3350,  2959,
-     701,  3443,  1337,  2960,   701,  2959,  1946,  4148,  1947,  1087,
-    3851,  1496,  4423,  4424,  4425,  1535,  1543,   845,  2712,  1550,
-    4403,  3576,   701,    37,    38,    39,    40,  3420,  1557,  1556,
-      44,  1216,  1789,   701,  1564,  2992,  2668,  2993,  1558,  2668,
-    1789,  5159,  1789,  3435,   852,  1565,   701,  1949,   852,  3194,
-    4404,  3195,  2418,  1567,   701,  3443,   846,  1566,  1568,  4221,
-     846,  1397,   966,  2669,  1570,  4405,  2669,  3848,  2668,  4249,
-    4250,  4251,  4252,  4253,  1569,  4406,  4067,  4254, -1672, -1672,
-   -1672, -1672,  1573,  1574,  3171, -1672,  2670,  1951,  2671,  2670,
-    3358,  2671,  3359,   418,  3436,  2669,  1576,  3425,    80,  3426,
-    4407,  1229,  1446,  1192,  1707,  3534,  4296,  3535,  1704,  4289,
-     420,  1711,  3539,  5144,  3540,  1712,  3443,  2668,  2670,  3544,
-    2671,  2665,  3443,  3600,  2665,  3601,  1953,  3066,  3066,  3066,
-    3066,  1144,  3848,  3066,  3066,  3066,  3066,  3066,  3066,  3066,
-    3066,  3066,  3066,  3561,  2669,  3634,  1713,  2938,  3437,  1718,
-    3831,  1875,  3832,  2665,  3443,  1731,  3678,  1552,  2959,  1748,
-    4344,  3725,  1741,  2938,  2667,  1738,  3734,  2670,  2938,  2671,
-    1739,  2667,  1446,  1742,  1763,  1144,   701,  4408,  3740,  4599,
-    2938,  1764,  5485,   193,  1876,   852,  1768,  1770,  1229,  3066,
-    3066,  1572, -1679, -1679, -1679, -1679,  3741,   846,  2938, -1679,
-    1778,  1686,  2665,  1774,  1775,  1698,  1397,  1700, -1670, -1670,
-   -1670, -1670, -1481,  1779,  4996, -1670,  1791,  3742,  3850,  2938,
-    4699,  1780,  1781,  3850, -1481,  3773,  1782,  2938,  3850, -1481,
-    3786,  3850,  2938,  1783,  4909,  4910,  1790,  4912,   701,  1784,
-    3438,  1877,  1793,  1823,    35,   427,  1229,  1822,    37,    38,
-      39,    40,    41,    42,    43,    44,  3791,  1825,  3792,    45,
-    1831,  3850,  4073,  3836,  3837,  3838,   216,  1837,  3833,  4101,
-    3834,  1867,  1894, -1481,  1878,  3850, -1673, -1673, -1673, -1673,
-    3562,  1872,  4023, -1673,  4024,   701,  4767,  4028,  1144,  4029,
-    4215,  1896,  4216, -1481,  1898,   700,   700,  1899,   845,   224,
-    1820,  1446,  1789,  2668,   845,  1930,  4242,   701,  2938,  1879,
-    2668,  3848,  1929,  1931,  4341,   701,  4342,  1932,  4351,  1229,
-    4352,  1927,  1446,  3563,  4362,  1229,  2938,  4448,  1934,  4449,
-    2669,  1939, -1481,  1446,  1942,  1965,  3848,  2669,  1966,   235,
-   -1481,  1880,  1229,  4453,  4463,  4454,  3267,  1229,  1978,  4485,
-    3439,  2959,   238,  2670,  4628,  2671,  4629,  1987,  3440,  2391,
-    2670,  3441,  2671,  1988,  4668,  4728,  2959,  2253,  1992,  1881,
-    1229,  1229,  1229,   248,   418,  1229,  4746,  4772,  2938,  2993,
-     418,  1997,  1998,  1229,  1229,  1229,  1229,  5486,  2665,  2006,
-    1999,   420,  4784,  2004,  2938,  2665,  1229,   420,  2008,  1229,
-    3787,  1229,  4842,  1882,  3267,  2011,  3794,   209,  4615,  2016,
-    2015,  1883,  1229,  1229,  4756,  1900,  1229,  4848,  1884,  4849,
-    3850,  1901,  2667,  2023,  4854,  1885,  2959,  4855,  2026,  2959,
-    1229,   376,  1229,  1886,  1229,  2022,  2995,  2996,  2997,  4928,
-    2029,  4929,  4932,  2034,  4980,  1887,  4981,  5030,  1418,  5031,
-    4616,  2041,  2031,  1888,  1229, -1671, -1671, -1671, -1671,  4965,
-    2044,  1902, -1671,  2998, -1481,  1229,   852,  1229,  1229,  1229,
-    2392,  5032,   852,  2938,  2037,  4617,    74,  1243,   846,  3896,
-    2046,  5040,  4677,  2993,   846,  3850,  2055,  5115,   701,  5116,
-    4618,  5186,  1229,  2959,  4619,  5211,  5229,  5212,  2993,  5237,
-    2057,  5238,  3848,  2058,  5242,  1229,  3195,  1889,  -190,  2060,
-    1229,  1789,  1903,  3066,  4620,  2062,  1229,  4621,  2074,  1904,
-    4507,  5248,  1905,  4192,  1719,  2076,  1229,  1741,  1720,  5250,
-    4622,  4192,  2083,  5494,  5495,  5262,  5303,  5263,  5304,  5325,
-    5343,  2386,  5263,  5357,  5358,  2993,  3792,  1906,  1192,  5359,
-    5369,  2938,  3195,  5372,  5394,  4192,  2993,  5400,  2667,  2993,
-    2085,  2668,   193,  4652,  4653,  1446,  2089,  5401,  1446,  2993,
-    1446,  5416,  5447,  5417,  3195,  1446,  4657,   701,  1907,  1397,
-    5448,   881,  2938,    80,    80,  5449,    80,  2938,  2669,  2323,
-    2094,  2102,  2324,   701,   701,  5451,  5502,  2938,  4192,  1229,
-    2107,  5505,  1397,  5256,  2108,  1833,   845,   845,   845,  4623,
-    5527,  2670,  5263,  2671,  5541,  2109,  5542,  4624,  2110,  2114,
-     701,  2330,  5567,   701,  5542,  2117,  1446, -2800,  1747,  2118,
-    1749,  3851,  4801,  3851,  4804,  1908,  2120,  1909,  2134,  2146,
-    1037,  2147,  2149,  1446,  2150,   216,  2665,  1910,  2257,  2157,
-    2160,  2332,  2161,  4625,  2162,  1911,  4535,  2163,  2164,  2165,
-    5565,  5566,  1037,  4725,  3850,  1912,  2167,  1446,  2172,  2173,
-    2174,  2175,  1397,  2177,  2182,  2196,  2230,  2261,   224,  2266,
-    2268,  2275,   418,   418,   418,  2276,  2282,  2269,  2283,  3850,
-    2284,  1032,  1785,  2358,  2285,  4831,  2286,  2668,   249,   420,
-     420,   420,  1914,  1915,  2288,  2289,  2360,  2290,  2291,  2292,
-    2293,  5241,  2295,  2296,  2297,  3803,  2298,  2299,   235,  2300,
-    2356,  2301,  5241,   701,  2669,  2302,  2304,  2305,  2390,  1916,
-    2306,   238,  1446,  2307,  1446,   701,  2308,  2309,  2310,   701,
-    2311,  2402,  3851,  5154,  5156,  2320,  2361,  2670,   701,  2671,
-    2386,  1525,   248,  2412,  2322,   845, -2800,  2422,  2431,  5148,
-    1751, -2800,  1753,  2460,  2462,  2471,   249, -1252,  2365,  2473,
-   -1252,  2480,  1181,  2488,   852,   852,   852,  2494,  2496,  2498,
-    2506,  2509,  2665,  2507,  2514,  2516,   846,   846,   846, -2743,
-    2518,  2538,  1917,  1446,  2539,  2540,  2545, -2800,  4376,  1397,
-    2542,  5299,  2396,  2398,  2543,  2544,  2546,  1397,  1397,  2547,
-    2548,  2554,   701,  2573,  2579,  2585,  2607,  2611,  1446,   943,
-    4239,  2613,  2615,  2614,  2616,  2632,  2617,  2323,  2633,  2644,
-    2324,   418,  2634,  2659,  2655,  2661,  4829,  2664,  2662,  2665,
-    2673,  2339,  2663,  4123,  1446,  2674,  2675,  2676,   420,  1446,
-    2677,  1544,  2681,  2690,   701,  3850,   701,  2798,  2682,  2330,
-    2692,  2696,  2697,  4198,  2700, -2800,  2707,  1789,   701,  2708,
-     701,  2714,  1789,  4210,  1911,  2715,  2719,  2725,  2726,  2736,
-    2737,  2741,  2763,  2742,  2764,  2738,  2771,  1267,  2779,  2332,
-    1144,   700,  2746,  2749,  2765,  2780,  2782,  4238,  2793,  2783,
-    2794,  2799,  2802,  5370,  2803,  2806,   915,  1446,  1144,  4871,
-    2807,  2815,  2830,  2810,  2835,  2848,  2851,  2852,  2860,  2866,
-    2864,  2868, -2800,   852,   701,  1446,  2875,  2886,  1959,  2869,
-    2880,  2888,  4952,  2889,  2893,   846,  2895,  2897,  2894,  2898,
-    1446,  2907,  2909,  4384,  4385,  4386,  4387,  2910,  2911,  2912,
-    2929,  2930,  2954,  3814,  2971,  2977,  2955,  5305,  2990,  3034,
-    3007,  3083,  3089,  2324,  3102,  3122,  4905,  3143,  3185,  5066,
-    3142,  3157,  3039,  3108,  3177,  3175,  5081,  3093,  3186,   701,
-    1149,  5145,  3174,  5287,  3180,  3120,  3205,  3206,  3207,  3224,
-    3196,  5290,  1396,  1229, -2800,  3182,   701,  3239,  3197, -2800,
-    4934,  3218,  5094,  3242,  2376,   845,  3241,  3208,  3256,  5295,
-    3257,  5297,  3259,  3269,  3270, -2800,  3271,  3291,   701,  3293,
-    3288,   701,  2346,  2347,  2348,  2349,  2350,  2351,  3295,  3296,
-    3302,  5087,  3312,  3307,  3318, -2800,  3313,  3326,  1229,  3315,
-    3322,  1446,  3334,  3335,  3338,  3351,  3356,  1229,  1701,  1705,
-    3370,  1789,  3389,  1229,  3415,  1229,  3383,  2717,  1229,  3388,
-    3410,  3424,  1446,  1229,  1229,  1229,  1229,  3416,  3428,  1229,
-    1229,  1229,  1229,  1229,  1229,  1229,  1229,  1229,  1229,  2339,
-    3427,   418,  1229,  1229,  3429,  3444,  3483,  1446,  3486,  3497,
-    3504,  3505,  1229,  3508,  3510,  3509,  1229,  3516,   420,  3517,
-    1229,  3518,  3519,  5231,  3520,  3527,  3524,  4346,  1229,  3529,
-    3552,  1229,  3536,  1229,  3566,  3541,  3568,  3570,  3577,  3586,
-    3066,  1446,  1229,  3583,  3591,  1229,  1229,  3592,  2788,  5033,
-    1229,  1229,  5148,  3593,  3594,  3595,  3603,  1229,  3606,  3605,
-    3624,  3609,  2318,  3610,  3623,  2323,  3628,  1229,  2324,  1229,
-    3629,  3630, -2800, -2800, -2800,  3627,  3632,  3638,  2826,  2491,
-   -2800,  1229,  3652,  3635,  3639,  3661,  3640,  1229,  1229,  1229,
-    3637,  5183,  3666,   852,  3663,  4708,  3667,  2330,  3641,  3650,
-    3670,  1164,  3671,  2331,  3680,   846,  3651,  3681,  3682,  3195,
-    2183,  3683,  3685,  3851,  3692,  3008,  3695,  3851,  3694,  3696,
-    3703,  3706,  3711,  5236,  1541,  3713,  3717,  2332,  3718,  2323,
-    3720,  3736,  2324,  3737,  1229,  3738,  2325,  2326,  2327,  3721,
-    3723,  3739,  3743,  3750,   954,  3744,  3746,  1229,  3749,  3772,
-    3805, -1931,  3788,  2328,  3822,  3904,  3827,  3813,  2938,   845,
-    4560,  2330,  3823,  1446,   845,  3778,   845,  2331,  5102,  3800,
-    3785,  3902,  3853, -2800,  3906,  3908,  3898,  3799,  1229,  3858,
-    2346,  2347,  2348,  2349,  2350,  2351,  3919,  3825,  3924,  1579,
-    3826,  2332,  3754,  3912,  3935,  3925,  3755,  3756,  3757,  3829,
-    3943,  3928,  5119,  3929,    80,  3923,  2189,    80,  3945,  3954,
-     701,  5124,  3946,  4359,  3959,  3950,  3957,  3966,  3951,  1267,
-    3982,  3983,  3993,  3994,  3998,  3999,  4008,  5362,  4009,  1396,
-    4011,  4017,  2333,  4018,  4019,   418,  4027,  2334,  4054,  5371,
-     418,  4058,   418,  5512,  5373,  4056,  5375,  4059,  4062,  4064,
-    4092,  3896,   420,  4065,   845,  4076,  4077,   420,  1446,   420,
-    4078,  4081,  1267,  4066,  4074,  4075,  3408,  4079,  4530,  4080,
-    4082,  4096,  4084,  2337,  4083,  4085,  4086,  4087,  2734,  4088,
-    4089,  1789,  4094,  4098,  4100,  4107,  4113,  4114,  4134,  4116,
-    4119,  4168,  4162,  4161,  4177,  4179,  2333,  2323,  4183,  4181,
-    2324,  2334,  4204,  4191,  4199,  4205,  3050,   701,  4192,  4201,
-     701,  4208,  4209,  4212,  4213,  4225,  4236,  2339,  3066,  4246,
-    2136,  4248,  2335,  2336,  4272,  4259,  4273,   852,  4261,  2330,
-     418,  4271,   852,  4274,   852, -2800,  4284,  2337,   691,   846,
-    4282,  4285,  4286,  4303,   846,  4294,   846,   420,  4297,  3775,
-    4299,  3754, -1930,  4277,  4955,  4364,  4614,  2277,  3774,  2332,
-    4353,  1150,  4377,  4443,  4393,  4420,  4365,  4312,  2338,  1229,
-    4337,  4338,  4446,  4339,  4345,  4415,  4368,  2493,  4451,  4466,
-    4472,  2339,  3759,  4493,  2340,  4495,  4501,  4508,  4510,  4383,
-    4496,  4401,   701,   701,    74,  4684,  1446,  4432,  2341,  4433,
-    4509,  4511,  4525,  4459,  4522,   701,  4417,   701,  4430,  4434,
-    4437,  4536,  4438,  3179,   419,  1037,  4513,  1037,  4539,  1037,
-    4551,  4537,   852,  4369,  4538,  1037,  1523,  1524,  4549,  4550,
-    4555,  4552,  4553,  4554,   846,  4557,  4567,  4558,  4575,  4591,
-    4517,  3760,  4568,  4593,  1446,  1229,  1229,  4596,  4602,  1037,
-    1037,  4603,  4605,  4606,  4631,  4609,  4642,  4227,  4238,   418,
-    4639,  4647,  2341,  4649, -2800,  4655,  2959,  4662,  4661, -2800,
-    4665,  4664,  4681,  4682,  4700,  4697,   420,  4695,  4694,  4703,
-    4726,  4730,  4701,  4698,  4706,  4705,  4721,  5389,  4732,  4733,
-    4743,  2342,  4737,  4738, -2800, -2800, -2800,  4844,  2346,  2347,
-    2348,  2349,  2350,  2351,  3851, -2800,  4740,  4748,   701,  3851,
-    4752,  4758,  4753,  4757,  3851,  4759,   700,  3851,  5061,  4760,
-    4761,  4765,  4780,  4793,  4797, -1932,  4792,  4798,  1789,  1229,
-    4795,  4805,  1820,  4806,    80,  4811,    80,  4813,  4830,  4814,
-    1229,  4816,  4837,  4810,  4841,  4843,  4817,  3851,  4845,  2339,
-    4818,  4850,  4851,  4859,  4882,  2342,  4875,  4876,  2343,  2344,
-    2345,  3851,  2346,  2347,  2348,  2349,  2350,  2351,  4883,  3011,
-    1229,  4895,  4884,  1397,  3745,  2323,  4898,  1037,  2324,  4904,
-    1229,  1229,  2587,  1446,  4913,  4902,  4920,  1229,  1229,  5386,
-    4907,  4908,  1229,  1446,  4945,  4946,  1812,  1229,  4958,  4963,
-    1229,  1229,  1396,  4966,  5123,  1229,  4953,  2330,  4962,  4973,
-    4964,  1229,  4991, -2800,  4971,  2588,  3012,  4993,  3761,  3762,
-    3763,  4877,  3764,  3765,  3766,  3767,  3768,  3769,  2589,  1229,
-   -2800,  4982,  4992,  1229,  4989,  4832,  4994,  2332,  5007,  1700,
-    1267,  5002,  2590,  1037,    35,  1229,  5012,  3013,   845,  5016,
-    1229,  5017,    41,    42,  5026,  1243,  1229,  5034,  2323,  5037,
-    5036,  2324,  5045,  5079,  5059,  2325,  2326,  2327,  3014,  5088,
-    5027,  5029,  5091,  5038,  1229,  5039,  5052,  5096,  5063,  3015,
-    5085,  2591,  2328,  5092,  4826,  2329,  5111,    81,  5112,  5121,
-    2330,  5126,  2592,  5108,  5127,  5131,  2331,  5146,  5142,  3016,
-    5153,  4372,  5160,  1229,  3017,  4638,  3851,  5167,  5169,  5193,
-      79,  5170,  2593,  5172,  5173,  5194,  5174,  2594,  5192,  5198,
-    2332,  1446,  5196, -2800,   418,  5201,  5202,  5213,  5215,  5216,
-    2346,  2347,  2348,  2349,  2350,  2351,  5223,  5217,   701,  5232,
-    5235,   420, -2800,  5239,  5244,  5247,  5252, -2800,  5279,  5251,
-    1446,  5254,  3018,  5256,  5260,  5310,  5271,  5281,  5294,  5315,
-    5319,  5322,  5320,  5327,  5332,   701,  5338,  5339,  5340,  5347,
-    1446,  3851,  5350,  3019,  5355,  5348,  5360,   701,  5349,  5361,
-    5378,  5368,  3515, -2800,  5374,  1229,  2595,  5382,  5377,  5381,
-    3515,  5393,  5384,  5397,  5288,   701,  5406,  5407,  3515,  5410,
-    3515,  5412,  5415,  5418,  1579,  5420,  5421,  3754,  5427,  5428,
-    5464, -2800, -2800, -2800,  5429,  5435,   852,  2596,  5436,  5468,
-    5408,  5409,  5445,  4378,  1446,  2333,  5457,  2339,   846,  5476,
-    2334,  5497,  5515,  5503,   881,  5536,  5540,  5459,  5546,  5547,
-    5475,  5480,   701,  5550,  5537,  5554,  5559,   881,  3578,  5534,
-    5555,  2335,  2336,  5535,  5560,  5562,  5561,  5563,  1938,  1229,
-    1162,  3020,  2747,  3572,  2409,  1789,  2337,  3888,  3021,  1962,
-    1229,  3414,  1963,  4005,  3022,  4528,  3496,  4118,  3608,    74,
-      74,  2597,    74,  4611,  5321,  5301,  1397,  2598,  5147,  5405,
-    2599,  5195,  4651,  5197,  4950,  5182,  3948,  2338,  1037,  5460,
-    3679,  5100,  5510,  5474,  5413,  5411,  3023,  3953, -2800,  3024,
-    2339,  1897,  3647,  2340,  4669,  4685,  3550,  4526,   698,  2600,
-    4646,  3551,  4021,  1446,  2827,  1446,  2601,  3025,  4658,  3542,
-    4967,  4187,  5514,  2602,  5564,  2323,  5551,  5171,  2324,  4135,
-    2603,  4122,  2325,  2326,  2327,  5478,  5125,  5399,  1397,  5465,
-    3851,  5128,  3026,  2809,  1057,  2250,  4727,  5266,  4691,  2328,
-     701,  1579,  3262,  3936,  3754,  2604,  2263,  2330,  3755,  3756,
-    3757,  5345,  3001,  2331,  1473,  3851,  1229,  3002,  4095,  3003,
-    1446,  5488,  5553,  5086,  3190,  1229,  1398,  2553,  3191,  2944,
-    1715,  2341,  3893,  4672,  4833,  1039,  5454,  2332,  4455,  2197,
-    3894, -2800,  1229,  1229,  3675,  3217,  1229,  2428,  2346,  2347,
-    2348,  2349,  2350,  2351,  2457,  3903,  2456,  1039,  3901,  2371,
-    1229,  4431,  5450,  5376,  4821,  1229,  3216,  3905,  2461,  4396,
-    1229,  4791,  5246,  1229,  1229,  4803,  5367,  4392,  5366,  4456,
-    4255,  1229,  1229,  5230,  5423,  2466,  4347,  5082,  5452,  5444,
-    5453,  3897,  3820,  3147,  3731,  4237,  3760,  1144,  3818,  1195,
-    5437,  3156,  3626,  1229,   845,  2871,  2096,  3243,  1165,  1492,
-    3883,   701,  2479,   701,  5084,  3234,  2472,  1229,  3247,  1144,
-    3248,  2258,  3250,  4461,  2342,  4822,  4462,  2343,  2344,  2345,
-    4436,  2346,  2347,  2348,  2349,  2350,  2351,  1801,  1037,  1802,
-    2375,  3254,  2333,  1037,  1037,  1188,  5463,  2334,  3677,  2476,
-    1446,   701,  1830,  2956,    83,  1530,     0,     0,  2186,     0,
-    1229,     0,     0,     0,  1245,     0,     0,     0,  2335,  2336,
-       0,  1274,     0,  1789,     0,     0,     0,     0,   379,     0,
-     418,  3851,  1291,  2337,   379,     0,     0,  1243,  1243,   694,
-       0,     0,     0,  5187, -2800,     0,     0,   420,     0,   701,
-       0,     0,     0,     0,     0,     0,  4614,     0,     0,     0,
-     691,  1229,     0,     0,  2338,   691,   379,  2489,  5206,  1524,
-       0,     0,     0,     0,     0,     0,   691,  2339,     0,     0,
-    2340,     0,     0,     0,     0,     0,     0,  2503,  1397,     0,
-       0,     0,     0,     0,  2510,  2512,     0,     0,     0,     0,
-       0,     0,     0,  3760,     0,     0,  1875,     0,     0,     0,
-       0,   379,  1229,     0,  1446,     0,     0,     0,     0,     0,
-       0,     0,   852, -2800, -2800, -2800,     0,  3764,  3765,  3766,
-    3767,  3768,  3769,     0,   846,     0,     0,     0,     0,  1876,
-       0,   845,     0,     0,  1229,  1446,     0,  1229,     0,  1229,
-       0,     0,  5557,     0,     0,     0,     0,     0,  2341,  1083,
-    1037,     0,     0,     0,  1243,  1243,     0,  1083,  1037,  1083,
-       0,     0,     0,  1229,     0,  2323,     0,  1229,  2324,     0,
-       0,     0,   379,  1446,     0,     0,     0,     0,  1229,     0,
-       0,     0,     0,     0,  1579,     0,  1877,  3754,     0,     0,
-       0,  3755,  3756,  3757,     0,     0,     0,  2330,     0,     0,
-    1229,     0,     0, -2800,     0,     0,     0,   418,  4360,     0,
-       0,     0,     0,  1397,     0,     0,     0,  1037,     0,  1878,
-    1037,  1037,     0,     0,   420,     0,     0,  2332,     0,     0,
-    1446,     0,     0,     0,  1446,  1446,     0,     0,     0,  1229,
-       0,  2342,     0,     0,  2343,  2344,  2345,     0,  2346,  2347,
-    2348,  2349,  2350,  2351,  1879,     0,  3183,     0,     0,     0,
-       0,  5333,  3184,     0,     0,     0,     0,     0,     0,     0,
-    3761,  3762,  3763,     0,  3764,  3765,  3766,  3767,  3768,  3769,
-    1229,     0,     0,     0,     0,     0,  1880,     0,     0,  1037,
-       0,  4373,     0,     0,     0,  4026,     0,     0,     0,   852,
-    1229,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   846,     0,     0,     0,     0,     0,     0,     0,     0,
-    1446,  1446,     0,     0,     0,     0,   691,   691,     0,     0,
-     379,  5354, -2800,     0,     0,     0,  4061, -2800,     0,     0,
-       0,     0,     0,  1229,     0,     0,  1229,     0,     0,     0,
-       0,     0,   209,  5533,  2625,  1229,  1883,     0,     0,     0,
-    1229,     0,  1229,  1884,  1229,   379,     0,     0,  2870,     0,
-    1885,  1229,     0, -2800,     0,     0,     0,  3759,  2626,     0,
-       0,     0,     0,     0,     0,  4093,     0,     0,     0,  1229,
-    1887,     0,  2882,     0,     0,     0,     0,     0,  1888,     0,
-       0,     0,  2890,     0,  2891,     0,     0,  3515,     0,     0,
-       0,  2896,   701,     0,  3515,  3515,  2899,  2339,  3515,     0,
-       0,     0,     0,     0,     0,  3515,     0,     0,     0,     0,
-       0,     0,     0,     0,  4132,     0,  3760,     0,     0,  4132,
-    1229,     0,     0,     0,  1397,     0,  1397,     0,     0,     0,
-       0,     0,  1889,     0,     0,     0,     0,     0,     0,     0,
-      74,     0,     0,    74,     0,     0,     0,     0,     0,   376,
-       0,  1229,  1229,     0,  5490,  5491,  5492,     0,   372,     0,
-       0,     0,  1229,     0,  4190,     0,     0,     0,  5479,     0,
-     701,     0,     0,     0,     0,   845,  1579,     0, -2800,  3754,
-       0,  5493,  1229,  3755,  3756,  3757,     0,     0,     0,  1579,
-       0,     0,  3754,  4220,  1397,     0,  3755,  3756,  3757,     0,
-    4774,   376,     0,     0,     0,   380,  5490,  5491,  5492,     0,
-       0,   380,     0,  4775,     0,     0,   695,  1229,     0,     0,
-       0,     0,  3647,  1229,  1229,     0,  1229,     0,   908,     0,
-       0,     0,     0,  5493,     0,     0,     0,   845,     0,  3040,
-    3041,     0,     0,   380,   372,  1229,  3055,  3056,     0,     0,
-       0,   418,     0,     0,     0,     0,   845,     0,     0,     0,
-     376,     0,     0,     0,     0,  5490,  5491,  5492,   420,     0,
-       0, -2800,     0,     0,     0,  3094,     0,  5523,  2346,  2347,
-    2348,  2349,  2350,  2351,     0,     0,     0,     0,   380,     0,
-       0,  5524,  5493,  3761,  3762,  3763,     0,  3764,  3765,  3766,
-    3767,  3768,  3769,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   418,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1229,  1229,     0,     0,     0,  1143,
-     420,  2503,   418,     0,     0,     0,     0,     0,  1229,  5523,
-       0,     0,     0,   852,     0,     0,     0,     0,     0,   420,
-    1229,  1229,     0,  5524,     0,   846,     0,     0,  5523,   380,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3759,
-       0,     0,  5524,     0,     0,     0,     0,  4357,     0,     0,
-       0,     0,  3759,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1037,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   852,     0,     0,     0,     0,
-    1039,     0,  1039,     0,  1039,     0,     0,   846,     0,     0,
-    1039,     0,     0,  2323,   852,     0,  2324,     0,  3760,     0,
-    2325,  2326,  2327,     0,     0,     0,   846,     0,     0,     0,
-       0,  3760,     0,     0,  1039,  1039,     0,  2328,  1037,     0,
-       0,     0,     0,     0,     0,  2330,  1154,     0,     0,     0,
-       0,  2331,   372,     0,     0,     0,     0,     0,  1812,     0,
-      74,     0,    74,     0,     0,     0,     0,   379,     0,     0,
-    2323,   379,     0,  2324,     0,  2332,     0,  2325,  2326,  2327,
-       0,     0,     0,     0,     0,   694,     0,     0,     0,     0,
-       0,     0,   694,     0,  2328,  2323,     0,     0,  2324,  1037,
-       0,     0,  2330,   694,     0,     0,     0,   380,  2331,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  2323,     0,     0,  2324,     0,     0,  2330,  2325,  2326,
-    2327,   694,  2332, -2800,     0,     0,   694,     0,     0,     0,
-       0,     0,   380,     0,     0,  2328,     0,   694,     0,     0,
-       0,     0,     0,  2330,     0,     0,     0,  2332,     0,  2331,
-       0,     0,  1039,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   694,     0,     0,   698,   698,     0,     0,
-    2333,  1817,     0,  2332,     0,  2334,     0,     0,   694,     0,
-       0,     0,   691,     0,   694,  3761,  3762,  3763,  4132,  3764,
-    3765,  3766,  3767,  3768,  3769,   694,  2335,  2336,  3761,  3762,
-    3763,     0,  3764,  3765,  3766,  3767,  3768,  3769,     0,   694,
-       0,  2337,     0,     0,     0,     0,     0,  4561,  1039,     0,
-    4562,     0,  4563,     0,     0,     0,     0,  2333,     0,     0,
-       0,     0,  2334,     0,     0,  1037,     0,     0,     0,     0,
-       0,     0,  2338,  1037,     0,  1037,     0,     0,     0,     0,
-       0,     0, -2800,  2335,  2336,  2339,     0, -2800,  2340,     0,
-       0,     0,     0,     0,     0,  3515,     0,     0,  2337,     0,
-       0,  3515,  3515,     0,  3515,     0,  2788,     0,  2333,     0,
-       0,     0,     0,  2334,     0,     0,     0,     0,     0,     0,
-       0,     0,     0, -2800,     0,     0,     0,     0,     0,  2338,
-       0,     0,     0,     0,  2335,  2336,  1083,     0,   694,     0,
-    1083,     0,  2339,     0,     0,  2340,     0,     0,     0,  2337,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   379,
-       0,     0,     0,     0,     0,     0,  2341,  2339,     0,     0,
+      81,  1144,  1091,  1693,  1163,  1715,  1153,   371,   376,   366,
+     367,  1164,  1360,   369,  2150,   852,  1762,  1768,   955,  1038,
+    1683,  2154,  1537,  1538,  1539,  1992,  2975,   848,  1543,   419,
+     943,  1128,  2160,  1267,  2205,   419,  1962,  2127,  1125,  1724,
+    1835,  1038,  2146,  2571,  2233,  2035,   938,  2942,  3170,  3429,
+    2005,  2634,  2133,  2054,  3870,  1397,  1012,  2764,  1046,  1201,
+     852,  2117,  2118,  2272,  2075,  3718,  2420,  2669,  1060,  2431,
+    1461,  2126,   848,  3179,  1707,   264,   420,  1267,  3580,  2042,
+    1396,  3990,   420,  2047,  2642,  3560,  4190,   701,  2051,  3267,
+    3269,  4026,   746,  4028,   376,  4007,  2058,  2145,  1092,  3199,
+     896,  1506,   752,  4164,  2851,  2105,  2077,   997,  1087,  3528,
+    2652,  2717,  4234,  3038,   420,  4217,  1087,  3532,  1087,  3534,
+    4445,  3490,  1957,  1244,  2731,  2732,  2434,  1155,  4485,   733,
+    1273,   852,  4142,  1147,  4693,  1267,  4484,   900,  3699,  2869,
+    4137,  1291,  1818,   848,  1466,  4137,  1205,  3921,  4520,  1820,
+     949,  1501,   957,  1156,  4479,  1481,   845,  1478,  3863,   420,
+    4647,   418,  3861,  3862,  4685,  4401,   733,   418,  4686,  1355,
+    4696,  1079,  4702,  2727,  1363,  2486,  2488,  2489,  2420,  4372,
+    3573,  1122,  1114,  3178,  2893,  1373,  1142,   947,   954,  3803,
+    4418,  4679,  2627,  2641,  2480,  2480,    79,   954,  2544,   418,
+    1397,   845,  4859,  4692,  1035,  3937,  2195,  1088,  2934,  1894,
+    4989,  2190,  1755,  3266,  4416,  1088,  2220,  1088,  2114,  2115,
+    4458,  1758,  4340,  1796,  1797,  1700,  1035,  3932,  1196,  2125,
+     420,  1490,  4253,  2378,  2326,  5120,   427,  5068,   954,  5070,
+    3760,  3760,  5113,  1809,   418,  2455,  2074,   906,  2117,  2118,
+      45,   427,  2133,    37,    38,    39,    40,  2138,  1391,  2226,
+      44,  5215,  2106,  2332,  4857,    45,  2126,  2738,  2106,  5139,
+    1218,  1809,   845,   846, -1713, -1713, -1713, -1713,  2743,   427,
+    3663, -1713,  3665,   423,  3109,  4223,  1515,  2421,  1956,  2106,
+    1520,  1521,  1522,  2334,  1971,   897, -1698, -1698, -1698, -1698,
+    1533,  3512,   273, -1698,  1997,  2842,  2106,  2644,  1526,  5146,
+    5147,   371,   376,   366,   367,   418,   427,   369,   846,  2030,
+   -2800, -2800, -2800, -2800,  4745,   274,  4747, -2800,   427,  3926,
+    2644,    37,    38,    39,    40, -2800, -2800,    43,    44,  1578,
+    1810,   419,    45,   275,  5336,  3407, -2053, -2053, -2053, -2053,
+    4866,  1554,  1870, -2053, -2801, -2801, -2801, -2801,   129,   130,
+   -1698, -2801,  1572,  1240,  1697,  3014,  2362,  1063,  1150, -2801,
+   -2801, -2798, -2798, -2798, -2798,  3760,   419,  4208, -2798,   264,
+     276,  2197,  3331,     3,  2843,  3109, -2798, -2798,   420,   846,
+    4643, -2797, -2797, -2797, -2797,  3408,  2114,  2115, -2797,  2848,
+    5313,  3536,  5294,  5259,  4002,  1861, -2797, -2797,  2644,  4523,
+    1686,  2021,  4755, -2214,  4756,  2565,  2579, -2393, -2393, -2393,
+   -2393,  2125,  2644,   420, -2393,  1788,   300, -1703, -1703, -1703,
+   -1703,  2725, -2393, -2393, -1703, -1703, -1703, -1703, -1703,  3736,
+    2194,  2644, -1703, -1670, -1670, -1670, -1670,  1064,  3716,   320,
+   -1670, -1683, -1683, -1683, -1683,  2005,  1871,  2817, -1683,  3436,
+   -1941,  1192,  2321, -1710, -1710, -1710, -1710, -1941,  -840,  4003,
+   -1710,  2990,  2778,   418,  3163,  1220,  1267,    37,    38,    39,
+      40,  3409,  1164,  5290,    44,  1726,  1133,  1727,  2567,  2368,
+    5430,  1923,  5255,    37,    38,    39,    40,  4862,  3144, -1703,
+      44,   325,  5279,  5280,  3316,  3145,  2568,   343,   418,  1862,
+   -1713, -1713, -1713, -1713,  2422,  5206,  2292, -1713,  5010,  2107,
+      37,    38,    39,    40, -1960,  2107,  3437,    44,  4644,  2779,
+    4158, -1960,   372,   943,  1157,  3241,    37,    38,    39,    40,
+    5314,   347,   426,    44,   427,  4757,  2107,    37,    38,    39,
+      40,  4524,  2365,    43,    44,  1578,  1810,  3867,    45,  2106,
+    2849,  1568,   862,  2107,  2038,  2365,  2818,  2970,  1199,  1200,
+    2668,  2976,  2844,  2978,  1397,  3257,  2981,   427,  2772,  3261,
+      37,    38,    39,    40,  1839,  2845,    43,    44,  1065,  2320,
+    2991,    45,  2776,  1799,  1802,  2412,  2413,  1397,  2644,  2183,
+     427,  2577,   908,  -148,  3110,   863,   273,  4076,  3354,    43,
+    2744,  3513,  -148,  1158,    45,  4224,  3537,  -148,   372,   365,
+    2363,  4535,  2161,  1241,  1190,  1066,  1067,  2739, -2214,   274,
+    1831,  3424,  3410,   370,  4137,  1206,  5525,  4867,  2569,   381,
+    2254,   958,  1720,  1555,  4990,  2139,  1721,   275,  2653,   249,
+    2209,  4957,  1811,   949,  2152,  1863,  2255,  1542,  5389,  4525,
+    2134,  2039,  4526,  3955,  2420,  4985,  2185,  1397,  2227,  2353,
+    3770,  3771,  3772,  3773,  3774,  3775,  3775,  2326,  4662,  1197,
+    1811,  4489,  1032,  1033,   276,  1805,  2713,  2152,  2715,  1864,
+     947,  3208,  2276,  2128, -2214,  5410,  5489,  1032,  1033,  1929,
+    2379,  2251,  1284,  1143,  4286,  3823,  2332, -2214,  5006,  4511,
+    1526,  2420,  2129,  2767,  1068,  3177,  2850,  2264,  2189,  1865,
+    2722,  2900,  3040,  2726,  1872,  4802,  2130,  1198,  2798,  4806,
+     300,  4777,  2273,  5011,  1728,  4418,  2334,  1297,   954,   954,
+    2570,  2963,  4539,  1542,  1351,  4673,  1233,  2207, -1698,  2938,
+    -408,  1709,  2763,   320,  5467,  4751,   852,  2668,  1449,  4796,
+    5026,  1144,  2014,  4845,  5027,  5028,  5472,  5029,  1209,  3923,
+    2210,  2992, -2800,  2212,  1812,  1813,  2216,  1134,  2218,  5462,
+   -1941,  2221,  1866,  1507,  3317,  2225,  1192,  1763,  5414,  4177,
+    2993,  3072,  1346,   751,  1397,  2906,  1720,  5452, -2053,  3090,
+    1721,  4159,  1397,  1397,  2971,   325, -2801,  3772,  3773,  3774,
+    3775,   343,   419,  2982,  1159,  3355,  2107,  1393,  3146,  2391,
+    5275,  2503,  2466, -2798,  3939,  5517,  3940,   702,  3329,  1298,
+    1154,  2467,  2791,  2792,  2112,  4186,   372,  4715,  4716,  4717,
+    4718,  4719,  2112, -2797, -1960,   347,  4110,  3170,  3170,  3170,
+    1406,  1336, -1670,  4114,  4115,   420,  2039,  4118,  4435,   420,
+    5105,  4633,  2630,  1229,  4123,  5431,  3703,  5115,  1545, -2393,
+    1299,  4236,  1229,   701,  1508,  3890,  1514,  4178,  1519, -1703,
+     701,  1207,  3986,  4471,  1523,  3425,  2613, -1703,  4116,  4117,
+     901,   701,  1205,  2578,   959,  2116,  1155,   845,  3243,  4077,
+    3243,  1502,  1499,  2120,  3281,  2946,  5205,  1229,  1514,  1519,
+    2190,  2953,  5181,  2255,   858, -1710,   859,  2956,  1976,   701,
+   -1471,  1300,  1156,   365,   701, -1474,  1177, -1670,  2654,  2128,
+    3371,  2890,  2891,  2627, -2529,   701,  2683,   370,   376,  2655,
+     418,  2656,  1545,   381,   418,  2323,   960,  2396,  2129,  3991,
+    4237,  3552,  2409,  2409,  1394,  5438,  4179,  5488,  1977,  5168,
+    5182,   701,  2132,  1777,  2363,  1229,  1710,  5270,  5183,  2141,
+    5056,  1447,  2366,  1766,  4708,  1229,   701,  2326,  3854,  3101,
+    5475,   961,   701,   962,  2369,  1192,  3417,   954,  3184,  4551,
+    1812,  1813,  1447,   701,  1178, -1471,  5184,  2657,    81,  3448,
+   -1474,  1541,  1500,  4582,  1352,  1087,  2332,   701,  4456,  1087,
+    2717,  2574,  1002,  4485,   846,  2972,  5239,  2099,  1450,  1513,
+    2690,  1518,  2015,  1937,  4829,  3619,  1731,  4485,  4293,  5401,
+    4931,  1532,  1711,   427,  4170,  4484,  2334,  1178,  1495,  3854,
+    3129,  3345,   954,  3924,  1938,  1568,  1786,  1787,  2555,  -148,
+    -148,  1548,  1550,  1179,  3448,  1876,  1180,  2565,  1526,  2887,
+    5119,  1512,  1026,  1517,  2862,   703,  3704,  4049,  5415,  2100,
+    5185,  1696,  4840,  1690,  2566,  1704,  1738,  3705,  2945,  2004,
+    1725,  1542, -1670,  1130,  1027,  1267,  4238,  3289,  3330,  4552,
+   -1471,  5402,  4180,  1547,  1549, -1474,  1179,  1229,  1229,  2142,
+    4135,  1534,  2141, -2163,  1088,  4135,   701,  4144,  1088,  2350,
+    2351,  2352,  2353,  1978,  3987,  3346,  5271,  3553,  5034,  2579,
+    2615,  5060,  5439,  5343,  5225,  2066,  5064,   420,  2621,  5066,
+    2567, -2529,  1148,  2321,  1229,  3274,  5057,  1192,  2573,   733,
+    2127,  5330,  2170,  2979,  2980, -1471,  4521,    35,  2568,  1181,
+   -1474,  4239,  4147,   903,  3991,    41,    42,  4181,  4583,  5340,
+    5350,  2101,  1026,  5341,  5348,  2067,  2574,  5476,  4294,  3130,
+    1178,  4050,  4485,  5312,  3131,  3418,  4982,  2152,  2780,  1087,
+    1087,  4230,  2171,  3978,  1027,  4171,  1026,  2703,  4234, -2529,
+    2706,  2707,  1181,  1149,    79,   701,   701,   860,   920,  5347,
+    3554,  3871,  4852, -2196,  3872,  3873,  5240,  1979,  1027,  1778,
+    3132,  2102,   418,  4880,  5318,  3874,  3875,  3876,  2781,  3877,
+    3878,  3035,  3037,  3979,  3879,  3880,  3881, -2215,  3044,  1179,
+    1853,  1859,  2142,  3441,  3058,  3059,  3060,  5477,  2806,  1381,
+    2859,  5186,  1079,  1966,  3076,  3078,  2973, -1471,  2919,  3088,
+    1798,  3896, -1474,  1182,  2580,  1527,   922, -1670,  2483,  2773,
+    1150,  5478,  1535,  2708,  4841,  -535, -1670,  1049,  2116, -1670,
+    1839, -1670,  1183,  3349,  4676,  3345,  1150,  3706,  1088,  1088,
+    2569,  2859,  5226, -1471,  3442,  2889, -1471,  4955, -1474,  4074,
+    5502, -1474,  4151,  1506,  2103,  1053,  2143,  3187,  2486,  5432,
+   -2163,  2575,  3690,  2487,  5273,  1229,  5138,    37,    38,    39,
+      40,  2911,  1447,  1267,    44,  2144,  1229,  4051,  3226,  2967,
+    2068,   853,  5116,  5289,  2924,  1181,  2484,  -634,  5522,  5319,
+    4152,   854,  1447,  2092,  2581,  3133,  2484,  2172,  3443,  2933,
+    2932,  1447,  3856,  2949,  4153,  4991,  5342,  1801,  5487,  3346,
+    1026,  4052,  1684,  5490,  4075,  1981,  5437,  4992, -2163,    35,
+     427,  1982,  3218,    37,    38,    39,    40,    41,    42,    43,
+      44,  3882,  1027,  2782,    45,  4844,  1063,  1791,  3980,  1229,
+    3151,  4053,  2570,  5251,  1151,  2485,  2070,  3064,  5554,  2002,
+    1526, -2243,  2709,  5234,  2710,  2485,  1821,  5320,  1144,  1181,
+   -2196,  1382,   930,  3856,   931,  5532,  2071,  2348,  2349,  2350,
+    2351,  2352,  2353,  3385,  2069,  2622,  5056,  5172,  1685,  4435,
+    4818,   920,  1447,  2152, -2215,  4825,    35,  3484,   936,  2143,
+    3444,  2173,  4154,   855,    41,    42,  2860,   376,  1720,  2518,
+    2152,  4485,  1721,  1791,  4610,  4473,  1164,  1527,  4737,  5386,
+    4613,  4614,  1267,  4616,  4546,  1383,  1064,  1818, -2196,  1983,
+     701,  1384,   372,  1143,  1820,  4428,  5558,  2783,  5523,  3386,
+    4677,  3660,  3981,  5124,  2393,  1061,  4282,  4975,  3661,   922,
+     701,  1181, -2215,  4008,    81,    81,  4137,    81,  5292,  2968,
+    3666,  1181,  5297,  5298,  3475,  1229,  5393,  5394,  2435,  2436,
+    3476,  2440,  2623,   701,  2427,  3883,  2211,  3349,  2213,  2559,
+    3152,  2217,  1844,  2219,  1097,  4993,  2222,  2223,  2224,  2560,
+    4001,  2969,  5194,   698,  1156,  1156,  3539,  1156,  2099,  2231,
+    3585,  3586,  3587,  3588,  2325,  5504,  2561,  2326,   216,   701,
+    3445,  1297,  3593,  2257,  1527,  2258,  3456, -2050,  3446,  3170,
+    2003,  3447,  3884,  1447,  4547,   701,  2072, -1483,  2720,  3072,
+    3072,  3387,  1845,  1419,  3072,  5276,  2332,   856,  4306, -1483,
+     701,   224, -2802,   701, -1483,  5282,  2900,  3897,  1766,  2444,
+    2948,  4672,  3936,  1170,  1229,  2394,  3637,  1202, -2243,  1495,
+    1062,  1205,  1745,  1870,  4135,  4463,  2334,  1065,  3477,  1154,
+    1039,  3072,  3072,  1171,  2441,  1984,  4962,  4485,  4537,  1098,
+    2717,   235,  1229,  1172,  3271,  4474,  2445,  3388, -1483,  1913,
+     852,  3219,  1039,  3950,   238,   930,  2986,   931,  5209,  4721,
+    3358,  4722,  2419,  1298,  1066,  1067,  5210,  4144, -1483,  1985,
+    1229,  1229,  1229,  4145,  1229,   248, -2243,  4475,  3370,  4548,
+    1397,  2055,  3885,  3005,  4146,  1846,  2357,  2383,  2384,  3227,
+    3854,  3117,  3854,  3118,  1229,  5505,  2583,  4009,  4476,  1986,
+    4078,  2562,  2101,  4538,  1299,  5170,  2584, -1483,   904,  5514,
+      79,    79,  4147,    79,  4148, -1483,  3119,  1746,  3335,    37,
+      38,    39,    40,  4010,  5335,  2442,    44,  1871,  1945,  1791,
+     701, -2802,  3291,  2399,  2554,  4275, -2802,  2987,   701,   701,
+    1913,  1096,  3455,  2447,  4963,  1173,  3220,  3359,  1229,   420,
+    1959,  3204,  2102,   733,   733,  1300,   419,   419,    37,    38,
+      39,    40,  1710,  2152,  3468,    44,  5332,  1720,   852,  3246,
+    4409,  1721, -2802,  2823,  3478,  5224,  1946,  1229,  1087,  1297,
+    2419,  1229,  1229,  1267,  1960,  1280,  4209,  1942,  1934,  4213,
+    4149,   845,  2500,  3812,  3507,  3813,  5550,   862,  2448,  5551,
+    4410,  3854,   420,   420,   420,  1706,   419,  5362,  3479,  1174,
+    3292,  1281,  2724,  2522,  3120,  4808,  2341,  1087,  3814,  3121,
+    5025,  1943,  5211,   701,  3122,  4412,  3367,  1850,  1711,  1851,
+    2385,  3272,  3205,  3273,   418,  2103,  1786,  1787,  3480, -1483,
+     863,  1568,  1210,  3961,   845,  3345,  5286,  4150,  2824,  2585,
+    3255,  2608,  4151,   420,  1211,  1212,  3707,  1947,   733,  3639,
+     420,  1447,    37,    38,    39,    40,  4234,   420,  5283,    44,
+    3893,  1298,  1093,  1213,  2759,  3613,  1214,  1088,  4408,  1175,
+    1859,  5436,  3859,  2586,  1859,  1961,  2760,   418,   418,   418,
+    4152,  4324,  3938,  4325,  2386,  4870,  4871, -2802,  3274,  1720,
+    1751,  2688,  1742,  1721,  4153,  1948,  1123,  1949,   846,   845,
+    4315,  2761,  1299,  3366, -2074,  5220,  1088,  2716,  -170,  3346,
+    1146,  3815,  4446,  3923,  1447,  3481,  3816,  4414,   963,  1791,
+    3708,  5101,    43,  5103,  1791,  1791,  3977,    45,   418,  4341,
+      37,    38,    39,    40,  -170,   418,  1951,    44,  4409,  3347,
+    3123,  4974,   418,  2906,  1148,  4965,  2984,  1447,  2670,  3482,
+    3124,   862,  1853,  1300,   920,  2689, -1521,  1853,   852,  1753,
+    4927, -1521,  4928,  4929,  3440,  2670,  4930,  3457,  4410,  4984,
+    2804,  4447,  1751,  3348,  5145,  3460,  1953,  3462,  5357,  3483,
+   -2802,   372,  4154,  4411,  2152,  1215,  1397,  2348,  2349,  2350,
+    2351,  2352,  2353,  4412,   863,  1836,  4408,  3501,  2444,  3519,
+    2495,  2496,  2326,  1982,  4326,  1149,  1853,  4641,   701,  2885,
+    1853,  3631,   922,  1937,  4327,  1955,   846,  1160,  4413,  3504,
+    3303,  4863,  3299,  1216,  5396, -1521,  2514,  2516,  1447,  1837,
+    2401,  4490,  3303,  3759,  1938,  2445,   862,  5061,  4281,  3485,
+    4492,  1753,  3817,  1447,  3856,  3787,  3856,  3969,  1397,  5524,
+    1136,  2797,  3818,  3868,  2708,  5549,  2280,   420,  3194,  1838,
+    1859,  2334,  1447,  2714, -1521,  1164,  4409,  3349,  4492,  3486,
+    2402,  4642,  1150,  3678,  3304,  2289, -1010,  3810,   701,   863,
+    1754,  5142,   701,  3011,   216,  4864,  3958,  2671,  2446,  2995,
+    2757,  -431,  1791,  2039,   701,  4414,  4410,  4285,  4966,   845,
+    1791,  1983,  5143,  4066,  2671,  2305,  1353,  2660,  1354,  1447,
+    5315,  4411,  2660,  1502,  2672,  3836,  4493,   224,  4191,  3201,
+    2318,  4412,  1229,   209,  2758,  3170,  1026,  4200,  1447,  3992,
+    3170,  2672,  2447,  5464,  1229,  4286,  3170,  2673,  2661,  2674,
+    1447,  4967,   418,  2661,  4493,  1374,  4413,  1937,  1027,  2694,
+     376,  4012,  1447,  4830,  2673,  3856,  2674,   235,   930,  1791,
+     931,  2326,  1791,  1791,  5385,  3891,  3177,  1229,  1938,   701,
+     701,  4494,  2668,  4495,  2492,  5062,  1375,  2493,  3010,  4522,
+    4527,  4740,   701,  2709,  2055,  2710,  1751,  2448,  2128,  2668,
+    2332,  1752,  1447,  1841,  5195,  1447,  1151,   701,   701,  4494,
+    -431,  4495,  1972,  3487, -2593,   249,    81,  2129,  1376,    81,
+    5123,  5369,  3004,   376,  3001,  3002,   846,  4512,  3003,   701,
+    2334,  1154,  1154,  4414,  1154,  5196,  2951,  1842,  2952,  4296,
+    1374,  1791,  2954,  3488,  2955,  3821,  1973,  2957,  5370,  3692,
+    1974,  2958,  3854,  4036,    35,  3033,  3854,  1356,  5149,  1357,
+     852,  2644,    41,    42,  1377,  1753,  4037,  1843,  5545,  1229,
+    2645,  1375,  3107,  4944,  4540,  2648,  1975,  2649,  4945,  4949,
+    2494, -1520,  3072,  3072,  3072,  3072, -1520,  5150,  3072,  3072,
+    3072,  3072,  3072,  3072,  3072,  3072,  3072,  3072,  3682,  3177,
+    4695,  4250,  4251,  4188,  1754,  2820,  1229,  1229,  1397,  4950,
+    1267,  2670,  1229,  1229,  4160,  4350,  1167,  4301,  3057,  1229,
+    1229,  1229,  4946,  4600,  2852,  1229,  3210,  1229,  1229,  1229,
+    1229,  1229,  1229,  2650,  1229,   193,  1229,  1229,  2538,  2670,
+    1229,  2695,     8,  4601,  3072,  3072,  2698,  5142,  1731,  1377,
+   -1520,  4846,  4046,  1251,  1447,  1229,  1229,  1229,  1229,   420,
+    1252,  1253,  1254,  1229,  5191,  2191,  5512,  1229,  5143,  2192,
+    1229,  1208,  2539,  1229,  1229,  1229,  1229,  1229,  1229,  1229,
+    1229,  1229,  3293,  1229,  3296,  3201,  4047,   864,  2644, -1520,
+    3902,  1229,  2128,  3995,  1229,  2747,  5534,  2651,  1202,  2753,
+    2128,   845,  2540,  2180,   121,   419,   905,  3619,  1702,  2728,
+    1219,  2129,    79,  5002,  4584,    79,  4048,  4683,   216,  2129,
+     999,  5142,   125,  3732,  2181,  2130,  1234,  2944,  3229,  2389,
+    1940,  1580,   427,  2132,  3760,  4585,  1236,  2756,  3761,  3762,
+    3763,  3290,  5143,  1397,   418,  1989,    45,  1249,  1993,  2191,
+    2671,   224,   420,  2941,  3353,  4299,  3590,  1229,  2409,  3286,
+     419,  3591,   419,  4042,  5564,  4941,  2374,  4943,  3968,  2375,
+    5461,  4947,  1094,  4948,   852,   216,  4135,  2672,  2671,  1494,
+     427,  3947,  3948,  3943,    35,  1039,  2419,  1039,  2116,  1039,
+    2545,   235,    41,    42,  4470,  1039,  4487,  4488,  1250,  2116,
+    2673,  2545,  2674,  2900,   238,  2672,  4143,   420,   224,   420,
+    3927,  3591,  1286,  3566,    37,    38,    39,    40,   846,  1039,
+    1039,    44,  3733,    35,   427,   248,  3734,  1295,  2673,   701,
+    2674,    41,    42,  1742,  1296,  2668, -1471,   418,    45,   249,
+   -1254,   129,   130, -1254,  4257,  4258,  4259,    81,   235,    81,
+   -1674, -1674, -1674, -1674,  2116,  1447,  1839, -1674,  1087,  1447,
+    1447,   238,  1343,  2668,  4255,  4256,  4257,  4258,  4259,   701,
+    3441,  1345,  4260,   420,   701,  2123,  2124,  1192,   701,  1720,
+    1340, -2053,   248,  1721,  3094,  4176,   701,  3097,  1348,  2200,
+    5216,  2201,   418,   852,   418,  1361,   249,   852,  2266,  1005,
+    2267,  3439,  1369,  3764,   701,  3901,  -534,  1229,  3786,  3414,
+    3788,  3789,  2279,  4508,   249,   845,  3856,  2906,  1229,  1006,
+    3856,  3442,  1447,  1087,  3765,  1229,  2425,  4061,  2426,  2428,
+    1005,  2429,  1379,  2878,  1447,  2879,  4069,  4728,  4729,  4730,
+    2476,  2477,  4289,  3854,  3215,  3216,   701,  1039,  3854,  2325,
+    1006,  1007,  2326,  3854, -1544, -1544,  3854,  1088,   418,  2476,
+    3239,   698,   698,   701,   701,  2116,  1819,  2545,  3072,  2005,
+    3567,  1447,  3865,  3866,  1397,  3443,  1397,  2943,  2964,  2944,
+    2965,  2332,  1007,  3766,   372,  1380,  3854, -2802,  2966,  2998,
+    2965,  2999,   420,   701,  1386,  3200,   420,  3201,  1389,  4161,
+    3854,  4163,  1378,  4424,  4255,  4256,  4257,  4258,  4259,   427,
+    3364,  2334,  3365,  1039,  4713,  1403, -1681, -1681, -1681, -1681,
+    1448,  1791,  1088, -1681,   701,  3449,  3902,  1457,   701,  4317,
+    1456,  3902,   846,  3431,   845,  3432,  1462,   852,   845,  1473,
+    3540,  1821,  3541,    79,  1397,    79,   701,   372,  1000,  3550,
+    3582,  1482,  4429,  4430,  4431,  1497,  4169,   701,  4172,    45,
+    3545,  2670,  3546,  4346,  5165,  1536,  3606,  3444,  3607,  4227,
+     701, -1672, -1672, -1672, -1672,  3809,  1544,   418, -1672,   701,
+    3449,   418,  1257,  1258,  1259,  1540,  1260,  1261,  1262,  1263,
+    1264,  1265,  2670,  1551,  3640,    35,  2944,  2420,  1557,    37,
+      38,    39,    40,    41,    42,  1558,    44,  3568,  4388,  3684,
+    3731,  2965,  2944,   206,  1559,  3740, -2802,  2944, -1050, -1050,
+    3115, -2802,  1565, -1675, -1675, -1675, -1675,  1229,  1447,  3177,
+   -1675, -1673, -1673, -1673, -1673,  3746,   420,  2944, -1673,  3747,
+     216,  2944,  3449,  1566,   206,  3854,  1567,  3748,  3449,  2944,
+    3569,   846,  1144,  1568,  3779,   846,  2944, -2802,  1569,  3356,
+    3767,  3768,  3769,  1570,  3770,  3771,  3772,  3773,  3774,  3775,
+    3792,   216,  2944,   224,  1571,  1575,  2670,  3445,   845,  3797,
+    3449,  3798,  1577,  1574,  3837,  3446,  3838,  3839,  3447,  3840,
+    3426,  4029,  4605,  4030,  1705,  4034,  1144,  4035,  1447,  1708,
+    2671,  2341,   701,  1712,   224,  3048,  4295,  4221,  1713,  4222,
+    3854,  1714,  1732,   235,  1229,  1739,  4248,  1008,  2944,  1719,
+    4347,   418,  4348,  4357,  2670,  4358,   238,  2672,  1740,  1791,
+    5002,  2671,  4368,  1742,  2944,  5491,   193,  1791,  1743,  1791,
+    4915,  4916,  2670,  4918,   235,  1749,  4454,   248,  4455,  4459,
+    2673,  4460,  2674,   372,  1769,  1765,  4705,   238,  2672,  1775,
+    4469,  1009,  3273,  4491,   701,  2965,  4634,    35,  4635,  1039,
+    1764,  1771,  1229,  3049,  4073,    41,    42,  1779,   248,  2670,
+    1776,  2673, -2802,  2674,  4674,  2668,  2965,    80,  3842,  3843,
+    3844,  4734,   249,  2255,  4752,   846,  2944,  4778,  4302,  2999,
+    4790,  4848,  2944,  3273,  4773,  1780,  4854,  3856,  4855,  1144,
+    1781,   701,  3856,  1784,  1792,  2671,  2668,  3856,   852,   216,
+    3856,  4860,  4079,  2965,   852,  1192,  4861,  1447,  2965,  4934,
+    3793,  4935,  3050,   701,  1782,  3051,  3800,  4986,  1783,  4987,
+    4107,   701,  2672,  1785,  1793,  1229,  2670,  5036,  1447,  5037,
+    3856,  1229,   224,  1844,  5038,  5046,  2944,  2999,  5121,  1447,
+    5122,  1824,  1795,  2671,  3856,  2673,  1825,  2674,  1229,  5192,
+    5217,  2965,  5218,  1229,   700, -2802,  5235,  4513,  2999,  1827,
+    1833,  2671,  2348,  2349,  2350,  2351,  2352,  2353,  1839,  3854,
+    2672,  5243,   235,  5244,  1869,  1874,  1229,  1229,  1229,  1896,
+    2668,  1229,  5248,  1845,  3201,   238,  1900,  1901,  2672,  1229,
+    1229,  1229,  1229,  2673,  3854,  2674,  1929,   420,  2671,  5254,
+    1898,  4198,  1229,   420,  1931,  1229,   248,  1229,  3052,  1932,
+    5256,  2673,  4198,  2674,  5268,  1933,  5269,   948,  1229,  1229,
+    5492,  1934,  1229,   966,  4541,  2672,  1936,  5309,  2668,  5310,
+    5331,  5349,  2388,  5269,  1941,  5363,  1229,  2999,  1229,   845,
+    1229,  3004,   376,  3001,  3002,   845,  2668,  3003,  2673,  1039,
+    2674,  1052,  1944,  1967,  1039,  1039,  5364,  1968,  3798,  4938,
+    1229,  5365,  1980,  2944,  2325,  2671,  5375,  2326,  3201,  1991,
+    5378,  1229,  4198,  1229,  1229,  1229,  1846,  1990,  1994,  4683,
+    4971,  1791,   418,  2668,  4807,   913,  4810,  2000,   418,  3856,
+    2001,  5400,  2672,  2999,   701,  5406,  2332,  2999,  1229,  5407,
+    3902,  2999, -2802,  1999,  3757,  3758,  5422,  2006,  5423,  3777,
+    2008,  1229,  3053,  2010,    74,  2673,  1229,  2674,  5453,  5454,
+    3201,  2944,  1229,  2017,  2018,  1847,  2334,  5455,  5457,  2944,
+    2944,  5508,  1229,  4198,  2013,  2024,  5500,  5501,  5511,   698,
+    5262,  5533,  5547,  5269,  5548,  2025,  3807,  3808,  2031,  5573,
+    2668,  5548,  2028,  2033,  3856,  3072,   846,  2036,  2043,  1848,
+    3854,  2046,   846,   209,  5039,  1748,   920,  1750,  2048,  2039,
+    2057,  1447,  2059,  2060,  1447,  -191,  1447,  2062,  2064,  2076,
+    2078,  1447,  2085,   701,  2087,  2091,   881, -1004,  2096,  1849,
+    3820,  2104,  2109,  4621,  2110,  2111,  2112,  2116,  2119,   701,
+     701,  4762,  2120,  2122,  2136,  1229,   852,   852,   852,  2148,
+    2149,  1835,  2151,  2152,  2159,  2162,  2163,  2164,  1850,  2165,
+    1851,  2166,  1039,  2167,   922,  2169,   701,  2175,  2174,   701,
+    1039, -2802,  1447,  2176,  2232,  4622, -2802,  2177,  2179,  2184,
+    4658,  4659,  2198,  2263,  2268,  2270,  2277,  2271,  2278,  1447,
+    2284,  2285,  2286,  4663,  2360,  2287,  2358,  2288,   249,  2362,
+    4623,  2290,  2291,  5571,  5572,  2292,  2293,  3581,  1852,  2294,
+    2295,  2297, -2802,  1447,  2298,  4624,  2299,  2300,  1037,  4625,
+    2301,  2302,  4837,  2303,  2304,  2306,  2307,  2308,  2309,  1039,
+    1791,  2392,  1039,  1039,  2310,  2311,  2363,  5247,  2312,  4626,
+    1037,  2313,  4627,  2388,  2404,   420,   420,   420,  5247,  1526,
+    2414,  2433,  2424,  1752,  1754,  4628,  2341,  2462,  2464,  2473,
+    2475,  2482,  1181,  2490,  2497,  2499,  2501,  2509,  1580,   701,
+    2510,  3760,  2512,  3856,  2517,  3761,  3762,  3763,  1447,  2541,
+    1447,   701,  2519, -2745,  2521,   701,  2542,   845,   845,   845,
+    2545,  2543,  4365,  2546,   701,   852,  2549,  2547,  3856,  2548,
+    2550,  1039,  2551,  2576,  5160,  5162,  2557,  2804,  2582,  2588,
+     930,  2610,   931,  4382,  2614,  2616,  5154,  2617,  2618,  2619,
+    2635,  2620,   933,  2637,  2662,  2647,  2636,  5305,  2658,  2664,
+     418,   418,   418,   935,  4629,  2665,  2055, -2802,  2666,  1447,
+    2667,  2668,  4630,  2676,  2679,  2677,  2678,  2680,  2684,  2685,
+    2693,  4245,  2696,  2700,  2701,  2704,  2711,  2712,   701,  2718,
+    1913,   943,  2719,  2746,  1447,  1545,  2723,  2740,  2729,  2741,
+    2730,  2769,  2742,  3072,  2318,  4731,  1877,  2745,  4631,  2751,
+    2755,  4204,  2770,  4835,  2777,  2785,  2786,  2771,  2788,  4129,
+    1447,  4216,  2789,  2799,   420,  1447,  2800,  2805,  2808,  2809,
+     701,  2813,   701,  2812,   846,   846,   846,   915,  2816,  1878,
+    2821,  2836,  1961,  2854,   701,  4244,   701,  2841,  2318,  2857,
+    2858,  2866,  2872,  2870,  2874,  2892,  2875,  2881,  2886,  5376,
+   -2802,  1144,  2894,  2895,  2913,  3115,   845,  2348,  2349,  2350,
+    2351,  2352,  2353,  2901,  2916,  2918,  2915,  2917,  1267,  1144,
+    2903,  3830,  2935,  1447,  2904,  2936,  2960,  2977,  2899,  2983,
+     948,  3765,  2996,  3040,  3856,  2900,  1879,  3848,  3013,  3089,
+     701,  1447,  2961,  3045,  3095,  2326,  4958,  3108,  3099,   418,
+    3114,  3126,  3128,  3148,  3149,  3163,  1447,  3183,  4390,  4391,
+    4392,  4393,  3188,  3180,  3181,  3186,  3191,  3192,  1149,  1880,
+    3211,  3212,  3213,  3230,  3202,  3248,   372,  3224,  2378,  3263,
+    3203,  3214,  3262,  3277,  3275,  5151,  3245,  3276,  5311,  3247,
+    3766,   954,  3294,  3301,  3302,   701,  4877,  3265,  3848,  5072,
+    3297,  1143,  3299,  3308,  1881,  3313,  5087,  3324,  3318,  1229,
+    3328,  5293,   701,  3332,  3319,   852,  3321,  3340,  3341,  3344,
+    5100,  5296,  3362,   846,  1702,  1706,  3357,  4352,  3376,  5301,
+    3389,  5303,  1397,  3394,   701,  3395,  1882,   701,  3421,  3416,
+    5093,  3430,  3422,  3433,  3434,  3492,  3450,  3489,  3435,  3515,
+    3514,  3503,  3510,  4911,  1229,  3511,  1791,  1447,  3516,  3522,
+    3523,  1791,  3542,  1229,  3526,  3524,  3535,  3525,  3533,  1229,
+    3558,  1229,  3572,  3530,  1229,  3547,  3576,  3583,  1447,  1229,
+    1229,  1229,  1229,  3574,  3589,  1229,  1229,  1229,  1229,  1229,
+    1229,  1229,  1229,  1229,  1229,  3597,  3592,  3598,  1229,  1229,
+    3599,  3600,   209,  1447,  2628,  3601,  1885,  3609,  1229,  3612,
+    3616,  3629,  1229,  1886,   420,  3630,  1229,  3611,  3615,  3634,
+    1887,  3635,  3633,  3636,  1229,  3638,  3644,  1229,  2629,  1229,
+    2493,  3643,  3641,  3645,  3658,  3667,  3646,  1447,  1229,  3647,
+    1889,  1229,  1229,  3669,  3672,  3656,  1229,  1229,  1890,  3657,
+    3673,  3686,  3676,  1229,  3677,  3687,   845,  3688,  3201,  5154,
+    2185,  3689,  3691,  1229,  3698,  1229,  3014,  3767,  3768,  3769,
+    3702,  3770,  3771,  3772,  3773,  3774,  3775,  1229,  3709,  1338,
+    3700,  3701,  4940,  1229,  1229,  1229,  5189,  3712,  4714,  3717,
+    1542,  3719,  3723,  3726,  3724,  1164,  3729,  1039,  3742,   418,
+    3743,  3744,  1891,  3727,  3745, -1933,  2944,  4320,  4321,  4322,
+    4323,  3749,  3750,  4328,  4329,  4330,  4331,  4332,  4333,  4334,
+    4335,  4336,  4337,  3794,  3811,  3833,  2325,  3828,  3756,  2326,
+    1229,  3908,  3859,  5242,  3752,  3904,  3755,  4566,  1398,   966,
+    1791,  3806,  3778,  1229,  3910,  3912,  3914,  3941,  3918,   852,
+    3784,  1039,  3791,  3805,   852,   698,   852,  3864,  2332,  1447,
+    3819,  3829,  3925,  3949, -2802,  5108,  3414,  3831,  4536,  4376,
+    4377,  1819,  3832,   846,  1229,    80,  3835,  3931,  3929,  3934,
+    3930,  3951,  2191,  2325,  3952,  3935,  2326,  3960,  2334,  3956,
+   -2802, -2802, -2802,  3963,  3965,  3957,  3999,  3972,  3988,  3989,
+    5237,  4000,  4005,  4004,  4014,  4015,   701,  4017,  5130,  4023,
+    4025,  4024,  1039,  4033,  4060,  2332,  4062,  4064,  4065,  4068,
+    4082,  2333,  4071,  4083,  4072,  4070,  4080,  4081,  4084,  4085,
+    1267,  4086,  4087,  4090,  1553,  4088,  4089,  4091,  4092,  2320,
+    4093,  4095,  4094,  4098,   852,  2334,  4100,  4102,   420,  1397,
+    2738,  5518,  4375,   420,  1447,   420,  4620,  4104,  4106,  4113,
+    4119,  4120,  3902,  4122,  4125,  4168,  4140,  4167,  1573,  5125,
+    4174,  4185,  1580,  1267,  4189,  3760,   372,  4183,  1687,  3761,
+    3762,  3763,  1699,  1398,  1701,  4187,   372,  4211,  4198,  4205,
+     845,  4210,  4214, -2802,  4197,   845,  4366,   845, -2802,  4215,
+    4218,  4219,  4231,   701,  4242,  4254,   701,  2138,  4277,  4265,
+     372,  4267,  4207,  4278,  4288,  4252,  4279,  4290,  4280,  4291,
+    4292,  4300,  4283,  4303,  4305,  4309,  2279,  3781,  3760,  3780,
+   -1932,  4343,  4318,   418, -2802,  4359,  4370,  4344,   418,  1150,
+     418,  4383,  4345,   420,  4399,  4351,  4371,  4421,  4374,  4426,
+    2335,  4449,  4389,  4407,  4436,  2336,  4423,  4452,  4457,  1039,
+    4438,  4439,  4472,  4690,  4478,  1229,  4444,  1039,  4499,  1039,
+    4465,  4501,   700,   700,  4502,  4440,  4443,  1822,  2341,  4514,
+    4507,  4515,  4516,  4517,  4519,   845,  4528,  4542,   701,   701,
+    4543,  2339,  1447,  4531,  4544,  4545,  4555,  4556,  4557,  4558,
+    4559,   701,  4560,   701,  5368,  4561,  4563,   846,  4573,  4581,
+    4574,  4597,   846,  4564,   846,  4599,  5377,  4523,  4602,  4608,
+    4609,  5379,    74,  5381,  4611,   419,  4244,  4612,   418,  4615,
+    4637,  4233,  4645,  4648,  4655,  2341,  4653,  4661,  4667,  4668,
+    1447,  1229,  1229,  1037,  2965,  1037,  4687,  1037,  4670,  4688,
+    1791,  4703,  4701,  1037,  1524,  1525,  4706,  4709,  4727, -2802,
+    4671,  4700,  4704,  4707,  4732,  3765,  4711,  4736,  4738,  4712,
+    4739,  4743,   420,  4744,  4746,  4764,  4749,  1037,  1037,  4754,
+    4765,  5395,  4758,  4766,  4759,  4763, -1934,  4767,  4786,  4803,
+    4850,  4771,  4798,  4640,  4799,  4811,  4801,  4804,  4812,  4816,
+    4817,  4820,   846,  2318,   701,  4819,  4822,  4823,  4824,   379,
+    2325,  4843,  4836,  2326,  4847,   379,  2343,  4849,  4851,  4397,
+     694,  4400,  4856,  4865,  3766,  1229,  4857,  4881,  4888,  4882,
+    1580,  4889,  4890,  3760,  4901,  4904,  1229,  3761,  3762,  3763,
+    4910,  4908,  2332,  4913,  4914,  2495,  2496,   379, -2802,  4919,
+    4926,  4951, -2802,  4952,  4780,  4959,  4964,   418,  4968,  2348,
+    2349,  2350,  2351,  2352,  2353,  4969,  1229,  4972,  4977,  4988,
+    4970,  4995,  2334,  4979,  4997,  4998,  1229,  1229,  4999,  1447,
+    5000,  5008,  5013,  1229,  1229,  5022,  5392,  5023,  1229,  1447,
+    5018,  5032,   379,  1229,  5040,  5033,  1229,  1229,  4883,  5042,
+    5035,  1229,  5043,  4838,  5044,  1037,  5051,  1229,  5045,  2344,
+    5065,  5058, -2802, -2802, -2802,  5069,  2348,  2349,  2350,  2351,
+    2352,  2353,  1397,  5094,  1814,  1229,  5085,  5097,  5091,  1229,
+    5102,  1039,  5098,  5118,  5127,  5114,  4378,  5132,   852,  5117,
+    1083,  1229,  5133,  5148,  5137,  5152,  1229,  5159,  1083,  5166,
+    1083,  1267,  1229,  4644,  5173,  5175,  5176,  1398,  5178,  5180,
+    5179,    80,    80,   379,    80,  5198,  5199,  5200,  5207,  5202,
+    1229,  1037,  5204,  5208,  5221,  5219,  5222, -2802,  5229,  5238,
+    1398,  5241, -2802,    81,  5223,  5245,  5250,  1221,  5253,  5287,
+    5262,  5257,  5258,  5260,  5316,  5266,  1243,  1791,  5321,  1229,
+    5277,  3767,  3768,  3769,  5285,  3770,  3771,  3772,  3773,  3774,
+    3775,  5300,  5328,  5325,  5326,  5333,  5338,  1447, -2802,  5344,
+    5345,  5346,  5353,  3765,  5354,  2325,  2259,  5355,  2326,  5361,
+    5366,  1341,  5374,  5380,   701,  5356,  5384,   420,  5367,  5387,
+    5383,  5388,  5399,  5403,  5294,  2325,  1447,  5412,  2326,  5413,
+    1398,  5416,  2327,  2328,  2329,  5390,  5418,  2332,  5421,  5426,
+    5424,   701,  2341, -2802,  5427,  5433,  1447,  5434,  5435,  2330,
+    5441,  5442,  4384,   701,  5451,  5463,  5414,  2332,  5470,   845,
+    5474,  1229,  3766,  2333,  5415,  5482,  5486,  2334,  5503,  1401,
+    5509,   701,  5521,  5465,  5542,  1580,  5481,  5540,  3760,  1452,
+    5543,  5546,  3761,  3762,  3763,  5552,  5541,  2334,  5556,  5553,
+    5560,  5561,  5565,  5567,  5566,  1162,  5568,  2752,  5569,  4781,
+    1447,   379,   418,  2322,  3578,  3894,  1899,  1965,  2411,  1964,
+    3420,  4011,  2324,  4534,  4124,  4617,  2325,  3502,   701,  2326,
+    1039,  5307,  5153, -2802,  5411,  5201,  2367,  4657,  5203,  5188,
+    4956,  4379,  3954,  4832,  3685,  1229,   379,  5106,  5466,  5516,
+    5419,  5417,  5480,  3959,  4675,  4691,  1229,  4652,  2332,  3556,
+    3557,  4532,  4027,  4664, -2802,  3548,  4973,  1398,  2833,    79,
+    2398,  2400,  4193,  5520,  5570,  1398,  1398,  5557,   372,  5177,
+    4141,  4128, -2802,  5484,  5131,  2815,   846, -2802,  2334,  5405,
+    5471,  1057,  5134,  4733,  5272,  2252,  4697,  5351,    74,    74,
+    3268,    74,  2335,  3942,  1399,  3009,  2265,  2336,  3007,  1447,
+    4101,  1447,  5559,  5494,  3197,  3008,  1474,  1037,  2950,  2556,
+    3196,  3899,  4678, -2802,  4839,  5460, -2802,  4461,  2337,  2338,
+    2199,  3681,  1716,  2348,  2349,  2350,  2351,  2352,  2353,  2430,
+    3900,   372,  2373,  2339,  3223,  2459,   701,  2458,  3909,  3767,
+    3768,  3769,  4784,  3770,  3771,  3772,  3773,  3774,  3775,  4437,
+     700,  3907,  1229,  5456,  5382,  4827,  1447,  2341,  3222,  2463,
+    3911,  1229,  4402,  4797,  2340,  4809,  5252,  5373,  3765,  4398,
+    5372,  2468,  4462,  4261,  5236,  4353,  5088,  2341,  1229,  1229,
+    2342,  5458,  1229, -2802,  5459,  5450,  3153,  3903, -2802,  3826,
+    3737,  3824,  4243,  3162,  1195,  1580,  1229,  3632,  3760,  3249,
+    2877,  1229, -2802, -2802, -2802,  5443,  1229,  2481,  1165,  1229,
+    1229,  1493,  3240,  3256,  1791,  2474,  1832,  1229,  1229,  2260,
+    3253,  3889,  3254,  4828, -2802,  1803,  4467,  3766,  1144,  2098,
+    4468,  4442,  5092,  1188,   852,  3260,  1804,  2377, -2802,  1229,
+    2478,  3683,  2188,  2962,    83,     0,  4620,   701,  1531,   701,
+    1144,     0,     0,  1229,     0,     0,     0,     0,  2343,     0,
+       0,  3848,     0,     0,     0,  3848,     0,     0,  2341,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    5031,     0,     0,     0,     0,     0,  1447,   701,     0,     0,
+       0,     0,     0,     0,     0,     0,  1229,     0,     0,     0,
+       0,  5193,     0,     0,     0,     0,     0,  1037,   372,  2009,
+       0,     0,  1037,  1037,     0,     0,  2721,     0,     0,     0,
+    2016,     0,     0,     0,     0,     0,  5212,     0,     0,     0,
+       0, -2802,     0,   420,     0,   701,     0,     0,  2348,  2349,
+    2350,  2351,  2352,  2353,     0,     0,     0,  1229,     0, -2802,
+       0,  2344,     0,     0,  2345,  2346,  2347,     0,  2348,  2349,
+    2350,  2351,  2352,  2353,     0,     0,  3189,     0,     0,     0,
+       0,     0,  3190,     0,     0,   845,  1039,     0,     0,     0,
+       0,  1039,     0,  2089,     0,     0,  2491,  2794,  1524,  1525,
+       0,     0,     0,     0,     0,     0,     0,     0,  1229,     0,
+    1447,     0,     0,     0,  3767,  3768,  3769,  2506,  3770,  3771,
+    3772,  3773,  3774,  3775,  2513,  2515,     0,  2832,   418,     0,
+       0,   852,     0,  5090,     0,     0,     0,     0,     0,     0,
+    1229,  1447,     0,  1229,     0,  1229,     0,     0,     0,     0,
+       0,     0, -2802,     0,     0,     0,     0,  3766,     0,  2348,
+    2349,  2350,  2351,  2352,  2353,     0,     0,     0,     0,  1229,
+       0,     0,     0,  1229,     0,     0,     0,     0,   379,  1447,
+       0,     0,   379,     0,  1229,     0,     0,     0,     0,     0,
+    1037,     0,  1791,     0,     0,     0,   694,     0,  1037,     0,
+       0,     0,   846,   694,     0,     0,  1229,     0,  1580,     0,
+       0,  3760,     0,     0,   694,  3761,  3762,  3763,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     420,     0,     0,     0,     0,     0,  1447,     0,     0,  5339,
+    1447,  1447,   694,     0,     0,  1229,     0,   694,     0,     0,
+       0,     0,     0,    80,     0,     0,    80,  1037,   694,     0,
+    1037,  1037,     0,     0,     0,     0,     0,     0,  5233,     0,
+    1039,  1580,   845,     0,  3760,     0,     0,     0,  3761,  3762,
+    3763,     0,     0,     0,   694,     0,  1229,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   694,
+       0,     0,     0,     0,     0,   694,  1229,     0,     0,     0,
+       0,     0,     0,     0,     0,   418,   694,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1447,  1447,     0,  1037,
+     694,     0,     0,     0, -2802, -2802, -2802,  5360,  3770,  3771,
+    3772,  3773,  3774,  3775,     0,     0,     0,     0,     0,  1229,
+       0,     0,  1229,     0,  5539,  3056,     0,     0,     0,     0,
+       0,  1229,     0,     0,     0,     0,  1229,  3848,  1229,     0,
+    1229,     0,  3848,     0,     0,  3848,     0,  1229,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   846,
+       0,     0,     0,     0,     0,  1229,     0,     0,     0,     0,
+       0,  3765,     0,     0,     0,     0,     0,  5099,  2876,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   701,     0,
+       0,     0,     0,     0,     0,     0,     0,  1083,  3017,   694,
+       0,  1083,  2888,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  2896,     0,  2897,     0,  1229,     0,     0,     0,
+     379,  2902,     0,     0,     0,     0,  2905,     0,     0,     0,
+    3766,     0,  3185,     0, -2802,     0,  5485,     0,     0,     0,
+       0,     0,     0,     0,     0,  3018,     0,  1229,  1229,  5499,
+     376,  5496,  5497,     0,     0,  5498,     0,     0,  1229,     0,
+       0,     0,     0,     0,     0,   852,   701,     0,     0,     0,
+      74,     0,     0,    74,     0,     0,  3019,  5529,  1229,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   694,   694,
+       0,     0,     0,  3766,     0,     0,     0,  3020,     0,     0,
+       0,  5499,   376,  5496,  5497,     0,   372,  5498,  3021,     0,
+       0,     0,     0,  1229,     0,     0,     0,     0,     0,  1229,
+    1229,     0,  1229,     0,     0,     0,     0,   852,  3022,     0,
+       0,   372,     0,  3023,     0,     0,   700,     0,     0,  5529,
+       0,  1229,     0,     0,     0,     0,   852,     0,     0,     0,
+    1039,     0,  1822,     0,    80,     0,    80,     0,  5529,     0,
+    5499,   376,  5496,  5497,   420,     0,  5498,     0,     0,  3046,
+    3047,  1083,  1083,     0,     0,     0,  3061,  3062,  1039,     0,
+       0,  3024,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1398,  2590,     0,     0,     0,     0,  3848,
+       0,     0,  3025,     0,     0,  3100,   845,  3767,  3768,  3769,
+    2318,  3770,  3771,  3772,  3773,  3774,  3775,     0,     0,     0,
+    1229,  1229,     0,     0,     0,     0,   420,  2591,     0,     0,
+       0,     0,  2318,     0,  1229,     0,     0,     0,     0,     0,
+    2592,     0,     0,     0,     0,   420,  1229,  1229,     0,   418,
+       0,     0,     0,     0,  2593,     0,     0,     0,     0,  1701,
+       0,  2506,     0,   881,     0,     0,     0,     0,   845,     0,
+    3767,  3768,  3769,     0,  3770,  3771,  3772,  3773,  3774,  3775,
+       0,     0,     0,     0,     0,     0,     0,   845,     0,     0,
+    3026,     0,     0,  2594,     0,     0,     0,  3027,    35,     0,
+       0,     0,     0,  3028,  2595,     0,    41,    42,     0,     0,
+       0,   418,  2325,     0,     0,  2326,     0,     0,     0,  2327,
+    2328,  2329,     0,   846,  2596,  1037,     0,     0,     0,  2597,
+     418,     0,     0,     0,   372,  3029,  2330,     0,  3030,  2331,
+       0,     0,     0,     0,  2332,     0,     0,     0,     0,     0,
+    2333,   691,     0,   694,     0,     0,  3031,     0,     0,     0,
+    5530,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   694,  2334,     0,     0,     0,     0,  1037,
+       0,  3032,     0,     0,     0,   846,  2882,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   694,  1039,  2598,  1814,
+       0,    74,     0,    74,   846,  3521,     0,     0,     0,     0,
+       0,     0,     0,  3521,     0,     0,     0,     0,     0,     0,
+    1877,  3521,  5530,  3521,     0,     0,     0,     0,     0,  2599,
+       0,  2909,   694,     0,     0,     0,     0,     0,     0,     0,
+    1037,  5530,     0,     0,     0,     0,     0,     0,   694,     0,
+       0,     0,     0,  1878,     0,     0,     0,     0,     0,   881,
+       0,     0,     0,   694,     0,     0,   694,     0,     0,     0,
+       0,  3584,     0,     0,     0,     0,     0,     0,     0,  2335,
+    2325,     0,     0,  2326,  2336,     0,     0,  2327,  2328,  2329,
+       0,     0,     0,  2600,     0,     0,     0,     0,     0,  2601,
+       0,  3614,  2602,     0,  2330,  2337,  2338,     0,     0,  1398,
+    1879,     0,  2332,     0,     0,     0,     0,     0,  2333,     0,
+    2339,     0,     0,  1243,     0,     0,     0,     0,     0,     0,
+       0,  2603,     0,     0,     0,  3653,     0,     0,  2604,     0,
+       0,     0,  2334,  1880,     0,  2605,     0,     0,     0,     0,
+       0,  2340,  2606,     0,     0,     0,     0,     0,     0,     0,
+       0,   372,     0,     0,  2341,     0,     0,  2342,     0,     0,
+       0,  1398,     0,     0,   372,     0,     0,  2607,  1881,     0,
+       0,     0,     0,     0,     0,     0,     0,  1037,     0,     0,
+       0,  2325,     0,   694,  2326,  1037,     0,  1037,  2327,  2328,
+    2329,   694,   694,     0,     0,     0,     0,     0,     0,     0,
+    1882,     0,   379,     0,     0,  2330,     0,     0,     0,     0,
+       0,     0,     0,  2332,     0,     0,  5538,     0,     0,  2333,
+       0,     0,     0,     0,     0,     0,     0,     0,  1883,  1039,
+       0,     0,     0,     0,     0,  2343,     0,  2335,     0,     0,
+       0,     0,  2336,  2334,     0,  1902,     0,     0,     0,     0,
+    3621,  1903,     0,     0,     0,   379,   379,   379,     0,     0,
+       0,     0,  1884,  2337,  2338,     0,   209,     0,     0,  1877,
+    1885,     0,     0,     0,     0,   372,   694,  1886,  2339,     0,
+       0,     0,     0,     0,  1887,     0,     0,     0,     0,     0,
+       0,  1904,  1888,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1878,     0,  1889,     0,   379,     0,     0,  2340,
+       0,     0,  1890,   379,     0,     0,     0,     0,     0,     0,
+     379,     0,  2341,     0,  1039,  2342,     0,     0,  2344,     0,
+    1083,  2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,
+    2353,     0,  1905,     0,     0,     0,     0,     0,  2335,  1906,
+       0,     0,  1907,  2336,  1902,     0,     0,     0,     0,  1879,
+    1903,     0,     0,     0,     0,     0,  1891,     0,     0,  1083,
+       0,  3648,  3651,     0,  2337,  2338,     0,  1908,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2339,
+       0,     0,  1880,     0,     0,     0,     0,     0,     0,     0,
+    1904,     0,     0,  2343,     0,     0,     0,     0,  1909,     0,
+       0,  1398,     0,     0,     0,     0,     0,     0,     0,     0,
+    2340,     0,  3622,     0,     0,     0,     0,  1881,     0,     0,
+       0,     0,     0,  2341,     0,     0,  2342,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1037,
+       0,  1905,     0,     0,     0,     0,     0,     0,  1906,  1882,
+       0,  1907,  3323,     0,     0,  1910,     0,  1911,     0,  1243,
+       0,   694,     0,   380,     0,     0,     0,  1912,     0,   380,
+       0,     0,     0,     0,   695,  1913,  1908,     0,     0,     0,
+       0,     0,     0,     0,     0,  1914,  2344,     0,     0,  2345,
+    2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,     0,
+       0,   380,     0,     0,  2343,  3751,     0,  1909,     0,     0,
+     379,     0,     0,     0,     0,   209,     0,     0,     0,  1885,
+       0,     0,  1916,  1917,     0,     0,  1886,     0,     0,     0,
+       0,   694,     0,  1887,     0,   694,  1398,     0,     0,     0,
+       0,  2629,     0,     0,     0,     0,   380,   694,     0,  1918,
+       0,  2325,     0,  1889,  2326,     0,     0,     0,  2327,  2328,
+    2329,  1890,     0,     0,  1910,     0,  1911,     0,     0,     0,
+       0,     0,     0,     0,     0,  2330,  1912,     0,     0,     0,
+       0,  3624,  1039,  2332,  1913,     0,     0,     0,     0,  2333,
+       0,     0,     0,     0,  1914,     0,     0,  2344,     0,     0,
+    2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,
+       0,     0,  1919,  2334,     0,  1891,  3801,   380,  4032,  3625,
+    4233,     0,   694,   694,     0,     0,     0,     0,  1915,     0,
+       0,  1916,  1917,     0,     0,   694,     0,     0,     0,     0,
+       4,     0,     0,  2506,     0,     0,  3892,     0,  1037,     0,
+     694,   694,     0,     0,     0,  3621,     0,     0,  1918,  4067,
+       5,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       6,     7,   694,     0,  1877,     0,     0,     9,    10,     0,
+       0,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,     0,  1878,  4099,    37,
+      38,    39,    40,    41,    42,    43,    44,  1245,  2335,     0,
+      45,  1919,     0,  2336,  1274,     0,     0,     0,     0,     0,
+    3521,     0,     0,     0,     0,  1292,     0,  3521,  3521,     0,
+       0,  3521,     0,     0,  2337,  2338,     0,     0,  3521,     0,
+       0,     0,     0,     0,     0,     0,     0,  4138,     0,  2339,
+       0,     0,  4138,   691,  1879,     0,     0,  1398,   691,  1398,
+       0,     0,    46,     0,     0,   380,     0,     0,     0,   691,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  3621,
+    2340,     0,     0,     0,     0,     0,     0,  1880,     0,     0,
+       0,     0,   379,  2341,     0,     0,  2342,  4196,  1877,     0,
+     380,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  3622,     0,     0,
+       0,     0,  1881,     0,     0,     0,  4226,  1398,     0,     0,
+       0,  1878,     0,     0,    47,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    48,     0,  1882,  3653,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  3721,
+       0,     0,     0,    49,  2343,  3725,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   379,     0,     0,  1879,     0,
+       0,     0,     0,     0,     0,     0,    50,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  5359,     0,     0,     0,     0,     0,     0,
+     209,  1880,     0,     0,  3623,     0,     0,     0,     0,     0,
+       0,  1886,    51,     0,     0,    52,     0,     0,  1887,     0,
+     379,     0,   379,     0,     0,     0,  2629,     0,     0,     0,
+      53,  3622,     0,     0,     0,     0,  1881,     0,  1889,     0,
+       0,     0,   694,     0,     0,     0,  1890,  2344,     0,     0,
+    2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,
+       0,     0,     0,     0,  3098,     0,  3624,     0,  1882,     0,
+       0,     0,     0,     0,  1037,     0,     0,     0,     0,  1037,
+       0,     0,   694,     0,     0,     0,   379,   694,     0,     0,
+    4363,   694,     0,     0,     0,  3857,     0,     0,     0,   694,
+    1891,  4173,     0,     0,  3625,     0,     0,     0,    54,   691,
+     691,     0,     0,     0,     0,     0,     0,   694,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   209,     0,     0,     0,  1885,     0,
+       0,     0,     0,  1902,     0,  1886,     0,     0,     0,  1903,
+       0,     0,  1887,     0,    55,     0,  3857,     0,     0,   694,
+    2629,     0,     0,     0,     0,     0,     0,     0,     0,    56,
+    1083,     0,  1889,     0,     0,  4249,   694,   694,     0,     0,
+    1890,     0,  3651,     0,    57,     0,     0,     0,     0,  1904,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3624,     0,     0,     0,     0,   379,   694,     0,     0,   379,
+       0,     0,    58,     0,     0,     0,     0,     0,     0,     0,
+      59,     0,    60,    61,    62,    63,    64,     0,     0,    65,
+      66,  1486,  2187,     0,  1891,  1083,    71,   694,  3625,     0,
+    1905,   694,     0,     0,     0,     0,     0,  1906,     0,     0,
+    1907,     0,     0,  2325,     0,     0,  2326,     0,  1037,   694,
+    2327,  2328,  2329,     0,     0,     0,     0,  1430,     0,     0,
+     694,     0,     0,     0,     0,  1908,     0,  2330,     0,     0,
+       0,     0,     0,   694,     0,  2332,     0,     0,  1430,     0,
+       0,  2333,   694,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1909,     0,     0,     0,
+       0,     0,   380,     0,     0,  2334,   380,     0,     0,     0,
+       0,  4138,     0,     0,     0,     0,     0,     0,     0,     0,
+     695,     0,     0,     0,     0,     0,     0,   695,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   695,   379,
+    4567,     0,     0,  4568,     0,  4569,     0,     0,     0,     0,
+       0,     0,     0,  1910,     0,  1911,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1912,   695,     0,     0,     0,
+       0,   695,     0,  1913,     0,     0,     0,     0,     0,     0,
+       0,     0,   695,  1914,     0,     0,  2135,     0,  3521,     0,
+       0,     0,     0,     0,  3521,  3521,     0,  3521,     0,  2794,
+       0,     0,     0,     0,     0,   694,     0,     0,   695,     0,
+    2335,     0,     0,     0,     0,  2336,     0,  1969,     0,     0,
+    1916,  1917,     0,   695,     0,     0,     0,  2168,     0,   695,
+       0,     0,     0,     0,     0,  2178,  2337,  2338,     0,     0,
+     695,  2186,     0,     0,     0,     0,     0,  1970,     0,  4464,
+       0,  2339,     0,     0,   695,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   694,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2338,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2339,  2323,     0,  2340,  2324,     0,     0,
-    4688,  2325,  2326,  2327,     0,     0,  2745,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  2328,     0,
-       0,     0,     0,  2341,     0,     0,  2330,   694,   694,     0,
-       0,     0,  2331,     0,     0,     0,     0,  3647,  3647,  3647,
-    3647,  3647,     0,     0,     0,     0,     0,     0, -2800,     0,
-       0,     0,     0,     0,     0,     0,  2332,  3642,  3645,  2342,
-       0,     0,  2343,  2344,  2345,     0,  2346,  2347,  2348,  2349,
-    2350,  2351,     0,     0,  2341,     0,     0,  2816,  3795,     0,
-       0,  2829,  4736,     0,     0,  4736,     0,  4736,     0,     0,
-       0,     0,     0,  2745,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1039,     0,     0,     0,     0,     0,     0,
-    1083,  1083,     0,     0,     0,     0,  2342,     0,     0,  2343,
-    2344,  2345,     0,  2346,  2347,  2348,  2349,  2350,  2351,     0,
-       0,     0,     0,  3092,     0,  1037,     0,     0,     0,     0,
-       0, -2800,     0,     0,     0,     0,     0,     0,  2346,  2347,
-    2348,  2349,  2350,  2351,     0,     0,     0,     0,     0,     0,
-       0,  2333,     0,     0,     0,     0,  2334,  2342,     0,  2906,
-    2343,  2344,  2345,     0,  2346,  2347,  2348,  2349,  2350,  2351,
-       0,     0,  2323,     0,  4133,  2324,     0,  2335,  2336,  2325,
-    2326,  2327,     0,     0,   380,     0,     0,  2745,   380,     0,
-       0,     0,  2337,     0,     0,     0,  2328,     0,     0,     0,
-       0,     0,   695,     0,  2330,     0,     0,     0,  4820,   695,
-    2331,  4827,  4828,     0,     0,     0,     0,     0,     0,     0,
-     695,     0,     0,  2338,     0,     0,     0,     0,  2133,     0,
-       0,     0,     0,     0,  2332,     0,  2339,    80,     0,  2340,
-       0,     0,     0,     0,     0,     0,     0,     0,   695,     0,
-       0,     0,     0,   695,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   695,     0,     0,     0,     0,  2166,
-       0,     0,     0,     0,     0,     0,     0,  2176,     0,     0,
-       0,   694,     0,  2184,     0,     0,     0,     0,   372,  1143,
-     695,     0,     0,  1039,     0,     0,     0,     0,  1039,  1039,
-       0,   694,     0,     0,     0,   695,     0,     0,     0,     0,
-       0,   695,     0,     0,     0,  2323,     0,  2341,  2324,     0,
-       0,     0,   695,     0,   694,     0,     0,     0,     0,  2503,
-       0,     0,  3886,     0,  1037,     0,   695,     0,     0,  2333,
-       0,     0,     0,     0,  2334,     0,     0,  2330,     0,     0,
-       0,     0,     0, -2800,     0,     0,     0,     0,     0,     0,
-     694,     0,     0,     0,     0,  2335,  2336,     0,     0,     0,
-       0,     0,  4915,  4916,     0,     0,   694,  2332,     0,     0,
-    2337,  3515,   698,  3515,  3515,     0,     0,  3515,     0,     0,
-       0,   694,  1397,     0,   694,     0,  4936,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2342,  2338,     0,  2343,  2344,  2345,     0,  2346,  2347,  2348,
-    2349,  2350,  2351,     0,  2339,  1154,     0,  4305,     0,     0,
-       0,     0,     0,     0,     0,   695,     0,     0,     0,     0,
-       0,  4778,     0,  4975,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   380,     0,     0,     0,
-       0,     0,     0,     0,  1429,  1039,     0,     0,     0,     0,
-       0,     0,  4995,  1039,     0,     0,     0,     0,     0,     0,
-       0,     0, -2800,     0,     0,  1429,     0, -2800,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2341,     0,   691,     0,     0,
-       0,  4736,     0,     0,     0,  4736,  4736,     0,  4736,     0,
-       0,   694,     0, -2800,   695,   695,     0,     0,     0,   694,
-     694,     0,  1039,     0,     0,  1039,  1039,     0,     0,     0,
-     379,     0,     0,     0,     0,     0,     0,  3272,     0,     0,
-       0,     0,  3276,     0,     0,     0,  3279,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2339,     0,     0,
+       0,     0,  2340,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  4694,     0,  2341,     0,     0,  2342,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  3303,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   379,   379,   379,     0,     0,  2342,     0,
-       0,  2343,  2344,  2345,  1039,  2346,  2347,  2348,  2349,  2350,
-    2351,     0,     0,   694,     0,     0,     0,     0,     0,     0,
-    2323,     0,     0,  2324,  3354,     0,     0,  2325,  2326,  2327,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   691,     0,   379,  2328,     0,     0,     0, -2800,     0,
-     379,     0,  2330,     0,     0,     0,     0,   379,  2331,     0,
-    4132,     0,     0,     0,  3615,     0,     0,  1083,     0,     0,
-       0,  3399,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2332,  1875,     0,     0,     0,     0,     0,     0,
-    1037,     0,     0,     0,     0,  1037,     0,     0,  3515,     0,
-       0,   691,     0,     0,     0,  3445,  1083,     0,     0,  1397,
-       0,     0,     0,  5151,     0,  5152,  1876,  4167,     0,  5157,
-    5158,     0,     0,  3457,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3467,     0,     0,  2323,     0,     0,
-    2324, -2800,     0,     0,  2325,  2326,  2327,  3491,  2346,  2347,
-    2348,  2349,  2350,  2351,     0,   691,     0,     0,     0,     0,
-       0,  2328,     0,     0,     0,     0,     0,     0,     0,  2330,
-       0,     0,     0,  1877,     0,  2331,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   372,  2333,   695,     0,
-       0,  4243,  2334,     0,     0,     0,     0,     0,  3645,  2332,
-       0,     0,     0,     0,  2010,     0,  1878,   694,   695,  1083,
-       0,     0,     0,  2335,  2336,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2025,     0,     0,     0,  2337,     0,
-       0,   695,     0,  2035,     0,     0,  3616,     0,     0,     0,
-    1900,  1879,     0,     0,     0,     0,  1901,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   379,     0,  2338,
-       0,  2278,     0,     0,     0,     0,     0,   695,     0,     0,
-       0,     0,  2339,  1880,  1037,  2340,     0,     0,   694,     0,
-    2287,     0,   694,   695,     0,     0,  1902,     0,     0,     0,
-       0,     0,     0,     0,   694,     0,     0,     0,   695,     0,
-       0,   695,     0,  2877,  2333,     0,     0,     0,     0,  2334,
-    2303,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  5302,  2316,     0,     0,     0,     0,
-    2335,  2336,     0,     0,     0,     0,     0,  1903,     0,   209,
-       0,     0,     0,  1883,  1904,  2337,     0,  1905,  2904,     0,
-    1884,     0,  2908,  2341,     0,     0,     0,  1885,  2914,  2915,
-       0,     0,     0,     0,     0,  2626,     0,     0,  3615,   694,
-     694,     0,  1906,     0,     0,     0,  2338,  1887,     0,     0,
-       0,  2931,   694,     0,     0,  1888,  3691,  1875,     0,  2339,
-       0,     0,  2340,     0,     0,     0,     0,   694,   694,     0,
-       0,     0,     0,  1907,     0,  3618,     0,     0,  3705,     0,
-       0,     0,     0,     0,     0,     0,  3691,     0,     0,   694,
-    1876,     0,     0,     0,     0,     0,  1154,  1154,   695,  1154,
-    1039,     0,     0,     0,     0,     0,   695,   695,     0,  1889,
-       0,     0,     0,  3619,  4227,  2259,  2342,   380,     0,  2343,
-    2344,  2345,     0,  2346,  2347,  2348,  2349,  2350,  2351,     0,
-    1908,     0,  1909,  4356,     0,     0,     0,     0,     0,     0,
-    2341,     0,  1910,     0,     0,  4458,     0,  1877,     0,     0,
-    1911,     0,  1397,  1039,     0,     0,     0,   698,     0,     0,
-    1912,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     380,   380,   380,  1817,     0,     0,     0,     0,     0,     0,
-    1878,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     695,     0,     0,     0,  1913,     0,     0,  1914,  1915,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    3616,     0,     0,     0,  1039,  1879,     0,     0,     0,   379,
-     380,     0,     0,     0,  1916,     0,     0,   380,     0,     0,
-       0,     0,     0,  2342,   380,     0,  2343,  2344,  2345,     0,
-    2346,  2347,  2348,  2349,  2350,  2351,     0,  1880,     0,     0,
-    4442,     0,     0,     0,  1037,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2323,     0,     0,  2324,     0,     0,     0,  2325,
-    2326,  2327,  1037,     0,     0,     0,     0,  1917,     0,     0,
-       0,  3187,   693,     0,     0,     0,  2328,     0,     0,     0,
-       0,     0,     0,     0,  2330,     0,     0,     0,     0,     0,
-    2331,     0,   379,   209,     0,     0,     0,  3617,     0,   843,
-       0,     0,     0,     0,  1884,     0,     0,     0,  5525,     0,
-       0,  1885,     0,     0,  2332,     0,     0,     0,     0,  2626,
-       0,     0,     0,     0,     0,     0,     0,     0,  3938,  1523,
-    1524,  1887,     0,     0,     0,     0,     0,     0,     0,  1888,
-    1039,     0,     0,     0,   843,     0,     0,   379,  1039,   379,
-    1039,     0,     0,     0,     0,     0,     0,     0,     0,  3618,
-       0,     0,     0,     0,   695,     0,     0,     0,   694,     0,
-    5525,  3960,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  5525,
-       0,     0,  1082,  1889,     0,     0,     0,  3619,     0,     0,
-    1082,     0,  1082,     0,     0,     0,     0,     0,   694,     0,
-       0,     0,   379,   694,   380,   843,     0,   694,     0,  2333,
-       0,     0,     0,     0,  2334,   694,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   695,     0,     0,     0,   695,
-       0,     0,     0,   694,     0,  2335,  2336,     0,     0,     0,
-       0,   695,     0,  3645,  3645,  3645,  3645,  3645,     0,     0,
-    2337,     0,     0,     0,     0,     0,     0,     0,  2684,     0,
-       0,     0,     0,     0,  4032,     0,     0,     0,     0,     0,
-       0,  1037,     0,     0,     0,   694,  4051,     0,     0,     0,
-       0,  2338,     0,     0,     0,     0,  1083,     0,     0,     0,
-       0,     0,   694,   694,  2339,     0,     0,  2340,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   695,   695,   372,     0,
-       0,   379,   694,     0,     0,   379,     0,     0,     0,   695,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  2762,
-       0,     0,     0,     0,   695,   695,     0,     0,     0,  3615,
-       0,     0,   694,  4102,  2778,  2323,   694,     0,  2324,     0,
-       0,     0,  2325,  2326,  2327,     0,   695,     0,  1875,     0,
-       0,     0,     0,  2801,   694,  2341,     0,     0,     0,  2328,
-       0,   372,     0,     0,     0,   694,     0,  2330,     0,     0,
-       0,     0,     0,  2331,     0,     0,     0,     0,   694,     0,
-    1039,  1876,     0,     0,     0,     0,   694,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2332,     0,     0,
-    2867,     0,     0,     0,     0,     0,     0,  2503,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  2878,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1429,     0,    74,  3109,     0,     0,     0,  1877,     0,
-       0,     0,   379,  2892,     0,     0,     0,     0,  2342,     0,
-       0,  2343,  2344,  2345,     0,  2346,  2347,  2348,  2349,  2350,
-    2351,     0,     0,     0,     0,  4474,     0,     0,     0,     0,
-       0,  1878,     0,     0,     0,     0,   380,     0,     0,     0,
-       0,     0,     0,  2923,     0,     0,  1429,     0,     0,     0,
-       0,     0,     0,  1037,     0,     0,     0,     0,     0,     0,
-    2745,  3616,  2333,  3636,     0,     0,  1879,  2334,   694,     0,
-       0,     0,     0,     0,  4892,  4893,     0,  4278,     0,  4896,
-    4897,     0,  3653,     0,     0,     0,     0,     0,  2335,  2336,
-       0,     0,     0,     0,     0,     0,     0,  3662,  1880,     0,
-    3664,  3665,  4292,  2337,     0,  3668,  3669,  2323,     0,     0,
-    2324,     0,  3673,     0,  2325,  2326,  2327,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   372,     0,   380,
-     694,  2328,     0,     0,  2338,     0,     0,     0,     0,  2330,
-       0,     0,     0,     0,     0,  2331,     0,  2339,  1037,  1039,
-    2340,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   209,     0,     0,     0,  1883,  2332,
-       0,     0,     0,     0,     0,  1884,     0,   694,     0,     0,
-       0,     0,  1885,     0,   380,     0,   380,     0,     0,  3714,
-    2626,     0,     0,     0,     0,  3096,     0,     0,     0,   694,
-       0,     0,  1887,     0,     0,   695,     0,   694,     0,     0,
-    1888,     0,     0,     0,     0,  2323,     0,     0,  2324,     0,
-       0,     0,  2325,  2326,  2327,     0,     0,     0,  2341,     0,
-    3618,     0,     0,     0,     0,     0,     0,     0,     0,  2328,
-       0,     0,     0,     0,     0,   695,     0,  2330,     0,   380,
-     695,     0,     0,  2331,   695,     0,     0,     0,     0,     0,
-       0,     0,   695,     0,  1889,     0,     0,     0,  3619,     0,
-       0,     0,     0,     0,  2333,     0,     0,  2332,     0,  2334,
-     695,     0,     0,   379,     0,     0,     0,     0,     0,   379,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2335,  2336,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2337,     0,     0,     0,     0,
-       0,  2342,   695,     0,  2343,  2344,  2345,     0,  2346,  2347,
-    2348,  2349,  2350,  2351,     0,     0,     0,     0,  4744,   695,
-     695,     0,     0,     0,     0,     0,  2338,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  5083,     0,  2339,
-       0,     0,  2340,     0,     0,     0,     0,     0,   380,   695,
-     843,  4503,   380,     0,     0,     0,     0,     0,     0,     0,
-     694,     0,  2333,     0,     0,     0,     0,  2334,   693,     0,
-       0,     0,     0,     0,     0,   693,     0,     0,     0,   695,
-       0,     0,     0,   695,     0,     0,   693,     0,  2335,  2336,
-       0,     0,     0,     0,     0,     0,  1037,     0,     0,     0,
-       0,   695,     0,  2337,     0,     0,     0,     0,     0,     0,
-       0,     0,   695,     0,   693,     0,     0,     0,     0,   693,
-    2341,     0,     0,     0,     0,   695,     0,     0,     0,     0,
-     693,     0,     0,   695,  2338,  1900,     0,     0,     0,     0,
-       0,  1901,  3321,     0,     0,     0,     0,  2339,  4580,   694,
-    2340,  4583,     0,     0,  3336,     0,   693,     0,     0,     0,
-       0,  3958,     0,     0,     0,   694,   694,     0,     0,     0,
-       0,   693,     0,     0,     0,     0,     0,   693,     0,     0,
-       0,  1902,     0,     0,     0,  1039,     0,     0,   693,   380,
-    1039,  3366,   694,     0,     0,   694,     0,     0,     0,     0,
-       0,     0,   693,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2342,     0,     0,  2343,  2344,  2345,     0,
-    2346,  2347,  2348,  2349,  2350,  2351,     0,     0,  2341,     0,
-    4779,     0,  1903,     0,     0,     0,  4010,     0,  4012,  1904,
-       0,     0,  1905,     0,     0,     0,     0,     0,  4659,     0,
-       0,     0,     0,     0,     0,   695,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1906,     0,     0,
-       0,   379,   379,   379,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   694,     0,     0,  1907,  1082,
-       0,   693,     0,  1082,     0,     0,     0,   694,     0,     0,
-       0,   694,     0,     0,     0,     0,     0,   695,     0,     0,
-     694,  2342,     0,     0,  2343,  2344,  2345,     0,  2346,  2347,
-    2348,  2349,  2350,  2351,     0,     0,     0,     0,  5024,     0,
-       0,     0,     0,     0,  4090,  3538,     0,     0,     0,  3691,
-    4097,     0,     0,     0,     0,  1908,     0,  1909,     0,     0,
-       0,     0,     0,     0,   695,     0,     0,  1910,     0,  1039,
-       0,     0,     0,     0,     0,  1911,     0,     0,     0,     0,
-       0,     0,     0,     0,   694,  1912,   695,     0,     0,     0,
-     693,   693,     0,     0,   695,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2316,     0,  2323,     0,     0,  2324,
-       0,     0,     0,  2325,  2326,  2327,     0,     0,     0,  1967,
-     379,     0,  1914,  1915,     0,     0,   694,     0,   694,   909,
-    2328,     0,     0,     0,     0,     0,     0,  5352,  2330,     0,
-     694,   910,   694,     0,  2331,     0,     0,     0,  2316,  1968,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   911,     0,     0,  3109,     0,     0,  2332,     0,
-     380,     0,     0,  1082,  1082,   912,   380,     0,     0,     0,
-       0,  3824,     0,     0,     0,   913,     0,     0,     0,  -792,
-       0,  4240,     0,     0,     0,     0,   694,  3842,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   914,     0,     0,
-       0,     0,  1917,   915,  4257,  4258,     0,  4260,     0,  4262,
-    4263,     0,     0,     0,     0,     0,     0,     0,   916,     0,
-       0,     0,  4270,     0,     0,     0,   372,     0,     0,   917,
-       0,     0,     0,     0,  3704,     0,     0,   918,     0,     0,
-       0,   694,     0,     0,     0,     0,     0,     0,  3842,   919,
-       0,  1143,     0,     0,     0,  3716,   920,   695,   694,     0,
-     921,     0,  4291,  2333,     0,     0,  3722,     0,  2334,     0,
-       0,     0,     0,  1900,     0,     0,     0, -1002,     0,  1901,
-     694,     0,     0,   694,     0,     0,     0,     0,     0,  2335,
-    2336,     0,     0,     0,     0,     0,  4889,     0,     0,     0,
-       0,     0,     0,     0,  2337,     0,     0,     0,  4899,     0,
-       0,     0,     0,     0,   922,     0,     0,     0,     0,  1902,
-       0,     0,     0,  -534,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2338,     0,     0,     0,     0,
-       0,     0,     0,     0,   693,     0,   695,     0,  2339,     0,
-       0,  2340,     0,     0,   923,     0,     0,   924,     0,     0,
-     379,     0,   695,   695,   693,     0,     0,     0,     0,  1039,
-    1903,     0,     0,     0,   925,     0,     0,  1904,     0,     0,
-    1905,     0,     0,     0,  5522,     0,     0,   693,     0,   695,
-       0,     0,   695,  -430,     0,     0,     0,  1039,     0,     0,
-       0,     0,     0,     0,     0,  1906,     0,     0,     0,     0,
-       0,   926,     0,     0,     0,     0,     0,     0,   927,     0,
-       0,     0,     0,   693,  -430,     0,     0,   928,     0,  2341,
-       0,     0,     0,     0,     0,     0,  1907,     0,     0,   693,
-       0,     0,     0,     0,     0,     0,  5522,     0,     0,     0,
-       0,     0,     0,     0,   693,     0,  -430,   693,     0,   929,
-     930,     0,   931,   932,     0,  5522,     0,     0,   380,   380,
-     380,     0,   933,     0,     0,     0,     0,   934,     0,     0,
-       0,     0,     0,   935,     0,     0,   936,     0,     0,   937,
-       0,  3691,   695,  1908,     0,  1909,     0,     0,     0,     0,
-       0,     0,  -430,     0,   695,  1910,     0,     0,   695,     0,
-       0,     0,     0,  1911,     0,     0,     0,   695,     0,     0,
-       0,     0,  2342,  1912,     0,  2343,  2344,  2345,     0,  2346,
-    2347,  2348,  2349,  2350,  2351,     0,     0,     0,     0,  5035,
-       0,     0,     0,     0,     0,     0,     0,  2323,     0,     0,
-    2324,     0,   694,     0,  2325,  2326,  2327,  1993,     0,  3964,
-    1914,  1915,     0,     0,     0,     0,     0,     0,     0,   865,
-       0,  2328,     0,     0,     0,     0,  3976,     0,     0,  2330,
-       0,   695,     0,     0,   693,  2331,     0,  1994,     0,     0,
-       0,     0,   693,   693,   379,     0,     0,     0,     0,   379,
-       0,   379,  3691,   843,  3691,     0,     0,     0,     0,  2332,
-       0,     0,     0,     0,     0,   866,  1039,   380,     0,     0,
-       0,     0,     0,   695,     0,   695,   372,     0,     0,   867,
-       0,     0,     0,     0,     0,     0,   372,   695,     0,   695,
-       0,     0,     0,     0,     0,     0,     0,   868,     0,   694,
-    1917,     0,   694,   869,     0,     0,   843,     0,     0,     0,
-     372,     0,     0,     0,     0,  4048,     0,  4050,   870,     0,
-       0,     0,     0,     0,     0,  1900,   693,     0,     0,   871,
-       0,  1901,     0,     0,     0,     0,     0,   872,     0,   379,
-       0,     0,     0,   695,     0,     0,     0,     0,     0,   873,
-       0,     0,     0,     0,   874,     0,  1943,     0,     0,     0,
-     875,     0,     0,     0,  2333,     0,     0,     0,     0,  2334,
-     843,  1902,     0,     0,     0,     0,  4091,   876,     0,     0,
-    1082,     0,     0,     0,   694,   694,     0,     0,     0,     0,
-    2335,  2336,     0,     0,     0,     0,     0,   694,   695,   694,
-       0,  4105,   877,     0,  1944,  2337,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   695,     0,     0,     0,  1082,
-       0,     0,  1903,   878,     0,     0,     0,  1230,  1232,  1904,
-       0,  1235,  1905,  1237,     0,     0,  2338,   695,     0,     0,
-     695,     0,     0,     0,     0,     0,     0,     0,     0,  2339,
-       0,     0,  2340,  1288,   879,     0,  4714,  1906,     0,     0,
-       0,     0,     0,     0,  4717,  4718,  4719,  4720,   379,     0,
-       0,     0,     0,  1343,   880,     0,     0,  1346,     0,     0,
-       0,     0,     0,     0,   881,  1945,  1900,     0,  1907,     0,
-    3366,     0,  1901,     0,     0,  1370,     0,     0,     0,     0,
-     694,     0,     0,  2316,     0,     0,     0,     0,  1039,     0,
-       0,   882,     0,     0,     0,     0,   883,   380,   884,  4391,
-     693,  4394,  1082,  4241,   885,     0,     0,   886,     0,     0,
-    2341,     0,  1902,  1946,     0,  1947,     0,     0,     0,     0,
-    1900,     0,     0,     0,     0,  1948,  1901,  1909,     0,     0,
-       0,     0,     0,     0,     0,   887,   888,  1910,     0,   889,
-       0,     0,     0,   890,     0,  1911,     0,     0,     0,     0,
-     843,  1943,   891,     0,  1949,  1912,     0,   892,     0,     0,
-       0,     0,     0,  1903,     0,     0,  1902,     0,     0,   893,
-    1904,   693,     0,  1905,     0,   693,     0,     0,     0,     0,
-       0,     0,   894,  1039,     0,     0,     0,   693,     0,  1950,
-       0,     0,  1914,  1915,  1951,     0,     0,     0,  1906,  1944,
-       0,     0,     0,  2342,  4304,     0,  2343,  2344,  2345,     0,
-    2346,  2347,  2348,  2349,  2350,  2351,     0,  1903,     0,  1952,
-    5044,     0,     0,     0,  1904,  4313,     0,  1905,     0,  1907,
-       0,     0,     0,  1953,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    4336,     0,  1906,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   693,   693,     0,     0,     0,     0,     0,     0,
-       0,  4862,     0,     0,     0,   693,     0,     0,     0,     0,
-    1945,     0,  1917,  1907,  2259,     0,  1908,     0,  1909,   695,
-     693,   693,     0,     0,     0,     0,     0,     0,  1910,     0,
-       0,     0,     0,  4880,  4881,     0,  1911,     0,     0,     0,
-     694,     0,   693,   379,     0,     0,  1912,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1946,     0,
-    1947,   380,     0,     0,     0,     0,   380,   694,   380,     0,
-    1948,     0,  1909,     0,     0,     0,     0,     0,     0,   694,
-    2608,     0,  1910,  1914,  1915,     0,     0,     0,     0,     0,
-    1911,     0,     0,     0,     0,     0,     0,   694,     0,  1949,
-    1912,  3691,     0,     0,     0,     0,     0,  4918,  4919,     0,
-    2609,     0,     0,     0,     0,     0,   695,     0,     0,   695,
-       0,     0,     0,     0,     0,     0,  1925,  1926,     0,     0,
-       0,     0,     0,     0,  3447,     0,     0,  1914,  1915,  1951,
+    1919,     0,     0,     0,   694,     0,     0,     0,     0, -2305,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3653,  3653,  3653,  3653,  3653,     0,   694,     0,     0,     0,
        0,     0,     0,     0,   694,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   380,     0,     0,     0,
-       0,     0,     0,     0,  3448,     0,     0,     0,     0,     0,
-       0,     0,   843,  1917,     0,     0,     0,     0,  1953,     0,
-       0,  1039,     0,     0,     0,  2323,     0,     0,  2324,     0,
-       0,     0,  2325,  2326,  2327,     0,     0,     0,   372,     0,
-       0,   695,   695,     0,     0,     0,     0,  2027,     0,  2328,
-       0,     0,     0,     0,   695,  5011,   695,  2330,     0,     0,
-       0,     0,     0,  2331,     0,  5013,  5014,  1917,  2050,  2051,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1900,  5018,     0,     0,     0,     0,  1901,  2332,     0,  2084,
-       0,     4,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   372,   694,     0,     0,     0,     0,     0,     0,     0,
-       0,     5,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     6,     7,     0,     0,   380,  1902,     0,     9,    10,
-       0,     0,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,   695,     0,     0,
-      37,    38,    39,    40,    41,    42,    43,    44,  2154,  2156,
-       0,    45,     0,     0,     0,     0,     0,  1903,     0,     0,
-       0,   693,     0,     0,  1904,     0,     0,  1905,     0,     0,
-       0,     0,  2333,     0,     0,     0,     0,  2334,     0,     0,
-    1900,     0,     0,     0,     0,     0,  1901,     0,     0,  4654,
-       0,     0,  1906,   694,     0,   694,     0,     0,  2335,  2336,
-       0,   693,     0,    46,     0,   843,   693,     0,     0,     0,
-     693,  3842,     0,  2337,     0,  3842,     0,     0,   693,     0,
-       0,     0,     0,  1907,     0,     0,  1902,     0,     0,     0,
-       0,     0,     0,   694,     0,     0,   693,     0,     0,     0,
-       0,     0,     0,     0,  2338,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2339,   372,     0,
-    2340,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    47,     0,  1903,   693,   379,
-    1908,   694,  1909,     0,  1904,     0,     0,  1905,     0,  1082,
-       0,     0,  1910,    48,     0,   693,   693,     0,     0,     0,
-    1911,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1912,     0,  1906,     0,    49,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   843,   693,     0,     0,   843,     0,
-       0,     0,     0,     0,     0,     0,     0,    50,  2341,     0,
-       0,     0,  5353,  1907,  2678,     0,     0,  1914,  1915,  5226,
-       0,     0,     0,     0,     0,   693,     0,     0,     0,   693,
+       0,     0,     0,   695,     0,     0,     0,     0,  1037,     0,
+       0,     0,     0,     0,     0,     0,     0, -2305,     0,     0,
+       0,     0,     0,     0,   380,  4742,  2343,     0,  4742, -2305,
+    4742,     0,     0,     0, -2305,     0,  1037,     0,     0, -2305,
+       0,     0,     0,     0, -2305,     0,   693, -2305,  2012,     0,
+   -2305,  2325,     0,     0,  2326,     0,     0,     0,  2327,  2328,
+    2329,     0,     0,  1243,     0,     0,     0,     0,  2027,     0,
+     379,     0,     0,   843,     0,  2330,   379,  2037, -2305,     0,
+       0,     0,     0,  2332,     0,  1442,     0,     0,     0,  2333,
+       0,     0,   695,   695,     0,     0,     0,     0, -2305,     0,
+       0,     0,     0,  1524,  1525,     0,  1442,     0,     0,     0,
+       0,     0,     0,  2334,     0,     0,     0,     0,   843,  2344,
+       0,     0,  2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,
+    2352,  2353,     0,     0,     0,     0,  4139, -2305,     0, -2305,
+       0,     0,     0,     0,     0, -2305,     0,   691,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  4826,     0,     0,  4833,  4834,  1082,   694,     0,     0,
+       0,     0,     0,     0,  1082,     0,  1082,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   843,
+      80,     0,     0,     0, -2305,     0,     0,     0,     0,     0,
+       0,  2325,     0,     0,  2326,     0,     0,     0,  2327,  2328,
+    2329,     0,     0,     0,     0,     0,     0,  3857,  2335,  3857,
+       0,     0,     0,  2336,     0,  2330,     0,  3651,  3651,  3651,
+    3651,  3651,     0,  2332,     0,     0,     0,     0,     0,  2333,
+       0,     0,     0,  1053,  2337,  2338,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1037,   694,     0,     0,  2339,
+       0,     0,     0,  2334,     0,     0,     0,     0,     0, -2305,
+       0,     0,   694,   694,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2261,
+    2340,     0,     0, -2305,     0, -2305, -2305,     0,     0,   694,
+       0,     0,   694,  2341,     0,     0,  2342,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  4921,  4922,     0,  3857, -2305,
+       0,     0, -2305, -2305,  3521, -2305,  3521,  3521,     0,     0,
+    3521,     0,  2750,     0,     0,  1398,     0,     0,     0,  4942,
        0,     0,     0,     0,     0,     0,     0,   695,     0,     0,
-     380,     0,     0,    51,  2679,     0,    52,   693,     0,     0,
-       0,     0,     0,     0,     0,     0,  2259,     0,   693,     0,
-       0,    53,     0,     0,   695,     0,     0,     0,     0,     0,
-    1908,   693,  1909,     0,     0,     0,   695,     0,     0,   693,
-       0,     0,  1910,     0,     0,     0,     0,     0,     0,     0,
-    1911,     0,     0,     0,   695,     0,     0,  5268,     0,     0,
-    1912,  2342,     0,     0,  2343,  2344,  2345,  1917,  2346,  2347,
-    2348,  2349,  2350,  2351,     0,     0,     0,     0,  5047,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3363,   843,   379,  1914,  1915,    54,
-       0,   695,     0,  5300,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2323,     0,     0,  2324,     0,     0,
-       0,  2325,  2326,  2327,  1916,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  2328,     0,
-       0,     0,     0,     0,  4863,    55,  2330,     0,     0,     0,
-       0,     0,  2331,     0,     0,     0,     0,     0,     0,     0,
-      56,   693,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  4879,     0,    57,  2332,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1917,     0,     0,
-       0,     0,     0,  4894,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    58,     0,     0,     0,     0,     0,     0,
-       0,    59,     0,    60,    61,    62,    63,    64,     0,   695,
-      65,    66,  1485,   693,     0,     0,  2323,    71,  1486,  2324,
-       0,  2660,     0,  2325,  2326,  2327,     0,  3842,     0,     0,
-       0,     0,  3842,     0,     0,  3842,     0,  4917,     0,     0,
-    2328,     0,     0,     0,     0,     0,     0,     0,  2330,     0,
-       0,     0,     0,     0,  2331,     0,     0,     0,     0,     0,
-     693,     0,     0,     0,     0,     0,     0,  5093,     0,     0,
-       0,  2333,     0,     0,   694,     0,  2334,     0,  2332,     0,
-       0,     0,   693,     0,     0,  2729,  2730,  2731,  2732,     0,
-     693,     0,     0,     0,     0,     0,     0,  2335,  2336,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2337,     0,     0,     0,     0,     0,     0,     0,
-     695,     0,   695,     0,     0,     0,     0,   739,  2768,  2769,
-       0,     0,     0,     0,     0,     0,     0,  2781,  5001,     0,
-       0,     0,     0,  2338,     0,     0,     0,  2795,     0,     0,
-       0,     0,   694,     0,     0,     0,  2339,     0,     0,  2340,
-     695,     0,     0,     0,   739,     0,   843,     0,     0,     0,
-       0,     0,   843,     0,     0,  2831,  2832,  2833,  2834,     0,
-       0,     0,     0,  2333,     0,   739,     0,     0,  2334,     0,
-       0,     0,     0,  2259,     0,     0,   372,     0,     0,     0,
-       0,     0,     0,  1048,     0,  5507,   380,     0,   695,  2335,
-    2336,     0,     0,     0,     0,     0,     0,     0,  1050,     0,
-       0,   372,     0,     0,  2337,     0,  1058,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2341,     0,     0,
-       0,  1072,     0,  1048,     0,     0,     0,  1095,     0,     0,
-     379,     0,     0,     0,     0,  2338,     0,  1127,     0,     0,
-       0,     0,     0,   693,     0,     0,  1132,     0,  2339,     0,
-       0,  2340,  2917,     0,     0,  2920,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2925,     0,     0,  2323,  3842,
-       0,  2324,     0,     0,  2933,  2325,  2326,  2327,     0,     0,
-    2316,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   379,     0,     0,     0,     0,     0,     0,     0,
-    2330,     0,  2316,     0,     0,     0,  2331,     0,     0,     0,
-    2342,   379,     0,  2343,  2344,  2345,     0,  2346,  2347,  2348,
-    2349,  2350,  2351,     0,     0,     0,     0,  5098,     0,  2341,
-    2332,     0,   693,     0,  2323,     0,     0,  2324,     0,     0,
-       0,  2325,  2326,  2327,     0,     0,     0,     0,   693,   693,
-       0,     0,  2323,     0,     0,  2324,     0,     0,  2328,  2325,
-    2326,  2327,     0,     0,     0,     0,  2330,     0,     0,     0,
-       0,     0,  2331,   380,     0,   693,  2328,     0,   693,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  2335,     0,
+       0,     0,     0,  2336,     0,     0,     0,   695,   379,   379,
+     379,     0,     0,     0,  2343,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2337,  2338,  4981,     0,     0,     0,
+     695,     0,   694,     0,     0,     0,     0,     0,     0,  2339,
+       0,  2506,  2822,     0,   694,     0,  2835,     0,   694,     0,
+       0,     0,     0,     0,     0,  5001,  1442,   694,  2750,     0,
+       0,     0,     0,     0,     0,     0,   695,    74,     0,     0,
+    2340,     0,     0,     0,     0,     0,  1442,     0,     0,     0,
+       0,     0,   695,  2341,     0,  1442,  2342,     0,     0,     0,
+       0,     0,     0,     0,  4742,     0,     0,   695,  4742,  4742,
+     695,  4742,     0,     0,     0,     0,     0,  2344,     0,     0,
+    2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,
+       0,   694,     0,     0,  4311,     0,     0,  1037,     0,     0,
+       0,     0,     0,     0,  2912,     0,     0,     0,     0,     0,
+       0,     0,  2883,  2325,     0,     0,  2326,     0,  4898,  4899,
+    2327,  2328,  2329,  4902,  4903,     0,     0,   379,     0,     0,
+       0,     0,  2750,   694,  2343,   694,  1442,  2330,     0,     0,
+       0,     0,     0,     0,     0,  2332,     0,   694,     0,   694,
+    1902,  2333,     0,     0,     0,     0,  1903,  2910,     0,     0,
+       0,  2914,     0,  2325,     0,     0,  2326,  2920,  2921,     0,
+    2327,  2328,  2329,     0,     0,  2334,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2330,     0,     0,
+    2937,     0,  1037,     0,     0,  2332,  1904,   695,     0,     0,
+       0,  2333,     0,   694,     0,   695,   695,     0,     0,     0,
+       0,     0,     0,  4138,     0,     0,   380,     0,     0,     0,
+       0,     0,     0,     0,     0,  2334,     0,  2344,     0,     0,
+    2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,
+       0,     0,     0,     0,  4362,     0,     0,  1905,     0,     0,
+       0,  3521,     0,     0,  1906,     0,     0,  1907,   694,     0,
+       0,     0,  1398,  2687,     0,     0,  5157,  1442,  5158,   380,
+     380,   380,  5163,  5164,     0,   694,     0,     0,     0,     0,
+    2335,     0,  1908,     0,     0,  2336,     0,     0,     0,     0,
+     695,     0,     0,     0,     0,     0,     0,   694,     0,     0,
+     694,     0,     0,     0,     0,     0,  2337,  2338,     0,     0,
+       0,     0,     0,  1909,     0,     0,     0,     0,     0,     0,
+     380,  2339,     0,     0,     0,     0,     0,   380,     0,     0,
+    2335,     0,     0,     0,   380,  2336,     0,     0,     0,     0,
+       0,     0,     0,     0,  2768,     0,     0,     0,     0,     0,
+       0,     0,  2340,     0,     0,     0,  2337,  2338,     0,  2784,
+       0,     0,     0,     0,     0,  2341,     0,     0,  2342,     0,
+    1910,  2339,  1911,     0,     0,     0,     0,   379,  2807,  3857,
+       0,     0,  1912,  3857,     0,     0,     0,     0,     0,     0,
+    1913,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1914,  5089,  2340,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   843,  2341,     0,  2397,  2342,     0,
+       0,     0,     0,     0,     0,  2873,     0,     0,     0,     0,
+    3193,     0,   693,     0,  1995,     0,     0,  1916,  1917,   693,
+       0,     0,     0,     0,  2884,     0,  2343,     0,     0,     0,
+     693,     0,     0,   691,     0,     0,  1430,     0,     0,     0,
+    1037,     0,     0,     0,  1996,     0,     0,     0,  2898,     0,
+       0,     0,     0,     0,     0,     0,     0,  5308,   693,     0,
+       0,     0,     0,   693,     0,   695,     0,     0,     0,     0,
+       0,     0,     0,  3278,   693,     0,  2343,     0,  3282,     0,
+       0,     0,  3285,     0,     0,     0,     0,     0,  2929,     0,
+       0,  1430,     0,     0,     0,     0,     0,     0,     0,     0,
+     693,     0,     0,     0,     0,     0,     0,  1919,  3309,     0,
+       0,     0,     0,     0,   380,   693,     0,     0,     0,  2344,
+       0,   693,  2345,  2346,  2347,  1442,  2348,  2349,  2350,  2351,
+    2352,  2353,   693,     0,     0,   695,  4448,     0,     0,   695,
+       0,     0,     0,     0,     0,     0,   693,     0,     0,   694,
+    3360,   695,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   691,     0,  2344,
+       0,     0,  2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,
+    2352,  2353,     0,     0,     0,     0,  4480,     0,  1442,     0,
+       0,   379,     0,     0,     0,     0,   379,  3405,   379,     0,
+    4961,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1398,     0,     0,     0,     0,
+       0,  1442,     0,     0,     0,     0,   695,   695,   691,     0,
+       0,     0,  3451,     0,     0,     0,     0,     0,     0,   695,
+    3102,     0,     0,  1082,     0,   693,   694,  1082,     0,   694,
+    3463,     0,     0,     0,   695,   695,     0,     0,     0,     0,
+       0,  3473,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  3497,     0,   695,     0,     0,     0,
+       0,     0,     0,   691,     0,     0,   379,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1442,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1442,     0,     0,
+       0,     0,     0,     0,     0,  1442,     0,     0,     0,     0,
+    2325,   694,   694,  2326,   693,   693,  1442,  2327,  2328,  2329,
+       0,     0,     0,     0,   694,     0,   694,     0,     0,     0,
+    3857,     0,     0,     0,  2330,  3857,     0,     0,     0,     0,
+    3857,     0,  2332,  3857,  5067,     0,     0,     0,  2333,     0,
+       0,     0,     0,  1902,     0,     0,     0,     0,     0,  1903,
+       0,  5358,     0,  1442,     0,     0,     0,     0,     0,     0,
+       0,  5531,  2334,  3857,     0,     0,     0,     0,     0,     0,
+       0,     0,  1442,     0,     0,     0,   380,  3857,     0,     0,
+       0,     0,     0,     0,  1442,   379,     0,  1082,  1082,  1904,
+       0,     0,     0,     0,     0,     0,  1442,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2325,     0,     0,  2326,
+       0,     0,     0,  2327,  2328,  2329,     0,   694,     0,     0,
+    5129,     0,     0,  5531,     0,     0,     0,     0,     0,     0,
+    2330,     0,     0,     0,     0,     0,  1442,     0,  2332,  1442,
+    1905,     0,  5531,     0,  2333,     0,  3642,  1906,     0,     0,
+    1907,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3659,     0,  2335,  2334,   380,
+       0,  1243,  2336,     0,     0,  1908,     0,     0,  3327,     0,
+    3668,     0,     0,  3670,  3671,  3697,     0,     0,  3674,  3675,
+    3342,     0,     0,  2337,  2338,  3679,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1909,  3711,  2339,     0,
+       0,     0,     0,     0,   865,  3697,     0,     0,     0,     0,
+       0,     0,  3857,     0,   380,     0,   380,  3372,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2340,
+       0,     0,     0,     0,     0,     0,   695,     0,     0,     0,
+       0,     0,  2341,     0,     0,  2342,     0,     0,     0,     0,
+     866,     0,     0,  1910,     0,  1911,     0,     0,     0,   693,
+       0,     0,  3720,  2335,   867,  1912,     0,     0,  2336,     0,
+       0,     0,     0,  1913,     0,     0,   695,  3857,  1442,   693,
+     380,   695,   868,  1914,     0,   695,     0,     0,   869,  2337,
+    2338,     0,     0,   695,     0,     0,     0,     0,  5528,     0,
+       0,     0,   693,   870,  2339,     0,     0,     0,     0,     0,
+       0,   695,     0,     0,   871,     0,     0,  2611,     0,     0,
+    1916,  1917,   872,  2343,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   873,  2340,     0,   694,   693,   874,
+     379,     0,     0,     0,     0,   875,     0,  2612,  2341,     0,
+    1902,  2342,     0,   695,   693,     0,  1903,     0,     0,     0,
+    5528,     0,   876,     0,   694,     0,     0,     0,     0,   693,
+     695,   695,   693,     0,  3544,     0,   694,     0,     0,  5528,
+       0,     0,     0,     0,     0,     0,     0,   877,     0,     0,
+    5327,     0,     0,     0,   694,     0,  1904,     0,     0,   380,
+     695,     0,     0,   380,     0,     0,     0,     0,   878,     0,
+    1919,     0,     0,     0,     0,     0,  2344,     0,     0,  2345,
+    2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,  2343,
+       0,   695,     0,  4750,     0,   695,     0,     0,     0,   879,
+       0,   694,     0,     0,     0,     0,     0,  1905,     0,     0,
+       0,     0,     0,   695,  1906,     0,  3857,  1907,     0,   880,
+       0,     0,     0,     0,   695,     0,     0,  3944,     0,   881,
+       0,     0,     0,     0,     0,     0,     0,   695,     0,  1442,
+       0,  3857,  1908,  1442,  1442,     0,   695,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   882,     0,     0,   693,
+       0,   883,     0,   884,     0,     0,     0,   693,   693,   885,
+    3966,     0,   886,  1909,     0,     0,     0,     0,   843,     0,
+       0,     0,  2344,     0,     0,  2345,  2346,  2347,     0,  2348,
+    2349,  2350,  2351,  2352,  2353,     0,     0,     0,     0,  4785,
+     887,   888,     0,   380,   889,     0,  1442,     0,   890,     0,
+    5429,     0,     0,     0,  3964,     0,     0,   891,  1442,   694,
+       0,     0,   892,     0,     0,     0,     0,     0,     0,     0,
+    1910,   843,  1911,  3710,   893,     0,     0,     0,     0,     0,
+       0,     0,  1912,     0,     0,     0,     0,   894,     0,     0,
+    1913,     0,   693,     0,  3722,  1442,     0,     0,     0,     0,
+    1914,     0,     0,     0,     0,  3728,     0,     0,     0,   695,
+       0,  2325,  5469,  4038,  2326,     0,     0,     0,  2327,  2328,
+    2329,     0,     0,     0,     0,  4057,     0,     0,     0,  4016,
+       0,  4018,     0,     0,  2681,  2330,   843,  1916,  1917,     0,
+       0,     0,     0,  2332,     0,     0,  1082,  3857,     0,  2333,
+       0,     0,     0,  1243,  1243,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2682,     0,     0,     0,     0,     0,
+     694,   695,   694,  2334,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2325,  1082,     0,  2326,     0,     0,
+       0,  2327,  2328,  2329,     0,     0,     0,     0,     0,     0,
+       0,     0,  4108,     0,     0,     0,     0,     0,  2330,     0,
+     694,     0,     0,     0,     0,     0,  2332,     0,   695,     0,
+       0,     0,  2333,     0,     0,     0,     0,  1919,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  4096,     0,     0,
+     695,     0,     0,  4103,     0,     0,  2334,     0,   695,     0,
+       0,     0,  1442,     0,     0,     0,   379,     0,   694,     0,
+       0,     0,     0,  2325,     0,     0,  2326,     0,  5563,     0,
+    2327,  2328,  2329,     0,     0,     0,     0,     0,  2335,     0,
+    1243,  1243,     0,  2336,     0,     0,     0,   693,     0,     0,
+       0,     0,     0,     0,     0,  2332,     0,     0,     0,     0,
+       0,  2333,     0,     0,  2337,  2338,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2339,
+    2325,     0,  1442,  2326,   380,  2334,     0,  2327,  2328,  2329,
+     380,     0,     0,     0,     0,     0,   843,     0,     0,     0,
        0,     0,     0,     0,  2330,     0,     0,     0,     0,     0,
-    2331,     0,     0,     0,     0,     0,  2332,     0,     0,     0,
-       0,     0,     0,     0,   372,     0,     0,     0,     0,     0,
-       0,     0,  2323,     0,  2332,  2324,     0,     0,     0,  2325,
-    2326,  2327,  2342,  3106,     0,  2343,  2344,  2345,     0,  2346,
-    2347,  2348,  2349,  2350,  2351,  2333,     0,     0,     0,  5130,
-    2334,     0,     0,     0,  2330,     0,     0,     0,  2259,     0,
-    2331,     0,     0,     0,   843,   843,   843,     0,     0,     0,
-       0,  2335,  2336,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2332,     0,  2337,     0,   693,     0,
-       0,     0,     0,     0,     0,     0,  4091,     0,     0,     0,
-     693,     0,     0,     0,   693,     0,     0,     0,     0,     0,
-       0,  2333,     0,   693,     0,     0,  2334,  2338,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  2333,
-    2339,     0,     0,     0,  2334,     0,     0,  2335,  2336,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2337,  2259,     0,  2335,  2336,  2259,  2259,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2337,   695,     0,     0,     0,     0,     0,   693,     0,     0,
-       0,     0,     0,  2338,     0,     0,     0,     0,     0,  2333,
-       0,     0,     0,     0,  2334,     0,  2339,     0,     0,  2340,
-       0,  2338,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  2341,     0,   843,  2339, -2800, -2800,  2340,     0,   693,
+    2340,  2335,  2332,     0,     0,     0,  2336,   693,  2333,     0,
+       0,   693,     0,  2341,     0,     0,  2342,     0,     0,  2750,
+       0,     0,     0,   693,     0,     0,     0,  2337,  2338,     0,
+       0,     0,  2334,     0,  4246,     0,  4284,     0,     0,     0,
+       0,     0,  2339,     0,     0,     0,     0,     0,  3970,     0,
+       0,     0,     0,     0,     0,     0,     0,  4263,  4264,     0,
+    4266,  4298,  4268,  4269,     0,  3982,     0,     0,     0,     0,
+       0,   695,     0,  2340,     0,  4276,     0,     0,     0,     0,
+    2335,     0,     0,     0,     0,  2336,  2341,     0,     0,  2342,
+       0,     0,     0,   379,  2343,     0,     0,     0,   693,   693,
+       0,  1442,     0,     0,     0,     0,  2337,  2338,     0,     0,
+       0,   693,     0,     0,     0,  4297,     0,     0,     0,     0,
+       0,  2339,  1442,     0,     0,     0,   693,   693,     0,     0,
+       0,     0,     0,  1442,     0,     0,     0,  2335,     0,     0,
+       0,     0,  2336,     0,     0,     0,     0,     0,   693,     0,
+       0,     0,  2340,     0,  4054,     0,  4056,     0,     0,     0,
+     695,     0,     0,  2337,  2338,  2341,     0,  2343,     0,     0,
+       0,     0,     0,     0,     0,     0,   695,   695,  2339,     0,
+       0,     0,     0,     0,     0,     0,     0,  2344,     0,     0,
+    2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,
+       0,     0,     0,   695,  5030,     0,   695,     0,     0,  2340,
+       0,     0,     0,     0,     0,  4097,     0,     0,     0,     0,
+       0,     0,  2341,     0,     0,  2342,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    4111,     0,     0,     0,     0,     0,  2343,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    2344,     0,     0,  2345,  2346,  2347,     0,  2348,  2349,  2350,
+    2351,  2352,  2353,     0,     0,     0,     0,  5041,   843,     0,
+       0,   694,   380,   380,   380,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2343,     0,     0,   695,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   695,     0,
+       0,     0,   695,     0,     0,     0,     0,     0,     0,  3372,
+    4509,   695,     0,     0,     0,     0,     0,     0,     0,  2344,
+       0,     0,  2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,
+    2352,  2353,     0,     0,     0,     0,     0,     0,     0,   694,
+       0,     0,  4247,     0,     0,  1442,     0,     0,  1442,     0,
+    1442,     0,     0,     0,  1902,  1442,     0,     0,     0,     0,
+    1903,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   695,  2344,     0,     0,  2345,
+    2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,     0,
+       0,     0,     0,  5050,     0,     0,     0,     0,     0,     0,
+    1904,     0,     0,     0,     0,     0,  1442,  4586,     0,     0,
+    4589,   380,     0,     0,     0,     0,     0,   695,     0,   695,
+       0,     0,     0,  1442,     0,     0,     0,     0,   693,     0,
+       0,   695,     0,   695,     0,     0,     0,   379,     0,     0,
+       0,     0,     0,  4310,     0,     0,     0,  1442,     0,     0,
+       0,  1905,     0,     0,     0,     0,     0,     0,  1906,     0,
+       0,  1907,     0,     0,  4319,     0,     0,     0,   693,     0,
+       0,     0,   843,   693,     0,     0,     0,   693,     0,     0,
+       0,     0,     0,     0,     0,   693,  1908,   695,     0,  4342,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   379,
+       0,     0,     0,   693,     0,     0,     0,  4665,     0,     0,
+       0,     0,  1442,     0,  1442,     0,     0,  1909,   379,     0,
+       0,     0,     0,  2261,     0,     0,     0,     0,  2325,     0,
+       0,  2326,     0,     0,     0,  2327,  2328,  2329,     0,     0,
+       0,     0,   695,     0,     0,   693,     0,     0,     0,     0,
+       0,     0,  2330,     0,     0,     0,  1082,     0,     0,   695,
+    2332,     0,   693,   693,     0,     0,  2333,     0,     0,     0,
+       0,     0,     0,  1442,  1910,     0,  1911,     0,     0,     0,
+       0,   695,     0,     0,   695,     0,  1912,     0,     0,     0,
+    2334,   843,   693,     0,  1913,   843,     0,  1902,  1442,     0,
+       0,     0,     0,  1903,  1914,     0,     0,     0,  3697,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1082,     0,   693,  1442,     0,     0,   693,  1945,  1442,
+       0,     0,     0,     0,     0,     0,     0,     0,  3369,  4720,
+       0,  1916,  1917,  1904,     0,   693,     0,  4723,  4724,  4725,
+    4726,     0,     0,     0,     0,     0,   693,     0,     0,     0,
+       0,   380,     0,     0,     0,     0,     0,     0,  1918,   693,
+       0,     0,     0,     0,     0,     0,  1946,     0,   693,     0,
+       0,     0,     0,     0,     0,     0,     0,  1442,     0,     0,
+       0,     0,     0,     0,  1905,  2335,     0,     0,     0,     0,
+    2336,  1906,     0,     0,  1907,  1442,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1442,  2337,  2338,     0,     0,     0,     0,     0,     0,  1908,
+       0,  1919,     0,     0,     0,   843,  2339,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1947,     0,  1248,
+    1909,     0,     0,     0,     0,     0,     0,  2340,  1278,     0,
+       0,     0,     0,     0,     0,     0,     0,  1294,     0,     0,
+    2341,     0,     0,  2342,     0,  1304,     0,     0,     0,     0,
+    1339,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   693,     0,     0,     0,  1948,     0,  1949,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1950,     0,  1911,
+       0,  1442,     0,     0,     0,     0,     0,     0,     0,  1912,
+       0,     0,     0,     0,     0,     0,     0,  1913,     0,     0,
+       0,     0,  1442,     0,     0,     0,  1951,  1914,     0,     0,
+       0,     0,     0,   695,     0,     0,     0,     0,     0,     0,
+       0,  2343,     0,   693,     0,  4895,     0,  1442,     0,     0,
+       0,     0,     0,     0,  4868,     0,     0,  4905,  4660,   739,
+       0,  1952,     0,     0,  1916,  1917,  1953,     0,     0,     0,
+       0,     0,     0,     0,     0,   380,     0,     0,     0,     0,
+     380,  1442,   380,     0,     0,     0,  4886,  4887,     0,     0,
+     693,  1954,     0,     0,     0,     0,   739,     0,     0,     0,
+       0,     0,     0,     0,     0,  1955,     0,     0,     0,     0,
+       0,     0,   693,     0,     0,     0,     0,   739,     0,     0,
+     693,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     695,     0,  1562,   695,  2344,  1048,     0,  2345,  2346,  2347,
+       0,  2348,  2349,  2350,  2351,  2352,  2353,     0,     0,     0,
+    1050,  5053,     0,     0,  1919,     0,     0,     0,  1058,     0,
+    4924,  4925,     0,     0,     0,     0,     0,     0,  1694,     0,
+     380,     0,     0,  1072,     0,  1048,     0,     0,     0,  1095,
+       0,     0,     0,     0,     0,     0,     0,  1718,     0,  1127,
+       0,     0,     0,     0,     0,     0,   843,     0,  1132,     0,
+       0,     0,   843,  1442,     0,     0,     0,     0,     0,     0,
+    1744,     0,     0,     0,  2325,   695,   695,  2326,     0,     0,
+       0,  2327,  2328,  2329,     0,     0,  1307,     0,   695,     0,
+     695,     0,     0,     0,     0,     0,     0,     0,  2330,     0,
+    3697,     0,  1902,     0,     0,     0,  2332,     0,  1903,     0,
+       0,     0,  2333,     0,     0,  2261,     0,  2325,     0,  1308,
+    2326,     0,     0,     0,  2327,  2328,  2329,     0,  5017,     0,
+       0,     0,  1309,  1310,     0,     0,  2334,     0,  5019,  5020,
+       0,  2330,  1311,     0,     0,     0,  1312,     0,  1904,  2332,
+       0,     0,     0,   693,  5024,  2333,     0,     0,  1442,   380,
+       0,     0,     0,     0,  1313,     0,     0,     0,     0,     0,
+       0,     0,     0,  1926,     0,     0,     0,     0,     0,  2334,
+       0,     0,     0,     0,     0,  1314,     0,     0,     0,     0,
+       0,   695,     0,     0,     0,     0,  1315,     0,     0,  1905,
+       0,     0,     0,     0,  1316,     0,  1906,     0,     0,  1907,
+       0,  3697,     0,  3697,     0,     0,  1317,     0,     0,     0,
+       0,  1318,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1908,     0,     0,     0,     0,     0,
+       0,  2335,   693,  4869,  1319,     0,  2336,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   693,   693,
+       0,     0,     0,     0,     0,  1909,     0,  2337,  2338,  1320,
+       0,     0,  4885,     0,     0,  2050,     0,     0,     0,     0,
+       0,     0,  2339,     0,  2335,   693,     0,     0,   693,  2336,
+    1321,     0,  4900,     0,     0,     0,  1442,     0,  2080,  2083,
+    2084,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    2337,  2338,     0,  2340,     0,     0,     0,     0,     0,     0,
+       0,  1322,  1910,     0,  1911,  2339,  2341,     0,     0,  2342,
+       0,     0,     0,     0,  1912,     0,     0,     0,     0,     0,
+       0,  1323,  1913,     0,  1442,     0,  4923,     0,     0,     0,
+       0,   881,  1914,     0,     0,     0,  2340,     0,     0,     0,
+       0,     0,     0,     0,   843,   843,   843,     0,     0,  2341,
+       0,     0,  2342,     0,     0,     0,     0,     0,  1324,     0,
+       0,     0,     0,  1325,     0,  1326,  3466,     0,   693,  1916,
+    1917,  1327,     0,     0,  1328,     0,     0,     0,     0,     0,
+     693,     0,     0,     0,   693,     0,     0,  2343,     0,     0,
+       0,     0,     0,   693,     0,     0,  3467,     0,     0,     0,
+       0,   695,     0,  1329,   380,     0,  1330,     0,     0,     0,
+    1331,     0,     0,     0,     0,     0,     0,  1332,     0,  1333,
+       0,     0,  5232,     0,  1334,     0,     0,  5007,   695,     0,
+    2343,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     695,     0,     0,  1694,     0,     0,     0,     0,     0,  1335,
+       0,     0,     0,     0,     0,     0,     0,   693,   695,  1919,
+     739,     0,     0,  1442,     0,     0,  1902,     0,     0,     0,
+       0,     0,  1903,  1442,  1694,     0,     0,     0,     0,     0,
+    2344,     0,  2261,  2345,  2346,  2347,     0,  2348,  2349,  2350,
+    2351,  2352,  2353,   843,     0,     0,     0,  5104,     0,   693,
+    5274,   693,     0,     0,     0,   695,     0,     0,     0,     0,
+       0,     0,  1904,   693,     0,   693,     0,     0,     0,     0,
+       0,     0,     0,  2344,     0,     0,  2345,  2346,  2347,     0,
+    2348,  2349,  2350,  2351,  2352,  2353,     0,     0,     0,     0,
+    5136,     0,     0,     0,     0,     0,  5306,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1905,     0,     0,     0,     0,     0,   693,
+    1906,     0,     0,  1907,     0,  2325,     0,     0,  2326,     0,
+       0,     0,  2327,  2328,  2329,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1908,  2330,
+       0,  1442,     0,     0,     0,     0,     0,  2332,     0,     0,
+       0,     0,     0,  2333,     0,     0,     0,     0,     0,     0,
+    2415,     0,     0,   695,   693,     0,     0,     0,     0,  1909,
+    1442,     0,     0,     0,     0,     0,     0,  2334,     0,     0,
        0,   693,     0,     0,     0,     0,     0,     0,     0,     0,
-    2337,     0,     0,   693,     0,   693,     0,     0,     0,     0,
-       0,   372,     0,     0,  5346,     0,     0,     0,     0,   695,
-       0,     0,     0,     0,   372,     0,     0,     0,     0,     0,
-       0, -2800,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2339,     0,     0,  2341,   739,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   693,
-    3319,  3320,     0,     0,     0,  2341,     0,     0,     0,  3331,
-       0,  3333,     0,     0,  2342,  3337,  5532,  2343,  2344,  2345,
-       0,  2346,  2347,  2348,  2349,  2350,  2351,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   693,     0,     0,   380,     0,     0,
-       0,     0,     0,     0,     0,  2341,     0,     0,     0,     0,
-       0,   693,     0,     0,     0,   372,     0,     0,     0,     0,
-    2342,     0,     0,  2343,  2344,  2345,     0,  2346,  2347,  2348,
-    2349,  2350,  2351,   693,     0,     0,   693,  5165,  2342,     0,
-       0,  2343,  2344,  2345,     0,  2346,  2347,  2348,  2349,  2350,
-    2351,     0,     0,     0,     0,  5402,     0,     0,  3452,   380,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   380,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  2342,     0,
-       0,  2343,  2344,  2345,     0,  2346,  2347,  2348,  2349,  2350,
-    2351,     0,     0,   843,  3512,     0,     0,     0,     0,     0,
-       0,     0,  3521,     0,  3523,     0,     0,     0,     0,     0,
-    3525,     0,     0,     0,     0,     0,     0,     0,  1225,  1231,
-    1231,   739,     0,  1231,     0,  1239,     0,  1225,     0,  1127,
-       0,     0,  1269,     0,     0,     0,     0,     0,  1127,     0,
-       0,  1127,     0,     0,     0,  1231,     0,  1127,     0,     0,
-       0,     0,     0,     0,     0,  1305,     0,     0,     0,     0,
-    1127,     0,  1225,     0,     0,  1231,     0,   739,     0,  1231,
-       0,     0,     0,     0,     0,     0,  1269,     0,     0,     0,
-    1365,     0,     0,     0,  3597,     0,     0,  1231,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     4,     0,     0,
-    1225,     0,     0,     0,     0,   739,     0,     0,     0,     0,
-    1225,     0,     0,     0,  1269,     0,     0,     5,     0,     0,
-    3656,     0,  3658,     0,     0,     0,     0,     6,     7,     0,
-       0,  1231,     8,     0,     9,    10,     0,     0,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,     0,    36,   693,    37,    38,    39,    40,
-      41,    42,    43,    44,     0,     0,     0,    45,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1127,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1127, -2303,  1563,     0,     0,   843,     0,     0,
-    2323,     0,   843,  2324,   843,     0,     0,  2325,  2326,  2327,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    46,
-       0,     0,  1673,  1673,  2328,     0,     0,   739,  1127,  3724,
-       0,     0,  2330,     0,     0,     0,     0,  2323,  2331,     0,
-    2324, -2303,     0,     0,  2325,  2326,  2327,  1127,     0,     0,
-       0,  1127,   693, -2303,     0,   693,     0,     0, -2303,  1673,
-       0,  2328,  2332, -2303,     0,     0,     0,     0, -2303,  2330,
-    1127, -2303,     0,     0, -2303,  2331,     0,     0,     0,     0,
-       0,     0,  1127,     0,     0,     0,     0,     0,     0,     0,
-       0,    47,   843,     0,     0,     0,     0,     0,     0,  2332,
-       0,     0, -2303,     0,     0,     0,     0,     0,     0,    48,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0, -2303,     0,     0,     0,     0,     0,     0,     0,
-      49,     0,     0,     0,     0,     0,     0,   693,   693,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     693,     0,   693,    50,     0,     0,     0,     0,     0,     0,
-       0, -2303,     0, -2303,  1127,     0,     0,  2333,     0, -2303,
-       0,     0,  2334,  1127,     0,     0,     0,     0,  1231,  1231,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    51,
-       0,     0,    52,  2335,  2336,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2333,     0,     0,    53,  2337,  2334,
-       0,     0,     0,     0,     0,     0,     0,     0, -2303,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1225,
-    2335,  2336,     0,     0,     0,     0,     0,     0,     0,  2338,
-    1225,     0,     0,     0,  1269,  2337,     0,     0,     0,     0,
-       0,     0,  2339,   693,     0,  2340,     0,     0,     0,  1231,
-       0,     0,     0,     0,     0,     0,     0,  1053,     0,     0,
-       0,     0,     0,     0,  1127,     0,  2338,     0,     0,     0,
-    1231,  1231,     0,     0,     0,    54,     0,     0,     0,  2339,
-       0,     0,  2340, -2303,     0,     0,     0,  1127,  1127,  1127,
-       0,  1231,     0,  1225,     0,     0,     0,     0,  2093,     0,
-       0,     0,     0,     0,     0,     0,     0, -2303,     0, -2303,
-   -2303,     0,     0,     0,     0,  3967,     0,  3968,  3969,  3970,
-       0,    55,     0,  2341,  2323,     0,     0,  2324,     0,     0,
-       0,  2325,  2326,  2327,     0,     0,    56,     0,     0,     0,
-       0,     0,     0, -2303,     0,     0, -2303, -2303,  2328, -2303,
-       0,    57,     0,     0,     0,     0,  2330,     0,     0,     0,
-    2341,     0,  2331,     0,     0,     0,     0,     0,  1231,     0,
-    1231,  1231,     0,     0,     0,     0,     0,     0,     0,    58,
-       0,     0,     0,     0,     0,     0,  2332,    59,     0,    60,
-      61,    62,    63,    64,     0,     0,    65,    66,    67,    68,
-       0,    69,    70,    71,    72,    73,     0,     0,     0,  1673,
-       0,     0,     0,     0,     0,     0,  2342,     0,     0,  2343,
-    2344,  2345,     0,  2346,  2347,  2348,  2349,  2350,  2351,     0,
-       0,     0,     0,  5422,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2233,  2233,     0,
-       0,     0,  1127,  2342,  1048,     0,  2343,  2344,  2345,     0,
-    2346,  2347,  2348,  2349,  2350,  2351,     0,     0,     0,     0,
-    5538,     0,     0,   693,     0,     0,   843,     0,     0,     0,
-    2267,     0,     0,  1127,     0,     0,  2273,     0,     0,     0,
-       0,  2333,     0,     0,     0,     0,  2334,     0,  1673,     0,
-     693,     0,  4106,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   693,     0,     0,     0,     0,  2335,  2336,     0,
-       0,     0,     0,     0,     0,     0,  1673,     0,     0,     0,
-     693,     0,  2337,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1673,  1673,  1673,     0,  1673,     0,
-       0,     0,     0,  2338,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2339,   693,  1673,  2340,
-       0,     0,     0,     0,     0,     0,     0,  1441,     0,     0,
+    1442,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   693,     0,     0,   693,     0,  2470,     0,
+    1225,  1231,  1231,   739,     0,  1231,     0,  1239,     0,  1225,
+       0,  1127,     0,     0,  1269,     0,  1910,     0,  1911,     0,
+    1127,     0,     0,  1127,     0,     0,     0,  1231,  1912,  1127,
+       0,     0,     0,     0,  1442,     0,  1913,  1306,     0,     0,
+       0,     0,  1127,     0,  1225,     0,  1914,  1231,     0,   739,
+       0,  1231,     0,     0,     0,     0,     0,     0,  1269,     0,
+    3697,     0,  1366,     0,   695,     0,   695,     0,     0,  1231,
+       0,     0,  2335,   843,     0,     0,     0,  2336,     0,     0,
+    3505,     0,     0,  1916,  1917,     0,     0,  2261,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  2337,  2338,
+       0,     0,  1225,     0,   695,     0,     0,   739,     0,     0,
+    3506,     0,  1225,  2339,     0,     0,  1269,     0,     0,     0,
+       0,     0,     0,     0,     0,  4097,     0,     0,     0,     0,
+       0,     0,     0,  1231,  2638,  1442,     0,     0,     0,     0,
+       0,     0,  2659,     0,  2340,     0,     0,     0,     0,     0,
+     380,     0,   695,     0,     0,     0,     0,  2341,     0,     0,
+    2342,     0,     0,     0,     0,     0,  2692,     0,     0,     0,
+       0,     0,     0,  1919,  2699,     0,     0,  2702,     0,     0,
+       0,     0,  2261,     0,     0,     0,  2261,  2261,  5513,  1127,
+    1442,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1127,     0,  1564,     0,     0,     0,
+       0,     0,  2325,  2737,     0,  2326,     0,     0,     0,  2327,
+    2328,  2329,     0,     0,     0,     0,     0,  2754,     0,     0,
+       0,     0,     0,     0,  1674,  1674,  2330,     0,  2343,   739,
+    1127,  2766,     0,     0,  2332,     0,     0,     0,     0,     0,
+    2333,     0,     0,     0,     0,     0,     0,     0,     0,  1127,
+       0,     0,     0,  1127,     0,   693,     0,     0,     0,     0,
+       0,  1674,     0,  5352,  2334,     0,     0,     0,     0,     0,
+       0,     0,  1127,     0,     0,     0,     0,     0,     0,  2325,
+    2819,     0,  2326,     0,  1127,     0,  2327,  2328,  2329,     0,
+       0,     0,     0,     0,     0,     0,     0,   843,     0,     0,
+       0,  2853,   843,  2330,   843,     0,     0,  1902,  2865,     0,
+    1442,  2332,     0,  1903,     0,     0,     0,  2333,     0,     0,
+       0,  2344,     0,     0,  2345,  2346,  2347,   380,  2348,  2349,
+    2350,  2351,  2352,  2353,     0,     0,     0,     0,  5171,     0,
+       0,  2334,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   693,  1904,     0,   693,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1127,     0,     0,  2335,
+       0,     0,     0,     0,  2336,  1127,     0,     0,     0,     0,
+    1231,  1231,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   843,     0,     0,  2337,  2338,     0,     0,     0,
+       0,     0,     0,     0,  1905,     0,     0,     0,     0,     0,
+    2339,  1906,     0,     0,  1907,     0,     0,     0,     0,     0,
+       0,  2947,     0,     0,  1442,     0,     0,     0,     0,     0,
+       0,     0,  1225,     0,     0,     0,     0,   693,   693,  1908,
+       0,  2340,     0,  1225,     0,     0,  2335,  1269,     0,     0,
+     693,  2336,   693,     0,  2341,  1442,     0,  2342,     0,     0,
+       0,     0,  1231,     0,     0,     0,     0,     0,  1694,  1694,
+    1909,     0,  2337,  2338,     0,     0,     0,  1127,     0,     0,
+       0,     0,     0,  1231,  1231,     0,     0,  2339,  3006,     0,
+       0,     0,     0,  1442,     0,     0,     0,     0,     0,     0,
+    1127,  1127,  1127,     0,  1231,     0,  1225,     0,     0,     0,
+       0,  2095,     0,     0,     0,   695,     0,     0,  2340,     0,
+       0,     0,     0,     0,     0,     0,     0,  1910,     0,  1911,
+       0,  2341,     0,     0,  2342,  2343,     0,     0,     0,  1912,
+       0,     0,     0,     0,     0,     0,     0,  1913,     0,     0,
+    1442,     0,     0,   693,  1442,  1442,     0,  1914,     0,     0,
+       0,     0,     0,     0,     0,  2325,     0,     0,  2326,     0,
+       0,     0,  2327,  2328,  2329,     0,     0,     0,     0,     0,
+       0,  1231,     0,  1231,  1231,  3161,     0,     0,     0,  2330,
+       0,  3993,     0,   695,  1916,  1917,     0,  2332,     0,     0,
+       0,     0,     0,  2333,     0,     0,     0,     0,     0,     0,
+       0,  3182,  2343,     0,     0,     0,     0,     0,     0,     0,
+       0,  3994,  1674,     0,     0,     0,     0,  2334,  2344,     0,
+       0,  2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,
+    2353,  1442,     0,     0,  2325,  5408,     0,  2326,  3195,     0,
+    3198,  2327,  2328,  2329,     0,     0,     0,     0,     0,     0,
+    2235,  2235,     0,     0,     0,  1127,     0,  1048,  2330,     0,
+       0,     0,     0,     0,     0,     0,  2332,     0,     0,     0,
+       0,     0,  2333,     0,  1919,     0,     0,  1694,     0,     0,
+       0,   380,     0,  2269,     0,     0,  1127,     0,     0,  2275,
+       0,     0,     0,     0,     0,  2344,  2334,     0,  2345,  2346,
+    2347,  1674,  2348,  2349,  2350,  2351,  2352,  2353,     0,     0,
+       0,     0,  5428,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  2335,     0,  1230,  1232,     0,  2336,  1235,  1674,
+    1237,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   380,     0,     0,     0,     0,  2337,  2338,
+    1288,     0,     0,     0,     0,     0,     0,  1674,  1674,  1674,
+       0,  1674,   380,  2339,     0,     0,     0,     0,     0,     0,
+    1344,     0,     0,   693,  1347,     0,   843,     0, -2307,     0,
+       0,  1674,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1371,     0,  2340,     0,     0,     0,     0,     0,
+     693,  2335,     0,   739,   739,     0,  2336,  2341,     0,     0,
+    2342,     0,   693,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0, -2307,  2337,  2338,     0,
+     693,     0,  1127,     0,     0,  1674,     0,     0, -2307,     0,
+       0,     0,  2339, -2307,     0,     0,     0,     0, -2307,     0,
+       0,     0,     0, -2307,     0,     0, -2307,     0,     0, -2307,
+       0,     0,     0,     0,  1674,     0,     0,     0,  1674,  1674,
+       0,     0,     0,  2340,  3396,     0,     0,   693,     0,  1127,
+    1127,  2472,     0,     0,     0,     0,  2341, -2307,  2343,  2342,
+    1902,     0,     0,  3423,     0,     0,  1903,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0, -2307,   739,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1945,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1904,     0,     0,     0,
+       0,     0,     0,     0,     0,     0, -2307,     0, -2307,     0,
+       0,     0,     0,     0, -2307,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2343,     0,  1946,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2344,     0,     0,  2345,  2346,  2347,  1905,  2348,  2349,
+    2350,  2351,  2352,  2353,  1906,   693,     0,  1907,  5544,     0,
+       0,     0,     0, -2307,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1127,  2643,     0,     0,
+       0,     0,  1908,     0,  1127,     0,     0,  1231,     0,     0,
+       0,  3575,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1269,     0,  1127,     0,
+    1947,     0,  1053,  1909,     0,     0,  1127,     0,     0,  1127,
+    2344,     0,     0,  2345,  2346,  2347,     0,  2348,  2349,  2350,
+    2351,  2352,  2353,     0,     0,     0,     0,  5562, -2307,     0,
+       0,     0,     0,  1127,     0,     0,     0,     0,     0,     0,
+       0,  1231,  1231,  1231,  1231,  1127,     0,     0,  1948,     0,
+    1949,     0, -2307,     0, -2307, -2307,   693,     0,   693,  1127,
+    1950,     0,  1911,  1927,  1928,     0,     0,     0,     0,     0,
+       0,  2765,  1912,  1127,     0,     0,     0,     0,     0,     0,
+    1913,     0,     0,     0,  1231,  1231,     0,     0, -2307,  1951,
+    1914, -2307, -2307,  1231, -2307,     0,   693,     0,     0,     0,
+       0,     0,     0,  1231,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     739,   739,     0,     0,     0,     0,     0,     0,  1441,  2323,
-       0,     0,  2324,     0,     0,     0,  2325,  2326,  2327,     0,
+       0,     0,  1127,     0,  3453,     0,     0,  1916,  1917,  1953,
+       0,  1231,  1231,  1231,  1231,     0,     0,     0,     0,     0,
+       0,     0,   843,  1127,   693,  2029,     0,     0,     0,     0,
+    1127,     0,     0,  2765,  3454,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2052,  2053,  1955,  1225,
+    3714,     0,     0,     0,     0,     0,   739,     0,     0,     0,
+       0,  1674,     0,     0,     0,     0,     0,  2086,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1225,     0,     0,  1919,     0,     0,
+       0,     0,     0,     0,  1269,     0,     0,  1902,  1231,     0,
+       0,  1231,     0,  1903,     0,     0,     0,     0,     0,     0,
+       0,  1231,     0,     0,     0,     0,     0,     0,     0,  1231,
+    1231,     0,  2325,     0,     0,  2326,     0,     0,     0,  2327,
+    2328,  2329,     0,  1127,     0,     0,  2156,  2158,     0,     0,
+       0,     0,     0,  1904,     0,     0,  2330,     0,     0,     0,
+    3204,     0,     0,     0,  2332,     0,     0,     0,     0,     0,
+    2333,     0,     0,     0,     0,     0,     0,  2235,     0,     0,
+       0,     0,     0,     0,  1231,     0,  1225,     0,     0,     0,
+    1127,  1127,     0,  1231,  2334,     0,     0,     0,     0,  3841,
+    1127,     0,     0,     0,  1905,     0,     0,     0,     0,   843,
+    1127,  1906,     0,     0,  1907,  1048,  1048,     0,     0,  3016,
+       0,     0,     0,  1674,  1674,     0,     0,     0,     0,  1674,
+    1674,     0,     0,     0,     0,     0,  1674,  1674,  1674,  1908,
+       0,  3205,  1674,  1269,  1674,  1674,  1674,  1674,  1674,  1674,
+       0,  1674,     0,  1674,  1674,     0,     0,  1674,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1909,     0,  1674,  1674,  1674,  1674,     0,     0,     0,  1231,
+    1674,     0,     0,     0,  1674,     0,     0,  1674,     0,     0,
+    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  2335,
+    1674,     0,     0,     0,  2336,     0,     0,  1127,  1674,     0,
+       0,  1674,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2337,  2338,  1910,     0,  1911,
+       0,     0,     0,  1127,     0,     0,     0,     0,     0,  1912,
+    2339,     0,     0,     0,     0,     0,     0,  1913,     0,     0,
+       0,     0,     0,   967,     0,     0,     0,  1914,     0,     0,
+       0,     0,     0,     0,     0,   968,     0,     0,     0,     0,
+    1127,  2340,  1127,     0,  1674,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2341,     0,   969,  2342,     0,     0,
+       0,  4040,     0,     0,  1916,  1917,     0,   693,     0,   970,
        0,     0,     0,     0,     0,     0,     0,     0,     0,  1127,
-       0,     0,  1673,  2328,  1900,     0,     0,     0,     0,     0,
-    1901,  2330,     0,     0,     0,     0,     0,  2331,     0,     0,
-       0,     0,  4264,     0,  4265,     0,     0,  2341,  4267,     0,
-       0,  1673,     0,     0,     0,  1673,  1673,     0,     0,     0,
-       0,  2332,     0,     0,     0,     0,  1127,  1127,  2470,     0,
-    1902,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   693,     0,     0,     0,     0,
-       0,     0,     0,     0,   739,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  4298,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1903,     0,     0,     0,     0,     0,     0,  1904,     0,
-       0,  1905,     0,     0,     0,     0,     0,     0,     0,     0,
-    2342,     0,     0,  2343,  2344,  2345,     0,  2346,  2347,  2348,
-    2349,  2350,  2351,     0,     0,     0,  1906,  5556,     0,     0,
-       0,     0,     0,     0,     0,     0,  2333,     0,  1900,     0,
-       0,  2334,     0,     0,  1901,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1907,     0,     0,
-       0,     0,  2335,  2336,     0,     0,   693,     0,   693,     0,
-       0,     0,  1127,  2640,     0,     0,     0,  2337,     0,     0,
-    1127,     0,     0,  1231,  1902,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1269,     0,  1127,     0,   693,     0,  2338,     0,
-       0,     0,  1127,  1900,  1908,  1127,  1909,     0,     0,  1901,
-       0,  2339,     0,     0,  2340,     0,  1910,     0,     0,     0,
-       0,     0,     0,     0,  1911,  1903,     0,     0,     0,  1127,
-       0,     0,  1904,     0,  1912,  1905,     0,  1231,  1231,  1231,
-    1231,  1127,   843,     0,   693,     0,     0,     0,     0,  1902,
-       0,     0,     0,     0,     0,  1127,     0,     0,     0,     0,
-    1906,     0,     0,     0,     0,     0,     0,  2759,  3460,  1127,
-       0,  1914,  1915,     0,     0,     0,     0,  1441,     0,     0,
-    1231,  1231,     0,     0,     0,     0,     0,     0,     0,  1231,
-       0,  1907,  2341,     0,     0,     0,     0,  1441,  3461,  1231,
-    1903,     0,     0,     0,     0,     0,  1441,  1904,     0,     0,
-    1905,     0,     0,  4497,  4498,  4499,  4500,     0,  1127,     0,
-       0,     0,     0,     0,     0,     0,     0,  1231,  1231,  1231,
-    1231,     0,     0,     0,     0,  1906,     0,     0,     0,  1127,
-       0,     0,     0,     0,     0,     0,  1127,     0,  1908,  2759,
-    1909,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1910,  1917,     0,     0,     0,  1225,  1907,     0,  1911,     0,
-       0,     0,   739,     0,     0,     0,     0,  1673,  1912,     0,
-       0,     0,     0,     0,     0,  2342,     0,  1441,  2343,  2344,
-    2345,     0,  2346,  2347,  2348,  2349,  2350,  2351,     0,     0,
-    4435,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1225,     0,  3499,     0,     0,  1914,  1915,     0,     0,     0,
-    1269,     0,     0,  1908,  1231,  1909,     0,  1231,     0,   843,
-       0,     0,     0,     0,     0,  1910,     0,  1231,     0,     0,
-       0,     0,  3500,  1911,     0,  1231,  1231,     0,     0,     0,
-       0,     0,     0,  1912,     0,     0,     0,     0,     0,  1127,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    4632,     0,     0,     0,     0,     0,     0,  3987,     0,     0,
-    1914,  1915,     0,  2233,     0,     0,     0,     0,     0,     0,
-    1231,     0,  1225,     0,     0,  1917,  1127,  1127,     0,  1231,
-       0,     0,     0,     0,     0,     0,  1127,  3988,  1441,     0,
-       0,     0,     0,     0,     0,     0,  1127,     0,     0,     0,
-       0,  1048,  1048,     0,     0,  3010,     0,     0,     0,  1673,
-    1673,     0,     0,     0,     0,  1673,  1673,     0,     0,     0,
-       0,     0,  1673,  1673,  1673,     0,     0,     0,  1673,  1269,
-    1673,  1673,  1673,  1673,  1673,  1673,     0,  1673,     0,  1673,
-    1673,     0,     0,  1673,     0,     0,     0,     0,     0,     0,
-    1917,     0,     0,     0,     0,     0,     0,     0,  1673,  1673,
-    1673,  1673,     0,     0,     0,  1231,  1673,     0,     0,     0,
-    1673,     0,     0,  1673,     0,     0,  1673,  1673,  1673,  1673,
-    1673,  1673,  1673,  1673,  1673,     0,  1673,   693,     0,     0,
-       0,     0,     0,  1127,  1673,     0,     0,  1673,     0,     0,
+       0,     0,     0,   971,     0,     0,  3231,     0,  3238,     0,
+       0,  4041,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   972,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   973,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   974,     0,  2343,     0,     0,     0,     0,
+       0,   975,     0,     0,     0,   693,     0,     0,  4059,     0,
+       0,     0,     0,   976,  1919,     0,     0,     0,   977,     0,
+       0,     0,     0,     0,   978,     0,   739,     0,     0,     0,
+       0,     0,     0,     0,     0,  1048,     0,  1048,     0,     0,
+       0,   979, -2321,     0,     0,     0,     0,     0,     0,     0,
+    3206,     0,     0,     0,  1674,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1225,     0,  1231,  1231,     0,
+       0,     0,  1225,     0,  1269,     0,  1231,     0,  1231,     0,
+       0,     0,  1231,     0,     0,  1127,     0,   980,  2344,     0,
+   -2321,  2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,
+    2353,     0, -2321,   843,     0,     0,     0, -2321,     0,     0,
+       0,     0, -2321,     0,  2643,     0,     0, -2321,   981,     0,
+   -2321,  3374,     0, -2321,     0,     0,     0,  3384,     0,   982,
+    2663,  4165,  4166,     0,     0,     0,  1127,     0,   983,     0,
+       0,     0,     0,     0,     0,     0,     0,  4175,   881,     0,
+       0, -2321,     0,     0,     0,  1127,     0,     0,     0,  3428,
+    3428,     0,     0,  4192,     0,   843,     0,     0,   739,     0,
+       0, -2321,  4201,  4202,     0,   984,     0,     0,     0,     0,
+     985,     0,   986,     0,   843,     0,  1231,     0,   987,  4220,
+       0,   988,     0,     0,  2733,  2734,  2735,  2736,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   -2321,     0, -2321,  3491,     0,  3494,  3496,     0, -2321,     0,
+     989,     0,     0,   990,     0,     0,     0,   991,     0,     0,
+       0,     0,     0,     0,   992,     0,   993,  2774,  2775,     0,
+       0,   994,     0,     0,  1231,     0,  2787,     0,     0,     0,
+       0,     0,  1231,   995,  1231,     0,  2801,     0,     0,     0,
+    1231,     0,     0,     0,     0,     0,   996, -2321,     0,     0,
+       0,     0,     0,     0,  1674,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2837,  2838,  2839,  2840,  2643,     0,
+    1694,  3428,     0,  1127,     0,     0,  3579,     0,     0,  1048,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1053,     0,     0,     0,
+       0,     0,     0,     0,     0,  3491,     0,     0,     0,     0,
+       0,     0,     0,     0,  1231,  3605,     0,     0,     0,     0,
+       0,     0, -2321,     0,     0,     0,     0,     0,     0,     0,
+    2095,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1674,     0,     0,     0,     0, -2321,     0, -2321, -2321,
+       0,     0,     0,     0,     0,  3652,  3655,     0,     0,     0,
+       0,  2923,     0,     0,  2926,     0,     0,     0,  1231,     0,
+    1231,  3428,  1231,  3428,  2931,     0,     0,     0,     0,     0,
+       0,     0, -2321,  2939,     4, -2321, -2321,     0, -2321,     0,
+       0,     0,     0,     0,     0,  4394,  4395,  4396,     0,  1674,
+       0,     0,     0,     0,     5,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     6,     7,     0,     0,     0,     0,
+    2235,     9,    10,     0,     0,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+       0,     0,     0,    37,    38,    39,    40,    41,    42,    43,
+      44,     0,  1127,     0,    45,     0,     0,     0,     0,     0,
+       0,     0,  1225,     0,     0,     0,     0,     0,  1225,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1231,
+       0,     0,     0,     0,     0,  1674,     0,     0,     0,     0,
+    1674,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    46,     0,     0,     0,
+       0,     0,     0,  1674,  1674,  1674,     0,     0,  1674,     0,
+       0,     0,  3112,     0,     0,     0,  1674,  1674,  1674,  1674,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1674,
+       0,     0,  1674,     0,  1674,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1674,  1674,     0,     0,  1674,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1269,     0,  1674,     0,  1674,     0,  1674,    47,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    48,  1674,     0,     0,
+       0,  1127,     0,     0,     0,     0,     0,     0,  3858,     0,
+    1674,  1674,  1674,     0,     0,     0,     0,    49,     0,     0,
+    2325,     0,     0,  2326,     0,     0,     0,  2327,  2328,  2329,
+       0,     0,     0,     0,     0,  1674,     0,     0,     0,     0,
+      50,     0,     0,     0,  2330,     0,     0,     0,  1674,     0,
+       0,     0,  2332,  1674,     0,     0,     0,     0,  2333,  1674,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  3858,
+       0,     0,  3917,     0,     0,  3920,    51,  3238,     0,    52,
+       0,     0,  2334,     0,     0,     0,  4636,     0,     0,     0,
+       0,     0,     0,     0,    53,     0,  4646,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1127,
-       0,     0,     0,     0,     0,  1900,     0,     0,     0,     0,
-       0,  1901,     0,     0,     0,     0,     0,     0,  2395,     0,
-       0,     0,     0,     0,     0,  2323,     0,     0,  2324,     0,
-       0,     0,  2325,  2326,  2327,     0,  1127,     0,  1127,     0,
-    1673,     0,     0,     0,     0,   693,     0,     0,     0,  2328,
-       0,  1902,     0,  3198,     0,     0,     0,  2330,     0,     0,
-       0,     0,     0,  2331,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1127,     0,     0,     0,     0,
-       0,     0,  3225,     0,  3232,     0,     0,  2332,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1903,     0,     0,     0,     0,     0,     0,  1904,
-       0,     0,  1905,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3199,     0,     0,  1906,     0,     0,
-       0,     0,     0,   843,     0,  1441,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   739,     0,     0,     0,     0,     0,     0,  1907,     0,
-    1048,     0,  1048,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1673,
-       0,     0,  2333,     0,     0,     0,     0,  2334,     0,     0,
-    1225,     0,  1231,  1231,     0,   843,     0,  1225,  1441,  1269,
-       0,  1231,     0,  1231,     0,     0,     0,  1231,  2335,  2336,
-    1127,     0,     0,     0,   843,  1908,     0,  1909,     0,     0,
-       0,     0,     0,  2337,     0,     0,     0,  1910,     0,     0,
-       0,  1441,     0,     0,     0,  1911,     0,     0,     0,  2640,
-       0,     0,     0,     0,     0,  1912,  3368,     0,     0,     0,
-       0,     0,  3378,     0,  2338,     0,     0,     0,  4911,     0,
-       0,  1127,     0,     0,     0,     0,     0,  2339,     0,     0,
-    2340,     0,  4914,     0,     0,     0,     0,     0,     0,  4034,
-    1127,     0,  1914,  1915,  3422,  3422,     0,     0,     0,     0,
-       0,     0,     0,   739,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  4035,
-    1231,     0,  1441,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1441,     0,     0,
-       0,     0,     0,     0,     0,  1441,     0,  3485,     0,  3488,
-    3490,     0,     0,     0,     0,     0,  1441,     0,  2341,     0,
-       0,  4977,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1231,     0,     0,     0,
-       0,     0,  1917,     0,  1231,     0,  1231,     0,     0,     0,
-       0,     0,  1231,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1441,     0,     0,  1673,     0,     0,     0,
-       0,     0,     0,  3200,     0,     0,     0,     0,     0,     0,
-    2640,     0,  1441,  3422,     0,  1127,     0,     0,  3573,     0,
-       0,  1048,     0,     0,  1441,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1441,     0,     0,     0,
-       0,  2342,     0,     0,  2343,  2344,  2345,  3485,  2346,  2347,
-    2348,  2349,  2350,  2351,     0,     0,  1231,  3599,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2093,     0,     0,     0,  1441,     0,     0,  1441,
-       0,     0,     0,  1673,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3646,  3649,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1231,     0,  1231,  3422,  1231,  3422,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  5103,  5105,  5105,     0,     4,     0,     0,     0,
-       0,  1673,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     5,     0,     0,     0,
-       0,     0,  2233,     0,     0,     0,     6,     7,     0,     0,
-       0,     0,     0,     9,    10,     0,     0,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,     0,     0,  1127,    37,    38,    39,    40,    41,
-      42,    43,    44,     0,  1225,     0,    45,     0,     0,     0,
-    1225,     0,     0,     0,     0,     0,     0,     0,  1441,     0,
-       0,  1231,     0,     0,     0,     0,     0,  1673,     0, -2305,
-       0,     0,  1673,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1673,  1673,  1673,    46,     0,
-    1673,     0,     0,  5207,     0,     0,     0,     0,  1673,  1673,
-    1673,  1673,     0,     0,     0,     0,     0, -2305,     0,     0,
-       0,  1673,     0,     0,  1673,     0,  1673,     0,     0, -2305,
-       0,     0,     0,     0, -2305,     0,     0,  1673,  1673, -2305,
-       0,  1673,     0,     0, -2305,     0,     0, -2305,     0,     0,
-   -2305,     0,     0,  1269,     0,  1673,     0,  1673,     0,  1673,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      47,     0,     0,     0,     0,     0,     0,     0, -2305,  1673,
-       0,     0,     0,  1127,     0,     0,     0,     0,    48,     0,
-    3852,     0,  1673,  1673,  1673,     0,     0,     0, -2305,     0,
-       0,     0,     0,     0,  2323,     0,     0,  2324,     0,    49,
-       0,  2325,  2326,  2327,     0,  5272,     0,  1673,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  2328,     0,
-    1673,     0,    50,     0,     0,  1673,  2330, -2305,     0, -2305,
-       0,  1673,  2331,     0,     0, -2305,     0,     0,     0,     0,
-    5296,  3852,  5298,     0,  3911,     0,     0,  3914,  1441,  3232,
-       0,     0,  1441,  1441,     0,     0,  2332,     0,    51,     0,
-       0,    52,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    53,     0,     0,     0,
-       0,     0,     0,     0, -2305,     0,     0,     0,     0,     0,
-       0,     0,     0,  2323,     0,     0,  2324,     0,     0,     0,
-    2325,  2326,  2327,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1673,  1441,  3422,  2328,     0,     0,
-       0,  2233,     0,     0,     0,  2330,     0,  1441,     0,     0,
-       0,  2331,     0,  1053,     0,     0,     0,     0,     0,  3774,
-       0,     0,     0,     0,  3775,     0,     0,  1231,     0,  1231,
-    1231,  1231,     0,     0,    54,  2332,     0,     0,     0, -2305,
-       0,  2333,     0,     0,  1441,     0,  2334,     0,     0,     0,
-    5105,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0, -2305,     0, -2305, -2305,  2335,  2336,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      55,     0,  2337,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    56,     0,     0,     0, -2305,
-       0,     0, -2305, -2305,     0, -2305,     0,     0,  5419,     0,
-      57,     0,     0,  2338,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2339,     0,     0,  2340,
-       0,     0,  1127,     0,     0,     0,     0,     0,    58,     0,
-    2333,     0,     0,     0,     0,  2334,    59,     0,    60,    61,
-      62,    63,    64,     0,     0,    65,    66,  1485,  2185,     0,
-       0,     0,    71,     0,     0,     0,  2335,  2336,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  2337,     0,     0,     0,  5467,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1441,     0,
-       0,     0,     0,     0,     0,     0,     0,  2341,     0,     0,
-       0,     0,  2338,     0,  1231,     0,     0,     0,     0,     0,
-       0,  3422,  3422,     0,     0,  2339,     0,     0,  2340,     0,
+       0,  4666,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1674,     0,  3428,     0,     0,     0,     0,  2235,
+       0,     0,     0,     0,     0,     0,     0,     0,  2865,     0,
+       0,     0,     0,     0,     0,  3780,     0,     0,     0,     0,
+    3781,     0,    54,     0,     0,  1231,     0,  1231,  1231,  1231,
+    3325,  3326,     0,     0,     0,     0,     0,  2335,     0,  3337,
+       0,  3339,  2336,     0,     0,  3343,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2337,  2338,     0,     0,     0,    55,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  2339,     0,
+       0,     0,     0,    56,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    57,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2340,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  2341,     0,     0,  2342,    58,     0,     0,     0,
+    1127,     0,     0,     0,    59,     0,    60,    61,    62,    63,
+      64,     0,     0,    65,    66,  1486,     0,     0,     0,  3458,
+      71,  1487,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2325,     0,     0,  2326,     0,     0,     0,
+    2327,  2328,  2329,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  4792,  4793,  4794,  4795,  2330,     0,     0,
+       0,     0,     0,     0,     0,  2332,     0,     0,     0,     0,
+       0,  2333,     0,  2343,     0,     0,     0,  3518,     0,     0,
+       0,     0,  1231,     0,     0,  3527,     0,  3529,     0,  3428,
+    3428,     0,     0,  3531,     0,  2334,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  5513,     0,     0,     0,  4348,
-       0,     0,     0,     0,     0,  1127,  1127,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1441,     0,
-       0,  1127,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2233,  1127,     0,     0,
-       0,     0,     0,     0,     0,  2233,  1127,  1127,     0,     0,
-    2342,     0,     0,  2343,  2344,  2345,  2341,  2346,  2347,  2348,
-    2349,  2350,  2351,  1127,     0,     0,     0,     0,     0,     0,
-       0,     0,  4349,     0,     0,     0,     0,     0,     0,     0,
-     739,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3646,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1231,     0,  1231,     0,     0,     0,
-    1231,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1225,     0,
-       0,     0,     0,     0,     0,     0,     0,  1441,  1127,  2342,
-       0,     0,  2343,  2344,  2345,     0,  2346,  2347,  2348,  2349,
-    2350,  2351,     0,     0,  1127,     0,     0,     0,  1441,     0,
-       0,     0,     0,     0,     0,     0,  1231,     0,     0,  1441,
-       0,     0,     0,  1673,     0,     0,     0,     0,     0,     0,
-       0,     0,  1673,     0,     0,     0,     0,     0,  1673,     0,
-    1673,     0,     0,  1673,     0,     0,     0,     0,  1673,  1673,
-    1673,  1673,     0,     0,  1673,  1673,  1673,  1673,  1673,  1673,
-    1673,  1673,  1673,  1673,     0,     0,     0,  1673,  1673,     0,
-       0,     0,     0,     0,     0,     0,     0,  1673,     0,     0,
-       0,  1673,   851,     0,     0,  1673,     0,     0,     0,     0,
-       0,     0,     0,  1673,     0,     0,  1673,     0,  1673,     0,
-       0,     0,     0,     0,     0,     0,     0,  1673,     0,     0,
-    1673,  1673,     0,     0,     0,  1673,  1673,     0,     0,     0,
-    4380,     0,  1673,     0,     0,     0,     0,   851,     0,  1127,
-    1127,  1127,  1225,     0,  3852,  4400,     0,     0,     0,  4400,
-    4414,     0,     0,     0,     0,     0,  1673,     0,     0,     0,
-       0,     0,  1673,  1673,  1673,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1086,     0,     0,     0,     0,
-       0,     0,     0,  1086,     0,  1086,     0,  2323,     0,     0,
-    2324,     0,     0,     0,  2325,  2326,  2327,     0,   851,  1673,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    3232,  2328,  1673,     0,     0,     0,     0,     0,     0,  2330,
-       0,     0,     0,     0,     0,  2331,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0, -2319,     0,
-       0,     0,     0,  4480,  2233,  2233,     0,  2759,     0,  2332,
-       0,  1441,     0,     0,  1441,     0,  1441,     0,     0,     0,
-       0,  1441,     0,     0,     0,  1231,  1231,  1231,  1231,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0, -2319,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0, -2319,     0,
-       0,     0,     0, -2319,  4524,     0,     0,     0, -2319,     0,
-       0,     0,  1441, -2319,     0,     0, -2319,     0,     0, -2319,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1441,
-       0,  5500,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1248,     0,     0,     0, -2319,     0,     0,
-       0,     0,  1278,  1441,  2333,     0,     0,     0,     0,  2334,
-       0,  1293,     0,     0,     0,     0,     0, -2319,     0,  1303,
-       0,     0,     0,     0,  1338,     0,     0,     0,     0,     0,
-    2335,  2336,     0,     0,     0,     0,     0,     0,     0,  4597,
-       0,     0,     0,     0,     0,  2337,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0, -2319,     0, -2319,     0,
-       0,     0,     0,     0, -2319,     0,     0,     0,  1441,     0,
-    1441,     0,     0,     0,     0,     0,  2338,     0,     0,     0,
-    1127,     0,  1231,     0,  1673,     0,     0,     0,     0,  2339,
-    1127,     0,  2340,     0,     0,     0,  4645,     0,     0,     0,
-       0,     0,     0,     0,     0,  2640,     0,     0,     0,     0,
-       0,  5501,     0, -2319,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1127,     0,     0,     0,  1441,
-       0,     0,     0,     0,     0,  3485,     0,     0,     0,     0,
-       0,     0,  4678,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1127,     0,  1441,     0,  2759,     0,     0,     0,
-    1673,  1673,  1053,     0,     0,     0,     0,     0,     0,     0,
-    2341,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1441,     0,     0,     0,     0,  1441,  1561,     0, -2319,     0,
-       0,     0,  3646,  3646,  3646,  3646,  3646,     0,     0,     0,
-       0,     0,  3422,     0,  3422,     0,     0,     0,     0,     0,
-       0,     0, -2319,     0, -2319, -2319,     0,     0,     0,     0,
-       0,     0,  1693,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1717,     0,  1441,  1673,     0,     0,     0, -2319,     0,
-       0, -2319, -2319,     0, -2319,  1673,     0,     0,     0,     0,
-       0,  1441,     0,  2342,  1743,     0,  2343,  2344,  2345,     0,
-    2346,  2347,  2348,  2349,  2350,  2351,  1441,     0,     0,     0,
-       0,     0,     0,     0,     0,  1673,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1673,  1673,     0,     0,     0,
-       0,     0,  1673,  1673,     0,     0,     0,  1673,     0,     0,
-       0,     0,  1673,     0,     0,  1673,  1673,     0,     0,     0,
-    1673,  4783,     0,     0,     0,     0,  1673,  1127,  1127,  1127,
-    1127,     0,     0,     0,  4400,  4414,     0,  4400,     0,     0,
-    4794,     0,     0,     0,  3852,     0,     0,     0,  3852,     0,
-       0,     0,     0,     0,  4809,     0,     0,     0,     0,     0,
-    1673,     0,     0,     0,     0,  1673,     0,  1924,     0,     0,
-       0,  1673,     0,     0,     0,     0,     0,  1441,     0,     0,
-       0,  1269,     0,     0,     0,     0,     0,  2323,     0,  1673,
-    2324,     0,  3911,     0,  2325,  2326,  2327,  3232,  1441,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  2328,     0,     0,  3733,  1048,     0,     0,  1673,  2330,
-       0,     0,     0,  1441,     0,  2331,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2323,  3422,  3422,
-    2324,     0,     0,     0,  2325,  2326,  2327,     0,     0,  2332,
-       0,     0,     0,     0,     0,     0,     0,  1441,     0,     0,
-       0,  2328,     0,  4878,     0,     0,     0,     0,  2048,  2330,
-       0,     0,     0,   851,     0,  2331,     0,     0,     0,     0,
-       0,  1227,     0,     0,     0,     0,     0,     0,     0,     0,
-    1227,  2078,  2081,  2082,     0,     0,     0,     0,     0,  2332,
-    1673,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1231,     0,     0,     0,     0,  1227,     0,     0,     0,     0,
+       0,     0,     0,  1127,  1127,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1127,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2235,  1127,     0,     0,     0,     0,
+       0,     0,     0,  2235,  1127,  1127,  2344,  3603,     0,  2345,
+    2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,     0,
+       0,  1127,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   739,     0,
+    2335,     0,     0,     0,     0,  2336,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3652,     0,     0,     0,     0,
+       0,     0,     0,  3662,     0,  3664,  2337,  2338,     0,     0,
+       0,     0,  1231,     0,  1231,     0,     0,     0,  1231,     0,
+       0,  2339,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1225,     0,     0,     0,
+       0,     0,     0,     0,   851,     0,  1127,     0,     0,     0,
+       0,     0,  2340,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1127,     0,     0,  2341,     0,     0,  2342,     0,
        0,     0,     0,     0,  1231,     0,     0,     0,     0,     0,
+       0,  1674,     0,     0,     0,     0,     0,     0,     0,   851,
+    1674,     0,     0,     0,     0,     0,  1674,     0,  1674,     0,
+       0,  1674,     0,     0,     0,     0,  1674,  1674,  1674,  1674,
+       0,     0,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
+    1674,  1674,  3730,     0,     0,  1674,  1674,     0,     0,     0,
+       0,     0,     0,     0,     0,  1674,     0,  1086,     0,  1674,
+       0,     0,     0,  1674,     0,  1086,  2343,  1086,     0,  5009,
+       0,  1674,     0,     0,  1674,     0,  1674,     0,     0,     0,
+     851,     0,     0,     0,     0,  1674,     0,     0,  1674,  1674,
+       0,     0,     0,  1674,  1674,     0,     0,     0,  4386,     0,
+    1674,     0,     0,     0,     0,     0,     0,  1127,  1127,  1127,
+    1225,     0,  3858,  4406,     0,     0,     0,  4406,  4420,  2325,
+       0,     0,  2326,     0,  1674,     0,  2327,  2328,  2329,     0,
+    1674,  1674,  1674,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2330,     0,     0,     0,     0,     0,     0,
+       0,  2332,     0,     0,     0,     0,     0,  2333,     0,  2344,
+       0,     0,  2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,
+    2352,  2353,     0,     0,  4441,     0,     0,  1674,     0,     0,
+       0,  2334,     0,     0,     0,     0,     0,     0,  3238,     0,
+    1674,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  4486,  2235,  2235,     0,  2765,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2333,     0,     0,     0,     0,  2334,
+       0,     0,     0,  1231,  1231,  1231,  1231,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  4530,     0,     0,     0,  2335,     0,     0,     0,
+       0,  2336,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  2337,  2338,     0,  5169,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2339,     0,     0,
+       0,  1694,     0,     0,     0,     0,     0,     0,  3973,     0,
+    3974,  3975,  3976,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  2340,     0,
+       0,     0,  5214,     0,     0,     0,     0,  4603,     0,     0,
+       0,  2341,     0,     0,  2342,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  4354,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1127,     0,
+    1231,     0,  1674,     0,     0,     0,     0,     0,  1127,     0,
+       0,     0,     0,     0,  4651,     0,     0,     0,     0,     0,
+       0,     0,     0,  2643,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  2343,  1127,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3491,     0,     0,     0,     0,  4355,     0,
+    4684,     0,     0,     0,     0,     0,     0,  5281,     0,     0,
+    1127,     0,     0,     0,  2765,     0,     0,     0,  1674,  1674,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1673,     0,     0,     0,     0,  1441,
-    2335,  2336,     0,  1227,     0,  1225,     0,     0,     0,  1444,
-    2640,     0,     0,  1227,     0,  2337,     0,     0,  2233,     0,
-       0,     0,     0,     0,  2333,     0,     0,     0,     0,  2334,
-    1444,     0,     0,  1231,  2640,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2338,     0,     0,     0,
-    2335,  2336,     0,     0,     0,     0,     0,     0,     0,  2339,
-       0,     0,  2340,  1127,     0,  2337,  5010,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1693,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1441,     0,  2338,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1693,     0,  2339,
-       0,  1673,  2340,     0,     0,     0,     0,     0,     0,     0,
-    1673,     0,     0,     0,     0,     0,     0,  3747,     0,     0,
-       0,     0,     0,     0,     0,  1227,  1227,  1673,  1673,     0,
-    2341,  1673,  1086,     0,     0,     0,  1086,     0,     0,     0,
-       0,     0,     0,     0,     0,  1225,  4400,     0,     0,     0,
-    3852,     0,     0,     0,     0,  3852,     0,     0,  3852,  1225,
-       0,  3485,  1227,  5065,     0,     0,  1673,  1673,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2341,     0,     0,     0,     0,     0,     0,     0,  4480,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  4480,  1269,  1231,  1231,  1231,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1441,  2342,     0,     0,  2343,  2344,  2345,     0,
-    2346,  2347,  2348,  2349,  2350,  2351,     0,     0,     0,     0,
-       0,     0,     0,  2413,     0,  1225,  1269,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1441,     0,     0,  2342,     0,     0,  2343,  2344,  2345,     0,
-    2346,  2347,  2348,  2349,  2350,  2351,     0,     0,     0,     0,
-       0,  2468,  2233,  2233,     0,     0,  1225,     0,     0,  1127,
-       0,     0,     0,     0,     0,     0,  1086,  1086,     0,  4645,
-       0,     0,     0,     0,     0,  1127,     0,  3422,     0,     0,
-       0,     0,  2640,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1227,     0,  4678,     0,     0,     0,     0,  1444,
-       0,     0,     0,  1227,     0,  1231,  1127,  4480,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1444,
-       0,     0,     0,     0,     0,     0,     0,     0,  1444,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1673,
-       0,     0,  1673,     0,  1673,     0,     0,     0,     0,     0,
-       0,     0,     0,  2323,     0,     0,  2324,     0,     0,     0,
-    2325,  2326,  2327,     0,     0,     0,  1227,     0,  1673,  1441,
-       0,     0,  3852,     0,     0,     0,  5065,  2328,     0,  1441,
-    3779,     0,     0,  1673,     0,  2330,  2635,     0,     0,     0,
-       0,  2331,  5259,     0,  2656,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1673,     0,     0,     0,  1444,
-       0,     0,     0,     0,     0,  2332,     0,  1231,  2689,     0,
-       0,  1127,     0,     0,     0,     0,  2695,     0,     0,  2698,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1673,     0,     0,     0,     0,     0,
-       0,  1231,  1231,  1231,  1231,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2733,  2233,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  2748,
-       0,     0,  1227,     0,     0,  1225,     0,     0,     0,     0,
-       0,     0,     0,  2760,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1673,  2323,  1441,     0,  2324,
-       0,     0,     0,  2325,  2326,  2327,     0,     0,     0,     0,
-    2333,     0,     0,     0,     0,  2334,     0,     0,     0,     0,
-    2328,     0,     0,     0,     0,     0,  1441,     0,  2330,     0,
-    1444,     0,  2813,     0,  2331,     0,  2335,  2336,  1673,     0,
-       0,  1225,     0,     0,     0,     0,  1441,     0,     0,     0,
-    1673,  2337,     0,  2847,     0,  1673,     0,  1673,  2332,  1673,
-    2859,  1227,     0,     0,     0,     0,  4480,     0,     0,     0,
-       0,     0,  1231,     0,  1269,     0,     0,     0,     0,     0,
-       0,     0,  2338,     0,  1673,     0,     0,     0,     0,  1227,
-       0,     0,     0,     0,     0,  2339,     0,     0,  2340,     0,
-    1441,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1227,  1227,  1227,
-       0,  1227,     0,     0,     0,     0,     0,     0,     0,     0,
-    1231,     0,     0,     0,     0,  1225,     0,     0,     0,     0,
-       0,  1227,     0,     0,     0,     0,  3784,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  5010,     0,
-       0,     0,     0,  2333,     0,     0,  1673,  1673,  2334,     0,
-       0,  3485,     0,  2941,     0,     0,  2341,  1673,     0,     0,
-    5259,     0,     0,     0,  3232,     0,     0,     0,     0,  2335,
-    2336,     0,     0,     0,     0,  1227,   851,  1225,     0,     0,
-       0,  1441,     0,     0,  2337,     0,     0,  1231,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1693,  1693,     0,     0,  1227,     0,     0,     0,  1227,  1227,
-       0,     0,  4480,     0,     0,  2338,     0,     0,  1225,  1225,
-    3000,  1673,     0,     0,     0,     0,     0,     0,  2339,     0,
-       0,  2340,     0,     0,     0,     0,  1441,     0,     0,     0,
-    1673,     0,     0,     0,     0,     0,     0,  1231,     0,  2342,
-       0,     0,  2343,  2344,  2345,     0,  2346,  2347,  2348,  2349,
-    2350,  2351,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2323,     0,     0,  2324,     0,     0,
-       0,  2325,  2326,  2327,     0,     0,     0,  1444,     0,     0,
-       0,     0,     0,   851,     0,     0,     0,     0,  2328,     0,
-       0,  3790,     0,  1086,     0,     0,  2330,     0,     0,  2341,
-       0,     0,  2331,     0,     0,     0,     0,  3155,     0,  1673,
-    1673,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1225,     0,     0,  2332,     0,     0,     0,
-       0,     0,  1086,  3176,     0,  1225,  1225,     0,     0,     0,
     1444,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1441,     0,     0,     0,
+    3652,  3652,  3652,  3652,  3652,  4112,     0,     0,     0,     0,
+    3428,  1444,  3428,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2344,     0,     0,  2345,  2346,
+    2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2325,     0,     0,
+    2326,     0,  1674,     0,  2327,  2328,  2329,     0,     0,     0,
+       0,     0,     0,  1674,     0,     0,     0,     0,     0,     0,
+       0,  2330,     0,     0,     0,     0,     0,     0,     0,  2332,
+       0,     0,     0,     0,     0,  2333,     0,     0,     0,     0,
+       0,     0,     0,  1674,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1674,  1674,     0,     0,     0,     0,  2334,
+    1674,  1674,     0,     0,     0,  1674,     0,     0,     0,     0,
+    1674,     0,     0,  1674,  1674,     0,     0,     0,  1674,  4789,
+       0,     0,     0,     0,  1674,  1127,  1127,  1127,  1127,     0,
+       0,     0,  4406,  4420,     0,  4406,     0,     0,  4800,     0,
+       0,     0,  3858,     0,     0,  4270,  3858,  4271,     0,     0,
+       0,  4273,  4815,     0,     0,     0,     0,     0,  1674,     0,
+       0,     0,     0,  1674,     0,     0,     0,     0,     0,  1674,
+       0,     0,     0,     0,     0,   851,     0,     0,     0,  1269,
+       0,  5506,     0,  1227,     0,     0,     0,  1674,     0,     0,
+    3917,     0,  1227,     0,     0,  3238,     0,     0,     0,     0,
+       0,     0,     0,     0,  2335,     0,     0,  4304,     0,  2336,
+       0,     0,     0,  1048,     0,     0,  1674,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1227,     0,     0,
+    2337,  2338,     0,     0,     0,     0,  3428,  3428,     0,     0,
+       0,  2325,     0,     0,  2326,  2339,     0,     0,  2327,  2328,
+    2329,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  4884,     0,     0,     0,  2330,     0,     0,  3739,     0,
+       0,     0,     0,  2332,     0,     0,  2340,     0,     0,  2333,
+       0,     0,     0,     0,     0,  1227,     0,     0,     0,  2341,
+       0,  1445,  2342,     0,     0,  1227,     0,     0,  1674,     0,
+       0,     0,     0,  2334,     0,     0,     0,     0,     0,     0,
+       0,  5507,  1445,     0,     0,     0,     0,     0,  1231,     0,
+       0,  1444,     0,     0,     0,     0,     0,  2325,     0,     0,
+    2326,     0,  1231,     0,  2327,  2328,  2329,     0,     0,     0,
+       0,  1444,     0,     0,     0,     0,     0,     0,     0,     0,
+    1444,  2330,     0,     0,     0,     0,     0,     0,     0,  2332,
+       0,     0,     0,     0,     0,  2333,     0,     0,     0,     0,
+    2343,     0,  1674,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1225,     0,     0,     0,     0,  2643,  2334,
+       0,     0,     0,     0,     0,     0,  2235,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  2335,     0,
+       0,  1231,  2643,  2336,     0,     0,     0,  1227,  1227,     0,
+       0,     0,     0,     0,  1086,     0,     0,     0,  1086,     0,
+       0,  1444,     0,     0,  2337,  2338,     0,     0,     0,     0,
+       0,  1127,     0,     0,  5016,     0,     0,     0,     0,  2339,
+       0,     0,     0,     0,  1227,     0,  4503,  4504,  4505,  4506,
+       0,     0,     0,  2344,     0,     0,  2345,  2346,  2347,     0,
+    2348,  2349,  2350,  2351,  2352,  2353,     0,     0,     0,     0,
+    2340,     0,     0,     0,     0,     0,     0,     0,     0,  1674,
+       0,     0,     0,  2341,  2335,     0,  2342,     0,  1674,  2336,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1674,  1674,     0,     0,  1674,
+    2337,  2338,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1225,  4406,  2339,     0,     0,  3858,     0,
+       0,     0,     0,  3858,     0,     0,  3858,  1225,     0,  3491,
+       0,  5071,     0,     0,  1674,  1674,     0,     0,     0,     0,
+       0,     0,  1444,     0,     0,     0,  2340,     0,     0,     0,
+       0,     0,     0,     0,  2343,     0,  4486,     0,     0,  2341,
+       0,     0,  2342,     0,     0,     0,     0,     0,     0,     0,
+    4486,  1269,  1231,  1231,  1231,     0,     0,  3753,  1086,  1086,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  4638,     0,  1227,     0,     0,     0,     0,
+       0,     0,  1445,  1225,  1269,     0,  1227,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1445,     0,     0,     0,     0,     0,     0,     0,
+    2343,  1445,     0,     0,     0,     0,     0,  2344,     0,     0,
+    2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,
+    2235,  2235,     0,     0,  1225,     0,     0,  1127,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  4651,     0,  1227,
+       0,     0,     0,  1127,     0,  3428,     0,     0,     0,     0,
+    2643,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  4684,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1231,  1127,  4486,     0,     0,     0,     0,
+       0,     0,  1445,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2344,     0,     0,  2345,  2346,  2347,     0,
+    2348,  2349,  2350,  2351,  2352,  2353,     0,  1674,     0,     0,
+    1674,     0,  1674,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1674,     0,  2325,     0,
+    3858,  2326,     0,     0,  5071,  2327,  2328,  2329,     0,     0,
+       0,  1674,     0,     0,     0,  1227,     0,     0,     0,     0,
+    5265,     0,  2330,     0,     0,  3785,     0,     0,     0,     0,
+    2332,     0,     0,  1674,     0,     0,  2333,     0,     0,     0,
+    2537,     0,     0,     0,     0,  1231,     0,     0,     0,  1127,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    2334,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1674,  1445,     0,     0,     0,     0,     0,  1231,
+    1231,  1231,  1231,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2235,     0,     0,     0,     0,     0,
+       0,     0,     0,  2537,  1227,     0,     0,     0,     0,     0,
+       0,     0,     0,  1225,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1227,  1674,  2325,     0,  1444,  2326,     0,     0,
+       0,  2327,  2328,  2329,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  2330,     0,
+    1227,  1227,  1227,     0,  1227,  2335,  2332,     0,     0,     0,
+    2336,     0,  2333,     0,     0,     0,  1674,     0,     0,  1225,
+       0,     0,     0,     0,  1227,     0,     0,     0,  1674,     0,
+       0,  2337,  2338,  1674,     0,  1674,  2334,  1674,     0,     0,
+       0,     0,     0,     0,  4486,     0,  2339,     0,     0,     0,
+    1231,     0,  1269,     0,     0,     0,     0,  1444,     0,     0,
+       0,     0,  1674,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1444,     0,     0,     0,     0,  2340,  1227,   851,
+    2537,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    2341,  1444,     0,  2342,     0,     0,     0,     0,     0,     0,
+       0,  4917,     0,     0,     0,     0,     0,  1227,  1231,     0,
+       0,  1227,  1227,  1225,     0,  4920,     0,     0,     0,     0,
+       0,     0,     0,     0,  3790,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  5016,     0,  1444,     0,
+       0,  2335,     0,     0,  1674,  1674,  2336,     0,     0,  3491,
+       0,     0,     0,     0,     0,  1674,     0,  1444,  5265,     0,
+       0,     0,  3238,     0,     0,     0,     0,  2337,  2338,  1444,
+       0,  2343,     0,     0,     0,  1225,     0,     0,     0,     0,
+       0,  1444,  2339,     0,     0,  1231,     0,     0,     0,     0,
+       0,  1445,     0,     0,  4983,     0,     0,   851,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1086,     0,     0,
+    4486,     0,     0,  2340,     0,     0,  1225,  1225,     0,  1674,
+       0,  1444,     0,     0,  1444,     0,  2341,     0,     0,  2342,
+       0,     0,     0,     0,     0,     0,     0,     0,  1674,     0,
+       0,     0,     0,     0,     0,  1231,  1086,     0,     0,     0,
+       0,     0,     0,     0,  1445,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2344,     0,     0,  2345,  2346,  2347,
+       0,  2348,  2349,  2350,  2351,  2352,  2353,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1445,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2325,     0,     0,
+    2326,     0,     0,     0,  2327,  2328,  2329,  2343,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1674,  1674,     0,
+       0,  2330,     0,     0,  3796,     0,     0,     0,     0,  2332,
+       0,  1225,     0,     0,     0,  2333,     0,     0,     0,     0,
+       0,     0,     0,  1225,  1225,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2334,
+       0,     0,     0,     0,     0,     0,     0,     0,  1445,     0,
+       0,     0,     0,  1444,     0,  5109,  5111,  5111,     0,     0,
+       0,     0,     0,  1445,     0,     0,     0,     0,     0,     0,
+       0,  1445,     0,     0,     0,     0,     0,   851,     0,     0,
+    2344,     0,  1445,  2345,  2346,  2347,     0,  2348,  2349,  2350,
+    2351,  2352,  2353,  3174,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    3189,     0,  3192,  1444,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2325,
+       0,     0,  2326,     0,     0,     0,  2327,  2328,  2329,  1445,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2342,     0,     0,  2343,  2344,  2345,     0,  2346,
-    2347,  2348,  2349,  2350,  2351,  2323,     0,     0,  2324,  1693,
-       0,     0,  2325,  2326,  2327,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  2328,
-       0,  2333,     0,     0,     0,  1086,  2334,  2330,     0,     0,
-       0,     0,     0,  2331,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1444,     0,     0,  2335,  2336,     0,
-       0,     0,     0,     0,     0,     0,     0,  2332,     0,  1444,
-    1441,     0,  2337,     0,     0,     0,     0,  1444,     0,     0,
-       0,     0,     0,   851,     0,     0,     0,     0,  1444,     0,
+       0,     0,  1227,  2330,  2335,     0,     0,     0,  1445,  2336,
+       0,  2332,     0,     0,  1227,     0,     0,  2333,     0,     0,
+    1445,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    2337,  2338,  1445,     0,     0,     0,     0,     0,     0,     0,
+       0,  2334,     0,     0,     0,  2339,     0,  1227,     0,     0,
+       0,     0,     0,     0,     0,     0,  5213,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1445,     0,     0,  1445,  2340,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2341,
+       0,     0,  2342,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1441,     0,  2338,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2339,     0,     0,  2340,
+       0,     0,     0,     0,  3264,     0,     0,     0,  2537,  3270,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1444,     0,     0,     0,  1441,
-       0,     0,     0,     0,     0,     0,     0,     0,  1227,     0,
-       0,     0,     0,     0,  1444,     0,     0,     0,     0,     0,
-    1227,     0,     0,     0,     0,     0,  1444,     0,     0,     0,
-       0,     0,  2333,     0,     0,     0,     0,  2334,  1444,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1227,     0,     0,  1441,  2341,  2335,  2336,
-    1441,  1441,     0,     0,     0,  3390,     0,     0,     0,     0,
-       0,     0,     0,  2337,     0,     0,     0,     0,  1444,     0,
-       0,  1444,     0,     0,  3417,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1227,
+       0,     0,     0,     0,     0,     0,  2335,     0,     0,     0,
+       0,  2336,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  5278,     0,
+    2343,     0,  2337,  2338,     0,     0,  1227,  1227,     0,     0,
+       0,  1444,  1227,  1227,     0,     0,     0,  2339,     0,  1227,
+    1227,  1227,     0,  1444,     0,  1227,     0,  1227,  1227,  1227,
+    1227,  1227,  1227,  5302,  1227,  5304,  1227,  1227,     0,     0,
+    1227,     0,     0,     0,     0,     0,     0,     0,  2340,     0,
+       0,     0,     0,     0,  1445,  1227,  1227,  1227,  1227,   851,
+    1444,  2341,     0,  1227,  2342,     0,     0,  1227,     0,     0,
+    1227,     0,     0,  1227,  1227,  1227,  1227,  1227,  1227,  1227,
+    1227,  1227,     0,  1227,     0,     0,     0,     0,     0,     0,
+       0,  1227,     0,  2344,  1227,     0,  2345,  2346,  2347,     0,
+    2348,  2349,  2350,  2351,  2352,  2353,     0,     0,  2325,     0,
+       0,  2326,     0,     0,     0,  2327,  2328,  2329,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     4,  2330,     0,     0,  4361,     0,     0,     0,     0,
+    2332,     0,  2343,     0,     0,     0,  2333,     0,     0,     0,
+       0,     5,     0,     0,     0,     0,     0,  1227,     0,     0,
+       0,     6,     7,  5111,     0,     0,     8,     0,     9,    10,
+    2334,  4307,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    35,     0,    36,     0,
+      37,    38,    39,    40,    41,    42,    43,    44,     0,     0,
+       0,    45,     0,     0,     0,     0,     0,  1444,     0,     0,
+       0,  5425,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2344,     0,     0,  2345,  2346,
+    2347,     0,  2348,  2349,  2350,  2351,  2352,  2353,     0,     0,
+       0,     0,     0,     0,     0,  1445,     0,     0,     0,  1445,
+    1445,     0,  2325,    46,     0,  2326,     0,     0,     0,  2327,
+    2328,  2329,     0,   851,     0,  2335,     0,     0,     0,     0,
+    2336,     0,     0,     0,     0,     0,  2330,  2537,     0,     0,
+       0,     0,     0,     0,  2332,     0,     0,     0,  5473,     0,
+    2333,  2337,  2338,     0,     0,     0,     0,  1227,     0,     0,
+       0,     0,     0,     0,     0,     0,  2339,     0,  1227,     0,
+       0,     0,  1445,     0,  2334,  1227,     0,     0,     0,     0,
+       0,     0,     0,     0,  1445,    47,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2340,     0,     0,
+       0,     0,     0,    48,     0,     0,     0,  1086,  5519,     0,
+    2341,     0,     0,  2342,     0,     0,     0,     0,     0,     0,
+       0,  1445,     0,     0,    49,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   851,     0,     0,     0,   851,    50,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1444,     0,     0,     0,
+       0,     0,  1086,     0,     0,     0,     0,     0,     0,  2335,
+       0,     0,     0,    51,  2336,     0,    52,  1444,     0,     0,
+       0,  2343,     0,     0,     0,     0,     0,     0,  1444,     0,
+       0,    53,     0,     0,     0,  2337,  2338,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    2339,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2340,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2341,     0,     0,  2342,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1227,  1445,    54,
+       0,     0,     0,     0,  2344,     0,   851,  2345,  2346,  2347,
+       0,  2348,  2349,  2350,  2351,  2352,  2353,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    55,     0,     0,     0,     0,
+       0,     0,  3174,  3174,  3174,     0,     0,     0,     0,     0,
+      56,     0,     0,     0,     0,  2343,     0,     0,  1445,     0,
+       0,     0,     0,     0,     0,    57,     0,     0,     0,     0,
+       0,     0,     0,     0,  1227,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2338,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2339,     0,     0,
-    2340,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    58,     0,     0,     0,     0,     0,     0,
+       0,    59,     0,    60,    61,    62,    63,    64,     0,     0,
+      65,    66,    67,    68,     0,    69,    70,    71,    72,    73,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1227,     0,  1441,     0,     0,
-    2342,     0,     0,  2343,  2344,  2345,     0,  2346,  2347,  2348,
-    2349,  2350,  2351,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1227,  1227,     0,     0,     0,     0,  1227,  1227,
-       0,     0,     0,     0,     0,  1227,  1227,  1227,  2341,     0,
-       0,  1227,     0,  1227,  1227,  1227,  1227,  1227,  1227,     0,
-    1227,     0,  1227,  1227,     0,     0,  1227,     0,     0,  3569,
-       0,     0,     0,     0,     0,     0,     0,  4301,     0,     0,
-    1444,  1227,  1227,  1227,  1227,   851,     0,     0,     0,  1227,
-       0,     0,     0,  1227,     0,     0,  1227,     0,     0,  1227,
-    1227,  1227,  1227,  1227,  1227,  1227,  1227,  1227,     0,  1227,
-       0,     0,     0,     0,     0,     0,     0,  1227,     0,     0,
+       0,     0,  1227,     0,     0,     0,     0,     0,     0,     0,
+    2537,     0,     0,  3270,     0,  3270,     0,     0,  2344,     0,
+    2537,  2345,  2346,  2347,     0,  2348,  2349,  2350,  2351,  2352,
+    2353,     0,     0,     0,  2325,     0,     0,  2326,     0,     0,
+       0,  2327,  2328,  2329,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1445,  2330,     0,
+       0,     0,     0,     0,     0,     0,  2332,     0,     0,     0,
+       0,  1444,  2333,     0,     0,  1227,     0,     0,  1445,     0,
+       0,  1227,     0,     0,     0,     0,     0,     0,  1444,  1445,
+       0,     0,     0,     0,     0,     0,  2334,     0,  1227,     0,
+       0,     0,     0,  1227,     0,     0,     0,     0,     0,     0,
+       0,     0,  2537,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1227,  1227,  1227,     0,
+       0,  1227,     0,     0,     0,     0,     0,     0,     0,  1227,
+    1227,  1227,  1227,     0,     0,     0,     0,   851,     0,     0,
+       0,     0,  1227,   851,     0,  1227,     0,  1227,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1227,  1227,
+       0,     0,  1227,     0,     0,     0,     0,  1444,     0,  1444,
+       0,     0,     0,     0,     0,     0,  1227,     0,  1227,     0,
+    1227,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2335,     0,     0,     0,     0,  2336,     0,     0,     0,
     1227,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1227,     0,  1227,  1227,  1227,     0,  2337,  2338,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1444,     0,
+       0,     0,  2339,     0,     0,     0,     0,     0,  1227,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  2342,     0,     0,  2343,  2344,  2345,     0,  2346,  2347,
-    2348,  2349,  2350,  2351,    86,    87,    88,     0,    90,    91,
-      92,     0,     0,     0,    95,     0,     0,    98,    99,   100,
-     101,   102,   103,     0,   104,   105,     0,     0,     0,   107,
-     108,   109,   110,  1227,   111,   112,   113,   114,     0,   115,
-     116,   117,     0,     0,     0,     0,     0,   120,   121,     0,
-       0,     0,     0,   122,     0,     0,     0,     0,     0,     0,
-       0,     0,   123,     0,   124,     0,   125,     0,    35,     0,
-       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,  1227,     0,  1444,     0,     0,  1227,     0,     0,     0,
+       0,     0,  1227,  2340,     0,     0,     0,     0,     0,     0,
+       0,     0,  1227,     0,     0,     0,  2341,     0,     0,  3270,
+       0,     0,     0,     0,  3270,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3708,     0,
-       0,     0,     0,     0,     0,     0,   132,     0,     0,     0,
-     134,   135,   136,   137,   138,     0,     0,     0,     0,     0,
-    1444,     0,     0,     0,  1444,  1444,   139,     0,     0,     0,
-       0,     0,     0,   143,     0,   144,     0,     0,   851,     0,
-       0,   147,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   150,     0,     0,     0,     0,     0,     0,
-     151,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     154,   155,  1227,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1227,     0,     0,     0,  1444,     0,     0,
-    1227,     0,     0,     0,     0,     0,     0,   161,     0,  1444,
-       0,     0,     0,     0,     0,   163,     0,     0,     0,   165,
-       0,     0,     0,     0,     0,   167,     0,     0,     0,     0,
-       0,   168,  1086,   169,     0,     0,     0,     0,     0,   171,
-       0,   172,     0,     0,     0,     0,  1444,     0,     0,   173,
-       0,     0,     0,     0,     0,     0,     0,  3835,     0,     0,
-       0,     0,     0,   175,   176,     0,     0,   851,     0,     0,
-     177,   851,   178,     0,     0,   179,   180,     0,   181,     0,
-       0,     0,     0,     0,     0,     0,     0,   182,   183,     0,
-     184,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   189,   190,   191,     0,     0,   192,     0,     0,
-       0,   194,     0,     0,   195,     0,   196,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     197,   198,     0,   199,   200,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   201,     0,   202,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     204,     0,     0,     0,     0,     0,     0,  1084,     0,     0,
-       0,     0,     0,     0,     0,  1084,     0,  1084,     0,     0,
-     211,     0,     0,     0,   213,     0,     0,     0,     0,  1227,
-    1444,     0,     0,     0,     0,     0,     0,     0,   851,     0,
-       0,     0,   218,     0,     0,   220,     0,     0,   221,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   223,     0,     0,     0,     0,     0,   225,     0,
-       0,     0,     0,     0,     0,   226,   227,     0,     0,     0,
-       0,   228,     0,   229,     0,     0,     0,     0,     0,     0,
-       0,     0,   232,     0,     0,     0,     0,     0,     0,     0,
-    1444,     0,     0,     0,     0,     0,     0,   236,     0,     0,
-     237,     0,     0,     0,  2323,     0,  1227,  2324,     0,     0,
-       0,  2325,  2326,  2327,     0,     0,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,     0,     0,     0,  2328,     0,
-       0,  4355,     0,     0,     0,     0,  2330,     0,     0,     0,
-       0,     0,  2331,     0,     0,     0,     0,     0,     0,     0,
-       0,  3236,     0,     4,     0,     0,  4053,     0,     0,     0,
-       0,     0,     0,     0,  1227,     0,  2332,     0,     0,     0,
-       0,     0,     0,     5,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     6,     7,     0,     0,     0,     0,     0,
-       9,    10,     0,     0,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,  1444,
-       0,     0,    37,    38,    39,    40,    41,    42,    43,    44,
-       0,     0,     0,    45,     0,     0,     0,  1227,     0,     0,
-    1444,     0,     0,  1227,     0,     0,     0,     0,     0,     0,
-       0,  1444,     0,     0,     0,     0,     0,     0,     0,     0,
-    1227,     0,     0,     0,     0,  1227,     0,     0,     0,     0,
-       0,  2333,     0,     0,     0,     0,  2334,     0,     0,  4159,
-    4160,     0,     0,     0,     0,    46,     0,     0,  1227,  1227,
-    1227,     0,     0,  1227,     0,  4169,     0,  2335,  2336,     0,
-       0,  1227,  1227,  1227,  1227,     0,     0,     0,     0,   851,
-       0,  4186,  2337,     0,  1227,   851,     0,  1227,     0,  1227,
-    4195,  4196,     0,     0,     0,     0,     0,     0,     0,     0,
-    1227,  1227,     0,     0,  1227,     0,     0,  4214,     0,     0,
-       0,     0,     0,  2338,     0,     0,     0,     0,  1227,   967,
-    1227,     0,  1227,     0,     0,     0,  2339,    47,     0,  2340,
-       0,   968,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1227,     0,     0,    48,     0,     0,     0,     0,
-       0,     0,   969,  1227,     0,  1227,  1227,  1227,     0,     0,
-       0,     0,     0,     0,     0,   970,    49,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   971,
-    1227,     0,     0,     0,     0,     0,     0,     0,     0,    50,
-       0,     0,     0,  1227,     0,     0,     0,   972,  1227,     0,
-       0,     0,     0,     0,  1227,     0,     0,  2341,  1693,     0,
-       0,     0,     0,     0,  1227,     0,     0,     0,   973,     0,
-       0,     0,     0,     0,     0,    51,     0,     0,    52,   974,
-       0,     0,     0,     0,     0,     0,     0,   975,     0,     0,
-       0,     0,     0,    53,     0,     0,     0,     0,     0,   976,
-       0,     0,     0,  1444,   977,     0,  1444,     0,  1444,     0,
-     978,     0,     0,  1444,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   979,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1227,     0,     0,
+       0,  1445,     0,     0,  1445,     0,  1445,     0,     0,     0,
+       0,  1445,     0,     0,     0,    85,     0,     0,     0,     0,
+       0,    89,     0,     0,     0,    93,     0,    94,     0,    96,
+      97,     0,  1444,     0,     0,  1227,     0,     0,     0,     0,
+     106,     0,     0,     0,     0,     0,     0,  2343,     0,     0,
+    3270,     0,     0,     0,     0,     0,   118,   119,     0,     0,
+       0,     0,  1445,     0,     0,  1444,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1445,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2342,     0,     0,  2343,  2344,  2345,     0,  2346,  2347,  2348,
-    2349,  2350,  2351,     0,  1444,     0,     0,     0,     0,     0,
-       0,    54,     0,   980,     0,     0,     0,     0,     0,     0,
-       0,  1444,     0,  4388,  4389,  4390,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   981,  1444,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   982,     0,    55,     0,     0,
-       0,     0,     0,     0,   983,     0,     0,     0,     0,     0,
-       0,     0,    56,     0,   881,     0,     0,   851,   851,   851,
-       0,     0,     0,     0,     0,     0,     0,    57,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   984,     0,     0,     0,     0,   985,     0,   986,     0,
-    1444,     0,  1444,  1223,   987,    58,     0,   988,     0,     0,
-       0,     0,  1223,    59,     0,    60,    61,    62,    63,    64,
-       0,     0,    65,    66,  1485,  2934,     0,     0,     0,    71,
-       0,     0,     0,     0,     0,     0,   989,     0,     0,   990,
-       0,     0,     0,   991,     0,     0,     0,  1223,     0,     0,
-     992,     0,   993,     0,     0,     0,     0,   994,     0,     0,
-       0,  1444,     0,     0,     0,     0,     0,     0,     0,   995,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   996,     0,     0,     0,  1444,     0,     0,     0,
+       0,     0,     0,  1445,     0,     0,   127,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   128,     0,   129,   130,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
-       0,  1442,  1444,     0,     0,  1223,   851,  1444,     0,     0,
-    2323,     0,     0,  2324,     0,     0,     0,  2325,  2326,  2327,
-       0,     0,  1442,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2328,     0,     0,     0,     0,     0,
-       0,     0,  2330,     0,     0,     0,     0,     0,  2331,     0,
+       0,     0,     0,  1161,     0,   851,   851,   851,     0,     0,
+    2344,     0,     0,  2345,  2346,  2347,     0,  2348,  2349,  2350,
+    2351,  2352,  2353,   140,     0,   141,   142,     0,     0,     0,
+       0,   145,     0,   146,     0,     0,  1444,     0,  1445,     0,
+    1445,     0,     0,     0,   148,     0,   149,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1444,     0,     0,
+       0,   152,     0,   153,     0,     0,   156,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   157,     0,
+     158,     0,  1444,     0,   159,     0,     0,     0,     0,     0,
+     160,     0,     0,     0,     0,     0,     0,     0,   162,  1445,
+     164,     0,     0,     0,     0,     0,   166,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1444,     0,     0,     0,
+       0,   170,     0,     0,  1445,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   174,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1445,     0,     0,     0,   851,  1445,     0,     0,     0,     0,
+       0,     0,     0,     0,  3174,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   185,   186,  1084,     0,
+       0,     0,   187,     0,     0,     0,  1084,     0,  1084,     0,
+       0,     0,     0,   188,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   193,     0,     0,     0,     0,     0,
+       0,     0,     0,  1445,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1445,     0,     0,     0,     0,     0,     0,  2537,     0,
+       0,     0,     0,   203,     0,     0,  1445,     0,     0,     0,
+       0,     0,     0,     0,     0,   205,     0,     0,     0,     0,
+     206,   207,     0,   208,     0,     0,     0,     0,   209,     0,
+       0,     0,     0,   210,     0,  2325,   212,     0,  2326,     0,
+       0,   214,  2327,  2328,  2329,     0,   215,   216,     0,     0,
+       0,     0,     0,     0,   217,     0,     0,     0,   219,  1227,
+       0,     0,     0,     0,     0,     0,     0,  2332,   222,     0,
+       0,     0,     0,  2333,     0,     0,     0,     0,     0,     0,
+     224,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3270,     0,     0,     0,  2334,     0,   230,
+       0,   231,     0,     0,  1227,     0,     0,  1445,     0,   233,
+       0,     0,     0,  1227,     0,   234,     0,     0,     0,  1227,
+     235,  1227,     0,     0,  1227,     0,     0,     0,  1445,  1227,
+    1227,  1227,  1227,   238,     0,  1227,  1227,  1227,  1227,  1227,
+    1227,  1227,  1227,  1227,  1227,     0,     0,     0,  1227,  1227,
+       0,     0,     0,  1445,   248,     0,     0,     0,  1227,     0,
+       0,     0,  1227,     0,   851,     0,  1227,     0,   249,     0,
+       0,     0,  -144,     0,  1227,     0,     0,  1227,     0,  1227,
+       0,     0,     0,     0,     0,     0,     0,  1445,  1227,     0,
+       0,  1227,  1227,     0,     0,     0,  1227,  1227,     0,     0,
+       0,     0,  2335,  1227,     0,     0,     0,  2336,     0,     0,
+       0,     0,     0,  1227,     0,  1227,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1227, -2802, -2802,
+       0,  1444,     0,  1227,  1227,  1227,     0,     0,     0,     0,
+       0,     0,     0,  2339,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0, -2802,     0,     0,     0,     0,  2537,
+    1227,     0,     0,     0,     0,     0,     0,  2341,     0,     0,
+       0,     4,     0,  1227,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1445,
+       0,     5,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     6,     7,     0,  1227,     0,     0,     0,     9,    10,
+       0,     0,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    35,     0,     0,     0,
+      37,    38,    39,    40,    41,    42,    43,    44,  2343,     0,
+       0,    45,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1444,     0,     0,     0,     0,
-       0,     0,  2332,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1444,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   851,     0,
+       0,     0,     0,   851,  1445,   851,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,  1444,     0,
-       0,     0,     0,     0,  4630,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  4640,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1223,  1223,     0,
-       0,     0,     0,     0,  1084,     0,     0,     0,  1084,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  4660,
-       0,  1227,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1223,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2859,  2333,     0,     0,
-       0,     0,  2334,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1227,     0,     0,  1444,
-       0,     0,     0,  2335,  2336,  1227,     0,     0,     0,     0,
-       0,  1227,     0,  1227,     0,     0,  1227,     0,  2337,     0,
-    1444,  1227,  1227,  1227,  1227,     0,     0,  1227,  1227,  1227,
-    1227,  1227,  1227,  1227,  1227,  1227,  1227,     0,     0,     0,
-    1227,  1227,     0,     0,     0,  1444,     0,     0,     0,  2338,
-    1227,     0,     0,     0,  1227,     0,   851,     0,  1227,     0,
-       0,     0,  2339,     0,     0,  2340,  1227,     0,     0,  1227,
-       0,  1227,     0,     0,     0,     0,     0,     0,     0,  1444,
-    1227,     0,     0,  1227,  1227,     0,     0,     0,  1227,  1227,
-       0,     0,     0,     0,     0,  1227,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1227,     0,  1227,  1084,  1084,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1227,
-       0,     0,     0,     0,     0,  1227,  1227,  1227,     0,     0,
-       0,     0,     0,     0,  1223,     0,     0,     0,     0,     0,
-       0,  1442,     0,  2341,     0,  1223,     0,     0,     0,     0,
-       0,  4786,  4787,  4788,  4789,     0,     0,     0,     0,     0,
-       0,  1442,     0,     0,     0,     0,     0,     0,     0,     0,
-    1442,     0,  1227,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1227,     0,     0,     0,     0,
+       0,     0,     0,    46,     0,     0,     0,     0,  1444,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1444,     0,     0,     0,     0,     0,     0,  1223,     0,
-       0,     0,     0,     0,     0,     0,  1227,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2342,     0,     0,  2343,
-    2344,  2345,     0,  2346,  2347,  2348,  2349,  2350,  2351,     0,
-       0,  1442,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2344,     0,     0,  2345,  2346,  2347,     0,  2348,  2349,
+    2350,  2351,  2352,  2353,     0,     0,     0,     0,     0,     0,
+    3174,     0,     0,     0,     0,  3174,     0,     0,     0,     0,
+     909,  3174,     0,   851,     0,    47,     0,     0,     0,     0,
+       0,     0,   910,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    48,     0,  1227,     0,     0,     0,     0,
+       0,     0,     0,   911,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    49,     0,   912,     0,     0,     0,
+       0,     0,  1445,     0,     0,     0,   913,     0,     0,     0,
+    -794,     0,     0,     0,     0,     0,  1444,    50,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   914,     0,
+       0,     0,     0,     0,   915,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1444,     0,     0,     0,   916,
+    1445,  1227,  1227,    51,  1223,     0,    52,     0,     0,     0,
+     917,     0,     0,  1223,     0,  1444,     0,     0,   918,     0,
+       0,    53,     0,     0,     0,     0,     0,     0,     0,     0,
+     919,     0,     0,     0,     0,     0,     0,   920,     0,     0,
+       0,   921,     0,     0,     0,     0,     0,     0,  1223,     0,
+       0,     0,     0,     0,     0,     0,     0,     0, -1004,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1444,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     4,     0,     0,     0,     0,     0,
-     851,     0,     0,     0,     0,   851,  1444,   851,     0,     0,
-       0,     0,     0,     0,     5,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     6,     7,     0,     0,     0,     0,
-       0,     9,    10,     0,  1223,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-       0,     0,     0,    37,    38,    39,    40,    41,    42,    43,
-      44,     0,     0,     0,    45,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1227,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   922,  1227,     0,     0,    54,
+       0,     0,     0,     0,  -535,     0,  1223,     0,     0,     0,
+       0,     0,  1443,     0,     0,     0,  1223,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1227,     0,     0,     0,
+       0,     0,     0,  1443,     0,   923,  1227,  1227,   924,  1445,
+       0,     0,     0,  1227,  1227,    55,     0,     0,  1227,  1445,
+       0,     0,     0,  1227,     0,   925,  1227,  1227,     0,     0,
+      56,  1227,     0,     0,     0,     0,     0,  1227,  5005,     0,
+    1444,     0,     0,     0,  -431,    57,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1227,     0,     0,     0,  1227,
+       0,     0,   926,     0,     0,     0,     0,     0,     0,   927,
+       0,  1227,     0,    58,     0,  -431,  1227,     0,   928,     0,
+       0,    59,  1227,    60,    61,    62,    63,    64,     0,     0,
+      65,    66,  1486,  2940,     0,  1444,     0,    71,     0,     0,
+    1227,     0,     0,     0,     0,     0,     0,  -431,  1223,  1223,
+     929,   930,     0,   931,   932,  1084,     0,     0,     0,  1084,
+       0,     0,     0,   933,     0,     0,     0,     0,   934,  1227,
+       0,     0,     0,     0,   935,     0,     0,   936,     0,     0,
+     937,     0,     0,     0,     0,  1223,     0,  1445,     0,     0,
+       0,     0,     0,  -431,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   851,     0,     0,
+       0,     0,     0,     0,     0,     0,  1445,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1442,     0,     0,   851,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1445,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1227,     0,     0,
-       0,     0,     0,  1223,     0,     0,    46,     0,     0,     0,
+       0,  1227,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3270,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1444,     0,     0,     0,     0,     0,
-       0,  1223,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  5003,     0,  1223,
-    1223,  1223,     0,  1223,     0,  1306,     0,     0,     0,     0,
-       0,     0,  1444,  1227,  1227,     0,     0,     0,    47,     0,
-       0,     0,     0,  1223,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    48,     0,  1307,     0,
+    1445,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1308,  1309,     0,     0,     0,     0,    49,     0,     0,
-       0,  1310,     0,     0,     0,  1311,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1223,     0,     0,
-      50,     0,     0,  1312,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1227,     0,     0,
-       0,     0,     0,     0,  1313,     0,  1223,     0,  1227,     0,
-    1223,  1223,     0,     0,     0,  1314,    51,     0,     0,    52,
-       0,     0,     0,  1315,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    53,  1316,     0,     0,  1227,     0,
-    1317,     0,     0,     0,     0,     0,     0,     0,  1227,  1227,
-       0,  1444,     0,     0,     0,  1227,  1227,     0,     0,     0,
-    1227,  1444,     0,  1318,     0,  1227,     0,     0,  1227,  1227,
-       0,     0,     0,  1227,     0,     0,     0,     0,     0,  1227,
-       0,     0,     0,     0,     0,     0,     0,     0,  1319,  1442,
-       0,     0,     0,     0,     0,     0,     0,  1227,     0,     0,
-       0,  1227,     0,     0,     0,  1084,     0,     0,     0,  1320,
-       0,     0,    54,  1227,     0,     0,     0,     0,  1227,     0,
-       0,     0,     0,     0,  1227,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1321,     0,  1227,  5163,  1084,     0,     0,     0,     0,     0,
-       0,     0,  1442,     0,     0,     0,     0,     0,    55,  1693,
-    1322,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     881,  1227,     0,    56,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1442,     0,     0,    57,  1444,
-    5208,     0,     0,     0,     0,     0,     0,  1323,     0,     0,
-       0,     0,  1324,     0,  1325,     0,     0,     0,     0,   851,
-    1326,     0,     0,  1327,     0,     0,    58,     0,  1444,     0,
-       0,     0,     0,     0,    59,     0,    60,    61,    62,    63,
-      64,     0,     0,    65,    66,  1485,     0,     0,  1444,     0,
-      71,     0,  1328,     0,     0,  1329,     0,  1084,     0,  1330,
-       0,     0,     0,  1227,     0,     0,  1331,     0,  1332,     0,
-       0,     0,     0,  1333,     0,     0,  1442,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1442,     0,     0,     0,     0,     0,     0,  1334,  1442,
-       0,     0,  1444,     0,     0,     0,     0,     0,     0,     0,
-    1442,     0,     0,     0,     0,  5275,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1227,     0,     0,     0,  1084,
+    1084,     0,     0,     0,     0,     0,  1227,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1227,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1227,     0,
-       0,     0,     0,     0,     0,     0,     0,  1442,     0,     0,
+       0,     0,     0,     0,     0,     0,  1223,     0,     0,     0,
+       0,     0,     0,  1443,     0,     0,     0,  1223,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  3270,
+       0,     0,     0,  1443,     0,     0,     0,     0,     0,  1445,
+       0,  1445,  1443,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1223,     0,     0,     0,     0,     0,  1442,     0,     0,     0,
-       0,     0,  1223,     0,     0,     0,     0,     0,  1442,     0,
+    1444,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1442,  1444,     0,  1444,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
+    1223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1227,     0,     0,     0,  1445,     0,  1444,     0,
+       0,  1227,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1227,  1227,
+       0,     0,  1227,  1443,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1227,     0,     0,     0,
+       0,  1227,     0,     0,     0,     0,  1227,     0,     0,  1227,
+    1227,     0,     0,     0,     0,  1444,     0,  1227,  1227,  1444,
+    1444,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1227,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1227,     0,     0,  1223,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1442,     0,     0,  1442,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1227,     0,     0,     0,  1444,     0,
-       0,     0,     0,  1227,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1227,  1227,     0,     0,  1227,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1227,     0,
-       0,     0,     0,  1227,     0,     0,     0,  1223,  1227,     0,
-       0,  1227,  1227,     0,     0,     0,     0,     0,     0,  1227,
-    1227,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1445,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1227,     0,     0,     0,
+       0,     0,     0,     0,     0,  5005,  1444,     0,     0,     0,
+       0,     0,     0,     0,  1443,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1227,     0,     0,  1223,  1223,     0,     0,     0,     0,
-    1223,  1223,     0,     0,     0,  1227,     0,  1223,  1223,  1223,
-       0,     0,     0,  1223,     0,  1223,  1223,  1223,  1223,  1223,
-    1223,     0,  1223,     0,  1223,  1223,     0,     0,  1223,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1444,     0,
-       0,     0,  1442,  1223,  1223,  1223,  1223,     0,  1227,     0,
-       0,  1223,     0,     0,     0,  1223,     0,     0,  1223,     0,
-       0,  1223,  1223,  1223,  1223,  1223,  1223,  1223,  1223,  1223,
-       0,  1223,     0,     0,     0,     0,     0,     0,     0,  1223,
-       0,     0,  1223,     0,     0,   851,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1227,
+       0,     0,     0,   851,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1223,     0,  1227,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1223,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1227,     0,
+    1445,  1223,  1223,  1223,     0,  1223,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
-    1227,     0,  1444,     0,     0,     0,     0,     0,     0,     0,
+    1227,  1445,     0,  1227,     0,  1227,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1227,
+       0,     0,     0,  1227,     0,     0,     0,     0,     0,  1445,
+       0,     0,     0,     0,  1227,     0,     0,     0,     0,  1223,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1227,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1223,     0,
+       0,     0,  1223,  1223,     0,     0,     0,     0,     0,     0,
+     851,     0,     0,     0,     0,     0,  1445,     0,     0,     0,
+    1445,  1445,     0,     0,     0,  1227,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1227,  1444,     0,  1227,     0,  1227,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1227,     0,     0,     0,  1227,     0,     0,     0,     0,
-       0,  1444,     0,     0,     0,     0,  1227,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1227,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1442,     0,     0,     0,  1442,  1442,  1227,     0,
+       0,     0,  1443,     0,     0,     0,  1227,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1084,     0,
+       0,     0,     0,     0,     0,     0,  1445,  1445,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   699,     0,     0,     0,     0,   743,     0,   743,  1227,
+       0,     0,  1227,     0,     0,     0,     0,  1084,   743,     0,
+       0,  1227,     0,     0,     0,  1443,  1227,     0,  1227,     0,
+    1227,     0,     0,     0,     0,     0,     0,  1227,     0,     0,
+       0,     0,     0,   743,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   743,     0,  1227,     0,     0,  1443,     0,
+       0,     0,     0,     0,   743,   743,     0,     0,   743,     0,
+       0,     0,     0,     0,   743,     0,     0,     0,  1040,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   851,     0,     0,     0,     0,     0,  1444,     0,
-       0,     0,  1444,  1444,     0,     0,     0,  1227,     0,     0,
-       0,     0,     0,     0,  1223,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1223,     0,     0,     0,  1442,
-       0,     0,  1223,     0,     0,     0,     0,     0,     0,     0,
-       0,  1442,     0,     0,     0,     0,     0,     0,  1227,     0,
+    1040,     0,     0,     0,     0,     0,  1227,     0,     0,     0,
+       0,     0,     0,     0,     0,   743,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1084,     0,     0,     0,  1227,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1442,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1444,  1444,
+       0,     0,     0,     0,     0,     0,     0,  1227,  1227,  1443,
+       0,     0,     0,     0,     0,     0,     0,     0,  1227,     0,
+       0,     0,     0,     0,  1443,     0,     0,     0,     0,     0,
+       0,     0,  1443,     0,     0,     0,     0,     0,  1227,     0,
+       0,     0,     0,  1443,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1227,     0,     0,  1227,     0,     0,     0,     0,     0,
-       0,     0,     0,  1227,     0,     0,     0,     0,  1227,     0,
-    1227,     0,  1227,     0,     0,     0,     0,     0,     0,  1227,
+       0,     0,     0,  1227,     0,     0,     0,     0,     0,  1227,
+    1227,     0,  1227,     0,     0,     0,     0,     0,     0,     0,
+    1443,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1227,     0,  1223,     0,     0,     0,     0,     0,  1443,
+       0,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
+       0,  1443,     0,     0,   851,     0,     0,     0,     0,     0,
+       0,     0,     0,  1443,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1223,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1227,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1443,     0,     0,  1443,     0,     0,     0,
+    1227,  1227,     0,     0,     0,     0,   851,     0,     0,     0,
+       0,     0,     0,     0,  1227,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   851,  1227,  1227,   743,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1227,     0,
+    1223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1223,  1442,     0,     0,     0,     0,     0,     0,  1227,
-    1227,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1227,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1223,  1223,     0,
+       0,     0,     0,  1223,  1223,     0,     0,     0,     0,     0,
+    1223,  1223,  1223,     0,     0,     0,  1223,     0,  1223,  1223,
+    1223,  1223,  1223,  1223,     0,  1223,     0,  1223,  1223,     0,
+       0,  1223,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1443,  1223,  1223,  1223,  1223,
+       0,     0,     0,     0,  1223,     0,     0,     0,  1223,     0,
+       0,  1223,     0,     0,  1223,  1223,  1223,  1223,  1223,  1223,
+    1223,  1223,  1223,     0,  1223,     0,     0,     0,     0,     0,
+       0,     0,  1223,     0,     0,  1223,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1227,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1442,     0,     0,  1227,     0,     0,     0,     0,
-       0,  1227,  1227,     0,  1227,     0,     0,     0,  1223,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1227,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   851,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1223,     0,
+       0,     0,     0,     0,     0,     0,     0,   743,     0,     0,
+      86,    87,    88,     0,    90,    91,    92,     0,     0,     0,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,     0,     0,     0,   107,   108,   109,   110,     0,
+     111,   112,   113,   114,     0,   115,   116,   117,     0,     0,
+       0,     0,     0,   120,   121,   743,   743,     0,     0,   122,
+       0,     0,     0,     0,     0,     0,     0,     0,   123,     0,
+     124,     0,   125,     0,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1443,     0,     0,     0,
+    1443,  1443,     0,   743,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   132,     0,     0,     0,   134,   135,   136,   137,
+     138,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   139,     0,     0,     0,     0,     0,  1223,   143,
+       0,   144,     0,     0,     0,     0,     0,   147,     0,  1223,
+       0,     0,     0,  1443,     0,     0,  1223,     0,     0,   150,
+       0,     0,     0,     0,     0,  1443,   151,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   154,   155,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1084,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1443,   161,     0,     0,     0,     0,     0,     0,
+       0,   163,     0,     0,     0,   165,     0,     0,     0,     0,
+       0,   167,     0,     0,     0,     0,     0,   168,     0,   169,
+       0,     0,     0,     0,     0,   171,     0,   172,     0,     0,
+       0,     0,     0,     0,     0,   173,     0,     0,     0,     0,
+       0,     0,     0,  1084,     0,     0,     0,     0,     0,   175,
+     176,     0,     0,     0,     0,     0,   177,     0,   178,     0,
+       0,   179,   180,     0,   181,     0,     0,     0,     0,     0,
+       0,     0,     0,   182,   183,     0,   184,     0,     0,     0,
+       0,  1390,   743,     0,   743,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   189,   190,
+     191,     0,     0,   192,     0,     0,     0,   194,     0,     0,
+     195,     0,   196,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   197,   198,     0,   199,
+     200,     0,     0,     0,     0,   743,     0,     0,   743,   743,
+       0,   201,     0,   202,     0,     0,     0,     0,  1223,  1443,
+       0,     0,     0,   699,     0,  1040,   204,  1040,     0,     0,
+       0,     0,     0,   699,     0,     0,     0,   743,     0,     0,
+       0,     0,     0,     0,     0,     0,   211,     0,     0,     0,
+     213,     0,     0,     0,     0,     0,     0,  1040,  1040,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   218,     0,
+       0,   220,     0,     0,   221,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   223,  1443,
+       0,     0,     0,     0,   225,     0,     0,     0,     0,     0,
+       0,   226,   227,     0,   743,  1223,   743,   228,     0,   229,
+       0,     0,     0,     0,     0,     0,     0,     0,   232,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1223,     0,     0,     0,
+       0,     0,     0,   236,     0,     0,   237,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,     0,     0,  1223,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   699,     0,  3242,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   699,
+     699,     0,     0,  1808,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1443,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1227,  1227,     0,     0,     0,     0,   851,     0,
-       0,     0,     0,     0,     0,     0,  1227,     0,     0,     0,
-       0,  1442,     0,     0,     0,     0,     0,   851,  1227,  1227,
+       0,     0,     0,     0,     0,     0,  1223,     0,     0,  1443,
+       0,     0,  1223,     0,     0,     0,     0,     0,     0,     0,
+    1443,   699,     0,     0,     0,     0,     0,     0,     0,  1223,
+       0,     0,     0,     0,  1223,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1223,  1223,  1223,
+       0,     0,  1223,     0,     0,     0,     0,     0,     0,     0,
+    1223,  1223,  1223,  1223,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1223,     0,     0,  1223,     0,  1223,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
-       0,     0,  1442,     0,     0,  1223,     0,     0,     0,     0,
-       0,     0,     0,  1442,     0,     0,     0,     0,     0,     0,
-       0,     0,  1223,     0,     0,     0,     0,  1223,     0,     0,
+    1223,     0,     0,  1223,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1223,     0,  1223,
+       0,  1223,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     953,  1223,     0,     0,     0,     0,     0,     0,     0,   953,
+       0,     0,  1223,     0,  1223,  1223,  1223,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1223,  1223,  1223,     0,     0,  1223,     0,     0,     0,     0,
-       0,     0,     0,  1223,  1223,  1223,  1223,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1223,     0,     0,  1223,
-       0,  1223,     0,     0,     0,   953,     0,     0,     0,     0,
-       0,     0,  1223,  1223,   953,     0,  1223,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1223,     0,  1223,     0,  1223,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1223,   953,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1223,     0,  1223,  1223,  1223,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1141,     0,  1223,     0,     0,     0,     0,     0,     0,     0,
-    1141,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
-    1223,     0,     0,     0,     0,     0,  1223,     0,    86,    87,
-      88,     0,    90,    91,    92,     0,  1223,     0,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
-       0,     0,     0,   107,   108,   109,   110,     0,   111,   112,
-     113,   114,     0,   115,   116,   117,     0,     0,     0,     0,
-       0,   120,   121,     0,     0,  1442,     0,   122,  1442,     0,
-    1442,     0,     0,     0,     0,  1442,   123,     0,   124,     0,
-     125,     0,    35,     0,     0,     0,     0,     0,     0,     0,
-      41,    42,     0,     0,     0,     0,     0,     0,     0,  1223,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     953,     0,  1223,     0,     0,     0,     0,  1223,     0,     0,
+       0,     0,     0,  1223,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1223,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1141,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1141,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1442,     0,     0,     0,
-     132,     0,     0,     0,   134,   135,   136,   137,   138,     0,
-       0,     0,     0,  1442,     0,     0,     0,     0,     0,     0,
-     139,     0,     0,     0,     0,     0,     0,   143,     0,   144,
-       0,     0,     0,     0,     0,   147,     0,  1442,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   150,  1191,     0,
-       0,     0,     0,     0,   151,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   154,   155,     0,     0,     0,     0,
+       0,     0,  1443,     0,     0,  1443,     0,  1443,     0,     0,
+       0,     0,  1443,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   699,     0,     0,
+       0,     0,   743,     0,   743,     0,  1223,   743,     0,   743,
+       0,     0,   743,   743,   743,     0,     0,     0,  2230,     0,
+       0,     0,     0,     0,     0,   743,     0,     0,     0,     0,
+       0,     0,     0,  1443,     0,     0,     0,     0,     0,   743,
+       0,   743,     0,     0,     0,     0,   743,     0,     0,     0,
+    1443,     4,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     5,     0,     0,  1443,     0,     0,     0,     0,     0,
+       0,     6,     7,     0,     0,     0,     0,     0,     9,    10,
+       0,     0,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    35,     0,     0,     0,
+      37,    38,    39,    40,    41,    42,    43,    44,     0,     0,
+       0,    45,     0,  1191,     0,     0,     0,     0,     0,  1443,
+       0,  1443,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   161,     0,     0,     0,     0,     0,     0,     0,   163,
-       0,     0,  1442,   165,  1442,     0,     0,     0,     0,   167,
-       0,     0,     0,     0,     0,   168,     0,   169,     0,     0,
-       0,     0,     0,   171,     0,   172,     0,     0,     0,     0,
-       0,     0,     0,   173,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   175,   176,     0,
-       0,     0,     0,     0,   177,     0,   178,     0,     0,   179,
-     180,     0,   181,  1442,     0,     0,     0,     0,     0,     0,
-       0,   182,   183,     0,   184,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1442,     0,
-       0,     0,     0,     0,     0,     0,   189,   190,   191,     0,
-       0,   192,     0,     0,     0,   194,     0,     0,   195,     0,
-     196,     0,     0,     0,  1442,     0,     0,     0,     0,  1442,
-       0,     0,     0,     0,   197,   198,     0,   199,   200,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   201,
-       0,   202,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   204,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2371,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   211,     0,     0,  1442,   213,     0,
+     743,   743,     0,    46,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   699,     0,     0,
+    1443,     0,   699,   699,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1442,   218,     0,     0,   220,
-       0,     0,   221,     0,     0,     0,     0,     0,     0,     0,
-    1442,     0,     0,     0,     0,     0,   223,     0,     0,     0,
-       0,     0,   225,     0,     0,   953,   953,     0,     0,   226,
-     227,     0,     0,     0,     0,   228,     0,   229,     0,     0,
-       0,     0,     0,     0,     0,     0,   232,     0,     0,     0,
+       0,     0,     0,     0,     0,  1443,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   236,     0,  1223,   237,     0,     0,     0,     0,     0,
-       0,     0,     0,  1191,     0,     0,     0,     0,     0,     0,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1223,     0,
-       0,  1442,     0,     0,     0,  3238,     0,  1223,     0,     0,
-       0,     0,     0,  1223,     0,  1223,     0,     0,  1223,     0,
-       0,     0,  1442,  1223,  1223,  1223,  1223,     0,     0,  1223,
-    1223,  1223,  1223,  1223,  1223,  1223,  1223,  1223,  1223,     0,
-       0,     0,  1223,  1223,     0,     0,     0,  1442,     0,     0,
-       0,     0,  1223,     0,     0,     0,  1223,     0,     0,     0,
-    1223,     0,     0,     0,     0,     0,     0,     0,  1223,     0,
-       0,  1223,     0,  1223,     0,     0,     0,     0,  1443,     0,
-       0,  1442,  1223,     0,  1238,  1223,  1223,     0,     0,     0,
-    1223,  1223,  1271,     0,     0,  1275,  1276,  1223,  1279,  1443,
-       0,  1285,     0,  1287,     0,     0,     0,  1223,     0,  1223,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1223,  1341,     0,     0,     0,     0,  1223,  1223,  1223,
-    1349,     0,     0,     0,     0,     0,     0,  1361,     0,     0,
-    1366,  1367,     0,     0,     0,  1369,     0,     0,     0,     0,
+       0,  1443,     0,     0,     0,    47,  1443,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1191,     0,   953,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1223,     0,     0,     0,     0,     0,
-    1401,     0,     0,     0,     0,     0,     0,  1223,     0,     0,
-       0,     0,     0,     0,     0,  1463,     0,  1467,     0,     0,
-    1469,     0,  1471,  1442,     0,  1475,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1223,   953,
+       0,     0,     0,    48,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   743,     0,   699,     0,     0,
+       0,     0,     0,     0,    49,     0,     0,  2508,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1443,     0,     0,    50,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1443,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1443,     0,     0,
+       0,     0,     0,    51,     0,     0,    52,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     699,    53,     0,     0,     0,     0,     0,     0,   699,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     953,   953,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1562,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1442,     0,
+       0,     0,     0,     0,     0,     0,     0,   699,     0,     0,
+     699,   699,     0,     0,     0,  1223,     0,     0,  1443,    54,
+       0,     0,     0,     0,  1223,     0,     0,     0,  1191,     0,
+    1223,     0,  1223,     0,     0,  1223,     0,     0,     0,  1443,
+    1223,  1223,  1223,  1223,     0,     0,  1223,  1223,  1223,  1223,
+    1223,  1223,  1223,  1223,  1223,  1223,     0,     0,     0,  1223,
+    1223,     0,     0,     0,  1443,    55,     0,     0,     0,  1223,
+       0,     0,     0,  1223,     0,     0,     0,  1223,     0,   699,
+      56,     0,     0,     0,     0,  1223,     0,     0,  1223,     0,
+    1223,     0,     0,     0,     0,    57,     0,     0,  1443,  1223,
+       0,     0,  1223,  1223,     0,     0,     0,  1223,  1223,     0,
+       0,     0,     0,     0,  1223,     0,     0,     0,     0,     0,
+       0,     0,     0,    58,  1223,     0,  1223,     0,     0,     0,
+       0,    59,     0,    60,    61,    62,    63,    64,  1223,     0,
+      65,    66,  1486,     0,  1223,  1223,  1223,    71,     0,  1238,
+       0,     0,     0,     0,     0,     0,     0,  1271,     0,     0,
+    1275,  1276,     0,  1279,     0,     0,  1285,     0,  1287,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1342,     0,     0,
+       0,  1223,     0,     0,     0,  1350,     0,     0,     0,     0,
+       0,     0,  1362,     0,  1223,  1367,  1368,     0,     0,     0,
+    1370,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1443,     0,     0,     0,     0,     0,     0,  1191,     0,   953,
+       0,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1402,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1191,     0,     0,     0,     0,     0,
+    1464,     0,  1468,     0,     0,  1470,     0,  1472,     0,     0,
+    1476,     0,   743,     0,   743,     0,     0,     0,   743,     0,
+     743,     0,     0,   743,   953,     0,     0,   743,     0,     0,
+       0,     0,  2371,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1443,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1141,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1563,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1191,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
-       0,     0,     0,     0,     0,     0,     0,     0,  1443,     0,
-       0,     0,  1824,     0,  1826,     0,     0,     0,  1828,     0,
-       0,     0,     0,     0,     0,     0,  1442,     0,  1443,     0,
-       0,     0,     0,     0,     0,     0,     0,  1443,  1866,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1141,     0,     0,     0,     0,
+       0,     0,     0,     0,  2230,     0,  1223,     0,     0,     0,
+       0,  3176,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2508,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1443,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1442,  1223,  1223,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1826,     0,  1828,
+       0,     0,     0,  1830,     0,     0,     0,     0,     0,     0,
+       0,  1443,  1223,  1223,     0,   699,     0,     0,     0,     0,
+       0,     0,     0,  1868,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1996,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2009,     0,     0,     0,     0,     0,  1443,     0,
-       0,     0,     0,     0,  2020,     0,  2021,     0,     0,     0,
-       0,     0,     0,     0,  2024,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2039,     0,     0,  2043,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2088,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   699,
+       0,     0,     0,   699,     0,     0,     0,     0,     0,  3252,
+       0,  1808,  1998,     0,   743,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1223,     0,  2011,     0,
+       0,     0,     0,     0,     0,     0,     0,  1223,     0,     0,
+    2022,     0,  2023,     0,     0,     0,     0,     0,     0,     0,
+    2026,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     699,     0,  2041,     0,     0,  2045,     0,  1223,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1223,  1223,     0,
+    1443,     0,     0,     0,  1223,  1223,     0,     0,     0,  1223,
+    1443,     0,     0,     0,  1223,     0,     0,  1223,  1223,  2090,
+       0,     0,  1223,     0,     0,     0,     0,     0,  1223,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1223,     0,     0,     0,
     1223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1223,  1223,     0,  1442,     0,     0,     0,  1223,  1223,     0,
-       0,     0,  1223,  1442,     0,     0,     0,  1223,     0,     0,
-    1223,  1223,     0,     0,     0,  1223,     0,     0,     0,     0,
-       0,  1223,     0,     0,     0,     0,     0,     0,     0,  1443,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
+       0,     0,  1223,     0,     0,     0,     0,  1223,     0,     0,
        0,     0,     0,  1223,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
-    1223,     0,     0,     0,     0,     0,  1223,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1223,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1223,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1223,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2251,     0,     0,     0,     0,
-       0,  1442,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1223,     0,     0,     0,     0,     0,     0,   699,     0,     0,
+       0,     0,     0,     0,     0,   699,     0,   699,  1443,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1442,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1442,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1443,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2253,     0,     0,     0,     0,     0,  1443,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1223,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1442,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
+       0,  1443,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2534,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1223,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1223,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1141,  2430,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1442,     0,  1442,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  2534,
-       0,     0,     0,     0,     0,     0,     0,     0,  2501,     0,
-       0,  2501,     0,     0,     0,     0,  1223,     0,     0,  2508,
-    1442,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
-       0,     0,  1443,     0,     0,     0,     0,  2517,     0,     0,
-       0,     0,  1223,  1223,     0,     0,  1223,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1223,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
-    1223,     0,     0,  1223,  1223,     0,     0,     0,     0,     0,
-       0,  1223,  1223,     0,  2606,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1223,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1443,     0,     0,     0,  1223,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1443,     0,
-       0,     0,     0,     0,     0,     0,  2534,     0,     0,     0,
-       0,     0,  2688,     0,     0,     0,     0,  1443,     0,     0,
-    1442,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1443,     0,  1443,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1443,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1223,     0,  1443,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1443,     0,     0,     0,   699,
-       0,     0,     0,     0,   743,     0,   743,  1443,     0,     0,
-       0,     0,     0,     0,     0,     0,   743,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  2805,     0,
-       0,     0,  1223,     0,  1442,     0,     0,     0,     0,     0,
-       0,   743,     0,     0,     0,     0,     0,  1443,     0,     0,
-    1443,   743,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   743,   743,  1223,  1442,   743,  1223,     0,  1223,
-       0,     0,   743,     0,     0,     0,  1040,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1141,  2432,     0,     0,
+       0,     0,   743,  2230,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1223,     0,     0,     0,  1443,     0,   699,
+       0,     0,  1223,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
+    1223,     0,     0,  1223,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2504,     0,  1223,  2504,     0,
+       0,     0,  1223,     0,     0,     0,  2511,  1223,     0,     0,
+    1223,  1223,     0,     0,     0,     0,     0,     0,  1223,  1223,
+       0,     0,     0,     0,  2520,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1223,     0,     0,     0,  1223,  1040,     0,
-       0,     0,     0,  1442,     0,     0,     0,     0,  1223,     0,
-       0,     0,     0,   743,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  2902,     0,
     1223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2916,     0,     0,  2919,     0,  2921,     0,  2922,
-       0,     0,     0,     0,     0,  2924,     0,     0,     0,     0,
-    1442,     0,     0,     0,  1442,  1442,     0,     0,     0,  1223,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1223,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1443,
-       0,     0,     0,     0,     0,     0,  2953,     0,     0,     0,
-    1223,     0,     0,     0,     0,     0,     0,     0,  2430,     0,
-       0,     0,  2430,     0,  2430,     0,     0,  2430,     0,     0,
-    1223,     0,     0,     0,     0,     0,     0,     0,     0,  3168,
+       0,  2609,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1443,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1223,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1442,  1442,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1223,     0,     0,  1223,     0,     0,     0,
-       0,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
-    1223,     0,  1223,     0,  1223,     0,     0,     0,     0,     0,
-       0,  1223,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2691,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   743,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3169,
+       0,     0,     0,     0,     0,     0,     0,     0,  1223,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2508,     0,     0,     0,     0,   699,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3258,
-       0,  1223,  1223,  2534,  3264,     0,     0,     0,     0,     0,
-       0,     0,  1223,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
+       0,  1443,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1223,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1223,  1443,     0,  1223,     0,  1223,     0,     0,     0,
+       0,     0,     0,     0,     0,  2811,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1443,  1223,     0,     0,
-       0,     0,     0,  1223,  1223,     0,  1223,     0,  1443,     0,
+    1223,     0,     0,     0,  1223,     0,     0,     0,     0,     0,
+    1443,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1191,     0,     0,     0,  1223,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1223,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1443,     0,     0,     0,     0,
-       0,  3273,  3274,     0,     0,     0,  3277,  3278,     0,     0,
-       0,  3281,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  3292,     0,     0,     0,     0,
-       0,     0,  3301,     0,     0,     0,  3304,  3305,     0,     0,
-    3308,  3309,     0,     0,     0,   743,     0,  3314,     0,     0,
-       0,     0,     0,     0,  1223,  1223,     0,     0,     0,  3330,
-       0,  3332,     0,     0,     0,     0,     0,     0,  1223,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3355,     0,
-    1223,  1223,     0,  3357,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   743,   743,     0,  3362,     0,     0,     0,
-       0,     0,     0,     0,  3367,     0,  3369,     0,  3371,  3374,
-    3376,     0,     0,     0,     0,  3384,  3387,     0,     0,     0,
-       0,     0,     0,     0,     0,  3400,     0,     0,     0,     0,
-    3409,     0,     0,     0,     0,  3413,     0,     0,     0,     0,
-       0,   743,     0,     0,     0,     0,     0,     0,     0,  1443,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3446,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    3453,     0,  3455,     0,     0,     0,     0,  3458,     0,     0,
-       0,  3459,     0,  3463,  3464,  3465,  3466,     0,  3468,     0,
+       0,     0,     0,     0,     0,     0,     0,  1443,     0,     0,
+       0,  1443,  1443,     0,     0,     0,  1223,     0,     0,     0,
+       0,     0,     0,     0,     0,  2908,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2922,
+       0,     0,  2925,     0,  2927,     0,  2928,     0,     0,     0,
+       0,     0,  2930,     0,     0,     0,     0,  1223,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  3492,  3493,  3494,     0,     0,     0,     0,     0,     0,
-       0,  3502,  3503,     0,     0,     0,     0,     0,     0,  2534,
+       0,     0,     0,     0,     0,     0,     0,  1223,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1443,  1443,     0,
+       0,     0,     0,  2959,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2432,     0,     0,     0,  2432,
+    1223,  2432,     0,  1223,  2432,     0,     0,     0,     0,     0,
+       0,     0,  1223,     0,     0,     0,     0,  1223,     0,  1223,
+       0,  1223,     0,     0,     0,     0,     0,     0,  1223,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1223,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  3545,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   699,     0,     0,     0,     0,   699,
+       0,     0,     0,     0,     0,     0,     0,  1223,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  3175,     0,  1223,  1223,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1223,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   743,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1389,
-     743,     0,   743,     0,     0,     0,     0,     0,  1443,     0,
+       0,     0,     0,     0,  1223,     0,     0,     0,     0,     0,
+    1223,  1223,     0,  1223,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1443,
+       0,     0,  1223,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1443,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   743,     0,     0,   743,   743,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   699,     0,  1040,     0,  1040,  1191,     0,     0,     0,
-       0,   699,     0,     0,     0,   743,     0,     0,     0,  2430,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1040,  1040,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   699,  1191,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3709,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  3279,
+    3280,  1223,  1223,     0,  3283,  3284,     0,     0,     0,  3287,
+       0,     0,     0,     0,     0,  1223,     0,     0,     0,     0,
+       0,     0,     0,  3298,     0,     0,     0,  1223,  1223,     0,
+    3307,     0,     0,     0,  3310,  3311,     0,     0,  3314,  3315,
+       0,     0,     0,     0,     0,  3320,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  3336,     0,  3338,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  3361,     0,     0,     0,
+       0,  3363,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  3368,     0,     0,     0,     0,     0,
+       0,     0,  3373,     0,  3375,     0,  3377,  3380,  3382,     0,
+       0,     0,     0,  3390,  3393,     0,     0,     0,     0,     0,
+       0,     0,     0,  3406,     0,     0,     0,     0,  3415,     0,
+       0,     0,     0,  3419,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  3452,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  3459,
+       0,  3461,  3252,     0,     0,     0,  3464,     0,     0,     0,
+    3465,     0,  3469,  3470,  3471,  3472,     0,  3474,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3498,  3499,  3500,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  3508,  3509,     0,     0,     0,     0,     0,     0,
+       0,    86,    87,    88,     0,    90,    91,    92,     0,     0,
+       0,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+       0,   104,   105,     0,     0,     0,   107,   108,   109,   110,
+       0,   111,   112,   113,   114,     0,   115,   116,   117,     0,
+       0,     0,     0,     0,   120,   121,  3551,     0,     0,     0,
+     122,     0,     0,     0,     0,     0,     0,     0,   699,   123,
+       0,   124,     0,   125,     0,    35,     0,     0,     0,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   699,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   743,     0,   743,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3168,  3168,  3168,     0,     0,     0,
+       0,     0,     0,   132,     0,     0,     0,   134,   135,   136,
+     137,   138,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   139,     0,     0,     0,     0,     0,     0,
+     143,     0,   144,     0,     0,     0,     0,     0,   147,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     150,     0,     0,     0,     0,     0,     0,   151,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   154,   155,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1228,     0,     0,     0,     0,     0,  1191,     0,     0,
+    1228,     0,     0,     0,   161,     0,     0,     0,     0,     0,
+    2432,     0,   163,     0,     0,     0,   165,     0,     0,     0,
+       0,     0,   167,     0,     0,     0,     0,     0,   168,     0,
+     169,     0,     0,     0,     0,  1228,   171,     0,   172,     0,
+       0,     0,     0,     0,     0,  3715,   173,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     175,   176,     0,     0,     0,     0,     0,   177,     0,   178,
+       0,     0,   179,   180,     0,   181,     0,     0,     0,     0,
+       0,     0,     0,     0,   182,   183,     0,   184,     0,     0,
+       0,     0,     0,  1228,     0,     0,     0,     0,     0,  1446,
+       0,     0,     0,  1228,     0,   699,     0,     0,     0,   189,
+     190,   191,     0,     0,   192,     0,     0,     0,   194,     0,
+    1446,   195,     0,   196,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   197,   198,     0,
+     199,   200,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   201,     0,   202,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   204,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   211,     0,     0,
+       0,   213,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   218,
+       0,     0,   220,     0,     0,   221,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1228,  1228,     0,     0,   223,
+       0,     0,     0,     0,     0,   225,     0,     0,  3898,     0,
+       0,     0,   226,   227,     0,     0,     0,     0,   228,     0,
+     229,     0,     0,     0,     0,     0,     0,     0,     0,   232,
+       0,  2508,  1228,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   236,     0,     0,   237,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3945,  3946,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  3244,     0,
+       0,  2432,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   699,     0,     0,
+       0,     0,     0,     0,     0,     0,  3967,     0,     0,     0,
+       0,     0,     0,     0,     0,  3971,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  3983,  3985,     0,     0,     0,  3985,     0,     0,     0,
+       0,  3996,  3997,  3998,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  4019,  4020,  4021,  4022,     0,     0,     0,     0,
+       0,     0,     0,  1228,     0,     0,     0,     0,     0,     0,
+    1446,     0,   699,     0,  1228,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  4039,
+    1446,  4043,  4044,  4045,     0,     0,     0,     0,     0,  1446,
+       0,  4058,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   699,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   699,   699,     0,
-       0,  1806,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1228,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2534,     0,     0,  3264,     0,  3264,     0,     0,
-       0,     0,  2534,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   699,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3892,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1443,     0,     0,     0,     0,     0,     0,
+    4105,     0,     0,     0,     0,     0,     0,     0,  4109,     0,
+    1446,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  4121,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1443,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2534,     0,     0,     0,     0,     0,
+    4162,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  3939,  3940,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2430,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1228,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  4199,     0,     0,     0,  4203,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  3961,     0,     0,     0,  1443,
-       0,  1443,     0,     0,  3965,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   743,     0,
+       0,     0,     0,     0,     0,     0,     0,  4241,     0,     0,
+       0,     0,     0,   953,     0,     0,     0,     0,     0,     0,
+       0,  1446,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  4262,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  4272,
+     699,     0,  1228,  4274,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2432,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    3977,  3979,     0,     0,     0,  3979,     0,     0,     0,     0,
-    3990,  3991,  3992,     0,     0,     0,     0,     0,     0,     0,
+    1228,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1228,  1228,
+    1228,     0,  1228,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1443,  4013,  4014,  4015,  4016,     0,     0,     0,     0,     0,
+       0,     0,  1228,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1443,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  4033,     0,
-    4037,  4038,  4039,     0,     0,     0,     0,     0,     0,     0,
-    4052,  3264,     0,     0,   699,     0,  3264,     0,     0,   743,
-       0,   743,     0,     0,   743,     0,   743,     0,     0,   743,
-     743,   743,     0,     0,     0,  2228,     0,     0,     0,     0,
-       0,     0,   743,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   743,     0,   743,     0,
-       0,     0,     0,   743,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1443,     0,     0,  1432,     0,  4099,
-       0,     0,     0,     0,     0,     0,     0,  4103,     0,     0,
-       0,     0,  3264,     0,     0,     0,     0,     0,  1432,     0,
-       0,     0,     0,     0,     0,     0,  4115,  1443,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  4156,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1228,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  4193,     0,     0,     0,  4197,     0,     0,
-       0,     0,     0,     0,     0,     0,  2369,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   743,   743,     0,
-       0,     0,     0,     0,     0,     0,  4235,     0,  1443,     0,
-       0,     0,   953,     0,   699,     0,     0,     0,     0,   699,
-     699,     0,     0,     0,     0,     0,     0,     0,     0,  1443,
-       0,     0,     0,     0,  4256,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  4266,     0,
-       0,     0,  4268,     0,  1443,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2430,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1228,     0,     0,     0,  1228,
+    1228,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1228,     0,     0,     0,     0,     0,     0,     0,  1443,  1228,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   743,     0,   699,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2505,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1228,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  3168,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1228,     0,     0,     0,   699,     0,  1445,     0,
-       0,     0,  1228,     0,   699,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1445,
-    2534,     0,     0,     0,     0,     0,     0,  1432,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1446,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1432,     0,     0,
-       0,     0,     0,     0,     0,     0,  1432,     0,     0,     0,
-       0,     0,     0,   699,     0,     0,   699,   699,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    4497,     0,  4498,     0,     0,     0,     0,     0,     0,  4500,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  3264,     0,     0,     0,     0,
-       0,     0,     0,     0,  1228,  1228,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   699,     0,  1432,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  4491,
-       0,  4492,     0,     0,     0,     0,     0,     0,  4494,     0,
-       0,  1228,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  4504,     0,     0,     0,     0,
+       0,     0,  1446,     0,     0,     0,  4510,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    4512,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  4523,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  4527,
+       0,  4518,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   699,  4529,     0,     0,  1446,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    4533,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  4556,     0,     0,     0,
-       0,     0,     0,  1443,     0,     0,     0,  4564,  4565,  4566,
-       0,     0,  4569,  4570,  4571,  4572,  4573,  4574,  1432,     0,
-       0,     0,  4581,  4582,     0,  4584,  4585,  4586,  4587,  4588,
-    4589,  4590,     0,     0,     0,     0,     0,     0,     0,     0,
-    4598,     0,  4600,  4601,     0,     0,     0,     0,     0,     0,
-       0,  2534,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  4562,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  4570,  4571,
+    4572,     0,     0,  4575,  4576,  4577,  4578,  4579,  4580,     0,
+       0,     0,     0,  4587,  4588,     0,  4590,  4591,  4592,  4593,
+    4594,  4595,  4596,     0,     0,     0,  1446,     0,     0,     0,
+       0,  4604,     0,  4606,  4607,     0,     0,     0,     0,     0,
+       0,  1446,     0,     0,     0,     0,     0,     0,     0,  1446,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   743,     0,
-     743,  1228,  4633,     0,   743,     0,   743,     0,  1445,   743,
-       0,     0,  1228,   743,     0,     0,     0,     0,  2369,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1445,     0,
-       0,     0,     0,     0,     0,     0,     0,  1445,     0,     0,
+    1446,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  4639,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1446,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1228,     0,     0,     0,     0,
+    1228,     0,     0,     0,     0,     0,  1446,     0,     0,     0,
+       0,     0,  1228,     0,     0,     0,     0,     0,  1446,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3979,     0,
+    1446,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1228,     0,     0,     0,  3985,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1443,     0,     0,     0,     0,     0,     0,     0,  1445,     0,
-    1443,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2430,  2430,  2430,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  4729,     0,     0,     0,
-    2228,     0,     0,     0,     0,     0,     0,  3170,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2505,     0,     0,
-       0,     0,  3168,     0,     0,     0,     0,  3168,     0,     0,
-       0,     0,     0,  3168,     0,     0,     0,     0,     0,     0,
-       0,  1228,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1432,     0,     0,     0,     0,
+    1446,     0,     0,  1446,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2432,  2432,  2432,     0,     0,
+       0,     0,     0,     0,     0,     0,  1433,  4735,     0,     0,
+       0,  1658,  1658,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1433,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   699,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1443,  1445,
+       0,     0,     0,     0,     0,     0,     0,  1228,  1735,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1443,  1432,     0,
-    1228,     0,     0,     0,   699,     0,     0,     0,   699,     0,
-       0,     0,     0,     0,  3246,     0,  1806,  1443,     0,   743,
-       0,     0,     0,     0,     0,     0,     0,     0,  1228,     0,
-       0,  1432,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1228,  1228,  1228,     0,
-    1228,     0,     0,     0,     0,   699,     0,     0,     0,     0,
-       0,  1443,     0,     0,     0,     0,     0,     0,     0,     0,
-    1228,     0,     0,  4866,     0,     0,     0,  4867,  4868,  4869,
-    4870,     0,     0,  4872,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1228,  1228,     0,     0,     0,     0,
+    1228,  1228,     0,     0,     0,     0,     0,  1228,  1228,  1228,
+       0,     0,     0,  1228,     0,  1228,  1228,  1228,  1228,  1228,
+    1228,     0,  1228,     0,  1228,  1228,     0,     0,  1228,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1446,  1228,  1228,  1228,  1228,     0,     0,     0,
+       0,  1228,     0,     0,     0,  1228,     0,     0,  1228,     0,
+       0,  1228,  1228,  1228,  1228,  1228,  1228,  1228,  1228,  1228,
+       0,  1228,     0,     0,     0,     0,     0,     0,     0,  1228,
+       0,     0,  1228,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1432,     0,     0,  4885,  4886,  4887,  4888,     0,
-    4890,  4891,     0,     0,     0,     0,     0,  1432,     0,     0,
-       0,     0,  4900,  4901,  1228,  1432,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1432,     0,     0,     0,
-    4906,     0,     0,     0,     0,     0,     0,  2430,  2430,     0,
-    2430,     0,     0,  1228,     0,     0,     0,  1228,  1228,     0,
-    4999,     0,  1443,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1432,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   699,  1432,     0,     0,     0,     0,     0,     0,   699,
-       0,   699,     0,     0,  1432,     0,     0,  1443,     0,     0,
-       0,     0,     0,     0,     0,     0,  1432,     0,     0,     0,
-       0,     0,     0,  4970,     0,     0,  1445,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  4988,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1432,     0,     0,  1432,
+       0,     0,     0,     0,  4872,     0,     0,     0,  4873,  4874,
+    4875,  4876,     0,     0,  4878,  1228,     0,     0,     0,     0,
+       0,     0,  1435,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  4891,  4892,  4893,  4894,
+       0,  4896,  4897,  1435,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  4906,  4907,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  4912,     0,     0,     0,     0,     0,     0,  2432,  2432,
+       0,  2432,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  5015,     0,     0,     0,     0,     0,  1445,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1446,     0,     0,     0,  1446,  1446,     0,
+       0,     0,     0,     0,     0,     0,     0,  1433,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1433,     0,     0,
+       0,     0,     0,     0,     0,     0,  1433,     0,     0,     0,
+       0,     0,     0,     0,  4976,  1228,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1228,     0,     0,     0,
+    1446,     0,     0,  1228,     0,  4994,     0,     0,     0,     0,
+       0,     0,  1446,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1445,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3264,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2430,     0,     0,
+       0,     0,     0,     0,  5021,     0,     0,     0,     0,  1446,
+       0,     0,     0,     0,     0,     0,     0,  1433,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2430,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1445,     0,     0,     0,     0,  1432,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1445,     0,
-       0,     0,     0,     0,     0,     0,  1445,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1445,     0,     0,
-       0,     0,     0,     0,   743,  2228,  5120,     0,     0,     0,
-       0,  3264,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   699,     0,     0,  5129,     0,     0,     0,     0,  5134,
-    5135,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1443,     0,  1445,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1228,     0,     0,
-       0,     0,     0,  1445,     0,     0,     0,     0,     0,  1228,
-       0,     0,     0,     0,     0,  1445,     0,     0,     0,     0,
-    1443,     0,     0,     0,     0,  5184,     0,  1445,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1228,     0,     0,     0,     0,     0,  1657,  1657,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1445,     0,  3979,
-    1445,     0,     0,     0,     0,     0,     0,  1443,     0,  5225,
-       0,  1443,  1443,     0,     0,  1734,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1432,     0,
-       0,     0,  1432,  1432,  2430,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2430,     0,     0,     0,     0,
-       0,     0,     0,     0,  1228,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  2282,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    5261,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2505,     0,  4999,  1443,     0,
-     699,  1228,  1228,     0,  5278,  1432,     0,  1228,  1228,     0,
-       0,     0,     0,  5285,  1228,  1228,  1228,  1432,     0,     0,
-    1228,     0,  1228,  1228,  1228,  1228,  1228,  1228,     0,  1228,
-       0,  1228,  1228,     0,  2430,  1228,     0,     0,     0,     0,
-    1434,     0,     0,     0,     0,     0,     0,     0,     0,  1445,
-    1228,  1228,  1228,  1228,  1432,     0,     0,     0,  1228,     0,
-       0,  1434,  1228,     0,     0,  1228,     0,     0,  1228,  1228,
-    1228,  1228,  1228,  1228,  1228,  1228,  1228,     0,  1228,     0,
-       0,     0,     0,     0,     0,     0,  1228,     0,     0,  1228,
+       0,     0,     0,     0,     0,     0,     0,     0,  2432,     0,
+       0,     0,     0,     0,     0,     0,  2296,     0,     0,     0,
+       0,     0,     0,  2432,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2314,  2315,  2316,     0,  2319,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  3979,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  2361,     0,
+       0,     0,     0,  1435,     0,     0,     0,     0,  1433,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2430,     0,     0,     0,
+       0,     0,     0,  1435,     0,  1228,  1446,  5126,     0,     0,
+       0,     0,  1435,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  5135,     0,     0,     0,     0,
+    5140,  5141,  2416,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1228,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  5391,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  5403,     0,     0,     0,
+       0,  2439,     0,     0,     0,  2451,  2454,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1446,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  5190,     0,     0,     0,
+       0,     0,  1228,  1435,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1432,     0,
-       0,  5414,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1445,
-       0,     0,     0,  1445,  1445,     0,     0,     0,     0,     0,
+    3985,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    5231,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1228,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1432,     0,
-       0,     0,     0,     0,     0,  5462,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2432,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2432,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1446,     0,     0,     0,     0,
+       0,  5267,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1228,  1435,     0,  1446,     0,     0,  1228,
+       0,     0,     0,     0,     0,  5284,     0,  1446,     0,     0,
+       0,     0,     0,     0,  5291,     0,  1228,     0,     0,     0,
        0,  1228,     0,     0,     0,     0,     0,     0,     0,     0,
-    5477,     0,  1228,     0,     0,     0,  1445,     0,     0,  1228,
-       0,     0,     0,     0,     0,     0,     0,     0,  1445,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2432,  1433,     0,     0,     0,
+       0,     0,     0,     0,  1228,  1228,  1228,     0,     0,  1228,
+       0,     0,     0,     0,     0,     0,     0,  1228,  1228,  1228,
+    1228,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1228,     0,     0,  1228,     0,  1228,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1228,  1228,     0,     0,
+    1228,     0,     0,     0,     0,     0,     0,     0,     0,  1433,
+       0,     0,     0,     0,  1228,     0,  1228,     0,  1228,     0,
+       0,     0,     0,  3985,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1228,     0,
+       0,     0,  1433,     0,     0,     0,     0,  2432,     0,  1228,
+       0,  1228,  1228,  1228,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   699,     0,     0,     0,
-       0,   699,     0,     0,  2280,  1445,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1228,     0,     0,     0,
+       0,     0,  5397,     0,     0,     0,     0,     0,     0,  1228,
+       0,     0,     0,     0,  1228,     0,     0,  5409,     0,     0,
+    1228,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1228,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  5420,  1433,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1433,     0,
+       0,     0,     0,     0,     0,     0,  1433,     0,     0,  1446,
+       0,     0,  1446,     0,  1446,     0,     0,  1433,     0,  1446,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1435,  1228,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  5468,     0,     0,     0,
+       0,     0,     0,     0,  1433,     0,     0,     0,     0,     0,
+    1446,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  5483,     0,  1433,     0,     0,     0,  1446,     0,     0,
+       0,     0,     0,     0,     0,  1433,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1435,     0,  1433,     0,     0,
+       0,  1446,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  3043,     0,  1435,     0,
+       0,     0,     0,     0,     0,     0,     0,  1433,     0,  3063,
+    1433,  3065,     0,     0,  3077,  3080,  3085,     0,     0,     0,
+       0,  3091,     0,     0,  3096,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1446,     0,  1446,  3103,
+    3104,  3105,  3106,     0,     0,     0,     0,  3113,     0,     0,
+       0,  3125,     0,     0,  3127,     0,     0,  3134,  3135,  3136,
+    3137,  3138,  3139,  3140,  3141,  3142,     0,  3143,     0,     0,
+       0,     0,     0,     0,     0,  1658,     0,     0,  3171,  1435,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1434,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2294,     0,     0,     0,     0,     0,     0,     0,
-    1434,     0,     0,     0,     0,     0,     0,  1432,     0,  1434,
+       0,     0,     0,     0,  1435,     0,     0,  1446,     0,     0,
+       0,     0,  1435,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1435,     0,     0,     0,     0,     0,     0,
+       0,     0,  1446,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2312,  2313,  2314,     0,  2317,     0,     0,     0,  1432,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1432,
-       0,     0,     0,     0,  2359,     0,     0,     0,     0,     0,
-     743,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1735,     0,     0,     0,     0,     0,     0,  1446,     0,
+       0,     0,     0,  1446,     0,     0,     0,     0,     0,  1433,
+    1435,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1435,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1435,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1435,     0,     0,     0,     0,     0,     0,
+       0,  1446,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1446,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1435,  1446,     0,  1435,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1434,     0,     0,     0,     0,     0,     0,     0,  2414,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1228,  1445,
-       0,     0,     0,     0,     0,     0,     0,  2437,     0,     0,
-       0,  2449,  2452,     0,     0,     0,     0,     0,     0,     0,
-     699,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  3312,     0,     0,     0,     0,     0,  1228,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1445,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1228,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1434,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1228,     0,     0,  1446,     0,     0,     0,     0,
+       0,  1228,     0,     0,     0,     0,     0,  1228,     0,  1228,
+    1433,     0,  1228,     0,  1433,  1433,  1446,  1228,  1228,  1228,
+    1228,     0,     0,  1228,  1228,  1228,  1228,  1228,  1228,  1228,
+    1228,  1228,  1228,     0,     0,     0,  1228,  1228,     0,     0,
+       0,  1446,     0,     0,     0,  1435,  1228,     0,     0,     0,
+    1228,     0,     0,     0,  1228,     0,     0,     0,     0,     0,
+       0,     0,  1228,     0,     0,  1228,     0,  1228,     0,     0,
+       0,     0,     0,     0,     0,  1446,  1228,  1433,     0,  1228,
+    1228,     0,     0,     0,  1228,  1228,     0,     0,     0,  1433,
+       0,  1228,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1228,     0,  1228,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1228,     0,     0,     0,     0,
+       0,  1228,  1228,  1228,     0,     0,  1433,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1228,     0,     0,     0,     0,     0,     0,
-       0,  1432,     0,     0,  1432,     0,  1432,     0,     0,     0,
-       0,  1432,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  3543,     0,     0,     0,     0,     0,     0,  1228,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1445,     0,
+       0,  1228,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1446,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1432,     0,     0,     0,  1228,     0,     0,  1445,
-       0,     0,  1228,     0,  3246,     0,     0,     0,     0,  1432,
-    1445,     0,     0,     0,     0,     0,     0,     0,     0,  1228,
-       0,     0,     0,     0,  1228,     0,     0,     0,     0,     0,
-       0,     0,     0,  1432,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1228,  1228,  1228,
        0,     0,  1228,     0,     0,     0,     0,     0,     0,     0,
-    1228,  1228,  1228,  1228,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1228,     0,     0,  1228,     0,  1228,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1228,
-    1228,     0,     0,  1228,     0,     0,     0,     0,  1432,     0,
-    1432,     0,     0,     0,     0,     0,     0,  1228,     0,  1228,
-     699,  1228,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1228,     0,     0,     0,     0,     0,     0,   699,     0,
-       0,     0,  1228,     0,  1228,  1228,  1228,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1434,  1432,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1228,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1228,     0,  1432,     0,     0,  1228,     0,     0,
-       0,     0,     0,  1228,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1228,     0,     0,     0,     0,     0,     0,
-    1432,     0,     0,     0,     0,  1432,     0,     0,     0,     0,
-       0,  1434,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1445,     0,     0,  1445,     0,  1445,     0,     0,
-       0,     0,  1445,     0,  1434,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1435,     0,     0,     0,
+    1435,  1435,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1432,     0,     0,  1228,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1432,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1445,     0,     0,  1432,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1445,  3037,     0,     0,  1435,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3057,  1434,  3059,     0,     0,  3071,
-    3074,  3079,     0,     0,  1445,  1435,  3085,     0,     0,  3090,
-    1434,     0,     0,     0,     0,     0,     0,   699,  1434,     0,
-       0,     0,     0,     0,  3097,  3098,  3099,  3100,     0,  1434,
-       0,     0,  3107,     0,     0,     0,  3119,     0,     0,  3121,
-       0,     0,  3128,  3129,  3130,  3131,  3132,  3133,  3134,  3135,
-    3136,     0,  3137,     0,     0,     0,     0,     0,     0,     0,
-    1657,     0,     0,  3165,     0,     0,     0,  1432,     0,  1445,
-       0,  1445,     0,     0,     0,     0,  1434,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1432,     0,
-       0,     0,     0,     0,     0,  1434,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1434,     0,     0,
-       0,     0,     0,  1432,     0,     0,     0,     0,     0,  1434,
-       0,     0,     0,     0,     0,     0,  1734,     0,     0,     0,
-    1445,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1432,     0,     0,
-       0,     0,     0,     0,     0,  1445,     0,     0,     0,  1434,
-       0,     0,  1434,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2505,     0,     0,     0,     0,     0,     0,
-       0,  1445,     0,     0,     0,     0,  1445,     0,     0,     0,
+       0,     0,     0,  1433,     0,     0,     0,     0,     0,     0,
+       0,     0,  1446,     0,     0,     0,     0,     0,     0,     0,
+       0,  1436,     0,     0,     0,     0,  3680,     0,     0,     0,
+       0,     0,     0,  1435,     0,     0,     0,     0,     0,     0,
+       0,     0,  1436,     0,     0,  1435,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1433,     0,     0,     0,     0,     0,     0,
+       0,     0,  1435,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1438,
+       0,     0,  3735,  1228,     0,     0,     0,  3741,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1445,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   699,
-       0,     0,  1445,     0,     0,     0,     0,     0,     0,  1432,
-       0,     0,     0,     0,     0,  3306,     0,  1445,     0,     0,
+    1438,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1446,     0,  2319,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3085,     0,  3085,  3085,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  3799,     0,     0,  3802,
+       0,  3804,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1446,  1228,
+    1228,     0,  1433,     0,     0,     0,     0,     0,     0,     0,
+    3822,     0,  3825,     0,  3827,     0,     0,     0,     0,     0,
+       0,     0,     0,  1433,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1433,     0,     0,     0,     0,  1435,
+       0,     0,     0,     0,     0,     0,     0,  3171,  3171,  3171,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  3895,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1228,     0,  2439,     0,     0,     0,     0,
+    3906,     0,     0,     0,  1228,     0,  2454,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1435,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1434,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1435,     0,     0,     0,     0,     0,
-    1228,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1435,     0,     0,     0,     0,     0,
-       0,     0,     0,  1435,   699,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1432,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1228,     0,     0,  1445,     0,
        0,     0,     0,     0,  1228,     0,     0,     0,     0,     0,
-    1228,     0,  1228,     0,     0,  1228,     0,     0,     0,  1445,
-    1228,  1228,  1228,  1228,     0,     0,  1228,  1228,  1228,  1228,
-    1228,  1228,  1228,  1228,  1228,  1228,     0,     0,     0,  1228,
-    1228,     0,     0,     0,  1445,     0,     0,     0,     0,  1228,
-       0,     0,     0,  1228,  1435,     0,     0,  1228,     0,     0,
-       0,     0,     0,     0,     0,  1228,     0,     0,  1228,     0,
-    1228,     0,     0,     0,     0,     0,     0,     0,  1445,  1228,
-       0,     0,  1228,  1228,     0,     0,     0,  1228,  1228,     0,
+       0,     0,     0,     0,  1228,  1228,     0,  1446,     0,     0,
+       0,  1228,  1228,     0,     0,     0,  1228,  1446,     0,     0,
+       0,  1228,     0,     0,  1228,  1228,     0,     0,     0,  1228,
+       0,     0,  1436,     0,     0,  1228,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  3953,
+       0,     0,  1436,  1228,     0,     0,     0,  1228,     0,     0,
+       0,  1436,     0,     0,     0,     0,     0,     0,     0,  1228,
        0,     0,     0,     0,  1228,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1228,     0,  1228,     0,     0,     0,
-       0,     0,  3537,     0,     0,     0,     0,     0,  1228,     0,
-       0,     0,  1432,     0,  1228,  1228,  1228,     0,     0,     0,
-       0,  1434,     0,     0,     0,  1434,  1434,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1437,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1432,  1228,     0,     0,     0,  1437,     0,     0,     0,     0,
-       0,     0,     0,     0,  1228,  1435,     0,     0,     0,     0,
-     743,     0,     0,     0,     0,     0,     0,     0,  1434,     0,
-    1445,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1434,     0,     0,     0,     0,  1228,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   699,     0,     0,     0,     0,  1434,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3674,     0,     0,
+    1228,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1228,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1435,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1228,     0,  1435,
+    1438,     0,     0,     0,     0,     0,  1433,     0,     0,  1433,
+    1435,  1433,  1436,     0,     0,  1446,  1433,     0,  1439,     0,
+    1438,     0,     0,     0,     0,     0,     0,     0,     0,  1438,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1439,
+       0,     0,     0,     0,  1446,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1446,     0,     0,  1433,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1228,
+       0,     0,     0,     0,  1433,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1445,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1432,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1432,
+       0,     0,     0,     0,     0,     0,     0,     0,  1433,     0,
+    1438,     0,     0,     0,     0,     0,     0,     0,  1446,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1436,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1228,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1228,     0,     0,     0,     0,     0,
+       0,     0,     0,  1433,     0,  1433,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  3729,     0,     0,     0,     0,  3735,     0,
-       0,     0,     0,  1438,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2317,  1438,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3079,     0,  3079,  3079,     0,     0,
-       0,  1434,     0,     0,     0,     0,  1228,  3793,     0,     0,
-    3796,     0,  3798,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1445,     0,     0,     0,     0,     0,     0,
-       0,  3816,     0,  3819,     0,  3821,     0,  1432,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1446,     0,  1446,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1435,     0,     0,     0,     0,     0,     0,     0,
-       0,  1434,     0,     0,     0,     0,  1432,     0,  3165,  3165,
-    3165,  1445,  1228,  1228,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1437,     0,  1432,     0,     0,     0,
-       0,     0,     0,  3889,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1437,     0,  2437,     0,     0,     0,
-       0,  3900,     0,  1437,     0,  1435,     0,  2452,     0,     0,
+       0,     0,     0,     0,  1433,     0,     0,     0,     0,     0,
+       0,  1438,  1435,     0,     0,  1435,     0,  1435,     0,     0,
+       0,     0,  1435,     0,     0,     0,     0,     0,     0,  1433,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1228,     0,     0,     0,  1446,     0,     0,     0,     0,  1228,
+       0,     0,     0,     0,     0,  1433,     0,     0,     0,     0,
+    1433,     0,     0,     0,     0,     0,  1228,  1228,     0,     0,
+    1228,     0,     0,  1435,     0,     0,     0,     0,     0,     0,
+    1441,     0,     0,     0,  1228,     0,     0,     0,     0,  1228,
+    1435,     0,     0,     0,  1228,     0,     0,  1228,  1228,     0,
+       0,  1441,     0,     0,     0,  1228,  1228,     0,     0,     0,
+       0,     0,     0,     0,  1435,     0,     0,     0,  1433,     0,
+       0,     0,     0,     0,     0,     0,     0,  1228,  4308,  1439,
+       0,     0,     0,     0,     0,     0,  1433,  4312,     0,     0,
+       0,  1228,     0,  4313,     0,  4314,     0,     0,     0,  1439,
+       0,  1433,     0,     0,     0,     0,     0,     0,  1439,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  4338,  4339,  1446,     0,     0,     0,     0,  1435,
+       0,  1435,     0,     0,  1228,     0,     0,     0,     0,     0,
+    3091,  1436,     0,     0,     0,     0,     0,     0,  4364,     0,
+       0,  4367,     0,  4369,     0,     0,     0,     0,     0,     0,
+       0,     0,  4373,     0,     0,     0,     0,     0,     0,     0,
+    4380,  4381,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1228,     0,     0,     0,  1439,
+    1435,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  4425,  1433,     0,  1436,     0,     0,  4432,  4433,  3171,
+       0,     0,     0,     0,     0,  1435,     0,     0,     0,     0,
+       0,     0,     0,  1433,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1228,  1436,  1446,  1438,
+       0,  1435,     0,     0,     0,     0,  1435,     0,  1433,     0,
+       0,     0,     0,     0,  4451,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1735,  1228,  1446,
+       0,  1228,     0,  1228,     0,     0,     0,     0,     0,     0,
+       0,     0,  1433,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1228,     0,     0,
+       0,  1228,  1438,     0,  1435,     0,     0,  1446,     0,     0,
+       0,     0,  1228,     0,     0,     0,     0,     0,  1436,     0,
+    1439,     0,  1435,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1436,  1228,  1438,     0,  1435,     0,     0,
+       0,  1436,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1436,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1446,     0,     0,     0,  1446,  1446,
+       0,  1441,     0,  1228,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1441,     0,     0,     0,     0,     0,     0,     0,  1436,
+    1441,     0,     0,     0,  1433,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1228,     0,  1438,     0,  1436,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1436,  1438,     0,     0,  1228,     0,     0,     0,  1435,  1438,
+       0,     0,  1436,     0,     0,     0,     0,     0,     0,     0,
+    1438,     0,     0,     0,  1446,  1446,     0,     0,     0,  1435,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1432,     0,     0,     0,     0,     0,     0,     0,  1435,     0,
-       0,     0,     0,     0,     0,     0,  1228,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,  1228,     0,     0,
-       0,     0,     0,   699,     0,     0,     0,     0,     0,     0,
+    1228,  1441,  1436,     0,  1435,  1436,     0,     0,     0,  1228,
+       0,     0,     0,     0,  1228,     0,  1228,  1438,  1228,  1433,
+       0,     0,     0,     0,     0,  1228,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1438,     0,  1435,     0,
+       0,     0,     0,  1228,     0,     0,     0,     0,  1438,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1434,     0,     0,     0,  1437,     0,     0,  1228,     0,     0,
-    3947,     0,     0,     0,     0,     0,     0,  1228,  1228,     0,
-    1445,  1434,     0,     0,  1228,  1228,     0,     0,     0,  1228,
-    1445,     0,  1434,     0,  1228,     0,     0,  1228,  1228,  1435,
-       0,     0,  1228,     0,     0,     0,     0,     0,  1228,     0,
-       0,  1432,     0,     0,  1435,     0,     0,     0,     0,     0,
-       0,     0,  1435,     0,     0,     0,  1228,     0,     0,     0,
-    1228,     0,     0,  1435,     0,     0,     0,     0,     0,     0,
-       0,     0,  1228,     0,     0,     0,     0,  1228,     0,     0,
-       0,     0,     0,  1228,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1438,     0,     0,  1432,     0,     0,     0,
-       0,  1228,     0,     0,     0,     0,     0,     0,     0,     0,
-    1435,     0,     0,  1438,     0,     0,     0,     0,     0,     0,
-       0,     0,  1438,     0,     0,  1437,     0,     0,     0,  1435,
-    1228,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1435,     0,     0,     0,     0,     0,     0,  1445,     0,
-       0,     0,     0,  1435,     0,     0,     0,     0,     0,     0,
+    1438,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1445,     0,     0,
+       0,     0,     0,     0,     0,  4698,  4699,     0,     0,     0,
+       0,     0,     0,     0,  1228,     0,     0,     0,     0,     0,
+    1438,     0,     0,  1438,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1439,     0,
+       0,     0,     0,     0,     0,  1228,  1228,     0,     0,     0,
+       0,     0,  1441,     0,     0,     0,  1228,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1436,     0,  1228,  1433,     0,     0,
+    1435,     0,     0,     0,     0,     0,     0,     0,     0,  4748,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    4753,  1439,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1228,     0,     0,     0,     0,     0,  1228,  1228,     0,
+    1228,     0,     0,     0,     0,  1433,     0,     0,     0,     0,
+       0,     0,     0,     0,  1439,     0,     0,     0,     0,  1228,
+    4768,  4770,     0,     0,     0,     0,     0,  4774,  4775,     0,
+       0,     0,  4776,     0,     0,     0,     0,  4779,     0,     0,
+    4782,  4783,     0,     0,     0,  4787,     0,     0,     0,     0,
+       0,  4791,  1438,     0,     0,  1435,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3171,     0,     0,     0,     0,
+    3171,     0,     0,     0,     0,  1439,  3171,     0,  1228,  1228,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1439,     0,  1228,     0,  1658,     0,     0,     0,  1439,     0,
+       0,     0,     0,     0,  1228,  1228,     0,     0,     0,  1439,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  4853,  1433,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1433,  1436,     0,     0,     0,  1436,
+    1436,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1439,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1435,     0,  1439,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1439,     0,     0,
+    1441,     0,     0,     0,     0,     0,     0,     0,     0,  1439,
+       0,     0,  1436,     0,     0,  4909,     0,     0,     0,     0,
+       0,     0,     0,     0,  1436,     0,     0,     0,     0,     0,
+       0,  1435,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1438,     0,     0,     0,  1438,  1438,  1439,
+       0,     0,  1439,     0,     0,     0,     0,     0,     0,     0,
+       0,  1436,     0,  1441,     0,     0,     0,     0,     0,     0,
+       0,     0,  1433,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  4954,
+       0,     0,     0,     0,     0,     0,  1441,     0,     0,     0,
+       0,  1433,     0,     0,     0,     0,     0,     0,     0,     0,
+    1438,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1433,  1438,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1435,     0,     0,  1435,  1445,     0,     0,
-       0,     0,     0,  1438,     0,     0,     0,     0,     0,     0,
-       0,     0,  1228,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1432,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1438,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1445,     0,     0,  1434,     0,     0,  1434,     0,  1434,
-       0,     0,     0,     0,  1434,     0,     0,     0,     0,     0,
+    1435,     0,     0,     0,     0,  1433,     0,  1441,     0,     0,
+    1435,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1441,     0,     0,     0,     0,     0,     0,     0,
+    1441,  1439,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1441,     0,     0,     0,     0,     0,     0,  1436,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1228,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1228,     0,     0,
+       0,     0,  5047,  5048,     0,     0,  5049,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1434,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1441,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1434,     0,  1438,     0,     0,     0,     0,     0,
-    1432,     0,     0,     0,     0,  1435,     0,     0,     0,     0,
-    1445,     0,  1445,     0,     0,     0,  1434,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1440,
-       0,  1432,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  5083,  5084,     0,     0,     0,  1433,  1441,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1436,  1441,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1440,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1437,  1228,     0,     0,     0,  1445,     0,  1432,
-       0,     0,  1228,     0,     0,     0,     0,     0,     0,     0,
-       0,  1434,     0,  1434,     0,     0,     0,     0,     0,  1228,
-    1228,     0,     0,  1228,     0,     0,     0,     0,     0,  4302,
-       0,     0,     0,     0,     0,     0,     0,  1228,  4306,     0,
-       0,     0,  1228,     0,  4307,     0,  4308,  1228,     0,     0,
-    1228,  1228,     0,     0,     0,  1437,  1432,     0,  1228,  1228,
-    1432,  1432,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1434,  4332,  4333,     0,     0,     0,     0,     0,
-    1228,     0,     0,     0,     0,     0,     0,     0,  1437,     0,
-       0,  3085,     0,     0,  1228,     0,     0,  1434,     0,  4358,
-       0,     0,  4361,     0,  4363,     0,     0,     0,     0,     0,
-       0,     0,     0,  4367,     0,     0,     0,     0,     0,     0,
-       0,  4374,  4375,  1434,     0,     0,     0,  1445,  1434,     0,
-       0,     0,     0,     0,     0,  1435,     0,  1228,     0,  1435,
-    1435,     0,     0,     0,     0,     0,     0,  1432,     0,     0,
-       0,     0,  4419,     0,     0,     0,     0,     0,  4426,  4427,
-    3165,     0,     0,     0,     0,     0,     0,     0,     0,  1437,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1437,     0,  1434,     0,  1228,     0,
-       0,     0,  1437,     0,     0,     0,     0,     0,     0,     0,
-       0,  1438,  1435,  1437,  1434,  4445,     0,     0,     0,     0,
-       0,     0,     0,     0,  1435,     0,     0,     0,  1734,  1434,
+       0,  1441,     0,     0,     0,     0,     0,     0,  1435,     0,
+       0,     0,     0,     0,     0,     0,  1438,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1228,
-       0,  1445,     0,     0,     0,     0,     0,     0,     0,     0,
-    1437,  1435,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1438,     0,     0,     0,     0,  1437,
-       0,  1228,  1445,     0,  1228,     0,  1228,     0,     0,     0,
-       0,  1437,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1437,     0,     0,     0,  1438,     0,  1440,
-    1228,     0,     0,     0,  1228,     0,     0,     0,     0,     0,
-    1445,     0,     0,     0,     0,  1228,     0,     0,     0,  1440,
-    1434,     0,     0,     0,     0,     0,     0,     0,  1440,     0,
-       0,     0,     0,  1437,     0,     0,  1437,  1228,     0,     0,
-       0,  1434,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1433,     0,     0,     0,     0,     0,  1435,     0,     0,
+       0,  1441,     0,     0,  1441,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1435,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1434,  1445,     0,     0,
-       0,  1445,  1445,     0,     0,     0,  1228,     0,  1438,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1438,     0,     0,     0,     0,     0,     0,
-    1434,  1438,     0,     0,     0,  1435,     0,     0,     0,  1440,
-       0,     0,  1438,     0,     0,     0,     0,  1228,     0,     0,
+       0,     0,     0,     0,     0,     0,  1438,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1228,     0,     0,
+       0,     0,  1439,     0,     0,     0,  1439,  1439,     0,     0,
+       0,  1435,     0,     0,     0,     0,     0,  1436,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1445,  1445,  1438,
+       0,     0,     0,     0,     0,     0,     0,     0,  1436,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1436,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1435,     0,     0,  1438,     0,
-    1228,     0,     0,  1228,     0,  1437,     0,     0,     0,     0,
-    1438,     0,  1228,     0,     0,     0,     0,  1228,     0,  1228,
-       0,  1228,  1438,     0,     0,     0,     0,     0,  1228,     0,
-       0,     0,     0,     0,     0,     0,  4692,  4693,     0,     0,
-       0,     0,  1434,     0,     0,     0,  1228,     0,     0,     0,
+       0,  1433,     0,     0,     0,     0,     0,     0,     0,  1439,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1440,     0,  1438,     0,     0,  1438,     0,     0,     0,     0,
+       0,  1439,     0,     0,     0,     0,     0,  3091,     0,     0,
+       0,     0,     0,  1441,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1435,  5249,     0,  1438,     0,     0,  1439,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  2319,     0,
+       0,     0,     0,     0,     0,     0,  1438,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1438,     0,     0,
+    1735,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1435,     0,     0,
+       0,     0,     0,     0,     0,  1433,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  5299,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1228,     0,     0,
+       0,     0,     0,     0,     0,     0,  1433,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    4742,     0,     0,     0,  1435,     0,     0,     0,  1228,  1228,
-       0,  4747,     0,     0,     0,     0,     0,  1434,     0,  1228,
-       0,     0,     0,     0,     0,  1435,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1435,     0,     0,  1228,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  4762,  4764,     0,     0,     0,     0,     0,  4768,  4769,
-       0,     0,     0,  4770,     0,     0,     0,     0,  4773,     0,
-       0,  4776,  4777,     0,  1228,     0,  4781,     0,     0,     0,
-    1228,  1228,  4785,  1228,     0,  1437,     0,     0,     0,  1437,
-    1437,     0,     0,     0,  1438,     0,     0,     0,     0,     0,
-       0,     0,  1228,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  3165,     0,     0,     0,
-       0,  3165,     0,     0,     0,     0,     0,  3165,     0,     0,
+       0,     0,     0,     0,  1433,     0,     0,     0,     0,     0,
+    5337,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1657,     0,     0,     0,     0,
-       0,     0,  1437,     0,     0,  1434,     0,     0,     0,     0,
-       0,     0,     0,     0,  1437,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  4847,     0,     0,     0,     0,     0,
-       0,  1228,  1228,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1228,     0,     0,     0,     0,
-       0,  1437,     0,  1434,     0,     0,     0,  1228,  1228,     0,
-       0,     0,     0,     0,     0,     0,     0,  1440,     0,     0,
+       0,     0,     0,     0,     0,  1439,     0,     0,     0,     0,
+       0,  1436,     0,     0,  1436,     0,  1436,     0,     0,     0,
+       0,  1436,     0,     0,  1441,     0,     0,  1435,  1441,  1441,
+       0,  1433,     0,     0,     0,  1433,  1433,     0,     0,     0,
+       0,     0,     0,     0,  5083,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  5398,
+       0,     0,  1436,     0,     0,  1439,  2355,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1436,
+       0,  1441,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1441,     0,     0,     0,     0,     0,  1438,
+       0,     0,  1438,  1436,  1438,     0,     0,     0,     0,  1438,
+       0,     0,  1433,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1441,  1435,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  5447,  5447,  2355,     0,     0,     0,     0,     0,     0,
+       0,     0,  5083,     0,     0,     0,     0,     0,     0,     0,
+    1438,     0,  1435,     0,     0,     0,     0,     0,  1436,     0,
+    1436,     0,     0,     0,     0,     0,     0,  1438,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  4903,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1435,     0,
-       0,  1435,     0,  1435,     0,     0,     0,     0,  1435,     0,
-    1440,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1438,     0,     0,     0,  1438,  1438,
+       0,     0,     0,     0,  1439,     0,     0,     0,     0,     0,
+    1435,  1438,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1439,  5447,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1439,     0,     0,  1436,
+       0,     0,     0,     0,     0,  5515,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1440,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1435,
-    4948,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1434,     0,     0,     0,  1435,     0,     0,     0,
-       0,     0,  1434,     0,     0,  1437,     0,     0,     0,     0,
-       0,  1438,     0,     0,     0,     0,     0,     0,     0,     0,
-    1435,     0,     0,  1438,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1436,     0,     0,  1435,     0,     0,
+       0,  1435,  1435,     0,     0,     0,  1438,     0,  1438,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1440,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1440,
-    1438,     0,     0,     0,     0,     0,     0,  1440,     0,     0,
-       0,     0,     0,     0,     0,  1437,     0,     0,  1440,     0,
-       0,     0,     0,     0,     0,  1435,     0,  1435,     0,     0,
+    1436,     0,     0,     0,     0,  1436,     0,  1441,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  5447,  5555,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1438,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  5041,  5042,  1440,     0,  5043,     0,     0,
-    1434,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1440,     0,  1435,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1440,     0,     0,  1434,
-       0,     0,  5077,  5078,     0,     0,     0,     0,  1440,     0,
-       0,  1435,     0,     0,     0,     0,     0,     0,     0,  1434,
+       0,     0,     0,  1436,     0,     0,     0,     0,  1435,     0,
+       0,     0,  1438,     0,     0,     0,     0,  1441,     0,     0,
+       0,  1436,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1436,     0,  1438,     0,
+       0,     0,     0,  1438,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1435,     0,     0,
-       0,     0,  1435,     0,  1437,     0,     0,     0,  1440,     0,
-       0,  1440,     0,     0,  1438,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1437,     0,     0,     0,     0,
-       0,     0,     0,  1434,     0,     0,  1437,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1435,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1435,     0,
-       0,     0,     0,     0,  1438,     0,     0,     0,     0,     0,
-       0,     0,     0,  1435,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1438,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1439,  1438,
+       0,  1439,     0,  1439,     0,     0,     0,     0,  1439,     0,
+       0,     0,     0,     0,  1438,     0,     0,  1436,     0,     0,
+       0,     0,     0,     0,     0,     0,  1441,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1436,     0,
+       0,     0,     0,     0,     0,     0,     0,  1441,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1441,  1439,
+       0,     0,     0,  1436,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1439,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1436,     0,     0,
+    1439,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1438,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1434,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1438,     0,     0,     0,
+       0,  2355,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1438,     0,     0,     0,  1439,     0,  1439,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1440,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3085,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1434,
-       0,     0,     0,     0,  1435,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  5243,     0,     0,     0,     0,     0,
-       0,     0,     0,  1438,     0,  1435,     0,     0,     0,  2317,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1438,     0,     0,     0,     0,     0,
-    1435,  1734,     0,     0,     0,  1438,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1438,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1437,     0,
-       0,  1437,     0,  1437,  1435,     0,     0,     0,  1437,     0,
-    5293,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1436,
+       0,     0,     0,     0,     0,     0,  1439,     0,     0,     0,
+    2355,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2355,     0,     0,     0,  3073,     0,
+       0,  1439,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  2355,  2355,  2355,     0,     0,  2355,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1439,     0,     0,
+       0,     0,  1439,     0,     0,     0,     0,     0,     0,     0,
+    1441,     0,     0,  1441,     0,  1441,     0,     0,     0,     0,
+    1441,     0,     0,     0,     0,     0,     0,     0,     0,  2355,
+       0,     0,     0,     0,  1436,     0,     0,  1438,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1439,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1441,     0,     0,     0,     0,     0,     0,  1439,     0,
+       0,     0,     0,     0,  2355,     0,     0,     0,  1441,     0,
+       0,     0,     0,  1439,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2355,     0,     0,
+       0,     0,  1441,     0,     0,     0,     0,     0,     0,  2355,
+       0,     0,  2355,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1438,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2353,     0,     0,     0,     0,     0,     0,     0,     0,  1434,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1437,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  5331,     0,     0,     0,     0,  1437,     0,     0,     0,
+       0,     0,  1436,     0,     0,     0,     0,  1441,     0,  1441,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1440,     0,     0,     0,  1440,  1440,     0,     0,     0,     0,
-    1437,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2353,     0,     0,
-       0,     0,     0,     0,     0,     0,  1435,     0,     0,     0,
-       0,     0,     0,     0,     0,  5077,     0,     0,     0,     0,
+       0,     0,     0,     0,  1439,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1440,     0,     0,
-    5392,     0,     0,  1434,     0,  1437,     0,  1437,     0,  1440,
+       0,     0,     0,     0,     0,  1439,     0,     0,     0,     0,
+    1436,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1441,     0,
+    1439,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1441,     0,     0,     0,     0,     0,     0,
+    1438,     0,     0,     0,  1439,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1441,
+       0,     0,     0,     0,  1441,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1434,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1440,  1438,     0,     0,
-    1438,     0,  1438,     0,     0,     0,     0,  1438,     0,     0,
-       0,  1435,     0,     0,     0,     0,  1437,     0,     0,     0,
-       0,     0,  1434,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  5441,  5441,     0,     0,     0,     0,     0,     0,
-       0,  1437,     0,  5077,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,  1438,     0,
-       0,     0,     0,     0,     0,     0,     0,  1437,     0,     0,
-       0,     0,  1437,     0,     0,  1438,     0,     0,     0,  1434,
-       0,     0,     0,  1434,  1434,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1438,
-       0,     0,     0,     0,     0,     0,     0,  5441,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  5509,     0,     0,     0,
-    1437,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1437,  1435,
-    1440,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1437,  1438,     0,  1438,     0,     0,     0,
-    1434,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1435,     0,     0,
-       0,     0,     0,     0,     0,  5441,  5549,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1440,     0,     0,     0,     0,  1438,     0,     0,     0,     0,
+       0,     0,  1441,     0,     0,     0,     0,     0,     0,  1436,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1436,
+    1441,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1441,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1439,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1438,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1437,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1438,     0,     0,     0,
-       0,  1438,     0,     0,     0,  1437,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1437,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1435,     0,     0,  1438,
-       0,     0,     0,     0,  1437,     0,  1435,     0,     0,  1440,
        0,     0,     0,     0,     0,     0,     0,  1438,     0,     0,
-       0,     0,     0,     0,  2353,     0,     0,     0,     0,     0,
-    1440,     0,  1438,     0,     0,     0,     0,     0,     0,     0,
-       0,  1440,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1438,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1441,     0,     0,     0,
+       0,  1439,     0,     0,     0,     0,     0,  1436,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1441,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1436,     0,     0,     0,
+       0,     0,  1441,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1436,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1441,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1438,     0,     0,     0,     0,
+    1436,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2353,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1437,  2353,     0,     0,
-       0,  3067,     0,  1438,  1435,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2353,  2353,  2353,     0,     0,
-    2353,     0,     0,     0,  1438,     0,     0,     0,     0,     0,
-       0,     0,     0,  1435,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1438,
-       0,     0,     0,  1435,     0,     0,     0,     0,     0,     0,
-       0,     0,  2353,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1438,     0,     0,     0,     0,  1439,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1438,     0,     0,     0,     0,     0,     0,
-       0,  1437,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1435,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2353,     0,     0,
+       0,     0,     0,     0,  1438,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2353,     0,     0,  1440,     0,     0,  1440,     0,  1440,     0,
-       0,     0,  2353,  1440,     0,  2353,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1439,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1441,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1438,     0,
+       0,  1436,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2355,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2355,     0,  2355,     0,     0,  3073,  3073,     0,  3776,
+       0,  3073,     0,     0,     0,  2355,     0,     0,  2355,     0,
+       0,     0,     0,  2355,     0,     0,  1436,     0,     0,  2355,
+       0,     0,     0,     0,  2355,     0,     0,     0,     0,     0,
+       0,  2355,  2355,  2355,  2355,     0,     0,     0,  3073,  3073,
+       0,  2355,     0,  1441,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2355,     0,  2355,     0,     0,     0,  1438,
+       0,     0,  2355,  2355,  2355,  2355,  2355,  2355,  2355,  2355,
+    2355,  2355,     0,     0,     0,     0,  1439,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1439,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2355,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1438,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1440,  1438,     0,     0,  1435,     0,
+       0,     0,     0,     0,     0,     0,  1436,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1440,     0,     0,     0,     0,     0,     0,     0,  1437,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1440,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1435,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1437,     0,     0,
+       0,  1441,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1438,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1440,     0,  1440,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1439,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1441,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    2355,     0,     0,  1439,  1438,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1436,     0,     0,  1439,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1436,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1440,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1439,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1436,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1435,     0,     0,  1440,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1437,     0,     0,     0,
-       0,     0,  1440,     0,     0,     0,  1437,  1440,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,  1438,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1441,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1441,     0,
+       0,     0,     0,     0,     0,     0,  1436,     0,     0,  1438,
+    1436,  1436,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1439,     0,
+       0,     0,     0,     0,     0,     0,     0,  1438,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1440,  1438,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1440,     0,     0,     0,  1435,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1440,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1435,     0,
+       0,  2355,     0,  1439,     0,     0,     0,  1436,     0,     0,
+       0,     0,     0,     0,  1438,     0,     0,     0,  1438,  1438,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1437,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1441,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1435,     0,     0,     0,
-       0,     0,     0,  1437,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1437,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1440,
-       0,     0,     0,     0,     0,  1438,     0,     0,     0,     0,
-       0,     0,     0,  1435,     0,  1438,     0,  1435,  1435,     0,
-    1440,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1437,     0,     0,
-       0,     0,     0,     0,     0,  1440,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1440,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1435,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2353,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1437,     0,
-    2353,     0,  2353,  1438,     0,  3067,  3067,     0,  3770,     0,
-    3067,     0,     0,     0,  2353,     0,     0,  2353,     0,     0,
-       0,     0,  2353,     0,     0,     0,     0,     0,  2353,     0,
-       0,     0,  1438,  2353,     0,     0,     0,     0,     0,     0,
-    2353,  2353,  2353,  2353,     0,     0,     0,  3067,  3067,     0,
-    2353,     0,  1438,  1437,     0,     0,     0,     0,     0,     0,
-       0,  1440,  2353,     0,  2353,     0,     0,     0,     0,     0,
-       0,  2353,  2353,  2353,  2353,  2353,  2353,  2353,  2353,  2353,
-    2353,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1438,     0,  2353,     0,
-       0,     0,     0,     0,     0,     0,     0,    85,     0,     0,
-       0,     0,     0,    89,     0,     0,     0,    93,     0,    94,
-       0,    96,    97,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   106,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1440,     0,   118,   119,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1437,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1438,   127,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   128,     0,
-     129,   130,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1161,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  2353,
-       0,     0,     0,     0,     0,   140,     0,   141,   142,     0,
-       0,     0,  1438,   145,     0,   146,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   148,     0,   149,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   152,  1440,   153,     0,  1437,   156,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     157,     0,   158,     0,     0,     0,   159,     0,     0,     0,
-       0,     0,   160,     0,     0,     0,     0,     0,  1437,     0,
-     162,     0,   164,     0,     0,     0,     0,     0,   166,     0,
-       0,     0,  1440,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   170,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1437,     0,     0,   174,
+       0,     0,     0,     0,     0,  1441,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1441,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1438,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   185,   186,
-       0,     0,     0,     0,   187,     0,     0,     0,     0,     0,
-       0,     0,     0,  1437,     0,   188,     0,  1437,  1437,     0,
-       0,     0,     0,     0,     0,     0,   193,     0,     0,     0,
+       0,     0,     0,     0,     0,  1438,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1439,     0,     0,     0,     0,  2355,  1441,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   203,     0,     0,     0,     0,
-    2353,  1440,     0,     0,     0,     0,     0,   205,     0,     0,
-       0,  1440,   206,   207,     0,   208,     0,     0,     0,     0,
-     209,     0,     0,     0,     0,   210,  1438,     0,   212,     0,
-       0,     0,     0,   214,  1437,     0,     0,     0,   215,   216,
-       0,     0,     0,     0,     0,     0,   217,     0,     0,     0,
-     219,     0,     0,     0,     0,     0,     0,  1438,     0,     0,
-     222,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   224,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   230,     0,   231,     0,  1438,     0,     0,     0,     0,
-       0,   233,     0,     0,     0,     0,     0,   234,     0,     0,
-       0,     0,   235,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   238,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2353,     0,  1440,
-       0,     0,     0,     0,     0,     0,   248,     0,     0,     0,
-       0,     0,  1438,     0,     0,     0,  1438,  1438,     0,     0,
-     249,     0,     0,     0,  -144,     0,     0,     0,  1440,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1440,     0,
-       0,     0,  2353,     0,     0,     0,     0,     0,  2353,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3770,  3770,     0,     0,  3067,  3067,
-    3067,  3067,     0,     0,  3067,  3067,  3067,  3067,  3067,  3067,
-    3067,  3067,  3067,  3067,  3770,     0,     0,     0,     0,     0,
-       0,     0,  1440,  1438,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2353,     0,     0,  2353,
-       0,  2353,     0,     0,  3770,  3770,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  2353,
-    3067,  3067,  2353,     0,  2353,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2355,     0,     0,     0,     0,     0,  2355,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3776,  3776,     0,     0,  3073,
+    3073,  3073,  3073,     0,     0,  3073,  3073,  3073,  3073,  3073,
+    3073,  3073,  3073,  3073,  3073,  3776,     0,     0,     0,     0,
+    1441,     0,     0,     0,     0,     0,     0,  1439,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2355,     0,     0,
+    2355,     0,  2355,     0,     0,  3776,  3776,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1439,     0,
+    2355,  3073,  3073,  2355,     0,  2355,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1441,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1439,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1440,     0,     0,     0,     0,     0,     0,
-       0,     0,  2353,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2353,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2355,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2355,     0,     0,     0,     0,     0,
+       0,     0,     0,  1439,     0,     0,     0,  1439,  1439,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1440,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2353,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2355,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1441,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1439,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1440,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1441,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1441,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3073,     0,     0,  1441,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3067,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1440,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1441,     0,     0,     0,  1441,
+    1441,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1440,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1440,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1441,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2355,     0,     0,     0,
+    2355,  2355,  2355,     0,     0,     0,     0,     0,  3776,  3776,
+    3776,  3776,     0,     0,     0,     0,  3776,  3776,  3776,  3776,
+    3776,  3776,  3776,  3776,  3776,  3776,  2355,  2355,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2353,     0,     0,  1440,  2353,
-    2353,  2353,  1440,  1440,     0,     0,     0,  3770,  3770,  3770,
-    3770,     0,     0,     0,     0,  3770,  3770,  3770,  3770,  3770,
-    3770,  3770,  3770,  3770,  3770,  2353,  2353,     0,     0,     0,
+       0,     0,  2355,     0,     0,  2355,     0,  2355,     0,     0,
+       0,  2355,     0,     0,  3776,  3776,     0,     0,  2355,  2355,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  2353,     0,     0,  2353,     0,  2353,     0,     0,     0,
-    2353,     0,     0,  3770,  3770,     0,     0,  2353,  2353,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1440,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2355,     0,     0,     0,     0,     0,     0,
+    2355,  2355,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2355,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2353,     0,     0,     0,     0,     0,     0,  2353,
-    2353,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  2353,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -6691,405 +6711,455 @@
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  3776,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3770,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    85,  2355,  2355,    86,    87,
+      88,    89,    90,    91,    92,    93,     0,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     106,     0,     0,   107,   108,   109,   110,     0,   111,   112,
+     113,   114,     0,   115,   116,   117,   118,   119,     0,     0,
+       0,   120,   121,     0,     0,     0,  2355,   122,     0,     0,
+       0,  2355,  3073,     0,     0,     0,   123,     0,   124,     0,
+     125,   126,    35,     0,     0,     0,  2355,     0,  2355,     0,
+      41,    42,  2355,  2355,  2355,     0,     0,  2355,     0,     0,
+    2355,  2355,     0,     0,     0,  2355,   127,     0,     0,  2355,
+       0,     0,     0,     0,     0,     0,   128,     0,   129,   130,
+       0,     0,     0,     0,     0,     0,     0,     0,   131,     0,
+     132,     0,     0,   133,   134,   135,   136,   137,   138,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    85,  2353,  2353,    86,    87,    88,
-      89,    90,    91,    92,    93,     0,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   106,
-       0,     0,   107,   108,   109,   110,     0,   111,   112,   113,
-     114,     0,   115,   116,   117,   118,   119,     0,     0,     0,
-     120,   121,     0,     0,     0,  2353,   122,     0,     0,     0,
-    2353,  3067,     0,     0,     0,   123,     0,   124,     0,   125,
-     126,    35,     0,     0,     0,  2353,     0,  2353,     0,    41,
-      42,  2353,  2353,  2353,     0,     0,  2353,     0,     0,  2353,
-    2353,     0,     0,     0,  2353,   127,     0,     0,  2353,     0,
-       0,     0,     0,     0,     0,   128,     0,   129,   130,     0,
-       0,     0,     0,     0,     0,     0,     0,   131,     0,   132,
-       0,     0,   133,   134,   135,   136,   137,   138,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   139,
-       0,     0,   140,     0,   141,   142,   143,     0,   144,     0,
-     145,     0,   146,     0,   147,     0,     0,     0,     0,     0,
-    2353,     0,     0,   148,     0,   149,   150,     0,     0,     0,
-       0,     0,     0,   151,     0,     0,     0,     0,     0,     0,
-     152,     0,   153,   154,   155,   156,     0,     0,     0,     0,
-       0, -1496,     0,     0,     0,     0,     0,   157,     0,   158,
-       0,     0,     0,   159,     0,     0,     0,     0,     0,   160,
-     161,     0,     0,     0,     0,     0,  2353,   162,   163,   164,
-       0,     0,   165,     0,     0,   166,     0,     0,   167,     0,
-       0,     0,     0,     0,   168,     0,   169,     0,     0,     0,
-     170,     0,   171,     0,   172,     0,     0,     0,     0,     0,
-       0,     0,   173,     0,     0,     0,   174,     0,     0,     0,
-       0,  2353,     0,     0,     0,     0,   175,   176,     0,     0,
-   -1496,     0,     0,   177,     0,   178,     0,     0,   179,   180,
-       0,   181,     0,     0,     0,     0,     0,     0,     0,     0,
-     182,   183,     0,   184,     0,   185,   186,     0,     0,     0,
-       0,   187,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   188,     0,     0,   189,   190,   191,     0,     0,
-     192,     0,     0,   193,   194,     0,     0,   195,     0,   196,
-       0,     0,     0,     0,     0,     0,     0,     0,  3770,  3067,
-       0,     0,     0,   197,   198,     0,   199,   200,     0,     0,
-       0,     0,     0,     0,  2353,  2353,  2353,     0,   201,     0,
-     202,     0,   203,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   204,   205,     0,     0,     0,     0,   206,
-     207,     0,   208,     0,     0,     0,     0,   209,     0,     0,
-    2353,  2353,   210,   211,     0,   212,     0,   213,     0,     0,
-     214,     0,     0,     0,     0,   215,   216,     0,     0,     0,
-       0,     0,     0,   217,     0,   218,     0,   219,   220,     0,
-       0,   221,     0,     0,     0,     0,     0,   222,     0,     0,
-       0,     0,     0,     0,     0,   223,     0,     0,     0,   224,
-       0,   225,     0,     0,     0,     0,     0,     0,   226,   227,
-       0,     0,     0,     0,   228,     0,   229,     0,   230,     0,
-     231,     0,     0,     0,     0,   232,     0,     0,   233,     0,
-       0, -1496,     0,     0,   234,     0,     0,     0,     0,   235,
-     236,     0,     0,   237,     0,     0,     0,     0,     0,     0,
-       0,     0,   238,     0,     0,     0,     0,     0,     0,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,     0,     0,
-       0,     0,     0,   248,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   249,     0,     0,
-       0,  -144,     0,     0,     0,     0,     0,     0,     0,     0,
-    3770,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2353,     0,     0,     0,
+     139,     0,     0,   140,     0,   141,   142,   143,     0,   144,
+       0,   145,     0,   146,     0,   147,     0,     0,     0,     0,
+       0,  2355,     0,     0,   148,     0,   149,   150,     0,     0,
+       0,     0,     0,     0,   151,     0,     0,     0,     0,     0,
+       0,   152,     0,   153,   154,   155,   156,     0,     0,     0,
+       0,     0, -1498,     0,     0,     0,     0,     0,   157,     0,
+     158,     0,     0,     0,   159,     0,     0,     0,     0,     0,
+     160,   161,     0,     0,     0,     0,     0,  2355,   162,   163,
+     164,     0,     0,   165,     0,     0,   166,     0,     0,   167,
+       0,     0,     0,     0,     0,   168,     0,   169,     0,     0,
+       0,   170,     0,   171,     0,   172,     0,     0,     0,     0,
+       0,     0,     0,   173,     0,     0,     0,   174,     0,     0,
+       0,     0,  2355,     0,     0,     0,     0,   175,   176,     0,
+       0, -1498,     0,     0,   177,     0,   178,     0,     0,   179,
+     180,     0,   181,     0,     0,     0,     0,     0,     0,     0,
+       0,   182,   183,     0,   184,     0,   185,   186,     0,     0,
+       0,     0,   187,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   188,     0,     0,   189,   190,   191,     0,
+       0,   192,     0,     0,   193,   194,     0,     0,   195,     0,
+     196,     0,     0,     0,     0,     0,     0,     0,     0,  3776,
+    3073,     0,     0,     0,   197,   198,     0,   199,   200,     0,
+       0,     0,     0,     0,     0,  2355,  2355,  2355,     0,   201,
+       0,   202,     0,   203,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   204,   205,     0,     0,     0,     0,
+     206,   207,     0,   208,     0,     0,     0,     0,   209,     0,
+       0,  2355,  2355,   210,   211,     0,   212,     0,   213,     0,
+       0,   214,     0,     0,     0,     0,   215,   216,     0,     0,
+       0,     0,     0,     0,   217,     0,   218,     0,   219,   220,
+       0,     0,   221,     0,     0,     0,     0,     0,   222,     0,
+       0,     0,     0,     0,     0,     0,   223,     0,     0,     0,
+     224,     0,   225,     0,     0,     0,     0,     0,     0,   226,
+     227,     0,     0,     0,     0,   228,     0,   229,     0,   230,
+       0,   231,     0,     0,     0,     0,   232,     0,     0,   233,
+       0,     0, -1498,     0,     0,   234,     0,     0,     0,     0,
+     235,   236,     0,     0,   237,     0,     0,     0,     0,     0,
+       0,     0,     0,   238,     0,     0,     0,     0,     0,     0,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,     0,
+       0,     0,     0,     0,   248,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   249,     0,
+       0,     0,  -144,     0,     0,     0,     0,     0,     0,     0,
+       0,  3776,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2355,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2353,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2355,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2353,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2355,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  2353,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2355,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2353,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2355,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   753,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
-     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
-     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,  2353,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,     0,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,  2355,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2353,   428,   429,   430,   431,   432,   433,   434,
-     435,   760,   436,   437,   438,   761,   762,   763,   764,   765,
-     766,   767,   439,   440,   768,   441,   442,   132,   443,   444,
-     445,   134,   135,   136,   137,   138,   769,   446,   447,   448,
-     449,   450,   770,   771,   451,   452,   772,   139,   453,   773,
-     454,   455,   456,   457,   143,   774,   144,   775,   458,   459,
-     460,   461,   147,   462,   463,   776,   777,   464,   465,   466,
-     467,   468,   469,   778,   150,   470,   471,   779,   780,   781,
-     782,   151,   783,   784,   785,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,   786,   479,   787,   480,   481,   482,
-     483,   484,   788,   485,   486,   487,   789,   790,   488,   489,
-     490,   491,   492,   791,   493,   494,   495,   792,   496,   497,
-     498,   793,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,   794,   506,   795,   507,   508,   167,   509,   796,   510,
-     797,   511,   168,   798,   169,   512,   513,   514,   799,   515,
-     171,   800,   172,   516,   801,   517,   518,   724,   519,   520,
-     173,   521,   522,   523,   524,   802,   525,   526,   527,   528,
-     529,   530,   803,   531,   175,   176,   804,   532,   533,   534,
-     805,   177,   806,   178,   807,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,   808,   809,   542,   182,   183,
-     543,   184,   810,   544,   545,   546,   811,   812,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,   190,   191,   560,   561,   192,   813,
-     562,   563,   194,   564,   814,   195,   565,   196,   566,   567,
-     568,   815,   569,   816,   817,   570,   571,   572,   818,   819,
-     573,   197,   198,   574,   199,   200,   575,   576,   577,   578,
-     579,   580,   581,   820,   582,   583,   201,   584,   202,   585,
-     586,   587,   821,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,   822,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,   823,   611,
-     612,   211,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,   824,   623,   624,   625,   626,   627,
-     825,   629,   630,   218,   631,   632,   220,   633,   634,   221,
-     635,   826,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,   827,   647,   648,   828,   649,   225,
-     650,   651,   652,   653,   654,   829,   226,   227,   830,   831,
-     656,   657,   228,   658,   229,   832,   659,   660,   661,   662,
-     663,   664,   665,   833,   834,   666,   667,   668,   669,   670,
-     835,   836,   671,   672,   673,   674,   675,   837,   236,   838,
-     676,   237,   677,   678,   679,   680,   839,   840,   681,   841,
-     842,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   753,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,  1000,    98,    99,   100,   101,   102,   103,   754,   104,
-     105,   708,   755,     0,   107,   108,   109,   110,   756,   757,
-     112,   113,   114,     0,   115,   758,   759,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,   427,     0,     0,    37,    38,    39,
-      40,    41,    42,    43,    44,  1577,  1578,  1579,    45,  1580,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,  3159,   436,   437,   438,     0,
-       0,     0,     0,  1581,     0,     0,   439,   440,     0,   441,
-     442,   132,   443,   444,   445,   134,  1582,   136,  1583,  1584,
-       0,   446,   447,   448,   449,   450,  1585,  1586,   451,   452,
-    1587,  1588,   453,     0,   454,   455,   456,   457,  1589,     0,
-    1590,     0,   458,   459,   460,   461,   147,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
-     471,     0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,   473,
-     474,   475,   476,   722,   477,  1598,  1599,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-    3160,     0,   488,   489,  1413,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-    1600,   503,   504,   505,  1601,  1602,   506,     0,   507,   508,
-    1603,   509,     0,   510,     0,   511,   168,     0,   169,   512,
-     513,   514,     0,   515,  1604,     0,  1605,   516,     0,   517,
-     518,   724,   519,   520,   173,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
-       0,   532,   533,   534,  1416,  1606,     0,  1607,     0,   535,
-     179,   180,   536,   181,   537,   538,   539,   540,   541,     0,
-       0,   542,  1608,   183,   543,   184,     0,   544,   545,   546,
-    1609,  1610,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,  1611,   190,  1612,
-     560,   561,   192,  1613,   562,   563,   194,   564,  1614,  1615,
-     565,  1616,   566,   567,   568,     0,   569,     0,     0,  1617,
-     571,   572,     0,     0,   573,   197,   198,   574,   199,  1618,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-    1619,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,  1620,   596,   597,   598,   599,
+       0,     0,     0,  2355,   428,   429,   430,   431,   432,   433,
+     434,   435,   760,   436,   437,   438,   761,   762,   763,   764,
+     765,   766,   767,   439,   440,   768,   441,   442,   132,   443,
+     444,   445,   134,   135,   136,   137,   138,   769,   446,   447,
+     448,   449,   450,   770,   771,   451,   452,   772,   139,   453,
+     773,   454,   455,   456,   457,   143,   774,   144,   775,   458,
+     459,   460,   461,   147,   462,   463,   776,   777,   464,   465,
+     466,   467,   468,   469,   778,   150,   470,   471,   779,   780,
+     781,   782,   151,   783,   784,   785,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,   786,   479,   787,   480,   481,
+     482,   483,   484,   788,   485,   486,   487,   789,   790,   488,
+     489,   490,   491,   492,   791,   493,   494,   495,   792,   496,
+     497,   498,   793,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,   794,   506,   795,   507,   508,   167,   509,   796,
+     510,   797,   511,   168,   798,   169,   512,   513,   514,   799,
+     515,   171,   800,   172,   516,   801,   517,   518,   724,   519,
+     520,   173,   521,   522,   523,   524,   802,   525,   526,   527,
+     528,   529,   530,   803,   531,   175,   176,   804,   532,   533,
+     534,   805,   177,   806,   178,   807,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,   808,   809,   542,   182,
+     183,   543,   184,   810,   544,   545,   546,   811,   812,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,   190,   191,   560,   561,   192,
+     813,   562,   563,   194,   564,   814,   195,   565,   196,   566,
+     567,   568,   815,   569,   816,   817,   570,   571,   572,   818,
+     819,   573,   197,   198,   574,   199,   200,   575,   576,   577,
+     578,   579,   580,   581,   820,   582,   583,   201,   584,   202,
+     585,   586,   587,   821,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,   822,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,   823,
+     611,   612,   211,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,   824,   623,   624,   625,   626,
+     627,   825,   629,   630,   218,   631,   632,   220,   633,   634,
+     221,   635,   826,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,   827,   647,   648,   828,   649,
+     225,   650,   651,   652,   653,   654,   829,   226,   227,   830,
+     831,   656,   657,   228,   658,   229,   832,   659,   660,   661,
+     662,   663,   664,   665,   833,   834,   666,   667,   668,   669,
+     670,   835,   836,   671,   672,   673,   674,   675,   837,   236,
+     838,   676,   237,   677,   678,   679,   680,   839,   840,   681,
+     841,   842,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   753,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,  1000,    98,    99,   100,   101,   102,   103,   754,
+     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
+     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,   427,     0,     0,    37,    38,
+      39,    40,    41,    42,    43,    44,  1578,  1579,  1580,    45,
+    1581,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,  3165,   436,   437,   438,
+       0,     0,     0,     0,  1582,     0,     0,   439,   440,     0,
+     441,   442,   132,   443,   444,   445,   134,  1583,   136,  1584,
+    1585,     0,   446,   447,   448,   449,   450,  1586,  1587,   451,
+     452,  1588,  1589,   453,     0,   454,   455,   456,   457,  1590,
+       0,  1591,     0,   458,   459,   460,   461,   147,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
+     470,   471,     0,  1592,  1593,  1594,  1595,  1596,  1597,  1598,
+     473,   474,   475,   476,   722,   477,  1599,  1600,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,  3166,     0,   488,   489,  1414,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,  1601,   503,   504,   505,  1602,  1603,   506,     0,   507,
+     508,  1604,   509,     0,   510,     0,   511,   168,     0,   169,
+     512,   513,   514,     0,   515,  1605,     0,  1606,   516,     0,
+     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
+     176,     0,   532,   533,   534,  1417,  1607,     0,  1608,     0,
+     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
+       0,     0,   542,  1609,   183,   543,   184,     0,   544,   545,
+     546,  1610,  1611,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,  1612,   190,
+    1613,   560,   561,   192,  1614,   562,   563,   194,   564,  1615,
+    1616,   565,  1617,   566,   567,   568,     0,   569,     0,     0,
+    1618,   571,   572,     0,     0,   573,   197,   198,   574,   199,
+    1619,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,  1620,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,  1621,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
+    1622,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,  1623,   629,   630,   218,   631,
+     632,   220,   633,   634,  1624,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,  1625,     0,
+     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
+       0,  1626,  1627,     0,     0,   656,   657,  1628,   658,  1629,
+    1630,   659,   660,   661,   662,   663,   664,   665,     0,  1631,
+     666,   667,   668,   669,   670,  1632,     0,   671,   672,   673,
+     674,   675,   728,  1633,  3167,   676,   237,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,  1634,  1635,  1636,  1637,  1638,  1639,  1640,
+    1641,   729,   688,   689,  1642,     0,     0,     0,     0,     0,
+       0,  1643,  1644,  3168,     0,     0,     0,     0,     0,     0,
+    1646,  3169,   753,    86,    87,    88,   705,    90,    91,    92,
+     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
+     102,   103,   754,   104,   105,   708,   755,     0,   107,   108,
+     109,   110,   756,   757,   112,   113,   114,     0,   115,   758,
+     759,   709,   710,     0,     0,     0,   711,   712,     0,     0,
+       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
+       0,   714,     0,   715,     0,   716,   717,    35,   427,     0,
+       0,    37,    38,    39,    40,    41,    42,    43,    44,  1578,
+    1579,  1580,    45,  1581,     0,     0,     0,     0,     0,     0,
+       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
+     436,   437,   438,     0,     0,     0,     0,  1582,     0,     0,
+     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
+    1583,   136,  1584,  1585,     0,   446,   447,   448,   449,   450,
+    1586,  1587,   451,   452,  1588,  1589,   453,     0,   454,   455,
+     456,   457,  1590,     0,  1591,     0,   458,   459,   460,   461,
+     147,   462,   463,   720,     0,   464,   465,   466,   467,   468,
+     469,     0,   150,   470,   471,     0,  1592,  1593,  1594,  1595,
+    1596,  1597,  1598,   473,   474,   475,   476,   722,   477,  1599,
+    1600,   478,     0,   479,     0,   480,   481,   482,   483,   484,
+       0,   485,   486,   487,     0,     0,   488,   489,  1414,   491,
+     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
+     499,   500,   501,   502,  1601,   503,   504,   505,  1602,  1603,
+     506,     0,   507,   508,  1604,   509,     0,   510,     0,   511,
+     168,     0,   169,   512,   513,   514,     0,   515,  1605,     0,
+    1606,   516,     0,   517,   518,   724,   519,   520,   173,   521,
+     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
+       0,   531,   175,   176,     0,   532,   533,   534,  1417,  1607,
+       0,  1608,     0,   535,   179,   180,   536,   181,   537,   538,
+     539,   540,   541,     0,     0,   542,  1609,   183,   543,   184,
+       0,   544,   545,   546,  1610,  1611,   547,   548,   549,   550,
+     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
+     559,  1612,   190,  1613,   560,   561,   192,  1614,   562,   563,
+     194,   564,  1615,  1616,   565,  1617,   566,   567,   568,     0,
+     569,     0,     0,  1618,   571,   572,     0,     0,   573,   197,
+     198,   574,   199,  1619,   575,   576,   577,   578,   579,   580,
+     581,     0,   582,   583,  1620,   584,   202,   585,   586,   587,
+       0,   588,   589,   590,   591,   592,   593,   594,   595,  1621,
+     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
+     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
+     613,   614,   615,  1622,   616,   617,   618,   619,   620,   621,
+     727,   622,   216,   623,   624,   625,   626,   627,  1623,   629,
+     630,   218,   631,   632,   220,   633,   634,  1624,   635,     0,
+     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
+     646,  1625,     0,   647,   648,   224,   649,   225,   650,   651,
+     652,   653,   654,     0,  1626,  1627,     0,     0,   656,   657,
+    1628,   658,  1629,  1630,   659,   660,   661,   662,   663,   664,
+     665,     0,  1631,   666,   667,   668,   669,   670,  1632,     0,
+     671,   672,   673,   674,   675,  2317,  1633,     0,   676,   237,
+     677,   678,   679,   680,     0,     0,   681,     0,   238,   682,
+     683,   684,   685,   686,   687,   239,  1634,  1635,  1636,  1637,
+    1638,  1639,  1640,  1641,   729,   688,   689,  1642,     0,   248,
+       0,     0,     0,     0,  1643,  1644,     0,     0,     0,     0,
+       0,     0,     0,  1646,  5261,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,   427,     0,     0,    37,    38,    39,    40,    41,    42,
+      43,    44,  1578,  1579,  1580,    45,  1581,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+    1582,     0,     0,   439,   440,     0,   441,   442,   132,   443,
+     444,   445,   134,  1583,   136,  1584,  1585,     0,   446,   447,
+     448,   449,   450,  1586,  1587,   451,   452,  1588,  1589,   453,
+       0,   454,   455,   456,   457,  1590,     0,  1591,     0,   458,
+     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,   150,   470,   471,     0,  1592,
+    1593,  1594,  1595,  1596,  1597,  1598,   473,   474,   475,   476,
+     722,   477,  1599,  1600,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,  1414,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,  1601,   503,   504,
+     505,  1602,  1603,   506,     0,   507,   508,  1604,   509,     0,
+     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
+     515,  1605,     0,  1606,   516,     0,   517,   518,   724,   519,
+     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
+     534,  1417,  1607,     0,  1608,     0,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,     0,     0,   542,  1609,
+     183,   543,   184,     0,   544,   545,   546,  1610,  1611,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,  1612,   190,  1613,   560,   561,   192,
+    1614,   562,   563,   194,   564,  1615,  1616,   565,  1617,   566,
+     567,   568,     0,   569,     0,     0,  1618,   571,   572,     0,
+       0,   573,   197,   198,   574,   199,  1619,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,  1620,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,  1621,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,   211,   613,   614,   615,  1622,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,  1623,   629,   630,   218,   631,   632,   220,   633,   634,
+    1624,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,  1625,     0,   647,   648,     0,   649,
+     225,   650,   651,   652,   653,   654,     0,  1626,  1627,     0,
+       0,   656,   657,  1628,   658,  1629,  1630,   659,   660,   661,
+     662,   663,   664,   665,     0,  1631,   666,   667,   668,   669,
+     670,  1632,     0,   671,   672,   673,   674,   675,   728,  1633,
+       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,  1634,
+    1635,  1636,  1637,  1638,  1639,  1640,  1641,   729,   688,   689,
+    1642,     0,     0,     0,     0,     0,     0,  1643,  1644,     0,
+       0,     0,     0,     0,     0,     0,  1646,  3075,   753,    86,
+      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
+       0,     0,    98,    99,   100,   101,   102,   103,   754,   104,
+     105,   708,   755,     0,   107,   108,   109,   110,   756,   757,
+     112,   113,   114,     0,   115,   758,   759,   709,   710,     0,
+       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
+       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
+       0,   716,   717,    35,   427,     0,     0,    37,    38,    39,
+      40,    41,    42,    43,    44,  1578,  1579,  1580,    45,  1581,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
+       0,     0,     0,  1582,     0,     0,   439,   440,     0,   441,
+     442,   132,   443,   444,   445,   134,  1583,   136,  1584,  1585,
+       0,   446,   447,   448,   449,   450,  1586,  1587,   451,   452,
+    1588,  1589,   453,     0,   454,   455,   456,   457,  1590,     0,
+    1591,     0,   458,   459,   460,   461,   147,   462,   463,   720,
+       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
+     471,     0,  1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,
+     474,   475,   476,   722,   477,  1599,  1600,   478,     0,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,  1414,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+    1601,   503,   504,   505,  1602,  1603,   506,     0,   507,   508,
+    1604,   509,     0,   510,     0,   511,   168,     0,   169,   512,
+     513,   514,     0,   515,  1605,     0,  1606,   516,     0,   517,
+     518,   724,   519,   520,   173,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
+       0,   532,   533,   534,  1417,  1607,     0,  1608,     0,   535,
+     179,   180,   536,   181,   537,   538,   539,   540,   541,     0,
+       0,   542,  1609,   183,   543,   184,     0,   544,   545,   546,
+    1610,  1611,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,  1612,   190,  1613,
+     560,   561,   192,  1614,   562,   563,   194,   564,  1615,  1616,
+     565,  1617,   566,   567,   568,     0,   569,     0,     0,  1618,
+     571,   572,     0,     0,   573,   197,   198,   574,   199,  1619,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+    1620,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,  1621,   596,   597,   598,   599,
        0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,   211,   613,   614,   615,  1621,
+     609,   610,     0,   611,   612,   211,   613,   614,   615,  1622,
      616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,  1622,   629,   630,   218,   631,   632,
-     220,   633,   634,  1623,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,  1624,     0,   647,
+     624,   625,   626,   627,  1623,   629,   630,   218,   631,   632,
+     220,   633,   634,  1624,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,  1625,     0,   647,
      648,     0,   649,   225,   650,   651,   652,   653,   654,     0,
-    1625,  1626,     0,     0,   656,   657,  1627,   658,  1628,  1629,
-     659,   660,   661,   662,   663,   664,   665,     0,  1630,   666,
-     667,   668,   669,   670,  1631,     0,   671,   672,   673,   674,
-     675,   728,  1632,  3161,   676,   237,   677,   678,   679,   680,
+    1626,  1627,     0,     0,   656,   657,  1628,   658,  1629,  1630,
+     659,   660,   661,   662,   663,   664,   665,     0,  1631,   666,
+     667,   668,   669,   670,  1632,     0,   671,   672,   673,   674,
+     675,   728,  1633,     0,   676,   237,   677,   678,   679,   680,
        0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,  1640,
-     729,   688,   689,  1641,     0,     0,     0,     0,     0,     0,
-    1642,  1643,  3162,     0,     0,     0,     0,     0,     0,  1645,
-    3163,   753,    86,    87,    88,   705,    90,    91,    92,   706,
+     687,   239,  1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,
+     729,   688,   689,  1642,     0,     0,     0,     0,     0,     0,
+    1643,  1644,     0,     0,     0,     0,     0,     0,     0,  1646,
+    4316,   753,    86,    87,    88,   705,    90,    91,    92,   706,
        0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
      103,   754,   104,   105,   708,   755,     0,   107,   108,   109,
      110,   756,   757,   112,   113,   114,     0,   115,   758,   759,
      709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
        0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
      714,     0,   715,     0,   716,   717,    35,   427,     0,     0,
-      37,    38,    39,    40,    41,    42,    43,    44,  1577,  1578,
-    1579,    45,  1580,     0,     0,     0,     0,     0,     0,     0,
+      37,    38,    39,    40,    41,    42,    43,    44,  1578,  1579,
+    1580,    45,  1581,     0,     0,     0,     0,     0,     0,     0,
      428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
-     437,   438,     0,     0,     0,     0,  1581,     0,     0,   439,
-     440,     0,   441,   442,   132,   443,   444,   445,   134,  1582,
-     136,  1583,  1584,     0,   446,   447,   448,   449,   450,  1585,
-    1586,   451,   452,  1587,  1588,   453,     0,   454,   455,   456,
-     457,  1589,     0,  1590,     0,   458,   459,   460,   461,   147,
+     437,   438,     0,     0,     0,     0,  1582,     0,     0,   439,
+     440,     0,   441,   442,   132,   443,   444,   445,   134,  1583,
+     136,  1584,  1585,     0,   446,   447,   448,   449,   450,  1586,
+    1587,   451,   452,  1588,  1589,   453,     0,   454,   455,   456,
+     457,  1590,     0,  1591,     0,   458,   459,   460,   461,   147,
      462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
-       0,   150,   470,   471,     0,  1591,  1592,  1593,  1594,  1595,
-    1596,  1597,   473,   474,   475,   476,   722,   477,  1598,  1599,
+       0,   150,   470,   471,     0,  1592,  1593,  1594,  1595,  1596,
+    1597,  1598,   473,   474,   475,   476,   722,   477,  1599,  1600,
      478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
-     485,   486,   487,     0,     0,   488,   489,  1413,   491,   492,
+     485,   486,   487,     0,     0,   488,   489,  1414,   491,   492,
        0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
-     500,   501,   502,  1600,   503,   504,   505,  1601,  1602,   506,
-       0,   507,   508,  1603,   509,     0,   510,     0,   511,   168,
-       0,   169,   512,   513,   514,     0,   515,  1604,     0,  1605,
+     500,   501,   502,  1601,   503,   504,   505,  1602,  1603,   506,
+       0,   507,   508,  1604,   509,     0,   510,     0,   511,   168,
+       0,   169,   512,   513,   514,     0,   515,  1605,     0,  1606,
      516,     0,   517,   518,   724,   519,   520,   173,   521,   522,
      523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
-     531,   175,   176,     0,   532,   533,   534,  1416,  1606,     0,
-    1607,     0,   535,   179,   180,   536,   181,   537,   538,   539,
-     540,   541,     0,     0,   542,  1608,   183,   543,   184,     0,
-     544,   545,   546,  1609,  1610,   547,   548,   549,   550,   551,
+     531,   175,   176,     0,   532,   533,   534,  1417,  1607,     0,
+    1608,     0,   535,   179,   180,   536,   181,   537,   538,   539,
+     540,   541,     0,     0,   542,  1609,   183,   543,   184,     0,
+     544,   545,   546,  1610,  1611,   547,   548,   549,   550,   551,
      552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
-    1611,   190,  1612,   560,   561,   192,  1613,   562,   563,   194,
-     564,  1614,  1615,   565,  1616,   566,   567,   568,     0,   569,
-       0,     0,  1617,   571,   572,     0,     0,   573,   197,   198,
-     574,   199,  1618,   575,   576,   577,   578,   579,   580,   581,
-       0,   582,   583,  1619,   584,   202,   585,   586,   587,     0,
-     588,   589,   590,   591,   592,   593,   594,   595,  1620,   596,
+    1612,   190,  1613,   560,   561,   192,  1614,   562,   563,   194,
+     564,  1615,  1616,   565,  1617,   566,   567,   568,     0,   569,
+       0,     0,  1618,   571,   572,     0,     0,   573,   197,   198,
+     574,   199,  1619,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,  1620,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,  1621,   596,
      597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
      606,   607,   608,   609,   610,     0,   611,   612,   211,   613,
-     614,   615,  1621,   616,   617,   618,   619,   620,   621,   727,
-     622,   216,   623,   624,   625,   626,   627,  1622,   629,   630,
-     218,   631,   632,   220,   633,   634,  1623,   635,     0,   636,
+     614,   615,  1622,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,  1623,   629,   630,
+     218,   631,   632,   220,   633,   634,  1624,   635,     0,   636,
      637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
-    1624,     0,   647,   648,   224,   649,   225,   650,   651,   652,
-     653,   654,     0,  1625,  1626,     0,     0,   656,   657,  1627,
-     658,  1628,  1629,   659,   660,   661,   662,   663,   664,   665,
-       0,  1630,   666,   667,   668,   669,   670,  1631,     0,   671,
-     672,   673,   674,   675,  2315,  1632,     0,   676,   237,   677,
-     678,   679,   680,     0,     0,   681,     0,   238,   682,   683,
-     684,   685,   686,   687,   239,  1633,  1634,  1635,  1636,  1637,
-    1638,  1639,  1640,   729,   688,   689,  1641,     0,   248,     0,
-       0,     0,     0,  1642,  1643,     0,     0,     0,     0,     0,
-       0,     0,  1645,  5255,   753,    86,    87,    88,   705,    90,
+    1625,     0,   647,   648,     0,   649,   225,   650,   651,   652,
+     653,   654,     0,  1626,  1627,     0,     0,   656,   657,  1628,
+     658,  1629,  1630,   659,   660,   661,   662,   663,   664,   665,
+       0,  1631,   666,   667,   668,   669,   670,  1632,     0,   671,
+     672,   673,   674,   675,   728,  1633,     0,   676,   237,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,  1634,  1635,  1636,  1637,  1638,
+    1639,  1640,  1641,   729,   688,   689,  1642,     0,     0,     0,
+       0,     0,     0,  1643,  1644,     0,     0,     0,     0,     0,
+       0,     0,  1646,  4387,   753,    86,    87,    88,   705,    90,
       91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
      100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
      107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
      115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
        0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
        0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-     427,     0,     0,    37,    38,    39,    40,    41,    42,    43,
-      44,  1577,  1578,  1579,    45,  1580,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,  1581,
+     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
        0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
-     445,   134,  1582,   136,  1583,  1584,     0,   446,   447,   448,
-     449,   450,  1585,  1586,   451,   452,  1587,  1588,   453,     0,
-     454,   455,   456,   457,  1589,     0,  1590,     0,   458,   459,
+     445,     0,  1407,   136,  1408,  1409,     0,   446,   447,   448,
+     449,   450,     0,     0,   451,   452,  1410,  1411,   453,     0,
+     454,   455,   456,   457,     0,     0,   144,     0,   458,   459,
      460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,   150,   470,   471,     0,  1591,  1592,
-    1593,  1594,  1595,  1596,  1597,   473,   474,   475,   476,   722,
-     477,  1598,  1599,   478,     0,   479,     0,   480,   481,   482,
+     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
+       0,   151,     0,     0,     0,   473,   474,   475,   476,   722,
+     477,  1412,  1413,   478,     0,   479,     0,   480,   481,   482,
      483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-    1413,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,  1600,   503,   504,   505,
-    1601,  1602,   506,     0,   507,   508,  1603,   509,     0,   510,
+    1414,   491,   492,     0,   493,   494,   495,     0,   496,   497,
+     498,     0,   499,   500,   501,   502,     0,   503,   504,   505,
+       0,     0,   506,     0,   507,   508,  1415,   509,     0,   510,
        0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
-    1604,     0,  1605,   516,     0,   517,   518,   724,   519,   520,
-     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
-    1416,  1606,     0,  1607,     0,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,     0,     0,   542,  1608,   183,
-     543,   184,     0,   544,   545,   546,  1609,  1610,   547,   548,
+       0,     0,     0,   516,     0,   517,   518,   724,   519,   520,
+     173,   521,   522,   523,   524,  2523,   525,   526,   527,   528,
+     529,   530,     0,   531,   175,  2524,     0,   532,   533,   534,
+    1417,  1418,     0,  1419,     0,   535,   179,   180,   536,   181,
+     537,   538,   539,   540,   541,     0,     0,   542,     0,   183,
+     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
      549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,  1611,   190,  1612,   560,   561,   192,  1613,
-     562,   563,   194,   564,  1614,  1615,   565,  1616,   566,   567,
-     568,     0,   569,     0,     0,  1617,   571,   572,     0,     0,
-     573,   197,   198,   574,   199,  1618,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,  1619,   584,   202,   585,
+     557,   558,   559,  1420,   190,  1421,   560,   561,     0,     0,
+     562,   563,   194,   564,     0,     0,   565,  1422,   566,   567,
+     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
+     573,  2526,   198,   574,   199,     0,   575,   576,   577,   578,
+     579,   580,   581,     0,   582,   583,     0,   584,     0,   585,
      586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,  1620,   596,   597,   598,   599,     0,   600,   601,   602,
+     595,  1423,   596,   597,   598,   599,     0,   600,   601,   602,
      603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,   211,   613,   614,   615,  1621,   616,   617,   618,   619,
+     612,   211,   613,   614,   615,     0,   616,   617,   618,   619,
      620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-    1622,   629,   630,   218,   631,   632,   220,   633,   634,  1623,
+       0,   629,   630,  2527,   631,   632,   220,   633,   634,  1425,
      635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,  1624,     0,   647,   648,     0,   649,   225,
-     650,   651,   652,   653,   654,     0,  1625,  1626,     0,     0,
-     656,   657,  1627,   658,  1628,  1629,   659,   660,   661,   662,
-     663,   664,   665,     0,  1630,   666,   667,   668,   669,   670,
-    1631,     0,   671,   672,   673,   674,   675,   728,  1632,     0,
+     644,   645,   646,     0,     0,   647,   648,     0,   649,   225,
+     650,   651,   652,   653,   654,     0,  1426,  1427,     0,     0,
+     656,   657,     0,   658,     0,     0,   659,   660,   661,   662,
+     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
+       0,     0,   671,   672,   673,   674,   675,     0,  1428,  2528,
      676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,  1633,  1634,
-    1635,  1636,  1637,  1638,  1639,  1640,   729,   688,   689,  1641,
-       0,     0,     0,     0,     0,     0,  1642,  1643,     0,     0,
-       0,     0,     0,     0,     0,  1645,  3069,   753,    86,    87,
-      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,   754,   104,   105,
-     708,   755,     0,   107,   108,   109,   110,   756,   757,   112,
-     113,   114,     0,   115,   758,   759,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,   427,     0,     0,    37,    38,    39,    40,
-      41,    42,    43,    44,  1577,  1578,  1579,    45,  1580,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
-       0,     0,  1581,     0,     0,   439,   440,     0,   441,   442,
-     132,   443,   444,   445,   134,  1582,   136,  1583,  1584,     0,
-     446,   447,   448,   449,   450,  1585,  1586,   451,   452,  1587,
-    1588,   453,     0,   454,   455,   456,   457,  1589,     0,  1590,
-       0,   458,   459,   460,   461,   147,   462,   463,   720,     0,
-     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
-       0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,   473,   474,
-     475,   476,   722,   477,  1598,  1599,   478,     0,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,  1413,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,  1600,
-     503,   504,   505,  1601,  1602,   506,     0,   507,   508,  1603,
-     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
-     514,     0,   515,  1604,     0,  1605,   516,     0,   517,   518,
-     724,   519,   520,   173,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
-     532,   533,   534,  1416,  1606,     0,  1607,     0,   535,   179,
-     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
-     542,  1608,   183,   543,   184,     0,   544,   545,   546,  1609,
-    1610,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,  1611,   190,  1612,   560,
-     561,   192,  1613,   562,   563,   194,   564,  1614,  1615,   565,
-    1616,   566,   567,   568,     0,   569,     0,     0,  1617,   571,
-     572,     0,     0,   573,   197,   198,   574,   199,  1618,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,  1619,
-     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
-     592,   593,   594,   595,  1620,   596,   597,   598,   599,     0,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,   211,   613,   614,   615,  1621,   616,
-     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
-     625,   626,   627,  1622,   629,   630,   218,   631,   632,   220,
-     633,   634,  1623,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,  1624,     0,   647,   648,
-       0,   649,   225,   650,   651,   652,   653,   654,     0,  1625,
-    1626,     0,     0,   656,   657,  1627,   658,  1628,  1629,   659,
-     660,   661,   662,   663,   664,   665,     0,  1630,   666,   667,
-     668,   669,   670,  1631,     0,   671,   672,   673,   674,   675,
-     728,  1632,     0,   676,   237,   677,   678,   679,   680,     0,
-       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,
-     688,   689,  1641,     0,     0,     0,     0,     0,     0,  1642,
-    1643,     0,     0,     0,     0,     0,     0,     0,  1645,  4310,
-     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
-     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,   427,     0,     0,    37,
-      38,    39,    40,    41,    42,    43,    44,  1577,  1578,  1579,
-      45,  1580,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,  1581,     0,     0,   439,   440,
-       0,   441,   442,   132,   443,   444,   445,   134,  1582,   136,
-    1583,  1584,     0,   446,   447,   448,   449,   450,  1585,  1586,
-     451,   452,  1587,  1588,   453,     0,   454,   455,   456,   457,
-    1589,     0,  1590,     0,   458,   459,   460,   461,   147,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-     150,   470,   471,     0,  1591,  1592,  1593,  1594,  1595,  1596,
-    1597,   473,   474,   475,   476,   722,   477,  1598,  1599,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,  1413,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,  1600,   503,   504,   505,  1601,  1602,   506,     0,
-     507,   508,  1603,   509,     0,   510,     0,   511,   168,     0,
-     169,   512,   513,   514,     0,   515,  1604,     0,  1605,   516,
-       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-     175,   176,     0,   532,   533,   534,  1416,  1606,     0,  1607,
-       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
-     541,     0,     0,   542,  1608,   183,   543,   184,     0,   544,
-     545,   546,  1609,  1610,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,  1611,
-     190,  1612,   560,   561,   192,  1613,   562,   563,   194,   564,
-    1614,  1615,   565,  1616,   566,   567,   568,     0,   569,     0,
-       0,  1617,   571,   572,     0,     0,   573,   197,   198,   574,
-     199,  1618,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,  1619,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,  1620,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
-     615,  1621,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,  1622,   629,   630,   218,
-     631,   632,   220,   633,   634,  1623,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,  1624,
-       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
-     654,     0,  1625,  1626,     0,     0,   656,   657,  1627,   658,
-    1628,  1629,   659,   660,   661,   662,   663,   664,   665,     0,
-    1630,   666,   667,   668,   669,   670,  1631,     0,   671,   672,
-     673,   674,   675,   728,  1632,     0,   676,   237,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,  1633,  1634,  1635,  1636,  1637,  1638,
-    1639,  1640,   729,   688,   689,  1641,     0,     0,     0,     0,
-       0,     0,  1642,  1643,     0,     0,     0,     0,     0,     0,
-       0,  1645,  4381,   753,    86,    87,    88,   705,    90,    91,
-      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+       0,   682,   683,   684,   685,   686,   687,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   729,   688,   689,     0,
+       0,     0,     0,   753,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,  2632,    98,    99,   100,
      101,   102,   103,   754,   104,   105,   708,   755,     0,   107,
      108,   109,   110,   756,   757,   112,   113,   114,     0,   115,
      758,   759,   709,   710,     0,     0,     0,   711,   712,     0,
@@ -7100,1754 +7170,1195 @@
        0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
        0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
        0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
-       0,  1406,   136,  1407,  1408,     0,   446,   447,   448,   449,
-     450,     0,     0,   451,   452,  1409,  1410,   453,     0,   454,
+       0,  1407,   136,  1408,  1409,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,  1410,  1411,   453,     0,   454,
      455,   456,   457,     0,     0,   144,     0,   458,   459,   460,
      461,   147,   462,   463,   720,     0,   464,   465,   466,   467,
      468,   469,     0,   150,   470,   471,     0,     0,     0,     0,
      151,     0,     0,     0,   473,   474,   475,   476,   722,   477,
-    1411,  1412,   478,     0,   479,     0,   480,   481,   482,   483,
-     484,     0,   485,   486,   487,     0,     0,   488,   489,  1413,
+    1412,  1413,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,  1414,
      491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
        0,   499,   500,   501,   502,     0,   503,   504,   505,     0,
-       0,   506,     0,   507,   508,  1414,   509,     0,   510,     0,
+       0,   506,     0,   507,   508,  1415,   509,     0,   510,     0,
      511,   168,     0,   169,   512,   513,   514,     0,   515,     0,
        0,     0,   516,     0,   517,   518,   724,   519,   520,   173,
-     521,   522,   523,   524,  2520,   525,   526,   527,   528,   529,
-     530,     0,   531,   175,  2521,     0,   532,   533,   534,  1416,
-    1417,     0,  1418,     0,   535,   179,   180,   536,   181,   537,
+     521,   522,   523,   524,  2523,   525,   526,   527,   528,   529,
+     530,     0,   531,   175,  2524,     0,   532,   533,   534,  1417,
+    1418,     0,  1419,     0,   535,   179,   180,   536,   181,   537,
      538,   539,   540,   541,     0,     0,   542,     0,   183,   543,
      184,     0,   544,   545,   546,     0,     0,   547,   548,   549,
      550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
-     558,   559,  1419,   190,  1420,   560,   561,     0,     0,   562,
-     563,   194,   564,     0,     0,   565,  1421,   566,   567,   568,
+     558,   559,  1420,   190,  1421,   560,   561,     0,     0,   562,
+     563,   194,   564,     0,     0,   565,  1422,   566,   567,   568,
        0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
-    2523,   198,   574,   199,     0,   575,   576,   577,   578,   579,
+    2526,   198,   574,   199,     0,   575,   576,   577,   578,   579,
      580,   581,     0,   582,   583,     0,   584,     0,   585,   586,
      587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
-    1422,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+    1423,   596,   597,   598,   599,     0,   600,   601,   602,   603,
      604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
      211,   613,   614,   615,     0,   616,   617,   618,   619,   620,
      621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
-     629,   630,  2524,   631,   632,   220,   633,   634,  1424,   635,
+     629,   630,  2527,   631,   632,   220,   633,   634,  1425,   635,
        0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
      645,   646,     0,     0,   647,   648,     0,   649,   225,   650,
-     651,   652,   653,   654,     0,  1425,  1426,     0,     0,   656,
+     651,   652,   653,   654,     0,  1426,  1427,     0,     0,   656,
      657,     0,   658,     0,     0,   659,   660,   661,   662,   663,
      664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
-       0,   671,   672,   673,   674,   675,     0,  1427,  2525,   676,
+       0,   671,   672,   673,   674,   675,     0,  1428,  2528,   676,
      237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
      682,   683,   684,   685,   686,   687,     0,     0,     0,     0,
        0,     0,     0,     0,     0,   729,   688,   689,     0,     0,
        0,     0,   753,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,  2629,    98,    99,   100,   101,
+     706,     0,   707,    95,     0,  3617,    98,    99,   100,   101,
      102,   103,   754,   104,   105,   708,   755,     0,   107,   108,
      109,   110,   756,   757,   112,   113,   114,     0,   115,   758,
      759,   709,   710,     0,     0,     0,   711,   712,     0,     0,
        0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   714,     0,   715,     0,   716,   717,    35,   427,     0,
+       0,    37,    38,    39,    40,    41,    42,    43,    44,  1578,
+    1579,  1580,    45,  1581,     0,     0,     0,     0,     0,     0,
        0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,   132,   443,   444,   445,     0,
-    1406,   136,  1407,  1408,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,  1409,  1410,   453,     0,   454,   455,
-     456,   457,     0,     0,   144,     0,   458,   459,   460,   461,
+     436,   437,   438,     0,     0,     0,     0,  1582,     0,     0,
+     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
+    1583,   136,  1584,  1585,     0,   446,   447,   448,   449,   450,
+    1586,  1587,   451,   452,  1588,  1589,   453,     0,   454,   455,
+     456,   457,  1590,     0,  1591,     0,   458,   459,   460,   461,
      147,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,   150,   470,   471,     0,     0,     0,     0,   151,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,  1411,
-    1412,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,  1413,   491,
+     469,     0,   150,   470,   471,     0,  1592,  1593,  1594,  1595,
+    1596,  1597,  1598,   473,   474,   475,   476,   722,   477,  1599,
+    1600,   478,  1734,   479,     0,   480,   481,   482,   483,   484,
+       0,   485,   486,   487,     0,     0,   488,   489,  1414,   491,
      492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,     0,   503,   504,   505,     0,     0,
-     506,     0,   507,   508,  1414,   509,     0,   510,     0,   511,
-     168,     0,   169,   512,   513,   514,     0,   515,     0,     0,
-       0,   516,     0,   517,   518,   724,   519,   520,   173,   521,
-     522,   523,   524,  2520,   525,   526,   527,   528,   529,   530,
-       0,   531,   175,  2521,     0,   532,   533,   534,  1416,  1417,
-       0,  1418,     0,   535,   179,   180,   536,   181,   537,   538,
-     539,   540,   541,     0,     0,   542,     0,   183,   543,   184,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
+     499,   500,   501,   502,  1601,   503,   504,   505,  1602,  1603,
+     506,     0,   507,   508,  1604,   509,     0,   510,     0,   511,
+     168,     0,   169,   512,   513,   514,     0,   515,  1605,     0,
+    1606,   516,     0,   517,   518,   724,   519,   520,   173,   521,
+     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
+       0,   531,   175,   176,     0,   532,   533,   534,  1417,  1607,
+       0,  1608,     0,   535,   179,   180,   536,   181,   537,   538,
+     539,   540,   541,     0,     0,   542,  1609,   183,   543,   184,
+       0,   544,   545,   546,  1610,  1611,   547,   548,   549,   550,
      551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,  1419,   190,  1420,   560,   561,     0,     0,   562,   563,
-     194,   564,     0,     0,   565,  1421,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,  2523,
-     198,   574,   199,     0,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,     0,   584,     0,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,  1422,
+     559,  1612,   190,  1613,   560,   561,   192,  1614,   562,   563,
+     194,   564,  1615,  1616,   565,  1617,   566,   567,   568,     0,
+     569,     0,     0,  1618,   571,   572,     0,     0,   573,   197,
+     198,   574,   199,  1619,   575,   576,   577,   578,   579,   580,
+     581,     0,   582,   583,  1620,   584,   202,   585,   586,   587,
+       0,   588,   589,   590,   591,   592,   593,   594,   595,  1621,
      596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
      605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
-     613,   614,   615,     0,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,  2524,   631,   632,   220,   633,   634,  1424,   635,     0,
+     613,   614,   615,  1622,   616,   617,   618,   619,   620,   621,
+     727,   622,   216,   623,   624,   625,   626,   627,  1623,   629,
+     630,   218,   631,   632,   220,   633,   634,  1624,   635,     0,
      636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,     0,     0,   647,   648,     0,   649,   225,   650,   651,
-     652,   653,   654,     0,  1425,  1426,     0,     0,   656,   657,
-       0,   658,     0,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,     0,  1427,  2525,   676,   237,
+     646,  1625,     0,   647,   648,   224,   649,   225,   650,   651,
+     652,   653,   654,     0,  1626,  1627,     0,     0,   656,   657,
+    1628,   658,  1629,  1630,   659,   660,   661,   662,   663,   664,
+     665,     0,  1631,   666,   667,   668,   669,   670,  1632,     0,
+     671,   672,   673,   674,   675,  2317,  1633,     0,   676,   237,
+     677,   678,   679,   680,     0,     0,   681,     0,   238,   682,
+     683,   684,   685,   686,   687,   239,  1634,  1635,  1636,  1637,
+    1638,  1639,  1640,  1641,   729,   688,   689,  1642,     0,   248,
+       0,     0,     0,     0,  1643,  1644,     0,     0,     0,     0,
+       0,     0,     0,  1646,   753,    86,    87,    88,   705,    90,
+      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
+     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
+     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
+     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
+       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
+       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
+     427,     0,     0,    37,    38,    39,    40,    41,    42,    43,
+      44,  1578,  1579,  1580,    45,  1581,     0,     0,     0,     0,
+       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,     0,   436,   437,   438,     0,     0,     0,     0,  1582,
+       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
+     445,   134,  1583,   136,  1584,  1585,     0,   446,   447,   448,
+     449,   450,  1586,  1587,   451,   452,  1588,  1589,   453,     0,
+     454,   455,   456,   457,  1590,     0,  1591,     0,   458,   459,
+     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
+     467,   468,   469,     0,   150,   470,   471,     0,  1592,  1593,
+    1594,  1595,  1596,  1597,  1598,   473,   474,   475,   476,   722,
+     477,  1599,  1600,   478,     0,   479,     0,   480,   481,   482,
+     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
+    1414,   491,   492,     0,   493,   494,   495,     0,   496,   497,
+     498,     0,   499,   500,   501,   502,  1601,   503,   504,   505,
+    1602,  1603,   506,     0,   507,   508,  1604,   509,     0,   510,
+       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
+    1605,     0,  1606,   516,     0,   517,   518,   724,   519,   520,
+     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
+     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
+    1417,  1607,     0,  1608,     0,   535,   179,   180,   536,   181,
+     537,   538,   539,   540,   541,     0,     0,   542,  1609,   183,
+     543,   184,     0,   544,   545,   546,  1610,  1611,   547,   548,
+     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
+     557,   558,   559,  1612,   190,  1613,   560,   561,   192,  1614,
+     562,   563,   194,   564,  1615,  1616,   565,  1617,   566,   567,
+     568,     0,   569,     0,     0,  1618,   571,   572,     0,     0,
+     573,   197,   198,   574,   199,  1619,   575,   576,   577,   578,
+     579,   580,   581,     0,   582,   583,  1620,   584,   202,   585,
+     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
+     595,  1621,   596,   597,   598,   599,     0,   600,   601,   602,
+     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
+     612,   211,   613,   614,   615,  1622,   616,   617,   618,   619,
+     620,   621,   727,   622,   216,   623,   624,   625,   626,   627,
+    1623,   629,   630,   218,   631,   632,   220,   633,   634,  1624,
+     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
+     644,   645,   646,  1625,     0,   647,   648,   224,   649,   225,
+     650,   651,   652,   653,   654,     0,  1626,  1627,     0,     0,
+     656,   657,  1628,   658,  1629,  1630,   659,   660,   661,   662,
+     663,   664,   665,     0,  1631,   666,   667,   668,   669,   670,
+    1632,     0,   671,   672,   673,   674,   675,  2317,  1633,     0,
+     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
+     238,   682,   683,   684,   685,   686,   687,   239,  1634,  1635,
+    1636,  1637,  1638,  1639,  1640,  1641,   729,   688,   689,  1642,
+       0,   248,     0,     0,     0,     0,  1643,  1644,     0,     0,
+       0,     0,     0,     0,     0,  1646,   753,    86,    87,    88,
+     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
+      98,    99,   100,   101,   102,   103,   754,   104,   105,   708,
+     755,     0,   107,   108,   109,   110,   756,   757,   112,   113,
+     114,     0,   115,   758,   759,   709,   710,     0,     0,     0,
+     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
+       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
+     717,    35,   427,     0,     0,    37,    38,    39,    40,    41,
+      42,    43,    44,  1578,  1579,  1580,    45,  1581,     0,     0,
+       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
+       0,  1582,     0,     0,   439,   440,     0,   441,   442,   132,
+     443,   444,   445,   134,  1583,   136,  1584,  1585,  3081,   446,
+     447,   448,   449,   450,  1586,  1587,   451,   452,  1588,  1589,
+     453,     0,   454,   455,   456,   457,  1590,     0,  1591,     0,
+     458,   459,   460,   461,   147,   462,   463,   720,     0,   464,
+     465,   466,   467,   468,   469,     0,   150,   470,   471,     0,
+    1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,   474,   475,
+     476,   722,   477,  1599,  1600,   478,     0,   479,     0,   480,
+     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
+     488,   489,  1414,   491,   492,     0,   493,   494,   495,     0,
+     496,   497,   498,     0,   499,   500,   501,   502,  1601,   503,
+     504,   505,  1602,  1603,   506,     0,   507,   508,  1604,   509,
+       0,   510,     0,   511,   168,  3082,   169,   512,   513,   514,
+       0,   515,  1605,     0,  1606,   516,     0,   517,   518,   724,
+     519,   520,   173,   521,   522,   523,   524,     0,   525,   526,
+     527,   528,   529,   530,     0,   531,   175,   176,     0,   532,
+     533,   534,  1417,  1607,     0,  1608,     0,   535,   179,   180,
+     536,   181,   537,   538,   539,   540,   541,     0,  3083,   542,
+    1609,   183,   543,   184,     0,   544,   545,   546,  1610,  1611,
+     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
+     556,   726,   557,   558,   559,  1612,   190,  1613,   560,   561,
+     192,  1614,   562,   563,   194,   564,  1615,  1616,   565,  1617,
+     566,   567,   568,     0,   569,     0,     0,  1618,   571,   572,
+       0,     0,   573,   197,   198,   574,   199,  1619,   575,   576,
+     577,   578,   579,   580,   581,     0,   582,   583,  1620,   584,
+     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
+     593,   594,   595,  1621,   596,   597,   598,   599,     0,   600,
+     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
+       0,   611,   612,   211,   613,   614,   615,  1622,   616,   617,
+     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
+     626,   627,  1623,   629,   630,   218,   631,   632,   220,   633,
+     634,  1624,   635,     0,   636,   637,   638,   639,   640,   641,
+     642,   643,   644,   645,   646,  1625,     0,   647,   648,     0,
+     649,   225,   650,   651,   652,   653,   654,     0,  1626,  1627,
+       0,  3084,   656,   657,  1628,   658,  1629,  1630,   659,   660,
+     661,   662,   663,   664,   665,     0,  1631,   666,   667,   668,
+     669,   670,  1632,     0,   671,   672,   673,   674,   675,   728,
+    1633,     0,   676,   237,   677,   678,   679,   680,     0,     0,
+     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
+    1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,   729,   688,
+     689,  1642,     0,     0,     0,     0,     0,     0,  1643,  1644,
+       0,     0,     0,     0,     0,     0,     0,  1646,   753,    86,
+      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
+       0,     0,    98,    99,   100,   101,   102,   103,   754,   104,
+     105,   708,   755,     0,   107,   108,   109,   110,   756,   757,
+     112,   113,   114,     0,   115,   758,   759,   709,   710,     0,
+       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
+       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
+       0,   716,   717,    35,   427,     0,     0,    37,    38,    39,
+      40,    41,    42,    43,    44,  1578,  1579,  1580,    45,  1581,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
+       0,     0,     0,  1582,     0,     0,   439,   440,     0,   441,
+     442,   132,   443,   444,   445,   134,  1583,   136,  1584,  1585,
+       0,   446,   447,   448,   449,   450,  1586,  1587,   451,   452,
+    1588,  1589,   453,     0,   454,   455,   456,   457,  1590,     0,
+    1591,     0,   458,   459,   460,   461,   147,   462,   463,   720,
+       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
+     471,     0,  1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,
+     474,   475,   476,   722,   477,  1599,  1600,   478,     0,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,  1414,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+    1601,   503,   504,   505,  1602,  1603,   506,     0,   507,   508,
+    1604,   509,     0,   510,     0,   511,   168,     0,   169,   512,
+     513,   514,     0,   515,  1605,     0,  1606,   516,     0,   517,
+     518,   724,   519,   520,   173,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
+       0,   532,   533,   534,  1417,  1607,     0,  1608,     0,   535,
+     179,   180,   536,   181,   537,   538,   539,   540,   541,     0,
+       0,   542,  1609,   183,   543,   184,     0,   544,   545,   546,
+    1610,  1611,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,  1612,   190,  1613,
+     560,   561,   192,  1614,   562,   563,   194,   564,  1615,  1616,
+     565,  1617,   566,   567,   568,     0,   569,     0,     0,  1618,
+     571,   572,     0,     0,   573,   197,   198,   574,   199,  1619,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+    1620,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,  1621,   596,   597,   598,   599,
+       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612,   211,   613,   614,   615,  1622,
+     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
+     624,   625,   626,   627,  1623,   629,   630,   218,   631,   632,
+     220,   633,   634,  1624,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,  1625,     0,   647,
+     648,     0,   649,   225,   650,   651,   652,   653,   654,     0,
+    1626,  1627,     0,     0,   656,   657,  1628,   658,  1629,  1630,
+     659,   660,   661,   662,   663,   664,   665,     0,  1631,   666,
+     667,   668,   669,   670,  1632,     0,   671,   672,   673,   674,
+     675,   728,  1633,     0,   676,   237,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,   239,  1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,
+     729,   688,   689,  1642,     0,     0,     0,     0,     0,     0,
+    1643,  1644,     0,     0,     0,     0,     0,  2279,  3036,  1646,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
+     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
+     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
+       0,   715,     0,   716,   717,    35,   427,     0,     0,    37,
+      38,    39,    40,    41,    42,    43,    44,  1578,  1579,  1580,
+      45,  1581,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,  1582,     0,     0,   439,   440,
+       0,   441,   442,   132,   443,   444,   445,   134,  1583,   136,
+    1584,  1585,     0,   446,   447,   448,   449,   450,  1586,  1587,
+     451,   452,  1588,  1589,   453,     0,   454,   455,   456,   457,
+    1590,     0,  1591,     0,   458,   459,   460,   461,   147,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,     0,  1592,  1593,  1594,  1595,  1596,  1597,
+    1598,   473,   474,   475,   476,   722,   477,  1599,  1600,   478,
+       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
+     486,   487,     0,     0,   488,   489,  1414,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,  1601,   503,   504,   505,  1602,  1603,   506,     0,
+     507,   508,  1604,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,  1605,     0,  1606,   516,
+       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
+     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
+     175,   176,     0,   532,   533,   534,  1417,  1607,     0,  1608,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,  1609,   183,   543,   184,     0,   544,
+     545,   546,  1610,  1611,   547,   548,   549,   550,   551,   552,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,  1612,
+     190,  1613,   560,   561,   192,  1614,   562,   563,   194,   564,
+    1615,  1616,   565,  1617,   566,   567,   568,     0,   569,     0,
+       0,  1618,   571,   572,     0,     0,   573,   197,   198,   574,
+     199,  1619,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,  1620,   584,   202,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,  1621,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,  1622,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,  1623,   629,   630,   218,
+     631,   632,   220,   633,   634,  1624,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,  1625,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,  1626,  1627,     0,     0,   656,   657,  1628,   658,
+    1629,  1630,   659,   660,   661,   662,   663,   664,   665,     0,
+    1631,   666,   667,   668,   669,   670,  1632,     0,   671,   672,
+     673,   674,   675,   728,  1633,     0,   676,   237,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,   687,   239,  1634,  1635,  1636,  1637,  1638,  1639,
+    1640,  1641,   729,   688,   689,  1642,     0,     0,     0,     0,
+       0,     0,  1643,  1644,  1645,     0,     0,     0,     0,     0,
+       0,  1646,   753,    86,    87,    88,   705,    90,    91,    92,
+     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
+     102,   103,   754,   104,   105,   708,   755,     0,   107,   108,
+     109,   110,   756,   757,   112,   113,   114,     0,   115,   758,
+     759,   709,   710,     0,     0,     0,   711,   712,     0,     0,
+       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
+       0,   714,     0,   715,     0,   716,   717,    35,   427,     0,
+       0,    37,    38,    39,    40,    41,    42,    43,    44,  1578,
+    1579,  1580,    45,  1581,     0,     0,     0,     0,     0,     0,
+       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
+     436,   437,   438,     0,     0,     0,     0,  1582,     0,     0,
+     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
+    1583,   136,  1584,  1585,     0,   446,   447,   448,   449,   450,
+    1586,  1587,   451,   452,  1588,  1589,   453,     0,   454,   455,
+     456,   457,  1590,     0,  1591,     0,   458,   459,   460,   461,
+     147,   462,   463,   720,     0,   464,   465,   466,   467,   468,
+     469,     0,   150,   470,   471,     0,  1592,  1593,  1594,  1595,
+    1596,  1597,  1598,   473,   474,   475,   476,   722,   477,  1599,
+    1600,   478,  1734,   479,     0,   480,   481,   482,   483,   484,
+       0,   485,   486,   487,     0,     0,   488,   489,  1414,   491,
+     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
+     499,   500,   501,   502,  1601,   503,   504,   505,  1602,  1603,
+     506,     0,   507,   508,  1604,   509,     0,   510,     0,   511,
+     168,     0,   169,   512,   513,   514,     0,   515,  1605,     0,
+    1606,   516,     0,   517,   518,   724,   519,   520,   173,   521,
+     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
+       0,   531,   175,   176,     0,   532,   533,   534,  1417,  1607,
+       0,  1608,     0,   535,   179,   180,   536,   181,   537,   538,
+     539,   540,   541,     0,     0,   542,  1609,   183,   543,   184,
+       0,   544,   545,   546,  1610,  1611,   547,   548,   549,   550,
+     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
+     559,  1612,   190,  1613,   560,   561,   192,  1614,   562,   563,
+     194,   564,  1615,  1616,   565,  1617,   566,   567,   568,     0,
+     569,     0,     0,  1618,   571,   572,     0,     0,   573,   197,
+     198,   574,   199,  1619,   575,   576,   577,   578,   579,   580,
+     581,     0,   582,   583,  1620,   584,   202,   585,   586,   587,
+       0,   588,   589,   590,   591,   592,   593,   594,   595,  1621,
+     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
+     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
+     613,   614,   615,  1622,   616,   617,   618,   619,   620,   621,
+     727,   622,     0,   623,   624,   625,   626,   627,  1623,   629,
+     630,   218,   631,   632,   220,   633,   634,  1624,   635,     0,
+     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
+     646,  1625,     0,   647,   648,     0,   649,   225,   650,   651,
+     652,   653,   654,     0,  1626,  1627,     0,     0,   656,   657,
+    1628,   658,  1629,  1630,   659,   660,   661,   662,   663,   664,
+     665,     0,  1631,   666,   667,   668,   669,   670,  1632,     0,
+     671,   672,   673,   674,   675,   728,  1633,     0,   676,   237,
      677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   729,   688,   689,     0,     0,     0,
-       0,   753,    86,    87,    88,   705,    90,    91,    92,   706,
-       0,   707,    95,     0,  3611,    98,    99,   100,   101,   102,
-     103,   754,   104,   105,   708,   755,     0,   107,   108,   109,
-     110,   756,   757,   112,   113,   114,     0,   115,   758,   759,
-     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
-       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
-     714,     0,   715,     0,   716,   717,    35,   427,     0,     0,
-      37,    38,    39,    40,    41,    42,    43,    44,  1577,  1578,
-    1579,    45,  1580,     0,     0,     0,     0,     0,     0,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
-     437,   438,     0,     0,     0,     0,  1581,     0,     0,   439,
-     440,     0,   441,   442,   132,   443,   444,   445,   134,  1582,
-     136,  1583,  1584,     0,   446,   447,   448,   449,   450,  1585,
-    1586,   451,   452,  1587,  1588,   453,     0,   454,   455,   456,
-     457,  1589,     0,  1590,     0,   458,   459,   460,   461,   147,
-     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
-       0,   150,   470,   471,     0,  1591,  1592,  1593,  1594,  1595,
-    1596,  1597,   473,   474,   475,   476,   722,   477,  1598,  1599,
-     478,  1733,   479,     0,   480,   481,   482,   483,   484,     0,
-     485,   486,   487,     0,     0,   488,   489,  1413,   491,   492,
-       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
-     500,   501,   502,  1600,   503,   504,   505,  1601,  1602,   506,
-       0,   507,   508,  1603,   509,     0,   510,     0,   511,   168,
-       0,   169,   512,   513,   514,     0,   515,  1604,     0,  1605,
-     516,     0,   517,   518,   724,   519,   520,   173,   521,   522,
-     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
-     531,   175,   176,     0,   532,   533,   534,  1416,  1606,     0,
-    1607,     0,   535,   179,   180,   536,   181,   537,   538,   539,
-     540,   541,     0,     0,   542,  1608,   183,   543,   184,     0,
-     544,   545,   546,  1609,  1610,   547,   548,   549,   550,   551,
-     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
-    1611,   190,  1612,   560,   561,   192,  1613,   562,   563,   194,
-     564,  1614,  1615,   565,  1616,   566,   567,   568,     0,   569,
-       0,     0,  1617,   571,   572,     0,     0,   573,   197,   198,
-     574,   199,  1618,   575,   576,   577,   578,   579,   580,   581,
-       0,   582,   583,  1619,   584,   202,   585,   586,   587,     0,
-     588,   589,   590,   591,   592,   593,   594,   595,  1620,   596,
-     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
-     606,   607,   608,   609,   610,     0,   611,   612,   211,   613,
-     614,   615,  1621,   616,   617,   618,   619,   620,   621,   727,
-     622,   216,   623,   624,   625,   626,   627,  1622,   629,   630,
-     218,   631,   632,   220,   633,   634,  1623,   635,     0,   636,
-     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
-    1624,     0,   647,   648,   224,   649,   225,   650,   651,   652,
-     653,   654,     0,  1625,  1626,     0,     0,   656,   657,  1627,
-     658,  1628,  1629,   659,   660,   661,   662,   663,   664,   665,
-       0,  1630,   666,   667,   668,   669,   670,  1631,     0,   671,
-     672,   673,   674,   675,  2315,  1632,     0,   676,   237,   677,
-     678,   679,   680,     0,     0,   681,     0,   238,   682,   683,
-     684,   685,   686,   687,   239,  1633,  1634,  1635,  1636,  1637,
-    1638,  1639,  1640,   729,   688,   689,  1641,     0,   248,     0,
-       0,     0,     0,  1642,  1643,     0,     0,     0,     0,     0,
-       0,     0,  1645,   753,    86,    87,    88,   705,    90,    91,
-      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
-     101,   102,   103,   754,   104,   105,   708,   755,     0,   107,
-     108,   109,   110,   756,   757,   112,   113,   114,     0,   115,
-     758,   759,   709,   710,     0,     0,     0,   711,   712,     0,
-       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
-       0,     0,   714,     0,   715,     0,   716,   717,    35,   427,
-       0,     0,    37,    38,    39,    40,    41,    42,    43,    44,
-    1577,  1578,  1579,    45,  1580,     0,     0,     0,     0,     0,
-       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-       0,   436,   437,   438,     0,     0,     0,     0,  1581,     0,
-       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
-     134,  1582,   136,  1583,  1584,     0,   446,   447,   448,   449,
-     450,  1585,  1586,   451,   452,  1587,  1588,   453,     0,   454,
-     455,   456,   457,  1589,     0,  1590,     0,   458,   459,   460,
-     461,   147,   462,   463,   720,     0,   464,   465,   466,   467,
-     468,   469,     0,   150,   470,   471,     0,  1591,  1592,  1593,
-    1594,  1595,  1596,  1597,   473,   474,   475,   476,   722,   477,
-    1598,  1599,   478,     0,   479,     0,   480,   481,   482,   483,
-     484,     0,   485,   486,   487,     0,     0,   488,   489,  1413,
-     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
-       0,   499,   500,   501,   502,  1600,   503,   504,   505,  1601,
-    1602,   506,     0,   507,   508,  1603,   509,     0,   510,     0,
-     511,   168,     0,   169,   512,   513,   514,     0,   515,  1604,
-       0,  1605,   516,     0,   517,   518,   724,   519,   520,   173,
-     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
-     530,     0,   531,   175,   176,     0,   532,   533,   534,  1416,
-    1606,     0,  1607,     0,   535,   179,   180,   536,   181,   537,
-     538,   539,   540,   541,     0,     0,   542,  1608,   183,   543,
-     184,     0,   544,   545,   546,  1609,  1610,   547,   548,   549,
-     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
-     558,   559,  1611,   190,  1612,   560,   561,   192,  1613,   562,
-     563,   194,   564,  1614,  1615,   565,  1616,   566,   567,   568,
-       0,   569,     0,     0,  1617,   571,   572,     0,     0,   573,
-     197,   198,   574,   199,  1618,   575,   576,   577,   578,   579,
-     580,   581,     0,   582,   583,  1619,   584,   202,   585,   586,
-     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
-    1620,   596,   597,   598,   599,     0,   600,   601,   602,   603,
-     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
-     211,   613,   614,   615,  1621,   616,   617,   618,   619,   620,
-     621,   727,   622,   216,   623,   624,   625,   626,   627,  1622,
-     629,   630,   218,   631,   632,   220,   633,   634,  1623,   635,
-       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
-     645,   646,  1624,     0,   647,   648,   224,   649,   225,   650,
-     651,   652,   653,   654,     0,  1625,  1626,     0,     0,   656,
-     657,  1627,   658,  1628,  1629,   659,   660,   661,   662,   663,
-     664,   665,     0,  1630,   666,   667,   668,   669,   670,  1631,
-       0,   671,   672,   673,   674,   675,  2315,  1632,     0,   676,
-     237,   677,   678,   679,   680,     0,     0,   681,     0,   238,
-     682,   683,   684,   685,   686,   687,   239,  1633,  1634,  1635,
-    1636,  1637,  1638,  1639,  1640,   729,   688,   689,  1641,     0,
-     248,     0,     0,     0,     0,  1642,  1643,     0,     0,     0,
-       0,     0,     0,     0,  1645,   753,    86,    87,    88,   705,
-      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
-      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
-       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
-       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
-     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
-       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
-      35,   427,     0,     0,    37,    38,    39,    40,    41,    42,
-      43,    44,  1577,  1578,  1579,    45,  1580,     0,     0,     0,
-       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
-    1581,     0,     0,   439,   440,     0,   441,   442,   132,   443,
-     444,   445,   134,  1582,   136,  1583,  1584,  3075,   446,   447,
-     448,   449,   450,  1585,  1586,   451,   452,  1587,  1588,   453,
-       0,   454,   455,   456,   457,  1589,     0,  1590,     0,   458,
-     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
-     466,   467,   468,   469,     0,   150,   470,   471,     0,  1591,
-    1592,  1593,  1594,  1595,  1596,  1597,   473,   474,   475,   476,
-     722,   477,  1598,  1599,   478,     0,   479,     0,   480,   481,
-     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
-     489,  1413,   491,   492,     0,   493,   494,   495,     0,   496,
-     497,   498,     0,   499,   500,   501,   502,  1600,   503,   504,
-     505,  1601,  1602,   506,     0,   507,   508,  1603,   509,     0,
-     510,     0,   511,   168,  3076,   169,   512,   513,   514,     0,
-     515,  1604,     0,  1605,   516,     0,   517,   518,   724,   519,
-     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
-     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
-     534,  1416,  1606,     0,  1607,     0,   535,   179,   180,   536,
-     181,   537,   538,   539,   540,   541,     0,  3077,   542,  1608,
-     183,   543,   184,     0,   544,   545,   546,  1609,  1610,   547,
-     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
-     726,   557,   558,   559,  1611,   190,  1612,   560,   561,   192,
-    1613,   562,   563,   194,   564,  1614,  1615,   565,  1616,   566,
-     567,   568,     0,   569,     0,     0,  1617,   571,   572,     0,
-       0,   573,   197,   198,   574,   199,  1618,   575,   576,   577,
-     578,   579,   580,   581,     0,   582,   583,  1619,   584,   202,
-     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
-     594,   595,  1620,   596,   597,   598,   599,     0,   600,   601,
-     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
-     611,   612,   211,   613,   614,   615,  1621,   616,   617,   618,
-     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
-     627,  1622,   629,   630,   218,   631,   632,   220,   633,   634,
-    1623,   635,     0,   636,   637,   638,   639,   640,   641,   642,
-     643,   644,   645,   646,  1624,     0,   647,   648,     0,   649,
-     225,   650,   651,   652,   653,   654,     0,  1625,  1626,     0,
-    3078,   656,   657,  1627,   658,  1628,  1629,   659,   660,   661,
-     662,   663,   664,   665,     0,  1630,   666,   667,   668,   669,
-     670,  1631,     0,   671,   672,   673,   674,   675,   728,  1632,
-       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
-       0,     0,   682,   683,   684,   685,   686,   687,   239,  1633,
-    1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,   688,   689,
-    1641,     0,     0,     0,     0,     0,     0,  1642,  1643,     0,
-       0,     0,     0,     0,     0,     0,  1645,   753,    86,    87,
-      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,   754,   104,   105,
-     708,   755,     0,   107,   108,   109,   110,   756,   757,   112,
-     113,   114,     0,   115,   758,   759,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,   427,     0,     0,    37,    38,    39,    40,
-      41,    42,    43,    44,  1577,  1578,  1579,    45,  1580,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
-       0,     0,  1581,     0,     0,   439,   440,     0,   441,   442,
-     132,   443,   444,   445,   134,  1582,   136,  1583,  1584,     0,
-     446,   447,   448,   449,   450,  1585,  1586,   451,   452,  1587,
-    1588,   453,     0,   454,   455,   456,   457,  1589,     0,  1590,
-       0,   458,   459,   460,   461,   147,   462,   463,   720,     0,
-     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
-       0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,   473,   474,
-     475,   476,   722,   477,  1598,  1599,   478,     0,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,  1413,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,  1600,
-     503,   504,   505,  1601,  1602,   506,     0,   507,   508,  1603,
-     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
-     514,     0,   515,  1604,     0,  1605,   516,     0,   517,   518,
-     724,   519,   520,   173,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
-     532,   533,   534,  1416,  1606,     0,  1607,     0,   535,   179,
-     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
-     542,  1608,   183,   543,   184,     0,   544,   545,   546,  1609,
-    1610,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,  1611,   190,  1612,   560,
-     561,   192,  1613,   562,   563,   194,   564,  1614,  1615,   565,
-    1616,   566,   567,   568,     0,   569,     0,     0,  1617,   571,
-     572,     0,     0,   573,   197,   198,   574,   199,  1618,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,  1619,
-     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
-     592,   593,   594,   595,  1620,   596,   597,   598,   599,     0,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,   211,   613,   614,   615,  1621,   616,
-     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
-     625,   626,   627,  1622,   629,   630,   218,   631,   632,   220,
-     633,   634,  1623,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,  1624,     0,   647,   648,
-       0,   649,   225,   650,   651,   652,   653,   654,     0,  1625,
-    1626,     0,     0,   656,   657,  1627,   658,  1628,  1629,   659,
-     660,   661,   662,   663,   664,   665,     0,  1630,   666,   667,
-     668,   669,   670,  1631,     0,   671,   672,   673,   674,   675,
-     728,  1632,     0,   676,   237,   677,   678,   679,   680,     0,
-       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,
-     688,   689,  1641,     0,     0,     0,     0,     0,     0,  1642,
-    1643,     0,     0,     0,     0,     0,  2277,  3030,  1645,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,   427,     0,     0,    37,    38,
-      39,    40,    41,    42,    43,    44,  1577,  1578,  1579,    45,
-    1580,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,  1581,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,   134,  1582,   136,  1583,
-    1584,     0,   446,   447,   448,   449,   450,  1585,  1586,   451,
-     452,  1587,  1588,   453,     0,   454,   455,   456,   457,  1589,
-       0,  1590,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,
-     473,   474,   475,   476,   722,   477,  1598,  1599,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,  1413,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,  1600,   503,   504,   505,  1601,  1602,   506,     0,   507,
-     508,  1603,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,  1604,     0,  1605,   516,     0,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-     176,     0,   532,   533,   534,  1416,  1606,     0,  1607,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,  1608,   183,   543,   184,     0,   544,   545,
-     546,  1609,  1610,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,  1611,   190,
-    1612,   560,   561,   192,  1613,   562,   563,   194,   564,  1614,
-    1615,   565,  1616,   566,   567,   568,     0,   569,     0,     0,
-    1617,   571,   572,     0,     0,   573,   197,   198,   574,   199,
-    1618,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,  1619,   584,   202,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,  1620,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-    1621,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,  1622,   629,   630,   218,   631,
-     632,   220,   633,   634,  1623,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,  1624,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,  1625,  1626,     0,     0,   656,   657,  1627,   658,  1628,
-    1629,   659,   660,   661,   662,   663,   664,   665,     0,  1630,
-     666,   667,   668,   669,   670,  1631,     0,   671,   672,   673,
-     674,   675,   728,  1632,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,   239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,
-    1640,   729,   688,   689,  1641,     0,     0,     0,     0,     0,
-       0,  1642,  1643,  1644,     0,     0,     0,     0,     0,     0,
-    1645,   753,    86,    87,    88,   705,    90,    91,    92,   706,
-       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
-     103,   754,   104,   105,   708,   755,     0,   107,   108,   109,
-     110,   756,   757,   112,   113,   114,     0,   115,   758,   759,
-     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
-       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
-     714,     0,   715,     0,   716,   717,    35,   427,     0,     0,
-      37,    38,    39,    40,    41,    42,    43,    44,  1577,  1578,
-    1579,    45,  1580,     0,     0,     0,     0,     0,     0,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
-     437,   438,     0,     0,     0,     0,  1581,     0,     0,   439,
-     440,     0,   441,   442,   132,   443,   444,   445,   134,  1582,
-     136,  1583,  1584,     0,   446,   447,   448,   449,   450,  1585,
-    1586,   451,   452,  1587,  1588,   453,     0,   454,   455,   456,
-     457,  1589,     0,  1590,     0,   458,   459,   460,   461,   147,
-     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
-       0,   150,   470,   471,     0,  1591,  1592,  1593,  1594,  1595,
-    1596,  1597,   473,   474,   475,   476,   722,   477,  1598,  1599,
-     478,  1733,   479,     0,   480,   481,   482,   483,   484,     0,
-     485,   486,   487,     0,     0,   488,   489,  1413,   491,   492,
-       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
-     500,   501,   502,  1600,   503,   504,   505,  1601,  1602,   506,
-       0,   507,   508,  1603,   509,     0,   510,     0,   511,   168,
-       0,   169,   512,   513,   514,     0,   515,  1604,     0,  1605,
-     516,     0,   517,   518,   724,   519,   520,   173,   521,   522,
-     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
-     531,   175,   176,     0,   532,   533,   534,  1416,  1606,     0,
-    1607,     0,   535,   179,   180,   536,   181,   537,   538,   539,
-     540,   541,     0,     0,   542,  1608,   183,   543,   184,     0,
-     544,   545,   546,  1609,  1610,   547,   548,   549,   550,   551,
-     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
-    1611,   190,  1612,   560,   561,   192,  1613,   562,   563,   194,
-     564,  1614,  1615,   565,  1616,   566,   567,   568,     0,   569,
-       0,     0,  1617,   571,   572,     0,     0,   573,   197,   198,
-     574,   199,  1618,   575,   576,   577,   578,   579,   580,   581,
-       0,   582,   583,  1619,   584,   202,   585,   586,   587,     0,
-     588,   589,   590,   591,   592,   593,   594,   595,  1620,   596,
-     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
-     606,   607,   608,   609,   610,     0,   611,   612,   211,   613,
-     614,   615,  1621,   616,   617,   618,   619,   620,   621,   727,
-     622,     0,   623,   624,   625,   626,   627,  1622,   629,   630,
-     218,   631,   632,   220,   633,   634,  1623,   635,     0,   636,
-     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
-    1624,     0,   647,   648,     0,   649,   225,   650,   651,   652,
-     653,   654,     0,  1625,  1626,     0,     0,   656,   657,  1627,
-     658,  1628,  1629,   659,   660,   661,   662,   663,   664,   665,
-       0,  1630,   666,   667,   668,   669,   670,  1631,     0,   671,
-     672,   673,   674,   675,   728,  1632,     0,   676,   237,   677,
-     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
-     684,   685,   686,   687,   239,  1633,  1634,  1635,  1636,  1637,
-    1638,  1639,  1640,   729,   688,   689,  1641,     0,     0,     0,
-       0,     0,     0,  1642,  1643,     0,     0,     0,     0,     0,
-       0,     0,  1645,   753,    86,    87,    88,   705,    90,    91,
-      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
-     101,   102,   103,   754,   104,   105,   708,   755,     0,   107,
-     108,   109,   110,   756,   757,   112,   113,   114,     0,   115,
-     758,   759,   709,   710,     0,     0,     0,   711,   712,     0,
-       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
-       0,     0,   714,     0,   715,     0,   716,   717,    35,   427,
-       0,     0,    37,    38,    39,    40,    41,    42,    43,    44,
-    1577,  1578,  1579,    45,  1580,     0,     0,     0,     0,     0,
-       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-    2447,   436,   437,   438,     0,     0,     0,     0,  1581,     0,
-       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
-     134,  1582,   136,  1583,  1584,     0,   446,   447,   448,   449,
-     450,  1585,  1586,   451,   452,  1587,  1588,   453,     0,   454,
-     455,   456,   457,  1589,     0,  1590,     0,   458,   459,   460,
-     461,   147,   462,   463,   720,     0,   464,   465,   466,   467,
-     468,   469,     0,   150,   470,   471,     0,  1591,  1592,  1593,
-    1594,  1595,  1596,  1597,   473,   474,   475,   476,   722,   477,
-    1598,  1599,   478,     0,   479,     0,   480,   481,   482,   483,
-     484,     0,   485,   486,   487,     0,     0,   488,   489,  1413,
-     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
-       0,   499,   500,   501,   502,  1600,   503,   504,   505,  1601,
-    1602,   506,     0,   507,   508,  1603,   509,     0,   510,     0,
-     511,   168,     0,   169,   512,   513,   514,     0,   515,  1604,
-       0,  1605,   516,     0,   517,   518,   724,   519,   520,   173,
-     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
-     530,     0,   531,   175,   176,     0,   532,   533,   534,  1416,
-    1606,     0,  1607,     0,   535,   179,   180,   536,   181,   537,
-     538,   539,   540,   541,     0,     0,   542,  1608,   183,   543,
-     184,     0,   544,   545,   546,  1609,  1610,   547,   548,   549,
-     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
-     558,   559,  1611,   190,  1612,   560,   561,   192,  1613,   562,
-     563,   194,   564,  1614,  1615,   565,  1616,   566,   567,   568,
-       0,   569,     0,     0,  1617,   571,   572,     0,     0,   573,
-     197,   198,   574,   199,  1618,   575,   576,   577,   578,   579,
-     580,   581,     0,   582,   583,  1619,   584,   202,   585,   586,
-     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
-    1620,   596,   597,   598,   599,     0,   600,   601,   602,   603,
-     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
-     211,   613,   614,   615,  1621,   616,   617,   618,   619,   620,
-     621,   727,   622,     0,   623,   624,   625,   626,   627,  1622,
-     629,   630,   218,   631,   632,   220,   633,   634,  1623,   635,
-       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
-     645,   646,  1624,     0,   647,   648,     0,   649,   225,   650,
-     651,   652,   653,   654,     0,  1625,  1626,     0,     0,   656,
-     657,  1627,   658,  1628,  1629,   659,   660,   661,   662,   663,
-     664,   665,     0,  1630,   666,   667,   668,   669,   670,  1631,
-       0,   671,   672,   673,   674,   675,   728,  1632,     0,   676,
-     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
-     682,   683,   684,   685,   686,   687,   239,  1633,  1634,  1635,
-    1636,  1637,  1638,  1639,  1640,   729,   688,   689,  1641,     0,
-       0,     0,     0,     0,     0,  1642,  1643,     0,     0,     0,
-       0,     0,     0,     0,  1645,   753,    86,    87,    88,   705,
-      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
-      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
-       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
-       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
-     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
-       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
-      35,   427,     0,     0,    37,    38,    39,    40,    41,    42,
-      43,    44,  1577,  1578,  1579,    45,  1580,     0,     0,     0,
-       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
-    1581,     0,     0,   439,   440,     0,   441,   442,   132,   443,
-     444,   445,   134,  1582,   136,  1583,  1584,     0,   446,   447,
-     448,   449,   450,  1585,  1586,   451,   452,  1587,  1588,   453,
-       0,   454,   455,   456,   457,  1589,     0,  1590,     0,   458,
-     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
-     466,   467,   468,   469,     0,   150,   470,   471,     0,  1591,
-    1592,  1593,  1594,  1595,  1596,  1597,   473,   474,   475,   476,
-     722,   477,  1598,  1599,   478,     0,   479,     0,   480,   481,
-     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
-     489,  1413,   491,   492,     0,   493,   494,   495,     0,   496,
-     497,   498,     0,   499,   500,   501,   502,  1600,   503,   504,
-     505,  1601,  1602,   506,     0,   507,   508,  1603,   509,     0,
-     510,     0,   511,   168,  3076,   169,   512,   513,   514,     0,
-     515,  1604,     0,  1605,   516,     0,   517,   518,   724,   519,
-     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
-     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
-     534,  1416,  1606,     0,  1607,     0,   535,   179,   180,   536,
-     181,   537,   538,   539,   540,   541,     0,     0,   542,  1608,
-     183,   543,   184,     0,   544,   545,   546,  1609,  1610,   547,
-     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
-     726,   557,   558,   559,  1611,   190,  1612,   560,   561,   192,
-    1613,   562,   563,   194,   564,  1614,  1615,   565,  1616,   566,
-     567,   568,     0,   569,     0,     0,  1617,   571,   572,     0,
-       0,   573,   197,   198,   574,   199,  1618,   575,   576,   577,
-     578,   579,   580,   581,     0,   582,   583,  1619,   584,   202,
-     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
-     594,   595,  1620,   596,   597,   598,   599,     0,   600,   601,
-     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
-     611,   612,   211,   613,   614,   615,  1621,   616,   617,   618,
-     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
-     627,  1622,   629,   630,   218,   631,   632,   220,   633,   634,
-    1623,   635,     0,   636,   637,   638,   639,   640,   641,   642,
-     643,   644,   645,   646,  1624,     0,   647,   648,     0,   649,
-     225,   650,   651,   652,   653,   654,     0,  1625,  1626,     0,
-       0,   656,   657,  1627,   658,  1628,  1629,   659,   660,   661,
-     662,   663,   664,   665,     0,  1630,   666,   667,   668,   669,
-     670,  1631,     0,   671,   672,   673,   674,   675,   728,  1632,
-       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
-       0,     0,   682,   683,   684,   685,   686,   687,   239,  1633,
-    1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,   688,   689,
-    1641,     0,     0,     0,     0,     0,     0,  1642,  1643,     0,
-       0,     0,     0,     0,     0,     0,  1645,   753,    86,    87,
-      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,   754,   104,   105,
-     708,   755,     0,   107,   108,   109,   110,   756,   757,   112,
-     113,   114,     0,   115,   758,   759,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,   427,     0,     0,    37,    38,    39,    40,
-      41,    42,    43,    44,  1577,  1578,  1579,    45,  1580,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
-       0,     0,  1581,     0,     0,   439,   440,     0,   441,   442,
-     132,   443,   444,   445,   134,  1582,   136,  1583,  1584,     0,
-     446,   447,   448,   449,   450,  1585,  1586,   451,   452,  1587,
-    1588,   453,     0,   454,   455,   456,   457,  1589,     0,  1590,
-       0,   458,   459,   460,   461,   147,   462,   463,   720,     0,
-     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
-       0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,   473,   474,
-     475,   476,   722,   477,  1598,  1599,   478,     0,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,  1413,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,  1600,
-     503,   504,   505,  1601,  1602,   506,     0,   507,   508,  1603,
-     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
-     514,     0,   515,  1604,     0,  1605,   516,     0,   517,   518,
-     724,   519,   520,   173,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
-     532,   533,   534,  1416,  1606,     0,  1607,     0,   535,   179,
-     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
-     542,  1608,   183,   543,   184,     0,   544,   545,   546,  1609,
-    1610,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,  1611,   190,  1612,   560,
-     561,   192,  1613,   562,   563,   194,   564,  1614,  1615,   565,
-    1616,   566,   567,   568,     0,   569,     0,     0,  1617,   571,
-     572,     0,     0,   573,   197,   198,   574,   199,  1618,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,  1619,
-     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
-     592,   593,   594,   595,  1620,   596,   597,   598,   599,     0,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,   211,   613,   614,   615,  1621,   616,
-     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
-     625,   626,   627,  1622,   629,   630,   218,   631,   632,   220,
-     633,   634,  1623,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,  1624,     0,   647,   648,
-       0,   649,   225,   650,   651,   652,   653,   654,     0,  1625,
-    1626,     0,     0,   656,   657,  1627,   658,  1628,  1629,   659,
-     660,   661,   662,   663,   664,   665,     0,  1630,   666,   667,
-     668,   669,   670,  1631,     0,   671,   672,   673,   674,   675,
-     728,  1632,  4428,   676,   237,   677,   678,   679,   680,     0,
-       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,
-     688,   689,  1641,     0,     0,     0,     0,     0,     0,  1642,
-    1643,     0,     0,     0,     0,     0,     0,     0,  1645,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,   427,     0,     0,    37,    38,
-      39,    40,    41,    42,    43,    44,  1577,  1578,  1579,    45,
-    1580,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,  1581,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,   134,  1582,   136,  1583,
-    1584,     0,   446,   447,   448,   449,   450,  1585,  1586,   451,
-     452,  1587,  1588,   453,     0,   454,   455,   456,   457,  1589,
-       0,  1590,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,  4444,  1591,  1592,  1593,  1594,  1595,  1596,  1597,
-     473,   474,   475,   476,   722,   477,  1598,  1599,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,  1413,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,  1600,   503,   504,   505,  1601,  1602,   506,     0,   507,
-     508,  1603,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,  1604,     0,  1605,   516,     0,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-     176,     0,   532,   533,   534,  1416,  1606,     0,  1607,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,  1608,   183,   543,   184,     0,   544,   545,
-     546,  1609,  1610,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,  1611,   190,
-    1612,   560,   561,   192,  1613,   562,   563,   194,   564,  1614,
-    1615,   565,  1616,   566,   567,   568,     0,   569,     0,     0,
-    1617,   571,   572,     0,     0,   573,   197,   198,   574,   199,
-    1618,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,  1619,   584,   202,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,  1620,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-    1621,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,  1622,   629,   630,   218,   631,
-     632,   220,   633,   634,  1623,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,  1624,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,  1625,  1626,     0,     0,   656,   657,  1627,   658,  1628,
-    1629,   659,   660,   661,   662,   663,   664,   665,     0,  1630,
-     666,   667,   668,   669,   670,  1631,     0,   671,   672,   673,
-     674,   675,   728,  1632,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,   239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,
-    1640,   729,   688,   689,  1641,     0,     0,     0,     0,     0,
-       0,  1642,  1643,     0,     0,     0,     0,     0,     0,     0,
-    1645,   753,    86,    87,    88,   705,    90,    91,    92,   706,
-       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
-     103,   754,   104,   105,   708,   755,     0,   107,   108,   109,
-     110,   756,   757,   112,   113,   114,     0,   115,   758,   759,
-     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
-       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
-     714,     0,   715,     0,   716,   717,    35,   427,     0,     0,
-      37,    38,    39,    40,    41,    42,    43,    44,  1577,  1578,
-    1579,    45,  1580,     0,     0,     0,     0,     0,     0,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
-     437,   438,     0,     0,     0,     0,  1581,     0,     0,   439,
-     440,     0,   441,   442,   132,   443,   444,   445,  5438,  1582,
-     136,  1583,  1584,     0,   446,   447,   448,   449,   450,  1585,
-    1586,   451,   452,  1587,  1588,   453,     0,   454,   455,   456,
-     457,  1589,     0,  1590,     0,   458,   459,   460,   461,   147,
-     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
-       0,   150,   470,   471,  5439,  1591,  1592,  1593,  1594,  1595,
-    1596,  1597,   473,   474,   475,   476,   722,   477,  1598,  1599,
-     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
-     485,   486,   487,     0,     0,   488,   489,  1413,   491,   492,
-       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
-     500,   501,   502,  1600,   503,   504,   505,  1601,  1602,   506,
-       0,   507,   508,  1603,   509,     0,   510,     0,   511,   168,
-       0,   169,   512,   513,   514,     0,   515,  1604,     0,  1605,
-     516,     0,   517,   518,   724,   519,   520,   173,   521,   522,
-     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
-     531,   175,   176,     0,   532,   533,   534,  1416,  1606,     0,
-    1607,     0,   535,   179,   180,   536,   181,   537,   538,   539,
-     540,   541,     0,     0,   542,  1608,   183,   543,   184,     0,
-     544,   545,   546,  1609,  1610,   547,   548,   549,   550,   551,
-     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
-    1611,   190,  1612,   560,   561,   192,  1613,   562,   563,   194,
-     564,  1614,  1615,   565,  1616,   566,   567,   568,     0,   569,
-       0,     0,  1617,   571,   572,     0,     0,   573,   197,   198,
-     574,   199,  1618,   575,   576,   577,   578,   579,   580,   581,
-       0,   582,   583,  1619,   584,   202,   585,   586,   587,     0,
-     588,   589,   590,   591,   592,   593,   594,   595,  1620,   596,
-     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
-     606,   607,   608,   609,   610,     0,   611,   612,   211,   613,
-     614,   615,  1621,   616,   617,   618,   619,   620,   621,   727,
-     622,     0,   623,   624,   625,   626,   627,  1622,   629,   630,
-     218,   631,   632,   220,   633,   634,  1623,   635,     0,   636,
-     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
-    1624,     0,   647,   648,     0,   649,   225,   650,   651,   652,
-     653,   654,     0,  1625,  1626,     0,     0,   656,   657,  1627,
-     658,  1628,  1629,   659,   660,   661,   662,  5440,   664,   665,
-       0,  1630,   666,   667,   668,   669,   670,  1631,     0,   671,
-     672,   673,   674,   675,   728,  1632,     0,   676,   237,   677,
-     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
-     684,   685,   686,   687,   239,  1633,  1634,  1635,  1636,  1637,
-    1638,  1639,  1640,   729,   688,   689,  1641,     0,     0,     0,
-       0,     0,     0,  1642,  1643,     0,     0,     0,     0,     0,
-       0,     0,  1645,   753,    86,    87,    88,   705,    90,    91,
-      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
-     101,   102,   103,   754,   104,   105,   708,   755,     0,   107,
-     108,   109,   110,   756,   757,   112,   113,   114,     0,   115,
-     758,   759,   709,   710,     0,     0,     0,   711,   712,     0,
-       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
-       0,     0,   714,     0,   715,     0,   716,   717,    35,   427,
-       0,     0,    37,    38,    39,    40,    41,    42,    43,    44,
-    1577,  1578,  1579,    45,  1580,     0,     0,     0,     0,     0,
-       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-       0,   436,   437,   438,     0,     0,     0,     0,  1581,     0,
-       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
-     134,  1582,   136,  1583,  1584,     0,   446,   447,   448,   449,
-     450,  1585,  1586,   451,   452,  1587,  1588,   453,     0,   454,
-     455,   456,   457,  1589,     0,  1590,     0,   458,   459,   460,
-     461,   147,   462,   463,   720,     0,   464,   465,   466,   467,
-     468,   469,     0,   150,   470,   471,  5439,  1591,  1592,  1593,
-    1594,  1595,  1596,  1597,   473,   474,   475,   476,   722,   477,
-    1598,  1599,   478,     0,   479,     0,   480,   481,   482,   483,
-     484,     0,   485,   486,   487,     0,     0,   488,   489,  1413,
-     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
-       0,   499,   500,   501,   502,  1600,   503,   504,   505,  1601,
-    1602,   506,     0,   507,   508,  1603,   509,     0,   510,     0,
-     511,   168,     0,   169,   512,   513,   514,     0,   515,  1604,
-       0,  1605,   516,     0,   517,   518,   724,   519,   520,   173,
-     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
-     530,     0,   531,   175,   176,     0,   532,   533,   534,  1416,
-    1606,     0,  1607,     0,   535,   179,   180,   536,   181,   537,
-     538,   539,   540,   541,     0,     0,   542,  1608,   183,   543,
-     184,     0,   544,   545,   546,  1609,  1610,   547,   548,   549,
-     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
-     558,   559,  1611,   190,  1612,   560,   561,   192,  1613,   562,
-     563,   194,   564,  1614,  1615,   565,  1616,   566,   567,   568,
-       0,   569,     0,     0,  1617,   571,   572,     0,     0,   573,
-     197,   198,   574,   199,  1618,   575,   576,   577,   578,   579,
-     580,   581,     0,   582,   583,  1619,   584,   202,   585,   586,
-     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
-    1620,   596,   597,   598,   599,     0,   600,   601,   602,   603,
-     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
-     211,   613,   614,   615,  1621,   616,   617,   618,   619,   620,
-     621,   727,   622,     0,   623,   624,   625,   626,   627,  1622,
-     629,   630,   218,   631,   632,   220,   633,   634,  1623,   635,
-       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
-     645,   646,  1624,     0,   647,   648,     0,   649,   225,   650,
-     651,   652,   653,   654,     0,  1625,  1626,     0,     0,   656,
-     657,  1627,   658,  1628,  1629,   659,   660,   661,   662,  5440,
-     664,   665,     0,  1630,   666,   667,   668,   669,   670,  1631,
-       0,   671,   672,   673,   674,   675,   728,  1632,     0,   676,
-     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
-     682,   683,   684,   685,   686,   687,   239,  1633,  1634,  1635,
-    1636,  1637,  1638,  1639,  1640,   729,   688,   689,  1641,     0,
-       0,     0,     0,     0,     0,  1642,  1643,     0,     0,     0,
-       0,     0,     0,     0,  1645,   753,    86,    87,    88,   705,
-      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
-      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
-       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
-       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
-     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
-       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
-      35,   427,     0,     0,    37,    38,    39,    40,    41,    42,
-      43,    44,  1577,  1578,  1579,    45,  1580,     0,     0,     0,
-       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
-    1581,     0,     0,   439,   440,     0,   441,   442,   132,   443,
-     444,   445,   134,  1582,   136,  1583,  1584,     0,   446,   447,
-     448,   449,   450,  1585,  1586,   451,   452,  1587,  1588,   453,
-       0,   454,   455,   456,   457,  1589,     0,  1590,     0,   458,
-     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
-     466,   467,   468,   469,     0,   150,   470,   471,     0,  1591,
-    1592,  1593,  1594,  1595,  1596,  1597,   473,   474,   475,   476,
-     722,   477,  1598,  1599,   478,     0,   479,     0,   480,   481,
-     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
-     489,  1413,   491,   492,     0,   493,   494,   495,     0,   496,
-     497,   498,     0,   499,   500,   501,   502,  1600,   503,   504,
-     505,  1601,  1602,   506,     0,   507,   508,  1603,   509,     0,
-     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
-     515,  1604,     0,  1605,   516,     0,   517,   518,   724,   519,
-     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
-     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
-     534,  1416,  1606,     0,  1607,     0,   535,   179,   180,   536,
-     181,   537,   538,   539,   540,   541,     0,     0,   542,  1608,
-     183,   543,   184,     0,   544,   545,   546,  1609,  1610,   547,
-     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
-     726,   557,   558,   559,  1611,   190,  1612,   560,   561,   192,
-    1613,   562,   563,   194,   564,  1614,  1615,   565,  1616,   566,
-     567,   568,     0,   569,     0,     0,  1617,   571,   572,     0,
-       0,   573,   197,   198,   574,   199,  1618,   575,   576,   577,
-     578,   579,   580,   581,     0,   582,   583,  1619,   584,   202,
-     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
-     594,   595,  1620,   596,   597,   598,   599,     0,   600,   601,
-     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
-     611,   612,   211,   613,   614,   615,  1621,   616,   617,   618,
-     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
-     627,  1622,   629,   630,   218,   631,   632,   220,   633,   634,
-    1623,   635,     0,   636,   637,   638,   639,   640,   641,   642,
-     643,   644,   645,   646,  1624,     0,   647,   648,     0,   649,
-     225,   650,   651,   652,   653,   654,     0,  1625,  1626,     0,
-       0,   656,   657,  1627,   658,  1628,  1629,   659,   660,   661,
-     662,   663,   664,   665,     0,  1630,   666,   667,   668,   669,
-     670,  1631,     0,   671,   672,   673,   674,   675,   728,  1632,
-       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
-       0,     0,   682,   683,   684,   685,   686,   687,   239,  1633,
-    1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,   688,   689,
-    1641,     0,     0,     0,     0,     0,     0,  1642,  1643,     0,
-       0,     0,     0,     0,     0,     0,  1645,   753,    86,    87,
-      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,   754,   104,   105,
-     708,   755,     0,   107,   108,   109,   110,   756,   757,   112,
-     113,   114,     0,   115,   758,   759,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,   427,     0,     0,    37,    38,    39,    40,
-      41,    42,    43,    44,  1577,  1578,  1579,    45,  1580,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
-       0,     0,  1581,     0,     0,   439,   440,     0,   441,   442,
-     132,   443,   444,   445,   134,  1582,   136,  1583,  1584,     0,
-     446,   447,   448,   449,   450,  1585,  1586,   451,   452,  1587,
-    1588,   453,     0,   454,   455,   456,   457,  1589,     0,  1590,
-       0,   458,   459,   460,   461,   147,   462,   463,   720,     0,
-     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
-       0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,   473,   474,
-     475,   476,   722,   477,  1598,  1599,   478,     0,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,  1413,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,  1600,
-     503,   504,   505,  1601,  1602,   506,     0,   507,   508,  1603,
-     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
-     514,     0,   515,  1604,     0,  1605,   516,     0,   517,   518,
-     724,   519,   520,   173,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
-     532,   533,   534,  1416,  1606,     0,  1607,     0,   535,   179,
-     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
-     542,  1608,   183,   543,   184,     0,   544,   545,   546,  1609,
-    1610,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,  1611,   190,  1612,   560,
-     561,   192,  1613,   562,   563,   194,   564,  1614,  1615,   565,
-    1616,   566,   567,   568,     0,   569,     0,     0,  1617,   571,
-     572,     0,     0,   573,   197,   198,   574,   199,  1618,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,  1619,
-     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
-     592,   593,   594,   595,  1620,   596,   597,   598,   599,     0,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,   211,   613,   614,   615,  1621,   616,
-     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
-     625,   626,   627,  1622,   629,   630,   218,   631,   632,   220,
-     633,   634,  1623,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,  1624,     0,   647,   648,
-       0,   649,   225,   650,   651,   652,   653,   654,     0,  1625,
-    1626,     0,     0,   656,   657,  1627,   658,  1628,  1629,   659,
-     660,   661,   662,   663,   664,   665,     0,  1630,   666,   667,
-     668,   669,   670,  1631,     0,   671,   672,   673,   674,   675,
-     728,  1632,     0,   676,   237,   677,   678,   679,   680,     0,
-       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-    4754,  1633,  1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,
-     688,   689,  1641,     0,     0,     0,     0,     0,     0,  1642,
-    1643,     0,     0,     0,     0,     0,     0,     0,  1645,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,   427,     0,     0,    37,    38,
-      39,    40,    41,    42,    43,    44,  1577,  1578,  1579,    45,
-    1580,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,  1581,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,   134,  1582,   136,  1583,
-    1584,     0,   446,   447,   448,   449,   450,  1585,  1586,   451,
-     452,  1587,  1588,   453,     0,   454,   455,   456,   457,  1589,
-       0,  1590,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,
-     473,   474,   475,   476,   722,   477,  1598,  1599,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,  1413,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,  1600,   503,   504,   505,  1601,  1602,   506,     0,   507,
-     508,  1603,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,  1604,     0,  1605,   516,     0,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-     176,     0,   532,   533,   534,  1416,  1606,     0,  1607,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,  1608,   183,   543,   184,     0,   544,   545,
-     546,  1609,  1610,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,  1611,   190,
-    1612,   560,  4763,   192,  1613,   562,   563,   194,   564,  1614,
-    1615,   565,  1616,   566,   567,   568,     0,   569,     0,     0,
-    1617,   571,   572,     0,     0,   573,   197,   198,   574,   199,
-    1618,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,  1619,   584,   202,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,  1620,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-    1621,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,  1622,   629,   630,   218,   631,
-     632,   220,   633,   634,  1623,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,  1624,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,  1625,  1626,     0,     0,   656,   657,  1627,   658,  1628,
-    1629,   659,   660,   661,   662,   663,   664,   665,     0,  1630,
-     666,   667,   668,   669,   670,  1631,     0,   671,   672,   673,
-     674,   675,   728,  1632,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,   239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,
-    1640,   729,   688,   689,  1641,     0,     0,     0,     0,     0,
-       0,  1642,  1643,     0,     0,     0,     0,     0,     0,     0,
-    1645,   753,    86,    87,    88,   705,    90,    91,    92,   706,
-       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
-     103,   754,   104,   105,   708,   755,     0,   107,   108,   109,
-     110,   756,   757,   112,   113,   114,     0,   115,   758,   759,
-     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
-       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
-     714,     0,   715,     0,   716,   717,    35,   427,     0,     0,
-      37,    38,    39,    40,    41,    42,    43,    44,  1577,  1578,
-    1579,    45,  1580,     0,     0,     0,     0,     0,     0,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
-     437,   438,     0,     0,     0,     0,  1581,     0,     0,   439,
-     440,     0,   441,   442,   132,   443,   444,   445,   134,  1582,
-     136,  1583,  1584,     0,   446,   447,   448,   449,   450,  1585,
-    1586,   451,   452,  1587,  1588,   453,     0,   454,   455,   456,
-     457,  1589,     0,  1590,     0,   458,   459,   460,   461,   147,
-     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
-       0,   150,   470,  5067,     0,  1591,  1592,  1593,  1594,  1595,
-    1596,  1597,   473,   474,   475,   476,   722,   477,  1598,  1599,
-     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
-     485,   486,   487,     0,     0,   488,   489,  1413,   491,   492,
-       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
-     500,   501,   502,  1600,   503,   504,   505,  1601,  1602,   506,
-       0,   507,   508,  1603,   509,     0,   510,     0,   511,   168,
-       0,   169,   512,   513,   514,     0,   515,  1604,     0,  5068,
-     516,     0,   517,   518,   724,   519,   520,   173,   521,   522,
-     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
-     531,   175,   176,     0,   532,   533,   534,  1416,  1606,     0,
-    1607,     0,   535,   179,   180,   536,   181,   537,   538,   539,
-     540,   541,     0,     0,   542,  1608,   183,   543,   184,     0,
-     544,   545,   546,  1609,  1610,   547,   548,   549,   550,   551,
-     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
-    1611,   190,  1612,   560,   561,   192,  1613,   562,   563,   194,
-     564,  1614,  1615,   565,  1616,   566,   567,   568,     0,   569,
-       0,     0,  1617,   571,   572,     0,     0,   573,   197,   198,
-     574,   199,  1618,   575,   576,   577,   578,   579,   580,   581,
-       0,   582,   583,  1619,   584,   202,   585,   586,   587,     0,
-     588,   589,   590,   591,   592,   593,   594,   595,  1620,   596,
-     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
-     606,   607,   608,   609,   610,     0,   611,   612,   211,   613,
-     614,  5069,  1621,   616,   617,   618,   619,   620,   621,   727,
-     622,     0,   623,   624,   625,   626,   627,  1622,   629,   630,
-     218,   631,   632,   220,   633,   634,  1623,   635,     0,   636,
-     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
-    1624,     0,   647,   648,     0,   649,   225,   650,   651,   652,
-     653,   654,     0,  1625,  1626,     0,     0,   656,   657,  1627,
-     658,  1628,  1629,   659,   660,   661,   662,   663,   664,   665,
-       0,  1630,   666,   667,   668,   669,   670,  1631,     0,   671,
-     672,   673,   674,   675,   728,  1632,     0,   676,   237,   677,
-     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
-     684,   685,   686,   687,   239,  1633,  1634,  1635,  1636,  1637,
-    1638,  1639,  1640,   729,   688,   689,  1641,     0,     0,     0,
-       0,     0,     0,  1642,  1643,     0,     0,     0,     0,     0,
-       0,     0,  5070,   753,    86,    87,    88,   705,    90,    91,
-      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
-     101,   102,   103,   754,   104,   105,   708,   755,     0,   107,
-     108,   109,   110,   756,   757,   112,   113,   114,     0,   115,
-     758,   759,   709,   710,     0,     0,     0,   711,   712,     0,
-       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
-       0,     0,   714,     0,   715,     0,   716,   717,    35,   427,
-       0,     0,    37,    38,    39,    40,    41,    42,    43,    44,
-    1577,  1578,  1579,    45,  1580,     0,     0,     0,     0,     0,
-       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-       0,   436,   437,   438,     0,     0,     0,     0,  1581,     0,
-       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
-   -2800,  1582,   136,  1583,  1584,     0,   446,   447,   448,   449,
-     450,  1585,  1586,   451,   452,  1587,  1588,   453,     0,   454,
-     455,   456,   457,  1589,     0,  1590,     0,   458,   459,   460,
-     461,   147,   462,   463,   720,     0,   464,   465,   466,   467,
-     468,   469,     0,   150,   470,   471,  5439,  1591,  1592,  1593,
-    1594,  1595,  1596,  1597,   473,   474,   475,   476,   722,   477,
-    1598,  1599,   478,     0,   479,     0,   480,   481,   482,   483,
-     484,     0,   485,   486,   487,     0,     0,   488,   489,  1413,
-     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
-       0,   499,   500,   501,   502,  1600,   503,   504,   505,  1601,
-    1602,   506,     0,   507,   508,  1603,   509,     0,   510,     0,
-     511,   168,     0,   169,   512,   513,   514,     0,   515,  1604,
-       0,  1605,   516,     0,   517,   518,   724,   519,   520, -2800,
-     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
-     530,     0,   531,   175,   176,     0,   532,   533,   534,  1416,
-    1606,     0,  1607,     0,   535,     0,     0,   536,   181,   537,
-     538,   539,   540,   541,     0,     0,   542,  1608,   183,   543,
-   -2800,     0,   544,   545,   546,  1609,  1610,   547,   548,   549,
-     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
-     558,   559,  1611,   190,  1612,   560,   561,   192,  1613,   562,
-     563,     0,   564,  1614,  1615,   565,  1616,   566,   567,   568,
-       0,   569,     0,     0,  1617,   571,   572,     0,     0,   573,
-     197,   198,   574,   199,  1618,   575,   576,   577,   578,   579,
-     580,   581,     0,   582,   583,  1619,   584,   202,   585,   586,
-     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
-    1620,   596,   597,   598,   599,     0,   600,   601,   602,   603,
-     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
-     211,   613,   614,   615,  1621,   616,   617,   618,   619,   620,
-     621,   727,   622,     0,   623,   624,   625,   626,   627,  1622,
-     629,   630,   218,   631,   632, -2800,   633,   634,  1623,   635,
-       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
-     645,   646,  1624,     0,   647,   648,     0,   649,   225,   650,
-     651,   652,   653,   654,     0,  1625,  1626,     0,     0,   656,
-     657,  1627,   658,  1628,  1629,   659,   660,   661,   662,  5440,
-     664,   665,     0,  1630,   666,   667,   668,   669,   670,  1631,
-       0,   671,   672,   673,   674,   675,   728,  1632,     0,   676,
-     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
-     682,   683,   684,   685,   686,   687,   239,  1633,  1634,  1635,
-    1636,  1637,  1638,  1639,  1640,   729,   688,   689, -2800,     0,
-       0,     0,     0,     0,     0,  1642,  1643,     0,     0,     0,
-       0,     0,     0,     0,  1645,   753,    86,    87,    88,   705,
-      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
-      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
-       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
-       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
-     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
-       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
-      35,   427,     0,     0,    37,    38,    39,    40,    41,    42,
-      43,    44,  1577,  1578,  1579,    45,  1580,     0,     0,     0,
-       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
-    1581,     0,     0,   439,   440,     0,   441,   442,   132,   443,
-     444,   445,   134,  1582,   136,  1583,  1584,     0,   446,   447,
-     448,   449,   450,  1585,  1586,   451,   452,  1587,  1588,   453,
-       0,   454,   455,   456,   457,  1589,     0,  1590,     0,   458,
-     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
-     466,   467,   468,   469,     0,   150,   470,   471,     0,  1591,
-    1592,  1593,  1594,  1595,  1596,  1597,   473,   474,   475,   476,
-     722,   477,  1598,  1599,   478,     0,   479,     0,   480,   481,
-     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
-     489,  1413,   491,   492,     0,   493,   494,   495,     0,   496,
-     497,   498,     0,   499,   500,   501,   502,  1600,   503,   504,
-     505,  1601,  1602,   506,     0,   507,   508,  1603,   509,     0,
-     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
-     515,  1604,     0,  1605,   516,     0,   517,   518,   724,   519,
-     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
-     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
-     534,  1416,  1606,     0,  1607,     0,   535,   179,   180,   536,
-     181,   537,   538,   539,   540,   541,     0,     0,   542,  1608,
-     183,   543,   184,     0,   544,   545,   546,  1609,  1610,   547,
-     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
-     726,   557,   558,   559,  1611,   190,  1612,   560,   561,   192,
-       0,   562,   563,   194,   564,  1614,  1615,   565,  1616,   566,
-     567,   568,     0,   569,     0,     0,  1617,   571,   572,     0,
-       0,   573,   197,   198,   574,   199,  1618,   575,   576,   577,
-     578,   579,   580,   581,     0,   582,   583,  1619,   584,   202,
-     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
-     594,   595,  1620,   596,   597,   598,   599,     0,   600,   601,
-     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
-     611,   612,   211,   613,   614,   615,  3061,   616,   617,   618,
-     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
-     627,  1622,   629,   630,   218,   631,   632,   220,   633,   634,
-    1623,   635,     0,   636,   637,   638,   639,   640,   641,   642,
-     643,   644,   645,   646,  1624,     0,   647,   648,     0,   649,
-     225,   650,   651,   652,   653,   654,     0,  1625,  1626,     0,
-       0,   656,   657,  1627,   658,  1628,  1629,   659,   660,   661,
-     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
-     670,  1631,     0,   671,   672,   673,   674,   675,   728,  1632,
-       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
-       0,     0,   682,   683,   684,   685,   686,   687,   239,  1633,
-    1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,   688,   689,
-       0,     0,     0,     0,     0,     0,     0,  3062,  3063,     0,
-       0,     0,     0,     0,     0,     0,  3064,   753,    86,    87,
-      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,   754,   104,   105,
-     708,   755,     0,   107,   108,   109,   110,   756,   757,   112,
-     113,   114,     0,   115,   758,   759,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,   427,     0,     0,    37,    38,    39,    40,
-      41,    42,    43,    44,  1577,  1578,  1579,    45,  1580,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
-       0,     0,  1581,     0,     0,   439,   440,     0,   441,   442,
-     132,   443,   444,   445,   134,  1582,   136,  1583,  1584,     0,
-     446,   447,   448,   449,   450,  1585,  1586,   451,   452,  1587,
-    1588,   453,     0,   454,   455,   456,   457,  1589,     0,  1590,
-       0,   458,   459,   460,   461,   147,   462,   463,   720,     0,
-     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
-       0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,   473,   474,
-     475,   476,   722,   477,  1598,  1599,   478,     0,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,  1413,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,  1600,
-     503,   504,   505,  1601,  1602,   506,     0,   507,   508,  1603,
-     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
-     514,     0,   515,  1604,     0,  1605,   516,     0,   517,   518,
-     724,   519,   520,   173,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
-     532,   533,   534,  1416,  1606,     0,  1607,     0,   535,     0,
-     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
-     542,  1608,   183,   543,   184,     0,   544,   545,   546,  1609,
-    1610,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,  1611,   190,  1612,   560,
-     561,   192,     0,   562,   563,   194,   564,  1614,  1615,   565,
-    1616,   566,   567,   568,     0,   569,     0,     0,  1617,   571,
-     572,     0,     0,   573,   197,   198,   574,   199,  1618,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,  1619,
-     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
-     592,   593,   594,   595,  1620,   596,   597,   598,   599,     0,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,   211,   613,   614,   615,  3061,   616,
-     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
-     625,   626,   627,  1622,   629,   630,   218,   631,   632,   220,
-     633,   634,  1623,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,  1624,     0,   647,   648,
-       0,   649,   225,   650,   651,   652,   653,   654,     0,  1625,
-    1626,     0,     0,   656,   657,  1627,   658,  1628,  1629,   659,
-     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
-     668,   669,   670,  1631,     0,   671,   672,   673,   674,   675,
-     728,  1632,     0,   676,   237,   677,   678,   679,   680,     0,
-       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,
-     688,   689,     0,     0,     0,     0,     0,     0,     0,  3062,
-    3063,     0,     0,     0,     0,     0,     0,     0,  3064,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,   427,     0,     0,    37,    38,
-      39,    40,    41,    42,    43,    44,  1577,  1578,     0,    45,
-    1580,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,  1581,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,   134,  1582,   136,  1583,
-    1584,     0,   446,   447,   448,   449,   450,  1585,  1586,   451,
-     452,  1587,  1588,   453,     0,   454,   455,   456,   457,  1589,
-       0,  1590,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,
-     473,   474,   475,   476,   722,   477,  1598,  1599,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,  1413,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,  1600,   503,   504,   505,  1601,  1602,   506,     0,   507,
-     508,  1603,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,  1604,     0,  1605,   516,     0,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-     176,     0,   532,   533,   534,  1416,  1606,     0,  1607,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,  1608,   183,   543,   184,     0,   544,   545,
-     546,  1609,  1610,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,  1611,   190,
-    1612,   560,   561,   192,     0,   562,   563,   194,   564,  1614,
-    1615,   565,  1616,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,   197,   198,   574,   199,
-    1618,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,  1619,   584,   202,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,  1620,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-    3061,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,  1622,   629,   630,   218,   631,
-     632,   220,   633,   634,  1623,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,  1624,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,  1625,  1626,     0,     0,   656,   657,  1627,   658,  1628,
-    1629,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,  1631,     0,   671,   672,   673,
-     674,   675,   728,  1632,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,   239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,
-    1640,   729,   688,   689,     0,     0,     0,   753,    86,    87,
-      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
-    3064,    98,    99,   100,   101,   102,   103,   754,   104,   105,
-     708,   755,     0,   107,   108,   109,   110,   756,   757,   112,
-     113,   114,     0,   115,   758,   759,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,   427,     0,     0,    37,    38,    39,    40,
-      41,    42,    43,    44,  1577,  1578,     0,    45,  1580,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
-       0,     0,  1581,     0,     0,   439,   440,     0,   441,   442,
-     132,   443,   444,   445,   134,  1582,   136,  1583,  1584,     0,
-    4343,   447,   448,   449,   450,  1585,  1586,   451,   452,  1587,
-    1588,   453,     0,   454,   455,   456,   457,  1589,     0,  1590,
-       0,   458,   459,   460,   461,   147,   462,   463,   720,     0,
-     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
-       0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,   473,   474,
-     475,   476,   722,   477,  1598,  1599,   478,     0,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,  1413,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,  1600,
-     503,   504,   505,  1601,  1602,   506,     0,   507,   508,  1603,
-     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
-     514,     0,   515,  1604,     0,  1605,   516,     0,   517,   518,
-     724,   519,   520,   173,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
-     532,   533,   534,  1416,  1606,     0,  1607,     0,   535,   179,
-     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
-     542,  1608,   183,   543,   184,     0,   544,   545,   546,  1609,
-    1610,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,  1611,   190,  1612,   560,
-     561,   192,     0,   562,   563,   194,   564,  1614,  1615,   565,
-    1616,   566,   567,   568,     0,   569,     0,     0,   570,   571,
-     572,     0,     0,   573,   197,   198,   574,   199,  1618,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,  1619,
-     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
-     592,   593,   594,   595,  1620,   596,   597,   598,   599,     0,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,   211,   613,   614,   615,  3061,   616,
-     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
-     625,   626,   627,  1622,   629,   630,   218,   631,   632,   220,
-     633,   634,  1623,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,  1624,     0,   647,   648,
-       0,   649,   225,   650,   651,   652,   653,   654,     0,  1625,
-    1626,     0,     0,   656,   657,  1627,   658,  1628,  1629,   659,
-     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
-     668,   669,   670,  1631,     0,   671,   672,   673,   674,   675,
-     728,  1632,     0,   676,   237,   677,   678,   679,   680,     0,
-       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,
-     688,   689,     0,     0,     0,   753,    86,    87,    88,   705,
-      90,    91,    92,   706,     0,   707,    95,     0,  3064,    98,
-      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
-       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
-       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
-     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
-       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
-      35,   427,     0,     0,    37,    38,    39,    40,    41,    42,
-      43,    44,  1577,  1578,  1579,    45,  1580,     0,     0,     0,
-       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
-    1581,     0,     0,   439,   440,     0,   441,   442,   132,   443,
-     444,   445,     0,  1582,   136,  1583,  1584,     0,   446,   447,
-     448,   449,   450,  1585,  1586,   451,   452,  1587,  1588,   453,
-       0,   454,   455,   456,   457,  1589,     0,  1590,     0,   458,
-     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
-     466,   467,   468,   469,     0,   150,   470,   471,     0,  1591,
-    1592,  1593,  1594,  1595,  1596,  1597,   473,   474,   475,   476,
-     722,   477,  1598,  1599,   478,     0,   479,     0,   480,   481,
-     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
-     489,  1413,   491,   492,     0,   493,   494,   495,     0,   496,
-       0,   498,     0,   499,   500,   501,   502,  1600,   503,   504,
-     505,  1601,  1602,   506,     0,   507,   508,  1603,   509,     0,
-     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
-     515,  1604,     0,  1605,   516,     0,   517,   518,   724,   519,
-     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
-     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
-     534,  1416,  1606,     0,  1607,     0,   535,     0,     0,   536,
-     181,   537,   538,   539,   540,   541,     0,     0,   542,  1608,
-     183,   543,     0,     0,   544,   545,   546,  1609,  1610,   547,
-     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
-     726,   557,   558,   559,  1611,   190,  1612,   560,   561,   192,
-    1613,   562,   563,     0,   564,  1614,  1615,   565,  1616,   566,
-     567,   568,     0,   569,     0,     0,  1617,   571,   572,     0,
-       0,   573,   197,   198,   574,   199,  1618,   575,   576,   577,
-     578,   579,   580,   581,     0,   582,   583,  1619,   584,   202,
-     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
-     594,   595,  1620,   596,   597,   598,   599,     0,   600,   601,
-     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
-     611,   612,   211,   613,   614,   615,  1621,   616,   617,   618,
-     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
-     627,  1622,   629,   630,   218,   631,   632,     0,   633,   634,
-    1623,   635,     0,   636,   637,   638,   639,   640,   641,   642,
-     643,   644,   645,   646,  1624,     0,   647,   648,     0,   649,
-     225,   650,   651,   652,   653,   654,     0,  1625,  1626,     0,
-       0,   656,   657,  1627,   658,  1628,  1629,   659,   660,   661,
-     662,   663,   664,   665,     0,  1630,   666,   667,   668,   669,
-     670,  1631,     0,   671,   672,   673,   674,   675,   728,  1632,
-       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
-       0,     0,   682,   683,   684,   685,   686,   687,   239,  1633,
-    1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,   688,   689,
-       0,     0,     0,     0,     0,     0,     0,  1642,  1643,     0,
-       0,     0,     0,     0,     0,     0,  1645,   753,    86,    87,
-      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,   754,   104,   105,
-     708,   755,     0,   107,   108,   109,   110,   756,   757,   112,
-     113,   114,     0,   115,   758,   759,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
-      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
-       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
-     132,   443,   444,   445,   134,   135,   136,   137,   138,     0,
-     446,   447,   448,   449,   450,     0,  1586,   451,   452,   719,
-     139,   453,     0,   454,   455,   456,   457,  1589,     0,  1590,
-       0,   458,   459,   460,   461,   147,   462,   463,   720,     0,
-     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
-       0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,   473,   474,
-     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
-     503,   504,   505,  1601,     0,   506,     0,   507,   508,   167,
-     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
-     514,     0,   515,  1604,     0,   172,   516,     0,   517,   518,
-     724,   519,   520,   173,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
-     532,   533,   534,     0,   177,     0,   178,     0,   535,   179,
-     180,   536,   181,   537,   538,   539,   540,   541,  3839,     0,
-     542,  1608,   183,   543,   184,     0,   544,   545,   546,  1609,
-    1610,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,   189,   190,   191,   560,
-     561,   192,     0,   562,   563,   194,   564,     0,  1615,   565,
-     196,   566,   567,   568,     0,   569,     0,  1124,   570,   571,
-     572,     0,     0,   573,   197,   198,   574,   199,  1618,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,  1619,
-     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
-     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,   211,   613,   614,   615,   213,  3840,
-     617,   618,   619,   620,   621,   727,   622,   216,   623,   624,
-     625,   626,   627,  1622,   629,   630,   218,   631,   632,   220,
-     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,  1624,     0,   647,   648,
-     224,   649,   225,   650,   651,   652,   653,   654,     0,   226,
-     227,     0,     0,   656,   657,  1627,   658,  1628,     0,   659,
-     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
-     668,   669,   670,  1631,     0,   671,   672,   673,   674,   675,
-    2315,   236,     0,   676,   237,   677,   678,   679,   680,     0,
-       0,   681,     0,   238,   682,   683,   684,   685,   686,   687,
-     239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,
-     688,   689,     0,     0,   248,   753,    86,    87,    88,   705,
-      90,    91,    92,   706,     0,   707,    95,     0,  3841,    98,
-      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
-       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
-       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
-     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
-       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
-      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
-     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
-       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
-     444,   445,   134,   135,   136,   137,   138,     0,   446,   447,
-     448,   449,   450,     0,  1586,   451,   452,   719,   139,   453,
-       0,   454,   455,   456,   457,  1589,     0,  1590,     0,   458,
-     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
-     466,   467,   468,   469,     0,   150,   470,   471,     0,  1591,
-    1592,  1593,  1594,  1595,  1596,  1597,   473,   474,   475,   476,
-     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
-     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
-     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
-     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
-     505,  1601,     0,   506,     0,   507,   508,   167,   509,     0,
-     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
-     515,  1604,     0,   172,   516,     0,   517,   518,   724,   519,
-     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
-     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
-     534,     0,   177,     0,   178,     0,   535,   179,   180,   536,
-     181,   537,   538,   539,   540,   541,  3839,     0,   542,  1608,
-     183,   543,   184,     0,   544,   545,   546,  1609,  1610,   547,
-     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
-     726,   557,   558,   559,   189,   190,   191,   560,   561,   192,
-       0,   562,   563,   194,   564,     0,  1615,   565,   196,   566,
-     567,   568,     0,   569,     0,  1124,   570,   571,   572,     0,
-       0,   573,   197,   198,   574,   199,  1618,   575,   576,   577,
-     578,   579,   580,   581,     0,   582,   583,  1619,   584,   202,
-     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
-     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
-     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
-     611,   612,   211,   613,   614,   615,   213,  3840,   617,   618,
-     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
-     627,  1622,   629,   630,   218,   631,   632,   220,   633,   634,
-     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
-     643,   644,   645,   646,  1624,     0,   647,   648,     0,   649,
-     225,   650,   651,   652,   653,   654,     0,   226,   227,     0,
-       0,   656,   657,  1627,   658,  1628,     0,   659,   660,   661,
-     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
-     670,  1631,     0,   671,   672,   673,   674,   675,   728,   236,
-       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
-       0,     0,   682,   683,   684,   685,   686,   687,   239,  1633,
-    1634,  1635,  1636,  1637,  1638,  1639,  1640,   729,   688,   689,
-       0,     0,     0,   753,    86,    87,    88,   705,    90,    91,
-      92,   706,     0,   707,    95,     0,  3841,    98,    99,   100,
-     101,   102,   103,   754,   104,   105,   708,   755,     0,   107,
-     108,   109,   110,   756,   757,   112,   113,   114,     0,   115,
-     758,   759,   709,   710,     0,     0,     0,   711,   712,     0,
-       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
-       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
-       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
-       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
-     134,   135,   136,   137,   138,     0,   446,   447,   448,   449,
-     450,     0,  1586,   451,   452,   719,   139,   453,     0,   454,
-     455,   456,   457,  1589,     0,  1590,     0,   458,   459,   460,
-     461,   147,   462,   463,   720,     0,   464,   465,   466,   467,
-     468,   469,     0,   150,   470,   471,     0,  1591,  1592,  1593,
-    1594,  1595,  1596,  1597,   473,   474,   475,   476,   722,   477,
-     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
-     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
-     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
-       0,   499,   500,   501,   502,   163,   503,   504,   505,  1601,
-       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
-     511,   168,     0,   169,   512,   513,   514,     0,   515,  1604,
-       0,   172,   516,     0,   517,   518,   724,   519,   520,   173,
-     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
-     530,     0,   531,   175,   176,     0,   532,   533,   534,     0,
-     177,     0,   178,     0,   535,   179,   180,   536,   181,   537,
-     538,   539,   540,   541,     0,     0,   542,  1608,   183,   543,
-     184,     0,   544,   545,   546,  1609,  1610,   547,   548,   549,
-     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
-     558,   559,   189,   190,   191,   560,   561,   192,     0,   562,
-     563,   194,   564,     0,  1615,   565,   196,   566,   567,   568,
-       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
-     197,   198,   574,   199,  1618,   575,   576,   577,   578,   579,
-     580,   581,     0,   582,   583,  1619,   584,   202,   585,   586,
-     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
-     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
-     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
-     211,   613,   614,   615,   213,  3840,   617,   618,   619,   620,
-     621,   727,   622,     0,   623,   624,   625,   626,   627,  1622,
-     629,   630,   218,   631,   632,   220,   633,   634,   221,   635,
-       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
-     645,   646,  1624,     0,   647,   648,     0,   649,   225,   650,
-     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
-     657,  1627,   658,  1628,     0,   659,   660,   661,   662,   663,
-     664,   665,     0,     0,   666,   667,   668,   669,   670,  1631,
-       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
-     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
-     682,   683,   684,   685,   686,   687,   239,  1633,  1634,  1635,
-    1636,  1637,  1638,  1639,  1640,   729,   688,   689,     0,     0,
-       0,   753,    86,    87,    88,   705,    90,    91,    92,   706,
-       0,   707,    95,     0,   249,    98,    99,   100,   101,   102,
-     103,   754,   104,   105,   708,   755,     0,   107,   108,   109,
-     110,   756,   757,   112,   113,   114,     0,   115,   758,   759,
-     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
-       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
-     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
-       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
-     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
-     440,     0,   441,   442,   132,   443,   444,   445,   134,   135,
-     136,   137,   138,     0,   446,   447,   448,   449,   450,     0,
-    1586,   451,   452,   719,   139,   453,     0,   454,   455,   456,
-     457,  1589,     0,  1590,     0,   458,   459,   460,   461,   147,
-     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
-       0,   150,   470,   471,     0,  1591,  1592,  1593,  1594,  1595,
-    1596,  1597,   473,   474,   475,   476,   722,   477,   154,   155,
-     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
-     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
-       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
-     500,   501,   502,   163,   503,   504,   505,  1601,     0,   506,
-       0,   507,   508,   167,   509,     0,   510,     0,   511,   168,
-       0,   169,   512,   513,   514,     0,   515,  1604,     0,   172,
-     516,     0,   517,   518,   724,   519,   520,   173,   521,   522,
-     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
-     531,   175,   176,     0,   532,   533,   534,     0,   177,     0,
-     178,     0,   535,   179,   180,   536,   181,   537,   538,   539,
-     540,   541,     0,     0,   542,  1608,   183,   543,   184,     0,
-     544,   545,   546,  1609,  1610,   547,   548,   549,   550,   551,
-     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
-     189,   190,   191,   560,   561,   192,     0,   562,   563,   194,
-     564,     0,  1615,   565,   196,   566,   567,   568,     0,   569,
-       0,     0,   570,   571,   572,     0,     0,   573,   197,   198,
-     574,   199,  1618,   575,   576,   577,   578,   579,   580,   581,
-       0,   582,   583,  1619,   584,   202,   585,   586,   587,     0,
-     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
-     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
-     606,   607,   608,   609,   610,     0,   611,   612,   211,   613,
-     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
-     622,     0,   623,   624,   625,   626,   627,  1622,   629,   630,
-     218,   631,   632,   220,   633,   634,   221,   635,     0,   636,
-     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
-    1624,     0,   647,   648,     0,   649,   225,   650,   651,   652,
-     653,   654,     0,   226,   227,     0,     0,   656,   657,  1627,
-     658,  1628,     0,   659,   660,   661,   662,   663,   664,   665,
-       0,     0,   666,   667,   668,   669,   670,  1631,     0,   671,
-     672,   673,   674,   675,   728,   236,     0,   676,   237,   677,
-     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
-     684,   685,   686,   687,   239,  1633,  1634,  1635,  1636,  1637,
-    1638,  1639,  1640,   729,   688,   689,     0,     0,     0,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,  4475,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,   134,   135,   136,   137,
-     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
-       0,   144,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,     0,     0,     0,   151,     0,     0,     0,
-     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
-     508,   167,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,   182,   183,   543,   184,     0,   544,   545,
-     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,   189,   190,
-     191,   560,   561,   192,     0,   562,   563,   194,   564,     0,
-     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,   197,   198,   574,   199,
-     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
-     632,   220,   633,   634,   221,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
-       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,   728,   236,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   729,   688,   689,     0,     0,     0,     0,    86,    87,
-      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
-    5122,    98,    99,   100,   101,   102,   103,     0,   104,   105,
-     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
-     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
-      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
-       0,     0,     0,  4397,     0,   439,   440,     0,   441,   442,
-       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
-     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
-     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
-       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
-     464,   465,   466,   467,   468,   469,     0, -1600,   470,   471,
-       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
-     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
-     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
-     509,     0,   510,     0,   511,     0,     0, -1600,   512,   513,
-     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
-     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531, -1600,   176,     0,
-     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
-       0,   536, -1600,   537,   538,   539,   540,   541,     0,     0,
-     542,   182, -1600,   543,     0,     0,   544,   545,   546,     0,
-       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,   189, -1600,   191,   560,
-     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
-     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
-     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
-     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
-     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612, -1600,   613,   614,   615,   213,   616,
-     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
-     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
-     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
-       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
-     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
-     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
-     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
-     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
-       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
-     688,   689,     0,     0,     0,     0,     0,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,  1741,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
+     683,   684,   685,   686,   687,   239,  1634,  1635,  1636,  1637,
+    1638,  1639,  1640,  1641,   729,   688,   689,  1642,     0,     0,
+       0,     0,     0,     0,  1643,  1644,     0,     0,     0,     0,
+       0,     0,     0,  1646,   753,    86,    87,    88,   705,    90,
+      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
+     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
+     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
+     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
+       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
+       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
+     427,     0,     0,    37,    38,    39,    40,    41,    42,    43,
+      44,  1578,  1579,  1580,    45,  1581,     0,     0,     0,     0,
+       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,  2449,   436,   437,   438,     0,     0,     0,     0,  1582,
+       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
+     445,   134,  1583,   136,  1584,  1585,     0,   446,   447,   448,
+     449,   450,  1586,  1587,   451,   452,  1588,  1589,   453,     0,
+     454,   455,   456,   457,  1590,     0,  1591,     0,   458,   459,
+     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
+     467,   468,   469,     0,   150,   470,   471,     0,  1592,  1593,
+    1594,  1595,  1596,  1597,  1598,   473,   474,   475,   476,   722,
+     477,  1599,  1600,   478,     0,   479,     0,   480,   481,   482,
+     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
+    1414,   491,   492,     0,   493,   494,   495,     0,   496,   497,
+     498,     0,   499,   500,   501,   502,  1601,   503,   504,   505,
+    1602,  1603,   506,     0,   507,   508,  1604,   509,     0,   510,
+       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
+    1605,     0,  1606,   516,     0,   517,   518,   724,   519,   520,
+     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
+     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
+    1417,  1607,     0,  1608,     0,   535,   179,   180,   536,   181,
+     537,   538,   539,   540,   541,     0,     0,   542,  1609,   183,
+     543,   184,     0,   544,   545,   546,  1610,  1611,   547,   548,
+     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
+     557,   558,   559,  1612,   190,  1613,   560,   561,   192,  1614,
+     562,   563,   194,   564,  1615,  1616,   565,  1617,   566,   567,
+     568,     0,   569,     0,     0,  1618,   571,   572,     0,     0,
+     573,   197,   198,   574,   199,  1619,   575,   576,   577,   578,
+     579,   580,   581,     0,   582,   583,  1620,   584,   202,   585,
+     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
+     595,  1621,   596,   597,   598,   599,     0,   600,   601,   602,
+     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
+     612,   211,   613,   614,   615,  1622,   616,   617,   618,   619,
+     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
+    1623,   629,   630,   218,   631,   632,   220,   633,   634,  1624,
+     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
+     644,   645,   646,  1625,     0,   647,   648,     0,   649,   225,
+     650,   651,   652,   653,   654,     0,  1626,  1627,     0,     0,
+     656,   657,  1628,   658,  1629,  1630,   659,   660,   661,   662,
+     663,   664,   665,     0,  1631,   666,   667,   668,   669,   670,
+    1632,     0,   671,   672,   673,   674,   675,   728,  1633,     0,
+     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
+       0,   682,   683,   684,   685,   686,   687,   239,  1634,  1635,
+    1636,  1637,  1638,  1639,  1640,  1641,   729,   688,   689,  1642,
+       0,     0,     0,     0,     0,     0,  1643,  1644,     0,     0,
+       0,     0,     0,     0,     0,  1646,   753,    86,    87,    88,
+     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
+      98,    99,   100,   101,   102,   103,   754,   104,   105,   708,
+     755,     0,   107,   108,   109,   110,   756,   757,   112,   113,
+     114,     0,   115,   758,   759,   709,   710,     0,     0,     0,
      711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
        0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,    37,    38,    39,    40,    41,
-      42,     0,    44,     0,     0,     0,    45,     0,     0,     0,
+     717,    35,   427,     0,     0,    37,    38,    39,    40,    41,
+      42,    43,    44,  1578,  1579,  1580,    45,  1581,     0,     0,
        0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
      433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
+       0,  1582,     0,     0,   439,   440,     0,   441,   442,   132,
+     443,   444,   445,   134,  1583,   136,  1584,  1585,     0,   446,
+     447,   448,   449,   450,  1586,  1587,   451,   452,  1588,  1589,
+     453,     0,   454,   455,   456,   457,  1590,     0,  1591,     0,
+     458,   459,   460,   461,   147,   462,   463,   720,     0,   464,
+     465,   466,   467,   468,   469,     0,   150,   470,   471,     0,
+    1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,   474,   475,
+     476,   722,   477,  1599,  1600,   478,     0,   479,     0,   480,
      481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
+     488,   489,  1414,   491,   492,     0,   493,   494,   495,     0,
+     496,   497,   498,     0,   499,   500,   501,   502,  1601,   503,
+     504,   505,  1602,  1603,   506,     0,   507,   508,  1604,   509,
+       0,   510,     0,   511,   168,  3082,   169,   512,   513,   514,
+       0,   515,  1605,     0,  1606,   516,     0,   517,   518,   724,
+     519,   520,   173,   521,   522,   523,   524,     0,   525,   526,
+     527,   528,   529,   530,     0,   531,   175,   176,     0,   532,
+     533,   534,  1417,  1607,     0,  1608,     0,   535,   179,   180,
+     536,   181,   537,   538,   539,   540,   541,     0,     0,   542,
+    1609,   183,   543,   184,     0,   544,   545,   546,  1610,  1611,
      547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
+     556,   726,   557,   558,   559,  1612,   190,  1613,   560,   561,
+     192,  1614,   562,   563,   194,   564,  1615,  1616,   565,  1617,
+     566,   567,   568,     0,   569,     0,     0,  1618,   571,   572,
+       0,     0,   573,   197,   198,   574,   199,  1619,   575,   576,
+     577,   578,   579,   580,   581,     0,   582,   583,  1620,   584,
      202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
+     593,   594,   595,  1621,   596,   597,   598,   599,     0,   600,
      601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
+       0,   611,   612,   211,   613,   614,   615,  1622,   616,   617,
      618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
+     626,   627,  1623,   629,   630,   218,   631,   632,   220,   633,
+     634,  1624,   635,     0,   636,   637,   638,   639,   640,   641,
+     642,   643,   644,   645,   646,  1625,     0,   647,   648,     0,
+     649,   225,   650,   651,   652,   653,   654,     0,  1626,  1627,
+       0,     0,   656,   657,  1628,   658,  1629,  1630,   659,   660,
+     661,   662,   663,   664,   665,     0,  1631,   666,   667,   668,
+     669,   670,  1632,     0,   671,   672,   673,   674,   675,   728,
+    1633,     0,   676,   237,   677,   678,   679,   680,     0,     0,
      681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,     0,     0,     0,     0,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,  3643,  3644,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
+    1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,   729,   688,
+     689,  1642,     0,     0,     0,     0,     0,     0,  1643,  1644,
+       0,     0,     0,     0,     0,     0,     0,  1646,   753,    86,
+      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
+       0,     0,    98,    99,   100,   101,   102,   103,   754,   104,
+     105,   708,   755,     0,   107,   108,   109,   110,   756,   757,
+     112,   113,   114,     0,   115,   758,   759,   709,   710,     0,
+       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
+       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
+       0,   716,   717,    35,   427,     0,     0,    37,    38,    39,
+      40,    41,    42,    43,    44,  1578,  1579,  1580,    45,  1581,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
+       0,     0,     0,  1582,     0,     0,   439,   440,     0,   441,
+     442,   132,   443,   444,   445,   134,  1583,   136,  1584,  1585,
+       0,   446,   447,   448,   449,   450,  1586,  1587,   451,   452,
+    1588,  1589,   453,     0,   454,   455,   456,   457,  1590,     0,
+    1591,     0,   458,   459,   460,   461,   147,   462,   463,   720,
+       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
+     471,     0,  1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,
+     474,   475,   476,   722,   477,  1599,  1600,   478,     0,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,  1414,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+    1601,   503,   504,   505,  1602,  1603,   506,     0,   507,   508,
+    1604,   509,     0,   510,     0,   511,   168,     0,   169,   512,
+     513,   514,     0,   515,  1605,     0,  1606,   516,     0,   517,
+     518,   724,   519,   520,   173,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
+       0,   532,   533,   534,  1417,  1607,     0,  1608,     0,   535,
+     179,   180,   536,   181,   537,   538,   539,   540,   541,     0,
+       0,   542,  1609,   183,   543,   184,     0,   544,   545,   546,
+    1610,  1611,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,  1612,   190,  1613,
+     560,   561,   192,  1614,   562,   563,   194,   564,  1615,  1616,
+     565,  1617,   566,   567,   568,     0,   569,     0,     0,  1618,
+     571,   572,     0,     0,   573,   197,   198,   574,   199,  1619,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+    1620,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,  1621,   596,   597,   598,   599,
+       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612,   211,   613,   614,   615,  1622,
+     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
+     624,   625,   626,   627,  1623,   629,   630,   218,   631,   632,
+     220,   633,   634,  1624,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,  1625,     0,   647,
+     648,     0,   649,   225,   650,   651,   652,   653,   654,     0,
+    1626,  1627,     0,     0,   656,   657,  1628,   658,  1629,  1630,
+     659,   660,   661,   662,   663,   664,   665,     0,  1631,   666,
+     667,   668,   669,   670,  1632,     0,   671,   672,   673,   674,
+     675,   728,  1633,  4434,   676,   237,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,   239,  1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,
+     729,   688,   689,  1642,     0,     0,     0,     0,     0,     0,
+    1643,  1644,     0,     0,     0,     0,     0,     0,     0,  1646,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
+     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
+     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
+       0,   715,     0,   716,   717,    35,   427,     0,     0,    37,
+      38,    39,    40,    41,    42,    43,    44,  1578,  1579,  1580,
+      45,  1581,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,  1582,     0,     0,   439,   440,
+       0,   441,   442,   132,   443,   444,   445,   134,  1583,   136,
+    1584,  1585,     0,   446,   447,   448,   449,   450,  1586,  1587,
+     451,   452,  1588,  1589,   453,     0,   454,   455,   456,   457,
+    1590,     0,  1591,     0,   458,   459,   460,   461,   147,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,  4450,  1592,  1593,  1594,  1595,  1596,  1597,
+    1598,   473,   474,   475,   476,   722,   477,  1599,  1600,   478,
+       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
+     486,   487,     0,     0,   488,   489,  1414,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,  1601,   503,   504,   505,  1602,  1603,   506,     0,
+     507,   508,  1604,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,  1605,     0,  1606,   516,
+       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
+     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
+     175,   176,     0,   532,   533,   534,  1417,  1607,     0,  1608,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,  1609,   183,   543,   184,     0,   544,
+     545,   546,  1610,  1611,   547,   548,   549,   550,   551,   552,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,  1612,
+     190,  1613,   560,   561,   192,  1614,   562,   563,   194,   564,
+    1615,  1616,   565,  1617,   566,   567,   568,     0,   569,     0,
+       0,  1618,   571,   572,     0,     0,   573,   197,   198,   574,
+     199,  1619,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,  1620,   584,   202,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,  1621,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,  1622,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,  1623,   629,   630,   218,
+     631,   632,   220,   633,   634,  1624,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,  1625,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,  1626,  1627,     0,     0,   656,   657,  1628,   658,
+    1629,  1630,   659,   660,   661,   662,   663,   664,   665,     0,
+    1631,   666,   667,   668,   669,   670,  1632,     0,   671,   672,
+     673,   674,   675,   728,  1633,     0,   676,   237,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,   687,   239,  1634,  1635,  1636,  1637,  1638,  1639,
+    1640,  1641,   729,   688,   689,  1642,     0,     0,     0,     0,
+       0,     0,  1643,  1644,     0,     0,     0,     0,     0,     0,
+       0,  1646,   753,    86,    87,    88,   705,    90,    91,    92,
+     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
+     102,   103,   754,   104,   105,   708,   755,     0,   107,   108,
+     109,   110,   756,   757,   112,   113,   114,     0,   115,   758,
+     759,   709,   710,     0,     0,     0,   711,   712,     0,     0,
+       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
+       0,   714,     0,   715,     0,   716,   717,    35,   427,     0,
+       0,    37,    38,    39,    40,    41,    42,    43,    44,  1578,
+    1579,  1580,    45,  1581,     0,     0,     0,     0,     0,     0,
+       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
+     436,   437,   438,     0,     0,     0,     0,  1582,     0,     0,
+     439,   440,     0,   441,   442,   132,   443,   444,   445,  5444,
+    1583,   136,  1584,  1585,     0,   446,   447,   448,   449,   450,
+    1586,  1587,   451,   452,  1588,  1589,   453,     0,   454,   455,
+     456,   457,  1590,     0,  1591,     0,   458,   459,   460,   461,
+     147,   462,   463,   720,     0,   464,   465,   466,   467,   468,
+     469,     0,   150,   470,   471,  5445,  1592,  1593,  1594,  1595,
+    1596,  1597,  1598,   473,   474,   475,   476,   722,   477,  1599,
+    1600,   478,     0,   479,     0,   480,   481,   482,   483,   484,
+       0,   485,   486,   487,     0,     0,   488,   489,  1414,   491,
+     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
+     499,   500,   501,   502,  1601,   503,   504,   505,  1602,  1603,
+     506,     0,   507,   508,  1604,   509,     0,   510,     0,   511,
+     168,     0,   169,   512,   513,   514,     0,   515,  1605,     0,
+    1606,   516,     0,   517,   518,   724,   519,   520,   173,   521,
+     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
+       0,   531,   175,   176,     0,   532,   533,   534,  1417,  1607,
+       0,  1608,     0,   535,   179,   180,   536,   181,   537,   538,
+     539,   540,   541,     0,     0,   542,  1609,   183,   543,   184,
+       0,   544,   545,   546,  1610,  1611,   547,   548,   549,   550,
+     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
+     559,  1612,   190,  1613,   560,   561,   192,  1614,   562,   563,
+     194,   564,  1615,  1616,   565,  1617,   566,   567,   568,     0,
+     569,     0,     0,  1618,   571,   572,     0,     0,   573,   197,
+     198,   574,   199,  1619,   575,   576,   577,   578,   579,   580,
+     581,     0,   582,   583,  1620,   584,   202,   585,   586,   587,
+       0,   588,   589,   590,   591,   592,   593,   594,   595,  1621,
+     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
+     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
+     613,   614,   615,  1622,   616,   617,   618,   619,   620,   621,
+     727,   622,     0,   623,   624,   625,   626,   627,  1623,   629,
+     630,   218,   631,   632,   220,   633,   634,  1624,   635,     0,
+     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
+     646,  1625,     0,   647,   648,     0,   649,   225,   650,   651,
+     652,   653,   654,     0,  1626,  1627,     0,     0,   656,   657,
+    1628,   658,  1629,  1630,   659,   660,   661,   662,  5446,   664,
+     665,     0,  1631,   666,   667,   668,   669,   670,  1632,     0,
+     671,   672,   673,   674,   675,   728,  1633,     0,   676,   237,
+     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
+     683,   684,   685,   686,   687,   239,  1634,  1635,  1636,  1637,
+    1638,  1639,  1640,  1641,   729,   688,   689,  1642,     0,     0,
+       0,     0,     0,     0,  1643,  1644,     0,     0,     0,     0,
+       0,     0,     0,  1646,   753,    86,    87,    88,   705,    90,
+      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
+     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
+     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
+     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
        0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
        0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,    37,    38,    39,    40,    41,    42,     0,
-      44,     0,     0,     0,    45,     0,     0,     0,     0,     0,
+     427,     0,     0,    37,    38,    39,    40,    41,    42,    43,
+      44,  1578,  1579,  1580,    45,  1581,     0,     0,     0,     0,
        0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
+     435,     0,   436,   437,   438,     0,     0,     0,     0,  1582,
+       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
+     445,   134,  1583,   136,  1584,  1585,     0,   446,   447,   448,
+     449,   450,  1586,  1587,   451,   452,  1588,  1589,   453,     0,
+     454,   455,   456,   457,  1590,     0,  1591,     0,   458,   459,
+     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
+     467,   468,   469,     0,   150,   470,   471,  5445,  1592,  1593,
+    1594,  1595,  1596,  1597,  1598,   473,   474,   475,   476,   722,
+     477,  1599,  1600,   478,     0,   479,     0,   480,   481,   482,
      483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
+    1414,   491,   492,     0,   493,   494,   495,     0,   496,   497,
+     498,     0,   499,   500,   501,   502,  1601,   503,   504,   505,
+    1602,  1603,   506,     0,   507,   508,  1604,   509,     0,   510,
+       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
+    1605,     0,  1606,   516,     0,   517,   518,   724,   519,   520,
+     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
+     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
+    1417,  1607,     0,  1608,     0,   535,   179,   180,   536,   181,
+     537,   538,   539,   540,   541,     0,     0,   542,  1609,   183,
+     543,   184,     0,   544,   545,   546,  1610,  1611,   547,   548,
      549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
+     557,   558,   559,  1612,   190,  1613,   560,   561,   192,  1614,
+     562,   563,   194,   564,  1615,  1616,   565,  1617,   566,   567,
+     568,     0,   569,     0,     0,  1618,   571,   572,     0,     0,
+     573,   197,   198,   574,   199,  1619,   575,   576,   577,   578,
+     579,   580,   581,     0,   582,   583,  1620,   584,   202,   585,
      586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
+     595,  1621,   596,   597,   598,   599,     0,   600,   601,   602,
      603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
+     612,   211,   613,   614,   615,  1622,   616,   617,   618,   619,
      620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
+    1623,   629,   630,   218,   631,   632,   220,   633,   634,  1624,
      635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,     0,
-       0,     0,     0,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,  3644,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
+     644,   645,   646,  1625,     0,   647,   648,     0,   649,   225,
+     650,   651,   652,   653,   654,     0,  1626,  1627,     0,     0,
+     656,   657,  1628,   658,  1629,  1630,   659,   660,   661,   662,
+    5446,   664,   665,     0,  1631,   666,   667,   668,   669,   670,
+    1632,     0,   671,   672,   673,   674,   675,   728,  1633,     0,
+     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
+       0,   682,   683,   684,   685,   686,   687,   239,  1634,  1635,
+    1636,  1637,  1638,  1639,  1640,  1641,   729,   688,   689,  1642,
+       0,     0,     0,     0,     0,     0,  1643,  1644,     0,     0,
+       0,     0,     0,     0,     0,  1646,   753,    86,    87,    88,
+     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
+      98,    99,   100,   101,   102,   103,   754,   104,   105,   708,
+     755,     0,   107,   108,   109,   110,   756,   757,   112,   113,
+     114,     0,   115,   758,   759,   709,   710,     0,     0,     0,
+     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
+       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
+     717,    35,   427,     0,     0,    37,    38,    39,    40,    41,
+      42,    43,    44,  1578,  1579,  1580,    45,  1581,     0,     0,
+       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
+       0,  1582,     0,     0,   439,   440,     0,   441,   442,   132,
+     443,   444,   445,   134,  1583,   136,  1584,  1585,     0,   446,
+     447,   448,   449,   450,  1586,  1587,   451,   452,  1588,  1589,
+     453,     0,   454,   455,   456,   457,  1590,     0,  1591,     0,
+     458,   459,   460,   461,   147,   462,   463,   720,     0,   464,
+     465,   466,   467,   468,   469,     0,   150,   470,   471,     0,
+    1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,   474,   475,
+     476,   722,   477,  1599,  1600,   478,     0,   479,     0,   480,
+     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
+     488,   489,  1414,   491,   492,     0,   493,   494,   495,     0,
+     496,   497,   498,     0,   499,   500,   501,   502,  1601,   503,
+     504,   505,  1602,  1603,   506,     0,   507,   508,  1604,   509,
+       0,   510,     0,   511,   168,     0,   169,   512,   513,   514,
+       0,   515,  1605,     0,  1606,   516,     0,   517,   518,   724,
+     519,   520,   173,   521,   522,   523,   524,     0,   525,   526,
+     527,   528,   529,   530,     0,   531,   175,   176,     0,   532,
+     533,   534,  1417,  1607,     0,  1608,     0,   535,   179,   180,
+     536,   181,   537,   538,   539,   540,   541,     0,     0,   542,
+    1609,   183,   543,   184,     0,   544,   545,   546,  1610,  1611,
+     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
+     556,   726,   557,   558,   559,  1612,   190,  1613,   560,   561,
+     192,  1614,   562,   563,   194,   564,  1615,  1616,   565,  1617,
+     566,   567,   568,     0,   569,     0,     0,  1618,   571,   572,
+       0,     0,   573,   197,   198,   574,   199,  1619,   575,   576,
+     577,   578,   579,   580,   581,     0,   582,   583,  1620,   584,
+     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
+     593,   594,   595,  1621,   596,   597,   598,   599,     0,   600,
+     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
+       0,   611,   612,   211,   613,   614,   615,  1622,   616,   617,
+     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
+     626,   627,  1623,   629,   630,   218,   631,   632,   220,   633,
+     634,  1624,   635,     0,   636,   637,   638,   639,   640,   641,
+     642,   643,   644,   645,   646,  1625,     0,   647,   648,     0,
+     649,   225,   650,   651,   652,   653,   654,     0,  1626,  1627,
+       0,     0,   656,   657,  1628,   658,  1629,  1630,   659,   660,
+     661,   662,   663,   664,   665,     0,  1631,   666,   667,   668,
+     669,   670,  1632,     0,   671,   672,   673,   674,   675,   728,
+    1633,     0,   676,   237,   677,   678,   679,   680,     0,     0,
+     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
+    1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,   729,   688,
+     689,  1642,     0,     0,     0,     0,     0,     0,  1643,  1644,
+       0,     0,     0,     0,     0,     0,     0,  1646,   753,    86,
+      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
+       0,     0,    98,    99,   100,   101,   102,   103,   754,   104,
+     105,   708,   755,     0,   107,   108,   109,   110,   756,   757,
+     112,   113,   114,     0,   115,   758,   759,   709,   710,     0,
+       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
+       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
+       0,   716,   717,    35,   427,     0,     0,    37,    38,    39,
+      40,    41,    42,    43,    44,  1578,  1579,  1580,    45,  1581,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
+       0,     0,     0,  1582,     0,     0,   439,   440,     0,   441,
+     442,   132,   443,   444,   445,   134,  1583,   136,  1584,  1585,
+       0,   446,   447,   448,   449,   450,  1586,  1587,   451,   452,
+    1588,  1589,   453,     0,   454,   455,   456,   457,  1590,     0,
+    1591,     0,   458,   459,   460,   461,   147,   462,   463,   720,
+       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
+     471,     0,  1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,
+     474,   475,   476,   722,   477,  1599,  1600,   478,     0,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,  1414,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+    1601,   503,   504,   505,  1602,  1603,   506,     0,   507,   508,
+    1604,   509,     0,   510,     0,   511,   168,     0,   169,   512,
+     513,   514,     0,   515,  1605,     0,  1606,   516,     0,   517,
+     518,   724,   519,   520,   173,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
+       0,   532,   533,   534,  1417,  1607,     0,  1608,     0,   535,
+     179,   180,   536,   181,   537,   538,   539,   540,   541,     0,
+       0,   542,  1609,   183,   543,   184,     0,   544,   545,   546,
+    1610,  1611,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,  1612,   190,  1613,
+     560,   561,   192,  1614,   562,   563,   194,   564,  1615,  1616,
+     565,  1617,   566,   567,   568,     0,   569,     0,     0,  1618,
+     571,   572,     0,     0,   573,   197,   198,   574,   199,  1619,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+    1620,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,  1621,   596,   597,   598,   599,
+       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612,   211,   613,   614,   615,  1622,
+     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
+     624,   625,   626,   627,  1623,   629,   630,   218,   631,   632,
+     220,   633,   634,  1624,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,  1625,     0,   647,
+     648,     0,   649,   225,   650,   651,   652,   653,   654,     0,
+    1626,  1627,     0,     0,   656,   657,  1628,   658,  1629,  1630,
+     659,   660,   661,   662,   663,   664,   665,     0,  1631,   666,
+     667,   668,   669,   670,  1632,     0,   671,   672,   673,   674,
+     675,   728,  1633,     0,   676,   237,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,  4760,  1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,
+     729,   688,   689,  1642,     0,     0,     0,     0,     0,     0,
+    1643,  1644,     0,     0,     0,     0,     0,     0,     0,  1646,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
+     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
+     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
+       0,   715,     0,   716,   717,    35,   427,     0,     0,    37,
+      38,    39,    40,    41,    42,    43,    44,  1578,  1579,  1580,
+      45,  1581,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,  1582,     0,     0,   439,   440,
+       0,   441,   442,   132,   443,   444,   445,   134,  1583,   136,
+    1584,  1585,     0,   446,   447,   448,   449,   450,  1586,  1587,
+     451,   452,  1588,  1589,   453,     0,   454,   455,   456,   457,
+    1590,     0,  1591,     0,   458,   459,   460,   461,   147,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,     0,  1592,  1593,  1594,  1595,  1596,  1597,
+    1598,   473,   474,   475,   476,   722,   477,  1599,  1600,   478,
+       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
+     486,   487,     0,     0,   488,   489,  1414,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,  1601,   503,   504,   505,  1602,  1603,   506,     0,
+     507,   508,  1604,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,  1605,     0,  1606,   516,
+       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
+     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
+     175,   176,     0,   532,   533,   534,  1417,  1607,     0,  1608,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,  1609,   183,   543,   184,     0,   544,
+     545,   546,  1610,  1611,   547,   548,   549,   550,   551,   552,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,  1612,
+     190,  1613,   560,  4769,   192,  1614,   562,   563,   194,   564,
+    1615,  1616,   565,  1617,   566,   567,   568,     0,   569,     0,
+       0,  1618,   571,   572,     0,     0,   573,   197,   198,   574,
+     199,  1619,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,  1620,   584,   202,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,  1621,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,  1622,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,  1623,   629,   630,   218,
+     631,   632,   220,   633,   634,  1624,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,  1625,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,  1626,  1627,     0,     0,   656,   657,  1628,   658,
+    1629,  1630,   659,   660,   661,   662,   663,   664,   665,     0,
+    1631,   666,   667,   668,   669,   670,  1632,     0,   671,   672,
+     673,   674,   675,   728,  1633,     0,   676,   237,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,   687,   239,  1634,  1635,  1636,  1637,  1638,  1639,
+    1640,  1641,   729,   688,   689,  1642,     0,     0,     0,     0,
+       0,     0,  1643,  1644,     0,     0,     0,     0,     0,     0,
+       0,  1646,   753,    86,    87,    88,   705,    90,    91,    92,
+     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
+     102,   103,   754,   104,   105,   708,   755,     0,   107,   108,
+     109,   110,   756,   757,   112,   113,   114,     0,   115,   758,
+     759,   709,   710,     0,     0,     0,   711,   712,     0,     0,
        0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
        0,   714,     0,   715,     0,   716,   717,    35,   427,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    37,    38,    39,    40,    41,    42,    43,    44,  1578,
+    1579,  1580,    45,  1581,     0,     0,     0,     0,     0,     0,
        0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
+     436,   437,   438,     0,     0,     0,     0,  1582,     0,     0,
+     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
+    1583,   136,  1584,  1585,     0,   446,   447,   448,   449,   450,
+    1586,  1587,   451,   452,  1588,  1589,   453,     0,   454,   455,
+     456,   457,  1590,     0,  1591,     0,   458,   459,   460,   461,
+     147,   462,   463,   720,     0,   464,   465,   466,   467,   468,
+     469,     0,   150,   470,  5073,     0,  1592,  1593,  1594,  1595,
+    1596,  1597,  1598,   473,   474,   475,   476,   722,   477,  1599,
+    1600,   478,     0,   479,     0,   480,   481,   482,   483,   484,
+       0,   485,   486,   487,     0,     0,   488,   489,  1414,   491,
      492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
+     499,   500,   501,   502,  1601,   503,   504,   505,  1602,  1603,
+     506,     0,   507,   508,  1604,   509,     0,   510,     0,   511,
+     168,     0,   169,   512,   513,   514,     0,   515,  1605,     0,
+    5074,   516,     0,   517,   518,   724,   519,   520,   173,   521,
      522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
+       0,   531,   175,   176,     0,   532,   533,   534,  1417,  1607,
+       0,  1608,     0,   535,   179,   180,   536,   181,   537,   538,
+     539,   540,   541,     0,     0,   542,  1609,   183,   543,   184,
+       0,   544,   545,   546,  1610,  1611,   547,   548,   549,   550,
      551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
+     559,  1612,   190,  1613,   560,   561,   192,  1614,   562,   563,
+     194,   564,  1615,  1616,   565,  1617,   566,   567,   568,     0,
+     569,     0,     0,  1618,   571,   572,     0,     0,   573,   197,
+     198,   574,   199,  1619,   575,   576,   577,   578,   579,   580,
+     581,     0,   582,   583,  1620,   584,   202,   585,   586,   587,
+       0,   588,   589,   590,   591,   592,   593,   594,   595,  1621,
      596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,   216,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
+     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
+     613,   614,  5075,  1622,   616,   617,   618,   619,   620,   621,
+     727,   622,     0,   623,   624,   625,   626,   627,  1623,   629,
+     630,   218,   631,   632,   220,   633,   634,  1624,   635,     0,
      636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,   224,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,  2315,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,   238,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,     0,     0,   248,
-       0,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,   249,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
+     646,  1625,     0,   647,   648,     0,   649,   225,   650,   651,
+     652,   653,   654,     0,  1626,  1627,     0,     0,   656,   657,
+    1628,   658,  1629,  1630,   659,   660,   661,   662,   663,   664,
+     665,     0,  1631,   666,   667,   668,   669,   670,  1632,     0,
+     671,   672,   673,   674,   675,   728,  1633,     0,   676,   237,
+     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
+     683,   684,   685,   686,   687,   239,  1634,  1635,  1636,  1637,
+    1638,  1639,  1640,  1641,   729,   688,   689,  1642,     0,     0,
+       0,     0,     0,     0,  1643,  1644,     0,     0,     0,     0,
+       0,     0,     0,  5076,   753,    86,    87,    88,   705,    90,
+      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
+     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
+     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
+     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
+       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
+       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
+     427,     0,     0,    37,    38,    39,    40,    41,    42,    43,
+      44,  1578,  1579,  1580,    45,  1581,     0,     0,     0,     0,
+       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,     0,   436,   437,   438,     0,     0,     0,     0,  1582,
+       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
+     445, -2802,  1583,   136,  1584,  1585,     0,   446,   447,   448,
+     449,   450,  1586,  1587,   451,   452,  1588,  1589,   453,     0,
+     454,   455,   456,   457,  1590,     0,  1591,     0,   458,   459,
+     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
+     467,   468,   469,     0,   150,   470,   471,  5445,  1592,  1593,
+    1594,  1595,  1596,  1597,  1598,   473,   474,   475,   476,   722,
+     477,  1599,  1600,   478,     0,   479,     0,   480,   481,   482,
+     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
+    1414,   491,   492,     0,   493,   494,   495,     0,   496,   497,
+     498,     0,   499,   500,   501,   502,  1601,   503,   504,   505,
+    1602,  1603,   506,     0,   507,   508,  1604,   509,     0,   510,
+       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
+    1605,     0,  1606,   516,     0,   517,   518,   724,   519,   520,
+   -2802,   521,   522,   523,   524,     0,   525,   526,   527,   528,
+     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
+    1417,  1607,     0,  1608,     0,   535,     0,     0,   536,   181,
+     537,   538,   539,   540,   541,     0,     0,   542,  1609,   183,
+     543, -2802,     0,   544,   545,   546,  1610,  1611,   547,   548,
+     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
+     557,   558,   559,  1612,   190,  1613,   560,   561,   192,  1614,
+     562,   563,     0,   564,  1615,  1616,   565,  1617,   566,   567,
+     568,     0,   569,     0,     0,  1618,   571,   572,     0,     0,
+     573,   197,   198,   574,   199,  1619,   575,   576,   577,   578,
+     579,   580,   581,     0,   582,   583,  1620,   584,   202,   585,
+     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
+     595,  1621,   596,   597,   598,   599,     0,   600,   601,   602,
+     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
+     612,   211,   613,   614,   615,  1622,   616,   617,   618,   619,
+     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
+    1623,   629,   630,   218,   631,   632, -2802,   633,   634,  1624,
+     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
+     644,   645,   646,  1625,     0,   647,   648,     0,   649,   225,
+     650,   651,   652,   653,   654,     0,  1626,  1627,     0,     0,
+     656,   657,  1628,   658,  1629,  1630,   659,   660,   661,   662,
+    5446,   664,   665,     0,  1631,   666,   667,   668,   669,   670,
+    1632,     0,   671,   672,   673,   674,   675,   728,  1633,     0,
+     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
+       0,   682,   683,   684,   685,   686,   687,   239,  1634,  1635,
+    1636,  1637,  1638,  1639,  1640,  1641,   729,   688,   689, -2802,
+       0,     0,     0,     0,     0,     0,  1643,  1644,     0,     0,
+       0,     0,     0,     0,     0,  1646,   753,    86,    87,    88,
+     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
+      98,    99,   100,   101,   102,   103,   754,   104,   105,   708,
+     755,     0,   107,   108,   109,   110,   756,   757,   112,   113,
+     114,     0,   115,   758,   759,   709,   710,     0,     0,     0,
+     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
+       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
+     717,    35,   427,     0,     0,    37,    38,    39,    40,    41,
+      42,    43,    44,  1578,  1579,  1580,    45,  1581,     0,     0,
+       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
+       0,  1582,     0,     0,   439,   440,     0,   441,   442,   132,
+     443,   444,   445,   134,  1583,   136,  1584,  1585,     0,   446,
+     447,   448,   449,   450,  1586,  1587,   451,   452,  1588,  1589,
+     453,     0,   454,   455,   456,   457,  1590,     0,  1591,     0,
+     458,   459,   460,   461,   147,   462,   463,   720,     0,   464,
+     465,   466,   467,   468,   469,     0,   150,   470,   471,     0,
+    1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,   474,   475,
+     476,   722,   477,  1599,  1600,   478,     0,   479,     0,   480,
+     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
+     488,   489,  1414,   491,   492,     0,   493,   494,   495,     0,
+     496,   497,   498,     0,   499,   500,   501,   502,  1601,   503,
+     504,   505,  1602,  1603,   506,     0,   507,   508,  1604,   509,
+       0,   510,     0,   511,   168,     0,   169,   512,   513,   514,
+       0,   515,  1605,     0,  1606,   516,     0,   517,   518,   724,
+     519,   520,   173,   521,   522,   523,   524,     0,   525,   526,
+     527,   528,   529,   530,     0,   531,   175,   176,     0,   532,
+     533,   534,  1417,  1607,     0,  1608,     0,   535,   179,   180,
+     536,   181,   537,   538,   539,   540,   541,     0,     0,   542,
+    1609,   183,   543,   184,     0,   544,   545,   546,  1610,  1611,
+     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
+     556,   726,   557,   558,   559,  1612,   190,  1613,   560,   561,
+     192,     0,   562,   563,   194,   564,  1615,  1616,   565,  1617,
+     566,   567,   568,     0,   569,     0,     0,  1618,   571,   572,
+       0,     0,   573,   197,   198,   574,   199,  1619,   575,   576,
+     577,   578,   579,   580,   581,     0,   582,   583,  1620,   584,
+     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
+     593,   594,   595,  1621,   596,   597,   598,   599,     0,   600,
+     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
+       0,   611,   612,   211,   613,   614,   615,  3067,   616,   617,
+     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
+     626,   627,  1623,   629,   630,   218,   631,   632,   220,   633,
+     634,  1624,   635,     0,   636,   637,   638,   639,   640,   641,
+     642,   643,   644,   645,   646,  1625,     0,   647,   648,     0,
+     649,   225,   650,   651,   652,   653,   654,     0,  1626,  1627,
+       0,     0,   656,   657,  1628,   658,  1629,  1630,   659,   660,
+     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
+     669,   670,  1632,     0,   671,   672,   673,   674,   675,   728,
+    1633,     0,   676,   237,   677,   678,   679,   680,     0,     0,
+     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
+    1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,   729,   688,
+     689,     0,     0,     0,     0,     0,     0,     0,  3068,  3069,
+       0,     0,     0,     0,     0,     0,     0,  3070,   753,    86,
+      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
+       0,     0,    98,    99,   100,   101,   102,   103,   754,   104,
+     105,   708,   755,     0,   107,   108,   109,   110,   756,   757,
+     112,   113,   114,     0,   115,   758,   759,   709,   710,     0,
+       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
+       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
+       0,   716,   717,    35,   427,     0,     0,    37,    38,    39,
+      40,    41,    42,    43,    44,  1578,  1579,  1580,    45,  1581,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
+       0,     0,     0,  1582,     0,     0,   439,   440,     0,   441,
+     442,   132,   443,   444,   445,   134,  1583,   136,  1584,  1585,
+       0,   446,   447,   448,   449,   450,  1586,  1587,   451,   452,
+    1588,  1589,   453,     0,   454,   455,   456,   457,  1590,     0,
+    1591,     0,   458,   459,   460,   461,   147,   462,   463,   720,
+       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
+     471,     0,  1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,
+     474,   475,   476,   722,   477,  1599,  1600,   478,     0,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,  1414,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+    1601,   503,   504,   505,  1602,  1603,   506,     0,   507,   508,
+    1604,   509,     0,   510,     0,   511,   168,     0,   169,   512,
+     513,   514,     0,   515,  1605,     0,  1606,   516,     0,   517,
+     518,   724,   519,   520,   173,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
+       0,   532,   533,   534,  1417,  1607,     0,  1608,     0,   535,
+       0,   180,   536,   181,   537,   538,   539,   540,   541,     0,
+       0,   542,  1609,   183,   543,   184,     0,   544,   545,   546,
+    1610,  1611,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,  1612,   190,  1613,
+     560,   561,   192,     0,   562,   563,   194,   564,  1615,  1616,
+     565,  1617,   566,   567,   568,     0,   569,     0,     0,  1618,
+     571,   572,     0,     0,   573,   197,   198,   574,   199,  1619,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+    1620,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,  1621,   596,   597,   598,   599,
+       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612,   211,   613,   614,   615,  3067,
+     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
+     624,   625,   626,   627,  1623,   629,   630,   218,   631,   632,
+     220,   633,   634,  1624,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,  1625,     0,   647,
+     648,     0,   649,   225,   650,   651,   652,   653,   654,     0,
+    1626,  1627,     0,     0,   656,   657,  1628,   658,  1629,  1630,
+     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
+     667,   668,   669,   670,  1632,     0,   671,   672,   673,   674,
+     675,   728,  1633,     0,   676,   237,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,   239,  1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,
+     729,   688,   689,     0,     0,     0,     0,     0,     0,     0,
+    3068,  3069,     0,     0,     0,     0,     0,     0,     0,  3070,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
      710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
      713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
+       0,   715,     0,   716,   717,    35,   427,     0,     0,    37,
+      38,    39,    40,    41,    42,    43,    44,  1578,  1579,     0,
+      45,  1581,     0,     0,     0,     0,     0,     0,     0,   428,
      429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
+     438,     0,     0,     0,     0,  1582,     0,     0,   439,   440,
+       0,   441,   442,   132,   443,   444,   445,   134,  1583,   136,
+    1584,  1585,     0,   446,   447,   448,   449,   450,  1586,  1587,
+     451,   452,  1588,  1589,   453,     0,   454,   455,   456,   457,
+    1590,     0,  1591,     0,   458,   459,   460,   461,   147,   462,
      463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+     150,   470,   471,     0,  1592,  1593,  1594,  1595,  1596,  1597,
+    1598,   473,   474,   475,   476,   722,   477,  1599,  1600,   478,
        0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
+     486,   487,     0,     0,   488,   489,  1414,   491,   492,     0,
      493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
+     501,   502,  1601,   503,   504,   505,  1602,  1603,   506,     0,
+     507,   508,  1604,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,  1605,     0,  1606,   516,
+       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
      524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     175,   176,     0,   532,   533,   534,  1417,  1607,     0,  1608,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,  1609,   183,   543,   184,     0,   544,
+     545,   546,  1610,  1611,   547,   548,   549,   550,   551,   552,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,  1612,
+     190,  1613,   560,   561,   192,     0,   562,   563,   194,   564,
+    1615,  1616,   565,  1617,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,   197,   198,   574,
+     199,  1619,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,  1620,   584,   202,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,  1621,   596,   597,
      598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-     216,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,   224,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,  2315,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,   238,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,     0,     0,   248,     0,    86,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,  3067,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,  1623,   629,   630,   218,
+     631,   632,   220,   633,   634,  1624,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,  1625,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,  1626,  1627,     0,     0,   656,   657,  1628,   658,
+    1629,  1630,   659,   660,   661,   662,   663,   664,   665,     0,
+       0,   666,   667,   668,   669,   670,  1632,     0,   671,   672,
+     673,   674,   675,   728,  1633,     0,   676,   237,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,   687,   239,  1634,  1635,  1636,  1637,  1638,  1639,
+    1640,  1641,   729,   688,   689,     0,     0,     0,   753,    86,
       87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,   249,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
+       0,  3070,    98,    99,   100,   101,   102,   103,   754,   104,
+     105,   708,   755,     0,   107,   108,   109,   110,   756,   757,
+     112,   113,   114,     0,   115,   758,   759,   709,   710,     0,
+       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
+       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
+       0,   716,   717,    35,   427,     0,     0,    37,    38,    39,
+      40,    41,    42,    43,    44,  1578,  1579,     0,    45,  1581,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
+       0,     0,     0,  1582,     0,     0,   439,   440,     0,   441,
+     442,   132,   443,   444,   445,   134,  1583,   136,  1584,  1585,
+       0,  4349,   447,   448,   449,   450,  1586,  1587,   451,   452,
+    1588,  1589,   453,     0,   454,   455,   456,   457,  1590,     0,
+    1591,     0,   458,   459,   460,   461,   147,   462,   463,   720,
+       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
+     471,     0,  1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,
+     474,   475,   476,   722,   477,  1599,  1600,   478,     0,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,  1414,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+    1601,   503,   504,   505,  1602,  1603,   506,     0,   507,   508,
+    1604,   509,     0,   510,     0,   511,   168,     0,   169,   512,
+     513,   514,     0,   515,  1605,     0,  1606,   516,     0,   517,
+     518,   724,   519,   520,   173,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
+       0,   532,   533,   534,  1417,  1607,     0,  1608,     0,   535,
+     179,   180,   536,   181,   537,   538,   539,   540,   541,     0,
+       0,   542,  1609,   183,   543,   184,     0,   544,   545,   546,
+    1610,  1611,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,  1612,   190,  1613,
+     560,   561,   192,     0,   562,   563,   194,   564,  1615,  1616,
+     565,  1617,   566,   567,   568,     0,   569,     0,     0,   570,
+     571,   572,     0,     0,   573,   197,   198,   574,   199,  1619,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+    1620,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,  1621,   596,   597,   598,   599,
+       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612,   211,   613,   614,   615,  3067,
+     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
+     624,   625,   626,   627,  1623,   629,   630,   218,   631,   632,
+     220,   633,   634,  1624,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,  1625,     0,   647,
+     648,     0,   649,   225,   650,   651,   652,   653,   654,     0,
+    1626,  1627,     0,     0,   656,   657,  1628,   658,  1629,  1630,
+     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
+     667,   668,   669,   670,  1632,     0,   671,   672,   673,   674,
+     675,   728,  1633,     0,   676,   237,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,   239,  1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,
+     729,   688,   689,     0,     0,     0,   753,    86,    87,    88,
+     705,    90,    91,    92,   706,     0,   707,    95,     0,  3070,
+      98,    99,   100,   101,   102,   103,   754,   104,   105,   708,
+     755,     0,   107,   108,   109,   110,   756,   757,   112,   113,
+     114,     0,   115,   758,   759,   709,   710,     0,     0,     0,
+     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
+       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
+     717,    35,   427,     0,     0,    37,    38,    39,    40,    41,
+      42,    43,    44,  1578,  1579,  1580,    45,  1581,     0,     0,
+       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
+       0,  1582,     0,     0,   439,   440,     0,   441,   442,   132,
+     443,   444,   445,     0,  1583,   136,  1584,  1585,     0,   446,
+     447,   448,   449,   450,  1586,  1587,   451,   452,  1588,  1589,
+     453,     0,   454,   455,   456,   457,  1590,     0,  1591,     0,
+     458,   459,   460,   461,   147,   462,   463,   720,     0,   464,
+     465,   466,   467,   468,   469,     0,   150,   470,   471,     0,
+    1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,   474,   475,
+     476,   722,   477,  1599,  1600,   478,     0,   479,     0,   480,
+     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
+     488,   489,  1414,   491,   492,     0,   493,   494,   495,     0,
+     496,     0,   498,     0,   499,   500,   501,   502,  1601,   503,
+     504,   505,  1602,  1603,   506,     0,   507,   508,  1604,   509,
+       0,   510,     0,   511,   168,     0,   169,   512,   513,   514,
+       0,   515,  1605,     0,  1606,   516,     0,   517,   518,   724,
+     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
+     527,   528,   529,   530,     0,   531,   175,   176,     0,   532,
+     533,   534,  1417,  1607,     0,  1608,     0,   535,     0,     0,
+     536,   181,   537,   538,   539,   540,   541,     0,     0,   542,
+    1609,   183,   543,     0,     0,   544,   545,   546,  1610,  1611,
+     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
+     556,   726,   557,   558,   559,  1612,   190,  1613,   560,   561,
+     192,  1614,   562,   563,     0,   564,  1615,  1616,   565,  1617,
+     566,   567,   568,     0,   569,     0,     0,  1618,   571,   572,
+       0,     0,   573,   197,   198,   574,   199,  1619,   575,   576,
+     577,   578,   579,   580,   581,     0,   582,   583,  1620,   584,
+     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
+     593,   594,   595,  1621,   596,   597,   598,   599,     0,   600,
+     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
+       0,   611,   612,   211,   613,   614,   615,  1622,   616,   617,
+     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
+     626,   627,  1623,   629,   630,   218,   631,   632,     0,   633,
+     634,  1624,   635,     0,   636,   637,   638,   639,   640,   641,
+     642,   643,   644,   645,   646,  1625,     0,   647,   648,     0,
+     649,   225,   650,   651,   652,   653,   654,     0,  1626,  1627,
+       0,     0,   656,   657,  1628,   658,  1629,  1630,   659,   660,
+     661,   662,   663,   664,   665,     0,  1631,   666,   667,   668,
+     669,   670,  1632,     0,   671,   672,   673,   674,   675,   728,
+    1633,     0,   676,   237,   677,   678,   679,   680,     0,     0,
+     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
+    1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,   729,   688,
+     689,     0,     0,     0,     0,     0,     0,     0,  1643,  1644,
+       0,     0,     0,     0,     0,     0,     0,  1646,   753,    86,
+      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
+       0,     0,    98,    99,   100,   101,   102,   103,   754,   104,
+     105,   708,   755,     0,   107,   108,   109,   110,   756,   757,
+     112,   113,   114,     0,   115,   758,   759,   709,   710,     0,
        0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
        0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
        0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
@@ -8855,264 +8366,314 @@
        0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
      431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
        0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
+     442,   132,   443,   444,   445,   134,   135,   136,   137,   138,
+       0,   446,   447,   448,   449,   450,     0,  1587,   451,   452,
+     719,   139,   453,     0,   454,   455,   456,   457,  1590,     0,
+    1591,     0,   458,   459,   460,   461,   147,   462,   463,   720,
+       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
+     471,     0,  1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,
      474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
        0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
        0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
      495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
+     163,   503,   504,   505,  1602,     0,   506,     0,   507,   508,
+     167,   509,     0,   510,     0,   511,   168,     0,   169,   512,
+     513,   514,     0,   515,  1605,     0,   172,   516,     0,   517,
+     518,   724,   519,   520,   173,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
        0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
+     179,   180,   536,   181,   537,   538,   539,   540,   541,  3845,
+       0,   542,  1609,   183,   543,   184,     0,   544,   545,   546,
+    1610,  1611,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,   189,   190,   191,
+     560,   561,   192,     0,   562,   563,   194,   564,     0,  1616,
+     565,   196,   566,   567,   568,     0,   569,     0,  1124,   570,
+     571,   572,     0,     0,   573,   197,   198,   574,   199,  1619,
      575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+    1620,   584,   202,   585,   586,   587,     0,   588,   589,   590,
      591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
        0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
+     609,   610,     0,   611,   612,   211,   613,   614,   615,   213,
+    3846,   617,   618,   619,   620,   621,   727,   622,   216,   623,
+     624,   625,   626,   627,  1623,   629,   630,   218,   631,   632,
+     220,   633,   634,   221,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,  1625,     0,   647,
+     648,   224,   649,   225,   650,   651,   652,   653,   654,     0,
+     226,   227,     0,     0,   656,   657,  1628,   658,  1629,     0,
      659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,     0,     0,     0,     0,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,  1716,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
+     667,   668,   669,   670,  1632,     0,   671,   672,   673,   674,
+     675,  2317,   236,     0,   676,   237,   677,   678,   679,   680,
+       0,     0,   681,     0,   238,   682,   683,   684,   685,   686,
+     687,   239,  1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,
+     729,   688,   689,     0,     0,   248,   753,    86,    87,    88,
+     705,    90,    91,    92,   706,     0,   707,    95,     0,  3847,
+      98,    99,   100,   101,   102,   103,   754,   104,   105,   708,
+     755,     0,   107,   108,   109,   110,   756,   757,   112,   113,
+     114,     0,   115,   758,   759,   709,   710,     0,     0,     0,
      711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
        0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
      717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
       42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
      433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
+       0,     0,     0,     0,   439,   440,     0,   441,   442,   132,
+     443,   444,   445,   134,   135,   136,   137,   138,     0,   446,
+     447,   448,   449,   450,     0,  1587,   451,   452,   719,   139,
+     453,     0,   454,   455,   456,   457,  1590,     0,  1591,     0,
+     458,   459,   460,   461,   147,   462,   463,   720,     0,   464,
+     465,   466,   467,   468,   469,     0,   150,   470,   471,     0,
+    1592,  1593,  1594,  1595,  1596,  1597,  1598,   473,   474,   475,
      476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
      481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
      488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
      496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
+     504,   505,  1602,     0,   506,     0,   507,   508,   167,   509,
+       0,   510,     0,   511,   168,     0,   169,   512,   513,   514,
+       0,   515,  1605,     0,   172,   516,     0,   517,   518,   724,
+     519,   520,   173,   521,   522,   523,   524,     0,   525,   526,
+     527,   528,   529,   530,     0,   531,   175,   176,     0,   532,
+     533,   534,     0,   177,     0,   178,     0,   535,   179,   180,
+     536,   181,   537,   538,   539,   540,   541,  3845,     0,   542,
+    1609,   183,   543,   184,     0,   544,   545,   546,  1610,  1611,
      547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
+     556,   726,   557,   558,   559,   189,   190,   191,   560,   561,
+     192,     0,   562,   563,   194,   564,     0,  1616,   565,   196,
+     566,   567,   568,     0,   569,     0,  1124,   570,   571,   572,
+       0,     0,   573,   197,   198,   574,   199,  1619,   575,   576,
+     577,   578,   579,   580,   581,     0,   582,   583,  1620,   584,
      202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
      593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
      601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
+       0,   611,   612,   211,   613,   614,   615,   213,  3846,   617,
      618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
+     626,   627,  1623,   629,   630,   218,   631,   632,   220,   633,
      634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
+     642,   643,   644,   645,   646,  1625,     0,   647,   648,     0,
+     649,   225,   650,   651,   652,   653,   654,     0,   226,   227,
+       0,     0,   656,   657,  1628,   658,  1629,     0,   659,   660,
      661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
+     669,   670,  1632,     0,   671,   672,   673,   674,   675,   728,
+     236,     0,   676,   237,   677,   678,   679,   680,     0,     0,
      681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,     0,     0,     0,     0,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,  3226,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
+    1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,   729,   688,
+     689,     0,     0,     0,   753,    86,    87,    88,   705,    90,
+      91,    92,   706,     0,   707,    95,     0,  3847,    98,    99,
+     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
+     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
+     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
        0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
        0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
        0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
      435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
+       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
+     445,   134,   135,   136,   137,   138,     0,   446,   447,   448,
+     449,   450,     0,  1587,   451,   452,   719,   139,   453,     0,
+     454,   455,   456,   457,  1590,     0,  1591,     0,   458,   459,
+     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
+     467,   468,   469,     0,   150,   470,   471,     0,  1592,  1593,
+    1594,  1595,  1596,  1597,  1598,   473,   474,   475,   476,   722,
      477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
      483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
      490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
      498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
+    1602,     0,   506,     0,   507,   508,   167,   509,     0,   510,
+       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
+    1605,     0,   172,   516,     0,   517,   518,   724,   519,   520,
+     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
+     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
+       0,   177,     0,   178,     0,   535,   179,   180,   536,   181,
+     537,   538,   539,   540,   541,     0,     0,   542,  1609,   183,
+     543,   184,     0,   544,   545,   546,  1610,  1611,   547,   548,
      549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
+     557,   558,   559,   189,   190,   191,   560,   561,   192,     0,
+     562,   563,   194,   564,     0,  1616,   565,   196,   566,   567,
      568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
+     573,   197,   198,   574,   199,  1619,   575,   576,   577,   578,
+     579,   580,   581,     0,   582,   583,  1620,   584,   202,   585,
      586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
      595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
      603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
+     612,   211,   613,   614,   615,   213,  3846,   617,   618,   619,
      620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
+    1623,   629,   630,   218,   631,   632,   220,   633,   634,   221,
      635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
+     644,   645,   646,  1625,     0,   647,   648,     0,   649,   225,
      650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
+     656,   657,  1628,   658,  1629,     0,   659,   660,   661,   662,
      663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,     0,
-       0,     0,     0,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,  4378,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
+    1632,     0,   671,   672,   673,   674,   675,   728,   236,     0,
+     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
+       0,   682,   683,   684,   685,   686,   687,   239,  1634,  1635,
+    1636,  1637,  1638,  1639,  1640,  1641,   729,   688,   689,     0,
+       0,     0,   753,    86,    87,    88,   705,    90,    91,    92,
+     706,     0,   707,    95,     0,   249,    98,    99,   100,   101,
+     102,   103,   754,   104,   105,   708,   755,     0,   107,   108,
+     109,   110,   756,   757,   112,   113,   114,     0,   115,   758,
+     759,   709,   710,     0,     0,     0,   711,   712,     0,     0,
        0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
        0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
        0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
      436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
+     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
+     135,   136,   137,   138,     0,   446,   447,   448,   449,   450,
+       0,  1587,   451,   452,   719,   139,   453,     0,   454,   455,
+     456,   457,  1590,     0,  1591,     0,   458,   459,   460,   461,
+     147,   462,   463,   720,     0,   464,   465,   466,   467,   468,
+     469,     0,   150,   470,   471,     0,  1592,  1593,  1594,  1595,
+    1596,  1597,  1598,   473,   474,   475,   476,   722,   477,   154,
      155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
        0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
      492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
+     499,   500,   501,   502,   163,   503,   504,   505,  1602,     0,
      506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
+     168,     0,   169,   512,   513,   514,     0,   515,  1605,     0,
+     172,   516,     0,   517,   518,   724,   519,   520,   173,   521,
      522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
+       0,   531,   175,   176,     0,   532,   533,   534,     0,   177,
+       0,   178,     0,   535,   179,   180,   536,   181,   537,   538,
+     539,   540,   541,     0,     0,   542,  1609,   183,   543,   184,
+       0,   544,   545,   546,  1610,  1611,   547,   548,   549,   550,
      551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
+     559,   189,   190,   191,   560,   561,   192,     0,   562,   563,
+     194,   564,     0,  1616,   565,   196,   566,   567,   568,     0,
      569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
+     198,   574,   199,  1619,   575,   576,   577,   578,   579,   580,
+     581,     0,   582,   583,  1620,   584,   202,   585,   586,   587,
        0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
      596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
+     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
      613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
+     727,   622,     0,   623,   624,   625,   626,   627,  1623,   629,
+     630,   218,   631,   632,   220,   633,   634,   221,   635,     0,
      636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
+     646,  1625,     0,   647,   648,     0,   649,   225,   650,   651,
      652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
+    1628,   658,  1629,     0,   659,   660,   661,   662,   663,   664,
+     665,     0,     0,   666,   667,   668,   669,   670,  1632,     0,
+     671,   672,   673,   674,   675,   728,   236,     0,   676,   237,
      677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,     0,     0,     0,
+     683,   684,   685,   686,   687,   239,  1634,  1635,  1636,  1637,
+    1638,  1639,  1640,  1641,   729,   688,   689,     0,     0,     0,
      753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,  4808,    98,    99,   100,   101,   102,   103,
+     707,    95,     0,  4481,    98,    99,   100,   101,   102,   103,
      754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
      756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
      710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
      713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,   427,     0,     0,    37,
-      38,    39,    40,    41,    42,    43,    44,     0,     0,  1251,
-      45,     0,     0,     0,     0,     0,  1252,  1253,  1254,   428,
-     429,   430,   431,   432,   433,   434,   435,   760,   436,   437,
-     438,   761,   762,   763,   764,   765,   766,   767,   439,   440,
-     768,   441,   442,   132,   443,   444,   445,     0,  1406,   136,
-    1407,  1408,   769,   446,   447,   448,   449,   450,   770,   771,
-     451,   452,  1409,  1410,   453,   773,   454,   455,   456,   457,
-       0,   774,   144,   775,   458,   459,   460,   461,   147,   462,
-     463,   720,   777,   464,   465,   466,   467,   468,   469,   778,
-     150,   470,   471,     0,   780,   781,   782,   151,   783,   784,
-     785,   473,   474,   475,   476,   722,   477,  1411,  1412,   478,
-     786,   479,   787,   480,   481,   482,   483,   484,   788,   485,
-     486,   487,   789,   790,   488,   489,  1413,   491,   492,   791,
-     493,   494,   495,   792,   496,   497,   498,   793,   499,   500,
-     501,   502,     0,   503,   504,   505,     0,   794,   506,   795,
-     507,   508,  1414,   509,   796,   510,   797,   511,   168,   798,
-     169,   512,   513,   514,   799,   515,     0,   800,     0,   516,
-     801,   517,   518,   724,   519,   520,   173,   521,   522,   523,
-     524,   802,   525,   526,   527,   528,   529,   530,   803,   531,
-     175,     0,     0,   532,   533,   534,  1416,  1417,   806,  1418,
-     807,   535,   179,   180,   536,   181,   537,   538,   539,   540,
-     541,   808,   809,   542,     0,   183,   543,   184,   810,   544,
-     545,   546,   811,   812,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,  1419,
-     190,  1420,   560,   561,     0,   813,   562,   563,   194,   564,
-     814,     0,   565,  1421,   566,   567,   568,   815,   569,   816,
-     817,  4124,   571,   572,   818,   819,   573,     0,   198,   574,
-     199,     0,   575,   576,   577,   578,   579,   580,   581,   820,
-     582,   583,     0,   584,     0,   585,   586,   587,   821,   588,
-     589,   590,   591,   592,   593,   594,   595,  1422,   596,   597,
-     598,   599,   822,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,   823,   611,   612,   211,   613,   614,
-     615,     0,   616,   617,   618,   619,   620,   621,   727,   622,
-     824,   623,   624,   625,   626,   627,   825,   629,   630,  2524,
-     631,   632,   220,   633,   634,  1424,   635,   826,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,     0,
-     827,   647,   648,   828,   649,   225,   650,   651,   652,   653,
-     654,   829,  1425,  1426,     0,   831,   656,   657,     0,   658,
-       0,   832,   659,   660,   661,   662,   663,   664,   665,     0,
-     834,   666,   667,   668,   669,   670,   835,   836,   671,   672,
-     673,   674,   675,     0,  1427,   838,   676,   237,   677,   678,
-     679,   680,   839,   840,   681,   841,   842,   682,   683,   684,
-     685,   686,   687,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   729,   688,   689,     0,     0,     0,  1257,  1258,
-    1259,     0,  4125,  4126,  1262,  1263,  1264,  1265,    86,    87,
+       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
+       0,   441,   442,   132,   443,   444,   445,   134,   135,   136,
+     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
+     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
+     143,     0,   144,     0,   458,   459,   460,   461,   147,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
+       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
+     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
+     507,   508,   167,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,   171,     0,   172,   516,
+       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
+     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
+     175,   176,     0,   532,   533,   534,     0,   177,     0,   178,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,   182,   183,   543,   184,     0,   544,
+     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
+     190,   191,   560,   561,   192,     0,   562,   563,   194,   564,
+       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,   197,   198,   574,
+     199,   200,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
+     631,   632,   220,   633,   634,   221,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
+     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
+       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
+     673,   674,   675,   728,   236,     0,   676,   237,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   729,   688,   689,     0,     0,     0,     0,    86,
+      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
+       0,  5128,    98,    99,   100,   101,   102,   103,     0,   104,
+     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
+     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
+       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
+       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
+       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
+       0,     0,     0,     0,  4403,     0,   439,   440,     0,   441,
+     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
+       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
+     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
+       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
+       0,   464,   465,   466,   467,   468,   469,     0, -1602,   470,
+     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
+     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
+     167,   509,     0,   510,     0,   511,     0,     0, -1602,   512,
+     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
+     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531, -1602,   176,
+       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
+       0,     0,   536, -1602,   537,   538,   539,   540,   541,     0,
+       0,   542,   182, -1602,   543,     0,     0,   544,   545,   546,
+       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,   189, -1602,   191,
+     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
+     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
+     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
+       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612, -1602,   613,   614,   615,   213,
+     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
+     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
+       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
+     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
+     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
+     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
+     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
+     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     729,   688,   689,     0,     0,     0,     0,     0,    86,    87,
       88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+    1742,    98,    99,   100,   101,   102,   103,     0,   104,   105,
      708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
      113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
        0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
        0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
-      41,    42,     0,     0,     0,     0,  1251,     0,     0,     0,
-       0,     0,     0,  1252,  1253,  1254,   428,   429,   430,   431,
+     716,   717,    35,     0,     0,     0,    37,    38,    39,    40,
+      41,    42,     0,    44,     0,     0,     0,    45,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
      432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
        0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
        0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
      446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
-     139,   453,     0,   454,  1255,   456,   457,   143,     0,     0,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
        0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
      464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
        0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
@@ -9120,7 +8681,7 @@
      480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
        0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
        0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
-     503,   504,   505,   165,     0,  1256,     0,   507,   508,   167,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
      509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
      514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
      724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
@@ -9149,90 +8710,139 @@
      728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
        0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
      239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
-     688,   689,     0,     0,     0,  1257,  1258,  1259,     0,  1260,
-    1261,  1262,  1263,  1264,  1265,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,  1251,     0,     0,     0,     0,     0,     0,
-    1252,  1253,  1254,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,  1357,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,  1358,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,     0,
-       0,     0,  1257,  1258,  1259,     0,  1260,  1261,  1262,  1263,
-    1264,  1265,    86,    87,    88,   705,    90,    91,    92,   706,
-       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
-     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
-     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
-     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
-       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
-     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
-       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
-    1251,     0,     0,     0,     0,     0,     0,  1252,  1253,  1254,
-     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
-     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
-     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
-       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
-       0,   451,   452,   719,   139,   453,     0,   454,  1457,   456,
-     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
-     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
-       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
-       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
-     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
-     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
-       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
-     500,   501,   502,   163,   503,   504,   505,   165,     0,  1458,
-       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
-       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
-     516,     0,   517,   518,   724,   519,  1459,     0,   521,   522,
-     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
-     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
-     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
-     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
-     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
-     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     688,   689,     0,     0,     0,     0,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,  3649,  3650,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,    37,    38,    39,    40,    41,    42,
+       0,    44,     0,     0,     0,    45,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+       0,     0,     0,     0,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,  3650,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,   427,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,   216,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,   224,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,  2317,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,   238,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,     0,     0,
+     248,     0,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,   249,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
      189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
      564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
        0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
@@ -9242,18 +8852,272 @@
      597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
      606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
      614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
-     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     622,   216,   623,   624,   625,   626,   627,     0,   629,   630,
      218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
      637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
-     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     223,     0,   647,   648,   224,   649,     0,   650,   651,   652,
      653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
      658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
        0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
-     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
-     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     672,   673,   674,   675,  2317,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,   238,   682,   683,
      684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   729,   688,   689,     0,     0,     0,  1257,
-    1258,  1259,     0,  1260,  1261,  1262,  1263,  1264,  1265,    86,
+     245,   246,   247,   729,   688,   689,     0,     0,   248,     0,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,   249,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,     0,     0,     0,     0,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+    1717,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,     0,     0,     0,     0,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,  3232,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+       0,     0,     0,     0,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,  4384,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,     0,     0,
+       0,   753,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,  4814,    98,    99,   100,   101,   102,
+     103,   754,   104,   105,   708,   755,     0,   107,   108,   109,
+     110,   756,   757,   112,   113,   114,     0,   115,   758,   759,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,   427,     0,     0,
+      37,    38,    39,    40,    41,    42,    43,    44,     0,     0,
+    1251,    45,     0,     0,     0,     0,     0,  1252,  1253,  1254,
+     428,   429,   430,   431,   432,   433,   434,   435,   760,   436,
+     437,   438,   761,   762,   763,   764,   765,   766,   767,   439,
+     440,   768,   441,   442,   132,   443,   444,   445,     0,  1407,
+     136,  1408,  1409,   769,   446,   447,   448,   449,   450,   770,
+     771,   451,   452,  1410,  1411,   453,   773,   454,   455,   456,
+     457,     0,   774,   144,   775,   458,   459,   460,   461,   147,
+     462,   463,   720,   777,   464,   465,   466,   467,   468,   469,
+     778,   150,   470,   471,     0,   780,   781,   782,   151,   783,
+     784,   785,   473,   474,   475,   476,   722,   477,  1412,  1413,
+     478,   786,   479,   787,   480,   481,   482,   483,   484,   788,
+     485,   486,   487,   789,   790,   488,   489,  1414,   491,   492,
+     791,   493,   494,   495,   792,   496,   497,   498,   793,   499,
+     500,   501,   502,     0,   503,   504,   505,     0,   794,   506,
+     795,   507,   508,  1415,   509,   796,   510,   797,   511,   168,
+     798,   169,   512,   513,   514,   799,   515,     0,   800,     0,
+     516,   801,   517,   518,   724,   519,   520,   173,   521,   522,
+     523,   524,   802,   525,   526,   527,   528,   529,   530,   803,
+     531,   175,     0,     0,   532,   533,   534,  1417,  1418,   806,
+    1419,   807,   535,   179,   180,   536,   181,   537,   538,   539,
+     540,   541,   808,   809,   542,     0,   183,   543,   184,   810,
+     544,   545,   546,   811,   812,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+    1420,   190,  1421,   560,   561,     0,   813,   562,   563,   194,
+     564,   814,     0,   565,  1422,   566,   567,   568,   815,   569,
+     816,   817,  4130,   571,   572,   818,   819,   573,     0,   198,
+     574,   199,     0,   575,   576,   577,   578,   579,   580,   581,
+     820,   582,   583,     0,   584,     0,   585,   586,   587,   821,
+     588,   589,   590,   591,   592,   593,   594,   595,  1423,   596,
+     597,   598,   599,   822,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,   823,   611,   612,   211,   613,
+     614,   615,     0,   616,   617,   618,   619,   620,   621,   727,
+     622,   824,   623,   624,   625,   626,   627,   825,   629,   630,
+    2527,   631,   632,   220,   633,   634,  1425,   635,   826,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+       0,   827,   647,   648,   828,   649,   225,   650,   651,   652,
+     653,   654,   829,  1426,  1427,     0,   831,   656,   657,     0,
+     658,     0,   832,   659,   660,   661,   662,   663,   664,   665,
+       0,   834,   666,   667,   668,   669,   670,   835,   836,   671,
+     672,   673,   674,   675,     0,  1428,   838,   676,   237,   677,
+     678,   679,   680,   839,   840,   681,   841,   842,   682,   683,
+     684,   685,   686,   687,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   729,   688,   689,     0,     0,     0,  1257,
+    1258,  1259,     0,  4131,  4132,  1262,  1263,  1264,  1265,    86,
       87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
        0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
      105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
@@ -9267,7 +9131,7 @@
        0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
      442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
        0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,  2017,   456,   457,   143,     0,
+     719,   139,   453,     0,   454,  1255,   456,   457,   143,     0,
        0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
        0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
      471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
@@ -9275,7 +9139,7 @@
        0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
        0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
      495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,  2018,     0,   507,   508,
+     163,   503,   504,   505,   165,     0,  1256,     0,   507,   508,
      167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
      513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
      518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
@@ -9319,7 +9183,7 @@
        0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
      444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
      448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
-       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+       0,   454,  1358,   456,   457,   143,     0,     0,     0,   458,
      459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
      466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
        0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
@@ -9327,7 +9191,7 @@
      482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
      489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
      497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
-     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     505,   165,     0,  1359,     0,   507,   508,   167,   509,     0,
      510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
      515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
      520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
@@ -9370,7 +9234,7 @@
      436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
      439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
      135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,  3327,
+       0,     0,   451,   452,   719,   139,   453,     0,   454,  1458,
      456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
        0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
      469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
@@ -9379,9 +9243,9 @@
        0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
      492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
      499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-    3328,     0,   507,   508,   167,   509,     0,   510,     0,   511,
+    1459,     0,   507,   508,   167,   509,     0,   510,     0,   511,
        0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
+     172,   516,     0,   517,   518,   724,   519,  1460,     0,   521,
      522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
        0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
        0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
@@ -9422,7 +9286,7 @@
        0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
      441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
      138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+     452,   719,   139,   453,     0,   454,  2019,   456,   457,   143,
        0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
      720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
      470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -9430,7 +9294,7 @@
      479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
      487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
      494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     502,   163,   503,   504,   505,   165,     0,  2020,     0,   507,
      508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
      512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
      517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
@@ -9442,7 +9306,7 @@
      554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
      191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
      195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
-    5101,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
      200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
      583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
      590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
@@ -9460,298 +9324,148 @@
      680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
      686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
      247,   729,   688,   689,     0,     0,     0,  1257,  1258,  1259,
-       0,  1260,  1261,  1262,  1263,  1264,  1265,   753,    86,    87,
-      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,   754,   104,   105,
-     708,   755,     0,   107,   108,   109,   110,   756,   757,   112,
-     113,   114,     0,   115,   758,   759,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
-      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,   760,   436,   437,   438,   761,   762,
-     763,   764,   765,   766,   767,   439,   440,   768,   441,   442,
-     132,   443,   444,   445,   134,   135,   136,   137,   138,   769,
-     446,   447,   448,   449,   450,   770,   771,   451,   452,   772,
-     139,   453,   773,   454,   455,   456,   457,   143,   774,   144,
-     775,   458,   459,   460,   461,   147,   462,   463,   776,   777,
-     464,   465,   466,   467,   468,   469,   778,   150,   470,   471,
-     779,   780,   781,   782,   151,   783,   784,   785,   473,   474,
-     475,   476,   722,   477,   154,   155,   478,   786,   479,   787,
-     480,   481,   482,   483,   484,   788,   485,   486,   487,   789,
-     790,   488,   489,   490,   491,   492,   791,   493,   494,   495,
-     792,   496,   497,   498,   793,   499,   500,   501,   502,   163,
-     503,   504,   505,   165,   794,   506,   795,   507,   508,   167,
-     509,   796,   510,   797,   511,   168,   798,   169,   512,   513,
-     514,   799,   515,   171,   800,   172,   516,   801,   517,   518,
-     724,   519,   520,   173,   521,   522,   523,   524,   802,   525,
-     526,   527,   528,   529,   530,   803,   531,   175,   176,   804,
-     532,   533,   534,   805,   177,   806,   178,   807,   535,   179,
-     180,   536,   181,   537,   538,   539,   540,   541,   808,   809,
-     542,   182,   183,   543,   184,   810,   544,   545,   546,   811,
-     812,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,   189,   190,   191,   560,
-     561,   192,   813,   562,   563,   194,   564,   814,   195,   565,
-     196,   566,   567,   568,   815,   569,   816,   817,   570,   571,
-     572,   818,   819,   573,   197,   198,   574,   199,   200,   575,
-     576,   577,   578,   579,   580,   581,   820,   582,   583,   201,
-     584,   202,   585,   586,   587,   821,   588,   589,   590,   591,
-     592,   593,   594,   595,   204,   596,   597,   598,   599,   822,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,   823,   611,   612,   211,   613,   614,   615,   213,   616,
-     617,   618,   619,   620,   621,   727,   622,   824,   623,   624,
-     625,   626,   627,   825,   629,   630,   218,   631,   632,   220,
-     633,   634,   221,   635,   826,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,   223,   827,   647,   648,
-     828,   649,   225,   650,   651,   652,   653,   654,   829,   226,
-     227,   830,   831,   656,   657,   228,   658,   229,   832,   659,
-     660,   661,   662,   663,   664,   665,   833,   834,   666,   667,
-     668,   669,   670,   835,   836,   671,   672,   673,   674,   675,
-     837,   236,   838,   676,   237,   677,   678,   679,   680,   839,
-     840,   681,   841,   842,   682,   683,   684,   685,   686,   687,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
-     688,   689,   753,    86,    87,    88,   705,    90,    91,    92,
-     706,  2415,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,   754,   104,   105,   708,   755,     0,   107,   108,
-     109,   110,   756,   757,   112,   113,   114,     0,   115,   758,
-     759,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,   132,   443,   444,   445,     0,
-    1406,   136,  1407,  1408,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,  1409,  1410,   453,     0,   454,   455,
-     456,   457,     0,     0,   144,     0,   458,   459,   460,   461,
-     147,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,   150,   470,   471,     0,     0,     0,     0,   151,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,  1411,
-    1412,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,  1413,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,     0,   503,   504,   505,     0,     0,
-     506,     0,   507,   508,  1414,   509,     0,   510,     0,   511,
-     168,     0,   169,   512,   513,   514,     0,   515,     0,     0,
-       0,   516,     0,   517,   518,   724,   519,   520,   173,   521,
-     522,   523,   524,  2520,   525,   526,   527,   528,   529,   530,
-       0,   531,   175,  2521,     0,   532,   533,   534,  1416,  1417,
-       0,  1418,     0,   535,   179,   180,   536,   181,   537,   538,
-     539,   540,   541,     0,     0,   542,     0,   183,   543,   184,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,  1419,   190,  1420,   560,   561,     0,     0,   562,   563,
-     194,   564,     0,     0,   565,  1421,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,  2522,   573,  2523,
-     198,   574,   199,     0,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,     0,   584,     0,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,  1422,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
-     613,   614,   615,     0,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,  2524,   631,   632,   220,   633,   634,  1424,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,     0,     0,   647,   648,     0,   649,   225,   650,   651,
-     652,   653,   654,     0,  1425,  1426,     0,     0,   656,   657,
-       0,   658,     0,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,     0,  1427,  2525,   676,   237,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   729,   688,   689,     0,    86,    87,
-      88,   705,    90,    91,    92,   706,  2526,   707,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
-     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
-     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
-      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
-       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
-       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
-     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
-     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
-       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
-     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
-       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
-     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
-     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
-     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
-     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
-     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
-     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
-       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
-     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
-       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
-     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
-     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
-     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
-     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
-     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
-     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
-     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
-     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
-       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
-     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
-     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
-     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
-     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
-       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
-     688,   689,     0,    86,    87,    88,   705,    90,    91,    92,
-     706,  1131,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,     0,    86,    87,
-      88,   705,    90,    91,    92,   706,  5155,   707,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
-     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
-     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
-       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
-       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
-     716,   717,    35,   427,     0,     0,     0,     0,     0,     0,
-      41,    42,     0,     0,     0,     0,     0,    45,     0,     0,
-       0,     0,     0,     0,     0,     0,   428,  1021,   430,   431,
-     432,   433,   434,   435,  1022,   436,   437,   438,     0,     0,
-       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
-       0,  1023,   444,   445,   134,   135,     0,   137,   138,     0,
-     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
-     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
-       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
-     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
-       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
-     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
-     503,   504,   505,   165,     0,   506,     0,   507,  1024,   167,
-     509,     0,   510,     0,  1025,     0,  1026,     0,   512,   513,
-     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
-     724,   519,   520,     0,   521,   522,   523,   524,  1027,   525,
-     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
-     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
-       0,   536,     0,   537,   538,   539,   540,  1028,     0,     0,
-     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
-       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
-     555,   556,   726,   557,   558,   559,   189,     0,   191,  1029,
-     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
-     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
-     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
-     584,   202,   585,   586,   587,     0,  1030,   589,   590,   591,
-     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
-     600,   601,  1031,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
-     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
-     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
-     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
-       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
-     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
-     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
-     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
-     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
-       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
-     688,   689,     0,     0,     0,     0,     0,     0,     0,  1032,
-    1033,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,   427,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-      45,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-    1021,   430,   431,   432,   433,   434,   435,  1022,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,  1055,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+       0,  1260,  1261,  1262,  1263,  1264,  1265,    86,    87,    88,
+     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
+      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
+       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
+     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
+     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
+       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
+     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
+      42,     0,     0,     0,     0,  1251,     0,     0,     0,     0,
+       0,     0,  1252,  1253,  1254,   428,   429,   430,   431,   432,
+     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
+       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
+     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
+     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
+     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
+     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
+     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
+       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
+     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
+     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
+     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
+     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
+     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
+       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
+       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
+     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
+     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
+     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
+     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
+     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
+     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
+     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
+     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
+     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
+       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
+     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
+     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
+     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
+     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
+       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
+     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
+     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
+     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
+     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
+     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
+       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
+     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
+     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
+     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
+     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
+     689,     0,     0,     0,  1257,  1258,  1259,     0,  1260,  1261,
+    1262,  1263,  1264,  1265,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,  1251,     0,     0,     0,     0,     0,     0,  1252,
+    1253,  1254,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+    3333,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,  3334,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,     0,     0,
+       0,  1257,  1258,  1259,     0,  1260,  1261,  1262,  1263,  1264,
+    1265,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
+       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
+     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
+     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
+       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,  1251,
+       0,     0,     0,     0,     0,     0,  1252,  1253,  1254,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
+       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
+     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
+     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
+     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
+       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
        0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
      486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
      493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
      501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,  1024,   167,   509,     0,   510,     0,  1056,     0,  1026,
+     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
        0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
        0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
-     524,  1027,   525,   526,   527,   528,   529,   530,     0,   531,
+     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
        0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
        0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-    1028,     0,     0,   542,   182,     0,   543,     0,     0,   544,
+     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
      545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
      553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,  1029,   561,   192,     0,   562,   563,     0,   564,
+       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
        0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
+       0,  5107,   571,   572,     0,     0,   573,   197,     0,   574,
        0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,  1030,
+     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
      589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,  1031,   603,   604,   605,   606,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
      607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
      615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
        0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
@@ -9764,18 +9478,170 @@
      673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
      679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
      685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,     0,     0,     0,     0,     0,
-       0,     0,  1032,  1033,    86,    87,    88,   705,    90,    91,
-      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     246,   247,   729,   688,   689,     0,     0,     0,  1257,  1258,
+    1259,     0,  1260,  1261,  1262,  1263,  1264,  1265,   753,    86,
+      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
+       0,     0,    98,    99,   100,   101,   102,   103,   754,   104,
+     105,   708,   755,     0,   107,   108,   109,   110,   756,   757,
+     112,   113,   114,     0,   115,   758,   759,   709,   710,     0,
+       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
+       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
+       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,   760,   436,   437,   438,   761,
+     762,   763,   764,   765,   766,   767,   439,   440,   768,   441,
+     442,   132,   443,   444,   445,   134,   135,   136,   137,   138,
+     769,   446,   447,   448,   449,   450,   770,   771,   451,   452,
+     772,   139,   453,   773,   454,   455,   456,   457,   143,   774,
+     144,   775,   458,   459,   460,   461,   147,   462,   463,   776,
+     777,   464,   465,   466,   467,   468,   469,   778,   150,   470,
+     471,   779,   780,   781,   782,   151,   783,   784,   785,   473,
+     474,   475,   476,   722,   477,   154,   155,   478,   786,   479,
+     787,   480,   481,   482,   483,   484,   788,   485,   486,   487,
+     789,   790,   488,   489,   490,   491,   492,   791,   493,   494,
+     495,   792,   496,   497,   498,   793,   499,   500,   501,   502,
+     163,   503,   504,   505,   165,   794,   506,   795,   507,   508,
+     167,   509,   796,   510,   797,   511,   168,   798,   169,   512,
+     513,   514,   799,   515,   171,   800,   172,   516,   801,   517,
+     518,   724,   519,   520,   173,   521,   522,   523,   524,   802,
+     525,   526,   527,   528,   529,   530,   803,   531,   175,   176,
+     804,   532,   533,   534,   805,   177,   806,   178,   807,   535,
+     179,   180,   536,   181,   537,   538,   539,   540,   541,   808,
+     809,   542,   182,   183,   543,   184,   810,   544,   545,   546,
+     811,   812,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,   189,   190,   191,
+     560,   561,   192,   813,   562,   563,   194,   564,   814,   195,
+     565,   196,   566,   567,   568,   815,   569,   816,   817,   570,
+     571,   572,   818,   819,   573,   197,   198,   574,   199,   200,
+     575,   576,   577,   578,   579,   580,   581,   820,   582,   583,
+     201,   584,   202,   585,   586,   587,   821,   588,   589,   590,
+     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
+     822,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,   823,   611,   612,   211,   613,   614,   615,   213,
+     616,   617,   618,   619,   620,   621,   727,   622,   824,   623,
+     624,   625,   626,   627,   825,   629,   630,   218,   631,   632,
+     220,   633,   634,   221,   635,   826,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,   223,   827,   647,
+     648,   828,   649,   225,   650,   651,   652,   653,   654,   829,
+     226,   227,   830,   831,   656,   657,   228,   658,   229,   832,
+     659,   660,   661,   662,   663,   664,   665,   833,   834,   666,
+     667,   668,   669,   670,   835,   836,   671,   672,   673,   674,
+     675,   837,   236,   838,   676,   237,   677,   678,   679,   680,
+     839,   840,   681,   841,   842,   682,   683,   684,   685,   686,
+     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     729,   688,   689,   753,    86,    87,    88,   705,    90,    91,
+      92,   706,  2417,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,   754,   104,   105,   708,   755,     0,   107,
+     108,   109,   110,   756,   757,   112,   113,   114,     0,   115,
+     758,   759,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
+       0,  1407,   136,  1408,  1409,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,  1410,  1411,   453,     0,   454,
+     455,   456,   457,     0,     0,   144,     0,   458,   459,   460,
+     461,   147,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,   150,   470,   471,     0,     0,     0,     0,
+     151,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+    1412,  1413,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,  1414,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,     0,   503,   504,   505,     0,
+       0,   506,     0,   507,   508,  1415,   509,     0,   510,     0,
+     511,   168,     0,   169,   512,   513,   514,     0,   515,     0,
+       0,     0,   516,     0,   517,   518,   724,   519,   520,   173,
+     521,   522,   523,   524,  2523,   525,   526,   527,   528,   529,
+     530,     0,   531,   175,  2524,     0,   532,   533,   534,  1417,
+    1418,     0,  1419,     0,   535,   179,   180,   536,   181,   537,
+     538,   539,   540,   541,     0,     0,   542,     0,   183,   543,
+     184,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,  1420,   190,  1421,   560,   561,     0,     0,   562,
+     563,   194,   564,     0,     0,   565,  1422,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,  2525,   573,
+    2526,   198,   574,   199,     0,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,     0,   584,     0,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+    1423,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+     211,   613,   614,   615,     0,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,  2527,   631,   632,   220,   633,   634,  1425,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,     0,     0,   647,   648,     0,   649,   225,   650,
+     651,   652,   653,   654,     0,  1426,  1427,     0,     0,   656,
+     657,     0,   658,     0,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,     0,  1428,  2528,   676,
+     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   729,   688,   689,     0,    86,
+      87,    88,   705,    90,    91,    92,   706,  2529,   707,    95,
+       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
+     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
+     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
+       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
+       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
+       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
+       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
+     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
+       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
+     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
+       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
+       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
+     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
+     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
+     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
+     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
+     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
+       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
+       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
+       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
+       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
+     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
+     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
+     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
+       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
+     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
+     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
+       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
+     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
+     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
+     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
+     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
+     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     729,   688,   689,     0,    86,    87,    88,   705,    90,    91,
+      92,   706,  1131,   707,    95,     0,     0,    98,    99,   100,
      101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
      108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
        0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
        0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
-       0,     0,   714,     0,   715,     0,   716,   717,    35,   427,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
        0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
-       0,     0,     0,    45,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-    1510,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
        0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
      134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
      450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
@@ -9788,9 +9654,9 @@
      491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
        0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
        0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
-     511,     0,  1026,     0,   512,   513,   514,     0,   515,   171,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
        0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
-     521,   522,   523,   524,  1027,   525,   526,   527,   528,   529,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
      530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
      177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
      538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
@@ -9815,1174 +9681,570 @@
        0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
        0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
      682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   729,   688,   689,     0,     0,
-       0,     0,     0,     0,     0,  1032,  1033,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,   427,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,    45,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,  1515,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,  1026,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,  1027,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,     0,     0,     0,     0,     0,     0,     0,  1032,  1033,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
-     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
-       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,   427,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
-     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
-       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
-     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
-     473,   474,   475,   476,   722,   477,   154,   155,   478,   723,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
-     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
-     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
-     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
-     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
-     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
-       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
-     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
-     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
-     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
-     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
-     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
-     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
-     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
-       0,   226,   227,  1687,     0,   656,   657,   228,   658,   229,
-       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   729,   688,   689,     0,     0,     0,     0,  1101,  1688,
-      86,    87,    88,   705,    90,    91,    92,   706,  1102,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
-     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
-       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
-     138,     0,   446,   447,   448,   449,   450,     0,     0,  1103,
-     452,  1074,   139,   453,     0,   454,   455,   456,   457,   143,
-       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
-    1104,     0,  1105,   465,   466,   467,   468,   469,     0,     0,
-     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
-     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
-     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
-     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
-     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
-     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
-     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
-       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
-    1106,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,  1107,   189,     0,
-     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
-     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
-     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,     0,  1108,   614,   615,
-     213,   616,   617,   618,  1109,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,  1110,     0,   629,   630,   218,   631,
-     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
-     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
-       0,  1111,   227,     0,     0,  1112,   657,   228,   658,   229,
-       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,  1078,   236,     0,   676,     0,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,  1113,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   729,   688,   689,   753,    86,    87,    88,   705,    90,
+     243,   244,   245,   246,   247,   729,   688,   689,     0,    86,
+      87,    88,   705,    90,    91,    92,   706,  5161,   707,    95,
+       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
+     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
+     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
+       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
+       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
+       0,   716,   717,    35,   427,     0,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,    45,     0,
+       0,     0,     0,     0,     0,     0,     0,   428,  1021,   430,
+     431,   432,   433,   434,   435,  1022,   436,   437,   438,     0,
+       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
+     442,     0,  1023,   444,   445,   134,   135,     0,   137,   138,
+       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
+     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
+       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
+       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
+     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
+     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+     163,   503,   504,   505,   165,     0,   506,     0,   507,  1024,
+     167,   509,     0,   510,     0,  1025,     0,  1026,     0,   512,
+     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
+     518,   724,   519,   520,     0,   521,   522,   523,   524,  1027,
+     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
+       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
+       0,     0,   536,     0,   537,   538,   539,   540,  1028,     0,
+       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
+       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
+     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
+    1029,   561,   192,     0,   562,   563,     0,   564,     0,   195,
+     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
+     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+     201,   584,   202,   585,   586,   587,     0,  1030,   589,   590,
+     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
+       0,   600,   601,  1031,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
+     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
+     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
+       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
+     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
+     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
+     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
+     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
+     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     729,   688,   689,     0,     0,     0,     0,     0,     0,     0,
+    1032,  1033,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,   427,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,    45,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,  1021,   430,   431,   432,   433,   434,   435,  1022,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,  1055,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,  1024,   167,   509,     0,   510,     0,  1056,     0,
+    1026,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
+     523,   524,  1027,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,  1028,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,  1029,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+    1030,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,  1031,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,     0,     0,     0,     0,
+       0,     0,     0,  1032,  1033,    86,    87,    88,   705,    90,
       91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
-     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
-     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
+     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
+     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
+     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
        0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
        0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,    37,    38,    39,    40,    41,    42,    43,
-      44,     0,     0,     0,    45,     0,     0,     0,     0,     0,
+     427,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,    45,     0,     0,     0,     0,     0,
        0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,   760,   436,   437,   438,   761,   762,   763,   764,   765,
-     766,   767,   439,   440,   768,   441,   442,   132,   443,   444,
-     445,   134,   135,   136,   137,   138,   769,   446,   447,   448,
-     449,   450,   770,   771,   451,   452,   772,   139,   453,   773,
-     454,   455,   456,   457,   143,   774,   144,   775,   458,   459,
-     460,   461,   147,   462,   463,   776,   777,   464,   465,   466,
-     467,   468,   469,   778,   150,   470,   471,   779,   780,   781,
-     782,   151,   783,   784,   785,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,   786,   479,   787,   480,   481,   482,
-     483,   484,   788,   485,   486,   487,   789,   790,   488,   489,
-     490,   491,   492,   791,   493,   494,   495,   792,   496,   497,
-     498,   793,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,   794,   506,   795,   507,   508,   167,   509,   796,   510,
-     797,   511,   168,   798,   169,   512,   513,   514,   799,   515,
-     171,   800,   172,   516,   801,   517,   518,   724,   519,   520,
-     173,   521,   522,   523,   524,   802,   525,   526,   527,   528,
-     529,   530,   803,   531,   175,   176,   804,   532,   533,   534,
-     805,   177,   806,   178,   807,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,   808,   809,   542,   182,   183,
-     543,   184,   810,   544,   545,   546,   811,   812,   547,   548,
+     435,  1511,   436,   437,   438,     0,     0,     0,     0,     0,
+       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
+     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
+     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
+     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
+     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
+     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
+       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
+     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
+     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
+     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
+     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
+     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
+       0,   511,     0,  1026,     0,   512,   513,   514,     0,   515,
+     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
+       0,   521,   522,   523,   524,  1027,   525,   526,   527,   528,
+     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
+       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
+     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
+     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
      549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,   190,   191,   560,   561,   192,   813,
-     562,   563,   194,   564,   814,   195,   565,   196,   566,   567,
-     568,   815,   569,   816,   817,   570,   571,   572,   818,   819,
-     573,   197,   198,   574,   199,   200,   575,   576,   577,   578,
-     579,   580,   581,   820,   582,   583,   201,   584,   202,   585,
-     586,   587,   821,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,   822,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,   823,   611,
-     612,   211,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,   824,   623,   624,   625,   626,   627,
-     825,   629,   630,   218,   631,   632,   220,   633,   634,   221,
-     635,   826,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,   827,   647,   648,   828,   649,   225,
-     650,   651,   652,   653,   654,   829,   226,   227,   830,   831,
-     656,   657,   228,   658,   229,   832,   659,   660,   661,   662,
-     663,   664,   665,   833,   834,   666,   667,   668,   669,   670,
-     835,   836,   671,   672,   673,   674,   675,   837,   236,   838,
-     676,   237,   677,   678,   679,   680,   839,   840,   681,   841,
-     842,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,   760,   436,   437,   438,
-     761,   762,   763,   764,   765,   766,   767,   439,   440,   768,
-     441,   442,   132,   443,   444,   445,   134,   135,   136,   137,
-     138,   769,   446,   447,   448,   449,   450,   770,   771,   451,
-     452,   772,   139,   453,   773,   454,   455,   456,   457,   143,
-     774,   144,   775,   458,   459,   460,   461,   147,   462,   463,
-     776,   777,   464,   465,   466,   467,   468,   469,   778,   150,
-     470,   471,   779,   780,   781,   782,   151,   783,   784,   785,
-     473,   474,   475,   476,   722,   477,   154,   155,   478,   786,
-     479,   787,   480,   481,   482,   483,   484,   788,   485,   486,
-     487,   789,   790,   488,   489,   490,   491,   492,   791,   493,
-     494,   495,   792,   496,   497,   498,   793,   499,   500,   501,
-     502,   163,   503,   504,   505,   165,   794,   506,   795,   507,
-     508,   167,   509,   796,   510,   797,   511,   168,   798,   169,
-     512,   513,   514,   799,   515,   171,   800,   172,   516,   801,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-     802,   525,   526,   527,   528,   529,   530,   803,   531,   175,
-     176,   804,   532,   533,   534,   805,   177,   806,   178,   807,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-     808,   809,   542,   182,   183,   543,   184,   810,   544,   545,
-     546,   811,   812,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,   189,   190,
-     191,   560,   561,   192,   813,   562,   563,   194,   564,   814,
-     195,   565,   196,   566,   567,   568,   815,   569,   816,   817,
-     570,   571,   572,   818,   819,   573,   197,   198,   574,   199,
-     200,   575,   576,   577,   578,   579,   580,   581,   820,   582,
-     583,   201,   584,   202,   585,   586,   587,   821,   588,   589,
-     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
-     599,   822,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,   823,   611,   612,   211,   613,   614,   615,
-     213,   616,   617,   618,   619,   620,   621,   727,   622,   824,
-     623,   624,   625,   626,   627,   825,   629,   630,   218,   631,
-     632,   220,   633,   634,   221,   635,   826,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,   223,   827,
-     647,   648,   828,   649,   225,   650,   651,   652,   653,   654,
-     829,   226,   227,   830,   831,   656,   657,   228,   658,   229,
-     832,   659,   660,   661,   662,   663,   664,   665,   833,   834,
-     666,   667,   668,   669,   670,   835,   836,   671,   672,   673,
-     674,   675,   837,   236,   838,   676,   237,   677,   678,   679,
-     680,   839,   840,   681,   841,   842,   682,   683,   684,   685,
-     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   729,   688,   689,   753,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
-     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
-     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,  3391,   433,   434,
-     435,   760,   436,   437,   438,   761,   762,   763,   764,   765,
-     766,   767,   439,   440,   768,   441,   442,   132,   443,   444,
-     445,   134,   135,   136,   137,   138,   769,   446,   447,   448,
-     449,   450,   770,   771,   451,   452,   772,   139,   453,   773,
-     454,   455,   456,   457,   143,   774,   144,   775,   458,   459,
-     460,   461,   147,   462,   463,   776,   777,   464,   465,   466,
-     467,   468,   469,   778,   150,   470,   471,   779,   780,   781,
-     782,   151,   783,   784,   785,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,   786,   479,   787,   480,   481,   482,
-     483,   484,   788,   485,   486,   487,   789,   790,   488,   489,
-     490,  3392,   492,   791,   493,   494,   495,   792,   496,   497,
-     498,   793,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,   794,   506,   795,   507,   508,   167,   509,   796,   510,
-     797,   511,   168,   798,   169,   512,   513,   514,   799,   515,
-     171,   800,   172,   516,   801,   517,   518,   724,   519,   520,
-     173,   521,   522,   523,   524,   802,   525,   526,   527,   528,
-     529,   530,   803,   531,   175,   176,   804,   532,   533,   534,
-     805,   177,   806,   178,   807,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,   808,   809,   542,   182,   183,
-     543,   184,   810,   544,   545,   546,   811,   812,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,   190,   191,   560,   561,   192,   813,
-     562,   563,   194,   564,   814,   195,   565,   196,   566,   567,
-     568,   815,   569,   816,   817,   570,   571,   572,   818,   819,
-     573,   197,   198,   574,   199,   200,   575,   576,   577,   578,
-     579,   580,   581,   820,   582,   583,   201,   584,   202,   585,
-     586,   587,   821,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,   822,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,   823,   611,
-     612,   211,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,   824,   623,   624,   625,   626,   627,
-     825,  3393,   630,   218,   631,   632,   220,   633,   634,   221,
-     635,   826,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,   827,   647,   648,   828,   649,   225,
-     650,   651,   652,   653,   654,   829,   226,   227,   830,   831,
-     656,   657,   228,   658,   229,   832,   659,   660,   661,   662,
-     663,   664,   665,   833,   834,   666,   667,   668,   669,   670,
-     835,   836,   671,   672,   673,   674,   675,   837,   236,   838,
-     676,   237,   677,   678,   679,   680,   839,   840,   681,   841,
-     842,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,   134,   135,   136,   137,
-     138,     0,   446,   447,   448,   449,   450,     0,  1586,   451,
-     452,   719,   139,   453,     0,   454,   455,   456,   457,  1589,
-       0,  1590,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,  1591,  1592,  1593,  1594,  1595,  1596,  1597,
-     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,   163,   503,   504,   505,  1601,     0,   506,     0,   507,
-     508,   167,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,  1604,     0,   172,   516,     0,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,  1608,   183,   543,   184,     0,   544,   545,
-     546,  1609,  1610,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,   189,   190,
-     191,   560,   561,   192,     0,   562,   563,   194,   564,     0,
-    1615,   565,   196,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,   197,   198,   574,   199,
-    1618,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,  1619,   584,   202,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,  1622,   629,   630,   218,   631,
-     632,   220,   633,   634,   221,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,  1624,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,   226,   227,     0,     0,   656,   657,  1627,   658,  1628,
-       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,  1631,     0,   671,   672,   673,
-     674,   675,   728,   236,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,   239,  1633,  1634,  1635,  1636,  1637,  1638,  1639,
-    1640,   729,   688,   689,   753,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
-     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
-     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
-     445,   134,   135,   136,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,   144,     0,   458,   459,
-     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
-       0,   151,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,   183,
-     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,   190,   191,   560,   561,   192,     0,
-     562,   563,   194,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,   198,   574,   199,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,   211,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,   220,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,   225,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,   134,   135,   136,   137,
-     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
-       0,   144,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,     0,     0,     0,   151,     0,     0,     0,
-     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
-     508,   167,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
-     517,   518,   724,   519,  1399,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,   182,   183,   543,   184,     0,   544,   545,
-     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,   189,   190,
-     191,   560,   561,   192,     0,   562,   563,   194,   564,     0,
-     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,   197,   198,   574,   199,
-     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
-     632,   220,   633,   634,   221,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
-       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,   728,   236,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   729,   688,   689,   753,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
-     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
-     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
-     445,   134,   135,   136,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,   144,     0,   458,   459,
-     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
-       0,   151,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,  1450,
-     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,   183,
-     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,   190,   191,   560,   561,   192,     0,
-     562,   563,   194,   564,     0,   195,   565,   196,   566,   567,
+     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
+     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
      568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,   198,   574,   199,   200,   575,   576,   577,   578,
+     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
      579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
      586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
      595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
      603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,   211,   613,   614,   615,   213,   616,   617,   618,   619,
+     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
      620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,   220,   633,   634,   221,
+       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
      635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,   225,
+     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
      650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
      656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
      663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
        0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
+     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
        0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,     0,  1406,   136,  1407,
-    1408,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,  1409,  1410,   453,     0,   454,   455,   456,   457,     0,
-       0,   144,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,     0,     0,     0,   151,     0,     0,     0,
-     473,   474,   475,   476,   722,   477,  1411,  1412,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,  1413,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,     0,   503,   504,   505,     0,     0,   506,     0,   507,
-     508,  1414,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,     0,     0,     0,   516,     0,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-    2520,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-    2521,     0,   532,   533,   534,  1416,  1417,     0,  1418,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,     0,   183,   543,   184,     0,   544,   545,
-     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,  1419,   190,
-    1420,   560,   561,     0,     0,   562,   563,   194,   564,     0,
-       0,   565,  1421,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,  2523,   198,   574,   199,
-       0,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,     0,   584,     0,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,  1422,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-       0,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,     0,   629,   630,  2524,   631,
-     632,   220,   633,   634,  1424,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,     0,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,  1425,  1426,     0,     0,   656,   657,     0,   658,     0,
-       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,     0,  1427,  2525,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   729,   688,   689,   753,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
-     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
-     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+     242,   243,   244,   245,   246,   247,   729,   688,   689,     0,
+       0,     0,     0,     0,     0,     0,  1032,  1033,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,   427,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,    45,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,  1516,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,  1026,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,   520,     0,   521,   522,   523,   524,  1027,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,     0,     0,     0,     0,     0,     0,     0,  1032,
+    1033,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
+       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
+     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
+     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
+       0,   715,     0,   716,   717,    35,   427,     0,     0,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
+       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
+     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
+     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
+     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
+       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+     723,   479,     0,   480,   481,   482,   483,   484,     0,   485,
+     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
+     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
+       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
+       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
+     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
+       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
+       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
+     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
+     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
+       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
+       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
+       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
+     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
+     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
+       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
+     654,     0,   226,   227,  1688,     0,   656,   657,   228,   658,
+     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
+       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
+     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   729,   688,   689,     0,     0,     0,     0,  1101,
+    1689,    86,    87,    88,   705,    90,    91,    92,   706,  1102,
+     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
+       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
+     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
+     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
+       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
+       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
+     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
+    1103,   452,  1074,   139,   453,     0,   454,   455,   456,   457,
+     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
+     463,  1104,     0,  1105,   465,   466,   467,   468,   469,     0,
+       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
+       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
+     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
+     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
+       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
+       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
+     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
+       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
+       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
+     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
+     545,  1106,     0,     0,   547,   548,   549,   550,   551,   552,
+     553,   554,   725,   555,   556,   726,   557,   558,  1107,   189,
+       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
+       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
+       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,     0,  1108,   614,
+     615,   213,   616,   617,   618,  1109,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,  1110,     0,   629,   630,   218,
+     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
+       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
+     654,     0,  1111,   227,     0,     0,  1112,   657,   228,   658,
+     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
+       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
+     673,   674,   675,  1078,   236,     0,   676,     0,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,  1113,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   729,   688,   689,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,    37,    38,    39,    40,    41,    42,
+      43,    44,     0,     0,     0,    45,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,   760,   436,   437,   438,   761,   762,   763,   764,
+     765,   766,   767,   439,   440,   768,   441,   442,   132,   443,
+     444,   445,   134,   135,   136,   137,   138,   769,   446,   447,
+     448,   449,   450,   770,   771,   451,   452,   772,   139,   453,
+     773,   454,   455,   456,   457,   143,   774,   144,   775,   458,
+     459,   460,   461,   147,   462,   463,   776,   777,   464,   465,
+     466,   467,   468,   469,   778,   150,   470,   471,   779,   780,
+     781,   782,   151,   783,   784,   785,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,   786,   479,   787,   480,   481,
+     482,   483,   484,   788,   485,   486,   487,   789,   790,   488,
+     489,   490,   491,   492,   791,   493,   494,   495,   792,   496,
+     497,   498,   793,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,   794,   506,   795,   507,   508,   167,   509,   796,
+     510,   797,   511,   168,   798,   169,   512,   513,   514,   799,
+     515,   171,   800,   172,   516,   801,   517,   518,   724,   519,
+     520,   173,   521,   522,   523,   524,   802,   525,   526,   527,
+     528,   529,   530,   803,   531,   175,   176,   804,   532,   533,
+     534,   805,   177,   806,   178,   807,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,   808,   809,   542,   182,
+     183,   543,   184,   810,   544,   545,   546,   811,   812,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,   190,   191,   560,   561,   192,
+     813,   562,   563,   194,   564,   814,   195,   565,   196,   566,
+     567,   568,   815,   569,   816,   817,   570,   571,   572,   818,
+     819,   573,   197,   198,   574,   199,   200,   575,   576,   577,
+     578,   579,   580,   581,   820,   582,   583,   201,   584,   202,
+     585,   586,   587,   821,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,   822,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,   823,
+     611,   612,   211,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,   824,   623,   624,   625,   626,
+     627,   825,   629,   630,   218,   631,   632,   220,   633,   634,
+     221,   635,   826,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,   827,   647,   648,   828,   649,
+     225,   650,   651,   652,   653,   654,   829,   226,   227,   830,
+     831,   656,   657,   228,   658,   229,   832,   659,   660,   661,
+     662,   663,   664,   665,   833,   834,   666,   667,   668,   669,
+     670,   835,   836,   671,   672,   673,   674,   675,   837,   236,
+     838,   676,   237,   677,   678,   679,   680,   839,   840,   681,
+     841,   842,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
+     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
+     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
+       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,   760,   436,   437,
+     438,   761,   762,   763,   764,   765,   766,   767,   439,   440,
+     768,   441,   442,   132,   443,   444,   445,   134,   135,   136,
+     137,   138,   769,   446,   447,   448,   449,   450,   770,   771,
+     451,   452,   772,   139,   453,   773,   454,   455,   456,   457,
+     143,   774,   144,   775,   458,   459,   460,   461,   147,   462,
+     463,   776,   777,   464,   465,   466,   467,   468,   469,   778,
+     150,   470,   471,   779,   780,   781,   782,   151,   783,   784,
+     785,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+     786,   479,   787,   480,   481,   482,   483,   484,   788,   485,
+     486,   487,   789,   790,   488,   489,   490,   491,   492,   791,
+     493,   494,   495,   792,   496,   497,   498,   793,   499,   500,
+     501,   502,   163,   503,   504,   505,   165,   794,   506,   795,
+     507,   508,   167,   509,   796,   510,   797,   511,   168,   798,
+     169,   512,   513,   514,   799,   515,   171,   800,   172,   516,
+     801,   517,   518,   724,   519,   520,   173,   521,   522,   523,
+     524,   802,   525,   526,   527,   528,   529,   530,   803,   531,
+     175,   176,   804,   532,   533,   534,   805,   177,   806,   178,
+     807,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,   808,   809,   542,   182,   183,   543,   184,   810,   544,
+     545,   546,   811,   812,   547,   548,   549,   550,   551,   552,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
+     190,   191,   560,   561,   192,   813,   562,   563,   194,   564,
+     814,   195,   565,   196,   566,   567,   568,   815,   569,   816,
+     817,   570,   571,   572,   818,   819,   573,   197,   198,   574,
+     199,   200,   575,   576,   577,   578,   579,   580,   581,   820,
+     582,   583,   201,   584,   202,   585,   586,   587,   821,   588,
+     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     598,   599,   822,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,   823,   611,   612,   211,   613,   614,
+     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
+     824,   623,   624,   625,   626,   627,   825,   629,   630,   218,
+     631,   632,   220,   633,   634,   221,   635,   826,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
+     827,   647,   648,   828,   649,   225,   650,   651,   652,   653,
+     654,   829,   226,   227,   830,   831,   656,   657,   228,   658,
+     229,   832,   659,   660,   661,   662,   663,   664,   665,   833,
+     834,   666,   667,   668,   669,   670,   835,   836,   671,   672,
+     673,   674,   675,   837,   236,   838,   676,   237,   677,   678,
+     679,   680,   839,   840,   681,   841,   842,   682,   683,   684,
+     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   729,   688,   689,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
-     445,     0,  1406,   136,  1407,  1408,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,  1409,  1410,   453,     0,
-     454,   455,   456,   457,     0,     0,   144,     0,   458,   459,
-     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
-       0,   151,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,  1411,  1412,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-    1413,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,     0,   503,   504,   505,
-       0,     0,   506,     0,   507,   508,  1414,   509,     0,   510,
-       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
-       0,     0,     0,   516,     0,   517,   518,   724,   519,   520,
-     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,   175,     0,     0,   532,   533,   534,
-    1416,  1417,     0,  1418,     0,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,     0,     0,   542,     0,   183,
-     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,  1419,   190,  1420,   560,   561,     0,     0,
-     562,   563,   194,   564,  2617,     0,   565,  1421,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,     0,   198,   574,   199,     0,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,     0,   584,     0,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,  1422,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,   211,   613,   614,   615,     0,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,  2524,   631,   632,   220,   633,   634,  1424,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,     0,     0,   647,   648,  4222,   649,   225,
-     650,   651,   652,   653,   654,     0,  1425,  1426,     0,     0,
-     656,   657,     0,   658,     0,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,     0,  1427,     0,
-     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   729,   688,   689,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,     0,  1406,   136,  1407,
-    1408,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,  1409,  1410,   453,     0,   454,   455,   456,   457,     0,
-       0,   144,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,     0,     0,     0,   151,     0,     0,     0,
-     473,   474,   475,   476,   722,   477,  1411,  1412,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,  1413,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,     0,   503,   504,   505,     0,     0,   506,     0,   507,
-     508,  1414,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,     0,     0,     0,   516,     0,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-       0,     0,   532,   533,   534,  1416,  1417,     0,  1418,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,     0,   183,   543,   184,     0,   544,   545,
-     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,  1419,   190,
-    1420,   560,   561,  2683,     0,   562,   563,   194,   564,     0,
-       0,   565,  1421,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,     0,   198,   574,   199,
-       0,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,     0,   584,     0,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,  1422,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-       0,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,     0,   629,   630,  1423,   631,
-     632,   220,   633,   634,  1424,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,     0,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,  1425,  1426,     0,     0,   656,   657,     0,   658,     0,
-       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,     0,  1427,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   729,   688,   689,   753,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
-     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
-     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,  3397,   433,
+     434,   435,   760,   436,   437,   438,   761,   762,   763,   764,
+     765,   766,   767,   439,   440,   768,   441,   442,   132,   443,
+     444,   445,   134,   135,   136,   137,   138,   769,   446,   447,
+     448,   449,   450,   770,   771,   451,   452,   772,   139,   453,
+     773,   454,   455,   456,   457,   143,   774,   144,   775,   458,
+     459,   460,   461,   147,   462,   463,   776,   777,   464,   465,
+     466,   467,   468,   469,   778,   150,   470,   471,   779,   780,
+     781,   782,   151,   783,   784,   785,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,   786,   479,   787,   480,   481,
+     482,   483,   484,   788,   485,   486,   487,   789,   790,   488,
+     489,   490,  3398,   492,   791,   493,   494,   495,   792,   496,
+     497,   498,   793,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,   794,   506,   795,   507,   508,   167,   509,   796,
+     510,   797,   511,   168,   798,   169,   512,   513,   514,   799,
+     515,   171,   800,   172,   516,   801,   517,   518,   724,   519,
+     520,   173,   521,   522,   523,   524,   802,   525,   526,   527,
+     528,   529,   530,   803,   531,   175,   176,   804,   532,   533,
+     534,   805,   177,   806,   178,   807,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,   808,   809,   542,   182,
+     183,   543,   184,   810,   544,   545,   546,   811,   812,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,   190,   191,   560,   561,   192,
+     813,   562,   563,   194,   564,   814,   195,   565,   196,   566,
+     567,   568,   815,   569,   816,   817,   570,   571,   572,   818,
+     819,   573,   197,   198,   574,   199,   200,   575,   576,   577,
+     578,   579,   580,   581,   820,   582,   583,   201,   584,   202,
+     585,   586,   587,   821,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,   822,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,   823,
+     611,   612,   211,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,   824,   623,   624,   625,   626,
+     627,   825,  3399,   630,   218,   631,   632,   220,   633,   634,
+     221,   635,   826,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,   827,   647,   648,   828,   649,
+     225,   650,   651,   652,   653,   654,   829,   226,   227,   830,
+     831,   656,   657,   228,   658,   229,   832,   659,   660,   661,
+     662,   663,   664,   665,   833,   834,   666,   667,   668,   669,
+     670,   835,   836,   671,   672,   673,   674,   675,   837,   236,
+     838,   676,   237,   677,   678,   679,   680,   839,   840,   681,
+     841,   842,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
+     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
+     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
+       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
+       0,   441,   442,   132,   443,   444,   445,   134,   135,   136,
+     137,   138,     0,   446,   447,   448,   449,   450,     0,  1587,
+     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
+    1590,     0,  1591,     0,   458,   459,   460,   461,   147,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,     0,  1592,  1593,  1594,  1595,  1596,  1597,
+    1598,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
+     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,   163,   503,   504,   505,  1602,     0,   506,     0,
+     507,   508,   167,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,  1605,     0,   172,   516,
+       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
+     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
+     175,   176,     0,   532,   533,   534,     0,   177,     0,   178,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,  1609,   183,   543,   184,     0,   544,
+     545,   546,  1610,  1611,   547,   548,   549,   550,   551,   552,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
+     190,   191,   560,   561,   192,     0,   562,   563,   194,   564,
+       0,  1616,   565,   196,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,   197,   198,   574,
+     199,  1619,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,  1620,   584,   202,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,  1623,   629,   630,   218,
+     631,   632,   220,   633,   634,   221,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,  1625,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,   226,   227,     0,     0,   656,   657,  1628,   658,
+    1629,     0,   659,   660,   661,   662,   663,   664,   665,     0,
+       0,   666,   667,   668,   669,   670,  1632,     0,   671,   672,
+     673,   674,   675,   728,   236,     0,   676,   237,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,   687,   239,  1634,  1635,  1636,  1637,  1638,  1639,
+    1640,  1641,   729,   688,   689,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
-     445,     0,  1406,   136,  1407,  1408,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,  1409,  1410,   453,     0,
-     454,   455,   456,   457,     0,     0,   144,     0,   458,   459,
-     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
-       0,   151,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,  1411,  1412,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-    1413,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,     0,   503,   504,   505,
-       0,     0,   506,     0,   507,   508,  1414,   509,     0,   510,
-       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
-       0,     0,     0,   516,     0,   517,   518,   724,   519,   520,
-     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,   175,     0,     0,   532,   533,   534,
-    1416,  1417,     0,  1418,     0,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,     0,     0,   542,     0,   183,
-     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,  1419,   190,  1420,   560,   561,  4049,     0,
-     562,   563,   194,   564,     0,     0,   565,  1421,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,     0,   198,   574,   199,     0,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,     0,   584,     0,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,  1422,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,   211,   613,   614,   615,     0,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,  1423,   631,   632,   220,   633,   634,  1424,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,     0,     0,   647,   648,     0,   649,   225,
-     650,   651,   652,   653,   654,     0,  1425,  1426,     0,     0,
-     656,   657,     0,   658,     0,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,     0,  1427,     0,
-     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   729,   688,   689,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,     0,  1406,   136,  1407,
-    1408,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,  1409,  1410,   453,     0,   454,   455,   456,   457,     0,
-       0,   144,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,     0,     0,     0,   151,     0,     0,     0,
-     473,   474,   475,   476,   722,   477,  1411,  1412,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,  1413,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,     0,   503,   504,   505,     0,     0,   506,     0,   507,
-     508,  1414,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,     0,     0,     0,   516,     0,
-     517,   518,   724,   519,  1415,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-       0,     0,   532,   533,   534,  1416,  1417,     0,  1418,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,     0,   183,   543,   184,     0,   544,   545,
-     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,  1419,   190,
-    1420,   560,   561,     0,     0,   562,   563,   194,   564,     0,
-       0,   565,  1421,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,     0,   198,   574,   199,
-       0,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,     0,   584,     0,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,  1422,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-       0,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,     0,   629,   630,  1423,   631,
-     632,   220,   633,   634,  1424,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,     0,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,  1425,  1426,     0,     0,   656,   657,     0,   658,     0,
-       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,     0,  1427,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   729,   688,   689,   753,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
-     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
-     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
-     445,     0,  1406,   136,  1407,  1408,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,  1409,  1410,   453,     0,
-     454,   455,   456,   457,     0,     0,   144,     0,   458,   459,
-     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
-       0,   151,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,  1411,  1412,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-    1413,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,     0,   503,   504,   505,
-       0,     0,   506,     0,   507,   508,  1414,   509,     0,   510,
-       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
-       0,     0,     0,   516,     0,   517,   518,   724,   519,  1476,
-     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,   175,     0,     0,   532,   533,   534,
-    1416,  1417,     0,  1418,     0,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,     0,     0,   542,     0,   183,
-     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,  1419,   190,  1420,   560,   561,     0,     0,
-     562,   563,   194,   564,     0,     0,   565,  1421,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,     0,   198,   574,   199,     0,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,     0,   584,     0,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,  1422,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,   211,   613,   614,   615,     0,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,  1423,   631,   632,   220,   633,   634,  1424,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,     0,     0,   647,   648,     0,   649,   225,
-     650,   651,   652,   653,   654,     0,  1425,  1426,     0,     0,
-     656,   657,     0,   658,     0,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,     0,  1427,     0,
-     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   729,   688,   689,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,     0,  1406,   136,  1407,
-    1408,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,  1409,  1410,   453,     0,   454,   455,   456,   457,     0,
-       0,   144,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,     0,     0,     0,   151,     0,     0,     0,
-     473,   474,   475,   476,   722,   477,  1411,  1412,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,  1413,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,     0,   503,   504,   505,     0,     0,   506,     0,   507,
-     508,  1414,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,     0,     0,     0,   516,     0,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-       0,     0,   532,   533,   534,  1416,  1417,     0,  1418,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,     0,   183,   543,   184,     0,   544,   545,
-     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,  1419,   190,
-    1420,   560,   561,     0,     0,   562,   563,   194,   564,     0,
-       0,   565,  1421,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,     0,   198,   574,   199,
-       0,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,     0,   584,     0,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,  1422,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-       0,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,     0,   629,   630,  1423,   631,
-     632,   220,   633,   634,  1424,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,     0,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,  1425,  1426,     0,     0,   656,   657,     0,   658,     0,
-       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,     0,  1427,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   729,   688,   689,   753,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
-     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
-     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
-     445,     0,  1406,   136,  1407,  1408,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,  1409,  1410,   453,     0,
-     454,   455,   456,   457,     0,     0,   144,     0,   458,   459,
-     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
-       0,   151,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,  1411,  1412,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-    1413,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,     0,   503,   504,   505,
-       0,     0,   506,     0,   507,   508,  1414,   509,     0,   510,
-       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
-       0,     0,     0,   516,     0,   517,   518,   724,   519,   520,
-     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,   175,     0,     0,   532,   533,   534,
-    1416,  1417,     0,  1418,     0,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,     0,     0,   542,     0,   183,
-     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,  1419,   190,  1420,   560,   561,     0,     0,
-     562,   563,   194,   564,     0,     0,   565,  1421,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,     0,   198,   574,   199,     0,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,     0,   584,     0,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,  1422,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,   211,   613,   614,   615,     0,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,  2524,   631,   632,   220,   633,   634,  1424,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,     0,     0,   647,   648,     0,   649,   225,
-     650,   651,   652,   653,   654,     0,  1425,  1426,     0,     0,
-     656,   657,     0,   658,     0,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,     0,  1427,     0,
-     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   729,   688,   689,   753,
-      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
-      95,     0,     0,    98,    99,   100,   101,   102,   103,   754,
-     104,   105,   708,   755,     0,   107,   108,   109,   110,   756,
-     757,   112,   113,   114,     0,   115,   758,   759,   709,   710,
-       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
-       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
-     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
-       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
-     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,     0,  1406,   136,  1407,
-    1408,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,  1409,  1410,   453,     0,   454,   455,   456,   457,     0,
-       0,   144,     0,   458,   459,   460,   461,   147,   462,   463,
-     720,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,     0,     0,     0,   151,     0,     0,     0,
-     473,   474,   475,   476,   722,   477,  1411,  1412,   478,     0,
-     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
-     487,     0,     0,   488,   489,  1413,   491,   492,     0,   493,
-     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,     0,   503,   504,   505,     0,     0,   506,     0,   507,
-     508,  1414,   509,     0,   510,     0,   511,   168,     0,   169,
-     512,   513,   514,     0,   515,     0,     0,     0,   516,     0,
-     517,   518,   724,   519,   520,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
-       0,     0,   532,   533,   534,  1416,  1417,     0,  1418,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,     0,   183,   543,   184,     0,   544,   545,
-     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,   725,   555,   556,   726,   557,   558,   559,  1419,   190,
-    1420,   560,   561,     0,     0,   562,   563,   194,   564,     0,
-       0,   565,  1421,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,     0,   198,   574,   199,
-       0,   575,   576,   577,   578,   579,   580,   581,     0,   582,
-     583,     0,   584,     0,   585,   586,   587,     0,   588,   589,
-     590,   591,   592,   593,   594,   595,  1422,   596,   597,   598,
-     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-       0,   616,   617,   618,   619,   620,   621,   727,   622,     0,
-     623,   624,   625,   626,   627,     0,   629,   630,     0,   631,
-     632,   220,   633,   634,  1424,   635,     0,   636,   637,   638,
-     639,   640,   641,   642,   643,   644,   645,   646,     0,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
-       0,  1425,  1426,     0,     0,   656,   657,     0,   658,     0,
-       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
-     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,     0,  1427,     0,   676,   237,   677,   678,   679,
-     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
-     686,   687,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   729,   688,   689,   753,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,   754,   104,   105,   708,   755,     0,
-     107,   108,   109,   110,   756,   757,   112,   113,   114,     0,
-     115,   758,   759,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
-     445,     0,     0,   136,     0,     0,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,     0,     0,   453,     0,
-     454,   455,   456,   457,     0,     0,   144,     0,   458,   459,
-     460,   461,   147,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
-       0,   151,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,     0,     0,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,     0,   503,   504,   505,
-       0,     0,   506,     0,   507,   508,     0,   509,     0,   510,
-       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
-       0,     0,     0,   516,     0,   517,   518,   724,   519,   520,
-     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,   175,     0,     0,   532,   533,   534,
-       0,     0,     0,     0,     0,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,     0,     0,   542,     0,   183,
-     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,     0,   190,     0,   560,   561,     0,     0,
-     562,   563,   194,   564,     0,     0,   565,     0,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,     0,   198,   574,   199,     0,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,     0,   584,     0,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,     0,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,   211,   613,   614,   615,     0,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,     0,   631,   632,   220,   633,   634,     0,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,     0,     0,   647,   648,     0,   649,   225,
-     650,   651,   652,   653,   654,     0,     0,     0,     0,     0,
-     656,   657,     0,   658,     0,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,     0,     0,     0,
-     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,   760,   436,   437,   438,   761,
-     762,   763,   764,   765,   766,   767,   439,   440,   768,   441,
-     442,   132,   443,   444,   445,   134,   135,   136,   137,   138,
-     769,   446,   447,   448,   449,   450,   770,   771,   451,   452,
-       0,   139,   453,   773,   454,   455,   456,   457,   143,   774,
-     144,   775,   458,   459,   460,   461,   147,   462,   463,   776,
-     777,   464,   465,   466,   467,   468,   469,   778,   150,   470,
-     471,     0,   780,   781,   782,   151,   783,   784,   785,   473,
-     474,   475,   476,     0,   477,   154,   155,   478,   786,   479,
-     787,   480,   481,   482,   483,   484,   788,   485,   486,   487,
-     789,   790,   488,   489,   490,   491,   492,   791,   493,   494,
-     495,   792,   496,   497,   498,   793,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,   794,   506,   795,   507,   508,
-     167,   509,   796,   510,   797,   511,   168,   798,   169,   512,
-     513,   514,   799,   515,   171,   800,   172,   516,   801,   517,
-     518,     0,   519,   520,   173,   521,   522,   523,   524,   802,
-     525,   526,   527,   528,   529,   530,   803,   531,   175,   176,
-       0,   532,   533,   534,     0,   177,   806,   178,   807,   535,
-     179,   180,   536,   181,   537,   538,   539,   540,   541,   808,
-     809,   542,   182,   183,   543,   184,   810,   544,   545,   546,
-     811,   812,   547,   548,   549,   550,   551,   552,   553,   554,
-       0,   555,   556,     0,   557,   558,   559,   189,   190,   191,
-     560,   561,   192,   813,   562,   563,   194,   564,   814,   195,
-     565,   196,   566,   567,   568,   815,   569,   816,   817,   570,
-     571,   572,   818,   819,   573,   197,   198,   574,   199,   200,
-     575,   576,   577,   578,   579,   580,   581,   820,   582,   583,
-     201,   584,   202,   585,   586,   587,   821,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-     822,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,   823,   611,   612,   211,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,     0,   622,   824,   623,
-     624,   625,   626,   627,   825,   629,   630,   218,   631,   632,
-     220,   633,   634,   221,   635,   826,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,   827,   647,
-     648,   828,   649,   225,   650,   651,   652,   653,   654,   829,
-     226,   227,     0,   831,   656,   657,   228,   658,   229,   832,
-     659,   660,   661,   662,   663,   664,   665,     0,   834,   666,
-     667,   668,   669,   670,   835,   836,   671,   672,   673,   674,
-     675,     0,   236,   838,   676,   237,   677,   678,   679,   680,
-     839,   840,   681,   841,   842,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-       0,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,   427,     0,
-       0,    37,    38,    39,    40,    41,    42,     0,    44,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,  1194,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,   427,     0,     0,    37,    38,    39,    40,    41,
-      42,     0,    44,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
+     444,   445,   134,   135,   136,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,   144,     0,   458,
+     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,   150,   470,   471,     0,     0,
+       0,     0,   151,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+     183,   543,   184,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,   190,   191,   560,   561,   192,
+       0,   562,   563,   194,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,   198,   574,   199,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,   211,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,   220,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+     225,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
      707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
      710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
      713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
        0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
@@ -10990,251 +10252,201 @@
        0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
      429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
      438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
+       0,   441,   442,   132,   443,   444,   445,   134,   135,   136,
      137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,  2562,   454,   455,   456,   457,
-     143,     0,     0,  2636,   458,   459,   460,   461,     0,   462,
-     463,   720,  2563,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
+     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
+     143,     0,   144,     0,   458,   459,   460,   461,   147,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
        0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
        0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
      486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,  2637,   500,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
      501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,  2565,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
+     507,   508,   167,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,   171,     0,   172,   516,
+       0,   517,   518,   724,   519,  1400,   173,   521,   522,   523,
      524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
+     175,   176,     0,   532,   533,   534,     0,   177,     0,   178,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,   182,   183,   543,   184,     0,   544,
      545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
      553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
+     190,   191,   560,   561,   192,     0,   562,   563,   194,   564,
        0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,  2566,   588,
+       0,   570,   571,   572,     0,     0,   573,   197,   198,   574,
+     199,   200,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
      589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
      598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
      615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
        0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
+     631,   632,   220,   633,   634,   221,   635,     0,   636,   637,
      638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
      654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
      229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-    2567,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
+       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
+     673,   674,   675,   728,   236,     0,   676,   237,   677,   678,
      679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
      685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+     246,   247,   729,   688,   689,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,  2562,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,  2563,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,  2637,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-    2565,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,  3553,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,  2566,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,  2567,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,  1089,   434,   435,  1041,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,  1042,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,  1090,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-    1043,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,  1044,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
+     444,   445,   134,   135,   136,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,   144,     0,   458,
+     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,   150,   470,   471,     0,     0,
+       0,     0,   151,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+    1451,   173,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+     183,   543,   184,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,   190,   191,   560,   561,   192,
+       0,   562,   563,   194,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,   198,   574,   199,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,   211,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,   220,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+     225,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
+     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
+     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
+       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
+       0,   441,   442,   132,   443,   444,   445,     0,  1407,   136,
+    1408,  1409,     0,   446,   447,   448,   449,   450,     0,     0,
+     451,   452,  1410,  1411,   453,     0,   454,   455,   456,   457,
+       0,     0,   144,     0,   458,   459,   460,   461,   147,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
+       0,   473,   474,   475,   476,   722,   477,  1412,  1413,   478,
+       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
+     486,   487,     0,     0,   488,   489,  1414,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,     0,   503,   504,   505,     0,     0,   506,     0,
+     507,   508,  1415,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,     0,     0,     0,   516,
+       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
+     524,  2523,   525,   526,   527,   528,   529,   530,     0,   531,
+     175,  2524,     0,   532,   533,   534,  1417,  1418,     0,  1419,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,     0,   183,   543,   184,     0,   544,
+     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,  1420,
+     190,  1421,   560,   561,     0,     0,   562,   563,   194,   564,
+       0,     0,   565,  1422,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,  2526,   198,   574,
+     199,     0,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,     0,   584,     0,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,  1423,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,     0,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,     0,   629,   630,  2527,
+     631,   632,   220,   633,   634,  1425,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,     0,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,  1426,  1427,     0,     0,   656,   657,     0,   658,
+       0,     0,   659,   660,   661,   662,   663,   664,   665,     0,
+       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
+     673,   674,   675,     0,  1428,  2528,   676,   237,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,   687,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   729,   688,   689,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,  1041,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,  1042,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,  3289,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,  1043,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,  1044,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,    37,    38,    39,    40,    41,
-      42,     0,    44,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
+     444,   445,     0,  1407,   136,  1408,  1409,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,  1410,  1411,   453,
+       0,   454,   455,   456,   457,     0,     0,   144,     0,   458,
+     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,   150,   470,   471,     0,     0,
+       0,     0,   151,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,  1412,  1413,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,  1414,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,     0,   503,   504,
+     505,     0,     0,   506,     0,   507,   508,  1415,   509,     0,
+     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
+     515,     0,     0,     0,   516,     0,   517,   518,   724,   519,
+     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,   175,     0,     0,   532,   533,
+     534,  1417,  1418,     0,  1419,     0,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,     0,     0,   542,     0,
+     183,   543,   184,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,  1420,   190,  1421,   560,   561,     0,
+       0,   562,   563,   194,   564,  2620,     0,   565,  1422,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,     0,   198,   574,   199,     0,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,     0,   584,     0,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,  1423,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,   211,   613,   614,   615,     0,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,  2527,   631,   632,   220,   633,   634,
+    1425,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,     0,     0,   647,   648,  4228,   649,
+     225,   650,   651,   652,   653,   654,     0,  1426,  1427,     0,
+       0,   656,   657,     0,   658,     0,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,     0,  1428,
+       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   729,   688,   689,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
      707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
      710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
      713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
        0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
@@ -11242,251 +10454,100 @@
        0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
      429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
      438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,  2562,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,  2563,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+       0,   441,   442,   132,   443,   444,   445,     0,  1407,   136,
+    1408,  1409,     0,   446,   447,   448,   449,   450,     0,     0,
+     451,   452,  1410,  1411,   453,     0,   454,   455,   456,   457,
+       0,     0,   144,     0,   458,   459,   460,   461,   147,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
+       0,   473,   474,   475,   476,   722,   477,  1412,  1413,   478,
        0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,  2637,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,  2565,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
+     486,   487,     0,     0,   488,   489,  1414,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,     0,   503,   504,   505,     0,     0,   506,     0,
+     507,   508,  1415,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,     0,     0,     0,   516,
+       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
      524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
+     175,     0,     0,   532,   533,   534,  1417,  1418,     0,  1419,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,     0,   183,   543,   184,     0,   544,
      545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,  2566,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,  1420,
+     190,  1421,   560,   561,  2686,     0,   562,   563,   194,   564,
+       0,     0,   565,  1422,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,     0,   198,   574,
+     199,     0,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,     0,   584,     0,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,  1423,   596,   597,
      598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-    2567,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,     0,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,     0,   629,   630,  1424,
+     631,   632,   220,   633,   634,  1425,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,     0,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,  1426,  1427,     0,     0,   656,   657,     0,   658,
+       0,     0,   659,   660,   661,   662,   663,   664,   665,     0,
+       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
+     673,   674,   675,     0,  1428,     0,   676,   237,   677,   678,
      679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-     427,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,   718,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,   721,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,   723,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,  1041,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,  1042,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-    1043,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,  1044,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,   950,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,   427,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
+     685,   686,   687,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   729,   688,   689,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,   951,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   952,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,  2235,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-    2236,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,  2237,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,  2238,   511,     0,     0,     0,  2239,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,  2240,  2241,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,  2242,   620,   621,   727,   622,     0,  2243,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,  2244,
-     649,     0,  2245,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-    2246,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
+     444,   445,     0,  1407,   136,  1408,  1409,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,  1410,  1411,   453,
+       0,   454,   455,   456,   457,     0,     0,   144,     0,   458,
+     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,   150,   470,   471,     0,     0,
+       0,     0,   151,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,  1412,  1413,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,  1414,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,     0,   503,   504,
+     505,     0,     0,   506,     0,   507,   508,  1415,   509,     0,
+     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
+     515,     0,     0,     0,   516,     0,   517,   518,   724,   519,
+     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,   175,     0,     0,   532,   533,
+     534,  1417,  1418,     0,  1419,     0,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,     0,     0,   542,     0,
+     183,   543,   184,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,  1420,   190,  1421,   560,   561,  4055,
+       0,   562,   563,   194,   564,     0,     0,   565,  1422,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,     0,   198,   574,   199,     0,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,     0,   584,     0,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,  1423,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,   211,   613,   614,   615,     0,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,  1424,   631,   632,   220,   633,   634,
+    1425,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,     0,     0,   647,   648,     0,   649,
+     225,   650,   651,   652,   653,   654,     0,  1426,  1427,     0,
+       0,   656,   657,     0,   658,     0,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,     0,  1428,
+       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   729,   688,   689,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
      707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
      710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
      713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
        0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
@@ -11494,11183 +10555,10011 @@
        0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
      429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
      438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,  1042,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+       0,   441,   442,   132,   443,   444,   445,     0,  1407,   136,
+    1408,  1409,     0,   446,   447,   448,   449,   450,     0,     0,
+     451,   452,  1410,  1411,   453,     0,   454,   455,   456,   457,
+       0,     0,   144,     0,   458,   459,   460,   461,   147,   462,
+     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
+       0,   473,   474,   475,   476,   722,   477,  1412,  1413,   478,
        0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
+     486,   487,     0,     0,   488,   489,  1414,   491,   492,     0,
      493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
+     501,   502,     0,   503,   504,   505,     0,     0,   506,     0,
+     507,   508,  1415,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,     0,     0,     0,   516,
+       0,   517,   518,   724,   519,  1416,   173,   521,   522,   523,
      524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
+     175,     0,     0,   532,   533,   534,  1417,  1418,     0,  1419,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,     0,   183,   543,   184,     0,   544,
      545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,  1043,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-    1044,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,  1420,
+     190,  1421,   560,   561,     0,     0,   562,   563,   194,   564,
+       0,     0,   565,  1422,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,     0,   198,   574,
+     199,     0,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,     0,   584,     0,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,  1423,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,     0,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,     0,   629,   630,  1424,
+     631,   632,   220,   633,   634,  1425,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,     0,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,  1426,  1427,     0,     0,   656,   657,     0,   658,
+       0,     0,   659,   660,   661,   662,   663,   664,   665,     0,
        0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
+     673,   674,   675,     0,  1428,     0,   676,   237,   677,   678,
      679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,  2224,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-     427,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+     685,   686,   687,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   729,   688,   689,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,  3148,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,  3149,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,  2502,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,  3150,   649,     0,
-     650,  3151,   652,  3152,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,  3153,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,   427,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,   745,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,   427,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,   723,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,   427,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,   899,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
+     444,   445,     0,  1407,   136,  1408,  1409,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,  1410,  1411,   453,
+       0,   454,   455,   456,   457,     0,     0,   144,     0,   458,
+     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,   150,   470,   471,     0,     0,
+       0,     0,   151,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,  1412,  1413,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,  1414,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,     0,   503,   504,
+     505,     0,     0,   506,     0,   507,   508,  1415,   509,     0,
+     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
+     515,     0,     0,     0,   516,     0,   517,   518,   724,   519,
+    1477,   173,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,   175,     0,     0,   532,   533,
+     534,  1417,  1418,     0,  1419,     0,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,     0,     0,   542,     0,
+     183,   543,   184,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,  1420,   190,  1421,   560,   561,     0,
+       0,   562,   563,   194,   564,     0,     0,   565,  1422,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,     0,   198,   574,   199,     0,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,     0,   584,     0,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,  1423,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,   211,   613,   614,   615,     0,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,  1424,   631,   632,   220,   633,   634,
+    1425,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,     0,     0,   647,   648,     0,   649,
+     225,   650,   651,   652,   653,   654,     0,  1426,  1427,     0,
+       0,   656,   657,     0,   658,     0,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,     0,  1428,
+       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   729,   688,   689,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
      707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
      710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
      713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
        0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
        0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,  1282,   436,   437,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
      438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
+       0,   441,   442,   132,   443,   444,   445,     0,  1407,   136,
+    1408,  1409,     0,   446,   447,   448,   449,   450,     0,     0,
+     451,   452,  1410,  1411,   453,     0,   454,   455,   456,   457,
+       0,     0,   144,     0,   458,   459,   460,   461,   147,   462,
      463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
+       0,   473,   474,   475,   476,   722,   477,  1412,  1413,   478,
        0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
+     486,   487,     0,     0,   488,   489,  1414,   491,   492,     0,
      493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,  1283,     0,   521,   522,   523,
+     501,   502,     0,   503,   504,   505,     0,     0,   506,     0,
+     507,   508,  1415,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,     0,     0,     0,   516,
+       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
      524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
+     175,     0,     0,   532,   533,   534,  1417,  1418,     0,  1419,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,     0,   183,   543,   184,     0,   544,
      545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-    1124,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,  1420,
+     190,  1421,   560,   561,     0,     0,   562,   563,   194,   564,
+       0,     0,   565,  1422,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,     0,   198,   574,
+     199,     0,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,     0,   584,     0,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,  1423,   596,   597,
      598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,     0,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,     0,   629,   630,  1424,
+     631,   632,   220,   633,   634,  1425,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,     0,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,  1426,  1427,     0,     0,   656,   657,     0,   658,
+       0,     0,   659,   660,   661,   662,   663,   664,   665,     0,
        0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
+     673,   674,   675,     0,  1428,     0,   676,   237,   677,   678,
      679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-     427,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,  1391,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,   129,
-     130,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
+     685,   686,   687,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   729,   688,   689,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,  3372,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,  3373,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,  3385,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,  3386,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
+     444,   445,     0,  1407,   136,  1408,  1409,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,  1410,  1411,   453,
+       0,   454,   455,   456,   457,     0,     0,   144,     0,   458,
+     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,   150,   470,   471,     0,     0,
+       0,     0,   151,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,  1412,  1413,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,  1414,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,     0,   503,   504,
+     505,     0,     0,   506,     0,   507,   508,  1415,   509,     0,
+     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
+     515,     0,     0,     0,   516,     0,   517,   518,   724,   519,
+     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,   175,     0,     0,   532,   533,
+     534,  1417,  1418,     0,  1419,     0,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,     0,     0,   542,     0,
+     183,   543,   184,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,  1420,   190,  1421,   560,   561,     0,
+       0,   562,   563,   194,   564,     0,     0,   565,  1422,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,     0,   198,   574,   199,     0,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,     0,   584,     0,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,  1423,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,   211,   613,   614,   615,     0,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,  2527,   631,   632,   220,   633,   634,
+    1425,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,     0,     0,   647,   648,     0,   649,
+     225,   650,   651,   652,   653,   654,     0,  1426,  1427,     0,
+       0,   656,   657,     0,   658,     0,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,     0,  1428,
+       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   729,   688,   689,
+     753,    86,    87,    88,   705,    90,    91,    92,   706,     0,
      707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
+     754,   104,   105,   708,   755,     0,   107,   108,   109,   110,
+     756,   757,   112,   113,   114,     0,   115,   758,   759,   709,
      710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
      713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,   427,     0,     0,     0,
+       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
        0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
      429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
      438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
+       0,   441,   442,   132,   443,   444,   445,     0,  1407,   136,
+    1408,  1409,     0,   446,   447,   448,   449,   450,     0,     0,
+     451,   452,  1410,  1411,   453,     0,   454,   455,   456,   457,
+       0,     0,   144,     0,   458,   459,   460,   461,   147,   462,
      463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
+     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
+       0,   473,   474,   475,   476,   722,   477,  1412,  1413,   478,
        0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
+     486,   487,     0,     0,   488,   489,  1414,   491,   492,     0,
      493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
+     501,   502,     0,   503,   504,   505,     0,     0,   506,     0,
+     507,   508,  1415,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,     0,     0,     0,   516,
+       0,   517,   518,   724,   519,   520,   173,   521,   522,   523,
      524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
+     175,     0,     0,   532,   533,   534,  1417,  1418,     0,  1419,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,     0,   183,   543,   184,     0,   544,
      545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     553,   554,   725,   555,   556,   726,   557,   558,   559,  1420,
+     190,  1421,   560,   561,     0,     0,   562,   563,   194,   564,
+       0,     0,   565,  1422,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,     0,   198,   574,
+     199,     0,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,     0,   584,     0,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,  1423,   596,   597,
      598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,     0,   616,   617,   618,   619,   620,   621,   727,   622,
+       0,   623,   624,   625,   626,   627,     0,   629,   630,     0,
+     631,   632,   220,   633,   634,  1425,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,     0,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,  1426,  1427,     0,     0,   656,   657,     0,   658,
+       0,     0,   659,   660,   661,   662,   663,   664,   665,     0,
        0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
+     673,   674,   675,     0,  1428,     0,   676,   237,   677,   678,
      679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-     427,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+     685,   686,   687,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   729,   688,   689,   753,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,   754,   104,   105,   708,   755,
+       0,   107,   108,   109,   110,   756,   757,   112,   113,   114,
+       0,   115,   758,   759,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   956,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,   427,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,   520,     0,  1003,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,   427,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,  1059,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,  1124,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,  1246,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,  1247,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
+     444,   445,     0,     0,   136,     0,     0,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,     0,     0,   453,
+       0,   454,   455,   456,   457,     0,     0,   144,     0,   458,
+     459,   460,   461,   147,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,   150,   470,   471,     0,     0,
+       0,     0,   151,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,     0,     0,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,     0,   503,   504,
+     505,     0,     0,   506,     0,   507,   508,     0,   509,     0,
+     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
+     515,     0,     0,     0,   516,     0,   517,   518,   724,   519,
+     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,   175,     0,     0,   532,   533,
+     534,     0,     0,     0,     0,     0,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,     0,     0,   542,     0,
+     183,   543,   184,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,     0,   190,     0,   560,   561,     0,
+       0,   562,   563,   194,   564,     0,     0,   565,     0,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,     0,   198,   574,   199,     0,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,     0,   584,     0,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,     0,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,   211,   613,   614,   615,     0,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,     0,   631,   632,   220,   633,   634,
+       0,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,     0,     0,   647,   648,     0,   649,
+     225,   650,   651,   652,   653,   654,     0,     0,     0,     0,
+       0,   656,   657,     0,   658,     0,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,     0,     0,
+       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,  1690,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,  1873,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,  1124,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,  1922,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,  1923,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,  2091,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,  2224,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,  2502,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,   760,   436,   437,   438,
+     761,   762,   763,   764,   765,   766,   767,   439,   440,   768,
+     441,   442,   132,   443,   444,   445,   134,   135,   136,   137,
+     138,   769,   446,   447,   448,   449,   450,   770,   771,   451,
+     452,     0,   139,   453,   773,   454,   455,   456,   457,   143,
+     774,   144,   775,   458,   459,   460,   461,   147,   462,   463,
+     776,   777,   464,   465,   466,   467,   468,   469,   778,   150,
+     470,   471,     0,   780,   781,   782,   151,   783,   784,   785,
+     473,   474,   475,   476,     0,   477,   154,   155,   478,   786,
+     479,   787,   480,   481,   482,   483,   484,   788,   485,   486,
+     487,   789,   790,   488,   489,   490,   491,   492,   791,   493,
+     494,   495,   792,   496,   497,   498,   793,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,   794,   506,   795,   507,
+     508,   167,   509,   796,   510,   797,   511,   168,   798,   169,
+     512,   513,   514,   799,   515,   171,   800,   172,   516,   801,
+     517,   518,     0,   519,   520,   173,   521,   522,   523,   524,
+     802,   525,   526,   527,   528,   529,   530,   803,   531,   175,
+     176,     0,   532,   533,   534,     0,   177,   806,   178,   807,
+     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
+     808,   809,   542,   182,   183,   543,   184,   810,   544,   545,
+     546,   811,   812,   547,   548,   549,   550,   551,   552,   553,
+     554,     0,   555,   556,     0,   557,   558,   559,   189,   190,
+     191,   560,   561,   192,   813,   562,   563,   194,   564,   814,
+     195,   565,   196,   566,   567,   568,   815,   569,   816,   817,
+     570,   571,   572,   818,   819,   573,   197,   198,   574,   199,
+     200,   575,   576,   577,   578,   579,   580,   581,   820,   582,
+     583,   201,   584,   202,   585,   586,   587,   821,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,   822,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,   823,   611,   612,   211,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,     0,   622,   824,
+     623,   624,   625,   626,   627,   825,   629,   630,   218,   631,
+     632,   220,   633,   634,   221,   635,   826,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,   827,
+     647,   648,   828,   649,   225,   650,   651,   652,   653,   654,
+     829,   226,   227,     0,   831,   656,   657,   228,   658,   229,
+     832,   659,   660,   661,   662,   663,   664,   665,     0,   834,
+     666,   667,   668,   669,   670,   835,   836,   671,   672,   673,
+     674,   675,     0,   236,   838,   676,   237,   677,   678,   679,
+     680,   839,   840,   681,   841,   842,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,     0,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,   427,
+       0,     0,    37,    38,    39,    40,    41,    42,     0,    44,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-    4397,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,  4411,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,  5104,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,  1071,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,  1194,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,   427,     0,     0,    37,    38,    39,    40,
+      41,    42,     0,    44,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,  1073,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,  1074,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,     0,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,  1075,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,  1076,   227,     0,     0,
-    1077,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,  1078,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,  1118,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-    1074,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,     0,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,  1119,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-    1120,   227,     0,     0,  1121,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,  1078,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,  2565,   454,   455,   456,
+     457,   143,     0,     0,  2639,   458,   459,   460,   461,     0,
+     462,   463,   720,  2566,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,  2640,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,  2568,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,  2569,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,  2570,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,  1138,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,  1270,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,  1277,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,  1292,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,  1348,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+    2565,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,  2566,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,  2640,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,  2568,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,  3559,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,  2569,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,  2570,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,  1089,   434,   435,  1041,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,  1042,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,  1090,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,  1043,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,  1044,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,  1363,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,  1404,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,  1462,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+    1041,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,  1042,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,  3295,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,  1043,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,  1044,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,    37,    38,    39,    40,
+      41,    42,     0,    44,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,  1466,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,  1468,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,  1470,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,  1474,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,  1482,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,  2565,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,  2566,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,  2640,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,  2568,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,  2569,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,  2570,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,   427,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,  1701,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,  1103,   452,  1074,   139,  1702,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,     0,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,  1107,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,  1108,   614,   615,   213,   616,   617,   618,  1109,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,  1694,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,  1111,   227,     0,     0,
-    1112,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,  1078,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,  1113,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,  1827,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,   718,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,   721,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,   723,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,  1041,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,  1042,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,  1043,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,  1044,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,   950,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,   427,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,  1073,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,  1074,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,     0,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,  1078,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,  2047,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,  2077,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+     951,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   952,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,  2237,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,  2238,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,  2239,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,  2240,   511,     0,     0,     0,  2241,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,  2242,  2243,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,  2244,   620,   621,   727,   622,     0,  2245,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+    2246,   649,     0,  2247,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,  2248,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,  2079,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,  2151,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+    1042,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,  1043,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,  1044,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,  2226,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,   427,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,  2153,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,  2155,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,  2272,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,  3154,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,  3155,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,  2505,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,  3156,   649,
+       0,   650,  3157,   652,  3158,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,  3159,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,   427,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,   745,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,   427,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-    2469,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,     0,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,  2857,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,  2861,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,  2901,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,  3300,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,   719,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,   720,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,  3375,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,   728,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-     719,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,   720,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,  3377,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,   559,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,   728,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,   719,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,   720,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,  3489,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-     559,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   728,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,   719,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,   720,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,  3511,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,   559,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,   728,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-    1103,   452,  1074,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,     0,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,  1107,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,  1108,   614,
-     615,   213,   616,   617,   618,  1109,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,  1694,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,  1111,   227,     0,     0,  1112,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,  1078,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,  1113,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,   705,    90,
-      91,    92,   706,     0,   707,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,   708,     0,     0,
-     107,   108,   109,   110,     0,     0,   112,   113,   114,     0,
-     115,     0,     0,   709,   710,     0,     0,     0,   711,   712,
-       0,     0,     0,     0,   713,     0,     0,     0,     0,     0,
-       0,     0,     0,   714,     0,   715,     0,   716,   717,    35,
-       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,     0,   443,   444,
-     445,   134,   135,     0,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,  1074,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,     0,     0,   458,   459,
-     460,   461,     0,   462,   463,     0,     0,   464,   465,   466,
-     467,   468,   469,     0,     0,   470,   471,     0,     0,     0,
-       0,     0,     0,     0,     0,   473,   474,   475,   476,   722,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,     0,     0,     0,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,   724,   519,   520,
-       0,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,     0,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,     0,     0,   536,     0,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,     0,
-     543,     0,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,   725,   555,   556,   726,
-     557,   558,   559,   189,     0,   191,   560,   561,   192,     0,
-     562,   563,     0,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,     0,   574,     0,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,     0,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,   727,   622,     0,   623,   624,   625,   626,   627,
-       0,   629,   630,   218,   631,   632,     0,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,     0,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-       0,     0,   671,   672,   673,   674,   675,  1078,   236,     0,
-     676,     0,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   729,   688,   689,    86,
-      87,    88,   705,    90,    91,    92,   706,     0,   707,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,   708,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,   709,   710,     0,
-       0,     0,   711,   712,     0,     0,     0,     0,   713,     0,
-       0,     0,     0,     0,     0,     0,     0,   714,     0,   715,
-       0,   716,   717,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,     0,   443,   444,   445,   134,   135,     0,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,  1103,   452,
-    1074,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-       0,     0,   458,   459,   460,   461,     0,   462,   463,     0,
-       0,   464,   465,   466,   467,   468,   469,     0,     0,   470,
-     471,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     474,   475,   476,   722,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,     0,     0,     0,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,   724,   519,   520,     0,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,     0,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-       0,     0,   536,     0,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,     0,   543,     0,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-     725,   555,   556,   726,   557,   558,  1107,   189,     0,   191,
-     560,   561,   192,     0,   562,   563,     0,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,     0,   574,     0,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,     0,  1108,   614,   615,   213,
-     616,   617,   618,  1109,   620,   621,   727,   622,     0,   623,
-     624,   625,   626,  1694,     0,   629,   630,   218,   631,   632,
-       0,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,     0,  2549,   651,   652,   653,   654,     0,
-    1111,   227,     0,     0,  1112,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,  1078,   236,     0,   676,     0,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-    1113,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     729,   688,   689,    86,    87,    88,   705,    90,    91,    92,
-     706,     0,   707,    95,     0,     0,    98,    99,   100,   101,
-     102,   103,     0,   104,   105,   708,     0,     0,   107,   108,
-     109,   110,     0,     0,   112,   113,   114,     0,   115,     0,
-       0,   709,   710,     0,     0,     0,   711,   712,     0,     0,
-       0,     0,   713,     0,     0,     0,     0,     0,     0,     0,
-       0,   714,     0,   715,     0,   716,   717,    35,     0,     0,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,     0,   443,   444,   445,   134,
-     135,     0,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,  1103,   452,  1074,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,     0,     0,   458,   459,   460,   461,
-       0,   462,   463,     0,     0,   464,   465,   466,   467,   468,
-     469,     0,     0,   470,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,   473,   474,   475,   476,   722,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-       0,     0,     0,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,   724,   519,   520,     0,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,     0,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,     0,     0,   536,     0,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,     0,   543,     0,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,   725,   555,   556,   726,   557,   558,
-    1107,   189,     0,   191,   560,   561,   192,     0,   562,   563,
-       0,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-       0,   574,     0,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,     0,
-    1108,   614,   615,   213,   616,   617,   618,  2621,   620,   621,
-     727,   622,     0,   623,   624,   625,   626,  2622,     0,   629,
-     630,   218,   631,   632,     0,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,     0,   650,   651,
-     652,   653,   654,     0,  1111,   227,     0,     0,  2623,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,  1078,   236,     0,   676,     0,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,  1113,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   729,   688,   689,    86,    87,    88,
-     705,    90,    91,    92,   706,     0,   707,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,   708,
-       0,     0,   107,   108,   109,   110,     0,     0,   112,   113,
-     114,     0,   115,     0,     0,   709,   710,     0,     0,     0,
-     711,   712,     0,     0,     0,     0,   713,     0,     0,     0,
-       0,     0,     0,     0,     0,   714,     0,   715,     0,   716,
-     717,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,     0,
-     443,   444,   445,   134,   135,     0,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,  1103,   452,  1074,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,     0,     0,
-     458,   459,   460,   461,     0,   462,   463,     0,     0,   464,
-     465,   466,   467,   468,   469,     0,     0,   470,   471,     0,
-       0,     0,     0,     0,     0,     0,     0,   473,   474,   475,
-     476,   722,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,     0,     0,     0,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,   724,
-     519,   520,     0,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,     0,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,     0,     0,
-     536,     0,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,     0,   543,     0,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,   725,   555,
-     556,   726,   557,   558,  1107,   189,     0,   191,   560,   561,
-     192,     0,   562,   563,     0,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,     0,   574,     0,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,     0,  1108,   614,   615,   213,   616,   617,
-     618,  1109,   620,   621,   727,   622,     0,   623,   624,   625,
-     626,  2622,     0,   629,   630,   218,   631,   632,     0,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,     0,   650,   651,   652,   653,   654,     0,  1111,   227,
-       0,     0,  2623,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,  1078,
-     236,     0,   676,     0,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,  1113,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   729,   688,
-     689,    86,    87,    88,   705,    90,    91,    92,   706,     0,
-     707,    95,     0,     0,    98,    99,   100,   101,   102,   103,
-       0,   104,   105,   708,     0,     0,   107,   108,   109,   110,
-       0,     0,   112,   113,   114,     0,   115,     0,     0,   709,
-     710,     0,     0,     0,   711,   712,     0,     0,     0,     0,
-     713,     0,     0,     0,     0,     0,     0,     0,     0,   714,
-       0,   715,     0,   716,   717,    35,     0,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,     0,   443,   444,   445,   134,   135,     0,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,   719,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,     0,     0,   458,   459,   460,   461,     0,   462,
-     463,   720,     0,   464,   465,   466,   467,   468,   469,     0,
-       0,   470,   471,     0,     0,     0,     0,     0,     0,     0,
-       0,   473,   474,   475,   476,   722,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,     0,     0,
-       0,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,   724,   519,   520,     0,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-       0,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,     0,     0,   536,     0,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,     0,   543,     0,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,   725,   555,   556,   726,   557,   558,   559,   189,
-       0,   191,   560,   561,   192,     0,   562,   563,     0,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,     0,   574,
-       0,   200,   575,   576,   577,   578,     0,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,     0,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,     0,   613,   614,
-     615,   213,     0,   617,   618,   619,   620,   621,   727,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,     0,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,     0,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,   728,   236,     0,   676,     0,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   729,   688,   689,    86,    87,    88,     0,    90,
-      91,    92,     0,     0,     0,    95,     0,     0,    98,    99,
-     100,   101,   102,   103,     0,   104,   105,     0,     0,     0,
-     107,   108,   109,   110,     0,   111,   112,   113,   114, -2555,
-     115,   116,   117,     0,     0,     0,     0,     0,   120,   121,
-       0,     0,     0,     0,   122,     0,     0,     0,     0,     0,
-       0,     0,     0,   123,     0,   124,     0,   125,   126,    35,
-       0,   422,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   132,     0,     0,
-       0,   134,   135,   136,   137,   138,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   139,     0,     0,
-       0,     0,     0,     0,   143,     0,   144,     0,     0,     0,
-       0,     0,   147,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   150,     0,     0,     0,     0,     0,
-       0,   151,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   154,   155,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   161,     0,
-       0,     0,     0,     0,     0,     0,   163,     0,     0,     0,
-     165,     0,     0,     0,     0,     0,   167,     0,     0,     0,
-       0,     0,   168,     0,   169,     0,     0,     0,     0,     0,
-     171,     0,   172,     0,     0,     0,     0,     0,     0,     0,
-     173,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   175,   176,     0,     0,     0,     0,
-       0,   177,     0,   178,     0,     0,   179,   180,     0,   181,
-       0,     0,     0,     0,     0,     0,     0,     0,   182,   183,
-       0,   184,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   189,   190,   191,     0,     0,   192,     0,
-       0,     0,   194,     0,     0,   195,     0,   196,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   197,   198,     0,   199,   200,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   201,     0,   202,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   204,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   211,     0,     0,     0,   213,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   218,     0,     0,   220,     0,     0,   221,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   223,     0,     0,     0,     0,     0,   225,
-       0,     0,     0,     0,     0,     0,   226,   227,     0,     0,
-       0,     0,   228,     0,   229,     0,     0,     0,     0,     0,
-       0,     0,     0,   232,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   236,     0,
-       0,   237,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,    86,    87,    88,     0,
-      90,    91,    92,     0,     0,     0,    95,     0,     0,    98,
-      99,   100,   101,   102,   103,     0,   104,   105,     0,     0,
-       0,   107,   108,   109,   110,     0,   111,   112,   113,   114,
-   -2556,   115,   116,   117,     0,     0,     0,     0,     0,   120,
-     121,     0,     0,     0,     0,   122,     0,     0,     0,     0,
-       0,     0,     0,     0,   123,     0,   124,     0,   125,   126,
-      35,     0,  1189,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,   723,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,   427,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,   899,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,  1282,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,  1283,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,  1124,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,   427,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,  1392,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+     129,   130,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   132,     0,
-       0,     0,   134,   135,   136,   137,   138,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   139,     0,
-       0,     0,     0,     0,     0,   143,     0,   144,     0,     0,
-       0,     0,     0,   147,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   150,     0,     0,     0,     0,
-       0,     0,   151,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   154,   155,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+    3378,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,  3379,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,  3391,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,  3392,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,   427,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   161,
-       0,     0,     0,     0,     0,     0,     0,   163,     0,     0,
-       0,   165,     0,     0,     0,     0,     0,   167,     0,     0,
-       0,     0,     0,   168,     0,   169,     0,     0,     0,     0,
-       0,   171,     0,   172,     0,     0,     0,     0,     0,     0,
-       0,   173,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   175,   176,     0,     0,     0,
-       0,     0,   177,     0,   178,     0,     0,   179,   180,     0,
-     181,     0,     0,     0,     0,     0,     0,     0,     0,   182,
-     183,     0,   184,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   189,   190,   191,     0,     0,   192,
-       0,     0,     0,   194,     0,     0,   195,     0,   196,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   197,   198,     0,   199,   200,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   201,     0,   202,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   204,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   211,     0,     0,     0,   213,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   218,     0,     0,   220,     0,     0,
-     221,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   223,     0,     0,     0,     0,     0,
-     225,     0,     0,     0,     0,     0,     0,   226,   227,     0,
-       0,     0,     0,   228,     0,   229,     0,     0,     0,     0,
-       0,     0,     0,     0,   232,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   236,
-       0,     0,   237,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,    86,    87,    88,
-       0,    90,    91,    92,     0,     0,     0,    95,     0,     0,
-      98,    99,   100,   101,   102,   103,     0,   104,   105,     0,
-       0,     0,   107,   108,   109,   110,     0,   111,   112,   113,
-     114,     0,   115,   116,   117,     0,     0,     0,     0,     0,
-     120,   121,     0,     0,     0,     0,   122,     0,     0,     0,
-       0,     0,     0,     0,     0,   123,     0,   124,     0,   125,
-       0,    35,     0,     0,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   132,
-       0,     0,     0,   134,   135,   136,   137,   138,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   139,
-       0,     0,     0,     0,     0,     0,   143,     0,   144,     0,
-       0,     0,     0,     0,   147,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   150,     0,     0,     0,
-       0,     0,     0,   151,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   154,   155,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     161,     0,     0,     0,     0,     0,     0,     0,   163,     0,
-       0,     0,   165,     0,     0,     0,     0,     0,   167,     0,
-       0,     0,     0,     0,   168,     0,   169,     0,     0,     0,
-       0,     0,   171,     0,   172,     0,     0,     0,     0,     0,
-       0,     0,   173,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   175,   176,     0,     0,
-       0,     0,     0,   177,     0,   178,     0,     0,   179,   180,
-       0,   181,     0,     0,     0,     0,     0,     0,     0,     0,
-     182,   183,     0,   184,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   189,   190,   191,     0,     0,
-     192,     0,     0,     0,   194,     0,     0,   195,     0,   196,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   197,   198,     0,   199,   200,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   201,     0,
-     202,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   204,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   211,     0,     0,     0,   213,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   218,     0,     0,   220,     0,
-       0,   221,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   223,     0,     0,     0,     0,
-       0,   225,     0,     0,     0,     0,     0,     0,   226,   227,
-       0,     0,     0,     0,   228,     0,   229,     0,     0,     0,
-       0,     0,     0,     0,     0,   232,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     236,     0,     0,   237,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,    86,    87,
-      88,     0,    90,    91,    92,     0,     0,     0,    95,     0,
-       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
-       0,     0,     0,   107,   108,   109,   110,     0,   111,   112,
-     113,   114,     0,   115,   116,   117,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    35,     0,     0,     0,     0,     0,     0,     0,
-      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     132,     0,     0,     0,   134,   135,   136,   137,   138,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     139,     0,     0,     0,     0,     0,     0,   143,     0,   144,
-       0,     0,     0,     0,     0,   147,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   150,     0,     0,
-       0,     0,     0,     0,   151,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   154,   155,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   161,     0,     0,     0,     0,     0,     0,     0,   163,
-       0,     0,     0,   165,     0,     0,     0,     0,     0,   167,
-       0,     0,     0,     0,     0,   168,     0,   169,     0,     0,
-       0,     0,     0,   171,     0,   172,     0,     0,     0,     0,
-       0,     0,     0,   173,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   175,   176,     0,
-       0,     0,     0,     0,   177,     0,   178,     0,     0,   179,
-     180,     0,   181,     0,     0,     0,     0,     0,     0,     0,
-       0,   182,   183,     0,   184,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   189,   190,   191,     0,
-       0,   192,     0,     0,     0,   194,     0,     0,   195,     0,
-     196,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   197,   198,     0,   199,   200,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   201,
-       0,   202,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   204,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   211,     0,     0,     0,   213,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   218,     0,     0,   220,
-       0,     0,   221,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   223,     0,     0,     0,
-       0,     0,   225,     0,     0,     0,     0,     0,     0,   226,
-     227,     0,     0,     0,     0,   228,     0,   229,     0,     0,
-       0,     0,     0,     0,     0,     0,   232,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   236,     0,     0,   237,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,    86,
-      87,    88,     0,    90,    91,    92,     0,     0,     0,    95,
-       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
-     105,     0,     0,     0,   107,   108,   109,   110,     0,     0,
-     112,   113,   114,     0,   115,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    35,     0,     0,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   132,     0,     0,     0,   134,   135,   136,   137,   138,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   139,     0,     0,     0,     0,     0,     0,   143,     0,
-     144,     0,     0,     0,     0,     0,   147,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   150,     0,
-       0,     0,     0,     0,     0,   151,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   154,   155,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     163,     0,     0,     0,   165,     0,     0,     0,     0,     0,
-     167,     0,     0,     0,     0,     0,   168,     0,   169,     0,
-       0,     0,     0,     0,   171,     0,   172,     0,     0,     0,
-       0,     0,     0,     0,   173,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   175,   176,
-       0,     0,     0,     0,     0,   177,     0,   178,     0,     0,
-     179,   180,     0,   181,     0,     0,     0,     0,     0,     0,
-       0,     0,   182,   183,     0,   184,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   189,   190,   191,
-       0,     0,   192,     0,     0,     0,   194,     0,     0,   195,
-       0,   196,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   197,   198,     0,   199,   200,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     201,     0,   202,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   204,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   211,     0,     0,     0,   213,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   218,     0,     0,
-     220,     0,     0,   221,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   223,     0,     0,
-       0,     0,     0,   225,     0,     0,     0,     0,     0,     0,
-     226,   227,     0,     0,     0,     0,   228,     0,   229,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   236,     0,     0,   237,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,   427,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-      35,   427,     0,     0,    37,    38,    39,    40,    41,    42,
-      43,    44,     0,     0,     0,    45,     0,     0,     0,     0,
        0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
      434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
-       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
-     444,   445,   134,   135,   136,   137,   138,     0,   446,   447,
-     448,   449,   450,     0,     0,   451,   452,     0,   139,   453,
-       0,   454,   455,   456,   457,   143,     0,   144,     0,   458,
-     459,   460,   461,   147,   462,   463,     0,     0,   464,   465,
-     466,   467,   468,   469,     0,   150,   470,   471,     0,     0,
-       0,     0,   151,     0,     0,     0,   473,   474,   475,   476,
-       0,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
      482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
      489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
      497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
-     505,   165,  2200,   506,     0,   507,   508,   167,   509,     0,
-     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
-     515,   171,     0,   172,   516,     0,   517,   518,     0,   519,
-     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
-     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
-     534,     0,   177,     0,   178,     0,   535,   179,   180,   536,
-     181,   537,   538,   539,   540,   541,     0,     0,   542,   182,
-     183,   543,   184,     0,   544,   545,   546,     0,     0,   547,
-     548,   549,   550,   551,   552,   553,   554,     0,   555,   556,
-       0,   557,   558,   559,   189,   190,   191,   560,   561,   192,
-       0,   562,   563,   194,   564,     0,   195,   565,   196,   566,
-     567,   568,     0,   569,  2201,     0,   570,   571,   572,     0,
-       0,   573,   197,   198,   574,   199,   200,   575,   576,   577,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
      578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
      585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
      594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
      602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
-     611,   612,   211,   613,   614,   615,   213,   616,   617,   618,
-     619,   620,   621,     0,   622,     0,   623,   624,   625,   626,
-     627,     0,   629,   630,   218,   631,   632,   220,   633,   634,
-     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   956,   641,   642,
      643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
-     225,   650,   651,   652,   653,   654,     0,   226,   227,     0,
-       0,   656,   657,   228,   658,   229,  2202,   659,   660,   661,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
      662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
-     670,     0,     0,   671,   672,   673,   674,   675,     0,   236,
-       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
        0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,    35,   688,   689,
-       0,     0,     0,     0,     0,    41,    42,  1032,  1785,  4930,
-       0,     0,     0,     0,     0,     0,  4931,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,   129,   130,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
-     135,   136,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,     0,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,   144,     0,   458,   459,   460,   461,
-     147,   462,   463,     0,     0,   464,   465,   466,   467,   468,
-     469,     0,   150,   470,   471,     0,     0,     0,     0,   151,
-       0,     0,     0,   473,   474,   475,   476,     0,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-     168,     0,   169,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,     0,   519,   520,   173,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,   175,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,   179,   180,   536,   181,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,   183,   543,   184,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,     0,   555,   556,     0,   557,   558,
-     559,   189,   190,   191,   560,   561,   192,     0,   562,   563,
-     194,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-     198,   574,   199,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-       0,   622,   216,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,   220,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,   224,   649,   225,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,   235,   236,     0,   676,   237,
-     677,   678,   679,   680,     0,     0,   681,     0,   238,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,     0,   688,   689,    35,   427,   248,
-       0,    37,    38,    39,    40,    41,    42,    43,    44,     0,
-       0,     0,    45,   249,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
-     135,   136,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,     0,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,   144,     0,   458,   459,   460,   461,
-     147,   462,   463,     0,     0,   464,   465,   466,   467,   468,
-     469,     0,   150,   470,   471,     0,     0,     0,     0,   151,
-       0,     0,     0,   473,   474,   475,   476,     0,   477,   154,
-     155,   478,  2403,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,  2200,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-     168,     0,   169,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,     0,   519,   520,   173,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,   175,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,   179,   180,   536,   181,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,   183,   543,   184,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,     0,   555,   556,     0,   557,   558,
-     559,   189,   190,   191,   560,   561,   192,     0,   562,   563,
-     194,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,  2201,     0,   570,   571,   572,     0,     0,   573,   197,
-     198,   574,   199,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-       0,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,   220,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,   225,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,  2202,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,     0,   236,     0,   676,   237,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,     0,   688,   689,     0,     0,     0,
-       0,     0,    35,   427,  1032,  1785,    37,    38,    39,    40,
-      41,    42,    43,    44,     0,     0,     0,    45,     0,     0,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,   427,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,   520,     0,  1003,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,   427,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,  1059,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
      432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
        0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
-     132,   443,   444,   445,   134,   135,   136,   137,   138,     0,
-     446,   447,   448,   449,   450,     0,     0,   451,   452,     0,
-     139,   453,     0,   454,   455,   456,   457,   143,     0,   144,
-       0,   458,   459,   460,   461,   147,   462,   463,     0,     0,
-     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
-       0,     0,     0,     0,   151,     0,     0,     0,   473,   474,
-     475,   476,     0,   477,   154,   155,   478,  2408,   479,     0,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
      480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
        0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
        0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
-     503,   504,   505,   165,  2200,   506,     0,   507,   508,   167,
-     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
      514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
-       0,   519,   520,   173,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
-     532,   533,   534,     0,   177,     0,   178,     0,   535,   179,
-     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
-     542,   182,   183,   543,   184,     0,   544,   545,   546,     0,
-       0,   547,   548,   549,   550,   551,   552,   553,   554,     0,
-     555,   556,     0,   557,   558,   559,   189,   190,   191,   560,
-     561,   192,     0,   562,   563,   194,   564,     0,   195,   565,
-     196,   566,   567,   568,     0,   569,  2201,     0,   570,   571,
-     572,     0,     0,   573,   197,   198,   574,   199,   200,   575,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,  1124,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
      576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
      584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
      592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
      600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,   211,   613,   614,   615,   213,   616,
-     617,   618,   619,   620,   621,     0,   622,     0,   623,   624,
-     625,   626,   627,     0,   629,   630,   218,   631,   632,   220,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
      633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
      641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
-       0,   649,   225,   650,   651,   652,   653,   654,     0,   226,
-     227,     0,     0,   656,   657,   228,   658,   229,  2202,   659,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
      660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
      668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
-       0,   236,     0,   676,   237,   677,   678,   679,   680,     0,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
        0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,     0,
-     688,   689,     0,     0,     0,     0,     0,    35,   427,  1032,
-    1785,    37,    38,    39,    40,    41,    42,    43,    44,     0,
-       0,     0,    45,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
-     135,   136,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,     0,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,   144,     0,   458,   459,   460,   461,
-     147,   462,   463,     0,     0,   464,   465,   466,   467,   468,
-     469,     0,   150,   470,   471,     0,     0,     0,     0,   151,
-       0,     0,     0,   473,   474,   475,   476,     0,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,  2200,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-     168,     0,   169,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,     0,   519,   520,   173,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,   175,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,   179,   180,   536,   181,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,   183,   543,   184,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,     0,   555,   556,     0,   557,   558,
-     559,   189,   190,   191,   560,   561,   192,     0,   562,   563,
-     194,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,  2201,     0,   570,   571,   572,     0,     0,   573,   197,
-     198,   574,   199,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-       0,   622,     0,   623,   624,   625,   626,   627,     0,   629,
-     630,   218,   631,   632,   220,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,   225,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,  2202,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,     0,   236,     0,   676,   237,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,     0,   688,   689,     0,     0,     0,
-       0,     0,    35,   427,  1032,  1785,    37,    38,    39,    40,
-      41,    42,     0,    44,     0,     0,     0,    45,     0,     0,
-       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
-       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
-     132,   443,   444,   445,   134,   135,   136,   137,   138,     0,
-     446,   447,   448,   449,   450,     0,     0,   451,   452,     0,
-     139,   453,     0,   454,   455,   456,   457,   143,     0,   144,
-       0,   458,   459,   460,   461,   147,   462,   463,     0,     0,
-     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
-       0,     0,     0,     0,   151,     0,     0,     0,   473,   474,
-     475,   476,     0,   477,   154,   155,   478,  3282,   479,     0,
-     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
-       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
-       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
-     503,   504,   505,   165,  2200,   506,     0,   507,   508,   167,
-     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
-     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
-       0,   519,   520,   173,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
-     532,   533,   534,     0,   177,     0,   178,     0,   535,   179,
-     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
-     542,   182,   183,   543,   184,     0,   544,   545,   546,     0,
-       0,   547,   548,   549,   550,   551,   552,   553,   554,     0,
-     555,   556,     0,   557,   558,   559,   189,   190,   191,   560,
-     561,   192,     0,   562,   563,   194,   564,     0,   195,   565,
-     196,   566,   567,   568,     0,   569,  2201,     0,   570,   571,
-     572,     0,     0,   573,   197,   198,   574,   199,   200,   575,
-     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
-     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
-     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
-     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,   211,   613,   614,   615,   213,   616,
-     617,   618,   619,   620,   621,     0,   622,     0,   623,   624,
-     625,   626,   627,     0,   629,   630,   218,   631,   632,   220,
-     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
-       0,   649,   225,   650,   651,   652,   653,   654,     0,   226,
-     227,     0,     0,   656,   657,   228,   658,   229,  2202,   659,
-     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
-     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
-       0,   236,     0,   676,   237,   677,   678,   679,   680,     0,
-       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,     0,
-     688,   689,     0,     0,     0,     0,     0,    35,   427,  1032,
-    1033,    37,    38,    39,    40,    41,    42,     0,    44,     0,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
-     135,   136,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,     0,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,   144,     0,   458,   459,   460,   461,
-     147,   462,   463,     0,     0,   464,   465,   466,   467,   468,
-     469,     0,   150,   470,   471,     0,     0,     0,     0,   151,
-       0,     0,   472,   473,   474,   475,   476,     0,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-     168,     0,   169,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,     0,   519,   520,   173,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,   175,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,   179,   180,   536,   181,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,   183,   543,   184,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,     0,   555,   556,     0,   557,   558,
-     559,   189,   190,   191,   560,   561,   192,     0,   562,   563,
-     194,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-     198,   574,   199,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-       0,   622,     0,   623,   624,   625,   626,   627,   628,   629,
-     630,   218,   631,   632,   220,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,   225,   650,   651,
-     652,   653,   654,     0,   226,   227,   655,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,     0,   236,     0,   676,   237,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,     0,   688,   689,    35,   427,     0,
-       0,    37,    38,    39,    40,    41,    42,     0,    44,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,  1246,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,  1247,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
-     135,   136,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,     0,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,   144,     0,   458,   459,   460,   461,
-     147,   462,   463,     0,     0,   464,   465,   466,   467,   468,
-     469,     0,   150,   470,   471,     0,     0,     0,     0,   151,
-       0,     0,   472,   473,   474,   475,   476,     0,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-     168,     0,   169,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,     0,   519,   520,   173,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,   175,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,   179,   180,   536,   181,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,   183,   543,   184,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-     551,   552,   553,   554,     0,   555,   556,     0,   557,   558,
-     559,   189,   190,   191,   560,   561,   192,     0,   562,   563,
-     194,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-     198,   574,   199,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-       0,   622,     0,   623,   624,   625,   626,   627,   628,   629,
-     630,   218,   631,   632,   220,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,   225,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,     0,   236,     0,   676,   237,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,    35,   688,   689,     0,    37,    38,
-      39,    40,    41,    42,     0,    44,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,  1691,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
      430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
        0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,   134,   135,   136,   137,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
      138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,     0,   139,   453,     0,   454,   455,   456,   457,   143,
-       0,   144,     0,   458,   459,   460,   461,   147,   462,   463,
-       0,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,     0,     0,     0,   151,     0,     0,     0,
-     473,   474,   475,   476,     0,   477,   154,   155,   478,     0,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
      479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
      487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
      494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
-     502,   163,   503,   504,   505,   165,  2200,   506,     0,   507,
-     508,   167,   509,     0,   510,     0,   511,   168,     0,   169,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
      512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
-     517,   518,     0,   519,   520,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
+     517,   518,   724,   519,  1875,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
      176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,   182,   183,   543,   184,     0,   544,   545,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
      546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,     0,   555,   556,     0,   557,   558,   559,   189,   190,
-     191,   560,   561,   192,     0,   562,   563,   194,   564,     0,
-     195,   565,   196,   566,   567,   568,     0,   569,  2201,     0,
-     570,   571,   572,     0,     0,   573,   197,   198,   574,   199,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,  1124,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
      200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
      583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
      590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
      599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-     213,   616,   617,   618,   619,   620,   621,     0,   622,     0,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
      623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
-     632,   220,   633,   634,   221,   635,     0,   636,   637,   638,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
      639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
        0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
-    2202,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
      666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,     0,   236,     0,   676,   237,   677,   678,   679,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
      680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
      686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,    35,   688,   689,     0,    37,    38,    39,    40,    41,
-      42,     0,    44,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,   132,
-     443,   444,   445,   134,   135,   136,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,     0,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,   144,     0,
-     458,   459,   460,   461,   147,   462,   463,     0,     0,   464,
-     465,   466,   467,   468,   469,     0,   150,   470,   471,     0,
-       0,     0,     0,   151,     0,     0,     0,   473,   474,   475,
-     476,     0,   477,   154,   155,   478,  2388,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,   168,     0,   169,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,     0,
-     519,   520,   173,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,   175,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,   179,   180,
-     536,   181,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,   183,   543,   184,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,     0,   555,
-     556,     0,   557,   558,   559,   189,   190,   191,   560,   561,
-     192,     0,   562,   563,   194,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,   198,   574,   199,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,   211,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,     0,   622,     0,   623,   624,   625,
-     626,   627,     0,   629,   630,   218,   631,   632,   220,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,   225,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,     0,
-     236,     0,   676,   237,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,    35,   688,
-     689,     0,    37,    38,    39,    40,    41,    42,     0,    44,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
-       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
-       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
-     134,   135,   136,   137,   138,     0,   446,   447,   448,   449,
-     450,     0,     0,   451,   452,     0,   139,   453,     0,   454,
-     455,   456,   457,   143,     0,   144,     0,   458,   459,   460,
-     461,   147,   462,   463,     0,     0,   464,   465,   466,   467,
-     468,   469,     0,   150,   470,   471,     0,     0,     0,     0,
-     151,     0,     0,     0,   473,   474,   475,   476,     0,   477,
+    1924,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
      154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
      484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
      491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
        0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
        0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
-     511,   168,     0,   169,   512,   513,   514,     0,   515,   171,
-       0,   172,   516,     0,   517,   518,     0,   519,   520,   173,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,  1925,     0,
      521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
-     530,     0,   531,   175,   176,     0,   532,   533,   534,     0,
-     177,     0,   178,     0,   535,   179,   180,   536,   181,   537,
-     538,   539,   540,   541,     0,     0,   542,   182,   183,   543,
-     184,     0,   544,   545,   546,     0,     0,   547,   548,   549,
-     550,   551,   552,   553,   554,     0,   555,   556,     0,   557,
-     558,   559,   189,   190,   191,   560,   561,   192,     0,   562,
-     563,   194,   564,     0,   195,   565,   196,   566,   567,   568,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
        0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
-     197,   198,   574,   199,   200,   575,   576,   577,   578,   579,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
      580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
      587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
      204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
      604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
-     211,   613,   614,   615,   213,   616,   617,   618,   619,   620,
-     621,     0,   622,     0,   623,   624,   625,   626,   627,     0,
-     629,   630,   218,   631,   632,   220,   633,   634,   221,   635,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
        0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
-     645,   646,   223,     0,   647,   648,     0,   649,   225,   650,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
      651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
      657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
      664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
-       0,   671,   672,   673,   674,   675,     0,   236,     0,   676,
-     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
      682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,    35,   688,   689,     0,    37,
-      38,    39,    40,    41,    42,     0,    44,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,   132,   443,   444,   445,   134,   135,   136,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,     0,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,   144,     0,   458,   459,   460,   461,   147,   462,
-     463,     0,     0,   464,   465,   466,   467,   468,   469,     0,
-     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
-       0,   473,   474,   475,   476,     0,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,   168,     0,
-     169,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,     0,   519,  2180,   173,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-     175,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,   183,   543,   184,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,     0,   555,   556,     0,   557,   558,   559,   189,
-     190,   191,   560,   561,   192,     0,   562,   563,   194,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,   198,   574,
-     199,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,     0,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,   220,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,     0,   236,     0,   676,   237,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,    35,   688,   689,     0,     0,     0,     0,     0,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,  2093,     0,     0,     0,     0,
       41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
-     432,   433,   434,   435,  1272,   436,   437,   438,     0,     0,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
        0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
-     132,   443,   444,   445,   134,   135,   136,   137,   138,     0,
-     446,   447,   448,   449,   450,     0,     0,   451,   452,     0,
-     139,   453,     0,   454,   455,   456,   457,   143,     0,   144,
-       0,   458,   459,   460,   461,   147,   462,   463,     0,     0,
-     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
-       0,     0,     0,     0,   151,     0,     0,   472,   473,   474,
-     475,   476,     0,   477,   154,   155,   478,     0,   479,     0,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
      480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
        0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
        0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
      503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
-     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
      514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
-       0,   519,   520,   173,   521,   522,   523,   524,     0,   525,
-     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
-     532,   533,   534,     0,   177,     0,   178,     0,   535,   179,
-     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
-     542,   182,   183,   543,   184,     0,   544,   545,   546,     0,
-       0,   547,   548,   549,   550,   551,   552,   553,   554,     0,
-     555,   556,     0,   557,   558,   559,   189,   190,   191,   560,
-     561,   192,     0,   562,   563,   194,   564,     0,   195,   565,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
      196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
-     572,     0,     0,   573,   197,   198,   574,   199,   200,   575,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
      576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
      584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
      592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
      600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
-     610,     0,   611,   612,   211,   613,   614,   615,   213,   616,
-     617,   618,   619,   620,   621,     0,   622,     0,   623,   624,
-     625,   626,   627,   628,   629,   630,   218,   631,   632,   220,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
      633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
      641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
-       0,   649,   225,   650,   651,   652,   653,   654,     0,   226,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
      227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
      660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
      668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
-       0,   236,     0,   676,   237,   677,   678,   679,   680,     0,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
        0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,    35,
-     688,   689,     0,     0,     0,     0,     0,    41,    42,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
-     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
-       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
-     445,   134,   135,   136,   137,   138,     0,   446,   447,   448,
-     449,   450,     0,     0,   451,   452,     0,   139,   453,     0,
-     454,   455,   456,   457,   143,     0,   144,     0,   458,   459,
-     460,   461,   147,   462,   463,     0,     0,   464,   465,   466,
-     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
-       0,   151,     0,     0,   472,   473,   474,   475,   476,     0,
-     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
-     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
-     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
-     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
-     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
-       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
-     171,     0,   172,   516,     0,   517,   518,     0,   519,   520,
-     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
-     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
-       0,   177,     0,   178,     0,   535,   179,   180,   536,   181,
-     537,   538,   539,   540,   541,     0,     0,   542,   182,   183,
-     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
-     549,   550,   551,   552,   553,   554,     0,   555,   556,     0,
-     557,   558,   559,   189,   190,   191,   560,   561,   192,     0,
-     562,   563,   194,   564,     0,   195,   565,   196,   566,   567,
-     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
-     573,   197,   198,   574,   199,   200,   575,   576,   577,   578,
-     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
-     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
-     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
-     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
-     612,   211,   613,   614,   615,   213,   616,   617,   618,   619,
-     620,   621,     0,   622,     0,   623,   624,   625,   626,   627,
-     628,   629,   630,   218,   631,   632,   220,   633,   634,   221,
-     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   645,   646,   223,     0,   647,   648,     0,   649,   225,
-     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
-     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
-     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
-    2743,     0,   671,   672,   673,   674,   675,     0,   236,     0,
-     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
-       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,    35,   688,   689,     0,
-       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+    2226,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
      437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
-     440,     0,   441,   442,   132,   443,   444,   445,   134,   135,
-     136,   137,   138,     0,   446,   447,   448,   449,   450,     0,
-       0,   451,   452,     0,   139,   453,     0,   454,   455,   456,
-     457,   143,     0,   144,     0,   458,   459,   460,   461,   147,
-     462,   463,     0,     0,   464,   465,   466,   467,   468,   469,
-       0,   150,   470,   471,     0,     0,     0,     0,   151,     0,
-       0,   472,   473,   474,   475,   476,     0,   477,   154,   155,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
      478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
      485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
        0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
      500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
-       0,   507,   508,   167,   509,     0,   510,     0,   511,   168,
-       0,   169,   512,   513,   514,     0,   515,   171,  3688,   172,
-     516,     0,   517,   518,     0,   519,   520,   173,   521,   522,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
      523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
-     531,   175,   176,     0,   532,   533,   534,     0,   177,     0,
-     178,     0,   535,   179,   180,   536,   181,   537,   538,   539,
-     540,   541,     0,     0,   542,   182,   183,   543,   184,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
      544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
-     552,   553,   554,     0,   555,   556,     0,   557,   558,   559,
-     189,   190,   191,   560,   561,   192,     0,   562,   563,   194,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
      564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
-       0,     0,   570,   571,   572,     0,     0,   573,   197,   198,
-     574,   199,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
        0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
      588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
      597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
-     606,   607,   608,   609,   610,     0,   611,   612,   211,   613,
-     614,   615,   213,   616,   617,   618,   619,   620,   621,     0,
-     622,     0,   623,   624,   625,   626,   627,   628,   629,   630,
-     218,   631,   632,   220,   633,   634,   221,   635,     0,   636,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,  2505,
      637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
-     223,     0,   647,   648,     0,   649,   225,   650,   651,   652,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
      653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
      658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
        0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
-     672,   673,   674,   675,     0,   236,     0,   676,   237,   677,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
      678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
      684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,    35,   688,   689,     0,     0,     0,     0,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
-     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
-       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
-     442,   132,   443,   444,   445,   134,   135,   136,   137,   138,
-       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
-       0,   139,   453,     0,   454,   455,   456,   457,   143,     0,
-     144,     0,   458,   459,   460,   461,   147,   462,   463,     0,
-       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
-     471,     0,     0,     0,     0,   151,     0,     0,   472,   473,
-     474,   475,   476,     0,   477,   154,   155,   478,     0,   479,
-       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
-       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
-     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
-     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
-     167,   509,     0,   510,     0,   511,   168,     0,   169,   512,
-     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
-     518,     0,   519,   520,   173,   521,   522,   523,   524,     0,
-     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
-       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
-     179,   180,   536,   181,   537,   538,   539,   540,   541,     0,
-       0,   542,   182,   183,   543,   184,     0,   544,   545,   546,
-       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
-       0,   555,   556,     0,   557,   558,   559,   189,   190,   191,
-     560,   561,   192,     0,   562,   563,   194,   564,     0,   195,
-     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
-     571,   572,     0,     0,   573,   197,   198,   574,   199,   200,
-     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
-     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
-     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
-       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   610,     0,   611,   612,   211,   613,   614,   615,   213,
-     616,   617,   618,   619,   620,   621,     0,   622,     0,   623,
-     624,   625,   626,   627,   628,   629,   630,   218,   631,   632,
-     220,   633,   634,   221,   635,     0,   636,   637,   638,   639,
-     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
-     648,     0,   649,   225,   650,   651,   652,   653,   654,     0,
-     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
-     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
-     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
-     675,     0,   236,     0,   676,   237,   677,   678,   679,   680,
-       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
-     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-      35,   688,   689,     0,     0,     0,     0,     0,    41,    42,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
      434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
-       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
-     444,   445,   134,   135,   136,   137,   138,     0,   446,   447,
-     448,   449,   450,     0,     0,   451,   452,     0,   139,   453,
-       0,   454,   455,   456,   457,   143,     0,   144,     0,   458,
-     459,   460,   461,   147,   462,   463,     0,     0,   464,   465,
-     466,   467,   468,   469,     0,   150,   470,   471,     0,     0,
-       0,     0,   151,     0,     0,   472,   473,   474,   475,   476,
-       0,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+       0,  4403,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
      482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
      489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
      497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
      505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
-     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
-     515,   171,     0,   172,   516,     0,   517,   518,     0,   519,
-     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
-     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
-     534,     0,   177,     0,   178,     0,   535,   179,   180,   536,
-     181,   537,   538,   539,   540,   541,     0,     0,   542,   182,
-     183,   543,   184,     0,   544,   545,   546,     0,     0,   547,
-     548,   549,   550,  1289,   552,   553,   554,     0,   555,   556,
-       0,   557,   558,   559,   189,   190,   191,   560,   561,   192,
-       0,   562,   563,   194,   564,     0,   195,   565,   196,   566,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
      567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
-       0,   573,   197,   198,   574,   199,   200,   575,   576,   577,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
      578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
      585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
      594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
      602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
-     611,   612,   211,   613,   614,   615,   213,   616,   617,   618,
-     619,   620,   621,     0,   622,     0,   623,   624,   625,   626,
-     627,   628,   629,   630,   218,   631,   632,   220,   633,   634,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
      221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
      643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
-     225,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
        0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
      662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
-     670,     0,     0,   671,   672,   673,   674,   675,     0,   236,
-       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
        0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,    35,   688,   689,
-       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
-     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
-     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
-     135,   136,   137,   138,     0,   446,   447,   448,   449,   450,
-       0,     0,   451,   452,     0,   139,   453,     0,   454,   455,
-     456,   457,   143,     0,   144,     0,   458,   459,   460,   461,
-     147,   462,   463,     0,     0,   464,   465,   466,   467,   468,
-     469,     0,   150,   470,   471,     0,     0,     0,     0,   151,
-       0,     0,   472,   473,   474,   475,   476,     0,   477,   154,
-     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
-       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
-     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
-     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
-     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
-     168,     0,   169,   512,   513,   514,     0,   515,   171,     0,
-     172,   516,     0,   517,   518,     0,   519,   520,   173,   521,
-     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
-       0,   531,   175,   176,     0,   532,   533,   534,     0,   177,
-       0,   178,     0,   535,   179,   180,   536,   181,   537,   538,
-     539,   540,   541,     0,     0,   542,   182,   183,   543,   184,
-       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
-    1371,   552,   553,   554,     0,   555,   556,     0,   557,   558,
-     559,   189,   190,   191,   560,   561,   192,     0,   562,   563,
-     194,   564,     0,   195,   565,   196,   566,   567,   568,     0,
-     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
-     198,   574,   199,   200,   575,   576,   577,   578,   579,   580,
-     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
-       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
-     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
-     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
-     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
-       0,   622,     0,   623,   624,   625,   626,   627,   628,   629,
-     630,   218,   631,   632,   220,   633,   634,   221,   635,     0,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   223,     0,   647,   648,     0,   649,   225,   650,   651,
-     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
-     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
-     665,     0,     0,   666,   667,   668,   669,   670,     0,     0,
-     671,   672,   673,   674,   675,     0,   236,     0,   676,   237,
-     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
-     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,    35,   688,   689,     0,     0,     0,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
        0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
      430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
-       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
-     441,   442,   132,   443,   444,   445,   134,   135,   136,   137,
+       0,     0,     0,     0,     0,  4417,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
      138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
-     452,     0,   139,   453,     0,   454,   455,   456,   457,   143,
-       0,   144,     0,   458,   459,   460,   461,   147,   462,   463,
-       0,     0,   464,   465,   466,   467,   468,   469,     0,   150,
-     470,   471,     0,     0,     0,     0,   151,     0,     0,   472,
-     473,   474,   475,   476,     0,   477,   154,   155,   478,     0,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
      479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
      487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
      494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
      502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
-     508,   167,   509,     0,   510,     0,   511,   168,     0,   169,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
      512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
-     517,   518,     0,   519,  1452,   173,   521,   522,   523,   524,
-       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
+     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
      176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
-     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
-       0,     0,   542,   182,   183,   543,   184,     0,   544,   545,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
      546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
-     554,     0,   555,   556,     0,   557,   558,   559,   189,   190,
-     191,   560,   561,   192,     0,   562,   563,   194,   564,     0,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
      195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
-     570,   571,   572,     0,     0,   573,   197,   198,   574,   199,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
      200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
      583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
      590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
      599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
-     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
-     213,   616,   617,   618,   619,   620,   621,     0,   622,     0,
-     623,   624,   625,   626,   627,   628,   629,   630,   218,   631,
-     632,   220,   633,   634,   221,   635,     0,   636,   637,   638,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
      639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
-     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
        0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
        0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
      666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
-     674,   675,     0,   236,     0,   676,   237,   677,   678,   679,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
      680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
      686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,    35,   688,   689,     0,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
-     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
-       0,     0,     0,     0,   439,   440,     0,   441,   442,   132,
-     443,   444,   445,   134,   135,   136,   137,   138,     0,   446,
-     447,   448,   449,   450,     0,     0,   451,   452,     0,   139,
-     453,     0,   454,   455,   456,   457,   143,     0,   144,     0,
-     458,   459,   460,   461,   147,   462,   463,     0,     0,   464,
-     465,   466,   467,   468,   469,     0,   150,   470,   471,     0,
-       0,     0,     0,   151,     0,     0,   472,   473,   474,   475,
-     476,     0,   477,   154,   155,   478,     0,   479,     0,   480,
-     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
-     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
-     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
-     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
-       0,   510,     0,   511,   168,     0,   169,   512,   513,   514,
-       0,   515,   171,     0,   172,   516,     0,   517,   518,     0,
-     519,  1464,   173,   521,   522,   523,   524,     0,   525,   526,
-     527,   528,   529,   530,     0,   531,   175,   176,     0,   532,
-     533,   534,     0,   177,     0,   178,     0,   535,   179,   180,
-     536,   181,   537,   538,   539,   540,   541,     0,     0,   542,
-     182,   183,   543,   184,     0,   544,   545,   546,     0,     0,
-     547,   548,   549,   550,   551,   552,   553,   554,     0,   555,
-     556,     0,   557,   558,   559,   189,   190,   191,   560,   561,
-     192,     0,   562,   563,   194,   564,     0,   195,   565,   196,
-     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
-       0,     0,   573,   197,   198,   574,   199,   200,   575,   576,
-     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
-     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
-     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-       0,   611,   612,   211,   613,   614,   615,   213,   616,   617,
-     618,   619,   620,   621,     0,   622,     0,   623,   624,   625,
-     626,   627,   628,   629,   630,   218,   631,   632,   220,   633,
-     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
-     649,   225,   650,   651,   652,   653,   654,     0,   226,   227,
-       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
-     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
-     669,   670,     0,     0,   671,   672,   673,   674,   675,     0,
-     236,     0,   676,   237,   677,   678,   679,   680,     0,     0,
-     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,    35,   688,
-     689,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
        0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
-       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
-     134,   135,   136,   137,   138,     0,   446,   447,   448,   449,
-     450,     0,     0,   451,   452,     0,   139,   453,     0,   454,
-     455,   456,   457,   143,     0,   144,     0,   458,   459,   460,
-     461,   147,   462,   463,     0,     0,   464,   465,   466,   467,
-     468,   469,     0,   150,   470,   471,     0,     0,     0,     0,
-     151,     0,     0,   472,   473,   474,   475,   476,     0,   477,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
      154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
      484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
      491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
        0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
        0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
-     511,   168,     0,   169,   512,   513,   514,     0,   515,   171,
-       0,   172,   516,     0,   517,   518,     0,   519,  1478,   173,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
      521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
-     530,     0,   531,   175,   176,     0,   532,   533,   534,     0,
-     177,     0,   178,     0,   535,   179,   180,   536,   181,   537,
-     538,   539,   540,   541,     0,     0,   542,   182,   183,   543,
-     184,     0,   544,   545,   546,     0,     0,   547,   548,   549,
-     550,  1479,   552,   553,   554,     0,   555,   556,     0,   557,
-     558,   559,   189,   190,   191,   560,   561,   192,     0,   562,
-     563,   194,   564,     0,   195,   565,   196,   566,   567,   568,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
        0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
-     197,   198,   574,   199,   200,   575,   576,   577,   578,   579,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
      580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
      587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
      204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
      604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
-     211,   613,   614,   615,   213,   616,   617,   618,   619,   620,
-     621,     0,   622,     0,   623,   624,   625,   626,   627,   628,
-     629,   630,   218,   631,   632,   220,   633,   634,   221,   635,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
        0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
-     645,   646,   223,     0,   647,   648,     0,   649,   225,   650,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
      651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
      657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
      664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
-       0,   671,   672,   673,   674,   675,     0,   236,     0,   676,
-     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+    5110,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
      682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,    35,   688,   689,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
-     438,   129,   130,     0,     0,     0,     0,     0,   439,   440,
-       0,   441,   442,   132,   443,   444,   445,   134,   135,   136,
-     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
-     451,   452,     0,   139,   453,     0,   454,   455,   456,   457,
-     143,     0,   144,     0,   458,   459,   460,   461,   147,   462,
-     463,     0,     0,   464,   465,   466,   467,   468,   469,     0,
-     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
-       0,   473,   474,   475,   476,     0,   477,   154,   155,   478,
-       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
-     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
-     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
-     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
-     507,   508,   167,   509,     0,   510,     0,   511,   168,     0,
-     169,   512,   513,   514,     0,   515,   171,     0,   172,   516,
-       0,   517,   518,     0,   519,   520,   173,   521,   522,   523,
-     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
-     175,   176,     0,   532,   533,   534,     0,   177,     0,   178,
-       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
-     541,     0,     0,   542,   182,   183,   543,   184,     0,   544,
-     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
-     553,   554,     0,   555,   556,     0,   557,   558,   559,   189,
-     190,   191,   560,   561,   192,     0,   562,   563,   194,   564,
-       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
-       0,   570,   571,   572,     0,     0,   573,   197,   198,   574,
-     199,   200,   575,   576,   577,   578,   579,   580,   581,     0,
-     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
-     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
-     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
-     615,   213,   616,   617,   618,   619,   620,   621,     0,   622,
-       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
-     631,   632,   220,   633,   634,   221,   635,     0,   636,   637,
-     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
-       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
-     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
-     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
-       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
-     673,   674,   675,     0,   236,     0,   676,   237,   677,   678,
-     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
-     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,     0,   688,   689
-};
-
-static const yytype_int16 yycheck[] =
-{
-       2,  1451,  1155,    78,  1105,   210,   249,   390,    78,    78,
-      78,   923,  1122,   390,    78,  1160,  1455,  1460,   879,    96,
-      84,   116,  1504,     2,  1042,  1043,  1044,  2239,  1534,   106,
-    1048,   963,   230,   153,   152,    78,  1291,   374,   166,  1100,
-    1225,  1128,  1359,   149,  1423,  1301,  1722,  1443,  1894,  1279,
-    1859,  3172,  1426,  1370,  2004,  1570,  2364,  1411,  1412,    78,
-     188,   164,   923,  3007,   141,    84,   161,  1421,  2816,   981,
-     224,  3367,  1904,   984,  1340,   751,    78,  1009,  1112,   156,
-    2528,  2529,    84,   203,   995,  2189,  3551,    89,  1739,   164,
-    1345,  1900,   170,  3343,  1349,  3620,   963,   116,  2377,  1354,
-    2074,   159,  1441,  1278,  2682,  2807,  1955,  1362,   131,  1284,
-    2734,  3391,  1915,  3393,   116,   875,  3578,  1372,  1293,  1743,
-     981,  3897,   882,   116,  2427,  2277,  1278,  3226,    78,   362,
-    4211,  3541,   210,   893,  1400,  1967,  2086,   232,  3950,  3536,
-    2979,  4000,   161,  3813,  3541,  3607,  1202,  3161,  3950,   376,
-     152,  1202,  1008,  3159,  3160,   994,   752,  1833,  3946,   161,
-    4200,   921,  3841,   376,  4201,  4223,   926,  2125,   161,  1972,
-    1973,  4148,  1779,  1780,  1781,  3847,  1108,   937,  4198,  4214,
-    2371,   217,   248,  3092,  4679,  1886,  1900,  1774,  1775,   116,
-    4210,  1497,   209,  1837,  1517,  4480,  3257,  1409,  1410,  1242,
-     166,   116,   219,  4808,  2178,  4810,  1488,   209,  1420,  3846,
-    1152,  1152,  3913,   232,  1291,   217,  4872,   219,  3776,    21,
-    2528,  3644,   188,  1024,    10,  1197,  1198,  1028,  1029,  1030,
-     232,    30,  2810,    71,   161,    71,    87,  1038,  4853,   232,
-      14,  1108,    87,  1000,  1598,  1599,   161,    85,    87,    85,
-    4906,  4994,  1626,    74,    75,    76,    77,   124,  1496,  1183,
-      81,  4297,  1616,  4299,    84,   116,   146,   117,    89,    90,
-     111,   116,  4910,  4911,   950,    98,   138,   160,    74,    75,
-      76,    77,   209,    14,   235,    81,   187,    71,   105,   117,
-     217,    14,   219,    89,    90,   146,    74,    75,    76,    77,
-     234,   146,   244,    81,   234,   232,   859,   382,    74,    75,
-      76,    77,   382,   382,   382,    81,   275,   232,   115,   256,
-    1338,   185,   152,  3232,    87,  1249,   390,   229,   180,   216,
-     234,   229,  2910,  4945,  2912,    74,    75,    76,    77,   382,
-      71,   131,    81,  3345,   215,   234,   334,   865,    71,   396,
-     114,    74,    75,    76,    77,   131,   874,    80,    81,    82,
-      83,   425,    85,    74,    75,    76,    77,   115,   106,   107,
-      81,   390,   138,   204,   131,  1587,  1588,   412,    94,   202,
-      78,   187,  2594,    74,    75,    76,    77,  1497,   390,    98,
-      81,   909,   412,   178,    71,   104,   248,   234,    89,    90,
-    1612,   184,    71,    80,   131,   412,   425,  1645,    85,  1321,
-     382,    80,   396,    96,   159,   131,    85,    74,    75,    76,
-      77,    50,   348,   425,    81,   100,  1102,    74,    75,    76,
-      77,   187,   382,     0,    81,   102,   152,   153,    71,    68,
-     412,    74,    75,    76,    77,   120,   162,    80,    81,   967,
-    1706,   148,    85,   234,   199,   307,   382,    78,  5063,   977,
-    1321,  1646,   102,   102,  5120,    74,    75,    76,    77,   109,
-     109,    78,    81,   279,   185,   234,   157,    78,   861,   526,
-      89,    90,   384,   150,   861,    78,   470,   203,  1673,  4984,
-     254,   158,   148,   202,   529,   233,   102,   235,    74,    75,
-      76,    77,   102,   109,   387,    81,   209,    78,  4485,   529,
-      74,    75,    76,    77,   320,  5106,  5107,    81,  2476,   186,
-      78,   240,   529,   234,   178,    89,    90,    78,    74,    75,
-      76,    77,   215,   318,   476,    81,    14,   655,   526,    74,
-      75,    76,    77,   148,   415,   449,    81,  5159,  3550,  1481,
-    1461,   403,   157,    78,  3062,  3063,    78,  2515,  1668,  3067,
-     449,  2519,   138,     8,  2014,   371,    11,    12,   385,   325,
-     529,  1681,  1504,   474,   148,   526,  2019,    22,    23,    24,
-    1504,    26,    27,   703,   704,  2236,    31,    32,    33,  2240,
-     190,  2242,   529,   260,  2245,   529,  3104,  3105,   388,   529,
-     487,  1711,  1712,  1199,  1200,   425,    74,    75,    76,    77,
-     180,    78,   388,    81,  1481,    74,    75,    76,    77,  5187,
-    4030,   449,    81,    74,    75,    76,    77,   477,   526,  1540,
-      81,   388,   462,  4030,    74,    75,    76,    77,   435,    78,
-    4680,    81,  1574,  2319,   524,  1556,   529,   470,   528,   423,
-    1506,   515,  4672,   655,  5269,  2772,   487,  3953,  5296,   526,
-    1571,   388,  4639,  2780,   526,  2782,  1219,   370,   451,   269,
-     472,   522,   517,   518,   519,   520,   521,   522,   248,   517,
-     518,   517,   518,   522,   382,   526,  5429,   435,   526,   526,
-    2366,   477,   423,   477,  2370,  4365,  1951,  4733,  1953,  1874,
-     423,  4737,  4738,   481,  4740,   526,  1507,  1574,  4170,  1510,
-     426,   494,  1513,   396,  1515,  3293,  2033,  1518,   520,  4696,
-    4392,  1522,  4401,   529,  2230,   524,  4405,   148,  4193,  1486,
-     526,  1961,   415,   178,   888,  5391,   105,   307,   449,   529,
-     310,  2007,    87,  2182,   482,   526,  2002,  5403,   526,  1924,
-     868,  4309,   449,   529,  4391,  4456,   519,   520,   521,   522,
-     526,   382,   857,  5368,   431,  5333,  1009,    87,   449,  1701,
-     529,   116,   529,   102,   192,   382,  2608,  1709,  1710,  1012,
-    1704,   382,   422,   422,   438,  1709,  1710,   526,  1306,   382,
-    2144,   148,  5383,   449,   517,   518,   914,   861,  2237,  1317,
-     157,   146,   529,   131,   515,   405,  5462,  2246,   244,   275,
-     529,   382,  3260,  5098,  3262,  1753,   422,   528,  1155,  1761,
-    1761,  1793,   491,   526,   382,  3573,  4249,  4250,  4251,  4252,
-    4253,   382,   952,   403,  1701,   526,   178,  4133,   857,  5334,
-     517,   518,   861,   512,   449,   903,  2678,  3861,   517,   518,
-    1893,  3159,  3160,  3161,   972,   857,  1933,   382,   234,   861,
-     382,  1938,  1380,   865,   857,   178,    98,   312,   190,   526,
-     470,  4848,   874,   875,  3935,   449,  2114,   524,  4855,   526,
-     882,   528,   318,   275,   178,   518,   178,   234,  2211,  2195,
-    2477,   893,  2479,  1021,  2217,  1023,  3175,  1025,  2542,  1005,
-    1054,  1497,  4983,  1031,  2186,   481,  1009,   909,   275,  2121,
-    2122,  5479,    25,   131,   359,   382,   178,   526,  1145,   921,
-    3157,   393,  2636,   449,   926,  2626,    25,  1055,  1056,  1006,
-     857,  5426,  1145,  1008,   375,   937,   185,   507,   334,   655,
-    3518,  3519,   857,   382,   330,   132,  1023,   493,  1025,   215,
-     526,   226,  1876,   140,   956,  3748,   526,   110,  1035,   164,
-    1884,   963,   526,   333,   275,   967,   512,    29,   108,   386,
-     202,   973,   224,   529,  1128,   977,   978,   533,  1055,  1056,
-     526,  3218,   984,  2322,  3777,   103,  4236,   703,   704,   515,
-    4792,   526,   994,   995,    37,   412,    39,   124,  1000,   471,
-     190,  2850,  3911,   318,    70,  1159,   472,  1009,    74,    75,
-      76,    77,    78,    79,   459,    81,   385,  1929,  2864,  1943,
-     190,  1000,  1946,  1947,   400,   493,   355,   396,   449,   398,
-    1850,  1134,   185,  4835,   239,   751,  3227,  4849,  2276,  2277,
-     476,   293,   317,   484,   512,  2283,   330,  4849,   178,   176,
-     244,  2289,  2290,  2291,   472,   185,   244,  1023,   526,  1025,
-     388,  2299,  2300,    98,  2082,  1129,  2304,   526,  1929,   104,
-    1106,   320,  1138,  2555,  1110,   526,   216,   157,   407,   269,
-     154,  1104,  4752,  2193,   190,   454,   526,  1241,  3536,  1055,
-    1056,  2015,   449,  3541,   530,   122,   438,  1099,  1100,   269,
-     318,   330,   449,    70,  1106,   185,  1108,   483,  1110,   296,
-    1129,    78,    79,   442,   180,   444,   348,   275,  4797,  5200,
-     194,  4793,   236,  4802,   318,   438,  4805,  1129,   524,   334,
-     318,  2316,   528,    98,  1136,   179,   528,  5174,  2534,   104,
-     526,   268,  2243,  2244,   438,  2524,   438,   409,   470,   415,
-     382,   400,   270,  5211,   348,  5195,   526,    84,   271,  5196,
-      87,   472,   529,   269,    91,    92,    93,   202,   515,  3617,
-     388,  4696,   271,  5208,   519,   520,   521,   522,  4474,  1106,
-     412,   528,   248,  1110,   389,   275,  5206,   340,   382,   156,
-     320,   318,  4994,   508,   412,  1197,  1198,   517,   518,   519,
-     520,   521,   522,   180,  1183,   267,  4668,    71,   236,   164,
-      74,    75,    76,    77,  5438,   259,    80,    81,    82,    83,
-    2040,    85,   336,  1202,   251,    74,    75,    76,    77,   256,
-    3188,  1233,    81,  4513,   950,   405,   952,   202,  2149,   206,
-     320,   307,   526,   475,   310,  2157,   365,  3755,  3756,  3757,
-    3758,  2162,   164,  3761,  3762,  3763,  3764,  3765,  3766,  3767,
-    3768,  3769,  3770,  1280,  1281,   292,  2177,  2199,   185,   321,
-    1249,   248,   140,  3157,   401,   349,   340,   320,  1280,  1281,
-     470,  2120,   476,  1233,   239,   185,   491,  1003,   476,   157,
-    2897,  1007,   275,    25,    98,  5335,  2157,   526,   428,   144,
-     470,   431,  2412,    35,  1306,   212,   140,   340,  5096,  3817,
-    3818,  1313,  5536,   348,   472,  1317,  2967,   431,   235,   228,
-      14,   340,   527,   100,   234,   530,  1384,   239,   382,   256,
-     307,  1333,   299,   310,  3218,   177,  2175,   403,   118,  5198,
-    1342,  1291,  2198,   120,  5425,   213,   256,   382,   180,  5430,
-     277,   457,   235,  1280,  1281,  4454,   400,  5027,   237,   139,
-    2298,  2462,   515,   231,   470,   275,   273,  5344,  2306,   443,
-     398,   524,   154,   526,   527,   528,   529,   412,  1380,   213,
-    5059,   348,   472,   348,  2296,   318,  1102,   412,  1104,   335,
-     417,   242,  3509,   437,   438,   449,   526,   231,   202,  3516,
-    3517,  5482,  1645,  3520,   321,   137,   185,   526,  4422,   336,
-    3527,  4417,   194,  2730,  4428,   382,   248,   382,   470,   386,
-      84,  1423,   334,    87,   452,   325,   403,    91,    92,    93,
-     458,  1506,  1509,   340,  1511,  2296,  5238,  1514,   202,  1516,
-    1823,   507,  1519,  1520,  1521,   412,  1823,   412,   482,   358,
-    4289,  5263,  5122,  2903,   237,  1532,  5126,  5127,  2514,  1461,
-    2635,  5263,  5543,  2514,   306,   529,   308,   350,  2907,  1546,
-    2913,  1548,  4882,  3685,   441,   307,   443,   389,   310,  1481,
-    4856,   154,   526,  1485,  1486,  4882,  1488,   154,   333,   472,
-     234,   384,   190,   270,  1496,   363,   529,  5273,  5274,  1732,
-     154,    98,  1504,   528,   202,  4970,  1485,  1486,   527,  1488,
-     529,   281,   256,  3359,  2831,  2832,  2833,  2834,   248,  1746,
-    1747,   194,  1749,  2698,   491,  1504,  2843,   194,   407,   363,
-     507,   275,  2787,  1746,  1747,   418,  1749,   413,  1540,   271,
-     194,   320,   393,   476,   348,  2720,  2698,   530,   318,   526,
-     496,   102,  1554,  3861,  1556,   472,   307,   464,   140,   281,
-     439,   334,   472,   224,   256,  3189,   236,   349,  4192,  1571,
-    2494,   403,  1574,  2748,   338,  4951,  3728,   307,   382,   491,
-     429,   430,  4030,  1585,  2102,   231,   513,   514,   515,   165,
-     517,   518,   519,   520,   521,   522,   318,   465,   491,  2195,
-     491,  3450,  3839,   185,  3841,   202,   340,   185,   412,  1763,
-    2876,  1613,   449,   277,   187,   527,  3919,   515,   530,   512,
-     530,   102,   386,  2555,   407,  1720,    70,  5429,  3460,  2147,
-     528,   465,   293,  4141,    78,    79,   529,  3288,   529,  1641,
-    1642,  1643,  2880,  1645,   347,   415,   197,   234,   412,   371,
-     526,  4947,   403,   517,   518,  1657,   439,   234,   189,   235,
-     229,   443,   360,  1665,  1687,  1688,   336,   324,   402,   256,
-     239,   332,   336,   403,   189,   507,   349,   460,  1773,   256,
-    5456,  4259,   349,  4261,  2596,   398,   195,   256,   275,   265,
-     382,   362,   529,   415,   386,   349,   205,  3671,   275,  1701,
-     470,  1720,  1704,   179,   280,   188,   279,  1709,  1710,   412,
-    1774,  1775,   156,  3950,   290,   348,   197,  1719,  1720,  5184,
-     412,  2239,  2633,  5099,  5186,  1704,   212,  1720,   472,   449,
-    1709,  1710,   124,  5109,   187,  2596,   230,   226,   320,   315,
-    4879,   454,  1837,   325,    70,   276,  1748,   320,   470,   382,
-    1752,  1753,    78,    79,  1773,  1774,  1775,  5007,   334,  1823,
-    5225,   276,   419,   207,   438,   112,  1830,   261,  1791,   252,
-     443,  1773,  1774,  1775,   187,   347,   443,  2701,  4917,   412,
-     451,   363,   347,   259,   176,  2709,   530,  2711,  4732,   443,
-       2,  1793,  3298,  1720,    84,   377,   285,  3600,   371,   491,
-    3603,    91,    92,    93,  1823,  1720,  1785,   293,   449,   529,
-     263,  1830,  1966,  1871,  5110,   338,   392,   261,  1837,  5344,
-     512,  1823,   391,   494,   348,   348,  3064,   405,  1830,  1831,
-     156,  1810,  1811,  2509,   362,  1837,  5116,  1553,  3076,   348,
-    3179,  2859,   405,   305,  1837,  1847,   193,   412,  1850,   513,
-     514,   515,  1854,   517,   518,   519,   520,   521,   522,   382,
-     438,   197,  3258,   199,   382,   318,   279,   320,  3264,   197,
-    3108,   199,  2632,   382,   515,   438,   268,    89,    87,   370,
-     206,  5343,  5003,   465,  1886,   472,  3329,   528,   412,   238,
-     188,   236,  1894,   526,   412,   472,   472,  1876,   157,  4843,
-     478,  4845,   375,   148,   282,  1884,   397,   320,  3146,   353,
-    1837,  4659,   157,   491,  3268,   478,   347,  4495,  4496,   451,
-    1847,   266,  1837,   451,   400,  1927,   318,   526,    74,    75,
-      76,    77,  2692,   406,   512,    81,  2868,   146,   307,   177,
-     152,   310,  2037,   530,   161,  4647,   158,   296,   526,    74,
-      75,    76,    77,   530,   252,  3839,    81,  3841,   371,  1886,
-     483,   437,   438,   526,  1943,   438,   494,  1946,  1947,  4671,
-    5220,  1687,  1688,   299,   186,    74,    75,    76,    77,   238,
-    5276,   412,    81,  1933,   320,  1987,  2746,  1989,  1938,   396,
-    4107,  2109,   230,   277,   330,   472,  4113,  4114,  2930,  4116,
-     259,  2868,   330,   491,  3954,   164,  2008,   472,   421,   401,
-     188,   484,  5477,  3166,    71,   232,   386,   398,  2037,   463,
-     427,  2023,   348,   261,   512,   184,   375,   471,    85,  2031,
-     474,   472,  3683,   348,   403,  2037,  2015,   296,  2040,  2422,
-    2042,    22,   412,   238,  2037,  2422,   336,  2971,   451,   526,
-     334,  3317,    74,    75,    76,    77,  2058,   216,   235,    81,
-    2062,   526,  1989,  2930,  2269,  5527,  3950,   382,   306,  2587,
-     308,   386,  2074,   454,   252,  1791,  2594,  3583,   106,   107,
-     339,   530,   396,   214,   398,   526,  3592,  2089,   265,  5385,
-      71,   494,   493,   442,   348,   444,  2199,   412,  2693,  2253,
-    2102,   296,   187,   280,   524,   442,  2108,   444,   528,  4417,
-    2037,   512,  2114,   290,  4422,   441,  3346,   443,  2120,   468,
-    4428,  3797,  2037,  2198,  3062,  3063,   257,   491,   382,  3067,
-    2132,  2208,   197,  2210,   199,   484,   164,  2214,  3368,  2216,
-     454,  5262,  2219,  3177,   229,  2147,  2223,  2149,  2150,   197,
-     229,   199,  2747,   488,  4433,  3987,   184,   222,   283,   234,
-    2162,  2056,    70,    71,  4401,   529,  3104,  3105,  4405,     5,
-    2172,   250,  3347,  2175,   222,  2177,  2178,   348,   263,   325,
-    2075,   256,   375,   442,  2186,   444,  2261,  2189,   216,    25,
-    2268,  2261,  2261,  2261,   529,   454,  3711,  2199,   529,    35,
-    4003,  4004,  4034,   238,   137,   138,   465,  2186,  3120,   468,
-    2189,   382,   148,   406,  5510,   392,   532,  2275,  2261,   378,
-     348,   157,   229,   513,   514,   515,   325,   517,   518,   519,
-     520,   521,   522,   318,  2329,   320,   331,  2239,   530,   334,
-    4748,   412,  3417,   250,  3920,   438,   405,   442,  3180,   444,
-      74,    75,    76,    77,   382,   320,  3180,    81,    40,  3120,
-     325,   296,   491,  4213,   382,   330,  3640,  3641,   386,  3719,
-     305,   224,   472,   468,  2276,  2277,   229,   325,  2954,   438,
-    2282,  2283,   330,   512,   412,   524,  2288,  2289,  2290,  2291,
-    3545,   484,   531,  2295,   412,  2297,  2298,  2299,  2300,  2301,
-    2302,   137,  2304,   325,  2306,  2307,    70,   320,  2310,   271,
-    2329,   521,   325,  2441,    78,    79,   526,  2308,   528,   478,
-    2311,  2424,  2324,  2325,  2326,  2327,  2328,  2329,   519,   520,
-     521,  2333,   491,  5454,   348,  2337,  2329,    16,  2340,  3200,
-     293,  2343,  2344,  2345,  2346,  2347,  2348,  2349,  2350,  2351,
-     378,  2353,  2557,   512,  2559,  4459,   369,   529,  2422,  2361,
-     525,   533,  2364,  5484,   529,   201,   405,   526,   382,   371,
-    4216,   224,   140,   491,  3285,  3286,   229,   405,   146,   332,
-     212,   383,   524,  3315,   491,   365,  4964,  4695,   530,   157,
-    4199,   456,   224,   302,   512,   529,   530,   229,   412,   438,
-      87,   466,  2329,  2422,   454,   512,   408,   442,   456,   444,
-     438,   302,   525,  2477,  2329,  2479,   529,   185,   466,   187,
-    2422,   348,   529,   493,  2467,  2427,   442,  2555,   444,   116,
-    2548,  5552,   493,   468,  4882,   271,   402,   302,  5382,   478,
-     293,   273,   512,   655,   329,  3951,  3952,  2542,  3315,  3715,
-     478,   512,   491,  2607,   482,   382,   526,   521,  2477,   146,
-    2479,   293,   526,   491,   528,   526,   517,   518,   519,   520,
-     521,   127,  4617,   512,  4619,  2477,   527,  2479,  4623,   332,
-    4625,   526,   283,   528,   512,   412,  4603,   526,  4605,  4606,
-     146,   400,  4609,  3011,   484,   263,  2498,    80,   526,  3017,
-     332,   325,    85,   449,   160,   334,   334,    34,   340,   400,
-     339,   339,  3750,   454,  2516,  2494,  2518,  4401,  5026,   129,
-    3431,  4405,  2524,  2542,   396,   397,  2528,  2529,   526,  3440,
-       7,  3075,   441,  3077,  3078,  2514,  2538,  2516,   454,  2518,
-    2542,  2543,    19,    20,   527,  2547,  3784,   530,  4996,  2542,
-     441,  3569,   320,  2555,   384,  4792,   212,   325,   402,   468,
-    4797,    38,   529,   530,    41,  4802,  2661,   177,  4805,   305,
-    2665,  2573,  2690,   527,  2576,   529,   441,   468,  3932,   527,
-      84,   529,   491,  3979,   493,  2587,   524,   302,   526,  2591,
-     302,  3829,  2594,   396,   397,   363,    70,    71,  4835,   305,
-     491,  2603,   493,   468,    78,    79,   259,   527,  3695,   377,
-     530,    85,  4849,  2615,  3546,  2542,  3548,   526,   491,   302,
-     493,  4272,  4273,  4274,  2626,   161,   491,  2542,   493,  3885,
-    2632,  2633,   464,   531,   527,   526,   529,    71,  2640,  3157,
-     165,   524,  2661,   526,   250,   528,  2665,    70,   258,  3560,
-     527,  3562,   529,    89,    90,    78,    79,    89,    90,  2661,
-    2662,   526,   526,  2665,   528,   454,   153,  3852,   302,   527,
-     484,   529,  2665,   128,   402,  3536,    99,   532,   283,  3546,
-    3541,  3548,    85,   160,  3616,   400,   334,   527,   400,   529,
-    2692,  2693,   904,   527,  2696,   529,   306,   465,   308,  2626,
-    3218,   526,  3855,  3856,  3857,   526,   400,  2802,   318,   529,
-     235,  2817,  2714,    74,    75,    76,    77,   400,   484,   128,
-      81,   198,  2701,  2725,   118,   527,   441,   529,   482,   441,
-    2709,  4943,  2711,   156,  2661,   509,  2738,   347,  2665,   527,
-     265,   529,  4418,   528,  2746,  2747,  2661,   279,   337,  3616,
-    2665,   963,   964,   468,   334,   280,   468,  4994,   441,   517,
-     518,   519,   520,   521,   337,   290,   400,   525,    74,    75,
-      76,    77,   449,   229,  4450,    81,   491,   387,   493,   491,
-     527,   493,   529,  2802,   207,   468,   334,   527,  1000,   529,
-     315,  2793,  2794,  2509,   337,   527,  3720,   529,   509,  3710,
-    2802,   118,   527,  4920,   529,   509,  2808,   441,   491,  2802,
-     493,   526,  2814,   491,   526,   493,   426,  3755,  3756,  3757,
-    3758,  3064,  5059,  3761,  3762,  3763,  3764,  3765,  3766,  3767,
-    3768,  3769,  3770,   256,   468,   527,   279,   529,   261,   519,
-     442,   130,   444,   526,  2846,   233,   527,  1059,   529,   128,
-    3788,   527,   527,   529,   302,   529,   527,   491,   529,   493,
-     526,   302,  2864,   527,   234,  3108,  2868,   392,   527,  4099,
-     529,   275,   321,   322,   163,  2802,   530,   519,  2880,  3817,
-    3818,  1093,    74,    75,    76,    77,   527,  2802,   529,    81,
-     271,  1103,   526,   532,   532,  1107,  1108,  1109,    74,    75,
-      76,    77,   212,   449,  5212,    81,   111,   527,  4792,   529,
-    4227,   449,   449,  4797,   224,   527,   449,   529,  4802,   229,
-     527,  4805,   529,   526,  4575,  4576,   208,  4578,  2930,   449,
-     353,   220,   128,   277,    70,    71,  2938,   271,    74,    75,
-      76,    77,    78,    79,    80,    81,   527,   449,   529,    85,
-     526,  4835,   400,  3151,  3152,  3153,   405,   528,   442,   400,
-     444,   412,   526,   273,   253,  4849,    74,    75,    76,    77,
-     393,   495,   527,    81,   529,  2977,  4355,   527,  3221,   529,
-     527,   382,   529,   293,   256,  1197,  1198,   217,  3083,   438,
-    1202,  2993,  2971,   441,  3089,   217,   527,  2999,   529,   288,
-     441,  5238,   528,   334,   527,  3007,   529,   256,   527,  3011,
-     529,   526,  3014,   436,   527,  3017,   529,   527,   382,   529,
-     468,   334,   332,  3025,   217,   256,  5263,   468,   217,   478,
-     340,   320,  3034,   527,   527,   529,   529,  3039,   334,   527,
-     463,   529,   491,   491,   491,   493,   493,   229,   471,   185,
-     491,   474,   493,   382,   527,   527,   529,   529,   217,   348,
-    3062,  3063,  3064,   512,  3083,  3067,   527,   527,   529,   529,
-    3089,   530,   291,  3075,  3076,  3077,  3078,   526,   526,   334,
-     187,  3083,   527,   472,   529,   526,  3088,  3089,   526,  3091,
-    3083,  3093,   527,   382,   529,   454,  3089,   386,   124,   484,
-     329,   390,  3104,  3105,  4342,    98,  3108,   527,   397,   529,
-    4994,   104,   302,   229,   527,   404,   529,   527,   283,   529,
-    3122,  3196,  3124,   412,  3126,   402,  3196,  3196,  3196,   527,
-     368,   529,  4614,   140,   527,   424,   529,   527,   274,   529,
-     166,   111,   526,   432,  3146,    74,    75,    76,    77,  4655,
-     320,   144,    81,  3196,   464,  3157,  3083,  3159,  3160,  3161,
-     296,   527,  3089,   529,   526,   191,     2,  3685,  3083,  4030,
-     495,   527,  4981,   529,  3089,  5059,   334,   527,  3180,   529,
-     206,   527,  3184,   529,   210,   527,   527,   529,   529,   527,
-     320,   529,  5429,   118,   527,  3197,   529,   486,   118,   459,
-    3202,  3180,   195,  4141,   230,   348,  3208,   233,   229,   202,
-     400,   527,   205,   529,   524,   484,  3218,   527,   528,   527,
-     246,   529,   484,  5435,  5436,   527,   527,   529,   529,   527,
-     527,   529,   529,   527,   527,   529,   529,   230,  2954,   527,
-     527,   529,   529,   527,   527,   529,   529,   527,   302,   529,
-     153,   441,   322,  4164,  4165,  3257,   229,   527,  3260,   529,
-    3262,   527,   527,   529,   529,  3267,  4177,  3269,   261,  1481,
-     527,   366,   529,  1485,  1486,   527,  1488,   529,   468,    84,
-     531,   217,    87,  3285,  3286,   527,   527,   529,   529,  3291,
-     217,   527,  1504,   529,   526,  4480,  3391,  3392,  3393,   325,
-     527,   491,   529,   493,   527,   217,   529,   333,   481,   526,
-    3312,   116,   527,  3315,   529,   359,  3318,   122,  1149,   526,
-    1151,  3839,  4406,  3841,  4408,   318,   217,   320,   110,   495,
-     166,   217,   217,  3335,   529,   405,   526,   330,  1550,   217,
-     217,   146,   334,   369,   217,   338,   400,   217,   334,   217,
-    5562,  5563,   188,  4277,  5238,   348,   217,  3359,   229,   217,
-     334,   217,  1574,   217,   217,   438,   526,   111,   438,   291,
-     229,   334,  3391,  3392,  3393,   526,   526,   229,   526,  5263,
-     229,   517,   518,   345,   526,  4446,   526,   441,   526,  3391,
-    3392,  3393,   385,   386,   526,   526,   275,   526,   526,   526,
-     526,  5052,   526,   526,   526,   210,   526,   526,   478,   526,
-     492,   526,  5063,  3415,   468,   526,   526,   526,   111,   412,
-     526,   491,  3424,   526,  3426,  3427,   526,   526,   526,  3431,
-     526,   168,  3950,  4939,  4940,  1647,   529,   491,  3440,   493,
-     529,   275,   512,   291,  1656,  3540,   251,   277,   111,  4931,
-     229,   256,   332,   229,   330,   412,   526,   527,  1670,   519,
-     530,   271,   403,   310,  3391,  3392,  3393,   529,   184,   471,
-     529,    14,   526,   515,   529,   526,  3391,  3392,  3393,   526,
-     526,   449,   475,  3485,   449,   400,   400,   292,  3825,  1701,
-     528,  5142,  1704,  1705,   449,   449,   293,  1709,  1710,   449,
-     449,   515,  3504,   449,   157,   400,   217,   334,  3510,  3627,
-    3630,   404,   449,   288,   449,   449,   325,    84,   471,   334,
-      87,  3540,   441,   330,   396,   526,  4438,   249,   449,   526,
-     157,   336,   449,  3535,  3536,   529,   348,   256,  3540,  3541,
-     217,  3695,   472,   179,  3546,  5429,  3548,  3540,   472,   116,
-     449,   449,   449,  3596,   128,   122,   128,  3536,  3560,   449,
-    3562,   449,  3541,  3606,   338,   449,   441,   449,   449,   117,
-     117,   400,   334,   529,   277,   449,   334,  4438,   334,   146,
-    3823,  1793,   449,   449,   495,   277,   277,  3630,   526,   491,
-     111,   100,   334,  5244,   217,   320,   185,  3599,  3841,  4510,
-     526,   217,   299,   472,   330,   320,   320,   111,   229,   111,
-     526,   283,   417,  3540,  3616,  3617,   401,   110,   483,   528,
-     526,   447,  4640,   447,   524,  3540,   412,   449,   524,   449,
-    3632,   217,   217,  3831,  3832,  3833,  3834,   472,   217,   472,
-     217,   217,    14,   210,   329,   449,   529,  5153,   324,   487,
-     234,   312,   312,    87,   447,   449,  4567,   225,   249,  4812,
-     242,   234,   526,   526,   451,   515,  4819,   529,   249,  3671,
-     273,  4926,   529,  5123,   529,   526,   415,   281,   335,   111,
-     526,  5124,  4614,  3685,   251,   527,  3688,   527,   529,   256,
-    4614,   472,  4837,    34,    10,  3790,   527,   529,   342,  5138,
-     128,  5140,   527,   449,   449,   510,   400,   526,  3710,   472,
-     400,  3713,   517,   518,   519,   520,   521,   522,   281,   281,
-     325,  4831,   449,   325,   526,   292,   449,   484,  3730,   449,
-     454,  3733,   402,   229,   283,   325,   334,  3739,   118,   421,
-     291,  3720,   396,  3745,   449,  3747,   291,  1959,  3750,   291,
-     333,   529,  3754,  3755,  3756,  3757,  3758,   441,   400,  3761,
-    3762,  3763,  3764,  3765,  3766,  3767,  3768,  3769,  3770,   336,
-     449,  3790,  3774,  3775,   334,   382,   382,  3779,   250,   409,
-     449,   449,  3784,   371,   111,   277,  3788,   277,  3790,   277,
-    3792,   472,   472,  5031,   277,   277,   283,  3790,  3800,   333,
-     217,  3803,   515,  3805,   229,   515,   484,   229,   231,   526,
-    4748,  3813,  3814,   330,   409,  3817,  3818,   526,  2030,  4757,
-    3822,  3823,  5304,   217,   217,   216,   491,  3829,   111,   320,
-     283,   320,  5070,   334,   334,    84,   247,  3839,    87,  3841,
-     247,   229,    91,    92,    93,   520,   111,   509,  2060,   310,
-     417,  3853,   217,   527,   509,   334,   527,  3859,  3860,  3861,
-     524,  4962,   283,  3790,   334,  4248,   334,   116,   527,   527,
-     409,  4248,   229,   122,   256,  3790,   527,   256,   256,   529,
-     529,   495,   529,  4401,    99,   240,   526,  4405,   449,   234,
-     309,   491,   334,  5046,   529,   128,   454,   146,   438,    84,
-     329,   527,    87,   527,  3906,   527,    91,    92,    93,   484,
-     283,   234,   527,   526,  3630,   527,   527,  3919,   527,   527,
-     234,   345,   352,   108,   449,   301,   344,   526,   529,  4024,
-    4058,   116,   526,  3935,  4029,   527,  4031,   122,  4850,   509,
-     527,   470,   488,   510,   488,   478,   511,   527,  3950,   527,
-     517,   518,   519,   520,   521,   522,   515,   526,   529,    84,
-     526,   146,    87,   334,   128,   515,    91,    92,    93,   526,
-     334,   527,  4883,   527,  2186,   530,   529,  2189,   337,   259,
-    3982,  4893,   334,   108,   449,   526,   217,   495,   526,  4850,
-     449,   449,   267,   325,   449,   338,   404,  5235,   217,  4931,
-     217,   404,   251,   404,   291,  4024,   259,   256,   449,  5247,
-    4029,   293,  4031,  5463,  5252,   472,  5254,   353,   353,   469,
-     320,  4882,  4024,   449,  4119,   303,   303,  4029,  4030,  4031,
-     303,   400,  4893,   449,   449,   449,  4029,   449,  4031,   449,
-     449,   217,   400,   292,   449,   449,   400,   449,   117,   400,
-     449,  4030,   412,   449,   449,   277,   277,   277,   527,   277,
-     526,   459,   529,   527,   449,   118,   251,    84,   178,   384,
-      87,   256,   333,   527,   526,   334,  2288,  4079,   529,   527,
-    4082,   111,   217,   449,   217,   229,   244,   336,  5026,   525,
-     138,   526,   277,   278,   400,   472,   400,  4024,   472,   116,
-    4119,   229,  4029,   400,  4031,   122,   409,   292,    89,  4024,
-     337,   215,   215,   208,  4029,   277,  4031,  4119,   277,   234,
-     277,    87,   345,   529,  4642,   234,  4119,   524,   229,   146,
-     483,   340,   488,   335,   234,   242,   526,   529,   323,  4141,
-     527,   527,   389,   527,   527,   512,   527,  4126,   155,   459,
-     229,   336,   277,   111,   339,   472,   283,   449,   128,   529,
-     472,   529,  4164,  4165,  1000,  4208,  4168,   529,   417,   515,
-     267,   441,   404,   515,   459,  4177,   526,  4179,   527,   527,
-     527,   449,   526,  2395,  4248,  1021,   526,  1023,   400,  1025,
-     400,   449,  4119,   210,   449,  1031,  1032,  1033,   449,   449,
-     382,   527,   527,   527,  4119,   526,   128,   491,   229,   146,
-     178,   336,   441,   217,  4216,  4217,  4218,   459,   527,  1055,
-    1056,   277,   277,   277,   526,   277,   367,   491,  4271,  4248,
-     281,   526,   417,   262,   251,   526,   529,   229,   495,   256,
-     529,   527,   151,   441,   449,   459,  4248,   526,   529,    84,
-     239,   178,   526,   529,   525,   527,   409,  5275,   234,   277,
-     527,   510,   277,   277,   513,   514,   515,  4472,   517,   518,
-     519,   520,   521,   522,  4792,   292,   277,   234,  4280,  4797,
-     526,   128,   527,   376,  4802,   489,  2498,  4805,  4806,   489,
-     527,   529,   527,   527,   280,   345,   526,   343,  4277,  4301,
-     526,   280,  2514,   440,  2516,   341,  2518,   128,   330,   245,
-    4312,   527,   515,   526,   459,   449,   527,  4835,   234,   336,
-     527,   491,   146,   261,   515,   510,   325,   325,   513,   514,
-     515,  4849,   517,   518,   519,   520,   521,   522,   128,   101,
-    4342,   529,   441,  2555,   529,    84,   529,  1183,    87,   140,
-    4352,  4353,   101,  4355,   217,   449,   277,  4359,  4360,  5271,
-     449,   449,  4364,  4365,   236,   234,  1202,  4369,   256,   409,
-    4372,  4373,  5304,   111,  4892,  4377,   472,   116,   526,   487,
-     472,  4383,   111,   122,   203,   134,   148,   334,   513,   514,
-     515,  4519,   517,   518,   519,   520,   521,   522,   147,  4401,
-     417,   491,   234,  4405,   491,  4448,   526,   146,   264,  2621,
-    5271,   229,   161,  1249,    70,  4417,   527,   179,  4513,   337,
-    4422,   275,    78,    79,   234,  4943,  4428,   376,    84,   425,
-     477,    87,   351,   490,   280,    91,    92,    93,   200,   157,
-     526,   526,   198,   527,  4446,   527,   526,   334,   526,   211,
-     527,   200,   108,   526,  4433,   111,   527,  4459,   449,   449,
-     116,   526,   211,   377,   526,   526,   122,   192,   229,   231,
-     325,   210,   111,  4475,   236,   325,  4994,   304,   259,   216,
-    4459,   526,   231,   367,   526,   111,   527,   236,   526,   338,
-     146,  4493,   527,   510,  4513,   397,   397,   459,   423,   423,
-     517,   518,   519,   520,   521,   522,   515,   527,  4510,   128,
-     128,  4513,   251,   111,   526,   526,   526,   256,   441,   527,
-    4522,   526,   284,   529,   527,   318,   526,   472,   441,   334,
-     441,    81,   527,   223,   367,  4537,   140,   337,   140,   198,
-    4542,  5059,   476,   305,    84,   491,   376,  4549,   491,   477,
-     111,   526,  2764,   292,   526,  4557,   305,   234,   529,   412,
-    2772,   441,   488,   374,   229,  4567,   203,   261,  2780,   334,
-    2782,   334,   526,   409,    84,   111,   111,    87,   337,   337,
-     128,    91,    92,    93,   526,   236,  4513,   336,   236,   396,
-     190,   470,   527,   526,  4596,   251,   526,   336,  4513,    81,
-     256,   396,    97,   383,   366,   108,   216,   527,   449,   234,
-     527,   526,  4614,   367,   526,   423,   491,   366,  2830,   529,
-     423,   277,   278,   529,   491,   236,   526,   236,  1274,  4631,
-     382,   393,  1990,  2815,  1710,  4614,   292,  3180,   400,  1280,
-    4642,  2674,  1281,  3368,   406,  4029,  2742,  3532,  2860,  1485,
-    1486,   400,  1488,  4118,  5172,  5145,  2868,   406,  4929,  5304,
-     409,  4977,  4162,  4981,  4633,  4961,  3292,   323,  1504,  5389,
-    2959,  4849,  5460,  5409,  5318,  5317,   438,  3296,   417,   441,
-     336,  1245,  2894,   339,  4195,  4209,  2805,  4024,    89,   438,
-    4154,  2805,  3392,  4695,  2061,  4697,   445,   459,  4178,  2799,
-    4658,  3585,  5468,   452,  5561,    84,  5542,  4956,    87,  3540,
-     459,  3535,    91,    92,    93,  5420,  4895,  5290,  2930,  5399,
-    5238,  4898,   484,  2050,   188,  1541,  4280,  5095,  4216,   108,
-    4732,    84,  2529,  3267,    87,   484,  1557,   116,    91,    92,
-      93,  5212,  2264,   122,   992,  5263,  4748,  2264,  3488,  2265,
-    4752,  5434,  5545,  4830,  2424,  4757,   964,  1854,  2425,  2199,
-    1123,   417,  3196,  4197,  4449,   166,  5381,   146,  3917,  1499,
-    3197,   510,  4774,  4775,  2942,  2465,  4778,  1738,   517,   518,
-     519,   520,   521,   522,  1756,  3208,  1755,   188,  3203,  1681,
-    4792,  3864,  5374,  5256,  4431,  4797,  2464,  3218,  1758,  3841,
-    4802,  4392,  5060,  4805,  4806,  4407,  5238,  3839,  5237,  3918,
-    3650,  4813,  4814,  5029,  5332,  1763,  3792,  4821,  5377,  5364,
-    5378,  3200,  3125,  2358,  3035,  3627,   336,  5070,  3123,   655,
-    5355,  2361,  2869,  4835,  4929,  2096,  1388,  2498,   391,  1002,
-    3174,  4843,  1775,  4845,  4823,  2474,  1769,  4849,  2506,  5092,
-    2507,  1553,  2514,  3924,   510,  4432,  3925,   513,   514,   515,
-    3890,   517,   518,   519,   520,   521,   522,  1200,  1704,  1200,
-    1684,  2518,   251,  1709,  1710,   424,  5394,   256,  2955,  1773,
-    4882,  4883,  1220,  2228,     2,  1034,    -1,    -1,  1485,    -1,
-    4892,    -1,    -1,    -1,   875,    -1,    -1,    -1,   277,   278,
-      -1,   882,    -1,  4882,    -1,    -1,    -1,    -1,    78,    -1,
-    4929,  5429,   893,   292,    84,    -1,    -1,  5435,  5436,    89,
-      -1,    -1,    -1,  4966,   277,    -1,    -1,  4929,    -1,  4931,
-      -1,    -1,    -1,    -1,    -1,    -1,  4929,    -1,    -1,    -1,
-     921,  4943,    -1,    -1,   323,   926,   116,  1783,  4991,  1785,
-      -1,    -1,    -1,    -1,    -1,    -1,   937,   336,    -1,    -1,
-     339,    -1,    -1,    -1,    -1,    -1,    -1,  1803,  3180,    -1,
-      -1,    -1,    -1,    -1,  1810,  1811,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   336,    -1,    -1,   130,    -1,    -1,    -1,
-      -1,   161,  4994,    -1,  4996,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4929,   513,   514,   515,    -1,   517,   518,   519,
-     520,   521,   522,    -1,  4929,    -1,    -1,    -1,    -1,   163,
-      -1,  5116,    -1,    -1,  5026,  5027,    -1,  5029,    -1,  5031,
-      -1,    -1,  5550,    -1,    -1,    -1,    -1,    -1,   417,   209,
-    1876,    -1,    -1,    -1,  5562,  5563,    -1,   217,  1884,   219,
-      -1,    -1,    -1,  5055,    -1,    84,    -1,  5059,    87,    -1,
-      -1,    -1,   232,  5065,    -1,    -1,    -1,    -1,  5070,    -1,
-      -1,    -1,    -1,    -1,    84,    -1,   220,    87,    -1,    -1,
-      -1,    91,    92,    93,    -1,    -1,    -1,   116,    -1,    -1,
-    5092,    -1,    -1,   122,    -1,    -1,    -1,  5116,   108,    -1,
-      -1,    -1,    -1,  3315,    -1,    -1,    -1,  1943,    -1,   253,
-    1946,  1947,    -1,    -1,  5116,    -1,    -1,   146,    -1,    -1,
-    5122,    -1,    -1,    -1,  5126,  5127,    -1,    -1,    -1,  5131,
-      -1,   510,    -1,    -1,   513,   514,   515,    -1,   517,   518,
-     519,   520,   521,   522,   288,    -1,   525,    -1,    -1,    -1,
-      -1,  5194,   531,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
-    5172,    -1,    -1,    -1,    -1,    -1,   320,    -1,    -1,  2015,
-      -1,   210,    -1,    -1,    -1,  3397,    -1,    -1,    -1,  5116,
-    5192,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  5116,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5212,  5213,    -1,    -1,    -1,    -1,  1197,  1198,    -1,    -1,
-     390,  5223,   251,    -1,    -1,    -1,  3438,   256,    -1,    -1,
-      -1,    -1,    -1,  5235,    -1,    -1,  5238,    -1,    -1,    -1,
-      -1,    -1,   386,  5486,   388,  5247,   390,    -1,    -1,    -1,
-    5252,    -1,  5254,   397,  5256,   425,    -1,    -1,  2094,    -1,
-     404,  5263,    -1,   292,    -1,    -1,    -1,   277,   412,    -1,
-      -1,    -1,    -1,    -1,    -1,  3487,    -1,    -1,    -1,  5281,
-     424,    -1,  2118,    -1,    -1,    -1,    -1,    -1,   432,    -1,
-      -1,    -1,  2128,    -1,  2130,    -1,    -1,  3509,    -1,    -1,
-      -1,  2137,  5304,    -1,  3516,  3517,  2142,   336,  3520,    -1,
-      -1,    -1,    -1,    -1,    -1,  3527,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3536,    -1,   336,    -1,    -1,  3541,
-    5332,    -1,    -1,    -1,  3546,    -1,  3548,    -1,    -1,    -1,
-      -1,    -1,   486,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2186,    -1,    -1,  2189,    -1,    -1,    -1,    -1,    -1,  5434,
-      -1,  5363,  5364,    -1,  5434,  5434,  5434,    -1,    78,    -1,
-      -1,    -1,  5374,    -1,  3586,    -1,    -1,    -1,  5421,    -1,
-    5382,    -1,    -1,    -1,    -1,  5480,    84,    -1,   417,    87,
-      -1,  5434,  5394,    91,    92,    93,    -1,    -1,    -1,    84,
-      -1,    -1,    87,  3615,  3616,    -1,    91,    92,    93,    -1,
-     108,  5486,    -1,    -1,    -1,    78,  5486,  5486,  5486,    -1,
-      -1,    84,    -1,   108,    -1,    -1,    89,  5429,    -1,    -1,
-      -1,    -1,  3644,  5435,  5436,    -1,  5438,    -1,   148,    -1,
-      -1,    -1,    -1,  5486,    -1,    -1,    -1,  5542,    -1,  2285,
-    2286,    -1,    -1,   116,   164,  5457,  2292,  2293,    -1,    -1,
-      -1,  5480,    -1,    -1,    -1,    -1,  5561,    -1,    -1,    -1,
-    5545,    -1,    -1,    -1,    -1,  5545,  5545,  5545,  5480,    -1,
-      -1,   510,    -1,    -1,    -1,  2321,    -1,  5480,   517,   518,
-     519,   520,   521,   522,    -1,    -1,    -1,    -1,   161,    -1,
-      -1,  5480,  5545,   513,   514,   515,    -1,   517,   518,   519,
-     520,   521,   522,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5542,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5536,  5537,    -1,    -1,    -1,   249,
-    5542,  2377,  5561,    -1,    -1,    -1,    -1,    -1,  5550,  5542,
-      -1,    -1,    -1,  5480,    -1,    -1,    -1,    -1,    -1,  5561,
-    5562,  5563,    -1,  5542,    -1,  5480,    -1,    -1,  5561,   232,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   277,
-      -1,    -1,  5561,    -1,    -1,    -1,    -1,  3799,    -1,    -1,
-      -1,    -1,   277,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2441,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  5542,    -1,    -1,    -1,    -1,
-    1021,    -1,  1023,    -1,  1025,    -1,    -1,  5542,    -1,    -1,
-    1031,    -1,    -1,    84,  5561,    -1,    87,    -1,   336,    -1,
-      91,    92,    93,    -1,    -1,    -1,  5561,    -1,    -1,    -1,
-      -1,   336,    -1,    -1,  1055,  1056,    -1,   108,  2494,    -1,
-      -1,    -1,    -1,    -1,    -1,   116,   376,    -1,    -1,    -1,
-      -1,   122,   382,    -1,    -1,    -1,    -1,    -1,  2514,    -1,
-    2516,    -1,  2518,    -1,    -1,    -1,    -1,   857,    -1,    -1,
-      84,   861,    -1,    87,    -1,   146,    -1,    91,    92,    93,
-      -1,    -1,    -1,    -1,    -1,   875,    -1,    -1,    -1,    -1,
-      -1,    -1,   882,    -1,   108,    84,    -1,    -1,    87,  2555,
-      -1,    -1,   116,   893,    -1,    -1,    -1,   390,   122,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    84,    -1,    -1,    87,    -1,    -1,   116,    91,    92,
-      93,   921,   146,   122,    -1,    -1,   926,    -1,    -1,    -1,
-      -1,    -1,   425,    -1,    -1,   108,    -1,   937,    -1,    -1,
-      -1,    -1,    -1,   116,    -1,    -1,    -1,   146,    -1,   122,
-      -1,    -1,  1183,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   963,    -1,    -1,  1197,  1198,    -1,    -1,
-     251,  1202,    -1,   146,    -1,   256,    -1,    -1,   978,    -1,
-      -1,    -1,  1793,    -1,   984,   513,   514,   515,  4030,   517,
-     518,   519,   520,   521,   522,   995,   277,   278,   513,   514,
-     515,    -1,   517,   518,   519,   520,   521,   522,    -1,  1009,
-      -1,   292,    -1,    -1,    -1,    -1,    -1,  4059,  1249,    -1,
-    4062,    -1,  4064,    -1,    -1,    -1,    -1,   251,    -1,    -1,
-      -1,    -1,   256,    -1,    -1,  2701,    -1,    -1,    -1,    -1,
-      -1,    -1,   323,  2709,    -1,  2711,    -1,    -1,    -1,    -1,
-      -1,    -1,   251,   277,   278,   336,    -1,   256,   339,    -1,
-      -1,    -1,    -1,    -1,    -1,  4107,    -1,    -1,   292,    -1,
-      -1,  4113,  4114,    -1,  4116,    -1,  4118,    -1,   251,    -1,
-      -1,    -1,    -1,   256,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,    -1,    -1,    -1,   323,
-      -1,    -1,    -1,    -1,   277,   278,  1106,    -1,  1108,    -1,
-    1110,    -1,   336,    -1,    -1,   339,    -1,    -1,    -1,   292,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1129,
-      -1,    -1,    -1,    -1,    -1,    -1,   417,   336,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     323,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   336,    84,    -1,   339,    87,    -1,    -1,
-    4212,    91,    92,    93,    -1,    -1,  1987,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,    -1,
-      -1,    -1,    -1,   417,    -1,    -1,   116,  1197,  1198,    -1,
-      -1,    -1,   122,    -1,    -1,    -1,    -1,  4249,  4250,  4251,
-    4252,  4253,    -1,    -1,    -1,    -1,    -1,    -1,   417,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   146,  2893,  2894,   510,
-      -1,    -1,   513,   514,   515,    -1,   517,   518,   519,   520,
-     521,   522,    -1,    -1,   417,    -1,    -1,  2058,   529,    -1,
-      -1,  2062,  4294,    -1,    -1,  4297,    -1,  4299,    -1,    -1,
-      -1,    -1,    -1,  2074,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1504,    -1,    -1,    -1,    -1,    -1,    -1,
-    1280,  1281,    -1,    -1,    -1,    -1,   510,    -1,    -1,   513,
-     514,   515,    -1,   517,   518,   519,   520,   521,   522,    -1,
-      -1,    -1,    -1,   527,    -1,  2971,    -1,    -1,    -1,    -1,
-      -1,   510,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,
-     519,   520,   521,   522,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   251,    -1,    -1,    -1,    -1,   256,   510,    -1,  2150,
-     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
-      -1,    -1,    84,    -1,   527,    87,    -1,   277,   278,    91,
-      92,    93,    -1,    -1,   857,    -1,    -1,  2178,   861,    -1,
-      -1,    -1,   292,    -1,    -1,    -1,   108,    -1,    -1,    -1,
-      -1,    -1,   875,    -1,   116,    -1,    -1,    -1,  4430,   882,
-     122,  4433,  4434,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     893,    -1,    -1,   323,    -1,    -1,    -1,    -1,  1428,    -1,
-      -1,    -1,    -1,    -1,   146,    -1,   336,  4459,    -1,   339,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   921,    -1,
-      -1,    -1,    -1,   926,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   937,    -1,    -1,    -1,    -1,  1469,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1477,    -1,    -1,
-      -1,  1461,    -1,  1483,    -1,    -1,    -1,    -1,  1008,  1009,
-     963,    -1,    -1,  1704,    -1,    -1,    -1,    -1,  1709,  1710,
-      -1,  1481,    -1,    -1,    -1,   978,    -1,    -1,    -1,    -1,
-      -1,   984,    -1,    -1,    -1,    84,    -1,   417,    87,    -1,
-      -1,    -1,   995,    -1,  1504,    -1,    -1,    -1,    -1,  3175,
-      -1,    -1,  3178,    -1,  3180,    -1,  1009,    -1,    -1,   251,
-      -1,    -1,    -1,    -1,   256,    -1,    -1,   116,    -1,    -1,
-      -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,    -1,    -1,
-    1540,    -1,    -1,    -1,    -1,   277,   278,    -1,    -1,    -1,
-      -1,    -1,  4594,  4595,    -1,    -1,  1556,   146,    -1,    -1,
-     292,  4603,  1793,  4605,  4606,    -1,    -1,  4609,    -1,    -1,
-      -1,  1571,  4614,    -1,  1574,    -1,  4618,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     510,   323,    -1,   513,   514,   515,    -1,   517,   518,   519,
-     520,   521,   522,    -1,   336,  1145,    -1,   527,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1108,    -1,    -1,    -1,    -1,
-      -1,   210,    -1,  4665,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1129,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   973,  1876,    -1,    -1,    -1,    -1,
-      -1,    -1,  4694,  1884,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   251,    -1,    -1,   994,    -1,   256,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   417,    -1,  2498,    -1,    -1,
-      -1,  4733,    -1,    -1,    -1,  4737,  4738,    -1,  4740,    -1,
-      -1,  1701,    -1,   292,  1197,  1198,    -1,    -1,    -1,  1709,
-    1710,    -1,  1943,    -1,    -1,  1946,  1947,    -1,    -1,    -1,
-    1720,    -1,    -1,    -1,    -1,    -1,    -1,  2538,    -1,    -1,
-      -1,    -1,  2543,    -1,    -1,    -1,  2547,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   336,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2573,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1773,  1774,  1775,    -1,    -1,   510,    -1,
-      -1,   513,   514,   515,  2015,   517,   518,   519,   520,   521,
-     522,    -1,    -1,  1793,    -1,    -1,    -1,    -1,    -1,    -1,
-      84,    -1,    -1,    87,  2615,    -1,    -1,    91,    92,    93,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2632,    -1,  1823,   108,    -1,    -1,    -1,   417,    -1,
-    1830,    -1,   116,    -1,    -1,    -1,    -1,  1837,   122,    -1,
-    4882,    -1,    -1,    -1,   111,    -1,    -1,  1847,    -1,    -1,
-      -1,  2662,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   146,   130,    -1,    -1,    -1,    -1,    -1,    -1,
-    3536,    -1,    -1,    -1,    -1,  3541,    -1,    -1,  4920,    -1,
-      -1,  2692,    -1,    -1,    -1,  2696,  1886,    -1,    -1,  4931,
-      -1,    -1,    -1,  4935,    -1,  4937,   163,  3563,    -1,  4941,
-    4942,    -1,    -1,  2714,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2725,    -1,    -1,    84,    -1,    -1,
-      87,   510,    -1,    -1,    91,    92,    93,  2738,   517,   518,
-     519,   520,   521,   522,    -1,  2746,    -1,    -1,    -1,    -1,
-      -1,   108,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   116,
-      -1,    -1,    -1,   220,    -1,   122,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1506,   251,  1461,    -1,
-      -1,  3637,   256,    -1,    -1,    -1,    -1,    -1,  3644,   146,
-      -1,    -1,    -1,    -1,  1313,    -1,   253,  1987,  1481,  1989,
-      -1,    -1,    -1,   277,   278,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1333,    -1,    -1,    -1,   292,    -1,
-      -1,  1504,    -1,  1342,    -1,    -1,   283,    -1,    -1,    -1,
-      98,   288,    -1,    -1,    -1,    -1,   104,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2037,    -1,   323,
-      -1,  1581,    -1,    -1,    -1,    -1,    -1,  1540,    -1,    -1,
-      -1,    -1,   336,   320,  3720,   339,    -1,    -1,  2058,    -1,
-    1600,    -1,  2062,  1556,    -1,    -1,   144,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2074,    -1,    -1,    -1,  1571,    -1,
-      -1,  1574,    -1,  2103,   251,    -1,    -1,    -1,    -1,   256,
-    1630,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5146,  1645,    -1,    -1,    -1,    -1,
-     277,   278,    -1,    -1,    -1,    -1,    -1,   195,    -1,   386,
-      -1,    -1,    -1,   390,   202,   292,    -1,   205,  2148,    -1,
-     397,    -1,  2152,   417,    -1,    -1,    -1,   404,  2158,  2159,
-      -1,    -1,    -1,    -1,    -1,   412,    -1,    -1,   111,  2149,
-    2150,    -1,   230,    -1,    -1,    -1,   323,   424,    -1,    -1,
-      -1,  2181,  2162,    -1,    -1,   432,  2977,   130,    -1,   336,
-      -1,    -1,   339,    -1,    -1,    -1,    -1,  2177,  2178,    -1,
-      -1,    -1,    -1,   261,    -1,   452,    -1,    -1,  2999,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3007,    -1,    -1,  2199,
-     163,    -1,    -1,    -1,    -1,    -1,  1746,  1747,  1701,  1749,
-    2441,    -1,    -1,    -1,    -1,    -1,  1709,  1710,    -1,   486,
-      -1,    -1,    -1,   490,   491,  1554,   510,  1720,    -1,   513,
-     514,   515,    -1,   517,   518,   519,   520,   521,   522,    -1,
-     318,    -1,   320,   527,    -1,    -1,    -1,    -1,    -1,    -1,
-     417,    -1,   330,    -1,    -1,  3921,    -1,   220,    -1,    -1,
-     338,    -1,  5304,  2494,    -1,    -1,    -1,  2498,    -1,    -1,
-     348,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1773,  1774,  1775,  2514,    -1,    -1,    -1,    -1,    -1,    -1,
-     253,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1793,    -1,    -1,    -1,   382,    -1,    -1,   385,   386,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     283,    -1,    -1,    -1,  2555,   288,    -1,    -1,    -1,  2329,
-    1823,    -1,    -1,    -1,   412,    -1,    -1,  1830,    -1,    -1,
-      -1,    -1,    -1,   510,  1837,    -1,   513,   514,   515,    -1,
-     517,   518,   519,   520,   521,   522,    -1,   320,    -1,    -1,
-     527,    -1,    -1,    -1,  4030,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    84,    -1,    -1,    87,    -1,    -1,    -1,    91,
-      92,    93,  4058,    -1,    -1,    -1,    -1,   475,    -1,    -1,
-      -1,  2421,    89,    -1,    -1,    -1,   108,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,    -1,    -1,
-     122,    -1,  2422,   386,    -1,    -1,    -1,   390,    -1,   116,
-      -1,    -1,    -1,    -1,   397,    -1,    -1,    -1,  5480,    -1,
-      -1,   404,    -1,    -1,   146,    -1,    -1,    -1,    -1,   412,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3269,  4125,
-    4126,   424,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   432,
-    2701,    -1,    -1,    -1,   161,    -1,    -1,  2477,  2709,  2479,
-    2711,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   452,
-      -1,    -1,    -1,    -1,  1987,    -1,    -1,    -1,  2498,    -1,
-    5542,  3312,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5561,
-      -1,    -1,   209,   486,    -1,    -1,    -1,   490,    -1,    -1,
-     217,    -1,   219,    -1,    -1,    -1,    -1,    -1,  2538,    -1,
-      -1,    -1,  2542,  2543,  2037,   232,    -1,  2547,    -1,   251,
-      -1,    -1,    -1,    -1,   256,  2555,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2058,    -1,    -1,    -1,  2062,
-      -1,    -1,    -1,  2573,    -1,   277,   278,    -1,    -1,    -1,
-      -1,  2074,    -1,  4249,  4250,  4251,  4252,  4253,    -1,    -1,
-     292,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1927,    -1,
-      -1,    -1,    -1,    -1,  3415,    -1,    -1,    -1,    -1,    -1,
-      -1,  4277,    -1,    -1,    -1,  2615,  3427,    -1,    -1,    -1,
-      -1,   323,    -1,    -1,    -1,    -1,  2626,    -1,    -1,    -1,
-      -1,    -1,  2632,  2633,   336,    -1,    -1,   339,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2149,  2150,  2198,    -1,
-      -1,  2661,  2662,    -1,    -1,  2665,    -1,    -1,    -1,  2162,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2008,
-      -1,    -1,    -1,    -1,  2177,  2178,    -1,    -1,    -1,   111,
-      -1,    -1,  2692,  3504,  2023,    84,  2696,    -1,    87,    -1,
-      -1,    -1,    91,    92,    93,    -1,  2199,    -1,   130,    -1,
-      -1,    -1,    -1,  2042,  2714,   417,    -1,    -1,    -1,   108,
-      -1,  2261,    -1,    -1,    -1,  2725,    -1,   116,    -1,    -1,
-      -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,  2738,    -1,
-    2971,   163,    -1,    -1,    -1,    -1,  2746,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,    -1,
-    2089,    -1,    -1,    -1,    -1,    -1,    -1,  4433,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2108,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2120,    -1,  4459,  2334,    -1,    -1,    -1,   220,    -1,
-      -1,    -1,  2802,  2132,    -1,    -1,    -1,    -1,   510,    -1,
-      -1,   513,   514,   515,    -1,   517,   518,   519,   520,   521,
-     522,    -1,    -1,    -1,    -1,   527,    -1,    -1,    -1,    -1,
-      -1,   253,    -1,    -1,    -1,    -1,  2329,    -1,    -1,    -1,
-      -1,    -1,    -1,  2172,    -1,    -1,  2175,    -1,    -1,    -1,
-      -1,    -1,    -1,  4519,    -1,    -1,    -1,    -1,    -1,    -1,
-    3671,   283,   251,  2883,    -1,    -1,   288,   256,  2868,    -1,
-      -1,    -1,    -1,    -1,  4540,  4541,    -1,  3688,    -1,  4545,
-    4546,    -1,  2902,    -1,    -1,    -1,    -1,    -1,   277,   278,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2917,   320,    -1,
-    2920,  2921,  3713,   292,    -1,  2925,  2926,    84,    -1,    -1,
-      87,    -1,  2932,    -1,    91,    92,    93,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2467,    -1,  2422,
-    2930,   108,    -1,    -1,   323,    -1,    -1,    -1,    -1,   116,
-      -1,    -1,    -1,    -1,    -1,   122,    -1,   336,  4614,  3180,
-     339,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   386,    -1,    -1,    -1,   390,   146,
-      -1,    -1,    -1,    -1,    -1,   397,    -1,  2977,    -1,    -1,
-      -1,    -1,   404,    -1,  2477,    -1,  2479,    -1,    -1,  3009,
-     412,    -1,    -1,    -1,    -1,  2324,    -1,    -1,    -1,  2999,
-      -1,    -1,   424,    -1,    -1,  2498,    -1,  3007,    -1,    -1,
-     432,    -1,    -1,    -1,    -1,    84,    -1,    -1,    87,    -1,
-      -1,    -1,    91,    92,    93,    -1,    -1,    -1,   417,    -1,
-     452,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,
-      -1,    -1,    -1,    -1,    -1,  2538,    -1,   116,    -1,  2542,
-    2543,    -1,    -1,   122,  2547,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2555,    -1,   486,    -1,    -1,    -1,   490,    -1,
-      -1,    -1,    -1,    -1,   251,    -1,    -1,   146,    -1,   256,
-    2573,    -1,    -1,  3083,    -1,    -1,    -1,    -1,    -1,  3089,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     277,   278,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   292,    -1,    -1,    -1,    -1,
-      -1,   510,  2615,    -1,   513,   514,   515,    -1,   517,   518,
-     519,   520,   521,   522,    -1,    -1,    -1,    -1,   527,  2632,
-    2633,    -1,    -1,    -1,    -1,    -1,   323,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4823,    -1,   336,
-      -1,    -1,   339,    -1,    -1,    -1,    -1,    -1,  2661,  2662,
-     857,  3982,  2665,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3180,    -1,   251,    -1,    -1,    -1,    -1,   256,   875,    -1,
-      -1,    -1,    -1,    -1,    -1,   882,    -1,    -1,    -1,  2692,
-      -1,    -1,    -1,  2696,    -1,    -1,   893,    -1,   277,   278,
-      -1,    -1,    -1,    -1,    -1,    -1,  4882,    -1,    -1,    -1,
-      -1,  2714,    -1,   292,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2725,    -1,   921,    -1,    -1,    -1,    -1,   926,
-     417,    -1,    -1,    -1,    -1,  2738,    -1,    -1,    -1,    -1,
-     937,    -1,    -1,  2746,   323,    98,    -1,    -1,    -1,    -1,
-      -1,   104,  2591,    -1,    -1,    -1,    -1,   336,  4079,  3269,
-     339,  4082,    -1,    -1,  2603,    -1,   963,    -1,    -1,    -1,
-      -1,  3301,    -1,    -1,    -1,  3285,  3286,    -1,    -1,    -1,
-      -1,   978,    -1,    -1,    -1,    -1,    -1,   984,    -1,    -1,
-      -1,   144,    -1,    -1,    -1,  3536,    -1,    -1,   995,  2802,
-    3541,  2640,  3312,    -1,    -1,  3315,    -1,    -1,    -1,    -1,
-      -1,    -1,  1009,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   510,    -1,    -1,   513,   514,   515,    -1,
-     517,   518,   519,   520,   521,   522,    -1,    -1,   417,    -1,
-     527,    -1,   195,    -1,    -1,    -1,  3376,    -1,  3378,   202,
-      -1,    -1,   205,    -1,    -1,    -1,    -1,    -1,  4179,    -1,
-      -1,    -1,    -1,    -1,    -1,  2868,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   230,    -1,    -1,
-      -1,  3391,  3392,  3393,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3415,    -1,    -1,   261,  1106,
-      -1,  1108,    -1,  1110,    -1,    -1,    -1,  3427,    -1,    -1,
-      -1,  3431,    -1,    -1,    -1,    -1,    -1,  2930,    -1,    -1,
-    3440,   510,    -1,    -1,   513,   514,   515,    -1,   517,   518,
-     519,   520,   521,   522,    -1,    -1,    -1,    -1,   527,    -1,
-      -1,    -1,    -1,    -1,  3484,  2794,    -1,    -1,    -1,  4280,
-    3490,    -1,    -1,    -1,    -1,   318,    -1,   320,    -1,    -1,
-      -1,    -1,    -1,    -1,  2977,    -1,    -1,   330,    -1,  3720,
-      -1,    -1,    -1,    -1,    -1,   338,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3504,   348,  2999,    -1,    -1,    -1,
-    1197,  1198,    -1,    -1,  3007,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3064,    -1,    84,    -1,    -1,    87,
-      -1,    -1,    -1,    91,    92,    93,    -1,    -1,    -1,   382,
-    3540,    -1,   385,   386,    -1,    -1,  3546,    -1,  3548,   101,
-     108,    -1,    -1,    -1,    -1,    -1,    -1,  5223,   116,    -1,
-    3560,   113,  3562,    -1,   122,    -1,    -1,    -1,  3108,   412,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   134,    -1,    -1,  3125,    -1,    -1,   146,    -1,
-    3083,    -1,    -1,  1280,  1281,   147,  3089,    -1,    -1,    -1,
-      -1,  3141,    -1,    -1,    -1,   157,    -1,    -1,    -1,   161,
-      -1,  3631,    -1,    -1,    -1,    -1,  3616,  3157,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   179,    -1,    -1,
-      -1,    -1,   475,   185,  3654,  3655,    -1,  3657,    -1,  3659,
-    3660,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   200,    -1,
-      -1,    -1,  3672,    -1,    -1,    -1,  3196,    -1,    -1,   211,
-      -1,    -1,    -1,    -1,  2993,    -1,    -1,   219,    -1,    -1,
-      -1,  3671,    -1,    -1,    -1,    -1,    -1,    -1,  3218,   231,
-      -1,  3221,    -1,    -1,    -1,  3014,   238,  3180,  3688,    -1,
-     242,    -1,  3712,   251,    -1,    -1,  3025,    -1,   256,    -1,
-      -1,    -1,    -1,    98,    -1,    -1,    -1,   259,    -1,   104,
-    3710,    -1,    -1,  3713,    -1,    -1,    -1,    -1,    -1,   277,
-     278,    -1,    -1,    -1,    -1,    -1,  4537,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   292,    -1,    -1,    -1,  4549,    -1,
-      -1,    -1,    -1,    -1,   296,    -1,    -1,    -1,    -1,   144,
-      -1,    -1,    -1,   305,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   323,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1461,    -1,  3269,    -1,   336,    -1,
-      -1,   339,    -1,    -1,   336,    -1,    -1,   339,    -1,    -1,
-    3790,    -1,  3285,  3286,  1481,    -1,    -1,    -1,    -1,  4030,
-     195,    -1,    -1,    -1,   356,    -1,    -1,   202,    -1,    -1,
-     205,    -1,    -1,    -1,  5480,    -1,    -1,  1504,    -1,  3312,
-      -1,    -1,  3315,   375,    -1,    -1,    -1,  4058,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   230,    -1,    -1,    -1,    -1,
-      -1,   393,    -1,    -1,    -1,    -1,    -1,    -1,   400,    -1,
-      -1,    -1,    -1,  1540,   406,    -1,    -1,   409,    -1,   417,
-      -1,    -1,    -1,    -1,    -1,    -1,   261,    -1,    -1,  1556,
-      -1,    -1,    -1,    -1,    -1,    -1,  5542,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1571,    -1,   438,  1574,    -1,   441,
-     442,    -1,   444,   445,    -1,  5561,    -1,    -1,  3391,  3392,
-    3393,    -1,   454,    -1,    -1,    -1,    -1,   459,    -1,    -1,
-      -1,    -1,    -1,   465,    -1,    -1,   468,    -1,    -1,   471,
-      -1,  4732,  3415,   318,    -1,   320,    -1,    -1,    -1,    -1,
-      -1,    -1,   484,    -1,  3427,   330,    -1,    -1,  3431,    -1,
-      -1,    -1,    -1,   338,    -1,    -1,    -1,  3440,    -1,    -1,
-      -1,    -1,   510,   348,    -1,   513,   514,   515,    -1,   517,
-     518,   519,   520,   521,   522,    -1,    -1,    -1,    -1,   527,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,
-      87,    -1,  3982,    -1,    91,    92,    93,   382,    -1,  3318,
-     385,   386,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,
-      -1,   108,    -1,    -1,    -1,    -1,  3335,    -1,    -1,   116,
-      -1,  3504,    -1,    -1,  1701,   122,    -1,   412,    -1,    -1,
-      -1,    -1,  1709,  1710,  4024,    -1,    -1,    -1,    -1,  4029,
-      -1,  4031,  4843,  1720,  4845,    -1,    -1,    -1,    -1,   146,
-      -1,    -1,    -1,    -1,    -1,   147,  4277,  3540,    -1,    -1,
-      -1,    -1,    -1,  3546,    -1,  3548,  3596,    -1,    -1,   161,
-      -1,    -1,    -1,    -1,    -1,    -1,  3606,  3560,    -1,  3562,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   179,    -1,  4079,
-     475,    -1,  4082,   185,    -1,    -1,  1773,    -1,    -1,    -1,
-    3630,    -1,    -1,    -1,    -1,  3424,    -1,  3426,   200,    -1,
-      -1,    -1,    -1,    -1,    -1,    98,  1793,    -1,    -1,   211,
-      -1,   104,    -1,    -1,    -1,    -1,    -1,   219,    -1,  4119,
-      -1,    -1,    -1,  3616,    -1,    -1,    -1,    -1,    -1,   231,
-      -1,    -1,    -1,    -1,   236,    -1,   129,    -1,    -1,    -1,
-     242,    -1,    -1,    -1,   251,    -1,    -1,    -1,    -1,   256,
-    1837,   144,    -1,    -1,    -1,    -1,  3485,   259,    -1,    -1,
-    1847,    -1,    -1,    -1,  4164,  4165,    -1,    -1,    -1,    -1,
-     277,   278,    -1,    -1,    -1,    -1,    -1,  4177,  3671,  4179,
-      -1,  3510,   284,    -1,   177,   292,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3688,    -1,    -1,    -1,  1886,
-      -1,    -1,   195,   305,    -1,    -1,    -1,   866,   867,   202,
-      -1,   870,   205,   872,    -1,    -1,   323,  3710,    -1,    -1,
-    3713,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   336,
-      -1,    -1,   339,   892,   336,    -1,  4256,   230,    -1,    -1,
-      -1,    -1,    -1,    -1,  4264,  4265,  4266,  4267,  4248,    -1,
-      -1,    -1,    -1,   912,   356,    -1,    -1,   916,    -1,    -1,
-      -1,    -1,    -1,    -1,   366,   258,    98,    -1,   261,    -1,
-    3599,    -1,   104,    -1,    -1,   934,    -1,    -1,    -1,    -1,
-    4280,    -1,    -1,  3823,    -1,    -1,    -1,    -1,  4519,    -1,
-      -1,   393,    -1,    -1,    -1,    -1,   398,  3790,   400,  3839,
-    1987,  3841,  1989,  3632,   406,    -1,    -1,   409,    -1,    -1,
-     417,    -1,   144,   306,    -1,   308,    -1,    -1,    -1,    -1,
-      98,    -1,    -1,    -1,    -1,   318,   104,   320,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   437,   438,   330,    -1,   441,
-      -1,    -1,    -1,   445,    -1,   338,    -1,    -1,    -1,    -1,
-    2037,   129,   454,    -1,   347,   348,    -1,   459,    -1,    -1,
-      -1,    -1,    -1,   195,    -1,    -1,   144,    -1,    -1,   471,
-     202,  2058,    -1,   205,    -1,  2062,    -1,    -1,    -1,    -1,
-      -1,    -1,   484,  4614,    -1,    -1,    -1,  2074,    -1,   382,
-      -1,    -1,   385,   386,   387,    -1,    -1,    -1,   230,   177,
-      -1,    -1,    -1,   510,  3733,    -1,   513,   514,   515,    -1,
-     517,   518,   519,   520,   521,   522,    -1,   195,    -1,   412,
-     527,    -1,    -1,    -1,   202,  3754,    -1,   205,    -1,   261,
-      -1,    -1,    -1,   426,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3779,    -1,   230,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2149,  2150,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4491,    -1,    -1,    -1,  2162,    -1,    -1,    -1,    -1,
-     258,    -1,   475,   261,  3813,    -1,   318,    -1,   320,  3982,
-    2177,  2178,    -1,    -1,    -1,    -1,    -1,    -1,   330,    -1,
-      -1,    -1,    -1,  4523,  4524,    -1,   338,    -1,    -1,    -1,
-    4510,    -1,  2199,  4513,    -1,    -1,   348,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   306,    -1,
-     308,  4024,    -1,    -1,    -1,    -1,  4029,  4537,  4031,    -1,
-     318,    -1,   320,    -1,    -1,    -1,    -1,    -1,    -1,  4549,
-     382,    -1,   330,   385,   386,    -1,    -1,    -1,    -1,    -1,
-     338,    -1,    -1,    -1,    -1,    -1,    -1,  4567,    -1,   347,
-     348,  5382,    -1,    -1,    -1,    -1,    -1,  4597,  4598,    -1,
-     412,    -1,    -1,    -1,    -1,    -1,  4079,    -1,    -1,  4082,
-      -1,    -1,    -1,    -1,    -1,    -1,  1255,  1256,    -1,    -1,
-      -1,    -1,    -1,    -1,   382,    -1,    -1,   385,   386,   387,
-      -1,    -1,    -1,    -1,  4614,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4119,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   412,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2329,   475,    -1,    -1,    -1,    -1,   426,    -1,
-      -1,  4882,    -1,    -1,    -1,    84,    -1,    -1,    87,    -1,
-      -1,    -1,    91,    92,    93,    -1,    -1,    -1,  4208,    -1,
-      -1,  4164,  4165,    -1,    -1,    -1,    -1,  1336,    -1,   108,
-      -1,    -1,    -1,    -1,  4177,  4705,  4179,   116,    -1,    -1,
-      -1,    -1,    -1,   122,    -1,  4715,  4716,   475,  1357,  1358,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      98,  4731,    -1,    -1,    -1,    -1,   104,   146,    -1,  1378,
-      -1,     5,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4271,  4732,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    25,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    35,    36,    -1,    -1,  4248,   144,    -1,    42,    43,
-      -1,    -1,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    70,  4280,    -1,    -1,
-      74,    75,    76,    77,    78,    79,    80,    81,  1457,  1458,
-      -1,    85,    -1,    -1,    -1,    -1,    -1,   195,    -1,    -1,
-      -1,  2498,    -1,    -1,   202,    -1,    -1,   205,    -1,    -1,
-      -1,    -1,   251,    -1,    -1,    -1,    -1,   256,    -1,    -1,
-      98,    -1,    -1,    -1,    -1,    -1,   104,    -1,    -1,  4168,
-      -1,    -1,   230,  4843,    -1,  4845,    -1,    -1,   277,   278,
-      -1,  2538,    -1,   137,    -1,  2542,  2543,    -1,    -1,    -1,
-    2547,  4401,    -1,   292,    -1,  4405,    -1,    -1,  2555,    -1,
-      -1,    -1,    -1,   261,    -1,    -1,   144,    -1,    -1,    -1,
-      -1,    -1,    -1,  4883,    -1,    -1,  2573,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   323,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   336,  4448,    -1,
-     339,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   209,    -1,   195,  2615,  4929,
-     318,  4931,   320,    -1,   202,    -1,    -1,   205,    -1,  2626,
-      -1,    -1,   330,   227,    -1,  2632,  2633,    -1,    -1,    -1,
-     338,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     348,    -1,   230,    -1,   248,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2661,  2662,    -1,    -1,  2665,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   271,   417,    -1,
-      -1,    -1,  5223,   261,   382,    -1,    -1,   385,   386,  5019,
-      -1,    -1,    -1,    -1,    -1,  2692,    -1,    -1,    -1,  2696,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4510,    -1,    -1,
-    4513,    -1,    -1,   307,   412,    -1,   310,  2714,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4365,    -1,  2725,    -1,
-      -1,   325,    -1,    -1,  4537,    -1,    -1,    -1,    -1,    -1,
-     318,  2738,   320,    -1,    -1,    -1,  4549,    -1,    -1,  2746,
-      -1,    -1,   330,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     338,    -1,    -1,    -1,  4567,    -1,    -1,  5097,    -1,    -1,
-     348,   510,    -1,    -1,   513,   514,   515,   475,   517,   518,
-     519,   520,   521,   522,    -1,    -1,    -1,    -1,   527,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   382,  2802,  5116,   385,   386,   403,
-      -1,  4614,    -1,  5143,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    84,    -1,    -1,    87,    -1,    -1,
-      -1,    91,    92,    93,   412,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,    -1,
-      -1,    -1,    -1,    -1,  4493,   449,   116,    -1,    -1,    -1,
-      -1,    -1,   122,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     464,  2868,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4522,    -1,   479,   146,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   475,    -1,    -1,
-      -1,    -1,    -1,  4542,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   507,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   515,    -1,   517,   518,   519,   520,   521,    -1,  4732,
-     524,   525,   526,  2930,    -1,    -1,    84,   531,   532,    87,
-      -1,  1910,    -1,    91,    92,    93,    -1,  4797,    -1,    -1,
-      -1,    -1,  4802,    -1,    -1,  4805,    -1,  4596,    -1,    -1,
-     108,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   116,    -1,
-      -1,    -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,    -1,
-    2977,    -1,    -1,    -1,    -1,    -1,    -1,  4837,    -1,    -1,
-      -1,   251,    -1,    -1,  5304,    -1,   256,    -1,   146,    -1,
-      -1,    -1,  2999,    -1,    -1,  1974,  1975,  1976,  1977,    -1,
-    3007,    -1,    -1,    -1,    -1,    -1,    -1,   277,   278,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   292,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4843,    -1,  4845,    -1,    -1,    -1,    -1,    94,  2017,  2018,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2026,  4697,    -1,
-      -1,    -1,    -1,   323,    -1,    -1,    -1,  2036,    -1,    -1,
-      -1,    -1,  5382,    -1,    -1,    -1,   336,    -1,    -1,   339,
-    4883,    -1,    -1,    -1,   131,    -1,  3083,    -1,    -1,    -1,
-      -1,    -1,  3089,    -1,    -1,  2064,  2065,  2066,  2067,    -1,
-      -1,    -1,    -1,   251,    -1,   152,    -1,    -1,   256,    -1,
-      -1,    -1,    -1,  4752,    -1,    -1,  4966,    -1,    -1,    -1,
-      -1,    -1,    -1,   170,    -1,  5455,  4929,    -1,  4931,   277,
-     278,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   185,    -1,
-      -1,  4991,    -1,    -1,   292,    -1,   193,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   417,    -1,    -1,
-      -1,   208,    -1,   210,    -1,    -1,    -1,   214,    -1,    -1,
-    5480,    -1,    -1,    -1,    -1,   323,    -1,   224,    -1,    -1,
-      -1,    -1,    -1,  3180,    -1,    -1,   233,    -1,   336,    -1,
-      -1,   339,  2161,    -1,    -1,  2164,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2174,    -1,    -1,    84,  5059,
-      -1,    87,    -1,    -1,  2183,    91,    92,    93,    -1,    -1,
-    5070,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5542,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     116,    -1,  5092,    -1,    -1,    -1,   122,    -1,    -1,    -1,
-     510,  5561,    -1,   513,   514,   515,    -1,   517,   518,   519,
-     520,   521,   522,    -1,    -1,    -1,    -1,   527,    -1,   417,
-     146,    -1,  3269,    -1,    84,    -1,    -1,    87,    -1,    -1,
-      -1,    91,    92,    93,    -1,    -1,    -1,    -1,  3285,  3286,
-      -1,    -1,    84,    -1,    -1,    87,    -1,    -1,   108,    91,
-      92,    93,    -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,
-      -1,    -1,   122,  5116,    -1,  3312,   108,    -1,  3315,    -1,
-      -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,    -1,    -1,
-     122,    -1,    -1,    -1,    -1,    -1,   146,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5194,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    84,    -1,   146,    87,    -1,    -1,    -1,    91,
-      92,    93,   510,  2332,    -1,   513,   514,   515,    -1,   517,
-     518,   519,   520,   521,   522,   251,    -1,    -1,    -1,   527,
-     256,    -1,    -1,    -1,   116,    -1,    -1,    -1,  5027,    -1,
-     122,    -1,    -1,    -1,  3391,  3392,  3393,    -1,    -1,    -1,
-      -1,   277,   278,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   146,    -1,   292,    -1,  3415,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5065,    -1,    -1,    -1,
-    3427,    -1,    -1,    -1,  3431,    -1,    -1,    -1,    -1,    -1,
-      -1,   251,    -1,  3440,    -1,    -1,   256,   323,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   251,
-     336,    -1,    -1,    -1,   256,    -1,    -1,   277,   278,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   292,  5122,    -1,   277,   278,  5126,  5127,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     292,  5304,    -1,    -1,    -1,    -1,    -1,  3504,    -1,    -1,
-      -1,    -1,    -1,   323,    -1,    -1,    -1,    -1,    -1,   251,
-      -1,    -1,    -1,    -1,   256,    -1,   336,    -1,    -1,   339,
-      -1,   323,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   417,    -1,  3540,   336,   277,   278,   339,    -1,  3546,
-      -1,  3548,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     292,    -1,    -1,  3560,    -1,  3562,    -1,    -1,    -1,    -1,
-      -1,  5421,    -1,    -1,  5213,    -1,    -1,    -1,    -1,  5382,
-      -1,    -1,    -1,    -1,  5434,    -1,    -1,    -1,    -1,    -1,
-      -1,   323,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   336,    -1,    -1,   417,   655,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3616,
-    2589,  2590,    -1,    -1,    -1,   417,    -1,    -1,    -1,  2598,
-      -1,  2600,    -1,    -1,   510,  2604,  5486,   513,   514,   515,
-      -1,   517,   518,   519,   520,   521,   522,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3671,    -1,    -1,  5480,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   417,    -1,    -1,    -1,    -1,
-      -1,  3688,    -1,    -1,    -1,  5545,    -1,    -1,    -1,    -1,
-     510,    -1,    -1,   513,   514,   515,    -1,   517,   518,   519,
-     520,   521,   522,  3710,    -1,    -1,  3713,   527,   510,    -1,
-      -1,   513,   514,   515,    -1,   517,   518,   519,   520,   521,
-     522,    -1,    -1,    -1,    -1,   527,    -1,    -1,  2707,  5542,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5561,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   510,    -1,
-      -1,   513,   514,   515,    -1,   517,   518,   519,   520,   521,
-     522,    -1,    -1,  3790,  2763,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2771,    -1,  2773,    -1,    -1,    -1,    -1,    -1,
-    2779,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   865,   866,
-     867,   868,    -1,   870,    -1,   872,    -1,   874,    -1,   876,
-      -1,    -1,   879,    -1,    -1,    -1,    -1,    -1,   885,    -1,
-      -1,   888,    -1,    -1,    -1,   892,    -1,   894,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   902,    -1,    -1,    -1,    -1,
-     907,    -1,   909,    -1,    -1,   912,    -1,   914,    -1,   916,
-      -1,    -1,    -1,    -1,    -1,    -1,   923,    -1,    -1,    -1,
-     927,    -1,    -1,    -1,  2853,    -1,    -1,   934,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,    -1,    -1,
-     967,    -1,    -1,    -1,    -1,   972,    -1,    -1,    -1,    -1,
-     977,    -1,    -1,    -1,   981,    -1,    -1,    25,    -1,    -1,
-    2909,    -1,  2911,    -1,    -1,    -1,    -1,    35,    36,    -1,
-      -1,   998,    40,    -1,    42,    43,    -1,    -1,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    -1,    72,  3982,    74,    75,    76,    77,
-      78,    79,    80,    81,    -1,    -1,    -1,    85,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1054,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1069,   164,  1071,    -1,    -1,  4024,    -1,    -1,
-      84,    -1,  4029,    87,  4031,    -1,    -1,    91,    92,    93,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   137,
-      -1,    -1,  1099,  1100,   108,    -1,    -1,  1104,  1105,  3028,
-      -1,    -1,   116,    -1,    -1,    -1,    -1,    84,   122,    -1,
-      87,   212,    -1,    -1,    91,    92,    93,  1124,    -1,    -1,
-      -1,  1128,  4079,   224,    -1,  4082,    -1,    -1,   229,  1136,
-      -1,   108,   146,   234,    -1,    -1,    -1,    -1,   239,   116,
-    1147,   242,    -1,    -1,   245,   122,    -1,    -1,    -1,    -1,
-      -1,    -1,  1159,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   209,  4119,    -1,    -1,    -1,    -1,    -1,    -1,   146,
-      -1,    -1,   273,    -1,    -1,    -1,    -1,    -1,    -1,   227,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   293,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     248,    -1,    -1,    -1,    -1,    -1,    -1,  4164,  4165,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4177,    -1,  4179,   271,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   332,    -1,   334,  1241,    -1,    -1,   251,    -1,   340,
-      -1,    -1,   256,  1250,    -1,    -1,    -1,    -1,  1255,  1256,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   307,
-      -1,    -1,   310,   277,   278,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   251,    -1,    -1,   325,   292,   256,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   389,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1306,
-     277,   278,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   323,
-    1317,    -1,    -1,    -1,  1321,   292,    -1,    -1,    -1,    -1,
-      -1,    -1,   336,  4280,    -1,   339,    -1,    -1,    -1,  1336,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   438,    -1,    -1,
-      -1,    -1,    -1,    -1,  1351,    -1,   323,    -1,    -1,    -1,
-    1357,  1358,    -1,    -1,    -1,   403,    -1,    -1,    -1,   336,
-      -1,    -1,   339,   464,    -1,    -1,    -1,  1374,  1375,  1376,
-      -1,  1378,    -1,  1380,    -1,    -1,    -1,    -1,  1385,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   488,    -1,   490,
-     491,    -1,    -1,    -1,    -1,  3324,    -1,  3326,  3327,  3328,
-      -1,   449,    -1,   417,    84,    -1,    -1,    87,    -1,    -1,
-      -1,    91,    92,    93,    -1,    -1,   464,    -1,    -1,    -1,
-      -1,    -1,    -1,   524,    -1,    -1,   527,   528,   108,   530,
-      -1,   479,    -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,
-     417,    -1,   122,    -1,    -1,    -1,    -1,    -1,  1455,    -1,
-    1457,  1458,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   507,
-      -1,    -1,    -1,    -1,    -1,    -1,   146,   515,    -1,   517,
-     518,   519,   520,   521,    -1,    -1,   524,   525,   526,   527,
-      -1,   529,   530,   531,   532,   533,    -1,    -1,    -1,  1496,
-      -1,    -1,    -1,    -1,    -1,    -1,   510,    -1,    -1,   513,
-     514,   515,    -1,   517,   518,   519,   520,   521,   522,    -1,
-      -1,    -1,    -1,   527,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1534,  1535,    -1,
-      -1,    -1,  1539,   510,  1541,    -1,   513,   514,   515,    -1,
-     517,   518,   519,   520,   521,   522,    -1,    -1,    -1,    -1,
-     527,    -1,    -1,  4510,    -1,    -1,  4513,    -1,    -1,    -1,
-    1567,    -1,    -1,  1570,    -1,    -1,  1573,    -1,    -1,    -1,
-      -1,   251,    -1,    -1,    -1,    -1,   256,    -1,  1585,    -1,
-    4537,    -1,  3511,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4549,    -1,    -1,    -1,    -1,   277,   278,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1613,    -1,    -1,    -1,
-    4567,    -1,   292,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1641,  1642,  1643,    -1,  1645,    -1,
-      -1,    -1,    -1,   323,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   336,  4614,  1665,   339,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   973,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1687,  1688,    -1,    -1,    -1,    -1,    -1,    -1,   994,    84,
-      -1,    -1,    87,    -1,    -1,    -1,    91,    92,    93,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1716,
-      -1,    -1,  1719,   108,    98,    -1,    -1,    -1,    -1,    -1,
-     104,   116,    -1,    -1,    -1,    -1,    -1,   122,    -1,    -1,
-      -1,    -1,  3661,    -1,  3663,    -1,    -1,   417,  3667,    -1,
-      -1,  1748,    -1,    -1,    -1,  1752,  1753,    -1,    -1,    -1,
-      -1,   146,    -1,    -1,    -1,    -1,  1763,  1764,  1765,    -1,
-     144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4732,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1791,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3723,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   195,    -1,    -1,    -1,    -1,    -1,    -1,   202,    -1,
-      -1,   205,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     510,    -1,    -1,   513,   514,   515,    -1,   517,   518,   519,
-     520,   521,   522,    -1,    -1,    -1,   230,   527,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   251,    -1,    98,    -1,
-      -1,   256,    -1,    -1,   104,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   261,    -1,    -1,
-      -1,    -1,   277,   278,    -1,    -1,  4843,    -1,  4845,    -1,
-      -1,    -1,  1899,  1900,    -1,    -1,    -1,   292,    -1,    -1,
-    1907,    -1,    -1,  1910,   144,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1929,    -1,  1931,    -1,  4883,    -1,   323,    -1,
-      -1,    -1,  1939,    98,   318,  1942,   320,    -1,    -1,   104,
-      -1,   336,    -1,    -1,   339,    -1,   330,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   338,   195,    -1,    -1,    -1,  1966,
-      -1,    -1,   202,    -1,   348,   205,    -1,  1974,  1975,  1976,
-    1977,  1978,  4929,    -1,  4931,    -1,    -1,    -1,    -1,   144,
-      -1,    -1,    -1,    -1,    -1,  1992,    -1,    -1,    -1,    -1,
-     230,    -1,    -1,    -1,    -1,    -1,    -1,  2004,   382,  2006,
-      -1,   385,   386,    -1,    -1,    -1,    -1,  1313,    -1,    -1,
-    2017,  2018,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2026,
-      -1,   261,   417,    -1,    -1,    -1,    -1,  1333,   412,  2036,
-     195,    -1,    -1,    -1,    -1,    -1,  1342,   202,    -1,    -1,
-     205,    -1,    -1,  3972,  3973,  3974,  3975,    -1,  2055,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2064,  2065,  2066,
-    2067,    -1,    -1,    -1,    -1,   230,    -1,    -1,    -1,  2076,
-      -1,    -1,    -1,    -1,    -1,    -1,  2083,    -1,   318,  2086,
-     320,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     330,   475,    -1,    -1,    -1,  2102,   261,    -1,   338,    -1,
-      -1,    -1,  2109,    -1,    -1,    -1,    -1,  2114,   348,    -1,
-      -1,    -1,    -1,    -1,    -1,   510,    -1,  1423,   513,   514,
-     515,    -1,   517,   518,   519,   520,   521,   522,    -1,    -1,
-     525,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2147,    -1,   382,    -1,    -1,   385,   386,    -1,    -1,    -1,
-    2157,    -1,    -1,   318,  2161,   320,    -1,  2164,    -1,  5116,
-      -1,    -1,    -1,    -1,    -1,   330,    -1,  2174,    -1,    -1,
-      -1,    -1,   412,   338,    -1,  2182,  2183,    -1,    -1,    -1,
-      -1,    -1,    -1,   348,    -1,    -1,    -1,    -1,    -1,  2196,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4139,    -1,    -1,    -1,    -1,    -1,    -1,   382,    -1,    -1,
-     385,   386,    -1,  2230,    -1,    -1,    -1,    -1,    -1,    -1,
-    2237,    -1,  2239,    -1,    -1,   475,  2243,  2244,    -1,  2246,
-      -1,    -1,    -1,    -1,    -1,    -1,  2253,   412,  1554,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2263,    -1,    -1,    -1,
-      -1,  2268,  2269,    -1,    -1,  2272,    -1,    -1,    -1,  2276,
-    2277,    -1,    -1,    -1,    -1,  2282,  2283,    -1,    -1,    -1,
-      -1,    -1,  2289,  2290,  2291,    -1,    -1,    -1,  2295,  2296,
-    2297,  2298,  2299,  2300,  2301,  2302,    -1,  2304,    -1,  2306,
-    2307,    -1,    -1,  2310,    -1,    -1,    -1,    -1,    -1,    -1,
-     475,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2325,  2326,
-    2327,  2328,    -1,    -1,    -1,  2332,  2333,    -1,    -1,    -1,
-    2337,    -1,    -1,  2340,    -1,    -1,  2343,  2344,  2345,  2346,
-    2347,  2348,  2349,  2350,  2351,    -1,  2353,  5304,    -1,    -1,
-      -1,    -1,    -1,  2360,  2361,    -1,    -1,  2364,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2386,
-      -1,    -1,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,
-      -1,   104,    -1,    -1,    -1,    -1,    -1,    -1,  1704,    -1,
-      -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,    87,    -1,
-      -1,    -1,    91,    92,    93,    -1,  2423,    -1,  2425,    -1,
-    2427,    -1,    -1,    -1,    -1,  5382,    -1,    -1,    -1,   108,
-      -1,   144,    -1,   112,    -1,    -1,    -1,   116,    -1,    -1,
-      -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2462,    -1,    -1,    -1,    -1,
-      -1,    -1,  2469,    -1,  2471,    -1,    -1,   146,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   195,    -1,    -1,    -1,    -1,    -1,    -1,   202,
-      -1,    -1,   205,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   193,    -1,    -1,   230,    -1,    -1,
-      -1,    -1,    -1,  5480,    -1,  1831,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2548,    -1,    -1,    -1,    -1,    -1,    -1,   261,    -1,
-    2557,    -1,  2559,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2576,
-      -1,    -1,   251,    -1,    -1,    -1,    -1,   256,    -1,    -1,
-    2587,    -1,  2589,  2590,    -1,  5542,    -1,  2594,  1894,  2596,
-      -1,  2598,    -1,  2600,    -1,    -1,    -1,  2604,   277,   278,
-    2607,    -1,    -1,    -1,  5561,   318,    -1,   320,    -1,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,    -1,   330,    -1,    -1,
-      -1,  1927,    -1,    -1,    -1,   338,    -1,    -1,    -1,  2636,
-      -1,    -1,    -1,    -1,    -1,   348,  2643,    -1,    -1,    -1,
-      -1,    -1,  2649,    -1,   323,    -1,    -1,    -1,  4577,    -1,
-      -1,  2658,    -1,    -1,    -1,    -1,    -1,   336,    -1,    -1,
-     339,    -1,  4591,    -1,    -1,    -1,    -1,    -1,    -1,   382,
-    2677,    -1,   385,   386,  2681,  2682,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2690,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   412,
-    2707,    -1,  2008,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2023,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2031,    -1,  2734,    -1,  2736,
-    2737,    -1,    -1,    -1,    -1,    -1,  2042,    -1,   417,    -1,
-      -1,  4670,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2763,    -1,    -1,    -1,
-      -1,    -1,   475,    -1,  2771,    -1,  2773,    -1,    -1,    -1,
-      -1,    -1,  2779,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2089,    -1,    -1,  2793,    -1,    -1,    -1,
-      -1,    -1,    -1,   472,    -1,    -1,    -1,    -1,    -1,    -1,
-    2807,    -1,  2108,  2810,    -1,  2812,    -1,    -1,  2815,    -1,
-      -1,  2818,    -1,    -1,  2120,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2132,    -1,    -1,    -1,
-      -1,   510,    -1,    -1,   513,   514,   515,  2844,   517,   518,
-     519,   520,   521,   522,    -1,    -1,  2853,  2854,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2869,    -1,    -1,    -1,  2172,    -1,    -1,  2175,
-      -1,    -1,    -1,  2880,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2894,  2895,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2907,    -1,  2909,  2910,  2911,  2912,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4851,  4852,  4853,    -1,     5,    -1,    -1,    -1,
-      -1,  2938,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    25,    -1,    -1,    -1,
-      -1,    -1,  2959,    -1,    -1,    -1,    35,    36,    -1,    -1,
-      -1,    -1,    -1,    42,    43,    -1,    -1,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    -1,    -1,  3001,    74,    75,    76,    77,    78,
-      79,    80,    81,    -1,  3011,    -1,    85,    -1,    -1,    -1,
-    3017,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2324,    -1,
-      -1,  3028,    -1,    -1,    -1,    -1,    -1,  3034,    -1,   164,
-      -1,    -1,  3039,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3062,  3063,  3064,   137,    -1,
-    3067,    -1,    -1,  4992,    -1,    -1,    -1,    -1,  3075,  3076,
-    3077,  3078,    -1,    -1,    -1,    -1,    -1,   212,    -1,    -1,
-      -1,  3088,    -1,    -1,  3091,    -1,  3093,    -1,    -1,   224,
-      -1,    -1,    -1,    -1,   229,    -1,    -1,  3104,  3105,   234,
-      -1,  3108,    -1,    -1,   239,    -1,    -1,   242,    -1,    -1,
-     245,    -1,    -1,  3120,    -1,  3122,    -1,  3124,    -1,  3126,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     209,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   273,  3146,
-      -1,    -1,    -1,  3150,    -1,    -1,    -1,    -1,   227,    -1,
-    3157,    -1,  3159,  3160,  3161,    -1,    -1,    -1,   293,    -1,
-      -1,    -1,    -1,    -1,    84,    -1,    -1,    87,    -1,   248,
-      -1,    91,    92,    93,    -1,  5104,    -1,  3184,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,    -1,
-    3197,    -1,   271,    -1,    -1,  3202,   116,   332,    -1,   334,
-      -1,  3208,   122,    -1,    -1,   340,    -1,    -1,    -1,    -1,
-    5139,  3218,  5141,    -1,  3221,    -1,    -1,  3224,  2524,  3226,
-      -1,    -1,  2528,  2529,    -1,    -1,   146,    -1,   307,    -1,
-      -1,   310,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   325,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   389,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    84,    -1,    -1,    87,    -1,    -1,    -1,
-      91,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3291,  2591,  3293,   108,    -1,    -1,
-      -1,  3298,    -1,    -1,    -1,   116,    -1,  2603,    -1,    -1,
-      -1,   122,    -1,   438,    -1,    -1,    -1,    -1,    -1,   229,
-      -1,    -1,    -1,    -1,   234,    -1,    -1,  3324,    -1,  3326,
-    3327,  3328,    -1,    -1,   403,   146,    -1,    -1,    -1,   464,
-      -1,   251,    -1,    -1,  2640,    -1,   256,    -1,    -1,    -1,
-    5269,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   488,    -1,   490,   491,   277,   278,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     449,    -1,   292,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   464,    -1,    -1,    -1,   524,
-      -1,    -1,   527,   528,    -1,   530,    -1,    -1,  5327,    -1,
-     479,    -1,    -1,   323,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   336,    -1,    -1,   339,
-      -1,    -1,  3429,    -1,    -1,    -1,    -1,    -1,   507,    -1,
-     251,    -1,    -1,    -1,    -1,   256,   515,    -1,   517,   518,
-     519,   520,   521,    -1,    -1,   524,   525,   526,   527,    -1,
-      -1,    -1,   531,    -1,    -1,    -1,   277,   278,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   292,    -1,    -1,    -1,  5404,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2794,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   417,    -1,    -1,
-      -1,    -1,   323,    -1,  3511,    -1,    -1,    -1,    -1,    -1,
-      -1,  3518,  3519,    -1,    -1,   336,    -1,    -1,   339,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  5464,    -1,    -1,    -1,   360,
-      -1,    -1,    -1,    -1,    -1,  3552,  3553,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2864,    -1,
-      -1,  3568,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3583,  3584,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3592,  3593,  3594,    -1,    -1,
-     510,    -1,    -1,   513,   514,   515,   417,   517,   518,   519,
-     520,   521,   522,  3610,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   433,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3627,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3644,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3661,    -1,  3663,    -1,    -1,    -1,
-    3667,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3685,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2993,  3695,   510,
-      -1,    -1,   513,   514,   515,    -1,   517,   518,   519,   520,
-     521,   522,    -1,    -1,  3711,    -1,    -1,    -1,  3014,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3723,    -1,    -1,  3025,
-      -1,    -1,    -1,  3730,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3739,    -1,    -1,    -1,    -1,    -1,  3745,    -1,
-    3747,    -1,    -1,  3750,    -1,    -1,    -1,    -1,  3755,  3756,
-    3757,  3758,    -1,    -1,  3761,  3762,  3763,  3764,  3765,  3766,
-    3767,  3768,  3769,  3770,    -1,    -1,    -1,  3774,  3775,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3784,    -1,    -1,
-      -1,  3788,   116,    -1,    -1,  3792,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3800,    -1,    -1,  3803,    -1,  3805,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3814,    -1,    -1,
-    3817,  3818,    -1,    -1,    -1,  3822,  3823,    -1,    -1,    -1,
-    3827,    -1,  3829,    -1,    -1,    -1,    -1,   161,    -1,  3836,
-    3837,  3838,  3839,    -1,  3841,  3842,    -1,    -1,    -1,  3846,
-    3847,    -1,    -1,    -1,    -1,    -1,  3853,    -1,    -1,    -1,
-      -1,    -1,  3859,  3860,  3861,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   209,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   217,    -1,   219,    -1,    84,    -1,    -1,
-      87,    -1,    -1,    -1,    91,    92,    93,    -1,   232,  3906,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3917,   108,  3919,    -1,    -1,    -1,    -1,    -1,    -1,   116,
-      -1,    -1,    -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   164,    -1,
-      -1,    -1,    -1,  3950,  3951,  3952,    -1,  3954,    -1,   146,
-      -1,  3257,    -1,    -1,  3260,    -1,  3262,    -1,    -1,    -1,
-      -1,  3267,    -1,    -1,    -1,  3972,  3973,  3974,  3975,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   212,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   224,    -1,
-      -1,    -1,    -1,   229,  4011,    -1,    -1,    -1,   234,    -1,
-      -1,    -1,  3318,   239,    -1,    -1,   242,    -1,    -1,   245,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3335,
-      -1,   228,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   876,    -1,    -1,    -1,   273,    -1,    -1,
-      -1,    -1,   885,  3359,   251,    -1,    -1,    -1,    -1,   256,
-      -1,   894,    -1,    -1,    -1,    -1,    -1,   293,    -1,   902,
-      -1,    -1,    -1,    -1,   907,    -1,    -1,    -1,    -1,    -1,
-     277,   278,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4096,
-      -1,    -1,    -1,    -1,    -1,   292,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   332,    -1,   334,    -1,
-      -1,    -1,    -1,    -1,   340,    -1,    -1,    -1,  3424,    -1,
-    3426,    -1,    -1,    -1,    -1,    -1,   323,    -1,    -1,    -1,
-    4137,    -1,  4139,    -1,  4141,    -1,    -1,    -1,    -1,   336,
-    4147,    -1,   339,    -1,    -1,    -1,  4153,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4162,    -1,    -1,    -1,    -1,
-      -1,   358,    -1,   389,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4182,    -1,    -1,    -1,  3485,
-      -1,    -1,    -1,    -1,    -1,  4192,    -1,    -1,    -1,    -1,
-      -1,    -1,  4199,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4209,    -1,  3510,    -1,  4213,    -1,    -1,    -1,
-    4217,  4218,   438,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     417,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3536,    -1,    -1,    -1,    -1,  3541,  1069,    -1,   464,    -1,
-      -1,    -1,  4249,  4250,  4251,  4252,  4253,    -1,    -1,    -1,
-      -1,    -1,  4259,    -1,  4261,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   488,    -1,   490,   491,    -1,    -1,    -1,    -1,
-      -1,    -1,  1105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1124,    -1,  3599,  4301,    -1,    -1,    -1,   524,    -1,
-      -1,   527,   528,    -1,   530,  4312,    -1,    -1,    -1,    -1,
-      -1,  3617,    -1,   510,  1147,    -1,   513,   514,   515,    -1,
-     517,   518,   519,   520,   521,   522,  3632,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4342,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4352,  4353,    -1,    -1,    -1,
-      -1,    -1,  4359,  4360,    -1,    -1,    -1,  4364,    -1,    -1,
-      -1,    -1,  4369,    -1,    -1,  4372,  4373,    -1,    -1,    -1,
-    4377,  4378,    -1,    -1,    -1,    -1,  4383,  4384,  4385,  4386,
-    4387,    -1,    -1,    -1,  4391,  4392,    -1,  4394,    -1,    -1,
-    4397,    -1,    -1,    -1,  4401,    -1,    -1,    -1,  4405,    -1,
-      -1,    -1,    -1,    -1,  4411,    -1,    -1,    -1,    -1,    -1,
-    4417,    -1,    -1,    -1,    -1,  4422,    -1,  1250,    -1,    -1,
-      -1,  4428,    -1,    -1,    -1,    -1,    -1,  3733,    -1,    -1,
-      -1,  4438,    -1,    -1,    -1,    -1,    -1,    84,    -1,  4446,
-      87,    -1,  4449,    -1,    91,    92,    93,  4454,  3754,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   108,    -1,    -1,   111,  4472,    -1,    -1,  4475,   116,
-      -1,    -1,    -1,  3779,    -1,   122,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,  4495,  4496,
-      87,    -1,    -1,    -1,    91,    92,    93,    -1,    -1,   146,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3813,    -1,    -1,
-      -1,   108,    -1,  4520,    -1,    -1,    -1,    -1,  1351,   116,
-      -1,    -1,    -1,   857,    -1,   122,    -1,    -1,    -1,    -1,
-      -1,   865,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     874,  1374,  1375,  1376,    -1,    -1,    -1,    -1,    -1,   146,
-    4557,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4577,    -1,    -1,    -1,    -1,   909,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4591,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   251,    -1,    -1,    -1,    -1,   256,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4631,    -1,    -1,    -1,    -1,  3935,
-     277,   278,    -1,   967,    -1,  4642,    -1,    -1,    -1,   973,
-    4647,    -1,    -1,   977,    -1,   292,    -1,    -1,  4655,    -1,
-      -1,    -1,    -1,    -1,   251,    -1,    -1,    -1,    -1,   256,
-     994,    -1,    -1,  4670,  4671,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   323,    -1,    -1,    -1,
-     277,   278,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   336,
-      -1,    -1,   339,  4700,    -1,   292,  4703,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1539,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4030,    -1,   323,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1570,    -1,   336,
-      -1,  4748,   339,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4757,    -1,    -1,    -1,    -1,    -1,    -1,   354,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1099,  1100,  4774,  4775,    -1,
-     417,  4778,  1106,    -1,    -1,    -1,  1110,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4792,  4793,    -1,    -1,    -1,
-    4797,    -1,    -1,    -1,    -1,  4802,    -1,    -1,  4805,  4806,
-      -1,  4808,  1136,  4810,    -1,    -1,  4813,  4814,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     417,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4835,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4849,  4850,  4851,  4852,  4853,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4168,   510,    -1,    -1,   513,   514,   515,    -1,
-     517,   518,   519,   520,   521,   522,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1716,    -1,  4892,  4893,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4216,    -1,    -1,   510,    -1,    -1,   513,   514,   515,    -1,
-     517,   518,   519,   520,   521,   522,    -1,    -1,    -1,    -1,
-      -1,  1764,  4939,  4940,    -1,    -1,  4943,    -1,    -1,  4946,
-      -1,    -1,    -1,    -1,    -1,    -1,  1280,  1281,    -1,  4956,
-      -1,    -1,    -1,    -1,    -1,  4962,    -1,  4964,    -1,    -1,
-      -1,    -1,  4969,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1306,    -1,  4981,    -1,    -1,    -1,    -1,  1313,
-      -1,    -1,    -1,  1317,    -1,  4992,  4993,  4994,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1333,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1342,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5026,
-      -1,    -1,  5029,    -1,  5031,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    84,    -1,    -1,    87,    -1,    -1,    -1,
-      91,    92,    93,    -1,    -1,    -1,  1380,    -1,  5055,  4355,
-      -1,    -1,  5059,    -1,    -1,    -1,  5063,   108,    -1,  4365,
-     111,    -1,    -1,  5070,    -1,   116,  1899,    -1,    -1,    -1,
-      -1,   122,  5079,    -1,  1907,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  5092,    -1,    -1,    -1,  1423,
-      -1,    -1,    -1,    -1,    -1,   146,    -1,  5104,  1931,    -1,
-      -1,  5108,    -1,    -1,    -1,    -1,  1939,    -1,    -1,  1942,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5131,    -1,    -1,    -1,    -1,    -1,
-      -1,  5138,  5139,  5140,  5141,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1978,  5153,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1992,
-      -1,    -1,  1496,    -1,    -1,  5172,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2006,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  5192,    84,  4493,    -1,    87,
-      -1,    -1,    -1,    91,    92,    93,    -1,    -1,    -1,    -1,
-     251,    -1,    -1,    -1,    -1,   256,    -1,    -1,    -1,    -1,
-     108,    -1,    -1,    -1,    -1,    -1,  4522,    -1,   116,    -1,
-    1554,    -1,  2055,    -1,   122,    -1,   277,   278,  5235,    -1,
-      -1,  5238,    -1,    -1,    -1,    -1,  4542,    -1,    -1,    -1,
-    5247,   292,    -1,  2076,    -1,  5252,    -1,  5254,   146,  5256,
-    2083,  1585,    -1,    -1,    -1,    -1,  5263,    -1,    -1,    -1,
-      -1,    -1,  5269,    -1,  5271,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   323,    -1,  5281,    -1,    -1,    -1,    -1,  1613,
-      -1,    -1,    -1,    -1,    -1,   336,    -1,    -1,   339,    -1,
-    4596,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1641,  1642,  1643,
-      -1,  1645,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5327,    -1,    -1,    -1,    -1,  5332,    -1,    -1,    -1,    -1,
-      -1,  1665,    -1,    -1,    -1,    -1,   234,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5355,    -1,
-      -1,    -1,    -1,   251,    -1,    -1,  5363,  5364,   256,    -1,
-      -1,  5368,    -1,  2196,    -1,    -1,   417,  5374,    -1,    -1,
-    5377,    -1,    -1,    -1,  5381,    -1,    -1,    -1,    -1,   277,
-     278,    -1,    -1,    -1,    -1,  1719,  1720,  5394,    -1,    -1,
-      -1,  4697,    -1,    -1,   292,    -1,    -1,  5404,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2243,  2244,    -1,    -1,  1748,    -1,    -1,    -1,  1752,  1753,
-      -1,    -1,  5429,    -1,    -1,   323,    -1,    -1,  5435,  5436,
-    2263,  5438,    -1,    -1,    -1,    -1,    -1,    -1,   336,    -1,
-      -1,   339,    -1,    -1,    -1,    -1,  4752,    -1,    -1,    -1,
-    5457,    -1,    -1,    -1,    -1,    -1,    -1,  5464,    -1,   510,
-      -1,    -1,   513,   514,   515,    -1,   517,   518,   519,   520,
-     521,   522,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    84,    -1,    -1,    87,    -1,    -1,
-      -1,    91,    92,    93,    -1,    -1,    -1,  1831,    -1,    -1,
-      -1,    -1,    -1,  1837,    -1,    -1,    -1,    -1,   108,    -1,
-      -1,   111,    -1,  1847,    -1,    -1,   116,    -1,    -1,   417,
-      -1,    -1,   122,    -1,    -1,    -1,    -1,  2360,    -1,  5536,
-    5537,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5550,    -1,    -1,   146,    -1,    -1,    -1,
-      -1,    -1,  1886,  2386,    -1,  5562,  5563,    -1,    -1,    -1,
-    1894,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4882,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2423,    -1,  2425,  1927,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   510,    -1,    -1,   513,   514,   515,    -1,   517,
-     518,   519,   520,   521,   522,    84,    -1,    -1,    87,  2462,
-      -1,    -1,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,
-      -1,   251,    -1,    -1,    -1,  1989,   256,   116,    -1,    -1,
-      -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2008,    -1,    -1,   277,   278,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,  2023,
-    4996,    -1,   292,    -1,    -1,    -1,    -1,  2031,    -1,    -1,
-      -1,    -1,    -1,  2037,    -1,    -1,    -1,    -1,  2042,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  5027,    -1,   323,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   336,    -1,    -1,   339,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2089,    -1,    -1,    -1,  5065,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2102,    -1,
-      -1,    -1,    -1,    -1,  2108,    -1,    -1,    -1,    -1,    -1,
-    2114,    -1,    -1,    -1,    -1,    -1,  2120,    -1,    -1,    -1,
-      -1,    -1,   251,    -1,    -1,    -1,    -1,   256,  2132,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2147,    -1,    -1,  5122,   417,   277,   278,
-    5126,  5127,    -1,    -1,    -1,  2658,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,    -1,    -1,  2172,    -1,
-      -1,  2175,    -1,    -1,  2677,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   323,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   336,    -1,    -1,
-     339,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2239,    -1,  5213,    -1,    -1,
-     510,    -1,    -1,   513,   514,   515,    -1,   517,   518,   519,
-     520,   521,   522,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2276,  2277,    -1,    -1,    -1,    -1,  2282,  2283,
-      -1,    -1,    -1,    -1,    -1,  2289,  2290,  2291,   417,    -1,
-      -1,  2295,    -1,  2297,  2298,  2299,  2300,  2301,  2302,    -1,
-    2304,    -1,  2306,  2307,    -1,    -1,  2310,    -1,    -1,  2812,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   446,    -1,    -1,
-    2324,  2325,  2326,  2327,  2328,  2329,    -1,    -1,    -1,  2333,
-      -1,    -1,    -1,  2337,    -1,    -1,  2340,    -1,    -1,  2343,
-    2344,  2345,  2346,  2347,  2348,  2349,  2350,  2351,    -1,  2353,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2361,    -1,    -1,
-    2364,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   510,    -1,    -1,   513,   514,   515,    -1,   517,   518,
-     519,   520,   521,   522,     6,     7,     8,    -1,    10,    11,
-      12,    -1,    -1,    -1,    16,    -1,    -1,    19,    20,    21,
-      22,    23,    24,    -1,    26,    27,    -1,    -1,    -1,    31,
-      32,    33,    34,  2427,    36,    37,    38,    39,    -1,    41,
-      42,    43,    -1,    -1,    -1,    -1,    -1,    49,    50,    -1,
-      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    64,    -1,    66,    -1,    68,    -1,    70,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3001,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   118,    -1,    -1,    -1,
-     122,   123,   124,   125,   126,    -1,    -1,    -1,    -1,    -1,
-    2524,    -1,    -1,    -1,  2528,  2529,   138,    -1,    -1,    -1,
-      -1,    -1,    -1,   145,    -1,   147,    -1,    -1,  2542,    -1,
-      -1,   153,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   165,    -1,    -1,    -1,    -1,    -1,    -1,
-     172,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     182,   183,  2576,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2587,    -1,    -1,    -1,  2591,    -1,    -1,
-    2594,    -1,    -1,    -1,    -1,    -1,    -1,   209,    -1,  2603,
-      -1,    -1,    -1,    -1,    -1,   217,    -1,    -1,    -1,   221,
-      -1,    -1,    -1,    -1,    -1,   227,    -1,    -1,    -1,    -1,
-      -1,   233,  2626,   235,    -1,    -1,    -1,    -1,    -1,   241,
-      -1,   243,    -1,    -1,    -1,    -1,  2640,    -1,    -1,   251,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3150,    -1,    -1,
-      -1,    -1,    -1,   265,   266,    -1,    -1,  2661,    -1,    -1,
-     272,  2665,   274,    -1,    -1,   277,   278,    -1,   280,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   289,   290,    -1,
-     292,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   314,   315,   316,    -1,    -1,   319,    -1,    -1,
-      -1,   323,    -1,    -1,   326,    -1,   328,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     342,   343,    -1,   345,   346,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   357,    -1,   359,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     372,    -1,    -1,    -1,    -1,    -1,    -1,   209,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   217,    -1,   219,    -1,    -1,
-     392,    -1,    -1,    -1,   396,    -1,    -1,    -1,    -1,  2793,
-    2794,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2802,    -1,
-      -1,    -1,   414,    -1,    -1,   417,    -1,    -1,   420,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   434,    -1,    -1,    -1,    -1,    -1,   440,    -1,
-      -1,    -1,    -1,    -1,    -1,   447,   448,    -1,    -1,    -1,
-      -1,   453,    -1,   455,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   464,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2864,    -1,    -1,    -1,    -1,    -1,    -1,   479,    -1,    -1,
-     482,    -1,    -1,    -1,    84,    -1,  2880,    87,    -1,    -1,
-      -1,    91,    92,    93,    -1,    -1,   498,   499,   500,   501,
-     502,   503,   504,   505,   506,    -1,    -1,    -1,   108,    -1,
-      -1,   111,    -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,
-      -1,    -1,   122,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   533,    -1,     5,    -1,    -1,  3429,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2938,    -1,   146,    -1,    -1,    -1,
-      -1,    -1,    -1,    25,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    35,    36,    -1,    -1,    -1,    -1,    -1,
-      42,    43,    -1,    -1,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,  2993,
-      -1,    -1,    74,    75,    76,    77,    78,    79,    80,    81,
-      -1,    -1,    -1,    85,    -1,    -1,    -1,  3011,    -1,    -1,
-    3014,    -1,    -1,  3017,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3025,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3034,    -1,    -1,    -1,    -1,  3039,    -1,    -1,    -1,    -1,
-      -1,   251,    -1,    -1,    -1,    -1,   256,    -1,    -1,  3552,
-    3553,    -1,    -1,    -1,    -1,   137,    -1,    -1,  3062,  3063,
-    3064,    -1,    -1,  3067,    -1,  3568,    -1,   277,   278,    -1,
-      -1,  3075,  3076,  3077,  3078,    -1,    -1,    -1,    -1,  3083,
-      -1,  3584,   292,    -1,  3088,  3089,    -1,  3091,    -1,  3093,
-    3593,  3594,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3104,  3105,    -1,    -1,  3108,    -1,    -1,  3610,    -1,    -1,
-      -1,    -1,    -1,   323,    -1,    -1,    -1,    -1,  3122,   101,
-    3124,    -1,  3126,    -1,    -1,    -1,   336,   209,    -1,   339,
-      -1,   113,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3146,    -1,    -1,   227,    -1,    -1,    -1,    -1,
-      -1,    -1,   134,  3157,    -1,  3159,  3160,  3161,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   147,   248,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,
-    3184,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   271,
-      -1,    -1,    -1,  3197,    -1,    -1,    -1,   179,  3202,    -1,
-      -1,    -1,    -1,    -1,  3208,    -1,    -1,   417,  3711,    -1,
-      -1,    -1,    -1,    -1,  3218,    -1,    -1,    -1,   200,    -1,
-      -1,    -1,    -1,    -1,    -1,   307,    -1,    -1,   310,   211,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   219,    -1,    -1,
-      -1,    -1,    -1,   325,    -1,    -1,    -1,    -1,    -1,   231,
-      -1,    -1,    -1,  3257,   236,    -1,  3260,    -1,  3262,    -1,
-     242,    -1,    -1,  3267,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   259,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3291,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     510,    -1,    -1,   513,   514,   515,    -1,   517,   518,   519,
-     520,   521,   522,    -1,  3318,    -1,    -1,    -1,    -1,    -1,
-      -1,   403,    -1,   305,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3335,    -1,  3836,  3837,  3838,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   336,  3359,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   347,    -1,   449,    -1,    -1,
-      -1,    -1,    -1,    -1,   356,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   464,    -1,   366,    -1,    -1,  3391,  3392,  3393,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   479,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   393,    -1,    -1,    -1,    -1,   398,    -1,   400,    -1,
-    3424,    -1,  3426,   865,   406,   507,    -1,   409,    -1,    -1,
-      -1,    -1,   874,   515,    -1,   517,   518,   519,   520,   521,
-      -1,    -1,   524,   525,   526,   527,    -1,    -1,    -1,   531,
-      -1,    -1,    -1,    -1,    -1,    -1,   438,    -1,    -1,   441,
-      -1,    -1,    -1,   445,    -1,    -1,    -1,   909,    -1,    -1,
-     452,    -1,   454,    -1,    -1,    -1,    -1,   459,    -1,    -1,
-      -1,  3485,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   471,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   484,    -1,    -1,    -1,  3510,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   967,    -1,    -1,    -1,    -1,
-      -1,   973,  3536,    -1,    -1,   977,  3540,  3541,    -1,    -1,
-      84,    -1,    -1,    87,    -1,    -1,    -1,    91,    92,    93,
-      -1,    -1,   994,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   108,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   116,    -1,    -1,    -1,    -1,    -1,   122,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3599,    -1,    -1,    -1,    -1,
-      -1,    -1,   146,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3617,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3632,    -1,
-      -1,    -1,    -1,    -1,  4137,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4147,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1099,  1100,    -1,
-      -1,    -1,    -1,    -1,  1106,    -1,    -1,    -1,  1110,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4182,
-      -1,  3685,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1136,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4209,   251,    -1,    -1,
-      -1,    -1,   256,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3730,    -1,    -1,  3733,
-      -1,    -1,    -1,   277,   278,  3739,    -1,    -1,    -1,    -1,
-      -1,  3745,    -1,  3747,    -1,    -1,  3750,    -1,   292,    -1,
-    3754,  3755,  3756,  3757,  3758,    -1,    -1,  3761,  3762,  3763,
-    3764,  3765,  3766,  3767,  3768,  3769,  3770,    -1,    -1,    -1,
-    3774,  3775,    -1,    -1,    -1,  3779,    -1,    -1,    -1,   323,
-    3784,    -1,    -1,    -1,  3788,    -1,  3790,    -1,  3792,    -1,
-      -1,    -1,   336,    -1,    -1,   339,  3800,    -1,    -1,  3803,
-      -1,  3805,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3813,
-    3814,    -1,    -1,  3817,  3818,    -1,    -1,    -1,  3822,  3823,
-      -1,    -1,    -1,    -1,    -1,  3829,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3839,    -1,  3841,  1280,  1281,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3853,
-      -1,    -1,    -1,    -1,    -1,  3859,  3860,  3861,    -1,    -1,
-      -1,    -1,    -1,    -1,  1306,    -1,    -1,    -1,    -1,    -1,
-      -1,  1313,    -1,   417,    -1,  1317,    -1,    -1,    -1,    -1,
-      -1,  4384,  4385,  4386,  4387,    -1,    -1,    -1,    -1,    -1,
-      -1,  1333,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1342,    -1,  3906,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3919,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3935,    -1,    -1,    -1,    -1,    -1,    -1,  1380,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3950,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   510,    -1,    -1,   513,
-     514,   515,    -1,   517,   518,   519,   520,   521,   522,    -1,
-      -1,  1423,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     5,    -1,    -1,    -1,    -1,    -1,
-    4024,    -1,    -1,    -1,    -1,  4029,  4030,  4031,    -1,    -1,
-      -1,    -1,    -1,    -1,    25,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    35,    36,    -1,    -1,    -1,    -1,
-      -1,    42,    43,    -1,  1496,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      -1,    -1,    -1,    74,    75,    76,    77,    78,    79,    80,
-      81,    -1,    -1,    -1,    85,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1554,    -1,    -1,  4119,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4141,    -1,    -1,
-      -1,    -1,    -1,  1585,    -1,    -1,   137,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4168,    -1,    -1,    -1,    -1,    -1,
-      -1,  1613,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4700,    -1,  1641,
-    1642,  1643,    -1,  1645,    -1,   101,    -1,    -1,    -1,    -1,
-      -1,    -1,  4216,  4217,  4218,    -1,    -1,    -1,   209,    -1,
-      -1,    -1,    -1,  1665,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   227,    -1,   134,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   147,   148,    -1,    -1,    -1,    -1,   248,    -1,    -1,
-      -1,   157,    -1,    -1,    -1,   161,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1719,    -1,    -1,
-     271,    -1,    -1,   179,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4301,    -1,    -1,
-      -1,    -1,    -1,    -1,   200,    -1,  1748,    -1,  4312,    -1,
-    1752,  1753,    -1,    -1,    -1,   211,   307,    -1,    -1,   310,
-      -1,    -1,    -1,   219,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   325,   231,    -1,    -1,  4342,    -1,
-     236,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4352,  4353,
-      -1,  4355,    -1,    -1,    -1,  4359,  4360,    -1,    -1,    -1,
-    4364,  4365,    -1,   259,    -1,  4369,    -1,    -1,  4372,  4373,
-      -1,    -1,    -1,  4377,    -1,    -1,    -1,    -1,    -1,  4383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   284,  1831,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4401,    -1,    -1,
-      -1,  4405,    -1,    -1,    -1,  1847,    -1,    -1,    -1,   305,
-      -1,    -1,   403,  4417,    -1,    -1,    -1,    -1,  4422,    -1,
-      -1,    -1,    -1,    -1,  4428,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     336,    -1,  4446,  4946,  1886,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1894,    -1,    -1,    -1,    -1,    -1,   449,  4962,
-     356,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     366,  4475,    -1,   464,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1927,    -1,    -1,   479,  4493,
-    4993,    -1,    -1,    -1,    -1,    -1,    -1,   393,    -1,    -1,
-      -1,    -1,   398,    -1,   400,    -1,    -1,    -1,    -1,  4513,
-     406,    -1,    -1,   409,    -1,    -1,   507,    -1,  4522,    -1,
-      -1,    -1,    -1,    -1,   515,    -1,   517,   518,   519,   520,
-     521,    -1,    -1,   524,   525,   526,    -1,    -1,  4542,    -1,
-     531,    -1,   438,    -1,    -1,   441,    -1,  1989,    -1,   445,
-      -1,    -1,    -1,  4557,    -1,    -1,   452,    -1,   454,    -1,
-      -1,    -1,    -1,   459,    -1,    -1,  2008,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2023,    -1,    -1,    -1,    -1,    -1,    -1,   484,  2031,
-      -1,    -1,  4596,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2042,    -1,    -1,    -1,    -1,  5108,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4631,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4642,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2089,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2102,    -1,    -1,    -1,    -1,    -1,  2108,    -1,    -1,    -1,
-      -1,    -1,  2114,    -1,    -1,    -1,    -1,    -1,  2120,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2132,  4695,    -1,  4697,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2147,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2172,    -1,    -1,  2175,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4748,    -1,    -1,    -1,  4752,    -1,
-      -1,    -1,    -1,  4757,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4774,  4775,    -1,    -1,  4778,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4792,    -1,
-      -1,    -1,    -1,  4797,    -1,    -1,    -1,  2239,  4802,    -1,
-      -1,  4805,  4806,    -1,    -1,    -1,    -1,    -1,    -1,  4813,
-    4814,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4835,    -1,    -1,  2276,  2277,    -1,    -1,    -1,    -1,
-    2282,  2283,    -1,    -1,    -1,  4849,    -1,  2289,  2290,  2291,
-      -1,    -1,    -1,  2295,    -1,  2297,  2298,  2299,  2300,  2301,
-    2302,    -1,  2304,    -1,  2306,  2307,    -1,    -1,  2310,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4882,    -1,
-      -1,    -1,  2324,  2325,  2326,  2327,  2328,    -1,  4892,    -1,
-      -1,  2333,    -1,    -1,    -1,  2337,    -1,    -1,  2340,    -1,
-      -1,  2343,  2344,  2345,  2346,  2347,  2348,  2349,  2350,  2351,
-      -1,  2353,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2361,
-      -1,    -1,  2364,    -1,    -1,  4929,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4943,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2427,    -1,    -1,    -1,    -1,
-    4994,    -1,  4996,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5026,  5027,    -1,  5029,    -1,  5031,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  5055,    -1,    -1,    -1,  5059,    -1,    -1,    -1,    -1,
-      -1,  5065,    -1,    -1,    -1,    -1,  5070,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2524,    -1,    -1,    -1,  2528,  2529,  5092,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5116,    -1,    -1,    -1,    -1,    -1,  5122,    -1,
-      -1,    -1,  5126,  5127,    -1,    -1,    -1,  5131,    -1,    -1,
-      -1,    -1,    -1,    -1,  2576,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2587,    -1,    -1,    -1,  2591,
-      -1,    -1,  2594,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2603,    -1,    -1,    -1,    -1,    -1,    -1,  5172,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2626,    -1,    -1,    -1,  5192,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2640,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5212,  5213,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  5235,    -1,    -1,  5238,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5247,    -1,    -1,    -1,    -1,  5252,    -1,
-    5254,    -1,  5256,    -1,    -1,    -1,    -1,    -1,    -1,  5263,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5281,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5332,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2793,  2794,    -1,    -1,    -1,    -1,    -1,    -1,  5363,
-    5364,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5374,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5394,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2864,    -1,    -1,  5429,    -1,    -1,    -1,    -1,
-      -1,  5435,  5436,    -1,  5438,    -1,    -1,    -1,  2880,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5457,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5480,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2938,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5536,  5537,    -1,    -1,    -1,    -1,  5542,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5550,    -1,    -1,    -1,
-      -1,  2993,    -1,    -1,    -1,    -1,    -1,  5561,  5562,  5563,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3011,
-      -1,    -1,  3014,    -1,    -1,  3017,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3025,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3034,    -1,    -1,    -1,    -1,  3039,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3062,  3063,  3064,    -1,    -1,  3067,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3075,  3076,  3077,  3078,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3088,    -1,    -1,  3091,
-      -1,  3093,    -1,    -1,    -1,   153,    -1,    -1,    -1,    -1,
-      -1,    -1,  3104,  3105,   162,    -1,  3108,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3122,    -1,  3124,    -1,  3126,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3146,   203,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3157,    -1,  3159,  3160,  3161,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     238,    -1,  3184,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     248,    -1,    -1,    -1,    -1,  3197,    -1,    -1,    -1,    -1,
-    3202,    -1,    -1,    -1,    -1,    -1,  3208,    -1,     6,     7,
-       8,    -1,    10,    11,    12,    -1,  3218,    -1,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
-      -1,    -1,    -1,    31,    32,    33,    34,    -1,    36,    37,
-      38,    39,    -1,    41,    42,    43,    -1,    -1,    -1,    -1,
-      -1,    49,    50,    -1,    -1,  3257,    -1,    55,  3260,    -1,
-    3262,    -1,    -1,    -1,    -1,  3267,    64,    -1,    66,    -1,
-      68,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3291,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3318,    -1,    -1,    -1,
-     118,    -1,    -1,    -1,   122,   123,   124,   125,   126,    -1,
-      -1,    -1,    -1,  3335,    -1,    -1,    -1,    -1,    -1,    -1,
-     138,    -1,    -1,    -1,    -1,    -1,    -1,   145,    -1,   147,
-      -1,    -1,    -1,    -1,    -1,   153,    -1,  3359,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   165,   426,    -1,
-      -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   182,   183,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   209,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   217,
-      -1,    -1,  3424,   221,  3426,    -1,    -1,    -1,    -1,   227,
-      -1,    -1,    -1,    -1,    -1,   233,    -1,   235,    -1,    -1,
-      -1,    -1,    -1,   241,    -1,   243,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   251,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   265,   266,    -1,
-      -1,    -1,    -1,    -1,   272,    -1,   274,    -1,    -1,   277,
-     278,    -1,   280,  3485,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   289,   290,    -1,   292,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3510,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   314,   315,   316,    -1,
-      -1,   319,    -1,    -1,    -1,   323,    -1,    -1,   326,    -1,
-     328,    -1,    -1,    -1,  3536,    -1,    -1,    -1,    -1,  3541,
-      -1,    -1,    -1,    -1,   342,   343,    -1,   345,   346,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   357,
-      -1,   359,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   372,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   392,    -1,    -1,  3599,   396,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3617,   414,    -1,    -1,   417,
-      -1,    -1,   420,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3632,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,    -1,
-      -1,    -1,   440,    -1,    -1,   703,   704,    -1,    -1,   447,
-     448,    -1,    -1,    -1,    -1,   453,    -1,   455,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   464,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   479,    -1,  3685,   482,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   751,    -1,    -1,    -1,    -1,    -1,    -1,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3730,    -1,
-      -1,  3733,    -1,    -1,    -1,   533,    -1,  3739,    -1,    -1,
-      -1,    -1,    -1,  3745,    -1,  3747,    -1,    -1,  3750,    -1,
-      -1,    -1,  3754,  3755,  3756,  3757,  3758,    -1,    -1,  3761,
-    3762,  3763,  3764,  3765,  3766,  3767,  3768,  3769,  3770,    -1,
-      -1,    -1,  3774,  3775,    -1,    -1,    -1,  3779,    -1,    -1,
-      -1,    -1,  3784,    -1,    -1,    -1,  3788,    -1,    -1,    -1,
-    3792,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3800,    -1,
-      -1,  3803,    -1,  3805,    -1,    -1,    -1,    -1,   973,    -1,
-      -1,  3813,  3814,    -1,   872,  3817,  3818,    -1,    -1,    -1,
-    3822,  3823,   880,    -1,    -1,   883,   884,  3829,   886,   994,
-      -1,   889,    -1,   891,    -1,    -1,    -1,  3839,    -1,  3841,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3853,   910,    -1,    -1,    -1,    -1,  3859,  3860,  3861,
-     918,    -1,    -1,    -1,    -1,    -1,    -1,   925,    -1,    -1,
-     928,   929,    -1,    -1,    -1,   933,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   950,    -1,   952,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3906,    -1,    -1,    -1,    -1,    -1,
-     968,    -1,    -1,    -1,    -1,    -1,    -1,  3919,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   983,    -1,   985,    -1,    -1,
-     988,    -1,   990,  3935,    -1,   993,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3950,  1007,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1070,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4030,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1102,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1138,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4141,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1313,    -1,
-      -1,    -1,  1210,    -1,  1212,    -1,    -1,    -1,  1216,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4168,    -1,  1333,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1342,  1236,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4216,  4217,  4218,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1294,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1310,    -1,    -1,    -1,    -1,    -1,  1423,    -1,
-      -1,    -1,    -1,    -1,  1322,    -1,  1324,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1332,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1344,    -1,    -1,  1347,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4301,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4312,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1381,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4342,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4352,  4353,    -1,  4355,    -1,    -1,    -1,  4359,  4360,    -1,
-      -1,    -1,  4364,  4365,    -1,    -1,    -1,  4369,    -1,    -1,
-    4372,  4373,    -1,    -1,    -1,  4377,    -1,    -1,    -1,    -1,
-      -1,  4383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1554,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4401,
-      -1,    -1,    -1,  4405,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4417,    -1,    -1,    -1,    -1,
-    4422,    -1,    -1,    -1,    -1,    -1,  4428,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4446,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4475,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1543,    -1,    -1,    -1,    -1,
-      -1,  4493,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4522,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4542,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4557,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4596,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4631,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4642,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1831,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1738,  1739,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4695,    -1,  4697,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1894,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1796,    -1,
-      -1,  1799,    -1,    -1,    -1,    -1,  4748,    -1,    -1,  1807,
-    4752,    -1,    -1,    -1,    -1,  4757,    -1,    -1,    -1,    -1,
-      -1,    -1,  1927,    -1,    -1,    -1,    -1,  1825,    -1,    -1,
-      -1,    -1,  4774,  4775,    -1,    -1,  4778,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4792,    -1,    -1,    -1,    -1,  4797,    -1,    -1,    -1,    -1,
-    4802,    -1,    -1,  4805,  4806,    -1,    -1,    -1,    -1,    -1,
-      -1,  4813,  4814,    -1,  1872,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4835,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2008,    -1,    -1,    -1,  4849,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2023,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2031,    -1,    -1,    -1,
-      -1,    -1,  1930,    -1,    -1,    -1,    -1,  2042,    -1,    -1,
-    4882,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4892,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2089,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4943,    -1,  2108,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2120,    -1,    -1,    -1,    89,
-      -1,    -1,    -1,    -1,    94,    -1,    96,  2132,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   106,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2046,    -1,
-      -1,    -1,  4994,    -1,  4996,    -1,    -1,    -1,    -1,    -1,
-      -1,   131,    -1,    -1,    -1,    -1,    -1,  2172,    -1,    -1,
-    2175,   141,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   152,   153,  5026,  5027,   156,  5029,    -1,  5031,
-      -1,    -1,   162,    -1,    -1,    -1,   166,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5055,    -1,    -1,    -1,  5059,   188,    -1,
-      -1,    -1,    -1,  5065,    -1,    -1,    -1,    -1,  5070,    -1,
-      -1,    -1,    -1,   203,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2146,    -1,
-    5092,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2160,    -1,    -1,  2163,    -1,  2165,    -1,  2167,
-      -1,    -1,    -1,    -1,    -1,  2173,    -1,    -1,    -1,    -1,
-    5122,    -1,    -1,    -1,  5126,  5127,    -1,    -1,    -1,  5131,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2324,
-      -1,    -1,    -1,    -1,    -1,    -1,  2224,    -1,    -1,    -1,
-    5172,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2236,    -1,
-      -1,    -1,  2240,    -1,  2242,    -1,    -1,  2245,    -1,    -1,
-    5192,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2364,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5212,  5213,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5235,    -1,    -1,  5238,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  5247,    -1,    -1,    -1,    -1,
-    5252,    -1,  5254,    -1,  5256,    -1,    -1,    -1,    -1,    -1,
-      -1,  5263,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5281,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   426,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2367,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5332,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2524,
-      -1,  5363,  5364,  2528,  2529,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5374,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5394,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2591,  5429,    -1,    -1,
-      -1,    -1,    -1,  5435,  5436,    -1,  5438,    -1,  2603,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2509,    -1,    -1,    -1,  5457,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2640,    -1,    -1,    -1,    -1,
-      -1,  2539,  2540,    -1,    -1,    -1,  2544,  2545,    -1,    -1,
-      -1,  2549,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2563,    -1,    -1,    -1,    -1,
-      -1,    -1,  2570,    -1,    -1,    -1,  2574,  2575,    -1,    -1,
-    2578,  2579,    -1,    -1,    -1,   655,    -1,  2585,    -1,    -1,
-      -1,    -1,    -1,    -1,  5536,  5537,    -1,    -1,    -1,  2597,
-      -1,  2599,    -1,    -1,    -1,    -1,    -1,    -1,  5550,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2616,    -1,
-    5562,  5563,    -1,  2621,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   703,   704,    -1,  2634,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2642,    -1,  2644,    -1,  2646,  2647,
-    2648,    -1,    -1,    -1,    -1,  2653,  2654,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2663,    -1,    -1,    -1,    -1,
-    2668,    -1,    -1,    -1,    -1,  2673,    -1,    -1,    -1,    -1,
-      -1,   751,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2794,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2697,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2708,    -1,  2710,    -1,    -1,    -1,    -1,  2715,    -1,    -1,
-      -1,  2719,    -1,  2721,  2722,  2723,  2724,    -1,  2726,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2739,  2740,  2741,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2749,  2750,    -1,    -1,    -1,    -1,    -1,    -1,  2864,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2803,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   949,
-     950,    -1,   952,    -1,    -1,    -1,    -1,    -1,  2993,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3014,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3025,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1003,    -1,    -1,  1006,  1007,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1021,    -1,  1023,    -1,  1025,  2954,    -1,    -1,    -1,
-      -1,  1031,    -1,    -1,    -1,  1035,    -1,    -1,    -1,  2967,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1055,  1056,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3002,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1102,    -1,  1104,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3159,  3160,  3161,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1183,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1197,  1198,    -1,
-      -1,  1201,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3257,    -1,    -1,  3260,    -1,  3262,    -1,    -1,
-      -1,    -1,  3267,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1249,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3195,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3318,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3335,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3359,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3270,  3271,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3288,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3313,    -1,    -1,    -1,  3424,
-      -1,  3426,    -1,    -1,  3322,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3338,  3339,    -1,    -1,    -1,  3343,    -1,    -1,    -1,    -1,
-    3348,  3349,  3350,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3485,  3379,  3380,  3381,  3382,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3510,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3416,    -1,
-    3418,  3419,  3420,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3428,  3536,    -1,    -1,  1504,    -1,  3541,    -1,    -1,  1509,
-      -1,  1511,    -1,    -1,  1514,    -1,  1516,    -1,    -1,  1519,
-    1520,  1521,    -1,    -1,    -1,  1525,    -1,    -1,    -1,    -1,
-      -1,    -1,  1532,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1546,    -1,  1548,    -1,
-      -1,    -1,    -1,  1553,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3599,    -1,    -1,   973,    -1,  3497,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3505,    -1,    -1,
-      -1,    -1,  3617,    -1,    -1,    -1,    -1,    -1,   994,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3524,  3632,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3547,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3591,    -1,    -1,    -1,  3595,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1676,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1687,  1688,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3624,    -1,  3733,    -1,
-      -1,    -1,  3630,    -1,  1704,    -1,    -1,    -1,    -1,  1709,
-    1710,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3754,
-      -1,    -1,    -1,    -1,  3652,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3666,    -1,
-      -1,    -1,  3670,    -1,  3779,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3683,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     865,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3813,   874,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1791,    -1,  1793,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1803,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   909,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3861,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   967,    -1,    -1,    -1,  1876,    -1,   973,    -1,
-      -1,    -1,   977,    -1,  1884,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   994,
-    3935,    -1,    -1,    -1,    -1,    -1,    -1,  1313,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1333,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1342,    -1,    -1,    -1,
-      -1,    -1,    -1,  1943,    -1,    -1,  1946,  1947,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4030,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1099,  1100,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2015,    -1,  1423,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3957,
-      -1,  3959,    -1,    -1,    -1,    -1,    -1,    -1,  3966,    -1,
-      -1,  1136,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3983,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3998,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4009,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4027,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4054,    -1,    -1,    -1,
-      -1,    -1,    -1,  4168,    -1,    -1,    -1,  4065,  4066,  4067,
-      -1,    -1,  4070,  4071,  4072,  4073,  4074,  4075,  1554,    -1,
-      -1,    -1,  4080,  4081,    -1,  4083,  4084,  4085,  4086,  4087,
-    4088,  4089,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4098,    -1,  4100,  4101,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2208,    -1,
-    2210,  1306,  4140,    -1,  2214,    -1,  2216,    -1,  1313,  2219,
-      -1,    -1,  1317,  2223,    -1,    -1,    -1,    -1,  2228,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1333,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1342,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1380,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4236,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4355,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1423,    -1,
-    4365,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4272,  4273,  4274,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4284,    -1,    -1,    -1,
-    2360,    -1,    -1,    -1,    -1,    -1,    -1,  2367,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2377,    -1,    -1,
-      -1,    -1,  4417,    -1,    -1,    -1,    -1,  4422,    -1,    -1,
-      -1,    -1,    -1,  4428,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1496,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1831,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2441,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4493,  1554,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4522,  1894,    -1,
-    1585,    -1,    -1,    -1,  2494,    -1,    -1,    -1,  2498,    -1,
-      -1,    -1,    -1,    -1,  2504,    -1,  2506,  4542,    -1,  2509,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1613,    -1,
-      -1,  1927,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1641,  1642,  1643,    -1,
-    1645,    -1,    -1,    -1,    -1,  2555,    -1,    -1,    -1,    -1,
-      -1,  4596,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1665,    -1,    -1,  4501,    -1,    -1,    -1,  4505,  4506,  4507,
-    4508,    -1,    -1,  4511,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2008,    -1,    -1,  4533,  4534,  4535,  4536,    -1,
-    4538,  4539,    -1,    -1,    -1,    -1,    -1,  2023,    -1,    -1,
-      -1,    -1,  4550,  4551,  1719,  2031,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2042,    -1,    -1,    -1,
-    4568,    -1,    -1,    -1,    -1,    -1,    -1,  4575,  4576,    -1,
-    4578,    -1,    -1,  1748,    -1,    -1,    -1,  1752,  1753,    -1,
-    4695,    -1,  4697,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2089,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2701,  2108,    -1,    -1,    -1,    -1,    -1,    -1,  2709,
-      -1,  2711,    -1,    -1,  2120,    -1,    -1,  4752,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2132,    -1,    -1,    -1,
-      -1,    -1,    -1,  4661,    -1,    -1,  1831,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4682,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2172,    -1,    -1,  2175,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4721,    -1,    -1,    -1,    -1,    -1,  1894,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1927,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4882,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4795,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4810,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2008,    -1,    -1,    -1,    -1,  2324,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2023,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2031,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2042,    -1,    -1,
-      -1,    -1,    -1,    -1,  2954,  2955,  4884,    -1,    -1,    -1,
-      -1,  4996,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2971,    -1,    -1,  4902,    -1,    -1,    -1,    -1,  4907,
-    4908,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5027,    -1,  2089,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2102,    -1,    -1,
-      -1,    -1,    -1,  2108,    -1,    -1,    -1,    -1,    -1,  2114,
-      -1,    -1,    -1,    -1,    -1,  2120,    -1,    -1,    -1,    -1,
-    5065,    -1,    -1,    -1,    -1,  4963,    -1,  2132,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2147,    -1,    -1,    -1,    -1,    -1,  1099,  1100,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2172,    -1,  5007,
-    2175,    -1,    -1,    -1,    -1,    -1,    -1,  5122,    -1,  5017,
-      -1,  5126,  5127,    -1,    -1,  1136,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2524,    -1,
-      -1,    -1,  2528,  2529,  5052,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  5063,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2239,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5088,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3175,    -1,  5212,  5213,    -1,
-    3180,  2276,  2277,    -1,  5112,  2591,    -1,  2282,  2283,    -1,
-      -1,    -1,    -1,  5121,  2289,  2290,  2291,  2603,    -1,    -1,
-    2295,    -1,  2297,  2298,  2299,  2300,  2301,  2302,    -1,  2304,
-      -1,  2306,  2307,    -1,  5142,  2310,    -1,    -1,    -1,    -1,
-     973,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2324,
-    2325,  2326,  2327,  2328,  2640,    -1,    -1,    -1,  2333,    -1,
-      -1,   994,  2337,    -1,    -1,  2340,    -1,    -1,  2343,  2344,
-    2345,  2346,  2347,  2348,  2349,  2350,  2351,    -1,  2353,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2361,    -1,    -1,  2364,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5220,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5244,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2427,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  5279,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5294,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2794,    -1,
-      -1,  5319,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2524,
-      -1,    -1,    -1,  2528,  2529,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2864,    -1,
-      -1,    -1,    -1,    -1,    -1,  5393,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2576,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5418,    -1,  2587,    -1,    -1,    -1,  2591,    -1,    -1,  2594,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2603,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3536,    -1,    -1,    -1,
-      -1,  3541,    -1,    -1,  1585,  2640,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1313,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1613,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1333,    -1,    -1,    -1,    -1,    -1,    -1,  2993,    -1,  1342,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1641,  1642,  1643,    -1,  1645,    -1,    -1,    -1,  3014,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3025,
-      -1,    -1,    -1,    -1,  1665,    -1,    -1,    -1,    -1,    -1,
-    3630,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1423,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1719,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2793,  2794,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1748,    -1,    -1,
-      -1,  1752,  1753,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3720,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2864,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2880,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1554,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2938,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3257,    -1,    -1,  3260,    -1,  3262,    -1,    -1,    -1,
-      -1,  3267,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2993,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3318,    -1,    -1,    -1,  3011,    -1,    -1,  3014,
-      -1,    -1,  3017,    -1,  3924,    -1,    -1,    -1,    -1,  3335,
-    3025,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3034,
-      -1,    -1,    -1,    -1,  3039,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3359,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3062,  3063,  3064,
-      -1,    -1,  3067,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3075,  3076,  3077,  3078,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3088,    -1,    -1,  3091,    -1,  3093,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3104,
-    3105,    -1,    -1,  3108,    -1,    -1,    -1,    -1,  3424,    -1,
-    3426,    -1,    -1,    -1,    -1,    -1,    -1,  3122,    -1,  3124,
-    4030,  3126,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3146,    -1,    -1,    -1,    -1,    -1,    -1,  4058,    -1,
-      -1,    -1,  3157,    -1,  3159,  3160,  3161,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1831,  3485,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3184,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3197,    -1,  3510,    -1,    -1,  3202,    -1,    -1,
-      -1,    -1,    -1,  3208,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3218,    -1,    -1,    -1,    -1,    -1,    -1,
-    3536,    -1,    -1,    -1,    -1,  3541,    -1,    -1,    -1,    -1,
-      -1,  1894,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3257,    -1,    -1,  3260,    -1,  3262,    -1,    -1,
-      -1,    -1,  3267,    -1,  1927,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3599,    -1,    -1,  3291,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3617,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3318,    -1,    -1,  3632,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3335,  2282,    -1,    -1,   973,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2295,  2008,  2297,    -1,    -1,  2300,
-    2301,  2302,    -1,    -1,  3359,   994,  2307,    -1,    -1,  2310,
-    2023,    -1,    -1,    -1,    -1,    -1,    -1,  4277,  2031,    -1,
-      -1,    -1,    -1,    -1,  2325,  2326,  2327,  2328,    -1,  2042,
-      -1,    -1,  2333,    -1,    -1,    -1,  2337,    -1,    -1,  2340,
-      -1,    -1,  2343,  2344,  2345,  2346,  2347,  2348,  2349,  2350,
-    2351,    -1,  2353,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2361,    -1,    -1,  2364,    -1,    -1,    -1,  3733,    -1,  3424,
-      -1,  3426,    -1,    -1,    -1,    -1,  2089,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3754,    -1,
-      -1,    -1,    -1,    -1,    -1,  2108,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2120,    -1,    -1,
-      -1,    -1,    -1,  3779,    -1,    -1,    -1,    -1,    -1,  2132,
-      -1,    -1,    -1,    -1,    -1,    -1,  2427,    -1,    -1,    -1,
-    3485,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3813,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3510,    -1,    -1,    -1,  2172,
-      -1,    -1,  2175,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4433,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3536,    -1,    -1,    -1,    -1,  3541,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3599,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4519,
-      -1,    -1,  3617,    -1,    -1,    -1,    -1,    -1,    -1,  3935,
-      -1,    -1,    -1,    -1,    -1,  2576,    -1,  3632,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2324,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1313,    -1,    -1,    -1,    -1,    -1,
-    3685,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1333,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1342,  4614,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4030,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3730,    -1,    -1,  3733,    -1,
-      -1,    -1,    -1,    -1,  3739,    -1,    -1,    -1,    -1,    -1,
-    3745,    -1,  3747,    -1,    -1,  3750,    -1,    -1,    -1,  3754,
-    3755,  3756,  3757,  3758,    -1,    -1,  3761,  3762,  3763,  3764,
-    3765,  3766,  3767,  3768,  3769,  3770,    -1,    -1,    -1,  3774,
-    3775,    -1,    -1,    -1,  3779,    -1,    -1,    -1,    -1,  3784,
-      -1,    -1,    -1,  3788,  1423,    -1,    -1,  3792,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3800,    -1,    -1,  3803,    -1,
-    3805,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3813,  3814,
-      -1,    -1,  3817,  3818,    -1,    -1,    -1,  3822,  3823,    -1,
-      -1,    -1,    -1,    -1,  3829,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3839,    -1,  3841,    -1,    -1,    -1,
-      -1,    -1,  2793,    -1,    -1,    -1,    -1,    -1,  3853,    -1,
-      -1,    -1,  4168,    -1,  3859,  3860,  3861,    -1,    -1,    -1,
-      -1,  2524,    -1,    -1,    -1,  2528,  2529,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   973,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4216,  3906,    -1,    -1,    -1,   994,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3919,  1554,    -1,    -1,    -1,    -1,
-    4830,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2591,    -1,
-    3935,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2603,    -1,    -1,    -1,    -1,  3950,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4882,    -1,    -1,    -1,    -1,  2640,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2938,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4030,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4355,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4365,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3034,    -1,    -1,    -1,    -1,  3039,    -1,
-      -1,    -1,    -1,   973,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3064,   994,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3075,    -1,  3077,  3078,    -1,    -1,
-      -1,  2794,    -1,    -1,    -1,    -1,  4141,  3088,    -1,    -1,
-    3091,    -1,  3093,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4168,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3122,    -1,  3124,    -1,  3126,    -1,  4493,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1831,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2864,    -1,    -1,    -1,    -1,  4522,    -1,  3159,  3160,
-    3161,  4216,  4217,  4218,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1313,    -1,  4542,    -1,    -1,    -1,
-      -1,    -1,    -1,  3184,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1333,    -1,  3197,    -1,    -1,    -1,
-      -1,  3202,    -1,  1342,    -1,  1894,    -1,  3208,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4596,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1927,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4301,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4312,    -1,    -1,
-      -1,    -1,    -1,  5223,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2993,    -1,    -1,    -1,  1423,    -1,    -1,  4342,    -1,    -1,
-    3291,    -1,    -1,    -1,    -1,    -1,    -1,  4352,  4353,    -1,
-    4355,  3014,    -1,    -1,  4359,  4360,    -1,    -1,    -1,  4364,
-    4365,    -1,  3025,    -1,  4369,    -1,    -1,  4372,  4373,  2008,
-      -1,    -1,  4377,    -1,    -1,    -1,    -1,    -1,  4383,    -1,
-      -1,  4697,    -1,    -1,  2023,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2031,    -1,    -1,    -1,  4401,    -1,    -1,    -1,
-    4405,    -1,    -1,  2042,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4417,    -1,    -1,    -1,    -1,  4422,    -1,    -1,
-      -1,    -1,    -1,  4428,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1313,    -1,    -1,  4752,    -1,    -1,    -1,
-      -1,  4446,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2089,    -1,    -1,  1333,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1342,    -1,    -1,  1554,    -1,    -1,    -1,  2108,
-    4475,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2120,    -1,    -1,    -1,    -1,    -1,    -1,  4493,    -1,
-      -1,    -1,    -1,  2132,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4522,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2172,    -1,    -1,  2175,  4542,    -1,    -1,
-      -1,    -1,    -1,  1423,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4557,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4882,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4596,    -1,    -1,  3257,    -1,    -1,  3260,    -1,  3262,
-      -1,    -1,    -1,    -1,  3267,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4631,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4642,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3318,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3335,    -1,  1554,    -1,    -1,    -1,    -1,    -1,
-    4996,    -1,    -1,    -1,    -1,  2324,    -1,    -1,    -1,    -1,
-    4695,    -1,  4697,    -1,    -1,    -1,  3359,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   973,
-      -1,  5027,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     994,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1831,  4748,    -1,    -1,    -1,  4752,    -1,  5065,
-      -1,    -1,  4757,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3424,    -1,  3426,    -1,    -1,    -1,    -1,    -1,  4774,
-    4775,    -1,    -1,  4778,    -1,    -1,    -1,    -1,    -1,  3730,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4792,  3739,    -1,
-      -1,    -1,  4797,    -1,  3745,    -1,  3747,  4802,    -1,    -1,
-    4805,  4806,    -1,    -1,    -1,  1894,  5122,    -1,  4813,  4814,
-    5126,  5127,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3485,  3774,  3775,    -1,    -1,    -1,    -1,    -1,
-    4835,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1927,    -1,
-      -1,  3792,    -1,    -1,  4849,    -1,    -1,  3510,    -1,  3800,
-      -1,    -1,  3803,    -1,  3805,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3814,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3822,  3823,  3536,    -1,    -1,    -1,  4882,  3541,    -1,
-      -1,    -1,    -1,    -1,    -1,  2524,    -1,  4892,    -1,  2528,
-    2529,    -1,    -1,    -1,    -1,    -1,    -1,  5213,    -1,    -1,
-      -1,    -1,  3853,    -1,    -1,    -1,    -1,    -1,  3859,  3860,
-    3861,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2008,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2023,    -1,  3599,    -1,  4943,    -1,
-      -1,    -1,  2031,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1831,  2591,  2042,  3617,  3906,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2603,    -1,    -1,    -1,  3919,  3632,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4994,
-      -1,  4996,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2089,  2640,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1894,    -1,    -1,    -1,    -1,  2108,
-      -1,  5026,  5027,    -1,  5029,    -1,  5031,    -1,    -1,    -1,
-      -1,  2120,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2132,    -1,    -1,    -1,  1927,    -1,  1313,
-    5055,    -1,    -1,    -1,  5059,    -1,    -1,    -1,    -1,    -1,
-    5065,    -1,    -1,    -1,    -1,  5070,    -1,    -1,    -1,  1333,
-    3733,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1342,    -1,
-      -1,    -1,    -1,  2172,    -1,    -1,  2175,  5092,    -1,    -1,
-      -1,  3754,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3779,  5122,    -1,    -1,
-      -1,  5126,  5127,    -1,    -1,    -1,  5131,    -1,  2008,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2023,    -1,    -1,    -1,    -1,    -1,    -1,
-    3813,  2031,    -1,    -1,    -1,  2794,    -1,    -1,    -1,  1423,
-      -1,    -1,  2042,    -1,    -1,    -1,    -1,  5172,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5192,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5212,  5213,  2089,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2864,    -1,    -1,  2108,    -1,
-    5235,    -1,    -1,  5238,    -1,  2324,    -1,    -1,    -1,    -1,
-    2120,    -1,  5247,    -1,    -1,    -1,    -1,  5252,    -1,  5254,
-      -1,  5256,  2132,    -1,    -1,    -1,    -1,    -1,  5263,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4217,  4218,    -1,    -1,
-      -1,    -1,  3935,    -1,    -1,    -1,  5281,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1554,    -1,  2172,    -1,    -1,  2175,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5332,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4301,    -1,    -1,    -1,  2993,    -1,    -1,    -1,  5363,  5364,
-      -1,  4312,    -1,    -1,    -1,    -1,    -1,  4030,    -1,  5374,
-      -1,    -1,    -1,    -1,    -1,  3014,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3025,    -1,    -1,  5394,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4352,  4353,    -1,    -1,    -1,    -1,    -1,  4359,  4360,
-      -1,    -1,    -1,  4364,    -1,    -1,    -1,    -1,  4369,    -1,
-      -1,  4372,  4373,    -1,  5429,    -1,  4377,    -1,    -1,    -1,
-    5435,  5436,  4383,  5438,    -1,  2524,    -1,    -1,    -1,  2528,
-    2529,    -1,    -1,    -1,  2324,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5457,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4417,    -1,    -1,    -1,
-      -1,  4422,    -1,    -1,    -1,    -1,    -1,  4428,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4446,    -1,    -1,    -1,    -1,
-      -1,    -1,  2591,    -1,    -1,  4168,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2603,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4475,    -1,    -1,    -1,    -1,    -1,
-      -1,  5536,  5537,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  5550,    -1,    -1,    -1,    -1,
-      -1,  2640,    -1,  4216,    -1,    -1,    -1,  5562,  5563,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1831,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4557,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3257,    -1,
-      -1,  3260,    -1,  3262,    -1,    -1,    -1,    -1,  3267,    -1,
-    1894,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2524,    -1,    -1,    -1,  2528,  2529,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1927,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3318,
-    4631,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4355,    -1,    -1,    -1,  3335,    -1,    -1,    -1,
-      -1,    -1,  4365,    -1,    -1,  2794,    -1,    -1,    -1,    -1,
-      -1,  2591,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3359,    -1,    -1,  2603,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2008,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2023,
-    2640,    -1,    -1,    -1,    -1,    -1,    -1,  2031,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2864,    -1,    -1,  2042,    -1,
-      -1,    -1,    -1,    -1,    -1,  3424,    -1,  3426,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4774,  4775,  2089,    -1,  4778,    -1,    -1,
-    4493,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2108,    -1,  3485,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2120,    -1,    -1,  4522,
-      -1,    -1,  4813,  4814,    -1,    -1,    -1,    -1,  2132,    -1,
-      -1,  3510,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4542,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3536,    -1,    -1,
-      -1,    -1,  3541,    -1,  2993,    -1,    -1,    -1,  2172,    -1,
-      -1,  2175,    -1,    -1,  2794,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3014,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4596,    -1,    -1,  3025,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3599,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3617,    -1,
-      -1,    -1,    -1,    -1,  2864,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3632,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4697,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2324,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5029,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4752,
-      -1,    -1,    -1,    -1,  3733,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5055,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2993,    -1,  3754,    -1,    -1,    -1,  5070,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3014,    -1,    -1,    -1,    -1,    -1,
-    3779,  5092,    -1,    -1,    -1,  3025,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3257,    -1,
-      -1,  3260,    -1,  3262,  3813,    -1,    -1,    -1,  3267,    -1,
-    5131,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1657,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4882,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3318,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  5192,    -1,    -1,    -1,    -1,  3335,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2524,    -1,    -1,    -1,  2528,  2529,    -1,    -1,    -1,    -1,
-    3359,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1734,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3935,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  5256,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2591,    -1,    -1,
-    5281,    -1,    -1,  4996,    -1,  3424,    -1,  3426,    -1,  2603,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5027,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2640,  3257,    -1,    -1,
-    3260,    -1,  3262,    -1,    -1,    -1,    -1,  3267,    -1,    -1,
-      -1,  4030,    -1,    -1,    -1,    -1,  3485,    -1,    -1,    -1,
-      -1,    -1,  5065,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5363,  5364,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3510,    -1,  5374,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3318,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3536,    -1,    -1,
-      -1,    -1,  3541,    -1,    -1,  3335,    -1,    -1,    -1,  5122,
-      -1,    -1,    -1,  5126,  5127,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3359,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5438,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5457,    -1,    -1,    -1,
-    3599,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3617,  4168,
-    2794,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3632,  3424,    -1,  3426,    -1,    -1,    -1,
-    5213,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4216,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  5536,  5537,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2864,    -1,    -1,    -1,    -1,  3485,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3510,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3733,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3536,    -1,    -1,    -1,
-      -1,  3541,    -1,    -1,    -1,  3754,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3779,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4355,    -1,    -1,  3599,
-      -1,    -1,    -1,    -1,  3813,    -1,  4365,    -1,    -1,  2993,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3617,    -1,    -1,
-      -1,    -1,    -1,    -1,  2191,    -1,    -1,    -1,    -1,    -1,
-    3014,    -1,  3632,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3025,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2280,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3935,  2294,    -1,    -1,
-      -1,  2298,    -1,  3733,  4493,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2312,  2313,  2314,    -1,    -1,
-    2317,    -1,    -1,    -1,  3754,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4522,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3779,
-      -1,    -1,    -1,  4542,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2359,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3813,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4030,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4596,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2414,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2437,    -1,    -1,  3257,    -1,    -1,  3260,    -1,  3262,    -1,
-      -1,    -1,  2449,  3267,    -1,  2452,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3318,  3935,    -1,    -1,  4697,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3335,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4168,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3359,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4752,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4216,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    4030,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3424,    -1,  3426,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3485,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4882,    -1,    -1,  3510,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4355,    -1,    -1,    -1,
-      -1,    -1,  3536,    -1,    -1,    -1,  4365,  3541,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4168,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3599,  4216,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3617,    -1,    -1,    -1,  4996,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3632,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5027,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4493,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5065,    -1,    -1,    -1,
-      -1,    -1,    -1,  4522,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4542,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3733,
-      -1,    -1,    -1,    -1,    -1,  4355,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5122,    -1,  4365,    -1,  5126,  5127,    -1,
-    3754,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4596,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  3779,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3813,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5213,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3037,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4697,    -1,
-    3057,    -1,  3059,  4493,    -1,  3062,  3063,    -1,  3065,    -1,
-    3067,    -1,    -1,    -1,  3071,    -1,    -1,  3074,    -1,    -1,
-      -1,    -1,  3079,    -1,    -1,    -1,    -1,    -1,  3085,    -1,
-      -1,    -1,  4522,  3090,    -1,    -1,    -1,    -1,    -1,    -1,
-    3097,  3098,  3099,  3100,    -1,    -1,    -1,  3104,  3105,    -1,
-    3107,    -1,  4542,  4752,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  3935,  3119,    -1,  3121,    -1,    -1,    -1,    -1,    -1,
-      -1,  3128,  3129,  3130,  3131,  3132,  3133,  3134,  3135,  3136,
-    3137,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4596,    -1,  3165,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,
-      -1,    -1,    -1,     9,    -1,    -1,    -1,    13,    -1,    15,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    28,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4030,    -1,    44,    45,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4882,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4697,    94,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   104,    -1,
-     106,   107,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   121,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3306,
-      -1,    -1,    -1,    -1,    -1,   141,    -1,   143,   144,    -1,
-      -1,    -1,  4752,   149,    -1,   151,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   162,    -1,   164,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   179,  4168,   181,    -1,  4996,   184,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     196,    -1,   198,    -1,    -1,    -1,   202,    -1,    -1,    -1,
-      -1,    -1,   208,    -1,    -1,    -1,    -1,    -1,  5027,    -1,
-     216,    -1,   218,    -1,    -1,    -1,    -1,    -1,   224,    -1,
-      -1,    -1,  4216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   239,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5065,    -1,    -1,   255,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4882,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   294,   295,
-      -1,    -1,    -1,    -1,   300,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5122,    -1,   311,    -1,  5126,  5127,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   322,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   361,    -1,    -1,    -1,    -1,
-    3537,  4355,    -1,    -1,    -1,    -1,    -1,   373,    -1,    -1,
-      -1,  4365,   378,   379,    -1,   381,    -1,    -1,    -1,    -1,
-     386,    -1,    -1,    -1,    -1,   391,  4996,    -1,   394,    -1,
-      -1,    -1,    -1,   399,  5213,    -1,    -1,    -1,   404,   405,
-      -1,    -1,    -1,    -1,    -1,    -1,   412,    -1,    -1,    -1,
-     416,    -1,    -1,    -1,    -1,    -1,    -1,  5027,    -1,    -1,
-     426,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   438,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   457,    -1,   459,    -1,  5065,    -1,    -1,    -1,    -1,
-      -1,   467,    -1,    -1,    -1,    -1,    -1,   473,    -1,    -1,
-      -1,    -1,   478,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   491,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3674,    -1,  4493,
-      -1,    -1,    -1,    -1,    -1,    -1,   512,    -1,    -1,    -1,
-      -1,    -1,  5122,    -1,    -1,    -1,  5126,  5127,    -1,    -1,
-     526,    -1,    -1,    -1,   530,    -1,    -1,    -1,  4522,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4542,    -1,
-      -1,    -1,  3729,    -1,    -1,    -1,    -1,    -1,  3735,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3751,  3752,    -1,    -1,  3755,  3756,
-    3757,  3758,    -1,    -1,  3761,  3762,  3763,  3764,  3765,  3766,
-    3767,  3768,  3769,  3770,  3771,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4596,  5213,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3793,    -1,    -1,  3796,
-      -1,  3798,    -1,    -1,  3801,  3802,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3816,
-    3817,  3818,  3819,    -1,  3821,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4697,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3889,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3900,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4752,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3947,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4882,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4141,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4996,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5027,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  5065,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4302,    -1,    -1,  5122,  4306,
-    4307,  4308,  5126,  5127,    -1,    -1,    -1,  4314,  4315,  4316,
-    4317,    -1,    -1,    -1,    -1,  4322,  4323,  4324,  4325,  4326,
-    4327,  4328,  4329,  4330,  4331,  4332,  4333,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4358,    -1,    -1,  4361,    -1,  4363,    -1,    -1,    -1,
-    4367,    -1,    -1,  4370,  4371,    -1,    -1,  4374,  4375,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5213,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4419,    -1,    -1,    -1,    -1,    -1,    -1,  4426,
-    4427,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4445,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4634,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,  4692,  4693,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    36,    37,    38,
-      39,    -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,  4742,    55,    -1,    -1,    -1,
-    4747,  4748,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,  4762,    -1,  4764,    -1,    78,
-      79,  4768,  4769,  4770,    -1,    -1,  4773,    -1,    -1,  4776,
-    4777,    -1,    -1,    -1,  4781,    94,    -1,    -1,  4785,    -1,
-      -1,    -1,    -1,    -1,    -1,   104,    -1,   106,   107,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   116,    -1,   118,
-      -1,    -1,   121,   122,   123,   124,   125,   126,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   138,
-      -1,    -1,   141,    -1,   143,   144,   145,    -1,   147,    -1,
-     149,    -1,   151,    -1,   153,    -1,    -1,    -1,    -1,    -1,
-    4847,    -1,    -1,   162,    -1,   164,   165,    -1,    -1,    -1,
-      -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,    -1,    -1,
-     179,    -1,   181,   182,   183,   184,    -1,    -1,    -1,    -1,
-      -1,   190,    -1,    -1,    -1,    -1,    -1,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,    -1,    -1,    -1,    -1,   208,
-     209,    -1,    -1,    -1,    -1,    -1,  4903,   216,   217,   218,
-      -1,    -1,   221,    -1,    -1,   224,    -1,    -1,   227,    -1,
-      -1,    -1,    -1,    -1,   233,    -1,   235,    -1,    -1,    -1,
-     239,    -1,   241,    -1,   243,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   251,    -1,    -1,    -1,   255,    -1,    -1,    -1,
-      -1,  4948,    -1,    -1,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,    -1,   274,    -1,    -1,   277,   278,
-      -1,   280,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     289,   290,    -1,   292,    -1,   294,   295,    -1,    -1,    -1,
-      -1,   300,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   311,    -1,    -1,   314,   315,   316,    -1,    -1,
-     319,    -1,    -1,   322,   323,    -1,    -1,   326,    -1,   328,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5025,  5026,
-      -1,    -1,    -1,   342,   343,    -1,   345,   346,    -1,    -1,
-      -1,    -1,    -1,    -1,  5041,  5042,  5043,    -1,   357,    -1,
-     359,    -1,   361,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   372,   373,    -1,    -1,    -1,    -1,   378,
-     379,    -1,   381,    -1,    -1,    -1,    -1,   386,    -1,    -1,
-    5077,  5078,   391,   392,    -1,   394,    -1,   396,    -1,    -1,
-     399,    -1,    -1,    -1,    -1,   404,   405,    -1,    -1,    -1,
-      -1,    -1,    -1,   412,    -1,   414,    -1,   416,   417,    -1,
-      -1,   420,    -1,    -1,    -1,    -1,    -1,   426,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,    -1,   438,
-      -1,   440,    -1,    -1,    -1,    -1,    -1,    -1,   447,   448,
-      -1,    -1,    -1,    -1,   453,    -1,   455,    -1,   457,    -1,
-     459,    -1,    -1,    -1,    -1,   464,    -1,    -1,   467,    -1,
-      -1,   470,    -1,    -1,   473,    -1,    -1,    -1,    -1,   478,
-     479,    -1,    -1,   482,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   491,    -1,    -1,    -1,    -1,    -1,    -1,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,    -1,    -1,
-      -1,    -1,    -1,   512,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,    -1,    -1,
-      -1,   530,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5227,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5243,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5293,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5331,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  5392,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5441,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
-      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,  5509,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5549,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
-     351,   352,   353,   354,   355,   356,   357,   358,   359,   360,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
-     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
-     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
-     441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,   478,   479,   480,
-     481,   482,   483,   484,   485,   486,   487,   488,   489,   490,
-     491,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,   532,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    -1,    41,    42,    43,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    71,    -1,    -1,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,    -1,
-      -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-      -1,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-     147,    -1,   149,   150,   151,   152,   153,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
-     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-     197,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,   233,    -1,   235,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
-      -1,   268,   269,   270,   271,   272,    -1,   274,    -1,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,   290,   291,   292,    -1,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,   343,   344,   345,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
-     417,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,   440,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,   456,
-     457,   458,   459,   460,   461,   462,   463,    -1,   465,   466,
-     467,   468,   469,   470,   471,    -1,   473,   474,   475,   476,
-     477,   478,   479,   480,   481,   482,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,   510,    -1,    -1,    -1,    -1,    -1,    -1,
-     517,   518,   519,    -1,    -1,    -1,    -1,    -1,    -1,   526,
-     527,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    -1,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    -1,    41,    42,    43,
-      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
-      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      64,    -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
-     104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,
-     114,    -1,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   126,    -1,   128,   129,   130,   131,   132,   133,
-     134,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
-     144,   145,    -1,   147,    -1,   149,   150,   151,   152,   153,
-     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
-      -1,   165,   166,   167,    -1,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
-     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
-      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
-      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
-      -1,   235,   236,   237,   238,    -1,   240,   241,    -1,   243,
-     244,    -1,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
-     264,   265,   266,    -1,   268,   269,   270,   271,   272,    -1,
-     274,    -1,   276,   277,   278,   279,   280,   281,   282,   283,
-     284,   285,    -1,    -1,   288,   289,   290,   291,   292,    -1,
-     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,   326,   327,   328,   329,   330,   331,    -1,   333,
-      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,   343,
-     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
-     384,   385,   386,   387,   388,    -1,   390,   391,   392,   393,
-     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
-     414,   415,   416,   417,   418,   419,   420,   421,    -1,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,    -1,   436,   437,   438,   439,   440,   441,   442,   443,
-     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
-     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,   466,   467,   468,   469,   470,   471,    -1,   473,
-     474,   475,   476,   477,   478,   479,    -1,   481,   482,   483,
-     484,   485,   486,    -1,    -1,   489,    -1,   491,   492,   493,
-     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
-     504,   505,   506,   507,   508,   509,   510,    -1,   512,    -1,
-      -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   526,   527,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
-      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      71,    -1,    -1,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,   110,
-      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,    -1,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,   147,    -1,   149,   150,
-     151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,   165,   166,   167,    -1,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,   265,   266,    -1,   268,   269,   270,
-     271,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,   290,
-     291,   292,    -1,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,   440,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,    -1,   465,   466,   467,   468,   469,   470,
-     471,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,   510,
-      -1,    -1,    -1,    -1,    -1,    -1,   517,   518,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   526,   527,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    -1,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    -1,    41,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    71,    -1,    -1,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,   153,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,   233,    -1,   235,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
-     268,   269,   270,   271,   272,    -1,   274,    -1,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,   290,   291,   292,    -1,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,    -1,   465,   466,   467,
-     468,   469,   470,   471,    -1,   473,   474,   475,   476,   477,
-     478,   479,    -1,   481,   482,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,   510,    -1,    -1,    -1,    -1,    -1,    -1,   517,
-     518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,   527,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,   114,
-      -1,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,    -1,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-     165,   166,   167,    -1,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
-     235,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-     265,   266,    -1,   268,   269,   270,   271,   272,    -1,   274,
-      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,   290,   291,   292,    -1,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,   411,   412,   413,   414,
-     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
-     465,   466,   467,   468,   469,   470,   471,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,   482,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,   510,    -1,    -1,    -1,    -1,
-      -1,    -1,   517,   518,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   526,   527,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    -1,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    -1,    41,
-      42,    43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
-      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
-      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
-      -1,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
-     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
-     142,   143,   144,    -1,    -1,   147,    -1,   149,   150,   151,
-     152,   153,   154,   155,   156,    -1,   158,   159,   160,   161,
-     162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,
-     172,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
-     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
-     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
-      -1,   213,   214,   215,   216,    -1,   218,   219,   220,    -1,
-      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
-     232,   233,    -1,   235,   236,   237,   238,    -1,   240,    -1,
-      -1,    -1,   244,    -1,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,    -1,   264,   265,   266,    -1,   268,   269,   270,   271,
-     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
-     282,   283,   284,   285,    -1,    -1,   288,    -1,   290,   291,
-     292,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,   317,   318,    -1,    -1,   321,
-     322,   323,   324,    -1,    -1,   327,   328,   329,   330,   331,
-      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
-     342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
-     352,   353,    -1,   355,   356,    -1,   358,    -1,   360,   361,
-     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
-     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
-     392,   393,   394,   395,    -1,   397,   398,   399,   400,   401,
-     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
-     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
-      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,    -1,    -1,   436,   437,    -1,   439,   440,   441,
-     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
-     452,    -1,   454,    -1,    -1,   457,   458,   459,   460,   461,
-     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
-      -1,   473,   474,   475,   476,   477,    -1,   479,   480,   481,
-     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
-     492,   493,   494,   495,   496,   497,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   507,   508,   509,    -1,    -1,
-      -1,    -1,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,   527,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    -1,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    -1,    41,    42,
-      43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,   118,   119,   120,   121,    -1,
-     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,    -1,    -1,   147,    -1,   149,   150,   151,   152,
-     153,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,   172,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,    -1,   218,   219,   220,    -1,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-     233,    -1,   235,   236,   237,   238,    -1,   240,    -1,    -1,
-      -1,   244,    -1,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-      -1,   264,   265,   266,    -1,   268,   269,   270,   271,   272,
-      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,    -1,    -1,   288,    -1,   290,   291,   292,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,    -1,    -1,   321,   322,
-     323,   324,    -1,    -1,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,    -1,   358,    -1,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
-     393,   394,   395,    -1,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,    -1,    -1,   436,   437,    -1,   439,   440,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-      -1,   454,    -1,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,    -1,   479,   480,   481,   482,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   507,   508,   509,    -1,    -1,    -1,
-      -1,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      -1,    15,    16,    -1,   527,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    -1,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    -1,    41,    42,    43,
-      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
-      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      64,    -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
-     104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,
-     114,    -1,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   126,    -1,   128,   129,   130,   131,   132,   133,
-     134,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
-     144,   145,    -1,   147,    -1,   149,   150,   151,   152,   153,
-     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
-      -1,   165,   166,   167,    -1,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,   185,   186,    -1,   188,   189,   190,   191,   192,    -1,
-     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
-      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
-      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
-      -1,   235,   236,   237,   238,    -1,   240,   241,    -1,   243,
-     244,    -1,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
-     264,   265,   266,    -1,   268,   269,   270,   271,   272,    -1,
-     274,    -1,   276,   277,   278,   279,   280,   281,   282,   283,
-     284,   285,    -1,    -1,   288,   289,   290,   291,   292,    -1,
-     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,   326,   327,   328,   329,   330,   331,    -1,   333,
-      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,   343,
-     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
-     384,   385,   386,   387,   388,    -1,   390,   391,   392,   393,
-     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
-     414,   415,   416,   417,   418,   419,   420,   421,    -1,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,    -1,   436,   437,   438,   439,   440,   441,   442,   443,
-     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
-     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,   466,   467,   468,   469,   470,   471,    -1,   473,
-     474,   475,   476,   477,   478,   479,    -1,   481,   482,   483,
-     484,   485,   486,    -1,    -1,   489,    -1,   491,   492,   493,
-     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
-     504,   505,   506,   507,   508,   509,   510,    -1,   512,    -1,
-      -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   526,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    -1,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    -1,    41,
-      42,    43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
-      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    71,
-      -1,    -1,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
-      -1,   103,   104,   105,    -1,    -1,    -1,    -1,   110,    -1,
-      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,    -1,   141,
-     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
-     152,   153,   154,   155,   156,    -1,   158,   159,   160,   161,
-     162,   163,    -1,   165,   166,   167,    -1,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
-     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
-     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
-      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
-     222,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
-     232,   233,    -1,   235,   236,   237,   238,    -1,   240,   241,
-      -1,   243,   244,    -1,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
-     262,    -1,   264,   265,   266,    -1,   268,   269,   270,   271,
-     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
-     282,   283,   284,   285,    -1,    -1,   288,   289,   290,   291,
-     292,    -1,   294,   295,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
-      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
-     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
-     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
-     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
-     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
-     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
-      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   434,    -1,   436,   437,   438,   439,   440,   441,
-     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,    -1,   465,   466,   467,   468,   469,   470,   471,
-      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
-     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,   491,
-     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
-     502,   503,   504,   505,   506,   507,   508,   509,   510,    -1,
-     512,    -1,    -1,    -1,    -1,   517,   518,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   526,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
-      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
-      70,    71,    -1,    -1,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
-     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
-     110,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-      -1,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
-     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
-     160,   161,   162,   163,    -1,   165,   166,   167,    -1,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
-     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
-     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
-     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,    -1,   225,   226,   227,   228,    -1,
-     230,    -1,   232,   233,   234,   235,   236,   237,   238,    -1,
-     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
-     260,   261,   262,    -1,   264,   265,   266,    -1,   268,   269,
-     270,   271,   272,    -1,   274,    -1,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   285,    -1,   287,   288,   289,
-     290,   291,   292,    -1,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
-     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
-      -1,   341,   342,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
-     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
-     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
-     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
-     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
-     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
-     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
-     450,   451,   452,   453,   454,   455,   456,   457,   458,   459,
-     460,   461,   462,   463,    -1,   465,   466,   467,   468,   469,
-     470,   471,    -1,   473,   474,   475,   476,   477,   478,   479,
-      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
-      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
-     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
-     510,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   526,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    -1,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    -1,    41,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    71,    -1,    -1,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,   153,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,   233,    -1,   235,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
-     268,   269,   270,   271,   272,    -1,   274,    -1,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,   290,   291,   292,    -1,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,    -1,   465,   466,   467,
-     468,   469,   470,   471,    -1,   473,   474,   475,   476,   477,
-     478,   479,    -1,   481,   482,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,   510,    -1,    -1,    -1,    -1,    -1,    -1,   517,
-     518,    -1,    -1,    -1,    -1,    -1,   524,   525,   526,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    71,    -1,    -1,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-     266,    -1,   268,   269,   270,   271,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,   290,   291,   292,    -1,   294,   295,
-     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
-     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
-     466,   467,   468,   469,   470,   471,    -1,   473,   474,   475,
-     476,   477,   478,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,   510,    -1,    -1,    -1,    -1,    -1,
-      -1,   517,   518,   519,    -1,    -1,    -1,    -1,    -1,    -1,
-     526,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    -1,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    -1,    41,    42,    43,
-      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
-      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      64,    -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
-     104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,
-     114,    -1,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   126,    -1,   128,   129,   130,   131,   132,   133,
-     134,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
-     144,   145,    -1,   147,    -1,   149,   150,   151,   152,   153,
-     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
-      -1,   165,   166,   167,    -1,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,   185,   186,    -1,   188,   189,   190,   191,   192,    -1,
-     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
-      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
-      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
-      -1,   235,   236,   237,   238,    -1,   240,   241,    -1,   243,
-     244,    -1,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
-     264,   265,   266,    -1,   268,   269,   270,   271,   272,    -1,
-     274,    -1,   276,   277,   278,   279,   280,   281,   282,   283,
-     284,   285,    -1,    -1,   288,   289,   290,   291,   292,    -1,
-     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,   326,   327,   328,   329,   330,   331,    -1,   333,
-      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,   343,
-     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
-     384,   385,   386,   387,   388,    -1,   390,   391,   392,   393,
-     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
-     404,    -1,   406,   407,   408,   409,   410,   411,   412,   413,
-     414,   415,   416,   417,   418,   419,   420,   421,    -1,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,    -1,   436,   437,    -1,   439,   440,   441,   442,   443,
-     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
-     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,   466,   467,   468,   469,   470,   471,    -1,   473,
-     474,   475,   476,   477,   478,   479,    -1,   481,   482,   483,
-     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
-     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
-     504,   505,   506,   507,   508,   509,   510,    -1,    -1,    -1,
-      -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   526,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    -1,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    -1,    41,
-      42,    43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
-      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    71,
-      -1,    -1,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,   103,   104,   105,    -1,    -1,    -1,    -1,   110,    -1,
-      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,    -1,   141,
-     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
-     152,   153,   154,   155,   156,    -1,   158,   159,   160,   161,
-     162,   163,    -1,   165,   166,   167,    -1,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
-     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
-     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
-      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
-     222,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
-     232,   233,    -1,   235,   236,   237,   238,    -1,   240,   241,
-      -1,   243,   244,    -1,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
-     262,    -1,   264,   265,   266,    -1,   268,   269,   270,   271,
-     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
-     282,   283,   284,   285,    -1,    -1,   288,   289,   290,   291,
-     292,    -1,   294,   295,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
-      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
-     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
-     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
-     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
-     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
-     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,    -1,   406,   407,   408,   409,   410,   411,
-     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
-      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   434,    -1,   436,   437,    -1,   439,   440,   441,
-     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,    -1,   465,   466,   467,   468,   469,   470,   471,
-      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
-     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
-     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
-     502,   503,   504,   505,   506,   507,   508,   509,   510,    -1,
-      -1,    -1,    -1,    -1,    -1,   517,   518,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   526,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
-      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
-      70,    71,    -1,    -1,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
-     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
-     110,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,    -1,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-      -1,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
-     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
-     160,   161,   162,   163,    -1,   165,   166,   167,    -1,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
-     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
-     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
-     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,    -1,   225,   226,   227,   228,    -1,
-     230,    -1,   232,   233,   234,   235,   236,   237,   238,    -1,
-     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
-     260,   261,   262,    -1,   264,   265,   266,    -1,   268,   269,
-     270,   271,   272,    -1,   274,    -1,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
-     290,   291,   292,    -1,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
-     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
-      -1,   341,   342,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
-     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
-     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
-     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
-     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
-     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
-     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
-      -1,   451,   452,   453,   454,   455,   456,   457,   458,   459,
-     460,   461,   462,   463,    -1,   465,   466,   467,   468,   469,
-     470,   471,    -1,   473,   474,   475,   476,   477,   478,   479,
-      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
-      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
-     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
-     510,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   526,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    -1,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    -1,    41,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    71,    -1,    -1,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,   153,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,   233,    -1,   235,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
-     268,   269,   270,   271,   272,    -1,   274,    -1,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,   290,   291,   292,    -1,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,    -1,   465,   466,   467,
-     468,   469,   470,   471,    -1,   473,   474,   475,   476,   477,
-     478,   479,   480,   481,   482,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,   510,    -1,    -1,    -1,    -1,    -1,    -1,   517,
-     518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    71,    -1,    -1,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-     266,    -1,   268,   269,   270,   271,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,   290,   291,   292,    -1,   294,   295,
-     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
-     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
-     466,   467,   468,   469,   470,   471,    -1,   473,   474,   475,
-     476,   477,   478,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,   510,    -1,    -1,    -1,    -1,    -1,
-      -1,   517,   518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     526,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    -1,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    -1,    41,    42,    43,
-      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
-      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      64,    -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
-     104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,
-     114,    -1,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   126,    -1,   128,   129,   130,   131,   132,   133,
-     134,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
-     144,   145,    -1,   147,    -1,   149,   150,   151,   152,   153,
-     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
-     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
-      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
-      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
-      -1,   235,   236,   237,   238,    -1,   240,   241,    -1,   243,
-     244,    -1,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
-     264,   265,   266,    -1,   268,   269,   270,   271,   272,    -1,
-     274,    -1,   276,   277,   278,   279,   280,   281,   282,   283,
-     284,   285,    -1,    -1,   288,   289,   290,   291,   292,    -1,
-     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,   326,   327,   328,   329,   330,   331,    -1,   333,
-      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,   343,
-     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
-     384,   385,   386,   387,   388,    -1,   390,   391,   392,   393,
-     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
-     404,    -1,   406,   407,   408,   409,   410,   411,   412,   413,
-     414,   415,   416,   417,   418,   419,   420,   421,    -1,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,    -1,   436,   437,    -1,   439,   440,   441,   442,   443,
-     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
-     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,   466,   467,   468,   469,   470,   471,    -1,   473,
-     474,   475,   476,   477,   478,   479,    -1,   481,   482,   483,
-     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
-     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
-     504,   505,   506,   507,   508,   509,   510,    -1,    -1,    -1,
-      -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   526,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    -1,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    -1,    41,
-      42,    43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
-      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    71,
-      -1,    -1,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
-      -1,   103,   104,   105,    -1,    -1,    -1,    -1,   110,    -1,
-      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,    -1,   141,
-     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
-     152,   153,   154,   155,   156,    -1,   158,   159,   160,   161,
-     162,   163,    -1,   165,   166,   167,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
-     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
-     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
-      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
-     222,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
-     232,   233,    -1,   235,   236,   237,   238,    -1,   240,   241,
-      -1,   243,   244,    -1,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
-     262,    -1,   264,   265,   266,    -1,   268,   269,   270,   271,
-     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
-     282,   283,   284,   285,    -1,    -1,   288,   289,   290,   291,
-     292,    -1,   294,   295,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
-      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
-     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
-     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
-     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
-     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
-     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,    -1,   406,   407,   408,   409,   410,   411,
-     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
-      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   434,    -1,   436,   437,    -1,   439,   440,   441,
-     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,    -1,   465,   466,   467,   468,   469,   470,   471,
-      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
-     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
-     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
-     502,   503,   504,   505,   506,   507,   508,   509,   510,    -1,
-      -1,    -1,    -1,    -1,    -1,   517,   518,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   526,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
-      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
-      70,    71,    -1,    -1,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
-     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
-     110,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,    -1,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-      -1,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
-     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
-     160,   161,   162,   163,    -1,   165,   166,   167,    -1,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
-     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
-     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
-     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,    -1,   225,   226,   227,   228,    -1,
-     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
-     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
-     260,   261,   262,    -1,   264,   265,   266,    -1,   268,   269,
-     270,   271,   272,    -1,   274,    -1,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
-     290,   291,   292,    -1,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
-     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
-      -1,   341,   342,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
-     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
-     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
-     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
-     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
-     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
-     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
-      -1,   451,   452,   453,   454,   455,   456,   457,   458,   459,
-     460,   461,   462,   463,    -1,   465,   466,   467,   468,   469,
-     470,   471,    -1,   473,   474,   475,   476,   477,   478,   479,
-      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
-      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
-     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
-     510,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   526,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    -1,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    -1,    41,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    71,    -1,    -1,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,   153,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,   233,    -1,   235,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
-     268,   269,   270,   271,   272,    -1,   274,    -1,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,   290,   291,   292,    -1,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,    -1,   465,   466,   467,
-     468,   469,   470,   471,    -1,   473,   474,   475,   476,   477,
-     478,   479,    -1,   481,   482,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,   510,    -1,    -1,    -1,    -1,    -1,    -1,   517,
-     518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    71,    -1,    -1,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-     266,    -1,   268,   269,   270,   271,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,   290,   291,   292,    -1,   294,   295,
-     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
-     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
-     466,   467,   468,   469,   470,   471,    -1,   473,   474,   475,
-     476,   477,   478,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,   510,    -1,    -1,    -1,    -1,    -1,
-      -1,   517,   518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     526,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    -1,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    -1,    41,    42,    43,
-      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
-      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      64,    -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
-     104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,
-     114,    -1,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   126,    -1,   128,   129,   130,   131,   132,   133,
-     134,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
-     144,   145,    -1,   147,    -1,   149,   150,   151,   152,   153,
-     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
-      -1,   165,   166,   167,    -1,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
-     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
-      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
-      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
-      -1,   235,   236,   237,   238,    -1,   240,   241,    -1,   243,
-     244,    -1,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
-     264,   265,   266,    -1,   268,   269,   270,   271,   272,    -1,
-     274,    -1,   276,   277,   278,   279,   280,   281,   282,   283,
-     284,   285,    -1,    -1,   288,   289,   290,   291,   292,    -1,
-     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,   326,   327,   328,   329,   330,   331,    -1,   333,
-      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,   343,
-     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
-     384,   385,   386,   387,   388,    -1,   390,   391,   392,   393,
-     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
-     404,    -1,   406,   407,   408,   409,   410,   411,   412,   413,
-     414,   415,   416,   417,   418,   419,   420,   421,    -1,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,    -1,   436,   437,    -1,   439,   440,   441,   442,   443,
-     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
-     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,   466,   467,   468,   469,   470,   471,    -1,   473,
-     474,   475,   476,   477,   478,   479,    -1,   481,   482,   483,
-     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
-     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
-     504,   505,   506,   507,   508,   509,   510,    -1,    -1,    -1,
-      -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   526,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    -1,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    -1,    41,
-      42,    43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
-      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    71,
-      -1,    -1,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
-      -1,   103,   104,   105,    -1,    -1,    -1,    -1,   110,    -1,
-      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,    -1,   141,
-     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
-     152,   153,   154,   155,   156,    -1,   158,   159,   160,   161,
-     162,   163,    -1,   165,   166,   167,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
-     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
-     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
-      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
-     222,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
-     232,   233,    -1,   235,   236,   237,   238,    -1,   240,   241,
-      -1,   243,   244,    -1,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
-     262,    -1,   264,   265,   266,    -1,   268,   269,   270,   271,
-     272,    -1,   274,    -1,   276,    -1,    -1,   279,   280,   281,
-     282,   283,   284,   285,    -1,    -1,   288,   289,   290,   291,
-     292,    -1,   294,   295,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
-     322,    -1,   324,   325,   326,   327,   328,   329,   330,   331,
-      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
-     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
-     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
-     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
-     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
-     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,    -1,   406,   407,   408,   409,   410,   411,
-     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
-      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   434,    -1,   436,   437,    -1,   439,   440,   441,
-     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,    -1,   465,   466,   467,   468,   469,   470,   471,
-      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
-     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
-     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
-     502,   503,   504,   505,   506,   507,   508,   509,   510,    -1,
-      -1,    -1,    -1,    -1,    -1,   517,   518,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   526,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
-      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
-      70,    71,    -1,    -1,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
-     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
-     110,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,    -1,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-      -1,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
-     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
-     160,   161,   162,   163,    -1,   165,   166,   167,    -1,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
-     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
-     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
-     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,    -1,   225,   226,   227,   228,    -1,
-     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
-     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
-     260,   261,   262,    -1,   264,   265,   266,    -1,   268,   269,
-     270,   271,   272,    -1,   274,    -1,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
-     290,   291,   292,    -1,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-      -1,   321,   322,   323,   324,   325,   326,   327,   328,   329,
-     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
-      -1,   341,   342,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
-     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
-     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
-     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
-     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
-     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
-     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
-      -1,   451,   452,   453,   454,   455,   456,   457,   458,   459,
-     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
-     470,   471,    -1,   473,   474,   475,   476,   477,   478,   479,
-      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
-      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
-     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   526,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    -1,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    -1,    41,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    71,    -1,    -1,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,   153,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,   233,    -1,   235,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
-     268,   269,   270,   271,   272,    -1,   274,    -1,   276,    -1,
-     278,   279,   280,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,   290,   291,   292,    -1,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,    -1,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
-     468,   469,   470,   471,    -1,   473,   474,   475,   476,   477,
-     478,   479,    -1,   481,   482,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   517,
-     518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    71,    -1,    -1,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    -1,    85,
-      86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-     266,    -1,   268,   269,   270,   271,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,   290,   291,   292,    -1,   294,   295,
-     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,    -1,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
-     456,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,   471,    -1,   473,   474,   475,
-     476,   477,   478,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,    -1,    -1,    -1,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
-     526,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    -1,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    -1,    41,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    71,    -1,    -1,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    -1,    85,    86,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,   153,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,   233,    -1,   235,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
-     268,   269,   270,   271,   272,    -1,   274,    -1,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,   290,   291,   292,    -1,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,    -1,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
-     468,   469,   470,   471,    -1,   473,   474,   475,   476,   477,
-     478,   479,    -1,   481,   482,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,    -1,    -1,    -1,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    -1,   526,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
-      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
-      70,    71,    -1,    -1,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
-     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
-     110,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
-     120,   121,    -1,   123,   124,   125,   126,    -1,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-      -1,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
-     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
-     160,   161,   162,   163,    -1,   165,   166,   167,    -1,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
-     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
-     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
-      -1,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,    -1,   225,   226,   227,   228,    -1,
-     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
-     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
-     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
-     260,   261,   262,    -1,   264,   265,   266,    -1,   268,   269,
-     270,   271,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
-     280,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
-     290,   291,    -1,    -1,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-     320,   321,   322,    -1,   324,   325,   326,   327,   328,   329,
-     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
-      -1,   341,   342,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
-     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
-     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
-     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
-     410,   411,   412,   413,   414,   415,   416,    -1,   418,   419,
-     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
-     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
-      -1,   451,   452,   453,   454,   455,   456,   457,   458,   459,
-     460,   461,   462,   463,    -1,   465,   466,   467,   468,   469,
-     470,   471,    -1,   473,   474,   475,   476,   477,   478,   479,
-      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
-      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
-     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   526,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    -1,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    -1,    41,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
-     128,   129,   130,   131,   132,    -1,   134,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,   153,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,   233,    -1,   235,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
-     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,   286,    -1,
-     288,   289,   290,   291,   292,    -1,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,    -1,   321,   322,   323,   324,    -1,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,   335,   336,   337,
-     338,    -1,    -1,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-     438,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
-     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
-     468,   469,   470,   471,    -1,   473,   474,   475,   476,   477,
-     478,   479,    -1,   481,   482,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,   491,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,    -1,    -1,   512,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    -1,   526,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
-      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
-      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,  1071,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,  1073,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,  1074,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,     0,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+    1075,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,  1076,   227,     0,
+       0,  1077,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,  1078,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,  1118,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,  1074,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+       0,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,  1119,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,  1120,   227,     0,     0,  1121,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,  1078,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,  1138,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,  1270,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,  1277,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+    1293,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,  1349,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,  1364,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,  1405,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,  1463,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+    1467,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,  1469,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,  1471,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,  1475,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,  1483,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,  1702,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,  1103,   452,  1074,   139,  1703,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,     0,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,  1107,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,  1108,   614,   615,   213,   616,   617,   618,
+    1109,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+    1695,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,  1111,   227,     0,
+       0,  1112,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,  1078,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,  1113,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+    1829,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+    1073,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,  1074,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,     0,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,  1078,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,  2049,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,  2079,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+    2081,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,  2153,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,  2155,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,  2157,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,  2274,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,  2471,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,     0,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,  2863,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,  2867,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,  2907,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,  3306,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,   719,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,   720,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+    3381,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,   728,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,   719,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+     720,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,  3383,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,   559,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,   627,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,   728,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,   719,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,   720,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,  3495,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,   559,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   728,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,   719,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,   720,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,  3517,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,   559,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+     728,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,  1103,   452,  1074,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,     0,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,  1107,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,  1108,
+     614,   615,   213,   616,   617,   618,  1109,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,  1695,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,  1111,   227,     0,     0,  1112,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,  1078,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,  1113,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,   705,
+      90,    91,    92,   706,     0,   707,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,   708,     0,
+       0,   107,   108,   109,   110,     0,     0,   112,   113,   114,
+       0,   115,     0,     0,   709,   710,     0,     0,     0,   711,
+     712,     0,     0,     0,     0,   713,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,   715,     0,   716,   717,
+      35,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,     0,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,     0,   443,
+     444,   445,   134,   135,     0,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,  1074,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,     0,     0,   458,
+     459,   460,   461,     0,   462,   463,     0,     0,   464,   465,
+     466,   467,   468,   469,     0,     0,   470,   471,     0,     0,
+       0,     0,     0,     0,     0,     0,   473,   474,   475,   476,
+     722,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,     0,     0,     0,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,   724,   519,
+     520,     0,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,     0,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,     0,     0,   536,
+       0,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+       0,   543,     0,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,   551,   552,   553,   554,   725,   555,   556,
+     726,   557,   558,   559,   189,     0,   191,   560,   561,   192,
+       0,   562,   563,     0,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,     0,   574,     0,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,     0,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,   727,   622,     0,   623,   624,   625,   626,
+     627,     0,   629,   630,   218,   631,   632,     0,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+       0,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,  1078,   236,
+       0,   676,     0,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   729,   688,   689,
+      86,    87,    88,   705,    90,    91,    92,   706,     0,   707,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,   708,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,   709,   710,
+       0,     0,     0,   711,   712,     0,     0,     0,     0,   713,
+       0,     0,     0,     0,     0,     0,     0,     0,   714,     0,
+     715,     0,   716,   717,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,     0,   443,   444,   445,   134,   135,     0,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,  1103,
+     452,  1074,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,     0,     0,   458,   459,   460,   461,     0,   462,   463,
+       0,     0,   464,   465,   466,   467,   468,   469,     0,     0,
+     470,   471,     0,     0,     0,     0,     0,     0,     0,     0,
+     473,   474,   475,   476,   722,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,     0,     0,     0,
+     512,   513,   514,     0,   515,   171,     0,   172,   516,     0,
+     517,   518,   724,   519,   520,     0,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,     0,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,     0,     0,   536,     0,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,     0,   543,     0,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,   725,   555,   556,   726,   557,   558,  1107,   189,     0,
+     191,   560,   561,   192,     0,   562,   563,     0,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,     0,   574,     0,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,     0,  1108,   614,   615,
+     213,   616,   617,   618,  1109,   620,   621,   727,   622,     0,
+     623,   624,   625,   626,  1695,     0,   629,   630,   218,   631,
+     632,     0,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,     0,  2552,   651,   652,   653,   654,
+       0,  1111,   227,     0,     0,  1112,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,  1078,   236,     0,   676,     0,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,  1113,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   729,   688,   689,    86,    87,    88,   705,    90,    91,
+      92,   706,     0,   707,    95,     0,     0,    98,    99,   100,
+     101,   102,   103,     0,   104,   105,   708,     0,     0,   107,
+     108,   109,   110,     0,     0,   112,   113,   114,     0,   115,
+       0,     0,   709,   710,     0,     0,     0,   711,   712,     0,
+       0,     0,     0,   713,     0,     0,     0,     0,     0,     0,
+       0,     0,   714,     0,   715,     0,   716,   717,    35,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,     0,   443,   444,   445,
+     134,   135,     0,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,  1103,   452,  1074,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,     0,     0,   458,   459,   460,
+     461,     0,   462,   463,     0,     0,   464,   465,   466,   467,
+     468,   469,     0,     0,   470,   471,     0,     0,     0,     0,
+       0,     0,     0,     0,   473,   474,   475,   476,   722,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,     0,     0,     0,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,   724,   519,   520,     0,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,     0,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,     0,     0,   536,     0,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,     0,   543,
+       0,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,   725,   555,   556,   726,   557,
+     558,  1107,   189,     0,   191,   560,   561,   192,     0,   562,
+     563,     0,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,     0,   574,     0,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+       0,  1108,   614,   615,   213,   616,   617,   618,  2624,   620,
+     621,   727,   622,     0,   623,   624,   625,   626,  2625,     0,
+     629,   630,   218,   631,   632,     0,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,     0,   650,
+     651,   652,   653,   654,     0,  1111,   227,     0,     0,  2626,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,  1078,   236,     0,   676,
+       0,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,  1113,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   729,   688,   689,    86,    87,
+      88,   705,    90,    91,    92,   706,     0,   707,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+     708,     0,     0,   107,   108,   109,   110,     0,     0,   112,
+     113,   114,     0,   115,     0,     0,   709,   710,     0,     0,
+       0,   711,   712,     0,     0,     0,     0,   713,     0,     0,
+       0,     0,     0,     0,     0,     0,   714,     0,   715,     0,
+     716,   717,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+       0,   443,   444,   445,   134,   135,     0,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,  1103,   452,  1074,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,     0,
+       0,   458,   459,   460,   461,     0,   462,   463,     0,     0,
+     464,   465,   466,   467,   468,   469,     0,     0,   470,   471,
+       0,     0,     0,     0,     0,     0,     0,     0,   473,   474,
+     475,   476,   722,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,     0,     0,     0,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+     724,   519,   520,     0,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,     0,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,     0,
+       0,   536,     0,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,     0,   543,     0,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,   725,
+     555,   556,   726,   557,   558,  1107,   189,     0,   191,   560,
+     561,   192,     0,   562,   563,     0,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,     0,   574,     0,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,     0,  1108,   614,   615,   213,   616,
+     617,   618,  1109,   620,   621,   727,   622,     0,   623,   624,
+     625,   626,  2625,     0,   629,   630,   218,   631,   632,     0,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,     0,   650,   651,   652,   653,   654,     0,  1111,
+     227,     0,     0,  2626,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+    1078,   236,     0,   676,     0,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,  1113,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   729,
+     688,   689,    86,    87,    88,   705,    90,    91,    92,   706,
+       0,   707,    95,     0,     0,    98,    99,   100,   101,   102,
+     103,     0,   104,   105,   708,     0,     0,   107,   108,   109,
+     110,     0,     0,   112,   113,   114,     0,   115,     0,     0,
+     709,   710,     0,     0,     0,   711,   712,     0,     0,     0,
+       0,   713,     0,     0,     0,     0,     0,     0,     0,     0,
+     714,     0,   715,     0,   716,   717,    35,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,     0,   443,   444,   445,   134,   135,
+       0,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,   719,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,     0,     0,   458,   459,   460,   461,     0,
+     462,   463,   720,     0,   464,   465,   466,   467,   468,   469,
+       0,     0,   470,   471,     0,     0,     0,     0,     0,     0,
+       0,     0,   473,   474,   475,   476,   722,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,     0,
+       0,     0,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,   724,   519,   520,     0,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,     0,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,     0,     0,   536,     0,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,     0,   543,     0,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,   725,   555,   556,   726,   557,   558,   559,
+     189,     0,   191,   560,   561,   192,     0,   562,   563,     0,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,     0,
+     574,     0,   200,   575,   576,   577,   578,     0,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,     0,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,     0,   613,
+     614,   615,   213,     0,   617,   618,   619,   620,   621,   727,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,     0,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,     0,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,   728,   236,     0,   676,     0,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   729,   688,   689,    86,    87,    88,     0,
+      90,    91,    92,     0,     0,     0,    95,     0,     0,    98,
+      99,   100,   101,   102,   103,     0,   104,   105,     0,     0,
+       0,   107,   108,   109,   110,     0,   111,   112,   113,   114,
+   -2557,   115,   116,   117,     0,     0,     0,     0,     0,   120,
+     121,     0,     0,     0,     0,   122,     0,     0,     0,     0,
+       0,     0,     0,     0,   123,     0,   124,     0,   125,   126,
+      35,     0,   422,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   132,     0,
+       0,     0,   134,   135,   136,   137,   138,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   139,     0,
+       0,     0,     0,     0,     0,   143,     0,   144,     0,     0,
+       0,     0,     0,   147,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   150,     0,     0,     0,     0,
+       0,     0,   151,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   154,   155,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   161,
+       0,     0,     0,     0,     0,     0,     0,   163,     0,     0,
+       0,   165,     0,     0,     0,     0,     0,   167,     0,     0,
+       0,     0,     0,   168,     0,   169,     0,     0,     0,     0,
+       0,   171,     0,   172,     0,     0,     0,     0,     0,     0,
+       0,   173,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   175,   176,     0,     0,     0,
+       0,     0,   177,     0,   178,     0,     0,   179,   180,     0,
+     181,     0,     0,     0,     0,     0,     0,     0,     0,   182,
+     183,     0,   184,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   189,   190,   191,     0,     0,   192,
+       0,     0,     0,   194,     0,     0,   195,     0,   196,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   197,   198,     0,   199,   200,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   201,     0,   202,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   204,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   211,     0,     0,     0,   213,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   218,     0,     0,   220,     0,     0,
+     221,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   223,     0,     0,     0,     0,     0,
+     225,     0,     0,     0,     0,     0,     0,   226,   227,     0,
+       0,     0,     0,   228,     0,   229,     0,     0,     0,     0,
+       0,     0,     0,     0,   232,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   236,
+       0,     0,   237,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,    86,    87,    88,
+       0,    90,    91,    92,     0,     0,     0,    95,     0,     0,
+      98,    99,   100,   101,   102,   103,     0,   104,   105,     0,
+       0,     0,   107,   108,   109,   110,     0,   111,   112,   113,
+     114, -2558,   115,   116,   117,     0,     0,     0,     0,     0,
+     120,   121,     0,     0,     0,     0,   122,     0,     0,     0,
+       0,     0,     0,     0,     0,   123,     0,   124,     0,   125,
+     126,    35,     0,  1189,     0,     0,     0,     0,     0,    41,
+      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   132,
+       0,     0,     0,   134,   135,   136,   137,   138,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   139,
+       0,     0,     0,     0,     0,     0,   143,     0,   144,     0,
+       0,     0,     0,     0,   147,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   150,     0,     0,     0,
+       0,     0,     0,   151,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   154,   155,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     161,     0,     0,     0,     0,     0,     0,     0,   163,     0,
+       0,     0,   165,     0,     0,     0,     0,     0,   167,     0,
+       0,     0,     0,     0,   168,     0,   169,     0,     0,     0,
+       0,     0,   171,     0,   172,     0,     0,     0,     0,     0,
+       0,     0,   173,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   175,   176,     0,     0,
+       0,     0,     0,   177,     0,   178,     0,     0,   179,   180,
+       0,   181,     0,     0,     0,     0,     0,     0,     0,     0,
+     182,   183,     0,   184,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   189,   190,   191,     0,     0,
+     192,     0,     0,     0,   194,     0,     0,   195,     0,   196,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   197,   198,     0,   199,   200,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   201,     0,
+     202,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   204,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   211,     0,     0,     0,   213,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   218,     0,     0,   220,     0,
+       0,   221,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   223,     0,     0,     0,     0,
+       0,   225,     0,     0,     0,     0,     0,     0,   226,   227,
+       0,     0,     0,     0,   228,     0,   229,     0,     0,     0,
+       0,     0,     0,     0,     0,   232,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     236,     0,     0,   237,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,    86,    87,
+      88,     0,    90,    91,    92,     0,     0,     0,    95,     0,
+       0,    98,    99,   100,   101,   102,   103,     0,   104,   105,
+       0,     0,     0,   107,   108,   109,   110,     0,   111,   112,
+     113,   114,     0,   115,   116,   117,     0,     0,     0,     0,
+       0,   120,   121,     0,     0,     0,     0,   122,     0,     0,
+       0,     0,     0,     0,     0,     0,   123,     0,   124,     0,
+     125,     0,    35,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     132,     0,     0,     0,   134,   135,   136,   137,   138,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     139,     0,     0,     0,     0,     0,     0,   143,     0,   144,
+       0,     0,     0,     0,     0,   147,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   150,     0,     0,
+       0,     0,     0,     0,   151,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   154,   155,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   161,     0,     0,     0,     0,     0,     0,     0,   163,
+       0,     0,     0,   165,     0,     0,     0,     0,     0,   167,
+       0,     0,     0,     0,     0,   168,     0,   169,     0,     0,
+       0,     0,     0,   171,     0,   172,     0,     0,     0,     0,
+       0,     0,     0,   173,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   175,   176,     0,
+       0,     0,     0,     0,   177,     0,   178,     0,     0,   179,
+     180,     0,   181,     0,     0,     0,     0,     0,     0,     0,
+       0,   182,   183,     0,   184,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   189,   190,   191,     0,
+       0,   192,     0,     0,     0,   194,     0,     0,   195,     0,
+     196,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   197,   198,     0,   199,   200,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   201,
+       0,   202,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   204,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   211,     0,     0,     0,   213,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   218,     0,     0,   220,
+       0,     0,   221,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   223,     0,     0,     0,
+       0,     0,   225,     0,     0,     0,     0,     0,     0,   226,
+     227,     0,     0,     0,     0,   228,     0,   229,     0,     0,
+       0,     0,     0,     0,     0,     0,   232,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   236,     0,     0,   237,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,    86,
+      87,    88,     0,    90,    91,    92,     0,     0,     0,    95,
+       0,     0,    98,    99,   100,   101,   102,   103,     0,   104,
+     105,     0,     0,     0,   107,   108,   109,   110,     0,   111,
+     112,   113,   114,     0,   115,   116,   117,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    35,     0,     0,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   132,     0,     0,     0,   134,   135,   136,   137,   138,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   139,     0,     0,     0,     0,     0,     0,   143,     0,
+     144,     0,     0,     0,     0,     0,   147,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   150,     0,
+       0,     0,     0,     0,     0,   151,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   154,   155,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   161,     0,     0,     0,     0,     0,     0,     0,
+     163,     0,     0,     0,   165,     0,     0,     0,     0,     0,
+     167,     0,     0,     0,     0,     0,   168,     0,   169,     0,
+       0,     0,     0,     0,   171,     0,   172,     0,     0,     0,
+       0,     0,     0,     0,   173,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   175,   176,
+       0,     0,     0,     0,     0,   177,     0,   178,     0,     0,
+     179,   180,     0,   181,     0,     0,     0,     0,     0,     0,
+       0,     0,   182,   183,     0,   184,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   189,   190,   191,
+       0,     0,   192,     0,     0,     0,   194,     0,     0,   195,
+       0,   196,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   197,   198,     0,   199,   200,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     201,     0,   202,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   204,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   211,     0,     0,     0,   213,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   218,     0,     0,
+     220,     0,     0,   221,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   223,     0,     0,
+       0,     0,     0,   225,     0,     0,     0,     0,     0,     0,
+     226,   227,     0,     0,     0,     0,   228,     0,   229,     0,
+       0,     0,     0,     0,     0,     0,     0,   232,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   236,     0,     0,   237,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+      86,    87,    88,     0,    90,    91,    92,     0,     0,     0,
+      95,     0,     0,    98,    99,   100,   101,   102,   103,     0,
+     104,   105,     0,     0,     0,   107,   108,   109,   110,     0,
+       0,   112,   113,   114,     0,   115,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    35,     0,     0,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   132,     0,     0,     0,   134,   135,   136,   137,
+     138,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   139,     0,     0,     0,     0,     0,     0,   143,
+       0,   144,     0,     0,     0,     0,     0,   147,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   150,
+       0,     0,     0,     0,     0,     0,   151,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   154,   155,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   163,     0,     0,     0,   165,     0,     0,     0,     0,
+       0,   167,     0,     0,     0,     0,     0,   168,     0,   169,
+       0,     0,     0,     0,     0,   171,     0,   172,     0,     0,
+       0,     0,     0,     0,     0,   173,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   175,
+     176,     0,     0,     0,     0,     0,   177,     0,   178,     0,
+       0,   179,   180,     0,   181,     0,     0,     0,     0,     0,
+       0,     0,     0,   182,   183,     0,   184,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   189,   190,
+     191,     0,     0,   192,     0,     0,     0,   194,     0,     0,
+     195,     0,   196,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   197,   198,     0,   199,
+     200,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   201,     0,   202,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   204,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   211,     0,     0,     0,
+     213,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   218,     0,
+       0,   220,     0,     0,   221,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   223,     0,
+       0,     0,     0,     0,   225,     0,     0,     0,     0,     0,
+       0,   226,   227,     0,     0,     0,     0,   228,     0,   229,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   236,     0,     0,   237,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,    35,   427,     0,     0,    37,    38,    39,    40,    41,
+      42,    43,    44,     0,     0,     0,    45,     0,     0,     0,
+       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
+       0,     0,     0,     0,   439,   440,     0,   441,   442,   132,
+     443,   444,   445,   134,   135,   136,   137,   138,     0,   446,
+     447,   448,   449,   450,     0,     0,   451,   452,     0,   139,
+     453,     0,   454,   455,   456,   457,   143,     0,   144,     0,
+     458,   459,   460,   461,   147,   462,   463,     0,     0,   464,
+     465,   466,   467,   468,   469,     0,   150,   470,   471,     0,
+       0,     0,     0,   151,     0,     0,     0,   473,   474,   475,
+     476,     0,   477,   154,   155,   478,     0,   479,     0,   480,
+     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
+     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
+     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
+     504,   505,   165,  2202,   506,     0,   507,   508,   167,   509,
+       0,   510,     0,   511,   168,     0,   169,   512,   513,   514,
+       0,   515,   171,     0,   172,   516,     0,   517,   518,     0,
+     519,   520,   173,   521,   522,   523,   524,     0,   525,   526,
+     527,   528,   529,   530,     0,   531,   175,   176,     0,   532,
+     533,   534,     0,   177,     0,   178,     0,   535,   179,   180,
+     536,   181,   537,   538,   539,   540,   541,     0,     0,   542,
+     182,   183,   543,   184,     0,   544,   545,   546,     0,     0,
+     547,   548,   549,   550,   551,   552,   553,   554,     0,   555,
+     556,     0,   557,   558,   559,   189,   190,   191,   560,   561,
+     192,     0,   562,   563,   194,   564,     0,   195,   565,   196,
+     566,   567,   568,     0,   569,  2203,     0,   570,   571,   572,
+       0,     0,   573,   197,   198,   574,   199,   200,   575,   576,
+     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
+     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
+     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
+     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
+       0,   611,   612,   211,   613,   614,   615,   213,   616,   617,
+     618,   619,   620,   621,     0,   622,     0,   623,   624,   625,
+     626,   627,     0,   629,   630,   218,   631,   632,   220,   633,
+     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
+     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
+     649,   225,   650,   651,   652,   653,   654,     0,   226,   227,
+       0,     0,   656,   657,   228,   658,   229,  2204,   659,   660,
+     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
+     669,   670,     0,     0,   671,   672,   673,   674,   675,     0,
+     236,     0,   676,   237,   677,   678,   679,   680,     0,     0,
+     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,    35,   688,
+     689,     0,     0,     0,     0,     0,    41,    42,  1786,  1787,
+    4936,     0,     0,     0,     0,     0,     0,  4937,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,   129,   130,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
+     134,   135,   136,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,     0,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,   144,     0,   458,   459,   460,
+     461,   147,   462,   463,     0,     0,   464,   465,   466,   467,
+     468,   469,     0,   150,   470,   471,     0,     0,     0,     0,
+     151,     0,     0,     0,   473,   474,   475,   476,     0,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,   168,     0,   169,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,     0,   519,   520,   173,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,   175,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,   179,   180,   536,   181,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,   183,   543,
+     184,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,     0,   555,   556,     0,   557,
+     558,   559,   189,   190,   191,   560,   561,   192,     0,   562,
+     563,   194,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,   198,   574,   199,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+     211,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,     0,   622,   216,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,   220,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,   224,   649,   225,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,   235,   236,     0,   676,
+     237,   677,   678,   679,   680,     0,     0,   681,     0,   238,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,     0,   688,   689,    35,   427,
+     248,     0,    37,    38,    39,    40,    41,    42,    43,    44,
+       0,     0,     0,    45,   249,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
+     134,   135,   136,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,     0,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,   144,     0,   458,   459,   460,
+     461,   147,   462,   463,     0,     0,   464,   465,   466,   467,
+     468,   469,     0,   150,   470,   471,     0,     0,     0,     0,
+     151,     0,     0,     0,   473,   474,   475,   476,     0,   477,
+     154,   155,   478,  2405,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+    2202,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,   168,     0,   169,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,     0,   519,   520,   173,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,   175,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,   179,   180,   536,   181,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,   183,   543,
+     184,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,     0,   555,   556,     0,   557,
+     558,   559,   189,   190,   191,   560,   561,   192,     0,   562,
+     563,   194,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,  2203,     0,   570,   571,   572,     0,     0,   573,
+     197,   198,   574,   199,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+     211,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,     0,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,   220,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,   225,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,  2204,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,     0,   236,     0,   676,
+     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,     0,   688,   689,     0,     0,
+       0,     0,     0,    35,   427,  1786,  1787,    37,    38,    39,
+      40,    41,    42,    43,    44,     0,     0,     0,    45,     0,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
+       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
+     442,   132,   443,   444,   445,   134,   135,   136,   137,   138,
+       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
+       0,   139,   453,     0,   454,   455,   456,   457,   143,     0,
+     144,     0,   458,   459,   460,   461,   147,   462,   463,     0,
+       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
+     471,     0,     0,     0,     0,   151,     0,     0,     0,   473,
+     474,   475,   476,     0,   477,   154,   155,   478,  2410,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+     163,   503,   504,   505,   165,  2202,   506,     0,   507,   508,
+     167,   509,     0,   510,     0,   511,   168,     0,   169,   512,
+     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
+     518,     0,   519,   520,   173,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
+       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
+     179,   180,   536,   181,   537,   538,   539,   540,   541,     0,
+       0,   542,   182,   183,   543,   184,     0,   544,   545,   546,
+       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
+       0,   555,   556,     0,   557,   558,   559,   189,   190,   191,
+     560,   561,   192,     0,   562,   563,   194,   564,     0,   195,
+     565,   196,   566,   567,   568,     0,   569,  2203,     0,   570,
+     571,   572,     0,     0,   573,   197,   198,   574,   199,   200,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
+       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612,   211,   613,   614,   615,   213,
+     616,   617,   618,   619,   620,   621,     0,   622,     0,   623,
+     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
+     220,   633,   634,   221,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
+     648,     0,   649,   225,   650,   651,   652,   653,   654,     0,
+     226,   227,     0,     0,   656,   657,   228,   658,   229,  2204,
+     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
+     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
+     675,     0,   236,     0,   676,   237,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+       0,   688,   689,     0,     0,     0,     0,     0,    35,   427,
+    1786,  1787,    37,    38,    39,    40,    41,    42,    43,    44,
+       0,     0,     0,    45,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
+     134,   135,   136,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,     0,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,   144,     0,   458,   459,   460,
+     461,   147,   462,   463,     0,     0,   464,   465,   466,   467,
+     468,   469,     0,   150,   470,   471,     0,     0,     0,     0,
+     151,     0,     0,     0,   473,   474,   475,   476,     0,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+    2202,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,   168,     0,   169,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,     0,   519,   520,   173,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,   175,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,   179,   180,   536,   181,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,   183,   543,
+     184,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,     0,   555,   556,     0,   557,
+     558,   559,   189,   190,   191,   560,   561,   192,     0,   562,
+     563,   194,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,  2203,     0,   570,   571,   572,     0,     0,   573,
+     197,   198,   574,   199,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+     211,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,     0,   622,     0,   623,   624,   625,   626,   627,     0,
+     629,   630,   218,   631,   632,   220,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,   225,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,  2204,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,     0,   236,     0,   676,
+     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,     0,   688,   689,     0,     0,
+       0,     0,     0,    35,   427,  1786,  1787,    37,    38,    39,
+      40,    41,    42,     0,    44,     0,     0,     0,    45,     0,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,     0,   436,   437,   438,     0,
+       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
+     442,   132,   443,   444,   445,   134,   135,   136,   137,   138,
+       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
+       0,   139,   453,     0,   454,   455,   456,   457,   143,     0,
+     144,     0,   458,   459,   460,   461,   147,   462,   463,     0,
+       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
+     471,     0,     0,     0,     0,   151,     0,     0,     0,   473,
+     474,   475,   476,     0,   477,   154,   155,   478,  3288,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+     163,   503,   504,   505,   165,  2202,   506,     0,   507,   508,
+     167,   509,     0,   510,     0,   511,   168,     0,   169,   512,
+     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
+     518,     0,   519,   520,   173,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
+       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
+     179,   180,   536,   181,   537,   538,   539,   540,   541,     0,
+       0,   542,   182,   183,   543,   184,     0,   544,   545,   546,
+       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
+       0,   555,   556,     0,   557,   558,   559,   189,   190,   191,
+     560,   561,   192,     0,   562,   563,   194,   564,     0,   195,
+     565,   196,   566,   567,   568,     0,   569,  2203,     0,   570,
+     571,   572,     0,     0,   573,   197,   198,   574,   199,   200,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
+       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612,   211,   613,   614,   615,   213,
+     616,   617,   618,   619,   620,   621,     0,   622,     0,   623,
+     624,   625,   626,   627,     0,   629,   630,   218,   631,   632,
+     220,   633,   634,   221,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
+     648,     0,   649,   225,   650,   651,   652,   653,   654,     0,
+     226,   227,     0,     0,   656,   657,   228,   658,   229,  2204,
+     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
+     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
+     675,     0,   236,     0,   676,   237,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+       0,   688,   689,     0,     0,     0,     0,     0,    35,   427,
+    1032,  1033,    37,    38,    39,    40,    41,    42,     0,    44,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
+     134,   135,   136,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,     0,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,   144,     0,   458,   459,   460,
+     461,   147,   462,   463,     0,     0,   464,   465,   466,   467,
+     468,   469,     0,   150,   470,   471,     0,     0,     0,     0,
+     151,     0,     0,   472,   473,   474,   475,   476,     0,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,   168,     0,   169,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,     0,   519,   520,   173,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,   175,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,   179,   180,   536,   181,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,   183,   543,
+     184,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,     0,   555,   556,     0,   557,
+     558,   559,   189,   190,   191,   560,   561,   192,     0,   562,
+     563,   194,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,   198,   574,   199,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+     211,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,     0,   622,     0,   623,   624,   625,   626,   627,   628,
+     629,   630,   218,   631,   632,   220,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,   225,   650,
+     651,   652,   653,   654,     0,   226,   227,   655,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,     0,   236,     0,   676,
+     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,     0,   688,   689,    35,   427,
+       0,     0,    37,    38,    39,    40,    41,    42,     0,    44,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
+     134,   135,   136,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,     0,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,   144,     0,   458,   459,   460,
+     461,   147,   462,   463,     0,     0,   464,   465,   466,   467,
+     468,   469,     0,   150,   470,   471,     0,     0,     0,     0,
+     151,     0,     0,   472,   473,   474,   475,   476,     0,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,   168,     0,   169,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,     0,   519,   520,   173,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,   175,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,   179,   180,   536,   181,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,   183,   543,
+     184,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,   551,   552,   553,   554,     0,   555,   556,     0,   557,
+     558,   559,   189,   190,   191,   560,   561,   192,     0,   562,
+     563,   194,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,   198,   574,   199,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+     211,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,     0,   622,     0,   623,   624,   625,   626,   627,   628,
+     629,   630,   218,   631,   632,   220,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,   225,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,     0,   236,     0,   676,
+     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,    35,   688,   689,     0,    37,
+      38,    39,    40,    41,    42,     0,    44,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
+       0,   441,   442,   132,   443,   444,   445,   134,   135,   136,
+     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
+     451,   452,     0,   139,   453,     0,   454,   455,   456,   457,
+     143,     0,   144,     0,   458,   459,   460,   461,   147,   462,
+     463,     0,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
+       0,   473,   474,   475,   476,     0,   477,   154,   155,   478,
+       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
+     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,   163,   503,   504,   505,   165,  2202,   506,     0,
+     507,   508,   167,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,   171,     0,   172,   516,
+       0,   517,   518,     0,   519,   520,   173,   521,   522,   523,
+     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
+     175,   176,     0,   532,   533,   534,     0,   177,     0,   178,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,   182,   183,   543,   184,     0,   544,
+     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
+     553,   554,     0,   555,   556,     0,   557,   558,   559,   189,
+     190,   191,   560,   561,   192,     0,   562,   563,   194,   564,
+       0,   195,   565,   196,   566,   567,   568,     0,   569,  2203,
+       0,   570,   571,   572,     0,     0,   573,   197,   198,   574,
+     199,   200,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,   213,   616,   617,   618,   619,   620,   621,     0,   622,
+       0,   623,   624,   625,   626,   627,     0,   629,   630,   218,
+     631,   632,   220,   633,   634,   221,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
+     229,  2204,   659,   660,   661,   662,   663,   664,   665,     0,
+       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
+     673,   674,   675,     0,   236,     0,   676,   237,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,    35,   688,   689,     0,    37,    38,    39,    40,
+      41,    42,     0,    44,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+     132,   443,   444,   445,   134,   135,   136,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,     0,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,   144,
+       0,   458,   459,   460,   461,   147,   462,   463,     0,     0,
+     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
+       0,     0,     0,     0,   151,     0,     0,     0,   473,   474,
+     475,   476,     0,   477,   154,   155,   478,  2390,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+       0,   519,   520,   173,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,   179,
+     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,   183,   543,   184,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,     0,
+     555,   556,     0,   557,   558,   559,   189,   190,   191,   560,
+     561,   192,     0,   562,   563,   194,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,   198,   574,   199,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,   211,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,     0,   622,     0,   623,   624,
+     625,   626,   627,     0,   629,   630,   218,   631,   632,   220,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,   225,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+       0,   236,     0,   676,   237,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,    35,
+     688,   689,     0,    37,    38,    39,    40,    41,    42,     0,
+      44,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
+       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
+     445,   134,   135,   136,   137,   138,     0,   446,   447,   448,
+     449,   450,     0,     0,   451,   452,     0,   139,   453,     0,
+     454,   455,   456,   457,   143,     0,   144,     0,   458,   459,
+     460,   461,   147,   462,   463,     0,     0,   464,   465,   466,
+     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
+       0,   151,     0,     0,     0,   473,   474,   475,   476,     0,
+     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
+     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
+     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
+     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
+     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
+       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
+     171,     0,   172,   516,     0,   517,   518,     0,   519,   520,
+     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
+     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
+       0,   177,     0,   178,     0,   535,   179,   180,   536,   181,
+     537,   538,   539,   540,   541,     0,     0,   542,   182,   183,
+     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
+     549,   550,   551,   552,   553,   554,     0,   555,   556,     0,
+     557,   558,   559,   189,   190,   191,   560,   561,   192,     0,
+     562,   563,   194,   564,     0,   195,   565,   196,   566,   567,
+     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
+     573,   197,   198,   574,   199,   200,   575,   576,   577,   578,
+     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
+     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
+     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
+     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
+     612,   211,   613,   614,   615,   213,   616,   617,   618,   619,
+     620,   621,     0,   622,     0,   623,   624,   625,   626,   627,
+       0,   629,   630,   218,   631,   632,   220,   633,   634,   221,
+     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
+     644,   645,   646,   223,     0,   647,   648,     0,   649,   225,
+     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
+     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
+     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
+       0,     0,   671,   672,   673,   674,   675,     0,   236,     0,
+     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
+       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
+     242,   243,   244,   245,   246,   247,    35,   688,   689,     0,
+      37,    38,    39,    40,    41,    42,     0,    44,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,     0,     0,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,   132,   443,   444,   445,   134,   135,
+     136,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,     0,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,   144,     0,   458,   459,   460,   461,   147,
+     462,   463,     0,     0,   464,   465,   466,   467,   468,   469,
+       0,   150,   470,   471,     0,     0,     0,     0,   151,     0,
+       0,     0,   473,   474,   475,   476,     0,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,   168,
+       0,   169,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,     0,   519,  2182,   173,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,   175,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,   179,   180,   536,   181,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,   183,   543,   184,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,     0,   555,   556,     0,   557,   558,   559,
+     189,   190,   191,   560,   561,   192,     0,   562,   563,   194,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,   198,
+     574,   199,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,   211,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,     0,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,   220,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,   225,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,     0,   236,     0,   676,   237,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,    35,   688,   689,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   428,   429,   430,
+     431,   432,   433,   434,   435,  1272,   436,   437,   438,     0,
+       0,     0,     0,     0,     0,     0,   439,   440,     0,   441,
+     442,   132,   443,   444,   445,   134,   135,   136,   137,   138,
+       0,   446,   447,   448,   449,   450,     0,     0,   451,   452,
+       0,   139,   453,     0,   454,   455,   456,   457,   143,     0,
+     144,     0,   458,   459,   460,   461,   147,   462,   463,     0,
+       0,   464,   465,   466,   467,   468,   469,     0,   150,   470,
+     471,     0,     0,     0,     0,   151,     0,     0,   472,   473,
+     474,   475,   476,     0,   477,   154,   155,   478,     0,   479,
+       0,   480,   481,   482,   483,   484,     0,   485,   486,   487,
+       0,     0,   488,   489,   490,   491,   492,     0,   493,   494,
+     495,     0,   496,   497,   498,     0,   499,   500,   501,   502,
+     163,   503,   504,   505,   165,     0,   506,     0,   507,   508,
+     167,   509,     0,   510,     0,   511,   168,     0,   169,   512,
+     513,   514,     0,   515,   171,     0,   172,   516,     0,   517,
+     518,     0,   519,   520,   173,   521,   522,   523,   524,     0,
+     525,   526,   527,   528,   529,   530,     0,   531,   175,   176,
+       0,   532,   533,   534,     0,   177,     0,   178,     0,   535,
+     179,   180,   536,   181,   537,   538,   539,   540,   541,     0,
+       0,   542,   182,   183,   543,   184,     0,   544,   545,   546,
+       0,     0,   547,   548,   549,   550,   551,   552,   553,   554,
+       0,   555,   556,     0,   557,   558,   559,   189,   190,   191,
+     560,   561,   192,     0,   562,   563,   194,   564,     0,   195,
+     565,   196,   566,   567,   568,     0,   569,     0,     0,   570,
+     571,   572,     0,     0,   573,   197,   198,   574,   199,   200,
+     575,   576,   577,   578,   579,   580,   581,     0,   582,   583,
+     201,   584,   202,   585,   586,   587,     0,   588,   589,   590,
+     591,   592,   593,   594,   595,   204,   596,   597,   598,   599,
+       0,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,     0,   611,   612,   211,   613,   614,   615,   213,
+     616,   617,   618,   619,   620,   621,     0,   622,     0,   623,
+     624,   625,   626,   627,   628,   629,   630,   218,   631,   632,
+     220,   633,   634,   221,   635,     0,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,   645,   646,   223,     0,   647,
+     648,     0,   649,   225,   650,   651,   652,   653,   654,     0,
+     226,   227,     0,     0,   656,   657,   228,   658,   229,     0,
+     659,   660,   661,   662,   663,   664,   665,     0,     0,   666,
+     667,   668,   669,   670,     0,     0,   671,   672,   673,   674,
+     675,     0,   236,     0,   676,   237,   677,   678,   679,   680,
+       0,     0,   681,     0,     0,   682,   683,   684,   685,   686,
+     687,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+      35,   688,   689,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   428,   429,   430,   431,   432,   433,
+     434,   435,  1289,   436,   437,   438,     0,     0,     0,     0,
+       0,     0,     0,   439,   440,     0,   441,   442,   132,   443,
+     444,   445,   134,   135,   136,   137,   138,     0,   446,   447,
+     448,   449,   450,     0,     0,   451,   452,     0,   139,   453,
+       0,   454,   455,   456,   457,   143,     0,   144,     0,   458,
+     459,   460,   461,   147,   462,   463,     0,     0,   464,   465,
+     466,   467,   468,   469,     0,   150,   470,   471,     0,     0,
+       0,     0,   151,     0,     0,   472,   473,   474,   475,   476,
+       0,   477,   154,   155,   478,     0,   479,     0,   480,   481,
+     482,   483,   484,     0,   485,   486,   487,     0,     0,   488,
+     489,   490,   491,   492,     0,   493,   494,   495,     0,   496,
+     497,   498,     0,   499,   500,   501,   502,   163,   503,   504,
+     505,   165,     0,   506,     0,   507,   508,   167,   509,     0,
+     510,     0,   511,   168,     0,   169,   512,   513,   514,     0,
+     515,   171,     0,   172,   516,     0,   517,   518,     0,   519,
+     520,   173,   521,   522,   523,   524,     0,   525,   526,   527,
+     528,   529,   530,     0,   531,   175,   176,     0,   532,   533,
+     534,     0,   177,     0,   178,     0,   535,   179,   180,   536,
+     181,   537,   538,   539,   540,   541,     0,     0,   542,   182,
+     183,   543,   184,     0,   544,   545,   546,     0,     0,   547,
+     548,   549,   550,  1290,   552,   553,   554,     0,   555,   556,
+       0,   557,   558,   559,   189,   190,   191,   560,   561,   192,
+       0,   562,   563,   194,   564,     0,   195,   565,   196,   566,
+     567,   568,     0,   569,     0,     0,   570,   571,   572,     0,
+       0,   573,   197,   198,   574,   199,   200,   575,   576,   577,
+     578,   579,   580,   581,     0,   582,   583,   201,   584,   202,
+     585,   586,   587,     0,   588,   589,   590,   591,   592,   593,
+     594,   595,   204,   596,   597,   598,   599,     0,   600,   601,
+     602,   603,   604,   605,   606,   607,   608,   609,   610,     0,
+     611,   612,   211,   613,   614,   615,   213,   616,   617,   618,
+     619,   620,   621,     0,   622,     0,   623,   624,   625,   626,
+     627,   628,   629,   630,   218,   631,   632,   220,   633,   634,
+     221,   635,     0,   636,   637,   638,   639,   640,   641,   642,
+     643,   644,   645,   646,   223,     0,   647,   648,     0,   649,
+     225,   650,   651,   652,   653,   654,     0,   226,   227,     0,
+       0,   656,   657,   228,   658,   229,     0,   659,   660,   661,
+     662,   663,   664,   665,     0,     0,   666,   667,   668,   669,
+     670,     0,     0,   671,   672,   673,   674,   675,     0,   236,
+       0,   676,   237,   677,   678,   679,   680,     0,     0,   681,
+       0,     0,   682,   683,   684,   685,   686,   687,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,    35,   688,   689,
+       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   428,   429,   430,   431,   432,   433,   434,   435,     0,
+     436,   437,   438,     0,     0,     0,     0,     0,     0,     0,
+     439,   440,     0,   441,   442,   132,   443,   444,   445,   134,
+     135,   136,   137,   138,     0,   446,   447,   448,   449,   450,
+       0,     0,   451,   452,     0,   139,   453,     0,   454,   455,
+     456,   457,   143,     0,   144,     0,   458,   459,   460,   461,
+     147,   462,   463,     0,     0,   464,   465,   466,   467,   468,
+     469,     0,   150,   470,   471,     0,     0,     0,     0,   151,
+       0,     0,   472,   473,   474,   475,   476,     0,   477,   154,
+     155,   478,     0,   479,     0,   480,   481,   482,   483,   484,
+       0,   485,   486,   487,     0,     0,   488,   489,   490,   491,
+     492,     0,   493,   494,   495,     0,   496,   497,   498,     0,
+     499,   500,   501,   502,   163,   503,   504,   505,   165,     0,
+     506,     0,   507,   508,   167,   509,     0,   510,     0,   511,
+     168,     0,   169,   512,   513,   514,     0,   515,   171,     0,
+     172,   516,     0,   517,   518,     0,   519,   520,   173,   521,
+     522,   523,   524,     0,   525,   526,   527,   528,   529,   530,
+       0,   531,   175,   176,     0,   532,   533,   534,     0,   177,
+       0,   178,     0,   535,   179,   180,   536,   181,   537,   538,
+     539,   540,   541,     0,     0,   542,   182,   183,   543,   184,
+       0,   544,   545,   546,     0,     0,   547,   548,   549,   550,
+     551,   552,   553,   554,     0,   555,   556,     0,   557,   558,
+     559,   189,   190,   191,   560,   561,   192,     0,   562,   563,
+     194,   564,     0,   195,   565,   196,   566,   567,   568,     0,
+     569,     0,     0,   570,   571,   572,     0,     0,   573,   197,
+     198,   574,   199,   200,   575,   576,   577,   578,   579,   580,
+     581,     0,   582,   583,   201,   584,   202,   585,   586,   587,
+       0,   588,   589,   590,   591,   592,   593,   594,   595,   204,
+     596,   597,   598,   599,     0,   600,   601,   602,   603,   604,
+     605,   606,   607,   608,   609,   610,     0,   611,   612,   211,
+     613,   614,   615,   213,   616,   617,   618,   619,   620,   621,
+       0,   622,     0,   623,   624,   625,   626,   627,   628,   629,
+     630,   218,   631,   632,   220,   633,   634,   221,   635,     0,
+     636,   637,   638,   639,   640,   641,   642,   643,   644,   645,
+     646,   223,     0,   647,   648,     0,   649,   225,   650,   651,
+     652,   653,   654,     0,   226,   227,     0,     0,   656,   657,
+     228,   658,   229,     0,   659,   660,   661,   662,   663,   664,
+     665,     0,     0,   666,   667,   668,   669,   670,  2748,     0,
+     671,   672,   673,   674,   675,     0,   236,     0,   676,   237,
+     677,   678,   679,   680,     0,     0,   681,     0,     0,   682,
+     683,   684,   685,   686,   687,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,    35,   688,   689,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   428,   429,
+     430,   431,   432,   433,   434,   435,     0,   436,   437,   438,
+       0,     0,     0,     0,     0,     0,     0,   439,   440,     0,
+     441,   442,   132,   443,   444,   445,   134,   135,   136,   137,
+     138,     0,   446,   447,   448,   449,   450,     0,     0,   451,
+     452,     0,   139,   453,     0,   454,   455,   456,   457,   143,
+       0,   144,     0,   458,   459,   460,   461,   147,   462,   463,
+       0,     0,   464,   465,   466,   467,   468,   469,     0,   150,
+     470,   471,     0,     0,     0,     0,   151,     0,     0,   472,
+     473,   474,   475,   476,     0,   477,   154,   155,   478,     0,
+     479,     0,   480,   481,   482,   483,   484,     0,   485,   486,
+     487,     0,     0,   488,   489,   490,   491,   492,     0,   493,
+     494,   495,     0,   496,   497,   498,     0,   499,   500,   501,
+     502,   163,   503,   504,   505,   165,     0,   506,     0,   507,
+     508,   167,   509,     0,   510,     0,   511,   168,     0,   169,
+     512,   513,   514,     0,   515,   171,  3694,   172,   516,     0,
+     517,   518,     0,   519,   520,   173,   521,   522,   523,   524,
+       0,   525,   526,   527,   528,   529,   530,     0,   531,   175,
+     176,     0,   532,   533,   534,     0,   177,     0,   178,     0,
+     535,   179,   180,   536,   181,   537,   538,   539,   540,   541,
+       0,     0,   542,   182,   183,   543,   184,     0,   544,   545,
+     546,     0,     0,   547,   548,   549,   550,   551,   552,   553,
+     554,     0,   555,   556,     0,   557,   558,   559,   189,   190,
+     191,   560,   561,   192,     0,   562,   563,   194,   564,     0,
+     195,   565,   196,   566,   567,   568,     0,   569,     0,     0,
+     570,   571,   572,     0,     0,   573,   197,   198,   574,   199,
+     200,   575,   576,   577,   578,   579,   580,   581,     0,   582,
+     583,   201,   584,   202,   585,   586,   587,     0,   588,   589,
+     590,   591,   592,   593,   594,   595,   204,   596,   597,   598,
+     599,     0,   600,   601,   602,   603,   604,   605,   606,   607,
+     608,   609,   610,     0,   611,   612,   211,   613,   614,   615,
+     213,   616,   617,   618,   619,   620,   621,     0,   622,     0,
+     623,   624,   625,   626,   627,   628,   629,   630,   218,   631,
+     632,   220,   633,   634,   221,   635,     0,   636,   637,   638,
+     639,   640,   641,   642,   643,   644,   645,   646,   223,     0,
+     647,   648,     0,   649,   225,   650,   651,   652,   653,   654,
+       0,   226,   227,     0,     0,   656,   657,   228,   658,   229,
+       0,   659,   660,   661,   662,   663,   664,   665,     0,     0,
+     666,   667,   668,   669,   670,     0,     0,   671,   672,   673,
+     674,   675,     0,   236,     0,   676,   237,   677,   678,   679,
+     680,     0,     0,   681,     0,     0,   682,   683,   684,   685,
+     686,   687,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,    35,   688,   689,     0,     0,     0,     0,     0,    41,
+      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   428,   429,   430,   431,   432,
+     433,   434,   435,     0,   436,   437,   438,     0,     0,     0,
+       0,     0,     0,     0,   439,   440,     0,   441,   442,   132,
+     443,   444,   445,   134,   135,   136,   137,   138,     0,   446,
+     447,   448,   449,   450,     0,     0,   451,   452,     0,   139,
+     453,     0,   454,   455,   456,   457,   143,     0,   144,     0,
+     458,   459,   460,   461,   147,   462,   463,     0,     0,   464,
+     465,   466,   467,   468,   469,     0,   150,   470,   471,     0,
+       0,     0,     0,   151,     0,     0,   472,   473,   474,   475,
+     476,     0,   477,   154,   155,   478,     0,   479,     0,   480,
+     481,   482,   483,   484,     0,   485,   486,   487,     0,     0,
+     488,   489,   490,   491,   492,     0,   493,   494,   495,     0,
+     496,   497,   498,     0,   499,   500,   501,   502,   163,   503,
+     504,   505,   165,     0,   506,     0,   507,   508,   167,   509,
+       0,   510,     0,   511,   168,     0,   169,   512,   513,   514,
+       0,   515,   171,     0,   172,   516,     0,   517,   518,     0,
+     519,   520,   173,   521,   522,   523,   524,     0,   525,   526,
+     527,   528,   529,   530,     0,   531,   175,   176,     0,   532,
+     533,   534,     0,   177,     0,   178,     0,   535,   179,   180,
+     536,   181,   537,   538,   539,   540,   541,     0,     0,   542,
+     182,   183,   543,   184,     0,   544,   545,   546,     0,     0,
+     547,   548,   549,   550,   551,   552,   553,   554,     0,   555,
+     556,     0,   557,   558,   559,   189,   190,   191,   560,   561,
+     192,     0,   562,   563,   194,   564,     0,   195,   565,   196,
+     566,   567,   568,     0,   569,     0,     0,   570,   571,   572,
+       0,     0,   573,   197,   198,   574,   199,   200,   575,   576,
+     577,   578,   579,   580,   581,     0,   582,   583,   201,   584,
+     202,   585,   586,   587,     0,   588,   589,   590,   591,   592,
+     593,   594,   595,   204,   596,   597,   598,   599,     0,   600,
+     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
+       0,   611,   612,   211,   613,   614,   615,   213,   616,   617,
+     618,   619,   620,   621,     0,   622,     0,   623,   624,   625,
+     626,   627,   628,   629,   630,   218,   631,   632,   220,   633,
+     634,   221,   635,     0,   636,   637,   638,   639,   640,   641,
+     642,   643,   644,   645,   646,   223,     0,   647,   648,     0,
+     649,   225,   650,   651,   652,   653,   654,     0,   226,   227,
+       0,     0,   656,   657,   228,   658,   229,     0,   659,   660,
+     661,   662,   663,   664,   665,     0,     0,   666,   667,   668,
+     669,   670,     0,     0,   671,   672,   673,   674,   675,     0,
+     236,     0,   676,   237,   677,   678,   679,   680,     0,     0,
+     681,     0,     0,   682,   683,   684,   685,   686,   687,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,    35,   688,
+     689,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   428,   429,   430,   431,   432,   433,   434,   435,
+       0,   436,   437,   438,     0,     0,     0,     0,     0,     0,
+       0,   439,   440,     0,   441,   442,   132,   443,   444,   445,
+     134,   135,   136,   137,   138,     0,   446,   447,   448,   449,
+     450,     0,     0,   451,   452,     0,   139,   453,     0,   454,
+     455,   456,   457,   143,     0,   144,     0,   458,   459,   460,
+     461,   147,   462,   463,     0,     0,   464,   465,   466,   467,
+     468,   469,     0,   150,   470,   471,     0,     0,     0,     0,
+     151,     0,     0,   472,   473,   474,   475,   476,     0,   477,
+     154,   155,   478,     0,   479,     0,   480,   481,   482,   483,
+     484,     0,   485,   486,   487,     0,     0,   488,   489,   490,
+     491,   492,     0,   493,   494,   495,     0,   496,   497,   498,
+       0,   499,   500,   501,   502,   163,   503,   504,   505,   165,
+       0,   506,     0,   507,   508,   167,   509,     0,   510,     0,
+     511,   168,     0,   169,   512,   513,   514,     0,   515,   171,
+       0,   172,   516,     0,   517,   518,     0,   519,   520,   173,
+     521,   522,   523,   524,     0,   525,   526,   527,   528,   529,
+     530,     0,   531,   175,   176,     0,   532,   533,   534,     0,
+     177,     0,   178,     0,   535,   179,   180,   536,   181,   537,
+     538,   539,   540,   541,     0,     0,   542,   182,   183,   543,
+     184,     0,   544,   545,   546,     0,     0,   547,   548,   549,
+     550,  1372,   552,   553,   554,     0,   555,   556,     0,   557,
+     558,   559,   189,   190,   191,   560,   561,   192,     0,   562,
+     563,   194,   564,     0,   195,   565,   196,   566,   567,   568,
+       0,   569,     0,     0,   570,   571,   572,     0,     0,   573,
+     197,   198,   574,   199,   200,   575,   576,   577,   578,   579,
+     580,   581,     0,   582,   583,   201,   584,   202,   585,   586,
+     587,     0,   588,   589,   590,   591,   592,   593,   594,   595,
+     204,   596,   597,   598,   599,     0,   600,   601,   602,   603,
+     604,   605,   606,   607,   608,   609,   610,     0,   611,   612,
+     211,   613,   614,   615,   213,   616,   617,   618,   619,   620,
+     621,     0,   622,     0,   623,   624,   625,   626,   627,   628,
+     629,   630,   218,   631,   632,   220,   633,   634,   221,   635,
+       0,   636,   637,   638,   639,   640,   641,   642,   643,   644,
+     645,   646,   223,     0,   647,   648,     0,   649,   225,   650,
+     651,   652,   653,   654,     0,   226,   227,     0,     0,   656,
+     657,   228,   658,   229,     0,   659,   660,   661,   662,   663,
+     664,   665,     0,     0,   666,   667,   668,   669,   670,     0,
+       0,   671,   672,   673,   674,   675,     0,   236,     0,   676,
+     237,   677,   678,   679,   680,     0,     0,   681,     0,     0,
+     682,   683,   684,   685,   686,   687,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,    35,   688,   689,     0,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   435,     0,   436,   437,
+     438,     0,     0,     0,     0,     0,     0,     0,   439,   440,
+       0,   441,   442,   132,   443,   444,   445,   134,   135,   136,
+     137,   138,     0,   446,   447,   448,   449,   450,     0,     0,
+     451,   452,     0,   139,   453,     0,   454,   455,   456,   457,
+     143,     0,   144,     0,   458,   459,   460,   461,   147,   462,
+     463,     0,     0,   464,   465,   466,   467,   468,   469,     0,
+     150,   470,   471,     0,     0,     0,     0,   151,     0,     0,
+     472,   473,   474,   475,   476,     0,   477,   154,   155,   478,
+       0,   479,     0,   480,   481,   482,   483,   484,     0,   485,
+     486,   487,     0,     0,   488,   489,   490,   491,   492,     0,
+     493,   494,   495,     0,   496,   497,   498,     0,   499,   500,
+     501,   502,   163,   503,   504,   505,   165,     0,   506,     0,
+     507,   508,   167,   509,     0,   510,     0,   511,   168,     0,
+     169,   512,   513,   514,     0,   515,   171,     0,   172,   516,
+       0,   517,   518,     0,   519,  1453,   173,   521,   522,   523,
+     524,     0,   525,   526,   527,   528,   529,   530,     0,   531,
+     175,   176,     0,   532,   533,   534,     0,   177,     0,   178,
+       0,   535,   179,   180,   536,   181,   537,   538,   539,   540,
+     541,     0,     0,   542,   182,   183,   543,   184,     0,   544,
+     545,   546,     0,     0,   547,   548,   549,   550,   551,   552,
+     553,   554,     0,   555,   556,     0,   557,   558,   559,   189,
+     190,   191,   560,   561,   192,     0,   562,   563,   194,   564,
+       0,   195,   565,   196,   566,   567,   568,     0,   569,     0,
+       0,   570,   571,   572,     0,     0,   573,   197,   198,   574,
+     199,   200,   575,   576,   577,   578,   579,   580,   581,     0,
+     582,   583,   201,   584,   202,   585,   586,   587,     0,   588,
+     589,   590,   591,   592,   593,   594,   595,   204,   596,   597,
+     598,   599,     0,   600,   601,   602,   603,   604,   605,   606,
+     607,   608,   609,   610,     0,   611,   612,   211,   613,   614,
+     615,   213,   616,   617,   618,   619,   620,   621,     0,   622,
+       0,   623,   624,   625,   626,   627,   628,   629,   630,   218,
+     631,   632,   220,   633,   634,   221,   635,     0,   636,   637,
+     638,   639,   640,   641,   642,   643,   644,   645,   646,   223,
+       0,   647,   648,     0,   649,   225,   650,   651,   652,   653,
+     654,     0,   226,   227,     0,     0,   656,   657,   228,   658,
+     229,     0,   659,   660,   661,   662,   663,   664,   665,     0,
+       0,   666,   667,   668,   669,   670,     0,     0,   671,   672,
+     673,   674,   675,     0,   236,     0,   676,   237,   677,   678,
+     679,   680,     0,     0,   681,     0,     0,   682,   683,   684,
+     685,   686,   687,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,    35,   688,   689,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   428,   429,   430,   431,
+     432,   433,   434,   435,     0,   436,   437,   438,     0,     0,
+       0,     0,     0,     0,     0,   439,   440,     0,   441,   442,
+     132,   443,   444,   445,   134,   135,   136,   137,   138,     0,
+     446,   447,   448,   449,   450,     0,     0,   451,   452,     0,
+     139,   453,     0,   454,   455,   456,   457,   143,     0,   144,
+       0,   458,   459,   460,   461,   147,   462,   463,     0,     0,
+     464,   465,   466,   467,   468,   469,     0,   150,   470,   471,
+       0,     0,     0,     0,   151,     0,     0,   472,   473,   474,
+     475,   476,     0,   477,   154,   155,   478,     0,   479,     0,
+     480,   481,   482,   483,   484,     0,   485,   486,   487,     0,
+       0,   488,   489,   490,   491,   492,     0,   493,   494,   495,
+       0,   496,   497,   498,     0,   499,   500,   501,   502,   163,
+     503,   504,   505,   165,     0,   506,     0,   507,   508,   167,
+     509,     0,   510,     0,   511,   168,     0,   169,   512,   513,
+     514,     0,   515,   171,     0,   172,   516,     0,   517,   518,
+       0,   519,  1465,   173,   521,   522,   523,   524,     0,   525,
+     526,   527,   528,   529,   530,     0,   531,   175,   176,     0,
+     532,   533,   534,     0,   177,     0,   178,     0,   535,   179,
+     180,   536,   181,   537,   538,   539,   540,   541,     0,     0,
+     542,   182,   183,   543,   184,     0,   544,   545,   546,     0,
+       0,   547,   548,   549,   550,   551,   552,   553,   554,     0,
+     555,   556,     0,   557,   558,   559,   189,   190,   191,   560,
+     561,   192,     0,   562,   563,   194,   564,     0,   195,   565,
+     196,   566,   567,   568,     0,   569,     0,     0,   570,   571,
+     572,     0,     0,   573,   197,   198,   574,   199,   200,   575,
+     576,   577,   578,   579,   580,   581,     0,   582,   583,   201,
+     584,   202,   585,   586,   587,     0,   588,   589,   590,   591,
+     592,   593,   594,   595,   204,   596,   597,   598,   599,     0,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,     0,   611,   612,   211,   613,   614,   615,   213,   616,
+     617,   618,   619,   620,   621,     0,   622,     0,   623,   624,
+     625,   626,   627,   628,   629,   630,   218,   631,   632,   220,
+     633,   634,   221,   635,     0,   636,   637,   638,   639,   640,
+     641,   642,   643,   644,   645,   646,   223,     0,   647,   648,
+       0,   649,   225,   650,   651,   652,   653,   654,     0,   226,
+     227,     0,     0,   656,   657,   228,   658,   229,     0,   659,
+     660,   661,   662,   663,   664,   665,     0,     0,   666,   667,
+     668,   669,   670,     0,     0,   671,   672,   673,   674,   675,
+       0,   236,     0,   676,   237,   677,   678,   679,   680,     0,
+       0,   681,     0,     0,   682,   683,   684,   685,   686,   687,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,    35,
+     688,   689,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   428,   429,   430,   431,   432,   433,   434,
+     435,     0,   436,   437,   438,     0,     0,     0,     0,     0,
+       0,     0,   439,   440,     0,   441,   442,   132,   443,   444,
+     445,   134,   135,   136,   137,   138,     0,   446,   447,   448,
+     449,   450,     0,     0,   451,   452,     0,   139,   453,     0,
+     454,   455,   456,   457,   143,     0,   144,     0,   458,   459,
+     460,   461,   147,   462,   463,     0,     0,   464,   465,   466,
+     467,   468,   469,     0,   150,   470,   471,     0,     0,     0,
+       0,   151,     0,     0,   472,   473,   474,   475,   476,     0,
+     477,   154,   155,   478,     0,   479,     0,   480,   481,   482,
+     483,   484,     0,   485,   486,   487,     0,     0,   488,   489,
+     490,   491,   492,     0,   493,   494,   495,     0,   496,   497,
+     498,     0,   499,   500,   501,   502,   163,   503,   504,   505,
+     165,     0,   506,     0,   507,   508,   167,   509,     0,   510,
+       0,   511,   168,     0,   169,   512,   513,   514,     0,   515,
+     171,     0,   172,   516,     0,   517,   518,     0,   519,  1479,
+     173,   521,   522,   523,   524,     0,   525,   526,   527,   528,
+     529,   530,     0,   531,   175,   176,     0,   532,   533,   534,
+       0,   177,     0,   178,     0,   535,   179,   180,   536,   181,
+     537,   538,   539,   540,   541,     0,     0,   542,   182,   183,
+     543,   184,     0,   544,   545,   546,     0,     0,   547,   548,
+     549,   550,  1480,   552,   553,   554,     0,   555,   556,     0,
+     557,   558,   559,   189,   190,   191,   560,   561,   192,     0,
+     562,   563,   194,   564,     0,   195,   565,   196,   566,   567,
+     568,     0,   569,     0,     0,   570,   571,   572,     0,     0,
+     573,   197,   198,   574,   199,   200,   575,   576,   577,   578,
+     579,   580,   581,     0,   582,   583,   201,   584,   202,   585,
+     586,   587,     0,   588,   589,   590,   591,   592,   593,   594,
+     595,   204,   596,   597,   598,   599,     0,   600,   601,   602,
+     603,   604,   605,   606,   607,   608,   609,   610,     0,   611,
+     612,   211,   613,   614,   615,   213,   616,   617,   618,   619,
+     620,   621,     0,   622,     0,   623,   624,   625,   626,   627,
+     628,   629,   630,   218,   631,   632,   220,   633,   634,   221,
+     635,     0,   636,   637,   638,   639,   640,   641,   642,   643,
+     644,   645,   646,   223,     0,   647,   648,     0,   649,   225,
+     650,   651,   652,   653,   654,     0,   226,   227,     0,     0,
+     656,   657,   228,   658,   229,     0,   659,   660,   661,   662,
+     663,   664,   665,     0,     0,   666,   667,   668,   669,   670,
+       0,     0,   671,   672,   673,   674,   675,     0,   236,     0,
+     676,   237,   677,   678,   679,   680,     0,     0,   681,     0,
+       0,   682,   683,   684,   685,   686,   687,   239,   240,   241,
+     242,   243,   244,   245,   246,   247,    35,   688,   689,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     428,   429,   430,   431,   432,   433,   434,   435,     0,   436,
+     437,   438,   129,   130,     0,     0,     0,     0,     0,   439,
+     440,     0,   441,   442,   132,   443,   444,   445,   134,   135,
+     136,   137,   138,     0,   446,   447,   448,   449,   450,     0,
+       0,   451,   452,     0,   139,   453,     0,   454,   455,   456,
+     457,   143,     0,   144,     0,   458,   459,   460,   461,   147,
+     462,   463,     0,     0,   464,   465,   466,   467,   468,   469,
+       0,   150,   470,   471,     0,     0,     0,     0,   151,     0,
+       0,     0,   473,   474,   475,   476,     0,   477,   154,   155,
+     478,     0,   479,     0,   480,   481,   482,   483,   484,     0,
+     485,   486,   487,     0,     0,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,     0,   496,   497,   498,     0,   499,
+     500,   501,   502,   163,   503,   504,   505,   165,     0,   506,
+       0,   507,   508,   167,   509,     0,   510,     0,   511,   168,
+       0,   169,   512,   513,   514,     0,   515,   171,     0,   172,
+     516,     0,   517,   518,     0,   519,   520,   173,   521,   522,
+     523,   524,     0,   525,   526,   527,   528,   529,   530,     0,
+     531,   175,   176,     0,   532,   533,   534,     0,   177,     0,
+     178,     0,   535,   179,   180,   536,   181,   537,   538,   539,
+     540,   541,     0,     0,   542,   182,   183,   543,   184,     0,
+     544,   545,   546,     0,     0,   547,   548,   549,   550,   551,
+     552,   553,   554,     0,   555,   556,     0,   557,   558,   559,
+     189,   190,   191,   560,   561,   192,     0,   562,   563,   194,
+     564,     0,   195,   565,   196,   566,   567,   568,     0,   569,
+       0,     0,   570,   571,   572,     0,     0,   573,   197,   198,
+     574,   199,   200,   575,   576,   577,   578,   579,   580,   581,
+       0,   582,   583,   201,   584,   202,   585,   586,   587,     0,
+     588,   589,   590,   591,   592,   593,   594,   595,   204,   596,
+     597,   598,   599,     0,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,     0,   611,   612,   211,   613,
+     614,   615,   213,   616,   617,   618,   619,   620,   621,     0,
+     622,     0,   623,   624,   625,   626,   627,     0,   629,   630,
+     218,   631,   632,   220,   633,   634,   221,   635,     0,   636,
+     637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
+     223,     0,   647,   648,     0,   649,   225,   650,   651,   652,
+     653,   654,     0,   226,   227,     0,     0,   656,   657,   228,
+     658,   229,     0,   659,   660,   661,   662,   663,   664,   665,
+       0,     0,   666,   667,   668,   669,   670,     0,     0,   671,
+     672,   673,   674,   675,     0,   236,     0,   676,   237,   677,
+     678,   679,   680,     0,     0,   681,     0,     0,   682,   683,
+     684,   685,   686,   687,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,     0,   688,   689
+};
+
+static const yytype_int16 yycheck[] =
+{
+       2,   249,   210,  1105,   390,  1122,   374,    78,    78,    78,
+      78,   390,   923,    78,  1452,   116,  1155,  1160,   153,   166,
+    1100,  1456,  1042,  1043,  1044,  1292,  2241,   116,  1048,    78,
+     152,   230,  1461,   879,  1505,    84,  1279,  1424,   224,  1128,
+    1225,   188,  1444,  1861,  1535,  1341,   149,  2191,  2366,  2685,
+    1302,  1896,  1427,  1360,  3178,   963,   164,  2006,   170,   751,
+     161,  1412,  1413,  1571,  1371,  3013,  1723,  1917,   203,  1740,
+     981,  1422,   161,  2379,  1112,    78,    78,   923,  2822,  1346,
+     963,  3349,    84,  1350,  1902,  2813,  3584,    89,  1355,  2531,
+    2532,  3397,    96,  3399,   164,  3373,  1363,  1442,   210,  2429,
+     131,  1009,   106,  3557,  2076,  1401,  1373,   159,   209,  2778,
+    1906,  1957,  3626,  2279,   116,  3613,   217,  2786,   219,  2788,
+    3903,  2738,  1278,   875,  1974,  1975,  1744,   376,  3956,    94,
+     882,   232,  3547,   362,  4217,   981,  3956,   141,  2985,  2088,
+    3542,   893,  1202,   232,   984,  3547,   752,  3232,  4006,  1202,
+     152,  1008,   156,   376,  3952,   995,   116,   994,  3167,   161,
+    4154,    78,  3165,  3166,  4206,  3847,   131,    84,  4207,   921,
+    4220,   209,  4229,  1969,   926,  1780,  1781,  1782,  1835,  3819,
+    2816,   219,   217,  2373,  2127,   937,   248,   152,   153,  3098,
+    3853,  4204,  1888,  1902,  1775,  1776,     2,   162,  1839,   116,
+    1108,   161,  4486,  4216,   166,  3263,  1498,   209,  2180,  1242,
+    4685,  1489,  1152,  2531,  3852,   217,  1518,   219,  1410,  1411,
+    3919,  1152,  3782,  1197,  1198,  1108,   188,    30,    21,  1421,
+     232,  1000,  3650,    10,    87,  4878,    71,  4814,   203,  4816,
+      87,    87,  4859,    14,   161,  1754,   111,   124,  1599,  1600,
+      85,    71,  1627,    74,    75,    76,    77,   138,   950,    14,
+      81,  5000,   131,   116,   146,    85,  1617,   117,   131,  4912,
+     859,    14,   232,   116,    74,    75,    76,    77,   117,    71,
+    2916,    81,  2918,    84,   115,   185,  1024,   160,  1278,   131,
+    1028,  1029,  1030,   146,  1284,   184,    74,    75,    76,    77,
+    1038,   152,    78,    81,  1294,   190,   131,   148,   275,  4916,
+    4917,   382,   382,   382,   382,   232,    71,   382,   161,  1339,
+      74,    75,    76,    77,  4303,    78,  4305,    81,    71,  3238,
+     148,    74,    75,    76,    77,    89,    90,    80,    81,    82,
+      83,   390,    85,    78,  5193,   185,    74,    75,    76,    77,
+     187,   234,    98,    81,    74,    75,    76,    77,   106,   107,
+     138,    81,   234,   178,   185,   240,   275,   179,   340,    89,
+      90,    74,    75,    76,    77,    87,   425,   333,    81,   382,
+      78,  1498,  2597,     0,   269,   115,    89,    90,   390,   232,
+     187,    74,    75,    76,    77,   235,  1588,  1589,    81,   209,
+     114,   234,   229,   413,   347,    98,    89,    90,   148,   178,
+    1102,  1322,   197,   234,   199,   140,   185,    74,    75,    76,
+      77,  1613,   148,   425,    81,  1183,    78,    74,    75,    76,
+      77,   157,    89,    90,    81,    74,    75,    76,    77,   204,
+    1497,   148,    81,    74,    75,    76,    77,   259,   234,    78,
+      81,    74,    75,    76,    77,  1707,   202,   375,    81,   382,
+     102,   426,  1647,    74,    75,    76,    77,   109,   412,   412,
+      81,    96,   277,   390,   234,   861,  1322,    74,    75,    76,
+      77,   321,   861,  5126,    81,   233,   235,   235,   213,  1674,
+    5339,  1249,  5069,    74,    75,    76,    77,  4491,   102,   138,
+      81,    78,  5112,  5113,   105,   109,   231,    78,   425,   202,
+      74,    75,    76,    77,   387,  4990,   526,    81,   234,   388,
+      74,    75,    76,    77,   102,   388,   449,    81,   325,   334,
+     216,   109,    78,   655,   190,  2478,    74,    75,    76,    77,
+     254,    78,    14,    81,    71,   330,   388,    74,    75,    76,
+      77,   320,  1669,    80,    81,    82,    83,   529,    85,   131,
+     370,   528,   451,   388,   234,  1682,   484,  2238,   703,   704,
+     526,  2242,   457,  2244,  1482,  2518,  2247,    71,  2016,  2522,
+      74,    75,    76,    77,   528,   470,    80,    81,   400,  1646,
+     215,    85,  2021,  1199,  1200,  1712,  1713,  1505,   148,  1482,
+      71,   157,   148,    71,   435,   494,   382,   157,   449,    80,
+     449,   462,    80,   269,    85,   515,   449,    85,   164,    78,
+     529,  4036,  1462,   438,   425,   437,   438,   477,   449,   382,
+    1219,   449,   472,    78,  4036,    25,  5485,   474,   363,    78,
+     256,   102,   524,   526,  4686,   526,   528,   382,   105,   526,
+    1507,  4645,   423,   655,   529,   348,   529,   529,  5275,   428,
+     529,   526,   431,  3299,  2321,  4678,   529,  1575,   423,   522,
+     517,   518,   519,   520,   521,   522,   522,    87,  4176,   472,
+     423,  3959,   517,   518,   382,   477,  1953,   529,  1955,   382,
+     655,   526,  1575,   493,   515,  5302,  5435,   517,   518,   526,
+     477,  1541,   888,   249,   529,   435,   116,   528,  4702,   449,
+     275,  2368,   512,  2009,   526,  2372,   526,  1557,  1487,   412,
+    1963,   524,   487,   449,   470,  4407,   526,   520,  2035,  4411,
+     382,  4371,  1572,   449,   482,  4398,   146,   187,   703,   704,
+     465,  2232,   449,   529,   178,  4199,   868,  1505,   526,  2184,
+     192,   234,  2004,   382,  5397,  4315,   857,   526,   178,  4397,
+    4739,  1009,   178,  4462,  4743,  4744,  5409,  4746,   857,   529,
+    1508,   396,   526,  1511,   517,   518,  1514,   526,  1516,  5389,
+     422,  1519,   475,  1012,   385,  1523,   751,  1155,   190,   102,
+     415,  2300,   914,    14,  1702,  2146,   524,  5374,   526,  2308,
+     528,   487,  1710,  1711,  2239,   382,   526,   519,   520,   521,
+     522,   382,   861,  2248,   470,  2611,   388,   952,   422,  1702,
+    5104,  1795,  1762,   526,  3266,  5468,  3268,    29,   178,   279,
+     376,  1762,   429,   430,   481,  3579,   382,  4255,  4256,  4257,
+    4258,  4259,   481,   526,   422,   382,  3515,  3165,  3166,  3167,
+     972,   903,   110,  3522,  3523,   857,   526,  3526,  3867,   861,
+    4854,  4139,  1895,   865,  3533,  5340,   215,  4861,  1054,   526,
+     320,   190,   874,   875,  1021,  3181,  1023,   190,  1025,   526,
+     882,   271,   244,  3941,  1031,  2681,  1876,   526,  3524,  3525,
+     482,   893,  1498,   449,   355,   526,  1145,   857,  2479,   449,
+    2481,  1009,  1005,   526,  2545,  2197,  4989,   909,  1055,  1056,
+    2188,  2213,   102,   529,    37,   526,    39,  2219,   154,   921,
+     164,   371,  1145,   382,   926,   164,   180,   185,   385,   493,
+    2639,  2123,  2124,  2629,   275,   937,  1926,   382,  1008,   396,
+     857,   398,  1128,   382,   861,   526,   407,  1705,   512,  3351,
+     269,   234,  1710,  1711,   956,   103,   269,  5432,   194,  4951,
+     150,   963,   526,    25,   529,   967,   449,   321,   158,   180,
+    4798,   973,   526,  1159,  4242,   977,   978,    87,  3163,  2324,
+     131,   442,   984,   444,    22,   950,   144,   952,   526,   236,
+     517,   518,   994,   995,   248,   239,   186,   454,  1000,  2697,
+     239,   449,  1006,   229,   438,  1106,   116,  1009,  3917,  1110,
+    2856,   185,   161,  4841,   857,   178,   318,   124,   438,  1023,
+    1931,  1025,   438,   491,   518,  2870,  1134,  4855,   178,   340,
+     472,  1035,   515,    71,   242,  4855,   146,   248,  1003,  3224,
+     122,   244,  1007,  3233,   512,   528,   517,   518,  1852,   517,
+     518,  1055,  1056,   307,  2752,  1241,   310,   140,   275,  2116,
+     412,  1023,   234,  1025,  2084,   267,   415,    98,   470,   176,
+     260,  1106,   334,  1104,   157,  1110,  1138,   215,  2195,   529,
+    1129,   529,   340,   232,   256,  1931,   405,  2558,   438,   336,
+     334,   402,   405,  1055,  1056,   334,   307,  1099,  1100,   310,
+    3542,   365,   180,   275,  1106,  3547,  1108,   140,  1110,   519,
+     520,   521,   522,   349,   476,   318,   470,   400,  4758,   185,
+    1878,  4803,   270,  5206,   318,   154,  4808,  1129,  1886,  4811,
+     213,   472,   212,  2318,  1136,  2537,  4799,  1102,   157,  1104,
+    2527,  5180,   154,  2245,  2246,   389,   320,    70,   231,   403,
+     389,   470,   185,   334,  3556,    78,    79,   470,   384,  5201,
+    5217,   268,   234,  5202,  5214,   194,   185,   318,   318,   251,
+     248,   202,  5000,  5165,   256,   333,  4674,   529,   154,  1280,
+    1281,  3623,   194,   154,   256,   393,   234,  1945,  4702,   530,
+    1948,  1949,   403,   273,  1000,  1197,  1198,   320,   238,  5212,
+     483,     8,  4480,   275,    11,    12,   508,   443,   256,   271,
+     292,   318,  1129,  4519,   235,    22,    23,    24,   194,    26,
+      27,  2278,  2279,   194,    31,    32,    33,   275,  2285,   307,
+    1233,  1233,   310,   156,  2291,  2292,  2293,   388,  2042,   236,
+     330,   431,  1280,  1281,  2301,  2302,   409,   491,  2159,  2306,
+     275,  3194,   491,   507,   320,   472,   296,   515,   180,  2017,
+     340,   412,   526,   177,   526,   305,   524,   231,   526,   527,
+     528,   529,   526,   476,   330,   244,   340,   415,  1280,  1281,
+     363,   330,   476,   527,   207,  2122,   530,   320,   527,   347,
+    5444,   530,   325,  2201,   401,   438,   507,  2414,  2903,  5341,
+     472,   320,  2973,   307,  5102,  1307,   412,    74,    75,    76,
+      77,  2151,  1314,  2159,    81,   526,  1318,   348,   185,   237,
+     349,    25,  4862,   412,  2164,   403,   248,   530,   185,   350,
+     363,    35,  1334,  1385,   400,   417,   248,   349,   261,  2179,
+    2177,  1343,  3163,  2200,   377,   190,  5204,   275,  5431,   318,
+     234,   382,   449,  5436,   412,    98,  5350,   202,   530,    70,
+      71,   104,  2464,    74,    75,    76,    77,    78,    79,    80,
+      81,   178,   256,   349,    85,  4460,   179,  1183,   349,  1381,
+     396,   412,   465,  5065,   464,   307,   100,  2298,  5542,   335,
+     275,   275,   306,  5033,   308,   307,  1202,   418,  1646,   403,
+     472,   398,   442,  3224,   444,  5488,   120,   517,   518,   519,
+     520,   521,   522,   398,   443,   189,  5244,  4957,   515,  4428,
+    4423,   238,  1424,   529,   472,  4434,    70,  2734,   468,   507,
+     353,   443,   465,   137,    78,    79,   526,  1507,   524,  1825,
+     529,  5269,   528,  1249,  4113,   237,  1825,   472,  4295,  5269,
+    4119,  4120,  2298,  4122,   236,   452,   259,  2517,   530,   202,
+    1462,   458,  1008,  1009,  2517,   529,  5549,   443,   325,   454,
+     526,  2909,   443,  4888,   185,   347,  3691,   526,  2913,   296,
+    1482,   403,   530,   202,  1486,  1487,  4888,  1489,  5128,   407,
+    2919,   403,  5132,  5133,    98,  1497,  5279,  5280,  1747,  1748,
+     104,  1750,   276,  1505,  1733,   312,  1510,   476,  1512,   229,
+     526,  1515,   156,  1517,   102,   360,  1520,  1521,  1522,   239,
+    3365,   439,  4976,    89,  1747,  1748,  2793,  1750,   124,  1533,
+    2837,  2838,  2839,  2840,    84,   228,   256,    87,   405,  1541,
+     463,   187,  2849,  1547,   472,  1549,  2702,   334,   471,  3867,
+     496,   474,   359,  1555,   336,  1557,   270,   212,   325,  3068,
+    3069,   398,   206,   274,  3073,  5105,   116,   271,  3734,   224,
+    1572,   438,   122,  1575,   229,  5115,   524,  3195,  1764,   281,
+     176,  4198,   530,     5,  1586,   296,  2882,   472,   472,  1554,
+     305,  2197,   102,    98,  4036,  3925,   146,   400,   202,  1145,
+     166,  3110,  3111,    25,   226,   348,   108,  5435,   347,   197,
+    3456,   478,  1614,    35,   340,   407,   318,   454,   273,   338,
+    1721,   324,   188,  3294,   491,   442,   212,   444,   132,  4265,
+     189,  4267,  1721,   279,   437,   438,   140,   140,   293,   382,
+    1642,  1643,  1644,   146,  1646,   512,   530,   439,  2638,   431,
+    2558,   468,   459,   449,   157,   299,  1658,  1688,  1689,   526,
+    3845,   197,  3847,   199,  1666,   358,   195,   386,   460,   412,
+    3466,   391,   268,   412,   320,  4953,   205,   332,   362,  5462,
+    1486,  1487,   185,  1489,   187,   340,   222,   197,  2599,    74,
+      75,    76,    77,   412,  5192,   317,    81,   202,   129,  1505,
+    1702,   251,   393,  1705,   348,  3677,   256,   293,  1710,  1711,
+     338,   282,  2702,   415,   216,   137,   419,   276,  1720,  1721,
+     348,   112,   318,  1688,  1689,   371,  1775,  1776,    74,    75,
+      76,    77,   449,   529,  2724,    81,  5190,   524,  1839,  2497,
+     235,   528,   292,   164,   348,  5013,   177,  1749,  1849,   187,
+    1839,  1753,  1754,  2599,   382,   386,  3606,   348,   256,  3609,
+     263,  1721,  1793,   197,  2754,   199,   527,   451,   470,   530,
+     265,  3956,  1774,  1775,  1776,   421,  1825,  5231,   382,   201,
+     471,   412,  1968,  1832,   320,   280,   336,  1888,   222,   325,
+    4738,   382,   296,  1795,   330,   290,  2636,   441,   515,   443,
+     188,   527,   193,   529,  1721,   401,   517,   518,   412,   464,
+     494,   528,     7,  3304,  1774,   244,  5122,   320,   239,   348,
+    2512,  1873,   325,  1825,    19,    20,   396,   258,  1793,  2886,
+    1832,  1833,    74,    75,    76,    77,  5350,  1839,  5116,    81,
+    3185,   279,   362,    38,   371,  2865,    41,  1849,   165,   271,
+    1852,  5349,   488,   382,  1856,   483,   383,  1774,  1775,  1776,
+     363,   197,  3264,   199,   252,  4501,  4502,   417,  3270,   524,
+     224,   348,   527,   528,   377,   306,   451,   308,  1721,  1839,
+    3754,   408,   320,  2635,   382,  5009,  1888,   318,   386,   318,
+     530,   325,   226,   529,  1896,   348,   330,   392,   283,  1705,
+     470,  4849,    80,  4851,  1710,  1711,  3335,    85,  1825,  3783,
+      74,    75,    76,    77,   412,  1832,   347,    81,   235,   348,
+     456,  4665,  1839,  3274,   212,  4653,   491,  1929,   302,   382,
+     466,   451,  1935,   371,   238,   412,   224,  1940,  2039,   293,
+    4609,   229,  4611,  4612,  2696,   302,  4615,  2705,   265,  4677,
+    2039,   285,   224,   382,   384,  2713,   387,  2715,  5226,   412,
+     510,  1507,   465,   280,   529,   160,  2874,   517,   518,   519,
+     520,   521,   522,   290,   494,   348,   165,    98,   281,   325,
+    1786,  1787,    87,   104,   320,   273,  1989,   188,  1990,  2111,
+    1993,  2874,   296,   491,   330,   426,  1839,   529,   315,  2751,
+     472,   188,   472,   198,  5282,   293,  1812,  1813,  2010,   382,
+     159,  3960,   472,  3070,   512,   318,   451,   334,  3689,   382,
+     187,   293,   456,  2025,  3845,  3082,  3847,  3323,  2936,  5483,
+     526,  2033,   466,  3172,   177,  5533,  1582,  2039,  2424,   412,
+    2042,   146,  2044,   400,   332,  2424,   235,   476,   187,   412,
+     199,   252,   340,  2936,   526,  1601,   526,  3114,  2060,   494,
+     332,   491,  2064,  2271,   405,   252,   526,   441,   371,  2255,
+     348,   375,  1878,   526,  2076,   392,   265,   491,   214,  2039,
+    1886,   202,   512,   325,   441,  1631,   442,   230,   444,  2091,
+     229,   280,   230,  2201,   468,  3152,   263,   438,  3589,   529,
+    1646,   290,  2104,   386,   382,  4423,   234,  3598,  2110,  3352,
+    4428,   468,   415,  5391,  2116,   529,  4434,   491,   261,   493,
+    2122,   257,  2039,   261,   263,   375,   315,   491,   256,   412,
+    2200,  3374,  2134,  4439,   491,  3956,   493,   478,   442,  1945,
+     444,    87,  1948,  1949,  5268,  3183,  3803,  2149,   512,  2151,
+    2152,   318,   526,   320,   307,   472,   406,   310,  2270,  4009,
+    4010,   325,  2164,   306,   468,   308,   224,   470,   493,   526,
+     116,   229,  2174,   348,   396,  2177,   464,  2179,  2180,   318,
+     484,   320,   348,   382,   532,   526,  2188,   512,   438,  2191,
+    4885,   370,  2263,  2263,  2263,  2263,  2039,  3993,  2263,  2201,
+     146,  1747,  1748,   392,  1750,   427,  2210,   382,  2212,  3717,
+     375,  2017,  2216,   412,  2218,  3126,   382,  2221,   397,  2977,
+     386,  2225,  4407,   515,    70,  2277,  4411,   442,  4923,   444,
+    2331,   148,    78,    79,   484,   293,   528,   412,  5516,  2241,
+     157,   406,  2331,   320,  4040,   396,   412,   398,   325,   236,
+     403,   224,  3761,  3762,  3763,  3764,   229,  4926,  3767,  3768,
+    3769,  3770,  3771,  3772,  3773,  3774,  3775,  3776,  2960,  3926,
+    4219,  3646,  3647,   438,   332,  2058,  2278,  2279,  3186,   266,
+    3126,   302,  2284,  2285,  3551,  3794,   530,  3725,  2290,  2291,
+    2292,  2293,   369,   100,  2077,  2297,  2443,  2299,  2300,  2301,
+    2302,  2303,  2304,   454,  2306,   322,  2308,  2309,   348,   302,
+    2312,  1935,    40,   120,  3823,  3824,  1940,   491,  2426,   484,
+     293,  4465,   348,    84,  2326,  2327,  2328,  2329,  2330,  2331,
+      91,    92,    93,  2335,  4970,   529,  5460,  2339,   512,   533,
+    2342,   271,   382,  2345,  2346,  2347,  2348,  2349,  2350,  2351,
+    2352,  2353,  2560,  2355,  2562,   529,   382,   127,   148,   332,
+    3206,  2363,   493,  3353,  2366,  1989,  5490,   157,   472,  1993,
+     493,  2331,   412,   229,    50,  2424,   146,  4222,   118,   400,
+      16,   512,  2188,  4701,   229,  2191,   412,  4205,   405,   512,
+     160,   491,    68,   525,   250,   526,   365,   529,  2469,   139,
+    1274,    84,    71,   526,    87,   250,   454,   400,    91,    92,
+      93,  2558,   512,  3321,  2331,  1289,    85,   329,  1292,   529,
+     441,   438,  2424,   533,  2610,  3721,   334,  2429,  3186,  2551,
+    2479,   339,  2481,  3423,  5558,  4623,   331,  4625,  3321,   334,
+    5388,  4629,   212,  4631,  2545,   405,  4888,   468,   441,    70,
+      71,  3291,  3292,   521,    70,  1021,  2545,  1023,   526,  1025,
+     528,   478,    78,    79,   521,  1031,  3957,  3958,   484,   526,
+     491,   528,   493,   524,   491,   468,   334,  2479,   438,  2481,
+     531,   339,   402,    99,    74,    75,    76,    77,  2331,  1055,
+    1056,    81,   525,    70,    71,   512,   529,   283,   491,  2501,
+     493,    78,    79,   527,    34,   526,   530,  2424,    85,   526,
+     527,   106,   107,   530,   519,   520,   521,  2519,   478,  2521,
+      74,    75,    76,    77,   526,  2527,   528,    81,  2629,  2531,
+    2532,   491,   526,   526,   517,   518,   519,   520,   521,  2541,
+     156,   454,   525,  2545,  2546,   137,   138,  2512,  2550,   524,
+     449,   526,   512,   528,  2310,  3575,  2558,  2313,   454,   527,
+    5002,   529,  2479,  2664,  2481,   384,   526,  2668,   527,   164,
+     529,  2693,   402,   256,  2576,   336,   305,  2579,  3081,  2668,
+    3083,  3084,   524,  3985,   526,  2545,  4407,  3938,  2590,   184,
+    4411,   207,  2594,  2694,   277,  2597,   527,  3437,   529,   527,
+     164,   529,   161,   491,  2606,   493,  3446,  4278,  4279,  4280,
+     529,   530,  3701,  4798,   396,   397,  2618,  1183,  4803,    84,
+     184,   216,    87,  4808,   396,   397,  4811,  2629,  2545,   529,
+     530,  1197,  1198,  2635,  2636,   526,  1202,   528,  4147,  3891,
+     256,  2643,    89,    90,  3552,   261,  3554,   527,   527,   529,
+     529,   116,   216,   336,  2200,   259,  4841,   122,   527,   527,
+     529,   529,  2664,  2665,    84,   527,  2668,   529,   531,  3552,
+    4855,  3554,   305,  3858,   517,   518,   519,   520,   521,    71,
+     527,   146,   529,  1249,   527,   250,    74,    75,    76,    77,
+     454,  2497,  2694,    81,  2696,  2697,  3542,   484,  2700,  3756,
+     153,  3547,  2545,   527,  2664,   529,   128,  2808,  2668,   402,
+     527,  2517,   529,  2519,  3622,  2521,  2718,  2263,   532,  2808,
+    2823,   283,  3861,  3862,  3863,   526,  3566,  2729,  3568,    85,
+     527,   302,   529,  3790,  4949,   526,   491,   353,   493,  3622,
+    2742,    74,    75,    76,    77,   210,   400,  2664,    81,  2751,
+    2752,  2668,   513,   514,   515,   334,   517,   518,   519,   520,
+     521,   522,   302,   529,   527,    70,   529,  4424,   128,    74,
+      75,    76,    77,    78,    79,   484,    81,   393,  3835,   527,
+     527,   529,   529,   378,   482,   527,   251,   529,    89,    90,
+    2336,   256,   118,    74,    75,    76,    77,  2799,  2800,  4456,
+      81,    74,    75,    76,    77,   527,  2808,   529,    81,   527,
+     405,   529,  2814,   509,   378,  5000,   279,   527,  2820,   529,
+     436,  2664,  3070,   528,   527,  2668,   529,   292,   337,   400,
+     513,   514,   515,   337,   517,   518,   519,   520,   521,   522,
+     527,   405,   529,   438,   334,   229,   302,   463,  2808,   527,
+    2852,   529,   334,   449,   442,   471,   444,   442,   474,   444,
+     400,   527,  4105,   529,   509,   527,  3114,   529,  2870,   337,
+     441,   336,  2874,   118,   438,   180,  3716,   527,   509,   529,
+    5065,   279,   233,   478,  2886,   529,   527,   482,   529,   519,
+     527,  2808,   529,   527,   302,   529,   491,   468,   526,  2705,
+    5218,   441,   527,   527,   529,   321,   322,  2713,   527,  2715,
+    4581,  4582,   302,  4584,   478,   128,   527,   512,   529,   527,
+     491,   529,   493,  2469,   530,   275,  4233,   491,   468,   532,
+     527,   526,   529,   527,  2936,   529,   491,    70,   493,  1505,
+     234,   519,  2944,   248,   400,    78,    79,   271,   512,   302,
+     532,   491,   417,   493,   527,   526,   529,     2,  3157,  3158,
+    3159,   527,   526,   529,   527,  2808,   529,   527,  3726,   529,
+     527,   527,   529,   529,  4361,   449,   527,  4798,   529,  3227,
+     449,  2983,  4803,   526,   208,   441,   526,  4808,  3089,   405,
+    4811,   527,   400,   529,  3095,  2960,   527,  2999,   529,   527,
+    3089,   529,   307,  3005,   449,   310,  3095,   527,   449,   529,
+     400,  3013,   468,   449,   111,  3017,   302,   527,  3020,   529,
+    4841,  3023,   438,   156,   527,   527,   529,   529,   527,  3031,
+     529,   271,   128,   441,  4855,   491,   277,   493,  3040,   527,
+     527,   529,   529,  3045,    89,   510,   527,   400,   529,   449,
+     526,   441,   517,   518,   519,   520,   521,   522,   528,  5244,
+     468,   527,   478,   529,   412,   495,  3068,  3069,  3070,   526,
+     526,  3073,   527,   206,   529,   491,   256,   217,   468,  3081,
+    3082,  3083,  3084,   491,  5269,   493,   526,  3089,   441,   527,
+     382,   529,  3094,  3095,   528,  3097,   512,  3099,   403,   217,
+     527,   491,   529,   493,   527,   334,   529,   152,  3110,  3111,
+     526,   256,  3114,   158,   400,   468,   382,   527,   526,   529,
+     527,   527,   529,   529,   334,   527,  3128,   529,  3130,  3089,
+    3132,  3202,  3202,  3202,  3202,  3095,   526,  3202,   491,  1705,
+     493,   186,   217,   256,  1710,  1711,   527,   217,   529,  4620,
+    3152,   527,   334,   529,    84,   441,   527,    87,   529,   382,
+     527,  3163,   529,  3165,  3166,  3167,   299,   229,   217,  4987,
+    4661,  2977,  3089,   526,  4412,   157,  4414,   291,  3095,  5000,
+     187,   527,   468,   529,  3186,   527,   116,   529,  3190,   527,
+    4036,   529,   122,   530,  3068,  3069,   527,   472,   529,  3073,
+     334,  3203,   507,   526,     2,   491,  3208,   493,   527,   527,
+     529,   529,  3214,   329,   484,   348,   146,   527,   527,   529,
+     529,   527,  3224,   529,   454,   402,  5441,  5442,   527,  1795,
+     529,   527,   527,   529,   529,   229,  3110,  3111,   368,   527,
+     526,   529,   283,   526,  5065,  4754,  3089,   140,   111,   382,
+    5435,   320,  3095,   386,  4763,  1149,   238,  1151,   495,   526,
+     334,  3263,   320,   118,  3266,   118,  3268,   459,   348,   229,
+     484,  3273,   484,  3275,   153,   229,   366,   259,   531,   412,
+     210,   217,   217,   124,   526,   217,   481,   526,   359,  3291,
+    3292,  4348,   526,   217,   110,  3297,  3397,  3398,  3399,   495,
+     217,  4486,   217,   529,   217,   217,   334,   217,   441,   217,
+     443,   334,  1878,   217,   296,   217,  3318,   217,   229,  3321,
+    1886,   251,  3324,   334,   526,   166,   256,   217,   217,   217,
+    4170,  4171,   438,   111,   291,   229,   334,   229,   526,  3341,
+     526,   526,   229,  4183,   345,   526,   492,   526,   526,   275,
+     191,   526,   526,  5568,  5569,   526,   526,   339,   491,   526,
+     526,   526,   292,  3365,   526,   206,   526,   526,   166,   210,
+     526,   526,  4452,   526,   526,   526,   526,   526,   526,  1945,
+    3186,   111,  1948,  1949,   526,   526,   529,  5058,   526,   230,
+     188,   526,   233,   529,   168,  3397,  3398,  3399,  5069,   275,
+     291,   111,   277,   229,   332,   246,   336,   229,   330,   412,
+     519,   271,   403,   310,   529,   184,   471,   529,    84,  3421,
+     515,    87,    14,  5244,   529,    91,    92,    93,  3430,   449,
+    3432,  3433,   526,   526,   526,  3437,   449,  3397,  3398,  3399,
+     528,   400,   108,   449,  3446,  3546,   293,   449,  5269,   400,
+     449,  2017,   449,   449,  4945,  4946,   515,  3546,   157,   400,
+     442,   217,   444,  3831,   334,   404,  4937,   288,   449,   449,
+     449,   325,   454,   441,   330,   334,   471,  5148,   396,   526,
+    3397,  3398,  3399,   465,   325,   449,   468,   417,   449,  3491,
+     249,   526,   333,   157,   256,   529,   348,   217,   472,   472,
+     179,  3636,   449,   449,   449,   128,   128,   449,  3510,   449,
+     338,  3633,   449,   529,  3516,  3701,   441,   117,   449,   117,
+     449,   334,   449,  5032,  3070,  4283,   130,   400,   369,   449,
+     449,  3602,   277,  4444,   334,   334,   277,   495,   277,  3541,
+    3542,  3612,   491,   526,  3546,  3547,   111,   100,   334,   217,
+    3552,   526,  3554,   320,  3397,  3398,  3399,   185,   472,   163,
+     217,   299,   483,   320,  3566,  3636,  3568,   330,  3114,   320,
+     111,   229,   111,   526,   283,   110,   528,   401,   526,  5250,
+     510,  3829,   447,   447,   217,  3131,  3546,   517,   518,   519,
+     520,   521,   522,   412,   472,   472,   217,   217,  4444,  3847,
+     449,  3147,   217,  3605,   449,   217,    14,   329,   524,   449,
+     655,   277,   324,   487,  5435,   524,   220,  3163,   234,   312,
+    3622,  3623,   529,   526,   312,    87,  4646,   447,   529,  3546,
+     526,   526,   449,   242,   225,   234,  3638,   451,  3837,  3838,
+    3839,  3840,   527,   529,   515,   529,   249,   249,   273,   253,
+     415,   281,   335,   111,   526,    34,  3202,   472,    10,   128,
+     529,   529,   342,   400,   449,  4932,   527,   449,  5159,   527,
+     336,  3636,   400,   281,   281,  3677,  4516,   527,  3224,  4818,
+     526,  3227,   472,   325,   288,   325,  4825,   526,   449,  3691,
+     454,  5129,  3694,   484,   449,  3796,   449,   402,   229,   283,
+    4843,  5130,   334,  3546,   118,   421,   325,  3796,   291,  5144,
+     291,  5146,  4620,   291,  3716,   396,   320,  3719,   449,   333,
+    4837,   529,   441,   449,   400,   250,   382,   382,   334,   277,
+     371,   409,   449,  4573,  3736,   449,  3542,  3739,   111,   277,
+     277,  3547,   515,  3745,   277,   472,   333,   472,   277,  3751,
+     217,  3753,   229,   283,  3756,   515,   229,   231,  3760,  3761,
+    3762,  3763,  3764,   484,   330,  3767,  3768,  3769,  3770,  3771,
+    3772,  3773,  3774,  3775,  3776,   409,   526,   526,  3780,  3781,
+     217,   217,   386,  3785,   388,   216,   390,   491,  3790,   111,
+     334,   334,  3794,   397,  3796,   283,  3798,   320,   320,   247,
+     404,   247,   520,   229,  3806,   111,   509,  3809,   412,  3811,
+     310,   524,   527,   509,   217,   334,   527,  3819,  3820,   527,
+     424,  3823,  3824,   334,   283,   527,  3828,  3829,   432,   527,
+     334,   256,   409,  3835,   229,   256,  3796,   256,   529,  5310,
+     529,   495,   529,  3845,    99,  3847,   240,   513,   514,   515,
+     234,   517,   518,   519,   520,   521,   522,  3859,   309,   904,
+     449,   526,  4620,  3865,  3866,  3867,  4968,   491,  4254,   334,
+     529,   128,   454,   329,   438,  4254,   283,  2443,   527,  3796,
+     527,   527,   486,   484,   234,   345,   529,  3761,  3762,  3763,
+    3764,   527,   527,  3767,  3768,  3769,  3770,  3771,  3772,  3773,
+    3774,  3775,  3776,   352,   234,   344,    84,   449,   526,    87,
+    3912,   470,   488,  5052,   527,   511,   527,  4064,   963,   964,
+    3726,   509,   527,  3925,   301,   488,   478,   128,   334,  4030,
+     527,  2497,   527,   527,  4035,  2501,  4037,   527,   116,  3941,
+     526,   526,   515,   334,   122,  4856,  4035,   526,  4037,  3823,
+    3824,  2517,   526,  3796,  3956,  1000,   526,   515,   530,   527,
+     529,   337,   529,    84,   334,   527,    87,   259,   146,   526,
+      91,    92,    93,   217,   449,   526,   267,   495,   449,   449,
+    5037,   325,   338,   449,   404,   217,  3988,   217,  4899,   404,
+     291,   404,  2558,   259,   449,   116,   472,   293,   353,   353,
+     303,   122,   449,   303,   449,   469,   449,   449,   303,   449,
+    4856,   449,   400,   400,  1059,   449,   449,   449,   400,  5076,
+     449,   449,   400,   320,  4125,   146,   412,   217,  4030,  4937,
+     117,  5469,   210,  4035,  4036,  4037,  4125,   449,   449,   277,
+     277,   277,  4888,   277,   526,   529,   527,   527,  1093,  4889,
+     459,   118,    84,  4899,   178,    87,  3602,   449,  1103,    91,
+      92,    93,  1107,  1108,  1109,   384,  3612,   334,   529,   526,
+    4030,   333,   111,   251,   527,  4035,   108,  4037,   256,   217,
+     449,   217,   229,  4085,   244,   526,  4088,   138,   229,   472,
+    3636,   472,   527,   400,   337,   525,   400,   409,   400,   215,
+     215,   277,   529,   277,   277,   208,   524,   234,    87,   229,
+     345,   527,   529,  4030,   292,   483,   234,   527,  4035,   340,
+    4037,   488,   527,  4125,   234,   527,   526,   512,   527,   242,
+     251,   335,   529,   529,   527,   256,   526,   389,   155,  2705,
+     529,   515,   459,  4214,   229,  4147,   526,  2713,   111,  2715,
+     515,   472,  1197,  1198,   472,   527,   527,  1202,   336,   449,
+     283,   267,   128,   441,   526,  4125,   459,   449,  4170,  4171,
+     449,   292,  4174,   404,   449,   400,   449,   449,   400,   527,
+     527,  4183,   527,  4185,  5241,   382,   526,  4030,   128,   229,
+     441,   146,  4035,   491,  4037,   217,  5253,   178,   459,   527,
+     277,  5258,  1000,  5260,   277,  4254,  4277,   277,  4125,   277,
+     526,   491,   281,   367,   262,   336,   526,   526,   495,   229,
+    4222,  4223,  4224,  1021,   529,  1023,   151,  1025,   527,   441,
+    4036,   459,   526,  1031,  1032,  1033,   449,    84,   409,   417,
+     529,   529,   529,   526,   239,   277,   527,   178,   234,   525,
+     277,   277,  4254,   277,   277,   128,   527,  1055,  1056,   234,
+     489,  5281,   526,   489,   527,   376,   345,   527,   527,   280,
+    4478,   529,   526,  4147,   527,   280,   526,   343,   440,   526,
+     341,   245,  4125,  3829,  4286,   128,   527,   527,   527,    78,
+      84,   515,   330,    87,   459,    84,   417,   449,   234,  3845,
+      89,  3847,   491,   261,   336,  4307,   146,   325,   515,   325,
+      84,   128,   441,    87,   529,   529,  4318,    91,    92,    93,
+     140,   449,   116,   449,   449,  4131,  4132,   116,   122,   217,
+     277,   236,   510,   234,   108,   472,   256,  4254,   526,   517,
+     518,   519,   520,   521,   522,   409,  4348,   111,   203,   491,
+     472,   491,   146,   487,   111,   234,  4358,  4359,   334,  4361,
+     526,   229,   264,  4365,  4366,   337,  5277,   275,  4370,  4371,
+     527,   234,   161,  4375,   376,   526,  4378,  4379,  4525,   477,
+     526,  4383,   425,  4454,   527,  1183,   351,  4389,   527,   510,
+     280,   526,   513,   514,   515,   526,   517,   518,   519,   520,
+     521,   522,  5310,   157,  1202,  4407,   490,   198,   527,  4411,
+     334,  2977,   526,   449,   449,   377,   210,   526,  4519,   527,
+     209,  4423,   526,   229,   526,   192,  4428,   325,   217,   111,
+     219,  5277,  4434,   325,   304,   259,   526,  1482,   367,   527,
+     526,  1486,  1487,   232,  1489,   526,   216,   111,   397,   527,
+    4452,  1249,   338,   397,   423,   459,   423,   251,   515,   128,
+    1505,   128,   256,  4465,   527,   111,   526,   865,   526,   472,
+     529,   527,   526,   526,   318,   527,   874,  4283,   334,  4481,
+     526,   513,   514,   515,   441,   517,   518,   519,   520,   521,
+     522,   441,    81,   441,   527,   223,   367,  4499,   292,   140,
+     337,   140,   198,   277,   491,    84,  1551,   491,    87,    84,
+     376,   909,   526,   526,  4516,   476,   111,  4519,   477,   412,
+     529,   234,   441,   374,   229,    84,  4528,   203,    87,   261,
+    1575,   334,    91,    92,    93,   488,   334,   116,   526,   111,
+     409,  4543,   336,   122,   111,   337,  4548,   337,   526,   108,
+     236,   236,   526,  4555,   527,   526,   190,   116,   128,  4519,
+     396,  4563,   336,   122,   470,    81,   526,   146,   396,   967,
+     383,  4573,    97,   527,   108,    84,   527,   529,    87,   977,
+     526,   216,    91,    92,    93,   449,   529,   146,   367,   234,
+     423,   423,   491,   526,   491,   382,   236,  1992,   236,   108,
+    4602,   390,  4519,  1648,  2821,  3186,  1245,  1281,  1711,  1280,
+    2677,  3374,  1657,  4035,  3538,  4124,    84,  2746,  4620,    87,
+    3186,  5151,  4935,   417,  5310,  4983,  1671,  4168,  4987,  4967,
+    4639,   210,  3298,  4439,  2965,  4637,   425,  4855,  5395,  5466,
+    5324,  5323,  5415,  3302,  4201,  4215,  4648,  4160,   116,  2811,
+    2811,  4030,  3398,  4184,   122,  2805,  4664,  1702,  2063,  4465,
+    1705,  1706,  3591,  5474,  5567,  1710,  1711,  5548,  4214,  4962,
+    3546,  3541,   251,  5426,  4901,  2052,  4519,   256,   146,  5296,
+    5405,   188,  4904,  4286,  5101,  1542,  4222,  5218,  1486,  1487,
+    2532,  1489,   251,  3273,   964,  2267,  1558,   256,  2266,  4701,
+    3494,  4703,  5551,  5440,  2427,  2266,   992,  1505,  2201,  1856,
+    2426,  3202,  4203,   292,  4455,  5387,   510,  3923,   277,   278,
+    1500,  2948,  1123,   517,   518,   519,   520,   521,   522,  1739,
+    3203,  4277,  1682,   292,  2467,  1757,  4738,  1756,  3214,   513,
+     514,   515,   210,   517,   518,   519,   520,   521,   522,  3870,
+    1795,  3209,  4754,  5380,  5262,  4437,  4758,   336,  2466,  1759,
+    3224,  4763,  3847,  4398,   323,  4413,  5066,  5244,   277,  3845,
+    5243,  1764,  3924,  3656,  5035,  3798,  4827,   336,  4780,  4781,
+     339,  5383,  4784,   251,  5384,  5370,  2360,  3206,   256,  3131,
+    3041,  3129,  3633,  2363,   655,    84,  4798,  2875,    87,  2501,
+    2098,  4803,    91,    92,    93,  5361,  4808,  1776,   391,  4811,
+    4812,  1002,  2476,  2517,  4620,  1770,  1220,  4819,  4820,  1554,
+    2509,  3180,  2510,  4438,   292,  1200,  3930,   336,  5076,  1389,
+    3931,  3896,  4836,   424,  4935,  2521,  1200,  1685,   417,  4841,
+    1774,  2961,  1486,  2230,     2,    -1,  4935,  4849,  1034,  4851,
+    5098,    -1,    -1,  4855,    -1,    -1,    -1,    -1,   417,    -1,
+      -1,  4407,    -1,    -1,    -1,  4411,    -1,    -1,   336,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4754,    -1,    -1,    -1,    -1,    -1,  4888,  4889,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4898,    -1,    -1,    -1,
+      -1,  4972,    -1,    -1,    -1,    -1,    -1,  1705,  4454,  1307,
+      -1,    -1,  1710,  1711,    -1,    -1,  1961,    -1,    -1,    -1,
+    1318,    -1,    -1,    -1,    -1,    -1,  4997,    -1,    -1,    -1,
+      -1,   510,    -1,  4935,    -1,  4937,    -1,    -1,   517,   518,
+     519,   520,   521,   522,    -1,    -1,    -1,  4949,    -1,   417,
+      -1,   510,    -1,    -1,   513,   514,   515,    -1,   517,   518,
+     519,   520,   521,   522,    -1,    -1,   525,    -1,    -1,    -1,
+      -1,    -1,   531,    -1,    -1,  4935,  3542,    -1,    -1,    -1,
+      -1,  3547,    -1,  1381,    -1,    -1,  1784,  2032,  1786,  1787,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5000,    -1,
+    5002,    -1,    -1,    -1,   513,   514,   515,  1805,   517,   518,
+     519,   520,   521,   522,  1812,  1813,    -1,  2062,  4935,    -1,
+      -1,  5122,    -1,  4829,    -1,    -1,    -1,    -1,    -1,    -1,
+    5032,  5033,    -1,  5035,    -1,  5037,    -1,    -1,    -1,    -1,
+      -1,    -1,   510,    -1,    -1,    -1,    -1,   336,    -1,   517,
+     518,   519,   520,   521,   522,    -1,    -1,    -1,    -1,  5061,
+      -1,    -1,    -1,  5065,    -1,    -1,    -1,    -1,   857,  5071,
+      -1,    -1,   861,    -1,  5076,    -1,    -1,    -1,    -1,    -1,
+    1878,    -1,  4888,    -1,    -1,    -1,   875,    -1,  1886,    -1,
+      -1,    -1,  4935,   882,    -1,    -1,  5098,    -1,    84,    -1,
+      -1,    87,    -1,    -1,   893,    91,    92,    93,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    5122,    -1,    -1,    -1,    -1,    -1,  5128,    -1,    -1,  5200,
+    5132,  5133,   921,    -1,    -1,  5137,    -1,   926,    -1,    -1,
+      -1,    -1,    -1,  2188,    -1,    -1,  2191,  1945,   937,    -1,
+    1948,  1949,    -1,    -1,    -1,    -1,    -1,    -1,  5032,    -1,
+    3726,    84,  5122,    -1,    87,    -1,    -1,    -1,    91,    92,
+      93,    -1,    -1,    -1,   963,    -1,  5178,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   978,
+      -1,    -1,    -1,    -1,    -1,   984,  5198,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5122,   995,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5218,  5219,    -1,  2017,
+    1009,    -1,    -1,    -1,   513,   514,   515,  5229,   517,   518,
+     519,   520,   521,   522,    -1,    -1,    -1,    -1,    -1,  5241,
+      -1,    -1,  5244,    -1,  5492,  2290,    -1,    -1,    -1,    -1,
+      -1,  5253,    -1,    -1,    -1,    -1,  5258,  4803,  5260,    -1,
+    5262,    -1,  4808,    -1,    -1,  4811,    -1,  5269,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5122,
+      -1,    -1,    -1,    -1,    -1,  5287,    -1,    -1,    -1,    -1,
+      -1,   277,    -1,    -1,    -1,    -1,    -1,  4843,  2096,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5310,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1106,   101,  1108,
+      -1,  1110,  2120,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2130,    -1,  2132,    -1,  5338,    -1,    -1,    -1,
+    1129,  2139,    -1,    -1,    -1,    -1,  2144,    -1,    -1,    -1,
+     336,    -1,  2397,    -1,   277,    -1,  5427,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   148,    -1,  5369,  5370,  5440,
+    5440,  5440,  5440,    -1,    -1,  5440,    -1,    -1,  5380,    -1,
+      -1,    -1,    -1,    -1,    -1,  5486,  5388,    -1,    -1,    -1,
+    2188,    -1,    -1,  2191,    -1,    -1,   179,  5486,  5400,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1197,  1198,
+      -1,    -1,    -1,   336,    -1,    -1,    -1,   200,    -1,    -1,
+      -1,  5492,  5492,  5492,  5492,    -1,  4972,  5492,   211,    -1,
+      -1,    -1,    -1,  5435,    -1,    -1,    -1,    -1,    -1,  5441,
+    5442,    -1,  5444,    -1,    -1,    -1,    -1,  5548,   231,    -1,
+      -1,  4997,    -1,   236,    -1,    -1,  2501,    -1,    -1,  5548,
+      -1,  5463,    -1,    -1,    -1,    -1,  5567,    -1,    -1,    -1,
+    4036,    -1,  2517,    -1,  2519,    -1,  2521,    -1,  5567,    -1,
+    5551,  5551,  5551,  5551,  5486,    -1,  5551,    -1,    -1,  2287,
+    2288,  1280,  1281,    -1,    -1,    -1,  2294,  2295,  4064,    -1,
+      -1,   284,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2558,   101,    -1,    -1,    -1,    -1,  5065,
+      -1,    -1,   305,    -1,    -1,  2323,  5486,   513,   514,   515,
+    5076,   517,   518,   519,   520,   521,   522,    -1,    -1,    -1,
+    5542,  5543,    -1,    -1,    -1,    -1,  5548,   134,    -1,    -1,
+      -1,    -1,  5098,    -1,  5556,    -1,    -1,    -1,    -1,    -1,
+     147,    -1,    -1,    -1,    -1,  5567,  5568,  5569,    -1,  5486,
+      -1,    -1,    -1,    -1,   161,    -1,    -1,    -1,    -1,  2624,
+      -1,  2379,    -1,   366,    -1,    -1,    -1,    -1,  5548,    -1,
+     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5567,    -1,    -1,
+     393,    -1,    -1,   200,    -1,    -1,    -1,   400,    70,    -1,
+      -1,    -1,    -1,   406,   211,    -1,    78,    79,    -1,    -1,
+      -1,  5548,    84,    -1,    -1,    87,    -1,    -1,    -1,    91,
+      92,    93,    -1,  5486,   231,  2443,    -1,    -1,    -1,   236,
+    5567,    -1,    -1,    -1,  5200,   438,   108,    -1,   441,   111,
+      -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,    -1,    -1,
+     122,    89,    -1,  1462,    -1,    -1,   459,    -1,    -1,    -1,
+    5486,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1482,   146,    -1,    -1,    -1,    -1,  2497,
+      -1,   484,    -1,    -1,    -1,  5548,  2104,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1505,  4283,   305,  2517,
+      -1,  2519,    -1,  2521,  5567,  2770,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2778,    -1,    -1,    -1,    -1,    -1,    -1,
+     130,  2786,  5548,  2788,    -1,    -1,    -1,    -1,    -1,   336,
+      -1,  2149,  1541,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2558,  5567,    -1,    -1,    -1,    -1,    -1,    -1,  1557,    -1,
+      -1,    -1,    -1,   163,    -1,    -1,    -1,    -1,    -1,   366,
+      -1,    -1,    -1,  1572,    -1,    -1,  1575,    -1,    -1,    -1,
+      -1,  2836,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   251,
+      84,    -1,    -1,    87,   256,    -1,    -1,    91,    92,    93,
+      -1,    -1,    -1,   400,    -1,    -1,    -1,    -1,    -1,   406,
+      -1,  2866,   409,    -1,   108,   277,   278,    -1,    -1,  2874,
+     220,    -1,   116,    -1,    -1,    -1,    -1,    -1,   122,    -1,
+     292,    -1,    -1,  2241,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   438,    -1,    -1,    -1,  2900,    -1,    -1,   445,    -1,
+      -1,    -1,   146,   253,    -1,   452,    -1,    -1,    -1,    -1,
+      -1,   323,   459,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5427,    -1,    -1,   336,    -1,    -1,   339,    -1,    -1,
+      -1,  2936,    -1,    -1,  5440,    -1,    -1,   484,   288,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2705,    -1,    -1,
+      -1,    84,    -1,  1702,    87,  2713,    -1,  2715,    91,    92,
+      93,  1710,  1711,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     320,    -1,  1721,    -1,    -1,   108,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   116,    -1,    -1,  5492,    -1,    -1,   122,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   348,  4525,
+      -1,    -1,    -1,    -1,    -1,   417,    -1,   251,    -1,    -1,
+      -1,    -1,   256,   146,    -1,    98,    -1,    -1,    -1,    -1,
+     111,   104,    -1,    -1,    -1,  1774,  1775,  1776,    -1,    -1,
+      -1,    -1,   382,   277,   278,    -1,   386,    -1,    -1,   130,
+     390,    -1,    -1,    -1,    -1,  5551,  1795,   397,   292,    -1,
+      -1,    -1,    -1,    -1,   404,    -1,    -1,    -1,    -1,    -1,
+      -1,   144,   412,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   163,    -1,   424,    -1,  1825,    -1,    -1,   323,
+      -1,    -1,   432,  1832,    -1,    -1,    -1,    -1,    -1,    -1,
+    1839,    -1,   336,    -1,  4620,   339,    -1,    -1,   510,    -1,
+    1849,   513,   514,   515,    -1,   517,   518,   519,   520,   521,
+     522,    -1,   195,    -1,    -1,    -1,    -1,    -1,   251,   202,
+      -1,    -1,   205,   256,    98,    -1,    -1,    -1,    -1,   220,
+     104,    -1,    -1,    -1,    -1,    -1,   486,    -1,    -1,  1888,
+      -1,  2899,  2900,    -1,   277,   278,    -1,   230,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   292,
+      -1,    -1,   253,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     144,    -1,    -1,   417,    -1,    -1,    -1,    -1,   261,    -1,
+      -1,  3186,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     323,    -1,   283,    -1,    -1,    -1,    -1,   288,    -1,    -1,
+      -1,    -1,    -1,   336,    -1,    -1,   339,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2977,
+      -1,   195,    -1,    -1,    -1,    -1,    -1,    -1,   202,   320,
+      -1,   205,  2590,    -1,    -1,   318,    -1,   320,    -1,  2597,
+      -1,  1990,    -1,    78,    -1,    -1,    -1,   330,    -1,    84,
+      -1,    -1,    -1,    -1,    89,   338,   230,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   348,   510,    -1,    -1,   513,
+     514,   515,    -1,   517,   518,   519,   520,   521,   522,    -1,
+      -1,   116,    -1,    -1,   417,   529,    -1,   261,    -1,    -1,
+    2039,    -1,    -1,    -1,    -1,   386,    -1,    -1,    -1,   390,
+      -1,    -1,   385,   386,    -1,    -1,   397,    -1,    -1,    -1,
+      -1,  2060,    -1,   404,    -1,  2064,  3321,    -1,    -1,    -1,
+      -1,   412,    -1,    -1,    -1,    -1,   161,  2076,    -1,   412,
+      -1,    84,    -1,   424,    87,    -1,    -1,    -1,    91,    92,
+      93,   432,    -1,    -1,   318,    -1,   320,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   108,   330,    -1,    -1,    -1,
+      -1,   452,  4888,   116,   338,    -1,    -1,    -1,    -1,   122,
+      -1,    -1,    -1,    -1,   348,    -1,    -1,   510,    -1,    -1,
+     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
+      -1,    -1,   475,   146,    -1,   486,   529,   232,  3403,   490,
+     491,    -1,  2151,  2152,    -1,    -1,    -1,    -1,   382,    -1,
+      -1,   385,   386,    -1,    -1,  2164,    -1,    -1,    -1,    -1,
+       5,    -1,    -1,  3181,    -1,    -1,  3184,    -1,  3186,    -1,
+    2179,  2180,    -1,    -1,    -1,   111,    -1,    -1,   412,  3444,
+      25,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      35,    36,  2201,    -1,   130,    -1,    -1,    42,    43,    -1,
+      -1,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    -1,   163,  3493,    74,
+      75,    76,    77,    78,    79,    80,    81,   875,   251,    -1,
+      85,   475,    -1,   256,   882,    -1,    -1,    -1,    -1,    -1,
+    3515,    -1,    -1,    -1,    -1,   893,    -1,  3522,  3523,    -1,
+      -1,  3526,    -1,    -1,   277,   278,    -1,    -1,  3533,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3542,    -1,   292,
+      -1,    -1,  3547,   921,   220,    -1,    -1,  3552,   926,  3554,
+      -1,    -1,   137,    -1,    -1,   390,    -1,    -1,    -1,   937,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,
+     323,    -1,    -1,    -1,    -1,    -1,    -1,   253,    -1,    -1,
+      -1,    -1,  2331,   336,    -1,    -1,   339,  3592,   130,    -1,
+     425,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   283,    -1,    -1,
+      -1,    -1,   288,    -1,    -1,    -1,  3621,  3622,    -1,    -1,
+      -1,   163,    -1,    -1,   209,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   227,    -1,   320,  3650,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3017,
+      -1,    -1,    -1,   248,   417,  3023,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2424,    -1,    -1,   220,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   271,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  5229,    -1,    -1,    -1,    -1,    -1,    -1,
+     386,   253,    -1,    -1,   390,    -1,    -1,    -1,    -1,    -1,
+      -1,   397,   307,    -1,    -1,   310,    -1,    -1,   404,    -1,
+    2479,    -1,  2481,    -1,    -1,    -1,   412,    -1,    -1,    -1,
+     325,   283,    -1,    -1,    -1,    -1,   288,    -1,   424,    -1,
+      -1,    -1,  2501,    -1,    -1,    -1,   432,   510,    -1,    -1,
+     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
+      -1,    -1,    -1,    -1,   527,    -1,   452,    -1,   320,    -1,
+      -1,    -1,    -1,    -1,  3542,    -1,    -1,    -1,    -1,  3547,
+      -1,    -1,  2541,    -1,    -1,    -1,  2545,  2546,    -1,    -1,
+    3805,  2550,    -1,    -1,    -1,  3163,    -1,    -1,    -1,  2558,
+     486,  3569,    -1,    -1,   490,    -1,    -1,    -1,   403,  1197,
+    1198,    -1,    -1,    -1,    -1,    -1,    -1,  2576,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   386,    -1,    -1,    -1,   390,    -1,
+      -1,    -1,    -1,    98,    -1,   397,    -1,    -1,    -1,   104,
+      -1,    -1,   404,    -1,   449,    -1,  3224,    -1,    -1,  2618,
+     412,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   464,
+    2629,    -1,   424,    -1,    -1,  3643,  2635,  2636,    -1,    -1,
+     432,    -1,  3650,    -1,   479,    -1,    -1,    -1,    -1,   144,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     452,    -1,    -1,    -1,    -1,  2664,  2665,    -1,    -1,  2668,
+      -1,    -1,   507,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     515,    -1,   517,   518,   519,   520,   521,    -1,    -1,   524,
+     525,   526,   527,    -1,   486,  2694,   531,  2696,   490,    -1,
+     195,  2700,    -1,    -1,    -1,    -1,    -1,   202,    -1,    -1,
+     205,    -1,    -1,    84,    -1,    -1,    87,    -1,  3726,  2718,
+      91,    92,    93,    -1,    -1,    -1,    -1,   973,    -1,    -1,
+    2729,    -1,    -1,    -1,    -1,   230,    -1,   108,    -1,    -1,
+      -1,    -1,    -1,  2742,    -1,   116,    -1,    -1,   994,    -1,
+      -1,   122,  2751,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   261,    -1,    -1,    -1,
+      -1,    -1,   857,    -1,    -1,   146,   861,    -1,    -1,    -1,
+      -1,  4036,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     875,    -1,    -1,    -1,    -1,    -1,    -1,   882,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   893,  2808,
+    4065,    -1,    -1,  4068,    -1,  4070,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   318,    -1,   320,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   330,   921,    -1,    -1,    -1,
+      -1,   926,    -1,   338,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   937,   348,    -1,    -1,  1429,    -1,  4113,    -1,
+      -1,    -1,    -1,    -1,  4119,  4120,    -1,  4122,    -1,  4124,
+      -1,    -1,    -1,    -1,    -1,  2874,    -1,    -1,   963,    -1,
+     251,    -1,    -1,    -1,    -1,   256,    -1,   382,    -1,    -1,
+     385,   386,    -1,   978,    -1,    -1,    -1,  1470,    -1,   984,
+      -1,    -1,    -1,    -1,    -1,  1478,   277,   278,    -1,    -1,
+     995,  1484,    -1,    -1,    -1,    -1,    -1,   412,    -1,  3927,
+      -1,   292,    -1,    -1,  1009,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2936,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   323,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4218,    -1,   336,    -1,    -1,   339,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     475,    -1,    -1,    -1,  2983,    -1,    -1,    -1,    -1,   164,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4255,  4256,  4257,  4258,  4259,    -1,  3005,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3013,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1108,    -1,    -1,    -1,    -1,  4036,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   212,    -1,    -1,
+      -1,    -1,    -1,    -1,  1129,  4300,   417,    -1,  4303,   224,
+    4305,    -1,    -1,    -1,   229,    -1,  4064,    -1,    -1,   234,
+      -1,    -1,    -1,    -1,   239,    -1,    89,   242,  1314,    -1,
+     245,    84,    -1,    -1,    87,    -1,    -1,    -1,    91,    92,
+      93,    -1,    -1,  3691,    -1,    -1,    -1,    -1,  1334,    -1,
+    3089,    -1,    -1,   116,    -1,   108,  3095,  1343,   273,    -1,
+      -1,    -1,    -1,   116,    -1,   973,    -1,    -1,    -1,   122,
+      -1,    -1,  1197,  1198,    -1,    -1,    -1,    -1,   293,    -1,
+      -1,    -1,    -1,  4131,  4132,    -1,   994,    -1,    -1,    -1,
+      -1,    -1,    -1,   146,    -1,    -1,    -1,    -1,   161,   510,
+      -1,    -1,   513,   514,   515,    -1,   517,   518,   519,   520,
+     521,   522,    -1,    -1,    -1,    -1,   527,   332,    -1,   334,
+      -1,    -1,    -1,    -1,    -1,   340,    -1,  1795,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
-     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,    -1,   128,   129,
-     130,   131,   132,    -1,   134,   135,   136,   137,   138,   139,
-      -1,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
-     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
-     160,   161,   162,   163,    -1,   165,   166,   167,    -1,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
-     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
-     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
-     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
-     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
-     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
-     260,   261,   262,    -1,   264,   265,   266,    -1,   268,   269,
-     270,    -1,   272,    -1,   274,    -1,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   285,   286,    -1,   288,   289,
-     290,   291,   292,    -1,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-      -1,   321,   322,   323,   324,    -1,   326,   327,   328,   329,
-     330,   331,    -1,   333,    -1,   335,   336,   337,   338,    -1,
-      -1,   341,   342,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
-     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
-     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
-     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
-     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
-     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
-     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
-      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
-     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
-     470,   471,    -1,   473,   474,   475,   476,   477,   478,   479,
-      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
-      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
-     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
-      -1,    -1,    -1,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    -1,   526,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    -1,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    -1,    41,
-      42,    43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
-      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,  4436,    -1,    -1,  4439,  4440,   209,  3186,    -1,    -1,
+      -1,    -1,    -1,    -1,   217,    -1,   219,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   232,
+    4465,    -1,    -1,    -1,   389,    -1,    -1,    -1,    -1,    -1,
+      -1,    84,    -1,    -1,    87,    -1,    -1,    -1,    91,    92,
+      93,    -1,    -1,    -1,    -1,    -1,    -1,  3845,   251,  3847,
+      -1,    -1,    -1,   256,    -1,   108,    -1,  4255,  4256,  4257,
+    4258,  4259,    -1,   116,    -1,    -1,    -1,    -1,    -1,   122,
+      -1,    -1,    -1,   438,   277,   278,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4283,  3275,    -1,    -1,   292,
+      -1,    -1,    -1,   146,    -1,    -1,    -1,    -1,    -1,   464,
+      -1,    -1,  3291,  3292,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1555,
+     323,    -1,    -1,   488,    -1,   490,   491,    -1,    -1,  3318,
+      -1,    -1,  3321,   336,    -1,    -1,   339,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4600,  4601,    -1,  3956,   524,
+      -1,    -1,   527,   528,  4609,   530,  4611,  4612,    -1,    -1,
+    4615,    -1,  1990,    -1,    -1,  4620,    -1,    -1,    -1,  4624,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1462,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   251,    -1,
+      -1,    -1,    -1,   256,    -1,    -1,    -1,  1482,  3397,  3398,
+    3399,    -1,    -1,    -1,   417,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   277,   278,  4671,    -1,    -1,    -1,
+    1505,    -1,  3421,    -1,    -1,    -1,    -1,    -1,    -1,   292,
+      -1,  4439,  2060,    -1,  3433,    -1,  2064,    -1,  3437,    -1,
+      -1,    -1,    -1,    -1,    -1,  4700,  1314,  3446,  2076,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1541,  4465,    -1,    -1,
+     323,    -1,    -1,    -1,    -1,    -1,  1334,    -1,    -1,    -1,
+      -1,    -1,  1557,   336,    -1,  1343,   339,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4739,    -1,    -1,  1572,  4743,  4744,
+    1575,  4746,    -1,    -1,    -1,    -1,    -1,   510,    -1,    -1,
+     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
+      -1,  3510,    -1,    -1,   527,    -1,    -1,  4525,    -1,    -1,
+      -1,    -1,    -1,    -1,  2152,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2105,    84,    -1,    -1,    87,    -1,  4546,  4547,
+      91,    92,    93,  4551,  4552,    -1,    -1,  3546,    -1,    -1,
+      -1,    -1,  2180,  3552,   417,  3554,  1424,   108,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   116,    -1,  3566,    -1,  3568,
+      98,   122,    -1,    -1,    -1,    -1,   104,  2150,    -1,    -1,
+      -1,  2154,    -1,    84,    -1,    -1,    87,  2160,  2161,    -1,
+      91,    92,    93,    -1,    -1,   146,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,    -1,    -1,
+    2183,    -1,  4620,    -1,    -1,   116,   144,  1702,    -1,    -1,
+      -1,   122,    -1,  3622,    -1,  1710,  1711,    -1,    -1,    -1,
+      -1,    -1,    -1,  4888,    -1,    -1,  1721,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   146,    -1,   510,    -1,    -1,
+     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
+      -1,    -1,    -1,    -1,   527,    -1,    -1,   195,    -1,    -1,
+      -1,  4926,    -1,    -1,   202,    -1,    -1,   205,  3677,    -1,
+      -1,    -1,  4937,  1929,    -1,    -1,  4941,  1555,  4943,  1774,
+    1775,  1776,  4947,  4948,    -1,  3694,    -1,    -1,    -1,    -1,
+     251,    -1,   230,    -1,    -1,   256,    -1,    -1,    -1,    -1,
+    1795,    -1,    -1,    -1,    -1,    -1,    -1,  3716,    -1,    -1,
+    3719,    -1,    -1,    -1,    -1,    -1,   277,   278,    -1,    -1,
+      -1,    -1,    -1,   261,    -1,    -1,    -1,    -1,    -1,    -1,
+    1825,   292,    -1,    -1,    -1,    -1,    -1,  1832,    -1,    -1,
+     251,    -1,    -1,    -1,  1839,   256,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2010,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   323,    -1,    -1,    -1,   277,   278,    -1,  2025,
+      -1,    -1,    -1,    -1,    -1,   336,    -1,    -1,   339,    -1,
+     318,   292,   320,    -1,    -1,    -1,    -1,  3796,  2044,  4407,
+      -1,    -1,   330,  4411,    -1,    -1,    -1,    -1,    -1,    -1,
+     338,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     348,  4829,   323,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   857,   336,    -1,  1705,   339,    -1,
+      -1,    -1,    -1,    -1,    -1,  2091,    -1,    -1,    -1,    -1,
+    2423,    -1,   875,    -1,   382,    -1,    -1,   385,   386,   882,
+      -1,    -1,    -1,    -1,  2110,    -1,   417,    -1,    -1,    -1,
+     893,    -1,    -1,  2501,    -1,    -1,  2122,    -1,    -1,    -1,
+    4888,    -1,    -1,    -1,   412,    -1,    -1,    -1,  2134,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5152,   921,    -1,
+      -1,    -1,    -1,   926,    -1,  1990,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2541,   937,    -1,   417,    -1,  2546,    -1,
+      -1,    -1,  2550,    -1,    -1,    -1,    -1,    -1,  2174,    -1,
+      -1,  2177,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     963,    -1,    -1,    -1,    -1,    -1,    -1,   475,  2576,    -1,
+      -1,    -1,    -1,    -1,  2039,   978,    -1,    -1,    -1,   510,
+      -1,   984,   513,   514,   515,  1833,   517,   518,   519,   520,
+     521,   522,   995,    -1,    -1,  2060,   527,    -1,    -1,  2064,
+      -1,    -1,    -1,    -1,    -1,    -1,  1009,    -1,    -1,  3988,
+    2618,  2076,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2635,    -1,   510,
+      -1,    -1,   513,   514,   515,    -1,   517,   518,   519,   520,
+     521,   522,    -1,    -1,    -1,    -1,   527,    -1,  1896,    -1,
+      -1,  4030,    -1,    -1,    -1,    -1,  4035,  2665,  4037,    -1,
+    4648,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5310,    -1,    -1,    -1,    -1,
+      -1,  1929,    -1,    -1,    -1,    -1,  2151,  2152,  2696,    -1,
+      -1,    -1,  2700,    -1,    -1,    -1,    -1,    -1,    -1,  2164,
+    2326,    -1,    -1,  1106,    -1,  1108,  4085,  1110,    -1,  4088,
+    2718,    -1,    -1,    -1,  2179,  2180,    -1,    -1,    -1,    -1,
+      -1,  2729,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2742,    -1,  2201,    -1,    -1,    -1,
+      -1,    -1,    -1,  2751,    -1,    -1,  4125,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2010,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2025,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2033,    -1,    -1,    -1,    -1,
+      84,  4170,  4171,    87,  1197,  1198,  2044,    91,    92,    93,
+      -1,    -1,    -1,    -1,  4183,    -1,  4185,    -1,    -1,    -1,
+    4798,    -1,    -1,    -1,   108,  4803,    -1,    -1,    -1,    -1,
+    4808,    -1,   116,  4811,  4812,    -1,    -1,    -1,   122,    -1,
+      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,    -1,   104,
+      -1,  5229,    -1,  2091,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5486,   146,  4841,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2110,    -1,    -1,    -1,  2331,  4855,    -1,    -1,
+      -1,    -1,    -1,    -1,  2122,  4254,    -1,  1280,  1281,   144,
+      -1,    -1,    -1,    -1,    -1,    -1,  2134,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,    87,
+      -1,    -1,    -1,    91,    92,    93,    -1,  4286,    -1,    -1,
+    4898,    -1,    -1,  5548,    -1,    -1,    -1,    -1,    -1,    -1,
+     108,    -1,    -1,    -1,    -1,    -1,  2174,    -1,   116,  2177,
+     195,    -1,  5567,    -1,   122,    -1,  2889,   202,    -1,    -1,
+     205,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2908,    -1,   251,   146,  2424,
+      -1,  4949,   256,    -1,    -1,   230,    -1,    -1,  2594,    -1,
+    2923,    -1,    -1,  2926,  2927,  2983,    -1,    -1,  2931,  2932,
+    2606,    -1,    -1,   277,   278,  2938,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   261,  3005,   292,    -1,
+      -1,    -1,    -1,    -1,   101,  3013,    -1,    -1,    -1,    -1,
+      -1,    -1,  5000,    -1,  2479,    -1,  2481,  2643,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   323,
+      -1,    -1,    -1,    -1,    -1,    -1,  2501,    -1,    -1,    -1,
+      -1,    -1,   336,    -1,    -1,   339,    -1,    -1,    -1,    -1,
+     147,    -1,    -1,   318,    -1,   320,    -1,    -1,    -1,  1462,
+      -1,    -1,  3015,   251,   161,   330,    -1,    -1,   256,    -1,
+      -1,    -1,    -1,   338,    -1,    -1,  2541,  5065,  2326,  1482,
+    2545,  2546,   179,   348,    -1,  2550,    -1,    -1,   185,   277,
+     278,    -1,    -1,  2558,    -1,    -1,    -1,    -1,  5486,    -1,
+      -1,    -1,  1505,   200,   292,    -1,    -1,    -1,    -1,    -1,
+      -1,  2576,    -1,    -1,   211,    -1,    -1,   382,    -1,    -1,
+     385,   386,   219,   417,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   231,   323,    -1,  4516,  1541,   236,
+    4519,    -1,    -1,    -1,    -1,   242,    -1,   412,   336,    -1,
+      98,   339,    -1,  2618,  1557,    -1,   104,    -1,    -1,    -1,
+    5548,    -1,   259,    -1,  4543,    -1,    -1,    -1,    -1,  1572,
+    2635,  2636,  1575,    -1,  2800,    -1,  4555,    -1,    -1,  5567,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   284,    -1,    -1,
+    5178,    -1,    -1,    -1,  4573,    -1,   144,    -1,    -1,  2664,
+    2665,    -1,    -1,  2668,    -1,    -1,    -1,    -1,   305,    -1,
+     475,    -1,    -1,    -1,    -1,    -1,   510,    -1,    -1,   513,
+     514,   515,    -1,   517,   518,   519,   520,   521,   522,   417,
+      -1,  2696,    -1,   527,    -1,  2700,    -1,    -1,    -1,   336,
+      -1,  4620,    -1,    -1,    -1,    -1,    -1,   195,    -1,    -1,
+      -1,    -1,    -1,  2718,   202,    -1,  5244,   205,    -1,   356,
+      -1,    -1,    -1,    -1,  2729,    -1,    -1,  3275,    -1,   366,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2742,    -1,  2527,
+      -1,  5269,   230,  2531,  2532,    -1,  2751,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,    -1,    -1,  1702,
+      -1,   398,    -1,   400,    -1,    -1,    -1,  1710,  1711,   406,
+    3318,    -1,   409,   261,    -1,    -1,    -1,    -1,  1721,    -1,
+      -1,    -1,   510,    -1,    -1,   513,   514,   515,    -1,   517,
+     518,   519,   520,   521,   522,    -1,    -1,    -1,    -1,   527,
+     437,   438,    -1,  2808,   441,    -1,  2594,    -1,   445,    -1,
+    5338,    -1,    -1,    -1,  3307,    -1,    -1,   454,  2606,  4738,
+      -1,    -1,   459,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     318,  1774,   320,  2999,   471,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   330,    -1,    -1,    -1,    -1,   484,    -1,    -1,
+     338,    -1,  1795,    -1,  3020,  2643,    -1,    -1,    -1,    -1,
+     348,    -1,    -1,    -1,    -1,  3031,    -1,    -1,    -1,  2874,
+      -1,    84,  5400,  3421,    87,    -1,    -1,    -1,    91,    92,
+      93,    -1,    -1,    -1,    -1,  3433,    -1,    -1,    -1,  3382,
+      -1,  3384,    -1,    -1,   382,   108,  1839,   385,   386,    -1,
+      -1,    -1,    -1,   116,    -1,    -1,  1849,  5435,    -1,   122,
+      -1,    -1,    -1,  5441,  5442,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   412,    -1,    -1,    -1,    -1,    -1,
+    4849,  2936,  4851,   146,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    84,  1888,    -1,    87,    -1,    -1,
+      -1,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3510,    -1,    -1,    -1,    -1,    -1,   108,    -1,
+    4889,    -1,    -1,    -1,    -1,    -1,   116,    -1,  2983,    -1,
+      -1,    -1,   122,    -1,    -1,    -1,    -1,   475,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3490,    -1,    -1,
+    3005,    -1,    -1,  3496,    -1,    -1,   146,    -1,  3013,    -1,
+      -1,    -1,  2800,    -1,    -1,    -1,  4935,    -1,  4937,    -1,
+      -1,    -1,    -1,    84,    -1,    -1,    87,    -1,  5556,    -1,
+      91,    92,    93,    -1,    -1,    -1,    -1,    -1,   251,    -1,
+    5568,  5569,    -1,   256,    -1,    -1,    -1,  1990,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,    -1,
+      -1,   122,    -1,    -1,   277,   278,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   292,
+      84,    -1,  2870,    87,  3089,   146,    -1,    91,    92,    93,
+    3095,    -1,    -1,    -1,    -1,    -1,  2039,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   108,    -1,    -1,    -1,    -1,    -1,
+     323,   251,   116,    -1,    -1,    -1,   256,  2060,   122,    -1,
+      -1,  2064,    -1,   336,    -1,    -1,   339,    -1,    -1,  3677,
+      -1,    -1,    -1,  2076,    -1,    -1,    -1,   277,   278,    -1,
+      -1,    -1,   146,    -1,  3637,    -1,  3694,    -1,    -1,    -1,
+      -1,    -1,   292,    -1,    -1,    -1,    -1,    -1,  3324,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3660,  3661,    -1,
+    3663,  3719,  3665,  3666,    -1,  3341,    -1,    -1,    -1,    -1,
+      -1,  3186,    -1,   323,    -1,  3678,    -1,    -1,    -1,    -1,
+     251,    -1,    -1,    -1,    -1,   256,   336,    -1,    -1,   339,
+      -1,    -1,    -1,  5122,   417,    -1,    -1,    -1,  2151,  2152,
+      -1,  2999,    -1,    -1,    -1,    -1,   277,   278,    -1,    -1,
+      -1,  2164,    -1,    -1,    -1,  3718,    -1,    -1,    -1,    -1,
+      -1,   292,  3020,    -1,    -1,    -1,  2179,  2180,    -1,    -1,
+      -1,    -1,    -1,  3031,    -1,    -1,    -1,   251,    -1,    -1,
+      -1,    -1,   256,    -1,    -1,    -1,    -1,    -1,  2201,    -1,
+      -1,    -1,   323,    -1,  3430,    -1,  3432,    -1,    -1,    -1,
+    3275,    -1,    -1,   277,   278,   336,    -1,   417,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3291,  3292,   292,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   510,    -1,    -1,
+     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
+      -1,    -1,    -1,  3318,   527,    -1,  3321,    -1,    -1,   323,
+      -1,    -1,    -1,    -1,    -1,  3491,    -1,    -1,    -1,    -1,
+      -1,    -1,   336,    -1,    -1,   339,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3516,    -1,    -1,    -1,    -1,    -1,   417,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     510,    -1,    -1,   513,   514,   515,    -1,   517,   518,   519,
+     520,   521,   522,    -1,    -1,    -1,    -1,   527,  2331,    -1,
+      -1,  5310,  3397,  3398,  3399,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   417,    -1,    -1,  3421,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3433,    -1,
+      -1,    -1,  3437,    -1,    -1,    -1,    -1,    -1,    -1,  3605,
+    3988,  3446,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   510,
+      -1,    -1,   513,   514,   515,    -1,   517,   518,   519,   520,
+     521,   522,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5388,
+      -1,    -1,  3638,    -1,    -1,  3263,    -1,    -1,  3266,    -1,
+    3268,    -1,    -1,    -1,    98,  3273,    -1,    -1,    -1,    -1,
+     104,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3510,   510,    -1,    -1,   513,
+     514,   515,    -1,   517,   518,   519,   520,   521,   522,    -1,
+      -1,    -1,    -1,   527,    -1,    -1,    -1,    -1,    -1,    -1,
+     144,    -1,    -1,    -1,    -1,    -1,  3324,  4085,    -1,    -1,
+    4088,  3546,    -1,    -1,    -1,    -1,    -1,  3552,    -1,  3554,
+      -1,    -1,    -1,  3341,    -1,    -1,    -1,    -1,  2501,    -1,
+      -1,  3566,    -1,  3568,    -1,    -1,    -1,  5486,    -1,    -1,
+      -1,    -1,    -1,  3739,    -1,    -1,    -1,  3365,    -1,    -1,
+      -1,   195,    -1,    -1,    -1,    -1,    -1,    -1,   202,    -1,
+      -1,   205,    -1,    -1,  3760,    -1,    -1,    -1,  2541,    -1,
+      -1,    -1,  2545,  2546,    -1,    -1,    -1,  2550,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2558,   230,  3622,    -1,  3785,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5548,
+      -1,    -1,    -1,  2576,    -1,    -1,    -1,  4185,    -1,    -1,
+      -1,    -1,  3430,    -1,  3432,    -1,    -1,   261,  5567,    -1,
+      -1,    -1,    -1,  3819,    -1,    -1,    -1,    -1,    84,    -1,
+      -1,    87,    -1,    -1,    -1,    91,    92,    93,    -1,    -1,
+      -1,    -1,  3677,    -1,    -1,  2618,    -1,    -1,    -1,    -1,
+      -1,    -1,   108,    -1,    -1,    -1,  2629,    -1,    -1,  3694,
+     116,    -1,  2635,  2636,    -1,    -1,   122,    -1,    -1,    -1,
+      -1,    -1,    -1,  3491,   318,    -1,   320,    -1,    -1,    -1,
+      -1,  3716,    -1,    -1,  3719,    -1,   330,    -1,    -1,    -1,
+     146,  2664,  2665,    -1,   338,  2668,    -1,    98,  3516,    -1,
+      -1,    -1,    -1,   104,   348,    -1,    -1,    -1,  4286,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2694,    -1,  2696,  3542,    -1,    -1,  2700,   129,  3547,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   382,  4262,
+      -1,   385,   386,   144,    -1,  2718,    -1,  4270,  4271,  4272,
+    4273,    -1,    -1,    -1,    -1,    -1,  2729,    -1,    -1,    -1,
+      -1,  3796,    -1,    -1,    -1,    -1,    -1,    -1,   412,  2742,
+      -1,    -1,    -1,    -1,    -1,    -1,   177,    -1,  2751,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3605,    -1,    -1,
+      -1,    -1,    -1,    -1,   195,   251,    -1,    -1,    -1,    -1,
+     256,   202,    -1,    -1,   205,  3623,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3638,   277,   278,    -1,    -1,    -1,    -1,    -1,    -1,   230,
+      -1,   475,    -1,    -1,    -1,  2808,   292,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   258,    -1,   876,
+     261,    -1,    -1,    -1,    -1,    -1,    -1,   323,   885,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   894,    -1,    -1,
+     336,    -1,    -1,   339,    -1,   902,    -1,    -1,    -1,    -1,
+     907,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2874,    -1,    -1,    -1,   306,    -1,   308,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   318,    -1,   320,
+      -1,  3739,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   330,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   338,    -1,    -1,
+      -1,    -1,  3760,    -1,    -1,    -1,   347,   348,    -1,    -1,
+      -1,    -1,    -1,  3988,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   417,    -1,  2936,    -1,  4543,    -1,  3785,    -1,    -1,
+      -1,    -1,    -1,    -1,  4497,    -1,    -1,  4555,  4174,    94,
+      -1,   382,    -1,    -1,   385,   386,   387,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4030,    -1,    -1,    -1,    -1,
+    4035,  3819,  4037,    -1,    -1,    -1,  4529,  4530,    -1,    -1,
+    2983,   412,    -1,    -1,    -1,    -1,   131,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   426,    -1,    -1,    -1,    -1,
+      -1,    -1,  3005,    -1,    -1,    -1,    -1,   152,    -1,    -1,
+    3013,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4085,    -1,  1069,  4088,   510,   170,    -1,   513,   514,   515,
+      -1,   517,   518,   519,   520,   521,   522,    -1,    -1,    -1,
+     185,   527,    -1,    -1,   475,    -1,    -1,    -1,   193,    -1,
+    4603,  4604,    -1,    -1,    -1,    -1,    -1,    -1,  1105,    -1,
+    4125,    -1,    -1,   208,    -1,   210,    -1,    -1,    -1,   214,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1124,    -1,   224,
+      -1,    -1,    -1,    -1,    -1,    -1,  3089,    -1,   233,    -1,
+      -1,    -1,  3095,  3941,    -1,    -1,    -1,    -1,    -1,    -1,
+    1147,    -1,    -1,    -1,    84,  4170,  4171,    87,    -1,    -1,
+      -1,    91,    92,    93,    -1,    -1,   101,    -1,  4183,    -1,
+    4185,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,    -1,
+    4738,    -1,    98,    -1,    -1,    -1,   116,    -1,   104,    -1,
+      -1,    -1,   122,    -1,    -1,  4371,    -1,    84,    -1,   134,
+      87,    -1,    -1,    -1,    91,    92,    93,    -1,  4711,    -1,
+      -1,    -1,   147,   148,    -1,    -1,   146,    -1,  4721,  4722,
+      -1,   108,   157,    -1,    -1,    -1,   161,    -1,   144,   116,
+      -1,    -1,    -1,  3186,  4737,   122,    -1,    -1,  4036,  4254,
+      -1,    -1,    -1,    -1,   179,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1250,    -1,    -1,    -1,    -1,    -1,   146,
+      -1,    -1,    -1,    -1,    -1,   200,    -1,    -1,    -1,    -1,
+      -1,  4286,    -1,    -1,    -1,    -1,   211,    -1,    -1,   195,
+      -1,    -1,    -1,    -1,   219,    -1,   202,    -1,    -1,   205,
+      -1,  4849,    -1,  4851,    -1,    -1,   231,    -1,    -1,    -1,
+      -1,   236,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   230,    -1,    -1,    -1,    -1,    -1,
+      -1,   251,  3275,  4499,   259,    -1,   256,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3291,  3292,
+      -1,    -1,    -1,    -1,    -1,   261,    -1,   277,   278,   284,
+      -1,    -1,  4528,    -1,    -1,  1352,    -1,    -1,    -1,    -1,
+      -1,    -1,   292,    -1,   251,  3318,    -1,    -1,  3321,   256,
+     305,    -1,  4548,    -1,    -1,    -1,  4174,    -1,  1375,  1376,
+    1377,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     277,   278,    -1,   323,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   336,   318,    -1,   320,   292,   336,    -1,    -1,   339,
+      -1,    -1,    -1,    -1,   330,    -1,    -1,    -1,    -1,    -1,
+      -1,   356,   338,    -1,  4222,    -1,  4602,    -1,    -1,    -1,
+      -1,   366,   348,    -1,    -1,    -1,   323,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3397,  3398,  3399,    -1,    -1,   336,
+      -1,    -1,   339,    -1,    -1,    -1,    -1,    -1,   393,    -1,
+      -1,    -1,    -1,   398,    -1,   400,   382,    -1,  3421,   385,
+     386,   406,    -1,    -1,   409,    -1,    -1,    -1,    -1,    -1,
+    3433,    -1,    -1,    -1,  3437,    -1,    -1,   417,    -1,    -1,
+      -1,    -1,    -1,  3446,    -1,    -1,   412,    -1,    -1,    -1,
+      -1,  4516,    -1,   438,  4519,    -1,   441,    -1,    -1,    -1,
+     445,    -1,    -1,    -1,    -1,    -1,    -1,   452,    -1,   454,
+      -1,    -1,  5025,    -1,   459,    -1,    -1,  4703,  4543,    -1,
+     417,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4555,    -1,    -1,  1540,    -1,    -1,    -1,    -1,    -1,   484,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3510,  4573,   475,
+     655,    -1,    -1,  4361,    -1,    -1,    98,    -1,    -1,    -1,
+      -1,    -1,   104,  4371,  1571,    -1,    -1,    -1,    -1,    -1,
+     510,    -1,  4758,   513,   514,   515,    -1,   517,   518,   519,
+     520,   521,   522,  3546,    -1,    -1,    -1,   527,    -1,  3552,
+    5103,  3554,    -1,    -1,    -1,  4620,    -1,    -1,    -1,    -1,
+      -1,    -1,   144,  3566,    -1,  3568,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   510,    -1,    -1,   513,   514,   515,    -1,
+     517,   518,   519,   520,   521,   522,    -1,    -1,    -1,    -1,
+     527,    -1,    -1,    -1,    -1,    -1,  5149,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   195,    -1,    -1,    -1,    -1,    -1,  3622,
+     202,    -1,    -1,   205,    -1,    84,    -1,    -1,    87,    -1,
+      -1,    -1,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   230,   108,
+      -1,  4499,    -1,    -1,    -1,    -1,    -1,   116,    -1,    -1,
+      -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,    -1,    -1,
+    1717,    -1,    -1,  4738,  3677,    -1,    -1,    -1,    -1,   261,
+    4528,    -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,    -1,
+      -1,  3694,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4548,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3716,    -1,    -1,  3719,    -1,  1765,    -1,
+     865,   866,   867,   868,    -1,   870,    -1,   872,    -1,   874,
+      -1,   876,    -1,    -1,   879,    -1,   318,    -1,   320,    -1,
+     885,    -1,    -1,   888,    -1,    -1,    -1,   892,   330,   894,
+      -1,    -1,    -1,    -1,  4602,    -1,   338,   902,    -1,    -1,
+      -1,    -1,   907,    -1,   909,    -1,   348,   912,    -1,   914,
+      -1,   916,    -1,    -1,    -1,    -1,    -1,    -1,   923,    -1,
+    5388,    -1,   927,    -1,  4849,    -1,  4851,    -1,    -1,   934,
+      -1,    -1,   251,  3796,    -1,    -1,    -1,   256,    -1,    -1,
+     382,    -1,    -1,   385,   386,    -1,    -1,  5033,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   277,   278,
+      -1,    -1,   967,    -1,  4889,    -1,    -1,   972,    -1,    -1,
+     412,    -1,   977,   292,    -1,    -1,   981,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5071,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   998,  1901,  4703,    -1,    -1,    -1,    -1,
+      -1,    -1,  1909,    -1,   323,    -1,    -1,    -1,    -1,    -1,
+    4935,    -1,  4937,    -1,    -1,    -1,    -1,   336,    -1,    -1,
+     339,    -1,    -1,    -1,    -1,    -1,  1933,    -1,    -1,    -1,
+      -1,    -1,    -1,   475,  1941,    -1,    -1,  1944,    -1,    -1,
+      -1,    -1,  5128,    -1,    -1,    -1,  5132,  5133,  5461,  1054,
+    4758,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1069,    -1,  1071,    -1,    -1,    -1,
+      -1,    -1,    84,  1980,    -1,    87,    -1,    -1,    -1,    91,
+      92,    93,    -1,    -1,    -1,    -1,    -1,  1994,    -1,    -1,
+      -1,    -1,    -1,    -1,  1099,  1100,   108,    -1,   417,  1104,
+    1105,  2008,    -1,    -1,   116,    -1,    -1,    -1,    -1,    -1,
+     122,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1124,
+      -1,    -1,    -1,  1128,    -1,  3988,    -1,    -1,    -1,    -1,
+      -1,  1136,    -1,  5219,   146,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1147,    -1,    -1,    -1,    -1,    -1,    -1,    84,
+    2057,    -1,    87,    -1,  1159,    -1,    91,    92,    93,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4030,    -1,    -1,
+      -1,  2078,  4035,   108,  4037,    -1,    -1,    98,  2085,    -1,
+    4888,   116,    -1,   104,    -1,    -1,    -1,   122,    -1,    -1,
+      -1,   510,    -1,    -1,   513,   514,   515,  5122,   517,   518,
+     519,   520,   521,   522,    -1,    -1,    -1,    -1,   527,    -1,
+      -1,   146,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4085,   144,    -1,  4088,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1241,    -1,    -1,   251,
+      -1,    -1,    -1,    -1,   256,  1250,    -1,    -1,    -1,    -1,
+    1255,  1256,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4125,    -1,    -1,   277,   278,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   195,    -1,    -1,    -1,    -1,    -1,
+     292,   202,    -1,    -1,   205,    -1,    -1,    -1,    -1,    -1,
+      -1,  2198,    -1,    -1,  5002,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1307,    -1,    -1,    -1,    -1,  4170,  4171,   230,
+      -1,   323,    -1,  1318,    -1,    -1,   251,  1322,    -1,    -1,
+    4183,   256,  4185,    -1,   336,  5033,    -1,   339,    -1,    -1,
+      -1,    -1,  1337,    -1,    -1,    -1,    -1,    -1,  2245,  2246,
+     261,    -1,   277,   278,    -1,    -1,    -1,  1352,    -1,    -1,
+      -1,    -1,    -1,  1358,  1359,    -1,    -1,   292,  2265,    -1,
+      -1,    -1,    -1,  5071,    -1,    -1,    -1,    -1,    -1,    -1,
+    1375,  1376,  1377,    -1,  1379,    -1,  1381,    -1,    -1,    -1,
+      -1,  1386,    -1,    -1,    -1,  5310,    -1,    -1,   323,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   318,    -1,   320,
+      -1,   336,    -1,    -1,   339,   417,    -1,    -1,    -1,   330,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   338,    -1,    -1,
+    5128,    -1,    -1,  4286,  5132,  5133,    -1,   348,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,    87,    -1,
+      -1,    -1,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,
+      -1,  1456,    -1,  1458,  1459,  2362,    -1,    -1,    -1,   108,
+      -1,   382,    -1,  5388,   385,   386,    -1,   116,    -1,    -1,
+      -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2388,   417,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   412,  1497,    -1,    -1,    -1,    -1,   146,   510,    -1,
+      -1,   513,   514,   515,    -1,   517,   518,   519,   520,   521,
+     522,  5219,    -1,    -1,    84,   527,    -1,    87,  2425,    -1,
+    2427,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,
+    1535,  1536,    -1,    -1,    -1,  1540,    -1,  1542,   108,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,
+      -1,    -1,   122,    -1,   475,    -1,    -1,  2464,    -1,    -1,
+      -1,  5486,    -1,  1568,    -1,    -1,  1571,    -1,    -1,  1574,
+      -1,    -1,    -1,    -1,    -1,   510,   146,    -1,   513,   514,
+     515,  1586,   517,   518,   519,   520,   521,   522,    -1,    -1,
+      -1,    -1,   527,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   251,    -1,   866,   867,    -1,   256,   870,  1614,
+     872,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  5548,    -1,    -1,    -1,    -1,   277,   278,
+     892,    -1,    -1,    -1,    -1,    -1,    -1,  1642,  1643,  1644,
+      -1,  1646,  5567,   292,    -1,    -1,    -1,    -1,    -1,    -1,
+     912,    -1,    -1,  4516,   916,    -1,  4519,    -1,   164,    -1,
+      -1,  1666,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   934,    -1,   323,    -1,    -1,    -1,    -1,    -1,
+    4543,   251,    -1,  1688,  1689,    -1,   256,   336,    -1,    -1,
+     339,    -1,  4555,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   212,   277,   278,    -1,
+    4573,    -1,  1717,    -1,    -1,  1720,    -1,    -1,   224,    -1,
+      -1,    -1,   292,   229,    -1,    -1,    -1,    -1,   234,    -1,
+      -1,    -1,    -1,   239,    -1,    -1,   242,    -1,    -1,   245,
+      -1,    -1,    -1,    -1,  1749,    -1,    -1,    -1,  1753,  1754,
+      -1,    -1,    -1,   323,  2661,    -1,    -1,  4620,    -1,  1764,
+    1765,  1766,    -1,    -1,    -1,    -1,   336,   273,   417,   339,
+      98,    -1,    -1,  2680,    -1,    -1,   104,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   293,  1793,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   129,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   144,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   332,    -1,   334,    -1,
+      -1,    -1,    -1,    -1,   340,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   417,    -1,   177,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   510,    -1,    -1,   513,   514,   515,   195,   517,   518,
+     519,   520,   521,   522,   202,  4738,    -1,   205,   527,    -1,
+      -1,    -1,    -1,   389,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1901,  1902,    -1,    -1,
+      -1,    -1,   230,    -1,  1909,    -1,    -1,  1912,    -1,    -1,
+      -1,  2818,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1931,    -1,  1933,    -1,
+     258,    -1,   438,   261,    -1,    -1,  1941,    -1,    -1,  1944,
+     510,    -1,    -1,   513,   514,   515,    -1,   517,   518,   519,
+     520,   521,   522,    -1,    -1,    -1,    -1,   527,   464,    -1,
+      -1,    -1,    -1,  1968,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1976,  1977,  1978,  1979,  1980,    -1,    -1,   306,    -1,
+     308,    -1,   488,    -1,   490,   491,  4849,    -1,  4851,  1994,
+     318,    -1,   320,  1255,  1256,    -1,    -1,    -1,    -1,    -1,
+      -1,  2006,   330,  2008,    -1,    -1,    -1,    -1,    -1,    -1,
+     338,    -1,    -1,    -1,  2019,  2020,    -1,    -1,   524,   347,
+     348,   527,   528,  2028,   530,    -1,  4889,    -1,    -1,    -1,
+      -1,    -1,    -1,  2038,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2057,    -1,   382,    -1,    -1,   385,   386,   387,
+      -1,  2066,  2067,  2068,  2069,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4935,  2078,  4937,  1337,    -1,    -1,    -1,    -1,
+    2085,    -1,    -1,  2088,   412,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1358,  1359,   426,  2104,
+    3007,    -1,    -1,    -1,    -1,    -1,  2111,    -1,    -1,    -1,
+      -1,  2116,    -1,    -1,    -1,    -1,    -1,  1379,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2149,    -1,    -1,   475,    -1,    -1,
+      -1,    -1,    -1,    -1,  2159,    -1,    -1,    98,  2163,    -1,
+      -1,  2166,    -1,   104,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2176,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2184,
+    2185,    -1,    84,    -1,    -1,    87,    -1,    -1,    -1,    91,
+      92,    93,    -1,  2198,    -1,    -1,  1458,  1459,    -1,    -1,
+      -1,    -1,    -1,   144,    -1,    -1,   108,    -1,    -1,    -1,
+     112,    -1,    -1,    -1,   116,    -1,    -1,    -1,    -1,    -1,
+     122,    -1,    -1,    -1,    -1,    -1,    -1,  2232,    -1,    -1,
+      -1,    -1,    -1,    -1,  2239,    -1,  2241,    -1,    -1,    -1,
+    2245,  2246,    -1,  2248,   146,    -1,    -1,    -1,    -1,  3156,
+    2255,    -1,    -1,    -1,   195,    -1,    -1,    -1,    -1,  5122,
+    2265,   202,    -1,    -1,   205,  2270,  2271,    -1,    -1,  2274,
+      -1,    -1,    -1,  2278,  2279,    -1,    -1,    -1,    -1,  2284,
+    2285,    -1,    -1,    -1,    -1,    -1,  2291,  2292,  2293,   230,
+      -1,   193,  2297,  2298,  2299,  2300,  2301,  2302,  2303,  2304,
+      -1,  2306,    -1,  2308,  2309,    -1,    -1,  2312,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     261,    -1,  2327,  2328,  2329,  2330,    -1,    -1,    -1,  2334,
+    2335,    -1,    -1,    -1,  2339,    -1,    -1,  2342,    -1,    -1,
+    2345,  2346,  2347,  2348,  2349,  2350,  2351,  2352,  2353,   251,
+    2355,    -1,    -1,    -1,   256,    -1,    -1,  2362,  2363,    -1,
+      -1,  2366,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   277,   278,   318,    -1,   320,
+      -1,    -1,    -1,  2388,    -1,    -1,    -1,    -1,    -1,   330,
+     292,    -1,    -1,    -1,    -1,    -1,    -1,   338,    -1,    -1,
+      -1,    -1,    -1,   101,    -1,    -1,    -1,   348,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,    -1,    -1,    -1,    -1,
+    2425,   323,  2427,    -1,  2429,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   336,    -1,   134,   339,    -1,    -1,
+      -1,   382,    -1,    -1,   385,   386,    -1,  5310,    -1,   147,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2464,
+      -1,    -1,    -1,   161,    -1,    -1,  2471,    -1,  2473,    -1,
+      -1,   412,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   179,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   200,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   211,    -1,   417,    -1,    -1,    -1,    -1,
+      -1,   219,    -1,    -1,    -1,  5388,    -1,    -1,  3435,    -1,
+      -1,    -1,    -1,   231,   475,    -1,    -1,    -1,   236,    -1,
+      -1,    -1,    -1,    -1,   242,    -1,  2551,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2560,    -1,  2562,    -1,    -1,
+      -1,   259,   164,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     472,    -1,    -1,    -1,  2579,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2590,    -1,  2592,  2593,    -1,
+      -1,    -1,  2597,    -1,  2599,    -1,  2601,    -1,  2603,    -1,
+      -1,    -1,  2607,    -1,    -1,  2610,    -1,   305,   510,    -1,
+     212,   513,   514,   515,    -1,   517,   518,   519,   520,   521,
+     522,    -1,   224,  5486,    -1,    -1,    -1,   229,    -1,    -1,
+      -1,    -1,   234,    -1,  2639,    -1,    -1,   239,   336,    -1,
+     242,  2646,    -1,   245,    -1,    -1,    -1,  2652,    -1,   347,
+    1912,  3558,  3559,    -1,    -1,    -1,  2661,    -1,   356,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3574,   366,    -1,
+      -1,   273,    -1,    -1,    -1,  2680,    -1,    -1,    -1,  2684,
+    2685,    -1,    -1,  3590,    -1,  5548,    -1,    -1,  2693,    -1,
+      -1,   293,  3599,  3600,    -1,   393,    -1,    -1,    -1,    -1,
+     398,    -1,   400,    -1,  5567,    -1,  2711,    -1,   406,  3616,
+      -1,   409,    -1,    -1,  1976,  1977,  1978,  1979,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     332,    -1,   334,  2738,    -1,  2740,  2741,    -1,   340,    -1,
+     438,    -1,    -1,   441,    -1,    -1,    -1,   445,    -1,    -1,
+      -1,    -1,    -1,    -1,   452,    -1,   454,  2019,  2020,    -1,
+      -1,   459,    -1,    -1,  2769,    -1,  2028,    -1,    -1,    -1,
+      -1,    -1,  2777,   471,  2779,    -1,  2038,    -1,    -1,    -1,
+    2785,    -1,    -1,    -1,    -1,    -1,   484,   389,    -1,    -1,
+      -1,    -1,    -1,    -1,  2799,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2066,  2067,  2068,  2069,  2813,    -1,
+    3717,  2816,    -1,  2818,    -1,    -1,  2821,    -1,    -1,  2824,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   438,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2850,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2859,  2860,    -1,    -1,    -1,    -1,
+      -1,    -1,   464,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2875,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2886,    -1,    -1,    -1,    -1,   488,    -1,   490,   491,
+      -1,    -1,    -1,    -1,    -1,  2900,  2901,    -1,    -1,    -1,
+      -1,  2163,    -1,    -1,  2166,    -1,    -1,    -1,  2913,    -1,
+    2915,  2916,  2917,  2918,  2176,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   524,  2185,     5,   527,   528,    -1,   530,    -1,
+      -1,    -1,    -1,    -1,    -1,  3842,  3843,  3844,    -1,  2944,
+      -1,    -1,    -1,    -1,    25,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    35,    36,    -1,    -1,    -1,    -1,
+    2965,    42,    43,    -1,    -1,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      -1,    -1,    -1,    74,    75,    76,    77,    78,    79,    80,
+      81,    -1,  3007,    -1,    85,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3017,    -1,    -1,    -1,    -1,    -1,  3023,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3034,
+      -1,    -1,    -1,    -1,    -1,  3040,    -1,    -1,    -1,    -1,
+    3045,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   137,    -1,    -1,    -1,
+      -1,    -1,    -1,  3068,  3069,  3070,    -1,    -1,  3073,    -1,
+      -1,    -1,  2334,    -1,    -1,    -1,  3081,  3082,  3083,  3084,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3094,
+      -1,    -1,  3097,    -1,  3099,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3110,  3111,    -1,    -1,  3114,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3126,    -1,  3128,    -1,  3130,    -1,  3132,   209,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   227,  3152,    -1,    -1,
+      -1,  3156,    -1,    -1,    -1,    -1,    -1,    -1,  3163,    -1,
+    3165,  3166,  3167,    -1,    -1,    -1,    -1,   248,    -1,    -1,
+      84,    -1,    -1,    87,    -1,    -1,    -1,    91,    92,    93,
+      -1,    -1,    -1,    -1,    -1,  3190,    -1,    -1,    -1,    -1,
+     271,    -1,    -1,    -1,   108,    -1,    -1,    -1,  3203,    -1,
+      -1,    -1,   116,  3208,    -1,    -1,    -1,    -1,   122,  3214,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3224,
+      -1,    -1,  3227,    -1,    -1,  3230,   307,  3232,    -1,   310,
+      -1,    -1,   146,    -1,    -1,    -1,  4143,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   325,    -1,  4153,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3297,    -1,  3299,    -1,    -1,    -1,    -1,  3304,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4215,    -1,
+      -1,    -1,    -1,    -1,    -1,   229,    -1,    -1,    -1,    -1,
+     234,    -1,   403,    -1,    -1,  3330,    -1,  3332,  3333,  3334,
+    2592,  2593,    -1,    -1,    -1,    -1,    -1,   251,    -1,  2601,
+      -1,  2603,   256,    -1,    -1,  2607,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   277,   278,    -1,    -1,    -1,   449,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   292,    -1,
+      -1,    -1,    -1,   464,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   479,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   323,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   336,    -1,    -1,   339,   507,    -1,    -1,    -1,
+    3435,    -1,    -1,    -1,   515,    -1,   517,   518,   519,   520,
+     521,    -1,    -1,   524,   525,   526,    -1,    -1,    -1,  2711,
+     531,   532,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    84,    -1,    -1,    87,    -1,    -1,    -1,
+      91,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4390,  4391,  4392,  4393,   108,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,    -1,
+      -1,   122,    -1,   417,    -1,    -1,    -1,  2769,    -1,    -1,
+      -1,    -1,  3517,    -1,    -1,  2777,    -1,  2779,    -1,  3524,
+    3525,    -1,    -1,  2785,    -1,   146,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3558,  3559,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3574,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3589,  3590,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3598,  3599,  3600,   510,  2859,    -1,   513,
+     514,   515,    -1,   517,   518,   519,   520,   521,   522,    -1,
+      -1,  3616,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3633,    -1,
+     251,    -1,    -1,    -1,    -1,   256,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3650,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2915,    -1,  2917,   277,   278,    -1,    -1,
+      -1,    -1,  3667,    -1,  3669,    -1,    -1,    -1,  3673,    -1,
+      -1,   292,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3691,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   116,    -1,  3701,    -1,    -1,    -1,
+      -1,    -1,   323,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3717,    -1,    -1,   336,    -1,    -1,   339,    -1,
+      -1,    -1,    -1,    -1,  3729,    -1,    -1,    -1,    -1,    -1,
+      -1,  3736,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,
+    3745,    -1,    -1,    -1,    -1,    -1,  3751,    -1,  3753,    -1,
+      -1,  3756,    -1,    -1,    -1,    -1,  3761,  3762,  3763,  3764,
+      -1,    -1,  3767,  3768,  3769,  3770,  3771,  3772,  3773,  3774,
+    3775,  3776,  3034,    -1,    -1,  3780,  3781,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3790,    -1,   209,    -1,  3794,
+      -1,    -1,    -1,  3798,    -1,   217,   417,   219,    -1,  4706,
+      -1,  3806,    -1,    -1,  3809,    -1,  3811,    -1,    -1,    -1,
+     232,    -1,    -1,    -1,    -1,  3820,    -1,    -1,  3823,  3824,
+      -1,    -1,    -1,  3828,  3829,    -1,    -1,    -1,  3833,    -1,
+    3835,    -1,    -1,    -1,    -1,    -1,    -1,  3842,  3843,  3844,
+    3845,    -1,  3847,  3848,    -1,    -1,    -1,  3852,  3853,    84,
+      -1,    -1,    87,    -1,  3859,    -1,    91,    92,    93,    -1,
+    3865,  3866,  3867,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   108,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   116,    -1,    -1,    -1,    -1,    -1,   122,    -1,   510,
+      -1,    -1,   513,   514,   515,    -1,   517,   518,   519,   520,
+     521,   522,    -1,    -1,   525,    -1,    -1,  3912,    -1,    -1,
+      -1,   146,    -1,    -1,    -1,    -1,    -1,    -1,  3923,    -1,
+    3925,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3956,  3957,  3958,    -1,  3960,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3978,  3979,  3980,  3981,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4017,    -1,    -1,    -1,   251,    -1,    -1,    -1,
+      -1,   256,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   277,   278,    -1,  4952,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   292,    -1,    -1,
+      -1,  4968,    -1,    -1,    -1,    -1,    -1,    -1,  3330,    -1,
+    3332,  3333,  3334,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   323,    -1,
+      -1,    -1,  4999,    -1,    -1,    -1,    -1,  4102,    -1,    -1,
+      -1,   336,    -1,    -1,   339,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   360,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4143,    -1,
+    4145,    -1,  4147,    -1,    -1,    -1,    -1,    -1,  4153,    -1,
+      -1,    -1,    -1,    -1,  4159,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4168,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   417,  4188,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4198,    -1,    -1,    -1,    -1,   433,    -1,
+    4205,    -1,    -1,    -1,    -1,    -1,    -1,  5114,    -1,    -1,
+    4215,    -1,    -1,    -1,  4219,    -1,    -1,    -1,  4223,  4224,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     973,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4255,  4256,  4257,  4258,  4259,  3517,    -1,    -1,    -1,    -1,
+    4265,   994,  4267,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   510,    -1,    -1,   513,   514,
+     515,    -1,   517,   518,   519,   520,   521,   522,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,
+      87,    -1,  4307,    -1,    91,    92,    93,    -1,    -1,    -1,
+      -1,    -1,    -1,  4318,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   108,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   116,
+      -1,    -1,    -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4348,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4358,  4359,    -1,    -1,    -1,    -1,   146,
+    4365,  4366,    -1,    -1,    -1,  4370,    -1,    -1,    -1,    -1,
+    4375,    -1,    -1,  4378,  4379,    -1,    -1,    -1,  4383,  4384,
+      -1,    -1,    -1,    -1,  4389,  4390,  4391,  4392,  4393,    -1,
+      -1,    -1,  4397,  4398,    -1,  4400,    -1,    -1,  4403,    -1,
+      -1,    -1,  4407,    -1,    -1,  3667,  4411,  3669,    -1,    -1,
+      -1,  3673,  4417,    -1,    -1,    -1,    -1,    -1,  4423,    -1,
+      -1,    -1,    -1,  4428,    -1,    -1,    -1,    -1,    -1,  4434,
+      -1,    -1,    -1,    -1,    -1,   857,    -1,    -1,    -1,  4444,
+      -1,   228,    -1,   865,    -1,    -1,    -1,  4452,    -1,    -1,
+    4455,    -1,   874,    -1,    -1,  4460,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   251,    -1,    -1,  3729,    -1,   256,
+      -1,    -1,    -1,  4478,    -1,    -1,  4481,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   909,    -1,    -1,
+     277,   278,    -1,    -1,    -1,    -1,  4501,  4502,    -1,    -1,
+      -1,    84,    -1,    -1,    87,   292,    -1,    -1,    91,    92,
+      93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4526,    -1,    -1,    -1,   108,    -1,    -1,   111,    -1,
+      -1,    -1,    -1,   116,    -1,    -1,   323,    -1,    -1,   122,
+      -1,    -1,    -1,    -1,    -1,   967,    -1,    -1,    -1,   336,
+      -1,   973,   339,    -1,    -1,   977,    -1,    -1,  4563,    -1,
+      -1,    -1,    -1,   146,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   358,   994,    -1,    -1,    -1,    -1,    -1,  4583,    -1,
+      -1,  1314,    -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,
+      87,    -1,  4597,    -1,    91,    92,    93,    -1,    -1,    -1,
+      -1,  1334,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1343,   108,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   116,
+      -1,    -1,    -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,
+     417,    -1,  4637,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4648,    -1,    -1,    -1,    -1,  4653,   146,
+      -1,    -1,    -1,    -1,    -1,    -1,  4661,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   251,    -1,
+      -1,  4676,  4677,   256,    -1,    -1,    -1,  1099,  1100,    -1,
+      -1,    -1,    -1,    -1,  1106,    -1,    -1,    -1,  1110,    -1,
+      -1,  1424,    -1,    -1,   277,   278,    -1,    -1,    -1,    -1,
+      -1,  4706,    -1,    -1,  4709,    -1,    -1,    -1,    -1,   292,
+      -1,    -1,    -1,    -1,  1136,    -1,  3978,  3979,  3980,  3981,
+      -1,    -1,    -1,   510,    -1,    -1,   513,   514,   515,    -1,
+     517,   518,   519,   520,   521,   522,    -1,    -1,    -1,    -1,
+     323,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4754,
+      -1,    -1,    -1,   336,   251,    -1,   339,    -1,  4763,   256,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4780,  4781,    -1,    -1,  4784,
+     277,   278,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4798,  4799,   292,    -1,    -1,  4803,    -1,
+      -1,    -1,    -1,  4808,    -1,    -1,  4811,  4812,    -1,  4814,
+      -1,  4816,    -1,    -1,  4819,  4820,    -1,    -1,    -1,    -1,
+      -1,    -1,  1555,    -1,    -1,    -1,   323,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   417,    -1,  4841,    -1,    -1,   336,
+      -1,    -1,   339,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4855,  4856,  4857,  4858,  4859,    -1,    -1,   354,  1280,  1281,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4145,    -1,  1307,    -1,    -1,    -1,    -1,
+      -1,    -1,  1314,  4898,  4899,    -1,  1318,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1334,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     417,  1343,    -1,    -1,    -1,    -1,    -1,   510,    -1,    -1,
+     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
+    4945,  4946,    -1,    -1,  4949,    -1,    -1,  4952,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4962,    -1,  1381,
+      -1,    -1,    -1,  4968,    -1,  4970,    -1,    -1,    -1,    -1,
+    4975,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4987,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4998,  4999,  5000,    -1,    -1,    -1,    -1,
+      -1,    -1,  1424,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   510,    -1,    -1,   513,   514,   515,    -1,
+     517,   518,   519,   520,   521,   522,    -1,  5032,    -1,    -1,
+    5035,    -1,  5037,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5061,    -1,    84,    -1,
+    5065,    87,    -1,    -1,  5069,    91,    92,    93,    -1,    -1,
+      -1,  5076,    -1,    -1,    -1,  1497,    -1,    -1,    -1,    -1,
+    5085,    -1,   108,    -1,    -1,   111,    -1,    -1,    -1,    -1,
+     116,    -1,    -1,  5098,    -1,    -1,   122,    -1,    -1,    -1,
+    1833,    -1,    -1,    -1,    -1,  5110,    -1,    -1,    -1,  5114,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     146,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  5137,  1555,    -1,    -1,    -1,    -1,    -1,  5144,
+    5145,  5146,  5147,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5159,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1896,  1586,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  5178,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1614,  5198,    84,    -1,  1929,    87,    -1,    -1,
+      -1,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,    -1,
+    1642,  1643,  1644,    -1,  1646,   251,   116,    -1,    -1,    -1,
+     256,    -1,   122,    -1,    -1,    -1,  5241,    -1,    -1,  5244,
+      -1,    -1,    -1,    -1,  1666,    -1,    -1,    -1,  5253,    -1,
+      -1,   277,   278,  5258,    -1,  5260,   146,  5262,    -1,    -1,
+      -1,    -1,    -1,    -1,  5269,    -1,   292,    -1,    -1,    -1,
+    5275,    -1,  5277,    -1,    -1,    -1,    -1,  2010,    -1,    -1,
+      -1,    -1,  5287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2025,    -1,    -1,    -1,    -1,   323,  1720,  1721,
+    2033,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     336,  2044,    -1,   339,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4583,    -1,    -1,    -1,    -1,    -1,  1749,  5333,    -1,
+      -1,  1753,  1754,  5338,    -1,  4597,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   234,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5361,    -1,  2091,    -1,
+      -1,   251,    -1,    -1,  5369,  5370,   256,    -1,    -1,  5374,
+      -1,    -1,    -1,    -1,    -1,  5380,    -1,  2110,  5383,    -1,
+      -1,    -1,  5387,    -1,    -1,    -1,    -1,   277,   278,  2122,
+      -1,   417,    -1,    -1,    -1,  5400,    -1,    -1,    -1,    -1,
+      -1,  2134,   292,    -1,    -1,  5410,    -1,    -1,    -1,    -1,
+      -1,  1833,    -1,    -1,  4676,    -1,    -1,  1839,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1849,    -1,    -1,
+    5435,    -1,    -1,   323,    -1,    -1,  5441,  5442,    -1,  5444,
+      -1,  2174,    -1,    -1,  2177,    -1,   336,    -1,    -1,   339,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5463,    -1,
+      -1,    -1,    -1,    -1,    -1,  5470,  1888,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1896,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   510,    -1,    -1,   513,   514,   515,
+      -1,   517,   518,   519,   520,   521,   522,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1929,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,
+      87,    -1,    -1,    -1,    91,    92,    93,   417,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5542,  5543,    -1,
+      -1,   108,    -1,    -1,   111,    -1,    -1,    -1,    -1,   116,
+      -1,  5556,    -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  5568,  5569,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2010,    -1,
+      -1,    -1,    -1,  2326,    -1,  4857,  4858,  4859,    -1,    -1,
+      -1,    -1,    -1,  2025,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2033,    -1,    -1,    -1,    -1,    -1,  2039,    -1,    -1,
+     510,    -1,  2044,   513,   514,   515,    -1,   517,   518,   519,
+     520,   521,   522,  2366,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,
+      -1,    -1,    87,    -1,    -1,    -1,    91,    92,    93,  2091,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2104,   108,   251,    -1,    -1,    -1,  2110,   256,
+      -1,   116,    -1,    -1,  2116,    -1,    -1,   122,    -1,    -1,
+    2122,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     277,   278,  2134,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   146,    -1,    -1,    -1,   292,    -1,  2149,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4998,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2174,    -1,    -1,  2177,   323,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   336,
+      -1,    -1,   339,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2527,    -1,    -1,    -1,  2531,  2532,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2241,
+      -1,    -1,    -1,    -1,    -1,    -1,   251,    -1,    -1,    -1,
+      -1,   256,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5110,    -1,
+     417,    -1,   277,   278,    -1,    -1,  2278,  2279,    -1,    -1,
+      -1,  2594,  2284,  2285,    -1,    -1,    -1,   292,    -1,  2291,
+    2292,  2293,    -1,  2606,    -1,  2297,    -1,  2299,  2300,  2301,
+    2302,  2303,  2304,  5145,  2306,  5147,  2308,  2309,    -1,    -1,
+    2312,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   323,    -1,
+      -1,    -1,    -1,    -1,  2326,  2327,  2328,  2329,  2330,  2331,
+    2643,   336,    -1,  2335,   339,    -1,    -1,  2339,    -1,    -1,
+    2342,    -1,    -1,  2345,  2346,  2347,  2348,  2349,  2350,  2351,
+    2352,  2353,    -1,  2355,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2363,    -1,   510,  2366,    -1,   513,   514,   515,    -1,
+     517,   518,   519,   520,   521,   522,    -1,    -1,    84,    -1,
+      -1,    87,    -1,    -1,    -1,    91,    92,    93,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     5,   108,    -1,    -1,   111,    -1,    -1,    -1,    -1,
+     116,    -1,   417,    -1,    -1,    -1,   122,    -1,    -1,    -1,
+      -1,    25,    -1,    -1,    -1,    -1,    -1,  2429,    -1,    -1,
+      -1,    35,    36,  5275,    -1,    -1,    40,    -1,    42,    43,
+     146,   446,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    -1,    72,    -1,
+      74,    75,    76,    77,    78,    79,    80,    81,    -1,    -1,
+      -1,    85,    -1,    -1,    -1,    -1,    -1,  2800,    -1,    -1,
+      -1,  5333,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   510,    -1,    -1,   513,   514,
+     515,    -1,   517,   518,   519,   520,   521,   522,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2527,    -1,    -1,    -1,  2531,
+    2532,    -1,    84,   137,    -1,    87,    -1,    -1,    -1,    91,
+      92,    93,    -1,  2545,    -1,   251,    -1,    -1,    -1,    -1,
+     256,    -1,    -1,    -1,    -1,    -1,   108,  2870,    -1,    -1,
+      -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,  5410,    -1,
+     122,   277,   278,    -1,    -1,    -1,    -1,  2579,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   292,    -1,  2590,    -1,
+      -1,    -1,  2594,    -1,   146,  2597,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2606,   209,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   323,    -1,    -1,
+      -1,    -1,    -1,   227,    -1,    -1,    -1,  2629,  5470,    -1,
+     336,    -1,    -1,   339,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2643,    -1,    -1,   248,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2664,    -1,    -1,    -1,  2668,   271,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2999,    -1,    -1,    -1,
+      -1,    -1,  2694,    -1,    -1,    -1,    -1,    -1,    -1,   251,
+      -1,    -1,    -1,   307,   256,    -1,   310,  3020,    -1,    -1,
+      -1,   417,    -1,    -1,    -1,    -1,    -1,    -1,  3031,    -1,
+      -1,   325,    -1,    -1,    -1,   277,   278,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
-      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
-     132,    -1,   134,   135,   136,   137,   138,   139,    -1,   141,
-     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
-     152,   153,   154,   155,   156,    -1,   158,   159,   160,   161,
-     162,   163,    -1,   165,   166,   167,    -1,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
-     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
-     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
-      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
-      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
-     232,   233,    -1,   235,   236,   237,   238,    -1,   240,   241,
-      -1,   243,   244,    -1,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
-     262,    -1,   264,   265,   266,    -1,   268,   269,   270,    -1,
-     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
-     282,   283,   284,   285,    -1,    -1,   288,   289,   290,   291,
-     292,    -1,   294,   295,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,   317,   318,   319,    -1,   321,
-     322,   323,   324,    -1,   326,   327,   328,   329,   330,   331,
-      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
-     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
-     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
-     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
-     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
-     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,    -1,   406,   407,   408,   409,   410,   411,
-     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
-      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   434,    -1,   436,   437,    -1,   439,   440,   441,
-     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
-     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
-     462,   463,    -1,    -1,   466,   467,   468,   469,   470,   471,
-      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
-     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
-     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
-     502,   503,   504,   505,   506,   507,   508,   509,    -1,    -1,
-      -1,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      -1,    15,    16,    -1,   526,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    -1,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    -1,    41,    42,    43,
-      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
-      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
+     292,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
-     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
-     114,    -1,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
-     134,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
-     144,   145,    -1,   147,    -1,   149,   150,   151,   152,   153,
-     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
-      -1,   165,   166,   167,    -1,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
-     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
-      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
-      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
-      -1,   235,   236,   237,   238,    -1,   240,   241,    -1,   243,
-     244,    -1,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
-     264,   265,   266,    -1,   268,   269,   270,    -1,   272,    -1,
-     274,    -1,   276,   277,   278,   279,   280,   281,   282,   283,
-     284,   285,    -1,    -1,   288,   289,   290,   291,   292,    -1,
-     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-     314,   315,   316,   317,   318,   319,    -1,   321,   322,   323,
-     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
-      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,   343,
-     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
-     384,   385,   386,   387,   388,    -1,   390,   391,   392,   393,
-     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
-     404,    -1,   406,   407,   408,   409,   410,   411,   412,   413,
-     414,   415,   416,   417,   418,   419,   420,   421,    -1,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,    -1,   436,   437,    -1,   439,   440,   441,   442,   443,
-     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
-     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
-      -1,    -1,   466,   467,   468,   469,   470,   471,    -1,   473,
-     474,   475,   476,   477,   478,   479,    -1,   481,   482,   483,
-     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
-     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
-     504,   505,   506,   507,   508,   509,    -1,    -1,    -1,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,   526,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   323,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   336,    -1,    -1,   339,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2799,  2800,   403,
+      -1,    -1,    -1,    -1,   510,    -1,  2808,   513,   514,   515,
+      -1,   517,   518,   519,   520,   521,   522,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   449,    -1,    -1,    -1,    -1,
+      -1,    -1,  3165,  3166,  3167,    -1,    -1,    -1,    -1,    -1,
+     464,    -1,    -1,    -1,    -1,   417,    -1,    -1,  2870,    -1,
+      -1,    -1,    -1,    -1,    -1,   479,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2886,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   507,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   515,    -1,   517,   518,   519,   520,   521,    -1,    -1,
+     524,   525,   526,   527,    -1,   529,   530,   531,   532,   533,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2944,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3263,    -1,    -1,  3266,    -1,  3268,    -1,    -1,   510,    -1,
+    3273,   513,   514,   515,    -1,   517,   518,   519,   520,   521,
+     522,    -1,    -1,    -1,    84,    -1,    -1,    87,    -1,    -1,
+      -1,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2999,   108,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   116,    -1,    -1,    -1,
+      -1,  3324,   122,    -1,    -1,  3017,    -1,    -1,  3020,    -1,
+      -1,  3023,    -1,    -1,    -1,    -1,    -1,    -1,  3341,  3031,
+      -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,  3040,    -1,
+      -1,    -1,    -1,  3045,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3365,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3068,  3069,  3070,    -1,
+      -1,  3073,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3081,
+    3082,  3083,  3084,    -1,    -1,    -1,    -1,  3089,    -1,    -1,
+      -1,    -1,  3094,  3095,    -1,  3097,    -1,  3099,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3110,  3111,
+      -1,    -1,  3114,    -1,    -1,    -1,    -1,  3430,    -1,  3432,
+      -1,    -1,    -1,    -1,    -1,    -1,  3128,    -1,  3130,    -1,
+    3132,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   251,    -1,    -1,    -1,    -1,   256,    -1,    -1,    -1,
+    3152,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3163,    -1,  3165,  3166,  3167,    -1,   277,   278,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3491,    -1,
+      -1,    -1,   292,    -1,    -1,    -1,    -1,    -1,  3190,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3203,    -1,  3516,    -1,    -1,  3208,    -1,    -1,    -1,
+      -1,    -1,  3214,   323,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3224,    -1,    -1,    -1,   336,    -1,    -1,  3542,
+      -1,    -1,    -1,    -1,  3547,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3263,    -1,    -1,  3266,    -1,  3268,    -1,    -1,    -1,
+      -1,  3273,    -1,    -1,    -1,     3,    -1,    -1,    -1,    -1,
+      -1,     9,    -1,    -1,    -1,    13,    -1,    15,    -1,    17,
+      18,    -1,  3605,    -1,    -1,  3297,    -1,    -1,    -1,    -1,
+      28,    -1,    -1,    -1,    -1,    -1,    -1,   417,    -1,    -1,
+    3623,    -1,    -1,    -1,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    -1,  3324,    -1,    -1,  3638,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3341,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3365,    -1,    -1,    94,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   104,    -1,   106,   107,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   121,    -1,  3397,  3398,  3399,    -1,    -1,
+     510,    -1,    -1,   513,   514,   515,    -1,   517,   518,   519,
+     520,   521,   522,   141,    -1,   143,   144,    -1,    -1,    -1,
+      -1,   149,    -1,   151,    -1,    -1,  3739,    -1,  3430,    -1,
+    3432,    -1,    -1,    -1,   162,    -1,   164,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3760,    -1,    -1,
+      -1,   179,    -1,   181,    -1,    -1,   184,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   196,    -1,
+     198,    -1,  3785,    -1,   202,    -1,    -1,    -1,    -1,    -1,
+     208,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   216,  3491,
+     218,    -1,    -1,    -1,    -1,    -1,   224,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3819,    -1,    -1,    -1,
+      -1,   239,    -1,    -1,  3516,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   255,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3542,    -1,    -1,    -1,  3546,  3547,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3867,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   294,   295,   209,    -1,
+      -1,    -1,   300,    -1,    -1,    -1,   217,    -1,   219,    -1,
+      -1,    -1,    -1,   311,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   322,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3605,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3623,    -1,    -1,    -1,    -1,    -1,    -1,  3941,    -1,
+      -1,    -1,    -1,   361,    -1,    -1,  3638,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   373,    -1,    -1,    -1,    -1,
+     378,   379,    -1,   381,    -1,    -1,    -1,    -1,   386,    -1,
+      -1,    -1,    -1,   391,    -1,    84,   394,    -1,    87,    -1,
+      -1,   399,    91,    92,    93,    -1,   404,   405,    -1,    -1,
+      -1,    -1,    -1,    -1,   412,    -1,    -1,    -1,   416,  3691,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   116,   426,    -1,
+      -1,    -1,    -1,   122,    -1,    -1,    -1,    -1,    -1,    -1,
+     438,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4036,    -1,    -1,    -1,   146,    -1,   457,
+      -1,   459,    -1,    -1,  3736,    -1,    -1,  3739,    -1,   467,
+      -1,    -1,    -1,  3745,    -1,   473,    -1,    -1,    -1,  3751,
+     478,  3753,    -1,    -1,  3756,    -1,    -1,    -1,  3760,  3761,
+    3762,  3763,  3764,   491,    -1,  3767,  3768,  3769,  3770,  3771,
+    3772,  3773,  3774,  3775,  3776,    -1,    -1,    -1,  3780,  3781,
+      -1,    -1,    -1,  3785,   512,    -1,    -1,    -1,  3790,    -1,
+      -1,    -1,  3794,    -1,  3796,    -1,  3798,    -1,   526,    -1,
+      -1,    -1,   530,    -1,  3806,    -1,    -1,  3809,    -1,  3811,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3819,  3820,    -1,
+      -1,  3823,  3824,    -1,    -1,    -1,  3828,  3829,    -1,    -1,
+      -1,    -1,   251,  3835,    -1,    -1,    -1,   256,    -1,    -1,
+      -1,    -1,    -1,  3845,    -1,  3847,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3859,   277,   278,
+      -1,  4174,    -1,  3865,  3866,  3867,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   292,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   323,    -1,    -1,    -1,    -1,  4222,
+    3912,    -1,    -1,    -1,    -1,    -1,    -1,   336,    -1,    -1,
+      -1,     5,    -1,  3925,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3941,
+      -1,    25,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    35,    36,    -1,  3956,    -1,    -1,    -1,    42,    43,
+      -1,    -1,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    -1,    -1,    -1,
+      74,    75,    76,    77,    78,    79,    80,    81,   417,    -1,
+      -1,    85,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4030,    -1,
+      -1,    -1,    -1,  4035,  4036,  4037,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4361,    -1,
+      -1,    -1,    -1,   137,    -1,    -1,    -1,    -1,  4371,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   510,    -1,    -1,   513,   514,   515,    -1,   517,   518,
+     519,   520,   521,   522,    -1,    -1,    -1,    -1,    -1,    -1,
+    4423,    -1,    -1,    -1,    -1,  4428,    -1,    -1,    -1,    -1,
+     101,  4434,    -1,  4125,    -1,   209,    -1,    -1,    -1,    -1,
+      -1,    -1,   113,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   227,    -1,  4147,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   134,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   248,    -1,   147,    -1,    -1,    -1,
+      -1,    -1,  4174,    -1,    -1,    -1,   157,    -1,    -1,    -1,
+     161,    -1,    -1,    -1,    -1,    -1,  4499,   271,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   179,    -1,
+      -1,    -1,    -1,    -1,   185,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4528,    -1,    -1,    -1,   200,
+    4222,  4223,  4224,   307,   865,    -1,   310,    -1,    -1,    -1,
+     211,    -1,    -1,   874,    -1,  4548,    -1,    -1,   219,    -1,
+      -1,   325,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     231,    -1,    -1,    -1,    -1,    -1,    -1,   238,    -1,    -1,
+      -1,   242,    -1,    -1,    -1,    -1,    -1,    -1,   909,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   259,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4602,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4307,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   296,  4318,    -1,    -1,   403,
+      -1,    -1,    -1,    -1,   305,    -1,   967,    -1,    -1,    -1,
+      -1,    -1,   973,    -1,    -1,    -1,   977,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4348,    -1,    -1,    -1,
+      -1,    -1,    -1,   994,    -1,   336,  4358,  4359,   339,  4361,
+      -1,    -1,    -1,  4365,  4366,   449,    -1,    -1,  4370,  4371,
+      -1,    -1,    -1,  4375,    -1,   356,  4378,  4379,    -1,    -1,
+     464,  4383,    -1,    -1,    -1,    -1,    -1,  4389,  4701,    -1,
+    4703,    -1,    -1,    -1,   375,   479,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4407,    -1,    -1,    -1,  4411,
+      -1,    -1,   393,    -1,    -1,    -1,    -1,    -1,    -1,   400,
+      -1,  4423,    -1,   507,    -1,   406,  4428,    -1,   409,    -1,
+      -1,   515,  4434,   517,   518,   519,   520,   521,    -1,    -1,
+     524,   525,   526,   527,    -1,  4758,    -1,   531,    -1,    -1,
+    4452,    -1,    -1,    -1,    -1,    -1,    -1,   438,  1099,  1100,
+     441,   442,    -1,   444,   445,  1106,    -1,    -1,    -1,  1110,
+      -1,    -1,    -1,   454,    -1,    -1,    -1,    -1,   459,  4481,
+      -1,    -1,    -1,    -1,   465,    -1,    -1,   468,    -1,    -1,
+     471,    -1,    -1,    -1,    -1,  1136,    -1,  4499,    -1,    -1,
+      -1,    -1,    -1,   484,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4519,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4528,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4548,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4563,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4888,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4602,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4637,    -1,    -1,    -1,  1280,
+    1281,    -1,    -1,    -1,    -1,    -1,  4648,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1307,    -1,    -1,    -1,
+      -1,    -1,    -1,  1314,    -1,    -1,    -1,  1318,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5002,
+      -1,    -1,    -1,  1334,    -1,    -1,    -1,    -1,    -1,  4701,
+      -1,  4703,  1343,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    5033,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1381,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4754,    -1,    -1,    -1,  4758,    -1,  5071,    -1,
+      -1,  4763,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4780,  4781,
+      -1,    -1,  4784,  1424,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4798,    -1,    -1,    -1,
+      -1,  4803,    -1,    -1,    -1,    -1,  4808,    -1,    -1,  4811,
+    4812,    -1,    -1,    -1,    -1,  5128,    -1,  4819,  4820,  5132,
+    5133,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4841,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4855,    -1,    -1,  1497,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4888,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4898,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5218,  5219,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1555,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4935,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1586,    -1,  4949,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1614,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5000,    -1,
+    5002,  1642,  1643,  1644,    -1,  1646,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1666,    -1,    -1,    -1,    -1,
+    5032,  5033,    -1,  5035,    -1,  5037,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5061,
+      -1,    -1,    -1,  5065,    -1,    -1,    -1,    -1,    -1,  5071,
+      -1,    -1,    -1,    -1,  5076,    -1,    -1,    -1,    -1,  1720,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5098,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1749,    -1,
+      -1,    -1,  1753,  1754,    -1,    -1,    -1,    -1,    -1,    -1,
+    5122,    -1,    -1,    -1,    -1,    -1,  5128,    -1,    -1,    -1,
+    5132,  5133,    -1,    -1,    -1,  5137,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5178,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1833,    -1,    -1,    -1,  5198,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1849,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5218,  5219,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    89,    -1,    -1,    -1,    -1,    94,    -1,    96,  5241,
+      -1,    -1,  5244,    -1,    -1,    -1,    -1,  1888,   106,    -1,
+      -1,  5253,    -1,    -1,    -1,  1896,  5258,    -1,  5260,    -1,
+    5262,    -1,    -1,    -1,    -1,    -1,    -1,  5269,    -1,    -1,
+      -1,    -1,    -1,   131,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   141,    -1,  5287,    -1,    -1,  1929,    -1,
+      -1,    -1,    -1,    -1,   152,   153,    -1,    -1,   156,    -1,
+      -1,    -1,    -1,    -1,   162,    -1,    -1,    -1,   166,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     188,    -1,    -1,    -1,    -1,    -1,  5338,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   203,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5369,  5370,  2010,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5380,    -1,
+      -1,    -1,    -1,    -1,  2025,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2033,    -1,    -1,    -1,    -1,    -1,  5400,    -1,
+      -1,    -1,    -1,  2044,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  5435,    -1,    -1,    -1,    -1,    -1,  5441,
+    5442,    -1,  5444,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2091,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5463,    -1,  2104,    -1,    -1,    -1,    -1,    -1,  2110,
+      -1,    -1,    -1,    -1,    -1,  2116,    -1,    -1,    -1,    -1,
+      -1,  2122,    -1,    -1,  5486,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2134,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2149,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2174,    -1,    -1,  2177,    -1,    -1,    -1,
+    5542,  5543,    -1,    -1,    -1,    -1,  5548,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5556,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5567,  5568,  5569,   426,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2241,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2278,  2279,    -1,
+      -1,    -1,    -1,  2284,  2285,    -1,    -1,    -1,    -1,    -1,
+    2291,  2292,  2293,    -1,    -1,    -1,  2297,    -1,  2299,  2300,
+    2301,  2302,  2303,  2304,    -1,  2306,    -1,  2308,  2309,    -1,
+      -1,  2312,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2326,  2327,  2328,  2329,  2330,
+      -1,    -1,    -1,    -1,  2335,    -1,    -1,    -1,  2339,    -1,
+      -1,  2342,    -1,    -1,  2345,  2346,  2347,  2348,  2349,  2350,
+    2351,  2352,  2353,    -1,  2355,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2363,    -1,    -1,  2366,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2429,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   655,    -1,    -1,
+       6,     7,     8,    -1,    10,    11,    12,    -1,    -1,    -1,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    -1,    -1,    -1,    31,    32,    33,    34,    -1,
+      36,    37,    38,    39,    -1,    41,    42,    43,    -1,    -1,
+      -1,    -1,    -1,    49,    50,   703,   704,    -1,    -1,    55,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      66,    -1,    68,    -1,    70,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,   290,   291,   292,    -1,   294,   295,
-     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,    -1,   321,   322,   323,   324,    -1,
-     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
-      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,   478,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,    -1,    -1,    -1,    -1,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
-     526,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
-      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
-      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,    -1,   111,    -1,   113,   114,    -1,   116,   117,
-      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
-     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
-      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,    -1,    -1,   235,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
-     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
-      -1,   279,   280,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,   290,   291,    -1,    -1,   294,   295,   296,    -1,
-      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
-     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
-     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
-     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
-     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,    -1,    -1,    -1,    -1,    -1,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,   527,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    74,    75,    76,    77,    78,
-      79,    -1,    81,    -1,    -1,    -1,    85,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,    -1,    -1,    -1,    -1,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,   525,   526,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    74,    75,    76,    77,    78,    79,    -1,
-      81,    -1,    -1,    -1,    85,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,    -1,
-      -1,    -1,    -1,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,   526,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    71,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2527,    -1,    -1,    -1,
+    2531,  2532,    -1,   751,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   118,    -1,    -1,    -1,   122,   123,   124,   125,
+     126,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   138,    -1,    -1,    -1,    -1,    -1,  2579,   145,
+      -1,   147,    -1,    -1,    -1,    -1,    -1,   153,    -1,  2590,
+      -1,    -1,    -1,  2594,    -1,    -1,  2597,    -1,    -1,   165,
+      -1,    -1,    -1,    -1,    -1,  2606,   172,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   182,   183,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2629,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2643,   209,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   217,    -1,    -1,    -1,   221,    -1,    -1,    -1,    -1,
+      -1,   227,    -1,    -1,    -1,    -1,    -1,   233,    -1,   235,
+      -1,    -1,    -1,    -1,    -1,   241,    -1,   243,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   251,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2694,    -1,    -1,    -1,    -1,    -1,   265,
+     266,    -1,    -1,    -1,    -1,    -1,   272,    -1,   274,    -1,
+      -1,   277,   278,    -1,   280,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   289,   290,    -1,   292,    -1,    -1,    -1,
+      -1,   949,   950,    -1,   952,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   314,   315,
+     316,    -1,    -1,   319,    -1,    -1,    -1,   323,    -1,    -1,
+     326,    -1,   328,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   342,   343,    -1,   345,
+     346,    -1,    -1,    -1,    -1,  1003,    -1,    -1,  1006,  1007,
+      -1,   357,    -1,   359,    -1,    -1,    -1,    -1,  2799,  2800,
+      -1,    -1,    -1,  1021,    -1,  1023,   372,  1025,    -1,    -1,
+      -1,    -1,    -1,  1031,    -1,    -1,    -1,  1035,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   392,    -1,    -1,    -1,
+     396,    -1,    -1,    -1,    -1,    -1,    -1,  1055,  1056,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   414,    -1,
+      -1,   417,    -1,    -1,   420,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   434,  2870,
+      -1,    -1,    -1,    -1,   440,    -1,    -1,    -1,    -1,    -1,
+      -1,   447,   448,    -1,  1102,  2886,  1104,   453,    -1,   455,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   464,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   479,    -1,    -1,   482,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,    -1,    -1,  2944,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1183,    -1,   533,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1197,
+    1198,    -1,    -1,  1201,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2999,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3017,    -1,    -1,  3020,
+      -1,    -1,  3023,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3031,  1249,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3040,
+      -1,    -1,    -1,    -1,  3045,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3068,  3069,  3070,
+      -1,    -1,  3073,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3081,  3082,  3083,  3084,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3094,    -1,    -1,  3097,    -1,  3099,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3110,
+    3111,    -1,    -1,  3114,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3128,    -1,  3130,
+      -1,  3132,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     153,  3152,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   162,
+      -1,    -1,  3163,    -1,  3165,  3166,  3167,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3190,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     203,    -1,  3203,    -1,    -1,    -1,    -1,  3208,    -1,    -1,
+      -1,    -1,    -1,  3214,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3224,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   238,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   248,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3263,    -1,    -1,  3266,    -1,  3268,    -1,    -1,
+      -1,    -1,  3273,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1505,    -1,    -1,
+      -1,    -1,  1510,    -1,  1512,    -1,  3297,  1515,    -1,  1517,
+      -1,    -1,  1520,  1521,  1522,    -1,    -1,    -1,  1526,    -1,
+      -1,    -1,    -1,    -1,    -1,  1533,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3324,    -1,    -1,    -1,    -1,    -1,  1547,
+      -1,  1549,    -1,    -1,    -1,    -1,  1554,    -1,    -1,    -1,
+    3341,     5,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    25,    -1,    -1,  3365,    -1,    -1,    -1,    -1,    -1,
+      -1,    35,    36,    -1,    -1,    -1,    -1,    -1,    42,    43,
+      -1,    -1,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    -1,    -1,    -1,
+      74,    75,    76,    77,    78,    79,    80,    81,    -1,    -1,
+      -1,    85,    -1,   426,    -1,    -1,    -1,    -1,    -1,  3430,
+      -1,  3432,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1677,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1688,  1689,    -1,   137,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1705,    -1,    -1,
+    3491,    -1,  1710,  1711,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3516,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3542,    -1,    -1,    -1,   209,  3547,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   227,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1793,    -1,  1795,    -1,    -1,
+      -1,    -1,    -1,    -1,   248,    -1,    -1,  1805,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3605,    -1,    -1,   271,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3623,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3638,    -1,    -1,
+      -1,    -1,    -1,   307,    -1,    -1,   310,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1878,   325,    -1,    -1,    -1,    -1,    -1,    -1,  1886,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3691,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     703,   704,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1945,    -1,    -1,
+    1948,  1949,    -1,    -1,    -1,  3736,    -1,    -1,  3739,   403,
+      -1,    -1,    -1,    -1,  3745,    -1,    -1,    -1,   751,    -1,
+    3751,    -1,  3753,    -1,    -1,  3756,    -1,    -1,    -1,  3760,
+    3761,  3762,  3763,  3764,    -1,    -1,  3767,  3768,  3769,  3770,
+    3771,  3772,  3773,  3774,  3775,  3776,    -1,    -1,    -1,  3780,
+    3781,    -1,    -1,    -1,  3785,   449,    -1,    -1,    -1,  3790,
+      -1,    -1,    -1,  3794,    -1,    -1,    -1,  3798,    -1,  2017,
+     464,    -1,    -1,    -1,    -1,  3806,    -1,    -1,  3809,    -1,
+    3811,    -1,    -1,    -1,    -1,   479,    -1,    -1,  3819,  3820,
+      -1,    -1,  3823,  3824,    -1,    -1,    -1,  3828,  3829,    -1,
+      -1,    -1,    -1,    -1,  3835,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   507,  3845,    -1,  3847,    -1,    -1,    -1,
+      -1,   515,    -1,   517,   518,   519,   520,   521,  3859,    -1,
+     524,   525,   526,    -1,  3865,  3866,  3867,   531,    -1,   872,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   880,    -1,    -1,
+     883,   884,    -1,   886,    -1,    -1,   889,    -1,   891,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   910,    -1,    -1,
+      -1,  3912,    -1,    -1,    -1,   918,    -1,    -1,    -1,    -1,
+      -1,    -1,   925,    -1,  3925,   928,   929,    -1,    -1,    -1,
+     933,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3941,    -1,    -1,    -1,    -1,    -1,    -1,   950,    -1,   952,
+      -1,    -1,    -1,    -1,    -1,  3956,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   968,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     983,    -1,   985,    -1,    -1,   988,    -1,   990,    -1,    -1,
+     993,    -1,  2210,    -1,  2212,    -1,    -1,    -1,  2216,    -1,
+    2218,    -1,    -1,  2221,  1007,    -1,    -1,  2225,    -1,    -1,
+      -1,    -1,  2230,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4036,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1070,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1102,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1138,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2362,    -1,  4147,    -1,    -1,    -1,
+      -1,  2369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2379,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4174,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1210,    -1,  1212,
+      -1,    -1,    -1,  1216,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4222,  4223,  4224,    -1,  2443,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1236,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2497,
+      -1,    -1,    -1,  2501,    -1,    -1,    -1,    -1,    -1,  2507,
+      -1,  2509,  1295,    -1,  2512,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4307,    -1,  1311,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4318,    -1,    -1,
+    1323,    -1,  1325,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1333,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2558,    -1,  1345,    -1,    -1,  1348,    -1,  4348,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4358,  4359,    -1,
+    4361,    -1,    -1,    -1,  4365,  4366,    -1,    -1,    -1,  4370,
+    4371,    -1,    -1,    -1,  4375,    -1,    -1,  4378,  4379,  1382,
+      -1,    -1,  4383,    -1,    -1,    -1,    -1,    -1,  4389,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4407,    -1,    -1,    -1,
+    4411,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4423,    -1,    -1,    -1,    -1,  4428,    -1,    -1,
+      -1,    -1,    -1,  4434,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4452,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4481,    -1,    -1,    -1,    -1,    -1,    -1,  2705,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2713,    -1,  2715,  4499,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4528,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1544,    -1,    -1,    -1,    -1,    -1,  4548,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4563,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4602,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4637,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4648,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4701,    -1,  4703,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1739,  1740,    -1,    -1,
+      -1,    -1,  2960,  2961,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4754,    -1,    -1,    -1,  4758,    -1,  2977,
+      -1,    -1,  4763,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4780,
+    4781,    -1,    -1,  4784,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1798,    -1,  4798,  1801,    -1,
+      -1,    -1,  4803,    -1,    -1,    -1,  1809,  4808,    -1,    -1,
+    4811,  4812,    -1,    -1,    -1,    -1,    -1,    -1,  4819,  4820,
+      -1,    -1,    -1,    -1,  1827,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4841,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4855,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1874,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4888,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4898,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1932,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4949,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3181,    -1,    -1,    -1,    -1,  3186,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5000,
+      -1,  5002,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5032,  5033,    -1,  5035,    -1,  5037,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2048,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    5061,    -1,    -1,    -1,  5065,    -1,    -1,    -1,    -1,    -1,
+    5071,    -1,    -1,    -1,    -1,  5076,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5098,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5128,    -1,    -1,
+      -1,  5132,  5133,    -1,    -1,    -1,  5137,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2148,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2162,
+      -1,    -1,  2165,    -1,  2167,    -1,  2169,    -1,    -1,    -1,
+      -1,    -1,  2175,    -1,    -1,    -1,    -1,  5178,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5198,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5218,  5219,    -1,
+      -1,    -1,    -1,  2226,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2238,    -1,    -1,    -1,  2242,
+    5241,  2244,    -1,  5244,  2247,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  5253,    -1,    -1,    -1,    -1,  5258,    -1,  5260,
+      -1,  5262,    -1,    -1,    -1,    -1,    -1,    -1,  5269,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5287,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3542,    -1,    -1,    -1,    -1,  3547,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5338,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2369,    -1,  5369,  5370,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5380,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5400,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3636,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5435,    -1,    -1,    -1,    -1,    -1,
+    5441,  5442,    -1,  5444,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  5463,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3726,  2512,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2542,
+    2543,  5542,  5543,    -1,  2547,  2548,    -1,    -1,    -1,  2552,
+      -1,    -1,    -1,    -1,    -1,  5556,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2566,    -1,    -1,    -1,  5568,  5569,    -1,
+    2573,    -1,    -1,    -1,  2577,  2578,    -1,    -1,  2581,  2582,
+      -1,    -1,    -1,    -1,    -1,  2588,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2600,    -1,  2602,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2619,    -1,    -1,    -1,
+      -1,  2624,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2637,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2645,    -1,  2647,    -1,  2649,  2650,  2651,    -1,
+      -1,    -1,    -1,  2656,  2657,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2666,    -1,    -1,    -1,    -1,  2671,    -1,
+      -1,    -1,    -1,  2676,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2701,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2712,
+      -1,  2714,  3930,    -1,    -1,    -1,  2719,    -1,    -1,    -1,
+    2723,    -1,  2725,  2726,  2727,  2728,    -1,  2730,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2743,  2744,  2745,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2755,  2756,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     6,     7,     8,    -1,    10,    11,    12,    -1,    -1,
+      -1,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
+      -1,    26,    27,    -1,    -1,    -1,    31,    32,    33,    34,
+      -1,    36,    37,    38,    39,    -1,    41,    42,    43,    -1,
+      -1,    -1,    -1,    -1,    49,    50,  2809,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4036,    64,
+      -1,    66,    -1,    68,    -1,    70,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4064,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   118,    -1,    -1,    -1,   122,   123,   124,
+     125,   126,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   138,    -1,    -1,    -1,    -1,    -1,    -1,
+     145,    -1,   147,    -1,    -1,    -1,    -1,    -1,   153,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     165,    -1,    -1,    -1,    -1,    -1,    -1,   172,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   182,   183,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   865,    -1,    -1,    -1,    -1,    -1,  2960,    -1,    -1,
+     874,    -1,    -1,    -1,   209,    -1,    -1,    -1,    -1,    -1,
+    2973,    -1,   217,    -1,    -1,    -1,   221,    -1,    -1,    -1,
+      -1,    -1,   227,    -1,    -1,    -1,    -1,    -1,   233,    -1,
+     235,    -1,    -1,    -1,    -1,   909,   241,    -1,   243,    -1,
+      -1,    -1,    -1,    -1,    -1,  3008,   251,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     265,   266,    -1,    -1,    -1,    -1,    -1,   272,    -1,   274,
+      -1,    -1,   277,   278,    -1,   280,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   289,   290,    -1,   292,    -1,    -1,
+      -1,    -1,    -1,   967,    -1,    -1,    -1,    -1,    -1,   973,
+      -1,    -1,    -1,   977,    -1,  4283,    -1,    -1,    -1,   314,
+     315,   316,    -1,    -1,   319,    -1,    -1,    -1,   323,    -1,
+     994,   326,    -1,   328,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   342,   343,    -1,
+     345,   346,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   357,    -1,   359,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   372,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   392,    -1,    -1,
+      -1,   396,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   414,
+      -1,    -1,   417,    -1,    -1,   420,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1099,  1100,    -1,    -1,   434,
+      -1,    -1,    -1,    -1,    -1,   440,    -1,    -1,  3201,    -1,
+      -1,    -1,   447,   448,    -1,    -1,    -1,    -1,   453,    -1,
+     455,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   464,
+      -1,  4439,  1136,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   479,    -1,    -1,   482,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3276,  3277,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   533,    -1,
+      -1,  3294,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4525,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3319,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3328,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3344,  3345,    -1,    -1,    -1,  3349,    -1,    -1,    -1,
+      -1,  3354,  3355,  3356,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3385,  3386,  3387,  3388,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1307,    -1,    -1,    -1,    -1,    -1,    -1,
+    1314,    -1,  4620,    -1,  1318,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3422,
+    1334,  3424,  3425,  3426,    -1,    -1,    -1,    -1,    -1,  1343,
+      -1,  3434,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1381,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3503,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3511,    -1,
+    1424,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3530,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3553,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1497,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3597,    -1,    -1,    -1,  3601,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4836,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3630,    -1,    -1,
+      -1,    -1,    -1,  3636,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1555,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3658,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3672,
+    4888,    -1,  1586,  3676,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3689,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1614,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1642,  1643,
+    1644,    -1,  1646,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1666,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1720,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1749,    -1,    -1,    -1,  1753,
+    1754,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1833,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3963,    -1,  3965,    -1,    -1,    -1,    -1,    -1,    -1,  3972,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1896,    -1,    -1,    -1,  3989,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4004,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5229,  4015,    -1,    -1,  1929,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4033,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4060,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4071,  4072,
+    4073,    -1,    -1,  4076,  4077,  4078,  4079,  4080,  4081,    -1,
+      -1,    -1,    -1,  4086,  4087,    -1,  4089,  4090,  4091,  4092,
+    4093,  4094,  4095,    -1,    -1,    -1,  2010,    -1,    -1,    -1,
+      -1,  4104,    -1,  4106,  4107,    -1,    -1,    -1,    -1,    -1,
+      -1,  2025,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2033,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2044,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4146,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2091,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2104,    -1,    -1,    -1,    -1,    -1,  2110,    -1,    -1,    -1,
+      -1,    -1,  2116,    -1,    -1,    -1,    -1,    -1,  2122,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2134,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2149,    -1,    -1,    -1,  4242,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2174,    -1,    -1,  2177,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4278,  4279,  4280,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   973,  4290,    -1,    -1,
+      -1,  1099,  1100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   994,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2241,  1136,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2278,  2279,    -1,    -1,    -1,    -1,
+    2284,  2285,    -1,    -1,    -1,    -1,    -1,  2291,  2292,  2293,
+      -1,    -1,    -1,  2297,    -1,  2299,  2300,  2301,  2302,  2303,
+    2304,    -1,  2306,    -1,  2308,  2309,    -1,    -1,  2312,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2326,  2327,  2328,  2329,  2330,    -1,    -1,    -1,
+      -1,  2335,    -1,    -1,    -1,  2339,    -1,    -1,  2342,    -1,
+      -1,  2345,  2346,  2347,  2348,  2349,  2350,  2351,  2352,  2353,
+      -1,  2355,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2363,
+      -1,    -1,  2366,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4507,    -1,    -1,    -1,  4511,  4512,
+    4513,  4514,    -1,    -1,  4517,  2429,    -1,    -1,    -1,    -1,
+      -1,    -1,   973,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4539,  4540,  4541,  4542,
+      -1,  4544,  4545,   994,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4556,  4557,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4574,    -1,    -1,    -1,    -1,    -1,    -1,  4581,  4582,
+      -1,  4584,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2527,    -1,    -1,    -1,  2531,  2532,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1314,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1334,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1343,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4667,  2579,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2590,    -1,    -1,    -1,
+    2594,    -1,    -1,  2597,    -1,  4688,    -1,    -1,    -1,    -1,
+      -1,    -1,  2606,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4727,    -1,    -1,    -1,    -1,  2643,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1424,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1586,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4801,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1614,    -1,    -1,    -1,
+      -1,    -1,    -1,  4816,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1642,  1643,  1644,    -1,  1646,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1666,    -1,
+      -1,    -1,    -1,  1314,    -1,    -1,    -1,    -1,  1555,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1334,    -1,  2799,  2800,  4890,    -1,    -1,
+      -1,    -1,  1343,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4908,    -1,    -1,    -1,    -1,
+    4913,  4914,  1720,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1749,    -1,    -1,    -1,  1753,  1754,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2870,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4969,    -1,    -1,    -1,
+      -1,    -1,  2886,  1424,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    5013,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    5023,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2944,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5058,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5069,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2999,    -1,    -1,    -1,    -1,
+      -1,  5094,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3017,  1555,    -1,  3020,    -1,    -1,  3023,
+      -1,    -1,    -1,    -1,    -1,  5118,    -1,  3031,    -1,    -1,
+      -1,    -1,    -1,    -1,  5127,    -1,  3040,    -1,    -1,    -1,
+      -1,  3045,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5148,  1833,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3068,  3069,  3070,    -1,    -1,  3073,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3081,  3082,  3083,
+    3084,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3094,    -1,    -1,  3097,    -1,  3099,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3110,  3111,    -1,    -1,
+    3114,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1896,
+      -1,    -1,    -1,    -1,  3128,    -1,  3130,    -1,  3132,    -1,
+      -1,    -1,    -1,  5226,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3152,    -1,
+      -1,    -1,  1929,    -1,    -1,    -1,    -1,  5250,    -1,  3163,
+      -1,  3165,  3166,  3167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3190,    -1,    -1,    -1,
+      -1,    -1,  5285,    -1,    -1,    -1,    -1,    -1,    -1,  3203,
+      -1,    -1,    -1,    -1,  3208,    -1,    -1,  5300,    -1,    -1,
+    3214,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3224,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  5325,  2010,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2025,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2033,    -1,    -1,  3263,
+      -1,    -1,  3266,    -1,  3268,    -1,    -1,  2044,    -1,  3273,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1833,  3297,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5399,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2091,    -1,    -1,    -1,    -1,    -1,
+    3324,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5424,    -1,  2110,    -1,    -1,    -1,  3341,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2122,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1896,    -1,  2134,    -1,    -1,
+      -1,  3365,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2284,    -1,  1929,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2174,    -1,  2297,
+    2177,  2299,    -1,    -1,  2302,  2303,  2304,    -1,    -1,    -1,
+      -1,  2309,    -1,    -1,  2312,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3430,    -1,  3432,  2327,
+    2328,  2329,  2330,    -1,    -1,    -1,    -1,  2335,    -1,    -1,
+      -1,  2339,    -1,    -1,  2342,    -1,    -1,  2345,  2346,  2347,
+    2348,  2349,  2350,  2351,  2352,  2353,    -1,  2355,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2363,    -1,    -1,  2366,  2010,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2025,    -1,    -1,  3491,    -1,    -1,
+      -1,    -1,  2033,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2044,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3516,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2429,    -1,    -1,    -1,    -1,    -1,    -1,  3542,    -1,
+      -1,    -1,    -1,  3547,    -1,    -1,    -1,    -1,    -1,  2326,
+    2091,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2110,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2122,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2134,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3605,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3623,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2174,  3638,    -1,  2177,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2579,    -1,    -1,    -1,    -1,    -1,  3691,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3736,    -1,    -1,  3739,    -1,    -1,    -1,    -1,
+      -1,  3745,    -1,    -1,    -1,    -1,    -1,  3751,    -1,  3753,
+    2527,    -1,  3756,    -1,  2531,  2532,  3760,  3761,  3762,  3763,
+    3764,    -1,    -1,  3767,  3768,  3769,  3770,  3771,  3772,  3773,
+    3774,  3775,  3776,    -1,    -1,    -1,  3780,  3781,    -1,    -1,
+      -1,  3785,    -1,    -1,    -1,  2326,  3790,    -1,    -1,    -1,
+    3794,    -1,    -1,    -1,  3798,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3806,    -1,    -1,  3809,    -1,  3811,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3819,  3820,  2594,    -1,  3823,
+    3824,    -1,    -1,    -1,  3828,  3829,    -1,    -1,    -1,  2606,
+      -1,  3835,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3845,    -1,  3847,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3859,    -1,    -1,    -1,    -1,
+      -1,  3865,  3866,  3867,    -1,    -1,  2643,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2799,    -1,    -1,    -1,    -1,    -1,    -1,  3912,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3925,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3941,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3956,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2527,    -1,    -1,    -1,
+    2531,  2532,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2800,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4036,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   973,    -1,    -1,    -1,    -1,  2944,    -1,    -1,    -1,
+      -1,    -1,    -1,  2594,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   994,    -1,    -1,  2606,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2870,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2643,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   973,
+      -1,    -1,  3040,  4147,    -1,    -1,    -1,  3045,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     994,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4174,    -1,  3070,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3081,    -1,  3083,  3084,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3094,    -1,    -1,  3097,
+      -1,  3099,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4222,  4223,
+    4224,    -1,  2999,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3128,    -1,  3130,    -1,  3132,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3020,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3031,    -1,    -1,    -1,    -1,  2800,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3165,  3166,  3167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3190,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4307,    -1,  3203,    -1,    -1,    -1,    -1,
+    3208,    -1,    -1,    -1,  4318,    -1,  3214,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2870,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4348,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4358,  4359,    -1,  4361,    -1,    -1,
+      -1,  4365,  4366,    -1,    -1,    -1,  4370,  4371,    -1,    -1,
+      -1,  4375,    -1,    -1,  4378,  4379,    -1,    -1,    -1,  4383,
+      -1,    -1,  1314,    -1,    -1,  4389,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3297,
+      -1,    -1,  1334,  4407,    -1,    -1,    -1,  4411,    -1,    -1,
+      -1,  1343,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4423,
+      -1,    -1,    -1,    -1,  4428,    -1,    -1,    -1,    -1,    -1,
+    4434,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4452,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2999,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4481,    -1,  3020,
+    1314,    -1,    -1,    -1,    -1,    -1,  3263,    -1,    -1,  3266,
+    3031,  3268,  1424,    -1,    -1,  4499,  3273,    -1,   973,    -1,
+    1334,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1343,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   994,
+      -1,    -1,    -1,    -1,  4528,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4548,    -1,    -1,  3324,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4563,
+      -1,    -1,    -1,    -1,  3341,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3365,    -1,
+    1424,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4602,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1555,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4637,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4648,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3430,    -1,  3432,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4701,    -1,  4703,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3491,    -1,    -1,    -1,    -1,    -1,
+      -1,  1555,  3263,    -1,    -1,  3266,    -1,  3268,    -1,    -1,
+      -1,    -1,  3273,    -1,    -1,    -1,    -1,    -1,    -1,  3516,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4754,    -1,    -1,    -1,  4758,    -1,    -1,    -1,    -1,  4763,
+      -1,    -1,    -1,    -1,    -1,  3542,    -1,    -1,    -1,    -1,
+    3547,    -1,    -1,    -1,    -1,    -1,  4780,  4781,    -1,    -1,
+    4784,    -1,    -1,  3324,    -1,    -1,    -1,    -1,    -1,    -1,
+     973,    -1,    -1,    -1,  4798,    -1,    -1,    -1,    -1,  4803,
+    3341,    -1,    -1,    -1,  4808,    -1,    -1,  4811,  4812,    -1,
+      -1,   994,    -1,    -1,    -1,  4819,  4820,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3365,    -1,    -1,    -1,  3605,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4841,  3736,  1314,
+      -1,    -1,    -1,    -1,    -1,    -1,  3623,  3745,    -1,    -1,
+      -1,  4855,    -1,  3751,    -1,  3753,    -1,    -1,    -1,  1334,
+      -1,  3638,    -1,    -1,    -1,    -1,    -1,    -1,  1343,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3780,  3781,  4888,    -1,    -1,    -1,    -1,  3430,
+      -1,  3432,    -1,    -1,  4898,    -1,    -1,    -1,    -1,    -1,
+    3798,  1833,    -1,    -1,    -1,    -1,    -1,    -1,  3806,    -1,
+      -1,  3809,    -1,  3811,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3820,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3828,  3829,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4949,    -1,    -1,    -1,  1424,
+    3491,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3859,  3739,    -1,  1896,    -1,    -1,  3865,  3866,  3867,
+      -1,    -1,    -1,    -1,    -1,  3516,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3760,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5000,  1929,  5002,  1833,
+      -1,  3542,    -1,    -1,    -1,    -1,  3547,    -1,  3785,    -1,
+      -1,    -1,    -1,    -1,  3912,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3925,  5032,  5033,
+      -1,  5035,    -1,  5037,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3819,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5061,    -1,    -1,
+      -1,  5065,  1896,    -1,  3605,    -1,    -1,  5071,    -1,    -1,
+      -1,    -1,  5076,    -1,    -1,    -1,    -1,    -1,  2010,    -1,
+    1555,    -1,  3623,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2025,  5098,  1929,    -1,  3638,    -1,    -1,
+      -1,  2033,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2044,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5128,    -1,    -1,    -1,  5132,  5133,
+      -1,  1314,    -1,  5137,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1334,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2091,
+    1343,    -1,    -1,    -1,  3941,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5178,    -1,  2010,    -1,  2110,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2122,  2025,    -1,    -1,  5198,    -1,    -1,    -1,  3739,  2033,
+      -1,    -1,  2134,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2044,    -1,    -1,    -1,  5218,  5219,    -1,    -1,    -1,  3760,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5241,    -1,    -1,
+    5244,  1424,  2174,    -1,  3785,  2177,    -1,    -1,    -1,  5253,
+      -1,    -1,    -1,    -1,  5258,    -1,  5260,  2091,  5262,  4036,
+      -1,    -1,    -1,    -1,    -1,  5269,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2110,    -1,  3819,    -1,
+      -1,    -1,    -1,  5287,    -1,    -1,    -1,    -1,  2122,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2134,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4223,  4224,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5338,    -1,    -1,    -1,    -1,    -1,
+    2174,    -1,    -1,  2177,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1833,    -1,
+      -1,    -1,    -1,    -1,    -1,  5369,  5370,    -1,    -1,    -1,
+      -1,    -1,  1555,    -1,    -1,    -1,  5380,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2326,    -1,  5400,  4174,    -1,    -1,
+    3941,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4307,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4318,  1896,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5435,    -1,    -1,    -1,    -1,    -1,  5441,  5442,    -1,
+    5444,    -1,    -1,    -1,    -1,  4222,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1929,    -1,    -1,    -1,    -1,  5463,
+    4358,  4359,    -1,    -1,    -1,    -1,    -1,  4365,  4366,    -1,
+      -1,    -1,  4370,    -1,    -1,    -1,    -1,  4375,    -1,    -1,
+    4378,  4379,    -1,    -1,    -1,  4383,    -1,    -1,    -1,    -1,
+      -1,  4389,  2326,    -1,    -1,  4036,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4423,    -1,    -1,    -1,    -1,
+    4428,    -1,    -1,    -1,    -1,  2010,  4434,    -1,  5542,  5543,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2025,    -1,  5556,    -1,  4452,    -1,    -1,    -1,  2033,    -1,
+      -1,    -1,    -1,    -1,  5568,  5569,    -1,    -1,    -1,  2044,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4481,  4361,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4371,  2527,    -1,    -1,    -1,  2531,
+    2532,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2091,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4174,    -1,  2110,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2122,    -1,    -1,
+    1833,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2134,
+      -1,    -1,  2594,    -1,    -1,  4563,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2606,    -1,    -1,    -1,    -1,    -1,
+      -1,  4222,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2527,    -1,    -1,    -1,  2531,  2532,  2174,
+      -1,    -1,  2177,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2643,    -1,  1896,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4499,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4637,
+      -1,    -1,    -1,    -1,    -1,    -1,  1929,    -1,    -1,    -1,
+      -1,  4528,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2594,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4548,  2606,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2643,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4361,    -1,    -1,    -1,    -1,  4602,    -1,  2010,    -1,    -1,
+    4371,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2025,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2033,  2326,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2044,    -1,    -1,    -1,    -1,    -1,    -1,  2800,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4780,  4781,    -1,    -1,  4784,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2091,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4819,  4820,    -1,    -1,    -1,  4703,  2110,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2870,  2122,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2134,    -1,    -1,    -1,    -1,    -1,    -1,  4499,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2800,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4758,    -1,    -1,    -1,    -1,    -1,  4528,    -1,    -1,
+      -1,  2174,    -1,    -1,  2177,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4548,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2870,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2527,    -1,    -1,    -1,  2531,  2532,    -1,    -1,
+      -1,  4602,    -1,    -1,    -1,    -1,    -1,  2999,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3020,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3031,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4888,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2594,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2606,    -1,    -1,    -1,    -1,    -1,  5035,    -1,    -1,
+      -1,    -1,    -1,  2326,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4703,  5061,    -1,  2999,    -1,    -1,  2643,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5076,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3020,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3031,    -1,    -1,
+    5098,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4758,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5002,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5137,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5033,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5071,    -1,    -1,    -1,    -1,    -1,
+    5198,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2800,    -1,    -1,    -1,    -1,
+      -1,  3263,    -1,    -1,  3266,    -1,  3268,    -1,    -1,    -1,
+      -1,  3273,    -1,    -1,  2527,    -1,    -1,  4888,  2531,  2532,
+      -1,  5128,    -1,    -1,    -1,  5132,  5133,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5262,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5287,
+      -1,    -1,  3324,    -1,    -1,  2870,  1658,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3341,
+      -1,  2594,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2606,    -1,    -1,    -1,    -1,    -1,  3263,
+      -1,    -1,  3266,  3365,  3268,    -1,    -1,    -1,    -1,  3273,
+      -1,    -1,  5219,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2643,  5002,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5369,  5370,  1735,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  5380,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3324,    -1,  5033,    -1,    -1,    -1,    -1,    -1,  3430,    -1,
+    3432,    -1,    -1,    -1,    -1,    -1,    -1,  3341,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2999,    -1,    -1,    -1,    -1,    -1,
+    5071,  3365,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3020,  5444,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3031,    -1,    -1,  3491,
+      -1,    -1,    -1,    -1,    -1,  5463,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3516,    -1,    -1,  5128,    -1,    -1,
+      -1,  5132,  5133,    -1,    -1,    -1,  3430,    -1,  3432,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3542,    -1,    -1,    -1,    -1,  3547,    -1,  2800,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5542,  5543,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3491,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3605,    -1,    -1,    -1,    -1,  5219,    -1,
+      -1,    -1,  3516,    -1,    -1,    -1,    -1,  2870,    -1,    -1,
+      -1,  3623,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3638,    -1,  3542,    -1,
+      -1,    -1,    -1,  3547,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3605,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3263,  3623,
+      -1,  3266,    -1,  3268,    -1,    -1,    -1,    -1,  3273,    -1,
+      -1,    -1,    -1,    -1,  3638,    -1,    -1,  3739,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2999,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3760,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3020,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3031,  3324,
+      -1,    -1,    -1,  3785,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3341,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3819,    -1,    -1,
+    3365,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3739,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3760,    -1,    -1,    -1,
+      -1,  2193,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3785,    -1,    -1,    -1,  3430,    -1,  3432,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3819,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3941,
+      -1,    -1,    -1,    -1,    -1,    -1,  3491,    -1,    -1,    -1,
+    2282,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2296,    -1,    -1,    -1,  2300,    -1,
+      -1,  3516,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2314,  2315,  2316,    -1,    -1,  2319,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3542,    -1,    -1,
+      -1,    -1,  3547,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3263,    -1,    -1,  3266,    -1,  3268,    -1,    -1,    -1,    -1,
+    3273,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2361,
+      -1,    -1,    -1,    -1,  4036,    -1,    -1,  3941,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3605,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3324,    -1,    -1,    -1,    -1,    -1,    -1,  3623,    -1,
+      -1,    -1,    -1,    -1,  2416,    -1,    -1,    -1,  3341,    -1,
+      -1,    -1,    -1,  3638,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2439,    -1,    -1,
+      -1,    -1,  3365,    -1,    -1,    -1,    -1,    -1,    -1,  2451,
+      -1,    -1,  2454,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4036,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4174,    -1,    -1,    -1,    -1,  3430,    -1,  3432,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3739,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3760,    -1,    -1,    -1,    -1,
+    4222,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3491,    -1,
+    3785,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3516,    -1,    -1,    -1,    -1,    -1,    -1,
+    4174,    -1,    -1,    -1,  3819,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3542,
+      -1,    -1,    -1,    -1,  3547,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4222,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,   405,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,   438,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,   491,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,    -1,    -1,   512,
-      -1,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,   526,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,   438,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,   491,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,    -1,    -1,   512,    -1,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,   526,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,    -1,    -1,    -1,    -1,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,   526,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,    -1,    -1,    -1,    -1,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,   526,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,    -1,
-      -1,    -1,    -1,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,   526,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,    -1,    -1,    -1,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,   526,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,    74,
-      75,    76,    77,    78,    79,    80,    81,    -1,    -1,    84,
-      85,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,    -1,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-      -1,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,    -1,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,    -1,   218,   219,   220,    -1,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,    -1,   242,    -1,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,    -1,    -1,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,    -1,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,    -1,   320,   321,   322,   323,   324,
-     325,    -1,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,    -1,   343,   344,
-     345,    -1,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,    -1,   358,    -1,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,    -1,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
-     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,    -1,
-     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
-     445,   446,   447,   448,    -1,   450,   451,   452,    -1,   454,
-      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
-     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,    -1,   479,   480,   481,   482,   483,   484,
-     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
-     495,   496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   507,   508,   509,    -1,    -1,    -1,   513,   514,
-     515,    -1,   517,   518,   519,   520,   521,   522,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
-      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
-      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,
-      -1,    -1,    -1,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
-      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
-     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
-      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
-     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
-      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
-      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
-     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
-     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
-     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
-     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
-     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,    -1,    -1,    -1,   513,   514,   515,    -1,   517,
-     518,   519,   520,   521,   522,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
-      -1,    -1,    -1,    84,    -1,    -1,    -1,    -1,    -1,    -1,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,    -1,
-      -1,    -1,   513,   514,   515,    -1,   517,   518,   519,   520,
-     521,   522,     6,     7,     8,     9,    10,    11,    12,    13,
-      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
-      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
-      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
-      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
-      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
-      84,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
-     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
-     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
-      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
-     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
-     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
-      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
-     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
-      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
-      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
-      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
-     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
-     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
-     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
-     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
-     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
-     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
-     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
-      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
-     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
-     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
-     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
-     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
-     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
-     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
-     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
-     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
-     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
-      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
-     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
-     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
-     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
-     504,   505,   506,   507,   508,   509,    -1,    -1,    -1,   513,
-     514,   515,    -1,   517,   518,   519,   520,   521,   522,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    84,    -1,    -1,
-      -1,    -1,    -1,    -1,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,    -1,    -1,    -1,   513,   514,   515,    -1,
-     517,   518,   519,   520,   521,   522,     6,     7,     8,     9,
+      -1,    -1,  3605,    -1,    -1,    -1,    -1,    -1,    -1,  4361,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4371,
+    3623,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3638,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3941,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4361,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4371,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3739,    -1,    -1,    -1,
+      -1,  4036,    -1,    -1,    -1,    -1,    -1,  4499,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3760,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4528,    -1,    -1,    -1,
+      -1,    -1,  3785,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4548,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3819,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4499,    -1,    -1,    -1,    -1,
+    4602,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4528,    -1,    -1,    -1,    -1,  4174,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4548,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4222,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3941,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4602,    -1,
+      -1,  4703,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3043,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3063,    -1,  3065,    -1,    -1,  3068,  3069,    -1,  3071,
+      -1,  3073,    -1,    -1,    -1,  3077,    -1,    -1,  3080,    -1,
+      -1,    -1,    -1,  3085,    -1,    -1,  4758,    -1,    -1,  3091,
+      -1,    -1,    -1,    -1,  3096,    -1,    -1,    -1,    -1,    -1,
+      -1,  3103,  3104,  3105,  3106,    -1,    -1,    -1,  3110,  3111,
+      -1,  3113,    -1,  4036,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3125,    -1,  3127,    -1,    -1,    -1,  4703,
+      -1,    -1,  3134,  3135,  3136,  3137,  3138,  3139,  3140,  3141,
+    3142,  3143,    -1,    -1,    -1,    -1,  4361,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4371,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3171,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4758,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4888,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4174,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4499,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4222,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    3312,    -1,    -1,  4528,  4888,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    5002,    -1,    -1,  4548,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5033,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4602,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5071,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5002,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4361,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4371,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5128,    -1,    -1,  5033,
+    5132,  5133,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4703,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5071,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3543,    -1,  4758,    -1,    -1,    -1,  5219,    -1,    -1,
+      -1,    -1,    -1,    -1,  5128,    -1,    -1,    -1,  5132,  5133,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4499,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4528,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4548,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5219,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4888,    -1,    -1,    -1,    -1,  3680,  4602,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3735,    -1,    -1,    -1,    -1,    -1,  3741,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3757,  3758,    -1,    -1,  3761,
+    3762,  3763,  3764,    -1,    -1,  3767,  3768,  3769,  3770,  3771,
+    3772,  3773,  3774,  3775,  3776,  3777,    -1,    -1,    -1,    -1,
+    4703,    -1,    -1,    -1,    -1,    -1,    -1,  5002,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3799,    -1,    -1,
+    3802,    -1,  3804,    -1,    -1,  3807,  3808,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5033,    -1,
+    3822,  3823,  3824,  3825,    -1,  3827,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4758,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5071,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3895,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3906,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  5128,    -1,    -1,    -1,  5132,  5133,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  3953,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4888,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5219,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5002,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    5033,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  4147,    -1,    -1,  5071,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5128,    -1,    -1,    -1,  5132,
+    5133,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5219,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4308,    -1,    -1,    -1,
+    4312,  4313,  4314,    -1,    -1,    -1,    -1,    -1,  4320,  4321,
+    4322,  4323,    -1,    -1,    -1,    -1,  4328,  4329,  4330,  4331,
+    4332,  4333,  4334,  4335,  4336,  4337,  4338,  4339,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4364,    -1,    -1,  4367,    -1,  4369,    -1,    -1,
+      -1,  4373,    -1,    -1,  4376,  4377,    -1,    -1,  4380,  4381,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4425,    -1,    -1,    -1,    -1,    -1,    -1,
+    4432,  4433,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4451,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4640,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     3,  4698,  4699,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    36,    37,
+      38,    39,    -1,    41,    42,    43,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,  4748,    55,    -1,    -1,
+      -1,  4753,  4754,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,  4768,    -1,  4770,    -1,
+      78,    79,  4774,  4775,  4776,    -1,    -1,  4779,    -1,    -1,
+    4782,  4783,    -1,    -1,    -1,  4787,    94,    -1,    -1,  4791,
+      -1,    -1,    -1,    -1,    -1,    -1,   104,    -1,   106,   107,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   116,    -1,
+     118,    -1,    -1,   121,   122,   123,   124,   125,   126,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     138,    -1,    -1,   141,    -1,   143,   144,   145,    -1,   147,
+      -1,   149,    -1,   151,    -1,   153,    -1,    -1,    -1,    -1,
+      -1,  4853,    -1,    -1,   162,    -1,   164,   165,    -1,    -1,
+      -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,    -1,
+      -1,   179,    -1,   181,   182,   183,   184,    -1,    -1,    -1,
+      -1,    -1,   190,    -1,    -1,    -1,    -1,    -1,   196,    -1,
+     198,    -1,    -1,    -1,   202,    -1,    -1,    -1,    -1,    -1,
+     208,   209,    -1,    -1,    -1,    -1,    -1,  4909,   216,   217,
+     218,    -1,    -1,   221,    -1,    -1,   224,    -1,    -1,   227,
+      -1,    -1,    -1,    -1,    -1,   233,    -1,   235,    -1,    -1,
+      -1,   239,    -1,   241,    -1,   243,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   251,    -1,    -1,    -1,   255,    -1,    -1,
+      -1,    -1,  4954,    -1,    -1,    -1,    -1,   265,   266,    -1,
+      -1,   269,    -1,    -1,   272,    -1,   274,    -1,    -1,   277,
+     278,    -1,   280,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   289,   290,    -1,   292,    -1,   294,   295,    -1,    -1,
+      -1,    -1,   300,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   311,    -1,    -1,   314,   315,   316,    -1,
+      -1,   319,    -1,    -1,   322,   323,    -1,    -1,   326,    -1,
+     328,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5031,
+    5032,    -1,    -1,    -1,   342,   343,    -1,   345,   346,    -1,
+      -1,    -1,    -1,    -1,    -1,  5047,  5048,  5049,    -1,   357,
+      -1,   359,    -1,   361,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   372,   373,    -1,    -1,    -1,    -1,
+     378,   379,    -1,   381,    -1,    -1,    -1,    -1,   386,    -1,
+      -1,  5083,  5084,   391,   392,    -1,   394,    -1,   396,    -1,
+      -1,   399,    -1,    -1,    -1,    -1,   404,   405,    -1,    -1,
+      -1,    -1,    -1,    -1,   412,    -1,   414,    -1,   416,   417,
+      -1,    -1,   420,    -1,    -1,    -1,    -1,    -1,   426,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,    -1,
+     438,    -1,   440,    -1,    -1,    -1,    -1,    -1,    -1,   447,
+     448,    -1,    -1,    -1,    -1,   453,    -1,   455,    -1,   457,
+      -1,   459,    -1,    -1,    -1,    -1,   464,    -1,    -1,   467,
+      -1,    -1,   470,    -1,    -1,   473,    -1,    -1,    -1,    -1,
+     478,   479,    -1,    -1,   482,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   491,    -1,    -1,    -1,    -1,    -1,    -1,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,    -1,
+      -1,    -1,    -1,    -1,   512,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,    -1,
+      -1,    -1,   530,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5233,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5249,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5299,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5337,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5398,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5447,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     5,     6,     7,     8,     9,
       10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
-      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
-      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
-      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
-      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,  5515,    -1,    55,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
       70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
-      -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,    -1,    -1,
-      -1,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
-     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
-     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
-      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
-     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
-     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
-     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
-     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
-     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
-     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
-     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
-     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
-     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
-     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
-      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
-      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  5555,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
      300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
-      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
-     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
-      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
-     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
-     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
-     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
-     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
-     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
-     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
-      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
-      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
-     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
-     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
-      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
-      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
+     340,   341,   342,   343,   344,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
+     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,   453,   454,   455,   456,   457,   458,   459,
+     460,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,   478,   479,
+     480,   481,   482,   483,   484,   485,   486,   487,   488,   489,
+     490,   491,   492,   493,   494,   495,   496,   497,   498,   499,
      500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
-      -1,    -1,    -1,   513,   514,   515,    -1,   517,   518,   519,
-     520,   521,   522,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
-      -1,    84,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,    -1,    -1,    -1,
-     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
-      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
-      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      16,    -1,   532,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
       -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    84,    -1,
-      -1,    -1,    -1,    -1,    -1,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+      66,    -1,    68,    69,    70,    71,    -1,    -1,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+      -1,    -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,    -1,   128,   129,   130,   131,   132,   133,   134,   135,
      136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
-     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
+     166,   167,    -1,   169,   170,   171,   172,   173,   174,   175,
      176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
      186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     196,   197,    -1,   199,   200,   201,   202,   203,    -1,   205,
      206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     216,   217,   218,   219,   220,   221,   222,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
      236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
-     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
-     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
-     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
-     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
+     266,    -1,   268,   269,   270,   271,   272,    -1,   274,    -1,
+     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,   290,   291,   292,    -1,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
      326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,   343,   344,   345,
      346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
      356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
      366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
      376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
      396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
-     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
      426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
       -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
-      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
+     466,   467,   468,   469,   470,   471,    -1,   473,   474,   475,
+     476,   477,   478,   479,   480,   481,   482,   483,   484,   485,
      486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
      496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,    -1,    -1,    -1,   513,   514,   515,
-      -1,   517,   518,   519,   520,   521,   522,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    -1,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    -1,    41,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
-     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
-     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
-     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
-     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
-     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
-     338,   339,   340,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
-     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
-     448,   449,   450,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,   464,   465,   466,   467,
-     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
-     478,   479,   480,   481,   482,   483,   484,   485,   486,   487,
-     488,   489,   490,   491,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,   519,    15,    16,    -1,    -1,    19,    20,    21,    22,
+     506,   507,   508,   509,   510,    -1,    -1,    -1,    -1,    -1,
+      -1,   517,   518,   519,    -1,    -1,    -1,    -1,    -1,    -1,
+     526,   527,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    -1,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    -1,    41,    42,
+      43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
+      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    64,    -1,    66,    -1,    68,    69,    70,    71,    -1,
+      -1,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
+     103,   104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,
+     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
+     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
+     133,   134,   135,   136,   137,   138,   139,    -1,   141,   142,
+     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
+     153,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
+     163,    -1,   165,   166,   167,    -1,   169,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
+      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
+     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
+     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
+     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
+     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
+     243,   244,    -1,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
+      -1,   264,   265,   266,    -1,   268,   269,   270,   271,   272,
+      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
+      -1,   294,   295,   296,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,   329,   330,   331,    -1,
+     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
+      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
+     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
+     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
+     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
+     433,   434,    -1,   436,   437,   438,   439,   440,   441,   442,
+     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,   466,   467,   468,   469,   470,   471,    -1,
+     473,   474,   475,   476,   477,   478,   479,    -1,   481,   482,
+     483,   484,   485,   486,    -1,    -1,   489,    -1,   491,   492,
+     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
+     503,   504,   505,   506,   507,   508,   509,   510,    -1,   512,
+      -1,    -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   526,   527,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    71,    -1,    -1,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+     110,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,    -1,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
+     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,   165,   166,   167,    -1,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,   265,   266,    -1,   268,   269,
+     270,   271,   272,    -1,   274,    -1,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+     290,   291,   292,    -1,   294,   295,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,   343,   344,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,   456,   457,   458,   459,
+     460,   461,   462,   463,    -1,   465,   466,   467,   468,   469,
+     470,   471,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+     510,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   526,   527,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      -1,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    -1,    41,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    71,    -1,    -1,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      -1,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,   153,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,   233,    -1,   235,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
+      -1,   268,   269,   270,   271,   272,    -1,   274,    -1,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,   290,   291,   292,    -1,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
+     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,   440,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,   466,
+     467,   468,   469,   470,   471,    -1,   473,   474,   475,   476,
+     477,   478,   479,    -1,   481,   482,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,   510,    -1,    -1,    -1,    -1,    -1,    -1,
+     517,   518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,
+     527,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    -1,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    -1,    41,    42,    43,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,
+     114,    -1,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,    -1,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,   147,    -1,   149,   150,   151,   152,   153,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,   165,   166,   167,    -1,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
+      -1,   235,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,   265,   266,    -1,   268,   269,   270,   271,   272,    -1,
+     274,    -1,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,   290,   291,   292,    -1,
+     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,   343,
+     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,   392,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,   411,   412,   413,
+     414,   415,   416,   417,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,   440,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,   466,   467,   468,   469,   470,   471,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,   482,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,   510,    -1,    -1,    -1,
+      -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   526,   527,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
+      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
+      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
+     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
+     121,    -1,   123,   124,   125,   126,    -1,   128,   129,   130,
+     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+     141,   142,   143,   144,    -1,    -1,   147,    -1,   149,   150,
+     151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
+     161,   162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,
+      -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,   180,
+     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
+     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
+     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
+     211,    -1,   213,   214,   215,   216,    -1,   218,   219,   220,
+      -1,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
+      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
+      -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,    -1,   264,   265,   266,    -1,   268,   269,   270,
+     271,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,    -1,    -1,   288,    -1,   290,
+     291,   292,    -1,   294,   295,   296,    -1,    -1,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,   314,   315,   316,   317,   318,    -1,    -1,
+     321,   322,   323,   324,    -1,    -1,   327,   328,   329,   330,
+     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
+     341,   342,   343,   344,   345,    -1,   347,   348,   349,   350,
+     351,   352,   353,    -1,   355,   356,    -1,   358,    -1,   360,
+     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
+     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
+     391,   392,   393,   394,   395,    -1,   397,   398,   399,   400,
+     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
+      -1,   412,   413,   414,   415,   416,   417,   418,   419,   420,
+     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
+     431,   432,   433,    -1,    -1,   436,   437,    -1,   439,   440,
+     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
+     451,   452,    -1,   454,    -1,    -1,   457,   458,   459,   460,
+     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
+      -1,    -1,   473,   474,   475,   476,   477,    -1,   479,   480,
+     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
+      -1,   492,   493,   494,   495,   496,   497,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,    -1,
+      -1,    -1,    -1,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,   527,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    -1,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    -1,    41,
+      42,    43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
+      -1,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,    -1,    -1,   147,    -1,   149,   150,   151,
+     152,   153,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,
+     172,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,    -1,   218,   219,   220,    -1,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,   233,    -1,   235,   236,   237,   238,    -1,   240,    -1,
+      -1,    -1,   244,    -1,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     262,    -1,   264,   265,   266,    -1,   268,   269,   270,   271,
+     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,    -1,    -1,   288,    -1,   290,   291,
+     292,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,   315,   316,   317,   318,    -1,    -1,   321,
+     322,   323,   324,    -1,    -1,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,    -1,   358,    -1,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+     392,   393,   394,   395,    -1,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,    -1,    -1,   436,   437,    -1,   439,   440,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,    -1,   454,    -1,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,    -1,   479,   480,   481,
+     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   507,   508,   509,    -1,    -1,
+      -1,    -1,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    -1,   527,    19,    20,    21,    22,
       23,    24,    25,    26,    27,    28,    29,    -1,    31,    32,
       33,    34,    35,    36,    37,    38,    39,    -1,    41,    42,
       43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
       -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    64,    -1,    66,    -1,    68,    69,    70,    71,    -1,
+      -1,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,   118,   119,   120,   121,    -1,
+     103,   104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,
+     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
      123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,    -1,    -1,   147,    -1,   149,   150,   151,   152,
+     133,   134,   135,   136,   137,   138,   139,    -1,   141,   142,
+     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
      153,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,   172,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
+     163,    -1,   165,   166,   167,    -1,   169,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
       -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
      203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,    -1,   218,   219,   220,    -1,    -1,
+     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
      223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-     233,    -1,   235,   236,   237,   238,    -1,   240,    -1,    -1,
-      -1,   244,    -1,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
+     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
+     243,   244,    -1,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
       -1,   264,   265,   266,    -1,   268,   269,   270,   271,   272,
       -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,    -1,    -1,   288,    -1,   290,   291,   292,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,    -1,    -1,   321,   322,
-     323,   324,    -1,    -1,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,   340,   341,   342,
-     343,   344,   345,    -1,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,    -1,   358,    -1,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
-     393,   394,   395,    -1,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,    -1,    -1,   436,   437,    -1,   439,   440,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-      -1,   454,    -1,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,    -1,   479,   480,   481,   482,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   507,   508,   509,    -1,     6,     7,
-       8,     9,    10,    11,    12,    13,   519,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
-      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
-      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
-      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
-     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
-      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
-     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
-      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
-      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
-     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
-     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
-     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
-     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
-     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,    -1,     6,     7,     8,     9,    10,    11,    12,
-      13,   519,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
+     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
+      -1,   294,   295,   296,   297,   298,   299,   300,   301,   302,
      303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
+     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,   329,   330,   331,    -1,
      333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
      353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
       -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
      373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
+     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
      393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
      423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
+     433,   434,    -1,   436,   437,   438,   439,   440,   441,   442,
      443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,   466,   467,   468,   469,   470,   471,    -1,
+     473,   474,   475,   476,   477,   478,   479,    -1,   481,   482,
+     483,   484,   485,   486,    -1,    -1,   489,    -1,   491,   492,
      493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,    -1,     6,     7,
-       8,     9,    10,    11,    12,    13,   519,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
-      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
-      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
-      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
-      68,    69,    70,    71,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    -1,    -1,    -1,    -1,    -1,    85,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,   104,   105,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
-      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
-     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
-      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
-     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,    -1,   234,    -1,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-     248,   249,   250,    -1,   252,   253,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
-     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
-      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
-      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
-     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
-     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
-     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
-     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
-     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
-     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
-     508,   509,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   517,
-     518,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+     503,   504,   505,   506,   507,   508,   509,   510,    -1,   512,
+      -1,    -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   526,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
+      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
+      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
+      71,    -1,    -1,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
+     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,   110,
+      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
+     121,   122,   123,   124,   125,   126,    -1,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,   137,   138,   139,    -1,
+     141,   142,   143,   144,   145,    -1,   147,    -1,   149,   150,
+     151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
+     161,   162,   163,    -1,   165,   166,   167,    -1,   169,   170,
+     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
+     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
+     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
+     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
+     221,   222,   223,    -1,   225,   226,   227,   228,    -1,   230,
+      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
+     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
+     261,   262,    -1,   264,   265,   266,    -1,   268,   269,   270,
+     271,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,    -1,    -1,   288,   289,   290,
+     291,   292,    -1,   294,   295,   296,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
+     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
+     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
+     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
+     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
+     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
+     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
+     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
+     431,   432,   433,   434,    -1,   436,   437,   438,   439,   440,
+     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
+     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,   466,   467,   468,   469,   470,
+     471,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
+     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
+     491,   492,   493,   494,   495,   496,   497,   498,   499,   500,
+     501,   502,   503,   504,   505,   506,   507,   508,   509,   510,
+      -1,   512,    -1,    -1,    -1,    -1,   517,   518,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   526,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    -1,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,
+      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
+      69,    70,    71,    -1,    -1,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
+      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
+      -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,   118,
+     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     139,    -1,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     149,   150,   151,   152,   153,   154,   155,   156,    -1,   158,
+     159,   160,   161,   162,   163,    -1,   165,   166,   167,    -1,
+     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
+     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
+     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
+     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
+     219,   220,   221,   222,   223,    -1,   225,   226,   227,   228,
+      -1,   230,    -1,   232,   233,   234,   235,   236,   237,   238,
+      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
+     249,   250,   251,   252,   253,   254,   255,    -1,   257,   258,
+     259,   260,   261,   262,    -1,   264,   265,   266,    -1,   268,
+     269,   270,   271,   272,    -1,   274,    -1,   276,   277,   278,
+     279,   280,   281,   282,   283,   284,   285,    -1,   287,   288,
+     289,   290,   291,   292,    -1,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
+      -1,    -1,   341,   342,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
+     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
+     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
+      -1,   390,   391,   392,   393,   394,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
+     409,   410,   411,   412,   413,   414,   415,   416,   417,   418,
+     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
+     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
+     439,   440,   441,   442,   443,   444,   445,    -1,   447,   448,
+      -1,   450,   451,   452,   453,   454,   455,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,   465,   466,   467,   468,
+     469,   470,   471,    -1,   473,   474,   475,   476,   477,   478,
+     479,    -1,   481,   482,   483,   484,   485,   486,    -1,    -1,
+     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
+     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
+     509,   510,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      -1,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    -1,    41,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    71,    -1,    -1,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      -1,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,   153,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,   233,    -1,   235,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
+      -1,   268,   269,   270,   271,   272,    -1,   274,    -1,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,   290,   291,   292,    -1,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
+     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,   440,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,   466,
+     467,   468,   469,   470,   471,    -1,   473,   474,   475,   476,
+     477,   478,   479,    -1,   481,   482,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,   510,    -1,    -1,    -1,    -1,    -1,    -1,
+     517,   518,    -1,    -1,    -1,    -1,    -1,   524,   525,   526,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
       15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
       45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
       55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      85,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
+      -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
+     105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,   114,
+      -1,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,    -1,   128,   129,   130,   131,   132,   133,   134,
      135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
+     145,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
      155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     165,   166,   167,    -1,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
       -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
      195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
      205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,   234,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
+     265,   266,    -1,   268,   269,   270,   271,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,   289,   290,   291,   292,    -1,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
      355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
      395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
+      -1,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   517,   518,     6,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
-      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
-      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
-      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
-      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    71,
-      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
-      -1,    -1,    -1,    85,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
-     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
-     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
-     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
-     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
-     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
-     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
-     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
-      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
-      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
-     232,    -1,   234,    -1,   236,   237,   238,    -1,   240,   241,
-      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
-     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
-     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
-     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
-      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
-     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
-      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
-     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
-     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
-     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
-     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
-      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
-     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
-      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
-     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
-     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
-     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
-      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
-      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
-     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
-     502,   503,   504,   505,   506,   507,   508,   509,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   517,   518,     6,     7,     8,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,   466,   467,   468,   469,   470,   471,    -1,   473,   474,
+     475,   476,   477,   478,   479,    -1,   481,   482,   483,   484,
+     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,   510,    -1,    -1,    -1,    -1,
+      -1,    -1,   517,   518,   519,    -1,    -1,    -1,    -1,    -1,
+      -1,   526,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    -1,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    -1,    41,    42,
+      43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
+      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    64,    -1,    66,    -1,    68,    69,    70,    71,    -1,
+      -1,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
+     103,   104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,
+     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
+     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
+     133,   134,   135,   136,   137,   138,   139,    -1,   141,   142,
+     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
+     153,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
+     163,    -1,   165,   166,   167,    -1,   169,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
+      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
+     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
+     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
+     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
+     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
+     243,   244,    -1,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
+      -1,   264,   265,   266,    -1,   268,   269,   270,   271,   272,
+      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
+      -1,   294,   295,   296,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,   329,   330,   331,    -1,
+     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
+      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
+     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
+     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,    -1,   406,   407,   408,   409,   410,   411,   412,
+     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
+     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
+     433,   434,    -1,   436,   437,    -1,   439,   440,   441,   442,
+     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,   466,   467,   468,   469,   470,   471,    -1,
+     473,   474,   475,   476,   477,   478,   479,    -1,   481,   482,
+     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
+     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
+     503,   504,   505,   506,   507,   508,   509,   510,    -1,    -1,
+      -1,    -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   526,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
+      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
+      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
+      71,    -1,    -1,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,   110,
+      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
+     121,   122,   123,   124,   125,   126,    -1,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,   137,   138,   139,    -1,
+     141,   142,   143,   144,   145,    -1,   147,    -1,   149,   150,
+     151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
+     161,   162,   163,    -1,   165,   166,   167,    -1,   169,   170,
+     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
+     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
+     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
+     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
+     221,   222,   223,    -1,   225,   226,   227,   228,    -1,   230,
+      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
+     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
+     261,   262,    -1,   264,   265,   266,    -1,   268,   269,   270,
+     271,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,    -1,    -1,   288,   289,   290,
+     291,   292,    -1,   294,   295,   296,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
+     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
+     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
+     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
+     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
+     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
+     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
+     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
+     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
+     431,   432,   433,   434,    -1,   436,   437,    -1,   439,   440,
+     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
+     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,   466,   467,   468,   469,   470,
+     471,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
+     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
+      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
+     501,   502,   503,   504,   505,   506,   507,   508,   509,   510,
+      -1,    -1,    -1,    -1,    -1,    -1,   517,   518,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   526,     5,     6,     7,     8,
        9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    -1,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,
       49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    71,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    85,    -1,    -1,    -1,
+      69,    70,    71,    -1,    -1,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
+      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
+      -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,   118,
+     119,   120,   121,   122,   123,   124,   125,   126,    -1,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     139,    -1,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     149,   150,   151,   152,   153,   154,   155,   156,    -1,   158,
+     159,   160,   161,   162,   163,    -1,   165,   166,   167,    -1,
+     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
      179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
      189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
      199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
      209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,   234,    -1,   236,   237,   238,
+     219,   220,   221,   222,   223,    -1,   225,   226,   227,   228,
+      -1,   230,    -1,   232,   233,   234,   235,   236,   237,   238,
       -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
+     249,   250,   251,   252,   253,   254,   255,    -1,   257,   258,
+     259,   260,   261,   262,    -1,   264,   265,   266,    -1,   268,
+     269,   270,   271,   272,    -1,   274,    -1,   276,   277,   278,
+     279,   280,   281,   282,   283,   284,   285,    -1,    -1,   288,
+     289,   290,   291,   292,    -1,   294,   295,   296,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
      329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
+      -1,    -1,   341,   342,   343,   344,   345,   346,   347,   348,
      349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
      359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
      369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
      379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
+      -1,   390,   391,   392,   393,   394,   395,   396,   397,   398,
      399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
+     409,   410,   411,   412,   413,   414,   415,   416,   417,   418,
      419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
      429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
+     439,   440,   441,   442,   443,   444,   445,    -1,   447,   448,
+      -1,    -1,   451,   452,   453,   454,   455,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,   465,   466,   467,   468,
+     469,   470,   471,    -1,   473,   474,   475,   476,   477,   478,
+     479,    -1,   481,   482,   483,   484,   485,   486,    -1,    -1,
      489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
      499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
-      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
-      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    71,    -1,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
-     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
-     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
-     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
-     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
-     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
-     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
-     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
-      -1,   447,   448,   449,    -1,   451,   452,   453,   454,   455,
-      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,    -1,    -1,    -1,    -1,     4,   515,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
-      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
-      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
-     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
-     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
-     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
-     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
-     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
-     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
-     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
-      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
-      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    74,    75,    76,    77,    78,    79,    80,
-      81,    -1,    -1,    -1,    85,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
-     351,   352,   353,   354,   355,   356,   357,   358,   359,   360,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
-     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
-     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
-     441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,   478,   479,   480,
-     481,   482,   483,   484,   485,   486,   487,   488,   489,   490,
-     491,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
-     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
-     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
-     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
-     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,   332,   333,   334,   335,
-     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,   354,   355,
-     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
-     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,   435,
-     436,   437,   438,   439,   440,   441,   442,   443,   444,   445,
-     446,   447,   448,   449,   450,   451,   452,   453,   454,   455,
-     456,   457,   458,   459,   460,   461,   462,   463,   464,   465,
-     466,   467,   468,   469,   470,   471,   472,   473,   474,   475,
-     476,   477,   478,   479,   480,   481,   482,   483,   484,   485,
-     486,   487,   488,   489,   490,   491,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,     5,     6,     7,     8,     9,    10,
+     509,   510,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      -1,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    -1,    41,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    71,    -1,    -1,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      -1,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,   153,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,   233,    -1,   235,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
+      -1,   268,   269,   270,   271,   272,    -1,   274,    -1,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,   290,   291,   292,    -1,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
+     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,   440,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,   466,
+     467,   468,   469,   470,   471,    -1,   473,   474,   475,   476,
+     477,   478,   479,   480,   481,   482,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,   510,    -1,    -1,    -1,    -1,    -1,    -1,
+     517,   518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
+      -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
+     105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,   114,
+      -1,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,    -1,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
+     145,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
+     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
+     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
+     265,   266,    -1,   268,   269,   270,   271,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,   289,   290,   291,   292,    -1,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+      -1,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,   466,   467,   468,   469,   470,   471,    -1,   473,   474,
+     475,   476,   477,   478,   479,    -1,   481,   482,   483,   484,
+     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,   510,    -1,    -1,    -1,    -1,
+      -1,    -1,   517,   518,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   526,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    -1,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    -1,    41,    42,
+      43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
+      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    64,    -1,    66,    -1,    68,    69,    70,    71,    -1,
+      -1,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
+     103,   104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,
+     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
+     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
+     133,   134,   135,   136,   137,   138,   139,    -1,   141,   142,
+     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
+     153,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
+     163,    -1,   165,   166,   167,   168,   169,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
+      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
+     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
+     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
+     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
+     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
+     243,   244,    -1,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
+      -1,   264,   265,   266,    -1,   268,   269,   270,   271,   272,
+      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
+      -1,   294,   295,   296,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,   329,   330,   331,    -1,
+     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
+      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
+     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
+     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,    -1,   406,   407,   408,   409,   410,   411,   412,
+     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
+     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
+     433,   434,    -1,   436,   437,    -1,   439,   440,   441,   442,
+     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,   466,   467,   468,   469,   470,   471,    -1,
+     473,   474,   475,   476,   477,   478,   479,    -1,   481,   482,
+     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
+     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
+     503,   504,   505,   506,   507,   508,   509,   510,    -1,    -1,
+      -1,    -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   526,     5,     6,     7,     8,     9,    10,
       11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
       21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
       31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
       41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
       -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      71,    -1,    -1,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
+     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,   110,
+      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
+     121,   122,   123,   124,   125,   126,    -1,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,   137,   138,   139,    -1,
+     141,   142,   143,   144,   145,    -1,   147,    -1,   149,   150,
+     151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
+     161,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
+     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
+     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
+     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
+     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
+     221,   222,   223,    -1,   225,   226,   227,   228,    -1,   230,
+      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
+     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
+     261,   262,    -1,   264,   265,   266,    -1,   268,   269,   270,
+     271,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,    -1,    -1,   288,   289,   290,
+     291,   292,    -1,   294,   295,   296,   297,   298,   299,   300,
      301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
      311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
-     351,   352,   353,   354,   355,   356,   357,   358,   359,   360,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
-     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
-     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
-     441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,   478,   479,   480,
-     481,   482,   483,   484,   485,   486,   487,   488,   489,   490,
-     491,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,   134,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,   290,   291,   292,    -1,   294,   295,
-     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,    -1,   321,   322,   323,   324,    -1,
-     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
-      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,   471,    -1,   473,   474,   475,
-     476,   477,   478,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,     5,     6,     7,     8,     9,    10,
+     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
+     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
+     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
+     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
+     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
+     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
+     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
+     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
+     431,   432,   433,   434,    -1,   436,   437,    -1,   439,   440,
+     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
+     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,   466,   467,   468,   469,   470,
+     471,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
+     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
+      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
+     501,   502,   503,   504,   505,   506,   507,   508,   509,   510,
+      -1,    -1,    -1,    -1,    -1,    -1,   517,   518,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   526,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    -1,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,
+      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
+      69,    70,    71,    -1,    -1,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
+      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
+      -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,   118,
+     119,   120,   121,   122,   123,   124,   125,   126,    -1,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     139,    -1,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     149,   150,   151,   152,   153,   154,   155,   156,    -1,   158,
+     159,   160,   161,   162,   163,    -1,   165,   166,   167,    -1,
+     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
+     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
+     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
+     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
+     219,   220,   221,   222,   223,    -1,   225,   226,   227,   228,
+      -1,   230,    -1,   232,   233,    -1,   235,   236,   237,   238,
+      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
+     249,   250,   251,   252,   253,   254,   255,    -1,   257,   258,
+     259,   260,   261,   262,    -1,   264,   265,   266,    -1,   268,
+     269,   270,   271,   272,    -1,   274,    -1,   276,   277,   278,
+     279,   280,   281,   282,   283,   284,   285,    -1,    -1,   288,
+     289,   290,   291,   292,    -1,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
+      -1,    -1,   341,   342,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
+     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
+     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
+      -1,   390,   391,   392,   393,   394,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
+     409,   410,   411,   412,   413,   414,   415,   416,   417,   418,
+     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
+     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
+     439,   440,   441,   442,   443,   444,   445,    -1,   447,   448,
+      -1,    -1,   451,   452,   453,   454,   455,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,   465,   466,   467,   468,
+     469,   470,   471,    -1,   473,   474,   475,   476,   477,   478,
+     479,    -1,   481,   482,   483,   484,   485,   486,    -1,    -1,
+     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
+     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
+     509,   510,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      -1,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    -1,    41,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    71,    -1,    -1,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      -1,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,   153,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,   233,    -1,   235,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
+      -1,   268,   269,   270,   271,   272,    -1,   274,    -1,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,   290,   291,   292,    -1,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
+     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,   440,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,   466,
+     467,   468,   469,   470,   471,    -1,   473,   474,   475,   476,
+     477,   478,   479,    -1,   481,   482,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,   510,    -1,    -1,    -1,    -1,    -1,    -1,
+     517,   518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
+      -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
+     105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,   114,
+      -1,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,    -1,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
+     145,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
+     165,   166,   167,    -1,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
+     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
+     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
+     265,   266,    -1,   268,   269,   270,   271,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,   289,   290,   291,   292,    -1,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+      -1,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,   466,   467,   468,   469,   470,   471,    -1,   473,   474,
+     475,   476,   477,   478,   479,    -1,   481,   482,   483,   484,
+     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,   510,    -1,    -1,    -1,    -1,
+      -1,    -1,   517,   518,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   526,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    -1,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    -1,    41,    42,
+      43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
+      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    64,    -1,    66,    -1,    68,    69,    70,    71,    -1,
+      -1,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
+     103,   104,   105,    -1,    -1,    -1,    -1,   110,    -1,    -1,
+     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
+     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
+     133,   134,   135,   136,   137,   138,   139,    -1,   141,   142,
+     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
+     153,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
+     163,    -1,   165,   166,   167,    -1,   169,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
+      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
+     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
+     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
+     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
+     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
+     243,   244,    -1,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
+      -1,   264,   265,   266,    -1,   268,   269,   270,   271,   272,
+      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
+      -1,   294,   295,   296,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,   329,   330,   331,    -1,
+     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
+      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
+     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
+     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,    -1,   406,   407,   408,   409,   410,   411,   412,
+     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
+     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
+     433,   434,    -1,   436,   437,    -1,   439,   440,   441,   442,
+     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,   466,   467,   468,   469,   470,   471,    -1,
+     473,   474,   475,   476,   477,   478,   479,    -1,   481,   482,
+     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
+     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
+     503,   504,   505,   506,   507,   508,   509,   510,    -1,    -1,
+      -1,    -1,    -1,    -1,   517,   518,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   526,     5,     6,     7,     8,     9,    10,
       11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
       21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
       31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
       41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
       -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      71,    -1,    -1,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
+     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,   110,
       -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
      121,   122,   123,   124,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+     131,   132,   133,   134,   135,   136,   137,   138,   139,    -1,
      141,   142,   143,   144,   145,    -1,   147,    -1,   149,   150,
      151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,
-      -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,   180,
+     161,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
      181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
      191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
      201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
      211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
+     221,   222,   223,    -1,   225,   226,   227,   228,    -1,   230,
       -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
      241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
      251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
      261,   262,    -1,   264,   265,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
+     271,   272,    -1,   274,    -1,   276,    -1,    -1,   279,   280,
      281,   282,   283,   284,   285,    -1,    -1,   288,   289,   290,
-     291,   292,    -1,   294,   295,   296,    -1,    -1,   299,   300,
+     291,   292,    -1,   294,   295,   296,   297,   298,   299,   300,
      301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,    -1,
-     321,   322,   323,   324,    -1,   326,   327,   328,   329,   330,
+     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
+     321,   322,    -1,   324,   325,   326,   327,   328,   329,   330,
      331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
      341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
      351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
@@ -22679,68 +20568,379 @@
      381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
      391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
      401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,   417,   418,   419,   420,
+     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
      421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
      431,   432,   433,   434,    -1,   436,   437,    -1,   439,   440,
      441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
+     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,   466,   467,   468,   469,   470,
+     471,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
      481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
       -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,   290,   291,   292,    -1,   294,   295,
-     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,    -1,   321,   322,   323,   324,    -1,
-     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
-      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,   478,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
+     501,   502,   503,   504,   505,   506,   507,   508,   509,   510,
+      -1,    -1,    -1,    -1,    -1,    -1,   517,   518,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   526,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    -1,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,
+      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
+      69,    70,    71,    -1,    -1,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
+      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
+      -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,   118,
+     119,   120,   121,   122,   123,   124,   125,   126,    -1,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     139,    -1,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     149,   150,   151,   152,   153,   154,   155,   156,    -1,   158,
+     159,   160,   161,   162,   163,    -1,   165,   166,   167,    -1,
+     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
+     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
+     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
+     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
+     219,   220,   221,   222,   223,    -1,   225,   226,   227,   228,
+      -1,   230,    -1,   232,   233,    -1,   235,   236,   237,   238,
+      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
+     249,   250,   251,   252,   253,   254,   255,    -1,   257,   258,
+     259,   260,   261,   262,    -1,   264,   265,   266,    -1,   268,
+     269,   270,   271,   272,    -1,   274,    -1,   276,   277,   278,
+     279,   280,   281,   282,   283,   284,   285,    -1,    -1,   288,
+     289,   290,   291,   292,    -1,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,    -1,   321,   322,   323,   324,   325,   326,   327,   328,
+     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
+      -1,    -1,   341,   342,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
+     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
+     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
+      -1,   390,   391,   392,   393,   394,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
+     409,   410,   411,   412,   413,   414,   415,   416,   417,   418,
+     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
+     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
+     439,   440,   441,   442,   443,   444,   445,    -1,   447,   448,
+      -1,    -1,   451,   452,   453,   454,   455,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
+     469,   470,   471,    -1,   473,   474,   475,   476,   477,   478,
+     479,    -1,   481,   482,   483,   484,   485,   486,    -1,    -1,
+     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
+     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
+     509,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      -1,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    -1,    41,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    71,    -1,    -1,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      -1,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,   153,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,   233,    -1,   235,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
+      -1,   268,   269,   270,   271,   272,    -1,   274,    -1,   276,
+      -1,   278,   279,   280,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,   290,   291,   292,    -1,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,   321,   322,   323,   324,   325,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
+     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,   440,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
+     467,   468,   469,   470,   471,    -1,   473,   474,   475,   476,
+     477,   478,   479,    -1,   481,   482,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     517,   518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
+      -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    -1,
+      85,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
+     105,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,   114,
+      -1,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,    -1,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
+     145,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
+     165,   166,   167,    -1,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
+     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
+     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
+     265,   266,    -1,   268,   269,   270,   271,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,   289,   290,   291,   292,    -1,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,    -1,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+      -1,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+      -1,   466,   467,   468,   469,   470,   471,    -1,   473,   474,
+     475,   476,   477,   478,   479,    -1,   481,   482,   483,   484,
+     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,    -1,    -1,    -1,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      -1,   526,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    -1,    41,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    71,    -1,    -1,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    -1,    85,    86,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,   110,    -1,    -1,   113,   114,    -1,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      -1,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,   153,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,   233,    -1,   235,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
+      -1,   268,   269,   270,   271,   272,    -1,   274,    -1,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,   290,   291,   292,    -1,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,   321,   322,   323,   324,   325,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
+     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,   440,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
+     467,   468,   469,   470,   471,    -1,   473,   474,   475,   476,
+     477,   478,   479,    -1,   481,   482,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,    -1,    -1,    -1,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    -1,    15,    16,    -1,   526,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    -1,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,
+      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
+      69,    70,    71,    -1,    -1,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
+      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
+      -1,   110,    -1,    -1,   113,   114,    -1,   116,   117,   118,
+     119,   120,   121,    -1,   123,   124,   125,   126,    -1,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     139,    -1,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     149,   150,   151,   152,   153,   154,   155,   156,    -1,   158,
+     159,   160,   161,   162,   163,    -1,   165,   166,   167,    -1,
+     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
+     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
+     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
+     209,    -1,   211,    -1,   213,   214,   215,   216,   217,   218,
+     219,   220,   221,   222,   223,    -1,   225,   226,   227,   228,
+      -1,   230,    -1,   232,   233,    -1,   235,   236,   237,   238,
+      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
+     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
+     259,   260,   261,   262,    -1,   264,   265,   266,    -1,   268,
+     269,   270,   271,   272,    -1,   274,    -1,   276,    -1,    -1,
+     279,   280,   281,   282,   283,   284,   285,    -1,    -1,   288,
+     289,   290,   291,    -1,    -1,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,   320,   321,   322,    -1,   324,   325,   326,   327,   328,
+     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
+      -1,    -1,   341,   342,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
+     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
+     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
+      -1,   390,   391,   392,   393,   394,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
+     409,   410,   411,   412,   413,   414,   415,   416,    -1,   418,
+     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
+     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
+     439,   440,   441,   442,   443,   444,   445,    -1,   447,   448,
+      -1,    -1,   451,   452,   453,   454,   455,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,   465,   466,   467,   468,
+     469,   470,   471,    -1,   473,   474,   475,   476,   477,   478,
+     479,    -1,   481,   482,   483,   484,   485,   486,    -1,    -1,
+     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
+     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
+     509,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   517,   518,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   526,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      -1,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    -1,    41,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      -1,   128,   129,   130,   131,   132,    -1,   134,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,   153,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,   233,    -1,   235,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
+      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+      -1,   288,   289,   290,   291,   292,    -1,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,   321,   322,   323,   324,    -1,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,   335,   336,
+     337,   338,    -1,    -1,   341,   342,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,   438,   439,   440,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
+     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
+     467,   468,   469,   470,   471,    -1,   473,   474,   475,   476,
+     477,   478,   479,    -1,   481,   482,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,   491,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,    -1,    -1,   512,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    -1,    15,    16,    -1,   526,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    -1,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,
+      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
+      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
+      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
+      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,
+     119,   120,   121,   122,   123,   124,   125,   126,    -1,   128,
+     129,   130,   131,   132,    -1,   134,   135,   136,   137,   138,
+     139,    -1,   141,   142,   143,   144,   145,    -1,   147,    -1,
+     149,   150,   151,   152,   153,   154,   155,   156,    -1,   158,
+     159,   160,   161,   162,   163,    -1,   165,   166,   167,    -1,
+     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
+     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
+     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
+     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
+     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
+      -1,   230,    -1,   232,   233,    -1,   235,   236,   237,   238,
+      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
+     249,   250,   251,   252,   253,   254,   255,    -1,   257,   258,
+     259,   260,   261,   262,    -1,   264,   265,   266,    -1,   268,
+     269,   270,    -1,   272,    -1,   274,    -1,   276,   277,   278,
+     279,   280,   281,   282,   283,   284,   285,   286,    -1,   288,
+     289,   290,   291,   292,    -1,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,    -1,   321,   322,   323,   324,    -1,   326,   327,   328,
+     329,   330,   331,    -1,   333,    -1,   335,   336,   337,   338,
+      -1,    -1,   341,   342,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
+     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
+     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
+      -1,   390,   391,   392,   393,   394,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
+     409,   410,   411,   412,   413,   414,   415,   416,   417,   418,
+     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
+     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
+     439,   440,   441,   442,   443,   444,   445,    -1,   447,   448,
+      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
+     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
+     469,   470,   471,    -1,   473,   474,   475,   476,   477,   478,
+     479,    -1,   481,   482,   483,   484,   485,   486,    -1,    -1,
+     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
+     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
+     509,    -1,    -1,    -1,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    -1,    15,    16,    -1,   526,    19,    20,
       21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
       31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
       41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
@@ -22752,11 +20952,11 @@
      101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
      121,   122,   123,   124,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+     131,   132,    -1,   134,   135,   136,   137,   138,   139,    -1,
      141,   142,   143,   144,   145,    -1,   147,    -1,   149,   150,
      151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,
-      -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,   180,
+     161,   162,   163,    -1,   165,   166,   167,    -1,   169,   170,
+     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
      181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
      191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
      201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
@@ -22768,7 +20968,7 @@
      261,   262,    -1,   264,   265,   266,    -1,   268,   269,   270,
       -1,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
      281,   282,   283,   284,   285,    -1,    -1,   288,   289,   290,
-     291,   292,    -1,   294,   295,   296,    -1,    -1,   299,   300,
+     291,   292,    -1,   294,   295,   296,   297,   298,   299,   300,
      301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
      311,   312,   313,   314,   315,   316,   317,   318,   319,    -1,
      321,   322,   323,   324,    -1,   326,   327,   328,   329,   330,
@@ -22780,323 +20980,376 @@
      381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
      391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
      401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,   417,   418,   419,   420,
+     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
      421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
      431,   432,   433,   434,    -1,   436,   437,    -1,   439,   440,
      441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
      451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
      461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
+     471,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
      481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
       -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,    -1,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,    -1,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,    -1,   218,   219,   220,    -1,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,    -1,    -1,    -1,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-     256,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-     266,    -1,   268,   269,   270,   271,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,    -1,   290,   291,   292,    -1,   294,   295,
-     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,    -1,    -1,   321,   322,   323,   324,    -1,
-      -1,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,   343,   344,   345,
-      -1,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,    -1,   358,    -1,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-      -1,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,    -1,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,    -1,   454,    -1,
-      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,    -1,   479,   480,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   507,   508,   509,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
-      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
-     121,    -1,   123,   124,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,    -1,    -1,   147,    -1,   149,   150,
-     151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,
-      -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,    -1,   218,   219,   220,
-      -1,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
-      -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,   265,    -1,    -1,   268,   269,   270,
-     271,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,    -1,    -1,   288,    -1,   290,
-     291,   292,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,    -1,    -1,
-     321,   322,   323,   324,   325,    -1,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,    -1,   343,   344,   345,    -1,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,    -1,   358,    -1,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,   392,   393,   394,   395,    -1,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,   417,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,    -1,    -1,   436,   437,   438,   439,   440,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,    -1,   454,    -1,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,    -1,   479,    -1,
-     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,    -1,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,    -1,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,    -1,   218,   219,   220,    -1,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,    -1,    -1,    -1,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-      -1,    -1,   268,   269,   270,   271,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,    -1,   290,   291,   292,    -1,   294,   295,
-     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,    -1,   321,   322,   323,   324,    -1,
-      -1,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,    -1,   343,   344,   345,
-      -1,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,    -1,   358,    -1,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-      -1,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,    -1,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,    -1,   454,    -1,
-      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,    -1,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   507,   508,   509,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
-      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+     501,   502,   503,   504,   505,   506,   507,   508,   509,    -1,
+      -1,    -1,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    -1,   526,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    -1,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    -1,    41,    42,
+      43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
+      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
-     121,    -1,   123,   124,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,    -1,    -1,   147,    -1,   149,   150,
-     151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,
-      -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,    -1,   218,   219,   220,
-      -1,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
-      -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,   265,    -1,    -1,   268,   269,   270,
-     271,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,    -1,    -1,   288,    -1,   290,
-     291,   292,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,    -1,
-     321,   322,   323,   324,    -1,    -1,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,    -1,   343,   344,   345,    -1,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,    -1,   358,    -1,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,   392,   393,   394,   395,    -1,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,   417,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,    -1,    -1,   436,   437,    -1,   439,   440,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,    -1,   454,    -1,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,    -1,   479,    -1,
-     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,    -1,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,    -1,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,    -1,   218,   219,   220,    -1,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,    -1,    -1,    -1,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-      -1,    -1,   268,   269,   270,   271,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,    -1,   290,   291,   292,    -1,   294,   295,
-     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,    -1,    -1,   321,   322,   323,   324,    -1,
-      -1,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,    -1,   343,   344,   345,
-      -1,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,    -1,   358,    -1,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-      -1,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,    -1,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,    -1,   454,    -1,
-      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,    -1,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   507,   508,   509,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
-      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
+     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
+     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
+      -1,   134,   135,   136,   137,   138,   139,    -1,   141,   142,
+     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
+     153,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
+     163,    -1,   165,   166,   167,    -1,   169,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
+      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
+     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
+     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
+     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
+     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
+     243,   244,    -1,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
+      -1,   264,   265,   266,    -1,   268,   269,   270,    -1,   272,
+      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
+      -1,   294,   295,   296,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,   317,   318,   319,    -1,   321,   322,
+     323,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
+     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
+      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
+     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
+     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,    -1,   406,   407,   408,   409,   410,   411,   412,
+     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
+     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
+     433,   434,    -1,   436,   437,    -1,   439,   440,   441,   442,
+     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
+     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
+     463,    -1,    -1,   466,   467,   468,   469,   470,   471,    -1,
+     473,   474,   475,   476,   477,   478,   479,    -1,   481,   482,
+     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
+     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
+     503,   504,   505,   506,   507,   508,   509,    -1,    -1,    -1,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    -1,   526,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
+      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
+     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
+      -1,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
+     145,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
+     165,   166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,
+      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
+     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
+     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
+     265,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,   289,   290,   291,   292,    -1,   294,
+     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,    -1,   321,   322,   323,   324,
+      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
+     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
+      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
+     475,   476,   477,   478,   479,    -1,   481,   482,   483,   484,
+     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,    -1,    -1,    -1,    -1,     6,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      -1,   526,    19,    20,    21,    22,    23,    24,    -1,    26,
+      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
+      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,    -1,   111,    -1,   113,   114,    -1,   116,
+     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
+      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
+     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,    -1,    -1,   235,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
+      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
+      -1,    -1,   279,   280,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,   290,   291,    -1,    -1,   294,   295,   296,
+      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
+     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
+      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
+     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
+     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
+     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,    -1,    -1,    -1,    -1,    -1,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+     527,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    74,    75,    76,    77,
+      78,    79,    -1,    81,    -1,    -1,    -1,    85,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,    -1,    -1,    -1,    -1,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,   525,   526,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    74,    75,    76,    77,    78,    79,
+      -1,    81,    -1,    -1,    -1,    85,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+      -1,    -1,    -1,    -1,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,   526,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    71,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
-     121,    -1,   123,   124,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,    -1,    -1,   147,    -1,   149,   150,
-     151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,
-      -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,    -1,   218,   219,   220,
-      -1,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
-      -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,   265,    -1,    -1,   268,   269,   270,
-     271,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,    -1,    -1,   288,    -1,   290,
-     291,   292,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,    -1,    -1,
-     321,   322,   323,   324,    -1,    -1,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,    -1,   343,   344,   345,    -1,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,    -1,   358,    -1,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,   392,   393,   394,   395,    -1,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,   417,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,    -1,    -1,   436,   437,    -1,   439,   440,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,    -1,   454,    -1,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,    -1,   479,    -1,
-     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,     5,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,   438,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,   491,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,    -1,    -1,
+     512,    -1,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,   526,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,   438,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,   491,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,    -1,    -1,   512,    -1,
        6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
+      16,    -1,   526,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
       -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
       66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
@@ -23104,257 +21357,363 @@
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
       96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,    -1,   123,   124,   125,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
      126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,    -1,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
      176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
      186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
      196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
      206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,    -1,   218,   219,   220,    -1,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,    -1,    -1,    -1,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-      -1,    -1,   268,   269,   270,   271,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,    -1,   290,   291,   292,    -1,   294,   295,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
      296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,    -1,    -1,   321,   322,   323,   324,    -1,
-      -1,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,    -1,   343,   344,   345,
-      -1,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,    -1,   358,    -1,   360,   361,   362,    -1,   364,   365,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
      366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
      376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-      -1,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
      406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,    -1,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,    -1,   454,    -1,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
       -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
      466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,    -1,   479,    -1,   481,   482,   483,   484,   485,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
      486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   507,   508,   509,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
-      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,    -1,    -1,    -1,    -1,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+     526,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,    -1,    -1,    -1,    -1,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,   526,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
-     121,    -1,   123,   124,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,    -1,    -1,   147,    -1,   149,   150,
-     151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,
-      -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,    -1,   218,   219,   220,
-      -1,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
-      -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,   265,    -1,    -1,   268,   269,   270,
-     271,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,    -1,    -1,   288,    -1,   290,
-     291,   292,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,    -1,    -1,
-     321,   322,   323,   324,    -1,    -1,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,    -1,   343,   344,   345,    -1,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,    -1,   358,    -1,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,   392,   393,   394,   395,    -1,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,   417,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,    -1,    -1,   436,   437,    -1,   439,   440,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,    -1,   454,    -1,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,    -1,   479,    -1,
-     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
-      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,    -1,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
-     136,   137,   138,   139,    -1,   141,   142,   143,   144,    -1,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-     156,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,    -1,   218,   219,   220,    -1,    -1,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,    -1,    -1,    -1,   244,    -1,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-      -1,    -1,   268,   269,   270,   271,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,    -1,   290,   291,   292,    -1,   294,   295,
-     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,    -1,    -1,   321,   322,   323,   324,    -1,
-      -1,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
-     336,   337,   338,    -1,    -1,   341,    -1,   343,   344,   345,
-      -1,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,    -1,   358,    -1,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-      -1,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
-     406,   407,   408,   409,   410,    -1,   412,   413,    -1,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,    -1,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,    -1,   454,    -1,
-      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,    -1,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   507,   508,   509,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    -1,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
-      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+      -1,    -1,    -1,    -1,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,   526,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
-     121,    -1,    -1,   124,    -1,    -1,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,    -1,    -1,   139,    -1,
-     141,   142,   143,   144,    -1,    -1,   147,    -1,   149,   150,
-     151,   152,   153,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,
-      -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,    -1,    -1,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,    -1,   218,   219,   220,
-      -1,    -1,   223,    -1,   225,   226,    -1,   228,    -1,   230,
-      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
-      -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,   265,    -1,    -1,   268,   269,   270,
-      -1,    -1,    -1,    -1,    -1,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,    -1,    -1,   288,    -1,   290,
-     291,   292,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,    -1,   315,    -1,   317,   318,    -1,    -1,
-     321,   322,   323,   324,    -1,    -1,   327,    -1,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,    -1,   343,   344,   345,    -1,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,    -1,   358,    -1,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,    -1,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,   392,   393,   394,   395,    -1,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,    -1,   415,   416,   417,   418,   419,    -1,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,    -1,    -1,   436,   437,    -1,   439,   440,
-     441,   442,   443,   444,   445,    -1,    -1,    -1,    -1,    -1,
-     451,   452,    -1,   454,    -1,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,    -1,    -1,    -1,
-     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,     6,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,    -1,    -1,
+      -1,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,   526,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    -1,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    -1,    41,    42,    43,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,
+      74,    75,    76,    77,    78,    79,    80,    81,    -1,    -1,
+      84,    85,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,    -1,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,    -1,   146,   147,   148,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,    -1,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,    -1,   218,   219,   220,    -1,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,    -1,   242,    -1,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,    -1,    -1,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,   286,   287,   288,    -1,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,   315,   316,   317,   318,    -1,   320,   321,   322,   323,
+     324,   325,    -1,   327,   328,   329,   330,   331,   332,   333,
+     334,   335,   336,   337,   338,   339,   340,   341,    -1,   343,
+     344,   345,    -1,   347,   348,   349,   350,   351,   352,   353,
+     354,   355,   356,    -1,   358,    -1,   360,   361,   362,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,   389,   390,   391,   392,   393,
+     394,   395,    -1,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+     414,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+      -1,   435,   436,   437,   438,   439,   440,   441,   442,   443,
+     444,   445,   446,   447,   448,    -1,   450,   451,   452,    -1,
+     454,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,   466,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,    -1,   479,   480,   481,   482,   483,
+     484,   485,   486,   487,   488,   489,   490,   491,   492,   493,
+     494,   495,   496,   497,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   507,   508,   509,    -1,    -1,    -1,   513,
+     514,   515,    -1,   517,   518,   519,   520,   521,   522,     6,
        7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
       -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
       27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
       37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-      -1,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,    -1,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-      -1,   268,   269,   270,    -1,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-      -1,   308,   309,    -1,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,   346,
-     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,    -1,   404,   405,   406,
-     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,   439,   440,   441,   442,   443,   444,   445,   446,
-     447,   448,    -1,   450,   451,   452,   453,   454,   455,   456,
-     457,   458,   459,   460,   461,   462,   463,    -1,   465,   466,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,    -1,   479,   480,   481,   482,   483,   484,   485,   486,
-     487,   488,   489,   490,   491,   492,   493,   494,   495,   496,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    78,    79,    -1,    -1,    -1,    -1,    84,    -1,    -1,
+      -1,    -1,    -1,    -1,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
+     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
+      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
+     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
+      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
+      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
+      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
+     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
+     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
+      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
+     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
+     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
+     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
      497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-      -1,   508,   509,     6,     7,     8,     9,    10,    11,    12,
+     507,   508,   509,    -1,    -1,    -1,   513,   514,   515,    -1,
+     517,   518,   519,   520,   521,   522,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
+      -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,    -1,    -1,
+      -1,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+      -1,    -1,    -1,   513,   514,   515,    -1,   517,   518,   519,
+     520,   521,   522,     6,     7,     8,     9,    10,    11,    12,
       13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
       23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
       33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
       -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
       -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    71,    -1,
-      -1,    74,    75,    76,    77,    78,    79,    -1,    81,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
+      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      -1,    84,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
      103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
      113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
      123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
@@ -23363,7 +21722,7 @@
       -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
      163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
+     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
       -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
      203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
      213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
@@ -23395,16 +21754,69 @@
      473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
      483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
      493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
+     503,   504,   505,   506,   507,   508,   509,    -1,    -1,    -1,
+     513,   514,   515,    -1,   517,   518,   519,   520,   521,   522,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    84,    -1,
+      -1,    -1,    -1,    -1,    -1,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,    -1,    -1,    -1,   513,   514,   515,
+      -1,   517,   518,   519,   520,   521,   522,     6,     7,     8,
        9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
       19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
       -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
       39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
       49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    71,    -1,    -1,    74,    75,    76,    77,    78,
-      79,    -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
+      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
+      79,    -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,    -1,
+      -1,    -1,    91,    92,    93,    94,    95,    96,    97,    98,
       99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
      119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
@@ -23446,29 +21858,541 @@
      479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
      489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
      499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+     509,    -1,    -1,    -1,   513,   514,   515,    -1,   517,   518,
+     519,   520,   521,   522,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    84,    -1,    -1,    -1,    -1,    -1,    -1,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,    -1,    -1,
+      -1,   513,   514,   515,    -1,   517,   518,   519,   520,   521,
+     522,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
+      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
+      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
+      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
+      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    84,
+      -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
+     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
+      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
+     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
+     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
+      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
+     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
+     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
+      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
+      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
+     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
+      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
+      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
+     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
+     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
+      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
+      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
+     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
+     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
+      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
+     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
+     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,    -1,    -1,    -1,   513,   514,
+     515,    -1,   517,   518,   519,   520,   521,   522,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      -1,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    -1,    41,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
+     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
+     337,   338,   339,   340,   341,   342,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
+     357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,   440,   441,   442,   443,   444,   445,   446,
+     447,   448,   449,   450,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,   464,   465,   466,
+     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
+     477,   478,   479,   480,   481,   482,   483,   484,   485,   486,
+     487,   488,   489,   490,   491,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,   519,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    -1,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    -1,    41,
+      42,    43,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
+      -1,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,    -1,    -1,   147,    -1,   149,   150,   151,
+     152,   153,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,
+     172,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,    -1,   218,   219,   220,    -1,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,   233,    -1,   235,   236,   237,   238,    -1,   240,    -1,
+      -1,    -1,   244,    -1,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     262,    -1,   264,   265,   266,    -1,   268,   269,   270,   271,
+     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,    -1,    -1,   288,    -1,   290,   291,
+     292,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,   315,   316,   317,   318,    -1,    -1,   321,
+     322,   323,   324,    -1,    -1,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,   340,   341,
+     342,   343,   344,   345,    -1,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,    -1,   358,    -1,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+     392,   393,   394,   395,    -1,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,    -1,    -1,   436,   437,    -1,   439,   440,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,    -1,   454,    -1,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,    -1,   479,   480,   481,
+     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   507,   508,   509,    -1,     6,
+       7,     8,     9,    10,    11,    12,    13,   519,    15,    16,
+      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
+      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
+      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
+     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
+      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
+     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
+      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
+      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
+      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
+     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
+     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
+      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
+     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
+     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
+     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,    -1,     6,     7,     8,     9,    10,    11,
+      12,    13,   519,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,    -1,     6,
+       7,     8,     9,    10,    11,    12,    13,   519,    15,    16,
+      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
+      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
+      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
+      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
+      -1,    68,    69,    70,    71,    -1,    -1,    -1,    -1,    -1,
+      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    85,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
+     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
+      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
+      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
+     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,    -1,   234,    -1,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,   248,   249,   250,    -1,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
+      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
+      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
+      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
+     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
+     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
+     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
+      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
+     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
+     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
+     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+     507,   508,   509,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     517,   518,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
+      -1,    85,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+     234,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   517,   518,     6,     7,     8,     9,    10,
+      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
+      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
+      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
+      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
+      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
+      71,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    -1,    -1,    85,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
+     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
+     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
+     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
+     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
+     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
+     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
+     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
+     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
+     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
+      -1,   232,    -1,   234,    -1,   236,   237,   238,    -1,   240,
+     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
+      -1,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
+      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
+     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
+     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
+     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
+     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
+     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
+     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
+     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
+     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
+      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
+     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
+     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
+     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
+     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
+     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
+      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
+     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
+      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
+     501,   502,   503,   504,   505,   506,   507,   508,   509,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   517,   518,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    71,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    85,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,   234,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   517,
+     518,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
       15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
       -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
       -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
       45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
       55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
+      -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,    -1,
       -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
       95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
      105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
       -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
      125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,    -1,    -1,   148,   149,   150,   151,   152,    -1,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,    -1,
+     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
+     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
       -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
+     185,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
      195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
      205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
      215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,   231,   232,    -1,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
       -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
       -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
      255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
@@ -23481,7 +22405,7 @@
       -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
       -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
       -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
      385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
@@ -23490,215 +22414,14 @@
      415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
       -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
+     445,    -1,   447,   448,   449,    -1,   451,   452,   453,   454,
      455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-     465,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
+      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
      475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
      485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
      495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-     231,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,   292,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,   465,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,   164,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,   239,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,   164,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,   239,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,   405,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    74,    75,    76,    77,    78,
-      79,    -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+     505,   506,   507,   508,   509,    -1,    -1,    -1,    -1,     4,
+     515,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
       -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
       -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
@@ -23711,16 +22434,16 @@
      105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
       -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
      125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
      145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,    -1,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
       -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
       -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
      195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
      205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
      215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,   231,   232,    -1,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
       -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
       -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
      255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
@@ -23733,7 +22456,7 @@
       -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
       -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
       -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
      385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
@@ -23744,216 +22467,267 @@
       -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
      445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
      455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-     465,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
+      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
      475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
      485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
      495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      71,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+     505,   506,   507,   508,   509,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    74,    75,    76,    77,    78,    79,
+      80,    81,    -1,    -1,    -1,    85,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
+     340,   341,   342,   343,   344,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
+     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,   453,   454,   455,   456,   457,   458,   459,
+     460,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,   478,   479,
+     480,   481,   482,   483,   484,   485,   486,   487,   488,   489,
+     490,   491,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
+      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
+     445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
+     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
+     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,   168,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,   164,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    71,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
+     340,   341,   342,   343,   344,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
+     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,   453,   454,   455,   456,   457,   458,   459,
+     460,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,   478,   479,
+     480,   481,   482,   483,   484,   485,   486,   487,   488,   489,
+     490,   491,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
+      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
+     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
+      -1,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,    -1,   128,   129,   130,   131,   132,    -1,   134,
+     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
+     145,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
+     165,   166,   167,    -1,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
+     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
+     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
+     265,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,   289,   290,   291,   292,    -1,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,    -1,   321,   322,   323,   324,
+      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+      -1,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
+     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
+      -1,   466,   467,   468,   469,   470,   471,    -1,   473,   474,
+     475,   476,   477,   478,   479,    -1,   481,   482,   483,   484,
+     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,   231,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,   438,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
+     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,   165,   166,   167,    -1,    -1,
+      -1,    -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,   265,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+     290,   291,   292,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+      -1,   321,   322,   323,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,   343,   344,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
       15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
       45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
       55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
       -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
@@ -23961,3372 +22735,4583 @@
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
       95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
      105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
+      -1,   116,   117,   118,   119,   120,   121,   122,   123,   124,
      125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
      135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,   164,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     145,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
+     165,   166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,
       -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
       -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
      195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
      205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
      215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
      255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
+     265,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,   289,   290,   291,   292,    -1,   294,
      295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
+     315,   316,   317,   318,   319,    -1,   321,   322,   323,   324,
       -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
      355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
+     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
      395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
+      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
      445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
      455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
       -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
+     475,   476,   477,   478,   479,    -1,   481,   482,   483,   484,
      485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
      495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      71,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,   438,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    71,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    71,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+     505,   506,   507,   508,   509,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    71,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
+     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,   165,   166,   167,    -1,    -1,
+      -1,    -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,   265,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+     290,   291,   292,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+      -1,   321,   322,   323,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,   343,   344,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
       15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
+      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
+     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
+      -1,   116,   117,   118,   119,   120,   121,    -1,   123,   124,
+     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
+      -1,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
+     165,   166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,
+      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
+     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
+     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
+     215,   216,    -1,   218,   219,   220,    -1,    -1,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,    -1,    -1,    -1,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,    -1,   264,
+     265,   266,    -1,   268,   269,   270,   271,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,    -1,   290,   291,   292,    -1,   294,
+     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,    -1,    -1,   321,   322,   323,   324,
+      -1,    -1,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,   342,   343,   344,
+     345,    -1,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,    -1,   358,    -1,   360,   361,   362,    -1,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
+     395,    -1,   397,   398,   399,   400,   401,   402,   403,   404,
+      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,    -1,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,    -1,   454,
+      -1,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
+      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
+     475,   476,   477,    -1,   479,   480,   481,   482,   483,   484,
+     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
+     495,   496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   507,   508,   509,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
+     120,   121,    -1,   123,   124,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,    -1,    -1,   147,    -1,   149,
+     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,   165,   166,   167,    -1,    -1,
+      -1,    -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,    -1,   218,   219,
+     220,    -1,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
+     240,    -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,   265,    -1,    -1,   268,   269,
+     270,   271,   272,    -1,   274,    -1,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,    -1,    -1,   288,    -1,
+     290,   291,   292,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,    -1,
+      -1,   321,   322,   323,   324,   325,    -1,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,    -1,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,    -1,   358,    -1,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,   392,   393,   394,   395,    -1,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,    -1,    -1,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,    -1,   454,    -1,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,    -1,   479,
+      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
       45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
       55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
       -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
      105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
+      -1,   116,   117,   118,   119,   120,   121,    -1,   123,   124,
      125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
      135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
+      -1,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
      155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     165,   166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,
       -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
       -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
      195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
      205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
+     215,   216,    -1,   218,   219,   220,    -1,    -1,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,    -1,    -1,    -1,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
      255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
+     265,    -1,    -1,   268,   269,   270,   271,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,    -1,   290,   291,   292,    -1,   294,
      295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-     335,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
+     315,   316,   317,   318,   319,    -1,   321,   322,   323,   324,
+      -1,    -1,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,    -1,   343,   344,
+     345,    -1,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,    -1,   358,    -1,   360,   361,   362,    -1,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
+     395,    -1,   397,   398,   399,   400,   401,   402,   403,   404,
       -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,    -1,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,    -1,   454,
+      -1,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
       -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
+     475,   476,   477,    -1,   479,    -1,   481,   482,   483,   484,
      485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      71,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,   106,
-     107,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+     495,   496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   507,   508,   509,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,   471,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,   471,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
+     120,   121,    -1,   123,   124,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,    -1,    -1,   147,    -1,   149,
+     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,   165,   166,   167,    -1,    -1,
+      -1,    -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,    -1,   218,   219,
+     220,    -1,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
+     240,    -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,   265,    -1,    -1,   268,   269,
+     270,   271,   272,    -1,   274,    -1,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,    -1,    -1,   288,    -1,
+     290,   291,   292,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+      -1,   321,   322,   323,   324,    -1,    -1,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,    -1,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,    -1,   358,    -1,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,   392,   393,   394,   395,    -1,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,    -1,    -1,   436,   437,    -1,   439,
+     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,    -1,   454,    -1,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,    -1,   479,
+      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
       15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
       45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
       55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,    -1,
+      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
       95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
      105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
+      -1,   116,   117,   118,   119,   120,   121,    -1,   123,   124,
      125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
      135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
+      -1,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
      155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     165,   166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,
       -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
       -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
      195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
      205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
+     215,   216,    -1,   218,   219,   220,    -1,    -1,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,    -1,    -1,    -1,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
      255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
+     265,    -1,    -1,   268,   269,   270,   271,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,    -1,   290,   291,   292,    -1,   294,
      295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
+     315,   316,   317,   318,    -1,    -1,   321,   322,   323,   324,
+      -1,    -1,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,    -1,   343,   344,
+     345,    -1,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,    -1,   358,    -1,   360,   361,   362,    -1,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
+     395,    -1,   397,   398,   399,   400,   401,   402,   403,   404,
       -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,    -1,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,    -1,   454,
+      -1,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
       -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
+     475,   476,   477,    -1,   479,    -1,   481,   482,   483,   484,
      485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      71,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    71,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    71,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+     495,   496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   507,   508,   509,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,   335,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
+     120,   121,    -1,   123,   124,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,    -1,    -1,   147,    -1,   149,
+     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,   165,   166,   167,    -1,    -1,
+      -1,    -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,    -1,   218,   219,
+     220,    -1,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
+     240,    -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,   265,    -1,    -1,   268,   269,
+     270,   271,   272,    -1,   274,    -1,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,    -1,    -1,   288,    -1,
+     290,   291,   292,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,    -1,
+      -1,   321,   322,   323,   324,    -1,    -1,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,    -1,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,    -1,   358,    -1,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,   392,   393,   394,   395,    -1,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,    -1,    -1,   436,   437,    -1,   439,
+     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,    -1,   454,    -1,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,    -1,   479,
+      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
       15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
       45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
       55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
       -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
      105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
+      -1,   116,   117,   118,   119,   120,   121,    -1,   123,   124,
      125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
      135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
+      -1,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
      155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     165,   166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,
       -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
       -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
      195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
      205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
+     215,   216,    -1,   218,   219,   220,    -1,    -1,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,    -1,    -1,    -1,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
      255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
+     265,    -1,    -1,   268,   269,   270,   271,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,    -1,   290,   291,   292,    -1,   294,
      295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
+     315,   316,   317,   318,    -1,    -1,   321,   322,   323,   324,
+      -1,    -1,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,    -1,   343,   344,
+     345,    -1,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,    -1,   358,    -1,   360,   361,   362,    -1,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
+     395,    -1,   397,   398,   399,   400,   401,   402,   403,   404,
       -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,    -1,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,    -1,   454,
+      -1,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
       -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
+     475,   476,   477,    -1,   479,    -1,   481,   482,   483,   484,
      485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+     495,   496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   507,   508,   509,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
+     120,   121,    -1,   123,   124,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,    -1,    -1,   147,    -1,   149,
+     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,   165,   166,   167,    -1,    -1,
+      -1,    -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,    -1,   218,   219,
+     220,    -1,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
+     240,    -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,   265,    -1,    -1,   268,   269,
+     270,   271,   272,    -1,   274,    -1,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,    -1,    -1,   288,    -1,
+     290,   291,   292,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,    -1,
+      -1,   321,   322,   323,   324,    -1,    -1,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,    -1,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,    -1,   358,    -1,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,   392,   393,   394,   395,    -1,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,    -1,    -1,   436,   437,    -1,   439,
+     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,    -1,   454,    -1,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,    -1,   479,
+      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    -1,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    -1,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
+      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
+     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
+      -1,   116,   117,   118,   119,   120,   121,    -1,   123,   124,
+     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
+      -1,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
+     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
+     165,   166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,
+      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
+     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
+     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
+     215,   216,    -1,   218,   219,   220,    -1,    -1,   223,    -1,
+     225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
+     235,   236,   237,   238,    -1,   240,    -1,    -1,    -1,   244,
+      -1,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
+     265,    -1,    -1,   268,   269,   270,   271,   272,    -1,   274,
+      -1,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,    -1,    -1,   288,    -1,   290,   291,   292,    -1,   294,
+     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,    -1,    -1,   321,   322,   323,   324,
+      -1,    -1,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   336,   337,   338,    -1,    -1,   341,    -1,   343,   344,
+     345,    -1,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,    -1,   358,    -1,   360,   361,   362,    -1,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
+     395,    -1,   397,   398,   399,   400,   401,   402,   403,   404,
+      -1,   406,   407,   408,   409,   410,    -1,   412,   413,    -1,
+     415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,    -1,
+      -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
+     445,    -1,   447,   448,    -1,    -1,   451,   452,    -1,   454,
+      -1,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
+      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
+     475,   476,   477,    -1,   479,    -1,   481,   482,   483,   484,
+     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
+     495,   496,   497,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   507,   508,   509,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      -1,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      -1,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
+     120,   121,    -1,    -1,   124,    -1,    -1,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,    -1,    -1,   139,
+      -1,   141,   142,   143,   144,    -1,    -1,   147,    -1,   149,
+     150,   151,   152,   153,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,   165,   166,   167,    -1,    -1,
+      -1,    -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,    -1,    -1,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,    -1,   218,   219,
+     220,    -1,    -1,   223,    -1,   225,   226,    -1,   228,    -1,
+     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
+     240,    -1,    -1,    -1,   244,    -1,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,   265,    -1,    -1,   268,   269,
+     270,    -1,    -1,    -1,    -1,    -1,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,    -1,    -1,   288,    -1,
+     290,   291,   292,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,    -1,   315,    -1,   317,   318,    -1,
+      -1,   321,   322,   323,   324,    -1,    -1,   327,    -1,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,    -1,   343,   344,   345,    -1,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,    -1,   358,    -1,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,    -1,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,   392,   393,   394,   395,    -1,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,    -1,   415,   416,   417,   418,   419,
+      -1,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,    -1,    -1,   436,   437,    -1,   439,
+     440,   441,   442,   443,   444,   445,    -1,    -1,    -1,    -1,
+      -1,   451,   452,    -1,   454,    -1,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,    -1,    -1,
+      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,    -1,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,    -1,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,    -1,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,    -1,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+     266,    -1,   268,   269,   270,    -1,   272,   273,   274,   275,
+     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,    -1,   308,   309,    -1,   311,   312,   313,   314,   315,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,   329,   330,   331,   332,   333,   334,   335,
+     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
+     346,   347,   348,   349,   350,   351,   352,   353,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,    -1,   404,   405,
+     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,   440,   441,   442,   443,   444,   445,
+     446,   447,   448,    -1,   450,   451,   452,   453,   454,   455,
+     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
+     466,   467,   468,   469,   470,   471,   472,   473,   474,   475,
+     476,   477,    -1,   479,   480,   481,   482,   483,   484,   485,
+     486,   487,   488,   489,   490,   491,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,    -1,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    71,
+      -1,    -1,    74,    75,    76,    77,    78,    79,    -1,    81,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    71,    -1,    -1,    74,    75,    76,    77,
+      78,    79,    -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,    -1,    -1,   148,   149,   150,   151,   152,    -1,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,   231,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,   231,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,   292,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,   465,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,   164,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,   239,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,   164,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,   239,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    74,    75,    76,    77,
+      78,    79,    -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,   335,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,   231,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    71,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    73,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,   168,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,   164,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    71,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,   231,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+     438,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+     164,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    71,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-     111,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,   111,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,   438,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    71,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    71,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,   472,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    71,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,   335,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    71,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,    -1,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,    -1,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+     106,   107,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,   471,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,   471,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    71,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    71,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    71,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    71,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,   335,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,   335,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    73,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,   111,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,   111,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,    -1,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+     472,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,    -1,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,    -1,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+      -1,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-     111,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,    -1,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,   156,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,   156,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,   156,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,    -1,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    15,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    -1,    -1,
-      31,    32,    33,    34,    -1,    -1,    37,    38,    39,    -1,
-      41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,    -1,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,    -1,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
-     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,   120,
-     121,   122,   123,    -1,   125,   126,    -1,   128,   129,   130,
-     131,   132,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-     141,   142,   143,   144,   145,    -1,    -1,    -1,   149,   150,
-     151,   152,    -1,   154,   155,    -1,    -1,   158,   159,   160,
-     161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
-     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
-     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
-     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
-      -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,
-     241,    -1,   243,   244,    -1,   246,   247,   248,   249,   250,
-      -1,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
-     261,   262,    -1,   264,    -1,   266,    -1,   268,   269,   270,
-      -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,
-     281,   282,   283,   284,   285,    -1,    -1,   288,   289,    -1,
-     291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,    -1,   316,   317,   318,   319,    -1,
-     321,   322,    -1,   324,    -1,   326,   327,   328,   329,   330,
-     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
-     341,   342,    -1,   344,    -1,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
-     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
-     391,    -1,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,    -1,   406,   407,   408,   409,   410,
-      -1,   412,   413,   414,   415,   416,    -1,   418,   419,   420,
-     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,    -1,   436,   437,    -1,   439,    -1,
-     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
-     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
-     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-      -1,    -1,   473,   474,   475,   476,   477,   478,   479,    -1,
-     481,    -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,
-      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,     6,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
-     117,    -1,   119,   120,   121,   122,   123,    -1,   125,   126,
-      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
-      -1,    -1,   149,   150,   151,   152,    -1,   154,   155,    -1,
-      -1,   158,   159,   160,   161,   162,   163,    -1,    -1,   166,
-     167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,    -1,   186,
-      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
-      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
-     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,    -1,   223,    -1,   225,   226,
-     227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,
-     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
-     247,   248,   249,   250,    -1,   252,   253,   254,   255,    -1,
-     257,   258,   259,   260,   261,   262,    -1,   264,    -1,   266,
-      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
-      -1,    -1,   279,    -1,   281,   282,   283,   284,   285,    -1,
-      -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,   296,
-      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
-     317,   318,   319,    -1,   321,   322,    -1,   324,    -1,   326,
-     327,   328,   329,   330,   331,    -1,   333,    -1,    -1,   336,
-     337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,    -1,   390,   391,    -1,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,    -1,   406,
-     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
-      -1,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
-     437,    -1,   439,    -1,   441,   442,   443,   444,   445,    -1,
-     447,   448,    -1,    -1,   451,   452,   453,   454,   455,    -1,
-     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
-     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
-     477,   478,   479,    -1,   481,    -1,   483,   484,   485,   486,
-      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-     507,   508,   509,     6,     7,     8,     9,    10,    11,    12,
-      13,    -1,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,    -1,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
-      -1,   154,   155,    -1,    -1,   158,   159,   160,   161,   162,
-     163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-      -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,   248,   249,   250,    -1,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,    -1,   316,   317,   318,   319,    -1,   321,   322,
-      -1,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-      -1,   344,    -1,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,    -1,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,    -1,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,    -1,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,    -1,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,    38,
-      39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
-      79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,
-     119,   120,   121,   122,   123,    -1,   125,   126,    -1,   128,
-     129,   130,   131,   132,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,
-     149,   150,   151,   152,    -1,   154,   155,    -1,    -1,   158,
-     159,   160,   161,   162,   163,    -1,    -1,   166,   167,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,    -1,   186,    -1,   188,
-     189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
-     199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
-     209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
-      -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,
-      -1,   240,   241,    -1,   243,   244,    -1,   246,   247,   248,
-     249,   250,    -1,   252,   253,   254,   255,    -1,   257,   258,
-     259,   260,   261,   262,    -1,   264,    -1,   266,    -1,   268,
-     269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,
-     279,    -1,   281,   282,   283,   284,   285,    -1,    -1,   288,
-     289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,    -1,   316,   317,   318,
-     319,    -1,   321,   322,    -1,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
-      -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
-     359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,    -1,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-      -1,   390,   391,    -1,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,    -1,   406,   407,   408,
-     409,   410,    -1,   412,   413,   414,   415,   416,    -1,   418,
-     419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
-     439,    -1,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
-     469,   470,    -1,    -1,   473,   474,   475,   476,   477,   478,
-     479,    -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,
-     489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    -1,    -1,    19,    20,    21,    22,    23,    24,
-      -1,    26,    27,    28,    -1,    -1,    31,    32,    33,    34,
-      -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,
-      45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
-      -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
-      -1,   116,   117,    -1,   119,   120,   121,   122,   123,    -1,
-     125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,   141,   142,   143,   144,
-     145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,
-     155,   156,    -1,   158,   159,   160,   161,   162,   163,    -1,
-      -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-      -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
-     195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
-     205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
-     225,   226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,
-      -1,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
-      -1,   246,   247,   248,   249,   250,    -1,   252,   253,   254,
-     255,    -1,   257,   258,   259,   260,   261,   262,    -1,   264,
-      -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,   274,
-      -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,   284,
-     285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,
-     295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-      -1,   316,   317,   318,   319,    -1,   321,   322,    -1,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
-      -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,   344,
-      -1,   346,   347,   348,   349,   350,    -1,   352,   353,    -1,
-     355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
-     365,   366,   367,   368,   369,    -1,   371,   372,   373,   374,
-     375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    -1,   390,   391,    -1,   393,   394,
-     395,   396,    -1,   398,   399,   400,   401,   402,   403,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
-     415,   416,    -1,   418,   419,   420,   421,    -1,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-      -1,   436,   437,    -1,   439,    -1,   441,   442,   443,   444,
-     445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
-     475,   476,   477,   478,   479,    -1,   481,    -1,   483,   484,
-     485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,     6,     7,     8,    -1,    10,
-      11,    12,    -1,    -1,    -1,    16,    -1,    -1,    19,    20,
-      21,    22,    23,    24,    -1,    26,    27,    -1,    -1,    -1,
-      31,    32,    33,    34,    -1,    36,    37,    38,    39,    40,
-      41,    42,    43,    -1,    -1,    -1,    -1,    -1,    49,    50,
-      -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,
-      -1,    72,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,   111,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,    -1,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   118,    -1,    -1,
-      -1,   122,   123,   124,   125,   126,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   138,    -1,    -1,
-      -1,    -1,    -1,    -1,   145,    -1,   147,    -1,    -1,    -1,
-      -1,    -1,   153,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   165,    -1,    -1,    -1,    -1,    -1,
-      -1,   172,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   182,   183,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   209,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   217,    -1,    -1,    -1,
-     221,    -1,    -1,    -1,    -1,    -1,   227,    -1,    -1,    -1,
-      -1,    -1,   233,    -1,   235,    -1,    -1,    -1,    -1,    -1,
-     241,    -1,   243,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     251,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   265,   266,    -1,    -1,    -1,    -1,
-      -1,   272,    -1,   274,    -1,    -1,   277,   278,    -1,   280,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   289,   290,
-      -1,   292,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   314,   315,   316,    -1,    -1,   319,    -1,
-      -1,    -1,   323,    -1,    -1,   326,    -1,   328,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,   156,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+     156,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   342,   343,    -1,   345,   346,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   357,    -1,   359,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,   156,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,   156,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   372,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,    -1,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,     9,
+      10,    11,    12,    13,    -1,    15,    16,    -1,    -1,    19,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    37,    38,    39,
+      -1,    41,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,
+      50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   392,    -1,    -1,    -1,   396,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
+     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   113,   114,    -1,   116,   117,    -1,   119,
+     120,   121,   122,   123,    -1,   125,   126,    -1,   128,   129,
+     130,   131,   132,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,   141,   142,   143,   144,   145,    -1,    -1,    -1,   149,
+     150,   151,   152,    -1,   154,   155,    -1,    -1,   158,   159,
+     160,   161,   162,   163,    -1,    -1,   166,   167,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
+     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
+     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
+     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,    -1,   223,    -1,   225,   226,   227,   228,    -1,
+     230,    -1,   232,    -1,    -1,    -1,   236,   237,   238,    -1,
+     240,   241,    -1,   243,   244,    -1,   246,   247,   248,   249,
+     250,    -1,   252,   253,   254,   255,    -1,   257,   258,   259,
+     260,   261,   262,    -1,   264,    -1,   266,    -1,   268,   269,
+     270,    -1,   272,    -1,   274,    -1,   276,    -1,    -1,   279,
+      -1,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
+      -1,   291,    -1,    -1,   294,   295,   296,    -1,    -1,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,    -1,   316,   317,   318,   319,
+      -1,   321,   322,    -1,   324,    -1,   326,   327,   328,   329,
+     330,   331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,
+      -1,   341,   342,    -1,   344,    -1,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
+     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
+     390,   391,    -1,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,    -1,   406,   407,   408,   409,
+     410,    -1,   412,   413,   414,   415,   416,    -1,   418,   419,
+     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
+      -1,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
+      -1,   451,   452,   453,   454,   455,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
+     470,    -1,    -1,   473,   474,   475,   476,   477,   478,   479,
+      -1,   481,    -1,   483,   484,   485,   486,    -1,    -1,   489,
+      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    49,    50,    -1,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,
+      66,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,   121,   122,   123,    -1,   125,
+     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,   141,   142,   143,   144,   145,
+      -1,    -1,    -1,   149,   150,   151,   152,    -1,   154,   155,
+      -1,    -1,   158,   159,   160,   161,   162,   163,    -1,    -1,
+     166,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,    -1,
+     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
+     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
+     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
+     226,   227,   228,    -1,   230,    -1,   232,    -1,    -1,    -1,
+     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     246,   247,   248,   249,   250,    -1,   252,   253,   254,   255,
+      -1,   257,   258,   259,   260,   261,   262,    -1,   264,    -1,
+     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
+     276,    -1,    -1,   279,    -1,   281,   282,   283,   284,   285,
+      -1,    -1,   288,   289,    -1,   291,    -1,    -1,   294,   295,
+     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,    -1,
+     316,   317,   318,   319,    -1,   321,   322,    -1,   324,    -1,
+     326,   327,   328,   329,   330,   331,    -1,   333,    -1,    -1,
+     336,   337,   338,    -1,    -1,   341,   342,    -1,   344,    -1,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
+     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,   387,   388,    -1,   390,   391,    -1,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,    -1,
+     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
+     416,    -1,   418,   419,   420,   421,    -1,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
+     436,   437,    -1,   439,    -1,   441,   442,   443,   444,   445,
+      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
+      -1,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
+     476,   477,   478,   479,    -1,   481,    -1,   483,   484,   485,
+     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    15,    16,    -1,    -1,    19,    20,    21,
+      22,    23,    24,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    -1,    -1,    37,    38,    39,    -1,    41,
+      -1,    -1,    44,    45,    -1,    -1,    -1,    49,    50,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    66,    -1,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   414,    -1,    -1,   417,    -1,    -1,   420,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,    -1,   119,   120,   121,
+     122,   123,    -1,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,   137,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,    -1,    -1,   149,   150,   151,
+     152,    -1,   154,   155,    -1,    -1,   158,   159,   160,   161,
+     162,   163,    -1,    -1,   166,   167,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,    -1,    -1,    -1,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,   248,   249,   250,    -1,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,    -1,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,    -1,    -1,   279,    -1,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,    -1,   291,
+      -1,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,    -1,   316,   317,   318,   319,    -1,   321,
+     322,    -1,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,    -1,   344,    -1,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+      -1,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,    -1,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,    -1,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+      -1,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    -1,
+      -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    37,
+      38,    39,    -1,    41,    -1,    -1,    44,    45,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+      -1,   119,   120,   121,   122,   123,    -1,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,    -1,
+      -1,   149,   150,   151,   152,    -1,   154,   155,    -1,    -1,
+     158,   159,   160,   161,   162,   163,    -1,    -1,   166,   167,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,    -1,    -1,    -1,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+     248,   249,   250,    -1,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,    -1,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,    -1,
+      -1,   279,    -1,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,    -1,   291,    -1,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,    -1,   316,   317,
+     318,   319,    -1,   321,   322,    -1,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,    -1,   344,    -1,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,    -1,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,    -1,   406,   407,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,    -1,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,    -1,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+     478,   479,    -1,   481,    -1,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   507,
+     508,   509,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    -1,    -1,    19,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    37,    38,    39,    -1,    41,    -1,    -1,
+      44,    45,    -1,    -1,    -1,    49,    50,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    66,    -1,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   434,    -1,    -1,    -1,    -1,    -1,   440,
-      -1,    -1,    -1,    -1,    -1,    -1,   447,   448,    -1,    -1,
-      -1,    -1,   453,    -1,   455,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   464,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   479,    -1,
-      -1,   482,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,     6,     7,     8,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,    -1,   119,   120,   121,   122,   123,
+      -1,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,    -1,    -1,   149,   150,   151,   152,    -1,
+     154,   155,   156,    -1,   158,   159,   160,   161,   162,   163,
+      -1,    -1,   166,   167,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,    -1,
+      -1,    -1,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,   248,   249,   250,    -1,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,    -1,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,    -1,    -1,   279,    -1,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,    -1,   316,   317,   318,   319,    -1,   321,   322,    -1,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,    -1,
+     344,    -1,   346,   347,   348,   349,   350,    -1,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,    -1,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,    -1,   393,
+     394,   395,   396,    -1,   398,   399,   400,   401,   402,   403,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,    -1,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,    -1,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,   478,   479,    -1,   481,    -1,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,     6,     7,     8,    -1,
       10,    11,    12,    -1,    -1,    -1,    16,    -1,    -1,    19,
       20,    21,    22,    23,    24,    -1,    26,    27,    -1,    -1,
       -1,    31,    32,    33,    34,    -1,    36,    37,    38,    39,
@@ -27380,10 +27365,10 @@
       -1,    10,    11,    12,    -1,    -1,    -1,    16,    -1,    -1,
       19,    20,    21,    22,    23,    24,    -1,    26,    27,    -1,
       -1,    -1,    31,    32,    33,    34,    -1,    36,    37,    38,
-      39,    -1,    41,    42,    43,    -1,    -1,    -1,    -1,    -1,
+      39,    40,    41,    42,    43,    -1,    -1,    -1,    -1,    -1,
       49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,    68,
-      -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
+      69,    70,    -1,    72,    -1,    -1,    -1,    -1,    -1,    78,
       79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -27431,9 +27416,9 @@
       -1,    19,    20,    21,    22,    23,    24,    -1,    26,    27,
       -1,    -1,    -1,    31,    32,    33,    34,    -1,    36,    37,
       38,    39,    -1,    41,    42,    43,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    49,    50,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    -1,
+      68,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -27479,8 +27464,8 @@
      498,   499,   500,   501,   502,   503,   504,   505,   506,     6,
        7,     8,    -1,    10,    11,    12,    -1,    -1,    -1,    16,
       -1,    -1,    19,    20,    21,    22,    23,    24,    -1,    26,
-      27,    -1,    -1,    -1,    31,    32,    33,    34,    -1,    -1,
-      37,    38,    39,    -1,    41,    -1,    -1,    -1,    -1,    -1,
+      27,    -1,    -1,    -1,    31,    32,    33,    34,    -1,    36,
+      37,    38,    39,    -1,    41,    42,    43,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -27491,441 +27476,94 @@
       -1,   118,    -1,    -1,    -1,   122,   123,   124,   125,   126,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,   138,    -1,    -1,    -1,    -1,    -1,    -1,   145,    -1,
-     147,    -1,    -1,    -1,    -1,    -1,   153,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   165,    -1,
-      -1,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   182,   183,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     217,    -1,    -1,    -1,   221,    -1,    -1,    -1,    -1,    -1,
-     227,    -1,    -1,    -1,    -1,    -1,   233,    -1,   235,    -1,
-      -1,    -1,    -1,    -1,   241,    -1,   243,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   251,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   265,   266,
-      -1,    -1,    -1,    -1,    -1,   272,    -1,   274,    -1,    -1,
-     277,   278,    -1,   280,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   289,   290,    -1,   292,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   314,   315,   316,
-      -1,    -1,   319,    -1,    -1,    -1,   323,    -1,    -1,   326,
-      -1,   328,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   342,   343,    -1,   345,   346,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     357,    -1,   359,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   372,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   392,    -1,    -1,    -1,   396,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   414,    -1,    -1,
-     417,    -1,    -1,   420,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,
-      -1,    -1,    -1,   440,    -1,    -1,    -1,    -1,    -1,    -1,
-     447,   448,    -1,    -1,    -1,    -1,   453,    -1,   455,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   479,    -1,    -1,   482,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   498,   499,   500,   501,   502,   503,   504,   505,   506,
-      70,    71,    -1,    -1,    74,    75,    76,    77,    78,    79,
-      80,    81,    -1,    -1,    -1,    85,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
-     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,    -1,   128,   129,
-     130,   131,   132,    -1,    -1,   135,   136,    -1,   138,   139,
-      -1,   141,   142,   143,   144,   145,    -1,   147,    -1,   149,
-     150,   151,   152,   153,   154,   155,    -1,    -1,   158,   159,
-     160,   161,   162,   163,    -1,   165,   166,   167,    -1,    -1,
-      -1,    -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,
-      -1,   181,   182,   183,   184,    -1,   186,    -1,   188,   189,
-     190,   191,   192,    -1,   194,   195,   196,    -1,    -1,   199,
-     200,   201,   202,   203,    -1,   205,   206,   207,    -1,   209,
-     210,   211,    -1,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,    -1,   225,   226,   227,   228,    -1,
-     230,    -1,   232,   233,    -1,   235,   236,   237,   238,    -1,
-     240,   241,    -1,   243,   244,    -1,   246,   247,    -1,   249,
-     250,   251,   252,   253,   254,   255,    -1,   257,   258,   259,
-     260,   261,   262,    -1,   264,   265,   266,    -1,   268,   269,
-     270,    -1,   272,    -1,   274,    -1,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   285,    -1,    -1,   288,   289,
-     290,   291,   292,    -1,   294,   295,   296,    -1,    -1,   299,
-     300,   301,   302,   303,   304,   305,   306,    -1,   308,   309,
-      -1,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-      -1,   321,   322,   323,   324,    -1,   326,   327,   328,   329,
-     330,   331,    -1,   333,   334,    -1,   336,   337,   338,    -1,
-      -1,   341,   342,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,    -1,   355,   356,   357,   358,   359,
-     360,   361,   362,    -1,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,    -1,   378,   379,
-     380,   381,   382,   383,   384,   385,   386,   387,   388,    -1,
-     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-     400,   401,   402,    -1,   404,    -1,   406,   407,   408,   409,
-     410,    -1,   412,   413,   414,   415,   416,   417,   418,   419,
-     420,   421,    -1,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,   434,    -1,   436,   437,    -1,   439,
-     440,   441,   442,   443,   444,   445,    -1,   447,   448,    -1,
-      -1,   451,   452,   453,   454,   455,   456,   457,   458,   459,
-     460,   461,   462,   463,    -1,    -1,   466,   467,   468,   469,
-     470,    -1,    -1,   473,   474,   475,   476,   477,    -1,   479,
-      -1,   481,   482,   483,   484,   485,   486,    -1,    -1,   489,
-      -1,    -1,   492,   493,   494,   495,   496,   497,   498,   499,
-     500,   501,   502,   503,   504,   505,   506,    70,   508,   509,
-      -1,    -1,    -1,    -1,    -1,    78,    79,   517,   518,   519,
-      -1,    -1,    -1,    -1,    -1,    -1,   526,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,   106,   107,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,    -1,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
-     153,   154,   155,    -1,    -1,   158,   159,   160,   161,   162,
-     163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,   172,
-      -1,    -1,    -1,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,    -1,   249,   250,   251,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,   265,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,    -1,   308,   309,    -1,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,    -1,   321,   322,
-     323,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-      -1,   404,   405,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,   438,   439,   440,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,   478,   479,    -1,   481,   482,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,   491,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,    -1,   508,   509,    70,    71,   512,
-      -1,    74,    75,    76,    77,    78,    79,    80,    81,    -1,
-      -1,    -1,    85,   526,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,    -1,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
-     153,   154,   155,    -1,    -1,   158,   159,   160,   161,   162,
-     163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,   172,
-      -1,    -1,    -1,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,   185,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,    -1,   249,   250,   251,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,   265,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,    -1,   308,   309,    -1,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,    -1,   321,   322,
-     323,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,   334,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-      -1,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,   440,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,    -1,   479,    -1,   481,   482,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,    -1,   508,   509,    -1,    -1,    -1,
-      -1,    -1,    70,    71,   517,   518,    74,    75,    76,    77,
-      78,    79,    80,    81,    -1,    -1,    -1,    85,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
-     128,   129,   130,   131,   132,    -1,    -1,   135,   136,    -1,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,   153,   154,   155,    -1,    -1,
-     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,   176,   177,
-     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,   233,    -1,   235,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-      -1,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
-     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,   290,   291,   292,    -1,   294,   295,   296,    -1,
-      -1,   299,   300,   301,   302,   303,   304,   305,   306,    -1,
-     308,   309,    -1,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,    -1,   321,   322,   323,   324,    -1,   326,   327,
-     328,   329,   330,   331,    -1,   333,   334,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,    -1,   404,    -1,   406,   407,
-     408,   409,   410,    -1,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
-     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
-      -1,   479,    -1,   481,   482,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,    -1,
-     508,   509,    -1,    -1,    -1,    -1,    -1,    70,    71,   517,
-     518,    74,    75,    76,    77,    78,    79,    80,    81,    -1,
-      -1,    -1,    85,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,    -1,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
-     153,   154,   155,    -1,    -1,   158,   159,   160,   161,   162,
-     163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,   172,
-      -1,    -1,    -1,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,    -1,   249,   250,   251,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,   265,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,    -1,   308,   309,    -1,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,    -1,   321,   322,
-     323,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,   334,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-      -1,   404,    -1,   406,   407,   408,   409,   410,    -1,   412,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,   440,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,    -1,   479,    -1,   481,   482,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,    -1,   508,   509,    -1,    -1,    -1,
-      -1,    -1,    70,    71,   517,   518,    74,    75,    76,    77,
-      78,    79,    -1,    81,    -1,    -1,    -1,    85,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
-     128,   129,   130,   131,   132,    -1,    -1,   135,   136,    -1,
-     138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
-      -1,   149,   150,   151,   152,   153,   154,   155,    -1,    -1,
-     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,   176,   177,
-     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
-     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
-      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
-      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,    -1,   225,   226,   227,
-     228,    -1,   230,    -1,   232,   233,    -1,   235,   236,   237,
-     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
-      -1,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
-     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
-     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,    -1,    -1,
-     288,   289,   290,   291,   292,    -1,   294,   295,   296,    -1,
-      -1,   299,   300,   301,   302,   303,   304,   305,   306,    -1,
-     308,   309,    -1,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,    -1,   321,   322,   323,   324,    -1,   326,   327,
-     328,   329,   330,   331,    -1,   333,   334,    -1,   336,   337,
-     338,    -1,    -1,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,    -1,   404,    -1,   406,   407,
-     408,   409,   410,    -1,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
-      -1,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
-     448,    -1,    -1,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
-     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
-      -1,   479,    -1,   481,   482,   483,   484,   485,   486,    -1,
-      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   501,   502,   503,   504,   505,   506,    -1,
-     508,   509,    -1,    -1,    -1,    -1,    -1,    70,    71,   517,
-     518,    74,    75,    76,    77,    78,    79,    -1,    81,    -1,
+     147,    -1,    -1,    -1,    -1,    -1,   153,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   165,    -1,
+      -1,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   182,   183,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,    -1,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
-     153,   154,   155,    -1,    -1,   158,   159,   160,   161,   162,
-     163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,   172,
-      -1,    -1,   175,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,    -1,   249,   250,   251,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,   265,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,    -1,   308,   309,    -1,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,    -1,   321,   322,
-     323,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-      -1,   404,    -1,   406,   407,   408,   409,   410,   411,   412,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,   440,   441,   442,
-     443,   444,   445,    -1,   447,   448,   449,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,    -1,   479,    -1,   481,   482,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,    -1,   508,   509,    70,    71,    -1,
-      -1,    74,    75,    76,    77,    78,    79,    -1,    81,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     113,   114,    -1,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,    -1,   128,   129,   130,   131,   132,
-      -1,    -1,   135,   136,    -1,   138,   139,    -1,   141,   142,
-     143,   144,   145,    -1,   147,    -1,   149,   150,   151,   152,
-     153,   154,   155,    -1,    -1,   158,   159,   160,   161,   162,
-     163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,   172,
-      -1,    -1,   175,   176,   177,   178,   179,    -1,   181,   182,
-     183,   184,    -1,   186,    -1,   188,   189,   190,   191,   192,
-      -1,   194,   195,   196,    -1,    -1,   199,   200,   201,   202,
-     203,    -1,   205,   206,   207,    -1,   209,   210,   211,    -1,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,    -1,
-     223,    -1,   225,   226,   227,   228,    -1,   230,    -1,   232,
-     233,    -1,   235,   236,   237,   238,    -1,   240,   241,    -1,
-     243,   244,    -1,   246,   247,    -1,   249,   250,   251,   252,
-     253,   254,   255,    -1,   257,   258,   259,   260,   261,   262,
-      -1,   264,   265,   266,    -1,   268,   269,   270,    -1,   272,
-      -1,   274,    -1,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,    -1,    -1,   288,   289,   290,   291,   292,
-      -1,   294,   295,   296,    -1,    -1,   299,   300,   301,   302,
-     303,   304,   305,   306,    -1,   308,   309,    -1,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,    -1,   321,   322,
-     323,   324,    -1,   326,   327,   328,   329,   330,   331,    -1,
-     333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,
-     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,   358,   359,   360,   361,   362,
-      -1,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,    -1,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,    -1,   390,   391,   392,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-      -1,   404,    -1,   406,   407,   408,   409,   410,   411,   412,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,    -1,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,    -1,   436,   437,    -1,   439,   440,   441,   442,
-     443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
-     453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
-     473,   474,   475,   476,   477,    -1,   479,    -1,   481,   482,
-     483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,    70,   508,   509,    -1,    74,    75,
-      76,    77,    78,    79,    -1,    81,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,   103,   104,   105,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,    -1,   128,   129,   130,   131,   132,    -1,    -1,   135,
-     136,    -1,   138,   139,    -1,   141,   142,   143,   144,   145,
-      -1,   147,    -1,   149,   150,   151,   152,   153,   154,   155,
-      -1,    -1,   158,   159,   160,   161,   162,   163,    -1,   165,
-     166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,
-     176,   177,   178,   179,    -1,   181,   182,   183,   184,    -1,
-     186,    -1,   188,   189,   190,   191,   192,    -1,   194,   195,
-     196,    -1,    -1,   199,   200,   201,   202,   203,    -1,   205,
-     206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,    -1,   225,
-     226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
-     246,   247,    -1,   249,   250,   251,   252,   253,   254,   255,
-      -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
-     266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-      -1,    -1,   288,   289,   290,   291,   292,    -1,   294,   295,
-     296,    -1,    -1,   299,   300,   301,   302,   303,   304,   305,
-     306,    -1,   308,   309,    -1,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,    -1,   321,   322,   323,   324,    -1,
-     326,   327,   328,   329,   330,   331,    -1,   333,   334,    -1,
-     336,   337,   338,    -1,    -1,   341,   342,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,   358,   359,   360,   361,   362,    -1,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,    -1,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,    -1,   390,   391,   392,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,    -1,   404,    -1,
-     406,   407,   408,   409,   410,    -1,   412,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,    -1,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,    -1,
-     436,   437,    -1,   439,   440,   441,   442,   443,   444,   445,
-      -1,   447,   448,    -1,    -1,   451,   452,   453,   454,   455,
-     456,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
-     466,   467,   468,   469,   470,    -1,    -1,   473,   474,   475,
-     476,   477,    -1,   479,    -1,   481,   482,   483,   484,   485,
-     486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,    70,   508,   509,    -1,    74,    75,    76,    77,    78,
-      79,    -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   209,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     217,    -1,    -1,    -1,   221,    -1,    -1,    -1,    -1,    -1,
+     227,    -1,    -1,    -1,    -1,    -1,   233,    -1,   235,    -1,
+      -1,    -1,    -1,    -1,   241,    -1,   243,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   251,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   265,   266,
+      -1,    -1,    -1,    -1,    -1,   272,    -1,   274,    -1,    -1,
+     277,   278,    -1,   280,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   289,   290,    -1,   292,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   314,   315,   316,
+      -1,    -1,   319,    -1,    -1,    -1,   323,    -1,    -1,   326,
+      -1,   328,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   342,   343,    -1,   345,   346,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     357,    -1,   359,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   372,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   392,    -1,    -1,    -1,   396,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   414,    -1,    -1,
+     417,    -1,    -1,   420,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,
+      -1,    -1,    -1,   440,    -1,    -1,    -1,    -1,    -1,    -1,
+     447,   448,    -1,    -1,    -1,    -1,   453,    -1,   455,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   464,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   479,    -1,    -1,   482,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+       6,     7,     8,    -1,    10,    11,    12,    -1,    -1,    -1,
+      16,    -1,    -1,    19,    20,    21,    22,    23,    24,    -1,
+      26,    27,    -1,    -1,    -1,    31,    32,    33,    34,    -1,
+      -1,    37,    38,    39,    -1,    41,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   118,    -1,    -1,    -1,   122,   123,   124,   125,
+     126,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   138,    -1,    -1,    -1,    -1,    -1,    -1,   145,
+      -1,   147,    -1,    -1,    -1,    -1,    -1,   153,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   165,
+      -1,    -1,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   182,   183,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   217,    -1,    -1,    -1,   221,    -1,    -1,    -1,    -1,
+      -1,   227,    -1,    -1,    -1,    -1,    -1,   233,    -1,   235,
+      -1,    -1,    -1,    -1,    -1,   241,    -1,   243,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   251,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   265,
+     266,    -1,    -1,    -1,    -1,    -1,   272,    -1,   274,    -1,
+      -1,   277,   278,    -1,   280,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   289,   290,    -1,   292,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   314,   315,
+     316,    -1,    -1,   319,    -1,    -1,    -1,   323,    -1,    -1,
+     326,    -1,   328,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   342,   343,    -1,   345,
+     346,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   357,    -1,   359,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   372,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   392,    -1,    -1,    -1,
+     396,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   414,    -1,
+      -1,   417,    -1,    -1,   420,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,
+      -1,    -1,    -1,    -1,   440,    -1,    -1,    -1,    -1,    -1,
+      -1,   447,   448,    -1,    -1,    -1,    -1,   453,    -1,   455,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   479,    -1,    -1,   482,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,    70,    71,    -1,    -1,    74,    75,    76,    77,    78,
+      79,    80,    81,    -1,    -1,    -1,    85,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,
       99,   100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,
@@ -27935,11 +27573,11 @@
      149,   150,   151,   152,   153,   154,   155,    -1,    -1,   158,
      159,   160,   161,   162,   163,    -1,   165,   166,   167,    -1,
       -1,    -1,    -1,   172,    -1,    -1,    -1,   176,   177,   178,
-     179,    -1,   181,   182,   183,   184,   185,   186,    -1,   188,
+     179,    -1,   181,   182,   183,   184,    -1,   186,    -1,   188,
      189,   190,   191,   192,    -1,   194,   195,   196,    -1,    -1,
      199,   200,   201,   202,   203,    -1,   205,   206,   207,    -1,
      209,   210,   211,    -1,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,    -1,   223,    -1,   225,   226,   227,   228,
+     219,   220,   221,   222,   223,    -1,   225,   226,   227,   228,
       -1,   230,    -1,   232,   233,    -1,   235,   236,   237,   238,
       -1,   240,   241,    -1,   243,   244,    -1,   246,   247,    -1,
      249,   250,   251,   252,   253,   254,   255,    -1,   257,   258,
@@ -27950,7 +27588,7 @@
      299,   300,   301,   302,   303,   304,   305,   306,    -1,   308,
      309,    -1,   311,   312,   313,   314,   315,   316,   317,   318,
      319,    -1,   321,   322,   323,   324,    -1,   326,   327,   328,
-     329,   330,   331,    -1,   333,    -1,    -1,   336,   337,   338,
+     329,   330,   331,    -1,   333,   334,    -1,   336,   337,   338,
       -1,    -1,   341,   342,   343,   344,   345,   346,   347,   348,
      349,   350,   351,   352,   353,    -1,   355,   356,   357,   358,
      359,   360,   361,   362,    -1,   364,   365,   366,   367,   368,
@@ -27962,16 +27600,16 @@
      419,   420,   421,    -1,   423,   424,   425,   426,   427,   428,
      429,   430,   431,   432,   433,   434,    -1,   436,   437,    -1,
      439,   440,   441,   442,   443,   444,   445,    -1,   447,   448,
-      -1,    -1,   451,   452,   453,   454,   455,    -1,   457,   458,
+      -1,    -1,   451,   452,   453,   454,   455,   456,   457,   458,
      459,   460,   461,   462,   463,    -1,    -1,   466,   467,   468,
      469,   470,    -1,    -1,   473,   474,   475,   476,   477,    -1,
      479,    -1,   481,   482,   483,   484,   485,   486,    -1,    -1,
      489,    -1,    -1,   492,   493,   494,   495,   496,   497,   498,
      499,   500,   501,   502,   503,   504,   505,   506,    70,   508,
-     509,    -1,    74,    75,    76,    77,    78,    79,    -1,    81,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     509,    -1,    -1,    -1,    -1,    -1,    78,    79,   517,   518,
+     519,    -1,    -1,    -1,    -1,    -1,    -1,   526,    -1,    -1,
       -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
-      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   103,   104,   105,   106,   107,    -1,    -1,    -1,    -1,
       -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
      122,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
      132,    -1,    -1,   135,   136,    -1,   138,   139,    -1,   141,
@@ -28001,11 +27639,277 @@
      372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
      382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
      392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,    -1,   404,   405,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,   478,   479,    -1,   481,
+     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,   491,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,    -1,   508,   509,    70,    71,
+     512,    -1,    74,    75,    76,    77,    78,    79,    80,    81,
+      -1,    -1,    -1,    85,   526,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,    -1,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
+     152,   153,   154,   155,    -1,    -1,   158,   159,   160,   161,
+     162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,
+     172,    -1,    -1,    -1,   176,   177,   178,   179,    -1,   181,
+     182,   183,   184,   185,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,   233,    -1,   235,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,    -1,   249,   250,   251,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,   265,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,   290,   291,
+     292,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,    -1,   308,   309,    -1,   311,
+     312,   313,   314,   315,   316,   317,   318,   319,    -1,   321,
+     322,   323,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,   334,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,    -1,   404,    -1,   406,   407,   408,   409,   410,    -1,
+     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,   440,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,    -1,   479,    -1,   481,
+     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,    -1,   508,   509,    -1,    -1,
+      -1,    -1,    -1,    70,    71,   517,   518,    74,    75,    76,
+      77,    78,    79,    80,    81,    -1,    -1,    -1,    85,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
+      -1,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,   153,   154,   155,    -1,
+      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
+     167,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,   176,
+     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,   233,    -1,   235,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,    -1,   249,   250,   251,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
+      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,   290,   291,   292,    -1,   294,   295,   296,
+      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
+      -1,   308,   309,    -1,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,   321,   322,   323,   324,    -1,   326,
+     327,   328,   329,   330,   331,    -1,   333,   334,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,    -1,   404,    -1,   406,
+     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,   440,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
+     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
+     477,    -1,   479,    -1,   481,   482,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+      -1,   508,   509,    -1,    -1,    -1,    -1,    -1,    70,    71,
+     517,   518,    74,    75,    76,    77,    78,    79,    80,    81,
+      -1,    -1,    -1,    85,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,    -1,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
+     152,   153,   154,   155,    -1,    -1,   158,   159,   160,   161,
+     162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,
+     172,    -1,    -1,    -1,   176,   177,   178,   179,    -1,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,   233,    -1,   235,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,    -1,   249,   250,   251,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,   265,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,   290,   291,
+     292,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,    -1,   308,   309,    -1,   311,
+     312,   313,   314,   315,   316,   317,   318,   319,    -1,   321,
+     322,   323,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,   334,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
      402,    -1,   404,    -1,   406,   407,   408,   409,   410,    -1,
      412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
       -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
      432,   433,   434,    -1,   436,   437,    -1,   439,   440,   441,
      442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
+     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,    -1,   479,    -1,   481,
+     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,    -1,   508,   509,    -1,    -1,
+      -1,    -1,    -1,    70,    71,   517,   518,    74,    75,    76,
+      77,    78,    79,    -1,    81,    -1,    -1,    -1,    85,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
+      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
+      -1,   138,   139,    -1,   141,   142,   143,   144,   145,    -1,
+     147,    -1,   149,   150,   151,   152,   153,   154,   155,    -1,
+      -1,   158,   159,   160,   161,   162,   163,    -1,   165,   166,
+     167,    -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,   176,
+     177,   178,   179,    -1,   181,   182,   183,   184,   185,   186,
+      -1,   188,   189,   190,   191,   192,    -1,   194,   195,   196,
+      -1,    -1,   199,   200,   201,   202,   203,    -1,   205,   206,
+     207,    -1,   209,   210,   211,    -1,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,    -1,   225,   226,
+     227,   228,    -1,   230,    -1,   232,   233,    -1,   235,   236,
+     237,   238,    -1,   240,   241,    -1,   243,   244,    -1,   246,
+     247,    -1,   249,   250,   251,   252,   253,   254,   255,    -1,
+     257,   258,   259,   260,   261,   262,    -1,   264,   265,   266,
+      -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,    -1,
+      -1,   288,   289,   290,   291,   292,    -1,   294,   295,   296,
+      -1,    -1,   299,   300,   301,   302,   303,   304,   305,   306,
+      -1,   308,   309,    -1,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,   321,   322,   323,   324,    -1,   326,
+     327,   328,   329,   330,   331,    -1,   333,   334,    -1,   336,
+     337,   338,    -1,    -1,   341,   342,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,   358,   359,   360,   361,   362,    -1,   364,   365,   366,
+     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+      -1,   378,   379,   380,   381,   382,   383,   384,   385,   386,
+     387,   388,    -1,   390,   391,   392,   393,   394,   395,   396,
+     397,   398,   399,   400,   401,   402,    -1,   404,    -1,   406,
+     407,   408,   409,   410,    -1,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,    -1,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,    -1,   436,
+     437,    -1,   439,   440,   441,   442,   443,   444,   445,    -1,
+     447,   448,    -1,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,    -1,   466,
+     467,   468,   469,   470,    -1,    -1,   473,   474,   475,   476,
+     477,    -1,   479,    -1,   481,   482,   483,   484,   485,   486,
+      -1,    -1,   489,    -1,    -1,   492,   493,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,   504,   505,   506,
+      -1,   508,   509,    -1,    -1,    -1,    -1,    -1,    70,    71,
+     517,   518,    74,    75,    76,    77,    78,    79,    -1,    81,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,    -1,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
+     152,   153,   154,   155,    -1,    -1,   158,   159,   160,   161,
+     162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,
+     172,    -1,    -1,   175,   176,   177,   178,   179,    -1,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,   233,    -1,   235,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,    -1,   249,   250,   251,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,   265,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,   290,   291,
+     292,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,    -1,   308,   309,    -1,   311,
+     312,   313,   314,   315,   316,   317,   318,   319,    -1,   321,
+     322,   323,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,    -1,   404,    -1,   406,   407,   408,   409,   410,   411,
+     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,   440,   441,
+     442,   443,   444,   445,    -1,   447,   448,   449,    -1,   451,
+     452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
+      -1,   473,   474,   475,   476,   477,    -1,   479,    -1,   481,
+     482,   483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,    -1,   508,   509,    70,    71,
+      -1,    -1,    74,    75,    76,    77,    78,    79,    -1,    81,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    95,    96,    97,    98,    99,   100,   101,
+      -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,   114,    -1,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,    -1,   128,   129,   130,   131,
+     132,    -1,    -1,   135,   136,    -1,   138,   139,    -1,   141,
+     142,   143,   144,   145,    -1,   147,    -1,   149,   150,   151,
+     152,   153,   154,   155,    -1,    -1,   158,   159,   160,   161,
+     162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,    -1,
+     172,    -1,    -1,   175,   176,   177,   178,   179,    -1,   181,
+     182,   183,   184,    -1,   186,    -1,   188,   189,   190,   191,
+     192,    -1,   194,   195,   196,    -1,    -1,   199,   200,   201,
+     202,   203,    -1,   205,   206,   207,    -1,   209,   210,   211,
+      -1,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+      -1,   223,    -1,   225,   226,   227,   228,    -1,   230,    -1,
+     232,   233,    -1,   235,   236,   237,   238,    -1,   240,   241,
+      -1,   243,   244,    -1,   246,   247,    -1,   249,   250,   251,
+     252,   253,   254,   255,    -1,   257,   258,   259,   260,   261,
+     262,    -1,   264,   265,   266,    -1,   268,   269,   270,    -1,
+     272,    -1,   274,    -1,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,    -1,    -1,   288,   289,   290,   291,
+     292,    -1,   294,   295,   296,    -1,    -1,   299,   300,   301,
+     302,   303,   304,   305,   306,    -1,   308,   309,    -1,   311,
+     312,   313,   314,   315,   316,   317,   318,   319,    -1,   321,
+     322,   323,   324,    -1,   326,   327,   328,   329,   330,   331,
+      -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,   341,
+     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,   355,   356,   357,   358,   359,   360,   361,
+     362,    -1,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,    -1,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,    -1,   390,   391,
+     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,    -1,   404,    -1,   406,   407,   408,   409,   410,   411,
+     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+      -1,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,    -1,   436,   437,    -1,   439,   440,   441,
+     442,   443,   444,   445,    -1,   447,   448,    -1,    -1,   451,
      452,   453,   454,   455,    -1,   457,   458,   459,   460,   461,
      462,   463,    -1,    -1,   466,   467,   468,   469,   470,    -1,
       -1,   473,   474,   475,   476,   477,    -1,   479,    -1,   481,
@@ -28026,7 +27930,7 @@
       -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
      195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
      205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,    -1,   223,    -1,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,    -1,
      225,   226,   227,   228,    -1,   230,    -1,   232,   233,    -1,
      235,   236,   237,   238,    -1,   240,   241,    -1,   243,   244,
       -1,   246,   247,    -1,   249,   250,   251,   252,   253,   254,
@@ -28037,7 +27941,7 @@
      295,   296,    -1,    -1,   299,   300,   301,   302,   303,   304,
      305,   306,    -1,   308,   309,    -1,   311,   312,   313,   314,
      315,   316,   317,   318,   319,    -1,   321,   322,   323,   324,
-      -1,   326,   327,   328,   329,   330,   331,    -1,   333,    -1,
+      -1,   326,   327,   328,   329,   330,   331,    -1,   333,   334,
       -1,   336,   337,   338,    -1,    -1,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
      355,   356,   357,   358,   359,   360,   361,   362,    -1,   364,
@@ -28050,23 +27954,23 @@
      425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
       -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
      445,    -1,   447,   448,    -1,    -1,   451,   452,   453,   454,
-     455,    -1,   457,   458,   459,   460,   461,   462,   463,    -1,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
       -1,   466,   467,   468,   469,   470,    -1,    -1,   473,   474,
      475,   476,   477,    -1,   479,    -1,   481,   482,   483,   484,
      485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
      495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,    70,   508,   509,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     505,   506,    70,   508,   509,    -1,    74,    75,    76,    77,
+      78,    79,    -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,   104,   105,    -1,    -1,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
      118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
      128,   129,   130,   131,   132,    -1,    -1,   135,   136,    -1,
      138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
       -1,   149,   150,   151,   152,   153,   154,   155,    -1,    -1,
      158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
-      -1,    -1,    -1,    -1,   172,    -1,    -1,   175,   176,   177,
-     178,   179,    -1,   181,   182,   183,   184,    -1,   186,    -1,
+      -1,    -1,    -1,    -1,   172,    -1,    -1,    -1,   176,   177,
+     178,   179,    -1,   181,   182,   183,   184,   185,   186,    -1,
      188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
       -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
       -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
@@ -28089,7 +27993,7 @@
      378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
      388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
      398,   399,   400,   401,   402,    -1,   404,    -1,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+     408,   409,   410,    -1,   412,   413,   414,   415,   416,   417,
      418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
      428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
       -1,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
@@ -28099,8 +28003,8 @@
       -1,   479,    -1,   481,   482,   483,   484,   485,   486,    -1,
       -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
      498,   499,   500,   501,   502,   503,   504,   505,   506,    70,
-     508,   509,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     508,   509,    -1,    74,    75,    76,    77,    78,    79,    -1,
+      81,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
      101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
@@ -28109,7 +28013,7 @@
      141,   142,   143,   144,   145,    -1,   147,    -1,   149,   150,
      151,   152,   153,   154,   155,    -1,    -1,   158,   159,   160,
      161,   162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,
-      -1,   172,    -1,    -1,   175,   176,   177,   178,   179,    -1,
+      -1,   172,    -1,    -1,    -1,   176,   177,   178,   179,    -1,
      181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
      191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
      201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
@@ -28133,17 +28037,17 @@
      381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
      391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
      401,   402,    -1,   404,    -1,   406,   407,   408,   409,   410,
-     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
+      -1,   412,   413,   414,   415,   416,   417,   418,   419,   420,
      421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
      431,   432,   433,   434,    -1,   436,   437,    -1,   439,   440,
      441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
      451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
      461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
-     471,    -1,   473,   474,   475,   476,   477,    -1,   479,    -1,
+      -1,    -1,   473,   474,   475,   476,   477,    -1,   479,    -1,
      481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
       -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
      501,   502,   503,   504,   505,   506,    70,   508,   509,    -1,
-      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
+      74,    75,    76,    77,    78,    79,    -1,    81,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
      104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
@@ -28153,13 +28057,13 @@
      144,   145,    -1,   147,    -1,   149,   150,   151,   152,   153,
      154,   155,    -1,    -1,   158,   159,   160,   161,   162,   163,
       -1,   165,   166,   167,    -1,    -1,    -1,    -1,   172,    -1,
-      -1,   175,   176,   177,   178,   179,    -1,   181,   182,   183,
+      -1,    -1,   176,   177,   178,   179,    -1,   181,   182,   183,
      184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
      194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
       -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
      214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
       -1,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
-      -1,   235,   236,   237,   238,    -1,   240,   241,   242,   243,
+      -1,   235,   236,   237,   238,    -1,   240,   241,    -1,   243,
      244,    -1,   246,   247,    -1,   249,   250,   251,   252,   253,
      254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
      264,   265,   266,    -1,   268,   269,   270,    -1,   272,    -1,
@@ -28176,7 +28080,7 @@
      374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
      384,   385,   386,   387,   388,    -1,   390,   391,   392,   393,
      394,   395,   396,   397,   398,   399,   400,   401,   402,    -1,
-     404,    -1,   406,   407,   408,   409,   410,   411,   412,   413,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
      414,   415,   416,   417,   418,   419,   420,   421,    -1,   423,
      424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
      434,    -1,   436,   437,    -1,   439,   440,   441,   442,   443,
@@ -28189,7 +28093,7 @@
      504,   505,   506,    70,   508,   509,    -1,    -1,    -1,    -1,
       -1,    78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,   103,   104,   105,    -1,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,
      117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
       -1,   128,   129,   130,   131,   132,    -1,    -1,   135,   136,
@@ -28233,7 +28137,7 @@
       70,   508,   509,    -1,    -1,    -1,    -1,    -1,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    94,    95,    96,    97,    98,    99,
-     100,   101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,
+     100,   101,   102,   103,   104,   105,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,   113,   114,    -1,   116,   117,   118,   119,
      120,   121,   122,   123,   124,   125,   126,    -1,   128,   129,
      130,   131,   132,    -1,    -1,   135,   136,    -1,   138,   139,
@@ -28313,7 +28217,7 @@
      433,   434,    -1,   436,   437,    -1,   439,   440,   441,   442,
      443,   444,   445,    -1,   447,   448,    -1,    -1,   451,   452,
      453,   454,   455,    -1,   457,   458,   459,   460,   461,   462,
-     463,    -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,
+     463,    -1,    -1,   466,   467,   468,   469,   470,   471,    -1,
      473,   474,   475,   476,   477,    -1,   479,    -1,   481,   482,
      483,   484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,
      493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
@@ -28334,7 +28238,7 @@
      206,   207,    -1,   209,   210,   211,    -1,   213,   214,   215,
      216,   217,   218,   219,   220,   221,    -1,   223,    -1,   225,
      226,   227,   228,    -1,   230,    -1,   232,   233,    -1,   235,
-     236,   237,   238,    -1,   240,   241,    -1,   243,   244,    -1,
+     236,   237,   238,    -1,   240,   241,   242,   243,   244,    -1,
      246,   247,    -1,   249,   250,   251,   252,   253,   254,   255,
       -1,   257,   258,   259,   260,   261,   262,    -1,   264,   265,
      266,    -1,   268,   269,   270,    -1,   272,    -1,   274,    -1,
@@ -28452,14 +28356,14 @@
       -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
       95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
-     105,   106,   107,    -1,    -1,    -1,    -1,    -1,   113,   114,
+     105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,   114,
       -1,   116,   117,   118,   119,   120,   121,   122,   123,   124,
      125,   126,    -1,   128,   129,   130,   131,   132,    -1,    -1,
      135,   136,    -1,   138,   139,    -1,   141,   142,   143,   144,
      145,    -1,   147,    -1,   149,   150,   151,   152,   153,   154,
      155,    -1,    -1,   158,   159,   160,   161,   162,   163,    -1,
      165,   166,   167,    -1,    -1,    -1,    -1,   172,    -1,    -1,
-      -1,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
+     175,   176,   177,   178,   179,    -1,   181,   182,   183,   184,
       -1,   186,    -1,   188,   189,   190,   191,   192,    -1,   194,
      195,   196,    -1,    -1,   199,   200,   201,   202,   203,    -1,
      205,   206,   207,    -1,   209,   210,   211,    -1,   213,   214,
@@ -28482,7 +28386,7 @@
      375,   376,    -1,   378,   379,   380,   381,   382,   383,   384,
      385,   386,   387,   388,    -1,   390,   391,   392,   393,   394,
      395,   396,   397,   398,   399,   400,   401,   402,    -1,   404,
-      -1,   406,   407,   408,   409,   410,    -1,   412,   413,   414,
+      -1,   406,   407,   408,   409,   410,   411,   412,   413,   414,
      415,   416,   417,   418,   419,   420,   421,    -1,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
       -1,   436,   437,    -1,   439,   440,   441,   442,   443,   444,
@@ -28492,7 +28396,138 @@
      475,   476,   477,    -1,   479,    -1,   481,   482,   483,   484,
      485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,   494,
      495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,   506,    -1,   508,   509
+     505,   506,    70,   508,   509,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
+      98,    99,   100,   101,    -1,   103,   104,   105,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,   114,    -1,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,    -1,
+     128,   129,   130,   131,   132,    -1,    -1,   135,   136,    -1,
+     138,   139,    -1,   141,   142,   143,   144,   145,    -1,   147,
+      -1,   149,   150,   151,   152,   153,   154,   155,    -1,    -1,
+     158,   159,   160,   161,   162,   163,    -1,   165,   166,   167,
+      -1,    -1,    -1,    -1,   172,    -1,    -1,   175,   176,   177,
+     178,   179,    -1,   181,   182,   183,   184,    -1,   186,    -1,
+     188,   189,   190,   191,   192,    -1,   194,   195,   196,    -1,
+      -1,   199,   200,   201,   202,   203,    -1,   205,   206,   207,
+      -1,   209,   210,   211,    -1,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,    -1,   223,    -1,   225,   226,   227,
+     228,    -1,   230,    -1,   232,   233,    -1,   235,   236,   237,
+     238,    -1,   240,   241,    -1,   243,   244,    -1,   246,   247,
+      -1,   249,   250,   251,   252,   253,   254,   255,    -1,   257,
+     258,   259,   260,   261,   262,    -1,   264,   265,   266,    -1,
+     268,   269,   270,    -1,   272,    -1,   274,    -1,   276,   277,
+     278,   279,   280,   281,   282,   283,   284,   285,    -1,    -1,
+     288,   289,   290,   291,   292,    -1,   294,   295,   296,    -1,
+      -1,   299,   300,   301,   302,   303,   304,   305,   306,    -1,
+     308,   309,    -1,   311,   312,   313,   314,   315,   316,   317,
+     318,   319,    -1,   321,   322,   323,   324,    -1,   326,   327,
+     328,   329,   330,   331,    -1,   333,    -1,    -1,   336,   337,
+     338,    -1,    -1,   341,   342,   343,   344,   345,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
+     358,   359,   360,   361,   362,    -1,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,    -1,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,    -1,   390,   391,   392,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,    -1,   404,    -1,   406,   407,
+     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+     418,   419,   420,   421,    -1,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,    -1,   436,   437,
+      -1,   439,   440,   441,   442,   443,   444,   445,    -1,   447,
+     448,    -1,    -1,   451,   452,   453,   454,   455,    -1,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,   466,   467,
+     468,   469,   470,    -1,    -1,   473,   474,   475,   476,   477,
+      -1,   479,    -1,   481,   482,   483,   484,   485,   486,    -1,
+      -1,   489,    -1,    -1,   492,   493,   494,   495,   496,   497,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,    70,
+     508,   509,    -1,    -1,    -1,    -1,    -1,    78,    79,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    94,    95,    96,    97,    98,    99,   100,
+     101,    -1,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   113,   114,    -1,   116,   117,   118,   119,   120,
+     121,   122,   123,   124,   125,   126,    -1,   128,   129,   130,
+     131,   132,    -1,    -1,   135,   136,    -1,   138,   139,    -1,
+     141,   142,   143,   144,   145,    -1,   147,    -1,   149,   150,
+     151,   152,   153,   154,   155,    -1,    -1,   158,   159,   160,
+     161,   162,   163,    -1,   165,   166,   167,    -1,    -1,    -1,
+      -1,   172,    -1,    -1,   175,   176,   177,   178,   179,    -1,
+     181,   182,   183,   184,    -1,   186,    -1,   188,   189,   190,
+     191,   192,    -1,   194,   195,   196,    -1,    -1,   199,   200,
+     201,   202,   203,    -1,   205,   206,   207,    -1,   209,   210,
+     211,    -1,   213,   214,   215,   216,   217,   218,   219,   220,
+     221,    -1,   223,    -1,   225,   226,   227,   228,    -1,   230,
+      -1,   232,   233,    -1,   235,   236,   237,   238,    -1,   240,
+     241,    -1,   243,   244,    -1,   246,   247,    -1,   249,   250,
+     251,   252,   253,   254,   255,    -1,   257,   258,   259,   260,
+     261,   262,    -1,   264,   265,   266,    -1,   268,   269,   270,
+      -1,   272,    -1,   274,    -1,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,    -1,    -1,   288,   289,   290,
+     291,   292,    -1,   294,   295,   296,    -1,    -1,   299,   300,
+     301,   302,   303,   304,   305,   306,    -1,   308,   309,    -1,
+     311,   312,   313,   314,   315,   316,   317,   318,   319,    -1,
+     321,   322,   323,   324,    -1,   326,   327,   328,   329,   330,
+     331,    -1,   333,    -1,    -1,   336,   337,   338,    -1,    -1,
+     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,   355,   356,   357,   358,   359,   360,
+     361,   362,    -1,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,    -1,   378,   379,   380,
+     381,   382,   383,   384,   385,   386,   387,   388,    -1,   390,
+     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
+     401,   402,    -1,   404,    -1,   406,   407,   408,   409,   410,
+     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
+     421,    -1,   423,   424,   425,   426,   427,   428,   429,   430,
+     431,   432,   433,   434,    -1,   436,   437,    -1,   439,   440,
+     441,   442,   443,   444,   445,    -1,   447,   448,    -1,    -1,
+     451,   452,   453,   454,   455,    -1,   457,   458,   459,   460,
+     461,   462,   463,    -1,    -1,   466,   467,   468,   469,   470,
+      -1,    -1,   473,   474,   475,   476,   477,    -1,   479,    -1,
+     481,   482,   483,   484,   485,   486,    -1,    -1,   489,    -1,
+      -1,   492,   493,   494,   495,   496,   497,   498,   499,   500,
+     501,   502,   503,   504,   505,   506,    70,   508,   509,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,    -1,   103,
+     104,   105,   106,   107,    -1,    -1,    -1,    -1,    -1,   113,
+     114,    -1,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,    -1,   128,   129,   130,   131,   132,    -1,
+      -1,   135,   136,    -1,   138,   139,    -1,   141,   142,   143,
+     144,   145,    -1,   147,    -1,   149,   150,   151,   152,   153,
+     154,   155,    -1,    -1,   158,   159,   160,   161,   162,   163,
+      -1,   165,   166,   167,    -1,    -1,    -1,    -1,   172,    -1,
+      -1,    -1,   176,   177,   178,   179,    -1,   181,   182,   183,
+     184,    -1,   186,    -1,   188,   189,   190,   191,   192,    -1,
+     194,   195,   196,    -1,    -1,   199,   200,   201,   202,   203,
+      -1,   205,   206,   207,    -1,   209,   210,   211,    -1,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,    -1,   223,
+      -1,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
+      -1,   235,   236,   237,   238,    -1,   240,   241,    -1,   243,
+     244,    -1,   246,   247,    -1,   249,   250,   251,   252,   253,
+     254,   255,    -1,   257,   258,   259,   260,   261,   262,    -1,
+     264,   265,   266,    -1,   268,   269,   270,    -1,   272,    -1,
+     274,    -1,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,    -1,    -1,   288,   289,   290,   291,   292,    -1,
+     294,   295,   296,    -1,    -1,   299,   300,   301,   302,   303,
+     304,   305,   306,    -1,   308,   309,    -1,   311,   312,   313,
+     314,   315,   316,   317,   318,   319,    -1,   321,   322,   323,
+     324,    -1,   326,   327,   328,   329,   330,   331,    -1,   333,
+      -1,    -1,   336,   337,   338,    -1,    -1,   341,   342,   343,
+     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,   358,   359,   360,   361,   362,    -1,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,    -1,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,    -1,   390,   391,   392,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,    -1,
+     404,    -1,   406,   407,   408,   409,   410,    -1,   412,   413,
+     414,   415,   416,   417,   418,   419,   420,   421,    -1,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,    -1,   436,   437,    -1,   439,   440,   441,   442,   443,
+     444,   445,    -1,   447,   448,    -1,    -1,   451,   452,   453,
+     454,   455,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,   466,   467,   468,   469,   470,    -1,    -1,   473,
+     474,   475,   476,   477,    -1,   479,    -1,   481,   482,   483,
+     484,   485,   486,    -1,    -1,   489,    -1,    -1,   492,   493,
+     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,    -1,   508,   509
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -28627,435 +28662,436 @@
      484,    84,    91,    92,    93,   142,   223,   513,   514,   515,
      517,   518,   519,   520,   521,   522,   850,  1081,  1082,  1252,
      250,  1121,   102,  1131,  1132,  1121,  1121,   250,  1119,  1121,
-     386,   412,   102,   250,  1011,  1121,   402,  1121,   773,   303,
-    1131,  1132,   250,  1119,   283,    34,   187,   279,   320,   371,
-     886,   887,   888,  1119,  1125,  1252,   101,   134,   147,   148,
-     157,   161,   179,   200,   211,   219,   231,   236,   259,   284,
-     305,   336,   356,   393,   398,   400,   406,   409,   438,   441,
-     445,   452,   454,   459,   484,   672,   779,  1272,  1119,   449,
-    1127,  1121,   526,   773,   454,  1122,   773,   454,   250,  1121,
-     178,   438,   442,   444,  1131,   442,   444,   142,   223,   850,
-     384,  1121,  1131,   250,   556,  1252,  1121,  1121,   402,  1121,
-     773,   303,  1131,   375,   406,   438,   484,   305,   161,   259,
-     236,   398,   452,   458,   666,    84,  1148,  1149,   531,  1268,
-    1275,   102,  1160,  1274,   955,   570,  1134,  1272,   853,   250,
-    1127,  1121,   250,   857,   250,  1122,   123,   125,   126,   137,
-     138,   182,   183,   201,   227,   250,   271,   272,   274,   314,
-     316,   328,   372,   414,   420,   447,   448,   479,   775,  1026,
-    1028,  1030,  1032,  1034,  1036,  1037,  1038,  1040,  1041,  1042,
-    1045,  1046,  1246,  1253,  1257,  1258,  1274,   454,   178,   438,
-     250,  1127,   250,  1132,  1133,   153,   484,   142,   223,   250,
-     850,   128,   250,  1121,   250,  1133,   250,  1121,   250,  1121,
-     250,  1121,   402,   857,   250,  1121,   250,   775,   250,   303,
-    1133,   283,   250,   772,   773,   526,   532,  1276,  1277,  1278,
-    1279,  1281,  1186,    70,  1156,  1205,   526,   930,   615,   954,
-     921,   915,   922,   923,   924,  1134,   916,  1130,   787,   788,
-     102,   787,   954,  1130,   788,   102,   787,   954,  1130,   788,
-     788,   788,  1130,  1129,  1129,   275,   472,  1210,  1211,  1285,
-    1286,   954,   788,   365,   526,   526,   634,   634,   634,   334,
-     449,   529,   634,   400,  1011,  1012,   787,   954,   787,   954,
-     529,   881,  1272,   234,   526,   927,   128,   484,   482,   864,
-     865,  1119,  1121,  1252,   118,   509,   279,   528,   337,   337,
-     334,   234,  1272,   449,   229,   782,   334,    82,    83,    84,
-      86,   110,   123,   125,   126,   133,   134,   137,   138,   145,
-     147,   169,   170,   171,   172,   173,   174,   175,   182,   183,
-     217,   221,   222,   227,   241,   243,   272,   274,   289,   297,
-     298,   314,   316,   320,   325,   326,   328,   336,   346,   357,
-     372,   396,   411,   420,   434,   447,   448,   453,   455,   456,
-     465,   471,   479,   499,   500,   501,   502,   503,   504,   505,
-     506,   510,   517,   518,   519,   526,   958,  1029,  1032,  1035,
-    1036,  1037,  1039,  1040,  1041,  1045,  1046,  1050,  1052,  1053,
-    1054,  1056,  1077,  1078,  1079,  1083,  1102,  1107,  1116,  1117,
-    1127,  1128,  1129,  1252,  1264,  1266,  1268,  1269,  1270,  1271,
-    1272,  1115,  1116,   449,   515,  1275,  1272,   449,   515,  1204,
-     102,   578,  1118,  1119,   410,   560,   185,   569,  1272,   570,
-    1272,   118,   139,   560,   509,   421,   887,   337,   234,   449,
-     515,   118,   509,   279,  1285,   888,   526,  1119,   519,   524,
-     528,  1108,  1109,  1012,  1256,   233,   235,   482,   912,   913,
-     915,   233,   918,   185,  1050,  1112,  1113,   963,   529,   526,
-     919,   527,   527,  1119,   102,   197,   969,   969,   128,   969,
-     224,   229,   293,   332,   976,   978,   979,   994,   996,   997,
-     998,   972,   973,   234,   275,  1011,  1013,  1114,   530,  1178,
-     519,  1197,  1198,  1200,   532,   532,    25,   271,   271,   449,
-     449,   449,   449,   526,   449,   518,   663,  1130,  1165,  1271,
-     208,   111,  1152,   128,  1155,  1155,   275,  1210,  1212,   275,
-    1210,  1211,  1212,   477,  1221,  1222,  1268,    14,    83,   423,
-     517,   518,  1129,  1213,  1214,  1215,  1264,  1266,  1270,  1271,
-    1272,  1273,   271,   277,  1121,   449,  1121,     6,  1121,  1245,
-    1200,   526,   833,  1109,   348,   382,   412,   528,   774,   348,
-     382,   412,   156,   206,   299,   348,   382,   412,   441,   443,
-     491,   571,   574,   893,   894,   895,   896,  1274,   805,    98,
-     202,   348,   382,   412,   475,   585,  1121,   412,    98,   202,
-     470,   553,   495,   250,  1011,   130,   163,   220,   253,   288,
-     320,   348,   382,   390,   397,   404,   412,   424,   432,   486,
-     571,   575,   836,   844,   526,   822,   382,   553,   256,   217,
-      98,   104,   144,   195,   202,   205,   230,   261,   318,   320,
-     330,   338,   348,   382,   385,   386,   412,   475,   583,   584,
-     691,   663,   102,   250,  1119,   773,   773,   526,   849,   528,
-     217,   334,   256,   545,   382,   491,   512,   538,   545,   334,
-     348,   382,   217,   129,   177,   258,   306,   308,   318,   347,
-     382,   387,   412,   426,   583,   660,   661,   348,   382,   483,
-     691,   699,   573,   561,   563,   256,   217,   382,   412,   583,
-     348,   382,   386,   412,   154,   194,   349,   443,   334,    98,
-     104,   202,   348,   382,   412,   595,   596,   229,   382,   412,
-     538,   574,   217,   382,   412,   583,  1121,   530,   291,   187,
-     335,   496,   529,   886,   472,   910,   334,  1127,   526,  1121,
-    1026,   454,   178,   438,  1127,   329,   484,   142,   223,   850,
-    1121,  1121,   402,   229,  1121,  1026,   283,   773,   634,   368,
-     600,   526,   748,   833,   140,  1026,   234,   526,   744,  1121,
-     538,   111,   904,  1121,   320,   538,   495,   250,  1119,   538,
-     773,   773,   744,   468,   615,   334,   538,   320,   118,   557,
-     459,   698,   348,   674,   154,   194,   349,   443,   100,   120,
-     270,   722,   111,   744,   229,   538,   484,   250,  1119,   250,
-     651,  1119,  1119,   484,   773,   153,   811,  1127,  1121,   229,
-     672,    73,  1150,  1252,   531,  1151,  1148,   124,   176,   268,
-     318,   401,   217,   833,   131,   388,   586,   217,   526,   217,
-     481,  1043,  1043,  1043,   526,  1031,  1031,   359,   526,  1033,
-     217,   137,   138,  1043,  1031,  1028,   493,   512,   526,  1047,
-     526,  1047,   529,   586,   110,  1027,   138,   526,  1044,   180,
-     310,   507,   526,  1048,   774,  1031,   495,   217,   822,   217,
-     529,   250,   772,   250,   773,   250,   773,   217,   849,  1133,
-     217,   334,   217,   217,   334,   217,   586,   217,   154,   194,
-     349,   443,   229,   217,   334,   217,   586,   217,   229,   250,
-     250,   570,   217,   529,   586,   527,  1277,  1278,  1276,   529,
-     533,  1050,  1086,  1209,  1284,  1285,   438,   955,   527,   529,
-     222,   334,   456,   567,   570,   663,   925,   921,   788,   954,
-     788,   954,  1286,  1287,   788,   954,   788,   954,  1287,   788,
-     954,   954,   954,   788,    14,   423,  1260,  1263,  1268,   954,
-     526,   635,   636,  1252,   635,   102,   179,   200,   231,   236,
-     283,   284,   400,   406,   438,   441,   459,   794,  1118,  1133,
-     793,  1121,   256,   529,   942,   954,   954,  1272,  1205,  1026,
-    1089,   111,  1133,   811,   527,   529,   291,  1252,   229,   229,
-     794,  1133,   399,  1252,   570,   334,   526,   524,   958,  1090,
-    1050,  1106,   526,   526,   229,   526,   526,   958,   526,   526,
-     526,   526,   526,   526,  1050,   526,   526,   526,   526,   526,
-     526,   526,   526,   958,   526,   526,   526,   526,   526,   526,
-     526,   526,  1050,  1050,  1050,   478,   958,  1050,  1086,  1109,
-    1272,   526,  1272,    84,    87,    91,    92,    93,   108,   111,
-     116,   122,   146,   251,   256,   277,   278,   292,   323,   336,
-     339,   417,   510,   513,   514,   515,   517,   518,   519,   520,
-     521,   522,  1081,  1083,  1085,  1274,   492,  1065,   345,  1050,
-     275,   529,   966,  1285,   526,  1272,  1109,    22,  1267,  1268,
-    1110,   966,   331,   334,  1237,  1237,    10,   477,  1224,  1225,
-    1227,  1204,  1204,   188,   252,   579,   529,   139,   185,   570,
-     111,   185,   296,   568,   663,  1046,  1272,  1274,  1272,   159,
-     199,  1062,   168,   185,   564,   565,   567,   663,   185,   564,
-    1285,  1285,   291,  1119,  1050,   519,  1124,  1254,  1108,   160,
-     387,   777,   277,   527,   529,   916,   527,   529,   964,  1120,
-    1121,   111,   919,   960,   960,   974,   975,  1050,   960,   226,
-     317,   985,   281,   318,   371,   415,   470,   102,   980,  1050,
-     981,   983,  1050,  1052,   994,   995,   979,   978,   976,   977,
-     229,   997,   330,   999,   976,   994,  1013,   932,  1119,   111,
-    1252,   412,  1197,   519,   529,   530,  1255,  1174,  1177,  1174,
-     271,   180,   248,   307,  1049,   307,  1049,  1049,   310,  1129,
-     307,   310,   403,  1271,   529,  1166,   184,  1204,   471,  1153,
-    1155,  1121,   423,  1129,  1226,  1268,   529,   515,  1121,    14,
-    1129,  1271,  1129,  1271,   529,  1184,   526,  1121,   526,  1256,
-     256,   266,   340,   342,   414,   480,   519,   826,   827,   828,
-     830,   832,   834,  1026,  1253,   348,   382,   412,   449,   449,
-     400,  1124,   528,   449,   449,   400,   293,   449,   449,   441,
-     560,   348,   893,   895,   515,   897,   229,   239,   256,   391,
-     806,   807,   140,   157,   213,   231,   363,   465,   631,   632,
-     157,   185,   320,   449,   157,   449,   185,   320,   400,   157,
-     195,   205,   348,   382,   740,   400,   680,   101,   134,   147,
-     161,   200,   211,   231,   236,   305,   336,   400,   406,   409,
-     438,   445,   452,   459,   484,   672,  1121,   217,   382,   412,
-     583,   334,   663,   404,   288,   449,   449,   325,   663,   189,
-     276,   400,   410,   451,   562,   388,   412,   836,   845,   527,
-     823,   826,   449,   471,   441,  1119,   148,   213,   622,   631,
-    1252,   148,   157,   868,   334,   396,   398,   454,   157,   868,
-     105,   385,   396,   398,   454,   396,  1119,   230,   261,   330,
-     773,   526,   449,   449,   249,   526,   590,   302,   441,   468,
-     491,   493,   590,   157,   529,   348,   256,   217,   382,   412,
-     583,   472,   472,   319,  1026,   348,   412,   850,  1121,  1119,
-     179,   574,   449,   540,   574,  1119,   449,   449,  1119,   663,
-     128,   662,   663,   663,   177,   306,   308,   128,   449,   538,
-     400,   538,   318,   661,   449,   449,   325,  1272,   691,   441,
-    1011,   157,   449,   868,   400,   449,   449,   590,   590,   773,
-     773,   773,   773,  1119,   117,   477,   117,   117,   449,   117,
-     449,   400,   529,   471,   709,  1132,   449,   540,  1119,   449,
-     400,   348,   382,   371,   383,   408,   566,   886,  1125,  1252,
-    1119,   833,  1026,   334,   277,   495,   822,   663,   773,   773,
-     849,   334,   277,   334,   154,   194,   349,   443,  1026,   334,
-     277,   773,   277,   491,   606,   429,   430,   601,  1272,   749,
-     750,  1274,   744,   526,   111,   773,   745,   746,  1254,   100,
-     893,  1026,   334,   217,   677,  1121,   320,   526,   539,   758,
-     472,   375,   484,  1119,   539,   217,  1132,   164,   239,   558,
-     614,   657,   721,   789,   809,   889,  1272,   699,   700,  1132,
-     299,   773,   773,   773,   773,   330,   190,   269,   457,   470,
-     723,   724,   209,   370,   526,   709,   539,  1119,   320,   659,
-     660,   320,   111,   330,   526,   634,   634,   250,   654,  1119,
-     229,   250,   812,  1125,   526,   824,   111,  1026,   283,   528,
-    1129,  1151,   491,   493,   956,   401,  1127,   586,  1026,  1122,
-     526,  1086,  1129,   775,  1043,  1043,   110,  1027,   447,   447,
-    1129,  1129,  1026,   524,   524,   412,  1129,   449,   449,  1129,
-    1031,   250,  1121,  1127,   586,  1133,  1132,   217,   586,   217,
-     472,   217,   472,   850,   586,   586,  1121,   773,  1133,  1121,
-     773,  1121,  1121,  1026,  1121,   773,   775,  1133,   709,   217,
-     217,   586,   772,   773,   527,   533,  1279,   527,   529,  1285,
-    1209,  1119,   176,   921,   923,   954,   954,  1287,   954,   954,
-    1287,   954,   954,  1121,    14,   529,  1267,   635,   527,   529,
-     527,   237,   407,   439,  1120,   772,   178,   409,   798,   799,
-    1120,   329,  1120,  1118,  1118,  1120,   772,   449,   491,   802,
-     212,   293,   706,   707,    96,   215,   396,   415,   943,  1011,
-     324,   944,   527,   529,   928,   931,   939,   946,   957,   449,
-    1119,   862,   863,   865,   792,   791,   792,   234,   240,   803,
-    1252,   101,   148,   179,   200,   211,   231,   236,   284,   305,
-     393,   400,   406,   438,   441,   459,   484,   672,   783,  1086,
-     525,  1086,  1090,  1091,   487,  1103,  1104,  1050,  1086,   526,
-    1129,  1129,   180,   248,   307,   310,   403,   507,  1092,  1093,
-    1272,  1274,  1086,  1086,  1086,  1129,  1129,  1050,   850,  1050,
-    1094,   396,   517,   518,   526,  1051,  1052,  1083,  1096,   527,
-    1086,  1050,  1086,  1097,  1050,   127,   234,   287,   450,  1050,
-    1086,  1100,  1086,   312,  1052,  1050,  1060,  1061,  1062,   312,
-    1050,  1062,   527,   529,  1129,  1048,  1026,  1050,  1050,  1050,
-    1050,  1254,   447,   115,   435,  1111,   773,  1050,   526,   958,
-    1101,   197,   199,   222,   320,   325,   330,   456,   466,  1050,
-     526,  1050,   449,   122,   251,   256,   292,   417,  1050,  1050,
-    1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,   102,   109,
-     422,  1080,   242,   225,  1066,   396,   526,  1077,   238,   296,
-     438,   442,   444,   468,   967,  1119,  1117,   234,  1001,   102,
-     197,   480,   519,   527,   828,  1050,  1087,  1088,  1253,  1121,
-    1268,  1108,  1001,  1226,   529,   515,  1119,   451,   526,  1272,
-     529,  1285,   527,   525,   531,   249,   249,   586,  1184,  1119,
-     913,   914,  1119,  1112,   527,   529,   526,   529,   112,   193,
-     472,   818,   526,   982,  1130,   415,   281,   335,   529,   396,
-     397,   984,  1118,   324,   419,   945,   995,   977,   472,   940,
-     185,   526,   933,   957,   111,  1252,   526,   947,   948,   949,
-     950,   951,  1252,   530,  1198,  1027,   533,  1177,   533,   527,
-     663,   527,    34,  1154,  1229,  1230,  1268,  1222,  1227,  1275,
-    1213,  1027,  1262,  1278,  1262,  1027,   342,   128,  1253,   527,
-     828,   830,   827,   830,  1253,   340,   527,   529,   774,   449,
-     449,   400,  1132,  1121,  1121,  1124,  1132,  1121,  1121,  1132,
-    1122,  1121,   185,   567,  1130,   393,   471,   791,   400,   239,
-     791,   526,  1121,   472,   813,   281,   281,   472,   526,   650,
-     250,  1121,   325,  1132,  1121,  1121,  1050,   325,  1121,  1121,
-     105,   385,   449,   449,  1121,   449,   681,  1127,   526,   773,
-     773,  1026,   454,   178,   438,   799,   484,   142,   223,   850,
-    1121,   773,  1121,   773,   402,   229,  1026,   773,   283,   244,
-     318,   348,   382,   476,   684,   685,   686,  1011,   449,   868,
-     400,   325,   189,   276,  1132,  1121,   334,  1121,   527,   529,
-    1131,  1133,  1121,   382,   583,   622,  1026,  1121,  1252,  1121,
-     291,  1121,   102,   471,  1121,   250,  1121,   250,  1252,   398,
-     454,   398,   454,   291,  1121,   102,   471,  1121,   291,   396,
-    1119,    98,   202,   412,   692,   693,   694,   695,  1254,  1132,
-    1121,   185,   235,   321,   472,   589,   592,   593,  1254,  1121,
-     333,   144,   333,  1121,   584,   449,   441,  1119,   449,   868,
-     400,  1123,  1252,  1123,   529,   527,   529,   449,   400,   334,
-     382,   449,   718,  1122,  1131,   156,   207,   261,   353,   463,
-     471,   474,   541,  1274,   382,  1132,  1121,   382,   412,   583,
-     660,   663,   773,  1121,   663,  1121,   663,  1132,  1121,  1121,
-     382,   412,   583,  1121,  1121,  1121,  1121,  1132,  1121,    98,
-     104,   202,   348,   382,   412,   348,   382,   412,   744,   382,
-     412,   382,   412,   382,  1025,  1252,   250,   754,  1252,   250,
-    1252,  1132,  1121,  1121,  1121,    98,   596,   409,  1131,   382,
-     412,   583,  1121,  1121,   449,   449,   152,   462,   371,   277,
-     111,   200,   773,   325,   780,  1272,   277,   277,   472,   472,
-     277,   773,   780,   773,   283,   773,   780,   277,   780,   333,
-     234,   449,   599,   538,   527,   529,   515,  1050,  1026,   527,
-     529,   515,   723,   624,  1254,  1121,   234,   400,   483,   678,
-     685,   686,   217,   292,   616,   618,   620,   622,   628,   631,
-      99,   256,   393,   436,   541,   542,   229,  1123,   484,  1119,
-     229,   719,   556,  1252,   557,   339,   615,   231,  1272,   744,
-     744,   744,   744,   330,   334,   339,   526,   744,  1023,  1024,
-    1025,   409,   526,   217,   217,   216,  1142,   773,   616,  1252,
-     491,   493,   646,   491,   591,   320,   111,   634,  1272,   320,
-     334,   527,   825,   826,   831,   111,   283,   390,   452,   490,
-     835,   836,   837,   334,   283,   570,  1150,   520,   247,   247,
-     229,   833,   111,  1086,   527,   527,   586,   524,   509,   509,
-     527,   527,  1129,   525,   526,  1129,  1252,  1272,  1283,  1252,
-     527,   527,   217,   586,   822,   772,   773,  1123,   773,  1123,
-     849,   334,   586,   334,   586,   586,   283,   334,   586,   586,
-     409,   229,   570,   586,  1050,   956,  1275,  1263,   527,   636,
-     256,   256,   256,   495,  1120,   529,   663,   664,   242,   795,
-     796,  1132,    99,   803,   449,   526,   234,   215,   415,   215,
-     415,   396,   470,   309,  1026,  1132,   491,   652,  1119,  1121,
-     234,   334,   795,   128,   586,  1127,  1026,   454,   438,  1127,
-     329,   484,  1026,   283,   773,   527,   525,   525,   529,  1050,
-     204,  1104,  1105,   111,   527,  1050,   527,   527,   527,   234,
-     527,   527,   527,   527,   527,   529,   527,   354,  1095,   527,
-     526,  1051,  1051,  1086,    87,    91,    92,    93,   256,   277,
-     336,   513,   514,   515,   517,   518,   519,   520,   521,   522,
-    1083,  1051,   527,   527,   229,   234,  1098,  1099,   527,   111,
-    1100,  1086,  1100,  1100,   234,   527,   527,  1254,   352,  1064,
-     111,   527,   529,  1050,  1254,   529,  1050,  1110,  1050,   527,
-     509,  1051,  1051,   210,  1086,   234,   197,   199,   222,   325,
-     330,   456,   466,   526,   210,   850,  1050,   435,  1111,  1050,
-    1101,  1050,   449,   526,   958,   526,   526,   344,  1070,   526,
-    1086,   442,   444,   442,   444,  1119,   968,   968,   968,   286,
-     397,   526,   958,  1002,  1003,  1004,  1011,  1016,  1053,  1055,
-    1056,  1127,  1252,   488,  1021,  1087,  1087,  1088,   527,    89,
-      90,   529,   972,   973,  1021,     8,    11,    12,    22,    23,
-      24,    26,    27,    31,    32,    33,   178,   312,   359,   459,
-    1232,  1233,  1235,  1225,  1226,   887,  1129,  1048,   565,  1050,
-    1027,   919,  1121,   928,   975,   336,  1081,  1084,   511,   819,
-    1050,   984,   470,   981,   301,  1002,   488,  1022,   478,   934,
-     935,  1252,   334,   936,  1252,   951,   952,   529,  1001,   515,
-    1110,   531,  1180,   530,   529,   515,    30,  1241,   527,   527,
-     530,   834,   774,   830,   830,   128,   832,   521,  1132,  1121,
-    1121,  1133,  1133,   334,  1120,   337,   334,  1050,   632,  1123,
-     526,   526,   526,   650,   259,   635,   732,   217,   586,   449,
-    1132,  1121,   570,   833,  1026,  1121,   495,   773,   773,   773,
-     773,   849,   154,   194,   349,   443,  1026,  1121,   667,  1121,
-     244,   476,   449,   449,   667,   684,   691,   382,   412,   583,
-    1121,  1121,  1121,   267,   325,   826,   347,   412,   449,   338,
-     689,   732,   202,   386,   412,   585,   691,   869,   404,   217,
-     586,   217,   586,  1121,  1121,  1121,  1121,   404,   404,   291,
-     694,   695,   694,   527,   529,   696,  1272,   259,   527,   529,
-     515,   528,  1132,  1121,   382,   412,   583,  1121,  1121,  1121,
-     348,   382,   412,    98,   202,   348,   382,   412,  1026,   319,
-    1026,  1132,  1121,  1119,   449,  1133,   472,   715,   293,   353,
-     325,  1272,   353,  1133,   469,   449,   449,   400,   347,   412,
-     157,   449,   868,   400,   449,   449,   303,   303,   303,   449,
-     449,   400,   449,   449,   400,   449,   400,   449,   400,   449,
-     586,  1026,   320,  1272,   412,   869,   217,   586,   449,  1121,
-     449,   400,  1132,  1121,   780,  1026,   773,   277,   780,   780,
-    1123,  1123,   780,   277,   277,  1121,   277,   780,   600,   526,
-     602,   603,   750,  1274,   336,   517,   518,   663,   747,   830,
-    1084,  1138,  1272,   527,   527,   746,   747,   334,   140,   146,
-     157,   185,   187,   263,   320,   325,   363,   377,   465,   625,
-     626,   627,   216,   487,   538,   570,  1121,   570,   689,  1119,
-    1119,   527,   529,  1133,   242,   393,  1133,  1129,   459,  1119,
-     634,   102,   190,   269,   405,   470,   720,   449,   717,   118,
-     557,   384,   438,   178,   591,   635,  1119,   724,   751,   752,
-    1272,   527,   529,  1121,   635,  1119,  1119,  1121,   957,   526,
-     617,   527,   333,   590,   333,   334,   647,   590,   111,   217,
-     957,   591,   449,   217,  1119,   527,   529,   185,   515,   838,
-    1272,   570,   438,   829,   830,   229,   839,   491,   837,   840,
-     190,   269,   405,   470,   877,  1121,   244,  1146,   957,  1160,
-     586,  1026,   527,  1129,  1047,  1047,   525,  1283,   526,   517,
-     518,   519,   520,   521,   525,  1044,  1121,   586,   586,   472,
-     586,   472,   586,   586,   773,   773,  1121,   773,  1121,   709,
-     586,   229,   400,   400,   400,  1120,   799,   529,  1132,   491,
-     529,   797,   337,  1012,   409,   215,   215,   178,   318,  1133,
-     794,   586,  1132,   833,   277,   822,   663,   277,   773,   277,
-    1090,   446,  1050,   208,  1026,   527,  1050,  1050,  1050,  1098,
-     527,  1086,   529,  1026,  1051,  1051,  1051,  1051,   197,   199,
-     320,   330,  1051,  1051,  1051,  1051,  1051,  1051,  1051,  1051,
-    1051,  1051,  1050,  1050,  1099,  1098,  1026,   527,   527,   527,
-    1086,   527,   529,   128,  1052,   527,  1254,  1061,   360,   433,
-    1063,   527,   529,   483,  1057,   111,   527,  1272,  1050,   108,
-     108,  1050,   527,  1050,   234,   526,  1089,  1050,   527,   210,
-    1051,  1051,   210,   210,  1050,  1050,   973,   488,   526,  1071,
-    1252,   527,  1086,   529,   968,   968,   968,   968,  1119,  1119,
-    1119,   958,  1016,   234,   958,  1003,  1004,   111,  1005,  1006,
-    1252,   529,   165,   235,   265,   280,   290,   315,   392,  1008,
-    1006,   111,  1005,  1007,  1252,   512,  1020,   526,  1109,  1050,
-     242,   986,   529,   972,   972,   972,  1050,  1050,   480,  1088,
-     527,   986,   529,   515,   527,   525,  1241,   527,   526,   819,
-     226,   285,   527,   335,   168,  1050,   389,   938,   527,   529,
-    1110,   155,   938,   527,   529,   948,  1022,  1112,  1129,   515,
-    1199,  1230,  1235,   527,   521,   834,   459,   237,   407,   439,
-     460,   808,   229,   808,   527,   526,   638,   639,   815,  1055,
-    1252,   635,   635,   732,  1125,   527,   187,   263,   318,   320,
-     733,  1121,  1121,   111,  1121,   472,   472,   773,   773,   773,
-     773,   283,   774,  1132,  1121,   449,   868,   400,   449,   267,
-     128,   441,  1121,   526,   624,   320,   590,   178,   320,   428,
-     431,   590,   459,  1121,  1252,   404,   693,  1121,   593,   747,
-    1254,   347,   412,   449,   868,   400,   449,   449,   449,   400,
-     236,   336,   431,   756,   757,   236,   336,   764,   765,   449,
-     449,   400,   527,   527,   527,   382,  1121,   526,   491,   716,
-    1130,  1272,  1272,  1272,  1121,  1121,  1121,   128,   441,  1121,
-    1121,  1121,  1121,  1121,  1121,   229,   229,   384,   229,   250,
-    1132,  1121,  1121,  1132,  1121,  1121,  1121,  1121,  1121,  1121,
-    1121,   146,   587,   217,   100,   120,   459,  1252,  1121,   691,
-    1121,  1121,   527,   277,   780,   277,   277,   780,   780,   277,
-     780,   601,   609,   610,  1254,   124,   166,   191,   206,   210,
-     230,   233,   246,   325,   333,   369,   604,   732,   491,   493,
-    1119,   526,   773,  1121,  1051,   188,   252,   187,   325,   281,
-    1119,   840,   367,   736,   737,  1252,   677,   526,   629,   262,
-     645,   620,  1133,  1133,  1026,   526,   591,  1133,   715,  1132,
-    1119,   495,   229,   725,   527,   529,  1025,   689,   527,   659,
-     330,   526,   930,   652,   619,   621,   623,   631,  1252,   646,
-     645,   151,   441,   648,   957,   654,   652,   648,  1272,  1125,
-     813,   831,  1050,  1050,   529,   526,   835,   459,   529,   744,
-     449,   526,   667,    84,  1157,   527,   525,   527,  1184,  1283,
-    1283,  1283,  1283,  1283,   586,  1123,  1123,   586,   586,   586,
-     586,   409,  1120,  1120,  1120,   663,   239,   796,   527,  1121,
-     178,   803,   234,   277,   325,   784,  1272,   277,   277,   784,
-     277,   784,  1050,   527,   527,  1099,   527,  1050,   234,   197,
-     199,   330,   526,   527,   498,  1059,  1086,   376,   128,   489,
-     489,   527,  1050,   318,  1050,   529,  1058,  1028,  1050,  1050,
-    1050,  1089,   527,  1050,   108,   108,  1050,  1050,   210,   527,
-     527,  1050,  1072,  1252,   527,  1050,  1119,  1119,  1119,  1119,
-    1006,  1007,   526,   527,  1252,   526,  1003,   280,   343,  1009,
-    1003,  1009,   280,  1008,  1009,   280,   440,  1014,   526,  1252,
-     526,   341,  1087,   128,   245,   993,   527,   527,   527,  1088,
-    1272,   993,  1233,   518,  1226,  1234,  1271,  1272,  1272,   850,
-     330,  1116,   957,   935,   334,   526,   937,   515,   951,   938,
-    1279,   459,   527,   449,   791,   234,   732,  1050,   527,   529,
-     491,   146,   816,   816,   527,   527,   840,   188,   252,   261,
-     187,   474,   586,  1026,  1123,  1123,  1121,  1121,  1121,  1121,
-    1121,  1133,  1121,   690,   694,   325,   325,  1130,  1252,  1026,
-     586,   586,   515,   128,   441,  1121,  1121,  1121,  1121,  1132,
-    1121,  1121,  1129,  1129,  1026,   529,  1129,  1129,   529,  1132,
-    1121,  1121,   449,  1050,   140,  1133,  1121,   449,   449,  1120,
-    1120,   773,  1120,   217,   773,  1272,  1272,  1026,   586,   586,
-     277,   780,   780,   780,   780,   472,   607,   608,   527,   529,
-     519,   526,   567,   611,   663,   904,  1272,   904,   320,   325,
-     369,   904,   904,   236,   266,   236,   234,   731,  1050,   320,
-     626,   840,   634,   472,   649,  1127,   108,   216,   256,   616,
-     214,   257,   526,   409,   472,   635,   111,   716,   557,   526,
-    1121,   203,   726,   487,   728,  1272,   591,   773,   616,   652,
-     527,   529,   491,   647,   646,   190,   202,   360,  1121,   491,
-     890,   111,   234,   334,   526,  1272,   828,   841,   842,  1253,
-     840,  1026,   229,  1119,   234,   449,   859,   264,   668,  1158,
-    1252,   586,   527,   586,   586,  1121,   337,   275,   586,   795,
-     784,   784,   784,   784,   527,  1051,   234,   526,  1089,   526,
-     527,   529,   527,  1052,   376,   527,   477,   425,   527,   527,
-     527,  1050,  1050,  1050,   527,   351,  1073,   527,  1017,  1018,
-    1055,  1005,   526,  1120,  1003,   334,   472,  1010,  1003,   280,
-    1003,  1127,  1024,   526,  1024,  1252,   972,   167,   243,   395,
-     526,   987,   988,   989,   990,   991,   992,  1050,  1050,   490,
-    1067,   972,  1067,  1129,  1271,   527,   954,  1285,   157,   814,
-     815,   198,   526,   958,  1114,   795,   334,   795,   527,   840,
-     639,   336,   850,   773,   472,   773,   817,   817,   377,   840,
-     649,   527,   449,   412,   944,   527,   529,   587,   747,  1133,
-    1121,   449,   526,  1127,   850,   757,   526,   526,   765,  1121,
-     527,   526,   412,   944,  1121,  1121,   491,   512,   907,   384,
-     907,   907,   229,   587,   780,   538,   192,   610,   567,   612,
-     613,  1272,  1272,   325,   635,   519,   635,  1272,  1272,   799,
-     111,   855,   855,  1119,   732,   527,   649,   304,   637,   259,
-     526,   737,   367,   526,   527,   102,   150,   158,   186,   260,
-     431,   630,   630,  1118,  1121,  1123,   527,   957,   689,   396,
-     427,   727,   526,   216,   111,   617,   527,   621,   338,   648,
-     647,   397,   397,   132,   140,   296,   957,   773,  1119,   814,
-     830,   527,   529,   459,  1021,   423,   423,   527,   667,   318,
-     476,   669,   670,   515,  1159,  1121,   586,  1051,  1089,   527,
-    1060,  1086,   128,   318,   508,   128,   972,   527,   529,   111,
-    1019,  1120,   527,  1050,   526,  1003,  1010,   526,   527,  1024,
-     527,   527,   526,   413,   526,   527,   529,  1068,  1069,  1252,
-     527,  1121,   527,   529,   321,   470,   797,   808,   586,   816,
-     649,   526,   773,   818,   818,  1119,   649,   732,  1121,   441,
-     694,   472,   588,   412,   944,  1121,  1089,   822,   229,   760,
-     849,  1089,  1089,  1050,   441,   772,   773,   772,   773,  1120,
-     586,   602,  1272,   527,   529,   635,   855,   114,   254,   229,
-     318,   633,   235,   350,   418,   334,   641,   642,   643,   441,
-     527,  1127,    81,   738,   645,   527,   689,   223,   759,   591,
-     890,  1050,   367,   957,   646,   645,   624,   648,   140,   337,
-     140,   652,   813,   527,   835,   841,  1026,   198,   491,   491,
-     476,   667,  1129,  1266,  1274,    84,   689,   527,   527,   527,
-     376,   477,  1086,   370,   397,  1074,  1020,  1017,   526,   527,
-    1120,  1086,   527,  1086,   526,  1086,   988,   529,   111,  1021,
-     815,   412,   234,   817,   488,   640,   850,   819,   819,   634,
-     732,  1121,  1050,   441,   527,   340,   402,   374,   761,   760,
-     527,   527,   527,  1121,   907,   613,   203,   261,   190,   470,
-     334,   643,   334,   642,  1121,   526,   527,   529,   409,   773,
-     111,   111,   527,  1127,   890,   647,   646,   337,   337,   526,
-     591,   840,   103,   270,   878,   236,   236,  1158,   122,   168,
-     461,  1050,  1075,  1076,  1075,   527,  1024,   527,   527,   527,
-     987,   527,  1069,  1071,   947,   795,   818,   526,   732,   527,
-     637,   944,  1121,  1127,   128,   761,   944,   773,   396,   131,
-     318,   388,   412,   644,   644,   527,    81,  1121,   756,   957,
-     526,   648,   647,   814,   648,   321,   526,   873,   875,   880,
-     931,   939,   946,   957,   799,   799,  1076,   396,   228,   358,
-     228,   358,   527,   383,  1015,   527,  1021,   586,   819,  1050,
-     641,   944,   822,   773,   728,    97,   185,   325,   689,   890,
-     729,   730,  1129,  1254,  1271,  1272,   648,   527,  1021,   874,
-     875,   876,   958,   959,   529,   529,   108,   526,   527,   732,
-     216,   527,   529,   591,   527,   530,   449,   234,  1076,  1050,
-     367,   730,   648,   876,   423,   423,   527,  1127,  1021,   491,
-     491,   526,   236,   236,   729,   799,   799,   527
+     386,   412,   102,   250,  1011,  1121,   402,  1121,   773,   102,
+     303,  1131,  1132,   250,  1119,   283,    34,   187,   279,   320,
+     371,   886,   887,   888,  1119,  1125,  1252,   101,   134,   147,
+     148,   157,   161,   179,   200,   211,   219,   231,   236,   259,
+     284,   305,   336,   356,   393,   398,   400,   406,   409,   438,
+     441,   445,   452,   454,   459,   484,   672,   779,  1272,  1119,
+     449,  1127,  1121,   526,   773,   454,  1122,   773,   454,   250,
+    1121,   178,   438,   442,   444,  1131,   442,   444,   142,   223,
+     850,   384,  1121,  1131,   250,   556,  1252,  1121,  1121,   402,
+    1121,   773,   303,  1131,   375,   406,   438,   484,   305,   161,
+     259,   236,   398,   452,   458,   666,    84,  1148,  1149,   531,
+    1268,  1275,   102,  1160,  1274,   955,   570,  1134,  1272,   853,
+     250,  1127,  1121,   250,   857,   250,  1122,   123,   125,   126,
+     137,   138,   182,   183,   201,   227,   250,   271,   272,   274,
+     314,   316,   328,   372,   414,   420,   447,   448,   479,   775,
+    1026,  1028,  1030,  1032,  1034,  1036,  1037,  1038,  1040,  1041,
+    1042,  1045,  1046,  1246,  1253,  1257,  1258,  1274,   454,   178,
+     438,   250,  1127,   250,  1132,  1133,   153,   484,   142,   223,
+     250,   850,   128,   250,  1121,   250,  1133,   250,  1121,   250,
+    1121,   250,  1121,   402,   857,   250,  1121,   250,   775,   250,
+     303,  1133,   283,   250,   772,   773,   526,   532,  1276,  1277,
+    1278,  1279,  1281,  1186,    70,  1156,  1205,   526,   930,   615,
+     954,   921,   915,   922,   923,   924,  1134,   916,  1130,   787,
+     788,   102,   787,   954,  1130,   788,   102,   787,   954,  1130,
+     788,   788,   788,  1130,  1129,  1129,   275,   472,  1210,  1211,
+    1285,  1286,   954,   788,   365,   526,   526,   634,   634,   634,
+     334,   449,   529,   634,   400,  1011,  1012,   787,   954,   787,
+     954,   529,   881,  1272,   234,   526,   927,   128,   484,   482,
+     864,   865,  1119,  1121,  1252,   118,   509,   279,   528,   337,
+     337,   334,   234,  1272,   449,   229,   782,   334,    82,    83,
+      84,    86,   110,   123,   125,   126,   133,   134,   137,   138,
+     145,   147,   169,   170,   171,   172,   173,   174,   175,   182,
+     183,   217,   221,   222,   227,   241,   243,   272,   274,   289,
+     297,   298,   314,   316,   320,   325,   326,   328,   336,   346,
+     357,   372,   396,   411,   420,   434,   447,   448,   453,   455,
+     456,   465,   471,   479,   499,   500,   501,   502,   503,   504,
+     505,   506,   510,   517,   518,   519,   526,   958,  1029,  1032,
+    1035,  1036,  1037,  1039,  1040,  1041,  1045,  1046,  1050,  1052,
+    1053,  1054,  1056,  1077,  1078,  1079,  1083,  1102,  1107,  1116,
+    1117,  1127,  1128,  1129,  1252,  1264,  1266,  1268,  1269,  1270,
+    1271,  1272,  1115,  1116,   449,   515,  1275,  1272,   449,   515,
+    1204,   102,   578,  1118,  1119,   410,   560,   185,   569,  1272,
+     570,  1272,   118,   139,   560,   509,   421,   887,   337,   234,
+     449,   515,   118,   509,   279,  1285,   888,   526,  1119,   519,
+     524,   528,  1108,  1109,  1012,  1256,   233,   235,   482,   912,
+     913,   915,   233,   918,   185,  1050,  1112,  1113,   963,   529,
+     526,   919,   527,   527,  1119,   102,   197,   969,   969,   128,
+     969,   224,   229,   293,   332,   976,   978,   979,   994,   996,
+     997,   998,   972,   973,   234,   275,  1011,  1013,  1114,   530,
+    1178,   519,  1197,  1198,  1200,   532,   532,    25,   271,   271,
+     449,   449,   449,   449,   526,   449,   517,   518,   663,  1130,
+    1165,  1271,   208,   111,  1152,   128,  1155,  1155,   275,  1210,
+    1212,   275,  1210,  1211,  1212,   477,  1221,  1222,  1268,    14,
+      83,   423,   517,   518,  1129,  1213,  1214,  1215,  1264,  1266,
+    1270,  1271,  1272,  1273,   271,   277,  1121,   449,  1121,     6,
+    1121,  1245,  1200,   526,   833,  1109,   348,   382,   412,   528,
+     774,   348,   382,   412,   156,   206,   299,   348,   382,   412,
+     441,   443,   491,   571,   574,   893,   894,   895,   896,  1274,
+     805,    98,   202,   348,   382,   412,   475,   585,  1121,   412,
+      98,   202,   470,   553,   495,   250,  1011,   130,   163,   220,
+     253,   288,   320,   348,   382,   390,   397,   404,   412,   424,
+     432,   486,   571,   575,   836,   844,   526,   822,   382,   553,
+     256,   217,    98,   104,   144,   195,   202,   205,   230,   261,
+     318,   320,   330,   338,   348,   382,   385,   386,   412,   475,
+     583,   584,   691,   663,   102,   250,  1119,   773,   773,   526,
+     849,   528,   217,   334,   256,   545,   382,   491,   512,   538,
+     545,   334,   348,   382,   217,   129,   177,   258,   306,   308,
+     318,   347,   382,   387,   412,   426,   583,   660,   661,   348,
+     382,   483,   691,   699,   573,   561,   563,   256,   217,   382,
+     412,   583,   348,   382,   386,   412,   154,   194,   349,   443,
+     334,    98,   104,   202,   348,   382,   412,   595,   596,   545,
+     229,   382,   538,   545,   217,   382,   412,   583,  1121,   530,
+     291,   187,   335,   496,   529,   886,   472,   910,   334,  1127,
+     526,  1121,  1026,   454,   178,   438,  1127,   329,   484,   142,
+     223,   850,  1121,  1121,   402,   229,  1121,  1026,   283,   773,
+     634,   368,   600,   526,   748,   833,   140,  1026,   234,   526,
+     744,  1121,   538,   111,   904,  1121,   320,   538,   495,   250,
+    1119,   538,   773,   773,   744,   468,   615,   334,   538,   320,
+     118,   557,   459,   698,   348,   674,   154,   194,   349,   443,
+     100,   120,   270,   722,   111,   744,   229,   538,   484,   250,
+    1119,   250,   651,  1119,  1119,   484,   773,   153,   811,  1127,
+    1121,   229,   672,    73,  1150,  1252,   531,  1151,  1148,   124,
+     176,   268,   318,   401,   217,   833,   131,   388,   586,   217,
+     526,   217,   481,  1043,  1043,  1043,   526,  1031,  1031,   359,
+     526,  1033,   217,   137,   138,  1043,  1031,  1028,   493,   512,
+     526,  1047,   526,  1047,   529,   586,   110,  1027,   138,   526,
+    1044,   180,   310,   507,   526,  1048,   774,  1031,   495,   217,
+     822,   217,   529,   250,   772,   250,   773,   250,   773,   217,
+     849,  1133,   217,   334,   217,   217,   334,   217,   586,   217,
+     154,   194,   349,   443,   229,   217,   334,   217,   586,   217,
+     229,   250,   250,   570,   217,   529,   586,   527,  1277,  1278,
+    1276,   529,   533,  1050,  1086,  1209,  1284,  1285,   438,   955,
+     527,   529,   222,   334,   456,   567,   570,   663,   925,   921,
+     788,   954,   788,   954,  1286,  1287,   788,   954,   788,   954,
+    1287,   788,   954,   954,   954,   788,    14,   423,  1260,  1263,
+    1268,   954,   526,   635,   636,  1252,   635,   102,   179,   200,
+     231,   236,   283,   284,   400,   406,   438,   441,   459,   794,
+    1118,  1133,   793,  1121,   256,   529,   942,   954,   954,  1272,
+    1205,  1026,  1089,   111,  1133,   811,   527,   529,   291,  1252,
+     229,   229,   794,  1133,   399,  1252,   570,   334,   526,   524,
+     958,  1090,  1050,  1106,   526,   526,   229,   526,   526,   958,
+     526,   526,   526,   526,   526,   526,  1050,   526,   526,   526,
+     526,   526,   526,   526,   526,   958,   526,   526,   526,   526,
+     526,   526,   526,   526,  1050,  1050,  1050,   478,   958,  1050,
+    1086,  1109,  1272,   526,  1272,    84,    87,    91,    92,    93,
+     108,   111,   116,   122,   146,   251,   256,   277,   278,   292,
+     323,   336,   339,   417,   510,   513,   514,   515,   517,   518,
+     519,   520,   521,   522,  1081,  1083,  1085,  1274,   492,  1065,
+     345,  1050,   275,   529,   966,  1285,   526,  1272,  1109,    22,
+    1267,  1268,  1110,   966,   331,   334,  1237,  1237,    10,   477,
+    1224,  1225,  1227,  1204,  1204,   188,   252,   579,   529,   139,
+     185,   570,   111,   185,   296,   568,   663,  1046,  1272,  1274,
+    1272,   159,   199,  1062,   168,   185,   564,   565,   567,   663,
+     185,   564,  1285,  1285,   291,  1119,  1050,   519,  1124,  1254,
+    1108,   160,   387,   777,   277,   527,   529,   916,   527,   529,
+     964,  1120,  1121,   111,   919,   960,   960,   974,   975,  1050,
+     960,   226,   317,   985,   281,   318,   371,   415,   470,   102,
+     980,  1050,   981,   983,  1050,  1052,   994,   995,   979,   978,
+     976,   977,   229,   997,   330,   999,   976,   994,  1013,   932,
+    1119,   111,  1252,   412,  1197,   519,   529,   530,  1255,  1174,
+    1177,  1174,   271,   180,   248,   307,  1049,   307,  1049,  1049,
+     310,  1129,   307,   310,   403,  1271,  1271,   529,  1166,   184,
+    1204,   471,  1153,  1155,  1121,   423,  1129,  1226,  1268,   529,
+     515,  1121,    14,  1129,  1271,  1129,  1271,   529,  1184,   526,
+    1121,   526,  1256,   256,   266,   340,   342,   414,   480,   519,
+     826,   827,   828,   830,   832,   834,  1026,  1253,   348,   382,
+     412,   449,   449,   400,  1124,   528,   449,   449,   400,   293,
+     449,   449,   441,   560,   348,   893,   895,   515,   897,   229,
+     239,   256,   391,   806,   807,   140,   157,   213,   231,   363,
+     465,   631,   632,   157,   185,   320,   449,   157,   449,   185,
+     320,   400,   157,   195,   205,   348,   382,   740,   400,   680,
+     101,   134,   147,   161,   200,   211,   231,   236,   305,   336,
+     400,   406,   409,   438,   445,   452,   459,   484,   672,  1121,
+     217,   382,   412,   583,   334,   663,   404,   288,   449,   449,
+     325,   663,   189,   276,   400,   410,   451,   562,   388,   412,
+     836,   845,   527,   823,   826,   449,   471,   441,  1119,   148,
+     213,   622,   631,  1252,   148,   157,   868,   334,   396,   398,
+     454,   157,   868,   105,   385,   396,   398,   454,   396,  1119,
+     230,   261,   330,   773,   526,   449,   449,   249,   526,   590,
+     302,   441,   468,   491,   493,   590,   157,   529,   348,   256,
+     217,   382,   412,   583,   472,   472,   319,  1026,   348,   412,
+     850,  1121,  1119,   179,   412,   574,   449,   540,   574,  1119,
+     449,   449,  1119,   663,   128,   662,   663,   663,   177,   306,
+     308,   128,   449,   538,   400,   538,   318,   661,   449,   449,
+     325,  1272,   691,   441,  1011,   157,   449,   868,   400,   449,
+     449,   590,   590,   773,   773,   773,   773,  1119,   117,   477,
+     117,   117,   449,   117,   449,   400,   529,   574,   471,   709,
+    1132,   449,   540,   574,  1119,   449,   400,   348,   382,   371,
+     383,   408,   566,   886,  1125,  1252,  1119,   833,  1026,   334,
+     277,   495,   822,   663,   773,   773,   849,   334,   277,   334,
+     154,   194,   349,   443,  1026,   334,   277,   773,   277,   491,
+     606,   429,   430,   601,  1272,   749,   750,  1274,   744,   526,
+     111,   773,   745,   746,  1254,   100,   893,  1026,   334,   217,
+     677,  1121,   320,   526,   539,   758,   472,   375,   484,  1119,
+     539,   217,  1132,   164,   239,   558,   614,   657,   721,   789,
+     809,   889,  1272,   699,   700,  1132,   299,   773,   773,   773,
+     773,   330,   190,   269,   457,   470,   723,   724,   209,   370,
+     526,   709,   539,  1119,   320,   659,   660,   320,   111,   330,
+     526,   634,   634,   250,   654,  1119,   229,   250,   812,  1125,
+     526,   824,   111,  1026,   283,   528,  1129,  1151,   491,   493,
+     956,   401,  1127,   586,  1026,  1122,   526,  1086,  1129,   775,
+    1043,  1043,   110,  1027,   447,   447,  1129,  1129,  1026,   524,
+     524,   412,  1129,   449,   449,  1129,  1031,   250,  1121,  1127,
+     586,  1133,  1132,   217,   586,   217,   472,   217,   472,   850,
+     586,   586,  1121,   773,  1133,  1121,   773,  1121,  1121,  1026,
+    1121,   773,   775,  1133,   709,   217,   217,   586,   772,   773,
+     527,   533,  1279,   527,   529,  1285,  1209,  1119,   176,   921,
+     923,   954,   954,  1287,   954,   954,  1287,   954,   954,  1121,
+      14,   529,  1267,   635,   527,   529,   527,   237,   407,   439,
+    1120,   772,   178,   409,   798,   799,  1120,   329,  1120,  1118,
+    1118,  1120,   772,   449,   491,   802,   212,   293,   706,   707,
+      96,   215,   396,   415,   943,  1011,   324,   944,   527,   529,
+     928,   931,   939,   946,   957,   449,  1119,   862,   863,   865,
+     792,   791,   792,   234,   240,   803,  1252,   101,   148,   179,
+     200,   211,   231,   236,   284,   305,   393,   400,   406,   438,
+     441,   459,   484,   672,   783,  1086,   525,  1086,  1090,  1091,
+     487,  1103,  1104,  1050,  1086,   526,  1129,  1129,   180,   248,
+     307,   310,   403,   507,  1092,  1093,  1272,  1274,  1086,  1086,
+    1086,  1129,  1129,  1050,   850,  1050,  1094,   396,   517,   518,
+     526,  1051,  1052,  1083,  1096,   527,  1086,  1050,  1086,  1097,
+    1050,   127,   234,   287,   450,  1050,  1086,  1100,  1086,   312,
+    1052,  1050,  1060,  1061,  1062,   312,  1050,  1062,   527,   529,
+    1129,  1048,  1026,  1050,  1050,  1050,  1050,  1254,   447,   115,
+     435,  1111,   773,  1050,   526,   958,  1101,   197,   199,   222,
+     320,   325,   330,   456,   466,  1050,   526,  1050,   449,   122,
+     251,   256,   292,   417,  1050,  1050,  1050,  1050,  1050,  1050,
+    1050,  1050,  1050,  1050,   102,   109,   422,  1080,   242,   225,
+    1066,   396,   526,  1077,   238,   296,   438,   442,   444,   468,
+     967,  1119,  1117,   234,  1001,   102,   197,   480,   519,   527,
+     828,  1050,  1087,  1088,  1253,  1121,  1268,  1108,  1001,  1226,
+     529,   515,  1119,   451,   526,  1272,   529,  1285,   527,   525,
+     531,   249,   249,   586,  1184,  1119,   913,   914,  1119,  1112,
+     527,   529,   526,   529,   112,   193,   472,   818,   526,   982,
+    1130,   415,   281,   335,   529,   396,   397,   984,  1118,   324,
+     419,   945,   995,   977,   472,   940,   185,   526,   933,   957,
+     111,  1252,   526,   947,   948,   949,   950,   951,  1252,   530,
+    1198,  1027,   533,  1177,   533,   527,   663,   527,    34,  1154,
+    1229,  1230,  1268,  1222,  1227,  1275,  1213,  1027,  1262,  1278,
+    1262,  1027,   342,   128,  1253,   527,   828,   830,   827,   830,
+    1253,   340,   527,   529,   774,   449,   449,   400,  1132,  1121,
+    1121,  1124,  1132,  1121,  1121,  1132,  1122,  1121,   185,   567,
+    1130,   393,   471,   791,   400,   239,   791,   526,  1121,   472,
+     813,   281,   281,   472,   526,   650,   250,  1121,   325,  1132,
+    1121,  1121,  1050,   325,  1121,  1121,   105,   385,   449,   449,
+    1121,   449,   681,  1127,   526,   773,   773,  1026,   454,   178,
+     438,   799,   484,   142,   223,   850,  1121,   773,  1121,   773,
+     402,   229,  1026,   773,   283,   244,   318,   348,   382,   476,
+     684,   685,   686,  1011,   449,   868,   400,   325,   189,   276,
+    1132,  1121,   334,  1121,   527,   529,  1131,  1133,  1121,   382,
+     583,   622,  1026,  1121,  1252,  1121,   291,  1121,   102,   471,
+    1121,   250,  1121,   250,  1252,   398,   454,   398,   454,   291,
+    1121,   102,   471,  1121,   291,   396,  1119,    98,   202,   412,
+     692,   693,   694,   695,  1254,  1132,  1121,   185,   235,   321,
+     472,   589,   592,   593,  1254,  1121,   333,   144,   333,  1121,
+     584,   449,   441,  1119,   449,   868,   400,  1123,  1252,  1123,
+     529,   527,   529,   449,   400,   334,   382,   449,   718,  1122,
+    1131,   156,   207,   261,   353,   463,   471,   474,   541,  1274,
+     382,  1132,  1121,   382,   412,   583,   660,   663,   773,  1121,
+     663,  1121,   663,  1132,  1121,  1121,   382,   412,   583,  1121,
+    1121,  1121,  1121,  1132,  1121,    98,   104,   202,   348,   382,
+     412,   348,   382,   412,   744,   382,   412,   382,   412,   382,
+    1025,  1252,   250,   754,  1252,   250,  1252,  1132,  1121,  1121,
+    1121,    98,   596,   409,  1131,   382,   412,   583,  1121,  1121,
+     449,   449,   152,   462,   371,   277,   111,   200,   773,   325,
+     780,  1272,   277,   277,   472,   472,   277,   773,   780,   773,
+     283,   773,   780,   277,   780,   333,   234,   449,   599,   538,
+     527,   529,   515,  1050,  1026,   527,   529,   515,   723,   624,
+    1254,  1121,   234,   400,   483,   678,   685,   686,   217,   292,
+     616,   618,   620,   622,   628,   631,    99,   256,   393,   436,
+     541,   542,   229,  1123,   484,  1119,   229,   719,   556,  1252,
+     557,   339,   615,   231,  1272,   744,   744,   744,   744,   330,
+     334,   339,   526,   744,  1023,  1024,  1025,   409,   526,   217,
+     217,   216,  1142,   773,   616,  1252,   491,   493,   646,   491,
+     591,   320,   111,   634,  1272,   320,   334,   527,   825,   826,
+     831,   111,   283,   390,   452,   490,   835,   836,   837,   334,
+     283,   570,  1150,   520,   247,   247,   229,   833,   111,  1086,
+     527,   527,   586,   524,   509,   509,   527,   527,  1129,   525,
+     526,  1129,  1252,  1272,  1283,  1252,   527,   527,   217,   586,
+     822,   772,   773,  1123,   773,  1123,   849,   334,   586,   334,
+     586,   586,   283,   334,   586,   586,   409,   229,   570,   586,
+    1050,   956,  1275,  1263,   527,   636,   256,   256,   256,   495,
+    1120,   529,   663,   664,   242,   795,   796,  1132,    99,   803,
+     449,   526,   234,   215,   415,   215,   415,   396,   470,   309,
+    1026,  1132,   491,   652,  1119,  1121,   234,   334,   795,   128,
+     586,  1127,  1026,   454,   438,  1127,   329,   484,  1026,   283,
+     773,   527,   525,   525,   529,  1050,   204,  1104,  1105,   111,
+     527,  1050,   527,   527,   527,   234,   527,   527,   527,   527,
+     527,   529,   527,   354,  1095,   527,   526,  1051,  1051,  1086,
+      87,    91,    92,    93,   256,   277,   336,   513,   514,   515,
+     517,   518,   519,   520,   521,   522,  1083,  1051,   527,   527,
+     229,   234,  1098,  1099,   527,   111,  1100,  1086,  1100,  1100,
+     234,   527,   527,  1254,   352,  1064,   111,   527,   529,  1050,
+    1254,   529,  1050,  1110,  1050,   527,   509,  1051,  1051,   210,
+    1086,   234,   197,   199,   222,   325,   330,   456,   466,   526,
+     210,   850,  1050,   435,  1111,  1050,  1101,  1050,   449,   526,
+     958,   526,   526,   344,  1070,   526,  1086,   442,   444,   442,
+     444,  1119,   968,   968,   968,   286,   397,   526,   958,  1002,
+    1003,  1004,  1011,  1016,  1053,  1055,  1056,  1127,  1252,   488,
+    1021,  1087,  1087,  1088,   527,    89,    90,   529,   972,   973,
+    1021,     8,    11,    12,    22,    23,    24,    26,    27,    31,
+      32,    33,   178,   312,   359,   459,  1232,  1233,  1235,  1225,
+    1226,   887,  1129,  1048,   565,  1050,  1027,   919,  1121,   928,
+     975,   336,  1081,  1084,   511,   819,  1050,   984,   470,   981,
+     301,  1002,   488,  1022,   478,   934,   935,  1252,   334,   936,
+    1252,   951,   952,   529,  1001,   515,  1110,   531,  1180,   530,
+     529,   515,    30,  1241,   527,   527,   530,   834,   774,   830,
+     830,   128,   832,   521,  1132,  1121,  1121,  1133,  1133,   334,
+    1120,   337,   334,  1050,   632,  1123,   526,   526,   526,   650,
+     259,   635,   732,   217,   586,   449,  1132,  1121,   570,   833,
+    1026,  1121,   495,   773,   773,   773,   773,   849,   154,   194,
+     349,   443,  1026,  1121,   667,  1121,   244,   476,   449,   449,
+     667,   684,   691,   382,   412,   583,  1121,  1121,  1121,   267,
+     325,   826,   347,   412,   449,   338,   689,   732,   202,   386,
+     412,   585,   691,   869,   404,   217,   586,   217,   586,  1121,
+    1121,  1121,  1121,   404,   404,   291,   694,   695,   694,   527,
+     529,   696,  1272,   259,   527,   529,   515,   528,  1132,  1121,
+     382,   412,   583,  1121,  1121,  1121,   348,   382,   412,    98,
+     202,   348,   382,   412,  1026,   319,  1026,  1132,  1121,  1119,
+     449,  1133,   472,   715,   293,   353,   325,  1272,   353,  1133,
+     469,   449,   449,   400,   347,   412,   157,   449,   868,   400,
+     449,   449,   303,   303,   303,   449,   449,   400,   449,   449,
+     400,   449,   400,   449,   400,   449,   586,  1026,   320,  1272,
+     412,   869,   217,   586,   449,  1121,   449,   400,  1132,  1121,
+     780,  1026,   773,   277,   780,   780,  1123,  1123,   780,   277,
+     277,  1121,   277,   780,   600,   526,   602,   603,   750,  1274,
+     336,   517,   518,   663,   747,   830,  1084,  1138,  1272,   527,
+     527,   746,   747,   334,   140,   146,   157,   185,   187,   263,
+     320,   325,   363,   377,   465,   625,   626,   627,   216,   487,
+     538,   570,  1121,   570,   689,  1119,  1119,   527,   529,  1133,
+     242,   393,  1133,  1129,   459,  1119,   634,   102,   190,   269,
+     405,   470,   720,   449,   717,   118,   557,   384,   438,   178,
+     591,   635,  1119,   724,   751,   752,  1272,   527,   529,  1121,
+     635,  1119,  1119,  1121,   957,   526,   617,   527,   333,   590,
+     333,   334,   647,   590,   111,   217,   957,   591,   449,   217,
+    1119,   527,   529,   185,   515,   838,  1272,   570,   438,   829,
+     830,   229,   839,   491,   837,   840,   190,   269,   405,   470,
+     877,  1121,   244,  1146,   957,  1160,   586,  1026,   527,  1129,
+    1047,  1047,   525,  1283,   526,   517,   518,   519,   520,   521,
+     525,  1044,  1121,   586,   586,   472,   586,   472,   586,   586,
+     773,   773,  1121,   773,  1121,   709,   586,   229,   400,   400,
+     400,  1120,   799,   529,  1132,   491,   529,   797,   337,  1012,
+     409,   215,   215,   178,   318,  1133,   794,   586,  1132,   833,
+     277,   822,   663,   277,   773,   277,  1090,   446,  1050,   208,
+    1026,   527,  1050,  1050,  1050,  1098,   527,  1086,   529,  1026,
+    1051,  1051,  1051,  1051,   197,   199,   320,   330,  1051,  1051,
+    1051,  1051,  1051,  1051,  1051,  1051,  1051,  1051,  1050,  1050,
+    1099,  1098,  1026,   527,   527,   527,  1086,   527,   529,   128,
+    1052,   527,  1254,  1061,   360,   433,  1063,   527,   529,   483,
+    1057,   111,   527,  1272,  1050,   108,   108,  1050,   527,  1050,
+     234,   526,  1089,  1050,   527,   210,  1051,  1051,   210,   210,
+    1050,  1050,   973,   488,   526,  1071,  1252,   527,  1086,   529,
+     968,   968,   968,   968,  1119,  1119,  1119,   958,  1016,   234,
+     958,  1003,  1004,   111,  1005,  1006,  1252,   529,   165,   235,
+     265,   280,   290,   315,   392,  1008,  1006,   111,  1005,  1007,
+    1252,   512,  1020,   526,  1109,  1050,   242,   986,   529,   972,
+     972,   972,  1050,  1050,   480,  1088,   527,   986,   529,   515,
+     527,   525,  1241,   527,   526,   819,   226,   285,   527,   335,
+     168,  1050,   389,   938,   527,   529,  1110,   155,   938,   527,
+     529,   948,  1022,  1112,  1129,   515,  1199,  1230,  1235,   527,
+     521,   834,   459,   237,   407,   439,   460,   808,   229,   808,
+     527,   526,   638,   639,   815,  1055,  1252,   635,   635,   732,
+    1125,   527,   187,   263,   318,   320,   733,  1121,  1121,   111,
+    1121,   472,   472,   773,   773,   773,   773,   283,   774,  1132,
+    1121,   449,   868,   400,   449,   267,   128,   441,  1121,   526,
+     624,   320,   590,   178,   320,   428,   431,   590,   459,  1121,
+    1252,   404,   693,  1121,   593,   747,  1254,   347,   412,   449,
+     868,   400,   449,   449,   449,   400,   236,   336,   431,   756,
+     757,   236,   336,   764,   765,   449,   449,   400,   527,   527,
+     527,   382,  1121,   526,   491,   716,  1130,  1272,  1272,  1272,
+    1121,  1121,  1121,   128,   441,  1121,  1121,  1121,  1121,  1121,
+    1121,   229,   229,   384,   229,   250,  1132,  1121,  1121,  1132,
+    1121,  1121,  1121,  1121,  1121,  1121,  1121,   146,   587,   217,
+     100,   120,   459,  1252,  1121,   691,  1121,  1121,   527,   277,
+     780,   277,   277,   780,   780,   277,   780,   601,   609,   610,
+    1254,   124,   166,   191,   206,   210,   230,   233,   246,   325,
+     333,   369,   604,   732,   491,   493,  1119,   526,   773,  1121,
+    1051,   188,   252,   187,   325,   281,  1119,   840,   367,   736,
+     737,  1252,   677,   526,   629,   262,   645,   620,  1133,  1133,
+    1026,   526,   591,  1133,   715,  1132,  1119,   495,   229,   725,
+     527,   529,  1025,   689,   527,   659,   330,   526,   930,   652,
+     619,   621,   623,   631,  1252,   646,   645,   151,   441,   648,
+     957,   654,   652,   648,  1272,  1125,   813,   831,  1050,  1050,
+     529,   526,   835,   459,   529,   744,   449,   526,   667,    84,
+    1157,   527,   525,   527,  1184,  1283,  1283,  1283,  1283,  1283,
+     586,  1123,  1123,   586,   586,   586,   586,   409,  1120,  1120,
+    1120,   663,   239,   796,   527,  1121,   178,   803,   234,   277,
+     325,   784,  1272,   277,   277,   784,   277,   784,  1050,   527,
+     527,  1099,   527,  1050,   234,   197,   199,   330,   526,   527,
+     498,  1059,  1086,   376,   128,   489,   489,   527,  1050,   318,
+    1050,   529,  1058,  1028,  1050,  1050,  1050,  1089,   527,  1050,
+     108,   108,  1050,  1050,   210,   527,   527,  1050,  1072,  1252,
+     527,  1050,  1119,  1119,  1119,  1119,  1006,  1007,   526,   527,
+    1252,   526,  1003,   280,   343,  1009,  1003,  1009,   280,  1008,
+    1009,   280,   440,  1014,   526,  1252,   526,   341,  1087,   128,
+     245,   993,   527,   527,   527,  1088,  1272,   993,  1233,   518,
+    1226,  1234,  1271,  1272,  1272,   850,   330,  1116,   957,   935,
+     334,   526,   937,   515,   951,   938,  1279,   459,   527,   449,
+     791,   234,   732,  1050,   527,   529,   491,   146,   816,   816,
+     527,   527,   840,   188,   252,   261,   187,   474,   586,  1026,
+    1123,  1123,  1121,  1121,  1121,  1121,  1121,  1133,  1121,   690,
+     694,   325,   325,  1130,  1252,  1026,   586,   586,   515,   128,
+     441,  1121,  1121,  1121,  1121,  1132,  1121,  1121,  1129,  1129,
+    1026,   529,  1129,  1129,   529,  1132,  1121,  1121,   449,  1050,
+     140,  1133,  1121,   449,   449,  1120,  1120,   773,  1120,   217,
+     773,  1272,  1272,  1026,   586,   586,   277,   780,   780,   780,
+     780,   472,   607,   608,   527,   529,   519,   526,   567,   611,
+     663,   904,  1272,   904,   320,   325,   369,   904,   904,   236,
+     266,   236,   234,   731,  1050,   320,   626,   840,   634,   472,
+     649,  1127,   108,   216,   256,   616,   214,   257,   526,   409,
+     472,   635,   111,   716,   557,   526,  1121,   203,   726,   487,
+     728,  1272,   591,   773,   616,   652,   527,   529,   491,   647,
+     646,   190,   202,   360,  1121,   491,   890,   111,   234,   334,
+     526,  1272,   828,   841,   842,  1253,   840,  1026,   229,  1119,
+     234,   449,   859,   264,   668,  1158,  1252,   586,   527,   586,
+     586,  1121,   337,   275,   586,   795,   784,   784,   784,   784,
+     527,  1051,   234,   526,  1089,   526,   527,   529,   527,  1052,
+     376,   527,   477,   425,   527,   527,   527,  1050,  1050,  1050,
+     527,   351,  1073,   527,  1017,  1018,  1055,  1005,   526,  1120,
+    1003,   334,   472,  1010,  1003,   280,  1003,  1127,  1024,   526,
+    1024,  1252,   972,   167,   243,   395,   526,   987,   988,   989,
+     990,   991,   992,  1050,  1050,   490,  1067,   972,  1067,  1129,
+    1271,   527,   954,  1285,   157,   814,   815,   198,   526,   958,
+    1114,   795,   334,   795,   527,   840,   639,   336,   850,   773,
+     472,   773,   817,   817,   377,   840,   649,   527,   449,   412,
+     944,   527,   529,   587,   747,  1133,  1121,   449,   526,  1127,
+     850,   757,   526,   526,   765,  1121,   527,   526,   412,   944,
+    1121,  1121,   491,   512,   907,   384,   907,   907,   229,   587,
+     780,   538,   192,   610,   567,   612,   613,  1272,  1272,   325,
+     635,   519,   635,  1272,  1272,   799,   111,   855,   855,  1119,
+     732,   527,   649,   304,   637,   259,   526,   737,   367,   526,
+     527,   102,   150,   158,   186,   260,   431,   630,   630,  1118,
+    1121,  1123,   527,   957,   689,   396,   427,   727,   526,   216,
+     111,   617,   527,   621,   338,   648,   647,   397,   397,   132,
+     140,   296,   957,   773,  1119,   814,   830,   527,   529,   459,
+    1021,   423,   423,   527,   667,   318,   476,   669,   670,   515,
+    1159,  1121,   586,  1051,  1089,   527,  1060,  1086,   128,   318,
+     508,   128,   972,   527,   529,   111,  1019,  1120,   527,  1050,
+     526,  1003,  1010,   526,   527,  1024,   527,   527,   526,   413,
+     526,   527,   529,  1068,  1069,  1252,   527,  1121,   527,   529,
+     321,   470,   797,   808,   586,   816,   649,   526,   773,   818,
+     818,  1119,   649,   732,  1121,   441,   694,   472,   588,   412,
+     944,  1121,  1089,   822,   229,   760,   849,  1089,  1089,  1050,
+     441,   772,   773,   772,   773,  1120,   586,   602,  1272,   527,
+     529,   635,   855,   114,   254,   229,   318,   633,   235,   350,
+     418,   334,   641,   642,   643,   441,   527,  1127,    81,   738,
+     645,   527,   689,   223,   759,   591,   890,  1050,   367,   957,
+     646,   645,   624,   648,   140,   337,   140,   652,   813,   527,
+     835,   841,  1026,   198,   491,   491,   476,   667,  1129,  1266,
+    1274,    84,   689,   527,   527,   527,   376,   477,  1086,   370,
+     397,  1074,  1020,  1017,   526,   527,  1120,  1086,   527,  1086,
+     526,  1086,   988,   529,   111,  1021,   815,   412,   234,   817,
+     488,   640,   850,   819,   819,   634,   732,  1121,  1050,   441,
+     527,   340,   402,   374,   761,   760,   527,   527,   527,  1121,
+     907,   613,   203,   261,   190,   470,   334,   643,   334,   642,
+    1121,   526,   527,   529,   409,   773,   111,   111,   527,  1127,
+     890,   647,   646,   337,   337,   526,   591,   840,   103,   270,
+     878,   236,   236,  1158,   122,   168,   461,  1050,  1075,  1076,
+    1075,   527,  1024,   527,   527,   527,   987,   527,  1069,  1071,
+     947,   795,   818,   526,   732,   527,   637,   944,  1121,  1127,
+     128,   761,   944,   773,   396,   131,   318,   388,   412,   644,
+     644,   527,    81,  1121,   756,   957,   526,   648,   647,   814,
+     648,   321,   526,   873,   875,   880,   931,   939,   946,   957,
+     799,   799,  1076,   396,   228,   358,   228,   358,   527,   383,
+    1015,   527,  1021,   586,   819,  1050,   641,   944,   822,   773,
+     728,    97,   185,   325,   689,   890,   729,   730,  1129,  1254,
+    1271,  1272,   648,   527,  1021,   874,   875,   876,   958,   959,
+     529,   529,   108,   526,   527,   732,   216,   527,   529,   591,
+     527,   530,   449,   234,  1076,  1050,   367,   730,   648,   876,
+     423,   423,   527,  1127,  1021,   491,   491,   526,   236,   236,
+     729,   799,   799,   527
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
@@ -29078,198 +29114,198 @@
      536,   536,   536,   536,   536,   537,   538,   538,   538,   539,
      539,   540,   540,   541,   541,   541,   541,   541,   541,   541,
      541,   541,   542,   542,   542,   542,   542,   542,   543,   544,
-     545,   545,   546,   546,   547,   548,   549,   549,   550,   550,
-     551,   552,   553,   553,   554,   554,   555,   555,   555,   555,
-     556,   556,   557,   557,   558,   558,   558,   558,   558,   558,
-     559,   559,   559,   560,   560,   560,   561,   561,   561,   561,
-     562,   562,   562,   562,   562,   562,   562,   562,   562,   562,
-     562,   563,   563,   564,   564,   565,   565,   566,   566,   566,
-     566,   567,   567,   567,   567,   568,   568,   568,   568,   568,
-     568,   568,   569,   569,   569,   570,   570,   571,   572,   572,
-     572,   572,   573,   573,   574,   574,   575,   575,   576,   576,
-     576,   576,   576,   577,   578,   578,   579,   579,   580,   581,
-     581,   581,   581,   581,   582,   582,   582,   582,   582,   582,
+     545,   545,   546,   546,   547,   548,   548,   549,   549,   550,
+     550,   551,   552,   553,   553,   554,   554,   555,   555,   555,
+     555,   556,   556,   557,   557,   558,   558,   558,   558,   558,
+     558,   559,   559,   559,   560,   560,   560,   561,   561,   561,
+     561,   562,   562,   562,   562,   562,   562,   562,   562,   562,
+     562,   562,   563,   563,   564,   564,   565,   565,   566,   566,
+     566,   566,   567,   567,   567,   567,   568,   568,   568,   568,
+     568,   568,   568,   569,   569,   569,   570,   570,   571,   572,
+     572,   572,   572,   573,   573,   574,   574,   575,   575,   576,
+     576,   576,   576,   576,   577,   578,   578,   579,   579,   580,
+     581,   581,   581,   581,   581,   582,   582,   582,   582,   582,
      582,   582,   582,   582,   582,   582,   582,   582,   582,   582,
-     583,   583,   584,   584,   584,   584,   584,   584,   584,   584,
+     582,   583,   583,   584,   584,   584,   584,   584,   584,   584,
      584,   584,   584,   584,   584,   584,   584,   584,   584,   584,
      584,   584,   584,   584,   584,   584,   584,   584,   584,   584,
      584,   584,   584,   584,   584,   584,   584,   584,   584,   584,
      584,   584,   584,   584,   584,   584,   584,   584,   584,   584,
-     584,   584,   585,   585,   586,   586,   586,   587,   587,   588,
-     588,   589,   589,   589,   589,   590,   591,   591,   592,   592,
-     593,   593,   593,   593,   594,   595,   595,   596,   596,   596,
-     596,   597,   597,   598,   598,   599,   599,   600,   600,   601,
-     601,   601,   602,   602,   603,   603,   604,   604,   604,   604,
+     584,   584,   584,   585,   585,   586,   586,   586,   587,   587,
+     588,   588,   589,   589,   589,   589,   590,   591,   591,   592,
+     592,   593,   593,   593,   593,   594,   595,   595,   596,   596,
+     596,   596,   597,   597,   598,   598,   599,   599,   600,   600,
+     601,   601,   601,   602,   602,   603,   603,   604,   604,   604,
      604,   604,   604,   604,   604,   604,   604,   604,   604,   604,
-     605,   605,   606,   606,   607,   607,   608,   608,   609,   609,
-     610,   611,   611,   611,   611,   611,   612,   612,   613,   614,
-     614,   614,   614,   615,   615,   615,   615,   615,   615,   615,
-     615,   616,   616,   617,   617,   618,   618,   619,   619,   620,
-     620,   620,   621,   621,   622,   623,   624,   624,   625,   625,
-     625,   625,   626,   626,   626,   626,   626,   626,   626,   627,
-     627,   627,   627,   628,   629,   629,   629,   630,   630,   630,
-     630,   630,   630,   631,   631,   632,   632,   632,   632,   632,
-     632,   632,   633,   633,   634,   634,   635,   635,   636,   637,
-     637,   637,   637,   638,   638,   639,   639,   640,   640,   641,
-     641,   641,   641,   641,   642,   643,   644,   644,   644,   644,
-     644,   645,   645,   646,   646,   646,   646,   647,   647,   647,
-     647,   648,   648,   649,   649,   650,   651,   652,   652,   652,
-     653,   653,   654,   655,   655,   656,   657,   657,   658,   658,
-     659,   659,   660,   660,   661,   661,   661,   661,   661,   661,
-     661,   661,   661,   661,   661,   661,   662,   662,   663,   663,
-     663,   664,   664,   665,   665,   666,   666,   667,   667,   668,
-     668,   669,   669,   670,   670,   671,   671,   672,   672,   673,
-     674,   674,   675,   675,   676,   676,   677,   677,   678,   678,
-     678,   679,   680,   680,   681,   682,   682,   682,   682,   682,
+     604,   605,   605,   606,   606,   607,   607,   608,   608,   609,
+     609,   610,   611,   611,   611,   611,   611,   612,   612,   613,
+     614,   614,   614,   614,   615,   615,   615,   615,   615,   615,
+     615,   615,   616,   616,   617,   617,   618,   618,   619,   619,
+     620,   620,   620,   621,   621,   622,   623,   624,   624,   625,
+     625,   625,   625,   626,   626,   626,   626,   626,   626,   626,
+     627,   627,   627,   627,   628,   629,   629,   629,   630,   630,
+     630,   630,   630,   630,   631,   631,   632,   632,   632,   632,
+     632,   632,   632,   633,   633,   634,   634,   635,   635,   636,
+     637,   637,   637,   637,   638,   638,   639,   639,   640,   640,
+     641,   641,   641,   641,   641,   642,   643,   644,   644,   644,
+     644,   644,   645,   645,   646,   646,   646,   646,   647,   647,
+     647,   647,   648,   648,   649,   649,   650,   651,   652,   652,
+     652,   653,   653,   654,   655,   655,   656,   657,   657,   658,
+     658,   659,   659,   660,   660,   661,   661,   661,   661,   661,
+     661,   661,   661,   661,   661,   661,   661,   662,   662,   663,
+     663,   663,   663,   664,   664,   665,   665,   666,   666,   667,
+     667,   668,   668,   669,   669,   670,   670,   671,   671,   672,
+     672,   673,   674,   674,   675,   675,   676,   676,   677,   677,
+     678,   678,   678,   679,   680,   680,   681,   682,   682,   682,
      682,   682,   682,   682,   682,   682,   682,   682,   682,   682,
      682,   682,   682,   682,   682,   682,   682,   682,   682,   682,
-     683,   684,   684,   684,   684,   685,   685,   686,   686,   687,
-     687,   688,   688,   689,   689,   690,   690,   691,   692,   692,
-     693,   693,   693,   693,   694,   695,   696,   697,   698,   698,
-     699,   699,   700,   700,   701,   701,   702,   702,   702,   703,
-     703,   704,   704,   705,   706,   706,   707,   707,   708,   709,
-     709,   710,   710,   711,   712,   713,   714,   714,   715,   715,
-     716,   716,   717,   717,   718,   718,   719,   719,   720,   720,
-     720,   720,   720,   721,   721,   722,   722,   722,   723,   723,
-     724,   724,   724,   724,   724,   725,   725,   726,   726,   727,
-     727,   728,   728,   729,   729,   729,   730,   730,   730,   730,
-     731,   731,   732,   732,   733,   733,   733,   733,   733,   733,
-     734,   734,   735,   735,   736,   736,   737,   738,   738,   739,
-     740,   740,   740,   740,   741,   742,   743,   743,   743,   743,
+     682,   682,   683,   684,   684,   684,   684,   685,   685,   686,
+     686,   687,   687,   688,   688,   689,   689,   690,   690,   691,
+     692,   692,   693,   693,   693,   693,   694,   695,   696,   697,
+     698,   698,   699,   699,   700,   700,   701,   701,   702,   702,
+     702,   703,   703,   704,   704,   705,   706,   706,   707,   707,
+     708,   709,   709,   710,   710,   711,   712,   713,   714,   714,
+     715,   715,   716,   716,   717,   717,   718,   718,   719,   719,
+     720,   720,   720,   720,   720,   721,   721,   722,   722,   722,
+     723,   723,   724,   724,   724,   724,   724,   725,   725,   726,
+     726,   727,   727,   728,   728,   729,   729,   729,   730,   730,
+     730,   730,   731,   731,   732,   732,   733,   733,   733,   733,
+     733,   733,   734,   734,   735,   735,   736,   736,   737,   738,
+     738,   739,   740,   740,   740,   740,   741,   742,   743,   743,
      743,   743,   743,   743,   743,   743,   743,   743,   743,   743,
-     744,   745,   745,   746,   746,   747,   747,   747,   747,   747,
-     748,   749,   749,   750,   751,   751,   752,   752,   753,   753,
-     753,   754,   754,   755,   756,   756,   757,   757,   757,   757,
-     757,   758,   758,   759,   759,   760,   760,   760,   761,   761,
-     762,   763,   763,   764,   764,   765,   765,   766,   766,   767,
-     767,   768,   769,   770,   770,   770,   770,   770,   770,   770,
-     770,   771,   771,   771,   771,   771,   771,   771,   771,   771,
-     771,   771,   771,   771,   771,   771,   772,   772,   773,   773,
-     774,   774,   775,   775,   776,   777,   777,   777,   778,   778,
+     743,   743,   744,   745,   745,   746,   746,   747,   747,   747,
+     747,   747,   748,   749,   749,   750,   751,   751,   752,   752,
+     753,   753,   753,   754,   754,   755,   756,   756,   757,   757,
+     757,   757,   757,   758,   758,   759,   759,   760,   760,   760,
+     761,   761,   762,   763,   763,   764,   764,   765,   765,   766,
+     766,   767,   767,   768,   769,   770,   770,   770,   770,   770,
+     770,   770,   770,   771,   771,   771,   771,   771,   771,   771,
+     771,   771,   771,   771,   771,   771,   771,   771,   772,   772,
+     773,   773,   774,   774,   775,   775,   776,   777,   777,   777,
      778,   778,   778,   778,   778,   778,   778,   778,   778,   778,
-     778,   778,   778,   778,   778,   778,   779,   779,   779,   779,
+     778,   778,   778,   778,   778,   778,   778,   778,   779,   779,
      779,   779,   779,   779,   779,   779,   779,   779,   779,   779,
-     779,   779,   779,   779,   779,   779,   779,   780,   780,   781,
-     781,   781,   781,   781,   781,   781,   782,   782,   783,   783,
-     783,   783,   783,   783,   783,   783,   783,   783,   783,   784,
-     784,   785,   785,   785,   785,   785,   785,   785,   785,   785,
-     785,   785,   786,   786,   786,   786,   786,   786,   786,   786,
-     786,   786,   786,   786,   786,   786,   787,   787,   788,   788,
-     789,   790,   790,   791,   791,   791,   791,   791,   792,   792,
-     793,   793,   793,   793,   794,   794,   794,   794,   794,   794,
+     779,   779,   779,   779,   779,   779,   779,   779,   779,   780,
+     780,   781,   781,   781,   781,   781,   781,   781,   782,   782,
+     783,   783,   783,   783,   783,   783,   783,   783,   783,   783,
+     783,   784,   784,   785,   785,   785,   785,   785,   785,   785,
+     785,   785,   785,   785,   786,   786,   786,   786,   786,   786,
+     786,   786,   786,   786,   786,   786,   786,   786,   787,   787,
+     788,   788,   789,   790,   790,   791,   791,   791,   791,   791,
+     792,   792,   793,   793,   793,   793,   794,   794,   794,   794,
      794,   794,   794,   794,   794,   794,   794,   794,   794,   794,
-     795,   795,   796,   796,   797,   797,   798,   798,   799,   800,
-     801,   801,   802,   802,   803,   803,   804,   805,   805,   806,
-     806,   806,   807,   807,   807,   808,   808,   808,   808,   809,
-     809,   810,   810,   811,   811,   812,   812,   813,   813,   814,
-     814,   815,   815,   815,   816,   816,   817,   817,   817,   818,
-     818,   818,   819,   819,   819,   820,   820,   820,   821,   821,
-     822,   822,   823,   823,   824,   824,   825,   825,   826,   826,
-     826,   826,   826,   827,   827,   827,   827,   827,   828,   829,
-     830,   830,   830,   831,   831,   831,   832,   833,   833,   833,
-     833,   834,   834,   835,   835,   836,   836,   836,   836,   836,
+     794,   794,   795,   795,   796,   796,   797,   797,   798,   798,
+     799,   800,   801,   801,   802,   802,   803,   803,   804,   805,
+     805,   806,   806,   806,   807,   807,   807,   808,   808,   808,
+     808,   809,   809,   810,   810,   811,   811,   812,   812,   813,
+     813,   814,   814,   815,   815,   815,   816,   816,   817,   817,
+     817,   818,   818,   818,   819,   819,   819,   820,   820,   820,
+     821,   821,   822,   822,   823,   823,   824,   824,   825,   825,
+     826,   826,   826,   826,   826,   827,   827,   827,   827,   827,
+     828,   829,   830,   830,   830,   831,   831,   831,   832,   833,
+     833,   833,   833,   834,   834,   835,   835,   836,   836,   836,
      836,   836,   836,   836,   836,   836,   836,   836,   836,   836,
-     837,   837,   837,   837,   837,   838,   838,   839,   839,   840,
-     840,   841,   842,   842,   843,   844,   844,   845,   845,   846,
-     846,   847,   847,   848,   848,   849,   849,   849,   849,   850,
-     850,   851,   852,   852,   853,   853,   854,   854,   854,   855,
-     855,   855,   856,   857,   857,   858,   859,   859,   859,   859,
-     860,   861,   861,   861,   861,   862,   862,   863,   863,   863,
-     864,   864,   865,   866,   866,   867,   867,   867,   867,   867,
+     836,   836,   837,   837,   837,   837,   837,   838,   838,   839,
+     839,   840,   840,   841,   842,   842,   843,   844,   844,   845,
+     845,   846,   846,   847,   847,   848,   848,   849,   849,   849,
+     849,   850,   850,   851,   852,   852,   853,   853,   854,   854,
+     854,   855,   855,   855,   856,   857,   857,   858,   859,   859,
+     859,   859,   860,   861,   861,   861,   861,   862,   862,   863,
+     863,   863,   864,   864,   865,   866,   866,   867,   867,   867,
      867,   867,   867,   867,   867,   867,   867,   867,   867,   867,
      867,   867,   867,   867,   867,   867,   867,   867,   867,   867,
      867,   867,   867,   867,   867,   867,   867,   867,   867,   867,
      867,   867,   867,   867,   867,   867,   867,   867,   867,   867,
-     867,   867,   867,   868,   868,   869,   869,   870,   870,   870,
+     867,   867,   867,   867,   867,   868,   868,   869,   869,   870,
      870,   870,   870,   870,   870,   870,   870,   870,   870,   870,
      870,   870,   870,   870,   870,   870,   870,   870,   870,   870,
-     870,   871,   871,   871,   871,   871,   871,   871,   871,   871,
+     870,   870,   870,   871,   871,   871,   871,   871,   871,   871,
      871,   871,   871,   871,   871,   871,   871,   871,   871,   871,
-     872,   873,   873,   873,   874,   874,   875,   875,   875,   875,
-     875,   876,   876,   877,   877,   877,   877,   878,   878,   878,
-     879,   879,   880,   881,   881,   882,   883,   883,   884,   884,
+     871,   871,   872,   873,   873,   873,   874,   874,   875,   875,
+     875,   875,   875,   876,   876,   877,   877,   877,   877,   878,
+     878,   878,   879,   879,   880,   881,   881,   882,   883,   883,
      884,   884,   884,   884,   884,   884,   884,   884,   884,   884,
-     884,   884,   885,   885,   885,   886,   886,   886,   886,   886,
-     887,   887,   887,   888,   888,   889,   889,   889,   889,   890,
-     890,   890,   890,   891,   892,   893,   893,   894,   894,   895,
-     895,   895,   896,   896,   896,   896,   896,   896,   896,   897,
-     897,   898,   898,   898,   899,   900,   900,   901,   901,   902,
-     903,   903,   903,   903,   903,   903,   903,   904,   904,   905,
-     906,   906,   906,   906,   906,   906,   907,   907,   908,   909,
-     909,   909,   910,   910,   911,   911,   911,   911,   911,   912,
-     912,   913,   913,   913,   913,   914,   914,   915,   915,   916,
-     916,   917,   917,   918,   918,   919,   919,   920,   920,   920,
-     920,   921,   921,   921,   921,   921,   921,   921,   921,   921,
-     922,   922,   923,   924,   924,   925,   925,   925,   926,   926,
-     927,   927,   928,   928,   928,   928,   929,   929,   930,   930,
-     931,   932,   932,   933,   933,   933,   934,   934,   935,   936,
-     936,   936,   937,   937,   937,   938,   938,   939,   940,   940,
-     941,   942,   942,   943,   943,   943,   943,   943,   943,   943,
-     943,   944,   944,   945,   945,   945,   946,   947,   947,   948,
-     948,   949,   950,   950,   951,   952,   952,   953,   954,   954,
-     955,   955,   955,   955,   955,   956,   956,   956,   957,   957,
-     958,   958,   959,   959,   959,   959,   959,   959,   959,   959,
-     960,   960,   961,   961,   961,   961,   961,   961,   961,   962,
-     962,   962,   963,   963,   964,   965,   965,   966,   966,   966,
-     967,   967,   967,   967,   967,   967,   967,   967,   967,   968,
-     968,   969,   969,   969,   970,   970,   971,   971,   972,   972,
-     973,   974,   974,   975,   975,   976,   976,   976,   976,   977,
-     977,   978,   978,   978,   979,   979,   980,   980,   981,   982,
-     982,   982,   983,   984,   984,   985,   985,   986,   986,   987,
-     987,   988,   988,   988,   988,   988,   989,   990,   991,   992,
-     993,   993,   994,   994,   995,   995,   996,   996,   997,   998,
-     998,   998,   998,   999,   999,  1000,  1000,  1001,  1001,  1002,
-    1002,  1003,  1003,  1003,  1003,  1003,  1003,  1003,  1003,  1004,
-    1004,  1004,  1004,  1004,  1004,  1005,  1005,  1005,  1005,  1006,
-    1006,  1007,  1007,  1007,  1007,  1007,  1008,  1008,  1008,  1008,
-    1009,  1009,  1010,  1010,  1011,  1011,  1011,  1011,  1012,  1012,
-    1013,  1013,  1013,  1014,  1015,  1015,  1016,  1016,  1017,  1018,
-    1018,  1019,  1019,  1020,  1020,  1021,  1021,  1022,  1022,  1022,
-    1023,  1023,  1024,  1024,  1025,  1026,  1026,  1026,  1026,  1026,
-    1026,  1027,  1027,  1027,  1028,  1028,  1028,  1028,  1028,  1028,
-    1028,  1029,  1029,  1029,  1029,  1030,  1030,  1031,  1031,  1032,
-    1032,  1032,  1032,  1032,  1032,  1032,  1032,  1032,  1032,  1032,
-    1033,  1033,  1034,  1034,  1035,  1035,  1036,  1037,  1038,  1038,
-    1039,  1039,  1040,  1041,  1042,  1042,  1042,  1042,  1042,  1042,
-    1043,  1043,  1044,  1044,  1045,  1045,  1045,  1045,  1046,  1047,
-    1047,  1047,  1048,  1048,  1048,  1048,  1048,  1048,  1048,  1048,
-    1048,  1048,  1048,  1048,  1048,  1048,  1049,  1049,  1050,  1050,
+     884,   884,   884,   884,   885,   885,   885,   886,   886,   886,
+     886,   886,   887,   887,   887,   888,   888,   889,   889,   889,
+     889,   890,   890,   890,   890,   891,   892,   893,   893,   894,
+     894,   895,   895,   895,   896,   896,   896,   896,   896,   896,
+     896,   897,   897,   898,   898,   898,   899,   900,   900,   901,
+     901,   902,   903,   903,   903,   903,   903,   903,   903,   904,
+     904,   905,   906,   906,   906,   906,   906,   906,   907,   907,
+     908,   909,   909,   909,   910,   910,   911,   911,   911,   911,
+     911,   912,   912,   913,   913,   913,   913,   914,   914,   915,
+     915,   916,   916,   917,   917,   918,   918,   919,   919,   920,
+     920,   920,   920,   921,   921,   921,   921,   921,   921,   921,
+     921,   921,   922,   922,   923,   924,   924,   925,   925,   925,
+     926,   926,   927,   927,   928,   928,   928,   928,   929,   929,
+     930,   930,   931,   932,   932,   933,   933,   933,   934,   934,
+     935,   936,   936,   936,   937,   937,   937,   938,   938,   939,
+     940,   940,   941,   942,   942,   943,   943,   943,   943,   943,
+     943,   943,   943,   944,   944,   945,   945,   945,   946,   947,
+     947,   948,   948,   949,   950,   950,   951,   952,   952,   953,
+     954,   954,   955,   955,   955,   955,   955,   956,   956,   956,
+     957,   957,   958,   958,   959,   959,   959,   959,   959,   959,
+     959,   959,   960,   960,   961,   961,   961,   961,   961,   961,
+     961,   962,   962,   962,   963,   963,   964,   965,   965,   966,
+     966,   966,   967,   967,   967,   967,   967,   967,   967,   967,
+     967,   968,   968,   969,   969,   969,   970,   970,   971,   971,
+     972,   972,   973,   974,   974,   975,   975,   976,   976,   976,
+     976,   977,   977,   978,   978,   978,   979,   979,   980,   980,
+     981,   982,   982,   982,   983,   984,   984,   985,   985,   986,
+     986,   987,   987,   988,   988,   988,   988,   988,   989,   990,
+     991,   992,   993,   993,   994,   994,   995,   995,   996,   996,
+     997,   998,   998,   998,   998,   999,   999,  1000,  1000,  1001,
+    1001,  1002,  1002,  1003,  1003,  1003,  1003,  1003,  1003,  1003,
+    1003,  1004,  1004,  1004,  1004,  1004,  1004,  1005,  1005,  1005,
+    1005,  1006,  1006,  1007,  1007,  1007,  1007,  1007,  1008,  1008,
+    1008,  1008,  1009,  1009,  1010,  1010,  1011,  1011,  1011,  1011,
+    1012,  1012,  1013,  1013,  1013,  1014,  1015,  1015,  1016,  1016,
+    1017,  1018,  1018,  1019,  1019,  1020,  1020,  1021,  1021,  1022,
+    1022,  1022,  1023,  1023,  1024,  1024,  1025,  1026,  1026,  1026,
+    1026,  1026,  1026,  1027,  1027,  1027,  1028,  1028,  1028,  1028,
+    1028,  1028,  1028,  1029,  1029,  1029,  1029,  1030,  1030,  1031,
+    1031,  1032,  1032,  1032,  1032,  1032,  1032,  1032,  1032,  1032,
+    1032,  1032,  1033,  1033,  1034,  1034,  1035,  1035,  1036,  1037,
+    1038,  1038,  1039,  1039,  1040,  1041,  1042,  1042,  1042,  1042,
+    1042,  1042,  1043,  1043,  1044,  1044,  1045,  1045,  1045,  1045,
+    1046,  1047,  1047,  1047,  1048,  1048,  1048,  1048,  1048,  1048,
+    1048,  1048,  1048,  1048,  1048,  1048,  1048,  1048,  1049,  1049,
     1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,
     1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,
     1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,
     1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,
     1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,
     1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,
-    1050,  1051,  1051,  1051,  1051,  1051,  1051,  1051,  1051,  1051,
+    1050,  1050,  1050,  1051,  1051,  1051,  1051,  1051,  1051,  1051,
     1051,  1051,  1051,  1051,  1051,  1051,  1051,  1051,  1051,  1051,
-    1051,  1051,  1051,  1051,  1051,  1051,  1052,  1052,  1052,  1052,
+    1051,  1051,  1051,  1051,  1051,  1051,  1051,  1051,  1052,  1052,
     1052,  1052,  1052,  1052,  1052,  1052,  1052,  1052,  1052,  1052,
-    1053,  1053,  1053,  1053,  1053,  1053,  1053,  1054,  1054,  1055,
-    1055,  1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,
+    1052,  1052,  1053,  1053,  1053,  1053,  1053,  1053,  1053,  1054,
+    1054,  1055,  1055,  1056,  1056,  1056,  1056,  1056,  1056,  1056,
     1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,
     1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,
     1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,  1056,
-    1056,  1056,  1056,  1057,  1057,  1058,  1058,  1058,  1058,  1059,
-    1060,  1060,  1061,  1061,  1062,  1062,  1063,  1063,  1063,  1064,
-    1064,  1064,  1064,  1065,  1065,  1066,  1066,  1067,  1067,  1068,
-    1068,  1069,  1070,  1070,  1070,  1071,  1072,  1072,  1073,  1073,
-    1074,  1074,  1074,  1075,  1075,  1076,  1076,  1076,  1076,  1076,
-    1077,  1077,  1077,  1078,  1078,  1079,  1080,  1080,  1080,  1081,
-    1081,  1082,  1082,  1082,  1082,  1082,  1082,  1082,  1082,  1082,
-    1082,  1082,  1082,  1083,  1083,  1084,  1084,  1085,  1085,  1085,
-    1085,  1085,  1085,  1086,  1086,  1087,  1087,  1088,  1088,  1088,
-    1089,  1089,  1090,  1090,  1090,  1091,  1091,  1092,  1092,  1093,
-    1093,  1093,  1093,  1093,  1093,  1093,  1093,  1094,  1094,  1095,
-    1096,  1096,  1097,  1097,  1097,  1097,  1097,  1097,  1098,  1099,
-    1100,  1100,  1100,  1101,  1101,  1102,  1103,  1103,  1104,  1105,
-    1105,  1106,  1106,  1107,  1107,  1108,  1108,  1108,  1108,  1109,
-    1109,  1110,  1110,  1111,  1111,  1112,  1112,  1113,  1113,  1114,
-    1115,  1115,  1116,  1116,  1117,  1117,  1117,  1117,  1118,  1118,
-    1119,  1119,  1120,  1120,  1121,  1122,  1123,  1124,  1125,  1126,
-    1127,  1127,  1128,  1128,  1128,  1128,  1128,  1128,  1128,  1128,
-    1128,  1128,  1128,  1128,  1128,  1128,  1128,  1129,  1130,  1130,
-    1130,  1130,  1131,  1132,  1132,  1132,  1133,  1133,  1134,  1134,
-    1134,  1134,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,
+    1056,  1056,  1056,  1056,  1056,  1057,  1057,  1058,  1058,  1058,
+    1058,  1059,  1060,  1060,  1061,  1061,  1062,  1062,  1063,  1063,
+    1063,  1064,  1064,  1064,  1064,  1065,  1065,  1066,  1066,  1067,
+    1067,  1068,  1068,  1069,  1070,  1070,  1070,  1071,  1072,  1072,
+    1073,  1073,  1074,  1074,  1074,  1075,  1075,  1076,  1076,  1076,
+    1076,  1076,  1077,  1077,  1077,  1078,  1078,  1079,  1080,  1080,
+    1080,  1081,  1081,  1082,  1082,  1082,  1082,  1082,  1082,  1082,
+    1082,  1082,  1082,  1082,  1082,  1083,  1083,  1084,  1084,  1085,
+    1085,  1085,  1085,  1085,  1085,  1086,  1086,  1087,  1087,  1088,
+    1088,  1088,  1089,  1089,  1090,  1090,  1090,  1091,  1091,  1092,
+    1092,  1093,  1093,  1093,  1093,  1093,  1093,  1093,  1093,  1094,
+    1094,  1095,  1096,  1096,  1097,  1097,  1097,  1097,  1097,  1097,
+    1098,  1099,  1100,  1100,  1100,  1101,  1101,  1102,  1103,  1103,
+    1104,  1105,  1105,  1106,  1106,  1107,  1107,  1108,  1108,  1108,
+    1108,  1109,  1109,  1110,  1110,  1111,  1111,  1112,  1112,  1113,
+    1113,  1114,  1115,  1115,  1116,  1116,  1117,  1117,  1117,  1117,
+    1118,  1118,  1119,  1119,  1120,  1120,  1121,  1122,  1123,  1124,
+    1125,  1126,  1127,  1127,  1128,  1128,  1128,  1128,  1128,  1128,
+    1128,  1128,  1128,  1128,  1128,  1128,  1128,  1128,  1128,  1129,
+    1130,  1130,  1130,  1130,  1131,  1132,  1132,  1132,  1133,  1133,
+    1134,  1134,  1134,  1134,  1135,  1135,  1135,  1135,  1135,  1135,
     1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,
     1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,
     1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,
@@ -29295,68 +29331,69 @@
     1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,
     1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,
     1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,  1135,
-    1135,  1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,
+    1135,  1135,  1135,  1136,  1136,  1136,  1136,  1136,  1136,  1136,
     1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,
     1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,
     1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,
-    1136,  1136,  1136,  1136,  1136,  1136,  1137,  1137,  1137,  1137,
+    1136,  1136,  1136,  1136,  1136,  1136,  1136,  1136,  1137,  1137,
     1137,  1137,  1137,  1137,  1137,  1137,  1137,  1137,  1137,  1137,
-    1137,  1137,  1137,  1137,  1137,  1137,  1137,  1137,  1137,  1138,
-    1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,
+    1137,  1137,  1137,  1137,  1137,  1137,  1137,  1137,  1137,  1137,
+    1137,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,
     1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,
     1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,
     1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,
     1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,
     1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,
     1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,  1138,
-    1138,  1138,  1138,  1138,  1139,  1139,  1140,  1140,  1140,  1140,
-    1140,  1140,  1140,  1140,  1142,  1141,  1143,  1144,  1144,  1144,
-    1144,  1145,  1145,  1145,  1145,  1146,  1146,  1147,  1148,  1149,
-    1149,  1150,  1150,  1150,  1151,  1151,  1152,  1152,  1153,  1153,
-    1154,  1154,  1154,  1154,  1155,  1155,  1155,  1156,  1157,  1157,
-    1158,  1158,  1159,  1159,  1159,  1159,  1160,  1160,  1161,  1162,
-    1163,  1164,  1164,  1165,  1166,  1166,  1167,  1167,  1167,  1167,
-    1167,  1169,  1168,  1170,  1171,  1172,  1172,  1173,  1173,  1173,
-    1173,  1174,  1174,  1176,  1175,  1178,  1177,  1179,  1177,  1177,
-    1180,  1180,  1181,  1181,  1181,  1182,  1182,  1182,  1182,  1183,
-    1183,  1184,  1184,  1184,  1184,  1184,  1184,  1185,  1185,  1185,
-    1186,  1188,  1187,  1189,  1190,  1189,  1191,  1191,  1192,  1192,
-    1193,  1193,  1194,  1194,  1194,  1194,  1194,  1194,  1194,  1194,
-    1194,  1195,  1195,  1195,  1195,  1195,  1195,  1195,  1195,  1195,
-    1195,  1196,  1196,  1197,  1197,  1198,  1199,  1199,  1200,  1200,
-    1200,  1201,  1202,  1203,  1203,  1203,  1203,  1204,  1204,  1204,
-    1205,  1205,  1206,  1206,  1207,  1208,  1208,  1209,  1209,  1210,
-    1210,  1211,  1211,  1212,  1213,  1213,  1214,  1214,  1214,  1215,
-    1215,  1215,  1215,  1215,  1215,  1215,  1215,  1215,  1216,  1216,
-    1216,  1216,  1216,  1217,  1217,  1218,  1219,  1220,  1221,  1221,
-    1222,  1223,  1224,  1224,  1225,  1226,  1226,  1227,  1228,  1229,
-    1229,  1230,  1231,  1232,  1232,  1233,  1234,  1234,  1234,  1234,
-    1234,  1235,  1235,  1235,  1235,  1235,  1235,  1235,  1235,  1235,
-    1235,  1235,  1235,  1235,  1235,  1235,  1236,  1236,  1237,  1237,
-    1238,  1238,  1238,  1240,  1239,  1241,  1241,  1243,  1242,  1244,
-    1244,  1244,  1245,  1245,  1245,  1245,  1245,  1245,  1245,  1245,
-    1245,  1246,  1246,  1247,  1247,  1247,  1247,  1247,  1247,  1247,
+    1138,  1138,  1138,  1138,  1138,  1138,  1139,  1139,  1140,  1140,
+    1140,  1140,  1140,  1140,  1140,  1140,  1142,  1141,  1143,  1144,
+    1144,  1144,  1144,  1145,  1145,  1145,  1145,  1146,  1146,  1147,
+    1148,  1149,  1149,  1150,  1150,  1150,  1151,  1151,  1152,  1152,
+    1153,  1153,  1154,  1154,  1154,  1154,  1155,  1155,  1155,  1156,
+    1157,  1157,  1158,  1158,  1159,  1159,  1159,  1159,  1160,  1160,
+    1161,  1162,  1163,  1164,  1164,  1165,  1166,  1166,  1167,  1167,
+    1167,  1167,  1167,  1169,  1168,  1170,  1171,  1172,  1172,  1173,
+    1173,  1173,  1173,  1174,  1174,  1176,  1175,  1178,  1177,  1179,
+    1177,  1177,  1180,  1180,  1181,  1181,  1181,  1182,  1182,  1182,
+    1182,  1183,  1183,  1184,  1184,  1184,  1184,  1184,  1184,  1185,
+    1185,  1185,  1186,  1188,  1187,  1189,  1190,  1189,  1191,  1191,
+    1192,  1192,  1193,  1193,  1194,  1194,  1194,  1194,  1194,  1194,
+    1194,  1194,  1194,  1195,  1195,  1195,  1195,  1195,  1195,  1195,
+    1195,  1195,  1195,  1196,  1196,  1197,  1197,  1198,  1199,  1199,
+    1200,  1200,  1200,  1201,  1202,  1203,  1203,  1203,  1203,  1204,
+    1204,  1204,  1205,  1205,  1206,  1206,  1207,  1208,  1208,  1209,
+    1209,  1210,  1210,  1211,  1211,  1212,  1213,  1213,  1214,  1214,
+    1214,  1215,  1215,  1215,  1215,  1215,  1215,  1215,  1215,  1215,
+    1216,  1216,  1216,  1216,  1216,  1217,  1217,  1218,  1219,  1220,
+    1221,  1221,  1222,  1223,  1224,  1224,  1225,  1226,  1226,  1227,
+    1228,  1229,  1229,  1230,  1231,  1232,  1232,  1233,  1234,  1234,
+    1234,  1234,  1234,  1235,  1235,  1235,  1235,  1235,  1235,  1235,
+    1235,  1235,  1235,  1235,  1235,  1235,  1235,  1235,  1236,  1236,
+    1237,  1237,  1238,  1238,  1238,  1240,  1239,  1241,  1241,  1243,
+    1242,  1244,  1244,  1244,  1245,  1245,  1245,  1245,  1245,  1245,
+    1245,  1245,  1245,  1246,  1246,  1247,  1247,  1247,  1247,  1247,
     1247,  1247,  1247,  1247,  1247,  1247,  1247,  1247,  1247,  1247,
-    1247,  1247,  1247,  1247,  1247,  1247,  1248,  1248,  1248,  1248,
-    1248,  1248,  1249,  1249,  1249,  1249,  1249,  1249,  1249,  1250,
-    1251,  1251,  1251,  1251,  1251,  1251,  1251,  1251,  1252,  1252,
-    1252,  1252,  1252,  1252,  1252,  1253,  1253,  1253,  1253,  1253,
-    1253,  1254,  1254,  1254,  1254,  1254,  1254,  1254,  1254,  1254,
-    1254,  1254,  1255,  1255,  1255,  1255,  1255,  1256,  1256,  1256,
-    1256,  1257,  1257,  1257,  1257,  1257,  1257,  1257,  1258,  1258,
-    1258,  1259,  1259,  1259,  1259,  1259,  1259,  1260,  1260,  1261,
-    1262,  1262,  1263,  1263,  1264,  1265,  1266,  1267,  1267,  1267,
-    1268,  1269,  1270,  1271,  1272,  1272,  1272,  1272,  1272,  1273,
-    1274,  1274,  1274,  1275,  1275,  1276,  1276,  1276,  1277,  1277,
-    1278,  1278,  1279,  1279,  1280,  1280,  1280,  1280,  1280,  1281,
+    1247,  1247,  1247,  1247,  1247,  1247,  1247,  1247,  1248,  1248,
+    1248,  1248,  1248,  1248,  1249,  1249,  1249,  1249,  1249,  1249,
+    1249,  1250,  1251,  1251,  1251,  1251,  1251,  1251,  1251,  1251,
+    1252,  1252,  1252,  1252,  1252,  1252,  1252,  1253,  1253,  1253,
+    1253,  1253,  1253,  1254,  1254,  1254,  1254,  1254,  1254,  1254,
+    1254,  1254,  1254,  1254,  1255,  1255,  1255,  1255,  1255,  1256,
+    1256,  1256,  1256,  1257,  1257,  1257,  1257,  1257,  1257,  1257,
+    1258,  1258,  1258,  1259,  1259,  1259,  1259,  1259,  1259,  1260,
+    1260,  1261,  1262,  1262,  1263,  1263,  1264,  1265,  1266,  1267,
+    1267,  1267,  1268,  1269,  1270,  1271,  1272,  1272,  1272,  1272,
+    1272,  1273,  1274,  1274,  1274,  1275,  1275,  1276,  1276,  1276,
+    1277,  1277,  1278,  1278,  1279,  1279,  1280,  1280,  1280,  1280,
+    1280,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,
     1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,
     1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,
     1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,
     1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,
-    1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,  1281,
-    1281,  1281,  1281,  1281,  1281,  1282,  1282,  1282,  1282,  1283,
-    1283,  1283,  1283,  1283,  1283,  1283,  1283,  1283,  1283,  1284,
-    1284,  1284,  1284,  1284,  1285,  1285,  1286,  1286,  1287,  1287
+    1281,  1281,  1281,  1281,  1281,  1281,  1281,  1282,  1282,  1282,
+    1282,  1283,  1283,  1283,  1283,  1283,  1283,  1283,  1283,  1283,
+    1283,  1284,  1284,  1284,  1284,  1284,  1285,  1285,  1286,  1286,
+    1287,  1287
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -29379,198 +29416,197 @@
        1,     1,     1,     1,     0,     5,     1,     1,     0,     2,
        0,     2,     0,     2,     2,     3,     3,     1,     3,     3,
        2,     1,     1,     2,     2,     2,     3,     3,     5,     5,
-       0,     3,     5,     5,     5,     4,     3,     5,     3,     5,
-       5,     6,     1,     1,     3,     5,     6,     4,     9,     7,
-       1,     0,     2,     0,     1,     1,     1,     1,     1,     1,
-       2,     3,     3,     2,     5,     1,     3,     3,     3,     3,
-       1,     3,     3,     2,     2,     2,     2,     3,     3,     3,
-       3,     1,     3,     1,     3,     1,     1,     2,     2,     2,
-       1,     1,     1,     1,     1,     1,     1,     3,     5,     1,
-       1,     1,     1,     1,     0,     1,     1,     2,     1,     2,
-       3,     2,     1,     1,     2,     1,     2,     1,     3,     4,
-       5,     4,     2,     4,     1,     1,     1,     1,     1,     2,
-       2,     2,     2,     2,     4,     6,    10,    13,     4,     6,
-      10,    13,     4,     6,     4,     6,     5,     7,    11,    14,
-       1,     3,     2,     3,     4,     6,     6,     6,     5,     5,
-       6,     6,     4,     8,     4,     2,     4,     3,     6,     4,
-       3,     3,     3,     3,     2,     2,     3,     4,     4,     3,
-       3,     3,     3,     3,     3,     4,     4,     3,     2,     3,
-       2,     2,     3,     3,     2,     2,     3,     4,     4,     4,
-       5,     1,     3,     2,     1,     1,     0,     2,     0,     2,
-       0,     1,     1,     1,     3,     3,     2,     0,     1,     3,
-       3,     1,     5,     3,     4,     1,     3,     4,     6,     4,
-       8,     2,     2,    11,     7,     1,     1,     1,     0,     1,
-       1,     1,     1,     3,     2,     0,     1,     1,     1,     3,
-       3,     1,     1,     3,     3,     3,     3,     4,     3,     2,
-       1,     0,     2,     0,     3,     0,     1,     0,     1,     3,
-       2,     1,     1,     1,     3,     0,     1,     3,     1,    11,
-      14,    10,    13,     1,     1,     2,     2,     2,     2,     1,
-       0,     1,     0,     3,     0,     1,     3,     1,     3,     1,
-       1,     1,     1,     1,     4,     4,     2,     0,     3,     1,
-       1,     2,     2,     1,     3,     4,     5,     2,     5,     1,
-       2,     2,     2,     3,     3,     3,     0,     1,     1,     1,
-       1,     1,     1,     3,     1,     5,     7,     3,     8,     4,
-       9,    11,     2,     0,     3,     0,     1,     3,     1,     2,
-       2,     2,     0,     1,     3,     3,     6,     4,     0,     1,
-       1,     2,     2,     0,     3,     3,     2,     1,     1,     2,
-       2,     4,     0,     2,     2,     2,     0,     3,     4,     4,
-       0,     2,     0,     4,     0,     3,     5,     2,     3,     0,
-       8,    11,     4,     1,     0,     6,     5,     8,     4,     6,
-       1,     0,     1,     2,     2,     1,     2,     3,     2,     2,
-       2,     2,     3,     3,     1,     3,     1,     0,     1,     2,
-       1,     1,     3,     6,    10,     1,     0,     1,     2,     2,
-       0,     2,     2,     1,     0,     5,     7,     1,     0,     7,
-       2,     0,     3,     5,     5,     8,     2,     0,     2,     2,
-       2,     5,     2,     0,     2,     7,    10,     6,     6,     6,
-       6,     7,     7,     9,     9,     6,     7,     6,     8,     8,
-       8,     8,     6,     6,     7,     7,     8,     6,     9,     6,
-       7,     2,     2,     2,     2,     1,     2,     1,     0,     6,
-       8,     7,     6,     4,     0,     1,     3,     4,     1,     3,
-       1,     2,     2,     2,     2,     1,     1,    10,     2,     0,
-       2,     2,     1,     0,     4,     6,     5,     4,     4,    11,
-      14,     5,     7,    11,     2,     1,     4,     0,     8,     1,
-       1,     7,     9,     8,     9,     8,     6,     8,     4,     0,
-       5,     0,     2,     0,     2,     0,     2,     0,     1,     1,
-       1,     1,     1,    15,    20,     1,     1,     2,     1,     3,
-       1,     1,     1,     3,     1,     3,     0,     1,     0,     1,
-       1,     4,     0,     1,     3,     0,     1,     1,     1,     1,
-       2,     0,     0,     2,     2,     1,     2,     2,     2,     2,
-       6,     8,    11,    13,     1,     3,     5,     1,     3,     5,
-       1,     2,     2,     1,     8,     4,     5,     4,     4,     4,
-       3,     7,     8,     6,     6,     6,     6,     6,     4,     5,
-       3,     1,     3,     3,     1,     1,     1,     1,     1,     1,
-       3,     1,     3,     3,     1,     0,     1,     3,     7,     9,
-       9,     3,     0,    13,     1,     3,     5,     6,     4,     7,
-       2,     1,     0,     2,     0,     2,     4,     0,     1,     0,
-       6,     8,     8,     1,     3,     5,     5,     7,     9,     7,
-       9,     5,     6,     6,     4,     4,     6,     4,     6,     5,
-       7,     1,     1,     1,     2,     1,     2,     2,     1,     1,
-       1,     1,     3,     3,     3,     3,     1,     3,     1,     2,
-       2,     3,     1,     3,     5,     2,     2,     0,     6,     6,
-       6,     7,     7,     7,     8,     9,     8,     8,     6,     9,
-       8,     9,     9,     7,    10,     7,     1,     1,     1,     1,
-       1,     1,     1,     2,     1,     1,     1,     1,     1,     2,
-       1,     3,     2,     3,     3,     3,     3,     1,     1,     8,
-       8,     8,     9,     9,     9,     9,     2,     0,     1,     1,
-       2,     2,     1,     1,     1,     1,     1,     1,     2,     1,
-       1,     2,     2,     3,     4,     5,     4,     5,     3,     4,
-       3,     4,     1,     2,     3,     3,     3,     3,     4,     4,
-       3,     3,     4,     4,     4,     4,     1,     1,     1,     0,
-       7,     7,    10,     1,     1,     2,     4,     5,     1,     3,
-       2,     2,     2,     2,     1,     2,     2,     4,     3,     2,
-       2,     2,     2,     3,     2,     2,     2,     5,     5,     5,
-       1,     3,     1,     2,     3,     0,     1,     3,     2,     6,
-       6,     9,     3,     0,     3,     0,     5,     2,     0,     3,
-       3,     3,     7,     7,    10,     1,     1,     1,     1,    14,
-      17,     1,     0,     1,     0,     1,     0,     2,     0,     1,
-       3,     5,     5,     7,     2,     0,     1,     2,     0,     1,
-       1,     0,     2,     2,     0,     9,    12,     7,     2,     0,
-       3,     2,     1,     3,     3,     2,     1,     3,     3,     3,
-       2,     2,     1,     1,     1,     1,     2,     1,     1,     1,
-       1,     4,     5,     1,     3,     3,     1,     3,     3,     5,
-       6,     1,     3,     1,     2,     4,     5,     1,     1,     1,
-       1,     3,     3,     2,     2,     1,     2,     2,     2,     1,
-       2,     2,     2,     1,     1,     1,     3,     3,     5,     2,
-       0,     2,     1,     3,     5,     1,     2,     1,     0,     5,
-       7,     5,     7,     5,     7,     3,     5,     5,     5,     1,
-       3,     2,     1,     2,     1,     2,    11,    10,    10,     2,
-       2,     0,     9,     2,     0,    10,    11,    11,     5,     5,
-       8,     3,     3,     6,     6,     1,     1,     1,     1,     1,
-       1,     3,     1,     5,     5,     7,     6,     6,     6,     6,
-       8,     8,     6,     6,     7,     9,     9,     8,    10,     6,
-       6,     6,     8,     6,     8,     6,     8,     7,     9,     6,
-       8,     7,     9,     8,    10,     9,    11,     8,    10,     9,
-      11,     8,     8,     7,     6,     6,     6,     8,     8,     8,
-       8,     6,     9,     1,     0,     2,     0,     7,     6,     6,
-       6,     6,     6,     7,     9,     9,     6,     8,     8,     8,
-       8,     8,     6,     8,     6,     8,     7,     9,     7,     9,
-       6,     7,     6,     6,     6,     6,     6,     7,     7,     7,
-       9,     9,     6,     6,     6,     8,     8,     8,     6,     7,
-      13,     1,     1,     3,     3,     1,     1,     1,     1,     1,
-       1,     1,     0,     1,     1,     1,     1,     1,     1,     0,
-       6,     8,     3,     2,     0,     2,     2,     2,     2,     3,
-       3,     2,     2,     2,     2,     3,     2,     5,     4,     3,
-       3,     3,     1,     1,     0,     3,     2,     2,     1,     2,
-       1,     3,     2,     1,     0,     9,    11,    12,    14,     3,
-       4,     4,     0,     2,     5,     1,     0,     1,     2,     3,
-       3,     3,     1,     2,     1,     1,     1,     1,     1,     1,
-       0,     5,     4,     6,     4,     3,     5,     4,     4,     6,
-       4,     6,     6,     5,     7,     9,     6,     1,     0,     6,
-      11,    11,    11,    13,     9,    11,     1,     1,    10,     4,
-       2,     5,     2,     0,     4,     5,     5,     4,     6,     1,
-       3,     1,     1,     1,     1,     2,     4,     1,     1,     1,
-       0,     1,     0,     1,     0,     3,     0,     2,     4,     3,
-       5,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     2,     1,     1,     1,     1,     0,     5,     4,
-       3,     0,     1,     1,     1,     1,     4,     9,     3,     0,
-       7,     1,     3,     1,     4,     2,     1,     3,     2,     8,
-       5,     0,     4,     3,     0,     3,     0,     7,     2,     0,
-       5,     3,     0,     2,     2,     2,     3,     1,     3,     1,
-       2,     1,     0,     1,     2,     0,     8,     1,     3,     1,
-       1,     3,     5,     5,     2,     1,     3,     7,     1,     1,
-       0,     3,     2,     2,     2,     0,     2,     2,     1,     1,
-       3,     3,     1,     2,     4,     4,     2,     3,     5,     5,
-       1,     1,     9,     9,     1,     2,     4,     4,     4,     2,
-       2,     3,     1,     3,     6,     1,     0,     2,     1,     0,
-       3,     3,     4,     4,     4,     4,     3,     2,     1,     1,
-       0,     1,     1,     0,     1,     5,     1,     0,     1,     0,
-       3,     1,     3,     4,     3,     2,     2,     1,     1,     1,
-       0,     2,     4,     5,     2,     3,     1,     1,     1,     1,
-       3,     0,     1,     1,     1,     1,     1,     3,     0,     1,
-       3,     1,     1,     1,     1,     1,     2,     4,     4,     5,
-       2,     0,     1,     3,     1,     0,     1,     2,     3,     2,
-       4,     2,     3,     2,     0,     2,     3,     2,     0,     1,
-       3,     2,     3,     2,     3,     2,     3,     1,     4,     3,
-       4,     5,     4,     5,     4,     5,     2,     4,     1,     1,
-       0,     1,     4,     5,     4,     0,     2,     2,     2,     1,
-       1,     0,     4,     2,     1,     2,     2,     4,     1,     3,
-       1,     2,     3,     6,     4,     0,     2,     6,     2,     1,
-       3,     4,     0,     2,     0,     2,     0,     2,     4,     0,
-       1,     0,     1,     3,     3,     2,     3,     5,     6,     2,
-       3,     3,     4,     0,     1,     1,     1,     1,     1,     2,
-       4,     1,     1,     1,     1,     2,     3,     3,     0,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     1,
-       3,     0,     1,     1,     1,     1,     5,     2,     1,     1,
-       1,     1,     5,     2,     2,     2,     1,     3,     3,     2,
-       1,     0,     3,     0,     5,     2,     5,     2,     1,     3,
-       3,     0,     1,     1,     1,     1,     1,     1,     3,     3,
-       3,     3,     3,     3,     3,     0,     1,     4,     1,     3,
-       3,     5,     2,     2,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     2,     2,     3,
-       3,     2,     2,     3,     5,     4,     6,     3,     5,     4,
-       6,     4,     6,     5,     7,     3,     2,     4,     2,     3,
-       3,     4,     3,     4,     3,     4,     5,     6,     6,     7,
-       6,     7,     6,     7,     3,     4,     4,     6,     2,     3,
-       4,     1,     3,     2,     2,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     2,     2,
-       5,     6,     6,     7,     3,     4,     1,     1,     2,     4,
-       1,     1,     1,     2,     2,     2,     2,     1,     1,     4,
-       3,     5,     6,     8,     6,     6,     4,     4,     1,     1,
-       1,     5,     1,     1,     4,     1,     4,     1,     4,     1,
-       4,     1,     1,     1,     1,     1,     1,     6,     4,     4,
-       4,     4,     6,     5,     5,     5,     4,     6,     4,     4,
-       4,     4,     5,     7,     7,     9,     5,     4,     6,     5,
-       7,     7,     7,     2,     3,     3,     3,     4,     0,     4,
-       1,     3,     3,     1,     1,     1,     2,     2,     0,     2,
-       4,     4,     6,     5,     0,     5,     0,     2,     0,     1,
-       3,     3,     2,     2,     0,     6,     1,     0,     3,     0,
-       2,     2,     0,     1,     4,     2,     2,     2,     2,     2,
-       4,     3,     5,     4,     3,     5,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     4,     1,     4,     1,     4,     1,
-       2,     1,     2,     1,     3,     1,     3,     1,     3,     3,
-       1,     3,     3,     3,     2,     1,     3,     3,     0,     1,
-       1,     1,     1,     1,     1,     1,     1,     4,     3,     2,
-       3,     0,     3,     3,     2,     2,     1,     0,     2,     2,
-       3,     2,     1,     1,     3,     5,     1,     2,     4,     2,
-       0,     1,     0,     1,     2,     2,     2,     3,     5,     1,
-       2,     0,     2,     1,     0,     1,     1,     1,     3,     3,
-       1,     0,     1,     3,     3,     2,     1,     1,     1,     3,
-       1,     2,     1,     3,     1,     1,     1,     1,     1,     1,
-       1,     2,     1,     1,     1,     1,     1,     2,     6,     2,
-       3,     5,     1,     1,     1,     1,     1,     1,     1,     1,
-       2,     2,     1,     1,     1,     1,     1,     3,     1,     1,
+       0,     3,     5,     5,     5,     5,     5,     3,     5,     3,
+       5,     5,     6,     1,     1,     3,     5,     6,     4,     9,
+       7,     1,     0,     2,     0,     1,     1,     1,     1,     1,
+       1,     2,     3,     3,     2,     5,     1,     3,     3,     3,
+       3,     1,     3,     3,     2,     2,     2,     2,     3,     3,
+       3,     3,     1,     3,     1,     3,     1,     1,     2,     2,
+       2,     1,     1,     1,     1,     1,     1,     1,     3,     5,
+       1,     1,     1,     1,     1,     0,     1,     1,     2,     1,
+       2,     3,     2,     1,     1,     2,     1,     2,     1,     3,
+       4,     5,     4,     2,     4,     1,     1,     1,     1,     1,
+       2,     2,     2,     2,     2,     4,     6,    10,    13,     4,
+       6,    10,    13,     4,     6,     4,     6,     5,     7,    11,
+      14,     1,     3,     2,     3,     4,     6,     6,     6,     5,
+       5,     6,     6,     4,     8,     4,     2,     4,     3,     6,
+       4,     3,     3,     3,     3,     2,     2,     3,     4,     4,
+       3,     3,     3,     3,     3,     3,     4,     4,     3,     2,
+       3,     2,     2,     3,     3,     2,     2,     3,     4,     4,
+       4,     5,     1,     3,     2,     1,     1,     0,     2,     0,
+       2,     0,     1,     1,     1,     3,     3,     2,     0,     1,
+       3,     3,     1,     5,     3,     4,     1,     3,     4,     6,
+       4,     8,     2,     2,    11,     7,     1,     1,     1,     0,
+       1,     1,     1,     1,     3,     2,     0,     1,     1,     1,
+       3,     3,     1,     1,     3,     3,     3,     3,     4,     3,
+       2,     1,     0,     2,     0,     3,     0,     1,     0,     1,
+       3,     2,     1,     1,     1,     3,     0,     1,     3,     1,
+      11,    14,    10,    13,     1,     1,     2,     2,     2,     2,
+       1,     0,     1,     0,     3,     0,     1,     3,     1,     3,
+       1,     1,     1,     1,     1,     4,     4,     2,     0,     3,
+       1,     1,     2,     2,     1,     3,     4,     5,     2,     5,
+       1,     2,     2,     2,     3,     3,     3,     0,     1,     1,
+       1,     1,     1,     1,     3,     1,     5,     7,     3,     8,
+       4,     9,    11,     2,     0,     3,     0,     1,     3,     1,
+       2,     2,     2,     0,     1,     3,     3,     6,     4,     0,
+       1,     1,     2,     2,     0,     3,     3,     2,     1,     1,
+       2,     2,     4,     0,     2,     2,     2,     0,     3,     4,
+       4,     0,     2,     0,     4,     0,     3,     5,     2,     3,
+       0,     8,    11,     4,     1,     0,     6,     5,     8,     4,
+       6,     1,     0,     1,     2,     2,     1,     2,     3,     2,
+       2,     2,     2,     3,     3,     1,     3,     1,     0,     1,
+       2,     2,     1,     1,     3,     6,    10,     1,     0,     1,
+       2,     2,     0,     2,     2,     1,     0,     5,     7,     1,
+       0,     7,     2,     0,     3,     5,     5,     8,     2,     0,
+       2,     2,     2,     5,     2,     0,     2,     7,    10,     6,
+       6,     6,     6,     7,     7,     9,     9,     6,     7,     6,
+       8,     8,     8,     8,     6,     6,     7,     7,     8,     6,
+       9,     6,     7,     2,     2,     2,     2,     1,     2,     1,
+       0,     6,     8,     7,     6,     4,     0,     1,     3,     4,
+       1,     3,     1,     2,     2,     2,     2,     1,     1,    10,
+       2,     0,     2,     2,     1,     0,     4,     6,     5,     4,
+       4,    11,    14,     5,     7,    11,     2,     1,     4,     0,
+       8,     1,     1,     7,     9,     8,     9,     8,     6,     8,
+       4,     0,     5,     0,     2,     0,     2,     0,     2,     0,
+       1,     1,     1,     1,     1,    15,    20,     1,     1,     2,
+       1,     3,     1,     1,     1,     3,     1,     3,     0,     1,
+       0,     1,     1,     4,     0,     1,     3,     0,     1,     1,
+       1,     1,     2,     0,     0,     2,     2,     1,     2,     2,
+       2,     2,     6,     8,    11,    13,     1,     3,     5,     1,
+       3,     5,     1,     2,     2,     1,     8,     4,     5,     4,
+       4,     4,     3,     7,     8,     6,     6,     6,     6,     6,
+       4,     5,     3,     1,     3,     3,     1,     1,     1,     1,
+       1,     1,     3,     1,     3,     3,     1,     0,     1,     3,
+       7,     9,     9,     3,     0,    13,     1,     3,     5,     6,
+       4,     7,     2,     1,     0,     2,     0,     2,     4,     0,
+       1,     0,     6,     8,     8,     1,     3,     5,     5,     7,
+       9,     7,     9,     5,     6,     6,     4,     4,     6,     4,
+       6,     5,     7,     1,     1,     1,     2,     1,     2,     2,
+       1,     1,     1,     1,     3,     3,     3,     3,     1,     3,
+       1,     2,     2,     3,     1,     3,     5,     2,     2,     0,
+       6,     6,     6,     7,     7,     7,     8,     9,     8,     8,
+       6,     9,     8,     9,     9,     7,    10,     7,     1,     1,
+       1,     1,     1,     1,     1,     2,     1,     1,     1,     1,
+       1,     2,     1,     3,     2,     3,     3,     3,     3,     1,
+       1,     8,     8,     8,     9,     9,     9,     9,     2,     0,
+       1,     1,     2,     2,     1,     1,     1,     1,     1,     1,
+       2,     1,     1,     2,     2,     3,     4,     5,     4,     5,
+       3,     4,     3,     4,     1,     2,     3,     3,     3,     3,
+       4,     4,     3,     3,     4,     4,     4,     4,     1,     1,
+       1,     0,     7,     7,    10,     1,     1,     2,     4,     5,
+       1,     3,     2,     2,     2,     2,     1,     2,     2,     4,
+       3,     2,     2,     2,     2,     3,     2,     2,     2,     5,
+       5,     5,     1,     3,     1,     2,     3,     0,     1,     3,
+       2,     6,     6,     9,     3,     0,     3,     0,     5,     2,
+       0,     3,     3,     3,     7,     7,    10,     1,     1,     1,
+       1,    14,    17,     1,     0,     1,     0,     1,     0,     2,
+       0,     1,     3,     5,     5,     7,     2,     0,     1,     2,
+       0,     1,     1,     0,     2,     2,     0,     9,    12,     7,
+       2,     0,     3,     2,     1,     3,     3,     2,     1,     3,
+       3,     3,     2,     2,     1,     1,     1,     1,     2,     1,
+       1,     1,     1,     4,     5,     1,     3,     3,     1,     3,
+       3,     5,     6,     1,     3,     1,     2,     4,     5,     1,
+       1,     1,     1,     3,     3,     2,     2,     1,     2,     2,
+       2,     1,     2,     2,     2,     1,     1,     1,     3,     3,
+       5,     2,     0,     2,     1,     3,     5,     1,     2,     1,
+       0,     5,     7,     5,     7,     5,     7,     3,     5,     5,
+       5,     1,     3,     2,     1,     2,     1,     2,    11,    10,
+      10,     2,     2,     0,     9,     2,     0,    10,    11,    11,
+       5,     5,     8,     3,     3,     6,     6,     1,     1,     1,
+       1,     1,     1,     3,     1,     5,     5,     7,     6,     6,
+       6,     6,     8,     8,     6,     6,     7,     9,     9,     8,
+      10,     6,     6,     6,     8,     6,     8,     6,     8,     7,
+       9,     6,     8,     7,     9,     8,    10,     9,    11,     8,
+      10,     9,    11,     8,     8,     7,     6,     6,     6,     8,
+       8,     8,     8,     6,     9,     1,     0,     2,     0,     7,
+       6,     6,     6,     6,     6,     7,     9,     9,     6,     8,
+       8,     8,     8,     8,     6,     8,     6,     8,     7,     9,
+       7,     9,     6,     7,     6,     6,     6,     6,     6,     7,
+       7,     7,     9,     9,     6,     6,     6,     8,     8,     8,
+       6,     7,    13,     1,     1,     3,     3,     1,     1,     1,
+       1,     1,     1,     1,     0,     1,     1,     1,     1,     1,
+       1,     0,     6,     8,     3,     2,     0,     2,     2,     2,
+       2,     3,     3,     2,     2,     2,     2,     3,     2,     5,
+       4,     3,     3,     3,     1,     1,     0,     3,     2,     2,
+       1,     2,     1,     3,     2,     1,     0,     9,    11,    12,
+      14,     3,     4,     4,     0,     2,     5,     1,     0,     1,
+       2,     3,     3,     3,     1,     2,     1,     1,     1,     1,
+       1,     1,     0,     5,     4,     6,     4,     3,     5,     4,
+       4,     6,     4,     6,     6,     5,     7,     9,     6,     1,
+       0,     6,    11,    11,    11,    13,     9,    11,     1,     1,
+      10,     4,     2,     5,     2,     0,     4,     5,     5,     4,
+       6,     1,     3,     1,     1,     1,     1,     2,     4,     1,
+       1,     1,     0,     1,     0,     1,     0,     3,     0,     2,
+       4,     3,     5,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     3,     2,     1,     1,     1,     1,     0,
+       5,     4,     3,     0,     1,     1,     1,     1,     4,     9,
+       3,     0,     7,     1,     3,     1,     4,     2,     1,     3,
+       2,     8,     5,     0,     4,     3,     0,     3,     0,     7,
+       2,     0,     5,     3,     0,     2,     2,     2,     3,     1,
+       3,     1,     2,     1,     0,     1,     2,     0,     8,     1,
+       3,     1,     1,     3,     5,     5,     2,     1,     3,     7,
+       1,     1,     0,     3,     2,     2,     2,     0,     2,     2,
+       1,     1,     3,     3,     1,     2,     4,     4,     2,     3,
+       5,     5,     1,     1,     9,     9,     1,     2,     4,     4,
+       4,     2,     2,     3,     1,     3,     6,     1,     0,     2,
+       1,     0,     3,     3,     4,     4,     4,     4,     3,     2,
+       1,     1,     0,     1,     1,     0,     1,     5,     1,     0,
+       1,     0,     3,     1,     3,     4,     3,     2,     2,     1,
+       1,     1,     0,     2,     4,     5,     2,     3,     1,     1,
+       1,     1,     3,     0,     1,     1,     1,     1,     1,     3,
+       0,     1,     3,     1,     1,     1,     1,     1,     2,     4,
+       4,     5,     2,     0,     1,     3,     1,     0,     1,     2,
+       3,     2,     4,     2,     3,     2,     0,     2,     3,     2,
+       0,     1,     3,     2,     3,     2,     3,     2,     3,     1,
+       4,     3,     4,     5,     4,     5,     4,     5,     2,     4,
+       1,     1,     0,     1,     4,     5,     4,     0,     2,     2,
+       2,     1,     1,     0,     4,     2,     1,     2,     2,     4,
+       1,     3,     1,     2,     3,     6,     4,     0,     2,     6,
+       2,     1,     3,     4,     0,     2,     0,     2,     0,     2,
+       4,     0,     1,     0,     1,     3,     3,     2,     3,     5,
+       6,     2,     3,     3,     4,     0,     1,     1,     1,     1,
+       1,     2,     4,     1,     1,     1,     1,     2,     3,     3,
+       0,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       2,     1,     3,     0,     1,     1,     1,     1,     5,     2,
+       1,     1,     1,     1,     5,     2,     2,     2,     1,     3,
+       3,     2,     1,     0,     3,     0,     5,     2,     5,     2,
+       1,     3,     3,     0,     1,     1,     1,     1,     1,     1,
+       3,     3,     3,     3,     3,     3,     3,     0,     1,     4,
+       1,     3,     3,     5,     2,     2,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     2,
+       2,     3,     3,     2,     2,     3,     5,     4,     6,     3,
+       5,     4,     6,     4,     6,     5,     7,     3,     2,     4,
+       2,     3,     3,     4,     3,     4,     3,     4,     5,     6,
+       6,     7,     6,     7,     6,     7,     3,     4,     4,     6,
+       2,     3,     4,     1,     3,     2,     2,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       2,     2,     5,     6,     6,     7,     3,     4,     1,     1,
+       2,     4,     1,     1,     1,     2,     2,     2,     2,     1,
+       1,     4,     3,     5,     6,     8,     6,     6,     4,     4,
+       1,     1,     1,     5,     1,     1,     4,     1,     4,     1,
+       4,     1,     4,     1,     1,     1,     1,     1,     1,     6,
+       4,     4,     4,     4,     6,     5,     5,     5,     4,     6,
+       4,     4,     4,     4,     5,     7,     7,     9,     5,     4,
+       6,     5,     7,     7,     7,     2,     3,     3,     3,     4,
+       0,     4,     1,     3,     3,     1,     1,     1,     2,     2,
+       0,     2,     4,     4,     6,     5,     0,     5,     0,     2,
+       0,     1,     3,     3,     2,     2,     0,     6,     1,     0,
+       3,     0,     2,     2,     0,     1,     4,     2,     2,     2,
+       2,     2,     4,     3,     5,     4,     3,     5,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     4,     1,     4,     1,
+       4,     1,     2,     1,     2,     1,     3,     1,     3,     1,
+       3,     3,     1,     3,     3,     3,     2,     1,     3,     3,
+       0,     1,     1,     1,     1,     1,     1,     1,     1,     4,
+       3,     2,     3,     0,     3,     3,     2,     2,     1,     0,
+       2,     2,     3,     2,     1,     1,     3,     5,     1,     2,
+       4,     2,     0,     1,     0,     1,     2,     2,     2,     3,
+       5,     1,     2,     0,     2,     1,     0,     1,     1,     1,
+       3,     3,     1,     0,     1,     3,     3,     2,     1,     1,
+       1,     3,     1,     2,     1,     3,     1,     1,     1,     1,
+       1,     1,     1,     2,     1,     1,     1,     1,     1,     2,
+       6,     2,     3,     5,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     2,     1,     1,     1,     1,     1,     3,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -29610,33 +29646,34 @@
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     0,     2,     4,     3,     2,     1,
-       1,     1,     1,     1,     0,     8,     2,     5,     3,     2,
-       2,     3,     7,     1,     1,     1,     0,     2,     2,     1,
-       0,     1,     3,     1,     2,     0,     2,     0,     2,     0,
-       1,     3,     4,     3,     1,     1,     1,     1,     2,     0,
-       2,     4,     0,     2,     2,     2,     1,     1,     7,     3,
-       1,     1,     1,     1,     2,     0,     1,     3,     3,     3,
-       3,     0,     4,     5,     5,     0,     1,     1,     1,     2,
-       2,     1,     2,     0,     7,     0,     5,     0,     4,     2,
-       2,     0,     2,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     5,     2,     1,     3,     2,     2,
-       3,     0,     5,     1,     0,     5,     2,     2,     1,     1,
-       1,     2,     2,     3,     1,     2,     2,     3,     3,     4,
-       2,     1,     2,     1,     1,     2,     2,     3,     1,     1,
-       1,     1,     0,     1,     3,     5,     0,     2,     0,     1,
-       2,     3,     2,     1,     1,     1,     0,     1,     1,     1,
-       1,     1,     2,     2,     3,     0,     1,     2,     1,     4,
-       3,     4,     3,     2,     1,     3,     1,     1,     1,     1,
-       2,     2,     1,     2,     2,     1,     1,     1,     4,     4,
-       4,     4,     4,     1,     0,     3,     3,     4,     1,     3,
-       3,     4,     1,     3,     3,     1,     1,     1,     6,     1,
-       3,     3,     6,     1,     3,     3,     1,     1,     2,     2,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     4,     4,     1,     1,
-       4,     4,     3,     0,     7,     1,     0,     0,     7,     3,
-       4,     3,     1,     1,     1,     2,     3,     5,     2,     5,
-       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     0,     2,     4,     3,
+       2,     1,     1,     1,     1,     1,     0,     8,     2,     5,
+       3,     2,     2,     3,     7,     1,     1,     1,     0,     2,
+       2,     1,     0,     1,     3,     1,     2,     0,     2,     0,
+       2,     0,     1,     3,     4,     3,     1,     1,     1,     1,
+       2,     0,     2,     4,     0,     2,     2,     2,     1,     1,
+       7,     3,     1,     1,     1,     1,     2,     0,     1,     3,
+       3,     3,     3,     0,     4,     5,     5,     0,     1,     1,
+       1,     2,     2,     1,     2,     0,     7,     0,     5,     0,
+       4,     2,     2,     0,     2,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     5,     2,     1,     3,
+       2,     2,     3,     0,     5,     1,     0,     5,     2,     2,
+       1,     1,     1,     2,     2,     3,     1,     2,     2,     3,
+       3,     4,     2,     1,     2,     1,     1,     2,     2,     3,
+       1,     1,     1,     1,     0,     1,     3,     5,     0,     2,
+       0,     1,     2,     3,     2,     1,     1,     1,     0,     1,
+       1,     1,     1,     1,     2,     2,     3,     0,     1,     2,
+       1,     4,     3,     4,     3,     2,     1,     3,     1,     1,
+       1,     1,     2,     2,     1,     2,     2,     1,     1,     1,
+       4,     4,     4,     4,     4,     1,     0,     3,     3,     4,
+       1,     3,     3,     4,     1,     3,     3,     1,     1,     1,
+       6,     1,     3,     3,     6,     1,     3,     3,     1,     1,
+       2,     2,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
+       1,     1,     4,     4,     3,     0,     7,     1,     0,     0,
+       7,     3,     4,     3,     1,     1,     1,     2,     3,     5,
+       2,     5,     2,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -29645,19 +29682,20 @@
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
-       0,     1,     2,     1,     2,     1,     1,     1,     2,     2,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     3,     1,     2,
-       1,     3,     1,     3,     1,     1,     1,     1,     1,     1,
+       3,     1,     0,     1,     2,     1,     2,     1,     1,     1,
+       2,     2,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     3,
+       1,     2,     1,     3,     1,     3,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     3,     2,     3,     1,
-       3,     3,     3,     3,     3,     3,     1,     1,     4,     0,
-       2,     2,     1,     1,     2,     1,     1,     1,     0,     1
+       1,     1,     1,     1,     1,     1,     1,     2,     3,     2,
+       3,     1,     3,     3,     3,     3,     3,     3,     1,     1,
+       4,     0,     2,     2,     1,     1,     2,     1,     1,     1,
+       0,     1
 };
 
 
@@ -30429,181 +30467,181 @@
         case 3:
 #line 1558 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30433 "preproc.c" /* yacc.c:1646  */
+#line 30471 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 4:
 #line 1560 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30439 "preproc.c" /* yacc.c:1646  */
+#line 30477 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 5:
 #line 1562 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30445 "preproc.c" /* yacc.c:1646  */
+#line 30483 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 6:
 #line 1564 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30451 "preproc.c" /* yacc.c:1646  */
+#line 30489 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 7:
 #line 1566 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30457 "preproc.c" /* yacc.c:1646  */
+#line 30495 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 8:
 #line 1568 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30463 "preproc.c" /* yacc.c:1646  */
+#line 30501 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 9:
 #line 1570 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30469 "preproc.c" /* yacc.c:1646  */
+#line 30507 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 10:
 #line 1572 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30475 "preproc.c" /* yacc.c:1646  */
+#line 30513 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 11:
 #line 1574 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30481 "preproc.c" /* yacc.c:1646  */
+#line 30519 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 12:
 #line 1576 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30487 "preproc.c" /* yacc.c:1646  */
+#line 30525 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 13:
 #line 1578 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30493 "preproc.c" /* yacc.c:1646  */
+#line 30531 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 14:
 #line 1580 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30499 "preproc.c" /* yacc.c:1646  */
+#line 30537 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 15:
 #line 1582 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30505 "preproc.c" /* yacc.c:1646  */
+#line 30543 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 16:
 #line 1584 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30511 "preproc.c" /* yacc.c:1646  */
+#line 30549 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 17:
 #line 1586 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30517 "preproc.c" /* yacc.c:1646  */
+#line 30555 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 18:
 #line 1588 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30523 "preproc.c" /* yacc.c:1646  */
+#line 30561 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 19:
 #line 1590 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30529 "preproc.c" /* yacc.c:1646  */
+#line 30567 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 20:
 #line 1592 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30535 "preproc.c" /* yacc.c:1646  */
+#line 30573 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 21:
 #line 1594 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30541 "preproc.c" /* yacc.c:1646  */
+#line 30579 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 22:
 #line 1596 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30547 "preproc.c" /* yacc.c:1646  */
+#line 30585 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 23:
 #line 1598 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30553 "preproc.c" /* yacc.c:1646  */
+#line 30591 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 24:
 #line 1600 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30559 "preproc.c" /* yacc.c:1646  */
+#line 30597 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 25:
 #line 1602 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30565 "preproc.c" /* yacc.c:1646  */
+#line 30603 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 26:
 #line 1604 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30571 "preproc.c" /* yacc.c:1646  */
+#line 30609 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 27:
 #line 1606 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30577 "preproc.c" /* yacc.c:1646  */
+#line 30615 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 28:
 #line 1608 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30583 "preproc.c" /* yacc.c:1646  */
+#line 30621 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 29:
 #line 1610 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30589 "preproc.c" /* yacc.c:1646  */
+#line 30627 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 30:
 #line 1612 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30595 "preproc.c" /* yacc.c:1646  */
+#line 30633 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 31:
 #line 1614 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30601 "preproc.c" /* yacc.c:1646  */
+#line 30639 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 32:
 #line 1616 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30607 "preproc.c" /* yacc.c:1646  */
+#line 30645 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 33:
@@ -30616,7 +30654,7 @@
 				if (connection)
 					mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in CLOSE DATABASE statement");
 
-				fprintf(yyout, "{ ECPGdisconnect(__LINE__, \"CURRENT\");");
+				fprintf(base_yyout, "{ ECPGdisconnect(__LINE__, \"CURRENT\");");
 				whenever_action(2);
 				free((yyvsp[0].str));
 				break;
@@ -30625,199 +30663,199 @@
 
 		output_statement((yyvsp[0].str), 0, ECPGst_normal);
 	}
-#line 30629 "preproc.c" /* yacc.c:1646  */
+#line 30667 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 34:
 #line 1636 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30635 "preproc.c" /* yacc.c:1646  */
+#line 30673 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 35:
 #line 1638 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30641 "preproc.c" /* yacc.c:1646  */
+#line 30679 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 36:
 #line 1640 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30647 "preproc.c" /* yacc.c:1646  */
+#line 30685 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 37:
 #line 1642 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30653 "preproc.c" /* yacc.c:1646  */
+#line 30691 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 38:
 #line 1644 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30659 "preproc.c" /* yacc.c:1646  */
+#line 30697 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 39:
 #line 1646 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30665 "preproc.c" /* yacc.c:1646  */
+#line 30703 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 40:
 #line 1648 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30671 "preproc.c" /* yacc.c:1646  */
+#line 30709 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 41:
 #line 1650 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30677 "preproc.c" /* yacc.c:1646  */
+#line 30715 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 42:
 #line 1652 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30683 "preproc.c" /* yacc.c:1646  */
+#line 30721 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 43:
 #line 1654 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30689 "preproc.c" /* yacc.c:1646  */
+#line 30727 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 44:
 #line 1656 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30695 "preproc.c" /* yacc.c:1646  */
+#line 30733 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 45:
 #line 1658 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30701 "preproc.c" /* yacc.c:1646  */
+#line 30739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 46:
 #line 1660 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30707 "preproc.c" /* yacc.c:1646  */
+#line 30745 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 47:
 #line 1662 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30713 "preproc.c" /* yacc.c:1646  */
+#line 30751 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 48:
 #line 1664 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30719 "preproc.c" /* yacc.c:1646  */
+#line 30757 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 49:
 #line 1666 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30725 "preproc.c" /* yacc.c:1646  */
+#line 30763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 50:
 #line 1668 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30731 "preproc.c" /* yacc.c:1646  */
+#line 30769 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 51:
 #line 1670 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30737 "preproc.c" /* yacc.c:1646  */
+#line 30775 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 52:
 #line 1672 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30743 "preproc.c" /* yacc.c:1646  */
+#line 30781 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 53:
 #line 1674 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30749 "preproc.c" /* yacc.c:1646  */
+#line 30787 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 54:
 #line 1676 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30755 "preproc.c" /* yacc.c:1646  */
+#line 30793 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 55:
 #line 1678 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30761 "preproc.c" /* yacc.c:1646  */
+#line 30799 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 56:
 #line 1680 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30767 "preproc.c" /* yacc.c:1646  */
+#line 30805 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 57:
 #line 1682 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30773 "preproc.c" /* yacc.c:1646  */
+#line 30811 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 58:
 #line 1684 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30779 "preproc.c" /* yacc.c:1646  */
+#line 30817 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 59:
 #line 1686 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30785 "preproc.c" /* yacc.c:1646  */
+#line 30823 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 60:
 #line 1688 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30791 "preproc.c" /* yacc.c:1646  */
+#line 30829 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 61:
 #line 1690 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30797 "preproc.c" /* yacc.c:1646  */
+#line 30835 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 62:
 #line 1692 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30803 "preproc.c" /* yacc.c:1646  */
+#line 30841 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 63:
 #line 1694 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30809 "preproc.c" /* yacc.c:1646  */
+#line 30847 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 64:
 #line 1696 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30815 "preproc.c" /* yacc.c:1646  */
+#line 30853 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 65:
 #line 1698 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30821 "preproc.c" /* yacc.c:1646  */
+#line 30859 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 66:
@@ -30825,229 +30863,229 @@
     {
 		output_deallocate_prepare_statement((yyvsp[0].str));
 	}
-#line 30829 "preproc.c" /* yacc.c:1646  */
+#line 30867 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 67:
 #line 1704 "preproc.y" /* yacc.c:1646  */
     { output_simple_statement((yyvsp[0].str)); }
-#line 30835 "preproc.c" /* yacc.c:1646  */
+#line 30873 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 68:
 #line 1706 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30841 "preproc.c" /* yacc.c:1646  */
+#line 30879 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 69:
 #line 1708 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 1, ECPGst_prepnormal); }
-#line 30847 "preproc.c" /* yacc.c:1646  */
+#line 30885 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 70:
 #line 1710 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 1, ECPGst_normal); }
-#line 30853 "preproc.c" /* yacc.c:1646  */
+#line 30891 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 71:
 #line 1712 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30859 "preproc.c" /* yacc.c:1646  */
+#line 30897 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 72:
 #line 1714 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30865 "preproc.c" /* yacc.c:1646  */
+#line 30903 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 73:
 #line 1716 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30871 "preproc.c" /* yacc.c:1646  */
+#line 30909 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 74:
 #line 1718 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30877 "preproc.c" /* yacc.c:1646  */
+#line 30915 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 75:
 #line 1720 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30883 "preproc.c" /* yacc.c:1646  */
+#line 30921 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 76:
 #line 1722 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30889 "preproc.c" /* yacc.c:1646  */
+#line 30927 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 77:
 #line 1724 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30895 "preproc.c" /* yacc.c:1646  */
+#line 30933 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 78:
 #line 1726 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30901 "preproc.c" /* yacc.c:1646  */
+#line 30939 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 79:
 #line 1728 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30907 "preproc.c" /* yacc.c:1646  */
+#line 30945 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 80:
 #line 1730 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30913 "preproc.c" /* yacc.c:1646  */
+#line 30951 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 81:
 #line 1732 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30919 "preproc.c" /* yacc.c:1646  */
+#line 30957 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 82:
 #line 1734 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30925 "preproc.c" /* yacc.c:1646  */
+#line 30963 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 83:
 #line 1736 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30931 "preproc.c" /* yacc.c:1646  */
+#line 30969 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 84:
 #line 1738 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30937 "preproc.c" /* yacc.c:1646  */
+#line 30975 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 85:
 #line 1740 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30943 "preproc.c" /* yacc.c:1646  */
+#line 30981 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 86:
 #line 1742 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30949 "preproc.c" /* yacc.c:1646  */
+#line 30987 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 87:
 #line 1744 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30955 "preproc.c" /* yacc.c:1646  */
+#line 30993 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 88:
 #line 1746 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30961 "preproc.c" /* yacc.c:1646  */
+#line 30999 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 89:
 #line 1748 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30967 "preproc.c" /* yacc.c:1646  */
+#line 31005 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 90:
 #line 1750 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30973 "preproc.c" /* yacc.c:1646  */
+#line 31011 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 91:
 #line 1752 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 1, ECPGst_execute); }
-#line 30979 "preproc.c" /* yacc.c:1646  */
+#line 31017 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 92:
 #line 1754 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30985 "preproc.c" /* yacc.c:1646  */
+#line 31023 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 93:
 #line 1756 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 1, ECPGst_normal); }
-#line 30991 "preproc.c" /* yacc.c:1646  */
+#line 31029 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 94:
 #line 1758 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 30997 "preproc.c" /* yacc.c:1646  */
+#line 31035 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 95:
 #line 1760 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31003 "preproc.c" /* yacc.c:1646  */
+#line 31041 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 96:
 #line 1762 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31009 "preproc.c" /* yacc.c:1646  */
+#line 31047 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 97:
 #line 1764 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31015 "preproc.c" /* yacc.c:1646  */
+#line 31053 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 98:
 #line 1766 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 1, ECPGst_prepnormal); }
-#line 31021 "preproc.c" /* yacc.c:1646  */
+#line 31059 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 99:
 #line 1768 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31027 "preproc.c" /* yacc.c:1646  */
+#line 31065 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 100:
 #line 1770 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31033 "preproc.c" /* yacc.c:1646  */
+#line 31071 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 101:
 #line 1772 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31039 "preproc.c" /* yacc.c:1646  */
+#line 31077 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 102:
 #line 1774 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31045 "preproc.c" /* yacc.c:1646  */
+#line 31083 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 103:
 #line 1776 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31051 "preproc.c" /* yacc.c:1646  */
+#line 31089 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 104:
@@ -31058,141 +31096,141 @@
 		else
 			output_statement(cat_str(5, mm_strdup("prepare"), (yyvsp[0].prep).name, (yyvsp[0].prep).type, mm_strdup("as"), (yyvsp[0].prep).stmt), 0, ECPGst_normal);
 	}
-#line 31062 "preproc.c" /* yacc.c:1646  */
+#line 31100 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 105:
 #line 1785 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31068 "preproc.c" /* yacc.c:1646  */
+#line 31106 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 106:
 #line 1787 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31074 "preproc.c" /* yacc.c:1646  */
+#line 31112 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 107:
 #line 1789 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31080 "preproc.c" /* yacc.c:1646  */
+#line 31118 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 108:
 #line 1791 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31086 "preproc.c" /* yacc.c:1646  */
+#line 31124 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 109:
 #line 1793 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31092 "preproc.c" /* yacc.c:1646  */
+#line 31130 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 110:
 #line 1795 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31098 "preproc.c" /* yacc.c:1646  */
+#line 31136 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 111:
 #line 1797 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31104 "preproc.c" /* yacc.c:1646  */
+#line 31142 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 112:
 #line 1799 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31110 "preproc.c" /* yacc.c:1646  */
+#line 31148 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 113:
 #line 1801 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31116 "preproc.c" /* yacc.c:1646  */
+#line 31154 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 114:
 #line 1803 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31122 "preproc.c" /* yacc.c:1646  */
+#line 31160 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 115:
 #line 1805 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 1, ECPGst_prepnormal); }
-#line 31128 "preproc.c" /* yacc.c:1646  */
+#line 31166 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 116:
 #line 1807 "preproc.y" /* yacc.c:1646  */
     {
-		fprintf(yyout, "{ ECPGtrans(__LINE__, %s, \"%s\");", connection ? connection : "NULL", (yyvsp[0].str));
+		fprintf(base_yyout, "{ ECPGtrans(__LINE__, %s, \"%s\");", connection ? connection : "NULL", (yyvsp[0].str));
 		whenever_action(2);
 		free((yyvsp[0].str));
 	}
-#line 31138 "preproc.c" /* yacc.c:1646  */
+#line 31176 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 117:
 #line 1813 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31144 "preproc.c" /* yacc.c:1646  */
+#line 31182 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 118:
 #line 1815 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31150 "preproc.c" /* yacc.c:1646  */
+#line 31188 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 119:
 #line 1817 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 1, ECPGst_prepnormal); }
-#line 31156 "preproc.c" /* yacc.c:1646  */
+#line 31194 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 120:
 #line 1819 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31162 "preproc.c" /* yacc.c:1646  */
+#line 31200 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 121:
 #line 1821 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31168 "preproc.c" /* yacc.c:1646  */
+#line 31206 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 122:
 #line 1823 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31174 "preproc.c" /* yacc.c:1646  */
+#line 31212 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 123:
 #line 1825 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31180 "preproc.c" /* yacc.c:1646  */
+#line 31218 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 124:
 #line 1827 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_normal); }
-#line 31186 "preproc.c" /* yacc.c:1646  */
+#line 31224 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 125:
 #line 1829 "preproc.y" /* yacc.c:1646  */
     {
-		fprintf(yyout,"ECPGallocate_desc(__LINE__, %s);",(yyvsp[0].str));
+		fprintf(base_yyout,"ECPGallocate_desc(__LINE__, %s);",(yyvsp[0].str));
 		whenever_action(0);
 		free((yyvsp[0].str));
 	}
-#line 31196 "preproc.c" /* yacc.c:1646  */
+#line 31234 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 126:
@@ -31201,12 +31239,12 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in CONNECT statement");
 
-		fprintf(yyout, "{ ECPGconnect(__LINE__, %d, %s, %d); ", compat, (yyvsp[0].str), autocommit);
+		fprintf(base_yyout, "{ ECPGconnect(__LINE__, %d, %s, %d); ", compat, (yyvsp[0].str), autocommit);
 		reset_variables();
 		whenever_action(2);
 		free((yyvsp[0].str));
 	}
-#line 31210 "preproc.c" /* yacc.c:1646  */
+#line 31248 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 127:
@@ -31214,17 +31252,17 @@
     {
 		output_simple_statement((yyvsp[0].str));
 	}
-#line 31218 "preproc.c" /* yacc.c:1646  */
+#line 31256 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 128:
 #line 1849 "preproc.y" /* yacc.c:1646  */
     {
-		fprintf(yyout,"ECPGdeallocate_desc(__LINE__, %s);",(yyvsp[0].str));
+		fprintf(base_yyout,"ECPGdeallocate_desc(__LINE__, %s);",(yyvsp[0].str));
 		whenever_action(0);
 		free((yyvsp[0].str));
 	}
-#line 31228 "preproc.c" /* yacc.c:1646  */
+#line 31266 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 129:
@@ -31232,21 +31270,21 @@
     {
 		output_simple_statement((yyvsp[0].str));
 	}
-#line 31236 "preproc.c" /* yacc.c:1646  */
+#line 31274 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 130:
 #line 1859 "preproc.y" /* yacc.c:1646  */
     {
-		fprintf(yyout, "{ ECPGdescribe(__LINE__, %d, %s,", compat, (yyvsp[0].str));
+		fprintf(base_yyout, "{ ECPGdescribe(__LINE__, %d, %s,", compat, (yyvsp[0].str));
 		dump_variables(argsresult, 1);
-		fputs("ECPGt_EORT);", yyout);
-		fprintf(yyout, "}");
+		fputs("ECPGt_EORT);", base_yyout);
+		fprintf(base_yyout, "}");
 		output_line_number();
 
 		free((yyvsp[0].str));
 	}
-#line 31250 "preproc.c" /* yacc.c:1646  */
+#line 31288 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 131:
@@ -31255,18 +31293,18 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in DISCONNECT statement");
 
-		fprintf(yyout, "{ ECPGdisconnect(__LINE__, %s);",
+		fprintf(base_yyout, "{ ECPGdisconnect(__LINE__, %s);",
 				(yyvsp[0].str) ? (yyvsp[0].str) : "\"CURRENT\"");
 		whenever_action(2);
 		free((yyvsp[0].str));
 	}
-#line 31264 "preproc.c" /* yacc.c:1646  */
+#line 31302 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 132:
 #line 1878 "preproc.y" /* yacc.c:1646  */
     { output_statement((yyvsp[0].str), 0, ECPGst_exec_immediate); }
-#line 31270 "preproc.c" /* yacc.c:1646  */
+#line 31308 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 133:
@@ -31275,16 +31313,16 @@
 		const char *con = connection ? connection : "NULL";
 
 		if (strcmp((yyvsp[0].str), "all") == 0)
-			fprintf(yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
+			fprintf(base_yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
 		else if ((yyvsp[0].str)[0] == ':')
-			fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, (yyvsp[0].str)+1);
+			fprintf(base_yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, (yyvsp[0].str)+1);
 		else
-			fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, (yyvsp[0].str));
+			fprintf(base_yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, (yyvsp[0].str));
 
 		whenever_action(2);
 		free((yyvsp[0].str));
 	}
-#line 31288 "preproc.c" /* yacc.c:1646  */
+#line 31326 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 134:
@@ -31295,7 +31333,7 @@
 		free((yyvsp[0].descriptor).name);
 		free((yyvsp[0].descriptor).str);
 	}
-#line 31299 "preproc.c" /* yacc.c:1646  */
+#line 31337 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 135:
@@ -31305,7 +31343,7 @@
 		output_get_descr_header((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 31309 "preproc.c" /* yacc.c:1646  */
+#line 31347 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 136:
@@ -31320,17 +31358,17 @@
 			ptr->opened = true;
 		}
 	}
-#line 31324 "preproc.c" /* yacc.c:1646  */
+#line 31362 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 137:
 #line 1918 "preproc.y" /* yacc.c:1646  */
     {
-		fprintf(yyout, "{ ECPGsetcommit(__LINE__, \"%s\", %s);", (yyvsp[0].str), connection ? connection : "NULL");
+		fprintf(base_yyout, "{ ECPGsetcommit(__LINE__, \"%s\", %s);", (yyvsp[0].str), connection ? connection : "NULL");
 		whenever_action(2);
 		free((yyvsp[0].str));
 	}
-#line 31334 "preproc.c" /* yacc.c:1646  */
+#line 31372 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 138:
@@ -31339,11 +31377,11 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in SET CONNECTION statement");
 
-		fprintf(yyout, "{ ECPGsetconn(__LINE__, %s);", (yyvsp[0].str));
+		fprintf(base_yyout, "{ ECPGsetconn(__LINE__, %s);", (yyvsp[0].str));
 		whenever_action(2);
 		free((yyvsp[0].str));
 	}
-#line 31347 "preproc.c" /* yacc.c:1646  */
+#line 31385 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 139:
@@ -31354,7 +31392,7 @@
 		free((yyvsp[0].descriptor).name);
 		free((yyvsp[0].descriptor).str);
 	}
-#line 31358 "preproc.c" /* yacc.c:1646  */
+#line 31396 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 140:
@@ -31364,7 +31402,7 @@
 		output_set_descr_header((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 31368 "preproc.c" /* yacc.c:1646  */
+#line 31406 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 141:
@@ -31373,11 +31411,11 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in TYPE statement");
 
-		fprintf(yyout, "%s", (yyvsp[0].str));
+		fprintf(base_yyout, "%s", (yyvsp[0].str));
 		free((yyvsp[0].str));
 		output_line_number();
 	}
-#line 31381 "preproc.c" /* yacc.c:1646  */
+#line 31419 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 142:
@@ -31388,7 +31426,7 @@
 
 		output_simple_statement((yyvsp[0].str));
 	}
-#line 31392 "preproc.c" /* yacc.c:1646  */
+#line 31430 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 143:
@@ -31399,13 +31437,13 @@
 
 		output_simple_statement((yyvsp[0].str));
 	}
-#line 31403 "preproc.c" /* yacc.c:1646  */
+#line 31441 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 144:
 #line 1969 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = NULL; }
-#line 31409 "preproc.c" /* yacc.c:1646  */
+#line 31447 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 145:
@@ -31413,7 +31451,7 @@
     { 
  (yyval.str) = cat_str(4,mm_strdup("create role"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31417 "preproc.c" /* yacc.c:1646  */
+#line 31455 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 146:
@@ -31421,7 +31459,7 @@
     { 
  (yyval.str) = mm_strdup("with");
 }
-#line 31425 "preproc.c" /* yacc.c:1646  */
+#line 31463 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 147:
@@ -31429,14 +31467,14 @@
     { 
  (yyval.str) = mm_strdup("with");
 }
-#line 31433 "preproc.c" /* yacc.c:1646  */
+#line 31471 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 148:
 #line 1991 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 31440 "preproc.c" /* yacc.c:1646  */
+#line 31478 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 149:
@@ -31444,14 +31482,14 @@
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31448 "preproc.c" /* yacc.c:1646  */
+#line 31486 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 150:
 #line 2002 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 31455 "preproc.c" /* yacc.c:1646  */
+#line 31493 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 151:
@@ -31459,14 +31497,14 @@
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31463 "preproc.c" /* yacc.c:1646  */
+#line 31501 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 152:
 #line 2013 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 31470 "preproc.c" /* yacc.c:1646  */
+#line 31508 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 153:
@@ -31474,7 +31512,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("password"),(yyvsp[0].str));
 }
-#line 31478 "preproc.c" /* yacc.c:1646  */
+#line 31516 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 154:
@@ -31482,7 +31520,7 @@
     { 
  (yyval.str) = mm_strdup("password null");
 }
-#line 31486 "preproc.c" /* yacc.c:1646  */
+#line 31524 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 155:
@@ -31490,7 +31528,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("encrypted password"),(yyvsp[0].str));
 }
-#line 31494 "preproc.c" /* yacc.c:1646  */
+#line 31532 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 156:
@@ -31498,7 +31536,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("unencrypted password"),(yyvsp[0].str));
 }
-#line 31502 "preproc.c" /* yacc.c:1646  */
+#line 31540 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 157:
@@ -31506,7 +31544,7 @@
     { 
  (yyval.str) = mm_strdup("inherit");
 }
-#line 31510 "preproc.c" /* yacc.c:1646  */
+#line 31548 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 158:
@@ -31514,7 +31552,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("connection limit"),(yyvsp[0].str));
 }
-#line 31518 "preproc.c" /* yacc.c:1646  */
+#line 31556 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 159:
@@ -31522,7 +31560,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("valid until"),(yyvsp[0].str));
 }
-#line 31526 "preproc.c" /* yacc.c:1646  */
+#line 31564 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 160:
@@ -31530,7 +31568,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("user"),(yyvsp[0].str));
 }
-#line 31534 "preproc.c" /* yacc.c:1646  */
+#line 31572 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 161:
@@ -31538,7 +31576,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 31542 "preproc.c" /* yacc.c:1646  */
+#line 31580 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 162:
@@ -31546,7 +31584,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 31550 "preproc.c" /* yacc.c:1646  */
+#line 31588 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 163:
@@ -31554,7 +31592,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("sysid"),(yyvsp[0].str));
 }
-#line 31558 "preproc.c" /* yacc.c:1646  */
+#line 31596 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 164:
@@ -31562,7 +31600,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("admin"),(yyvsp[0].str));
 }
-#line 31566 "preproc.c" /* yacc.c:1646  */
+#line 31604 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 165:
@@ -31570,7 +31608,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("role"),(yyvsp[0].str));
 }
-#line 31574 "preproc.c" /* yacc.c:1646  */
+#line 31612 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 166:
@@ -31578,7 +31616,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("in role"),(yyvsp[0].str));
 }
-#line 31582 "preproc.c" /* yacc.c:1646  */
+#line 31620 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 167:
@@ -31586,7 +31624,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("in group"),(yyvsp[0].str));
 }
-#line 31590 "preproc.c" /* yacc.c:1646  */
+#line 31628 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 168:
@@ -31594,7 +31632,7 @@
     { 
  (yyval.str) = cat_str(4,mm_strdup("create user"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31598 "preproc.c" /* yacc.c:1646  */
+#line 31636 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 169:
@@ -31602,14 +31640,14 @@
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter role"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31606 "preproc.c" /* yacc.c:1646  */
+#line 31644 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 170:
 #line 2104 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 31613 "preproc.c" /* yacc.c:1646  */
+#line 31651 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 171:
@@ -31617,7 +31655,7 @@
     { 
  (yyval.str) = cat_str(2,mm_strdup("in database"),(yyvsp[0].str));
 }
-#line 31621 "preproc.c" /* yacc.c:1646  */
+#line 31659 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 172:
@@ -31625,7 +31663,7 @@
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter role"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31629 "preproc.c" /* yacc.c:1646  */
+#line 31667 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 173:
@@ -31633,7 +31671,7 @@
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter role all"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31637 "preproc.c" /* yacc.c:1646  */
+#line 31675 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 174:
@@ -31641,167 +31679,167 @@
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter user"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31645 "preproc.c" /* yacc.c:1646  */
+#line 31683 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 175:
 #line 2135 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter user"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter user"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31653 "preproc.c" /* yacc.c:1646  */
+#line 31691 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 176:
-#line 2143 "preproc.y" /* yacc.c:1646  */
+#line 2139 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("drop role"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter user all"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31661 "preproc.c" /* yacc.c:1646  */
+#line 31699 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 177:
 #line 2147 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("drop role if exists"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("drop role"),(yyvsp[0].str));
 }
-#line 31669 "preproc.c" /* yacc.c:1646  */
+#line 31707 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 178:
-#line 2155 "preproc.y" /* yacc.c:1646  */
+#line 2151 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("drop user"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("drop role if exists"),(yyvsp[0].str));
 }
-#line 31677 "preproc.c" /* yacc.c:1646  */
+#line 31715 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 179:
 #line 2159 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("drop user if exists"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("drop user"),(yyvsp[0].str));
 }
-#line 31685 "preproc.c" /* yacc.c:1646  */
+#line 31723 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 180:
-#line 2167 "preproc.y" /* yacc.c:1646  */
+#line 2163 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("create group"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("drop user if exists"),(yyvsp[0].str));
 }
-#line 31693 "preproc.c" /* yacc.c:1646  */
+#line 31731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 181:
-#line 2175 "preproc.y" /* yacc.c:1646  */
+#line 2171 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter group"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("user"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("create group"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31701 "preproc.c" /* yacc.c:1646  */
+#line 31739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 182:
-#line 2183 "preproc.y" /* yacc.c:1646  */
+#line 2179 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("add");
+ (yyval.str) = cat_str(5,mm_strdup("alter group"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("user"),(yyvsp[0].str));
 }
-#line 31709 "preproc.c" /* yacc.c:1646  */
+#line 31747 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 183:
 #line 2187 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("drop");
+ (yyval.str) = mm_strdup("add");
 }
-#line 31717 "preproc.c" /* yacc.c:1646  */
+#line 31755 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 184:
-#line 2195 "preproc.y" /* yacc.c:1646  */
+#line 2191 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("drop group"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("drop");
 }
-#line 31725 "preproc.c" /* yacc.c:1646  */
+#line 31763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 185:
 #line 2199 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("drop group if exists"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("drop group"),(yyvsp[0].str));
 }
-#line 31733 "preproc.c" /* yacc.c:1646  */
+#line 31771 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 186:
-#line 2207 "preproc.y" /* yacc.c:1646  */
+#line 2203 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("create schema"),(yyvsp[-3].str),mm_strdup("authorization"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("drop group if exists"),(yyvsp[0].str));
 }
-#line 31741 "preproc.c" /* yacc.c:1646  */
+#line 31779 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 187:
 #line 2211 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("create schema"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("create schema"),(yyvsp[-3].str),mm_strdup("authorization"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31749 "preproc.c" /* yacc.c:1646  */
+#line 31787 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 188:
 #line 2215 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = cat_str(5,mm_strdup("create schema if not exists"),(yyvsp[-3].str),mm_strdup("authorization"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("create schema"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31758 "preproc.c" /* yacc.c:1646  */
+#line 31795 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 189:
-#line 2220 "preproc.y" /* yacc.c:1646  */
+#line 2219 "preproc.y" /* yacc.c:1646  */
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = cat_str(3,mm_strdup("create schema if not exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("create schema if not exists"),(yyvsp[-3].str),mm_strdup("authorization"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31767 "preproc.c" /* yacc.c:1646  */
+#line 31804 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 190:
-#line 2229 "preproc.y" /* yacc.c:1646  */
+#line 2224 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = cat_str(3,mm_strdup("create schema if not exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 31775 "preproc.c" /* yacc.c:1646  */
+#line 31813 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 191:
 #line 2233 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 31782 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 31821 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 192:
-#line 2240 "preproc.y" /* yacc.c:1646  */
+#line 2237 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 31790 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 31828 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 193:
 #line 2244 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 31797 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 31836 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 194:
-#line 2251 "preproc.y" /* yacc.c:1646  */
+#line 2248 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 31805 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 31843 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 195:
@@ -31809,7 +31847,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 31813 "preproc.c" /* yacc.c:1646  */
+#line 31851 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 196:
@@ -31817,7 +31855,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 31821 "preproc.c" /* yacc.c:1646  */
+#line 31859 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 197:
@@ -31825,7 +31863,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 31829 "preproc.c" /* yacc.c:1646  */
+#line 31867 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 198:
@@ -31833,7 +31871,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 31837 "preproc.c" /* yacc.c:1646  */
+#line 31875 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 199:
@@ -31841,213 +31879,221 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 31845 "preproc.c" /* yacc.c:1646  */
+#line 31883 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 200:
-#line 2279 "preproc.y" /* yacc.c:1646  */
+#line 2275 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 31853 "preproc.c" /* yacc.c:1646  */
+#line 31891 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 201:
 #line 2283 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("set local"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 31861 "preproc.c" /* yacc.c:1646  */
+#line 31899 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 202:
 #line 2287 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("set session"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("set local"),(yyvsp[0].str));
 }
-#line 31869 "preproc.c" /* yacc.c:1646  */
+#line 31907 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 203:
-#line 2295 "preproc.y" /* yacc.c:1646  */
+#line 2291 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("transaction"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("set session"),(yyvsp[0].str));
 }
-#line 31877 "preproc.c" /* yacc.c:1646  */
+#line 31915 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 204:
 #line 2299 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("session characteristics as transaction"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("transaction"),(yyvsp[0].str));
 }
-#line 31885 "preproc.c" /* yacc.c:1646  */
+#line 31923 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 205:
 #line 2303 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("session characteristics as transaction"),(yyvsp[0].str));
 }
-#line 31893 "preproc.c" /* yacc.c:1646  */
+#line 31931 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 206:
-#line 2311 "preproc.y" /* yacc.c:1646  */
+#line 2307 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 31901 "preproc.c" /* yacc.c:1646  */
+#line 31939 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 207:
 #line 2315 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 31909 "preproc.c" /* yacc.c:1646  */
+#line 31947 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 208:
 #line 2319 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("to default"));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 31917 "preproc.c" /* yacc.c:1646  */
+#line 31955 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 210:
-#line 2324 "preproc.y" /* yacc.c:1646  */
+  case 209:
+#line 2323 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("to default"));
 }
-#line 31925 "preproc.c" /* yacc.c:1646  */
+#line 31963 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 211:
 #line 2328 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("from current"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 31933 "preproc.c" /* yacc.c:1646  */
+#line 31971 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 212:
 #line 2332 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("time zone"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("from current"));
 }
-#line 31941 "preproc.c" /* yacc.c:1646  */
+#line 31979 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 213:
 #line 2336 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = cat_str(2,mm_strdup("catalog"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("time zone"),(yyvsp[0].str));
 }
-#line 31950 "preproc.c" /* yacc.c:1646  */
+#line 31987 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 214:
-#line 2341 "preproc.y" /* yacc.c:1646  */
+#line 2340 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[0].str));
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = cat_str(2,mm_strdup("catalog"),(yyvsp[0].str));
 }
-#line 31958 "preproc.c" /* yacc.c:1646  */
+#line 31996 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 215:
 #line 2345 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("names"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[0].str));
 }
-#line 31966 "preproc.c" /* yacc.c:1646  */
+#line 32004 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 216:
 #line 2349 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("role"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("names"),(yyvsp[0].str));
 }
-#line 31974 "preproc.c" /* yacc.c:1646  */
+#line 32012 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 217:
 #line 2353 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("session authorization"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("role"),(yyvsp[0].str));
 }
-#line 31982 "preproc.c" /* yacc.c:1646  */
+#line 32020 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 218:
 #line 2357 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("session authorization default");
+ (yyval.str) = cat_str(2,mm_strdup("session authorization"),(yyvsp[0].str));
 }
-#line 31990 "preproc.c" /* yacc.c:1646  */
+#line 32028 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 219:
 #line 2361 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("xml option"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("session authorization default");
 }
-#line 31998 "preproc.c" /* yacc.c:1646  */
+#line 32036 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 220:
 #line 2365 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("transaction snapshot"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("xml option"),(yyvsp[0].str));
 }
-#line 32006 "preproc.c" /* yacc.c:1646  */
+#line 32044 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 221:
-#line 2373 "preproc.y" /* yacc.c:1646  */
+#line 2369 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("transaction snapshot"),(yyvsp[0].str));
 }
-#line 32014 "preproc.c" /* yacc.c:1646  */
+#line 32052 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 222:
 #line 2377 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32022 "preproc.c" /* yacc.c:1646  */
+#line 32060 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 223:
-#line 2385 "preproc.y" /* yacc.c:1646  */
+#line 2381 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
 }
-#line 32030 "preproc.c" /* yacc.c:1646  */
+#line 32068 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 224:
 #line 2389 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32038 "preproc.c" /* yacc.c:1646  */
+#line 32076 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 225:
-#line 2397 "preproc.y" /* yacc.c:1646  */
+#line 2393 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 32046 "preproc.c" /* yacc.c:1646  */
+#line 32084 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 226:
 #line 2401 "preproc.y" /* yacc.c:1646  */
     { 
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 32092 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 227:
+#line 2405 "preproc.y" /* yacc.c:1646  */
+    { 
 		if ((yyvsp[0].str)[0] == '$')
 		{
 			free((yyvsp[0].str));
@@ -32056,79 +32102,71 @@
 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 32060 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 227:
-#line 2415 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = mm_strdup("read uncommitted");
-}
-#line 32068 "preproc.c" /* yacc.c:1646  */
+#line 32106 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 228:
 #line 2419 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("read committed");
+ (yyval.str) = mm_strdup("read uncommitted");
 }
-#line 32076 "preproc.c" /* yacc.c:1646  */
+#line 32114 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 229:
 #line 2423 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("repeatable read");
+ (yyval.str) = mm_strdup("read committed");
 }
-#line 32084 "preproc.c" /* yacc.c:1646  */
+#line 32122 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 230:
 #line 2427 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("serializable");
+ (yyval.str) = mm_strdup("repeatable read");
 }
-#line 32092 "preproc.c" /* yacc.c:1646  */
+#line 32130 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 231:
-#line 2435 "preproc.y" /* yacc.c:1646  */
+#line 2431 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("true");
+ (yyval.str) = mm_strdup("serializable");
 }
-#line 32100 "preproc.c" /* yacc.c:1646  */
+#line 32138 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 232:
 #line 2439 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("false");
+ (yyval.str) = mm_strdup("true");
 }
-#line 32108 "preproc.c" /* yacc.c:1646  */
+#line 32146 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 233:
 #line 2443 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("on");
+ (yyval.str) = mm_strdup("false");
 }
-#line 32116 "preproc.c" /* yacc.c:1646  */
+#line 32154 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 234:
 #line 2447 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("on");
 }
-#line 32124 "preproc.c" /* yacc.c:1646  */
+#line 32162 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 235:
-#line 2455 "preproc.y" /* yacc.c:1646  */
+#line 2451 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 32132 "preproc.c" /* yacc.c:1646  */
+#line 32170 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 236:
@@ -32136,78 +32174,78 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 32140 "preproc.c" /* yacc.c:1646  */
+#line 32178 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 237:
 #line 2463 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32148 "preproc.c" /* yacc.c:1646  */
+#line 32186 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 238:
 #line 2467 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32156 "preproc.c" /* yacc.c:1646  */
+#line 32194 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 239:
 #line 2471 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 32164 "preproc.c" /* yacc.c:1646  */
+#line 32202 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 240:
 #line 2475 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("default");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32172 "preproc.c" /* yacc.c:1646  */
+#line 32210 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 241:
 #line 2479 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("local");
+ (yyval.str) = mm_strdup("default");
 }
-#line 32180 "preproc.c" /* yacc.c:1646  */
+#line 32218 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 242:
-#line 2487 "preproc.y" /* yacc.c:1646  */
+#line 2483 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("local");
 }
-#line 32188 "preproc.c" /* yacc.c:1646  */
+#line 32226 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 243:
 #line 2491 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("default");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32196 "preproc.c" /* yacc.c:1646  */
+#line 32234 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 244:
 #line 2495 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 32203 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("default");
+}
+#line 32242 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 245:
-#line 2502 "preproc.y" /* yacc.c:1646  */
+#line 2499 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 32211 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 32249 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 246:
@@ -32215,1017 +32253,1025 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 32219 "preproc.c" /* yacc.c:1646  */
+#line 32257 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 247:
-#line 2514 "preproc.y" /* yacc.c:1646  */
+#line 2510 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("reset"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32227 "preproc.c" /* yacc.c:1646  */
+#line 32265 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 248:
-#line 2522 "preproc.y" /* yacc.c:1646  */
+#line 2518 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("reset"),(yyvsp[0].str));
 }
-#line 32235 "preproc.c" /* yacc.c:1646  */
+#line 32273 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 249:
 #line 2526 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("time zone");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32243 "preproc.c" /* yacc.c:1646  */
+#line 32281 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 250:
 #line 2530 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("transaction isolation level");
+ (yyval.str) = mm_strdup("time zone");
 }
-#line 32251 "preproc.c" /* yacc.c:1646  */
+#line 32289 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 251:
 #line 2534 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("session authorization");
+ (yyval.str) = mm_strdup("transaction isolation level");
 }
-#line 32259 "preproc.c" /* yacc.c:1646  */
+#line 32297 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 252:
-#line 2542 "preproc.y" /* yacc.c:1646  */
+#line 2538 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("session authorization");
 }
-#line 32267 "preproc.c" /* yacc.c:1646  */
+#line 32305 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 253:
 #line 2546 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32275 "preproc.c" /* yacc.c:1646  */
+#line 32313 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 254:
-#line 2554 "preproc.y" /* yacc.c:1646  */
+#line 2550 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("all");
 }
-#line 32283 "preproc.c" /* yacc.c:1646  */
+#line 32321 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 255:
 #line 2558 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 32291 "preproc.c" /* yacc.c:1646  */
+#line 32329 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 256:
-#line 2566 "preproc.y" /* yacc.c:1646  */
+#line 2562 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32299 "preproc.c" /* yacc.c:1646  */
+#line 32337 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 257:
 #line 2570 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 32307 "preproc.c" /* yacc.c:1646  */
+#line 32345 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 258:
-#line 2578 "preproc.y" /* yacc.c:1646  */
+#line 2574 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("show"),(yyvsp[-1].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32315 "preproc.c" /* yacc.c:1646  */
+#line 32353 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 259:
 #line 2582 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("show time zone");
+ (yyval.str) = cat_str(2,mm_strdup("show"),(yyvsp[-1].str));
 }
-#line 32323 "preproc.c" /* yacc.c:1646  */
+#line 32361 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 260:
 #line 2586 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("show transaction isolation level");
+ (yyval.str) = mm_strdup("show time zone");
 }
-#line 32331 "preproc.c" /* yacc.c:1646  */
+#line 32369 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 261:
 #line 2590 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("show session authorization");
+ (yyval.str) = mm_strdup("show transaction isolation level");
 }
-#line 32339 "preproc.c" /* yacc.c:1646  */
+#line 32377 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 262:
 #line 2594 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = mm_strdup("show session authorization");
+}
+#line 32385 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 263:
+#line 2598 "preproc.y" /* yacc.c:1646  */
     {
 		mmerror(PARSE_ERROR, ET_ERROR, "SHOW ALL is not implemented");
 		(yyval.str) = EMPTY;
 	}
-#line 32348 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 263:
-#line 2603 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = cat_str(3,mm_strdup("set constraints"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 32356 "preproc.c" /* yacc.c:1646  */
+#line 32394 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 264:
-#line 2611 "preproc.y" /* yacc.c:1646  */
+#line 2607 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all");
+ (yyval.str) = cat_str(3,mm_strdup("set constraints"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32364 "preproc.c" /* yacc.c:1646  */
+#line 32402 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 265:
 #line 2615 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("all");
 }
-#line 32372 "preproc.c" /* yacc.c:1646  */
+#line 32410 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 266:
-#line 2623 "preproc.y" /* yacc.c:1646  */
+#line 2619 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("deferred");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32380 "preproc.c" /* yacc.c:1646  */
+#line 32418 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 267:
 #line 2627 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("immediate");
+ (yyval.str) = mm_strdup("deferred");
 }
-#line 32388 "preproc.c" /* yacc.c:1646  */
+#line 32426 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 268:
-#line 2635 "preproc.y" /* yacc.c:1646  */
+#line 2631 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("checkpoint");
+ (yyval.str) = mm_strdup("immediate");
 }
-#line 32396 "preproc.c" /* yacc.c:1646  */
+#line 32434 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 269:
-#line 2643 "preproc.y" /* yacc.c:1646  */
+#line 2639 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("discard all");
+ (yyval.str) = mm_strdup("checkpoint");
 }
-#line 32404 "preproc.c" /* yacc.c:1646  */
+#line 32442 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 270:
 #line 2647 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("discard temp");
+ (yyval.str) = mm_strdup("discard all");
 }
-#line 32412 "preproc.c" /* yacc.c:1646  */
+#line 32450 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 271:
 #line 2651 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("discard temporary");
+ (yyval.str) = mm_strdup("discard temp");
 }
-#line 32420 "preproc.c" /* yacc.c:1646  */
+#line 32458 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 272:
 #line 2655 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("discard plans");
+ (yyval.str) = mm_strdup("discard temporary");
 }
-#line 32428 "preproc.c" /* yacc.c:1646  */
+#line 32466 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 273:
 #line 2659 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("discard sequences");
+ (yyval.str) = mm_strdup("discard plans");
 }
-#line 32436 "preproc.c" /* yacc.c:1646  */
+#line 32474 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 274:
-#line 2667 "preproc.y" /* yacc.c:1646  */
+#line 2663 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter table"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("discard sequences");
 }
-#line 32444 "preproc.c" /* yacc.c:1646  */
+#line 32482 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 275:
 #line 2671 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter table if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter table"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32452 "preproc.c" /* yacc.c:1646  */
+#line 32490 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 276:
 #line 2675 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter table all in tablespace"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter table if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32460 "preproc.c" /* yacc.c:1646  */
+#line 32498 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 277:
 #line 2679 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter table all in tablespace"),(yyvsp[-7].str),mm_strdup("owned by"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter table all in tablespace"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32468 "preproc.c" /* yacc.c:1646  */
+#line 32506 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 278:
 #line 2683 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter index"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter table all in tablespace"),(yyvsp[-7].str),mm_strdup("owned by"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32476 "preproc.c" /* yacc.c:1646  */
+#line 32514 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 279:
 #line 2687 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter index if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter index"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32484 "preproc.c" /* yacc.c:1646  */
+#line 32522 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 280:
 #line 2691 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter index all in tablespace"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter index if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32492 "preproc.c" /* yacc.c:1646  */
+#line 32530 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 281:
 #line 2695 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter index all in tablespace"),(yyvsp[-7].str),mm_strdup("owned by"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter index all in tablespace"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32500 "preproc.c" /* yacc.c:1646  */
+#line 32538 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 282:
 #line 2699 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter sequence"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter index all in tablespace"),(yyvsp[-7].str),mm_strdup("owned by"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32508 "preproc.c" /* yacc.c:1646  */
+#line 32546 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 283:
 #line 2703 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter sequence if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter sequence"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32516 "preproc.c" /* yacc.c:1646  */
+#line 32554 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 284:
 #line 2707 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter view"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter sequence if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32524 "preproc.c" /* yacc.c:1646  */
+#line 32562 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 285:
 #line 2711 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter view if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter view"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32532 "preproc.c" /* yacc.c:1646  */
+#line 32570 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 286:
 #line 2715 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter materialized view"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter view if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32540 "preproc.c" /* yacc.c:1646  */
+#line 32578 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 287:
 #line 2719 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter materialized view if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter materialized view"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32548 "preproc.c" /* yacc.c:1646  */
+#line 32586 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 288:
 #line 2723 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter materialized view all in tablespace"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter materialized view if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32556 "preproc.c" /* yacc.c:1646  */
+#line 32594 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 289:
 #line 2727 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter materialized view all in tablespace"),(yyvsp[-7].str),mm_strdup("owned by"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter materialized view all in tablespace"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32564 "preproc.c" /* yacc.c:1646  */
+#line 32602 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 290:
-#line 2735 "preproc.y" /* yacc.c:1646  */
+#line 2731 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(7,mm_strdup("alter materialized view all in tablespace"),(yyvsp[-7].str),mm_strdup("owned by"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32572 "preproc.c" /* yacc.c:1646  */
+#line 32610 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 291:
 #line 2739 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32580 "preproc.c" /* yacc.c:1646  */
+#line 32618 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 292:
-#line 2747 "preproc.y" /* yacc.c:1646  */
+#line 2743 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 32588 "preproc.c" /* yacc.c:1646  */
+#line 32626 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 293:
 #line 2751 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("add column"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[0].str));
 }
-#line 32596 "preproc.c" /* yacc.c:1646  */
+#line 32634 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 294:
 #line 2755 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("add column"),(yyvsp[0].str));
 }
-#line 32604 "preproc.c" /* yacc.c:1646  */
+#line 32642 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 295:
 #line 2759 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("drop not null"));
+ (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32612 "preproc.c" /* yacc.c:1646  */
+#line 32650 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 296:
 #line 2763 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set not null"));
+ (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("drop not null"));
 }
-#line 32620 "preproc.c" /* yacc.c:1646  */
+#line 32658 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 297:
 #line 2767 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set statistics"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set not null"));
 }
-#line 32628 "preproc.c" /* yacc.c:1646  */
+#line 32666 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 298:
 #line 2771 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set statistics"),(yyvsp[0].str));
 }
-#line 32636 "preproc.c" /* yacc.c:1646  */
+#line 32674 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 299:
 #line 2775 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("reset"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 32644 "preproc.c" /* yacc.c:1646  */
+#line 32682 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 300:
 #line 2779 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set storage"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("reset"),(yyvsp[0].str));
 }
-#line 32652 "preproc.c" /* yacc.c:1646  */
+#line 32690 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 301:
 #line 2783 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[-4].str),mm_strdup("if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set storage"),(yyvsp[0].str));
 }
-#line 32660 "preproc.c" /* yacc.c:1646  */
+#line 32698 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 302:
 #line 2787 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("drop"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[-4].str),mm_strdup("if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32668 "preproc.c" /* yacc.c:1646  */
+#line 32706 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 303:
 #line 2791 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(8,mm_strdup("alter"),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("type"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("drop"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32676 "preproc.c" /* yacc.c:1646  */
+#line 32714 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 304:
 #line 2795 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(8,mm_strdup("alter"),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("type"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32684 "preproc.c" /* yacc.c:1646  */
+#line 32722 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 305:
 #line 2799 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32692 "preproc.c" /* yacc.c:1646  */
+#line 32730 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 306:
 #line 2803 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter constraint"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[0].str));
 }
-#line 32700 "preproc.c" /* yacc.c:1646  */
+#line 32738 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 307:
 #line 2807 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("validate constraint"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter constraint"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32708 "preproc.c" /* yacc.c:1646  */
+#line 32746 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 308:
 #line 2811 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop constraint if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("validate constraint"),(yyvsp[0].str));
 }
-#line 32716 "preproc.c" /* yacc.c:1646  */
+#line 32754 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 309:
 #line 2815 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop constraint"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop constraint if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32724 "preproc.c" /* yacc.c:1646  */
+#line 32762 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 310:
 #line 2819 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("set with oids");
+ (yyval.str) = cat_str(3,mm_strdup("drop constraint"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 32732 "preproc.c" /* yacc.c:1646  */
+#line 32770 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 311:
 #line 2823 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("set without oids");
+ (yyval.str) = mm_strdup("set with oids");
 }
-#line 32740 "preproc.c" /* yacc.c:1646  */
+#line 32778 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 312:
 #line 2827 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("cluster on"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("set without oids");
 }
-#line 32748 "preproc.c" /* yacc.c:1646  */
+#line 32786 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 313:
 #line 2831 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("set without cluster");
+ (yyval.str) = cat_str(2,mm_strdup("cluster on"),(yyvsp[0].str));
 }
-#line 32756 "preproc.c" /* yacc.c:1646  */
+#line 32794 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 314:
 #line 2835 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("set logged");
+ (yyval.str) = mm_strdup("set without cluster");
 }
-#line 32764 "preproc.c" /* yacc.c:1646  */
+#line 32802 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 315:
 #line 2839 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("set unlogged");
+ (yyval.str) = mm_strdup("set logged");
 }
-#line 32772 "preproc.c" /* yacc.c:1646  */
+#line 32810 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 316:
 #line 2843 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("enable trigger"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("set unlogged");
 }
-#line 32780 "preproc.c" /* yacc.c:1646  */
+#line 32818 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 317:
 #line 2847 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("enable always trigger"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("enable trigger"),(yyvsp[0].str));
 }
-#line 32788 "preproc.c" /* yacc.c:1646  */
+#line 32826 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 318:
 #line 2851 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("enable replica trigger"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("enable always trigger"),(yyvsp[0].str));
 }
-#line 32796 "preproc.c" /* yacc.c:1646  */
+#line 32834 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 319:
 #line 2855 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("enable trigger all");
+ (yyval.str) = cat_str(2,mm_strdup("enable replica trigger"),(yyvsp[0].str));
 }
-#line 32804 "preproc.c" /* yacc.c:1646  */
+#line 32842 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 320:
 #line 2859 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("enable trigger user");
+ (yyval.str) = mm_strdup("enable trigger all");
 }
-#line 32812 "preproc.c" /* yacc.c:1646  */
+#line 32850 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 321:
 #line 2863 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("disable trigger"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("enable trigger user");
 }
-#line 32820 "preproc.c" /* yacc.c:1646  */
+#line 32858 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 322:
 #line 2867 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("disable trigger all");
+ (yyval.str) = cat_str(2,mm_strdup("disable trigger"),(yyvsp[0].str));
 }
-#line 32828 "preproc.c" /* yacc.c:1646  */
+#line 32866 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 323:
 #line 2871 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("disable trigger user");
+ (yyval.str) = mm_strdup("disable trigger all");
 }
-#line 32836 "preproc.c" /* yacc.c:1646  */
+#line 32874 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 324:
 #line 2875 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("enable rule"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("disable trigger user");
 }
-#line 32844 "preproc.c" /* yacc.c:1646  */
+#line 32882 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 325:
 #line 2879 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("enable always rule"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("enable rule"),(yyvsp[0].str));
 }
-#line 32852 "preproc.c" /* yacc.c:1646  */
+#line 32890 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 326:
 #line 2883 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("enable replica rule"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("enable always rule"),(yyvsp[0].str));
 }
-#line 32860 "preproc.c" /* yacc.c:1646  */
+#line 32898 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 327:
 #line 2887 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("disable rule"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("enable replica rule"),(yyvsp[0].str));
 }
-#line 32868 "preproc.c" /* yacc.c:1646  */
+#line 32906 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 328:
 #line 2891 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("inherit"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("disable rule"),(yyvsp[0].str));
 }
-#line 32876 "preproc.c" /* yacc.c:1646  */
+#line 32914 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 329:
 #line 2895 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("no inherit"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("inherit"),(yyvsp[0].str));
 }
-#line 32884 "preproc.c" /* yacc.c:1646  */
+#line 32922 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 330:
 #line 2899 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("of"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("no inherit"),(yyvsp[0].str));
 }
-#line 32892 "preproc.c" /* yacc.c:1646  */
+#line 32930 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 331:
 #line 2903 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("not of");
+ (yyval.str) = cat_str(2,mm_strdup("of"),(yyvsp[0].str));
 }
-#line 32900 "preproc.c" /* yacc.c:1646  */
+#line 32938 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 332:
 #line 2907 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("not of");
 }
-#line 32908 "preproc.c" /* yacc.c:1646  */
+#line 32946 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 333:
 #line 2911 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("set tablespace"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 32916 "preproc.c" /* yacc.c:1646  */
+#line 32954 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 334:
 #line 2915 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("set tablespace"),(yyvsp[0].str));
 }
-#line 32924 "preproc.c" /* yacc.c:1646  */
+#line 32962 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 335:
 #line 2919 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("reset"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 32932 "preproc.c" /* yacc.c:1646  */
+#line 32970 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 336:
 #line 2923 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("replica identity"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("reset"),(yyvsp[0].str));
 }
-#line 32940 "preproc.c" /* yacc.c:1646  */
+#line 32978 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 337:
 #line 2927 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("enable row level security");
+ (yyval.str) = cat_str(2,mm_strdup("replica identity"),(yyvsp[0].str));
 }
-#line 32948 "preproc.c" /* yacc.c:1646  */
+#line 32986 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 338:
 #line 2931 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("disable row level security");
+ (yyval.str) = mm_strdup("enable row level security");
 }
-#line 32956 "preproc.c" /* yacc.c:1646  */
+#line 32994 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 339:
 #line 2935 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("force row level security");
+ (yyval.str) = mm_strdup("disable row level security");
 }
-#line 32964 "preproc.c" /* yacc.c:1646  */
+#line 33002 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 340:
 #line 2939 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("no force row level security");
+ (yyval.str) = mm_strdup("force row level security");
 }
-#line 32972 "preproc.c" /* yacc.c:1646  */
+#line 33010 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 341:
 #line 2943 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("no force row level security");
 }
-#line 32980 "preproc.c" /* yacc.c:1646  */
+#line 33018 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 342:
-#line 2951 "preproc.y" /* yacc.c:1646  */
+#line 2947 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("set default"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 32988 "preproc.c" /* yacc.c:1646  */
+#line 33026 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 343:
 #line 2955 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("drop default");
+ (yyval.str) = cat_str(2,mm_strdup("set default"),(yyvsp[0].str));
 }
-#line 32996 "preproc.c" /* yacc.c:1646  */
+#line 33034 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 344:
-#line 2963 "preproc.y" /* yacc.c:1646  */
+#line 2959 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cascade");
+ (yyval.str) = mm_strdup("drop default");
 }
-#line 33004 "preproc.c" /* yacc.c:1646  */
+#line 33042 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 345:
 #line 2967 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("restrict");
+ (yyval.str) = mm_strdup("cascade");
 }
-#line 33012 "preproc.c" /* yacc.c:1646  */
+#line 33050 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 346:
 #line 2971 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33019 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("restrict");
+}
+#line 33058 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 347:
-#line 2978 "preproc.y" /* yacc.c:1646  */
+#line 2975 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[0].str));
-}
-#line 33027 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33065 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 348:
 #line 2982 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33034 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[0].str));
+}
+#line 33073 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 349:
-#line 2989 "preproc.y" /* yacc.c:1646  */
+#line 2986 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
-}
-#line 33042 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33080 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 350:
 #line 2993 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33049 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
+}
+#line 33088 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 351:
-#line 3000 "preproc.y" /* yacc.c:1646  */
+#line 2997 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("nothing");
-}
-#line 33057 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33095 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 352:
 #line 3004 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("full");
+ (yyval.str) = mm_strdup("nothing");
 }
-#line 33065 "preproc.c" /* yacc.c:1646  */
+#line 33103 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 353:
 #line 3008 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("default");
+ (yyval.str) = mm_strdup("full");
 }
-#line 33073 "preproc.c" /* yacc.c:1646  */
+#line 33111 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 354:
 #line 3012 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("using index"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("default");
 }
-#line 33081 "preproc.c" /* yacc.c:1646  */
+#line 33119 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 355:
-#line 3020 "preproc.y" /* yacc.c:1646  */
+#line 3016 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(2,mm_strdup("using index"),(yyvsp[0].str));
 }
-#line 33089 "preproc.c" /* yacc.c:1646  */
+#line 33127 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 356:
-#line 3028 "preproc.y" /* yacc.c:1646  */
+#line 3024 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 33097 "preproc.c" /* yacc.c:1646  */
+#line 33135 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 357:
 #line 3032 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33104 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
+}
+#line 33143 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 358:
-#line 3039 "preproc.y" /* yacc.c:1646  */
+#line 3036 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 33112 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33150 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 359:
 #line 3043 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33120 "preproc.c" /* yacc.c:1646  */
+#line 33158 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 360:
-#line 3051 "preproc.y" /* yacc.c:1646  */
+#line 3047 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 33128 "preproc.c" /* yacc.c:1646  */
+#line 33166 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 361:
 #line 3055 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 33136 "preproc.c" /* yacc.c:1646  */
+#line 33174 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 362:
 #line 3059 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("."),(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33144 "preproc.c" /* yacc.c:1646  */
+#line 33182 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 363:
 #line 3063 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("."),(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 33152 "preproc.c" /* yacc.c:1646  */
+#line 33190 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 364:
-#line 3071 "preproc.y" /* yacc.c:1646  */
+#line 3067 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter type"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
 }
-#line 33160 "preproc.c" /* yacc.c:1646  */
+#line 33198 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 365:
-#line 3079 "preproc.y" /* yacc.c:1646  */
+#line 3075 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("alter type"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33168 "preproc.c" /* yacc.c:1646  */
+#line 33206 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 366:
 #line 3083 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33176 "preproc.c" /* yacc.c:1646  */
+#line 33214 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 367:
-#line 3091 "preproc.y" /* yacc.c:1646  */
+#line 3087 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("add attribute"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 33184 "preproc.c" /* yacc.c:1646  */
+#line 33222 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 368:
 #line 3095 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop attribute if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("add attribute"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33192 "preproc.c" /* yacc.c:1646  */
+#line 33230 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 369:
 #line 3099 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop attribute"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop attribute if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33200 "preproc.c" /* yacc.c:1646  */
+#line 33238 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 370:
 #line 3103 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter attribute"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("type"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop attribute"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33208 "preproc.c" /* yacc.c:1646  */
+#line 33246 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 371:
-#line 3111 "preproc.y" /* yacc.c:1646  */
+#line 3107 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = cat_str(7,mm_strdup("alter attribute"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("type"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 33254 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 372:
+#line 3115 "preproc.y" /* yacc.c:1646  */
     {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		(yyval.str) = cat2_str(mm_strdup("close"), cursor_marker);
 	}
-#line 33217 "preproc.c" /* yacc.c:1646  */
+#line 33263 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 372:
-#line 3116 "preproc.y" /* yacc.c:1646  */
+  case 373:
+#line 3120 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = mm_strdup("close all");
 }
-#line 33225 "preproc.c" /* yacc.c:1646  */
+#line 33271 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 373:
-#line 3124 "preproc.y" /* yacc.c:1646  */
+  case 374:
+#line 3128 "preproc.y" /* yacc.c:1646  */
     { 
 			if (strcmp((yyvsp[-5].str), "from") == 0 &&
 			   (strcmp((yyvsp[-4].str), "stdin") == 0 || strcmp((yyvsp[-4].str), "stdout") == 0))
@@ -33233,305 +33279,297 @@
 
  (yyval.str) = cat_str(11,mm_strdup("copy"),(yyvsp[-9].str),(yyvsp[-8].str),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33237 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 374:
-#line 3132 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = cat_str(7,mm_strdup("copy"),(yyvsp[-5].str),mm_strdup("to"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 33245 "preproc.c" /* yacc.c:1646  */
+#line 33283 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 375:
-#line 3140 "preproc.y" /* yacc.c:1646  */
+#line 3136 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("from");
+ (yyval.str) = cat_str(7,mm_strdup("copy"),(yyvsp[-5].str),mm_strdup("to"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33253 "preproc.c" /* yacc.c:1646  */
+#line 33291 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 376:
 #line 3144 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("to");
+ (yyval.str) = mm_strdup("from");
 }
-#line 33261 "preproc.c" /* yacc.c:1646  */
+#line 33299 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 377:
-#line 3152 "preproc.y" /* yacc.c:1646  */
+#line 3148 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("program");
+ (yyval.str) = mm_strdup("to");
 }
-#line 33269 "preproc.c" /* yacc.c:1646  */
+#line 33307 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 378:
 #line 3156 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33276 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("program");
+}
+#line 33315 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 379:
-#line 3163 "preproc.y" /* yacc.c:1646  */
+#line 3160 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 33284 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33322 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 380:
 #line 3167 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("stdin");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33292 "preproc.c" /* yacc.c:1646  */
+#line 33330 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 381:
 #line 3171 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("stdout");
+ (yyval.str) = mm_strdup("stdin");
 }
-#line 33300 "preproc.c" /* yacc.c:1646  */
+#line 33338 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 382:
-#line 3179 "preproc.y" /* yacc.c:1646  */
+#line 3175 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("stdout");
 }
-#line 33308 "preproc.c" /* yacc.c:1646  */
+#line 33346 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 383:
 #line 3183 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33316 "preproc.c" /* yacc.c:1646  */
+#line 33354 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 384:
-#line 3191 "preproc.y" /* yacc.c:1646  */
+#line 3187 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 33324 "preproc.c" /* yacc.c:1646  */
+#line 33362 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 385:
 #line 3195 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33331 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 33370 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 386:
-#line 3202 "preproc.y" /* yacc.c:1646  */
+#line 3199 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("binary");
-}
-#line 33339 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33377 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 387:
 #line 3206 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("oids");
+ (yyval.str) = mm_strdup("binary");
 }
-#line 33347 "preproc.c" /* yacc.c:1646  */
+#line 33385 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 388:
 #line 3210 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("freeze");
+ (yyval.str) = mm_strdup("oids");
 }
-#line 33355 "preproc.c" /* yacc.c:1646  */
+#line 33393 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 389:
 #line 3214 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("delimiter"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("freeze");
 }
-#line 33363 "preproc.c" /* yacc.c:1646  */
+#line 33401 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 390:
 #line 3218 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("null"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("delimiter"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33371 "preproc.c" /* yacc.c:1646  */
+#line 33409 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 391:
 #line 3222 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("csv");
+ (yyval.str) = cat_str(3,mm_strdup("null"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33379 "preproc.c" /* yacc.c:1646  */
+#line 33417 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 392:
 #line 3226 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("header");
+ (yyval.str) = mm_strdup("csv");
 }
-#line 33387 "preproc.c" /* yacc.c:1646  */
+#line 33425 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 393:
 #line 3230 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("quote"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("header");
 }
-#line 33395 "preproc.c" /* yacc.c:1646  */
+#line 33433 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 394:
 #line 3234 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("escape"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("quote"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33403 "preproc.c" /* yacc.c:1646  */
+#line 33441 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 395:
 #line 3238 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("force quote"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("escape"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33411 "preproc.c" /* yacc.c:1646  */
+#line 33449 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 396:
 #line 3242 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("force quote *");
+ (yyval.str) = cat_str(2,mm_strdup("force quote"),(yyvsp[0].str));
 }
-#line 33419 "preproc.c" /* yacc.c:1646  */
+#line 33457 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 397:
 #line 3246 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("force not null"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("force quote *");
 }
-#line 33427 "preproc.c" /* yacc.c:1646  */
+#line 33465 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 398:
 #line 3250 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("force null"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("force not null"),(yyvsp[0].str));
 }
-#line 33435 "preproc.c" /* yacc.c:1646  */
+#line 33473 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 399:
 #line 3254 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("encoding"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("force null"),(yyvsp[0].str));
 }
-#line 33443 "preproc.c" /* yacc.c:1646  */
+#line 33481 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 400:
-#line 3262 "preproc.y" /* yacc.c:1646  */
+#line 3258 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("binary");
+ (yyval.str) = cat_str(2,mm_strdup("encoding"),(yyvsp[0].str));
 }
-#line 33451 "preproc.c" /* yacc.c:1646  */
+#line 33489 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 401:
 #line 3266 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33458 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("binary");
+}
+#line 33497 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 402:
-#line 3273 "preproc.y" /* yacc.c:1646  */
+#line 3270 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with oids");
-}
-#line 33466 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33504 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 403:
 #line 3277 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33473 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("with oids");
+}
+#line 33512 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 404:
-#line 3284 "preproc.y" /* yacc.c:1646  */
+#line 3281 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("delimiters"),(yyvsp[0].str));
-}
-#line 33481 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33519 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 405:
 #line 3288 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33488 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("delimiters"),(yyvsp[0].str));
+}
+#line 33527 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 406:
-#line 3295 "preproc.y" /* yacc.c:1646  */
+#line 3292 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("using");
-}
-#line 33496 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33534 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 407:
 #line 3299 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33503 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("using");
+}
+#line 33542 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 408:
-#line 3306 "preproc.y" /* yacc.c:1646  */
+#line 3303 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 33511 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33549 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 409:
 #line 3310 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33519 "preproc.c" /* yacc.c:1646  */
+#line 33557 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 410:
-#line 3318 "preproc.y" /* yacc.c:1646  */
+#line 3314 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 33527 "preproc.c" /* yacc.c:1646  */
+#line 33565 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 411:
-#line 3326 "preproc.y" /* yacc.c:1646  */
+#line 3322 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33535 "preproc.c" /* yacc.c:1646  */
+#line 33573 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 412:
@@ -33539,219 +33577,219 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 33543 "preproc.c" /* yacc.c:1646  */
+#line 33581 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 413:
 #line 3334 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("*");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33551 "preproc.c" /* yacc.c:1646  */
+#line 33589 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 414:
 #line 3338 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("*");
 }
-#line 33559 "preproc.c" /* yacc.c:1646  */
+#line 33597 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 415:
 #line 3342 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33566 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 33605 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 416:
-#line 3349 "preproc.y" /* yacc.c:1646  */
+#line 3346 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 33574 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33612 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 417:
 #line 3353 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33582 "preproc.c" /* yacc.c:1646  */
+#line 33620 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 418:
-#line 3361 "preproc.y" /* yacc.c:1646  */
+#line 3357 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 33590 "preproc.c" /* yacc.c:1646  */
+#line 33628 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 419:
-#line 3369 "preproc.y" /* yacc.c:1646  */
+#line 3365 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(11,mm_strdup("create"),(yyvsp[-9].str),mm_strdup("table"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33598 "preproc.c" /* yacc.c:1646  */
+#line 33636 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 420:
 #line 3373 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(11,mm_strdup("create"),(yyvsp[-12].str),mm_strdup("table if not exists"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(11,mm_strdup("create"),(yyvsp[-9].str),mm_strdup("table"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33606 "preproc.c" /* yacc.c:1646  */
+#line 33644 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 421:
 #line 3377 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-8].str),mm_strdup("table"),(yyvsp[-6].str),mm_strdup("of"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(11,mm_strdup("create"),(yyvsp[-12].str),mm_strdup("table if not exists"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33614 "preproc.c" /* yacc.c:1646  */
+#line 33652 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 422:
 #line 3381 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-11].str),mm_strdup("table if not exists"),(yyvsp[-6].str),mm_strdup("of"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-8].str),mm_strdup("table"),(yyvsp[-6].str),mm_strdup("of"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33622 "preproc.c" /* yacc.c:1646  */
+#line 33660 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 423:
-#line 3389 "preproc.y" /* yacc.c:1646  */
+#line 3385 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("temporary");
+ (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-11].str),mm_strdup("table if not exists"),(yyvsp[-6].str),mm_strdup("of"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33630 "preproc.c" /* yacc.c:1646  */
+#line 33668 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 424:
 #line 3393 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("temp");
+ (yyval.str) = mm_strdup("temporary");
 }
-#line 33638 "preproc.c" /* yacc.c:1646  */
+#line 33676 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 425:
 #line 3397 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("local temporary");
+ (yyval.str) = mm_strdup("temp");
 }
-#line 33646 "preproc.c" /* yacc.c:1646  */
+#line 33684 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 426:
 #line 3401 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("local temp");
+ (yyval.str) = mm_strdup("local temporary");
 }
-#line 33654 "preproc.c" /* yacc.c:1646  */
+#line 33692 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 427:
 #line 3405 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("global temporary");
+ (yyval.str) = mm_strdup("local temp");
 }
-#line 33662 "preproc.c" /* yacc.c:1646  */
+#line 33700 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 428:
 #line 3409 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("global temp");
+ (yyval.str) = mm_strdup("global temporary");
 }
-#line 33670 "preproc.c" /* yacc.c:1646  */
+#line 33708 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 429:
 #line 3413 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unlogged");
+ (yyval.str) = mm_strdup("global temp");
 }
-#line 33678 "preproc.c" /* yacc.c:1646  */
+#line 33716 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 430:
 #line 3417 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33685 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("unlogged");
+}
+#line 33724 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 431:
-#line 3424 "preproc.y" /* yacc.c:1646  */
+#line 3421 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 33693 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 432:
 #line 3428 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33700 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 33739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 433:
-#line 3435 "preproc.y" /* yacc.c:1646  */
+#line 3432 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
-}
-#line 33708 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33746 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 434:
 #line 3439 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33715 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 33754 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 435:
-#line 3446 "preproc.y" /* yacc.c:1646  */
+#line 3443 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 33723 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33761 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 436:
 #line 3450 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33731 "preproc.c" /* yacc.c:1646  */
+#line 33769 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 437:
-#line 3458 "preproc.y" /* yacc.c:1646  */
+#line 3454 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 33739 "preproc.c" /* yacc.c:1646  */
+#line 33777 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 438:
 #line 3462 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33747 "preproc.c" /* yacc.c:1646  */
+#line 33785 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 439:
-#line 3470 "preproc.y" /* yacc.c:1646  */
+#line 3466 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 33755 "preproc.c" /* yacc.c:1646  */
+#line 33793 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 440:
@@ -33759,7 +33797,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 33763 "preproc.c" /* yacc.c:1646  */
+#line 33801 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 441:
@@ -33767,15 +33805,15 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 33771 "preproc.c" /* yacc.c:1646  */
+#line 33809 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 442:
-#line 3486 "preproc.y" /* yacc.c:1646  */
+#line 3482 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 33779 "preproc.c" /* yacc.c:1646  */
+#line 33817 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 443:
@@ -33783,54 +33821,54 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 33787 "preproc.c" /* yacc.c:1646  */
+#line 33825 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 444:
-#line 3498 "preproc.y" /* yacc.c:1646  */
+#line 3494 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33795 "preproc.c" /* yacc.c:1646  */
+#line 33833 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 445:
-#line 3506 "preproc.y" /* yacc.c:1646  */
+#line 3502 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("with options"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33803 "preproc.c" /* yacc.c:1646  */
+#line 33841 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 446:
-#line 3514 "preproc.y" /* yacc.c:1646  */
+#line 3510 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("with options"),(yyvsp[0].str));
 }
-#line 33811 "preproc.c" /* yacc.c:1646  */
+#line 33849 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 447:
 #line 3518 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33818 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 33857 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 448:
-#line 3525 "preproc.y" /* yacc.c:1646  */
+#line 3522 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("constraint"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 33826 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 33864 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 449:
 #line 3529 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("constraint"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33834 "preproc.c" /* yacc.c:1646  */
+#line 33872 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 450:
@@ -33838,395 +33876,395 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 33842 "preproc.c" /* yacc.c:1646  */
+#line 33880 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 451:
 #line 3537 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 33850 "preproc.c" /* yacc.c:1646  */
+#line 33888 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 452:
-#line 3545 "preproc.y" /* yacc.c:1646  */
+#line 3541 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("not null");
+ (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[0].str));
 }
-#line 33858 "preproc.c" /* yacc.c:1646  */
+#line 33896 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 453:
 #line 3549 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("null");
+ (yyval.str) = mm_strdup("not null");
 }
-#line 33866 "preproc.c" /* yacc.c:1646  */
+#line 33904 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 454:
 #line 3553 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("unique"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("null");
 }
-#line 33874 "preproc.c" /* yacc.c:1646  */
+#line 33912 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 455:
 #line 3557 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("primary key"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("unique"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33882 "preproc.c" /* yacc.c:1646  */
+#line 33920 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 456:
 #line 3561 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("check ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("primary key"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33890 "preproc.c" /* yacc.c:1646  */
+#line 33928 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 457:
 #line 3565 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("default"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("check ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 33898 "preproc.c" /* yacc.c:1646  */
+#line 33936 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 458:
 #line 3569 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("references"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("default"),(yyvsp[0].str));
 }
-#line 33906 "preproc.c" /* yacc.c:1646  */
+#line 33944 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 459:
-#line 3577 "preproc.y" /* yacc.c:1646  */
+#line 3573 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("deferrable");
+ (yyval.str) = cat_str(5,mm_strdup("references"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33914 "preproc.c" /* yacc.c:1646  */
+#line 33952 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 460:
 #line 3581 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("not deferrable");
+ (yyval.str) = mm_strdup("deferrable");
 }
-#line 33922 "preproc.c" /* yacc.c:1646  */
+#line 33960 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 461:
 #line 3585 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("initially deferred");
+ (yyval.str) = mm_strdup("not deferrable");
 }
-#line 33930 "preproc.c" /* yacc.c:1646  */
+#line 33968 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 462:
 #line 3589 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("initially immediate");
+ (yyval.str) = mm_strdup("initially deferred");
 }
-#line 33938 "preproc.c" /* yacc.c:1646  */
+#line 33976 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 463:
-#line 3597 "preproc.y" /* yacc.c:1646  */
+#line 3593 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("like"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("initially immediate");
 }
-#line 33946 "preproc.c" /* yacc.c:1646  */
+#line 33984 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 464:
-#line 3605 "preproc.y" /* yacc.c:1646  */
+#line 3601 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("including"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("like"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 33954 "preproc.c" /* yacc.c:1646  */
+#line 33992 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 465:
 #line 3609 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("excluding"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("including"),(yyvsp[0].str));
 }
-#line 33962 "preproc.c" /* yacc.c:1646  */
+#line 34000 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 466:
 #line 3613 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 33969 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("excluding"),(yyvsp[0].str));
+}
+#line 34008 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 467:
-#line 3620 "preproc.y" /* yacc.c:1646  */
+#line 3617 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("defaults");
-}
-#line 33977 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34015 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 468:
 #line 3624 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("constraints");
+ (yyval.str) = mm_strdup("defaults");
 }
-#line 33985 "preproc.c" /* yacc.c:1646  */
+#line 34023 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 469:
 #line 3628 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("indexes");
+ (yyval.str) = mm_strdup("constraints");
 }
-#line 33993 "preproc.c" /* yacc.c:1646  */
+#line 34031 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 470:
 #line 3632 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("storage");
+ (yyval.str) = mm_strdup("indexes");
 }
-#line 34001 "preproc.c" /* yacc.c:1646  */
+#line 34039 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 471:
 #line 3636 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("comments");
+ (yyval.str) = mm_strdup("storage");
 }
-#line 34009 "preproc.c" /* yacc.c:1646  */
+#line 34047 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 472:
 #line 3640 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all");
+ (yyval.str) = mm_strdup("comments");
 }
-#line 34017 "preproc.c" /* yacc.c:1646  */
+#line 34055 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 473:
-#line 3648 "preproc.y" /* yacc.c:1646  */
+#line 3644 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("constraint"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("all");
 }
-#line 34025 "preproc.c" /* yacc.c:1646  */
+#line 34063 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 474:
 #line 3652 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("constraint"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34033 "preproc.c" /* yacc.c:1646  */
+#line 34071 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 475:
-#line 3660 "preproc.y" /* yacc.c:1646  */
+#line 3656 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("check ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 34041 "preproc.c" /* yacc.c:1646  */
+#line 34079 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 476:
 #line 3664 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("unique ("),(yyvsp[-4].str),mm_strdup(")"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("check ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 34049 "preproc.c" /* yacc.c:1646  */
+#line 34087 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 477:
 #line 3668 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("unique"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("unique ("),(yyvsp[-4].str),mm_strdup(")"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34057 "preproc.c" /* yacc.c:1646  */
+#line 34095 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 478:
 #line 3672 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("primary key ("),(yyvsp[-4].str),mm_strdup(")"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("unique"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34065 "preproc.c" /* yacc.c:1646  */
+#line 34103 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 479:
 #line 3676 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("primary key"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("primary key ("),(yyvsp[-4].str),mm_strdup(")"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34073 "preproc.c" /* yacc.c:1646  */
+#line 34111 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 480:
 #line 3680 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(9,mm_strdup("exclude"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("primary key"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34081 "preproc.c" /* yacc.c:1646  */
+#line 34119 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 481:
 #line 3684 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(8,mm_strdup("foreign key ("),(yyvsp[-7].str),mm_strdup(") references"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(9,mm_strdup("exclude"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34089 "preproc.c" /* yacc.c:1646  */
+#line 34127 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 482:
-#line 3692 "preproc.y" /* yacc.c:1646  */
+#line 3688 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("no inherit");
+ (yyval.str) = cat_str(8,mm_strdup("foreign key ("),(yyvsp[-7].str),mm_strdup(") references"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34097 "preproc.c" /* yacc.c:1646  */
+#line 34135 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 483:
 #line 3696 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34104 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("no inherit");
+}
+#line 34143 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 484:
-#line 3703 "preproc.y" /* yacc.c:1646  */
+#line 3700 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
-}
-#line 34112 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34150 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 485:
 #line 3707 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34119 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 34158 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 486:
-#line 3714 "preproc.y" /* yacc.c:1646  */
+#line 3711 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 34127 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34165 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 487:
 #line 3718 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 34135 "preproc.c" /* yacc.c:1646  */
+#line 34173 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 488:
-#line 3726 "preproc.y" /* yacc.c:1646  */
+#line 3722 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 34143 "preproc.c" /* yacc.c:1646  */
+#line 34181 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 489:
-#line 3734 "preproc.y" /* yacc.c:1646  */
+#line 3730 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("match full");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 34151 "preproc.c" /* yacc.c:1646  */
+#line 34189 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 490:
 #line 3738 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = mm_strdup("match partial");
+ (yyval.str) = mm_strdup("match full");
 }
-#line 34160 "preproc.c" /* yacc.c:1646  */
+#line 34197 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 491:
-#line 3743 "preproc.y" /* yacc.c:1646  */
+#line 3742 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("match simple");
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = mm_strdup("match partial");
 }
-#line 34168 "preproc.c" /* yacc.c:1646  */
+#line 34206 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 492:
 #line 3747 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34175 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("match simple");
+}
+#line 34214 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 493:
-#line 3754 "preproc.y" /* yacc.c:1646  */
+#line 3751 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 34183 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34221 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 494:
 #line 3758 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 34191 "preproc.c" /* yacc.c:1646  */
+#line 34229 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 495:
-#line 3766 "preproc.y" /* yacc.c:1646  */
+#line 3762 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("with"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 34199 "preproc.c" /* yacc.c:1646  */
+#line 34237 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 496:
 #line 3770 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-5].str),mm_strdup("with operator ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("with"),(yyvsp[0].str));
 }
-#line 34207 "preproc.c" /* yacc.c:1646  */
+#line 34245 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 497:
-#line 3778 "preproc.y" /* yacc.c:1646  */
+#line 3774 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("where ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(4,(yyvsp[-5].str),mm_strdup("with operator ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 34215 "preproc.c" /* yacc.c:1646  */
+#line 34253 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 498:
 #line 3782 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34222 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("where ("),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 34261 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 499:
-#line 3789 "preproc.y" /* yacc.c:1646  */
+#line 3786 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 34230 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34268 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 500:
@@ -34234,15 +34272,15 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 34238 "preproc.c" /* yacc.c:1646  */
+#line 34276 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 501:
 #line 3797 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 34246 "preproc.c" /* yacc.c:1646  */
+#line 34284 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 502:
@@ -34250,1696 +34288,1696 @@
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34254 "preproc.c" /* yacc.c:1646  */
+#line 34292 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 503:
 #line 3805 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34261 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 34300 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 504:
-#line 3812 "preproc.y" /* yacc.c:1646  */
+#line 3809 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("on update"),(yyvsp[0].str));
-}
-#line 34269 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34307 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 505:
-#line 3820 "preproc.y" /* yacc.c:1646  */
+#line 3816 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("on delete"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("on update"),(yyvsp[0].str));
 }
-#line 34277 "preproc.c" /* yacc.c:1646  */
+#line 34315 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 506:
-#line 3828 "preproc.y" /* yacc.c:1646  */
+#line 3824 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("no action");
+ (yyval.str) = cat_str(2,mm_strdup("on delete"),(yyvsp[0].str));
 }
-#line 34285 "preproc.c" /* yacc.c:1646  */
+#line 34323 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 507:
 #line 3832 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("restrict");
+ (yyval.str) = mm_strdup("no action");
 }
-#line 34293 "preproc.c" /* yacc.c:1646  */
+#line 34331 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 508:
 #line 3836 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cascade");
+ (yyval.str) = mm_strdup("restrict");
 }
-#line 34301 "preproc.c" /* yacc.c:1646  */
+#line 34339 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 509:
 #line 3840 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("set null");
+ (yyval.str) = mm_strdup("cascade");
 }
-#line 34309 "preproc.c" /* yacc.c:1646  */
+#line 34347 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 510:
 #line 3844 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("set default");
+ (yyval.str) = mm_strdup("set null");
 }
-#line 34317 "preproc.c" /* yacc.c:1646  */
+#line 34355 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 511:
-#line 3852 "preproc.y" /* yacc.c:1646  */
+#line 3848 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("inherits ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("set default");
 }
-#line 34325 "preproc.c" /* yacc.c:1646  */
+#line 34363 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 512:
 #line 3856 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34332 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("inherits ("),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 34371 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 513:
-#line 3863 "preproc.y" /* yacc.c:1646  */
+#line 3860 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
-}
-#line 34340 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34378 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 514:
 #line 3867 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with oids");
+ (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
 }
-#line 34348 "preproc.c" /* yacc.c:1646  */
+#line 34386 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 515:
 #line 3871 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("without oids");
+ (yyval.str) = mm_strdup("with oids");
 }
-#line 34356 "preproc.c" /* yacc.c:1646  */
+#line 34394 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 516:
 #line 3875 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34363 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("without oids");
+}
+#line 34402 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 517:
-#line 3882 "preproc.y" /* yacc.c:1646  */
+#line 3879 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("on commit drop");
-}
-#line 34371 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34409 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 518:
 #line 3886 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("on commit delete rows");
+ (yyval.str) = mm_strdup("on commit drop");
 }
-#line 34379 "preproc.c" /* yacc.c:1646  */
+#line 34417 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 519:
 #line 3890 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("on commit preserve rows");
+ (yyval.str) = mm_strdup("on commit delete rows");
 }
-#line 34387 "preproc.c" /* yacc.c:1646  */
+#line 34425 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 520:
 #line 3894 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34394 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("on commit preserve rows");
+}
+#line 34433 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 521:
-#line 3901 "preproc.y" /* yacc.c:1646  */
+#line 3898 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("tablespace"),(yyvsp[0].str));
-}
-#line 34402 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34440 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 522:
 #line 3905 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34409 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("tablespace"),(yyvsp[0].str));
+}
+#line 34448 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 523:
-#line 3912 "preproc.y" /* yacc.c:1646  */
+#line 3909 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("using index tablespace"),(yyvsp[0].str));
-}
-#line 34417 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34455 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 524:
 #line 3916 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34424 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("using index tablespace"),(yyvsp[0].str));
+}
+#line 34463 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 525:
-#line 3923 "preproc.y" /* yacc.c:1646  */
+#line 3920 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("using index"),(yyvsp[0].str));
-}
-#line 34432 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34470 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 526:
-#line 3931 "preproc.y" /* yacc.c:1646  */
+#line 3927 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("using index"),(yyvsp[0].str));
 }
-#line 34440 "preproc.c" /* yacc.c:1646  */
+#line 34478 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 527:
-#line 3939 "preproc.y" /* yacc.c:1646  */
+#line 3935 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with data");
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34448 "preproc.c" /* yacc.c:1646  */
+#line 34486 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 528:
 #line 3943 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with no data");
+ (yyval.str) = mm_strdup("with data");
 }
-#line 34456 "preproc.c" /* yacc.c:1646  */
+#line 34494 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 529:
 #line 3947 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34463 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("with no data");
+}
+#line 34502 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 530:
-#line 3954 "preproc.y" /* yacc.c:1646  */
+#line 3951 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[-6].str),mm_strdup("materialized view"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 34471 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34509 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 531:
 #line 3958 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[-9].str),mm_strdup("materialized view if not exists"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[-6].str),mm_strdup("materialized view"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34479 "preproc.c" /* yacc.c:1646  */
+#line 34517 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 532:
-#line 3966 "preproc.y" /* yacc.c:1646  */
+#line 3962 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[-9].str),mm_strdup("materialized view if not exists"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34487 "preproc.c" /* yacc.c:1646  */
+#line 34525 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 533:
-#line 3974 "preproc.y" /* yacc.c:1646  */
+#line 3970 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unlogged");
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34495 "preproc.c" /* yacc.c:1646  */
+#line 34533 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 534:
 #line 3978 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34502 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("unlogged");
+}
+#line 34541 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 535:
-#line 3985 "preproc.y" /* yacc.c:1646  */
+#line 3982 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("refresh materialized view"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 34510 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34548 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 536:
-#line 3993 "preproc.y" /* yacc.c:1646  */
+#line 3989 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("create"),(yyvsp[-3].str),mm_strdup("sequence"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("refresh materialized view"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34518 "preproc.c" /* yacc.c:1646  */
+#line 34556 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 537:
 #line 3997 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("create"),(yyvsp[-6].str),mm_strdup("sequence if not exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("create"),(yyvsp[-3].str),mm_strdup("sequence"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34526 "preproc.c" /* yacc.c:1646  */
+#line 34564 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 538:
-#line 4005 "preproc.y" /* yacc.c:1646  */
+#line 4001 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter sequence"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("create"),(yyvsp[-6].str),mm_strdup("sequence if not exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34534 "preproc.c" /* yacc.c:1646  */
+#line 34572 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 539:
 #line 4009 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter sequence if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter sequence"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34542 "preproc.c" /* yacc.c:1646  */
+#line 34580 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 540:
-#line 4017 "preproc.y" /* yacc.c:1646  */
+#line 4013 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("alter sequence if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34550 "preproc.c" /* yacc.c:1646  */
+#line 34588 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 541:
 #line 4021 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34557 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 34596 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 542:
-#line 4028 "preproc.y" /* yacc.c:1646  */
+#line 4025 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 34565 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34603 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 543:
 #line 4032 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 34573 "preproc.c" /* yacc.c:1646  */
+#line 34611 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 544:
-#line 4040 "preproc.y" /* yacc.c:1646  */
+#line 4036 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("cache"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34581 "preproc.c" /* yacc.c:1646  */
+#line 34619 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 545:
 #line 4044 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cycle");
+ (yyval.str) = cat_str(2,mm_strdup("cache"),(yyvsp[0].str));
 }
-#line 34589 "preproc.c" /* yacc.c:1646  */
+#line 34627 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 546:
 #line 4048 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("no cycle");
+ (yyval.str) = mm_strdup("cycle");
 }
-#line 34597 "preproc.c" /* yacc.c:1646  */
+#line 34635 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 547:
 #line 4052 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("increment"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("no cycle");
 }
-#line 34605 "preproc.c" /* yacc.c:1646  */
+#line 34643 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 548:
 #line 4056 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("maxvalue"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("increment"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34613 "preproc.c" /* yacc.c:1646  */
+#line 34651 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 549:
 #line 4060 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("minvalue"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("maxvalue"),(yyvsp[0].str));
 }
-#line 34621 "preproc.c" /* yacc.c:1646  */
+#line 34659 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 550:
 #line 4064 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("no maxvalue");
+ (yyval.str) = cat_str(2,mm_strdup("minvalue"),(yyvsp[0].str));
 }
-#line 34629 "preproc.c" /* yacc.c:1646  */
+#line 34667 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 551:
 #line 4068 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("no minvalue");
+ (yyval.str) = mm_strdup("no maxvalue");
 }
-#line 34637 "preproc.c" /* yacc.c:1646  */
+#line 34675 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 552:
 #line 4072 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("owned by"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("no minvalue");
 }
-#line 34645 "preproc.c" /* yacc.c:1646  */
+#line 34683 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 553:
 #line 4076 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("start"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("owned by"),(yyvsp[0].str));
 }
-#line 34653 "preproc.c" /* yacc.c:1646  */
+#line 34691 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 554:
 #line 4080 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("restart");
+ (yyval.str) = cat_str(3,mm_strdup("start"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34661 "preproc.c" /* yacc.c:1646  */
+#line 34699 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 555:
 #line 4084 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("restart"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("restart");
 }
-#line 34669 "preproc.c" /* yacc.c:1646  */
+#line 34707 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 556:
-#line 4092 "preproc.y" /* yacc.c:1646  */
+#line 4088 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("by");
+ (yyval.str) = cat_str(3,mm_strdup("restart"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34677 "preproc.c" /* yacc.c:1646  */
+#line 34715 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 557:
 #line 4096 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34684 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("by");
+}
+#line 34723 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 558:
-#line 4103 "preproc.y" /* yacc.c:1646  */
+#line 4100 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 34692 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34730 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 559:
 #line 4107 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 34700 "preproc.c" /* yacc.c:1646  */
+#line 34738 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 560:
 #line 4111 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
 }
-#line 34708 "preproc.c" /* yacc.c:1646  */
+#line 34746 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 561:
-#line 4119 "preproc.y" /* yacc.c:1646  */
+#line 4115 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
 }
-#line 34716 "preproc.c" /* yacc.c:1646  */
+#line 34754 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 562:
-#line 4123 "preproc.y" /* yacc.c:1646  */
+#line 4119 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 34724 "preproc.c" /* yacc.c:1646  */
+#line 34762 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 563:
-#line 4131 "preproc.y" /* yacc.c:1646  */
+#line 4127 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("create"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("language"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 34732 "preproc.c" /* yacc.c:1646  */
+#line 34770 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 564:
-#line 4135 "preproc.y" /* yacc.c:1646  */
+#line 4131 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-8].str),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("language"),(yyvsp[-4].str),mm_strdup("handler"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 34740 "preproc.c" /* yacc.c:1646  */
+#line 34778 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 565:
+#line 4139 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = cat_str(6,mm_strdup("create"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("language"),(yyvsp[0].str));
+}
+#line 34786 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 566:
 #line 4143 "preproc.y" /* yacc.c:1646  */
     { 
+ (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-8].str),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("language"),(yyvsp[-4].str),mm_strdup("handler"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 34794 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 567:
+#line 4151 "preproc.y" /* yacc.c:1646  */
+    { 
  (yyval.str) = mm_strdup("trusted");
 }
-#line 34748 "preproc.c" /* yacc.c:1646  */
+#line 34802 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 566:
-#line 4147 "preproc.y" /* yacc.c:1646  */
+  case 568:
+#line 4155 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 34755 "preproc.c" /* yacc.c:1646  */
+#line 34809 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 567:
-#line 4154 "preproc.y" /* yacc.c:1646  */
+  case 569:
+#line 4162 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 34763 "preproc.c" /* yacc.c:1646  */
+#line 34817 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 568:
-#line 4158 "preproc.y" /* yacc.c:1646  */
+  case 570:
+#line 4166 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34771 "preproc.c" /* yacc.c:1646  */
+#line 34825 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 569:
-#line 4166 "preproc.y" /* yacc.c:1646  */
+  case 571:
+#line 4174 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,mm_strdup("inline"),(yyvsp[0].str));
 }
-#line 34779 "preproc.c" /* yacc.c:1646  */
+#line 34833 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 570:
-#line 4170 "preproc.y" /* yacc.c:1646  */
+  case 572:
+#line 4178 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 34786 "preproc.c" /* yacc.c:1646  */
+#line 34840 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 571:
-#line 4177 "preproc.y" /* yacc.c:1646  */
+  case 573:
+#line 4185 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,mm_strdup("validator"),(yyvsp[0].str));
 }
-#line 34794 "preproc.c" /* yacc.c:1646  */
+#line 34848 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 572:
-#line 4181 "preproc.y" /* yacc.c:1646  */
+  case 574:
+#line 4189 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = mm_strdup("no validator");
 }
-#line 34802 "preproc.c" /* yacc.c:1646  */
+#line 34856 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 573:
-#line 4189 "preproc.y" /* yacc.c:1646  */
+  case 575:
+#line 4197 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 34810 "preproc.c" /* yacc.c:1646  */
+#line 34864 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 574:
-#line 4193 "preproc.y" /* yacc.c:1646  */
+  case 576:
+#line 4201 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 34817 "preproc.c" /* yacc.c:1646  */
+#line 34871 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 575:
-#line 4200 "preproc.y" /* yacc.c:1646  */
+  case 577:
+#line 4208 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[-3].str),mm_strdup("language"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34825 "preproc.c" /* yacc.c:1646  */
+#line 34879 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 576:
-#line 4204 "preproc.y" /* yacc.c:1646  */
+  case 578:
+#line 4212 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[-5].str),mm_strdup("language if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34833 "preproc.c" /* yacc.c:1646  */
+#line 34887 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 577:
-#line 4212 "preproc.y" /* yacc.c:1646  */
+  case 579:
+#line 4220 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = mm_strdup("procedural");
 }
-#line 34841 "preproc.c" /* yacc.c:1646  */
+#line 34895 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 578:
-#line 4216 "preproc.y" /* yacc.c:1646  */
+  case 580:
+#line 4224 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 34848 "preproc.c" /* yacc.c:1646  */
+#line 34902 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 579:
-#line 4223 "preproc.y" /* yacc.c:1646  */
+  case 581:
+#line 4231 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(6,mm_strdup("create tablespace"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("location"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34856 "preproc.c" /* yacc.c:1646  */
+#line 34910 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 580:
-#line 4231 "preproc.y" /* yacc.c:1646  */
+  case 582:
+#line 4239 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,mm_strdup("owner"),(yyvsp[0].str));
 }
-#line 34864 "preproc.c" /* yacc.c:1646  */
+#line 34918 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 581:
-#line 4235 "preproc.y" /* yacc.c:1646  */
+  case 583:
+#line 4243 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 34871 "preproc.c" /* yacc.c:1646  */
+#line 34925 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 582:
-#line 4242 "preproc.y" /* yacc.c:1646  */
+  case 584:
+#line 4250 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop tablespace"),(yyvsp[0].str));
 }
-#line 34879 "preproc.c" /* yacc.c:1646  */
+#line 34933 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 583:
-#line 4246 "preproc.y" /* yacc.c:1646  */
+  case 585:
+#line 4254 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop tablespace if exists"),(yyvsp[0].str));
 }
-#line 34887 "preproc.c" /* yacc.c:1646  */
+#line 34941 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 584:
-#line 4254 "preproc.y" /* yacc.c:1646  */
+  case 586:
+#line 4262 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(4,mm_strdup("create extension"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34895 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 585:
-#line 4258 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = cat_str(4,mm_strdup("create extension if not exists"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 34903 "preproc.c" /* yacc.c:1646  */
+#line 34949 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 586:
+  case 587:
 #line 4266 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("create extension if not exists"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34911 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 587:
-#line 4270 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str)=EMPTY; }
-#line 34918 "preproc.c" /* yacc.c:1646  */
+#line 34957 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 588:
-#line 4277 "preproc.y" /* yacc.c:1646  */
+#line 4274 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34926 "preproc.c" /* yacc.c:1646  */
+#line 34965 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 589:
-#line 4281 "preproc.y" /* yacc.c:1646  */
+#line 4278 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[0].str));
-}
-#line 34934 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 34972 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 590:
 #line 4285 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[0].str));
 }
-#line 34942 "preproc.c" /* yacc.c:1646  */
+#line 34980 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 591:
-#line 4293 "preproc.y" /* yacc.c:1646  */
+#line 4289 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter extension"),(yyvsp[-2].str),mm_strdup("update"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[0].str));
 }
-#line 34950 "preproc.c" /* yacc.c:1646  */
+#line 34988 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 592:
-#line 4301 "preproc.y" /* yacc.c:1646  */
+#line 4293 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
 }
-#line 34958 "preproc.c" /* yacc.c:1646  */
+#line 34996 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 593:
-#line 4305 "preproc.y" /* yacc.c:1646  */
+#line 4301 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 34965 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(4,mm_strdup("alter extension"),(yyvsp[-2].str),mm_strdup("update"),(yyvsp[0].str));
+}
+#line 35004 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 594:
-#line 4312 "preproc.y" /* yacc.c:1646  */
+#line 4309 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34973 "preproc.c" /* yacc.c:1646  */
+#line 35012 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 595:
-#line 4320 "preproc.y" /* yacc.c:1646  */
+#line 4313 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("aggregate"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 34981 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 35019 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 596:
-#line 4324 "preproc.y" /* yacc.c:1646  */
+#line 4320 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(8,mm_strdup("alter extension"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("cast ("),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(2,mm_strdup("to"),(yyvsp[0].str));
 }
-#line 34989 "preproc.c" /* yacc.c:1646  */
+#line 35027 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 597:
 #line 4328 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("collation"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("aggregate"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 34997 "preproc.c" /* yacc.c:1646  */
+#line 35035 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 598:
 #line 4332 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("conversion"),(yyvsp[0].str));
+ (yyval.str) = cat_str(8,mm_strdup("alter extension"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("cast ("),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 35005 "preproc.c" /* yacc.c:1646  */
+#line 35043 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 599:
 #line 4336 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("domain"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("collation"),(yyvsp[0].str));
 }
-#line 35013 "preproc.c" /* yacc.c:1646  */
+#line 35051 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 600:
 #line 4340 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("function"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("conversion"),(yyvsp[0].str));
 }
-#line 35021 "preproc.c" /* yacc.c:1646  */
+#line 35059 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 601:
 #line 4344 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("language"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("domain"),(yyvsp[0].str));
 }
-#line 35029 "preproc.c" /* yacc.c:1646  */
+#line 35067 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 602:
 #line 4348 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("operator"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("function"),(yyvsp[0].str));
 }
-#line 35037 "preproc.c" /* yacc.c:1646  */
+#line 35075 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 603:
 #line 4352 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("operator class"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("language"),(yyvsp[0].str));
 }
-#line 35045 "preproc.c" /* yacc.c:1646  */
+#line 35083 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 604:
 #line 4356 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("operator family"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("operator"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35053 "preproc.c" /* yacc.c:1646  */
+#line 35091 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 605:
 #line 4360 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("operator class"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
 }
-#line 35061 "preproc.c" /* yacc.c:1646  */
+#line 35099 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 606:
 #line 4364 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("event trigger"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("operator family"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
 }
-#line 35069 "preproc.c" /* yacc.c:1646  */
+#line 35107 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 607:
 #line 4368 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("table"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("schema"),(yyvsp[0].str));
 }
-#line 35077 "preproc.c" /* yacc.c:1646  */
+#line 35115 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 608:
 #line 4372 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("text search parser"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("event trigger"),(yyvsp[0].str));
 }
-#line 35085 "preproc.c" /* yacc.c:1646  */
+#line 35123 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 609:
 #line 4376 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("text search dictionary"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("table"),(yyvsp[0].str));
 }
-#line 35093 "preproc.c" /* yacc.c:1646  */
+#line 35131 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 610:
 #line 4380 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("text search template"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("text search parser"),(yyvsp[0].str));
 }
-#line 35101 "preproc.c" /* yacc.c:1646  */
+#line 35139 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 611:
 #line 4384 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("text search configuration"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("text search dictionary"),(yyvsp[0].str));
 }
-#line 35109 "preproc.c" /* yacc.c:1646  */
+#line 35147 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 612:
 #line 4388 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("sequence"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("text search template"),(yyvsp[0].str));
 }
-#line 35117 "preproc.c" /* yacc.c:1646  */
+#line 35155 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 613:
 #line 4392 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("view"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("text search configuration"),(yyvsp[0].str));
 }
-#line 35125 "preproc.c" /* yacc.c:1646  */
+#line 35163 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 614:
 #line 4396 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("materialized view"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("sequence"),(yyvsp[0].str));
 }
-#line 35133 "preproc.c" /* yacc.c:1646  */
+#line 35171 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 615:
 #line 4400 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("foreign table"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("view"),(yyvsp[0].str));
 }
-#line 35141 "preproc.c" /* yacc.c:1646  */
+#line 35179 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 616:
 #line 4404 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("foreign data wrapper"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("materialized view"),(yyvsp[0].str));
 }
-#line 35149 "preproc.c" /* yacc.c:1646  */
+#line 35187 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 617:
 #line 4408 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("server"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("foreign table"),(yyvsp[0].str));
 }
-#line 35157 "preproc.c" /* yacc.c:1646  */
+#line 35195 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 618:
 #line 4412 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("transform for"),(yyvsp[-2].str),mm_strdup("language"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("foreign data wrapper"),(yyvsp[0].str));
 }
-#line 35165 "preproc.c" /* yacc.c:1646  */
+#line 35203 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 619:
 #line 4416 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("type"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("server"),(yyvsp[0].str));
 }
-#line 35173 "preproc.c" /* yacc.c:1646  */
+#line 35211 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 620:
-#line 4424 "preproc.y" /* yacc.c:1646  */
+#line 4420 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("create foreign data wrapper"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("transform for"),(yyvsp[-2].str),mm_strdup("language"),(yyvsp[0].str));
 }
-#line 35181 "preproc.c" /* yacc.c:1646  */
+#line 35219 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 621:
-#line 4432 "preproc.y" /* yacc.c:1646  */
+#line 4424 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("handler"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("type"),(yyvsp[0].str));
 }
-#line 35189 "preproc.c" /* yacc.c:1646  */
+#line 35227 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 622:
-#line 4436 "preproc.y" /* yacc.c:1646  */
+#line 4432 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("no handler");
+ (yyval.str) = cat_str(4,mm_strdup("create foreign data wrapper"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35197 "preproc.c" /* yacc.c:1646  */
+#line 35235 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 623:
 #line 4440 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("validator"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("handler"),(yyvsp[0].str));
 }
-#line 35205 "preproc.c" /* yacc.c:1646  */
+#line 35243 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 624:
 #line 4444 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("no validator");
+ (yyval.str) = mm_strdup("no handler");
 }
-#line 35213 "preproc.c" /* yacc.c:1646  */
+#line 35251 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 625:
-#line 4452 "preproc.y" /* yacc.c:1646  */
+#line 4448 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("validator"),(yyvsp[0].str));
 }
-#line 35221 "preproc.c" /* yacc.c:1646  */
+#line 35259 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 626:
-#line 4456 "preproc.y" /* yacc.c:1646  */
+#line 4452 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("no validator");
 }
-#line 35229 "preproc.c" /* yacc.c:1646  */
+#line 35267 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 627:
-#line 4464 "preproc.y" /* yacc.c:1646  */
+#line 4460 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 35237 "preproc.c" /* yacc.c:1646  */
+#line 35275 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 628:
-#line 4468 "preproc.y" /* yacc.c:1646  */
+#line 4464 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35244 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 35283 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 629:
-#line 4475 "preproc.y" /* yacc.c:1646  */
+#line 4472 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop foreign data wrapper"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 35252 "preproc.c" /* yacc.c:1646  */
+#line 35291 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 630:
-#line 4479 "preproc.y" /* yacc.c:1646  */
+#line 4476 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop foreign data wrapper if exists"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 35260 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 35298 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 631:
-#line 4487 "preproc.y" /* yacc.c:1646  */
+#line 4483 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop foreign data wrapper"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35268 "preproc.c" /* yacc.c:1646  */
+#line 35306 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 632:
-#line 4491 "preproc.y" /* yacc.c:1646  */
+#line 4487 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter foreign data wrapper"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop foreign data wrapper if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35276 "preproc.c" /* yacc.c:1646  */
+#line 35314 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 633:
-#line 4499 "preproc.y" /* yacc.c:1646  */
+#line 4495 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("options ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35284 "preproc.c" /* yacc.c:1646  */
+#line 35322 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 634:
-#line 4503 "preproc.y" /* yacc.c:1646  */
+#line 4499 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35291 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("alter foreign data wrapper"),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 35330 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 635:
-#line 4510 "preproc.y" /* yacc.c:1646  */
+#line 4507 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("options ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 35299 "preproc.c" /* yacc.c:1646  */
+#line 35338 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 636:
-#line 4514 "preproc.y" /* yacc.c:1646  */
+#line 4511 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
-}
-#line 35307 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 35345 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 637:
-#line 4522 "preproc.y" /* yacc.c:1646  */
+#line 4518 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("options ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 35315 "preproc.c" /* yacc.c:1646  */
+#line 35353 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 638:
-#line 4530 "preproc.y" /* yacc.c:1646  */
+#line 4522 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 35323 "preproc.c" /* yacc.c:1646  */
+#line 35361 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 639:
-#line 4534 "preproc.y" /* yacc.c:1646  */
+#line 4530 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("options ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 35331 "preproc.c" /* yacc.c:1646  */
+#line 35369 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 640:
-#line 4542 "preproc.y" /* yacc.c:1646  */
+#line 4538 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 35339 "preproc.c" /* yacc.c:1646  */
+#line 35377 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 641:
-#line 4546 "preproc.y" /* yacc.c:1646  */
+#line 4542 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 35347 "preproc.c" /* yacc.c:1646  */
+#line 35385 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 642:
 #line 4550 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 35355 "preproc.c" /* yacc.c:1646  */
+#line 35393 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 643:
 #line 4554 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("drop"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 35363 "preproc.c" /* yacc.c:1646  */
+#line 35401 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 644:
-#line 4562 "preproc.y" /* yacc.c:1646  */
+#line 4558 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[0].str));
 }
-#line 35371 "preproc.c" /* yacc.c:1646  */
+#line 35409 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 645:
-#line 4570 "preproc.y" /* yacc.c:1646  */
+#line 4562 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("drop"),(yyvsp[0].str));
 }
-#line 35379 "preproc.c" /* yacc.c:1646  */
+#line 35417 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 646:
-#line 4578 "preproc.y" /* yacc.c:1646  */
+#line 4570 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35387 "preproc.c" /* yacc.c:1646  */
+#line 35425 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 647:
-#line 4586 "preproc.y" /* yacc.c:1646  */
+#line 4578 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("create server"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("foreign data wrapper"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 35395 "preproc.c" /* yacc.c:1646  */
+#line 35433 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 648:
-#line 4594 "preproc.y" /* yacc.c:1646  */
+#line 4586 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("type"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 35403 "preproc.c" /* yacc.c:1646  */
+#line 35441 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 649:
-#line 4598 "preproc.y" /* yacc.c:1646  */
+#line 4594 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35410 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(7,mm_strdup("create server"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("foreign data wrapper"),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 35449 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 650:
-#line 4605 "preproc.y" /* yacc.c:1646  */
+#line 4602 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("type"),(yyvsp[0].str));
 }
-#line 35418 "preproc.c" /* yacc.c:1646  */
+#line 35457 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 651:
-#line 4609 "preproc.y" /* yacc.c:1646  */
+#line 4606 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("version null");
-}
-#line 35426 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 35464 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 652:
-#line 4617 "preproc.y" /* yacc.c:1646  */
+#line 4613 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[0].str));
 }
-#line 35434 "preproc.c" /* yacc.c:1646  */
+#line 35472 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 653:
-#line 4621 "preproc.y" /* yacc.c:1646  */
+#line 4617 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35441 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("version null");
+}
+#line 35480 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 654:
-#line 4628 "preproc.y" /* yacc.c:1646  */
+#line 4625 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop server"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 35449 "preproc.c" /* yacc.c:1646  */
+#line 35488 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 655:
-#line 4632 "preproc.y" /* yacc.c:1646  */
+#line 4629 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop server if exists"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 35457 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 35495 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 656:
-#line 4640 "preproc.y" /* yacc.c:1646  */
+#line 4636 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35465 "preproc.c" /* yacc.c:1646  */
+#line 35503 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 657:
-#line 4644 "preproc.y" /* yacc.c:1646  */
+#line 4640 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter server"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop server if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35473 "preproc.c" /* yacc.c:1646  */
+#line 35511 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 658:
 #line 4648 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter server"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35481 "preproc.c" /* yacc.c:1646  */
+#line 35519 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 659:
-#line 4656 "preproc.y" /* yacc.c:1646  */
+#line 4652 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(9,mm_strdup("create foreign table"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35489 "preproc.c" /* yacc.c:1646  */
+#line 35527 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 660:
-#line 4660 "preproc.y" /* yacc.c:1646  */
+#line 4656 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(9,mm_strdup("create foreign table if not exists"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35497 "preproc.c" /* yacc.c:1646  */
+#line 35535 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 661:
-#line 4668 "preproc.y" /* yacc.c:1646  */
+#line 4664 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter foreign table"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(9,mm_strdup("create foreign table"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35505 "preproc.c" /* yacc.c:1646  */
+#line 35543 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 662:
-#line 4672 "preproc.y" /* yacc.c:1646  */
+#line 4668 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter foreign table if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(9,mm_strdup("create foreign table if not exists"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35513 "preproc.c" /* yacc.c:1646  */
+#line 35551 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 663:
-#line 4680 "preproc.y" /* yacc.c:1646  */
+#line 4676 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(8,mm_strdup("import foreign schema"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("from server"),(yyvsp[-3].str),mm_strdup("into"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter foreign table"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35521 "preproc.c" /* yacc.c:1646  */
+#line 35559 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 664:
-#line 4688 "preproc.y" /* yacc.c:1646  */
+#line 4680 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("limit to");
+ (yyval.str) = cat_str(3,mm_strdup("alter foreign table if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35529 "preproc.c" /* yacc.c:1646  */
+#line 35567 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 665:
-#line 4692 "preproc.y" /* yacc.c:1646  */
+#line 4688 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("except");
+ (yyval.str) = cat_str(8,mm_strdup("import foreign schema"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("from server"),(yyvsp[-3].str),mm_strdup("into"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35537 "preproc.c" /* yacc.c:1646  */
+#line 35575 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 666:
-#line 4700 "preproc.y" /* yacc.c:1646  */
+#line 4696 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("limit to");
 }
-#line 35545 "preproc.c" /* yacc.c:1646  */
+#line 35583 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 667:
-#line 4704 "preproc.y" /* yacc.c:1646  */
+#line 4700 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35552 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("except");
+}
+#line 35591 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 668:
-#line 4711 "preproc.y" /* yacc.c:1646  */
+#line 4708 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("create user mapping for"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 35560 "preproc.c" /* yacc.c:1646  */
+#line 35599 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 669:
-#line 4719 "preproc.y" /* yacc.c:1646  */
+#line 4712 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 35568 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 35606 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 670:
-#line 4723 "preproc.y" /* yacc.c:1646  */
+#line 4719 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("user");
+ (yyval.str) = cat_str(5,mm_strdup("create user mapping for"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35576 "preproc.c" /* yacc.c:1646  */
+#line 35614 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 671:
-#line 4731 "preproc.y" /* yacc.c:1646  */
+#line 4727 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("drop user mapping for"),(yyvsp[-2].str),mm_strdup("server"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 35584 "preproc.c" /* yacc.c:1646  */
+#line 35622 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 672:
-#line 4735 "preproc.y" /* yacc.c:1646  */
+#line 4731 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("drop user mapping if exists for"),(yyvsp[-2].str),mm_strdup("server"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("user");
 }
-#line 35592 "preproc.c" /* yacc.c:1646  */
+#line 35630 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 673:
-#line 4743 "preproc.y" /* yacc.c:1646  */
+#line 4739 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter user mapping for"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("drop user mapping for"),(yyvsp[-2].str),mm_strdup("server"),(yyvsp[0].str));
 }
-#line 35600 "preproc.c" /* yacc.c:1646  */
+#line 35638 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 674:
-#line 4751 "preproc.y" /* yacc.c:1646  */
+#line 4743 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(8,mm_strdup("create policy"),(yyvsp[-6].str),mm_strdup("on"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("drop user mapping if exists for"),(yyvsp[-2].str),mm_strdup("server"),(yyvsp[0].str));
 }
-#line 35608 "preproc.c" /* yacc.c:1646  */
+#line 35646 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 675:
-#line 4759 "preproc.y" /* yacc.c:1646  */
+#line 4751 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter policy"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter user mapping for"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35616 "preproc.c" /* yacc.c:1646  */
+#line 35654 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 676:
-#line 4767 "preproc.y" /* yacc.c:1646  */
+#line 4759 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop policy"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(8,mm_strdup("create policy"),(yyvsp[-6].str),mm_strdup("on"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35624 "preproc.c" /* yacc.c:1646  */
+#line 35662 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 677:
-#line 4771 "preproc.y" /* yacc.c:1646  */
+#line 4767 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop policy if exists"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter policy"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35632 "preproc.c" /* yacc.c:1646  */
+#line 35670 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 678:
-#line 4779 "preproc.y" /* yacc.c:1646  */
+#line 4775 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("using ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,mm_strdup("drop policy"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35640 "preproc.c" /* yacc.c:1646  */
+#line 35678 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 679:
-#line 4783 "preproc.y" /* yacc.c:1646  */
+#line 4779 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35647 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(5,mm_strdup("drop policy if exists"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 35686 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 680:
-#line 4790 "preproc.y" /* yacc.c:1646  */
+#line 4787 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("with check ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("using ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 35655 "preproc.c" /* yacc.c:1646  */
+#line 35694 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 681:
-#line 4794 "preproc.y" /* yacc.c:1646  */
+#line 4791 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 35662 "preproc.c" /* yacc.c:1646  */
+#line 35701 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 682:
-#line 4801 "preproc.y" /* yacc.c:1646  */
+#line 4798 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("with check ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 35670 "preproc.c" /* yacc.c:1646  */
+#line 35709 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 683:
-#line 4805 "preproc.y" /* yacc.c:1646  */
+#line 4802 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 35677 "preproc.c" /* yacc.c:1646  */
+#line 35716 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 684:
-#line 4812 "preproc.y" /* yacc.c:1646  */
+#line 4809 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,mm_strdup("to"),(yyvsp[0].str));
 }
-#line 35685 "preproc.c" /* yacc.c:1646  */
+#line 35724 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 685:
-#line 4816 "preproc.y" /* yacc.c:1646  */
+#line 4813 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 35692 "preproc.c" /* yacc.c:1646  */
+#line 35731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 686:
-#line 4823 "preproc.y" /* yacc.c:1646  */
+#line 4820 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("for"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("to"),(yyvsp[0].str));
 }
-#line 35700 "preproc.c" /* yacc.c:1646  */
+#line 35739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 687:
-#line 4827 "preproc.y" /* yacc.c:1646  */
+#line 4824 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 35707 "preproc.c" /* yacc.c:1646  */
+#line 35746 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 688:
-#line 4834 "preproc.y" /* yacc.c:1646  */
+#line 4831 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all");
+ (yyval.str) = cat_str(2,mm_strdup("for"),(yyvsp[0].str));
 }
-#line 35715 "preproc.c" /* yacc.c:1646  */
+#line 35754 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 689:
-#line 4838 "preproc.y" /* yacc.c:1646  */
+#line 4835 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("select");
-}
-#line 35723 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 35761 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 690:
 #line 4842 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("insert");
+ (yyval.str) = mm_strdup("all");
 }
-#line 35731 "preproc.c" /* yacc.c:1646  */
+#line 35769 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 691:
 #line 4846 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("update");
+ (yyval.str) = mm_strdup("select");
 }
-#line 35739 "preproc.c" /* yacc.c:1646  */
+#line 35777 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 692:
 #line 4850 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("delete");
+ (yyval.str) = mm_strdup("insert");
 }
-#line 35747 "preproc.c" /* yacc.c:1646  */
+#line 35785 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 693:
-#line 4858 "preproc.y" /* yacc.c:1646  */
+#line 4854 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(13,mm_strdup("create trigger"),(yyvsp[-12].str),(yyvsp[-11].str),(yyvsp[-10].str),mm_strdup("on"),(yyvsp[-8].str),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("execute procedure"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("update");
 }
-#line 35755 "preproc.c" /* yacc.c:1646  */
+#line 35793 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 694:
-#line 4862 "preproc.y" /* yacc.c:1646  */
+#line 4858 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(15,mm_strdup("create constraint trigger"),(yyvsp[-16].str),mm_strdup("after"),(yyvsp[-14].str),mm_strdup("on"),(yyvsp[-12].str),(yyvsp[-11].str),(yyvsp[-10].str),mm_strdup("for each row"),(yyvsp[-6].str),mm_strdup("execute procedure"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("delete");
 }
-#line 35763 "preproc.c" /* yacc.c:1646  */
+#line 35801 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 695:
-#line 4870 "preproc.y" /* yacc.c:1646  */
+#line 4866 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("before");
+ (yyval.str) = cat_str(13,mm_strdup("create trigger"),(yyvsp[-12].str),(yyvsp[-11].str),(yyvsp[-10].str),mm_strdup("on"),(yyvsp[-8].str),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("execute procedure"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 35771 "preproc.c" /* yacc.c:1646  */
+#line 35809 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 696:
-#line 4874 "preproc.y" /* yacc.c:1646  */
+#line 4870 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("after");
+ (yyval.str) = cat_str(15,mm_strdup("create constraint trigger"),(yyvsp[-16].str),mm_strdup("after"),(yyvsp[-14].str),mm_strdup("on"),(yyvsp[-12].str),(yyvsp[-11].str),(yyvsp[-10].str),mm_strdup("for each row"),(yyvsp[-6].str),mm_strdup("execute procedure"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 35779 "preproc.c" /* yacc.c:1646  */
+#line 35817 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 697:
 #line 4878 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("instead of");
+ (yyval.str) = mm_strdup("before");
 }
-#line 35787 "preproc.c" /* yacc.c:1646  */
+#line 35825 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 698:
-#line 4886 "preproc.y" /* yacc.c:1646  */
+#line 4882 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("after");
 }
-#line 35795 "preproc.c" /* yacc.c:1646  */
+#line 35833 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 699:
-#line 4890 "preproc.y" /* yacc.c:1646  */
+#line 4886 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("or"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("instead of");
 }
-#line 35803 "preproc.c" /* yacc.c:1646  */
+#line 35841 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 700:
-#line 4898 "preproc.y" /* yacc.c:1646  */
+#line 4894 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("insert");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 35811 "preproc.c" /* yacc.c:1646  */
+#line 35849 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 701:
-#line 4902 "preproc.y" /* yacc.c:1646  */
+#line 4898 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("delete");
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("or"),(yyvsp[0].str));
 }
-#line 35819 "preproc.c" /* yacc.c:1646  */
+#line 35857 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 702:
 #line 4906 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("update");
+ (yyval.str) = mm_strdup("insert");
 }
-#line 35827 "preproc.c" /* yacc.c:1646  */
+#line 35865 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 703:
 #line 4910 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("update of"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("delete");
 }
-#line 35835 "preproc.c" /* yacc.c:1646  */
+#line 35873 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 704:
 #line 4914 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("truncate");
+ (yyval.str) = mm_strdup("update");
 }
-#line 35843 "preproc.c" /* yacc.c:1646  */
+#line 35881 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 705:
-#line 4922 "preproc.y" /* yacc.c:1646  */
+#line 4918 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("for"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("update of"),(yyvsp[0].str));
 }
-#line 35851 "preproc.c" /* yacc.c:1646  */
+#line 35889 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 706:
-#line 4926 "preproc.y" /* yacc.c:1646  */
+#line 4922 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35858 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("truncate");
+}
+#line 35897 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 707:
-#line 4933 "preproc.y" /* yacc.c:1646  */
+#line 4930 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("each");
+ (yyval.str) = cat_str(3,mm_strdup("for"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 35866 "preproc.c" /* yacc.c:1646  */
+#line 35905 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 708:
-#line 4937 "preproc.y" /* yacc.c:1646  */
+#line 4934 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 35873 "preproc.c" /* yacc.c:1646  */
+#line 35912 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 709:
-#line 4944 "preproc.y" /* yacc.c:1646  */
+#line 4941 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("row");
+ (yyval.str) = mm_strdup("each");
 }
-#line 35881 "preproc.c" /* yacc.c:1646  */
+#line 35920 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 710:
-#line 4948 "preproc.y" /* yacc.c:1646  */
+#line 4945 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("statement");
-}
-#line 35889 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 35927 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 711:
-#line 4956 "preproc.y" /* yacc.c:1646  */
+#line 4952 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("when ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("row");
 }
-#line 35897 "preproc.c" /* yacc.c:1646  */
+#line 35935 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 712:
-#line 4960 "preproc.y" /* yacc.c:1646  */
+#line 4956 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35904 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("statement");
+}
+#line 35943 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 713:
-#line 4967 "preproc.y" /* yacc.c:1646  */
+#line 4964 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("when ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 35912 "preproc.c" /* yacc.c:1646  */
+#line 35951 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 714:
-#line 4971 "preproc.y" /* yacc.c:1646  */
+#line 4968 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
-}
-#line 35920 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 35958 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 715:
 #line 4975 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35927 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 35966 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 716:
-#line 4982 "preproc.y" /* yacc.c:1646  */
+#line 4979 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 35935 "preproc.c" /* yacc.c:1646  */
+#line 35974 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 717:
-#line 4986 "preproc.y" /* yacc.c:1646  */
+#line 4983 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 35943 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 35981 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 718:
@@ -35947,7 +35985,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 35951 "preproc.c" /* yacc.c:1646  */
+#line 35989 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 719:
@@ -35955,383 +35993,383 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 35959 "preproc.c" /* yacc.c:1646  */
+#line 35997 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 720:
-#line 5002 "preproc.y" /* yacc.c:1646  */
+#line 4998 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 35967 "preproc.c" /* yacc.c:1646  */
+#line 36005 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 721:
-#line 5006 "preproc.y" /* yacc.c:1646  */
+#line 5002 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35974 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 36013 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 722:
-#line 5013 "preproc.y" /* yacc.c:1646  */
+#line 5010 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 35981 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
+}
+#line 36021 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 723:
-#line 5016 "preproc.y" /* yacc.c:1646  */
+#line 5014 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 35989 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 36028 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 724:
-#line 5024 "preproc.y" /* yacc.c:1646  */
+#line 5021 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("not deferrable");
-}
-#line 35997 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 36035 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 725:
-#line 5028 "preproc.y" /* yacc.c:1646  */
+#line 5024 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("deferrable");
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36005 "preproc.c" /* yacc.c:1646  */
+#line 36043 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 726:
 #line 5032 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("initially immediate");
+ (yyval.str) = mm_strdup("not deferrable");
 }
-#line 36013 "preproc.c" /* yacc.c:1646  */
+#line 36051 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 727:
 #line 5036 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("initially deferred");
+ (yyval.str) = mm_strdup("deferrable");
 }
-#line 36021 "preproc.c" /* yacc.c:1646  */
+#line 36059 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 728:
 #line 5040 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("not valid");
+ (yyval.str) = mm_strdup("initially immediate");
 }
-#line 36029 "preproc.c" /* yacc.c:1646  */
+#line 36067 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 729:
 #line 5044 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("no inherit");
+ (yyval.str) = mm_strdup("initially deferred");
 }
-#line 36037 "preproc.c" /* yacc.c:1646  */
+#line 36075 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 730:
-#line 5052 "preproc.y" /* yacc.c:1646  */
+#line 5048 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop trigger"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("not valid");
 }
-#line 36045 "preproc.c" /* yacc.c:1646  */
+#line 36083 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 731:
-#line 5056 "preproc.y" /* yacc.c:1646  */
+#line 5052 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop trigger if exists"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("no inherit");
 }
-#line 36053 "preproc.c" /* yacc.c:1646  */
+#line 36091 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 732:
-#line 5064 "preproc.y" /* yacc.c:1646  */
+#line 5060 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("create event trigger"),(yyvsp[-7].str),mm_strdup("on"),(yyvsp[-5].str),mm_strdup("execute procedure"),(yyvsp[-2].str),mm_strdup("( )"));
+ (yyval.str) = cat_str(5,mm_strdup("drop trigger"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36061 "preproc.c" /* yacc.c:1646  */
+#line 36099 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 733:
-#line 5068 "preproc.y" /* yacc.c:1646  */
+#line 5064 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(9,mm_strdup("create event trigger"),(yyvsp[-9].str),mm_strdup("on"),(yyvsp[-7].str),mm_strdup("when"),(yyvsp[-5].str),mm_strdup("execute procedure"),(yyvsp[-2].str),mm_strdup("( )"));
+ (yyval.str) = cat_str(5,mm_strdup("drop trigger if exists"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36069 "preproc.c" /* yacc.c:1646  */
+#line 36107 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 734:
-#line 5076 "preproc.y" /* yacc.c:1646  */
+#line 5072 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(7,mm_strdup("create event trigger"),(yyvsp[-7].str),mm_strdup("on"),(yyvsp[-5].str),mm_strdup("execute procedure"),(yyvsp[-2].str),mm_strdup("( )"));
 }
-#line 36077 "preproc.c" /* yacc.c:1646  */
+#line 36115 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 735:
-#line 5080 "preproc.y" /* yacc.c:1646  */
+#line 5076 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
+ (yyval.str) = cat_str(9,mm_strdup("create event trigger"),(yyvsp[-9].str),mm_strdup("on"),(yyvsp[-7].str),mm_strdup("when"),(yyvsp[-5].str),mm_strdup("execute procedure"),(yyvsp[-2].str),mm_strdup("( )"));
 }
-#line 36085 "preproc.c" /* yacc.c:1646  */
+#line 36123 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 736:
-#line 5088 "preproc.y" /* yacc.c:1646  */
+#line 5084 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-4].str),mm_strdup("in ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 36093 "preproc.c" /* yacc.c:1646  */
+#line 36131 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 737:
-#line 5096 "preproc.y" /* yacc.c:1646  */
+#line 5088 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("sconst");
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 36101 "preproc.c" /* yacc.c:1646  */
+#line 36139 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 738:
-#line 5100 "preproc.y" /* yacc.c:1646  */
+#line 5096 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup(", sconst"));
+ (yyval.str) = cat_str(4,(yyvsp[-4].str),mm_strdup("in ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 36109 "preproc.c" /* yacc.c:1646  */
+#line 36147 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 739:
-#line 5108 "preproc.y" /* yacc.c:1646  */
+#line 5104 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter event trigger"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("sconst");
 }
-#line 36117 "preproc.c" /* yacc.c:1646  */
+#line 36155 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 740:
-#line 5116 "preproc.y" /* yacc.c:1646  */
+#line 5108 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("enable");
+ (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup(", sconst"));
 }
-#line 36125 "preproc.c" /* yacc.c:1646  */
+#line 36163 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 741:
-#line 5120 "preproc.y" /* yacc.c:1646  */
+#line 5116 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("enable replica");
+ (yyval.str) = cat_str(3,mm_strdup("alter event trigger"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36133 "preproc.c" /* yacc.c:1646  */
+#line 36171 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 742:
 #line 5124 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("enable always");
+ (yyval.str) = mm_strdup("enable");
 }
-#line 36141 "preproc.c" /* yacc.c:1646  */
+#line 36179 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 743:
 #line 5128 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("disable");
+ (yyval.str) = mm_strdup("enable replica");
 }
-#line 36149 "preproc.c" /* yacc.c:1646  */
+#line 36187 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 744:
-#line 5136 "preproc.y" /* yacc.c:1646  */
+#line 5132 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = cat_str(6,mm_strdup("create assertion"),(yyvsp[-5].str),mm_strdup("check ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("enable always");
 }
-#line 36158 "preproc.c" /* yacc.c:1646  */
+#line 36195 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 745:
-#line 5145 "preproc.y" /* yacc.c:1646  */
+#line 5136 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = cat_str(3,mm_strdup("drop assertion"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("disable");
 }
-#line 36167 "preproc.c" /* yacc.c:1646  */
+#line 36203 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 746:
-#line 5154 "preproc.y" /* yacc.c:1646  */
+#line 5144 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("create aggregate"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = cat_str(6,mm_strdup("create assertion"),(yyvsp[-5].str),mm_strdup("check ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 36175 "preproc.c" /* yacc.c:1646  */
+#line 36212 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 747:
-#line 5158 "preproc.y" /* yacc.c:1646  */
+#line 5153 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("create aggregate"),(yyvsp[-1].str),(yyvsp[0].str));
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = cat_str(3,mm_strdup("drop assertion"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36183 "preproc.c" /* yacc.c:1646  */
+#line 36221 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 748:
 #line 5162 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("create operator"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("create aggregate"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36191 "preproc.c" /* yacc.c:1646  */
+#line 36229 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 749:
 #line 5166 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("create type"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("create aggregate"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36199 "preproc.c" /* yacc.c:1646  */
+#line 36237 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 750:
 #line 5170 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("create type"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("create operator"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36207 "preproc.c" /* yacc.c:1646  */
+#line 36245 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 751:
 #line 5174 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("create type"),(yyvsp[-4].str),mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("create type"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36215 "preproc.c" /* yacc.c:1646  */
+#line 36253 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 752:
 #line 5178 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("create type"),(yyvsp[-5].str),mm_strdup("as enum ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(2,mm_strdup("create type"),(yyvsp[0].str));
 }
-#line 36223 "preproc.c" /* yacc.c:1646  */
+#line 36261 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 753:
 #line 5182 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("create type"),(yyvsp[-3].str),mm_strdup("as range"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("create type"),(yyvsp[-4].str),mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 36231 "preproc.c" /* yacc.c:1646  */
+#line 36269 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 754:
 #line 5186 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("create text search parser"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("create type"),(yyvsp[-5].str),mm_strdup("as enum ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 36239 "preproc.c" /* yacc.c:1646  */
+#line 36277 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 755:
 #line 5190 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("create text search dictionary"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("create type"),(yyvsp[-3].str),mm_strdup("as range"),(yyvsp[0].str));
 }
-#line 36247 "preproc.c" /* yacc.c:1646  */
+#line 36285 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 756:
 #line 5194 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("create text search template"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("create text search parser"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36255 "preproc.c" /* yacc.c:1646  */
+#line 36293 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 757:
 #line 5198 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("create text search configuration"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("create text search dictionary"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36263 "preproc.c" /* yacc.c:1646  */
+#line 36301 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 758:
 #line 5202 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("create collation"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("create text search template"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36271 "preproc.c" /* yacc.c:1646  */
+#line 36309 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 759:
 #line 5206 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("create collation"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("create text search configuration"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36279 "preproc.c" /* yacc.c:1646  */
+#line 36317 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 760:
-#line 5214 "preproc.y" /* yacc.c:1646  */
+#line 5210 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("create collation"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36287 "preproc.c" /* yacc.c:1646  */
+#line 36325 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 761:
-#line 5222 "preproc.y" /* yacc.c:1646  */
+#line 5214 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(4,mm_strdup("create collation"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 36295 "preproc.c" /* yacc.c:1646  */
+#line 36333 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 762:
-#line 5226 "preproc.y" /* yacc.c:1646  */
+#line 5222 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 36303 "preproc.c" /* yacc.c:1646  */
+#line 36341 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 763:
-#line 5234 "preproc.y" /* yacc.c:1646  */
+#line 5230 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 36311 "preproc.c" /* yacc.c:1646  */
+#line 36349 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 764:
-#line 5238 "preproc.y" /* yacc.c:1646  */
+#line 5234 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 36319 "preproc.c" /* yacc.c:1646  */
+#line 36357 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 765:
-#line 5246 "preproc.y" /* yacc.c:1646  */
+#line 5242 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 36327 "preproc.c" /* yacc.c:1646  */
+#line 36365 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 766:
-#line 5250 "preproc.y" /* yacc.c:1646  */
+#line 5246 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 36335 "preproc.c" /* yacc.c:1646  */
+#line 36373 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 767:
@@ -36339,7 +36377,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 36343 "preproc.c" /* yacc.c:1646  */
+#line 36381 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 768:
@@ -36347,7 +36385,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 36351 "preproc.c" /* yacc.c:1646  */
+#line 36389 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 769:
@@ -36355,1228 +36393,1244 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 36359 "preproc.c" /* yacc.c:1646  */
+#line 36397 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 770:
-#line 5270 "preproc.y" /* yacc.c:1646  */
+#line 5266 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 36367 "preproc.c" /* yacc.c:1646  */
+#line 36405 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 771:
-#line 5278 "preproc.y" /* yacc.c:1646  */
+#line 5270 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 36375 "preproc.c" /* yacc.c:1646  */
+#line 36413 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 772:
-#line 5282 "preproc.y" /* yacc.c:1646  */
+#line 5278 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 36383 "preproc.c" /* yacc.c:1646  */
+#line 36421 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 773:
-#line 5290 "preproc.y" /* yacc.c:1646  */
+#line 5286 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 36391 "preproc.c" /* yacc.c:1646  */
+#line 36429 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 774:
-#line 5298 "preproc.y" /* yacc.c:1646  */
+#line 5290 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 36399 "preproc.c" /* yacc.c:1646  */
+#line 36437 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 775:
-#line 5302 "preproc.y" /* yacc.c:1646  */
+#line 5298 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 36406 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
+}
+#line 36445 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 776:
-#line 5309 "preproc.y" /* yacc.c:1646  */
+#line 5306 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 36414 "preproc.c" /* yacc.c:1646  */
+#line 36453 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 777:
-#line 5313 "preproc.y" /* yacc.c:1646  */
+#line 5310 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
-}
-#line 36422 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 36460 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 778:
-#line 5321 "preproc.y" /* yacc.c:1646  */
+#line 5317 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter type"),(yyvsp[-4].str),mm_strdup("add value"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 36430 "preproc.c" /* yacc.c:1646  */
+#line 36468 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 779:
-#line 5325 "preproc.y" /* yacc.c:1646  */
+#line 5321 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter type"),(yyvsp[-6].str),mm_strdup("add value"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("before"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 36438 "preproc.c" /* yacc.c:1646  */
+#line 36476 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 780:
 #line 5329 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter type"),(yyvsp[-6].str),mm_strdup("add value"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("after"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter type"),(yyvsp[-4].str),mm_strdup("add value"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36446 "preproc.c" /* yacc.c:1646  */
+#line 36484 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 781:
-#line 5337 "preproc.y" /* yacc.c:1646  */
+#line 5333 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("if not exists");
+ (yyval.str) = cat_str(7,mm_strdup("alter type"),(yyvsp[-6].str),mm_strdup("add value"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("before"),(yyvsp[0].str));
 }
-#line 36454 "preproc.c" /* yacc.c:1646  */
+#line 36492 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 782:
-#line 5341 "preproc.y" /* yacc.c:1646  */
+#line 5337 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 36461 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(7,mm_strdup("alter type"),(yyvsp[-6].str),mm_strdup("add value"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("after"),(yyvsp[0].str));
+}
+#line 36500 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 783:
-#line 5348 "preproc.y" /* yacc.c:1646  */
+#line 5345 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(10,mm_strdup("create operator class"),(yyvsp[-9].str),(yyvsp[-8].str),mm_strdup("for type"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("if not exists");
 }
-#line 36469 "preproc.c" /* yacc.c:1646  */
+#line 36508 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 784:
-#line 5356 "preproc.y" /* yacc.c:1646  */
+#line 5349 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 36477 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 36515 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 785:
-#line 5360 "preproc.y" /* yacc.c:1646  */
+#line 5356 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(10,mm_strdup("create operator class"),(yyvsp[-9].str),(yyvsp[-8].str),mm_strdup("for type"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 36485 "preproc.c" /* yacc.c:1646  */
+#line 36523 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 786:
-#line 5368 "preproc.y" /* yacc.c:1646  */
+#line 5364 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("operator"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 36493 "preproc.c" /* yacc.c:1646  */
+#line 36531 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 787:
-#line 5372 "preproc.y" /* yacc.c:1646  */
+#line 5368 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("operator"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 36501 "preproc.c" /* yacc.c:1646  */
+#line 36539 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 788:
 #line 5376 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("function"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("operator"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36509 "preproc.c" /* yacc.c:1646  */
+#line 36547 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 789:
 #line 5380 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("function"),(yyvsp[-5].str),mm_strdup("("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("operator"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36517 "preproc.c" /* yacc.c:1646  */
+#line 36555 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 790:
 #line 5384 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("storage"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("function"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36525 "preproc.c" /* yacc.c:1646  */
+#line 36563 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 791:
-#line 5392 "preproc.y" /* yacc.c:1646  */
+#line 5388 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("default");
+ (yyval.str) = cat_str(7,mm_strdup("function"),(yyvsp[-5].str),mm_strdup("("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36533 "preproc.c" /* yacc.c:1646  */
+#line 36571 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 792:
-#line 5396 "preproc.y" /* yacc.c:1646  */
+#line 5392 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 36540 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("storage"),(yyvsp[0].str));
+}
+#line 36579 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 793:
-#line 5403 "preproc.y" /* yacc.c:1646  */
+#line 5400 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("family"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("default");
 }
-#line 36548 "preproc.c" /* yacc.c:1646  */
+#line 36587 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 794:
-#line 5407 "preproc.y" /* yacc.c:1646  */
+#line 5404 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 36555 "preproc.c" /* yacc.c:1646  */
+#line 36594 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 795:
-#line 5414 "preproc.y" /* yacc.c:1646  */
+#line 5411 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("for search");
+ (yyval.str) = cat_str(2,mm_strdup("family"),(yyvsp[0].str));
 }
-#line 36563 "preproc.c" /* yacc.c:1646  */
+#line 36602 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 796:
-#line 5418 "preproc.y" /* yacc.c:1646  */
+#line 5415 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("for order by"),(yyvsp[0].str));
-}
-#line 36571 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 36609 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 797:
 #line 5422 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 36578 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("for search");
+}
+#line 36617 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 798:
-#line 5429 "preproc.y" /* yacc.c:1646  */
+#line 5426 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = mm_strdup("recheck");
+ (yyval.str) = cat_str(2,mm_strdup("for order by"),(yyvsp[0].str));
 }
-#line 36587 "preproc.c" /* yacc.c:1646  */
+#line 36625 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 799:
-#line 5434 "preproc.y" /* yacc.c:1646  */
+#line 5430 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 36594 "preproc.c" /* yacc.c:1646  */
+#line 36632 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 800:
-#line 5441 "preproc.y" /* yacc.c:1646  */
+#line 5437 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("create operator family"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = mm_strdup("recheck");
 }
-#line 36602 "preproc.c" /* yacc.c:1646  */
+#line 36641 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 801:
-#line 5449 "preproc.y" /* yacc.c:1646  */
+#line 5442 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("add"),(yyvsp[0].str));
-}
-#line 36610 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 36648 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 802:
-#line 5453 "preproc.y" /* yacc.c:1646  */
+#line 5449 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("drop"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("create operator family"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
 }
-#line 36618 "preproc.c" /* yacc.c:1646  */
+#line 36656 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 803:
-#line 5461 "preproc.y" /* yacc.c:1646  */
+#line 5457 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("add"),(yyvsp[0].str));
 }
-#line 36626 "preproc.c" /* yacc.c:1646  */
+#line 36664 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 804:
-#line 5465 "preproc.y" /* yacc.c:1646  */
+#line 5461 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("drop"),(yyvsp[0].str));
 }
-#line 36634 "preproc.c" /* yacc.c:1646  */
+#line 36672 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 805:
-#line 5473 "preproc.y" /* yacc.c:1646  */
+#line 5469 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("operator"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 36642 "preproc.c" /* yacc.c:1646  */
+#line 36680 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 806:
-#line 5477 "preproc.y" /* yacc.c:1646  */
+#line 5473 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("function"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 36650 "preproc.c" /* yacc.c:1646  */
+#line 36688 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 807:
-#line 5485 "preproc.y" /* yacc.c:1646  */
+#line 5481 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop operator class"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("operator"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 36658 "preproc.c" /* yacc.c:1646  */
+#line 36696 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 808:
-#line 5489 "preproc.y" /* yacc.c:1646  */
+#line 5485 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop operator class if exists"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("function"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 36666 "preproc.c" /* yacc.c:1646  */
+#line 36704 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 809:
-#line 5497 "preproc.y" /* yacc.c:1646  */
+#line 5493 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop operator family"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("drop operator class"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36674 "preproc.c" /* yacc.c:1646  */
+#line 36712 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 810:
-#line 5501 "preproc.y" /* yacc.c:1646  */
+#line 5497 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop operator family if exists"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("drop operator class if exists"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36682 "preproc.c" /* yacc.c:1646  */
+#line 36720 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 811:
-#line 5509 "preproc.y" /* yacc.c:1646  */
+#line 5505 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop owned by"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("drop operator family"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36690 "preproc.c" /* yacc.c:1646  */
+#line 36728 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 812:
-#line 5517 "preproc.y" /* yacc.c:1646  */
+#line 5509 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("reassign owned by"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("drop operator family if exists"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36698 "preproc.c" /* yacc.c:1646  */
+#line 36736 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 813:
-#line 5525 "preproc.y" /* yacc.c:1646  */
+#line 5517 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[-4].str),mm_strdup("if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop owned by"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36706 "preproc.c" /* yacc.c:1646  */
+#line 36744 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 814:
-#line 5529 "preproc.y" /* yacc.c:1646  */
+#line 5525 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("drop"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("reassign owned by"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 36714 "preproc.c" /* yacc.c:1646  */
+#line 36752 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 815:
 #line 5533 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop type"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[-4].str),mm_strdup("if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36722 "preproc.c" /* yacc.c:1646  */
+#line 36760 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 816:
 #line 5537 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop type if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("drop"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36730 "preproc.c" /* yacc.c:1646  */
+#line 36768 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 817:
 #line 5541 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop domain"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop type"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36738 "preproc.c" /* yacc.c:1646  */
+#line 36776 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 818:
 #line 5545 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop domain if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop type if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36746 "preproc.c" /* yacc.c:1646  */
+#line 36784 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 819:
 #line 5549 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop index concurrently"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop domain"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36754 "preproc.c" /* yacc.c:1646  */
+#line 36792 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 820:
 #line 5553 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("drop index concurrently if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("drop domain if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36762 "preproc.c" /* yacc.c:1646  */
+#line 36800 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 821:
-#line 5561 "preproc.y" /* yacc.c:1646  */
+#line 5557 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("table");
+ (yyval.str) = cat_str(3,mm_strdup("drop index concurrently"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36770 "preproc.c" /* yacc.c:1646  */
+#line 36808 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 822:
-#line 5565 "preproc.y" /* yacc.c:1646  */
+#line 5561 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("sequence");
+ (yyval.str) = cat_str(3,mm_strdup("drop index concurrently if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36778 "preproc.c" /* yacc.c:1646  */
+#line 36816 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 823:
 #line 5569 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("view");
+ (yyval.str) = mm_strdup("table");
 }
-#line 36786 "preproc.c" /* yacc.c:1646  */
+#line 36824 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 824:
 #line 5573 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("materialized view");
+ (yyval.str) = mm_strdup("sequence");
 }
-#line 36794 "preproc.c" /* yacc.c:1646  */
+#line 36832 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 825:
 #line 5577 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("index");
+ (yyval.str) = mm_strdup("view");
 }
-#line 36802 "preproc.c" /* yacc.c:1646  */
+#line 36840 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 826:
 #line 5581 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("foreign table");
+ (yyval.str) = mm_strdup("materialized view");
 }
-#line 36810 "preproc.c" /* yacc.c:1646  */
+#line 36848 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 827:
 #line 5585 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("event trigger");
+ (yyval.str) = mm_strdup("index");
 }
-#line 36818 "preproc.c" /* yacc.c:1646  */
+#line 36856 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 828:
 #line 5589 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("collation");
+ (yyval.str) = mm_strdup("foreign table");
 }
-#line 36826 "preproc.c" /* yacc.c:1646  */
+#line 36864 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 829:
 #line 5593 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("conversion");
+ (yyval.str) = mm_strdup("event trigger");
 }
-#line 36834 "preproc.c" /* yacc.c:1646  */
+#line 36872 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 830:
 #line 5597 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("schema");
+ (yyval.str) = mm_strdup("collation");
 }
-#line 36842 "preproc.c" /* yacc.c:1646  */
+#line 36880 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 831:
 #line 5601 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("extension");
+ (yyval.str) = mm_strdup("conversion");
 }
-#line 36850 "preproc.c" /* yacc.c:1646  */
+#line 36888 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 832:
 #line 5605 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("text search parser");
+ (yyval.str) = mm_strdup("schema");
 }
-#line 36858 "preproc.c" /* yacc.c:1646  */
+#line 36896 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 833:
 #line 5609 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("text search dictionary");
+ (yyval.str) = mm_strdup("extension");
 }
-#line 36866 "preproc.c" /* yacc.c:1646  */
+#line 36904 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 834:
 #line 5613 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("text search template");
+ (yyval.str) = mm_strdup("text search parser");
 }
-#line 36874 "preproc.c" /* yacc.c:1646  */
+#line 36912 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 835:
 #line 5617 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("text search configuration");
+ (yyval.str) = mm_strdup("text search dictionary");
 }
-#line 36882 "preproc.c" /* yacc.c:1646  */
+#line 36920 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 836:
-#line 5625 "preproc.y" /* yacc.c:1646  */
+#line 5621 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("text search template");
 }
-#line 36890 "preproc.c" /* yacc.c:1646  */
+#line 36928 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 837:
-#line 5629 "preproc.y" /* yacc.c:1646  */
+#line 5625 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("text search configuration");
 }
-#line 36898 "preproc.c" /* yacc.c:1646  */
+#line 36936 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 838:
-#line 5637 "preproc.y" /* yacc.c:1646  */
+#line 5633 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 36906 "preproc.c" /* yacc.c:1646  */
+#line 36944 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 839:
-#line 5641 "preproc.y" /* yacc.c:1646  */
+#line 5637 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 36914 "preproc.c" /* yacc.c:1646  */
+#line 36952 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 840:
-#line 5649 "preproc.y" /* yacc.c:1646  */
+#line 5645 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("."),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 36922 "preproc.c" /* yacc.c:1646  */
+#line 36960 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 841:
-#line 5653 "preproc.y" /* yacc.c:1646  */
+#line 5649 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36930 "preproc.c" /* yacc.c:1646  */
+#line 36968 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 842:
-#line 5661 "preproc.y" /* yacc.c:1646  */
+#line 5657 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("."),(yyvsp[0].str));
 }
-#line 36938 "preproc.c" /* yacc.c:1646  */
+#line 36976 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 844:
-#line 5666 "preproc.y" /* yacc.c:1646  */
+  case 843:
+#line 5661 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("truncate"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
 }
-#line 36946 "preproc.c" /* yacc.c:1646  */
+#line 36984 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 845:
-#line 5674 "preproc.y" /* yacc.c:1646  */
+  case 844:
+#line 5669 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("continue identity");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 36954 "preproc.c" /* yacc.c:1646  */
+#line 36992 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 846:
-#line 5678 "preproc.y" /* yacc.c:1646  */
+#line 5674 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("restart identity");
+ (yyval.str) = cat_str(5,mm_strdup("truncate"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 36962 "preproc.c" /* yacc.c:1646  */
+#line 37000 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 847:
 #line 5682 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 36969 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("continue identity");
+}
+#line 37008 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 848:
-#line 5689 "preproc.y" /* yacc.c:1646  */
+#line 5686 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("comment on"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("restart identity");
 }
-#line 36977 "preproc.c" /* yacc.c:1646  */
+#line 37016 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 849:
-#line 5693 "preproc.y" /* yacc.c:1646  */
+#line 5690 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("comment on type"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
-}
-#line 36985 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 37023 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 850:
 #line 5697 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("comment on domain"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("comment on"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 36993 "preproc.c" /* yacc.c:1646  */
+#line 37031 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 851:
 #line 5701 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("comment on aggregate"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("comment on type"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37001 "preproc.c" /* yacc.c:1646  */
+#line 37039 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 852:
 #line 5705 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("comment on function"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("comment on domain"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37009 "preproc.c" /* yacc.c:1646  */
+#line 37047 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 853:
 #line 5709 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("comment on operator"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("comment on aggregate"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37017 "preproc.c" /* yacc.c:1646  */
+#line 37055 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 854:
 #line 5713 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("comment on constraint"),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("comment on function"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37025 "preproc.c" /* yacc.c:1646  */
+#line 37063 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 855:
 #line 5717 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("comment on constraint"),(yyvsp[-5].str),mm_strdup("on domain"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("comment on operator"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37033 "preproc.c" /* yacc.c:1646  */
+#line 37071 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 856:
 #line 5721 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("comment on policy"),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("comment on constraint"),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37041 "preproc.c" /* yacc.c:1646  */
+#line 37079 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 857:
 #line 5725 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("comment on rule"),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("comment on constraint"),(yyvsp[-5].str),mm_strdup("on domain"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37049 "preproc.c" /* yacc.c:1646  */
+#line 37087 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 858:
 #line 5729 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("comment on rule"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("comment on policy"),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37057 "preproc.c" /* yacc.c:1646  */
+#line 37095 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 859:
 #line 5733 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("comment on transform for"),(yyvsp[-4].str),mm_strdup("language"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("comment on rule"),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37065 "preproc.c" /* yacc.c:1646  */
+#line 37103 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 860:
 #line 5737 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("comment on trigger"),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("comment on rule"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37073 "preproc.c" /* yacc.c:1646  */
+#line 37111 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 861:
 #line 5741 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("comment on operator class"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("comment on transform for"),(yyvsp[-4].str),mm_strdup("language"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37081 "preproc.c" /* yacc.c:1646  */
+#line 37119 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 862:
 #line 5745 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("comment on operator family"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("comment on trigger"),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37089 "preproc.c" /* yacc.c:1646  */
+#line 37127 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 863:
 #line 5749 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("comment on large object"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("comment on operator class"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37097 "preproc.c" /* yacc.c:1646  */
+#line 37135 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 864:
 #line 5753 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("comment on cast ("),(yyvsp[-5].str),mm_strdup("as"),(yyvsp[-3].str),mm_strdup(") is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("comment on operator family"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37105 "preproc.c" /* yacc.c:1646  */
+#line 37143 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 865:
 #line 5757 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("comment on"),(yyvsp[-4].str),mm_strdup("language"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("comment on large object"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37113 "preproc.c" /* yacc.c:1646  */
+#line 37151 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 866:
-#line 5765 "preproc.y" /* yacc.c:1646  */
+#line 5761 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("column");
+ (yyval.str) = cat_str(6,mm_strdup("comment on cast ("),(yyvsp[-5].str),mm_strdup("as"),(yyvsp[-3].str),mm_strdup(") is"),(yyvsp[0].str));
 }
-#line 37121 "preproc.c" /* yacc.c:1646  */
+#line 37159 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 867:
-#line 5769 "preproc.y" /* yacc.c:1646  */
+#line 5765 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("database");
+ (yyval.str) = cat_str(6,mm_strdup("comment on"),(yyvsp[-4].str),mm_strdup("language"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37129 "preproc.c" /* yacc.c:1646  */
+#line 37167 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 868:
 #line 5773 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("schema");
+ (yyval.str) = mm_strdup("column");
 }
-#line 37137 "preproc.c" /* yacc.c:1646  */
+#line 37175 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 869:
 #line 5777 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("index");
+ (yyval.str) = mm_strdup("database");
 }
-#line 37145 "preproc.c" /* yacc.c:1646  */
+#line 37183 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 870:
 #line 5781 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("sequence");
+ (yyval.str) = mm_strdup("schema");
 }
-#line 37153 "preproc.c" /* yacc.c:1646  */
+#line 37191 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 871:
 #line 5785 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("table");
+ (yyval.str) = mm_strdup("index");
 }
-#line 37161 "preproc.c" /* yacc.c:1646  */
+#line 37199 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 872:
 #line 5789 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("view");
+ (yyval.str) = mm_strdup("sequence");
 }
-#line 37169 "preproc.c" /* yacc.c:1646  */
+#line 37207 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 873:
 #line 5793 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("materialized view");
+ (yyval.str) = mm_strdup("table");
 }
-#line 37177 "preproc.c" /* yacc.c:1646  */
+#line 37215 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 874:
 #line 5797 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("collation");
+ (yyval.str) = mm_strdup("view");
 }
-#line 37185 "preproc.c" /* yacc.c:1646  */
+#line 37223 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 875:
 #line 5801 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("conversion");
+ (yyval.str) = mm_strdup("materialized view");
 }
-#line 37193 "preproc.c" /* yacc.c:1646  */
+#line 37231 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 876:
 #line 5805 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("tablespace");
+ (yyval.str) = mm_strdup("collation");
 }
-#line 37201 "preproc.c" /* yacc.c:1646  */
+#line 37239 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 877:
 #line 5809 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("extension");
+ (yyval.str) = mm_strdup("conversion");
 }
-#line 37209 "preproc.c" /* yacc.c:1646  */
+#line 37247 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 878:
 #line 5813 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("role");
+ (yyval.str) = mm_strdup("tablespace");
 }
-#line 37217 "preproc.c" /* yacc.c:1646  */
+#line 37255 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 879:
 #line 5817 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("foreign table");
+ (yyval.str) = mm_strdup("extension");
 }
-#line 37225 "preproc.c" /* yacc.c:1646  */
+#line 37263 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 880:
 #line 5821 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("server");
+ (yyval.str) = mm_strdup("role");
 }
-#line 37233 "preproc.c" /* yacc.c:1646  */
+#line 37271 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 881:
 #line 5825 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("foreign data wrapper");
+ (yyval.str) = mm_strdup("foreign table");
 }
-#line 37241 "preproc.c" /* yacc.c:1646  */
+#line 37279 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 882:
 #line 5829 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("event trigger");
+ (yyval.str) = mm_strdup("server");
 }
-#line 37249 "preproc.c" /* yacc.c:1646  */
+#line 37287 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 883:
 #line 5833 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("text search configuration");
+ (yyval.str) = mm_strdup("foreign data wrapper");
 }
-#line 37257 "preproc.c" /* yacc.c:1646  */
+#line 37295 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 884:
 #line 5837 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("text search dictionary");
+ (yyval.str) = mm_strdup("event trigger");
 }
-#line 37265 "preproc.c" /* yacc.c:1646  */
+#line 37303 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 885:
 #line 5841 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("text search parser");
+ (yyval.str) = mm_strdup("text search configuration");
 }
-#line 37273 "preproc.c" /* yacc.c:1646  */
+#line 37311 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 886:
 #line 5845 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("text search template");
+ (yyval.str) = mm_strdup("text search dictionary");
 }
-#line 37281 "preproc.c" /* yacc.c:1646  */
+#line 37319 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 887:
-#line 5853 "preproc.y" /* yacc.c:1646  */
+#line 5849 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("text search parser");
 }
-#line 37289 "preproc.c" /* yacc.c:1646  */
+#line 37327 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 888:
-#line 5857 "preproc.y" /* yacc.c:1646  */
+#line 5853 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("null");
+ (yyval.str) = mm_strdup("text search template");
 }
-#line 37297 "preproc.c" /* yacc.c:1646  */
+#line 37335 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 889:
-#line 5865 "preproc.y" /* yacc.c:1646  */
+#line 5861 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 37305 "preproc.c" /* yacc.c:1646  */
+#line 37343 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 890:
-#line 5869 "preproc.y" /* yacc.c:1646  */
+#line 5865 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on type"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("null");
 }
-#line 37313 "preproc.c" /* yacc.c:1646  */
+#line 37351 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 891:
 #line 5873 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on domain"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37321 "preproc.c" /* yacc.c:1646  */
+#line 37359 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 892:
 #line 5877 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[-6].str),mm_strdup("on aggregate"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on type"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37329 "preproc.c" /* yacc.c:1646  */
+#line 37367 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 893:
 #line 5881 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[-6].str),mm_strdup("on function"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on domain"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37337 "preproc.c" /* yacc.c:1646  */
+#line 37375 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 894:
 #line 5885 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-6].str),mm_strdup("on large object"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[-6].str),mm_strdup("on aggregate"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37345 "preproc.c" /* yacc.c:1646  */
+#line 37383 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 895:
 #line 5889 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(8,mm_strdup("security label"),(yyvsp[-6].str),mm_strdup("on"),(yyvsp[-4].str),mm_strdup("language"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[-6].str),mm_strdup("on function"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37353 "preproc.c" /* yacc.c:1646  */
+#line 37391 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 896:
-#line 5897 "preproc.y" /* yacc.c:1646  */
+#line 5893 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("for"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-6].str),mm_strdup("on large object"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 37361 "preproc.c" /* yacc.c:1646  */
+#line 37399 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 897:
-#line 5901 "preproc.y" /* yacc.c:1646  */
+#line 5897 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 37368 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(8,mm_strdup("security label"),(yyvsp[-6].str),mm_strdup("on"),(yyvsp[-4].str),mm_strdup("language"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
+}
+#line 37407 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 898:
-#line 5908 "preproc.y" /* yacc.c:1646  */
+#line 5905 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("column");
+ (yyval.str) = cat_str(2,mm_strdup("for"),(yyvsp[0].str));
 }
-#line 37376 "preproc.c" /* yacc.c:1646  */
+#line 37415 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 899:
-#line 5912 "preproc.y" /* yacc.c:1646  */
+#line 5909 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("database");
-}
-#line 37384 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 37422 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 900:
 #line 5916 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("event trigger");
+ (yyval.str) = mm_strdup("column");
 }
-#line 37392 "preproc.c" /* yacc.c:1646  */
+#line 37430 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 901:
 #line 5920 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("foreign table");
+ (yyval.str) = mm_strdup("database");
 }
-#line 37400 "preproc.c" /* yacc.c:1646  */
+#line 37438 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 902:
 #line 5924 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("schema");
+ (yyval.str) = mm_strdup("event trigger");
 }
-#line 37408 "preproc.c" /* yacc.c:1646  */
+#line 37446 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 903:
 #line 5928 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("sequence");
+ (yyval.str) = mm_strdup("foreign table");
 }
-#line 37416 "preproc.c" /* yacc.c:1646  */
+#line 37454 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 904:
 #line 5932 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("table");
+ (yyval.str) = mm_strdup("schema");
 }
-#line 37424 "preproc.c" /* yacc.c:1646  */
+#line 37462 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 905:
 #line 5936 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("role");
+ (yyval.str) = mm_strdup("sequence");
 }
-#line 37432 "preproc.c" /* yacc.c:1646  */
+#line 37470 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 906:
 #line 5940 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("tablespace");
+ (yyval.str) = mm_strdup("table");
 }
-#line 37440 "preproc.c" /* yacc.c:1646  */
+#line 37478 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 907:
 #line 5944 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("view");
+ (yyval.str) = mm_strdup("role");
 }
-#line 37448 "preproc.c" /* yacc.c:1646  */
+#line 37486 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 908:
 #line 5948 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("materialized view");
+ (yyval.str) = mm_strdup("tablespace");
 }
-#line 37456 "preproc.c" /* yacc.c:1646  */
+#line 37494 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 909:
-#line 5956 "preproc.y" /* yacc.c:1646  */
+#line 5952 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("view");
 }
-#line 37464 "preproc.c" /* yacc.c:1646  */
+#line 37502 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 910:
-#line 5960 "preproc.y" /* yacc.c:1646  */
+#line 5956 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("null");
+ (yyval.str) = mm_strdup("materialized view");
 }
-#line 37472 "preproc.c" /* yacc.c:1646  */
+#line 37510 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 911:
-#line 5968 "preproc.y" /* yacc.c:1646  */
+#line 5964 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("fetch"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 37480 "preproc.c" /* yacc.c:1646  */
+#line 37518 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 912:
-#line 5972 "preproc.y" /* yacc.c:1646  */
+#line 5968 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("move"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("null");
 }
-#line 37488 "preproc.c" /* yacc.c:1646  */
+#line 37526 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 913:
 #line 5976 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = cat_str(2,mm_strdup("fetch"),(yyvsp[0].str));
+}
+#line 37534 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 914:
+#line 5980 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = cat_str(2,mm_strdup("move"),(yyvsp[0].str));
+}
+#line 37542 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 915:
+#line 5984 "preproc.y" /* yacc.c:1646  */
     {
 		(yyval.str) = cat2_str(mm_strdup("fetch"), (yyvsp[-1].str));
 	}
-#line 37496 "preproc.c" /* yacc.c:1646  */
+#line 37550 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 914:
-#line 5980 "preproc.y" /* yacc.c:1646  */
+  case 916:
+#line 5988 "preproc.y" /* yacc.c:1646  */
     {
 		char *cursor_marker = (yyvsp[-1].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[-1].str);
 		add_additional_variables((yyvsp[-1].str), false);
 		(yyval.str) = cat_str(2, mm_strdup("fetch forward"), cursor_marker);
 	}
-#line 37506 "preproc.c" /* yacc.c:1646  */
+#line 37560 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 915:
-#line 5986 "preproc.y" /* yacc.c:1646  */
+  case 917:
+#line 5994 "preproc.y" /* yacc.c:1646  */
     {
 		char *cursor_marker = (yyvsp[-1].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[-1].str);
 		add_additional_variables((yyvsp[-1].str), false);
 		(yyval.str) = cat_str(2, mm_strdup("fetch forward from"), cursor_marker);
 	}
-#line 37516 "preproc.c" /* yacc.c:1646  */
+#line 37570 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 916:
-#line 5992 "preproc.y" /* yacc.c:1646  */
+  case 918:
+#line 6000 "preproc.y" /* yacc.c:1646  */
     {
 		char *cursor_marker = (yyvsp[-1].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[-1].str);
 		add_additional_variables((yyvsp[-1].str), false);
 		(yyval.str) = cat_str(2, mm_strdup("fetch backward"), cursor_marker);
 	}
-#line 37526 "preproc.c" /* yacc.c:1646  */
+#line 37580 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 917:
-#line 5998 "preproc.y" /* yacc.c:1646  */
+  case 919:
+#line 6006 "preproc.y" /* yacc.c:1646  */
     {
 		char *cursor_marker = (yyvsp[-1].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[-1].str);
 		add_additional_variables((yyvsp[-1].str), false);
 		(yyval.str) = cat_str(2, mm_strdup("fetch backward from"), cursor_marker);
 	}
-#line 37536 "preproc.c" /* yacc.c:1646  */
+#line 37590 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 918:
-#line 6004 "preproc.y" /* yacc.c:1646  */
+  case 920:
+#line 6012 "preproc.y" /* yacc.c:1646  */
     {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		add_additional_variables((yyvsp[0].str), false);
 		(yyval.str) = cat_str(2, mm_strdup("move forward"), cursor_marker);
 	}
-#line 37546 "preproc.c" /* yacc.c:1646  */
+#line 37600 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 919:
-#line 6010 "preproc.y" /* yacc.c:1646  */
+  case 921:
+#line 6018 "preproc.y" /* yacc.c:1646  */
     {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		add_additional_variables((yyvsp[0].str), false);
 		(yyval.str) = cat_str(2, mm_strdup("move forward from"), cursor_marker);
 	}
-#line 37556 "preproc.c" /* yacc.c:1646  */
+#line 37610 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 920:
-#line 6016 "preproc.y" /* yacc.c:1646  */
+  case 922:
+#line 6024 "preproc.y" /* yacc.c:1646  */
     {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		add_additional_variables((yyvsp[0].str), false);
 		(yyval.str) = cat_str(2, mm_strdup("move backward"), cursor_marker);
 	}
-#line 37566 "preproc.c" /* yacc.c:1646  */
+#line 37620 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 921:
-#line 6022 "preproc.y" /* yacc.c:1646  */
+  case 923:
+#line 6030 "preproc.y" /* yacc.c:1646  */
     {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		add_additional_variables((yyvsp[0].str), false);
 		(yyval.str) = cat_str(2, mm_strdup("move backward from"), cursor_marker);
 	}
-#line 37576 "preproc.c" /* yacc.c:1646  */
+#line 37630 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 922:
-#line 6032 "preproc.y" /* yacc.c:1646  */
+  case 924:
+#line 6040 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37587,11 +37641,11 @@
 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 37591 "preproc.c" /* yacc.c:1646  */
+#line 37645 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 923:
-#line 6043 "preproc.y" /* yacc.c:1646  */
+  case 925:
+#line 6051 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37602,11 +37656,11 @@
 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37606 "preproc.c" /* yacc.c:1646  */
+#line 37660 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 924:
-#line 6054 "preproc.y" /* yacc.c:1646  */
+  case 926:
+#line 6062 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37617,11 +37671,11 @@
 
  (yyval.str) = cat_str(3,mm_strdup("next"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37621 "preproc.c" /* yacc.c:1646  */
+#line 37675 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 925:
-#line 6065 "preproc.y" /* yacc.c:1646  */
+  case 927:
+#line 6073 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37632,11 +37686,11 @@
 
  (yyval.str) = cat_str(3,mm_strdup("prior"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37636 "preproc.c" /* yacc.c:1646  */
+#line 37690 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 926:
-#line 6076 "preproc.y" /* yacc.c:1646  */
+  case 928:
+#line 6084 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37647,11 +37701,11 @@
 
  (yyval.str) = cat_str(3,mm_strdup("first"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37651 "preproc.c" /* yacc.c:1646  */
+#line 37705 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 927:
-#line 6087 "preproc.y" /* yacc.c:1646  */
+  case 929:
+#line 6095 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37662,11 +37716,11 @@
 
  (yyval.str) = cat_str(3,mm_strdup("last"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37666 "preproc.c" /* yacc.c:1646  */
+#line 37720 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 928:
-#line 6098 "preproc.y" /* yacc.c:1646  */
+  case 930:
+#line 6106 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37682,11 +37736,11 @@
 
  (yyval.str) = cat_str(4,mm_strdup("absolute"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37686 "preproc.c" /* yacc.c:1646  */
+#line 37740 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 929:
-#line 6114 "preproc.y" /* yacc.c:1646  */
+  case 931:
+#line 6122 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37702,11 +37756,11 @@
 
  (yyval.str) = cat_str(4,mm_strdup("relative"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37706 "preproc.c" /* yacc.c:1646  */
+#line 37760 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 930:
-#line 6130 "preproc.y" /* yacc.c:1646  */
+  case 932:
+#line 6138 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37722,11 +37776,11 @@
 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37726 "preproc.c" /* yacc.c:1646  */
+#line 37780 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 931:
-#line 6146 "preproc.y" /* yacc.c:1646  */
+  case 933:
+#line 6154 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37737,11 +37791,11 @@
 
  (yyval.str) = cat_str(3,mm_strdup("all"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37741 "preproc.c" /* yacc.c:1646  */
+#line 37795 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 932:
-#line 6157 "preproc.y" /* yacc.c:1646  */
+  case 934:
+#line 6165 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37757,11 +37811,11 @@
 
  (yyval.str) = cat_str(4,mm_strdup("forward"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37761 "preproc.c" /* yacc.c:1646  */
+#line 37815 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 933:
-#line 6173 "preproc.y" /* yacc.c:1646  */
+  case 935:
+#line 6181 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37772,11 +37826,11 @@
 
  (yyval.str) = cat_str(3,mm_strdup("forward all"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37776 "preproc.c" /* yacc.c:1646  */
+#line 37830 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 934:
-#line 6184 "preproc.y" /* yacc.c:1646  */
+  case 936:
+#line 6192 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37792,11 +37846,11 @@
 
  (yyval.str) = cat_str(4,mm_strdup("backward"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37796 "preproc.c" /* yacc.c:1646  */
+#line 37850 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 935:
-#line 6200 "preproc.y" /* yacc.c:1646  */
+  case 937:
+#line 6208 "preproc.y" /* yacc.c:1646  */
     { 
 		add_additional_variables((yyvsp[0].str), false);
 		if ((yyvsp[0].str)[0] == ':')
@@ -37807,2484 +37861,2468 @@
 
  (yyval.str) = cat_str(3,mm_strdup("backward all"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37811 "preproc.c" /* yacc.c:1646  */
+#line 37865 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 936:
-#line 6215 "preproc.y" /* yacc.c:1646  */
+  case 938:
+#line 6223 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = mm_strdup("from");
 }
-#line 37819 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 937:
-#line 6219 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = mm_strdup("in");
-}
-#line 37827 "preproc.c" /* yacc.c:1646  */
+#line 37873 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 938:
+  case 939:
 #line 6227 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("in");
 }
-#line 37835 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 939:
-#line 6231 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str)=EMPTY; }
-#line 37842 "preproc.c" /* yacc.c:1646  */
+#line 37881 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 940:
-#line 6238 "preproc.y" /* yacc.c:1646  */
+#line 6235 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("grant"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("to"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 37850 "preproc.c" /* yacc.c:1646  */
+#line 37889 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 941:
-#line 6246 "preproc.y" /* yacc.c:1646  */
+#line 6239 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("revoke"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("from"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 37858 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 37896 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 942:
-#line 6250 "preproc.y" /* yacc.c:1646  */
+#line 6246 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("revoke grant option for"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("from"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("grant"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("to"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37866 "preproc.c" /* yacc.c:1646  */
+#line 37904 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 943:
-#line 6258 "preproc.y" /* yacc.c:1646  */
+#line 6254 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(7,mm_strdup("revoke"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("from"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37874 "preproc.c" /* yacc.c:1646  */
+#line 37912 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 944:
-#line 6262 "preproc.y" /* yacc.c:1646  */
+#line 6258 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all");
+ (yyval.str) = cat_str(7,mm_strdup("revoke grant option for"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("from"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37882 "preproc.c" /* yacc.c:1646  */
+#line 37920 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 945:
 #line 6266 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all privileges");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 37890 "preproc.c" /* yacc.c:1646  */
+#line 37928 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 946:
 #line 6270 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("all ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("all");
 }
-#line 37898 "preproc.c" /* yacc.c:1646  */
+#line 37936 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 947:
 #line 6274 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("all privileges ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("all privileges");
 }
-#line 37906 "preproc.c" /* yacc.c:1646  */
+#line 37944 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 948:
-#line 6282 "preproc.y" /* yacc.c:1646  */
+#line 6278 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("all ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 37914 "preproc.c" /* yacc.c:1646  */
+#line 37952 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 949:
-#line 6286 "preproc.y" /* yacc.c:1646  */
+#line 6282 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("all privileges ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 37922 "preproc.c" /* yacc.c:1646  */
+#line 37960 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 950:
-#line 6294 "preproc.y" /* yacc.c:1646  */
+#line 6290 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("select"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 37930 "preproc.c" /* yacc.c:1646  */
+#line 37968 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 951:
-#line 6298 "preproc.y" /* yacc.c:1646  */
+#line 6294 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("references"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 37938 "preproc.c" /* yacc.c:1646  */
+#line 37976 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 952:
 #line 6302 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("create"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("select"),(yyvsp[0].str));
 }
-#line 37946 "preproc.c" /* yacc.c:1646  */
+#line 37984 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 953:
 #line 6306 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("references"),(yyvsp[0].str));
 }
-#line 37954 "preproc.c" /* yacc.c:1646  */
+#line 37992 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 954:
-#line 6314 "preproc.y" /* yacc.c:1646  */
+#line 6310 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("create"),(yyvsp[0].str));
 }
-#line 37962 "preproc.c" /* yacc.c:1646  */
+#line 38000 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 955:
-#line 6318 "preproc.y" /* yacc.c:1646  */
+#line 6314 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 37970 "preproc.c" /* yacc.c:1646  */
+#line 38008 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 956:
 #line 6322 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("sequence"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 37978 "preproc.c" /* yacc.c:1646  */
+#line 38016 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 957:
 #line 6326 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("foreign data wrapper"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[0].str));
 }
-#line 37986 "preproc.c" /* yacc.c:1646  */
+#line 38024 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 958:
 #line 6330 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("foreign server"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("sequence"),(yyvsp[0].str));
 }
-#line 37994 "preproc.c" /* yacc.c:1646  */
+#line 38032 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 959:
 #line 6334 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("function"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("foreign data wrapper"),(yyvsp[0].str));
 }
-#line 38002 "preproc.c" /* yacc.c:1646  */
+#line 38040 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 960:
 #line 6338 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("database"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("foreign server"),(yyvsp[0].str));
 }
-#line 38010 "preproc.c" /* yacc.c:1646  */
+#line 38048 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 961:
 #line 6342 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("domain"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("function"),(yyvsp[0].str));
 }
-#line 38018 "preproc.c" /* yacc.c:1646  */
+#line 38056 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 962:
 #line 6346 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("database"),(yyvsp[0].str));
 }
-#line 38026 "preproc.c" /* yacc.c:1646  */
+#line 38064 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 963:
 #line 6350 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("large object"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("domain"),(yyvsp[0].str));
 }
-#line 38034 "preproc.c" /* yacc.c:1646  */
+#line 38072 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 964:
 #line 6354 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[0].str));
 }
-#line 38042 "preproc.c" /* yacc.c:1646  */
+#line 38080 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 965:
 #line 6358 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("tablespace"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("large object"),(yyvsp[0].str));
 }
-#line 38050 "preproc.c" /* yacc.c:1646  */
+#line 38088 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 966:
 #line 6362 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("type"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[0].str));
 }
-#line 38058 "preproc.c" /* yacc.c:1646  */
+#line 38096 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 967:
 #line 6366 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("all tables in schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("tablespace"),(yyvsp[0].str));
 }
-#line 38066 "preproc.c" /* yacc.c:1646  */
+#line 38104 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 968:
 #line 6370 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("all sequences in schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("type"),(yyvsp[0].str));
 }
-#line 38074 "preproc.c" /* yacc.c:1646  */
+#line 38112 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 969:
 #line 6374 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("all functions in schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("all tables in schema"),(yyvsp[0].str));
 }
-#line 38082 "preproc.c" /* yacc.c:1646  */
+#line 38120 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 970:
-#line 6382 "preproc.y" /* yacc.c:1646  */
+#line 6378 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("all sequences in schema"),(yyvsp[0].str));
 }
-#line 38090 "preproc.c" /* yacc.c:1646  */
+#line 38128 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 971:
-#line 6386 "preproc.y" /* yacc.c:1646  */
+#line 6382 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("all functions in schema"),(yyvsp[0].str));
 }
-#line 38098 "preproc.c" /* yacc.c:1646  */
+#line 38136 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 972:
-#line 6394 "preproc.y" /* yacc.c:1646  */
+#line 6390 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 38106 "preproc.c" /* yacc.c:1646  */
+#line 38144 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 973:
-#line 6398 "preproc.y" /* yacc.c:1646  */
+#line 6394 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("group"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 38114 "preproc.c" /* yacc.c:1646  */
+#line 38152 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 974:
-#line 6406 "preproc.y" /* yacc.c:1646  */
+#line 6402 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with grant option");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38122 "preproc.c" /* yacc.c:1646  */
+#line 38160 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 975:
-#line 6410 "preproc.y" /* yacc.c:1646  */
+#line 6406 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 38129 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("group"),(yyvsp[0].str));
+}
+#line 38168 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 976:
-#line 6417 "preproc.y" /* yacc.c:1646  */
+#line 6414 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("with grant option");
 }
-#line 38137 "preproc.c" /* yacc.c:1646  */
+#line 38176 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 977:
-#line 6421 "preproc.y" /* yacc.c:1646  */
+#line 6418 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
-}
-#line 38145 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 38183 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 978:
-#line 6429 "preproc.y" /* yacc.c:1646  */
+#line 6425 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38153 "preproc.c" /* yacc.c:1646  */
+#line 38191 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 979:
-#line 6437 "preproc.y" /* yacc.c:1646  */
+#line 6429 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("grant"),(yyvsp[-4].str),mm_strdup("to"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 38161 "preproc.c" /* yacc.c:1646  */
+#line 38199 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 980:
-#line 6445 "preproc.y" /* yacc.c:1646  */
+#line 6437 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("revoke"),(yyvsp[-4].str),mm_strdup("from"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38169 "preproc.c" /* yacc.c:1646  */
+#line 38207 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 981:
-#line 6449 "preproc.y" /* yacc.c:1646  */
+#line 6445 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("revoke admin option for"),(yyvsp[-4].str),mm_strdup("from"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("grant"),(yyvsp[-4].str),mm_strdup("to"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38177 "preproc.c" /* yacc.c:1646  */
+#line 38215 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 982:
-#line 6457 "preproc.y" /* yacc.c:1646  */
+#line 6453 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with admin option");
+ (yyval.str) = cat_str(6,mm_strdup("revoke"),(yyvsp[-4].str),mm_strdup("from"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38185 "preproc.c" /* yacc.c:1646  */
+#line 38223 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 983:
-#line 6461 "preproc.y" /* yacc.c:1646  */
+#line 6457 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 38192 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(6,mm_strdup("revoke admin option for"),(yyvsp[-4].str),mm_strdup("from"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 38231 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 984:
-#line 6468 "preproc.y" /* yacc.c:1646  */
+#line 6465 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("granted by"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("with admin option");
 }
-#line 38200 "preproc.c" /* yacc.c:1646  */
+#line 38239 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 985:
-#line 6472 "preproc.y" /* yacc.c:1646  */
+#line 6469 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 38207 "preproc.c" /* yacc.c:1646  */
+#line 38246 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 986:
-#line 6479 "preproc.y" /* yacc.c:1646  */
+#line 6476 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter default privileges"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("granted by"),(yyvsp[0].str));
 }
-#line 38215 "preproc.c" /* yacc.c:1646  */
+#line 38254 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 987:
-#line 6487 "preproc.y" /* yacc.c:1646  */
+#line 6480 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 38223 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 38261 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 988:
-#line 6491 "preproc.y" /* yacc.c:1646  */
+#line 6487 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 38230 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("alter default privileges"),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 38269 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 989:
-#line 6498 "preproc.y" /* yacc.c:1646  */
+#line 6495 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("in schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38238 "preproc.c" /* yacc.c:1646  */
+#line 38277 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 990:
-#line 6502 "preproc.y" /* yacc.c:1646  */
+#line 6499 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("for role"),(yyvsp[0].str));
-}
-#line 38246 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 38284 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 991:
 #line 6506 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("for user"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("in schema"),(yyvsp[0].str));
 }
-#line 38254 "preproc.c" /* yacc.c:1646  */
+#line 38292 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 992:
-#line 6514 "preproc.y" /* yacc.c:1646  */
+#line 6510 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("grant"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("to"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("for role"),(yyvsp[0].str));
 }
-#line 38262 "preproc.c" /* yacc.c:1646  */
+#line 38300 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 993:
-#line 6518 "preproc.y" /* yacc.c:1646  */
+#line 6514 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("revoke"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("from"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("for user"),(yyvsp[0].str));
 }
-#line 38270 "preproc.c" /* yacc.c:1646  */
+#line 38308 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 994:
 #line 6522 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("revoke grant option for"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("from"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("grant"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("to"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38278 "preproc.c" /* yacc.c:1646  */
+#line 38316 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 995:
-#line 6530 "preproc.y" /* yacc.c:1646  */
+#line 6526 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("tables");
+ (yyval.str) = cat_str(7,mm_strdup("revoke"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("from"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38286 "preproc.c" /* yacc.c:1646  */
+#line 38324 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 996:
-#line 6534 "preproc.y" /* yacc.c:1646  */
+#line 6530 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("functions");
+ (yyval.str) = cat_str(7,mm_strdup("revoke grant option for"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("from"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38294 "preproc.c" /* yacc.c:1646  */
+#line 38332 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 997:
 #line 6538 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("sequences");
+ (yyval.str) = mm_strdup("tables");
 }
-#line 38302 "preproc.c" /* yacc.c:1646  */
+#line 38340 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 998:
 #line 6542 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("types");
+ (yyval.str) = mm_strdup("functions");
 }
-#line 38310 "preproc.c" /* yacc.c:1646  */
+#line 38348 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 999:
-#line 6550 "preproc.y" /* yacc.c:1646  */
+#line 6546 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(14,mm_strdup("create"),(yyvsp[-12].str),mm_strdup("index"),(yyvsp[-10].str),(yyvsp[-9].str),mm_strdup("on"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("("),(yyvsp[-4].str),mm_strdup(")"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("sequences");
 }
-#line 38318 "preproc.c" /* yacc.c:1646  */
+#line 38356 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1000:
-#line 6554 "preproc.y" /* yacc.c:1646  */
+#line 6550 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(15,mm_strdup("create"),(yyvsp[-15].str),mm_strdup("index"),(yyvsp[-13].str),mm_strdup("if not exists"),(yyvsp[-9].str),mm_strdup("on"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("("),(yyvsp[-4].str),mm_strdup(")"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("types");
 }
-#line 38326 "preproc.c" /* yacc.c:1646  */
+#line 38364 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1001:
-#line 6562 "preproc.y" /* yacc.c:1646  */
+#line 6558 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unique");
+ (yyval.str) = cat_str(14,mm_strdup("create"),(yyvsp[-12].str),mm_strdup("index"),(yyvsp[-10].str),(yyvsp[-9].str),mm_strdup("on"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("("),(yyvsp[-4].str),mm_strdup(")"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38334 "preproc.c" /* yacc.c:1646  */
+#line 38372 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1002:
-#line 6566 "preproc.y" /* yacc.c:1646  */
+#line 6562 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 38341 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(15,mm_strdup("create"),(yyvsp[-15].str),mm_strdup("index"),(yyvsp[-13].str),mm_strdup("if not exists"),(yyvsp[-9].str),mm_strdup("on"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("("),(yyvsp[-4].str),mm_strdup(")"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 38380 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1003:
-#line 6573 "preproc.y" /* yacc.c:1646  */
+#line 6570 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("concurrently");
+ (yyval.str) = mm_strdup("unique");
 }
-#line 38349 "preproc.c" /* yacc.c:1646  */
+#line 38388 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1004:
-#line 6577 "preproc.y" /* yacc.c:1646  */
+#line 6574 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 38356 "preproc.c" /* yacc.c:1646  */
+#line 38395 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1005:
-#line 6584 "preproc.y" /* yacc.c:1646  */
+#line 6581 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("concurrently");
 }
-#line 38364 "preproc.c" /* yacc.c:1646  */
+#line 38403 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1006:
-#line 6588 "preproc.y" /* yacc.c:1646  */
+#line 6585 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 38371 "preproc.c" /* yacc.c:1646  */
+#line 38410 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1007:
-#line 6595 "preproc.y" /* yacc.c:1646  */
+#line 6592 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38379 "preproc.c" /* yacc.c:1646  */
+#line 38418 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1008:
-#line 6599 "preproc.y" /* yacc.c:1646  */
+#line 6596 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 38386 "preproc.c" /* yacc.c:1646  */
+#line 38425 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1009:
-#line 6606 "preproc.y" /* yacc.c:1646  */
+#line 6603 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
 }
-#line 38394 "preproc.c" /* yacc.c:1646  */
+#line 38433 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1010:
-#line 6610 "preproc.y" /* yacc.c:1646  */
+#line 6607 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
-}
-#line 38402 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 38440 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1011:
-#line 6618 "preproc.y" /* yacc.c:1646  */
+#line 6614 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38410 "preproc.c" /* yacc.c:1646  */
+#line 38448 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1012:
-#line 6622 "preproc.y" /* yacc.c:1646  */
+#line 6618 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 38418 "preproc.c" /* yacc.c:1646  */
+#line 38456 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1013:
 #line 6626 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38426 "preproc.c" /* yacc.c:1646  */
+#line 38464 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1014:
-#line 6634 "preproc.y" /* yacc.c:1646  */
+#line 6630 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38434 "preproc.c" /* yacc.c:1646  */
+#line 38472 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1015:
-#line 6638 "preproc.y" /* yacc.c:1646  */
+#line 6634 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 38441 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(7,mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 38480 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1016:
-#line 6645 "preproc.y" /* yacc.c:1646  */
+#line 6642 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[0].str));
 }
-#line 38449 "preproc.c" /* yacc.c:1646  */
+#line 38488 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1017:
-#line 6649 "preproc.y" /* yacc.c:1646  */
+#line 6646 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
-}
-#line 38457 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 38495 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1018:
 #line 6653 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 38464 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 38503 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1019:
-#line 6660 "preproc.y" /* yacc.c:1646  */
+#line 6657 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("asc");
+ (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
 }
-#line 38472 "preproc.c" /* yacc.c:1646  */
+#line 38511 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1020:
-#line 6664 "preproc.y" /* yacc.c:1646  */
+#line 6661 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("desc");
-}
-#line 38480 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 38518 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1021:
 #line 6668 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 38487 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("asc");
+}
+#line 38526 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1022:
-#line 6675 "preproc.y" /* yacc.c:1646  */
+#line 6672 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("nulls first");
+ (yyval.str) = mm_strdup("desc");
 }
-#line 38495 "preproc.c" /* yacc.c:1646  */
+#line 38534 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1023:
-#line 6679 "preproc.y" /* yacc.c:1646  */
+#line 6676 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("nulls last");
-}
-#line 38503 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 38541 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1024:
 #line 6683 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 38510 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("nulls first");
+}
+#line 38549 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1025:
-#line 6690 "preproc.y" /* yacc.c:1646  */
+#line 6687 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(9,mm_strdup("create"),(yyvsp[-7].str),mm_strdup("function"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("returns"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("nulls last");
 }
-#line 38518 "preproc.c" /* yacc.c:1646  */
+#line 38557 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1026:
-#line 6694 "preproc.y" /* yacc.c:1646  */
+#line 6691 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-10].str),mm_strdup("function"),(yyvsp[-8].str),(yyvsp[-7].str),mm_strdup("returns table ("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 38526 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 38564 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1027:
 #line 6698 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[-5].str),mm_strdup("function"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(9,mm_strdup("create"),(yyvsp[-7].str),mm_strdup("function"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("returns"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38534 "preproc.c" /* yacc.c:1646  */
+#line 38572 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1028:
-#line 6706 "preproc.y" /* yacc.c:1646  */
+#line 6702 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("or replace");
+ (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-10].str),mm_strdup("function"),(yyvsp[-8].str),(yyvsp[-7].str),mm_strdup("returns table ("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38542 "preproc.c" /* yacc.c:1646  */
+#line 38580 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1029:
-#line 6710 "preproc.y" /* yacc.c:1646  */
+#line 6706 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 38549 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[-5].str),mm_strdup("function"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 38588 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1030:
-#line 6717 "preproc.y" /* yacc.c:1646  */
+#line 6714 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("or replace");
 }
-#line 38557 "preproc.c" /* yacc.c:1646  */
+#line 38596 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1031:
-#line 6721 "preproc.y" /* yacc.c:1646  */
+#line 6718 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("( )");
-}
-#line 38565 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 38603 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1032:
-#line 6729 "preproc.y" /* yacc.c:1646  */
+#line 6725 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 38573 "preproc.c" /* yacc.c:1646  */
+#line 38611 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1033:
-#line 6733 "preproc.y" /* yacc.c:1646  */
+#line 6729 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("( )");
 }
-#line 38581 "preproc.c" /* yacc.c:1646  */
+#line 38619 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1034:
-#line 6741 "preproc.y" /* yacc.c:1646  */
+#line 6737 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38589 "preproc.c" /* yacc.c:1646  */
+#line 38627 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1035:
-#line 6745 "preproc.y" /* yacc.c:1646  */
+#line 6741 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("( )");
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 38597 "preproc.c" /* yacc.c:1646  */
+#line 38635 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1036:
-#line 6753 "preproc.y" /* yacc.c:1646  */
+#line 6749 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 38605 "preproc.c" /* yacc.c:1646  */
+#line 38643 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1037:
-#line 6757 "preproc.y" /* yacc.c:1646  */
+#line 6753 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("( )");
 }
-#line 38613 "preproc.c" /* yacc.c:1646  */
+#line 38651 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1038:
-#line 6765 "preproc.y" /* yacc.c:1646  */
+#line 6761 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38621 "preproc.c" /* yacc.c:1646  */
+#line 38659 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1039:
-#line 6769 "preproc.y" /* yacc.c:1646  */
+#line 6765 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 38629 "preproc.c" /* yacc.c:1646  */
+#line 38667 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1040:
 #line 6773 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38637 "preproc.c" /* yacc.c:1646  */
+#line 38675 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1041:
 #line 6777 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38645 "preproc.c" /* yacc.c:1646  */
+#line 38683 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1042:
 #line 6781 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38653 "preproc.c" /* yacc.c:1646  */
+#line 38691 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1043:
-#line 6789 "preproc.y" /* yacc.c:1646  */
+#line 6785 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("in");
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38661 "preproc.c" /* yacc.c:1646  */
+#line 38699 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1044:
-#line 6793 "preproc.y" /* yacc.c:1646  */
+#line 6789 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("out");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38669 "preproc.c" /* yacc.c:1646  */
+#line 38707 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1045:
 #line 6797 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("inout");
+ (yyval.str) = mm_strdup("in");
 }
-#line 38677 "preproc.c" /* yacc.c:1646  */
+#line 38715 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1046:
 #line 6801 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("in out");
+ (yyval.str) = mm_strdup("out");
 }
-#line 38685 "preproc.c" /* yacc.c:1646  */
+#line 38723 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1047:
 #line 6805 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("variadic");
+ (yyval.str) = mm_strdup("inout");
 }
-#line 38693 "preproc.c" /* yacc.c:1646  */
+#line 38731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1048:
-#line 6813 "preproc.y" /* yacc.c:1646  */
+#line 6809 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("in out");
 }
-#line 38701 "preproc.c" /* yacc.c:1646  */
+#line 38739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1049:
-#line 6821 "preproc.y" /* yacc.c:1646  */
+#line 6813 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("variadic");
 }
-#line 38709 "preproc.c" /* yacc.c:1646  */
+#line 38747 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1050:
-#line 6829 "preproc.y" /* yacc.c:1646  */
+#line 6821 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 38717 "preproc.c" /* yacc.c:1646  */
+#line 38755 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1051:
-#line 6833 "preproc.y" /* yacc.c:1646  */
+#line 6829 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("% type"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38725 "preproc.c" /* yacc.c:1646  */
+#line 38763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1052:
 #line 6837 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("setof"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("% type"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38733 "preproc.c" /* yacc.c:1646  */
+#line 38771 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1053:
-#line 6845 "preproc.y" /* yacc.c:1646  */
+#line 6841 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("% type"));
 }
-#line 38741 "preproc.c" /* yacc.c:1646  */
+#line 38779 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1054:
-#line 6849 "preproc.y" /* yacc.c:1646  */
+#line 6845 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("default"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("setof"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("% type"));
 }
-#line 38749 "preproc.c" /* yacc.c:1646  */
+#line 38787 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1055:
 #line 6853 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38757 "preproc.c" /* yacc.c:1646  */
+#line 38795 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1056:
-#line 6861 "preproc.y" /* yacc.c:1646  */
+#line 6857 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("default"),(yyvsp[0].str));
 }
-#line 38766 "preproc.c" /* yacc.c:1646  */
+#line 38803 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1057:
-#line 6870 "preproc.y" /* yacc.c:1646  */
+#line 6861 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("( * )");
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 38774 "preproc.c" /* yacc.c:1646  */
+#line 38811 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1058:
-#line 6874 "preproc.y" /* yacc.c:1646  */
+#line 6869 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38782 "preproc.c" /* yacc.c:1646  */
+#line 38820 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1059:
 #line 6878 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("( order by"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("( * )");
 }
-#line 38790 "preproc.c" /* yacc.c:1646  */
+#line 38828 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1060:
 #line 6882 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-4].str),mm_strdup("order by"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 38798 "preproc.c" /* yacc.c:1646  */
+#line 38836 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1061:
-#line 6890 "preproc.y" /* yacc.c:1646  */
+#line 6886 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("( order by"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 38806 "preproc.c" /* yacc.c:1646  */
+#line 38844 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1062:
-#line 6894 "preproc.y" /* yacc.c:1646  */
+#line 6890 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-4].str),mm_strdup("order by"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 38814 "preproc.c" /* yacc.c:1646  */
+#line 38852 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1063:
-#line 6902 "preproc.y" /* yacc.c:1646  */
+#line 6898 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 38822 "preproc.c" /* yacc.c:1646  */
+#line 38860 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1064:
-#line 6906 "preproc.y" /* yacc.c:1646  */
+#line 6902 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 38830 "preproc.c" /* yacc.c:1646  */
+#line 38868 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1065:
-#line 6914 "preproc.y" /* yacc.c:1646  */
+#line 6910 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("called on null input");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38838 "preproc.c" /* yacc.c:1646  */
+#line 38876 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1066:
-#line 6918 "preproc.y" /* yacc.c:1646  */
+#line 6914 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("returns null on null input");
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 38846 "preproc.c" /* yacc.c:1646  */
+#line 38884 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1067:
 #line 6922 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("strict");
+ (yyval.str) = mm_strdup("called on null input");
 }
-#line 38854 "preproc.c" /* yacc.c:1646  */
+#line 38892 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1068:
 #line 6926 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("immutable");
+ (yyval.str) = mm_strdup("returns null on null input");
 }
-#line 38862 "preproc.c" /* yacc.c:1646  */
+#line 38900 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1069:
 #line 6930 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("stable");
+ (yyval.str) = mm_strdup("strict");
 }
-#line 38870 "preproc.c" /* yacc.c:1646  */
+#line 38908 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1070:
 #line 6934 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("volatile");
+ (yyval.str) = mm_strdup("immutable");
 }
-#line 38878 "preproc.c" /* yacc.c:1646  */
+#line 38916 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1071:
 #line 6938 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("external security definer");
+ (yyval.str) = mm_strdup("stable");
 }
-#line 38886 "preproc.c" /* yacc.c:1646  */
+#line 38924 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1072:
 #line 6942 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("external security invoker");
+ (yyval.str) = mm_strdup("volatile");
 }
-#line 38894 "preproc.c" /* yacc.c:1646  */
+#line 38932 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1073:
 #line 6946 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("security definer");
+ (yyval.str) = mm_strdup("external security definer");
 }
-#line 38902 "preproc.c" /* yacc.c:1646  */
+#line 38940 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1074:
 #line 6950 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("security invoker");
+ (yyval.str) = mm_strdup("external security invoker");
 }
-#line 38910 "preproc.c" /* yacc.c:1646  */
+#line 38948 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1075:
 #line 6954 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("leakproof");
+ (yyval.str) = mm_strdup("security definer");
 }
-#line 38918 "preproc.c" /* yacc.c:1646  */
+#line 38956 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1076:
 #line 6958 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("not leakproof");
+ (yyval.str) = mm_strdup("security invoker");
 }
-#line 38926 "preproc.c" /* yacc.c:1646  */
+#line 38964 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1077:
 #line 6962 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("cost"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("leakproof");
 }
-#line 38934 "preproc.c" /* yacc.c:1646  */
+#line 38972 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1078:
 #line 6966 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("rows"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("not leakproof");
 }
-#line 38942 "preproc.c" /* yacc.c:1646  */
+#line 38980 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1079:
 #line 6970 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("cost"),(yyvsp[0].str));
 }
-#line 38950 "preproc.c" /* yacc.c:1646  */
+#line 38988 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1080:
-#line 6978 "preproc.y" /* yacc.c:1646  */
+#line 6974 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("rows"),(yyvsp[0].str));
 }
-#line 38958 "preproc.c" /* yacc.c:1646  */
+#line 38996 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1081:
-#line 6982 "preproc.y" /* yacc.c:1646  */
+#line 6978 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 38966 "preproc.c" /* yacc.c:1646  */
+#line 39004 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1082:
 #line 6986 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("transform"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[0].str));
 }
-#line 38974 "preproc.c" /* yacc.c:1646  */
+#line 39012 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1083:
 #line 6990 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("window");
+ (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[0].str));
 }
-#line 38982 "preproc.c" /* yacc.c:1646  */
+#line 39020 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1084:
 #line 6994 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("transform"),(yyvsp[0].str));
 }
-#line 38990 "preproc.c" /* yacc.c:1646  */
+#line 39028 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1085:
-#line 7002 "preproc.y" /* yacc.c:1646  */
+#line 6998 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("window");
 }
-#line 38998 "preproc.c" /* yacc.c:1646  */
+#line 39036 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1086:
-#line 7006 "preproc.y" /* yacc.c:1646  */
+#line 7002 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 39006 "preproc.c" /* yacc.c:1646  */
+#line 39044 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1087:
-#line 7014 "preproc.y" /* yacc.c:1646  */
+#line 7010 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("for type"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 39014 "preproc.c" /* yacc.c:1646  */
+#line 39052 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1088:
-#line 7018 "preproc.y" /* yacc.c:1646  */
+#line 7014 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup(", for type"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 39022 "preproc.c" /* yacc.c:1646  */
+#line 39060 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1089:
-#line 7026 "preproc.y" /* yacc.c:1646  */
+#line 7022 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("for type"),(yyvsp[0].str));
 }
-#line 39030 "preproc.c" /* yacc.c:1646  */
+#line 39068 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1090:
-#line 7030 "preproc.y" /* yacc.c:1646  */
+#line 7026 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 39037 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup(", for type"),(yyvsp[0].str));
+}
+#line 39076 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1091:
-#line 7037 "preproc.y" /* yacc.c:1646  */
+#line 7034 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
 }
-#line 39045 "preproc.c" /* yacc.c:1646  */
+#line 39084 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1092:
-#line 7045 "preproc.y" /* yacc.c:1646  */
+#line 7038 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 39053 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 39091 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1093:
-#line 7049 "preproc.y" /* yacc.c:1646  */
+#line 7045 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39061 "preproc.c" /* yacc.c:1646  */
+#line 39099 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1094:
-#line 7057 "preproc.y" /* yacc.c:1646  */
+#line 7053 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 39069 "preproc.c" /* yacc.c:1646  */
+#line 39107 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1095:
-#line 7065 "preproc.y" /* yacc.c:1646  */
+#line 7057 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 39077 "preproc.c" /* yacc.c:1646  */
+#line 39115 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1096:
-#line 7069 "preproc.y" /* yacc.c:1646  */
+#line 7065 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39085 "preproc.c" /* yacc.c:1646  */
+#line 39123 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1097:
-#line 7077 "preproc.y" /* yacc.c:1646  */
+#line 7073 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("restrict");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 39093 "preproc.c" /* yacc.c:1646  */
+#line 39131 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1098:
-#line 7081 "preproc.y" /* yacc.c:1646  */
+#line 7077 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 39100 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 39139 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1099:
-#line 7088 "preproc.y" /* yacc.c:1646  */
+#line 7085 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("drop function"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("restrict");
 }
-#line 39108 "preproc.c" /* yacc.c:1646  */
+#line 39147 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1100:
-#line 7092 "preproc.y" /* yacc.c:1646  */
+#line 7089 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("drop function if exists"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 39116 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 39154 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1101:
-#line 7100 "preproc.y" /* yacc.c:1646  */
+#line 7096 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("drop aggregate"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("drop function"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39124 "preproc.c" /* yacc.c:1646  */
+#line 39162 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1102:
-#line 7104 "preproc.y" /* yacc.c:1646  */
+#line 7100 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("drop aggregate if exists"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("drop function if exists"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39132 "preproc.c" /* yacc.c:1646  */
+#line 39170 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1103:
-#line 7112 "preproc.y" /* yacc.c:1646  */
+#line 7108 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("drop operator"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("drop aggregate"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39140 "preproc.c" /* yacc.c:1646  */
+#line 39178 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1104:
-#line 7116 "preproc.y" /* yacc.c:1646  */
+#line 7112 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("drop operator if exists"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("drop aggregate if exists"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39148 "preproc.c" /* yacc.c:1646  */
+#line 39186 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1105:
-#line 7124 "preproc.y" /* yacc.c:1646  */
+#line 7120 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(4,mm_strdup("drop operator"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39156 "preproc.c" /* yacc.c:1646  */
+#line 39194 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1106:
-#line 7128 "preproc.y" /* yacc.c:1646  */
+#line 7124 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(4,mm_strdup("drop operator if exists"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39164 "preproc.c" /* yacc.c:1646  */
+#line 39202 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1107:
 #line 7132 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("( none ,"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 39172 "preproc.c" /* yacc.c:1646  */
+#line 39210 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1108:
 #line 7136 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-3].str),mm_strdup(", none )"));
+ (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 39180 "preproc.c" /* yacc.c:1646  */
+#line 39218 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1109:
-#line 7144 "preproc.y" /* yacc.c:1646  */
+#line 7140 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("( none ,"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 39188 "preproc.c" /* yacc.c:1646  */
+#line 39226 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1110:
-#line 7148 "preproc.y" /* yacc.c:1646  */
+#line 7144 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-3].str),mm_strdup(", none )"));
 }
-#line 39196 "preproc.c" /* yacc.c:1646  */
+#line 39234 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1111:
-#line 7156 "preproc.y" /* yacc.c:1646  */
+#line 7152 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("do"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 39204 "preproc.c" /* yacc.c:1646  */
+#line 39242 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1112:
-#line 7164 "preproc.y" /* yacc.c:1646  */
+#line 7156 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
 }
-#line 39212 "preproc.c" /* yacc.c:1646  */
+#line 39250 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1113:
-#line 7168 "preproc.y" /* yacc.c:1646  */
+#line 7164 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("do"),(yyvsp[0].str));
 }
-#line 39220 "preproc.c" /* yacc.c:1646  */
+#line 39258 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1114:
-#line 7176 "preproc.y" /* yacc.c:1646  */
+#line 7172 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39228 "preproc.c" /* yacc.c:1646  */
+#line 39266 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1115:
-#line 7180 "preproc.y" /* yacc.c:1646  */
+#line 7176 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39236 "preproc.c" /* yacc.c:1646  */
+#line 39274 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1116:
-#line 7188 "preproc.y" /* yacc.c:1646  */
+#line 7184 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("create cast ("),(yyvsp[-7].str),mm_strdup("as"),(yyvsp[-5].str),mm_strdup(") with function"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 39244 "preproc.c" /* yacc.c:1646  */
+#line 39282 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1117:
-#line 7192 "preproc.y" /* yacc.c:1646  */
+#line 7188 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("create cast ("),(yyvsp[-6].str),mm_strdup("as"),(yyvsp[-4].str),mm_strdup(") without function"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[0].str));
 }
-#line 39252 "preproc.c" /* yacc.c:1646  */
+#line 39290 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1118:
 #line 7196 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("create cast ("),(yyvsp[-6].str),mm_strdup("as"),(yyvsp[-4].str),mm_strdup(") with inout"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("create cast ("),(yyvsp[-7].str),mm_strdup("as"),(yyvsp[-5].str),mm_strdup(") with function"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39260 "preproc.c" /* yacc.c:1646  */
+#line 39298 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1119:
-#line 7204 "preproc.y" /* yacc.c:1646  */
+#line 7200 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("as implicit");
+ (yyval.str) = cat_str(6,mm_strdup("create cast ("),(yyvsp[-6].str),mm_strdup("as"),(yyvsp[-4].str),mm_strdup(") without function"),(yyvsp[0].str));
 }
-#line 39268 "preproc.c" /* yacc.c:1646  */
+#line 39306 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1120:
-#line 7208 "preproc.y" /* yacc.c:1646  */
+#line 7204 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("as assignment");
+ (yyval.str) = cat_str(6,mm_strdup("create cast ("),(yyvsp[-6].str),mm_strdup("as"),(yyvsp[-4].str),mm_strdup(") with inout"),(yyvsp[0].str));
 }
-#line 39276 "preproc.c" /* yacc.c:1646  */
+#line 39314 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1121:
 #line 7212 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 39283 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("as implicit");
+}
+#line 39322 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1122:
-#line 7219 "preproc.y" /* yacc.c:1646  */
+#line 7216 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(8,mm_strdup("drop cast"),(yyvsp[-6].str),mm_strdup("("),(yyvsp[-4].str),mm_strdup("as"),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("as assignment");
 }
-#line 39291 "preproc.c" /* yacc.c:1646  */
+#line 39330 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1123:
-#line 7227 "preproc.y" /* yacc.c:1646  */
+#line 7220 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("if exists");
-}
-#line 39299 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 39337 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1124:
-#line 7231 "preproc.y" /* yacc.c:1646  */
+#line 7227 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 39306 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(8,mm_strdup("drop cast"),(yyvsp[-6].str),mm_strdup("("),(yyvsp[-4].str),mm_strdup("as"),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+}
+#line 39345 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1125:
-#line 7238 "preproc.y" /* yacc.c:1646  */
+#line 7235 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(9,mm_strdup("create"),(yyvsp[-8].str),mm_strdup("transform for"),(yyvsp[-5].str),mm_strdup("language"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("if exists");
 }
-#line 39314 "preproc.c" /* yacc.c:1646  */
+#line 39353 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1126:
-#line 7246 "preproc.y" /* yacc.c:1646  */
+#line 7239 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("from sql with function"),(yyvsp[-6].str),mm_strdup(", to sql with function"),(yyvsp[0].str));
-}
-#line 39322 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 39360 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1127:
-#line 7250 "preproc.y" /* yacc.c:1646  */
+#line 7246 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("to sql with function"),(yyvsp[-6].str),mm_strdup(", from sql with function"),(yyvsp[0].str));
+ (yyval.str) = cat_str(9,mm_strdup("create"),(yyvsp[-8].str),mm_strdup("transform for"),(yyvsp[-5].str),mm_strdup("language"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 39330 "preproc.c" /* yacc.c:1646  */
+#line 39368 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1128:
 #line 7254 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("from sql with function"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("from sql with function"),(yyvsp[-6].str),mm_strdup(", to sql with function"),(yyvsp[0].str));
 }
-#line 39338 "preproc.c" /* yacc.c:1646  */
+#line 39376 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1129:
 #line 7258 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("to sql with function"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("to sql with function"),(yyvsp[-6].str),mm_strdup(", from sql with function"),(yyvsp[0].str));
 }
-#line 39346 "preproc.c" /* yacc.c:1646  */
+#line 39384 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1130:
-#line 7266 "preproc.y" /* yacc.c:1646  */
+#line 7262 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("drop transform"),(yyvsp[-5].str),mm_strdup("for"),(yyvsp[-3].str),mm_strdup("language"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("from sql with function"),(yyvsp[0].str));
 }
-#line 39354 "preproc.c" /* yacc.c:1646  */
+#line 39392 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1131:
-#line 7274 "preproc.y" /* yacc.c:1646  */
+#line 7266 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("reindex"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("to sql with function"),(yyvsp[0].str));
 }
-#line 39362 "preproc.c" /* yacc.c:1646  */
+#line 39400 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1132:
-#line 7278 "preproc.y" /* yacc.c:1646  */
+#line 7274 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("reindex"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("drop transform"),(yyvsp[-5].str),mm_strdup("for"),(yyvsp[-3].str),mm_strdup("language"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39370 "preproc.c" /* yacc.c:1646  */
+#line 39408 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1133:
 #line 7282 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("reindex ("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("reindex"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39378 "preproc.c" /* yacc.c:1646  */
+#line 39416 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1134:
 #line 7286 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("reindex ("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("reindex"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39386 "preproc.c" /* yacc.c:1646  */
+#line 39424 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1135:
-#line 7294 "preproc.y" /* yacc.c:1646  */
+#line 7290 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("index");
+ (yyval.str) = cat_str(5,mm_strdup("reindex ("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39394 "preproc.c" /* yacc.c:1646  */
+#line 39432 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1136:
-#line 7298 "preproc.y" /* yacc.c:1646  */
+#line 7294 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("table");
+ (yyval.str) = cat_str(5,mm_strdup("reindex ("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39402 "preproc.c" /* yacc.c:1646  */
+#line 39440 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1137:
-#line 7306 "preproc.y" /* yacc.c:1646  */
+#line 7302 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("schema");
+ (yyval.str) = mm_strdup("index");
 }
-#line 39410 "preproc.c" /* yacc.c:1646  */
+#line 39448 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1138:
-#line 7310 "preproc.y" /* yacc.c:1646  */
+#line 7306 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("system");
+ (yyval.str) = mm_strdup("table");
 }
-#line 39418 "preproc.c" /* yacc.c:1646  */
+#line 39456 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1139:
 #line 7314 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("database");
+ (yyval.str) = mm_strdup("schema");
 }
-#line 39426 "preproc.c" /* yacc.c:1646  */
+#line 39464 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1140:
-#line 7322 "preproc.y" /* yacc.c:1646  */
+#line 7318 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("system");
 }
-#line 39434 "preproc.c" /* yacc.c:1646  */
+#line 39472 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1141:
-#line 7326 "preproc.y" /* yacc.c:1646  */
+#line 7322 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("database");
 }
-#line 39442 "preproc.c" /* yacc.c:1646  */
+#line 39480 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1142:
-#line 7334 "preproc.y" /* yacc.c:1646  */
+#line 7330 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("verbose");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 39450 "preproc.c" /* yacc.c:1646  */
+#line 39488 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1143:
-#line 7342 "preproc.y" /* yacc.c:1646  */
+#line 7334 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 39458 "preproc.c" /* yacc.c:1646  */
+#line 39496 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1144:
-#line 7346 "preproc.y" /* yacc.c:1646  */
+#line 7342 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-2].str),mm_strdup("reset"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("verbose");
 }
-#line 39466 "preproc.c" /* yacc.c:1646  */
+#line 39504 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1145:
-#line 7354 "preproc.y" /* yacc.c:1646  */
+#line 7350 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter aggregate"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 39474 "preproc.c" /* yacc.c:1646  */
+#line 39512 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1146:
-#line 7358 "preproc.y" /* yacc.c:1646  */
+#line 7354 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-2].str),mm_strdup("reset"),(yyvsp[0].str));
 }
-#line 39482 "preproc.c" /* yacc.c:1646  */
+#line 39520 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1147:
 #line 7362 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter aggregate"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39490 "preproc.c" /* yacc.c:1646  */
+#line 39528 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1148:
 #line 7366 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39498 "preproc.c" /* yacc.c:1646  */
+#line 39536 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1149:
 #line 7370 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39506 "preproc.c" /* yacc.c:1646  */
+#line 39544 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1150:
 #line 7374 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter domain"),(yyvsp[-5].str),mm_strdup("rename constraint"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39514 "preproc.c" /* yacc.c:1646  */
+#line 39552 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1151:
 #line 7378 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39522 "preproc.c" /* yacc.c:1646  */
+#line 39560 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1152:
 #line 7382 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter domain"),(yyvsp[-5].str),mm_strdup("rename constraint"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 39530 "preproc.c" /* yacc.c:1646  */
+#line 39568 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1153:
 #line 7386 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter group"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39538 "preproc.c" /* yacc.c:1646  */
+#line 39576 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1154:
 #line 7390 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter"),(yyvsp[-5].str),mm_strdup("language"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39546 "preproc.c" /* yacc.c:1646  */
+#line 39584 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1155:
 #line 7394 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter group"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39554 "preproc.c" /* yacc.c:1646  */
+#line 39592 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1156:
 #line 7398 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter"),(yyvsp[-5].str),mm_strdup("language"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39562 "preproc.c" /* yacc.c:1646  */
+#line 39600 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1157:
 #line 7402 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter policy"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39570 "preproc.c" /* yacc.c:1646  */
+#line 39608 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1158:
 #line 7406 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter policy if exists"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39578 "preproc.c" /* yacc.c:1646  */
+#line 39616 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1159:
 #line 7410 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter schema"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter policy"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39586 "preproc.c" /* yacc.c:1646  */
+#line 39624 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1160:
 #line 7414 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter policy if exists"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39594 "preproc.c" /* yacc.c:1646  */
+#line 39632 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1161:
 #line 7418 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter table"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter schema"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39602 "preproc.c" /* yacc.c:1646  */
+#line 39640 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1162:
 #line 7422 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter table if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39610 "preproc.c" /* yacc.c:1646  */
+#line 39648 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1163:
 #line 7426 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter sequence"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter table"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39618 "preproc.c" /* yacc.c:1646  */
+#line 39656 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1164:
 #line 7430 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter sequence if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter table if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39626 "preproc.c" /* yacc.c:1646  */
+#line 39664 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1165:
 #line 7434 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter view"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter sequence"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39634 "preproc.c" /* yacc.c:1646  */
+#line 39672 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1166:
 #line 7438 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter view if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter sequence if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39642 "preproc.c" /* yacc.c:1646  */
+#line 39680 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1167:
 #line 7442 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter materialized view"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter view"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39650 "preproc.c" /* yacc.c:1646  */
+#line 39688 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1168:
 #line 7446 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter materialized view if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter view if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39658 "preproc.c" /* yacc.c:1646  */
+#line 39696 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1169:
 #line 7450 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter index"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter materialized view"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39666 "preproc.c" /* yacc.c:1646  */
+#line 39704 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1170:
 #line 7454 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter index if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter materialized view if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39674 "preproc.c" /* yacc.c:1646  */
+#line 39712 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1171:
 #line 7458 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter foreign table"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter index"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39682 "preproc.c" /* yacc.c:1646  */
+#line 39720 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1172:
 #line 7462 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter foreign table if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter index if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39690 "preproc.c" /* yacc.c:1646  */
+#line 39728 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1173:
 #line 7466 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter table"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter foreign table"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39698 "preproc.c" /* yacc.c:1646  */
+#line 39736 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1174:
 #line 7470 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter table if exists"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter foreign table if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39706 "preproc.c" /* yacc.c:1646  */
+#line 39744 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1175:
 #line 7474 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter materialized view"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter table"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 39714 "preproc.c" /* yacc.c:1646  */
+#line 39752 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1176:
 #line 7478 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter materialized view if exists"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter table if exists"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 39722 "preproc.c" /* yacc.c:1646  */
+#line 39760 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1177:
 #line 7482 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter table"),(yyvsp[-5].str),mm_strdup("rename constraint"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter materialized view"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 39730 "preproc.c" /* yacc.c:1646  */
+#line 39768 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1178:
 #line 7486 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter table if exists"),(yyvsp[-5].str),mm_strdup("rename constraint"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter materialized view if exists"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 39738 "preproc.c" /* yacc.c:1646  */
+#line 39776 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1179:
 #line 7490 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter foreign table"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter table"),(yyvsp[-5].str),mm_strdup("rename constraint"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 39746 "preproc.c" /* yacc.c:1646  */
+#line 39784 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1180:
 #line 7494 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter foreign table if exists"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter table if exists"),(yyvsp[-5].str),mm_strdup("rename constraint"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 39754 "preproc.c" /* yacc.c:1646  */
+#line 39792 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1181:
 #line 7498 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter rule"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter foreign table"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 39762 "preproc.c" /* yacc.c:1646  */
+#line 39800 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1182:
 #line 7502 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter trigger"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(7,mm_strdup("alter foreign table if exists"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 39770 "preproc.c" /* yacc.c:1646  */
+#line 39808 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1183:
 #line 7506 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter event trigger"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter rule"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39778 "preproc.c" /* yacc.c:1646  */
+#line 39816 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1184:
 #line 7510 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter role"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter trigger"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39786 "preproc.c" /* yacc.c:1646  */
+#line 39824 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1185:
 #line 7514 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter user"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter event trigger"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39794 "preproc.c" /* yacc.c:1646  */
+#line 39832 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1186:
 #line 7518 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter role"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39802 "preproc.c" /* yacc.c:1646  */
+#line 39840 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1187:
 #line 7522 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search parser"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter user"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39810 "preproc.c" /* yacc.c:1646  */
+#line 39848 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1188:
 #line 7526 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39818 "preproc.c" /* yacc.c:1646  */
+#line 39856 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1189:
 #line 7530 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search template"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter text search parser"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39826 "preproc.c" /* yacc.c:1646  */
+#line 39864 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1190:
 #line 7534 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39834 "preproc.c" /* yacc.c:1646  */
+#line 39872 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1191:
 #line 7538 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter text search template"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39842 "preproc.c" /* yacc.c:1646  */
+#line 39880 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1192:
 #line 7542 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("alter type"),(yyvsp[-6].str),mm_strdup("rename attribute"),(yyvsp[-3].str),mm_strdup("to"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39850 "preproc.c" /* yacc.c:1646  */
+#line 39888 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1193:
-#line 7550 "preproc.y" /* yacc.c:1646  */
+#line 7546 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("column");
+ (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 39858 "preproc.c" /* yacc.c:1646  */
+#line 39896 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1194:
-#line 7554 "preproc.y" /* yacc.c:1646  */
+#line 7550 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 39865 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(7,mm_strdup("alter type"),(yyvsp[-6].str),mm_strdup("rename attribute"),(yyvsp[-3].str),mm_strdup("to"),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 39904 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1195:
-#line 7561 "preproc.y" /* yacc.c:1646  */
+#line 7558 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("set data");
+ (yyval.str) = mm_strdup("column");
 }
-#line 39873 "preproc.c" /* yacc.c:1646  */
+#line 39912 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1196:
-#line 7565 "preproc.y" /* yacc.c:1646  */
+#line 7562 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 39880 "preproc.c" /* yacc.c:1646  */
+#line 39919 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1197:
-#line 7572 "preproc.y" /* yacc.c:1646  */
+#line 7569 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter aggregate"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("set data");
 }
-#line 39888 "preproc.c" /* yacc.c:1646  */
+#line 39927 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1198:
-#line 7576 "preproc.y" /* yacc.c:1646  */
+#line 7573 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
-}
-#line 39896 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 39934 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1199:
 #line 7580 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter aggregate"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39904 "preproc.c" /* yacc.c:1646  */
+#line 39942 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1200:
 #line 7584 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39912 "preproc.c" /* yacc.c:1646  */
+#line 39950 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1201:
 #line 7588 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter extension"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39920 "preproc.c" /* yacc.c:1646  */
+#line 39958 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1202:
 #line 7592 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39928 "preproc.c" /* yacc.c:1646  */
+#line 39966 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1203:
 #line 7596 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter operator"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter extension"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39936 "preproc.c" /* yacc.c:1646  */
+#line 39974 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1204:
 #line 7600 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39944 "preproc.c" /* yacc.c:1646  */
+#line 39982 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1205:
 #line 7604 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter operator"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39952 "preproc.c" /* yacc.c:1646  */
+#line 39990 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1206:
 #line 7608 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter table"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39960 "preproc.c" /* yacc.c:1646  */
+#line 39998 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1207:
 #line 7612 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter table if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39968 "preproc.c" /* yacc.c:1646  */
+#line 40006 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1208:
 #line 7616 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search parser"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter table"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39976 "preproc.c" /* yacc.c:1646  */
+#line 40014 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1209:
 #line 7620 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter table if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39984 "preproc.c" /* yacc.c:1646  */
+#line 40022 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1210:
 #line 7624 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search template"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter text search parser"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 39992 "preproc.c" /* yacc.c:1646  */
+#line 40030 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1211:
 #line 7628 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40000 "preproc.c" /* yacc.c:1646  */
+#line 40038 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1212:
 #line 7632 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter sequence"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter text search template"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40008 "preproc.c" /* yacc.c:1646  */
+#line 40046 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1213:
 #line 7636 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter sequence if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40016 "preproc.c" /* yacc.c:1646  */
+#line 40054 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1214:
 #line 7640 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter view"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter sequence"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40024 "preproc.c" /* yacc.c:1646  */
+#line 40062 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1215:
 #line 7644 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter view if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter sequence if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40032 "preproc.c" /* yacc.c:1646  */
+#line 40070 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1216:
 #line 7648 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter materialized view"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter view"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40040 "preproc.c" /* yacc.c:1646  */
+#line 40078 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1217:
 #line 7652 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter materialized view if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter view if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40048 "preproc.c" /* yacc.c:1646  */
+#line 40086 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1218:
 #line 7656 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter foreign table"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter materialized view"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40056 "preproc.c" /* yacc.c:1646  */
+#line 40094 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1219:
 #line 7660 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter foreign table if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter materialized view if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40064 "preproc.c" /* yacc.c:1646  */
+#line 40102 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1220:
 #line 7664 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter foreign table"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40072 "preproc.c" /* yacc.c:1646  */
+#line 40110 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1221:
-#line 7672 "preproc.y" /* yacc.c:1646  */
+#line 7668 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter aggregate"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter foreign table if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40080 "preproc.c" /* yacc.c:1646  */
+#line 40118 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1222:
-#line 7676 "preproc.y" /* yacc.c:1646  */
+#line 7672 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 40088 "preproc.c" /* yacc.c:1646  */
+#line 40126 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1223:
 #line 7680 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter aggregate"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40096 "preproc.c" /* yacc.c:1646  */
+#line 40134 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1224:
 #line 7684 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40104 "preproc.c" /* yacc.c:1646  */
+#line 40142 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1225:
 #line 7688 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40112 "preproc.c" /* yacc.c:1646  */
+#line 40150 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1226:
 #line 7692 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40120 "preproc.c" /* yacc.c:1646  */
+#line 40158 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1227:
 #line 7696 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter"),(yyvsp[-5].str),mm_strdup("language"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40128 "preproc.c" /* yacc.c:1646  */
+#line 40166 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1228:
 #line 7700 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter large object"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40136 "preproc.c" /* yacc.c:1646  */
+#line 40174 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1229:
 #line 7704 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter operator"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter"),(yyvsp[-5].str),mm_strdup("language"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40144 "preproc.c" /* yacc.c:1646  */
+#line 40182 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1230:
 #line 7708 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter large object"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40152 "preproc.c" /* yacc.c:1646  */
+#line 40190 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1231:
 #line 7712 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter operator"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40160 "preproc.c" /* yacc.c:1646  */
+#line 40198 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1232:
 #line 7716 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter schema"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40168 "preproc.c" /* yacc.c:1646  */
+#line 40206 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1233:
 #line 7720 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40176 "preproc.c" /* yacc.c:1646  */
+#line 40214 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1234:
 #line 7724 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter schema"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40184 "preproc.c" /* yacc.c:1646  */
+#line 40222 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1235:
 #line 7728 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40192 "preproc.c" /* yacc.c:1646  */
+#line 40230 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1236:
 #line 7732 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40200 "preproc.c" /* yacc.c:1646  */
+#line 40238 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1237:
 #line 7736 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40208 "preproc.c" /* yacc.c:1646  */
+#line 40246 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1238:
 #line 7740 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40216 "preproc.c" /* yacc.c:1646  */
+#line 40254 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1239:
 #line 7744 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter event trigger"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40224 "preproc.c" /* yacc.c:1646  */
+#line 40262 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1240:
-#line 7752 "preproc.y" /* yacc.c:1646  */
+#line 7748 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(12,mm_strdup("create"),(yyvsp[-11].str),mm_strdup("rule"),(yyvsp[-9].str),mm_strdup("as on"),(yyvsp[-6].str),mm_strdup("to"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("do"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40232 "preproc.c" /* yacc.c:1646  */
+#line 40270 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1241:
-#line 7760 "preproc.y" /* yacc.c:1646  */
+#line 7752 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("nothing");
+ (yyval.str) = cat_str(4,mm_strdup("alter event trigger"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40240 "preproc.c" /* yacc.c:1646  */
+#line 40278 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1242:
-#line 7764 "preproc.y" /* yacc.c:1646  */
+#line 7760 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(12,mm_strdup("create"),(yyvsp[-11].str),mm_strdup("rule"),(yyvsp[-9].str),mm_strdup("as on"),(yyvsp[-6].str),mm_strdup("to"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("do"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40248 "preproc.c" /* yacc.c:1646  */
+#line 40286 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1243:
 #line 7768 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("nothing");
 }
-#line 40256 "preproc.c" /* yacc.c:1646  */
+#line 40294 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1244:
-#line 7776 "preproc.y" /* yacc.c:1646  */
+#line 7772 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(";"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 40264 "preproc.c" /* yacc.c:1646  */
+#line 40302 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1245:
-#line 7780 "preproc.y" /* yacc.c:1646  */
+#line 7776 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 40272 "preproc.c" /* yacc.c:1646  */
+#line 40310 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1246:
-#line 7788 "preproc.y" /* yacc.c:1646  */
+#line 7784 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(";"),(yyvsp[0].str));
 }
-#line 40280 "preproc.c" /* yacc.c:1646  */
+#line 40318 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1247:
-#line 7792 "preproc.y" /* yacc.c:1646  */
+#line 7788 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40288 "preproc.c" /* yacc.c:1646  */
+#line 40326 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1248:
@@ -40292,7 +40330,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40296 "preproc.c" /* yacc.c:1646  */
+#line 40334 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1249:
@@ -40300,7 +40338,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40304 "preproc.c" /* yacc.c:1646  */
+#line 40342 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1250:
@@ -40308,1051 +40346,1051 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40312 "preproc.c" /* yacc.c:1646  */
+#line 40350 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1251:
-#line 7812 "preproc.y" /* yacc.c:1646  */
+#line 7808 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40320 "preproc.c" /* yacc.c:1646  */
+#line 40358 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1252:
-#line 7816 "preproc.y" /* yacc.c:1646  */
+#line 7812 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 40327 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 40366 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1253:
-#line 7823 "preproc.y" /* yacc.c:1646  */
+#line 7820 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("select");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 40335 "preproc.c" /* yacc.c:1646  */
+#line 40374 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1254:
-#line 7827 "preproc.y" /* yacc.c:1646  */
+#line 7824 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("update");
-}
-#line 40343 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 40381 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1255:
 #line 7831 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("delete");
+ (yyval.str) = mm_strdup("select");
 }
-#line 40351 "preproc.c" /* yacc.c:1646  */
+#line 40389 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1256:
 #line 7835 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("insert");
+ (yyval.str) = mm_strdup("update");
 }
-#line 40359 "preproc.c" /* yacc.c:1646  */
+#line 40397 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1257:
-#line 7843 "preproc.y" /* yacc.c:1646  */
+#line 7839 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("instead");
+ (yyval.str) = mm_strdup("delete");
 }
-#line 40367 "preproc.c" /* yacc.c:1646  */
+#line 40405 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1258:
-#line 7847 "preproc.y" /* yacc.c:1646  */
+#line 7843 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("also");
+ (yyval.str) = mm_strdup("insert");
 }
-#line 40375 "preproc.c" /* yacc.c:1646  */
+#line 40413 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1259:
 #line 7851 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 40382 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("instead");
+}
+#line 40421 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1260:
-#line 7858 "preproc.y" /* yacc.c:1646  */
+#line 7855 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop rule"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("also");
 }
-#line 40390 "preproc.c" /* yacc.c:1646  */
+#line 40429 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1261:
-#line 7862 "preproc.y" /* yacc.c:1646  */
+#line 7859 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("drop rule if exists"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 40398 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 40436 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1262:
-#line 7870 "preproc.y" /* yacc.c:1646  */
+#line 7866 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("notify"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("drop rule"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40406 "preproc.c" /* yacc.c:1646  */
+#line 40444 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1263:
-#line 7878 "preproc.y" /* yacc.c:1646  */
+#line 7870 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("drop rule if exists"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40414 "preproc.c" /* yacc.c:1646  */
+#line 40452 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1264:
-#line 7882 "preproc.y" /* yacc.c:1646  */
+#line 7878 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 40421 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("notify"),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 40460 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1265:
-#line 7889 "preproc.y" /* yacc.c:1646  */
+#line 7886 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("listen"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup(","),(yyvsp[0].str));
 }
-#line 40429 "preproc.c" /* yacc.c:1646  */
+#line 40468 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1266:
-#line 7897 "preproc.y" /* yacc.c:1646  */
+#line 7890 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("unlisten"),(yyvsp[0].str));
-}
-#line 40437 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 40475 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1267:
-#line 7901 "preproc.y" /* yacc.c:1646  */
+#line 7897 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unlisten *");
+ (yyval.str) = cat_str(2,mm_strdup("listen"),(yyvsp[0].str));
 }
-#line 40445 "preproc.c" /* yacc.c:1646  */
+#line 40483 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1268:
-#line 7909 "preproc.y" /* yacc.c:1646  */
+#line 7905 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("abort"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("unlisten"),(yyvsp[0].str));
 }
-#line 40453 "preproc.c" /* yacc.c:1646  */
+#line 40491 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1269:
-#line 7913 "preproc.y" /* yacc.c:1646  */
+#line 7909 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("begin"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("unlisten *");
 }
-#line 40461 "preproc.c" /* yacc.c:1646  */
+#line 40499 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1270:
 #line 7917 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("start transaction"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("abort"),(yyvsp[0].str));
 }
-#line 40469 "preproc.c" /* yacc.c:1646  */
+#line 40507 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1271:
 #line 7921 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("commit"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("begin"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40477 "preproc.c" /* yacc.c:1646  */
+#line 40515 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1272:
 #line 7925 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("end"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("start transaction"),(yyvsp[0].str));
 }
-#line 40485 "preproc.c" /* yacc.c:1646  */
+#line 40523 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1273:
 #line 7929 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("rollback"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("commit"),(yyvsp[0].str));
 }
-#line 40493 "preproc.c" /* yacc.c:1646  */
+#line 40531 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1274:
 #line 7933 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("savepoint"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("end"),(yyvsp[0].str));
 }
-#line 40501 "preproc.c" /* yacc.c:1646  */
+#line 40539 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1275:
 #line 7937 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("release savepoint"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("rollback"),(yyvsp[0].str));
 }
-#line 40509 "preproc.c" /* yacc.c:1646  */
+#line 40547 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1276:
 #line 7941 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("release"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("savepoint"),(yyvsp[0].str));
 }
-#line 40517 "preproc.c" /* yacc.c:1646  */
+#line 40555 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1277:
 #line 7945 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("rollback"),(yyvsp[-3].str),mm_strdup("to savepoint"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("release savepoint"),(yyvsp[0].str));
 }
-#line 40525 "preproc.c" /* yacc.c:1646  */
+#line 40563 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1278:
 #line 7949 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("rollback"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("release"),(yyvsp[0].str));
 }
-#line 40533 "preproc.c" /* yacc.c:1646  */
+#line 40571 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1279:
 #line 7953 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("prepare transaction"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("rollback"),(yyvsp[-3].str),mm_strdup("to savepoint"),(yyvsp[0].str));
 }
-#line 40541 "preproc.c" /* yacc.c:1646  */
+#line 40579 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1280:
 #line 7957 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("commit prepared"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("rollback"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 40549 "preproc.c" /* yacc.c:1646  */
+#line 40587 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1281:
 #line 7961 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("rollback prepared"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("prepare transaction"),(yyvsp[0].str));
 }
-#line 40557 "preproc.c" /* yacc.c:1646  */
+#line 40595 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1282:
-#line 7969 "preproc.y" /* yacc.c:1646  */
+#line 7965 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("work");
+ (yyval.str) = cat_str(2,mm_strdup("commit prepared"),(yyvsp[0].str));
 }
-#line 40565 "preproc.c" /* yacc.c:1646  */
+#line 40603 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1283:
-#line 7973 "preproc.y" /* yacc.c:1646  */
+#line 7969 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("transaction");
+ (yyval.str) = cat_str(2,mm_strdup("rollback prepared"),(yyvsp[0].str));
 }
-#line 40573 "preproc.c" /* yacc.c:1646  */
+#line 40611 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1284:
 #line 7977 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 40580 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("work");
+}
+#line 40619 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1285:
-#line 7984 "preproc.y" /* yacc.c:1646  */
+#line 7981 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("isolation level"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("transaction");
 }
-#line 40588 "preproc.c" /* yacc.c:1646  */
+#line 40627 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1286:
-#line 7988 "preproc.y" /* yacc.c:1646  */
+#line 7985 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("read only");
-}
-#line 40596 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 40634 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1287:
 #line 7992 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("read write");
+ (yyval.str) = cat_str(2,mm_strdup("isolation level"),(yyvsp[0].str));
 }
-#line 40604 "preproc.c" /* yacc.c:1646  */
+#line 40642 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1288:
 #line 7996 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("deferrable");
+ (yyval.str) = mm_strdup("read only");
 }
-#line 40612 "preproc.c" /* yacc.c:1646  */
+#line 40650 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1289:
 #line 8000 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("not deferrable");
+ (yyval.str) = mm_strdup("read write");
 }
-#line 40620 "preproc.c" /* yacc.c:1646  */
+#line 40658 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1290:
-#line 8008 "preproc.y" /* yacc.c:1646  */
+#line 8004 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("deferrable");
 }
-#line 40628 "preproc.c" /* yacc.c:1646  */
+#line 40666 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1291:
-#line 8012 "preproc.y" /* yacc.c:1646  */
+#line 8008 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("not deferrable");
 }
-#line 40636 "preproc.c" /* yacc.c:1646  */
+#line 40674 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1292:
 #line 8016 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 40644 "preproc.c" /* yacc.c:1646  */
+#line 40682 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1293:
-#line 8024 "preproc.y" /* yacc.c:1646  */
+#line 8020 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 40652 "preproc.c" /* yacc.c:1646  */
+#line 40690 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1294:
-#line 8028 "preproc.y" /* yacc.c:1646  */
+#line 8024 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 40659 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 40698 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1295:
-#line 8035 "preproc.y" /* yacc.c:1646  */
+#line 8032 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(9,mm_strdup("create"),(yyvsp[-7].str),mm_strdup("view"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 40667 "preproc.c" /* yacc.c:1646  */
+#line 40706 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1296:
-#line 8039 "preproc.y" /* yacc.c:1646  */
+#line 8036 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(9,mm_strdup("create or replace"),(yyvsp[-7].str),mm_strdup("view"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 40675 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 40713 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1297:
 #line 8043 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = cat_str(11,mm_strdup("create"),(yyvsp[-10].str),mm_strdup("recursive view"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(9,mm_strdup("create"),(yyvsp[-7].str),mm_strdup("view"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40684 "preproc.c" /* yacc.c:1646  */
+#line 40721 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1298:
-#line 8048 "preproc.y" /* yacc.c:1646  */
+#line 8047 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = cat_str(11,mm_strdup("create or replace"),(yyvsp[-10].str),mm_strdup("recursive view"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(9,mm_strdup("create or replace"),(yyvsp[-7].str),mm_strdup("view"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40693 "preproc.c" /* yacc.c:1646  */
+#line 40729 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1299:
-#line 8057 "preproc.y" /* yacc.c:1646  */
+#line 8051 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with check option");
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = cat_str(11,mm_strdup("create"),(yyvsp[-10].str),mm_strdup("recursive view"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40701 "preproc.c" /* yacc.c:1646  */
+#line 40738 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1300:
-#line 8061 "preproc.y" /* yacc.c:1646  */
+#line 8056 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with cascaded check option");
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = cat_str(11,mm_strdup("create or replace"),(yyvsp[-10].str),mm_strdup("recursive view"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40709 "preproc.c" /* yacc.c:1646  */
+#line 40747 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1301:
 #line 8065 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with local check option");
+ (yyval.str) = mm_strdup("with check option");
 }
-#line 40717 "preproc.c" /* yacc.c:1646  */
+#line 40755 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1302:
 #line 8069 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 40724 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("with cascaded check option");
+}
+#line 40763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1303:
-#line 8076 "preproc.y" /* yacc.c:1646  */
+#line 8073 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("load"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("with local check option");
 }
-#line 40732 "preproc.c" /* yacc.c:1646  */
+#line 40771 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1304:
-#line 8084 "preproc.y" /* yacc.c:1646  */
+#line 8077 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("create database"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 40740 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 40778 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1305:
-#line 8092 "preproc.y" /* yacc.c:1646  */
+#line 8084 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("load"),(yyvsp[0].str));
 }
-#line 40748 "preproc.c" /* yacc.c:1646  */
+#line 40786 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1306:
-#line 8096 "preproc.y" /* yacc.c:1646  */
+#line 8092 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 40755 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(4,mm_strdup("create database"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 40794 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1307:
-#line 8103 "preproc.y" /* yacc.c:1646  */
+#line 8100 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40763 "preproc.c" /* yacc.c:1646  */
+#line 40802 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1308:
-#line 8107 "preproc.y" /* yacc.c:1646  */
+#line 8104 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 40771 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 40809 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1309:
-#line 8115 "preproc.y" /* yacc.c:1646  */
+#line 8111 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 40779 "preproc.c" /* yacc.c:1646  */
+#line 40817 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1310:
-#line 8119 "preproc.y" /* yacc.c:1646  */
+#line 8115 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40787 "preproc.c" /* yacc.c:1646  */
+#line 40825 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1311:
 #line 8123 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup("default"));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40795 "preproc.c" /* yacc.c:1646  */
+#line 40833 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1312:
-#line 8131 "preproc.y" /* yacc.c:1646  */
+#line 8127 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40803 "preproc.c" /* yacc.c:1646  */
+#line 40841 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1313:
-#line 8135 "preproc.y" /* yacc.c:1646  */
+#line 8131 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("connection limit");
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup("default"));
 }
-#line 40811 "preproc.c" /* yacc.c:1646  */
+#line 40849 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1314:
 #line 8139 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("encoding");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 40819 "preproc.c" /* yacc.c:1646  */
+#line 40857 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1315:
 #line 8143 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("location");
+ (yyval.str) = mm_strdup("connection limit");
 }
-#line 40827 "preproc.c" /* yacc.c:1646  */
+#line 40865 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1316:
 #line 8147 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("owner");
+ (yyval.str) = mm_strdup("encoding");
 }
-#line 40835 "preproc.c" /* yacc.c:1646  */
+#line 40873 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1317:
 #line 8151 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("tablespace");
+ (yyval.str) = mm_strdup("location");
 }
-#line 40843 "preproc.c" /* yacc.c:1646  */
+#line 40881 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1318:
 #line 8155 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("template");
+ (yyval.str) = mm_strdup("owner");
 }
-#line 40851 "preproc.c" /* yacc.c:1646  */
+#line 40889 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1319:
-#line 8163 "preproc.y" /* yacc.c:1646  */
+#line 8159 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("=");
+ (yyval.str) = mm_strdup("tablespace");
 }
-#line 40859 "preproc.c" /* yacc.c:1646  */
+#line 40897 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1320:
-#line 8167 "preproc.y" /* yacc.c:1646  */
+#line 8163 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 40866 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("template");
+}
+#line 40905 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1321:
-#line 8174 "preproc.y" /* yacc.c:1646  */
+#line 8171 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-2].str),mm_strdup("with"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("=");
 }
-#line 40874 "preproc.c" /* yacc.c:1646  */
+#line 40913 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1322:
-#line 8178 "preproc.y" /* yacc.c:1646  */
+#line 8175 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter database"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 40882 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 40920 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1323:
 #line 8182 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-3].str),mm_strdup("set tablespace"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-2].str),mm_strdup("with"),(yyvsp[0].str));
 }
-#line 40890 "preproc.c" /* yacc.c:1646  */
+#line 40928 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1324:
-#line 8190 "preproc.y" /* yacc.c:1646  */
+#line 8186 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter database"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40898 "preproc.c" /* yacc.c:1646  */
+#line 40936 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1325:
-#line 8198 "preproc.y" /* yacc.c:1646  */
+#line 8190 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("drop database"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-3].str),mm_strdup("set tablespace"),(yyvsp[0].str));
 }
-#line 40906 "preproc.c" /* yacc.c:1646  */
+#line 40944 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1326:
-#line 8202 "preproc.y" /* yacc.c:1646  */
+#line 8198 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("drop database if exists"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter database"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40914 "preproc.c" /* yacc.c:1646  */
+#line 40952 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1327:
-#line 8210 "preproc.y" /* yacc.c:1646  */
+#line 8206 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("alter system set"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("drop database"),(yyvsp[0].str));
 }
-#line 40922 "preproc.c" /* yacc.c:1646  */
+#line 40960 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1328:
-#line 8214 "preproc.y" /* yacc.c:1646  */
+#line 8210 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("alter system reset"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("drop database if exists"),(yyvsp[0].str));
 }
-#line 40930 "preproc.c" /* yacc.c:1646  */
+#line 40968 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1329:
-#line 8222 "preproc.y" /* yacc.c:1646  */
+#line 8218 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("create domain"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("alter system set"),(yyvsp[0].str));
 }
-#line 40938 "preproc.c" /* yacc.c:1646  */
+#line 40976 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1330:
-#line 8230 "preproc.y" /* yacc.c:1646  */
+#line 8222 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("alter system reset"),(yyvsp[0].str));
 }
-#line 40946 "preproc.c" /* yacc.c:1646  */
+#line 40984 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1331:
-#line 8234 "preproc.y" /* yacc.c:1646  */
+#line 8230 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("drop not null"));
+ (yyval.str) = cat_str(5,mm_strdup("create domain"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40954 "preproc.c" /* yacc.c:1646  */
+#line 40992 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1332:
 #line 8238 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("set not null"));
+ (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40962 "preproc.c" /* yacc.c:1646  */
+#line 41000 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1333:
 #line 8242 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-2].str),mm_strdup("add"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("drop not null"));
 }
-#line 40970 "preproc.c" /* yacc.c:1646  */
+#line 41008 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1334:
 #line 8246 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter domain"),(yyvsp[-4].str),mm_strdup("drop constraint"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("set not null"));
 }
-#line 40978 "preproc.c" /* yacc.c:1646  */
+#line 41016 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1335:
 #line 8250 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("alter domain"),(yyvsp[-6].str),mm_strdup("drop constraint if exists"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-2].str),mm_strdup("add"),(yyvsp[0].str));
 }
-#line 40986 "preproc.c" /* yacc.c:1646  */
+#line 41024 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1336:
 #line 8254 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("validate constraint"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("alter domain"),(yyvsp[-4].str),mm_strdup("drop constraint"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40994 "preproc.c" /* yacc.c:1646  */
+#line 41032 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1337:
-#line 8262 "preproc.y" /* yacc.c:1646  */
+#line 8258 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("as");
+ (yyval.str) = cat_str(5,mm_strdup("alter domain"),(yyvsp[-6].str),mm_strdup("drop constraint if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41002 "preproc.c" /* yacc.c:1646  */
+#line 41040 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1338:
-#line 8266 "preproc.y" /* yacc.c:1646  */
+#line 8262 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41009 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("validate constraint"),(yyvsp[0].str));
+}
+#line 41048 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1339:
-#line 8273 "preproc.y" /* yacc.c:1646  */
+#line 8270 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("alter text search dictionary"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("as");
 }
-#line 41017 "preproc.c" /* yacc.c:1646  */
+#line 41056 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1340:
-#line 8281 "preproc.y" /* yacc.c:1646  */
+#line 8274 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("add mapping for"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 41025 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41063 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1341:
-#line 8285 "preproc.y" /* yacc.c:1646  */
+#line 8281 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("alter mapping for"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("alter text search dictionary"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41033 "preproc.c" /* yacc.c:1646  */
+#line 41071 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1342:
 #line 8289 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("alter mapping replace"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("add mapping for"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41041 "preproc.c" /* yacc.c:1646  */
+#line 41079 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1343:
 #line 8293 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(8,mm_strdup("alter text search configuration"),(yyvsp[-8].str),mm_strdup("alter mapping for"),(yyvsp[-4].str),mm_strdup("replace"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("alter mapping for"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41049 "preproc.c" /* yacc.c:1646  */
+#line 41087 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1344:
 #line 8297 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-4].str),mm_strdup("drop mapping for"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("alter mapping replace"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41057 "preproc.c" /* yacc.c:1646  */
+#line 41095 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1345:
 #line 8301 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("drop mapping if exists for"),(yyvsp[0].str));
+ (yyval.str) = cat_str(8,mm_strdup("alter text search configuration"),(yyvsp[-8].str),mm_strdup("alter mapping for"),(yyvsp[-4].str),mm_strdup("replace"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41065 "preproc.c" /* yacc.c:1646  */
+#line 41103 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1346:
-#line 8309 "preproc.y" /* yacc.c:1646  */
+#line 8305 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with");
+ (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-4].str),mm_strdup("drop mapping for"),(yyvsp[0].str));
 }
-#line 41073 "preproc.c" /* yacc.c:1646  */
+#line 41111 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1347:
-#line 8313 "preproc.y" /* yacc.c:1646  */
+#line 8309 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with");
+ (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("drop mapping if exists for"),(yyvsp[0].str));
 }
-#line 41081 "preproc.c" /* yacc.c:1646  */
+#line 41119 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1348:
-#line 8321 "preproc.y" /* yacc.c:1646  */
+#line 8317 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-8].str),mm_strdup("conversion"),(yyvsp[-6].str),mm_strdup("for"),(yyvsp[-4].str),mm_strdup("to"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("with");
 }
-#line 41089 "preproc.c" /* yacc.c:1646  */
+#line 41127 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1349:
-#line 8329 "preproc.y" /* yacc.c:1646  */
+#line 8321 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("cluster"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("with");
 }
-#line 41097 "preproc.c" /* yacc.c:1646  */
+#line 41135 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1350:
-#line 8333 "preproc.y" /* yacc.c:1646  */
+#line 8329 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("cluster"),(yyvsp[0].str));
+ (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-8].str),mm_strdup("conversion"),(yyvsp[-6].str),mm_strdup("for"),(yyvsp[-4].str),mm_strdup("to"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 41105 "preproc.c" /* yacc.c:1646  */
+#line 41143 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1351:
 #line 8337 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("cluster"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("on"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("cluster"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41113 "preproc.c" /* yacc.c:1646  */
+#line 41151 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1352:
-#line 8345 "preproc.y" /* yacc.c:1646  */
+#line 8341 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("cluster"),(yyvsp[0].str));
 }
-#line 41121 "preproc.c" /* yacc.c:1646  */
+#line 41159 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1353:
-#line 8349 "preproc.y" /* yacc.c:1646  */
+#line 8345 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41128 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(5,mm_strdup("cluster"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("on"),(yyvsp[0].str));
+}
+#line 41167 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1354:
-#line 8356 "preproc.y" /* yacc.c:1646  */
+#line 8353 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("vacuum"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
 }
-#line 41136 "preproc.c" /* yacc.c:1646  */
+#line 41175 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1355:
-#line 8360 "preproc.y" /* yacc.c:1646  */
+#line 8357 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("vacuum"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 41144 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41182 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1356:
 #line 8364 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("vacuum"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("vacuum"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41152 "preproc.c" /* yacc.c:1646  */
+#line 41190 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1357:
 #line 8368 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("vacuum ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,mm_strdup("vacuum"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41160 "preproc.c" /* yacc.c:1646  */
+#line 41198 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1358:
 #line 8372 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("vacuum ("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("vacuum"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41168 "preproc.c" /* yacc.c:1646  */
+#line 41206 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1359:
-#line 8380 "preproc.y" /* yacc.c:1646  */
+#line 8376 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("vacuum ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 41176 "preproc.c" /* yacc.c:1646  */
+#line 41214 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1360:
-#line 8384 "preproc.y" /* yacc.c:1646  */
+#line 8380 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("vacuum ("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41184 "preproc.c" /* yacc.c:1646  */
+#line 41222 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1361:
-#line 8392 "preproc.y" /* yacc.c:1646  */
+#line 8388 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41192 "preproc.c" /* yacc.c:1646  */
+#line 41230 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1362:
-#line 8396 "preproc.y" /* yacc.c:1646  */
+#line 8392 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("verbose");
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 41200 "preproc.c" /* yacc.c:1646  */
+#line 41238 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1363:
 #line 8400 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("freeze");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 41208 "preproc.c" /* yacc.c:1646  */
+#line 41246 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1364:
 #line 8404 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("full");
+ (yyval.str) = mm_strdup("verbose");
 }
-#line 41216 "preproc.c" /* yacc.c:1646  */
+#line 41254 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1365:
-#line 8412 "preproc.y" /* yacc.c:1646  */
+#line 8408 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("freeze");
 }
-#line 41224 "preproc.c" /* yacc.c:1646  */
+#line 41262 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1366:
-#line 8416 "preproc.y" /* yacc.c:1646  */
+#line 8412 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("full");
 }
-#line 41232 "preproc.c" /* yacc.c:1646  */
+#line 41270 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1367:
-#line 8424 "preproc.y" /* yacc.c:1646  */
+#line 8420 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("analyze");
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41240 "preproc.c" /* yacc.c:1646  */
+#line 41278 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1368:
-#line 8428 "preproc.y" /* yacc.c:1646  */
+#line 8424 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("analyse");
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41248 "preproc.c" /* yacc.c:1646  */
+#line 41286 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1369:
-#line 8436 "preproc.y" /* yacc.c:1646  */
+#line 8432 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("verbose");
+ (yyval.str) = mm_strdup("analyze");
 }
-#line 41256 "preproc.c" /* yacc.c:1646  */
+#line 41294 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1370:
-#line 8440 "preproc.y" /* yacc.c:1646  */
+#line 8436 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41263 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("analyse");
+}
+#line 41302 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1371:
-#line 8447 "preproc.y" /* yacc.c:1646  */
+#line 8444 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("full");
+ (yyval.str) = mm_strdup("verbose");
 }
-#line 41271 "preproc.c" /* yacc.c:1646  */
+#line 41310 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1372:
-#line 8451 "preproc.y" /* yacc.c:1646  */
+#line 8448 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 41278 "preproc.c" /* yacc.c:1646  */
+#line 41317 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1373:
-#line 8458 "preproc.y" /* yacc.c:1646  */
+#line 8455 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("freeze");
+ (yyval.str) = mm_strdup("full");
 }
-#line 41286 "preproc.c" /* yacc.c:1646  */
+#line 41325 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1374:
-#line 8462 "preproc.y" /* yacc.c:1646  */
+#line 8459 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 41293 "preproc.c" /* yacc.c:1646  */
+#line 41332 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1375:
-#line 8469 "preproc.y" /* yacc.c:1646  */
+#line 8466 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("freeze");
 }
-#line 41301 "preproc.c" /* yacc.c:1646  */
+#line 41340 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1376:
-#line 8473 "preproc.y" /* yacc.c:1646  */
+#line 8470 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 41308 "preproc.c" /* yacc.c:1646  */
+#line 41347 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1377:
-#line 8480 "preproc.y" /* yacc.c:1646  */
+#line 8477 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("explain"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 41316 "preproc.c" /* yacc.c:1646  */
+#line 41355 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1378:
-#line 8484 "preproc.y" /* yacc.c:1646  */
+#line 8481 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("explain"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 41324 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41362 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1379:
 #line 8488 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("explain verbose"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("explain"),(yyvsp[0].str));
 }
-#line 41332 "preproc.c" /* yacc.c:1646  */
+#line 41370 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1380:
 #line 8492 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("explain ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("explain"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41340 "preproc.c" /* yacc.c:1646  */
+#line 41378 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1381:
-#line 8500 "preproc.y" /* yacc.c:1646  */
+#line 8496 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("explain verbose"),(yyvsp[0].str));
 }
-#line 41348 "preproc.c" /* yacc.c:1646  */
+#line 41386 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1382:
-#line 8504 "preproc.y" /* yacc.c:1646  */
+#line 8500 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(4,mm_strdup("explain ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 41356 "preproc.c" /* yacc.c:1646  */
+#line 41394 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1383:
@@ -41360,7 +41398,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41364 "preproc.c" /* yacc.c:1646  */
+#line 41402 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1384:
@@ -41368,7 +41406,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41372 "preproc.c" /* yacc.c:1646  */
+#line 41410 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1385:
@@ -41376,7 +41414,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41380 "preproc.c" /* yacc.c:1646  */
+#line 41418 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1386:
@@ -41384,7 +41422,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41388 "preproc.c" /* yacc.c:1646  */
+#line 41426 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1387:
@@ -41392,7 +41430,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41396 "preproc.c" /* yacc.c:1646  */
+#line 41434 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1388:
@@ -41400,7 +41438,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41404 "preproc.c" /* yacc.c:1646  */
+#line 41442 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1389:
@@ -41408,121 +41446,121 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41412 "preproc.c" /* yacc.c:1646  */
+#line 41450 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1390:
-#line 8540 "preproc.y" /* yacc.c:1646  */
+#line 8536 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41420 "preproc.c" /* yacc.c:1646  */
+#line 41458 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1391:
-#line 8544 "preproc.y" /* yacc.c:1646  */
+#line 8540 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 41428 "preproc.c" /* yacc.c:1646  */
+#line 41466 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1392:
-#line 8552 "preproc.y" /* yacc.c:1646  */
+#line 8548 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 41436 "preproc.c" /* yacc.c:1646  */
+#line 41474 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1393:
-#line 8560 "preproc.y" /* yacc.c:1646  */
+#line 8552 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 41444 "preproc.c" /* yacc.c:1646  */
+#line 41482 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1394:
-#line 8564 "preproc.y" /* yacc.c:1646  */
+#line 8560 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41452 "preproc.c" /* yacc.c:1646  */
+#line 41490 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1395:
-#line 8572 "preproc.y" /* yacc.c:1646  */
+#line 8568 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41460 "preproc.c" /* yacc.c:1646  */
+#line 41498 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1396:
-#line 8576 "preproc.y" /* yacc.c:1646  */
+#line 8572 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41468 "preproc.c" /* yacc.c:1646  */
+#line 41506 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1397:
 #line 8580 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41475 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 41514 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1398:
-#line 8587 "preproc.y" /* yacc.c:1646  */
+#line 8584 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 41522 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 1399:
+#line 8588 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str)=EMPTY; }
+#line 41529 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 1400:
+#line 8595 "preproc.y" /* yacc.c:1646  */
     {
 		(yyval.prep).name = (yyvsp[-3].str);
 		(yyval.prep).type = (yyvsp[-2].str);
 		(yyval.prep).stmt = cat_str(3, mm_strdup("\""), (yyvsp[0].str), mm_strdup("\""));
 	}
-#line 41485 "preproc.c" /* yacc.c:1646  */
+#line 41539 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1399:
-#line 8593 "preproc.y" /* yacc.c:1646  */
+  case 1401:
+#line 8601 "preproc.y" /* yacc.c:1646  */
     {
 		(yyval.prep).name = (yyvsp[-2].str);
 		(yyval.prep).type = NULL;
 		(yyval.prep).stmt = (yyvsp[0].str);
 	}
-#line 41495 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 1400:
-#line 8603 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
-}
-#line 41503 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 1401:
-#line 8607 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str)=EMPTY; }
-#line 41510 "preproc.c" /* yacc.c:1646  */
+#line 41549 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1402:
-#line 8614 "preproc.y" /* yacc.c:1646  */
+#line 8611 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 41518 "preproc.c" /* yacc.c:1646  */
+#line 41557 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1403:
-#line 8618 "preproc.y" /* yacc.c:1646  */
+#line 8615 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 41526 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41564 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1404:
@@ -41530,7 +41568,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41534 "preproc.c" /* yacc.c:1646  */
+#line 41572 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1405:
@@ -41538,409 +41576,425 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41542 "preproc.c" /* yacc.c:1646  */
+#line 41580 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1406:
-#line 8634 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[-2].str); }
-#line 41548 "preproc.c" /* yacc.c:1646  */
+#line 8630 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 41588 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1407:
-#line 8636 "preproc.y" /* yacc.c:1646  */
+#line 8634 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(8,mm_strdup("create"),(yyvsp[-7].str),mm_strdup("table"),(yyvsp[-5].str),mm_strdup("as execute"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 41556 "preproc.c" /* yacc.c:1646  */
+#line 41596 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1408:
-#line 8644 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
-}
-#line 41564 "preproc.c" /* yacc.c:1646  */
+#line 8642 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[-2].str); }
+#line 41602 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1409:
-#line 8648 "preproc.y" /* yacc.c:1646  */
+#line 8644 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41571 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(8,mm_strdup("create"),(yyvsp[-7].str),mm_strdup("table"),(yyvsp[-5].str),mm_strdup("as execute"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 41610 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1410:
-#line 8655 "preproc.y" /* yacc.c:1646  */
+#line 8652 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,(yyvsp[-6].str),mm_strdup("insert into"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 41579 "preproc.c" /* yacc.c:1646  */
+#line 41618 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1411:
-#line 8663 "preproc.y" /* yacc.c:1646  */
+#line 8656 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 41587 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41625 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1412:
-#line 8667 "preproc.y" /* yacc.c:1646  */
+#line 8663 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,(yyvsp[-6].str),mm_strdup("insert into"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41595 "preproc.c" /* yacc.c:1646  */
+#line 41633 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1413:
-#line 8675 "preproc.y" /* yacc.c:1646  */
+#line 8671 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41603 "preproc.c" /* yacc.c:1646  */
+#line 41641 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1414:
-#line 8679 "preproc.y" /* yacc.c:1646  */
+#line 8675 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 41611 "preproc.c" /* yacc.c:1646  */
+#line 41649 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1415:
 #line 8683 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("default values");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 41619 "preproc.c" /* yacc.c:1646  */
+#line 41657 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1416:
-#line 8691 "preproc.y" /* yacc.c:1646  */
+#line 8687 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 41627 "preproc.c" /* yacc.c:1646  */
+#line 41665 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1417:
-#line 8695 "preproc.y" /* yacc.c:1646  */
+#line 8691 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("default values");
 }
-#line 41635 "preproc.c" /* yacc.c:1646  */
+#line 41673 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1418:
-#line 8703 "preproc.y" /* yacc.c:1646  */
+#line 8699 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 41643 "preproc.c" /* yacc.c:1646  */
+#line 41681 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1419:
-#line 8711 "preproc.y" /* yacc.c:1646  */
+#line 8703 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("on conflict"),(yyvsp[-5].str),mm_strdup("do update set"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 41651 "preproc.c" /* yacc.c:1646  */
+#line 41689 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1420:
-#line 8715 "preproc.y" /* yacc.c:1646  */
+#line 8711 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("on conflict"),(yyvsp[-2].str),mm_strdup("do nothing"));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41659 "preproc.c" /* yacc.c:1646  */
+#line 41697 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1421:
 #line 8719 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41666 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(5,mm_strdup("on conflict"),(yyvsp[-5].str),mm_strdup("do update set"),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 41705 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1422:
-#line 8726 "preproc.y" /* yacc.c:1646  */
+#line 8723 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("on conflict"),(yyvsp[-2].str),mm_strdup("do nothing"));
 }
-#line 41674 "preproc.c" /* yacc.c:1646  */
+#line 41713 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1423:
-#line 8730 "preproc.y" /* yacc.c:1646  */
+#line 8727 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("on constraint"),(yyvsp[0].str));
-}
-#line 41682 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41720 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1424:
 #line 8734 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41689 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+}
+#line 41728 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1425:
-#line 8741 "preproc.y" /* yacc.c:1646  */
+#line 8738 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("returning"),(yyvsp[-1].str));
+ (yyval.str) = cat_str(2,mm_strdup("on constraint"),(yyvsp[0].str));
 }
-#line 41697 "preproc.c" /* yacc.c:1646  */
+#line 41736 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1426:
-#line 8745 "preproc.y" /* yacc.c:1646  */
+#line 8742 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 41704 "preproc.c" /* yacc.c:1646  */
+#line 41743 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1427:
-#line 8752 "preproc.y" /* yacc.c:1646  */
+#line 8749 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,(yyvsp[-6].str),mm_strdup("delete from"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("returning"),(yyvsp[-1].str));
 }
-#line 41712 "preproc.c" /* yacc.c:1646  */
+#line 41751 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1428:
-#line 8760 "preproc.y" /* yacc.c:1646  */
+#line 8753 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
-}
-#line 41720 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41758 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1429:
-#line 8764 "preproc.y" /* yacc.c:1646  */
+#line 8760 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41727 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(6,(yyvsp[-6].str),mm_strdup("delete from"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 41766 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1430:
-#line 8771 "preproc.y" /* yacc.c:1646  */
+#line 8768 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("lock"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
 }
-#line 41735 "preproc.c" /* yacc.c:1646  */
+#line 41774 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1431:
-#line 8779 "preproc.y" /* yacc.c:1646  */
+#line 8772 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("in"),(yyvsp[-1].str),mm_strdup("mode"));
-}
-#line 41743 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41781 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1432:
-#line 8783 "preproc.y" /* yacc.c:1646  */
+#line 8779 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41750 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(5,mm_strdup("lock"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 41789 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1433:
-#line 8790 "preproc.y" /* yacc.c:1646  */
+#line 8787 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("access share");
+ (yyval.str) = cat_str(3,mm_strdup("in"),(yyvsp[-1].str),mm_strdup("mode"));
 }
-#line 41758 "preproc.c" /* yacc.c:1646  */
+#line 41797 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1434:
-#line 8794 "preproc.y" /* yacc.c:1646  */
+#line 8791 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("row share");
-}
-#line 41766 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41804 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1435:
 #line 8798 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("row exclusive");
+ (yyval.str) = mm_strdup("access share");
 }
-#line 41774 "preproc.c" /* yacc.c:1646  */
+#line 41812 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1436:
 #line 8802 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("share update exclusive");
+ (yyval.str) = mm_strdup("row share");
 }
-#line 41782 "preproc.c" /* yacc.c:1646  */
+#line 41820 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1437:
 #line 8806 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("share");
+ (yyval.str) = mm_strdup("row exclusive");
 }
-#line 41790 "preproc.c" /* yacc.c:1646  */
+#line 41828 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1438:
 #line 8810 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("share row exclusive");
+ (yyval.str) = mm_strdup("share update exclusive");
 }
-#line 41798 "preproc.c" /* yacc.c:1646  */
+#line 41836 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1439:
 #line 8814 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("exclusive");
+ (yyval.str) = mm_strdup("share");
 }
-#line 41806 "preproc.c" /* yacc.c:1646  */
+#line 41844 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1440:
 #line 8818 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("access exclusive");
+ (yyval.str) = mm_strdup("share row exclusive");
 }
-#line 41814 "preproc.c" /* yacc.c:1646  */
+#line 41852 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1441:
-#line 8826 "preproc.y" /* yacc.c:1646  */
+#line 8822 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("nowait");
+ (yyval.str) = mm_strdup("exclusive");
 }
-#line 41822 "preproc.c" /* yacc.c:1646  */
+#line 41860 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1442:
-#line 8830 "preproc.y" /* yacc.c:1646  */
+#line 8826 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41829 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("access exclusive");
+}
+#line 41868 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1443:
-#line 8837 "preproc.y" /* yacc.c:1646  */
+#line 8834 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = mm_strdup("nowait");
 }
-#line 41837 "preproc.c" /* yacc.c:1646  */
+#line 41876 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1444:
-#line 8841 "preproc.y" /* yacc.c:1646  */
+#line 8838 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("skip locked");
-}
-#line 41845 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41883 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1445:
 #line 8845 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 41852 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("nowait");
+}
+#line 41891 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1446:
-#line 8852 "preproc.y" /* yacc.c:1646  */
+#line 8849 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(8,(yyvsp[-7].str),mm_strdup("update"),(yyvsp[-5].str),mm_strdup("set"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("skip locked");
 }
-#line 41860 "preproc.c" /* yacc.c:1646  */
+#line 41899 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1447:
-#line 8860 "preproc.y" /* yacc.c:1646  */
+#line 8853 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 41868 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 41906 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1448:
-#line 8864 "preproc.y" /* yacc.c:1646  */
+#line 8860 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(8,(yyvsp[-7].str),mm_strdup("update"),(yyvsp[-5].str),mm_strdup("set"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41876 "preproc.c" /* yacc.c:1646  */
+#line 41914 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1449:
-#line 8872 "preproc.y" /* yacc.c:1646  */
+#line 8868 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41884 "preproc.c" /* yacc.c:1646  */
+#line 41922 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1450:
-#line 8876 "preproc.y" /* yacc.c:1646  */
+#line 8872 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 41892 "preproc.c" /* yacc.c:1646  */
+#line 41930 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1451:
-#line 8884 "preproc.y" /* yacc.c:1646  */
+#line 8880 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 41900 "preproc.c" /* yacc.c:1646  */
+#line 41938 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1452:
-#line 8892 "preproc.y" /* yacc.c:1646  */
+#line 8884 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-3].str),mm_strdup(") ="),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 41908 "preproc.c" /* yacc.c:1646  */
+#line 41946 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1453:
-#line 8896 "preproc.y" /* yacc.c:1646  */
+#line 8892 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-3].str),mm_strdup(") ="),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 41916 "preproc.c" /* yacc.c:1646  */
+#line 41954 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1454:
-#line 8904 "preproc.y" /* yacc.c:1646  */
+#line 8900 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-3].str),mm_strdup(") ="),(yyvsp[0].str));
 }
-#line 41924 "preproc.c" /* yacc.c:1646  */
+#line 41962 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1455:
-#line 8912 "preproc.y" /* yacc.c:1646  */
+#line 8904 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-3].str),mm_strdup(") ="),(yyvsp[0].str));
 }
-#line 41932 "preproc.c" /* yacc.c:1646  */
+#line 41970 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1456:
-#line 8916 "preproc.y" /* yacc.c:1646  */
+#line 8912 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41940 "preproc.c" /* yacc.c:1646  */
+#line 41978 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1457:
+#line 8920 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 41986 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 1458:
 #line 8924 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+}
+#line 41994 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 1459:
+#line 8932 "preproc.y" /* yacc.c:1646  */
     {
 		struct cursor *ptr, *this;
 		char *cursor_marker = (yyvsp[-5].str)[0] == ':' ? mm_strdup("$0") : mm_strdup((yyvsp[-5].str));
@@ -41989,19 +42043,19 @@
 		else
 			(yyval.str) = cat2_str(adjust_outofscope_cursor_vars(this), comment);
 	}
-#line 41993 "preproc.c" /* yacc.c:1646  */
+#line 42047 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1458:
-#line 8977 "preproc.y" /* yacc.c:1646  */
+  case 1460:
+#line 8985 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42001 "preproc.c" /* yacc.c:1646  */
+#line 42055 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1459:
-#line 8981 "preproc.y" /* yacc.c:1646  */
+  case 1461:
+#line 8989 "preproc.y" /* yacc.c:1646  */
     {
 			char *curname = mm_alloc(strlen((yyvsp[0].str)) + 2);
 			sprintf(curname, ":%s", (yyvsp[0].str));
@@ -42009,744 +42063,728 @@
 			(yyvsp[0].str) = curname;
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 42013 "preproc.c" /* yacc.c:1646  */
+#line 42067 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1460:
-#line 8993 "preproc.y" /* yacc.c:1646  */
+  case 1462:
+#line 9001 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 42020 "preproc.c" /* yacc.c:1646  */
+#line 42074 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1461:
-#line 8996 "preproc.y" /* yacc.c:1646  */
+  case 1463:
+#line 9004 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("no scroll"));
 }
-#line 42028 "preproc.c" /* yacc.c:1646  */
+#line 42082 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1462:
-#line 9000 "preproc.y" /* yacc.c:1646  */
+  case 1464:
+#line 9008 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("scroll"));
 }
-#line 42036 "preproc.c" /* yacc.c:1646  */
+#line 42090 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1463:
-#line 9004 "preproc.y" /* yacc.c:1646  */
+  case 1465:
+#line 9012 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("binary"));
 }
-#line 42044 "preproc.c" /* yacc.c:1646  */
+#line 42098 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1464:
-#line 9008 "preproc.y" /* yacc.c:1646  */
+  case 1466:
+#line 9016 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("insensitive"));
 }
-#line 42052 "preproc.c" /* yacc.c:1646  */
+#line 42106 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1465:
-#line 9016 "preproc.y" /* yacc.c:1646  */
+  case 1467:
+#line 9024 "preproc.y" /* yacc.c:1646  */
     {
 		if (compat == ECPG_COMPAT_INFORMIX_SE && autocommit)
 			(yyval.str) = mm_strdup("with hold");
 		else
 			(yyval.str) = EMPTY;
 	}
-#line 42063 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 1466:
-#line 9023 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = mm_strdup("with hold");
-}
-#line 42071 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 1467:
-#line 9027 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = mm_strdup("without hold");
-}
-#line 42079 "preproc.c" /* yacc.c:1646  */
+#line 42117 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1468:
-#line 9035 "preproc.y" /* yacc.c:1646  */
+#line 9031 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("with hold");
 }
-#line 42087 "preproc.c" /* yacc.c:1646  */
+#line 42125 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1469:
-#line 9039 "preproc.y" /* yacc.c:1646  */
+#line 9035 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("without hold");
 }
-#line 42095 "preproc.c" /* yacc.c:1646  */
+#line 42133 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1470:
-#line 9047 "preproc.y" /* yacc.c:1646  */
+#line 9043 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42103 "preproc.c" /* yacc.c:1646  */
+#line 42141 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1471:
-#line 9051 "preproc.y" /* yacc.c:1646  */
+#line 9047 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42111 "preproc.c" /* yacc.c:1646  */
+#line 42149 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1472:
-#line 9059 "preproc.y" /* yacc.c:1646  */
+#line 9055 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42119 "preproc.c" /* yacc.c:1646  */
+#line 42157 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1473:
-#line 9063 "preproc.y" /* yacc.c:1646  */
+#line 9059 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42127 "preproc.c" /* yacc.c:1646  */
+#line 42165 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1474:
 #line 9067 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42135 "preproc.c" /* yacc.c:1646  */
+#line 42173 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1475:
 #line 9071 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42143 "preproc.c" /* yacc.c:1646  */
+#line 42181 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1476:
 #line 9075 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42151 "preproc.c" /* yacc.c:1646  */
+#line 42189 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1477:
 #line 9079 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42159 "preproc.c" /* yacc.c:1646  */
+#line 42197 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1478:
 #line 9083 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42167 "preproc.c" /* yacc.c:1646  */
+#line 42205 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1479:
 #line 9087 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42175 "preproc.c" /* yacc.c:1646  */
+#line 42213 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1480:
-#line 9095 "preproc.y" /* yacc.c:1646  */
+#line 9091 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42183 "preproc.c" /* yacc.c:1646  */
+#line 42221 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1481:
-#line 9099 "preproc.y" /* yacc.c:1646  */
+#line 9095 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42191 "preproc.c" /* yacc.c:1646  */
+#line 42229 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1482:
-#line 9107 "preproc.y" /* yacc.c:1646  */
+#line 9103 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(9,mm_strdup("select"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42199 "preproc.c" /* yacc.c:1646  */
+#line 42237 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1483:
-#line 9111 "preproc.y" /* yacc.c:1646  */
+#line 9107 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(9,mm_strdup("select"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42207 "preproc.c" /* yacc.c:1646  */
+#line 42245 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1484:
 #line 9115 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(9,mm_strdup("select"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42215 "preproc.c" /* yacc.c:1646  */
+#line 42253 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1485:
 #line 9119 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[0].str));
+ (yyval.str) = cat_str(9,mm_strdup("select"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42223 "preproc.c" /* yacc.c:1646  */
+#line 42261 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1486:
 #line 9123 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("union"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42231 "preproc.c" /* yacc.c:1646  */
+#line 42269 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1487:
 #line 9127 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("intersect"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[0].str));
 }
-#line 42239 "preproc.c" /* yacc.c:1646  */
+#line 42277 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1488:
 #line 9131 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("except"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("union"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42247 "preproc.c" /* yacc.c:1646  */
+#line 42285 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1489:
-#line 9139 "preproc.y" /* yacc.c:1646  */
+#line 9135 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("intersect"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42255 "preproc.c" /* yacc.c:1646  */
+#line 42293 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1490:
-#line 9143 "preproc.y" /* yacc.c:1646  */
+#line 9139 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("except"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42263 "preproc.c" /* yacc.c:1646  */
+#line 42301 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1491:
 #line 9147 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("with recursive"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
 }
-#line 42271 "preproc.c" /* yacc.c:1646  */
+#line 42309 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1492:
-#line 9155 "preproc.y" /* yacc.c:1646  */
+#line 9151 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
 }
-#line 42279 "preproc.c" /* yacc.c:1646  */
+#line 42317 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1493:
-#line 9159 "preproc.y" /* yacc.c:1646  */
+#line 9155 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("with recursive"),(yyvsp[0].str));
 }
-#line 42287 "preproc.c" /* yacc.c:1646  */
+#line 42325 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1494:
-#line 9167 "preproc.y" /* yacc.c:1646  */
+#line 9163 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42295 "preproc.c" /* yacc.c:1646  */
+#line 42333 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1495:
-#line 9175 "preproc.y" /* yacc.c:1646  */
+#line 9167 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 42303 "preproc.c" /* yacc.c:1646  */
+#line 42341 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1496:
-#line 9179 "preproc.y" /* yacc.c:1646  */
+#line 9175 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42310 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(5,(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 42349 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1497:
-#line 9186 "preproc.y" /* yacc.c:1646  */
-    {
-						FoundInto = 1;
-						(yyval.str)= cat2_str(mm_strdup("into"), (yyvsp[0].str));
-					}
-#line 42319 "preproc.c" /* yacc.c:1646  */
+#line 9183 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 42357 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1498:
-#line 9190 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = EMPTY; }
-#line 42325 "preproc.c" /* yacc.c:1646  */
+#line 9187 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str)=EMPTY; }
+#line 42364 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1499:
-#line 9192 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str)=EMPTY; }
-#line 42332 "preproc.c" /* yacc.c:1646  */
+#line 9194 "preproc.y" /* yacc.c:1646  */
+    {
+						FoundInto = 1;
+						(yyval.str)= cat2_str(mm_strdup("into"), (yyvsp[0].str));
+					}
+#line 42373 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1500:
-#line 9199 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = cat_str(3,mm_strdup("temporary"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 42340 "preproc.c" /* yacc.c:1646  */
+#line 9198 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = EMPTY; }
+#line 42379 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1501:
-#line 9203 "preproc.y" /* yacc.c:1646  */
+#line 9200 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("temp"),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 42348 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 42386 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1502:
 #line 9207 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("local temporary"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("temporary"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42356 "preproc.c" /* yacc.c:1646  */
+#line 42394 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1503:
 #line 9211 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("local temp"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("temp"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42364 "preproc.c" /* yacc.c:1646  */
+#line 42402 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1504:
 #line 9215 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("global temporary"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("local temporary"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42372 "preproc.c" /* yacc.c:1646  */
+#line 42410 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1505:
 #line 9219 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("global temp"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("local temp"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42380 "preproc.c" /* yacc.c:1646  */
+#line 42418 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1506:
 #line 9223 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("unlogged"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("global temporary"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42388 "preproc.c" /* yacc.c:1646  */
+#line 42426 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1507:
 #line 9227 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("global temp"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42396 "preproc.c" /* yacc.c:1646  */
+#line 42434 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1508:
 #line 9231 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("unlogged"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42404 "preproc.c" /* yacc.c:1646  */
+#line 42442 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1509:
-#line 9239 "preproc.y" /* yacc.c:1646  */
+#line 9235 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("table");
+ (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[0].str));
 }
-#line 42412 "preproc.c" /* yacc.c:1646  */
+#line 42450 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1510:
-#line 9243 "preproc.y" /* yacc.c:1646  */
+#line 9239 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42419 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 42458 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1511:
-#line 9250 "preproc.y" /* yacc.c:1646  */
+#line 9247 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all");
+ (yyval.str) = mm_strdup("table");
 }
-#line 42427 "preproc.c" /* yacc.c:1646  */
+#line 42466 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1512:
-#line 9254 "preproc.y" /* yacc.c:1646  */
+#line 9251 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("distinct");
-}
-#line 42435 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 42473 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1513:
 #line 9258 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42442 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("all");
+}
+#line 42481 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1514:
-#line 9265 "preproc.y" /* yacc.c:1646  */
+#line 9262 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = mm_strdup("distinct");
 }
-#line 42450 "preproc.c" /* yacc.c:1646  */
+#line 42489 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1515:
-#line 9269 "preproc.y" /* yacc.c:1646  */
+#line 9266 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("distinct on ("),(yyvsp[-1].str),mm_strdup(")"));
-}
-#line 42458 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 42496 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1516:
-#line 9277 "preproc.y" /* yacc.c:1646  */
+#line 9273 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all");
+ (yyval.str) = mm_strdup("distinct");
 }
-#line 42466 "preproc.c" /* yacc.c:1646  */
+#line 42504 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1517:
-#line 9281 "preproc.y" /* yacc.c:1646  */
+#line 9277 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42473 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("distinct on ("),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 42512 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1518:
-#line 9288 "preproc.y" /* yacc.c:1646  */
+#line 9285 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("all");
 }
-#line 42481 "preproc.c" /* yacc.c:1646  */
+#line 42520 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1519:
-#line 9292 "preproc.y" /* yacc.c:1646  */
+#line 9289 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 42488 "preproc.c" /* yacc.c:1646  */
+#line 42527 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1520:
-#line 9299 "preproc.y" /* yacc.c:1646  */
+#line 9296 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("order by"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42496 "preproc.c" /* yacc.c:1646  */
+#line 42535 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1521:
-#line 9307 "preproc.y" /* yacc.c:1646  */
+#line 9300 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 42504 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 42542 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1522:
-#line 9311 "preproc.y" /* yacc.c:1646  */
+#line 9307 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("order by"),(yyvsp[0].str));
 }
-#line 42512 "preproc.c" /* yacc.c:1646  */
+#line 42550 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1523:
-#line 9319 "preproc.y" /* yacc.c:1646  */
+#line 9315 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42520 "preproc.c" /* yacc.c:1646  */
+#line 42558 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1524:
-#line 9323 "preproc.y" /* yacc.c:1646  */
+#line 9319 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 42528 "preproc.c" /* yacc.c:1646  */
+#line 42566 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1525:
-#line 9331 "preproc.y" /* yacc.c:1646  */
+#line 9327 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42536 "preproc.c" /* yacc.c:1646  */
+#line 42574 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1526:
-#line 9335 "preproc.y" /* yacc.c:1646  */
+#line 9331 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42544 "preproc.c" /* yacc.c:1646  */
+#line 42582 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1527:
 #line 9339 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42552 "preproc.c" /* yacc.c:1646  */
+#line 42590 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1528:
 #line 9343 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42560 "preproc.c" /* yacc.c:1646  */
+#line 42598 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1529:
-#line 9351 "preproc.y" /* yacc.c:1646  */
+#line 9347 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42568 "preproc.c" /* yacc.c:1646  */
+#line 42606 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1530:
-#line 9355 "preproc.y" /* yacc.c:1646  */
+#line 9351 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42575 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 42614 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1531:
-#line 9362 "preproc.y" /* yacc.c:1646  */
+#line 9359 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("limit"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42583 "preproc.c" /* yacc.c:1646  */
+#line 42622 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1532:
-#line 9366 "preproc.y" /* yacc.c:1646  */
-    {
-		mmerror(PARSE_ERROR, ET_WARNING, "no longer supported LIMIT #,# syntax passed to server");
-		(yyval.str) = cat_str(4, mm_strdup("limit"), (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str));
-	}
-#line 42592 "preproc.c" /* yacc.c:1646  */
+#line 9363 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str)=EMPTY; }
+#line 42629 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1533:
-#line 9371 "preproc.y" /* yacc.c:1646  */
+#line 9370 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("fetch"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup("only"));
+ (yyval.str) = cat_str(2,mm_strdup("limit"),(yyvsp[0].str));
 }
-#line 42600 "preproc.c" /* yacc.c:1646  */
+#line 42637 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1534:
-#line 9379 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = cat_str(2,mm_strdup("offset"),(yyvsp[0].str));
-}
-#line 42608 "preproc.c" /* yacc.c:1646  */
+#line 9374 "preproc.y" /* yacc.c:1646  */
+    {
+		mmerror(PARSE_ERROR, ET_WARNING, "no longer supported LIMIT #,# syntax passed to server");
+		(yyval.str) = cat_str(4, mm_strdup("limit"), (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str));
+	}
+#line 42646 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1535:
-#line 9383 "preproc.y" /* yacc.c:1646  */
+#line 9379 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("offset"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("fetch"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup("only"));
 }
-#line 42616 "preproc.c" /* yacc.c:1646  */
+#line 42654 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1536:
-#line 9391 "preproc.y" /* yacc.c:1646  */
+#line 9387 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("offset"),(yyvsp[0].str));
 }
-#line 42624 "preproc.c" /* yacc.c:1646  */
+#line 42662 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1537:
-#line 9395 "preproc.y" /* yacc.c:1646  */
+#line 9391 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all");
+ (yyval.str) = cat_str(3,mm_strdup("offset"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42632 "preproc.c" /* yacc.c:1646  */
+#line 42670 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1538:
-#line 9403 "preproc.y" /* yacc.c:1646  */
+#line 9399 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42640 "preproc.c" /* yacc.c:1646  */
+#line 42678 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1539:
-#line 9411 "preproc.y" /* yacc.c:1646  */
+#line 9403 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("all");
 }
-#line 42648 "preproc.c" /* yacc.c:1646  */
+#line 42686 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1540:
-#line 9415 "preproc.y" /* yacc.c:1646  */
+#line 9411 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42656 "preproc.c" /* yacc.c:1646  */
+#line 42694 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1541:
 #line 9419 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42663 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 42702 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1542:
-#line 9426 "preproc.y" /* yacc.c:1646  */
+#line 9423 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42671 "preproc.c" /* yacc.c:1646  */
+#line 42710 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1543:
-#line 9434 "preproc.y" /* yacc.c:1646  */
+#line 9427 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("row");
-}
-#line 42679 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 42717 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1544:
-#line 9438 "preproc.y" /* yacc.c:1646  */
+#line 9434 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("rows");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42687 "preproc.c" /* yacc.c:1646  */
+#line 42725 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1545:
-#line 9446 "preproc.y" /* yacc.c:1646  */
+#line 9442 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("first");
+ (yyval.str) = mm_strdup("row");
 }
-#line 42695 "preproc.c" /* yacc.c:1646  */
+#line 42733 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1546:
-#line 9450 "preproc.y" /* yacc.c:1646  */
+#line 9446 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("next");
+ (yyval.str) = mm_strdup("rows");
 }
-#line 42703 "preproc.c" /* yacc.c:1646  */
+#line 42741 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1547:
-#line 9458 "preproc.y" /* yacc.c:1646  */
+#line 9454 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("group by"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("first");
 }
-#line 42711 "preproc.c" /* yacc.c:1646  */
+#line 42749 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1548:
-#line 9462 "preproc.y" /* yacc.c:1646  */
+#line 9458 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42718 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("next");
+}
+#line 42757 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1549:
-#line 9469 "preproc.y" /* yacc.c:1646  */
+#line 9466 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("group by"),(yyvsp[0].str));
 }
-#line 42726 "preproc.c" /* yacc.c:1646  */
+#line 42765 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1550:
-#line 9473 "preproc.y" /* yacc.c:1646  */
+#line 9470 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
-}
-#line 42734 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 42772 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1551:
-#line 9481 "preproc.y" /* yacc.c:1646  */
+#line 9477 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42742 "preproc.c" /* yacc.c:1646  */
+#line 42780 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1552:
-#line 9485 "preproc.y" /* yacc.c:1646  */
+#line 9481 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 42750 "preproc.c" /* yacc.c:1646  */
+#line 42788 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1553:
@@ -42754,7 +42792,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42758 "preproc.c" /* yacc.c:1646  */
+#line 42796 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1554:
@@ -42762,7 +42800,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42766 "preproc.c" /* yacc.c:1646  */
+#line 42804 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1555:
@@ -42770,219 +42808,219 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42774 "preproc.c" /* yacc.c:1646  */
+#line 42812 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1556:
-#line 9505 "preproc.y" /* yacc.c:1646  */
+#line 9501 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("( )");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42782 "preproc.c" /* yacc.c:1646  */
+#line 42820 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1557:
-#line 9513 "preproc.y" /* yacc.c:1646  */
+#line 9505 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("rollup ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42790 "preproc.c" /* yacc.c:1646  */
+#line 42828 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1558:
-#line 9521 "preproc.y" /* yacc.c:1646  */
+#line 9513 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("cube ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("( )");
 }
-#line 42798 "preproc.c" /* yacc.c:1646  */
+#line 42836 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1559:
-#line 9529 "preproc.y" /* yacc.c:1646  */
+#line 9521 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("grouping sets ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("rollup ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42806 "preproc.c" /* yacc.c:1646  */
+#line 42844 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1560:
-#line 9537 "preproc.y" /* yacc.c:1646  */
+#line 9529 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("having"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("cube ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42814 "preproc.c" /* yacc.c:1646  */
+#line 42852 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1561:
-#line 9541 "preproc.y" /* yacc.c:1646  */
+#line 9537 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42821 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("grouping sets ("),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 42860 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1562:
-#line 9548 "preproc.y" /* yacc.c:1646  */
+#line 9545 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("having"),(yyvsp[0].str));
 }
-#line 42829 "preproc.c" /* yacc.c:1646  */
+#line 42868 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1563:
-#line 9552 "preproc.y" /* yacc.c:1646  */
+#line 9549 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("for read only");
-}
-#line 42837 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 42875 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1564:
-#line 9560 "preproc.y" /* yacc.c:1646  */
+#line 9556 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42845 "preproc.c" /* yacc.c:1646  */
+#line 42883 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1565:
-#line 9564 "preproc.y" /* yacc.c:1646  */
+#line 9560 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42852 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("for read only");
+}
+#line 42891 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1566:
-#line 9571 "preproc.y" /* yacc.c:1646  */
+#line 9568 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42860 "preproc.c" /* yacc.c:1646  */
+#line 42899 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1567:
-#line 9575 "preproc.y" /* yacc.c:1646  */
+#line 9572 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 42868 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 42906 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1568:
-#line 9583 "preproc.y" /* yacc.c:1646  */
+#line 9579 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42876 "preproc.c" /* yacc.c:1646  */
+#line 42914 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1569:
-#line 9591 "preproc.y" /* yacc.c:1646  */
+#line 9583 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("for update");
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42884 "preproc.c" /* yacc.c:1646  */
+#line 42922 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1570:
-#line 9595 "preproc.y" /* yacc.c:1646  */
+#line 9591 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("for no key update");
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42892 "preproc.c" /* yacc.c:1646  */
+#line 42930 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1571:
 #line 9599 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("for share");
+ (yyval.str) = mm_strdup("for update");
 }
-#line 42900 "preproc.c" /* yacc.c:1646  */
+#line 42938 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1572:
 #line 9603 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("for key share");
+ (yyval.str) = mm_strdup("for no key update");
 }
-#line 42908 "preproc.c" /* yacc.c:1646  */
+#line 42946 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1573:
-#line 9611 "preproc.y" /* yacc.c:1646  */
+#line 9607 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("of"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("for share");
 }
-#line 42916 "preproc.c" /* yacc.c:1646  */
+#line 42954 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1574:
-#line 9615 "preproc.y" /* yacc.c:1646  */
+#line 9611 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42923 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("for key share");
+}
+#line 42962 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1575:
-#line 9622 "preproc.y" /* yacc.c:1646  */
+#line 9619 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("values"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("of"),(yyvsp[0].str));
 }
-#line 42931 "preproc.c" /* yacc.c:1646  */
+#line 42970 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1576:
-#line 9626 "preproc.y" /* yacc.c:1646  */
+#line 9623 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
-}
-#line 42939 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 42977 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1577:
-#line 9634 "preproc.y" /* yacc.c:1646  */
+#line 9630 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("values"),(yyvsp[0].str));
 }
-#line 42947 "preproc.c" /* yacc.c:1646  */
+#line 42985 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1578:
-#line 9638 "preproc.y" /* yacc.c:1646  */
+#line 9634 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 42954 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+}
+#line 42993 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1579:
-#line 9645 "preproc.y" /* yacc.c:1646  */
+#line 9642 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
 }
-#line 42962 "preproc.c" /* yacc.c:1646  */
+#line 43001 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1580:
-#line 9649 "preproc.y" /* yacc.c:1646  */
+#line 9646 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
-}
-#line 42970 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 43008 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1581:
-#line 9657 "preproc.y" /* yacc.c:1646  */
+#line 9653 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 42978 "preproc.c" /* yacc.c:1646  */
+#line 43016 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1582:
-#line 9661 "preproc.y" /* yacc.c:1646  */
+#line 9657 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 42986 "preproc.c" /* yacc.c:1646  */
+#line 43024 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1583:
@@ -42990,541 +43028,557 @@
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42994 "preproc.c" /* yacc.c:1646  */
+#line 43032 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1584:
 #line 9669 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("lateral"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43002 "preproc.c" /* yacc.c:1646  */
+#line 43040 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1585:
 #line 9673 "preproc.y" /* yacc.c:1646  */
     { 
-	if ((yyvsp[0].str) == NULL)
-		mmerror(PARSE_ERROR, ET_ERROR, "subquery in FROM must have an alias");
-
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43013 "preproc.c" /* yacc.c:1646  */
+#line 43048 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1586:
-#line 9680 "preproc.y" /* yacc.c:1646  */
+#line 9677 "preproc.y" /* yacc.c:1646  */
     { 
-	if ((yyvsp[0].str) == NULL)
-		mmerror(PARSE_ERROR, ET_ERROR, "subquery in FROM must have an alias");
-
  (yyval.str) = cat_str(3,mm_strdup("lateral"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43024 "preproc.c" /* yacc.c:1646  */
+#line 43056 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1587:
-#line 9687 "preproc.y" /* yacc.c:1646  */
+#line 9681 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+	if ((yyvsp[0].str) == NULL)
+		mmerror(PARSE_ERROR, ET_ERROR, "subquery in FROM must have an alias");
+
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43032 "preproc.c" /* yacc.c:1646  */
+#line 43067 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1588:
-#line 9691 "preproc.y" /* yacc.c:1646  */
+#line 9688 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+	if ((yyvsp[0].str) == NULL)
+		mmerror(PARSE_ERROR, ET_ERROR, "subquery in FROM must have an alias");
+
+ (yyval.str) = cat_str(3,mm_strdup("lateral"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43040 "preproc.c" /* yacc.c:1646  */
+#line 43078 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1589:
-#line 9699 "preproc.y" /* yacc.c:1646  */
+#line 9695 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43048 "preproc.c" /* yacc.c:1646  */
+#line 43086 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1590:
-#line 9703 "preproc.y" /* yacc.c:1646  */
+#line 9699 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("cross join"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 43056 "preproc.c" /* yacc.c:1646  */
+#line 43094 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1591:
 #line 9707 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("join"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43064 "preproc.c" /* yacc.c:1646  */
+#line 43102 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1592:
 #line 9711 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("join"),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("cross join"),(yyvsp[0].str));
 }
-#line 43072 "preproc.c" /* yacc.c:1646  */
+#line 43110 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1593:
 #line 9715 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("natural"),(yyvsp[-2].str),mm_strdup("join"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("join"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43080 "preproc.c" /* yacc.c:1646  */
+#line 43118 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1594:
 #line 9719 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("natural join"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("join"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43088 "preproc.c" /* yacc.c:1646  */
+#line 43126 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1595:
-#line 9727 "preproc.y" /* yacc.c:1646  */
+#line 9723 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("as"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("natural"),(yyvsp[-2].str),mm_strdup("join"),(yyvsp[0].str));
 }
-#line 43096 "preproc.c" /* yacc.c:1646  */
+#line 43134 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1596:
-#line 9731 "preproc.y" /* yacc.c:1646  */
+#line 9727 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("natural join"),(yyvsp[0].str));
 }
-#line 43104 "preproc.c" /* yacc.c:1646  */
+#line 43142 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1597:
 #line 9735 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,mm_strdup("as"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43112 "preproc.c" /* yacc.c:1646  */
+#line 43150 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1598:
 #line 9739 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[0].str));
 }
-#line 43120 "preproc.c" /* yacc.c:1646  */
+#line 43158 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1599:
-#line 9747 "preproc.y" /* yacc.c:1646  */
+#line 9743 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43128 "preproc.c" /* yacc.c:1646  */
+#line 43166 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1600:
-#line 9751 "preproc.y" /* yacc.c:1646  */
+#line 9747 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 43135 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 43174 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1601:
-#line 9758 "preproc.y" /* yacc.c:1646  */
+#line 9755 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43143 "preproc.c" /* yacc.c:1646  */
+#line 43182 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1602:
-#line 9762 "preproc.y" /* yacc.c:1646  */
+#line 9759 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
-}
-#line 43151 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 43189 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1603:
 #line 9766 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("as"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43159 "preproc.c" /* yacc.c:1646  */
+#line 43197 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1604:
 #line 9770 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43167 "preproc.c" /* yacc.c:1646  */
+#line 43205 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1605:
 #line 9774 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 43174 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(5,mm_strdup("as"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 43213 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1606:
-#line 9781 "preproc.y" /* yacc.c:1646  */
+#line 9778 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("full"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43182 "preproc.c" /* yacc.c:1646  */
+#line 43221 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1607:
-#line 9785 "preproc.y" /* yacc.c:1646  */
+#line 9782 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("left"),(yyvsp[0].str));
-}
-#line 43190 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 43228 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1608:
 #line 9789 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("right"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("full"),(yyvsp[0].str));
 }
-#line 43198 "preproc.c" /* yacc.c:1646  */
+#line 43236 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1609:
 #line 9793 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("inner");
+ (yyval.str) = cat_str(2,mm_strdup("left"),(yyvsp[0].str));
 }
-#line 43206 "preproc.c" /* yacc.c:1646  */
+#line 43244 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1610:
-#line 9801 "preproc.y" /* yacc.c:1646  */
+#line 9797 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("outer");
+ (yyval.str) = cat_str(2,mm_strdup("right"),(yyvsp[0].str));
 }
-#line 43214 "preproc.c" /* yacc.c:1646  */
+#line 43252 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1611:
-#line 9805 "preproc.y" /* yacc.c:1646  */
+#line 9801 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 43221 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("inner");
+}
+#line 43260 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1612:
-#line 9812 "preproc.y" /* yacc.c:1646  */
+#line 9809 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("using ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("outer");
 }
-#line 43229 "preproc.c" /* yacc.c:1646  */
+#line 43268 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1613:
-#line 9816 "preproc.y" /* yacc.c:1646  */
+#line 9813 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("on"),(yyvsp[0].str));
-}
-#line 43237 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 43275 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1614:
-#line 9824 "preproc.y" /* yacc.c:1646  */
+#line 9820 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("using ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43245 "preproc.c" /* yacc.c:1646  */
+#line 43283 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1615:
-#line 9828 "preproc.y" /* yacc.c:1646  */
+#line 9824 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("*"));
+ (yyval.str) = cat_str(2,mm_strdup("on"),(yyvsp[0].str));
 }
-#line 43253 "preproc.c" /* yacc.c:1646  */
+#line 43291 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1616:
 #line 9832 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("only"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43261 "preproc.c" /* yacc.c:1646  */
+#line 43299 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1617:
 #line 9836 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("only ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("*"));
 }
-#line 43269 "preproc.c" /* yacc.c:1646  */
+#line 43307 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1618:
-#line 9844 "preproc.y" /* yacc.c:1646  */
+#line 9840 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("only"),(yyvsp[0].str));
 }
-#line 43277 "preproc.c" /* yacc.c:1646  */
+#line 43315 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1619:
-#line 9848 "preproc.y" /* yacc.c:1646  */
+#line 9844 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("only ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43285 "preproc.c" /* yacc.c:1646  */
+#line 43323 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1620:
-#line 9856 "preproc.y" /* yacc.c:1646  */
+#line 9852 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43293 "preproc.c" /* yacc.c:1646  */
+#line 43331 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1621:
-#line 9860 "preproc.y" /* yacc.c:1646  */
+#line 9856 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 43301 "preproc.c" /* yacc.c:1646  */
+#line 43339 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1622:
 #line 9864 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43309 "preproc.c" /* yacc.c:1646  */
+#line 43347 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1623:
-#line 9872 "preproc.y" /* yacc.c:1646  */
+#line 9868 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("tablesample"),(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43317 "preproc.c" /* yacc.c:1646  */
+#line 43355 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1624:
-#line 9880 "preproc.y" /* yacc.c:1646  */
+#line 9872 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("repeatable ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 43325 "preproc.c" /* yacc.c:1646  */
+#line 43363 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1625:
-#line 9884 "preproc.y" /* yacc.c:1646  */
+#line 9880 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 43332 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(6,mm_strdup("tablesample"),(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+}
+#line 43371 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1626:
-#line 9891 "preproc.y" /* yacc.c:1646  */
+#line 9888 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("repeatable ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43340 "preproc.c" /* yacc.c:1646  */
+#line 43379 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1627:
-#line 9895 "preproc.y" /* yacc.c:1646  */
+#line 9892 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("rows from ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
-}
-#line 43348 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 43386 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1628:
-#line 9903 "preproc.y" /* yacc.c:1646  */
+#line 9899 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43356 "preproc.c" /* yacc.c:1646  */
+#line 43394 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1629:
-#line 9911 "preproc.y" /* yacc.c:1646  */
+#line 9903 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(4,mm_strdup("rows from ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 43364 "preproc.c" /* yacc.c:1646  */
+#line 43402 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1630:
-#line 9915 "preproc.y" /* yacc.c:1646  */
+#line 9911 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43372 "preproc.c" /* yacc.c:1646  */
+#line 43410 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1631:
-#line 9923 "preproc.y" /* yacc.c:1646  */
+#line 9919 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43380 "preproc.c" /* yacc.c:1646  */
+#line 43418 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1632:
-#line 9927 "preproc.y" /* yacc.c:1646  */
+#line 9923 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 43387 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+}
+#line 43426 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1633:
-#line 9934 "preproc.y" /* yacc.c:1646  */
+#line 9931 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with ordinality");
+ (yyval.str) = cat_str(3,mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43395 "preproc.c" /* yacc.c:1646  */
+#line 43434 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1634:
-#line 9938 "preproc.y" /* yacc.c:1646  */
+#line 9935 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 43402 "preproc.c" /* yacc.c:1646  */
+#line 43441 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1635:
-#line 9945 "preproc.y" /* yacc.c:1646  */
+#line 9942 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("where"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("with ordinality");
 }
-#line 43410 "preproc.c" /* yacc.c:1646  */
+#line 43449 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1636:
-#line 9949 "preproc.y" /* yacc.c:1646  */
+#line 9946 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 43417 "preproc.c" /* yacc.c:1646  */
+#line 43456 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1637:
-#line 9956 "preproc.y" /* yacc.c:1646  */
+#line 9953 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,mm_strdup("where"),(yyvsp[0].str));
 }
-#line 43425 "preproc.c" /* yacc.c:1646  */
+#line 43464 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1638:
-#line 9960 "preproc.y" /* yacc.c:1646  */
+#line 9957 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str)=EMPTY; }
+#line 43471 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 1639:
+#line 9964 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = cat_str(2,mm_strdup("where"),(yyvsp[0].str));
+}
+#line 43479 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 1640:
+#line 9968 "preproc.y" /* yacc.c:1646  */
     {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		(yyval.str) = cat_str(2,mm_strdup("where current of"), cursor_marker);
 	}
-#line 43434 "preproc.c" /* yacc.c:1646  */
+#line 43488 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1639:
-#line 9965 "preproc.y" /* yacc.c:1646  */
+  case 1641:
+#line 9973 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 43441 "preproc.c" /* yacc.c:1646  */
+#line 43495 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1640:
-#line 9972 "preproc.y" /* yacc.c:1646  */
+  case 1642:
+#line 9980 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43449 "preproc.c" /* yacc.c:1646  */
+#line 43503 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1641:
-#line 9976 "preproc.y" /* yacc.c:1646  */
+  case 1643:
+#line 9984 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 43456 "preproc.c" /* yacc.c:1646  */
+#line 43510 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1642:
-#line 9983 "preproc.y" /* yacc.c:1646  */
+  case 1644:
+#line 9991 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43464 "preproc.c" /* yacc.c:1646  */
+#line 43518 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1643:
-#line 9987 "preproc.y" /* yacc.c:1646  */
+  case 1645:
+#line 9995 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 43472 "preproc.c" /* yacc.c:1646  */
+#line 43526 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1644:
-#line 9995 "preproc.y" /* yacc.c:1646  */
+  case 1646:
+#line 10003 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43480 "preproc.c" /* yacc.c:1646  */
+#line 43534 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1645:
-#line 10003 "preproc.y" /* yacc.c:1646  */
+  case 1647:
+#line 10011 "preproc.y" /* yacc.c:1646  */
     {	(yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].index).str); }
-#line 43486 "preproc.c" /* yacc.c:1646  */
+#line 43540 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1646:
-#line 10005 "preproc.y" /* yacc.c:1646  */
+  case 1648:
+#line 10013 "preproc.y" /* yacc.c:1646  */
     {	(yyval.str) = cat_str(3, mm_strdup("setof"), (yyvsp[-1].str), (yyvsp[0].index).str); }
-#line 43492 "preproc.c" /* yacc.c:1646  */
+#line 43546 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1647:
-#line 10007 "preproc.y" /* yacc.c:1646  */
+  case 1649:
+#line 10015 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(4,(yyvsp[-4].str),mm_strdup("array ["),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 43500 "preproc.c" /* yacc.c:1646  */
+#line 43554 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1648:
-#line 10011 "preproc.y" /* yacc.c:1646  */
+  case 1650:
+#line 10019 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(5,mm_strdup("setof"),(yyvsp[-4].str),mm_strdup("array ["),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 43508 "preproc.c" /* yacc.c:1646  */
+#line 43562 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1649:
-#line 10015 "preproc.y" /* yacc.c:1646  */
+  case 1651:
+#line 10023 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("array"));
 }
-#line 43516 "preproc.c" /* yacc.c:1646  */
+#line 43570 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1650:
-#line 10019 "preproc.y" /* yacc.c:1646  */
+  case 1652:
+#line 10027 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(3,mm_strdup("setof"),(yyvsp[-1].str),mm_strdup("array"));
 }
-#line 43524 "preproc.c" /* yacc.c:1646  */
+#line 43578 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1651:
-#line 10027 "preproc.y" /* yacc.c:1646  */
+  case 1653:
+#line 10035 "preproc.y" /* yacc.c:1646  */
     {
 		(yyval.index).index1 = (yyvsp[-2].index).index1;
 		(yyval.index).index2 = (yyvsp[-2].index).index2;
@@ -43534,11 +43588,11 @@
 			(yyval.index).index2 = mm_strdup("0");
 		(yyval.index).str = cat_str(2, (yyvsp[-2].index).str, mm_strdup("[]"));
 	}
-#line 43538 "preproc.c" /* yacc.c:1646  */
+#line 43592 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1652:
-#line 10037 "preproc.y" /* yacc.c:1646  */
+  case 1654:
+#line 10045 "preproc.y" /* yacc.c:1646  */
     {
 		(yyval.index).index1 = (yyvsp[-3].index).index1;
 		(yyval.index).index2 = (yyvsp[-3].index).index2;
@@ -43548,33 +43602,17 @@
 			(yyval.index).index2 = mm_strdup((yyvsp[-1].str));
 		(yyval.index).str = cat_str(4, (yyvsp[-3].index).str, mm_strdup("["), (yyvsp[-1].str), mm_strdup("]"));
 	}
-#line 43552 "preproc.c" /* yacc.c:1646  */
+#line 43606 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 1653:
-#line 10047 "preproc.y" /* yacc.c:1646  */
+  case 1655:
+#line 10055 "preproc.y" /* yacc.c:1646  */
     {
 		(yyval.index).index1 = mm_strdup("-1");
 		(yyval.index).index2 = mm_strdup("-1");
 		(yyval.index).str= EMPTY;
 	}
-#line 43562 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 1654:
-#line 10057 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 43570 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 1655:
-#line 10061 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 43578 "preproc.c" /* yacc.c:1646  */
+#line 43616 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1656:
@@ -43582,7 +43620,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43586 "preproc.c" /* yacc.c:1646  */
+#line 43624 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1657:
@@ -43590,7 +43628,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43594 "preproc.c" /* yacc.c:1646  */
+#line 43632 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1658:
@@ -43598,39 +43636,39 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43602 "preproc.c" /* yacc.c:1646  */
+#line 43640 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1659:
 #line 10077 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43610 "preproc.c" /* yacc.c:1646  */
+#line 43648 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1660:
 #line 10081 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43618 "preproc.c" /* yacc.c:1646  */
+#line 43656 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1661:
-#line 10089 "preproc.y" /* yacc.c:1646  */
+#line 10085 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43626 "preproc.c" /* yacc.c:1646  */
+#line 43664 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1662:
-#line 10093 "preproc.y" /* yacc.c:1646  */
+#line 10089 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43634 "preproc.c" /* yacc.c:1646  */
+#line 43672 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1663:
@@ -43638,7 +43676,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43642 "preproc.c" /* yacc.c:1646  */
+#line 43680 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1664:
@@ -43646,1258 +43684,1258 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43650 "preproc.c" /* yacc.c:1646  */
+#line 43688 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1665:
-#line 10109 "preproc.y" /* yacc.c:1646  */
+#line 10105 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43658 "preproc.c" /* yacc.c:1646  */
+#line 43696 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1666:
-#line 10113 "preproc.y" /* yacc.c:1646  */
+#line 10109 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43666 "preproc.c" /* yacc.c:1646  */
+#line 43704 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1667:
-#line 10121 "preproc.y" /* yacc.c:1646  */
+#line 10117 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43674 "preproc.c" /* yacc.c:1646  */
+#line 43712 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1668:
-#line 10125 "preproc.y" /* yacc.c:1646  */
+#line 10121 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 43681 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 43720 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1669:
-#line 10132 "preproc.y" /* yacc.c:1646  */
+#line 10129 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("int");
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43689 "preproc.c" /* yacc.c:1646  */
+#line 43728 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1670:
-#line 10136 "preproc.y" /* yacc.c:1646  */
+#line 10133 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("integer");
-}
-#line 43697 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 43735 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1671:
 #line 10140 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("smallint");
+ (yyval.str) = mm_strdup("int");
 }
-#line 43705 "preproc.c" /* yacc.c:1646  */
+#line 43743 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1672:
 #line 10144 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("bigint");
+ (yyval.str) = mm_strdup("integer");
 }
-#line 43713 "preproc.c" /* yacc.c:1646  */
+#line 43751 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1673:
 #line 10148 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("real");
+ (yyval.str) = mm_strdup("smallint");
 }
-#line 43721 "preproc.c" /* yacc.c:1646  */
+#line 43759 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1674:
 #line 10152 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("float"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("bigint");
 }
-#line 43729 "preproc.c" /* yacc.c:1646  */
+#line 43767 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1675:
 #line 10156 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("double precision");
+ (yyval.str) = mm_strdup("real");
 }
-#line 43737 "preproc.c" /* yacc.c:1646  */
+#line 43775 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1676:
 #line 10160 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("decimal"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("float"),(yyvsp[0].str));
 }
-#line 43745 "preproc.c" /* yacc.c:1646  */
+#line 43783 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1677:
 #line 10164 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("dec"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("double precision");
 }
-#line 43753 "preproc.c" /* yacc.c:1646  */
+#line 43791 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1678:
 #line 10168 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("numeric"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("decimal"),(yyvsp[0].str));
 }
-#line 43761 "preproc.c" /* yacc.c:1646  */
+#line 43799 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1679:
 #line 10172 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("boolean");
+ (yyval.str) = cat_str(2,mm_strdup("dec"),(yyvsp[0].str));
 }
-#line 43769 "preproc.c" /* yacc.c:1646  */
+#line 43807 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1680:
-#line 10180 "preproc.y" /* yacc.c:1646  */
+#line 10176 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(2,mm_strdup("numeric"),(yyvsp[0].str));
 }
-#line 43777 "preproc.c" /* yacc.c:1646  */
+#line 43815 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1681:
-#line 10184 "preproc.y" /* yacc.c:1646  */
+#line 10180 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 43784 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("boolean");
+}
+#line 43823 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1682:
-#line 10191 "preproc.y" /* yacc.c:1646  */
+#line 10188 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43792 "preproc.c" /* yacc.c:1646  */
+#line 43831 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1683:
-#line 10195 "preproc.y" /* yacc.c:1646  */
+#line 10192 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 43800 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 43838 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1684:
-#line 10203 "preproc.y" /* yacc.c:1646  */
+#line 10199 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43808 "preproc.c" /* yacc.c:1646  */
+#line 43846 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1685:
-#line 10207 "preproc.y" /* yacc.c:1646  */
+#line 10203 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43816 "preproc.c" /* yacc.c:1646  */
+#line 43854 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1686:
-#line 10215 "preproc.y" /* yacc.c:1646  */
+#line 10211 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("bit"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43824 "preproc.c" /* yacc.c:1646  */
+#line 43862 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1687:
-#line 10223 "preproc.y" /* yacc.c:1646  */
+#line 10215 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("bit"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43832 "preproc.c" /* yacc.c:1646  */
+#line 43870 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1688:
-#line 10231 "preproc.y" /* yacc.c:1646  */
+#line 10223 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(5,mm_strdup("bit"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43840 "preproc.c" /* yacc.c:1646  */
+#line 43878 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1689:
-#line 10235 "preproc.y" /* yacc.c:1646  */
+#line 10231 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("bit"),(yyvsp[0].str));
 }
-#line 43848 "preproc.c" /* yacc.c:1646  */
+#line 43886 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1690:
-#line 10243 "preproc.y" /* yacc.c:1646  */
+#line 10239 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43856 "preproc.c" /* yacc.c:1646  */
+#line 43894 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1691:
-#line 10247 "preproc.y" /* yacc.c:1646  */
+#line 10243 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43864 "preproc.c" /* yacc.c:1646  */
+#line 43902 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1692:
-#line 10255 "preproc.y" /* yacc.c:1646  */
+#line 10251 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43872 "preproc.c" /* yacc.c:1646  */
+#line 43910 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1693:
-#line 10263 "preproc.y" /* yacc.c:1646  */
+#line 10255 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 43880 "preproc.c" /* yacc.c:1646  */
+#line 43918 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1694:
-#line 10271 "preproc.y" /* yacc.c:1646  */
+#line 10263 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("character"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 43888 "preproc.c" /* yacc.c:1646  */
+#line 43926 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1695:
-#line 10275 "preproc.y" /* yacc.c:1646  */
+#line 10271 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("char"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43896 "preproc.c" /* yacc.c:1646  */
+#line 43934 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1696:
 #line 10279 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("varchar");
+ (yyval.str) = cat_str(2,mm_strdup("character"),(yyvsp[0].str));
 }
-#line 43904 "preproc.c" /* yacc.c:1646  */
+#line 43942 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1697:
 #line 10283 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("national character"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("char"),(yyvsp[0].str));
 }
-#line 43912 "preproc.c" /* yacc.c:1646  */
+#line 43950 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1698:
 #line 10287 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("national char"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("varchar");
 }
-#line 43920 "preproc.c" /* yacc.c:1646  */
+#line 43958 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1699:
 #line 10291 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("nchar"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("national character"),(yyvsp[0].str));
 }
-#line 43928 "preproc.c" /* yacc.c:1646  */
+#line 43966 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1700:
-#line 10299 "preproc.y" /* yacc.c:1646  */
+#line 10295 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("varying");
+ (yyval.str) = cat_str(2,mm_strdup("national char"),(yyvsp[0].str));
 }
-#line 43936 "preproc.c" /* yacc.c:1646  */
+#line 43974 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1701:
-#line 10303 "preproc.y" /* yacc.c:1646  */
+#line 10299 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 43943 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("nchar"),(yyvsp[0].str));
+}
+#line 43982 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1702:
-#line 10310 "preproc.y" /* yacc.c:1646  */
+#line 10307 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("character set"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("varying");
 }
-#line 43951 "preproc.c" /* yacc.c:1646  */
+#line 43990 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1703:
-#line 10314 "preproc.y" /* yacc.c:1646  */
+#line 10311 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 43958 "preproc.c" /* yacc.c:1646  */
+#line 43997 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1704:
-#line 10321 "preproc.y" /* yacc.c:1646  */
+#line 10318 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("timestamp ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("character set"),(yyvsp[0].str));
 }
-#line 43966 "preproc.c" /* yacc.c:1646  */
+#line 44005 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1705:
-#line 10325 "preproc.y" /* yacc.c:1646  */
+#line 10322 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("timestamp"),(yyvsp[0].str));
-}
-#line 43974 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 44012 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1706:
 #line 10329 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("time ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,mm_strdup("timestamp ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 43982 "preproc.c" /* yacc.c:1646  */
+#line 44020 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1707:
 #line 10333 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("time"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("timestamp"),(yyvsp[0].str));
 }
-#line 43990 "preproc.c" /* yacc.c:1646  */
+#line 44028 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1708:
-#line 10341 "preproc.y" /* yacc.c:1646  */
+#line 10337 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("interval");
+ (yyval.str) = cat_str(4,mm_strdup("time ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 43998 "preproc.c" /* yacc.c:1646  */
+#line 44036 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1709:
-#line 10349 "preproc.y" /* yacc.c:1646  */
+#line 10341 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("with time zone");
+ (yyval.str) = cat_str(2,mm_strdup("time"),(yyvsp[0].str));
 }
-#line 44006 "preproc.c" /* yacc.c:1646  */
+#line 44044 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1710:
-#line 10353 "preproc.y" /* yacc.c:1646  */
+#line 10349 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("without time zone");
+ (yyval.str) = mm_strdup("interval");
 }
-#line 44014 "preproc.c" /* yacc.c:1646  */
+#line 44052 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1711:
 #line 10357 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 44021 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("with time zone");
+}
+#line 44060 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1712:
-#line 10364 "preproc.y" /* yacc.c:1646  */
+#line 10361 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("year");
+ (yyval.str) = mm_strdup("without time zone");
 }
-#line 44029 "preproc.c" /* yacc.c:1646  */
+#line 44068 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1713:
-#line 10368 "preproc.y" /* yacc.c:1646  */
+#line 10365 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("month");
-}
-#line 44037 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 44075 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1714:
 #line 10372 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("day");
+ (yyval.str) = mm_strdup("year");
 }
-#line 44045 "preproc.c" /* yacc.c:1646  */
+#line 44083 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1715:
 #line 10376 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("hour");
+ (yyval.str) = mm_strdup("month");
 }
-#line 44053 "preproc.c" /* yacc.c:1646  */
+#line 44091 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1716:
 #line 10380 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("minute");
+ (yyval.str) = mm_strdup("day");
 }
-#line 44061 "preproc.c" /* yacc.c:1646  */
+#line 44099 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1717:
 #line 10384 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("hour");
 }
-#line 44069 "preproc.c" /* yacc.c:1646  */
+#line 44107 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1718:
 #line 10388 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("year to month");
+ (yyval.str) = mm_strdup("minute");
 }
-#line 44077 "preproc.c" /* yacc.c:1646  */
+#line 44115 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1719:
 #line 10392 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("day to hour");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 44085 "preproc.c" /* yacc.c:1646  */
+#line 44123 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1720:
 #line 10396 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("day to minute");
+ (yyval.str) = mm_strdup("year to month");
 }
-#line 44093 "preproc.c" /* yacc.c:1646  */
+#line 44131 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1721:
 #line 10400 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("day to"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("day to hour");
 }
-#line 44101 "preproc.c" /* yacc.c:1646  */
+#line 44139 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1722:
 #line 10404 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("hour to minute");
+ (yyval.str) = mm_strdup("day to minute");
 }
-#line 44109 "preproc.c" /* yacc.c:1646  */
+#line 44147 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1723:
 #line 10408 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("hour to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("day to"),(yyvsp[0].str));
 }
-#line 44117 "preproc.c" /* yacc.c:1646  */
+#line 44155 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1724:
 #line 10412 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("minute to"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("hour to minute");
 }
-#line 44125 "preproc.c" /* yacc.c:1646  */
+#line 44163 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1725:
 #line 10416 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 44132 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("hour to"),(yyvsp[0].str));
+}
+#line 44171 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1726:
-#line 10423 "preproc.y" /* yacc.c:1646  */
+#line 10420 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("second");
+ (yyval.str) = cat_str(2,mm_strdup("minute to"),(yyvsp[0].str));
 }
-#line 44140 "preproc.c" /* yacc.c:1646  */
+#line 44179 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1727:
-#line 10427 "preproc.y" /* yacc.c:1646  */
+#line 10424 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("second ("),(yyvsp[-1].str),mm_strdup(")"));
-}
-#line 44148 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 44186 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1728:
-#line 10435 "preproc.y" /* yacc.c:1646  */
+#line 10431 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("second");
 }
-#line 44156 "preproc.c" /* yacc.c:1646  */
+#line 44194 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1729:
-#line 10439 "preproc.y" /* yacc.c:1646  */
+#line 10435 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("::"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("second ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44164 "preproc.c" /* yacc.c:1646  */
+#line 44202 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1730:
 #line 10443 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("collate"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 44172 "preproc.c" /* yacc.c:1646  */
+#line 44210 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1731:
 #line 10447 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("at time zone"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("::"),(yyvsp[0].str));
 }
-#line 44180 "preproc.c" /* yacc.c:1646  */
+#line 44218 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1732:
 #line 10451 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("collate"),(yyvsp[0].str));
 }
-#line 44188 "preproc.c" /* yacc.c:1646  */
+#line 44226 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1733:
 #line 10455 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("at time zone"),(yyvsp[0].str));
 }
-#line 44196 "preproc.c" /* yacc.c:1646  */
+#line 44234 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1734:
 #line 10459 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("+"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
 }
-#line 44204 "preproc.c" /* yacc.c:1646  */
+#line 44242 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1735:
 #line 10463 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("-"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
 }
-#line 44212 "preproc.c" /* yacc.c:1646  */
+#line 44250 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1736:
 #line 10467 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("*"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("+"),(yyvsp[0].str));
 }
-#line 44220 "preproc.c" /* yacc.c:1646  */
+#line 44258 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1737:
 #line 10471 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("/"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("-"),(yyvsp[0].str));
 }
-#line 44228 "preproc.c" /* yacc.c:1646  */
+#line 44266 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1738:
 #line 10475 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("%"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("*"),(yyvsp[0].str));
 }
-#line 44236 "preproc.c" /* yacc.c:1646  */
+#line 44274 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1739:
 #line 10479 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("^"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("/"),(yyvsp[0].str));
 }
-#line 44244 "preproc.c" /* yacc.c:1646  */
+#line 44282 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1740:
 #line 10483 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("%"),(yyvsp[0].str));
 }
-#line 44252 "preproc.c" /* yacc.c:1646  */
+#line 44290 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1741:
 #line 10487 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("^"),(yyvsp[0].str));
 }
-#line 44260 "preproc.c" /* yacc.c:1646  */
+#line 44298 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1742:
 #line 10491 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<"),(yyvsp[0].str));
 }
-#line 44268 "preproc.c" /* yacc.c:1646  */
+#line 44306 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1743:
 #line 10495 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<="),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">"),(yyvsp[0].str));
 }
-#line 44276 "preproc.c" /* yacc.c:1646  */
+#line 44314 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1744:
 #line 10499 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">="),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 44284 "preproc.c" /* yacc.c:1646  */
+#line 44322 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1745:
 #line 10503 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<>"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<="),(yyvsp[0].str));
 }
-#line 44292 "preproc.c" /* yacc.c:1646  */
+#line 44330 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1746:
 #line 10507 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">="),(yyvsp[0].str));
 }
-#line 44300 "preproc.c" /* yacc.c:1646  */
+#line 44338 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1747:
 #line 10511 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<>"),(yyvsp[0].str));
 }
-#line 44308 "preproc.c" /* yacc.c:1646  */
+#line 44346 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1748:
 #line 10515 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44316 "preproc.c" /* yacc.c:1646  */
+#line 44354 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1749:
 #line 10519 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44324 "preproc.c" /* yacc.c:1646  */
+#line 44362 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1750:
 #line 10523 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("or"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44332 "preproc.c" /* yacc.c:1646  */
+#line 44370 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1751:
 #line 10527 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("not"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 44340 "preproc.c" /* yacc.c:1646  */
+#line 44378 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1752:
 #line 10531 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("not"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("or"),(yyvsp[0].str));
 }
-#line 44348 "preproc.c" /* yacc.c:1646  */
+#line 44386 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1753:
 #line 10535 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("like"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("not"),(yyvsp[0].str));
 }
-#line 44356 "preproc.c" /* yacc.c:1646  */
+#line 44394 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1754:
 #line 10539 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("like"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("not"),(yyvsp[0].str));
 }
-#line 44364 "preproc.c" /* yacc.c:1646  */
+#line 44402 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1755:
 #line 10543 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("not like"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("like"),(yyvsp[0].str));
 }
-#line 44372 "preproc.c" /* yacc.c:1646  */
+#line 44410 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1756:
 #line 10547 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("not like"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("like"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 44380 "preproc.c" /* yacc.c:1646  */
+#line 44418 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1757:
 #line 10551 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("ilike"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("not like"),(yyvsp[0].str));
 }
-#line 44388 "preproc.c" /* yacc.c:1646  */
+#line 44426 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1758:
 #line 10555 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("ilike"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("not like"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 44396 "preproc.c" /* yacc.c:1646  */
+#line 44434 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1759:
 #line 10559 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("not ilike"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("ilike"),(yyvsp[0].str));
 }
-#line 44404 "preproc.c" /* yacc.c:1646  */
+#line 44442 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1760:
 #line 10563 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("not ilike"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("ilike"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 44412 "preproc.c" /* yacc.c:1646  */
+#line 44450 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1761:
 #line 10567 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("similar to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("not ilike"),(yyvsp[0].str));
 }
-#line 44420 "preproc.c" /* yacc.c:1646  */
+#line 44458 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1762:
 #line 10571 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("similar to"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("not ilike"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 44428 "preproc.c" /* yacc.c:1646  */
+#line 44466 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1763:
 #line 10575 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("not similar to"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("similar to"),(yyvsp[0].str));
 }
-#line 44436 "preproc.c" /* yacc.c:1646  */
+#line 44474 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1764:
 #line 10579 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-6].str),mm_strdup("not similar to"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("similar to"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 44444 "preproc.c" /* yacc.c:1646  */
+#line 44482 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1765:
 #line 10583 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is null"));
+ (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("not similar to"),(yyvsp[0].str));
 }
-#line 44452 "preproc.c" /* yacc.c:1646  */
+#line 44490 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1766:
 #line 10587 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("isnull"));
+ (yyval.str) = cat_str(5,(yyvsp[-6].str),mm_strdup("not similar to"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 44460 "preproc.c" /* yacc.c:1646  */
+#line 44498 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1767:
 #line 10591 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not null"));
+ (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is null"));
 }
-#line 44468 "preproc.c" /* yacc.c:1646  */
+#line 44506 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1768:
 #line 10595 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("notnull"));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("isnull"));
 }
-#line 44476 "preproc.c" /* yacc.c:1646  */
+#line 44514 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1769:
 #line 10599 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("overlaps"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not null"));
 }
-#line 44484 "preproc.c" /* yacc.c:1646  */
+#line 44522 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1770:
 #line 10603 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is true"));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("notnull"));
 }
-#line 44492 "preproc.c" /* yacc.c:1646  */
+#line 44530 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1771:
 #line 10607 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not true"));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("overlaps"),(yyvsp[0].str));
 }
-#line 44500 "preproc.c" /* yacc.c:1646  */
+#line 44538 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1772:
 #line 10611 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is false"));
+ (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is true"));
 }
-#line 44508 "preproc.c" /* yacc.c:1646  */
+#line 44546 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1773:
 #line 10615 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not false"));
+ (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not true"));
 }
-#line 44516 "preproc.c" /* yacc.c:1646  */
+#line 44554 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1774:
 #line 10619 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is unknown"));
+ (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is false"));
 }
-#line 44524 "preproc.c" /* yacc.c:1646  */
+#line 44562 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1775:
 #line 10623 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not unknown"));
+ (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not false"));
 }
-#line 44532 "preproc.c" /* yacc.c:1646  */
+#line 44570 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1776:
 #line 10627 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("is distinct from"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is unknown"));
 }
-#line 44540 "preproc.c" /* yacc.c:1646  */
+#line 44578 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1777:
 #line 10631 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-5].str),mm_strdup("is not distinct from"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not unknown"));
 }
-#line 44548 "preproc.c" /* yacc.c:1646  */
+#line 44586 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1778:
 #line 10635 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-5].str),mm_strdup("is of ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("is distinct from"),(yyvsp[0].str));
 }
-#line 44556 "preproc.c" /* yacc.c:1646  */
+#line 44594 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1779:
 #line 10639 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-6].str),mm_strdup("is not of ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,(yyvsp[-5].str),mm_strdup("is not distinct from"),(yyvsp[0].str));
 }
-#line 44564 "preproc.c" /* yacc.c:1646  */
+#line 44602 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1780:
 #line 10643 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,(yyvsp[-5].str),mm_strdup("between"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-5].str),mm_strdup("is of ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44572 "preproc.c" /* yacc.c:1646  */
+#line 44610 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1781:
 #line 10647 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,(yyvsp[-6].str),mm_strdup("not between"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-6].str),mm_strdup("is not of ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44580 "preproc.c" /* yacc.c:1646  */
+#line 44618 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1782:
 #line 10651 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("between symmetric"),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,(yyvsp[-5].str),mm_strdup("between"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 44588 "preproc.c" /* yacc.c:1646  */
+#line 44626 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1783:
 #line 10655 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-6].str),mm_strdup("not between symmetric"),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,(yyvsp[-6].str),mm_strdup("not between"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 44596 "preproc.c" /* yacc.c:1646  */
+#line 44634 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1784:
 #line 10659 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("in"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("between symmetric"),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 44604 "preproc.c" /* yacc.c:1646  */
+#line 44642 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1785:
 #line 10663 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("not in"),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-6].str),mm_strdup("not between symmetric"),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 44612 "preproc.c" /* yacc.c:1646  */
+#line 44650 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1786:
 #line 10667 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("in"),(yyvsp[0].str));
 }
-#line 44620 "preproc.c" /* yacc.c:1646  */
+#line 44658 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1787:
 #line 10671 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("not in"),(yyvsp[0].str));
 }
-#line 44628 "preproc.c" /* yacc.c:1646  */
+#line 44666 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1788:
 #line 10675 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = cat_str(2,mm_strdup("unique"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44637 "preproc.c" /* yacc.c:1646  */
+#line 44674 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1789:
-#line 10680 "preproc.y" /* yacc.c:1646  */
+#line 10679 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is document"));
+ (yyval.str) = cat_str(6,(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44645 "preproc.c" /* yacc.c:1646  */
+#line 44682 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1790:
-#line 10684 "preproc.y" /* yacc.c:1646  */
+#line 10683 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not document"));
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = cat_str(2,mm_strdup("unique"),(yyvsp[0].str));
 }
-#line 44653 "preproc.c" /* yacc.c:1646  */
+#line 44691 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1791:
-#line 10692 "preproc.y" /* yacc.c:1646  */
+#line 10688 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is document"));
 }
-#line 44661 "preproc.c" /* yacc.c:1646  */
+#line 44699 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1792:
-#line 10696 "preproc.y" /* yacc.c:1646  */
+#line 10692 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("::"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not document"));
 }
-#line 44669 "preproc.c" /* yacc.c:1646  */
+#line 44707 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1793:
 #line 10700 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 44677 "preproc.c" /* yacc.c:1646  */
+#line 44715 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1794:
 #line 10704 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("::"),(yyvsp[0].str));
 }
-#line 44685 "preproc.c" /* yacc.c:1646  */
+#line 44723 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1795:
 #line 10708 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("+"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
 }
-#line 44693 "preproc.c" /* yacc.c:1646  */
+#line 44731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1796:
 #line 10712 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("-"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
 }
-#line 44701 "preproc.c" /* yacc.c:1646  */
+#line 44739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1797:
 #line 10716 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("*"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("+"),(yyvsp[0].str));
 }
-#line 44709 "preproc.c" /* yacc.c:1646  */
+#line 44747 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1798:
 #line 10720 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("/"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("-"),(yyvsp[0].str));
 }
-#line 44717 "preproc.c" /* yacc.c:1646  */
+#line 44755 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1799:
 #line 10724 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("%"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("*"),(yyvsp[0].str));
 }
-#line 44725 "preproc.c" /* yacc.c:1646  */
+#line 44763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1800:
 #line 10728 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("^"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("/"),(yyvsp[0].str));
 }
-#line 44733 "preproc.c" /* yacc.c:1646  */
+#line 44771 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1801:
 #line 10732 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("%"),(yyvsp[0].str));
 }
-#line 44741 "preproc.c" /* yacc.c:1646  */
+#line 44779 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1802:
 #line 10736 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("^"),(yyvsp[0].str));
 }
-#line 44749 "preproc.c" /* yacc.c:1646  */
+#line 44787 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1803:
 #line 10740 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<"),(yyvsp[0].str));
 }
-#line 44757 "preproc.c" /* yacc.c:1646  */
+#line 44795 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1804:
 #line 10744 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<="),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">"),(yyvsp[0].str));
 }
-#line 44765 "preproc.c" /* yacc.c:1646  */
+#line 44803 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1805:
 #line 10748 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">="),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 44773 "preproc.c" /* yacc.c:1646  */
+#line 44811 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1806:
 #line 10752 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<>"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<="),(yyvsp[0].str));
 }
-#line 44781 "preproc.c" /* yacc.c:1646  */
+#line 44819 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1807:
 #line 10756 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">="),(yyvsp[0].str));
 }
-#line 44789 "preproc.c" /* yacc.c:1646  */
+#line 44827 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1808:
 #line 10760 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<>"),(yyvsp[0].str));
 }
-#line 44797 "preproc.c" /* yacc.c:1646  */
+#line 44835 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1809:
 #line 10764 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44805 "preproc.c" /* yacc.c:1646  */
+#line 44843 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1810:
 #line 10768 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("is distinct from"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44813 "preproc.c" /* yacc.c:1646  */
+#line 44851 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1811:
 #line 10772 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-5].str),mm_strdup("is not distinct from"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44821 "preproc.c" /* yacc.c:1646  */
+#line 44859 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1812:
 #line 10776 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-5].str),mm_strdup("is of ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("is distinct from"),(yyvsp[0].str));
 }
-#line 44829 "preproc.c" /* yacc.c:1646  */
+#line 44867 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1813:
 #line 10780 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-6].str),mm_strdup("is not of ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,(yyvsp[-5].str),mm_strdup("is not distinct from"),(yyvsp[0].str));
 }
-#line 44837 "preproc.c" /* yacc.c:1646  */
+#line 44875 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1814:
 #line 10784 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is document"));
+ (yyval.str) = cat_str(4,(yyvsp[-5].str),mm_strdup("is of ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44845 "preproc.c" /* yacc.c:1646  */
+#line 44883 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1815:
 #line 10788 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not document"));
+ (yyval.str) = cat_str(4,(yyvsp[-6].str),mm_strdup("is not of ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44853 "preproc.c" /* yacc.c:1646  */
+#line 44891 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1816:
-#line 10796 "preproc.y" /* yacc.c:1646  */
+#line 10792 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is document"));
 }
-#line 44861 "preproc.c" /* yacc.c:1646  */
+#line 44899 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1817:
-#line 10800 "preproc.y" /* yacc.c:1646  */
+#line 10796 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not document"));
 }
-#line 44869 "preproc.c" /* yacc.c:1646  */
+#line 44907 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1818:
 #line 10804 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 44877 "preproc.c" /* yacc.c:1646  */
+#line 44915 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1819:
 #line 10808 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 44885 "preproc.c" /* yacc.c:1646  */
+#line 44923 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1820:
 #line 10812 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44893 "preproc.c" /* yacc.c:1646  */
+#line 44931 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1821:
 #line 10816 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 44901 "preproc.c" /* yacc.c:1646  */
+#line 44939 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1822:
@@ -44905,1839 +44943,1839 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44909 "preproc.c" /* yacc.c:1646  */
+#line 44947 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1823:
 #line 10824 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 44917 "preproc.c" /* yacc.c:1646  */
+#line 44955 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1824:
 #line 10828 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("exists"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 44925 "preproc.c" /* yacc.c:1646  */
+#line 44963 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1825:
 #line 10832 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("array"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44933 "preproc.c" /* yacc.c:1646  */
+#line 44971 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1826:
 #line 10836 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("array"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("exists"),(yyvsp[0].str));
 }
-#line 44941 "preproc.c" /* yacc.c:1646  */
+#line 44979 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1827:
 #line 10840 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("array"),(yyvsp[0].str));
 }
-#line 44949 "preproc.c" /* yacc.c:1646  */
+#line 44987 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1828:
 #line 10844 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("array"),(yyvsp[0].str));
 }
-#line 44957 "preproc.c" /* yacc.c:1646  */
+#line 44995 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1829:
 #line 10848 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("grouping ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 44965 "preproc.c" /* yacc.c:1646  */
+#line 45003 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1830:
-#line 10856 "preproc.y" /* yacc.c:1646  */
+#line 10852 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("( )"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 44973 "preproc.c" /* yacc.c:1646  */
+#line 45011 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1831:
-#line 10860 "preproc.y" /* yacc.c:1646  */
+#line 10856 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("grouping ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44981 "preproc.c" /* yacc.c:1646  */
+#line 45019 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1832:
 #line 10864 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("( variadic"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("( )"));
 }
-#line 44989 "preproc.c" /* yacc.c:1646  */
+#line 45027 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1833:
 #line 10868 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(", variadic"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44997 "preproc.c" /* yacc.c:1646  */
+#line 45035 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1834:
 #line 10872 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("( all"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("( variadic"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45005 "preproc.c" /* yacc.c:1646  */
+#line 45043 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1835:
 #line 10876 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("( distinct"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(7,(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(", variadic"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45013 "preproc.c" /* yacc.c:1646  */
+#line 45051 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1836:
 #line 10880 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("( * )"));
+ (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("( all"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45021 "preproc.c" /* yacc.c:1646  */
+#line 45059 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1837:
-#line 10888 "preproc.y" /* yacc.c:1646  */
+#line 10884 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("( distinct"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45029 "preproc.c" /* yacc.c:1646  */
+#line 45067 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1838:
-#line 10892 "preproc.y" /* yacc.c:1646  */
+#line 10888 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("( * )"));
 }
-#line 45037 "preproc.c" /* yacc.c:1646  */
+#line 45075 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1839:
-#line 10900 "preproc.y" /* yacc.c:1646  */
+#line 10896 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45045 "preproc.c" /* yacc.c:1646  */
+#line 45083 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1840:
-#line 10904 "preproc.y" /* yacc.c:1646  */
+#line 10900 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45053 "preproc.c" /* yacc.c:1646  */
+#line 45091 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1841:
-#line 10912 "preproc.y" /* yacc.c:1646  */
+#line 10908 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("collation for ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 45061 "preproc.c" /* yacc.c:1646  */
+#line 45099 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1842:
-#line 10916 "preproc.y" /* yacc.c:1646  */
+#line 10912 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_date");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 45069 "preproc.c" /* yacc.c:1646  */
+#line 45107 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1843:
 #line 10920 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_time");
+ (yyval.str) = cat_str(3,mm_strdup("collation for ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45077 "preproc.c" /* yacc.c:1646  */
+#line 45115 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1844:
 #line 10924 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("current_time ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("current_date");
 }
-#line 45085 "preproc.c" /* yacc.c:1646  */
+#line 45123 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1845:
 #line 10928 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_timestamp");
+ (yyval.str) = mm_strdup("current_time");
 }
-#line 45093 "preproc.c" /* yacc.c:1646  */
+#line 45131 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1846:
 #line 10932 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("current_timestamp ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("current_time ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45101 "preproc.c" /* yacc.c:1646  */
+#line 45139 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1847:
 #line 10936 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("localtime");
+ (yyval.str) = mm_strdup("current_timestamp");
 }
-#line 45109 "preproc.c" /* yacc.c:1646  */
+#line 45147 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1848:
 #line 10940 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("localtime ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("current_timestamp ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45117 "preproc.c" /* yacc.c:1646  */
+#line 45155 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1849:
 #line 10944 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("localtimestamp");
+ (yyval.str) = mm_strdup("localtime");
 }
-#line 45125 "preproc.c" /* yacc.c:1646  */
+#line 45163 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1850:
 #line 10948 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("localtimestamp ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("localtime ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45133 "preproc.c" /* yacc.c:1646  */
+#line 45171 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1851:
 #line 10952 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_role");
+ (yyval.str) = mm_strdup("localtimestamp");
 }
-#line 45141 "preproc.c" /* yacc.c:1646  */
+#line 45179 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1852:
 #line 10956 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_user");
+ (yyval.str) = cat_str(3,mm_strdup("localtimestamp ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45149 "preproc.c" /* yacc.c:1646  */
+#line 45187 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1853:
 #line 10960 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("session_user");
+ (yyval.str) = mm_strdup("current_role");
 }
-#line 45157 "preproc.c" /* yacc.c:1646  */
+#line 45195 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1854:
 #line 10964 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("user");
+ (yyval.str) = mm_strdup("current_user");
 }
-#line 45165 "preproc.c" /* yacc.c:1646  */
+#line 45203 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1855:
 #line 10968 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_catalog");
+ (yyval.str) = mm_strdup("session_user");
 }
-#line 45173 "preproc.c" /* yacc.c:1646  */
+#line 45211 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1856:
 #line 10972 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_schema");
+ (yyval.str) = mm_strdup("user");
 }
-#line 45181 "preproc.c" /* yacc.c:1646  */
+#line 45219 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1857:
 #line 10976 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("cast ("),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("current_catalog");
 }
-#line 45189 "preproc.c" /* yacc.c:1646  */
+#line 45227 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1858:
 #line 10980 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("extract ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("current_schema");
 }
-#line 45197 "preproc.c" /* yacc.c:1646  */
+#line 45235 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1859:
 #line 10984 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("overlay ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,mm_strdup("cast ("),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45205 "preproc.c" /* yacc.c:1646  */
+#line 45243 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1860:
 #line 10988 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("position ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("extract ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45213 "preproc.c" /* yacc.c:1646  */
+#line 45251 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1861:
 #line 10992 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("substring ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("overlay ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45221 "preproc.c" /* yacc.c:1646  */
+#line 45259 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1862:
 #line 10996 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("treat ("),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("position ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45229 "preproc.c" /* yacc.c:1646  */
+#line 45267 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1863:
 #line 11000 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("trim ( both"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("substring ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45237 "preproc.c" /* yacc.c:1646  */
+#line 45275 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1864:
 #line 11004 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("trim ( leading"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,mm_strdup("treat ("),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45245 "preproc.c" /* yacc.c:1646  */
+#line 45283 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1865:
 #line 11008 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("trim ( trailing"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("trim ( both"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45253 "preproc.c" /* yacc.c:1646  */
+#line 45291 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1866:
 #line 11012 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("trim ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("trim ( leading"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45261 "preproc.c" /* yacc.c:1646  */
+#line 45299 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1867:
 #line 11016 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("nullif ("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("trim ( trailing"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45269 "preproc.c" /* yacc.c:1646  */
+#line 45307 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1868:
 #line 11020 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("coalesce ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("trim ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45277 "preproc.c" /* yacc.c:1646  */
+#line 45315 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1869:
 #line 11024 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("greatest ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,mm_strdup("nullif ("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45285 "preproc.c" /* yacc.c:1646  */
+#line 45323 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1870:
 #line 11028 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("least ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("coalesce ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45293 "preproc.c" /* yacc.c:1646  */
+#line 45331 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1871:
 #line 11032 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("xmlconcat ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("greatest ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45301 "preproc.c" /* yacc.c:1646  */
+#line 45339 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1872:
 #line 11036 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("xmlelement ( name"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("least ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45309 "preproc.c" /* yacc.c:1646  */
+#line 45347 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1873:
 #line 11040 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("xmlelement ( name"),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("xmlconcat ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45317 "preproc.c" /* yacc.c:1646  */
+#line 45355 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1874:
 #line 11044 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("xmlelement ( name"),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("xmlelement ( name"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45325 "preproc.c" /* yacc.c:1646  */
+#line 45363 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1875:
 #line 11048 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(7,mm_strdup("xmlelement ( name"),(yyvsp[-5].str),mm_strdup(","),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,mm_strdup("xmlelement ( name"),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45333 "preproc.c" /* yacc.c:1646  */
+#line 45371 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1876:
 #line 11052 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("xmlexists ("),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,mm_strdup("xmlelement ( name"),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45341 "preproc.c" /* yacc.c:1646  */
+#line 45379 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1877:
 #line 11056 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("xmlforest ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(7,mm_strdup("xmlelement ( name"),(yyvsp[-5].str),mm_strdup(","),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45349 "preproc.c" /* yacc.c:1646  */
+#line 45387 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1878:
 #line 11060 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("xmlparse ("),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(4,mm_strdup("xmlexists ("),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45357 "preproc.c" /* yacc.c:1646  */
+#line 45395 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1879:
 #line 11064 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("xmlpi ( name"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("xmlforest ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45365 "preproc.c" /* yacc.c:1646  */
+#line 45403 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1880:
 #line 11068 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("xmlpi ( name"),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,mm_strdup("xmlparse ("),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45373 "preproc.c" /* yacc.c:1646  */
+#line 45411 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1881:
 #line 11072 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("xmlroot ("),(yyvsp[-4].str),mm_strdup(","),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("xmlpi ( name"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45381 "preproc.c" /* yacc.c:1646  */
+#line 45419 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1882:
 #line 11076 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("xmlserialize ("),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(5,mm_strdup("xmlpi ( name"),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45389 "preproc.c" /* yacc.c:1646  */
+#line 45427 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1883:
-#line 11084 "preproc.y" /* yacc.c:1646  */
+#line 11080 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,mm_strdup("xmlroot ("),(yyvsp[-4].str),mm_strdup(","),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45397 "preproc.c" /* yacc.c:1646  */
+#line 45435 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1884:
-#line 11088 "preproc.y" /* yacc.c:1646  */
+#line 11084 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("version no value");
+ (yyval.str) = cat_str(6,mm_strdup("xmlserialize ("),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45405 "preproc.c" /* yacc.c:1646  */
+#line 45443 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1885:
-#line 11096 "preproc.y" /* yacc.c:1646  */
+#line 11092 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup(", standalone yes");
+ (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[0].str));
 }
-#line 45413 "preproc.c" /* yacc.c:1646  */
+#line 45451 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1886:
-#line 11100 "preproc.y" /* yacc.c:1646  */
+#line 11096 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup(", standalone no");
+ (yyval.str) = mm_strdup("version no value");
 }
-#line 45421 "preproc.c" /* yacc.c:1646  */
+#line 45459 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1887:
 #line 11104 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup(", standalone no value");
+ (yyval.str) = mm_strdup(", standalone yes");
 }
-#line 45429 "preproc.c" /* yacc.c:1646  */
+#line 45467 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1888:
 #line 11108 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 45436 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup(", standalone no");
+}
+#line 45475 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1889:
-#line 11115 "preproc.y" /* yacc.c:1646  */
+#line 11112 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("xmlattributes ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup(", standalone no value");
 }
-#line 45444 "preproc.c" /* yacc.c:1646  */
+#line 45483 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1890:
-#line 11123 "preproc.y" /* yacc.c:1646  */
+#line 11116 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 45452 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 45490 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1891:
-#line 11127 "preproc.y" /* yacc.c:1646  */
+#line 11123 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("xmlattributes ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45460 "preproc.c" /* yacc.c:1646  */
+#line 45498 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1892:
-#line 11135 "preproc.y" /* yacc.c:1646  */
+#line 11131 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 45468 "preproc.c" /* yacc.c:1646  */
+#line 45506 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1893:
-#line 11139 "preproc.y" /* yacc.c:1646  */
+#line 11135 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 45476 "preproc.c" /* yacc.c:1646  */
+#line 45514 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1894:
-#line 11147 "preproc.y" /* yacc.c:1646  */
+#line 11143 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("document");
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 45484 "preproc.c" /* yacc.c:1646  */
+#line 45522 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1895:
-#line 11151 "preproc.y" /* yacc.c:1646  */
+#line 11147 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("content");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 45492 "preproc.c" /* yacc.c:1646  */
+#line 45530 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1896:
-#line 11159 "preproc.y" /* yacc.c:1646  */
+#line 11155 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("preserve whitespace");
+ (yyval.str) = mm_strdup("document");
 }
-#line 45500 "preproc.c" /* yacc.c:1646  */
+#line 45538 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1897:
-#line 11163 "preproc.y" /* yacc.c:1646  */
+#line 11159 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("strip whitespace");
+ (yyval.str) = mm_strdup("content");
 }
-#line 45508 "preproc.c" /* yacc.c:1646  */
+#line 45546 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1898:
 #line 11167 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 45515 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = mm_strdup("preserve whitespace");
+}
+#line 45554 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1899:
-#line 11174 "preproc.y" /* yacc.c:1646  */
+#line 11171 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("passing"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("strip whitespace");
 }
-#line 45523 "preproc.c" /* yacc.c:1646  */
+#line 45562 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1900:
-#line 11178 "preproc.y" /* yacc.c:1646  */
+#line 11175 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("passing"),(yyvsp[-2].str),mm_strdup("by ref"));
-}
-#line 45531 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 45569 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1901:
 #line 11182 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("passing by ref"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("passing"),(yyvsp[0].str));
 }
-#line 45539 "preproc.c" /* yacc.c:1646  */
+#line 45577 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1902:
 #line 11186 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("passing by ref"),(yyvsp[-2].str),mm_strdup("by ref"));
+ (yyval.str) = cat_str(3,mm_strdup("passing"),(yyvsp[-2].str),mm_strdup("by ref"));
 }
-#line 45547 "preproc.c" /* yacc.c:1646  */
+#line 45585 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1903:
-#line 11194 "preproc.y" /* yacc.c:1646  */
+#line 11190 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("within group ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(2,mm_strdup("passing by ref"),(yyvsp[0].str));
 }
-#line 45555 "preproc.c" /* yacc.c:1646  */
+#line 45593 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1904:
-#line 11198 "preproc.y" /* yacc.c:1646  */
+#line 11194 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 45562 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("passing by ref"),(yyvsp[-2].str),mm_strdup("by ref"));
+}
+#line 45601 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1905:
-#line 11205 "preproc.y" /* yacc.c:1646  */
+#line 11202 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("filter ( where"),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("within group ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45570 "preproc.c" /* yacc.c:1646  */
+#line 45609 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1906:
-#line 11209 "preproc.y" /* yacc.c:1646  */
+#line 11206 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 45577 "preproc.c" /* yacc.c:1646  */
+#line 45616 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1907:
-#line 11216 "preproc.y" /* yacc.c:1646  */
+#line 11213 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("window"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,mm_strdup("filter ( where"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45585 "preproc.c" /* yacc.c:1646  */
+#line 45624 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1908:
-#line 11220 "preproc.y" /* yacc.c:1646  */
+#line 11217 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 45592 "preproc.c" /* yacc.c:1646  */
+#line 45631 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1909:
-#line 11227 "preproc.y" /* yacc.c:1646  */
+#line 11224 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("window"),(yyvsp[0].str));
 }
-#line 45600 "preproc.c" /* yacc.c:1646  */
+#line 45639 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1910:
-#line 11231 "preproc.y" /* yacc.c:1646  */
+#line 11228 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
-}
-#line 45608 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 45646 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1911:
-#line 11239 "preproc.y" /* yacc.c:1646  */
+#line 11235 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 45616 "preproc.c" /* yacc.c:1646  */
+#line 45654 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1912:
-#line 11247 "preproc.y" /* yacc.c:1646  */
+#line 11239 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("over"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 45624 "preproc.c" /* yacc.c:1646  */
+#line 45662 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1913:
-#line 11251 "preproc.y" /* yacc.c:1646  */
+#line 11247 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("over"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 45632 "preproc.c" /* yacc.c:1646  */
+#line 45670 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1914:
 #line 11255 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 45639 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("over"),(yyvsp[0].str));
+}
+#line 45678 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1915:
-#line 11262 "preproc.y" /* yacc.c:1646  */
+#line 11259 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,mm_strdup("("),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(2,mm_strdup("over"),(yyvsp[0].str));
 }
-#line 45647 "preproc.c" /* yacc.c:1646  */
+#line 45686 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1916:
-#line 11270 "preproc.y" /* yacc.c:1646  */
+#line 11263 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 45655 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 45693 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1917:
-#line 11274 "preproc.y" /* yacc.c:1646  */
+#line 11270 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 45662 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(6,mm_strdup("("),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 45701 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1918:
-#line 11281 "preproc.y" /* yacc.c:1646  */
+#line 11278 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("partition by"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 45670 "preproc.c" /* yacc.c:1646  */
+#line 45709 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1919:
-#line 11285 "preproc.y" /* yacc.c:1646  */
+#line 11282 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 45677 "preproc.c" /* yacc.c:1646  */
+#line 45716 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1920:
-#line 11292 "preproc.y" /* yacc.c:1646  */
+#line 11289 "preproc.y" /* yacc.c:1646  */
     { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
- (yyval.str) = cat_str(2,mm_strdup("range"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("partition by"),(yyvsp[0].str));
 }
-#line 45686 "preproc.c" /* yacc.c:1646  */
+#line 45724 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1921:
-#line 11297 "preproc.y" /* yacc.c:1646  */
+#line 11293 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("rows"),(yyvsp[0].str));
-}
-#line 45694 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 45731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1922:
-#line 11301 "preproc.y" /* yacc.c:1646  */
+#line 11300 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 45701 "preproc.c" /* yacc.c:1646  */
+mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
+ (yyval.str) = cat_str(2,mm_strdup("range"),(yyvsp[0].str));
+}
+#line 45740 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1923:
-#line 11308 "preproc.y" /* yacc.c:1646  */
+#line 11305 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("rows"),(yyvsp[0].str));
 }
-#line 45709 "preproc.c" /* yacc.c:1646  */
+#line 45748 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1924:
-#line 11312 "preproc.y" /* yacc.c:1646  */
+#line 11309 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("between"),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
-}
-#line 45717 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 45755 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1925:
-#line 11320 "preproc.y" /* yacc.c:1646  */
+#line 11316 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unbounded preceding");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 45725 "preproc.c" /* yacc.c:1646  */
+#line 45763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1926:
-#line 11324 "preproc.y" /* yacc.c:1646  */
+#line 11320 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unbounded following");
+ (yyval.str) = cat_str(4,mm_strdup("between"),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 45733 "preproc.c" /* yacc.c:1646  */
+#line 45771 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1927:
 #line 11328 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current row");
+ (yyval.str) = mm_strdup("unbounded preceding");
 }
-#line 45741 "preproc.c" /* yacc.c:1646  */
+#line 45779 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1928:
 #line 11332 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("preceding"));
+ (yyval.str) = mm_strdup("unbounded following");
 }
-#line 45749 "preproc.c" /* yacc.c:1646  */
+#line 45787 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1929:
 #line 11336 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("following"));
+ (yyval.str) = mm_strdup("current row");
 }
-#line 45757 "preproc.c" /* yacc.c:1646  */
+#line 45795 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1930:
-#line 11344 "preproc.y" /* yacc.c:1646  */
+#line 11340 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("row ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("preceding"));
 }
-#line 45765 "preproc.c" /* yacc.c:1646  */
+#line 45803 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1931:
-#line 11348 "preproc.y" /* yacc.c:1646  */
+#line 11344 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("row ( )");
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("following"));
 }
-#line 45773 "preproc.c" /* yacc.c:1646  */
+#line 45811 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1932:
 #line 11352 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("row ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45781 "preproc.c" /* yacc.c:1646  */
+#line 45819 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1933:
-#line 11360 "preproc.y" /* yacc.c:1646  */
+#line 11356 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("row ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("row ( )");
 }
-#line 45789 "preproc.c" /* yacc.c:1646  */
+#line 45827 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1934:
-#line 11364 "preproc.y" /* yacc.c:1646  */
+#line 11360 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("row ( )");
+ (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45797 "preproc.c" /* yacc.c:1646  */
+#line 45835 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1935:
-#line 11372 "preproc.y" /* yacc.c:1646  */
+#line 11368 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = cat_str(3,mm_strdup("row ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45805 "preproc.c" /* yacc.c:1646  */
+#line 45843 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1936:
-#line 11380 "preproc.y" /* yacc.c:1646  */
+#line 11372 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("any");
+ (yyval.str) = mm_strdup("row ( )");
 }
-#line 45813 "preproc.c" /* yacc.c:1646  */
+#line 45851 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1937:
-#line 11384 "preproc.y" /* yacc.c:1646  */
+#line 11380 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("some");
+ (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45821 "preproc.c" /* yacc.c:1646  */
+#line 45859 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1938:
 #line 11388 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all");
+ (yyval.str) = mm_strdup("any");
 }
-#line 45829 "preproc.c" /* yacc.c:1646  */
+#line 45867 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1939:
-#line 11396 "preproc.y" /* yacc.c:1646  */
+#line 11392 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("some");
 }
-#line 45837 "preproc.c" /* yacc.c:1646  */
+#line 45875 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1940:
-#line 11400 "preproc.y" /* yacc.c:1646  */
+#line 11396 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("all");
 }
-#line 45845 "preproc.c" /* yacc.c:1646  */
+#line 45883 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1941:
-#line 11408 "preproc.y" /* yacc.c:1646  */
+#line 11404 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("+");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 45853 "preproc.c" /* yacc.c:1646  */
+#line 45891 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1942:
-#line 11412 "preproc.y" /* yacc.c:1646  */
+#line 11408 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("-");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 45861 "preproc.c" /* yacc.c:1646  */
+#line 45899 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1943:
 #line 11416 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("*");
+ (yyval.str) = mm_strdup("+");
 }
-#line 45869 "preproc.c" /* yacc.c:1646  */
+#line 45907 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1944:
 #line 11420 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("/");
+ (yyval.str) = mm_strdup("-");
 }
-#line 45877 "preproc.c" /* yacc.c:1646  */
+#line 45915 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1945:
 #line 11424 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("%");
+ (yyval.str) = mm_strdup("*");
 }
-#line 45885 "preproc.c" /* yacc.c:1646  */
+#line 45923 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1946:
 #line 11428 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("^");
+ (yyval.str) = mm_strdup("/");
 }
-#line 45893 "preproc.c" /* yacc.c:1646  */
+#line 45931 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1947:
 #line 11432 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("<");
+ (yyval.str) = mm_strdup("%");
 }
-#line 45901 "preproc.c" /* yacc.c:1646  */
+#line 45939 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1948:
 #line 11436 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup(">");
+ (yyval.str) = mm_strdup("^");
 }
-#line 45909 "preproc.c" /* yacc.c:1646  */
+#line 45947 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1949:
 #line 11440 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("=");
+ (yyval.str) = mm_strdup("<");
 }
-#line 45917 "preproc.c" /* yacc.c:1646  */
+#line 45955 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1950:
 #line 11444 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("<=");
+ (yyval.str) = mm_strdup(">");
 }
-#line 45925 "preproc.c" /* yacc.c:1646  */
+#line 45963 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1951:
 #line 11448 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup(">=");
+ (yyval.str) = mm_strdup("=");
 }
-#line 45933 "preproc.c" /* yacc.c:1646  */
+#line 45971 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1952:
 #line 11452 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("<>");
+ (yyval.str) = mm_strdup("<=");
 }
-#line 45941 "preproc.c" /* yacc.c:1646  */
+#line 45979 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1953:
-#line 11460 "preproc.y" /* yacc.c:1646  */
+#line 11456 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup(">=");
 }
-#line 45949 "preproc.c" /* yacc.c:1646  */
+#line 45987 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1954:
-#line 11464 "preproc.y" /* yacc.c:1646  */
+#line 11460 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("operator ("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = mm_strdup("<>");
 }
-#line 45957 "preproc.c" /* yacc.c:1646  */
+#line 45995 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1955:
-#line 11472 "preproc.y" /* yacc.c:1646  */
+#line 11468 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45965 "preproc.c" /* yacc.c:1646  */
+#line 46003 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1956:
-#line 11476 "preproc.y" /* yacc.c:1646  */
+#line 11472 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(3,mm_strdup("operator ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45973 "preproc.c" /* yacc.c:1646  */
+#line 46011 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1957:
-#line 11484 "preproc.y" /* yacc.c:1646  */
+#line 11480 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45981 "preproc.c" /* yacc.c:1646  */
+#line 46019 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1958:
-#line 11488 "preproc.y" /* yacc.c:1646  */
+#line 11484 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(3,mm_strdup("operator ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45989 "preproc.c" /* yacc.c:1646  */
+#line 46027 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1959:
 #line 11492 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("like");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 45997 "preproc.c" /* yacc.c:1646  */
+#line 46035 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1960:
 #line 11496 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("not like");
+ (yyval.str) = cat_str(3,mm_strdup("operator ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 46005 "preproc.c" /* yacc.c:1646  */
+#line 46043 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1961:
 #line 11500 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("ilike");
+ (yyval.str) = mm_strdup("like");
 }
-#line 46013 "preproc.c" /* yacc.c:1646  */
+#line 46051 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1962:
 #line 11504 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("not ilike");
+ (yyval.str) = mm_strdup("not like");
 }
-#line 46021 "preproc.c" /* yacc.c:1646  */
+#line 46059 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1963:
-#line 11512 "preproc.y" /* yacc.c:1646  */
+#line 11508 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("ilike");
 }
-#line 46029 "preproc.c" /* yacc.c:1646  */
+#line 46067 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1964:
-#line 11516 "preproc.y" /* yacc.c:1646  */
+#line 11512 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("not ilike");
 }
-#line 46037 "preproc.c" /* yacc.c:1646  */
+#line 46075 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1965:
-#line 11524 "preproc.y" /* yacc.c:1646  */
+#line 11520 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46045 "preproc.c" /* yacc.c:1646  */
+#line 46083 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1966:
-#line 11528 "preproc.y" /* yacc.c:1646  */
+#line 11524 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46053 "preproc.c" /* yacc.c:1646  */
+#line 46091 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1967:
-#line 11536 "preproc.y" /* yacc.c:1646  */
+#line 11532 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46061 "preproc.c" /* yacc.c:1646  */
+#line 46099 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1968:
-#line 11540 "preproc.y" /* yacc.c:1646  */
+#line 11536 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(":="),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46069 "preproc.c" /* yacc.c:1646  */
+#line 46107 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1969:
 #line 11544 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("=>"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46077 "preproc.c" /* yacc.c:1646  */
+#line 46115 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1970:
-#line 11552 "preproc.y" /* yacc.c:1646  */
+#line 11548 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(":="),(yyvsp[0].str));
 }
-#line 46085 "preproc.c" /* yacc.c:1646  */
+#line 46123 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1971:
-#line 11556 "preproc.y" /* yacc.c:1646  */
+#line 11552 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("=>"),(yyvsp[0].str));
 }
-#line 46093 "preproc.c" /* yacc.c:1646  */
+#line 46131 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1972:
-#line 11564 "preproc.y" /* yacc.c:1646  */
+#line 11560 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[-1].str),mm_strdup("]"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46101 "preproc.c" /* yacc.c:1646  */
+#line 46139 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1973:
-#line 11568 "preproc.y" /* yacc.c:1646  */
+#line 11564 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[-1].str),mm_strdup("]"));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46109 "preproc.c" /* yacc.c:1646  */
+#line 46147 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1974:
 #line 11572 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("[ ]");
+ (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 46117 "preproc.c" /* yacc.c:1646  */
+#line 46155 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1975:
-#line 11580 "preproc.y" /* yacc.c:1646  */
+#line 11576 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 46125 "preproc.c" /* yacc.c:1646  */
+#line 46163 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1976:
-#line 11584 "preproc.y" /* yacc.c:1646  */
+#line 11580 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("[ ]");
 }
-#line 46133 "preproc.c" /* yacc.c:1646  */
+#line 46171 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1977:
-#line 11592 "preproc.y" /* yacc.c:1646  */
+#line 11588 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46141 "preproc.c" /* yacc.c:1646  */
+#line 46179 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1978:
-#line 11596 "preproc.y" /* yacc.c:1646  */
+#line 11592 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 46148 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+}
+#line 46187 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1979:
-#line 11603 "preproc.y" /* yacc.c:1646  */
+#line 11600 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 46156 "preproc.c" /* yacc.c:1646  */
+#line 46195 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1980:
-#line 11607 "preproc.y" /* yacc.c:1646  */
+#line 11604 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("year");
-}
-#line 46164 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 46202 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1981:
 #line 11611 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("month");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46172 "preproc.c" /* yacc.c:1646  */
+#line 46210 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1982:
 #line 11615 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("day");
+ (yyval.str) = mm_strdup("year");
 }
-#line 46180 "preproc.c" /* yacc.c:1646  */
+#line 46218 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1983:
 #line 11619 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("hour");
+ (yyval.str) = mm_strdup("month");
 }
-#line 46188 "preproc.c" /* yacc.c:1646  */
+#line 46226 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1984:
 #line 11623 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("minute");
+ (yyval.str) = mm_strdup("day");
 }
-#line 46196 "preproc.c" /* yacc.c:1646  */
+#line 46234 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1985:
 #line 11627 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("second");
+ (yyval.str) = mm_strdup("hour");
 }
-#line 46204 "preproc.c" /* yacc.c:1646  */
+#line 46242 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1986:
 #line 11631 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("minute");
 }
-#line 46212 "preproc.c" /* yacc.c:1646  */
+#line 46250 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1987:
-#line 11639 "preproc.y" /* yacc.c:1646  */
+#line 11635 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("second");
 }
-#line 46220 "preproc.c" /* yacc.c:1646  */
+#line 46258 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1988:
-#line 11643 "preproc.y" /* yacc.c:1646  */
+#line 11639 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46228 "preproc.c" /* yacc.c:1646  */
+#line 46266 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1989:
-#line 11651 "preproc.y" /* yacc.c:1646  */
+#line 11647 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("placing"),(yyvsp[0].str));
+ (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46236 "preproc.c" /* yacc.c:1646  */
+#line 46274 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1990:
-#line 11659 "preproc.y" /* yacc.c:1646  */
+#line 11651 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("in"),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46244 "preproc.c" /* yacc.c:1646  */
+#line 46282 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1991:
-#line 11663 "preproc.y" /* yacc.c:1646  */
+#line 11659 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 46251 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,mm_strdup("placing"),(yyvsp[0].str));
+}
+#line 46290 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1992:
-#line 11670 "preproc.y" /* yacc.c:1646  */
+#line 11667 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("in"),(yyvsp[0].str));
 }
-#line 46259 "preproc.c" /* yacc.c:1646  */
+#line 46298 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1993:
-#line 11674 "preproc.y" /* yacc.c:1646  */
+#line 11671 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 46267 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 46305 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1994:
 #line 11678 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46275 "preproc.c" /* yacc.c:1646  */
+#line 46313 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1995:
 #line 11682 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46283 "preproc.c" /* yacc.c:1646  */
+#line 46321 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1996:
 #line 11686 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46291 "preproc.c" /* yacc.c:1646  */
+#line 46329 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1997:
 #line 11690 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 46298 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 46337 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1998:
-#line 11697 "preproc.y" /* yacc.c:1646  */
+#line 11694 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46306 "preproc.c" /* yacc.c:1646  */
+#line 46345 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 1999:
-#line 11705 "preproc.y" /* yacc.c:1646  */
+#line 11698 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("for"),(yyvsp[0].str));
-}
-#line 46314 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 46352 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2000:
-#line 11713 "preproc.y" /* yacc.c:1646  */
+#line 11705 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
 }
-#line 46322 "preproc.c" /* yacc.c:1646  */
+#line 46360 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2001:
-#line 11717 "preproc.y" /* yacc.c:1646  */
+#line 11713 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,mm_strdup("for"),(yyvsp[0].str));
 }
-#line 46330 "preproc.c" /* yacc.c:1646  */
+#line 46368 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2002:
 #line 11721 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 46338 "preproc.c" /* yacc.c:1646  */
+#line 46376 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2003:
-#line 11729 "preproc.y" /* yacc.c:1646  */
+#line 11725 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
 }
-#line 46346 "preproc.c" /* yacc.c:1646  */
+#line 46384 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2004:
-#line 11733 "preproc.y" /* yacc.c:1646  */
+#line 11729 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46354 "preproc.c" /* yacc.c:1646  */
+#line 46392 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2005:
-#line 11741 "preproc.y" /* yacc.c:1646  */
+#line 11737 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("case"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup("end"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46362 "preproc.c" /* yacc.c:1646  */
+#line 46400 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2006:
-#line 11749 "preproc.y" /* yacc.c:1646  */
+#line 11741 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 46370 "preproc.c" /* yacc.c:1646  */
+#line 46408 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2007:
-#line 11753 "preproc.y" /* yacc.c:1646  */
+#line 11749 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("case"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup("end"));
 }
-#line 46378 "preproc.c" /* yacc.c:1646  */
+#line 46416 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2008:
-#line 11761 "preproc.y" /* yacc.c:1646  */
+#line 11757 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(4,mm_strdup("when"),(yyvsp[-2].str),mm_strdup("then"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46386 "preproc.c" /* yacc.c:1646  */
+#line 46424 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2009:
-#line 11769 "preproc.y" /* yacc.c:1646  */
+#line 11761 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("else"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46394 "preproc.c" /* yacc.c:1646  */
+#line 46432 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2010:
-#line 11773 "preproc.y" /* yacc.c:1646  */
+#line 11769 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 46401 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(4,mm_strdup("when"),(yyvsp[-2].str),mm_strdup("then"),(yyvsp[0].str));
+}
+#line 46440 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2011:
-#line 11780 "preproc.y" /* yacc.c:1646  */
+#line 11777 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("else"),(yyvsp[0].str));
 }
-#line 46409 "preproc.c" /* yacc.c:1646  */
+#line 46448 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2012:
-#line 11784 "preproc.y" /* yacc.c:1646  */
+#line 11781 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str)=EMPTY; }
-#line 46416 "preproc.c" /* yacc.c:1646  */
+#line 46455 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2013:
-#line 11791 "preproc.y" /* yacc.c:1646  */
+#line 11788 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46424 "preproc.c" /* yacc.c:1646  */
+#line 46463 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2014:
-#line 11795 "preproc.y" /* yacc.c:1646  */
+#line 11792 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
-}
-#line 46432 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 46470 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2015:
-#line 11803 "preproc.y" /* yacc.c:1646  */
+#line 11799 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("."),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46440 "preproc.c" /* yacc.c:1646  */
+#line 46478 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2016:
-#line 11807 "preproc.y" /* yacc.c:1646  */
+#line 11803 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup(". *");
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46448 "preproc.c" /* yacc.c:1646  */
+#line 46486 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2017:
 #line 11811 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[-1].str),mm_strdup("]"));
+ (yyval.str) = cat_str(2,mm_strdup("."),(yyvsp[0].str));
 }
-#line 46456 "preproc.c" /* yacc.c:1646  */
+#line 46494 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2018:
 #line 11815 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,mm_strdup("["),(yyvsp[-3].str),mm_strdup(":"),(yyvsp[-1].str),mm_strdup("]"));
+ (yyval.str) = mm_strdup(". *");
 }
-#line 46464 "preproc.c" /* yacc.c:1646  */
+#line 46502 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2019:
-#line 11823 "preproc.y" /* yacc.c:1646  */
+#line 11819 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 46472 "preproc.c" /* yacc.c:1646  */
+#line 46510 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2020:
-#line 11827 "preproc.y" /* yacc.c:1646  */
+#line 11823 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(5,mm_strdup("["),(yyvsp[-3].str),mm_strdup(":"),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 46480 "preproc.c" /* yacc.c:1646  */
+#line 46518 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2021:
-#line 11835 "preproc.y" /* yacc.c:1646  */
+#line 11831 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 46487 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = (yyvsp[0].str);
+}
+#line 46526 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2022:
-#line 11838 "preproc.y" /* yacc.c:1646  */
+#line 11835 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46495 "preproc.c" /* yacc.c:1646  */
+#line 46534 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2023:
-#line 11846 "preproc.y" /* yacc.c:1646  */
+#line 11843 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("asymmetric");
-}
-#line 46503 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 46541 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2024:
-#line 11850 "preproc.y" /* yacc.c:1646  */
+#line 11846 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 46510 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+}
+#line 46549 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2025:
-#line 11857 "preproc.y" /* yacc.c:1646  */
+#line 11854 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("asymmetric");
 }
-#line 46518 "preproc.c" /* yacc.c:1646  */
+#line 46557 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2026:
-#line 11861 "preproc.y" /* yacc.c:1646  */
+#line 11858 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("default");
-}
-#line 46526 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 46564 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2027:
-#line 11869 "preproc.y" /* yacc.c:1646  */
+#line 11865 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46534 "preproc.c" /* yacc.c:1646  */
+#line 46572 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2028:
-#line 11873 "preproc.y" /* yacc.c:1646  */
+#line 11869 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("default");
 }
-#line 46542 "preproc.c" /* yacc.c:1646  */
+#line 46580 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2029:
-#line 11881 "preproc.y" /* yacc.c:1646  */
+#line 11877 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46550 "preproc.c" /* yacc.c:1646  */
+#line 46588 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2030:
-#line 11889 "preproc.y" /* yacc.c:1646  */
+#line 11881 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46558 "preproc.c" /* yacc.c:1646  */
+#line 46596 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2031:
-#line 11893 "preproc.y" /* yacc.c:1646  */
+#line 11889 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str)=EMPTY; }
-#line 46565 "preproc.c" /* yacc.c:1646  */
+ (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
+}
+#line 46604 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2032:
-#line 11900 "preproc.y" /* yacc.c:1646  */
+#line 11897 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46573 "preproc.c" /* yacc.c:1646  */
+#line 46612 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2033:
-#line 11904 "preproc.y" /* yacc.c:1646  */
+#line 11901 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
-}
-#line 46581 "preproc.c" /* yacc.c:1646  */
+ (yyval.str)=EMPTY; }
+#line 46619 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2034:
-#line 11912 "preproc.y" /* yacc.c:1646  */
+#line 11908 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46589 "preproc.c" /* yacc.c:1646  */
+#line 46627 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2035:
-#line 11916 "preproc.y" /* yacc.c:1646  */
+#line 11912 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46597 "preproc.c" /* yacc.c:1646  */
+#line 46635 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2036:
 #line 11920 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 46605 "preproc.c" /* yacc.c:1646  */
+#line 46643 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2037:
 #line 11924 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("*");
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46613 "preproc.c" /* yacc.c:1646  */
+#line 46651 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2038:
-#line 11932 "preproc.y" /* yacc.c:1646  */
+#line 11928 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46621 "preproc.c" /* yacc.c:1646  */
+#line 46659 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2039:
-#line 11936 "preproc.y" /* yacc.c:1646  */
+#line 11932 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("*");
 }
-#line 46629 "preproc.c" /* yacc.c:1646  */
+#line 46667 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2040:
-#line 11944 "preproc.y" /* yacc.c:1646  */
+#line 11940 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46637 "preproc.c" /* yacc.c:1646  */
+#line 46675 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2041:
-#line 11948 "preproc.y" /* yacc.c:1646  */
+#line 11944 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46645 "preproc.c" /* yacc.c:1646  */
+#line 46683 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2042:
-#line 11956 "preproc.y" /* yacc.c:1646  */
+#line 11952 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46653 "preproc.c" /* yacc.c:1646  */
+#line 46691 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2043:
-#line 11960 "preproc.y" /* yacc.c:1646  */
+#line 11956 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46661 "preproc.c" /* yacc.c:1646  */
+#line 46699 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2044:
-#line 11968 "preproc.y" /* yacc.c:1646  */
+#line 11964 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46669 "preproc.c" /* yacc.c:1646  */
+#line 46707 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2045:
-#line 11976 "preproc.y" /* yacc.c:1646  */
+#line 11968 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46677 "preproc.c" /* yacc.c:1646  */
+#line 46715 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2046:
-#line 11984 "preproc.y" /* yacc.c:1646  */
+#line 11976 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46685 "preproc.c" /* yacc.c:1646  */
+#line 46723 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2047:
-#line 11992 "preproc.y" /* yacc.c:1646  */
+#line 11984 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46693 "preproc.c" /* yacc.c:1646  */
+#line 46731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2048:
-#line 12000 "preproc.y" /* yacc.c:1646  */
+#line 11992 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46701 "preproc.c" /* yacc.c:1646  */
+#line 46739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2049:
-#line 12008 "preproc.y" /* yacc.c:1646  */
+#line 12000 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46709 "preproc.c" /* yacc.c:1646  */
+#line 46747 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2050:
-#line 12016 "preproc.y" /* yacc.c:1646  */
+#line 12008 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46717 "preproc.c" /* yacc.c:1646  */
+#line 46755 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2051:
-#line 12020 "preproc.y" /* yacc.c:1646  */
+#line 12016 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46725 "preproc.c" /* yacc.c:1646  */
+#line 46763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2052:
-#line 12028 "preproc.y" /* yacc.c:1646  */
+#line 12024 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46733 "preproc.c" /* yacc.c:1646  */
+#line 46771 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2053:
-#line 12032 "preproc.y" /* yacc.c:1646  */
+#line 12028 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46741 "preproc.c" /* yacc.c:1646  */
+#line 46779 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2054:
@@ -46745,7 +46783,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46749 "preproc.c" /* yacc.c:1646  */
+#line 46787 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2055:
@@ -46753,31 +46791,31 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46757 "preproc.c" /* yacc.c:1646  */
+#line 46795 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2056:
 #line 12044 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xconst");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46765 "preproc.c" /* yacc.c:1646  */
+#line 46803 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2057:
 #line 12048 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46773 "preproc.c" /* yacc.c:1646  */
+#line 46811 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2058:
 #line 12052 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(6,(yyvsp[-5].str),mm_strdup("("),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("xconst");
 }
-#line 46781 "preproc.c" /* yacc.c:1646  */
+#line 46819 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2059:
@@ -46785,159 +46823,159 @@
     { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46789 "preproc.c" /* yacc.c:1646  */
+#line 46827 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2060:
 #line 12060 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
+ (yyval.str) = cat_str(6,(yyvsp[-5].str),mm_strdup("("),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 46797 "preproc.c" /* yacc.c:1646  */
+#line 46835 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2061:
 #line 12064 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
+ (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46805 "preproc.c" /* yacc.c:1646  */
+#line 46843 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2062:
 #line 12068 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("true");
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46813 "preproc.c" /* yacc.c:1646  */
+#line 46851 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2063:
 #line 12072 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("false");
+ (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 46821 "preproc.c" /* yacc.c:1646  */
+#line 46859 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2064:
 #line 12076 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("null");
+ (yyval.str) = mm_strdup("true");
 }
-#line 46829 "preproc.c" /* yacc.c:1646  */
+#line 46867 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2065:
-#line 12079 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 46835 "preproc.c" /* yacc.c:1646  */
+#line 12080 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = mm_strdup("false");
+}
+#line 46875 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2066:
-#line 12080 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 46841 "preproc.c" /* yacc.c:1646  */
+#line 12084 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = mm_strdup("null");
+}
+#line 46883 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2067:
-#line 12086 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = make_name(); }
-#line 46847 "preproc.c" /* yacc.c:1646  */
+#line 12087 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 46889 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2068:
-#line 12092 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = (yyvsp[0].str);
-}
-#line 46855 "preproc.c" /* yacc.c:1646  */
+#line 12088 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 46895 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2069:
-#line 12095 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 46861 "preproc.c" /* yacc.c:1646  */
+#line 12094 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = make_name(); }
+#line 46901 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2070:
-#line 12097 "preproc.y" /* yacc.c:1646  */
+#line 12100 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46869 "preproc.c" /* yacc.c:1646  */
+#line 46909 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2071:
-#line 12101 "preproc.y" /* yacc.c:1646  */
-    { 
- (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
-}
-#line 46877 "preproc.c" /* yacc.c:1646  */
+#line 12103 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 46915 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2072:
-#line 12109 "preproc.y" /* yacc.c:1646  */
+#line 12105 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
 }
-#line 46885 "preproc.c" /* yacc.c:1646  */
+#line 46923 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2073:
-#line 12117 "preproc.y" /* yacc.c:1646  */
+#line 12109 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
 }
-#line 46893 "preproc.c" /* yacc.c:1646  */
+#line 46931 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2074:
-#line 12121 "preproc.y" /* yacc.c:1646  */
+#line 12117 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_user");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46901 "preproc.c" /* yacc.c:1646  */
+#line 46939 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2075:
 #line 12125 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("session_user");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46909 "preproc.c" /* yacc.c:1646  */
+#line 46947 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2076:
-#line 12133 "preproc.y" /* yacc.c:1646  */
+#line 12129 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = mm_strdup("current_user");
 }
-#line 46917 "preproc.c" /* yacc.c:1646  */
+#line 46955 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2077:
-#line 12137 "preproc.y" /* yacc.c:1646  */
+#line 12133 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
+ (yyval.str) = mm_strdup("session_user");
 }
-#line 46925 "preproc.c" /* yacc.c:1646  */
+#line 46963 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2078:
-#line 12145 "preproc.y" /* yacc.c:1646  */
+#line 12141 "preproc.y" /* yacc.c:1646  */
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46933 "preproc.c" /* yacc.c:1646  */
+#line 46971 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2079:
-#line 12149 "preproc.y" /* yacc.c:1646  */
+#line 12145 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = (yyvsp[0].str);
+ (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46941 "preproc.c" /* yacc.c:1646  */
+#line 46979 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2080:
@@ -46945,7 +46983,7 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46949 "preproc.c" /* yacc.c:1646  */
+#line 46987 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2081:
@@ -46953,3261 +46991,3277 @@
     { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46957 "preproc.c" /* yacc.c:1646  */
+#line 46995 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2082:
-#line 12165 "preproc.y" /* yacc.c:1646  */
+#line 12161 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("abort");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46965 "preproc.c" /* yacc.c:1646  */
+#line 47003 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2083:
-#line 12169 "preproc.y" /* yacc.c:1646  */
+#line 12165 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("absolute");
+ (yyval.str) = (yyvsp[0].str);
 }
-#line 46973 "preproc.c" /* yacc.c:1646  */
+#line 47011 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2084:
 #line 12173 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("access");
+ (yyval.str) = mm_strdup("abort");
 }
-#line 46981 "preproc.c" /* yacc.c:1646  */
+#line 47019 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2085:
 #line 12177 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("action");
+ (yyval.str) = mm_strdup("absolute");
 }
-#line 46989 "preproc.c" /* yacc.c:1646  */
+#line 47027 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2086:
 #line 12181 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("add");
+ (yyval.str) = mm_strdup("access");
 }
-#line 46997 "preproc.c" /* yacc.c:1646  */
+#line 47035 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2087:
 #line 12185 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("admin");
+ (yyval.str) = mm_strdup("action");
 }
-#line 47005 "preproc.c" /* yacc.c:1646  */
+#line 47043 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2088:
 #line 12189 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("after");
+ (yyval.str) = mm_strdup("add");
 }
-#line 47013 "preproc.c" /* yacc.c:1646  */
+#line 47051 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2089:
 #line 12193 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("aggregate");
+ (yyval.str) = mm_strdup("admin");
 }
-#line 47021 "preproc.c" /* yacc.c:1646  */
+#line 47059 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2090:
 #line 12197 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("also");
+ (yyval.str) = mm_strdup("after");
 }
-#line 47029 "preproc.c" /* yacc.c:1646  */
+#line 47067 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2091:
 #line 12201 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("alter");
+ (yyval.str) = mm_strdup("aggregate");
 }
-#line 47037 "preproc.c" /* yacc.c:1646  */
+#line 47075 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2092:
 #line 12205 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("always");
+ (yyval.str) = mm_strdup("also");
 }
-#line 47045 "preproc.c" /* yacc.c:1646  */
+#line 47083 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2093:
 #line 12209 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("assertion");
+ (yyval.str) = mm_strdup("alter");
 }
-#line 47053 "preproc.c" /* yacc.c:1646  */
+#line 47091 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2094:
 #line 12213 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("assignment");
+ (yyval.str) = mm_strdup("always");
 }
-#line 47061 "preproc.c" /* yacc.c:1646  */
+#line 47099 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2095:
 #line 12217 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("at");
+ (yyval.str) = mm_strdup("assertion");
 }
-#line 47069 "preproc.c" /* yacc.c:1646  */
+#line 47107 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2096:
 #line 12221 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("attribute");
+ (yyval.str) = mm_strdup("assignment");
 }
-#line 47077 "preproc.c" /* yacc.c:1646  */
+#line 47115 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2097:
 #line 12225 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("backward");
+ (yyval.str) = mm_strdup("at");
 }
-#line 47085 "preproc.c" /* yacc.c:1646  */
+#line 47123 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2098:
 #line 12229 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("before");
+ (yyval.str) = mm_strdup("attribute");
 }
-#line 47093 "preproc.c" /* yacc.c:1646  */
+#line 47131 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2099:
 #line 12233 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("begin");
+ (yyval.str) = mm_strdup("backward");
 }
-#line 47101 "preproc.c" /* yacc.c:1646  */
+#line 47139 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2100:
 #line 12237 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("by");
+ (yyval.str) = mm_strdup("before");
 }
-#line 47109 "preproc.c" /* yacc.c:1646  */
+#line 47147 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2101:
 #line 12241 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cache");
+ (yyval.str) = mm_strdup("begin");
 }
-#line 47117 "preproc.c" /* yacc.c:1646  */
+#line 47155 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2102:
 #line 12245 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("called");
+ (yyval.str) = mm_strdup("by");
 }
-#line 47125 "preproc.c" /* yacc.c:1646  */
+#line 47163 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2103:
 #line 12249 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cascade");
+ (yyval.str) = mm_strdup("cache");
 }
-#line 47133 "preproc.c" /* yacc.c:1646  */
+#line 47171 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2104:
 #line 12253 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cascaded");
+ (yyval.str) = mm_strdup("called");
 }
-#line 47141 "preproc.c" /* yacc.c:1646  */
+#line 47179 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2105:
 #line 12257 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("catalog");
+ (yyval.str) = mm_strdup("cascade");
 }
-#line 47149 "preproc.c" /* yacc.c:1646  */
+#line 47187 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2106:
 #line 12261 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("chain");
+ (yyval.str) = mm_strdup("cascaded");
 }
-#line 47157 "preproc.c" /* yacc.c:1646  */
+#line 47195 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2107:
 #line 12265 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("characteristics");
+ (yyval.str) = mm_strdup("catalog");
 }
-#line 47165 "preproc.c" /* yacc.c:1646  */
+#line 47203 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2108:
 #line 12269 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("checkpoint");
+ (yyval.str) = mm_strdup("chain");
 }
-#line 47173 "preproc.c" /* yacc.c:1646  */
+#line 47211 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2109:
 #line 12273 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("class");
+ (yyval.str) = mm_strdup("characteristics");
 }
-#line 47181 "preproc.c" /* yacc.c:1646  */
+#line 47219 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2110:
 #line 12277 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("close");
+ (yyval.str) = mm_strdup("checkpoint");
 }
-#line 47189 "preproc.c" /* yacc.c:1646  */
+#line 47227 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2111:
 #line 12281 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cluster");
+ (yyval.str) = mm_strdup("class");
 }
-#line 47197 "preproc.c" /* yacc.c:1646  */
+#line 47235 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2112:
 #line 12285 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("comment");
+ (yyval.str) = mm_strdup("close");
 }
-#line 47205 "preproc.c" /* yacc.c:1646  */
+#line 47243 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2113:
 #line 12289 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("comments");
+ (yyval.str) = mm_strdup("cluster");
 }
-#line 47213 "preproc.c" /* yacc.c:1646  */
+#line 47251 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2114:
 #line 12293 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("commit");
+ (yyval.str) = mm_strdup("comment");
 }
-#line 47221 "preproc.c" /* yacc.c:1646  */
+#line 47259 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2115:
 #line 12297 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("committed");
+ (yyval.str) = mm_strdup("comments");
 }
-#line 47229 "preproc.c" /* yacc.c:1646  */
+#line 47267 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2116:
 #line 12301 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("configuration");
+ (yyval.str) = mm_strdup("commit");
 }
-#line 47237 "preproc.c" /* yacc.c:1646  */
+#line 47275 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2117:
 #line 12305 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("conflict");
+ (yyval.str) = mm_strdup("committed");
 }
-#line 47245 "preproc.c" /* yacc.c:1646  */
+#line 47283 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2118:
 #line 12309 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("constraints");
+ (yyval.str) = mm_strdup("configuration");
 }
-#line 47253 "preproc.c" /* yacc.c:1646  */
+#line 47291 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2119:
 #line 12313 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("content");
+ (yyval.str) = mm_strdup("conflict");
 }
-#line 47261 "preproc.c" /* yacc.c:1646  */
+#line 47299 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2120:
 #line 12317 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("continue");
+ (yyval.str) = mm_strdup("constraints");
 }
-#line 47269 "preproc.c" /* yacc.c:1646  */
+#line 47307 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2121:
 #line 12321 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("conversion");
+ (yyval.str) = mm_strdup("content");
 }
-#line 47277 "preproc.c" /* yacc.c:1646  */
+#line 47315 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2122:
 #line 12325 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("copy");
+ (yyval.str) = mm_strdup("continue");
 }
-#line 47285 "preproc.c" /* yacc.c:1646  */
+#line 47323 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2123:
 #line 12329 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cost");
+ (yyval.str) = mm_strdup("conversion");
 }
-#line 47293 "preproc.c" /* yacc.c:1646  */
+#line 47331 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2124:
 #line 12333 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("csv");
+ (yyval.str) = mm_strdup("copy");
 }
-#line 47301 "preproc.c" /* yacc.c:1646  */
+#line 47339 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2125:
 #line 12337 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cube");
+ (yyval.str) = mm_strdup("cost");
 }
-#line 47309 "preproc.c" /* yacc.c:1646  */
+#line 47347 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2126:
 #line 12341 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cursor");
+ (yyval.str) = mm_strdup("csv");
 }
-#line 47317 "preproc.c" /* yacc.c:1646  */
+#line 47355 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2127:
 #line 12345 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cycle");
+ (yyval.str) = mm_strdup("cube");
 }
-#line 47325 "preproc.c" /* yacc.c:1646  */
+#line 47363 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2128:
 #line 12349 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("data");
+ (yyval.str) = mm_strdup("cursor");
 }
-#line 47333 "preproc.c" /* yacc.c:1646  */
+#line 47371 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2129:
 #line 12353 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("database");
+ (yyval.str) = mm_strdup("cycle");
 }
-#line 47341 "preproc.c" /* yacc.c:1646  */
+#line 47379 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2130:
 #line 12357 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("deallocate");
+ (yyval.str) = mm_strdup("data");
 }
-#line 47349 "preproc.c" /* yacc.c:1646  */
+#line 47387 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2131:
 #line 12361 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("declare");
+ (yyval.str) = mm_strdup("database");
 }
-#line 47357 "preproc.c" /* yacc.c:1646  */
+#line 47395 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2132:
 #line 12365 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("defaults");
+ (yyval.str) = mm_strdup("deallocate");
 }
-#line 47365 "preproc.c" /* yacc.c:1646  */
+#line 47403 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2133:
 #line 12369 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("deferred");
+ (yyval.str) = mm_strdup("declare");
 }
-#line 47373 "preproc.c" /* yacc.c:1646  */
+#line 47411 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2134:
 #line 12373 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("definer");
+ (yyval.str) = mm_strdup("defaults");
 }
-#line 47381 "preproc.c" /* yacc.c:1646  */
+#line 47419 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2135:
 #line 12377 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("delete");
+ (yyval.str) = mm_strdup("deferred");
 }
-#line 47389 "preproc.c" /* yacc.c:1646  */
+#line 47427 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2136:
 #line 12381 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("delimiter");
+ (yyval.str) = mm_strdup("definer");
 }
-#line 47397 "preproc.c" /* yacc.c:1646  */
+#line 47435 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2137:
 #line 12385 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("delimiters");
+ (yyval.str) = mm_strdup("delete");
 }
-#line 47405 "preproc.c" /* yacc.c:1646  */
+#line 47443 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2138:
 #line 12389 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("dictionary");
+ (yyval.str) = mm_strdup("delimiter");
 }
-#line 47413 "preproc.c" /* yacc.c:1646  */
+#line 47451 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2139:
 #line 12393 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("disable");
+ (yyval.str) = mm_strdup("delimiters");
 }
-#line 47421 "preproc.c" /* yacc.c:1646  */
+#line 47459 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2140:
 #line 12397 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("discard");
+ (yyval.str) = mm_strdup("dictionary");
 }
-#line 47429 "preproc.c" /* yacc.c:1646  */
+#line 47467 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2141:
 #line 12401 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("document");
+ (yyval.str) = mm_strdup("disable");
 }
-#line 47437 "preproc.c" /* yacc.c:1646  */
+#line 47475 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2142:
 #line 12405 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("domain");
+ (yyval.str) = mm_strdup("discard");
 }
-#line 47445 "preproc.c" /* yacc.c:1646  */
+#line 47483 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2143:
 #line 12409 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("double");
+ (yyval.str) = mm_strdup("document");
 }
-#line 47453 "preproc.c" /* yacc.c:1646  */
+#line 47491 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2144:
 #line 12413 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("drop");
+ (yyval.str) = mm_strdup("domain");
 }
-#line 47461 "preproc.c" /* yacc.c:1646  */
+#line 47499 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2145:
 #line 12417 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("each");
+ (yyval.str) = mm_strdup("double");
 }
-#line 47469 "preproc.c" /* yacc.c:1646  */
+#line 47507 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2146:
 #line 12421 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("enable");
+ (yyval.str) = mm_strdup("drop");
 }
-#line 47477 "preproc.c" /* yacc.c:1646  */
+#line 47515 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2147:
 #line 12425 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("encoding");
+ (yyval.str) = mm_strdup("each");
 }
-#line 47485 "preproc.c" /* yacc.c:1646  */
+#line 47523 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2148:
 #line 12429 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("encrypted");
+ (yyval.str) = mm_strdup("enable");
 }
-#line 47493 "preproc.c" /* yacc.c:1646  */
+#line 47531 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2149:
 #line 12433 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("enum");
+ (yyval.str) = mm_strdup("encoding");
 }
-#line 47501 "preproc.c" /* yacc.c:1646  */
+#line 47539 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2150:
 #line 12437 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("escape");
+ (yyval.str) = mm_strdup("encrypted");
 }
-#line 47509 "preproc.c" /* yacc.c:1646  */
+#line 47547 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2151:
 #line 12441 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("event");
+ (yyval.str) = mm_strdup("enum");
 }
-#line 47517 "preproc.c" /* yacc.c:1646  */
+#line 47555 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2152:
 #line 12445 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("exclude");
+ (yyval.str) = mm_strdup("escape");
 }
-#line 47525 "preproc.c" /* yacc.c:1646  */
+#line 47563 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2153:
 #line 12449 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("excluding");
+ (yyval.str) = mm_strdup("event");
 }
-#line 47533 "preproc.c" /* yacc.c:1646  */
+#line 47571 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2154:
 #line 12453 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("exclusive");
+ (yyval.str) = mm_strdup("exclude");
 }
-#line 47541 "preproc.c" /* yacc.c:1646  */
+#line 47579 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2155:
 #line 12457 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("execute");
+ (yyval.str) = mm_strdup("excluding");
 }
-#line 47549 "preproc.c" /* yacc.c:1646  */
+#line 47587 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2156:
 #line 12461 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("explain");
+ (yyval.str) = mm_strdup("exclusive");
 }
-#line 47557 "preproc.c" /* yacc.c:1646  */
+#line 47595 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2157:
 #line 12465 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("extension");
+ (yyval.str) = mm_strdup("execute");
 }
-#line 47565 "preproc.c" /* yacc.c:1646  */
+#line 47603 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2158:
 #line 12469 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("external");
+ (yyval.str) = mm_strdup("explain");
 }
-#line 47573 "preproc.c" /* yacc.c:1646  */
+#line 47611 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2159:
 #line 12473 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("family");
+ (yyval.str) = mm_strdup("extension");
 }
-#line 47581 "preproc.c" /* yacc.c:1646  */
+#line 47619 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2160:
 #line 12477 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("filter");
+ (yyval.str) = mm_strdup("external");
 }
-#line 47589 "preproc.c" /* yacc.c:1646  */
+#line 47627 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2161:
 #line 12481 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("first");
+ (yyval.str) = mm_strdup("family");
 }
-#line 47597 "preproc.c" /* yacc.c:1646  */
+#line 47635 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2162:
 #line 12485 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("following");
+ (yyval.str) = mm_strdup("filter");
 }
-#line 47605 "preproc.c" /* yacc.c:1646  */
+#line 47643 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2163:
 #line 12489 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("force");
+ (yyval.str) = mm_strdup("first");
 }
-#line 47613 "preproc.c" /* yacc.c:1646  */
+#line 47651 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2164:
 #line 12493 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("forward");
+ (yyval.str) = mm_strdup("following");
 }
-#line 47621 "preproc.c" /* yacc.c:1646  */
+#line 47659 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2165:
 #line 12497 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("function");
+ (yyval.str) = mm_strdup("force");
 }
-#line 47629 "preproc.c" /* yacc.c:1646  */
+#line 47667 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2166:
 #line 12501 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("functions");
+ (yyval.str) = mm_strdup("forward");
 }
-#line 47637 "preproc.c" /* yacc.c:1646  */
+#line 47675 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2167:
 #line 12505 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("global");
+ (yyval.str) = mm_strdup("function");
 }
-#line 47645 "preproc.c" /* yacc.c:1646  */
+#line 47683 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2168:
 #line 12509 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("granted");
+ (yyval.str) = mm_strdup("functions");
 }
-#line 47653 "preproc.c" /* yacc.c:1646  */
+#line 47691 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2169:
 #line 12513 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("handler");
+ (yyval.str) = mm_strdup("global");
 }
-#line 47661 "preproc.c" /* yacc.c:1646  */
+#line 47699 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2170:
 #line 12517 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("header");
+ (yyval.str) = mm_strdup("granted");
 }
-#line 47669 "preproc.c" /* yacc.c:1646  */
+#line 47707 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2171:
 #line 12521 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("hold");
+ (yyval.str) = mm_strdup("handler");
 }
-#line 47677 "preproc.c" /* yacc.c:1646  */
+#line 47715 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2172:
 #line 12525 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("identity");
+ (yyval.str) = mm_strdup("header");
 }
-#line 47685 "preproc.c" /* yacc.c:1646  */
+#line 47723 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2173:
 #line 12529 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("if");
+ (yyval.str) = mm_strdup("hold");
 }
-#line 47693 "preproc.c" /* yacc.c:1646  */
+#line 47731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2174:
 #line 12533 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("immediate");
+ (yyval.str) = mm_strdup("identity");
 }
-#line 47701 "preproc.c" /* yacc.c:1646  */
+#line 47739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2175:
 #line 12537 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("immutable");
+ (yyval.str) = mm_strdup("if");
 }
-#line 47709 "preproc.c" /* yacc.c:1646  */
+#line 47747 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2176:
 #line 12541 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("implicit");
+ (yyval.str) = mm_strdup("immediate");
 }
-#line 47717 "preproc.c" /* yacc.c:1646  */
+#line 47755 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2177:
 #line 12545 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("import");
+ (yyval.str) = mm_strdup("immutable");
 }
-#line 47725 "preproc.c" /* yacc.c:1646  */
+#line 47763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2178:
 #line 12549 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("including");
+ (yyval.str) = mm_strdup("implicit");
 }
-#line 47733 "preproc.c" /* yacc.c:1646  */
+#line 47771 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2179:
 #line 12553 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("increment");
+ (yyval.str) = mm_strdup("import");
 }
-#line 47741 "preproc.c" /* yacc.c:1646  */
+#line 47779 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2180:
 #line 12557 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("index");
+ (yyval.str) = mm_strdup("including");
 }
-#line 47749 "preproc.c" /* yacc.c:1646  */
+#line 47787 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2181:
 #line 12561 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("indexes");
+ (yyval.str) = mm_strdup("increment");
 }
-#line 47757 "preproc.c" /* yacc.c:1646  */
+#line 47795 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2182:
 #line 12565 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("inherit");
+ (yyval.str) = mm_strdup("index");
 }
-#line 47765 "preproc.c" /* yacc.c:1646  */
+#line 47803 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2183:
 #line 12569 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("inherits");
+ (yyval.str) = mm_strdup("indexes");
 }
-#line 47773 "preproc.c" /* yacc.c:1646  */
+#line 47811 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2184:
 #line 12573 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("inline");
+ (yyval.str) = mm_strdup("inherit");
 }
-#line 47781 "preproc.c" /* yacc.c:1646  */
+#line 47819 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2185:
 #line 12577 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("insensitive");
+ (yyval.str) = mm_strdup("inherits");
 }
-#line 47789 "preproc.c" /* yacc.c:1646  */
+#line 47827 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2186:
 #line 12581 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("insert");
+ (yyval.str) = mm_strdup("inline");
 }
-#line 47797 "preproc.c" /* yacc.c:1646  */
+#line 47835 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2187:
 #line 12585 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("instead");
+ (yyval.str) = mm_strdup("insensitive");
 }
-#line 47805 "preproc.c" /* yacc.c:1646  */
+#line 47843 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2188:
 #line 12589 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("invoker");
+ (yyval.str) = mm_strdup("insert");
 }
-#line 47813 "preproc.c" /* yacc.c:1646  */
+#line 47851 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2189:
 #line 12593 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("isolation");
+ (yyval.str) = mm_strdup("instead");
 }
-#line 47821 "preproc.c" /* yacc.c:1646  */
+#line 47859 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2190:
 #line 12597 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("key");
+ (yyval.str) = mm_strdup("invoker");
 }
-#line 47829 "preproc.c" /* yacc.c:1646  */
+#line 47867 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2191:
 #line 12601 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("label");
+ (yyval.str) = mm_strdup("isolation");
 }
-#line 47837 "preproc.c" /* yacc.c:1646  */
+#line 47875 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2192:
 #line 12605 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("language");
+ (yyval.str) = mm_strdup("key");
 }
-#line 47845 "preproc.c" /* yacc.c:1646  */
+#line 47883 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2193:
 #line 12609 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("large");
+ (yyval.str) = mm_strdup("label");
 }
-#line 47853 "preproc.c" /* yacc.c:1646  */
+#line 47891 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2194:
 #line 12613 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("last");
+ (yyval.str) = mm_strdup("language");
 }
-#line 47861 "preproc.c" /* yacc.c:1646  */
+#line 47899 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2195:
 #line 12617 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("leakproof");
+ (yyval.str) = mm_strdup("large");
 }
-#line 47869 "preproc.c" /* yacc.c:1646  */
+#line 47907 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2196:
 #line 12621 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("level");
+ (yyval.str) = mm_strdup("last");
 }
-#line 47877 "preproc.c" /* yacc.c:1646  */
+#line 47915 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2197:
 #line 12625 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("listen");
+ (yyval.str) = mm_strdup("leakproof");
 }
-#line 47885 "preproc.c" /* yacc.c:1646  */
+#line 47923 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2198:
 #line 12629 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("load");
+ (yyval.str) = mm_strdup("level");
 }
-#line 47893 "preproc.c" /* yacc.c:1646  */
+#line 47931 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2199:
 #line 12633 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("local");
+ (yyval.str) = mm_strdup("listen");
 }
-#line 47901 "preproc.c" /* yacc.c:1646  */
+#line 47939 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2200:
 #line 12637 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("location");
+ (yyval.str) = mm_strdup("load");
 }
-#line 47909 "preproc.c" /* yacc.c:1646  */
+#line 47947 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2201:
 #line 12641 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("lock");
+ (yyval.str) = mm_strdup("local");
 }
-#line 47917 "preproc.c" /* yacc.c:1646  */
+#line 47955 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2202:
 #line 12645 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("locked");
+ (yyval.str) = mm_strdup("location");
 }
-#line 47925 "preproc.c" /* yacc.c:1646  */
+#line 47963 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2203:
 #line 12649 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("logged");
+ (yyval.str) = mm_strdup("lock");
 }
-#line 47933 "preproc.c" /* yacc.c:1646  */
+#line 47971 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2204:
 #line 12653 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("mapping");
+ (yyval.str) = mm_strdup("locked");
 }
-#line 47941 "preproc.c" /* yacc.c:1646  */
+#line 47979 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2205:
 #line 12657 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("match");
+ (yyval.str) = mm_strdup("logged");
 }
-#line 47949 "preproc.c" /* yacc.c:1646  */
+#line 47987 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2206:
 #line 12661 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("materialized");
+ (yyval.str) = mm_strdup("mapping");
 }
-#line 47957 "preproc.c" /* yacc.c:1646  */
+#line 47995 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2207:
 #line 12665 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("maxvalue");
+ (yyval.str) = mm_strdup("match");
 }
-#line 47965 "preproc.c" /* yacc.c:1646  */
+#line 48003 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2208:
 #line 12669 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("minvalue");
+ (yyval.str) = mm_strdup("materialized");
 }
-#line 47973 "preproc.c" /* yacc.c:1646  */
+#line 48011 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2209:
 #line 12673 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("mode");
+ (yyval.str) = mm_strdup("maxvalue");
 }
-#line 47981 "preproc.c" /* yacc.c:1646  */
+#line 48019 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2210:
 #line 12677 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("move");
+ (yyval.str) = mm_strdup("minvalue");
 }
-#line 47989 "preproc.c" /* yacc.c:1646  */
+#line 48027 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2211:
 #line 12681 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("name");
+ (yyval.str) = mm_strdup("mode");
 }
-#line 47997 "preproc.c" /* yacc.c:1646  */
+#line 48035 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2212:
 #line 12685 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("names");
+ (yyval.str) = mm_strdup("move");
 }
-#line 48005 "preproc.c" /* yacc.c:1646  */
+#line 48043 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2213:
 #line 12689 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("next");
+ (yyval.str) = mm_strdup("name");
 }
-#line 48013 "preproc.c" /* yacc.c:1646  */
+#line 48051 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2214:
 #line 12693 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("no");
+ (yyval.str) = mm_strdup("names");
 }
-#line 48021 "preproc.c" /* yacc.c:1646  */
+#line 48059 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2215:
 #line 12697 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("nothing");
+ (yyval.str) = mm_strdup("next");
 }
-#line 48029 "preproc.c" /* yacc.c:1646  */
+#line 48067 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2216:
 #line 12701 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("notify");
+ (yyval.str) = mm_strdup("no");
 }
-#line 48037 "preproc.c" /* yacc.c:1646  */
+#line 48075 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2217:
 #line 12705 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("nowait");
+ (yyval.str) = mm_strdup("nothing");
 }
-#line 48045 "preproc.c" /* yacc.c:1646  */
+#line 48083 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2218:
 #line 12709 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("nulls");
+ (yyval.str) = mm_strdup("notify");
 }
-#line 48053 "preproc.c" /* yacc.c:1646  */
+#line 48091 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2219:
 #line 12713 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("object");
+ (yyval.str) = mm_strdup("nowait");
 }
-#line 48061 "preproc.c" /* yacc.c:1646  */
+#line 48099 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2220:
 #line 12717 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("of");
+ (yyval.str) = mm_strdup("nulls");
 }
-#line 48069 "preproc.c" /* yacc.c:1646  */
+#line 48107 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2221:
 #line 12721 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("off");
+ (yyval.str) = mm_strdup("object");
 }
-#line 48077 "preproc.c" /* yacc.c:1646  */
+#line 48115 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2222:
 #line 12725 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("oids");
+ (yyval.str) = mm_strdup("of");
 }
-#line 48085 "preproc.c" /* yacc.c:1646  */
+#line 48123 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2223:
 #line 12729 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("operator");
+ (yyval.str) = mm_strdup("off");
 }
-#line 48093 "preproc.c" /* yacc.c:1646  */
+#line 48131 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2224:
 #line 12733 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("option");
+ (yyval.str) = mm_strdup("oids");
 }
-#line 48101 "preproc.c" /* yacc.c:1646  */
+#line 48139 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2225:
 #line 12737 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("options");
+ (yyval.str) = mm_strdup("operator");
 }
-#line 48109 "preproc.c" /* yacc.c:1646  */
+#line 48147 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2226:
 #line 12741 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("ordinality");
+ (yyval.str) = mm_strdup("option");
 }
-#line 48117 "preproc.c" /* yacc.c:1646  */
+#line 48155 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2227:
 #line 12745 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("over");
+ (yyval.str) = mm_strdup("options");
 }
-#line 48125 "preproc.c" /* yacc.c:1646  */
+#line 48163 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2228:
 #line 12749 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("owned");
+ (yyval.str) = mm_strdup("ordinality");
 }
-#line 48133 "preproc.c" /* yacc.c:1646  */
+#line 48171 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2229:
 #line 12753 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("owner");
+ (yyval.str) = mm_strdup("over");
 }
-#line 48141 "preproc.c" /* yacc.c:1646  */
+#line 48179 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2230:
 #line 12757 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("parser");
+ (yyval.str) = mm_strdup("owned");
 }
-#line 48149 "preproc.c" /* yacc.c:1646  */
+#line 48187 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2231:
 #line 12761 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("partial");
+ (yyval.str) = mm_strdup("owner");
 }
-#line 48157 "preproc.c" /* yacc.c:1646  */
+#line 48195 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2232:
 #line 12765 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("partition");
+ (yyval.str) = mm_strdup("parser");
 }
-#line 48165 "preproc.c" /* yacc.c:1646  */
+#line 48203 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2233:
 #line 12769 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("passing");
+ (yyval.str) = mm_strdup("partial");
 }
-#line 48173 "preproc.c" /* yacc.c:1646  */
+#line 48211 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2234:
 #line 12773 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("password");
+ (yyval.str) = mm_strdup("partition");
 }
-#line 48181 "preproc.c" /* yacc.c:1646  */
+#line 48219 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2235:
 #line 12777 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("plans");
+ (yyval.str) = mm_strdup("passing");
 }
-#line 48189 "preproc.c" /* yacc.c:1646  */
+#line 48227 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2236:
 #line 12781 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("policy");
+ (yyval.str) = mm_strdup("password");
 }
-#line 48197 "preproc.c" /* yacc.c:1646  */
+#line 48235 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2237:
 #line 12785 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("preceding");
+ (yyval.str) = mm_strdup("plans");
 }
-#line 48205 "preproc.c" /* yacc.c:1646  */
+#line 48243 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2238:
 #line 12789 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("prepare");
+ (yyval.str) = mm_strdup("policy");
 }
-#line 48213 "preproc.c" /* yacc.c:1646  */
+#line 48251 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2239:
 #line 12793 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("prepared");
+ (yyval.str) = mm_strdup("preceding");
 }
-#line 48221 "preproc.c" /* yacc.c:1646  */
+#line 48259 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2240:
 #line 12797 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("preserve");
+ (yyval.str) = mm_strdup("prepare");
 }
-#line 48229 "preproc.c" /* yacc.c:1646  */
+#line 48267 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2241:
 #line 12801 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("prior");
+ (yyval.str) = mm_strdup("prepared");
 }
-#line 48237 "preproc.c" /* yacc.c:1646  */
+#line 48275 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2242:
 #line 12805 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("privileges");
+ (yyval.str) = mm_strdup("preserve");
 }
-#line 48245 "preproc.c" /* yacc.c:1646  */
+#line 48283 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2243:
 #line 12809 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("procedural");
+ (yyval.str) = mm_strdup("prior");
 }
-#line 48253 "preproc.c" /* yacc.c:1646  */
+#line 48291 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2244:
 #line 12813 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("procedure");
+ (yyval.str) = mm_strdup("privileges");
 }
-#line 48261 "preproc.c" /* yacc.c:1646  */
+#line 48299 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2245:
 #line 12817 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("program");
+ (yyval.str) = mm_strdup("procedural");
 }
-#line 48269 "preproc.c" /* yacc.c:1646  */
+#line 48307 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2246:
 #line 12821 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("quote");
+ (yyval.str) = mm_strdup("procedure");
 }
-#line 48277 "preproc.c" /* yacc.c:1646  */
+#line 48315 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2247:
 #line 12825 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("range");
+ (yyval.str) = mm_strdup("program");
 }
-#line 48285 "preproc.c" /* yacc.c:1646  */
+#line 48323 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2248:
 #line 12829 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("read");
+ (yyval.str) = mm_strdup("quote");
 }
-#line 48293 "preproc.c" /* yacc.c:1646  */
+#line 48331 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2249:
 #line 12833 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("reassign");
+ (yyval.str) = mm_strdup("range");
 }
-#line 48301 "preproc.c" /* yacc.c:1646  */
+#line 48339 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2250:
 #line 12837 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("recheck");
+ (yyval.str) = mm_strdup("read");
 }
-#line 48309 "preproc.c" /* yacc.c:1646  */
+#line 48347 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2251:
 #line 12841 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("recursive");
+ (yyval.str) = mm_strdup("reassign");
 }
-#line 48317 "preproc.c" /* yacc.c:1646  */
+#line 48355 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2252:
 #line 12845 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("ref");
+ (yyval.str) = mm_strdup("recheck");
 }
-#line 48325 "preproc.c" /* yacc.c:1646  */
+#line 48363 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2253:
 #line 12849 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("refresh");
+ (yyval.str) = mm_strdup("recursive");
 }
-#line 48333 "preproc.c" /* yacc.c:1646  */
+#line 48371 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2254:
 #line 12853 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("reindex");
+ (yyval.str) = mm_strdup("ref");
 }
-#line 48341 "preproc.c" /* yacc.c:1646  */
+#line 48379 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2255:
 #line 12857 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("relative");
+ (yyval.str) = mm_strdup("refresh");
 }
-#line 48349 "preproc.c" /* yacc.c:1646  */
+#line 48387 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2256:
 #line 12861 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("release");
+ (yyval.str) = mm_strdup("reindex");
 }
-#line 48357 "preproc.c" /* yacc.c:1646  */
+#line 48395 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2257:
 #line 12865 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("rename");
+ (yyval.str) = mm_strdup("relative");
 }
-#line 48365 "preproc.c" /* yacc.c:1646  */
+#line 48403 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2258:
 #line 12869 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("repeatable");
+ (yyval.str) = mm_strdup("release");
 }
-#line 48373 "preproc.c" /* yacc.c:1646  */
+#line 48411 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2259:
 #line 12873 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("replace");
+ (yyval.str) = mm_strdup("rename");
 }
-#line 48381 "preproc.c" /* yacc.c:1646  */
+#line 48419 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2260:
 #line 12877 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("replica");
+ (yyval.str) = mm_strdup("repeatable");
 }
-#line 48389 "preproc.c" /* yacc.c:1646  */
+#line 48427 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2261:
 #line 12881 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("reset");
+ (yyval.str) = mm_strdup("replace");
 }
-#line 48397 "preproc.c" /* yacc.c:1646  */
+#line 48435 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2262:
 #line 12885 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("restart");
+ (yyval.str) = mm_strdup("replica");
 }
-#line 48405 "preproc.c" /* yacc.c:1646  */
+#line 48443 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2263:
 #line 12889 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("restrict");
+ (yyval.str) = mm_strdup("reset");
 }
-#line 48413 "preproc.c" /* yacc.c:1646  */
+#line 48451 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2264:
 #line 12893 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("returns");
+ (yyval.str) = mm_strdup("restart");
 }
-#line 48421 "preproc.c" /* yacc.c:1646  */
+#line 48459 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2265:
 #line 12897 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("revoke");
+ (yyval.str) = mm_strdup("restrict");
 }
-#line 48429 "preproc.c" /* yacc.c:1646  */
+#line 48467 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2266:
 #line 12901 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("role");
+ (yyval.str) = mm_strdup("returns");
 }
-#line 48437 "preproc.c" /* yacc.c:1646  */
+#line 48475 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2267:
 #line 12905 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("rollback");
+ (yyval.str) = mm_strdup("revoke");
 }
-#line 48445 "preproc.c" /* yacc.c:1646  */
+#line 48483 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2268:
 #line 12909 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("rollup");
+ (yyval.str) = mm_strdup("role");
 }
-#line 48453 "preproc.c" /* yacc.c:1646  */
+#line 48491 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2269:
 #line 12913 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("rows");
+ (yyval.str) = mm_strdup("rollback");
 }
-#line 48461 "preproc.c" /* yacc.c:1646  */
+#line 48499 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2270:
 #line 12917 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("rule");
+ (yyval.str) = mm_strdup("rollup");
 }
-#line 48469 "preproc.c" /* yacc.c:1646  */
+#line 48507 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2271:
 #line 12921 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("savepoint");
+ (yyval.str) = mm_strdup("rows");
 }
-#line 48477 "preproc.c" /* yacc.c:1646  */
+#line 48515 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2272:
 #line 12925 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("schema");
+ (yyval.str) = mm_strdup("rule");
 }
-#line 48485 "preproc.c" /* yacc.c:1646  */
+#line 48523 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2273:
 #line 12929 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("scroll");
+ (yyval.str) = mm_strdup("savepoint");
 }
-#line 48493 "preproc.c" /* yacc.c:1646  */
+#line 48531 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2274:
 #line 12933 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("search");
+ (yyval.str) = mm_strdup("schema");
 }
-#line 48501 "preproc.c" /* yacc.c:1646  */
+#line 48539 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2275:
 #line 12937 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("security");
+ (yyval.str) = mm_strdup("scroll");
 }
-#line 48509 "preproc.c" /* yacc.c:1646  */
+#line 48547 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2276:
 #line 12941 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("sequence");
+ (yyval.str) = mm_strdup("search");
 }
-#line 48517 "preproc.c" /* yacc.c:1646  */
+#line 48555 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2277:
 #line 12945 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("sequences");
+ (yyval.str) = mm_strdup("security");
 }
-#line 48525 "preproc.c" /* yacc.c:1646  */
+#line 48563 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2278:
 #line 12949 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("serializable");
+ (yyval.str) = mm_strdup("sequence");
 }
-#line 48533 "preproc.c" /* yacc.c:1646  */
+#line 48571 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2279:
 #line 12953 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("server");
+ (yyval.str) = mm_strdup("sequences");
 }
-#line 48541 "preproc.c" /* yacc.c:1646  */
+#line 48579 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2280:
 #line 12957 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("session");
+ (yyval.str) = mm_strdup("serializable");
 }
-#line 48549 "preproc.c" /* yacc.c:1646  */
+#line 48587 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2281:
 #line 12961 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("set");
+ (yyval.str) = mm_strdup("server");
 }
-#line 48557 "preproc.c" /* yacc.c:1646  */
+#line 48595 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2282:
 #line 12965 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("sets");
+ (yyval.str) = mm_strdup("session");
 }
-#line 48565 "preproc.c" /* yacc.c:1646  */
+#line 48603 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2283:
 #line 12969 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("share");
+ (yyval.str) = mm_strdup("set");
 }
-#line 48573 "preproc.c" /* yacc.c:1646  */
+#line 48611 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2284:
 #line 12973 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("show");
+ (yyval.str) = mm_strdup("sets");
 }
-#line 48581 "preproc.c" /* yacc.c:1646  */
+#line 48619 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2285:
 #line 12977 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("simple");
+ (yyval.str) = mm_strdup("share");
 }
-#line 48589 "preproc.c" /* yacc.c:1646  */
+#line 48627 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2286:
 #line 12981 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("skip");
+ (yyval.str) = mm_strdup("show");
 }
-#line 48597 "preproc.c" /* yacc.c:1646  */
+#line 48635 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2287:
 #line 12985 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("snapshot");
+ (yyval.str) = mm_strdup("simple");
 }
-#line 48605 "preproc.c" /* yacc.c:1646  */
+#line 48643 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2288:
 #line 12989 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("sql");
+ (yyval.str) = mm_strdup("skip");
 }
-#line 48613 "preproc.c" /* yacc.c:1646  */
+#line 48651 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2289:
 #line 12993 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("stable");
+ (yyval.str) = mm_strdup("snapshot");
 }
-#line 48621 "preproc.c" /* yacc.c:1646  */
+#line 48659 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2290:
 #line 12997 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("standalone");
+ (yyval.str) = mm_strdup("sql");
 }
-#line 48629 "preproc.c" /* yacc.c:1646  */
+#line 48667 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2291:
 #line 13001 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("start");
+ (yyval.str) = mm_strdup("stable");
 }
-#line 48637 "preproc.c" /* yacc.c:1646  */
+#line 48675 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2292:
 #line 13005 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("statement");
+ (yyval.str) = mm_strdup("standalone");
 }
-#line 48645 "preproc.c" /* yacc.c:1646  */
+#line 48683 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2293:
 #line 13009 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("statistics");
+ (yyval.str) = mm_strdup("start");
 }
-#line 48653 "preproc.c" /* yacc.c:1646  */
+#line 48691 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2294:
 #line 13013 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("stdin");
+ (yyval.str) = mm_strdup("statement");
 }
-#line 48661 "preproc.c" /* yacc.c:1646  */
+#line 48699 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2295:
 #line 13017 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("stdout");
+ (yyval.str) = mm_strdup("statistics");
 }
-#line 48669 "preproc.c" /* yacc.c:1646  */
+#line 48707 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2296:
 #line 13021 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("storage");
+ (yyval.str) = mm_strdup("stdin");
 }
-#line 48677 "preproc.c" /* yacc.c:1646  */
+#line 48715 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2297:
 #line 13025 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("strict");
+ (yyval.str) = mm_strdup("stdout");
 }
-#line 48685 "preproc.c" /* yacc.c:1646  */
+#line 48723 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2298:
 #line 13029 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("strip");
+ (yyval.str) = mm_strdup("storage");
 }
-#line 48693 "preproc.c" /* yacc.c:1646  */
+#line 48731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2299:
 #line 13033 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("sysid");
+ (yyval.str) = mm_strdup("strict");
 }
-#line 48701 "preproc.c" /* yacc.c:1646  */
+#line 48739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2300:
 #line 13037 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("system");
+ (yyval.str) = mm_strdup("strip");
 }
-#line 48709 "preproc.c" /* yacc.c:1646  */
+#line 48747 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2301:
 #line 13041 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("tables");
+ (yyval.str) = mm_strdup("sysid");
 }
-#line 48717 "preproc.c" /* yacc.c:1646  */
+#line 48755 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2302:
 #line 13045 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("tablespace");
+ (yyval.str) = mm_strdup("system");
 }
-#line 48725 "preproc.c" /* yacc.c:1646  */
+#line 48763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2303:
 #line 13049 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("temp");
+ (yyval.str) = mm_strdup("tables");
 }
-#line 48733 "preproc.c" /* yacc.c:1646  */
+#line 48771 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2304:
 #line 13053 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("template");
+ (yyval.str) = mm_strdup("tablespace");
 }
-#line 48741 "preproc.c" /* yacc.c:1646  */
+#line 48779 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2305:
 #line 13057 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("temporary");
+ (yyval.str) = mm_strdup("temp");
 }
-#line 48749 "preproc.c" /* yacc.c:1646  */
+#line 48787 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2306:
 #line 13061 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("text");
+ (yyval.str) = mm_strdup("template");
 }
-#line 48757 "preproc.c" /* yacc.c:1646  */
+#line 48795 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2307:
 #line 13065 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("transaction");
+ (yyval.str) = mm_strdup("temporary");
 }
-#line 48765 "preproc.c" /* yacc.c:1646  */
+#line 48803 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2308:
 #line 13069 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("transform");
+ (yyval.str) = mm_strdup("text");
 }
-#line 48773 "preproc.c" /* yacc.c:1646  */
+#line 48811 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2309:
 #line 13073 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("trigger");
+ (yyval.str) = mm_strdup("transaction");
 }
-#line 48781 "preproc.c" /* yacc.c:1646  */
+#line 48819 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2310:
 #line 13077 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("truncate");
+ (yyval.str) = mm_strdup("transform");
 }
-#line 48789 "preproc.c" /* yacc.c:1646  */
+#line 48827 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2311:
 #line 13081 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("trusted");
+ (yyval.str) = mm_strdup("trigger");
 }
-#line 48797 "preproc.c" /* yacc.c:1646  */
+#line 48835 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2312:
 #line 13085 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("type");
+ (yyval.str) = mm_strdup("truncate");
 }
-#line 48805 "preproc.c" /* yacc.c:1646  */
+#line 48843 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2313:
 #line 13089 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("types");
+ (yyval.str) = mm_strdup("trusted");
 }
-#line 48813 "preproc.c" /* yacc.c:1646  */
+#line 48851 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2314:
 #line 13093 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unbounded");
+ (yyval.str) = mm_strdup("type");
 }
-#line 48821 "preproc.c" /* yacc.c:1646  */
+#line 48859 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2315:
 #line 13097 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("uncommitted");
+ (yyval.str) = mm_strdup("types");
 }
-#line 48829 "preproc.c" /* yacc.c:1646  */
+#line 48867 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2316:
 #line 13101 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unencrypted");
+ (yyval.str) = mm_strdup("unbounded");
 }
-#line 48837 "preproc.c" /* yacc.c:1646  */
+#line 48875 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2317:
 #line 13105 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unknown");
+ (yyval.str) = mm_strdup("uncommitted");
 }
-#line 48845 "preproc.c" /* yacc.c:1646  */
+#line 48883 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2318:
 #line 13109 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unlisten");
+ (yyval.str) = mm_strdup("unencrypted");
 }
-#line 48853 "preproc.c" /* yacc.c:1646  */
+#line 48891 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2319:
 #line 13113 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unlogged");
+ (yyval.str) = mm_strdup("unknown");
 }
-#line 48861 "preproc.c" /* yacc.c:1646  */
+#line 48899 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2320:
 #line 13117 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("until");
+ (yyval.str) = mm_strdup("unlisten");
 }
-#line 48869 "preproc.c" /* yacc.c:1646  */
+#line 48907 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2321:
 #line 13121 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("update");
+ (yyval.str) = mm_strdup("unlogged");
 }
-#line 48877 "preproc.c" /* yacc.c:1646  */
+#line 48915 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2322:
 #line 13125 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("vacuum");
+ (yyval.str) = mm_strdup("until");
 }
-#line 48885 "preproc.c" /* yacc.c:1646  */
+#line 48923 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2323:
 #line 13129 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("valid");
+ (yyval.str) = mm_strdup("update");
 }
-#line 48893 "preproc.c" /* yacc.c:1646  */
+#line 48931 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2324:
 #line 13133 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("validate");
+ (yyval.str) = mm_strdup("vacuum");
 }
-#line 48901 "preproc.c" /* yacc.c:1646  */
+#line 48939 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2325:
 #line 13137 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("validator");
+ (yyval.str) = mm_strdup("valid");
 }
-#line 48909 "preproc.c" /* yacc.c:1646  */
+#line 48947 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2326:
 #line 13141 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("value");
+ (yyval.str) = mm_strdup("validate");
 }
-#line 48917 "preproc.c" /* yacc.c:1646  */
+#line 48955 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2327:
 #line 13145 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("varying");
+ (yyval.str) = mm_strdup("validator");
 }
-#line 48925 "preproc.c" /* yacc.c:1646  */
+#line 48963 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2328:
 #line 13149 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("version");
+ (yyval.str) = mm_strdup("value");
 }
-#line 48933 "preproc.c" /* yacc.c:1646  */
+#line 48971 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2329:
 #line 13153 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("view");
+ (yyval.str) = mm_strdup("varying");
 }
-#line 48941 "preproc.c" /* yacc.c:1646  */
+#line 48979 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2330:
 #line 13157 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("views");
+ (yyval.str) = mm_strdup("version");
 }
-#line 48949 "preproc.c" /* yacc.c:1646  */
+#line 48987 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2331:
 #line 13161 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("volatile");
+ (yyval.str) = mm_strdup("view");
 }
-#line 48957 "preproc.c" /* yacc.c:1646  */
+#line 48995 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2332:
 #line 13165 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("whitespace");
+ (yyval.str) = mm_strdup("views");
 }
-#line 48965 "preproc.c" /* yacc.c:1646  */
+#line 49003 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2333:
 #line 13169 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("within");
+ (yyval.str) = mm_strdup("volatile");
 }
-#line 48973 "preproc.c" /* yacc.c:1646  */
+#line 49011 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2334:
 #line 13173 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("without");
+ (yyval.str) = mm_strdup("whitespace");
 }
-#line 48981 "preproc.c" /* yacc.c:1646  */
+#line 49019 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2335:
 #line 13177 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("work");
+ (yyval.str) = mm_strdup("within");
 }
-#line 48989 "preproc.c" /* yacc.c:1646  */
+#line 49027 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2336:
 #line 13181 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("wrapper");
+ (yyval.str) = mm_strdup("without");
 }
-#line 48997 "preproc.c" /* yacc.c:1646  */
+#line 49035 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2337:
 #line 13185 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("write");
+ (yyval.str) = mm_strdup("work");
 }
-#line 49005 "preproc.c" /* yacc.c:1646  */
+#line 49043 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2338:
 #line 13189 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xml");
+ (yyval.str) = mm_strdup("wrapper");
 }
-#line 49013 "preproc.c" /* yacc.c:1646  */
+#line 49051 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2339:
 #line 13193 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("yes");
+ (yyval.str) = mm_strdup("write");
 }
-#line 49021 "preproc.c" /* yacc.c:1646  */
+#line 49059 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2340:
 #line 13197 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("zone");
+ (yyval.str) = mm_strdup("xml");
 }
-#line 49029 "preproc.c" /* yacc.c:1646  */
+#line 49067 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2341:
-#line 13205 "preproc.y" /* yacc.c:1646  */
+#line 13201 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("between");
+ (yyval.str) = mm_strdup("yes");
 }
-#line 49037 "preproc.c" /* yacc.c:1646  */
+#line 49075 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2342:
-#line 13209 "preproc.y" /* yacc.c:1646  */
+#line 13205 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("bigint");
+ (yyval.str) = mm_strdup("zone");
 }
-#line 49045 "preproc.c" /* yacc.c:1646  */
+#line 49083 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2343:
 #line 13213 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("bit");
+ (yyval.str) = mm_strdup("between");
 }
-#line 49053 "preproc.c" /* yacc.c:1646  */
+#line 49091 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2344:
 #line 13217 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("boolean");
+ (yyval.str) = mm_strdup("bigint");
 }
-#line 49061 "preproc.c" /* yacc.c:1646  */
+#line 49099 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2345:
 #line 13221 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("character");
+ (yyval.str) = mm_strdup("bit");
 }
-#line 49069 "preproc.c" /* yacc.c:1646  */
+#line 49107 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2346:
 #line 13225 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("coalesce");
+ (yyval.str) = mm_strdup("boolean");
 }
-#line 49077 "preproc.c" /* yacc.c:1646  */
+#line 49115 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2347:
 #line 13229 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("dec");
+ (yyval.str) = mm_strdup("character");
 }
-#line 49085 "preproc.c" /* yacc.c:1646  */
+#line 49123 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2348:
 #line 13233 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("decimal");
+ (yyval.str) = mm_strdup("coalesce");
 }
-#line 49093 "preproc.c" /* yacc.c:1646  */
+#line 49131 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2349:
 #line 13237 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("exists");
+ (yyval.str) = mm_strdup("dec");
 }
-#line 49101 "preproc.c" /* yacc.c:1646  */
+#line 49139 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2350:
 #line 13241 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("extract");
+ (yyval.str) = mm_strdup("decimal");
 }
-#line 49109 "preproc.c" /* yacc.c:1646  */
+#line 49147 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2351:
 #line 13245 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("float");
+ (yyval.str) = mm_strdup("exists");
 }
-#line 49117 "preproc.c" /* yacc.c:1646  */
+#line 49155 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2352:
 #line 13249 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("greatest");
+ (yyval.str) = mm_strdup("extract");
 }
-#line 49125 "preproc.c" /* yacc.c:1646  */
+#line 49163 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2353:
 #line 13253 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("grouping");
+ (yyval.str) = mm_strdup("float");
 }
-#line 49133 "preproc.c" /* yacc.c:1646  */
+#line 49171 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2354:
 #line 13257 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("inout");
+ (yyval.str) = mm_strdup("greatest");
 }
-#line 49141 "preproc.c" /* yacc.c:1646  */
+#line 49179 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2355:
 #line 13261 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("integer");
+ (yyval.str) = mm_strdup("grouping");
 }
-#line 49149 "preproc.c" /* yacc.c:1646  */
+#line 49187 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2356:
 #line 13265 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("interval");
+ (yyval.str) = mm_strdup("inout");
 }
-#line 49157 "preproc.c" /* yacc.c:1646  */
+#line 49195 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2357:
 #line 13269 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("least");
+ (yyval.str) = mm_strdup("integer");
 }
-#line 49165 "preproc.c" /* yacc.c:1646  */
+#line 49203 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2358:
 #line 13273 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("national");
+ (yyval.str) = mm_strdup("interval");
 }
-#line 49173 "preproc.c" /* yacc.c:1646  */
+#line 49211 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2359:
 #line 13277 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("nchar");
+ (yyval.str) = mm_strdup("least");
 }
-#line 49181 "preproc.c" /* yacc.c:1646  */
+#line 49219 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2360:
 #line 13281 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("none");
+ (yyval.str) = mm_strdup("national");
 }
-#line 49189 "preproc.c" /* yacc.c:1646  */
+#line 49227 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2361:
 #line 13285 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("nullif");
+ (yyval.str) = mm_strdup("nchar");
 }
-#line 49197 "preproc.c" /* yacc.c:1646  */
+#line 49235 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2362:
 #line 13289 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("numeric");
+ (yyval.str) = mm_strdup("none");
 }
-#line 49205 "preproc.c" /* yacc.c:1646  */
+#line 49243 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2363:
 #line 13293 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("out");
+ (yyval.str) = mm_strdup("nullif");
 }
-#line 49213 "preproc.c" /* yacc.c:1646  */
+#line 49251 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2364:
 #line 13297 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("overlay");
+ (yyval.str) = mm_strdup("numeric");
 }
-#line 49221 "preproc.c" /* yacc.c:1646  */
+#line 49259 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2365:
 #line 13301 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("position");
+ (yyval.str) = mm_strdup("out");
 }
-#line 49229 "preproc.c" /* yacc.c:1646  */
+#line 49267 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2366:
 #line 13305 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("precision");
+ (yyval.str) = mm_strdup("overlay");
 }
-#line 49237 "preproc.c" /* yacc.c:1646  */
+#line 49275 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2367:
 #line 13309 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("real");
+ (yyval.str) = mm_strdup("position");
 }
-#line 49245 "preproc.c" /* yacc.c:1646  */
+#line 49283 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2368:
 #line 13313 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("row");
+ (yyval.str) = mm_strdup("precision");
 }
-#line 49253 "preproc.c" /* yacc.c:1646  */
+#line 49291 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2369:
 #line 13317 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("setof");
+ (yyval.str) = mm_strdup("real");
 }
-#line 49261 "preproc.c" /* yacc.c:1646  */
+#line 49299 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2370:
 #line 13321 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("smallint");
+ (yyval.str) = mm_strdup("row");
 }
-#line 49269 "preproc.c" /* yacc.c:1646  */
+#line 49307 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2371:
 #line 13325 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("substring");
+ (yyval.str) = mm_strdup("setof");
 }
-#line 49277 "preproc.c" /* yacc.c:1646  */
+#line 49315 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2372:
 #line 13329 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("time");
+ (yyval.str) = mm_strdup("smallint");
 }
-#line 49285 "preproc.c" /* yacc.c:1646  */
+#line 49323 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2373:
 #line 13333 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("timestamp");
+ (yyval.str) = mm_strdup("substring");
 }
-#line 49293 "preproc.c" /* yacc.c:1646  */
+#line 49331 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2374:
 #line 13337 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("treat");
+ (yyval.str) = mm_strdup("time");
 }
-#line 49301 "preproc.c" /* yacc.c:1646  */
+#line 49339 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2375:
 #line 13341 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("trim");
+ (yyval.str) = mm_strdup("timestamp");
 }
-#line 49309 "preproc.c" /* yacc.c:1646  */
+#line 49347 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2376:
 #line 13345 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("varchar");
+ (yyval.str) = mm_strdup("treat");
 }
-#line 49317 "preproc.c" /* yacc.c:1646  */
+#line 49355 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2377:
 #line 13349 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xmlattributes");
+ (yyval.str) = mm_strdup("trim");
 }
-#line 49325 "preproc.c" /* yacc.c:1646  */
+#line 49363 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2378:
 #line 13353 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xmlconcat");
+ (yyval.str) = mm_strdup("varchar");
 }
-#line 49333 "preproc.c" /* yacc.c:1646  */
+#line 49371 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2379:
 #line 13357 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xmlelement");
+ (yyval.str) = mm_strdup("xmlattributes");
 }
-#line 49341 "preproc.c" /* yacc.c:1646  */
+#line 49379 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2380:
 #line 13361 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xmlexists");
+ (yyval.str) = mm_strdup("xmlconcat");
 }
-#line 49349 "preproc.c" /* yacc.c:1646  */
+#line 49387 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2381:
 #line 13365 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xmlforest");
+ (yyval.str) = mm_strdup("xmlelement");
 }
-#line 49357 "preproc.c" /* yacc.c:1646  */
+#line 49395 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2382:
 #line 13369 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xmlparse");
+ (yyval.str) = mm_strdup("xmlexists");
 }
-#line 49365 "preproc.c" /* yacc.c:1646  */
+#line 49403 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2383:
 #line 13373 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xmlpi");
+ (yyval.str) = mm_strdup("xmlforest");
 }
-#line 49373 "preproc.c" /* yacc.c:1646  */
+#line 49411 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2384:
 #line 13377 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xmlroot");
+ (yyval.str) = mm_strdup("xmlparse");
 }
-#line 49381 "preproc.c" /* yacc.c:1646  */
+#line 49419 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2385:
 #line 13381 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("xmlserialize");
+ (yyval.str) = mm_strdup("xmlpi");
 }
-#line 49389 "preproc.c" /* yacc.c:1646  */
+#line 49427 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2386:
-#line 13389 "preproc.y" /* yacc.c:1646  */
+#line 13385 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("authorization");
+ (yyval.str) = mm_strdup("xmlroot");
 }
-#line 49397 "preproc.c" /* yacc.c:1646  */
+#line 49435 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2387:
-#line 13393 "preproc.y" /* yacc.c:1646  */
+#line 13389 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("binary");
+ (yyval.str) = mm_strdup("xmlserialize");
 }
-#line 49405 "preproc.c" /* yacc.c:1646  */
+#line 49443 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2388:
 #line 13397 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("collation");
+ (yyval.str) = mm_strdup("authorization");
 }
-#line 49413 "preproc.c" /* yacc.c:1646  */
+#line 49451 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2389:
 #line 13401 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("concurrently");
+ (yyval.str) = mm_strdup("binary");
 }
-#line 49421 "preproc.c" /* yacc.c:1646  */
+#line 49459 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2390:
 #line 13405 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cross");
+ (yyval.str) = mm_strdup("collation");
 }
-#line 49429 "preproc.c" /* yacc.c:1646  */
+#line 49467 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2391:
 #line 13409 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_schema");
+ (yyval.str) = mm_strdup("concurrently");
 }
-#line 49437 "preproc.c" /* yacc.c:1646  */
+#line 49475 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2392:
 #line 13413 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("freeze");
+ (yyval.str) = mm_strdup("cross");
 }
-#line 49445 "preproc.c" /* yacc.c:1646  */
+#line 49483 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2393:
 #line 13417 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("full");
+ (yyval.str) = mm_strdup("current_schema");
 }
-#line 49453 "preproc.c" /* yacc.c:1646  */
+#line 49491 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2394:
 #line 13421 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("ilike");
+ (yyval.str) = mm_strdup("freeze");
 }
-#line 49461 "preproc.c" /* yacc.c:1646  */
+#line 49499 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2395:
 #line 13425 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("inner");
+ (yyval.str) = mm_strdup("full");
 }
-#line 49469 "preproc.c" /* yacc.c:1646  */
+#line 49507 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2396:
 #line 13429 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("is");
+ (yyval.str) = mm_strdup("ilike");
 }
-#line 49477 "preproc.c" /* yacc.c:1646  */
+#line 49515 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2397:
 #line 13433 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("isnull");
+ (yyval.str) = mm_strdup("inner");
 }
-#line 49485 "preproc.c" /* yacc.c:1646  */
+#line 49523 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2398:
 #line 13437 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("join");
+ (yyval.str) = mm_strdup("is");
 }
-#line 49493 "preproc.c" /* yacc.c:1646  */
+#line 49531 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2399:
 #line 13441 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("left");
+ (yyval.str) = mm_strdup("isnull");
 }
-#line 49501 "preproc.c" /* yacc.c:1646  */
+#line 49539 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2400:
 #line 13445 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("like");
+ (yyval.str) = mm_strdup("join");
 }
-#line 49509 "preproc.c" /* yacc.c:1646  */
+#line 49547 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2401:
 #line 13449 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("natural");
+ (yyval.str) = mm_strdup("left");
 }
-#line 49517 "preproc.c" /* yacc.c:1646  */
+#line 49555 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2402:
 #line 13453 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("notnull");
+ (yyval.str) = mm_strdup("like");
 }
-#line 49525 "preproc.c" /* yacc.c:1646  */
+#line 49563 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2403:
 #line 13457 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("outer");
+ (yyval.str) = mm_strdup("natural");
 }
-#line 49533 "preproc.c" /* yacc.c:1646  */
+#line 49571 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2404:
 #line 13461 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("overlaps");
+ (yyval.str) = mm_strdup("notnull");
 }
-#line 49541 "preproc.c" /* yacc.c:1646  */
+#line 49579 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2405:
 #line 13465 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("right");
+ (yyval.str) = mm_strdup("outer");
 }
-#line 49549 "preproc.c" /* yacc.c:1646  */
+#line 49587 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2406:
 #line 13469 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("similar");
+ (yyval.str) = mm_strdup("overlaps");
 }
-#line 49557 "preproc.c" /* yacc.c:1646  */
+#line 49595 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2407:
 #line 13473 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("tablesample");
+ (yyval.str) = mm_strdup("right");
 }
-#line 49565 "preproc.c" /* yacc.c:1646  */
+#line 49603 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2408:
 #line 13477 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("verbose");
+ (yyval.str) = mm_strdup("similar");
 }
-#line 49573 "preproc.c" /* yacc.c:1646  */
+#line 49611 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2409:
-#line 13485 "preproc.y" /* yacc.c:1646  */
+#line 13481 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("all");
+ (yyval.str) = mm_strdup("tablesample");
 }
-#line 49581 "preproc.c" /* yacc.c:1646  */
+#line 49619 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2410:
-#line 13489 "preproc.y" /* yacc.c:1646  */
+#line 13485 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("analyse");
+ (yyval.str) = mm_strdup("verbose");
 }
-#line 49589 "preproc.c" /* yacc.c:1646  */
+#line 49627 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2411:
 #line 13493 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("analyze");
+ (yyval.str) = mm_strdup("all");
 }
-#line 49597 "preproc.c" /* yacc.c:1646  */
+#line 49635 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2412:
 #line 13497 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("and");
+ (yyval.str) = mm_strdup("analyse");
 }
-#line 49605 "preproc.c" /* yacc.c:1646  */
+#line 49643 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2413:
 #line 13501 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("any");
+ (yyval.str) = mm_strdup("analyze");
 }
-#line 49613 "preproc.c" /* yacc.c:1646  */
+#line 49651 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2414:
 #line 13505 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("array");
+ (yyval.str) = mm_strdup("and");
 }
-#line 49621 "preproc.c" /* yacc.c:1646  */
+#line 49659 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2415:
 #line 13509 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("as");
+ (yyval.str) = mm_strdup("any");
 }
-#line 49629 "preproc.c" /* yacc.c:1646  */
+#line 49667 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2416:
 #line 13513 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("asc");
+ (yyval.str) = mm_strdup("array");
 }
-#line 49637 "preproc.c" /* yacc.c:1646  */
+#line 49675 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2417:
 #line 13517 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("asymmetric");
+ (yyval.str) = mm_strdup("as");
 }
-#line 49645 "preproc.c" /* yacc.c:1646  */
+#line 49683 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2418:
 #line 13521 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("both");
+ (yyval.str) = mm_strdup("asc");
 }
-#line 49653 "preproc.c" /* yacc.c:1646  */
+#line 49691 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2419:
 #line 13525 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("case");
+ (yyval.str) = mm_strdup("asymmetric");
 }
-#line 49661 "preproc.c" /* yacc.c:1646  */
+#line 49699 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2420:
 #line 13529 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("cast");
+ (yyval.str) = mm_strdup("both");
 }
-#line 49669 "preproc.c" /* yacc.c:1646  */
+#line 49707 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2421:
 #line 13533 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("check");
+ (yyval.str) = mm_strdup("case");
 }
-#line 49677 "preproc.c" /* yacc.c:1646  */
+#line 49715 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2422:
 #line 13537 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("collate");
+ (yyval.str) = mm_strdup("cast");
 }
-#line 49685 "preproc.c" /* yacc.c:1646  */
+#line 49723 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2423:
 #line 13541 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("column");
+ (yyval.str) = mm_strdup("check");
 }
-#line 49693 "preproc.c" /* yacc.c:1646  */
+#line 49731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2424:
 #line 13545 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("constraint");
+ (yyval.str) = mm_strdup("collate");
 }
-#line 49701 "preproc.c" /* yacc.c:1646  */
+#line 49739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2425:
 #line 13549 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("create");
+ (yyval.str) = mm_strdup("column");
 }
-#line 49709 "preproc.c" /* yacc.c:1646  */
+#line 49747 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2426:
 #line 13553 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_catalog");
+ (yyval.str) = mm_strdup("constraint");
 }
-#line 49717 "preproc.c" /* yacc.c:1646  */
+#line 49755 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2427:
 #line 13557 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_date");
+ (yyval.str) = mm_strdup("create");
 }
-#line 49725 "preproc.c" /* yacc.c:1646  */
+#line 49763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2428:
 #line 13561 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_role");
+ (yyval.str) = mm_strdup("current_catalog");
 }
-#line 49733 "preproc.c" /* yacc.c:1646  */
+#line 49771 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2429:
 #line 13565 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_time");
+ (yyval.str) = mm_strdup("current_date");
 }
-#line 49741 "preproc.c" /* yacc.c:1646  */
+#line 49779 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2430:
 #line 13569 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_timestamp");
+ (yyval.str) = mm_strdup("current_role");
 }
-#line 49749 "preproc.c" /* yacc.c:1646  */
+#line 49787 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2431:
 #line 13573 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("current_user");
+ (yyval.str) = mm_strdup("current_time");
 }
-#line 49757 "preproc.c" /* yacc.c:1646  */
+#line 49795 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2432:
 #line 13577 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("default");
+ (yyval.str) = mm_strdup("current_timestamp");
 }
-#line 49765 "preproc.c" /* yacc.c:1646  */
+#line 49803 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2433:
 #line 13581 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("deferrable");
+ (yyval.str) = mm_strdup("current_user");
 }
-#line 49773 "preproc.c" /* yacc.c:1646  */
+#line 49811 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2434:
 #line 13585 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("desc");
+ (yyval.str) = mm_strdup("default");
 }
-#line 49781 "preproc.c" /* yacc.c:1646  */
+#line 49819 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2435:
 #line 13589 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("distinct");
+ (yyval.str) = mm_strdup("deferrable");
 }
-#line 49789 "preproc.c" /* yacc.c:1646  */
+#line 49827 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2436:
 #line 13593 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("do");
+ (yyval.str) = mm_strdup("desc");
 }
-#line 49797 "preproc.c" /* yacc.c:1646  */
+#line 49835 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2437:
 #line 13597 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("else");
+ (yyval.str) = mm_strdup("distinct");
 }
-#line 49805 "preproc.c" /* yacc.c:1646  */
+#line 49843 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2438:
 #line 13601 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("end");
+ (yyval.str) = mm_strdup("do");
 }
-#line 49813 "preproc.c" /* yacc.c:1646  */
+#line 49851 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2439:
 #line 13605 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("except");
+ (yyval.str) = mm_strdup("else");
 }
-#line 49821 "preproc.c" /* yacc.c:1646  */
+#line 49859 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2440:
 #line 13609 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("false");
+ (yyval.str) = mm_strdup("end");
 }
-#line 49829 "preproc.c" /* yacc.c:1646  */
+#line 49867 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2441:
 #line 13613 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("fetch");
+ (yyval.str) = mm_strdup("except");
 }
-#line 49837 "preproc.c" /* yacc.c:1646  */
+#line 49875 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2442:
 #line 13617 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("for");
+ (yyval.str) = mm_strdup("false");
 }
-#line 49845 "preproc.c" /* yacc.c:1646  */
+#line 49883 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2443:
 #line 13621 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("foreign");
+ (yyval.str) = mm_strdup("fetch");
 }
-#line 49853 "preproc.c" /* yacc.c:1646  */
+#line 49891 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2444:
 #line 13625 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("from");
+ (yyval.str) = mm_strdup("for");
 }
-#line 49861 "preproc.c" /* yacc.c:1646  */
+#line 49899 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2445:
 #line 13629 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("grant");
+ (yyval.str) = mm_strdup("foreign");
 }
-#line 49869 "preproc.c" /* yacc.c:1646  */
+#line 49907 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2446:
 #line 13633 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("group");
+ (yyval.str) = mm_strdup("from");
 }
-#line 49877 "preproc.c" /* yacc.c:1646  */
+#line 49915 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2447:
 #line 13637 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("having");
+ (yyval.str) = mm_strdup("grant");
 }
-#line 49885 "preproc.c" /* yacc.c:1646  */
+#line 49923 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2448:
 #line 13641 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("in");
+ (yyval.str) = mm_strdup("group");
 }
-#line 49893 "preproc.c" /* yacc.c:1646  */
+#line 49931 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2449:
 #line 13645 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("initially");
+ (yyval.str) = mm_strdup("having");
 }
-#line 49901 "preproc.c" /* yacc.c:1646  */
+#line 49939 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2450:
 #line 13649 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("intersect");
+ (yyval.str) = mm_strdup("in");
 }
-#line 49909 "preproc.c" /* yacc.c:1646  */
+#line 49947 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2451:
 #line 13653 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("into");
+ (yyval.str) = mm_strdup("initially");
 }
-#line 49917 "preproc.c" /* yacc.c:1646  */
+#line 49955 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2452:
 #line 13657 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("lateral");
+ (yyval.str) = mm_strdup("intersect");
 }
-#line 49925 "preproc.c" /* yacc.c:1646  */
+#line 49963 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2453:
 #line 13661 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("leading");
+ (yyval.str) = mm_strdup("into");
 }
-#line 49933 "preproc.c" /* yacc.c:1646  */
+#line 49971 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2454:
 #line 13665 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("limit");
+ (yyval.str) = mm_strdup("lateral");
 }
-#line 49941 "preproc.c" /* yacc.c:1646  */
+#line 49979 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2455:
 #line 13669 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("localtime");
+ (yyval.str) = mm_strdup("leading");
 }
-#line 49949 "preproc.c" /* yacc.c:1646  */
+#line 49987 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2456:
 #line 13673 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("localtimestamp");
+ (yyval.str) = mm_strdup("limit");
 }
-#line 49957 "preproc.c" /* yacc.c:1646  */
+#line 49995 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2457:
 #line 13677 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("not");
+ (yyval.str) = mm_strdup("localtime");
 }
-#line 49965 "preproc.c" /* yacc.c:1646  */
+#line 50003 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2458:
 #line 13681 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("null");
+ (yyval.str) = mm_strdup("localtimestamp");
 }
-#line 49973 "preproc.c" /* yacc.c:1646  */
+#line 50011 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2459:
 #line 13685 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("offset");
+ (yyval.str) = mm_strdup("not");
 }
-#line 49981 "preproc.c" /* yacc.c:1646  */
+#line 50019 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2460:
 #line 13689 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("on");
+ (yyval.str) = mm_strdup("null");
 }
-#line 49989 "preproc.c" /* yacc.c:1646  */
+#line 50027 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2461:
 #line 13693 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("only");
+ (yyval.str) = mm_strdup("offset");
 }
-#line 49997 "preproc.c" /* yacc.c:1646  */
+#line 50035 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2462:
 #line 13697 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("or");
+ (yyval.str) = mm_strdup("on");
 }
-#line 50005 "preproc.c" /* yacc.c:1646  */
+#line 50043 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2463:
 #line 13701 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("order");
+ (yyval.str) = mm_strdup("only");
 }
-#line 50013 "preproc.c" /* yacc.c:1646  */
+#line 50051 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2464:
 #line 13705 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("placing");
+ (yyval.str) = mm_strdup("or");
 }
-#line 50021 "preproc.c" /* yacc.c:1646  */
+#line 50059 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2465:
 #line 13709 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("primary");
+ (yyval.str) = mm_strdup("order");
 }
-#line 50029 "preproc.c" /* yacc.c:1646  */
+#line 50067 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2466:
 #line 13713 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("references");
+ (yyval.str) = mm_strdup("placing");
 }
-#line 50037 "preproc.c" /* yacc.c:1646  */
+#line 50075 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2467:
 #line 13717 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("returning");
+ (yyval.str) = mm_strdup("primary");
 }
-#line 50045 "preproc.c" /* yacc.c:1646  */
+#line 50083 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2468:
 #line 13721 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("select");
+ (yyval.str) = mm_strdup("references");
 }
-#line 50053 "preproc.c" /* yacc.c:1646  */
+#line 50091 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2469:
 #line 13725 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("session_user");
+ (yyval.str) = mm_strdup("returning");
 }
-#line 50061 "preproc.c" /* yacc.c:1646  */
+#line 50099 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2470:
 #line 13729 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("some");
+ (yyval.str) = mm_strdup("select");
 }
-#line 50069 "preproc.c" /* yacc.c:1646  */
+#line 50107 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2471:
 #line 13733 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("symmetric");
+ (yyval.str) = mm_strdup("session_user");
 }
-#line 50077 "preproc.c" /* yacc.c:1646  */
+#line 50115 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2472:
 #line 13737 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("table");
+ (yyval.str) = mm_strdup("some");
 }
-#line 50085 "preproc.c" /* yacc.c:1646  */
+#line 50123 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2473:
 #line 13741 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("then");
+ (yyval.str) = mm_strdup("symmetric");
 }
-#line 50093 "preproc.c" /* yacc.c:1646  */
+#line 50131 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2474:
 #line 13745 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("trailing");
+ (yyval.str) = mm_strdup("table");
 }
-#line 50101 "preproc.c" /* yacc.c:1646  */
+#line 50139 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2475:
 #line 13749 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("true");
+ (yyval.str) = mm_strdup("then");
 }
-#line 50109 "preproc.c" /* yacc.c:1646  */
+#line 50147 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2476:
 #line 13753 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("unique");
+ (yyval.str) = mm_strdup("trailing");
 }
-#line 50117 "preproc.c" /* yacc.c:1646  */
+#line 50155 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2477:
 #line 13757 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("user");
+ (yyval.str) = mm_strdup("true");
 }
-#line 50125 "preproc.c" /* yacc.c:1646  */
+#line 50163 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2478:
 #line 13761 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("using");
+ (yyval.str) = mm_strdup("unique");
 }
-#line 50133 "preproc.c" /* yacc.c:1646  */
+#line 50171 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2479:
 #line 13765 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("variadic");
+ (yyval.str) = mm_strdup("user");
 }
-#line 50141 "preproc.c" /* yacc.c:1646  */
+#line 50179 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2480:
 #line 13769 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("when");
+ (yyval.str) = mm_strdup("using");
 }
-#line 50149 "preproc.c" /* yacc.c:1646  */
+#line 50187 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2481:
 #line 13773 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("where");
+ (yyval.str) = mm_strdup("variadic");
 }
-#line 50157 "preproc.c" /* yacc.c:1646  */
+#line 50195 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2482:
 #line 13777 "preproc.y" /* yacc.c:1646  */
     { 
- (yyval.str) = mm_strdup("window");
+ (yyval.str) = mm_strdup("when");
 }
-#line 50165 "preproc.c" /* yacc.c:1646  */
+#line 50203 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2483:
 #line 13781 "preproc.y" /* yacc.c:1646  */
     { 
+ (yyval.str) = mm_strdup("where");
+}
+#line 50211 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 2484:
+#line 13785 "preproc.y" /* yacc.c:1646  */
+    { 
+ (yyval.str) = mm_strdup("window");
+}
+#line 50219 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 2485:
+#line 13789 "preproc.y" /* yacc.c:1646  */
+    { 
  (yyval.str) = mm_strdup("with");
 }
-#line 50173 "preproc.c" /* yacc.c:1646  */
+#line 50227 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2486:
-#line 13794 "preproc.y" /* yacc.c:1646  */
+  case 2488:
+#line 13802 "preproc.y" /* yacc.c:1646  */
     { connection = NULL; }
-#line 50179 "preproc.c" /* yacc.c:1646  */
+#line 50233 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2488:
-#line 13797 "preproc.y" /* yacc.c:1646  */
+  case 2490:
+#line 13805 "preproc.y" /* yacc.c:1646  */
     {
-					fprintf(yyout, "%s", (yyvsp[0].str));
+					fprintf(base_yyout, "%s", (yyvsp[0].str));
 					free((yyvsp[0].str));
 					output_line_number();
 				}
-#line 50189 "preproc.c" /* yacc.c:1646  */
+#line 50243 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2490:
-#line 13803 "preproc.y" /* yacc.c:1646  */
-    { fprintf(yyout, "%s", (yyvsp[0].str)); free((yyvsp[0].str)); }
-#line 50195 "preproc.c" /* yacc.c:1646  */
+  case 2492:
+#line 13811 "preproc.y" /* yacc.c:1646  */
+    { fprintf(base_yyout, "%s", (yyvsp[0].str)); free((yyvsp[0].str)); }
+#line 50249 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2491:
-#line 13804 "preproc.y" /* yacc.c:1646  */
-    { fprintf(yyout, "%s", (yyvsp[0].str)); free((yyvsp[0].str)); }
-#line 50201 "preproc.c" /* yacc.c:1646  */
+  case 2493:
+#line 13812 "preproc.y" /* yacc.c:1646  */
+    { fprintf(base_yyout, "%s", (yyvsp[0].str)); free((yyvsp[0].str)); }
+#line 50255 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2492:
-#line 13805 "preproc.y" /* yacc.c:1646  */
-    { braces_open++; fputs("{", yyout); }
-#line 50207 "preproc.c" /* yacc.c:1646  */
+  case 2494:
+#line 13813 "preproc.y" /* yacc.c:1646  */
+    { braces_open++; fputs("{", base_yyout); }
+#line 50261 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2493:
-#line 13807 "preproc.y" /* yacc.c:1646  */
+  case 2495:
+#line 13815 "preproc.y" /* yacc.c:1646  */
     {
 			remove_typedefs(braces_open);
 			remove_variables(braces_open--);
@@ -50216,30 +50270,30 @@
 				free(current_function);
 				current_function = NULL;
 			}
-			fputs("}", yyout);
+			fputs("}", base_yyout);
 		}
-#line 50222 "preproc.c" /* yacc.c:1646  */
+#line 50276 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2494:
-#line 13819 "preproc.y" /* yacc.c:1646  */
+  case 2496:
+#line 13827 "preproc.y" /* yacc.c:1646  */
     {FoundInto = 0;}
-#line 50228 "preproc.c" /* yacc.c:1646  */
+#line 50282 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2495:
-#line 13820 "preproc.y" /* yacc.c:1646  */
+  case 2497:
+#line 13828 "preproc.y" /* yacc.c:1646  */
     {
 			if (FoundInto == 1)
 				mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE AS cannot specify INTO");
 
 			(yyval.str) = cat_str(6, mm_strdup("create"), (yyvsp[-6].str), mm_strdup("table"), (yyvsp[-4].str), mm_strdup("as"), (yyvsp[-1].str));
 		}
-#line 50239 "preproc.c" /* yacc.c:1646  */
+#line 50293 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2496:
-#line 13829 "preproc.y" /* yacc.c:1646  */
+  case 2498:
+#line 13837 "preproc.y" /* yacc.c:1646  */
     {
 			connection = (yyvsp[0].str);
 			/*
@@ -50249,35 +50303,35 @@
 			if (argsinsert != NULL)
 				argsinsert = NULL;
 		}
-#line 50253 "preproc.c" /* yacc.c:1646  */
+#line 50307 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2497:
-#line 13844 "preproc.y" /* yacc.c:1646  */
+  case 2499:
+#line 13852 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(5, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str), mm_strdup(","), (yyvsp[-1].str)); }
-#line 50259 "preproc.c" /* yacc.c:1646  */
+#line 50313 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2498:
-#line 13846 "preproc.y" /* yacc.c:1646  */
+  case 2500:
+#line 13854 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("NULL, NULL, NULL, \"DEFAULT\""); }
-#line 50265 "preproc.c" /* yacc.c:1646  */
+#line 50319 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2499:
-#line 13849 "preproc.y" /* yacc.c:1646  */
+  case 2501:
+#line 13857 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(3, mm_strdup("NULL,"), (yyvsp[0].str), mm_strdup(", NULL")); }
-#line 50271 "preproc.c" /* yacc.c:1646  */
+#line 50325 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2500:
-#line 13851 "preproc.y" /* yacc.c:1646  */
+  case 2502:
+#line 13859 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat2_str((yyvsp[0].str), mm_strdup(", NULL, NULL, NULL")); }
-#line 50277 "preproc.c" /* yacc.c:1646  */
+#line 50331 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2501:
-#line 13855 "preproc.y" /* yacc.c:1646  */
+  case 2503:
+#line 13863 "preproc.y" /* yacc.c:1646  */
     {
 			/* old style: dbname[@server][:port] */
 			if (strlen((yyvsp[-1].str)) > 0 && *((yyvsp[-1].str)) != '@')
@@ -50289,11 +50343,11 @@
 			else
 				(yyval.str) = make3_str(mm_strdup("\""), make3_str((yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)), mm_strdup("\""));
 		}
-#line 50293 "preproc.c" /* yacc.c:1646  */
+#line 50347 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2502:
-#line 13867 "preproc.y" /* yacc.c:1646  */
+  case 2504:
+#line 13875 "preproc.y" /* yacc.c:1646  */
     {
 			/* new style: <tcp|unix>:postgresql://server[:port][/dbname] */
 			if (strncmp((yyvsp[-6].str), "unix:postgresql", strlen("unix:postgresql")) != 0 && strncmp((yyvsp[-6].str), "tcp:postgresql", strlen("tcp:postgresql")) != 0)
@@ -50309,19 +50363,19 @@
 
 			(yyval.str) = make3_str(make3_str(mm_strdup("\""), (yyvsp[-6].str), mm_strdup(":")), (yyvsp[-4].str), make3_str(make3_str((yyvsp[-3].str), mm_strdup("/"), (yyvsp[-1].str)), (yyvsp[0].str), mm_strdup("\"")));
 		}
-#line 50313 "preproc.c" /* yacc.c:1646  */
+#line 50367 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2503:
-#line 13883 "preproc.y" /* yacc.c:1646  */
+  case 2505:
+#line 13891 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 50321 "preproc.c" /* yacc.c:1646  */
+#line 50375 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2504:
-#line 13887 "preproc.y" /* yacc.c:1646  */
+  case 2506:
+#line 13895 "preproc.y" /* yacc.c:1646  */
     {
 			/* We can only process double quoted strings not single quotes ones,
 			 * so we change the quotes.
@@ -50330,23 +50384,23 @@
 			(yyvsp[0].str)[strlen((yyvsp[0].str))-1] = '\"';
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 50334 "preproc.c" /* yacc.c:1646  */
+#line 50388 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2505:
-#line 13897 "preproc.y" /* yacc.c:1646  */
+  case 2507:
+#line 13905 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50340 "preproc.c" /* yacc.c:1646  */
+#line 50394 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2506:
-#line 13898 "preproc.y" /* yacc.c:1646  */
+  case 2508:
+#line 13906 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 50346 "preproc.c" /* yacc.c:1646  */
+#line 50400 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2507:
-#line 13902 "preproc.y" /* yacc.c:1646  */
+  case 2509:
+#line 13910 "preproc.y" /* yacc.c:1646  */
     {
 			if (strcmp((yyvsp[0].str), "postgresql") != 0 && strcmp((yyvsp[0].str), "postgres") != 0)
 				mmerror(PARSE_ERROR, ET_ERROR, "expected \"postgresql\", found \"%s\"", (yyvsp[0].str));
@@ -50356,134 +50410,134 @@
 
 			(yyval.str) = make3_str((yyvsp[-1].str), mm_strdup(":"), (yyvsp[0].str));
 		}
-#line 50360 "preproc.c" /* yacc.c:1646  */
+#line 50414 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2508:
-#line 13914 "preproc.y" /* yacc.c:1646  */
+  case 2510:
+#line 13922 "preproc.y" /* yacc.c:1646  */
     {
 			if (strcmp((yyvsp[-1].str), "@") != 0 && strcmp((yyvsp[-1].str), "//") != 0)
 				mmerror(PARSE_ERROR, ET_ERROR, "expected \"@\" or \"://\", found \"%s\"", (yyvsp[-1].str));
 
 			(yyval.str) = make2_str((yyvsp[-1].str), (yyvsp[0].str));
 		}
-#line 50371 "preproc.c" /* yacc.c:1646  */
+#line 50425 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2509:
-#line 13922 "preproc.y" /* yacc.c:1646  */
+  case 2511:
+#line 13930 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50377 "preproc.c" /* yacc.c:1646  */
+#line 50431 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2510:
-#line 13923 "preproc.y" /* yacc.c:1646  */
+  case 2512:
+#line 13931 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 50383 "preproc.c" /* yacc.c:1646  */
+#line 50437 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2511:
-#line 13926 "preproc.y" /* yacc.c:1646  */
+  case 2513:
+#line 13934 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50389 "preproc.c" /* yacc.c:1646  */
+#line 50443 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2512:
-#line 13927 "preproc.y" /* yacc.c:1646  */
+  case 2514:
+#line 13935 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make3_str((yyvsp[-2].str), mm_strdup("."), (yyvsp[0].str)); }
-#line 50395 "preproc.c" /* yacc.c:1646  */
+#line 50449 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2513:
-#line 13928 "preproc.y" /* yacc.c:1646  */
+  case 2515:
+#line 13936 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make_name(); }
-#line 50401 "preproc.c" /* yacc.c:1646  */
+#line 50455 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2514:
-#line 13931 "preproc.y" /* yacc.c:1646  */
+  case 2516:
+#line 13939 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make2_str(mm_strdup(":"), (yyvsp[0].str)); }
-#line 50407 "preproc.c" /* yacc.c:1646  */
+#line 50461 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2515:
-#line 13932 "preproc.y" /* yacc.c:1646  */
+  case 2517:
+#line 13940 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 50413 "preproc.c" /* yacc.c:1646  */
+#line 50467 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2516:
-#line 13935 "preproc.y" /* yacc.c:1646  */
+  case 2518:
+#line 13943 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50419 "preproc.c" /* yacc.c:1646  */
+#line 50473 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2517:
-#line 13936 "preproc.y" /* yacc.c:1646  */
+  case 2519:
+#line 13944 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("NULL"); }
-#line 50425 "preproc.c" /* yacc.c:1646  */
+#line 50479 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2518:
-#line 13939 "preproc.y" /* yacc.c:1646  */
+  case 2520:
+#line 13947 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50431 "preproc.c" /* yacc.c:1646  */
+#line 50485 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2519:
-#line 13940 "preproc.y" /* yacc.c:1646  */
+  case 2521:
+#line 13948 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("NULL, NULL"); }
-#line 50437 "preproc.c" /* yacc.c:1646  */
+#line 50491 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2520:
-#line 13944 "preproc.y" /* yacc.c:1646  */
+  case 2522:
+#line 13952 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat2_str((yyvsp[0].str), mm_strdup(", NULL")); }
-#line 50443 "preproc.c" /* yacc.c:1646  */
+#line 50497 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2521:
-#line 13946 "preproc.y" /* yacc.c:1646  */
+  case 2523:
+#line 13954 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str)); }
-#line 50449 "preproc.c" /* yacc.c:1646  */
+#line 50503 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2522:
-#line 13948 "preproc.y" /* yacc.c:1646  */
+  case 2524:
+#line 13956 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(3, (yyvsp[-3].str), mm_strdup(","), (yyvsp[0].str)); }
-#line 50455 "preproc.c" /* yacc.c:1646  */
+#line 50509 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2523:
-#line 13950 "preproc.y" /* yacc.c:1646  */
+  case 2525:
+#line 13958 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str)); }
-#line 50461 "preproc.c" /* yacc.c:1646  */
+#line 50515 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2524:
-#line 13954 "preproc.y" /* yacc.c:1646  */
+  case 2526:
+#line 13962 "preproc.y" /* yacc.c:1646  */
     {
 			if ((yyvsp[0].str)[0] == '\"')
 				(yyval.str) = (yyvsp[0].str);
 			else
 				(yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\""));
 		}
-#line 50472 "preproc.c" /* yacc.c:1646  */
+#line 50526 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2525:
-#line 13961 "preproc.y" /* yacc.c:1646  */
+  case 2527:
+#line 13969 "preproc.y" /* yacc.c:1646  */
     {
 			if ((yyvsp[0].str)[0] == '\"')
 				(yyval.str) = (yyvsp[0].str);
 			else
 				(yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\""));
 		}
-#line 50483 "preproc.c" /* yacc.c:1646  */
+#line 50537 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2526:
-#line 13968 "preproc.y" /* yacc.c:1646  */
+  case 2528:
+#line 13976 "preproc.y" /* yacc.c:1646  */
     {
 			enum ECPGttype type = argsinsert->variable->type->type;
 
@@ -50497,11 +50551,11 @@
 			else
 				(yyval.str) = mm_strdup(argsinsert->variable->name);
 		}
-#line 50501 "preproc.c" /* yacc.c:1646  */
+#line 50555 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2527:
-#line 13984 "preproc.y" /* yacc.c:1646  */
+  case 2529:
+#line 13992 "preproc.y" /* yacc.c:1646  */
     {
 			/* check if we have a string variable */
 			struct variable *p = find_variable((yyvsp[0].str));
@@ -50533,11 +50587,11 @@
 				}
 			}
 		}
-#line 50537 "preproc.c" /* yacc.c:1646  */
+#line 50591 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2528:
-#line 14018 "preproc.y" /* yacc.c:1646  */
+  case 2530:
+#line 14026 "preproc.y" /* yacc.c:1646  */
     {
 			if (strlen((yyvsp[-1].str)) == 0)
 				mmerror(PARSE_ERROR, ET_ERROR, "incomplete statement");
@@ -50547,25 +50601,25 @@
 
 			(yyval.str) = make2_str(mm_strdup("?"), (yyvsp[0].str));
 		}
-#line 50551 "preproc.c" /* yacc.c:1646  */
+#line 50605 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2529:
-#line 14027 "preproc.y" /* yacc.c:1646  */
+  case 2531:
+#line 14035 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 50557 "preproc.c" /* yacc.c:1646  */
+#line 50611 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2530:
-#line 14031 "preproc.y" /* yacc.c:1646  */
+  case 2532:
+#line 14039 "preproc.y" /* yacc.c:1646  */
     {
 				(yyval.str) = make2_str((yyvsp[-1].str), (yyvsp[0].str));
 			}
-#line 50565 "preproc.c" /* yacc.c:1646  */
+#line 50619 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2531:
-#line 14035 "preproc.y" /* yacc.c:1646  */
+  case 2533:
+#line 14043 "preproc.y" /* yacc.c:1646  */
     {
 				if (strlen((yyvsp[-1].str)) == 0)
 					mmerror(PARSE_ERROR, ET_ERROR, "incomplete statement");
@@ -50575,35 +50629,35 @@
 
 				(yyval.str) = cat_str(3, make2_str((yyvsp[-3].str), (yyvsp[-2].str)), (yyvsp[-1].str), (yyvsp[0].str));
 			}
-#line 50579 "preproc.c" /* yacc.c:1646  */
+#line 50633 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2532:
-#line 14047 "preproc.y" /* yacc.c:1646  */
+  case 2534:
+#line 14055 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 50585 "preproc.c" /* yacc.c:1646  */
+#line 50639 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2533:
-#line 14049 "preproc.y" /* yacc.c:1646  */
+  case 2535:
+#line 14057 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make2_str(mm_strdup("="), (yyvsp[0].str)); }
-#line 50591 "preproc.c" /* yacc.c:1646  */
+#line 50645 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2534:
-#line 14051 "preproc.y" /* yacc.c:1646  */
+  case 2536:
+#line 14059 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make2_str(mm_strdup("="), (yyvsp[0].str)); }
-#line 50597 "preproc.c" /* yacc.c:1646  */
+#line 50651 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2535:
-#line 14053 "preproc.y" /* yacc.c:1646  */
+  case 2537:
+#line 14061 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make2_str(mm_strdup("="), (yyvsp[0].str)); }
-#line 50603 "preproc.c" /* yacc.c:1646  */
+#line 50657 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2536:
-#line 14057 "preproc.y" /* yacc.c:1646  */
+  case 2538:
+#line 14065 "preproc.y" /* yacc.c:1646  */
     {
 			if ((yyvsp[0].str)[0] == '\"' && (yyvsp[0].str)[strlen((yyvsp[0].str))-1] == '\"') /* already quoted? */
 				(yyval.str) = (yyvsp[0].str);
@@ -50617,17 +50671,17 @@
 				(yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\""));
 			}
 		}
-#line 50621 "preproc.c" /* yacc.c:1646  */
+#line 50675 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2537:
-#line 14070 "preproc.y" /* yacc.c:1646  */
+  case 2539:
+#line 14078 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50627 "preproc.c" /* yacc.c:1646  */
+#line 50681 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2538:
-#line 14078 "preproc.y" /* yacc.c:1646  */
+  case 2540:
+#line 14086 "preproc.y" /* yacc.c:1646  */
     {
 			struct cursor *ptr, *this;
 			char *cursor_marker = (yyvsp[-5].str)[0] == ':' ? mm_strdup("$0") : mm_strdup((yyvsp[-5].str));
@@ -50686,179 +50740,179 @@
 			else
 				(yyval.str) = cat2_str(adjust_outofscope_cursor_vars(this), comment);
 		}
-#line 50690 "preproc.c" /* yacc.c:1646  */
+#line 50744 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2539:
-#line 14139 "preproc.y" /* yacc.c:1646  */
+  case 2541:
+#line 14147 "preproc.y" /* yacc.c:1646  */
     {
 			  /* execute immediate means prepare the statement and
 			   * immediately execute it */
 			  (yyval.str) = (yyvsp[0].str);
 			}
-#line 50700 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 2541:
-#line 14149 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 50706 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 2542:
-#line 14150 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 50712 "preproc.c" /* yacc.c:1646  */
+#line 50754 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2543:
-#line 14153 "preproc.y" /* yacc.c:1646  */
+#line 14157 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50718 "preproc.c" /* yacc.c:1646  */
+#line 50760 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2544:
-#line 14155 "preproc.y" /* yacc.c:1646  */
+#line 14158 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50724 "preproc.c" /* yacc.c:1646  */
+#line 50766 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2545:
-#line 14156 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = EMPTY; }
-#line 50730 "preproc.c" /* yacc.c:1646  */
+#line 14161 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 50772 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2546:
-#line 14159 "preproc.y" /* yacc.c:1646  */
+#line 14163 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50736 "preproc.c" /* yacc.c:1646  */
+#line 50778 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2547:
-#line 14160 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("year to minute"); }
-#line 50742 "preproc.c" /* yacc.c:1646  */
+#line 14164 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = EMPTY; }
+#line 50784 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2548:
-#line 14161 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("year to second"); }
-#line 50748 "preproc.c" /* yacc.c:1646  */
+#line 14167 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 50790 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2549:
-#line 14162 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("day to day"); }
-#line 50754 "preproc.c" /* yacc.c:1646  */
+#line 14168 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("year to minute"); }
+#line 50796 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2550:
-#line 14163 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("month to month"); }
-#line 50760 "preproc.c" /* yacc.c:1646  */
+#line 14169 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("year to second"); }
+#line 50802 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2551:
 #line 14170 "preproc.y" /* yacc.c:1646  */
-    { fputs("/* exec sql begin declare section */", yyout); }
-#line 50766 "preproc.c" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("day to day"); }
+#line 50808 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2552:
-#line 14172 "preproc.y" /* yacc.c:1646  */
+#line 14171 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("month to month"); }
+#line 50814 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 2553:
+#line 14178 "preproc.y" /* yacc.c:1646  */
+    { fputs("/* exec sql begin declare section */", base_yyout); }
+#line 50820 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 2554:
+#line 14180 "preproc.y" /* yacc.c:1646  */
     {
-			fprintf(yyout, "%s/* exec sql end declare section */", (yyvsp[-1].str));
+			fprintf(base_yyout, "%s/* exec sql end declare section */", (yyvsp[-1].str));
 			free((yyvsp[-1].str));
 			output_line_number();
 		}
-#line 50776 "preproc.c" /* yacc.c:1646  */
+#line 50830 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2553:
-#line 14179 "preproc.y" /* yacc.c:1646  */
+  case 2555:
+#line 14187 "preproc.y" /* yacc.c:1646  */
     {}
-#line 50782 "preproc.c" /* yacc.c:1646  */
+#line 50836 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2554:
-#line 14181 "preproc.y" /* yacc.c:1646  */
+  case 2556:
+#line 14189 "preproc.y" /* yacc.c:1646  */
     {}
-#line 50788 "preproc.c" /* yacc.c:1646  */
+#line 50842 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2555:
-#line 14183 "preproc.y" /* yacc.c:1646  */
+  case 2557:
+#line 14191 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 50794 "preproc.c" /* yacc.c:1646  */
+#line 50848 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2556:
-#line 14184 "preproc.y" /* yacc.c:1646  */
+  case 2558:
+#line 14192 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50800 "preproc.c" /* yacc.c:1646  */
+#line 50854 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2557:
-#line 14187 "preproc.y" /* yacc.c:1646  */
+  case 2559:
+#line 14195 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50806 "preproc.c" /* yacc.c:1646  */
+#line 50860 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2558:
-#line 14188 "preproc.y" /* yacc.c:1646  */
+  case 2560:
+#line 14196 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50812 "preproc.c" /* yacc.c:1646  */
+#line 50866 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2559:
-#line 14189 "preproc.y" /* yacc.c:1646  */
+  case 2561:
+#line 14197 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].str)); }
-#line 50818 "preproc.c" /* yacc.c:1646  */
+#line 50872 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2560:
-#line 14190 "preproc.y" /* yacc.c:1646  */
+  case 2562:
+#line 14198 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].str)); }
-#line 50824 "preproc.c" /* yacc.c:1646  */
+#line 50878 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2561:
-#line 14193 "preproc.y" /* yacc.c:1646  */
+  case 2563:
+#line 14201 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 50830 "preproc.c" /* yacc.c:1646  */
+#line 50884 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2562:
-#line 14194 "preproc.y" /* yacc.c:1646  */
+  case 2564:
+#line 14202 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].str)); }
-#line 50836 "preproc.c" /* yacc.c:1646  */
+#line 50890 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2563:
-#line 14198 "preproc.y" /* yacc.c:1646  */
+  case 2565:
+#line 14206 "preproc.y" /* yacc.c:1646  */
     {
 		/* reset this variable so we see if there was */
 		/* an initializer specified */
 		initializer = 0;
 	}
-#line 50846 "preproc.c" /* yacc.c:1646  */
+#line 50900 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2564:
-#line 14204 "preproc.y" /* yacc.c:1646  */
+  case 2566:
+#line 14212 "preproc.y" /* yacc.c:1646  */
     {
 		add_typedef((yyvsp[-2].str), (yyvsp[-1].index).index1, (yyvsp[-1].index).index2, (yyvsp[-4].type).type_enum, (yyvsp[-4].type).type_dimension, (yyvsp[-4].type).type_index, initializer, *(yyvsp[-3].str) ? 1 : 0);
 
-		fprintf(yyout, "typedef %s %s %s %s;\n", (yyvsp[-4].type).type_str, *(yyvsp[-3].str) ? "*" : "", (yyvsp[-2].str), (yyvsp[-1].index).str);
+		fprintf(base_yyout, "typedef %s %s %s %s;\n", (yyvsp[-4].type).type_str, *(yyvsp[-3].str) ? "*" : "", (yyvsp[-2].str), (yyvsp[-1].index).str);
 		output_line_number();
 		(yyval.str) = mm_strdup("");
 	}
-#line 50858 "preproc.c" /* yacc.c:1646  */
+#line 50912 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2565:
-#line 14214 "preproc.y" /* yacc.c:1646  */
+  case 2567:
+#line 14222 "preproc.y" /* yacc.c:1646  */
     {
 			actual_type[struct_level].type_enum = (yyvsp[0].type).type_enum;
 			actual_type[struct_level].type_str = (yyvsp[0].type).type_str;
@@ -50868,19 +50922,19 @@
 
 			actual_startline[struct_level] = hashline_number();
 		}
-#line 50872 "preproc.c" /* yacc.c:1646  */
+#line 50926 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2566:
-#line 14224 "preproc.y" /* yacc.c:1646  */
+  case 2568:
+#line 14232 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.str) = cat_str(5, actual_startline[struct_level], (yyvsp[-4].str), (yyvsp[-3].type).type_str, (yyvsp[-1].str), mm_strdup(";\n"));
 		}
-#line 50880 "preproc.c" /* yacc.c:1646  */
+#line 50934 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2567:
-#line 14228 "preproc.y" /* yacc.c:1646  */
+  case 2569:
+#line 14236 "preproc.y" /* yacc.c:1646  */
     {
 			actual_type[struct_level].type_enum = (yyvsp[0].type).type_enum;
 			actual_type[struct_level].type_str = (yyvsp[0].type).type_str;
@@ -50890,93 +50944,93 @@
 
 			actual_startline[struct_level] = hashline_number();
 		}
-#line 50894 "preproc.c" /* yacc.c:1646  */
+#line 50948 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2568:
-#line 14238 "preproc.y" /* yacc.c:1646  */
+  case 2570:
+#line 14246 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.str) = cat_str(4, actual_startline[struct_level], (yyvsp[-3].type).type_str, (yyvsp[-1].str), mm_strdup(";\n"));
 		}
-#line 50902 "preproc.c" /* yacc.c:1646  */
+#line 50956 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2569:
-#line 14242 "preproc.y" /* yacc.c:1646  */
+  case 2571:
+#line 14250 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.str) = cat2_str((yyvsp[-1].str), mm_strdup(";"));
 		}
-#line 50910 "preproc.c" /* yacc.c:1646  */
+#line 50964 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2570:
-#line 14247 "preproc.y" /* yacc.c:1646  */
+  case 2572:
+#line 14255 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) =cat2_str(mm_strdup(":"), (yyvsp[0].str)); }
-#line 50916 "preproc.c" /* yacc.c:1646  */
+#line 50970 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2571:
-#line 14248 "preproc.y" /* yacc.c:1646  */
+  case 2573:
+#line 14256 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 50922 "preproc.c" /* yacc.c:1646  */
+#line 50976 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2572:
-#line 14252 "preproc.y" /* yacc.c:1646  */
+  case 2574:
+#line 14260 "preproc.y" /* yacc.c:1646  */
     {(yyval.str) = cat2_str ((yyvsp[-1].str), (yyvsp[0].str)); }
-#line 50928 "preproc.c" /* yacc.c:1646  */
+#line 50982 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2573:
-#line 14253 "preproc.y" /* yacc.c:1646  */
+  case 2575:
+#line 14261 "preproc.y" /* yacc.c:1646  */
     {(yyval.str) = (yyvsp[0].str); }
-#line 50934 "preproc.c" /* yacc.c:1646  */
+#line 50988 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2574:
-#line 14254 "preproc.y" /* yacc.c:1646  */
+  case 2576:
+#line 14262 "preproc.y" /* yacc.c:1646  */
     {(yyval.str) = (yyvsp[0].str); }
-#line 50940 "preproc.c" /* yacc.c:1646  */
+#line 50994 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2575:
-#line 14257 "preproc.y" /* yacc.c:1646  */
+  case 2577:
+#line 14265 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("extern"); }
-#line 50946 "preproc.c" /* yacc.c:1646  */
+#line 51000 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2576:
-#line 14258 "preproc.y" /* yacc.c:1646  */
+  case 2578:
+#line 14266 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("static"); }
-#line 50952 "preproc.c" /* yacc.c:1646  */
+#line 51006 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2577:
-#line 14259 "preproc.y" /* yacc.c:1646  */
+  case 2579:
+#line 14267 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("register"); }
-#line 50958 "preproc.c" /* yacc.c:1646  */
+#line 51012 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2578:
-#line 14260 "preproc.y" /* yacc.c:1646  */
+  case 2580:
+#line 14268 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("auto"); }
-#line 50964 "preproc.c" /* yacc.c:1646  */
+#line 51018 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2579:
-#line 14263 "preproc.y" /* yacc.c:1646  */
+  case 2581:
+#line 14271 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("const"); }
-#line 50970 "preproc.c" /* yacc.c:1646  */
+#line 51024 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2580:
-#line 14264 "preproc.y" /* yacc.c:1646  */
+  case 2582:
+#line 14272 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("volatile"); }
-#line 50976 "preproc.c" /* yacc.c:1646  */
+#line 51030 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2581:
-#line 14268 "preproc.y" /* yacc.c:1646  */
+  case 2583:
+#line 14276 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.type).type_enum = (yyvsp[0].type_enum);
 			(yyval.type).type_str = mm_strdup(ecpg_type_name((yyvsp[0].type_enum)));
@@ -50984,11 +51038,11 @@
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 50988 "preproc.c" /* yacc.c:1646  */
+#line 51042 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2582:
-#line 14276 "preproc.y" /* yacc.c:1646  */
+  case 2584:
+#line 14284 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.type).type_str = (yyvsp[0].str);
 			(yyval.type).type_dimension = mm_strdup("-1");
@@ -51005,11 +51059,11 @@
 				(yyval.type).type_sizeof = NULL;
 			}
 		}
-#line 51009 "preproc.c" /* yacc.c:1646  */
+#line 51063 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2583:
-#line 14293 "preproc.y" /* yacc.c:1646  */
+  case 2585:
+#line 14301 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.type).type_str = (yyvsp[0].str);
 			(yyval.type).type_enum = ECPGt_int;
@@ -51017,11 +51071,11 @@
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 51021 "preproc.c" /* yacc.c:1646  */
+#line 51075 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2584:
-#line 14301 "preproc.y" /* yacc.c:1646  */
+  case 2586:
+#line 14309 "preproc.y" /* yacc.c:1646  */
     {
 			if (strcmp((yyvsp[-4].str), "numeric") == 0)
 			{
@@ -51044,11 +51098,11 @@
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 51048 "preproc.c" /* yacc.c:1646  */
+#line 51102 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2585:
-#line 14324 "preproc.y" /* yacc.c:1646  */
+  case 2587:
+#line 14332 "preproc.y" /* yacc.c:1646  */
     {
 			if (strlen((yyvsp[0].str)) != 0 && strcmp ((yyvsp[-1].str), "datetime") != 0 && strcmp ((yyvsp[-1].str), "interval") != 0)
 				mmerror (PARSE_ERROR, ET_ERROR, "interval specification not allowed here");
@@ -51154,11 +51208,11 @@
 				struct_member_list[struct_level] = ECPGstruct_member_dup(this->struct_member_list);
 			}
 		}
-#line 51158 "preproc.c" /* yacc.c:1646  */
+#line 51212 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2586:
-#line 14430 "preproc.y" /* yacc.c:1646  */
+  case 2588:
+#line 14438 "preproc.y" /* yacc.c:1646  */
     {
 			/* this is for named structs/unions */
 			char *name;
@@ -51190,46 +51244,46 @@
 				struct_member_list[struct_level] = NULL;
 			}
 		}
-#line 51194 "preproc.c" /* yacc.c:1646  */
+#line 51248 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2587:
-#line 14464 "preproc.y" /* yacc.c:1646  */
+  case 2589:
+#line 14472 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(3, mm_strdup("enum"), (yyvsp[-1].str), (yyvsp[0].str)); }
-#line 51200 "preproc.c" /* yacc.c:1646  */
+#line 51254 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2588:
-#line 14466 "preproc.y" /* yacc.c:1646  */
+  case 2590:
+#line 14474 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat2_str(mm_strdup("enum"), (yyvsp[0].str)); }
-#line 51206 "preproc.c" /* yacc.c:1646  */
+#line 51260 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2589:
-#line 14468 "preproc.y" /* yacc.c:1646  */
+  case 2591:
+#line 14476 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat2_str(mm_strdup("enum"), (yyvsp[0].str)); }
-#line 51212 "preproc.c" /* yacc.c:1646  */
+#line 51266 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2590:
-#line 14472 "preproc.y" /* yacc.c:1646  */
+  case 2592:
+#line 14480 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(3, mm_strdup("{"), (yyvsp[-1].str), mm_strdup("}")); }
-#line 51218 "preproc.c" /* yacc.c:1646  */
+#line 51272 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2591:
-#line 14475 "preproc.y" /* yacc.c:1646  */
+  case 2593:
+#line 14483 "preproc.y" /* yacc.c:1646  */
     {
 			struct_member_list[struct_level++] = NULL;
 			if (struct_level >= STRUCT_DEPTH)
 				 mmerror(PARSE_ERROR, ET_ERROR, "too many levels in nested structure/union definition");
 			forward_name = mm_strdup((yyvsp[0].struct_union).symbol);
 		}
-#line 51229 "preproc.c" /* yacc.c:1646  */
+#line 51283 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2592:
-#line 14482 "preproc.y" /* yacc.c:1646  */
+  case 2594:
+#line 14490 "preproc.y" /* yacc.c:1646  */
     {
 			struct typedefs *ptr, *this;
 			struct this_type su_type;
@@ -51245,7 +51299,7 @@
 			free(forward_name);
 			forward_name = NULL;
 
-			/* This is essantially a typedef but needs the keyword struct/union as well.
+			/* This is essentially a typedef but needs the keyword struct/union as well.
 			 * So we create the typedef for each struct definition with symbol */
 			for (ptr = types; ptr != NULL; ptr = ptr->next)
 			{
@@ -51271,122 +51325,122 @@
 			types = this;
 			(yyval.str) = cat_str(4, su_type.type_str, mm_strdup("{"), (yyvsp[-1].str), mm_strdup("}"));
 		}
-#line 51275 "preproc.c" /* yacc.c:1646  */
+#line 51329 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2593:
-#line 14525 "preproc.y" /* yacc.c:1646  */
+  case 2595:
+#line 14533 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51281 "preproc.c" /* yacc.c:1646  */
+#line 51335 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2594:
-#line 14527 "preproc.y" /* yacc.c:1646  */
+  case 2596:
+#line 14535 "preproc.y" /* yacc.c:1646  */
     {
 			struct_member_list[struct_level++] = NULL;
 			if (struct_level >= STRUCT_DEPTH)
 				 mmerror(PARSE_ERROR, ET_ERROR, "too many levels in nested structure/union definition");
 		}
-#line 51291 "preproc.c" /* yacc.c:1646  */
+#line 51345 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2595:
-#line 14533 "preproc.y" /* yacc.c:1646  */
+  case 2597:
+#line 14541 "preproc.y" /* yacc.c:1646  */
     {
 			ECPGfree_struct_member(struct_member_list[struct_level]);
 			struct_member_list[struct_level] = NULL;
 			struct_level--;
 			(yyval.str) = cat_str(4, (yyvsp[-4].str), mm_strdup("{"), (yyvsp[-1].str), mm_strdup("}"));
 		}
-#line 51302 "preproc.c" /* yacc.c:1646  */
+#line 51356 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2596:
-#line 14542 "preproc.y" /* yacc.c:1646  */
+  case 2598:
+#line 14550 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.struct_union).su = mm_strdup("struct");
 			(yyval.struct_union).symbol = (yyvsp[0].str);
 			ECPGstruct_sizeof = cat_str(3, mm_strdup("sizeof("), cat2_str(mm_strdup((yyval.struct_union).su), mm_strdup((yyval.struct_union).symbol)), mm_strdup(")"));
 		}
-#line 51312 "preproc.c" /* yacc.c:1646  */
+#line 51366 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2597:
-#line 14548 "preproc.y" /* yacc.c:1646  */
+  case 2599:
+#line 14556 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.struct_union).su = mm_strdup("union");
 			(yyval.struct_union).symbol = (yyvsp[0].str);
 		}
-#line 51321 "preproc.c" /* yacc.c:1646  */
+#line 51375 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2598:
-#line 14555 "preproc.y" /* yacc.c:1646  */
+  case 2600:
+#line 14563 "preproc.y" /* yacc.c:1646  */
     {
 			ECPGstruct_sizeof = mm_strdup(""); /* This must not be NULL to distinguish from simple types. */
 			(yyval.str) = mm_strdup("struct");
 		}
-#line 51330 "preproc.c" /* yacc.c:1646  */
+#line 51384 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2599:
-#line 14560 "preproc.y" /* yacc.c:1646  */
+  case 2601:
+#line 14568 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.str) = mm_strdup("union");
 		}
-#line 51338 "preproc.c" /* yacc.c:1646  */
+#line 51392 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2600:
-#line 14565 "preproc.y" /* yacc.c:1646  */
+  case 2602:
+#line 14573 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum)=(yyvsp[0].type_enum); }
-#line 51344 "preproc.c" /* yacc.c:1646  */
+#line 51398 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2601:
-#line 14566 "preproc.y" /* yacc.c:1646  */
+  case 2603:
+#line 14574 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum)=(yyvsp[0].type_enum); }
-#line 51350 "preproc.c" /* yacc.c:1646  */
+#line 51404 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2602:
-#line 14569 "preproc.y" /* yacc.c:1646  */
+  case 2604:
+#line 14577 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_unsigned_short; }
-#line 51356 "preproc.c" /* yacc.c:1646  */
+#line 51410 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2603:
-#line 14570 "preproc.y" /* yacc.c:1646  */
+  case 2605:
+#line 14578 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_unsigned_short; }
-#line 51362 "preproc.c" /* yacc.c:1646  */
+#line 51416 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2604:
-#line 14571 "preproc.y" /* yacc.c:1646  */
+  case 2606:
+#line 14579 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_unsigned_int; }
-#line 51368 "preproc.c" /* yacc.c:1646  */
+#line 51422 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2605:
-#line 14572 "preproc.y" /* yacc.c:1646  */
+  case 2607:
+#line 14580 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_unsigned_int; }
-#line 51374 "preproc.c" /* yacc.c:1646  */
+#line 51428 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2606:
-#line 14573 "preproc.y" /* yacc.c:1646  */
+  case 2608:
+#line 14581 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_unsigned_long; }
-#line 51380 "preproc.c" /* yacc.c:1646  */
+#line 51434 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2607:
-#line 14574 "preproc.y" /* yacc.c:1646  */
+  case 2609:
+#line 14582 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_unsigned_long; }
-#line 51386 "preproc.c" /* yacc.c:1646  */
+#line 51440 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2608:
-#line 14576 "preproc.y" /* yacc.c:1646  */
+  case 2610:
+#line 14584 "preproc.y" /* yacc.c:1646  */
     {
 #ifdef HAVE_LONG_LONG_INT
 			(yyval.type_enum) = ECPGt_unsigned_long_long;
@@ -51394,11 +51448,11 @@
 			(yyval.type_enum) = ECPGt_unsigned_long;
 #endif
 		}
-#line 51398 "preproc.c" /* yacc.c:1646  */
+#line 51452 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2609:
-#line 14584 "preproc.y" /* yacc.c:1646  */
+  case 2611:
+#line 14592 "preproc.y" /* yacc.c:1646  */
     {
 #ifdef HAVE_LONG_LONG_INT
 			(yyval.type_enum) = ECPGt_unsigned_long_long;
@@ -51406,47 +51460,47 @@
 			(yyval.type_enum) = ECPGt_unsigned_long;
 #endif
 		}
-#line 51410 "preproc.c" /* yacc.c:1646  */
+#line 51464 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2610:
-#line 14591 "preproc.y" /* yacc.c:1646  */
+  case 2612:
+#line 14599 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_unsigned_char; }
-#line 51416 "preproc.c" /* yacc.c:1646  */
+#line 51470 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2611:
-#line 14594 "preproc.y" /* yacc.c:1646  */
+  case 2613:
+#line 14602 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_short; }
-#line 51422 "preproc.c" /* yacc.c:1646  */
+#line 51476 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2612:
-#line 14595 "preproc.y" /* yacc.c:1646  */
+  case 2614:
+#line 14603 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_short; }
-#line 51428 "preproc.c" /* yacc.c:1646  */
+#line 51482 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2613:
-#line 14596 "preproc.y" /* yacc.c:1646  */
+  case 2615:
+#line 14604 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_int; }
-#line 51434 "preproc.c" /* yacc.c:1646  */
+#line 51488 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2614:
-#line 14597 "preproc.y" /* yacc.c:1646  */
+  case 2616:
+#line 14605 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_long; }
-#line 51440 "preproc.c" /* yacc.c:1646  */
+#line 51494 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2615:
-#line 14598 "preproc.y" /* yacc.c:1646  */
+  case 2617:
+#line 14606 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_long; }
-#line 51446 "preproc.c" /* yacc.c:1646  */
+#line 51500 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2616:
-#line 14600 "preproc.y" /* yacc.c:1646  */
+  case 2618:
+#line 14608 "preproc.y" /* yacc.c:1646  */
     {
 #ifdef HAVE_LONG_LONG_INT
 			(yyval.type_enum) = ECPGt_long_long;
@@ -51454,11 +51508,11 @@
 			(yyval.type_enum) = ECPGt_long;
 #endif
 		}
-#line 51458 "preproc.c" /* yacc.c:1646  */
+#line 51512 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2617:
-#line 14608 "preproc.y" /* yacc.c:1646  */
+  case 2619:
+#line 14616 "preproc.y" /* yacc.c:1646  */
     {
 #ifdef HAVE_LONG_LONG_INT
 			(yyval.type_enum) = ECPGt_long_long;
@@ -51466,46 +51520,46 @@
 			(yyval.type_enum) = ECPGt_long;
 #endif
 		}
-#line 51470 "preproc.c" /* yacc.c:1646  */
+#line 51524 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2618:
-#line 14615 "preproc.y" /* yacc.c:1646  */
+  case 2620:
+#line 14623 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_bool; }
-#line 51476 "preproc.c" /* yacc.c:1646  */
+#line 51530 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2619:
-#line 14616 "preproc.y" /* yacc.c:1646  */
+  case 2621:
+#line 14624 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_char; }
-#line 51482 "preproc.c" /* yacc.c:1646  */
+#line 51536 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2620:
-#line 14617 "preproc.y" /* yacc.c:1646  */
+  case 2622:
+#line 14625 "preproc.y" /* yacc.c:1646  */
     { (yyval.type_enum) = ECPGt_double; }
-#line 51488 "preproc.c" /* yacc.c:1646  */
+#line 51542 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2623:
-#line 14625 "preproc.y" /* yacc.c:1646  */
+  case 2625:
+#line 14633 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51494 "preproc.c" /* yacc.c:1646  */
+#line 51548 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2624:
-#line 14627 "preproc.y" /* yacc.c:1646  */
+  case 2626:
+#line 14635 "preproc.y" /* yacc.c:1646  */
     {
 			if (actual_type[struct_level].type_enum == ECPGt_varchar)
 				(yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup(";"), (yyvsp[0].str));
 			else
 				(yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str));
 		}
-#line 51505 "preproc.c" /* yacc.c:1646  */
+#line 51559 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2625:
-#line 14636 "preproc.y" /* yacc.c:1646  */
+  case 2627:
+#line 14644 "preproc.y" /* yacc.c:1646  */
     {
 			struct ECPGtype * type;
 			char *dimension = (yyvsp[-2].index).index1;	/* dimension of array */
@@ -51590,292 +51644,292 @@
 
 			free((yyvsp[-3].str));
 		}
-#line 51594 "preproc.c" /* yacc.c:1646  */
+#line 51648 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2626:
-#line 14723 "preproc.y" /* yacc.c:1646  */
+  case 2628:
+#line 14731 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 51600 "preproc.c" /* yacc.c:1646  */
+#line 51654 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2627:
-#line 14725 "preproc.y" /* yacc.c:1646  */
+  case 2629:
+#line 14733 "preproc.y" /* yacc.c:1646  */
     {
 			initializer = 1;
 			(yyval.str) = cat2_str(mm_strdup("="), (yyvsp[0].str));
 		}
-#line 51609 "preproc.c" /* yacc.c:1646  */
+#line 51663 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2628:
-#line 14731 "preproc.y" /* yacc.c:1646  */
+  case 2630:
+#line 14739 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 51615 "preproc.c" /* yacc.c:1646  */
+#line 51669 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2629:
-#line 14732 "preproc.y" /* yacc.c:1646  */
+  case 2631:
+#line 14740 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("*"); }
-#line 51621 "preproc.c" /* yacc.c:1646  */
+#line 51675 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2630:
-#line 14733 "preproc.y" /* yacc.c:1646  */
+  case 2632:
+#line 14741 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("**"); }
-#line 51627 "preproc.c" /* yacc.c:1646  */
+#line 51681 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2631:
-#line 14740 "preproc.y" /* yacc.c:1646  */
+  case 2633:
+#line 14748 "preproc.y" /* yacc.c:1646  */
     {
 			/* this is only supported for compatibility */
 			(yyval.str) = cat_str(3, mm_strdup("/* declare statement"), (yyvsp[0].str), mm_strdup("*/"));
 		}
-#line 51636 "preproc.c" /* yacc.c:1646  */
+#line 51690 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2632:
-#line 14748 "preproc.y" /* yacc.c:1646  */
+  case 2634:
+#line 14756 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51642 "preproc.c" /* yacc.c:1646  */
+#line 51696 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2633:
-#line 14751 "preproc.y" /* yacc.c:1646  */
+  case 2635:
+#line 14759 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51648 "preproc.c" /* yacc.c:1646  */
+#line 51702 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2634:
-#line 14752 "preproc.y" /* yacc.c:1646  */
+  case 2636:
+#line 14760 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("\"CURRENT\""); }
-#line 51654 "preproc.c" /* yacc.c:1646  */
+#line 51708 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2635:
-#line 14753 "preproc.y" /* yacc.c:1646  */
+  case 2637:
+#line 14761 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("\"ALL\""); }
-#line 51660 "preproc.c" /* yacc.c:1646  */
+#line 51714 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2636:
-#line 14754 "preproc.y" /* yacc.c:1646  */
+  case 2638:
+#line 14762 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("\"CURRENT\""); }
-#line 51666 "preproc.c" /* yacc.c:1646  */
+#line 51720 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2637:
-#line 14757 "preproc.y" /* yacc.c:1646  */
+  case 2639:
+#line 14765 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\"")); }
-#line 51672 "preproc.c" /* yacc.c:1646  */
+#line 51726 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2638:
-#line 14758 "preproc.y" /* yacc.c:1646  */
+  case 2640:
+#line 14766 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("\"DEFAULT\""); }
-#line 51678 "preproc.c" /* yacc.c:1646  */
+#line 51732 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2639:
-#line 14759 "preproc.y" /* yacc.c:1646  */
+  case 2641:
+#line 14767 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51684 "preproc.c" /* yacc.c:1646  */
+#line 51738 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2640:
-#line 14763 "preproc.y" /* yacc.c:1646  */
+  case 2642:
+#line 14771 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51690 "preproc.c" /* yacc.c:1646  */
+#line 51744 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2641:
-#line 14765 "preproc.y" /* yacc.c:1646  */
+  case 2643:
+#line 14773 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\"")); }
-#line 51696 "preproc.c" /* yacc.c:1646  */
+#line 51750 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2642:
-#line 14772 "preproc.y" /* yacc.c:1646  */
+  case 2644:
+#line 14780 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51702 "preproc.c" /* yacc.c:1646  */
+#line 51756 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2643:
-#line 14773 "preproc.y" /* yacc.c:1646  */
+  case 2645:
+#line 14781 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("all"); }
-#line 51708 "preproc.c" /* yacc.c:1646  */
+#line 51762 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2644:
-#line 14780 "preproc.y" /* yacc.c:1646  */
+  case 2646:
+#line 14788 "preproc.y" /* yacc.c:1646  */
     {
 			if ((yyvsp[-1].str)[0] == ':')
 				remove_variable_from_list(&argsinsert, find_variable((yyvsp[-1].str) + 1));
 			(yyval.str) = (yyvsp[-1].str);
 		}
-#line 51718 "preproc.c" /* yacc.c:1646  */
+#line 51772 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2645:
-#line 14787 "preproc.y" /* yacc.c:1646  */
+  case 2647:
+#line 14795 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 51724 "preproc.c" /* yacc.c:1646  */
+#line 51778 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2646:
-#line 14788 "preproc.y" /* yacc.c:1646  */
+  case 2648:
+#line 14796 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51730 "preproc.c" /* yacc.c:1646  */
+#line 51784 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2647:
-#line 14791 "preproc.y" /* yacc.c:1646  */
+  case 2649:
+#line 14799 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 51736 "preproc.c" /* yacc.c:1646  */
+#line 51790 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2648:
-#line 14792 "preproc.y" /* yacc.c:1646  */
+  case 2650:
+#line 14800 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51742 "preproc.c" /* yacc.c:1646  */
+#line 51796 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2649:
-#line 14796 "preproc.y" /* yacc.c:1646  */
+  case 2651:
+#line 14804 "preproc.y" /* yacc.c:1646  */
     {
 			add_variable_to_head(&argsinsert, descriptor_variable((yyvsp[0].str),0), &no_indicator);
 			(yyval.str) = EMPTY;
 		}
-#line 51751 "preproc.c" /* yacc.c:1646  */
+#line 51805 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2650:
-#line 14801 "preproc.y" /* yacc.c:1646  */
+  case 2652:
+#line 14809 "preproc.y" /* yacc.c:1646  */
     {
 			add_variable_to_head(&argsinsert, sqlda_variable((yyvsp[0].str)), &no_indicator);
 			(yyval.str) = EMPTY;
 		}
-#line 51760 "preproc.c" /* yacc.c:1646  */
+#line 51814 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2651:
-#line 14808 "preproc.y" /* yacc.c:1646  */
+  case 2653:
+#line 14816 "preproc.y" /* yacc.c:1646  */
     {
 			add_variable_to_head(&argsresult, descriptor_variable((yyvsp[0].str),1), &no_indicator);
 			(yyval.str) = EMPTY;
 		}
-#line 51769 "preproc.c" /* yacc.c:1646  */
+#line 51823 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2652:
-#line 14813 "preproc.y" /* yacc.c:1646  */
+  case 2654:
+#line 14821 "preproc.y" /* yacc.c:1646  */
     {
 			add_variable_to_head(&argsresult, sqlda_variable((yyvsp[0].str)), &no_indicator);
 			(yyval.str) = EMPTY;
 		}
-#line 51778 "preproc.c" /* yacc.c:1646  */
+#line 51832 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2653:
-#line 14820 "preproc.y" /* yacc.c:1646  */
+  case 2655:
+#line 14828 "preproc.y" /* yacc.c:1646  */
     {
 			add_variable_to_head(&argsresult, sqlda_variable((yyvsp[0].str)), &no_indicator);
 			(yyval.str) = EMPTY;
 		}
-#line 51787 "preproc.c" /* yacc.c:1646  */
+#line 51841 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2656:
-#line 14829 "preproc.y" /* yacc.c:1646  */
+  case 2658:
+#line 14837 "preproc.y" /* yacc.c:1646  */
     {
 			char *length = mm_alloc(32);
 
 			sprintf(length, "%d", (int) strlen((yyvsp[0].str)));
 			add_variable_to_head(&argsinsert, new_variable((yyvsp[0].str), ECPGmake_simple_type(ECPGt_const, length, 0), 0), &no_indicator);
 		}
-#line 51798 "preproc.c" /* yacc.c:1646  */
+#line 51852 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2657:
-#line 14835 "preproc.y" /* yacc.c:1646  */
+  case 2659:
+#line 14843 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 51804 "preproc.c" /* yacc.c:1646  */
+#line 51858 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2658:
-#line 14836 "preproc.y" /* yacc.c:1646  */
+  case 2660:
+#line 14844 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 51810 "preproc.c" /* yacc.c:1646  */
+#line 51864 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2659:
-#line 14839 "preproc.y" /* yacc.c:1646  */
+  case 2661:
+#line 14847 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51816 "preproc.c" /* yacc.c:1646  */
+#line 51870 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2660:
-#line 14840 "preproc.y" /* yacc.c:1646  */
+  case 2662:
+#line 14848 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(2, mm_strdup("+"), (yyvsp[0].str)); }
-#line 51822 "preproc.c" /* yacc.c:1646  */
+#line 51876 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2661:
-#line 14841 "preproc.y" /* yacc.c:1646  */
+  case 2663:
+#line 14849 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(2, mm_strdup("-"), (yyvsp[0].str)); }
-#line 51828 "preproc.c" /* yacc.c:1646  */
+#line 51882 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2662:
-#line 14842 "preproc.y" /* yacc.c:1646  */
+  case 2664:
+#line 14850 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51834 "preproc.c" /* yacc.c:1646  */
+#line 51888 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2663:
-#line 14843 "preproc.y" /* yacc.c:1646  */
+  case 2665:
+#line 14851 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(2, mm_strdup("+"), (yyvsp[0].str)); }
-#line 51840 "preproc.c" /* yacc.c:1646  */
+#line 51894 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2664:
-#line 14844 "preproc.y" /* yacc.c:1646  */
+  case 2666:
+#line 14852 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = cat_str(2, mm_strdup("-"), (yyvsp[0].str)); }
-#line 51846 "preproc.c" /* yacc.c:1646  */
+#line 51900 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2665:
-#line 14845 "preproc.y" /* yacc.c:1646  */
+  case 2667:
+#line 14853 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51852 "preproc.c" /* yacc.c:1646  */
+#line 51906 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2666:
-#line 14846 "preproc.y" /* yacc.c:1646  */
+  case 2668:
+#line 14854 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51858 "preproc.c" /* yacc.c:1646  */
+#line 51912 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2667:
-#line 14847 "preproc.y" /* yacc.c:1646  */
+  case 2669:
+#line 14855 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 51864 "preproc.c" /* yacc.c:1646  */
+#line 51918 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2668:
-#line 14854 "preproc.y" /* yacc.c:1646  */
+  case 2670:
+#line 14862 "preproc.y" /* yacc.c:1646  */
     {
 		const char *con = connection ? connection : "NULL";
 		mmerror(PARSE_ERROR, ET_WARNING, "using unsupported DESCRIBE statement");
 		(yyval.str) = (char *) mm_alloc(sizeof("1, , ") + strlen(con) + strlen((yyvsp[-1].str)));
 		sprintf((yyval.str), "1, %s, %s", con, (yyvsp[-1].str));
 	}
-#line 51875 "preproc.c" /* yacc.c:1646  */
+#line 51929 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2669:
-#line 14861 "preproc.y" /* yacc.c:1646  */
+  case 2671:
+#line 14869 "preproc.y" /* yacc.c:1646  */
     {
 		const char *con = connection ? connection : "NULL";
 		struct variable *var;
@@ -51887,98 +51941,98 @@
 		(yyval.str) = (char *) mm_alloc(sizeof("0, , ") + strlen(con) + strlen((yyvsp[-1].str)));
 		sprintf((yyval.str), "0, %s, %s", con, (yyvsp[-1].str));
 	}
-#line 51891 "preproc.c" /* yacc.c:1646  */
+#line 51945 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2670:
-#line 14873 "preproc.y" /* yacc.c:1646  */
+  case 2672:
+#line 14881 "preproc.y" /* yacc.c:1646  */
     {
 		const char *con = connection ? connection : "NULL";
 		(yyval.str) = (char *) mm_alloc(sizeof("0, , ") + strlen(con) + strlen((yyvsp[-1].str)));
 		sprintf((yyval.str), "0, %s, %s", con, (yyvsp[-1].str));
 	}
-#line 51901 "preproc.c" /* yacc.c:1646  */
+#line 51955 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2671:
-#line 14879 "preproc.y" /* yacc.c:1646  */
+  case 2673:
+#line 14887 "preproc.y" /* yacc.c:1646  */
     {
 		const char *con = connection ? connection : "NULL";
 		mmerror(PARSE_ERROR, ET_WARNING, "using unsupported DESCRIBE statement");
 		(yyval.str) = (char *) mm_alloc(sizeof("1, , ") + strlen(con) + strlen((yyvsp[-1].str)));
 		sprintf((yyval.str), "1, %s, %s", con, (yyvsp[-1].str));
 	}
-#line 51912 "preproc.c" /* yacc.c:1646  */
+#line 51966 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2672:
-#line 14886 "preproc.y" /* yacc.c:1646  */
+  case 2674:
+#line 14894 "preproc.y" /* yacc.c:1646  */
     {
 		const char *con = connection ? connection : "NULL";
 		(yyval.str) = (char *) mm_alloc(sizeof("0, , ") + strlen(con) + strlen((yyvsp[-1].str)));
 		sprintf((yyval.str), "0, %s, %s", con, (yyvsp[-1].str));
 	}
-#line 51922 "preproc.c" /* yacc.c:1646  */
+#line 51976 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2673:
-#line 14893 "preproc.y" /* yacc.c:1646  */
+  case 2675:
+#line 14901 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("output"); }
-#line 51928 "preproc.c" /* yacc.c:1646  */
+#line 51982 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2674:
-#line 14894 "preproc.y" /* yacc.c:1646  */
+  case 2676:
+#line 14902 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 51934 "preproc.c" /* yacc.c:1646  */
+#line 51988 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2675:
-#line 14907 "preproc.y" /* yacc.c:1646  */
+  case 2677:
+#line 14915 "preproc.y" /* yacc.c:1646  */
     {
 			add_descriptor((yyvsp[0].str),connection);
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 51943 "preproc.c" /* yacc.c:1646  */
+#line 51997 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2676:
-#line 14918 "preproc.y" /* yacc.c:1646  */
+  case 2678:
+#line 14926 "preproc.y" /* yacc.c:1646  */
     {
 			drop_descriptor((yyvsp[0].str),connection);
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 51952 "preproc.c" /* yacc.c:1646  */
+#line 52006 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2677:
-#line 14929 "preproc.y" /* yacc.c:1646  */
+  case 2679:
+#line 14937 "preproc.y" /* yacc.c:1646  */
     {  (yyval.str) = (yyvsp[-1].str); }
-#line 51958 "preproc.c" /* yacc.c:1646  */
+#line 52012 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2680:
-#line 14937 "preproc.y" /* yacc.c:1646  */
+  case 2682:
+#line 14945 "preproc.y" /* yacc.c:1646  */
     { push_assignment((yyvsp[-2].str), (yyvsp[0].dtype_enum)); }
-#line 51964 "preproc.c" /* yacc.c:1646  */
+#line 52018 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2681:
-#line 14942 "preproc.y" /* yacc.c:1646  */
+  case 2683:
+#line 14950 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[-1].str); }
-#line 51970 "preproc.c" /* yacc.c:1646  */
+#line 52024 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2684:
-#line 14950 "preproc.y" /* yacc.c:1646  */
+  case 2686:
+#line 14958 "preproc.y" /* yacc.c:1646  */
     {
 			push_assignment((yyvsp[0].str), (yyvsp[-2].dtype_enum));
 		}
-#line 51978 "preproc.c" /* yacc.c:1646  */
+#line 52032 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2685:
-#line 14956 "preproc.y" /* yacc.c:1646  */
+  case 2687:
+#line 14964 "preproc.y" /* yacc.c:1646  */
     {
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 
@@ -51986,51 +52040,51 @@
 			new_variable((yyvsp[0].str), ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 51990 "preproc.c" /* yacc.c:1646  */
+#line 52044 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2686:
-#line 14964 "preproc.y" /* yacc.c:1646  */
+  case 2688:
+#line 14972 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 51998 "preproc.c" /* yacc.c:1646  */
+#line 52052 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2687:
-#line 14969 "preproc.y" /* yacc.c:1646  */
+  case 2689:
+#line 14977 "preproc.y" /* yacc.c:1646  */
     { (yyval.dtype_enum) = ECPGd_count; }
-#line 52004 "preproc.c" /* yacc.c:1646  */
+#line 52058 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2688:
-#line 14977 "preproc.y" /* yacc.c:1646  */
+  case 2690:
+#line 14985 "preproc.y" /* yacc.c:1646  */
     {  (yyval.descriptor).str = (yyvsp[-1].str); (yyval.descriptor).name = (yyvsp[-3].str); }
-#line 52010 "preproc.c" /* yacc.c:1646  */
+#line 52064 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2691:
-#line 14984 "preproc.y" /* yacc.c:1646  */
+  case 2693:
+#line 14992 "preproc.y" /* yacc.c:1646  */
     { push_assignment((yyvsp[-2].str), (yyvsp[0].dtype_enum)); }
-#line 52016 "preproc.c" /* yacc.c:1646  */
+#line 52070 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2692:
-#line 14988 "preproc.y" /* yacc.c:1646  */
+  case 2694:
+#line 14996 "preproc.y" /* yacc.c:1646  */
     {  (yyval.descriptor).str = (yyvsp[-1].str); (yyval.descriptor).name = (yyvsp[-3].str); }
-#line 52022 "preproc.c" /* yacc.c:1646  */
+#line 52076 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2695:
-#line 14996 "preproc.y" /* yacc.c:1646  */
+  case 2697:
+#line 15004 "preproc.y" /* yacc.c:1646  */
     {
 			push_assignment((yyvsp[0].str), (yyvsp[-2].dtype_enum));
 		}
-#line 52030 "preproc.c" /* yacc.c:1646  */
+#line 52084 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2696:
-#line 15002 "preproc.y" /* yacc.c:1646  */
+  case 2698:
+#line 15010 "preproc.y" /* yacc.c:1646  */
     {
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 
@@ -52038,19 +52092,19 @@
 			new_variable((yyvsp[0].str), ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 52042 "preproc.c" /* yacc.c:1646  */
+#line 52096 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2697:
-#line 15011 "preproc.y" /* yacc.c:1646  */
+  case 2699:
+#line 15019 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 52050 "preproc.c" /* yacc.c:1646  */
+#line 52104 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2698:
-#line 15016 "preproc.y" /* yacc.c:1646  */
+  case 2700:
+#line 15024 "preproc.y" /* yacc.c:1646  */
     {
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 			char *var = cat2_str(mm_strdup("-"), (yyvsp[0].str));
@@ -52059,11 +52113,11 @@
 			new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			(yyval.str) = var;
 		}
-#line 52063 "preproc.c" /* yacc.c:1646  */
+#line 52117 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2699:
-#line 15026 "preproc.y" /* yacc.c:1646  */
+  case 2701:
+#line 15034 "preproc.y" /* yacc.c:1646  */
     {
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 			char *var = cat2_str(mm_strdup("-"), (yyvsp[0].str));
@@ -52072,11 +52126,11 @@
 			new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			(yyval.str) = var;
 		}
-#line 52076 "preproc.c" /* yacc.c:1646  */
+#line 52130 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2700:
-#line 15036 "preproc.y" /* yacc.c:1646  */
+  case 2702:
+#line 15044 "preproc.y" /* yacc.c:1646  */
     {
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 			char *var = (yyvsp[0].str) + 1;
@@ -52086,153 +52140,153 @@
 			new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			(yyval.str) = var;
 		}
-#line 52090 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 2701:
-#line 15047 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_cardinality; }
-#line 52096 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 2702:
-#line 15048 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_data; }
-#line 52102 "preproc.c" /* yacc.c:1646  */
+#line 52144 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2703:
-#line 15049 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_di_code; }
-#line 52108 "preproc.c" /* yacc.c:1646  */
+#line 15055 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_cardinality; }
+#line 52150 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2704:
-#line 15050 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_di_precision; }
-#line 52114 "preproc.c" /* yacc.c:1646  */
+#line 15056 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_data; }
+#line 52156 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2705:
-#line 15051 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_indicator; }
-#line 52120 "preproc.c" /* yacc.c:1646  */
+#line 15057 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_di_code; }
+#line 52162 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2706:
-#line 15052 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_key_member; }
-#line 52126 "preproc.c" /* yacc.c:1646  */
+#line 15058 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_di_precision; }
+#line 52168 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2707:
-#line 15053 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_length; }
-#line 52132 "preproc.c" /* yacc.c:1646  */
+#line 15059 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_indicator; }
+#line 52174 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2708:
-#line 15054 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_name; }
-#line 52138 "preproc.c" /* yacc.c:1646  */
+#line 15060 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_key_member; }
+#line 52180 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2709:
-#line 15055 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_nullable; }
-#line 52144 "preproc.c" /* yacc.c:1646  */
+#line 15061 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_length; }
+#line 52186 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2710:
-#line 15056 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_octet; }
-#line 52150 "preproc.c" /* yacc.c:1646  */
+#line 15062 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_name; }
+#line 52192 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2711:
-#line 15057 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_precision; }
-#line 52156 "preproc.c" /* yacc.c:1646  */
+#line 15063 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_nullable; }
+#line 52198 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2712:
-#line 15058 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_length; }
-#line 52162 "preproc.c" /* yacc.c:1646  */
+#line 15064 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_octet; }
+#line 52204 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2713:
-#line 15059 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_ret_octet; }
-#line 52168 "preproc.c" /* yacc.c:1646  */
+#line 15065 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_precision; }
+#line 52210 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2714:
-#line 15060 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_scale; }
-#line 52174 "preproc.c" /* yacc.c:1646  */
+#line 15066 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_length; }
+#line 52216 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2715:
-#line 15061 "preproc.y" /* yacc.c:1646  */
-    { (yyval.dtype_enum) = ECPGd_type; }
-#line 52180 "preproc.c" /* yacc.c:1646  */
+#line 15067 "preproc.y" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_ret_octet; }
+#line 52222 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2716:
 #line 15068 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52186 "preproc.c" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_scale; }
+#line 52228 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2717:
 #line 15069 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52192 "preproc.c" /* yacc.c:1646  */
+    { (yyval.dtype_enum) = ECPGd_type; }
+#line 52234 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2718:
-#line 15072 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("on"); }
-#line 52198 "preproc.c" /* yacc.c:1646  */
+#line 15076 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52240 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2719:
-#line 15073 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("off"); }
-#line 52204 "preproc.c" /* yacc.c:1646  */
+#line 15077 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52246 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2720:
 #line 15080 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52210 "preproc.c" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("on"); }
+#line 52252 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2721:
 #line 15081 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52216 "preproc.c" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("off"); }
+#line 52258 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2722:
-#line 15082 "preproc.y" /* yacc.c:1646  */
+#line 15088 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52222 "preproc.c" /* yacc.c:1646  */
+#line 52264 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2723:
 #line 15089 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52270 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 2724:
+#line 15090 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52276 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 2725:
+#line 15097 "preproc.y" /* yacc.c:1646  */
     {
 			/* reset this variable so we see if there was */
 			/* an initializer specified */
 			initializer = 0;
 		}
-#line 52232 "preproc.c" /* yacc.c:1646  */
+#line 52286 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2724:
-#line 15095 "preproc.y" /* yacc.c:1646  */
+  case 2726:
+#line 15103 "preproc.y" /* yacc.c:1646  */
     {
 			add_typedef((yyvsp[-4].str), (yyvsp[-1].index).index1, (yyvsp[-1].index).index2, (yyvsp[-2].type).type_enum, (yyvsp[-2].type).type_dimension, (yyvsp[-2].type).type_index, initializer, *(yyvsp[0].str) ? 1 : 0);
 
@@ -52241,33 +52295,33 @@
 			else
 				(yyval.str) = cat_str(6, mm_strdup("typedef "), mm_strdup((yyvsp[-2].type).type_str), *(yyvsp[0].str)?mm_strdup("*"):mm_strdup(""), mm_strdup((yyvsp[-4].str)), mm_strdup((yyvsp[-1].index).str), mm_strdup(";"));
 		}
-#line 52245 "preproc.c" /* yacc.c:1646  */
+#line 52299 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2725:
-#line 15105 "preproc.y" /* yacc.c:1646  */
+  case 2727:
+#line 15113 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = mm_strdup("reference"); }
-#line 52251 "preproc.c" /* yacc.c:1646  */
+#line 52305 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2726:
-#line 15106 "preproc.y" /* yacc.c:1646  */
+  case 2728:
+#line 15114 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 52257 "preproc.c" /* yacc.c:1646  */
+#line 52311 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2727:
-#line 15113 "preproc.y" /* yacc.c:1646  */
+  case 2729:
+#line 15121 "preproc.y" /* yacc.c:1646  */
     {
 			/* reset this variable so we see if there was */
 			/* an initializer specified */
 			initializer = 0;
 		}
-#line 52267 "preproc.c" /* yacc.c:1646  */
+#line 52321 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2728:
-#line 15119 "preproc.y" /* yacc.c:1646  */
+  case 2730:
+#line 15127 "preproc.y" /* yacc.c:1646  */
     {
 			struct variable *p = find_variable((yyvsp[-4].str));
 			char *dimension = (yyvsp[-1].index).index1;
@@ -52325,740 +52379,740 @@
 
 			(yyval.str) = cat_str(7, mm_strdup("/* exec sql var"), mm_strdup((yyvsp[-4].str)), mm_strdup("is"), mm_strdup((yyvsp[-2].type).type_str), mm_strdup((yyvsp[-1].index).str), (yyvsp[0].str), mm_strdup("*/"));
 		}
-#line 52329 "preproc.c" /* yacc.c:1646  */
+#line 52383 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2729:
-#line 15183 "preproc.y" /* yacc.c:1646  */
+  case 2731:
+#line 15191 "preproc.y" /* yacc.c:1646  */
     {
 			when_error.code = (yyvsp[0].action).code;
 			when_error.command = (yyvsp[0].action).command;
 			(yyval.str) = cat_str(3, mm_strdup("/* exec sql whenever sqlerror "), (yyvsp[0].action).str, mm_strdup("; */"));
 		}
-#line 52339 "preproc.c" /* yacc.c:1646  */
+#line 52393 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2730:
-#line 15189 "preproc.y" /* yacc.c:1646  */
+  case 2732:
+#line 15197 "preproc.y" /* yacc.c:1646  */
     {
 			when_nf.code = (yyvsp[0].action).code;
 			when_nf.command = (yyvsp[0].action).command;
 			(yyval.str) = cat_str(3, mm_strdup("/* exec sql whenever not found "), (yyvsp[0].action).str, mm_strdup("; */"));
 		}
-#line 52349 "preproc.c" /* yacc.c:1646  */
+#line 52403 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2731:
-#line 15195 "preproc.y" /* yacc.c:1646  */
+  case 2733:
+#line 15203 "preproc.y" /* yacc.c:1646  */
     {
 			when_warn.code = (yyvsp[0].action).code;
 			when_warn.command = (yyvsp[0].action).command;
 			(yyval.str) = cat_str(3, mm_strdup("/* exec sql whenever sql_warning "), (yyvsp[0].action).str, mm_strdup("; */"));
 		}
-#line 52359 "preproc.c" /* yacc.c:1646  */
+#line 52413 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2732:
-#line 15203 "preproc.y" /* yacc.c:1646  */
+  case 2734:
+#line 15211 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.action).code = W_NOTHING;
 			(yyval.action).command = NULL;
 			(yyval.action).str = mm_strdup("continue");
 		}
-#line 52369 "preproc.c" /* yacc.c:1646  */
+#line 52423 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2733:
-#line 15209 "preproc.y" /* yacc.c:1646  */
+  case 2735:
+#line 15217 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.action).code = W_SQLPRINT;
 			(yyval.action).command = NULL;
 			(yyval.action).str = mm_strdup("sqlprint");
 		}
-#line 52379 "preproc.c" /* yacc.c:1646  */
+#line 52433 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2734:
-#line 15215 "preproc.y" /* yacc.c:1646  */
+  case 2736:
+#line 15223 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.action).code = W_STOP;
 			(yyval.action).command = NULL;
 			(yyval.action).str = mm_strdup("stop");
 		}
-#line 52389 "preproc.c" /* yacc.c:1646  */
+#line 52443 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2735:
-#line 15221 "preproc.y" /* yacc.c:1646  */
+  case 2737:
+#line 15229 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.action).code = W_GOTO;
 			(yyval.action).command = mm_strdup((yyvsp[0].str));
 			(yyval.action).str = cat2_str(mm_strdup("goto "), (yyvsp[0].str));
 		}
-#line 52399 "preproc.c" /* yacc.c:1646  */
+#line 52453 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2736:
-#line 15227 "preproc.y" /* yacc.c:1646  */
+  case 2738:
+#line 15235 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.action).code = W_GOTO;
 			(yyval.action).command = mm_strdup((yyvsp[0].str));
 			(yyval.action).str = cat2_str(mm_strdup("goto "), (yyvsp[0].str));
 		}
-#line 52409 "preproc.c" /* yacc.c:1646  */
+#line 52463 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2737:
-#line 15233 "preproc.y" /* yacc.c:1646  */
+  case 2739:
+#line 15241 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.action).code = W_DO;
 			(yyval.action).command = cat_str(4, (yyvsp[-3].str), mm_strdup("("), (yyvsp[-1].str), mm_strdup(")"));
 			(yyval.action).str = cat2_str(mm_strdup("do"), mm_strdup((yyval.action).command));
 		}
-#line 52419 "preproc.c" /* yacc.c:1646  */
+#line 52473 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2738:
-#line 15239 "preproc.y" /* yacc.c:1646  */
+  case 2740:
+#line 15247 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.action).code = W_BREAK;
 			(yyval.action).command = NULL;
 			(yyval.action).str = mm_strdup("break");
 		}
-#line 52429 "preproc.c" /* yacc.c:1646  */
+#line 52483 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2739:
-#line 15245 "preproc.y" /* yacc.c:1646  */
+  case 2741:
+#line 15253 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.action).code = W_DO;
 			(yyval.action).command = cat_str(4, (yyvsp[-3].str), mm_strdup("("), (yyvsp[-1].str), mm_strdup(")"));
 			(yyval.action).str = cat2_str(mm_strdup("call"), mm_strdup((yyval.action).command));
 		}
-#line 52439 "preproc.c" /* yacc.c:1646  */
+#line 52493 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2740:
-#line 15251 "preproc.y" /* yacc.c:1646  */
+  case 2742:
+#line 15259 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.action).code = W_DO;
 			(yyval.action).command = cat2_str((yyvsp[0].str), mm_strdup("()"));
 			(yyval.action).str = cat2_str(mm_strdup("call"), mm_strdup((yyval.action).command));
 		}
-#line 52449 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 2741:
-#line 15261 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52455 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 2742:
-#line 15262 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52461 "preproc.c" /* yacc.c:1646  */
+#line 52503 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2743:
-#line 15265 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("break"); }
-#line 52467 "preproc.c" /* yacc.c:1646  */
+#line 15269 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52509 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2744:
-#line 15266 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("call"); }
-#line 52473 "preproc.c" /* yacc.c:1646  */
+#line 15270 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52515 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2745:
-#line 15267 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("cardinality"); }
-#line 52479 "preproc.c" /* yacc.c:1646  */
+#line 15273 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("break"); }
+#line 52521 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2746:
-#line 15268 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("count"); }
-#line 52485 "preproc.c" /* yacc.c:1646  */
+#line 15274 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("call"); }
+#line 52527 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2747:
-#line 15269 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("datetime_interval_code"); }
-#line 52491 "preproc.c" /* yacc.c:1646  */
+#line 15275 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("cardinality"); }
+#line 52533 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2748:
-#line 15270 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("datetime_interval_precision"); }
-#line 52497 "preproc.c" /* yacc.c:1646  */
+#line 15276 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("count"); }
+#line 52539 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2749:
-#line 15271 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("found"); }
-#line 52503 "preproc.c" /* yacc.c:1646  */
+#line 15277 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("datetime_interval_code"); }
+#line 52545 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2750:
-#line 15272 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("go"); }
-#line 52509 "preproc.c" /* yacc.c:1646  */
+#line 15278 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("datetime_interval_precision"); }
+#line 52551 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2751:
-#line 15273 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("goto"); }
-#line 52515 "preproc.c" /* yacc.c:1646  */
+#line 15279 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("found"); }
+#line 52557 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2752:
-#line 15274 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("identified"); }
-#line 52521 "preproc.c" /* yacc.c:1646  */
+#line 15280 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("go"); }
+#line 52563 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2753:
-#line 15275 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("indicator"); }
-#line 52527 "preproc.c" /* yacc.c:1646  */
+#line 15281 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("goto"); }
+#line 52569 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2754:
-#line 15276 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("key_member"); }
-#line 52533 "preproc.c" /* yacc.c:1646  */
+#line 15282 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("identified"); }
+#line 52575 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2755:
-#line 15277 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("length"); }
-#line 52539 "preproc.c" /* yacc.c:1646  */
+#line 15283 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("indicator"); }
+#line 52581 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2756:
-#line 15278 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("nullable"); }
-#line 52545 "preproc.c" /* yacc.c:1646  */
+#line 15284 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("key_member"); }
+#line 52587 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2757:
-#line 15279 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("octet_length"); }
-#line 52551 "preproc.c" /* yacc.c:1646  */
+#line 15285 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("length"); }
+#line 52593 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2758:
-#line 15280 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("returned_length"); }
-#line 52557 "preproc.c" /* yacc.c:1646  */
+#line 15286 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("nullable"); }
+#line 52599 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2759:
-#line 15281 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("returned_octet_length"); }
-#line 52563 "preproc.c" /* yacc.c:1646  */
+#line 15287 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("octet_length"); }
+#line 52605 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2760:
-#line 15282 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("scale"); }
-#line 52569 "preproc.c" /* yacc.c:1646  */
+#line 15288 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("returned_length"); }
+#line 52611 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2761:
-#line 15283 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("section"); }
-#line 52575 "preproc.c" /* yacc.c:1646  */
+#line 15289 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("returned_octet_length"); }
+#line 52617 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2762:
-#line 15284 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("sqlerror"); }
-#line 52581 "preproc.c" /* yacc.c:1646  */
+#line 15290 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("scale"); }
+#line 52623 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2763:
-#line 15285 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("sqlprint"); }
-#line 52587 "preproc.c" /* yacc.c:1646  */
+#line 15291 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("section"); }
+#line 52629 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2764:
-#line 15286 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("sqlwarning"); }
-#line 52593 "preproc.c" /* yacc.c:1646  */
+#line 15292 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("sqlerror"); }
+#line 52635 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2765:
-#line 15287 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("stop"); }
-#line 52599 "preproc.c" /* yacc.c:1646  */
+#line 15293 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("sqlprint"); }
+#line 52641 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2766:
-#line 15290 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("connect"); }
-#line 52605 "preproc.c" /* yacc.c:1646  */
+#line 15294 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("sqlwarning"); }
+#line 52647 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2767:
-#line 15291 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("describe"); }
-#line 52611 "preproc.c" /* yacc.c:1646  */
+#line 15295 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("stop"); }
+#line 52653 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2768:
-#line 15292 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("disconnect"); }
-#line 52617 "preproc.c" /* yacc.c:1646  */
+#line 15298 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("connect"); }
+#line 52659 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2769:
-#line 15293 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("open"); }
-#line 52623 "preproc.c" /* yacc.c:1646  */
+#line 15299 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("describe"); }
+#line 52665 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2770:
-#line 15294 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("var"); }
-#line 52629 "preproc.c" /* yacc.c:1646  */
+#line 15300 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("disconnect"); }
+#line 52671 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2771:
-#line 15295 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("whenever"); }
-#line 52635 "preproc.c" /* yacc.c:1646  */
+#line 15301 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("open"); }
+#line 52677 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2772:
-#line 15299 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("bool"); }
-#line 52641 "preproc.c" /* yacc.c:1646  */
+#line 15302 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("var"); }
+#line 52683 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2773:
-#line 15300 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("long"); }
-#line 52647 "preproc.c" /* yacc.c:1646  */
+#line 15303 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("whenever"); }
+#line 52689 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2774:
-#line 15301 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("output"); }
-#line 52653 "preproc.c" /* yacc.c:1646  */
+#line 15307 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("bool"); }
+#line 52695 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2775:
-#line 15302 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("short"); }
-#line 52659 "preproc.c" /* yacc.c:1646  */
+#line 15308 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("long"); }
+#line 52701 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2776:
-#line 15303 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("struct"); }
-#line 52665 "preproc.c" /* yacc.c:1646  */
+#line 15309 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("output"); }
+#line 52707 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2777:
-#line 15304 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("signed"); }
-#line 52671 "preproc.c" /* yacc.c:1646  */
+#line 15310 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("short"); }
+#line 52713 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2778:
-#line 15305 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("unsigned"); }
-#line 52677 "preproc.c" /* yacc.c:1646  */
+#line 15311 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("struct"); }
+#line 52719 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2779:
-#line 15308 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52683 "preproc.c" /* yacc.c:1646  */
+#line 15312 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("signed"); }
+#line 52725 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2780:
-#line 15311 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52689 "preproc.c" /* yacc.c:1646  */
+#line 15313 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("unsigned"); }
+#line 52731 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2781:
-#line 15312 "preproc.y" /* yacc.c:1646  */
+#line 15316 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52695 "preproc.c" /* yacc.c:1646  */
+#line 52737 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2782:
-#line 15313 "preproc.y" /* yacc.c:1646  */
+#line 15319 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52701 "preproc.c" /* yacc.c:1646  */
+#line 52743 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2783:
-#line 15314 "preproc.y" /* yacc.c:1646  */
+#line 15320 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52707 "preproc.c" /* yacc.c:1646  */
+#line 52749 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2784:
-#line 15315 "preproc.y" /* yacc.c:1646  */
+#line 15321 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52713 "preproc.c" /* yacc.c:1646  */
+#line 52755 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2785:
-#line 15316 "preproc.y" /* yacc.c:1646  */
+#line 15322 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52719 "preproc.c" /* yacc.c:1646  */
+#line 52761 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2786:
-#line 15317 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("char"); }
-#line 52725 "preproc.c" /* yacc.c:1646  */
+#line 15323 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52767 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2787:
-#line 15318 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("values"); }
-#line 52731 "preproc.c" /* yacc.c:1646  */
+#line 15324 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52773 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2788:
-#line 15331 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52737 "preproc.c" /* yacc.c:1646  */
+#line 15325 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("char"); }
+#line 52779 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2789:
-#line 15332 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52743 "preproc.c" /* yacc.c:1646  */
+#line 15326 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("values"); }
+#line 52785 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2790:
-#line 15333 "preproc.y" /* yacc.c:1646  */
+#line 15339 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52749 "preproc.c" /* yacc.c:1646  */
+#line 52791 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2791:
-#line 15334 "preproc.y" /* yacc.c:1646  */
+#line 15340 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52755 "preproc.c" /* yacc.c:1646  */
+#line 52797 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2792:
-#line 15335 "preproc.y" /* yacc.c:1646  */
+#line 15341 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52761 "preproc.c" /* yacc.c:1646  */
+#line 52803 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2793:
-#line 15336 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("char"); }
-#line 52767 "preproc.c" /* yacc.c:1646  */
+#line 15342 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52809 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2794:
-#line 15337 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("values"); }
-#line 52773 "preproc.c" /* yacc.c:1646  */
+#line 15343 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52815 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2795:
-#line 15342 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52779 "preproc.c" /* yacc.c:1646  */
+#line 15344 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("char"); }
+#line 52821 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2796:
-#line 15343 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52785 "preproc.c" /* yacc.c:1646  */
+#line 15345 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("values"); }
+#line 52827 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2797:
-#line 15344 "preproc.y" /* yacc.c:1646  */
+#line 15350 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52791 "preproc.c" /* yacc.c:1646  */
+#line 52833 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2798:
-#line 15345 "preproc.y" /* yacc.c:1646  */
+#line 15351 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52797 "preproc.c" /* yacc.c:1646  */
+#line 52839 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2799:
-#line 15346 "preproc.y" /* yacc.c:1646  */
+#line 15352 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52803 "preproc.c" /* yacc.c:1646  */
+#line 52845 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2800:
-#line 15347 "preproc.y" /* yacc.c:1646  */
+#line 15353 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52809 "preproc.c" /* yacc.c:1646  */
+#line 52851 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2801:
-#line 15353 "preproc.y" /* yacc.c:1646  */
+#line 15354 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52815 "preproc.c" /* yacc.c:1646  */
+#line 52857 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2802:
-#line 15354 "preproc.y" /* yacc.c:1646  */
+#line 15355 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52821 "preproc.c" /* yacc.c:1646  */
+#line 52863 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2803:
-#line 15355 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("char"); }
-#line 52827 "preproc.c" /* yacc.c:1646  */
+#line 15361 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52869 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2804:
-#line 15356 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("current"); }
-#line 52833 "preproc.c" /* yacc.c:1646  */
+#line 15362 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52875 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2805:
-#line 15357 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("input"); }
-#line 52839 "preproc.c" /* yacc.c:1646  */
+#line 15363 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("char"); }
+#line 52881 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2806:
-#line 15358 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("int"); }
-#line 52845 "preproc.c" /* yacc.c:1646  */
+#line 15364 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("current"); }
+#line 52887 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2807:
-#line 15359 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("to"); }
-#line 52851 "preproc.c" /* yacc.c:1646  */
+#line 15365 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("input"); }
+#line 52893 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2808:
-#line 15360 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("union"); }
-#line 52857 "preproc.c" /* yacc.c:1646  */
+#line 15366 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("int"); }
+#line 52899 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2809:
-#line 15361 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("values"); }
-#line 52863 "preproc.c" /* yacc.c:1646  */
+#line 15367 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("to"); }
+#line 52905 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2810:
-#line 15362 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52869 "preproc.c" /* yacc.c:1646  */
+#line 15368 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("union"); }
+#line 52911 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2811:
-#line 15363 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52875 "preproc.c" /* yacc.c:1646  */
+#line 15369 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("values"); }
+#line 52917 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2812:
-#line 15366 "preproc.y" /* yacc.c:1646  */
+#line 15370 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52881 "preproc.c" /* yacc.c:1646  */
+#line 52923 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2813:
-#line 15367 "preproc.y" /* yacc.c:1646  */
+#line 15371 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52887 "preproc.c" /* yacc.c:1646  */
+#line 52929 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2814:
-#line 15368 "preproc.y" /* yacc.c:1646  */
+#line 15374 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52893 "preproc.c" /* yacc.c:1646  */
+#line 52935 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2815:
-#line 15369 "preproc.y" /* yacc.c:1646  */
+#line 15375 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52899 "preproc.c" /* yacc.c:1646  */
+#line 52941 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2816:
-#line 15370 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("connection"); }
-#line 52905 "preproc.c" /* yacc.c:1646  */
+#line 15376 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52947 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2817:
-#line 15373 "preproc.y" /* yacc.c:1646  */
+#line 15377 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52911 "preproc.c" /* yacc.c:1646  */
+#line 52953 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2818:
-#line 15374 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52917 "preproc.c" /* yacc.c:1646  */
+#line 15378 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("connection"); }
+#line 52959 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2819:
-#line 15375 "preproc.y" /* yacc.c:1646  */
+#line 15381 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52923 "preproc.c" /* yacc.c:1646  */
+#line 52965 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2820:
-#line 15376 "preproc.y" /* yacc.c:1646  */
+#line 15382 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 52929 "preproc.c" /* yacc.c:1646  */
+#line 52971 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2821:
-#line 15379 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("auto"); }
-#line 52935 "preproc.c" /* yacc.c:1646  */
+#line 15383 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52977 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2822:
-#line 15380 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("const"); }
-#line 52941 "preproc.c" /* yacc.c:1646  */
+#line 15384 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 52983 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2823:
-#line 15381 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("extern"); }
-#line 52947 "preproc.c" /* yacc.c:1646  */
+#line 15387 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("auto"); }
+#line 52989 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2824:
-#line 15382 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("register"); }
-#line 52953 "preproc.c" /* yacc.c:1646  */
+#line 15388 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("const"); }
+#line 52995 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2825:
-#line 15383 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("static"); }
-#line 52959 "preproc.c" /* yacc.c:1646  */
+#line 15389 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("extern"); }
+#line 53001 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2826:
-#line 15384 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("typedef"); }
-#line 52965 "preproc.c" /* yacc.c:1646  */
+#line 15390 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("register"); }
+#line 53007 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2827:
-#line 15385 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("volatile"); }
-#line 52971 "preproc.c" /* yacc.c:1646  */
+#line 15391 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("static"); }
+#line 53013 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2828:
-#line 15402 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52977 "preproc.c" /* yacc.c:1646  */
+#line 15392 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("typedef"); }
+#line 53019 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2829:
-#line 15403 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 52983 "preproc.c" /* yacc.c:1646  */
+#line 15393 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("volatile"); }
+#line 53025 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2830:
-#line 15404 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("connection"); }
-#line 52989 "preproc.c" /* yacc.c:1646  */
+#line 15410 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53031 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2831:
-#line 15407 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("day"); }
-#line 52995 "preproc.c" /* yacc.c:1646  */
+#line 15411 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53037 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2832:
-#line 15408 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("hour"); }
-#line 53001 "preproc.c" /* yacc.c:1646  */
+#line 15412 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("connection"); }
+#line 53043 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2833:
-#line 15409 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("minute"); }
-#line 53007 "preproc.c" /* yacc.c:1646  */
+#line 15415 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("day"); }
+#line 53049 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2834:
-#line 15410 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("month"); }
-#line 53013 "preproc.c" /* yacc.c:1646  */
+#line 15416 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("hour"); }
+#line 53055 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2835:
-#line 15411 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("second"); }
-#line 53019 "preproc.c" /* yacc.c:1646  */
+#line 15417 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("minute"); }
+#line 53061 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2836:
-#line 15412 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("year"); }
-#line 53025 "preproc.c" /* yacc.c:1646  */
+#line 15418 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("month"); }
+#line 53067 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2839:
+  case 2837:
 #line 15419 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("second"); }
+#line 53073 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 2838:
+#line 15420 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("year"); }
+#line 53079 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 2841:
+#line 15427 "preproc.y" /* yacc.c:1646  */
     {
 				reset_variables();
 				pacounter = 1;
 			}
-#line 53034 "preproc.c" /* yacc.c:1646  */
+#line 53088 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2840:
-#line 15425 "preproc.y" /* yacc.c:1646  */
+  case 2842:
+#line 15433 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 53040 "preproc.c" /* yacc.c:1646  */
+#line 53094 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2841:
-#line 15426 "preproc.y" /* yacc.c:1646  */
+  case 2843:
+#line 15434 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 53046 "preproc.c" /* yacc.c:1646  */
+#line 53100 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2842:
-#line 15430 "preproc.y" /* yacc.c:1646  */
+  case 2844:
+#line 15438 "preproc.y" /* yacc.c:1646  */
     { add_variable_to_head(&argsresult, find_variable((yyvsp[-1].str)), find_variable((yyvsp[0].str))); }
-#line 53052 "preproc.c" /* yacc.c:1646  */
+#line 53106 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2843:
-#line 15432 "preproc.y" /* yacc.c:1646  */
+  case 2845:
+#line 15440 "preproc.y" /* yacc.c:1646  */
     { add_variable_to_head(&argsresult, find_variable((yyvsp[0].str)), &no_indicator); }
-#line 53058 "preproc.c" /* yacc.c:1646  */
+#line 53112 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2844:
-#line 15437 "preproc.y" /* yacc.c:1646  */
+  case 2846:
+#line 15445 "preproc.y" /* yacc.c:1646  */
     {
 			if (find_variable((yyvsp[0].str))->type->type == ECPGt_array)
 				mmerror(PARSE_ERROR, ET_ERROR, "arrays of indicators are not allowed on input");
@@ -53066,11 +53120,11 @@
 			add_variable_to_head(&argsinsert, find_variable((yyvsp[-1].str)), find_variable((yyvsp[0].str)));
 			(yyval.str) = create_questionmarks((yyvsp[-1].str), false);
 		}
-#line 53070 "preproc.c" /* yacc.c:1646  */
+#line 53124 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2845:
-#line 15447 "preproc.y" /* yacc.c:1646  */
+  case 2847:
+#line 15455 "preproc.y" /* yacc.c:1646  */
     {
 			char *ptr = strstr((yyvsp[0].str), ".arr");
 
@@ -53079,38 +53133,38 @@
 			add_variable_to_head(&argsinsert, find_variable((yyvsp[0].str)), &no_indicator);
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 53083 "preproc.c" /* yacc.c:1646  */
+#line 53137 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2846:
-#line 15458 "preproc.y" /* yacc.c:1646  */
+  case 2848:
+#line 15466 "preproc.y" /* yacc.c:1646  */
     {
 			add_variable_to_head(&argsinsert, find_variable((yyvsp[0].str)), &no_indicator);
 			(yyval.str) = create_questionmarks((yyvsp[0].str), false);
 		}
-#line 53092 "preproc.c" /* yacc.c:1646  */
+#line 53146 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2847:
-#line 15464 "preproc.y" /* yacc.c:1646  */
+  case 2849:
+#line 15472 "preproc.y" /* yacc.c:1646  */
     { check_indicator((find_variable((yyvsp[0].str)))->type); (yyval.str) = (yyvsp[0].str); }
-#line 53098 "preproc.c" /* yacc.c:1646  */
+#line 53152 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2848:
-#line 15465 "preproc.y" /* yacc.c:1646  */
+  case 2850:
+#line 15473 "preproc.y" /* yacc.c:1646  */
     { check_indicator((find_variable((yyvsp[0].str)))->type); (yyval.str) = (yyvsp[0].str); }
-#line 53104 "preproc.c" /* yacc.c:1646  */
+#line 53158 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2849:
-#line 15466 "preproc.y" /* yacc.c:1646  */
+  case 2851:
+#line 15474 "preproc.y" /* yacc.c:1646  */
     { check_indicator((find_variable((yyvsp[0].str)))->type); (yyval.str) = (yyvsp[0].str); }
-#line 53110 "preproc.c" /* yacc.c:1646  */
+#line 53164 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2850:
-#line 15470 "preproc.y" /* yacc.c:1646  */
+  case 2852:
+#line 15478 "preproc.y" /* yacc.c:1646  */
     {
 			/* As long as multidimensional arrays are not implemented we have to check for those here */
 			char *ptr = (yyvsp[0].str);
@@ -53141,29 +53195,29 @@
 			}
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 53145 "preproc.c" /* yacc.c:1646  */
+#line 53199 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2851:
-#line 15502 "preproc.y" /* yacc.c:1646  */
+  case 2853:
+#line 15510 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make_name(); }
-#line 53151 "preproc.c" /* yacc.c:1646  */
+#line 53205 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2852:
-#line 15504 "preproc.y" /* yacc.c:1646  */
+  case 2854:
+#line 15512 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make_name(); }
-#line 53157 "preproc.c" /* yacc.c:1646  */
+#line 53211 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2853:
-#line 15506 "preproc.y" /* yacc.c:1646  */
+  case 2855:
+#line 15514 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make_name(); }
-#line 53163 "preproc.c" /* yacc.c:1646  */
+#line 53217 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2854:
-#line 15510 "preproc.y" /* yacc.c:1646  */
+  case 2856:
+#line 15518 "preproc.y" /* yacc.c:1646  */
     {
 			/* could have been input as '' or $$ */
 			(yyval.str) = (char *)mm_alloc(strlen((yyvsp[0].str)) + 3);
@@ -53173,11 +53227,11 @@
 			(yyval.str)[strlen((yyvsp[0].str))+2]='\0';
 			free((yyvsp[0].str));
 		}
-#line 53177 "preproc.c" /* yacc.c:1646  */
+#line 53231 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2855:
-#line 15520 "preproc.y" /* yacc.c:1646  */
+  case 2857:
+#line 15528 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.str) = (char *)mm_alloc(strlen((yyvsp[0].str)) + 4);
 			(yyval.str)[0]='E';
@@ -53187,11 +53241,11 @@
 			(yyval.str)[strlen((yyvsp[0].str))+3]='\0';
 			free((yyvsp[0].str));
 		}
-#line 53191 "preproc.c" /* yacc.c:1646  */
+#line 53245 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2856:
-#line 15530 "preproc.y" /* yacc.c:1646  */
+  case 2858:
+#line 15538 "preproc.y" /* yacc.c:1646  */
     {
 			(yyval.str) = (char *)mm_alloc(strlen((yyvsp[0].str)) + 4);
 			(yyval.str)[0]='N';
@@ -53201,615 +53255,615 @@
 			(yyval.str)[strlen((yyvsp[0].str))+3]='\0';
 			free((yyvsp[0].str));
 		}
-#line 53205 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 2857:
-#line 15539 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53211 "preproc.c" /* yacc.c:1646  */
-    break;
-
-  case 2858:
-#line 15540 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53217 "preproc.c" /* yacc.c:1646  */
+#line 53259 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2859:
-#line 15543 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = make_name(); }
-#line 53223 "preproc.c" /* yacc.c:1646  */
+#line 15547 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53265 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2860:
-#line 15545 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = make_name(); }
-#line 53229 "preproc.c" /* yacc.c:1646  */
+#line 15548 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53271 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2861:
-#line 15546 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\"")); }
-#line 53235 "preproc.c" /* yacc.c:1646  */
+#line 15551 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = make_name(); }
+#line 53277 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2862:
-#line 15547 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53241 "preproc.c" /* yacc.c:1646  */
+#line 15553 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = make_name(); }
+#line 53283 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2863:
-#line 15551 "preproc.y" /* yacc.c:1646  */
+#line 15554 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\"")); }
-#line 53247 "preproc.c" /* yacc.c:1646  */
+#line 53289 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2864:
-#line 15553 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = make3_str(mm_strdup("("), (yyvsp[0].str), mm_strdup(")")); }
-#line 53253 "preproc.c" /* yacc.c:1646  */
+#line 15555 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53295 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2865:
-#line 15560 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53259 "preproc.c" /* yacc.c:1646  */
+#line 15559 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\"")); }
+#line 53301 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2866:
 #line 15561 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("()"); }
-#line 53265 "preproc.c" /* yacc.c:1646  */
+    { (yyval.str) = make3_str(mm_strdup("("), (yyvsp[0].str), mm_strdup(")")); }
+#line 53307 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2867:
-#line 15563 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = cat_str(3, mm_strdup("("), (yyvsp[-1].str), mm_strdup(")")); }
-#line 53271 "preproc.c" /* yacc.c:1646  */
+#line 15568 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53313 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2868:
-#line 15566 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53277 "preproc.c" /* yacc.c:1646  */
+#line 15569 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("()"); }
+#line 53319 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2869:
-#line 15568 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].str)); }
-#line 53283 "preproc.c" /* yacc.c:1646  */
+#line 15571 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = cat_str(3, mm_strdup("("), (yyvsp[-1].str), mm_strdup(")")); }
+#line 53325 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2870:
-#line 15571 "preproc.y" /* yacc.c:1646  */
+#line 15574 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 53289 "preproc.c" /* yacc.c:1646  */
+#line 53331 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2871:
-#line 15572 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str)); }
-#line 53295 "preproc.c" /* yacc.c:1646  */
+#line 15576 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].str)); }
+#line 53337 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2872:
-#line 15575 "preproc.y" /* yacc.c:1646  */
+#line 15579 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 53301 "preproc.c" /* yacc.c:1646  */
+#line 53343 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2873:
-#line 15576 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = cat_str(3, mm_strdup("{"), (yyvsp[-1].str), mm_strdup("}")); }
-#line 53307 "preproc.c" /* yacc.c:1646  */
+#line 15580 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str)); }
+#line 53349 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2874:
-#line 15579 "preproc.y" /* yacc.c:1646  */
+#line 15583 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 53313 "preproc.c" /* yacc.c:1646  */
+#line 53355 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2875:
-#line 15580 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("("); }
-#line 53319 "preproc.c" /* yacc.c:1646  */
+#line 15584 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = cat_str(3, mm_strdup("{"), (yyvsp[-1].str), mm_strdup("}")); }
+#line 53361 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2876:
-#line 15581 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup(")"); }
-#line 53325 "preproc.c" /* yacc.c:1646  */
+#line 15587 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53367 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2877:
-#line 15582 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup(","); }
-#line 53331 "preproc.c" /* yacc.c:1646  */
+#line 15588 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("("); }
+#line 53373 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2878:
-#line 15583 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup(";"); }
-#line 53337 "preproc.c" /* yacc.c:1646  */
+#line 15589 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup(")"); }
+#line 53379 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2879:
-#line 15586 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53343 "preproc.c" /* yacc.c:1646  */
+#line 15590 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup(","); }
+#line 53385 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2880:
-#line 15587 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53349 "preproc.c" /* yacc.c:1646  */
+#line 15591 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup(";"); }
+#line 53391 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2881:
-#line 15588 "preproc.y" /* yacc.c:1646  */
+#line 15594 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 53355 "preproc.c" /* yacc.c:1646  */
+#line 53397 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2882:
-#line 15589 "preproc.y" /* yacc.c:1646  */
+#line 15595 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 53361 "preproc.c" /* yacc.c:1646  */
+#line 53403 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2883:
-#line 15590 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("*"); }
-#line 53367 "preproc.c" /* yacc.c:1646  */
+#line 15596 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53409 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2884:
-#line 15591 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("+"); }
-#line 53373 "preproc.c" /* yacc.c:1646  */
+#line 15597 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53415 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2885:
-#line 15592 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("-"); }
-#line 53379 "preproc.c" /* yacc.c:1646  */
+#line 15598 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("*"); }
+#line 53421 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2886:
-#line 15593 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("/"); }
-#line 53385 "preproc.c" /* yacc.c:1646  */
+#line 15599 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("+"); }
+#line 53427 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2887:
-#line 15594 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("%"); }
-#line 53391 "preproc.c" /* yacc.c:1646  */
+#line 15600 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("-"); }
+#line 53433 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2888:
-#line 15595 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("NULL"); }
-#line 53397 "preproc.c" /* yacc.c:1646  */
+#line 15601 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("/"); }
+#line 53439 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2889:
-#line 15596 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("+="); }
-#line 53403 "preproc.c" /* yacc.c:1646  */
+#line 15602 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("%"); }
+#line 53445 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2890:
-#line 15597 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("&&"); }
-#line 53409 "preproc.c" /* yacc.c:1646  */
+#line 15603 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("NULL"); }
+#line 53451 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2891:
-#line 15598 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = make_name(); }
-#line 53415 "preproc.c" /* yacc.c:1646  */
+#line 15604 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("+="); }
+#line 53457 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2892:
-#line 15599 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("auto"); }
-#line 53421 "preproc.c" /* yacc.c:1646  */
+#line 15605 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("&&"); }
+#line 53463 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2893:
-#line 15600 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("const"); }
-#line 53427 "preproc.c" /* yacc.c:1646  */
+#line 15606 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = make_name(); }
+#line 53469 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2894:
-#line 15601 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("--"); }
-#line 53433 "preproc.c" /* yacc.c:1646  */
+#line 15607 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("auto"); }
+#line 53475 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2895:
-#line 15602 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("/="); }
-#line 53439 "preproc.c" /* yacc.c:1646  */
+#line 15608 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("const"); }
+#line 53481 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2896:
-#line 15603 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup(".*"); }
-#line 53445 "preproc.c" /* yacc.c:1646  */
+#line 15609 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("--"); }
+#line 53487 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2897:
-#line 15604 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("=="); }
-#line 53451 "preproc.c" /* yacc.c:1646  */
+#line 15610 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("/="); }
+#line 53493 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2898:
-#line 15605 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("extern"); }
-#line 53457 "preproc.c" /* yacc.c:1646  */
+#line 15611 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup(".*"); }
+#line 53499 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2899:
-#line 15606 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("++"); }
-#line 53463 "preproc.c" /* yacc.c:1646  */
+#line 15612 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("=="); }
+#line 53505 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2900:
-#line 15607 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("<<"); }
-#line 53469 "preproc.c" /* yacc.c:1646  */
+#line 15613 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("extern"); }
+#line 53511 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2901:
-#line 15608 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("->"); }
-#line 53475 "preproc.c" /* yacc.c:1646  */
+#line 15614 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("++"); }
+#line 53517 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2902:
-#line 15609 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("->*"); }
-#line 53481 "preproc.c" /* yacc.c:1646  */
+#line 15615 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("<<"); }
+#line 53523 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2903:
-#line 15610 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("%="); }
-#line 53487 "preproc.c" /* yacc.c:1646  */
+#line 15616 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("->"); }
+#line 53529 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2904:
-#line 15611 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("*="); }
-#line 53493 "preproc.c" /* yacc.c:1646  */
+#line 15617 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("->*"); }
+#line 53535 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2905:
-#line 15612 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("!="); }
-#line 53499 "preproc.c" /* yacc.c:1646  */
+#line 15618 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("%="); }
+#line 53541 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2906:
-#line 15613 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("||"); }
-#line 53505 "preproc.c" /* yacc.c:1646  */
+#line 15619 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("*="); }
+#line 53547 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2907:
-#line 15614 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("register"); }
-#line 53511 "preproc.c" /* yacc.c:1646  */
+#line 15620 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("!="); }
+#line 53553 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2908:
-#line 15615 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup(">>"); }
-#line 53517 "preproc.c" /* yacc.c:1646  */
+#line 15621 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("||"); }
+#line 53559 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2909:
-#line 15616 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("static"); }
-#line 53523 "preproc.c" /* yacc.c:1646  */
+#line 15622 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("register"); }
+#line 53565 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2910:
-#line 15617 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("-="); }
-#line 53529 "preproc.c" /* yacc.c:1646  */
+#line 15623 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup(">>"); }
+#line 53571 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2911:
-#line 15618 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("typedef"); }
-#line 53535 "preproc.c" /* yacc.c:1646  */
+#line 15624 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("static"); }
+#line 53577 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2912:
-#line 15619 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("volatile"); }
-#line 53541 "preproc.c" /* yacc.c:1646  */
+#line 15625 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("-="); }
+#line 53583 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2913:
-#line 15620 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("bool"); }
-#line 53547 "preproc.c" /* yacc.c:1646  */
+#line 15626 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("typedef"); }
+#line 53589 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2914:
-#line 15621 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("enum"); }
-#line 53553 "preproc.c" /* yacc.c:1646  */
+#line 15627 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("volatile"); }
+#line 53595 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2915:
-#line 15622 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("hour"); }
-#line 53559 "preproc.c" /* yacc.c:1646  */
+#line 15628 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("bool"); }
+#line 53601 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2916:
-#line 15623 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("int"); }
-#line 53565 "preproc.c" /* yacc.c:1646  */
+#line 15629 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("enum"); }
+#line 53607 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2917:
-#line 15624 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("long"); }
-#line 53571 "preproc.c" /* yacc.c:1646  */
+#line 15630 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("hour"); }
+#line 53613 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2918:
-#line 15625 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("minute"); }
-#line 53577 "preproc.c" /* yacc.c:1646  */
+#line 15631 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("int"); }
+#line 53619 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2919:
-#line 15626 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("month"); }
-#line 53583 "preproc.c" /* yacc.c:1646  */
+#line 15632 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("long"); }
+#line 53625 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2920:
-#line 15627 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("second"); }
-#line 53589 "preproc.c" /* yacc.c:1646  */
+#line 15633 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("minute"); }
+#line 53631 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2921:
-#line 15628 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("short"); }
-#line 53595 "preproc.c" /* yacc.c:1646  */
+#line 15634 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("month"); }
+#line 53637 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2922:
-#line 15629 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("signed"); }
-#line 53601 "preproc.c" /* yacc.c:1646  */
+#line 15635 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("second"); }
+#line 53643 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2923:
-#line 15630 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("struct"); }
-#line 53607 "preproc.c" /* yacc.c:1646  */
+#line 15636 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("short"); }
+#line 53649 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2924:
-#line 15631 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("unsigned"); }
-#line 53613 "preproc.c" /* yacc.c:1646  */
+#line 15637 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("signed"); }
+#line 53655 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2925:
-#line 15632 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("year"); }
-#line 53619 "preproc.c" /* yacc.c:1646  */
+#line 15638 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("struct"); }
+#line 53661 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2926:
-#line 15633 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("char"); }
-#line 53625 "preproc.c" /* yacc.c:1646  */
+#line 15639 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("unsigned"); }
+#line 53667 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2927:
-#line 15634 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("float"); }
-#line 53631 "preproc.c" /* yacc.c:1646  */
+#line 15640 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("year"); }
+#line 53673 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2928:
-#line 15635 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("to"); }
-#line 53637 "preproc.c" /* yacc.c:1646  */
+#line 15641 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("char"); }
+#line 53679 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2929:
-#line 15636 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("union"); }
-#line 53643 "preproc.c" /* yacc.c:1646  */
+#line 15642 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("float"); }
+#line 53685 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2930:
-#line 15637 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("varchar"); }
-#line 53649 "preproc.c" /* yacc.c:1646  */
+#line 15643 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("to"); }
+#line 53691 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2931:
-#line 15638 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("["); }
-#line 53655 "preproc.c" /* yacc.c:1646  */
+#line 15644 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("union"); }
+#line 53697 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2932:
-#line 15639 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("]"); }
-#line 53661 "preproc.c" /* yacc.c:1646  */
+#line 15645 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("varchar"); }
+#line 53703 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2933:
-#line 15640 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("="); }
-#line 53667 "preproc.c" /* yacc.c:1646  */
+#line 15646 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("["); }
+#line 53709 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2934:
-#line 15641 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup(":"); }
-#line 53673 "preproc.c" /* yacc.c:1646  */
+#line 15647 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("]"); }
+#line 53715 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2935:
-#line 15644 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53679 "preproc.c" /* yacc.c:1646  */
+#line 15648 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("="); }
+#line 53721 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2936:
-#line 15645 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53685 "preproc.c" /* yacc.c:1646  */
+#line 15649 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup(":"); }
+#line 53727 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2937:
-#line 15646 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("all"); }
-#line 53691 "preproc.c" /* yacc.c:1646  */
+#line 15652 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53733 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2938:
-#line 15647 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = mm_strdup("all"); }
-#line 53697 "preproc.c" /* yacc.c:1646  */
+#line 15653 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53739 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2939:
-#line 15650 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53703 "preproc.c" /* yacc.c:1646  */
+#line 15654 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("all"); }
+#line 53745 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2940:
-#line 15651 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = cat_str(3, mm_strdup("("), (yyvsp[-1].str), mm_strdup(")")); }
-#line 53709 "preproc.c" /* yacc.c:1646  */
+#line 15655 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = mm_strdup("all"); }
+#line 53751 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2941:
-#line 15652 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("+"), (yyvsp[0].str)); }
-#line 53715 "preproc.c" /* yacc.c:1646  */
+#line 15658 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53757 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2942:
-#line 15653 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("-"), (yyvsp[0].str)); }
-#line 53721 "preproc.c" /* yacc.c:1646  */
+#line 15659 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = cat_str(3, mm_strdup("("), (yyvsp[-1].str), mm_strdup(")")); }
+#line 53763 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2943:
-#line 15654 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("*"), (yyvsp[0].str)); }
-#line 53727 "preproc.c" /* yacc.c:1646  */
+#line 15660 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("+"), (yyvsp[0].str)); }
+#line 53769 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2944:
-#line 15655 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("/"), (yyvsp[0].str)); }
-#line 53733 "preproc.c" /* yacc.c:1646  */
+#line 15661 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("-"), (yyvsp[0].str)); }
+#line 53775 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2945:
-#line 15656 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("%"), (yyvsp[0].str)); }
-#line 53739 "preproc.c" /* yacc.c:1646  */
+#line 15662 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("*"), (yyvsp[0].str)); }
+#line 53781 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2946:
-#line 15657 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53745 "preproc.c" /* yacc.c:1646  */
+#line 15663 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("/"), (yyvsp[0].str)); }
+#line 53787 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2947:
-#line 15658 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53751 "preproc.c" /* yacc.c:1646  */
+#line 15664 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("%"), (yyvsp[0].str)); }
+#line 53793 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2948:
-#line 15659 "preproc.y" /* yacc.c:1646  */
-    { if (pg_strcasecmp((yyvsp[-3].str), "sizeof") != 0)
-							mmerror(PARSE_ERROR, ET_ERROR, "operator not allowed in variable definition");
-						  else
-							(yyval.str) = cat_str(4, (yyvsp[-3].str), mm_strdup("("), (yyvsp[-1].type).type_str, mm_strdup(")"));
-						}
-#line 53761 "preproc.c" /* yacc.c:1646  */
+#line 15665 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53799 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2949:
 #line 15666 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = EMPTY; }
-#line 53767 "preproc.c" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53805 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2950:
 #line 15667 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = EMPTY; }
-#line 53773 "preproc.c" /* yacc.c:1646  */
+    { if (pg_strcasecmp((yyvsp[-3].str), "sizeof") != 0)
+							mmerror(PARSE_ERROR, ET_ERROR, "operator not allowed in variable definition");
+						  else
+							(yyval.str) = cat_str(4, (yyvsp[-3].str), mm_strdup("("), (yyvsp[-1].type).type_str, mm_strdup(")"));
+						}
+#line 53815 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2951:
-#line 15668 "preproc.y" /* yacc.c:1646  */
+#line 15674 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 53779 "preproc.c" /* yacc.c:1646  */
+#line 53821 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2952:
-#line 15669 "preproc.y" /* yacc.c:1646  */
+#line 15675 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 53785 "preproc.c" /* yacc.c:1646  */
+#line 53827 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2953:
-#line 15670 "preproc.y" /* yacc.c:1646  */
+#line 15676 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 53791 "preproc.c" /* yacc.c:1646  */
+#line 53833 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2954:
-#line 15673 "preproc.y" /* yacc.c:1646  */
+#line 15677 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 53797 "preproc.c" /* yacc.c:1646  */
+#line 53839 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2955:
-#line 15674 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53803 "preproc.c" /* yacc.c:1646  */
+#line 15678 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = EMPTY; }
+#line 53845 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2956:
-#line 15677 "preproc.y" /* yacc.c:1646  */
-    { (yyval.str) = (yyvsp[0].str); }
-#line 53809 "preproc.c" /* yacc.c:1646  */
+#line 15681 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = EMPTY; }
+#line 53851 "preproc.c" /* yacc.c:1646  */
     break;
 
   case 2957:
-#line 15679 "preproc.y" /* yacc.c:1646  */
+#line 15682 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53857 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 2958:
+#line 15685 "preproc.y" /* yacc.c:1646  */
+    { (yyval.str) = (yyvsp[0].str); }
+#line 53863 "preproc.c" /* yacc.c:1646  */
+    break;
+
+  case 2959:
+#line 15687 "preproc.y" /* yacc.c:1646  */
     {
 		struct variable *var;
 
@@ -53818,23 +53872,23 @@
 		add_variable_to_head(&argsresult, var, &no_indicator);
 		(yyval.str) = (yyvsp[0].str);
 	}
-#line 53822 "preproc.c" /* yacc.c:1646  */
+#line 53876 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2958:
-#line 15689 "preproc.y" /* yacc.c:1646  */
+  case 2960:
+#line 15697 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = EMPTY; }
-#line 53828 "preproc.c" /* yacc.c:1646  */
+#line 53882 "preproc.c" /* yacc.c:1646  */
     break;
 
-  case 2959:
-#line 15690 "preproc.y" /* yacc.c:1646  */
+  case 2961:
+#line 15698 "preproc.y" /* yacc.c:1646  */
     { (yyval.str) = (yyvsp[0].str); }
-#line 53834 "preproc.c" /* yacc.c:1646  */
+#line 53888 "preproc.c" /* yacc.c:1646  */
     break;
 
 
-#line 53838 "preproc.c" /* yacc.c:1646  */
+#line 53892 "preproc.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -54069,25 +54123,17 @@
 #endif
   return yyresult;
 }
-#line 15693 "preproc.y" /* yacc.c:1906  */
+#line 15701 "preproc.y" /* yacc.c:1906  */
 
 
 void base_yyerror(const char *error)
 {
 	/* translator: %s is typically the translation of "syntax error" */
 	mmerror(PARSE_ERROR, ET_ERROR, "%s at or near \"%s\"",
-			_(error), token_start ? token_start : yytext);
+			_(error), token_start ? token_start : base_yytext);
 }
 
 void parser_init(void)
 {
  /* This function is empty. It only exists for compatibility with the backend parser right now. */
 }
-
-/*
- * Must undefine base_yylex before including pgc.c, since we want it
- * to create the function base_yylex not filtered_base_yylex.
- */
-#undef base_yylex
-
-#include "pgc.c"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/preproc.y postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/preproc.y
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/preproc.y	2016-03-28 20:23:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/preproc.y	2017-08-07 21:34:39.000000000 +0000
@@ -73,7 +73,7 @@
 	/* localize the error message string */
 	error = _(error);
 
-	fprintf(stderr, "%s:%d: ", input_filename, yylineno);
+	fprintf(stderr, "%s:%d: ", input_filename, base_yylineno);
 
 	switch(type)
 	{
@@ -118,10 +118,10 @@
 	vmmerror(error_code, ET_ERROR, error, ap);
 	va_end(ap);
 
-	if (yyin)
-		fclose(yyin);
-	if (yyout)
-		fclose(yyout);
+	if (base_yyin)
+		fclose(base_yyin);
+	if (base_yyout)
+		fclose(base_yyout);
 
 	if (strcmp(output_filename, "-") != 0 && unlink(output_filename) != 0)
 		fprintf(stderr, _("could not remove output file \"%s\"\n"), output_filename);
@@ -196,7 +196,7 @@
 static char *
 make_name(void)
 {
-	return mm_strdup(yytext);
+	return mm_strdup(base_yytext);
 }
 
 static char *
@@ -208,7 +208,7 @@
 
 	/* In case we have a struct, we have to print as many "?" as there are attributes in the struct
 	 * An array is only allowed together with an element argument
-	 * This is essantially only used for inserts, but using a struct as input parameter is an error anywhere else
+	 * This is essentially only used for inserts, but using a struct as input parameter is an error anywhere else
 	 * so we don't have to worry here. */
 
 	if (p->type->type == ECPGt_struct || (array && p->type->type == ECPGt_array && p->type->u.element->type == ECPGt_struct))
@@ -1623,7 +1623,7 @@
 				if (connection)
 					mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in CLOSE DATABASE statement");
 
-				fprintf(yyout, "{ ECPGdisconnect(__LINE__, \"CURRENT\");");
+				fprintf(base_yyout, "{ ECPGdisconnect(__LINE__, \"CURRENT\");");
 				whenever_action(2);
 				free($1);
 				break;
@@ -1805,7 +1805,7 @@
 	{ output_statement($1, 1, ECPGst_prepnormal); }
 |  TransactionStmt
 	{
-		fprintf(yyout, "{ ECPGtrans(__LINE__, %s, \"%s\");", connection ? connection : "NULL", $1);
+		fprintf(base_yyout, "{ ECPGtrans(__LINE__, %s, \"%s\");", connection ? connection : "NULL", $1);
 		whenever_action(2);
 		free($1);
 	}
@@ -1827,7 +1827,7 @@
  { output_statement($1, 0, ECPGst_normal); }
 	| ECPGAllocateDescr
 	{
-		fprintf(yyout,"ECPGallocate_desc(__LINE__, %s);",$1);
+		fprintf(base_yyout,"ECPGallocate_desc(__LINE__, %s);",$1);
 		whenever_action(0);
 		free($1);
 	}
@@ -1836,7 +1836,7 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in CONNECT statement");
 
-		fprintf(yyout, "{ ECPGconnect(__LINE__, %d, %s, %d); ", compat, $1, autocommit);
+		fprintf(base_yyout, "{ ECPGconnect(__LINE__, %d, %s, %d); ", compat, $1, autocommit);
 		reset_variables();
 		whenever_action(2);
 		free($1);
@@ -1847,7 +1847,7 @@
 	}
 	| ECPGDeallocateDescr
 	{
-		fprintf(yyout,"ECPGdeallocate_desc(__LINE__, %s);",$1);
+		fprintf(base_yyout,"ECPGdeallocate_desc(__LINE__, %s);",$1);
 		whenever_action(0);
 		free($1);
 	}
@@ -1857,10 +1857,10 @@
 	}
 	| ECPGDescribe
 	{
-		fprintf(yyout, "{ ECPGdescribe(__LINE__, %d, %s,", compat, $1);
+		fprintf(base_yyout, "{ ECPGdescribe(__LINE__, %d, %s,", compat, $1);
 		dump_variables(argsresult, 1);
-		fputs("ECPGt_EORT);", yyout);
-		fprintf(yyout, "}");
+		fputs("ECPGt_EORT);", base_yyout);
+		fprintf(base_yyout, "}");
 		output_line_number();
 
 		free($1);
@@ -1870,7 +1870,7 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in DISCONNECT statement");
 
-		fprintf(yyout, "{ ECPGdisconnect(__LINE__, %s);",
+		fprintf(base_yyout, "{ ECPGdisconnect(__LINE__, %s);",
 				$1 ? $1 : "\"CURRENT\"");
 		whenever_action(2);
 		free($1);
@@ -1881,11 +1881,11 @@
 		const char *con = connection ? connection : "NULL";
 
 		if (strcmp($1, "all") == 0)
-			fprintf(yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
+			fprintf(base_yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
 		else if ($1[0] == ':')
-			fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, $1+1);
+			fprintf(base_yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, $1+1);
 		else
-			fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1);
+			fprintf(base_yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1);
 
 		whenever_action(2);
 		free($1);
@@ -1916,7 +1916,7 @@
 	}
 	| ECPGSetAutocommit
 	{
-		fprintf(yyout, "{ ECPGsetcommit(__LINE__, \"%s\", %s);", $1, connection ? connection : "NULL");
+		fprintf(base_yyout, "{ ECPGsetcommit(__LINE__, \"%s\", %s);", $1, connection ? connection : "NULL");
 		whenever_action(2);
 		free($1);
 	}
@@ -1925,7 +1925,7 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in SET CONNECTION statement");
 
-		fprintf(yyout, "{ ECPGsetconn(__LINE__, %s);", $1);
+		fprintf(base_yyout, "{ ECPGsetconn(__LINE__, %s);", $1);
 		whenever_action(2);
 		free($1);
 	}
@@ -1947,7 +1947,7 @@
 		if (connection)
 			mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in TYPE statement");
 
-		fprintf(yyout, "%s", $1);
+		fprintf(base_yyout, "%s", $1);
 		free($1);
 		output_line_number();
 	}
@@ -2131,9 +2131,13 @@
 
 
  AlterUserSetStmt:
- ALTER USER RoleSpec SetResetClause
+ ALTER USER RoleSpec opt_in_database SetResetClause
  { 
- $$ = cat_str(3,mm_strdup("alter user"),$3,$4);
+ $$ = cat_str(4,mm_strdup("alter user"),$3,$4,$5);
+}
+|  ALTER USER ALL opt_in_database SetResetClause
+ { 
+ $$ = cat_str(3,mm_strdup("alter user all"),$4,$5);
 }
 ;
 
@@ -4103,6 +4107,10 @@
  { 
  $$ = $1;
 }
+|  '+' ecpg_fconst
+ { 
+ $$ = cat_str(2,mm_strdup("+"),$2);
+}
 |  '-' ecpg_fconst
  { 
  $$ = cat_str(2,mm_strdup("-"),$2);
@@ -13795,14 +13803,14 @@
 				| ecpgstart stmt ';'
 				| ecpgstart ECPGVarDeclaration
 				{
-					fprintf(yyout, "%s", $2);
+					fprintf(base_yyout, "%s", $2);
 					free($2);
 					output_line_number();
 				}
 				| ECPGDeclaration
-				| c_thing               { fprintf(yyout, "%s", $1); free($1); }
-				| CPP_LINE              { fprintf(yyout, "%s", $1); free($1); }
-				| '{'                   { braces_open++; fputs("{", yyout); }
+				| c_thing               { fprintf(base_yyout, "%s", $1); free($1); }
+				| CPP_LINE              { fprintf(base_yyout, "%s", $1); free($1); }
+				| '{'                   { braces_open++; fputs("{", base_yyout); }
 				| '}'
 		{
 			remove_typedefs(braces_open);
@@ -13812,7 +13820,7 @@
 				free(current_function);
 				current_function = NULL;
 			}
-			fputs("}", yyout);
+			fputs("}", base_yyout);
 		}
 		;
 
@@ -14142,7 +14150,7 @@
 			  $$ = $3;
 			};
 /*
- * variable decalartion outside exec sql declare block
+ * variable declaration outside exec sql declare block
  */
 ECPGVarDeclaration: single_vt_declaration;
 
@@ -14167,10 +14175,10 @@
  * variable declaration inside exec sql declare block
  */
 ECPGDeclaration: sql_startdeclare
-		{ fputs("/* exec sql begin declare section */", yyout); }
+		{ fputs("/* exec sql begin declare section */", base_yyout); }
 		var_type_declarations sql_enddeclare
 		{
-			fprintf(yyout, "%s/* exec sql end declare section */", $3);
+			fprintf(base_yyout, "%s/* exec sql end declare section */", $3);
 			free($3);
 			output_line_number();
 		}
@@ -14204,7 +14212,7 @@
 	{
 		add_typedef($5, $6.index1, $6.index2, $3.type_enum, $3.type_dimension, $3.type_index, initializer, *$4 ? 1 : 0);
 
-		fprintf(yyout, "typedef %s %s %s %s;\n", $3.type_str, *$4 ? "*" : "", $5, $6.str);
+		fprintf(base_yyout, "typedef %s %s %s %s;\n", $3.type_str, *$4 ? "*" : "", $5, $6.str);
 		output_line_number();
 		$$ = mm_strdup("");
 	};
@@ -14494,7 +14502,7 @@
 			free(forward_name);
 			forward_name = NULL;
 
-			/* This is essantially a typedef but needs the keyword struct/union as well.
+			/* This is essentially a typedef but needs the keyword struct/union as well.
 			 * So we create the typedef for each struct definition with symbol */
 			for (ptr = types; ptr != NULL; ptr = ptr->next)
 			{
@@ -15062,7 +15070,7 @@
 		;
 
 /*
- * set/reset the automatic transaction mode, this needs a differnet handling
+ * set/reset the automatic transaction mode, this needs a different handling
  * as the other set commands
  */
 ECPGSetAutocommit:	SET SQL_AUTOCOMMIT '=' on_off	{ $$ = $4; }
@@ -15074,7 +15082,7 @@
 		;
 
 /*
- * set the actual connection, this needs a differnet handling as the other
+ * set the actual connection, this needs a different handling as the other
  * set commands
  */
 ECPGSetConnection:	SET CONNECTION TO connection_object { $$ = $4; }
@@ -15696,18 +15704,10 @@
 {
 	/* translator: %s is typically the translation of "syntax error" */
 	mmerror(PARSE_ERROR, ET_ERROR, "%s at or near \"%s\"",
-			_(error), token_start ? token_start : yytext);
+			_(error), token_start ? token_start : base_yytext);
 }
 
 void parser_init(void)
 {
  /* This function is empty. It only exists for compatibility with the backend parser right now. */
 }
-
-/*
- * Must undefine base_yylex before including pgc.c, since we want it
- * to create the function base_yylex not filtered_base_yylex.
- */
-#undef base_yylex
-
-#include "pgc.c"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/variable.c postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/variable.c
--- postgresql-9.5-9.5.2/src/interfaces/ecpg/preproc/variable.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/ecpg/preproc/variable.c	2017-08-07 21:13:41.000000000 +0000
@@ -452,7 +452,7 @@
 	dump_variables(list->next, mode);
 
 	/* Then the current element and its indicator */
-	ECPGdump_a_type(yyout, list->variable->name, list->variable->type, list->variable->brace_level,
+	ECPGdump_a_type(base_yyout, list->variable->name, list->variable->type, list->variable->brace_level,
 					list->indicator->name, list->indicator->type, list->indicator->brace_level,
 					NULL, NULL, str_zero, NULL, NULL);
 
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/bcc32.mak postgresql-9.5-9.5.8/src/interfaces/libpq/bcc32.mak
--- postgresql-9.5-9.5.2/src/interfaces/libpq/bcc32.mak	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/bcc32.mak	2017-08-07 21:13:41.000000000 +0000
@@ -8,7 +8,7 @@
 
 !IF "$(BCB)" == ""
 !MESSAGE You must edit bcc32.mak and define BCB at the top
-!ERROR misssing BCB
+!ERROR missing BCB
 !ENDIF
 
 !IF "$(__NMAKE__)" == ""
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/fe-auth.c postgresql-9.5-9.5.8/src/interfaces/libpq/fe-auth.c
--- postgresql-9.5-9.5.2/src/interfaces/libpq/fe-auth.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/fe-auth.c	2017-08-07 21:13:41.000000000 +0000
@@ -234,7 +234,9 @@
 {
 	char		sysmsg[256];
 
-	if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, r, 0,
+	if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS |
+					  FORMAT_MESSAGE_FROM_SYSTEM,
+					  NULL, r, 0,
 					  sysmsg, sizeof(sysmsg), NULL) == 0)
 		printfPQExpBuffer(&conn->errorMessage, "%s: SSPI error %x\n",
 						  mprefix, (unsigned int) r);
@@ -370,7 +372,12 @@
 	SECURITY_STATUS r;
 	TimeStamp	expire;
 
-	conn->sspictx = NULL;
+	if (conn->sspictx)
+	{
+		printfPQExpBuffer(&conn->errorMessage,
+					libpq_gettext("duplicate SSPI authentication request\n"));
+		return STATUS_ERROR;
+	}
 
 	/*
 	 * Retrieve credentials handle
@@ -701,6 +708,19 @@
 				return STATUS_ERROR;
 			break;
 
+			/*
+			 * SASL authentication was introduced in version 10. Older
+			 * versions recognize the request only to give a nicer error
+			 * message. We call it "SCRAM authentication" in the error, rather
+			 * than SASL, because SCRAM is more familiar to users, and it's
+			 * the only SASL authentication mechanism that has been
+			 * implemented as of this writing, anyway.
+			 */
+		case AUTH_REQ_SASL:
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("SCRAM authentication requires libpq version 10 or above\n"));
+			return STATUS_ERROR;
+
 		default:
 			printfPQExpBuffer(&conn->errorMessage,
 			libpq_gettext("authentication method %u not supported\n"), areq);
@@ -792,7 +812,7 @@
  * be sent in cleartext if it is encrypted on the client side.  This is
  * good because it ensures the cleartext password won't end up in logs,
  * pg_stat displays, etc.  We export the function so that clients won't
- * be dependent on low-level details like whether the enceyption is MD5
+ * be dependent on low-level details like whether the encryption is MD5
  * or something else.
  *
  * Arguments are the cleartext password, and the SQL name of the user it
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/fe-connect.c postgresql-9.5-9.5.8/src/interfaces/libpq/fe-connect.c
--- postgresql-9.5-9.5.2/src/interfaces/libpq/fe-connect.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/fe-connect.c	2017-08-07 21:13:41.000000000 +0000
@@ -100,6 +100,25 @@
 #define ERRCODE_CANNOT_CONNECT_NOW "57P03"
 
 /*
+ * Cope with the various platform-specific ways to spell TCP keepalive socket
+ * options.  This doesn't cover Windows, which as usual does its own thing.
+ */
+#if defined(TCP_KEEPIDLE)
+/* TCP_KEEPIDLE is the name of this option on Linux and *BSD */
+#define PG_TCP_KEEPALIVE_IDLE TCP_KEEPIDLE
+#define PG_TCP_KEEPALIVE_IDLE_STR "TCP_KEEPIDLE"
+#elif defined(TCP_KEEPALIVE_THRESHOLD)
+/* TCP_KEEPALIVE_THRESHOLD is the name of this option on Solaris >= 11 */
+#define PG_TCP_KEEPALIVE_IDLE TCP_KEEPALIVE_THRESHOLD
+#define PG_TCP_KEEPALIVE_IDLE_STR "TCP_KEEPALIVE_THRESHOLD"
+#elif defined(TCP_KEEPALIVE) && defined(__darwin__)
+/* TCP_KEEPALIVE is the name of this option on macOS */
+/* Caution: Solaris has this symbol but it means something different */
+#define PG_TCP_KEEPALIVE_IDLE TCP_KEEPALIVE
+#define PG_TCP_KEEPALIVE_IDLE_STR "TCP_KEEPALIVE"
+#endif
+
+/*
  * fall back options if they are not specified by arguments or defined
  * by environment variables
  */
@@ -401,15 +420,56 @@
 {
 	/* Drop any SSL state */
 	pqsecure_close(conn);
+
 	/* Close the socket itself */
 	if (conn->sock != PGINVALID_SOCKET)
 		closesocket(conn->sock);
 	conn->sock = PGINVALID_SOCKET;
+
 	/* Optionally discard any unread data */
 	if (flushInput)
 		conn->inStart = conn->inCursor = conn->inEnd = 0;
+
 	/* Always discard any unsent data */
 	conn->outCount = 0;
+
+	/* Free authentication state */
+#ifdef ENABLE_GSS
+	{
+		OM_uint32	min_s;
+
+		if (conn->gctx)
+			gss_delete_sec_context(&min_s, &conn->gctx, GSS_C_NO_BUFFER);
+		if (conn->gtarg_nam)
+			gss_release_name(&min_s, &conn->gtarg_nam);
+		if (conn->ginbuf.length)
+			gss_release_buffer(&min_s, &conn->ginbuf);
+		if (conn->goutbuf.length)
+			gss_release_buffer(&min_s, &conn->goutbuf);
+	}
+#endif
+#ifdef ENABLE_SSPI
+	if (conn->ginbuf.length)
+		free(conn->ginbuf.value);
+	conn->ginbuf.length = 0;
+	conn->ginbuf.value = NULL;
+	if (conn->sspitarget)
+		free(conn->sspitarget);
+	conn->sspitarget = NULL;
+	if (conn->sspicred)
+	{
+		FreeCredentialsHandle(conn->sspicred);
+		free(conn->sspicred);
+		conn->sspicred = NULL;
+	}
+	if (conn->sspictx)
+	{
+		DeleteSecurityContext(conn->sspictx);
+		free(conn->sspictx);
+		conn->sspictx = NULL;
+	}
+	conn->usesspi = 0;
+#endif
 }
 
 
@@ -1239,32 +1299,19 @@
 	if (idle < 0)
 		idle = 0;
 
-#ifdef TCP_KEEPIDLE
-	if (setsockopt(conn->sock, IPPROTO_TCP, TCP_KEEPIDLE,
+#ifdef PG_TCP_KEEPALIVE_IDLE
+	if (setsockopt(conn->sock, IPPROTO_TCP, PG_TCP_KEEPALIVE_IDLE,
 				   (char *) &idle, sizeof(idle)) < 0)
 	{
 		char		sebuf[256];
 
 		appendPQExpBuffer(&conn->errorMessage,
-					  libpq_gettext("setsockopt(TCP_KEEPIDLE) failed: %s\n"),
-						  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
-		return 0;
-	}
-#else
-#ifdef TCP_KEEPALIVE
-	/* Darwin uses TCP_KEEPALIVE rather than TCP_KEEPIDLE */
-	if (setsockopt(conn->sock, IPPROTO_TCP, TCP_KEEPALIVE,
-				   (char *) &idle, sizeof(idle)) < 0)
-	{
-		char		sebuf[256];
-
-		appendPQExpBuffer(&conn->errorMessage,
-					 libpq_gettext("setsockopt(TCP_KEEPALIVE) failed: %s\n"),
+						  libpq_gettext("setsockopt(%s) failed: %s\n"),
+						  PG_TCP_KEEPALIVE_IDLE_STR,
 						  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 		return 0;
 	}
 #endif
-#endif
 
 	return 1;
 }
@@ -1291,7 +1338,8 @@
 		char		sebuf[256];
 
 		appendPQExpBuffer(&conn->errorMessage,
-					 libpq_gettext("setsockopt(TCP_KEEPINTVL) failed: %s\n"),
+						  libpq_gettext("setsockopt(%s) failed: %s\n"),
+						  "TCP_KEEPINTVL",
 						  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 		return 0;
 	}
@@ -1323,7 +1371,8 @@
 		char		sebuf[256];
 
 		appendPQExpBuffer(&conn->errorMessage,
-					   libpq_gettext("setsockopt(TCP_KEEPCNT) failed: %s\n"),
+						  libpq_gettext("setsockopt(%s) failed: %s\n"),
+						  "TCP_KEEPCNT",
 						  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 		return 0;
 	}
@@ -1331,7 +1380,7 @@
 
 	return 1;
 }
-#else							/* Win32 */
+#else							/* WIN32 */
 #ifdef SIO_KEEPALIVE_VALS
 /*
  * Enable keepalives and set the keepalive values on Win32,
@@ -1789,7 +1838,8 @@
 											(char *) &on, sizeof(on)) < 0)
 						{
 							appendPQExpBuffer(&conn->errorMessage,
-											  libpq_gettext("setsockopt(SO_KEEPALIVE) failed: %s\n"),
+											  libpq_gettext("setsockopt(%s) failed: %s\n"),
+											  "SO_KEEPALIVE",
 							SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 							err = 1;
 						}
@@ -3006,41 +3056,6 @@
 	if (conn->lobjfuncs)
 		free(conn->lobjfuncs);
 	conn->lobjfuncs = NULL;
-#ifdef ENABLE_GSS
-	{
-		OM_uint32	min_s;
-
-		if (conn->gctx)
-			gss_delete_sec_context(&min_s, &conn->gctx, GSS_C_NO_BUFFER);
-		if (conn->gtarg_nam)
-			gss_release_name(&min_s, &conn->gtarg_nam);
-		if (conn->ginbuf.length)
-			gss_release_buffer(&min_s, &conn->ginbuf);
-		if (conn->goutbuf.length)
-			gss_release_buffer(&min_s, &conn->goutbuf);
-	}
-#endif
-#ifdef ENABLE_SSPI
-	if (conn->ginbuf.length)
-		free(conn->ginbuf.value);
-	conn->ginbuf.length = 0;
-	conn->ginbuf.value = NULL;
-	if (conn->sspitarget)
-		free(conn->sspitarget);
-	conn->sspitarget = NULL;
-	if (conn->sspicred)
-	{
-		FreeCredentialsHandle(conn->sspicred);
-		free(conn->sspicred);
-		conn->sspicred = NULL;
-	}
-	if (conn->sspictx)
-	{
-		DeleteSecurityContext(conn->sspictx);
-		free(conn->sspictx);
-		conn->sspictx = NULL;
-	}
-#endif
 }
 
 /*
@@ -4422,7 +4437,11 @@
  * of "dbname" keyword is a connection string (as indicated by
  * recognized_connection_string) then parse and process it, overriding any
  * previously processed conflicting keywords. Subsequent keywords will take
- * precedence, however.
+ * precedence, however. In-tree programs generally specify expand_dbname=true,
+ * so command-line arguments naming a database can use a connection string.
+ * Some code acquires arbitrary database names from known-literal sources like
+ * PQdb(), PQconninfoParse() and pg_database.datname.  When connecting to such
+ * a database, in-tree code first wraps the name in a connection string.
  */
 static PQconninfoOption *
 conninfo_array_parse(const char *const * keywords, const char *const * values,
@@ -4631,6 +4650,30 @@
 		}
 
 		/*
+		 * Interpret the deprecated PGREQUIRESSL environment variable.  Per
+		 * tradition, translate values starting with "1" to sslmode=require,
+		 * and ignore other values.  Given both PGREQUIRESSL=1 and PGSSLMODE,
+		 * PGSSLMODE takes precedence; the opposite was true before v9.3.
+		 */
+		if (strcmp(option->keyword, "sslmode") == 0)
+		{
+			const char *requiresslenv = getenv("PGREQUIRESSL");
+
+			if (requiresslenv != NULL && requiresslenv[0] == '1')
+			{
+				option->val = strdup("require");
+				if (!option->val)
+				{
+					if (errorMessage)
+						printfPQExpBuffer(errorMessage,
+										  libpq_gettext("out of memory\n"));
+					return false;
+				}
+				continue;
+			}
+		}
+
+		/*
 		 * No environment variable specified or the variable isn't set - try
 		 * compiled-in default
 		 */
@@ -5763,18 +5806,26 @@
 			break;
 
 		len = strlen(buf);
-		if (len == 0)
-			continue;
 
 		/* Remove trailing newline */
-		if (buf[len - 1] == '\n')
-			buf[len - 1] = 0;
+		if (len > 0 && buf[len - 1] == '\n')
+		{
+			buf[--len] = '\0';
+			/* Handle DOS-style line endings, too, even when not on Windows */
+			if (len > 0 && buf[len - 1] == '\r')
+				buf[--len] = '\0';
+		}
+
+		if (len == 0)
+			continue;
 
 		if ((t = pwdfMatchesString(t, hostname)) == NULL ||
 			(t = pwdfMatchesString(t, port)) == NULL ||
 			(t = pwdfMatchesString(t, dbname)) == NULL ||
 			(t = pwdfMatchesString(t, username)) == NULL)
 			continue;
+
+		/* Found a match. */
 		ret = strdup(t);
 		fclose(fp);
 
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/fe-exec.c postgresql-9.5-9.5.8/src/interfaces/libpq/fe-exec.c
--- postgresql-9.5-9.5.2/src/interfaces/libpq/fe-exec.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/fe-exec.c	2017-08-07 21:13:41.000000000 +0000
@@ -982,14 +982,31 @@
 
 		cnt = sscanf(value, "%d.%d.%d", &vmaj, &vmin, &vrev);
 
-		if (cnt < 2)
-			conn->sversion = 0; /* unknown */
-		else
+		if (cnt == 3)
 		{
-			if (cnt == 2)
-				vrev = 0;
+			/* old style, e.g. 9.6.1 */
 			conn->sversion = (100 * vmaj + vmin) * 100 + vrev;
 		}
+		else if (cnt == 2)
+		{
+			if (vmaj >= 10)
+			{
+				/* new style, e.g. 10.1 */
+				conn->sversion = 100 * 100 * vmaj + vmin;
+			}
+			else
+			{
+				/* old style without minor version, e.g. 9.6devel */
+				conn->sversion = (100 * vmaj + vmin) * 100;
+			}
+		}
+		else if (cnt == 1)
+		{
+			/* new style without minor version, e.g. 10devel */
+			conn->sversion = 100 * 100 * vmaj;
+		}
+		else
+			conn->sversion = 0; /* unknown */
 	}
 }
 
@@ -1367,8 +1384,7 @@
 	}
 
 	/* initialize async result-accumulation state */
-	conn->result = NULL;
-	conn->next_result = NULL;
+	pqClearAsyncResult(conn);
 
 	/* reset single-row processing mode */
 	conn->singleRowMode = false;
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/fe-print.c postgresql-9.5-9.5.8/src/interfaces/libpq/fe-print.c
--- postgresql-9.5-9.5.2/src/interfaces/libpq/fe-print.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/fe-print.c	2017-08-07 21:13:41.000000000 +0000
@@ -166,8 +166,9 @@
 			screen_size.ws_col = 80;
 #endif
 			pagerenv = getenv("PAGER");
+			/* if PAGER is unset, empty or all-white-space, don't use pager */
 			if (pagerenv != NULL &&
-				pagerenv[0] != '\0' &&
+				strspn(pagerenv, " \t\r\n") != strlen(pagerenv) &&
 				!po->html3 &&
 				((po->expanded &&
 				  nTups * (nFields + 1) >= screen_size.ws_row) ||
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/fe-secure-openssl.c postgresql-9.5-9.5.8/src/interfaces/libpq/fe-secure-openssl.c
--- postgresql-9.5-9.5.2/src/interfaces/libpq/fe-secure-openssl.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/fe-secure-openssl.c	2017-08-07 21:13:41.000000000 +0000
@@ -54,7 +54,7 @@
 #endif
 
 #include <openssl/ssl.h>
-#if (SSLEAY_VERSION_NUMBER >= 0x00907000L)
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
 #include <openssl/conf.h>
 #endif
 #ifdef USE_SSL_ENGINE
@@ -70,7 +70,7 @@
 static void destroy_ssl_system(void);
 static int	initialize_SSL(PGconn *conn);
 static PostgresPollingStatusType open_client_SSL(PGconn *);
-static char *SSLerrmessage(void);
+static char *SSLerrmessage(unsigned long ecode);
 static void SSLerrfree(char *buf);
 
 static int	my_sock_read(BIO *h, char *buf, int size);
@@ -82,12 +82,7 @@
 static bool pq_init_ssl_lib = true;
 static bool pq_init_crypto_lib = true;
 
-/*
- * SSL_context is currently shared between threads and therefore we need to be
- * careful to lock around any usage of it when providing thread safety.
- * ssl_config_mutex is the mutex that we use to protect it.
- */
-static SSL_CTX *SSL_context = NULL;
+static bool ssl_lib_initialized = false;
 
 #ifdef ENABLE_THREAD_SAFETY
 static long ssl_open_connections = 0;
@@ -135,44 +130,9 @@
 	/* First time through? */
 	if (conn->ssl == NULL)
 	{
-#ifdef ENABLE_THREAD_SAFETY
-		int			rc;
-#endif
-
-#ifdef ENABLE_THREAD_SAFETY
-		if ((rc = pthread_mutex_lock(&ssl_config_mutex)))
-		{
-			printfPQExpBuffer(&conn->errorMessage,
-			   libpq_gettext("could not acquire mutex: %s\n"), strerror(rc));
-			return PGRES_POLLING_FAILED;
-		}
-#endif
-		/* Create a connection-specific SSL object */
-		if (!(conn->ssl = SSL_new(SSL_context)) ||
-			!SSL_set_app_data(conn->ssl, conn) ||
-			!my_SSL_set_fd(conn, conn->sock))
-		{
-			char	   *err = SSLerrmessage();
-
-			printfPQExpBuffer(&conn->errorMessage,
-				   libpq_gettext("could not establish SSL connection: %s\n"),
-							  err);
-			SSLerrfree(err);
-#ifdef ENABLE_THREAD_SAFETY
-			pthread_mutex_unlock(&ssl_config_mutex);
-#endif
-			pgtls_close(conn);
-
-			return PGRES_POLLING_FAILED;
-		}
-		conn->ssl_in_use = true;
-
-#ifdef ENABLE_THREAD_SAFETY
-		pthread_mutex_unlock(&ssl_config_mutex);
-#endif
-
 		/*
-		 * Load client certificate, private key, and trusted CA certs.
+		 * Create a connection-specific SSL object, and load client certificate,
+		 * private key, and trusted CA certs.
 		 */
 		if (initialize_SSL(conn) != 0)
 		{
@@ -209,11 +169,32 @@
 	int			result_errno = 0;
 	char		sebuf[256];
 	int			err;
+	unsigned long ecode;
 
 rloop:
+	/*
+	 * Prepare to call SSL_get_error() by clearing thread's OpenSSL error
+	 * queue.  In general, the current thread's error queue must be empty
+	 * before the TLS/SSL I/O operation is attempted, or SSL_get_error()
+	 * will not work reliably.  Since the possibility exists that other
+	 * OpenSSL clients running in the same thread but not under our control
+	 * will fail to call ERR_get_error() themselves (after their own I/O
+	 * operations), pro-actively clear the per-thread error queue now.
+	 */
 	SOCK_ERRNO_SET(0);
+	ERR_clear_error();
 	n = SSL_read(conn->ssl, ptr, len);
 	err = SSL_get_error(conn->ssl, n);
+
+	/*
+	 * Other clients of OpenSSL may fail to call ERR_get_error(), but we
+	 * always do, so as to not cause problems for OpenSSL clients that
+	 * don't call ERR_clear_error() defensively.  Be sure that this
+	 * happens by calling now.  SSL_get_error() relies on the OpenSSL
+	 * per-thread error queue being intact, so this is the earliest
+	 * possible point ERR_get_error() may be called.
+	 */
+	ecode = (err != SSL_ERROR_NONE || n < 0) ? ERR_get_error() : 0;
 	switch (err)
 	{
 		case SSL_ERROR_NONE:
@@ -266,7 +247,7 @@
 			break;
 		case SSL_ERROR_SSL:
 			{
-				char	   *errm = SSLerrmessage();
+				char	   *errm = SSLerrmessage(ecode);
 
 				printfPQExpBuffer(&conn->errorMessage,
 								  libpq_gettext("SSL error: %s\n"), errm);
@@ -318,10 +299,13 @@
 	int			result_errno = 0;
 	char		sebuf[256];
 	int			err;
+	unsigned long ecode;
 
 	SOCK_ERRNO_SET(0);
+	ERR_clear_error();
 	n = SSL_write(conn->ssl, ptr, len);
 	err = SSL_get_error(conn->ssl, n);
+	ecode = (err != SSL_ERROR_NONE || n < 0) ? ERR_get_error() : 0;
 	switch (err)
 	{
 		case SSL_ERROR_NONE:
@@ -372,7 +356,7 @@
 			break;
 		case SSL_ERROR_SSL:
 			{
-				char	   *errm = SSLerrmessage();
+				char	   *errm = SSLerrmessage(ecode);
 
 				printfPQExpBuffer(&conn->errorMessage,
 								  libpq_gettext("SSL error: %s\n"), errm);
@@ -483,7 +467,6 @@
 	return 1;
 }
 
-
 /*
  * Check if a name from a server's certificate matches the peer's hostname.
  *
@@ -499,7 +482,7 @@
 {
 	int			len;
 	char	   *name;
-	unsigned char *namedata;
+	const unsigned char *namedata;
 	int			result;
 
 	*store_name = NULL;
@@ -518,7 +501,11 @@
 	 * There is no guarantee the string returned from the certificate is
 	 * NULL-terminated, so make a copy that is.
 	 */
+#ifdef HAVE_ASN1_STRING_GET0_DATA
+	namedata = ASN1_STRING_get0_data(name_entry);
+#else
 	namedata = ASN1_STRING_data(name_entry);
+#endif
 	len = ASN1_STRING_length(name_entry);
 	name = malloc(len + 1);
 	if (name == NULL)
@@ -706,9 +693,13 @@
 	return found_match && !got_error;
 }
 
-#ifdef ENABLE_THREAD_SAFETY
+#if defined(ENABLE_THREAD_SAFETY) && defined(HAVE_CRYPTO_LOCK)
 /*
- *	Callback functions for OpenSSL internal locking
+ *	Callback functions for OpenSSL internal locking.  (OpenSSL 1.1.0
+ *	does its own locking, and doesn't need these anymore.  The
+ *	CRYPTO_lock() function was removed in 1.1.0, when the callbacks
+ *	were made obsolete, so we assume that if CRYPTO_lock() exists,
+ *	the callbacks are still required.)
  */
 
 static unsigned long
@@ -738,11 +729,10 @@
 			PGTHREAD_ERROR("failed to unlock mutex");
 	}
 }
-#endif   /* ENABLE_THREAD_SAFETY */
+#endif   /* ENABLE_THREAD_SAFETY && HAVE_CRYPTO_LOCK */
 
 /*
- * Initialize SSL system, in particular creating the SSL_context object
- * that will be shared by all SSL-using connections in this process.
+ * Initialize SSL library.
  *
  * In threadsafe mode, this includes setting up libcrypto callback functions
  * to do thread locking.
@@ -777,6 +767,7 @@
 	if (pthread_mutex_lock(&ssl_config_mutex))
 		return -1;
 
+#ifdef HAVE_CRYPTO_LOCK
 	if (pq_init_crypto_lib)
 	{
 		/*
@@ -817,48 +808,24 @@
 				CRYPTO_set_locking_callback(pq_lockingcallback);
 		}
 	}
+#endif   /* HAVE_CRYPTO_LOCK */
 #endif   /* ENABLE_THREAD_SAFETY */
 
-	if (!SSL_context)
+	if (!ssl_lib_initialized)
 	{
 		if (pq_init_ssl_lib)
 		{
-#if SSLEAY_VERSION_NUMBER >= 0x00907000L
+#ifdef HAVE_OPENSSL_INIT_SSL
+			OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
+#else
+#if OPENSSL_VERSION_NUMBER >= 0x00907000L
 			OPENSSL_config(NULL);
 #endif
 			SSL_library_init();
 			SSL_load_error_strings();
-		}
-
-		/*
-		 * We use SSLv23_method() because it can negotiate use of the highest
-		 * mutually supported protocol version, while alternatives like
-		 * TLSv1_2_method() permit only one specific version.  Note that we
-		 * don't actually allow SSL v2 or v3, only TLS protocols (see below).
-		 */
-		SSL_context = SSL_CTX_new(SSLv23_method());
-		if (!SSL_context)
-		{
-			char	   *err = SSLerrmessage();
-
-			printfPQExpBuffer(&conn->errorMessage,
-						 libpq_gettext("could not create SSL context: %s\n"),
-							  err);
-			SSLerrfree(err);
-#ifdef ENABLE_THREAD_SAFETY
-			pthread_mutex_unlock(&ssl_config_mutex);
 #endif
-			return -1;
 		}
-
-		/* Disable old protocol versions */
-		SSL_CTX_set_options(SSL_context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-
-		/*
-		 * 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);
+		ssl_lib_initialized = true;
 	}
 
 #ifdef ENABLE_THREAD_SAFETY
@@ -876,12 +843,13 @@
  *	if we had any.)
  *
  *	Callbacks are only set when we're compiled in threadsafe mode, so
- *	we only need to remove them in this case.
+ *	we only need to remove them in this case. They are also not needed
+ *	with OpenSSL 1.1.0 anymore.
  */
 static void
 destroy_ssl_system(void)
 {
-#ifdef ENABLE_THREAD_SAFETY
+#if defined(ENABLE_THREAD_SAFETY) && defined(HAVE_CRYPTO_LOCK)
 	/* Mutex is created in initialize_ssl_system() */
 	if (pthread_mutex_lock(&ssl_config_mutex))
 		return;
@@ -901,9 +869,8 @@
 			CRYPTO_set_id_callback(NULL);
 
 		/*
-		 * We don't free the lock array or the SSL_context. If we get another
-		 * connection in this process, we will just re-use them with the
-		 * existing mutexes.
+		 * We don't free the lock array. If we get another connection in
+		 * this process, we will just re-use them with the existing mutexes.
 		 *
 		 * This means we leak a little memory on repeated load/unload of the
 		 * library.
@@ -915,26 +882,22 @@
 }
 
 /*
- *	Initialize (potentially) per-connection SSL data, namely the
- *	client certificate, private key, and trusted CA certs.
- *
- *	conn->ssl must already be created.  It receives the connection's client
- *	certificate and private key.  Note however that certificates also get
- *	loaded into the SSL_context object, and are therefore accessible to all
- *	connections in this process.  This should be OK as long as there aren't
- *	any hash collisions among the certs.
+ *	Create per-connection SSL object, and load the client certificate,
+ *	private key, and trusted CA certs.
  *
  *	Returns 0 if OK, -1 on failure (with a message in conn->errorMessage).
  */
 static int
 initialize_SSL(PGconn *conn)
 {
+	SSL_CTX	   *SSL_context;
 	struct stat buf;
 	char		homedir[MAXPGPATH];
 	char		fnbuf[MAXPGPATH];
 	char		sebuf[256];
 	bool		have_homedir;
 	bool		have_cert;
+	bool		have_rootcert;
 	EVP_PKEY   *pkey = NULL;
 
 	/*
@@ -950,6 +913,124 @@
 	else	/* won't need it */
 		have_homedir = false;
 
+	/*
+	 * Create a new SSL_CTX object.
+	 *
+	 * We used to share a single SSL_CTX between all connections, but it was
+	 * complicated if connections used different certificates. So now we create
+	 * a separate context for each connection, and accept the overhead.
+	 */
+	SSL_context = SSL_CTX_new(SSLv23_method());
+	if (!SSL_context)
+	{
+		char	   *err = SSLerrmessage(ERR_get_error());
+
+		printfPQExpBuffer(&conn->errorMessage,
+						 libpq_gettext("could not create SSL context: %s\n"),
+							  err);
+		SSLerrfree(err);
+		return -1;
+	}
+
+	/* Disable old protocol versions */
+	SSL_CTX_set_options(SSL_context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+
+	/*
+	 * 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);
+
+	/*
+	 * If the root cert file exists, load it so we can perform certificate
+	 * verification. If sslmode is "verify-full" we will also do further
+	 * verification after the connection has been completed.
+	 */
+	if (conn->sslrootcert && strlen(conn->sslrootcert) > 0)
+		strlcpy(fnbuf, conn->sslrootcert, sizeof(fnbuf));
+	else if (have_homedir)
+		snprintf(fnbuf, sizeof(fnbuf), "%s/%s", homedir, ROOT_CERT_FILE);
+	else
+		fnbuf[0] = '\0';
+
+	if (fnbuf[0] != '\0' &&
+		stat(fnbuf, &buf) == 0)
+	{
+		X509_STORE *cvstore;
+
+		if (SSL_CTX_load_verify_locations(SSL_context, fnbuf, NULL) != 1)
+		{
+			char	   *err = SSLerrmessage(ERR_get_error());
+
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("could not read root certificate file \"%s\": %s\n"),
+							  fnbuf, err);
+			SSLerrfree(err);
+			SSL_CTX_free(SSL_context);
+			return -1;
+		}
+
+		if ((cvstore = SSL_CTX_get_cert_store(SSL_context)) != NULL)
+		{
+			if (conn->sslcrl && strlen(conn->sslcrl) > 0)
+				strlcpy(fnbuf, conn->sslcrl, sizeof(fnbuf));
+			else if (have_homedir)
+				snprintf(fnbuf, sizeof(fnbuf), "%s/%s", homedir, ROOT_CRL_FILE);
+			else
+				fnbuf[0] = '\0';
+
+			/* Set the flags to check against the complete CRL chain */
+			if (fnbuf[0] != '\0' &&
+				X509_STORE_load_locations(cvstore, fnbuf, NULL) == 1)
+			{
+				/* OpenSSL 0.96 does not support X509_V_FLAG_CRL_CHECK */
+#ifdef X509_V_FLAG_CRL_CHECK
+				X509_STORE_set_flags(cvstore,
+						  X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
+#else
+				char	   *err = SSLerrmessage(ERR_get_error());
+
+				printfPQExpBuffer(&conn->errorMessage,
+								  libpq_gettext("SSL library does not support CRL certificates (file \"%s\")\n"),
+								  fnbuf);
+				SSLerrfree(err);
+				SSL_CTX_free(SSL_context);
+				return -1;
+#endif
+			}
+			/* if not found, silently ignore;  we do not require CRL */
+			ERR_clear_error();
+		}
+		have_rootcert = true;
+	}
+	else
+	{
+		/*
+		 * stat() failed; assume root file doesn't exist.  If sslmode is
+		 * verify-ca or verify-full, this is an error.  Otherwise, continue
+		 * without performing any server cert verification.
+		 */
+		if (conn->sslmode[0] == 'v')	/* "verify-ca" or "verify-full" */
+		{
+			/*
+			 * The only way to reach here with an empty filename is if
+			 * pqGetHomeDirectory failed.  That's a sufficiently unusual case
+			 * that it seems worth having a specialized error message for it.
+			 */
+			if (fnbuf[0] == '\0')
+				printfPQExpBuffer(&conn->errorMessage,
+								  libpq_gettext("could not get home directory to locate root certificate file\n"
+												"Either provide the file or change sslmode to disable server certificate verification.\n"));
+			else
+				printfPQExpBuffer(&conn->errorMessage,
+				libpq_gettext("root certificate file \"%s\" does not exist\n"
+							  "Either provide the file or change sslmode to disable server certificate verification.\n"), fnbuf);
+			SSL_CTX_free(SSL_context);
+			return -1;
+		}
+		have_rootcert = false;
+	}
+
 	/* Read the client certificate file */
 	if (conn->sslcert && strlen(conn->sslcert) > 0)
 		strlcpy(fnbuf, conn->sslcert, sizeof(fnbuf));
@@ -975,6 +1056,7 @@
 			printfPQExpBuffer(&conn->errorMessage,
 			   libpq_gettext("could not open certificate file \"%s\": %s\n"),
 							  fnbuf, pqStrerror(errno, sebuf, sizeof(sebuf)));
+			SSL_CTX_free(SSL_context);
 			return -1;
 		}
 		have_cert = false;
@@ -982,67 +1064,54 @@
 	else
 	{
 		/*
-		 * Cert file exists, so load it.  Since OpenSSL doesn't provide the
-		 * equivalent of "SSL_use_certificate_chain_file", we actually have to
-		 * load the file twice.  The first call loads any extra certs after
-		 * the first one into chain-cert storage associated with the
-		 * SSL_context.  The second call loads the first cert (only) into the
-		 * SSL object, where it will be correctly paired with the private key
-		 * we load below.  We do it this way so that each connection
-		 * understands which subject cert to present, in case different
-		 * sslcert settings are used for different connections in the same
-		 * process.
-		 *
-		 * NOTE: This function may also modify our SSL_context and therefore
-		 * we have to lock around this call and any places where we use the
-		 * SSL_context struct.
+		 * Cert file exists, so load it. Since OpenSSL doesn't provide the
+		 * equivalent of "SSL_use_certificate_chain_file", we have to load
+		 * it into the SSL context, rather than the SSL object.
 		 */
-#ifdef ENABLE_THREAD_SAFETY
-		int			rc;
-
-		if ((rc = pthread_mutex_lock(&ssl_config_mutex)))
-		{
-			printfPQExpBuffer(&conn->errorMessage,
-			   libpq_gettext("could not acquire mutex: %s\n"), strerror(rc));
-			return -1;
-		}
-#endif
 		if (SSL_CTX_use_certificate_chain_file(SSL_context, fnbuf) != 1)
 		{
-			char	   *err = SSLerrmessage();
-
-			printfPQExpBuffer(&conn->errorMessage,
-			   libpq_gettext("could not read certificate file \"%s\": %s\n"),
-							  fnbuf, err);
-			SSLerrfree(err);
-
-#ifdef ENABLE_THREAD_SAFETY
-			pthread_mutex_unlock(&ssl_config_mutex);
-#endif
-			return -1;
-		}
-
-		if (SSL_use_certificate_file(conn->ssl, fnbuf, SSL_FILETYPE_PEM) != 1)
-		{
-			char	   *err = SSLerrmessage();
+			char	   *err = SSLerrmessage(ERR_get_error());
 
 			printfPQExpBuffer(&conn->errorMessage,
 			   libpq_gettext("could not read certificate file \"%s\": %s\n"),
 							  fnbuf, err);
 			SSLerrfree(err);
-#ifdef ENABLE_THREAD_SAFETY
-			pthread_mutex_unlock(&ssl_config_mutex);
-#endif
+			SSL_CTX_free(SSL_context);
 			return -1;
 		}
 
 		/* need to load the associated private key, too */
 		have_cert = true;
+	}
 
-#ifdef ENABLE_THREAD_SAFETY
-		pthread_mutex_unlock(&ssl_config_mutex);
-#endif
+	/*
+	 * The SSL context is now loaded with the correct root and client certificates.
+	 * Create a connection-specific SSL object. The private key is loaded directly
+	 * into the SSL object. (We could load the private key into the context, too, but
+	 * we have done it this way historically, and it doesn't really matter.)
+	 */
+	if (!(conn->ssl = SSL_new(SSL_context)) ||
+		!SSL_set_app_data(conn->ssl, conn) ||
+		!my_SSL_set_fd(conn, conn->sock))
+	{
+		char	   *err = SSLerrmessage(ERR_get_error());
+
+		printfPQExpBuffer(&conn->errorMessage,
+				   libpq_gettext("could not establish SSL connection: %s\n"),
+						  err);
+		SSLerrfree(err);
+		SSL_CTX_free(SSL_context);
+		return -1;
 	}
+	conn->ssl_in_use = true;
+
+	/*
+	 * SSL contexts are reference counted by OpenSSL. We can free it as soon as we
+	 * have created the SSL object, and it will stick around for as long as it's
+	 * actually needed.
+	 */
+	SSL_CTX_free(SSL_context);
+	SSL_context = NULL;
 
 	/*
 	 * Read the SSL key. If a key is specified, treat it as an engine:key
@@ -1079,7 +1148,7 @@
 			conn->engine = ENGINE_by_id(engine_str);
 			if (conn->engine == NULL)
 			{
-				char	   *err = SSLerrmessage();
+				char	   *err = SSLerrmessage(ERR_get_error());
 
 				printfPQExpBuffer(&conn->errorMessage,
 					 libpq_gettext("could not load SSL engine \"%s\": %s\n"),
@@ -1091,7 +1160,7 @@
 
 			if (ENGINE_init(conn->engine) == 0)
 			{
-				char	   *err = SSLerrmessage();
+				char	   *err = SSLerrmessage(ERR_get_error());
 
 				printfPQExpBuffer(&conn->errorMessage,
 				libpq_gettext("could not initialize SSL engine \"%s\": %s\n"),
@@ -1107,7 +1176,7 @@
 										   NULL, NULL);
 			if (pkey == NULL)
 			{
-				char	   *err = SSLerrmessage();
+				char	   *err = SSLerrmessage(ERR_get_error());
 
 				printfPQExpBuffer(&conn->errorMessage,
 								  libpq_gettext("could not read private SSL key \"%s\" from engine \"%s\": %s\n"),
@@ -1121,7 +1190,7 @@
 			}
 			if (SSL_use_PrivateKey(conn->ssl, pkey) != 1)
 			{
-				char	   *err = SSLerrmessage();
+				char	   *err = SSLerrmessage(ERR_get_error());
 
 				printfPQExpBuffer(&conn->errorMessage,
 								  libpq_gettext("could not load private SSL key \"%s\" from engine \"%s\": %s\n"),
@@ -1177,7 +1246,7 @@
 
 		if (SSL_use_PrivateKey_file(conn->ssl, fnbuf, SSL_FILETYPE_PEM) != 1)
 		{
-			char	   *err = SSLerrmessage();
+			char	   *err = SSLerrmessage(ERR_get_error());
 
 			printfPQExpBuffer(&conn->errorMessage,
 			   libpq_gettext("could not load private key file \"%s\": %s\n"),
@@ -1191,7 +1260,7 @@
 	if (have_cert &&
 		SSL_check_private_key(conn->ssl) != 1)
 	{
-		char	   *err = SSLerrmessage();
+		char	   *err = SSLerrmessage(ERR_get_error());
 
 		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("certificate does not match private key file \"%s\": %s\n"),
@@ -1201,109 +1270,10 @@
 	}
 
 	/*
-	 * If the root cert file exists, load it so we can perform certificate
-	 * verification. If sslmode is "verify-full" we will also do further
-	 * verification after the connection has been completed.
+	 * If a root cert was loaded, also set our certificate verification callback.
 	 */
-	if (conn->sslrootcert && strlen(conn->sslrootcert) > 0)
-		strlcpy(fnbuf, conn->sslrootcert, sizeof(fnbuf));
-	else if (have_homedir)
-		snprintf(fnbuf, sizeof(fnbuf), "%s/%s", homedir, ROOT_CERT_FILE);
-	else
-		fnbuf[0] = '\0';
-
-	if (fnbuf[0] != '\0' &&
-		stat(fnbuf, &buf) == 0)
-	{
-		X509_STORE *cvstore;
-
-#ifdef ENABLE_THREAD_SAFETY
-		int			rc;
-
-		if ((rc = pthread_mutex_lock(&ssl_config_mutex)))
-		{
-			printfPQExpBuffer(&conn->errorMessage,
-			   libpq_gettext("could not acquire mutex: %s\n"), strerror(rc));
-			return -1;
-		}
-#endif
-		if (SSL_CTX_load_verify_locations(SSL_context, fnbuf, NULL) != 1)
-		{
-			char	   *err = SSLerrmessage();
-
-			printfPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("could not read root certificate file \"%s\": %s\n"),
-							  fnbuf, err);
-			SSLerrfree(err);
-#ifdef ENABLE_THREAD_SAFETY
-			pthread_mutex_unlock(&ssl_config_mutex);
-#endif
-			return -1;
-		}
-
-		if ((cvstore = SSL_CTX_get_cert_store(SSL_context)) != NULL)
-		{
-			if (conn->sslcrl && strlen(conn->sslcrl) > 0)
-				strlcpy(fnbuf, conn->sslcrl, sizeof(fnbuf));
-			else if (have_homedir)
-				snprintf(fnbuf, sizeof(fnbuf), "%s/%s", homedir, ROOT_CRL_FILE);
-			else
-				fnbuf[0] = '\0';
-
-			/* Set the flags to check against the complete CRL chain */
-			if (fnbuf[0] != '\0' &&
-				X509_STORE_load_locations(cvstore, fnbuf, NULL) == 1)
-			{
-				/* OpenSSL 0.96 does not support X509_V_FLAG_CRL_CHECK */
-#ifdef X509_V_FLAG_CRL_CHECK
-				X509_STORE_set_flags(cvstore,
-						  X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
-#else
-				char	   *err = SSLerrmessage();
-
-				printfPQExpBuffer(&conn->errorMessage,
-								  libpq_gettext("SSL library does not support CRL certificates (file \"%s\")\n"),
-								  fnbuf);
-				SSLerrfree(err);
-#ifdef ENABLE_THREAD_SAFETY
-				pthread_mutex_unlock(&ssl_config_mutex);
-#endif
-				return -1;
-#endif
-			}
-			/* if not found, silently ignore;  we do not require CRL */
-		}
-#ifdef ENABLE_THREAD_SAFETY
-		pthread_mutex_unlock(&ssl_config_mutex);
-#endif
-
+	if (have_rootcert)
 		SSL_set_verify(conn->ssl, SSL_VERIFY_PEER, verify_cb);
-	}
-	else
-	{
-		/*
-		 * stat() failed; assume root file doesn't exist.  If sslmode is
-		 * verify-ca or verify-full, this is an error.  Otherwise, continue
-		 * without performing any server cert verification.
-		 */
-		if (conn->sslmode[0] == 'v')	/* "verify-ca" or "verify-full" */
-		{
-			/*
-			 * The only way to reach here with an empty filename is if
-			 * pqGetHomeDirectory failed.  That's a sufficiently unusual case
-			 * that it seems worth having a specialized error message for it.
-			 */
-			if (fnbuf[0] == '\0')
-				printfPQExpBuffer(&conn->errorMessage,
-								  libpq_gettext("could not get home directory to locate root certificate file\n"
-												"Either provide the file or change sslmode to disable server certificate verification.\n"));
-			else
-				printfPQExpBuffer(&conn->errorMessage,
-				libpq_gettext("root certificate file \"%s\" does not exist\n"
-							  "Either provide the file or change sslmode to disable server certificate verification.\n"), fnbuf);
-			return -1;
-		}
-	}
 
 	/*
 	 * If the OpenSSL version used supports it (from 1.0.0 on) and the user
@@ -1327,11 +1297,14 @@
 {
 	int			r;
 
+	ERR_clear_error();
 	r = SSL_connect(conn->ssl);
 	if (r <= 0)
 	{
 		int			err = SSL_get_error(conn->ssl, r);
+		unsigned long ecode;
 
+		ecode = ERR_get_error();
 		switch (err)
 		{
 			case SSL_ERROR_WANT_READ:
@@ -1356,7 +1329,7 @@
 				}
 			case SSL_ERROR_SSL:
 				{
-					char	   *err = SSLerrmessage();
+					char	   *err = SSLerrmessage(ecode);
 
 					printfPQExpBuffer(&conn->errorMessage,
 									  libpq_gettext("SSL error: %s\n"),
@@ -1384,7 +1357,9 @@
 	conn->peer = SSL_get_peer_certificate(conn->ssl);
 	if (conn->peer == NULL)
 	{
-		char	   *err = SSLerrmessage();
+		char	   *err;
+
+		err = SSLerrmessage(ERR_get_error());
 
 		printfPQExpBuffer(&conn->errorMessage,
 					libpq_gettext("certificate could not be obtained: %s\n"),
@@ -1456,7 +1431,9 @@
 
 
 /*
- * Obtain reason string for last SSL error
+ * Obtain reason string for passed SSL errcode
+ *
+ * ERR_get_error() is used by caller to get errcode to pass here.
  *
  * Some caution is needed here since ERR_reason_error_string will
  * return NULL if it doesn't recognize the error code.  We don't
@@ -1467,28 +1444,26 @@
 #define SSL_ERR_LEN 128
 
 static char *
-SSLerrmessage(void)
+SSLerrmessage(unsigned long ecode)
 {
-	unsigned long errcode;
 	const char *errreason;
 	char	   *errbuf;
 
 	errbuf = malloc(SSL_ERR_LEN);
 	if (!errbuf)
 		return ssl_nomem;
-	errcode = ERR_get_error();
-	if (errcode == 0)
+	if (ecode == 0)
 	{
 		snprintf(errbuf, SSL_ERR_LEN, libpq_gettext("no SSL error reported"));
 		return errbuf;
 	}
-	errreason = ERR_reason_error_string(errcode);
+	errreason = ERR_reason_error_string(ecode);
 	if (errreason != NULL)
 	{
 		strlcpy(errbuf, errreason, SSL_ERR_LEN);
 		return errbuf;
 	}
-	snprintf(errbuf, SSL_ERR_LEN, libpq_gettext("SSL error code %lu"), errcode);
+	snprintf(errbuf, SSL_ERR_LEN, libpq_gettext("SSL error code %lu"), ecode);
 	return errbuf;
 }
 
@@ -1591,15 +1566,19 @@
  * to retry; do we need to adopt their logic for that?
  */
 
-static bool my_bio_initialized = false;
-static BIO_METHOD my_bio_methods;
+#ifndef HAVE_BIO_GET_DATA
+#define BIO_get_data(bio) (bio->ptr)
+#define BIO_set_data(bio, data) (bio->ptr = data)
+#endif
+
+static BIO_METHOD *my_bio_methods;
 
 static int
 my_sock_read(BIO *h, char *buf, int size)
 {
 	int			res;
 
-	res = pqsecure_raw_read((PGconn *) h->ptr, buf, size);
+	res = pqsecure_raw_read((PGconn *) BIO_get_data(h), buf, size);
 	BIO_clear_retry_flags(h);
 	if (res < 0)
 	{
@@ -1629,7 +1608,7 @@
 {
 	int			res;
 
-	res = pqsecure_raw_write((PGconn *) h->ptr, buf, size);
+	res = pqsecure_raw_write((PGconn *) BIO_get_data(h), buf, size);
 	BIO_clear_retry_flags(h);
 	if (res <= 0)
 	{
@@ -1657,14 +1636,45 @@
 static BIO_METHOD *
 my_BIO_s_socket(void)
 {
-	if (!my_bio_initialized)
+	if (!my_bio_methods)
 	{
-		memcpy(&my_bio_methods, BIO_s_socket(), sizeof(BIO_METHOD));
-		my_bio_methods.bread = my_sock_read;
-		my_bio_methods.bwrite = my_sock_write;
-		my_bio_initialized = true;
+		BIO_METHOD *biom = (BIO_METHOD *) BIO_s_socket();
+#ifdef HAVE_BIO_METH_NEW
+		int			my_bio_index;
+
+		my_bio_index = BIO_get_new_index();
+		if (my_bio_index == -1)
+			return NULL;
+		my_bio_methods = BIO_meth_new(my_bio_index, "libpq socket");
+		if (!my_bio_methods)
+			return NULL;
+		/*
+		 * As of this writing, these functions never fail. But check anyway, like
+		 * OpenSSL's own examples do.
+		 */
+		if (!BIO_meth_set_write(my_bio_methods, my_sock_write) ||
+			!BIO_meth_set_read(my_bio_methods, my_sock_read) ||
+			!BIO_meth_set_gets(my_bio_methods, BIO_meth_get_gets(biom)) ||
+			!BIO_meth_set_puts(my_bio_methods, BIO_meth_get_puts(biom)) ||
+			!BIO_meth_set_ctrl(my_bio_methods, BIO_meth_get_ctrl(biom)) ||
+			!BIO_meth_set_create(my_bio_methods, BIO_meth_get_create(biom)) ||
+			!BIO_meth_set_destroy(my_bio_methods, BIO_meth_get_destroy(biom)) ||
+			!BIO_meth_set_callback_ctrl(my_bio_methods, BIO_meth_get_callback_ctrl(biom)))
+		{
+			BIO_meth_free(my_bio_methods);
+			my_bio_methods = NULL;
+			return NULL;
+		}
+#else
+		my_bio_methods = malloc(sizeof(BIO_METHOD));
+		if (!my_bio_methods)
+			return NULL;
+		memcpy(my_bio_methods, biom, sizeof(BIO_METHOD));
+		my_bio_methods->bread = my_sock_read;
+		my_bio_methods->bwrite = my_sock_write;
+#endif
 	}
-	return &my_bio_methods;
+	return my_bio_methods;
 }
 
 /* This should exactly match openssl's SSL_set_fd except for using my BIO */
@@ -1672,16 +1682,22 @@
 my_SSL_set_fd(PGconn *conn, int fd)
 {
 	int			ret = 0;
-	BIO		   *bio = NULL;
+	BIO		   *bio;
+	BIO_METHOD *bio_method;
 
-	bio = BIO_new(my_BIO_s_socket());
+	bio_method = my_BIO_s_socket();
+	if (bio_method == NULL)
+	{
+		SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB);
+		goto err;
+	}
+	bio = BIO_new(bio_method);
 	if (bio == NULL)
 	{
 		SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB);
 		goto err;
 	}
-	/* Use 'ptr' to store pointer to PGconn */
-	bio->ptr = conn;
+	BIO_set_data(bio, conn);
 
 	SSL_set_bio(conn->ssl, bio, bio);
 	BIO_set_fd(bio, fd, BIO_NOCLOSE);
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/libpq-dist.rc postgresql-9.5-9.5.8/src/interfaces/libpq/libpq-dist.rc
--- postgresql-9.5-9.5.2/src/interfaces/libpq/libpq-dist.rc	2016-03-28 20:23:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/libpq-dist.rc	2017-08-07 21:34:39.000000000 +0000
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,5,2,16088
- PRODUCTVERSION 9,5,2,16088
+ FILEVERSION 9,5,8,17219
+ PRODUCTVERSION 9,5,8,17219
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0
  FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "PostgreSQL Access Library\0"
-            VALUE "FileVersion", "9.5.2\0"
+            VALUE "FileVersion", "9.5.8\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2015\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "9.5.2\0"
+            VALUE "ProductVersion", "9.5.8\0"
         END
     END
     BLOCK "VarFileInfo"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/libpq-int.h postgresql-9.5-9.5.8/src/interfaces/libpq/libpq-int.h
--- postgresql-9.5-9.5.2/src/interfaces/libpq/libpq-int.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/libpq-int.h	2017-08-07 21:13:41.000000000 +0000
@@ -77,7 +77,7 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-#if (SSLEAY_VERSION_NUMBER >= 0x00907000L) && !defined(OPENSSL_NO_ENGINE)
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L) && !defined(OPENSSL_NO_ENGINE)
 #define USE_SSL_ENGINE
 #endif
 #endif   /* USE_OPENSSL */
@@ -631,7 +631,7 @@
 #endif
 
 /*
- * The SSL implementatation provides these functions (fe-secure-openssl.c)
+ * The SSL implementation provides these functions (fe-secure-openssl.c)
  */
 extern void pgtls_init_library(bool do_ssl, int do_crypto);
 extern int	pgtls_init(PGconn *conn);
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/libpq.rc.in postgresql-9.5-9.5.8/src/interfaces/libpq/libpq.rc.in
--- postgresql-9.5-9.5.2/src/interfaces/libpq/libpq.rc.in	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/libpq.rc.in	2017-08-07 21:13:41.000000000 +0000
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,5,2,0
- PRODUCTVERSION 9,5,2,0
+ FILEVERSION 9,5,8,0
+ PRODUCTVERSION 9,5,8,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0
  FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "PostgreSQL Access Library\0"
-            VALUE "FileVersion", "9.5.2\0"
+            VALUE "FileVersion", "9.5.8\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2015\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "9.5.2\0"
+            VALUE "ProductVersion", "9.5.8\0"
         END
     END
     BLOCK "VarFileInfo"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/po/de.po postgresql-9.5-9.5.8/src/interfaces/libpq/po/de.po
--- postgresql-9.5-9.5.2/src/interfaces/libpq/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,14 +1,14 @@
 # German message translation file for libpq
-# Peter Eisentraut <peter_e@gmx.net>, 2001 - 2015.
+# Peter Eisentraut <peter_e@gmx.net>, 2001 - 2017.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-24 20:08+0000\n"
-"PO-Revision-Date: 2015-05-18 20:57-0400\n"
+"POT-Creation-Date: 2017-08-07 16:24+0000\n"
+"PO-Revision-Date: 2017-05-08 08:30-0400\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -20,7 +20,7 @@
 msgid "GSSAPI continuation error"
 msgstr "GSSAPI-Fortsetzungsfehler"
 
-#: fe-auth.c:177 fe-auth.c:410
+#: fe-auth.c:177 fe-auth.c:417
 msgid "host name must be specified\n"
 msgstr "Hostname muss angegeben werden\n"
 
@@ -28,14 +28,14 @@
 msgid "duplicate GSS authentication request\n"
 msgstr "doppelte GSSAPI-Authentifizierungsanfrage\n"
 
-#: fe-auth.c:197 fe-auth.c:307 fe-auth.c:381 fe-auth.c:416 fe-auth.c:512
-#: fe-auth.c:778 fe-connect.c:701 fe-connect.c:898 fe-connect.c:1074
-#: fe-connect.c:2085 fe-connect.c:3477 fe-connect.c:3729 fe-connect.c:3848
-#: fe-connect.c:4088 fe-connect.c:4168 fe-connect.c:4267 fe-connect.c:4519
-#: fe-connect.c:4548 fe-connect.c:4620 fe-connect.c:4638 fe-connect.c:4734
-#: fe-connect.c:5068 fe-connect.c:5218 fe-exec.c:3339 fe-exec.c:3504
-#: fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1571
-#: fe-secure-openssl.c:527 fe-secure-openssl.c:1069
+#: fe-auth.c:197 fe-auth.c:309 fe-auth.c:388 fe-auth.c:423 fe-auth.c:519
+#: fe-auth.c:798 fe-connect.c:767 fe-connect.c:964 fe-connect.c:1140
+#: fe-connect.c:2141 fe-connect.c:3498 fe-connect.c:3750 fe-connect.c:3869
+#: fe-connect.c:4109 fe-connect.c:4189 fe-connect.c:4288 fe-connect.c:4544
+#: fe-connect.c:4573 fe-connect.c:4645 fe-connect.c:4669 fe-connect.c:4687
+#: fe-connect.c:4783 fe-connect.c:5117 fe-connect.c:5267 fe-exec.c:3355
+#: fe-exec.c:3520 fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1613
+#: fe-secure-openssl.c:514 fe-secure-openssl.c:1138
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
 
@@ -43,74 +43,82 @@
 msgid "GSSAPI name import error"
 msgstr "GSSAPI-Namensimportfehler"
 
-#: fe-auth.c:296
+#: fe-auth.c:298
 msgid "SSPI continuation error"
 msgstr "SSPI-Fortsetzungsfehler"
 
-#: fe-auth.c:396
+#: fe-auth.c:378
+msgid "duplicate SSPI authentication request\n"
+msgstr "doppelte SSPI-Authentifizierungsanfrage\n"
+
+#: fe-auth.c:403
 msgid "could not acquire SSPI credentials"
 msgstr "konnte SSPI-Credentials nicht erhalten"
 
-#: fe-auth.c:487
+#: fe-auth.c:494
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "SCM_CRED-Authentifizierungsmethode nicht unterstützt\n"
 
-#: fe-auth.c:563
+#: fe-auth.c:570
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Authentifizierung mit Kerberos 4 nicht unterstützt\n"
 
-#: fe-auth.c:568
+#: fe-auth.c:575
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Authentifizierung mit Kerberos 5 nicht unterstützt\n"
 
-#: fe-auth.c:639
+#: fe-auth.c:646
 msgid "GSSAPI authentication not supported\n"
 msgstr "Authentifizierung mit GSSAPI nicht unterstützt\n"
 
-#: fe-auth.c:671
+#: fe-auth.c:678
 msgid "SSPI authentication not supported\n"
 msgstr "Authentifizierung mit SSPI nicht unterstützt\n"
 
-#: fe-auth.c:679
+#: fe-auth.c:686
 msgid "Crypt authentication not supported\n"
 msgstr "Authentifizierung mit Crypt nicht unterstützt\n"
 
-#: fe-auth.c:706
+#: fe-auth.c:721
+msgid "SCRAM authentication requires libpq version 10 or above\n"
+msgstr "SCRAM-Authentifizierung benötigt libpq Version 10 oder neuer\n"
+
+#: fe-auth.c:726
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "Authentifizierungsmethode %u nicht unterstützt\n"
 
-#: fe-auth.c:753
+#: fe-auth.c:773
 #, c-format
 msgid "user name lookup failure: error code %lu\n"
 msgstr "Fehler beim Nachschlagen des Benutzernamens: Fehlercode %lu\n"
 
-#: fe-auth.c:763 fe-connect.c:2012
+#: fe-auth.c:783 fe-connect.c:2068
 #, c-format
 msgid "could not look up local user ID %d: %s\n"
 msgstr "konnte lokale Benutzer-ID %d nicht nachschlagen: %s\n"
 
-#: fe-auth.c:768 fe-connect.c:2017
+#: fe-auth.c:788 fe-connect.c:2073
 #, c-format
 msgid "local user with ID %d does not exist\n"
 msgstr "lokaler Benutzer mit ID %d existiert nicht\n"
 
-#: fe-connect.c:840
+#: fe-connect.c:906
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
-msgstr "ungültiger sslmode-Wert: „%s“\n"
+msgstr "ungültiger sslmode-Wert: »%s«\n"
 
-#: fe-connect.c:861
+#: fe-connect.c:927
 #, 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"
+msgstr "sslmode-Wert »%s« ist ungültig, wenn SSL-Unterstützung nicht einkompiliert worden ist\n"
 
-#: fe-connect.c:1098
+#: fe-connect.c:1164
 #, 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"
+msgstr "konnte Socket nicht auf TCP »No Delay«-Modus umstellen: %s\n"
 
-#: fe-connect.c:1128
+#: fe-connect.c:1194
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -119,9 +127,9 @@
 msgstr ""
 "konnte nicht mit dem Server verbinden: %s\n"
 "\tLäuft der Server lokal und akzeptiert er Verbindungen\n"
-"\tauf dem Unix-Domain-Socket „%s“?\n"
+"\tauf dem Unix-Domain-Socket »%s«?\n"
 
-#: fe-connect.c:1183
+#: fe-connect.c:1249
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -129,10 +137,10 @@
 "\tTCP/IP connections on port %s?\n"
 msgstr ""
 "konnte nicht mit dem Server verbinden: %s\n"
-"\tLäuft der Server auf dem Host „%s“ (%s) und akzeptiert er\n"
+"\tLäuft der Server auf dem Host »%s« (%s) und akzeptiert er\n"
 "\tTCP/IP-Verbindungen auf Port %s?\n"
 
-#: fe-connect.c:1192
+#: fe-connect.c:1258
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -140,399 +148,379 @@
 "\tTCP/IP connections on port %s?\n"
 msgstr ""
 "konnte nicht mit dem Server verbinden: %s\n"
-"\tLäuft der Server auf dem Host „%s“ und akzeptiert er\n"
+"\tLäuft der Server auf dem Host »%s« und akzeptiert er\n"
 "\tTCP/IP-Verbindungen auf Port %s?\n"
 
-#: fe-connect.c:1243
-#, c-format
-msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPIDLE) fehlgeschlagen: %s\n"
-
-#: fe-connect.c:1256
-#, c-format
-msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPALIVE) fehlgeschlagen: %s\n"
-
-#: fe-connect.c:1288
-#, c-format
-msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPINTVL) fehlgeschlagen: %s\n"
-
-#: fe-connect.c:1320
+#: fe-connect.c:1309 fe-connect.c:1341 fe-connect.c:1374 fe-connect.c:1841
 #, c-format
-msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPCNT) fehlgeschlagen: %s\n"
+msgid "setsockopt(%s) failed: %s\n"
+msgstr "setsockopt(%s) fehlgeschlagen: %s\n"
 
-#: fe-connect.c:1368
+#: fe-connect.c:1423
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) fehlgeschlagen: %ui\n"
 
-#: fe-connect.c:1420
+#: fe-connect.c:1475
 #, c-format
 msgid "invalid port number: \"%s\"\n"
-msgstr "ungültige Portnummer: „%s“\n"
+msgstr "ungültige Portnummer: »%s«\n"
 
-#: fe-connect.c:1453
+#: fe-connect.c:1508
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)\n"
-msgstr "Unix-Domain-Socket-Pfad „%s“ ist zu lang (maximal %d Bytes)\n"
+msgstr "Unix-Domain-Socket-Pfad »%s« ist zu lang (maximal %d Bytes)\n"
 
-#: fe-connect.c:1472
+#: fe-connect.c:1527
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
-msgstr "konnte Hostnamen „%s“ nicht in Adresse übersetzen: %s\n"
+msgstr "konnte Hostnamen »%s« nicht in Adresse übersetzen: %s\n"
 
-#: fe-connect.c:1476
+#: fe-connect.c:1531
 #, 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"
+msgstr "konnte Unix-Domain-Socket-Pfad »%s« nicht in Adresse übersetzen: %s\n"
 
-#: fe-connect.c:1681
+#: fe-connect.c:1736
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "ungültiger Verbindungszustand, möglicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:1721
+#: fe-connect.c:1776
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "konnte Socket nicht erzeugen: %s\n"
 
-#: fe-connect.c:1743
+#: fe-connect.c:1798
 #, c-format
 msgid "could not set socket to nonblocking mode: %s\n"
 msgstr "konnte Socket nicht auf nicht-blockierenden Modus umstellen: %s\n"
 
-#: fe-connect.c:1754
+#: fe-connect.c:1809
 #, 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"
+msgstr "konnte Socket nicht auf »Close on exec«-Modus umstellen: %s\n"
 
-#: fe-connect.c:1773
+#: fe-connect.c:1828
 msgid "keepalives parameter must be an integer\n"
-msgstr "Parameter „keepalives“ muss eine ganze Zahl sein\n"
+msgstr "Parameter »keepalives« muss eine ganze Zahl sein\n"
 
-#: fe-connect.c:1786
-#, c-format
-msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
-msgstr "setsockopt(SO_KEEPALIVE) fehlgeschlagen: %s\n"
-
-#: fe-connect.c:1923
+#: fe-connect.c:1979
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "konnte Socket-Fehlerstatus nicht ermitteln: %s\n"
 
-#: fe-connect.c:1957
+#: fe-connect.c:2013
 #, 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:1999
+#: fe-connect.c:2055
 msgid "requirepeer parameter is not supported on this platform\n"
-msgstr "Parameter „requirepeer“ wird auf dieser Plattform nicht unterstützt\n"
+msgstr "Parameter »requirepeer« wird auf dieser Plattform nicht unterstützt\n"
 
-#: fe-connect.c:2002
+#: fe-connect.c:2058
 #, c-format
 msgid "could not get peer credentials: %s\n"
 msgstr "konnte Credentials von Gegenstelle nicht ermitteln: %s\n"
 
-#: fe-connect.c:2025
+#: fe-connect.c:2081
 #, 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"
+msgstr "requirepeer gibt »%s« an, aber tatsächlicher Benutzername der Gegenstelle ist »%s«\n"
 
-#: fe-connect.c:2059
+#: fe-connect.c:2115
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "konnte Paket zur SSL-Verhandlung nicht senden: %s\n"
 
-#: fe-connect.c:2098
+#: fe-connect.c:2154
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "konnte Startpaket nicht senden: %s\n"
 
-#: fe-connect.c:2168
+#: fe-connect.c:2224
 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:2194
+#: fe-connect.c:2250
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "ungültige Antwort auf SSL-Verhandlungspaket empfangen: %c\n"
 
-#: fe-connect.c:2269 fe-connect.c:2302
+#: fe-connect.c:2325 fe-connect.c:2358
 #, 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:2469
+#: fe-connect.c:2525
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "Speicher aufgebraucht beim Anlegen des GSSAPI-Puffers (%d)"
 
-#: fe-connect.c:2554
+#: fe-connect.c:2610
 msgid "unexpected message from server during startup\n"
 msgstr "unerwartete Nachricht vom Server beim Start\n"
 
-#: fe-connect.c:2648
+#: fe-connect.c:2704
 #, 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:3083 fe-connect.c:3143
+#: fe-connect.c:3104 fe-connect.c:3164
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
-msgstr "PGEventProc „%s“ während PGEVT_CONNRESET-Ereignis fehlgeschlagen\n"
+msgstr "PGEventProc »%s« während PGEVT_CONNRESET-Ereignis fehlgeschlagen\n"
 
-#: fe-connect.c:3490
+#: fe-connect.c:3511
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
-msgstr "ungültige LDAP-URL „%s“: Schema muss ldap:// sein\n"
+msgstr "ungültige LDAP-URL »%s«: Schema muss ldap:// sein\n"
 
-#: fe-connect.c:3505
+#: fe-connect.c:3526
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
-msgstr "ungültige LDAP-URL „%s“: Distinguished Name fehlt\n"
+msgstr "ungültige LDAP-URL »%s«: Distinguished Name fehlt\n"
 
-#: fe-connect.c:3516 fe-connect.c:3569
+#: fe-connect.c:3537 fe-connect.c:3590
 #, 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"
+msgstr "ungültige LDAP-URL »%s«: muss genau ein Attribut haben\n"
 
-#: fe-connect.c:3526 fe-connect.c:3583
+#: fe-connect.c:3547 fe-connect.c:3604
 #, 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"
+msgstr "ungültige LDAP-URL »%s«: Suchbereich fehlt (base/one/sub)\n"
 
-#: fe-connect.c:3537
+#: fe-connect.c:3558
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
-msgstr "ungültige LDAP-URL „%s“: kein Filter\n"
+msgstr "ungültige LDAP-URL »%s«: kein Filter\n"
 
-#: fe-connect.c:3558
+#: fe-connect.c:3579
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
-msgstr "ungültige LDAP-URL „%s“: ungültige Portnummer\n"
+msgstr "ungültige LDAP-URL »%s«: ungültige Portnummer\n"
 
-#: fe-connect.c:3592
+#: fe-connect.c:3613
 msgid "could not create LDAP structure\n"
 msgstr "konnte LDAP-Struktur nicht erzeugen\n"
 
-#: fe-connect.c:3668
+#: fe-connect.c:3689
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "Suche auf LDAP-Server fehlgeschlagen: %s\n"
 
-#: fe-connect.c:3679
+#: fe-connect.c:3700
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "LDAP-Suche ergab mehr als einen Eintrag\n"
 
-#: fe-connect.c:3680 fe-connect.c:3692
+#: fe-connect.c:3701 fe-connect.c:3713
 msgid "no entry found on LDAP lookup\n"
 msgstr "kein Eintrag gefunden bei LDAP-Suche\n"
 
-#: fe-connect.c:3703 fe-connect.c:3716
+#: fe-connect.c:3724 fe-connect.c:3737
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "Attribut hat keine Werte bei LDAP-Suche\n"
 
-#: fe-connect.c:3768 fe-connect.c:3787 fe-connect.c:4306
+#: fe-connect.c:3789 fe-connect.c:3808 fe-connect.c:4327
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
-msgstr "fehlendes „=“ nach „%s“ in der Zeichenkette der Verbindungsdaten\n"
+msgstr "fehlendes »=« nach »%s« in der Zeichenkette der Verbindungsdaten\n"
 
-#: fe-connect.c:3860 fe-connect.c:4487 fe-connect.c:5201
+#: fe-connect.c:3881 fe-connect.c:4512 fe-connect.c:5250
 #, c-format
 msgid "invalid connection option \"%s\"\n"
-msgstr "ungültige Verbindungsoption „%s“\n"
+msgstr "ungültige Verbindungsoption »%s«\n"
 
-#: fe-connect.c:3876 fe-connect.c:4355
+#: fe-connect.c:3897 fe-connect.c:4376
 msgid "unterminated quoted string in connection info string\n"
 msgstr "fehlendes schließendes Anführungszeichen (\") in der Zeichenkette der Verbindungsdaten\n"
 
-#: fe-connect.c:3916
+#: fe-connect.c:3937
 msgid "could not get home directory to locate service definition file"
 msgstr "konnte Home-Verzeichnis nicht ermitteln, um Servicedefinitionsdatei zu finden"
 
-#: fe-connect.c:3949
+#: fe-connect.c:3970
 #, c-format
 msgid "definition of service \"%s\" not found\n"
-msgstr "Definition von Service „%s“ nicht gefunden\n"
+msgstr "Definition von Service »%s« nicht gefunden\n"
 
-#: fe-connect.c:3972
+#: fe-connect.c:3993
 #, c-format
 msgid "service file \"%s\" not found\n"
-msgstr "Servicedatei „%s“ nicht gefunden\n"
+msgstr "Servicedatei »%s« nicht gefunden\n"
 
-#: fe-connect.c:3985
+#: fe-connect.c:4006
 #, c-format
 msgid "line %d too long in service file \"%s\"\n"
-msgstr "Zeile %d zu lang in Servicedatei „%s“\n"
+msgstr "Zeile %d zu lang in Servicedatei »%s«\n"
 
-#: fe-connect.c:4056 fe-connect.c:4100
+#: fe-connect.c:4077 fe-connect.c:4121
 #, c-format
 msgid "syntax error in service file \"%s\", line %d\n"
-msgstr "Syntaxfehler in Servicedatei „%s“, Zeile %d\n"
+msgstr "Syntaxfehler in Servicedatei »%s«, Zeile %d\n"
 
-#: fe-connect.c:4067
+#: fe-connect.c:4088
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d\n"
-msgstr "geschachtelte „service“-Definitionen werden nicht unterstützt in Servicedatei „%s“, Zeile %d\n"
+msgstr "geschachtelte »service«-Definitionen werden nicht unterstützt in Servicedatei »%s«, Zeile %d\n"
 
-#: fe-connect.c:4745
+#: fe-connect.c:4794
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\"\n"
-msgstr "ungültige URI an interne Parserroutine weitergeleitet: „%s“\n"
+msgstr "ungültige URI an interne Parserroutine weitergeleitet: »%s«\n"
 
-#: fe-connect.c:4815
+#: fe-connect.c:4864
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\"\n"
-msgstr "Ende der Eingabezeichenkette gefunden beim Suchen nach passendem „]“ in IPv6-Hostadresse in URI: „%s“\n"
+msgstr "Ende der Eingabezeichenkette gefunden beim Suchen nach passendem »]« in IPv6-Hostadresse in URI: »%s«\n"
 
-#: fe-connect.c:4822
+#: fe-connect.c:4871
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\"\n"
-msgstr "IPv6-Hostadresse darf nicht leer sein in URI: „%s“\n"
+msgstr "IPv6-Hostadresse darf nicht leer sein in URI: »%s«\n"
 
-#: fe-connect.c:4837
+#: fe-connect.c:4886
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\"\n"
-msgstr "unerwartetes Zeichen „%c“ an Position %d in URI („:“ oder „/“ erwartet): „%s“\n"
+msgstr "unerwartetes Zeichen »%c« an Position %d in URI (»:« oder »/« erwartet): »%s«\n"
 
-#: fe-connect.c:4951
+#: fe-connect.c:5000
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\"\n"
-msgstr "zusätzliches Schlüssel/Wert-Trennzeichen „=“ in URI-Query-Parameter: „%s“\n"
+msgstr "zusätzliches Schlüssel/Wert-Trennzeichen »=« in URI-Query-Parameter: »%s«\n"
 
-#: fe-connect.c:4971
+#: fe-connect.c:5020
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\"\n"
-msgstr "fehlendes Schlüssel/Wert-Trennzeichen „=“ in URI-Query-Parameter: „%s“\n"
+msgstr "fehlendes Schlüssel/Wert-Trennzeichen »=« in URI-Query-Parameter: »%s«\n"
 
-#: fe-connect.c:5022
+#: fe-connect.c:5071
 #, c-format
 msgid "invalid URI query parameter: \"%s\"\n"
-msgstr "ungültiger URI-Query-Parameter: „%s“\n"
+msgstr "ungültiger URI-Query-Parameter: »%s«\n"
 
-#: fe-connect.c:5096
+#: fe-connect.c:5145
 #, c-format
 msgid "invalid percent-encoded token: \"%s\"\n"
-msgstr "ungültiges Prozent-kodiertes Token: „%s“\n"
+msgstr "ungültiges Prozent-kodiertes Token: »%s«\n"
 
-#: fe-connect.c:5106
+#: fe-connect.c:5155
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\"\n"
-msgstr "verbotener Wert %%00 in Prozent-kodiertem Wert: „%s“\n"
+msgstr "verbotener Wert %%00 in Prozent-kodiertem Wert: »%s«\n"
 
-#: fe-connect.c:5437
+#: fe-connect.c:5486
 msgid "connection pointer is NULL\n"
 msgstr "Verbindung ist ein NULL-Zeiger\n"
 
-#: fe-connect.c:5723
+#: fe-connect.c:5772
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
-msgstr "WARNUNG: Passwortdatei „%s“ ist keine normale Datei\n"
+msgstr "WARNUNG: Passwortdatei »%s« ist keine normale Datei\n"
 
-#: fe-connect.c:5732
+#: fe-connect.c:5781
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
-msgstr "WARNUNG: Passwortdatei „%s“ erlaubt Lesezugriff für Gruppe oder Andere; Rechte sollten u=rw (0600) oder weniger sein\n"
+msgstr "WARNUNG: Passwortdatei »%s« erlaubt Lesezugriff für Gruppe oder Andere; Rechte sollten u=rw (0600) oder weniger sein\n"
 
-#: fe-connect.c:5838
+#: fe-connect.c:5895
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
-msgstr "Passwort wurde aus Datei „%s“ gelesen\n"
+msgstr "Passwort wurde aus Datei »%s« gelesen\n"
 
 #: fe-exec.c:825
 msgid "NOTICE"
 msgstr "HINWEIS"
 
-#: fe-exec.c:1122 fe-exec.c:1180 fe-exec.c:1226
+#: fe-exec.c:1139 fe-exec.c:1197 fe-exec.c:1243
 msgid "command string is a null pointer\n"
 msgstr "Befehlszeichenkette ist ein NULL-Zeiger\n"
 
-#: fe-exec.c:1186 fe-exec.c:1232 fe-exec.c:1327
+#: fe-exec.c:1203 fe-exec.c:1249 fe-exec.c:1344
 msgid "number of parameters must be between 0 and 65535\n"
 msgstr "Anzahl der Parameter muss zwischen 0 und 65535 sein\n"
 
-#: fe-exec.c:1220 fe-exec.c:1321
+#: fe-exec.c:1237 fe-exec.c:1338
 msgid "statement name is a null pointer\n"
 msgstr "Anweisungsname ist ein NULL-Zeiger\n"
 
-#: fe-exec.c:1240 fe-exec.c:1404 fe-exec.c:2119 fe-exec.c:2318
+#: fe-exec.c:1257 fe-exec.c:1420 fe-exec.c:2135 fe-exec.c:2334
 msgid "function requires at least protocol version 3.0\n"
 msgstr "Funktion erfordert mindestens Protokollversion 3.0\n"
 
-#: fe-exec.c:1358
+#: fe-exec.c:1375
 msgid "no connection to the server\n"
 msgstr "keine Verbindung mit dem Server\n"
 
-#: fe-exec.c:1365
+#: fe-exec.c:1382
 msgid "another command is already in progress\n"
 msgstr "ein anderer Befehl ist bereits in Ausführung\n"
 
-#: fe-exec.c:1480
+#: fe-exec.c:1496
 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:1749
+#: fe-exec.c:1765
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "unerwarteter asyncStatus: %d\n"
 
-#: fe-exec.c:1769
+#: fe-exec.c:1785
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
-msgstr "PGEventProc „%s“ während PGEVT_RESULTCREATE-Ereignis fehlgeschlagen\n"
+msgstr "PGEventProc »%s« während PGEVT_RESULTCREATE-Ereignis fehlgeschlagen\n"
 
-#: fe-exec.c:1929
+#: fe-exec.c:1945
 msgid "COPY terminated by new PQexec"
 msgstr "COPY von neuem PQexec beendet"
 
-#: fe-exec.c:1937
+#: fe-exec.c:1953
 msgid "COPY IN state must be terminated first\n"
 msgstr "COPY-IN-Zustand muss erst beendet werden\n"
 
-#: fe-exec.c:1957
+#: fe-exec.c:1973
 msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY-OUT-Zustand muss erst beendet werden\n"
 
-#: fe-exec.c:1965
+#: fe-exec.c:1981
 msgid "PQexec not allowed during COPY BOTH\n"
 msgstr "PQexec ist während COPY BOTH nicht erlaubt\n"
 
-#: fe-exec.c:2208 fe-exec.c:2275 fe-exec.c:2365 fe-protocol2.c:1352
-#: fe-protocol3.c:1710
+#: fe-exec.c:2224 fe-exec.c:2291 fe-exec.c:2381 fe-protocol2.c:1352
+#: fe-protocol3.c:1752
 msgid "no COPY in progress\n"
 msgstr "keine COPY in Ausführung\n"
 
-#: fe-exec.c:2555
+#: fe-exec.c:2571
 msgid "connection in wrong state\n"
 msgstr "Verbindung im falschen Zustand\n"
 
-#: fe-exec.c:2586
+#: fe-exec.c:2602
 msgid "invalid ExecStatusType code"
 msgstr "ungültiger ExecStatusType-Kode"
 
-#: fe-exec.c:2650 fe-exec.c:2673
+#: fe-exec.c:2666 fe-exec.c:2689
 #, 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:2666
+#: fe-exec.c:2682
 #, 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:2688
+#: fe-exec.c:2704
 #, 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:2998
+#: fe-exec.c:3014
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "konnte Ergebnis vom Server nicht interpretieren: %s"
 
-#: fe-exec.c:3237 fe-exec.c:3321
+#: fe-exec.c:3253 fe-exec.c:3337
 msgid "incomplete multibyte character\n"
 msgstr "unvollständiges Mehrbyte-Zeichen\n"
 
@@ -571,17 +559,17 @@
 #: fe-lobj.c:707 fe-lobj.c:816
 #, c-format
 msgid "could not open file \"%s\": %s\n"
-msgstr "konnte Datei „%s“ nicht öffnen: %s\n"
+msgstr "konnte Datei »%s« nicht öffnen: %s\n"
 
 #: fe-lobj.c:762
 #, c-format
 msgid "could not read from file \"%s\": %s\n"
-msgstr "konnte nicht aus Datei „%s“ nicht lesen: %s\n"
+msgstr "konnte nicht aus Datei »%s« nicht lesen: %s\n"
 
 #: fe-lobj.c:836 fe-lobj.c:860
 #, c-format
 msgid "could not write to file \"%s\": %s\n"
-msgstr "konnte nicht in Datei „%s“ schreiben: %s\n"
+msgstr "konnte nicht in Datei »%s« schreiben: %s\n"
 
 #: fe-lobj.c:947
 msgid "query to initialize large object functions did not return data\n"
@@ -629,11 +617,11 @@
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "Integer der Größe %lu wird von pqPutInt nicht unterstützt"
 
-#: fe-misc.c:642 fe-misc.c:842
+#: fe-misc.c:642 fe-misc.c:843
 msgid "connection not open\n"
 msgstr "Verbindung nicht offen\n"
 
-#: fe-misc.c:812 fe-secure-openssl.c:249 fe-secure-openssl.c:355
+#: fe-misc.c:812 fe-secure-openssl.c:230 fe-secure-openssl.c:339
 #: fe-secure.c:253 fe-secure.c:362
 msgid ""
 "server closed the connection unexpectedly\n"
@@ -644,15 +632,15 @@
 "\tDas heißt wahrscheinlich, dass der Server abnormal beendete\n"
 "\tbevor oder während die Anweisung bearbeitet wurde.\n"
 
-#: fe-misc.c:1015
+#: fe-misc.c:1016
 msgid "timeout expired\n"
 msgstr "Timeout abgelaufen\n"
 
-#: fe-misc.c:1060
+#: fe-misc.c:1061
 msgid "socket not open\n"
 msgstr "Socket ist nicht offen\n"
 
-#: fe-misc.c:1083
+#: fe-misc.c:1084
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() fehlgeschlagen: %s\n"
@@ -672,37 +660,37 @@
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "Nachricht vom Typ 0x%02x kam vom Server im Ruhezustand"
 
-#: fe-protocol2.c:503 fe-protocol2.c:538 fe-protocol2.c:1049
-#: fe-protocol3.c:209 fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:324
-#: fe-protocol3.c:995
+#: fe-protocol2.c:503 fe-protocol2.c:538 fe-protocol2.c:1049 fe-protocol3.c:209
+#: fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:333 fe-protocol3.c:720
+#: fe-protocol3.c:1037
 msgid "out of memory"
 msgstr "Speicher aufgebraucht"
 
 #: fe-protocol2.c:529
 #, c-format
 msgid "unexpected character %c following empty query response (\"I\" message)"
-msgstr "unerwartetes Zeichen %c kam nach Antwort auf leere Anfrage („I“-Nachricht)"
+msgstr "unerwartetes Zeichen %c kam nach Antwort auf leere Anfrage (»I«-Nachricht)"
 
 #: fe-protocol2.c:595
 #, c-format
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
-msgstr "Server sendete Daten („D“-Nachricht) ohne vorherige Zeilenbeschreibung („T“-Nachricht)"
+msgstr "Server sendete Daten (»D«-Nachricht) ohne vorherige Zeilenbeschreibung (»T«-Nachricht)"
 
 #: fe-protocol2.c:613
 #, c-format
 msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
-msgstr "Server sendete binäre Daten („B“-Nachricht) ohne vorherige Zeilenbeschreibung („T“-Nachricht)"
+msgstr "Server sendete binäre Daten (»B«-Nachricht) ohne vorherige Zeilenbeschreibung (»T«-Nachricht)"
 
-#: fe-protocol2.c:633 fe-protocol3.c:402
+#: fe-protocol2.c:633 fe-protocol3.c:412
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
-msgstr "unerwartete Antwort vom Server; erstes empfangenes Zeichen war „%c“\n"
+msgstr "unerwartete Antwort vom Server; erstes empfangenes Zeichen war »%c«\n"
 
-#: fe-protocol2.c:762 fe-protocol2.c:937 fe-protocol3.c:617 fe-protocol3.c:799
+#: fe-protocol2.c:762 fe-protocol2.c:937 fe-protocol3.c:627 fe-protocol3.c:841
 msgid "out of memory for query result"
 msgstr "Speicher für Anfrageergebnis aufgebraucht"
 
-#: fe-protocol2.c:1395 fe-protocol3.c:1779
+#: fe-protocol2.c:1395 fe-protocol3.c:1821
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -712,266 +700,261 @@
 msgid "lost synchronization with server, resetting connection"
 msgstr "Synchronisation mit Server verloren, Verbindung wird zurückgesetzt"
 
-#: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:1982
+#: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:2024
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "Protokollfehler: id=0x%x\n"
 
-#: fe-protocol3.c:358
+#: fe-protocol3.c:368
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
-msgstr "Server sendete Daten („D“-Nachricht) ohne vorherige Zeilenbeschreibung („T“-Nachricht)\n"
+msgstr "Server sendete Daten (»D«-Nachricht) ohne vorherige Zeilenbeschreibung (»T«-Nachricht)\n"
 
-#: fe-protocol3.c:423
+#: fe-protocol3.c:433
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
-msgstr "Nachrichteninhalt stimmt nicht mit Länge in Nachrichtentyp „%c“ überein\n"
+msgstr "Nachrichteninhalt stimmt nicht mit Länge in Nachrichtentyp »%c« überein\n"
 
-#: fe-protocol3.c:444
+#: fe-protocol3.c:454
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
-msgstr "Synchronisation mit Server verloren: Nachrichtentyp „%c“ empfangen, Länge %d\n"
+msgstr "Synchronisation mit Server verloren: Nachrichtentyp »%c« empfangen, Länge %d\n"
 
-#: fe-protocol3.c:495 fe-protocol3.c:535
+#: fe-protocol3.c:505 fe-protocol3.c:545
 msgid "insufficient data in \"T\" message"
-msgstr "nicht genug Daten in „T“-Nachricht"
+msgstr "nicht genug Daten in »T«-Nachricht"
 
-#: fe-protocol3.c:568
+#: fe-protocol3.c:578
 msgid "extraneous data in \"T\" message"
-msgstr "zu viele Daten in „T“-Nachricht"
+msgstr "zu viele Daten in »T«-Nachricht"
 
-#: fe-protocol3.c:707 fe-protocol3.c:739 fe-protocol3.c:757
+#: fe-protocol3.c:749 fe-protocol3.c:781 fe-protocol3.c:799
 msgid "insufficient data in \"D\" message"
-msgstr "nicht genug Daten in „D“-Nachricht"
+msgstr "nicht genug Daten in »D«-Nachricht"
 
-#: fe-protocol3.c:713
+#: fe-protocol3.c:755
 msgid "unexpected field count in \"D\" message"
-msgstr "unerwartete Feldzahl in „D“-Nachricht"
+msgstr "unerwartete Feldzahl in »D«-Nachricht"
 
-#: fe-protocol3.c:766
+#: fe-protocol3.c:808
 msgid "extraneous data in \"D\" message"
-msgstr "zu viele Daten in „D“-Nachricht"
+msgstr "zu viele Daten in »D«-Nachricht"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:898 fe-protocol3.c:917
+#: fe-protocol3.c:940 fe-protocol3.c:959
 #, c-format
 msgid " at character %s"
 msgstr " bei Zeichen %s"
 
-#: fe-protocol3.c:930
+#: fe-protocol3.c:972
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETAIL:  %s\n"
 
-#: fe-protocol3.c:933
+#: fe-protocol3.c:975
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "TIP:  %s\n"
 
-#: fe-protocol3.c:936
+#: fe-protocol3.c:978
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "ANFRAGE:  %s\n"
 
-#: fe-protocol3.c:939
+#: fe-protocol3.c:981
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "KONTEXT:  %s\n"
 
-#: fe-protocol3.c:946
+#: fe-protocol3.c:988
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "SCHEMANAME:  %s\n"
 
-#: fe-protocol3.c:950
+#: fe-protocol3.c:992
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "TABELLENNAME:  %s\n"
 
-#: fe-protocol3.c:954
+#: fe-protocol3.c:996
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "SPALTENNAME:  %s\n"
 
-#: fe-protocol3.c:958
+#: fe-protocol3.c:1000
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "DATENTYPNAME:  %s\n"
 
-#: fe-protocol3.c:962
+#: fe-protocol3.c:1004
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "CONSTRAINT-NAME:  %s\n"
 
-#: fe-protocol3.c:974
+#: fe-protocol3.c:1016
 msgid "LOCATION:  "
 msgstr "ORT:  "
 
-#: fe-protocol3.c:976
+#: fe-protocol3.c:1018
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:978
+#: fe-protocol3.c:1020
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1209
+#: fe-protocol3.c:1251
 #, c-format
 msgid "LINE %d: "
 msgstr "ZEILE %d: "
 
-#: fe-protocol3.c:1604
+#: fe-protocol3.c:1646
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: Text COPY OUT nicht ausgeführt\n"
 
-#: fe-secure-openssl.c:146 fe-secure-openssl.c:1006 fe-secure-openssl.c:1226
-#, c-format
-msgid "could not acquire mutex: %s\n"
-msgstr "konnte Mutex nicht sperren: %s\n"
-
-#: fe-secure-openssl.c:158
-#, c-format
-msgid "could not establish SSL connection: %s\n"
-msgstr "konnte SSL-Verbindung nicht aufbauen: %s\n"
-
-#: fe-secure-openssl.c:254 fe-secure-openssl.c:360 fe-secure-openssl.c:1349
+#: fe-secure-openssl.c:235 fe-secure-openssl.c:344 fe-secure-openssl.c:1322
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL-SYSCALL-Fehler: %s\n"
 
-#: fe-secure-openssl.c:261 fe-secure-openssl.c:367 fe-secure-openssl.c:1353
+#: fe-secure-openssl.c:242 fe-secure-openssl.c:351 fe-secure-openssl.c:1326
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL-SYSCALL-Fehler: Dateiende entdeckt\n"
 
-#: fe-secure-openssl.c:272 fe-secure-openssl.c:378 fe-secure-openssl.c:1362
+#: fe-secure-openssl.c:253 fe-secure-openssl.c:362 fe-secure-openssl.c:1335
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL-Fehler: %s\n"
 
-#: fe-secure-openssl.c:287 fe-secure-openssl.c:393
+#: fe-secure-openssl.c:268 fe-secure-openssl.c:377
 msgid "SSL connection has been closed unexpectedly\n"
 msgstr "SSL-Verbindung wurde unerwartet geschlossen\n"
 
-#: fe-secure-openssl.c:293 fe-secure-openssl.c:399 fe-secure-openssl.c:1371
+#: fe-secure-openssl.c:274 fe-secure-openssl.c:383 fe-secure-openssl.c:1344
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "unbekannter SSL-Fehlercode: %d\n"
 
-#: fe-secure-openssl.c:511
+#: fe-secure-openssl.c:494
 msgid "SSL certificate's name entry is missing\n"
 msgstr "Namenseintrag fehlt im SSL-Zertifikat\n"
 
-#: fe-secure-openssl.c:541
+#: fe-secure-openssl.c:528
 msgid "SSL certificate's name contains embedded null\n"
 msgstr "Name im SSL-Zertifikat enthält Null-Byte\n"
 
-#: fe-secure-openssl.c:592
+#: fe-secure-openssl.c:579
 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-openssl.c:692
+#: fe-secure-openssl.c:679
 #, c-format
 msgid "server certificate for \"%s\" does not match host name \"%s\"\n"
-msgstr "Server-Zertifikat für „%s“ stimmt nicht mit dem Hostnamen „%s“ überein\n"
+msgstr "Server-Zertifikat für »%s« stimmt nicht mit dem Hostnamen »%s« überein\n"
 
-#: fe-secure-openssl.c:698
+#: fe-secure-openssl.c:685
 msgid "could not get server's host name from server certificate\n"
 msgstr "konnte Hostnamen des Servers nicht aus dem Serverzertifikat ermitteln\n"
 
-#: fe-secure-openssl.c:845
+#: fe-secure-openssl.c:929
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "konnte SSL-Kontext nicht erzeugen: %s\n"
 
-#: fe-secure-openssl.c:976
+#: fe-secure-openssl.c:966
+#, c-format
+msgid "could not read root certificate file \"%s\": %s\n"
+msgstr "konnte Root-Zertifikat-Datei »%s« nicht lesen: %s\n"
+
+#: fe-secure-openssl.c:994
+#, 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-openssl.c:1022
+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 ""
+"konnte Home-Verzeichnis nicht ermitteln, um Root-Zertifikat-Datei zu finden\n"
+"Legen Sie entweder die Datei an oder ändern Sie sslmode, um die Überprüfung der Serverzertifikate abzuschalten.\n"
+
+#: fe-secure-openssl.c:1026
+#, 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 ""
+"Root-Zertifikat-Datei »%s« existiert nicht\n"
+"Legen Sie entweder die Datei an oder ändern Sie sslmode, um die Überprüfung der Serverzertifikate abzuschalten.\n"
+
+#: fe-secure-openssl.c:1057
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
-msgstr "konnte Zertifikatdatei „%s“ nicht öffnen: %s\n"
+msgstr "konnte Zertifikatdatei »%s« nicht öffnen: %s\n"
 
-#: fe-secure-openssl.c:1015 fe-secure-openssl.c:1030
+#: fe-secure-openssl.c:1076
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
-msgstr "konnte Zertifikatdatei „%s“ nicht lesen: %s\n"
+msgstr "konnte Zertifikatdatei »%s« nicht lesen: %s\n"
 
-#: fe-secure-openssl.c:1085
+#: fe-secure-openssl.c:1100
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "konnte SSL-Verbindung nicht aufbauen: %s\n"
+
+#: fe-secure-openssl.c:1154
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
-msgstr "konnte SSL-Engine „%s“ nicht laden: %s\n"
+msgstr "konnte SSL-Engine »%s« nicht laden: %s\n"
 
-#: fe-secure-openssl.c:1097
+#: fe-secure-openssl.c:1166
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
-msgstr "konnte SSL-Engine „%s“ nicht initialisieren: %s\n"
+msgstr "konnte SSL-Engine »%s« nicht initialisieren: %s\n"
 
-#: fe-secure-openssl.c:1113
+#: fe-secure-openssl.c:1182
 #, 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"
+msgstr "konnte privaten SSL-Schlüssel »%s« nicht von Engine »%s« lesen: %s\n"
 
-#: fe-secure-openssl.c:1127
+#: fe-secure-openssl.c:1196
 #, 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"
+msgstr "konnte privaten SSL-Schlüssel »%s« nicht von Engine »%s« laden: %s\n"
 
-#: fe-secure-openssl.c:1164
+#: fe-secure-openssl.c:1233
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
-msgstr "Zertifikat vorhanden, aber keine private Schlüsseldatei „%s“\n"
+msgstr "Zertifikat vorhanden, aber keine private Schlüsseldatei »%s«\n"
 
-#: fe-secure-openssl.c:1172
+#: fe-secure-openssl.c:1241
 #, c-format
 msgid "private key file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
-msgstr "WARNUNG: private Schlüsseldatei „%s“ erlaubt Lesezugriff für Gruppe oder Andere; Rechte sollten u=rw (0600) oder weniger sein\n"
+msgstr "WARNUNG: private Schlüsseldatei »%s« erlaubt Lesezugriff für Gruppe oder Andere; Rechte sollten u=rw (0600) oder weniger sein\n"
 
-#: fe-secure-openssl.c:1183
+#: fe-secure-openssl.c:1252
 #, c-format
 msgid "could not load private key file \"%s\": %s\n"
-msgstr "konnte private Schlüsseldatei „%s“ nicht laden: %s\n"
+msgstr "konnte private Schlüsseldatei »%s« nicht laden: %s\n"
 
-#: fe-secure-openssl.c:1197
+#: fe-secure-openssl.c:1266
 #, 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-openssl.c:1235
-#, c-format
-msgid "could not read root certificate file \"%s\": %s\n"
-msgstr "konnte Root-Zertifikat-Datei „%s“ nicht lesen: %s\n"
-
-#: fe-secure-openssl.c:1265
-#, 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-openssl.c:1298
-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 ""
-"konnte Home-Verzeichnis nicht ermitteln, um Root-Zertifikat-Datei zu finden\n"
-"Legen Sie entweder die Datei an oder ändern Sie sslmode, um die Überprüfung der Serverzertifikate abzuschalten.\n"
-
-#: fe-secure-openssl.c:1302
-#, 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 ""
-"Root-Zertifikat-Datei „%s“ existiert nicht\n"
-"Legen Sie entweder die Datei an oder ändern Sie sslmode, um die Überprüfung der Serverzertifikate abzuschalten.\n"
+msgstr "Zertifikat passt nicht zur privaten Schlüsseldatei »%s«: %s\n"
 
-#: fe-secure-openssl.c:1390
+#: fe-secure-openssl.c:1365
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "Zertifikat konnte nicht ermittelt werden: %s\n"
 
-#: fe-secure-openssl.c:1482
+#: fe-secure-openssl.c:1457
 #, c-format
 msgid "no SSL error reported"
 msgstr "kein SSL-Fehler berichtet"
 
-#: fe-secure-openssl.c:1491
+#: fe-secure-openssl.c:1466
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL-Fehlercode %lu"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/po/es.po postgresql-9.5-9.5.8/src/interfaces/libpq/po/es.po
--- postgresql-9.5-9.5.2/src/interfaces/libpq/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: libpq (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:38+0000\n"
+"POT-Creation-Date: 2017-05-21 17:26+0000\n"
 "PO-Revision-Date: 2015-09-29 23:33-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
@@ -24,7 +24,7 @@
 msgid "GSSAPI continuation error"
 msgstr "error en continuación de GSSAPI"
 
-#: fe-auth.c:177 fe-auth.c:410
+#: fe-auth.c:177 fe-auth.c:412
 msgid "host name must be specified\n"
 msgstr "el nombre de servidor debe ser especificado\n"
 
@@ -32,14 +32,14 @@
 msgid "duplicate GSS authentication request\n"
 msgstr "petición de autentificación GSS duplicada\n"
 
-#: fe-auth.c:197 fe-auth.c:307 fe-auth.c:381 fe-auth.c:416 fe-auth.c:512
-#: fe-auth.c:778 fe-connect.c:701 fe-connect.c:898 fe-connect.c:1074
-#: fe-connect.c:2085 fe-connect.c:3477 fe-connect.c:3729 fe-connect.c:3848
-#: fe-connect.c:4088 fe-connect.c:4168 fe-connect.c:4267 fe-connect.c:4519
-#: fe-connect.c:4548 fe-connect.c:4620 fe-connect.c:4638 fe-connect.c:4734
-#: fe-connect.c:5068 fe-connect.c:5218 fe-exec.c:3339 fe-exec.c:3504
-#: fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1571
-#: fe-secure-openssl.c:527 fe-secure-openssl.c:1069
+#: fe-auth.c:197 fe-auth.c:309 fe-auth.c:383 fe-auth.c:418 fe-auth.c:514
+#: fe-auth.c:793 fe-connect.c:707 fe-connect.c:904 fe-connect.c:1080
+#: fe-connect.c:2091 fe-connect.c:3483 fe-connect.c:3735 fe-connect.c:3854
+#: fe-connect.c:4094 fe-connect.c:4174 fe-connect.c:4273 fe-connect.c:4529
+#: fe-connect.c:4558 fe-connect.c:4630 fe-connect.c:4654 fe-connect.c:4672
+#: fe-connect.c:4768 fe-connect.c:5102 fe-connect.c:5252 fe-exec.c:3355
+#: fe-exec.c:3520 fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1613
+#: fe-secure-openssl.c:514 fe-secure-openssl.c:1138
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
 
@@ -47,74 +47,78 @@
 msgid "GSSAPI name import error"
 msgstr "error en conversión de nombre GSSAPI"
 
-#: fe-auth.c:296
+#: fe-auth.c:298
 msgid "SSPI continuation error"
 msgstr "error en continuación de SSPI"
 
-#: fe-auth.c:396
+#: fe-auth.c:398
 msgid "could not acquire SSPI credentials"
 msgstr "no se pudo obtener las credenciales SSPI"
 
-#: fe-auth.c:487
+#: fe-auth.c:489
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "el método de autentificación SCM_CRED no está soportado\n"
 
-#: fe-auth.c:563
+#: fe-auth.c:565
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "el método de autentificación Kerberos 4 no está soportado\n"
 
-#: fe-auth.c:568
+#: fe-auth.c:570
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "el método de autentificación Kerberos 5 no está soportado\n"
 
-#: fe-auth.c:639
+#: fe-auth.c:641
 msgid "GSSAPI authentication not supported\n"
 msgstr "el método de autentificación GSSAPI no está soportado\n"
 
-#: fe-auth.c:671
+#: fe-auth.c:673
 msgid "SSPI authentication not supported\n"
 msgstr "el método de autentificación SSPI no está soportado\n"
 
-#: fe-auth.c:679
+#: fe-auth.c:681
 msgid "Crypt authentication not supported\n"
 msgstr "el método de autentificación Crypt no está soportado\n"
 
-#: fe-auth.c:706
+#: fe-auth.c:716
+msgid "SCRAM authentication requires libpq version 10 or above\n"
+msgstr "la autentificación SCRAM requiere la versión de libpq 10 o superior\n"
+
+#: fe-auth.c:721
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "el método de autentificación %u no está soportado\n"
 
-#: fe-auth.c:753
+#: fe-auth.c:768
 #, c-format
 msgid "user name lookup failure: error code %lu\n"
 msgstr "fallo en la búsqueda del nombre de usuario: código de error %lu\n"
 
-#: fe-auth.c:763 fe-connect.c:2012
+#: fe-auth.c:778 fe-connect.c:2018
 #, c-format
 msgid "could not look up local user ID %d: %s\n"
 msgstr "no se pudo buscar el usuario local de ID %d: %s\n"
 
-#: fe-auth.c:768 fe-connect.c:2017
+#: fe-auth.c:783 fe-connect.c:2023
 #, 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:840
+#: fe-connect.c:846
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "valor sslmode no válido: «%s»\n"
 
-#: fe-connect.c:861
+#: fe-connect.c:867
 #, 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"
 
-#: fe-connect.c:1098
+#: fe-connect.c:1104
 #, 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:1128
+#: fe-connect.c:1134
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -125,7 +129,7 @@
 "\t¿Está el servidor en ejecución localmente y aceptando\n"
 "\tconexiones en el socket de dominio Unix «%s»?\n"
 
-#: fe-connect.c:1183
+#: fe-connect.c:1189
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -136,7 +140,7 @@
 "\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:1192
+#: fe-connect.c:1198
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -147,300 +151,300 @@
 "\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:1243
+#: fe-connect.c:1249
 #, c-format
 msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPIDLE) falló: %s\n"
 
-#: fe-connect.c:1256
+#: fe-connect.c:1262
 #, c-format
 msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPALIVE) falló: %s\n"
 
-#: fe-connect.c:1288
+#: fe-connect.c:1294
 #, c-format
 msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPINTVL) falló: %s\n"
 
-#: fe-connect.c:1320
+#: fe-connect.c:1326
 #, c-format
 msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPCNT) falló: %s\n"
 
-#: fe-connect.c:1368
+#: fe-connect.c:1374
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 
-#: fe-connect.c:1420
+#: fe-connect.c:1426
 #, c-format
 msgid "invalid port number: \"%s\"\n"
 msgstr "número de puerto no válido: «%s»\n"
 
-#: fe-connect.c:1453
+#: fe-connect.c:1459
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)\n"
 msgstr "la ruta del socket de dominio Unix «%s» es demasiado larga (máximo %d bytes)\n"
 
-#: fe-connect.c:1472
+#: fe-connect.c:1478
 #, 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:1476
+#: fe-connect.c:1482
 #, 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:1681
+#: fe-connect.c:1687
 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:1721
+#: fe-connect.c:1727
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "no se pudo crear el socket: %s\n"
 
-#: fe-connect.c:1743
+#: fe-connect.c:1749
 #, c-format
 msgid "could not set socket to nonblocking mode: %s\n"
 msgstr "no se pudo establecer el socket en modo no bloqueante: %s\n"
 
-#: fe-connect.c:1754
+#: fe-connect.c:1760
 #, 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:1773
+#: fe-connect.c:1779
 msgid "keepalives parameter must be an integer\n"
 msgstr "el parámetro de keepalives debe ser un entero\n"
 
-#: fe-connect.c:1786
+#: fe-connect.c:1792
 #, c-format
 msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(SO_KEEPALIVE) falló: %s\n"
 
-#: fe-connect.c:1923
+#: fe-connect.c:1929
 #, 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:1957
+#: fe-connect.c:1963
 #, 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:1999
+#: fe-connect.c:2005
 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:2002
+#: fe-connect.c:2008
 #, c-format
 msgid "could not get peer credentials: %s\n"
 msgstr "no se pudo obtener credenciales de la contraparte: %s\n"
 
-#: fe-connect.c:2025
+#: fe-connect.c:2031
 #, 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:2059
+#: fe-connect.c:2065
 #, 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:2098
+#: fe-connect.c:2104
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "no se pudo enviar el paquete de inicio: %s\n"
 
-#: fe-connect.c:2168
+#: fe-connect.c:2174
 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:2194
+#: fe-connect.c:2200
 #, 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:2269 fe-connect.c:2302
+#: fe-connect.c:2275 fe-connect.c:2308
 #, 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:2469
+#: fe-connect.c:2475
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "memoria agotada creando el búfer GSSAPI (%d)"
 
-#: fe-connect.c:2554
+#: fe-connect.c:2560
 msgid "unexpected message from server during startup\n"
 msgstr "se ha recibido un mensaje inesperado del servidor durante el inicio\n"
 
-#: fe-connect.c:2648
+#: fe-connect.c:2654
 #, 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:3083 fe-connect.c:3143
+#: fe-connect.c:3089 fe-connect.c:3149
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "PGEventProc «%s» falló durante el evento PGEVT_CONNRESET\n"
 
-#: fe-connect.c:3490
+#: fe-connect.c:3496
 #, 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:3505
+#: fe-connect.c:3511
 #, 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:3516 fe-connect.c:3569
+#: fe-connect.c:3522 fe-connect.c:3575
 #, 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:3526 fe-connect.c:3583
+#: fe-connect.c:3532 fe-connect.c:3589
 #, 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"
 
-#: fe-connect.c:3537
+#: fe-connect.c:3543
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "URL LDAP no válida «%s»: no tiene filtro\n"
 
-#: fe-connect.c:3558
+#: fe-connect.c:3564
 #, 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:3592
+#: fe-connect.c:3598
 msgid "could not create LDAP structure\n"
 msgstr "no se pudo crear estructura LDAP\n"
 
-#: fe-connect.c:3668
+#: fe-connect.c:3674
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "búsqueda en servidor LDAP falló: %s\n"
 
-#: fe-connect.c:3679
+#: fe-connect.c:3685
 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:3680 fe-connect.c:3692
+#: fe-connect.c:3686 fe-connect.c:3698
 msgid "no entry found on LDAP lookup\n"
 msgstr "no se encontró ninguna entrada en búsqueda LDAP\n"
 
-#: fe-connect.c:3703 fe-connect.c:3716
+#: fe-connect.c:3709 fe-connect.c:3722
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "la búsqueda LDAP entregó atributo sin valores\n"
 
-#: fe-connect.c:3768 fe-connect.c:3787 fe-connect.c:4306
+#: fe-connect.c:3774 fe-connect.c:3793 fe-connect.c:4312
 #, 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:3860 fe-connect.c:4487 fe-connect.c:5201
+#: fe-connect.c:3866 fe-connect.c:4497 fe-connect.c:5235
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "opción de conexión no válida «%s»\n"
 
-#: fe-connect.c:3876 fe-connect.c:4355
+#: fe-connect.c:3882 fe-connect.c:4361
 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:3916
+#: fe-connect.c:3922
 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:3949
+#: fe-connect.c:3955
 #, c-format
 msgid "definition of service \"%s\" not found\n"
 msgstr "la definición de servicio «%s» no fue encontrada\n"
 
-#: fe-connect.c:3972
+#: fe-connect.c:3978
 #, c-format
 msgid "service file \"%s\" not found\n"
 msgstr "el archivo de servicio «%s» no fue encontrado\n"
 
-#: fe-connect.c:3985
+#: fe-connect.c:3991
 #, 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:4056 fe-connect.c:4100
+#: fe-connect.c:4062 fe-connect.c:4106
 #, 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:4067
+#: fe-connect.c:4073
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d\n"
 msgstr "especificaciones de servicio anidadas no soportadas en archivo de servicio «%s», línea %d\n"
 
-#: fe-connect.c:4745
+#: fe-connect.c:4779
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\"\n"
 msgstr "URI no válida propagada a rutina interna de procesamiento: «%s»\n"
 
-#: fe-connect.c:4815
+#: fe-connect.c:4849
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\"\n"
 msgstr "se encontró el fin de la cadena mientras se buscaba el «]» correspondiente en dirección IPv6 en URI: «%s»\n"
 
-#: fe-connect.c:4822
+#: fe-connect.c:4856
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\"\n"
 msgstr "la dirección IPv6 no puede ser vacía en la URI: «%s»\n"
 
-#: fe-connect.c:4837
+#: fe-connect.c:4871
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\"\n"
 msgstr "carácter «%c» inesperado en la posición %d en URI (se esperaba «:» o «/»): «%s»\n"
 
-#: fe-connect.c:4951
+#: fe-connect.c:4985
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\"\n"
 msgstr "separador llave/valor «=» extra en parámetro de la URI: «%s»\n"
 
-#: fe-connect.c:4971
+#: fe-connect.c:5005
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\"\n"
 msgstr "separador llave/valor «=» faltante en parámetro de la URI: «%s»\n"
 
-#: fe-connect.c:5022
+#: fe-connect.c:5056
 #, c-format
 msgid "invalid URI query parameter: \"%s\"\n"
 msgstr "parámetro de URI no válido: «%s»\n"
 
-#: fe-connect.c:5096
+#: fe-connect.c:5130
 #, c-format
 msgid "invalid percent-encoded token: \"%s\"\n"
 msgstr "elemento escapado con %% no válido: «%s»\n"
 
-#: fe-connect.c:5106
+#: fe-connect.c:5140
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\"\n"
 msgstr "valor no permitido %%00 en valor escapado con %%: «%s»\n"
 
-#: fe-connect.c:5437
+#: fe-connect.c:5471
 msgid "connection pointer is NULL\n"
 msgstr "el puntero de conexión es NULL\n"
 
-#: fe-connect.c:5723
+#: fe-connect.c:5757
 #, 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:5732
+#: fe-connect.c:5766
 #, 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"
 
-#: fe-connect.c:5838
+#: fe-connect.c:5880
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
 msgstr "contraseña obtenida desde el archivo «%s»\n"
@@ -449,94 +453,94 @@
 msgid "NOTICE"
 msgstr "AVISO"
 
-#: fe-exec.c:1122 fe-exec.c:1180 fe-exec.c:1226
+#: fe-exec.c:1139 fe-exec.c:1197 fe-exec.c:1243
 msgid "command string is a null pointer\n"
 msgstr "la cadena de orden es un puntero nulo\n"
 
-#: fe-exec.c:1186 fe-exec.c:1232 fe-exec.c:1327
+#: fe-exec.c:1203 fe-exec.c:1249 fe-exec.c:1344
 msgid "number of parameters must be between 0 and 65535\n"
 msgstr "el número de parámetros debe estar entre 0 y 65535\n"
 
-#: fe-exec.c:1220 fe-exec.c:1321
+#: fe-exec.c:1237 fe-exec.c:1338
 msgid "statement name is a null pointer\n"
 msgstr "el nombre de sentencia es un puntero nulo\n"
 
-#: fe-exec.c:1240 fe-exec.c:1404 fe-exec.c:2119 fe-exec.c:2318
+#: fe-exec.c:1257 fe-exec.c:1420 fe-exec.c:2135 fe-exec.c:2334
 msgid "function requires at least protocol version 3.0\n"
 msgstr "la función requiere protocolo 3.0 o superior\n"
 
-#: fe-exec.c:1358
+#: fe-exec.c:1375
 msgid "no connection to the server\n"
 msgstr "no hay conexión con el servidor\n"
 
-#: fe-exec.c:1365
+#: fe-exec.c:1382
 msgid "another command is already in progress\n"
 msgstr "hay otra orden en ejecución\n"
 
-#: fe-exec.c:1480
+#: fe-exec.c:1496
 msgid "length must be given for binary parameter\n"
 msgstr "el largo debe ser especificado para un parámetro binario\n"
 
-#: fe-exec.c:1749
+#: fe-exec.c:1765
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "asyncStatus no esperado: %d\n"
 
-#: fe-exec.c:1769
+#: fe-exec.c:1785
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "PGEventProc «%s» falló durante el evento PGEVT_RESULTCREATE\n"
 
-#: fe-exec.c:1929
+#: fe-exec.c:1945
 msgid "COPY terminated by new PQexec"
 msgstr "COPY terminado por un nuevo PQexec"
 
-#: fe-exec.c:1937
+#: fe-exec.c:1953
 msgid "COPY IN state must be terminated first\n"
 msgstr "el estado COPY IN debe ser terminado primero\n"
 
-#: fe-exec.c:1957
+#: fe-exec.c:1973
 msgid "COPY OUT state must be terminated first\n"
 msgstr "el estado COPY OUT debe ser terminado primero\n"
 
-#: fe-exec.c:1965
+#: fe-exec.c:1981
 msgid "PQexec not allowed during COPY BOTH\n"
 msgstr "PQexec no está permitido durante COPY BOTH\n"
 
-#: fe-exec.c:2208 fe-exec.c:2275 fe-exec.c:2365 fe-protocol2.c:1352
-#: fe-protocol3.c:1710
+#: fe-exec.c:2224 fe-exec.c:2291 fe-exec.c:2381 fe-protocol2.c:1352
+#: fe-protocol3.c:1752
 msgid "no COPY in progress\n"
 msgstr "no hay COPY alguno en ejecución\n"
 
-#: fe-exec.c:2555
+#: fe-exec.c:2571
 msgid "connection in wrong state\n"
 msgstr "la conexión está en un estado incorrecto\n"
 
-#: fe-exec.c:2586
+#: fe-exec.c:2602
 msgid "invalid ExecStatusType code"
 msgstr "el código de ExecStatusType no es válido"
 
-#: fe-exec.c:2650 fe-exec.c:2673
+#: fe-exec.c:2666 fe-exec.c:2689
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "el número de columna %d está fuera del rango 0..%d"
 
-#: fe-exec.c:2666
+#: fe-exec.c:2682
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "el número de fila %d está fuera del rango 0..%d"
 
-#: fe-exec.c:2688
+#: fe-exec.c:2704
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "el número de parámetro %d está fuera del rango 0..%d"
 
-#: fe-exec.c:2998
+#: fe-exec.c:3014
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "no se pudo interpretar el resultado del servidor: %s"
 
-#: fe-exec.c:3237 fe-exec.c:3321
+#: fe-exec.c:3253 fe-exec.c:3337
 msgid "incomplete multibyte character\n"
 msgstr "carácter multibyte incompleto\n"
 
@@ -633,11 +637,11 @@
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "el entero de tamaño %lu no está soportado por pqPutInt"
 
-#: fe-misc.c:642 fe-misc.c:842
+#: fe-misc.c:642 fe-misc.c:843
 msgid "connection not open\n"
 msgstr "la conexión no está abierta\n"
 
-#: fe-misc.c:812 fe-secure-openssl.c:249 fe-secure-openssl.c:355
+#: fe-misc.c:812 fe-secure-openssl.c:230 fe-secure-openssl.c:339
 #: fe-secure.c:253 fe-secure.c:362
 msgid ""
 "server closed the connection unexpectedly\n"
@@ -648,15 +652,15 @@
 "\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:1015
+#: fe-misc.c:1016
 msgid "timeout expired\n"
 msgstr "tiempo de espera agotado\n"
 
-#: fe-misc.c:1060
+#: fe-misc.c:1061
 msgid "socket not open\n"
 msgstr "el socket no está abierto\n"
 
-#: fe-misc.c:1083
+#: fe-misc.c:1084
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() fallida: %s\n"
@@ -677,8 +681,8 @@
 msgstr "un mensaje de tipo 0x%02x llegó del servidor estando inactivo"
 
 #: fe-protocol2.c:503 fe-protocol2.c:538 fe-protocol2.c:1049
-#: fe-protocol3.c:209 fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:324
-#: fe-protocol3.c:995
+#: fe-protocol3.c:209 fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:333
+#: fe-protocol3.c:720 fe-protocol3.c:1037
 msgid "out of memory"
 msgstr "memoria agotada"
 
@@ -697,16 +701,16 @@
 msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
 msgstr "el servidor envió datos binarios (mensaje «B») sin precederlos con una description de fila (mensaje «T»)"
 
-#: fe-protocol2.c:633 fe-protocol3.c:402
+#: fe-protocol2.c:633 fe-protocol3.c:412
 #, 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:762 fe-protocol2.c:937 fe-protocol3.c:617 fe-protocol3.c:799
+#: fe-protocol2.c:762 fe-protocol2.c:937 fe-protocol3.c:627 fe-protocol3.c:841
 msgid "out of memory for query result"
 msgstr "no hay suficiente memoria para el resultado de la consulta"
 
-#: fe-protocol2.c:1395 fe-protocol3.c:1779
+#: fe-protocol2.c:1395 fe-protocol3.c:1821
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -716,266 +720,261 @@
 msgid "lost synchronization with server, resetting connection"
 msgstr "se perdió la sincronía con el servidor, reseteando la conexión"
 
-#: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:1982
+#: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:2024
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "error de protocolo: id=0x%x\n"
 
-#: fe-protocol3.c:358
+#: fe-protocol3.c:368
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
 msgstr "el servidor envió datos (mensaje «D») sin precederlos con una descripción de fila (mensaje «T»)\n"
 
-#: fe-protocol3.c:423
+#: fe-protocol3.c:433
 #, 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:444
+#: fe-protocol3.c:454
 #, 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:495 fe-protocol3.c:535
+#: fe-protocol3.c:505 fe-protocol3.c:545
 msgid "insufficient data in \"T\" message"
 msgstr "datos insuficientes en el mensaje «T»"
 
-#: fe-protocol3.c:568
+#: fe-protocol3.c:578
 msgid "extraneous data in \"T\" message"
 msgstr "datos ininteligibles en mensaje «T»"
 
-#: fe-protocol3.c:707 fe-protocol3.c:739 fe-protocol3.c:757
+#: fe-protocol3.c:749 fe-protocol3.c:781 fe-protocol3.c:799
 msgid "insufficient data in \"D\" message"
 msgstr "datos insuficientes en el mensaje «D»"
 
-#: fe-protocol3.c:713
+#: fe-protocol3.c:755
 msgid "unexpected field count in \"D\" message"
 msgstr "cantidad de campos inesperada en mensaje «D»"
 
-#: fe-protocol3.c:766
+#: fe-protocol3.c:808
 msgid "extraneous data in \"D\" message"
 msgstr "datos ininteligibles en mensaje «D»"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:898 fe-protocol3.c:917
+#: fe-protocol3.c:940 fe-protocol3.c:959
 #, c-format
 msgid " at character %s"
 msgstr " en el carácter %s"
 
-#: fe-protocol3.c:930
+#: fe-protocol3.c:972
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETALLE:  %s\n"
 
-#: fe-protocol3.c:933
+#: fe-protocol3.c:975
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "SUGERENCIA:  %s\n"
 
-#: fe-protocol3.c:936
+#: fe-protocol3.c:978
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "CONSULTA:  %s\n"
 
-#: fe-protocol3.c:939
+#: fe-protocol3.c:981
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTEXTO:  %s\n"
 
-#: fe-protocol3.c:946
+#: fe-protocol3.c:988
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "NOMBRE DE ESQUEMA:  %s\n"
 
-#: fe-protocol3.c:950
+#: fe-protocol3.c:992
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "NOMBRE DE TABLA:  %s\n"
 
-#: fe-protocol3.c:954
+#: fe-protocol3.c:996
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "NOMBRE DE COLUMNA:  %s\n"
 
-#: fe-protocol3.c:958
+#: fe-protocol3.c:1000
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "NOMBRE TIPO DE DATO:  %s\n"
 
-#: fe-protocol3.c:962
+#: fe-protocol3.c:1004
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "NOMBRE DE RESTRICCIÓN:  %s\n"
 
-#: fe-protocol3.c:974
+#: fe-protocol3.c:1016
 msgid "LOCATION:  "
 msgstr "UBICACIÓN:  "
 
-#: fe-protocol3.c:976
+#: fe-protocol3.c:1018
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:978
+#: fe-protocol3.c:1020
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1209
+#: fe-protocol3.c:1251
 #, c-format
 msgid "LINE %d: "
 msgstr "L�NEA %d: "
 
-#: fe-protocol3.c:1604
+#: fe-protocol3.c:1646
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: no se está haciendo COPY OUT de texto\n"
 
-#: fe-secure-openssl.c:146 fe-secure-openssl.c:1006 fe-secure-openssl.c:1226
-#, c-format
-msgid "could not acquire mutex: %s\n"
-msgstr "no se pudo adquirir el mutex: %s\n"
-
-#: fe-secure-openssl.c:158
-#, c-format
-msgid "could not establish SSL connection: %s\n"
-msgstr "no se pudo establecer conexión SSL: %s\n"
-
-#: fe-secure-openssl.c:254 fe-secure-openssl.c:360 fe-secure-openssl.c:1349
+#: fe-secure-openssl.c:235 fe-secure-openssl.c:344 fe-secure-openssl.c:1322
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "ERROR en llamada SSL: %s\n"
 
-#: fe-secure-openssl.c:261 fe-secure-openssl.c:367 fe-secure-openssl.c:1353
+#: fe-secure-openssl.c:242 fe-secure-openssl.c:351 fe-secure-openssl.c:1326
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "ERROR en llamada SSL: detectado fin de archivo\n"
 
-#: fe-secure-openssl.c:272 fe-secure-openssl.c:378 fe-secure-openssl.c:1362
+#: fe-secure-openssl.c:253 fe-secure-openssl.c:362 fe-secure-openssl.c:1335
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "error de SSL: %s\n"
 
-#: fe-secure-openssl.c:287 fe-secure-openssl.c:393
+#: fe-secure-openssl.c:268 fe-secure-openssl.c:377
 msgid "SSL connection has been closed unexpectedly\n"
 msgstr "la conexión SSL se ha cerrado inesperadamente\n"
 
-#: fe-secure-openssl.c:293 fe-secure-openssl.c:399 fe-secure-openssl.c:1371
+#: fe-secure-openssl.c:274 fe-secure-openssl.c:383 fe-secure-openssl.c:1344
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "código de error SSL no reconocido: %d\n"
 
-#: fe-secure-openssl.c:511
+#: fe-secure-openssl.c:494
 msgid "SSL certificate's name entry is missing\n"
 msgstr "falta el elemento de nombre en el certificado SSL\n"
 
-#: fe-secure-openssl.c:541
+#: fe-secure-openssl.c:528
 msgid "SSL certificate's name contains embedded null\n"
 msgstr "el elemento de nombre en el certificado SSL contiene un carácter null\n"
 
-#: fe-secure-openssl.c:592
+#: fe-secure-openssl.c:579
 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-openssl.c:692
+#: fe-secure-openssl.c:679
 #, c-format
 msgid "server certificate for \"%s\" does not match host name \"%s\"\n"
 msgstr "el certificado de servidor para «%s» no coincide con el nombre de servidor «%s»\n"
 
-#: fe-secure-openssl.c:698
+#: fe-secure-openssl.c:685
 msgid "could not get server's host name from server certificate\n"
 msgstr "no se pudo obtener el nombre de servidor desde el certificado del servidor\n"
 
-#: fe-secure-openssl.c:845
+#: fe-secure-openssl.c:929
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "no se pudo crear un contexto SSL: %s\n"
 
-#: fe-secure-openssl.c:976
+#: fe-secure-openssl.c:966
+#, 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-openssl.c:994
+#, 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-openssl.c:1022
+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-openssl.c:1026
+#, 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 ""
+"el archivo de certificado raíz «%s» no existe\n"
+"Debe ya sea entregar este archivo, o bien cambiar sslmode para deshabilitar la verificación de certificados del servidor.\n"
+
+#: fe-secure-openssl.c:1057
 #, 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-openssl.c:1015 fe-secure-openssl.c:1030
+#: fe-secure-openssl.c:1076
 #, 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-openssl.c:1085
+#: fe-secure-openssl.c:1100
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "no se pudo establecer conexión SSL: %s\n"
+
+#: fe-secure-openssl.c:1154
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
 msgstr "no se pudo cargar el motor SSL «%s»: %s\n"
 
-#: fe-secure-openssl.c:1097
+#: fe-secure-openssl.c:1166
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
 msgstr "no se pudo inicializar el motor SSL «%s»: %s\n"
 
-#: fe-secure-openssl.c:1113
+#: fe-secure-openssl.c:1182
 #, 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"
 
-#: fe-secure-openssl.c:1127
+#: fe-secure-openssl.c:1196
 #, 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-openssl.c:1164
+#: fe-secure-openssl.c:1233
 #, 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-openssl.c:1172
+#: fe-secure-openssl.c:1241
 #, c-format
 msgid "private key file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 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-openssl.c:1183
+#: fe-secure-openssl.c:1252
 #, 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-openssl.c:1197
+#: fe-secure-openssl.c:1266
 #, 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-openssl.c:1235
-#, 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-openssl.c:1265
-#, 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-openssl.c:1298
-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-openssl.c:1302
-#, 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 ""
-"el archivo de certificado raíz «%s» no existe\n"
-"Debe ya sea entregar este archivo, o bien cambiar sslmode para deshabilitar la verificación de certificados del servidor.\n"
-
-#: fe-secure-openssl.c:1390
+#: fe-secure-openssl.c:1365
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "el certificado no pudo ser obtenido: %s\n"
 
-#: fe-secure-openssl.c:1482
+#: fe-secure-openssl.c:1457
 #, c-format
 msgid "no SSL error reported"
 msgstr "código de error SSL no reportado"
 
-#: fe-secure-openssl.c:1491
+#: fe-secure-openssl.c:1466
 #, c-format
 msgid "SSL error code %lu"
 msgstr "código de error SSL %lu"
@@ -994,3 +993,6 @@
 #, c-format
 msgid "unrecognized socket error: 0x%08X/%d"
 msgstr "código de error de socket no reconocido: 0x%08X/%d"
+
+#~ msgid "could not acquire mutex: %s\n"
+#~ msgstr "no se pudo adquirir el mutex: %s\n"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/po/fr.po postgresql-9.5-9.5.8/src/interfaces/libpq/po/fr.po
--- postgresql-9.5-9.5.2/src/interfaces/libpq/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,119 +1,127 @@
 # translation of libpq.po to fr_fr
 # french message translation file for libpq
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 #
 # Guillaume Lelarge <guillaume@lelarge.info>, 2004-2009.
-# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
+# Stéphane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-17 02:38+0000\n"
-"PO-Revision-Date: 2016-02-21 15:09+0100\n"
+"POT-Creation-Date: 2017-06-30 16:26+0000\n"
+"PO-Revision-Date: 2017-07-02 17:39+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.12\n"
 
 #: fe-auth.c:148
 msgid "GSSAPI continuation error"
 msgstr "erreur de suite GSSAPI"
 
-#: fe-auth.c:177 fe-auth.c:410
+#: fe-auth.c:177 fe-auth.c:417
 msgid "host name must be specified\n"
-msgstr "le nom d'hôte doit être précisé\n"
+msgstr "le nom d'hôte doit être précisé\n"
 
 #: fe-auth.c:184
 msgid "duplicate GSS authentication request\n"
-msgstr "requête d'authentification GSS dupliquée\n"
+msgstr "requête d'authentification GSS dupliquée\n"
 
-#: fe-auth.c:197 fe-auth.c:307 fe-auth.c:381 fe-auth.c:416 fe-auth.c:512
-#: fe-auth.c:778 fe-connect.c:707 fe-connect.c:904 fe-connect.c:1080
-#: fe-connect.c:2091 fe-connect.c:3483 fe-connect.c:3735 fe-connect.c:3854
-#: fe-connect.c:4094 fe-connect.c:4174 fe-connect.c:4273 fe-connect.c:4525
-#: fe-connect.c:4554 fe-connect.c:4626 fe-connect.c:4644 fe-connect.c:4740
-#: fe-connect.c:5074 fe-connect.c:5224 fe-exec.c:3339 fe-exec.c:3504
-#: fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1613
-#: fe-secure-openssl.c:527 fe-secure-openssl.c:1069
+#: fe-auth.c:197 fe-auth.c:309 fe-auth.c:388 fe-auth.c:423 fe-auth.c:519
+#: fe-auth.c:798 fe-connect.c:767 fe-connect.c:964 fe-connect.c:1140
+#: fe-connect.c:2141 fe-connect.c:3498 fe-connect.c:3750 fe-connect.c:3869
+#: fe-connect.c:4109 fe-connect.c:4189 fe-connect.c:4288 fe-connect.c:4544
+#: fe-connect.c:4573 fe-connect.c:4645 fe-connect.c:4669 fe-connect.c:4687
+#: fe-connect.c:4783 fe-connect.c:5117 fe-connect.c:5267 fe-exec.c:3355
+#: fe-exec.c:3520 fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1613
+#: fe-secure-openssl.c:514 fe-secure-openssl.c:1138
 msgid "out of memory\n"
-msgstr "mémoire épuisée\n"
+msgstr "mémoire épuisée\n"
 
 #: fe-auth.c:210
 msgid "GSSAPI name import error"
 msgstr "erreur d'import du nom GSSAPI"
 
-#: fe-auth.c:296
+#: fe-auth.c:298
 msgid "SSPI continuation error"
 msgstr "erreur de suite SSPI"
 
-#: fe-auth.c:396
+#: fe-auth.c:378
+msgid "duplicate SSPI authentication request\n"
+msgstr "requête d'authentification SSPI dupliquée\n"
+
+#: fe-auth.c:403
 msgid "could not acquire SSPI credentials"
-msgstr "n'a pas pu récupérer les pièces d'identité SSPI"
+msgstr "n'a pas pu récupérer les pièces d'identité SSPI"
 
-#: fe-auth.c:487
+#: fe-auth.c:494
 msgid "SCM_CRED authentication method not supported\n"
-msgstr "authentification SCM_CRED non supportée\n"
+msgstr "authentification SCM_CRED non supportée\n"
 
-#: fe-auth.c:563
+#: fe-auth.c:570
 msgid "Kerberos 4 authentication not supported\n"
-msgstr "authentification Kerberos 4 non supportée\n"
+msgstr "authentification Kerberos 4 non supportée\n"
 
-#: fe-auth.c:568
+#: fe-auth.c:575
 msgid "Kerberos 5 authentication not supported\n"
-msgstr "authentification Kerberos 5 non supportée\n"
+msgstr "authentification Kerberos 5 non supportée\n"
 
-#: fe-auth.c:639
+#: fe-auth.c:646
 msgid "GSSAPI authentication not supported\n"
-msgstr "authentification GSSAPI non supportée\n"
+msgstr "authentification GSSAPI non supportée\n"
 
-#: fe-auth.c:671
+#: fe-auth.c:678
 msgid "SSPI authentication not supported\n"
-msgstr "authentification SSPI non supportée\n"
+msgstr "authentification SSPI non supportée\n"
 
-#: fe-auth.c:679
+#: fe-auth.c:686
 msgid "Crypt authentication not supported\n"
-msgstr "authentification crypt non supportée\n"
+msgstr "authentification crypt non supportée\n"
+
+#: fe-auth.c:721
+msgid "SCRAM authentication requires libpq version 10 or above\n"
+msgstr "L'authentification SCRAM nécessite la bibliothèque libpq en version 10 ou ultérieure.\n"
 
-#: fe-auth.c:706
+#: fe-auth.c:726
 #, c-format
 msgid "authentication method %u not supported\n"
-msgstr "méthode d'authentification %u non supportée\n"
+msgstr "méthode d'authentification %u non supportée\n"
 
-#: fe-auth.c:753
+#: fe-auth.c:773
 #, c-format
 msgid "user name lookup failure: error code %lu\n"
-msgstr "échec de la recherche du nom d'utilisateur : code erreur %lu\n"
+msgstr "échec de la recherche du nom d'utilisateur : code erreur %lu\n"
 
-#: fe-auth.c:763 fe-connect.c:2018
+#: fe-auth.c:783 fe-connect.c:2068
 #, c-format
 msgid "could not look up local user ID %d: %s\n"
 msgstr "n'a pas pu rechercher l'identifiant de l'utilisateur local %d : %s\n"
 
-#: fe-auth.c:768 fe-connect.c:2023
+#: fe-auth.c:788 fe-connect.c:2073
 #, 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:846
+#: fe-connect.c:906
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
-msgstr "valeur sslmode invalide : « %s »\n"
+msgstr "valeur sslmode invalide : « %s »\n"
 
-#: fe-connect.c:867
+#: fe-connect.c:927
 #, 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"
+msgstr "valeur sslmode « %s » invalide si le support SSL n'est pas compilé initialement\n"
 
-#: fe-connect.c:1104
+#: fe-connect.c:1164
 #, 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"
+msgstr "n'a pas pu activer le mode TCP sans délai pour la socket : %s\n"
 
-#: fe-connect.c:1134
+#: fe-connect.c:1194
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -122,9 +130,9 @@
 msgstr ""
 "n'a pas pu se connecter au serveur : %s\n"
 "\tLe serveur est-il actif localement et accepte-t-il les connexions sur la\n"
-" \tsocket Unix « %s » ?\n"
+" \tsocket Unix « %s » ?\n"
 
-#: fe-connect.c:1189
+#: fe-connect.c:1249
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -132,10 +140,10 @@
 "\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"
+"\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:1198
+#: fe-connect.c:1258
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -143,530 +151,510 @@
 "\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 » et accepte-t-il les connexions\n"
+"\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:1249
-#, c-format
-msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPIDLE) a échoué : %s\n"
-
-#: fe-connect.c:1262
+#: fe-connect.c:1309 fe-connect.c:1341 fe-connect.c:1374 fe-connect.c:1841
 #, c-format
-msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPALIVE) a échoué : %s\n"
+msgid "setsockopt(%s) failed: %s\n"
+msgstr "setsockopt(%s) a échoué : %s\n"
 
-#: fe-connect.c:1294
-#, c-format
-msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPINTVL) a échoué : %s\n"
-
-#: fe-connect.c:1326
-#, c-format
-msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPCNT) a échoué : %s\n"
-
-#: fe-connect.c:1374
+#: fe-connect.c:1423
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
-msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) a échoué : %ui\n"
+msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) a échoué : %ui\n"
 
-#: fe-connect.c:1426
+#: fe-connect.c:1475
 #, c-format
 msgid "invalid port number: \"%s\"\n"
-msgstr "numéro de port invalide : « %s »\n"
+msgstr "numéro de port invalide : « %s »\n"
 
-#: fe-connect.c:1459
+#: fe-connect.c:1508
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)\n"
-msgstr "Le chemin du socket de domaine Unix, « %s », est trop (maximum %d octets)\n"
+msgstr "Le chemin du socket de domaine Unix, « %s », est trop (maximum %d octets)\n"
 
-#: fe-connect.c:1478
+#: fe-connect.c:1527
 #, 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"
+msgstr "n'a pas pu traduire le nom d'hôte « %s » en adresse : %s\n"
 
-#: fe-connect.c:1482
+#: fe-connect.c:1531
 #, 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"
+"n'a pas pu traduire le chemin de la socket du domaine Unix « %s » en adresse :\n"
 "%s\n"
 
-#: fe-connect.c:1687
+#: fe-connect.c:1736
 msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "état de connexion invalide, indique probablement une corruption de mémoire\n"
+msgstr "état de connexion invalide, indique probablement une corruption de mémoire\n"
 
-#: fe-connect.c:1727
+#: fe-connect.c:1776
 #, c-format
 msgid "could not create socket: %s\n"
-msgstr "n'a pas pu créer la socket : %s\n"
+msgstr "n'a pas pu créer la socket : %s\n"
 
-#: fe-connect.c:1749
+#: fe-connect.c:1798
 #, c-format
 msgid "could not set socket to nonblocking mode: %s\n"
 msgstr "n'a pas pu activer le mode non-bloquant pour la socket : %s\n"
 
-#: fe-connect.c:1760
+#: fe-connect.c:1809
 #, 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"
+msgstr "n'a pas pu paramétrer la socket en mode close-on-exec : %s\n"
 
-#: fe-connect.c:1779
+#: fe-connect.c:1828
 msgid "keepalives parameter must be an integer\n"
-msgstr "le paramètre keepalives doit être un entier\n"
-
-#: fe-connect.c:1792
-#, c-format
-msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
-msgstr "setsockopt(SO_KEEPALIVE) a échoué : %s\n"
+msgstr "le paramètre keepalives doit être un entier\n"
 
-#: fe-connect.c:1929
+#: fe-connect.c:1979
 #, 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"
+msgstr "n'a pas pu déterminer le statut d'erreur de la socket : %s\n"
 
-#: fe-connect.c:1963
+#: fe-connect.c:2013
 #, 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:2005
+#: fe-connect.c:2055
 msgid "requirepeer parameter is not supported on this platform\n"
-msgstr "le paramètre requirepeer n'est pas supporté sur cette plateforme\n"
+msgstr "le paramètre requirepeer n'est pas supporté sur cette plateforme\n"
 
-#: fe-connect.c:2008
+#: fe-connect.c:2058
 #, 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:2031
+#: fe-connect.c:2081
 #, 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"
+msgstr "requirepeer indique « %s » mais le nom de l'utilisateur réel est « %s »\n"
 
-#: fe-connect.c:2065
+#: fe-connect.c:2115
 #, 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"
+msgstr "n'a pas pu transmettre le paquet de négociation SSL : %s\n"
 
-#: fe-connect.c:2104
+#: fe-connect.c:2154
 #, c-format
 msgid "could not send startup packet: %s\n"
-msgstr "n'a pas pu transmettre le paquet de démarrage : %s\n"
+msgstr "n'a pas pu transmettre le paquet de démarrage : %s\n"
 
-#: fe-connect.c:2174
+#: fe-connect.c:2224
 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"
+msgstr "le serveur ne supporte pas SSL alors que SSL était réclamé\n"
 
-#: fe-connect.c:2200
+#: fe-connect.c:2250
 #, 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"
+msgstr "a reçu une réponse invalide à la négociation SSL : %c\n"
 
-#: fe-connect.c:2275 fe-connect.c:2308
+#: fe-connect.c:2325 fe-connect.c:2358
 #, 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"
+"attendait une requête d'authentification en provenance du serveur, mais a\n"
+" reçu %c\n"
 
-#: fe-connect.c:2475
+#: fe-connect.c:2525
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
-msgstr "mémoire épuisée lors de l'allocation du tampon GSSAPI (%d)"
+msgstr "mémoire épuisée lors de l'allocation du tampon GSSAPI (%d)"
 
-#: fe-connect.c:2560
+#: fe-connect.c:2610
 msgid "unexpected message from server during startup\n"
-msgstr "message inattendu du serveur lors du démarrage\n"
+msgstr "message inattendu du serveur lors du démarrage\n"
 
-#: fe-connect.c:2654
+#: fe-connect.c:2704
 #, 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"
+"état de connexion invalide (%d), indiquant probablement une corruption de\n"
+" mémoire\n"
 
-#: fe-connect.c:3089 fe-connect.c:3149
+#: fe-connect.c:3104 fe-connect.c:3164
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
-msgstr "échec de PGEventProc « %s » lors de l'événement PGEVT_CONNRESET\n"
+msgstr "échec de PGEventProc « %s » lors de l'événement PGEVT_CONNRESET\n"
 
-#: fe-connect.c:3496
+#: fe-connect.c:3511
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
-msgstr "URL LDAP « %s » invalide : le schéma doit être ldap://\n"
+msgstr "URL LDAP « %s » invalide : le schéma doit être ldap://\n"
 
-#: fe-connect.c:3511
+#: fe-connect.c:3526
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
-msgstr "URL LDAP « %s » invalide : le « distinguished name » manque\n"
+msgstr "URL LDAP « %s » invalide : le « distinguished name » manque\n"
 
-#: fe-connect.c:3522 fe-connect.c:3575
+#: fe-connect.c:3537 fe-connect.c:3590
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
-msgstr "URL LDAP « %s » invalide : doit avoir exactement un attribut\n"
+msgstr "URL LDAP « %s » invalide : doit avoir exactement un attribut\n"
 
-#: fe-connect.c:3532 fe-connect.c:3589
+#: fe-connect.c:3547 fe-connect.c:3604
 #, 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"
+msgstr "URL LDAP « %s » invalide : doit avoir une échelle de recherche (base/un/sous)\n"
 
-#: fe-connect.c:3543
+#: fe-connect.c:3558
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
-msgstr "URL LDAP « %s » invalide : aucun filtre\n"
+msgstr "URL LDAP « %s » invalide : aucun filtre\n"
 
-#: fe-connect.c:3564
+#: fe-connect.c:3579
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
-msgstr "URL LDAP « %s » invalide : numéro de port invalide\n"
+msgstr "URL LDAP « %s » invalide : numéro de port invalide\n"
 
-#: fe-connect.c:3598
+#: fe-connect.c:3613
 msgid "could not create LDAP structure\n"
-msgstr "n'a pas pu créer la structure LDAP\n"
+msgstr "n'a pas pu créer la structure LDAP\n"
 
-#: fe-connect.c:3674
+#: fe-connect.c:3689
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
-msgstr "échec de la recherche sur le serveur LDAP : %s\n"
+msgstr "échec de la recherche sur le serveur LDAP : %s\n"
 
-#: fe-connect.c:3685
+#: fe-connect.c:3700
 msgid "more than one entry found on LDAP lookup\n"
-msgstr "plusieurs entrées trouvées pendant la recherche LDAP\n"
+msgstr "plusieurs entrées trouvées pendant la recherche LDAP\n"
 
-#: fe-connect.c:3686 fe-connect.c:3698
+#: fe-connect.c:3701 fe-connect.c:3713
 msgid "no entry found on LDAP lookup\n"
-msgstr "aucune entrée trouvée pendant la recherche LDAP\n"
+msgstr "aucune entrée trouvée pendant la recherche LDAP\n"
 
-#: fe-connect.c:3709 fe-connect.c:3722
+#: fe-connect.c:3724 fe-connect.c:3737
 msgid "attribute has no values on LDAP lookup\n"
-msgstr "l'attribut n'a pas de valeur après la recherche LDAP\n"
+msgstr "l'attribut n'a pas de valeur après la recherche LDAP\n"
 
-#: fe-connect.c:3774 fe-connect.c:3793 fe-connect.c:4312
+#: fe-connect.c:3789 fe-connect.c:3808 fe-connect.c:4327
 #, 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"
+msgstr "« = » manquant après « %s » dans la chaîne des paramètres de connexion\n"
 
-#: fe-connect.c:3866 fe-connect.c:4493 fe-connect.c:5207
+#: fe-connect.c:3881 fe-connect.c:4512 fe-connect.c:5250
 #, c-format
 msgid "invalid connection option \"%s\"\n"
-msgstr "option de connexion « %s » invalide\n"
+msgstr "option de connexion « %s » invalide\n"
 
-#: fe-connect.c:3882 fe-connect.c:4361
+#: fe-connect.c:3897 fe-connect.c:4376
 msgid "unterminated quoted string in connection info string\n"
-msgstr "guillemets non refermés dans la chaîne des paramètres de connexion\n"
+msgstr "guillemets non refermés dans la chaîne des paramètres de connexion\n"
 
-#: fe-connect.c:3922
+#: fe-connect.c:3937
 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"
+"n'a pas pu obtenir le répertoire personnel pour trouver le certificat de\n"
+"définition du service"
 
-#: fe-connect.c:3955
+#: fe-connect.c:3970
 #, c-format
 msgid "definition of service \"%s\" not found\n"
-msgstr "définition du service « %s » introuvable\n"
+msgstr "définition du service « %s » introuvable\n"
 
-#: fe-connect.c:3978
+#: fe-connect.c:3993
 #, c-format
 msgid "service file \"%s\" not found\n"
-msgstr "fichier de service « %s » introuvable\n"
+msgstr "fichier de service « %s » introuvable\n"
 
-#: fe-connect.c:3991
+#: fe-connect.c:4006
 #, c-format
 msgid "line %d too long in service file \"%s\"\n"
-msgstr "ligne %d trop longue dans le fichier service « %s »\n"
+msgstr "ligne %d trop longue dans le fichier service « %s »\n"
 
-#: fe-connect.c:4062 fe-connect.c:4106
+#: fe-connect.c:4077 fe-connect.c:4121
 #, c-format
 msgid "syntax error in service file \"%s\", line %d\n"
-msgstr "erreur de syntaxe dans le fichier service « %s », ligne %d\n"
+msgstr "erreur de syntaxe dans le fichier service « %s », ligne %d\n"
 
-#: fe-connect.c:4073
+#: fe-connect.c:4088
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d\n"
-msgstr "spécifications imbriquées de service non supportées dans le fichier service « %s », ligne %d\n"
+msgstr "spécifications imbriquées de service non supportées dans le fichier service « %s », ligne %d\n"
 
-#: fe-connect.c:4751
+#: fe-connect.c:4794
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\"\n"
-msgstr "URI invalide propagée à la routine d'analyse interne : « %s »\n"
+msgstr "URI invalide propagée à la routine d'analyse interne : « %s »\n"
 
-#: fe-connect.c:4821
+#: fe-connect.c:4864
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\"\n"
 msgstr ""
-"fin de chaîne atteinte lors de la recherche du « ] » correspondant dans\n"
-"l'adresse IPv6 de l'hôte indiquée dans l'URI : « %s »\n"
+"fin de chaîne atteinte lors de la recherche du « ] » correspondant dans\n"
+"l'adresse IPv6 de l'hôte indiquée dans l'URI : « %s »\n"
 
-#: fe-connect.c:4828
+#: fe-connect.c:4871
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\"\n"
-msgstr "l'adresse IPv6 de l'hôte ne peut pas être vide dans l'URI : « %s »\n"
+msgstr "l'adresse IPv6 de l'hôte ne peut pas être vide dans l'URI : « %s »\n"
 
-#: fe-connect.c:4843
+#: fe-connect.c:4886
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\"\n"
 msgstr ""
-"caractère « %c » inattendu à la position %d de l'URI (caractère « : » ou\n"
-"« / » attendu) : « %s »\n"
+"caractère « %c » inattendu à la position %d de l'URI (caractère « : » ou\n"
+"« / » attendu) : « %s »\n"
 
-#: fe-connect.c:4957
+#: fe-connect.c:5000
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\"\n"
-msgstr "séparateur « = » de clé/valeur en trop dans le paramètre de requête URI : « %s »\n"
+msgstr "séparateur « = » de clé/valeur en trop dans le paramètre de requête URI : « %s »\n"
 
-#: fe-connect.c:4977
+#: fe-connect.c:5020
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\"\n"
-msgstr "séparateur « = » de clé/valeur manquant dans le paramètre de requête URI : « %s »\n"
+msgstr "séparateur « = » de clé/valeur manquant dans le paramètre de requête URI : « %s »\n"
 
-#: fe-connect.c:5028
+#: fe-connect.c:5071
 #, c-format
 msgid "invalid URI query parameter: \"%s\"\n"
-msgstr "paramètre de la requête URI invalide : « %s »\n"
+msgstr "paramètre de la requête URI invalide : « %s »\n"
 
-#: fe-connect.c:5102
+#: fe-connect.c:5145
 #, c-format
 msgid "invalid percent-encoded token: \"%s\"\n"
-msgstr "jeton encodé en pourcentage invalide : « %s »\n"
+msgstr "jeton encodé en pourcentage invalide : « %s »\n"
 
-#: fe-connect.c:5112
+#: fe-connect.c:5155
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\"\n"
-msgstr "valeur %%00 interdite dans la valeur codée en pourcentage : « %s »\n"
+msgstr "valeur %%00 interdite dans la valeur codée en pourcentage : « %s »\n"
 
-#: fe-connect.c:5443
+#: fe-connect.c:5486
 msgid "connection pointer is NULL\n"
 msgstr "le pointeur de connexion est NULL\n"
 
-#: fe-connect.c:5729
+#: fe-connect.c:5772
 #, 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"
+msgstr "ATTENTION : le fichier de mots de passe « %s » n'est pas un fichier texte\n"
 
-#: fe-connect.c:5738
+#: fe-connect.c:5781
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr ""
-"ATTENTION : le fichier de mots de passe « %s » a des droits d'accès en\n"
-"lecture pour le groupe ou universel ; les droits devraient être u=rw (0600)\n"
-"ou inférieur\n"
+"ATTENTION : le fichier de mots de passe « %s » a des droits d'accès en\n"
+"lecture pour le groupe ou universel ; les droits devraient être u=rw (0600)\n"
+"ou inférieur\n"
 
-#: fe-connect.c:5844
+#: fe-connect.c:5895
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
-msgstr "mot de passe récupéré dans le fichier fichier « %s »\n"
+msgstr "mot de passe récupéré dans le fichier fichier « %s »\n"
 
 #: fe-exec.c:825
 msgid "NOTICE"
 msgstr "NOTICE"
 
-#: fe-exec.c:1122 fe-exec.c:1180 fe-exec.c:1226
+#: fe-exec.c:1139 fe-exec.c:1197 fe-exec.c:1243
 msgid "command string is a null pointer\n"
-msgstr "la chaîne de commande est un pointeur nul\n"
+msgstr "la chaîne de commande est un pointeur nul\n"
 
-#: fe-exec.c:1186 fe-exec.c:1232 fe-exec.c:1327
+#: fe-exec.c:1203 fe-exec.c:1249 fe-exec.c:1344
 msgid "number of parameters must be between 0 and 65535\n"
-msgstr "le nombre de paramètres doit être compris entre 0 et 65535\n"
+msgstr "le nombre de paramètres doit être compris entre 0 et 65535\n"
 
-#: fe-exec.c:1220 fe-exec.c:1321
+#: fe-exec.c:1237 fe-exec.c:1338
 msgid "statement name is a null pointer\n"
 msgstr "le nom de l'instruction est un pointeur nul\n"
 
-#: fe-exec.c:1240 fe-exec.c:1404 fe-exec.c:2119 fe-exec.c:2318
+#: fe-exec.c:1257 fe-exec.c:1420 fe-exec.c:2135 fe-exec.c:2334
 msgid "function requires at least protocol version 3.0\n"
-msgstr "la fonction nécessite au minimum le protocole 3.0\n"
+msgstr "la fonction nécessite au minimum le protocole 3.0\n"
 
-#: fe-exec.c:1358
+#: fe-exec.c:1375
 msgid "no connection to the server\n"
 msgstr "aucune connexion au serveur\n"
 
-#: fe-exec.c:1365
+#: fe-exec.c:1382
 msgid "another command is already in progress\n"
-msgstr "une autre commande est déjà en cours\n"
+msgstr "une autre commande est déjà en cours\n"
 
-#: fe-exec.c:1480
+#: fe-exec.c:1496
 msgid "length must be given for binary parameter\n"
-msgstr "la longueur doit être indiquée pour les paramètres binaires\n"
+msgstr "la longueur doit être indiquée pour les paramètres binaires\n"
 
-#: fe-exec.c:1749
+#: fe-exec.c:1765
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "asyncStatus inattendu : %d\n"
 
-#: fe-exec.c:1769
+#: fe-exec.c:1785
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
-msgstr "échec de PGEventProc « %s » lors de l'événement PGEVT_RESULTCREATE\n"
+msgstr "échec de PGEventProc « %s » lors de l'événement PGEVT_RESULTCREATE\n"
 
-#: fe-exec.c:1929
+#: fe-exec.c:1945
 msgid "COPY terminated by new PQexec"
-msgstr "COPY terminé par un nouveau PQexec"
+msgstr "COPY terminé par un nouveau PQexec"
 
-#: fe-exec.c:1937
+#: fe-exec.c:1953
 msgid "COPY IN state must be terminated first\n"
-msgstr "l'état COPY IN doit d'abord être terminé\n"
+msgstr "l'état COPY IN doit d'abord être terminé\n"
 
-#: fe-exec.c:1957
+#: fe-exec.c:1973
 msgid "COPY OUT state must be terminated first\n"
-msgstr "l'état COPY OUT doit d'abord être terminé\n"
+msgstr "l'état COPY OUT doit d'abord être terminé\n"
 
-#: fe-exec.c:1965
+#: fe-exec.c:1981
 msgid "PQexec not allowed during COPY BOTH\n"
-msgstr "PQexec non autorisé pendant COPY BOTH\n"
+msgstr "PQexec non autorisé pendant COPY BOTH\n"
 
-#: fe-exec.c:2208 fe-exec.c:2275 fe-exec.c:2365 fe-protocol2.c:1352
+#: fe-exec.c:2224 fe-exec.c:2291 fe-exec.c:2381 fe-protocol2.c:1352
 #: fe-protocol3.c:1752
 msgid "no COPY in progress\n"
 msgstr "aucun COPY en cours\n"
 
-#: fe-exec.c:2555
+#: fe-exec.c:2571
 msgid "connection in wrong state\n"
-msgstr "connexion dans un état erroné\n"
+msgstr "connexion dans un état erroné\n"
 
-#: fe-exec.c:2586
+#: fe-exec.c:2602
 msgid "invalid ExecStatusType code"
 msgstr "code ExecStatusType invalide"
 
-#: fe-exec.c:2650 fe-exec.c:2673
+#: fe-exec.c:2666 fe-exec.c:2689
 #, c-format
 msgid "column number %d is out of range 0..%d"
-msgstr "le numéro de colonne %d est en dehors des limites 0..%d"
+msgstr "le numéro de colonne %d est en dehors des limites 0..%d"
 
-#: fe-exec.c:2666
+#: fe-exec.c:2682
 #, c-format
 msgid "row number %d is out of range 0..%d"
-msgstr "le numéro de ligne %d est en dehors des limites 0..%d"
+msgstr "le numéro de ligne %d est en dehors des limites 0..%d"
 
-#: fe-exec.c:2688
+#: fe-exec.c:2704
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
-msgstr "le numéro de paramètre %d est en dehors des limites 0..%d"
+msgstr "le numéro de paramètre %d est en dehors des limites 0..%d"
 
-#: fe-exec.c:2998
+#: fe-exec.c:3014
 #, c-format
 msgid "could not interpret result from server: %s"
-msgstr "n'a pas pu interpréter la réponse du serveur : %s"
+msgstr "n'a pas pu interpréter la réponse du serveur : %s"
 
-#: fe-exec.c:3237 fe-exec.c:3321
+#: fe-exec.c:3253 fe-exec.c:3337
 msgid "incomplete multibyte character\n"
-msgstr "caractère multi-octet incomplet\n"
+msgstr "caractère multi-octet incomplet\n"
 
 #: fe-lobj.c:155
 msgid "cannot determine OID of function lo_truncate\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_truncate\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_truncate\n"
 
 #: fe-lobj.c:171
 msgid "argument of lo_truncate exceeds integer range\n"
-msgstr "l'argument de lo_truncate dépasse l'échelle des entiers\n"
+msgstr "l'argument de lo_truncate dépasse l'échelle des entiers\n"
 
 #: fe-lobj.c:222
 msgid "cannot determine OID of function lo_truncate64\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_truncate64\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_truncate64\n"
 
 #: fe-lobj.c:280
 msgid "argument of lo_read exceeds integer range\n"
-msgstr "l'argument de lo_read dépasse l'échelle des entiers\n"
+msgstr "l'argument de lo_read dépasse l'échelle des entiers\n"
 
 #: fe-lobj.c:335
 msgid "argument of lo_write exceeds integer range\n"
-msgstr "l'argument de lo_write dépasse l'échelle des entiers\n"
+msgstr "l'argument de lo_write dépasse l'échelle des entiers\n"
 
 #: fe-lobj.c:426
 msgid "cannot determine OID of function lo_lseek64\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_lseek64\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_lseek64\n"
 
 #: fe-lobj.c:522
 msgid "cannot determine OID of function lo_create\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_create\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_create\n"
 
 #: fe-lobj.c:601
 msgid "cannot determine OID of function lo_tell64\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_tell64\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_tell64\n"
 
 #: fe-lobj.c:707 fe-lobj.c:816
 #, c-format
 msgid "could not open file \"%s\": %s\n"
-msgstr "n'a pas pu ouvrir le fichier « %s » : %s\n"
+msgstr "n'a pas pu ouvrir le fichier « %s » : %s\n"
 
 #: fe-lobj.c:762
 #, c-format
 msgid "could not read from file \"%s\": %s\n"
-msgstr "n'a pas pu lire le fichier « %s » : %s\n"
+msgstr "n'a pas pu lire le fichier « %s » : %s\n"
 
 #: fe-lobj.c:836 fe-lobj.c:860
 #, c-format
 msgid "could not write to file \"%s\": %s\n"
-msgstr "n'a pas pu écrire dans le fichier « %s » : %s\n"
+msgstr "n'a pas pu écrire dans le fichier « %s » : %s\n"
 
 #: fe-lobj.c:947
 msgid "query to initialize large object functions did not return data\n"
 msgstr ""
-"la requête d'initialisation des fonctions pour « Larges Objects » ne renvoie\n"
-"pas de données\n"
+"la requête d'initialisation des fonctions pour « Larges Objects » ne renvoie\n"
+"pas de données\n"
 
 #: fe-lobj.c:996
 msgid "cannot determine OID of function lo_open\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_open\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_open\n"
 
 #: fe-lobj.c:1003
 msgid "cannot determine OID of function lo_close\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_close\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_close\n"
 
 #: fe-lobj.c:1010
 msgid "cannot determine OID of function lo_creat\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_creat\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_creat\n"
 
 #: fe-lobj.c:1017
 msgid "cannot determine OID of function lo_unlink\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_unlink\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_unlink\n"
 
 #: fe-lobj.c:1024
 msgid "cannot determine OID of function lo_lseek\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_lseek\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_lseek\n"
 
 #: fe-lobj.c:1031
 msgid "cannot determine OID of function lo_tell\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lo_tell\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lo_tell\n"
 
 #: fe-lobj.c:1038
 msgid "cannot determine OID of function loread\n"
-msgstr "ne peut pas déterminer l'OID de la fonction loread\n"
+msgstr "ne peut pas déterminer l'OID de la fonction loread\n"
 
 #: fe-lobj.c:1045
 msgid "cannot determine OID of function lowrite\n"
-msgstr "ne peut pas déterminer l'OID de la fonction lowrite\n"
+msgstr "ne peut pas déterminer l'OID de la fonction lowrite\n"
 
 #: fe-misc.c:295
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
-msgstr "entier de taille %lu non supporté par pqGetInt"
+msgstr "entier de taille %lu non supporté par pqGetInt"
 
 #: fe-misc.c:331
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
-msgstr "entier de taille %lu non supporté par pqPutInt"
+msgstr "entier de taille %lu non supporté par pqPutInt"
 
 #: fe-misc.c:642 fe-misc.c:843
 msgid "connection not open\n"
 msgstr "la connexion n'est pas active\n"
 
-#: fe-misc.c:812 fe-secure-openssl.c:249 fe-secure-openssl.c:355
+#: fe-misc.c:812 fe-secure-openssl.c:230 fe-secure-openssl.c:339
 #: fe-secure.c:253 fe-secure.c:362
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
 "\tbefore or while processing the request.\n"
 msgstr ""
-"la connexion au serveur a été coupée de façon inattendue\n"
-"\tLe serveur s'est peut-être arrêté anormalement avant ou durant le\n"
-"\ttraitement de la requête.\n"
+"la connexion au serveur a été coupée de façon inattendue\n"
+"\tLe serveur s'est peut-être arrêté anormalement avant ou durant le\n"
+"\ttraitement de la requête.\n"
 
 #: fe-misc.c:1016
 msgid "timeout expired\n"
-msgstr "le délai est dépassé\n"
+msgstr "le délai est dépassé\n"
 
 #: fe-misc.c:1061
 msgid "socket not open\n"
@@ -675,58 +663,58 @@
 #: fe-misc.c:1084
 #, c-format
 msgid "select() failed: %s\n"
-msgstr "échec de select() : %s\n"
+msgstr "échec de select() : %s\n"
 
 #: 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"
+msgstr "état setenv %c invalide, indiquant probablement une corruption de la mémoire\n"
 
 #: 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"
+msgstr "état %c invalide, indiquant probablement une corruption de la mémoire\n"
 
 #: 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"
+msgstr "le message de type 0x%02x est arrivé alors que le serveur était en attente"
 
 #: fe-protocol2.c:503 fe-protocol2.c:538 fe-protocol2.c:1049 fe-protocol3.c:209
 #: fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:333 fe-protocol3.c:720
 #: fe-protocol3.c:1037
 msgid "out of memory"
-msgstr "mémoire épuisée"
+msgstr "mémoire épuisée"
 
 #: fe-protocol2.c:529
 #, 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 »)"
+"caractère %c inattendu à la suite d'une réponse de requête vide (message\n"
+"« I »)"
 
 #: fe-protocol2.c:595
 #, c-format
 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 »)"
+"le serveur a envoyé des données (message « D ») sans description préalable\n"
+"de la ligne (message « T »)"
 
 #: fe-protocol2.c:613
 #, c-format
 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 »)"
+"le serveur a envoyé des données binaires (message « B ») sans description\n"
+"préalable de la ligne (message « T »)"
 
 #: fe-protocol2.c:633 fe-protocol3.c:412
 #, 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"
+msgstr "réponse inattendue du serveur, le premier caractère reçu étant « %c »\n"
 
 #: fe-protocol2.c:762 fe-protocol2.c:937 fe-protocol3.c:627 fe-protocol3.c:841
 msgid "out of memory for query result"
-msgstr "mémoire épuisée pour le résultat de la requête"
+msgstr "mémoire épuisée pour le résultat de la requête"
 
 #: fe-protocol2.c:1395 fe-protocol3.c:1821
 #, c-format
@@ -736,7 +724,7 @@
 #: fe-protocol2.c:1407
 #, c-format
 msgid "lost synchronization with server, resetting connection"
-msgstr "synchronisation perdue avec le serveur, réinitialisation de la connexion"
+msgstr "synchronisation perdue avec le serveur, réinitialisation de la connexion"
 
 #: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:2024
 #, c-format
@@ -746,53 +734,53 @@
 #: fe-protocol3.c:368
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
 msgstr ""
-"le serveur a envoyé des données (message « D ») sans description préalable\n"
-"de la ligne (message « T »)\n"
+"le serveur a envoyé des données (message « D ») sans description préalable\n"
+"de la ligne (message « T »)\n"
 
 #: fe-protocol3.c:433
 #, 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"
+"« %c »\n"
 
 #: fe-protocol3.c:454
 #, 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"
+"synchronisation perdue avec le serveur : a reçu le type de message « %c »,\n"
 "longueur %d\n"
 
 #: fe-protocol3.c:505 fe-protocol3.c:545
 msgid "insufficient data in \"T\" message"
-msgstr "données insuffisantes dans le message « T »"
+msgstr "données insuffisantes dans le message « T »"
 
 #: fe-protocol3.c:578
 msgid "extraneous data in \"T\" message"
-msgstr "données supplémentaires dans le message « T »"
+msgstr "données supplémentaires dans le message « T »"
 
 #: fe-protocol3.c:749 fe-protocol3.c:781 fe-protocol3.c:799
 msgid "insufficient data in \"D\" message"
-msgstr "données insuffisantes dans le message « D »"
+msgstr "données insuffisantes dans le message « D »"
 
 #: fe-protocol3.c:755
 msgid "unexpected field count in \"D\" message"
-msgstr "nombre de champs inattendu dans le message « D »"
+msgstr "nombre de champs inattendu dans le message « D »"
 
 #: fe-protocol3.c:808
 msgid "extraneous data in \"D\" message"
-msgstr "données supplémentaires dans le message « D »"
+msgstr "données supplémentaires dans le message « D »"
 
 #. translator: %s represents a digit string
 #: fe-protocol3.c:940 fe-protocol3.c:959
 #, c-format
 msgid " at character %s"
-msgstr " au caractère %s"
+msgstr " au caractère %s"
 
 #: fe-protocol3.c:972
 #, c-format
 msgid "DETAIL:  %s\n"
-msgstr "DÉTAIL : %s\n"
+msgstr "DÉTAIL : %s\n"
 
 #: fe-protocol3.c:975
 #, c-format
@@ -802,7 +790,7 @@
 #: fe-protocol3.c:978
 #, c-format
 msgid "QUERY:  %s\n"
-msgstr "REQUÊTE : %s\n"
+msgstr "REQUÊTE : %s\n"
 
 #: fe-protocol3.c:981
 #, c-format
@@ -812,7 +800,7 @@
 #: fe-protocol3.c:988
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
-msgstr "NOM DE SCHÉMA : %s\n"
+msgstr "NOM DE SCHÉMA : %s\n"
 
 #: fe-protocol3.c:992
 #, c-format
@@ -827,7 +815,7 @@
 #: fe-protocol3.c:1000
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
-msgstr "NOM DU TYPE DE DONNÉES : %s\n"
+msgstr "NOM DU TYPE DE DONNÉES : %s\n"
 
 #: fe-protocol3.c:1004
 #, c-format
@@ -855,160 +843,155 @@
 
 #: fe-protocol3.c:1646
 msgid "PQgetline: not doing text COPY OUT\n"
-msgstr "PQgetline : ne va pas réaliser un COPY OUT au format texte\n"
-
-#: fe-secure-openssl.c:146 fe-secure-openssl.c:1006 fe-secure-openssl.c:1226
-#, c-format
-msgid "could not acquire mutex: %s\n"
-msgstr "n'a pas pu acquérir le mutex : %s\n"
+msgstr "PQgetline : ne va pas réaliser un COPY OUT au format texte\n"
 
-#: fe-secure-openssl.c:158
-#, c-format
-msgid "could not establish SSL connection: %s\n"
-msgstr "n'a pas pu établir la connexion SSL : %s\n"
-
-#: fe-secure-openssl.c:254 fe-secure-openssl.c:360 fe-secure-openssl.c:1349
+#: fe-secure-openssl.c:235 fe-secure-openssl.c:344 fe-secure-openssl.c:1322
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "erreur SYSCALL SSL : %s\n"
 
-#: fe-secure-openssl.c:261 fe-secure-openssl.c:367 fe-secure-openssl.c:1353
+#: fe-secure-openssl.c:242 fe-secure-openssl.c:351 fe-secure-openssl.c:1326
 msgid "SSL SYSCALL error: EOF detected\n"
-msgstr "erreur SYSCALL SSL : EOF détecté\n"
+msgstr "erreur SYSCALL SSL : EOF détecté\n"
 
-#: fe-secure-openssl.c:272 fe-secure-openssl.c:378 fe-secure-openssl.c:1362
+#: fe-secure-openssl.c:253 fe-secure-openssl.c:362 fe-secure-openssl.c:1335
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "erreur SSL : %s\n"
 
-#: fe-secure-openssl.c:287 fe-secure-openssl.c:393
+#: fe-secure-openssl.c:268 fe-secure-openssl.c:377
 msgid "SSL connection has been closed unexpectedly\n"
-msgstr "la connexion SSL a été fermée de façon inattendu\n"
+msgstr "la connexion SSL a été fermée de façon inattendu\n"
 
-#: fe-secure-openssl.c:293 fe-secure-openssl.c:399 fe-secure-openssl.c:1371
+#: fe-secure-openssl.c:274 fe-secure-openssl.c:383 fe-secure-openssl.c:1344
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "code d'erreur SSL inconnu : %d\n"
 
-#: fe-secure-openssl.c:511
+#: fe-secure-openssl.c:494
 msgid "SSL certificate's name entry is missing\n"
-msgstr "l'entrée du nom du certificat SSL est manquante\n"
+msgstr "l'entrée du nom du certificat SSL est manquante\n"
 
-#: fe-secure-openssl.c:541
+#: fe-secure-openssl.c:528
 msgid "SSL certificate's name contains embedded null\n"
 msgstr "le nom du certificat SSL contient des NULL\n"
 
-#: fe-secure-openssl.c:592
+#: fe-secure-openssl.c:579
 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"
+msgstr "le nom d'hôte doit être précisé pour une connexion SSL vérifiée\n"
 
-#: fe-secure-openssl.c:692
+#: fe-secure-openssl.c:679
 #, c-format
 msgid "server certificate for \"%s\" does not match host name \"%s\"\n"
-msgstr "le certificat serveur pour « %s » ne correspond pas au nom d'hôte « %s »\n"
+msgstr "le certificat serveur pour « %s » ne correspond pas au nom d'hôte « %s »\n"
 
-#: fe-secure-openssl.c:698
+#: fe-secure-openssl.c:685
 msgid "could not get server's host name from server certificate\n"
-msgstr "n'a pas pu récupérer le nom d'hôte du serveur à partir du certificat serveur\n"
+msgstr "n'a pas pu récupérer le nom d'hôte du serveur à partir du certificat serveur\n"
 
-#: fe-secure-openssl.c:845
+#: fe-secure-openssl.c:929
 #, c-format
 msgid "could not create SSL context: %s\n"
-msgstr "n'a pas pu créer le contexte SSL : %s\n"
+msgstr "n'a pas pu créer le contexte SSL : %s\n"
+
+#: fe-secure-openssl.c:966
+#, 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-openssl.c:994
+#, 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-openssl.c:1022
+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'a pas pu obtenir le répertoire personnel pour situer le fichier de certificat racine.\n"
+"Fournissez le fichier ou modifiez sslmode pour désactiver la vérification du\n"
+"certificat par le serveur.\n"
 
-#: fe-secure-openssl.c:976
+#: fe-secure-openssl.c:1026
+#, 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 ""
+"le fichier de certificat racine « %s » n'existe pas.\n"
+"Fournissez le fichier ou modifiez sslmode pour désactiver la vérification du\n"
+"certificat par le serveur.\n"
+
+#: fe-secure-openssl.c:1057
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
-msgstr "n'a pas pu ouvrir le certificat « %s » : %s\n"
+msgstr "n'a pas pu ouvrir le certificat « %s » : %s\n"
 
-#: fe-secure-openssl.c:1015 fe-secure-openssl.c:1030
+#: fe-secure-openssl.c:1076
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
-msgstr "n'a pas pu lire le certificat « %s » : %s\n"
+msgstr "n'a pas pu lire le certificat « %s » : %s\n"
+
+#: fe-secure-openssl.c:1100
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "n'a pas pu établir la connexion SSL : %s\n"
 
-#: fe-secure-openssl.c:1085
+#: fe-secure-openssl.c:1154
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
-msgstr "n'a pas pu charger le moteur SSL « %s » : %s\n"
+msgstr "n'a pas pu charger le moteur SSL « %s » : %s\n"
 
-#: fe-secure-openssl.c:1097
+#: fe-secure-openssl.c:1166
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
-msgstr "n'a pas pu initialiser le moteur SSL « %s » : %s\n"
+msgstr "n'a pas pu initialiser le moteur SSL « %s » : %s\n"
 
-#: fe-secure-openssl.c:1113
+#: fe-secure-openssl.c:1182
 #, 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"
+msgstr "n'a pas pu lire la clé privée SSL « %s » à partir du moteur « %s » : %s\n"
 
-#: fe-secure-openssl.c:1127
+#: fe-secure-openssl.c:1196
 #, 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"
+msgstr "n'a pas pu charger la clé privée SSL « %s » à partir du moteur « %s » : %s\n"
 
-#: fe-secure-openssl.c:1164
+#: fe-secure-openssl.c:1233
 #, 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"
+msgstr "le certificat est présent, mais la clé privée « %s » est absente\n"
 
-#: fe-secure-openssl.c:1172
+#: fe-secure-openssl.c:1241
 #, c-format
 msgid "private key file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr ""
-"le fichier de la clé privée « %s » a des droits d'accès en lecture\n"
-"pour le groupe ou universel ; les droits devraient être u=rw (0600)\n"
-"ou inférieur\n"
+"le fichier de la clé privée « %s » a des droits d'accès en lecture\n"
+"pour le groupe ou universel ; les droits devraient être u=rw (0600)\n"
+"ou inférieur\n"
 
-#: fe-secure-openssl.c:1183
+#: fe-secure-openssl.c:1252
 #, 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"
+msgstr "n'a pas pu charger le fichier de clé privée « %s » : %s\n"
 
-#: fe-secure-openssl.c:1197
+#: fe-secure-openssl.c:1266
 #, 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"
+msgstr "le certificat ne correspond pas à la clé privée « %s » : %s\n"
 
-#: fe-secure-openssl.c:1235
-#, 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-openssl.c:1265
-#, 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-openssl.c:1298
-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'a pas pu obtenir le répertoire personnel pour situer le fichier de certificat racine.\n"
-"Fournissez le fichier ou modifiez sslmode pour désactiver la vérification du\n"
-"certificat par le serveur.\n"
-
-#: fe-secure-openssl.c:1302
-#, 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 ""
-"le fichier de certificat racine « %s » n'existe pas.\n"
-"Fournissez le fichier ou modifiez sslmode pour désactiver la vérification du\n"
-"certificat par le serveur.\n"
-
-#: fe-secure-openssl.c:1390
+#: fe-secure-openssl.c:1365
 #, c-format
 msgid "certificate could not be obtained: %s\n"
-msgstr "le certificat n'a pas pu être obtenu : %s\n"
+msgstr "le certificat n'a pas pu être obtenu : %s\n"
 
-#: fe-secure-openssl.c:1482
+#: fe-secure-openssl.c:1457
 #, c-format
 msgid "no SSL error reported"
-msgstr "aucune erreur SSL reportée"
+msgstr "aucune erreur SSL reportée"
 
-#: fe-secure-openssl.c:1491
+#: fe-secure-openssl.c:1466
 #, c-format
 msgid "SSL error code %lu"
 msgstr "erreur SSL %lu"
@@ -1016,51 +999,66 @@
 #: fe-secure.c:261
 #, 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"
+msgstr "n'a pas pu recevoir des données depuis le serveur : %s\n"
 
 #: fe-secure.c:369
 #, c-format
 msgid "could not send data to server: %s\n"
-msgstr "n'a pas pu transmettre les données au serveur : %s\n"
+msgstr "n'a pas pu transmettre les données au serveur : %s\n"
 
 #: win32.c:317
 #, c-format
 msgid "unrecognized socket error: 0x%08X/%d"
 msgstr "erreur de socket non reconnue : 0x%08X/%d"
 
-#~ msgid "could not set socket to blocking mode: %s\n"
-#~ msgstr "n'a pas pu activer le mode bloquant pour la socket : %s\n"
+#~ msgid "unrecognized return value from row processor"
+#~ msgstr "valeur de retour du traitement de la ligne non reconnue"
 
-#~ msgid "Kerberos 5 authentication rejected: %*s\n"
-#~ msgstr "authentification Kerberos 5 rejetée : %*s\n"
+#~ msgid "invalid sslverify value: \"%s\"\n"
+#~ msgstr "valeur sslverify invalide : « %s »\n"
 
-#~ msgid "could not restore nonblocking mode on socket: %s\n"
-#~ msgstr "n'a pas pu rétablir le mode non-bloquant pour la socket : %s\n"
+#~ 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 "could not read private key file \"%s\": %s\n"
+#~ msgstr "n'a pas pu lire la 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 open private key file \"%s\": %s\n"
+#~ msgstr "n'a pas pu ouvrir le fichier de clé privée « %s » : %s\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 get home directory to locate client certificate files\n"
 #~ msgstr ""
-#~ "n'a pas pu récupérer le répertoire personnel pour trouver les certificats\n"
+#~ "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 restore nonblocking mode on socket: %s\n"
+#~ msgstr "n'a pas pu rétablir le mode non-bloquant pour la socket : %s\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 "Kerberos 5 authentication rejected: %*s\n"
+#~ msgstr "authentification Kerberos 5 rejetée : %*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 set socket to blocking mode: %s\n"
+#~ msgstr "n'a pas pu activer le mode bloquant pour la socket : %s\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 acquire mutex: %s\n"
+#~ msgstr "n'a pas pu acquérir le mutex : %s\n"
 
-#~ 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 "setsockopt(SO_KEEPALIVE) failed: %s\n"
+#~ msgstr "setsockopt(SO_KEEPALIVE) a échoué : %s\n"
 
-#~ msgid "invalid sslverify value: \"%s\"\n"
-#~ msgstr "valeur sslverify invalide : « %s »\n"
+#~ msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
+#~ msgstr "setsockopt(TCP_KEEPINTVL) a échoué : %s\n"
 
-#~ msgid "unrecognized return value from row processor"
-#~ msgstr "valeur de retour du traitement de la ligne non reconnue"
+#~ msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
+#~ msgstr "setsockopt(TCP_KEEPALIVE) a échoué : %s\n"
+
+#~ msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
+#~ msgstr "setsockopt(TCP_KEEPIDLE) a échoué : %s\n"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/po/it.po postgresql-9.5-9.5.8/src/interfaces/libpq/po/it.po
--- postgresql-9.5-9.5.2/src/interfaces/libpq/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -40,8 +40,8 @@
 msgstr ""
 "Project-Id-Version: libpq (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-19 17:38+0000\n"
-"PO-Revision-Date: 2015-07-20 00:30+0100\n"
+"POT-Creation-Date: 2017-05-22 15:46+0000\n"
+"PO-Revision-Date: 2017-05-23 01:18+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -50,14 +50,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 # DV: non ne sono convinto
 #: fe-auth.c:148
 msgid "GSSAPI continuation error"
 msgstr "GSSAPI errore di continuazione"
 
-#: fe-auth.c:177 fe-auth.c:410
+#: fe-auth.c:177 fe-auth.c:412
 msgid "host name must be specified\n"
 msgstr "il nome dell'host deve essere specificato\n"
 
@@ -65,14 +65,14 @@
 msgid "duplicate GSS authentication request\n"
 msgstr "richiesta di autenticazione GSS duplicata\n"
 
-#: fe-auth.c:197 fe-auth.c:307 fe-auth.c:381 fe-auth.c:416 fe-auth.c:512
-#: fe-auth.c:778 fe-connect.c:701 fe-connect.c:898 fe-connect.c:1074
-#: fe-connect.c:2085 fe-connect.c:3477 fe-connect.c:3729 fe-connect.c:3848
-#: fe-connect.c:4088 fe-connect.c:4168 fe-connect.c:4267 fe-connect.c:4519
-#: fe-connect.c:4548 fe-connect.c:4620 fe-connect.c:4638 fe-connect.c:4734
-#: fe-connect.c:5068 fe-connect.c:5218 fe-exec.c:3339 fe-exec.c:3504
-#: fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1571
-#: fe-secure-openssl.c:527 fe-secure-openssl.c:1069
+#: fe-auth.c:197 fe-auth.c:309 fe-auth.c:383 fe-auth.c:418 fe-auth.c:514
+#: fe-auth.c:793 fe-connect.c:707 fe-connect.c:904 fe-connect.c:1080
+#: fe-connect.c:2091 fe-connect.c:3483 fe-connect.c:3735 fe-connect.c:3854
+#: fe-connect.c:4094 fe-connect.c:4174 fe-connect.c:4273 fe-connect.c:4529
+#: fe-connect.c:4558 fe-connect.c:4630 fe-connect.c:4654 fe-connect.c:4672
+#: fe-connect.c:4768 fe-connect.c:5102 fe-connect.c:5252 fe-exec.c:3355
+#: fe-exec.c:3520 fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1613
+#: fe-secure-openssl.c:514 fe-secure-openssl.c:1138
 msgid "out of memory\n"
 msgstr "memoria esaurita\n"
 
@@ -81,74 +81,78 @@
 msgid "GSSAPI name import error"
 msgstr "errore di importazione del nome GSSAPI"
 
-#: fe-auth.c:296
+#: fe-auth.c:298
 msgid "SSPI continuation error"
 msgstr "SSPI errore di continuazione"
 
-#: fe-auth.c:396
+#: fe-auth.c:398
 msgid "could not acquire SSPI credentials"
 msgstr "non è stato possibile ottenere le credenziali SSPI"
 
-#: fe-auth.c:487
+#: fe-auth.c:489
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "il metodo di autenticazione SCM_CRED non è supportato\n"
 
-#: fe-auth.c:563
+#: fe-auth.c:565
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "l'autenticazione Kerberos 4 non è supportata\n"
 
-#: fe-auth.c:568
+#: fe-auth.c:570
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "l'autenticazione Kerberos 5 non è supportata\n"
 
-#: fe-auth.c:639
+#: fe-auth.c:641
 msgid "GSSAPI authentication not supported\n"
 msgstr "l'autenticazione GSSAPI non è supportata\n"
 
-#: fe-auth.c:671
+#: fe-auth.c:673
 msgid "SSPI authentication not supported\n"
 msgstr "l'autenticazione SSPI non è supportata\n"
 
-#: fe-auth.c:679
+#: fe-auth.c:681
 msgid "Crypt authentication not supported\n"
 msgstr "l'autenticazione Crypt non è supportata\n"
 
-#: fe-auth.c:706
+#: fe-auth.c:716
+msgid "SCRAM authentication requires libpq version 10 or above\n"
+msgstr "l'autenticazione SCRAM richiede libpq versione 10 o successiva\n"
+
+#: fe-auth.c:721
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "l'autenticazione %u non è supportata\n"
 
-#: fe-auth.c:753
+#: fe-auth.c:768
 #, c-format
 msgid "user name lookup failure: error code %lu\n"
 msgstr "ricerca del nome utente fallita: codice di errore %lu\n"
 
-#: fe-auth.c:763 fe-connect.c:2012
+#: fe-auth.c:778 fe-connect.c:2018
 #, c-format
 msgid "could not look up local user ID %d: %s\n"
 msgstr "ricerca dell'ID utente locale %d non riuscita: %s\n"
 
-#: fe-auth.c:768 fe-connect.c:2017
+#: fe-auth.c:783 fe-connect.c:2023
 #, c-format
 msgid "local user with ID %d does not exist\n"
 msgstr "l'utente locale con ID %d non esiste\n"
 
-#: fe-connect.c:840
+#: fe-connect.c:846
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "valore sslmode errato: \"%s\"\n"
 
-#: fe-connect.c:861
+#: fe-connect.c:867
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr "valore sslmode \"%s\" non valido quando il supporto SSL non è compilato\n"
 
-#: fe-connect.c:1098
+#: fe-connect.c:1104
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "impostazione del socket in modalità TCP no delay fallita: %s\n"
 
-#: fe-connect.c:1128
+#: fe-connect.c:1134
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -159,7 +163,7 @@
 "\tVerifica che il server locale sia in funzione e che\n"
 "\taccetti connessioni sul socket di dominio Unix \"%s\"\n"
 
-#: fe-connect.c:1183
+#: fe-connect.c:1189
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -170,7 +174,7 @@
 "\tVerifica che il server all'indirizzo \"%s\" (%s) sia in funzione\n"
 "\te che accetti connessioni TCP/IP sulla porta %s\n"
 
-#: fe-connect.c:1192
+#: fe-connect.c:1198
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -181,302 +185,302 @@
 "\tVerifica che il server all'indirizzo \"%s\" sia in funzione\n"
 "\te che accetti connessioni TCP/IP sulla porta %s\n"
 
-#: fe-connect.c:1243
+#: fe-connect.c:1249
 #, c-format
 msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
 msgstr "chiamata setsockopt(TCP_KEEPIDLE) fallita: %s\n"
 
-#: fe-connect.c:1256
+#: fe-connect.c:1262
 #, c-format
 msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
 msgstr "chiamata setsockopt(TCP_KEEPALIVE) fallita: %s\n"
 
-#: fe-connect.c:1288
+#: fe-connect.c:1294
 #, c-format
 msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
 msgstr "chiamata setsockopt(TCP_KEEPINTVL) fallita: %s\n"
 
-#: fe-connect.c:1320
+#: fe-connect.c:1326
 #, c-format
 msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
 msgstr "chiamata setsockopt(TCP_KEEPCNT) fallita: %s\n"
 
-#: fe-connect.c:1368
+#: fe-connect.c:1374
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "chiamata WSAIoctl(SIO_KEEPALIVE_VALS) fallito: %ui\n"
 
-#: fe-connect.c:1420
+#: fe-connect.c:1426
 #, c-format
 msgid "invalid port number: \"%s\"\n"
 msgstr "numero di porta non valido: \"%s\"\n"
 
-#: fe-connect.c:1453
+#: fe-connect.c:1459
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)\n"
 msgstr "Il percorso del socket di dominio unix \"%s\" è troppo lungo (massimo %d byte)\n"
 
-#: fe-connect.c:1472
+#: fe-connect.c:1478
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "conversione del nome host \"%s\" in indirizzo fallita: %s\n"
 
-#: fe-connect.c:1476
+#: fe-connect.c:1482
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "conversione del percorso del socket di dominio Unix \"%s\" in indirizzo fallita: %s\n"
 
-#: fe-connect.c:1681
+#: fe-connect.c:1687
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "stato della connessione non valido, probabilmente indica una corruzione della memoria\n"
 
-#: fe-connect.c:1721
+#: fe-connect.c:1727
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "creazione del socket fallita: %s\n"
 
-#: fe-connect.c:1743
+#: fe-connect.c:1749
 #, c-format
 msgid "could not set socket to nonblocking mode: %s\n"
 msgstr "impostazione del socket in modalità non bloccante fallita: %s\n"
 
-#: fe-connect.c:1754
+#: fe-connect.c:1760
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s\n"
 msgstr "impostazione del socket in modalità close-on-exec fallita: %s\n"
 
-#: fe-connect.c:1773
+#: fe-connect.c:1779
 msgid "keepalives parameter must be an integer\n"
 msgstr "il parametro keepalives dev'essere un intero\n"
 
-#: fe-connect.c:1786
+#: fe-connect.c:1792
 #, c-format
 msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
 msgstr "chiamata setsockopt(SO_KEEPALIVE) fallita: %s\n"
 
-#: fe-connect.c:1923
+#: fe-connect.c:1929
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "lettura dello stato di errore del socket fallita: %s\n"
 
-#: fe-connect.c:1957
+#: fe-connect.c:1963
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "non è stato possibile ottenere l'indirizzo del client dal socket: %s\n"
 
-#: fe-connect.c:1999
+#: fe-connect.c:2005
 msgid "requirepeer parameter is not supported on this platform\n"
 msgstr "il parametro requirepeer non è supportato su questa piattaforma\n"
 
-#: fe-connect.c:2002
+#: fe-connect.c:2008
 #, c-format
 msgid "could not get peer credentials: %s\n"
 msgstr "non è stato possibile ottenere le credenziali del peer: %s\n"
 
-#: fe-connect.c:2025
+#: fe-connect.c:2031
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
 msgstr "requirepeer specifica \"%s\", ma il vero nome utente del peer è \"%s\"\n"
 
-#: fe-connect.c:2059
+#: fe-connect.c:2065
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "invio del pacchetto di negoziazione SSL fallito: %s\n"
 
-#: fe-connect.c:2098
+#: fe-connect.c:2104
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "invio del pacchetto di avvio fallito: %s\n"
 
-#: fe-connect.c:2168
+#: fe-connect.c:2174
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "il server non supporta SSL, ma SSL è stato richiesto\n"
 
-#: fe-connect.c:2194
+#: fe-connect.c:2200
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "ricevuta risposta errata alla negoziazione SSL: %c\n"
 
-#: fe-connect.c:2269 fe-connect.c:2302
+#: fe-connect.c:2275 fe-connect.c:2308
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "prevista richiesta di autenticazione dal server, ma è stato ricevuto %c\n"
 
-#: fe-connect.c:2469
+#: fe-connect.c:2475
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "errore di memoria nell'allocazione del buffer GSSAPI (%d)"
 
-#: fe-connect.c:2554
+#: fe-connect.c:2560
 msgid "unexpected message from server during startup\n"
 msgstr "messaggio imprevisto dal server durante l'avvio\n"
 
-#: fe-connect.c:2648
+#: fe-connect.c:2654
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption\n"
 msgstr "stato connessione errato %d, probabilmente indica una corruzione di memoria\n"
 
-#: fe-connect.c:3083 fe-connect.c:3143
+#: fe-connect.c:3089 fe-connect.c:3149
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "PGEventProc \"%s\" fallito durante l'evento PGEVT_CONNRESET\n"
 
-#: fe-connect.c:3490
+#: fe-connect.c:3496
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
 msgstr "URL LDAP \"%s\" non corretta: lo schema deve essere ldap://\n"
 
-#: fe-connect.c:3505
+#: fe-connect.c:3511
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
 msgstr "URL LDAP \"%s\" non corretta: distinguished name non trovato\n"
 
-#: fe-connect.c:3516 fe-connect.c:3569
+#: fe-connect.c:3522 fe-connect.c:3575
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
 msgstr "URL LDAP \"%s\" non corretta: deve avere esattamente un attributo\n"
 
-#: fe-connect.c:3526 fe-connect.c:3583
+#: fe-connect.c:3532 fe-connect.c:3589
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
 msgstr "URL LDAP \"%s\" non corretta: deve essere specificato la portata della ricerca (base/one/sub)\n"
 
-#: fe-connect.c:3537
+#: fe-connect.c:3543
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "URL LDAP \"%s\" non corretta: filtro non specificato\n"
 
-#: fe-connect.c:3558
+#: fe-connect.c:3564
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
 msgstr "URL LDAP \"%s\" non corretta: numero di porta non valido\n"
 
-#: fe-connect.c:3592
+#: fe-connect.c:3598
 msgid "could not create LDAP structure\n"
 msgstr "creazione della struttura dati LDAP fallita\n"
 
-#: fe-connect.c:3668
+#: fe-connect.c:3674
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "ricerca del server LDAP fallita: %s\n"
 
-#: fe-connect.c:3679
+#: fe-connect.c:3685
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "trovata più di una voce nella ricerca LDAP\n"
 
-#: fe-connect.c:3680 fe-connect.c:3692
+#: fe-connect.c:3686 fe-connect.c:3698
 msgid "no entry found on LDAP lookup\n"
 msgstr "nessun elemento trovato per la ricerca LDAP\n"
 
-#: fe-connect.c:3703 fe-connect.c:3716
+#: fe-connect.c:3709 fe-connect.c:3722
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "l'attributo non ha valori nella ricerca LDAP\n"
 
-#: fe-connect.c:3768 fe-connect.c:3787 fe-connect.c:4306
+#: fe-connect.c:3774 fe-connect.c:3793 fe-connect.c:4312
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "manca \"=\" dopo \"%s\" nella stringa di connessione\n"
 
-#: fe-connect.c:3860 fe-connect.c:4487 fe-connect.c:5201
+#: fe-connect.c:3866 fe-connect.c:4497 fe-connect.c:5235
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "opzione di connessione errata \"%s\"\n"
 
-#: fe-connect.c:3876 fe-connect.c:4355
+#: fe-connect.c:3882 fe-connect.c:4361
 msgid "unterminated quoted string in connection info string\n"
 msgstr "stringa tra virgolette non terminata nella stringa di connessione\n"
 
-#: fe-connect.c:3916
+#: fe-connect.c:3922
 msgid "could not get home directory to locate service definition file"
 msgstr "directory home non trovata per la localizzazione del file di definizione di servizio"
 
-#: fe-connect.c:3949
+#: fe-connect.c:3955
 #, c-format
 msgid "definition of service \"%s\" not found\n"
 msgstr "il file di definizione di servizio \"%s\" non è stato trovato\n"
 
-#: fe-connect.c:3972
+#: fe-connect.c:3978
 #, c-format
 msgid "service file \"%s\" not found\n"
 msgstr "il file di servizio \"%s\" non è stato trovato\n"
 
-#: fe-connect.c:3985
+#: fe-connect.c:3991
 #, c-format
 msgid "line %d too long in service file \"%s\"\n"
 msgstr "la riga %d nel file di servizio \"%s\" è troppo lunga\n"
 
-#: fe-connect.c:4056 fe-connect.c:4100
+#: fe-connect.c:4062 fe-connect.c:4106
 #, c-format
 msgid "syntax error in service file \"%s\", line %d\n"
 msgstr "errore di sintassi del file di servizio \"%s\", alla riga %d\n"
 
-#: fe-connect.c:4067
+#: fe-connect.c:4073
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d\n"
 msgstr "specifiche di servizio annidate non supportate nel file di servizio \"%s\", linea %d\n"
 
-#: fe-connect.c:4745
+#: fe-connect.c:4779
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\"\n"
 msgstr "URI invalida propagata alla routine di parsing interna: \"%s\"\n"
 
-#: fe-connect.c:4815
+#: fe-connect.c:4849
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\"\n"
 msgstr "fine stringa raggiunta cercando un \"]\" corrispondente nell'indirizzo host IPv6 nella URI: \"%s\"\n"
 
-#: fe-connect.c:4822
+#: fe-connect.c:4856
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\"\n"
 msgstr "l'indirizzo host IPv6 non dev'essere assente nella URI: \"%s\"\n"
 
-#: fe-connect.c:4837
+#: fe-connect.c:4871
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\"\n"
 msgstr "carattere inatteso \"%c\" in posizione %d nella uri URI (atteso \":\" oppure \"/\"): \"%s\"\n"
 
-#: fe-connect.c:4951
+#: fe-connect.c:4985
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\"\n"
 msgstr "separatore chiave/valore \"=\" in eccesso nei parametri della URI: \"%s\"\n"
 
-#: fe-connect.c:4971
+#: fe-connect.c:5005
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\"\n"
 msgstr "separatore chiave/valore \"=\" mancante nei parametri della URI: \"%s\"\n"
 
-#: fe-connect.c:5022
+#: fe-connect.c:5056
 #, c-format
 msgid "invalid URI query parameter: \"%s\"\n"
 msgstr "parametro URI non valido: \"%s\"\n"
 
-#: fe-connect.c:5096
+#: fe-connect.c:5130
 #, c-format
 msgid "invalid percent-encoded token: \"%s\"\n"
 msgstr "simbolo percent-encoded non valido \"%s\"\n"
 
-#: fe-connect.c:5106
+#: fe-connect.c:5140
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\"\n"
 msgstr "valore non ammesso %%00 nel valore percent-encoded: \"%s\"\n"
 
-#: fe-connect.c:5437
+#: fe-connect.c:5471
 msgid "connection pointer is NULL\n"
 msgstr "il puntatore della connessione è NULL\n"
 
-#: fe-connect.c:5723
+#: fe-connect.c:5757
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "ATTENZIONE: il file delle password \"%s\" non è un file regolare\n"
 
-#: fe-connect.c:5732
+#: fe-connect.c:5766
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr ""
 "ATTENZIONE: Il file delle password %s ha privilegi di accesso in lettura e scrittura per tutti;\n"
 "i permessi dovrebbero essere u=rw (0600) o inferiori\n"
 
-#: fe-connect.c:5838
+#: fe-connect.c:5880
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
 msgstr "password ottenuta dal file \"%s\"\n"
@@ -485,95 +489,95 @@
 msgid "NOTICE"
 msgstr "NOTIFICA"
 
-#: fe-exec.c:1122 fe-exec.c:1180 fe-exec.c:1226
+#: fe-exec.c:1139 fe-exec.c:1197 fe-exec.c:1243
 msgid "command string is a null pointer\n"
 msgstr "il testo del comando è un puntatore nullo\n"
 
-#: fe-exec.c:1186 fe-exec.c:1232 fe-exec.c:1327
+#: fe-exec.c:1203 fe-exec.c:1249 fe-exec.c:1344
 msgid "number of parameters must be between 0 and 65535\n"
 msgstr "il numero di parametri deve essere tra 0 e 65535\n"
 
-#: fe-exec.c:1220 fe-exec.c:1321
+#: fe-exec.c:1237 fe-exec.c:1338
 msgid "statement name is a null pointer\n"
 msgstr "il nome dell'istruzione è un puntatore nullo\n"
 
-#: fe-exec.c:1240 fe-exec.c:1404 fe-exec.c:2119 fe-exec.c:2318
+#: fe-exec.c:1257 fe-exec.c:1420 fe-exec.c:2135 fe-exec.c:2334
 msgid "function requires at least protocol version 3.0\n"
 msgstr "la funzione richiede almeno il protocollo versione 3.0\n"
 
-#: fe-exec.c:1358
+#: fe-exec.c:1375
 msgid "no connection to the server\n"
 msgstr "nessuna connessione al server\n"
 
-#: fe-exec.c:1365
+#: fe-exec.c:1382
 msgid "another command is already in progress\n"
 msgstr "un altro comando è in esecuzione\n"
 
-#: fe-exec.c:1480
+#: fe-exec.c:1496
 msgid "length must be given for binary parameter\n"
 msgstr "la lunghezza deve essere fornita per i parametri binari\n"
 
-#: fe-exec.c:1749
+#: fe-exec.c:1765
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "asyncStatus imprevisto: %d\n"
 
-#: fe-exec.c:1769
+#: fe-exec.c:1785
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "PGEventProc \"%s\" fallito durante l'evento PGEVT_RESULTCREATE\n"
 
-#: fe-exec.c:1929
+#: fe-exec.c:1945
 msgid "COPY terminated by new PQexec"
 msgstr "COPY terminato da una nuova PQexec"
 
-#: fe-exec.c:1937
+#: fe-exec.c:1953
 msgid "COPY IN state must be terminated first\n"
 msgstr "lo stato COPY IN deve prima essere terminato\n"
 
-#: fe-exec.c:1957
+#: fe-exec.c:1973
 msgid "COPY OUT state must be terminated first\n"
 msgstr "lo stato COPY OUT deve prima essere terminato\n"
 
 # NON SONO ASSOLUTAMENTE CONVINTO!
-#: fe-exec.c:1965
+#: fe-exec.c:1981
 msgid "PQexec not allowed during COPY BOTH\n"
 msgstr "PQexec not consentito durante COPY BOTH\n"
 
-#: fe-exec.c:2208 fe-exec.c:2275 fe-exec.c:2365 fe-protocol2.c:1352
-#: fe-protocol3.c:1710
+#: fe-exec.c:2224 fe-exec.c:2291 fe-exec.c:2381 fe-protocol2.c:1352
+#: fe-protocol3.c:1752
 msgid "no COPY in progress\n"
 msgstr "nessun comando COPY in corso\n"
 
-#: fe-exec.c:2555
+#: fe-exec.c:2571
 msgid "connection in wrong state\n"
 msgstr "la connessione è in uno stato errato\n"
 
-#: fe-exec.c:2586
+#: fe-exec.c:2602
 msgid "invalid ExecStatusType code"
 msgstr "codice ExecStatusType errato"
 
-#: fe-exec.c:2650 fe-exec.c:2673
+#: fe-exec.c:2666 fe-exec.c:2689
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "la colonna numero %d non è compreso tra 0 e %d"
 
-#: fe-exec.c:2666
+#: fe-exec.c:2682
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "la riga numero %d non è compreso tra 0 e %d"
 
-#: fe-exec.c:2688
+#: fe-exec.c:2704
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "il parametro numero %d non è compreso tra 0 e %d"
 
-#: fe-exec.c:2998
+#: fe-exec.c:3014
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "errore nell'interpretazione del risultato dal server: %s"
 
-#: fe-exec.c:3237 fe-exec.c:3321
+#: fe-exec.c:3253 fe-exec.c:3337
 msgid "incomplete multibyte character\n"
 msgstr "carattere multibyte incompleto\n"
 
@@ -670,11 +674,11 @@
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "intero di dimensione %lu non supportato da pqPutInt"
 
-#: fe-misc.c:642 fe-misc.c:842
+#: fe-misc.c:642 fe-misc.c:843
 msgid "connection not open\n"
 msgstr "connessione non aperta\n"
 
-#: fe-misc.c:812 fe-secure-openssl.c:249 fe-secure-openssl.c:355
+#: fe-misc.c:812 fe-secure-openssl.c:230 fe-secure-openssl.c:339
 #: fe-secure.c:253 fe-secure.c:362
 msgid ""
 "server closed the connection unexpectedly\n"
@@ -685,15 +689,15 @@
 "\tQuesto probabilmente indica che il server ha terminato in modo anormale\n"
 "\tprima o durante l'elaborazione della richiesta.\n"
 
-#: fe-misc.c:1015
+#: fe-misc.c:1016
 msgid "timeout expired\n"
 msgstr "timeout scaduto\n"
 
-#: fe-misc.c:1060
+#: fe-misc.c:1061
 msgid "socket not open\n"
 msgstr "socket non aperto\n"
 
-#: fe-misc.c:1083
+#: fe-misc.c:1084
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() fallita: %s\n"
@@ -713,9 +717,9 @@
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "messaggio tipo 0x%02x arrivato dal server mentre era inattivo"
 
-#: fe-protocol2.c:503 fe-protocol2.c:538 fe-protocol2.c:1049
-#: fe-protocol3.c:209 fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:324
-#: fe-protocol3.c:995
+#: fe-protocol2.c:503 fe-protocol2.c:538 fe-protocol2.c:1049 fe-protocol3.c:209
+#: fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:333 fe-protocol3.c:720
+#: fe-protocol3.c:1037
 msgid "out of memory"
 msgstr "memoria esaurita"
 
@@ -734,16 +738,16 @@
 msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
 msgstr "il server ha spedito dati binari (messaggio di tipo \"B\") senza prima il descrittore di riga (messaggio di tipo \"T\")"
 
-#: fe-protocol2.c:633 fe-protocol3.c:402
+#: fe-protocol2.c:633 fe-protocol3.c:412
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "risposta inattesa dal server; il primo carattere ricevuto era \"%c\"\n"
 
-#: fe-protocol2.c:762 fe-protocol2.c:937 fe-protocol3.c:617 fe-protocol3.c:799
+#: fe-protocol2.c:762 fe-protocol2.c:937 fe-protocol3.c:627 fe-protocol3.c:841
 msgid "out of memory for query result"
 msgstr "memoria esaurita per il risultato della query"
 
-#: fe-protocol2.c:1395 fe-protocol3.c:1779
+#: fe-protocol2.c:1395 fe-protocol3.c:1821
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -753,266 +757,261 @@
 msgid "lost synchronization with server, resetting connection"
 msgstr "persa la sincronizzazione con il server, sto resettando la connessione"
 
-#: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:1982
+#: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:2024
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "errore di protocollo: id=0x%x\n"
 
-#: fe-protocol3.c:358
+#: fe-protocol3.c:368
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
 msgstr "il server ha spedito dati (messaggio di tipo \"D\") senza prima il descrittore di riga (messaggio di tipo \"T\")\n"
 
-#: fe-protocol3.c:423
+#: fe-protocol3.c:433
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
 msgstr "i contenuti del messaggio non sono in accordo con la lunghezza del tipo di messaggio \"%c\"\n"
 
-#: fe-protocol3.c:444
+#: fe-protocol3.c:454
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr "persa la sincronizzazione con il server: ricevuto il tipo di messaggio \"%c\" di lunghezza %d\n"
 
-#: fe-protocol3.c:495 fe-protocol3.c:535
+#: fe-protocol3.c:505 fe-protocol3.c:545
 msgid "insufficient data in \"T\" message"
 msgstr "dati insufficienti nel messaggio di tipo \"T\""
 
-#: fe-protocol3.c:568
+#: fe-protocol3.c:578
 msgid "extraneous data in \"T\" message"
 msgstr "dati estranei nel messaggio di tipo \"T\""
 
-#: fe-protocol3.c:707 fe-protocol3.c:739 fe-protocol3.c:757
+#: fe-protocol3.c:749 fe-protocol3.c:781 fe-protocol3.c:799
 msgid "insufficient data in \"D\" message"
 msgstr "dati insufficienti nel messaggio di tipo \"D\""
 
-#: fe-protocol3.c:713
+#: fe-protocol3.c:755
 msgid "unexpected field count in \"D\" message"
 msgstr "numero dei campi non previsto nel messaggio di tipo \"D\""
 
-#: fe-protocol3.c:766
+#: fe-protocol3.c:808
 msgid "extraneous data in \"D\" message"
 msgstr "dati estranei nel messaggio di tipo \"D\""
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:898 fe-protocol3.c:917
+#: fe-protocol3.c:940 fe-protocol3.c:959
 #, c-format
 msgid " at character %s"
 msgstr " al carattere %s"
 
-#: fe-protocol3.c:930
+#: fe-protocol3.c:972
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETTAGLI: %s\n"
 
-#: fe-protocol3.c:933
+#: fe-protocol3.c:975
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "NOTA: %s\n"
 
-#: fe-protocol3.c:936
+#: fe-protocol3.c:978
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "QUERY: %s\n"
 
-#: fe-protocol3.c:939
+#: fe-protocol3.c:981
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTESTO: %s\n"
 
-#: fe-protocol3.c:946
+#: fe-protocol3.c:988
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "NOME SCHEMA:  %s\n"
 
-#: fe-protocol3.c:950
+#: fe-protocol3.c:992
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "NOME TABELLA:  %s\n"
 
-#: fe-protocol3.c:954
+#: fe-protocol3.c:996
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "NOME COLONNA:  %s\n"
 
-#: fe-protocol3.c:958
+#: fe-protocol3.c:1000
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "NOME TIPO DATI:  %s\n"
 
-#: fe-protocol3.c:962
+#: fe-protocol3.c:1004
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "NOME VINCOLO:  %s\n"
 
-#: fe-protocol3.c:974
+#: fe-protocol3.c:1016
 msgid "LOCATION:  "
 msgstr "POSIZIONE:  "
 
-#: fe-protocol3.c:976
+#: fe-protocol3.c:1018
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:978
+#: fe-protocol3.c:1020
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1209
+#: fe-protocol3.c:1251
 #, c-format
 msgid "LINE %d: "
 msgstr "RIGA %d: "
 
-#: fe-protocol3.c:1604
+#: fe-protocol3.c:1646
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: COPY OUT testuale ignorato\n"
 
-#: fe-secure-openssl.c:146 fe-secure-openssl.c:1006 fe-secure-openssl.c:1226
-#, c-format
-msgid "could not acquire mutex: %s\n"
-msgstr "acquisizione del mutex fallita: %s\n"
-
-#: fe-secure-openssl.c:158
-#, c-format
-msgid "could not establish SSL connection: %s\n"
-msgstr "non è stato possibile stabilire una connessione SSL: %s\n"
-
-#: fe-secure-openssl.c:254 fe-secure-openssl.c:360 fe-secure-openssl.c:1349
+#: fe-secure-openssl.c:235 fe-secure-openssl.c:344 fe-secure-openssl.c:1322
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "errore SSL SYSCALL: %s\n"
 
-#: fe-secure-openssl.c:261 fe-secure-openssl.c:367 fe-secure-openssl.c:1353
+#: fe-secure-openssl.c:242 fe-secure-openssl.c:351 fe-secure-openssl.c:1326
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "errore SSL SYSCALL: rilevato EOF\n"
 
-#: fe-secure-openssl.c:272 fe-secure-openssl.c:378 fe-secure-openssl.c:1362
+#: fe-secure-openssl.c:253 fe-secure-openssl.c:362 fe-secure-openssl.c:1335
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "errore SSL: %s\n"
 
-#: fe-secure-openssl.c:287 fe-secure-openssl.c:393
+#: fe-secure-openssl.c:268 fe-secure-openssl.c:377
 msgid "SSL connection has been closed unexpectedly\n"
 msgstr "la connessione SSL è stata chiusa inaspettatamente\n"
 
-#: fe-secure-openssl.c:293 fe-secure-openssl.c:399 fe-secure-openssl.c:1371
+#: fe-secure-openssl.c:274 fe-secure-openssl.c:383 fe-secure-openssl.c:1344
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "codice di errore SSL sconosciuto: %d\n"
 
-#: fe-secure-openssl.c:511
+#: fe-secure-openssl.c:494
 msgid "SSL certificate's name entry is missing\n"
 msgstr "manca il nome del certificato SSL\n"
 
-#: fe-secure-openssl.c:541
+#: fe-secure-openssl.c:528
 msgid "SSL certificate's name contains embedded null\n"
 msgstr "Il nome del certificato SSL contiene null\n"
 
-#: fe-secure-openssl.c:592
+#: fe-secure-openssl.c:579
 msgid "host name must be specified for a verified SSL connection\n"
 msgstr "il nome dell'host dev'essere specificato per una connessione SSL verificata\n"
 
-#: fe-secure-openssl.c:692
+#: fe-secure-openssl.c:679
 #, c-format
 msgid "server certificate for \"%s\" does not match host name \"%s\"\n"
 msgstr "il certificato per il server \"%s\" non combacia col nome host \"%s\"\n"
 
-#: fe-secure-openssl.c:698
+#: fe-secure-openssl.c:685
 msgid "could not get server's host name from server certificate\n"
 msgstr "impossibile ottenere il nome dell'host del server dal certificato del server\n"
 
-#: fe-secure-openssl.c:845
+#: fe-secure-openssl.c:929
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "creazione del contesto SSL fallita: %s\n"
 
-#: fe-secure-openssl.c:976
+#: fe-secure-openssl.c:966
+#, c-format
+msgid "could not read root certificate file \"%s\": %s\n"
+msgstr "lettura del file di certificato radice \"%s\" fallita: %s\n"
+
+#: fe-secure-openssl.c:994
+#, c-format
+msgid "SSL library does not support CRL certificates (file \"%s\")\n"
+msgstr "la libreria SSL non supporta i certificati di tipo CRL (file \"%s\")\n"
+
+#: fe-secure-openssl.c:1022
+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 ""
+"directory utente non trovata per la locazione del file di certificato radice\n"
+"Per favore fornisci il file oppure cambia sslmode per disabilitare la verifica del certificato del server.\n"
+
+#: fe-secure-openssl.c:1026
+#, 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 ""
+"il file \"%s\" del certificato radice non esiste\n"
+"Per favore fornisci il file oppure cambia sslmode per disabilitare la verifica del certificato del server.\n"
+
+#: fe-secure-openssl.c:1057
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
 msgstr "apertura del file di certificato \"%s\" fallita: %s\n"
 
-#: fe-secure-openssl.c:1015 fe-secure-openssl.c:1030
+#: fe-secure-openssl.c:1076
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
 msgstr "lettura del file di certificato \"%s\" fallita: %s\n"
 
-#: fe-secure-openssl.c:1085
+#: fe-secure-openssl.c:1100
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "non è stato possibile stabilire una connessione SSL: %s\n"
+
+#: fe-secure-openssl.c:1154
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
 msgstr "caricamento del motore SSL \"%s\" fallito: %s\n"
 
-#: fe-secure-openssl.c:1097
+#: fe-secure-openssl.c:1166
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
 msgstr "inizializzazione del motore SSL \"%s\" fallita: %s\n"
 
-#: fe-secure-openssl.c:1113
+#: fe-secure-openssl.c:1182
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "lettura del file della chiave privata SSL \"%s\" dal motore \"%s\" fallita: %s\n"
 
-#: fe-secure-openssl.c:1127
+#: fe-secure-openssl.c:1196
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "caricamento della chiave privata SSL \"%s\" dal motore \"%s\" fallito: %s\n"
 
-#: fe-secure-openssl.c:1164
+#: fe-secure-openssl.c:1233
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
 msgstr "certificato trovato, ma non la chiave privata \"%s\"\n"
 
-#: fe-secure-openssl.c:1172
+#: fe-secure-openssl.c:1241
 #, c-format
 msgid "private key file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr "Il file della chiave privata \"%s\" ha privilegi di accesso in lettura e scrittura per tutti; i permessi dovrebbero essere u=rw (0600) o inferiori\n"
 
-#: fe-secure-openssl.c:1183
+#: fe-secure-openssl.c:1252
 #, c-format
 msgid "could not load private key file \"%s\": %s\n"
 msgstr "caricamento del file della chiave privata \"%s\" fallito: %s\n"
 
-#: fe-secure-openssl.c:1197
+#: fe-secure-openssl.c:1266
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s\n"
 msgstr "il certificato non corrisponde con il file della chiave privata \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1235
-#, c-format
-msgid "could not read root certificate file \"%s\": %s\n"
-msgstr "lettura del file di certificato radice \"%s\" fallita: %s\n"
-
-#: fe-secure-openssl.c:1265
-#, c-format
-msgid "SSL library does not support CRL certificates (file \"%s\")\n"
-msgstr "la libreria SSL non supporta i certificati di tipo CRL (file \"%s\")\n"
-
-#: fe-secure-openssl.c:1298
-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 ""
-"directory utente non trovata per la locazione del file di certificato radice\n"
-"Per favore fornisci il file oppure cambia sslmode per disabilitare la verifica del certificato del server.\n"
-
-#: fe-secure-openssl.c:1302
-#, 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 ""
-"il file \"%s\" del certificato radice non esiste\n"
-"Per favore fornisci il file oppure cambia sslmode per disabilitare la verifica del certificato del server.\n"
-
-#: fe-secure-openssl.c:1390
+#: fe-secure-openssl.c:1365
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "non è stato possibile possibile ottenere il certificato: %s\n"
 
-#: fe-secure-openssl.c:1482
+#: fe-secure-openssl.c:1457
 #, c-format
 msgid "no SSL error reported"
 msgstr "nessun errore SSL riportato"
 
-#: fe-secure-openssl.c:1491
+#: fe-secure-openssl.c:1466
 #, c-format
 msgid "SSL error code %lu"
 msgstr "codice di errore SSL: %lu"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/po/pt_BR.po postgresql-9.5-9.5.8/src/interfaces/libpq/po/pt_BR.po
--- postgresql-9.5-9.5.2/src/interfaces/libpq/po/pt_BR.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/po/pt_BR.po	2017-08-07 21:13:41.000000000 +0000
@@ -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-2015.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-09-17 22:32-0300\n"
+"POT-Creation-Date: 2017-08-06 01:45-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"
@@ -22,7 +22,7 @@
 msgid "GSSAPI continuation error"
 msgstr "erro ao continuar autenticação GSSAPI"
 
-#: fe-auth.c:177 fe-auth.c:410
+#: fe-auth.c:177 fe-auth.c:417
 msgid "host name must be specified\n"
 msgstr "nome da máquina deve ser especificado\n"
 
@@ -30,14 +30,14 @@
 msgid "duplicate GSS authentication request\n"
 msgstr "pedido de autenticação GSS duplicado\n"
 
-#: fe-auth.c:197 fe-auth.c:307 fe-auth.c:381 fe-auth.c:416 fe-auth.c:512
-#: fe-auth.c:778 fe-connect.c:701 fe-connect.c:898 fe-connect.c:1074
-#: fe-connect.c:2085 fe-connect.c:3477 fe-connect.c:3729 fe-connect.c:3848
-#: fe-connect.c:4088 fe-connect.c:4168 fe-connect.c:4267 fe-connect.c:4519
-#: fe-connect.c:4548 fe-connect.c:4620 fe-connect.c:4638 fe-connect.c:4734
-#: fe-connect.c:5068 fe-connect.c:5218 fe-exec.c:3339 fe-exec.c:3504
-#: fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1571
-#: fe-secure-openssl.c:527 fe-secure-openssl.c:1069
+#: fe-auth.c:197 fe-auth.c:309 fe-auth.c:388 fe-auth.c:423 fe-auth.c:519
+#: fe-auth.c:798 fe-connect.c:767 fe-connect.c:964 fe-connect.c:1140
+#: fe-connect.c:2141 fe-connect.c:3498 fe-connect.c:3750 fe-connect.c:3869
+#: fe-connect.c:4109 fe-connect.c:4189 fe-connect.c:4288 fe-connect.c:4544
+#: fe-connect.c:4573 fe-connect.c:4645 fe-connect.c:4669 fe-connect.c:4687
+#: fe-connect.c:4783 fe-connect.c:5117 fe-connect.c:5267 fe-exec.c:3355
+#: fe-exec.c:3520 fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1613
+#: fe-secure-openssl.c:514 fe-secure-openssl.c:1138
 msgid "out of memory\n"
 msgstr "sem memória\n"
 
@@ -45,74 +45,82 @@
 msgid "GSSAPI name import error"
 msgstr "erro de importação de nome GSSAPI"
 
-#: fe-auth.c:296
+#: fe-auth.c:298
 msgid "SSPI continuation error"
 msgstr "erro ao continuar autenticação SSPI"
 
-#: fe-auth.c:396
+#: fe-auth.c:378
+msgid "duplicate SSPI authentication request\n"
+msgstr "pedido de autenticação SSPI duplicado\n"
+
+#: fe-auth.c:403
 msgid "could not acquire SSPI credentials"
 msgstr "não pôde obter credenciais SSPI"
 
-#: fe-auth.c:487
+#: fe-auth.c:494
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "método de autenticação SCM_CRED não é suportado\n"
 
-#: fe-auth.c:563
+#: fe-auth.c:570
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Autenticação Kerberos 4 não é suportada\n"
 
-#: fe-auth.c:568
+#: fe-auth.c:575
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Autenticação Kerberos 5 não é suportada\n"
 
-#: fe-auth.c:639
+#: fe-auth.c:646
 msgid "GSSAPI authentication not supported\n"
 msgstr "Autenticação GSSAPI não é suportada\n"
 
-#: fe-auth.c:671
+#: fe-auth.c:678
 msgid "SSPI authentication not supported\n"
 msgstr "Autenticação SSPI não é suportada\n"
 
-#: fe-auth.c:679
+#: fe-auth.c:686
 msgid "Crypt authentication not supported\n"
 msgstr "Autenticação crypt não é suportada\n"
 
-#: fe-auth.c:706
+#: fe-auth.c:721
+msgid "SCRAM authentication requires libpq version 10 or above\n"
+msgstr "autenticação SCRAM requer libpq com versão 10 ou superior\n"
+
+#: fe-auth.c:726
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "método de autenticação %u não é suportado\n"
 
-#: fe-auth.c:753
+#: fe-auth.c:773
 #, c-format
 msgid "user name lookup failure: error code %lu\n"
 msgstr "falhou ao pesquisar nome de usuário: código de erro %lu\n"
 
-#: fe-auth.c:763 fe-connect.c:2012
+#: fe-auth.c:783 fe-connect.c:2068
 #, c-format
 msgid "could not look up local user ID %d: %s\n"
 msgstr "não pôde encontrar ID de usuário local %d: %s\n"
 
-#: fe-auth.c:768 fe-connect.c:2017
+#: fe-auth.c:788 fe-connect.c:2073
 #, 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:840
+#: fe-connect.c:906
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "valor do modo ssl desconhecido: \"%s\"\n"
 
-#: fe-connect.c:861
+#: fe-connect.c:927
 #, 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:1098
+#: fe-connect.c:1164
 #, 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:1128
+#: fe-connect.c:1194
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -123,7 +131,7 @@
 "\tO servidor está executando localmente e aceitando\n"
 "\tconexões no soquete de domínio Unix \"%s\"?\n"
 
-#: fe-connect.c:1183
+#: fe-connect.c:1249
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -134,7 +142,7 @@
 "\tO servidor está executando na máquina \"%s\" (%s) e aceitando\n"
 "\tconexões TCP/IP na porta %s?\n"
 
-#: fe-connect.c:1192
+#: fe-connect.c:1258
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -145,300 +153,280 @@
 "\tO servidor está executando na máquina \"%s\" e aceitando\n"
 "\tconexões TCP/IP na porta %s?\n"
 
-#: fe-connect.c:1243
+#: fe-connect.c:1309 fe-connect.c:1341 fe-connect.c:1374 fe-connect.c:1841
 #, c-format
-msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPIDLE) falhou: %s\n"
+msgid "setsockopt(%s) failed: %s\n"
+msgstr "setsockopt(%s) falhou: %s\n"
 
-#: fe-connect.c:1256
-#, c-format
-msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPALIVE) falhou: %s\n"
-
-#: fe-connect.c:1288
-#, c-format
-msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPINTVL) falhou: %s\n"
-
-#: fe-connect.c:1320
-#, c-format
-msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
-msgstr "setsockopt(TCP_KEEPCNT) falhou: %s\n"
-
-#: fe-connect.c:1368
+#: fe-connect.c:1423
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) falhou: %ui\n"
 
-#: fe-connect.c:1420
+#: fe-connect.c:1475
 #, c-format
 msgid "invalid port number: \"%s\"\n"
 msgstr "número de porta inválido: \"%s\"\n"
 
-#: fe-connect.c:1453
+#: fe-connect.c:1508
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)\n"
 msgstr "caminho do soquete de domínio Unix \"%s\" é muito longo (máximo de %d bytes)\n"
 
-#: fe-connect.c:1472
+#: fe-connect.c:1527
 #, 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:1476
+#: fe-connect.c:1531
 #, 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:1681
+#: fe-connect.c:1736
 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:1721
+#: fe-connect.c:1776
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "não pôde criar soquete: %s\n"
 
-#: fe-connect.c:1743
+#: fe-connect.c:1798
 #, c-format
 msgid "could not set socket to nonblocking mode: %s\n"
 msgstr "não pôde configurar o soquete para modo não bloqueado: %s\n"
 
-#: fe-connect.c:1754
+#: fe-connect.c:1809
 #, 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:1773
+#: fe-connect.c:1828
 msgid "keepalives parameter must be an integer\n"
 msgstr "parâmetro keepalives deve ser um inteiro\n"
 
-#: fe-connect.c:1786
-#, c-format
-msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
-msgstr "setsockopt(SO_KEEPALIVE) falhou: %s\n"
-
-#: fe-connect.c:1923
+#: fe-connect.c:1979
 #, 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:1957
+#: fe-connect.c:2013
 #, 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:1999
+#: fe-connect.c:2055
 msgid "requirepeer parameter is not supported on this platform\n"
 msgstr "parâmetro requirepeer não é suportado nessa plataforma\n"
 
-#: fe-connect.c:2002
+#: fe-connect.c:2058
 #, c-format
 msgid "could not get peer credentials: %s\n"
 msgstr "não pôde receber credenciais: %s\n"
 
-#: fe-connect.c:2025
+#: fe-connect.c:2081
 #, 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:2059
+#: fe-connect.c:2115
 #, 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:2098
+#: fe-connect.c:2154
 #, 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:2168
+#: fe-connect.c:2224
 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:2194
+#: fe-connect.c:2250
 #, 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:2269 fe-connect.c:2302
+#: fe-connect.c:2325 fe-connect.c:2358
 #, 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:2469
+#: fe-connect.c:2525
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "sem memória para alocar buffer para GSSAPI (%d)"
 
-#: fe-connect.c:2554
+#: fe-connect.c:2610
 msgid "unexpected message from server during startup\n"
 msgstr "mensagem inesperada do servidor durante inicialização\n"
 
-#: fe-connect.c:2648
+#: fe-connect.c:2704
 #, 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:3083 fe-connect.c:3143
+#: fe-connect.c:3104 fe-connect.c:3164
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "PGEventProc \"%s\" falhou durante evento PGEVT_CONNRESET\n"
 
-#: fe-connect.c:3490
+#: fe-connect.c:3511
 #, 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:3505
+#: fe-connect.c:3526
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
 msgstr "URL LDAP \"%s\" é inválida: faltando nome distinto\n"
 
-#: fe-connect.c:3516 fe-connect.c:3569
+#: fe-connect.c:3537 fe-connect.c:3590
 #, 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:3526 fe-connect.c:3583
+#: fe-connect.c:3547 fe-connect.c:3604
 #, 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:3537
+#: fe-connect.c:3558
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "URL LDAP \"%s\" é inválida: nenhum filtro\n"
 
-#: fe-connect.c:3558
+#: fe-connect.c:3579
 #, 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:3592
+#: fe-connect.c:3613
 msgid "could not create LDAP structure\n"
 msgstr "não pôde criar estrutura LDAP\n"
 
-#: fe-connect.c:3668
+#: fe-connect.c:3689
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "busca em servidor LDAP falhou: %s\n"
 
-#: fe-connect.c:3679
+#: fe-connect.c:3700
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "mais de um registro encontrado na busca no LDAP\n"
 
-#: fe-connect.c:3680 fe-connect.c:3692
+#: fe-connect.c:3701 fe-connect.c:3713
 msgid "no entry found on LDAP lookup\n"
 msgstr "nenhum registro encontrado na busca no LDAP\n"
 
-#: fe-connect.c:3703 fe-connect.c:3716
+#: fe-connect.c:3724 fe-connect.c:3737
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "atributo não tem valores na busca no LDAP\n"
 
-#: fe-connect.c:3768 fe-connect.c:3787 fe-connect.c:4306
+#: fe-connect.c:3789 fe-connect.c:3808 fe-connect.c:4327
 #, 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:3860 fe-connect.c:4487 fe-connect.c:5201
+#: fe-connect.c:3881 fe-connect.c:4512 fe-connect.c:5250
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "opção de conexão \"%s\" é inválida\n"
 
-#: fe-connect.c:3876 fe-connect.c:4355
+#: fe-connect.c:3897 fe-connect.c:4376
 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:3916
+#: fe-connect.c:3937
 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:3949
+#: fe-connect.c:3970
 #, 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:3972
+#: fe-connect.c:3993
 #, c-format
 msgid "service file \"%s\" not found\n"
 msgstr "arquivo de serviço \"%s\" não foi encontrado\n"
 
-#: fe-connect.c:3985
+#: fe-connect.c:4006
 #, 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:4056 fe-connect.c:4100
+#: fe-connect.c:4077 fe-connect.c:4121
 #, 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:4067
+#: fe-connect.c:4088
 #, c-format
 msgid "nested service specifications not supported in service file \"%s\", line %d\n"
 msgstr "especificações de serviço aninhadas não são suportadas no arquivo de serviço \"%s\", linha %d\n"
 
-#: fe-connect.c:4745
+#: fe-connect.c:4794
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\"\n"
 msgstr "URI inválida propagada para rotina interna do analisador: \"%s\"\n"
 
-#: fe-connect.c:4815
+#: fe-connect.c:4864
 #, c-format
 msgid "end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\"\n"
 msgstr "fim da cadeia de caracteres atingido quando procurava por \"]\" no endereço IPv6 na URI: \"%s\"\n"
 
-#: fe-connect.c:4822
+#: fe-connect.c:4871
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\"\n"
 msgstr "endereço IPv6 não pode ser vazio na URI: \"%s\"\n"
 
-#: fe-connect.c:4837
+#: fe-connect.c:4886
 #, c-format
 msgid "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\"\n"
 msgstr "caracter \"%c\" inesperado na posição %d na URI (esperado \":\" ou \"/\"): \"%s\"\n"
 
-#: fe-connect.c:4951
+#: fe-connect.c:5000
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\"\n"
 msgstr "separador de chave/valor \"=\" extra no parâmetro da URI: \"%s\"\n"
 
-#: fe-connect.c:4971
+#: fe-connect.c:5020
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\"\n"
 msgstr "faltando separador de chave/valor \"=\" no parâmetro da URI: \"%s\"\n"
 
-#: fe-connect.c:5022
+#: fe-connect.c:5071
 #, c-format
 msgid "invalid URI query parameter: \"%s\"\n"
 msgstr "parâmetro da URI é inválido: \"%s\"\n"
 
-#: fe-connect.c:5096
+#: fe-connect.c:5145
 #, c-format
 msgid "invalid percent-encoded token: \"%s\"\n"
 msgstr "elemento escapado com porcentagem é inválido: \"%s\"\n"
 
-#: fe-connect.c:5106
+#: fe-connect.c:5155
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\"\n"
 msgstr "valor %%00 proibido em valor escapado com porcentagem: \"%s\"\n"
 
-#: fe-connect.c:5437
+#: fe-connect.c:5486
 msgid "connection pointer is NULL\n"
 msgstr "ponteiro da conexão é NULO\n"
 
-#: fe-connect.c:5723
+#: fe-connect.c:5772
 #, 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:5732
+#: fe-connect.c:5781
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 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:5838
+#: fe-connect.c:5895
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
 msgstr "senha obtida do arquivo \"%s\"\n"
@@ -447,94 +435,94 @@
 msgid "NOTICE"
 msgstr "NOTA"
 
-#: fe-exec.c:1122 fe-exec.c:1180 fe-exec.c:1226
+#: fe-exec.c:1139 fe-exec.c:1197 fe-exec.c:1243
 msgid "command string is a null pointer\n"
 msgstr "cadeia de caracteres do comando é um ponteiro nulo\n"
 
-#: fe-exec.c:1186 fe-exec.c:1232 fe-exec.c:1327
+#: fe-exec.c:1203 fe-exec.c:1249 fe-exec.c:1344
 msgid "number of parameters must be between 0 and 65535\n"
 msgstr "número de parâmetros deve ser entre 0 e 65535\n"
 
-#: fe-exec.c:1220 fe-exec.c:1321
+#: fe-exec.c:1237 fe-exec.c:1338
 msgid "statement name is a null pointer\n"
 msgstr "nome do comando é um ponteiro nulo\n"
 
-#: fe-exec.c:1240 fe-exec.c:1404 fe-exec.c:2119 fe-exec.c:2318
+#: fe-exec.c:1257 fe-exec.c:1420 fe-exec.c:2135 fe-exec.c:2334
 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:1358
+#: fe-exec.c:1375
 msgid "no connection to the server\n"
 msgstr "sem conexão ao servidor\n"
 
-#: fe-exec.c:1365
+#: fe-exec.c:1382
 msgid "another command is already in progress\n"
 msgstr "outro comando já está em execução\n"
 
-#: fe-exec.c:1480
+#: fe-exec.c:1496
 msgid "length must be given for binary parameter\n"
 msgstr "tamanho deve ser informado para um parâmetro binário\n"
 
-#: fe-exec.c:1749
+#: fe-exec.c:1765
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "asyncStatus inesperado: %d\n"
 
-#: fe-exec.c:1769
+#: fe-exec.c:1785
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "PGEventProc \"%s\" falhou durante evento PGEVT_RESULTCREATE\n"
 
-#: fe-exec.c:1929
+#: fe-exec.c:1945
 msgid "COPY terminated by new PQexec"
 msgstr "COPY terminado por novo PQexec"
 
-#: fe-exec.c:1937
+#: fe-exec.c:1953
 msgid "COPY IN state must be terminated first\n"
 msgstr "estado de COPY IN deve ser terminado primeiro\n"
 
-#: fe-exec.c:1957
+#: fe-exec.c:1973
 msgid "COPY OUT state must be terminated first\n"
 msgstr "estado de COPY OUT deve ser terminado primeiro\n"
 
-#: fe-exec.c:1965
+#: fe-exec.c:1981
 msgid "PQexec not allowed during COPY BOTH\n"
 msgstr "PQexec não é permitido durante COPY BOTH\n"
 
-#: fe-exec.c:2208 fe-exec.c:2275 fe-exec.c:2365 fe-protocol2.c:1352
-#: fe-protocol3.c:1710
+#: fe-exec.c:2224 fe-exec.c:2291 fe-exec.c:2381 fe-protocol2.c:1352
+#: fe-protocol3.c:1752
 msgid "no COPY in progress\n"
 msgstr "nenhum COPY está em execução\n"
 
-#: fe-exec.c:2555
+#: fe-exec.c:2571
 msgid "connection in wrong state\n"
 msgstr "conexão em estado errado\n"
 
-#: fe-exec.c:2586
+#: fe-exec.c:2602
 msgid "invalid ExecStatusType code"
 msgstr "código de ExecStatusType é inválido"
 
-#: fe-exec.c:2650 fe-exec.c:2673
+#: fe-exec.c:2666 fe-exec.c:2689
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "coluna número %d está fora do intervalo 0..%d"
 
-#: fe-exec.c:2666
+#: fe-exec.c:2682
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "linha número %d está fora do intervalo 0..%d"
 
-#: fe-exec.c:2688
+#: fe-exec.c:2704
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "parâmetro número %d está fora do intervalo 0..%d"
 
-#: fe-exec.c:2998
+#: fe-exec.c:3014
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "não pôde interpretar resultado do servidor: %s"
 
-#: fe-exec.c:3237 fe-exec.c:3321
+#: fe-exec.c:3253 fe-exec.c:3337
 msgid "incomplete multibyte character\n"
 msgstr "caracter multibyte incompleto\n"
 
@@ -631,11 +619,11 @@
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "inteiro de tamanho %lu não é suportado por pqPutInt"
 
-#: fe-misc.c:642 fe-misc.c:842
+#: fe-misc.c:642 fe-misc.c:843
 msgid "connection not open\n"
 msgstr "conexão não está aberta\n"
 
-#: fe-misc.c:812 fe-secure-openssl.c:249 fe-secure-openssl.c:355
+#: fe-misc.c:812 fe-secure-openssl.c:230 fe-secure-openssl.c:339
 #: fe-secure.c:253 fe-secure.c:362
 msgid ""
 "server closed the connection unexpectedly\n"
@@ -646,15 +634,15 @@
 "\tIsto provavelmente significa que o servidor terminou de forma anormal\n"
 "\tantes ou durante o processamento do pedido.\n"
 
-#: fe-misc.c:1015
+#: fe-misc.c:1016
 msgid "timeout expired\n"
 msgstr "tempo de espera expirado\n"
 
-#: fe-misc.c:1060
+#: fe-misc.c:1061
 msgid "socket not open\n"
 msgstr "soquete não está aberto\n"
 
-#: fe-misc.c:1083
+#: fe-misc.c:1084
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() falhou: %s\n"
@@ -675,8 +663,8 @@
 msgstr "tipo de mensagem 0x%02x chegou do servidor enquanto estava ocioso"
 
 #: fe-protocol2.c:503 fe-protocol2.c:538 fe-protocol2.c:1049
-#: fe-protocol3.c:209 fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:324
-#: fe-protocol3.c:995
+#: fe-protocol3.c:209 fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:333
+#: fe-protocol3.c:720 fe-protocol3.c:1037
 msgid "out of memory"
 msgstr "sem memória"
 
@@ -695,16 +683,16 @@
 msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
 msgstr "servidor enviou dados binários (mensagem \"B\") sem antes enviar descrição de registro (mensagem \"T\")"
 
-#: fe-protocol2.c:633 fe-protocol3.c:402
+#: fe-protocol2.c:633 fe-protocol3.c:412
 #, 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:762 fe-protocol2.c:937 fe-protocol3.c:617 fe-protocol3.c:799
+#: fe-protocol2.c:762 fe-protocol2.c:937 fe-protocol3.c:627 fe-protocol3.c:841
 msgid "out of memory for query result"
 msgstr "sem memória para resultado da consulta"
 
-#: fe-protocol2.c:1395 fe-protocol3.c:1779
+#: fe-protocol2.c:1395 fe-protocol3.c:1821
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -714,266 +702,261 @@
 msgid "lost synchronization with server, resetting connection"
 msgstr "perda de sincronismo com o servidor, reiniciando conexão"
 
-#: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:1982
+#: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:2024
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "erro de protocolo: id=0x%x\n"
 
-#: fe-protocol3.c:358
+#: fe-protocol3.c:368
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
 msgstr "servidor enviou dados (mensagem \"D\") sem antes enviar descrição de registro (mensagem \"T\")\n"
 
-#: fe-protocol3.c:423
+#: fe-protocol3.c:433
 #, 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:444
+#: fe-protocol3.c:454
 #, 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:495 fe-protocol3.c:535
+#: fe-protocol3.c:505 fe-protocol3.c:545
 msgid "insufficient data in \"T\" message"
 msgstr "dados insuficientes na mensagem \"T\""
 
-#: fe-protocol3.c:568
+#: fe-protocol3.c:578
 msgid "extraneous data in \"T\" message"
 msgstr "dados estranhos na mensagem \"T\""
 
-#: fe-protocol3.c:707 fe-protocol3.c:739 fe-protocol3.c:757
+#: fe-protocol3.c:749 fe-protocol3.c:781 fe-protocol3.c:799
 msgid "insufficient data in \"D\" message"
 msgstr "dados insuficientes na mensagem \"D\""
 
-#: fe-protocol3.c:713
+#: fe-protocol3.c:755
 msgid "unexpected field count in \"D\" message"
 msgstr "contagem de campos inesperada em mensagem \"D\""
 
-#: fe-protocol3.c:766
+#: fe-protocol3.c:808
 msgid "extraneous data in \"D\" message"
 msgstr "dados estranhos na mensagem \"D\""
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:898 fe-protocol3.c:917
+#: fe-protocol3.c:940 fe-protocol3.c:959
 #, c-format
 msgid " at character %s"
 msgstr " no caracter %s"
 
-#: fe-protocol3.c:930
+#: fe-protocol3.c:972
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETALHE:  %s\n"
 
-#: fe-protocol3.c:933
+#: fe-protocol3.c:975
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "DICA:  %s\n"
 
-#: fe-protocol3.c:936
+#: fe-protocol3.c:978
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "CONSULTA:  %s\n"
 
-#: fe-protocol3.c:939
+#: fe-protocol3.c:981
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTEXTO:  %s\n"
 
-#: fe-protocol3.c:946
+#: fe-protocol3.c:988
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "NOME DO ESQUEMA:  %s\n"
 
-#: fe-protocol3.c:950
+#: fe-protocol3.c:992
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "NOME DA TABELA:  %s\n"
 
-#: fe-protocol3.c:954
+#: fe-protocol3.c:996
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "NOME DA COLUNA:  %s\n"
 
-#: fe-protocol3.c:958
+#: fe-protocol3.c:1000
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "NOME DO TIPO DE DADO:  %s\n"
 
-#: fe-protocol3.c:962
+#: fe-protocol3.c:1004
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "NOME DA RESTRIÇÃO:  %s\n"
 
-#: fe-protocol3.c:974
+#: fe-protocol3.c:1016
 msgid "LOCATION:  "
 msgstr "LOCAL:  "
 
-#: fe-protocol3.c:976
+#: fe-protocol3.c:1018
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:978
+#: fe-protocol3.c:1020
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1209
+#: fe-protocol3.c:1251
 #, c-format
 msgid "LINE %d: "
 msgstr "LINHA %d: "
 
-#: fe-protocol3.c:1604
+#: fe-protocol3.c:1646
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: não está fazendo COPY OUT de texto\n"
 
-#: fe-secure-openssl.c:146 fe-secure-openssl.c:1006 fe-secure-openssl.c:1226
-#, c-format
-msgid "could not acquire mutex: %s\n"
-msgstr "não pôde obter mutex: %s\n"
-
-#: fe-secure-openssl.c:158
-#, c-format
-msgid "could not establish SSL connection: %s\n"
-msgstr "não pôde estabelecer conexão SSL: %s\n"
-
-#: fe-secure-openssl.c:254 fe-secure-openssl.c:360 fe-secure-openssl.c:1349
+#: fe-secure-openssl.c:235 fe-secure-openssl.c:344 fe-secure-openssl.c:1322
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "Erro de SYSCALL SSL: %s\n"
 
-#: fe-secure-openssl.c:261 fe-secure-openssl.c:367 fe-secure-openssl.c:1353
+#: fe-secure-openssl.c:242 fe-secure-openssl.c:351 fe-secure-openssl.c:1326
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "Erro de SYSCALL SSL: EOF detectado\n"
 
-#: fe-secure-openssl.c:272 fe-secure-openssl.c:378 fe-secure-openssl.c:1362
+#: fe-secure-openssl.c:253 fe-secure-openssl.c:362 fe-secure-openssl.c:1335
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "Erro de SSL: %s\n"
 
-#: fe-secure-openssl.c:287 fe-secure-openssl.c:393
+#: fe-secure-openssl.c:268 fe-secure-openssl.c:377
 msgid "SSL connection has been closed unexpectedly\n"
 msgstr "conexão SSL foi fechada inesperadamente\n"
 
-#: fe-secure-openssl.c:293 fe-secure-openssl.c:399 fe-secure-openssl.c:1371
+#: fe-secure-openssl.c:274 fe-secure-openssl.c:383 fe-secure-openssl.c:1344
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "código de erro SSL desconhecido: %d\n"
 
-#: fe-secure-openssl.c:511
+#: fe-secure-openssl.c:494
 msgid "SSL certificate's name entry is missing\n"
 msgstr "entrada do nome do certificado SSL está ausente\n"
 
-#: fe-secure-openssl.c:541
+#: fe-secure-openssl.c:528
 msgid "SSL certificate's name contains embedded null\n"
 msgstr "nome do certificado SSL contém nulo embutido\n"
 
-#: fe-secure-openssl.c:592
+#: fe-secure-openssl.c:579
 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"
 
-#: fe-secure-openssl.c:692
+#: fe-secure-openssl.c:679
 #, c-format
 msgid "server certificate for \"%s\" does not match host name \"%s\"\n"
 msgstr "certificado do servidor para \"%s\" não corresponde ao nome da máquina \"%s\"\n"
 
-#: fe-secure-openssl.c:698
+#: fe-secure-openssl.c:685
 msgid "could not get server's host name from server certificate\n"
 msgstr "não pôde obter nome de máquina do servidor a partir do certificado do servidor\n"
 
-#: fe-secure-openssl.c:845
+#: fe-secure-openssl.c:929
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "não pôde criar contexto SSL: %s\n"
 
-#: fe-secure-openssl.c:976
+#: fe-secure-openssl.c:966
+#, 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-openssl.c:994
+#, 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-openssl.c:1022
+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-openssl.c:1026
+#, 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 ""
+"certificado raiz \"%s\" não existe\n"
+"Forneça um arquivo ou mude o sslmode para desabilitar a verificação de certificado do servidor.\n"
+
+#: fe-secure-openssl.c:1057
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
 msgstr "não pôde abrir certificado \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1015 fe-secure-openssl.c:1030
+#: fe-secure-openssl.c:1076
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
 msgstr "não pôde ler certificado \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1085
+#: fe-secure-openssl.c:1100
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "não pôde estabelecer conexão SSL: %s\n"
+
+#: fe-secure-openssl.c:1154
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
 msgstr "não pôde carregar mecanismo SSL \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1097
+#: fe-secure-openssl.c:1166
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
 msgstr "não pôde inicializar mecanismo SSL \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1113
+#: fe-secure-openssl.c:1182
 #, 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-openssl.c:1127
+#: fe-secure-openssl.c:1196
 #, 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-openssl.c:1164
+#: fe-secure-openssl.c:1233
 #, 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-openssl.c:1172
+#: fe-secure-openssl.c:1241
 #, c-format
 msgid "private key file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 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-openssl.c:1183
+#: fe-secure-openssl.c:1252
 #, 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-openssl.c:1197
+#: fe-secure-openssl.c:1266
 #, 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-openssl.c:1235
-#, 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-openssl.c:1265
-#, 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-openssl.c:1298
-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-openssl.c:1302
-#, 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 ""
-"certificado raiz \"%s\" não existe\n"
-"Forneça um arquivo ou mude o sslmode para desabilitar a verificação de certificado do servidor.\n"
-
-#: fe-secure-openssl.c:1390
+#: fe-secure-openssl.c:1365
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "certificado não pôde ser obtido: %s\n"
 
-#: fe-secure-openssl.c:1482
+#: fe-secure-openssl.c:1457
 #, c-format
 msgid "no SSL error reported"
 msgstr "nenhum erro SSL relatado"
 
-#: fe-secure-openssl.c:1491
+#: fe-secure-openssl.c:1466
 #, c-format
 msgid "SSL error code %lu"
 msgstr "código de erro SSL %lu"
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/po/ru.po postgresql-9.5-9.5.8/src/interfaces/libpq/po/ru.po
--- postgresql-9.5-9.5.2/src/interfaces/libpq/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,48 +1,31 @@
-# LIBPQ Translated Messages into the Russian Language (UTF-8)
+# Russian message translation file for libpq
+# Copyright (C) 2001-2016 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Serguei A. Mokhov <mokhov@cs.concordia.ca>, 2001-2004.
+# Oleg Bartunov <oleg@sai.msu.su>, 2005.
+# Andrey Sudnik <sudnikand@yandex.ru>, 2010.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# Copyright (c) 2001-2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
-# Copyright (c) 2012-2013 Alexander Lakhin <exclusion@gmail.com>
-# Distributed under the same licensing terms as PostgreSQL itself.
-#
-# pgtranslation Id: libpq.po,v 1.4 2010/12/07 21:22:21 petere Exp $
-#
-# ChangeLog:
-#   - August 19, 2013: Alexander Lakhin <exclusion@gmail.com>.
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 22, 2012: Backporting 9.1 translation to 8.4. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 17, 2012: complete translation for 9.1. Alexander Lakhin <exclusion@gmail.com>.
-#   - November, 2010: Updates for PostgreSQL 9 by Andrey Sudnik <sudnikand@yandex.ru>.
-#   - January, 2005: Corrections and improvements by Oleg Bartunov <oleg@sai.msu.su>.
-#   - March 27 - November 1, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>.
-#   - July 24 - October 5, 2003: Updates for 7.4.*; <mokhov@cs.concordia.ca>.
-#   - January 2, 2002: Completed SSL translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - October 12, 2002: Post-7.3beta2 fuzzy translation fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>.
-#   - August 2001 - August 2002: Initial translation and maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: libpq (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-22 00:08+0000\n"
-"PO-Revision-Date: 2015-07-22 16:24+0300\n"
-"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgtranslation-translators@pgfoundry.org>\n"
+"POT-Creation-Date: 2017-05-26 20:45+0000\n"
+"PO-Revision-Date: 2017-05-27 13:35+0300\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
+"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 
 #: fe-auth.c:148
 msgid "GSSAPI continuation error"
 msgstr "ошибка продолжени� в GSSAPI"
 
-#: fe-auth.c:177 fe-auth.c:410
+#: fe-auth.c:177 fe-auth.c:412
 msgid "host name must be specified\n"
 msgstr "требует�� указать им� �ервера\n"
 
@@ -50,14 +33,14 @@
 msgid "duplicate GSS authentication request\n"
 msgstr "повторный запро� аутентификации GSS\n"
 
-#: fe-auth.c:197 fe-auth.c:307 fe-auth.c:381 fe-auth.c:416 fe-auth.c:512
-#: fe-auth.c:778 fe-connect.c:701 fe-connect.c:898 fe-connect.c:1074
-#: fe-connect.c:2085 fe-connect.c:3477 fe-connect.c:3729 fe-connect.c:3848
-#: fe-connect.c:4088 fe-connect.c:4168 fe-connect.c:4267 fe-connect.c:4519
-#: fe-connect.c:4548 fe-connect.c:4620 fe-connect.c:4638 fe-connect.c:4734
-#: fe-connect.c:5068 fe-connect.c:5218 fe-exec.c:3339 fe-exec.c:3504
-#: fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1571
-#: fe-secure-openssl.c:527 fe-secure-openssl.c:1069
+#: fe-auth.c:197 fe-auth.c:309 fe-auth.c:383 fe-auth.c:418 fe-auth.c:514
+#: fe-auth.c:793 fe-connect.c:707 fe-connect.c:904 fe-connect.c:1080
+#: fe-connect.c:2091 fe-connect.c:3483 fe-connect.c:3735 fe-connect.c:3854
+#: fe-connect.c:4094 fe-connect.c:4174 fe-connect.c:4273 fe-connect.c:4529
+#: fe-connect.c:4558 fe-connect.c:4630 fe-connect.c:4654 fe-connect.c:4672
+#: fe-connect.c:4768 fe-connect.c:5102 fe-connect.c:5252 fe-exec.c:3355
+#: fe-exec.c:3520 fe-lobj.c:896 fe-protocol2.c:1206 fe-protocol3.c:1613
+#: fe-secure-openssl.c:514 fe-secure-openssl.c:1138
 msgid "out of memory\n"
 msgstr "нехватка пам�ти\n"
 
@@ -65,74 +48,78 @@
 msgid "GSSAPI name import error"
 msgstr "ошибка импорта имени в GSSAPI"
 
-#: fe-auth.c:296
+#: fe-auth.c:298
 msgid "SSPI continuation error"
 msgstr "ошибка продолжени� в SSPI"
 
-#: fe-auth.c:396
+#: fe-auth.c:398
 msgid "could not acquire SSPI credentials"
 msgstr "не удало�ь получить удо�товерение SSPI"
 
-#: fe-auth.c:487
+#: fe-auth.c:489
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "аутентификаци� SCM_CRED не поддерживает��\n"
 
-#: fe-auth.c:563
+#: fe-auth.c:565
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "аутентификаци� Kerberos 4 не поддерживает��\n"
 
-#: fe-auth.c:568
+#: fe-auth.c:570
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "аутентификаци� Kerberos 5 не поддерживает��\n"
 
-#: fe-auth.c:639
+#: fe-auth.c:641
 msgid "GSSAPI authentication not supported\n"
 msgstr "аутентификаци� через GSSAPI не поддерживает��\n"
 
-#: fe-auth.c:671
+#: fe-auth.c:673
 msgid "SSPI authentication not supported\n"
 msgstr "аутентификаци� через SSPI не поддерживает��\n"
 
-#: fe-auth.c:679
+#: fe-auth.c:681
 msgid "Crypt authentication not supported\n"
 msgstr "аутентификаци� Crypt не поддерживает��\n"
 
-#: fe-auth.c:706
+#: fe-auth.c:716
+msgid "SCRAM authentication requires libpq version 10 or above\n"
+msgstr "дл� аутентификации SCRAM требует�� libpq вер�ии 10 или новее\n"
+
+#: fe-auth.c:721
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "метод аутентификации %u не поддерживает��\n"
 
-#: fe-auth.c:753
+#: fe-auth.c:768
 #, c-format
 msgid "user name lookup failure: error code %lu\n"
 msgstr "ра�познать им� пользовател� не удало�ь (код ошибки: %lu)\n"
 
-#: fe-auth.c:763 fe-connect.c:2012
+#: fe-auth.c:778 fe-connect.c:2018
 #, c-format
 msgid "could not look up local user ID %d: %s\n"
 msgstr "найти локального пользовател� по идентификатору (%d) не удало�ь: %s\n"
 
-#: fe-auth.c:768 fe-connect.c:2017
+#: fe-auth.c:783 fe-connect.c:2023
 #, c-format
 msgid "local user with ID %d does not exist\n"
 msgstr "локальный пользователь � ID %d не �уще�твует\n"
 
-#: fe-connect.c:840
+#: fe-connect.c:846
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "неверное значение sslmode: \"%s\"\n"
 
-#: fe-connect.c:861
+#: fe-connect.c:867
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr "значение sslmode \"%s\" недопу�тимо дл� �борки без поддержки SSL\n"
 
-#: fe-connect.c:1098
+#: fe-connect.c:1104
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "не удало�ь переве�ти �окет в режим TCP-передачи без задержки: %s\n"
 
-#: fe-connect.c:1128
+#: fe-connect.c:1134
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -143,7 +130,7 @@
 "\tОн дей�твительно работает локально и принимает\n"
 "\t�оединени� через доменный �окет \"%s\"?\n"
 
-#: fe-connect.c:1183
+#: fe-connect.c:1189
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -154,7 +141,7 @@
 "\tОн дей�твительно работает по адре�у \"%s\" (%s)\n"
 "\t и принимает TCP-�оединени� (порт %s)?\n"
 
-#: fe-connect.c:1192
+#: fe-connect.c:1198
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -165,243 +152,243 @@
 "\tОн дей�твительно работает по адре�у \"%s\"\n"
 "\t и принимает TCP-�оединени� (порт %s)?\n"
 
-#: fe-connect.c:1243
+#: fe-connect.c:1249
 #, c-format
 msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
 msgstr "ошибка в setsockopt(TCP_KEEPIDLE): %s\n"
 
-#: fe-connect.c:1256
+#: fe-connect.c:1262
 #, c-format
 msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
 msgstr "ошибка в setsockopt(TCP_KEEPALIVE): %s\n"
 
-#: fe-connect.c:1288
+#: fe-connect.c:1294
 #, c-format
 msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
 msgstr "ошибка в setsockopt(TCP_KEEPINTVL): %s\n"
 
-#: fe-connect.c:1320
+#: fe-connect.c:1326
 #, c-format
 msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
 msgstr "ошибка в setsockopt(TCP_KEEPCNT): %s\n"
 
-#: fe-connect.c:1368
+#: fe-connect.c:1374
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "ошибка в WSAIoctl(SIO_KEEPALIVE_VALS): %ui\n"
 
-#: fe-connect.c:1420
+#: fe-connect.c:1426
 #, c-format
 msgid "invalid port number: \"%s\"\n"
 msgstr "неверный номер порта: \"%s\"\n"
 
-#: fe-connect.c:1453
+#: fe-connect.c:1459
 #, c-format
 msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)\n"
 msgstr "длина пути доменного �окета \"%s\" превышает предел (%d байт)\n"
 
-#: fe-connect.c:1472
+#: fe-connect.c:1478
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "преобразовать им� \"%s\" в адре� не удало�ь: %s\n"
 
-#: fe-connect.c:1476
+#: fe-connect.c:1482
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr ""
 "преобразовать путь к доменному �окету UNIX \"%s\" в адре� не удало�ь: %s\n"
 
-#: fe-connect.c:1681
+#: fe-connect.c:1687
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "неверное �о�то�ние �оединени� - возможно разрушение пам�ти\n"
 
-#: fe-connect.c:1721
+#: fe-connect.c:1727
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "не удало�ь �оздать �окет: %s\n"
 
-#: fe-connect.c:1743
+#: fe-connect.c:1749
 #, c-format
 msgid "could not set socket to nonblocking mode: %s\n"
 msgstr "не удало�ь переве�ти �окет в неблокирующий режим: %s\n"
 
-#: fe-connect.c:1754
+#: fe-connect.c:1760
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s\n"
 msgstr ""
 "не удало�ь переве�ти �окет в режим закрыти� при выполнении (close-on-exec): "
 "%s\n"
 
-#: fe-connect.c:1773
+#: fe-connect.c:1779
 msgid "keepalives parameter must be an integer\n"
 msgstr "параметр keepalives должен быть целым чи�лом\n"
 
-#: fe-connect.c:1786
+#: fe-connect.c:1792
 #, c-format
 msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
 msgstr "ошибка в setsockopt(SO_KEEPALIVE): %s\n"
 
-#: fe-connect.c:1923
+#: fe-connect.c:1929
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "не удало�ь получить �тату� ошибки �окета: %s\n"
 
-#: fe-connect.c:1957
+#: fe-connect.c:1963
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "не удало�ь получить адре� клиента из �окета: %s\n"
 
-#: fe-connect.c:1999
+#: fe-connect.c:2005
 msgid "requirepeer parameter is not supported on this platform\n"
 msgstr "параметр requirepeer не поддерживает�� в �той ОС\n"
 
-#: fe-connect.c:2002
+#: fe-connect.c:2008
 #, c-format
 msgid "could not get peer credentials: %s\n"
 msgstr "не удало�ь получить учётные данные �ервера: %s\n"
 
-#: fe-connect.c:2025
+#: fe-connect.c:2031
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
 msgstr ""
 "requirepeer допу�кает подключение только к \"%s\", но �ервер работает под "
 "именем \"%s\"\n"
 
-#: fe-connect.c:2059
+#: fe-connect.c:2065
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "не удало�ь отправить пакет �огла�овани� SSL: %s\n"
 
-#: fe-connect.c:2098
+#: fe-connect.c:2104
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "не удало�ь отправить �тартовый пакет: %s\n"
 
-#: fe-connect.c:2168
+#: fe-connect.c:2174
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "затребовано подключение через SSL, но �ервер не поддерживает SSL\n"
 
-#: fe-connect.c:2194
+#: fe-connect.c:2200
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "получен неверный ответ на �огла�ование SSL: %c\n"
 
-#: fe-connect.c:2269 fe-connect.c:2302
+#: fe-connect.c:2275 fe-connect.c:2308
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "ожидал�� запро� аутентификации от �ервера, но получено: %c\n"
 
-#: fe-connect.c:2469
+#: fe-connect.c:2475
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%d)"
 msgstr "недо�таточно пам�ти дл� буфера GSSAPI (%d)"
 
-#: fe-connect.c:2554
+#: fe-connect.c:2560
 msgid "unexpected message from server during startup\n"
 msgstr "неожиданное �ообщение от �ервера в начале работы\n"
 
-#: fe-connect.c:2648
+#: fe-connect.c:2654
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption\n"
 msgstr "неверное �о�то�ние �оединени� %d - возможно разрушение пам�ти\n"
 
-#: fe-connect.c:3083 fe-connect.c:3143
+#: fe-connect.c:3089 fe-connect.c:3149
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "ошибка в PGEventProc \"%s\" при обработке �обыти� PGEVT_CONNRESET\n"
 
-#: fe-connect.c:3490
+#: fe-connect.c:3496
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
 msgstr "некорректный адре� LDAP \"%s\": �хема должна быть ldap://\n"
 
-#: fe-connect.c:3505
+#: fe-connect.c:3511
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
 msgstr "некорректный адре� LDAP \"%s\": от�ут�твует уникальное им�\n"
 
-#: fe-connect.c:3516 fe-connect.c:3569
+#: fe-connect.c:3522 fe-connect.c:3575
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
 msgstr "некорректный адре� LDAP \"%s\": должен быть только один атрибут\n"
 
-#: fe-connect.c:3526 fe-connect.c:3583
+#: fe-connect.c:3532 fe-connect.c:3589
 #, 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:3537
+#: fe-connect.c:3543
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "некорректный адре� LDAP \"%s\": нет фильтра\n"
 
-#: fe-connect.c:3558
+#: fe-connect.c:3564
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
 msgstr "некорректный адре� LDAP \"%s\": неверный номер порта\n"
 
-#: fe-connect.c:3592
+#: fe-connect.c:3598
 msgid "could not create LDAP structure\n"
 msgstr "не удало�ь �оздать �труктуру LDAP\n"
 
-#: fe-connect.c:3668
+#: fe-connect.c:3674
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "ошибка пои�ка на �ервере LDAP: %s\n"
 
-#: fe-connect.c:3679
+#: fe-connect.c:3685
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "при пои�ке LDAP найдено более одного вхождени�\n"
 
-#: fe-connect.c:3680 fe-connect.c:3692
+#: fe-connect.c:3686 fe-connect.c:3698
 msgid "no entry found on LDAP lookup\n"
 msgstr "при пои�ке LDAP ничего не найдено\n"
 
-#: fe-connect.c:3703 fe-connect.c:3716
+#: fe-connect.c:3709 fe-connect.c:3722
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "атрибут не �одержит значений при пои�ке LDAP\n"
 
-#: fe-connect.c:3768 fe-connect.c:3787 fe-connect.c:4306
+#: fe-connect.c:3774 fe-connect.c:3793 fe-connect.c:4312
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "в �троке �оединени� нет \"=\" по�ле \"%s\"\n"
 
-#: fe-connect.c:3860 fe-connect.c:4487 fe-connect.c:5201
+#: fe-connect.c:3866 fe-connect.c:4497 fe-connect.c:5235
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "неверный параметр �оединени� \"%s\"\n"
 
-#: fe-connect.c:3876 fe-connect.c:4355
+#: fe-connect.c:3882 fe-connect.c:4361
 msgid "unterminated quoted string in connection info string\n"
 msgstr "в �троке �оединени� не хватает закрывающей кавычки\n"
 
-#: fe-connect.c:3916
+#: fe-connect.c:3922
 msgid "could not get home directory to locate service definition file"
 msgstr ""
 "не удало�ь получить домашний каталог дл� загрузки файла определений �лужб"
 
-#: fe-connect.c:3949
+#: fe-connect.c:3955
 #, c-format
 msgid "definition of service \"%s\" not found\n"
 msgstr "определение �лужбы \"%s\" не найдено\n"
 
-#: fe-connect.c:3972
+#: fe-connect.c:3978
 #, c-format
 msgid "service file \"%s\" not found\n"
 msgstr "файл определений �лужб \"%s\" не найден\n"
 
-#: fe-connect.c:3985
+#: fe-connect.c:3991
 #, c-format
 msgid "line %d too long in service file \"%s\"\n"
 msgstr "�лишком длинна� �трока (%d) в файле определений �лужб \"%s\"\n"
 
-#: fe-connect.c:4056 fe-connect.c:4100
+#: fe-connect.c:4062 fe-connect.c:4106
 #, c-format
 msgid "syntax error in service file \"%s\", line %d\n"
 msgstr "�интак�иче�ка� ошибка в файле определени� �лужб \"%s\" (�трока %d)\n"
 
-#: fe-connect.c:4067
+#: fe-connect.c:4073
 #, c-format
 msgid ""
 "nested service specifications not supported in service file \"%s\", line %d\n"
@@ -409,24 +396,24 @@
 "рекур�ивные определени� �лужб не поддерживают�� (файл определени� �лужб \"%s"
 "\", �трока %d)\n"
 
-#: fe-connect.c:4745
+#: fe-connect.c:4779
 #, c-format
 msgid "invalid URI propagated to internal parser routine: \"%s\"\n"
 msgstr "во внутреннюю процедуру разбора �троки передан ошибочный URI: \"%s\"\n"
 
-#: fe-connect.c:4815
+#: fe-connect.c:4849
 #, c-format
 msgid ""
 "end of string reached when looking for matching \"]\" in IPv6 host address "
 "in URI: \"%s\"\n"
 msgstr "URI не �одержит �имвол \"]\" по�ле адре�а IPv6: \"%s\"\n"
 
-#: fe-connect.c:4822
+#: fe-connect.c:4856
 #, c-format
 msgid "IPv6 host address may not be empty in URI: \"%s\"\n"
 msgstr "IPv6, �одержащий�� в URI, не может быть пу�тым: \"%s\"\n"
 
-#: fe-connect.c:4837
+#: fe-connect.c:4871
 #, c-format
 msgid ""
 "unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): "
@@ -435,41 +422,41 @@
 "неожиданный �имвол \"%c\" в позиции %d в URI (ожидало�ь \":\" или \"/\"): "
 "\"%s\"\n"
 
-#: fe-connect.c:4951
+#: fe-connect.c:4985
 #, c-format
 msgid "extra key/value separator \"=\" in URI query parameter: \"%s\"\n"
 msgstr "лишний разделитель ключа/значени� \"=\" в параметрах URI: \"%s\"\n"
 
-#: fe-connect.c:4971
+#: fe-connect.c:5005
 #, c-format
 msgid "missing key/value separator \"=\" in URI query parameter: \"%s\"\n"
 msgstr "в параметрах URI не хватает разделител� ключа/значени� \"=\": \"%s\"\n"
 
-#: fe-connect.c:5022
+#: fe-connect.c:5056
 #, c-format
 msgid "invalid URI query parameter: \"%s\"\n"
 msgstr "неверный параметр в URI: \"%s\"\n"
 
-#: fe-connect.c:5096
+#: fe-connect.c:5130
 #, c-format
 msgid "invalid percent-encoded token: \"%s\"\n"
 msgstr "неверный �имвол, закодированный � %%: \"%s\"\n"
 
-#: fe-connect.c:5106
+#: fe-connect.c:5140
 #, c-format
 msgid "forbidden value %%00 in percent-encoded value: \"%s\"\n"
 msgstr "недопу�тимое значение %%00 дл� �имвола, закодированного � %%: \"%s\"\n"
 
-#: fe-connect.c:5437
+#: fe-connect.c:5471
 msgid "connection pointer is NULL\n"
 msgstr "нулевой указатель �оединени�\n"
 
-#: fe-connect.c:5723
+#: fe-connect.c:5757
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: файл паролей \"%s\" - не обычный файл\n"
 
-#: fe-connect.c:5732
+#: fe-connect.c:5766
 #, c-format
 msgid ""
 "WARNING: password file \"%s\" has group or world access; permissions should "
@@ -478,7 +465,7 @@
 "ПРЕДУПРЕЖДЕ�ИЕ: к файлу паролей \"%s\" имеют до�туп в�е или группа; права "
 "должны быть u=rw (0600) или более ограниченные\n"
 
-#: fe-connect.c:5838
+#: fe-connect.c:5880
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
 msgstr "пароль получен из файла \"%s\"\n"
@@ -487,94 +474,94 @@
 msgid "NOTICE"
 msgstr "З�МЕЧ��ИЕ"
 
-#: fe-exec.c:1122 fe-exec.c:1180 fe-exec.c:1226
+#: fe-exec.c:1139 fe-exec.c:1197 fe-exec.c:1243
 msgid "command string is a null pointer\n"
 msgstr "указатель на командную �троку нулевой\n"
 
-#: fe-exec.c:1186 fe-exec.c:1232 fe-exec.c:1327
+#: fe-exec.c:1203 fe-exec.c:1249 fe-exec.c:1344
 msgid "number of parameters must be between 0 and 65535\n"
 msgstr "чи�ло параметров должно быть от 0 до 65535\n"
 
-#: fe-exec.c:1220 fe-exec.c:1321
+#: fe-exec.c:1237 fe-exec.c:1338
 msgid "statement name is a null pointer\n"
 msgstr "указатель на им� оператора нулевой\n"
 
-#: fe-exec.c:1240 fe-exec.c:1404 fe-exec.c:2119 fe-exec.c:2318
+#: fe-exec.c:1257 fe-exec.c:1420 fe-exec.c:2135 fe-exec.c:2334
 msgid "function requires at least protocol version 3.0\n"
 msgstr "функци� требует протокол минимум вер�ии 3.0\n"
 
-#: fe-exec.c:1358
+#: fe-exec.c:1375
 msgid "no connection to the server\n"
 msgstr "нет �оединени� � �ервером\n"
 
-#: fe-exec.c:1365
+#: fe-exec.c:1382
 msgid "another command is already in progress\n"
 msgstr "уже выполн�ет�� друга� команда\n"
 
-#: fe-exec.c:1480
+#: fe-exec.c:1496
 msgid "length must be given for binary parameter\n"
 msgstr "дл� двоичного параметра должна быть указана длина\n"
 
-#: fe-exec.c:1749
+#: fe-exec.c:1765
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "неожиданный asyncStatus: %d\n"
 
-#: fe-exec.c:1769
+#: fe-exec.c:1785
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "ошибка в PGEventProc \"%s\" при обработке �обыти� PGEVT_RESULTCREATE\n"
 
-#: fe-exec.c:1929
+#: fe-exec.c:1945
 msgid "COPY terminated by new PQexec"
 msgstr "операци� COPY прервана вызовом PQexec"
 
-#: fe-exec.c:1937
+#: fe-exec.c:1953
 msgid "COPY IN state must be terminated first\n"
 msgstr "�начала должно завершить�� �о�то�ние COPY IN\n"
 
-#: fe-exec.c:1957
+#: fe-exec.c:1973
 msgid "COPY OUT state must be terminated first\n"
 msgstr "�начала должно завершить�� �о�то�ние COPY OUT\n"
 
-#: fe-exec.c:1965
+#: fe-exec.c:1981
 msgid "PQexec not allowed during COPY BOTH\n"
 msgstr "вызов PQexec не допу�кает�� в проце��е COPY BOTH\n"
 
-#: fe-exec.c:2208 fe-exec.c:2275 fe-exec.c:2365 fe-protocol2.c:1352
-#: fe-protocol3.c:1710
+#: fe-exec.c:2224 fe-exec.c:2291 fe-exec.c:2381 fe-protocol2.c:1352
+#: fe-protocol3.c:1752
 msgid "no COPY in progress\n"
 msgstr "операци� COPY не выполн�ет��\n"
 
-#: fe-exec.c:2555
+#: fe-exec.c:2571
 msgid "connection in wrong state\n"
 msgstr "�оединение в неправильном �о�то�нии\n"
 
-#: fe-exec.c:2586
+#: fe-exec.c:2602
 msgid "invalid ExecStatusType code"
 msgstr "неверный код ExecStatusType"
 
-#: fe-exec.c:2650 fe-exec.c:2673
+#: fe-exec.c:2666 fe-exec.c:2689
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "номер �толбца %d вне диапазона 0..%d"
 
-#: fe-exec.c:2666
+#: fe-exec.c:2682
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "номер запи�и %d вне диапазона 0..%d"
 
-#: fe-exec.c:2688
+#: fe-exec.c:2704
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "номер параметра %d вне диапазона 0..%d"
 
-#: fe-exec.c:2998
+#: fe-exec.c:3014
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "не удало�ь интерпретировать ответ �ервера: %s"
 
-#: fe-exec.c:3237 fe-exec.c:3321
+#: fe-exec.c:3253 fe-exec.c:3337
 msgid "incomplete multibyte character\n"
 msgstr "неполный многобайтный �имвол\n"
 
@@ -671,11 +658,11 @@
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "функци� pqPutInt не поддерживает integer размером %lu байт"
 
-#: fe-misc.c:642 fe-misc.c:842
+#: fe-misc.c:642 fe-misc.c:843
 msgid "connection not open\n"
 msgstr "�оединение не открыто\n"
 
-#: fe-misc.c:812 fe-secure-openssl.c:249 fe-secure-openssl.c:355
+#: fe-misc.c:812 fe-secure-openssl.c:230 fe-secure-openssl.c:339
 #: fe-secure.c:253 fe-secure.c:362
 msgid ""
 "server closed the connection unexpectedly\n"
@@ -686,15 +673,15 @@
 "\tСкорее в�его �ервер прекратил работу из-за �бо�\n"
 "\tдо или в проце��е выполнени� запро�а.\n"
 
-#: fe-misc.c:1015
+#: fe-misc.c:1016
 msgid "timeout expired\n"
 msgstr "таймаут\n"
 
-#: fe-misc.c:1060
+#: fe-misc.c:1061
 msgid "socket not open\n"
 msgstr "�окет не открыт\n"
 
-#: fe-misc.c:1083
+#: fe-misc.c:1084
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "ошибка в select(): %s\n"
@@ -714,9 +701,9 @@
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "от �ервера во врем� про�то� получено �ообщение типа 0x%02x"
 
-#: fe-protocol2.c:503 fe-protocol2.c:538 fe-protocol2.c:1049
-#: fe-protocol3.c:209 fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:324
-#: fe-protocol3.c:995
+#: fe-protocol2.c:503 fe-protocol2.c:538 fe-protocol2.c:1049 fe-protocol3.c:209
+#: fe-protocol3.c:236 fe-protocol3.c:253 fe-protocol3.c:333 fe-protocol3.c:720
+#: fe-protocol3.c:1037
 msgid "out of memory"
 msgstr "нехватка пам�ти"
 
@@ -743,16 +730,16 @@
 "�ервер отправил двоичные данные (�ообщение \"B\") без предварительного "
 "опи�ани� �троки (�ообщение \"T\")"
 
-#: fe-protocol2.c:633 fe-protocol3.c:402
+#: fe-protocol2.c:633 fe-protocol3.c:412
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "неожиданный ответ �ервера; первый полученный �имвол: \"%c\"\n"
 
-#: fe-protocol2.c:762 fe-protocol2.c:937 fe-protocol3.c:617 fe-protocol3.c:799
+#: fe-protocol2.c:762 fe-protocol2.c:937 fe-protocol3.c:627 fe-protocol3.c:841
 msgid "out of memory for query result"
 msgstr "недо�таточно пам�ти дл� результата запро�а"
 
-#: fe-protocol2.c:1395 fe-protocol3.c:1779
+#: fe-protocol2.c:1395 fe-protocol3.c:1821
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -762,12 +749,12 @@
 msgid "lost synchronization with server, resetting connection"
 msgstr "потер�на �инхронизаци� � �ервером; попытка во��тановить �оединение"
 
-#: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:1982
+#: fe-protocol2.c:1541 fe-protocol2.c:1573 fe-protocol3.c:2024
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "ошибка протокола: id=0x%x\n"
 
-#: fe-protocol3.c:358
+#: fe-protocol3.c:368
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)\n"
@@ -775,207 +762,233 @@
 "�ервер отправил данные (�ообщение \"D\") без предварительного опи�ани� "
 "�троки (�ообщение \"T\")\n"
 
-#: fe-protocol3.c:423
+#: fe-protocol3.c:433
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
 msgstr "�одержимое не �оответ�твует длине в �ообщении типа \"%c\"\n"
 
-#: fe-protocol3.c:444
+#: fe-protocol3.c:454
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr ""
 "потер�на �инхронизаци� � �ервером: получено �ообщение типа \"%c\", длина %d\n"
 
-#: fe-protocol3.c:495 fe-protocol3.c:535
+#: fe-protocol3.c:505 fe-protocol3.c:545
 msgid "insufficient data in \"T\" message"
 msgstr "недо�таточно данных в �ообщении \"T\""
 
-#: fe-protocol3.c:568
+#: fe-protocol3.c:578
 msgid "extraneous data in \"T\" message"
 msgstr "лишние данные в �ообщении \"T\""
 
-#: fe-protocol3.c:707 fe-protocol3.c:739 fe-protocol3.c:757
+#: fe-protocol3.c:749 fe-protocol3.c:781 fe-protocol3.c:799
 msgid "insufficient data in \"D\" message"
 msgstr "недо�таточно данных в �ообщении \"D\""
 
-#: fe-protocol3.c:713
+#: fe-protocol3.c:755
 msgid "unexpected field count in \"D\" message"
 msgstr "неверное чи�ло полей в �ообщении \"D\""
 
-#: fe-protocol3.c:766
+#: fe-protocol3.c:808
 msgid "extraneous data in \"D\" message"
 msgstr "лишние данные в �ообщении \"D\""
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:898 fe-protocol3.c:917
+#: fe-protocol3.c:940 fe-protocol3.c:959
 #, c-format
 msgid " at character %s"
 msgstr " �имвол %s"
 
-#: fe-protocol3.c:930
+#: fe-protocol3.c:972
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "ПОДРОБ�ОСТИ:  %s\n"
 
-#: fe-protocol3.c:933
+#: fe-protocol3.c:975
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "ПОДСК�ЗК�:  %s\n"
 
-#: fe-protocol3.c:936
+#: fe-protocol3.c:978
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "З�ПРОС:  %s\n"
 
-#: fe-protocol3.c:939
+#: fe-protocol3.c:981
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "КО�ТЕКСТ:  %s\n"
 
-#: fe-protocol3.c:946
+#: fe-protocol3.c:988
 #, c-format
 msgid "SCHEMA NAME:  %s\n"
 msgstr "СХЕМ�:  %s\n"
 
-#: fe-protocol3.c:950
+#: fe-protocol3.c:992
 #, c-format
 msgid "TABLE NAME:  %s\n"
 msgstr "Т�БЛИЦ�:  %s\n"
 
-#: fe-protocol3.c:954
+#: fe-protocol3.c:996
 #, c-format
 msgid "COLUMN NAME:  %s\n"
 msgstr "СТОЛБЕЦ:  %s\n"
 
-#: fe-protocol3.c:958
+#: fe-protocol3.c:1000
 #, c-format
 msgid "DATATYPE NAME:  %s\n"
 msgstr "ТИП Д���ЫХ:  %s\n"
 
-#: fe-protocol3.c:962
+#: fe-protocol3.c:1004
 #, c-format
 msgid "CONSTRAINT NAME:  %s\n"
 msgstr "ОГР��ИЧЕ�ИЕ:  %s\n"
 
-#: fe-protocol3.c:974
+#: fe-protocol3.c:1016
 msgid "LOCATION:  "
 msgstr "ПОЛОЖЕ�ИЕ:  "
 
-#: fe-protocol3.c:976
+#: fe-protocol3.c:1018
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:978
+#: fe-protocol3.c:1020
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1209
+#: fe-protocol3.c:1251
 #, c-format
 msgid "LINE %d: "
 msgstr "СТРОК� %d: "
 
-#: fe-protocol3.c:1604
+#: fe-protocol3.c:1646
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline можно вызывать только во врем� COPY OUT � тек�том\n"
 
-#: fe-secure-openssl.c:146 fe-secure-openssl.c:1006 fe-secure-openssl.c:1226
-#, c-format
-msgid "could not acquire mutex: %s\n"
-msgstr "не удало�ь заблокировать �емафор: %s\n"
-
-#: fe-secure-openssl.c:158
-#, c-format
-msgid "could not establish SSL connection: %s\n"
-msgstr "не удало�ь у�тановить SSL-�оединение: %s\n"
-
-#: fe-secure-openssl.c:254 fe-secure-openssl.c:360 fe-secure-openssl.c:1349
+#: fe-secure-openssl.c:235 fe-secure-openssl.c:344 fe-secure-openssl.c:1322
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "ошибка SSL SYSCALL: %s\n"
 
-#: fe-secure-openssl.c:261 fe-secure-openssl.c:367 fe-secure-openssl.c:1353
+#: fe-secure-openssl.c:242 fe-secure-openssl.c:351 fe-secure-openssl.c:1326
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "ошибка SSL SYSCALL: конец файла (EOF)\n"
 
-#: fe-secure-openssl.c:272 fe-secure-openssl.c:378 fe-secure-openssl.c:1362
+#: fe-secure-openssl.c:253 fe-secure-openssl.c:362 fe-secure-openssl.c:1335
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "ошибка SSL: %s\n"
 
-#: fe-secure-openssl.c:287 fe-secure-openssl.c:393
+#: fe-secure-openssl.c:268 fe-secure-openssl.c:377
 msgid "SSL connection has been closed unexpectedly\n"
 msgstr "SSL-�оединение было неожиданно закрыто\n"
 
-#: fe-secure-openssl.c:293 fe-secure-openssl.c:399 fe-secure-openssl.c:1371
+#: fe-secure-openssl.c:274 fe-secure-openssl.c:383 fe-secure-openssl.c:1344
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "нера�познанный код ошибки SSL: %d\n"
 
-#: fe-secure-openssl.c:511
+#: fe-secure-openssl.c:494
 msgid "SSL certificate's name entry is missing\n"
 msgstr "запи�ь имени в SSL-�ертификате от�ут�твует\n"
 
-#: fe-secure-openssl.c:541
+#: fe-secure-openssl.c:528
 msgid "SSL certificate's name contains embedded null\n"
 msgstr "им� в SSL-�ертификате включает нулевой байт\n"
 
-#: fe-secure-openssl.c:592
+#: fe-secure-openssl.c:579
 msgid "host name must be specified for a verified SSL connection\n"
 msgstr "дл� проверенного SSL-�оединени� требует�� указать им� узла\n"
 
-#: fe-secure-openssl.c:692
+#: fe-secure-openssl.c:679
 #, c-format
 msgid "server certificate for \"%s\" does not match host name \"%s\"\n"
 msgstr ""
 "�ерверный �ертификат дл� \"%s\" не �оответ�твует имени �ервера \"%s\"\n"
 
-#: fe-secure-openssl.c:698
+#: fe-secure-openssl.c:685
 msgid "could not get server's host name from server certificate\n"
 msgstr "не удало�ь получить им� �ервера из �ертификата\n"
 
-#: fe-secure-openssl.c:845
+#: fe-secure-openssl.c:929
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "не удало�ь �оздать контек�т SSL: %s\n"
 
-#: fe-secure-openssl.c:976
+#: fe-secure-openssl.c:966
+#, c-format
+msgid "could not read root certificate file \"%s\": %s\n"
+msgstr "не удало�ь прочитать файл корневых �ертификатов \"%s\": %s\n"
+
+#: fe-secure-openssl.c:994
+#, c-format
+msgid "SSL library does not support CRL certificates (file \"%s\")\n"
+msgstr "Библиотека SSL не поддерживает проверку CRL (файл \"%s\")\n"
+
+#: fe-secure-openssl.c:1022
+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-openssl.c:1026
+#, 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 ""
+"файл корневых �ертификатов \"%s\" не �уще�твует\n"
+"Укажите полный путь к файлу или отключите проверку �ертификата �ервера, "
+"изменив sslmode.\n"
+
+#: fe-secure-openssl.c:1057
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
 msgstr "не удало�ь открыть файл �ертификата \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1015 fe-secure-openssl.c:1030
+#: fe-secure-openssl.c:1076
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
 msgstr "не удало�ь прочитать файл �ертификата \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1085
+#: fe-secure-openssl.c:1100
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "не удало�ь у�тановить SSL-�оединение: %s\n"
+
+#: fe-secure-openssl.c:1154
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
 msgstr "не удало�ь загрузить модуль SSL ENGINE \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1097
+#: fe-secure-openssl.c:1166
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
 msgstr "не удало�ь инициализировать модуль SSL ENGINE \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1113
+#: fe-secure-openssl.c:1182
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "не удало�ь прочитать закрытый ключ SSL \"%s\" из модул� \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1127
+#: fe-secure-openssl.c:1196
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "не удало�ь загрузить закрытый ключ SSL \"%s\" из модул� \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1164
+#: fe-secure-openssl.c:1233
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
 msgstr "�ертификат при�ут�твует, но файла закрытого ключа \"%s\" нет\n"
 
-#: fe-secure-openssl.c:1172
+#: fe-secure-openssl.c:1241
 #, c-format
 msgid ""
 "private key file \"%s\" has group or world access; permissions should be "
@@ -984,58 +997,27 @@
 "к файлу закрытого ключа \"%s\" имеют до�туп в�е или группа; права должны "
 "быть u=rw (0600) или более ограниченные\n"
 
-#: fe-secure-openssl.c:1183
+#: fe-secure-openssl.c:1252
 #, c-format
 msgid "could not load private key file \"%s\": %s\n"
 msgstr "не удало�ь загрузить файл закрытого ключа \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1197
+#: fe-secure-openssl.c:1266
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s\n"
 msgstr "�ертификат не �оответ�твует файлу закрытого ключа \"%s\": %s\n"
 
-#: fe-secure-openssl.c:1235
-#, c-format
-msgid "could not read root certificate file \"%s\": %s\n"
-msgstr "не удало�ь прочитать файл корневых �ертификатов \"%s\": %s\n"
-
-#: fe-secure-openssl.c:1265
-#, c-format
-msgid "SSL library does not support CRL certificates (file \"%s\")\n"
-msgstr "Библиотека SSL не поддерживает проверку CRL (файл \"%s\")\n"
-
-#: fe-secure-openssl.c:1298
-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-openssl.c:1302
-#, 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 ""
-"файл корневых �ертификатов \"%s\" не �уще�твует\n"
-"Укажите полный путь к файлу или отключите проверку �ертификата �ервера, "
-"изменив sslmode.\n"
-
-#: fe-secure-openssl.c:1390
+#: fe-secure-openssl.c:1365
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "не удало�ь получить �ертификат: %s\n"
 
-#: fe-secure-openssl.c:1482
+#: fe-secure-openssl.c:1457
 #, c-format
 msgid "no SSL error reported"
 msgstr "нет �ообщени� об ошибке SSL"
 
-#: fe-secure-openssl.c:1491
+#: fe-secure-openssl.c:1466
 #, c-format
 msgid "SSL error code %lu"
 msgstr "код ошибки SSL: %lu"
@@ -1055,6 +1037,9 @@
 msgid "unrecognized socket error: 0x%08X/%d"
 msgstr "нера�познанна� ошибка �окета: 0x%08X/%d"
 
+#~ msgid "could not acquire mutex: %s\n"
+#~ msgstr "не удало�ь заблокировать �емафор: %s\n"
+
 #~ msgid "unrecognized return value from row processor"
 #~ msgstr "проце��ор �трок вернул нера�познанное значение"
 
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/po/zh_CN.po postgresql-9.5-9.5.8/src/interfaces/libpq/po/zh_CN.po
--- postgresql-9.5-9.5.2/src/interfaces/libpq/po/zh_CN.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/po/zh_CN.po	2017-08-07 21:13:41.000000000 +0000
@@ -695,13 +695,13 @@
 #: fe-misc.c:295
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
-msgstr "pgGetInt �支�大�为 %lu 的整数"
+msgstr "pqGetInt �支�大�为 %lu 的整数"
 
 # fe-misc.c:341
 #: fe-misc.c:331
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
-msgstr "pgPutInt �支�大�为 %lu 的整数"
+msgstr "pqPutInt �支�大�为 %lu 的整数"
 
 # fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
 #: fe-misc.c:642 fe-misc.c:843
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/test/.gitignore postgresql-9.5-9.5.8/src/interfaces/libpq/test/.gitignore
--- postgresql-9.5-9.5.2/src/interfaces/libpq/test/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/test/.gitignore	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,3 @@
+/uri-regress
+/regress.diff
+/regress.out
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/test/Makefile postgresql-9.5-9.5.8/src/interfaces/libpq/test/Makefile
--- postgresql-9.5-9.5.2/src/interfaces/libpq/test/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/test/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -18,5 +18,5 @@
 		   $(PERL) $(top_srcdir)/$(subdir)/regress.pl
 
 clean distclean maintainer-clean:
-	rm -f $(PROGS)
+	rm -f $(PROGS) *.o
 	rm -f regress.out regress.diff
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/win32.c postgresql-9.5-9.5.8/src/interfaces/libpq/win32.c
--- postgresql-9.5-9.5.2/src/interfaces/libpq/win32.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/win32.c	2017-08-07 21:13:41.000000000 +0000
@@ -32,7 +32,7 @@
 
 #include "win32.h"
 
-/* Declared here to avoid pulling in all includes, which causes name collissions */
+/* Declared here to avoid pulling in all includes, which causes name collisions */
 #ifdef ENABLE_NLS
 extern char *libpq_gettext(const char *msgid) pg_attribute_format_arg(1);
 #else
diff -Nru postgresql-9.5-9.5.2/src/interfaces/libpq/win32.mak postgresql-9.5-9.5.8/src/interfaces/libpq/win32.mak
--- postgresql-9.5-9.5.2/src/interfaces/libpq/win32.mak	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/interfaces/libpq/win32.mak	2017-08-07 21:13:41.000000000 +0000
@@ -167,8 +167,9 @@
 	"$(INTDIR)\win32error.obj" \
 	"$(INTDIR)\win32setlocale.obj" \
 	"$(INTDIR)\pthread-win32.obj"
+
 !IFDEF USE_OPENSSL
-	LIB32_OBJS=$(LIB32_OBJS) "$(INTDIR)\fe-secure-openssl.obj"
+LIB32_OBJS=$(LIB32_OBJS) "$(INTDIR)\fe-secure-openssl.obj"
 !ENDIF
 
 
diff -Nru postgresql-9.5-9.5.2/src/Makefile postgresql-9.5-9.5.8/src/Makefile
--- postgresql-9.5-9.5.2/src/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -25,7 +25,8 @@
 	bin \
 	pl \
 	makefiles \
-	test/regress
+	test/regress \
+	test/perl
 
 # There are too many interdependencies between the subdirectories, so
 # don't attempt parallel make here.
diff -Nru postgresql-9.5-9.5.2/src/Makefile.global.in postgresql-9.5-9.5.8/src/Makefile.global.in
--- postgresql-9.5-9.5.2/src/Makefile.global.in	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/Makefile.global.in	2017-08-07 21:13:41.000000000 +0000
@@ -297,6 +297,7 @@
 endif
 perl_archlibexp		= @perl_archlibexp@
 perl_privlibexp		= @perl_privlibexp@
+perl_embed_ccflags	= @perl_embed_ccflags@
 perl_embed_ldflags	= @perl_embed_ldflags@
 
 # Miscellaneous
@@ -331,8 +332,11 @@
 endif
 
 PROVE = @PROVE@
-PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/
-PROVE_FLAGS = --verbose
+# There are common routines in src/test/perl, and some test suites have
+# extra perl modules in their own directory.
+PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/ -I $(srcdir)
+# User-supplied prove flags such as --verbose can be provided in PROVE_FLAGS.
+PROVE_FLAGS =
 
 # prepend to path if already set, else just set it
 define add_to_path
@@ -564,6 +568,11 @@
   COPT= $(CUSTOM_COPT)
 endif
 
+#
+# These variables are meant to be set in the environment of "make"
+# to add flags to whatever configure picked.  Unlike the ones above,
+# they are documented.
+#
 ifdef COPT
    CFLAGS += $(COPT)
    LDFLAGS += $(COPT)
diff -Nru postgresql-9.5-9.5.2/src/makefiles/Makefile.linux postgresql-9.5-9.5.8/src/makefiles/Makefile.linux
--- postgresql-9.5-9.5.2/src/makefiles/Makefile.linux	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/makefiles/Makefile.linux	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,14 @@
 AROPT = crs
+
 export_dynamic = -Wl,-E
 # Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH.
 # This allows LD_LIBRARY_PATH to still work when needed.
 rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags
+
 DLSUFFIX = .so
 
-ifeq "$(findstring sparc,$(host_cpu))" "sparc"
 CFLAGS_SL = -fPIC
-else
-CFLAGS_SL = -fpic
-endif
+
 
 # Rule for building a shared library from a single .o file
 %.so: %.o
diff -Nru postgresql-9.5-9.5.2/src/makefiles/Makefile.netbsd postgresql-9.5-9.5.8/src/makefiles/Makefile.netbsd
--- postgresql-9.5-9.5.2/src/makefiles/Makefile.netbsd	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/makefiles/Makefile.netbsd	2017-08-07 21:13:41.000000000 +0000
@@ -9,11 +9,7 @@
 
 DLSUFFIX = .so
 
-ifeq ($(findstring sparc,$(host_cpu)), sparc)
 CFLAGS_SL = -fPIC -DPIC
-else
-CFLAGS_SL = -fpic -DPIC
-endif
 
 
 # Rule for building a shared library from a single .o file
diff -Nru postgresql-9.5-9.5.2/src/makefiles/Makefile.openbsd postgresql-9.5-9.5.8/src/makefiles/Makefile.openbsd
--- postgresql-9.5-9.5.2/src/makefiles/Makefile.openbsd	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/makefiles/Makefile.openbsd	2017-08-07 21:13:41.000000000 +0000
@@ -7,11 +7,7 @@
 
 DLSUFFIX = .so
 
-ifeq ($(findstring sparc,$(host_cpu)), sparc)
 CFLAGS_SL = -fPIC -DPIC
-else
-CFLAGS_SL = -fpic -DPIC
-endif
 
 
 # Rule for building a shared library from a single .o file
diff -Nru postgresql-9.5-9.5.2/src/Makefile.shlib postgresql-9.5-9.5.8/src/Makefile.shlib
--- postgresql-9.5-9.5.2/src/Makefile.shlib	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/Makefile.shlib	2017-08-07 21:13:41.000000000 +0000
@@ -338,7 +338,16 @@
 else # PORTNAME == aix
 
 # AIX case
-$(shlib) $(stlib): $(OBJS) | $(SHLIB_PREREQS)
+
+# There is no correct way to write a rule that generates two files.
+# Rules with two targets don't have that meaning, they are merely
+# shorthand for two otherwise separate rules.  To be safe for parallel
+# make, we must chain the dependencies like this.  The semicolon is
+# important, otherwise make will choose some built-in rule.
+
+$(stlib): $(shlib) ;
+
+$(shlib): $(OBJS) | $(SHLIB_PREREQS)
 	rm -f $(stlib)
 	$(LINK.static) $(stlib) $^
 	$(RANLIB) $(stlib)
@@ -393,7 +402,7 @@
 	$(CC) $(CFLAGS)  -shared -static-libgcc -o $@  $(OBJS) $(DLL_DEFFILE) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK) $(LIBS) -Wl,--out-implib=$(stlib)
 endif
 
-endif # PORTNAME == cgywin
+endif # PORTNAME == cygwin
 endif # PORTNAME == cygwin || PORTNAME == win32
 
 
diff -Nru postgresql-9.5-9.5.2/src/nls-global.mk postgresql-9.5-9.5.8/src/nls-global.mk
--- postgresql-9.5-9.5.2/src/nls-global.mk	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/nls-global.mk	2017-08-07 21:13:41.000000000 +0000
@@ -76,7 +76,7 @@
 ifeq ($(word 1,$(GETTEXT_FILES)),+)
 po/$(CATALOG_NAME).pot: $(word 2, $(GETTEXT_FILES)) $(MAKEFILE_LIST)
 ifdef XGETTEXT
-	$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) -f $<
+	$(XGETTEXT) -D $(srcdir) -D . -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) -f $<
 else
 	@echo "You don't have 'xgettext'."; exit 1
 endif
@@ -85,7 +85,7 @@
 # Change to srcdir explicitly, don't rely on $^.  That way we get
 # consistent #: file references in the po files.
 ifdef XGETTEXT
-	$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) $(GETTEXT_FILES)
+	$(XGETTEXT) -D $(srcdir) -D . -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(addprefix --flag=, $(GETTEXT_FLAGS)) $(GETTEXT_FILES)
 else
 	@echo "You don't have 'xgettext'."; exit 1
 endif
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/GNUmakefile postgresql-9.5-9.5.8/src/pl/plperl/GNUmakefile
--- postgresql-9.5-9.5.2/src/pl/plperl/GNUmakefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/GNUmakefile	2017-08-07 21:13:41.000000000 +0000
@@ -12,7 +12,11 @@
 override CPPFLAGS += -Wno-comment
 endif
 
-override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE
+# Note: we need to make sure that the CORE directory is included last,
+# probably because it sometimes contains some header files with names
+# that clash with some of ours, or with some that we include, notably on
+# Windows.
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE
 
 rpathdir = $(perl_archlibexp)/CORE
 
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/plperl.c postgresql-9.5-9.5.8/src/pl/plperl/plperl.c
--- postgresql-9.5-9.5.2/src/pl/plperl/plperl.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/plperl.c	2017-08-07 21:13:41.000000000 +0000
@@ -6,6 +6,7 @@
  **********************************************************************/
 
 #include "postgres.h"
+
 /* Defined by Perl */
 #undef _
 
@@ -282,6 +283,7 @@
 static void plperl_trusted_init(void);
 static void plperl_untrusted_init(void);
 static HV  *plperl_spi_execute_fetch_result(SPITupleTable *, int, int);
+static void plperl_return_next_internal(SV *sv);
 static char *hek2cstr(HE *he);
 static SV **hv_store_string(HV *hv, const char *key, SV *val);
 static SV **hv_fetch_string(HV *hv, const char *key);
@@ -300,11 +302,26 @@
 #endif
 
 /*
+ * Decrement the refcount of the given SV within the active Perl interpreter
+ *
+ * This is handy because it reloads the active-interpreter pointer, saving
+ * some notation in callers that switch the active interpreter.
+ */
+static inline void
+SvREFCNT_dec_current(SV *sv)
+{
+	dTHX;
+
+	SvREFCNT_dec(sv);
+}
+
+/*
  * convert a HE (hash entry) key to a cstr in the current database encoding
  */
 static char *
 hek2cstr(HE *he)
 {
+	dTHX;
 	char	   *ret;
 	SV		   *sv;
 
@@ -655,15 +672,19 @@
 	 * to the database AFTER on_*_init code has run. See
 	 * http://archives.postgresql.org/pgsql-hackers/2010-01/msg02669.php
 	 */
-	newXS("PostgreSQL::InServer::SPI::bootstrap",
-		  boot_PostgreSQL__InServer__SPI, __FILE__);
+	{
+		dTHX;
 
-	eval_pv("PostgreSQL::InServer::SPI::bootstrap()", FALSE);
-	if (SvTRUE(ERRSV))
-		ereport(ERROR,
-				(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
-				 errmsg("%s", strip_trailing_ws(sv2cstr(ERRSV))),
-		errcontext("while executing PostgreSQL::InServer::SPI::bootstrap")));
+		newXS("PostgreSQL::InServer::SPI::bootstrap",
+			  boot_PostgreSQL__InServer__SPI, __FILE__);
+
+		eval_pv("PostgreSQL::InServer::SPI::bootstrap()", FALSE);
+		if (SvTRUE(ERRSV))
+			ereport(ERROR,
+					(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
+					 errmsg("%s", strip_trailing_ws(sv2cstr(ERRSV))),
+					 errcontext("while executing PostgreSQL::InServer::SPI::bootstrap")));
+	}
 
 	/* Fully initialized, so mark the hashtable entry valid */
 	interp_desc->interp = interp;
@@ -806,53 +827,62 @@
 	PERL_SET_CONTEXT(plperl);
 	perl_construct(plperl);
 
-	/* run END blocks in perl_destruct instead of perl_run */
-	PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
-
 	/*
-	 * Record the original function for the 'require' and 'dofile' opcodes.
-	 * (They share the same implementation.) Ensure it's used for new
-	 * interpreters.
+	 * Run END blocks in perl_destruct instead of perl_run.  Note that dTHX
+	 * loads up a pointer to the current interpreter, so we have to postpone
+	 * it to here rather than put it at the function head.
 	 */
-	if (!pp_require_orig)
-		pp_require_orig = PL_ppaddr[OP_REQUIRE];
-	else
 	{
-		PL_ppaddr[OP_REQUIRE] = pp_require_orig;
-		PL_ppaddr[OP_DOFILE] = pp_require_orig;
-	}
+		dTHX;
+
+		PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
+
+		/*
+		 * Record the original function for the 'require' and 'dofile'
+		 * opcodes.  (They share the same implementation.)  Ensure it's used
+		 * for new interpreters.
+		 */
+		if (!pp_require_orig)
+			pp_require_orig = PL_ppaddr[OP_REQUIRE];
+		else
+		{
+			PL_ppaddr[OP_REQUIRE] = pp_require_orig;
+			PL_ppaddr[OP_DOFILE] = pp_require_orig;
+		}
 
 #ifdef PLPERL_ENABLE_OPMASK_EARLY
 
-	/*
-	 * For regression testing to prove that the PLC_PERLBOOT and PLC_TRUSTED
-	 * code doesn't even compile any unsafe ops. In future there may be a
-	 * valid need for them to do so, in which case this could be softened
-	 * (perhaps moved to plperl_trusted_init()) or removed.
-	 */
-	PL_op_mask = plperl_opmask;
+		/*
+		 * For regression testing to prove that the PLC_PERLBOOT and
+		 * PLC_TRUSTED code doesn't even compile any unsafe ops.  In future
+		 * there may be a valid need for them to do so, in which case this
+		 * could be softened (perhaps moved to plperl_trusted_init()) or
+		 * removed.
+		 */
+		PL_op_mask = plperl_opmask;
 #endif
 
-	if (perl_parse(plperl, plperl_init_shared_libs,
-				   nargs, embedding, NULL) != 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
-				 errmsg("%s", strip_trailing_ws(sv2cstr(ERRSV))),
-				 errcontext("while parsing Perl initialization")));
+		if (perl_parse(plperl, plperl_init_shared_libs,
+					   nargs, embedding, NULL) != 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
+					 errmsg("%s", strip_trailing_ws(sv2cstr(ERRSV))),
+					 errcontext("while parsing Perl initialization")));
 
-	if (perl_run(plperl) != 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
-				 errmsg("%s", strip_trailing_ws(sv2cstr(ERRSV))),
-				 errcontext("while running Perl initialization")));
+		if (perl_run(plperl) != 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
+					 errmsg("%s", strip_trailing_ws(sv2cstr(ERRSV))),
+					 errcontext("while running Perl initialization")));
 
 #ifdef PLPERL_RESTORE_LOCALE
-	PLPERL_RESTORE_LOCALE(LC_COLLATE, save_collate);
-	PLPERL_RESTORE_LOCALE(LC_CTYPE, save_ctype);
-	PLPERL_RESTORE_LOCALE(LC_MONETARY, save_monetary);
-	PLPERL_RESTORE_LOCALE(LC_NUMERIC, save_numeric);
-	PLPERL_RESTORE_LOCALE(LC_TIME, save_time);
+		PLPERL_RESTORE_LOCALE(LC_COLLATE, save_collate);
+		PLPERL_RESTORE_LOCALE(LC_CTYPE, save_ctype);
+		PLPERL_RESTORE_LOCALE(LC_MONETARY, save_monetary);
+		PLPERL_RESTORE_LOCALE(LC_NUMERIC, save_numeric);
+		PLPERL_RESTORE_LOCALE(LC_TIME, save_time);
 #endif
+	}
 
 	return plperl;
 }
@@ -918,6 +948,7 @@
 		 * public API so isn't portably available.) Meanwhile END blocks can
 		 * be used to perform manual cleanup.
 		 */
+		dTHX;
 
 		/* Run END blocks - based on perl's perl_destruct() */
 		if (PL_exit_flags & PERL_EXIT_DESTRUCT_END)
@@ -944,6 +975,7 @@
 static void
 plperl_trusted_init(void)
 {
+	dTHX;
 	HV		   *stash;
 	SV		   *sv;
 	char	   *key;
@@ -1024,6 +1056,8 @@
 static void
 plperl_untrusted_init(void)
 {
+	dTHX;
+
 	/*
 	 * Nothing to do except execute plperl.on_plperlu_init
 	 */
@@ -1059,6 +1093,7 @@
 static HeapTuple
 plperl_build_tuple_result(HV *perlhash, TupleDesc td)
 {
+	dTHX;
 	Datum	   *values;
 	bool	   *nulls;
 	HE		   *he;
@@ -1115,6 +1150,8 @@
 static SV  *
 get_perl_array_ref(SV *sv)
 {
+	dTHX;
+
 	if (SvOK(sv) && SvROK(sv))
 	{
 		if (SvTYPE(SvRV(sv)) == SVt_PVAV)
@@ -1143,6 +1180,7 @@
 						Oid arraytypid, Oid elemtypid, int32 typmod,
 						FmgrInfo *finfo, Oid typioparam)
 {
+	dTHX;
 	int			i;
 	int			len = av_len(av) + 1;
 
@@ -1214,6 +1252,7 @@
 static Datum
 plperl_array_to_datum(SV *src, Oid typid, int32 typmod)
 {
+	dTHX;
 	ArrayBuildState *astate;
 	Oid			elemtypid;
 	FmgrInfo	finfo;
@@ -1416,6 +1455,7 @@
 static SV  *
 plperl_ref_from_pg_array(Datum arg, Oid typid)
 {
+	dTHX;
 	ArrayType  *ar = DatumGetArrayTypeP(arg);
 	Oid			elementtype = ARR_ELEMTYPE(ar);
 	int16		typlen;
@@ -1484,6 +1524,7 @@
 static SV  *
 split_array(plperl_array_info *info, int first, int last, int nest)
 {
+	dTHX;
 	int			i;
 	AV		   *result;
 
@@ -1517,6 +1558,7 @@
 static SV  *
 make_array_ref(plperl_array_info *info, int first, int last)
 {
+	dTHX;
 	int			i;
 	AV		   *result = newAV();
 
@@ -1554,6 +1596,7 @@
 static SV  *
 plperl_trigger_build_args(FunctionCallInfo fcinfo)
 {
+	dTHX;
 	TriggerData *tdata;
 	TupleDesc	tupdesc;
 	int			i;
@@ -1660,6 +1703,7 @@
 static SV  *
 plperl_event_trigger_build_args(FunctionCallInfo fcinfo)
 {
+	dTHX;
 	EventTriggerData *tdata;
 	HV		   *hv;
 
@@ -1678,6 +1722,7 @@
 static HeapTuple
 plperl_modify_tuple(HV *hvTD, TriggerData *tdata, HeapTuple otup)
 {
+	dTHX;
 	SV		  **svp;
 	HV		   *hvNew;
 	HE		   *he;
@@ -1879,7 +1924,7 @@
 
 		perlret = plperl_call_perl_func(&desc, &fake_fcinfo);
 
-		SvREFCNT_dec(perlret);
+		SvREFCNT_dec_current(perlret);
 
 		if (SPI_finish() != SPI_OK_FINISH)
 			elog(ERROR, "SPI_finish() failed");
@@ -1887,7 +1932,7 @@
 	PG_CATCH();
 	{
 		if (desc.reference)
-			SvREFCNT_dec(desc.reference);
+			SvREFCNT_dec_current(desc.reference);
 		current_call_data = save_call_data;
 		activate_interpreter(oldinterp);
 		PG_RE_THROW();
@@ -1895,7 +1940,7 @@
 	PG_END_TRY();
 
 	if (desc.reference)
-		SvREFCNT_dec(desc.reference);
+		SvREFCNT_dec_current(desc.reference);
 
 	current_call_data = save_call_data;
 	activate_interpreter(oldinterp);
@@ -2023,6 +2068,7 @@
 static void
 plperl_create_sub(plperl_proc_desc *prodesc, char *s, Oid fn_oid)
 {
+	dTHX;
 	dSP;
 	char		subname[NAMEDATALEN + 40];
 	HV		   *pragma_hv = newHV();
@@ -2109,6 +2155,7 @@
 static SV  *
 plperl_call_perl_func(plperl_proc_desc *desc, FunctionCallInfo fcinfo)
 {
+	dTHX;
 	dSP;
 	SV		   *retval;
 	int			i;
@@ -2202,6 +2249,7 @@
 plperl_call_perl_trigger_func(plperl_proc_desc *desc, FunctionCallInfo fcinfo,
 							  SV *td)
 {
+	dTHX;
 	dSP;
 	SV		   *retval,
 			   *TDsv;
@@ -2270,6 +2318,7 @@
 									FunctionCallInfo fcinfo,
 									SV *td)
 {
+	dTHX;
 	dSP;
 	SV		   *retval,
 			   *TDsv;
@@ -2389,13 +2438,14 @@
 		sav = get_perl_array_ref(perlret);
 		if (sav)
 		{
+			dTHX;
 			int			i = 0;
 			SV		  **svp = 0;
 			AV		   *rav = (AV *) SvRV(sav);
 
 			while ((svp = av_fetch(rav, i, FALSE)) != NULL)
 			{
-				plperl_return_next(*svp);
+				plperl_return_next_internal(*svp);
 				i++;
 			}
 		}
@@ -2432,7 +2482,7 @@
 	/* Restore the previous error callback */
 	error_context_stack = pl_error_context.previous;
 
-	SvREFCNT_dec(perlret);
+	SvREFCNT_dec_current(perlret);
 
 	return retval;
 }
@@ -2536,9 +2586,9 @@
 	/* Restore the previous error callback */
 	error_context_stack = pl_error_context.previous;
 
-	SvREFCNT_dec(svTD);
+	SvREFCNT_dec_current(svTD);
 	if (perlret)
-		SvREFCNT_dec(perlret);
+		SvREFCNT_dec_current(perlret);
 
 	return retval;
 }
@@ -2577,9 +2627,7 @@
 	/* Restore the previous error callback */
 	error_context_stack = pl_error_context.previous;
 
-	SvREFCNT_dec(svTD);
-
-	return;
+	SvREFCNT_dec_current(svTD);
 }
 
 
@@ -2622,7 +2670,7 @@
 		plperl_interp_desc *oldinterp = plperl_active_interp;
 
 		activate_interpreter(prodesc->interp);
-		SvREFCNT_dec(prodesc->reference);
+		SvREFCNT_dec_current(prodesc->reference);
 		activate_interpreter(oldinterp);
 	}
 	/* Get rid of what we conveniently can of our own structs */
@@ -2936,6 +2984,7 @@
 static SV  *
 plperl_hash_from_tuple(HeapTuple tuple, TupleDesc tupdesc)
 {
+	dTHX;
 	HV		   *hv;
 	int			i;
 
@@ -3094,6 +3143,7 @@
 plperl_spi_execute_fetch_result(SPITupleTable *tuptable, int processed,
 								int status)
 {
+	dTHX;
 	HV		   *result;
 
 	check_spi_usage_allowed();
@@ -3129,16 +3179,41 @@
 
 
 /*
- * Note: plperl_return_next is called both in Postgres and Perl contexts.
- * We report any errors in Postgres fashion (via ereport).  If called in
- * Perl context, it is SPI.xs's responsibility to catch the error and
- * convert to a Perl error.  We assume (perhaps without adequate justification)
- * that we need not abort the current transaction if the Perl code traps the
- * error.
+ * plperl_return_next catches any error and converts it to a Perl error.
+ * We assume (perhaps without adequate justification) that we need not abort
+ * the current transaction if the Perl code traps the error.
  */
 void
 plperl_return_next(SV *sv)
 {
+	MemoryContext oldcontext = CurrentMemoryContext;
+
+	PG_TRY();
+	{
+		plperl_return_next_internal(sv);
+	}
+	PG_CATCH();
+	{
+		ErrorData  *edata;
+
+		/* Must reset elog.c's state */
+		MemoryContextSwitchTo(oldcontext);
+		edata = CopyErrorData();
+		FlushErrorState();
+
+		/* Punt the error to Perl */
+		croak_cstr(edata->message);
+	}
+	PG_END_TRY();
+}
+
+/*
+ * plperl_return_next_internal reports any errors in Postgres fashion
+ * (via ereport).
+ */
+static void
+plperl_return_next_internal(SV *sv)
+{
 	plperl_proc_desc *prodesc;
 	FunctionCallInfo fcinfo;
 	ReturnSetInfo *rsi;
@@ -3164,12 +3239,18 @@
 
 		/*
 		 * This is the first call to return_next in the current PL/Perl
-		 * function call, so memoize some lookups
+		 * function call, so identify the output tuple descriptor and create a
+		 * tuplestore to hold the result rows.
 		 */
 		if (prodesc->fn_retistuple)
 			(void) get_call_result_type(fcinfo, NULL, &tupdesc);
 		else
+		{
 			tupdesc = rsi->expectedDesc;
+			/* Protect assumption below that we return exactly one column */
+			if (tupdesc == NULL || tupdesc->natts != 1)
+				elog(ERROR, "expected single-column result descriptor for non-composite SETOF result");
+		}
 
 		/*
 		 * Make sure the tuple_store and ret_tdesc are sufficiently
@@ -3219,20 +3300,20 @@
 	}
 	else
 	{
-		Datum		ret;
-		bool		isNull;
+		Datum		ret[1];
+		bool		isNull[1];
 
-		ret = plperl_sv_to_datum(sv,
-								 prodesc->result_oid,
-								 -1,
-								 fcinfo,
-								 &prodesc->result_in_func,
-								 prodesc->result_typioparam,
-								 &isNull);
+		ret[0] = plperl_sv_to_datum(sv,
+									prodesc->result_oid,
+									-1,
+									fcinfo,
+									&prodesc->result_in_func,
+									prodesc->result_typioparam,
+									&isNull[0]);
 
 		tuplestore_putvalues(current_call_data->tuple_store,
 							 current_call_data->ret_tdesc,
-							 &ret, &isNull);
+							 ret, isNull);
 	}
 
 	MemoryContextSwitchTo(old_cxt);
@@ -3343,6 +3424,7 @@
 
 	PG_TRY();
 	{
+		dTHX;
 		Portal		p = SPI_cursor_find(cursor);
 
 		if (!p)
@@ -3614,6 +3696,8 @@
 
 	PG_TRY();
 	{
+		dTHX;
+
 		/************************************************************
 		 * Fetch the saved plan descriptor, see if it's o.k.
 		 ************************************************************/
@@ -3885,12 +3969,54 @@
 }
 
 /*
+ * Implementation of plperl's elog() function
+ *
+ * If the error level is less than ERROR, we'll just emit the message and
+ * return.  When it is ERROR, elog() will longjmp, which we catch and
+ * turn into a Perl croak().  Note we are assuming that elog() can't have
+ * any internal failures that are so bad as to require a transaction abort.
+ *
+ * The main reason this is out-of-line is to avoid conflicts between XSUB.h
+ * and the PG_TRY macros.
+ */
+void
+plperl_util_elog(int level, SV *msg)
+{
+	MemoryContext oldcontext = CurrentMemoryContext;
+	char	   *volatile cmsg = NULL;
+
+	PG_TRY();
+	{
+		cmsg = sv2cstr(msg);
+		elog(level, "%s", cmsg);
+		pfree(cmsg);
+	}
+	PG_CATCH();
+	{
+		ErrorData  *edata;
+
+		/* Must reset elog.c's state */
+		MemoryContextSwitchTo(oldcontext);
+		edata = CopyErrorData();
+		FlushErrorState();
+
+		if (cmsg)
+			pfree(cmsg);
+
+		/* Punt the error to Perl */
+		croak_cstr(edata->message);
+	}
+	PG_END_TRY();
+}
+
+/*
  * Store an SV into a hash table under a key that is a string assumed to be
  * in the current database's encoding.
  */
 static SV **
 hv_store_string(HV *hv, const char *key, SV *val)
 {
+	dTHX;
 	int32		hlen;
 	char	   *hkey;
 	SV		  **ret;
@@ -3919,6 +4045,7 @@
 static SV **
 hv_fetch_string(HV *hv, const char *key)
 {
+	dTHX;
 	int32		hlen;
 	char	   *hkey;
 	SV		  **ret;
@@ -3977,6 +4104,7 @@
 static char *
 setlocale_perl(int category, char *locale)
 {
+	dTHX;
 	char	   *RETVAL = setlocale(category, locale);
 
 	if (RETVAL)
@@ -4041,4 +4169,4 @@
 	return RETVAL;
 }
 
-#endif
+#endif							/* WIN32 */
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/plperl.h postgresql-9.5-9.5.8/src/pl/plperl/plperl.h
--- postgresql-9.5-9.5.2/src/pl/plperl/plperl.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/plperl.h	2017-08-07 21:13:41.000000000 +0000
@@ -24,7 +24,7 @@
 #ifdef isnan
 #undef isnan
 #endif
-#endif
+#endif							/* WIN32 */
 
 /*
  * Supply a value of PERL_UNUSED_DECL that will satisfy gcc - the one
@@ -43,10 +43,22 @@
 #endif
 
 
-/* required for perl API */
+/*
+ * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
+ * can compile against MULTIPLICITY Perl builds without including XSUB.h.
+ */
+#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
+
+/*
+ * We want to include XSUB.h only within .xs files, because on some platforms
+ * it undesirably redefines a lot of libc functions.  But it must appear
+ * before ppport.h, so use a #define flag to control inclusion here.
+ */
+#ifdef PG_NEED_PERL_XSUB_H
 #include "XSUB.h"
+#endif
 
 /* put back our snprintf and vsnprintf */
 #ifdef USE_REPL_SNPRINTF
@@ -99,5 +111,6 @@
 void		plperl_spi_freeplan(char *);
 void		plperl_spi_cursor_close(char *);
 char	   *plperl_sv_to_literal(SV *, char *);
+void		plperl_util_elog(int level, SV *msg);
 
 #endif   /* PL_PERL_H */
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/plperl_helpers.h postgresql-9.5-9.5.8/src/pl/plperl/plperl_helpers.h
--- postgresql-9.5-9.5.2/src/pl/plperl/plperl_helpers.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/plperl_helpers.h	2017-08-07 21:13:41.000000000 +0000
@@ -50,6 +50,7 @@
 static inline char *
 sv2cstr(SV *sv)
 {
+	dTHX;
 	char	   *val,
 			   *res;
 	STRLEN		len;
@@ -107,6 +108,7 @@
 static inline SV *
 cstr2sv(const char *str)
 {
+	dTHX;
 	SV		   *sv;
 	char	   *utf8_str;
 
@@ -134,6 +136,8 @@
 static inline void
 croak_cstr(const char *str)
 {
+	dTHX;
+
 #ifdef croak_sv
 	/* Use sv_2mortal() to be sure the transient SV gets freed */
 	croak_sv(sv_2mortal(cstr2sv(str)));
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/po/de.po postgresql-9.5-9.5.8/src/pl/plperl/po/de.po
--- postgresql-9.5-9.5.2/src/pl/plperl/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PostgreSQL package.
 # Peter Eisentraut <peter_e@gmx.net>, 2009 - 2015.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@
 
 #: plperl.c:404
 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."
+msgstr "Wenn wahr, dann wird vertrauenswürdiger und nicht vertrauenswürdiger Perl-Code im »strict«-Modus kompiliert."
 
 #: plperl.c:418
 msgid "Perl initialization code to execute when a Perl interpreter is initialized."
@@ -84,7 +84,7 @@
 #: plperl.c:1081 plperl.c:1710
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
-msgstr "Perl-Hash enthält nicht existierende Spalte „%s“"
+msgstr "Perl-Hash enthält nicht existierende Spalte »%s«"
 
 #: plperl.c:1166
 #, c-format
@@ -144,7 +144,7 @@
 #: plperl.c:2073
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
-msgstr "keine CODE-Referenz erhalten beim Kompilieren von Funktion „%s“"
+msgstr "keine CODE-Referenz erhalten beim Kompilieren von Funktion »%s«"
 
 #: plperl.c:2163
 #, c-format
@@ -179,7 +179,7 @@
 #: plperl.c:2515
 #, c-format
 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"
+msgstr "Ergebnis einer PL/Perl-Triggerfunktion muss undef, »SKIP« oder »MODIFY« sein"
 
 #: plperl.c:2694 plperl.c:2704
 #, c-format
@@ -204,12 +204,12 @@
 #: plperl.c:3934
 #, c-format
 msgid "PL/Perl function \"%s\""
-msgstr "PL/Perl-Funktion „%s“"
+msgstr "PL/Perl-Funktion »%s«"
 
 #: plperl.c:3946
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
-msgstr "Kompilierung der PL/Perl-Funktion „%s“"
+msgstr "Kompilierung der PL/Perl-Funktion »%s«"
 
 #: plperl.c:3955
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/po/es.po postgresql-9.5-9.5.8/src/pl/plperl/po/es.po
--- postgresql-9.5-9.5.2/src/pl/plperl/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: plperl (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:37+0000\n"
+"POT-Creation-Date: 2017-05-21 17:26+0000\n"
 "PO-Revision-Date: 2015-09-30 12:21-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
@@ -41,8 +41,8 @@
 msgstr "no se pueden instanciar múltiples intérpretes Perl en esta plataforma"
 
 #: plperl.c:665 plperl.c:840 plperl.c:846 plperl.c:960 plperl.c:972
-#: plperl.c:1015 plperl.c:1036 plperl.c:2068 plperl.c:2175 plperl.c:2242
-#: plperl.c:2304
+#: plperl.c:1015 plperl.c:1036 plperl.c:2079 plperl.c:2188 plperl.c:2255
+#: plperl.c:2317
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -82,7 +82,7 @@
 msgid "while executing plperl.on_plperlu_init"
 msgstr "mientras se ejecutaba plperl.on_plperlu_init"
 
-#: plperl.c:1081 plperl.c:1710
+#: plperl.c:1081 plperl.c:1721
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "el hash de Perl contiene el columna inexistente «%s»"
@@ -122,97 +122,97 @@
 msgid "lookup failed for type %s"
 msgstr "búsqueda del tipo %s falló"
 
-#: plperl.c:1687
+#: plperl.c:1698
 #, c-format
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} no existe"
 
-#: plperl.c:1691
+#: plperl.c:1702
 #, c-format
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} no es una referencia a un hash"
 
-#: plperl.c:1944 plperl.c:2776
+#: plperl.c:1955 plperl.c:2789
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "las funciones en PL/Perl no pueden retornar el tipo %s"
 
-#: plperl.c:1957 plperl.c:2821
+#: plperl.c:1968 plperl.c:2834
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "funciones de PL/Perl no pueden aceptar el tipo %s"
 
-#: plperl.c:2073
+#: plperl.c:2084
 #, 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»"
 
-#: plperl.c:2163
+#: plperl.c:2176
 #, c-format
 msgid "didn't get a return item from function"
 msgstr "no se obtuvo un elemento de retorno desde la función"
 
-#: plperl.c:2206 plperl.c:2272
+#: plperl.c:2219 plperl.c:2285
 #, c-format
 msgid "couldn't fetch $_TD"
 msgstr "no se pudo obtener $_TD"
 
-#: plperl.c:2230 plperl.c:2292
+#: plperl.c:2243 plperl.c:2305
 #, c-format
 msgid "didn't get a return item from trigger function"
 msgstr "no se obtuvo un elemento de retorno desde la función de disparador"
 
-#: plperl.c:2349
+#: plperl.c:2362
 #, c-format
 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:2393
+#: plperl.c:2406
 #, c-format
 msgid "set-returning PL/Perl function must return reference to array or use return_next"
 msgstr "una función PL/Perl que retorna un conjunto debe retornar una referencia a un array o usar return_next"
 
-#: plperl.c:2507
+#: plperl.c:2520
 #, c-format
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ignorando la tupla modificada en el disparador DELETE"
 
-#: plperl.c:2515
+#: plperl.c:2528
 #, c-format
 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:2694 plperl.c:2704
+#: plperl.c:2707 plperl.c:2717
 #, c-format
 msgid "out of memory"
 msgstr "memoria agotada"
 
-#: plperl.c:2768
+#: plperl.c:2781
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones disparadoras sólo pueden ser llamadas como disparadores"
 
-#: plperl.c:3144
+#: plperl.c:3157
 #, c-format
 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:3200
+#: plperl.c:3213
 #, c-format
 msgid "SETOF-composite-returning PL/Perl function must call return_next with reference to hash"
 msgstr "una función Perl que retorna SETOF de un tipo compuesto debe invocar return_next con una referencia a un hash"
 
-#: plperl.c:3934
+#: plperl.c:3947
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "función PL/Perl «%s»"
 
-#: plperl.c:3946
+#: plperl.c:3959
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "compilación de la función PL/Perl «%s»"
 
-#: plperl.c:3955
+#: plperl.c:3968
 #, c-format
 msgid "PL/Perl anonymous code block"
 msgstr "bloque de código anónimo de PL/Perl"
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/po/fr.po postgresql-9.5-9.5.8/src/pl/plperl/po/fr.po
--- postgresql-9.5-9.5.2/src/pl/plperl/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,12 +1,12 @@
 # translation of plperl.po to fr_fr
 # french message translation file for plperl
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 # Guillaume Lelarge <guillaume@lelarge.info>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2016-02-17 02:37+0000\n"
 "PO-Revision-Date: 2016-02-21 15:47+0100\n"
@@ -14,38 +14,38 @@
 "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-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
 #: plperl.c:404
 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"
+"Si true, le code Perl de confiance et sans confiance sera compilé en mode\n"
 "strict."
 
 #: plperl.c:418
 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é."
+"Code d'initialisation Perl à exécuter lorsque un interpréteur Perl est\n"
+"initialisé."
 
 #: plperl.c:440
 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"
+"Code d'initialisation Perl à exécuter lorsque plperl est utilisé pour la\n"
+"première fois"
 
 #: plperl.c:448
 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"
+"Code d'initialisation Perl à exécuter lorsque plperlu est utilisé pour la\n"
+"première fois"
 
 #: plperl.c:645
 #, c-format
 msgid "cannot allocate multiple Perl interpreters on this platform"
-msgstr "ne peut pas allouer plusieurs interpréteurs Perl sur cette plateforme"
+msgstr "ne peut pas allouer plusieurs interpréteurs Perl sur cette plateforme"
 
 #: plperl.c:665 plperl.c:840 plperl.c:846 plperl.c:960 plperl.c:972
 #: plperl.c:1015 plperl.c:1036 plperl.c:2068 plperl.c:2177 plperl.c:2244
@@ -57,7 +57,7 @@
 #: plperl.c:666
 #, c-format
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
-msgstr "lors de l'exécution de PostgreSQL::InServer::SPI::bootstrap"
+msgstr "lors de l'exécution de PostgreSQL::InServer::SPI::bootstrap"
 
 #: plperl.c:841
 #, c-format
@@ -67,37 +67,37 @@
 #: plperl.c:847
 #, c-format
 msgid "while running Perl initialization"
-msgstr "lors de l'exécution de l'initialisation de perl"
+msgstr "lors de l'exécution de l'initialisation de perl"
 
 #: plperl.c:961
 #, c-format
 msgid "while executing PLC_TRUSTED"
-msgstr "lors de l'exécution de PLC_TRUSTED"
+msgstr "lors de l'exécution de PLC_TRUSTED"
 
 #: plperl.c:973
 #, c-format
 msgid "while executing utf8fix"
-msgstr "lors de l'exécution de utf8fix"
+msgstr "lors de l'exécution de utf8fix"
 
 #: plperl.c:1016
 #, c-format
 msgid "while executing plperl.on_plperl_init"
-msgstr "lors de l'exécution de plperl.on_plperl_init"
+msgstr "lors de l'exécution de plperl.on_plperl_init"
 
 #: plperl.c:1037
 #, c-format
 msgid "while executing plperl.on_plperlu_init"
-msgstr "lors de l'exécution de plperl.on_plperlu_init"
+msgstr "lors de l'exécution de plperl.on_plperlu_init"
 
 #: plperl.c:1081 plperl.c:1710
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
-msgstr "Le hachage Perl contient la colonne « %s » inexistante"
+msgstr "Le hachage Perl contient la colonne « %s » inexistante"
 
 #: plperl.c:1166
 #, 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)"
+msgstr "le nombre de dimensions du tableau (%d) dépasse la maximum autorisé (%d)"
 
 #: plperl.c:1178 plperl.c:1195
 #, c-format
@@ -120,18 +120,18 @@
 #, c-format
 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"
+"fonction renvoyant le type record appelée dans un contexte qui ne peut pas\n"
 "accepter le type record"
 
 #: plperl.c:1358
 #, c-format
 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"
+msgstr "la fonction PL/perl doit renvoyer la référence à un hachage ou à un tableau"
 
 #: plperl.c:1395
 #, c-format
 msgid "lookup failed for type %s"
-msgstr "recherche échouée pour le type %s"
+msgstr "recherche échouée pour le type %s"
 
 #: plperl.c:1687
 #, c-format
@@ -141,7 +141,7 @@
 #: plperl.c:1691
 #, c-format
 msgid "$_TD->{new} is not a hash reference"
-msgstr "$_TD->{new} n'est pas une référence de hachage"
+msgstr "$_TD->{new} n'est pas une référence de hachage"
 
 #: plperl.c:1944 plperl.c:2778
 #, c-format
@@ -156,58 +156,58 @@
 #: plperl.c:2073
 #, 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 »"
+msgstr "n'a pas obtenu une référence CODE lors de la compilation de la fonction « %s »"
 
 #: plperl.c:2165
 #, c-format
 msgid "didn't get a return item from function"
-msgstr "n'a pas obtenu un élément en retour de la fonction"
+msgstr "n'a pas obtenu un élément en retour de la fonction"
 
 #: plperl.c:2208 plperl.c:2274
 #, c-format
 msgid "couldn't fetch $_TD"
-msgstr "n'a pas pu récupérer $_TD"
+msgstr "n'a pas pu récupérer $_TD"
 
 #: plperl.c:2232 plperl.c:2294
 #, c-format
 msgid "didn't get a return item from trigger function"
-msgstr "n'a pas obtenu un élément en retour de la fonction trigger"
+msgstr "n'a pas obtenu un élément en retour de la fonction trigger"
 
 #: plperl.c:2351
 #, c-format
 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"
+"fonction renvoyant un ensemble appelée dans un contexte qui ne peut pas\n"
 "accepter un ensemble"
 
 #: plperl.c:2395
 #, c-format
 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"
+"la fonction PL/perl renvoyant des ensembles doit renvoyer la référence à\n"
 "un tableau ou utiliser return_next"
 
 #: plperl.c:2509
 #, c-format
 msgid "ignoring modified row in DELETE trigger"
-msgstr "ignore la ligne modifiée dans le trigger DELETE"
+msgstr "ignore la ligne modifiée dans le trigger DELETE"
 
 #: plperl.c:2517
 #, c-format
 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 »"
+"le résultat de la fonction trigger PL/perl doit être undef, « SKIP » ou\n"
+"« MODIFY »"
 
 #: plperl.c:2696 plperl.c:2706
 #, c-format
 msgid "out of memory"
-msgstr "mémoire épuisée"
+msgstr "mémoire épuisée"
 
 #: plperl.c:2770
 #, c-format
 msgid "trigger functions can only be called as triggers"
-msgstr "les fonctions trigger peuvent seulement être appelées par des triggers"
+msgstr "les fonctions trigger peuvent seulement être appelées par des triggers"
 
 #: plperl.c:3146
 #, c-format
@@ -219,17 +219,17 @@
 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"
+"return_next avec la référence à un hachage"
 
 #: plperl.c:3936
 #, c-format
 msgid "PL/Perl function \"%s\""
-msgstr "fonction PL/Perl « %s »"
+msgstr "fonction PL/Perl « %s »"
 
 #: plperl.c:3948
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
-msgstr "compilation de la fonction PL/Perl « %s »"
+msgstr "compilation de la fonction PL/Perl « %s »"
 
 #: plperl.c:3957
 #, c-format
@@ -237,15 +237,15 @@
 msgstr "bloc de code PL/Perl anonyme"
 
 #~ msgid "error from Perl function \"%s\": %s"
-#~ msgstr "échec dans la fonction Perl « %s » : %s"
+#~ msgstr "échec dans la fonction Perl « %s » : %s"
 
 #~ msgid "creation of Perl function \"%s\" failed: %s"
-#~ msgstr "échec de la création de la fonction Perl « %s » : %s"
+#~ msgstr "échec de la création de la fonction Perl « %s » : %s"
 
 #~ msgid "while executing PLC_SAFE_OK"
-#~ msgstr "lors de l'exécution de PLC_SAFE_OK"
+#~ msgstr "lors de l'exécution de PLC_SAFE_OK"
 
 #~ 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"
+#~ "référence à un hachage"
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/po/it.po postgresql-9.5-9.5.8/src/pl/plperl/po/it.po
--- postgresql-9.5-9.5.2/src/pl/plperl/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -20,7 +20,7 @@
 "Project-Id-Version: plperl (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2015-08-15 18:37+0000\n"
-"PO-Revision-Date: 2015-08-16 10:02+0100\n"
+"PO-Revision-Date: 2016-04-17 20:56+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -28,6 +28,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #: plperl.c:404
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/po/ru.po postgresql-9.5-9.5.8/src/pl/plperl/po/ru.po
--- postgresql-9.5-9.5.2/src/pl/plperl/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,26 +1,22 @@
 # Russian message translation file for plperl
-# Copyright (C) 2012 PostgreSQL Global Development Group
+# Copyright (C) 2012-2016 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Alexander Lakhin <exclusion@gmail.com>, 2012.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# ChangeLog:
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 18, 2012: Complete translation for 9.1. Alexander Lakhin <exclusion@gmail.com>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.2\n"
+"Project-Id-Version: plperl (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-09-19 03:07+0000\n"
-"PO-Revision-Date: 2015-10-16 21:10+0400\n"
+"POT-Creation-Date: 2016-09-20 18:15+0000\n"
+"PO-Revision-Date: 2016-09-20 12:00+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 2.0\n"
 
 #: plperl.c:404
 msgid ""
@@ -54,8 +50,8 @@
 msgstr "на �той платформе нельз� запу�тить множе�тво интерпретаторов Perl"
 
 #: plperl.c:665 plperl.c:840 plperl.c:846 plperl.c:960 plperl.c:972
-#: plperl.c:1015 plperl.c:1036 plperl.c:2068 plperl.c:2175 plperl.c:2242
-#: plperl.c:2304
+#: plperl.c:1015 plperl.c:1036 plperl.c:2079 plperl.c:2188 plperl.c:2255
+#: plperl.c:2317
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -95,7 +91,7 @@
 msgid "while executing plperl.on_plperlu_init"
 msgstr "при выполнении plperl.on_plperlu_init"
 
-#: plperl.c:1081 plperl.c:1710
+#: plperl.c:1081 plperl.c:1721
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Perl-хеш �одержит не�уще�твующий �толбец \"%s\""
@@ -140,53 +136,53 @@
 msgid "lookup failed for type %s"
 msgstr "найти тип %s не удало�ь"
 
-#: plperl.c:1687
+#: plperl.c:1698
 #, c-format
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} не �уще�твует"
 
-#: plperl.c:1691
+#: plperl.c:1702
 #, c-format
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} - не ��ылка на хеш"
 
-#: plperl.c:1944 plperl.c:2776
+#: plperl.c:1955 plperl.c:2789
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "функции PL/Perl не могут возвращать тип %s"
 
-#: plperl.c:1957 plperl.c:2821
+#: plperl.c:1968 plperl.c:2834
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "функции PL/Perl не могут принимать тип %s"
 
-#: plperl.c:2073
+#: plperl.c:2084
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "не удало�ь получить ��ылку на код по�ле компил�ции функции \"%s\""
 
-#: plperl.c:2163
+#: plperl.c:2176
 #, c-format
 msgid "didn't get a return item from function"
 msgstr "не удало�ь получить возвращаемый �лемент от функции"
 
-#: plperl.c:2206 plperl.c:2272
+#: plperl.c:2219 plperl.c:2285
 #, c-format
 msgid "couldn't fetch $_TD"
 msgstr "не удало�ь получить $_TD"
 
-#: plperl.c:2230 plperl.c:2292
+#: plperl.c:2243 plperl.c:2305
 #, c-format
 msgid "didn't get a return item from trigger function"
 msgstr "не удало�ь получить возвращаемый �лемент от триггерной функции"
 
-#: plperl.c:2349
+#: plperl.c:2362
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "функци�, возвращающа� множе�тво, вызвана в контек�те, где ему нет ме�та"
 
-#: plperl.c:2393
+#: plperl.c:2406
 #, c-format
 msgid ""
 "set-returning PL/Perl function must return reference to array or use "
@@ -195,12 +191,12 @@
 "функци� PL/Perl, возвращающа� множе�тво, должна возвращать ��ылку на ма��ив "
 "или вызывать return_next"
 
-#: plperl.c:2507
+#: plperl.c:2520
 #, c-format
 msgid "ignoring modified row in DELETE trigger"
 msgstr "в триггере DELETE изменённа� �трока игнорирует��"
 
-#: plperl.c:2515
+#: plperl.c:2528
 #, c-format
 msgid ""
 "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
@@ -208,23 +204,23 @@
 "результатом триггерной функции PL/Perl должен быть undef, \"SKIP\" или "
 "\"MODIFY\""
 
-#: plperl.c:2694 plperl.c:2704
+#: plperl.c:2707 plperl.c:2717
 #, c-format
 msgid "out of memory"
 msgstr "нехватка пам�ти"
 
-#: plperl.c:2768
+#: plperl.c:2781
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "триггерные функции могут вызывать�� только в триггерах"
 
-#: plperl.c:3144
+#: plperl.c:3157
 #, c-format
 msgid "cannot use return_next in a non-SETOF function"
 msgstr ""
 "return_next можно и�пользовать только в функци�х, возвращающих множе�тва"
 
-#: plperl.c:3200
+#: plperl.c:3213
 #, c-format
 msgid ""
 "SETOF-composite-returning PL/Perl function must call return_next with "
@@ -233,17 +229,17 @@
 "функци� PL/Perl, возвращающа� �о�тавное множе�тво, должна вызывать "
 "return_next �о ��ылкой на хеш"
 
-#: plperl.c:3934
+#: plperl.c:3947
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "функци� PL/Perl \"%s\""
 
-#: plperl.c:3946
+#: plperl.c:3959
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "компил�ци� функции PL/Perl \"%s\""
 
-#: plperl.c:3955
+#: plperl.c:3968
 #, c-format
 msgid "PL/Perl anonymous code block"
 msgstr "анонимный блок кода PL/Perl"
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/ppport.h postgresql-9.5-9.5.8/src/pl/plperl/ppport.h
--- postgresql-9.5-9.5.2/src/pl/plperl/ppport.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/ppport.h	2017-08-07 21:13:41.000000000 +0000
@@ -79,7 +79,7 @@
 If this option is given, a copy of each file will be saved with
 the given suffix that contains the suggested changes. This does
 not require any external programs. Note that this does not
-automagially add a dot between the original filename and the
+automagically add a dot between the original filename and the
 suffix. If you want the dot, you have to include it in the option
 argument.
 
@@ -4364,9 +4364,9 @@
 
     OP * const modname = newSVOP(OP_CONST, 0, name);
     /* 5.005 has a somewhat hacky force_normal that doesn't croak on
-       SvREADONLY() if PL_compling is true. Current perls take care in
+       SvREADONLY() if PL_compiling is true. Current perls take care in
        ck_require() to correctly turn off SvREADONLY before calling
-       force_normal_flags(). This seems a better fix than fudging PL_compling
+       force_normal_flags(). This seems a better fix than fudging PL_compiling
      */
     SvREADONLY_off(((SVOP*)modname)->op_sv);
     modname->op_private |= OPpCONST_BARE;
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/SPI.xs postgresql-9.5-9.5.8/src/pl/plperl/SPI.xs
--- postgresql-9.5-9.5.2/src/pl/plperl/SPI.xs	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/SPI.xs	2017-08-07 21:13:41.000000000 +0000
@@ -9,44 +9,16 @@
 
 /* this must be first: */
 #include "postgres.h"
-#include "mb/pg_wchar.h"       /* for GetDatabaseEncoding */
 
 /* Defined by Perl */
 #undef _
 
 /* perl stuff */
+#define PG_NEED_PERL_XSUB_H
 #include "plperl.h"
 #include "plperl_helpers.h"
 
 
-/*
- * Interface routine to catch ereports and punt them to Perl
- */
-static void
-do_plperl_return_next(SV *sv)
-{
-	MemoryContext oldcontext = CurrentMemoryContext;
-
-	PG_TRY();
-	{
-		plperl_return_next(sv);
-	}
-	PG_CATCH();
-	{
-		ErrorData  *edata;
-
-		/* Must reset elog.c's state */
-		MemoryContextSwitchTo(oldcontext);
-		edata = CopyErrorData();
-		FlushErrorState();
-
-		/* Punt the error to Perl */
-		croak_cstr(edata->message);
-	}
-	PG_END_TRY();
-}
-
-
 MODULE = PostgreSQL::InServer::SPI PREFIX = spi_
 
 PROTOTYPES: ENABLE
@@ -76,7 +48,7 @@
 spi_return_next(rv)
 	SV *rv;
 	CODE:
-		do_plperl_return_next(rv);
+		plperl_return_next(rv);
 
 SV *
 spi_spi_query(sv)
diff -Nru postgresql-9.5-9.5.2/src/pl/plperl/Util.xs postgresql-9.5-9.5.8/src/pl/plperl/Util.xs
--- postgresql-9.5-9.5.2/src/pl/plperl/Util.xs	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plperl/Util.xs	2017-08-07 21:13:41.000000000 +0000
@@ -15,53 +15,15 @@
 #include "fmgr.h"
 #include "utils/builtins.h"
 #include "utils/bytea.h"       /* for byteain & byteaout */
-#include "mb/pg_wchar.h"       /* for GetDatabaseEncoding */
+
 /* Defined by Perl */
 #undef _
 
 /* perl stuff */
+#define PG_NEED_PERL_XSUB_H
 #include "plperl.h"
 #include "plperl_helpers.h"
 
-/*
- * Implementation of plperl's elog() function
- *
- * If the error level is less than ERROR, we'll just emit the message and
- * return.  When it is ERROR, elog() will longjmp, which we catch and
- * turn into a Perl croak().  Note we are assuming that elog() can't have
- * any internal failures that are so bad as to require a transaction abort.
- *
- * This is out-of-line to suppress "might be clobbered by longjmp" warnings.
- */
-static void
-do_util_elog(int level, SV *msg)
-{
-	MemoryContext oldcontext = CurrentMemoryContext;
-	char	   * volatile cmsg = NULL;
-
-	PG_TRY();
-	{
-		cmsg = sv2cstr(msg);
-		elog(level, "%s", cmsg);
-		pfree(cmsg);
-	}
-	PG_CATCH();
-	{
-		ErrorData  *edata;
-
-		/* Must reset elog.c's state */
-		MemoryContextSwitchTo(oldcontext);
-		edata = CopyErrorData();
-		FlushErrorState();
-
-		if (cmsg)
-			pfree(cmsg);
-
-		/* Punt the error to Perl */
-		croak_cstr(edata->message);
-	}
-	PG_END_TRY();
-}
 
 static text *
 sv2text(SV *sv)
@@ -105,7 +67,7 @@
             level = ERROR;
         if (level < DEBUG5)
             level = DEBUG5;
-        do_util_elog(level, msg);
+        plperl_util_elog(level, msg);
 
 SV *
 util_quote_literal(sv)
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_comp.c postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_comp.c
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_comp.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_comp.c	2017-08-07 21:13:41.000000000 +0000
@@ -2204,14 +2204,19 @@
 	/* NB: this is only used to decide whether to apply expand_array */
 	if (typeStruct->typtype == TYPTYPE_BASE)
 	{
-		/* this test should match what get_element_type() checks */
+		/*
+		 * This test should include what get_element_type() checks.  We also
+		 * disallow non-toastable array types (i.e. oidvector and int2vector).
+		 */
 		typ->typisarray = (typeStruct->typlen == -1 &&
-						   OidIsValid(typeStruct->typelem));
+						   OidIsValid(typeStruct->typelem) &&
+						   typeStruct->typstorage != 'p');
 	}
 	else if (typeStruct->typtype == TYPTYPE_DOMAIN)
 	{
 		/* we can short-circuit looking up base types if it's not varlena */
 		typ->typisarray = (typeStruct->typlen == -1 &&
+						   typeStruct->typstorage != 'p' &&
 				 OidIsValid(get_base_element_type(typeStruct->typbasetype)));
 	}
 	else
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_exec.c postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_exec.c
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_exec.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_exec.c	2017-08-07 21:13:41.000000000 +0000
@@ -6015,6 +6015,8 @@
 			ExprContext *econtext = estate->eval_econtext;
 			MemoryContext oldcontext;
 
+			SPI_push();
+
 			oldcontext = MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);
 
 			econtext->caseValue_datum = value;
@@ -6028,6 +6030,8 @@
 			cast_entry->cast_in_use = false;
 
 			MemoryContextSwitchTo(oldcontext);
+
+			SPI_pop();
 		}
 	}
 
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_gram.c postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_gram.c
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_gram.c	2016-03-28 20:23:04.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_gram.c	2017-08-07 21:34:43.000000000 +0000
@@ -281,61 +281,62 @@
     K_GET = 318,
     K_HINT = 319,
     K_IF = 320,
-    K_IN = 321,
-    K_INFO = 322,
-    K_INSERT = 323,
-    K_INTO = 324,
-    K_IS = 325,
-    K_LAST = 326,
-    K_LOG = 327,
-    K_LOOP = 328,
-    K_MESSAGE = 329,
-    K_MESSAGE_TEXT = 330,
-    K_MOVE = 331,
-    K_NEXT = 332,
-    K_NO = 333,
-    K_NOT = 334,
-    K_NOTICE = 335,
-    K_NULL = 336,
-    K_OPEN = 337,
-    K_OPTION = 338,
-    K_OR = 339,
-    K_PERFORM = 340,
-    K_PG_CONTEXT = 341,
-    K_PG_DATATYPE_NAME = 342,
-    K_PG_EXCEPTION_CONTEXT = 343,
-    K_PG_EXCEPTION_DETAIL = 344,
-    K_PG_EXCEPTION_HINT = 345,
-    K_PRINT_STRICT_PARAMS = 346,
-    K_PRIOR = 347,
-    K_QUERY = 348,
-    K_RAISE = 349,
-    K_RELATIVE = 350,
-    K_RESULT_OID = 351,
-    K_RETURN = 352,
-    K_RETURNED_SQLSTATE = 353,
-    K_REVERSE = 354,
-    K_ROW_COUNT = 355,
-    K_ROWTYPE = 356,
-    K_SCHEMA = 357,
-    K_SCHEMA_NAME = 358,
-    K_SCROLL = 359,
-    K_SLICE = 360,
-    K_SQLSTATE = 361,
-    K_STACKED = 362,
-    K_STRICT = 363,
-    K_TABLE = 364,
-    K_TABLE_NAME = 365,
-    K_THEN = 366,
-    K_TO = 367,
-    K_TYPE = 368,
-    K_USE_COLUMN = 369,
-    K_USE_VARIABLE = 370,
-    K_USING = 371,
-    K_VARIABLE_CONFLICT = 372,
-    K_WARNING = 373,
-    K_WHEN = 374,
-    K_WHILE = 375
+    K_IMPORT = 321,
+    K_IN = 322,
+    K_INFO = 323,
+    K_INSERT = 324,
+    K_INTO = 325,
+    K_IS = 326,
+    K_LAST = 327,
+    K_LOG = 328,
+    K_LOOP = 329,
+    K_MESSAGE = 330,
+    K_MESSAGE_TEXT = 331,
+    K_MOVE = 332,
+    K_NEXT = 333,
+    K_NO = 334,
+    K_NOT = 335,
+    K_NOTICE = 336,
+    K_NULL = 337,
+    K_OPEN = 338,
+    K_OPTION = 339,
+    K_OR = 340,
+    K_PERFORM = 341,
+    K_PG_CONTEXT = 342,
+    K_PG_DATATYPE_NAME = 343,
+    K_PG_EXCEPTION_CONTEXT = 344,
+    K_PG_EXCEPTION_DETAIL = 345,
+    K_PG_EXCEPTION_HINT = 346,
+    K_PRINT_STRICT_PARAMS = 347,
+    K_PRIOR = 348,
+    K_QUERY = 349,
+    K_RAISE = 350,
+    K_RELATIVE = 351,
+    K_RESULT_OID = 352,
+    K_RETURN = 353,
+    K_RETURNED_SQLSTATE = 354,
+    K_REVERSE = 355,
+    K_ROW_COUNT = 356,
+    K_ROWTYPE = 357,
+    K_SCHEMA = 358,
+    K_SCHEMA_NAME = 359,
+    K_SCROLL = 360,
+    K_SLICE = 361,
+    K_SQLSTATE = 362,
+    K_STACKED = 363,
+    K_STRICT = 364,
+    K_TABLE = 365,
+    K_TABLE_NAME = 366,
+    K_THEN = 367,
+    K_TO = 368,
+    K_TYPE = 369,
+    K_USE_COLUMN = 370,
+    K_USE_VARIABLE = 371,
+    K_USING = 372,
+    K_VARIABLE_CONFLICT = 373,
+    K_WARNING = 374,
+    K_WHEN = 375,
+    K_WHILE = 376
   };
 #endif
 
@@ -396,7 +397,7 @@
 		PLpgSQL_stmt_fetch		*fetch;
 		PLpgSQL_case_when		*casewhen;
 
-#line 400 "pl_gram.c" /* yacc.c:355  */
+#line 401 "pl_gram.c" /* yacc.c:355  */
 };
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
@@ -425,7 +426,7 @@
 
 /* Copy the second part of user declarations.  */
 
-#line 429 "pl_gram.c" /* yacc.c:358  */
+#line 430 "pl_gram.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -669,21 +670,21 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1139
+#define YYLAST   1164
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  128
+#define YYNTOKENS  129
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  84
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  234
+#define YYNRULES  236
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  312
+#define YYNSTATES  314
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   375
+#define YYMAXUTOK   376
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -695,13 +696,13 @@
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,   121,     2,     2,     2,     2,
-     123,   124,     2,     2,   125,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,   122,
-       2,   126,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,   122,     2,     2,     2,     2,
+     124,   125,     2,     2,   126,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,   123,
+       2,   127,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   127,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   128,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -729,37 +730,37 @@
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120
+     115,   116,   117,   118,   119,   120,   121
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   347,   347,   353,   354,   357,   361,   370,   374,   378,
-     384,   388,   393,   394,   397,   419,   427,   434,   443,   455,
-     456,   459,   460,   464,   477,   532,   538,   537,   590,   593,
-     597,   604,   610,   613,   642,   646,   652,   660,   661,   663,
-     678,   693,   721,   749,   780,   781,   786,   797,   798,   803,
-     808,   815,   816,   820,   822,   828,   829,   837,   838,   842,
-     843,   853,   855,   857,   859,   861,   863,   865,   867,   869,
-     871,   873,   875,   877,   879,   881,   883,   885,   887,   889,
-     891,   893,   897,   910,   924,   987,   990,   994,  1000,  1004,
-    1010,  1023,  1070,  1082,  1087,  1095,  1100,  1117,  1134,  1137,
-    1151,  1154,  1160,  1167,  1181,  1185,  1191,  1203,  1206,  1221,
-    1238,  1256,  1290,  1552,  1584,  1599,  1606,  1649,  1652,  1658,
-    1673,  1677,  1683,  1709,  1853,  1876,  1894,  1898,  1908,  1920,
-    1984,  2061,  2093,  2106,  2111,  2124,  2131,  2147,  2152,  2160,
-    2162,  2161,  2201,  2205,  2211,  2224,  2233,  2239,  2276,  2280,
-    2284,  2288,  2292,  2296,  2304,  2307,  2315,  2317,  2324,  2328,
-    2332,  2341,  2342,  2343,  2344,  2345,  2346,  2347,  2348,  2349,
-    2350,  2351,  2352,  2353,  2354,  2355,  2356,  2357,  2358,  2359,
-    2360,  2361,  2362,  2363,  2364,  2365,  2366,  2367,  2368,  2369,
-    2370,  2371,  2372,  2373,  2374,  2375,  2376,  2377,  2378,  2379,
-    2380,  2381,  2382,  2383,  2384,  2385,  2386,  2387,  2388,  2389,
-    2390,  2391,  2392,  2393,  2394,  2395,  2396,  2397,  2398,  2399,
-    2400,  2401,  2402,  2403,  2404,  2405,  2406,  2407,  2408,  2409,
-    2410,  2411,  2412,  2413,  2414
+       0,   348,   348,   354,   355,   358,   362,   371,   375,   379,
+     385,   389,   394,   395,   398,   420,   428,   435,   444,   456,
+     457,   460,   461,   465,   478,   533,   539,   538,   591,   594,
+     598,   605,   611,   614,   643,   647,   653,   661,   662,   664,
+     679,   694,   722,   750,   781,   782,   787,   798,   799,   804,
+     809,   816,   817,   821,   823,   829,   830,   838,   839,   843,
+     844,   854,   856,   858,   860,   862,   864,   866,   868,   870,
+     872,   874,   876,   878,   880,   882,   884,   886,   888,   890,
+     892,   894,   898,   911,   925,   988,   991,   995,  1001,  1005,
+    1011,  1024,  1071,  1083,  1088,  1096,  1101,  1118,  1135,  1138,
+    1152,  1155,  1161,  1168,  1182,  1186,  1192,  1204,  1207,  1222,
+    1239,  1257,  1291,  1553,  1585,  1600,  1607,  1650,  1653,  1659,
+    1674,  1678,  1684,  1710,  1854,  1877,  1895,  1899,  1903,  1913,
+    1925,  1989,  2066,  2098,  2111,  2116,  2129,  2136,  2152,  2157,
+    2165,  2167,  2166,  2206,  2210,  2216,  2229,  2238,  2244,  2281,
+    2285,  2289,  2293,  2297,  2301,  2309,  2312,  2320,  2322,  2329,
+    2333,  2337,  2346,  2347,  2348,  2349,  2350,  2351,  2352,  2353,
+    2354,  2355,  2356,  2357,  2358,  2359,  2360,  2361,  2362,  2363,
+    2364,  2365,  2366,  2367,  2368,  2369,  2370,  2371,  2372,  2373,
+    2374,  2375,  2376,  2377,  2378,  2379,  2380,  2381,  2382,  2383,
+    2384,  2385,  2386,  2387,  2388,  2389,  2390,  2391,  2392,  2393,
+    2394,  2395,  2396,  2397,  2398,  2399,  2400,  2401,  2402,  2403,
+    2404,  2405,  2406,  2407,  2408,  2409,  2410,  2411,  2412,  2413,
+    2414,  2415,  2416,  2417,  2418,  2419,  2420
 };
 #endif
 
@@ -779,17 +780,17 @@
   "K_DECLARE", "K_DEFAULT", "K_DETAIL", "K_DIAGNOSTICS", "K_DUMP",
   "K_ELSE", "K_ELSIF", "K_END", "K_ERRCODE", "K_ERROR", "K_EXCEPTION",
   "K_EXECUTE", "K_EXIT", "K_FETCH", "K_FIRST", "K_FOR", "K_FOREACH",
-  "K_FORWARD", "K_FROM", "K_GET", "K_HINT", "K_IF", "K_IN", "K_INFO",
-  "K_INSERT", "K_INTO", "K_IS", "K_LAST", "K_LOG", "K_LOOP", "K_MESSAGE",
-  "K_MESSAGE_TEXT", "K_MOVE", "K_NEXT", "K_NO", "K_NOT", "K_NOTICE",
-  "K_NULL", "K_OPEN", "K_OPTION", "K_OR", "K_PERFORM", "K_PG_CONTEXT",
-  "K_PG_DATATYPE_NAME", "K_PG_EXCEPTION_CONTEXT", "K_PG_EXCEPTION_DETAIL",
-  "K_PG_EXCEPTION_HINT", "K_PRINT_STRICT_PARAMS", "K_PRIOR", "K_QUERY",
-  "K_RAISE", "K_RELATIVE", "K_RESULT_OID", "K_RETURN",
-  "K_RETURNED_SQLSTATE", "K_REVERSE", "K_ROW_COUNT", "K_ROWTYPE",
-  "K_SCHEMA", "K_SCHEMA_NAME", "K_SCROLL", "K_SLICE", "K_SQLSTATE",
-  "K_STACKED", "K_STRICT", "K_TABLE", "K_TABLE_NAME", "K_THEN", "K_TO",
-  "K_TYPE", "K_USE_COLUMN", "K_USE_VARIABLE", "K_USING",
+  "K_FORWARD", "K_FROM", "K_GET", "K_HINT", "K_IF", "K_IMPORT", "K_IN",
+  "K_INFO", "K_INSERT", "K_INTO", "K_IS", "K_LAST", "K_LOG", "K_LOOP",
+  "K_MESSAGE", "K_MESSAGE_TEXT", "K_MOVE", "K_NEXT", "K_NO", "K_NOT",
+  "K_NOTICE", "K_NULL", "K_OPEN", "K_OPTION", "K_OR", "K_PERFORM",
+  "K_PG_CONTEXT", "K_PG_DATATYPE_NAME", "K_PG_EXCEPTION_CONTEXT",
+  "K_PG_EXCEPTION_DETAIL", "K_PG_EXCEPTION_HINT", "K_PRINT_STRICT_PARAMS",
+  "K_PRIOR", "K_QUERY", "K_RAISE", "K_RELATIVE", "K_RESULT_OID",
+  "K_RETURN", "K_RETURNED_SQLSTATE", "K_REVERSE", "K_ROW_COUNT",
+  "K_ROWTYPE", "K_SCHEMA", "K_SCHEMA_NAME", "K_SCROLL", "K_SLICE",
+  "K_SQLSTATE", "K_STACKED", "K_STRICT", "K_TABLE", "K_TABLE_NAME",
+  "K_THEN", "K_TO", "K_TYPE", "K_USE_COLUMN", "K_USE_VARIABLE", "K_USING",
   "K_VARIABLE_CONFLICT", "K_WARNING", "K_WHEN", "K_WHILE", "'#'", "';'",
   "'('", "')'", "','", "'='", "'['", "$accept", "pl_function",
   "comp_options", "comp_option", "option_value", "opt_semi", "pl_block",
@@ -833,16 +834,16 @@
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,    35,    59,    40,    41,    44,    61,    91
+     375,   376,    35,    59,    40,    41,    44,    61,    91
 };
 # endif
 
-#define YYPACT_NINF -234
+#define YYPACT_NINF -236
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-234)))
+  (!!((Yystate) == (-236)))
 
-#define YYTABLE_NINF -145
+#define YYTABLE_NINF -146
 
 #define yytable_value_is_error(Yytable_value) \
   0
@@ -851,38 +852,38 @@
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -234,    40,   -18,  -234,   283,   -55,  -234,   -80,    21,    10,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,    34,  -234,    17,   583,
-     -37,  -234,  -234,  -234,  -234,   182,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,   886,  -234,   283,  -234,   182,  -234,
-    -234,    -9,  -234,  -234,  -234,  -234,  -234,  -234,    15,  -234,
-    -234,  -234,  -234,  -234,   -26,  -234,  -234,  -234,   -52,    15,
-    -234,  -234,  -234,   -46,  -234,  -234,  -234,  -234,   -11,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,   283,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,    12,     0,    45,
-    -234,    26,  -234,   -24,  -234,    49,  -234,   -20,  -234,  -234,
-    -234,   -16,    -6,    15,  -234,  -234,    61,  -234,    15,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,   -71,  -234,   283,
-      78,    78,  -234,  -234,  -234,   384,  -234,  -234,    77,  -234,
-     -30,  -234,  -234,   283,    -6,  -234,    48,   103,   782,     5,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-      65,    27,   938,  -234,  -234,  -234,  -234,    11,  -234,    14,
-     485,    55,  -234,  -234,  -234,    84,   -59,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,   -61,  -234,    -7,    33,  -234,  -234,
-    -234,  -234,   130,    74,    72,  -234,  -234,   681,   -21,  -234,
-    -234,  -234,    66,    -8,   -10,   990,   115,   283,  -234,  -234,
-     103,  -234,  -234,  -234,    97,  -234,   124,   283,     1,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-      29,  -234,    73,  -234,  -234,  1042,  -234,    87,  -234,    31,
-    -234,   681,  -234,  -234,  -234,   834,    35,  -234,  -234,  -234,
-    -234,  -234
+    -236,    30,    -9,  -236,   297,   -61,  -236,   -81,    15,     8,
+    -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,
+    -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,
+    -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,
+    -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,
+    -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,
+    -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,
+    -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,
+    -236,  -236,  -236,  -236,  -236,  -236,  -236,    53,  -236,    34,
+     600,   -17,  -236,  -236,  -236,  -236,   195,  -236,  -236,  -236,
+    -236,  -236,  -236,  -236,  -236,   907,  -236,   297,  -236,   195,
+    -236,  -236,     2,  -236,  -236,  -236,  -236,  -236,  -236,    46,
+    -236,  -236,  -236,  -236,  -236,   -24,  -236,  -236,  -236,  -236,
+     -40,    46,  -236,  -236,  -236,   -36,  -236,  -236,  -236,  -236,
+     -11,  -236,  -236,  -236,  -236,  -236,  -236,  -236,   297,  -236,
+    -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,    39,
+     -25,    75,  -236,    36,  -236,     1,  -236,    68,  -236,    -6,
+    -236,  -236,  -236,   -12,    -2,    46,  -236,  -236,    78,  -236,
+      46,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,   -72,
+    -236,   297,    60,    60,  -236,  -236,  -236,   399,  -236,  -236,
+      93,  -236,   -34,  -236,  -236,   297,    -2,  -236,    57,   103,
+     801,     9,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,
+    -236,  -236,    64,    27,   960,  -236,  -236,  -236,  -236,    11,
+    -236,    13,   501,    55,  -236,  -236,  -236,    89,   -58,  -236,
+    -236,  -236,  -236,  -236,  -236,  -236,   -63,  -236,    -7,    12,
+    -236,  -236,  -236,  -236,   132,    79,    74,  -236,  -236,   699,
+     -31,  -236,  -236,  -236,    65,    -8,   -10,  1013,   118,   297,
+    -236,  -236,   103,  -236,  -236,  -236,   100,  -236,   126,   297,
+     -55,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,
+    -236,  -236,    31,  -236,    73,  -236,  -236,  1066,  -236,    88,
+    -236,    35,  -236,   699,  -236,  -236,  -236,   854,    37,  -236,
+    -236,  -236,  -236,  -236
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -890,66 +891,66 @@
      means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       3,     0,   152,     1,     0,     0,     4,    12,     0,    15,
-     158,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,     0,   159,     0,     0,
-       0,    13,     2,    59,    18,    16,   153,     5,    10,     6,
-      11,     7,     9,     8,   152,    42,     0,    22,    17,    20,
-      21,    44,    43,   127,   128,    95,   124,   103,     0,   121,
-     140,   129,   120,   133,    85,   150,   126,   133,     0,     0,
-     148,   123,   122,     0,    60,    75,    62,    76,     0,    63,
-      64,    65,    66,    67,    68,    69,   154,    70,    71,    72,
-      73,    74,    77,    78,    79,    80,    81,     0,    15,     0,
-      19,     0,    45,     0,    30,     0,    46,     0,   137,   138,
-     136,     0,     0,     0,    86,    87,     0,    59,     0,   135,
-     130,    82,    61,    58,    57,   149,   148,     0,   155,   154,
-       0,     0,    59,   151,    23,     0,    29,    26,    47,   150,
-     107,   105,   134,     0,   141,   143,     0,     0,   152,     0,
-      96,    83,   148,   156,   119,    14,   114,   115,   113,    59,
-       0,   117,   152,   109,    59,    39,    41,     0,    40,    32,
-       0,    51,    59,    59,   104,     0,     0,   146,   147,   142,
-     131,    93,    94,    92,     0,    89,     0,   100,   132,   157,
-     111,   112,     0,     0,     0,   110,    25,     0,     0,    48,
-      50,    49,     0,     0,   152,   152,     0,     0,    59,    84,
-       0,    91,    59,   150,     0,   118,     0,   154,     0,    34,
-      46,    38,    37,    31,    52,    56,    53,    24,    54,    55,
-       0,   145,   152,    88,    90,   152,    59,     0,   151,     0,
-      33,     0,    36,    27,   102,   152,     0,    59,   125,    35,
-      97,   116
+       3,     0,   153,     1,     0,     0,     4,    12,     0,    15,
+     159,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,     0,   160,     0,
+       0,     0,    13,     2,    59,    18,    16,   154,     5,    10,
+       6,    11,     7,     9,     8,   153,    42,     0,    22,    17,
+      20,    21,    44,    43,   128,   129,    95,   124,   103,     0,
+     121,   141,   130,   120,   134,    85,   151,   126,   127,   134,
+       0,     0,   149,   123,   122,     0,    60,    75,    62,    76,
+       0,    63,    64,    65,    66,    67,    68,    69,   155,    70,
+      71,    72,    73,    74,    77,    78,    79,    80,    81,     0,
+      15,     0,    19,     0,    45,     0,    30,     0,    46,     0,
+     138,   139,   137,     0,     0,     0,    86,    87,     0,    59,
+       0,   136,   131,    82,    61,    58,    57,   150,   149,     0,
+     156,   155,     0,     0,    59,   152,    23,     0,    29,    26,
+      47,   151,   107,   105,   135,     0,   142,   144,     0,     0,
+     153,     0,    96,    83,   149,   157,   119,    14,   114,   115,
+     113,    59,     0,   117,   153,   109,    59,    39,    41,     0,
+      40,    32,     0,    51,    59,    59,   104,     0,     0,   147,
+     148,   143,   132,    93,    94,    92,     0,    89,     0,   100,
+     133,   158,   111,   112,     0,     0,     0,   110,    25,     0,
+       0,    48,    50,    49,     0,     0,   153,   153,     0,     0,
+      59,    84,     0,    91,    59,   151,     0,   118,     0,   155,
+       0,    34,    46,    38,    37,    31,    52,    56,    53,    24,
+      54,    55,     0,   146,   153,    88,    90,   153,    59,     0,
+     152,     0,    33,     0,    36,    27,   102,   153,     0,    59,
+     125,    35,    97,   116
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -234,  -234,  -234,  -234,  -234,  -234,   154,  -234,  -234,  -234,
-      51,  -234,  -234,  -234,  -234,  -234,  -234,  -141,  -234,  -234,
-    -233,  -234,  -119,  -234,  -234,  -234,  -234,  -220,   -89,  -234,
-    -234,  -234,  -234,  -234,  -234,  -108,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,   -36,  -234,  -234,  -234,  -234,
-    -234,   -28,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -206,
-    -234,  -234,  -234,  -234,  -234,    38,  -234,  -234,   -99,  -234,
-    -234,  -234,   -38,  -234,   -96,  -155,  -234,  -187,  -130,   170,
-    -166,  -234,    -4,   -88
+    -236,  -236,  -236,  -236,  -236,  -236,   155,  -236,  -236,  -236,
+      52,  -236,  -236,  -236,  -236,  -236,  -236,  -141,  -236,  -236,
+    -235,  -236,  -119,  -236,  -236,  -236,  -236,  -215,   -90,  -236,
+    -236,  -236,  -236,  -236,  -236,  -108,  -236,  -236,  -236,  -236,
+    -236,  -236,  -236,  -236,  -236,   -37,  -236,  -236,  -236,  -236,
+    -236,   -27,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -208,
+    -236,  -236,  -236,  -236,  -236,    38,  -236,  -236,  -106,  -236,
+    -236,  -236,   -33,  -236,  -100,  -156,  -236,  -198,  -128,   172,
+    -177,  -236,    -4,   -89
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,     2,     6,    99,    92,   133,     8,    95,   108,
-     109,   110,   229,   165,   303,   258,   278,   279,   283,   227,
-     111,   166,   198,   231,   263,   287,   288,   186,   222,   134,
-     135,   136,   137,   176,   244,   245,   294,   246,   138,   139,
-     247,   274,   140,   167,   200,   201,   235,   141,   142,   143,
-     219,   220,   144,   253,   145,   146,   147,   148,   149,   223,
-     150,   151,   152,   153,   154,   173,   155,   156,   171,   157,
-     172,   204,   205,   236,   237,   181,   210,   177,   224,   158,
-     187,   214,   188,    87
+      -1,     1,     2,     6,   100,    93,   135,     8,    96,   109,
+     110,   111,   231,   167,   305,   260,   280,   281,   285,   229,
+     112,   168,   200,   233,   265,   289,   290,   188,   224,   136,
+     137,   138,   139,   178,   246,   247,   296,   248,   140,   141,
+     249,   276,   142,   169,   202,   203,   237,   143,   144,   145,
+     221,   222,   146,   255,   147,   148,   149,   150,   151,   225,
+     152,   153,   154,   155,   156,   175,   157,   158,   173,   159,
+     174,   206,   207,   238,   239,   183,   212,   179,   226,   160,
+     189,   216,   190,    88
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -957,305 +958,311 @@
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      86,   100,   183,     4,   104,   183,   183,   112,   113,   114,
-     115,     4,   232,   250,   174,   161,   101,   116,   255,   233,
-     112,   117,   118,   215,   280,   267,   271,   162,    88,   119,
-     180,   211,   -28,   168,   169,   170,    89,   285,   281,  -106,
-       3,  -106,    91,   289,    94,   121,   122,   123,   212,   282,
-      93,   213,   268,   124,    94,   125,    96,   249,   126,   190,
-     191,   269,    90,   189,   270,    97,   127,   194,   280,   163,
-     179,   128,   129,   192,   206,   130,   182,   102,   103,   209,
-     196,   175,   272,   273,   131,   195,   296,   132,   208,   199,
-     197,   113,   114,   115,     4,   164,   216,   217,   218,   199,
-     116,   311,   159,     5,   117,   118,   202,   228,   207,  -106,
-     230,   299,   119,   203,   286,   184,   185,   240,   184,   184,
-     193,   241,   242,   243,  -144,   300,   301,   248,   121,   122,
-     123,   251,   252,   256,   262,   266,   124,   257,   125,   275,
-     276,   126,   261,   264,   265,   277,   290,   284,   297,   127,
-     298,   304,   306,   308,   128,   129,     7,   310,   130,   160,
-     309,   302,   293,   221,   234,   178,   239,   131,   307,   112,
-     132,   291,     9,     0,     0,     0,     0,     0,     0,   292,
-       0,     0,     0,   295,     0,     0,     0,     0,     0,     0,
-       0,     0,  -144,     0,     0,     0,     0,     0,     0,   238,
-     105,     0,     0,   106,     0,    12,    13,   305,    14,    15,
-      16,     0,     0,   112,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,   107,    29,    30,    31,
-      32,     0,    33,     0,    34,    35,    36,     0,    37,    38,
-      39,     0,     0,    40,     0,    41,    42,     0,     0,    43,
-      44,     0,    45,    46,    47,     0,    48,    49,    50,    51,
-      52,     0,    53,   238,    54,    55,     0,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-       0,    79,    80,     0,     0,    81,    82,    83,     0,    84,
-      85,    10,     0,    11,     0,     0,    12,    13,     0,    14,
-      15,    16,     0,     0,     0,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,     0,    29,    30,
-      31,    32,     0,    33,     0,    34,    35,    36,     0,    37,
-      38,    39,     0,     0,    40,     0,    41,    42,     0,     0,
-      43,    44,     0,    45,    46,    47,     0,    48,    49,    50,
-      51,    52,     0,    53,     0,    54,    55,     0,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,     0,    79,    80,     0,     0,    81,    82,    83,     0,
-      84,    85,   225,   226,     0,     0,     0,    12,    13,     0,
-      14,    15,    16,     0,     0,     0,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,     0,    29,
-      30,    31,    32,     0,    33,     0,    34,    35,    36,     0,
-      37,    38,    39,     0,     0,    40,     0,    41,    42,     0,
-       0,    43,    44,     0,    45,    46,    47,     0,    48,    49,
-      50,    51,    52,     0,    53,     0,    54,    55,     0,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,     0,    79,    80,     0,     0,    81,    82,    83,
-       0,    84,    85,   259,   260,     0,     0,     0,    12,    13,
+      87,   101,   185,   234,   105,   185,   185,   113,   114,   115,
+     116,     4,     4,   252,   217,   235,   176,   117,   257,    95,
+     113,   118,   119,    89,   282,   182,   163,   269,   283,   120,
+       3,    90,   213,   273,   192,   193,   102,   287,   164,  -106,
+     284,  -106,    92,   -28,    94,   122,   123,   124,   214,   194,
+     291,   215,    95,   125,   270,   126,   127,    91,   251,   128,
+     271,   274,   275,   272,   170,   171,   172,   129,   282,   208,
+     302,   303,   130,   131,   211,    97,   132,   298,   218,   219,
+     220,   165,    98,   181,   177,   133,   201,   184,   134,   210,
+     191,   114,   115,   116,     4,   197,   195,   196,   103,   104,
+     117,   313,   301,   161,   118,   119,   198,   166,   230,   199,
+    -106,   204,   120,     5,   201,   288,   186,   187,   205,   186,
+     186,   243,   244,   245,  -145,   209,   232,   242,   122,   123,
+     124,   253,   250,   254,   258,   264,   125,   259,   126,   127,
+     268,   277,   128,   263,   266,   267,   278,   286,   279,   292,
+     129,   299,   300,   308,   306,   130,   131,     7,   310,   132,
+     312,   162,   311,   304,   295,   236,   223,   180,   133,   293,
+     113,   134,   309,   241,     9,     0,     0,     0,     0,     0,
+     294,     0,     0,     0,   297,     0,     0,     0,     0,     0,
+       0,     0,     0,  -145,     0,     0,     0,     0,     0,     0,
+       0,   240,     0,     0,     0,     0,     0,     0,   307,     0,
+       0,     0,     0,   106,   113,     0,   107,     0,    12,    13,
        0,    14,    15,    16,     0,     0,     0,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,     0,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,   108,
       29,    30,    31,    32,     0,    33,     0,    34,    35,    36,
        0,    37,    38,    39,     0,     0,    40,     0,    41,    42,
-       0,     0,    43,    44,     0,    45,    46,    47,     0,    48,
-      49,    50,    51,    52,     0,    53,     0,    54,    55,     0,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+       0,    43,     0,    44,    45,   240,    46,    47,    48,     0,
+      49,    50,    51,    52,    53,     0,    54,     0,    55,    56,
+       0,    57,    58,    59,    60,    61,    62,    63,    64,    65,
       66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,     0,    79,    80,     0,     0,    81,    82,
-      83,    98,    84,    85,     0,     0,    12,    13,     0,    14,
-      15,    16,     0,     0,     0,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,     0,    29,    30,
-      31,    32,     0,    33,     0,    34,    35,    36,     0,    37,
-      38,    39,     0,     0,    40,     0,    41,    42,     0,     0,
-      43,    44,     0,    45,    46,    47,     0,    48,    49,    50,
-      51,    52,     0,    53,     0,    54,    55,     0,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,     0,    79,    80,     0,     0,    81,    82,    83,   105,
-      84,    85,     0,     0,    12,    13,     0,    14,    15,    16,
+      76,    77,    78,    79,     0,    80,    81,     0,     0,    82,
+      83,    84,     0,    85,    86,    10,     0,    11,     0,     0,
+      12,    13,     0,    14,    15,    16,     0,     0,     0,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,     0,    29,    30,    31,    32,     0,    33,     0,    34,
+      35,    36,     0,    37,    38,    39,     0,     0,    40,     0,
+      41,    42,     0,    43,     0,    44,    45,     0,    46,    47,
+      48,     0,    49,    50,    51,    52,    53,     0,    54,     0,
+      55,    56,     0,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,     0,    80,    81,     0,
+       0,    82,    83,    84,     0,    85,    86,   227,   228,     0,
+       0,     0,    12,    13,     0,    14,    15,    16,     0,     0,
+       0,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,     0,    29,    30,    31,    32,     0,    33,
+       0,    34,    35,    36,     0,    37,    38,    39,     0,     0,
+      40,     0,    41,    42,     0,    43,     0,    44,    45,     0,
+      46,    47,    48,     0,    49,    50,    51,    52,    53,     0,
+      54,     0,    55,    56,     0,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,     0,    80,
+      81,     0,     0,    82,    83,    84,     0,    85,    86,   261,
+     262,     0,     0,     0,    12,    13,     0,    14,    15,    16,
        0,     0,     0,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,     0,    29,    30,    31,    32,
        0,    33,     0,    34,    35,    36,     0,    37,    38,    39,
-       0,     0,    40,     0,    41,    42,     0,     0,    43,    44,
-       0,    45,    46,    47,     0,    48,    49,    50,    51,    52,
-       0,    53,     0,    54,    55,     0,    56,    57,    58,    59,
+       0,     0,    40,     0,    41,    42,     0,    43,     0,    44,
+      45,     0,    46,    47,    48,     0,    49,    50,    51,    52,
+      53,     0,    54,     0,    55,    56,     0,    57,    58,    59,
       60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,     0,
-      79,    80,     0,     0,    81,    82,    83,     0,    84,    85,
-     113,   114,   115,     4,     0,     0,     0,     0,     0,   116,
-       0,     0,     0,   117,   118,     0,     0,     0,     0,     0,
-       0,   119,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   -98,   -98,   -98,     0,     0,     0,   121,   122,   123,
-       0,     0,     0,     0,     0,   124,     0,   125,     0,     0,
-     126,     0,   113,   114,   115,     4,     0,     0,   127,     0,
-       0,   116,     0,   128,   129,   117,   118,   130,     0,     0,
-       0,     0,     0,   119,     0,     0,   131,     0,     0,   132,
-       0,     0,     0,   -99,   -99,   -99,     0,     0,     0,   121,
-     122,   123,     0,     0,     0,     0,     0,   124,     0,   125,
-       0,     0,   126,     0,   113,   114,   115,     4,     0,     0,
-     127,     0,     0,   116,     0,   128,   129,   117,   118,   130,
-       0,     0,     0,     0,     0,   119,     0,     0,   131,     0,
-       0,   132,     0,     0,     0,     0,     0,  -139,     0,     0,
-     120,   121,   122,   123,     0,     0,     0,     0,     0,   124,
-       0,   125,     0,     0,   126,     0,   113,   114,   115,     4,
-       0,     0,   127,     0,     0,   116,     0,   128,   129,   117,
-     118,   130,     0,     0,     0,     0,     0,   119,     0,     0,
-     131,     0,     0,   132,     0,     0,     0,     0,     0,   254,
-       0,     0,     0,   121,   122,   123,     0,     0,     0,     0,
-       0,   124,     0,   125,     0,     0,   126,     0,   113,   114,
-     115,     4,     0,     0,   127,     0,     0,   116,     0,   128,
-     129,   117,   118,   130,     0,     0,     0,     0,     0,   119,
-       0,     0,   131,     0,     0,   132,     0,     0,     0,     0,
-       0,  -108,     0,     0,     0,   121,   122,   123,     0,     0,
-       0,     0,     0,   124,     0,   125,     0,     0,   126,     0,
-     113,   114,   115,     4,     0,     0,   127,     0,     0,   116,
-       0,   128,   129,   117,   118,   130,     0,     0,     0,     0,
-       0,   119,     0,     0,   131,     0,     0,   132,     0,     0,
-       0,     0,     0,  -101,     0,     0,     0,   121,   122,   123,
-       0,     0,     0,     0,     0,   124,     0,   125,     0,     0,
-     126,     0,     0,     0,     0,     0,     0,     0,   127,     0,
-       0,     0,     0,   128,   129,     0,     0,   130,     0,     0,
-       0,     0,     0,     0,     0,     0,   131,     0,     0,   132
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+       0,    80,    81,     0,     0,    82,    83,    84,    99,    85,
+      86,     0,     0,    12,    13,     0,    14,    15,    16,     0,
+       0,     0,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,     0,    29,    30,    31,    32,     0,
+      33,     0,    34,    35,    36,     0,    37,    38,    39,     0,
+       0,    40,     0,    41,    42,     0,    43,     0,    44,    45,
+       0,    46,    47,    48,     0,    49,    50,    51,    52,    53,
+       0,    54,     0,    55,    56,     0,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,     0,
+      80,    81,     0,     0,    82,    83,    84,   106,    85,    86,
+       0,     0,    12,    13,     0,    14,    15,    16,     0,     0,
+       0,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,     0,    29,    30,    31,    32,     0,    33,
+       0,    34,    35,    36,     0,    37,    38,    39,     0,     0,
+      40,     0,    41,    42,     0,    43,     0,    44,    45,     0,
+      46,    47,    48,     0,    49,    50,    51,    52,    53,     0,
+      54,     0,    55,    56,     0,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,     0,    80,
+      81,     0,     0,    82,    83,    84,     0,    85,    86,   114,
+     115,   116,     4,     0,     0,     0,     0,     0,   117,     0,
+       0,     0,   118,   119,     0,     0,     0,     0,     0,     0,
+     120,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     -98,   -98,   -98,     0,     0,     0,   122,   123,   124,     0,
+       0,     0,     0,     0,   125,     0,   126,   127,     0,     0,
+     128,     0,   114,   115,   116,     4,     0,     0,   129,     0,
+       0,   117,     0,   130,   131,   118,   119,   132,     0,     0,
+       0,     0,     0,   120,     0,     0,   133,     0,     0,   134,
+       0,     0,     0,   -99,   -99,   -99,     0,     0,     0,   122,
+     123,   124,     0,     0,     0,     0,     0,   125,     0,   126,
+     127,     0,     0,   128,     0,   114,   115,   116,     4,     0,
+       0,   129,     0,     0,   117,     0,   130,   131,   118,   119,
+     132,     0,     0,     0,     0,     0,   120,     0,     0,   133,
+       0,     0,   134,     0,     0,     0,     0,     0,  -140,     0,
+       0,   121,   122,   123,   124,     0,     0,     0,     0,     0,
+     125,     0,   126,   127,     0,     0,   128,     0,   114,   115,
+     116,     4,     0,     0,   129,     0,     0,   117,     0,   130,
+     131,   118,   119,   132,     0,     0,     0,     0,     0,   120,
+       0,     0,   133,     0,     0,   134,     0,     0,     0,     0,
+       0,   256,     0,     0,     0,   122,   123,   124,     0,     0,
+       0,     0,     0,   125,     0,   126,   127,     0,     0,   128,
+       0,   114,   115,   116,     4,     0,     0,   129,     0,     0,
+     117,     0,   130,   131,   118,   119,   132,     0,     0,     0,
+       0,     0,   120,     0,     0,   133,     0,     0,   134,     0,
+       0,     0,     0,     0,  -108,     0,     0,     0,   122,   123,
+     124,     0,     0,     0,     0,     0,   125,     0,   126,   127,
+       0,     0,   128,     0,   114,   115,   116,     4,     0,     0,
+     129,     0,     0,   117,     0,   130,   131,   118,   119,   132,
+       0,     0,     0,     0,     0,   120,     0,     0,   133,     0,
+       0,   134,     0,     0,     0,     0,     0,  -101,     0,     0,
+       0,   122,   123,   124,     0,     0,     0,     0,     0,   125,
+       0,   126,   127,     0,     0,   128,     0,     0,     0,     0,
+       0,     0,     0,   129,     0,     0,     0,     0,   130,   131,
+       0,     0,   132,     0,     0,     0,     0,     0,     0,     0,
+       0,   133,     0,     0,   134
 };
 
 static const yytype_int16 yycheck[] =
 {
-       4,    89,    13,    21,    93,    13,    13,    95,    18,    19,
-      20,    21,   199,   219,    40,    24,    53,    27,   224,    49,
-     108,    31,    32,   189,   257,    84,   246,    36,    83,    39,
-     129,   186,    41,    18,    19,    20,    91,    45,    59,    49,
-       0,    51,   122,   263,    44,    55,    56,    57,   119,    70,
-      29,   122,   111,    63,    44,    65,    22,   212,    68,    59,
-      60,   122,   117,    51,   125,    48,    76,    22,   301,    78,
-     122,    81,    82,    73,   173,    85,   122,   114,   115,   178,
-     104,   107,    49,    50,    94,    59,   273,    97,   177,   119,
-      41,    18,    19,    20,    21,   104,    18,    19,    20,   119,
-      27,   307,   106,   121,    31,    32,   122,   195,    47,   119,
-      33,   277,    39,   119,   122,   126,   127,    69,   126,   126,
-     120,    18,    19,    20,    51,   124,   125,   122,    55,    56,
-      57,    66,   105,   122,    79,    51,    63,   123,    65,     9,
-      66,    68,   230,   232,   233,    73,    31,    81,    51,    76,
-      26,   122,    65,   122,    81,    82,     2,   122,    85,   108,
-     301,   280,   270,   191,   200,   127,   204,    94,   298,   257,
-      97,   267,     2,    -1,    -1,    -1,    -1,    -1,    -1,   268,
-      -1,    -1,    -1,   272,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   119,    -1,    -1,    -1,    -1,    -1,    -1,   203,
-      18,    -1,    -1,    21,    -1,    23,    24,   296,    26,    27,
-      28,    -1,    -1,   301,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    -1,    50,    -1,    52,    53,    54,    -1,    56,    57,
-      58,    -1,    -1,    61,    -1,    63,    64,    -1,    -1,    67,
-      68,    -1,    70,    71,    72,    -1,    74,    75,    76,    77,
-      78,    -1,    80,   267,    82,    83,    -1,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-      -1,   109,   110,    -1,    -1,   113,   114,   115,    -1,   117,
-     118,    18,    -1,    20,    -1,    -1,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    -1,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    -1,    45,    46,
-      47,    48,    -1,    50,    -1,    52,    53,    54,    -1,    56,
-      57,    58,    -1,    -1,    61,    -1,    63,    64,    -1,    -1,
-      67,    68,    -1,    70,    71,    72,    -1,    74,    75,    76,
-      77,    78,    -1,    80,    -1,    82,    83,    -1,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,    -1,   109,   110,    -1,    -1,   113,   114,   115,    -1,
-     117,   118,    18,    19,    -1,    -1,    -1,    23,    24,    -1,
-      26,    27,    28,    -1,    -1,    -1,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    -1,    45,
-      46,    47,    48,    -1,    50,    -1,    52,    53,    54,    -1,
-      56,    57,    58,    -1,    -1,    61,    -1,    63,    64,    -1,
-      -1,    67,    68,    -1,    70,    71,    72,    -1,    74,    75,
-      76,    77,    78,    -1,    80,    -1,    82,    83,    -1,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,    -1,   109,   110,    -1,    -1,   113,   114,   115,
-      -1,   117,   118,    18,    19,    -1,    -1,    -1,    23,    24,
+       4,    90,    13,   201,    94,    13,    13,    96,    18,    19,
+      20,    21,    21,   221,   191,    49,    40,    27,   226,    44,
+     109,    31,    32,    84,   259,   131,    24,    85,    59,    39,
+       0,    92,   188,   248,    59,    60,    53,    45,    36,    49,
+      71,    51,   123,    41,    29,    55,    56,    57,   120,    74,
+     265,   123,    44,    63,   112,    65,    66,   118,   214,    69,
+     123,    49,    50,   126,    18,    19,    20,    77,   303,   175,
+     125,   126,    82,    83,   180,    22,    86,   275,    18,    19,
+      20,    79,    48,   123,   108,    95,   120,   123,    98,   179,
+      51,    18,    19,    20,    21,    59,   121,    22,   115,   116,
+      27,   309,   279,   107,    31,    32,   105,   105,   197,    41,
+     120,   123,    39,   122,   120,   123,   127,   128,   120,   127,
+     127,    18,    19,    20,    51,    47,    33,    70,    55,    56,
+      57,    67,   123,   106,   123,    80,    63,   124,    65,    66,
+      51,     9,    69,   232,   234,   235,    67,    82,    74,    31,
+      77,    51,    26,    65,   123,    82,    83,     2,   123,    86,
+     123,   109,   303,   282,   272,   202,   193,   129,    95,   269,
+     259,    98,   300,   206,     2,    -1,    -1,    -1,    -1,    -1,
+     270,    -1,    -1,    -1,   274,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   120,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   205,    -1,    -1,    -1,    -1,    -1,    -1,   298,    -1,
+      -1,    -1,    -1,    18,   303,    -1,    21,    -1,    23,    24,
       -1,    26,    27,    28,    -1,    -1,    -1,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    -1,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    46,    47,    48,    -1,    50,    -1,    52,    53,    54,
       -1,    56,    57,    58,    -1,    -1,    61,    -1,    63,    64,
-      -1,    -1,    67,    68,    -1,    70,    71,    72,    -1,    74,
-      75,    76,    77,    78,    -1,    80,    -1,    82,    83,    -1,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      -1,    66,    -1,    68,    69,   269,    71,    72,    73,    -1,
+      75,    76,    77,    78,    79,    -1,    81,    -1,    83,    84,
+      -1,    86,    87,    88,    89,    90,    91,    92,    93,    94,
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,    -1,   109,   110,    -1,    -1,   113,   114,
-     115,    18,   117,   118,    -1,    -1,    23,    24,    -1,    26,
-      27,    28,    -1,    -1,    -1,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    -1,    45,    46,
-      47,    48,    -1,    50,    -1,    52,    53,    54,    -1,    56,
-      57,    58,    -1,    -1,    61,    -1,    63,    64,    -1,    -1,
-      67,    68,    -1,    70,    71,    72,    -1,    74,    75,    76,
-      77,    78,    -1,    80,    -1,    82,    83,    -1,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,    -1,   109,   110,    -1,    -1,   113,   114,   115,    18,
-     117,   118,    -1,    -1,    23,    24,    -1,    26,    27,    28,
+     105,   106,   107,   108,    -1,   110,   111,    -1,    -1,   114,
+     115,   116,    -1,   118,   119,    18,    -1,    20,    -1,    -1,
+      23,    24,    -1,    26,    27,    28,    -1,    -1,    -1,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,    -1,    45,    46,    47,    48,    -1,    50,    -1,    52,
+      53,    54,    -1,    56,    57,    58,    -1,    -1,    61,    -1,
+      63,    64,    -1,    66,    -1,    68,    69,    -1,    71,    72,
+      73,    -1,    75,    76,    77,    78,    79,    -1,    81,    -1,
+      83,    84,    -1,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,    -1,   110,   111,    -1,
+      -1,   114,   115,   116,    -1,   118,   119,    18,    19,    -1,
+      -1,    -1,    23,    24,    -1,    26,    27,    28,    -1,    -1,
+      -1,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    43,    -1,    45,    46,    47,    48,    -1,    50,
+      -1,    52,    53,    54,    -1,    56,    57,    58,    -1,    -1,
+      61,    -1,    63,    64,    -1,    66,    -1,    68,    69,    -1,
+      71,    72,    73,    -1,    75,    76,    77,    78,    79,    -1,
+      81,    -1,    83,    84,    -1,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,    -1,   110,
+     111,    -1,    -1,   114,   115,   116,    -1,   118,   119,    18,
+      19,    -1,    -1,    -1,    23,    24,    -1,    26,    27,    28,
       -1,    -1,    -1,    32,    33,    34,    35,    36,    37,    38,
       39,    40,    41,    42,    43,    -1,    45,    46,    47,    48,
       -1,    50,    -1,    52,    53,    54,    -1,    56,    57,    58,
-      -1,    -1,    61,    -1,    63,    64,    -1,    -1,    67,    68,
-      -1,    70,    71,    72,    -1,    74,    75,    76,    77,    78,
-      -1,    80,    -1,    82,    83,    -1,    85,    86,    87,    88,
+      -1,    -1,    61,    -1,    63,    64,    -1,    66,    -1,    68,
+      69,    -1,    71,    72,    73,    -1,    75,    76,    77,    78,
+      79,    -1,    81,    -1,    83,    84,    -1,    86,    87,    88,
       89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,    -1,
-     109,   110,    -1,    -1,   113,   114,   115,    -1,   117,   118,
-      18,    19,    20,    21,    -1,    -1,    -1,    -1,    -1,    27,
-      -1,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,    -1,
-      -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    49,    50,    51,    -1,    -1,    -1,    55,    56,    57,
-      -1,    -1,    -1,    -1,    -1,    63,    -1,    65,    -1,    -1,
-      68,    -1,    18,    19,    20,    21,    -1,    -1,    76,    -1,
-      -1,    27,    -1,    81,    82,    31,    32,    85,    -1,    -1,
-      -1,    -1,    -1,    39,    -1,    -1,    94,    -1,    -1,    97,
+      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+      -1,   110,   111,    -1,    -1,   114,   115,   116,    18,   118,
+     119,    -1,    -1,    23,    24,    -1,    26,    27,    28,    -1,
+      -1,    -1,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    -1,    45,    46,    47,    48,    -1,
+      50,    -1,    52,    53,    54,    -1,    56,    57,    58,    -1,
+      -1,    61,    -1,    63,    64,    -1,    66,    -1,    68,    69,
+      -1,    71,    72,    73,    -1,    75,    76,    77,    78,    79,
+      -1,    81,    -1,    83,    84,    -1,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
+     110,   111,    -1,    -1,   114,   115,   116,    18,   118,   119,
+      -1,    -1,    23,    24,    -1,    26,    27,    28,    -1,    -1,
+      -1,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    43,    -1,    45,    46,    47,    48,    -1,    50,
+      -1,    52,    53,    54,    -1,    56,    57,    58,    -1,    -1,
+      61,    -1,    63,    64,    -1,    66,    -1,    68,    69,    -1,
+      71,    72,    73,    -1,    75,    76,    77,    78,    79,    -1,
+      81,    -1,    83,    84,    -1,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,    -1,   110,
+     111,    -1,    -1,   114,   115,   116,    -1,   118,   119,    18,
+      19,    20,    21,    -1,    -1,    -1,    -1,    -1,    27,    -1,
+      -1,    -1,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,
+      39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      49,    50,    51,    -1,    -1,    -1,    55,    56,    57,    -1,
+      -1,    -1,    -1,    -1,    63,    -1,    65,    66,    -1,    -1,
+      69,    -1,    18,    19,    20,    21,    -1,    -1,    77,    -1,
+      -1,    27,    -1,    82,    83,    31,    32,    86,    -1,    -1,
+      -1,    -1,    -1,    39,    -1,    -1,    95,    -1,    -1,    98,
       -1,    -1,    -1,    49,    50,    51,    -1,    -1,    -1,    55,
       56,    57,    -1,    -1,    -1,    -1,    -1,    63,    -1,    65,
-      -1,    -1,    68,    -1,    18,    19,    20,    21,    -1,    -1,
-      76,    -1,    -1,    27,    -1,    81,    82,    31,    32,    85,
-      -1,    -1,    -1,    -1,    -1,    39,    -1,    -1,    94,    -1,
-      -1,    97,    -1,    -1,    -1,    -1,    -1,    51,    -1,    -1,
-      54,    55,    56,    57,    -1,    -1,    -1,    -1,    -1,    63,
-      -1,    65,    -1,    -1,    68,    -1,    18,    19,    20,    21,
-      -1,    -1,    76,    -1,    -1,    27,    -1,    81,    82,    31,
-      32,    85,    -1,    -1,    -1,    -1,    -1,    39,    -1,    -1,
-      94,    -1,    -1,    97,    -1,    -1,    -1,    -1,    -1,    51,
-      -1,    -1,    -1,    55,    56,    57,    -1,    -1,    -1,    -1,
-      -1,    63,    -1,    65,    -1,    -1,    68,    -1,    18,    19,
-      20,    21,    -1,    -1,    76,    -1,    -1,    27,    -1,    81,
-      82,    31,    32,    85,    -1,    -1,    -1,    -1,    -1,    39,
-      -1,    -1,    94,    -1,    -1,    97,    -1,    -1,    -1,    -1,
+      66,    -1,    -1,    69,    -1,    18,    19,    20,    21,    -1,
+      -1,    77,    -1,    -1,    27,    -1,    82,    83,    31,    32,
+      86,    -1,    -1,    -1,    -1,    -1,    39,    -1,    -1,    95,
+      -1,    -1,    98,    -1,    -1,    -1,    -1,    -1,    51,    -1,
+      -1,    54,    55,    56,    57,    -1,    -1,    -1,    -1,    -1,
+      63,    -1,    65,    66,    -1,    -1,    69,    -1,    18,    19,
+      20,    21,    -1,    -1,    77,    -1,    -1,    27,    -1,    82,
+      83,    31,    32,    86,    -1,    -1,    -1,    -1,    -1,    39,
+      -1,    -1,    95,    -1,    -1,    98,    -1,    -1,    -1,    -1,
       -1,    51,    -1,    -1,    -1,    55,    56,    57,    -1,    -1,
-      -1,    -1,    -1,    63,    -1,    65,    -1,    -1,    68,    -1,
-      18,    19,    20,    21,    -1,    -1,    76,    -1,    -1,    27,
-      -1,    81,    82,    31,    32,    85,    -1,    -1,    -1,    -1,
-      -1,    39,    -1,    -1,    94,    -1,    -1,    97,    -1,    -1,
-      -1,    -1,    -1,    51,    -1,    -1,    -1,    55,    56,    57,
-      -1,    -1,    -1,    -1,    -1,    63,    -1,    65,    -1,    -1,
-      68,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,    -1,
-      -1,    -1,    -1,    81,    82,    -1,    -1,    85,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    -1,    97
+      -1,    -1,    -1,    63,    -1,    65,    66,    -1,    -1,    69,
+      -1,    18,    19,    20,    21,    -1,    -1,    77,    -1,    -1,
+      27,    -1,    82,    83,    31,    32,    86,    -1,    -1,    -1,
+      -1,    -1,    39,    -1,    -1,    95,    -1,    -1,    98,    -1,
+      -1,    -1,    -1,    -1,    51,    -1,    -1,    -1,    55,    56,
+      57,    -1,    -1,    -1,    -1,    -1,    63,    -1,    65,    66,
+      -1,    -1,    69,    -1,    18,    19,    20,    21,    -1,    -1,
+      77,    -1,    -1,    27,    -1,    82,    83,    31,    32,    86,
+      -1,    -1,    -1,    -1,    -1,    39,    -1,    -1,    95,    -1,
+      -1,    98,    -1,    -1,    -1,    -1,    -1,    51,    -1,    -1,
+      -1,    55,    56,    57,    -1,    -1,    -1,    -1,    -1,    63,
+      -1,    65,    66,    -1,    -1,    69,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    77,    -1,    -1,    -1,    -1,    82,    83,
+      -1,    -1,    86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    95,    -1,    -1,    98
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,   129,   130,     0,    21,   121,   131,   134,   135,   207,
+       0,   130,   131,     0,    21,   122,   132,   135,   136,   208,
       18,    20,    23,    24,    26,    27,    28,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    45,
       46,    47,    48,    50,    52,    53,    54,    56,    57,    58,
-      61,    63,    64,    67,    68,    70,    71,    72,    74,    75,
-      76,    77,    78,    80,    82,    83,    85,    86,    87,    88,
+      61,    63,    64,    66,    68,    69,    71,    72,    73,    75,
+      76,    77,    78,    79,    81,    83,    84,    86,    87,    88,
       89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   109,
-     110,   113,   114,   115,   117,   118,   210,   211,    83,    91,
-     117,   122,   133,    29,    44,   136,    22,    48,    18,   132,
-     211,    53,   114,   115,   156,    18,    21,    44,   137,   138,
-     139,   148,   211,    18,    19,    20,    27,    31,    32,    39,
-      54,    55,    56,    57,    63,    65,    68,    76,    81,    82,
-      85,    94,    97,   134,   157,   158,   159,   160,   166,   167,
-     170,   175,   176,   177,   180,   182,   183,   184,   185,   186,
-     188,   189,   190,   191,   192,   194,   195,   197,   207,   210,
-     138,    24,    36,    78,   104,   141,   149,   171,    18,    19,
-      20,   196,   198,   193,    40,   107,   161,   205,   193,   122,
-     196,   203,   122,    13,   126,   127,   155,   208,   210,    51,
-      59,    60,    73,   120,    22,    59,   104,    41,   150,   119,
-     172,   173,   122,   119,   199,   200,   196,    47,   156,   196,
-     204,   203,   119,   122,   209,   208,    18,    19,    20,   178,
-     179,   179,   156,   187,   206,    18,    19,   147,   211,   140,
-      33,   151,   205,    49,   173,   174,   201,   202,   210,   200,
-      69,    18,    19,    20,   162,   163,   165,   168,   122,   203,
-     187,    66,   105,   181,    51,   187,   122,   123,   143,    18,
-      19,   211,    79,   152,   156,   156,    51,    84,   111,   122,
-     125,   155,    49,    50,   169,     9,    66,    73,   144,   145,
-     148,    59,    70,   146,    81,    45,   122,   153,   154,   155,
-      31,   202,   156,   163,   164,   156,   205,    51,    26,   208,
-     124,   125,   150,   142,   122,   156,    65,   206,   122,   145,
-     122,   187
+      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+     110,   111,   114,   115,   116,   118,   119,   211,   212,    84,
+      92,   118,   123,   134,    29,    44,   137,    22,    48,    18,
+     133,   212,    53,   115,   116,   157,    18,    21,    44,   138,
+     139,   140,   149,   212,    18,    19,    20,    27,    31,    32,
+      39,    54,    55,    56,    57,    63,    65,    66,    69,    77,
+      82,    83,    86,    95,    98,   135,   158,   159,   160,   161,
+     167,   168,   171,   176,   177,   178,   181,   183,   184,   185,
+     186,   187,   189,   190,   191,   192,   193,   195,   196,   198,
+     208,   211,   139,    24,    36,    79,   105,   142,   150,   172,
+      18,    19,    20,   197,   199,   194,    40,   108,   162,   206,
+     194,   123,   197,   204,   123,    13,   127,   128,   156,   209,
+     211,    51,    59,    60,    74,   121,    22,    59,   105,    41,
+     151,   120,   173,   174,   123,   120,   200,   201,   197,    47,
+     157,   197,   205,   204,   120,   123,   210,   209,    18,    19,
+      20,   179,   180,   180,   157,   188,   207,    18,    19,   148,
+     212,   141,    33,   152,   206,    49,   174,   175,   202,   203,
+     211,   201,    70,    18,    19,    20,   163,   164,   166,   169,
+     123,   204,   188,    67,   106,   182,    51,   188,   123,   124,
+     144,    18,    19,   212,    80,   153,   157,   157,    51,    85,
+     112,   123,   126,   156,    49,    50,   170,     9,    67,    74,
+     145,   146,   149,    59,    71,   147,    82,    45,   123,   154,
+     155,   156,    31,   203,   157,   164,   165,   157,   206,    51,
+      26,   209,   125,   126,   151,   143,   123,   157,    65,   207,
+     123,   146,   123,   188
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,   128,   129,   130,   130,   131,   131,   131,   131,   131,
-     132,   132,   133,   133,   134,   135,   135,   135,   136,   137,
-     137,   138,   138,   138,   139,   139,   140,   139,   141,   141,
-     141,   142,   143,   143,   144,   144,   145,   146,   146,   147,
-     147,   147,   148,   148,   149,   149,   150,   151,   151,   151,
-     151,   152,   152,   153,   153,   154,   154,   155,   155,   156,
-     156,   157,   157,   157,   157,   157,   157,   157,   157,   157,
-     157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
-     157,   157,   158,   159,   160,   161,   161,   161,   162,   162,
-     163,   164,   165,   165,   165,   166,   166,   167,   168,   168,
-     169,   169,   170,   171,   172,   172,   173,   174,   174,   175,
-     176,   177,   178,   179,   179,   179,   180,   181,   181,   182,
-     183,   183,   184,   185,   186,   187,   188,   188,   188,   189,
-     190,   191,   192,   193,   194,   195,   196,   196,   196,   197,
-     198,   197,   199,   199,   200,   201,   201,   202,   203,   204,
-     205,   206,   207,   207,   208,   208,   209,   209,   210,   210,
-     210,   211,   211,   211,   211,   211,   211,   211,   211,   211,
-     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
-     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
-     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
-     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
-     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
-     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
-     211,   211,   211,   211,   211
+       0,   129,   130,   131,   131,   132,   132,   132,   132,   132,
+     133,   133,   134,   134,   135,   136,   136,   136,   137,   138,
+     138,   139,   139,   139,   140,   140,   141,   140,   142,   142,
+     142,   143,   144,   144,   145,   145,   146,   147,   147,   148,
+     148,   148,   149,   149,   150,   150,   151,   152,   152,   152,
+     152,   153,   153,   154,   154,   155,   155,   156,   156,   157,
+     157,   158,   158,   158,   158,   158,   158,   158,   158,   158,
+     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
+     158,   158,   159,   160,   161,   162,   162,   162,   163,   163,
+     164,   165,   166,   166,   166,   167,   167,   168,   169,   169,
+     170,   170,   171,   172,   173,   173,   174,   175,   175,   176,
+     177,   178,   179,   180,   180,   180,   181,   182,   182,   183,
+     184,   184,   185,   186,   187,   188,   189,   189,   189,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   197,   197,
+     198,   199,   198,   200,   200,   201,   202,   202,   203,   204,
+     205,   206,   207,   208,   208,   209,   209,   210,   210,   211,
+     211,   211,   212,   212,   212,   212,   212,   212,   212,   212,
+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
+     212,   212,   212,   212,   212,   212,   212
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1274,9 +1281,9 @@
        0,     2,     7,     0,     2,     1,     3,     0,     2,     3,
        4,     4,     2,     1,     1,     1,     8,     0,     2,     3,
        1,     1,     1,     1,     1,     5,     1,     1,     1,     1,
-       2,     4,     4,     0,     3,     2,     1,     1,     1,     0,
-       0,     3,     2,     1,     4,     3,     1,     1,     0,     0,
-       0,     0,     0,     3,     0,     1,     1,     2,     1,     1,
+       1,     2,     4,     4,     0,     3,     2,     1,     1,     1,
+       0,     0,     3,     2,     1,     4,     3,     1,     1,     0,
+       0,     0,     0,     0,     3,     0,     1,     1,     2,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -1284,7 +1291,7 @@
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1
+       1,     1,     1,     1,     1,     1,     1
 };
 
 
@@ -2054,23 +2061,23 @@
   switch (yyn)
     {
         case 2:
-#line 348 "pl_gram.y" /* yacc.c:1646  */
+#line 349 "pl_gram.y" /* yacc.c:1646  */
     {
 						plpgsql_parse_result = (PLpgSQL_stmt_block *) (yyvsp[-1].stmt);
 					}
-#line 2062 "pl_gram.c" /* yacc.c:1646  */
+#line 2069 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 358 "pl_gram.y" /* yacc.c:1646  */
+#line 359 "pl_gram.y" /* yacc.c:1646  */
     {
 						plpgsql_DumpExecTree = true;
 					}
-#line 2070 "pl_gram.c" /* yacc.c:1646  */
+#line 2077 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 362 "pl_gram.y" /* yacc.c:1646  */
+#line 363 "pl_gram.y" /* yacc.c:1646  */
     {
 						if (strcmp((yyvsp[0].str), "on") == 0)
 							plpgsql_curr_compile->print_strict_params = true;
@@ -2079,51 +2086,51 @@
 						else
 							elog(ERROR, "unrecognized print_strict_params option %s", (yyvsp[0].str));
 					}
-#line 2083 "pl_gram.c" /* yacc.c:1646  */
+#line 2090 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 371 "pl_gram.y" /* yacc.c:1646  */
+#line 372 "pl_gram.y" /* yacc.c:1646  */
     {
 						plpgsql_curr_compile->resolve_option = PLPGSQL_RESOLVE_ERROR;
 					}
-#line 2091 "pl_gram.c" /* yacc.c:1646  */
+#line 2098 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 375 "pl_gram.y" /* yacc.c:1646  */
+#line 376 "pl_gram.y" /* yacc.c:1646  */
     {
 						plpgsql_curr_compile->resolve_option = PLPGSQL_RESOLVE_VARIABLE;
 					}
-#line 2099 "pl_gram.c" /* yacc.c:1646  */
+#line 2106 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 379 "pl_gram.y" /* yacc.c:1646  */
+#line 380 "pl_gram.y" /* yacc.c:1646  */
     {
 						plpgsql_curr_compile->resolve_option = PLPGSQL_RESOLVE_COLUMN;
 					}
-#line 2107 "pl_gram.c" /* yacc.c:1646  */
+#line 2114 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 385 "pl_gram.y" /* yacc.c:1646  */
+#line 386 "pl_gram.y" /* yacc.c:1646  */
     {
 					(yyval.str) = (yyvsp[0].word).ident;
 				}
-#line 2115 "pl_gram.c" /* yacc.c:1646  */
+#line 2122 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 389 "pl_gram.y" /* yacc.c:1646  */
+#line 390 "pl_gram.y" /* yacc.c:1646  */
     {
 					(yyval.str) = pstrdup((yyvsp[0].keyword));
 				}
-#line 2123 "pl_gram.c" /* yacc.c:1646  */
+#line 2130 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 398 "pl_gram.y" /* yacc.c:1646  */
+#line 399 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_block *new;
 
@@ -2142,11 +2149,11 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 2146 "pl_gram.c" /* yacc.c:1646  */
+#line 2153 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 420 "pl_gram.y" /* yacc.c:1646  */
+#line 421 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* done with decls, so resume identifier lookup */
 						plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
@@ -2154,33 +2161,33 @@
 						(yyval.declhdr).n_initvars = 0;
 						(yyval.declhdr).initvarnos = NULL;
 					}
-#line 2158 "pl_gram.c" /* yacc.c:1646  */
+#line 2165 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 428 "pl_gram.y" /* yacc.c:1646  */
+#line 429 "pl_gram.y" /* yacc.c:1646  */
     {
 						plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
 						(yyval.declhdr).label	  = (yyvsp[-1].str);
 						(yyval.declhdr).n_initvars = 0;
 						(yyval.declhdr).initvarnos = NULL;
 					}
-#line 2169 "pl_gram.c" /* yacc.c:1646  */
+#line 2176 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 435 "pl_gram.y" /* yacc.c:1646  */
+#line 436 "pl_gram.y" /* yacc.c:1646  */
     {
 						plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
 						(yyval.declhdr).label	  = (yyvsp[-2].str);
 						/* Remember variables declared in decl_stmts */
 						(yyval.declhdr).n_initvars = plpgsql_add_initdatums(&((yyval.declhdr).initvarnos));
 					}
-#line 2180 "pl_gram.c" /* yacc.c:1646  */
+#line 2187 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 444 "pl_gram.y" /* yacc.c:1646  */
+#line 445 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* Forget any variables created before block */
 						plpgsql_add_initdatums(NULL);
@@ -2190,19 +2197,19 @@
 						 */
 						plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_DECLARE;
 					}
-#line 2194 "pl_gram.c" /* yacc.c:1646  */
+#line 2201 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 461 "pl_gram.y" /* yacc.c:1646  */
+#line 462 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* We allow useless extra DECLAREs */
 					}
-#line 2202 "pl_gram.c" /* yacc.c:1646  */
+#line 2209 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 465 "pl_gram.y" /* yacc.c:1646  */
+#line 466 "pl_gram.y" /* yacc.c:1646  */
     {
 						/*
 						 * Throw a helpful error if user tries to put block
@@ -2213,11 +2220,11 @@
 								 errmsg("block label must be placed before DECLARE, not after"),
 								 parser_errposition((yylsp[-2]))));
 					}
-#line 2217 "pl_gram.c" /* yacc.c:1646  */
+#line 2224 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 478 "pl_gram.y" /* yacc.c:1646  */
+#line 479 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_variable	*var;
 
@@ -2272,26 +2279,26 @@
 										 parser_errposition((yylsp[-1]))));
 						}
 					}
-#line 2276 "pl_gram.c" /* yacc.c:1646  */
+#line 2283 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 533 "pl_gram.y" /* yacc.c:1646  */
+#line 534 "pl_gram.y" /* yacc.c:1646  */
     {
 						plpgsql_ns_additem((yyvsp[-1].nsitem)->itemtype,
 										   (yyvsp[-1].nsitem)->itemno, (yyvsp[-4].varname).name);
 					}
-#line 2285 "pl_gram.c" /* yacc.c:1646  */
+#line 2292 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 538 "pl_gram.y" /* yacc.c:1646  */
+#line 539 "pl_gram.y" /* yacc.c:1646  */
     { plpgsql_ns_push((yyvsp[-2].varname).name); }
-#line 2291 "pl_gram.c" /* yacc.c:1646  */
+#line 2298 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 540 "pl_gram.y" /* yacc.c:1646  */
+#line 541 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_var *new;
 						PLpgSQL_expr *curname_def;
@@ -2339,51 +2346,51 @@
 							new->cursor_explicit_argrow = (yyvsp[-2].datum)->dno;
 						new->cursor_options = CURSOR_OPT_FAST_PLAN | (yyvsp[-5].ival);
 					}
-#line 2343 "pl_gram.c" /* yacc.c:1646  */
+#line 2350 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 590 "pl_gram.y" /* yacc.c:1646  */
+#line 591 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.ival) = 0;
 					}
-#line 2351 "pl_gram.c" /* yacc.c:1646  */
+#line 2358 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 594 "pl_gram.y" /* yacc.c:1646  */
+#line 595 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.ival) = CURSOR_OPT_NO_SCROLL;
 					}
-#line 2359 "pl_gram.c" /* yacc.c:1646  */
+#line 2366 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 598 "pl_gram.y" /* yacc.c:1646  */
+#line 599 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.ival) = CURSOR_OPT_SCROLL;
 					}
-#line 2367 "pl_gram.c" /* yacc.c:1646  */
+#line 2374 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 604 "pl_gram.y" /* yacc.c:1646  */
+#line 605 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.expr) = read_sql_stmt("");
 					}
-#line 2375 "pl_gram.c" /* yacc.c:1646  */
+#line 2382 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 610 "pl_gram.y" /* yacc.c:1646  */
+#line 611 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.datum) = NULL;
 					}
-#line 2383 "pl_gram.c" /* yacc.c:1646  */
+#line 2390 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 614 "pl_gram.y" /* yacc.c:1646  */
+#line 615 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_row *new;
 						int i;
@@ -2410,37 +2417,37 @@
 						plpgsql_adddatum((PLpgSQL_datum *) new);
 						(yyval.datum) = (PLpgSQL_datum *) new;
 					}
-#line 2414 "pl_gram.c" /* yacc.c:1646  */
+#line 2421 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 643 "pl_gram.y" /* yacc.c:1646  */
+#line 644 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = list_make1((yyvsp[0].datum));
 					}
-#line 2422 "pl_gram.c" /* yacc.c:1646  */
+#line 2429 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 35:
-#line 647 "pl_gram.y" /* yacc.c:1646  */
+#line 648 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].datum));
 					}
-#line 2430 "pl_gram.c" /* yacc.c:1646  */
+#line 2437 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 653 "pl_gram.y" /* yacc.c:1646  */
+#line 654 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.datum) = (PLpgSQL_datum *)
 							plpgsql_build_variable((yyvsp[-1].varname).name, (yyvsp[-1].varname).lineno,
 												   (yyvsp[0].dtype), true);
 					}
-#line 2440 "pl_gram.c" /* yacc.c:1646  */
+#line 2447 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 39:
-#line 664 "pl_gram.y" /* yacc.c:1646  */
+#line 665 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_nsitem *nsi;
 
@@ -2455,11 +2462,11 @@
 									 parser_errposition((yylsp[0]))));
 						(yyval.nsitem) = nsi;
 					}
-#line 2459 "pl_gram.c" /* yacc.c:1646  */
+#line 2466 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 40:
-#line 679 "pl_gram.y" /* yacc.c:1646  */
+#line 680 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_nsitem *nsi;
 
@@ -2474,11 +2481,11 @@
 									 parser_errposition((yylsp[0]))));
 						(yyval.nsitem) = nsi;
 					}
-#line 2478 "pl_gram.c" /* yacc.c:1646  */
+#line 2485 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 41:
-#line 694 "pl_gram.y" /* yacc.c:1646  */
+#line 695 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_nsitem *nsi;
 
@@ -2504,11 +2511,11 @@
 									 parser_errposition((yylsp[0]))));
 						(yyval.nsitem) = nsi;
 					}
-#line 2508 "pl_gram.c" /* yacc.c:1646  */
+#line 2515 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 722 "pl_gram.y" /* yacc.c:1646  */
+#line 723 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.varname).name = (yyvsp[0].word).ident;
 						(yyval.varname).lineno = plpgsql_location_to_lineno((yylsp[0]));
@@ -2536,11 +2543,11 @@
 						}
 
 					}
-#line 2540 "pl_gram.c" /* yacc.c:1646  */
+#line 2547 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 750 "pl_gram.y" /* yacc.c:1646  */
+#line 751 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.varname).name = pstrdup((yyvsp[0].keyword));
 						(yyval.varname).lineno = plpgsql_location_to_lineno((yylsp[0]));
@@ -2568,23 +2575,23 @@
 						}
 
 					}
-#line 2572 "pl_gram.c" /* yacc.c:1646  */
+#line 2579 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 780 "pl_gram.y" /* yacc.c:1646  */
+#line 781 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = false; }
-#line 2578 "pl_gram.c" /* yacc.c:1646  */
+#line 2585 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 45:
-#line 782 "pl_gram.y" /* yacc.c:1646  */
+#line 783 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = true; }
-#line 2584 "pl_gram.c" /* yacc.c:1646  */
+#line 2591 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 786 "pl_gram.y" /* yacc.c:1646  */
+#line 787 "pl_gram.y" /* yacc.c:1646  */
     {
 						/*
 						 * If there's a lookahead token, read_datatype
@@ -2593,75 +2600,75 @@
 						(yyval.dtype) = read_datatype(yychar);
 						yyclearin;
 					}
-#line 2597 "pl_gram.c" /* yacc.c:1646  */
+#line 2604 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 797 "pl_gram.y" /* yacc.c:1646  */
+#line 798 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.oid) = InvalidOid; }
-#line 2603 "pl_gram.c" /* yacc.c:1646  */
+#line 2610 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 799 "pl_gram.y" /* yacc.c:1646  */
+#line 800 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.oid) = get_collation_oid(list_make1(makeString((yyvsp[0].word).ident)),
 											   false);
 					}
-#line 2612 "pl_gram.c" /* yacc.c:1646  */
+#line 2619 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 804 "pl_gram.y" /* yacc.c:1646  */
+#line 805 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.oid) = get_collation_oid(list_make1(makeString(pstrdup((yyvsp[0].keyword)))),
 											   false);
 					}
-#line 2621 "pl_gram.c" /* yacc.c:1646  */
+#line 2628 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 809 "pl_gram.y" /* yacc.c:1646  */
+#line 810 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.oid) = get_collation_oid((yyvsp[0].cword).idents, false);
 					}
-#line 2629 "pl_gram.c" /* yacc.c:1646  */
+#line 2636 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 815 "pl_gram.y" /* yacc.c:1646  */
+#line 816 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = false; }
-#line 2635 "pl_gram.c" /* yacc.c:1646  */
+#line 2642 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 817 "pl_gram.y" /* yacc.c:1646  */
+#line 818 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.boolean) = true; }
-#line 2641 "pl_gram.c" /* yacc.c:1646  */
+#line 2648 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 821 "pl_gram.y" /* yacc.c:1646  */
+#line 822 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.expr) = NULL; }
-#line 2647 "pl_gram.c" /* yacc.c:1646  */
+#line 2654 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 823 "pl_gram.y" /* yacc.c:1646  */
+#line 824 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.expr) = read_sql_expression(';', ";");
 					}
-#line 2655 "pl_gram.c" /* yacc.c:1646  */
+#line 2662 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 59:
-#line 842 "pl_gram.y" /* yacc.c:1646  */
+#line 843 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.list) = NIL; }
-#line 2661 "pl_gram.c" /* yacc.c:1646  */
+#line 2668 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 844 "pl_gram.y" /* yacc.c:1646  */
+#line 845 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* don't bother linking null statements into list */
 						if ((yyvsp[0].stmt) == NULL)
@@ -2669,137 +2676,137 @@
 						else
 							(yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].stmt));
 					}
-#line 2673 "pl_gram.c" /* yacc.c:1646  */
+#line 2680 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 61:
-#line 854 "pl_gram.y" /* yacc.c:1646  */
+#line 855 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[-1].stmt); }
-#line 2679 "pl_gram.c" /* yacc.c:1646  */
+#line 2686 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 856 "pl_gram.y" /* yacc.c:1646  */
+#line 857 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2685 "pl_gram.c" /* yacc.c:1646  */
+#line 2692 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 858 "pl_gram.y" /* yacc.c:1646  */
+#line 859 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2691 "pl_gram.c" /* yacc.c:1646  */
+#line 2698 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 860 "pl_gram.y" /* yacc.c:1646  */
+#line 861 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2697 "pl_gram.c" /* yacc.c:1646  */
+#line 2704 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 65:
-#line 862 "pl_gram.y" /* yacc.c:1646  */
+#line 863 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2703 "pl_gram.c" /* yacc.c:1646  */
+#line 2710 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 66:
-#line 864 "pl_gram.y" /* yacc.c:1646  */
+#line 865 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2709 "pl_gram.c" /* yacc.c:1646  */
+#line 2716 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 67:
-#line 866 "pl_gram.y" /* yacc.c:1646  */
+#line 867 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2715 "pl_gram.c" /* yacc.c:1646  */
+#line 2722 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 868 "pl_gram.y" /* yacc.c:1646  */
+#line 869 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2721 "pl_gram.c" /* yacc.c:1646  */
+#line 2728 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 69:
-#line 870 "pl_gram.y" /* yacc.c:1646  */
+#line 871 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2727 "pl_gram.c" /* yacc.c:1646  */
+#line 2734 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 872 "pl_gram.y" /* yacc.c:1646  */
+#line 873 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2733 "pl_gram.c" /* yacc.c:1646  */
+#line 2740 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 71:
-#line 874 "pl_gram.y" /* yacc.c:1646  */
+#line 875 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2739 "pl_gram.c" /* yacc.c:1646  */
+#line 2746 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 876 "pl_gram.y" /* yacc.c:1646  */
+#line 877 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2745 "pl_gram.c" /* yacc.c:1646  */
+#line 2752 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 73:
-#line 878 "pl_gram.y" /* yacc.c:1646  */
+#line 879 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2751 "pl_gram.c" /* yacc.c:1646  */
+#line 2758 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 74:
-#line 880 "pl_gram.y" /* yacc.c:1646  */
+#line 881 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2757 "pl_gram.c" /* yacc.c:1646  */
+#line 2764 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 75:
-#line 882 "pl_gram.y" /* yacc.c:1646  */
+#line 883 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2763 "pl_gram.c" /* yacc.c:1646  */
+#line 2770 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 76:
-#line 884 "pl_gram.y" /* yacc.c:1646  */
+#line 885 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2769 "pl_gram.c" /* yacc.c:1646  */
+#line 2776 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 77:
-#line 886 "pl_gram.y" /* yacc.c:1646  */
+#line 887 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2775 "pl_gram.c" /* yacc.c:1646  */
+#line 2782 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 78:
-#line 888 "pl_gram.y" /* yacc.c:1646  */
+#line 889 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2781 "pl_gram.c" /* yacc.c:1646  */
+#line 2788 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 79:
-#line 890 "pl_gram.y" /* yacc.c:1646  */
+#line 891 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2787 "pl_gram.c" /* yacc.c:1646  */
+#line 2794 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 80:
-#line 892 "pl_gram.y" /* yacc.c:1646  */
+#line 893 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2793 "pl_gram.c" /* yacc.c:1646  */
+#line 2800 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 81:
-#line 894 "pl_gram.y" /* yacc.c:1646  */
+#line 895 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.stmt) = (yyvsp[0].stmt); }
-#line 2799 "pl_gram.c" /* yacc.c:1646  */
+#line 2806 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 82:
-#line 898 "pl_gram.y" /* yacc.c:1646  */
+#line 899 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_perform *new;
 
@@ -2810,11 +2817,11 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 2814 "pl_gram.c" /* yacc.c:1646  */
+#line 2821 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 83:
-#line 911 "pl_gram.y" /* yacc.c:1646  */
+#line 912 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_assign *new;
 
@@ -2826,11 +2833,11 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 2830 "pl_gram.c" /* yacc.c:1646  */
+#line 2837 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 84:
-#line 925 "pl_gram.y" /* yacc.c:1646  */
+#line 926 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_getdiag	 *new;
 						ListCell		*lc;
@@ -2890,51 +2897,51 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 2894 "pl_gram.c" /* yacc.c:1646  */
+#line 2901 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 85:
-#line 987 "pl_gram.y" /* yacc.c:1646  */
+#line 988 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.boolean) = false;
 					}
-#line 2902 "pl_gram.c" /* yacc.c:1646  */
+#line 2909 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 991 "pl_gram.y" /* yacc.c:1646  */
+#line 992 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.boolean) = false;
 					}
-#line 2910 "pl_gram.c" /* yacc.c:1646  */
+#line 2917 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 87:
-#line 995 "pl_gram.y" /* yacc.c:1646  */
+#line 996 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.boolean) = true;
 					}
-#line 2918 "pl_gram.c" /* yacc.c:1646  */
+#line 2925 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 88:
-#line 1001 "pl_gram.y" /* yacc.c:1646  */
+#line 1002 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].diagitem));
 					}
-#line 2926 "pl_gram.c" /* yacc.c:1646  */
+#line 2933 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 89:
-#line 1005 "pl_gram.y" /* yacc.c:1646  */
+#line 1006 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = list_make1((yyvsp[0].diagitem));
 					}
-#line 2934 "pl_gram.c" /* yacc.c:1646  */
+#line 2941 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 90:
-#line 1011 "pl_gram.y" /* yacc.c:1646  */
+#line 1012 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_diag_item *new;
 
@@ -2944,11 +2951,11 @@
 
 						(yyval.diagitem) = new;
 					}
-#line 2948 "pl_gram.c" /* yacc.c:1646  */
+#line 2955 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 1023 "pl_gram.y" /* yacc.c:1646  */
+#line 1024 "pl_gram.y" /* yacc.c:1646  */
     {
 						int	tok = yylex();
 
@@ -2994,11 +3001,11 @@
 						else
 							yyerror("unrecognized GET DIAGNOSTICS item");
 					}
-#line 2998 "pl_gram.c" /* yacc.c:1646  */
+#line 3005 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 92:
-#line 1071 "pl_gram.y" /* yacc.c:1646  */
+#line 1072 "pl_gram.y" /* yacc.c:1646  */
     {
 						check_assignable((yyvsp[0].wdatum).datum, (yylsp[0]));
 						if ((yyvsp[0].wdatum).datum->dtype == PLPGSQL_DTYPE_ROW ||
@@ -3010,38 +3017,38 @@
 									 parser_errposition((yylsp[0]))));
 						(yyval.ival) = (yyvsp[0].wdatum).datum->dno;
 					}
-#line 3014 "pl_gram.c" /* yacc.c:1646  */
+#line 3021 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 93:
-#line 1083 "pl_gram.y" /* yacc.c:1646  */
+#line 1084 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* just to give a better message than "syntax error" */
 						word_is_not_variable(&((yyvsp[0].word)), (yylsp[0]));
 					}
-#line 3023 "pl_gram.c" /* yacc.c:1646  */
+#line 3030 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 1088 "pl_gram.y" /* yacc.c:1646  */
+#line 1089 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* just to give a better message than "syntax error" */
 						cword_is_not_variable(&((yyvsp[0].cword)), (yylsp[0]));
 					}
-#line 3032 "pl_gram.c" /* yacc.c:1646  */
+#line 3039 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 1096 "pl_gram.y" /* yacc.c:1646  */
+#line 1097 "pl_gram.y" /* yacc.c:1646  */
     {
 						check_assignable((yyvsp[0].wdatum).datum, (yylsp[0]));
 						(yyval.ival) = (yyvsp[0].wdatum).datum->dno;
 					}
-#line 3041 "pl_gram.c" /* yacc.c:1646  */
+#line 3048 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 1101 "pl_gram.y" /* yacc.c:1646  */
+#line 1102 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_arrayelem	*new;
 
@@ -3056,11 +3063,11 @@
 
 						(yyval.ival) = new->dno;
 					}
-#line 3060 "pl_gram.c" /* yacc.c:1646  */
+#line 3067 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 97:
-#line 1118 "pl_gram.y" /* yacc.c:1646  */
+#line 1119 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_if *new;
 
@@ -3074,19 +3081,19 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 3078 "pl_gram.c" /* yacc.c:1646  */
+#line 3085 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 98:
-#line 1134 "pl_gram.y" /* yacc.c:1646  */
+#line 1135 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = NIL;
 					}
-#line 3086 "pl_gram.c" /* yacc.c:1646  */
+#line 3093 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 99:
-#line 1138 "pl_gram.y" /* yacc.c:1646  */
+#line 1139 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_if_elsif *new;
 
@@ -3097,35 +3104,35 @@
 
 						(yyval.list) = lappend((yyvsp[-3].list), new);
 					}
-#line 3101 "pl_gram.c" /* yacc.c:1646  */
+#line 3108 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 100:
-#line 1151 "pl_gram.y" /* yacc.c:1646  */
+#line 1152 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = NIL;
 					}
-#line 3109 "pl_gram.c" /* yacc.c:1646  */
+#line 3116 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 101:
-#line 1155 "pl_gram.y" /* yacc.c:1646  */
+#line 1156 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = (yyvsp[0].list);
 					}
-#line 3117 "pl_gram.c" /* yacc.c:1646  */
+#line 3124 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 102:
-#line 1161 "pl_gram.y" /* yacc.c:1646  */
+#line 1162 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.stmt) = make_case((yylsp[-6]), (yyvsp[-5].expr), (yyvsp[-4].list), (yyvsp[-3].list));
 					}
-#line 3125 "pl_gram.c" /* yacc.c:1646  */
+#line 3132 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 103:
-#line 1167 "pl_gram.y" /* yacc.c:1646  */
+#line 1168 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_expr *expr = NULL;
 						int	tok = yylex();
@@ -3138,27 +3145,27 @@
 						plpgsql_push_back_token(K_WHEN);
 						(yyval.expr) = expr;
 					}
-#line 3142 "pl_gram.c" /* yacc.c:1646  */
+#line 3149 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 104:
-#line 1182 "pl_gram.y" /* yacc.c:1646  */
+#line 1183 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].casewhen));
 					}
-#line 3150 "pl_gram.c" /* yacc.c:1646  */
+#line 3157 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 105:
-#line 1186 "pl_gram.y" /* yacc.c:1646  */
+#line 1187 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = list_make1((yyvsp[0].casewhen));
 					}
-#line 3158 "pl_gram.c" /* yacc.c:1646  */
+#line 3165 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 106:
-#line 1192 "pl_gram.y" /* yacc.c:1646  */
+#line 1193 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_case_when *new = palloc(sizeof(PLpgSQL_case_when));
 
@@ -3167,19 +3174,19 @@
 						new->stmts	= (yyvsp[0].list);
 						(yyval.casewhen) = new;
 					}
-#line 3171 "pl_gram.c" /* yacc.c:1646  */
+#line 3178 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 107:
-#line 1203 "pl_gram.y" /* yacc.c:1646  */
+#line 1204 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.list) = NIL;
 					}
-#line 3179 "pl_gram.c" /* yacc.c:1646  */
+#line 3186 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 108:
-#line 1207 "pl_gram.y" /* yacc.c:1646  */
+#line 1208 "pl_gram.y" /* yacc.c:1646  */
     {
 						/*
 						 * proc_sect could return an empty list, but we
@@ -3192,11 +3199,11 @@
 						else
 							(yyval.list) = list_make1(NULL);
 					}
-#line 3196 "pl_gram.c" /* yacc.c:1646  */
+#line 3203 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 109:
-#line 1222 "pl_gram.y" /* yacc.c:1646  */
+#line 1223 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_loop *new;
 
@@ -3211,11 +3218,11 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 3215 "pl_gram.c" /* yacc.c:1646  */
+#line 3222 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 110:
-#line 1239 "pl_gram.y" /* yacc.c:1646  */
+#line 1240 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_while *new;
 
@@ -3231,11 +3238,11 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 3235 "pl_gram.c" /* yacc.c:1646  */
+#line 3242 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 111:
-#line 1257 "pl_gram.y" /* yacc.c:1646  */
+#line 1258 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* This runs after we've scanned the loop body */
 						if ((yyvsp[-1].stmt)->cmd_type == PLPGSQL_STMT_FORI)
@@ -3267,11 +3274,11 @@
 						/* close namespace started in opt_block_label */
 						plpgsql_ns_pop();
 					}
-#line 3271 "pl_gram.c" /* yacc.c:1646  */
+#line 3278 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 112:
-#line 1291 "pl_gram.y" /* yacc.c:1646  */
+#line 1292 "pl_gram.y" /* yacc.c:1646  */
     {
 						int			tok = yylex();
 						int			tokloc = yylloc;
@@ -3513,11 +3520,11 @@
 							}
 						}
 					}
-#line 3517 "pl_gram.c" /* yacc.c:1646  */
+#line 3524 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 113:
-#line 1553 "pl_gram.y" /* yacc.c:1646  */
+#line 1554 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.forvariable).name = NameOfDatum(&((yyvsp[0].wdatum)));
 						(yyval.forvariable).lineno = plpgsql_location_to_lineno((yylsp[0]));
@@ -3549,11 +3556,11 @@
 															   (yylsp[0]));
 						}
 					}
-#line 3553 "pl_gram.c" /* yacc.c:1646  */
+#line 3560 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 114:
-#line 1585 "pl_gram.y" /* yacc.c:1646  */
+#line 1586 "pl_gram.y" /* yacc.c:1646  */
     {
 						int			tok;
 
@@ -3568,20 +3575,20 @@
 						if (tok == ',')
 							word_is_not_variable(&((yyvsp[0].word)), (yylsp[0]));
 					}
-#line 3572 "pl_gram.c" /* yacc.c:1646  */
+#line 3579 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 115:
-#line 1600 "pl_gram.y" /* yacc.c:1646  */
+#line 1601 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* just to give a better message than "syntax error" */
 						cword_is_not_variable(&((yyvsp[0].cword)), (yylsp[0]));
 					}
-#line 3581 "pl_gram.c" /* yacc.c:1646  */
+#line 3588 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 116:
-#line 1607 "pl_gram.y" /* yacc.c:1646  */
+#line 1608 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_foreach_a *new;
 
@@ -3621,27 +3628,27 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *) new;
 					}
-#line 3625 "pl_gram.c" /* yacc.c:1646  */
+#line 3632 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 117:
-#line 1649 "pl_gram.y" /* yacc.c:1646  */
+#line 1650 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.ival) = 0;
 					}
-#line 3633 "pl_gram.c" /* yacc.c:1646  */
+#line 3640 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 118:
-#line 1653 "pl_gram.y" /* yacc.c:1646  */
+#line 1654 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.ival) = (yyvsp[0].ival);
 					}
-#line 3641 "pl_gram.c" /* yacc.c:1646  */
+#line 3648 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 119:
-#line 1659 "pl_gram.y" /* yacc.c:1646  */
+#line 1660 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_exit *new;
 
@@ -3654,27 +3661,27 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 3658 "pl_gram.c" /* yacc.c:1646  */
+#line 3665 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 120:
-#line 1674 "pl_gram.y" /* yacc.c:1646  */
+#line 1675 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.boolean) = true;
 					}
-#line 3666 "pl_gram.c" /* yacc.c:1646  */
+#line 3673 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 121:
-#line 1678 "pl_gram.y" /* yacc.c:1646  */
+#line 1679 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.boolean) = false;
 					}
-#line 3674 "pl_gram.c" /* yacc.c:1646  */
+#line 3681 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 122:
-#line 1684 "pl_gram.y" /* yacc.c:1646  */
+#line 1685 "pl_gram.y" /* yacc.c:1646  */
     {
 						int	tok;
 
@@ -3698,11 +3705,11 @@
 							(yyval.stmt) = make_return_stmt((yylsp[0]));
 						}
 					}
-#line 3702 "pl_gram.c" /* yacc.c:1646  */
+#line 3709 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 123:
-#line 1710 "pl_gram.y" /* yacc.c:1646  */
+#line 1711 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_raise		*new;
 						int	tok;
@@ -3844,11 +3851,11 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 3848 "pl_gram.c" /* yacc.c:1646  */
+#line 3855 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 124:
-#line 1854 "pl_gram.y" /* yacc.c:1646  */
+#line 1855 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_assert		*new;
 						int	tok;
@@ -3869,29 +3876,37 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *) new;
 					}
-#line 3873 "pl_gram.c" /* yacc.c:1646  */
+#line 3880 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 125:
-#line 1877 "pl_gram.y" /* yacc.c:1646  */
+#line 1878 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.loop_body).stmts = (yyvsp[-4].list);
 						(yyval.loop_body).end_label = (yyvsp[-1].str);
 						(yyval.loop_body).end_label_location = (yylsp[-1]);
 					}
-#line 3883 "pl_gram.c" /* yacc.c:1646  */
+#line 3890 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 126:
-#line 1895 "pl_gram.y" /* yacc.c:1646  */
+#line 1896 "pl_gram.y" /* yacc.c:1646  */
     {
-						(yyval.stmt) = make_execsql_stmt(K_INSERT, (yylsp[0]));
+						(yyval.stmt) = make_execsql_stmt(K_IMPORT, (yylsp[0]));
 					}
-#line 3891 "pl_gram.c" /* yacc.c:1646  */
+#line 3898 "pl_gram.c" /* yacc.c:1646  */
     break;
 
   case 127:
-#line 1899 "pl_gram.y" /* yacc.c:1646  */
+#line 1900 "pl_gram.y" /* yacc.c:1646  */
+    {
+						(yyval.stmt) = make_execsql_stmt(K_INSERT, (yylsp[0]));
+					}
+#line 3906 "pl_gram.c" /* yacc.c:1646  */
+    break;
+
+  case 128:
+#line 1904 "pl_gram.y" /* yacc.c:1646  */
     {
 						int			tok;
 
@@ -3901,11 +3916,11 @@
 							word_is_not_variable(&((yyvsp[0].word)), (yylsp[0]));
 						(yyval.stmt) = make_execsql_stmt(T_WORD, (yylsp[0]));
 					}
-#line 3905 "pl_gram.c" /* yacc.c:1646  */
+#line 3920 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 128:
-#line 1909 "pl_gram.y" /* yacc.c:1646  */
+  case 129:
+#line 1914 "pl_gram.y" /* yacc.c:1646  */
     {
 						int			tok;
 
@@ -3915,11 +3930,11 @@
 							cword_is_not_variable(&((yyvsp[0].cword)), (yylsp[0]));
 						(yyval.stmt) = make_execsql_stmt(T_CWORD, (yylsp[0]));
 					}
-#line 3919 "pl_gram.c" /* yacc.c:1646  */
+#line 3934 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 129:
-#line 1921 "pl_gram.y" /* yacc.c:1646  */
+  case 130:
+#line 1926 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_dynexecute *new;
 						PLpgSQL_expr *expr;
@@ -3980,11 +3995,11 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 3984 "pl_gram.c" /* yacc.c:1646  */
+#line 3999 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 130:
-#line 1985 "pl_gram.y" /* yacc.c:1646  */
+  case 131:
+#line 1990 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_open *new;
 						int				  tok;
@@ -4059,11 +4074,11 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 4063 "pl_gram.c" /* yacc.c:1646  */
+#line 4078 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 131:
-#line 2062 "pl_gram.y" /* yacc.c:1646  */
+  case 132:
+#line 2067 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_fetch *fetch = (yyvsp[-2].fetch);
 						PLpgSQL_rec	   *rec;
@@ -4093,11 +4108,11 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)fetch;
 					}
-#line 4097 "pl_gram.c" /* yacc.c:1646  */
+#line 4112 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 132:
-#line 2094 "pl_gram.y" /* yacc.c:1646  */
+  case 133:
+#line 2099 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_fetch *fetch = (yyvsp[-2].fetch);
 
@@ -4107,19 +4122,19 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)fetch;
 					}
-#line 4111 "pl_gram.c" /* yacc.c:1646  */
+#line 4126 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 133:
-#line 2106 "pl_gram.y" /* yacc.c:1646  */
+  case 134:
+#line 2111 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.fetch) = read_fetch_direction();
 					}
-#line 4119 "pl_gram.c" /* yacc.c:1646  */
+#line 4134 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 134:
-#line 2112 "pl_gram.y" /* yacc.c:1646  */
+  case 135:
+#line 2117 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_stmt_close *new;
 
@@ -4130,20 +4145,20 @@
 
 						(yyval.stmt) = (PLpgSQL_stmt *)new;
 					}
-#line 4134 "pl_gram.c" /* yacc.c:1646  */
+#line 4149 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 135:
-#line 2125 "pl_gram.y" /* yacc.c:1646  */
+  case 136:
+#line 2130 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* We do not bother building a node for NULL */
 						(yyval.stmt) = NULL;
 					}
-#line 4143 "pl_gram.c" /* yacc.c:1646  */
+#line 4158 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 136:
-#line 2132 "pl_gram.y" /* yacc.c:1646  */
+  case 137:
+#line 2137 "pl_gram.y" /* yacc.c:1646  */
     {
 						if ((yyvsp[0].wdatum).datum->dtype != PLPGSQL_DTYPE_VAR)
 							ereport(ERROR,
@@ -4159,35 +4174,35 @@
 									 parser_errposition((yylsp[0]))));
 						(yyval.var) = (PLpgSQL_var *) (yyvsp[0].wdatum).datum;
 					}
-#line 4163 "pl_gram.c" /* yacc.c:1646  */
+#line 4178 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 137:
-#line 2148 "pl_gram.y" /* yacc.c:1646  */
+  case 138:
+#line 2153 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* just to give a better message than "syntax error" */
 						word_is_not_variable(&((yyvsp[0].word)), (yylsp[0]));
 					}
-#line 4172 "pl_gram.c" /* yacc.c:1646  */
+#line 4187 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 138:
-#line 2153 "pl_gram.y" /* yacc.c:1646  */
+  case 139:
+#line 2158 "pl_gram.y" /* yacc.c:1646  */
     {
 						/* just to give a better message than "syntax error" */
 						cword_is_not_variable(&((yyvsp[0].cword)), (yylsp[0]));
 					}
-#line 4181 "pl_gram.c" /* yacc.c:1646  */
+#line 4196 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 139:
-#line 2160 "pl_gram.y" /* yacc.c:1646  */
+  case 140:
+#line 2165 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.exception_block) = NULL; }
-#line 4187 "pl_gram.c" /* yacc.c:1646  */
+#line 4202 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 140:
-#line 2162 "pl_gram.y" /* yacc.c:1646  */
+  case 141:
+#line 2167 "pl_gram.y" /* yacc.c:1646  */
     {
 						/*
 						 * We use a mid-rule action to add these
@@ -4218,38 +4233,38 @@
 
 						(yyval.exception_block) = new;
 					}
-#line 4222 "pl_gram.c" /* yacc.c:1646  */
+#line 4237 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 141:
-#line 2193 "pl_gram.y" /* yacc.c:1646  */
+  case 142:
+#line 2198 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_exception_block *new = (yyvsp[-1].exception_block);
 						new->exc_list = (yyvsp[0].list);
 
 						(yyval.exception_block) = new;
 					}
-#line 4233 "pl_gram.c" /* yacc.c:1646  */
+#line 4248 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 142:
-#line 2202 "pl_gram.y" /* yacc.c:1646  */
+  case 143:
+#line 2207 "pl_gram.y" /* yacc.c:1646  */
     {
 							(yyval.list) = lappend((yyvsp[-1].list), (yyvsp[0].exception));
 						}
-#line 4241 "pl_gram.c" /* yacc.c:1646  */
+#line 4256 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 143:
-#line 2206 "pl_gram.y" /* yacc.c:1646  */
+  case 144:
+#line 2211 "pl_gram.y" /* yacc.c:1646  */
     {
 							(yyval.list) = list_make1((yyvsp[0].exception));
 						}
-#line 4249 "pl_gram.c" /* yacc.c:1646  */
+#line 4264 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 144:
-#line 2212 "pl_gram.y" /* yacc.c:1646  */
+  case 145:
+#line 2217 "pl_gram.y" /* yacc.c:1646  */
     {
 						PLpgSQL_exception *new;
 
@@ -4260,11 +4275,11 @@
 
 						(yyval.exception) = new;
 					}
-#line 4264 "pl_gram.c" /* yacc.c:1646  */
+#line 4279 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 145:
-#line 2225 "pl_gram.y" /* yacc.c:1646  */
+  case 146:
+#line 2230 "pl_gram.y" /* yacc.c:1646  */
     {
 							PLpgSQL_condition	*old;
 
@@ -4273,19 +4288,19 @@
 							old->next = (yyvsp[0].condition);
 							(yyval.condition) = (yyvsp[-2].condition);
 						}
-#line 4277 "pl_gram.c" /* yacc.c:1646  */
+#line 4292 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 146:
-#line 2234 "pl_gram.y" /* yacc.c:1646  */
+  case 147:
+#line 2239 "pl_gram.y" /* yacc.c:1646  */
     {
 							(yyval.condition) = (yyvsp[0].condition);
 						}
-#line 4285 "pl_gram.c" /* yacc.c:1646  */
+#line 4300 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 147:
-#line 2240 "pl_gram.y" /* yacc.c:1646  */
+  case 148:
+#line 2245 "pl_gram.y" /* yacc.c:1646  */
     {
 							if (strcmp((yyvsp[0].str), "sqlstate") != 0)
 							{
@@ -4319,109 +4334,109 @@
 								(yyval.condition) = new;
 							}
 						}
-#line 4323 "pl_gram.c" /* yacc.c:1646  */
+#line 4338 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 148:
-#line 2276 "pl_gram.y" /* yacc.c:1646  */
+  case 149:
+#line 2281 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.expr) = read_sql_expression(';', ";"); }
-#line 4329 "pl_gram.c" /* yacc.c:1646  */
+#line 4344 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 149:
-#line 2280 "pl_gram.y" /* yacc.c:1646  */
+  case 150:
+#line 2285 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.expr) = read_sql_expression(']', "]"); }
-#line 4335 "pl_gram.c" /* yacc.c:1646  */
+#line 4350 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 150:
-#line 2284 "pl_gram.y" /* yacc.c:1646  */
+  case 151:
+#line 2289 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.expr) = read_sql_expression(K_THEN, "THEN"); }
-#line 4341 "pl_gram.c" /* yacc.c:1646  */
+#line 4356 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 151:
-#line 2288 "pl_gram.y" /* yacc.c:1646  */
+  case 152:
+#line 2293 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.expr) = read_sql_expression(K_LOOP, "LOOP"); }
-#line 4347 "pl_gram.c" /* yacc.c:1646  */
+#line 4362 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 152:
-#line 2292 "pl_gram.y" /* yacc.c:1646  */
+  case 153:
+#line 2297 "pl_gram.y" /* yacc.c:1646  */
     {
 						plpgsql_ns_push(NULL);
 						(yyval.str) = NULL;
 					}
-#line 4356 "pl_gram.c" /* yacc.c:1646  */
+#line 4371 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 153:
-#line 2297 "pl_gram.y" /* yacc.c:1646  */
+  case 154:
+#line 2302 "pl_gram.y" /* yacc.c:1646  */
     {
 						plpgsql_ns_push((yyvsp[-1].str));
 						(yyval.str) = (yyvsp[-1].str);
 					}
-#line 4365 "pl_gram.c" /* yacc.c:1646  */
+#line 4380 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 154:
-#line 2304 "pl_gram.y" /* yacc.c:1646  */
+  case 155:
+#line 2309 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.str) = NULL;
 					}
-#line 4373 "pl_gram.c" /* yacc.c:1646  */
+#line 4388 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 155:
-#line 2308 "pl_gram.y" /* yacc.c:1646  */
+  case 156:
+#line 2313 "pl_gram.y" /* yacc.c:1646  */
     {
 						if (plpgsql_ns_lookup_label(plpgsql_ns_top(), (yyvsp[0].str)) == NULL)
 							yyerror("label does not exist");
 						(yyval.str) = (yyvsp[0].str);
 					}
-#line 4383 "pl_gram.c" /* yacc.c:1646  */
+#line 4398 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 156:
-#line 2316 "pl_gram.y" /* yacc.c:1646  */
+  case 157:
+#line 2321 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.expr) = NULL; }
-#line 4389 "pl_gram.c" /* yacc.c:1646  */
+#line 4404 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 157:
-#line 2318 "pl_gram.y" /* yacc.c:1646  */
+  case 158:
+#line 2323 "pl_gram.y" /* yacc.c:1646  */
     { (yyval.expr) = (yyvsp[0].expr); }
-#line 4395 "pl_gram.c" /* yacc.c:1646  */
+#line 4410 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 158:
-#line 2325 "pl_gram.y" /* yacc.c:1646  */
+  case 159:
+#line 2330 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.str) = (yyvsp[0].word).ident;
 					}
-#line 4403 "pl_gram.c" /* yacc.c:1646  */
+#line 4418 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 159:
-#line 2329 "pl_gram.y" /* yacc.c:1646  */
+  case 160:
+#line 2334 "pl_gram.y" /* yacc.c:1646  */
     {
 						(yyval.str) = pstrdup((yyvsp[0].keyword));
 					}
-#line 4411 "pl_gram.c" /* yacc.c:1646  */
+#line 4426 "pl_gram.c" /* yacc.c:1646  */
     break;
 
-  case 160:
-#line 2333 "pl_gram.y" /* yacc.c:1646  */
+  case 161:
+#line 2338 "pl_gram.y" /* yacc.c:1646  */
     {
 						if ((yyvsp[0].wdatum).ident == NULL) /* composite name not OK */
 							yyerror("syntax error");
 						(yyval.str) = (yyvsp[0].wdatum).ident;
 					}
-#line 4421 "pl_gram.c" /* yacc.c:1646  */
+#line 4436 "pl_gram.c" /* yacc.c:1646  */
     break;
 
 
-#line 4425 "pl_gram.c" /* yacc.c:1646  */
+#line 4440 "pl_gram.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4656,7 +4671,7 @@
 #endif
   return yyresult;
 }
-#line 2417 "pl_gram.y" /* yacc.c:1906  */
+#line 2423 "pl_gram.y" /* yacc.c:1906  */
 
 
 /*
@@ -5037,12 +5052,32 @@
 	plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_EXPR;
 
 	/*
-	 * We have to special-case the sequence INSERT INTO, because we don't want
-	 * that to be taken as an INTO-variables clause.  Fortunately, this is the
-	 * only valid use of INTO in a pl/pgsql SQL command, and INTO is already a
-	 * fully reserved word in the main grammar.  We have to treat it that way
-	 * anywhere in the string, not only at the start; consider CREATE RULE
-	 * containing an INSERT statement.
+	 * Scan to the end of the SQL command.  Identify any INTO-variables
+	 * clause lurking within it, and parse that via read_into_target().
+	 *
+	 * Because INTO is sometimes used in the main SQL grammar, we have to be
+	 * careful not to take any such usage of INTO as a pl/pgsql INTO clause.
+	 * There are currently three such cases:
+	 *
+	 * 1. SELECT ... INTO.  We don't care, we just override that with the
+	 * pl/pgsql definition.
+	 *
+	 * 2. INSERT INTO.  This is relatively easy to recognize since the words
+	 * must appear adjacently; but we can't assume INSERT starts the command,
+	 * because it can appear in CREATE RULE or WITH.  Unfortunately, INSERT is
+	 * *not* fully reserved, so that means there is a chance of a false match;
+	 * but it's not very likely.
+	 *
+	 * 3. IMPORT FOREIGN SCHEMA ... INTO.  This is not allowed in CREATE RULE
+	 * or WITH, so we just check for IMPORT as the command's first token.
+	 * (If IMPORT FOREIGN SCHEMA returned data someone might wish to capture
+	 * with an INTO-variables clause, we'd have to work much harder here.)
+	 *
+	 * Fortunately, INTO is a fully reserved word in the main grammar, so
+	 * at least we need not worry about it appearing as an identifier.
+	 *
+	 * Any future additional uses of INTO in the main grammar will doubtless
+	 * break this logic again ... beware!
 	 */
 	tok = firsttoken;
 	for (;;)
@@ -5055,9 +5090,12 @@
 			break;
 		if (tok == 0)
 			yyerror("unexpected end of function definition");
-
-		if (tok == K_INTO && prev_tok != K_INSERT)
+		if (tok == K_INTO)
 		{
+			if (prev_tok == K_INSERT)
+				continue;		/* INSERT INTO is not an INTO-target */
+			if (firsttoken == K_IMPORT)
+				continue;		/* IMPORT ... INTO is not an INTO-target */
 			if (have_into)
 				yyerror("INTO specified more than once");
 			have_into = true;
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_gram.h postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_gram.h
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_gram.h	2016-03-28 20:23:04.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_gram.h	2017-08-07 21:34:43.000000000 +0000
@@ -108,61 +108,62 @@
     K_GET = 318,
     K_HINT = 319,
     K_IF = 320,
-    K_IN = 321,
-    K_INFO = 322,
-    K_INSERT = 323,
-    K_INTO = 324,
-    K_IS = 325,
-    K_LAST = 326,
-    K_LOG = 327,
-    K_LOOP = 328,
-    K_MESSAGE = 329,
-    K_MESSAGE_TEXT = 330,
-    K_MOVE = 331,
-    K_NEXT = 332,
-    K_NO = 333,
-    K_NOT = 334,
-    K_NOTICE = 335,
-    K_NULL = 336,
-    K_OPEN = 337,
-    K_OPTION = 338,
-    K_OR = 339,
-    K_PERFORM = 340,
-    K_PG_CONTEXT = 341,
-    K_PG_DATATYPE_NAME = 342,
-    K_PG_EXCEPTION_CONTEXT = 343,
-    K_PG_EXCEPTION_DETAIL = 344,
-    K_PG_EXCEPTION_HINT = 345,
-    K_PRINT_STRICT_PARAMS = 346,
-    K_PRIOR = 347,
-    K_QUERY = 348,
-    K_RAISE = 349,
-    K_RELATIVE = 350,
-    K_RESULT_OID = 351,
-    K_RETURN = 352,
-    K_RETURNED_SQLSTATE = 353,
-    K_REVERSE = 354,
-    K_ROW_COUNT = 355,
-    K_ROWTYPE = 356,
-    K_SCHEMA = 357,
-    K_SCHEMA_NAME = 358,
-    K_SCROLL = 359,
-    K_SLICE = 360,
-    K_SQLSTATE = 361,
-    K_STACKED = 362,
-    K_STRICT = 363,
-    K_TABLE = 364,
-    K_TABLE_NAME = 365,
-    K_THEN = 366,
-    K_TO = 367,
-    K_TYPE = 368,
-    K_USE_COLUMN = 369,
-    K_USE_VARIABLE = 370,
-    K_USING = 371,
-    K_VARIABLE_CONFLICT = 372,
-    K_WARNING = 373,
-    K_WHEN = 374,
-    K_WHILE = 375
+    K_IMPORT = 321,
+    K_IN = 322,
+    K_INFO = 323,
+    K_INSERT = 324,
+    K_INTO = 325,
+    K_IS = 326,
+    K_LAST = 327,
+    K_LOG = 328,
+    K_LOOP = 329,
+    K_MESSAGE = 330,
+    K_MESSAGE_TEXT = 331,
+    K_MOVE = 332,
+    K_NEXT = 333,
+    K_NO = 334,
+    K_NOT = 335,
+    K_NOTICE = 336,
+    K_NULL = 337,
+    K_OPEN = 338,
+    K_OPTION = 339,
+    K_OR = 340,
+    K_PERFORM = 341,
+    K_PG_CONTEXT = 342,
+    K_PG_DATATYPE_NAME = 343,
+    K_PG_EXCEPTION_CONTEXT = 344,
+    K_PG_EXCEPTION_DETAIL = 345,
+    K_PG_EXCEPTION_HINT = 346,
+    K_PRINT_STRICT_PARAMS = 347,
+    K_PRIOR = 348,
+    K_QUERY = 349,
+    K_RAISE = 350,
+    K_RELATIVE = 351,
+    K_RESULT_OID = 352,
+    K_RETURN = 353,
+    K_RETURNED_SQLSTATE = 354,
+    K_REVERSE = 355,
+    K_ROW_COUNT = 356,
+    K_ROWTYPE = 357,
+    K_SCHEMA = 358,
+    K_SCHEMA_NAME = 359,
+    K_SCROLL = 360,
+    K_SLICE = 361,
+    K_SQLSTATE = 362,
+    K_STACKED = 363,
+    K_STRICT = 364,
+    K_TABLE = 365,
+    K_TABLE_NAME = 366,
+    K_THEN = 367,
+    K_TO = 368,
+    K_TYPE = 369,
+    K_USE_COLUMN = 370,
+    K_USE_VARIABLE = 371,
+    K_USING = 372,
+    K_VARIABLE_CONFLICT = 373,
+    K_WARNING = 374,
+    K_WHEN = 375,
+    K_WHILE = 376
   };
 #endif
 
@@ -223,7 +224,7 @@
 		PLpgSQL_stmt_fetch		*fetch;
 		PLpgSQL_case_when		*casewhen;
 
-#line 227 "pl_gram.h" /* yacc.c:1909  */
+#line 228 "pl_gram.h" /* yacc.c:1909  */
 };
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_gram.y postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_gram.y
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_gram.y	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_gram.y	2017-08-07 21:13:41.000000000 +0000
@@ -286,6 +286,7 @@
 %token <keyword>	K_GET
 %token <keyword>	K_HINT
 %token <keyword>	K_IF
+%token <keyword>	K_IMPORT
 %token <keyword>	K_IN
 %token <keyword>	K_INFO
 %token <keyword>	K_INSERT
@@ -1891,7 +1892,11 @@
  * assignment.  Give an appropriate complaint for that, instead of letting
  * the core parser throw an unhelpful "syntax error".
  */
-stmt_execsql	: K_INSERT
+stmt_execsql	: K_IMPORT
+					{
+						$$ = make_execsql_stmt(K_IMPORT, @1);
+					}
+				| K_INSERT
 					{
 						$$ = make_execsql_stmt(K_INSERT, @1);
 					}
@@ -2369,6 +2374,7 @@
 				| K_FORWARD
 				| K_GET
 				| K_HINT
+				| K_IMPORT
 				| K_INFO
 				| K_INSERT
 				| K_IS
@@ -2794,12 +2800,32 @@
 	plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_EXPR;
 
 	/*
-	 * We have to special-case the sequence INSERT INTO, because we don't want
-	 * that to be taken as an INTO-variables clause.  Fortunately, this is the
-	 * only valid use of INTO in a pl/pgsql SQL command, and INTO is already a
-	 * fully reserved word in the main grammar.  We have to treat it that way
-	 * anywhere in the string, not only at the start; consider CREATE RULE
-	 * containing an INSERT statement.
+	 * Scan to the end of the SQL command.  Identify any INTO-variables
+	 * clause lurking within it, and parse that via read_into_target().
+	 *
+	 * Because INTO is sometimes used in the main SQL grammar, we have to be
+	 * careful not to take any such usage of INTO as a pl/pgsql INTO clause.
+	 * There are currently three such cases:
+	 *
+	 * 1. SELECT ... INTO.  We don't care, we just override that with the
+	 * pl/pgsql definition.
+	 *
+	 * 2. INSERT INTO.  This is relatively easy to recognize since the words
+	 * must appear adjacently; but we can't assume INSERT starts the command,
+	 * because it can appear in CREATE RULE or WITH.  Unfortunately, INSERT is
+	 * *not* fully reserved, so that means there is a chance of a false match;
+	 * but it's not very likely.
+	 *
+	 * 3. IMPORT FOREIGN SCHEMA ... INTO.  This is not allowed in CREATE RULE
+	 * or WITH, so we just check for IMPORT as the command's first token.
+	 * (If IMPORT FOREIGN SCHEMA returned data someone might wish to capture
+	 * with an INTO-variables clause, we'd have to work much harder here.)
+	 *
+	 * Fortunately, INTO is a fully reserved word in the main grammar, so
+	 * at least we need not worry about it appearing as an identifier.
+	 *
+	 * Any future additional uses of INTO in the main grammar will doubtless
+	 * break this logic again ... beware!
 	 */
 	tok = firsttoken;
 	for (;;)
@@ -2812,9 +2838,12 @@
 			break;
 		if (tok == 0)
 			yyerror("unexpected end of function definition");
-
-		if (tok == K_INTO && prev_tok != K_INSERT)
+		if (tok == K_INTO)
 		{
+			if (prev_tok == K_INSERT)
+				continue;		/* INSERT INTO is not an INTO-target */
+			if (firsttoken == K_IMPORT)
+				continue;		/* IMPORT ... INTO is not an INTO-target */
 			if (have_into)
 				yyerror("INTO specified more than once");
 			have_into = true;
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_handler.c postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_handler.c
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_handler.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_handler.c	2017-08-07 21:13:41.000000000 +0000
@@ -110,6 +110,8 @@
 	}
 
 	myextra = (int *) malloc(sizeof(int));
+	if (!myextra)
+		return false;
 	*myextra = extrachecks;
 	*extra = (void *) myextra;
 
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_scanner.c postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_scanner.c
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/pl_scanner.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/pl_scanner.c	2017-08-07 21:13:41.000000000 +0000
@@ -127,6 +127,7 @@
 	PG_KEYWORD("forward", K_FORWARD, UNRESERVED_KEYWORD)
 	PG_KEYWORD("get", K_GET, UNRESERVED_KEYWORD)
 	PG_KEYWORD("hint", K_HINT, UNRESERVED_KEYWORD)
+	PG_KEYWORD("import", K_IMPORT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("info", K_INFO, UNRESERVED_KEYWORD)
 	PG_KEYWORD("insert", K_INSERT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("is", K_IS, UNRESERVED_KEYWORD)
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/po/de.po postgresql-9.5-9.5.8/src/pl/plpgsql/src/po/de.po
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PostgreSQL package.
 # Peter Eisentraut <peter_e@gmx.net>, 2009 - 2015.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
@@ -27,7 +27,7 @@
 #: pl_comp.c:517
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
-msgstr "konnte den tatsächlichen Rückgabetyp der polymorphischen Funktion „%s“ nicht ermitteln"
+msgstr "konnte den tatsächlichen Rückgabetyp der polymorphischen Funktion »%s« nicht ermitteln"
 
 #: pl_comp.c:547
 #, c-format
@@ -57,17 +57,17 @@
 #: pl_comp.c:957
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
-msgstr "Kompilierung der PL/pgSQL-Funktion „%s“ nahe Zeile %d"
+msgstr "Kompilierung der PL/pgSQL-Funktion »%s« nahe Zeile %d"
 
 #: pl_comp.c:980
 #, c-format
 msgid "parameter name \"%s\" used more than once"
-msgstr "Parametername „%s“ mehrmals angegeben"
+msgstr "Parametername »%s« mehrmals angegeben"
 
 #: pl_comp.c:1090
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
-msgstr "Spaltenverweis „%s“ ist nicht eindeutig"
+msgstr "Spaltenverweis »%s« ist nicht eindeutig"
 
 #: pl_comp.c:1092
 #, c-format
@@ -78,37 +78,37 @@
 #: pl_exec.c:4971
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
-msgstr "Record „%s“ hat kein Feld „%s“"
+msgstr "Record »%s« hat kein Feld »%s«"
 
 #: pl_comp.c:1831
 #, c-format
 msgid "relation \"%s\" does not exist"
-msgstr "Relation „%s“ existiert nicht"
+msgstr "Relation »%s« existiert nicht"
 
 #: pl_comp.c:1940
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
-msgstr "Variable „%s“ hat Pseudotyp %s"
+msgstr "Variable »%s« hat Pseudotyp %s"
 
 #: pl_comp.c:2006
 #, c-format
 msgid "relation \"%s\" is not a table"
-msgstr "Relation „%s“ ist keine Tabelle"
+msgstr "Relation »%s« ist keine Tabelle"
 
 #: pl_comp.c:2166
 #, c-format
 msgid "type \"%s\" is only a shell"
-msgstr "Typ „%s“ ist nur eine Hülle"
+msgstr "Typ »%s« ist nur eine Hülle"
 
 #: pl_comp.c:2255 pl_comp.c:2308
 #, c-format
 msgid "unrecognized exception condition \"%s\""
-msgstr "unbekannte Ausnahmebedingung „%s“"
+msgstr "unbekannte Ausnahmebedingung »%s«"
 
 #: pl_comp.c:2466
 #, c-format
 msgid "could not determine actual argument type for polymorphic function \"%s\""
-msgstr "konnte den tatsächlichen Argumenttyp der polymorphischen Funktion „%s“ nicht ermitteln"
+msgstr "konnte den tatsächlichen Argumenttyp der polymorphischen Funktion »%s« nicht ermitteln"
 
 #: pl_exec.c:321 pl_exec.c:614 pl_exec.c:893
 msgid "during initialization of execution state"
@@ -197,7 +197,7 @@
 #: pl_exec.c:1169
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
-msgstr "Variable „%s“ ist als NOT NULL deklariert und kann daher nicht den Ausgangswert NULL haben"
+msgstr "Variable »%s« ist als NOT NULL deklariert und kann daher nicht den Ausgangswert NULL haben"
 
 #: pl_exec.c:1219
 msgid "during statement block entry"
@@ -249,7 +249,7 @@
 #: pl_exec.c:2203 pl_exec.c:3963
 #, c-format
 msgid "cursor \"%s\" already in use"
-msgstr "Cursor „%s“ ist bereits in Verwendung"
+msgstr "Cursor »%s« ist bereits in Verwendung"
 
 #: pl_exec.c:2226 pl_exec.c:4025
 #, c-format
@@ -305,7 +305,7 @@
 #: pl_exec.c:4873 pl_exec.c:4941 pl_exec.c:4964
 #, c-format
 msgid "record \"%s\" is not assigned yet"
-msgstr "Record „%s“ hat noch keinen Wert"
+msgstr "Record »%s« hat noch keinen Wert"
 
 #: pl_exec.c:2763 pl_exec.c:4436 pl_exec.c:4764 pl_exec.c:4790 pl_exec.c:4856
 #: pl_exec.c:4875 pl_exec.c:4943 pl_exec.c:4966
@@ -415,12 +415,12 @@
 #: pl_exec.c:4105 pl_exec.c:4197
 #, c-format
 msgid "cursor variable \"%s\" is null"
-msgstr "Cursor-Variable „%s“ ist NULL"
+msgstr "Cursor-Variable »%s« ist NULL"
 
 #: pl_exec.c:4112 pl_exec.c:4204
 #, c-format
 msgid "cursor \"%s\" does not exist"
-msgstr "Cursor „%s“ existiert nicht"
+msgstr "Cursor »%s« existiert nicht"
 
 #: pl_exec.c:4126
 #, c-format
@@ -430,7 +430,7 @@
 #: pl_exec.c:4306
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
-msgstr "NULL-Wert kann der Variable „%s“ nicht zugewiesen werden, weil sie als NOT NULL deklariert ist"
+msgstr "NULL-Wert kann der Variable »%s« nicht zugewiesen werden, weil sie als NOT NULL deklariert ist"
 
 #: pl_exec.c:4378
 #, c-format
@@ -460,24 +460,24 @@
 #: pl_exec.c:5080
 #, c-format
 msgid "query \"%s\" did not return data"
-msgstr "Anfrage „%s“ hat keine Daten zurückgegeben"
+msgstr "Anfrage »%s« hat keine Daten zurückgegeben"
 
 #: pl_exec.c:5088
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
-msgstr[0] "Anfrage „%s“ hat %d Spalte zurückgegeben"
-msgstr[1] "Anfrage „%s“ hat %d Spalten zurückgegeben"
+msgstr[0] "Anfrage »%s« hat %d Spalte zurückgegeben"
+msgstr[1] "Anfrage »%s« hat %d Spalten zurückgegeben"
 
 #: pl_exec.c:5115
 #, c-format
 msgid "query \"%s\" returned more than one row"
-msgstr "Anfrage „%s“ hat mehr als eine Zeile zurückgegeben"
+msgstr "Anfrage »%s« hat mehr als eine Zeile zurückgegeben"
 
 #: pl_exec.c:5170
 #, c-format
 msgid "query \"%s\" is not a SELECT"
-msgstr "Anfrage „%s“ ist kein SELECT"
+msgstr "Anfrage »%s« ist kein SELECT"
 
 #: pl_funcs.c:218
 msgid "statement block"
@@ -539,7 +539,7 @@
 #: pl_gram.y:673 pl_gram.y:688 pl_gram.y:714
 #, c-format
 msgid "variable \"%s\" does not exist"
-msgstr "Variable „%s“ existiert nicht"
+msgstr "Variable »%s« existiert nicht"
 
 #: pl_gram.y:732 pl_gram.y:760
 msgid "duplicate declaration"
@@ -548,7 +548,7 @@
 #: pl_gram.y:743 pl_gram.y:771
 #, c-format
 msgid "variable \"%s\" shadows a previously defined variable"
-msgstr "Variable „%s“ verdeckt eine zuvor definierte Variable"
+msgstr "Variable »%s« verdeckt eine zuvor definierte Variable"
 
 #: pl_gram.y:950
 #, c-format
@@ -567,7 +567,7 @@
 #: pl_gram.y:1077 pl_gram.y:3361
 #, c-format
 msgid "\"%s\" is not a scalar variable"
-msgstr "„%s“ ist keine skalare Variable"
+msgstr "»%s« ist keine skalare Variable"
 
 #: pl_gram.y:1329 pl_gram.y:1523
 #, c-format
@@ -616,7 +616,7 @@
 
 #: pl_gram.y:2018
 msgid "syntax error, expected \"FOR\""
-msgstr "Syntaxfehler, „FOR“ erwartet"
+msgstr "Syntaxfehler, »FOR« erwartet"
 
 #: pl_gram.y:2080
 #, c-format
@@ -631,7 +631,7 @@
 #: pl_gram.y:2142
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
-msgstr "Variable „%s“ muss Typ cursor oder refcursor haben"
+msgstr "Variable »%s« muss Typ cursor oder refcursor haben"
 
 #: pl_gram.y:2310
 msgid "label does not exist"
@@ -640,7 +640,7 @@
 #: pl_gram.y:2457 pl_gram.y:2468
 #, c-format
 msgid "\"%s\" is not a known variable"
-msgstr "„%s“ ist keine bekannte Variable"
+msgstr "»%s« ist keine bekannte Variable"
 
 #: pl_gram.y:2572 pl_gram.y:2582 pl_gram.y:2738
 msgid "mismatched parentheses"
@@ -649,12 +649,12 @@
 #: pl_gram.y:2586
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
-msgstr "„%s“ fehlt am Ende des SQL-Ausdrucks"
+msgstr "»%s« fehlt am Ende des SQL-Ausdrucks"
 
 #: pl_gram.y:2592
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
-msgstr "„%s“ fehlt am Ende der SQL-Anweisung"
+msgstr "»%s« fehlt am Ende der SQL-Anweisung"
 
 #: pl_gram.y:2609
 msgid "missing expression"
@@ -698,7 +698,7 @@
 #: pl_gram.y:3066
 #, c-format
 msgid "RETURN cannot have a parameter in function returning void"
-msgstr "RETURN kann keinen Parameter haben in einer Funktion, die „void“ zurückgibt"
+msgstr "RETURN kann keinen Parameter haben in einer Funktion, die »void« zurückgibt"
 
 #: pl_gram.y:3126
 #, c-format
@@ -708,7 +708,7 @@
 #: pl_gram.y:3230
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
-msgstr "„%s“ wurde als CONSTANT deklariert"
+msgstr "»%s« wurde als CONSTANT deklariert"
 
 #: pl_gram.y:3292 pl_gram.y:3304
 #, c-format
@@ -723,42 +723,42 @@
 #: pl_gram.y:3557
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
-msgstr "Endlabel „%s“ für ungelabelten Block angegeben"
+msgstr "Endlabel »%s« für ungelabelten Block angegeben"
 
 #: pl_gram.y:3564
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
-msgstr "Endlabel „%s“ unterscheidet sich vom Label des Blocks „%s“"
+msgstr "Endlabel »%s« unterscheidet sich vom Label des Blocks »%s«"
 
 #: pl_gram.y:3599
 #, c-format
 msgid "cursor \"%s\" has no arguments"
-msgstr "Cursor „%s“ hat keine Argumente"
+msgstr "Cursor »%s« hat keine Argumente"
 
 #: pl_gram.y:3613
 #, c-format
 msgid "cursor \"%s\" has arguments"
-msgstr "Cursor „%s“ hat Argumente"
+msgstr "Cursor »%s« hat Argumente"
 
 #: pl_gram.y:3655
 #, c-format
 msgid "cursor \"%s\" has no argument named \"%s\""
-msgstr "Cursor „%s“ hat kein Argument namens „%s“"
+msgstr "Cursor »%s« hat kein Argument namens »%s«"
 
 #: pl_gram.y:3675
 #, c-format
 msgid "value for parameter \"%s\" of cursor \"%s\" specified more than once"
-msgstr "Wert für Parameter „%s“ von Cursor „%s“ mehrmals angegeben"
+msgstr "Wert für Parameter »%s« von Cursor »%s« mehrmals angegeben"
 
 #: pl_gram.y:3700
 #, c-format
 msgid "not enough arguments for cursor \"%s\""
-msgstr "nicht genügend Argumente für Cursor „%s“"
+msgstr "nicht genügend Argumente für Cursor »%s«"
 
 #: pl_gram.y:3707
 #, c-format
 msgid "too many arguments for cursor \"%s\""
-msgstr "zu viele Argumente für Cursor „%s“"
+msgstr "zu viele Argumente für Cursor »%s«"
 
 #: pl_gram.y:3795
 msgid "unrecognized RAISE statement option"
@@ -766,7 +766,7 @@
 
 #: pl_gram.y:3799
 msgid "syntax error, expected \"=\""
-msgstr "Syntaxfehler, „=“ erwartet"
+msgstr "Syntaxfehler, »=« erwartet"
 
 #: pl_gram.y:3840
 #, c-format
@@ -808,4 +808,4 @@
 #: pl_scanner.c:637
 #, c-format
 msgid "%s at or near \"%s\""
-msgstr "%s bei „%s“"
+msgstr "%s bei »%s«"
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/po/es.po postgresql-9.5-9.5.8/src/pl/plpgsql/src/po/es.po
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: plpgsql (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:37+0000\n"
+"POT-Creation-Date: 2017-05-21 17:26+0000\n"
 "PO-Revision-Date: 2015-09-30 12:19-0300\n"
 "Last-Translator: Carlos Chapi <carloswaldo@babelruins.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
@@ -22,7 +22,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: pl_comp.c:436 pl_handler.c:448
+#: pl_comp.c:436 pl_handler.c:450
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "las funciones PL/pgSQL no pueden aceptar el tipo %s"
@@ -37,7 +37,7 @@
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones de disparador sólo pueden ser invocadas como disparadores"
 
-#: pl_comp.c:551 pl_handler.c:433
+#: pl_comp.c:551 pl_handler.c:435
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "las funciones PL/pgSQL no pueden retornar el tipo %s"
@@ -103,12 +103,12 @@
 msgid "type \"%s\" is only a shell"
 msgstr "el tipo «%s» está inconcluso"
 
-#: pl_comp.c:2255 pl_comp.c:2308
+#: pl_comp.c:2260 pl_comp.c:2313
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "no se reconoce la condición de excepción «%s»"
 
-#: pl_comp.c:2466
+#: pl_comp.c:2471
 #, c-format
 msgid "could not determine actual argument type for polymorphic function \"%s\""
 msgstr "no se pudo determinar el verdadero tipo de argumento para la función polimórfica «%s»"
@@ -294,7 +294,7 @@
 msgid "cannot return non-composite value from function returning composite type"
 msgstr "no se puede retornar un valor no-compuesto desde una función que retorne tipos compuestos"
 
-#: pl_exec.c:2698 pl_gram.y:3112
+#: pl_exec.c:2698 pl_gram.y:3141
 #, c-format
 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"
@@ -326,7 +326,7 @@
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT debe tener un parámetro"
 
-#: pl_exec.c:2915 pl_gram.y:3174
+#: pl_exec.c:2915 pl_gram.y:3203
 #, c-format
 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"
@@ -400,7 +400,7 @@
 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:3738 pl_exec.c:7026
+#: pl_exec.c:3738 pl_exec.c:7030
 #, c-format
 msgid "query string argument of EXECUTE is null"
 msgstr "el argumento de consulta a ejecutar en EXECUTE es null"
@@ -514,301 +514,301 @@
 msgid "FOR over EXECUTE statement"
 msgstr "bucle FOR en torno a una sentencia EXECUTE"
 
-#: pl_gram.y:472
+#: pl_gram.y:473
 #, c-format
 msgid "block label must be placed before DECLARE, not after"
 msgstr "etiqueta de bloque debe estar antes de DECLARE, no después"
 
-#: pl_gram.y:492
+#: pl_gram.y:493
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "los ordenamientos (collation) no están soportados por el tipo %s"
 
-#: pl_gram.y:507
+#: pl_gram.y:508
 #, c-format
 msgid "row or record variable cannot be CONSTANT"
 msgstr "variable de tipo row o record no puede ser CONSTANT"
 
-#: pl_gram.y:517
+#: pl_gram.y:518
 #, c-format
 msgid "row or record variable cannot be NOT NULL"
 msgstr "variable de tipo row o record no puede ser NOT NULL"
 
-#: pl_gram.y:528
+#: pl_gram.y:529
 #, c-format
 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"
 
-#: pl_gram.y:673 pl_gram.y:688 pl_gram.y:714
+#: pl_gram.y:674 pl_gram.y:689 pl_gram.y:715
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "no existe la variable «%s»"
 
-#: pl_gram.y:732 pl_gram.y:760
+#: pl_gram.y:733 pl_gram.y:761
 msgid "duplicate declaration"
 msgstr "declaración duplicada"
 
-#: pl_gram.y:743 pl_gram.y:771
+#: pl_gram.y:744 pl_gram.y:772
 #, c-format
 msgid "variable \"%s\" shadows a previously defined variable"
 msgstr "la variable «%s» oculta una variable definida anteriormente"
 
-#: pl_gram.y:950
+#: pl_gram.y:951
 #, c-format
 msgid "diagnostics item %s is not allowed in GET STACKED DIAGNOSTICS"
 msgstr "elemento de diagnóstico %s no se permite en GET STACKED DIAGNOSTICS"
 
-#: pl_gram.y:968
+#: pl_gram.y:969
 #, c-format
 msgid "diagnostics item %s is not allowed in GET CURRENT DIAGNOSTICS"
 msgstr "elemento de diagnóstico %s no se permite en GET STACKED DIAGNOSTICS"
 
-#: pl_gram.y:1066
+#: pl_gram.y:1067
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "elemento de GET DIAGNOSTICS no reconocido"
 
-#: pl_gram.y:1077 pl_gram.y:3361
+#: pl_gram.y:1078 pl_gram.y:3390
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "«%s» no es una variable escalar"
 
-#: pl_gram.y:1329 pl_gram.y:1523
+#: pl_gram.y:1330 pl_gram.y:1524
 #, c-format
 msgid "loop variable of loop over rows must be a record or row variable or list of scalar variables"
 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"
 
-#: pl_gram.y:1363
+#: pl_gram.y:1364
 #, c-format
 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"
 
-#: pl_gram.y:1370
+#: pl_gram.y:1371
 #, c-format
 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)"
 
-#: pl_gram.y:1454
+#: pl_gram.y:1455
 #, c-format
 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"
 
-#: pl_gram.y:1490
+#: pl_gram.y:1491
 #, c-format
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "no se puede especificar REVERSE en un bucle FOR de una consulta"
 
-#: pl_gram.y:1637
+#: pl_gram.y:1638
 #, c-format
 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"
 
-#: pl_gram.y:1689 pl_gram.y:1726 pl_gram.y:1774 pl_gram.y:2814 pl_gram.y:2896
-#: pl_gram.y:3007 pl_gram.y:3763
+#: pl_gram.y:1690 pl_gram.y:1727 pl_gram.y:1775 pl_gram.y:2840 pl_gram.y:2925
+#: pl_gram.y:3036 pl_gram.y:3792
 msgid "unexpected end of function definition"
 msgstr "fin inesperado de la definición de la función"
 
-#: pl_gram.y:1794 pl_gram.y:1818 pl_gram.y:1834 pl_gram.y:1840 pl_gram.y:1954
-#: pl_gram.y:1962 pl_gram.y:1976 pl_gram.y:2071 pl_gram.y:2252 pl_gram.y:2335
-#: pl_gram.y:2486 pl_gram.y:3604 pl_gram.y:3665 pl_gram.y:3744
+#: pl_gram.y:1795 pl_gram.y:1819 pl_gram.y:1835 pl_gram.y:1841 pl_gram.y:1959
+#: pl_gram.y:1967 pl_gram.y:1981 pl_gram.y:2076 pl_gram.y:2257 pl_gram.y:2340
+#: pl_gram.y:2492 pl_gram.y:3633 pl_gram.y:3694 pl_gram.y:3773
 msgid "syntax error"
 msgstr "error de sintaxis"
 
-#: pl_gram.y:1822 pl_gram.y:1824 pl_gram.y:2256 pl_gram.y:2258
+#: pl_gram.y:1823 pl_gram.y:1825 pl_gram.y:2261 pl_gram.y:2263
 msgid "invalid SQLSTATE code"
 msgstr "código SQLSTATE no válido"
 
-#: pl_gram.y:2018
+#: pl_gram.y:2023
 msgid "syntax error, expected \"FOR\""
 msgstr "error de sintaxis, se esperaba «FOR»"
 
-#: pl_gram.y:2080
+#: pl_gram.y:2085
 #, c-format
 msgid "FETCH statement cannot return multiple rows"
 msgstr "la sentencia FETCH no puede retornar múltiples filas"
 
-#: pl_gram.y:2136
+#: pl_gram.y:2141
 #, c-format
 msgid "cursor variable must be a simple variable"
 msgstr "variable de cursor debe ser una variable simple"
 
-#: pl_gram.y:2142
+#: pl_gram.y:2147
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "la variable «%s» debe ser de tipo cursor o refcursor"
 
-#: pl_gram.y:2310
+#: pl_gram.y:2315
 msgid "label does not exist"
 msgstr "la etiqueta no existe"
 
-#: pl_gram.y:2457 pl_gram.y:2468
+#: pl_gram.y:2463 pl_gram.y:2474
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "«%s» no es una variable conocida"
 
-#: pl_gram.y:2572 pl_gram.y:2582 pl_gram.y:2738
+#: pl_gram.y:2578 pl_gram.y:2588 pl_gram.y:2744
 msgid "mismatched parentheses"
 msgstr "no coinciden los paréntesis"
 
-#: pl_gram.y:2586
+#: pl_gram.y:2592
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "falta «%s» al final de la expresión SQL"
 
-#: pl_gram.y:2592
+#: pl_gram.y:2598
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "falta «%s» al final de la sentencia SQL"
 
-#: pl_gram.y:2609
+#: pl_gram.y:2615
 msgid "missing expression"
 msgstr "expresión faltante"
 
-#: pl_gram.y:2611
+#: pl_gram.y:2617
 msgid "missing SQL statement"
 msgstr "sentencia SQL faltante"
 
-#: pl_gram.y:2740
+#: pl_gram.y:2746
 msgid "incomplete data type declaration"
 msgstr "declaración de tipo de dato incompleta"
 
-#: pl_gram.y:2763
+#: pl_gram.y:2769
 msgid "missing data type declaration"
 msgstr "declaración de tipo de dato faltante"
 
-#: pl_gram.y:2819
+#: pl_gram.y:2848
 msgid "INTO specified more than once"
 msgstr "INTO fue especificado más de una vez"
 
-#: pl_gram.y:2988
+#: pl_gram.y:3017
 msgid "expected FROM or IN"
 msgstr "se espera FROM o IN"
 
-#: pl_gram.y:3048
+#: pl_gram.y:3077
 #, c-format
 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"
 
-#: pl_gram.y:3049
+#: pl_gram.y:3078
 #, c-format
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Use RETURN NEXT o RETURN QUERY."
 
-#: pl_gram.y:3057
+#: pl_gram.y:3086
 #, c-format
 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"
 
-#: pl_gram.y:3066
+#: pl_gram.y:3095
 #, c-format
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "RETURN no puede tener parámetro en una función que retorna void"
 
-#: pl_gram.y:3126
+#: pl_gram.y:3155
 #, c-format
 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"
 
-#: pl_gram.y:3230
+#: pl_gram.y:3259
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "«%s» esta declarada como CONSTANT"
 
-#: pl_gram.y:3292 pl_gram.y:3304
+#: pl_gram.y:3321 pl_gram.y:3333
 #, c-format
 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"
 
-#: pl_gram.y:3349
+#: pl_gram.y:3378
 #, c-format
 msgid "too many INTO variables specified"
 msgstr "se especificaron demasiadas variables INTO"
 
-#: pl_gram.y:3557
+#: pl_gram.y:3586
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "etiqueta de término «%s» especificada para un bloque sin etiqueta"
 
-#: pl_gram.y:3564
+#: pl_gram.y:3593
 #, 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»"
 
-#: pl_gram.y:3599
+#: pl_gram.y:3628
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "el cursor «%s» no tiene argumentos"
 
-#: pl_gram.y:3613
+#: pl_gram.y:3642
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "el cursor «%s» tiene argumentos"
 
-#: pl_gram.y:3655
+#: pl_gram.y:3684
 #, c-format
 msgid "cursor \"%s\" has no argument named \"%s\""
 msgstr "el cursor «%s» no tiene un argumento llamado «%s»"
 
-#: pl_gram.y:3675
+#: pl_gram.y:3704
 #, c-format
 msgid "value for parameter \"%s\" of cursor \"%s\" specified more than once"
 msgstr "el valor para el parámetro «%s» del cursor «%s» fue especificado más de una vez"
 
-#: pl_gram.y:3700
+#: pl_gram.y:3729
 #, c-format
 msgid "not enough arguments for cursor \"%s\""
 msgstr "no hay suficientes argumentos para el cursor «%s»"
 
-#: pl_gram.y:3707
+#: pl_gram.y:3736
 #, c-format
 msgid "too many arguments for cursor \"%s\""
 msgstr "demasiados argumentos para el cursor «%s»"
 
-#: pl_gram.y:3795
+#: pl_gram.y:3824
 msgid "unrecognized RAISE statement option"
 msgstr "no se reconoce la opción de sentencia RAISE"
 
-#: pl_gram.y:3799
+#: pl_gram.y:3828
 msgid "syntax error, expected \"=\""
 msgstr "error de sintaxis, se esperaba «=»"
 
-#: pl_gram.y:3840
+#: pl_gram.y:3869
 #, c-format
 msgid "too many parameters specified for RAISE"
 msgstr "se especificaron demasiados parámetros a RAISE"
 
-#: pl_gram.y:3844
+#: pl_gram.y:3873
 #, c-format
 msgid "too few parameters specified for RAISE"
 msgstr "se especificaron muy pocos parámetros a RAISE"
 
-#: pl_handler.c:149
+#: pl_handler.c:151
 msgid "Sets handling of conflicts between PL/pgSQL variable names and table column names."
 msgstr "Determina el manejo de conflictos entre nombres de variables PL/pgSQL y nombres de columnas de tablas."
 
-#: pl_handler.c:158
+#: pl_handler.c:160
 msgid "Print information about parameters in the DETAIL part of the error messages generated on INTO ... STRICT failures."
 msgstr "Imprimir información de parámetros en la parte DETALLE de los mensajes de error generados por fallos en INTO ... STRICT."
 
-#: pl_handler.c:166
+#: pl_handler.c:168
 msgid "Perform checks given in ASSERT statements."
 msgstr "Ejecuta las verificaciones en sentencias ASSERT."
 
-#: pl_handler.c:174
+#: pl_handler.c:176
 msgid "List of programming constructs that should produce a warning."
 msgstr "Listado de estructuras de programación que deben dar una advertencia."
 
-#: pl_handler.c:184
+#: pl_handler.c:186
 msgid "List of programming constructs that should produce an error."
 msgstr "Listado de estructuras de programación que deben dar un error."
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:621
+#: pl_scanner.c:622
 #, 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:637
+#: pl_scanner.c:638
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s en o cerca de «%s»"
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/po/fr.po postgresql-9.5-9.5.8/src/pl/plpgsql/src/po/fr.po
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,12 +1,12 @@
 # translation of plpgsql.po to fr_fr
 # french message translation file for plpgsql
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 # Guillaume Lelarge <guillaume@lelarge.info>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2016-02-17 02:37+0000\n"
 "PO-Revision-Date: 2016-02-21 15:45+0100\n"
@@ -14,7 +14,7 @@
 "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-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.8.6\n"
@@ -28,13 +28,13 @@
 #, 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 »"
+"n'a pas pu déterminer le type de retour actuel pour la fonction\n"
+"polymorphique « %s »"
 
 #: pl_comp.c:547
 #, c-format
 msgid "trigger functions can only be called as triggers"
-msgstr "les fonctions triggers peuvent seulement être appelées par des triggers"
+msgstr "les fonctions triggers peuvent seulement être appelées par des triggers"
 
 #: pl_comp.c:551 pl_handler.c:433
 #, c-format
@@ -44,83 +44,83 @@
 #: pl_comp.c:592
 #, c-format
 msgid "trigger functions cannot have declared arguments"
-msgstr "les fonctions triggers ne peuvent pas avoir des arguments déclarés"
+msgstr "les fonctions triggers ne peuvent pas avoir des arguments déclarés"
 
 #: pl_comp.c:593
 #, c-format
 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"
+"Les arguments du trigger peuvent être accédés via TG_NARGS et TG_ARGV à\n"
 "la place."
 
 #: pl_comp.c:695
 #, c-format
 msgid "event trigger functions cannot have declared arguments"
-msgstr "les fonctions triggers sur événement ne peuvent pas avoir des arguments déclarés"
+msgstr "les fonctions triggers sur événement ne peuvent pas avoir des arguments déclarés"
 
 #: pl_comp.c:957
 #, 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"
+msgstr "compilation de la fonction PL/pgsql « %s » près de la ligne %d"
 
 #: pl_comp.c:980
 #, c-format
 msgid "parameter name \"%s\" used more than once"
-msgstr "le nom du paramètre « %s » est utilisé plus d'une fois"
+msgstr "le nom du paramètre « %s » est utilisé plus d'une fois"
 
 #: pl_comp.c:1090
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
-msgstr "la référence à la colonne « %s » est ambigu"
+msgstr "la référence à la colonne « %s » est ambigu"
 
 #: pl_comp.c:1092
 #, c-format
 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"
+"Cela pourrait faire référence à une variable PL/pgsql ou à la colonne d'une\n"
 "table."
 
 #: pl_comp.c:1272 pl_comp.c:1300 pl_exec.c:4447 pl_exec.c:4795 pl_exec.c:4880
 #: pl_exec.c:4971
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
-msgstr "l'enregistrement « %s » n'a pas de champs « %s »"
+msgstr "l'enregistrement « %s » n'a pas de champs « %s »"
 
 #: pl_comp.c:1831
 #, c-format
 msgid "relation \"%s\" does not exist"
-msgstr "la relation « %s » n'existe pas"
+msgstr "la relation « %s » n'existe pas"
 
 #: pl_comp.c:1940
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
-msgstr "la variable « %s » a le pseudo-type %s"
+msgstr "la variable « %s » a le pseudo-type %s"
 
 #: pl_comp.c:2006
 #, c-format
 msgid "relation \"%s\" is not a table"
-msgstr "la relation « %s » n'est pas une table"
+msgstr "la relation « %s » n'est pas une table"
 
 #: pl_comp.c:2166
 #, c-format
 msgid "type \"%s\" is only a shell"
-msgstr "le type « %s » est seulement un shell"
+msgstr "le type « %s » est seulement un shell"
 
 #: pl_comp.c:2255 pl_comp.c:2308
 #, c-format
 msgid "unrecognized exception condition \"%s\""
-msgstr "condition d'exception non reconnue « %s »"
+msgstr "condition d'exception non reconnue « %s »"
 
 #: pl_comp.c:2466
 #, 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 »"
+"n'a pas pu déterminer le type d'argument actuel pour la fonction\n"
+"polymorphique « %s »"
 
 #: pl_exec.c:321 pl_exec.c:614 pl_exec.c:893
 msgid "during initialization of execution state"
-msgstr "durant l'initialisation de l'état de la fonction"
+msgstr "durant l'initialisation de l'état de la fonction"
 
 #: pl_exec.c:328
 msgid "while storing call arguments into local variables"
@@ -128,17 +128,17 @@
 
 #: pl_exec.c:408 pl_exec.c:771
 msgid "during function entry"
-msgstr "durant l'entrée d'une fonction"
+msgstr "durant l'entrée d'une fonction"
 
 #: pl_exec.c:439 pl_exec.c:802 pl_exec.c:934
 #, c-format
 msgid "CONTINUE cannot be used outside a loop"
-msgstr "CONTINUE ne peut pas être utilisé à l'extérieur d'une boucle"
+msgstr "CONTINUE ne peut pas être utilisé à l'extérieur d'une boucle"
 
 #: pl_exec.c:443
 #, c-format
 msgid "control reached end of function without RETURN"
-msgstr "le contrôle a atteint la fin de la fonction sans RETURN"
+msgstr "le contrôle a atteint la fin de la fonction sans RETURN"
 
 #: pl_exec.c:450
 msgid "while casting return value to function's return type"
@@ -148,13 +148,13 @@
 #, c-format
 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"
+"fonction renvoyant un ensemble appelée dans un contexte qui ne peut pas\n"
 "accepter un ensemble"
 
 #: pl_exec.c:501 pl_exec.c:2829
 msgid "returned record type does not match expected record type"
 msgstr ""
-"le type d'enregistrement renvoyé ne correspond pas au type d'enregistrement\n"
+"le type d'enregistrement renvoyé ne correspond pas au type d'enregistrement\n"
 "attendu"
 
 #: pl_exec.c:556 pl_exec.c:810 pl_exec.c:942
@@ -164,17 +164,17 @@
 #: pl_exec.c:806 pl_exec.c:938
 #, c-format
 msgid "control reached end of trigger procedure without RETURN"
-msgstr "le contrôle a atteint la fin de la procédure trigger sans RETURN"
+msgstr "le contrôle a atteint la fin de la procédure trigger sans RETURN"
 
 #: pl_exec.c:815
 #, c-format
 msgid "trigger procedure cannot return a set"
-msgstr "la procédure trigger ne peut pas renvoyer un ensemble"
+msgstr "la procédure trigger ne peut pas renvoyer un ensemble"
 
 #: pl_exec.c:837
 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"
+"la structure de ligne renvoyée ne correspond pas à la structure de la table\n"
 "du trigger"
 
 #. translator: last %s is a phrase such as "during statement block
@@ -197,7 +197,7 @@
 #: pl_exec.c:1012
 #, c-format
 msgid "PL/pgSQL function %s line %d at %s"
-msgstr "fonction PL/pgsql %s, ligne %d à %s"
+msgstr "fonction PL/pgsql %s, ligne %d à %s"
 
 #: pl_exec.c:1018
 #, c-format
@@ -211,11 +211,11 @@
 #: pl_exec.c:1169
 #, 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"
+msgstr "la variable « %s » déclarée NOT NULL ne peut pas valoir NULL par défaut"
 
 #: pl_exec.c:1219
 msgid "during statement block entry"
-msgstr "lors de l'entrée dans le bloc d'instructions"
+msgstr "lors de l'entrée dans le bloc d'instructions"
 
 #: pl_exec.c:1240
 msgid "during statement block exit"
@@ -229,7 +229,7 @@
 #, c-format
 msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
 msgstr ""
-"GET STACKED DIAGNOSTICS ne peut pas être utilisé à l'extérieur d'un gestionnaire\n"
+"GET STACKED DIAGNOSTICS ne peut pas être utilisé à l'extérieur d'un gestionnaire\n"
 "d'exception"
 
 #: pl_exec.c:1838
@@ -245,32 +245,32 @@
 #: pl_exec.c:1993
 #, c-format
 msgid "lower bound of FOR loop cannot be null"
-msgstr "la limite inférieure de la boucle FOR ne peut pas être NULL"
+msgstr "la limite inférieure de la boucle FOR ne peut pas être NULL"
 
 #: pl_exec.c:2009
 #, c-format
 msgid "upper bound of FOR loop cannot be null"
-msgstr "la limite supérieure de la boucle FOR ne peut pas être NULL"
+msgstr "la limite supérieure de la boucle FOR ne peut pas être NULL"
 
 #: pl_exec.c:2027
 #, c-format
 msgid "BY value of FOR loop cannot be null"
-msgstr "la valeur BY d'une boucle FOR ne peut pas être NULL"
+msgstr "la valeur BY d'une boucle FOR ne peut pas être NULL"
 
 #: pl_exec.c:2033
 #, c-format
 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"
+msgstr "la valeur BY d'une boucle FOR doit être plus grande que zéro"
 
 #: pl_exec.c:2203 pl_exec.c:3963
 #, c-format
 msgid "cursor \"%s\" already in use"
-msgstr "curseur « %s » déjà en cours d'utilisation"
+msgstr "curseur « %s » déjà en cours d'utilisation"
 
 #: pl_exec.c:2226 pl_exec.c:4025
 #, c-format
 msgid "arguments given for cursor without arguments"
-msgstr "arguments donnés pour le curseur sans arguments"
+msgstr "arguments donnés pour le curseur sans arguments"
 
 #: pl_exec.c:2245 pl_exec.c:4044
 #, c-format
@@ -280,7 +280,7 @@
 #: pl_exec.c:2330
 #, c-format
 msgid "FOREACH expression must not be null"
-msgstr "l'expression FOREACH ne doit pas être NULL"
+msgstr "l'expression FOREACH ne doit pas être NULL"
 
 #: pl_exec.c:2336
 #, c-format
@@ -295,17 +295,17 @@
 #: pl_exec.c:2380
 #, c-format
 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"
+msgstr "la variable d'une boucle FOREACH ... SLICE doit être d'un type tableau"
 
 #: pl_exec.c:2384
 #, c-format
 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"
+msgstr "la valeur d'une boucle FOREACH ne doit pas être de type tableau"
 
 #: pl_exec.c:2572 pl_exec.c:2654 pl_exec.c:2821
 #, c-format
 msgid "cannot return non-composite value from function returning composite type"
-msgstr "ne peut pas renvoyer de valeurs non composites à partir d'une fonction renvoyant un type composite"
+msgstr "ne peut pas renvoyer de valeurs non composites à partir d'une fonction renvoyant un type composite"
 
 #: pl_exec.c:2698 pl_gram.y:3112
 #, c-format
@@ -315,29 +315,29 @@
 #: pl_exec.c:2732 pl_exec.c:2863
 #, c-format
 msgid "wrong result type supplied in RETURN NEXT"
-msgstr "mauvais type de résultat fourni dans RETURN NEXT"
+msgstr "mauvais type de résultat fourni dans RETURN NEXT"
 
 #: pl_exec.c:2761 pl_exec.c:4434 pl_exec.c:4762 pl_exec.c:4788 pl_exec.c:4854
 #: pl_exec.c:4873 pl_exec.c:4941 pl_exec.c:4964
 #, c-format
 msgid "record \"%s\" is not assigned yet"
-msgstr "l'enregistrement « %s » n'est pas encore affectée"
+msgstr "l'enregistrement « %s » n'est pas encore affectée"
 
 #: pl_exec.c:2763 pl_exec.c:4436 pl_exec.c:4764 pl_exec.c:4790 pl_exec.c:4856
 #: pl_exec.c:4875 pl_exec.c:4943 pl_exec.c:4966
 #, c-format
 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."
+msgstr "La structure de ligne d'un enregistrement pas encore affecté est indéterminée."
 
 #: pl_exec.c:2767 pl_exec.c:2787
 #, c-format
 msgid "wrong record type supplied in RETURN NEXT"
-msgstr "mauvais type d'enregistrement fourni à RETURN NEXT"
+msgstr "mauvais type d'enregistrement fourni à RETURN NEXT"
 
 #: pl_exec.c:2882
 #, c-format
 msgid "RETURN NEXT must have a parameter"
-msgstr "RETURN NEXT doit avoir un paramètre"
+msgstr "RETURN NEXT doit avoir un paramètre"
 
 #: pl_exec.c:2915 pl_gram.y:3174
 #, c-format
@@ -346,24 +346,24 @@
 
 #: pl_exec.c:2935
 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"
+msgstr "la structure de la requête ne correspond pas au type de résultat de la fonction"
 
 #: pl_exec.c:3015 pl_exec.c:3145
 #, c-format
 msgid "RAISE option already specified: %s"
-msgstr "option RAISE déjà spécifiée : %s"
+msgstr "option RAISE déjà spécifiée : %s"
 
 #: pl_exec.c:3048
 #, c-format
 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"
+"RAISE sans paramètre ne peut pas être utilisé sans un gestionnaire\n"
 "d'exception"
 
 #: pl_exec.c:3135
 #, c-format
 msgid "RAISE statement option cannot be null"
-msgstr "l'option de l'instruction RAISE ne peut pas être NULL"
+msgstr "l'option de l'instruction RAISE ne peut pas être NULL"
 
 #: pl_exec.c:3206
 #, c-format
@@ -373,7 +373,7 @@
 #: pl_exec.c:3279
 #, c-format
 msgid "assertion failed"
-msgstr "échec de l'assertion"
+msgstr "échec de l'assertion"
 
 #: pl_exec.c:3469 pl_exec.c:3613 pl_exec.c:3802
 #, c-format
@@ -388,57 +388,57 @@
 #: pl_exec.c:3474 pl_exec.c:3618 pl_exec.c:3807
 #, c-format
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
-msgstr "Utiliser un bloc BEGIN dans une clause EXCEPTION à la place."
+msgstr "Utiliser un bloc BEGIN dans une clause EXCEPTION à la place."
 
 #: pl_exec.c:3641 pl_exec.c:3831
 #, c-format
 msgid "INTO used with a command that cannot return data"
-msgstr "INTO utilisé dans une commande qui ne peut pas envoyer de données"
+msgstr "INTO utilisé dans une commande qui ne peut pas envoyer de données"
 
 #: pl_exec.c:3669 pl_exec.c:3859
 #, c-format
 msgid "query returned no rows"
-msgstr "la requête n'a renvoyé aucune ligne"
+msgstr "la requête n'a renvoyé aucune ligne"
 
 #: pl_exec.c:3688 pl_exec.c:3878
 #, c-format
 msgid "query returned more than one row"
-msgstr "la requête a renvoyé plus d'une ligne"
+msgstr "la requête a renvoyé plus d'une ligne"
 
 #: pl_exec.c:3705
 #, c-format
 msgid "query has no destination for result data"
-msgstr "la requête n'a pas de destination pour les données résultantes"
+msgstr "la requête n'a pas de destination pour les données résultantes"
 
 #: pl_exec.c:3706
 #, c-format
 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."
+msgstr "Si vous voulez annuler les résultats d'un SELECT, utilisez PERFORM à la place."
 
 #: pl_exec.c:3738 pl_exec.c:7026
 #, c-format
 msgid "query string argument of EXECUTE is null"
-msgstr "l'argument de la requête de EXECUTE est NULL"
+msgstr "l'argument de la requête de EXECUTE est NULL"
 
 #: pl_exec.c:3794
 #, c-format
 msgid "EXECUTE of SELECT ... INTO is not implemented"
-msgstr "EXECUTE de SELECT ... INTO n'est pas implanté"
+msgstr "EXECUTE de SELECT ... INTO n'est pas implanté"
 
 #: pl_exec.c:3795
 #, c-format
 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."
+msgstr "Vous pouvez aussi utiliser EXECUTE ... INTO ou EXECUTE CREATE TABLE ... AS à la place."
 
 #: pl_exec.c:4105 pl_exec.c:4197
 #, c-format
 msgid "cursor variable \"%s\" is null"
-msgstr "la variable du curseur « %s » est NULL"
+msgstr "la variable du curseur « %s » est NULL"
 
 #: pl_exec.c:4112 pl_exec.c:4204
 #, c-format
 msgid "cursor \"%s\" does not exist"
-msgstr "le curseur « %s » n'existe pas"
+msgstr "le curseur « %s » n'existe pas"
 
 #: pl_exec.c:4126
 #, c-format
@@ -449,23 +449,23 @@
 #, 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"
+"une valeur NULL ne peut pas être affectée à la variable « %s » déclarée\n"
 "non NULL"
 
 #: pl_exec.c:4378
 #, c-format
 msgid "cannot assign non-composite value to a row variable"
-msgstr "ne peut pas affecter une valeur non composite à une variable de type ROW"
+msgstr "ne peut pas affecter une valeur non composite à une variable de type ROW"
 
 #: pl_exec.c:4402
 #, c-format
 msgid "cannot assign non-composite value to a record variable"
-msgstr "ne peut pas affecter une valeur non composite à une variable RECORD"
+msgstr "ne peut pas affecter une valeur non composite à une variable RECORD"
 
 #: pl_exec.c:4545
 #, 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)"
+msgstr "le nombre de dimensions du tableau (%d) dépasse la maximum autorisé (%d)"
 
 #: pl_exec.c:4577
 #, c-format
@@ -475,29 +475,29 @@
 #: pl_exec.c:4614
 #, c-format
 msgid "array subscript in assignment must not be null"
-msgstr "un indice de tableau dans une affectation ne peut pas être NULL"
+msgstr "un indice de tableau dans une affectation ne peut pas être NULL"
 
 #: pl_exec.c:5080
 #, c-format
 msgid "query \"%s\" did not return data"
-msgstr "la requête « %s » ne renvoie pas de données"
+msgstr "la requête « %s » ne renvoie pas de données"
 
 #: pl_exec.c:5088
 #, 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"
+msgstr[0] "la requête « %s » a renvoyé %d colonne"
+msgstr[1] "la requête « %s » a renvoyé %d colonnes"
 
 #: pl_exec.c:5115
 #, c-format
 msgid "query \"%s\" returned more than one row"
-msgstr "la requête « %s » a renvoyé plus d'une ligne"
+msgstr "la requête « %s » a renvoyé plus d'une ligne"
 
 #: pl_exec.c:5170
 #, c-format
 msgid "query \"%s\" is not a SELECT"
-msgstr "la requête « %s » n'est pas un SELECT"
+msgstr "la requête « %s » n'est pas un SELECT"
 
 #: pl_funcs.c:218
 msgid "statement block"
@@ -509,7 +509,7 @@
 
 #: pl_funcs.c:230
 msgid "FOR with integer loop variable"
-msgstr "variable entière de boucle FOR"
+msgstr "variable entière de boucle FOR"
 
 #: pl_funcs.c:232
 msgid "FOR over SELECT rows"
@@ -534,66 +534,66 @@
 #: pl_gram.y:472
 #, c-format
 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"
+msgstr "le label du bloc doit être placé avant DECLARE, et non pas après"
 
 #: pl_gram.y:492
 #, c-format
 msgid "collations are not supported by type %s"
-msgstr "les collationnements ne sont pas supportés par le type %s"
+msgstr "les collationnements ne sont pas supportés par le type %s"
 
 #: pl_gram.y:507
 #, c-format
 msgid "row or record variable cannot be CONSTANT"
-msgstr "la variable ROW ou RECORD ne peut pas être CONSTANT"
+msgstr "la variable ROW ou RECORD ne peut pas être CONSTANT"
 
 #: pl_gram.y:517
 #, c-format
 msgid "row or record variable cannot be NOT NULL"
-msgstr "la variable ROW ou RECORD ne peut pas être NOT NULL"
+msgstr "la variable ROW ou RECORD ne peut pas être NOT NULL"
 
 #: pl_gram.y:528
 #, c-format
 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"
+msgstr "la valeur par défaut de variable ROW ou RECORD n'est pas supportée"
 
 #: pl_gram.y:673 pl_gram.y:688 pl_gram.y:714
 #, c-format
 msgid "variable \"%s\" does not exist"
-msgstr "la variable « %s » n'existe pas"
+msgstr "la variable « %s » n'existe pas"
 
 #: pl_gram.y:732 pl_gram.y:760
 msgid "duplicate declaration"
-msgstr "déclaration dupliquée"
+msgstr "déclaration dupliquée"
 
 #: pl_gram.y:743 pl_gram.y:771
 #, c-format
 msgid "variable \"%s\" shadows a previously defined variable"
-msgstr "la variable « %s » cache une variable définie précédemment"
+msgstr "la variable « %s » cache une variable définie précédemment"
 
 #: pl_gram.y:950
 #, c-format
 msgid "diagnostics item %s is not allowed in GET STACKED DIAGNOSTICS"
-msgstr "l'élément %s de diagnostique l'est pas autorisé dans GET STACKED DIAGNOSTICS"
+msgstr "l'élément %s de diagnostique l'est pas autorisé dans GET STACKED DIAGNOSTICS"
 
 #: pl_gram.y:968
 #, c-format
 msgid "diagnostics item %s is not allowed in GET CURRENT DIAGNOSTICS"
-msgstr "l'élément %s de diagnostique l'est pas autorisé dans GET CURRENT DIAGNOSTICS"
+msgstr "l'élément %s de diagnostique l'est pas autorisé dans GET CURRENT DIAGNOSTICS"
 
 #: pl_gram.y:1066
 msgid "unrecognized GET DIAGNOSTICS item"
-msgstr "élément GET DIAGNOSTICS non reconnu"
+msgstr "élément GET DIAGNOSTICS non reconnu"
 
 #: pl_gram.y:1077 pl_gram.y:3361
 #, c-format
 msgid "\"%s\" is not a scalar variable"
-msgstr "« %s » n'est pas une variable scalaire"
+msgstr "« %s » n'est pas une variable scalaire"
 
 #: pl_gram.y:1329 pl_gram.y:1523
 #, c-format
 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"
+"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"
 
 #: pl_gram.y:1363
@@ -604,7 +604,7 @@
 #: pl_gram.y:1370
 #, c-format
 msgid "cursor FOR loop must use a bound cursor variable"
-msgstr "le curseur de la boucle FOR doit utiliser une variable curseur limité"
+msgstr "le curseur de la boucle FOR doit utiliser une variable curseur limité"
 
 #: pl_gram.y:1454
 #, c-format
@@ -614,17 +614,17 @@
 #: pl_gram.y:1490
 #, c-format
 msgid "cannot specify REVERSE in query FOR loop"
-msgstr "ne peut pas spécifier REVERSE dans la requête de la boucle FOR"
+msgstr "ne peut pas spécifier REVERSE dans la requête de la boucle FOR"
 
 #: pl_gram.y:1637
 #, c-format
 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"
+msgstr "la variable d'une boucle FOREACH doit être une variable connue ou une liste de variables"
 
 #: pl_gram.y:1689 pl_gram.y:1726 pl_gram.y:1774 pl_gram.y:2814 pl_gram.y:2896
 #: pl_gram.y:3007 pl_gram.y:3763
 msgid "unexpected end of function definition"
-msgstr "définition inattendue de la fin de fonction"
+msgstr "définition inattendue de la fin de fonction"
 
 #: pl_gram.y:1794 pl_gram.y:1818 pl_gram.y:1834 pl_gram.y:1840 pl_gram.y:1954
 #: pl_gram.y:1962 pl_gram.y:1976 pl_gram.y:2071 pl_gram.y:2252 pl_gram.y:2335
@@ -638,7 +638,7 @@
 
 #: pl_gram.y:2018
 msgid "syntax error, expected \"FOR\""
-msgstr "erreur de syntaxe, « FOR » attendu"
+msgstr "erreur de syntaxe, « FOR » attendu"
 
 #: pl_gram.y:2080
 #, c-format
@@ -648,12 +648,12 @@
 #: pl_gram.y:2136
 #, c-format
 msgid "cursor variable must be a simple variable"
-msgstr "la variable de curseur doit être une variable simple"
+msgstr "la variable de curseur doit être une variable simple"
 
 #: pl_gram.y:2142
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
-msgstr "la variable « %s » doit être de type cursor ou refcursor"
+msgstr "la variable « %s » doit être de type cursor ou refcursor"
 
 #: pl_gram.y:2310
 msgid "label does not exist"
@@ -662,21 +662,21 @@
 #: pl_gram.y:2457 pl_gram.y:2468
 #, c-format
 msgid "\"%s\" is not a known variable"
-msgstr "« %s » n'est pas une variable connue"
+msgstr "« %s » n'est pas une variable connue"
 
 #: pl_gram.y:2572 pl_gram.y:2582 pl_gram.y:2738
 msgid "mismatched parentheses"
-msgstr "parenthèses non correspondantes"
+msgstr "parenthèses non correspondantes"
 
 #: pl_gram.y:2586
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
-msgstr "« %s » manquant à la fin de l'expression SQL"
+msgstr "« %s » manquant à la fin de l'expression SQL"
 
 #: pl_gram.y:2592
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
-msgstr "« %s » manquant à la fin de l'instruction SQL"
+msgstr "« %s » manquant à la fin de l'instruction SQL"
 
 #: pl_gram.y:2609
 msgid "missing expression"
@@ -688,15 +688,15 @@
 
 #: pl_gram.y:2740
 msgid "incomplete data type declaration"
-msgstr "déclaration incomplète d'un type de données"
+msgstr "déclaration incomplète d'un type de données"
 
 #: pl_gram.y:2763
 msgid "missing data type declaration"
-msgstr "déclaration manquante d'un type de données"
+msgstr "déclaration manquante d'un type de données"
 
 #: pl_gram.y:2819
 msgid "INTO specified more than once"
-msgstr "INTO spécifié plus d'une fois"
+msgstr "INTO spécifié plus d'une fois"
 
 #: pl_gram.y:2988
 msgid "expected FROM or IN"
@@ -705,7 +705,7 @@
 #: pl_gram.y:3048
 #, c-format
 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"
+msgstr "RETURN ne peut pas avoir un paramètre dans une fonction renvoyant un ensemble"
 
 #: pl_gram.y:3049
 #, c-format
@@ -715,76 +715,76 @@
 #: pl_gram.y:3057
 #, c-format
 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"
+msgstr "RETURN ne peut pas avoir un paramètre dans une fonction avec des paramètres OUT"
 
 #: pl_gram.y:3066
 #, c-format
 msgid "RETURN cannot have a parameter in function returning void"
-msgstr "RETURN ne peut pas avoir un paramètre dans une fonction renvoyant void"
+msgstr "RETURN ne peut pas avoir un paramètre dans une fonction renvoyant void"
 
 #: pl_gram.y:3126
 #, c-format
 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"
+"RETURN NEXT ne peut pas avoir un paramètre dans une fonction avec des\n"
+"paramètres OUT"
 
 #: pl_gram.y:3230
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
-msgstr "« %s » est déclaré CONSTANT"
+msgstr "« %s » est déclaré CONSTANT"
 
 #: pl_gram.y:3292 pl_gram.y:3304
 #, c-format
 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"
+"la variable de type RECORD ou ROW ne peut pas faire partie d'une liste INTO à\n"
+"plusieurs éléments"
 
 #: pl_gram.y:3349
 #, c-format
 msgid "too many INTO variables specified"
-msgstr "trop de variables INTO indiquées"
+msgstr "trop de variables INTO indiquées"
 
 #: pl_gram.y:3557
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
-msgstr "label de fin « %s » spécifié pour un bloc sans label"
+msgstr "label de fin « %s » spécifié pour un bloc sans label"
 
 #: pl_gram.y:3564
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
-msgstr "label de fin « %s » différent du label « %s » du bloc"
+msgstr "label de fin « %s » différent du label « %s » du bloc"
 
 #: pl_gram.y:3599
 #, c-format
 msgid "cursor \"%s\" has no arguments"
-msgstr "le curseur « %s » n'a pas d'arguments"
+msgstr "le curseur « %s » n'a pas d'arguments"
 
 #: pl_gram.y:3613
 #, c-format
 msgid "cursor \"%s\" has arguments"
-msgstr "le curseur « %s » a des arguments"
+msgstr "le curseur « %s » a des arguments"
 
 #: pl_gram.y:3655
 #, c-format
 msgid "cursor \"%s\" has no argument named \"%s\""
-msgstr "le curseur « %s » n'a pas d'argument nommé « %s »"
+msgstr "le curseur « %s » n'a pas d'argument nommé « %s »"
 
 #: pl_gram.y:3675
 #, c-format
 msgid "value for parameter \"%s\" of cursor \"%s\" specified more than once"
-msgstr "la valeur du paramètre « %s » pour le curseur « %s » est spécifiée plus d'une fois"
+msgstr "la valeur du paramètre « %s » pour le curseur « %s » est spécifiée plus d'une fois"
 
 #: pl_gram.y:3700
 #, c-format
 msgid "not enough arguments for cursor \"%s\""
-msgstr "pas assez d'arguments pour le curseur « %s »"
+msgstr "pas assez d'arguments pour le curseur « %s »"
 
 #: pl_gram.y:3707
 #, c-format
 msgid "too many arguments for cursor \"%s\""
-msgstr "trop d'arguments pour le curseur « %s »"
+msgstr "trop d'arguments pour le curseur « %s »"
 
 #: pl_gram.y:3795
 msgid "unrecognized RAISE statement option"
@@ -792,17 +792,17 @@
 
 #: pl_gram.y:3799
 msgid "syntax error, expected \"=\""
-msgstr "erreur de syntaxe, « = » attendu"
+msgstr "erreur de syntaxe, « = » attendu"
 
 #: pl_gram.y:3840
 #, c-format
 msgid "too many parameters specified for RAISE"
-msgstr "trop de paramètres pour RAISE"
+msgstr "trop de paramètres pour RAISE"
 
 #: pl_gram.y:3844
 #, c-format
 msgid "too few parameters specified for RAISE"
-msgstr "trop peu de paramètres pour RAISE"
+msgstr "trop peu de paramètres pour RAISE"
 
 #: pl_handler.c:149
 msgid "Sets handling of conflicts between PL/pgSQL variable names and table column names."
@@ -810,11 +810,11 @@
 
 #: pl_handler.c:158
 msgid "Print information about parameters in the DETAIL part of the error messages generated on INTO ... STRICT failures."
-msgstr "Affiche des informations sur les paramètres dans la partie DETAIL des messages d'erreur générés pour des échecs INTO .. STRICT."
+msgstr "Affiche des informations sur les paramètres dans la partie DETAIL des messages d'erreur générés pour des échecs INTO .. STRICT."
 
 #: pl_handler.c:166
 msgid "Perform checks given in ASSERT statements."
-msgstr "Réalise les vérifications données dans les instructions ASSERT."
+msgstr "Réalise les vérifications données dans les instructions ASSERT."
 
 #: pl_handler.c:174
 msgid "List of programming constructs that should produce a warning."
@@ -828,13 +828,13 @@
 #: pl_scanner.c:621
 #, c-format
 msgid "%s at end of input"
-msgstr "%s à la fin de l'entrée"
+msgstr "%s à la fin de l'entrée"
 
 #. translator: first %s is typically the translation of "syntax error"
 #: pl_scanner.c:637
 #, c-format
 msgid "%s at or near \"%s\""
-msgstr "%s sur ou près de « %s »"
+msgstr "%s sur ou près de « %s »"
 
 #~ msgid "RETURN must specify a record or row variable in function returning row"
 #~ msgstr ""
@@ -847,34 +847,34 @@
 #~ "renvoyant une ligne"
 
 #~ msgid "unterminated dollar-quoted string"
-#~ msgstr "chaîne entre dollars non terminée"
+#~ msgstr "chaîne entre dollars non terminée"
 
 #~ msgid "unterminated quoted string"
-#~ msgstr "chaîne entre guillemets non terminée"
+#~ msgstr "chaîne entre guillemets non terminée"
 
 #~ msgid "unterminated /* comment"
-#~ msgstr "commentaire /* non terminé"
+#~ msgstr "commentaire /* non terminé"
 
 #~ msgid "unterminated quoted identifier"
-#~ msgstr "identifiant entre guillemets non terminé"
+#~ msgstr "identifiant entre guillemets non terminé"
 
 #~ msgid "qualified identifier cannot be used here: %s"
-#~ msgstr "l'identifiant qualifié ne peut pas être utilisé ici : %s"
+#~ msgstr "l'identifiant qualifié ne peut pas être utilisé ici : %s"
 
 #~ msgid "unterminated \" in identifier: %s"
-#~ msgstr "\" non terminé dans l'identifiant : %s"
+#~ msgstr "\" non terminé dans l'identifiant : %s"
 
 #~ msgid "variable \"%s\" does not exist in the current block"
-#~ msgstr "la variable « %s » n'existe pas dans le bloc actuel"
+#~ msgstr "la variable « %s » n'existe pas dans le bloc actuel"
 
 #~ msgid "expected \")\""
-#~ msgstr "« ) » attendu"
+#~ msgstr "« ) » attendu"
 
 #~ 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"
+#~ msgstr "chaîne littérale dans la fonction PL/pgsql « %s » près de la ligne %d"
 
 #~ 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 "Expected record variable, row variable, or list of scalar variables following INTO."
 #~ msgstr ""
@@ -882,68 +882,68 @@
 #~ "suivant INTO."
 
 #~ msgid "cannot assign to tg_argv"
-#~ msgstr "ne peut pas affecter à tg_argv"
+#~ msgstr "ne peut pas affecter à tg_argv"
 
 #~ 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"
+#~ "RETURN ne peut pas avoir un paramètre dans une fonction renvoyant des\n"
 #~ "lignes ; utilisez RETURN NEXT ou RETURN QUERY"
 
 #~ msgid "too many variables specified in SQL statement"
-#~ msgstr "trop de variables spécifiées dans l'instruction SQL"
+#~ msgstr "trop de variables spécifiées dans l'instruction SQL"
 
 #~ msgid "expected a cursor or refcursor variable"
 #~ msgstr "attendait une variable de type cursor ou refcursor"
 
 #~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
-#~ msgstr "Attendait « FOR » pour ouvrir un curseur pour une variable sans limite."
+#~ msgstr "Attendait « FOR » pour ouvrir un curseur pour une variable sans limite."
 
 #~ msgid "syntax error at \"%s\""
-#~ msgstr "erreur de syntaxe à « %s »"
+#~ msgstr "erreur de syntaxe à « %s »"
 
 #~ msgid "expected an integer variable"
-#~ msgstr "attend une variable entière"
+#~ msgstr "attend une variable entière"
 
 #~ msgid "function has no parameter \"%s\""
-#~ msgstr "la fonction n'a pas de paramètre « %s »"
+#~ msgstr "la fonction n'a pas de paramètre « %s »"
 
 #~ msgid "only positional parameters can be aliased"
-#~ msgstr "seuls les paramètres de position peuvent avoir un alias"
+#~ msgstr "seuls les paramètres de position peuvent avoir un alias"
 
 #~ 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 »."
+#~ msgstr "Le type %s renvoyé ne correspond pas au type %s attendu dans la colonne « %s »."
 
 #~ 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"
+#~ "Le nombre de colonnes renvoyées (%d) ne correspond pas au nombre de colonnes\n"
 #~ "attendues (%d)."
 
 #~ msgid "N/A (dropped column)"
-#~ msgstr "N/A (colonne supprimée)"
+#~ msgstr "N/A (colonne supprimée)"
 
 #~ 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"
+#~ msgstr "le type de tg_argv[%d] 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"
+#~ msgstr "le type de « %s.%s » ne correspond pas à ce qui est préparé dans le plan"
 
 #~ 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"
+#~ msgstr "le type de « %s » ne correspond pas à ce qui est préparé dans le plan"
 
 #~ msgid "expected \"[\""
-#~ msgstr "« [ » attendu"
+#~ msgstr "« [ » attendu"
 
 #~ msgid "row \"%s.%s\" has no field \"%s\""
-#~ msgstr "la ligne « %s.%s » n'a aucun champ « %s »"
+#~ msgstr "la ligne « %s.%s » n'a aucun champ « %s »"
 
 #~ msgid "row \"%s\" has no field \"%s\""
-#~ msgstr "la ligne « %s » n'a aucun champ « %s »"
+#~ msgstr "la ligne « %s » n'a aucun champ « %s »"
 
 #~ msgid "cursor \"%s\" closed unexpectedly"
-#~ msgstr "le curseur « %s » a été fermé de façon inattendu"
+#~ msgstr "le curseur « %s » a été fermé de façon inattendu"
 
 #~ msgid "relation \"%s.%s\" does not exist"
-#~ msgstr "la relation « %s.%s » n'existe pas"
+#~ msgstr "la relation « %s.%s » n'existe pas"
 
 #~ msgid "EXECUTE statement"
 #~ msgstr "instruction EXECUTE"
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/po/it.po postgresql-9.5-9.5.8/src/pl/plpgsql/src/po/it.po
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: plpgsql (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-06 14:37+0000\n"
+"POT-Creation-Date: 2016-04-12 00:37+0000\n"
 "PO-Revision-Date: 2015-07-07 03:18+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
@@ -31,154 +31,154 @@
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: pl_comp.c:432 pl_handler.c:448
+#: pl_comp.c:436 pl_handler.c:448
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "Le funzioni PL/pgSQL non accettano il tipo %s"
 
-#: pl_comp.c:513
+#: pl_comp.c:517
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr "determinazione del tipo di ritorno reale per la funzione polimorfa \"%s\" fallita"
 
-#: pl_comp.c:543
+#: pl_comp.c:547
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "le funzioni trigger possono essere chiamate esclusivamente da trigger"
 
-#: pl_comp.c:547 pl_handler.c:433
+#: pl_comp.c:551 pl_handler.c:433
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "Le funzioni PL/pgSQL non possono restituire un tipo %s"
 
-#: pl_comp.c:588
+#: pl_comp.c:592
 #, c-format
 msgid "trigger functions cannot have declared arguments"
 msgstr "Le funzioni trigger non possono avere argomenti dichiarati"
 
-#: pl_comp.c:589
+#: pl_comp.c:593
 #, c-format
 msgid "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead."
 msgstr "Gli argomenti del trigger possono essere acceduti tramite TG_NARGS e TG_ARGV invece."
 
-#: pl_comp.c:691
+#: pl_comp.c:695
 #, c-format
 msgid "event trigger functions cannot have declared arguments"
 msgstr "le funzioni trigger di evento non possono avere argomenti dichiarati"
 
-#: pl_comp.c:944
+#: pl_comp.c:957
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "compilazione della funzione PL/pgSQL \"%s\" in prossimità della riga %d"
 
-#: pl_comp.c:967
+#: pl_comp.c:980
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "il nome di parametro \"%s\" è usato più di una volta"
 
-#: pl_comp.c:1077
+#: pl_comp.c:1090
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "il riferimento alla colonna \"%s\" è ambiguo"
 
-#: pl_comp.c:1079
+#: pl_comp.c:1092
 #, c-format
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr "Può riferirsi o ad una variabile PL/pgSQL o ad una colonna di tabella."
 
-#: pl_comp.c:1259 pl_comp.c:1287 pl_exec.c:4373 pl_exec.c:4722 pl_exec.c:4807
-#: pl_exec.c:4898
+#: pl_comp.c:1272 pl_comp.c:1300 pl_exec.c:4447 pl_exec.c:4795 pl_exec.c:4880
+#: pl_exec.c:4971
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "il record \"%s\" non ha un campo \"%s\""
 
-#: pl_comp.c:1818
+#: pl_comp.c:1831
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "la relazione \"%s\" non esiste"
 
-#: pl_comp.c:1927
+#: pl_comp.c:1940
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "la variabile \"%s\" ha lo pseudo-tipo %s"
 
-#: pl_comp.c:1994
+#: pl_comp.c:2006
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "la relazione \"%s\" non è una tabella"
 
-#: pl_comp.c:2154
+#: pl_comp.c:2166
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "il tipo \"%s\" non è completamente definito"
 
-#: pl_comp.c:2243 pl_comp.c:2296
+#: pl_comp.c:2255 pl_comp.c:2308
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "condizione di eccezione \"%s\" sconosciuta"
 
-#: pl_comp.c:2503
+#: pl_comp.c:2466
 #, c-format
 msgid "could not determine actual argument type for polymorphic function \"%s\""
 msgstr "il tipo reale dell'argomento non è determinabile per la funzione polimorfa \"%s\""
 
-#: pl_exec.c:301 pl_exec.c:599 pl_exec.c:869
+#: pl_exec.c:321 pl_exec.c:614 pl_exec.c:893
 msgid "during initialization of execution state"
 msgstr "durante l'inizializzazione dello stato di esecuzione"
 
-#: pl_exec.c:308
+#: pl_exec.c:328
 msgid "while storing call arguments into local variables"
 msgstr "durante la memorizzazione degli argomenti di chiamata in variabili locali"
 
-#: pl_exec.c:393 pl_exec.c:747
+#: pl_exec.c:408 pl_exec.c:771
 msgid "during function entry"
 msgstr "durante l'ingresso nella funzione"
 
-#: pl_exec.c:424 pl_exec.c:778 pl_exec.c:906
+#: pl_exec.c:439 pl_exec.c:802 pl_exec.c:934
 #, c-format
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE non può essere usato all'esterno di un ciclo"
 
-#: pl_exec.c:428
+#: pl_exec.c:443
 #, c-format
 msgid "control reached end of function without RETURN"
 msgstr "il controllo ha raggiunto la fine di una funzione senza incontrare alcun RETURN"
 
-#: pl_exec.c:435
+#: pl_exec.c:450
 msgid "while casting return value to function's return type"
 msgstr "durante la conversione del valore da restituire nel tipo restituito della funzione"
 
-#: pl_exec.c:448 pl_exec.c:2948
+#: pl_exec.c:463 pl_exec.c:2987
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "la funzione che restituisce insiemi è chiamata in un contesto che non può accettare un insieme"
 
-#: pl_exec.c:486 pl_exec.c:2790
+#: pl_exec.c:501 pl_exec.c:2829
 msgid "returned record type does not match expected record type"
 msgstr "il tipo del record restituito non coincide con quello atteso"
 
-#: pl_exec.c:541 pl_exec.c:786 pl_exec.c:914
+#: pl_exec.c:556 pl_exec.c:810 pl_exec.c:942
 msgid "during function exit"
 msgstr "durante l'uscita della funzione"
 
-#: pl_exec.c:782 pl_exec.c:910
+#: pl_exec.c:806 pl_exec.c:938
 #, c-format
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "il controllo ha raggiunto la fine di una procedura trigger senza incontrare alcun RETURN"
 
-#: pl_exec.c:791
+#: pl_exec.c:815
 #, c-format
 msgid "trigger procedure cannot return a set"
 msgstr "la procedura trigger non può restituire un insieme"
 
-#: pl_exec.c:813
+#: pl_exec.c:837
 msgid "returned row structure does not match the structure of the triggering table"
 msgstr "la struttura della riga restituita non coincide con la struttura della tabella che ha generato il trigger"
 
 #. translator: last %s is a phrase such as "during statement block
 #. local variable initialization"
 #.
-#: pl_exec.c:965
+#: pl_exec.c:993
 #, c-format
 msgid "PL/pgSQL function %s line %d %s"
 msgstr "funzione PL/pgSQL %s riga %d %s"
@@ -186,307 +186,307 @@
 #. translator: last %s is a phrase such as "while storing call
 #. arguments into local variables"
 #.
-#: pl_exec.c:976
+#: pl_exec.c:1004
 #, c-format
 msgid "PL/pgSQL function %s %s"
 msgstr "funzione PL/pgSQL %s %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:984
+#: pl_exec.c:1012
 #, c-format
 msgid "PL/pgSQL function %s line %d at %s"
 msgstr "funzione PL/pgSQL %s riga %d a %s"
 
-#: pl_exec.c:990
+#: pl_exec.c:1018
 #, c-format
 msgid "PL/pgSQL function %s"
 msgstr "funzione PL/pgSQL %s"
 
-#: pl_exec.c:1100
+#: pl_exec.c:1129
 msgid "during statement block local variable initialization"
 msgstr "durante l'inizializzazione di variabili locali del blocco di istruzioni"
 
-#: pl_exec.c:1139
+#: pl_exec.c:1169
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr "la variabile \"%s\" dichiarata NOT NULL non può avere valore predefinito NULL"
 
-#: pl_exec.c:1189
+#: pl_exec.c:1219
 msgid "during statement block entry"
 msgstr "durante l'entrata nel blocco di istruzioni"
 
-#: pl_exec.c:1210
+#: pl_exec.c:1240
 msgid "during statement block exit"
 msgstr "durante l'uscita dal blocco di istruzioni"
 
-#: pl_exec.c:1253
+#: pl_exec.c:1283
 msgid "during exception cleanup"
 msgstr "durante la pulizia delle eccezioni"
 
-#: pl_exec.c:1604
+#: pl_exec.c:1634
 #, c-format
 msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
 msgstr "GET STACKED DIAGNOSTICS non può essere usato fuori da un gestore di eccezioni"
 
-#: pl_exec.c:1800
+#: pl_exec.c:1838
 #, c-format
 msgid "case not found"
 msgstr "caso non trovato"
 
-#: pl_exec.c:1801
+#: pl_exec.c:1839
 #, c-format
 msgid "CASE statement is missing ELSE part."
 msgstr "all'istruzione CASE manca la parte ELSE."
 
-#: pl_exec.c:1955
+#: pl_exec.c:1993
 #, c-format
 msgid "lower bound of FOR loop cannot be null"
 msgstr "il limite inferiore di un ciclo FOR non può essere nullo"
 
-#: pl_exec.c:1971
+#: pl_exec.c:2009
 #, c-format
 msgid "upper bound of FOR loop cannot be null"
 msgstr "il limite superiore di un ciclo FOR non può essere null"
 
-#: pl_exec.c:1989
+#: pl_exec.c:2027
 #, c-format
 msgid "BY value of FOR loop cannot be null"
 msgstr "il valore BY di un ciclo FOR non può essere null"
 
-#: pl_exec.c:1995
+#: pl_exec.c:2033
 #, c-format
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "il valore BY di un ciclo FOR deve essere maggiore di zero"
 
-#: pl_exec.c:2164 pl_exec.c:3890
+#: pl_exec.c:2203 pl_exec.c:3963
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "il cursore \"%s\" è già in uso"
 
-#: pl_exec.c:2187 pl_exec.c:3952
+#: pl_exec.c:2226 pl_exec.c:4025
 #, c-format
 msgid "arguments given for cursor without arguments"
 msgstr "sono stati passati argomenti al cursore che non ne accetta"
 
-#: pl_exec.c:2206 pl_exec.c:3971
+#: pl_exec.c:2245 pl_exec.c:4044
 #, c-format
 msgid "arguments required for cursor"
 msgstr "sono richiesti argomenti per il cursore"
 
-#: pl_exec.c:2291
+#: pl_exec.c:2330
 #, c-format
 msgid "FOREACH expression must not be null"
 msgstr "l'espressione FOREACH non può essere vuota"
 
-#: pl_exec.c:2297
+#: pl_exec.c:2336
 #, c-format
 msgid "FOREACH expression must yield an array, not type %s"
 msgstr "l'espressione FOREACH deve generare un array, non il tipo %s"
 
-#: pl_exec.c:2314
+#: pl_exec.c:2353
 #, c-format
 msgid "slice dimension (%d) is out of the valid range 0..%d"
 msgstr "la dimensione della sezione (%d) è fuori dell'intervallo valido 0..%d"
 
-#: pl_exec.c:2341
+#: pl_exec.c:2380
 #, c-format
 msgid "FOREACH ... SLICE loop variable must be of an array type"
 msgstr "la variabile del ciclo FOREACH ... SLICE dev'essere di tipo array"
 
-#: pl_exec.c:2345
+#: pl_exec.c:2384
 #, c-format
 msgid "FOREACH loop variable must not be of an array type"
 msgstr "la variabile di ciclo FOREACH non può essere un tipo array"
 
-#: pl_exec.c:2533 pl_exec.c:2615 pl_exec.c:2782
+#: pl_exec.c:2572 pl_exec.c:2654 pl_exec.c:2821
 #, c-format
 msgid "cannot return non-composite value from function returning composite type"
 msgstr "non è possibile restituire valori non compositi da una funzione che restituisce un tipo composito"
 
-#: pl_exec.c:2659 pl_gram.y:3112
+#: pl_exec.c:2698 pl_gram.y:3112
 #, c-format
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "non si può usare RETURN NEXT in una funzione non-SETOF"
 
-#: pl_exec.c:2693 pl_exec.c:2824
+#: pl_exec.c:2732 pl_exec.c:2863
 #, c-format
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "è stato fornito un risultato di tipo non corretto a RETURN NEXT"
 
-#: pl_exec.c:2722 pl_exec.c:4360 pl_exec.c:4689 pl_exec.c:4715 pl_exec.c:4781
-#: pl_exec.c:4800 pl_exec.c:4868 pl_exec.c:4891
+#: pl_exec.c:2761 pl_exec.c:4434 pl_exec.c:4762 pl_exec.c:4788 pl_exec.c:4854
+#: pl_exec.c:4873 pl_exec.c:4941 pl_exec.c:4964
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "il record \"%s\" non è stato ancora assegnato"
 
-#: pl_exec.c:2724 pl_exec.c:4362 pl_exec.c:4691 pl_exec.c:4717 pl_exec.c:4783
-#: pl_exec.c:4802 pl_exec.c:4870 pl_exec.c:4893
+#: pl_exec.c:2763 pl_exec.c:4436 pl_exec.c:4764 pl_exec.c:4790 pl_exec.c:4856
+#: pl_exec.c:4875 pl_exec.c:4943 pl_exec.c:4966
 #, c-format
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "La struttura della tupla di un record non ancora assegnato è indeterminata."
 
-#: pl_exec.c:2728 pl_exec.c:2748
+#: pl_exec.c:2767 pl_exec.c:2787
 #, c-format
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "è stato fornito un record di tipo non corretto a RETURN NEXT"
 
-#: pl_exec.c:2843
+#: pl_exec.c:2882
 #, c-format
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT deve avere un parametro"
 
-#: pl_exec.c:2876 pl_gram.y:3174
+#: pl_exec.c:2915 pl_gram.y:3174
 #, c-format
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "non si può usare RETURN QUERY in una funzione non-SETOF"
 
-#: pl_exec.c:2896
+#: pl_exec.c:2935
 msgid "structure of query does not match function result type"
 msgstr "la struttura della query non coincide con il tipo del risultato della funzione"
 
-#: pl_exec.c:2976 pl_exec.c:3106
+#: pl_exec.c:3015 pl_exec.c:3145
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "opzione RAISE già specificata: %s"
 
-#: pl_exec.c:3009
+#: pl_exec.c:3048
 #, c-format
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr "RAISE senza parametri non può essere usato all'esterno di un gestore di eccezioni"
 
-#: pl_exec.c:3096
+#: pl_exec.c:3135
 #, c-format
 msgid "RAISE statement option cannot be null"
 msgstr "l'opzione dell'istruzione RAISE non può essere nulla"
 
-#: pl_exec.c:3167
+#: pl_exec.c:3206
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:3240
+#: pl_exec.c:3279
 #, c-format
 msgid "assertion failed"
 msgstr "asserzione fallita"
 
-#: pl_exec.c:3396 pl_exec.c:3540 pl_exec.c:3729
+#: pl_exec.c:3469 pl_exec.c:3613 pl_exec.c:3802
 #, c-format
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "non è possibile usare COPY verso/da un client in PL/pgSQL"
 
-#: pl_exec.c:3400 pl_exec.c:3544 pl_exec.c:3733
+#: pl_exec.c:3473 pl_exec.c:3617 pl_exec.c:3806
 #, c-format
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "non si possono avviare/terminare transazioni in PL/pgSQL"
 
-#: pl_exec.c:3401 pl_exec.c:3545 pl_exec.c:3734
+#: pl_exec.c:3474 pl_exec.c:3618 pl_exec.c:3807
 #, c-format
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Utilizza invece un blocco BEGIN con una clausola EXCEPTION."
 
-#: pl_exec.c:3568 pl_exec.c:3758
+#: pl_exec.c:3641 pl_exec.c:3831
 #, c-format
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO usato con un comando che non restituisce alcun dato"
 
-#: pl_exec.c:3596 pl_exec.c:3786
+#: pl_exec.c:3669 pl_exec.c:3859
 #, c-format
 msgid "query returned no rows"
 msgstr "la query non ha restituito alcuna riga"
 
-#: pl_exec.c:3615 pl_exec.c:3805
+#: pl_exec.c:3688 pl_exec.c:3878
 #, c-format
 msgid "query returned more than one row"
 msgstr "la query ha restituito più di una riga"
 
-#: pl_exec.c:3632
+#: pl_exec.c:3705
 #, c-format
 msgid "query has no destination for result data"
 msgstr "la query non ha una destinazione per i dati restituiti"
 
-#: pl_exec.c:3633
+#: pl_exec.c:3706
 #, c-format
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Se vuoi scartare i risultati di una SELECT, utilizza PERFORM."
 
-#: pl_exec.c:3665 pl_exec.c:7063
+#: pl_exec.c:3738 pl_exec.c:7026
 #, c-format
 msgid "query string argument of EXECUTE is null"
 msgstr "l'argomento della query di EXECUTE è nullo"
 
-#: pl_exec.c:3721
+#: pl_exec.c:3794
 #, c-format
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "EXECUTE di SELECT ... INTO non è implementato"
 
-#: pl_exec.c:3722
+#: pl_exec.c:3795
 #, c-format
 msgid "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS instead."
 msgstr "Potresti usare invece EXECUTE ... INTO oppure EXECUTE CREATE TABLE ... AS."
 
-#: pl_exec.c:4034 pl_exec.c:4126
+#: pl_exec.c:4105 pl_exec.c:4197
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "la variabile del cursore \"%s\" è nulla"
 
-#: pl_exec.c:4041 pl_exec.c:4133
+#: pl_exec.c:4112 pl_exec.c:4204
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "il cursore \"%s\" non esiste"
 
-#: pl_exec.c:4055
+#: pl_exec.c:4126
 #, c-format
 msgid "relative or absolute cursor position is null"
 msgstr "la posizione relativa o assoluta del cursore è nulla"
 
-#: pl_exec.c:4235
+#: pl_exec.c:4306
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "il valore null non può essere assegnato alla variabile \"%s\" dichiarata NOT NULL"
 
-#: pl_exec.c:4304
+#: pl_exec.c:4378
 #, c-format
 msgid "cannot assign non-composite value to a row variable"
 msgstr "non è possibile assegnare un valore non composito ad una variabile di tipo row"
 
-#: pl_exec.c:4328
+#: pl_exec.c:4402
 #, c-format
 msgid "cannot assign non-composite value to a record variable"
 msgstr "non è possibile assegnare un valore non composito ad una variabile di tipo record"
 
-#: pl_exec.c:4471
+#: pl_exec.c:4545
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "il numero di dimensioni dell'array (%d) eccede il massimo consentito (%d)"
 
-#: pl_exec.c:4503
+#: pl_exec.c:4577
 #, c-format
 msgid "subscripted object is not an array"
 msgstr "l'oggetto del quale è stato richiesto un elemento non è un array"
 
-#: pl_exec.c:4540
+#: pl_exec.c:4614
 #, c-format
 msgid "array subscript in assignment must not be null"
 msgstr "l'indice di un array nell'assegnamento non può essere nullo"
 
-#: pl_exec.c:5007
+#: pl_exec.c:5080
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "la query \"%s\" non ha restituito dati"
 
-#: pl_exec.c:5015
+#: pl_exec.c:5088
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
 msgstr[0] "la query \"%s\" ha restituito %d colonna"
 msgstr[1] "la query \"%s\" ha restituito %d colonne"
 
-#: pl_exec.c:5042
+#: pl_exec.c:5115
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "la query \"%s\" ha restituito più di una riga"
 
-#: pl_exec.c:5104
+#: pl_exec.c:5170
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "la query \"%s\" non è una SELECT"
@@ -519,10 +519,6 @@
 msgid "SQL statement"
 msgstr "istruzione SQL"
 
-#: pl_funcs.c:252
-msgid "EXECUTE statement"
-msgstr "istruzione EXECUTE"
-
 #: pl_funcs.c:254
 msgid "FOR over EXECUTE statement"
 msgstr "ciclo FOR su una istruzione EXECUTE"
diff -Nru postgresql-9.5-9.5.2/src/pl/plpgsql/src/po/ru.po postgresql-9.5-9.5.8/src/pl/plpgsql/src/po/ru.po
--- postgresql-9.5-9.5.2/src/pl/plpgsql/src/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpgsql/src/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,59 +1,51 @@
 # Russian message translation file for plpgsql
-#
-# Copyright (C) 2012 PostgreSQL Global Development Group
-# Copyright (c) 2012-2013 Alexander Lakhin, exclusion@gmail.com
+# Copyright (C) 2012-2016 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# ChangeLog:
-#   - August 24, 2014: Updates for 9.4. Alexander Lakhin <exclusion@gmail.com>.
-#   - March 14, 2013: Updates for 9.3. Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 2, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 19, 2012: Complete translation for 9.1. Alexander Lakhin <exclusion@gmail.com>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9 current\n"
+"Project-Id-Version: plpgsql (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-09-19 03:07+0000\n"
-"PO-Revision-Date: 2015-10-16 21:32+0400\n"
+"POT-Creation-Date: 2017-01-30 17:16+0000\n"
+"PO-Revision-Date: 2016-11-24 11:24+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 2.0\n"
 
-#: pl_comp.c:432 pl_handler.c:448
+#: pl_comp.c:436 pl_handler.c:450
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "функции PL/pgSQL не могут принимать тип %s"
 
-#: pl_comp.c:513
+#: pl_comp.c:517
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
 "не удало�ь определить фактиче�кий тип результата дл� полиморфной функции \"%s"
 "\""
 
-#: pl_comp.c:543
+#: pl_comp.c:547
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "триггерные функции могут вызывать�� только в триггерах"
 
-#: pl_comp.c:547 pl_handler.c:433
+#: pl_comp.c:551 pl_handler.c:435
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "функции PL/pgSQL не могут возвращать тип %s"
 
-#: pl_comp.c:588
+#: pl_comp.c:592
 #, c-format
 msgid "trigger functions cannot have declared arguments"
 msgstr "у триггерных функций не может быть объ�вленных аргументов"
 
-#: pl_comp.c:589
+#: pl_comp.c:593
 #, c-format
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
@@ -62,63 +54,63 @@
 "При необходимо�ти к аргументам триггера можно обращать�� через переменные "
 "TG_NARGS and TG_ARGV."
 
-#: pl_comp.c:691
+#: pl_comp.c:695
 #, c-format
 msgid "event trigger functions cannot have declared arguments"
 msgstr "у функций �обытийных триггеров не может быть объ�вленных аргументов"
 
-#: pl_comp.c:944
+#: pl_comp.c:957
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "компил�ци� функции PL/pgSQL \"%s\" в районе �троки %d"
 
-#: pl_comp.c:967
+#: pl_comp.c:980
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "им� параметра \"%s\" указано неоднократно"
 
-#: pl_comp.c:1077
+#: pl_comp.c:1090
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "неоднозначна� ��ылка на �толбец \"%s\""
 
-#: pl_comp.c:1079
+#: pl_comp.c:1092
 #, c-format
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr "Подразумевает�� ��ылка на переменную PL/pgSQL или �толбец таблицы."
 
-#: pl_comp.c:1259 pl_comp.c:1287 pl_exec.c:4394 pl_exec.c:4743 pl_exec.c:4828
-#: pl_exec.c:4919
+#: pl_comp.c:1272 pl_comp.c:1300 pl_exec.c:4447 pl_exec.c:4795 pl_exec.c:4880
+#: pl_exec.c:4971
 #, c-format
 msgid "record \"%s\" has no field \"%s\""
 msgstr "в запи�и \"%s\" нет пол� \"%s\""
 
-#: pl_comp.c:1818
+#: pl_comp.c:1831
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "отношение \"%s\" не �уще�твует"
 
-#: pl_comp.c:1927
+#: pl_comp.c:1940
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "переменна� \"%s\" имеет п�евдотип %s"
 
-#: pl_comp.c:1994
+#: pl_comp.c:2006
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "отношение \"%s\" не �вл�ет�� таблицей"
 
-#: pl_comp.c:2154
+#: pl_comp.c:2166
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "тип \"%s\" - лишь пу�тышка"
 
-#: pl_comp.c:2243 pl_comp.c:2296
+#: pl_comp.c:2260 pl_comp.c:2313
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "нера�познанное у�ловие и�ключени� \"%s\""
 
-#: pl_comp.c:2503
+#: pl_comp.c:2471
 #, c-format
 msgid ""
 "could not determine actual argument type for polymorphic function \"%s\""
@@ -126,52 +118,57 @@
 "не удало�ь определить фактиче�кий тип аргумента дл� полиморфной функции \"%s"
 "\""
 
-#: pl_exec.c:324 pl_exec.c:612 pl_exec.c:872
+#: pl_exec.c:321 pl_exec.c:614 pl_exec.c:893
 msgid "during initialization of execution state"
 msgstr "в проце��е инициализации �о�то�ни� выполнени�"
 
-#: pl_exec.c:331
+#: pl_exec.c:328
 msgid "while storing call arguments into local variables"
 msgstr "при �охранении аргументов вызова в локальных переменных"
 
-#: pl_exec.c:416 pl_exec.c:760
+#: pl_exec.c:408 pl_exec.c:771
 msgid "during function entry"
 msgstr "при входе в функцию"
 
-#: pl_exec.c:441
+#: pl_exec.c:439 pl_exec.c:802 pl_exec.c:934
+#, c-format
+msgid "CONTINUE cannot be used outside a loop"
+msgstr "CONTINUE нельз� и�пользовать вне цикла"
+
+#: pl_exec.c:443
 #, c-format
 msgid "control reached end of function without RETURN"
 msgstr "конец функции до�тигнут без RETURN"
 
-#: pl_exec.c:448
+#: pl_exec.c:450
 msgid "while casting return value to function's return type"
 msgstr "при приведении возвращаемого значени� к типу результата функции"
 
-#: pl_exec.c:461 pl_exec.c:2938
+#: pl_exec.c:463 pl_exec.c:2987
 #, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "функци�, возвращающа� множе�тво, вызвана в контек�те, где ему нет ме�та"
 
-#: pl_exec.c:499 pl_exec.c:2779
+#: pl_exec.c:501 pl_exec.c:2829
 msgid "returned record type does not match expected record type"
 msgstr "возвращаемый тип запи�и не �оответ�твует ожидаемому"
 
-#: pl_exec.c:554 pl_exec.c:789 pl_exec.c:907
+#: pl_exec.c:556 pl_exec.c:810 pl_exec.c:942
 msgid "during function exit"
 msgstr "при выходе из функции"
 
-#: pl_exec.c:785 pl_exec.c:903
+#: pl_exec.c:806 pl_exec.c:938
 #, c-format
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "конец триггерной процедуры до�тигнут без RETURN"
 
-#: pl_exec.c:794
+#: pl_exec.c:815
 #, c-format
 msgid "trigger procedure cannot return a set"
 msgstr "триггерна� процедура не может возвращать множе�тво"
 
-#: pl_exec.c:816
+#: pl_exec.c:837
 msgid ""
 "returned row structure does not match the structure of the triggering table"
 msgstr ""
@@ -181,7 +178,7 @@
 #. translator: last %s is a phrase such as "during statement block
 #. local variable initialization"
 #.
-#: pl_exec.c:954
+#: pl_exec.c:993
 #, c-format
 msgid "PL/pgSQL function %s line %d %s"
 msgstr "функци� PL/pgSQL %s, �трока %d, %s"
@@ -189,249 +186,250 @@
 #. translator: last %s is a phrase such as "while storing call
 #. arguments into local variables"
 #.
-#: pl_exec.c:965
+#: pl_exec.c:1004
 #, 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:973
+#: pl_exec.c:1012
 #, c-format
 msgid "PL/pgSQL function %s line %d at %s"
 msgstr "функци� PL/pgSQL %s, �трока %d, оператор %s"
 
-#: pl_exec.c:979
+#: pl_exec.c:1018
 #, c-format
 msgid "PL/pgSQL function %s"
 msgstr "функци� PL/pgSQL %s"
 
-#: pl_exec.c:1089
+#: pl_exec.c:1129
 msgid "during statement block local variable initialization"
 msgstr "при инициализации локальной переменной в блоке операторов"
 
-#: pl_exec.c:1128
+#: pl_exec.c:1169
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr ""
 "переменна� \"%s\", объ�вленна� NOT NULL, не может иметь значение по "
 "умолчанию NULL"
 
-#: pl_exec.c:1178
+#: pl_exec.c:1219
 msgid "during statement block entry"
 msgstr "при входе в блок операторов"
 
-#: pl_exec.c:1199
+#: pl_exec.c:1240
 msgid "during statement block exit"
 msgstr "при выходе из блока операторов"
 
-#: pl_exec.c:1242
+#: pl_exec.c:1283
 msgid "during exception cleanup"
 msgstr "при очи�тке по�ле и�ключени�"
 
-#: pl_exec.c:1593
+#: pl_exec.c:1634
 #, c-format
 msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
 msgstr ""
 "GET STACKED DIAGNOSTICS нельз� и�пользовать вне блока обработчика и�ключени�"
 
-#: pl_exec.c:1789
+#: pl_exec.c:1838
 #, c-format
 msgid "case not found"
 msgstr "неправильный CASE"
 
-#: pl_exec.c:1790
+#: pl_exec.c:1839
 #, c-format
 msgid "CASE statement is missing ELSE part."
 msgstr "В операторе CASE не хватает ча�ти ELSE."
 
-#: pl_exec.c:1944
+#: pl_exec.c:1993
 #, c-format
 msgid "lower bound of FOR loop cannot be null"
 msgstr "нижн�� граница цикла FOR не может быть равна NULL"
 
-#: pl_exec.c:1960
+#: pl_exec.c:2009
 #, c-format
 msgid "upper bound of FOR loop cannot be null"
 msgstr "верхн�� граница цикла FOR не может быть равна NULL"
 
-#: pl_exec.c:1978
+#: pl_exec.c:2027
 #, c-format
 msgid "BY value of FOR loop cannot be null"
 msgstr "значение BY в цикле FOR не может быть равно NULL"
 
-#: pl_exec.c:1984
+#: pl_exec.c:2033
 #, c-format
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "значение BY в цикле FOR должно быть больше нул�"
 
-#: pl_exec.c:2153 pl_exec.c:3911
+#: pl_exec.c:2203 pl_exec.c:3963
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "кур�ор \"%s\" уже и�пользует��"
 
-#: pl_exec.c:2176 pl_exec.c:3973
+#: pl_exec.c:2226 pl_exec.c:4025
 #, c-format
 msgid "arguments given for cursor without arguments"
 msgstr "кур�ору без аргументов были переданы аргументы"
 
-#: pl_exec.c:2195 pl_exec.c:3992
+#: pl_exec.c:2245 pl_exec.c:4044
 #, c-format
 msgid "arguments required for cursor"
 msgstr "кур�ору требуют�� аргументы"
 
-#: pl_exec.c:2280
+#: pl_exec.c:2330
 #, c-format
 msgid "FOREACH expression must not be null"
 msgstr "выражение FOREACH не может быть равно NULL"
 
-#: pl_exec.c:2286
+#: pl_exec.c:2336
 #, c-format
 msgid "FOREACH expression must yield an array, not type %s"
 msgstr "выражение в FOREACH должно быть ма��ивом, но не типом %s"
 
-#: pl_exec.c:2303
+#: pl_exec.c:2353
 #, c-format
 msgid "slice dimension (%d) is out of the valid range 0..%d"
 msgstr "размерно�ть �реза (%d) вне допу�тимого диапазона 0..%d"
 
-#: pl_exec.c:2330
+#: pl_exec.c:2380
 #, c-format
 msgid "FOREACH ... SLICE loop variable must be of an array type"
 msgstr "переменна� цикла FOREACH ... SLICE должна быть ма��ивом"
 
-#: pl_exec.c:2334
+#: pl_exec.c:2384
 #, c-format
 msgid "FOREACH loop variable must not be of an array type"
 msgstr "переменна� цикла FOREACH не должна быть ма��ивом"
 
-#: pl_exec.c:2522 pl_exec.c:2604 pl_exec.c:2771
+#: pl_exec.c:2572 pl_exec.c:2654 pl_exec.c:2821
 #, c-format
 msgid ""
 "cannot return non-composite value from function returning composite type"
 msgstr ""
 "функци�, возвращающа� �о�тавной тип, не может вернуть не�о�тавное значение"
 
-#: pl_exec.c:2648 pl_gram.y:3161
+#: pl_exec.c:2698 pl_gram.y:3141
 #, c-format
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr ""
 "RETURN NEXT можно и�пользовать только в функци�х, возвращающих множе�тва"
 
-#: pl_exec.c:2682 pl_exec.c:2813
+#: pl_exec.c:2732 pl_exec.c:2863
 #, c-format
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "в RETURN NEXT передан неправильный тип результата"
 
-#: pl_exec.c:2711 pl_exec.c:4381 pl_exec.c:4710 pl_exec.c:4736 pl_exec.c:4802
-#: pl_exec.c:4821 pl_exec.c:4889 pl_exec.c:4912
+#: pl_exec.c:2761 pl_exec.c:4434 pl_exec.c:4762 pl_exec.c:4788 pl_exec.c:4854
+#: pl_exec.c:4873 pl_exec.c:4941 pl_exec.c:4964
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "запи�и \"%s\" не при�воено значение"
 
-#: pl_exec.c:2713 pl_exec.c:4383 pl_exec.c:4712 pl_exec.c:4738 pl_exec.c:4804
-#: pl_exec.c:4823 pl_exec.c:4891 pl_exec.c:4914
+#: pl_exec.c:2763 pl_exec.c:4436 pl_exec.c:4764 pl_exec.c:4790 pl_exec.c:4856
+#: pl_exec.c:4875 pl_exec.c:4943 pl_exec.c:4966
 #, c-format
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr ""
 "Дл� запи�и, которой не при�воено значение, �труктура кортежа не определена."
 
-#: pl_exec.c:2717 pl_exec.c:2737
+#: pl_exec.c:2767 pl_exec.c:2787
 #, c-format
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "в RETURN NEXT передан неправильный тип запи�и"
 
-#: pl_exec.c:2832
+#: pl_exec.c:2882
 #, c-format
 msgid "RETURN NEXT must have a parameter"
 msgstr "у оператора RETURN NEXT должен быть параметр"
 
-#: pl_exec.c:2865 pl_gram.y:3223
+#: pl_exec.c:2915 pl_gram.y:3203
 #, c-format
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr ""
 "RETURN QUERY можно и�пользовать только в функци�х, возвращающих множе�тва"
 
-#: pl_exec.c:2886
+#: pl_exec.c:2935
 msgid "structure of query does not match function result type"
 msgstr "�труктура запро�а не �оответ�твует типу результата функции"
 
-#: pl_exec.c:2966 pl_exec.c:3096
+#: pl_exec.c:3015 pl_exec.c:3145
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "�тот параметр RAISE уже указан: %s"
 
-#: pl_exec.c:2999
+#: pl_exec.c:3048
 #, c-format
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr ""
 "RAISE без параметров нельз� и�пользовать вне блока обработчика и�ключени�"
 
-#: pl_exec.c:3086
+#: pl_exec.c:3135
 #, c-format
 msgid "RAISE statement option cannot be null"
 msgstr "параметром оператора RAISE не может быть NULL"
 
-#: pl_exec.c:3155
+#: pl_exec.c:3206
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:3226
+#: pl_exec.c:3279
 #, c-format
 msgid "assertion failed"
 msgstr "нарушение и�тинно�ти"
 
-#: pl_exec.c:3417 pl_exec.c:3561 pl_exec.c:3750
+#: pl_exec.c:3469 pl_exec.c:3613 pl_exec.c:3802
 #, c-format
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "в PL/pgSQL нельз� выполнить COPY � уча�тием клиента"
 
-#: pl_exec.c:3421 pl_exec.c:3565 pl_exec.c:3754
+#: pl_exec.c:3473 pl_exec.c:3617 pl_exec.c:3806
 #, c-format
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "в PL/pgSQL нельз� начинать/заканчивать транзакции"
 
-#: pl_exec.c:3422 pl_exec.c:3566 pl_exec.c:3755
+#: pl_exec.c:3474 pl_exec.c:3618 pl_exec.c:3807
 #, c-format
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "И�пользуйте блок BEGIN � предложением EXCEPTION."
 
-#: pl_exec.c:3589 pl_exec.c:3779
+#: pl_exec.c:3641 pl_exec.c:3831
 #, c-format
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO � командой не может возвращать данные"
 
-#: pl_exec.c:3617 pl_exec.c:3807
+#: pl_exec.c:3669 pl_exec.c:3859
 #, c-format
 msgid "query returned no rows"
 msgstr "запро� не вернул �трок"
 
-#: pl_exec.c:3636 pl_exec.c:3826
+#: pl_exec.c:3688 pl_exec.c:3878
 #, c-format
 msgid "query returned more than one row"
 msgstr "запро� вернул не�колько �трок"
 
-#: pl_exec.c:3653
+#: pl_exec.c:3705
 #, c-format
 msgid "query has no destination for result data"
 msgstr "в запро�е нет назначени� дл� данных результата"
 
-#: pl_exec.c:3654
+#: pl_exec.c:3706
 #, c-format
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Е�ли вам нужно отбро�ить результаты SELECT, и�пользуйте PERFORM."
 
-#: pl_exec.c:3686 pl_exec.c:7122
+#: pl_exec.c:3738 pl_exec.c:7030
 #, c-format
 msgid "query string argument of EXECUTE is null"
 msgstr "в каче�тве тек�та запро�а в EXECUTE передан NULL"
 
-#: pl_exec.c:3742
+#: pl_exec.c:3794
 #, c-format
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "возможно�ть выполнени� SELECT ... INTO в EXECUTE не реализована"
 
-#: pl_exec.c:3743
+# skip-rule: space-before-ellipsis
+#: pl_exec.c:3795
 #, c-format
 msgid ""
 "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
@@ -440,57 +438,57 @@
 "�льтернативой может �тать EXECUTE ... INTO или EXECUTE CREATE TABLE ... "
 "AS ..."
 
-#: pl_exec.c:4055 pl_exec.c:4147
+#: pl_exec.c:4105 pl_exec.c:4197
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "переменна� кур�ора \"%s\" равна NULL"
 
-#: pl_exec.c:4062 pl_exec.c:4154
+#: pl_exec.c:4112 pl_exec.c:4204
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "кур�ор \"%s\" не �уще�твует"
 
-#: pl_exec.c:4076
+#: pl_exec.c:4126
 #, c-format
 msgid "relative or absolute cursor position is null"
 msgstr "отно�ительна� или аб�олютна� позици� кур�ора равна NULL"
 
-#: pl_exec.c:4256
+#: pl_exec.c:4306
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "значение NULL нельз� при�воить переменной \"%s\", объ�вленной NOT NULL"
 
-#: pl_exec.c:4325
+#: pl_exec.c:4378
 #, c-format
 msgid "cannot assign non-composite value to a row variable"
 msgstr "переменной типа кортеж можно при�воить только �о�тавное значение"
 
-#: pl_exec.c:4349
+#: pl_exec.c:4402
 #, c-format
 msgid "cannot assign non-composite value to a record variable"
 msgstr "переменной типа запи�ь можно при�воить только �о�тавное значение"
 
-#: pl_exec.c:4492
+#: pl_exec.c:4545
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "чи�ло размерно�тей ма��ива (%d) превышает предел (%d)"
 
-#: pl_exec.c:4524
+#: pl_exec.c:4577
 #, c-format
 msgid "subscripted object is not an array"
 msgstr "дл� объекта указан индек�, но �тот объект - не ма��ив"
 
-#: pl_exec.c:4561
+#: pl_exec.c:4614
 #, c-format
 msgid "array subscript in assignment must not be null"
 msgstr "индек� �лемента ма��ива в при�ваивании не может быть NULL"
 
-#: pl_exec.c:5028
+#: pl_exec.c:5080
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "запро� \"%s\" не вернул данные"
 
-#: pl_exec.c:5036
+#: pl_exec.c:5088
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
@@ -498,45 +496,45 @@
 msgstr[1] "запро� \"%s\" вернул %d �троки"
 msgstr[2] "запро� \"%s\" вернул %d �трок"
 
-#: pl_exec.c:5063
+#: pl_exec.c:5115
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "запро� \"%s\" вернул не�колько �трок"
 
-#: pl_exec.c:5127
+#: pl_exec.c:5170
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "запро� \"%s\" - не SELECT"
 
-#: pl_funcs.c:237
+#: pl_funcs.c:218
 msgid "statement block"
 msgstr "блок операторов"
 
-#: pl_funcs.c:239
+#: pl_funcs.c:220
 msgid "assignment"
 msgstr "при�ваивание"
 
-#: pl_funcs.c:249
+#: pl_funcs.c:230
 msgid "FOR with integer loop variable"
 msgstr "FOR � целочи�ленной переменной цикла"
 
-#: pl_funcs.c:251
+#: pl_funcs.c:232
 msgid "FOR over SELECT rows"
 msgstr "FOR по результатам SELECT"
 
-#: pl_funcs.c:253
+#: pl_funcs.c:234
 msgid "FOR over cursor"
 msgstr "FOR по кур�ору"
 
-#: pl_funcs.c:255
+#: pl_funcs.c:236
 msgid "FOREACH over array"
 msgstr "FOREACH дл� ма��ива"
 
-#: pl_funcs.c:269
+#: pl_funcs.c:250
 msgid "SQL statement"
 msgstr "SQL-оператор"
 
-#: pl_funcs.c:273
+#: pl_funcs.c:254
 msgid "FOR over EXECUTE statement"
 msgstr "FOR по результатам EXECUTE"
 
@@ -593,7 +591,7 @@
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "нера�познанный �лемент GET DIAGNOSTICS"
 
-#: pl_gram.y:1078 pl_gram.y:3410
+#: pl_gram.y:1078 pl_gram.y:3390
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "\"%s\" - не �кал�рна� переменна�"
@@ -635,206 +633,188 @@
 "переменной цикла FOREACH должна быть изве�тна� переменна� или �пи�ок "
 "переменных"
 
-#: pl_gram.y:1679
-#, c-format
-msgid ""
-"there is no label \"%s\" attached to any block or loop enclosing this "
-"statement"
-msgstr "в блоке или цикле, окружающем �тот оператор, нет метки \"%s\""
-
-#: pl_gram.y:1687
-#, c-format
-msgid "block label \"%s\" cannot be used in CONTINUE"
-msgstr "метку блока \"%s\" нельз� и�пользовать в CONTINUE"
-
-#: pl_gram.y:1702
-#, c-format
-msgid "EXIT cannot be used outside a loop, unless it has a label"
-msgstr "EXIT можно и�пользовать вне цикла только � указанием метки"
-
-#: pl_gram.y:1703
-#, c-format
-msgid "CONTINUE cannot be used outside a loop"
-msgstr "CONTINUE нельз� и�пользовать вне цикла"
-
-#: pl_gram.y:1727 pl_gram.y:1764 pl_gram.y:1812 pl_gram.y:2863 pl_gram.y:2945
-#: pl_gram.y:3056 pl_gram.y:3812
+#: pl_gram.y:1690 pl_gram.y:1727 pl_gram.y:1775 pl_gram.y:2840 pl_gram.y:2925
+#: pl_gram.y:3036 pl_gram.y:3792
 msgid "unexpected end of function definition"
 msgstr "неожиданный конец определени� функции"
 
-#: pl_gram.y:1832 pl_gram.y:1856 pl_gram.y:1872 pl_gram.y:1878 pl_gram.y:1992
-#: pl_gram.y:2000 pl_gram.y:2014 pl_gram.y:2109 pl_gram.y:2290 pl_gram.y:2384
-#: pl_gram.y:2535 pl_gram.y:3653 pl_gram.y:3714 pl_gram.y:3793
+#: pl_gram.y:1795 pl_gram.y:1819 pl_gram.y:1835 pl_gram.y:1841 pl_gram.y:1959
+#: pl_gram.y:1967 pl_gram.y:1981 pl_gram.y:2076 pl_gram.y:2257 pl_gram.y:2340
+#: pl_gram.y:2492 pl_gram.y:3633 pl_gram.y:3694 pl_gram.y:3773
 msgid "syntax error"
 msgstr "ошибка �интак�и�а"
 
-#: pl_gram.y:1860 pl_gram.y:1862 pl_gram.y:2294 pl_gram.y:2296
+#: pl_gram.y:1823 pl_gram.y:1825 pl_gram.y:2261 pl_gram.y:2263
 msgid "invalid SQLSTATE code"
 msgstr "неверный код SQLSTATE"
 
-#: pl_gram.y:2056
+#: pl_gram.y:2023
 msgid "syntax error, expected \"FOR\""
 msgstr "ошибка �интак�и�а, ожидал�� \"FOR\""
 
-#: pl_gram.y:2118
+#: pl_gram.y:2085
 #, c-format
 msgid "FETCH statement cannot return multiple rows"
 msgstr "оператор FETCH не может вернуть не�колько �трок"
 
-#: pl_gram.y:2174
+#: pl_gram.y:2141
 #, c-format
 msgid "cursor variable must be a simple variable"
 msgstr "переменна�-кур�ор должна быть про�той переменной"
 
-#: pl_gram.y:2180
+#: pl_gram.y:2147
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "переменна� \"%s\" должна быть типа cursor или refcursor"
 
-#: pl_gram.y:2506 pl_gram.y:2517
+#: pl_gram.y:2315
+msgid "label does not exist"
+msgstr "метка не �уще�твует"
+
+#: pl_gram.y:2463 pl_gram.y:2474
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "\"%s\" - не изве�тна� переменна�"
 
-#: pl_gram.y:2621 pl_gram.y:2631 pl_gram.y:2787
+#: pl_gram.y:2578 pl_gram.y:2588 pl_gram.y:2744
 msgid "mismatched parentheses"
 msgstr "непарные �кобки"
 
-#: pl_gram.y:2635
+#: pl_gram.y:2592
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "от�ут�твует \"%s\" в конце выражени� SQL"
 
-#: pl_gram.y:2641
+#: pl_gram.y:2598
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "от�ут�твует \"%s\" в конце оператора SQL"
 
-#: pl_gram.y:2658
+#: pl_gram.y:2615
 msgid "missing expression"
 msgstr "от�ут�твует выражение"
 
-#: pl_gram.y:2660
+#: pl_gram.y:2617
 msgid "missing SQL statement"
 msgstr "от�ут�твует оператор SQL"
 
-#: pl_gram.y:2789
+#: pl_gram.y:2746
 msgid "incomplete data type declaration"
 msgstr "неполное определение типа данных"
 
-#: pl_gram.y:2812
+#: pl_gram.y:2769
 msgid "missing data type declaration"
 msgstr "от�ут�твует определение типа данных"
 
-#: pl_gram.y:2868
+#: pl_gram.y:2848
 msgid "INTO specified more than once"
 msgstr "INTO указано неоднократно"
 
-#: pl_gram.y:3037
+#: pl_gram.y:3017
 msgid "expected FROM or IN"
 msgstr "ожидало�ь FROM или IN"
 
-#: pl_gram.y:3097
+#: pl_gram.y:3077
 #, c-format
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "в функции, возвращающей множе�тво, RETURN должен быть без параметров"
 
-#: pl_gram.y:3098
+#: pl_gram.y:3078
 #, c-format
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "И�пользуйте RETURN NEXT или RETURN QUERY."
 
-#: pl_gram.y:3106
+#: pl_gram.y:3086
 #, c-format
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN должен быть без параметров в функции � параметрами OUT"
 
-#: pl_gram.y:3115
+#: pl_gram.y:3095
 #, c-format
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "в функции, не возвращающей ничего, RETURN не должен иметь параметров"
 
-#: pl_gram.y:3175
+#: pl_gram.y:3155
 #, c-format
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr "RETURN NEXT должен быть без параметров в функции � параметрами OUT"
 
-#: pl_gram.y:3279
+#: pl_gram.y:3259
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "\"%s\" объ�влена как CONSTANT"
 
-#: pl_gram.y:3341 pl_gram.y:3353
+#: pl_gram.y:3321 pl_gram.y:3333
 #, c-format
 msgid "record or row variable cannot be part of multiple-item INTO list"
 msgstr ""
 "переменна� типа запи�ь или кортеж не может быть ча�тью �пи�ка INTO � "
 "не�колькими �лементами"
 
-#: pl_gram.y:3398
+#: pl_gram.y:3378
 #, c-format
 msgid "too many INTO variables specified"
 msgstr "указано �лишком много переменных INTO"
 
-#: pl_gram.y:3606
+#: pl_gram.y:3586
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "конечна� метка \"%s\" указана дл� не помеченного блока"
 
-#: pl_gram.y:3613
+#: pl_gram.y:3593
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "конечна� метка \"%s\" отличает�� от метки блока \"%s\""
 
-#: pl_gram.y:3648
+#: pl_gram.y:3628
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "кур�ор \"%s\" не имеет аргументов"
 
-#: pl_gram.y:3662
+#: pl_gram.y:3642
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "кур�ор \"%s\" имеет аргументы"
 
-#: pl_gram.y:3704
+#: pl_gram.y:3684
 #, c-format
 msgid "cursor \"%s\" has no argument named \"%s\""
 msgstr "кур�ор \"%s\" не имеет аргумента \"%s\""
 
-#: pl_gram.y:3724
+#: pl_gram.y:3704
 #, c-format
 msgid "value for parameter \"%s\" of cursor \"%s\" specified more than once"
 msgstr "значение параметра \"%s\" кур�ора \"%s\" указано неоднократно"
 
-#: pl_gram.y:3749
+#: pl_gram.y:3729
 #, c-format
 msgid "not enough arguments for cursor \"%s\""
 msgstr "недо�таточно аргументов дл� кур�ора \"%s\""
 
-#: pl_gram.y:3756
+#: pl_gram.y:3736
 #, c-format
 msgid "too many arguments for cursor \"%s\""
 msgstr "�лишком много аргументов дл� кур�ора \"%s\""
 
-#: pl_gram.y:3844
+#: pl_gram.y:3824
 msgid "unrecognized RAISE statement option"
 msgstr "нера�познанный параметр оператора RAISE"
 
-#: pl_gram.y:3848
+#: pl_gram.y:3828
 msgid "syntax error, expected \"=\""
 msgstr "ошибка �интак�и�а, ожидало�ь \"=\""
 
-#: pl_gram.y:3889
+#: pl_gram.y:3869
 #, c-format
 msgid "too many parameters specified for RAISE"
 msgstr "�лишком много параметров дл� RAISE"
 
-#: pl_gram.y:3893
+#: pl_gram.y:3873
 #, c-format
 msgid "too few parameters specified for RAISE"
 msgstr "недо�таточно параметров дл� RAISE"
 
-#: pl_handler.c:149
+#: pl_handler.c:151
 msgid ""
 "Sets handling of conflicts between PL/pgSQL variable names and table column "
 "names."
@@ -842,7 +822,7 @@
 "Выбирает режим разрешени� конфликтов между именами переменных PL/pgSQL и "
 "именами �толбцов таблиц."
 
-#: pl_handler.c:158
+#: pl_handler.c:160
 msgid ""
 "Print information about parameters in the DETAIL part of the error messages "
 "generated on INTO ... STRICT failures."
@@ -850,37 +830,45 @@
 "Добавл�ет информацию о параметрах в раздел DETAIL �ообщений, выводимых при "
 "ошибках в INTO ... STRICT."
 
-#: pl_handler.c:166
+#: pl_handler.c:168
 msgid "Perform checks given in ASSERT statements."
 msgstr "Выполн�ет проверки, заданные в операторах ASSERT."
 
-#: pl_handler.c:174
+#: pl_handler.c:176
 msgid "List of programming constructs that should produce a warning."
 msgstr ""
 "Спи�ок программных кон�трукций, которые должны выдавать предупреждени�."
 
-#: pl_handler.c:184
+#: pl_handler.c:186
 msgid "List of programming constructs that should produce an error."
 msgstr "Спи�ок программных кон�трукций, которые должны выдавать ошибку."
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:621
+#: pl_scanner.c:622
 #, c-format
 msgid "%s at end of input"
 msgstr "%s в конце"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:637
+#: pl_scanner.c:638
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s (примерное положение: \"%s\")"
 
+#~ msgid ""
+#~ "there is no label \"%s\" attached to any block or loop enclosing this "
+#~ "statement"
+#~ msgstr "в блоке или цикле, окружающем �тот оператор, нет метки \"%s\""
+
+#~ msgid "block label \"%s\" cannot be used in CONTINUE"
+#~ msgstr "метку блока \"%s\" нельз� и�пользовать в CONTINUE"
+
+#~ msgid "EXIT cannot be used outside a loop, unless it has a label"
+#~ msgstr "EXIT можно и�пользовать вне цикла только � указанием метки"
+
 #~ msgid "EXECUTE statement"
 #~ msgstr "оператор EXECUTE"
 
-#~ msgid "label does not exist"
-#~ msgstr "метка не �уще�твует"
-
 #~ msgid ""
 #~ "RETURN must specify a record or row variable in function returning row"
 #~ msgstr ""
diff -Nru postgresql-9.5-9.5.2/src/pl/plpython/plpy_elog.c postgresql-9.5-9.5.8/src/pl/plpython/plpy_elog.c
--- postgresql-9.5-9.5.2/src/pl/plpython/plpy_elog.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpython/plpy_elog.c	2017-08-07 21:13:41.000000000 +0000
@@ -21,7 +21,8 @@
 PyObject   *PLy_exc_spi_error = NULL;
 
 
-static void PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth);
+static void PLy_traceback(PyObject *e, PyObject *v, PyObject *tb,
+			  char **xmsg, char **tbmsg, int *tb_depth);
 static void PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail,
 					   char **hint, char **query, int *position);
 static char *get_source_line(const char *src, int lineno);
@@ -53,16 +54,20 @@
 	int			position = 0;
 
 	PyErr_Fetch(&exc, &val, &tb);
+
 	if (exc != NULL)
 	{
+		PyErr_NormalizeException(&exc, &val, &tb);
+
 		if (PyErr_GivenExceptionMatches(val, PLy_exc_spi_error))
 			PLy_get_spi_error_data(val, &sqlerrcode, &detail, &hint, &query, &position);
 		else if (PyErr_GivenExceptionMatches(val, PLy_exc_fatal))
 			elevel = FATAL;
 	}
-	PyErr_Restore(exc, val, tb);
 
-	PLy_traceback(&xmsg, &tbmsg, &tb_depth);
+	/* this releases our refcount on tb! */
+	PLy_traceback(exc, val, tb,
+				  &xmsg, &tbmsg, &tb_depth);
 
 	if (fmt)
 	{
@@ -113,6 +118,9 @@
 			pfree(xmsg);
 		if (tbmsg)
 			pfree(tbmsg);
+		Py_XDECREF(exc);
+		Py_XDECREF(val);
+
 		PG_RE_THROW();
 	}
 	PG_END_TRY();
@@ -123,21 +131,24 @@
 		pfree(xmsg);
 	if (tbmsg)
 		pfree(tbmsg);
+	Py_XDECREF(exc);
+	Py_XDECREF(val);
 }
 
 /*
- * Extract a Python traceback from the current exception.
+ * Extract a Python traceback from the given exception data.
  *
  * The exception error message is returned in xmsg, the traceback in
  * tbmsg (both as palloc'd strings) and the traceback depth in
  * tb_depth.
+ *
+ * We release refcounts on all the Python objects in the traceback stack,
+ * but not on e or v.
  */
 static void
-PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth)
+PLy_traceback(PyObject *e, PyObject *v, PyObject *tb,
+			  char **xmsg, char **tbmsg, int *tb_depth)
 {
-	PyObject   *e,
-			   *v,
-			   *tb;
 	PyObject   *e_type_o;
 	PyObject   *e_module_o;
 	char	   *e_type_s = NULL;
@@ -148,12 +159,7 @@
 	StringInfoData tbstr;
 
 	/*
-	 * get the current exception
-	 */
-	PyErr_Fetch(&e, &v, &tb);
-
-	/*
-	 * oops, no exception, return
+	 * if no exception, return nulls
 	 */
 	if (e == NULL)
 	{
@@ -164,8 +170,6 @@
 		return;
 	}
 
-	PyErr_NormalizeException(&e, &v, &tb);
-
 	/*
 	 * Format the exception and its value and put it in xmsg.
 	 */
@@ -222,6 +226,12 @@
 
 		PG_TRY();
 		{
+			/*
+			 * Ancient versions of Python (circa 2.3) contain a bug whereby
+			 * the fetches below can fail if the error indicator is set.
+			 */
+			PyErr_Clear();
+
 			lineno = PyObject_GetAttrString(tb, "tb_lineno");
 			if (lineno == NULL)
 				elog(ERROR, "could not get line number from Python traceback");
@@ -264,7 +274,7 @@
 			long		plain_lineno;
 
 			/*
-			 * The second frame points at the internal function, but to mimick
+			 * The second frame points at the internal function, but to mimic
 			 * Python error reporting we want to say <module>.
 			 */
 			if (*tb_depth == 1)
@@ -332,8 +342,6 @@
 	Py_XDECREF(e_type_o);
 	Py_XDECREF(e_module_o);
 	Py_XDECREF(vob);
-	Py_XDECREF(v);
-	Py_DECREF(e);
 }
 
 /*
@@ -367,7 +375,7 @@
 static void
 PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hint, char **query, int *position)
 {
-	PyObject   *spidata = NULL;
+	PyObject   *spidata;
 
 	spidata = PyObject_GetAttrString(exc, "spidata");
 
@@ -384,8 +392,6 @@
 		PLy_get_spi_sqlerrcode(exc, sqlerrcode);
 	}
 
-	PyErr_Clear();
-	/* no elog here, we simply won't report the errhint, errposition etc */
 	Py_XDECREF(spidata);
 }
 
diff -Nru postgresql-9.5-9.5.2/src/pl/plpython/plpy_plpymodule.c postgresql-9.5-9.5.8/src/pl/plpython/plpy_plpymodule.c
--- postgresql-9.5-9.5.2/src/pl/plpython/plpy_plpymodule.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpython/plpy_plpymodule.c	2017-08-07 21:13:41.000000000 +0000
@@ -25,6 +25,9 @@
 
 
 static void PLy_add_exceptions(PyObject *plpy);
+static PyObject *PLy_create_exception(char *name,
+					 PyObject *base, PyObject *dict,
+					 const char *modname, PyObject *mod);
 static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
 
 /* module functions */
@@ -192,47 +195,63 @@
 #else
 	excmod = PyModule_Create(&PLy_exc_module);
 #endif
-	if (PyModule_AddObject(plpy, "spiexceptions", excmod) < 0)
-		PLy_elog(ERROR, "could not add the spiexceptions module");
+	if (excmod == NULL)
+		PLy_elog(ERROR, "could not create the spiexceptions module");
 
 	/*
-	 * XXX it appears that in some circumstances the reference count of the
-	 * spiexceptions module drops to zero causing a Python assert failure when
-	 * the garbage collector visits the module. This has been observed on the
-	 * buildfarm. To fix this, add an additional ref for the module here.
-	 *
-	 * This shouldn't cause a memory leak - we don't want this garbage
-	 * collected, and this function shouldn't be called more than once per
-	 * backend.
+	 * PyModule_AddObject does not add a refcount to the object, for some odd
+	 * reason; we must do that.
 	 */
 	Py_INCREF(excmod);
+	if (PyModule_AddObject(plpy, "spiexceptions", excmod) < 0)
+		PLy_elog(ERROR, "could not add the spiexceptions module");
 
-	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
-	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
-	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
-
-	if (PLy_exc_error == NULL ||
-		PLy_exc_fatal == NULL ||
-		PLy_exc_spi_error == NULL)
-		PLy_elog(ERROR, "could not create the base SPI exceptions");
-
-	Py_INCREF(PLy_exc_error);
-	PyModule_AddObject(plpy, "Error", PLy_exc_error);
-	Py_INCREF(PLy_exc_fatal);
-	PyModule_AddObject(plpy, "Fatal", PLy_exc_fatal);
-	Py_INCREF(PLy_exc_spi_error);
-	PyModule_AddObject(plpy, "SPIError", PLy_exc_spi_error);
+	PLy_exc_error = PLy_create_exception("plpy.Error", NULL, NULL,
+										 "Error", plpy);
+	PLy_exc_fatal = PLy_create_exception("plpy.Fatal", NULL, NULL,
+										 "Fatal", plpy);
+	PLy_exc_spi_error = PLy_create_exception("plpy.SPIError", NULL, NULL,
+											 "SPIError", plpy);
 
 	memset(&hash_ctl, 0, sizeof(hash_ctl));
 	hash_ctl.keysize = sizeof(int);
 	hash_ctl.entrysize = sizeof(PLyExceptionEntry);
-	PLy_spi_exceptions = hash_create("SPI exceptions", 256,
+	PLy_spi_exceptions = hash_create("PL/Python SPI exceptions", 256,
 									 &hash_ctl, HASH_ELEM | HASH_BLOBS);
 
 	PLy_generate_spi_exceptions(excmod, PLy_exc_spi_error);
 }
 
 /*
+ * Create an exception object and add it to the module
+ */
+static PyObject *
+PLy_create_exception(char *name, PyObject *base, PyObject *dict,
+					 const char *modname, PyObject *mod)
+{
+	PyObject   *exc;
+
+	exc = PyErr_NewException(name, base, dict);
+	if (exc == NULL)
+		PLy_elog(ERROR, "could not create exception \"%s\"", name);
+
+	/*
+	 * PyModule_AddObject does not add a refcount to the object, for some odd
+	 * reason; we must do that.
+	 */
+	Py_INCREF(exc);
+	PyModule_AddObject(mod, modname, exc);
+
+	/*
+	 * The caller will also store a pointer to the exception object in some
+	 * permanent variable, so add another ref to account for that.  This is
+	 * probably excessively paranoid, but let's be sure.
+	 */
+	Py_INCREF(exc);
+	return exc;
+}
+
+/*
  * Add all the autogenerated exceptions as subclasses of SPIError
  */
 static void
@@ -257,12 +276,14 @@
 
 		PyDict_SetItemString(dict, "sqlstate", sqlstate);
 		Py_DECREF(sqlstate);
-		exc = PyErr_NewException(exception_map[i].name, base, dict);
-		PyModule_AddObject(mod, exception_map[i].classname, exc);
+
+		exc = PLy_create_exception(exception_map[i].name, base, dict,
+								   exception_map[i].classname, mod);
+
 		entry = hash_search(PLy_spi_exceptions, &exception_map[i].sqlstate,
 							HASH_ENTER, &found);
-		entry->exc = exc;
 		Assert(!found);
+		entry->exc = exc;
 	}
 }
 
diff -Nru postgresql-9.5-9.5.2/src/pl/plpython/plpy_typeio.h postgresql-9.5-9.5.8/src/pl/plpython/plpy_typeio.h
--- postgresql-9.5-9.5.2/src/pl/plpython/plpy_typeio.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpython/plpy_typeio.h	2017-08-07 21:13:41.000000000 +0000
@@ -71,7 +71,7 @@
 	PLyObToTuple r;
 } PLyTypeOutput;
 
-/* all we need to move Postgresql data to Python objects,
+/* all we need to move PostgreSQL data to Python objects,
  * and vice versa
  */
 typedef struct PLyTypeInfo
diff -Nru postgresql-9.5-9.5.2/src/pl/plpython/po/de.po postgresql-9.5-9.5.8/src/pl/plpython/po/de.po
--- postgresql-9.5-9.5.2/src/pl/plpython/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpython/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PostgreSQL package.
 # Peter Eisentraut <peter_e@gmx.net>, 2009 - 2016.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-08 10:37+0000\n"
-"PO-Revision-Date: 2016-02-08 12:21-0500\n"
+"POT-Creation-Date: 2017-02-06 15:15+0000\n"
+"PO-Revision-Date: 2017-02-06 10:34-0500\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -61,7 +61,7 @@
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "Schließen eines Cursors in einer abgebrochenen Subtransaktion"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
+#: plpy_elog.c:108 plpy_elog.c:109 plpy_plpymodule.c:440
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -94,7 +94,7 @@
 #: plpy_exec.c:165
 #, c-format
 msgid "PL/Python function with return type \"void\" did not return None"
-msgstr "PL/Python-Funktion mit Rückgabetyp „void“ hat nicht None zurückgegeben"
+msgstr "PL/Python-Funktion mit Rückgabetyp »void« hat nicht None zurückgegeben"
 
 #: plpy_exec.c:291 plpy_exec.c:317
 #, c-format
@@ -159,7 +159,7 @@
 #: plpy_exec.c:703
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
-msgstr "in TD[\"new\"] gefundener Schlüssel „%s“ existiert nicht als Spalte in der den Trigger auslösenden Zeile"
+msgstr "in TD[\"new\"] gefundener Schlüssel »%s« existiert nicht als Spalte in der den Trigger auslösenden Zeile"
 
 #: plpy_exec.c:783
 #, c-format
@@ -204,7 +204,7 @@
 #: plpy_main.c:190
 #, c-format
 msgid "could not import \"__main__\" module"
-msgstr "konnte Modul „__main__“ nicht importieren"
+msgstr "konnte Modul »__main__« nicht importieren"
 
 #: plpy_main.c:195
 #, c-format
@@ -219,7 +219,7 @@
 #: plpy_main.c:409
 #, c-format
 msgid "PL/Python function \"%s\""
-msgstr "PL/Python-Funktion „%s“"
+msgstr "PL/Python-Funktion »%s«"
 
 #: plpy_main.c:416
 #, c-format
@@ -231,56 +231,61 @@
 msgid "plan.status takes no arguments"
 msgstr "plan.status nimmt keine Argumente"
 
-#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#: plpy_plpymodule.c:181 plpy_plpymodule.c:184
 #, c-format
 msgid "could not import \"plpy\" module"
-msgstr "konnte Modul „plpy“ nicht importieren"
+msgstr "konnte Modul »plpy« nicht importieren"
 
-#: plpy_plpymodule.c:196
+#: plpy_plpymodule.c:199
+#, c-format
+msgid "could not create the spiexceptions module"
+msgstr "konnte das Modul »spiexceptions« nicht erzeugen"
+
+#: plpy_plpymodule.c:207
 #, c-format
 msgid "could not add the spiexceptions module"
-msgstr "konnte das Modul „spiexceptions“ nicht hinzufügen"
+msgstr "konnte das Modul »spiexceptions« nicht hinzufügen"
 
-#: plpy_plpymodule.c:217
+#: plpy_plpymodule.c:236
 #, c-format
-msgid "could not create the base SPI exceptions"
-msgstr "konnte die SPI-Basisausnahmen nicht erzeugen"
+msgid "could not create exception \"%s\""
+msgstr "konnte Ausnahme »%s« nicht erzeugen"
 
-#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
+#: plpy_plpymodule.c:271 plpy_plpymodule.c:275
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "konnte SPI-Ausnahmen nicht erzeugen"
 
-#: plpy_plpymodule.c:387
+#: plpy_plpymodule.c:408
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "konnte Argumente in plpy.elog nicht entpacken"
 
-#: plpy_plpymodule.c:395
+#: plpy_plpymodule.c:416
 msgid "could not parse error message in plpy.elog"
 msgstr "konnte Fehlermeldung in plpy.elog nicht parsen"
 
-#: plpy_procedure.c:213
+#: plpy_procedure.c:223
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "Triggerfunktionen können nur als Trigger aufgerufen werden"
 
-#: plpy_procedure.c:218
+#: plpy_procedure.c:228
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "PL/Python-Funktionen können keinen Rückgabetyp %s haben"
 
-#: plpy_procedure.c:300
+#: plpy_procedure.c:310
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "PL/Python-Funktionen können Typ %s nicht annehmen"
 
-#: plpy_procedure.c:398
+#: plpy_procedure.c:408
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
-msgstr "konnte PL/Python-Funktion „%s“ nicht kompilieren"
+msgstr "konnte PL/Python-Funktion »%s« nicht kompilieren"
 
-#: plpy_procedure.c:401
+#: plpy_procedure.c:411
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "konnte anonymen PL/Python-Codeblock nicht kompilieren"
@@ -348,12 +353,12 @@
 #: plpy_typeio.c:564
 #, c-format
 msgid "could not import a module for Decimal constructor"
-msgstr "konnte kein Modul für den „Decimal“-Konstruktor importieren"
+msgstr "konnte kein Modul für den »Decimal«-Konstruktor importieren"
 
 #: plpy_typeio.c:568
 #, c-format
 msgid "no Decimal attribute in module"
-msgstr "kein Attribut „Decimal“ im Modul"
+msgstr "kein Attribut »Decimal« im Modul"
 
 #: plpy_typeio.c:574
 #, c-format
@@ -398,7 +403,7 @@
 #: plpy_typeio.c:992
 #, c-format
 msgid "key \"%s\" not found in mapping"
-msgstr "Schlüssel „%s“ nicht in Mapping gefunden"
+msgstr "Schlüssel »%s« nicht in Mapping gefunden"
 
 #: plpy_typeio.c:993
 #, c-format
@@ -413,7 +418,7 @@
 #: plpy_typeio.c:1155
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
-msgstr "Attribut „%s“ existiert nicht in Python-Objekt"
+msgstr "Attribut »%s« existiert nicht in Python-Objekt"
 
 #: plpy_typeio.c:1156
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/pl/plpython/po/es.po postgresql-9.5-9.5.8/src/pl/plpython/po/es.po
--- postgresql-9.5-9.5.2/src/pl/plpython/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpython/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: plpython (PostgreSQL 9.4)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:37+0000\n"
+"POT-Creation-Date: 2017-05-21 17:26+0000\n"
 "PO-Revision-Date: 2014-12-15 16:56-0300\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
@@ -63,7 +63,7 @@
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "cerrando un cursor en una subtransacción abortada"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
+#: plpy_elog.c:108 plpy_elog.c:109 plpy_plpymodule.c:440
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -174,47 +174,57 @@
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "abortando una subtransacción que no se ha cerrado"
 
-#: plpy_main.c:93
+#: plpy_main.c:124
 #, c-format
 msgid "Python major version mismatch in session"
 msgstr "las versiones mayores de Python no coinciden en esta sesión"
 
-#: plpy_main.c:94
+#: plpy_main.c:125
 #, 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."
 
-#: plpy_main.c:96
+#: plpy_main.c:127
 #, c-format
 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."
 
-#: plpy_main.c:111
+#: plpy_main.c:150
+#, c-format
+msgid "multiple Python libraries are present in session"
+msgstr "hay múltiples librerías de Python presentes en esta sesión"
+
+#: plpy_main.c:151
+#, c-format
+msgid "Only one Python major version can be used in one session."
+msgstr "Sólo se puede usar una versión mayor de Python en cada sesión."
+
+#: plpy_main.c:167
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "error no capturado en la inicialización"
 
-#: plpy_main.c:134
+#: plpy_main.c:190
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "no se pudo importar el módulo «__main__»"
 
-#: plpy_main.c:139
+#: plpy_main.c:195
 #, c-format
 msgid "could not create globals"
 msgstr "no se pudo crear las globales"
 
-#: plpy_main.c:143
+#: plpy_main.c:199
 #, c-format
 msgid "could not initialize globals"
 msgstr "no se pudo inicializar las globales"
 
-#: plpy_main.c:348
+#: plpy_main.c:409
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "función PL/Python «%s»"
 
-#: plpy_main.c:355
+#: plpy_main.c:416
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "bloque de código anónimo de PL/Python"
@@ -224,56 +234,61 @@
 msgid "plan.status takes no arguments"
 msgstr "plan.status no lleva argumentos"
 
-#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#: plpy_plpymodule.c:181 plpy_plpymodule.c:184
 #, c-format
 msgid "could not import \"plpy\" module"
 msgstr "no se pudo importar el módulo «plpy»"
 
-#: plpy_plpymodule.c:196
+#: plpy_plpymodule.c:199
+#, c-format
+msgid "could not create the spiexceptions module"
+msgstr "no se pudo crear el módulo spiexceptions"
+
+#: plpy_plpymodule.c:207
 #, c-format
 msgid "could not add the spiexceptions module"
 msgstr "no se pudo importar el módulo spiexceptions"
 
-#: plpy_plpymodule.c:217
+#: plpy_plpymodule.c:236
 #, c-format
-msgid "could not create the base SPI exceptions"
-msgstr "no se pudo crear las excepciones SPI basales"
+msgid "could not create exception \"%s\""
+msgstr "no se pudo crear la excepción «%s»"
 
-#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
+#: plpy_plpymodule.c:271 plpy_plpymodule.c:275
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "no se pudo generar excepciones SPI"
 
-#: plpy_plpymodule.c:387
+#: plpy_plpymodule.c:408
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "no se pudo desempaquetar los argumentos de plpy.elog"
 
-#: plpy_plpymodule.c:395
+#: plpy_plpymodule.c:416
 msgid "could not parse error message in plpy.elog"
 msgstr "no se pudo analizar el mensaje de error de plpy.elog"
 
-#: plpy_procedure.c:213
+#: plpy_procedure.c:223
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones disparadoras sólo pueden ser llamadas como disparadores"
 
-#: plpy_procedure.c:218
+#: plpy_procedure.c:228
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "las funciones PL/Python no pueden retornar el tipo %s"
 
-#: plpy_procedure.c:300
+#: plpy_procedure.c:310
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "la funciones PL/Python no pueden aceptar el tipo %s"
 
-#: plpy_procedure.c:398
+#: plpy_procedure.c:408
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "no se pudo compilar la función PL/Python «%s»"
 
-#: plpy_procedure.c:401
+#: plpy_procedure.c:411
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "no se pudo compilar el bloque anónimo PL/Python"
@@ -423,8 +438,11 @@
 msgid "could not extract bytes from encoded string"
 msgstr "no se pudo extraer bytes desde la cadena codificada"
 
+#~ 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."
+
 #~ msgid "plpy.prepare does not support composite types"
 #~ msgstr "plpy.prepare no soporta tipos compuestos"
 
-#~ 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."
+#~ msgid "could not create the base SPI exceptions"
+#~ msgstr "no se pudo crear las excepciones SPI basales"
diff -Nru postgresql-9.5-9.5.2/src/pl/plpython/po/fr.po postgresql-9.5-9.5.8/src/pl/plpython/po/fr.po
--- postgresql-9.5-9.5.2/src/pl/plpython/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpython/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-17 02:37+0000\n"
-"PO-Revision-Date: 2016-02-21 15:46+0100\n"
+"POT-Creation-Date: 2017-02-06 16:15+0000\n"
+"PO-Revision-Date: 2017-02-06 18:59+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: plpy_cursorobject.c:98
 #, c-format
@@ -61,7 +61,7 @@
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "fermeture d'un curseur dans une sous-transaction annulée"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
+#: plpy_elog.c:108 plpy_elog.c:109 plpy_plpymodule.c:440
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -247,32 +247,37 @@
 msgid "plan.status takes no arguments"
 msgstr "plan.status ne prends pas d'arguments"
 
-#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#: plpy_plpymodule.c:181 plpy_plpymodule.c:184
 #, c-format
 msgid "could not import \"plpy\" module"
 msgstr "n'a pas pu importer le module « plpy »"
 
-#: plpy_plpymodule.c:196
+#: plpy_plpymodule.c:199
+#, c-format
+msgid "could not create the spiexceptions module"
+msgstr "n'a pas pu créer le module « spiexceptions »"
+
+#: plpy_plpymodule.c:207
 #, c-format
 msgid "could not add the spiexceptions module"
 msgstr "n'a pas pu ajouter le module « spiexceptions »"
 
-#: plpy_plpymodule.c:217
+#: plpy_plpymodule.c:236
 #, c-format
-msgid "could not create the base SPI exceptions"
-msgstr "n'a pas pu créer les exceptions SPI de base"
+msgid "could not create exception \"%s\""
+msgstr "n'a pas pu créer l'exception « %s »"
 
-#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
+#: plpy_plpymodule.c:271 plpy_plpymodule.c:275
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "n'a pas pu générer les exceptions SPI"
 
-#: plpy_plpymodule.c:387
+#: plpy_plpymodule.c:408
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "n'a pas pu déballer les arguments dans plpy.elog"
 
-#: plpy_plpymodule.c:395
+#: plpy_plpymodule.c:416
 msgid "could not parse error message in plpy.elog"
 msgstr "n'a pas pu analyser le message d'erreur dans plpy.elog"
 
@@ -452,58 +457,61 @@
 msgid "could not extract bytes from encoded string"
 msgstr "n'a pas pu extraire les octets de la chaîne encodée"
 
-#~ msgid "PL/Python function \"%s\" could not execute plan"
-#~ msgstr "la fonction PL/python « %s » n'a pas pu exécuter un plan"
+#~ msgid "plpy.prepare does not support composite types"
+#~ msgstr "plpy.prepare ne supporte pas les types composites"
 
-#~ 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"
-#~ "de retour"
+#~ 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."
 
-#~ 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"
+#~ msgid "unrecognized error in PLy_spi_execute_fetch_result"
+#~ msgstr "erreur inconnue dans PLy_spi_execute_fetch_result"
 
-#~ msgid "PL/Python function \"%s\" failed"
-#~ msgstr "échec de la fonction PL/python « %s »"
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "échec de PyCObject_AsVoidPtr()"
 
-#~ msgid "out of memory"
-#~ msgstr "mémoire épuisée"
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "échec de PyCObject_FromVoidPtr()"
 
-#~ msgid "PL/Python: %s"
-#~ msgstr "PL/python : %s"
+#~ msgid "transaction aborted"
+#~ msgstr "transaction annulée"
 
-#~ msgid "could not create procedure cache"
-#~ msgstr "n'a pas pu créer le cache de procédure"
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr "arguments invalides pour plpy.prepare"
 
-#~ msgid "unrecognized error in PLy_spi_execute_query"
-#~ msgstr "erreur inconnue dans PLy_spi_execute_query"
+#~ 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_prepare"
-#~ msgstr "erreur inconnue dans PLy_spi_prepare"
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "erreur inconnue dans PLy_spi_execute_query"
 
-#~ msgid "invalid arguments for plpy.prepare"
-#~ msgstr "arguments invalides pour plpy.prepare"
+#~ msgid "could not create procedure cache"
+#~ msgstr "n'a pas pu créer le cache de procédure"
 
-#~ msgid "transaction aborted"
-#~ msgstr "transaction annulée"
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/python : %s"
 
-#~ msgid "PyCObject_FromVoidPtr() failed"
-#~ msgstr "échec de PyCObject_FromVoidPtr()"
+#~ msgid "out of memory"
+#~ msgstr "mémoire épuisée"
 
-#~ msgid "PyCObject_AsVoidPtr() failed"
-#~ msgstr "échec de PyCObject_AsVoidPtr()"
+#~ msgid "PL/Python function \"%s\" failed"
+#~ msgstr "échec de la fonction PL/python « %s »"
 
-#~ msgid "unrecognized error in PLy_spi_execute_fetch_result"
-#~ msgstr "erreur inconnue dans PLy_spi_execute_fetch_result"
+#~ 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"
 
-#~ 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."
+#~ 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"
+#~ "de retour"
 
-#~ msgid "plpy.prepare does not support composite types"
-#~ msgstr "plpy.prepare ne supporte pas les types composites"
+#~ msgid "PL/Python function \"%s\" could not execute plan"
+#~ msgstr "la fonction PL/python « %s » n'a pas pu exécuter un plan"
+
+#~ msgid "could not create the base SPI exceptions"
+#~ msgstr "n'a pas pu créer les exceptions SPI de base"
diff -Nru postgresql-9.5-9.5.2/src/pl/plpython/po/it.po postgresql-9.5-9.5.8/src/pl/plpython/po/it.po
--- postgresql-9.5-9.5.2/src/pl/plpython/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpython/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -19,8 +19,8 @@
 msgstr ""
 "Project-Id-Version: plpython (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-07-06 14:37+0000\n"
-"PO-Revision-Date: 2015-07-06 19:38+0100\n"
+"POT-Creation-Date: 2017-02-09 21:15+0000\n"
+"PO-Revision-Date: 2017-04-23 02:56+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -28,7 +28,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: plpy_cursorobject.c:98
 #, c-format
@@ -72,7 +72,7 @@
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "chiusura di un cursore in una sotto-transazione interrotta"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
+#: plpy_elog.c:108 plpy_elog.c:109 plpy_plpymodule.c:440
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -152,77 +152,87 @@
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "creazione del nuovo dizionario nella costruzione degli argomenti del trigger fallita"
 
-#: plpy_exec.c:665
+#: plpy_exec.c:666
 #, c-format
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] cancellato, non è possibile modificare la riga"
 
-#: plpy_exec.c:669
+#: plpy_exec.c:671
 #, c-format
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] non è un dizionario"
 
-#: plpy_exec.c:693
+#: plpy_exec.c:696
 #, 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"
 
-#: plpy_exec.c:699
+#: plpy_exec.c:703
 #, 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"
 
-#: plpy_exec.c:779
+#: plpy_exec.c:783
 #, c-format
 msgid "while modifying trigger row"
 msgstr "durante la modifica della riga trigger"
 
-#: plpy_exec.c:840
+#: plpy_exec.c:844
 #, c-format
 msgid "forcibly aborting a subtransaction that has not been exited"
 msgstr "interruzione forzata di una sotto-transazione che non è terminata"
 
-#: plpy_main.c:93
+#: plpy_main.c:124
 #, c-format
 msgid "Python major version mismatch in session"
 msgstr "mancata corrispondenza della versione maggiore di Python nella sessione"
 
-#: plpy_main.c:94
+#: plpy_main.c:125
 #, c-format
 msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
 msgstr "Questa sessione ha precedentemente usato Python con versione maggiore %d e ora sta tentando di usare Python con versione maggiore %d."
 
-#: plpy_main.c:96
+#: plpy_main.c:127
 #, c-format
 msgid "Start a new session to use a different Python major version."
 msgstr "Avvia una nuova sessione per usa una versione maggiore di Python diversa."
 
-#: plpy_main.c:111
+#: plpy_main.c:150
+#, c-format
+msgid "multiple Python libraries are present in session"
+msgstr "c'è più di una libreria Python presente nella sessione"
+
+#: plpy_main.c:151
+#, c-format
+msgid "Only one Python major version can be used in one session."
+msgstr "Solo una versione maggiore di Python può essere usata in una sessione."
+
+#: plpy_main.c:167
 #, c-format
 msgid "untrapped error in initialization"
 msgstr "errore non catturato durante l'inizializzazione"
 
-#: plpy_main.c:134
+#: plpy_main.c:190
 #, c-format
 msgid "could not import \"__main__\" module"
 msgstr "importazione del modulo \"__main__\""
 
-#: plpy_main.c:139
+#: plpy_main.c:195
 #, c-format
 msgid "could not create globals"
 msgstr "creazione delle variabili globali fallita"
 
-#: plpy_main.c:143
+#: plpy_main.c:199
 #, c-format
 msgid "could not initialize globals"
 msgstr "inizializzazione delle variabili globali fallita"
 
-#: plpy_main.c:348
+#: plpy_main.c:409
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "funzione PL/Python \"%s\""
 
-#: plpy_main.c:355
+#: plpy_main.c:416
 #, c-format
 msgid "PL/Python anonymous code block"
 msgstr "blocco di codice anonimo in PL/Python"
@@ -232,56 +242,61 @@
 msgid "plan.status takes no arguments"
 msgstr "plan.status non accetta argomenti"
 
-#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#: plpy_plpymodule.c:181 plpy_plpymodule.c:184
 #, c-format
 msgid "could not import \"plpy\" module"
 msgstr "importazione del modulo \"plpy\" fallita"
 
-#: plpy_plpymodule.c:196
+#: plpy_plpymodule.c:199
+#, c-format
+msgid "could not create the spiexceptions module"
+msgstr "creazione del modulo spiexceptions fallita"
+
+#: plpy_plpymodule.c:207
 #, c-format
 msgid "could not add the spiexceptions module"
 msgstr "aggiunta del modulo spiexceptions fallita"
 
-#: plpy_plpymodule.c:217
+#: plpy_plpymodule.c:236
 #, c-format
-msgid "could not create the base SPI exceptions"
-msgstr "creazione delle eccezioni SPI di base fallita"
+msgid "could not create exception \"%s\""
+msgstr "creazione dell'eccezione \"%s\" fallita"
 
-#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
+#: plpy_plpymodule.c:271 plpy_plpymodule.c:275
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "generazione delle eccezioni SPI fallita"
 
-#: plpy_plpymodule.c:387
+#: plpy_plpymodule.c:408
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "non è stato possibile espandere gli argomenti in plpy.elog"
 
-#: plpy_plpymodule.c:395
+#: plpy_plpymodule.c:416
 msgid "could not parse error message in plpy.elog"
 msgstr "non è stato possibile interpretare il messaggio di errore in plpy.elog"
 
-#: plpy_procedure.c:213
+#: plpy_procedure.c:223
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "le funzioni trigger possono essere chiamate esclusivamente da trigger"
 
-#: plpy_procedure.c:218
+#: plpy_procedure.c:228
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "le funzioni PL/Python non possono restituire il tipo %s"
 
-#: plpy_procedure.c:300
+#: plpy_procedure.c:310
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "le funzioni PL/Python non possono accettare il tipo %s"
 
-#: plpy_procedure.c:398
+#: plpy_procedure.c:408
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "compilazione della funzione PL/Python \"%s\" fallita"
 
-#: plpy_procedure.c:401
+#: plpy_procedure.c:411
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "compilazione del blocco di codice anonimo PL/Python fallita"
@@ -396,27 +411,27 @@
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "il valore restituito dalla funzione con tipo restituito array non è una sequenza Python"
 
-#: plpy_typeio.c:982
+#: plpy_typeio.c:992
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "la chiave \"%s\" non è stata trovata nel dizionario"
 
-#: plpy_typeio.c:983
+#: plpy_typeio.c:993
 #, c-format
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr "Per restituire null in una colonna, inserire nella mappa il valore None con una chiave chiamata come la colonna."
 
-#: plpy_typeio.c:1034
+#: plpy_typeio.c:1044
 #, c-format
 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"
 
-#: plpy_typeio.c:1145
+#: plpy_typeio.c:1155
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "l'attributo \"%s\" non esiste nell'oggetto Python"
 
-#: plpy_typeio.c:1146
+#: plpy_typeio.c:1156
 #, c-format
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr "Per restituire null in una colonna, l'oggetto restituito deve avere un attributo chiamato come la colonna con valore None."
diff -Nru postgresql-9.5-9.5.2/src/pl/plpython/po/pt_BR.po postgresql-9.5-9.5.8/src/pl/plpython/po/pt_BR.po
--- postgresql-9.5-9.5.2/src/pl/plpython/po/pt_BR.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpython/po/pt_BR.po	2017-08-07 21:13:41.000000000 +0000
@@ -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-2016.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2009-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-02-13 17:22-0300\n"
+"POT-Creation-Date: 2017-05-08 15:51-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"
@@ -59,7 +59,7 @@
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "fechando um cursor em uma subtransação abortada"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
+#: plpy_elog.c:108 plpy_elog.c:109 plpy_plpymodule.c:440
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -229,56 +229,61 @@
 msgid "plan.status takes no arguments"
 msgstr "plan.status não contém argumentos"
 
-#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#: plpy_plpymodule.c:181 plpy_plpymodule.c:184
 #, c-format
 msgid "could not import \"plpy\" module"
 msgstr "não pôde importar módulo \"plpy\""
 
-#: plpy_plpymodule.c:196
+#: plpy_plpymodule.c:199
+#, c-format
+msgid "could not create the spiexceptions module"
+msgstr "não pôde criar o módulo spiexceptions"
+
+#: plpy_plpymodule.c:207
 #, c-format
 msgid "could not add the spiexceptions module"
 msgstr "não pôde adicionar o módulo spiexceptions"
 
-#: plpy_plpymodule.c:217
+#: plpy_plpymodule.c:236
 #, c-format
-msgid "could not create the base SPI exceptions"
-msgstr "não pôde criar as exceções base da SPI"
+msgid "could not create exception \"%s\""
+msgstr "não pôde criar exceção \"%s\""
 
-#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
+#: plpy_plpymodule.c:271 plpy_plpymodule.c:275
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "não pôde gerar exceções da SPI"
 
-#: plpy_plpymodule.c:387
+#: plpy_plpymodule.c:408
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "não pode desempacotar argumentos em plpy.elog"
 
-#: plpy_plpymodule.c:395
+#: plpy_plpymodule.c:416
 msgid "could not parse error message in plpy.elog"
 msgstr "não pode analisar mensagem de erro em plpy.elog"
 
-#: plpy_procedure.c:213
+#: plpy_procedure.c:223
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "funções de gatilho só podem ser chamadas como gatilhos"
 
-#: plpy_procedure.c:218
+#: plpy_procedure.c:228
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "funções PL/Python não podem retornar tipo %s"
 
-#: plpy_procedure.c:300
+#: plpy_procedure.c:310
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "funções PL/Python não podem aceitar tipo %s"
 
-#: plpy_procedure.c:398
+#: plpy_procedure.c:408
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "não pôde compilar função PL/Python \"%s\""
 
-#: plpy_procedure.c:401
+#: plpy_procedure.c:411
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "não pôde compilar bloco de código PL/Python anônimo"
diff -Nru postgresql-9.5-9.5.2/src/pl/plpython/po/ru.po postgresql-9.5-9.5.8/src/pl/plpython/po/ru.po
--- postgresql-9.5-9.5.2/src/pl/plpython/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/plpython/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,28 +1,22 @@
 # Russian message translation file for plpython
-# Copyright (C) 2012 PostgreSQL Global Development Group
+# Copyright (C) 2012-2016 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Alexander Lakhin <exclusion@gmail.com>, 2012.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# ChangeLog:
-#   - August 6, 2012: Alexander Lakhin <exclusion@gmail.com>.
-#   - June 27, 2012: Updates for 9.2. Alexander Lakhin <exclusion@gmail.com>.
-#   - April 3, 2012: Bug fixes. Alexander Lakhin <exclusion@gmail.com>.
-#   - February 18, 2012: Complete translation for 9.1. Alexander Lakhin <exclusion@gmail.com>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.2\n"
+"Project-Id-Version: plpython (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-01-15 04:37+0000\n"
-"PO-Revision-Date: 2016-01-17 08:04+0300\n"
+"POT-Creation-Date: 2017-02-06 22:15+0000\n"
+"PO-Revision-Date: 2017-02-02 15:21+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 2.0\n"
 
 #: plpy_cursorobject.c:98
 #, c-format
@@ -67,7 +61,7 @@
 msgid "closing a cursor in an aborted subtransaction"
 msgstr "закрытие кур�ора в прерванной подтранзакции"
 
-#: plpy_elog.c:103 plpy_elog.c:104 plpy_plpymodule.c:419
+#: plpy_elog.c:108 plpy_elog.c:109 plpy_plpymodule.c:440
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -256,56 +250,61 @@
 msgid "plan.status takes no arguments"
 msgstr "plan.status не принимает аргументы"
 
-#: plpy_plpymodule.c:178 plpy_plpymodule.c:181
+#: plpy_plpymodule.c:181 plpy_plpymodule.c:184
 #, c-format
 msgid "could not import \"plpy\" module"
 msgstr "не удало�ь импортировать модуль \"plpy\""
 
-#: plpy_plpymodule.c:196
+#: plpy_plpymodule.c:199
+#, c-format
+msgid "could not create the spiexceptions module"
+msgstr "не удало�ь �оздать модуль spiexceptions"
+
+#: plpy_plpymodule.c:207
 #, c-format
 msgid "could not add the spiexceptions module"
 msgstr "не удало�ь добавить модуль spiexceptions"
 
-#: plpy_plpymodule.c:217
+#: plpy_plpymodule.c:236
 #, c-format
-msgid "could not create the base SPI exceptions"
-msgstr "не удало�ь �оздать базовые объекты и�ключений SPI"
+msgid "could not create exception \"%s\""
+msgstr "не удало�ь �генерировать и�ключение \"%s\""
 
-#: plpy_plpymodule.c:252 plpy_plpymodule.c:256
+#: plpy_plpymodule.c:271 plpy_plpymodule.c:275
 #, c-format
 msgid "could not generate SPI exceptions"
 msgstr "не удало�ь �генерировать и�ключени� SPI"
 
-#: plpy_plpymodule.c:387
+#: plpy_plpymodule.c:408
 #, c-format
 msgid "could not unpack arguments in plpy.elog"
 msgstr "не удало�ь ра�паковать аргументы в plpy.elog"
 
-#: plpy_plpymodule.c:395
+#: plpy_plpymodule.c:416
 msgid "could not parse error message in plpy.elog"
 msgstr "не удало�ь разобрать �ообщение об ошибке в plpy.elog"
 
-#: plpy_procedure.c:213
+#: plpy_procedure.c:223
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "триггерные функции могут вызывать�� только в триггерах"
 
-#: plpy_procedure.c:218
+#: plpy_procedure.c:228
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "функции PL/Python не могут возвращать тип %s"
 
-#: plpy_procedure.c:300
+#: plpy_procedure.c:310
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "функции PL/Python не могут принимать тип %s"
 
-#: plpy_procedure.c:398
+#: plpy_procedure.c:408
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "не удало�ь �компилировать функцию PL/Python \"%s\""
 
-#: plpy_procedure.c:401
+#: plpy_procedure.c:411
 #, c-format
 msgid "could not compile anonymous PL/Python code block"
 msgstr "не удало�ь �компилировать анонимный блок кода PL/Python"
@@ -470,6 +469,9 @@
 msgid "could not extract bytes from encoded string"
 msgstr "не удало�ь извлечь байты из кодированной �троки"
 
+#~ msgid "could not create the base SPI exceptions"
+#~ msgstr "не удало�ь �оздать базовые объекты и�ключений SPI"
+
 #~ msgid "plpy.prepare does not support composite types"
 #~ msgstr "plpy.prepare не поддерживает �о�тавные типы"
 
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/expected/pltcl_queries_1.out postgresql-9.5-9.5.8/src/pl/tcl/expected/pltcl_queries_1.out
--- postgresql-9.5-9.5.2/src/pl/tcl/expected/pltcl_queries_1.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/expected/pltcl_queries_1.out	1970-01-01 00:00:00.000000000 +0000
@@ -1,258 +0,0 @@
--- suppress CONTEXT so that function OIDs aren't in output
-\set VERBOSITY terse
-insert into T_pkey1 values (1, 'key1-1', 'test key');
-insert into T_pkey1 values (1, 'key1-2', 'test key');
-insert into T_pkey1 values (1, 'key1-3', 'test key');
-insert into T_pkey1 values (2, 'key2-1', 'test key');
-insert into T_pkey1 values (2, 'key2-2', 'test key');
-insert into T_pkey1 values (2, 'key2-3', 'test key');
-insert into T_pkey2 values (1, 'key1-1', 'test key');
-insert into T_pkey2 values (1, 'key1-2', 'test key');
-insert into T_pkey2 values (1, 'key1-3', 'test key');
-insert into T_pkey2 values (2, 'key2-1', 'test key');
-insert into T_pkey2 values (2, 'key2-2', 'test key');
-insert into T_pkey2 values (2, 'key2-3', 'test key');
-select * from T_pkey1;
- key1 |         key2         |                   txt                    
-------+----------------------+------------------------------------------
-    1 | key1-1               | test key                                
-    1 | key1-2               | test key                                
-    1 | key1-3               | test key                                
-    2 | key2-1               | test key                                
-    2 | key2-2               | test key                                
-    2 | key2-3               | test key                                
-(6 rows)
-
--- key2 in T_pkey2 should have upper case only
-select * from T_pkey2;
- key1 |         key2         |                   txt                    
-------+----------------------+------------------------------------------
-    1 | KEY1-1               | test key                                
-    1 | KEY1-2               | test key                                
-    1 | KEY1-3               | test key                                
-    2 | KEY2-1               | test key                                
-    2 | KEY2-2               | test key                                
-    2 | KEY2-3               | test key                                
-(6 rows)
-
-insert into T_pkey1 values (1, 'KEY1-3', 'should work');
--- Due to the upper case translation in trigger this must fail
-insert into T_pkey2 values (1, 'KEY1-3', 'should fail');
-ERROR:  duplicate key '1', 'KEY1-3' for T_pkey2
-insert into T_dta1 values ('trec 1', 1, 'key1-1');
-insert into T_dta1 values ('trec 2', 1, 'key1-2');
-insert into T_dta1 values ('trec 3', 1, 'key1-3');
--- Must fail due to unknown key in T_pkey1
-insert into T_dta1 values ('trec 4', 1, 'key1-4');
-ERROR:  key for t_dta1 not in t_pkey1
-insert into T_dta2 values ('trec 1', 1, 'KEY1-1');
-insert into T_dta2 values ('trec 2', 1, 'KEY1-2');
-insert into T_dta2 values ('trec 3', 1, 'KEY1-3');
--- Must fail due to unknown key in T_pkey2
-insert into T_dta2 values ('trec 4', 1, 'KEY1-4');
-ERROR:  key for t_dta2 not in t_pkey2
-select * from T_dta1;
-    tkey    | ref1 |         ref2         
-------------+------+----------------------
- trec 1     |    1 | key1-1              
- trec 2     |    1 | key1-2              
- trec 3     |    1 | key1-3              
-(3 rows)
-
-select * from T_dta2;
-    tkey    | ref1 |         ref2         
-------------+------+----------------------
- trec 1     |    1 | KEY1-1              
- trec 2     |    1 | KEY1-2              
- trec 3     |    1 | KEY1-3              
-(3 rows)
-
-update T_pkey1 set key2 = 'key2-9' where key1 = 2 and key2 = 'key2-1';
-update T_pkey1 set key2 = 'key1-9' where key1 = 1 and key2 = 'key1-1';
-ERROR:  key '1', 'key1-1              ' referenced by T_dta1
-delete from T_pkey1 where key1 = 2 and key2 = 'key2-2';
-delete from T_pkey1 where key1 = 1 and key2 = 'key1-2';
-ERROR:  key '1', 'key1-2              ' referenced by T_dta1
-update T_pkey2 set key2 = 'KEY2-9' where key1 = 2 and key2 = 'KEY2-1';
-update T_pkey2 set key2 = 'KEY1-9' where key1 = 1 and key2 = 'KEY1-1';
-NOTICE:  updated 1 entries in T_dta2 for new key in T_pkey2
-delete from T_pkey2 where key1 = 2 and key2 = 'KEY2-2';
-delete from T_pkey2 where key1 = 1 and key2 = 'KEY1-2';
-NOTICE:  deleted 1 entries from T_dta2
-select * from T_pkey1;
- key1 |         key2         |                   txt                    
-------+----------------------+------------------------------------------
-    1 | key1-1               | test key                                
-    1 | key1-2               | test key                                
-    1 | key1-3               | test key                                
-    2 | key2-3               | test key                                
-    1 | KEY1-3               | should work                             
-    2 | key2-9               | test key                                
-(6 rows)
-
-select * from T_pkey2;
- key1 |         key2         |                   txt                    
-------+----------------------+------------------------------------------
-    1 | KEY1-3               | test key                                
-    2 | KEY2-3               | test key                                
-    2 | KEY2-9               | test key                                
-    1 | KEY1-9               | test key                                
-(4 rows)
-
-select * from T_dta1;
-    tkey    | ref1 |         ref2         
-------------+------+----------------------
- trec 1     |    1 | key1-1              
- trec 2     |    1 | key1-2              
- trec 3     |    1 | key1-3              
-(3 rows)
-
-select * from T_dta2;
-    tkey    | ref1 |         ref2         
-------------+------+----------------------
- trec 3     |    1 | KEY1-3              
- trec 1     |    1 | KEY1-9              
-(2 rows)
-
-select tcl_avg(key1) from T_pkey1;
- tcl_avg 
----------
-       1
-(1 row)
-
-select tcl_sum(key1) from T_pkey1;
- tcl_sum 
----------
-       8
-(1 row)
-
-select tcl_avg(key1) from T_pkey2;
- tcl_avg 
----------
-       1
-(1 row)
-
-select tcl_sum(key1) from T_pkey2;
- tcl_sum 
----------
-       6
-(1 row)
-
--- The following should return NULL instead of 0
-select tcl_avg(key1) from T_pkey1 where key1 = 99;
- tcl_avg 
----------
-        
-(1 row)
-
-select tcl_sum(key1) from T_pkey1 where key1 = 99;
- tcl_sum 
----------
-       0
-(1 row)
-
-select 1 @< 2;
- ?column? 
-----------
- t
-(1 row)
-
-select 100 @< 4;
- ?column? 
-----------
- f
-(1 row)
-
-select * from T_pkey1 order by key1 using @<, key2;
- key1 |         key2         |                   txt                    
-------+----------------------+------------------------------------------
-    1 | key1-1               | test key                                
-    1 | key1-2               | test key                                
-    1 | key1-3               | test key                                
-    1 | KEY1-3               | should work                             
-    2 | key2-3               | test key                                
-    2 | key2-9               | test key                                
-(6 rows)
-
-select * from T_pkey2 order by key1 using @<, key2;
- key1 |         key2         |                   txt                    
-------+----------------------+------------------------------------------
-    1 | KEY1-3               | test key                                
-    1 | KEY1-9               | test key                                
-    2 | KEY2-3               | test key                                
-    2 | KEY2-9               | test key                                
-(4 rows)
-
--- show dump of trigger data
-insert into trigger_test values(1,'insert');
-NOTICE:  NEW: {i: 1, v: insert}
-NOTICE:  OLD: {}
-NOTICE:  TG_level: ROW
-NOTICE:  TG_name: show_trigger_data_trig
-NOTICE:  TG_op: INSERT
-NOTICE:  TG_relatts: {{} i v}
-NOTICE:  TG_relid: bogus:12345
-NOTICE:  TG_table_name: trigger_test
-NOTICE:  TG_table_schema: public
-NOTICE:  TG_when: BEFORE
-NOTICE:  args: {23 skidoo}
-insert into trigger_test_view values(2,'insert');
-NOTICE:  NEW: {i: 2, v: insert}
-NOTICE:  OLD: {}
-NOTICE:  TG_level: ROW
-NOTICE:  TG_name: show_trigger_data_view_trig
-NOTICE:  TG_op: INSERT
-NOTICE:  TG_relatts: {{} i v}
-NOTICE:  TG_relid: bogus:12345
-NOTICE:  TG_table_name: trigger_test_view
-NOTICE:  TG_table_schema: public
-NOTICE:  TG_when: {INSTEAD OF}
-NOTICE:  args: {24 {skidoo view}}
-update trigger_test_view set v = 'update' where i=1;
-NOTICE:  NEW: {i: 1, v: update}
-NOTICE:  OLD: {i: 1, v: insert}
-NOTICE:  TG_level: ROW
-NOTICE:  TG_name: show_trigger_data_view_trig
-NOTICE:  TG_op: UPDATE
-NOTICE:  TG_relatts: {{} i v}
-NOTICE:  TG_relid: bogus:12345
-NOTICE:  TG_table_name: trigger_test_view
-NOTICE:  TG_table_schema: public
-NOTICE:  TG_when: {INSTEAD OF}
-NOTICE:  args: {24 {skidoo view}}
-delete from trigger_test_view;
-NOTICE:  NEW: {}
-NOTICE:  OLD: {i: 1, v: insert}
-NOTICE:  TG_level: ROW
-NOTICE:  TG_name: show_trigger_data_view_trig
-NOTICE:  TG_op: DELETE
-NOTICE:  TG_relatts: {{} i v}
-NOTICE:  TG_relid: bogus:12345
-NOTICE:  TG_table_name: trigger_test_view
-NOTICE:  TG_table_schema: public
-NOTICE:  TG_when: {INSTEAD OF}
-NOTICE:  args: {24 {skidoo view}}
-update trigger_test set v = 'update' where i = 1;
-NOTICE:  NEW: {i: 1, v: update}
-NOTICE:  OLD: {i: 1, v: insert}
-NOTICE:  TG_level: ROW
-NOTICE:  TG_name: show_trigger_data_trig
-NOTICE:  TG_op: UPDATE
-NOTICE:  TG_relatts: {{} i v}
-NOTICE:  TG_relid: bogus:12345
-NOTICE:  TG_table_name: trigger_test
-NOTICE:  TG_table_schema: public
-NOTICE:  TG_when: BEFORE
-NOTICE:  args: {23 skidoo}
-delete from trigger_test;
-NOTICE:  NEW: {}
-NOTICE:  OLD: {i: 1, v: update}
-NOTICE:  TG_level: ROW
-NOTICE:  TG_name: show_trigger_data_trig
-NOTICE:  TG_op: DELETE
-NOTICE:  TG_relatts: {{} i v}
-NOTICE:  TG_relid: bogus:12345
-NOTICE:  TG_table_name: trigger_test
-NOTICE:  TG_table_schema: public
-NOTICE:  TG_when: BEFORE
-NOTICE:  args: {23 skidoo}
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/expected/pltcl_queries.out postgresql-9.5-9.5.8/src/pl/tcl/expected/pltcl_queries.out
--- postgresql-9.5-9.5.2/src/pl/tcl/expected/pltcl_queries.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/expected/pltcl_queries.out	2017-08-07 21:13:41.000000000 +0000
@@ -163,7 +163,7 @@
  f
 (1 row)
 
-select * from T_pkey1 order by key1 using @<, key2;
+select * from T_pkey1 order by key1 using @<, key2 collate "C";
  key1 |         key2         |                   txt                    
 ------+----------------------+------------------------------------------
     1 | KEY1-3               | should work                             
@@ -174,7 +174,7 @@
     2 | key2-9               | test key                                
 (6 rows)
 
-select * from T_pkey2 order by key1 using @<, key2;
+select * from T_pkey2 order by key1 using @<, key2 collate "C";
  key1 |         key2         |                   txt                    
 ------+----------------------+------------------------------------------
     1 | KEY1-3               | test key                                
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/expected/pltcl_setup.out postgresql-9.5-9.5.8/src/pl/tcl/expected/pltcl_setup.out
--- postgresql-9.5-9.5.2/src/pl/tcl/expected/pltcl_setup.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/expected/pltcl_setup.out	2017-08-07 21:13:41.000000000 +0000
@@ -507,7 +507,7 @@
 create function tcl_date_week(int4,int4,int4) returns text as $$
     return [clock format [clock scan "$2/$3/$1"] -format "%U"]
 $$ language pltcl immutable;
-select tcl_date_week(2010,1,24);
+select tcl_date_week(2010,1,26);
  tcl_date_week 
 ---------------
  04
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/pltcl.c postgresql-9.5-9.5.8/src/pl/tcl/pltcl.c
--- postgresql-9.5-9.5.2/src/pl/tcl/pltcl.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/pltcl.c	2017-08-07 21:13:41.000000000 +0000
@@ -1079,20 +1079,22 @@
 			FmgrInfo	finfo;
 
 			/************************************************************
-			 * Ignore ".tupno" pseudo elements (see pltcl_set_tuple_values)
-			 ************************************************************/
-			if (strcmp(ret_name, ".tupno") == 0)
-				continue;
-
-			/************************************************************
 			 * Get the attribute number
+			 *
+			 * We silently ignore ".tupno", if it's present but doesn't match
+			 * any actual output column.  This allows direct use of a row
+			 * returned by pltcl_set_tuple_values().
 			 ************************************************************/
 			attnum = SPI_fnumber(tupdesc, ret_name);
 			if (attnum == SPI_ERROR_NOATTRIBUTE)
+			{
+				if (strcmp(ret_name, ".tupno") == 0)
+					continue;
 				ereport(ERROR,
 						(errcode(ERRCODE_UNDEFINED_COLUMN),
 						 errmsg("unrecognized attribute \"%s\"",
 								ret_name)));
+			}
 			if (attnum <= 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -2505,8 +2507,7 @@
 	CONST84 char *nullname = NULL;
 
 	/************************************************************
-	 * Prepare pointers for Tcl_SetVar2() below and in array
-	 * mode set the .tupno element
+	 * Prepare pointers for Tcl_SetVar2() below
 	 ************************************************************/
 	if (arrayname == NULL)
 	{
@@ -2517,6 +2518,12 @@
 	{
 		arrptr = &arrayname;
 		nameptr = &attname;
+
+		/*
+		 * When outputting to an array, fill the ".tupno" element with the
+		 * current tuple number.  This will be overridden below if ".tupno" is
+		 * in use as an actual field name in the rowtype.
+		 */
 		snprintf(buf, sizeof(buf), "%d", tupno);
 		Tcl_SetVar2(interp, arrayname, ".tupno", buf, 0);
 	}
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/po/de.po postgresql-9.5-9.5.8/src/pl/tcl/po/de.po
--- postgresql-9.5-9.5.2/src/pl/tcl/po/de.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/po/de.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,7 +1,7 @@
 # German message translation file for PL/Tcl
 # Peter Eisentraut <peter_e@gmx.net>, 2009 - 2015.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
@@ -19,12 +19,12 @@
 #: pltcl.c:555
 #, c-format
 msgid "module \"unknown\" not found in pltcl_modules"
-msgstr "Modul „unknown“ nicht in pltcl_modules gefunden"
+msgstr "Modul »unknown« nicht in pltcl_modules gefunden"
 
 #: pltcl.c:591
 #, c-format
 msgid "could not load module \"unknown\": %s"
-msgstr "konnte Modul „unknown“ nicht laden: %s"
+msgstr "konnte Modul »unknown« nicht laden: %s"
 
 #: pltcl.c:1047
 #, c-format
@@ -39,12 +39,12 @@
 #: pltcl.c:1094
 #, c-format
 msgid "unrecognized attribute \"%s\""
-msgstr "unbekanntes Attribute „%s“"
+msgstr "unbekanntes Attribute »%s«"
 
 #: pltcl.c:1099
 #, c-format
 msgid "cannot set system attribute \"%s\""
-msgstr "Systemattribut „%s“ kann nicht gesetzt werden"
+msgstr "Systemattribut »%s« kann nicht gesetzt werden"
 
 #: pltcl.c:1222 pltcl.c:1648
 #, c-format
@@ -58,7 +58,7 @@
 "in PL/Tcl function \"%s\""
 msgstr ""
 "%s\n"
-"in PL/Tcl-Funktion „%s“"
+"in PL/Tcl-Funktion »%s«"
 
 #: pltcl.c:1331 pltcl.c:1338
 #, c-format
@@ -88,4 +88,4 @@
 #: pltcl.c:1564
 #, c-format
 msgid "could not create internal procedure \"%s\": %s"
-msgstr "konnte interne Prozedur „%s“ nicht erzeugen: %s"
+msgstr "konnte interne Prozedur »%s« nicht erzeugen: %s"
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/po/es.po postgresql-9.5-9.5.8/src/pl/tcl/po/es.po
--- postgresql-9.5-9.5.2/src/pl/tcl/po/es.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/po/es.po	2017-08-07 21:13:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: pltcl (PostgreSQL 9.5)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-10-04 00:37+0000\n"
+"POT-Creation-Date: 2017-05-21 17:26+0000\n"
 "PO-Revision-Date: 2015-09-29 23:23-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
@@ -39,22 +39,22 @@
 msgid "trigger's return list must have even number of elements"
 msgstr "la lista de retorno del disparador debe tener un número par de elementos"
 
-#: pltcl.c:1094
+#: pltcl.c:1095
 #, c-format
 msgid "unrecognized attribute \"%s\""
 msgstr "atributo «%s» no reconocido"
 
-#: pltcl.c:1099
+#: pltcl.c:1101
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "no se puede definir el atributo de sistema «%s»"
 
-#: pltcl.c:1222 pltcl.c:1648
+#: pltcl.c:1224 pltcl.c:1650
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pltcl.c:1223
+#: pltcl.c:1225
 #, c-format
 msgid ""
 "%s\n"
@@ -63,32 +63,32 @@
 "%s\n"
 "en función PL/Tcl \"%s\""
 
-#: pltcl.c:1331 pltcl.c:1338
+#: pltcl.c:1333 pltcl.c:1340
 #, c-format
 msgid "out of memory"
 msgstr "memoria agotada"
 
-#: pltcl.c:1386
+#: pltcl.c:1388
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones disparadoras sólo pueden ser invocadas como disparadores"
 
-#: pltcl.c:1395
+#: pltcl.c:1397
 #, c-format
 msgid "PL/Tcl functions cannot return type %s"
 msgstr "las funciones PL/Tcl no pueden retornar tipo %s"
 
-#: pltcl.c:1407
+#: pltcl.c:1409
 #, c-format
 msgid "PL/Tcl functions cannot return composite types"
 msgstr "las funciones PL/Tcl no pueden retornar tipos compuestos"
 
-#: pltcl.c:1446
+#: pltcl.c:1448
 #, c-format
 msgid "PL/Tcl functions cannot accept type %s"
 msgstr "las funciones PL/Tcl no pueden aceptar el tipog%s"
 
-#: pltcl.c:1564
+#: pltcl.c:1566
 #, c-format
 msgid "could not create internal procedure \"%s\": %s"
 msgstr "no se pudo crear procedimiento interno «%s»: %s"
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/po/fr.po postgresql-9.5-9.5.8/src/pl/tcl/po/fr.po
--- postgresql-9.5-9.5.2/src/pl/tcl/po/fr.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/po/fr.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,12 +1,12 @@
 # translation of pltcl.po to fr_fr
 # french message translation file for pltcl
 #
-# Use these quotes: « %s »
+# Use these quotes: « %s »
 # Guillaume Lelarge <guillaume@lelarge.info>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2016-02-21 16:07+0000\n"
 "PO-Revision-Date: 2016-02-21 17:18+0100\n"
@@ -14,39 +14,39 @@
 "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-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
 #: pltcl.c:555
 #, c-format
 msgid "module \"unknown\" not found in pltcl_modules"
-msgstr "module « unkown » introuvable dans pltcl_modules"
+msgstr "module « unkown » introuvable dans pltcl_modules"
 
 #: pltcl.c:591
 #, c-format
 msgid "could not load module \"unknown\": %s"
-msgstr "n'a pas pu charger le module « unknown » : %s"
+msgstr "n'a pas pu charger le module « unknown » : %s"
 
 #: pltcl.c:1047
 #, c-format
 msgid "could not split return value from trigger: %s"
-msgstr "n'a pas pu séparer la valeur de retour du trigger : %s"
+msgstr "n'a pas pu séparer la valeur de retour du trigger : %s"
 
 #: pltcl.c:1058
 #, c-format
 msgid "trigger's return list must have even number of elements"
-msgstr "la liste de retour du trigger doit avoir un nombre pair d'éléments"
+msgstr "la liste de retour du trigger doit avoir un nombre pair d'éléments"
 
 #: pltcl.c:1094
 #, c-format
 msgid "unrecognized attribute \"%s\""
-msgstr "attribut « %s » non reconnu"
+msgstr "attribut « %s » non reconnu"
 
 #: pltcl.c:1099
 #, c-format
 msgid "cannot set system attribute \"%s\""
-msgstr "ne peut pas initialiser l'attribut système « %s »"
+msgstr "ne peut pas initialiser l'attribut système « %s »"
 
 #: pltcl.c:1222 pltcl.c:1648
 #, c-format
@@ -60,17 +60,17 @@
 "in PL/Tcl function \"%s\""
 msgstr ""
 "%s\n"
-"dans la fonction PL/Tcl « %s »"
+"dans la fonction PL/Tcl « %s »"
 
 #: pltcl.c:1331 pltcl.c:1338
 #, c-format
 msgid "out of memory"
-msgstr "mémoire épuisée"
+msgstr "mémoire épuisée"
 
 #: pltcl.c:1386
 #, c-format
 msgid "trigger functions can only be called as triggers"
-msgstr "les fonctions trigger peuvent seulement être appelées par des triggers"
+msgstr "les fonctions trigger peuvent seulement être appelées par des triggers"
 
 #: pltcl.c:1395
 #, c-format
@@ -90,4 +90,4 @@
 #: pltcl.c:1564
 #, c-format
 msgid "could not create internal procedure \"%s\": %s"
-msgstr "n'a pas pu créer la procédure interne « %s » : %s"
+msgstr "n'a pas pu créer la procédure interne « %s » : %s"
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/po/it.po postgresql-9.5-9.5.8/src/pl/tcl/po/it.po
--- postgresql-9.5-9.5.2/src/pl/tcl/po/it.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/po/it.po	2017-08-07 21:13:41.000000000 +0000
@@ -18,14 +18,15 @@
 msgstr ""
 "Project-Id-Version: pltcl (PostgreSQL) 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-08-15 18:37+0000\n"
-"PO-Revision-Date: 2015-08-16 10:05+0100\n"
+"POT-Creation-Date: 2016-04-12 00:37+0000\n"
+"PO-Revision-Date: 2016-04-17 03:40+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\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: Poedit 1.5.4\n"
 
 #: pltcl.c:555
@@ -45,8 +46,8 @@
 
 #: pltcl.c:1058
 #, c-format
-msgid "invalid return list from trigger - must have even # of elements"
-msgstr "lista restituita dal trigger non valida: deve avere un numero pari di elementi"
+msgid "trigger's return list must have even number of elements"
+msgstr "la lista restituita dal trigger deve avere un numero pari di elementi"
 
 #: pltcl.c:1094
 #, c-format
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/po/ru.po postgresql-9.5-9.5.8/src/pl/tcl/po/ru.po
--- postgresql-9.5-9.5.2/src/pl/tcl/po/ru.po	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/po/ru.po	2017-08-07 21:13:41.000000000 +0000
@@ -1,25 +1,22 @@
 # Russian message translation file for pltcl
-# Copyright (C) 2012 PostgreSQL Global Development Group
+# Copyright (C) 2012-2016 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Alexander Lakhin <exclusion@gmail.com>, 2012.
+# Alexander Lakhin <exclusion@gmail.com>, 2012-2017.
 #
-# ChangeLog:
-#   - February 18, 2012: Complete translation for 9.1. Alexander Lakhin <exclusion@gmail.com>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.2\n"
+"Project-Id-Version: pltcl (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-09-19 03:07+0000\n"
-"PO-Revision-Date: 2015-10-16 21:38+0400\n"
+"POT-Creation-Date: 2016-11-23 19:15+0000\n"
+"PO-Revision-Date: 2016-09-20 12:00+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
-"Language-Team: Russian <pgsql-translators@postgresql.org>\n"
+"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
 "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 2.0\n"
 
 #: pltcl.c:555
 #, c-format
@@ -41,22 +38,22 @@
 msgid "trigger's return list must have even number of elements"
 msgstr "в возвращаемом триггером �пи�ке должно быть чётное чи�ло �лементов"
 
-#: pltcl.c:1094
+#: pltcl.c:1095
 #, c-format
 msgid "unrecognized attribute \"%s\""
 msgstr "нера�познанный атрибут \"%s\""
 
-#: pltcl.c:1099
+#: pltcl.c:1101
 #, c-format
 msgid "cannot set system attribute \"%s\""
 msgstr "у�тановить �и�темный атрибут \"%s\" нельз�"
 
-#: pltcl.c:1222 pltcl.c:1648
+#: pltcl.c:1224 pltcl.c:1650
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pltcl.c:1223
+#: pltcl.c:1225
 #, c-format
 msgid ""
 "%s\n"
@@ -65,32 +62,32 @@
 "%s\n"
 "в функции PL/Tcl \"%s\""
 
-#: pltcl.c:1331 pltcl.c:1338
+#: pltcl.c:1333 pltcl.c:1340
 #, c-format
 msgid "out of memory"
 msgstr "нехватка пам�ти"
 
-#: pltcl.c:1386
+#: pltcl.c:1388
 #, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "триггерные функции могут вызывать�� только в триггерах"
 
-#: pltcl.c:1395
+#: pltcl.c:1397
 #, c-format
 msgid "PL/Tcl functions cannot return type %s"
 msgstr "функции PL/Tcl не могут возвращать тип %s"
 
-#: pltcl.c:1407
+#: pltcl.c:1409
 #, c-format
 msgid "PL/Tcl functions cannot return composite types"
 msgstr "функции PL/Tcl не могут возвращать �о�тавные типы"
 
-#: pltcl.c:1446
+#: pltcl.c:1448
 #, c-format
 msgid "PL/Tcl functions cannot accept type %s"
 msgstr "функции PL/Tcl не могут принимать тип %s"
 
-#: pltcl.c:1564
+#: pltcl.c:1566
 #, c-format
 msgid "could not create internal procedure \"%s\": %s"
 msgstr "не удало�ь �оздать внутреннюю процедуру \"%s\": %s"
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/sql/pltcl_queries.sql postgresql-9.5-9.5.8/src/pl/tcl/sql/pltcl_queries.sql
--- postgresql-9.5-9.5.2/src/pl/tcl/sql/pltcl_queries.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/sql/pltcl_queries.sql	2017-08-07 21:13:41.000000000 +0000
@@ -70,8 +70,8 @@
 select 1 @< 2;
 select 100 @< 4;
 
-select * from T_pkey1 order by key1 using @<, key2;
-select * from T_pkey2 order by key1 using @<, key2;
+select * from T_pkey1 order by key1 using @<, key2 collate "C";
+select * from T_pkey2 order by key1 using @<, key2 collate "C";
 
 -- show dump of trigger data
 insert into trigger_test values(1,'insert');
diff -Nru postgresql-9.5-9.5.2/src/pl/tcl/sql/pltcl_setup.sql postgresql-9.5-9.5.8/src/pl/tcl/sql/pltcl_setup.sql
--- postgresql-9.5-9.5.2/src/pl/tcl/sql/pltcl_setup.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/pl/tcl/sql/pltcl_setup.sql	2017-08-07 21:13:41.000000000 +0000
@@ -557,7 +557,7 @@
     return [clock format [clock scan "$2/$3/$1"] -format "%U"]
 $$ language pltcl immutable;
 
-select tcl_date_week(2010,1,24);
+select tcl_date_week(2010,1,26);
 select tcl_date_week(2001,10,24);
 
 -- test pltcl event triggers
diff -Nru postgresql-9.5-9.5.2/src/port/chklocale.c postgresql-9.5-9.5.8/src/port/chklocale.c
--- postgresql-9.5-9.5.2/src/port/chklocale.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/port/chklocale.c	2017-08-07 21:13:41.000000000 +0000
@@ -19,6 +19,10 @@
 #include "postgres_fe.h"
 #endif
 
+#if defined(WIN32) && (_MSC_VER >= 1900)
+#include <windows.h>
+#endif
+
 #include <locale.h>
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
@@ -196,6 +200,16 @@
  * locale machinery determine the code page.  See comments at IsoLocaleName().
  * For other compilers, follow the locale's predictable format.
  *
+ * Visual Studio 2015 should still be able to do the same, but the declaration
+ * of lc_codepage is missing in _locale_t, causing this code compilation to
+ * fail, hence this falls back instead on GetLocaleInfoEx. VS 2015 may be an
+ * exception and post-VS2015 versions should be able to handle properly the
+ * codepage number using _create_locale(). So, instead of the same logic as
+ * VS 2012 and VS 2013, this routine uses GetLocaleInfoEx to parse short
+ * locale names like "de-DE", "fr-FR", etc. If those cannot be parsed correctly
+ * process falls back to the pre-VS-2010 manual parsing done with
+ * using <Language>_<Country>.<CodePage> as a base.
+ *
  * Returns a malloc()'d string for the caller to free.
  */
 static char *
@@ -203,7 +217,7 @@
 {
 	char	   *r = NULL;
 
-#if (_MSC_VER >= 1700)
+#if (_MSC_VER >= 1700) && (_MSC_VER < 1900)
 	_locale_t	loct = NULL;
 
 	loct = _create_locale(LC_CTYPE, ctype);
@@ -217,20 +231,41 @@
 #else
 	char	   *codepage;
 
-	/*
-	 * Locale format on Win32 is <Language>_<Country>.<CodePage> . For
-	 * example, English_United States.1252.
-	 */
-	codepage = strrchr(ctype, '.');
-	if (codepage != NULL)
+#if (_MSC_VER >= 1900)
+	uint32		cp;
+	WCHAR		wctype[LOCALE_NAME_MAX_LENGTH];
+
+	memset(wctype, 0, sizeof(wctype));
+	MultiByteToWideChar(CP_ACP, 0, ctype, -1, wctype, LOCALE_NAME_MAX_LENGTH);
+
+	if (GetLocaleInfoEx(wctype,
+			LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER,
+			(LPWSTR) &cp, sizeof(cp) / sizeof(WCHAR)) > 0)
 	{
-		int			ln;
-
-		codepage++;
-		ln = strlen(codepage);
-		r = malloc(ln + 3);
+		r = malloc(16);			/* excess */
 		if (r != NULL)
-			sprintf(r, "CP%s", codepage);
+			sprintf(r, "CP%u", cp);
+	}
+	else
+#endif
+	{
+
+		/*
+		 * Locale format on Win32 is <Language>_<Country>.<CodePage> . For
+		 * example, English_United States.1252.
+		 */
+		codepage = strrchr(ctype, '.');
+		if (codepage != NULL)
+		{
+			int			ln;
+
+			codepage++;
+			ln = strlen(codepage);
+			r = malloc(ln + 3);
+			if (r != NULL)
+				sprintf(r, "CP%s", codepage);
+		}
+
 	}
 #endif
 
diff -Nru postgresql-9.5-9.5.2/src/port/dirmod.c postgresql-9.5-9.5.8/src/port/dirmod.c
--- postgresql-9.5-9.5.2/src/port/dirmod.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/port/dirmod.c	2017-08-07 21:13:41.000000000 +0000
@@ -206,7 +206,9 @@
 		LPSTR		msg;
 
 		errno = 0;
-		FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+		FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+					  FORMAT_MESSAGE_IGNORE_INSERTS |
+					  FORMAT_MESSAGE_FROM_SYSTEM,
 					  NULL, GetLastError(),
 					  MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
 					  (LPSTR) &msg, 0, NULL);
@@ -281,7 +283,9 @@
 		LPSTR		msg;
 
 		errno = 0;
-		FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+		FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+					  FORMAT_MESSAGE_IGNORE_INSERTS |
+					  FORMAT_MESSAGE_FROM_SYSTEM,
 					  NULL, GetLastError(),
 					  MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
 					  (LPSTR) &msg, 0, NULL);
diff -Nru postgresql-9.5-9.5.2/src/port/noblock.c postgresql-9.5-9.5.8/src/port/noblock.c
--- postgresql-9.5-9.5.2/src/port/noblock.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/port/noblock.c	2017-08-07 21:13:41.000000000 +0000
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
  *
  * noblock.c
- *	  set a file descriptor as non-blocking
+ *	  set a file descriptor as blocking or non-blocking
  *
  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -17,11 +17,22 @@
 #include <fcntl.h>
 
 
+/*
+ * Put socket into nonblock mode.
+ * Returns true on success, false on failure.
+ */
 bool
 pg_set_noblock(pgsocket sock)
 {
 #if !defined(WIN32)
-	return (fcntl(sock, F_SETFL, O_NONBLOCK) != -1);
+	int			flags;
+
+	flags = fcntl(sock, F_GETFL);
+	if (flags < 0)
+		return false;
+	if (fcntl(sock, F_SETFL, (flags | O_NONBLOCK)) == -1)
+		return false;
+	return true;
 #else
 	unsigned long ioctlsocket_ret = 1;
 
@@ -30,7 +41,10 @@
 #endif
 }
 
-
+/*
+ * Put socket into blocking mode.
+ * Returns true on success, false on failure.
+ */
 bool
 pg_set_block(pgsocket sock)
 {
@@ -38,7 +52,9 @@
 	int			flags;
 
 	flags = fcntl(sock, F_GETFL);
-	if (flags < 0 || fcntl(sock, F_SETFL, (long) (flags & ~O_NONBLOCK)))
+	if (flags < 0)
+		return false;
+	if (fcntl(sock, F_SETFL, (flags & ~O_NONBLOCK)) == -1)
 		return false;
 	return true;
 #else
diff -Nru postgresql-9.5-9.5.2/src/port/path.c postgresql-9.5-9.5.8/src/port/path.c
--- postgresql-9.5-9.5.2/src/port/path.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/port/path.c	2017-08-07 21:13:41.000000000 +0000
@@ -86,7 +86,11 @@
 bool
 has_drive_prefix(const char *path)
 {
+#ifdef WIN32
 	return skip_drive(path) != path;
+#else
+	return false;
+#endif
 }
 
 /*
diff -Nru postgresql-9.5-9.5.2/src/port/pgsleep.c postgresql-9.5-9.5.8/src/port/pgsleep.c
--- postgresql-9.5-9.5.2/src/port/pgsleep.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/port/pgsleep.c	2017-08-07 21:13:41.000000000 +0000
@@ -14,6 +14,9 @@
 
 #include <unistd.h>
 #include <sys/time.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 
 /*
  * In a Windows backend, we don't use this implementation, but rather
diff -Nru postgresql-9.5-9.5.2/src/port/win32env.c postgresql-9.5-9.5.8/src/port/win32env.c
--- postgresql-9.5-9.5.2/src/port/win32env.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/port/win32env.c	2017-08-07 21:13:41.000000000 +0000
@@ -1,9 +1,8 @@
 /*-------------------------------------------------------------------------
  *
  * win32env.c
- *	  putenv() and unsetenv() for win32, that updates both process
- *	  environment and the cached versions in (potentially multiple)
- *	  MSVCRT.
+ *	  putenv() and unsetenv() for win32, which update both process environment
+ *	  and caches in (potentially multiple) C run-time library (CRT) versions.
  *
  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -24,17 +23,10 @@
 	char	   *cp;
 
 	/*
-	 * Each version of MSVCRT has its own _putenv() call in the runtime
-	 * library.
-	 *
-	 * mingw always uses MSVCRT.DLL, but if we are in a Visual C++
-	 * environment, attempt to update the environment in all MSVCRT modules
-	 * that are currently loaded, to work properly with any third party
-	 * libraries linked against a different MSVCRT but still relying on
-	 * environment variables.
-	 *
-	 * Also separately update the system environment that gets inherited by
-	 * subprocesses.
+	 * Each CRT has its own _putenv() symbol and copy of the environment.
+	 * Update the environment in each CRT module currently loaded, so every
+	 * third-party library sees this change regardless of the CRT it links
+	 * against.
 	 */
 #ifdef _MSC_VER
 	typedef int (_cdecl * PUTENVPROC) (const char *);
@@ -46,28 +38,61 @@
 	}			rtmodules[] =
 	{
 		{
-			"msvcrt", 0, NULL
-		},						/* Visual Studio 6.0 / mingw */
+			"msvcrt", NULL, NULL
+		},						/* Visual Studio 6.0 / MinGW */
 		{
-			"msvcr70", 0, NULL
+			"msvcrtd", NULL, NULL
+		},
+		{
+			"msvcr70", NULL, NULL
 		},						/* Visual Studio 2002 */
 		{
-			"msvcr71", 0, NULL
+			"msvcr70d", NULL, NULL
+		},
+		{
+			"msvcr71", NULL, NULL
 		},						/* Visual Studio 2003 */
 		{
-			"msvcr80", 0, NULL
+			"msvcr71d", NULL, NULL
+		},
+		{
+			"msvcr80", NULL, NULL
 		},						/* Visual Studio 2005 */
 		{
-			"msvcr90", 0, NULL
+			"msvcr80d", NULL, NULL
+		},
+		{
+			"msvcr90", NULL, NULL
 		},						/* Visual Studio 2008 */
 		{
-			"msvcr100", 0, NULL
+			"msvcr90d", NULL, NULL
+		},
+		{
+			"msvcr100", NULL, NULL
 		},						/* Visual Studio 2010 */
 		{
-			"msvcr110", 0, NULL
+			"msvcr100d", NULL, NULL
+		},
+		{
+			"msvcr110", NULL, NULL
 		},						/* Visual Studio 2012 */
 		{
-			NULL, 0, NULL
+			"msvcr110d", NULL, NULL
+		},
+		{
+			"msvcr120", NULL, NULL
+		},						/* Visual Studio 2013 */
+		{
+			"msvcr120d", NULL, NULL
+		},
+		{
+			"ucrtbase", NULL, NULL
+		},						/* Visual Studio 2015 and later */
+		{
+			"ucrtbased", NULL, NULL
+		},
+		{
+			NULL, NULL, NULL
 		}
 	};
 	int			i;
@@ -76,7 +101,7 @@
 	{
 		if (rtmodules[i].putenvFunc == NULL)
 		{
-			if (rtmodules[i].hmodule == 0)
+			if (rtmodules[i].hmodule == NULL)
 			{
 				/* Not attempted before, so try to find this DLL */
 				rtmodules[i].hmodule = GetModuleHandle(rtmodules[i].modulename);
@@ -94,7 +119,6 @@
 					rtmodules[i].putenvFunc = (PUTENVPROC) GetProcAddress(rtmodules[i].hmodule, "_putenv");
 					if (rtmodules[i].putenvFunc == NULL)
 					{
-						CloseHandle(rtmodules[i].hmodule);
 						rtmodules[i].hmodule = INVALID_HANDLE_VALUE;
 						continue;
 					}
@@ -115,8 +139,8 @@
 #endif   /* _MSC_VER */
 
 	/*
-	 * Update the process environment - to make modifications visible to child
-	 * processes.
+	 * Update process environment, making this change visible to child
+	 * processes and to CRTs initializing in the future.
 	 *
 	 * Need a copy of the string so we can modify it.
 	 */
@@ -136,7 +160,7 @@
 		/*
 		 * Only call SetEnvironmentVariable() when we are adding a variable,
 		 * not when removing it. Calling it on both crashes on at least
-		 * certain versions of MingW.
+		 * certain versions of MinGW.
 		 */
 		if (!SetEnvironmentVariable(envcpy, cp))
 		{
diff -Nru postgresql-9.5-9.5.2/src/port/win32ver.rc postgresql-9.5-9.5.8/src/port/win32ver.rc
--- postgresql-9.5-9.5.2/src/port/win32ver.rc	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/port/win32ver.rc	2017-08-07 21:13:41.000000000 +0000
@@ -2,8 +2,8 @@
 #include "pg_config.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION    9,5,2,0
- PRODUCTVERSION 9,5,2,0
+ FILEVERSION    9,5,8,0
+ PRODUCTVERSION 9,5,8,0
  FILEFLAGSMASK  0x17L
  FILEFLAGS      0x0L
  FILEOS         VOS_NT_WINDOWS32
diff -Nru postgresql-9.5-9.5.2/src/test/examples/testlibpq2.c postgresql-9.5-9.5.8/src/test/examples/testlibpq2.c
--- postgresql-9.5-9.5.2/src/test/examples/testlibpq2.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/examples/testlibpq2.c	2017-08-07 21:13:41.000000000 +0000
@@ -34,6 +34,10 @@
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 #include "libpq-fe.h"
 
 static void
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/expected/eval-plan-qual.out postgresql-9.5-9.5.8/src/test/isolation/expected/eval-plan-qual.out
--- postgresql-9.5-9.5.2/src/test/isolation/expected/eval-plan-qual.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/expected/eval-plan-qual.out	2017-08-07 21:13:41.000000000 +0000
@@ -163,3 +163,24 @@
 
 1              newTableAValue (1,tableBValue)
 step c2: COMMIT;
+
+starting permutation: wrtwcte readwcte c1 c2
+step wrtwcte: UPDATE table_a SET value = 'tableAValue2' WHERE id = 1;
+step readwcte: 
+	WITH
+	    cte1 AS (
+	      SELECT id FROM table_b WHERE value = 'tableBValue'
+	    ),
+	    cte2 AS (
+	      SELECT * FROM table_a
+	      WHERE id = (SELECT id FROM cte1)
+	      FOR UPDATE
+	    )
+	SELECT * FROM cte2;
+ <waiting ...>
+step c1: COMMIT;
+step c2: COMMIT;
+step readwcte: <... completed>
+id             value          
+
+1              tableAValue2   
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/expected/insert-conflict-do-nothing-2.out postgresql-9.5-9.5.8/src/test/isolation/expected/insert-conflict-do-nothing-2.out
--- postgresql-9.5-9.5.2/src/test/isolation/expected/insert-conflict-do-nothing-2.out	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/expected/insert-conflict-do-nothing-2.out	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,105 @@
+Parsed test spec with 2 sessions
+
+starting permutation: beginrr1 beginrr2 donothing1 c1 donothing2 c2 show
+step beginrr1: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step beginrr2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step donothing1: INSERT INTO ints(key, val) VALUES(1, 'donothing1') ON CONFLICT DO NOTHING;
+step c1: COMMIT;
+step donothing2: INSERT INTO ints(key, val) VALUES(1, 'donothing2'), (1, 'donothing3') ON CONFLICT DO NOTHING;
+step c2: COMMIT;
+step show: SELECT * FROM ints;
+key            val            
+
+1              donothing1     
+
+starting permutation: beginrr1 beginrr2 donothing2 c2 donothing1 c1 show
+step beginrr1: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step beginrr2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step donothing2: INSERT INTO ints(key, val) VALUES(1, 'donothing2'), (1, 'donothing3') ON CONFLICT DO NOTHING;
+step c2: COMMIT;
+step donothing1: INSERT INTO ints(key, val) VALUES(1, 'donothing1') ON CONFLICT DO NOTHING;
+step c1: COMMIT;
+step show: SELECT * FROM ints;
+key            val            
+
+1              donothing2     
+
+starting permutation: beginrr1 beginrr2 donothing1 donothing2 c1 c2 show
+step beginrr1: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step beginrr2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step donothing1: INSERT INTO ints(key, val) VALUES(1, 'donothing1') ON CONFLICT DO NOTHING;
+step donothing2: INSERT INTO ints(key, val) VALUES(1, 'donothing2'), (1, 'donothing3') ON CONFLICT DO NOTHING; <waiting ...>
+step c1: COMMIT;
+step donothing2: <... completed>
+error in steps c1 donothing2: ERROR:  could not serialize access due to concurrent update
+step c2: COMMIT;
+step show: SELECT * FROM ints;
+key            val            
+
+1              donothing1     
+
+starting permutation: beginrr1 beginrr2 donothing2 donothing1 c2 c1 show
+step beginrr1: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step beginrr2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step donothing2: INSERT INTO ints(key, val) VALUES(1, 'donothing2'), (1, 'donothing3') ON CONFLICT DO NOTHING;
+step donothing1: INSERT INTO ints(key, val) VALUES(1, 'donothing1') ON CONFLICT DO NOTHING; <waiting ...>
+step c2: COMMIT;
+step donothing1: <... completed>
+error in steps c2 donothing1: ERROR:  could not serialize access due to concurrent update
+step c1: COMMIT;
+step show: SELECT * FROM ints;
+key            val            
+
+1              donothing2     
+
+starting permutation: begins1 begins2 donothing1 c1 donothing2 c2 show
+step begins1: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step begins2: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step donothing1: INSERT INTO ints(key, val) VALUES(1, 'donothing1') ON CONFLICT DO NOTHING;
+step c1: COMMIT;
+step donothing2: INSERT INTO ints(key, val) VALUES(1, 'donothing2'), (1, 'donothing3') ON CONFLICT DO NOTHING;
+step c2: COMMIT;
+step show: SELECT * FROM ints;
+key            val            
+
+1              donothing1     
+
+starting permutation: begins1 begins2 donothing2 c2 donothing1 c1 show
+step begins1: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step begins2: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step donothing2: INSERT INTO ints(key, val) VALUES(1, 'donothing2'), (1, 'donothing3') ON CONFLICT DO NOTHING;
+step c2: COMMIT;
+step donothing1: INSERT INTO ints(key, val) VALUES(1, 'donothing1') ON CONFLICT DO NOTHING;
+step c1: COMMIT;
+step show: SELECT * FROM ints;
+key            val            
+
+1              donothing2     
+
+starting permutation: begins1 begins2 donothing1 donothing2 c1 c2 show
+step begins1: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step begins2: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step donothing1: INSERT INTO ints(key, val) VALUES(1, 'donothing1') ON CONFLICT DO NOTHING;
+step donothing2: INSERT INTO ints(key, val) VALUES(1, 'donothing2'), (1, 'donothing3') ON CONFLICT DO NOTHING; <waiting ...>
+step c1: COMMIT;
+step donothing2: <... completed>
+error in steps c1 donothing2: ERROR:  could not serialize access due to concurrent update
+step c2: COMMIT;
+step show: SELECT * FROM ints;
+key            val            
+
+1              donothing1     
+
+starting permutation: begins1 begins2 donothing2 donothing1 c2 c1 show
+step begins1: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step begins2: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step donothing2: INSERT INTO ints(key, val) VALUES(1, 'donothing2'), (1, 'donothing3') ON CONFLICT DO NOTHING;
+step donothing1: INSERT INTO ints(key, val) VALUES(1, 'donothing1') ON CONFLICT DO NOTHING; <waiting ...>
+step c2: COMMIT;
+step donothing1: <... completed>
+error in steps c2 donothing1: ERROR:  could not serialize access due to concurrent update
+step c1: COMMIT;
+step show: SELECT * FROM ints;
+key            val            
+
+1              donothing2     
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/expected/lock-committed-keyupdate.out postgresql-9.5-9.5.8/src/test/isolation/expected/lock-committed-keyupdate.out
--- postgresql-9.5-9.5.2/src/test/isolation/expected/lock-committed-keyupdate.out	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/expected/lock-committed-keyupdate.out	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,496 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s1b s2b1 s1l s2l s1u s1c s1ul s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+2              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s1u s2l s1c s1ul s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+2              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s1u s1ul s2l s1c s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s2l: <... completed>
+id             value          
+
+1              one            
+2              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s2l s1u s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcku_table;
+id             value          
+
+1              one            
+2              two            
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+2              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s1u s2l s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcku_table;
+id             value          
+
+1              one            
+2              two            
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+2              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s1u s1ul s2l s1c s1hint s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s2l: <... completed>
+id             value          
+
+1              one            
+2              two            
+step s1hint: SELECT * FROM lcku_table;
+id             value          
+
+1              one            
+2              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s2l s1u s1c s1ul s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+error in steps s1ul s2l: ERROR:  could not serialize access due to concurrent update
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s1u s2l s1c s1ul s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+error in steps s1ul s2l: ERROR:  could not serialize access due to concurrent update
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s1u s1ul s2l s1c s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s2l: <... completed>
+error in steps s1c s2l: ERROR:  could not serialize access due to concurrent update
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s2l s1u s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcku_table;
+id             value          
+
+1              one            
+2              two            
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+error in steps s1ul s2l: ERROR:  could not serialize access due to concurrent update
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s1u s2l s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcku_table;
+id             value          
+
+1              one            
+2              two            
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+error in steps s1ul s2l: ERROR:  could not serialize access due to concurrent update
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s1u s1ul s2l s1c s1hint s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s2l: <... completed>
+error in steps s1c s2l: ERROR:  could not serialize access due to concurrent update
+step s1hint: SELECT * FROM lcku_table;
+id             value          
+
+1              one            
+2              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s2l s1u s1c s1ul s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+error in steps s1ul s2l: ERROR:  could not serialize access due to concurrent update
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s1u s2l s1c s1ul s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+error in steps s1ul s2l: ERROR:  could not serialize access due to concurrent update
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s1u s1ul s2l s1c s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s2l: <... completed>
+error in steps s1c s2l: ERROR:  could not serialize access due to concurrent update
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s2l s1u s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcku_table;
+id             value          
+
+1              one            
+2              two            
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+error in steps s1ul s2l: ERROR:  could not serialize access due to concurrent update
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s1u s2l s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcku_table;
+id             value          
+
+1              one            
+2              two            
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+error in steps s1ul s2l: ERROR:  could not serialize access due to concurrent update
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s1u s1ul s2l s1c s1hint s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(578902068);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcku_table SET id = 2 WHERE id = 3;
+step s1ul: SELECT pg_advisory_unlock(578902068);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s2l: <... completed>
+error in steps s1c s2l: ERROR:  could not serialize access due to concurrent update
+step s1hint: SELECT * FROM lcku_table;
+id             value          
+
+1              one            
+2              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/expected/lock-committed-update.out postgresql-9.5-9.5.8/src/test/isolation/expected/lock-committed-update.out
--- postgresql-9.5-9.5.2/src/test/isolation/expected/lock-committed-update.out	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/expected/lock-committed-update.out	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,667 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s1b s2b1 s1l s2l s1u s1c s1ul s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s1u s2l s1c s1ul s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s2l s1ul s1u s1c s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s1u s1ul s2l s1c s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE;
+id             value          
+
+1              one            
+step s1c: COMMIT;
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s2l s1u s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s1u s2l s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s2l s1ul s1u s1c s1hint s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b1 s1l s1u s1ul s2l s1c s1hint s2c
+step s1b: BEGIN;
+step s2b1: BEGIN ISOLATION LEVEL READ COMMITTED;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE;
+id             value          
+
+1              one            
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s2l s1u s1c s1ul s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s1u s2l s1c s1ul s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s2l s1ul s1u s1c s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s1u s1ul s2l s1c s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE;
+id             value          
+
+1              one            
+step s1c: COMMIT;
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s2l s1u s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s1u s2l s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s2l s1ul s1u s1c s1hint s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b2 s1l s1u s1ul s2l s1c s1hint s2c
+step s1b: BEGIN;
+step s2b2: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE;
+id             value          
+
+1              one            
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s2l s1u s1c s1ul s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s1u s2l s1c s1ul s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s2l s1ul s1u s1c s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s1u s1ul s2l s1c s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE;
+id             value          
+
+1              one            
+step s1c: COMMIT;
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s2l s1u s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s1u s2l s1c s1hint s1ul s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s2l s1ul s1u s1c s1hint s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; <waiting ...>
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: <... completed>
+id             value          
+
+1              one            
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
+
+starting permutation: s1b s2b3 s1l s1u s1ul s2l s1c s1hint s2c
+step s1b: BEGIN;
+step s2b3: BEGIN ISOLATION LEVEL SERIALIZABLE;
+step s1l: SELECT pg_advisory_lock(380170116);
+pg_advisory_lock
+
+               
+step s1u: UPDATE lcu_table SET value = 'two' WHERE id = 1;
+step s1ul: SELECT pg_advisory_unlock(380170116);
+pg_advisory_unlock
+
+t              
+step s2l: SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE;
+id             value          
+
+1              one            
+step s1c: COMMIT;
+step s1hint: SELECT * FROM lcu_table;
+id             value          
+
+1              two            
+step s2c: COMMIT;
+pg_advisory_unlock_all
+
+               
+pg_advisory_unlock_all
+
+               
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/expected/lock-update-delete.out postgresql-9.5-9.5.8/src/test/isolation/expected/lock-update-delete.out
--- postgresql-9.5-9.5.2/src/test/isolation/expected/lock-update-delete.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/expected/lock-update-delete.out	2017-08-07 21:13:41.000000000 +0000
@@ -156,7 +156,7 @@
 step s1l: <... completed>
 key            value          
 
-1              2              
+1              1              
 
 starting permutation: s2b s1l s2u s2_blocker1 s2r s2_unlock
 pg_advisory_lock
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/expected/read-write-unique-2.out postgresql-9.5-9.5.8/src/test/isolation/expected/read-write-unique-2.out
--- postgresql-9.5-9.5.2/src/test/isolation/expected/read-write-unique-2.out	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/expected/read-write-unique-2.out	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,29 @@
+Parsed test spec with 2 sessions
+
+starting permutation: r1 r2 w1 w2 c1 c2
+step r1: SELECT * FROM test WHERE i = 42;
+i              
+
+step r2: SELECT * FROM test WHERE i = 42;
+i              
+
+step w1: INSERT INTO test VALUES (42);
+step w2: INSERT INTO test VALUES (42); <waiting ...>
+step c1: COMMIT;
+step w2: <... completed>
+error in steps c1 w2: ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT;
+
+starting permutation: r1 w1 c1 r2 w2 c2
+step r1: SELECT * FROM test WHERE i = 42;
+i              
+
+step w1: INSERT INTO test VALUES (42);
+step c1: COMMIT;
+step r2: SELECT * FROM test WHERE i = 42;
+i              
+
+42             
+step w2: INSERT INTO test VALUES (42);
+ERROR:  duplicate key value violates unique constraint "test_pkey"
+step c2: COMMIT;
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/expected/read-write-unique-3.out postgresql-9.5-9.5.8/src/test/isolation/expected/read-write-unique-3.out
--- postgresql-9.5-9.5.2/src/test/isolation/expected/read-write-unique-3.out	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/expected/read-write-unique-3.out	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,12 @@
+Parsed test spec with 2 sessions
+
+starting permutation: rw1 rw2 c1 c2
+step rw1: SELECT insert_unique(1, '1');
+insert_unique  
+
+               
+step rw2: SELECT insert_unique(1, '2'); <waiting ...>
+step c1: COMMIT;
+step rw2: <... completed>
+error in steps c1 rw2: ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT;
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/expected/read-write-unique-4.out postgresql-9.5-9.5.8/src/test/isolation/expected/read-write-unique-4.out
--- postgresql-9.5-9.5.2/src/test/isolation/expected/read-write-unique-4.out	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/expected/read-write-unique-4.out	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,41 @@
+Parsed test spec with 2 sessions
+
+starting permutation: r1 r2 w1 w2 c1 c2
+step r1: SELECT COALESCE(MAX(invoice_number) + 1, 1) FROM invoice WHERE year = 2016;
+coalesce       
+
+3              
+step r2: SELECT COALESCE(MAX(invoice_number) + 1, 1) FROM invoice WHERE year = 2016;
+coalesce       
+
+3              
+step w1: INSERT INTO invoice VALUES (2016, 3);
+step w2: INSERT INTO invoice VALUES (2016, 3); <waiting ...>
+step c1: COMMIT;
+step w2: <... completed>
+error in steps c1 w2: ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT;
+
+starting permutation: r1 w1 w2 c1 c2
+step r1: SELECT COALESCE(MAX(invoice_number) + 1, 1) FROM invoice WHERE year = 2016;
+coalesce       
+
+3              
+step w1: INSERT INTO invoice VALUES (2016, 3);
+step w2: INSERT INTO invoice VALUES (2016, 3); <waiting ...>
+step c1: COMMIT;
+step w2: <... completed>
+error in steps c1 w2: ERROR:  duplicate key value violates unique constraint "invoice_pkey"
+step c2: COMMIT;
+
+starting permutation: r2 w1 w2 c1 c2
+step r2: SELECT COALESCE(MAX(invoice_number) + 1, 1) FROM invoice WHERE year = 2016;
+coalesce       
+
+3              
+step w1: INSERT INTO invoice VALUES (2016, 3);
+step w2: INSERT INTO invoice VALUES (2016, 3); <waiting ...>
+step c1: COMMIT;
+step w2: <... completed>
+error in steps c1 w2: ERROR:  duplicate key value violates unique constraint "invoice_pkey"
+step c2: COMMIT;
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/expected/read-write-unique.out postgresql-9.5-9.5.8/src/test/isolation/expected/read-write-unique.out
--- postgresql-9.5-9.5.2/src/test/isolation/expected/read-write-unique.out	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/expected/read-write-unique.out	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,29 @@
+Parsed test spec with 2 sessions
+
+starting permutation: r1 r2 w1 w2 c1 c2
+step r1: SELECT * FROM test;
+i              
+
+step r2: SELECT * FROM test;
+i              
+
+step w1: INSERT INTO test VALUES (42);
+step w2: INSERT INTO test VALUES (42); <waiting ...>
+step c1: COMMIT;
+step w2: <... completed>
+error in steps c1 w2: ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT;
+
+starting permutation: r1 w1 c1 r2 w2 c2
+step r1: SELECT * FROM test;
+i              
+
+step w1: INSERT INTO test VALUES (42);
+step c1: COMMIT;
+step r2: SELECT * FROM test;
+i              
+
+42             
+step w2: INSERT INTO test VALUES (42);
+ERROR:  duplicate key value violates unique constraint "test_pkey"
+step c2: COMMIT;
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/expected/update-locked-tuple.out postgresql-9.5-9.5.8/src/test/isolation/expected/update-locked-tuple.out
--- postgresql-9.5-9.5.2/src/test/isolation/expected/update-locked-tuple.out	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/expected/update-locked-tuple.out	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,55 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s1b s2b s2u s2c s1u1 s1u2 s1c
+step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s2b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s2u: UPDATE users SET sometime = '1830-10-04' WHERE id = 1;
+step s2c: COMMIT;
+step s1u1: UPDATE orders SET name = 'order of olivier (2)', user_id = 1 WHERE id = 1;
+step s1u2: UPDATE orders SET name = 'order of olivier (3)', user_id = 1 WHERE id = 1;
+step s1c: COMMIT;
+
+starting permutation: s1b s2b s2u s1u1 s2c s1u2 s1c
+step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s2b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s2u: UPDATE users SET sometime = '1830-10-04' WHERE id = 1;
+step s1u1: UPDATE orders SET name = 'order of olivier (2)', user_id = 1 WHERE id = 1;
+step s2c: COMMIT;
+step s1u2: UPDATE orders SET name = 'order of olivier (3)', user_id = 1 WHERE id = 1;
+step s1c: COMMIT;
+
+starting permutation: s1b s2b s1u1 s2u s2c s1u2 s1c
+step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s2b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1u1: UPDATE orders SET name = 'order of olivier (2)', user_id = 1 WHERE id = 1;
+step s2u: UPDATE users SET sometime = '1830-10-04' WHERE id = 1;
+step s2c: COMMIT;
+step s1u2: UPDATE orders SET name = 'order of olivier (3)', user_id = 1 WHERE id = 1;
+step s1c: COMMIT;
+
+starting permutation: s1b s1u1 s2b s2u s2c s1u2 s1c
+step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1u1: UPDATE orders SET name = 'order of olivier (2)', user_id = 1 WHERE id = 1;
+step s2b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s2u: UPDATE users SET sometime = '1830-10-04' WHERE id = 1;
+step s2c: COMMIT;
+step s1u2: UPDATE orders SET name = 'order of olivier (3)', user_id = 1 WHERE id = 1;
+step s1c: COMMIT;
+
+starting permutation: s1b s1u1 s2b s1u2 s2u s2c s1c
+step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1u1: UPDATE orders SET name = 'order of olivier (2)', user_id = 1 WHERE id = 1;
+step s2b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1u2: UPDATE orders SET name = 'order of olivier (3)', user_id = 1 WHERE id = 1;
+step s2u: UPDATE users SET sometime = '1830-10-04' WHERE id = 1;
+step s2c: COMMIT;
+step s1c: COMMIT;
+
+starting permutation: s1b s1u1 s1u2 s2b s2u s2c s1c
+step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s1u1: UPDATE orders SET name = 'order of olivier (2)', user_id = 1 WHERE id = 1;
+step s1u2: UPDATE orders SET name = 'order of olivier (3)', user_id = 1 WHERE id = 1;
+step s2b: BEGIN ISOLATION LEVEL REPEATABLE READ;
+step s2u: UPDATE users SET sometime = '1830-10-04' WHERE id = 1;
+step s2c: COMMIT;
+step s1c: COMMIT;
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/isolation_schedule postgresql-9.5-9.5.8/src/test/isolation/isolation_schedule
--- postgresql-9.5-9.5.2/src/test/isolation/isolation_schedule	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/isolation_schedule	2017-08-07 21:13:41.000000000 +0000
@@ -1,3 +1,7 @@
+test: read-write-unique
+test: read-write-unique-2
+test: read-write-unique-3
+test: read-write-unique-4
 test: simple-write-skew
 test: receipt-report
 test: temporal-range-integrity
@@ -17,6 +21,7 @@
 test: lock-update-delete
 test: lock-update-traversal
 test: insert-conflict-do-nothing
+test: insert-conflict-do-nothing-2
 test: insert-conflict-do-update
 test: insert-conflict-do-update-2
 test: insert-conflict-do-update-3
@@ -25,6 +30,9 @@
 test: aborted-keyrevoke
 test: multixact-no-deadlock
 test: multixact-no-forget
+test: lock-committed-update
+test: lock-committed-keyupdate
+test: update-locked-tuple
 test: propagate-lock-delete
 test: tuplelock-conflict
 test: nowait
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/eval-plan-qual.spec postgresql-9.5-9.5.8/src/test/isolation/specs/eval-plan-qual.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/eval-plan-qual.spec	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/eval-plan-qual.spec	2017-08-07 21:13:41.000000000 +0000
@@ -103,11 +103,27 @@
 	FROM table_a ta
 	WHERE ta.id = 1 FOR UPDATE OF ta;
 }
+step "wrtwcte"	{ UPDATE table_a SET value = 'tableAValue2' WHERE id = 1; }
 step "c2"	{ COMMIT; }
 
 session "s3"
 setup		{ BEGIN ISOLATION LEVEL READ COMMITTED; }
 step "read"	{ SELECT * FROM accounts ORDER BY accountid; }
+
+# this test exercises EvalPlanQual with a CTE, cf bug #14328
+step "readwcte"	{
+	WITH
+	    cte1 AS (
+	      SELECT id FROM table_b WHERE value = 'tableBValue'
+	    ),
+	    cte2 AS (
+	      SELECT * FROM table_a
+	      WHERE id = (SELECT id FROM cte1)
+	      FOR UPDATE
+	    )
+	SELECT * FROM cte2;
+}
+
 teardown	{ COMMIT; }
 
 permutation "wx1" "wx2" "c1" "c2" "read"
@@ -118,3 +134,4 @@
 permutation "wx2" "partiallock" "c2" "c1" "read"
 permutation "wx2" "lockwithvalues" "c2" "c1" "read"
 permutation "updateforss" "readforss" "c1" "c2"
+permutation "wrtwcte" "readwcte" "c1" "c2"
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/insert-conflict-do-nothing-2.spec postgresql-9.5-9.5.8/src/test/isolation/specs/insert-conflict-do-nothing-2.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/insert-conflict-do-nothing-2.spec	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/insert-conflict-do-nothing-2.spec	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,34 @@
+# INSERT...ON CONFLICT DO NOTHING test with multiple rows
+# in higher isolation levels
+
+setup
+{
+  CREATE TABLE ints (key int primary key, val text);
+}
+
+teardown
+{
+  DROP TABLE ints;
+}
+
+session "s1"
+step "beginrr1" { BEGIN ISOLATION LEVEL REPEATABLE READ; }
+step "begins1" { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "donothing1" { INSERT INTO ints(key, val) VALUES(1, 'donothing1') ON CONFLICT DO NOTHING; }
+step "c1" { COMMIT; }
+step "show" { SELECT * FROM ints; }
+
+session "s2"
+step "beginrr2" { BEGIN ISOLATION LEVEL REPEATABLE READ; }
+step "begins2" { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "donothing2" { INSERT INTO ints(key, val) VALUES(1, 'donothing2'), (1, 'donothing3') ON CONFLICT DO NOTHING; }
+step "c2" { COMMIT; }
+
+permutation "beginrr1" "beginrr2" "donothing1" "c1" "donothing2" "c2" "show"
+permutation "beginrr1" "beginrr2" "donothing2" "c2" "donothing1" "c1" "show"
+permutation "beginrr1" "beginrr2" "donothing1" "donothing2" "c1" "c2" "show"
+permutation "beginrr1" "beginrr2" "donothing2" "donothing1" "c2" "c1" "show"
+permutation "begins1" "begins2" "donothing1" "c1" "donothing2" "c2" "show"
+permutation "begins1" "begins2" "donothing2" "c2" "donothing1" "c1" "show"
+permutation "begins1" "begins2" "donothing1" "donothing2" "c1" "c2" "show"
+permutation "begins1" "begins2" "donothing2" "donothing1" "c2" "c1" "show"
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/lock-committed-keyupdate.spec postgresql-9.5-9.5.8/src/test/isolation/specs/lock-committed-keyupdate.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/lock-committed-keyupdate.spec	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/lock-committed-keyupdate.spec	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,66 @@
+# Test locking of a tuple with a committed key-update.  In this case,
+# the update conflicts with the lock, so failures are expected, except
+# in READ COMMITTED isolation mode.
+#
+# Some of the permutations are commented out that work fine in the
+# lock-committed-update test, because in this case the update blocks.
+
+setup
+{
+    DROP TABLE IF EXISTS lcku_table;
+    CREATE TABLE lcku_table (id INTEGER PRIMARY KEY, value TEXT);
+    INSERT INTO lcku_table VALUES (1, 'one');
+    INSERT INTO lcku_table VALUES (3, 'two');
+}
+
+teardown
+{
+    DROP TABLE lcku_table;
+}
+
+session "s1"
+step "s1b"    { BEGIN; }
+step "s1l"    { SELECT pg_advisory_lock(578902068); }
+step "s1u"    { UPDATE lcku_table SET id = 2 WHERE id = 3; }
+step "s1hint" { SELECT * FROM lcku_table; }
+step "s1ul"   { SELECT pg_advisory_unlock(578902068); }
+step "s1c"    { COMMIT; }
+teardown      { SELECT pg_advisory_unlock_all(); }
+
+session "s2"
+step "s2b1"    { BEGIN ISOLATION LEVEL READ COMMITTED; }
+step "s2b2"    { BEGIN ISOLATION LEVEL REPEATABLE READ; }
+step "s2b3"    { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "s2l"    { SELECT * FROM lcku_table WHERE pg_advisory_lock(578902068) IS NOT NULL FOR KEY SHARE; }
+step "s2c"    { COMMIT; }
+teardown      { SELECT pg_advisory_unlock_all(); }
+
+permutation "s1b" "s2b1" "s1l" "s2l"        "s1u" "s1c"          "s1ul" "s2c"
+permutation "s1b" "s2b1" "s1l" "s1u"        "s2l" "s1c"          "s1ul" "s2c"
+#permutation "s1b" "s2b1" "s1l" "s2l" "s1ul" "s1u" "s1c"                 "s2c"
+permutation "s1b" "s2b1" "s1l" "s1u" "s1ul" "s2l" "s1c"                 "s2c"
+
+permutation "s1b" "s2b1" "s1l" "s2l"        "s1u" "s1c" "s1hint" "s1ul" "s2c"
+permutation "s1b" "s2b1" "s1l" "s1u"        "s2l" "s1c" "s1hint" "s1ul" "s2c"
+#permutation "s1b" "s2b1" "s1l" "s2l" "s1ul" "s1u" "s1c" "s1hint"        "s2c"
+permutation "s1b" "s2b1" "s1l" "s1u" "s1ul" "s2l" "s1c" "s1hint"        "s2c"
+
+permutation "s1b" "s2b2" "s1l" "s2l"        "s1u" "s1c"          "s1ul" "s2c"
+permutation "s1b" "s2b2" "s1l" "s1u"        "s2l" "s1c"          "s1ul" "s2c"
+#permutation "s1b" "s2b2" "s1l" "s2l" "s1ul" "s1u" "s1c"                 "s2c"
+permutation "s1b" "s2b2" "s1l" "s1u" "s1ul" "s2l" "s1c"                 "s2c"
+
+permutation "s1b" "s2b2" "s1l" "s2l"        "s1u" "s1c" "s1hint" "s1ul" "s2c"
+permutation "s1b" "s2b2" "s1l" "s1u"        "s2l" "s1c" "s1hint" "s1ul" "s2c"
+#permutation "s1b" "s2b2" "s1l" "s2l" "s1ul" "s1u" "s1c" "s1hint"        "s2c"
+permutation "s1b" "s2b2" "s1l" "s1u" "s1ul" "s2l" "s1c" "s1hint"        "s2c"
+
+permutation "s1b" "s2b3" "s1l" "s2l"        "s1u" "s1c"          "s1ul" "s2c"
+permutation "s1b" "s2b3" "s1l" "s1u"        "s2l" "s1c"          "s1ul" "s2c"
+#permutation "s1b" "s2b3" "s1l" "s2l" "s1ul" "s1u" "s1c"                 "s2c"
+permutation "s1b" "s2b3" "s1l" "s1u" "s1ul" "s2l" "s1c"                 "s2c"
+
+permutation "s1b" "s2b3" "s1l" "s2l"        "s1u" "s1c" "s1hint" "s1ul" "s2c"
+permutation "s1b" "s2b3" "s1l" "s1u"        "s2l" "s1c" "s1hint" "s1ul" "s2c"
+#permutation "s1b" "s2b3" "s1l" "s2l" "s1ul" "s1u" "s1c" "s1hint"        "s2c"
+permutation "s1b" "s2b3" "s1l" "s1u" "s1ul" "s2l" "s1c" "s1hint"        "s2c"
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/lock-committed-update.spec postgresql-9.5-9.5.8/src/test/isolation/specs/lock-committed-update.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/lock-committed-update.spec	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/lock-committed-update.spec	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,62 @@
+# Test locking of a tuple with a committed update.  When the lock does not
+# conflict with the update, no blocking and no serializability errors should
+# occur.
+
+setup
+{
+    DROP TABLE IF EXISTS lcu_table;
+    CREATE TABLE lcu_table (id INTEGER PRIMARY KEY, value TEXT);
+    INSERT INTO lcu_table VALUES (1, 'one');
+}
+
+teardown
+{
+    DROP TABLE lcu_table;
+}
+
+session "s1"
+step "s1b"    { BEGIN; }
+step "s1l"    { SELECT pg_advisory_lock(380170116); }
+step "s1u"    { UPDATE lcu_table SET value = 'two' WHERE id = 1; }
+step "s1hint" { SELECT * FROM lcu_table; }
+step "s1ul"   { SELECT pg_advisory_unlock(380170116); }
+step "s1c"    { COMMIT; }
+teardown      { SELECT pg_advisory_unlock_all(); }
+
+session "s2"
+step "s2b1"    { BEGIN ISOLATION LEVEL READ COMMITTED; }
+step "s2b2"    { BEGIN ISOLATION LEVEL REPEATABLE READ; }
+step "s2b3"    { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "s2l"    { SELECT * FROM lcu_table WHERE pg_advisory_lock(380170116) IS NOT NULL FOR KEY SHARE; }
+step "s2c"    { COMMIT; }
+teardown      { SELECT pg_advisory_unlock_all(); }
+
+permutation "s1b" "s2b1" "s1l" "s2l"        "s1u" "s1c"          "s1ul" "s2c"
+permutation "s1b" "s2b1" "s1l" "s1u"        "s2l" "s1c"          "s1ul" "s2c"
+permutation "s1b" "s2b1" "s1l" "s2l" "s1ul" "s1u" "s1c"                 "s2c"
+permutation "s1b" "s2b1" "s1l" "s1u" "s1ul" "s2l" "s1c"                 "s2c"
+
+permutation "s1b" "s2b1" "s1l" "s2l"        "s1u" "s1c" "s1hint" "s1ul" "s2c"
+permutation "s1b" "s2b1" "s1l" "s1u"        "s2l" "s1c" "s1hint" "s1ul" "s2c"
+permutation "s1b" "s2b1" "s1l" "s2l" "s1ul" "s1u" "s1c" "s1hint"        "s2c"
+permutation "s1b" "s2b1" "s1l" "s1u" "s1ul" "s2l" "s1c" "s1hint"        "s2c"
+
+permutation "s1b" "s2b2" "s1l" "s2l"        "s1u" "s1c"          "s1ul" "s2c"
+permutation "s1b" "s2b2" "s1l" "s1u"        "s2l" "s1c"          "s1ul" "s2c"
+permutation "s1b" "s2b2" "s1l" "s2l" "s1ul" "s1u" "s1c"                 "s2c"
+permutation "s1b" "s2b2" "s1l" "s1u" "s1ul" "s2l" "s1c"                 "s2c"
+
+permutation "s1b" "s2b2" "s1l" "s2l"        "s1u" "s1c" "s1hint" "s1ul" "s2c"
+permutation "s1b" "s2b2" "s1l" "s1u"        "s2l" "s1c" "s1hint" "s1ul" "s2c"
+permutation "s1b" "s2b2" "s1l" "s2l" "s1ul" "s1u" "s1c" "s1hint"        "s2c"
+permutation "s1b" "s2b2" "s1l" "s1u" "s1ul" "s2l" "s1c" "s1hint"        "s2c"
+
+permutation "s1b" "s2b3" "s1l" "s2l"        "s1u" "s1c"          "s1ul" "s2c"
+permutation "s1b" "s2b3" "s1l" "s1u"        "s2l" "s1c"          "s1ul" "s2c"
+permutation "s1b" "s2b3" "s1l" "s2l" "s1ul" "s1u" "s1c"                 "s2c"
+permutation "s1b" "s2b3" "s1l" "s1u" "s1ul" "s2l" "s1c"                 "s2c"
+
+permutation "s1b" "s2b3" "s1l" "s2l"        "s1u" "s1c" "s1hint" "s1ul" "s2c"
+permutation "s1b" "s2b3" "s1l" "s1u"        "s2l" "s1c" "s1hint" "s1ul" "s2c"
+permutation "s1b" "s2b3" "s1l" "s2l" "s1ul" "s1u" "s1c" "s1hint"        "s2c"
+permutation "s1b" "s2b3" "s1l" "s1u" "s1ul" "s2l" "s1c" "s1hint"        "s2c"
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/read-write-unique-2.spec postgresql-9.5-9.5.8/src/test/isolation/specs/read-write-unique-2.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/read-write-unique-2.spec	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/read-write-unique-2.spec	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,36 @@
+# Read-write-unique test.
+
+setup
+{
+  CREATE TABLE test (i integer PRIMARY KEY);
+}
+
+teardown
+{
+  DROP TABLE test;
+}
+
+session "s1"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "r1" { SELECT * FROM test WHERE i = 42; }
+step "w1" { INSERT INTO test VALUES (42); }
+step "c1" { COMMIT; }
+
+session "s2"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "r2" { SELECT * FROM test WHERE i = 42; }
+step "w2" { INSERT INTO test VALUES (42); }
+step "c2" { COMMIT; }
+
+# Two SSI transactions see that there is no row with value 42
+# in the table, then try to insert that value; T1 inserts,
+# and then T2 blocks waiting for T1 to commit.  Finally,
+# T2 reports a serialization failure.
+
+permutation "r1" "r2" "w1" "w2" "c1" "c2"
+
+# If the value is already visible before T2 begins, then a
+# regular unique constraint violation should still be raised
+# by T2.
+
+permutation "r1" "w1" "c1" "r2" "w2" "c2"
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/read-write-unique-3.spec postgresql-9.5-9.5.8/src/test/isolation/specs/read-write-unique-3.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/read-write-unique-3.spec	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/read-write-unique-3.spec	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,33 @@
+# Read-write-unique test.
+# From bug report 9301.
+
+setup
+{
+  CREATE TABLE test (
+    key   integer UNIQUE,
+    val   text
+  );
+
+  CREATE OR REPLACE FUNCTION insert_unique(k integer, v text) RETURNS void
+  LANGUAGE SQL AS $$
+    INSERT INTO test (key, val) SELECT k, v WHERE NOT EXISTS (SELECT key FROM test WHERE key = k);
+  $$;
+}
+
+teardown
+{
+  DROP FUNCTION insert_unique(integer, text);
+  DROP TABLE test;
+}
+
+session "s1"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "rw1" { SELECT insert_unique(1, '1'); }
+step "c1" { COMMIT; }
+
+session "s2"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "rw2" { SELECT insert_unique(1, '2'); }
+step "c2" { COMMIT; }
+
+permutation "rw1" "rw2" "c1" "c2"
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/read-write-unique-4.spec postgresql-9.5-9.5.8/src/test/isolation/specs/read-write-unique-4.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/read-write-unique-4.spec	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/read-write-unique-4.spec	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,48 @@
+# Read-write-unique test.
+# Implementing a gapless sequence of ID numbers for each year.
+
+setup
+{
+  CREATE TABLE invoice (
+    year int,
+    invoice_number int,
+    PRIMARY KEY (year, invoice_number)
+  );
+
+  INSERT INTO invoice VALUES (2016, 1), (2016, 2);
+}
+
+teardown
+{
+  DROP TABLE invoice;
+}
+
+session "s1"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "r1" { SELECT COALESCE(MAX(invoice_number) + 1, 1) FROM invoice WHERE year = 2016; }
+step "w1" { INSERT INTO invoice VALUES (2016, 3); }
+step "c1" { COMMIT; }
+
+session "s2"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "r2" { SELECT COALESCE(MAX(invoice_number) + 1, 1) FROM invoice WHERE year = 2016; }
+step "w2" { INSERT INTO invoice VALUES (2016, 3); }
+step "c2" { COMMIT; }
+
+# if they both read first then there should be an SSI conflict
+permutation "r1" "r2" "w1" "w2" "c1" "c2"
+
+# cases where one session doesn't explicitly read before writing:
+
+# if s2 doesn't explicitly read, then trying to insert the value
+# generates a unique constraint violation after s1 commits, as if s2
+# ran after s1
+permutation "r1" "w1" "w2" "c1" "c2"
+
+# if s1 doesn't explicitly read, but s2 does, then s1 inserts and
+# commits first, should s2 experience an SSI failure instead of a
+# unique constraint violation?  there is no serial order of operations
+# (s1, s2) or (s2, s1) where s1 succeeds, and s2 doesn't see the row
+# in an explicit select but then fails to insert due to unique
+# constraint violation
+permutation "r2" "w1" "w2" "c1" "c2"
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/read-write-unique.spec postgresql-9.5-9.5.8/src/test/isolation/specs/read-write-unique.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/read-write-unique.spec	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/read-write-unique.spec	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,39 @@
+# Read-write-unique test.
+
+setup
+{
+  CREATE TABLE test (i integer PRIMARY KEY);
+}
+
+teardown
+{
+  DROP TABLE test;
+}
+
+session "s1"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "r1" { SELECT * FROM test; }
+step "w1" { INSERT INTO test VALUES (42); }
+step "c1" { COMMIT; }
+
+session "s2"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; }
+step "r2" { SELECT * FROM test; }
+step "w2" { INSERT INTO test VALUES (42); }
+step "c2" { COMMIT; }
+
+# Two SSI transactions see that there is no row with value 42
+# in the table, then try to insert that value; T1 inserts,
+# and then T2 blocks waiting for T1 to commit.  Finally,
+# T2 reports a serialization failure.
+#
+# (In an earlier version of Postgres, T2 would report a unique
+# constraint violation).
+
+permutation "r1" "r2" "w1" "w2" "c1" "c2"
+
+# If the value is already visible before T2 begins, then a
+# regular unique constraint violation should still be raised
+# by T2.
+
+permutation "r1" "w1" "c1" "r2" "w2" "c2"
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/receipt-report.spec postgresql-9.5-9.5.8/src/test/isolation/specs/receipt-report.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/receipt-report.spec	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/receipt-report.spec	2017-08-07 21:13:41.000000000 +0000
@@ -7,7 +7,7 @@
 # be changed and a report of the closed day's receipts subsequently
 # run which will miss a receipt from the date which has been closed.
 #
-# There are only six permuations which must cause a serialization failure.
+# There are only six permutations which must cause a serialization failure.
 # Failure cases are where s1 overlaps both s2 and s3, but s2 commits before
 # s3 executes its first SELECT.
 #
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/two-ids.spec postgresql-9.5-9.5.8/src/test/isolation/specs/two-ids.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/two-ids.spec	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/two-ids.spec	2017-08-07 21:13:41.000000000 +0000
@@ -2,7 +2,7 @@
 #
 # Small, simple test showing read-only anomalies.
 #
-# There are only four permuations which must cause a serialization failure.
+# There are only four permutations which must cause a serialization failure.
 # Required failure cases are where s2 overlaps both s1 and s3, but s1
 # commits before s3 executes its first SELECT.
 #
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specs/update-locked-tuple.spec postgresql-9.5-9.5.8/src/test/isolation/specs/update-locked-tuple.spec
--- postgresql-9.5-9.5.2/src/test/isolation/specs/update-locked-tuple.spec	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specs/update-locked-tuple.spec	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,38 @@
+# Test updating a locked tuple.  When the lock doesn't conflict with the
+# update, no blocking nor serializability problems should occur.
+
+setup
+{
+   DROP TABLE IF EXISTS users, orders;
+   CREATE TABLE users (id INTEGER PRIMARY KEY,
+                       name varchar,
+                       sometime timestamp);
+   CREATE TABLE orders (id INTEGER PRIMARY KEY,
+                        name varchar,
+                        user_id INTEGER REFERENCES users (id));
+   INSERT INTO users (id, name) VALUES (1, 'olivier');
+   INSERT INTO orders (id, name) VALUES (1, 'order of olivier (1)');
+}
+
+teardown
+{
+   DROP TABLE users, orders;
+}
+
+session "s1"
+step "s1b"	 { BEGIN ISOLATION LEVEL REPEATABLE READ; }
+step "s1u1"  { UPDATE orders SET name = 'order of olivier (2)', user_id = 1 WHERE id = 1; }
+step "s1u2"  { UPDATE orders SET name = 'order of olivier (3)', user_id = 1 WHERE id = 1; }
+step "s1c"   { COMMIT; }
+
+session "s2"
+step "s2b"   { BEGIN ISOLATION LEVEL REPEATABLE READ; }
+step "s2u"   { UPDATE users SET sometime = '1830-10-04' WHERE id = 1; }
+step "s2c"   { COMMIT; }
+
+permutation "s1b" "s2b" "s2u" "s2c" "s1u1" "s1u2" "s1c"
+permutation "s1b" "s2b" "s2u" "s1u1" "s2c" "s1u2" "s1c"
+permutation "s1b" "s2b" "s1u1" "s2u" "s2c" "s1u2" "s1c"
+permutation "s1b" "s1u1" "s2b" "s2u" "s2c" "s1u2" "s1c"
+permutation "s1b" "s1u1" "s2b" "s1u2" "s2u" "s2c" "s1c"
+permutation "s1b" "s1u1" "s1u2" "s2b" "s2u" "s2c" "s1c"
diff -Nru postgresql-9.5-9.5.2/src/test/isolation/specscanner.c postgresql-9.5-9.5.8/src/test/isolation/specscanner.c
--- postgresql-9.5-9.5.2/src/test/isolation/specscanner.c	2016-03-28 20:23:04.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/isolation/specscanner.c	2017-08-07 21:34:43.000000000 +0000
@@ -642,7 +642,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( spec_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -655,7 +655,7 @@
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, spec_yyin))==0 && ferror(spec_yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, spec_yyin)) == 0 && ferror(spec_yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1125,7 +1125,7 @@
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
diff -Nru postgresql-9.5-9.5.2/src/test/Makefile postgresql-9.5-9.5.8/src/test/Makefile
--- postgresql-9.5-9.5.2/src/test/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -12,7 +12,7 @@
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-SUBDIRS = regress isolation modules
+SUBDIRS = perl regress isolation modules
 
 # We don't build or execute examples/, locale/, or thread/ by default,
 # but we do want "make clean" etc to recurse into them.  Likewise for ssl/,
diff -Nru postgresql-9.5-9.5.2/src/test/modules/commit_ts/expected/commit_timestamp_1.out postgresql-9.5-9.5.8/src/test/modules/commit_ts/expected/commit_timestamp_1.out
--- postgresql-9.5-9.5.2/src/test/modules/commit_ts/expected/commit_timestamp_1.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/modules/commit_ts/expected/commit_timestamp_1.out	2017-08-07 21:13:41.000000000 +0000
@@ -23,9 +23,17 @@
 SELECT pg_xact_commit_timestamp('0'::xid);
 ERROR:  cannot retrieve commit timestamp for transaction 0
 SELECT pg_xact_commit_timestamp('1'::xid);
-ERROR:  cannot retrieve commit timestamp for transaction 1
+ pg_xact_commit_timestamp 
+--------------------------
+ 
+(1 row)
+
 SELECT pg_xact_commit_timestamp('2'::xid);
-ERROR:  cannot retrieve commit timestamp for transaction 2
+ pg_xact_commit_timestamp 
+--------------------------
+ 
+(1 row)
+
 SELECT x.xid::text::bigint > 0, x.timestamp > '-infinity'::timestamptz, x.timestamp <= now() FROM pg_last_committed_xact() x;
 ERROR:  could not get commit timestamp data
 HINT:  Make sure the configuration parameter "track_commit_timestamp" is set.
diff -Nru postgresql-9.5-9.5.2/src/test/modules/commit_ts/expected/commit_timestamp.out postgresql-9.5-9.5.8/src/test/modules/commit_ts/expected/commit_timestamp.out
--- postgresql-9.5-9.5.2/src/test/modules/commit_ts/expected/commit_timestamp.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/modules/commit_ts/expected/commit_timestamp.out	2017-08-07 21:13:41.000000000 +0000
@@ -28,9 +28,17 @@
 SELECT pg_xact_commit_timestamp('0'::xid);
 ERROR:  cannot retrieve commit timestamp for transaction 0
 SELECT pg_xact_commit_timestamp('1'::xid);
-ERROR:  cannot retrieve commit timestamp for transaction 1
+ pg_xact_commit_timestamp 
+--------------------------
+ 
+(1 row)
+
 SELECT pg_xact_commit_timestamp('2'::xid);
-ERROR:  cannot retrieve commit timestamp for transaction 2
+ pg_xact_commit_timestamp 
+--------------------------
+ 
+(1 row)
+
 SELECT x.xid::text::bigint > 0, x.timestamp > '-infinity'::timestamptz, x.timestamp <= now() FROM pg_last_committed_xact() x;
  ?column? | ?column? | ?column? 
 ----------+----------+----------
diff -Nru postgresql-9.5-9.5.2/src/test/modules/test_ddl_deparse/expected/alter_ts_config.out postgresql-9.5-9.5.8/src/test/modules/test_ddl_deparse/expected/alter_ts_config.out
--- postgresql-9.5-9.5.2/src/test/modules/test_ddl_deparse/expected/alter_ts_config.out	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/modules/test_ddl_deparse/expected/alter_ts_config.out	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,8 @@
+--
+-- ALTER TEXT SEARCH CONFIGURATION
+--
+CREATE TEXT SEARCH CONFIGURATION en (copy=english);
+NOTICE:  DDL test: type simple, tag CREATE TEXT SEARCH CONFIGURATION
+ALTER TEXT SEARCH CONFIGURATION en
+  ALTER MAPPING FOR host, email, url, sfloat WITH simple;
+NOTICE:  DDL test: type alter text search configuration, tag ALTER TEXT SEARCH CONFIGURATION
diff -Nru postgresql-9.5-9.5.2/src/test/modules/test_ddl_deparse/expected/comment_on.out postgresql-9.5-9.5.8/src/test/modules/test_ddl_deparse/expected/comment_on.out
--- postgresql-9.5-9.5.2/src/test/modules/test_ddl_deparse/expected/comment_on.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/modules/test_ddl_deparse/expected/comment_on.out	2017-08-07 21:13:41.000000000 +0000
@@ -21,5 +21,3 @@
 NOTICE:  DDL test: type simple, tag COMMENT
 COMMENT ON RULE rule_1 IS 'RULE test';
 NOTICE:  DDL test: type simple, tag COMMENT
--- should not fire
-COMMENT ON DATABASE contrib_regression IS 'contrib regression';
diff -Nru postgresql-9.5-9.5.2/src/test/modules/test_ddl_deparse/Makefile postgresql-9.5-9.5.8/src/test/modules/test_ddl_deparse/Makefile
--- postgresql-9.5-9.5.2/src/test/modules/test_ddl_deparse/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/modules/test_ddl_deparse/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -23,6 +23,7 @@
 	comment_on \
 	alter_function \
 	alter_sequence \
+	alter_ts_config \
 	alter_type_enum \
 	opfamily \
 	defprivs \
diff -Nru postgresql-9.5-9.5.2/src/test/modules/test_ddl_deparse/sql/alter_ts_config.sql postgresql-9.5-9.5.8/src/test/modules/test_ddl_deparse/sql/alter_ts_config.sql
--- postgresql-9.5-9.5.2/src/test/modules/test_ddl_deparse/sql/alter_ts_config.sql	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/modules/test_ddl_deparse/sql/alter_ts_config.sql	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,8 @@
+--
+-- ALTER TEXT SEARCH CONFIGURATION
+--
+
+CREATE TEXT SEARCH CONFIGURATION en (copy=english);
+
+ALTER TEXT SEARCH CONFIGURATION en
+  ALTER MAPPING FOR host, email, url, sfloat WITH simple;
diff -Nru postgresql-9.5-9.5.2/src/test/modules/test_ddl_deparse/sql/comment_on.sql postgresql-9.5-9.5.8/src/test/modules/test_ddl_deparse/sql/comment_on.sql
--- postgresql-9.5-9.5.2/src/test/modules/test_ddl_deparse/sql/comment_on.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/modules/test_ddl_deparse/sql/comment_on.sql	2017-08-07 21:13:41.000000000 +0000
@@ -12,6 +12,3 @@
 COMMENT ON FUNCTION c_function_test() IS 'FUNCTION test';
 COMMENT ON TRIGGER trigger_1 ON datatype_table IS 'TRIGGER test';
 COMMENT ON RULE rule_1 IS 'RULE test';
-
--- should not fire
-COMMENT ON DATABASE contrib_regression IS 'contrib regression';
diff -Nru postgresql-9.5-9.5.2/src/test/modules/test_shm_mq/setup.c postgresql-9.5-9.5.8/src/test/modules/test_shm_mq/setup.c
--- postgresql-9.5-9.5.2/src/test/modules/test_shm_mq/setup.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/modules/test_shm_mq/setup.c	2017-08-07 21:13:41.000000000 +0000
@@ -287,11 +287,11 @@
 			/* Wait to be signalled. */
 			WaitLatch(MyLatch, WL_LATCH_SET, 0);
 
-			/* An interrupt may have occurred while we were waiting. */
-			CHECK_FOR_INTERRUPTS();
-
 			/* Reset the latch so we don't spin. */
 			ResetLatch(MyLatch);
+
+			/* An interrupt may have occurred while we were waiting. */
+			CHECK_FOR_INTERRUPTS();
 		}
 	}
 	PG_CATCH();
diff -Nru postgresql-9.5-9.5.2/src/test/modules/test_shm_mq/test.c postgresql-9.5-9.5.8/src/test/modules/test_shm_mq/test.c
--- postgresql-9.5-9.5.2/src/test/modules/test_shm_mq/test.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/modules/test_shm_mq/test.c	2017-08-07 21:13:41.000000000 +0000
@@ -231,8 +231,8 @@
 			 * for us to do.
 			 */
 			WaitLatch(MyLatch, WL_LATCH_SET, 0);
-			CHECK_FOR_INTERRUPTS();
 			ResetLatch(MyLatch);
+			CHECK_FOR_INTERRUPTS();
 		}
 	}
 
diff -Nru postgresql-9.5-9.5.2/src/test/modules/worker_spi/worker_spi.c postgresql-9.5-9.5.8/src/test/modules/worker_spi/worker_spi.c
--- postgresql-9.5-9.5.2/src/test/modules/worker_spi/worker_spi.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/modules/worker_spi/worker_spi.c	2017-08-07 21:13:41.000000000 +0000
@@ -292,6 +292,7 @@
 		SPI_finish();
 		PopActiveSnapshot();
 		CommitTransactionCommand();
+		pgstat_report_stat(false);
 		pgstat_report_activity(STATE_IDLE, NULL);
 	}
 
@@ -345,7 +346,9 @@
 		BGWORKER_BACKEND_DATABASE_CONNECTION;
 	worker.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	worker.bgw_restart_time = BGW_NEVER_RESTART;
-	worker.bgw_main = worker_spi_main;
+	worker.bgw_main = NULL;
+	sprintf(worker.bgw_library_name, "worker_spi");
+	sprintf(worker.bgw_function_name, "worker_spi_main");
 	worker.bgw_notify_pid = 0;
 
 	/*
@@ -376,7 +379,7 @@
 		BGWORKER_BACKEND_DATABASE_CONNECTION;
 	worker.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	worker.bgw_restart_time = BGW_NEVER_RESTART;
-	worker.bgw_main = NULL;		/* new worker might not have library loaded */
+	worker.bgw_main = NULL;
 	sprintf(worker.bgw_library_name, "worker_spi");
 	sprintf(worker.bgw_function_name, "worker_spi_main");
 	snprintf(worker.bgw_name, BGW_MAXLEN, "worker %d", i);
diff -Nru postgresql-9.5-9.5.2/src/test/perl/Makefile postgresql-9.5-9.5.8/src/test/perl/Makefile
--- postgresql-9.5-9.5.2/src/test/perl/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/perl/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,29 @@
+#-------------------------------------------------------------------------
+#
+# Makefile for src/test/perl
+#
+# Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
+#
+# src/test/perl/Makefile
+#
+#-------------------------------------------------------------------------
+
+subdir = src/test/perl
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+
+ifeq ($(enable_tap_tests),yes)
+
+installdirs:
+	$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(subdir)'
+
+install: all installdirs
+	$(INSTALL_DATA) $(srcdir)/TestLib.pm '$(DESTDIR)$(pgxsdir)/$(subdir)/TestLib.pm'
+	$(INSTALL_DATA) $(srcdir)/SimpleTee.pm '$(DESTDIR)$(pgxsdir)/$(subdir)/SimpleTee.pm'
+
+uninstall:
+	rm -f '$(DESTDIR)$(pgxsdir)/$(subdir)/TestLib.pm'
+	rm -f '$(DESTDIR)$(pgxsdir)/$(subdir)/SimpleTee.pm'
+
+endif
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/aggregates.out postgresql-9.5-9.5.8/src/test/regress/expected/aggregates.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/aggregates.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/aggregates.out	2017-08-07 21:13:41.000000000 +0000
@@ -366,6 +366,81 @@
  9999
 (1 row)
 
+-- Test handling of Params within aggregate arguments in hashed aggregation.
+-- Per bug report from Jeevan Chalke.
+explain (verbose, costs off)
+select s1, s2, sm
+from generate_series(1, 3) s1,
+     lateral (select s2, sum(s1 + s2) sm
+              from generate_series(1, 3) s2 group by s2) ss
+order by 1, 2;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Sort
+   Output: s1.s1, s2.s2, (sum((s1.s1 + s2.s2)))
+   Sort Key: s1.s1, s2.s2
+   ->  Nested Loop
+         Output: s1.s1, s2.s2, (sum((s1.s1 + s2.s2)))
+         ->  Function Scan on pg_catalog.generate_series s1
+               Output: s1.s1
+               Function Call: generate_series(1, 3)
+         ->  HashAggregate
+               Output: s2.s2, sum((s1.s1 + s2.s2))
+               Group Key: s2.s2
+               ->  Function Scan on pg_catalog.generate_series s2
+                     Output: s2.s2
+                     Function Call: generate_series(1, 3)
+(14 rows)
+
+select s1, s2, sm
+from generate_series(1, 3) s1,
+     lateral (select s2, sum(s1 + s2) sm
+              from generate_series(1, 3) s2 group by s2) ss
+order by 1, 2;
+ s1 | s2 | sm 
+----+----+----
+  1 |  1 |  2
+  1 |  2 |  3
+  1 |  3 |  4
+  2 |  1 |  3
+  2 |  2 |  4
+  2 |  3 |  5
+  3 |  1 |  4
+  3 |  2 |  5
+  3 |  3 |  6
+(9 rows)
+
+explain (verbose, costs off)
+select array(select sum(x+y) s
+            from generate_series(1,3) y group by y order by s)
+  from generate_series(1,3) x;
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Function Scan on pg_catalog.generate_series x
+   Output: (SubPlan 1)
+   Function Call: generate_series(1, 3)
+   SubPlan 1
+     ->  Sort
+           Output: (sum((x.x + y.y))), y.y
+           Sort Key: (sum((x.x + y.y)))
+           ->  HashAggregate
+                 Output: sum((x.x + y.y)), y.y
+                 Group Key: y.y
+                 ->  Function Scan on pg_catalog.generate_series y
+                       Output: y.y
+                       Function Call: generate_series(1, 3)
+(13 rows)
+
+select array(select sum(x+y) s
+            from generate_series(1,3) y group by y order by s)
+  from generate_series(1,3) x;
+  array  
+---------
+ {2,3,4}
+ {3,4,5}
+ {4,5,6}
+(3 rows)
+
 --
 -- test for bitwise integer aggregates
 --
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/alter_table.out postgresql-9.5-9.5.8/src/test/regress/expected/alter_table.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/alter_table.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/alter_table.out	2017-08-07 21:13:41.000000000 +0000
@@ -128,6 +128,55 @@
 
 DROP TABLE tmp_new;
 DROP TABLE tmp_new2;
+--
+-- check renaming to a table's array type's autogenerated name
+-- (the array type's name should get out of the way)
+--
+CREATE TABLE tmp_array (id int);
+CREATE TABLE tmp_array2 (id int);
+SELECT typname FROM pg_type WHERE oid = 'tmp_array[]'::regtype;
+  typname   
+------------
+ _tmp_array
+(1 row)
+
+SELECT typname FROM pg_type WHERE oid = 'tmp_array2[]'::regtype;
+   typname   
+-------------
+ _tmp_array2
+(1 row)
+
+ALTER TABLE tmp_array2 RENAME TO _tmp_array;
+SELECT typname FROM pg_type WHERE oid = 'tmp_array[]'::regtype;
+   typname   
+-------------
+ __tmp_array
+(1 row)
+
+SELECT typname FROM pg_type WHERE oid = '_tmp_array[]'::regtype;
+   typname    
+--------------
+ ___tmp_array
+(1 row)
+
+DROP TABLE _tmp_array;
+DROP TABLE tmp_array;
+-- renaming to table's own array type's name is an interesting corner case
+CREATE TABLE tmp_array (id int);
+SELECT typname FROM pg_type WHERE oid = 'tmp_array[]'::regtype;
+  typname   
+------------
+ _tmp_array
+(1 row)
+
+ALTER TABLE tmp_array RENAME TO _tmp_array;
+SELECT typname FROM pg_type WHERE oid = '_tmp_array[]'::regtype;
+   typname   
+-------------
+ __tmp_array
+(1 row)
+
+DROP TABLE _tmp_array;
 -- ALTER TABLE ... RENAME on non-table relations
 -- renaming indexes (FIXME: this should probably test the index's functionality)
 ALTER INDEX IF EXISTS __onek_unique1 RENAME TO tmp_onek_unique1;
@@ -310,7 +359,7 @@
 -- Try (and fail) to add constraint due to invalid source columns
 ALTER TABLE tmp3 add constraint tmpconstr foreign key(c) references tmp2 match full;
 ERROR:  column "c" referenced in foreign key constraint does not exist
--- Try (and fail) to add constraint due to invalide destination columns explicitly given
+-- Try (and fail) to add constraint due to invalid destination columns explicitly given
 ALTER TABLE tmp3 add constraint tmpconstr foreign key(a) references tmp2(b) match full;
 ERROR:  column "b" referenced in foreign key constraint does not exist
 -- Try (and fail) to add constraint due to invalid data
@@ -367,6 +416,26 @@
 ALTER TABLE tmp3 VALIDATE CONSTRAINT identity;
 NOTICE:  boo: 16
 NOTICE:  boo: 20
+-- A NO INHERIT constraint should not be looked for in children during VALIDATE CONSTRAINT
+create table parent_noinh_convalid (a int);
+create table child_noinh_convalid () inherits (parent_noinh_convalid);
+insert into parent_noinh_convalid values (1);
+insert into child_noinh_convalid values (1);
+alter table parent_noinh_convalid add constraint check_a_is_2 check (a = 2) no inherit not valid;
+-- fail, because of the row in parent
+alter table parent_noinh_convalid validate constraint check_a_is_2;
+ERROR:  check constraint "check_a_is_2" is violated by some row
+delete from only parent_noinh_convalid;
+-- ok (parent itself contains no violating rows)
+alter table parent_noinh_convalid validate constraint check_a_is_2;
+select convalidated from pg_constraint where conrelid = 'parent_noinh_convalid'::regclass and conname = 'check_a_is_2';
+ convalidated 
+--------------
+ t
+(1 row)
+
+-- cleanup
+drop table parent_noinh_convalid, child_noinh_convalid;
 -- Try (and fail) to create constraint from tmp5(a) to tmp4(a) - unique constraint on
 -- tmp4 is a,b
 ALTER TABLE tmp5 add constraint tmpconstr foreign key(a) references tmp4(a) match full;
@@ -525,6 +594,66 @@
      references pktable(ptest1, ptest2);
 ERROR:  foreign key constraint "fktable_ftest2_fkey" cannot be implemented
 DETAIL:  Key columns "ftest2" and "ptest1" are of incompatible types: inet and integer.
+DROP TABLE FKTABLE;
+DROP TABLE PKTABLE;
+-- Test that ALTER CONSTRAINT updates trigger deferrability properly
+CREATE TEMP TABLE PKTABLE (ptest1 int primary key);
+CREATE TEMP TABLE FKTABLE (ftest1 int);
+ALTER TABLE FKTABLE ADD CONSTRAINT fknd FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION NOT DEFERRABLE;
+ALTER TABLE FKTABLE ADD CONSTRAINT fkdd FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE FKTABLE ADD CONSTRAINT fkdi FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE FKTABLE ADD CONSTRAINT fknd2 FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE FKTABLE ALTER CONSTRAINT fknd2 NOT DEFERRABLE;
+ALTER TABLE FKTABLE ADD CONSTRAINT fkdd2 FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION NOT DEFERRABLE;
+ALTER TABLE FKTABLE ALTER CONSTRAINT fkdd2 DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE FKTABLE ADD CONSTRAINT fkdi2 FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION NOT DEFERRABLE;
+ALTER TABLE FKTABLE ALTER CONSTRAINT fkdi2 DEFERRABLE INITIALLY IMMEDIATE;
+SELECT conname, tgfoid::regproc, tgtype, tgdeferrable, tginitdeferred
+FROM pg_trigger JOIN pg_constraint con ON con.oid = tgconstraint
+WHERE tgrelid = 'pktable'::regclass
+ORDER BY 1,2,3;
+ conname |         tgfoid         | tgtype | tgdeferrable | tginitdeferred 
+---------+------------------------+--------+--------------+----------------
+ fkdd    | "RI_FKey_cascade_del"  |      9 | f            | f
+ fkdd    | "RI_FKey_noaction_upd" |     17 | t            | t
+ fkdd2   | "RI_FKey_cascade_del"  |      9 | f            | f
+ fkdd2   | "RI_FKey_noaction_upd" |     17 | t            | t
+ fkdi    | "RI_FKey_cascade_del"  |      9 | f            | f
+ fkdi    | "RI_FKey_noaction_upd" |     17 | t            | f
+ fkdi2   | "RI_FKey_cascade_del"  |      9 | f            | f
+ fkdi2   | "RI_FKey_noaction_upd" |     17 | t            | f
+ fknd    | "RI_FKey_cascade_del"  |      9 | f            | f
+ fknd    | "RI_FKey_noaction_upd" |     17 | f            | f
+ fknd2   | "RI_FKey_cascade_del"  |      9 | f            | f
+ fknd2   | "RI_FKey_noaction_upd" |     17 | f            | f
+(12 rows)
+
+SELECT conname, tgfoid::regproc, tgtype, tgdeferrable, tginitdeferred
+FROM pg_trigger JOIN pg_constraint con ON con.oid = tgconstraint
+WHERE tgrelid = 'fktable'::regclass
+ORDER BY 1,2,3;
+ conname |       tgfoid        | tgtype | tgdeferrable | tginitdeferred 
+---------+---------------------+--------+--------------+----------------
+ fkdd    | "RI_FKey_check_ins" |      5 | t            | t
+ fkdd    | "RI_FKey_check_upd" |     17 | t            | t
+ fkdd2   | "RI_FKey_check_ins" |      5 | t            | t
+ fkdd2   | "RI_FKey_check_upd" |     17 | t            | t
+ fkdi    | "RI_FKey_check_ins" |      5 | t            | f
+ fkdi    | "RI_FKey_check_upd" |     17 | t            | f
+ fkdi2   | "RI_FKey_check_ins" |      5 | t            | f
+ fkdi2   | "RI_FKey_check_upd" |     17 | t            | f
+ fknd    | "RI_FKey_check_ins" |      5 | f            | f
+ fknd    | "RI_FKey_check_upd" |     17 | f            | f
+ fknd2   | "RI_FKey_check_ins" |      5 | f            | f
+ fknd2   | "RI_FKey_check_upd" |     17 | f            | f
+(12 rows)
+
 -- temp tables should go away by themselves, need not drop them.
 -- test check constraint adding
 create table atacc1 ( test int );
@@ -1958,6 +2087,28 @@
  test_inh_check_child | test_inh_check_a_check |           1 | f          | f
 (6 rows)
 
+-- ALTER COLUMN TYPE with different schema in children
+-- Bug at https://postgr.es/m/20170102225618.GA10071@telsasoft.com
+CREATE TABLE test_type_diff (f1 int);
+CREATE TABLE test_type_diff_c (extra smallint) INHERITS (test_type_diff);
+ALTER TABLE test_type_diff ADD COLUMN f2 int;
+INSERT INTO test_type_diff_c VALUES (1, 2, 3);
+ALTER TABLE test_type_diff ALTER COLUMN f2 TYPE bigint USING f2::bigint;
+CREATE TABLE test_type_diff2 (int_two int2, int_four int4, int_eight int8);
+CREATE TABLE test_type_diff2_c1 (int_four int4, int_eight int8, int_two int2);
+CREATE TABLE test_type_diff2_c2 (int_eight int8, int_two int2, int_four int4);
+CREATE TABLE test_type_diff2_c3 (int_two int2, int_four int4, int_eight int8);
+ALTER TABLE test_type_diff2_c1 INHERIT test_type_diff2;
+ALTER TABLE test_type_diff2_c2 INHERIT test_type_diff2;
+ALTER TABLE test_type_diff2_c3 INHERIT test_type_diff2;
+INSERT INTO test_type_diff2_c1 VALUES (1, 2, 3);
+INSERT INTO test_type_diff2_c2 VALUES (4, 5, 6);
+INSERT INTO test_type_diff2_c3 VALUES (7, 8, 9);
+ALTER TABLE test_type_diff2 ALTER COLUMN int_four TYPE int8 USING int_four::int8;
+-- whole-row references are disallowed
+ALTER TABLE test_type_diff2 ALTER COLUMN int_four TYPE int4 USING (pg_column_size(test_type_diff2));
+ERROR:  cannot convert whole-row table reference
+DETAIL:  USING expression contains a whole-row table reference.
 -- check for rollback of ANALYZE corrupting table property flags (bug #11638)
 CREATE TABLE check_fk_presence_1 (id int PRIMARY KEY, t text);
 CREATE TABLE check_fk_presence_2 (id int REFERENCES check_fk_presence_1, t text);
@@ -2603,6 +2754,39 @@
  comment_test_positive_col_check | CHECK constraint on comment_test.positive_col
 (2 rows)
 
+-- Check compatibility for foreign keys and comments. This is done
+-- separately as rebuilding the column type of the parent leads
+-- to an error and would reduce the test scope.
+CREATE TABLE comment_test_child (
+  id text CONSTRAINT comment_test_child_fk REFERENCES comment_test);
+CREATE INDEX comment_test_child_fk ON comment_test_child(id);
+COMMENT ON COLUMN comment_test_child.id IS 'Column ''id'' on comment_test_child';
+COMMENT ON INDEX comment_test_child_fk IS 'Index backing the FOREIGN KEY of comment_test_child';
+COMMENT ON CONSTRAINT comment_test_child_fk ON comment_test_child IS 'FOREIGN KEY constraint of comment_test_child';
+-- Change column type of parent
+ALTER TABLE comment_test ALTER COLUMN id SET DATA TYPE text;
+ALTER TABLE comment_test ALTER COLUMN id SET DATA TYPE int USING id::integer;
+ERROR:  foreign key constraint "comment_test_child_fk" cannot be implemented
+DETAIL:  Key columns "id" and "id" are of incompatible types: text and integer.
+-- Comments should be intact
+SELECT col_description('comment_test_child'::regclass, 1) as comment;
+              comment              
+-----------------------------------
+ Column 'id' on comment_test_child
+(1 row)
+
+SELECT indexrelid::regclass::text as index, obj_description(indexrelid, 'pg_class') as comment FROM pg_index where indrelid = 'comment_test_child'::regclass ORDER BY 1, 2;
+         index         |                       comment                       
+-----------------------+-----------------------------------------------------
+ comment_test_child_fk | Index backing the FOREIGN KEY of comment_test_child
+(1 row)
+
+SELECT conname as constraint, obj_description(oid, 'pg_constraint') as comment FROM pg_constraint where conrelid = 'comment_test_child'::regclass ORDER BY 1, 2;
+      constraint       |                   comment                    
+-----------------------+----------------------------------------------
+ comment_test_child_fk | FOREIGN KEY constraint of comment_test_child
+(1 row)
+
 -- Check that we map relation oids to filenodes and back correctly.  Only
 -- display bad mappings so the test output doesn't change all the time.  A
 -- filenode function call can return NULL for a relation dropped concurrently
@@ -2678,7 +2862,7 @@
 ALTER TABLE unlogged2 SET LOGGED; -- fails because a foreign key to an unlogged table exists
 ERROR:  could not change table "unlogged2" to logged because it references unlogged table "unlogged1"
 ALTER TABLE unlogged1 SET LOGGED;
--- check relpersistence of an unlogged table after changing to permament
+-- check relpersistence of an unlogged table after changing to permanent
 SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^unlogged1'
 UNION ALL
 SELECT 'toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^unlogged1'
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/arrays.out postgresql-9.5-9.5.8/src/test/regress/expected/arrays.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/arrays.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/arrays.out	2017-08-07 21:13:41.000000000 +0000
@@ -478,6 +478,20 @@
  {2}
 (1 row)
 
+SELECT
+    array_position(ids, (1, 1)),
+    array_positions(ids, (1, 1))
+        FROM
+(VALUES
+    (ARRAY[(0, 0), (1, 1)]),
+    (ARRAY[(1, 1)])
+) AS f (ids);
+ array_position | array_positions 
+----------------+-----------------
+              2 | {2}
+              1 | {1}
+(2 rows)
+
 -- operators
 SELECT a FROM arrtest WHERE b = ARRAY[[[113,142],[1,147]]];
        a       
@@ -1428,16 +1442,43 @@
  {{juhu,juhu,juhu},{juhu,juhu,juhu},{juhu,juhu,juhu}}
 (1 row)
 
+select a, a = '{}' as is_eq, array_dims(a)
+  from (select array_fill(42, array[0]) as a) ss;
+ a  | is_eq | array_dims 
+----+-------+------------
+ {} | t     | 
+(1 row)
+
+select a, a = '{}' as is_eq, array_dims(a)
+  from (select array_fill(42, '{}') as a) ss;
+ a  | is_eq | array_dims 
+----+-------+------------
+ {} | t     | 
+(1 row)
+
+select a, a = '{}' as is_eq, array_dims(a)
+  from (select array_fill(42, '{}', '{}') as a) ss;
+ a  | is_eq | array_dims 
+----+-------+------------
+ {} | t     | 
+(1 row)
+
 -- raise exception
 select array_fill(1, null, array[2,2]);
 ERROR:  dimension array or low bound array cannot be null
 select array_fill(1, array[2,2], null);
 ERROR:  dimension array or low bound array cannot be null
+select array_fill(1, array[2,2], '{}');
+ERROR:  wrong number of array subscripts
+DETAIL:  Low bound array has different size than dimensions array.
 select array_fill(1, array[3,3], array[1,1,1]);
 ERROR:  wrong number of array subscripts
 DETAIL:  Low bound array has different size than dimensions array.
 select array_fill(1, array[1,2,null]);
 ERROR:  dimension values cannot be null
+select array_fill(1, array[[1,2],[3,4]]);
+ERROR:  wrong number of array subscripts
+DETAIL:  Dimension array must be one dimensional.
 select string_to_array('1|2|3', '|');
  string_to_array 
 -----------------
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/brin.out postgresql-9.5-9.5.8/src/test/regress/expected/brin.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/brin.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/brin.out	2017-08-07 21:13:41.000000000 +0000
@@ -149,7 +149,7 @@
 	 '{100, 100, 1, 100, 100}'),
 	('textcol', 'text',
 	 '{>, >=, =, <=, <}',
-	 '{AAAAAA, AAAAAA, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',
+	 '{ABABAB, ABABAB, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',
 	 '{100, 100, 1, 100, 100}'),
 	('oidcol', 'oid',
 	 '{>, >=, =, <=, <}',
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/case.out postgresql-9.5-9.5.8/src/test/regress/expected/case.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/case.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/case.out	2017-08-07 21:13:41.000000000 +0000
@@ -297,6 +297,75 @@
 (4 rows)
 
 --
+-- Nested CASE expressions
+--
+-- This test exercises a bug caused by aliasing econtext->caseValue_isNull
+-- with the isNull argument of the inner CASE's ExecEvalCase() call.  After
+-- evaluating the vol(null) expression in the inner CASE's second WHEN-clause,
+-- the isNull flag for the case test value incorrectly became true, causing
+-- the third WHEN-clause not to match.  The volatile function calls are needed
+-- to prevent constant-folding in the planner, which would hide the bug.
+-- Wrap this in a single transaction so the transient '=' operator doesn't
+-- cause problems in concurrent sessions
+BEGIN;
+CREATE FUNCTION vol(text) returns text as
+  'begin return $1; end' language plpgsql volatile;
+SELECT CASE
+  (CASE vol('bar')
+    WHEN 'foo' THEN 'it was foo!'
+    WHEN vol(null) THEN 'null input'
+    WHEN 'bar' THEN 'it was bar!' END
+  )
+  WHEN 'it was foo!' THEN 'foo recognized'
+  WHEN 'it was bar!' THEN 'bar recognized'
+  ELSE 'unrecognized' END;
+      case      
+----------------
+ bar recognized
+(1 row)
+
+-- In this case, we can't inline the SQL function without confusing things.
+CREATE DOMAIN foodomain AS text;
+CREATE FUNCTION volfoo(text) returns foodomain as
+  'begin return $1::foodomain; end' language plpgsql volatile;
+CREATE FUNCTION inline_eq(foodomain, foodomain) returns boolean as
+  'SELECT CASE $2::text WHEN $1::text THEN true ELSE false END' language sql;
+CREATE OPERATOR = (procedure = inline_eq,
+                   leftarg = foodomain, rightarg = foodomain);
+SELECT CASE volfoo('bar') WHEN 'foo'::foodomain THEN 'is foo' ELSE 'is not foo' END;
+    case    
+------------
+ is not foo
+(1 row)
+
+ROLLBACK;
+-- Test multiple evaluation of a CASE arg that is a read/write object (#14472)
+-- Wrap this in a single transaction so the transient '=' operator doesn't
+-- cause problems in concurrent sessions
+BEGIN;
+CREATE DOMAIN arrdomain AS int[];
+CREATE FUNCTION make_ad(int,int) returns arrdomain as
+  'declare x arrdomain;
+   begin
+     x := array[$1,$2];
+     return x;
+   end' language plpgsql volatile;
+CREATE FUNCTION ad_eq(arrdomain, arrdomain) returns boolean as
+  'begin return array_eq($1, $2); end' language plpgsql;
+CREATE OPERATOR = (procedure = ad_eq,
+                   leftarg = arrdomain, rightarg = arrdomain);
+SELECT CASE make_ad(1,2)
+  WHEN array[2,4]::arrdomain THEN 'wrong'
+  WHEN array[2,5]::arrdomain THEN 'still wrong'
+  WHEN array[1,2]::arrdomain THEN 'right'
+  END;
+ case  
+-------
+ right
+(1 row)
+
+ROLLBACK;
+--
 -- Clean up
 --
 DROP TABLE CASE_TBL;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/combocid.out postgresql-9.5-9.5.8/src/test/regress/expected/combocid.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/combocid.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/combocid.out	2017-08-07 21:13:41.000000000 +0000
@@ -140,3 +140,30 @@
  (0,6) |    0 |    444
 (3 rows)
 
+-- test for bug reported in
+-- CABRT9RC81YUf1=jsmWopcKJEro=VoeG2ou6sPwyOUTx_qteRsg@mail.gmail.com
+CREATE TABLE IF NOT EXISTS testcase(
+	id int PRIMARY KEY,
+	balance numeric
+);
+INSERT INTO testcase VALUES (1, 0);
+BEGIN;
+SELECT * FROM testcase WHERE testcase.id = 1 FOR UPDATE;
+ id | balance 
+----+---------
+  1 |       0
+(1 row)
+
+UPDATE testcase SET balance = balance + 400 WHERE id=1;
+SAVEPOINT subxact;
+UPDATE testcase SET balance = balance - 100 WHERE id=1;
+ROLLBACK TO SAVEPOINT subxact;
+-- should return one tuple
+SELECT * FROM testcase WHERE id = 1 FOR UPDATE;
+ id | balance 
+----+---------
+  1 |     400
+(1 row)
+
+ROLLBACK;
+DROP TABLE testcase;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/copy2.out postgresql-9.5-9.5.8/src/test/regress/expected/copy2.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/copy2.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/copy2.out	2017-08-07 21:13:41.000000000 +0000
@@ -463,9 +463,87 @@
    
 (2 rows)
 
+-- test with RLS enabled.
+CREATE ROLE regress_rls_copy_user;
+CREATE ROLE regress_rls_copy_user_colperms;
+CREATE TABLE rls_t1 (a int, b int, c int);
+COPY rls_t1 (a, b, c) from stdin;
+CREATE POLICY p1 ON rls_t1 FOR SELECT USING (a % 2 = 0);
+ALTER TABLE rls_t1 ENABLE ROW LEVEL SECURITY;
+ALTER TABLE rls_t1 FORCE ROW LEVEL SECURITY;
+GRANT SELECT ON TABLE rls_t1 TO regress_rls_copy_user;
+GRANT SELECT (a, b) ON TABLE rls_t1 TO regress_rls_copy_user_colperms;
+-- all columns
+COPY rls_t1 TO stdout;
+1	4	1
+2	3	2
+3	2	3
+4	1	4
+COPY rls_t1 (a, b, c) TO stdout;
+1	4	1
+2	3	2
+3	2	3
+4	1	4
+-- subset of columns
+COPY rls_t1 (a) TO stdout;
+1
+2
+3
+4
+COPY rls_t1 (a, b) TO stdout;
+1	4
+2	3
+3	2
+4	1
+-- column reordering
+COPY rls_t1 (b, a) TO stdout;
+4	1
+3	2
+2	3
+1	4
+SET SESSION AUTHORIZATION regress_rls_copy_user;
+-- all columns
+COPY rls_t1 TO stdout;
+2	3	2
+4	1	4
+COPY rls_t1 (a, b, c) TO stdout;
+2	3	2
+4	1	4
+-- subset of columns
+COPY rls_t1 (a) TO stdout;
+2
+4
+COPY rls_t1 (a, b) TO stdout;
+2	3
+4	1
+-- column reordering
+COPY rls_t1 (b, a) TO stdout;
+3	2
+1	4
+RESET SESSION AUTHORIZATION;
+SET SESSION AUTHORIZATION regress_rls_copy_user_colperms;
+-- attempt all columns (should fail)
+COPY rls_t1 TO stdout;
+ERROR:  permission denied for relation rls_t1
+COPY rls_t1 (a, b, c) TO stdout;
+ERROR:  permission denied for relation rls_t1
+-- try to copy column with no privileges (should fail)
+COPY rls_t1 (c) TO stdout;
+ERROR:  permission denied for relation rls_t1
+-- subset of columns (should succeed)
+COPY rls_t1 (a) TO stdout;
+2
+4
+COPY rls_t1 (a, b) TO stdout;
+2	3
+4	1
+RESET SESSION AUTHORIZATION;
 DROP TABLE forcetest;
 DROP TABLE vistest;
 DROP FUNCTION truncate_in_subxact();
 DROP TABLE x, y;
+DROP TABLE rls_t1 CASCADE;
+DROP ROLE regress_rls_copy_user;
+DROP ROLE regress_rls_copy_user_colperms;
 DROP FUNCTION fn_x_before();
 DROP FUNCTION fn_x_after();
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/create_index.out postgresql-9.5-9.5.8/src/test/regress/expected/create_index.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/create_index.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/create_index.out	2017-08-07 21:13:41.000000000 +0000
@@ -2900,7 +2900,7 @@
         1 |     1001
 (2 rows)
 
-RESET enable_indexscan;
+RESET enable_indexonlyscan;
 --
 -- Check elimination of constant-NULL subexpressions
 --
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/create_type.out postgresql-9.5-9.5.8/src/test/regress/expected/create_type.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/create_type.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/create_type.out	2017-08-07 21:13:41.000000000 +0000
@@ -115,6 +115,31 @@
     ELEMENT = int,
     INTERNALLENGTH = 32);
 ERROR:  function array_out(not_existing_type) does not exist
+-- Check dependency transfer of opaque functions when creating a new type
+CREATE FUNCTION base_fn_in(cstring) RETURNS opaque AS 'boolin'
+    LANGUAGE internal IMMUTABLE STRICT;
+CREATE FUNCTION base_fn_out(opaque) RETURNS opaque AS 'boolout'
+    LANGUAGE internal IMMUTABLE STRICT;
+CREATE TYPE base_type(INPUT = base_fn_in, OUTPUT = base_fn_out);
+WARNING:  changing argument type of function base_fn_out from "opaque" to base_type
+WARNING:  changing return type of function base_fn_in from "opaque" to base_type
+WARNING:  changing return type of function base_fn_out from "opaque" to "cstring"
+DROP FUNCTION base_fn_in(cstring); -- error
+ERROR:  cannot drop function base_fn_in(cstring) because other objects depend on it
+DETAIL:  type base_type depends on function base_fn_in(cstring)
+function base_fn_out(base_type) depends on type base_type
+HINT:  Use DROP ... CASCADE to drop the dependent objects too.
+DROP FUNCTION base_fn_out(opaque); -- error
+ERROR:  function base_fn_out(opaque) does not exist
+DROP TYPE base_type; -- error
+ERROR:  cannot drop type base_type because other objects depend on it
+DETAIL:  function base_fn_out(base_type) depends on type base_type
+function base_fn_in(cstring) depends on type base_type
+HINT:  Use DROP ... CASCADE to drop the dependent objects too.
+DROP TYPE base_type CASCADE;
+NOTICE:  drop cascades to 2 other objects
+DETAIL:  drop cascades to function base_fn_out(base_type)
+drop cascades to function base_fn_in(cstring)
 -- Check usage of typmod with a user-defined type
 -- (we have borrowed numeric's typmod functions)
 CREATE TEMP TABLE mytab (foo widget(42,13,7));     -- should fail
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/create_view.out postgresql-9.5-9.5.8/src/test/regress/expected/create_view.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/create_view.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/create_view.out	2017-08-07 21:13:41.000000000 +0000
@@ -288,6 +288,43 @@
  mysecview4 | v       | {security_barrier=false}
 (4 rows)
 
+-- This test checks that proper typmods are assigned in a multi-row VALUES
+CREATE VIEW tt1 AS
+  SELECT * FROM (
+    VALUES
+       ('abc'::varchar(3), '0123456789', 42, 'abcd'::varchar(4)),
+       ('0123456789', 'abc'::varchar(3), 42.12, 'abc'::varchar(4))
+  ) vv(a,b,c,d);
+\d+ tt1
+                      View "testviewschm2.tt1"
+ Column |         Type         | Modifiers | Storage  | Description 
+--------+----------------------+-----------+----------+-------------
+ a      | character varying    |           | extended | 
+ b      | character varying    |           | extended | 
+ c      | numeric              |           | main     | 
+ d      | character varying(4) |           | extended | 
+View definition:
+ SELECT vv.a,
+    vv.b,
+    vv.c,
+    vv.d
+   FROM ( VALUES ('abc'::character varying(3),'0123456789'::character varying,42,'abcd'::character varying(4)), ('0123456789'::character varying,'abc'::character varying(3),42.12,'abc'::character varying(4))) vv(a, b, c, d);
+
+SELECT * FROM tt1;
+     a      |     b      |   c   |  d   
+------------+------------+-------+------
+ abc        | 0123456789 |    42 | abcd
+ 0123456789 | abc        | 42.12 | abc
+(2 rows)
+
+SELECT a::varchar(3) FROM tt1;
+  a  
+-----
+ abc
+ 012
+(2 rows)
+
+DROP VIEW tt1;
 -- Test view decompilation in the face of relation renaming conflicts
 CREATE TABLE tt1 (f1 int, f2 int, f3 text);
 CREATE TABLE tx1 (x1 int, x2 int, x3 text);
@@ -1502,6 +1539,115 @@
    ->  Seq Scan on int8_tbl xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_1
 (3 rows)
 
+-- check display of ScalarArrayOp with a sub-select
+select 'foo'::text = any(array['abc','def','foo']::text[]);
+ ?column? 
+----------
+ t
+(1 row)
+
+select 'foo'::text = any((select array['abc','def','foo']::text[]));  -- fail
+ERROR:  operator does not exist: text = text[]
+LINE 1: select 'foo'::text = any((select array['abc','def','foo']::t...
+                           ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+select 'foo'::text = any((select array['abc','def','foo']::text[])::text[]);
+ ?column? 
+----------
+ t
+(1 row)
+
+create view tt19v as
+select 'foo'::text = any(array['abc','def','foo']::text[]) c1,
+       'foo'::text = any((select array['abc','def','foo']::text[])::text[]) c2;
+select pg_get_viewdef('tt19v', true);
+                                               pg_get_viewdef                                               
+------------------------------------------------------------------------------------------------------------
+  SELECT 'foo'::text = ANY (ARRAY['abc'::text, 'def'::text, 'foo'::text]) AS c1,                           +
+     'foo'::text = ANY ((( SELECT ARRAY['abc'::text, 'def'::text, 'foo'::text] AS "array"))::text[]) AS c2;
+(1 row)
+
+-- check display of assorted RTE_FUNCTION expressions
+create view tt20v as
+select * from
+  coalesce(1,2) as c,
+  collation for ('x'::text) col,
+  current_date as d,
+  cast(1+2 as int4) as i4,
+  cast(1+2 as int8) as i8;
+select pg_get_viewdef('tt20v', true);
+               pg_get_viewdef                
+---------------------------------------------
+  SELECT c.c,                               +
+     col.col,                               +
+     d.d,                                   +
+     i4.i4,                                 +
+     i8.i8                                  +
+    FROM COALESCE(1, 2) c(c),               +
+     pg_collation_for('x'::text) col(col),  +
+     CAST('now'::text::date AS date) d(d),  +
+     CAST(1 + 2 AS integer) i4(i4),         +
+     CAST((1 + 2)::bigint AS bigint) i8(i8);
+(1 row)
+
+-- corner cases with empty join conditions
+create view tt21v as
+select * from tt5 natural inner join tt6;
+select pg_get_viewdef('tt21v', true);
+    pg_get_viewdef    
+----------------------
+  SELECT tt5.a,      +
+     tt5.b,          +
+     tt5.cc,         +
+     tt6.c,          +
+     tt6.d           +
+    FROM tt5         +
+      CROSS JOIN tt6;
+(1 row)
+
+create view tt22v as
+select * from tt5 natural left join tt6;
+select pg_get_viewdef('tt22v', true);
+       pg_get_viewdef        
+-----------------------------
+  SELECT tt5.a,             +
+     tt5.b,                 +
+     tt5.cc,                +
+     tt6.c,                 +
+     tt6.d                  +
+    FROM tt5                +
+      LEFT JOIN tt6 ON TRUE;
+(1 row)
+
+-- check handling of views with immediately-renamed columns
+create view tt23v (col_a, col_b) as
+select q1 as other_name1, q2 as other_name2 from int8_tbl
+union
+select 42, 43;
+select pg_get_viewdef('tt23v', true);
+        pg_get_viewdef         
+-------------------------------
+  SELECT int8_tbl.q1 AS col_a,+
+     int8_tbl.q2 AS col_b     +
+    FROM int8_tbl             +
+ UNION                        +
+  SELECT 42 AS col_a,         +
+     43 AS col_b;
+(1 row)
+
+select pg_get_ruledef(oid, true) from pg_rewrite
+  where ev_class = 'tt23v'::regclass and ev_type = '1';
+                         pg_get_ruledef                          
+-----------------------------------------------------------------
+ CREATE RULE "_RETURN" AS                                       +
+     ON SELECT TO tt23v DO INSTEAD  SELECT int8_tbl.q1 AS col_a,+
+     int8_tbl.q2 AS col_b                                       +
+    FROM int8_tbl                                               +
+ UNION                                                          +
+  SELECT 42 AS col_a,                                           +
+     43 AS col_b;
+(1 row)
+
 -- clean up all the random objects we made above
 set client_min_messages = warning;
 DROP SCHEMA temp_view_test CASCADE;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/domain.out postgresql-9.5-9.5.8/src/test/regress/expected/domain.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/domain.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/domain.out	2017-08-07 21:13:41.000000000 +0000
@@ -107,6 +107,7 @@
 INSERT INTO domarrtest values (NULL, '{{"a","b","c"},{"d","e","f"}}');
 INSERT INTO domarrtest values (NULL, '{{"toolong","b","c"},{"d","e","f"}}');
 ERROR:  value too long for type character varying(4)
+INSERT INTO domarrtest (testint4arr[1], testint4arr[3]) values (11,22);
 select * from domarrtest;
   testint4arr  |    testchar4arr     
 ---------------+---------------------
@@ -115,7 +116,8 @@
  {2,2}         | {{a,b},{c,d},{e,f}}
  {2,2}         | {{a},{c}}
                | {{a,b,c},{d,e,f}}
-(5 rows)
+ {11,NULL,22}  | 
+(6 rows)
 
 select testint4arr[1], testchar4arr[2:2] from domarrtest;
  testint4arr | testchar4arr 
@@ -125,7 +127,8 @@
            2 | {{c,d}}
            2 | {{c}}
              | {{d,e,f}}
-(5 rows)
+          11 | 
+(6 rows)
 
 select array_dims(testint4arr), array_dims(testchar4arr) from domarrtest;
  array_dims | array_dims 
@@ -135,7 +138,8 @@
  [1:2]      | [1:3][1:2]
  [1:2]      | [1:2][1:1]
             | [1:2][1:3]
-(5 rows)
+ [1:3]      | 
+(6 rows)
 
 COPY domarrtest FROM stdin;
 COPY domarrtest FROM stdin;	-- fail
@@ -149,9 +153,21 @@
  {2,2}         | {{a,b},{c,d},{e,f}}
  {2,2}         | {{a},{c}}
                | {{a,b,c},{d,e,f}}
+ {11,NULL,22}  | 
  {3,4}         | {q,w,e}
                | 
-(7 rows)
+(8 rows)
+
+update domarrtest set
+  testint4arr[1] = testint4arr[1] + 1,
+  testint4arr[3] = testint4arr[3] - 1
+where testchar4arr is null;
+select * from domarrtest where testchar4arr is null;
+   testint4arr    | testchar4arr 
+------------------+--------------
+ {12,NULL,21}     | 
+ {NULL,NULL,NULL} | 
+(2 rows)
 
 drop table domarrtest;
 drop domain domainint4arr restrict;
@@ -182,6 +198,119 @@
 (1 row)
 
 drop domain dia;
+-- Test domains over arrays of composite
+create type comptype as (r float8, i float8);
+create domain dcomptypea as comptype[];
+create table dcomptable (d1 dcomptypea unique);
+insert into dcomptable values (array[row(1,2)]::dcomptypea);
+insert into dcomptable values (array[row(3,4), row(5,6)]::comptype[]);
+insert into dcomptable values (array[row(7,8)::comptype, row(9,10)::comptype]);
+insert into dcomptable values (array[row(1,2)]::dcomptypea);  -- fail on uniqueness
+ERROR:  duplicate key value violates unique constraint "dcomptable_d1_key"
+DETAIL:  Key (d1)=({"(1,2)"}) already exists.
+insert into dcomptable (d1[1]) values(row(9,10));
+insert into dcomptable (d1[1].r) values(11);
+select * from dcomptable;
+         d1         
+--------------------
+ {"(1,2)"}
+ {"(3,4)","(5,6)"}
+ {"(7,8)","(9,10)"}
+ {"(9,10)"}
+ {"(11,)"}
+(5 rows)
+
+select d1[2], d1[1].r, d1[1].i from dcomptable;
+   d1   | r  | i  
+--------+----+----
+        |  1 |  2
+ (5,6)  |  3 |  4
+ (9,10) |  7 |  8
+        |  9 | 10
+        | 11 |   
+(5 rows)
+
+update dcomptable set d1[2] = row(d1[2].i, d1[2].r);
+select * from dcomptable;
+         d1         
+--------------------
+ {"(1,2)","(,)"}
+ {"(3,4)","(6,5)"}
+ {"(7,8)","(10,9)"}
+ {"(9,10)","(,)"}
+ {"(11,)","(,)"}
+(5 rows)
+
+update dcomptable set d1[1].r = d1[1].r + 1 where d1[1].i > 0;
+select * from dcomptable;
+         d1         
+--------------------
+ {"(11,)","(,)"}
+ {"(2,2)","(,)"}
+ {"(4,4)","(6,5)"}
+ {"(8,8)","(10,9)"}
+ {"(10,10)","(,)"}
+(5 rows)
+
+alter domain dcomptypea add constraint c1 check (value[1].r <= value[1].i);
+alter domain dcomptypea add constraint c2 check (value[1].r > value[1].i);  -- fail
+ERROR:  column "d1" of table "dcomptable" contains values that violate the new constraint
+select array[row(2,1)]::dcomptypea;  -- fail
+ERROR:  value for domain dcomptypea violates check constraint "c1"
+insert into dcomptable values (array[row(1,2)]::comptype[]);
+insert into dcomptable values (array[row(2,1)]::comptype[]);  -- fail
+ERROR:  value for domain dcomptypea violates check constraint "c1"
+insert into dcomptable (d1[1].r) values(99);
+insert into dcomptable (d1[1].r, d1[1].i) values(99, 100);
+insert into dcomptable (d1[1].r, d1[1].i) values(100, 99);  -- fail
+ERROR:  value for domain dcomptypea violates check constraint "c1"
+update dcomptable set d1[1].r = d1[1].r + 1 where d1[1].i > 0;  -- fail
+ERROR:  value for domain dcomptypea violates check constraint "c1"
+update dcomptable set d1[1].r = d1[1].r - 1, d1[1].i = d1[1].i + 1
+  where d1[1].i > 0;
+select * from dcomptable;
+         d1         
+--------------------
+ {"(11,)","(,)"}
+ {"(99,)"}
+ {"(1,3)","(,)"}
+ {"(3,5)","(6,5)"}
+ {"(7,9)","(10,9)"}
+ {"(9,11)","(,)"}
+ {"(0,3)"}
+ {"(98,101)"}
+(8 rows)
+
+explain (verbose, costs off)
+  update dcomptable set d1[1].r = d1[1].r - 1, d1[1].i = d1[1].i + 1
+    where d1[1].i > 0;
+                                                   QUERY PLAN                                                   
+----------------------------------------------------------------------------------------------------------------
+ Update on public.dcomptable
+   ->  Seq Scan on public.dcomptable
+         Output: (d1[1].r := (d1[1].r - '1'::double precision))[1].i := (d1[1].i + '1'::double precision), ctid
+         Filter: (dcomptable.d1[1].i > '0'::double precision)
+(4 rows)
+
+create rule silly as on delete to dcomptable do instead
+  update dcomptable set d1[1].r = d1[1].r - 1, d1[1].i = d1[1].i + 1
+    where d1[1].i > 0;
+\d+ dcomptable
+                        Table "public.dcomptable"
+ Column |    Type    | Modifiers | Storage  | Stats target | Description 
+--------+------------+-----------+----------+--------------+-------------
+ d1     | dcomptypea |           | extended |              | 
+Indexes:
+    "dcomptable_d1_key" UNIQUE CONSTRAINT, btree (d1)
+Rules:
+    silly AS
+    ON DELETE TO dcomptable DO INSTEAD  UPDATE dcomptable SET d1[1].r = dcomptable.d1[1].r - 1::double precision, d1[1].i = dcomptable.d1[1].i + 1::double precision
+  WHERE dcomptable.d1[1].i > 0::double precision
+
+drop table dcomptable;
+drop type comptype cascade;
+NOTICE:  drop cascades to type dcomptypea
+-- Test not-null restrictions
 create domain dnotnull varchar(15) NOT NULL;
 create domain dnull    varchar(15);
 create domain dcheck   varchar(15) NOT NULL CHECK (VALUE = 'a' OR VALUE = 'c' OR VALUE = 'd');
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/foreign_data.out postgresql-9.5-9.5.8/src/test/regress/expected/foreign_data.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/foreign_data.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/foreign_data.out	2017-08-07 21:13:41.000000000 +0000
@@ -1179,10 +1179,11 @@
 ALTER SERVER s9 VERSION '1.1';
 GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;
 CREATE USER MAPPING FOR current_user SERVER s9;
+-- We use terse mode to avoid ordering issues in cascade detail output.
+\set VERBOSITY terse
 DROP SERVER s9 CASCADE;
 NOTICE:  drop cascades to 2 other objects
-DETAIL:  drop cascades to user mapping for public on server s9
-drop cascades to user mapping for unprivileged_role on server s9
+\set VERBOSITY default
 RESET ROLE;
 CREATE SERVER s9 FOREIGN DATA WRAPPER foo;
 GRANT USAGE ON FOREIGN SERVER s9 TO unprivileged_role;
@@ -1194,7 +1195,66 @@
 CREATE USER MAPPING FOR current_user SERVER s9;
 DROP SERVER s9 CASCADE;                                         -- ERROR
 ERROR:  must be owner of foreign server s9
+-- Check visibility of user mapping data
+SET ROLE regress_test_role;
+CREATE SERVER s10 FOREIGN DATA WRAPPER foo;
+CREATE USER MAPPING FOR public SERVER s10 OPTIONS (user 'secret');
+CREATE USER MAPPING FOR unprivileged_role SERVER s10 OPTIONS (user 'secret');
+-- owner of server can see some option fields
+\deu+
+             List of user mappings
+ Server |     User name     |    FDW Options    
+--------+-------------------+-------------------
+ s10    | public            | ("user" 'secret')
+ s10    | unprivileged_role | 
+ s4     | foreign_data_user | 
+ s5     | regress_test_role | (modified '1')
+ s6     | regress_test_role | 
+ s8     | foreign_data_user | 
+ s8     | public            | 
+ s9     | unprivileged_role | 
+ t1     | public            | (modified '1')
+(9 rows)
+
+RESET ROLE;
+-- superuser can see all option fields
+\deu+
+              List of user mappings
+ Server |     User name     |     FDW Options     
+--------+-------------------+---------------------
+ s10    | public            | ("user" 'secret')
+ s10    | unprivileged_role | ("user" 'secret')
+ s4     | foreign_data_user | 
+ s5     | regress_test_role | (modified '1')
+ s6     | regress_test_role | 
+ s8     | foreign_data_user | (password 'public')
+ s8     | public            | 
+ s9     | unprivileged_role | 
+ t1     | public            | (modified '1')
+(9 rows)
+
+-- unprivileged user cannot see any option field
+SET ROLE unprivileged_role;
+\deu+
+          List of user mappings
+ Server |     User name     | FDW Options 
+--------+-------------------+-------------
+ s10    | public            | 
+ s10    | unprivileged_role | 
+ s4     | foreign_data_user | 
+ s5     | regress_test_role | 
+ s6     | regress_test_role | 
+ s8     | foreign_data_user | 
+ s8     | public            | 
+ s9     | unprivileged_role | 
+ t1     | public            | 
+(9 rows)
+
 RESET ROLE;
+\set VERBOSITY terse
+DROP SERVER s10 CASCADE;
+NOTICE:  drop cascades to 2 other objects
+\set VERBOSITY default
 -- Triggers
 CREATE FUNCTION dummy_trigger() RETURNS TRIGGER AS $$
   BEGIN
@@ -1529,15 +1589,12 @@
 Child tables: ct3,
               ft3
 
+\set VERBOSITY terse
 DROP FOREIGN TABLE ft2; -- ERROR
 ERROR:  cannot drop foreign table ft2 because other objects depend on it
-DETAIL:  table ct3 depends on foreign table ft2
-foreign table ft3 depends on foreign table ft2
-HINT:  Use DROP ... CASCADE to drop the dependent objects too.
 DROP FOREIGN TABLE ft2 CASCADE;
 NOTICE:  drop cascades to 2 other objects
-DETAIL:  drop cascades to table ct3
-drop cascades to foreign table ft3
+\set VERBOSITY default
 CREATE FOREIGN TABLE ft2 (
 	c1 integer NOT NULL,
 	c2 text,
@@ -1761,16 +1818,12 @@
 DROP SERVER t1 CASCADE;
 NOTICE:  drop cascades to user mapping for public on server t1
 DROP USER MAPPING FOR regress_test_role SERVER s6;
--- This test causes some order dependent cascade detail output,
--- so switch to terse mode for it.
 \set VERBOSITY terse
 DROP FOREIGN DATA WRAPPER foo CASCADE;
 NOTICE:  drop cascades to 5 other objects
-\set VERBOSITY default
 DROP SERVER s8 CASCADE;
 NOTICE:  drop cascades to 2 other objects
-DETAIL:  drop cascades to user mapping for foreign_data_user on server s8
-drop cascades to user mapping for public on server s8
+\set VERBOSITY default
 DROP ROLE regress_test_indirect;
 DROP ROLE regress_test_role;
 DROP ROLE unprivileged_role;                                -- ERROR
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/foreign_key.out postgresql-9.5-9.5.8/src/test/regress/expected/foreign_key.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/foreign_key.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/foreign_key.out	2017-08-07 21:13:41.000000000 +0000
@@ -1359,3 +1359,37 @@
 ERROR:  update or delete on table "pp" violates foreign key constraint "cc_f1_fkey" on table "cc"
 DETAIL:  Key (f1)=(13) is still referenced from table "cc".
 drop table pp, cc;
+--
+-- Test deferred FK check on a tuple deleted by a rolled-back subtransaction
+--
+create table pktable2(f1 int primary key);
+create table fktable2(f1 int references pktable2 deferrable initially deferred);
+insert into pktable2 values(1);
+begin;
+insert into fktable2 values(1);
+savepoint x;
+delete from fktable2;
+rollback to x;
+commit;
+begin;
+insert into fktable2 values(2);
+savepoint x;
+delete from fktable2;
+rollback to x;
+commit; -- fail
+ERROR:  insert or update on table "fktable2" violates foreign key constraint "fktable2_f1_fkey"
+DETAIL:  Key (f1)=(2) is not present in table "pktable2".
+--
+-- Test that we prevent dropping FK constraint with pending trigger events
+--
+begin;
+insert into fktable2 values(2);
+alter table fktable2 drop constraint fktable2_f1_fkey;
+ERROR:  cannot ALTER TABLE "fktable2" because it has pending trigger events
+commit;
+begin;
+delete from pktable2 where f1 = 1;
+alter table fktable2 drop constraint fktable2_f1_fkey;
+ERROR:  cannot ALTER TABLE "pktable2" because it has pending trigger events
+commit;
+drop table pktable2, fktable2;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/gist.out postgresql-9.5-9.5.8/src/test/regress/expected/gist.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/gist.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/gist.out	2017-08-07 21:13:41.000000000 +0000
@@ -114,6 +114,40 @@
  (0.5,0.5)
 (11 rows)
 
+-- Check case with multiple rescans (bug #14641)
+explain (costs off)
+select p from
+  (values (box(point(0,0), point(0.5,0.5))),
+          (box(point(0.5,0.5), point(0.75,0.75))),
+          (box(point(0.8,0.8), point(1.0,1.0)))) as v(bb)
+cross join lateral
+  (select p from gist_tbl where p <@ bb order by p <-> bb[0] limit 2) ss;
+                             QUERY PLAN                             
+--------------------------------------------------------------------
+ Nested Loop
+   ->  Values Scan on "*VALUES*"
+   ->  Limit
+         ->  Index Only Scan using gist_tbl_point_index on gist_tbl
+               Index Cond: (p <@ "*VALUES*".column1)
+               Order By: (p <-> ("*VALUES*".column1)[0])
+(6 rows)
+
+select p from
+  (values (box(point(0,0), point(0.5,0.5))),
+          (box(point(0.5,0.5), point(0.75,0.75))),
+          (box(point(0.8,0.8), point(1.0,1.0)))) as v(bb)
+cross join lateral
+  (select p from gist_tbl where p <@ bb order by p <-> bb[0] limit 2) ss;
+      p      
+-------------
+ (0.5,0.5)
+ (0.45,0.45)
+ (0.75,0.75)
+ (0.7,0.7)
+ (1,1)
+ (0.95,0.95)
+(6 rows)
+
 drop index gist_tbl_point_index;
 -- Test index-only scan with box opclass
 create index gist_tbl_box_index on gist_tbl using gist (b);
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/groupingsets.out postgresql-9.5-9.5.8/src/test/regress/expected/groupingsets.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/groupingsets.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/groupingsets.out	2017-08-07 21:13:41.000000000 +0000
@@ -847,4 +847,11 @@
  2500
 (6 rows)
 
+-- Check for sensible failure on unsortable data
+select usort, grouping(usort), count(*) from (values ('1'::xid),('2'::xid),('1'::xid)) v(usort) group by rollup(usort);
+ERROR:  could not implement GROUP BY
+DETAIL:  Some of the datatypes do not support sorting, which is required for grouping sets.
+select id, usort, grouping(id,usort), count(*) from (values (1,'1'::xid),(1,'2'::xid),(2,'1'::xid)) v(id,usort) group by grouping sets ((id), (usort));
+ERROR:  could not implement GROUP BY
+DETAIL:  Some of the datatypes do not support sorting, which is required for grouping sets.
 -- end
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/indirect_toast.out postgresql-9.5-9.5.8/src/test/regress/expected/indirect_toast.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/indirect_toast.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/indirect_toast.out	2017-08-07 21:13:41.000000000 +0000
@@ -23,7 +23,7 @@
  ("one-toasted,one-null",1,,12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123
 (4 rows)
 
--- modification without modifying asigned value
+-- modification without modifying assigned value
 UPDATE toasttest SET cnt = cnt +1, f1 = f1 RETURNING substring(toasttest::text, 1, 200);
                                                                                                 substring                                                                                                 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -61,7 +61,7 @@
  ("one-toasted,one-null",4,,12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123
 (4 rows)
 
--- check we didn't screw with main/toast tuple visiblity
+-- check we didn't screw with main/toast tuple visibility
 VACUUM FREEZE toasttest;
 SELECT substring(toasttest::text, 1, 200) FROM toasttest;
                                                                                                 substring                                                                                                 
@@ -95,7 +95,7 @@
  ("one-toasted,one-null",5,,12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123
 (4 rows)
 
--- modification without modifying asigned value
+-- modification without modifying assigned value
 UPDATE toasttest SET cnt = cnt +1, f1 = f1 RETURNING substring(toasttest::text, 1, 200);
                                                                                                 substring                                                                                                 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -135,7 +135,7 @@
  ("one-toasted,one-null, via indirect",0,1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
 (5 rows)
 
--- check we didn't screw with main/toast tuple visiblity
+-- check we didn't screw with main/toast tuple visibility
 VACUUM FREEZE toasttest;
 SELECT substring(toasttest::text, 1, 200) FROM toasttest;
                                                                                                 substring                                                                                                 
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/inherit.out postgresql-9.5-9.5.8/src/test/regress/expected/inherit.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/inherit.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/inherit.out	2017-08-07 21:13:41.000000000 +0000
@@ -612,6 +612,55 @@
  32 | one | two | three
 (1 row)
 
+-- check that oid column is handled properly during alter table inherit
+create table oid_parent (a int) with oids;
+create table oid_child () inherits (oid_parent);
+select attinhcount, attislocal from pg_attribute
+  where attrelid = 'oid_child'::regclass and attname = 'oid';
+ attinhcount | attislocal 
+-------------+------------
+           1 | f
+(1 row)
+
+drop table oid_child;
+create table oid_child (a int) without oids;
+alter table oid_child inherit oid_parent;  -- fail
+ERROR:  table "oid_child" without OIDs cannot inherit from table "oid_parent" with OIDs
+alter table oid_child set with oids;
+select attinhcount, attislocal from pg_attribute
+  where attrelid = 'oid_child'::regclass and attname = 'oid';
+ attinhcount | attislocal 
+-------------+------------
+           0 | t
+(1 row)
+
+alter table oid_child inherit oid_parent;
+select attinhcount, attislocal from pg_attribute
+  where attrelid = 'oid_child'::regclass and attname = 'oid';
+ attinhcount | attislocal 
+-------------+------------
+           1 | t
+(1 row)
+
+alter table oid_child set without oids;  -- fail
+ERROR:  cannot drop inherited column "oid"
+alter table oid_parent set without oids;
+select attinhcount, attislocal from pg_attribute
+  where attrelid = 'oid_child'::regclass and attname = 'oid';
+ attinhcount | attislocal 
+-------------+------------
+           0 | t
+(1 row)
+
+alter table oid_child set without oids;
+select attinhcount, attislocal from pg_attribute
+  where attrelid = 'oid_child'::regclass and attname = 'oid';
+ attinhcount | attislocal 
+-------------+------------
+(0 rows)
+
+drop table oid_parent cascade;
+NOTICE:  drop cascades to table oid_child
 -- Test non-inheritable parent constraints
 create table p1(ff1 int);
 alter table p1 add constraint p1chk check (ff1 > 0) no inherit;
@@ -645,6 +694,9 @@
     "p2chk" CHECK (ff1 > 10)
 Inherits: p1
 
+-- Test that child does not override inheritable constraints of the parent
+create table c2 (constraint p2chk check (ff1 > 10) no inherit) inherits (p1);	--fails
+ERROR:  constraint "p2chk" conflicts with inherited constraint on relation "c2"
 drop table p1 cascade;
 NOTICE:  drop cascades to table c1
 -- Tests for casting between the rowtypes of parent and child
@@ -1090,6 +1142,56 @@
 DROP TABLE test_foreign_constraints_inh;
 DROP TABLE test_foreign_constraints;
 DROP TABLE test_primary_constraints;
+-- Test that parent and child CHECK constraints can be created in either order
+create table p1(f1 int);
+create table p1_c1() inherits(p1);
+alter table p1 add constraint inh_check_constraint1 check (f1 > 0);
+alter table p1_c1 add constraint inh_check_constraint1 check (f1 > 0);
+NOTICE:  merging constraint "inh_check_constraint1" with inherited definition
+alter table p1_c1 add constraint inh_check_constraint2 check (f1 < 10);
+alter table p1 add constraint inh_check_constraint2 check (f1 < 10);
+NOTICE:  merging constraint "inh_check_constraint2" with inherited definition
+select conrelid::regclass::text as relname, conname, conislocal, coninhcount
+from pg_constraint where conname like 'inh\_check\_constraint%'
+order by 1, 2;
+ relname |        conname        | conislocal | coninhcount 
+---------+-----------------------+------------+-------------
+ p1      | inh_check_constraint1 | t          |           0
+ p1      | inh_check_constraint2 | t          |           0
+ p1_c1   | inh_check_constraint1 | t          |           1
+ p1_c1   | inh_check_constraint2 | t          |           1
+(4 rows)
+
+drop table p1 cascade;
+NOTICE:  drop cascades to table p1_c1
+-- Test that a valid child can have not-valid parent, but not vice versa
+create table invalid_check_con(f1 int);
+create table invalid_check_con_child() inherits(invalid_check_con);
+alter table invalid_check_con_child add constraint inh_check_constraint check(f1 > 0) not valid;
+alter table invalid_check_con add constraint inh_check_constraint check(f1 > 0); -- fail
+ERROR:  constraint "inh_check_constraint" conflicts with NOT VALID constraint on relation "invalid_check_con_child"
+alter table invalid_check_con_child drop constraint inh_check_constraint;
+insert into invalid_check_con values(0);
+alter table invalid_check_con_child add constraint inh_check_constraint check(f1 > 0);
+alter table invalid_check_con add constraint inh_check_constraint check(f1 > 0) not valid;
+NOTICE:  merging constraint "inh_check_constraint" with inherited definition
+insert into invalid_check_con values(0); -- fail
+ERROR:  new row for relation "invalid_check_con" violates check constraint "inh_check_constraint"
+DETAIL:  Failing row contains (0).
+insert into invalid_check_con_child values(0); -- fail
+ERROR:  new row for relation "invalid_check_con_child" violates check constraint "inh_check_constraint"
+DETAIL:  Failing row contains (0).
+select conrelid::regclass::text as relname, conname,
+       convalidated, conislocal, coninhcount, connoinherit
+from pg_constraint where conname like 'inh\_check\_constraint%'
+order by 1, 2;
+         relname         |       conname        | convalidated | conislocal | coninhcount | connoinherit 
+-------------------------+----------------------+--------------+------------+-------------+--------------
+ invalid_check_con       | inh_check_constraint | f            | t          |           0 | f
+ invalid_check_con_child | inh_check_constraint | t            | t          |           1 | f
+(2 rows)
+
+-- We don't drop the invalid_check_con* tables, to test dump/reload with
 --
 -- Test parameterized append plans for inheritance trees
 --
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/insert_conflict.out postgresql-9.5-9.5.8/src/test/regress/expected/insert_conflict.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/insert_conflict.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/insert_conflict.out	2017-08-07 21:13:41.000000000 +0000
@@ -289,7 +289,7 @@
 ERROR:  there is no unique or exclusion constraint matching the ON CONFLICT specification
 drop index comp_key_index;
 --
--- Partial index tests, no inference predicate specificied
+-- Partial index tests, no inference predicate specified
 --
 create unique index part_comp_key_index on insertconflicttest(key, fruit) where key < 5;
 create unique index expr_part_comp_key_index on insertconflicttest(key, lower(fruit)) where key < 5;
@@ -454,6 +454,45 @@
 LINE 1: ...values (1) on conflict (key) do update set data = excluded.o...
                                                              ^
 drop table syscolconflicttest;
+--
+-- Previous tests all managed to not test any expressions requiring
+-- planner preprocessing ...
+--
+create table insertconflict (a bigint, b bigint);
+create unique index insertconflicti1 on insertconflict(coalesce(a, 0));
+create unique index insertconflicti2 on insertconflict(b)
+  where coalesce(a, 1) > 0;
+insert into insertconflict values (1, 2)
+on conflict (coalesce(a, 0)) do nothing;
+insert into insertconflict values (1, 2)
+on conflict (b) where coalesce(a, 1) > 0 do nothing;
+insert into insertconflict values (1, 2)
+on conflict (b) where coalesce(a, 1) > 1 do nothing;
+drop table insertconflict;
+--
+-- test insertion through view
+--
+create table insertconflict (f1 int primary key, f2 text);
+create view insertconflictv as
+  select * from insertconflict with cascaded check option;
+insert into insertconflictv values (1,'foo')
+  on conflict (f1) do update set f2 = excluded.f2;
+select * from insertconflict;
+ f1 | f2  
+----+-----
+  1 | foo
+(1 row)
+
+insert into insertconflictv values (1,'bar')
+  on conflict (f1) do update set f2 = excluded.f2;
+select * from insertconflict;
+ f1 | f2  
+----+-----
+  1 | bar
+(1 row)
+
+drop view insertconflictv;
+drop table insertconflict;
 -- ******************************************************************
 -- *                                                                *
 -- * Test inheritance (example taken from tutorial)                 *
@@ -687,3 +726,61 @@
 
 ;
 DROP TABLE dropcol;
+-- check handling of regular btree constraint along with gist constraint
+create table twoconstraints (f1 int unique, f2 box,
+                             exclude using gist(f2 with &&));
+insert into twoconstraints values(1, '((0,0),(1,1))');
+insert into twoconstraints values(1, '((2,2),(3,3))');  -- fail on f1
+ERROR:  duplicate key value violates unique constraint "twoconstraints_f1_key"
+DETAIL:  Key (f1)=(1) already exists.
+insert into twoconstraints values(2, '((0,0),(1,2))');  -- fail on f2
+ERROR:  conflicting key value violates exclusion constraint "twoconstraints_f2_excl"
+DETAIL:  Key (f2)=((1,2),(0,0)) conflicts with existing key (f2)=((1,1),(0,0)).
+insert into twoconstraints values(2, '((0,0),(1,2))')
+  on conflict on constraint twoconstraints_f1_key do nothing;  -- fail on f2
+ERROR:  conflicting key value violates exclusion constraint "twoconstraints_f2_excl"
+DETAIL:  Key (f2)=((1,2),(0,0)) conflicts with existing key (f2)=((1,1),(0,0)).
+insert into twoconstraints values(2, '((0,0),(1,2))')
+  on conflict on constraint twoconstraints_f2_excl do nothing;  -- do nothing
+select * from twoconstraints;
+ f1 |     f2      
+----+-------------
+  1 | (1,1),(0,0)
+(1 row)
+
+drop table twoconstraints;
+-- check handling of self-conflicts at various isolation levels
+create table selfconflict (f1 int primary key, f2 int);
+begin transaction isolation level read committed;
+insert into selfconflict values (1,1), (1,2) on conflict do nothing;
+commit;
+begin transaction isolation level repeatable read;
+insert into selfconflict values (2,1), (2,2) on conflict do nothing;
+commit;
+begin transaction isolation level serializable;
+insert into selfconflict values (3,1), (3,2) on conflict do nothing;
+commit;
+begin transaction isolation level read committed;
+insert into selfconflict values (4,1), (4,2) on conflict(f1) do update set f2 = 0;
+ERROR:  ON CONFLICT DO UPDATE command cannot affect row a second time
+HINT:  Ensure that no rows proposed for insertion within the same command have duplicate constrained values.
+commit;
+begin transaction isolation level repeatable read;
+insert into selfconflict values (5,1), (5,2) on conflict(f1) do update set f2 = 0;
+ERROR:  ON CONFLICT DO UPDATE command cannot affect row a second time
+HINT:  Ensure that no rows proposed for insertion within the same command have duplicate constrained values.
+commit;
+begin transaction isolation level serializable;
+insert into selfconflict values (6,1), (6,2) on conflict(f1) do update set f2 = 0;
+ERROR:  ON CONFLICT DO UPDATE command cannot affect row a second time
+HINT:  Ensure that no rows proposed for insertion within the same command have duplicate constrained values.
+commit;
+select * from selfconflict;
+ f1 | f2 
+----+----
+  1 |  1
+  2 |  1
+  3 |  1
+(3 rows)
+
+drop table selfconflict;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/interval.out postgresql-9.5-9.5.8/src/test/regress/expected/interval.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/interval.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/interval.out	2017-08-07 21:13:41.000000000 +0000
@@ -207,6 +207,70 @@
            | 34 years        | 6 years
 (45 rows)
 
+-- Test intervals that are large enough to overflow 64 bits in comparisons
+CREATE TEMP TABLE INTERVAL_TBL_OF (f1 interval);
+INSERT INTO INTERVAL_TBL_OF (f1) VALUES
+  ('2147483647 days 2147483647 months'),
+  ('2147483647 days -2147483648 months'),
+  ('1 year'),
+  ('-2147483648 days 2147483647 months'),
+  ('-2147483648 days -2147483648 months');
+-- these should fail as out-of-range
+INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('2147483648 days');
+ERROR:  interval field value out of range: "2147483648 days"
+LINE 1: INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('2147483648 days');
+                                                 ^
+INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('-2147483649 days');
+ERROR:  interval field value out of range: "-2147483649 days"
+LINE 1: INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('-2147483649 days')...
+                                                 ^
+INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('2147483647 years');
+ERROR:  interval out of range
+LINE 1: INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('2147483647 years')...
+                                                 ^
+INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('-2147483648 years');
+ERROR:  interval out of range
+LINE 1: INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('-2147483648 years'...
+                                                 ^
+SELECT r1.*, r2.*
+   FROM INTERVAL_TBL_OF r1, INTERVAL_TBL_OF r2
+   WHERE r1.f1 > r2.f1
+   ORDER BY r1.f1, r2.f1;
+                    f1                     |                    f1                     
+-------------------------------------------+-------------------------------------------
+ -178956970 years -8 mons +2147483647 days | -178956970 years -8 mons -2147483648 days
+ 1 year                                    | -178956970 years -8 mons -2147483648 days
+ 1 year                                    | -178956970 years -8 mons +2147483647 days
+ 178956970 years 7 mons -2147483648 days   | -178956970 years -8 mons -2147483648 days
+ 178956970 years 7 mons -2147483648 days   | -178956970 years -8 mons +2147483647 days
+ 178956970 years 7 mons -2147483648 days   | 1 year
+ 178956970 years 7 mons 2147483647 days    | -178956970 years -8 mons -2147483648 days
+ 178956970 years 7 mons 2147483647 days    | -178956970 years -8 mons +2147483647 days
+ 178956970 years 7 mons 2147483647 days    | 1 year
+ 178956970 years 7 mons 2147483647 days    | 178956970 years 7 mons -2147483648 days
+(10 rows)
+
+CREATE INDEX ON INTERVAL_TBL_OF USING btree (f1);
+SET enable_seqscan TO false;
+EXPLAIN (COSTS OFF)
+SELECT f1 FROM INTERVAL_TBL_OF r1 ORDER BY f1;
+                             QUERY PLAN                             
+--------------------------------------------------------------------
+ Index Only Scan using interval_tbl_of_f1_idx on interval_tbl_of r1
+(1 row)
+
+SELECT f1 FROM INTERVAL_TBL_OF r1 ORDER BY f1;
+                    f1                     
+-------------------------------------------
+ -178956970 years -8 mons -2147483648 days
+ -178956970 years -8 mons +2147483647 days
+ 1 year
+ 178956970 years 7 mons -2147483648 days
+ 178956970 years 7 mons 2147483647 days
+(5 rows)
+
+RESET enable_seqscan;
+DROP TABLE INTERVAL_TBL_OF;
 -- Test multiplication and division with intervals.
 -- Floating point arithmetic rounding errors can lead to unexpected results,
 -- though the code attempts to do the right thing and round up to days and
@@ -682,6 +746,24 @@
  1 day 02:03:04.57
 (1 row)
 
+-- test casting to restricted precision (bug #14479)
+SELECT f1, f1::INTERVAL DAY TO MINUTE AS "minutes",
+  (f1 + INTERVAL '1 month')::INTERVAL MONTH::INTERVAL YEAR AS "years"
+  FROM interval_tbl;
+       f1        |     minutes     |  years   
+-----------------+-----------------+----------
+ 00:01:00        | 00:01:00        | 00:00:00
+ 05:00:00        | 05:00:00        | 00:00:00
+ 10 days         | 10 days         | 00:00:00
+ 34 years        | 34 years        | 34 years
+ 3 mons          | 3 mons          | 00:00:00
+ -00:00:14       | 00:00:00        | 00:00:00
+ 1 day 02:03:04  | 1 day 02:03:00  | 00:00:00
+ 6 years         | 6 years         | 6 years
+ 5 mons          | 5 mons          | 00:00:00
+ 5 mons 12:00:00 | 5 mons 12:00:00 | 00:00:00
+(10 rows)
+
 -- test inputting and outputting SQL standard interval literals
 SET IntervalStyle TO sql_standard;
 SELECT  interval '0'                       AS "zero",
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/join.out postgresql-9.5-9.5.8/src/test/regress/expected/join.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/join.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/join.out	2017-08-07 21:13:41.000000000 +0000
@@ -2237,6 +2237,38 @@
 (1 row)
 
 --
+-- regression test: check a case where we formerly missed including an EC
+-- enforcement clause because it was expected to be handled at scan level
+--
+explain (costs off)
+select a.f1, b.f1, t.thousand, t.tenthous from
+  tenk1 t,
+  (select sum(f1)+1 as f1 from int4_tbl i4a) a,
+  (select sum(f1) as f1 from int4_tbl i4b) b
+where b.f1 = t.thousand and a.f1 = b.f1 and (a.f1+b.f1+999) = t.tenthous;
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Nested Loop
+   ->  Aggregate
+         ->  Seq Scan on int4_tbl i4b
+   ->  Nested Loop
+         Join Filter: ((sum(i4b.f1)) = ((sum(i4a.f1) + 1)))
+         ->  Aggregate
+               ->  Seq Scan on int4_tbl i4a
+         ->  Index Only Scan using tenk1_thous_tenthous on tenk1 t
+               Index Cond: ((thousand = (sum(i4b.f1))) AND (tenthous = ((((sum(i4a.f1) + 1)) + (sum(i4b.f1))) + 999)))
+(9 rows)
+
+select a.f1, b.f1, t.thousand, t.tenthous from
+  tenk1 t,
+  (select sum(f1)+1 as f1 from int4_tbl i4a) a,
+  (select sum(f1) as f1 from int4_tbl i4b) b
+where b.f1 = t.thousand and a.f1 = b.f1 and (a.f1+b.f1+999) = t.tenthous;
+ f1 | f1 | thousand | tenthous 
+----+----+----------+----------
+(0 rows)
+
+--
 -- Clean up
 --
 DROP TABLE t1;
@@ -3802,6 +3834,37 @@
 (0 rows)
 
 --
+-- test successful handling of full join underneath left join (bug #14105)
+--
+explain (costs off)
+select * from
+  (select 1 as id) as xx
+  left join
+    (tenk1 as a1 full join (select 1 as id) as yy on (a1.unique1 = yy.id))
+  on (xx.id = coalesce(yy.id));
+              QUERY PLAN               
+---------------------------------------
+ Nested Loop Left Join
+   Join Filter: ((1) = COALESCE((1)))
+   ->  Result
+   ->  Hash Full Join
+         Hash Cond: (a1.unique1 = (1))
+         ->  Seq Scan on tenk1 a1
+         ->  Hash
+               ->  Result
+(8 rows)
+
+select * from
+  (select 1 as id) as xx
+  left join
+    (tenk1 as a1 full join (select 1 as id) as yy on (a1.unique1 = yy.id))
+  on (xx.id = coalesce(yy.id));
+ id | unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 | id 
+----+---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------+----
+  1 |       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx  |  1
+(1 row)
+
+--
 -- test ability to push constants through outer join clauses
 --
 explain (costs off)
@@ -4200,7 +4263,7 @@
 -- Test hints given on incorrect column references are useful
 --
 select t1.uunique1 from
-  tenk1 t1 join tenk2 t2 on t1.two = t2.two; -- error, prefer "t1" suggestipn
+  tenk1 t1 join tenk2 t2 on t1.two = t2.two; -- error, prefer "t1" suggestion
 ERROR:  column t1.uunique1 does not exist
 LINE 1: select t1.uunique1 from
                ^
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/matview.out postgresql-9.5-9.5.8/src/test/regress/expected/matview.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/matview.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/matview.out	2017-08-07 21:13:41.000000000 +0000
@@ -292,7 +292,7 @@
 -- test diemv when the mv does not exist
 DROP MATERIALIZED VIEW IF EXISTS no_such_mv;
 NOTICE:  materialized view "no_such_mv" does not exist, skipping
--- make sure invalid comination of options is prohibited
+-- make sure invalid combination of options is prohibited
 REFRESH MATERIALIZED VIEW CONCURRENTLY tvmm WITH NO DATA;
 ERROR:  CONCURRENTLY and WITH NO DATA options cannot be used together
 -- no tuple locks on materialized views
@@ -382,26 +382,6 @@
 DETAIL:  drop cascades to view v_test2
 drop cascades to materialized view mv_test2
 drop cascades to materialized view mv_test3
--- test that vacuum does not make empty matview look unpopulated
-CREATE TABLE hoge (i int);
-INSERT INTO hoge VALUES (generate_series(1,100000));
-CREATE MATERIALIZED VIEW hogeview AS SELECT * FROM hoge WHERE i % 2 = 0;
-CREATE INDEX hogeviewidx ON hogeview (i);
-DELETE FROM hoge;
-REFRESH MATERIALIZED VIEW hogeview;
-SELECT * FROM hogeview WHERE i < 10;
- i 
----
-(0 rows)
-
-VACUUM ANALYZE hogeview;
-SELECT * FROM hogeview WHERE i < 10;
- i 
----
-(0 rows)
-
-DROP TABLE hoge CASCADE;
-NOTICE:  drop cascades to materialized view hogeview
 -- test that duplicate values on unique index prevent refresh
 CREATE TABLE foo(a, b) AS VALUES(1, 10);
 CREATE MATERIALIZED VIEW mv AS SELECT * FROM foo;
@@ -454,28 +434,67 @@
 DROP TABLE boxes CASCADE;
 NOTICE:  drop cascades to materialized view boxmv
 -- make sure that column names are handled correctly
-CREATE TABLE v (i int, j int);
-CREATE MATERIALIZED VIEW mv_v (ii) AS SELECT i, j AS jj FROM v;
-ALTER TABLE v RENAME COLUMN i TO x;
-INSERT INTO v values (1, 2);
-CREATE UNIQUE INDEX mv_v_ii ON mv_v (ii);
-REFRESH MATERIALIZED VIEW mv_v;
-UPDATE v SET j = 3 WHERE x = 1;
-REFRESH MATERIALIZED VIEW CONCURRENTLY mv_v;
-SELECT * FROM v;
+CREATE TABLE mvtest_v (i int, j int);
+CREATE MATERIALIZED VIEW mvtest_mv_v (ii, jj, kk) AS SELECT i, j FROM mvtest_v; -- error
+ERROR:  too many column names were specified
+CREATE MATERIALIZED VIEW mvtest_mv_v (ii, jj) AS SELECT i, j FROM mvtest_v; -- ok
+CREATE MATERIALIZED VIEW mvtest_mv_v_2 (ii) AS SELECT i, j FROM mvtest_v; -- ok
+CREATE MATERIALIZED VIEW mvtest_mv_v_3 (ii, jj, kk) AS SELECT i, j FROM mvtest_v WITH NO DATA; -- error
+ERROR:  too many column names were specified
+CREATE MATERIALIZED VIEW mvtest_mv_v_3 (ii, jj) AS SELECT i, j FROM mvtest_v WITH NO DATA; -- ok
+CREATE MATERIALIZED VIEW mvtest_mv_v_4 (ii) AS SELECT i, j FROM mvtest_v WITH NO DATA; -- ok
+ALTER TABLE mvtest_v RENAME COLUMN i TO x;
+INSERT INTO mvtest_v values (1, 2);
+CREATE UNIQUE INDEX mvtest_mv_v_ii ON mvtest_mv_v (ii);
+REFRESH MATERIALIZED VIEW mvtest_mv_v;
+UPDATE mvtest_v SET j = 3 WHERE x = 1;
+REFRESH MATERIALIZED VIEW CONCURRENTLY mvtest_mv_v;
+REFRESH MATERIALIZED VIEW mvtest_mv_v_2;
+REFRESH MATERIALIZED VIEW mvtest_mv_v_3;
+REFRESH MATERIALIZED VIEW mvtest_mv_v_4;
+SELECT * FROM mvtest_v;
  x | j 
 ---+---
  1 | 3
 (1 row)
 
-SELECT * FROM mv_v;
+SELECT * FROM mvtest_mv_v;
  ii | jj 
 ----+----
   1 |  3
 (1 row)
 
-DROP TABLE v CASCADE;
-NOTICE:  drop cascades to materialized view mv_v
+SELECT * FROM mvtest_mv_v_2;
+ ii | j 
+----+---
+  1 | 3
+(1 row)
+
+SELECT * FROM mvtest_mv_v_3;
+ ii | jj 
+----+----
+  1 |  3
+(1 row)
+
+SELECT * FROM mvtest_mv_v_4;
+ ii | j 
+----+---
+  1 | 3
+(1 row)
+
+DROP TABLE mvtest_v CASCADE;
+NOTICE:  drop cascades to 4 other objects
+DETAIL:  drop cascades to materialized view mvtest_mv_v
+drop cascades to materialized view mvtest_mv_v_2
+drop cascades to materialized view mvtest_mv_v_3
+drop cascades to materialized view mvtest_mv_v_4
+-- make sure that create WITH NO DATA does not plan the query (bug #13907)
+create materialized view mvtest_error as select 1/0 as x;  -- fail
+ERROR:  division by zero
+create materialized view mvtest_error as select 1/0 as x with no data;
+refresh materialized view mvtest_error;  -- fail here
+ERROR:  division by zero
+drop materialized view mvtest_error;
 -- make sure that matview rows can be referenced as source rows (bug #9398)
 CREATE TABLE v AS SELECT generate_series(1,10) AS a;
 CREATE MATERIALIZED VIEW mv_v AS SELECT a FROM v WHERE a <= 5;
@@ -518,3 +537,28 @@
 REFRESH MATERIALIZED VIEW CONCURRENTLY mv_foo;
 DROP OWNED BY user_dw CASCADE;
 DROP ROLE user_dw;
+-- make sure that create WITH NO DATA works via SPI
+BEGIN;
+CREATE FUNCTION mvtest_func()
+  RETURNS void AS $$
+BEGIN
+  CREATE MATERIALIZED VIEW mvtest1 AS SELECT 1 AS x;
+  CREATE MATERIALIZED VIEW mvtest2 AS SELECT 1 AS x WITH NO DATA;
+END;
+$$ LANGUAGE plpgsql;
+SELECT mvtest_func();
+ mvtest_func 
+-------------
+ 
+(1 row)
+
+SELECT * FROM mvtest1;
+ x 
+---
+ 1
+(1 row)
+
+SELECT * FROM mvtest2;
+ERROR:  materialized view "mvtest2" has not been populated
+HINT:  Use the REFRESH MATERIALIZED VIEW command.
+ROLLBACK;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/money.out postgresql-9.5-9.5.8/src/test/regress/expected/money.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/money.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/money.out	2017-08-07 21:13:41.000000000 +0000
@@ -185,6 +185,44 @@
  $123.46
 (1 row)
 
+-- rounding vs. truncation in division
+SELECT '878.08'::money / 11::float8;
+ ?column? 
+----------
+   $79.83
+(1 row)
+
+SELECT '878.08'::money / 11::float4;
+ ?column? 
+----------
+   $79.83
+(1 row)
+
+SELECT '878.08'::money / 11::int;
+ ?column? 
+----------
+   $79.82
+(1 row)
+
+SELECT '878.08'::money / 11::smallint;
+ ?column? 
+----------
+   $79.82
+(1 row)
+
+-- check for precision loss in division
+SELECT '90000000000000099.00'::money / 10::int;
+         ?column?          
+---------------------------
+ $9,000,000,000,000,009.90
+(1 row)
+
+SELECT '90000000000000099.00'::money / 10::smallint;
+         ?column?          
+---------------------------
+ $9,000,000,000,000,009.90
+(1 row)
+
 -- Cast int4/int8 to money
 SELECT 1234567890::money;
        money       
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/object_address.out postgresql-9.5-9.5.8/src/test/regress/expected/object_address.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/object_address.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/object_address.out	2017-08-07 21:13:41.000000000 +0000
@@ -64,6 +64,15 @@
 WARNING:  error for toast table column: unsupported object type "toast table column"
 WARNING:  error for view column: unsupported object type "view column"
 WARNING:  error for materialized view column: unsupported object type "materialized view column"
+-- miscellaneous other errors
+select * from pg_get_object_address('operator of access method', '{btree,integer_ops,1}', '{int4,bool}');
+ERROR:  operator 1 (int4, bool) of operator family integer_ops for access method btree does not exist
+select * from pg_get_object_address('operator of access method', '{btree,integer_ops,99}', '{int4,int4}');
+ERROR:  operator 99 (int4, int4) of operator family integer_ops for access method btree does not exist
+select * from pg_get_object_address('function of access method', '{btree,integer_ops,1}', '{int4,bool}');
+ERROR:  function 1 (int4, bool) of operator family integer_ops for access method btree does not exist
+select * from pg_get_object_address('function of access method', '{btree,integer_ops,99}', '{int4,int4}');
+ERROR:  function 99 (int4, int4) of operator family integer_ops for access method btree does not exist
 DO $$
 DECLARE
 	objtype text;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/plpgsql.out postgresql-9.5-9.5.8/src/test/regress/expected/plpgsql.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/plpgsql.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/plpgsql.out	2017-08-07 21:13:41.000000000 +0000
@@ -1423,7 +1423,7 @@
 
 --
 -- Install the central phone system and create the phone numbers.
--- They are weired on insert to the patchfields. Again the
+-- They are wired on insert to the patchfields. Again the
 -- triggers automatically tell the PSlots to update their
 -- backlink field.
 --
@@ -5304,7 +5304,77 @@
 CONTEXT:  PL/pgSQL function testoa(integer,integer,integer) line 5 at assignment
 drop function arrayassign1();
 drop function testoa(x1 int, x2 int, x3 int);
--- access to call stack
+--
+-- Test handling of expanded arrays
+--
+create function returns_rw_array(int) returns int[]
+language plpgsql as $$
+  declare r int[];
+  begin r := array[$1, $1]; return r; end;
+$$ stable;
+create function consumes_rw_array(int[]) returns int
+language plpgsql as $$
+  begin return $1[1]; end;
+$$ stable;
+-- bug #14174
+explain (verbose, costs off)
+select i, a from
+  (select returns_rw_array(1) as a offset 0) ss,
+  lateral consumes_rw_array(a) i;
+                           QUERY PLAN                            
+-----------------------------------------------------------------
+ Nested Loop
+   Output: i.i, (returns_rw_array(1))
+   ->  Result
+         Output: returns_rw_array(1)
+   ->  Function Scan on public.consumes_rw_array i
+         Output: i.i
+         Function Call: consumes_rw_array((returns_rw_array(1)))
+(7 rows)
+
+select i, a from
+  (select returns_rw_array(1) as a offset 0) ss,
+  lateral consumes_rw_array(a) i;
+ i |   a   
+---+-------
+ 1 | {1,1}
+(1 row)
+
+explain (verbose, costs off)
+select consumes_rw_array(a), a from returns_rw_array(1) a;
+                 QUERY PLAN                 
+--------------------------------------------
+ Function Scan on public.returns_rw_array a
+   Output: consumes_rw_array(a), a
+   Function Call: returns_rw_array(1)
+(3 rows)
+
+select consumes_rw_array(a), a from returns_rw_array(1) a;
+ consumes_rw_array |   a   
+-------------------+-------
+                 1 | {1,1}
+(1 row)
+
+explain (verbose, costs off)
+select consumes_rw_array(a), a from
+  (values (returns_rw_array(1)), (returns_rw_array(2))) v(a);
+                             QUERY PLAN                              
+---------------------------------------------------------------------
+ Values Scan on "*VALUES*"
+   Output: consumes_rw_array("*VALUES*".column1), "*VALUES*".column1
+(2 rows)
+
+select consumes_rw_array(a), a from
+  (values (returns_rw_array(1)), (returns_rw_array(2))) v(a);
+ consumes_rw_array |   a   
+-------------------+-------
+                 1 | {1,1}
+                 2 | {2,2}
+(2 rows)
+
+--
+-- Test access to call stack
+--
 create function inner_func(int)
 returns int as $$
 declare _context text;
@@ -5541,3 +5611,42 @@
 $$;
 ERROR:  unhandled assertion
 CONTEXT:  PL/pgSQL function inline_code_block line 3 at ASSERT
+-- Test use of plpgsql in a domain check constraint (cf. bug #14414)
+create function plpgsql_domain_check(val int) returns boolean as $$
+begin return val > 0; end
+$$ language plpgsql immutable;
+create domain plpgsql_domain as integer check(plpgsql_domain_check(value));
+do $$
+declare v_test plpgsql_domain;
+begin
+  v_test := 1;
+end;
+$$;
+do $$
+declare v_test plpgsql_domain := 1;
+begin
+  v_test := 0;  -- fail
+end;
+$$;
+ERROR:  value for domain plpgsql_domain violates check constraint "plpgsql_domain_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 4 at assignment
+-- Test handling of expanded array passed to a domain constraint (bug #14472)
+create function plpgsql_arr_domain_check(val int[]) returns boolean as $$
+begin return val[1] > 0; end
+$$ language plpgsql immutable;
+create domain plpgsql_arr_domain as int[] check(plpgsql_arr_domain_check(value));
+do $$
+declare v_test plpgsql_arr_domain;
+begin
+  v_test := array[1];
+  v_test := v_test || 2;
+end;
+$$;
+do $$
+declare v_test plpgsql_arr_domain := array[1];
+begin
+  v_test := 0 || v_test;  -- fail
+end;
+$$;
+ERROR:  value for domain plpgsql_arr_domain violates check constraint "plpgsql_arr_domain_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 4 at assignment
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/prepared_xacts_1.out postgresql-9.5-9.5.8/src/test/regress/expected/prepared_xacts_1.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/prepared_xacts_1.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/prepared_xacts_1.out	2017-08-07 21:13:41.000000000 +0000
@@ -199,12 +199,7 @@
 
 -- pxtest3 should be locked because of the pending DROP
 begin;
-set statement_timeout to 2000;
-SELECT * FROM pxtest3;
- fff 
------
-(0 rows)
-
+lock table pxtest3 in access share mode nowait;
 rollback;
 -- Disconnect, we will continue testing in a different backend
 \c -
@@ -216,12 +211,7 @@
 
 -- pxtest3 should still be locked because of the pending DROP
 begin;
-set statement_timeout to 2000;
-SELECT * FROM pxtest3;
- fff 
------
-(0 rows)
-
+lock table pxtest3 in access share mode nowait;
 rollback;
 -- Commit table creation
 COMMIT PREPARED 'regress-one';
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/prepared_xacts.out postgresql-9.5-9.5.8/src/test/regress/expected/prepared_xacts.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/prepared_xacts.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/prepared_xacts.out	2017-08-07 21:13:41.000000000 +0000
@@ -195,9 +195,8 @@
 
 -- pxtest3 should be locked because of the pending DROP
 begin;
-set statement_timeout to 2000;
-SELECT * FROM pxtest3;
-ERROR:  canceling statement due to statement timeout
+lock table pxtest3 in access share mode nowait;
+ERROR:  could not obtain lock on relation "pxtest3"
 rollback;
 -- Disconnect, we will continue testing in a different backend
 \c -
@@ -211,9 +210,8 @@
 
 -- pxtest3 should still be locked because of the pending DROP
 begin;
-set statement_timeout to 2000;
-SELECT * FROM pxtest3;
-ERROR:  canceling statement due to statement timeout
+lock table pxtest3 in access share mode nowait;
+ERROR:  could not obtain lock on relation "pxtest3"
 rollback;
 -- Commit table creation
 COMMIT PREPARED 'regress-one';
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/privileges.out postgresql-9.5-9.5.8/src/test/regress/expected/privileges.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/privileges.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/privileges.out	2017-08-07 21:13:41.000000000 +0000
@@ -12,7 +12,7 @@
 DROP ROLE IF EXISTS regressuser4;
 DROP ROLE IF EXISTS regressuser5;
 DROP ROLE IF EXISTS regressuser6;
-SELECT lo_unlink(oid) FROM pg_largeobject_metadata;
+SELECT lo_unlink(oid) FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
  lo_unlink 
 -----------
 (0 rows)
@@ -184,6 +184,103 @@
  1 | two
 (2 rows)
 
+-- test leaky-function protections in selfuncs
+-- regressuser1 will own a table and provide a view for it.
+SET SESSION AUTHORIZATION regressuser1;
+CREATE TABLE atest12 as
+  SELECT x AS a, 10001 - x AS b FROM generate_series(1,10000) x;
+CREATE INDEX ON atest12 (a);
+CREATE INDEX ON atest12 (abs(a));
+VACUUM ANALYZE atest12;
+CREATE FUNCTION leak(integer,integer) RETURNS boolean
+  AS $$begin return $1 < $2; end$$
+  LANGUAGE plpgsql immutable;
+CREATE OPERATOR <<< (procedure = leak, leftarg = integer, rightarg = integer,
+                     restrict = scalarltsel);
+-- view with leaky operator
+CREATE VIEW atest12v AS
+  SELECT * FROM atest12 WHERE b <<< 5;
+GRANT SELECT ON atest12v TO PUBLIC;
+-- This plan should use nestloop, knowing that few rows will be selected.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12v x, atest12v y WHERE x.a = y.b;
+                   QUERY PLAN                    
+-------------------------------------------------
+ Nested Loop
+   ->  Seq Scan on atest12 atest12_1
+         Filter: (b <<< 5)
+   ->  Index Scan using atest12_a_idx on atest12
+         Index Cond: (a = atest12_1.b)
+         Filter: (b <<< 5)
+(6 rows)
+
+-- And this one.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12 x, atest12 y
+  WHERE x.a = y.b and abs(y.a) <<< 5;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Nested Loop
+   ->  Seq Scan on atest12 y
+         Filter: (abs(a) <<< 5)
+   ->  Index Scan using atest12_a_idx on atest12 x
+         Index Cond: (a = y.b)
+(5 rows)
+
+-- Check if regressuser2 can break security.
+SET SESSION AUTHORIZATION regressuser2;
+CREATE FUNCTION leak2(integer,integer) RETURNS boolean
+  AS $$begin raise notice 'leak % %', $1, $2; return $1 > $2; end$$
+  LANGUAGE plpgsql immutable;
+CREATE OPERATOR >>> (procedure = leak2, leftarg = integer, rightarg = integer,
+                     restrict = scalargtsel);
+-- This should not show any "leak" notices before failing.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12 WHERE a >>> 0;
+ERROR:  permission denied for relation atest12
+-- This plan should use hashjoin, as it will expect many rows to be selected.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12v x, atest12v y WHERE x.a = y.b;
+                QUERY PLAN                 
+-------------------------------------------
+ Hash Join
+   Hash Cond: (atest12.a = atest12_1.b)
+   ->  Seq Scan on atest12
+         Filter: (b <<< 5)
+   ->  Hash
+         ->  Seq Scan on atest12 atest12_1
+               Filter: (b <<< 5)
+(7 rows)
+
+-- Now regressuser1 grants sufficient access to regressuser2.
+SET SESSION AUTHORIZATION regressuser1;
+GRANT SELECT (a, b) ON atest12 TO PUBLIC;
+SET SESSION AUTHORIZATION regressuser2;
+-- Now regressuser2 will also get a good row estimate.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12v x, atest12v y WHERE x.a = y.b;
+                   QUERY PLAN                    
+-------------------------------------------------
+ Nested Loop
+   ->  Seq Scan on atest12 atest12_1
+         Filter: (b <<< 5)
+   ->  Index Scan using atest12_a_idx on atest12
+         Index Cond: (a = atest12_1.b)
+         Filter: (b <<< 5)
+(6 rows)
+
+-- But not for this, due to lack of table-wide permissions needed
+-- to make use of the expression index's statistics.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12 x, atest12 y
+  WHERE x.a = y.b and abs(y.a) <<< 5;
+              QUERY PLAN              
+--------------------------------------
+ Hash Join
+   Hash Cond: (x.a = y.b)
+   ->  Seq Scan on atest12 x
+   ->  Hash
+         ->  Seq Scan on atest12 y
+               Filter: (abs(a) <<< 5)
+(6 rows)
+
+-- clean up (regressuser1's objects are all dropped later)
+DROP FUNCTION leak2(integer, integer) CASCADE;
+NOTICE:  drop cascades to operator >>>(integer,integer)
 -- groups
 SET SESSION AUTHORIZATION regressuser3;
 CREATE TABLE atest3 (one int, two int, three int);
@@ -1123,6 +1220,14 @@
       2002
 (1 row)
 
+SELECT loread(lo_open(1001, x'20000'::int), 32);	-- allowed, for now
+ loread 
+--------
+ \x
+(1 row)
+
+SELECT lowrite(lo_open(1001, x'40000'::int), 'abcd');	-- fail, wrong mode
+ERROR:  large object descriptor 0 was not opened for writing
 SELECT loread(lo_open(1001, x'40000'::int), 32);
  loread 
 --------
@@ -1174,11 +1279,11 @@
 
 \c -
 -- confirm ACL setting
-SELECT oid, pg_get_userbyid(lomowner) ownername, lomacl FROM pg_largeobject_metadata;
+SELECT oid, pg_get_userbyid(lomowner) ownername, lomacl FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
  oid  |  ownername   |                                          lomacl                                          
 ------+--------------+------------------------------------------------------------------------------------------
- 1002 | regressuser1 | 
  1001 | regressuser1 | {regressuser1=rw/regressuser1,=rw/regressuser1}
+ 1002 | regressuser1 | 
  1003 | regressuser1 | {regressuser1=rw/regressuser1,regressuser2=r/regressuser1}
  1004 | regressuser1 | {regressuser1=rw/regressuser1,regressuser2=rw/regressuser1}
  1005 | regressuser1 | {regressuser1=rw/regressuser1,regressuser2=r*w/regressuser1,regressuser3=r/regressuser2}
@@ -1218,6 +1323,8 @@
 ERROR:  permission denied for large object 1002
 SELECT lo_truncate(lo_open(1002, x'20000'::int), 10);	-- to be denied
 ERROR:  permission denied for large object 1002
+SELECT lo_put(1002, 1, 'abcd');				-- to be denied
+ERROR:  permission denied for large object 1002
 SELECT lo_unlink(1002);					-- to be denied
 ERROR:  must be owner of large object 1002
 SELECT lo_export(1001, '/dev/null');			-- to be denied
@@ -1547,7 +1654,7 @@
 DROP TABLE atestc;
 DROP TABLE atestp1;
 DROP TABLE atestp2;
-SELECT lo_unlink(oid) FROM pg_largeobject_metadata;
+SELECT lo_unlink(oid) FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
  lo_unlink 
 -----------
          1
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/replica_identity.out postgresql-9.5-9.5.8/src/test/regress/expected/replica_identity.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/replica_identity.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/replica_identity.out	2017-08-07 21:13:41.000000000 +0000
@@ -5,10 +5,11 @@
        nonkey text,
        CONSTRAINT test_replica_identity_unique_defer UNIQUE (keya, keyb) DEFERRABLE,
        CONSTRAINT test_replica_identity_unique_nondefer UNIQUE (keya, keyb)
-);
+) WITH OIDS;
 CREATE TABLE test_replica_identity_othertable (id serial primary key);
 CREATE INDEX test_replica_identity_keyab ON test_replica_identity (keya, keyb);
 CREATE UNIQUE INDEX test_replica_identity_keyab_key ON test_replica_identity (keya, keyb);
+CREATE UNIQUE INDEX test_replica_identity_oid_idx ON test_replica_identity (oid);
 CREATE UNIQUE INDEX test_replica_identity_nonkey ON test_replica_identity (keya, nonkey);
 CREATE INDEX test_replica_identity_hash ON test_replica_identity USING hash (nonkey);
 WARNING:  hash indexes are not WAL-logged and their use is discouraged
@@ -88,13 +89,16 @@
     "test_replica_identity_expr" UNIQUE, btree (keya, keyb, (3))
     "test_replica_identity_keyab_key" UNIQUE, btree (keya, keyb)
     "test_replica_identity_nonkey" UNIQUE, btree (keya, nonkey)
+    "test_replica_identity_oid_idx" UNIQUE, btree (oid)
     "test_replica_identity_partial" UNIQUE, btree (keya, keyb) WHERE keyb <> '3'::text
     "test_replica_identity_unique_defer" UNIQUE CONSTRAINT, btree (keya, keyb) DEFERRABLE
     "test_replica_identity_unique_nondefer" UNIQUE CONSTRAINT, btree (keya, keyb)
     "test_replica_identity_hash" hash (nonkey)
     "test_replica_identity_keyab" btree (keya, keyb)
 
--- succeed, nondeferrable unique constraint over nonullable cols
+-- succeed, oid unique index
+ALTER TABLE test_replica_identity REPLICA IDENTITY USING INDEX test_replica_identity_oid_idx;
+-- succeed, nondeferrable unique constraint over nonnullable cols
 ALTER TABLE test_replica_identity REPLICA IDENTITY USING INDEX test_replica_identity_unique_nondefer;
 -- succeed unique index over nonnullable cols
 ALTER TABLE test_replica_identity REPLICA IDENTITY USING INDEX test_replica_identity_keyab_key;
@@ -118,6 +122,7 @@
     "test_replica_identity_expr" UNIQUE, btree (keya, keyb, (3))
     "test_replica_identity_keyab_key" UNIQUE, btree (keya, keyb) REPLICA IDENTITY
     "test_replica_identity_nonkey" UNIQUE, btree (keya, nonkey)
+    "test_replica_identity_oid_idx" UNIQUE, btree (oid)
     "test_replica_identity_partial" UNIQUE, btree (keya, keyb) WHERE keyb <> '3'::text
     "test_replica_identity_unique_defer" UNIQUE CONSTRAINT, btree (keya, keyb) DEFERRABLE
     "test_replica_identity_unique_nondefer" UNIQUE CONSTRAINT, btree (keya, keyb)
@@ -166,12 +171,14 @@
     "test_replica_identity_expr" UNIQUE, btree (keya, keyb, (3))
     "test_replica_identity_keyab_key" UNIQUE, btree (keya, keyb)
     "test_replica_identity_nonkey" UNIQUE, btree (keya, nonkey)
+    "test_replica_identity_oid_idx" UNIQUE, btree (oid)
     "test_replica_identity_partial" UNIQUE, btree (keya, keyb) WHERE keyb <> '3'::text
     "test_replica_identity_unique_defer" UNIQUE CONSTRAINT, btree (keya, keyb) DEFERRABLE
     "test_replica_identity_unique_nondefer" UNIQUE CONSTRAINT, btree (keya, keyb)
     "test_replica_identity_hash" hash (nonkey)
     "test_replica_identity_keyab" btree (keya, keyb)
 Replica Identity: FULL
+Has OIDs: yes
 
 ALTER TABLE test_replica_identity REPLICA IDENTITY NOTHING;
 SELECT relreplident FROM pg_class WHERE oid = 'test_replica_identity'::regclass;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/rolenames.out postgresql-9.5-9.5.8/src/test/regress/expected/rolenames.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/rolenames.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/rolenames.out	2017-08-07 21:13:41.000000000 +0000
@@ -298,9 +298,9 @@
 LINE 1: ALTER USER CURRENT_ROLE WITH LOGIN;
                    ^
 ALTER USER ALL WITH REPLICATION; -- error
-ERROR:  syntax error at or near "ALL"
+ERROR:  syntax error at or near "WITH"
 LINE 1: ALTER USER ALL WITH REPLICATION;
-                   ^
+                       ^
 ALTER USER SESSION_ROLE WITH NOREPLICATION; -- error
 ERROR:  role "session_role" does not exist
 ALTER USER PUBLIC WITH NOREPLICATION; -- error
@@ -380,9 +380,6 @@
 ALTER USER "current_user" SET application_name to 'FOOFOO';
 ALTER USER "Public" SET application_name to 'BARBAR';
 ALTER USER ALL SET application_name to 'SLAP';
-ERROR:  syntax error at or near "ALL"
-LINE 1: ALTER USER ALL SET application_name to 'SLAP';
-                   ^
 SELECT * FROM chksetconfig();
  db  |     role     |  rolkeyword  |         setconfig         
 -----+--------------+--------------+---------------------------
@@ -407,9 +404,6 @@
 ALTER USER "current_user" RESET application_name;
 ALTER USER "Public" RESET application_name;
 ALTER USER ALL RESET application_name;
-ERROR:  syntax error at or near "ALL"
-LINE 1: ALTER USER ALL RESET application_name;
-                   ^
 SELECT * FROM chksetconfig();
  db | role | rolkeyword | setconfig 
 ----+------+------------+-----------
@@ -428,7 +422,7 @@
                    ^
 ALTER USER nonexistent SET application_name to 'BOMB'; -- error
 ERROR:  role "nonexistent" does not exist
--- CREAETE SCHEMA
+-- CREATE SCHEMA
 set client_min_messages to error;
 CREATE SCHEMA newschema1 AUTHORIZATION CURRENT_USER;
 CREATE SCHEMA newschema2 AUTHORIZATION "current_user";
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/rowsecurity.out postgresql-9.5-9.5.8/src/test/regress/expected/rowsecurity.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/rowsecurity.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/rowsecurity.out	2017-08-07 21:13:41.000000000 +0000
@@ -488,7 +488,7 @@
  a |  b  
 ---+-----
  2 | bbb
- 4 | ddd
+ 4 | dad
  2 | bcd
  4 | def
  2 | yyy
@@ -508,14 +508,14 @@
 
 SELECT * FROM t1 WHERE f_leak(b);
 NOTICE:  f_leak => bbb
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
 NOTICE:  f_leak => bcd
 NOTICE:  f_leak => def
 NOTICE:  f_leak => yyy
  a |  b  
 ---+-----
  2 | bbb
- 4 | ddd
+ 4 | dad
  2 | bcd
  4 | def
  2 | yyy
@@ -540,7 +540,7 @@
  oid | a |  b  
 -----+---+-----
  102 | 2 | bbb
- 104 | 4 | ddd
+ 104 | 4 | dad
  202 | 2 | bcd
  204 | 4 | def
  302 | 2 | yyy
@@ -563,7 +563,7 @@
  a |  b  |   t1    
 ---+-----+---------
  2 | bbb | (2,bbb)
- 4 | ddd | (4,ddd)
+ 4 | dad | (4,dad)
  2 | bcd | (2,bcd)
  4 | def | (4,def)
  2 | yyy | (2,yyy)
@@ -586,7 +586,7 @@
  a |  b  
 ---+-----
  2 | bbb
- 4 | ddd
+ 4 | dad
  2 | bcd
  4 | def
  2 | yyy
@@ -610,14 +610,14 @@
 
 SELECT * FROM t1 WHERE f_leak(b) FOR SHARE;
 NOTICE:  f_leak => bbb
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
 NOTICE:  f_leak => bcd
 NOTICE:  f_leak => def
 NOTICE:  f_leak => yyy
  a |  b  
 ---+-----
  2 | bbb
- 4 | ddd
+ 4 | dad
  2 | bcd
  4 | def
  2 | yyy
@@ -664,10 +664,10 @@
 RESET SESSION AUTHORIZATION;
 SET row_security TO OFF;
 SELECT * FROM t1 WHERE f_leak(b);
-NOTICE:  f_leak => aaa
+NOTICE:  f_leak => aba
 NOTICE:  f_leak => bbb
 NOTICE:  f_leak => ccc
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
 NOTICE:  f_leak => abc
 NOTICE:  f_leak => bcd
 NOTICE:  f_leak => cde
@@ -677,10 +677,10 @@
 NOTICE:  f_leak => zzz
  a |  b  
 ---+-----
- 1 | aaa
+ 1 | aba
  2 | bbb
  3 | ccc
- 4 | ddd
+ 4 | dad
  1 | abc
  2 | bcd
  3 | cde
@@ -706,10 +706,10 @@
 SET SESSION AUTHORIZATION rls_regress_exempt_user;
 SET row_security TO OFF;
 SELECT * FROM t1 WHERE f_leak(b);
-NOTICE:  f_leak => aaa
+NOTICE:  f_leak => aba
 NOTICE:  f_leak => bbb
 NOTICE:  f_leak => ccc
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
 NOTICE:  f_leak => abc
 NOTICE:  f_leak => bcd
 NOTICE:  f_leak => cde
@@ -719,10 +719,10 @@
 NOTICE:  f_leak => zzz
  a |  b  
 ---+-----
- 1 | aaa
+ 1 | aba
  2 | bbb
  3 | ccc
- 4 | ddd
+ 4 | dad
  1 | abc
  2 | bcd
  3 | cde
@@ -952,10 +952,10 @@
 RESET SESSION AUTHORIZATION;
 SET row_security TO OFF;
 SELECT * FROM t1 WHERE f_leak(b);
-NOTICE:  f_leak => aaa
+NOTICE:  f_leak => aba
 NOTICE:  f_leak => bbb
 NOTICE:  f_leak => ccc
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
 NOTICE:  f_leak => abc
 NOTICE:  f_leak => bcd
 NOTICE:  f_leak => cde
@@ -965,10 +965,10 @@
 NOTICE:  f_leak => zzz
  a |  b  
 ---+-----
- 1 | aaa
+ 1 | aba
  2 | bbb
  3 | ccc
- 4 | ddd
+ 4 | dad
  1 | abc
  2 | bcd
  3 | cde
@@ -994,7 +994,7 @@
 EXECUTE p1(2);
  a |  b  
 ---+-----
- 1 | aaa
+ 1 | aba
  2 | bbb
  1 | abc
  2 | bcd
@@ -1088,7 +1088,7 @@
 
 UPDATE t1 SET b = b || b WHERE f_leak(b);
 NOTICE:  f_leak => bbb
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
 NOTICE:  f_leak => bcd
 NOTICE:  f_leak => def
 NOTICE:  f_leak => yyy
@@ -1105,27 +1105,27 @@
 
 UPDATE only t1 SET b = b || '_updt' WHERE f_leak(b);
 NOTICE:  f_leak => bbbbbb
-NOTICE:  f_leak => dddddd
+NOTICE:  f_leak => daddad
 -- returning clause with system column
 UPDATE only t1 SET b = b WHERE f_leak(b) RETURNING oid, *, t1;
 NOTICE:  f_leak => bbbbbb_updt
-NOTICE:  f_leak => dddddd_updt
+NOTICE:  f_leak => daddad_updt
  oid | a |      b      |       t1        
 -----+---+-------------+-----------------
  102 | 2 | bbbbbb_updt | (2,bbbbbb_updt)
- 104 | 4 | dddddd_updt | (4,dddddd_updt)
+ 104 | 4 | daddad_updt | (4,daddad_updt)
 (2 rows)
 
 UPDATE t1 SET b = b WHERE f_leak(b) RETURNING *;
 NOTICE:  f_leak => bbbbbb_updt
-NOTICE:  f_leak => dddddd_updt
+NOTICE:  f_leak => daddad_updt
 NOTICE:  f_leak => bcdbcd
 NOTICE:  f_leak => defdef
 NOTICE:  f_leak => yyyyyy
  a |      b      
 ---+-------------
  2 | bbbbbb_updt
- 4 | dddddd_updt
+ 4 | daddad_updt
  2 | bcdbcd
  4 | defdef
  2 | yyyyyy
@@ -1133,14 +1133,14 @@
 
 UPDATE t1 SET b = b WHERE f_leak(b) RETURNING oid, *, t1;
 NOTICE:  f_leak => bbbbbb_updt
-NOTICE:  f_leak => dddddd_updt
+NOTICE:  f_leak => daddad_updt
 NOTICE:  f_leak => bcdbcd
 NOTICE:  f_leak => defdef
 NOTICE:  f_leak => yyyyyy
  oid | a |      b      |       t1        
 -----+---+-------------+-----------------
  102 | 2 | bbbbbb_updt | (2,bbbbbb_updt)
- 104 | 4 | dddddd_updt | (4,dddddd_updt)
+ 104 | 4 | daddad_updt | (4,daddad_updt)
  202 | 2 | bcdbcd      | (2,bcdbcd)
  204 | 4 | defdef      | (4,defdef)
  302 | 2 | yyyyyy      | (2,yyyyyy)
@@ -1328,15 +1328,15 @@
 UPDATE t1 t1_1 SET b = t1_2.b FROM t1 t1_2
 WHERE t1_1.a = 4 AND t1_2.a = t1_1.a AND t1_2.b = t1_1.b
 AND f_leak(t1_1.b) AND f_leak(t1_2.b) RETURNING *, t1_1, t1_2;
-NOTICE:  f_leak => dddddd_updt
-NOTICE:  f_leak => dddddd_updt
+NOTICE:  f_leak => daddad_updt
+NOTICE:  f_leak => daddad_updt
 NOTICE:  f_leak => defdef
 NOTICE:  f_leak => defdef
-NOTICE:  f_leak => dddddd_updt
+NOTICE:  f_leak => daddad_updt
 NOTICE:  f_leak => defdef
  a |      b      | a |      b      |      t1_1       |      t1_2       
 ---+-------------+---+-------------+-----------------+-----------------
- 4 | dddddd_updt | 4 | dddddd_updt | (4,dddddd_updt) | (4,dddddd_updt)
+ 4 | daddad_updt | 4 | daddad_updt | (4,daddad_updt) | (4,daddad_updt)
  4 | defdef      | 4 | defdef      | (4,defdef)      | (4,defdef)
 (2 rows)
 
@@ -1345,7 +1345,7 @@
 SELECT * FROM t1 ORDER BY a,b;
  a |      b      
 ---+-------------
- 1 | aaa
+ 1 | aba
  1 | abc
  1 | xxx
  2 | bbbbbb_updt
@@ -1354,7 +1354,7 @@
  3 | ccc
  3 | cde
  3 | zzz
- 4 | dddddd_updt
+ 4 | daddad_updt
  4 | defdef
 (11 rows)
 
@@ -1397,11 +1397,11 @@
 
 DELETE FROM only t1 WHERE f_leak(b) RETURNING oid, *, t1;
 NOTICE:  f_leak => bbbbbb_updt
-NOTICE:  f_leak => dddddd_updt
+NOTICE:  f_leak => daddad_updt
  oid | a |      b      |       t1        
 -----+---+-------------+-----------------
  102 | 2 | bbbbbb_updt | (2,bbbbbb_updt)
- 104 | 4 | dddddd_updt | (4,dddddd_updt)
+ 104 | 4 | daddad_updt | (4,daddad_updt)
 (2 rows)
 
 DELETE FROM t1 WHERE f_leak(b) RETURNING oid, *, t1;
@@ -1653,21 +1653,21 @@
 GRANT SELECT ON z1,z2 TO rls_regress_group1, rls_regress_group2,
     rls_regress_user1, rls_regress_user2;
 INSERT INTO z1 VALUES
-    (1, 'aaa'),
+    (1, 'aba'),
     (2, 'bbb'),
     (3, 'ccc'),
-    (4, 'ddd');
+    (4, 'dad');
 CREATE POLICY p1 ON z1 TO rls_regress_group1 USING (a % 2 = 0);
 CREATE POLICY p2 ON z1 TO rls_regress_group2 USING (a % 2 = 1);
 ALTER TABLE z1 ENABLE ROW LEVEL SECURITY;
 SET SESSION AUTHORIZATION rls_regress_user1;
 SELECT * FROM z1 WHERE f_leak(b);
 NOTICE:  f_leak => bbb
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
  a |  b  
 ---+-----
  2 | bbb
- 4 | ddd
+ 4 | dad
 (2 rows)
 
 EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
@@ -1722,11 +1722,11 @@
 SET ROLE rls_regress_group1;
 SELECT * FROM z1 WHERE f_leak(b);
 NOTICE:  f_leak => bbb
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
  a |  b  
 ---+-----
  2 | bbb
- 4 | ddd
+ 4 | dad
 (2 rows)
 
 EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
@@ -1777,11 +1777,11 @@
 
 SET SESSION AUTHORIZATION rls_regress_user2;
 SELECT * FROM z1 WHERE f_leak(b);
-NOTICE:  f_leak => aaa
+NOTICE:  f_leak => aba
 NOTICE:  f_leak => ccc
  a |  b  
 ---+-----
- 1 | aaa
+ 1 | aba
  3 | ccc
 (2 rows)
 
@@ -1833,11 +1833,11 @@
 
 SET ROLE rls_regress_group2;
 SELECT * FROM z1 WHERE f_leak(b);
-NOTICE:  f_leak => aaa
+NOTICE:  f_leak => aba
 NOTICE:  f_leak => ccc
  a |  b  
 ---+-----
- 1 | aaa
+ 1 | aba
  3 | ccc
 (2 rows)
 
@@ -1897,16 +1897,16 @@
 -- Query as role that is not owner of view or table.  Should return all records.
 SET SESSION AUTHORIZATION rls_regress_user1;
 SELECT * FROM rls_view;
-NOTICE:  f_leak => aaa
+NOTICE:  f_leak => aba
 NOTICE:  f_leak => bbb
 NOTICE:  f_leak => ccc
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
  a |  b  
 ---+-----
- 1 | aaa
+ 1 | aba
  2 | bbb
  3 | ccc
- 4 | ddd
+ 4 | dad
 (4 rows)
 
 EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
@@ -1919,16 +1919,16 @@
 -- Query as view/table owner.  Should return all records.
 SET SESSION AUTHORIZATION rls_regress_user0;
 SELECT * FROM rls_view;
-NOTICE:  f_leak => aaa
+NOTICE:  f_leak => aba
 NOTICE:  f_leak => bbb
 NOTICE:  f_leak => ccc
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
  a |  b  
 ---+-----
- 1 | aaa
+ 1 | aba
  2 | bbb
  3 | ccc
- 4 | ddd
+ 4 | dad
 (4 rows)
 
 EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
@@ -1948,11 +1948,11 @@
 SET SESSION AUTHORIZATION rls_regress_user0;
 SELECT * FROM rls_view;
 NOTICE:  f_leak => bbb
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
  a |  b  
 ---+-----
  2 | bbb
- 4 | ddd
+ 4 | dad
 (2 rows)
 
 EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
@@ -1969,11 +1969,11 @@
 SET SESSION AUTHORIZATION rls_regress_user1;
 SELECT * FROM rls_view;
 NOTICE:  f_leak => bbb
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
  a |  b  
 ---+-----
  2 | bbb
- 4 | ddd
+ 4 | dad
 (2 rows)
 
 EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
@@ -1996,11 +1996,11 @@
 GRANT SELECT ON rls_view TO rls_regress_user2;
 SELECT * FROM rls_view;
 NOTICE:  f_leak => bbb
-NOTICE:  f_leak => ddd
+NOTICE:  f_leak => dad
  a |  b  
 ---+-----
  2 | bbb
- 4 | ddd
+ 4 | dad
 (2 rows)
 
 EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/rowtypes.out postgresql-9.5-9.5.8/src/test/regress/expected/rowtypes.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/rowtypes.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/rowtypes.out	2017-08-07 21:13:41.000000000 +0000
@@ -657,3 +657,57 @@
  {"q2":0,"q1":0}
 (3 rows)
 
+--
+-- IS [NOT] NULL should not recurse into nested composites (bug #14235)
+--
+explain (verbose, costs off)
+select r, r is null as isnull, r is not null as isnotnull
+from (values (1,row(1,2)), (1,row(null,null)), (1,null),
+             (null,row(1,2)), (null,row(null,null)), (null,null) ) r(a,b);
+                                                                                                         QUERY PLAN                                                                                                          
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Values Scan on "*VALUES*"
+   Output: ROW("*VALUES*".column1, "*VALUES*".column2), (("*VALUES*".column1 IS NULL) AND ("*VALUES*".column2 IS NOT DISTINCT FROM NULL)), (("*VALUES*".column1 IS NOT NULL) AND ("*VALUES*".column2 IS DISTINCT FROM NULL))
+(2 rows)
+
+select r, r is null as isnull, r is not null as isnotnull
+from (values (1,row(1,2)), (1,row(null,null)), (1,null),
+             (null,row(1,2)), (null,row(null,null)), (null,null) ) r(a,b);
+      r      | isnull | isnotnull 
+-------------+--------+-----------
+ (1,"(1,2)") | f      | t
+ (1,"(,)")   | f      | t
+ (1,)        | f      | f
+ (,"(1,2)")  | f      | f
+ (,"(,)")    | f      | f
+ (,)         | t      | f
+(6 rows)
+
+explain (verbose, costs off)
+with r(a,b) as
+  (values (1,row(1,2)), (1,row(null,null)), (1,null),
+          (null,row(1,2)), (null,row(null,null)), (null,null) )
+select r, r is null as isnull, r is not null as isnotnull from r;
+                        QUERY PLAN                        
+----------------------------------------------------------
+ CTE Scan on r
+   Output: r.*, (r.* IS NULL), (r.* IS NOT NULL)
+   CTE r
+     ->  Values Scan on "*VALUES*"
+           Output: "*VALUES*".column1, "*VALUES*".column2
+(5 rows)
+
+with r(a,b) as
+  (values (1,row(1,2)), (1,row(null,null)), (1,null),
+          (null,row(1,2)), (null,row(null,null)), (null,null) )
+select r, r is null as isnull, r is not null as isnotnull from r;
+      r      | isnull | isnotnull 
+-------------+--------+-----------
+ (1,"(1,2)") | f      | t
+ (1,"(,)")   | f      | t
+ (1,)        | f      | f
+ (,"(1,2)")  | f      | f
+ (,"(,)")    | f      | f
+ (,)         | t      | f
+(6 rows)
+
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/rules.out postgresql-9.5-9.5.8/src/test/regress/expected/rules.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/rules.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/rules.out	2017-08-07 21:13:41.000000000 +0000
@@ -938,7 +938,7 @@
 	shoename   char(10),      -- primary key
 	sh_avail   integer,       -- available # of pairs
 	slcolor    char(10),      -- preferred shoelace color
-	slminlen   float,         -- miminum shoelace length
+	slminlen   float,         -- minimum shoelace length
 	slmaxlen   float,         -- maximum shoelace length
 	slunit     char(8)        -- length unit
 );
@@ -2102,7 +2102,9 @@
             ELSE a.rolname
         END AS usename,
         CASE
-            WHEN (pg_has_role(s.srvowner, 'USAGE'::text) OR has_server_privilege(s.oid, 'USAGE'::text)) THEN u.umoptions
+            WHEN (((u.umuser <> (0)::oid) AND (a.rolname = "current_user"()) AND (pg_has_role(s.srvowner, 'USAGE'::text) OR has_server_privilege(s.oid, 'USAGE'::text))) OR ((u.umuser = (0)::oid) AND pg_has_role(s.srvowner, 'USAGE'::text)) OR ( SELECT pg_authid.rolsuper
+               FROM pg_authid
+              WHERE (pg_authid.rolname = "current_user"()))) THEN u.umoptions
             ELSE NULL::text[]
         END AS umoptions
    FROM ((pg_user_mapping u
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/sanity_check.out postgresql-9.5-9.5.8/src/test/regress/expected/sanity_check.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/sanity_check.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/sanity_check.out	2017-08-07 21:13:41.000000000 +0000
@@ -62,6 +62,8 @@
 int4_tbl|f
 int8_tbl|f
 interval_tbl|f
+invalid_check_con|f
+invalid_check_con_child|f
 iportaltest|f
 kd_point_tbl|t
 line_tbl|f
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/select_into.out postgresql-9.5-9.5.8/src/test/regress/expected/select_into.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/select_into.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/select_into.out	2017-08-07 21:13:41.000000000 +0000
@@ -50,6 +50,44 @@
 drop cascades to table selinto_schema.tmp2
 drop cascades to table selinto_schema.tmp3
 DROP USER selinto_user;
+-- Tests for WITH NO DATA and column name consistency
+CREATE TABLE ctas_base (i int, j int);
+INSERT INTO ctas_base VALUES (1, 2);
+CREATE TABLE ctas_nodata (ii, jj, kk) AS SELECT i, j FROM ctas_base; -- Error
+ERROR:  too many column names were specified
+CREATE TABLE ctas_nodata (ii, jj, kk) AS SELECT i, j FROM ctas_base WITH NO DATA; -- Error
+ERROR:  too many column names were specified
+CREATE TABLE ctas_nodata (ii, jj) AS SELECT i, j FROM ctas_base; -- OK
+CREATE TABLE ctas_nodata_2 (ii, jj) AS SELECT i, j FROM ctas_base WITH NO DATA; -- OK
+CREATE TABLE ctas_nodata_3 (ii) AS SELECT i, j FROM ctas_base; -- OK
+CREATE TABLE ctas_nodata_4 (ii) AS SELECT i, j FROM ctas_base WITH NO DATA; -- OK
+SELECT * FROM ctas_nodata;
+ ii | jj 
+----+----
+  1 |  2
+(1 row)
+
+SELECT * FROM ctas_nodata_2;
+ ii | jj 
+----+----
+(0 rows)
+
+SELECT * FROM ctas_nodata_3;
+ ii | j 
+----+---
+  1 | 2
+(1 row)
+
+SELECT * FROM ctas_nodata_4;
+ ii | j 
+----+---
+(0 rows)
+
+DROP TABLE ctas_base;
+DROP TABLE ctas_nodata;
+DROP TABLE ctas_nodata_2;
+DROP TABLE ctas_nodata_3;
+DROP TABLE ctas_nodata_4;
 --
 -- CREATE TABLE AS/SELECT INTO as last command in a SQL function
 -- have been known to cause problems
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/timestamptz.out postgresql-9.5-9.5.8/src/test/regress/expected/timestamptz.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/timestamptz.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/timestamptz.out	2017-08-07 21:13:41.000000000 +0000
@@ -1749,24 +1749,24 @@
 --Cleanup
 DROP TABLE TIMESTAMPTZ_TST;
 -- test timestamptz constructors
-set TimeZone to 'America/Santiago';
+set TimeZone to 'America/New_York';
 -- numeric timezone
 SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33);
         make_timestamptz         
 ---------------------------------
- Sun Jul 15 08:15:55.33 1973 CLT
+ Sun Jul 15 08:15:55.33 1973 EDT
 (1 row)
 
 SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33, '+2');
         make_timestamptz         
 ---------------------------------
- Sun Jul 15 02:15:55.33 1973 CLT
+ Sun Jul 15 02:15:55.33 1973 EDT
 (1 row)
 
 SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33, '-2');
         make_timestamptz         
 ---------------------------------
- Sun Jul 15 06:15:55.33 1973 CLT
+ Sun Jul 15 06:15:55.33 1973 EDT
 (1 row)
 
 WITH tzs (tz) AS (VALUES
@@ -1775,23 +1775,23 @@
     ('+10:00:1'), ('+10:00:01'),
     ('+10:00:10'))
      SELECT make_timestamptz(2010, 2, 27, 3, 45, 00, tz), tz FROM tzs;
-       make_timestamptz        |    tz     
--------------------------------+-----------
- Fri Feb 26 23:45:00 2010 CLST | +1
- Fri Feb 26 23:45:00 2010 CLST | +1:
- Fri Feb 26 23:45:00 2010 CLST | +1:0
- Fri Feb 26 23:45:00 2010 CLST | +100
- Fri Feb 26 23:45:00 2010 CLST | +1:00
- Fri Feb 26 23:45:00 2010 CLST | +01:00
- Fri Feb 26 14:45:00 2010 CLST | +10
- Fri Feb 26 14:45:00 2010 CLST | +1000
- Fri Feb 26 14:45:00 2010 CLST | +10:
- Fri Feb 26 14:45:00 2010 CLST | +10:0
- Fri Feb 26 14:45:00 2010 CLST | +10:00
- Fri Feb 26 14:45:00 2010 CLST | +10:00:
- Fri Feb 26 14:44:59 2010 CLST | +10:00:1
- Fri Feb 26 14:44:59 2010 CLST | +10:00:01
- Fri Feb 26 14:44:50 2010 CLST | +10:00:10
+       make_timestamptz       |    tz     
+------------------------------+-----------
+ Fri Feb 26 21:45:00 2010 EST | +1
+ Fri Feb 26 21:45:00 2010 EST | +1:
+ Fri Feb 26 21:45:00 2010 EST | +1:0
+ Fri Feb 26 21:45:00 2010 EST | +100
+ Fri Feb 26 21:45:00 2010 EST | +1:00
+ Fri Feb 26 21:45:00 2010 EST | +01:00
+ Fri Feb 26 12:45:00 2010 EST | +10
+ Fri Feb 26 12:45:00 2010 EST | +1000
+ Fri Feb 26 12:45:00 2010 EST | +10:
+ Fri Feb 26 12:45:00 2010 EST | +10:0
+ Fri Feb 26 12:45:00 2010 EST | +10:00
+ Fri Feb 26 12:45:00 2010 EST | +10:00:
+ Fri Feb 26 12:44:59 2010 EST | +10:00:1
+ Fri Feb 26 12:44:59 2010 EST | +10:00:01
+ Fri Feb 26 12:44:50 2010 EST | +10:00:10
 (15 rows)
 
 -- these should fail
@@ -1837,30 +1837,29 @@
 SELECT make_timestamptz(1910, 12, 24, 0, 0, 0, 'Nehwon/Lankhmar');
 ERROR:  time zone "Nehwon/Lankhmar" not recognized
 -- abbreviations
-SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLST');
-       make_timestamptz        
--------------------------------
- Wed Dec 10 10:10:10 2008 CLST
+SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EST');
+       make_timestamptz       
+------------------------------
+ Wed Dec 10 10:10:10 2008 EST
 (1 row)
 
-SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLT');
-       make_timestamptz        
--------------------------------
- Wed Dec 10 11:10:10 2008 CLST
+SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EDT');
+       make_timestamptz       
+------------------------------
+ Wed Dec 10 09:10:10 2008 EST
 (1 row)
 
 SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
-       make_timestamptz        
--------------------------------
- Wed Dec 10 15:10:10 2014 CLST
+       make_timestamptz       
+------------------------------
+ Wed Dec 10 13:10:10 2014 EST
 (1 row)
 
 RESET TimeZone;
 --
 -- Test behavior with a dynamic (time-varying) timezone abbreviation.
 -- These tests rely on the knowledge that MSK (Europe/Moscow standard time)
--- moved forwards in Mar 2011 and that VET (America/Caracas standard time)
--- moved backwards in Dec 2007.
+-- moved forwards in Mar 2011 and backwards again in Oct 2014.
 --
 SET TimeZone to 'UTC';
 SELECT '2011-03-27 00:00:00 Europe/Moscow'::timestamptz;
@@ -1971,100 +1970,64 @@
  Sun Mar 27 00:00:00 2011 UTC
 (1 row)
 
-SELECT '2007-12-09 02:00:00 America/Caracas'::timestamptz;
+SELECT '2014-10-26 00:00:00 Europe/Moscow'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 06:00:00 2007 UTC
+ Sat Oct 25 20:00:00 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:29:59 America/Caracas'::timestamptz;
+SELECT '2014-10-26 00:59:59 Europe/Moscow'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 06:29:59 2007 UTC
+ Sat Oct 25 20:59:59 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:30:00 America/Caracas'::timestamptz;
+SELECT '2014-10-26 01:00:00 Europe/Moscow'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 07:00:00 2007 UTC
+ Sat Oct 25 22:00:00 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:30:01 America/Caracas'::timestamptz;
+SELECT '2014-10-26 01:00:01 Europe/Moscow'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 07:00:01 2007 UTC
+ Sat Oct 25 22:00:01 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:59:59 America/Caracas'::timestamptz;
+SELECT '2014-10-26 02:00:00 Europe/Moscow'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 07:29:59 2007 UTC
+ Sat Oct 25 23:00:00 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 03:00:00 America/Caracas'::timestamptz;
+SELECT '2014-10-26 00:00:00 MSK'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 07:30:00 2007 UTC
+ Sat Oct 25 20:00:00 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 03:00:01 America/Caracas'::timestamptz;
+SELECT '2014-10-26 00:59:59 MSK'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 07:30:01 2007 UTC
+ Sat Oct 25 20:59:59 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 04:00:00 America/Caracas'::timestamptz;
+SELECT '2014-10-26 01:00:00 MSK'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 08:30:00 2007 UTC
+ Sat Oct 25 22:00:00 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:00:00 VET'::timestamptz;
+SELECT '2014-10-26 01:00:01 MSK'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 06:00:00 2007 UTC
+ Sat Oct 25 22:00:01 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:29:59 VET'::timestamptz;
+SELECT '2014-10-26 02:00:00 MSK'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 06:29:59 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 02:30:00 VET'::timestamptz;
-         timestamptz          
-------------------------------
- Sun Dec 09 07:00:00 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 02:30:01 VET'::timestamptz;
-         timestamptz          
-------------------------------
- Sun Dec 09 07:00:01 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 02:59:59 VET'::timestamptz;
-         timestamptz          
-------------------------------
- Sun Dec 09 07:29:59 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 03:00:00 VET'::timestamptz;
-         timestamptz          
-------------------------------
- Sun Dec 09 07:30:00 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 03:00:01 VET'::timestamptz;
-         timestamptz          
-------------------------------
- Sun Dec 09 07:30:01 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 04:00:00 VET'::timestamptz;
-         timestamptz          
-------------------------------
- Sun Dec 09 08:30:00 2007 UTC
+ Sat Oct 25 23:00:00 2014 UTC
 (1 row)
 
 SELECT '2011-03-27 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
@@ -2175,112 +2138,76 @@
  Sun Mar 27 00:00:00 2011 UTC
 (1 row)
 
-SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'America/Caracas';
-           timezone           
-------------------------------
- Sun Dec 09 06:00:00 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'America/Caracas';
-           timezone           
-------------------------------
- Sun Dec 09 06:29:59 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'America/Caracas';
-           timezone           
-------------------------------
- Sun Dec 09 07:00:00 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'America/Caracas';
-           timezone           
-------------------------------
- Sun Dec 09 07:00:01 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'America/Caracas';
-           timezone           
-------------------------------
- Sun Dec 09 07:29:59 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'America/Caracas';
-           timezone           
-------------------------------
- Sun Dec 09 07:30:00 2007 UTC
-(1 row)
-
-SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'America/Caracas';
+SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
            timezone           
 ------------------------------
- Sun Dec 09 07:30:01 2007 UTC
+ Sat Oct 25 20:00:00 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'America/Caracas';
+SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'Europe/Moscow';
            timezone           
 ------------------------------
- Sun Dec 09 08:30:00 2007 UTC
+ Sat Oct 25 20:59:59 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'VET';
+SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
            timezone           
 ------------------------------
- Sun Dec 09 06:00:00 2007 UTC
+ Sat Oct 25 22:00:00 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'VET';
+SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'Europe/Moscow';
            timezone           
 ------------------------------
- Sun Dec 09 06:29:59 2007 UTC
+ Sat Oct 25 22:00:01 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'VET';
+SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
            timezone           
 ------------------------------
- Sun Dec 09 07:00:00 2007 UTC
+ Sat Oct 25 23:00:00 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'VET';
+SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'MSK';
            timezone           
 ------------------------------
- Sun Dec 09 07:00:01 2007 UTC
+ Sat Oct 25 20:00:00 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'VET';
+SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'MSK';
            timezone           
 ------------------------------
- Sun Dec 09 07:29:59 2007 UTC
+ Sat Oct 25 20:59:59 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'VET';
+SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'MSK';
            timezone           
 ------------------------------
- Sun Dec 09 07:30:00 2007 UTC
+ Sat Oct 25 22:00:00 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'VET';
+SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'MSK';
            timezone           
 ------------------------------
- Sun Dec 09 07:30:01 2007 UTC
+ Sat Oct 25 22:00:01 2014 UTC
 (1 row)
 
-SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'VET';
+SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'MSK';
            timezone           
 ------------------------------
- Sun Dec 09 08:30:00 2007 UTC
+ Sat Oct 25 23:00:00 2014 UTC
 (1 row)
 
-SELECT make_timestamptz(2007, 12, 9, 2, 0, 0, 'VET');
+SELECT make_timestamptz(2014, 10, 26, 0, 0, 0, 'MSK');
        make_timestamptz       
 ------------------------------
- Sun Dec 09 06:00:00 2007 UTC
+ Sat Oct 25 20:00:00 2014 UTC
 (1 row)
 
-SELECT make_timestamptz(2007, 12, 9, 3, 0, 0, 'VET');
+SELECT make_timestamptz(2014, 10, 26, 1, 0, 0, 'MSK');
        make_timestamptz       
 ------------------------------
- Sun Dec 09 07:30:00 2007 UTC
+ Sat Oct 25 22:00:00 2014 UTC
 (1 row)
 
 SET TimeZone to 'Europe/Moscow';
@@ -2326,47 +2253,34 @@
  Sun Mar 27 04:00:00 2011 MSK
 (1 row)
 
-SET TimeZone to 'America/Caracas';
-SELECT '2007-12-09 06:00:00 UTC'::timestamptz;
+SELECT '2014-10-25 21:00:00 UTC'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 02:00:00 2007 VET
+ Sun Oct 26 01:00:00 2014 MSK
 (1 row)
 
-SELECT '2007-12-09 06:30:00 UTC'::timestamptz;
+SELECT '2014-10-25 21:59:59 UTC'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 02:30:00 2007 VET
+ Sun Oct 26 01:59:59 2014 MSK
 (1 row)
 
-SELECT '2007-12-09 06:59:59 UTC'::timestamptz;
+SELECT '2014-10-25 22:00:00 UTC'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 02:59:59 2007 VET
+ Sun Oct 26 01:00:00 2014 MSK
 (1 row)
 
-SELECT '2007-12-09 07:00:00 UTC'::timestamptz;
+SELECT '2014-10-25 22:00:01 UTC'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 02:30:00 2007 VET
+ Sun Oct 26 01:00:01 2014 MSK
 (1 row)
 
-SELECT '2007-12-09 07:00:01 UTC'::timestamptz;
+SELECT '2014-10-25 23:00:00 UTC'::timestamptz;
          timestamptz          
 ------------------------------
- Sun Dec 09 02:30:01 2007 VET
-(1 row)
-
-SELECT '2007-12-09 07:29:59 UTC'::timestamptz;
-         timestamptz          
-------------------------------
- Sun Dec 09 02:59:59 2007 VET
-(1 row)
-
-SELECT '2007-12-09 07:30:00 UTC'::timestamptz;
-         timestamptz          
-------------------------------
- Sun Dec 09 03:00:00 2007 VET
+ Sun Oct 26 02:00:00 2014 MSK
 (1 row)
 
 RESET TimeZone;
@@ -2412,46 +2326,34 @@
  Sun Mar 27 04:00:00 2011
 (1 row)
 
-SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
          timezone         
 --------------------------
- Sun Dec 09 02:00:00 2007
+ Sun Oct 26 01:00:00 2014
 (1 row)
 
-SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
          timezone         
 --------------------------
- Sun Dec 09 02:30:00 2007
+ Sun Oct 26 01:59:59 2014
 (1 row)
 
-SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
          timezone         
 --------------------------
- Sun Dec 09 02:59:59 2007
+ Sun Oct 26 01:00:00 2014
 (1 row)
 
-SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
          timezone         
 --------------------------
- Sun Dec 09 02:30:00 2007
+ Sun Oct 26 01:00:01 2014
 (1 row)
 
-SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
          timezone         
 --------------------------
- Sun Dec 09 02:30:01 2007
-(1 row)
-
-SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-         timezone         
---------------------------
- Sun Dec 09 02:59:59 2007
-(1 row)
-
-SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-         timezone         
---------------------------
- Sun Dec 09 03:00:00 2007
+ Sun Oct 26 02:00:00 2014
 (1 row)
 
 SELECT '2011-03-26 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
@@ -2496,45 +2398,87 @@
  Sun Mar 27 04:00:00 2011
 (1 row)
 
-SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
+SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
          timezone         
 --------------------------
- Sun Dec 09 02:00:00 2007
+ Sun Oct 26 01:00:00 2014
 (1 row)
 
-SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
+SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'MSK';
          timezone         
 --------------------------
- Sun Dec 09 02:30:00 2007
+ Sun Oct 26 01:59:59 2014
 (1 row)
 
-SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'VET';
+SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
          timezone         
 --------------------------
- Sun Dec 09 02:59:59 2007
+ Sun Oct 26 01:00:00 2014
 (1 row)
 
-SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
+SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'MSK';
          timezone         
 --------------------------
- Sun Dec 09 02:30:00 2007
+ Sun Oct 26 01:00:01 2014
 (1 row)
 
-SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'VET';
+SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
          timezone         
 --------------------------
- Sun Dec 09 02:30:01 2007
+ Sun Oct 26 02:00:00 2014
 (1 row)
 
-SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'VET';
-         timezone         
---------------------------
- Sun Dec 09 02:59:59 2007
+--
+-- Test that the pg_timezone_names and pg_timezone_abbrevs views are
+-- more-or-less working.  We can't test their contents in any great detail
+-- without the outputs changing anytime IANA updates the underlying data,
+-- but it seems reasonable to expect at least one entry per major meridian.
+-- (At the time of writing, the actual counts are around 38 because of
+-- zones using fractional GMT offsets, so this is a pretty loose test.)
+--
+select count(distinct utc_offset) >= 24 as ok from pg_timezone_names;
+ ok 
+----
+ t
 (1 row)
 
-SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
-         timezone         
---------------------------
- Sun Dec 09 03:00:00 2007
+select count(distinct utc_offset) >= 24 as ok from pg_timezone_abbrevs;
+ ok 
+----
+ t
+(1 row)
+
+-- Let's check the non-default timezone abbreviation sets, too
+set timezone_abbreviations = 'Australia';
+select count(distinct utc_offset) >= 24 as ok from pg_timezone_abbrevs;
+ ok 
+----
+ t
+(1 row)
+
+set timezone_abbreviations = 'India';
+select count(distinct utc_offset) >= 24 as ok from pg_timezone_abbrevs;
+ ok 
+----
+ t
+(1 row)
+
+--
+-- Test that AT TIME ZONE isn't misoptimized when using an index (bug #14504)
+--
+create temp table tmptz (f1 timestamptz primary key);
+insert into tmptz values ('2017-01-18 00:00+00');
+explain (costs off)
+select * from tmptz where f1 at time zone 'utc' = '2017-01-18 00:00';
+                                           QUERY PLAN                                            
+-------------------------------------------------------------------------------------------------
+ Seq Scan on tmptz
+   Filter: (timezone('utc'::text, f1) = 'Wed Jan 18 00:00:00 2017'::timestamp without time zone)
+(2 rows)
+
+select * from tmptz where f1 at time zone 'utc' = '2017-01-18 00:00';
+              f1              
+------------------------------
+ Tue Jan 17 16:00:00 2017 PST
 (1 row)
 
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/tsdicts.out postgresql-9.5-9.5.8/src/test/regress/expected/tsdicts.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/tsdicts.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/tsdicts.out	2017-08-07 21:13:41.000000000 +0000
@@ -191,7 +191,7 @@
  {foot,ball,klubber}
 (1 row)
 
--- Synonim dictionary
+-- Synonym dictionary
 CREATE TEXT SEARCH DICTIONARY synonym (
 						Template=synonym,
 						Synonyms=synonym_sample
@@ -322,10 +322,10 @@
  '1':1,5 '12':3 '123':4 'pgsql':2
 (1 row)
 
-SELECT to_tsvector('thesaurus_tst', 'Supernovae star is very new star and usually called supernovae (abbrevation SN)');
-                         to_tsvector                         
--------------------------------------------------------------
- 'abbrev':10 'call':8 'new':4 'sn':1,9,11 'star':5 'usual':7
+SELECT to_tsvector('thesaurus_tst', 'Supernovae star is very new star and usually called supernovae (abbreviation SN)');
+                         to_tsvector                          
+--------------------------------------------------------------
+ 'abbrevi':10 'call':8 'new':4 'sn':1,9,11 'star':5 'usual':7
 (1 row)
 
 SELECT to_tsvector('thesaurus_tst', 'Booking tickets is looking like a booking a tickets');
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/tsearch.out postgresql-9.5-9.5.8/src/test/regress/expected/tsearch.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/tsearch.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/tsearch.out	2017-08-07 21:13:41.000000000 +0000
@@ -98,8 +98,36 @@
    494
 (1 row)
 
+SELECT count(*) FROM test_tsvector WHERE a @@ any ('{wr,qh}');
+ count 
+-------
+   158
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'no_such_lexeme';
+ count 
+-------
+     0
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '!no_such_lexeme';
+ count 
+-------
+   508
+(1 row)
+
 create index wowidx on test_tsvector using gist (a);
 SET enable_seqscan=OFF;
+SET enable_indexscan=ON;
+SET enable_bitmapscan=OFF;
+explain (costs off) SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+                      QUERY PLAN                       
+-------------------------------------------------------
+ Aggregate
+   ->  Index Scan using wowidx on test_tsvector
+         Index Cond: (a @@ '''wr'' | ''qh'''::tsquery)
+(3 rows)
+
 SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
  count 
 -------
@@ -148,10 +176,107 @@
    158
 (1 row)
 
+SELECT count(*) FROM test_tsvector WHERE a @@ 'no_such_lexeme';
+ count 
+-------
+     0
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '!no_such_lexeme';
+ count 
+-------
+   508
+(1 row)
+
+SET enable_indexscan=OFF;
+SET enable_bitmapscan=ON;
+explain (costs off) SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on test_tsvector
+         Recheck Cond: (a @@ '''wr'' | ''qh'''::tsquery)
+         ->  Bitmap Index Scan on wowidx
+               Index Cond: (a @@ '''wr'' | ''qh'''::tsquery)
+(5 rows)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+ count 
+-------
+   158
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
+ count 
+-------
+    17
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
+ count 
+-------
+     6
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
+ count 
+-------
+    98
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
+ count 
+-------
+    23
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
+ count 
+-------
+    39
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'w:*|q:*';
+ count 
+-------
+   494
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ any ('{wr,qh}');
+ count 
+-------
+   158
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'no_such_lexeme';
+ count 
+-------
+     0
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '!no_such_lexeme';
+ count 
+-------
+   508
+(1 row)
+
 RESET enable_seqscan;
+RESET enable_indexscan;
+RESET enable_bitmapscan;
 DROP INDEX wowidx;
 CREATE INDEX wowidx ON test_tsvector USING gin (a);
 SET enable_seqscan=OFF;
+-- GIN only supports bitmapscan, so no need to test plain indexscan
+explain (costs off) SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on test_tsvector
+         Recheck Cond: (a @@ '''wr'' | ''qh'''::tsquery)
+         ->  Bitmap Index Scan on wowidx
+               Index Cond: (a @@ '''wr'' | ''qh'''::tsquery)
+(5 rows)
+
 SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
  count 
 -------
@@ -200,6 +325,18 @@
    158
 (1 row)
 
+SELECT count(*) FROM test_tsvector WHERE a @@ 'no_such_lexeme';
+ count 
+-------
+     0
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '!no_such_lexeme';
+ count 
+-------
+   508
+(1 row)
+
 RESET enable_seqscan;
 INSERT INTO test_tsvector VALUES ('???', 'DFG:1A,2B,6C,10 FGH');
 SELECT * FROM ts_stat('SELECT a FROM test_tsvector') ORDER BY ndoc DESC, nentry DESC, word LIMIT 10;
@@ -865,6 +1002,13 @@
  'foo' & 'bar' & 'qq' & ( 'city' & 'new' & 'york' | ( 'nyc' | 'big' & 'apple' ) )
 (1 row)
 
+SELECT ts_rewrite(ts_rewrite('new & !york ', 'york', '!jersey'),
+                  'jersey', 'mexico');
+       ts_rewrite       
+------------------------
+ 'new' & !( !'mexico' )
+(1 row)
+
 SELECT ts_rewrite('moscow', 'SELECT keyword, sample FROM test_tsquery'::text );
      ts_rewrite      
 ---------------------
@@ -901,6 +1045,21 @@
  'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
 (1 row)
 
+-- Check empty substitution
+SELECT ts_rewrite(to_tsquery('5 & (6 | 5)'), to_tsquery('5'), to_tsquery(''));
+NOTICE:  text-search query doesn't contain lexemes: ""
+ ts_rewrite 
+------------
+ '6'
+(1 row)
+
+SELECT ts_rewrite(to_tsquery('!5'), to_tsquery('5'), to_tsquery(''));
+NOTICE:  text-search query doesn't contain lexemes: ""
+ ts_rewrite 
+------------
+ 
+(1 row)
+
 SELECT keyword FROM test_tsquery WHERE keyword @> 'new';
     keyword     
 ----------------
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/tstypes.out postgresql-9.5-9.5.8/src/test/regress/expected/tstypes.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/tstypes.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/tstypes.out	2017-08-07 21:13:41.000000000 +0000
@@ -625,3 +625,15 @@
         0.1
 (1 row)
 
+select to_tsvector('simple', 'x y q y') @@ '!foo' AS "true";
+ true 
+------
+ t
+(1 row)
+
+select to_tsvector('simple', '') @@ '!foo' AS "true";
+ true 
+------
+ t
+(1 row)
+
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/updatable_views.out postgresql-9.5-9.5.8/src/test/regress/expected/updatable_views.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/updatable_views.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/updatable_views.out	2017-08-07 21:13:41.000000000 +0000
@@ -2459,3 +2459,16 @@
 DROP VIEW v1;
 DROP TABLE t2;
 DROP TABLE t1;
+--
+-- Test CREATE OR REPLACE VIEW turning a non-updatable view into an
+-- auto-updatable view and adding check options in a single step
+--
+CREATE TABLE t1 (a int, b text);
+CREATE VIEW v1 AS SELECT null::int AS a;
+CREATE OR REPLACE VIEW v1 AS SELECT * FROM t1 WHERE a > 0 WITH CHECK OPTION;
+INSERT INTO v1 VALUES (1, 'ok'); -- ok
+INSERT INTO v1 VALUES (-1, 'invalid'); -- should fail
+ERROR:  new row violates check option for view "v1"
+DETAIL:  Failing row contains (-1, invalid).
+DROP VIEW v1;
+DROP TABLE t1;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/update.out postgresql-9.5-9.5.8/src/test/regress/expected/update.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/update.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/update.out	2017-08-07 21:13:41.000000000 +0000
@@ -56,6 +56,13 @@
  100 | 20 | 
 (2 rows)
 
+-- fail, wrong data type:
+UPDATE update_test SET a = v.* FROM (VALUES(100, 20)) AS v(i, j)
+  WHERE update_test.b = v.j;
+ERROR:  column "a" is of type integer but expression is of type record
+LINE 1: UPDATE update_test SET a = v.* FROM (VALUES(100, 20)) AS v(i...
+                                   ^
+HINT:  You will need to rewrite or cast the expression.
 --
 -- Test multiple-set-clause syntax
 --
@@ -133,6 +140,17 @@
     |     | 
 (4 rows)
 
+-- these should work, but don't yet:
+UPDATE update_test SET (a,b) = (v.*) FROM (VALUES(21, 100)) AS v(i, j)
+  WHERE update_test.a = v.i;
+ERROR:  number of columns does not match number of values
+LINE 1: UPDATE update_test SET (a,b) = (v.*) FROM (VALUES(21, 100)) ...
+                                       ^
+UPDATE update_test SET (a,b) = ROW(v.*) FROM (VALUES(21, 101)) AS v(i, j)
+  WHERE update_test.a = v.i;
+ERROR:  syntax error at or near "ROW"
+LINE 1: UPDATE update_test SET (a,b) = ROW(v.*) FROM (VALUES(21, 101...
+                                       ^
 -- if an alias for the target table is specified, don't allow references
 -- to the original table name
 UPDATE update_test AS t SET b = update_test.b + 10 WHERE t.a = 10;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/xmlmap_1.out postgresql-9.5-9.5.8/src/test/regress/expected/xmlmap_1.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/xmlmap_1.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/xmlmap_1.out	2017-08-07 21:13:41.000000000 +0000
@@ -78,7 +78,11 @@
 ERROR:  unsupported XML feature
 DETAIL:  This functionality requires the server to be built with libxml support.
 HINT:  You need to rebuild PostgreSQL using --with-libxml.
-MOVE FIRST IN xc;
+SELECT cursor_to_xmlschema('xc'::refcursor, false, true, '');
+ERROR:  unsupported XML feature
+DETAIL:  This functionality requires the server to be built with libxml support.
+HINT:  You need to rebuild PostgreSQL using --with-libxml.
+MOVE BACKWARD ALL IN xc;
 SELECT cursor_to_xml('xc'::refcursor, 5, true, false, '');
 ERROR:  unsupported XML feature
 DETAIL:  This functionality requires the server to be built with libxml support.
diff -Nru postgresql-9.5-9.5.2/src/test/regress/expected/xmlmap.out postgresql-9.5-9.5.8/src/test/regress/expected/xmlmap.out
--- postgresql-9.5-9.5.2/src/test/regress/expected/xmlmap.out	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/expected/xmlmap.out	2017-08-07 21:13:41.000000000 +0000
@@ -696,20 +696,58 @@
  
 (1 row)
 
-MOVE FIRST IN xc;
+SELECT cursor_to_xmlschema('xc'::refcursor, false, true, '');
+                                     cursor_to_xmlschema                                      
+----------------------------------------------------------------------------------------------
+ <xsd:schema                                                                                 +
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema">                                           +
+                                                                                             +
+ <xsd:simpleType name="INTEGER">                                                             +
+   <xsd:restriction base="xsd:int">                                                          +
+     <xsd:maxInclusive value="2147483647"/>                                                  +
+     <xsd:minInclusive value="-2147483648"/>                                                 +
+   </xsd:restriction>                                                                        +
+ </xsd:simpleType>                                                                           +
+                                                                                             +
+ <xsd:simpleType name="UDT.regression.pg_catalog.text">                                      +
+   <xsd:restriction base="xsd:string">                                                       +
+   </xsd:restriction>                                                                        +
+ </xsd:simpleType>                                                                           +
+                                                                                             +
+ <xsd:complexType name="RowType">                                                            +
+   <xsd:sequence>                                                                            +
+     <xsd:element name="a" type="INTEGER" minOccurs="0"></xsd:element>                       +
+     <xsd:element name="b" type="UDT.regression.pg_catalog.text" minOccurs="0"></xsd:element>+
+   </xsd:sequence>                                                                           +
+ </xsd:complexType>                                                                          +
+                                                                                             +
+ <xsd:element name="row" type="RowType"/>                                                    +
+                                                                                             +
+ </xsd:schema>
+(1 row)
+
+MOVE BACKWARD ALL IN xc;
 SELECT cursor_to_xml('xc'::refcursor, 5, true, false, '');
- cursor_to_xml 
----------------
- <row>        +
-   <a>1</a>   +
-   <b>one</b> +
- </row>       +
-              +
- <row>        +
-   <a>2</a>   +
-   <b>two</b> +
- </row>       +
-              +
+                         cursor_to_xml                         
+---------------------------------------------------------------
+ <table xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">+
+                                                              +
+ <row>                                                        +
+   <a>-1</a>                                                  +
+   <b xsi:nil="true"/>                                        +
+ </row>                                                       +
+                                                              +
+ <row>                                                        +
+   <a>1</a>                                                   +
+   <b>one</b>                                                 +
+ </row>                                                       +
+                                                              +
+ <row>                                                        +
+   <a>2</a>                                                   +
+   <b>two</b>                                                 +
+ </row>                                                       +
+                                                              +
+ </table>                                                     +
  
 (1 row)
 
diff -Nru postgresql-9.5-9.5.2/src/test/regress/input/create_function_2.source postgresql-9.5-9.5.8/src/test/regress/input/create_function_2.source
--- postgresql-9.5-9.5.2/src/test/regress/input/create_function_2.source	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/input/create_function_2.source	2017-08-07 21:13:41.000000000 +0000
@@ -62,15 +62,6 @@
    LANGUAGE SQL;
 
 
-CREATE FUNCTION user_relns()
-   RETURNS setof name
-   AS 'select relname
-       from pg_class c, pg_namespace n
-       where relnamespace = n.oid and
-             (nspname !~ ''pg_.*'' and nspname <> ''information_schema'') and
-             relkind <> ''i'' '
-   LANGUAGE SQL;
-
 CREATE FUNCTION pt_in_widget(point, widget)
    RETURNS bool
    AS '@libdir@/regress@DLSUFFIX@'
diff -Nru postgresql-9.5-9.5.2/src/test/regress/input/largeobject.source postgresql-9.5-9.5.8/src/test/regress/input/largeobject.source
--- postgresql-9.5-9.5.2/src/test/regress/input/largeobject.source	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/input/largeobject.source	2017-08-07 21:13:41.000000000 +0000
@@ -86,10 +86,8 @@
 SELECT lo_from_bytea(0, lo_get(loid)) AS newloid FROM lotest_stash_values
 \gset
 
--- Ideally we'd put a comment on this object for pg_dump testing purposes.
--- But since pg_upgrade fails to preserve large object comments, doing so
--- would break pg_upgrade's regression test.
--- COMMENT ON LARGE OBJECT :newloid IS 'I Wandered Lonely as a Cloud';
+-- Add a comment to it, as well, for pg_dump/pg_upgrade testing.
+COMMENT ON LARGE OBJECT :newloid IS 'I Wandered Lonely as a Cloud';
 
 -- Read out a portion
 BEGIN;
@@ -253,6 +251,13 @@
 SET bytea_output TO hex;
 SELECT lo_get(:newloid);
 
+-- Create one more object that we leave behind for testing pg_dump/pg_upgrade;
+-- this one intentionally has an OID in the system range
+SELECT lo_create(3001);
+
+COMMENT ON LARGE OBJECT 3001 IS 'testing comments';
+
+-- Clean up
 DROP TABLE lotest_stash_values;
 
 DROP ROLE regresslo;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/input/misc.source postgresql-9.5-9.5.8/src/test/regress/input/misc.source
--- postgresql-9.5-9.5.2/src/test/regress/input/misc.source	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/input/misc.source	2017-08-07 21:13:41.000000000 +0000
@@ -218,9 +218,6 @@
 
 SELECT name(equipment(p.hobbies)), name(p.hobbies), p.name FROM person* p;
 
-SELECT user_relns() AS user_relns
-   ORDER BY user_relns;
-
 SELECT name(equipment(hobby_construct(text 'skywalking', text 'mer')));
 
 SELECT name(equipment(hobby_construct_named(text 'skywalking', text 'mer')));
diff -Nru postgresql-9.5-9.5.2/src/test/regress/input/tablespace.source postgresql-9.5-9.5.8/src/test/regress/input/tablespace.source
--- postgresql-9.5-9.5.2/src/test/regress/input/tablespace.source	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/input/tablespace.source	2017-08-07 21:13:41.000000000 +0000
@@ -44,6 +44,37 @@
 SELECT relname, spcname FROM pg_catalog.pg_tablespace t, pg_catalog.pg_class c
     where c.reltablespace = t.oid AND c.relname = 'foo_idx';
 
+-- check that default_tablespace doesn't affect ALTER TABLE index rebuilds
+CREATE TABLE testschema.test_default_tab(id bigint) TABLESPACE testspace;
+INSERT INTO testschema.test_default_tab VALUES (1);
+CREATE INDEX test_index1 on testschema.test_default_tab (id);
+CREATE INDEX test_index2 on testschema.test_default_tab (id) TABLESPACE testspace;
+\d testschema.test_index1
+\d testschema.test_index2
+-- use a custom tablespace for default_tablespace
+SET default_tablespace TO testspace;
+-- tablespace should not change if no rewrite
+ALTER TABLE testschema.test_default_tab ALTER id TYPE bigint;
+\d testschema.test_index1
+\d testschema.test_index2
+SELECT * FROM testschema.test_default_tab;
+-- tablespace should not change even if there is an index rewrite
+ALTER TABLE testschema.test_default_tab ALTER id TYPE int;
+\d testschema.test_index1
+\d testschema.test_index2
+SELECT * FROM testschema.test_default_tab;
+-- now use the default tablespace for default_tablespace
+SET default_tablespace TO '';
+-- tablespace should not change if no rewrite
+ALTER TABLE testschema.test_default_tab ALTER id TYPE int;
+\d testschema.test_index1
+\d testschema.test_index2
+-- tablespace should not change even if there is an index rewrite
+ALTER TABLE testschema.test_default_tab ALTER id TYPE bigint;
+\d testschema.test_index1
+\d testschema.test_index2
+DROP TABLE testschema.test_default_tab;
+
 -- let's try moving a table from one place to another
 CREATE TABLE testschema.atable AS VALUES (1), (2);
 CREATE UNIQUE INDEX anindex ON testschema.atable(column1);
@@ -66,11 +97,18 @@
 
 CREATE ROLE tablespace_testuser1 login;
 CREATE ROLE tablespace_testuser2 login;
+GRANT USAGE ON SCHEMA testschema TO tablespace_testuser2;
 
 ALTER TABLESPACE testspace OWNER TO tablespace_testuser1;
 
+CREATE TABLE testschema.tablespace_acl (c int);
+-- new owner lacks permission to create this index from scratch
+CREATE INDEX k ON testschema.tablespace_acl (c) TABLESPACE testspace;
+ALTER TABLE testschema.tablespace_acl OWNER TO tablespace_testuser2;
+
 SET SESSION ROLE tablespace_testuser2;
 CREATE TABLE tablespace_table (i int) TABLESPACE testspace; -- fail
+ALTER TABLE testschema.tablespace_acl ALTER c TYPE bigint;
 RESET ROLE;
 
 ALTER TABLESPACE testspace RENAME TO testspace_renamed;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/output/create_function_2.source postgresql-9.5-9.5.8/src/test/regress/output/create_function_2.source
--- postgresql-9.5-9.5.2/src/test/regress/output/create_function_2.source	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/output/create_function_2.source	2017-08-07 21:13:41.000000000 +0000
@@ -47,14 +47,6 @@
    RETURNS setof equipment_r
    AS 'select * from equipment_r where equipment_r.hobby = hobby'
    LANGUAGE SQL;
-CREATE FUNCTION user_relns()
-   RETURNS setof name
-   AS 'select relname
-       from pg_class c, pg_namespace n
-       where relnamespace = n.oid and
-             (nspname !~ ''pg_.*'' and nspname <> ''information_schema'') and
-             relkind <> ''i'' '
-   LANGUAGE SQL;
 CREATE FUNCTION pt_in_widget(point, widget)
    RETURNS bool
    AS '@libdir@/regress@DLSUFFIX@'
diff -Nru postgresql-9.5-9.5.2/src/test/regress/output/largeobject_1.source postgresql-9.5-9.5.8/src/test/regress/output/largeobject_1.source
--- postgresql-9.5-9.5.2/src/test/regress/output/largeobject_1.source	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/output/largeobject_1.source	2017-08-07 21:13:41.000000000 +0000
@@ -90,10 +90,8 @@
 -- it's left behind to help test pg_dump.
 SELECT lo_from_bytea(0, lo_get(loid)) AS newloid FROM lotest_stash_values
 \gset
--- Ideally we'd put a comment on this object for pg_dump testing purposes.
--- But since pg_upgrade fails to preserve large object comments, doing so
--- would break pg_upgrade's regression test.
--- COMMENT ON LARGE OBJECT :newloid IS 'I Wandered Lonely as a Cloud';
+-- Add a comment to it, as well, for pg_dump/pg_upgrade testing.
+COMMENT ON LARGE OBJECT :newloid IS 'I Wandered Lonely as a Cloud';
 -- Read out a portion
 BEGIN;
 UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
@@ -469,5 +467,15 @@
  \xdeadbeef
 (1 row)
 
+-- Create one more object that we leave behind for testing pg_dump/pg_upgrade;
+-- this one intentionally has an OID in the system range
+SELECT lo_create(3001);
+ lo_create 
+-----------
+      3001
+(1 row)
+
+COMMENT ON LARGE OBJECT 3001 IS 'testing comments';
+-- Clean up
 DROP TABLE lotest_stash_values;
 DROP ROLE regresslo;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/output/largeobject.source postgresql-9.5-9.5.8/src/test/regress/output/largeobject.source
--- postgresql-9.5-9.5.2/src/test/regress/output/largeobject.source	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/output/largeobject.source	2017-08-07 21:13:41.000000000 +0000
@@ -90,10 +90,8 @@
 -- it's left behind to help test pg_dump.
 SELECT lo_from_bytea(0, lo_get(loid)) AS newloid FROM lotest_stash_values
 \gset
--- Ideally we'd put a comment on this object for pg_dump testing purposes.
--- But since pg_upgrade fails to preserve large object comments, doing so
--- would break pg_upgrade's regression test.
--- COMMENT ON LARGE OBJECT :newloid IS 'I Wandered Lonely as a Cloud';
+-- Add a comment to it, as well, for pg_dump/pg_upgrade testing.
+COMMENT ON LARGE OBJECT :newloid IS 'I Wandered Lonely as a Cloud';
 -- Read out a portion
 BEGIN;
 UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
@@ -469,5 +467,15 @@
  \xdeadbeef
 (1 row)
 
+-- Create one more object that we leave behind for testing pg_dump/pg_upgrade;
+-- this one intentionally has an OID in the system range
+SELECT lo_create(3001);
+ lo_create 
+-----------
+      3001
+(1 row)
+
+COMMENT ON LARGE OBJECT 3001 IS 'testing comments';
+-- Clean up
 DROP TABLE lotest_stash_values;
 DROP ROLE regresslo;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/output/misc.source postgresql-9.5-9.5.8/src/test/regress/output/misc.source
--- postgresql-9.5-9.5.2/src/test/regress/output/misc.source	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/output/misc.source	2017-08-07 21:13:41.000000000 +0000
@@ -574,144 +574,6 @@
  peet's coffee | posthacking | jeff
 (6 rows)
 
-SELECT user_relns() AS user_relns
-   ORDER BY user_relns;
-     user_relns      
----------------------
- a
- a_star
- abstime_tbl
- aggtest
- aggtype
- array_index_op_test
- array_op_test
- arrtest
- b
- b_star
- bb
- box_tbl
- bprime
- brinopers
- brintest
- bt_f8_heap
- bt_i4_heap
- bt_name_heap
- bt_txt_heap
- btree_tall_tbl
- c
- c_star
- char_tbl
- check2_tbl
- check_seq
- check_tbl
- circle_tbl
- city
- copy_tbl
- d
- d_star
- date_tbl
- default_seq
- default_tbl
- defaultexpr_tbl
- dept
- dupindexcols
- e_star
- emp
- equipment_r
- f_star
- fast_emp4000
- float4_tbl
- float8_tbl
- func_index_heap
- gin_test_tbl
- gist_point_tbl
- hash_f8_heap
- hash_i4_heap
- hash_name_heap
- hash_txt_heap
- hobbies_r
- iexit
- ihighway
- inet_tbl
- inhf
- inhx
- insert_seq
- insert_tbl
- int2_tbl
- int4_tbl
- int8_tbl
- interval_tbl
- iportaltest
- kd_point_tbl
- line_tbl
- log_table
- lseg_tbl
- main_table
- money_data
- num_data
- num_exp_add
- num_exp_div
- num_exp_ln
- num_exp_log10
- num_exp_mul
- num_exp_power_10_ln
- num_exp_sqrt
- num_exp_sub
- num_input_test
- num_result
- onek
- onek2
- path_tbl
- person
- point_tbl
- polygon_tbl
- quad_point_tbl
- radix_text_tbl
- ramp
- random_tbl
- real_city
- reltime_tbl
- rls_tbl
- rls_tbl_force
- road
- shighway
- slow_emp4000
- spgist_point_tbl
- spgist_text_tbl
- street
- stud_emp
- student
- subselect_tbl
- t
- tenk1
- tenk2
- test_range_excl
- test_range_gist
- test_range_spgist
- test_tablesample
- test_tablesample_v1
- test_tablesample_v2
- test_tsvector
- testjsonb
- text_tbl
- time_tbl
- timestamp_tbl
- timestamptz_tbl
- timetz_tbl
- tinterval_tbl
- tm
- tmm
- toyemp
- tv
- tvm
- tvmm
- tvv
- tvvm
- tvvmv
- varchar_tbl
- xacttest
-(132 rows)
-
 SELECT name(equipment(hobby_construct(text 'skywalking', text 'mer')));
  name 
 ------
diff -Nru postgresql-9.5-9.5.2/src/test/regress/output/tablespace.source postgresql-9.5-9.5.8/src/test/regress/output/tablespace.source
--- postgresql-9.5-9.5.2/src/test/regress/output/tablespace.source	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/output/tablespace.source	2017-08-07 21:13:41.000000000 +0000
@@ -61,6 +61,111 @@
  foo_idx | testspace
 (1 row)
 
+-- check that default_tablespace doesn't affect ALTER TABLE index rebuilds
+CREATE TABLE testschema.test_default_tab(id bigint) TABLESPACE testspace;
+INSERT INTO testschema.test_default_tab VALUES (1);
+CREATE INDEX test_index1 on testschema.test_default_tab (id);
+CREATE INDEX test_index2 on testschema.test_default_tab (id) TABLESPACE testspace;
+\d testschema.test_index1
+Index "testschema.test_index1"
+ Column |  Type  | Definition 
+--------+--------+------------
+ id     | bigint | id
+btree, for table "testschema.test_default_tab"
+
+\d testschema.test_index2
+Index "testschema.test_index2"
+ Column |  Type  | Definition 
+--------+--------+------------
+ id     | bigint | id
+btree, for table "testschema.test_default_tab"
+Tablespace: "testspace"
+
+-- use a custom tablespace for default_tablespace
+SET default_tablespace TO testspace;
+-- tablespace should not change if no rewrite
+ALTER TABLE testschema.test_default_tab ALTER id TYPE bigint;
+\d testschema.test_index1
+Index "testschema.test_index1"
+ Column |  Type  | Definition 
+--------+--------+------------
+ id     | bigint | id
+btree, for table "testschema.test_default_tab"
+
+\d testschema.test_index2
+Index "testschema.test_index2"
+ Column |  Type  | Definition 
+--------+--------+------------
+ id     | bigint | id
+btree, for table "testschema.test_default_tab"
+Tablespace: "testspace"
+
+SELECT * FROM testschema.test_default_tab;
+ id 
+----
+  1
+(1 row)
+
+-- tablespace should not change even if there is an index rewrite
+ALTER TABLE testschema.test_default_tab ALTER id TYPE int;
+\d testschema.test_index1
+Index "testschema.test_index1"
+ Column |  Type   | Definition 
+--------+---------+------------
+ id     | integer | id
+btree, for table "testschema.test_default_tab"
+
+\d testschema.test_index2
+Index "testschema.test_index2"
+ Column |  Type   | Definition 
+--------+---------+------------
+ id     | integer | id
+btree, for table "testschema.test_default_tab"
+Tablespace: "testspace"
+
+SELECT * FROM testschema.test_default_tab;
+ id 
+----
+  1
+(1 row)
+
+-- now use the default tablespace for default_tablespace
+SET default_tablespace TO '';
+-- tablespace should not change if no rewrite
+ALTER TABLE testschema.test_default_tab ALTER id TYPE int;
+\d testschema.test_index1
+Index "testschema.test_index1"
+ Column |  Type   | Definition 
+--------+---------+------------
+ id     | integer | id
+btree, for table "testschema.test_default_tab"
+
+\d testschema.test_index2
+Index "testschema.test_index2"
+ Column |  Type   | Definition 
+--------+---------+------------
+ id     | integer | id
+btree, for table "testschema.test_default_tab"
+Tablespace: "testspace"
+
+-- tablespace should not change even if there is an index rewrite
+ALTER TABLE testschema.test_default_tab ALTER id TYPE bigint;
+\d testschema.test_index1
+Index "testschema.test_index1"
+ Column |  Type  | Definition 
+--------+--------+------------
+ id     | bigint | id
+btree, for table "testschema.test_default_tab"
+
+\d testschema.test_index2
+Index "testschema.test_index2"
+ Column |  Type  | Definition 
+--------+--------+------------
+ id     | bigint | id
+btree, for table "testschema.test_default_tab"
+Tablespace: "testspace"
+
+DROP TABLE testschema.test_default_tab;
 -- let's try moving a table from one place to another
 CREATE TABLE testschema.atable AS VALUES (1), (2);
 CREATE UNIQUE INDEX anindex ON testschema.atable(column1);
@@ -87,10 +192,16 @@
 ERROR:  tablespace "testspace" is not empty
 CREATE ROLE tablespace_testuser1 login;
 CREATE ROLE tablespace_testuser2 login;
+GRANT USAGE ON SCHEMA testschema TO tablespace_testuser2;
 ALTER TABLESPACE testspace OWNER TO tablespace_testuser1;
+CREATE TABLE testschema.tablespace_acl (c int);
+-- new owner lacks permission to create this index from scratch
+CREATE INDEX k ON testschema.tablespace_acl (c) TABLESPACE testspace;
+ALTER TABLE testschema.tablespace_acl OWNER TO tablespace_testuser2;
 SET SESSION ROLE tablespace_testuser2;
 CREATE TABLE tablespace_table (i int) TABLESPACE testspace; -- fail
 ERROR:  permission denied for tablespace testspace
+ALTER TABLE testschema.tablespace_acl ALTER c TYPE bigint;
 RESET ROLE;
 ALTER TABLESPACE testspace RENAME TO testspace_renamed;
 ALTER TABLE ALL IN TABLESPACE testspace_renamed SET TABLESPACE pg_default;
@@ -101,10 +212,11 @@
 -- Should succeed
 DROP TABLESPACE testspace_renamed;
 DROP SCHEMA testschema CASCADE;
-NOTICE:  drop cascades to 4 other objects
+NOTICE:  drop cascades to 5 other objects
 DETAIL:  drop cascades to table testschema.foo
 drop cascades to table testschema.asselect
 drop cascades to table testschema.asexecute
 drop cascades to table testschema.atable
+drop cascades to table testschema.tablespace_acl
 DROP ROLE tablespace_testuser1;
 DROP ROLE tablespace_testuser2;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/pg_regress.c postgresql-9.5-9.5.8/src/test/regress/pg_regress.c
--- postgresql-9.5-9.5.2/src/test/regress/pg_regress.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/pg_regress.c	2017-08-07 21:13:41.000000000 +0000
@@ -2185,6 +2185,8 @@
 	if (temp_instance)
 	{
 		FILE	   *pg_conf;
+		const char *env_wait;
+		int			wait_seconds;
 
 		/*
 		 * Prepare the temp instance
@@ -2334,11 +2336,23 @@
 		}
 
 		/*
-		 * Wait till postmaster is able to accept connections (normally only a
-		 * second or so, but Cygwin is reportedly *much* slower).  Don't wait
-		 * forever, however.
-		 */
-		for (i = 0; i < 60; i++)
+		 * Wait till postmaster is able to accept connections; normally this
+		 * is only a second or so, but Cygwin is reportedly *much* slower, and
+		 * test builds using Valgrind or similar tools might be too.  Hence,
+		 * allow the default timeout of 60 seconds to be overridden from the
+		 * PGCTLTIMEOUT environment variable.
+		 */
+		env_wait = getenv("PGCTLTIMEOUT");
+		if (env_wait != NULL)
+		{
+			wait_seconds = atoi(env_wait);
+			if (wait_seconds <= 0)
+				wait_seconds = 60;
+		}
+		else
+			wait_seconds = 60;
+
+		for (i = 0; i < wait_seconds; i++)
 		{
 			/* Done if psql succeeds */
 			if (system(buf2) == 0)
@@ -2359,9 +2373,10 @@
 
 			pg_usleep(1000000L);
 		}
-		if (i >= 60)
+		if (i >= wait_seconds)
 		{
-			fprintf(stderr, _("\n%s: postmaster did not respond within 60 seconds\nExamine %s/log/postmaster.log for the reason\n"), progname, outputdir);
+			fprintf(stderr, _("\n%s: postmaster did not respond within %d seconds\nExamine %s/log/postmaster.log for the reason\n"),
+					progname, wait_seconds, outputdir);
 
 			/*
 			 * If we get here, the postmaster is probably wedged somewhere in
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/aggregates.sql postgresql-9.5-9.5.8/src/test/regress/sql/aggregates.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/aggregates.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/aggregates.sql	2017-08-07 21:13:41.000000000 +0000
@@ -98,6 +98,28 @@
   (select max((select i.unique2 from tenk1 i where i.unique1 = o.unique1)))
 from tenk1 o;
 
+-- Test handling of Params within aggregate arguments in hashed aggregation.
+-- Per bug report from Jeevan Chalke.
+explain (verbose, costs off)
+select s1, s2, sm
+from generate_series(1, 3) s1,
+     lateral (select s2, sum(s1 + s2) sm
+              from generate_series(1, 3) s2 group by s2) ss
+order by 1, 2;
+select s1, s2, sm
+from generate_series(1, 3) s1,
+     lateral (select s2, sum(s1 + s2) sm
+              from generate_series(1, 3) s2 group by s2) ss
+order by 1, 2;
+
+explain (verbose, costs off)
+select array(select sum(x+y) s
+            from generate_series(1,3) y group by y order by s)
+  from generate_series(1,3) x;
+select array(select sum(x+y) s
+            from generate_series(1,3) y group by y order by s)
+  from generate_series(1,3) x;
+
 --
 -- test for bitwise integer aggregates
 --
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/alter_table.sql postgresql-9.5-9.5.8/src/test/regress/sql/alter_table.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/alter_table.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/alter_table.sql	2017-08-07 21:13:41.000000000 +0000
@@ -165,6 +165,26 @@
 DROP TABLE tmp_new;
 DROP TABLE tmp_new2;
 
+--
+-- check renaming to a table's array type's autogenerated name
+-- (the array type's name should get out of the way)
+--
+CREATE TABLE tmp_array (id int);
+CREATE TABLE tmp_array2 (id int);
+SELECT typname FROM pg_type WHERE oid = 'tmp_array[]'::regtype;
+SELECT typname FROM pg_type WHERE oid = 'tmp_array2[]'::regtype;
+ALTER TABLE tmp_array2 RENAME TO _tmp_array;
+SELECT typname FROM pg_type WHERE oid = 'tmp_array[]'::regtype;
+SELECT typname FROM pg_type WHERE oid = '_tmp_array[]'::regtype;
+DROP TABLE _tmp_array;
+DROP TABLE tmp_array;
+
+-- renaming to table's own array type's name is an interesting corner case
+CREATE TABLE tmp_array (id int);
+SELECT typname FROM pg_type WHERE oid = 'tmp_array[]'::regtype;
+ALTER TABLE tmp_array RENAME TO _tmp_array;
+SELECT typname FROM pg_type WHERE oid = '_tmp_array[]'::regtype;
+DROP TABLE _tmp_array;
 
 -- ALTER TABLE ... RENAME on non-table relations
 -- renaming indexes (FIXME: this should probably test the index's functionality)
@@ -255,7 +275,7 @@
 -- Try (and fail) to add constraint due to invalid source columns
 ALTER TABLE tmp3 add constraint tmpconstr foreign key(c) references tmp2 match full;
 
--- Try (and fail) to add constraint due to invalide destination columns explicitly given
+-- Try (and fail) to add constraint due to invalid destination columns explicitly given
 ALTER TABLE tmp3 add constraint tmpconstr foreign key(a) references tmp2(b) match full;
 
 -- Try (and fail) to add constraint due to invalid data
@@ -307,6 +327,21 @@
 ALTER TABLE tmp3 ADD CONSTRAINT IDENTITY check (b = boo(b)) NOT VALID;
 ALTER TABLE tmp3 VALIDATE CONSTRAINT identity;
 
+-- A NO INHERIT constraint should not be looked for in children during VALIDATE CONSTRAINT
+create table parent_noinh_convalid (a int);
+create table child_noinh_convalid () inherits (parent_noinh_convalid);
+insert into parent_noinh_convalid values (1);
+insert into child_noinh_convalid values (1);
+alter table parent_noinh_convalid add constraint check_a_is_2 check (a = 2) no inherit not valid;
+-- fail, because of the row in parent
+alter table parent_noinh_convalid validate constraint check_a_is_2;
+delete from only parent_noinh_convalid;
+-- ok (parent itself contains no violating rows)
+alter table parent_noinh_convalid validate constraint check_a_is_2;
+select convalidated from pg_constraint where conrelid = 'parent_noinh_convalid'::regclass and conname = 'check_a_is_2';
+-- cleanup
+drop table parent_noinh_convalid, child_noinh_convalid;
+
 -- Try (and fail) to create constraint from tmp5(a) to tmp4(a) - unique constraint on
 -- tmp4 is a,b
 
@@ -404,6 +439,39 @@
 -- As does this...
 ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest2, ftest1)
      references pktable(ptest1, ptest2);
+DROP TABLE FKTABLE;
+DROP TABLE PKTABLE;
+
+-- Test that ALTER CONSTRAINT updates trigger deferrability properly
+
+CREATE TEMP TABLE PKTABLE (ptest1 int primary key);
+CREATE TEMP TABLE FKTABLE (ftest1 int);
+
+ALTER TABLE FKTABLE ADD CONSTRAINT fknd FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION NOT DEFERRABLE;
+ALTER TABLE FKTABLE ADD CONSTRAINT fkdd FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE FKTABLE ADD CONSTRAINT fkdi FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION DEFERRABLE INITIALLY IMMEDIATE;
+
+ALTER TABLE FKTABLE ADD CONSTRAINT fknd2 FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE FKTABLE ALTER CONSTRAINT fknd2 NOT DEFERRABLE;
+ALTER TABLE FKTABLE ADD CONSTRAINT fkdd2 FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION NOT DEFERRABLE;
+ALTER TABLE FKTABLE ALTER CONSTRAINT fkdd2 DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE FKTABLE ADD CONSTRAINT fkdi2 FOREIGN KEY(ftest1) REFERENCES pktable
+  ON DELETE CASCADE ON UPDATE NO ACTION NOT DEFERRABLE;
+ALTER TABLE FKTABLE ALTER CONSTRAINT fkdi2 DEFERRABLE INITIALLY IMMEDIATE;
+
+SELECT conname, tgfoid::regproc, tgtype, tgdeferrable, tginitdeferred
+FROM pg_trigger JOIN pg_constraint con ON con.oid = tgconstraint
+WHERE tgrelid = 'pktable'::regclass
+ORDER BY 1,2,3;
+SELECT conname, tgfoid::regproc, tgtype, tgdeferrable, tginitdeferred
+FROM pg_trigger JOIN pg_constraint con ON con.oid = tgconstraint
+WHERE tgrelid = 'fktable'::regclass
+ORDER BY 1,2,3;
 
 -- temp tables should go away by themselves, need not drop them.
 
@@ -1288,6 +1356,28 @@
   where relname like 'test_inh_check%' and c.conrelid = r.oid
   order by 1, 2;
 
+-- ALTER COLUMN TYPE with different schema in children
+-- Bug at https://postgr.es/m/20170102225618.GA10071@telsasoft.com
+CREATE TABLE test_type_diff (f1 int);
+CREATE TABLE test_type_diff_c (extra smallint) INHERITS (test_type_diff);
+ALTER TABLE test_type_diff ADD COLUMN f2 int;
+INSERT INTO test_type_diff_c VALUES (1, 2, 3);
+ALTER TABLE test_type_diff ALTER COLUMN f2 TYPE bigint USING f2::bigint;
+
+CREATE TABLE test_type_diff2 (int_two int2, int_four int4, int_eight int8);
+CREATE TABLE test_type_diff2_c1 (int_four int4, int_eight int8, int_two int2);
+CREATE TABLE test_type_diff2_c2 (int_eight int8, int_two int2, int_four int4);
+CREATE TABLE test_type_diff2_c3 (int_two int2, int_four int4, int_eight int8);
+ALTER TABLE test_type_diff2_c1 INHERIT test_type_diff2;
+ALTER TABLE test_type_diff2_c2 INHERIT test_type_diff2;
+ALTER TABLE test_type_diff2_c3 INHERIT test_type_diff2;
+INSERT INTO test_type_diff2_c1 VALUES (1, 2, 3);
+INSERT INTO test_type_diff2_c2 VALUES (4, 5, 6);
+INSERT INTO test_type_diff2_c3 VALUES (7, 8, 9);
+ALTER TABLE test_type_diff2 ALTER COLUMN int_four TYPE int8 USING int_four::int8;
+-- whole-row references are disallowed
+ALTER TABLE test_type_diff2 ALTER COLUMN int_four TYPE int4 USING (pg_column_size(test_type_diff2));
+
 -- check for rollback of ANALYZE corrupting table property flags (bug #11638)
 CREATE TABLE check_fk_presence_1 (id int PRIMARY KEY, t text);
 CREATE TABLE check_fk_presence_2 (id int REFERENCES check_fk_presence_1, t text);
@@ -1662,6 +1752,24 @@
 SELECT indexrelid::regclass::text as index, obj_description(indexrelid, 'pg_class') as comment FROM pg_index where indrelid = 'comment_test'::regclass ORDER BY 1, 2;
 SELECT conname as constraint, obj_description(oid, 'pg_constraint') as comment FROM pg_constraint where conrelid = 'comment_test'::regclass ORDER BY 1, 2;
 
+-- Check compatibility for foreign keys and comments. This is done
+-- separately as rebuilding the column type of the parent leads
+-- to an error and would reduce the test scope.
+CREATE TABLE comment_test_child (
+  id text CONSTRAINT comment_test_child_fk REFERENCES comment_test);
+CREATE INDEX comment_test_child_fk ON comment_test_child(id);
+COMMENT ON COLUMN comment_test_child.id IS 'Column ''id'' on comment_test_child';
+COMMENT ON INDEX comment_test_child_fk IS 'Index backing the FOREIGN KEY of comment_test_child';
+COMMENT ON CONSTRAINT comment_test_child_fk ON comment_test_child IS 'FOREIGN KEY constraint of comment_test_child';
+
+-- Change column type of parent
+ALTER TABLE comment_test ALTER COLUMN id SET DATA TYPE text;
+ALTER TABLE comment_test ALTER COLUMN id SET DATA TYPE int USING id::integer;
+
+-- Comments should be intact
+SELECT col_description('comment_test_child'::regclass, 1) as comment;
+SELECT indexrelid::regclass::text as index, obj_description(indexrelid, 'pg_class') as comment FROM pg_index where indrelid = 'comment_test_child'::regclass ORDER BY 1, 2;
+SELECT conname as constraint, obj_description(oid, 'pg_constraint') as comment FROM pg_constraint where conrelid = 'comment_test_child'::regclass ORDER BY 1, 2;
 
 -- Check that we map relation oids to filenodes and back correctly.  Only
 -- display bad mappings so the test output doesn't change all the time.  A
@@ -1720,7 +1828,7 @@
 ALTER TABLE unlogged3 SET LOGGED; -- skip self-referencing foreign key
 ALTER TABLE unlogged2 SET LOGGED; -- fails because a foreign key to an unlogged table exists
 ALTER TABLE unlogged1 SET LOGGED;
--- check relpersistence of an unlogged table after changing to permament
+-- check relpersistence of an unlogged table after changing to permanent
 SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^unlogged1'
 UNION ALL
 SELECT 'toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^unlogged1'
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/arrays.sql postgresql-9.5-9.5.8/src/test/regress/sql/arrays.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/arrays.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/arrays.sql	2017-08-07 21:13:41.000000000 +0000
@@ -221,6 +221,15 @@
 SELECT array_position('[2:4]={1,2,3}'::int[], 1);
 SELECT array_positions('[2:4]={1,2,3}'::int[], 1);
 
+SELECT
+    array_position(ids, (1, 1)),
+    array_positions(ids, (1, 1))
+        FROM
+(VALUES
+    (ARRAY[(0, 0), (1, 1)]),
+    (ARRAY[(1, 1)])
+) AS f (ids);
+
 -- operators
 SELECT a FROM arrtest WHERE b = ARRAY[[[113,142],[1,147]]];
 SELECT NOT ARRAY[1.1,1.2,1.3] = ARRAY[1.1,1.2,1.3] AS "FALSE";
@@ -432,11 +441,19 @@
 select array_fill(7, array[3,3]);
 select array_fill('juhu'::text, array[3,3],array[2,2]);
 select array_fill('juhu'::text, array[3,3]);
+select a, a = '{}' as is_eq, array_dims(a)
+  from (select array_fill(42, array[0]) as a) ss;
+select a, a = '{}' as is_eq, array_dims(a)
+  from (select array_fill(42, '{}') as a) ss;
+select a, a = '{}' as is_eq, array_dims(a)
+  from (select array_fill(42, '{}', '{}') as a) ss;
 -- raise exception
 select array_fill(1, null, array[2,2]);
 select array_fill(1, array[2,2], null);
+select array_fill(1, array[2,2], '{}');
 select array_fill(1, array[3,3], array[1,1,1]);
 select array_fill(1, array[1,2,null]);
+select array_fill(1, array[[1,2],[3,4]]);
 
 select string_to_array('1|2|3', '|');
 select string_to_array('1|2|3|', '|');
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/brin.sql postgresql-9.5-9.5.8/src/test/regress/sql/brin.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/brin.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/brin.sql	2017-08-07 21:13:41.000000000 +0000
@@ -154,7 +154,7 @@
 	 '{100, 100, 1, 100, 100}'),
 	('textcol', 'text',
 	 '{>, >=, =, <=, <}',
-	 '{AAAAAA, AAAAAA, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',
+	 '{ABABAB, ABABAB, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',
 	 '{100, 100, 1, 100, 100}'),
 	('oidcol', 'oid',
 	 '{>, >=, =, <=, <}',
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/case.sql postgresql-9.5-9.5.8/src/test/regress/sql/case.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/case.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/case.sql	2017-08-07 21:13:41.000000000 +0000
@@ -157,6 +157,78 @@
 SELECT * FROM CASE_TBL;
 
 --
+-- Nested CASE expressions
+--
+
+-- This test exercises a bug caused by aliasing econtext->caseValue_isNull
+-- with the isNull argument of the inner CASE's ExecEvalCase() call.  After
+-- evaluating the vol(null) expression in the inner CASE's second WHEN-clause,
+-- the isNull flag for the case test value incorrectly became true, causing
+-- the third WHEN-clause not to match.  The volatile function calls are needed
+-- to prevent constant-folding in the planner, which would hide the bug.
+
+-- Wrap this in a single transaction so the transient '=' operator doesn't
+-- cause problems in concurrent sessions
+BEGIN;
+
+CREATE FUNCTION vol(text) returns text as
+  'begin return $1; end' language plpgsql volatile;
+
+SELECT CASE
+  (CASE vol('bar')
+    WHEN 'foo' THEN 'it was foo!'
+    WHEN vol(null) THEN 'null input'
+    WHEN 'bar' THEN 'it was bar!' END
+  )
+  WHEN 'it was foo!' THEN 'foo recognized'
+  WHEN 'it was bar!' THEN 'bar recognized'
+  ELSE 'unrecognized' END;
+
+-- In this case, we can't inline the SQL function without confusing things.
+CREATE DOMAIN foodomain AS text;
+
+CREATE FUNCTION volfoo(text) returns foodomain as
+  'begin return $1::foodomain; end' language plpgsql volatile;
+
+CREATE FUNCTION inline_eq(foodomain, foodomain) returns boolean as
+  'SELECT CASE $2::text WHEN $1::text THEN true ELSE false END' language sql;
+
+CREATE OPERATOR = (procedure = inline_eq,
+                   leftarg = foodomain, rightarg = foodomain);
+
+SELECT CASE volfoo('bar') WHEN 'foo'::foodomain THEN 'is foo' ELSE 'is not foo' END;
+
+ROLLBACK;
+
+-- Test multiple evaluation of a CASE arg that is a read/write object (#14472)
+-- Wrap this in a single transaction so the transient '=' operator doesn't
+-- cause problems in concurrent sessions
+BEGIN;
+
+CREATE DOMAIN arrdomain AS int[];
+
+CREATE FUNCTION make_ad(int,int) returns arrdomain as
+  'declare x arrdomain;
+   begin
+     x := array[$1,$2];
+     return x;
+   end' language plpgsql volatile;
+
+CREATE FUNCTION ad_eq(arrdomain, arrdomain) returns boolean as
+  'begin return array_eq($1, $2); end' language plpgsql;
+
+CREATE OPERATOR = (procedure = ad_eq,
+                   leftarg = arrdomain, rightarg = arrdomain);
+
+SELECT CASE make_ad(1,2)
+  WHEN array[2,4]::arrdomain THEN 'wrong'
+  WHEN array[2,5]::arrdomain THEN 'still wrong'
+  WHEN array[1,2]::arrdomain THEN 'right'
+  END;
+
+ROLLBACK;
+
+--
 -- Clean up
 --
 
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/combocid.sql postgresql-9.5-9.5.8/src/test/regress/sql/combocid.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/combocid.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/combocid.sql	2017-08-07 21:13:41.000000000 +0000
@@ -91,3 +91,21 @@
 COMMIT;
 
 SELECT ctid,cmin,* FROM combocidtest;
+
+-- test for bug reported in
+-- CABRT9RC81YUf1=jsmWopcKJEro=VoeG2ou6sPwyOUTx_qteRsg@mail.gmail.com
+CREATE TABLE IF NOT EXISTS testcase(
+	id int PRIMARY KEY,
+	balance numeric
+);
+INSERT INTO testcase VALUES (1, 0);
+BEGIN;
+SELECT * FROM testcase WHERE testcase.id = 1 FOR UPDATE;
+UPDATE testcase SET balance = balance + 400 WHERE id=1;
+SAVEPOINT subxact;
+UPDATE testcase SET balance = balance - 100 WHERE id=1;
+ROLLBACK TO SAVEPOINT subxact;
+-- should return one tuple
+SELECT * FROM testcase WHERE id = 1 FOR UPDATE;
+ROLLBACK;
+DROP TABLE testcase;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/copy2.sql postgresql-9.5-9.5.8/src/test/regress/sql/copy2.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/copy2.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/copy2.sql	2017-08-07 21:13:41.000000000 +0000
@@ -327,9 +327,72 @@
 \.
 select * from check_con_tbl;
 
+-- test with RLS enabled.
+CREATE ROLE regress_rls_copy_user;
+CREATE ROLE regress_rls_copy_user_colperms;
+CREATE TABLE rls_t1 (a int, b int, c int);
+
+COPY rls_t1 (a, b, c) from stdin;
+1	4	1
+2	3	2
+3	2	3
+4	1	4
+\.
+
+CREATE POLICY p1 ON rls_t1 FOR SELECT USING (a % 2 = 0);
+ALTER TABLE rls_t1 ENABLE ROW LEVEL SECURITY;
+ALTER TABLE rls_t1 FORCE ROW LEVEL SECURITY;
+
+GRANT SELECT ON TABLE rls_t1 TO regress_rls_copy_user;
+GRANT SELECT (a, b) ON TABLE rls_t1 TO regress_rls_copy_user_colperms;
+
+-- all columns
+COPY rls_t1 TO stdout;
+COPY rls_t1 (a, b, c) TO stdout;
+
+-- subset of columns
+COPY rls_t1 (a) TO stdout;
+COPY rls_t1 (a, b) TO stdout;
+
+-- column reordering
+COPY rls_t1 (b, a) TO stdout;
+
+SET SESSION AUTHORIZATION regress_rls_copy_user;
+
+-- all columns
+COPY rls_t1 TO stdout;
+COPY rls_t1 (a, b, c) TO stdout;
+
+-- subset of columns
+COPY rls_t1 (a) TO stdout;
+COPY rls_t1 (a, b) TO stdout;
+
+-- column reordering
+COPY rls_t1 (b, a) TO stdout;
+
+RESET SESSION AUTHORIZATION;
+
+SET SESSION AUTHORIZATION regress_rls_copy_user_colperms;
+
+-- attempt all columns (should fail)
+COPY rls_t1 TO stdout;
+COPY rls_t1 (a, b, c) TO stdout;
+
+-- try to copy column with no privileges (should fail)
+COPY rls_t1 (c) TO stdout;
+
+-- subset of columns (should succeed)
+COPY rls_t1 (a) TO stdout;
+COPY rls_t1 (a, b) TO stdout;
+
+RESET SESSION AUTHORIZATION;
+
 DROP TABLE forcetest;
 DROP TABLE vistest;
 DROP FUNCTION truncate_in_subxact();
 DROP TABLE x, y;
+DROP TABLE rls_t1 CASCADE;
+DROP ROLE regress_rls_copy_user;
+DROP ROLE regress_rls_copy_user_colperms;
 DROP FUNCTION fn_x_before();
 DROP FUNCTION fn_x_after();
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/create_index.sql postgresql-9.5-9.5.8/src/test/regress/sql/create_index.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/create_index.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/create_index.sql	2017-08-07 21:13:41.000000000 +0000
@@ -972,7 +972,7 @@
 WHERE thousand < 2 AND tenthous IN (1001,3000)
 ORDER BY thousand;
 
-RESET enable_indexscan;
+RESET enable_indexonlyscan;
 
 --
 -- Check elimination of constant-NULL subexpressions
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/create_type.sql postgresql-9.5-9.5.8/src/test/regress/sql/create_type.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/create_type.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/create_type.sql	2017-08-07 21:13:41.000000000 +0000
@@ -115,6 +115,17 @@
     ELEMENT = int,
     INTERNALLENGTH = 32);
 
+-- Check dependency transfer of opaque functions when creating a new type
+CREATE FUNCTION base_fn_in(cstring) RETURNS opaque AS 'boolin'
+    LANGUAGE internal IMMUTABLE STRICT;
+CREATE FUNCTION base_fn_out(opaque) RETURNS opaque AS 'boolout'
+    LANGUAGE internal IMMUTABLE STRICT;
+CREATE TYPE base_type(INPUT = base_fn_in, OUTPUT = base_fn_out);
+DROP FUNCTION base_fn_in(cstring); -- error
+DROP FUNCTION base_fn_out(opaque); -- error
+DROP TYPE base_type; -- error
+DROP TYPE base_type CASCADE;
+
 -- Check usage of typmod with a user-defined type
 -- (we have borrowed numeric's typmod functions)
 
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/create_view.sql postgresql-9.5-9.5.8/src/test/regress/sql/create_view.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/create_view.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/create_view.sql	2017-08-07 21:13:41.000000000 +0000
@@ -224,6 +224,19 @@
                      'mysecview3'::regclass, 'mysecview4'::regclass)
        ORDER BY relname;
 
+-- This test checks that proper typmods are assigned in a multi-row VALUES
+
+CREATE VIEW tt1 AS
+  SELECT * FROM (
+    VALUES
+       ('abc'::varchar(3), '0123456789', 42, 'abcd'::varchar(4)),
+       ('0123456789', 'abc'::varchar(3), 42.12, 'abc'::varchar(4))
+  ) vv(a,b,c,d);
+\d+ tt1
+SELECT * FROM tt1;
+SELECT a::varchar(3) FROM tt1;
+DROP VIEW tt1;
+
 -- Test view decompilation in the face of relation renaming conflicts
 
 CREATE TABLE tt1 (f1 int, f2 int, f3 text);
@@ -496,6 +509,49 @@
 select pg_get_viewdef('tt18v', true);
 explain (costs off) select * from tt18v;
 
+-- check display of ScalarArrayOp with a sub-select
+
+select 'foo'::text = any(array['abc','def','foo']::text[]);
+select 'foo'::text = any((select array['abc','def','foo']::text[]));  -- fail
+select 'foo'::text = any((select array['abc','def','foo']::text[])::text[]);
+
+create view tt19v as
+select 'foo'::text = any(array['abc','def','foo']::text[]) c1,
+       'foo'::text = any((select array['abc','def','foo']::text[])::text[]) c2;
+select pg_get_viewdef('tt19v', true);
+
+-- check display of assorted RTE_FUNCTION expressions
+
+create view tt20v as
+select * from
+  coalesce(1,2) as c,
+  collation for ('x'::text) col,
+  current_date as d,
+  cast(1+2 as int4) as i4,
+  cast(1+2 as int8) as i8;
+select pg_get_viewdef('tt20v', true);
+
+-- corner cases with empty join conditions
+
+create view tt21v as
+select * from tt5 natural inner join tt6;
+select pg_get_viewdef('tt21v', true);
+
+create view tt22v as
+select * from tt5 natural left join tt6;
+select pg_get_viewdef('tt22v', true);
+
+-- check handling of views with immediately-renamed columns
+
+create view tt23v (col_a, col_b) as
+select q1 as other_name1, q2 as other_name2 from int8_tbl
+union
+select 42, 43;
+
+select pg_get_viewdef('tt23v', true);
+select pg_get_ruledef(oid, true) from pg_rewrite
+  where ev_class = 'tt23v'::regclass and ev_type = '1';
+
 -- clean up all the random objects we made above
 set client_min_messages = warning;
 DROP SCHEMA temp_view_test CASCADE;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/domain.sql postgresql-9.5-9.5.8/src/test/regress/sql/domain.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/domain.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/domain.sql	2017-08-07 21:13:41.000000000 +0000
@@ -85,6 +85,7 @@
 INSERT INTO domarrtest values ('{2,2}', '{{"a"},{"c"}}');
 INSERT INTO domarrtest values (NULL, '{{"a","b","c"},{"d","e","f"}}');
 INSERT INTO domarrtest values (NULL, '{{"toolong","b","c"},{"d","e","f"}}');
+INSERT INTO domarrtest (testint4arr[1], testint4arr[3]) values (11,22);
 select * from domarrtest;
 select testint4arr[1], testchar4arr[2:2] from domarrtest;
 select array_dims(testint4arr), array_dims(testchar4arr) from domarrtest;
@@ -100,6 +101,13 @@
 
 select * from domarrtest;
 
+update domarrtest set
+  testint4arr[1] = testint4arr[1] + 1,
+  testint4arr[3] = testint4arr[3] - 1
+where testchar4arr is null;
+
+select * from domarrtest where testchar4arr is null;
+
 drop table domarrtest;
 drop domain domainint4arr restrict;
 drop domain domainchar4arr restrict;
@@ -111,6 +119,55 @@
 select pg_typeof('{1,2,3}'::dia || 42); -- should be int[] not dia
 drop domain dia;
 
+
+-- Test domains over arrays of composite
+
+create type comptype as (r float8, i float8);
+create domain dcomptypea as comptype[];
+create table dcomptable (d1 dcomptypea unique);
+
+insert into dcomptable values (array[row(1,2)]::dcomptypea);
+insert into dcomptable values (array[row(3,4), row(5,6)]::comptype[]);
+insert into dcomptable values (array[row(7,8)::comptype, row(9,10)::comptype]);
+insert into dcomptable values (array[row(1,2)]::dcomptypea);  -- fail on uniqueness
+insert into dcomptable (d1[1]) values(row(9,10));
+insert into dcomptable (d1[1].r) values(11);
+
+select * from dcomptable;
+select d1[2], d1[1].r, d1[1].i from dcomptable;
+update dcomptable set d1[2] = row(d1[2].i, d1[2].r);
+select * from dcomptable;
+update dcomptable set d1[1].r = d1[1].r + 1 where d1[1].i > 0;
+select * from dcomptable;
+
+alter domain dcomptypea add constraint c1 check (value[1].r <= value[1].i);
+alter domain dcomptypea add constraint c2 check (value[1].r > value[1].i);  -- fail
+
+select array[row(2,1)]::dcomptypea;  -- fail
+insert into dcomptable values (array[row(1,2)]::comptype[]);
+insert into dcomptable values (array[row(2,1)]::comptype[]);  -- fail
+insert into dcomptable (d1[1].r) values(99);
+insert into dcomptable (d1[1].r, d1[1].i) values(99, 100);
+insert into dcomptable (d1[1].r, d1[1].i) values(100, 99);  -- fail
+update dcomptable set d1[1].r = d1[1].r + 1 where d1[1].i > 0;  -- fail
+update dcomptable set d1[1].r = d1[1].r - 1, d1[1].i = d1[1].i + 1
+  where d1[1].i > 0;
+select * from dcomptable;
+
+explain (verbose, costs off)
+  update dcomptable set d1[1].r = d1[1].r - 1, d1[1].i = d1[1].i + 1
+    where d1[1].i > 0;
+create rule silly as on delete to dcomptable do instead
+  update dcomptable set d1[1].r = d1[1].r - 1, d1[1].i = d1[1].i + 1
+    where d1[1].i > 0;
+\d+ dcomptable
+
+drop table dcomptable;
+drop type comptype cascade;
+
+
+-- Test not-null restrictions
+
 create domain dnotnull varchar(15) NOT NULL;
 create domain dnull    varchar(15);
 create domain dcheck   varchar(15) NOT NULL CHECK (VALUE = 'a' OR VALUE = 'c' OR VALUE = 'd');
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/foreign_data.sql postgresql-9.5-9.5.8/src/test/regress/sql/foreign_data.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/foreign_data.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/foreign_data.sql	2017-08-07 21:13:41.000000000 +0000
@@ -481,7 +481,10 @@
 ALTER SERVER s9 VERSION '1.1';
 GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;
 CREATE USER MAPPING FOR current_user SERVER s9;
+-- We use terse mode to avoid ordering issues in cascade detail output.
+\set VERBOSITY terse
 DROP SERVER s9 CASCADE;
+\set VERBOSITY default
 RESET ROLE;
 CREATE SERVER s9 FOREIGN DATA WRAPPER foo;
 GRANT USAGE ON FOREIGN SERVER s9 TO unprivileged_role;
@@ -490,7 +493,24 @@
 GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;          -- WARNING
 CREATE USER MAPPING FOR current_user SERVER s9;
 DROP SERVER s9 CASCADE;                                         -- ERROR
+
+-- Check visibility of user mapping data
+SET ROLE regress_test_role;
+CREATE SERVER s10 FOREIGN DATA WRAPPER foo;
+CREATE USER MAPPING FOR public SERVER s10 OPTIONS (user 'secret');
+CREATE USER MAPPING FOR unprivileged_role SERVER s10 OPTIONS (user 'secret');
+-- owner of server can see some option fields
+\deu+
 RESET ROLE;
+-- superuser can see all option fields
+\deu+
+-- unprivileged user cannot see any option field
+SET ROLE unprivileged_role;
+\deu+
+RESET ROLE;
+\set VERBOSITY terse
+DROP SERVER s10 CASCADE;
+\set VERBOSITY default
 
 -- Triggers
 CREATE FUNCTION dummy_trigger() RETURNS TRIGGER AS $$
@@ -614,8 +634,10 @@
 -- child does not inherit NO INHERIT constraints
 \d+ pt1
 \d+ ft2
+\set VERBOSITY terse
 DROP FOREIGN TABLE ft2; -- ERROR
 DROP FOREIGN TABLE ft2 CASCADE;
+\set VERBOSITY default
 CREATE FOREIGN TABLE ft2 (
 	c1 integer NOT NULL,
 	c2 text,
@@ -689,12 +711,10 @@
 DROP ROLE regress_test_role;                                -- ERROR
 DROP SERVER t1 CASCADE;
 DROP USER MAPPING FOR regress_test_role SERVER s6;
--- This test causes some order dependent cascade detail output,
--- so switch to terse mode for it.
 \set VERBOSITY terse
 DROP FOREIGN DATA WRAPPER foo CASCADE;
-\set VERBOSITY default
 DROP SERVER s8 CASCADE;
+\set VERBOSITY default
 DROP ROLE regress_test_indirect;
 DROP ROLE regress_test_role;
 DROP ROLE unprivileged_role;                                -- ERROR
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/foreign_key.sql postgresql-9.5-9.5.8/src/test/regress/sql/foreign_key.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/foreign_key.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/foreign_key.sql	2017-08-07 21:13:41.000000000 +0000
@@ -1009,3 +1009,39 @@
 insert into cc values(13);
 update pp set f1=f1+1; -- fail
 drop table pp, cc;
+
+--
+-- Test deferred FK check on a tuple deleted by a rolled-back subtransaction
+--
+create table pktable2(f1 int primary key);
+create table fktable2(f1 int references pktable2 deferrable initially deferred);
+insert into pktable2 values(1);
+
+begin;
+insert into fktable2 values(1);
+savepoint x;
+delete from fktable2;
+rollback to x;
+commit;
+
+begin;
+insert into fktable2 values(2);
+savepoint x;
+delete from fktable2;
+rollback to x;
+commit; -- fail
+
+--
+-- Test that we prevent dropping FK constraint with pending trigger events
+--
+begin;
+insert into fktable2 values(2);
+alter table fktable2 drop constraint fktable2_f1_fkey;
+commit;
+
+begin;
+delete from pktable2 where f1 = 1;
+alter table fktable2 drop constraint fktable2_f1_fkey;
+commit;
+
+drop table pktable2, fktable2;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/gist.sql postgresql-9.5-9.5.8/src/test/regress/sql/gist.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/gist.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/gist.sql	2017-08-07 21:13:41.000000000 +0000
@@ -69,6 +69,22 @@
 select p from gist_tbl where p <@ box(point(0,0), point(0.5, 0.5))
 order by point(0.101, 0.101) <-> p;
 
+-- Check case with multiple rescans (bug #14641)
+explain (costs off)
+select p from
+  (values (box(point(0,0), point(0.5,0.5))),
+          (box(point(0.5,0.5), point(0.75,0.75))),
+          (box(point(0.8,0.8), point(1.0,1.0)))) as v(bb)
+cross join lateral
+  (select p from gist_tbl where p <@ bb order by p <-> bb[0] limit 2) ss;
+
+select p from
+  (values (box(point(0,0), point(0.5,0.5))),
+          (box(point(0.5,0.5), point(0.75,0.75))),
+          (box(point(0.8,0.8), point(1.0,1.0)))) as v(bb)
+cross join lateral
+  (select p from gist_tbl where p <@ bb order by p <-> bb[0] limit 2) ss;
+
 drop index gist_tbl_point_index;
 
 -- Test index-only scan with box opclass
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/groupingsets.sql postgresql-9.5-9.5.8/src/test/regress/sql/groupingsets.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/groupingsets.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/groupingsets.sql	2017-08-07 21:13:41.000000000 +0000
@@ -224,4 +224,8 @@
 select sum(ten) from onek group by two, rollup(four::text) order by 1;
 select sum(ten) from onek group by rollup(four::text), two order by 1;
 
+-- Check for sensible failure on unsortable data
+select usort, grouping(usort), count(*) from (values ('1'::xid),('2'::xid),('1'::xid)) v(usort) group by rollup(usort);
+select id, usort, grouping(id,usort), count(*) from (values (1,'1'::xid),(1,'2'::xid),(2,'1'::xid)) v(id,usort) group by grouping sets ((id), (usort));
+
 -- end
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/indirect_toast.sql postgresql-9.5-9.5.8/src/test/regress/sql/indirect_toast.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/indirect_toast.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/indirect_toast.sql	2017-08-07 21:13:41.000000000 +0000
@@ -11,7 +11,7 @@
 -- modification without changing varlenas
 UPDATE toasttest SET cnt = cnt +1 RETURNING substring(toasttest::text, 1, 200);
 
--- modification without modifying asigned value
+-- modification without modifying assigned value
 UPDATE toasttest SET cnt = cnt +1, f1 = f1 RETURNING substring(toasttest::text, 1, 200);
 
 -- modification modifying, but effectively not changing
@@ -20,7 +20,7 @@
 UPDATE toasttest SET cnt = cnt +1, f1 = '-'||f1||'-' RETURNING substring(toasttest::text, 1, 200);
 
 SELECT substring(toasttest::text, 1, 200) FROM toasttest;
--- check we didn't screw with main/toast tuple visiblity
+-- check we didn't screw with main/toast tuple visibility
 VACUUM FREEZE toasttest;
 SELECT substring(toasttest::text, 1, 200) FROM toasttest;
 
@@ -42,7 +42,7 @@
 -- modification without changing varlenas
 UPDATE toasttest SET cnt = cnt +1 RETURNING substring(toasttest::text, 1, 200);
 
--- modification without modifying asigned value
+-- modification without modifying assigned value
 UPDATE toasttest SET cnt = cnt +1, f1 = f1 RETURNING substring(toasttest::text, 1, 200);
 
 -- modification modifying, but effectively not changing
@@ -53,7 +53,7 @@
 INSERT INTO toasttest(descr, f1, f2) VALUES('one-toasted,one-null, via indirect', repeat('1234567890',30000), NULL);
 
 SELECT substring(toasttest::text, 1, 200) FROM toasttest;
--- check we didn't screw with main/toast tuple visiblity
+-- check we didn't screw with main/toast tuple visibility
 VACUUM FREEZE toasttest;
 SELECT substring(toasttest::text, 1, 200) FROM toasttest;
 
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/inherit.sql postgresql-9.5-9.5.8/src/test/regress/sql/inherit.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/inherit.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/inherit.sql	2017-08-07 21:13:41.000000000 +0000
@@ -145,6 +145,32 @@
 alter table a alter column aa type integer using bit_length(aa);
 select * from d;
 
+-- check that oid column is handled properly during alter table inherit
+create table oid_parent (a int) with oids;
+
+create table oid_child () inherits (oid_parent);
+select attinhcount, attislocal from pg_attribute
+  where attrelid = 'oid_child'::regclass and attname = 'oid';
+drop table oid_child;
+
+create table oid_child (a int) without oids;
+alter table oid_child inherit oid_parent;  -- fail
+alter table oid_child set with oids;
+select attinhcount, attislocal from pg_attribute
+  where attrelid = 'oid_child'::regclass and attname = 'oid';
+alter table oid_child inherit oid_parent;
+select attinhcount, attislocal from pg_attribute
+  where attrelid = 'oid_child'::regclass and attname = 'oid';
+alter table oid_child set without oids;  -- fail
+alter table oid_parent set without oids;
+select attinhcount, attislocal from pg_attribute
+  where attrelid = 'oid_child'::regclass and attname = 'oid';
+alter table oid_child set without oids;
+select attinhcount, attislocal from pg_attribute
+  where attrelid = 'oid_child'::regclass and attname = 'oid';
+
+drop table oid_parent cascade;
+
 -- Test non-inheritable parent constraints
 create table p1(ff1 int);
 alter table p1 add constraint p1chk check (ff1 > 0) no inherit;
@@ -157,6 +183,9 @@
 \d p1
 \d c1
 
+-- Test that child does not override inheritable constraints of the parent
+create table c2 (constraint p2chk check (ff1 > 10) no inherit) inherits (p1);	--fails
+
 drop table p1 cascade;
 
 -- Tests for casting between the rowtypes of parent and child
@@ -334,6 +363,45 @@
 DROP TABLE test_foreign_constraints;
 DROP TABLE test_primary_constraints;
 
+-- Test that parent and child CHECK constraints can be created in either order
+create table p1(f1 int);
+create table p1_c1() inherits(p1);
+
+alter table p1 add constraint inh_check_constraint1 check (f1 > 0);
+alter table p1_c1 add constraint inh_check_constraint1 check (f1 > 0);
+
+alter table p1_c1 add constraint inh_check_constraint2 check (f1 < 10);
+alter table p1 add constraint inh_check_constraint2 check (f1 < 10);
+
+select conrelid::regclass::text as relname, conname, conislocal, coninhcount
+from pg_constraint where conname like 'inh\_check\_constraint%'
+order by 1, 2;
+
+drop table p1 cascade;
+
+-- Test that a valid child can have not-valid parent, but not vice versa
+create table invalid_check_con(f1 int);
+create table invalid_check_con_child() inherits(invalid_check_con);
+
+alter table invalid_check_con_child add constraint inh_check_constraint check(f1 > 0) not valid;
+alter table invalid_check_con add constraint inh_check_constraint check(f1 > 0); -- fail
+alter table invalid_check_con_child drop constraint inh_check_constraint;
+
+insert into invalid_check_con values(0);
+
+alter table invalid_check_con_child add constraint inh_check_constraint check(f1 > 0);
+alter table invalid_check_con add constraint inh_check_constraint check(f1 > 0) not valid;
+
+insert into invalid_check_con values(0); -- fail
+insert into invalid_check_con_child values(0); -- fail
+
+select conrelid::regclass::text as relname, conname,
+       convalidated, conislocal, coninhcount, connoinherit
+from pg_constraint where conname like 'inh\_check\_constraint%'
+order by 1, 2;
+
+-- We don't drop the invalid_check_con* tables, to test dump/reload with
+
 --
 -- Test parameterized append plans for inheritance trees
 --
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/insert_conflict.sql postgresql-9.5-9.5.8/src/test/regress/sql/insert_conflict.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/insert_conflict.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/insert_conflict.sql	2017-08-07 21:13:41.000000000 +0000
@@ -138,7 +138,7 @@
 drop index comp_key_index;
 
 --
--- Partial index tests, no inference predicate specificied
+-- Partial index tests, no inference predicate specified
 --
 create unique index part_comp_key_index on insertconflicttest(key, fruit) where key < 5;
 create unique index expr_part_comp_key_index on insertconflicttest(key, lower(fruit)) where key < 5;
@@ -261,6 +261,46 @@
 insert into syscolconflicttest values (1) on conflict (key) do update set data = excluded.oid::text;
 drop table syscolconflicttest;
 
+--
+-- Previous tests all managed to not test any expressions requiring
+-- planner preprocessing ...
+--
+create table insertconflict (a bigint, b bigint);
+
+create unique index insertconflicti1 on insertconflict(coalesce(a, 0));
+
+create unique index insertconflicti2 on insertconflict(b)
+  where coalesce(a, 1) > 0;
+
+insert into insertconflict values (1, 2)
+on conflict (coalesce(a, 0)) do nothing;
+
+insert into insertconflict values (1, 2)
+on conflict (b) where coalesce(a, 1) > 0 do nothing;
+
+insert into insertconflict values (1, 2)
+on conflict (b) where coalesce(a, 1) > 1 do nothing;
+
+drop table insertconflict;
+
+--
+-- test insertion through view
+--
+
+create table insertconflict (f1 int primary key, f2 text);
+create view insertconflictv as
+  select * from insertconflict with cascaded check option;
+
+insert into insertconflictv values (1,'foo')
+  on conflict (f1) do update set f2 = excluded.f2;
+select * from insertconflict;
+insert into insertconflictv values (1,'bar')
+  on conflict (f1) do update set f2 = excluded.f2;
+select * from insertconflict;
+
+drop view insertconflictv;
+drop table insertconflict;
+
 
 -- ******************************************************************
 -- *                                                                *
@@ -385,3 +425,49 @@
 ;
 
 DROP TABLE dropcol;
+
+-- check handling of regular btree constraint along with gist constraint
+
+create table twoconstraints (f1 int unique, f2 box,
+                             exclude using gist(f2 with &&));
+insert into twoconstraints values(1, '((0,0),(1,1))');
+insert into twoconstraints values(1, '((2,2),(3,3))');  -- fail on f1
+insert into twoconstraints values(2, '((0,0),(1,2))');  -- fail on f2
+insert into twoconstraints values(2, '((0,0),(1,2))')
+  on conflict on constraint twoconstraints_f1_key do nothing;  -- fail on f2
+insert into twoconstraints values(2, '((0,0),(1,2))')
+  on conflict on constraint twoconstraints_f2_excl do nothing;  -- do nothing
+select * from twoconstraints;
+drop table twoconstraints;
+
+-- check handling of self-conflicts at various isolation levels
+
+create table selfconflict (f1 int primary key, f2 int);
+
+begin transaction isolation level read committed;
+insert into selfconflict values (1,1), (1,2) on conflict do nothing;
+commit;
+
+begin transaction isolation level repeatable read;
+insert into selfconflict values (2,1), (2,2) on conflict do nothing;
+commit;
+
+begin transaction isolation level serializable;
+insert into selfconflict values (3,1), (3,2) on conflict do nothing;
+commit;
+
+begin transaction isolation level read committed;
+insert into selfconflict values (4,1), (4,2) on conflict(f1) do update set f2 = 0;
+commit;
+
+begin transaction isolation level repeatable read;
+insert into selfconflict values (5,1), (5,2) on conflict(f1) do update set f2 = 0;
+commit;
+
+begin transaction isolation level serializable;
+insert into selfconflict values (6,1), (6,2) on conflict(f1) do update set f2 = 0;
+commit;
+
+select * from selfconflict;
+
+drop table selfconflict;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/interval.sql postgresql-9.5-9.5.8/src/test/regress/sql/interval.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/interval.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/interval.sql	2017-08-07 21:13:41.000000000 +0000
@@ -59,6 +59,33 @@
    WHERE r1.f1 > r2.f1
    ORDER BY r1.f1, r2.f1;
 
+-- Test intervals that are large enough to overflow 64 bits in comparisons
+CREATE TEMP TABLE INTERVAL_TBL_OF (f1 interval);
+INSERT INTO INTERVAL_TBL_OF (f1) VALUES
+  ('2147483647 days 2147483647 months'),
+  ('2147483647 days -2147483648 months'),
+  ('1 year'),
+  ('-2147483648 days 2147483647 months'),
+  ('-2147483648 days -2147483648 months');
+-- these should fail as out-of-range
+INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('2147483648 days');
+INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('-2147483649 days');
+INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('2147483647 years');
+INSERT INTO INTERVAL_TBL_OF (f1) VALUES ('-2147483648 years');
+
+SELECT r1.*, r2.*
+   FROM INTERVAL_TBL_OF r1, INTERVAL_TBL_OF r2
+   WHERE r1.f1 > r2.f1
+   ORDER BY r1.f1, r2.f1;
+
+CREATE INDEX ON INTERVAL_TBL_OF USING btree (f1);
+SET enable_seqscan TO false;
+EXPLAIN (COSTS OFF)
+SELECT f1 FROM INTERVAL_TBL_OF r1 ORDER BY f1;
+SELECT f1 FROM INTERVAL_TBL_OF r1 ORDER BY f1;
+RESET enable_seqscan;
+
+DROP TABLE INTERVAL_TBL_OF;
 
 -- Test multiplication and division with intervals.
 -- Floating point arithmetic rounding errors can lead to unexpected results,
@@ -196,6 +223,11 @@
 SELECT interval '1 2:03.5678' minute to second(2);
 SELECT interval '1 2:03:04.5678' minute to second(2);
 
+-- test casting to restricted precision (bug #14479)
+SELECT f1, f1::INTERVAL DAY TO MINUTE AS "minutes",
+  (f1 + INTERVAL '1 month')::INTERVAL MONTH::INTERVAL YEAR AS "years"
+  FROM interval_tbl;
+
 -- test inputting and outputting SQL standard interval literals
 SET IntervalStyle TO sql_standard;
 SELECT  interval '0'                       AS "zero",
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/join.sql postgresql-9.5-9.5.8/src/test/regress/sql/join.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/join.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/join.sql	2017-08-07 21:13:41.000000000 +0000
@@ -391,6 +391,23 @@
   tenk1 t5
 where t4.thousand = t5.unique1 and ss.x1 = t4.tenthous and ss.x2 = t5.stringu1;
 
+--
+-- regression test: check a case where we formerly missed including an EC
+-- enforcement clause because it was expected to be handled at scan level
+--
+explain (costs off)
+select a.f1, b.f1, t.thousand, t.tenthous from
+  tenk1 t,
+  (select sum(f1)+1 as f1 from int4_tbl i4a) a,
+  (select sum(f1) as f1 from int4_tbl i4b) b
+where b.f1 = t.thousand and a.f1 = b.f1 and (a.f1+b.f1+999) = t.tenthous;
+
+select a.f1, b.f1, t.thousand, t.tenthous from
+  tenk1 t,
+  (select sum(f1)+1 as f1 from int4_tbl i4a) a,
+  (select sum(f1) as f1 from int4_tbl i4b) b
+where b.f1 = t.thousand and a.f1 = b.f1 and (a.f1+b.f1+999) = t.tenthous;
+
 
 --
 -- Clean up
@@ -1210,6 +1227,23 @@
 where ss1.c2 = 0;
 
 --
+-- test successful handling of full join underneath left join (bug #14105)
+--
+
+explain (costs off)
+select * from
+  (select 1 as id) as xx
+  left join
+    (tenk1 as a1 full join (select 1 as id) as yy on (a1.unique1 = yy.id))
+  on (xx.id = coalesce(yy.id));
+
+select * from
+  (select 1 as id) as xx
+  left join
+    (tenk1 as a1 full join (select 1 as id) as yy on (a1.unique1 = yy.id))
+  on (xx.id = coalesce(yy.id));
+
+--
 -- test ability to push constants through outer join clauses
 --
 
@@ -1420,7 +1454,7 @@
 --
 
 select t1.uunique1 from
-  tenk1 t1 join tenk2 t2 on t1.two = t2.two; -- error, prefer "t1" suggestipn
+  tenk1 t1 join tenk2 t2 on t1.two = t2.two; -- error, prefer "t1" suggestion
 select t2.uunique1 from
   tenk1 t1 join tenk2 t2 on t1.two = t2.two; -- error, prefer "t2" suggestion
 select uunique1 from
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/matview.sql postgresql-9.5-9.5.8/src/test/regress/sql/matview.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/matview.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/matview.sql	2017-08-07 21:13:41.000000000 +0000
@@ -92,7 +92,7 @@
 -- test diemv when the mv does not exist
 DROP MATERIALIZED VIEW IF EXISTS no_such_mv;
 
--- make sure invalid comination of options is prohibited
+-- make sure invalid combination of options is prohibited
 REFRESH MATERIALIZED VIEW CONCURRENTLY tvmm WITH NO DATA;
 
 -- no tuple locks on materialized views
@@ -122,18 +122,6 @@
 
 DROP VIEW v_test1 CASCADE;
 
--- test that vacuum does not make empty matview look unpopulated
-CREATE TABLE hoge (i int);
-INSERT INTO hoge VALUES (generate_series(1,100000));
-CREATE MATERIALIZED VIEW hogeview AS SELECT * FROM hoge WHERE i % 2 = 0;
-CREATE INDEX hogeviewidx ON hogeview (i);
-DELETE FROM hoge;
-REFRESH MATERIALIZED VIEW hogeview;
-SELECT * FROM hogeview WHERE i < 10;
-VACUUM ANALYZE hogeview;
-SELECT * FROM hogeview WHERE i < 10;
-DROP TABLE hoge CASCADE;
-
 -- test that duplicate values on unique index prevent refresh
 CREATE TABLE foo(a, b) AS VALUES(1, 10);
 CREATE MATERIALIZED VIEW mv AS SELECT * FROM foo;
@@ -175,17 +163,34 @@
 DROP TABLE boxes CASCADE;
 
 -- make sure that column names are handled correctly
-CREATE TABLE v (i int, j int);
-CREATE MATERIALIZED VIEW mv_v (ii) AS SELECT i, j AS jj FROM v;
-ALTER TABLE v RENAME COLUMN i TO x;
-INSERT INTO v values (1, 2);
-CREATE UNIQUE INDEX mv_v_ii ON mv_v (ii);
-REFRESH MATERIALIZED VIEW mv_v;
-UPDATE v SET j = 3 WHERE x = 1;
-REFRESH MATERIALIZED VIEW CONCURRENTLY mv_v;
-SELECT * FROM v;
-SELECT * FROM mv_v;
-DROP TABLE v CASCADE;
+CREATE TABLE mvtest_v (i int, j int);
+CREATE MATERIALIZED VIEW mvtest_mv_v (ii, jj, kk) AS SELECT i, j FROM mvtest_v; -- error
+CREATE MATERIALIZED VIEW mvtest_mv_v (ii, jj) AS SELECT i, j FROM mvtest_v; -- ok
+CREATE MATERIALIZED VIEW mvtest_mv_v_2 (ii) AS SELECT i, j FROM mvtest_v; -- ok
+CREATE MATERIALIZED VIEW mvtest_mv_v_3 (ii, jj, kk) AS SELECT i, j FROM mvtest_v WITH NO DATA; -- error
+CREATE MATERIALIZED VIEW mvtest_mv_v_3 (ii, jj) AS SELECT i, j FROM mvtest_v WITH NO DATA; -- ok
+CREATE MATERIALIZED VIEW mvtest_mv_v_4 (ii) AS SELECT i, j FROM mvtest_v WITH NO DATA; -- ok
+ALTER TABLE mvtest_v RENAME COLUMN i TO x;
+INSERT INTO mvtest_v values (1, 2);
+CREATE UNIQUE INDEX mvtest_mv_v_ii ON mvtest_mv_v (ii);
+REFRESH MATERIALIZED VIEW mvtest_mv_v;
+UPDATE mvtest_v SET j = 3 WHERE x = 1;
+REFRESH MATERIALIZED VIEW CONCURRENTLY mvtest_mv_v;
+REFRESH MATERIALIZED VIEW mvtest_mv_v_2;
+REFRESH MATERIALIZED VIEW mvtest_mv_v_3;
+REFRESH MATERIALIZED VIEW mvtest_mv_v_4;
+SELECT * FROM mvtest_v;
+SELECT * FROM mvtest_mv_v;
+SELECT * FROM mvtest_mv_v_2;
+SELECT * FROM mvtest_mv_v_3;
+SELECT * FROM mvtest_mv_v_4;
+DROP TABLE mvtest_v CASCADE;
+
+-- make sure that create WITH NO DATA does not plan the query (bug #13907)
+create materialized view mvtest_error as select 1/0 as x;  -- fail
+create materialized view mvtest_error as select 1/0 as x with no data;
+refresh materialized view mvtest_error;  -- fail here
+drop materialized view mvtest_error;
 
 -- make sure that matview rows can be referenced as source rows (bug #9398)
 CREATE TABLE v AS SELECT generate_series(1,10) AS a;
@@ -209,3 +214,17 @@
 REFRESH MATERIALIZED VIEW CONCURRENTLY mv_foo;
 DROP OWNED BY user_dw CASCADE;
 DROP ROLE user_dw;
+
+-- make sure that create WITH NO DATA works via SPI
+BEGIN;
+CREATE FUNCTION mvtest_func()
+  RETURNS void AS $$
+BEGIN
+  CREATE MATERIALIZED VIEW mvtest1 AS SELECT 1 AS x;
+  CREATE MATERIALIZED VIEW mvtest2 AS SELECT 1 AS x WITH NO DATA;
+END;
+$$ LANGUAGE plpgsql;
+SELECT mvtest_func();
+SELECT * FROM mvtest1;
+SELECT * FROM mvtest2;
+ROLLBACK;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/money.sql postgresql-9.5-9.5.8/src/test/regress/sql/money.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/money.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/money.sql	2017-08-07 21:13:41.000000000 +0000
@@ -57,6 +57,16 @@
 INSERT INTO money_data VALUES ('$123.459');
 SELECT * FROM money_data;
 
+-- rounding vs. truncation in division
+SELECT '878.08'::money / 11::float8;
+SELECT '878.08'::money / 11::float4;
+SELECT '878.08'::money / 11::int;
+SELECT '878.08'::money / 11::smallint;
+
+-- check for precision loss in division
+SELECT '90000000000000099.00'::money / 10::int;
+SELECT '90000000000000099.00'::money / 10::smallint;
+
 -- Cast int4/int8 to money
 SELECT 1234567890::money;
 SELECT 12345678901234567::money;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/object_address.sql postgresql-9.5-9.5.8/src/test/regress/sql/object_address.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/object_address.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/object_address.sql	2017-08-07 21:13:41.000000000 +0000
@@ -62,6 +62,12 @@
 END;
 $$;
 
+-- miscellaneous other errors
+select * from pg_get_object_address('operator of access method', '{btree,integer_ops,1}', '{int4,bool}');
+select * from pg_get_object_address('operator of access method', '{btree,integer_ops,99}', '{int4,int4}');
+select * from pg_get_object_address('function of access method', '{btree,integer_ops,1}', '{int4,bool}');
+select * from pg_get_object_address('function of access method', '{btree,integer_ops,99}', '{int4,int4}');
+
 DO $$
 DECLARE
 	objtype text;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/plpgsql.sql postgresql-9.5-9.5.8/src/test/regress/sql/plpgsql.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/plpgsql.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/plpgsql.sql	2017-08-07 21:13:41.000000000 +0000
@@ -1350,7 +1350,7 @@
 
 --
 -- Install the central phone system and create the phone numbers.
--- They are weired on insert to the patchfields. Again the
+-- They are wired on insert to the patchfields. Again the
 -- triggers automatically tell the PSlots to update their
 -- backlink field.
 --
@@ -4199,7 +4199,49 @@
 drop function arrayassign1();
 drop function testoa(x1 int, x2 int, x3 int);
 
--- access to call stack
+
+--
+-- Test handling of expanded arrays
+--
+
+create function returns_rw_array(int) returns int[]
+language plpgsql as $$
+  declare r int[];
+  begin r := array[$1, $1]; return r; end;
+$$ stable;
+
+create function consumes_rw_array(int[]) returns int
+language plpgsql as $$
+  begin return $1[1]; end;
+$$ stable;
+
+-- bug #14174
+explain (verbose, costs off)
+select i, a from
+  (select returns_rw_array(1) as a offset 0) ss,
+  lateral consumes_rw_array(a) i;
+
+select i, a from
+  (select returns_rw_array(1) as a offset 0) ss,
+  lateral consumes_rw_array(a) i;
+
+explain (verbose, costs off)
+select consumes_rw_array(a), a from returns_rw_array(1) a;
+
+select consumes_rw_array(a), a from returns_rw_array(1) a;
+
+explain (verbose, costs off)
+select consumes_rw_array(a), a from
+  (values (returns_rw_array(1)), (returns_rw_array(2))) v(a);
+
+select consumes_rw_array(a), a from
+  (values (returns_rw_array(1)), (returns_rw_array(2))) v(a);
+
+
+--
+-- Test access to call stack
+--
+
 create function inner_func(int)
 returns int as $$
 declare _context text;
@@ -4348,3 +4390,48 @@
   null; -- do nothing
 end;
 $$;
+
+-- Test use of plpgsql in a domain check constraint (cf. bug #14414)
+
+create function plpgsql_domain_check(val int) returns boolean as $$
+begin return val > 0; end
+$$ language plpgsql immutable;
+
+create domain plpgsql_domain as integer check(plpgsql_domain_check(value));
+
+do $$
+declare v_test plpgsql_domain;
+begin
+  v_test := 1;
+end;
+$$;
+
+do $$
+declare v_test plpgsql_domain := 1;
+begin
+  v_test := 0;  -- fail
+end;
+$$;
+
+-- Test handling of expanded array passed to a domain constraint (bug #14472)
+
+create function plpgsql_arr_domain_check(val int[]) returns boolean as $$
+begin return val[1] > 0; end
+$$ language plpgsql immutable;
+
+create domain plpgsql_arr_domain as int[] check(plpgsql_arr_domain_check(value));
+
+do $$
+declare v_test plpgsql_arr_domain;
+begin
+  v_test := array[1];
+  v_test := v_test || 2;
+end;
+$$;
+
+do $$
+declare v_test plpgsql_arr_domain := array[1];
+begin
+  v_test := 0 || v_test;  -- fail
+end;
+$$;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/prepared_xacts.sql postgresql-9.5-9.5.8/src/test/regress/sql/prepared_xacts.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/prepared_xacts.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/prepared_xacts.sql	2017-08-07 21:13:41.000000000 +0000
@@ -123,8 +123,7 @@
 
 -- pxtest3 should be locked because of the pending DROP
 begin;
-set statement_timeout to 2000;
-SELECT * FROM pxtest3;
+lock table pxtest3 in access share mode nowait;
 rollback;
 
 -- Disconnect, we will continue testing in a different backend
@@ -135,8 +134,7 @@
 
 -- pxtest3 should still be locked because of the pending DROP
 begin;
-set statement_timeout to 2000;
-SELECT * FROM pxtest3;
+lock table pxtest3 in access share mode nowait;
 rollback;
 
 -- Commit table creation
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/privileges.sql postgresql-9.5-9.5.8/src/test/regress/sql/privileges.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/privileges.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/privileges.sql	2017-08-07 21:13:41.000000000 +0000
@@ -17,7 +17,7 @@
 DROP ROLE IF EXISTS regressuser5;
 DROP ROLE IF EXISTS regressuser6;
 
-SELECT lo_unlink(oid) FROM pg_largeobject_metadata;
+SELECT lo_unlink(oid) FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
 
 RESET client_min_messages;
 
@@ -127,6 +127,67 @@
 SELECT * FROM atest1; -- ok
 
 
+-- test leaky-function protections in selfuncs
+
+-- regressuser1 will own a table and provide a view for it.
+SET SESSION AUTHORIZATION regressuser1;
+
+CREATE TABLE atest12 as
+  SELECT x AS a, 10001 - x AS b FROM generate_series(1,10000) x;
+CREATE INDEX ON atest12 (a);
+CREATE INDEX ON atest12 (abs(a));
+VACUUM ANALYZE atest12;
+
+CREATE FUNCTION leak(integer,integer) RETURNS boolean
+  AS $$begin return $1 < $2; end$$
+  LANGUAGE plpgsql immutable;
+CREATE OPERATOR <<< (procedure = leak, leftarg = integer, rightarg = integer,
+                     restrict = scalarltsel);
+
+-- view with leaky operator
+CREATE VIEW atest12v AS
+  SELECT * FROM atest12 WHERE b <<< 5;
+GRANT SELECT ON atest12v TO PUBLIC;
+
+-- This plan should use nestloop, knowing that few rows will be selected.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12v x, atest12v y WHERE x.a = y.b;
+
+-- And this one.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12 x, atest12 y
+  WHERE x.a = y.b and abs(y.a) <<< 5;
+
+-- Check if regressuser2 can break security.
+SET SESSION AUTHORIZATION regressuser2;
+
+CREATE FUNCTION leak2(integer,integer) RETURNS boolean
+  AS $$begin raise notice 'leak % %', $1, $2; return $1 > $2; end$$
+  LANGUAGE plpgsql immutable;
+CREATE OPERATOR >>> (procedure = leak2, leftarg = integer, rightarg = integer,
+                     restrict = scalargtsel);
+
+-- This should not show any "leak" notices before failing.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12 WHERE a >>> 0;
+
+-- This plan should use hashjoin, as it will expect many rows to be selected.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12v x, atest12v y WHERE x.a = y.b;
+
+-- Now regressuser1 grants sufficient access to regressuser2.
+SET SESSION AUTHORIZATION regressuser1;
+GRANT SELECT (a, b) ON atest12 TO PUBLIC;
+SET SESSION AUTHORIZATION regressuser2;
+
+-- Now regressuser2 will also get a good row estimate.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12v x, atest12v y WHERE x.a = y.b;
+
+-- But not for this, due to lack of table-wide permissions needed
+-- to make use of the expression index's statistics.
+EXPLAIN (COSTS OFF) SELECT * FROM atest12 x, atest12 y
+  WHERE x.a = y.b and abs(y.a) <<< 5;
+
+-- clean up (regressuser1's objects are all dropped later)
+DROP FUNCTION leak2(integer, integer) CASCADE;
+
+
 -- groups
 
 SET SESSION AUTHORIZATION regressuser3;
@@ -709,6 +770,9 @@
 SELECT lo_create(2001);
 SELECT lo_create(2002);
 
+SELECT loread(lo_open(1001, x'20000'::int), 32);	-- allowed, for now
+SELECT lowrite(lo_open(1001, x'40000'::int), 'abcd');	-- fail, wrong mode
+
 SELECT loread(lo_open(1001, x'40000'::int), 32);
 SELECT loread(lo_open(1002, x'40000'::int), 32);	-- to be denied
 SELECT loread(lo_open(1003, x'40000'::int), 32);
@@ -729,7 +793,7 @@
 
 \c -
 -- confirm ACL setting
-SELECT oid, pg_get_userbyid(lomowner) ownername, lomacl FROM pg_largeobject_metadata;
+SELECT oid, pg_get_userbyid(lomowner) ownername, lomacl FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
 
 SET SESSION AUTHORIZATION regressuser3;
 
@@ -748,6 +812,7 @@
 SELECT loread(lo_open(1002, x'40000'::int), 32);	-- to be denied
 SELECT lowrite(lo_open(1002, x'20000'::int), 'abcd');	-- to be denied
 SELECT lo_truncate(lo_open(1002, x'20000'::int), 10);	-- to be denied
+SELECT lo_put(1002, 1, 'abcd');				-- to be denied
 SELECT lo_unlink(1002);					-- to be denied
 SELECT lo_export(1001, '/dev/null');			-- to be denied
 
@@ -960,7 +1025,7 @@
 DROP TABLE atestp1;
 DROP TABLE atestp2;
 
-SELECT lo_unlink(oid) FROM pg_largeobject_metadata;
+SELECT lo_unlink(oid) FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
 
 DROP GROUP regressgroup1;
 DROP GROUP regressgroup2;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/replica_identity.sql postgresql-9.5-9.5.8/src/test/regress/sql/replica_identity.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/replica_identity.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/replica_identity.sql	2017-08-07 21:13:41.000000000 +0000
@@ -5,12 +5,13 @@
        nonkey text,
        CONSTRAINT test_replica_identity_unique_defer UNIQUE (keya, keyb) DEFERRABLE,
        CONSTRAINT test_replica_identity_unique_nondefer UNIQUE (keya, keyb)
-);
+) WITH OIDS;
 
 CREATE TABLE test_replica_identity_othertable (id serial primary key);
 
 CREATE INDEX test_replica_identity_keyab ON test_replica_identity (keya, keyb);
 CREATE UNIQUE INDEX test_replica_identity_keyab_key ON test_replica_identity (keya, keyb);
+CREATE UNIQUE INDEX test_replica_identity_oid_idx ON test_replica_identity (oid);
 CREATE UNIQUE INDEX test_replica_identity_nonkey ON test_replica_identity (keya, nonkey);
 CREATE INDEX test_replica_identity_hash ON test_replica_identity USING hash (nonkey);
 CREATE UNIQUE INDEX test_replica_identity_expr ON test_replica_identity (keya, keyb, (3));
@@ -52,7 +53,10 @@
 SELECT relreplident FROM pg_class WHERE oid = 'test_replica_identity'::regclass;
 \d test_replica_identity
 
--- succeed, nondeferrable unique constraint over nonullable cols
+-- succeed, oid unique index
+ALTER TABLE test_replica_identity REPLICA IDENTITY USING INDEX test_replica_identity_oid_idx;
+
+-- succeed, nondeferrable unique constraint over nonnullable cols
 ALTER TABLE test_replica_identity REPLICA IDENTITY USING INDEX test_replica_identity_unique_nondefer;
 
 -- succeed unique index over nonnullable cols
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/rolenames.sql postgresql-9.5-9.5.8/src/test/regress/sql/rolenames.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/rolenames.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/rolenames.sql	2017-08-07 21:13:41.000000000 +0000
@@ -171,7 +171,7 @@
 ALTER USER NONE SET application_name to 'BOMB'; -- error
 ALTER USER nonexistent SET application_name to 'BOMB'; -- error
 
--- CREAETE SCHEMA
+-- CREATE SCHEMA
 set client_min_messages to error;
 CREATE SCHEMA newschema1 AUTHORIZATION CURRENT_USER;
 CREATE SCHEMA newschema2 AUTHORIZATION "current_user";
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/rowsecurity.sql postgresql-9.5-9.5.8/src/test/regress/sql/rowsecurity.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/rowsecurity.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/rowsecurity.sql	2017-08-07 21:13:41.000000000 +0000
@@ -200,10 +200,10 @@
 GRANT ALL ON t1 TO public;
 
 COPY t1 FROM stdin WITH (oids);
-101	1	aaa
+101	1	aba
 102	2	bbb
 103	3	ccc
-104	4	ddd
+104	4	dad
 \.
 
 CREATE TABLE t2 (c float) INHERITS (t1);
@@ -635,10 +635,10 @@
     rls_regress_user1, rls_regress_user2;
 
 INSERT INTO z1 VALUES
-    (1, 'aaa'),
+    (1, 'aba'),
     (2, 'bbb'),
     (3, 'ccc'),
-    (4, 'ddd');
+    (4, 'dad');
 
 CREATE POLICY p1 ON z1 TO rls_regress_group1 USING (a % 2 = 0);
 CREATE POLICY p2 ON z1 TO rls_regress_group2 USING (a % 2 = 1);
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/rowtypes.sql postgresql-9.5-9.5.8/src/test/regress/sql/rowtypes.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/rowtypes.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/rowtypes.sql	2017-08-07 21:13:41.000000000 +0000
@@ -286,3 +286,27 @@
 create temp table tt2 () inherits(tt1);
 insert into tt2 values(0,0);
 select row_to_json(r) from (select q2,q1 from tt1 offset 0) r;
+
+--
+-- IS [NOT] NULL should not recurse into nested composites (bug #14235)
+--
+
+explain (verbose, costs off)
+select r, r is null as isnull, r is not null as isnotnull
+from (values (1,row(1,2)), (1,row(null,null)), (1,null),
+             (null,row(1,2)), (null,row(null,null)), (null,null) ) r(a,b);
+
+select r, r is null as isnull, r is not null as isnotnull
+from (values (1,row(1,2)), (1,row(null,null)), (1,null),
+             (null,row(1,2)), (null,row(null,null)), (null,null) ) r(a,b);
+
+explain (verbose, costs off)
+with r(a,b) as
+  (values (1,row(1,2)), (1,row(null,null)), (1,null),
+          (null,row(1,2)), (null,row(null,null)), (null,null) )
+select r, r is null as isnull, r is not null as isnotnull from r;
+
+with r(a,b) as
+  (values (1,row(1,2)), (1,row(null,null)), (1,null),
+          (null,row(1,2)), (null,row(null,null)), (null,null) )
+select r, r is null as isnull, r is not null as isnotnull from r;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/rules.sql postgresql-9.5-9.5.8/src/test/regress/sql/rules.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/rules.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/rules.sql	2017-08-07 21:13:41.000000000 +0000
@@ -522,7 +522,7 @@
 	shoename   char(10),      -- primary key
 	sh_avail   integer,       -- available # of pairs
 	slcolor    char(10),      -- preferred shoelace color
-	slminlen   float,         -- miminum shoelace length
+	slminlen   float,         -- minimum shoelace length
 	slmaxlen   float,         -- maximum shoelace length
 	slunit     char(8)        -- length unit
 );
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/select_into.sql postgresql-9.5-9.5.8/src/test/regress/sql/select_into.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/select_into.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/select_into.sql	2017-08-07 21:13:41.000000000 +0000
@@ -53,6 +53,25 @@
 DROP SCHEMA selinto_schema CASCADE;
 DROP USER selinto_user;
 
+-- Tests for WITH NO DATA and column name consistency
+CREATE TABLE ctas_base (i int, j int);
+INSERT INTO ctas_base VALUES (1, 2);
+CREATE TABLE ctas_nodata (ii, jj, kk) AS SELECT i, j FROM ctas_base; -- Error
+CREATE TABLE ctas_nodata (ii, jj, kk) AS SELECT i, j FROM ctas_base WITH NO DATA; -- Error
+CREATE TABLE ctas_nodata (ii, jj) AS SELECT i, j FROM ctas_base; -- OK
+CREATE TABLE ctas_nodata_2 (ii, jj) AS SELECT i, j FROM ctas_base WITH NO DATA; -- OK
+CREATE TABLE ctas_nodata_3 (ii) AS SELECT i, j FROM ctas_base; -- OK
+CREATE TABLE ctas_nodata_4 (ii) AS SELECT i, j FROM ctas_base WITH NO DATA; -- OK
+SELECT * FROM ctas_nodata;
+SELECT * FROM ctas_nodata_2;
+SELECT * FROM ctas_nodata_3;
+SELECT * FROM ctas_nodata_4;
+DROP TABLE ctas_base;
+DROP TABLE ctas_nodata;
+DROP TABLE ctas_nodata_2;
+DROP TABLE ctas_nodata_3;
+DROP TABLE ctas_nodata_4;
+
 --
 -- CREATE TABLE AS/SELECT INTO as last command in a SQL function
 -- have been known to cause problems
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/timestamptz.sql postgresql-9.5-9.5.8/src/test/regress/sql/timestamptz.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/timestamptz.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/timestamptz.sql	2017-08-07 21:13:41.000000000 +0000
@@ -273,7 +273,7 @@
 DROP TABLE TIMESTAMPTZ_TST;
 
 -- test timestamptz constructors
-set TimeZone to 'America/Santiago';
+set TimeZone to 'America/New_York';
 
 -- numeric timezone
 SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33);
@@ -302,8 +302,8 @@
 SELECT make_timestamptz(1910, 12, 24, 0, 0, 0, 'Nehwon/Lankhmar');
 
 -- abbreviations
-SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLST');
-SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLT');
+SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EST');
+SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EDT');
 SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
 
 RESET TimeZone;
@@ -311,8 +311,7 @@
 --
 -- Test behavior with a dynamic (time-varying) timezone abbreviation.
 -- These tests rely on the knowledge that MSK (Europe/Moscow standard time)
--- moved forwards in Mar 2011 and that VET (America/Caracas standard time)
--- moved backwards in Dec 2007.
+-- moved forwards in Mar 2011 and backwards again in Oct 2014.
 --
 
 SET TimeZone to 'UTC';
@@ -337,23 +336,17 @@
 SELECT '2011-03-27 03:00:01 MSK'::timestamptz;
 SELECT '2011-03-27 04:00:00 MSK'::timestamptz;
 
-SELECT '2007-12-09 02:00:00 America/Caracas'::timestamptz;
-SELECT '2007-12-09 02:29:59 America/Caracas'::timestamptz;
-SELECT '2007-12-09 02:30:00 America/Caracas'::timestamptz;
-SELECT '2007-12-09 02:30:01 America/Caracas'::timestamptz;
-SELECT '2007-12-09 02:59:59 America/Caracas'::timestamptz;
-SELECT '2007-12-09 03:00:00 America/Caracas'::timestamptz;
-SELECT '2007-12-09 03:00:01 America/Caracas'::timestamptz;
-SELECT '2007-12-09 04:00:00 America/Caracas'::timestamptz;
-
-SELECT '2007-12-09 02:00:00 VET'::timestamptz;
-SELECT '2007-12-09 02:29:59 VET'::timestamptz;
-SELECT '2007-12-09 02:30:00 VET'::timestamptz;
-SELECT '2007-12-09 02:30:01 VET'::timestamptz;
-SELECT '2007-12-09 02:59:59 VET'::timestamptz;
-SELECT '2007-12-09 03:00:00 VET'::timestamptz;
-SELECT '2007-12-09 03:00:01 VET'::timestamptz;
-SELECT '2007-12-09 04:00:00 VET'::timestamptz;
+SELECT '2014-10-26 00:00:00 Europe/Moscow'::timestamptz;
+SELECT '2014-10-26 00:59:59 Europe/Moscow'::timestamptz;
+SELECT '2014-10-26 01:00:00 Europe/Moscow'::timestamptz;
+SELECT '2014-10-26 01:00:01 Europe/Moscow'::timestamptz;
+SELECT '2014-10-26 02:00:00 Europe/Moscow'::timestamptz;
+
+SELECT '2014-10-26 00:00:00 MSK'::timestamptz;
+SELECT '2014-10-26 00:59:59 MSK'::timestamptz;
+SELECT '2014-10-26 01:00:00 MSK'::timestamptz;
+SELECT '2014-10-26 01:00:01 MSK'::timestamptz;
+SELECT '2014-10-26 02:00:00 MSK'::timestamptz;
 
 SELECT '2011-03-27 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
 SELECT '2011-03-27 01:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
@@ -375,26 +368,20 @@
 SELECT '2011-03-27 03:00:01'::timestamp AT TIME ZONE 'MSK';
 SELECT '2011-03-27 04:00:00'::timestamp AT TIME ZONE 'MSK';
 
-SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'America/Caracas';
-
-SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'VET';
-SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'VET';
-SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'VET';
-SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'VET';
-SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'VET';
-SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'VET';
-SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'VET';
-SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'VET';
+SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
+SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'Europe/Moscow';
+SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
+SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'Europe/Moscow';
+SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
+
+SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'MSK';
+SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'MSK';
+SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'MSK';
+SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'MSK';
+SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'MSK';
 
-SELECT make_timestamptz(2007, 12, 9, 2, 0, 0, 'VET');
-SELECT make_timestamptz(2007, 12, 9, 3, 0, 0, 'VET');
+SELECT make_timestamptz(2014, 10, 26, 0, 0, 0, 'MSK');
+SELECT make_timestamptz(2014, 10, 26, 1, 0, 0, 'MSK');
 
 SET TimeZone to 'Europe/Moscow';
 
@@ -406,15 +393,11 @@
 SELECT '2011-03-26 23:59:59 UTC'::timestamptz;
 SELECT '2011-03-27 00:00:00 UTC'::timestamptz;
 
-SET TimeZone to 'America/Caracas';
-
-SELECT '2007-12-09 06:00:00 UTC'::timestamptz;
-SELECT '2007-12-09 06:30:00 UTC'::timestamptz;
-SELECT '2007-12-09 06:59:59 UTC'::timestamptz;
-SELECT '2007-12-09 07:00:00 UTC'::timestamptz;
-SELECT '2007-12-09 07:00:01 UTC'::timestamptz;
-SELECT '2007-12-09 07:29:59 UTC'::timestamptz;
-SELECT '2007-12-09 07:30:00 UTC'::timestamptz;
+SELECT '2014-10-25 21:00:00 UTC'::timestamptz;
+SELECT '2014-10-25 21:59:59 UTC'::timestamptz;
+SELECT '2014-10-25 22:00:00 UTC'::timestamptz;
+SELECT '2014-10-25 22:00:01 UTC'::timestamptz;
+SELECT '2014-10-25 23:00:00 UTC'::timestamptz;
 
 RESET TimeZone;
 
@@ -426,13 +409,11 @@
 SELECT '2011-03-26 23:59:59 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
 SELECT '2011-03-27 00:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
 
-SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
 
 SELECT '2011-03-26 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
 SELECT '2011-03-26 22:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
@@ -442,10 +423,33 @@
 SELECT '2011-03-26 23:59:59 UTC'::timestamptz AT TIME ZONE 'MSK';
 SELECT '2011-03-27 00:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
 
-SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
-SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
-SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'VET';
-SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
-SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'VET';
-SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'VET';
-SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
+SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'MSK';
+SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'MSK';
+SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+
+--
+-- Test that the pg_timezone_names and pg_timezone_abbrevs views are
+-- more-or-less working.  We can't test their contents in any great detail
+-- without the outputs changing anytime IANA updates the underlying data,
+-- but it seems reasonable to expect at least one entry per major meridian.
+-- (At the time of writing, the actual counts are around 38 because of
+-- zones using fractional GMT offsets, so this is a pretty loose test.)
+--
+select count(distinct utc_offset) >= 24 as ok from pg_timezone_names;
+select count(distinct utc_offset) >= 24 as ok from pg_timezone_abbrevs;
+-- Let's check the non-default timezone abbreviation sets, too
+set timezone_abbreviations = 'Australia';
+select count(distinct utc_offset) >= 24 as ok from pg_timezone_abbrevs;
+set timezone_abbreviations = 'India';
+select count(distinct utc_offset) >= 24 as ok from pg_timezone_abbrevs;
+
+--
+-- Test that AT TIME ZONE isn't misoptimized when using an index (bug #14504)
+--
+create temp table tmptz (f1 timestamptz primary key);
+insert into tmptz values ('2017-01-18 00:00+00');
+explain (costs off)
+select * from tmptz where f1 at time zone 'utc' = '2017-01-18 00:00';
+select * from tmptz where f1 at time zone 'utc' = '2017-01-18 00:00';
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/tsdicts.sql postgresql-9.5-9.5.8/src/test/regress/sql/tsdicts.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/tsdicts.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/tsdicts.sql	2017-08-07 21:13:41.000000000 +0000
@@ -48,7 +48,7 @@
 SELECT ts_lexize('hunspell', 'ballyklubber');
 SELECT ts_lexize('hunspell', 'footballyklubber');
 
--- Synonim dictionary
+-- Synonym dictionary
 CREATE TEXT SEARCH DICTIONARY synonym (
 						Template=synonym,
 						Synonyms=synonym_sample
@@ -119,5 +119,5 @@
 	WITH synonym, thesaurus, english_stem;
 
 SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one');
-SELECT to_tsvector('thesaurus_tst', 'Supernovae star is very new star and usually called supernovae (abbrevation SN)');
+SELECT to_tsvector('thesaurus_tst', 'Supernovae star is very new star and usually called supernovae (abbreviation SN)');
 SELECT to_tsvector('thesaurus_tst', 'Booking tickets is looking like a booking a tickets');
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/tsearch.sql postgresql-9.5-9.5.8/src/test/regress/sql/tsearch.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/tsearch.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/tsearch.sql	2017-08-07 21:13:41.000000000 +0000
@@ -48,10 +48,17 @@
 SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
 SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
 SELECT count(*) FROM test_tsvector WHERE a @@ 'w:*|q:*';
+SELECT count(*) FROM test_tsvector WHERE a @@ any ('{wr,qh}');
+SELECT count(*) FROM test_tsvector WHERE a @@ 'no_such_lexeme';
+SELECT count(*) FROM test_tsvector WHERE a @@ '!no_such_lexeme';
 
 create index wowidx on test_tsvector using gist (a);
 
 SET enable_seqscan=OFF;
+SET enable_indexscan=ON;
+SET enable_bitmapscan=OFF;
+
+explain (costs off) SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
 
 SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
 SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
@@ -61,14 +68,37 @@
 SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
 SELECT count(*) FROM test_tsvector WHERE a @@ 'w:*|q:*';
 SELECT count(*) FROM test_tsvector WHERE a @@ any ('{wr,qh}');
+SELECT count(*) FROM test_tsvector WHERE a @@ 'no_such_lexeme';
+SELECT count(*) FROM test_tsvector WHERE a @@ '!no_such_lexeme';
+
+SET enable_indexscan=OFF;
+SET enable_bitmapscan=ON;
+
+explain (costs off) SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'w:*|q:*';
+SELECT count(*) FROM test_tsvector WHERE a @@ any ('{wr,qh}');
+SELECT count(*) FROM test_tsvector WHERE a @@ 'no_such_lexeme';
+SELECT count(*) FROM test_tsvector WHERE a @@ '!no_such_lexeme';
 
 RESET enable_seqscan;
+RESET enable_indexscan;
+RESET enable_bitmapscan;
 
 DROP INDEX wowidx;
 
 CREATE INDEX wowidx ON test_tsvector USING gin (a);
 
 SET enable_seqscan=OFF;
+-- GIN only supports bitmapscan, so no need to test plain indexscan
+
+explain (costs off) SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
 
 SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
 SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
@@ -78,8 +108,11 @@
 SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
 SELECT count(*) FROM test_tsvector WHERE a @@ 'w:*|q:*';
 SELECT count(*) FROM test_tsvector WHERE a @@ any ('{wr,qh}');
+SELECT count(*) FROM test_tsvector WHERE a @@ 'no_such_lexeme';
+SELECT count(*) FROM test_tsvector WHERE a @@ '!no_such_lexeme';
 
 RESET enable_seqscan;
+
 INSERT INTO test_tsvector VALUES ('???', 'DFG:1A,2B,6C,10 FGH');
 SELECT * FROM ts_stat('SELECT a FROM test_tsvector') ORDER BY ndoc DESC, nentry DESC, word LIMIT 10;
 SELECT * FROM ts_stat('SELECT a FROM test_tsvector', 'AB') ORDER BY ndoc DESC, nentry DESC, word;
@@ -311,6 +344,8 @@
 RESET enable_seqscan;
 
 SELECT ts_rewrite('foo & bar & qq & new & york',  'new & york'::tsquery, 'big & apple | nyc | new & york & city');
+SELECT ts_rewrite(ts_rewrite('new & !york ', 'york', '!jersey'),
+                  'jersey', 'mexico');
 
 SELECT ts_rewrite('moscow', 'SELECT keyword, sample FROM test_tsquery'::text );
 SELECT ts_rewrite('moscow & hotel', 'SELECT keyword, sample FROM test_tsquery'::text );
@@ -320,6 +355,9 @@
 SELECT ts_rewrite( 'moscow & hotel', 'SELECT keyword, sample FROM test_tsquery');
 SELECT ts_rewrite( 'bar & new & qq & foo & york', 'SELECT keyword, sample FROM test_tsquery');
 
+-- Check empty substitution
+SELECT ts_rewrite(to_tsquery('5 & (6 | 5)'), to_tsquery('5'), to_tsquery(''));
+SELECT ts_rewrite(to_tsquery('!5'), to_tsquery('5'), to_tsquery(''));
 
 SELECT keyword FROM test_tsquery WHERE keyword @> 'new';
 SELECT keyword FROM test_tsquery WHERE keyword @> 'moscow';
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/tstypes.sql postgresql-9.5-9.5.8/src/test/regress/sql/tstypes.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/tstypes.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/tstypes.sql	2017-08-07 21:13:41.000000000 +0000
@@ -115,3 +115,6 @@
 SELECT ts_rank_cd(' a:1 s:2C d g'::tsvector, 'a & s');
 SELECT ts_rank_cd(' a:1 s:2B d g'::tsvector, 'a & s');
 SELECT ts_rank_cd(' a:1 s:2 d g'::tsvector, 'a & s');
+
+select to_tsvector('simple', 'x y q y') @@ '!foo' AS "true";
+select to_tsvector('simple', '') @@ '!foo' AS "true";
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/updatable_views.sql postgresql-9.5-9.5.8/src/test/regress/sql/updatable_views.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/updatable_views.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/updatable_views.sql	2017-08-07 21:13:41.000000000 +0000
@@ -1098,3 +1098,17 @@
 DROP VIEW v1;
 DROP TABLE t2;
 DROP TABLE t1;
+
+--
+-- Test CREATE OR REPLACE VIEW turning a non-updatable view into an
+-- auto-updatable view and adding check options in a single step
+--
+CREATE TABLE t1 (a int, b text);
+CREATE VIEW v1 AS SELECT null::int AS a;
+CREATE OR REPLACE VIEW v1 AS SELECT * FROM t1 WHERE a > 0 WITH CHECK OPTION;
+
+INSERT INTO v1 VALUES (1, 'ok'); -- ok
+INSERT INTO v1 VALUES (-1, 'invalid'); -- should fail
+
+DROP VIEW v1;
+DROP TABLE t1;
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/update.sql postgresql-9.5-9.5.8/src/test/regress/sql/update.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/update.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/update.sql	2017-08-07 21:13:41.000000000 +0000
@@ -40,6 +40,10 @@
 
 SELECT * FROM update_test;
 
+-- fail, wrong data type:
+UPDATE update_test SET a = v.* FROM (VALUES(100, 20)) AS v(i, j)
+  WHERE update_test.b = v.j;
+
 --
 -- Test multiple-set-clause syntax
 --
@@ -70,6 +74,11 @@
 UPDATE update_test SET (b,a) = (select a+1,b from update_test where a = 1000)
   WHERE a = 11;
 SELECT * FROM update_test;
+-- these should work, but don't yet:
+UPDATE update_test SET (a,b) = (v.*) FROM (VALUES(21, 100)) AS v(i, j)
+  WHERE update_test.a = v.i;
+UPDATE update_test SET (a,b) = ROW(v.*) FROM (VALUES(21, 101)) AS v(i, j)
+  WHERE update_test.a = v.i;
 
 -- if an alias for the target table is specified, don't allow references
 -- to the original table name
diff -Nru postgresql-9.5-9.5.2/src/test/regress/sql/xmlmap.sql postgresql-9.5-9.5.8/src/test/regress/sql/xmlmap.sql
--- postgresql-9.5-9.5.2/src/test/regress/sql/xmlmap.sql	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/regress/sql/xmlmap.sql	2017-08-07 21:13:41.000000000 +0000
@@ -30,7 +30,8 @@
 
 DECLARE xc CURSOR WITH HOLD FOR SELECT * FROM testxmlschema.test1 ORDER BY 1, 2;
 SELECT cursor_to_xml('xc'::refcursor, 5, false, true, '');
-MOVE FIRST IN xc;
+SELECT cursor_to_xmlschema('xc'::refcursor, false, true, '');
+MOVE BACKWARD ALL IN xc;
 SELECT cursor_to_xml('xc'::refcursor, 5, true, false, '');
 SELECT cursor_to_xmlschema('xc'::refcursor, true, false, '');
 
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/cas.config postgresql-9.5-9.5.8/src/test/ssl/cas.config
--- postgresql-9.5-9.5.2/src/test/ssl/cas.config	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/cas.config	2017-08-07 21:13:41.000000000 +0000
@@ -2,11 +2,10 @@
 
 [ req ]
 prompt                 = no
-req_extensions         = v3_req
 
-# For Subject Alternative Names
-[ v3_req ]
-subjectAltName = @alt_names
+# Extensions for CA certs
+[ v3_ca ]
+basicConstraints = CA:true
 
 # Root CA, used to sign the certificates of the intermediary server and
 # client CAs.
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/Makefile postgresql-9.5-9.5.8/src/test/ssl/Makefile
--- postgresql-9.5-9.5.2/src/test/ssl/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -23,7 +23,8 @@
 	ssl/client.crl ssl/server.crl ssl/root.crl \
 	ssl/both-cas-1.crt ssl/both-cas-2.crt \
 	ssl/root+server_ca.crt ssl/root+server.crl \
-	ssl/root+client_ca.crt ssl/root+client.crl
+	ssl/root+client_ca.crt ssl/root+client.crl \
+	ssl/client+client_ca.crt
 
 # This target generates all the key and certificate files.
 sslfiles: $(SSLFILES)
@@ -41,15 +42,16 @@
 # Root CA certificate
 ssl/root_ca.crt: ssl/root_ca.key cas.config
 	touch ssl/root_ca-certindex
-	openssl req -new -out ssl/root_ca.crt -x509 -config cas.config -config root_ca.config -key ssl/root_ca.key -days 10000
+	openssl req -new -out ssl/root_ca.crt -x509 -config cas.config -config root_ca.config -key ssl/root_ca.key -days 10000 -extensions v3_ca
 	echo "01" > ssl/root_ca.srl
 
 # Client and server CAs
 ssl/%_ca.crt: ssl/%_ca.key %_ca.config ssl/root_ca.crt ssl/new_certs_dir
 	touch ssl/$*_ca-certindex
+	echo "unique_subject=no" > ssl/$*_ca-certindex.attr
 	openssl req -new -out ssl/temp_ca.crt -config cas.config -config $*_ca.config -key ssl/$*_ca.key
 # Sign the certificate with the root CA
-	openssl ca -name root_ca -batch -config cas.config -in ssl/temp_ca.crt -out ssl/temp_ca_signed.crt
+	openssl ca -name root_ca -batch -config cas.config -in ssl/temp_ca.crt -out ssl/temp_ca_signed.crt -extensions v3_ca
 	openssl x509 -in ssl/temp_ca_signed.crt -out ssl/$*_ca.crt # to keep just the PEM cert
 	rm ssl/temp_ca.crt ssl/temp_ca_signed.crt
 	echo "01" > ssl/$*_ca.srl
@@ -98,6 +100,9 @@
 ssl/root+client_ca.crt: ssl/root_ca.crt ssl/client_ca.crt
 	cat $^ > $@
 
+ssl/client+client_ca.crt: ssl/client.crt ssl/client_ca.crt
+	cat $^ > $@
+
 #### CRLs
 
 ssl/client.crl: ssl/client-revoked.crt
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/README postgresql-9.5-9.5.8/src/test/ssl/README
--- postgresql-9.5-9.5.2/src/test/ssl/README	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/README	2017-08-07 21:13:41.000000000 +0000
@@ -65,6 +65,10 @@
 root+client_ca
 	Contains root_crt and client_ca.crt. For use as server's "ssl_ca_file".
 
+client+client_ca
+	Contains client.crt and client_ca.crt in that order. For use as client's
+	certificate chain.
+
 There are also CRLs for each of the CAs: root.crl, server.crl and client.crl.
 
 For convenience, all of these keypairs and certificates are included in the
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/root_ca.config postgresql-9.5-9.5.8/src/test/ssl/root_ca.config
--- postgresql-9.5-9.5.2/src/test/ssl/root_ca.config	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/root_ca.config	2017-08-07 21:13:41.000000000 +0000
@@ -7,3 +7,7 @@
 
 [ req_distinguished_name ]
 CN                     = Test root CA for PostgreSQL SSL regression test suite
+
+# Extensions for CA certs
+[ v3_ca ]
+basicConstraints = CA:true
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/server-cn-only.config postgresql-9.5-9.5.8/src/test/ssl/server-cn-only.config
--- postgresql-9.5-9.5.2/src/test/ssl/server-cn-only.config	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/server-cn-only.config	2017-08-07 21:13:41.000000000 +0000
@@ -3,7 +3,6 @@
 
 [ req ]
 distinguished_name     = req_distinguished_name
-req_extensions         = v3_req
 prompt                 = no
 
 [ req_distinguished_name ]
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/server-no-names.config postgresql-9.5-9.5.8/src/test/ssl/server-no-names.config
--- postgresql-9.5-9.5.2/src/test/ssl/server-no-names.config	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/server-no-names.config	2017-08-07 21:13:41.000000000 +0000
@@ -5,7 +5,6 @@
 
 [ req ]
 distinguished_name     = req_distinguished_name
-req_extensions         = v3_req
 prompt                 = no
 
 [ req_distinguished_name ]
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/server-revoked.config postgresql-9.5-9.5.8/src/test/ssl/server-revoked.config
--- postgresql-9.5-9.5.2/src/test/ssl/server-revoked.config	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/server-revoked.config	2017-08-07 21:13:41.000000000 +0000
@@ -5,7 +5,6 @@
 
 [ req ]
 distinguished_name     = req_distinguished_name
-req_extensions         = v3_req
 prompt                 = no
 
 [ req_distinguished_name ]
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ServerSetup.pm postgresql-9.5-9.5.8/src/test/ssl/ServerSetup.pm
--- postgresql-9.5-9.5.2/src/test/ssl/ServerSetup.pm	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ServerSetup.pm	2017-08-07 21:13:41.000000000 +0000
@@ -7,7 +7,7 @@
 # - ssl/root+client_ca.crt as the CA root for validating client certs.
 # - reject non-SSL connections
 # - a database called trustdb that lets anyone in
-# - another database called certdb that uses certificate authentiction, ie.
+# - another database called certdb that uses certificate authentication, ie.
 #   the client must present a valid certificate signed by the client CA
 # - two users, called ssltestuser and anotheruser.
 #
@@ -46,6 +46,7 @@
 sub configure_test_server_for_ssl
 {
 	my $tempdir = $_[0];
+	my $serverhost = $_[1];
 
 	# Create test users and databases
 	psql 'postgres', "CREATE USER ssltestuser";
@@ -58,6 +59,7 @@
 	print CONF "fsync=off\n";
 	print CONF "log_connections=on\n";
 	print CONF "log_hostname=on\n";
+	print CONF "listen_addresses='$serverhost'\n";
 	print CONF "log_statement=all\n";
 
 	# enable SSL and set up server key
@@ -70,6 +72,7 @@
 	copy_files("ssl/server-*.key", "$tempdir/pgdata");
 	chmod(0600, glob "$tempdir/pgdata/server-*.key") or die $!;
 	copy_files("ssl/root+client_ca.crt", "$tempdir/pgdata");
+	copy_files("ssl/root_ca.crt", "$tempdir/pgdata");
 	copy_files("ssl/root+client.crl",    "$tempdir/pgdata");
 
   # Only accept SSL connections from localhost. Our tests don't depend on this
@@ -96,12 +99,13 @@
 {
 	my $tempdir  = $_[0];
 	my $certfile = $_[1];
+	my $cafile = $_[2] || "root+client_ca";
 
-	diag "Restarting server with certfile \"$certfile\"...";
+	diag "Restarting server with certfile \"$certfile\" and cafile \"$cafile\"...";
 
 	open SSLCONF, ">$tempdir/pgdata/sslconfig.conf";
 	print SSLCONF "ssl=on\n";
-	print SSLCONF "ssl_ca_file='root+client_ca.crt'\n";
+	print SSLCONF "ssl_ca_file='$cafile.crt'\n";
 	print SSLCONF "ssl_cert_file='$certfile.crt'\n";
 	print SSLCONF "ssl_key_file='$certfile.key'\n";
 	print SSLCONF "ssl_crl_file='root+client.crl'\n";
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/both-cas-1.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/both-cas-1.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/both-cas-1.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/both-cas-1.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,39 +1,40 @@
 -----BEGIN CERTIFICATE-----
-MIIB9zCCAWACCQDrgvp38CAy8DANBgkqhkiG9w0BAQsFADBAMT4wPAYDVQQDDDVU
-ZXN0IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBz
-dWl0ZTAeFw0xNTAyMTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMEAxPjA8BgNVBAMM
-NVRlc3Qgcm9vdCBDQSBmb3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0
-IHN1aXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyTfGMPAjAylLr3G7c
-/QToCA3da5YZzdhd3TiQGugrJjWI4TzVB7pQ8IwDYk/jZf5TzVdEtz0B4TeIeUZl
-FLW9dMpa/8SY2TETvMTuXR5MOxyw6FMEKb3buolsIksCCQ1btEIrDZ+gv9SJXcdL
-ylU+VI1lKmn2fLNWWATzWrIUawIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAF2T84iG
-zWKXu+3PysuPOn7RuRpMgYQKouQktErNJ8hM7Yqj3vu879zUkX1rP0HGnx7xQC3d
-nBkoJ7yNDR0MwQpWo1Dj1HLKNEY6ojKJgPd0+m8nG+02yUmmOjo0oMYzJx2DQy0u
-Y4qecEd6aDbqXTo+qOJ7Qm/U+U4kD9MTT6GD
+MIICDjCCAXegAwIBAgIJAO2nC4XHXDkUMA0GCSqGSIb3DQEBCwUAMEAxPjA8BgNV
+BAMMNVRlc3Qgcm9vdCBDQSBmb3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0
+ZXN0IHN1aXRlMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowQDE+MDwG
+A1UEAww1VGVzdCByb290IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9u
+IHRlc3Qgc3VpdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vUDilEsB5
+qI9cGWTthAIjlvr2ngFJqHmMeOgTg4JQQ24MQedh0r22nDNwm80r4RD9RCjlw/k8
+sS+chRwQclJqpE6EV65TIH0JhOKGFpx/Pz/yrru5QwEDkYcHl1QcK3xFUKbSxi/B
+MCq4TZf63HkI6/VRY+1SwKF2a4pjWIaDAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADgYEAtBNiRyqydB+iy2DtoYYjsvq/q69o3UrbIhKPMlYE
+TJcgWyEz4gsRMnceM/dQl0dchZ8jrAbLiAbqr7PvitjdxGSQJ8w7Gb4IawPu3UCE
+TfMWiG5oYV1nHHZotEQuE+Gx4AdzSVGzLGj2xF9dSMxEQq7uPlpv67IeHEn5g3w1
+K5Y=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIB8TCCAVoCAQIwDQYJKoZIhvcNAQEFBQAwQDE+MDwGA1UEAww1VGVzdCByb290
-IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc3VpdGUwHhcN
-MTUwMjE2MjAwNjIzWhcNNDIwNzA0MjAwNjIzWjBCMUAwPgYDVQQDDDdUZXN0IENB
-IGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3QgY2xpZW50IGNlcnRz
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8wIYcmeePSXVufP/Hn/6ICEog
-IUXqSNls5QIJR7Sate4iKGGTDEsRTxI4oDgkOYtcQNuEeXMf6k3xo+PRR08IEQNk
-XKy1zUWds6UBFboD72SyuTE2lxJBg+xOAWgl7JSNA+g8e0Y+wfhfxGZgRuqVxVNP
-9sAsfCEzGKna1l46dQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAD20Bmina/uXTLXO
-oPWgpMmKwQu7Q6DPXxItCUdWgK1k1D82brRjH+usrkrmCW5BQNXOC/0zJS22ioC1
-CJbhAujH3iPaV0C3xsVSf+bvTL6OMkwV/9x9OdDN+LI2auEt4S+fP5ZTVsTXt4wA
-A9cQIl2Qy88enZZAFKxrScFFlstp
+MIICCDCCAXGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBAMT4wPAYDVQQDDDVUZXN0
+IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzdWl0
+ZTAeFw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMEIxQDA+BgNVBAMMN1Rl
+c3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBjbGllbnQg
+Y2VydHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMI2MXWSb8TZnCLVNYJ+
+19b4noxRmaR1W2zUxl4aTMfiPt9cK06lNY39EPBfjmb7hjxD76w8fLoV/aZ0gOgd
+JXFRZvIg7SyM7QVFma0AJAIZayes+ba1odEmBEi378g0mLrjCLqZtBVHfvJxL/6x
+6/flSTAn/+09vtELvvLWBePZAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEAlGC24V2TsiSlo9RIboBZTZqd0raUpKkmVbkwKyqcmecoFfCI
+TCmoyJLYyUL5/e3dtn/cGDcaqxaO3qxnstxVEMSrlCGfZdZJ2oouXZMpDy9CkeOM
+ypCCx9pc4EmP3mvu64f21+dNCXlhM36pZ1IokeS5jk2FIHUda+m5jlk5o6I=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIB8TCCAVoCAQEwDQYJKoZIhvcNAQEFBQAwQDE+MDwGA1UEAww1VGVzdCByb290
-IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc3VpdGUwHhcN
-MTUwMjE2MjAwNjIzWhcNNDIwNzA0MjAwNjIzWjBCMUAwPgYDVQQDDDdUZXN0IENB
-IGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNlcnRz
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDAYtajRx8vM6IB0SLZsAhTD0Y
-VHM+/+t0a4m3JXolJBbo9/B2/WAN0IH1E2zmlalLc3JBmGsH1a8U5ZlRow3p2ODL
-rFra9FbOl0wekmRFvZeaRln/99dpI5itVpL97QPHO8QMMK1IsyurFA5GfuPOBx9P
-i0MvzsT0tYsRvR929QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAJw4ngOYElfyMYkS
-K6bOgMosrBoX8ns6jQgdXEzf7QOIa110bs6nD+XeJeKmzUAZ3wumXBTalPaiqkEz
-bq4nlsEs1phvj0Coy5eehjV3DB8bDLEneOlV5N9y4Z4VO1BrhX61bLiPXBRp1MZR
-I0sCdxhswSrq02/OuFGe6mqrSBBI
+MIICCDCCAXGgAwIBAgIBATANBgkqhkiG9w0BAQUFADBAMT4wPAYDVQQDDDVUZXN0
+IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzdWl0
+ZTAeFw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMEIxQDA+BgNVBAMMN1Rl
+c3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzZXJ2ZXIg
+Y2VydHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKpkEBIZexm3YZ94RA+c
+vUREqvLgECfHlP9BbkXySFPGWcAPt/0uSW62eVS3UFcB9083W4w/uilL75PXDHV1
+37fyq+6LHCYE5TinzVr5ECAtQMpIzlKkAuAPq3mTa1fklwT/MCz/PKGAljs2o95w
+mNyEJwTchOQ52fZjFexRiarNAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEAP1ZhwGxsL7GTNxfs2qwYCjsF2zYSjCPXtwJnKFu5ayGxz6dB
+paspokWFCglP1PwPAmINHeqp669WNnAmC5EixdTy2jcnod8NB6RlkOqJmNzVPhvO
+cTZXxKd3awOzz0+IJ2bMcC9JPXs8phhRuRgvSfKTTZVtdcFmVF/HYIrBB5Y=
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/both-cas-2.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/both-cas-2.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/both-cas-2.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/both-cas-2.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,39 +1,40 @@
 -----BEGIN CERTIFICATE-----
-MIIB9zCCAWACCQDrgvp38CAy8DANBgkqhkiG9w0BAQsFADBAMT4wPAYDVQQDDDVU
-ZXN0IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBz
-dWl0ZTAeFw0xNTAyMTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMEAxPjA8BgNVBAMM
-NVRlc3Qgcm9vdCBDQSBmb3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0
-IHN1aXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyTfGMPAjAylLr3G7c
-/QToCA3da5YZzdhd3TiQGugrJjWI4TzVB7pQ8IwDYk/jZf5TzVdEtz0B4TeIeUZl
-FLW9dMpa/8SY2TETvMTuXR5MOxyw6FMEKb3buolsIksCCQ1btEIrDZ+gv9SJXcdL
-ylU+VI1lKmn2fLNWWATzWrIUawIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAF2T84iG
-zWKXu+3PysuPOn7RuRpMgYQKouQktErNJ8hM7Yqj3vu879zUkX1rP0HGnx7xQC3d
-nBkoJ7yNDR0MwQpWo1Dj1HLKNEY6ojKJgPd0+m8nG+02yUmmOjo0oMYzJx2DQy0u
-Y4qecEd6aDbqXTo+qOJ7Qm/U+U4kD9MTT6GD
+MIICDjCCAXegAwIBAgIJAO2nC4XHXDkUMA0GCSqGSIb3DQEBCwUAMEAxPjA8BgNV
+BAMMNVRlc3Qgcm9vdCBDQSBmb3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0
+ZXN0IHN1aXRlMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowQDE+MDwG
+A1UEAww1VGVzdCByb290IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9u
+IHRlc3Qgc3VpdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vUDilEsB5
+qI9cGWTthAIjlvr2ngFJqHmMeOgTg4JQQ24MQedh0r22nDNwm80r4RD9RCjlw/k8
+sS+chRwQclJqpE6EV65TIH0JhOKGFpx/Pz/yrru5QwEDkYcHl1QcK3xFUKbSxi/B
+MCq4TZf63HkI6/VRY+1SwKF2a4pjWIaDAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADgYEAtBNiRyqydB+iy2DtoYYjsvq/q69o3UrbIhKPMlYE
+TJcgWyEz4gsRMnceM/dQl0dchZ8jrAbLiAbqr7PvitjdxGSQJ8w7Gb4IawPu3UCE
+TfMWiG5oYV1nHHZotEQuE+Gx4AdzSVGzLGj2xF9dSMxEQq7uPlpv67IeHEn5g3w1
+K5Y=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIB8TCCAVoCAQEwDQYJKoZIhvcNAQEFBQAwQDE+MDwGA1UEAww1VGVzdCByb290
-IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc3VpdGUwHhcN
-MTUwMjE2MjAwNjIzWhcNNDIwNzA0MjAwNjIzWjBCMUAwPgYDVQQDDDdUZXN0IENB
-IGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNlcnRz
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDAYtajRx8vM6IB0SLZsAhTD0Y
-VHM+/+t0a4m3JXolJBbo9/B2/WAN0IH1E2zmlalLc3JBmGsH1a8U5ZlRow3p2ODL
-rFra9FbOl0wekmRFvZeaRln/99dpI5itVpL97QPHO8QMMK1IsyurFA5GfuPOBx9P
-i0MvzsT0tYsRvR929QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAJw4ngOYElfyMYkS
-K6bOgMosrBoX8ns6jQgdXEzf7QOIa110bs6nD+XeJeKmzUAZ3wumXBTalPaiqkEz
-bq4nlsEs1phvj0Coy5eehjV3DB8bDLEneOlV5N9y4Z4VO1BrhX61bLiPXBRp1MZR
-I0sCdxhswSrq02/OuFGe6mqrSBBI
+MIICCDCCAXGgAwIBAgIBATANBgkqhkiG9w0BAQUFADBAMT4wPAYDVQQDDDVUZXN0
+IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzdWl0
+ZTAeFw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMEIxQDA+BgNVBAMMN1Rl
+c3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzZXJ2ZXIg
+Y2VydHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKpkEBIZexm3YZ94RA+c
+vUREqvLgECfHlP9BbkXySFPGWcAPt/0uSW62eVS3UFcB9083W4w/uilL75PXDHV1
+37fyq+6LHCYE5TinzVr5ECAtQMpIzlKkAuAPq3mTa1fklwT/MCz/PKGAljs2o95w
+mNyEJwTchOQ52fZjFexRiarNAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEAP1ZhwGxsL7GTNxfs2qwYCjsF2zYSjCPXtwJnKFu5ayGxz6dB
+paspokWFCglP1PwPAmINHeqp669WNnAmC5EixdTy2jcnod8NB6RlkOqJmNzVPhvO
+cTZXxKd3awOzz0+IJ2bMcC9JPXs8phhRuRgvSfKTTZVtdcFmVF/HYIrBB5Y=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIB8TCCAVoCAQIwDQYJKoZIhvcNAQEFBQAwQDE+MDwGA1UEAww1VGVzdCByb290
-IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc3VpdGUwHhcN
-MTUwMjE2MjAwNjIzWhcNNDIwNzA0MjAwNjIzWjBCMUAwPgYDVQQDDDdUZXN0IENB
-IGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3QgY2xpZW50IGNlcnRz
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8wIYcmeePSXVufP/Hn/6ICEog
-IUXqSNls5QIJR7Sate4iKGGTDEsRTxI4oDgkOYtcQNuEeXMf6k3xo+PRR08IEQNk
-XKy1zUWds6UBFboD72SyuTE2lxJBg+xOAWgl7JSNA+g8e0Y+wfhfxGZgRuqVxVNP
-9sAsfCEzGKna1l46dQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAD20Bmina/uXTLXO
-oPWgpMmKwQu7Q6DPXxItCUdWgK1k1D82brRjH+usrkrmCW5BQNXOC/0zJS22ioC1
-CJbhAujH3iPaV0C3xsVSf+bvTL6OMkwV/9x9OdDN+LI2auEt4S+fP5ZTVsTXt4wA
-A9cQIl2Qy88enZZAFKxrScFFlstp
+MIICCDCCAXGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBAMT4wPAYDVQQDDDVUZXN0
+IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzdWl0
+ZTAeFw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMEIxQDA+BgNVBAMMN1Rl
+c3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBjbGllbnQg
+Y2VydHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMI2MXWSb8TZnCLVNYJ+
+19b4noxRmaR1W2zUxl4aTMfiPt9cK06lNY39EPBfjmb7hjxD76w8fLoV/aZ0gOgd
+JXFRZvIg7SyM7QVFma0AJAIZayes+ba1odEmBEi378g0mLrjCLqZtBVHfvJxL/6x
+6/flSTAn/+09vtELvvLWBePZAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEAlGC24V2TsiSlo9RIboBZTZqd0raUpKkmVbkwKyqcmecoFfCI
+TCmoyJLYyUL5/e3dtn/cGDcaqxaO3qxnstxVEMSrlCGfZdZJ2oouXZMpDy9CkeOM
+ypCCx9pc4EmP3mvu64f21+dNCXlhM36pZ1IokeS5jk2FIHUda+m5jlk5o6I=
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/client_ca.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/client_ca.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/client_ca.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/client_ca.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB8TCCAVoCAQIwDQYJKoZIhvcNAQEFBQAwQDE+MDwGA1UEAww1VGVzdCByb290
-IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc3VpdGUwHhcN
-MTUwMjE2MjAwNjIzWhcNNDIwNzA0MjAwNjIzWjBCMUAwPgYDVQQDDDdUZXN0IENB
-IGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3QgY2xpZW50IGNlcnRz
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8wIYcmeePSXVufP/Hn/6ICEog
-IUXqSNls5QIJR7Sate4iKGGTDEsRTxI4oDgkOYtcQNuEeXMf6k3xo+PRR08IEQNk
-XKy1zUWds6UBFboD72SyuTE2lxJBg+xOAWgl7JSNA+g8e0Y+wfhfxGZgRuqVxVNP
-9sAsfCEzGKna1l46dQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAD20Bmina/uXTLXO
-oPWgpMmKwQu7Q6DPXxItCUdWgK1k1D82brRjH+usrkrmCW5BQNXOC/0zJS22ioC1
-CJbhAujH3iPaV0C3xsVSf+bvTL6OMkwV/9x9OdDN+LI2auEt4S+fP5ZTVsTXt4wA
-A9cQIl2Qy88enZZAFKxrScFFlstp
+MIICCDCCAXGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBAMT4wPAYDVQQDDDVUZXN0
+IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzdWl0
+ZTAeFw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMEIxQDA+BgNVBAMMN1Rl
+c3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBjbGllbnQg
+Y2VydHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMI2MXWSb8TZnCLVNYJ+
+19b4noxRmaR1W2zUxl4aTMfiPt9cK06lNY39EPBfjmb7hjxD76w8fLoV/aZ0gOgd
+JXFRZvIg7SyM7QVFma0AJAIZayes+ba1odEmBEi378g0mLrjCLqZtBVHfvJxL/6x
+6/flSTAn/+09vtELvvLWBePZAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEAlGC24V2TsiSlo9RIboBZTZqd0raUpKkmVbkwKyqcmecoFfCI
+TCmoyJLYyUL5/e3dtn/cGDcaqxaO3qxnstxVEMSrlCGfZdZJ2oouXZMpDy9CkeOM
+ypCCx9pc4EmP3mvu64f21+dNCXlhM36pZ1IokeS5jk2FIHUda+m5jlk5o6I=
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/client_ca.key postgresql-9.5-9.5.8/src/test/ssl/ssl/client_ca.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/client_ca.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/client_ca.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC8wIYcmeePSXVufP/Hn/6ICEogIUXqSNls5QIJR7Sate4iKGGT
-DEsRTxI4oDgkOYtcQNuEeXMf6k3xo+PRR08IEQNkXKy1zUWds6UBFboD72SyuTE2
-lxJBg+xOAWgl7JSNA+g8e0Y+wfhfxGZgRuqVxVNP9sAsfCEzGKna1l46dQIDAQAB
-AoGAMAXDmU9G7NvBtuSypvV76txBD7+nbB4ww1XYmMfXmW0kMyiW+rSr/LFjb2jE
-H+NMI6KUtzW3Jq2UOyB5e+tqnbDjqZlQjnBYFnWKRa8SxsuamSAvGNLPIzur8rxm
-qxOWkxlHpS+I6OXn263sWzG38ptQ3X4zK6ADcTpg7FkkYJkCQQDhCJH630aXQyia
-90QM+BaKp7rhr+DHW+vVU/5pg3FrPIuvRlLo+E8iJItY3Ae+AJylK6kP6/5AJzOz
-s1tXjZezAkEA1rnW4YIlWRlaJE4hXMNvF4VJO5MBtS60F4/z1kR0uVO5+JAgTZT0
-GE7ghZQ3VwdyRiWc59zXr2qkA75qtMFRNwJBAK0x82iqP6Jbxfy/Ilj4+CBvR547
-xzyourHNm5mJ2Nk4GCombdlwgzc7+SPC9RJ/VhCpsczXTTAC+//qovqXt5ECQEtF
-rlwzQWBwkLb1ZKCeKg12vetSZ2DaVGuGHRZZvQlSnnjSHWDU/JSg4fgxswyhIaAR
-g2WMd1eY7JIbaFChDBUCQQC46CikUDq2kfIPOkj/dsa4wLkUETrcgBx+eaZbOCgx
-JU7GqsoSXxTgKcjZPm/5O/rWWtwB9XhtTuvS/NYi3aSs
+MIICXQIBAAKBgQDCNjF1km/E2Zwi1TWCftfW+J6MUZmkdVts1MZeGkzH4j7fXCtO
+pTWN/RDwX45m+4Y8Q++sPHy6Ff2mdIDoHSVxUWbyIO0sjO0FRZmtACQCGWsnrPm2
+taHRJgRIt+/INJi64wi6mbQVR37ycS/+sev35UkwJ//tPb7RC77y1gXj2QIDAQAB
+AoGALo7NVpEvaDJ+wr74H/uGhMt/PsZFHe7gZvuvPlnxtC1hwywWWbkzWIGlcOqH
+edqseIAU0eaCRB4He8MMMBjko5WZcPRrE6mR0ZqtcTSIsg2dRkXJeSbY0A8ZPLjU
+xw0RiNPRwcr0zgImzMCR5dVuKOgnAGDRZiDwWefF0g6pRYECQQDwXJyT/E5EKOBY
+U4tioFMVypbYlyLXjvhKIFL6wdNAVIOa0LQ+X6cPBZRIM6q+eUjodHWnjf9uFX1i
+4mjegCwJAkEAztjruKRIoHAk6zQtSEv2vJhObeXg0gAHWRuCmivS/9NtqrEyGGpl
+V0YCe3T257Mrw7A0TgBf7lojkrSnOT+NUQJBAM4Fs7gstTE7EEDlKz4YSd8NzQpN
+UXIOe8eduUJyTI6BYmSaq0QjXOBFWfohPyMQdmu5FvfNgLls9hKCGn1Mw3ECQCMQ
+tvU4NG+uUzPkRoDpD8zs7O7Id5JiGtzKQxurrjtcNk0neNyWvNNMtQME0w54W0Tz
+TAqlGZ4ofbtTEL4tveECQQCFl7OS+Emv0kvUCUm4QQ/xR9bjZ80lRdRn0AwXPiPz
+zzYjV0OILDlMip+WrleC99v6R2M6BJrSPQr08oxeIUzy
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/client+client_ca.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/client+client_ca.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/client+client_ca.crt	1970-01-01 00:00:00.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/client+client_ca.crt	2017-08-07 21:13:41.000000000 +0000
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIBxzCCATACAQEwDQYJKoZIhvcNAQEFBQAwQjFAMD4GA1UEAww3VGVzdCBDQSBm
+b3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0IGNsaWVudCBjZXJ0czAe
+Fw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMBYxFDASBgNVBAMMC3NzbHRl
+c3R1c2VyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN3RFl8VWMEBN1Qas0
+w1CFcXdDEbKVNSPsqWHzHIEPoGJv+eUIBK2lQ/Ce8nRCdelO50RsmlbcXBIrjVl6
+BN0RmEeEVclgCdiamYN53LBdc5KWKpKCKn45lCtlZodWt0hNNx1pAmh85jDKpoO9
+ErbCnSU1wODPqnOzdkLU7jBu5QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABUz+vnu
+dD1Q1N/Ezs5DzJeQDtiJb9PNzBHAUPQoXeLvuITcDdyYWc18Yi4fX7gwyD42q2iu
+1I0hmm2bNJfujsGbvGYFLuQ4hC2ucAAj2Gm681GhhaNYtfsfHYm9R8GRZFvp40oj
+qXpkDkYsPdyVxUyoxJ+M0Ub5VC/k1pQNtIaq
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICCDCCAXGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBAMT4wPAYDVQQDDDVUZXN0
+IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzdWl0
+ZTAeFw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMEIxQDA+BgNVBAMMN1Rl
+c3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBjbGllbnQg
+Y2VydHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMI2MXWSb8TZnCLVNYJ+
+19b4noxRmaR1W2zUxl4aTMfiPt9cK06lNY39EPBfjmb7hjxD76w8fLoV/aZ0gOgd
+JXFRZvIg7SyM7QVFma0AJAIZayes+ba1odEmBEi378g0mLrjCLqZtBVHfvJxL/6x
+6/flSTAn/+09vtELvvLWBePZAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEAlGC24V2TsiSlo9RIboBZTZqd0raUpKkmVbkwKyqcmecoFfCI
+TCmoyJLYyUL5/e3dtn/cGDcaqxaO3qxnstxVEMSrlCGfZdZJ2oouXZMpDy9CkeOM
+ypCCx9pc4EmP3mvu64f21+dNCXlhM36pZ1IokeS5jk2FIHUda+m5jlk5o6I=
+-----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/client.crl postgresql-9.5-9.5.8/src/test/ssl/ssl/client.crl
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/client.crl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/client.crl	2017-08-07 21:13:41.000000000 +0000
@@ -1,9 +1,9 @@
 -----BEGIN X509 CRL-----
 MIIBHTCBhzANBgkqhkiG9w0BAQUFADBCMUAwPgYDVQQDDDdUZXN0IENBIGZvciBQ
-b3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3QgY2xpZW50IGNlcnRzFw0xNTAy
-MTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMBQwEgIBAhcNMTUwMjE2MjAwNjIzWjAN
-BgkqhkiG9w0BAQUFAAOBgQAsrnXoVeyU8vmxPOVQrHvoMXkEvF9dOnSHIQD0ZnAW
-pxbj98hCMSIW+DPIXXFebMQ6GIPp4S/w5kVpngY51paT4iztRMlV+YeyuZQuZX9a
-EVgpj4t+i6hhtBHk5p9DeknERoAIsl4m2maQ58lT5UyeN4fdz4eNP6y3mQRfSTUn
-bQ==
+b3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3QgY2xpZW50IGNlcnRzFw0xNjA5
+MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMBQwEgIBAhcNMTYwOTEyMTYzMDAxWjAN
+BgkqhkiG9w0BAQUFAAOBgQAyiU3V6ci5JR5oAZjlG7yFBhVO2TFLga5FynwHK5Wd
+ML0BA/0TtTXFiPoul+zvOdqwpX8GC3IuxqgJzlxWOxl5mZzyKEtheT9RBwvBmjAe
+ZjT7bFttKo/WKpztNE/2ZEDYyN87Xlpcm5UBFNhcYUjQkxuWIEvH4VOPm0iFjzm4
+tA==
 -----END X509 CRL-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/client.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/client.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/client.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/client.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
 MIIBxzCCATACAQEwDQYJKoZIhvcNAQEFBQAwQjFAMD4GA1UEAww3VGVzdCBDQSBm
 b3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0IGNsaWVudCBjZXJ0czAe
-Fw0xNTAyMTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMBYxFDASBgNVBAMMC3NzbHRl
-c3R1c2VyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDay1hT3/0Nj5ndv2TJ
-DxJZWQTOZD+/0ktqW9qyiRY9o0nf7PCQZE9OCh3ylaaPPfpL7iITZi1KASmSIn7M
-E4w1ibmBqFiogDE0Bq0DgJaoeUgLHMERDUtcxBJgwyCGjfI9Om4jy74kwMXb8I5i
-jVwZLUTSWzRSgany3WRqMb6CwwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBALfP/i7o
-ZVYsIZWksIb/uxr/AlghyNQjLPVJTAOjrm9PP9rwKR2alI/zjkDrHVH57n4MfcmD
-Xn247DRv/MJFJ1xWCSh4PCy0vyTCFAerNDcqniSTqp2+Yusdr0mH/gHa+34ASYu/
-MXXB4UBMjTnZ/KhaVTmAv3cPeiMAQODRud65
+Fw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMBYxFDASBgNVBAMMC3NzbHRl
+c3R1c2VyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN3RFl8VWMEBN1Qas0
+w1CFcXdDEbKVNSPsqWHzHIEPoGJv+eUIBK2lQ/Ce8nRCdelO50RsmlbcXBIrjVl6
+BN0RmEeEVclgCdiamYN53LBdc5KWKpKCKn45lCtlZodWt0hNNx1pAmh85jDKpoO9
+ErbCnSU1wODPqnOzdkLU7jBu5QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABUz+vnu
+dD1Q1N/Ezs5DzJeQDtiJb9PNzBHAUPQoXeLvuITcDdyYWc18Yi4fX7gwyD42q2iu
+1I0hmm2bNJfujsGbvGYFLuQ4hC2ucAAj2Gm681GhhaNYtfsfHYm9R8GRZFvp40oj
+qXpkDkYsPdyVxUyoxJ+M0Ub5VC/k1pQNtIaq
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/client.key postgresql-9.5-9.5.8/src/test/ssl/ssl/client.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/client.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/client.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDay1hT3/0Nj5ndv2TJDxJZWQTOZD+/0ktqW9qyiRY9o0nf7PCQ
-ZE9OCh3ylaaPPfpL7iITZi1KASmSIn7ME4w1ibmBqFiogDE0Bq0DgJaoeUgLHMER
-DUtcxBJgwyCGjfI9Om4jy74kwMXb8I5ijVwZLUTSWzRSgany3WRqMb6CwwIDAQAB
-AoGAJAMiR7Pvb+L5/XC6QwmzCHfJfbssbwNLHHd/+LDtszmEOFJEik+oafzqTvpo
-ztzxrLvGahEAVVT5pa791dNF2V//AKCDj3mOSVfrh6aYeA5naMT91JjnuRVgpdlc
-1b7p1FpbnwmzppqSbAfVQxmTlFxvVevukTqkAzP03uuQZ+kCQQD8XMpgCYXFuAl9
-n59OjS9Fi4oISI2lxFFxUK4KjGW4fOzS9/PdHepc4YBJQXSrDdELkH/un5AZQ7tr
-67R5YkB1AkEA3fKwaV0dPlXg78rVImUEXwNRM9SgxHquE6itzuT7RYg47bEnDHDm
-EGzN5QVs7TrxApk8KCxPUzlv/3vSWszPVwJBAMN+2mN1XQTi4a9IhW+jnZghVce+
-9MQShgjjOEABrRcy538zB94mO5TCN9AH/eo45NUxlnlzcHyx5LHgwUk7HLUCQQCP
-RhT/Ty6LiOCVqvf/Jfq2YuvOa5oEe7VX13Grt0FFV3R4a/1rGI5LWBFpoCD62yut
-o8GjpUbn0JIt+H6IQuItAkAqnLiP2ZJMhDoey8+btgwiAEoUnkDfa3bNA9wncJhO
-M3G4BM/bZhX5cuIaU7kPUHUS5fQeLLUfveWtbVSu1cRn
+MIICXAIBAAKBgQDN3RFl8VWMEBN1Qas0w1CFcXdDEbKVNSPsqWHzHIEPoGJv+eUI
+BK2lQ/Ce8nRCdelO50RsmlbcXBIrjVl6BN0RmEeEVclgCdiamYN53LBdc5KWKpKC
+Kn45lCtlZodWt0hNNx1pAmh85jDKpoO9ErbCnSU1wODPqnOzdkLU7jBu5QIDAQAB
+AoGBAMFEdSwGuTCoewwPXcNIRpUxJC1ENStdW1+42atarFPWV/QWYI35jmhkc0dW
+Cg3HEwUvm452C2wPyEM5DbK/VCacUkcvcA1taPnNjaw4qUjxRnsVCMhIZp0sCKEW
+N1LZhBcc9ThGyOvirRZfk3URqtW58nDqTKZeKZQr/d4DkNz1AkEA7QrHDZUdtdQw
+znG+8gsby7hK6+4h3F7ICD+RfUVAHEdSC2L59YsEH03d/kr62t1YOxdlMmCYK9sO
+7bthNibwhwJBAN5T8BDD1eRukPPGu602uAPRCfOgx6uoUGL78jTXUYGOiVG/fxkt
+EIr3m4G7KKj7LKipX8eowsCVC+Fj/3+SXDMCQAnzPN3OF5wtVwsjbS991eHcT5DN
+wzAb7muiN3o5sPI+8Cu4MOPkvPyPaTUmcpdDWVPJrJ7LvTeCD4NdLTx3r/sCQEsV
+g+zVhoX4BUIe6sELyseXMEo0EVrapBNZzSmlUiRz89JE3vKssnqMNttwTsIK2cE4
+Ol2ek+8gJvv+nooB7tsCQCu8ZYH75hVZGONfviwHk1RD5DegNZ6pT1Or4g9N23cj
+YbP58Lvi4tiQqG6zKMCosWFoDsiKKIH9qQkrygSCn3o=
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/client-revoked.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/client-revoked.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/client-revoked.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/client-revoked.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
 MIIBxzCCATACAQIwDQYJKoZIhvcNAQEFBQAwQjFAMD4GA1UEAww3VGVzdCBDQSBm
 b3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0IGNsaWVudCBjZXJ0czAe
-Fw0xNTAyMTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMBYxFDASBgNVBAMMC3NzbHRl
-c3R1c2VyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmApiFBFLZi/hgQOMz
-iAHXBbY7A5hNMitQZMSTUB+/fLnzofkUjf/7GiRCLmdTCa4w1wvQp5VbrEhIbSGW
-sFSam6GuE0IBfSRJA0IouBtxdk8bCY4HDpXsh/6eC9XtV4k9YDp4JlkUNxOVu8Pb
-Z86OEQf3Ww/EZP5AfwORXLYgVQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAEarnPO1
-Rc88mDYZWM8H/I18L0omdib21+lJczkm4sgv2hVp2nR4Wfb51DojYruLxNJ0k/A5
-T0nEZghQDtNQQpMko9e8jn8gmEAs83zQIsVsmosfTYg0Zr2pSkT0ILSfR6BupHFJ
-I96I+qcRKc4rotOirgMrcgo/VpUcWnz8VPEo
+Fw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMBYxFDASBgNVBAMMC3NzbHRl
+c3R1c2VyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKeycg+E5SBlaTxcus
+Fps4yZnGVB78Kt/HQAZcmgiwWZxN0th9SsJVMw2VkwMPPm4o8idEF/PZvbz15DHk
+MrNWSOMB8qsXlt3P8VMhKhWG025TbWpfXbNHKKqQqAc55i1SvQJvllrAYKOlpu/K
+YQsIK/ZpjeTywcVi19B3aPE82wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAE3vuzMF
+C5Ut6X981NjsuSlDptqDd8aQqO1HK7McEcH7Tjw6DU9ZPqw9Ktpz/wAJc2DvsmBM
+QqlM+OtSkEncAdWx/xOzN46oHUNxrR2cXD1N/0HgVHJEUfq8p+oJHYXKVWtsjO7S
+2/fZnMMO9Gv6e7eTiYE55R0IZrQENwtmIJ8y
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/client-revoked.key postgresql-9.5-9.5.8/src/test/ssl/ssl/client-revoked.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/client-revoked.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/client-revoked.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDmApiFBFLZi/hgQOMziAHXBbY7A5hNMitQZMSTUB+/fLnzofkU
-jf/7GiRCLmdTCa4w1wvQp5VbrEhIbSGWsFSam6GuE0IBfSRJA0IouBtxdk8bCY4H
-DpXsh/6eC9XtV4k9YDp4JlkUNxOVu8PbZ86OEQf3Ww/EZP5AfwORXLYgVQIDAQAB
-AoGBAOV1iXqJya1Fuc8sbHyoHk3IYPeWqoW4mwVkwcbElCeP4mJvH/Glh82VUr7D
-VEi+y4vlvN+3j4UY5jN6y5ts5bhDam4RjdHzhLT+ddlztoH4LNcgPDokQtPDtfOd
-UbbMcM6Pim7+ynBLncAj7dTin4/pVL2tYUIrKWvLhCU2zISxAkEA+CyHJZs49vOs
-hx8xEXGStdLq3k9vUk8G4BISicswixDWPQmJ3YN053FAZ+moHjqNpU5dMn7cVIcA
-HEW6LLS7IwJBAO1DbyWtCNQJZBKXzvBKxx9nOBb+5ovQZWs92bpvxkATPn4TUbQx
-nEe7eOPX+R2szP9+/3ApmZA1gV1mpVKsyicCQQCcUmf6jzCtlUXKgyJES5bPAwFA
-cSa84NyCzb9xnlSAdGWOYvC9YC2GD3czPSHRkK5iPt9DjFc6wyKVrHId8OWjAkBh
-8Yp6dRnF3jKPclec3mGg1w1SgNtPMDINuTSeP/IJFWigxvzdc/Vdr0hSVh+iXmkp
-t5VfCe04mL3UfsEUhfvVAkEA5Y05DCgaT+rOZbl6hMXlIqT5eT+xTatmDZzv6FUJ
-eAaYYhja/FrWa5JFXFUpFTamWGMTkfd6zsDS1bI6hwg/5Q==
+MIICXQIBAAKBgQDKeycg+E5SBlaTxcusFps4yZnGVB78Kt/HQAZcmgiwWZxN0th9
+SsJVMw2VkwMPPm4o8idEF/PZvbz15DHkMrNWSOMB8qsXlt3P8VMhKhWG025TbWpf
+XbNHKKqQqAc55i1SvQJvllrAYKOlpu/KYQsIK/ZpjeTywcVi19B3aPE82wIDAQAB
+AoGAKXV79pFBICRyF8HZSTw7vi3xUZ2p1oJE3bxrUQytGMbQbVLtxwHGtsFEV8sJ
+RlbHIZUrmxK4eG4UQdjeqlYDSBsV4x/g4sqpgQAoE1J6TQ9D3at6LqnvUa6ObjQW
+W/GczCkrQRkRTxwa35PSE2CcgNcoyUXRkF0DHhugPcOVjRkCQQD1jUQYgLoUKDbZ
+mZ1odm2adDu4BMFTd3pyQBVZmetlPrLVr8iU6bHJGUWpaFkpv/jbOJfNgijqQ3i6
+vZRhyHgHAkEA0xi6XZITkzmLP7qEQsho9JX02Pqqpd4ZQOp6CZDY6TH45oOBK0Bn
++xsfGENexiqU2EFtIChesScVpzTuvq2XjQJBALB82HTEEPpr7QB5aKmsdRqOcF3T
+DSDwvxFe/flop8gdSGxN690cGqxvfaJFXdCkKjlmc7VB2CaIWD3gBMZDUAECQQC8
+oUIXTurTCf6WSdLZ4j93H3CVWxiV8uraCSxX0+kgKBlj0mrf/UNtLQUSJ1FO/snW
+nFApBinnXyeILFKSbIgZAkB74ahj70+NmAFfEcgN3FjcHOy81rsvN9tO4rC0/0nt
+iYBz1jc4KBZdyQY1rgk2om9m+EC+mlJsxtgFNK3k/kRJ
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/.gitignore postgresql-9.5-9.5.8/src/test/ssl/ssl/.gitignore
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/.gitignore	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/.gitignore	2017-08-07 21:13:41.000000000 +0000
@@ -1,2 +1,3 @@
-*.old
-new_certs_dir
+/*.old
+/new_certs_dir/
+/client_tmp.key
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/root_ca.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/root_ca.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/root_ca.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/root_ca.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIIB9zCCAWACCQDrgvp38CAy8DANBgkqhkiG9w0BAQsFADBAMT4wPAYDVQQDDDVU
-ZXN0IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBz
-dWl0ZTAeFw0xNTAyMTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMEAxPjA8BgNVBAMM
-NVRlc3Qgcm9vdCBDQSBmb3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0
-IHN1aXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyTfGMPAjAylLr3G7c
-/QToCA3da5YZzdhd3TiQGugrJjWI4TzVB7pQ8IwDYk/jZf5TzVdEtz0B4TeIeUZl
-FLW9dMpa/8SY2TETvMTuXR5MOxyw6FMEKb3buolsIksCCQ1btEIrDZ+gv9SJXcdL
-ylU+VI1lKmn2fLNWWATzWrIUawIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAF2T84iG
-zWKXu+3PysuPOn7RuRpMgYQKouQktErNJ8hM7Yqj3vu879zUkX1rP0HGnx7xQC3d
-nBkoJ7yNDR0MwQpWo1Dj1HLKNEY6ojKJgPd0+m8nG+02yUmmOjo0oMYzJx2DQy0u
-Y4qecEd6aDbqXTo+qOJ7Qm/U+U4kD9MTT6GD
+MIICDjCCAXegAwIBAgIJAO2nC4XHXDkUMA0GCSqGSIb3DQEBCwUAMEAxPjA8BgNV
+BAMMNVRlc3Qgcm9vdCBDQSBmb3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0
+ZXN0IHN1aXRlMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowQDE+MDwG
+A1UEAww1VGVzdCByb290IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9u
+IHRlc3Qgc3VpdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vUDilEsB5
+qI9cGWTthAIjlvr2ngFJqHmMeOgTg4JQQ24MQedh0r22nDNwm80r4RD9RCjlw/k8
+sS+chRwQclJqpE6EV65TIH0JhOKGFpx/Pz/yrru5QwEDkYcHl1QcK3xFUKbSxi/B
+MCq4TZf63HkI6/VRY+1SwKF2a4pjWIaDAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADgYEAtBNiRyqydB+iy2DtoYYjsvq/q69o3UrbIhKPMlYE
+TJcgWyEz4gsRMnceM/dQl0dchZ8jrAbLiAbqr7PvitjdxGSQJ8w7Gb4IawPu3UCE
+TfMWiG5oYV1nHHZotEQuE+Gx4AdzSVGzLGj2xF9dSMxEQq7uPlpv67IeHEn5g3w1
+K5Y=
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/root_ca.key postgresql-9.5-9.5.8/src/test/ssl/ssl/root_ca.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/root_ca.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/root_ca.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCyTfGMPAjAylLr3G7c/QToCA3da5YZzdhd3TiQGugrJjWI4TzV
-B7pQ8IwDYk/jZf5TzVdEtz0B4TeIeUZlFLW9dMpa/8SY2TETvMTuXR5MOxyw6FME
-Kb3buolsIksCCQ1btEIrDZ+gv9SJXcdLylU+VI1lKmn2fLNWWATzWrIUawIDAQAB
-AoGAQ8TmMuO6e/QqUiUlKe8tBzfQdUDn+wTG4N4tGnBvn77VCCJ7qYhXY14aCUs7
-i/V/FcDtE1wF3woHvmJBxDd731TILBhuqn3UIWJafoiezlhqwR2uvTfnWh62N15w
-xlmGDuPwXMtQCazbcD6I9hgbADBbMmsyym8cuwN+hxU7bKECQQDfzkAN0RNI/m31
-7GVjOvWrd3+brwf19jXtxhzJCRThjyVyCMYfG9ELP/u76aNCMs2otn2K49Vd0s5A
-rG6uN4Z7AkEAy/QXExktz0YxaTMHYHafwSkraoygKVUIoxWm2AHhNXdSY1M8AqkL
-6VqGpNgcwiEE0QJHG0MFjB0tZAe9/kq+0QJAWqc+htozR5PXko+ImeMd87BZvgPt
-45ExUvi2XDAThzHmZwRqy9sGl9n466q9eGj/qOEShRm4KWLkLIor4uGW1QJAbj2h
-u1EA0ei/DH3ontt/vojiTtV0POMZqA0sAdYCRUQZ5FY5ObbmGVw1KyUlZkkysUbp
-6HJxrSqYPllw+OKuAQJBAN54Aep6BvzI+arJrOm2Un5l27jfPbuKmvJWjus1mU+e
-HkaXYUF31/LIN4gNeu0ULbCSKpvk00UaBfjbwvfLmAk=
+MIICXQIBAAKBgQDOL1A4pRLAeaiPXBlk7YQCI5b69p4BSah5jHjoE4OCUENuDEHn
+YdK9tpwzcJvNK+EQ/UQo5cP5PLEvnIUcEHJSaqROhFeuUyB9CYTihhacfz8/8q67
+uUMBA5GHB5dUHCt8RVCm0sYvwTAquE2X+tx5COv1UWPtUsChdmuKY1iGgwIDAQAB
+AoGAE+iNnmqR/PPCStVhvlUQwgQdt+3II+ew1MuzgPUhZZvKZv3X/zd62cagHndp
+E86A1NsfkbNd0NsDYM2ELMmJwC8cTKFw2WyB9t3v0GTtVG8e338QdrrTOvawO3F4
+f4tCESvBgY4qmJMuvicMqLey9fAXc8ul+wocRRYx4r1Gc4ECQQDpgATrxdy7vkf0
+KFxO6htUnKB/V5Q56qvlMzXKHSiwnCMKRYPY7NAxLVNVTmH3ACaBFCvg1f7++Yn7
+r5zEEcuLAkEA4g17NFfFZmBz37C9Cu1W6cX0ps0MgI9w38bEYy8LOk0liUGd+Qit
+AKpu8KNOb3v5FQ5TL25EaX1VhM78OE9v6QJBAIFHZPIZGY5E2te+pOT4Tut40I/Q
+sHukh0meIdDmdgnaWLguJsKq0tX3b2USwcCcr7TVszmHoegPxyq3X0dbRuMCQQDW
+7OhyWO1XrGcfjKQAyq4zMMKvARBc/4TbTtoUT3tGYGlK+jdfuw76LhGy/CIsP1wQ
+2ADhfN7QyZjQ4BfQ1j5ZAkBggAL3a/4+KjsPesTxWjlufmoL9QG8Bgaj1tWBYDzX
+5CQCWYRPVE7aV+Jh1NDHgToQsziZtvRL16l+GivYEnTX
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/root+client_ca.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/root+client_ca.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/root+client_ca.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/root+client_ca.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,26 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIB9zCCAWACCQDrgvp38CAy8DANBgkqhkiG9w0BAQsFADBAMT4wPAYDVQQDDDVU
-ZXN0IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBz
-dWl0ZTAeFw0xNTAyMTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMEAxPjA8BgNVBAMM
-NVRlc3Qgcm9vdCBDQSBmb3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0
-IHN1aXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyTfGMPAjAylLr3G7c
-/QToCA3da5YZzdhd3TiQGugrJjWI4TzVB7pQ8IwDYk/jZf5TzVdEtz0B4TeIeUZl
-FLW9dMpa/8SY2TETvMTuXR5MOxyw6FMEKb3buolsIksCCQ1btEIrDZ+gv9SJXcdL
-ylU+VI1lKmn2fLNWWATzWrIUawIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAF2T84iG
-zWKXu+3PysuPOn7RuRpMgYQKouQktErNJ8hM7Yqj3vu879zUkX1rP0HGnx7xQC3d
-nBkoJ7yNDR0MwQpWo1Dj1HLKNEY6ojKJgPd0+m8nG+02yUmmOjo0oMYzJx2DQy0u
-Y4qecEd6aDbqXTo+qOJ7Qm/U+U4kD9MTT6GD
+MIICDjCCAXegAwIBAgIJAO2nC4XHXDkUMA0GCSqGSIb3DQEBCwUAMEAxPjA8BgNV
+BAMMNVRlc3Qgcm9vdCBDQSBmb3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0
+ZXN0IHN1aXRlMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowQDE+MDwG
+A1UEAww1VGVzdCByb290IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9u
+IHRlc3Qgc3VpdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vUDilEsB5
+qI9cGWTthAIjlvr2ngFJqHmMeOgTg4JQQ24MQedh0r22nDNwm80r4RD9RCjlw/k8
+sS+chRwQclJqpE6EV65TIH0JhOKGFpx/Pz/yrru5QwEDkYcHl1QcK3xFUKbSxi/B
+MCq4TZf63HkI6/VRY+1SwKF2a4pjWIaDAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADgYEAtBNiRyqydB+iy2DtoYYjsvq/q69o3UrbIhKPMlYE
+TJcgWyEz4gsRMnceM/dQl0dchZ8jrAbLiAbqr7PvitjdxGSQJ8w7Gb4IawPu3UCE
+TfMWiG5oYV1nHHZotEQuE+Gx4AdzSVGzLGj2xF9dSMxEQq7uPlpv67IeHEn5g3w1
+K5Y=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIB8TCCAVoCAQIwDQYJKoZIhvcNAQEFBQAwQDE+MDwGA1UEAww1VGVzdCByb290
-IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc3VpdGUwHhcN
-MTUwMjE2MjAwNjIzWhcNNDIwNzA0MjAwNjIzWjBCMUAwPgYDVQQDDDdUZXN0IENB
-IGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3QgY2xpZW50IGNlcnRz
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8wIYcmeePSXVufP/Hn/6ICEog
-IUXqSNls5QIJR7Sate4iKGGTDEsRTxI4oDgkOYtcQNuEeXMf6k3xo+PRR08IEQNk
-XKy1zUWds6UBFboD72SyuTE2lxJBg+xOAWgl7JSNA+g8e0Y+wfhfxGZgRuqVxVNP
-9sAsfCEzGKna1l46dQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAD20Bmina/uXTLXO
-oPWgpMmKwQu7Q6DPXxItCUdWgK1k1D82brRjH+usrkrmCW5BQNXOC/0zJS22ioC1
-CJbhAujH3iPaV0C3xsVSf+bvTL6OMkwV/9x9OdDN+LI2auEt4S+fP5ZTVsTXt4wA
-A9cQIl2Qy88enZZAFKxrScFFlstp
+MIICCDCCAXGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBAMT4wPAYDVQQDDDVUZXN0
+IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzdWl0
+ZTAeFw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMEIxQDA+BgNVBAMMN1Rl
+c3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBjbGllbnQg
+Y2VydHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMI2MXWSb8TZnCLVNYJ+
+19b4noxRmaR1W2zUxl4aTMfiPt9cK06lNY39EPBfjmb7hjxD76w8fLoV/aZ0gOgd
+JXFRZvIg7SyM7QVFma0AJAIZayes+ba1odEmBEi378g0mLrjCLqZtBVHfvJxL/6x
+6/flSTAn/+09vtELvvLWBePZAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEAlGC24V2TsiSlo9RIboBZTZqd0raUpKkmVbkwKyqcmecoFfCI
+TCmoyJLYyUL5/e3dtn/cGDcaqxaO3qxnstxVEMSrlCGfZdZJ2oouXZMpDy9CkeOM
+ypCCx9pc4EmP3mvu64f21+dNCXlhM36pZ1IokeS5jk2FIHUda+m5jlk5o6I=
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/root+client.crl postgresql-9.5-9.5.8/src/test/ssl/ssl/root+client.crl
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/root+client.crl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/root+client.crl	2017-08-07 21:13:41.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN X509 CRL-----
 MIIBBDBvMA0GCSqGSIb3DQEBBQUAMEAxPjA8BgNVBAMMNVRlc3Qgcm9vdCBDQSBm
-b3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0IHN1aXRlFw0xNTAyMTYy
-MDA2MjNaFw00MjA3MDQyMDA2MjNaMA0GCSqGSIb3DQEBBQUAA4GBACEwQiR8BKoD
-eGuJKMy73AGLzNu3m7jUPWBPntGpNrUMZXNQXgtfm1t3twXbklQq4pao+9SKgT5X
-guXpfoa/mPLs//gsTEx0EQV/YzsXm2xFBUtaRq46GbJK3XTfRJLw7OOzBFij1o3i
-GaeVMn7IXwQBNkxQT0AAAiCUz5yz/Wvx
+b3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0IHN1aXRlFw0xNjA5MTIx
+NjMwMDFaFw00NDAxMjkxNjMwMDFaMA0GCSqGSIb3DQEBBQUAA4GBAAX612LU7WpG
+0AsQy1TPAXCwQdvzCVLU2L58unheWGSZruzlaLrh/x435xJ/3a2p9ZxCPlAMTUNk
++4mz4BC14uB7nkKQlTGHH3o1qGhwFTmdXmeDDjzyBPEQkSEfcpLDampRBLaFjq/F
+yaKadxocukmCcbxXdiDZePFpf7TfuoIm
 -----END X509 CRL-----
 -----BEGIN X509 CRL-----
 MIIBHTCBhzANBgkqhkiG9w0BAQUFADBCMUAwPgYDVQQDDDdUZXN0IENBIGZvciBQ
-b3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3QgY2xpZW50IGNlcnRzFw0xNTAy
-MTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMBQwEgIBAhcNMTUwMjE2MjAwNjIzWjAN
-BgkqhkiG9w0BAQUFAAOBgQAsrnXoVeyU8vmxPOVQrHvoMXkEvF9dOnSHIQD0ZnAW
-pxbj98hCMSIW+DPIXXFebMQ6GIPp4S/w5kVpngY51paT4iztRMlV+YeyuZQuZX9a
-EVgpj4t+i6hhtBHk5p9DeknERoAIsl4m2maQ58lT5UyeN4fdz4eNP6y3mQRfSTUn
-bQ==
+b3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3QgY2xpZW50IGNlcnRzFw0xNjA5
+MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMBQwEgIBAhcNMTYwOTEyMTYzMDAxWjAN
+BgkqhkiG9w0BAQUFAAOBgQAyiU3V6ci5JR5oAZjlG7yFBhVO2TFLga5FynwHK5Wd
+ML0BA/0TtTXFiPoul+zvOdqwpX8GC3IuxqgJzlxWOxl5mZzyKEtheT9RBwvBmjAe
+ZjT7bFttKo/WKpztNE/2ZEDYyN87Xlpcm5UBFNhcYUjQkxuWIEvH4VOPm0iFjzm4
+tA==
 -----END X509 CRL-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/root.crl postgresql-9.5-9.5.8/src/test/ssl/ssl/root.crl
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/root.crl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/root.crl	2017-08-07 21:13:41.000000000 +0000
@@ -1,8 +1,8 @@
 -----BEGIN X509 CRL-----
 MIIBBDBvMA0GCSqGSIb3DQEBBQUAMEAxPjA8BgNVBAMMNVRlc3Qgcm9vdCBDQSBm
-b3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0IHN1aXRlFw0xNTAyMTYy
-MDA2MjNaFw00MjA3MDQyMDA2MjNaMA0GCSqGSIb3DQEBBQUAA4GBACEwQiR8BKoD
-eGuJKMy73AGLzNu3m7jUPWBPntGpNrUMZXNQXgtfm1t3twXbklQq4pao+9SKgT5X
-guXpfoa/mPLs//gsTEx0EQV/YzsXm2xFBUtaRq46GbJK3XTfRJLw7OOzBFij1o3i
-GaeVMn7IXwQBNkxQT0AAAiCUz5yz/Wvx
+b3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0IHN1aXRlFw0xNjA5MTIx
+NjMwMDFaFw00NDAxMjkxNjMwMDFaMA0GCSqGSIb3DQEBBQUAA4GBAAX612LU7WpG
+0AsQy1TPAXCwQdvzCVLU2L58unheWGSZruzlaLrh/x435xJ/3a2p9ZxCPlAMTUNk
++4mz4BC14uB7nkKQlTGHH3o1qGhwFTmdXmeDDjzyBPEQkSEfcpLDampRBLaFjq/F
+yaKadxocukmCcbxXdiDZePFpf7TfuoIm
 -----END X509 CRL-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/root+server_ca.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/root+server_ca.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/root+server_ca.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/root+server_ca.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,26 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIB9zCCAWACCQDrgvp38CAy8DANBgkqhkiG9w0BAQsFADBAMT4wPAYDVQQDDDVU
-ZXN0IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBz
-dWl0ZTAeFw0xNTAyMTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMEAxPjA8BgNVBAMM
-NVRlc3Qgcm9vdCBDQSBmb3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0
-IHN1aXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyTfGMPAjAylLr3G7c
-/QToCA3da5YZzdhd3TiQGugrJjWI4TzVB7pQ8IwDYk/jZf5TzVdEtz0B4TeIeUZl
-FLW9dMpa/8SY2TETvMTuXR5MOxyw6FMEKb3buolsIksCCQ1btEIrDZ+gv9SJXcdL
-ylU+VI1lKmn2fLNWWATzWrIUawIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAF2T84iG
-zWKXu+3PysuPOn7RuRpMgYQKouQktErNJ8hM7Yqj3vu879zUkX1rP0HGnx7xQC3d
-nBkoJ7yNDR0MwQpWo1Dj1HLKNEY6ojKJgPd0+m8nG+02yUmmOjo0oMYzJx2DQy0u
-Y4qecEd6aDbqXTo+qOJ7Qm/U+U4kD9MTT6GD
+MIICDjCCAXegAwIBAgIJAO2nC4XHXDkUMA0GCSqGSIb3DQEBCwUAMEAxPjA8BgNV
+BAMMNVRlc3Qgcm9vdCBDQSBmb3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0
+ZXN0IHN1aXRlMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowQDE+MDwG
+A1UEAww1VGVzdCByb290IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9u
+IHRlc3Qgc3VpdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vUDilEsB5
+qI9cGWTthAIjlvr2ngFJqHmMeOgTg4JQQ24MQedh0r22nDNwm80r4RD9RCjlw/k8
+sS+chRwQclJqpE6EV65TIH0JhOKGFpx/Pz/yrru5QwEDkYcHl1QcK3xFUKbSxi/B
+MCq4TZf63HkI6/VRY+1SwKF2a4pjWIaDAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADgYEAtBNiRyqydB+iy2DtoYYjsvq/q69o3UrbIhKPMlYE
+TJcgWyEz4gsRMnceM/dQl0dchZ8jrAbLiAbqr7PvitjdxGSQJ8w7Gb4IawPu3UCE
+TfMWiG5oYV1nHHZotEQuE+Gx4AdzSVGzLGj2xF9dSMxEQq7uPlpv67IeHEn5g3w1
+K5Y=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIB8TCCAVoCAQEwDQYJKoZIhvcNAQEFBQAwQDE+MDwGA1UEAww1VGVzdCByb290
-IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc3VpdGUwHhcN
-MTUwMjE2MjAwNjIzWhcNNDIwNzA0MjAwNjIzWjBCMUAwPgYDVQQDDDdUZXN0IENB
-IGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNlcnRz
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDAYtajRx8vM6IB0SLZsAhTD0Y
-VHM+/+t0a4m3JXolJBbo9/B2/WAN0IH1E2zmlalLc3JBmGsH1a8U5ZlRow3p2ODL
-rFra9FbOl0wekmRFvZeaRln/99dpI5itVpL97QPHO8QMMK1IsyurFA5GfuPOBx9P
-i0MvzsT0tYsRvR929QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAJw4ngOYElfyMYkS
-K6bOgMosrBoX8ns6jQgdXEzf7QOIa110bs6nD+XeJeKmzUAZ3wumXBTalPaiqkEz
-bq4nlsEs1phvj0Coy5eehjV3DB8bDLEneOlV5N9y4Z4VO1BrhX61bLiPXBRp1MZR
-I0sCdxhswSrq02/OuFGe6mqrSBBI
+MIICCDCCAXGgAwIBAgIBATANBgkqhkiG9w0BAQUFADBAMT4wPAYDVQQDDDVUZXN0
+IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzdWl0
+ZTAeFw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMEIxQDA+BgNVBAMMN1Rl
+c3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzZXJ2ZXIg
+Y2VydHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKpkEBIZexm3YZ94RA+c
+vUREqvLgECfHlP9BbkXySFPGWcAPt/0uSW62eVS3UFcB9083W4w/uilL75PXDHV1
+37fyq+6LHCYE5TinzVr5ECAtQMpIzlKkAuAPq3mTa1fklwT/MCz/PKGAljs2o95w
+mNyEJwTchOQ52fZjFexRiarNAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEAP1ZhwGxsL7GTNxfs2qwYCjsF2zYSjCPXtwJnKFu5ayGxz6dB
+paspokWFCglP1PwPAmINHeqp669WNnAmC5EixdTy2jcnod8NB6RlkOqJmNzVPhvO
+cTZXxKd3awOzz0+IJ2bMcC9JPXs8phhRuRgvSfKTTZVtdcFmVF/HYIrBB5Y=
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/root+server.crl postgresql-9.5-9.5.8/src/test/ssl/ssl/root+server.crl
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/root+server.crl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/root+server.crl	2017-08-07 21:13:41.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN X509 CRL-----
 MIIBBDBvMA0GCSqGSIb3DQEBBQUAMEAxPjA8BgNVBAMMNVRlc3Qgcm9vdCBDQSBm
-b3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0IHN1aXRlFw0xNTAyMTYy
-MDA2MjNaFw00MjA3MDQyMDA2MjNaMA0GCSqGSIb3DQEBBQUAA4GBACEwQiR8BKoD
-eGuJKMy73AGLzNu3m7jUPWBPntGpNrUMZXNQXgtfm1t3twXbklQq4pao+9SKgT5X
-guXpfoa/mPLs//gsTEx0EQV/YzsXm2xFBUtaRq46GbJK3XTfRJLw7OOzBFij1o3i
-GaeVMn7IXwQBNkxQT0AAAiCUz5yz/Wvx
+b3IgUG9zdGdyZVNRTCBTU0wgcmVncmVzc2lvbiB0ZXN0IHN1aXRlFw0xNjA5MTIx
+NjMwMDFaFw00NDAxMjkxNjMwMDFaMA0GCSqGSIb3DQEBBQUAA4GBAAX612LU7WpG
+0AsQy1TPAXCwQdvzCVLU2L58unheWGSZruzlaLrh/x435xJ/3a2p9ZxCPlAMTUNk
++4mz4BC14uB7nkKQlTGHH3o1qGhwFTmdXmeDDjzyBPEQkSEfcpLDampRBLaFjq/F
+yaKadxocukmCcbxXdiDZePFpf7TfuoIm
 -----END X509 CRL-----
 -----BEGIN X509 CRL-----
 MIIBHTCBhzANBgkqhkiG9w0BAQUFADBCMUAwPgYDVQQDDDdUZXN0IENBIGZvciBQ
-b3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNlcnRzFw0xNTAy
-MTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMBQwEgIBBhcNMTUwMjE2MjAwNjIzWjAN
-BgkqhkiG9w0BAQUFAAOBgQB1c54zLMueMtLiSmBT6kfXJe9o3Krd2n774g7kzNlR
-DeLpCHeUvyLF0m8YK09vbLv2W0r6VQnbjyQGr9xyweRLLtOXc0FIDsTO8g/jvMSq
-Q9zITuqWiCHRbNhi2B3HPo2NsrfA+tQEAZvMUgnynlerNvGkLWQZeC2UsxrrSs4t
-9Q==
+b3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNlcnRzFw0xNjA5
+MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMBQwEgIBBhcNMTYwOTEyMTYzMDAxWjAN
+BgkqhkiG9w0BAQUFAAOBgQAm5J6912hKDUWXyu3yCEk1j3KICE2J42ZjFRvxBNdO
+Zhv/iBjyFI6TmCVJqoe4GJbNG78xmNEl3/2ZUavG/aD0Z3xGu2xm0p+3Uh2zhfDQ
+VEdlgFNKNItS0AtKvoduoZUXKnz3Ft09yLmz9yHLu6EslIsYryi+wnZ5DwUBj5Ec
+WA==
 -----END X509 CRL-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server_ca.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/server_ca.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server_ca.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server_ca.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB8TCCAVoCAQEwDQYJKoZIhvcNAQEFBQAwQDE+MDwGA1UEAww1VGVzdCByb290
-IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc3VpdGUwHhcN
-MTUwMjE2MjAwNjIzWhcNNDIwNzA0MjAwNjIzWjBCMUAwPgYDVQQDDDdUZXN0IENB
-IGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNlcnRz
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDAYtajRx8vM6IB0SLZsAhTD0Y
-VHM+/+t0a4m3JXolJBbo9/B2/WAN0IH1E2zmlalLc3JBmGsH1a8U5ZlRow3p2ODL
-rFra9FbOl0wekmRFvZeaRln/99dpI5itVpL97QPHO8QMMK1IsyurFA5GfuPOBx9P
-i0MvzsT0tYsRvR929QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAJw4ngOYElfyMYkS
-K6bOgMosrBoX8ns6jQgdXEzf7QOIa110bs6nD+XeJeKmzUAZ3wumXBTalPaiqkEz
-bq4nlsEs1phvj0Coy5eehjV3DB8bDLEneOlV5N9y4Z4VO1BrhX61bLiPXBRp1MZR
-I0sCdxhswSrq02/OuFGe6mqrSBBI
+MIICCDCCAXGgAwIBAgIBATANBgkqhkiG9w0BAQUFADBAMT4wPAYDVQQDDDVUZXN0
+IHJvb3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzdWl0
+ZTAeFw0xNjA5MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMEIxQDA+BgNVBAMMN1Rl
+c3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Npb24gdGVzdCBzZXJ2ZXIg
+Y2VydHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKpkEBIZexm3YZ94RA+c
+vUREqvLgECfHlP9BbkXySFPGWcAPt/0uSW62eVS3UFcB9083W4w/uilL75PXDHV1
+37fyq+6LHCYE5TinzVr5ECAtQMpIzlKkAuAPq3mTa1fklwT/MCz/PKGAljs2o95w
+mNyEJwTchOQ52fZjFexRiarNAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEAP1ZhwGxsL7GTNxfs2qwYCjsF2zYSjCPXtwJnKFu5ayGxz6dB
+paspokWFCglP1PwPAmINHeqp669WNnAmC5EixdTy2jcnod8NB6RlkOqJmNzVPhvO
+cTZXxKd3awOzz0+IJ2bMcC9JPXs8phhRuRgvSfKTTZVtdcFmVF/HYIrBB5Y=
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server_ca.key postgresql-9.5-9.5.8/src/test/ssl/ssl/server_ca.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server_ca.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server_ca.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDDAYtajRx8vM6IB0SLZsAhTD0YVHM+/+t0a4m3JXolJBbo9/B2
-/WAN0IH1E2zmlalLc3JBmGsH1a8U5ZlRow3p2ODLrFra9FbOl0wekmRFvZeaRln/
-99dpI5itVpL97QPHO8QMMK1IsyurFA5GfuPOBx9Pi0MvzsT0tYsRvR929QIDAQAB
-AoGAcq9i1INvAJFN6cRUdKOeVTbwK3HnQWLjh9mC6bpZxqQd8S94NZK4Pgelloux
-HT9hjGU+CgPo1ne+e0y4ycFaeWf6SFyMJ3KmGFKCliE6A5zd/g+rIp8oja0Y7eLZ
-PUdx984qynfvFMxgB+VJk22cLui9az65WCY+akdWbnwfR4ECQQD4GH6S71bZya9G
-/DDS2YYi3Cvke6wsGSXTMyfDaW42M3mtJOrmoczrx1sAzTmO4rwhuzFFQRs662IS
-/c9nmXOhAkEAyTgK9BNbkb5n2KN0Ebpx+x9cCh7fJ6qY54DOk+svp2jOhBcV9Aqd
-fYPHzPI0v358buPjozXgALNl7FGrO6sC1QJBAPKrwuMmiOVuiav9ciRL8RCYG7bZ
-4Ycg8garuvFBZzRNFW9u9PWyvibCURlvpCVHUo4L9B2xmVkAdGXvLbhAOQECQQDD
-9zKjtl6NuFRGphmaUmxDV605pgtLBFhZzhZh9MC6V9YYyqr0u4nZ/YeOz6wTe0oQ
-bRz7jLKVvCHdX0RWnhvpAkEAhY+plw7q6fyXSBBOVUcHUO2Wtmdm8clvKbs64Wdl
-bjryhvBhq3gPii7jnLGwS2v5jwqCcKpK1tszO/8+gj2T+A==
+MIICXAIBAAKBgQCqZBASGXsZt2GfeEQPnL1ERKry4BAnx5T/QW5F8khTxlnAD7f9
+LklutnlUt1BXAfdPN1uMP7opS++T1wx1dd+38qvuixwmBOU4p81a+RAgLUDKSM5S
+pALgD6t5k2tX5JcE/zAs/zyhgJY7NqPecJjchCcE3ITkOdn2YxXsUYmqzQIDAQAB
+AoGATaLcI7MSgOwqggPFVyu+nS2AiruHAOkSPZ/tg9daFznISRegaK6/bL+d1vjT
+lWFi8ugxQV0EEK710XHpzldQAH0YQ9YA86s7P/a4SjETdRChFYt+CV+aZ4feyNPV
+OZcKuoE82MUFU03jaJsWJJ4jybPPTcZ0Rr25oFpkR2fnPMECQQDXrRWviHuLkmrV
+WqZQLXiPt6bCrTowpnKo62Un5yrA7dehfL9b12J7/9tgfy0ZHXZtBXSHlELZ4LeA
+wpYfsq59AkEAyj99EE++kU2QbkCqYKJ5xBQxNc2ntZ/EfiBXMuQNwncj4m86xFLj
+coFHyOrRjo1GZAFxsZsNbf74xgMLDxIOkQJAHzKiWGndtSrQ2Vvrgt2Q+vkN3ktA
+h5kMLPMgBs2hmZbOAkYRSC+3x0gTa7n5xBBG+S441QPVR78BzFZZcOxf4QJBAIVk
+lH8iqYU6jE07l2Q/JWK/Eqny529yXe32NK0bHzwoymE5jaAZL2zBefA5eFe2NDwX
+e75xjs0Cw2AOd8fL2BECQBqAafyDcER1SasqV5hkjyFQQu8FqzLUyppwbTKTRZji
+s+xxGwP9jT9LaKC6w9nuzFmaGi0OO3ciE+I+X89YiKc=
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-cn-and-alt-names.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/server-cn-and-alt-names.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-cn-and-alt-names.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-cn-and-alt-names.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
 MIICSTCCAbKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMUAwPgYDVQQDDDdUZXN0
 IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNl
-cnRzMB4XDTE1MDIxNjIwMDYyM1oXDTQyMDcwNDIwMDYyM1owRjEeMBwGA1UECwwV
+cnRzMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowRjEeMBwGA1UECwwV
 UG9zdGdyZVNRTCB0ZXN0IHN1aXRlMSQwIgYDVQQDDBtjb21tb24tbmFtZS5wZy1z
-c2x0ZXN0LnRlc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMH7OtRvW0qP
-gYDMInkd0mgKnqhexEUnTf90mGihzd4sw91J0bJBnC/wfLmpP9a1wOwvAma1GSJ2
-1lLFrSC8bXkT+6nIiqXlFK4HqW5w3PktbO1InujFS1PoxXOdlSwdcIzQ+VDk3Kv3
-IVnCq9w8rcchthnSb+3kYx5QjA0Gb1vhAgMBAAGjSzBJMEcGA1UdEQRAMD6CHWRu
+c2x0ZXN0LnRlc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALsIeqZ7pHER
+w0nqVgePeSDdr7/fXMNtF/yFk4ZYUXGLuyzterEUaxeSYB5jmNAeY7ANRjbMb5N9
+mvoHHUsz0AzVNFihcSvP5nB9xIAEypMUF7qoXNVgXbG33gFKLbfNWqbuLUqaiWCb
++B7ahLVPTbm16Kwaw0sEMcSALED/lsMfAgMBAAGjSzBJMEcGA1UdEQRAMD6CHWRu
 czEuYWx0LW5hbWUucGctc3NsdGVzdC50ZXN0gh1kbnMyLmFsdC1uYW1lLnBnLXNz
-bHRlc3QudGVzdDANBgkqhkiG9w0BAQUFAAOBgQCBBVEMkprc18bqWcZ8P93JGc1r
-lJoSARfIkBuAkJODyQHJ6kp6fq1kuR8seax35VPNXIvBlPqXoS9zvXYVmF/qOJEk
-TtW8YAACZywn02dM5CQRS7T9HCcBJeFUHxbGcBCY+AqzbhM+tGii6UnogjvqdKje
-ApVvu0m4MsSn+WWQlw==
+bHRlc3QudGVzdDANBgkqhkiG9w0BAQUFAAOBgQAcbbxoyusUuTKq+hz7wLiJfEis
+UHrq8BwakaOP0zTln8XBT3uvNeumjQQGciqMNsV8QQ0xT3XadO7R9ix5V5IzTxnC
+q4s1xKxSJsmVcPf9Ql43ev3S+lRnyw1ws4lfe9hOdKfOopjHpa+D2VW8/iRfhNj2
+PO7iYMyUZKXB0ynKTw==
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-cn-and-alt-names.key postgresql-9.5-9.5.8/src/test/ssl/ssl/server-cn-and-alt-names.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-cn-and-alt-names.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-cn-and-alt-names.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDB+zrUb1tKj4GAzCJ5HdJoCp6oXsRFJ03/dJhooc3eLMPdSdGy
-QZwv8Hy5qT/WtcDsLwJmtRkidtZSxa0gvG15E/upyIql5RSuB6lucNz5LWztSJ7o
-xUtT6MVznZUsHXCM0PlQ5Nyr9yFZwqvcPK3HIbYZ0m/t5GMeUIwNBm9b4QIDAQAB
-AoGAVOp2gWJR81zI0yoJeT2dyt/DPm9lueQP1+EhisQyC61K/IcBHehsx+udneTC
-RmqADqQxh+aFHzoobkmMlUUHInIF8gQe/brw6s27BemUSrT2M47BrZINnOKTvhVa
-6xnqcD46DkdYE3z4dF2DsZ+uzgw/bO4sksw/yus2C+2tLlUCQQD8dy5+Ivw7AUVW
-H5VNR0joFlR8xeJA8FA460+UhNle/oDtqEjq/YDotHdOnd8EePpR24/c3cMVfXj3
-uqTnKyo7AkEAxLJx8D55ZiDQYprL9DWONVuEk5WZJZIgCNRX+hlymf00Hfm67cue
-aD0Y8G1DA5vNywNVpUihdm9wDFPz/PSUkwJAevnG4NRDzq4QyyG5RRpLDhoKb3io
-e/9S5FbivbJ0e4w22wzU7/opt7BoSRgnUPNo40Sy79/precfbHQy7ROejwJASovu
-zsR+sgwhrh1Iywc5HFPRDTYXUrvs1CvWI/1dB6uFAw9QnysaoBr3xrdCPK3h8t0S
-qo+6Ue6uIp32zJnNbQJBALLb34EY6Au69ztILcUpYgzTE8wmXtBTt4RBQDMIw+F1
-ZBw3e3tZjKmOPJySq5v8jyNF5L3s5gd/GRtPRCTkOfo=
+MIICXQIBAAKBgQC7CHqme6RxEcNJ6lYHj3kg3a+/31zDbRf8hZOGWFFxi7ss7Xqx
+FGsXkmAeY5jQHmOwDUY2zG+TfZr6Bx1LM9AM1TRYoXErz+ZwfcSABMqTFBe6qFzV
+YF2xt94BSi23zVqm7i1Kmolgm/ge2oS1T025teisGsNLBDHEgCxA/5bDHwIDAQAB
+AoGAB0Hh+HnNvLFywXh9VBfGHHddrXVOVSrzhlHskob0yhIg9jJU03A2Y5jDcApv
+UIwNVDR/p/qwzalPDSqfgV6GURgqzS/If+qKN7aPiTZPwTB1I9zNVLf07EaZjS08
+IppwpVbFnrJww1WP/P5VRZxnkbhZ0ClZWm3Bo/V6Axi5O8kCQQDitdVoEerONTq3
+a3n6lzPm473l0P+gZdqbSeqRO59c0uMvE3aIged6cPQZ7WIAivID7Wh7AP0zHetz
+NQOCw1fNAkEA0zJfIDyNtkcuPzm9Eg5gQzdgusZ455Eij3VoSRJTX5fLDaBf/lo+
+z6bsGqmnGK8JVtKkpvSPV0L9R47KDCUCmwJBAKlWmKi7eV+9crY+mUYMWsBDrDxU
++Bue+MK1W3hPyKFVBEzNhORB490ZMbuMDH/LSSqV0kzOWFIuLwhGuPCbaKECQEeU
+VvFSFKWm0mHTa+VmwfGGH16uTeQOKKx+mm3JrEBF7igcJuzKIWe3p2YSAfQ3vu6S
+TgPX940Xw0gxeQFMuekCQQDHuGhGdj3faCSkW8/dIkAX37/VkOxSvaZGpmDxclZL
+g21KLL9Ng6wI56wvMo61TCK5gEPnpmDB8H5l3VULt9Yn
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-cn-only.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/server-cn-only.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-cn-only.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-cn-only.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
 MIIB/DCCAWWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBCMUAwPgYDVQQDDDdUZXN0
 IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNl
-cnRzMB4XDTE1MDIxNjIwMDYyM1oXDTQyMDcwNDIwMDYyM1owRjEeMBwGA1UECwwV
+cnRzMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowRjEeMBwGA1UECwwV
 UG9zdGdyZVNRTCB0ZXN0IHN1aXRlMSQwIgYDVQQDDBtjb21tb24tbmFtZS5wZy1z
-c2x0ZXN0LnRlc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOqxI3Umy7P+
-FqPSenj/4SgwJgKMM73Q0tJvaDNXb1ipfAUHbvnKCNUs693YjRdZwTAVXsYq8btC
-ja/4L24FLCNktLzQfxmVuueMgi7HuYevxVbhOXhxuy8cbTeC6FZj3F6vU7Obg5rM
-L6FNzVljbtx/YA2lM4H/lWafTp0mXnmFAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEA
-DLLwuxmM5ReGFO6L95kxK++vFa7oXNBw8JxagzqfnF85N2leNbpQxxsDS9U/Bavu
-D0okKJR1ezdWlT0AwJcOtnt/X/qoxVFo35rIEjDZv4rWveiPwe3BeYm2tWLRHgKI
-6NrPD+kXXqGFPHobbXBPvE2MrW4p+ojD0DTeO8ZXjj4=
+c2x0ZXN0LnRlc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALkR7DNyRnAE
+D7ZxnsfOPQ55QB0nM2onJmVZkG4EeqQJ6GZHJym7pHHwbww+dgXvlNzkv2SOvA+Y
+q8TXgYvSiKhZ4N4ReSWWZ71P+RqJXpSrj6K2mVKOw0Rno9kMt0370bQOnkvSQY9B
+WxJbxji2ks3oj4wma+1zje3i46IlwoYHAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEA
+G2ZMgJnCz3/kDv30Uun3YzVktMW4O1y9AbFR1YrbHM8xvVGFLpp9z2PVYOKwKeND
+oS3UjW/wJynAT3xPwY3Zg6GbTqx2Fu8BG9bb73RK2af1IT8sB1Pxj8t4kZr0egaO
+m8TIbipkZNVakwG9idiVYjn4CusqYthFsOKW+OHiM3I=
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-cn-only.key postgresql-9.5-9.5.8/src/test/ssl/ssl/server-cn-only.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-cn-only.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-cn-only.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDqsSN1Jsuz/haj0np4/+EoMCYCjDO90NLSb2gzV29YqXwFB275
-ygjVLOvd2I0XWcEwFV7GKvG7Qo2v+C9uBSwjZLS80H8ZlbrnjIIux7mHr8VW4Tl4
-cbsvHG03guhWY9xer1Ozm4OazC+hTc1ZY27cf2ANpTOB/5Vmn06dJl55hQIDAQAB
-AoGBAN1Vp9oBd5VNqS5g/y4EK+VJ218FuHpoaZsahEv/Rrx4QsU/aHLdDg11qxBy
-/UUrWZ2uWc5Mi+ON9bAiQSDicec0ybYD5+Nn3Yv6v82J4Lr6Nlg6lsMSXxr0tfh7
-1Jh4EZWkIvMilSyo2ft2bP5o/rBCiIKXPzLDOmaoYUurNwPVAkEA+uR8icow3Ig4
-DXatPDIVaCr66cfndBSmbXe9M0eY23ic/8VNqjyuo3CNLOqBupl5teZTv6dTLXY4
-9RD5U3x70wJBAO94OTptH8Mp5aJX5PX6x2eggydTBnSNUyZZp1FquFpE5GRhyd5O
-RO7V4f0fcZCyuJcZI9xNvkqLIC8WzyZ8FkcCQQCwJk2d/HxzyZv5L/KPCebnvQ1v
-p+/EG1+CCgingUQ8CyHHngJaXMKMc9Ba0ccFeQ3v/WedbuBCUffJcAJtcEALAkA7
-fIn60ZDKUmYQ5fSihiFyxJTP9/fqjBDTvgGqX/BbvDFgHkqfRqIpEkiJMH5ti3f/
-UOdvmoBi1Byyld/vl3ORAkEAzruQTKAG5HeD+XPijO1qtaNXAiyxLr49FkJsm/Yx
-sgM/ZMbLmYZwu6JHt3+Tvo1++scUuwrsYCUmTP1+Ca37Uw==
+MIICXQIBAAKBgQC5EewzckZwBA+2cZ7Hzj0OeUAdJzNqJyZlWZBuBHqkCehmRycp
+u6Rx8G8MPnYF75Tc5L9kjrwPmKvE14GL0oioWeDeEXkllme9T/kaiV6Uq4+itplS
+jsNEZ6PZDLdN+9G0Dp5L0kGPQVsSW8Y4tpLN6I+MJmvtc43t4uOiJcKGBwIDAQAB
+AoGBAJzj6r86UyhG6SMbcyWjWvNYKtgMEXQeOFiW8u+xcF57375E95hTcHb/AsT4
+dolVr3cLnI0cy6TVIli+8R2dnybVxgdV/NSWLk69HDb+YPh2cEA7TxAb3vSfMdyJ
+T4uC6ibyjAaWdmEDYhuhP45ALf8MKYHEdtmpdGVU0TtrcZThAkEA8oERu+OPXEVO
+OG6yJh6JKwrGOv5jEVK9G2v9ns0LiJDhnDc/wTv5/zq6GIQlWDViV7dmtYPedOAr
+Zk3e4HNUHwJBAMNemFSkwMew7jI0yQKuHLN3/kKQXi70ZGXHr6i6hzlcxgoa68zq
+Ayx9/4m3D4ucwzSTQo/84p7PA+JXTGLu0RkCQF07WgIOXtNuob/4bu1Q2BOANO4B
+Vz0VvjaIsh0XX9PFP7e7VfuIf3isr1c1ltXu0DxA+m/WnvP4KzdNwN4x+KkCQCrP
+mr/Jjnjzu26DBJ0yvBVTsQKzEgBmC24GMObfYOxf+QGT3qH7kZB5V7q8w4pLYrct
+ocNdnedA49AAYzu2q1kCQQDR5DJ+L/kM02pV4LLhbQ6U6nhBKDPXY26nob/TAtwq
+eODDcDiceMGKThwwnGEjEeO2w4uZEM124v5sJgZtlByD
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server.crl postgresql-9.5-9.5.8/src/test/ssl/ssl/server.crl
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server.crl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server.crl	2017-08-07 21:13:41.000000000 +0000
@@ -1,9 +1,9 @@
 -----BEGIN X509 CRL-----
 MIIBHTCBhzANBgkqhkiG9w0BAQUFADBCMUAwPgYDVQQDDDdUZXN0IENBIGZvciBQ
-b3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNlcnRzFw0xNTAy
-MTYyMDA2MjNaFw00MjA3MDQyMDA2MjNaMBQwEgIBBhcNMTUwMjE2MjAwNjIzWjAN
-BgkqhkiG9w0BAQUFAAOBgQB1c54zLMueMtLiSmBT6kfXJe9o3Krd2n774g7kzNlR
-DeLpCHeUvyLF0m8YK09vbLv2W0r6VQnbjyQGr9xyweRLLtOXc0FIDsTO8g/jvMSq
-Q9zITuqWiCHRbNhi2B3HPo2NsrfA+tQEAZvMUgnynlerNvGkLWQZeC2UsxrrSs4t
-9Q==
+b3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNlcnRzFw0xNjA5
+MTIxNjMwMDFaFw00NDAxMjkxNjMwMDFaMBQwEgIBBhcNMTYwOTEyMTYzMDAxWjAN
+BgkqhkiG9w0BAQUFAAOBgQAm5J6912hKDUWXyu3yCEk1j3KICE2J42ZjFRvxBNdO
+Zhv/iBjyFI6TmCVJqoe4GJbNG78xmNEl3/2ZUavG/aD0Z3xGu2xm0p+3Uh2zhfDQ
+VEdlgFNKNItS0AtKvoduoZUXKnz3Ft09yLmz9yHLu6EslIsYryi+wnZ5DwUBj5Ec
+WA==
 -----END X509 CRL-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-multiple-alt-names.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/server-multiple-alt-names.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-multiple-alt-names.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-multiple-alt-names.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
 MIICPzCCAaigAwIBAgIBBDANBgkqhkiG9w0BAQUFADBCMUAwPgYDVQQDDDdUZXN0
 IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNl
-cnRzMB4XDTE1MDIxNjIwMDYyM1oXDTQyMDcwNDIwMDYyM1owIDEeMBwGA1UECwwV
+cnRzMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowIDEeMBwGA1UECwwV
 UG9zdGdyZVNRTCB0ZXN0IHN1aXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQC0Bkarg2DSU/0+vFG5dgmxV38SSC006t69zkFmrkUMIEg0iuj4I44qlOf/6EP4
-++RfDwQpiUNRTQmTNwDmjmc1bsXysIvVPzIDKEgpvqI82T1sLpF14PogoNlAzdpu
-CnpnU+QTUS3Ic5dhxK8YHyVtsG5nfF/3u1S15p5UaPGiOwIDAQABo2cwZTBjBgNV
+gQC3KEGfUWKDHb5tzwJ58o5GaFwUctjQxOg4Wtf6TvBRnuAd7VYAVFRtdPLnH9k5
+dHDUpMw1bHx4nUmbnphtLJDS8VVowLyjKGAU/uOuQidUk0nCSllHPaE8soBZPV8x
+BwG7TQ47GO7Jg4dmcTLF+E4m3YbzHglOmoN5+vrwWSJnLQIDAQABo2cwZTBjBgNV
 HREEXDBagh1kbnMxLmFsdC1uYW1lLnBnLXNzbHRlc3QudGVzdIIdZG5zMi5hbHQt
 bmFtZS5wZy1zc2x0ZXN0LnRlc3SCGioud2lsZGNhcmQucGctc3NsdGVzdC50ZXN0
-MA0GCSqGSIb3DQEBBQUAA4GBAASEAOEwDFE4qCPXJPpEzma7+vRqVFedWPXFXoW0
-R3HCGlvYJKwnlgxf41ipWHWmJPHLdg+KVJtlfRQ5U2SIIn7yjr3Wk+apcvWMvDpQ
-lkIVTwCmSINnj8GjQqgJsHD6I75edRaMQk3PlurzdBWJp6oz+UWbYvGDRDC4pHWu
-nLhZ
+MA0GCSqGSIb3DQEBBQUAA4GBAANowuGrcHzwfVLHa1PC4W0obG2it61VaA+OFHwv
+OAloZTbbNslSh/RGyrD2ZafRZpZNhjNB3JRIt7bv5Y0j5YP7CQkp2ucD90V580Pe
+vuoP+jZ/f5ZIC2ffiG9ofPxQdJEHy63GWHSH668rWQBc12GhHqgwZXNoWRMJxVrj
+EZqd
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-multiple-alt-names.key postgresql-9.5-9.5.8/src/test/ssl/ssl/server-multiple-alt-names.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-multiple-alt-names.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-multiple-alt-names.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC0Bkarg2DSU/0+vFG5dgmxV38SSC006t69zkFmrkUMIEg0iuj4
-I44qlOf/6EP4++RfDwQpiUNRTQmTNwDmjmc1bsXysIvVPzIDKEgpvqI82T1sLpF1
-4PogoNlAzdpuCnpnU+QTUS3Ic5dhxK8YHyVtsG5nfF/3u1S15p5UaPGiOwIDAQAB
-AoGAPa3gzKbIp4drPvFatsZAb+hgey0LgBPwmOtv8PRIZ+0vkAD/7PSRovk9u6oi
-j84N4pvMe0ayL8rLOwsfXd7wcQTxDPxy+RkkMW7RRFzusPjeTMgS753/l4IqehCX
-2SLPBkE9e3/UMRR0vds8T7btgTrv3R8pcgntli7W6RPrmLECQQDgZDjxx9X9O36v
-SR29RhMUQdz0PQpHYwhtmBLECmr1Lpecu5Zr0JOaabWvd5Lzx1cV2hmldZFQP/gO
-fEdzhsfHAkEAzWIjB0y/NH61U4Bj4fML1dGnMEzO0wm0MVEMKjcmPJUbtktvZ6jD
-MedYw5VLcWbjXMAJt70UFjcxxAJPmZXZ7QJBAMKEnwiZX1uCc7OoAmvNj0SEQ/JF
-598ybl/y8HGZRlb86NkplKAp04qMEL/nPDCvoUKEKq9QV4PlsDd+bMItGIkCQFml
-omCHUVZakE84VWDEs7/K2U0t2YEoVSzJkaPDmr8K3qO9XY1Djp/zuTz1p46COG+9
-qwA2WdQwl1pVH+WMESkCQQC1UPYLBYIDj0JaJokSgBPh71Ui8/iBP0J1cvhvKOsS
-LrEO4JUq2HBFVcxb7QahHPC22dWI8HlIJgzlUi9BEJPv
+MIICXAIBAAKBgQC3KEGfUWKDHb5tzwJ58o5GaFwUctjQxOg4Wtf6TvBRnuAd7VYA
+VFRtdPLnH9k5dHDUpMw1bHx4nUmbnphtLJDS8VVowLyjKGAU/uOuQidUk0nCSllH
+PaE8soBZPV8xBwG7TQ47GO7Jg4dmcTLF+E4m3YbzHglOmoN5+vrwWSJnLQIDAQAB
+AoGAPUp4Y0MNz0il0ANFFd/oYoFLxwADtCEggLNNsRK3cujSoNEqRWPy+Mn4+wT6
+YTKpC0+2km4iXQ5tcmkpIueV8qAitks7n8Ed7qP9Le4MXePnzgn4lL0qY1zExESX
+ibAQy/ThPdRuWvelpAXpEOMZclZsix6ksFaAMdC7o8+KwdUCQQDcrd0/X4N+wlSa
+LBUcnTmhFI9gcPcvckZoxISHWV2B/QaDVvGA2gYMNJa3lEcuH07LfQh0rraEzAP3
+AhG8BRPnAkEA1Hj2+qKf7aBqcjyQ5yHdxsyw/wFF3ivH5dW7mShi/C6fo+qj6WSU
+JNLPN3nhJ++5IH3DuuCTop1qNwk9jEOJywJAQED3bJ5Y4S2gCIvRUdWNlBMyc/gw
+YMY7LgIaPHaOvWx42wETrFrO6/rb73PjDdDb1m//aEn+psfoV6FonIA1/QJBAK1D
+c4xRf39k2EkN8NA6wsKx+wgIPrR9GUboc1HjKE0jrBUca8wQs+oPauF/Z0eM6nd/
+d1R2fI4YNhxpUaKHFN8CQEpJAGi5/CfFQWdGuDbJwbXwNA8zKlyGohE/lGfjZx55
+LnL3KE/rQXKRaCmLyk5Ce6oZQkDiN7GVEwEz2wMJlys=
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-no-names.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/server-no-names.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-no-names.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-no-names.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
 MIIB1jCCAT+gAwIBAgIBBTANBgkqhkiG9w0BAQUFADBCMUAwPgYDVQQDDDdUZXN0
 IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNl
-cnRzMB4XDTE1MDIxNjIwMDYyM1oXDTQyMDcwNDIwMDYyM1owIDEeMBwGA1UECwwV
+cnRzMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowIDEeMBwGA1UECwwV
 UG9zdGdyZVNRTCB0ZXN0IHN1aXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDE2mzybnsgbq7owCPC0m+igNt5pBk5hDpzFAhpbAZ6hZ85AzHnLbpCDTH5w0Zm
-HeevCRkNcDgjqfoDo4DruXYpI8jH+QwuKvUwTt3GGm6C4lb3SBtfNdzJsk5kRE3o
-ziMG/OxtiApxFu14nbCnqMuDs3meykD1jHheK0CsHCKq2wIDAQABMA0GCSqGSIb3
-DQEBBQUAA4GBAFNfiKDTLJ2V7kgIWDEOcyKQY8T4cAzgz6jcpN9CePgATB2Yrb9P
-x7kkKW68h9SbEk6qtS4YQZjSXWKUqrjjIW22+DJSQAXMZoyADZTnZOASHjNXIzLE
-y6B1RX+c7CjolHHSYkbki3RqKGhTQr1hnwkq3N8Fl9bftT5zFuezwnjD
+gQC6VU212xAM+d99liOE5ROUG7qwuHhELgNbqGxUgNu8S/nKBrZSsGzWnqA4//iG
+DXTZLHszRctXVrkhq2VXFCmRZLajk8uw4GtGCwb/HdvANrDM3rwiU23yjX3Q5Dvh
+vHgkG+0PBf2Ghr+/XEbDkAwB0xi8QhO33F+1uQEH4XJM4QIDAQABMA0GCSqGSIb3
+DQEBBQUAA4GBAFBH5fx/I61acluRFTP5RJ8aymi8ez37+MoQ+Aftj1BXwcGSRe2E
+57c0VjWUooJGKy/gs/y9F09JngEhFRz0pUCMAKQMaciEJh17ai+QOuSo6/NsGA50
+dw+w4UrYbxJK1RxhgKIYY3sojJ/6G+VbprPlWtSPSEcukRGjj31XRIfp
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-no-names.key postgresql-9.5-9.5.8/src/test/ssl/ssl/server-no-names.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-no-names.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-no-names.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDE2mzybnsgbq7owCPC0m+igNt5pBk5hDpzFAhpbAZ6hZ85AzHn
-LbpCDTH5w0ZmHeevCRkNcDgjqfoDo4DruXYpI8jH+QwuKvUwTt3GGm6C4lb3SBtf
-NdzJsk5kRE3oziMG/OxtiApxFu14nbCnqMuDs3meykD1jHheK0CsHCKq2wIDAQAB
-AoGATKkLWHXx+TVhZD6/LnWpB83KqtpfAGkgIgShKfzpoPk8goVd/7ttF5/v4GZN
-miL3QND4MqWLF0hwls4rvKDjBH7q4zw+AR55pnfwoQMsfqMvAn7wZi5HKTah1xbj
-yf2J1N62pNW4ZdFnlcXmAPLVDxKyCYaZqdeqgr4VkLvgIVECQQD05OYFasP/5be1
-wSj7zxd5vPK2/EJ6CFN+gwXXYOZWWR7m90g3CXxMWeH7RPIlrfcPC8o8r6xna2BS
-E+BKzTYXAkEAzcfLpwZUHcCPrCipMsoC35FQhNCpecuZjVYx0oGsfiE6gu87ddLX
-H3YL7+EEmtPdps4fF/9WK87MSpj1IRFv3QJAJIEOTJZqmvV6GeyuGEL5Y9snbuFR
-Y3FkSMJtF3rJOuvT8GfB6vpN/e+UAOl5EubIogSG497n2w6lb/aog13thwJADtel
-WcO8F3VHJ5y7L32gnW2GyD2gq7dCuQ4Jg+x0e5h79uu4dzQg7hT+oWuygFRdvWVK
-mtmA5qIA3DSSIbN3RQJAd97xYxEPMF2NU+vdsLBxrkdH9tCHrqOlzEVTdhBCJrx/
-L/lJQvtxkpWEiFtQdd5OhAurNZ6iWoIdA7fhNHPCqg==
+MIICXQIBAAKBgQC6VU212xAM+d99liOE5ROUG7qwuHhELgNbqGxUgNu8S/nKBrZS
+sGzWnqA4//iGDXTZLHszRctXVrkhq2VXFCmRZLajk8uw4GtGCwb/HdvANrDM3rwi
+U23yjX3Q5DvhvHgkG+0PBf2Ghr+/XEbDkAwB0xi8QhO33F+1uQEH4XJM4QIDAQAB
+AoGBAJrFaDr5rqdYlc6W+wHT1SNctQE8+IiJP7jOeMzoC5yn7t9kG+UrLfxG3gb6
+ds/CNaB+VgcMng35tuTEnPRrhuoWh3d0jWZ/QqMklPMyrLO5s0wEOuW47D/KI4MR
+wKoucQW44LrTdQgKsa4ZJbILKMScanY1oQXXjq4tueZaxajBAkEA4w8gO1rby9zQ
+fIp2C4Mfi9Pe46c1/bM+AD+9hXRO9oYCE+aoi0ww4/qvE5fMYQluSmSd8Yhbvuzk
+nifMF2l5xQJBANIVTdPudQvviCoXXtexl71b4KVdX9EjuWTNTCx64YB2ISg30YNw
+xvlPvDQy/EvVj/3wSGAy5M/7ZVpkXCQe5G0CQC/Jgi4bzECWo6Zieb+ohB4opDNj
+gMB5VeY1hAyvUuMdhxhrJjPTAEMrAmfsPc56bqTnkjpASZbgQqlqlNCkmUUCQHlV
+epTLpWhWWMNOqiVTWbsxBGcdrchhpKLWe4c5FWKXV4Ed8/DBQvodFirjw5mc58QX
+cgW1fzesD5aMXjcybGUCQQCZwYJir3OQC+CJCrsvACSPr3SQm28hiuO4P41dC7eT
+JWluvXOGmWnZwskW/+6imEe7pGYnY81pKThnsV+CXfN9
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-revoked.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/server-revoked.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-revoked.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-revoked.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
 MIIB/DCCAWWgAwIBAgIBBjANBgkqhkiG9w0BAQUFADBCMUAwPgYDVQQDDDdUZXN0
 IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNl
-cnRzMB4XDTE1MDIxNjIwMDYyM1oXDTQyMDcwNDIwMDYyM1owRjEeMBwGA1UECwwV
+cnRzMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowRjEeMBwGA1UECwwV
 UG9zdGdyZVNRTCB0ZXN0IHN1aXRlMSQwIgYDVQQDDBtjb21tb24tbmFtZS5wZy1z
-c2x0ZXN0LnRlc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMGFtZgJN+Lt
-w1Bu6MmAB6h9IUrSFEVxUrrxwz5RG3UDiBkr8StZCM2hXLdSB9tSjBLIWILmuPCR
-ydyf70XFTTO8L0Mc6F38I+4GVthNp8h1VJIrl1wRQIfVqFbbKYKiyCQYITzezVuC
-UjHjo6xklmMewdInRrcNbWxNVkWH91zLAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEA
-m9bRiYypdOrU/1hCzo6bj3Ly39/zUZp+T5xBkLJQpgVLTU8GSEdP35kc3CWzEu77
-39610RY3X0A5fNTLs74t7w2dCViYPvNu/suu87AVtlioHMkwL3QEOUnWM/l23XUR
-mj33SwQfmLOV94cNLVTd8IZ9PIT0ARn/YrS1Prx1zeg=
+c2x0ZXN0LnRlc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOmX1G+61akp
+XA8zveTsQOtipWN8UzF0TbtxFO6LndM4RMlMFPrS/18KAbOFcfSjQvw9dfMXfOIk
+zuwIYtAPD2qVyWAGRvk0Xl5qEz8aaVBbayUN5uRMByF2vgbOMz4IEywNRTWZRS2x
+kAFO4/FCb/LRxD+82yck8zcZoL+SdbZZAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEA
+LryjYf+t8X5j4DeeRN0uh3OWUpzFo7FaVcakjDQSgZIdlgA9RofL81yzJZAoSqk1
+zT8jqo0HKOAwunbNJxhIH54gAIpsEE9624IUAoLMo8OUF2WdMWLXJJTljfbXx/Tb
+4ccuQvMLs+Um70Ogc7Mqm0+BM5N61lBdJOgMlDP511E=
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-revoked.key postgresql-9.5-9.5.8/src/test/ssl/ssl/server-revoked.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-revoked.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-revoked.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDBhbWYCTfi7cNQbujJgAeofSFK0hRFcVK68cM+URt1A4gZK/Er
-WQjNoVy3UgfbUowSyFiC5rjwkcncn+9FxU0zvC9DHOhd/CPuBlbYTafIdVSSK5dc
-EUCH1ahW2ymCosgkGCE83s1bglIx46OsZJZjHsHSJ0a3DW1sTVZFh/dcywIDAQAB
-AoGADWTrxLIepB5AvnhutEOgRBElFMCllojZaQcCtHV4qQititB3yMBI07KvcCDF
-WnDEMSict7KwajYs+pA3R2T4itVLCoz5iXYJ2CIf6XOJK+NYcf7XulSm5IqukbqT
-3KlofUY2GY/5DN9tgUUnAsZ7wh6iMaq/H+BPBcblZg2kyYECQQDpYRAjwepzpr0P
-gfohKYlfKJwQ9WWTRkMasn6q4DY6txeXNk5nMC9C3FHeiTgpfRr8GZBvk61lb6pV
-pFWADR2TAkEA1EepQ95Mums8BxU6/PAOhXKLlyYvldaIXcajv/+/PclVuEL8ko5z
-jspEGk7U/jqonwcN98R/h4ui7nxhoxIG6QJAFydgGIwWnJ7ARxeYH04lqOE4ip4u
-E6x23+Exm/ZeqvibSI9EvAwVxEZjgPaQMd2NndFTeR5np5aqiZCiQvAKLQJAfRs+
-xqDc14Ebf5Ejkq5n4H4BhrMamFQ3Sg0ntKAlNWTTACV6dWU+9Yh/WoHbRXmMpyyh
-LsS/5EKHY8YqRND7AQJAd+qIgqFUI0RAwvbmLxW/iR5JIKM5kZ4xJ13/O4x55XEI
-4H+8YS/nYPnjMpaEWrFppNfv2UEXD2L1OkJVuYx1Sg==
+MIICXAIBAAKBgQDpl9RvutWpKVwPM73k7EDrYqVjfFMxdE27cRTui53TOETJTBT6
+0v9fCgGzhXH0o0L8PXXzF3ziJM7sCGLQDw9qlclgBkb5NF5eahM/GmlQW2slDebk
+TAchdr4GzjM+CBMsDUU1mUUtsZABTuPxQm/y0cQ/vNsnJPM3GaC/knW2WQIDAQAB
+AoGATDyWQ6TZiK0L85Yyep00jt4SFkcEK9bGa897QmNkrgPmR0BCdJ4aZF0ysvFx
+gKMsAIDaluzqgC/9LIGMJlVT9RisKWQks2cPIs5gERmYg7uNzfYegbn4N2liRG5z
+d7aWevi82Dtie1xch2DdUW/mxGdvR4duyXOlSYUhbDmK8oECQQD4MylmccYxz8Ry
+7APVKXPMhSCmD86y4KGfWGtKuLo4vF4Ifaze7sVtEBznNQLIAn2U4M5XD4to/VQN
+2nT1ESHJAkEA8O8nDKC4vWtCXzMD2/DdHrJjxhCPbDJFp24PRFUia1yUOAgqcnfv
+UzXkdcxSv/zUBB/WejLEvvrQ6Ib48Lq4EQJAZ8ashsMHhYhDsXFxYM1GN7tqHUT6
+vdwid8e2hLWcV2CbSJ2TjFr1fVaBX0LQ+OPhskAUxl4fgjR50pkG0fjp0QJAJvB/
+/yp6sSKEt54nIYTsN+nc9kX26CW33DeNgB3CUlfEHMo1EgsQQwKSyfcb6KuUGJaM
+s3NBGRywZuRpl36WAQJBAKgyfmq15Ggoe4rQOyO774e1mfUQW6/fWVX8dE09ZxXz
+28Sy4/K16UDUzIzzuaW3L7WjzCKql82vy2PpmWX28OM=
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-single-alt-name.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/server-single-alt-name.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-single-alt-name.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-single-alt-name.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
 MIICBjCCAW+gAwIBAgIBAzANBgkqhkiG9w0BAQUFADBCMUAwPgYDVQQDDDdUZXN0
 IENBIGZvciBQb3N0Z3JlU1FMIFNTTCByZWdyZXNzaW9uIHRlc3Qgc2VydmVyIGNl
-cnRzMB4XDTE1MDIxNjIwMDYyM1oXDTQyMDcwNDIwMDYyM1owIDEeMBwGA1UECwwV
+cnRzMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVowIDEeMBwGA1UECwwV
 UG9zdGdyZVNRTCB0ZXN0IHN1aXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDnDMJShFXba5o4o1ubyRmV9AyJLVM+8nZaC1iJzqeIPObXYpbcp3bhXtowAwvk
-d3IGI/fBm/2/NKvYnyagTS9DUNRTnykHxlCKsMitx38+sU1EerkDltK0OId+obvZ
-eVD+h3j7pVfA0NPKXkpcP3xoihQU9I5kOPKQEIQPNAUfdwIDAQABoy4wLDAqBgNV
+gQD8lRO7m7xRlUJCKdkHdPnLKu/pbHLBgIYJk33nr22CQaM0UCgfCzr0LPaPCtlF
+r5D/WS/MIlyzaXHHJMnzbFB1bx3T9BQijobeO1LKS7s3ZyPEaiNVJoih6ZXlXMQ/
+sPp887EChn+COh9BWgnWbSV0Zq2m9bggDg83J34bIeWOmwIDAQABoy4wLDAqBgNV
 HREEIzAhgh9zaW5nbGUuYWx0LW5hbWUucGctc3NsdGVzdC50ZXN0MA0GCSqGSIb3
-DQEBBQUAA4GBAHDkKwNT8p+/sv0Q2dIo0jdFxtBdS/fnsHzjr5ZJNa9SXEer5m3v
-lMllzYW8lfTdR9PgBZ3y2lFZixD63ZF3nkIEYcD5njLp4ui7g2OVqxRfmt+rHefh
-HiKm5v5GLs72lhR4GQT13AsjGVS1WWZtYhO4LwTjN+nbjnRIpXIhrSC/
+DQEBBQUAA4GBAIIcaM6MHSbH9t8cQhgWKXhjqlph/oRsNwTTalSamLR6JeT9BWxp
+IZXrsgzIJsVlTSHj8JRZnv++6TVDe/1N2MtwNfJUqnblIFwaf83kulv18Vhwoh4l
+dqPNaBZqdk9+EWJwPSzolK2VRKZcea+E2sMZBTYAV3pijy1k/oC8OX1V
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-single-alt-name.key postgresql-9.5-9.5.8/src/test/ssl/ssl/server-single-alt-name.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-single-alt-name.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-single-alt-name.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDnDMJShFXba5o4o1ubyRmV9AyJLVM+8nZaC1iJzqeIPObXYpbc
-p3bhXtowAwvkd3IGI/fBm/2/NKvYnyagTS9DUNRTnykHxlCKsMitx38+sU1EerkD
-ltK0OId+obvZeVD+h3j7pVfA0NPKXkpcP3xoihQU9I5kOPKQEIQPNAUfdwIDAQAB
-AoGBAOP42uPAX1aY3Rp1VLZpvi0PGC9h4XmCkvRVrY6LsRHjxYFPbbtaIRpOFMq6
-tsk+cetNIfCOkdhPiB+9KMeSYMYShiyCrHfFxuS0FIP4rQhBB89wzcjffw2CYLGD
-Umx65+XVv6RBW85p6v4s1+LQMVUtf41yxm9JXT0TVDjEcgRBAkEA+/FKxv9DuZNZ
-Abjak3MeaULpnPl+Fxp+jg1M4wK12MFYCm2eBUx0X+cqVORErwLJ3gdXQBT7fJQz
-bNwxjUKuTQJBAOrFVKF2dtuPAeFBlKG4sy5azGfgzS6cAJQ4LPp4uGX7ve9C8OzI
-oZU21LT4cm3nuFSeMjcCKHmur85gFQrETtMCQQDKWu1yk8gzn1OX/H8iew3sAaBd
-Qk6yA8euFKSymJSyOeiax5xqKRQ3ixYHBSjdYGH/AOplP/UWBHqhbuIl0W7pAkAr
-f9qZfCizr8CqawtOF7njeeFr0eRSoYcd73auBhYsl0NvBJk9VkNSMXGiAnK5WHj3
-/MPTG2xCd5KNi5H6h7sPAkEApf8JUvEA5ZPkFAA6x+OXLmEL+nXOnJnhKjSUIVJx
-Pgp7FTy6eKg+/iUEyhRHw5So7QjwHqH61+CIBNS41vGPuA==
+MIICXwIBAAKBgQD8lRO7m7xRlUJCKdkHdPnLKu/pbHLBgIYJk33nr22CQaM0UCgf
+Czr0LPaPCtlFr5D/WS/MIlyzaXHHJMnzbFB1bx3T9BQijobeO1LKS7s3ZyPEaiNV
+Joih6ZXlXMQ/sPp887EChn+COh9BWgnWbSV0Zq2m9bggDg83J34bIeWOmwIDAQAB
+AoGBAOkekmraLvJBRzkXtJZcUVxBkdIn5LZRb+SQu2jFkdXhzMawoIceb1gD08Br
+6+KUSshSQXov0M1KKdf6TWYc9xfGg0+XgqPLw0CIJjdO8TZkIaaHZU803snWtM0e
+9PlhUm2T/RDdx0cG7HD4WR8x5ij1Fc+W5QsDOi5oCke0XC0xAkEA/+rmRUaOSOaI
+CohIH+oHlLTLfr0acAP2cjQHJkf5OUBVnyirfCcsFsxmnhvARuuIdftwd9p73Gw9
+MIGVV6TDIwJBAPyp5xByHy7sicsi2ynSTpS9JhuVvR9cdKBLGmbPQtS0Fb0rannR
+wyybfFIN1trfZJ6QmNKAPSPfUFhre3b4WikCQQDVOZYaairquojmnZ3aWVdvoyNZ
+uZ1pbyPLC2ZZkuYnuV6deXlHvCuT40Iswdp2PJA6HQEcG0HP6a8h1xXjLDgZAkEA
+wMKirTJTxgnh6l9SUyrGlsVjoGHx4k44D96catkvBHXLrAHGft/ghlStWTCDvYH3
+Et4AKYB6pLaHZp3BmPdKWQJBAMI65XkJC5+XESMUP26lC71eo6tMcJ9fBKOa7PEW
+M9I04AeId/3nbA2eKCebfUzrZOizeHHOjhH3Dubz3df8Ww8=
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-ss.crt postgresql-9.5-9.5.8/src/test/ssl/ssl/server-ss.crt
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-ss.crt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-ss.crt	2017-08-07 21:13:41.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICCDCCAXGgAwIBAgIJAJyw4sQKTY2UMA0GCSqGSIb3DQEBCwUAMEYxJDAiBgNV
+MIICCDCCAXGgAwIBAgIJAJ5i7OAq01pyMA0GCSqGSIb3DQEBCwUAMEYxJDAiBgNV
 BAMMG2NvbW1vbi1uYW1lLnBnLXNzbHRlc3QudGVzdDEeMBwGA1UECwwVUG9zdGdy
-ZVNRTCB0ZXN0IHN1aXRlMB4XDTE1MDIxNjIwMDYyM1oXDTQyMDcwNDIwMDYyM1ow
+ZVNRTCB0ZXN0IHN1aXRlMB4XDTE2MDkxMjE2MzAwMVoXDTQ0MDEyOTE2MzAwMVow
 RjEkMCIGA1UEAwwbY29tbW9uLW5hbWUucGctc3NsdGVzdC50ZXN0MR4wHAYDVQQL
 DBVQb3N0Z3JlU1FMIHRlc3Qgc3VpdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAOqxI3Umy7P+FqPSenj/4SgwJgKMM73Q0tJvaDNXb1ipfAUHbvnKCNUs693Y
-jRdZwTAVXsYq8btCja/4L24FLCNktLzQfxmVuueMgi7HuYevxVbhOXhxuy8cbTeC
-6FZj3F6vU7Obg5rML6FNzVljbtx/YA2lM4H/lWafTp0mXnmFAgMBAAEwDQYJKoZI
-hvcNAQELBQADgYEAGweDmEYzoEWb3WNn7Mc58ToPnl5DbRZdVmRjsyC6J5oZRu2E
-e/GZZ/1MSNPgccoyhdcPmSqTzUzbQnvYsqcHfuncA/oNJR3wvMV/wSy0QepklX1b
-ixjZg9c+mhQ/JTSjYnRK5iSTPNX4F3zkpvP79POuQYl/7Oihqxl0Mmkezuc=
+AoGBALkR7DNyRnAED7ZxnsfOPQ55QB0nM2onJmVZkG4EeqQJ6GZHJym7pHHwbww+
+dgXvlNzkv2SOvA+Yq8TXgYvSiKhZ4N4ReSWWZ71P+RqJXpSrj6K2mVKOw0Rno9kM
+t0370bQOnkvSQY9BWxJbxji2ks3oj4wma+1zje3i46IlwoYHAgMBAAEwDQYJKoZI
+hvcNAQELBQADgYEAZtnJALcQmbqBAm16RE/Smu75lBkniqlB0MwOJyGpDg5DkXtA
+YnZP139cRWKCjbWiYj4hgK0eGGRoBuubF6zRrRlYLV9iyZyRx1cBYyUbQBW+AfER
+jWiL4IBJWn7RNej6Uc0Th8Di5eEZapDt0DFkdALFhpFNaWJIcCUKpqEJHUA=
 -----END CERTIFICATE-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/ssl/server-ss.key postgresql-9.5-9.5.8/src/test/ssl/ssl/server-ss.key
--- postgresql-9.5-9.5.2/src/test/ssl/ssl/server-ss.key	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/ssl/server-ss.key	2017-08-07 21:13:41.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC6FTHDuNKbYQChNtxAFLKzJESIKOZh8WpgCN91HFtnXX4hp3rS
-bkEDIABlQdqfcXLk7PmlR/rboOIqwuIAaIa12BxEJ5KW2vtcSAFd17anhG/a9n8w
-cQnoEUvLLAp7V2xGJ8Cu8mtyv9Qsmd5bS+SFchmbIcMZUb4znZfIr7AWWQIDAQAB
-AoGAJvVzAtA6P8+ySw5qVHxA4aKxOnSdr1nU9KBG8ITsWhrH4pHm9BGjSN01V/3O
-oN0mueknZ0RHsB3h3CQLHxzDPwmsah7apU8W/1AVyZ9LDEMuoZQef3+JfegmuNMj
-YYtBR8xozTviOH0UH6t3VOW8Y2TLtZo5kMz3XwjWBS+cCYECQQDlPEfH1x9QGXNW
-Eo37QK4UkL6/2czIXWitvb5+79KiG70XYIxrQR9NhpZHSGjBlS+TqJ4tnQa/fv95
-v4I7Q5NpAkEAz88ax91FeHr8y41s01MmJ6Gs6EOrFEpoHGboDdbwJ50pME5XnVJu
-xjHPklHgwiWFf4dQURjv6hCPUMVpe1w9cQJAZocPk9Ijry+y5kxmNHo5YflbV3OS
-pAsjRpIXIa8iBl9hs5L7Ov1lgscvb7JzKCIRpXlFRiF1YzDqEwoUtW0EAQJAH+/c
-VcsT2ihMoZvilbe5rW2TfT6pFD07MuI916Ko1e25Xssre+onTB5roDklKbFKiwbo
-uQ30ESzqWad9RpAugQJBANmRD25BmlHbdBDg+Zfd+4jDPAjXN8OesslEs5dMvs8C
-vqGrozvmtpLRcLiIitTiT4TzuUPowgZQtCjC0X6jSGY=
+MIICXgIBAAKBgQC3ekl7kd5dbcgs5UDu2im/oNSranNRqfqe4USVtiD9NPEWIc43
+wJhkp7w5BOf4xwWukrhOkpTzPLJwYH5HsQL6gBFZi095VExrdRopmpk268l41rSD
+q+y0eWM+DoapoiU8tZ106RtMVSinDfXpXz6Nh9+WQ7/Q4EHWbREvf/SIeQIDAQAB
+AoGAWbacqaRIk2xznag3WNMp6L5OXsa9Pmgb2IYTkBSvCsBRRd4fxFkS6tythz/j
+4VwHZjXtktXPqSO7qIE2Hf3qkxfBpZ72qrvEDpHLXzEFXUamJMPRDZIBHrkfa/sl
+pq+z0siCwO/ozoiInQFxArHeZs8MoGd/FYtECwbuvQd9LuUCQQDkYhlrELE7MB47
+Ot+vgkodp84p2LHlY48cLfn0Es+3aDzusWZbNDENmY9tOubIygh3qo0G2NtSEGVK
+NZzm73GHAkEAzaoUKK3YCD95OKyj3FZ9P/32K1y7JqCH/9ux9dXBQLegdd0hWLk9
+USLlaPgC4FOVrSSbiQHbZ8lUewwtNeK1/wJBALf0nGy0wUzfcTpcLZh85Z4Fb/Yc
+6Q3Pp5IXJmIGVPFyMMJCeiO0Yl6F9hURgJrywOdCpN2DBwWO10dy77LD4zkCQQCP
+EJHnXk8aJbVYpFd0TcHhAvP8ZAxYKXGRnS0lWqWNNG9trf6lbm5mA4VcSLIPhHVp
+NT7wxpbukpGu6uCETInXAkEAhF7m+XeHvJ0vrdpI3OSOVTW8o9QZSqUffsGB6eRb
+v/dJvKgaz3JOzpvRS87lRUd62QfjfmiDXjyhllRn8OPMuw==
 -----END RSA PRIVATE KEY-----
diff -Nru postgresql-9.5-9.5.2/src/test/ssl/t/001_ssltests.pl postgresql-9.5-9.5.8/src/test/ssl/t/001_ssltests.pl
--- postgresql-9.5-9.5.2/src/test/ssl/t/001_ssltests.pl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/test/ssl/t/001_ssltests.pl	2017-08-07 21:13:41.000000000 +0000
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 use TestLib;
-use Test::More tests => 38;
+use Test::More tests => 40;
 use ServerSetup;
 use File::Copy;
 
@@ -75,16 +75,16 @@
 	ok(!$result, "$connstr (should fail)");
 }
 
-# The client's private key must not be world-readable. Git doesn't track
-# permissions (except for the executable bit), so they might be wrong after
-# a checkout.
-chmod 0600, "ssl/client.key";
+# The client's private key must not be world-readable, so take a copy
+# of the key stored in the code tree and update its permissions.
+copy("ssl/client.key", "ssl/client_tmp.key");
+chmod 0600, "ssl/client_tmp.key";
 
 #### Part 0. Set up the server.
 
 diag "setting up data directory in \"$tempdir\"...";
 start_test_server($tempdir);
-configure_test_server_for_ssl($tempdir);
+configure_test_server_for_ssl($tempdir, $SERVERHOSTADDR);
 switch_server_cert($tempdir, 'server-cn-only');
 
 ### Part 1. Run client-side tests.
@@ -231,17 +231,27 @@
 
 # correct client cert
 test_connect_ok(
-	"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client.key");
+	"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key");
 
 # client cert belonging to another user
 test_connect_fails(
-	"user=anotheruser sslcert=ssl/client.crt sslkey=ssl/client.key");
+	"user=anotheruser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key");
 
 # revoked client cert
 test_connect_fails(
 "user=ssltestuser sslcert=ssl/client-revoked.crt sslkey=ssl/client-revoked.key"
 );
 
+# intermediate client_ca.crt is provided by client, and isn't in server's ssl_ca_file
+switch_server_cert($tempdir, 'server-cn-only', 'root_ca');
+$common_connstr =
+"user=ssltestuser dbname=certdb sslkey=ssl/client_tmp.key sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR";
+
+test_connect_ok("sslmode=require sslcert=ssl/client+client_ca.crt");
+test_connect_fails("sslmode=require sslcert=ssl/client.crt");
 
 # All done! Save the log, before the temporary installation is deleted
 copy("$tempdir/client-log", "./client-log");
+
+# clean up
+unlink "ssl/client_tmp.key";
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/africa postgresql-9.5-9.5.8/src/timezone/data/africa
--- postgresql-9.5-9.5.2/src/timezone/data/africa	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/africa	2017-08-07 21:13:41.000000000 +0000
@@ -6,15 +6,15 @@
 # tz@iana.org for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2014-10-31):
+# From Paul Eggert (2017-02-20):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
 # Unfortunately this book contains many errors and cites no sources.
 #
-# Gwillim Law writes that a good source
-# for recent time zone data is the International Air Transport
+# Many years ago Gwillim Law wrote that a good source
+# for time zone data was the International Air Transport
 # Association's Standard Schedules Information Manual (IATA SSIM),
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.  Except where otherwise noted,
@@ -31,39 +31,33 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
+# European-style abbreviations are commonly used along the Mediterranean.
+# For sub-Saharan Africa abbreviations were less standardized.
 # Previous editions of this database used WAT, CAT, SAT, and EAT
-# for +0:00 through +3:00, respectively,
-# but Mark R V Murray reports that
-# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
-# 'WAT' is probably the best name for +1:00, as the common phrase for
+# for UT +00 through +03, respectively,
+# but in 1997 Mark R V Murray reported that
+# 'SAST' is the official abbreviation for +02 in the country of South Africa,
+# 'CAT' is commonly used for +02 in countries north of South Africa, and
+# 'WAT' is probably the best name for +01, as the common phrase for
 # the area that includes Nigeria is "West Africa".
-# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
 #
-# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
-# I'd guess that this was because people needed _some_ name for -1:00,
-# and at the time, far west Africa was the only major land area in -1:00.
-# This usage is now obsolete, as the last use of -1:00 on the African
-# mainland seems to have been 1976 in Western Sahara.
-#
-# To summarize, the following abbreviations seem to have some currency:
-#	-1:00	WAT	West Africa Time (no longer used)
-#	 0:00	GMT	Greenwich Mean Time
-#	 2:00	CAT	Central Africa Time
-#	 2:00	SAST	South Africa Standard Time
-# and Murray suggests the following abbreviation:
-#	 1:00	WAT	West Africa Time
-# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
-# for times before 1976, but this is the best I can think of
-# until we get more information.
+# To summarize, the following abbreviations seemed to have some currency:
+#	 +00	GMT	Greenwich Mean Time
+#	 +02	CAT	Central Africa Time
+#	 +02	SAST	South Africa Standard Time
+# and Murray suggested the following abbreviation:
+#	 +01	WAT	West Africa Time
+# Murray's suggestion seems to have caught on in news reports and the like.
+# I vaguely recall 'WAT' also being used for -01 in the past but
+# cannot now come up with solid citations.
 #
 # 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: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
+#	 +02	WAST	West Africa Summer Time
+#	 +03	CAST	Central Africa Summer Time (no longer used)
+#	 +03	SAST	South Africa Summer Time (no longer used)
+#	 +03	EAT	East Africa Time
+# 'EAT' also seems to have caught on; the others are rare but are paired
+# with better-attested non-DST abbreviations.
 
 # Algeria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -119,19 +113,19 @@
 # Cameroon
 # See Africa/Lagos.
 
-# Cape Verde
+# Cape Verde / Cabo Verde
 #
-# Shanks gives 1907 for the transition to CVT.
+# Shanks gives 1907 for the transition to +02.
 # Perhaps the 1911-05-26 Portuguese decree
-# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
+# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
 # merely made it official?
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907        # Praia
-			-2:00	-	CVT	1942 Sep
-			-2:00	1:00	CVST	1945 Oct 15
-			-2:00	-	CVT	1975 Nov 25  2:00
-			-1:00	-	CVT
+			-2:00	-	-02	1942 Sep
+			-2:00	1:00	-01	1945 Oct 15
+			-2:00	-	-02	1975 Nov 25  2:00
+			-1:00	-	-01
 
 # Central African Republic
 # See Africa/Lagos.
@@ -343,6 +337,12 @@
 # decision to abandon DST permanently.  See Ahram Online 2015-04-24.
 # http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx
 
+# From Steffen Thorsen (2016-04-29):
+# Egypt will have DST from July 7 until the end of October....
+# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx
+# From Mina Samuel (2016-07-04):
+# Egyptian government took the decision to cancel the DST,
+
 Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
 Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
 Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
@@ -382,7 +382,7 @@
 Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
-			 0:00	Ghana	%s
+			 0:00	Ghana	GMT/+0020
 
 # Guinea
 # See Africa/Abidjan.
@@ -391,20 +391,20 @@
 #
 # Shanks gives 1911-05-26 for the transition to WAT,
 # evidently confusing the date of the Portuguese decree
-# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
+# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
 # with the date that it took effect, namely 1912-01-01.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Bissau	-1:02:20 -	LMT	1912 Jan  1
-			-1:00	-	WAT	1975
+			-1:00	-	-01	1975
 			 0:00	-	GMT
 
 # Kenya
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Nairobi	2:27:16	-	LMT	1928 Jul
 			3:00	-	EAT	1930
-			2:30	-	BEAT	1940
-			2:45	-	BEAUT	1960
+			2:30	-	+0230	1940
+			2:45	-	+0245	1960
 			3:00	-	EAT
 Link Africa/Nairobi Africa/Addis_Ababa	 # Ethiopia
 Link Africa/Nairobi Africa/Asmara	 # Eritrea
@@ -420,18 +420,25 @@
 # See Africa/Johannesburg.
 
 # Liberia
-# From Paul Eggert (2006-03-22):
-# In 1972 Liberia was the last country to switch
-# from a UTC offset that was not a multiple of 15 or 20 minutes.
-# Howse reports that it was in honor of their president's birthday.
-# Shank & Pottenger report the date as May 1, whereas Howse reports Jan;
-# go with Shanks & Pottenger.
-# For Liberia before 1972, Shanks & Pottenger report -0:44, whereas Howse and
-# Whitman each report -0:44:30; go with the more precise figure.
+#
+# From Paul Eggert (2017-03-02):
+#
+# The Nautical Almanac for the Year 1970, p 264, is the source for -0:44:30.
+#
+# In 1972 Liberia was the last country to switch from a UTC offset
+# that was not a multiple of 15 or 20 minutes.  The 1972 change was on
+# 1972-01-07, according to an entry dated 1972-01-04 on p 330 of:
+# Presidential Papers: First year of the administration of
+# President William R. Tolbert, Jr., July 23, 1971-July 31, 1972.
+# Monrovia: Executive Mansion.
+#
+# Use the abbreviation "MMT" before 1972, as the more-accurate numeric
+# abbreviation "-004430" would be one byte over the POSIX limit.
+#
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Monrovia	-0:43:08 -	LMT	1882
 			-0:43:08 -	MMT	1919 Mar # Monrovia Mean Time
-			-0:44:30 -	LRT	1972 May # Liberia Time
+			-0:44:30 -	MMT	1972 Jan 7 # approximately MMT
 			 0:00	-	GMT
 
 ###############################################################################
@@ -458,7 +465,7 @@
 # http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
 #
 # From Paul Eggert (2013-10-25):
-# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
+# For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
@@ -590,7 +597,7 @@
 Rule Mauritius	2009	only	-	Mar	lastSun	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
-			4:00 Mauritius	MU%sT	# Mauritius Time
+			4:00 Mauritius	+04/+05
 # Agalega Is, Rodriguez
 # no information; probably like Indian/Mauritius
 
@@ -858,11 +865,11 @@
 Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
 Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
 Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
-Rule	Morocco	2011	only	-	Jul	31	 0	0	-
+Rule	Morocco	2011	only	-	Jul	31	 0:00	0	-
 Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	S
-Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
 Rule	Morocco	2012	only	-	Jul	20	 3:00	0	-
 Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	S
+Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
 Rule	Morocco	2013	only	-	Jul	 7	 3:00	0	-
 Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	S
 Rule	Morocco	2013	max	-	Oct	lastSun	 3:00	0	-
@@ -909,14 +916,14 @@
 # since most of it was then controlled by Morocco.
 
 Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
-			-1:00	-	WAT	1976 Apr 14
+			-1:00	-	-01	1976 Apr 14
 			 0:00	Morocco	WE%sT
 
 # Mozambique
 #
 # Shanks gives 1903-03-01 for the transition to CAT.
 # Perhaps the 1911-05-26 Portuguese decree
-# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
+# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
 # merely made it official?
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -943,16 +950,19 @@
 # the country are close to 40 minutes earlier in sunrise than the rest
 # of the country.
 #
-# From Paul Eggert (2007-03-31):
-# Apparently the Caprivi Strip informally observes Botswana time, but
-# we have no details.  In the meantime people there can use Africa/Gaborone.
+# From Paul Eggert (2017-02-22):
+# Although the Zambezi Region (formerly known as Caprivi) informally
+# observes Botswana time, we have no details about historical practice.
+# In the meantime people there can use Africa/Gaborone.
+# See: Immanuel S. The Namibian. 2017-02-23.
+# http://www.namibian.com.na/51480/read/Time-change-divides-lawmakers
 
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Namibia	1994	max	-	Sep	Sun>=1	2:00	1:00	S
 Rule	Namibia	1995	max	-	Apr	Sun>=1	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
-			1:30	-	SWAT	1903 Mar    # SW Africa Time
+			1:30	-	+0130	1903 Mar
 			2:00	-	SAST	1942 Sep 20  2:00
 			2:00	1:00	SAST	1943 Mar 21  2:00
 			2:00	-	SAST	1990 Mar 21 # independence
@@ -979,7 +989,7 @@
 # Réunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun # Saint-Denis
-			4:00	-	RET	# Réunion Time
+			4:00	-	+04
 #
 # Crozet Islands also observes Réunion time; see the 'antarctica' file.
 #
@@ -1014,7 +1024,7 @@
 # Seychelles
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun # Victoria
-			4:00	-	SCT	# Seychelles Time
+			4:00	-	+04
 # From Paul Eggert (2001-05-30):
 # Aldabra, Farquhar, and Desroches, originally dependencies of the
 # Seychelles, were transferred to the British Indian Ocean Territory
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/antarctica postgresql-9.5-9.5.8/src/timezone/data/antarctica
--- postgresql-9.5-9.5.2/src/timezone/data/antarctica	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/antarctica	2017-08-07 21:13:41.000000000 +0000
@@ -10,10 +10,8 @@
 # http://www.spri.cam.ac.uk/bob/periant.htm
 # for information.
 # Unless otherwise specified, we have no time zone information.
-#
-# Except for the French entries,
-# I made up all time zone abbreviations mentioned here; corrections welcome!
-# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
+
+# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited.
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
@@ -29,7 +27,7 @@
 #	previously sealers and scientific personnel wintered
 #	Margaret Turner reports
 #	http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
-#	(1999-09-30) that they're UTC+5, with no DST;
+#	(1999-09-30) that they're UT +05, with no DST;
 #	presumably this is when they have visitors.
 #
 # year-round bases
@@ -66,25 +64,29 @@
 # Background:
 # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
 
+# From Steffen Thorsen (2016-10-28):
+# Australian Antarctica Division informed us that Casey changed time
+# zone to UTC+11 in "the morning of 22nd October 2016".
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Casey	0	-	zzz	1969
-			8:00	-	AWST	2009 Oct 18  2:00
-						# Australian Western Std Time
-			11:00	-	CAST	2010 Mar  5  2:00  # Casey Time
-			8:00	-	AWST	2011 Oct 28  2:00
-			11:00	-	CAST	2012 Feb 21 17:00u
-			8:00	-	AWST
-Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
-			7:00	-	DAVT	1964 Nov    # Davis Time
-			0	-	zzz	1969 Feb
-			7:00	-	DAVT	2009 Oct 18  2:00
-			5:00	-	DAVT	2010 Mar 10 20:00u
-			7:00	-	DAVT	2011 Oct 28  2:00
-			5:00	-	DAVT	2012 Feb 21 20:00u
-			7:00	-	DAVT
-Zone Antarctica/Mawson	0	-	zzz	1954 Feb 13
-			6:00	-	MAWT	2009 Oct 18  2:00 # Mawson Time
-			5:00	-	MAWT
+Zone Antarctica/Casey	0	-	-00	1969
+			8:00	-	+08	2009 Oct 18  2:00
+			11:00	-	+11	2010 Mar  5  2:00
+			8:00	-	+08	2011 Oct 28  2:00
+			11:00	-	+11	2012 Feb 21 17:00u
+			8:00	-	+08	2016 Oct 22
+			11:00	-	+11
+Zone Antarctica/Davis	0	-	-00	1957 Jan 13
+			7:00	-	+07	1964 Nov
+			0	-	-00	1969 Feb
+			7:00	-	+07	2009 Oct 18  2:00
+			5:00	-	+05	2010 Mar 10 20:00u
+			7:00	-	+07	2011 Oct 28  2:00
+			5:00	-	+05	2012 Feb 21 20:00u
+			7:00	-	+07
+Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
+			6:00	-	+06	2009 Oct 18  2:00
+			5:00	-	+05
 # References:
 # Casey Weather (1998-02-26)
 # http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
@@ -108,7 +110,8 @@
 # O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
 # Prat, -6230-05941
 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
-# These locations have always used Santiago time; use TZ='America/Santiago'.
+# These locations employ Region of Magallanes time; use
+# TZ='America/Punta_Arenas'.
 
 # China - year-round bases
 # Great Wall, King George Island, -6213-05858, since 1985-02-20
@@ -137,8 +140,8 @@
 #	fishing stations operated variously 1819/1931
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Kerguelen	0	-	zzz	1950 # Port-aux-Français
-			5:00	-	TFT	# ISO code TF Time
+Zone Indian/Kerguelen	0	-	-00	1950 # Port-aux-Français
+			5:00	-	+05
 #
 # year-round base in the main continent
 # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
@@ -148,10 +151,10 @@
 # It was destroyed by fire on 1952-01-14.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/DumontDUrville 0 -	zzz	1947
-			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
-			0	-	zzz	1956 Nov
-			10:00	-	DDUT	# Dumont-d'Urville Time
+Zone Antarctica/DumontDUrville 0 -	-00	1947
+			10:00	-	+10	1952 Jan 14
+			0	-	-00	1956 Nov
+			10:00	-	+10
 
 # France & Italy - year-round base
 # Concordia, -750600+1232000, since 2005
@@ -176,8 +179,8 @@
 # was established on 1957-01-29.  Since Syowa station is still the main
 # station of Japan, it's appropriate for the principal location.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
-			3:00	-	SYOT	# Syowa Time
+Zone Antarctica/Syowa	0	-	-00	1957 Jan 29
+			3:00	-	+03
 # See:
 # NIPR Antarctic Research Activities (1999-08-17)
 # http://www.nipr.ac.jp/english/ara01.html
@@ -214,19 +217,19 @@
 # correct, but they should be quite close to the actual dates.
 #
 # From Paul Eggert (2014-03-21):
-# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
+# The CET-switching Troll rules require zic from tz 2014b or later, so as
 # suggested by Bengt-Inge Larsson comment them out for now, and approximate
 # with only UTC and CEST.  Uncomment them when 2014b is more prevalent.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	CET
-Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	CEST
-#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	CET
-#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	UTC
+#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	+01
+Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	+02
+#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	+01
+#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	+00
 # Remove the following line when uncommenting the above '#Rule' lines.
-Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	UTC
+Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	+00
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Troll	0	-	zzz	2005 Feb 12
+Zone Antarctica/Troll	0	-	-00	2005 Feb 12
 			0:00	Troll	%s
 
 # Poland - year-round base
@@ -265,10 +268,10 @@
 # changes during the year and does not necessarily correspond to mean
 # solar noon.  So the Vostok time might have been whatever the clocks
 # happened to be during their visit.  So we still don't really know what time
-# it is at Vostok.  But we'll guess UTC+6.
+# it is at Vostok.  But we'll guess +06.
 #
-Zone Antarctica/Vostok	0	-	zzz	1957 Dec 16
-			6:00	-	VOST	# Vostok time
+Zone Antarctica/Vostok	0	-	-00	1957 Dec 16
+			6:00	-	+06
 
 # S Africa - year-round bases
 # Marion Island, -4653+03752
@@ -300,8 +303,8 @@
 # <http://webexhibits.org/daylightsaving/g.html> says Rothera is -03 all year.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Rothera	0	-	zzz	1976 Dec  1
-			-3:00	-	ROTT	# Rothera time
+Zone Antarctica/Rothera	0	-	-00	1976 Dec  1
+			-3:00	-	-03
 
 # Uruguay - year round base
 # Artigas, King George Island, -621104-0585107
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/asia postgresql-9.5-9.5.8/src/timezone/data/asia
--- postgresql-9.5-9.5.2/src/timezone/data/asia	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/asia	2017-08-07 21:13:41.000000000 +0000
@@ -6,15 +6,15 @@
 # tz@iana.org for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2015-08-08):
+# From Paul Eggert (2017-01-13):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
 # Unfortunately this book contains many errors and cites no sources.
 #
-# Gwillim Law writes that a good source
-# for recent time zone data is the International Air Transport
+# Many years ago Gwillim Law wrote that a good source
+# for time zone data was the International Air Transport
 # Association's Standard Schedules Information Manual (IATA SSIM),
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.  Except where otherwise noted,
@@ -35,29 +35,24 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
-# I invented the abbreviations marked '*' in the following table;
-# the rest are from earlier versions of this file, or from other sources.
-# Corrections are welcome!
+# The following alphabetic abbreviations appear in these tables:
 #	     std  dst
 #	     LMT	Local Mean Time
 #	2:00 EET  EEST	Eastern European Time
 #	2:00 IST  IDT	Israel
-#	3:00 AST  ADT	Arabia*
-#	3:30 IRST IRDT	Iran*
-#	4:00 GST	Gulf*
 #	5:30 IST	India
-#	7:00 ICT	Indochina, most times and locations*
 #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)
 #	8:00 WITA	central Indonesia (Waktu Indonesia Tengah)
 #	8:00 CST	China
-#	8:00 IDT	Indochina, 1943-45, 1947-55, 1960-75 (some locations)*
-#	8:00 JWST	Western Standard Time (Japan, 1896/1937)*
-#	8:30 KST  KDT	Korea when at +0830*
-#	9:00 JCST	Central Standard Time (Japan, 1896/1937)
+#	8:30 KST  KDT	Korea when at +0830
 #	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
 #	9:00 JST  JDT	Japan
 #	9:00 KST  KDT	Korea when at +09
 #	9:30 ACST	Australian Central Standard Time
+# Otherwise, these tables typically use numeric abbreviations like +03
+# and +0330 for integer hour and minute UTC offsets.  Although earlier
+# editions invented alphabetic time zone abbreviations for every
+# offset, this did not reflect common practice.
 #
 # See the 'europe' file for Russia and Turkey in Asia.
 
@@ -65,7 +60,7 @@
 # Incorporates data for Singapore from Robert Elz' asia 1.1, as well as
 # additional information from Tom Yap, Sun Microsystems Intercontinental
 # Technical Support (including a page from the Official Airline Guide -
-# Worldwide Edition).  The names for time zones are guesses.
+# Worldwide Edition).
 
 ###############################################################################
 
@@ -79,19 +74,15 @@
 Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
 Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
 Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
-Rule RussiaAsia	1984	1991	-	Sep	lastSun	 2:00s	0	-
-Rule RussiaAsia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
-Rule RussiaAsia	1992	only	-	Mar	lastSat	23:00	1:00	S
-Rule RussiaAsia	1992	only	-	Sep	lastSat	23:00	0	-
-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	-
+Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
+Rule RussiaAsia	1985	2011	-	Mar	lastSun	 2:00s	1:00	S
+Rule RussiaAsia	1996	2011	-	Oct	lastSun	 2:00s	0	-
 
 # Afghanistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Kabul	4:36:48 -	LMT	1890
-			4:00	-	AFT	1945
-			4:30	-	AFT
+			4:00	-	+04	1945
+			4:30	-	+0430
 
 # Armenia
 # From Paul Eggert (2006-03-22):
@@ -120,13 +111,11 @@
 # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
-			3:00	-	YERT	1957 Mar    # Yerevan Time
-			4:00 RussiaAsia YER%sT	1991 Mar 31  2:00s
-			3:00	1:00	YERST	1991 Sep 23 # independence
-			3:00 RussiaAsia	AM%sT	1995 Sep 24  2:00s
-			4:00	-	AMT	1997
-			4:00 RussiaAsia	AM%sT	2012 Mar 25  2:00s
-			4:00	-	AMT
+			3:00	-	+03	1957 Mar
+			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
+			3:00 RussiaAsia	+03/+04	1995 Sep 24  2:00s
+			4:00	-	+04	1997
+			4:00 RussiaAsia	+04/+05
 
 # Azerbaijan
 
@@ -147,13 +136,12 @@
 Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
-			3:00	-	BAKT	1957 Mar    # Baku Time
-			4:00 RussiaAsia BAK%sT	1991 Mar 31  2:00s
-			3:00	1:00	BAKST	1991 Aug 30 # independence
-			3:00 RussiaAsia	AZ%sT	1992 Sep lastSat 23:00
-			4:00	-	AZT	1996     # Azerbaijan Time
-			4:00	EUAsia	AZ%sT	1997
-			4:00	Azer	AZ%sT
+			3:00	-	+03	1957 Mar
+			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
+			3:00 RussiaAsia	+03/+04	1992 Sep lastSun  2:00s
+			4:00	-	+04	1996
+			4:00	EUAsia	+04/+05	1997
+			4:00	Azer	+04/+05
 
 # Bahrain
 # See Asia/Qatar.
@@ -237,18 +225,17 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dhaka	6:01:40 -	LMT	1890
 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
-			6:30	-	BURT	1942 May 15 # Burma Time
-			5:30	-	IST	1942 Sep
-			6:30	-	BURT	1951 Sep 30
-			6:00	-	DACT	1971 Mar 26 # Dacca Time
-			6:00	-	BDT	2009
-			6:00	Dhaka	BD%sT
+			6:30	-	+0630	1942 May 15
+			5:30	-	+0530	1942 Sep
+			6:30	-	+0630	1951 Sep 30
+			6:00	-	+06	2009
+			6:00	Dhaka	+06/+07
 
 # Bhutan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Thimphu	5:58:36 -	LMT	1947 Aug 15 # or Thimbu
-			5:30	-	IST	1987 Oct
-			6:00	-	BTT	# Bhutan Time
+			5:30	-	+0530	1987 Oct
+			6:00	-	+06
 
 # British Indian Ocean Territory
 # Whitman and the 1995 CIA time zone map say 5:00, but the
@@ -258,25 +245,25 @@
 # then contained the Chagos Archipelago).
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Chagos	4:49:40	-	LMT	1907
-			5:00	-	IOT	1996 # BIOT Time
-			6:00	-	IOT
+			5:00	-	+05	1996
+			6:00	-	+06
 
 # Brunei
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar # Bandar Seri Begawan
-			7:30	-	BNT	1933
-			8:00	-	BNT
+			7:30	-	+0730	1933
+			8:00	-	+08
 
 # Burma / Myanmar
 
 # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Rangoon	6:24:40 -	LMT	1880        # or Yangon
+Zone	Asia/Yangon	6:24:40 -	LMT	1880        # or Rangoon
 			6:24:40	-	RMT	1920        # Rangoon Mean Time?
-			6:30	-	BURT	1942 May    # Burma Time
-			9:00	-	JST	1945 May  3
-			6:30	-	MMT	# Myanmar Time
+			6:30	-	+0630	1942 May
+			9:00	-	+09	1945 May  3
+			6:30	-	+0630
 
 # Cambodia
 # See Asia/Bangkok.
@@ -339,7 +326,7 @@
 # (could be true), for the moment I am assuming that those two
 # counties are mistakes in the astro.com data.
 
-# From Paul Eggert (2014-06-30):
+# From Paul Eggert (2017-01-05):
 # Alois Treindl kindly sent me translations of the following two sources:
 #
 # (1)
@@ -387,7 +374,7 @@
 # Lewiston (ME) Daily Sun (1939-05-29), p 17, said "Even the time is
 # different - the occupied districts going by Tokyo time, an hour
 # ahead of that prevailing in the rest of Shanghai."  Guess that the
-# Xujiahui Observatory was under French control and stuck with UT+8.
+# Xujiahui Observatory was under French control and stuck with UT +08.
 #
 # In earlier versions of this file, China had many separate Zone entries, but
 # this was based on what were apparently incorrect data in Shanks & Pottenger.
@@ -396,29 +383,27 @@
 # Proposed in 1918 and theoretically in effect until 1949 (although in practice
 # mainly observed in coastal areas), the five zones were:
 #
-# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT+8.5
-# Asia/Harbin (currently a link to Asia/Shanghai)
+# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT +08:30
+# Now part of Asia/Shanghai; its pre-1970 times are not recorded here.
 # Heilongjiang (except Mohe county), Jilin
 #
-# Zhongyuan Time ("Central plain Time") UT+8
-# Asia/Shanghai
+# Zhongyuan Time ("Central plain Time") UT +08
+# Now part of Asia/Shanghai.
 # most of China
-# This currently represents most other zones as well,
-# as apparently these regions have been the same since 1970.
 # Milne gives 8:05:43.2 for Xujiahui Observatory time; round to nearest.
-# Guo says Shanghai switched to UT+8 "from the end of the 19th century".
+# Guo says Shanghai switched to UT +08 "from the end of the 19th century".
 #
-# Long-shu Time (probably due to Long and Shu being two names of that area) UT+7
-# Asia/Chongqing (currently a link to Asia/Shanghai)
+# Long-shu Time (probably as Long and Shu were two names of the area) UT +07
+# Now part of Asia/Shanghai; its pre-1970 times are not recorded here.
 # Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
-# most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
+# most of Gansu; west Inner Mongolia; east Qinghai; and the Guangdong
 # counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
 # Yangchun, Yangjiang, Yu'nan, and Yunfu.
 #
-# Xin-zang Time ("Xinjiang-Tibet Time") UT+6
-# Asia/Urumqi
-# This currently represents Kunlun Time as well,
-# as apparently the two regions have been the same since 1970.
+# Xin-zang Time ("Xinjiang-Tibet Time") UT +06
+# This region is now part of either Asia/Urumqi or Asia/Shanghai with
+# current boundaries uncertain; times before 1970 for areas that
+# disagree with Ürümqi or Shanghai are not recorded here.
 # The Gansu counties Aksay, Anxi, Dunhuang, Subei; west Qinghai;
 # the Guangdong counties  Xuwen, Haikang, Suixi, Lianjiang,
 # Zhanjiang, Wuchuan, Huazhou, Gaozhou, Maoming, Dianbai, and Xinyi;
@@ -428,8 +413,8 @@
 # Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami,
 # Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan.
 #
-# Kunlun Time UT+5.5
-# Asia/Kashgar (currently a link to Asia/Urumqi)
+# Kunlun Time UT +05:30
+# This region is now in the same status as Xin-zang Time (see above).
 # West Tibet, including Pulan, Aheqi, Shufu, Shule;
 # West Xinjiang, including Aksu, Atushi, Yining, Hetian, Cele, Luopu, Nileke,
 # Zhaosu, Tekesi, Gongliu, Chabuchaer, Huocheng, Bole, Pishan, Suiding,
@@ -444,7 +429,7 @@
 #
 # On the other hand, ethnic Uyghurs, who make up about half the
 # population of Xinjiang, typically use "Xinjiang time" which is two
-# hours behind Beijing time, or UTC +0600. The government of the Xinjiang
+# hours behind Beijing time, or UT +06. The government of the Xinjiang
 # Uyghur Autonomous Region, (XAUR, or just Xinjiang for short) as well as
 # local governments such as the Ürümqi city government use both times in
 # publications, referring to what is popularly called Xinjiang time as
@@ -500,8 +485,8 @@
 # having the same time as Beijing.
 
 # From Paul Eggert (2014-06-30):
-# In the early days of the PRC, Tibet was given its own time zone (UT+6) but
-# this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
+# In the early days of the PRC, Tibet was given its own time zone (UT +06)
+# but this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
 # Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN
 # 978-0231142861 (2008), translator's introduction by Matthew Akester, p x.
 # As this is before our 1970 cutoff, Tibet doesn't need a separate zone.
@@ -515,12 +500,12 @@
 # Republics, the Soviet Union, the Kuomintang, and the People's Republic of
 # China, and tracking down all these organizations' timekeeping rules would be
 # quite a trick.  Approximate this lost history by a transition from LMT to
-# XJT at the start of 1928, the year of accession of the warlord Jin Shuren,
+# UT +06 at the start of 1928, the year of accession of the warlord Jin Shuren,
 # which happens to be the date given by Shanks & Pottenger (no doubt as a
-# guess) as the transition from LMT.  Ignore the usage of UT+8 before
-# 1986-02-01 under the theory that the transition date to UT+8 is unknown and
+# guess) as the transition from LMT.  Ignore the usage of +08 before
+# 1986-02-01 under the theory that the transition date to +08 is unknown and
 # that the sort of users who prefer Asia/Urumqi now typically ignored the
-# UT+8 mandate back then.
+# +08 mandate back then.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Beijing time, used throughout China; represented by Shanghai.
@@ -530,7 +515,7 @@
 # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
 # / Wulumuqi.  (Please use Asia/Shanghai if you prefer Beijing time.)
 Zone	Asia/Urumqi	5:50:20	-	LMT	1928
-			6:00	-	XJT
+			6:00	-	+06
 
 
 # Hong Kong (Xianggang)
@@ -725,7 +710,7 @@
 # be found from historical government announcement database.
 
 # From Paul Eggert (2014-07-03):
-# As per Yu-Cheng Chuang, say that Taiwan was at UT+9 from 1937-10-01
+# As per Yu-Cheng Chuang, say that Taiwan was at UT +09 from 1937-10-01
 # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
 # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
 
@@ -749,38 +734,47 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Taipei or Taibei or T'ai-pei
 Zone	Asia/Taipei	8:06:00 -	LMT	1896 Jan  1
-			8:00	-	JWST	1937 Oct  1
+			8:00	-	CST	1937 Oct  1
 			9:00	-	JST	1945 Sep 21  1:00
 			8:00	Taiwan	C%sT
 
 # Macau (Macao, Aomen)
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Macau	1961	1962	-	Mar	Sun>=16	3:30	1:00	S
-Rule	Macau	1961	1964	-	Nov	Sun>=1	3:30	0	-
-Rule	Macau	1963	only	-	Mar	Sun>=16	0:00	1:00	S
-Rule	Macau	1964	only	-	Mar	Sun>=16	3:30	1:00	S
-Rule	Macau	1965	only	-	Mar	Sun>=16	0:00	1:00	S
-Rule	Macau	1965	only	-	Oct	31	0:00	0	-
-Rule	Macau	1966	1971	-	Apr	Sun>=16	3:30	1:00	S
-Rule	Macau	1966	1971	-	Oct	Sun>=16	3:30	0	-
-Rule	Macau	1972	1974	-	Apr	Sun>=15	0:00	1:00	S
-Rule	Macau	1972	1973	-	Oct	Sun>=15	0:00	0	-
-Rule	Macau	1974	1977	-	Oct	Sun>=15	3:30	0	-
-Rule	Macau	1975	1977	-	Apr	Sun>=15	3:30	1:00	S
-Rule	Macau	1978	1980	-	Apr	Sun>=15	0:00	1:00	S
-Rule	Macau	1978	1980	-	Oct	Sun>=15	0:00	0	-
+Rule	Macau	1961	1962	-	Mar	Sun>=16	3:30	1:00	D
+Rule	Macau	1961	1964	-	Nov	Sun>=1	3:30	0	S
+Rule	Macau	1963	only	-	Mar	Sun>=16	0:00	1:00	D
+Rule	Macau	1964	only	-	Mar	Sun>=16	3:30	1:00	D
+Rule	Macau	1965	only	-	Mar	Sun>=16	0:00	1:00	D
+Rule	Macau	1965	only	-	Oct	31	0:00	0	S
+Rule	Macau	1966	1971	-	Apr	Sun>=16	3:30	1:00	D
+Rule	Macau	1966	1971	-	Oct	Sun>=16	3:30	0	S
+Rule	Macau	1972	1974	-	Apr	Sun>=15	0:00	1:00	D
+Rule	Macau	1972	1973	-	Oct	Sun>=15	0:00	0	S
+Rule	Macau	1974	1977	-	Oct	Sun>=15	3:30	0	S
+Rule	Macau	1975	1977	-	Apr	Sun>=15	3:30	1:00	D
+Rule	Macau	1978	1980	-	Apr	Sun>=15	0:00	1:00	D
+Rule	Macau	1978	1980	-	Oct	Sun>=15	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Macau	7:34:20 -	LMT	1912 Jan  1
-			8:00	Macau	MO%sT	1999 Dec 20 # return to China
-			8:00	PRC	C%sT
+			8:00	Macau	C%sT
 
 
 ###############################################################################
 
 # Cyprus
-#
+
 # Milne says the Eastern Telegraph Company used 2:14:00.  Stick with LMT.
-#
+# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
+
+# From Paul Eggert (2016-09-09):
+# Yesterday's Cyprus Mail reports that Northern Cyprus followed Turkey's
+# lead and switched from +02/+03 to +03 year-round.
+# http://cyprus-mail.com/2016/09/08/two-time-zones-cyprus-turkey-will-not-turn-clocks-back-next-month/
+#
+# From Even Scharning (2016-10-31):
+# Looks like the time zone split in Cyprus went through last night.
+# http://cyprus-mail.com/2016/10/30/cyprus-new-division-two-time-zones-now-reality/
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	S
 Rule	Cyprus	1975	only	-	Oct	12	0:00	0	-
@@ -795,7 +789,10 @@
 Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
 			2:00	Cyprus	EE%sT	1998 Sep
 			2:00	EUAsia	EE%sT
-# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
+Zone	Asia/Famagusta	2:15:48	-	LMT	1921 Nov 14
+			2:00	Cyprus	EE%sT	1998 Sep
+			2:00	EUAsia	EE%sT	2016 Sep  8
+			3:00	-	+03
 
 # Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
 # However, for various reasons many users expect to find it under Europe.
@@ -839,16 +836,15 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tbilisi	2:59:11 -	LMT	1880
 			2:59:11	-	TBMT	1924 May  2 # Tbilisi Mean Time
-			3:00	-	TBIT	1957 Mar    # Tbilisi Time
-			4:00 RussiaAsia TBI%sT	1991 Mar 31  2:00s
-			3:00	1:00	TBIST	1991 Apr  9 # independence
-			3:00 RussiaAsia GE%sT	1992        # Georgia Time
-			3:00 E-EurAsia	GE%sT	1994 Sep lastSun
-			4:00 E-EurAsia	GE%sT	1996 Oct lastSun
-			4:00	1:00	GEST	1997 Mar lastSun
-			4:00 E-EurAsia	GE%sT	2004 Jun 27
-			3:00 RussiaAsia	GE%sT	2005 Mar lastSun  2:00
-			4:00	-	GET
+			3:00	-	+03	1957 Mar
+			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
+			3:00 RussiaAsia +03/+04	1992
+			3:00 E-EurAsia	+03/+04	1994 Sep lastSun
+			4:00 E-EurAsia	+04/+05	1996 Oct lastSun
+			4:00	1:00	+05	1997 Mar lastSun
+			4:00 E-EurAsia	+04/+05	2004 Jun 27
+			3:00 RussiaAsia	+03/+04	2005 Mar lastSun  2:00
+			4:00	-	+04
 
 # East Timor
 
@@ -876,11 +872,10 @@
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dili	8:22:20 -	LMT	1912 Jan  1
-			8:00	-	TLT	1942 Feb 21 23:00 # E Timor Time
-			9:00	-	JST	1945 Sep 23
-			9:00	-	TLT	1976 May  3
-			8:00	-	WITA	2000 Sep 17  0:00
-			9:00	-	TLT
+			8:00	-	+08	1942 Feb 21 23:00
+			9:00	-	+09	1976 May  3
+			8:00	-	+08	2000 Sep 17  0:00
+			9:00	-	+09
 
 # India
 
@@ -895,9 +890,9 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Kolkata	5:53:28 -	LMT	1880        # Kolkata
 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
-			6:30	-	BURT	1942 May 15 # Burma Time
+			6:30	-	+0630	1942 May 15
 			5:30	-	IST	1942 Sep
-			5:30	1:00	IST	1945 Oct 15
+			5:30	1:00	+0630	1945 Oct 15
 			5:30	-	IST
 # The following are like Asia/Kolkata:
 #	Andaman Is
@@ -925,7 +920,7 @@
 # These would be the earliest possible times for a change.
 # Régimes horaires pour le monde entier, by Henri Le Corre, (Éditions
 # Traditionnelles, 1987, Paris) says that Java and Madura switched
-# from JST to UTC+07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
+# from UT +09 to +07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
 # (Hollandia).  For now, assume all Indonesian locations other than Jayapura
 # switched on 1945-09-23.
 #
@@ -936,11 +931,11 @@
 # summary published by the Time and Frequency Laboratory of the
 # Research Center for Calibration, Instrumentation and Metrology,
 # Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
-# The abbreviations are:
+# The time zone abbreviations and UT offsets are:
 #
-# WIB  - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
-# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
-# WIT  - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
+# WIB  - +07 - Waktu Indonesia Barat (Indonesia western time)
+# WITA - +08 - Waktu Indonesia Tengah (Indonesia central time)
+# WIT  - +09 - Waktu Indonesia Timur (Indonesia eastern time)
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Java, Sumatra
@@ -948,33 +943,33 @@
 # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
 # but this must be a typo.
 			7:07:12	-	BMT	1923 Dec 31 23:47:12 # Batavia
-			7:20	-	JAVT	1932 Nov    # Java Time
-			7:30	-	WIB	1942 Mar 23
-			9:00	-	JST	1945 Sep 23
-			7:30	-	WIB	1948 May
-			8:00	-	WIB	1950 May
-			7:30	-	WIB	1964
+			7:20	-	+0720	1932 Nov
+			7:30	-	+0730	1942 Mar 23
+			9:00	-	+09	1945 Sep 23
+			7:30	-	+0730	1948 May
+			8:00	-	+08	1950 May
+			7:30	-	+0730	1964
 			7:00	-	WIB
 # west and central Borneo
 Zone Asia/Pontianak	7:17:20	-	LMT	1908 May
 			7:17:20	-	PMT	1932 Nov    # Pontianak MT
-			7:30	-	WIB	1942 Jan 29
-			9:00	-	JST	1945 Sep 23
-			7:30	-	WIB	1948 May
-			8:00	-	WIB	1950 May
-			7:30	-	WIB	1964
+			7:30	-	+0730	1942 Jan 29
+			9:00	-	+09	1945 Sep 23
+			7:30	-	+0730	1948 May
+			8:00	-	+08	1950 May
+			7:30	-	+0730	1964
 			8:00	-	WITA	1988 Jan  1
 			7:00	-	WIB
 # Sulawesi, Lesser Sundas, east and south Borneo
 Zone Asia/Makassar	7:57:36 -	LMT	1920
 			7:57:36	-	MMT	1932 Nov    # Macassar MT
-			8:00	-	WITA	1942 Feb  9
-			9:00	-	JST	1945 Sep 23
+			8:00	-	+08	1942 Feb  9
+			9:00	-	+09	1945 Sep 23
 			8:00	-	WITA
 # Maluku Islands, West Papua, Papua
 Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
-			9:00	-	WIT	1944 Sep  1
-			9:30	-	ACST	1964
+			9:00	-	+09	1944 Sep  1
+			9:30	-	+0930	1964
 			9:00	-	WIT
 
 # Iran
@@ -1006,8 +1001,6 @@
 # for at least the last 5 years.  Before that, for a few years, the
 # date used was the first Thursday night of Farvardin and the last
 # Thursday night of Shahrivar, but I can't give exact dates....
-# I have also changed the abbreviations to what is considered correct
-# here in Iran, IRST for regular time and IRDT for daylight saving time.
 #
 # From Roozbeh Pournader (2005-04-05):
 # The text of the Iranian law, in effect since 1925, clearly mentions
@@ -1114,9 +1107,9 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tehran	3:25:44	-	LMT	1916
 			3:25:44	-	TMT	1946     # Tehran Mean Time
-			3:30	-	IRST	1977 Nov
-			4:00	Iran	IR%sT	1979
-			3:30	Iran	IR%sT
+			3:30	-	+0330	1977 Nov
+			4:00	Iran	+04/+05	1979
+			3:30	Iran	+0330/+0430
 
 
 # Iraq
@@ -1159,8 +1152,8 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baghdad	2:57:40	-	LMT	1890
 			2:57:36	-	BMT	1918     # Baghdad Mean Time?
-			3:00	-	AST	1982 May
-			3:00	Iraq	A%sT
+			3:00	-	+03	1982 May
+			3:00	Iraq	+03/+04
 
 
 ###############################################################################
@@ -1459,8 +1452,6 @@
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
-			9:00	-	JST	1896 Jan  1
-			9:00	-	JCST	1937 Oct  1
 			9:00	Japan	J%sT
 # Since 1938, all Japanese possessions have been like Asia/Tokyo.
 
@@ -1567,23 +1558,6 @@
 
 # Kazakhstan
 
-# From Paul Eggert (1996-11-22):
-# Andrew Evtichov (1996-04-13) writes that Kazakhstan
-# stayed in sync with Moscow after 1990, and that Aqtobe (formerly Aktyubinsk)
-# and Aqtau (formerly Shevchenko) are the largest cities in their zones.
-# Guess that Aqtau and Aqtobe diverged in 1995, since that's the first time
-# IATA SSIM mentions a third time zone in Kazakhstan.
-
-# From Paul Eggert (2006-03-22):
-# German Iofis, ELSI, Almaty (2001-10-09) reports that Kazakhstan uses
-# RussiaAsia rules, instead of switching at 00:00 as the IATA has it.
-# Go with Shanks & Pottenger, who have them always using RussiaAsia rules.
-# Also go with the following claims of Shanks & Pottenger:
-#
-# - Kazakhstan did not observe DST in 1991.
-# - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
-# - Oral switched from +5:00 to +4:00 in spring 1989.
-
 # From Kazakhstan Embassy's News Bulletin No. 11
 # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
 # The Government of Kazakhstan passed a resolution March 15 abolishing
@@ -1595,68 +1569,268 @@
 # was "blended" with the Central zone.  Therefore, Kazakhstan now has
 # two time zones, and difference between them is one hour.  The zone
 # closer to UTC is the former Western zone (probably still called the
-# same), encompassing four provinces in the west: Aqtobe, Atyrau,
-# Mangghystau, and West Kazakhstan.  The other zone encompasses
+# same), encompassing four provinces in the west: Aqtöbe, Atyraū,
+# Mangghystaū, and West Kazakhstan.  The other zone encompasses
 # everything else....  I guess that would make Kazakhstan time zones
 # de jure UTC+5 and UTC+6 respectively.
 
-#
+# From Stepan Golosunov (2016-03-27):
+# Review of the linked documents from http://adilet.zan.kz/
+# produced the following data for post-1991 Kazakhstan:
+#
+# 0. Act of the Cabinet of Ministers of the USSR
+# from 1991-02-04 No. 20
+# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102010545
+# removed the extra hour ("decree time") on the territory of the USSR
+# starting with the last Sunday of March 1991.
+# It also allowed (but not mandated) Kazakh SSR, Kirghiz SSR, Tajik SSR,
+# Turkmen SSR and Uzbek SSR to not have "summer" time.
+#
+# The 1992-01-13 act also refers to the act of the Cabinet of Ministers
+# of the Kazakh SSR from 1991-03-20 No. 170 "About the act of the Cabinet
+# of Ministers of the USSR from 1991-02-04 No. 20" but I didn't found its
+# text.
+#
+# According to Izvestia newspaper No. 68 (23334) from 1991-03-20
+# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
+# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
+# transition to "summer" time:
+# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
+# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
+# were to move clocks 1 hour forward.
+# Kazakh SSR (excluding Uralsk oblast); Republic of Kyrgyzstan, Tajik
+# SSR; Andijan, Jizzakh, Namangan, Sirdarya, Tashkent, Fergana oblasts
+# of the Uzbek SSR were to move clocks 1 hour backwards.
+# Other territories were to not move clocks.
+# When the "summer" time would end on 1991-09-29, clocks were to be
+# moved 1 hour backwards on the territory of the USSR excluding
+# Kazakhstan, Kirghizia, Uzbekistan, Turkmenia, Tajikistan.
+#
+# Apparently there were last minute changes. Apparently Kazakh act No. 170
+# was one of such changes.
+#
+# https://ru.wikipedia.org/wiki/Декретное врем�
+# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that
+# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast)
+# were to not move clocks and Uralsk oblast was to move clocks
+# forward; on 1991-09-29 Kazakhstan was to move clocks backwards.
+# (Probably there were changes even after that publication. There is an
+# article claiming that Kaliningrad oblast decided on 1991-03-29 to not
+# move clocks.)
+#
+# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
+# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
+# to +04/+05. It's unclear how Qyzylorda oblast moved into the fifth
+# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
+#
+# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
+# from 1992-01-13 No. 28
+# http://adilet.zan.kz/rus/docs/P920000028_
+# (text includes modification from the 1996 act)
+# introduced new rules for calculation of time, mirroring Russian
+# 1992-01-08 act.  It specified that time would be calculated
+# according to time belts plus extra hour ("decree time"), moved clocks
+# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
+# 2:00, specified DST rules.  It acknowledged that Kazakhstan was
+# located in the fourth and the fifth time belts and specified the
+# border between them to be located east of Qostanay and Aktyubinsk
+# oblasts (notably including Turgai and Qyzylorda oblasts into the fifth
+# time belt).
+#
+# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
+# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyraū and Qostanay oblasts; from
+# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk)....
+#
+# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
+# from 1992-03-27 No. 284
+# http://adilet.zan.kz/rus/docs/P920000284_
+# cancels extra hour ("decree time") for Uralsk and Qyzylorda oblasts
+# since the last Sunday of March 1992, while keeping them in the fourth
+# and the fifth time belts respectively.
+#
+# 3. Order of the Prime Minister of the Republic of Kazakhstan
+# from 1994-09-23 No. 384
+# http://adilet.zan.kz/rus/docs/R940000384_
+# cancels the extra hour ("decree time") on the territory of Mangghystaū
+# oblast since the last Sunday of September 1994 (saying that time on
+# the territory would correspond to the third time belt as a
+# result)....
+#
+# 4. Act of the Government of the Republic of Kazakhstan
+# from 1996-05-08 No. 575
+# http://adilet.zan.kz/rus/docs/P960000575_
+# amends the 1992-01-13 act to end summer time in October instead
+# of September, mirroring identical Russian change from 1996-04-23 act.
+#
+# 5. Act of the Government of the Republic of Kazakhstan
+# from 1999-03-26 No. 305
+# http://adilet.zan.kz/rus/docs/P990000305_
+# cancels the extra hour ("decree time") for Atyraū oblast since the
+# last Sunday of March 1999 while retaining the oblast in the fourth
+# time belt.
+#
+# This means change from +05/+06 to +04/+05....
+#
+# 6. Act of the Government of the Republic of Kazakhstan
+# from 2000-11-23 No. 1749
+# http://adilet.zan.kz/rus/archive/docs/P000001749_/23.11.2000
+# replaces the previous five documents.
+#
+# The only changes I noticed are in definition of the border between the
+# fourth and the fifth time belts.  They account for changes in spelling
+# and administrative division (splitting of Turgai oblast in 1997
+# probably changed time in territories incorporated into Qostanay oblast
+# (including Arkalyk) from +06/+07 to +05/+06) and move Qyzylorda oblast
+# from being in the fifth time belt and not using decree time into the
+# fourth time belt (no change in practice).
+#
+# 7. Act of the Government of the Republic of Kazakhstan
+# from 2003-12-29 No. 1342
+# http://adilet.zan.kz/rus/docs/P030001342_
+# modified the 2000-11-23 act.  No relevant changes, apparently.
+#
+# 8. Act of the Government of the Republic of Kazakhstan
+# from 2004-07-20 No. 775
+# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
+# modified the 2000-11-23 act to move Qostanay and Qyzylorda oblasts into
+# the fifth time belt and add Aktobe oblast to the list of regions not
+# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
+# zones (+04/+05 and +06/+07).  The changes were to be implemented
+# during DST transitions in 2004 and 2005 but the acts got radically
+# amended before implementation happened.
+#
+# 9. Act of the Government of the Republic of Kazakhstan
+# from 2004-09-15 No. 1059
+# http://adilet.zan.kz/rus/docs/P040001059_
+# modified the 2000-11-23 act to remove exceptions from the "decree time"
+# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
+# 2004-07-20 act to implement changes for Atyraū, West Kazakhstan,
+# Qostanay, Qyzylorda and Mangghystaū oblasts by not moving clocks
+# during the 2004 transition to "winter" time.
+#
+# This means transition from +04/+05 to +05/+06 for Atyraū oblast (no
+# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
+# +06/+07 for Qostanay oblast (Qostanay and Arkalyk, no zones currently)
+# and Asia/Qyzylorda on 2004-10-31 at 3:00....
+#
+# 10. Act of the Government of the Republic of Kazakhstan
+# from 2005-03-15 No. 231
+# http://adilet.zan.kz/rus/docs/P050000231_
+# removes DST provisions from the 2000-11-23 act, removes most of the
+# (already implemented) provisions from the 2004-07-20 and 2004-09-15
+# acts, comes into effect 10 days after official publication.
+# The only practical effect seems to be the abolition of the summer
+# time.
+#
+# Unamended version of the act of the Government of the Russian Federation
+# No. 23 from 1992-01-08 [See 'europe' file for details].
+# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
+# act was to be enacted on the last Sunday of March 1992.
+
+# From Stepan Golosunov (2016-11-08):
+# Turgai reorganization should affect only southern part of Qostanay
+# oblast.  Which should probably be separated into Asia/Arkalyk zone.
+# (There were also 1970, 1988 and 1990 Turgai oblast reorganizations
+# according to wikipedia.)
+#
+# [For Qostanay] http://www.ng.kz/gazeta/195/hranit/
+# suggests that clocks were to be moved 40 minutes backwards on
+# 1920-01-01 to the fourth time belt.  But I do not understand
+# how that could happen....
+#
+# [For Atyrau and Oral] 1919 decree
+# (http://www.worldtimezone.com/dst_news/dst_news_russia-1919-02-08.html
+# and in Byalokoz) lists Ural river (plus 10 versts on its left bank) in
+# the third time belt (before 1930 this means +03).
+
+# From Paul Eggert (2016-12-06):
+# The tables below reflect Golosunov's remarks, with exceptions as noted.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
+# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA,
+# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ.
 Zone	Asia/Almaty	5:07:48 -	LMT	1924 May  2 # or Alma-Ata
-			5:00	-	ALMT	1930 Jun 21 # Alma-Ata Time
-			6:00 RussiaAsia ALM%sT	1991
-			6:00	-	ALMT	1992
-			6:00 RussiaAsia	ALM%sT	2005 Mar 15
-			6:00	-	ALMT
-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.)
+			5:00	-	+05	1930 Jun 21
+			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
+			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
+			6:00 RussiaAsia	+06/+07	2004 Oct 31  2:00s
+			6:00	-	+06
+# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
+# This currently includes Qostanay (aka Kostanay, Kustanay) (KZ-KUS);
+# see comments below.
 Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
-			4:00	-	KIZT	1930 Jun 21 # Kizilorda Time
-			5:00	-	KIZT	1981 Apr  1
-			5:00	1:00	KIZST	1981 Oct  1
-			6:00	-	KIZT	1982 Apr  1
-			5:00 RussiaAsia	KIZ%sT	1991
-			5:00	-	KIZT	1991 Dec 16 # independence
-			5:00	-	QYZT	1992 Jan 19  2:00
-			6:00 RussiaAsia	QYZ%sT	2005 Mar 15
-			6:00	-	QYZT
-# Aqtobe (aka Aktobe, formerly Aktyubinsk)
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1981 Apr  1
+			5:00	1:00	+06	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+			4:00 RussiaAsia	+04/+05	1991 Sep 29  2:00s
+			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
+			6:00 RussiaAsia	+06/+07	1992 Mar 29  2:00s
+			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
+			6:00	-	+06
+# The following zone is like Asia/Qyzylorda except for being one
+# hour earlier from 1991-09-29 to 1992-03-29.  The 1991/2 rules for
+# Qostanay are unclear partly because of the 1997 Turgai
+# reorganization, so this zone is commented out for now.
+#Zone	Asia/Qostanay	4:14:20 -	LMT	1924 May  2
+#			4:00	-	+04	1930 Jun 21
+#			5:00	-	+05	1981 Apr  1
+#			5:00	1:00	+06	1981 Oct  1
+#			6:00	-	+06	1982 Apr  1
+#			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+#			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+#			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
+#			6:00	-	+06
+#
+# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
 Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
-			4:00	-	AKTT	1930 Jun 21 # Aktyubinsk Time
-			5:00	-	AKTT	1981 Apr  1
-			5:00	1:00	AKTST	1981 Oct  1
-			6:00	-	AKTT	1982 Apr  1
-			5:00 RussiaAsia	AKT%sT	1991
-			5:00	-	AKTT	1991 Dec 16 # independence
-			5:00 RussiaAsia	AQT%sT	2005 Mar 15 # Aqtobe Time
-			5:00	-	AQTT
-# Mangghystau
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1981 Apr  1
+			5:00	1:00	+06	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
+			5:00	-	+05
+# Mangghystaū (KZ-MAN)
 # Aqtau was not founded until 1963, but it represents an inhabited region,
 # so include time stamps before 1963.
 Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
-			4:00	-	FORT	1930 Jun 21 # Fort Shevchenko T
-			5:00	-	FORT	1963
-			5:00	-	SHET	1981 Oct  1 # Shevchenko Time
-			6:00	-	SHET	1982 Apr  1
-			5:00 RussiaAsia	SHE%sT	1991
-			5:00	-	SHET	1991 Dec 16 # independence
-			5:00 RussiaAsia	AQT%sT	1995 Mar lastSun  2:00 # Aqtau Time
-			4:00 RussiaAsia	AQT%sT	2005 Mar 15
-			5:00	-	AQTT
-# West Kazakhstan
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+			5:00 RussiaAsia	+05/+06	1994 Sep 25  2:00s
+			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
+			5:00	-	+05
+# Atyraū (KZ-ATY) is like Mangghystaū except it switched from
+# +04/+05 to +05/+06 in spring 1999, not fall 1994.
+Zone	Asia/Atyrau	3:27:44	-	LMT	1924 May  2
+			3:00	-	+03	1930 Jun 21
+			5:00	-	+05	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+			5:00 RussiaAsia	+05/+06	1999 Mar 28  2:00s
+			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
+			5:00	-	+05
+# West Kazakhstan (KZ-ZAP)
 # From Paul Eggert (2016-03-18):
 # The 1989 transition is from USSR act No. 227 (1989-03-14).
 Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
-			4:00	-	URAT	1930 Jun 21 # Ural'sk time
-			5:00	-	URAT	1981 Apr  1
-			5:00	1:00	URAST	1981 Oct  1
-			6:00	-	URAT	1982 Apr  1
-			5:00 RussiaAsia	URA%sT	1989 Mar 26  2:00
-			4:00 RussiaAsia	URA%sT	1991
-			4:00	-	URAT	1991 Dec 16 # independence
-			4:00 RussiaAsia	ORA%sT	2005 Mar 15 # Oral Time
-			5:00	-	ORAT
+			3:00	-	+03	1930 Jun 21
+			5:00	-	+05	1981 Apr  1
+			5:00	1:00	+06	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1989 Mar 26  2:00s
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+			5:00 RussiaAsia	+05/+06	1992 Mar 29  2:00s
+			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
+			5:00	-	+05
 
 # Kyrgyzstan (Kirgizstan)
 # Transitions through 1991 are from Shanks & Pottenger.
@@ -1677,11 +1851,11 @@
 Rule	Kyrgyz	1997	2004	-	Oct	lastSun	2:30	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
-			5:00	-	FRUT	1930 Jun 21 # Frunze Time
-			6:00 RussiaAsia FRU%sT	1991 Mar 31  2:00s
-			5:00	1:00	FRUST	1991 Aug 31  2:00 # independence
-			5:00	Kyrgyz	KG%sT	2005 Aug 12 # Kyrgyzstan Time
-			6:00	-	KGT
+			5:00	-	+05	1930 Jun 21
+			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
+			5:00 RussiaAsia	+05/+06	1991 Aug 31  2:00
+			5:00	Kyrgyz	+05/+06	2005 Aug 12
+			6:00	-	+06
 
 ###############################################################################
 
@@ -1720,25 +1894,24 @@
 Rule	ROK	1987	1988	-	May	Sun>=8	2:00	1:00	D
 Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
 
-# From Paul Eggert (2014-10-30):
+# From Paul Eggert (2016-08-23):
 # The Korean Wikipedia entry gives the following sources for UT offsets:
 #
-# 1908: Official Journal Article No. 3994 (Edict No. 5)
+# 1908: Official Journal Article No. 3994 (decree No. 5)
 # 1912: Governor-General of Korea Official Gazette Issue No. 367
 #       (Announcement No. 338)
 # 1954: Presidential Decree No. 876 (1954-03-17)
 # 1961: Law No. 676 (1961-08-07)
-# 1987: Law No. 3919 (1986-12-31)
 #
-# The Wikipedia entry also has confusing information about a change
-# to UT+9 in April 1910, but then what would be the point of the later change
-# to UT+9 on 1912-01-01?  Omit the 1910 change for now.
+# (Another source "1987: Law No. 3919 (1986-12-31)" was in the 2014-10-30
+# edition of the Korean Wikipedia entry.)
 #
 # I guessed that time zone abbreviations through 1945 followed the same
 # rules as discussed under Taiwan, with nominal switches from JST to KST
 # when the respective cities were taken over by the Allies after WWII.
 #
-# For Pyongyang we have no information; guess no changes since World War II.
+# For Pyongyang, guess no changes from World War II until 2015, as we
+# have no information otherwise.
 
 # From Steffen Thorsen (2015-08-07):
 # According to many news sources, North Korea is going to change to
@@ -1755,14 +1928,12 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Seoul	8:27:52	-	LMT	1908 Apr  1
 			8:30	-	KST	1912 Jan  1
-			9:00	-	JCST	1937 Oct  1
 			9:00	-	JST	1945 Sep  8
 			9:00	-	KST	1954 Mar 21
 			8:30	ROK	K%sT	1961 Aug 10
 			9:00	ROK	K%sT
 Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 Apr  1
 			8:30	-	KST	1912 Jan  1
-			9:00	-	JCST	1937 Oct  1
 			9:00	-	JST	1945 Aug 24
 			9:00	-	KST	2015 Aug 15 00:00
 			8:30	-	KST
@@ -1817,30 +1988,29 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Asia/Kuala_Lumpur	6:46:46 -	LMT	1901 Jan  1
 			6:55:25	-	SMT	1905 Jun  1 # Singapore M.T.
-			7:00	-	MALT	1933 Jan  1 # Malaya Time
-			7:00	0:20	MALST	1936 Jan  1
-			7:20	-	MALT	1941 Sep  1
-			7:30	-	MALT	1942 Feb 16
-			9:00	-	JST	1945 Sep 12
-			7:30	-	MALT	1982 Jan  1
-			8:00	-	MYT	# Malaysia Time
+			7:00	-	+07	1933 Jan  1
+			7:00	0:20	+0720	1936 Jan  1
+			7:20	-	+0720	1941 Sep  1
+			7:30	-	+0730	1942 Feb 16
+			9:00	-	+09	1945 Sep 12
+			7:30	-	+0730	1982 Jan  1
+			8:00	-	+08
 # Sabah & Sarawak
 # From Paul Eggert (2014-08-12):
 # The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945
 # and 1982 transition dates are from Mok Ly Yng.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Asia/Kuching	7:21:20	-	LMT	1926 Mar
-			7:30	-	BORT	1933        # Borneo Time
-			8:00	NBorneo	BOR%sT	1942 Feb 16
-			9:00	-	JST	1945 Sep 12
-			8:00	-	BORT	1982 Jan  1
-			8:00	-	MYT
+			7:30	-	+0730	1933
+			8:00 NBorneo  +08/+0820	1942 Feb 16
+			9:00	-	+09	1945 Sep 12
+			8:00	-	+08
 
 # Maldives
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Maldives	4:54:00 -	LMT	1880 # Male
 			4:54:00	-	MMT	1960 # Male Mean Time
-			5:00	-	MVT	# Maldives Time
+			5:00	-	+05
 
 # Mongolia
 
@@ -1898,7 +2068,7 @@
 # Bill Bonnet (2005-05-19) reports that the US Embassy in Ulaanbaatar says
 # there is only one time zone and that DST is observed, citing Microsoft
 # Windows XP as the source.  Risto Nykänen (2005-05-16) reports that
-# travelmongolia.org says there are two time zones (UTC+7, UTC+8) with no DST.
+# travelmongolia.org says there are two time zones (UT +07, +08) with no DST.
 # Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in
 # Washington, DC says there are two time zones, with DST observed.
 # He also found
@@ -1967,37 +2137,41 @@
 # correction of 02:00 (in the previous edition) not being done correctly
 # in the latest edition; so ignore it for now.
 
+# From Ganbold Tsagaankhuu (2017-02-09):
+# Mongolian Government meeting has concluded today to cancel daylight
+# saving time adoption in Mongolia.  Source: http://zasag.mn/news/view/16192
+
 Rule	Mongol	1985	1998	-	Mar	lastSun	0:00	1:00	S
 Rule	Mongol	1984	1998	-	Sep	lastSun	0:00	0	-
 # IATA SSIM (1999-09) says Mongolia no longer observes DST.
 Rule	Mongol	2001	only	-	Apr	lastSat	2:00	1:00	S
 Rule	Mongol	2001	2006	-	Sep	lastSat	2:00	0	-
 Rule	Mongol	2002	2006	-	Mar	lastSat	2:00	1:00	S
-Rule	Mongol	2015	max	-	Mar	lastSat	2:00	1:00	S
-Rule	Mongol	2015	max	-	Sep	lastSat	0:00	0	-
+Rule	Mongol	2015	2016	-	Mar	lastSat	2:00	1:00	S
+Rule	Mongol	2015	2016	-	Sep	lastSat	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
 Zone	Asia/Hovd	6:06:36 -	LMT	1905 Aug
-			6:00	-	HOVT	1978     # Hovd Time
-			7:00	Mongol	HOV%sT
+			6:00	-	+06	1978
+			7:00	Mongol	+07/+08
 # Ulaanbaatar, a.k.a. Ulan Bataar, Ulan Bator, Urga
 Zone	Asia/Ulaanbaatar 7:07:32 -	LMT	1905 Aug
-			7:00	-	ULAT	1978     # Ulaanbaatar Time
-			8:00	Mongol	ULA%sT
+			7:00	-	+07	1978
+			8:00	Mongol	+08/+09
 # Choibalsan, a.k.a. Bajan Tümen, Bajan Tumen, Chojbalsan,
 # Choybalsan, Sanbejse, Tchoibalsan
 Zone	Asia/Choibalsan	7:38:00 -	LMT	1905 Aug
-			7:00	-	ULAT	1978
-			8:00	-	ULAT	1983 Apr
-			9:00	Mongol	CHO%sT	2008 Mar 31 # Choibalsan Time
-			8:00	Mongol	CHO%sT
+			7:00	-	+07	1978
+			8:00	-	+08	1983 Apr
+			9:00	Mongol	+09/+10	2008 Mar 31
+			8:00	Mongol	+08/+09
 
 # Nepal
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Kathmandu	5:41:16 -	LMT	1920
-			5:30	-	IST	1986
-			5:45	-	NPT	# Nepal Time
+			5:30	-	+0530	1986
+			5:45	-	+0545
 
 # Oman
 # See Asia/Dubai.
@@ -2146,10 +2320,10 @@
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
-			5:30	-	IST	1942 Sep
-			5:30	1:00	IST	1945 Oct 15
-			5:30	-	IST	1951 Sep 30
-			5:00	-	KART	1971 Mar 26 # Karachi Time
+			5:30	-	+0530	1942 Sep
+			5:30	1:00	+0630	1945 Oct 15
+			5:30	-	+0530	1951 Sep 30
+			5:00	-	+05	1971 Mar 26
 			5:00 Pakistan	PK%sT	# Pakistan Time
 
 # Palestine
@@ -2401,11 +2575,6 @@
 # From Paul Eggert (2015-03-03):
 # http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
 # says that the fall 2014 transition was Oct 23 at 24:00.
-# For future dates, guess the last Friday in March at 24:00 through
-# the first Friday on or after October 21 at 00:00.  This is consistent with
-# the predictions in today's editions of the following URLs:
-# http://www.timeanddate.com/time/change/gaza-strip/gaza
-# http://www.timeanddate.com/time/change/west-bank/hebron
 
 # From Hannah Kreitem (2016-03-09):
 # http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728
@@ -2415,7 +2584,21 @@
 #
 # From Paul Eggert (2016-03-12):
 # Predict spring transitions on March's last Saturday at 01:00 from now on.
-# Leave fall predictions alone for now.
+
+# From Sharef Mustafa (2016-10-19):
+# [T]he Palestinian cabinet decision (Mar 8th 2016) published on
+# http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf
+# states that summer time will end on Oct 29th at 01:00.
+#
+# From Tim Parenti (2016-10-19):
+# Predict fall transitions on October's last Saturday at 01:00 from now on.
+# This is consistent with the 2016 transition as well as our spring
+# predictions.
+#
+# From Paul Eggert (2016-10-19):
+# It's also consistent with predictions in the following URLs today:
+# http://www.timeanddate.com/time/change/gaza-strip/gaza
+# http://www.timeanddate.com/time/change/west-bank/hebron
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
@@ -2444,13 +2627,14 @@
 Rule Palestine	2012	2014	-	Mar	lastThu	24:00	1:00	S
 Rule Palestine	2012	only	-	Sep	21	1:00	0	-
 Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
-Rule Palestine	2014	max	-	Oct	Fri>=21	0:00	0	-
+Rule Palestine	2014	2015	-	Oct	Fri>=21	0:00	0	-
 Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
 Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
+Rule Palestine	2016	max	-	Oct	lastSat	1:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-			2:00	Zion	EET	1948 May 15
+			2:00	Zion	EET/EEST 1948 May 15
 			2:00 EgyptAsia	EE%sT	1967 Jun  5
 			2:00	Zion	I%sT	1996
 			2:00	Jordan	EE%sT	1999
@@ -2463,7 +2647,7 @@
 			2:00 Palestine	EE%sT
 
 Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
-			2:00	Zion	EET	1948 May 15
+			2:00	Zion	EET/EEST 1948 May 15
 			2:00 EgyptAsia	EE%sT	1967 Jun  5
 			2:00	Zion	I%sT	1996
 			2:00	Jordan	EE%sT	1999
@@ -2504,15 +2688,15 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Manila	-15:56:00 -	LMT	1844 Dec 31
 			8:04:00 -	LMT	1899 May 11
-			8:00	Phil	PH%sT	1942 May
-			9:00	-	JST	1944 Nov
-			8:00	Phil	PH%sT
+			8:00	Phil	+08/+09	1942 May
+			9:00	-	+09	1944 Nov
+			8:00	Phil	+08/+09
 
 # Qatar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Qatar	3:26:08 -	LMT	1920     # Al Dawhah / Doha
-			4:00	-	GST	1972 Jun
-			3:00	-	AST
+			4:00	-	+04	1972 Jun
+			3:00	-	+03
 Link Asia/Qatar Asia/Bahrain
 
 # Saudi Arabia
@@ -2534,12 +2718,12 @@
 # earlier date.
 #
 # Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
-# time zones; the other zone, at UTC+4, was in the far eastern part of
+# time zones; the other zone, at UT +04, was in the far eastern part of
 # the country.  Ignore this, as it's before our 1970 cutoff.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Riyadh	3:06:52 -	LMT	1947 Mar 14
-			3:00	-	AST
+			3:00	-	+03
 Link Asia/Riyadh Asia/Aden	# Yemen
 Link Asia/Riyadh Asia/Kuwait
 
@@ -2549,14 +2733,13 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
 			6:55:25	-	SMT	1905 Jun  1 # Singapore M.T.
-			7:00	-	MALT	1933 Jan  1 # Malaya Time
-			7:00	0:20	MALST	1936 Jan  1
-			7:20	-	MALT	1941 Sep  1
-			7:30	-	MALT	1942 Feb 16
-			9:00	-	JST	1945 Sep 12
-			7:30	-	MALT	1965 Aug  9 # independence
-			7:30	-	SGT	1982 Jan  1 # Singapore Time
-			8:00	-	SGT
+			7:00	-	+07	1933 Jan  1
+			7:00	0:20	+0720	1936 Jan  1
+			7:20	-	+0720	1941 Sep  1
+			7:30	-	+0730	1942 Feb 16
+			9:00	-	+09	1945 Sep 12
+			7:30	-	+0730	1982 Jan  1
+			8:00	-	+08
 
 # Spratly Is
 # no information
@@ -2596,45 +2779,31 @@
 # People who live in regions under Tamil control can use [TZ='Asia/Kolkata'],
 # as that zone has agreed with the Tamil areas since our cutoff date of 1970.
 
-# From K Sethu (2006-04-25):
-# I think the abbreviation LKT originated from the world of computers at
-# the time of or subsequent to the time zone changes by SL Government
-# twice in 1996 and probably SL Government or its standardization
-# agencies never declared an abbreviation as a national standard.
-#
-# I recollect before the recent change the government announcements
-# mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka
-# Time and no mention was made about the abbreviation.
-#
-# If we look at Sri Lanka Department of Government's "Official News
-# Website of Sri Lanka" ... http://www.news.lk/ we can see that they
-# use SLT as abbreviation in time stamp at the beginning of each news
-# item....
-#
-# Within Sri Lanka I think LKT is well known among computer users and
-# administrators.  In my opinion SLT may not be a good choice because the
-# nation's largest telcom / internet operator Sri Lanka Telcom is well
-# known by that abbreviation - simply as SLT (there IP domains are
-# slt.lk and sltnet.lk).
-#
-# But if indeed our government has adopted SLT as standard abbreviation
-# (that we have not known so far) then  it is better that it be used for
-# all computers.
-
-# From Paul Eggert (2006-04-25):
-# One possibility is that we wait for a bit for the dust to settle down
-# and then see what people actually say in practice.
+# From Sadika Sumanapala (2016-10-19):
+# According to http://www.sltime.org (maintained by Measurement Units,
+# Standards & Services Department, Sri Lanka) abbreviation for Sri Lanka
+# standard time is SLST.
+#
+# From Paul Eggert (2016-10-18):
+# "SLST" seems to be reasonably recent and rarely-used outside time
+# zone nerd sources.  I searched Google News and found three uses of
+# it in the International Business Times of India in February and
+# March of this year when discussing cricket match times, but nothing
+# since then (though there has been a lot of cricket) and nothing in
+# other English-language news sources.  Our old abbreviation "LKT" is
+# even worse.  For now, let's use a numeric abbreviation; we can
+# switch to "SLST" if it catches on.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Colombo	5:19:24 -	LMT	1880
 			5:19:32	-	MMT	1906        # Moratuwa Mean Time
-			5:30	-	IST	1942 Jan  5
-			5:30	0:30	IHST	1942 Sep
-			5:30	1:00	IST	1945 Oct 16  2:00
-			5:30	-	IST	1996 May 25  0:00
-			6:30	-	LKT	1996 Oct 26  0:30
-			6:00	-	LKT	2006 Apr 15  0:30
-			5:30	-	IST
+			5:30	-	+0530	1942 Jan  5
+			5:30	0:30	+06	1942 Sep
+			5:30	1:00	+0630	1945 Oct 16  2:00
+			5:30	-	+0530	1996 May 25  0:00
+			6:30	-	+0630	1996 Oct 26  0:30
+			6:00	-	+06	2006 Apr 15  0:30
+			5:30	-	+0530
 
 # Syria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -2803,16 +2972,16 @@
 # From Shanks & Pottenger.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
-			5:00	-	DUST	1930 Jun 21 # Dushanbe Time
-			6:00 RussiaAsia DUS%sT	1991 Mar 31  2:00s
-			5:00	1:00	DUSST	1991 Sep  9  2:00s
-			5:00	-	TJT	# Tajikistan Time
+			5:00	-	+05	1930 Jun 21
+			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
+			5:00	1:00	+05/+06	1991 Sep  9  2:00s
+			5:00	-	+05
 
 # Thailand
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Bangkok	6:42:04	-	LMT	1880
 			6:42:04	-	BMT	1920 Apr # Bangkok Mean Time
-			7:00	-	ICT
+			7:00	-	+07
 Link Asia/Bangkok Asia/Phnom_Penh	# Cambodia
 Link Asia/Bangkok Asia/Vientiane	# Laos
 
@@ -2820,36 +2989,33 @@
 # From Shanks & Pottenger.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
-			4:00	-	ASHT	1930 Jun 21 # Ashkhabad Time
-			5:00 RussiaAsia	ASH%sT	1991 Mar 31  2:00
-			4:00 RussiaAsia	ASH%sT	1991 Oct 27 # independence
-			4:00 RussiaAsia	TM%sT	1992 Jan 19  2:00
-			5:00	-	TMT
+			4:00	-	+04	1930 Jun 21
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00
+			5:00	-	+05
 
 # United Arab Emirates
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dubai	3:41:12 -	LMT	1920
-			4:00	-	GST
+			4:00	-	+04
 Link Asia/Dubai Asia/Muscat	# Oman
 
 # Uzbekistan
 # Byalokoz 1919 says Uzbekistan was 4:27:53.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Samarkand	4:27:53 -	LMT	1924 May  2
-			4:00	-	SAMT	1930 Jun 21 # Samarkand Time
-			5:00	-	SAMT	1981 Apr  1
-			5:00	1:00	SAMST	1981 Oct  1
-			6:00	-	TAST	1982 Apr  1 # Tashkent Time
-			5:00 RussiaAsia	SAM%sT	1991 Sep  1 # independence
-			5:00 RussiaAsia	UZ%sT	1992
-			5:00	-	UZT
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1981 Apr  1
+			5:00	1:00	+06	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1992
+			5:00	-	+05
 # Milne says Tashkent was 4:37:10.8; round to nearest.
 Zone	Asia/Tashkent	4:37:11 -	LMT	1924 May  2
-			5:00	-	TAST	1930 Jun 21 # Tashkent Time
-			6:00 RussiaAsia	TAS%sT	1991 Mar 31  2:00
-			5:00 RussiaAsia	TAS%sT	1991 Sep  1 # independence
-			5:00 RussiaAsia	UZ%sT	1992
-			5:00	-	UZT
+			5:00	-	+05	1930 Jun 21
+			6:00 RussiaAsia	+06/+07	1991 Mar 31  2:00
+			5:00 RussiaAsia	+05/+06	1992
+			5:00	-	+05
 
 # Vietnam
 
@@ -2904,15 +3070,15 @@
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Asia/Ho_Chi_Minh	7:06:40 -	LMT	1906 Jul  1
-			7:06:30	-	PLMT	1911 May  1
-			7:00	-	ICT	1942 Dec 31 23:00
-			8:00	-	IDT	1945 Mar 14 23:00
-			9:00	-	JST	1945 Sep  2
-			7:00	-	ICT	1947 Apr  1
-			8:00	-	IDT	1955 Jul  1
-			7:00	-	ICT	1959 Dec 31 23:00
-			8:00	-	IDT	1975 Jun 13
-			7:00	-	ICT
+			7:06:30	-	PLMT	1911 May  1 # Phù Liễn MT
+			7:00	-	+07	1942 Dec 31 23:00
+			8:00	-	+08	1945 Mar 14 23:00
+			9:00	-	+09	1945 Sep  2
+			7:00	-	+07	1947 Apr  1
+			8:00	-	+08	1955 Jul  1
+			7:00	-	+07	1959 Dec 31 23:00
+			8:00	-	+08	1975 Jun 13
+			7:00	-	+07
 
 # Yemen
 # See Asia/Riyadh.
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/australasia postgresql-9.5-9.5.8/src/timezone/data/australasia
--- postgresql-9.5-9.5.2/src/timezone/data/australasia	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/australasia	2017-08-07 21:13:41.000000000 +0000
@@ -44,8 +44,8 @@
 			 8:00	Aus	AW%sT	1943 Jul
 			 8:00	AW	AW%sT
 Zone Australia/Eucla	 8:35:28 -	LMT	1895 Dec
-			 8:45	Aus	ACW%sT	1943 Jul
-			 8:45	AW	ACW%sT
+			 8:45	Aus +0845/+0945	1943 Jul
+			 8:45	AW  +0845/+0945
 
 # Queensland
 #
@@ -212,7 +212,8 @@
 Rule	LH	2008	max	-	Oct	Sun>=1	2:00	0:30	D
 Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
 			10:00	-	AEST	1981 Mar
-			10:30	LH	LH%sT
+			10:30	LH	+1030/+1130 1985 Jul
+			10:30	LH	+1030/+11
 
 # Australian miscellany
 #
@@ -243,26 +244,26 @@
 # will produce a binary file with an [A]EST-type as the first 32-bit type;
 # this is required for correct handling of times before 1916 by
 # pre-2013 versions of localtime.
-Zone Antarctica/Macquarie 0	-	zzz	1899 Nov
+Zone Antarctica/Macquarie 0	-	-00	1899 Nov
 			10:00	-	AEST	1916 Oct  1  2:00
 			10:00	1:00	AEDT	1917 Feb
 			10:00	Aus	AE%sT	1919 Apr  1  0:00s
-			0	-	zzz	1948 Mar 25
+			0	-	-00	1948 Mar 25
 			10:00	Aus	AE%sT	1967
 			10:00	AT	AE%sT	2010 Apr  4  3:00
-			11:00	-	MIST	# Macquarie I Standard Time
+			11:00	-	+11
 
 # Christmas
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Christmas	7:02:52 -	LMT	1895 Feb
-			7:00	-	CXT	# Christmas Island Time
+			7:00	-	+07
 
 # Cocos (Keeling) Is
 # These islands were ruled by the Ross family from about 1830 to 1978.
 # We don't know when standard time was introduced; for now, we guess 1900.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Cocos	6:27:40	-	LMT	1900
-			6:30	-	CCT	# Cocos Islands Time
+			6:30	-	+0630
 
 
 # Fiji
@@ -350,7 +351,13 @@
 # commencing at 2.00 am on Sunday 1st November, 2015 and ending at
 # 3.00 am on Sunday 17th January, 2016.
 
-# From Paul Eggert (2015-09-01):
+# From Raymond Kumar (2016-10-04):
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-6th-NOVEMBER,-2016.aspx
+# "Fiji's daylight savings will begin on Sunday, 6 November 2016, when
+# clocks go forward an hour at 2am to 3am....  Daylight Saving will
+# end at 3.00am on Sunday 15th January 2017."
+
+# From Paul Eggert (2016-10-03):
 # For now, guess DST from 02:00 the first Sunday in November to
 # 03:00 the third Sunday in January.  Although ad hoc, it matches
 # transitions since late 2014 and seems more likely to match future
@@ -369,16 +376,16 @@
 Rule	Fiji	2015	max	-	Jan	Sun>=15	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26 # Suva
-			12:00	Fiji	FJ%sT	# Fiji Time
+			12:00	Fiji	+12/+13
 
 # French Polynesia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct # Rikitea
-			 -9:00	-	GAMT	# Gambier Time
+			 -9:00	-	-09
 Zone	Pacific/Marquesas -9:18:00 -	LMT	1912 Oct
-			 -9:30	-	MART	# Marquesas Time
+			 -9:30	-	-0930
 Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct # Papeete
-			-10:00	-	TAHT	# Tahiti Time
+			-10:00	-	-10
 # Clipperton (near North America) is administered from French Polynesia;
 # it is uninhabited.
 
@@ -393,15 +400,15 @@
 # Kiribati
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Tarawa	 11:32:04 -	LMT	1901 # Bairiki
-			 12:00	-	GILT	# Gilbert Is Time
+			 12:00	-	+12
 Zone Pacific/Enderbury	-11:24:20 -	LMT	1901
-			-12:00	-	PHOT	1979 Oct # Phoenix Is Time
-			-11:00	-	PHOT	1995
-			 13:00	-	PHOT
+			-12:00	-	-12	1979 Oct
+			-11:00	-	-11	1995
+			 13:00	-	+13
 Zone Pacific/Kiritimati	-10:29:20 -	LMT	1901
-			-10:40	-	LINT	1979 Oct # Line Is Time
-			-10:00	-	LINT	1995
-			 14:00	-	LINT
+			-10:40	-	-1040	1979 Oct
+			-10:00	-	-10	1995
+			 14:00	-	+14
 
 # N Mariana Is
 # See Pacific/Guam.
@@ -409,31 +416,31 @@
 # Marshall Is
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Majuro	11:24:48 -	LMT	1901
-			11:00	-	MHT	1969 Oct # Marshall Islands Time
-			12:00	-	MHT
+			11:00	-	+11	1969 Oct
+			12:00	-	+12
 Zone Pacific/Kwajalein	11:09:20 -	LMT	1901
-			11:00	-	MHT	1969 Oct
-			-12:00	-	KWAT	1993 Aug 20 # Kwajalein Time
-			12:00	-	MHT
+			11:00	-	+11	1969 Oct
+			-12:00	-	-12	1993 Aug 20
+			12:00	-	+12
 
 # Micronesia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Chuuk	10:07:08 -	LMT	1901
-			10:00	-	CHUT	# Chuuk Time
+			10:00	-	+10
 Zone Pacific/Pohnpei	10:32:52 -	LMT	1901 # Kolonia
-			11:00	-	PONT	# Pohnpei Time
+			11:00	-	+11
 Zone Pacific/Kosrae	10:51:56 -	LMT	1901
-			11:00	-	KOST	1969 Oct # Kosrae Time
-			12:00	-	KOST	1999
-			11:00	-	KOST
+			11:00	-	+11	1969 Oct
+			12:00	-	+12	1999
+			11:00	-	+11
 
 # Nauru
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15 # Uaobe
-			11:30	-	NRT	1942 Mar 15 # Nauru Time
-			9:00	-	JST	1944 Aug 15
-			11:30	-	NRT	1979 May
-			12:00	-	NRT
+			11:30	-	+1130	1942 Mar 15
+			9:00	-	+09	1944 Aug 15
+			11:30	-	+1130	1979 May
+			12:00	-	+12
 
 # New Caledonia
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -444,7 +451,7 @@
 Rule	NC	1997	only	-	Mar	 2	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Noumea	11:05:48 -	LMT	1912 Jan 13 # Nouméa
-			11:00	NC	NC%sT
+			11:00	NC	+11/+12
 
 
 ###############################################################################
@@ -485,8 +492,8 @@
 			11:30	NZ	NZ%sT	1946 Jan  1
 			12:00	NZ	NZ%sT
 Zone Pacific/Chatham	12:13:48 -	LMT	1868 Nov  2
-			12:15	-	CHAST	1946 Jan  1
-			12:45	Chatham	CHA%sT
+			12:15	-	+1215	1946 Jan  1
+			12:45	Chatham	+1245/+1345
 
 Link Pacific/Auckland Antarctica/McMurdo
 
@@ -508,8 +515,8 @@
 Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	HS
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901        # Avarua
-			-10:30	-	CKT	1978 Nov 12 # Cook Is Time
-			-10:00	Cook	CK%sT
+			-10:30	-	-1030	1978 Nov 12
+			-10:00	Cook	-10/-0930
 
 ###############################################################################
 
@@ -517,35 +524,35 @@
 # Niue
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Niue	-11:19:40 -	LMT	1901        # Alofi
-			-11:20	-	NUT	1951        # Niue Time
-			-11:30	-	NUT	1978 Oct  1
-			-11:00	-	NUT
+			-11:20	-	-1120	1951
+			-11:30	-	-1130	1978 Oct  1
+			-11:00	-	-11
 
 # Norfolk
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Norfolk	11:11:52 -	LMT	1901 # Kingston
-			11:12	-	NMT	1951 # Norfolk Mean Time
-			11:30	-	NFT	1974 Oct 27 02:00 # Norfolk T.
-			11:30	1:00	NFST	1975 Mar  2 02:00
-			11:30	-	NFT	2015 Oct  4 02:00
-			11:00	-	NFT
+			11:12	-	+1112	1951
+			11:30	-	+1130	1974 Oct 27 02:00
+			11:30	1:00	+1230	1975 Mar  2 02:00
+			11:30	-	+1130	2015 Oct  4 02:00
+			11:00	-	+11
 
 # Palau (Belau)
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Palau	8:57:56 -	LMT	1901 # Koror
-			9:00	-	PWT	# Palau Time
+			9:00	-	+09
 
 # Papua New Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
 			9:48:32	-	PMMT	1895 # Port Moresby Mean Time
-			10:00	-	PGT	# Papua New Guinea Time
+			10:00	-	+10
 #
 # From Paul Eggert (2014-10-13):
 # Base the Bougainville entry on the Arawa-Kieta region, which appears to have
 # the most people even though it was devastated in the Bougainville Civil War.
 #
-# Although Shanks gives 1942-03-15 / 1943-11-01 for JST, these dates
+# Although Shanks gives 1942-03-15 / 1943-11-01 for UT +09, these dates
 # are apparently rough guesswork from the starts of military campaigns.
 # The World War II entries below are instead based on Arawa-Kieta.
 # The Japanese occupied Kieta in July 1942,
@@ -553,29 +560,27 @@
 # http://pwencycl.kgbudge.com/B/o/Bougainville.htm
 # and seem to have controlled it until their 1945-08-21 surrender.
 #
-# The Autonomous Region of Bougainville plans to switch from UTC+10 to UTC+11
-# on 2014-12-28 at 02:00.  They call UTC+11 "Bougainville Standard Time";
-# abbreviate this as BST.  See:
+# The Autonomous Region of Bougainville switched from UT +10 to +11
+# on 2014-12-28 at 02:00.  They call +11 "Bougainville Standard Time".
+# See:
 # http://www.bougainville24.com/bougainville-issues/bougainville-gets-own-timezone/
 #
 Zone Pacific/Bougainville 10:22:16 -	LMT	1880
 			 9:48:32 -	PMMT	1895
-			10:00	-	PGT	1942 Jul
-			 9:00	-	JST	1945 Aug 21
-			10:00	-	PGT	2014 Dec 28  2:00
-			11:00	-	BST
+			10:00	-	+10	1942 Jul
+			 9:00	-	+09	1945 Aug 21
+			10:00	-	+10	2014 Dec 28  2:00
+			11:00	-	+11
 
 # Pitcairn
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901        # Adamstown
-			-8:30	-	PNT	1998 Apr 27  0:00
-			-8:00	-	PST	# Pitcairn Standard Time
+			-8:30	-	-0830	1998 Apr 27  0:00
+			-8:00	-	-08
 
 # American Samoa
 Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
 			-11:22:48 -	LMT	1911
-			-11:00	-	NST	1967 Apr    # N=Nome
-			-11:00	-	BST	1983 Nov 30 # B=Bering
 			-11:00	-	SST	            # S=Samoa
 Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
 
@@ -620,7 +625,7 @@
 # From Paul Eggert (2014-06-27):
 # The International Date Line Act 2011
 # http://www.parliament.gov.ws/images/ACTS/International_Date_Line_Act__2011_-_Eng.pdf
-# changed Samoa from UTC-11 to UTC+13, effective "12 o'clock midnight, on
+# changed Samoa from UT -11 to +13, effective "12 o'clock midnight, on
 # Thursday 29th December 2011".  The International Date Line was adjusted
 # accordingly.
 
@@ -656,17 +661,17 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
 			-11:26:56 -	LMT	1911
-			-11:30	-	WSST	1950
-			-11:00	WS	S%sT	2011 Dec 29 24:00 # S=Samoa
-			 13:00	WS	WS%sT
+			-11:30	-	-1130	1950
+			-11:00	WS	-11/-10	2011 Dec 29 24:00
+			 13:00	WS	+13/+14
 
 # Solomon Is
 # excludes Bougainville, for which see Papua New Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct # Honiara
-			11:00	-	SBT	# Solomon Is Time
+			11:00	-	+11
 
-# Tokelau Is
+# Tokelau
 #
 # From Gwillim Law (2011-12-29)
 # A correspondent informed me that Tokelau, like Samoa, will be skipping
@@ -687,8 +692,8 @@
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fakaofo	-11:24:56 -	LMT	1901
-			-11:00	-	TKT	2011 Dec 30 # Tokelau Time
-			13:00	-	TKT
+			-11:00	-	-11	2011 Dec 30
+			13:00	-	+13
 
 # Tonga
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -696,16 +701,18 @@
 Rule	Tonga	2000	only	-	Mar	19	2:00s	0	-
 Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	S
 Rule	Tonga	2001	2002	-	Jan	lastSun	2:00	0	-
+Rule	Tonga	2016	max	-	Nov	Sun>=1	2:00	1:00	S
+Rule	Tonga	2017	max	-	Jan	Sun>=15	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
-			12:20	-	TOT	1941 # Tonga Time
-			13:00	-	TOT	1999
-			13:00	Tonga	TO%sT
+			12:20	-	+1220	1941
+			13:00	-	+13	1999
+			13:00	Tonga	+13/+14
 
 # Tuvalu
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Funafuti	11:56:52 -	LMT	1901
-			12:00	-	TVT	# Tuvalu Time
+			12:00	-	+12
 
 
 # US minor outlying islands
@@ -715,7 +722,7 @@
 # 1886-1891; Baker was similar but exact dates are not known.
 # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
 # uninhabited thereafter.
-# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
+# Howland observed Hawaii Standard Time (UT -10:30) in 1937;
 # see page 206 of Elgen M. Long and Marie K. Long,
 # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
 # So most likely Howland and Baker observed Hawaii Time from 1935
@@ -729,10 +736,11 @@
 
 # Johnston
 #
-# From Paul Eggert (2014-03-11):
+# From Paul Eggert (2017-02-10):
 # Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind.
 # Details are uncertain.  We have no data for Johnston after 1970, so
-# treat it like Hawaii for now.
+# treat it like Hawaii for now.  Since Johnston is now uninhabited,
+# its link to Pacific/Honolulu is in the 'backward' file.
 #
 # In his memoirs of June 6th to October 4, 1945
 # <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
@@ -752,8 +760,6 @@
 # See the table on page 4 where he lists GMT and local times for the tests; a
 # footnote for the JI tests reads that local time is "JI time = Hawaii Time
 # Minus One Hour".
-#
-# See 'northamerica' for Pacific/Johnston.
 
 # Kingman
 # uninhabited
@@ -767,7 +773,7 @@
 # Wake
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Wake	11:06:28 -	LMT	1901
-			12:00	-	WAKT	# Wake Time
+			12:00	-	+12
 
 
 # Vanuatu
@@ -780,12 +786,12 @@
 Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
-			11:00	Vanuatu	VU%sT	# Vanuatu Time
+			11:00	Vanuatu	+11/+12
 
 # Wallis and Futuna
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Wallis	12:15:20 -	LMT	1901
-			12:00	-	WFT	# Wallis & Futuna Time
+			12:00	-	+12
 
 ###############################################################################
 
@@ -796,15 +802,15 @@
 # tz@iana.org for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2014-10-31):
+# From Paul Eggert (2017-02-10):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
 # Unfortunately this book contains many errors and cites no sources.
 #
-# Gwillim Law writes that a good source
-# for recent time zone data is the International Air Transport
+# Many years ago Gwillim Law wrote that a good source
+# for time zone data was the International Air Transport
 # Association's Standard Schedules Information Manual (IATA SSIM),
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.  Except where otherwise noted,
@@ -821,28 +827,19 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
-# I invented the abbreviations marked '*' in the following table;
-# the rest are from earlier versions of this file, or from other sources.
+# The following abbreviations are from other sources.
 # Corrections are welcome!
 #		std	dst
 #		LMT		Local Mean Time
 #	  8:00	AWST	AWDT	Western Australia
-#	  8:45	ACWST	ACWDT	Central Western Australia*
-#	  9:00	JST		Japan
 #	  9:30	ACST	ACDT	Central Australia
 #	 10:00	AEST	AEDT	Eastern Australia
+#	 10:00	GST		Guam through 2000
 #	 10:00	ChST		Chamorro
-#	 10:30	LHST	LHDT	Lord Howe*
-#	 11:00	BST		Bougainville*
 #	 11:30	NZMT	NZST	New Zealand through 1945
 #	 12:00	NZST	NZDT	New Zealand 1946-present
-#	 12:15	CHAST		Chatham through 1945*
-#	 12:45	CHAST	CHADT	Chatham 1946-present*
-#	 13:00	WSST	WSDT	(western) Samoa 2011-present*
-#	-11:30	WSST		Western Samoa through 1950*
 #	-11:00	SST		Samoa
 #	-10:00	HST		Hawaii
-#	- 8:00	PST		Pitcairn*
 #
 # See the 'northamerica' file for Hawaii.
 # See the 'southamerica' file for Easter I and the Galápagos Is.
@@ -1473,7 +1470,7 @@
 # Zealand time.  I understand that is the time they keep locally, anyhow."
 # For now, assume this practice goes back to the introduction of standard time
 # in New Zealand, as this would make Chatham Islands time almost exactly match
-# LMT back when New Zealand was at UTC+11:30; also, assume Chatham Islands did
+# LMT back when New Zealand was at UT +11:30; also, assume Chatham Islands did
 # not observe New Zealand's prewar DST.
 
 ###############################################################################
@@ -1529,7 +1526,7 @@
 # For now, we assume the Ladrones switched at the same time as the Philippines;
 # see Asia/Manila.
 
-# US Public Law 106-564 (2000-12-23) made UTC+10 the official standard time,
+# US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
 # under the name "Chamorro Standard Time".  There is no official abbreviation,
 # but Congressman Robert A. Underwood, author of the bill that became law,
 # wrote in a press release (2000-12-27) that he will seek the use of "ChST".
@@ -1541,15 +1538,15 @@
 # "I am certain, having lived there for the past decade, that 'Truk'
 # (now properly known as Chuuk) ... is in the time zone GMT+10."
 #
-# Shanks & Pottenger write that Truk switched from UTC+10 to UTC+11
+# Shanks & Pottenger write that Truk switched from UT +10 to +11
 # on 1978-10-01; ignore this for now.
 
 # From Paul Eggert (1999-10-29):
 # The Federated States of Micronesia Visitors Board writes in
 # The Federated States of Micronesia - Visitor Information (1999-01-26)
 # http://www.fsmgov.org/info/clocks.html
-# that Truk and Yap are UTC+10, and Ponape and Kosrae are UTC+11.
-# We don't know when Kosrae switched from UTC+12; assume January 1 for now.
+# that Truk and Yap are UT +10, and Ponape and Kosrae are +11.
+# We don't know when Kosrae switched from +12; assume January 1 for now.
 
 
 # Midway
@@ -1615,11 +1612,11 @@
 # ordaining - by a masterpiece of diplomatic flattery - that
 # the Fourth of July should be celebrated twice in that year."
 
-# Although Shanks & Pottenger says they both switched to UTC-11:30
-# in 1911, and to UTC-11 in 1950. many earlier sources give UTC-11
+# Although Shanks & Pottenger says they both switched to UT -11:30
+# in 1911, and to -11 in 1950. many earlier sources give -11
 # for American Samoa, e.g., the US National Bureau of Standards
 # circular "Standard Time Throughout the World", 1932.
-# Assume American Samoa switched to UTC-11 in 1911, not 1950,
+# Assume American Samoa switched to -11 in 1911, not 1950,
 # and that after 1950 they agreed until (western) Samoa skipped a
 # day in 2011.  Assume also that the Samoas follow the US and New
 # Zealand's "ST"/"DT" style of daylight-saving abbreviations.
@@ -1706,9 +1703,17 @@
 # of January the standard time in the Kingdom shall be moved backward by one
 # hour to 1:00am.
 
-# From Pulu 'Anau (2002-11-05):
+# From Pulu ʻAnau (2002-11-05):
 # The law was for 3 years, supposedly to get renewed.  It wasn't.
 
+# From Pulu ʻAnau (2016-10-27):
+# http://mic.gov.to/news-today/press-releases/6375-daylight-saving-set-to-run-from-6-november-2016-to-15-january-2017
+# Cannot find anyone who knows the rules, has seen the duration or has seen
+# the cabinet decision, but it appears we are following Fiji's rule set.
+#
+# From Tim Parenti (2016-10-26):
+# Assume Tonga will observe DST from the first Sunday in November at 02:00
+# through the third Sunday in January at 03:00, like Fiji, for now.
 
 # Wake
 
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/backward postgresql-9.5-9.5.8/src/timezone/data/backward
--- postgresql-9.5-9.5.2/src/timezone/data/backward	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/backward	2017-08-07 21:13:41.000000000 +0000
@@ -36,6 +36,7 @@
 Link	Asia/Urumqi		Asia/Kashgar
 Link	Asia/Kathmandu		Asia/Katmandu
 Link	Asia/Macau		Asia/Macao
+Link	Asia/Yangon		Asia/Rangoon
 Link	Asia/Ho_Chi_Minh	Asia/Saigon
 Link	Asia/Jerusalem		Asia/Tel_Aviv
 Link	Asia/Thimphu		Asia/Thimbu
@@ -95,6 +96,7 @@
 Link	Pacific/Chatham		NZ-CHAT
 Link	America/Denver		Navajo
 Link	Asia/Shanghai		PRC
+Link	Pacific/Honolulu	Pacific/Johnston
 Link	Pacific/Pohnpei		Pacific/Ponape
 Link	Pacific/Pago_Pago	Pacific/Samoa
 Link	Pacific/Chuuk		Pacific/Truk
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/backzone postgresql-9.5-9.5.8/src/timezone/data/backzone
--- postgresql-9.5-9.5.2/src/timezone/data/backzone	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/backzone	2017-08-07 21:13:41.000000000 +0000
@@ -65,7 +65,7 @@
 # Mali (southern)
 Zone	Africa/Bamako	-0:32:00 -	LMT	1912
 			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Jun 20
+			-1:00	-	-01	1960 Jun 20
 			 0:00	-	GMT
 
 # Central African Republic
@@ -75,7 +75,7 @@
 # Gambia
 Zone	Africa/Banjul	-1:06:36 -	LMT	1912
 			-1:06:36 -	BMT	1935 # Banjul Mean Time
-			-1:00	-	WAT	1964
+			-1:00	-	-01	1964
 			 0:00	-	GMT
 
 # Malawi
@@ -93,18 +93,18 @@
 # Guinea
 Zone	Africa/Conakry	-0:54:52 -	LMT	1912
 			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960
+			-1:00	-	-01	1960
 			 0:00	-	GMT
 
 # Senegal
 Zone	Africa/Dakar	-1:09:44 -	LMT	1912
-			-1:00	-	WAT	1941 Jun
+			-1:00	-	-01	1941 Jun
 			 0:00	-	GMT
 
 # Tanzania
 Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
 			3:00	-	EAT	1948
-			2:45	-	BEAUT	1961
+			2:45	-	+0245	1961
 			3:00	-	EAT
 
 # Djibouti
@@ -122,14 +122,14 @@
 # The International Hydrographic Bulletin, 1932-33, p 63 says that
 # Sierra Leone would advance its clocks by 20 minutes on 1933-10-01.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
-Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
-Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
+Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	-0020
+Rule	SL	1935	1942	-	Oct	 1	0:00	0	-01
+Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	+01
 Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
 Zone	Africa/Freetown	-0:53:00 -	LMT	1882
 			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
 			-1:00	SL	%s	1957
-			 0:00	SL	%s
+			 0:00	SL	GMT/+01
 
 # Botswana
 # From Paul Eggert (2013-02-21):
@@ -153,8 +153,8 @@
 # Uganda
 Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
 			3:00	-	EAT	1930
-			2:30	-	BEAT	1948
-			2:45	-	BEAUT	1957
+			2:30	-	+0230	1948
+			2:45	-	+0245	1957
 			3:00	-	EAT
 
 # Rwanda
@@ -177,11 +177,11 @@
 #
 # Shanks gives 1911-05-26 for the transition to WAT,
 # evidently confusing the date of the Portuguese decree
-# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
+# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
 # with the date that it took effect, namely 1912-01-01.
 #
 Zone	Africa/Luanda	0:52:56	-	LMT	1892
-			0:52:04	-	AOT	1912 Jan  1 # Angola Time
+			0:52:04	-	+005204	1912 Jan  1
 			1:00	-	WAT
 
 # Democratic Republic of the Congo (east)
@@ -194,9 +194,9 @@
 
 # Equatorial Guinea
 #
-# Although Shanks says that Malabo switched from UTC to UTC+1 on 1963-12-15,
+# Although Shanks says that Malabo switched from UT +00 to +01 on 1963-12-15,
 # a Google Books search says that London Calling, Issues 432-465 (1948), p 19,
-# says that Spanish Guinea was at GMT+1 back then.  The Shanks data entries
+# says that Spanish Guinea was at +01 back then.  The Shanks data entries
 # are most likely wrong, but we have nothing better; use them here for now.
 #
 Zone	Africa/Malabo	0:35:08 -	LMT	1912
@@ -216,19 +216,19 @@
 # Somalia
 Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
 			3:00	-	EAT	1931
-			2:30	-	BEAT	1957
+			2:30	-	+0230	1957
 			3:00	-	EAT
 
 # Niger
 Zone	Africa/Niamey	 0:08:28 -	LMT	1912
-			-1:00	-	WAT	1934 Feb 26
+			-1:00	-	-01	1934 Feb 26
 			 0:00	-	GMT	1960
 			 1:00	-	WAT
 
 # Mauritania
 Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
 			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Nov 28
+			-1:00	-	-01	1960 Nov 28
 			 0:00	-	GMT
 
 # Burkina Faso
@@ -264,19 +264,19 @@
 # The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit.
 Zone America/Argentina/ComodRivadavia -4:30:00 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1991 Mar  3
-			-4:00	-	WART	1991 Oct 20
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	-	ART	2004 Jun  1
-			-4:00	-	WART	2004 Jun 20
-			-3:00	-	ART
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1991 Mar  3
+			-4:00	-	-04	1991 Oct 20
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	-	-03	2004 Jun  1
+			-4:00	-	-04	2004 Jun 20
+			-3:00	-	-03
 
 # Aruba
 Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12 # Oranjestad
-			-4:30	-	ANT	1965 # Netherlands Antilles Time
+			-4:30	-	-0430	1965
 			-4:00	-	AST
 
 # Cayman Is
@@ -365,12 +365,12 @@
 # Formosa (FM), La Pampa (LP), Chubut (CH)
 Zone America/Rosario	-4:02:40 -	LMT	1894 Nov
 			-4:16:44 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1991 Jul
-			-3:00	-	ART	1999 Oct  3  0:00
-			-4:00	Arg	AR%sT	2000 Mar  3  0:00
-			-3:00	-	ART
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1991 Jul
+			-3:00	-	-03	1999 Oct  3  0:00
+			-4:00	Arg	-04/-03	2000 Mar  3  0:00
+			-3:00	-	-03
 
 # St Kitts-Nevis
 Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar  2 # Basseterre
@@ -395,7 +395,7 @@
 			-4:00	-	AST
 
 # McMurdo, Ross Island, since 1955-12
-Zone Antarctica/McMurdo	0	-	zzz	1956
+Zone Antarctica/McMurdo	0	-	-00	1956
 			12:00	NZ	NZ%sT
 Link Antarctica/McMurdo Antarctica/South_Pole
 
@@ -403,12 +403,12 @@
 # Milne says 2:59:54 was the meridian of the saluting battery at Aden,
 # and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
 Zone	Asia/Aden	2:59:54	-	LMT	1950
-			3:00	-	AST
+			3:00	-	+03
 
 # Bahrain
 Zone	Asia/Bahrain	3:22:20 -	LMT	1920     # Manamah
-			4:00	-	GST	1972 Jun
-			3:00	-	AST
+			4:00	-	+04	1972 Jun
+			3:00	-	+03
 
 # India
 #
@@ -431,7 +431,7 @@
 # counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
 # Yangchun, Yangjiang, Yu'nan, and Yunfu.
 Zone	Asia/Chongqing	7:06:20	-	LMT	1928     # or Chungking
-			7:00	-	LONT	1980 May # Long-shu Time
+			7:00	-	+07	1980 May
 			8:00	PRC	C%sT
 Link Asia/Chongqing Asia/Chungking
 
@@ -442,61 +442,61 @@
 # October 1954, with exact date and time unspecified.
 Zone	Asia/Hanoi	7:03:24 -	LMT	1906 Jul  1
 			7:06:30	-	PLMT	1911 May  1
-			7:00	-	ICT	1942 Dec 31 23:00
-			8:00	-	IDT	1945 Mar 14 23:00
-			9:00	-	JST	1945 Sep  2
-			7:00	-	ICT	1947 Apr  1
-			8:00	-	IDT	1954 Oct
-			7:00	-	ICT
+			7:00	-	+07	1942 Dec 31 23:00
+			8:00	-	+08	1945 Mar 14 23:00
+			9:00	-	+09	1945 Sep  2
+			7:00	-	+07	1947 Apr  1
+			8:00	-	+08	1954 Oct
+			7:00	-	+07
 
 # China
 # Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
 # Heilongjiang (except Mohe county), Jilin
 Zone	Asia/Harbin	8:26:44	-	LMT	1928     # or Haerbin
-			8:30	-	CHAT	1932 Mar # Changbai Time
+			8:30	-	+0830	1932 Mar
 			8:00	-	CST	1940
-			9:00	-	CHAT	1966 May
-			8:30	-	CHAT	1980 May
+			9:00	-	+09	1966 May
+			8:30	-	+0830	1980 May
 			8:00	PRC	C%sT
 
 # far west China
 Zone	Asia/Kashgar	5:03:56	-	LMT	1928     # or Kashi or Kaxgar
-			5:30	-	KAST	1940     # Kashgar Time
-			5:00	-	KAST	1980 May
+			5:30	-	+0530	1940
+			5:00	-	+05	1980 May
 			8:00	PRC	C%sT
 
 # Kuwait
 Zone	Asia/Kuwait	3:11:56 -	LMT	1950
-			3:00	-	AST
+			3:00	-	+03
 
 
 # Oman
 # Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
 Zone	Asia/Muscat	3:54:24 -	LMT	1920
-			4:00	-	GST
+			4:00	-	+04
 
 # India
 # From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
 # According to a Portuguese decree (1911-05-26)
-# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# Portuguese India switched to GMT+5 on 1912-01-01.
+# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
+# Portuguese India switched to UT +05 on 1912-01-01.
 #Zone	Asia/Panaji	[not enough info to complete]
 
 # Cambodia
 # From Paul Eggert (2014-10-11):
 # See Asia/Ho_Chi_Minh for the source for most of this data.  Also, guess
-# (1) Cambodia reverted to UT+7 on 1945-09-02, when Vietnam did, and
-# (2) they also reverted to UT+7 on 1953-11-09, the date of independence.
+# (1) Cambodia reverted to UT +07 on 1945-09-02, when Vietnam did, and
+# (2) they also reverted to +07 on 1953-11-09, the date of independence.
 # These guesses are probably wrong but they're better than guessing no
 # transitions there.
 Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jul  1
 			7:06:30	-	PLMT	1911 May  1
-			7:00	-	ICT	1942 Dec 31 23:00
-			8:00	-	IDT	1945 Mar 14 23:00
-			9:00	-	JST	1945 Sep  2
-			7:00	-	ICT	1947 Apr  1
-			8:00	-	IDT	1953 Nov  9
-			7:00	-	ICT
+			7:00	-	+07	1942 Dec 31 23:00
+			8:00	-	+08	1945 Mar 14 23:00
+			9:00	-	+09	1945 Sep  2
+			7:00	-	+07	1947 Apr  1
+			8:00	-	+08	1953 Nov  9
+			7:00	-	+07
 
 # Israel
 Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
@@ -506,21 +506,21 @@
 # Laos
 # From Paul Eggert (2014-10-11):
 # See Asia/Ho_Chi_Minh for the source for most of this data.
-# Trần's book says that Laos reverted to UT+7 on 1955-04-15.
-# Also, guess that Laos reverted to UT+7 on 1945-09-02, when Vietnam did;
+# Trần's book says that Laos reverted to UT +07 on 1955-04-15.
+# Also, guess that Laos reverted to +07 on 1945-09-02, when Vietnam did;
 # this is probably wrong but it's better than guessing no transition.
 Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jul  1
 			7:06:30	-	PLMT	1911 May  1
-			7:00	-	ICT	1942 Dec 31 23:00
-			8:00	-	IDT	1945 Mar 14 23:00
-			9:00	-	JST	1945 Sep  2
-			7:00	-	ICT	1947 Apr  1
-			8:00	-	IDT	1955 Apr 15
-			7:00	-	ICT
+			7:00	-	+07	1942 Dec 31 23:00
+			8:00	-	+08	1945 Mar 14 23:00
+			9:00	-	+09	1945 Sep  2
+			7:00	-	+07	1947 Apr  1
+			8:00	-	+08	1955 Apr 15
+			7:00	-	+07
 
 # Jan Mayen
 # From Whitman:
-Zone Atlantic/Jan_Mayen	-1:00	-	EGT
+Zone Atlantic/Jan_Mayen	-1:00	-	-01
 
 # St Helena
 Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890 # Jamestown
@@ -663,15 +663,13 @@
 #  "   3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A  "
 #
 Zone Pacific/Midway	-11:49:28 -	LMT	1901
-			-11:00	-	NST	1956 Jun  3
-			-11:00	1:00	NDT	1956 Sep  2
-			-11:00	-	NST	1967 Apr    # N=Nome
-			-11:00	-	BST	1983 Nov 30 # B=Bering
-			-11:00	-	SST	            # S=Samoa
+			-11:00	-	-11	1956 Jun  3
+			-11:00	1:00	-10	1956 Sep  2
+			-11:00	-	-11
 
 # N Mariana Is
 Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
 			 9:43:00 -	LMT	1901
-			 9:00	-	MPT	1969 Oct    # N Mariana Is Time
-			10:00	-	MPT	2000 Dec 23
+			 9:00	-	+09	1969 Oct
+			10:00	-	+10	2000 Dec 23
 			10:00	-	ChST	# Chamorro Standard Time
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/etcetera postgresql-9.5-9.5.8/src/timezone/data/etcetera
--- postgresql-9.5-9.5.2/src/timezone/data/etcetera	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/etcetera	2017-08-07 21:13:41.000000000 +0000
@@ -8,6 +8,13 @@
 # need now for the entries that are not on UTC are for ships at sea
 # that cannot use POSIX TZ settings.
 
+# Starting with POSIX 1003.1-2001, the entries below are all
+# unnecessary as settings for the TZ environment variable.  E.g.,
+# instead of TZ='Etc/GMT+4' one can use the POSIX setting TZ='<-04>+4'.
+#
+# Do not use a POSIX TZ setting like TZ='GMT+4', which is four hours
+# behind GMT but uses the completely misleading abbreviation "GMT".
+
 Zone	Etc/GMT		0	-	GMT
 Zone	Etc/UTC		0	-	UTC
 Zone	Etc/UCT		0	-	UCT
@@ -26,23 +33,13 @@
 Link	Etc/GMT				Etc/GMT+0
 Link	Etc/GMT				Etc/GMT0
 
-# We use POSIX-style signs in the Zone names and the output abbreviations,
+# Be consistent with POSIX TZ settings in the Zone names,
 # even though this is the opposite of what many people expect.
 # POSIX has positive signs west of Greenwich, but many people expect
 # positive signs east of Greenwich.  For example, TZ='Etc/GMT+4' uses
-# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
+# the abbreviation "-04" and corresponds to 4 hours behind UT
 # (i.e. west of Greenwich) even though many people would expect it to
 # mean 4 hours ahead of UT (i.e. east of Greenwich).
-#
-# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
-# TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to
-# ISO 8601 you can use TZ='<-0400>+4'.  Thus the commonly-expected
-# offset is kept within the angle bracket (and is used for display)
-# while the POSIX sign is kept outside the angle bracket (and is used
-# for calculation).
-#
-# Do not use a TZ setting like TZ='GMT+4', which is four hours behind
-# GMT but uses the completely misleading abbreviation "GMT".
 
 # Earlier incarnations of this package were not POSIX-compliant,
 # and had lines such as
@@ -51,30 +48,31 @@
 # way does a
 #		zic -l GMT-12
 # so we moved the names into the Etc subdirectory.
+# Also, the time zone abbreviations are now compatible with %z.
 
-Zone	Etc/GMT-14	14	-	GMT-14	# 14 hours ahead of GMT
-Zone	Etc/GMT-13	13	-	GMT-13
-Zone	Etc/GMT-12	12	-	GMT-12
-Zone	Etc/GMT-11	11	-	GMT-11
-Zone	Etc/GMT-10	10	-	GMT-10
-Zone	Etc/GMT-9	9	-	GMT-9
-Zone	Etc/GMT-8	8	-	GMT-8
-Zone	Etc/GMT-7	7	-	GMT-7
-Zone	Etc/GMT-6	6	-	GMT-6
-Zone	Etc/GMT-5	5	-	GMT-5
-Zone	Etc/GMT-4	4	-	GMT-4
-Zone	Etc/GMT-3	3	-	GMT-3
-Zone	Etc/GMT-2	2	-	GMT-2
-Zone	Etc/GMT-1	1	-	GMT-1
-Zone	Etc/GMT+1	-1	-	GMT+1
-Zone	Etc/GMT+2	-2	-	GMT+2
-Zone	Etc/GMT+3	-3	-	GMT+3
-Zone	Etc/GMT+4	-4	-	GMT+4
-Zone	Etc/GMT+5	-5	-	GMT+5
-Zone	Etc/GMT+6	-6	-	GMT+6
-Zone	Etc/GMT+7	-7	-	GMT+7
-Zone	Etc/GMT+8	-8	-	GMT+8
-Zone	Etc/GMT+9	-9	-	GMT+9
-Zone	Etc/GMT+10	-10	-	GMT+10
-Zone	Etc/GMT+11	-11	-	GMT+11
-Zone	Etc/GMT+12	-12	-	GMT+12
+Zone	Etc/GMT-14	14	-	+14
+Zone	Etc/GMT-13	13	-	+13
+Zone	Etc/GMT-12	12	-	+12
+Zone	Etc/GMT-11	11	-	+11
+Zone	Etc/GMT-10	10	-	+10
+Zone	Etc/GMT-9	9	-	+09
+Zone	Etc/GMT-8	8	-	+08
+Zone	Etc/GMT-7	7	-	+07
+Zone	Etc/GMT-6	6	-	+06
+Zone	Etc/GMT-5	5	-	+05
+Zone	Etc/GMT-4	4	-	+04
+Zone	Etc/GMT-3	3	-	+03
+Zone	Etc/GMT-2	2	-	+02
+Zone	Etc/GMT-1	1	-	+01
+Zone	Etc/GMT+1	-1	-	-01
+Zone	Etc/GMT+2	-2	-	-02
+Zone	Etc/GMT+3	-3	-	-03
+Zone	Etc/GMT+4	-4	-	-04
+Zone	Etc/GMT+5	-5	-	-05
+Zone	Etc/GMT+6	-6	-	-06
+Zone	Etc/GMT+7	-7	-	-07
+Zone	Etc/GMT+8	-8	-	-08
+Zone	Etc/GMT+9	-9	-	-09
+Zone	Etc/GMT+10	-10	-	-10
+Zone	Etc/GMT+11	-11	-	-11
+Zone	Etc/GMT+12	-12	-	-12
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/europe postgresql-9.5-9.5.8/src/timezone/data/europe
--- postgresql-9.5-9.5.2/src/timezone/data/europe	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/europe	2017-08-07 21:13:41.000000000 +0000
@@ -6,15 +6,15 @@
 # tz@iana.org for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2014-10-31):
+# From Paul Eggert (2017-02-10):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
 # Unfortunately this book contains many errors and cites no sources.
 #
-# Gwillim Law writes that a good source
-# for recent time zone data is the International Air Transport
+# Many years ago Gwillim Law wrote that a good source
+# for time zone data was the International Air Transport
 # Association's Standard Schedules Information Manual (IATA SSIM),
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.  Except where otherwise noted,
@@ -56,27 +56,23 @@
 #	History of Summer Time
 #	<http://pcdsh01.on.br/HISTHV.htm>
 #	(1998-09-21, in Portuguese)
-
 #
 # I invented the abbreviations marked '*' in the following table;
-# the rest are from earlier versions of this file, or from other sources.
-# Corrections are welcome!
-#                   std dst  2dst
-#                   LMT           Local Mean Time
-#       -4:00       AST ADT       Atlantic
-#       -3:00       WGT WGST      Western Greenland*
-#       -1:00       EGT EGST      Eastern Greenland*
-#        0:00       GMT BST  BDST Greenwich, British Summer
-#        0:00       GMT IST       Greenwich, Irish Summer
-#        0:00       WET WEST WEMT Western Europe
-#        0:19:32.13 AMT NST       Amsterdam, Netherlands Summer (1835-1937)*
-#        0:20       NET NEST      Netherlands (1937-1940)*
-#        1:00       BST           British Standard (1968-1971)
-#        1:00       CET CEST CEMT Central Europe
-#        1:00:14    SET           Swedish (1879-1899)*
-#        2:00       EET EEST      Eastern Europe
-#        3:00       FET           Further-eastern Europe (2011-2014)*
-#        3:00       MSK MSD  MSM* Minsk, Moscow
+# the rest are variants of the "xMT" pattern for a city's mean time,
+# or are from other sources.  Corrections are welcome!
+#                   std  dst  2dst
+#                   LMT             Local Mean Time
+#       -4:00       AST  ADT        Atlantic
+#        0:00       GMT  BST  BDST  Greenwich, British Summer
+#        0:00       GMT  IST        Greenwich, Irish Summer
+#        0:00       WET  WEST WEMT  Western Europe
+#        0:19:32.13 AMT* NST*       Amsterdam, Netherlands Summer (1835-1937)
+#        1:00       BST             British Standard (1968-1971)
+#        1:00       CET  CEST CEMT  Central Europe
+#        1:00:14    SET             Swedish (1879-1899)
+#        1:36:34    RMT* LST*       Riga, Latvian Summer (1880-1926)*
+#        2:00       EET  EEST       Eastern Europe
+#        3:00       MSK  MSD  MDST* Moscow
 
 # From Peter Ilieve (1994-12-04),
 # The original six [EU members]: Belgium, France, (West) Germany, Italy,
@@ -476,7 +472,7 @@
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Dublin	-0:25:00 -	LMT	1880 Aug  2
-			-0:25:21 -	DMT	1916 May 21  2:00
+			-0:25:21 -	DMT	1916 May 21  2:00 # Dublin MT
 			-0:25:21 1:00	IST	1916 Oct  1  2:00s
 			 0:00	GB-Eire	%s	1921 Dec  6 # independence
 			 0:00	GB-Eire	GMT/IST	1940 Feb 25  2:00
@@ -583,16 +579,33 @@
 Rule	E-Eur	1981	max	-	Mar	lastSun	 0:00	1:00	S
 Rule	E-Eur	1996	max	-	Oct	lastSun	 0:00	0	-
 
+
+# Daylight saving time for Russia and the Soviet Union
+#
+# The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Russia	1917	only	-	Jul	 1	23:00	1:00	MST  # Moscow Summer Time
+#
+# Decree No. 142 (1917-12-22) http://istmat.info/node/28137
 Rule	Russia	1917	only	-	Dec	28	 0:00	0	MMT  # Moscow Mean Time
+#
+# Decree No. 497 (1918-05-30) http://istmat.info/node/30001
 Rule	Russia	1918	only	-	May	31	22:00	2:00	MDST # Moscow Double Summer Time
 Rule	Russia	1918	only	-	Sep	16	 1:00	1:00	MST
+#
+# Decree No. 258 (1919-05-29) http://istmat.info/node/37949
 Rule	Russia	1919	only	-	May	31	23:00	2:00	MDST
-Rule	Russia	1919	only	-	Jul	 1	 2:00	1:00	MSD
+#
+Rule	Russia	1919	only	-	Jul	 1	 0:00u	1:00	MSD
 Rule	Russia	1919	only	-	Aug	16	 0:00	0	MSK
+#
+# Decree No. 63 (1921-02-03) http://istmat.info/node/45840
 Rule	Russia	1921	only	-	Feb	14	23:00	1:00	MSD
-Rule	Russia	1921	only	-	Mar	20	23:00	2:00	MSM  # Midsummer
+#
+# Decree No. 121 (1921-03-07) http://istmat.info/node/45949
+Rule	Russia	1921	only	-	Mar	20	23:00	2:00	+05
+#
 Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
 Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
 # Act No. 925 of the Council of Ministers of the USSR (1980-10-24):
@@ -600,13 +613,9 @@
 Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
 # Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
 # Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
-Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
-Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+Rule	Russia	1984	1995	-	Sep	lastSun	 2:00s	0	-
+Rule	Russia	1985	2010	-	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	2010	-	Mar	lastSun	 2:00s	1:00	S
-Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
 Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
 # As described below, Russia's 2014 change affects Zone data, not Rule data.
 
@@ -630,6 +639,14 @@
 # rules (Moscow time)
 # c) Uralsk oblast: third time belt rules (Moscow+1).
 
+# From Stepan Golosunov (2016-03-27):
+# Unamended version of the act of the
+# Government of the Russian Federation No. 23 from 08.01.1992
+# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102014034&rdk=0
+# says that every year clocks were to be moved forward on last Sunday
+# of March at 2 hours and moved backwards on last Sunday of September
+# at 3 hours.  It was amended in 1996 to replace September with October.
+
 # 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.
@@ -751,6 +768,14 @@
 			1:00	EU	CE%sT
 
 # Belarus
+#
+# From Stepan Golosunov (2016-07-02):
+# http://www.lawbelarus.com/repub/sub30/texf9611.htm
+# (Act of the Cabinet of Ministers of the Republic of Belarus from
+# 1992-03-25 No. 157) ... says clocks were to be moved forward at 2:00
+# on last Sunday of March and backward at 3:00 on last Sunday of September
+# (the same as previous USSR and contemporary Russian regulations).
+#
 # 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).
@@ -763,8 +788,6 @@
 # From Alexander Bokovoy (2014-10-09):
 # Belarussian government decided against changing to winter time....
 # http://eng.belta.by/all_news/society/Belarus-decides-against-adjusting-time-in-Russias-wake_i_76335.html
-# From Paul Eggert (2014-10-08):
-# Hence Belarus can share time zone abbreviations with Moscow again.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Minsk	1:50:16 -	LMT	1880
@@ -774,12 +797,8 @@
 			1:00	C-Eur	CE%sT	1944 Jul  3
 			3:00	Russia	MSK/MSD	1990
 			3:00	-	MSK	1991 Mar 31  2:00s
-			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	2011 Mar 27  2:00s
-			3:00	-	FET	2014 Oct 26  1:00s
-			3:00	-	MSK
+			3:00	-	+03
 
 # Belgium
 #
@@ -879,7 +898,7 @@
 # Cyprus
 # Please see the 'asia' file for Asia/Nicosia.
 
-# Czech Republic
+# Czech Republic / Czechia
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Czech	1945	only	-	Apr	 8	2:00s	1:00	S
 Rule	Czech	1945	only	-	Nov	18	2:00s	0	-
@@ -1042,16 +1061,16 @@
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Danmarkshavn -1:14:40 -	LMT	1916 Jul 28
-			-3:00	-	WGT	1980 Apr  6  2:00
-			-3:00	EU	WG%sT	1996
+			-3:00	-	-03	1980 Apr  6  2:00
+			-3:00	EU	-03/-02	1996
 			0:00	-	GMT
 Zone America/Scoresbysund -1:27:52 -	LMT	1916 Jul 28 # Ittoqqortoormiit
-			-2:00	-	CGT	1980 Apr  6  2:00
-			-2:00	C-Eur	CG%sT	1981 Mar 29
-			-1:00	EU	EG%sT
+			-2:00	-	-02	1980 Apr  6  2:00
+			-2:00	C-Eur	-02/-01	1981 Mar 29
+			-1:00	EU	-01/+00
 Zone America/Godthab	-3:26:56 -	LMT	1916 Jul 28 # Nuuk
-			-3:00	-	WGT	1980 Apr  6  2:00
-			-3:00	EU	WG%sT
+			-3:00	-	-03	1980 Apr  6  2:00
+			-3:00	EU	-03/-02
 Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
 			-4:00	Thule	A%sT
 
@@ -1287,7 +1306,7 @@
 # http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf
 # says that Bersarin issued an order to use Moscow time on May 20.
 # However, Moscow did not observe daylight saving in 1945, so
-# this was equivalent to CEMT (GMT+3), not GMT+4.
+# this was equivalent to UT +03, not +04.
 
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -1466,7 +1485,7 @@
 Rule	Iceland	1967	only	-	Oct	29	 1:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Reykjavik	-1:28	-	LMT	1908
-			-1:00	Iceland	IS%sT	1968 Apr  7  1:00s
+			-1:00	Iceland	-01/+00	1968 Apr  7  1:00s
 			 0:00	-	GMT
 
 # Italy
@@ -1478,73 +1497,84 @@
 # But these events all occurred before the 1970 cutoff,
 # so record only the time in Rome.
 #
-# From Paul Eggert (2006-03-22):
-# For Italian DST we have three sources: Shanks & Pottenger, Whitman, and
-# F. Pollastri
-# Day-light Saving Time in Italy (2006-02-03)
-# http://toi.iriti.cnr.it/uk/ienitlt.html
-# ('FP' below), taken from an Italian National Electrotechnical Institute
-# publication. When the three sources disagree, guess who's right, as follows:
-#
-# year	FP	Shanks&P. (S)	Whitman (W)	Go with:
-# 1916	06-03	06-03 24:00	06-03 00:00	FP & W
-#	09-30	09-30 24:00	09-30 01:00	FP; guess 24:00s
-# 1917	04-01	03-31 24:00	03-31 00:00	FP & S
-#	09-30	09-29 24:00	09-30 01:00	FP & W
-# 1918	03-09	03-09 24:00	03-09 00:00	FP & S
-#	10-06	10-05 24:00	10-06 01:00	FP & W
-# 1919	03-01	03-01 24:00	03-01 00:00	FP & S
-#	10-04	10-04 24:00	10-04 01:00	FP; guess 24:00s
-# 1920	03-20	03-20 24:00	03-20 00:00	FP & S
-#	09-18	09-18 24:00	10-01 01:00	FP; guess 24:00s
-# 1944	04-02	04-03 02:00			S (see C-Eur)
-#	09-16	10-02 03:00			FP; guess 24:00s
-# 1945	09-14	09-16 24:00			FP; guess 24:00s
-# 1970	05-21	05-31 00:00			S
-#	09-20	09-27 00:00			S
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Italy	1916	only	-	Jun	 3	0:00s	1:00	S
-Rule	Italy	1916	only	-	Oct	 1	0:00s	0	-
-Rule	Italy	1917	only	-	Apr	 1	0:00s	1:00	S
-Rule	Italy	1917	only	-	Sep	30	0:00s	0	-
-Rule	Italy	1918	only	-	Mar	10	0:00s	1:00	S
-Rule	Italy	1918	1919	-	Oct	Sun>=1	0:00s	0	-
-Rule	Italy	1919	only	-	Mar	 2	0:00s	1:00	S
-Rule	Italy	1920	only	-	Mar	21	0:00s	1:00	S
-Rule	Italy	1920	only	-	Sep	19	0:00s	0	-
-Rule	Italy	1940	only	-	Jun	15	0:00s	1:00	S
-Rule	Italy	1944	only	-	Sep	17	0:00s	0	-
-Rule	Italy	1945	only	-	Apr	 2	2:00	1:00	S
-Rule	Italy	1945	only	-	Sep	15	0:00s	0	-
-Rule	Italy	1946	only	-	Mar	17	2:00s	1:00	S
-Rule	Italy	1946	only	-	Oct	 6	2:00s	0	-
-Rule	Italy	1947	only	-	Mar	16	0:00s	1:00	S
-Rule	Italy	1947	only	-	Oct	 5	0:00s	0	-
-Rule	Italy	1948	only	-	Feb	29	2:00s	1:00	S
-Rule	Italy	1948	only	-	Oct	 3	2:00s	0	-
-Rule	Italy	1966	1968	-	May	Sun>=22	0:00	1:00	S
-Rule	Italy	1966	1969	-	Sep	Sun>=22	0:00	0	-
-Rule	Italy	1969	only	-	Jun	 1	0:00	1:00	S
-Rule	Italy	1970	only	-	May	31	0:00	1:00	S
-Rule	Italy	1970	only	-	Sep	lastSun	0:00	0	-
-Rule	Italy	1971	1972	-	May	Sun>=22	0:00	1:00	S
-Rule	Italy	1971	only	-	Sep	lastSun	1:00	0	-
-Rule	Italy	1972	only	-	Oct	 1	0:00	0	-
-Rule	Italy	1973	only	-	Jun	 3	0:00	1:00	S
-Rule	Italy	1973	1974	-	Sep	lastSun	0:00	0	-
-Rule	Italy	1974	only	-	May	26	0:00	1:00	S
-Rule	Italy	1975	only	-	Jun	 1	0:00s	1:00	S
-Rule	Italy	1975	1977	-	Sep	lastSun	0:00s	0	-
-Rule	Italy	1976	only	-	May	30	0:00s	1:00	S
-Rule	Italy	1977	1979	-	May	Sun>=22	0:00s	1:00	S
-Rule	Italy	1978	only	-	Oct	 1	0:00s	0	-
-Rule	Italy	1979	only	-	Sep	30	0:00s	0	-
+# From Michael Deckers (2016-10-24):
+# http://www.ac-ilsestante.it/MERIDIANE/ora_legale quotes a law of 1893-08-10
+# ... [translated as] "The preceding dispositions will enter into
+# force at the instant at which, according to the time specified in
+# the 1st article, the 1st of November 1893 will begin...."
+#
+# From Pierpaolo Bernardi (2016-10-20):
+# The authoritative source for time in Italy is the national metrological
+# institute, which has a summary page of historical DST data at
+# http://www.inrim.it/res/tf/ora_legale_i.shtml
+# (2016-10-24):
+# http://www.renzobaldini.it/le-ore-legali-in-italia/
+# has still different data for 1944.  It divides Italy in two, as
+# there were effectively two governments at the time, north of Gothic
+# Line German controlled territory, official government RSI, and south
+# of the Gothic Line, controlled by allied armies.
+#
+# From Brian Inglis (2016-10-23):
+# Viceregal LEGISLATIVE DECREE. 14 September 1944, no. 219.
+# Restoration of Standard Time. (044U0219) (OJ 62 of 30.9.1944) ...
+# Given the R. law decreed on 1944-03-29, no. 92, by which standard time is
+# advanced to sixty minutes later starting at hour two on 1944-04-02; ...
+# Starting at hour three on the date 1944-09-17 standard time will be resumed.
+#
+# From Paul Eggert (2016-10-27):
+# Go with INRiM for DST rules, except as corrected by Inglis for 1944
+# for the Kingdom of Italy.  This is consistent with Renzo Baldini.
+# Model Rome's occupation by using using C-Eur rules from 1943-09-10
+# to 1944-06-04; although Rome was an open city during this period, it
+# was effectively controlled by Germany.
+#
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Italy	1916	only	-	Jun	 3	24:00	1:00	S
+Rule	Italy	1916	1917	-	Sep	30	24:00	0	-
+Rule	Italy	1917	only	-	Mar	31	24:00	1:00	S
+Rule	Italy	1918	only	-	Mar	 9	24:00	1:00	S
+Rule	Italy	1918	only	-	Oct	 6	24:00	0	-
+Rule	Italy	1919	only	-	Mar	 1	24:00	1:00	S
+Rule	Italy	1919	only	-	Oct	 4	24:00	0	-
+Rule	Italy	1920	only	-	Mar	20	24:00	1:00	S
+Rule	Italy	1920	only	-	Sep	18	24:00	0	-
+Rule	Italy	1940	only	-	Jun	14	24:00	1:00	S
+Rule	Italy	1942	only	-	Nov	 2	 2:00s	0	-
+Rule	Italy	1943	only	-	Mar	29	 2:00s	1:00	S
+Rule	Italy	1943	only	-	Oct	 4	 2:00s	0	-
+Rule	Italy	1944	only	-	Apr	 2	 2:00s	1:00	S
+Rule	Italy	1944	only	-	Sep	17	 2:00s	0	-
+Rule	Italy	1945	only	-	Apr	 2	 2:00	1:00	S
+Rule	Italy	1945	only	-	Sep	15	 1:00	0	-
+Rule	Italy	1946	only	-	Mar	17	 2:00s	1:00	S
+Rule	Italy	1946	only	-	Oct	 6	 2:00s	0	-
+Rule	Italy	1947	only	-	Mar	16	 0:00s	1:00	S
+Rule	Italy	1947	only	-	Oct	 5	 0:00s	0	-
+Rule	Italy	1948	only	-	Feb	29	 2:00s	1:00	S
+Rule	Italy	1948	only	-	Oct	 3	 2:00s	0	-
+Rule	Italy	1966	1968	-	May	Sun>=22	 0:00s	1:00	S
+Rule	Italy	1966	only	-	Sep	24	24:00	0	-
+Rule	Italy	1967	1969	-	Sep	Sun>=22	 0:00s	0	-
+Rule	Italy	1969	only	-	Jun	 1	 0:00s	1:00	S
+Rule	Italy	1970	only	-	May	31	 0:00s	1:00	S
+Rule	Italy	1970	only	-	Sep	lastSun	 0:00s	0	-
+Rule	Italy	1971	1972	-	May	Sun>=22	 0:00s	1:00	S
+Rule	Italy	1971	only	-	Sep	lastSun	 0:00s	0	-
+Rule	Italy	1972	only	-	Oct	 1	 0:00s	0	-
+Rule	Italy	1973	only	-	Jun	 3	 0:00s	1:00	S
+Rule	Italy	1973	1974	-	Sep	lastSun	 0:00s	0	-
+Rule	Italy	1974	only	-	May	26	 0:00s	1:00	S
+Rule	Italy	1975	only	-	Jun	 1	 0:00s	1:00	S
+Rule	Italy	1975	1977	-	Sep	lastSun	 0:00s	0	-
+Rule	Italy	1976	only	-	May	30	 0:00s	1:00	S
+Rule	Italy	1977	1979	-	May	Sun>=22	 0:00s	1:00	S
+Rule	Italy	1978	only	-	Oct	 1	 0:00s	0	-
+Rule	Italy	1979	only	-	Sep	30	 0:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
-			0:49:56	-	RMT	1893 Nov  1  0:00s # Rome Mean
-			1:00	Italy	CE%sT	1942 Nov  2  2:00s
-			1:00	C-Eur	CE%sT	1944 Jul
+			0:49:56	-	RMT	1893 Oct 31 23:49:56 # Rome Mean
+			1:00	Italy	CE%sT	1943 Sep 10
+			1:00	C-Eur	CE%sT	1944 Jun  4
 			1:00	Italy	CE%sT	1980
 			1:00	EU	CE%sT
 
@@ -1743,6 +1773,10 @@
 # See Europe/Belgrade.
 
 # Malta
+#
+# From Paul Eggert (2016-10-21):
+# Assume 1900-1972 was like Rome, overriding Shanks.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Malta	1973	only	-	Mar	31	0:00s	1:00	S
 Rule	Malta	1973	only	-	Sep	29	0:00s	0	-
@@ -1753,8 +1787,6 @@
 Rule	Malta	1980	only	-	Mar	31	2:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
-			1:00	Italy	CE%sT	1942 Nov  2  2:00s
-			1:00	C-Eur	CE%sT	1945 Apr  2  2:00s
 			1:00	Italy	CE%sT	1973 Mar 31
 			1:00	Malta	CE%sT	1981
 			1:00	EU	CE%sT
@@ -1886,7 +1918,7 @@
 # Amsterdam mean time.
 
 # The data entries before 1945 are taken from
-# http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm
+# http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Neth	1916	only	-	May	 1	0:00	1:00	NST	# Netherlands Summer Time
@@ -1917,7 +1949,7 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Europe/Amsterdam	0:19:32 -	LMT	1835
 			0:19:32	Neth	%s	1937 Jul  1
-			0:20	Neth	NE%sT	1940 May 16  0:00 # Dutch Time
+			0:20	Neth +0020/+0120 1940 May 16  0:00
 			1:00	C-Eur	CE%sT	1945 Apr  2  2:00
 			1:00	Neth	CE%sT	1977
 			1:00	EU	CE%sT
@@ -2134,16 +2166,34 @@
 			 0:00	W-Eur	WE%sT	1992 Sep 27  1:00s
 			 1:00	EU	CE%sT	1996 Mar 31  1:00u
 			 0:00	EU	WE%sT
+# This Zone can be simplified once we assume zic %z.
 Zone Atlantic/Azores	-1:42:40 -	LMT	1884        # Ponta Delgada
 			-1:54:32 -	HMT	1912 Jan  1 # Horta Mean Time
-			-2:00	Port	AZO%sT	1966 Apr  3  2:00  # Azores Time
-			-1:00	Port	AZO%sT	1983 Sep 25  1:00s
-			-1:00	W-Eur	AZO%sT	1992 Sep 27  1:00s
+			-2:00	Port	-02/-01	1942 Apr 25 22:00s
+			-2:00	Port	+00	1942 Aug 15 22:00s
+			-2:00	Port	-02/-01	1943 Apr 17 22:00s
+			-2:00	Port	+00	1943 Aug 28 22:00s
+			-2:00	Port	-02/-01	1944 Apr 22 22:00s
+			-2:00	Port	+00	1944 Aug 26 22:00s
+			-2:00	Port	-02/-01	1945 Apr 21 22:00s
+			-2:00	Port	+00	1945 Aug 25 22:00s
+			-2:00	Port	-02/-01	1966 Apr  3  2:00
+			-1:00	Port	-01/+00	1983 Sep 25  1:00s
+			-1:00	W-Eur	-01/+00	1992 Sep 27  1:00s
 			 0:00	EU	WE%sT	1993 Mar 28  1:00u
-			-1:00	EU	AZO%sT
+			-1:00	EU	-01/+00
+# This Zone can be simplified once we assume zic %z.
 Zone Atlantic/Madeira	-1:07:36 -	LMT	1884        # Funchal
 			-1:07:36 -	FMT	1912 Jan  1 # Funchal Mean Time
-			-1:00	Port	MAD%sT	1966 Apr  3  2:00 # Madeira Time
+			-1:00	Port	-01/+00	1942 Apr 25 22:00s
+			-1:00	Port	+01	1942 Aug 15 22:00s
+			-1:00	Port	-01/+00	1943 Apr 17 22:00s
+			-1:00	Port	+01	1943 Aug 28 22:00s
+			-1:00	Port	-01/+00	1944 Apr 22 22:00s
+			-1:00	Port	+01	1944 Aug 26 22:00s
+			-1:00	Port	-01/+00	1945 Apr 21 22:00s
+			-1:00	Port	+01	1945 Aug 25 22:00s
+			-1:00	Port	-01/+00	1966 Apr  3  2:00
 			 0:00	Port	WE%sT	1983 Sep 25  1:00s
 			 0:00	EU	WE%sT
 
@@ -2251,7 +2301,6 @@
 # http://www.worldtimezone.com/dst_news/dst_news_russia-map-2014-07.html
 
 # From Paul Eggert (2006-03-22):
-# Except for Moscow after 1919-07-01, I invented the time zone abbreviations.
 # Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991,
 # are from Andrey A. Chernov.  The rest is from Shanks & Pottenger,
 # except we follow Chernov's report that 1992 DST transitions were Sat
@@ -2327,7 +2376,7 @@
 			 2:00	Poland	CE%sT	1946
 			 3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
 			 2:00	Russia	EE%sT	2011 Mar 27  2:00s
-			 3:00	-	FET	2014 Oct 26  2:00s
+			 3:00	-	+03	2014 Oct 26  2:00s
 			 2:00	-	EET
 
 
@@ -2380,6 +2429,16 @@
 # 78	RU-SPE	Saint Petersburg
 # 83	RU-NEN	Nenets Autonomous Okrug
 
+# From Paul Eggert (2016-08-23):
+# The Soviets switched to UT-based time in 1919.  Decree No. 59
+# (1919-02-08) http://istmat.info/node/35567 established UT-based time
+# zones, and Decree No. 147 (1919-03-29) http://istmat.info/node/35854
+# specified a transition date of 1919-07-01, apparently at 00:00 UT.
+# No doubt only the Soviet-controlled regions switched on that date;
+# later transitions to UT-based time in other parts of Russia are
+# taken from what appear to be guesses by Shanks.
+# (Thanks to Alexander Belopolsky for pointers to the decrees.)
+
 # From Stepan Golosunov (2016-03-07):
 # 11. Regions-violators, 1981-1982.
 # Wikipedia refers to
@@ -2421,7 +2480,7 @@
 # attributes the 1982 changes to the Act of the Council of Ministers
 # of the USSR No. 126 from 18.02.1982.  1980-925.txt also adds
 # Udmurtia to the list of affected territories and lists Khatangsky
-# district separately from Taymyr Autonomous Okurg.  Probably erroneously.
+# district separately from Taymyr Autonomous Okrug.  Probably erroneously.
 #
 # The affected territories are currently listed under Europe/Moscow,
 # Asia/Yekaterinburg and Asia/Krasnoyarsk.
@@ -2481,7 +2540,7 @@
 
 Zone Europe/Moscow	 2:30:17 -	LMT	1880
 			 2:30:17 -	MMT	1916 Jul  3 # Moscow Mean Time
-			 2:31:19 Russia	%s	1919 Jul  1  2:00
+			 2:31:19 Russia	%s	1919 Jul  1  0:00u
 			 3:00	Russia	%s	1921 Oct
 			 3:00	Russia	MSK/MSD	1922 Oct
 			 2:00	-	EET	1930 Jun 21
@@ -2492,10 +2551,8 @@
 			 3:00	-	MSK
 
 
-# From Tim Parenti (2014-07-03):
-# Europe/Simferopol covers...
-# **	****	Crimea, Republic of
-# **	****	Sevastopol
+# From Paul Eggert (2016-12-06):
+# Europe/Simferopol covers Crimea.
 
 Zone Europe/Simferopol	 2:16:24 -	LMT	1880
 			 2:16	-	SMT	1924 May  2 # Simferopol Mean T
@@ -2557,38 +2614,55 @@
 			 3:00	-	+03	2016 Mar 27  2:00s
 			 4:00	-	+04
 
-# From Paul Eggert (2016-03-18):
+# From Paul Eggert (2016-11-11):
 # Europe/Volgograd covers:
 # 34	RU-VGG	Volgograd Oblast
-# 64	RU-SAR	Saratov Oblast
 # The 1988 transition is from USSR act No. 5 (1988-01-04).
 
 Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
-			 3:00	-	TSAT	1925 Apr  6 # Tsaritsyn Time
-			 3:00	-	STAT	1930 Jun 21 # Stalingrad Time
-			 4:00	-	STAT	1961 Nov 11
-			 4:00	Russia	VOL%sT	1988 Mar 27  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	MSK/MSD	2011 Mar 27  2:00s
-			 4:00	-	MSK	2014 Oct 26  2:00s
-			 3:00	-	MSK
+			 3:00	-	+03	1930 Jun 21
+			 4:00	-	+04	1961 Nov 11
+			 4:00	Russia	+04/+05	1988 Mar 27  2:00s
+			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
+			 4:00	-	+04	1992 Mar 29  2:00s
+			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
+			 4:00	-	+04	2014 Oct 26  2:00s
+			 3:00	-	+03
+
+# From Paul Eggert (2016-11-11):
+# Europe/Saratov covers:
+# 64	RU-SAR	Saratov Oblast
+
+# From Yuri Konotopov (2016-11-11):
+# Dec 4, 2016 02:00 UTC+3....  Saratov Region's local time will be ... UTC+4.
+# From Stepan Golosunov (2016-11-11):
+# ... Byalokoz listed Saratov on 03:04:18.
+# From Stepan Golosunov (2016-11-22):
+# http://publication.pravo.gov.ru/Document/View/0001201611220031
+
+Zone Europe/Saratov	 3:04:18 -	LMT	1919 Jul  1  0:00u
+			 3:00	-	+03	1930 Jun 21
+			 4:00	Russia	+04/+05	1988 Mar 27  2:00s
+			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
+			 4:00	-	+04	1992 Mar 29  2:00s
+			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
+			 4:00	-	+04	2014 Oct 26  2:00s
+			 3:00	-	+03	2016 Dec  4  2:00s
+			 4:00	-	+04
 
 # From Paul Eggert (2016-03-18):
 # Europe/Kirov covers:
 # 43	RU-KIR	Kirov Oblast
 # The 1989 transition is from USSR act No. 227 (1989-03-14).
 #
-# Europe/Kirov is still in draft form and for now is commented out.
-#
-#Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  2:00
-#			 3:00	-	+03	1930 Jun 21
-#			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
-#			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
-#			 4:00	-	+04	1992 Mar 29  2:00s
-#			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
-#			 4:00	-	+04	2014 Oct 26  2:00s
-#			 3:00	-	+03
+Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  0:00u
+			 3:00	-	+03	1930 Jun 21
+			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
+			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
+			 4:00	-	+04	1992 Mar 29  2:00s
+			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
+			 4:00	-	+04	2014 Oct 26  2:00s
+			 3:00	-	+03
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Europe/Samara covers...
@@ -2599,16 +2673,16 @@
 # Byalokoz 1919 says Samara was 3:20:20.
 # The 1989 transition is from USSR act No. 227 (1989-03-14).
 
-Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  2:00
-			 3:00	-	SAMT	1930 Jun 21 # Samara Time
-			 4:00	-	SAMT	1935 Jan 27
-			 4:00	Russia	KUY%sT	1989 Mar 26  2:00s # Kuybyshev
-			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
-			 2:00	Russia	EE%sT	1991 Sep 29  2:00s
-			 3:00	-	SAMT	1991 Oct 20  3:00
-			 4:00	Russia	SAM%sT	2010 Mar 28  2:00s
-			 3:00	Russia	SAM%sT	2011 Mar 27  2:00s
-			 4:00	-	SAMT
+Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  0:00u
+			 3:00	-	+03	1930 Jun 21
+			 4:00	-	+04	1935 Jan 27
+			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
+			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
+			 2:00	Russia	+02/+03	1991 Sep 29  2:00s
+			 3:00	-	+03	1991 Oct 20  3:00
+			 4:00	Russia	+04/+05	2010 Mar 28  2:00s
+			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
+			 4:00	-	+04
 
 # From Paul Eggert (2016-03-18):
 # Europe/Ulyanovsk covers:
@@ -2623,7 +2697,7 @@
 # From Matt Johnson (2016-03-09):
 # http://publication.pravo.gov.ru/Document/View/0001201603090051
 
-Zone Europe/Ulyanovsk	 3:13:36 -	LMT	1919 Jul  1  2:00
+Zone Europe/Ulyanovsk	 3:13:36 -	LMT	1919 Jul  1  0:00u
 			 3:00	-	+03	1930 Jun 21
 			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
 			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
@@ -2655,12 +2729,12 @@
 
 Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1916 Jul  3
 			 3:45:05 -	PMT	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	2011 Mar 27  2:00s
-			 6:00	-	YEKT	2014 Oct 26  2:00s
-			 5:00	-	YEKT
+			 4:00	-	+04	1930 Jun 21
+			 5:00	Russia	+05/+06	1991 Mar 31  2:00s
+			 4:00	Russia	+04/+05	1992 Jan 19  2:00s
+			 5:00	Russia	+05/+06	2011 Mar 27  2:00s
+			 6:00	-	+06	2014 Oct 26  2:00s
+			 5:00	-	+05
 
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
@@ -2670,12 +2744,12 @@
 # Byalokoz 1919 says Omsk was 4:53:30.
 
 Zone Asia/Omsk		 4:53:30 -	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	2011 Mar 27  2:00s
-			 7:00	-	OMST	2014 Oct 26  2:00s
-			 6:00	-	OMST
+			 5:00	-	+05	1930 Jun 21
+			 6:00	Russia	+06/+07	1991 Mar 31  2:00s
+			 5:00	Russia	+05/+06	1992 Jan 19  2:00s
+			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
+			 7:00	-	+07	2014 Oct 26  2:00s
+			 6:00	-	+06
 
 # From Paul Eggert (2016-02-22):
 # Asia/Barnaul covers:
@@ -2721,21 +2795,29 @@
 # Asia/Novosibirsk covers:
 # 54	RU-NVS	Novosibirsk Oblast
 
+# From Stepan Golosunov (2016-05-30):
+# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=1085784-6
+# moves Novosibirsk oblast from UTC+6 to UTC+7.
+# From Stepan Golosunov (2016-07-04):
+# The law was signed yesterday and published today on
+# http://publication.pravo.gov.ru/Document/View/0001201607040064
+
 Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
-			 6:00	-	NOVT	1930 Jun 21 # Novosibirsk Time
-			 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	2011 Mar 27  2:00s
-			 7:00	-	NOVT	2014 Oct 26  2:00s
-			 6:00	-	NOVT
+			 6:00	-	+06	1930 Jun 21
+			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
+			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
+			 7:00	Russia	+07/+08	1993 May 23 # say Shanks & P.
+			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
+			 7:00	-	+07	2014 Oct 26  2:00s
+			 6:00	-	+06	2016 Jul 24  2:00s
+			 7:00	-	+07
 
 # From Paul Eggert (2016-03-18):
 # Asia/Tomsk covers:
 # 70	RU-TOM	Tomsk Oblast
-#
-# Asia/Tomsk is still in draft form and for now is commented out.
-# Tomsk may be changing time zones in 2016 (not decided yet).
+
+# From Stepan Golosunov (2016-03-24):
+# Byalokoz listed Tomsk at 5:39:51.
 
 # From Stanislaw A. Kuzikowski (1994-06-29):
 # Tomsk is still 4 hours ahead of Moscow.
@@ -2747,17 +2829,40 @@
 # Note that time belts (numbered from 2 (Moscow) to 12 according to their
 # GMT/UTC offset and having too many exceptions like regions formally
 # belonging to one belt but using time from another) were replaced
-# with time zones in 2011 with different numberings (there was a
+# with time zones in 2011 with different numbering (there was a
 # 2-hour gap between second and third zones in 2011-2014).
 
-#Zone Asia/Tomsk	 5:39:52 -	LMT	1919 Dec 22
-#			 6:00	-	+06	1930 Jun 21
-#			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
-#			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
-#			 7:00	Russia	+07/+08	2002 May  1  3:00
-#			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
-#			 7:00	-	+07	2014 Oct 26  2:00s
-#			 6:00	-	+06
+# From Stepan Golosunov (2016-04-12):
+# http://asozd2.duma.gov.ru/main.nsf/(SpravkaNew)?OpenAgent&RN=1006865-6
+# This bill was approved in the first reading today.  It moves Tomsk oblast
+# from UTC+6 to UTC+7 and is supposed to come into effect on 2016-05-29 at
+# 2:00.  The bill needs to be approved in the second and the third readings by
+# the State Duma, approved by the Federation Council, signed by the President
+# and published to become a law.  Minor changes in the text are to be expected
+# before the second reading (references need to be updated to account for the
+# recent changes).
+#
+# Judging by the ultra-short one-day amendments period, recent similar laws,
+# the State Duma schedule and the Federation Council schedule
+# http://www.duma.gov.ru/legislative/planning/day-shedule/por_vesna_2016/
+# http://council.gov.ru/activity/meetings/schedule/63303
+# I speculate that the final text of the bill will be proposed tomorrow, the
+# bill will be approved in the second and the third readings on Friday,
+# approved by the Federation Council on 2016-04-20, signed by the President and
+# published as a law around 2016-04-26.
+
+# From Matt Johnson (2016-04-26):
+# http://publication.pravo.gov.ru/Document/View/0001201604260048
+
+Zone	Asia/Tomsk	 5:39:51 -	LMT	1919 Dec 22
+			 6:00	-	+06	1930 Jun 21
+			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
+			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
+			 7:00	Russia	+07/+08	2002 May  1  3:00
+			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
+			 7:00	-	+07	2014 Oct 26  2:00s
+			 6:00	-	+06	2016 May 29  2:00s
+			 7:00	-	+07
 
 
 # From Tim Parenti (2014-07-03):
@@ -2788,14 +2893,12 @@
 # realigning itself with KRAT.
 
 Zone Asia/Novokuznetsk	 5:48:48 -	LMT	1924 May  1
-			 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	2010 Mar 28  2:00s
-			 6:00	Russia	NOV%sT	2011 Mar 27  2:00s # Novosibirsk
-			 7:00	-	NOVT	2014 Oct 26  2:00s
-			 7:00	-	KRAT	# Krasnoyarsk Time
-
+			 6:00	-	+06	1930 Jun 21
+			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
+			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
+			 7:00	Russia	+07/+08	2010 Mar 28  2:00s
+			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
+			 7:00	-	+07
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Asia/Krasnoyarsk covers...
@@ -2809,12 +2912,12 @@
 # Byalokoz 1919 says Krasnoyarsk was 6:11:26.
 
 Zone Asia/Krasnoyarsk	 6:11:26 -	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	2011 Mar 27  2:00s
-			 8:00	-	KRAT	2014 Oct 26  2:00s
-			 7:00	-	KRAT
+			 6:00	-	+06	1930 Jun 21
+			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
+			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
+			 7:00	Russia	+07/+08	2011 Mar 27  2:00s
+			 8:00	-	+08	2014 Oct 26  2:00s
+			 7:00	-	+07
 
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
@@ -2831,12 +2934,12 @@
 
 Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
 			 6:57:05 -	IMT	1920 Jan 25 # Irkutsk Mean Time
-			 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	2011 Mar 27  2:00s
-			 9:00	-	IRKT	2014 Oct 26  2:00s
-			 8:00	-	IRKT
+			 7:00	-	+07	1930 Jun 21
+			 8:00	Russia	+08/+09	1991 Mar 31  2:00s
+			 7:00	Russia	+07/+08	1992 Jan 19  2:00s
+			 8:00	Russia	+08/+09	2011 Mar 27  2:00s
+			 9:00	-	+09	2014 Oct 26  2:00s
+			 8:00	-	+08
 
 
 # From Tim Parenti (2014-07-06):
@@ -2853,13 +2956,13 @@
 # http://publication.pravo.gov.ru/Document/View/0001201512300107
 
 Zone Asia/Chita	 7:33:52 -	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	2011 Mar 27  2:00s
-			10:00	-	YAKT	2014 Oct 26  2:00s
-			 8:00	-	IRKT	2016 Mar 27  2:00
-			 9:00	-	YAKT
+			 8:00	-	+08	1930 Jun 21
+			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
+			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
+			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
+			10:00	-	+10	2014 Oct 26  2:00s
+			 8:00	-	+08	2016 Mar 27  2:00
+			 9:00	-	+09
 
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
@@ -2899,12 +3002,12 @@
 # Byalokoz 1919 says Yakutsk was 8:38:58.
 
 Zone Asia/Yakutsk	 8:38:58 -	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	2011 Mar 27  2:00s
-			10:00	-	YAKT	2014 Oct 26  2:00s
-			 9:00	-	YAKT
+			 8:00	-	+08	1930 Jun 21
+			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
+			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
+			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
+			10:00	-	+10	2014 Oct 26  2:00s
+			 9:00	-	+09
 
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
@@ -2922,12 +3025,12 @@
 # Go with Byalokoz.
 
 Zone Asia/Vladivostok	 8:47:31 -	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%sT	1992 Jan 19  2:00s
-			10:00	Russia	VLA%sT	2011 Mar 27  2:00s
-			11:00	-	VLAT	2014 Oct 26  2:00s
-			10:00	-	VLAT
+			 9:00	-	+09	1930 Jun 21
+			10:00	Russia	+10/+11	1991 Mar 31  2:00s
+			 9:00	Russia	+09/+10	1992 Jan 19  2:00s
+			10:00	Russia	+10/+11	2011 Mar 27  2:00s
+			11:00	-	+11	2014 Oct 26  2:00s
+			10:00	-	+10
 
 
 # From Tim Parenti (2014-07-03):
@@ -2945,14 +3048,14 @@
 # This transition is no doubt wrong, but we have no better info.
 
 Zone Asia/Khandyga	 9:02:13 -	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	2004
-			10:00	Russia	VLA%sT	2011 Mar 27  2:00s
-			11:00	-	VLAT	2011 Sep 13  0:00s # Decree 725?
-			10:00	-	YAKT	2014 Oct 26  2:00s
-			 9:00	-	YAKT
+			 8:00	-	+08	1930 Jun 21
+			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
+			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
+			 9:00	Russia	+09/+10	2004
+			10:00	Russia	+10/+11	2011 Mar 27  2:00s
+			11:00	-	+11	2011 Sep 13  0:00s # Decree 725?
+			10:00	-	+10	2014 Oct 26  2:00s
+			 9:00	-	+09
 
 
 # From Tim Parenti (2014-07-03):
@@ -2968,15 +3071,14 @@
 
 # The Zone name should be Asia/Yuzhno-Sakhalinsk, but that's too long.
 Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
-			 9:00	-	JCST	1937 Oct  1
-			 9:00	-	JST	1945 Aug 25
-			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	2011 Mar 27  2:00s
-			11:00	-	SAKT	2014 Oct 26  2:00s
-			10:00	-	SAKT	2016 Mar 27  2:00s
-			11:00	-	SAKT
+			 9:00	-	+09	1945 Aug 25
+			11:00	Russia	+11/+12	1991 Mar 31  2:00s # Sakhalin T
+			10:00	Russia	+10/+11	1992 Jan 19  2:00s
+			11:00	Russia	+11/+12	1997 Mar lastSun  2:00s
+			10:00	Russia	+10/+11	2011 Mar 27  2:00s
+			11:00	-	+11	2014 Oct 26  2:00s
+			10:00	-	+10	2016 Mar 27  2:00s
+			11:00	-	+11
 
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
@@ -2990,26 +3092,22 @@
 # until now by Asia/Magadan, will instead move to UTC+11.  These regions will
 # need their own zone.
 
-# From Alexander Krivenyshev (2016-01-03):
-# Magadan Oblast / Magadan (draft bill date of entry 2015-12-08),
-# UTC+10 to UTC+11
-# From Stepan Golosunov (2016-03-17):
-# The bill is currently proposed to be approved in both the second and
-# the third readings on 2016-03-22. It might be in time to be approved
-# by the Federation Council on 2016-03-23.
+# From Alexander Krivenyshev (2016-03-27):
+# ... draft bill 948300-6 to change its time zone from UTC+10 to UTC+11 ...
+# will take ... effect ... on April 24, 2016 at 2 o'clock
+#
+# From Matt Johnson (2016-04-05):
+# ... signed by the President today ...
+# http://publication.pravo.gov.ru/Document/View/0001201604050038
 
 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	2011 Mar 27  2:00s
-			12:00	-	MAGT	2014 Oct 26  2:00s
-			10:00	-	MAGT
-# From Paul Eggert (2016-03-18):
-# If the bill passes as-is, replace the previous data line with:
-#			10:00	-	MAGT	2016 Apr 24  2:00s
-#			11:00	-	MAGT
-# and update zone1970.tab and zone.tab to say "MSK+08" for Asia/Magadan.
+			10:00	-	+10	1930 Jun 21 # Magadan Time
+			11:00	Russia	+11/+12	1991 Mar 31  2:00s
+			10:00	Russia	+10/+11	1992 Jan 19  2:00s
+			11:00	Russia	+11/+12	2011 Mar 27  2:00s
+			12:00	-	+12	2014 Oct 26  2:00s
+			10:00	-	+10	2016 Apr 24  2:00s
+			11:00	-	+11
 
 
 # From Tim Parenti (2014-07-06):
@@ -3052,17 +3150,14 @@
 # in Russian.)  In addition, Srednekolymsk appears to be a much older
 # settlement and the population of Zyryanka seems to be declining.
 # Go with Srednekolymsk.
-#
-# Since Magadan Oblast moves to UTC+10 on 2014-10-26, we cannot keep using MAGT
-# as the abbreviation.  Use SRET instead.
 
 Zone Asia/Srednekolymsk	10:14:52 -	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	2011 Mar 27  2:00s
-			12:00	-	MAGT	2014 Oct 26  2:00s
-			11:00	-	SRET	# Srednekolymsk Time
+			10:00	-	+10	1930 Jun 21
+			11:00	Russia	+11/+12	1991 Mar 31  2:00s
+			10:00	Russia	+10/+11	1992 Jan 19  2:00s
+			11:00	Russia	+11/+12	2011 Mar 27  2:00s
+			12:00	-	+12	2014 Oct 26  2:00s
+			11:00	-	+11
 
 
 # From Tim Parenti (2014-07-03):
@@ -3080,14 +3175,14 @@
 # UTC+12 since at least then, too.
 
 Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
-			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
-			 9:00	Russia	YAKT	1981 Apr  1
-			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	2011 Mar 27  2:00s
-			12:00	-	MAGT	2011 Sep 13  0:00s # Decree 725?
-			11:00	-	VLAT	2014 Oct 26  2:00s
-			10:00	-	VLAT
+			 8:00	-	+08	1930 Jun 21
+			 9:00	Russia	+09/+10	1981 Apr  1
+			11:00	Russia	+11/+12	1991 Mar 31  2:00s
+			10:00	Russia	+10/+11	1992 Jan 19  2:00s
+			11:00	Russia	+11/+12	2011 Mar 27  2:00s
+			12:00	-	+12	2011 Sep 13  0:00s # Decree 725?
+			11:00	-	+11	2014 Oct 26  2:00s
+			10:00	-	+10
 
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
@@ -3100,12 +3195,12 @@
 # The Zone name should be Asia/Petropavlovsk-Kamchatski or perhaps
 # Asia/Petropavlovsk-Kamchatsky, but these are too long.
 Zone Asia/Kamchatka	10:34:36 -	LMT	1922 Nov 10
-			11:00	-	PETT	1930 Jun 21 # P-K Time
-			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	2011 Mar 27  2:00s
-			12:00	-	PETT
+			11:00	-	+11	1930 Jun 21
+			12:00	Russia	+12/+13	1991 Mar 31  2:00s
+			11:00	Russia	+11/+12	1992 Jan 19  2:00s
+			12:00	Russia	+12/+13	2010 Mar 28  2:00s
+			11:00	Russia	+11/+12	2011 Mar 27  2:00s
+			12:00	-	+12
 
 
 # From Tim Parenti (2014-07-03):
@@ -3113,13 +3208,13 @@
 # 87	RU-CHU	Chukotka Autonomous Okrug
 
 Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
-			12:00	-	ANAT	1930 Jun 21 # Anadyr Time
-			13:00	Russia	ANA%sT	1982 Apr  1  0:00s
-			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	2011 Mar 27  2:00s
-			12:00	-	ANAT
+			12:00	-	+12	1930 Jun 21
+			13:00	Russia	+13/+14	1982 Apr  1  0:00s
+			12:00	Russia	+12/+13	1991 Mar 31  2:00s
+			11:00	Russia	+11/+12	1992 Jan 19  2:00s
+			12:00	Russia	+12/+13	2010 Mar 28  2:00s
+			11:00	Russia	+11/+12	2011 Mar 27  2:00s
+			12:00	-	+12
 
 
 # San Marino
@@ -3150,46 +3245,77 @@
 # See Europe/Belgrade.
 
 # Spain
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# For 1917-1919 Whitman gives Apr Sat>=1 - Oct Sat>=1;
-# go with Shanks & Pottenger.
-Rule	Spain	1917	only	-	May	 5	23:00s	1:00	S
-Rule	Spain	1917	1919	-	Oct	 6	23:00s	0	-
-Rule	Spain	1918	only	-	Apr	15	23:00s	1:00	S
-Rule	Spain	1919	only	-	Apr	 5	23:00s	1:00	S
-# Whitman gives 1921 Feb 28 - Oct 14; go with Shanks & Pottenger.
-Rule	Spain	1924	only	-	Apr	16	23:00s	1:00	S
-# Whitman gives 1924 Oct 14; go with Shanks & Pottenger.
-Rule	Spain	1924	only	-	Oct	 4	23:00s	0	-
-Rule	Spain	1926	only	-	Apr	17	23:00s	1:00	S
-# Whitman says no DST in 1929; go with Shanks & Pottenger.
-Rule	Spain	1926	1929	-	Oct	Sat>=1	23:00s	0	-
-Rule	Spain	1927	only	-	Apr	 9	23:00s	1:00	S
-Rule	Spain	1928	only	-	Apr	14	23:00s	1:00	S
-Rule	Spain	1929	only	-	Apr	20	23:00s	1:00	S
-# Whitman gives 1937 Jun 16, 1938 Apr 16, 1940 Apr 13;
-# go with Shanks & Pottenger.
-Rule	Spain	1937	only	-	May	22	23:00s	1:00	S
-Rule	Spain	1937	1939	-	Oct	Sat>=1	23:00s	0	-
-Rule	Spain	1938	only	-	Mar	22	23:00s	1:00	S
-Rule	Spain	1939	only	-	Apr	15	23:00s	1:00	S
-Rule	Spain	1940	only	-	Mar	16	23:00s	1:00	S
-# Whitman says no DST 1942-1945; go with Shanks & Pottenger.
-Rule	Spain	1942	only	-	May	 2	22:00s	2:00	M # Midsummer
-Rule	Spain	1942	only	-	Sep	 1	22:00s	1:00	S
-Rule	Spain	1943	1946	-	Apr	Sat>=13	22:00s	2:00	M
-Rule	Spain	1943	only	-	Oct	 3	22:00s	1:00	S
-Rule	Spain	1944	only	-	Oct	10	22:00s	1:00	S
-Rule	Spain	1945	only	-	Sep	30	 1:00	1:00	S
-Rule	Spain	1946	only	-	Sep	30	 0:00	0	-
+#
+# From Paul Eggert (2016-12-14):
+#
+# The source for Europe/Madrid before 2013 is:
+# Planesas P. La hora oficial en España y sus cambios.
+# Anuario del Observatorio Astronómico de Madrid (2013, in Spanish).
+# http://astronomia.ign.es/rknowsys-theme/images/webAstro/paginas/documentos/Anuario/lahoraoficialenespana.pdf
+# As this source says that historical time in the Canaries is obscure,
+# and it does not discuss Ceuta, stick with Shanks for now for that data.
+#
+# In the 1918 and 1919 fallback transitions in Spain, the clock for
+# the hour-longer day officially kept going after midnight, so that
+# the repeated instances of that day's 00:00 hour were 24 hours apart,
+# with a fallback transition from the second occurrence of 00:59... to
+# the next day's 00:00.  Our data format cannot represent this
+# directly, and instead repeats the first hour of the next day, with a
+# fallback transition from the next day's 00:59... to 00:00.
+
+# From Michael Deckers (2016-12-15):
+# The Royal Decree of 1900-06-26 quoted by Planesas, online at
+# https://www.boe.es/datos/pdfs/BOE//1900/209/A00383-00384.pdf
+# says in its article 5 (my translation):
+# These dispositions will enter into force beginning with the
+# instant at which, according to the time indicated in article 1,
+# the 1st day of January of 1901 will begin.
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Spain	1918	only	-	Apr	15	23:00	1:00	S
+Rule	Spain	1918	1919	-	Oct	 6	24:00s	0	-
+Rule	Spain	1919	only	-	Apr	 6	23:00	1:00	S
+Rule	Spain	1924	only	-	Apr	16	23:00	1:00	S
+Rule	Spain	1924	only	-	Oct	 4	24:00s	0	-
+Rule	Spain	1926	only	-	Apr	17	23:00	1:00	S
+Rule	Spain	1926	1929	-	Oct	Sat>=1	24:00s	0	-
+Rule	Spain	1927	only	-	Apr	 9	23:00	1:00	S
+Rule	Spain	1928	only	-	Apr	15	 0:00	1:00	S
+Rule	Spain	1929	only	-	Apr	20	23:00	1:00	S
+# Republican Spain during the civil war; it controlled Madrid until 1939-03-28.
+Rule	Spain	1937	only	-	Jun	16	23:00	1:00	S
+Rule	Spain	1937	only	-	Oct	 2	24:00s	0	-
+Rule	Spain	1938	only	-	Apr	 2	23:00	1:00	S
+Rule	Spain	1938	only	-	Apr	30	23:00	2:00	M
+Rule	Spain	1938	only	-	Oct	 2	24:00	1:00	S
+# The following rules are for unified Spain again.
+#
+# Planesas does not say what happened in Madrid between its fall on
+# 1939-03-28 and the Nationalist spring-forward transition on
+# 1939-04-15.  For lack of better info, assume Madrid's clocks did not
+# change during that period.
+#
+# The first rule is commented out, as it is redundant for Republican Spain.
+#Rule	Spain	1939	only	-	Apr	15	23:00	1:00	S
+Rule	Spain	1939	only	-	Oct	 7	24:00s	0	-
+Rule	Spain	1942	only	-	May	 2	23:00	1:00	S
+Rule	Spain	1942	only	-	Sep	 1	 1:00	0	-
+Rule	Spain	1943	1946	-	Apr	Sat>=13	23:00	1:00	S
+Rule	Spain	1943	1944	-	Oct	Sun>=1	 1:00	0	-
+Rule	Spain	1945	1946	-	Sep	lastSun	 1:00	0	-
 Rule	Spain	1949	only	-	Apr	30	23:00	1:00	S
-Rule	Spain	1949	only	-	Sep	30	 1:00	0	-
-Rule	Spain	1974	1975	-	Apr	Sat>=13	23:00	1:00	S
+Rule	Spain	1949	only	-	Oct	 2	 1:00	0	-
+Rule	Spain	1974	1975	-	Apr	Sat>=12	23:00	1:00	S
 Rule	Spain	1974	1975	-	Oct	Sun>=1	 1:00	0	-
 Rule	Spain	1976	only	-	Mar	27	23:00	1:00	S
 Rule	Spain	1976	1977	-	Sep	lastSun	 1:00	0	-
-Rule	Spain	1977	1978	-	Apr	 2	23:00	1:00	S
-Rule	Spain	1978	only	-	Oct	 1	 1:00	0	-
+Rule	Spain	1977	only	-	Apr	 2	23:00	1:00	S
+Rule	Spain	1978	only	-	Apr	 2	 2:00s	1:00	S
+Rule	Spain	1978	only	-	Oct	 1	 2:00s	0	-
+# Nationalist Spain during the civil war
+#Rule NatSpain	1937	only	-	May	22	23:00	1:00	S
+#Rule NatSpain	1937	1938	-	Oct	Sat>=1	24:00s	0	-
+#Rule NatSpain	1938	only	-	Mar	26	23:00	1:00	S
 # The following rules are copied from Morocco from 1967 through 1978.
 Rule SpainAfrica 1967	only	-	Jun	 3	12:00	1:00	S
 Rule SpainAfrica 1967	only	-	Oct	 1	 0:00	0	-
@@ -3201,11 +3327,11 @@
 Rule SpainAfrica 1978	only	-	Jun	 1	 0:00	1:00	S
 Rule SpainAfrica 1978	only	-	Aug	 4	 0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Madrid	-0:14:44 -	LMT	1901 Jan  1  0:00s
-			 0:00	Spain	WE%sT	1946 Sep 30
+Zone	Europe/Madrid	-0:14:44 -	LMT	1900 Dec 31 23:45:16
+			 0:00	Spain	WE%sT	1940 Mar 16 23:00
 			 1:00	Spain	CE%sT	1979
 			 1:00	EU	CE%sT
-Zone	Africa/Ceuta	-0:21:16 -	LMT	1901
+Zone	Africa/Ceuta	-0:21:16 -	LMT	1900 Dec 31 23:38:44
 			 0:00	-	WET	1918 May  6 23:00
 			 0:00	1:00	WEST	1918 Oct  7 23:00
 			 0:00	-	WET	1924
@@ -3214,7 +3340,7 @@
 			 1:00	-	CET	1986
 			 1:00	EU	CE%sT
 Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
-			-1:00	-	CANT	1946 Sep 30  1:00 # Canaries T
+			-1:00	-	-01	1946 Sep 30  1:00
 			 0:00	-	WET	1980 Apr  6  0:00s
 			 0:00	1:00	WEST	1980 Sep 28  1:00u
 			 0:00	EU	WE%sT
@@ -3378,22 +3504,24 @@
 
 # Turkey
 
-# From Amar Devegowda (2007-01-03):
-# The time zone rules for Istanbul, Turkey have not been changed for years now.
-# ... The latest rules are available at:
-# http://www.timeanddate.com/worldclock/timezone.html?n=107
-# From Steffen Thorsen (2007-01-03):
-# I have been able to find press records back to 1996 which all say that
-# DST started 01:00 local time and end at 02:00 local time.  I am not sure
-# what happened before that.  One example for each year from 1996 to 2001:
-# http://newspot.byegm.gov.tr/arsiv/1996/21/N4.htm
-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING97/03/97X03X25.TXT
-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING98/03/98X03X02.HTM
-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING99/10/99X10X26.HTM#%2016
-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2000/03/00X03X06.HTM#%2021
-# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2001/03/23x03x01.HTM#%2027
-# From Paul Eggert (2007-01-03):
-# Prefer the above source to Shanks & Pottenger for time stamps after 1990.
+# From Kıvanç Yazan (2016-09-25):
+# 1) For 1986-2006, DST started at 01:00 local and ended at 02:00 local, with
+#    no exceptions.
+# 2) 1994's lastSun was overridden with Mar 20 ...
+# Here are official papers:
+# http://www.resmigazete.gov.tr/arsiv/19032.pdf  - page 2 for 1986
+# http://www.resmigazete.gov.tr/arsiv/19400.pdf  - page 4 for 1987
+# http://www.resmigazete.gov.tr/arsiv/19752.pdf  - page 15 for 1988
+# http://www.resmigazete.gov.tr/arsiv/20102.pdf  - page 6 for 1989
+# http://www.resmigazete.gov.tr/arsiv/20464.pdf  - page 1 for 1990 - 1992
+# http://www.resmigazete.gov.tr/arsiv/21531.pdf  - page 15 for 1993 - 1995
+# http://www.resmigazete.gov.tr/arsiv/21879.pdf  - page 1 for overriding 1994
+# http://www.resmigazete.gov.tr/arsiv/22588.pdf  - page 1 for 1996, 1997
+# http://www.resmigazete.gov.tr/arsiv/23286.pdf  - page 10 for 1998 - 2000
+# http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2  - for 2001
+# http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2  - for 2002-2006
+# From Paul Eggert (2016-09-25):
+# Prefer the above sources to Shanks & Pottenger for time stamps after 1985.
 
 # From Steffen Thorsen (2007-03-09):
 # Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
@@ -3440,6 +3568,14 @@
 # Engineered Standard Time," said Twitter user @aysekarahasan.
 # http://www.bbc.com/news/world-europe-34631326
 
+# From Burak AYDIN (2016-09-08):
+# Turkey will stay in Daylight Saving Time even in winter....
+# http://www.resmigazete.gov.tr/eskiler/2016/09/20160908-2.pdf
+#
+# From Paul Eggert (2016-09-07):
+# The change is permanent, so this is the new standard time in Turkey.
+# It takes effect today, which is not much notice.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Turkey	1916	only	-	May	 1	0:00	1:00	S
 Rule	Turkey	1916	only	-	Oct	 1	0:00	0	-
@@ -3494,16 +3630,16 @@
 Rule	Turkey	1983	only	-	Oct	 2	0:00	0	-
 Rule	Turkey	1985	only	-	Apr	20	0:00	1:00	S
 Rule	Turkey	1985	only	-	Sep	28	0:00	0	-
-Rule	Turkey	1986	1990	-	Mar	lastSun	2:00s	1:00	S
-Rule	Turkey	1986	1990	-	Sep	lastSun	2:00s	0	-
-Rule	Turkey	1991	2006	-	Mar	lastSun	1:00s	1:00	S
-Rule	Turkey	1991	1995	-	Sep	lastSun	1:00s	0	-
+Rule	Turkey	1986	1993	-	Mar	lastSun	1:00s	1:00	S
+Rule	Turkey	1986	1995	-	Sep	lastSun	1:00s	0	-
+Rule	Turkey	1994	only	-	Mar	20	1:00s	1:00	S
+Rule	Turkey	1995	2006	-	Mar	lastSun	1:00s	1:00	S
 Rule	Turkey	1996	2006	-	Oct	lastSun	1:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Istanbul	1:55:52 -	LMT	1880
 			1:56:56	-	IMT	1910 Oct # Istanbul Mean Time?
 			2:00	Turkey	EE%sT	1978 Oct 15
-			3:00	Turkey	TR%sT	1985 Apr 20 # Turkey Time
+			3:00	Turkey	+03/+04	1985 Apr 20
 			2:00	Turkey	EE%sT	2007
 			2:00	EU	EE%sT	2011 Mar 27  1:00u
 			2:00	-	EET	2011 Mar 28  1:00u
@@ -3511,7 +3647,8 @@
 			2:00	-	EET	2014 Mar 31  1:00u
 			2:00	EU	EE%sT	2015 Oct 25  1:00u
 			2:00	1:00	EEST	2015 Nov  8  1:00u
-			2:00	EU	EE%sT
+			2:00	EU	EE%sT	2016 Sep  7
+			3:00	-	+03
 Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 
 # Ukraine
@@ -3616,7 +3753,7 @@
 # spelling, except omit the apostrophe as it is not allowed in
 # portable Posix file names.
 Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
-			2:20	-	CUT	1924 May  2 # Central Ukraine T
+			2:20	-	+0220	1924 May  2
 			2:00	-	EET	1930 Jun 21
 			3:00	-	MSK	1941 Aug 25
 			1:00	C-Eur	CE%sT	1943 Oct 25
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/factory postgresql-9.5-9.5.8/src/timezone/data/factory
--- postgresql-9.5-9.5.2/src/timezone/data/factory	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/factory	2017-08-07 21:13:41.000000000 +0000
@@ -1,9 +1,10 @@
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
-# For companies who don't want to put time zone specification in
-# their installation procedures.  When users run date, they'll get the message.
-# Also useful for the "comp.sources" version.
+# For distributors who don't want to put time zone specification in
+# their installation procedures.  Users that run 'date' will get the
+# time zone abbreviation "-00", indicating that the actual time zone
+# is unknown.
 
 # Zone	NAME	GMTOFF	RULES	FORMAT
-Zone	Factory	0	- "Local time zone must be set--see zic manual page"
+Zone	Factory	0	-	-00
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/iso3166.tab postgresql-9.5-9.5.8/src/timezone/data/iso3166.tab
--- postgresql-9.5-9.5.2/src/timezone/data/iso3166.tab	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/iso3166.tab	1970-01-01 00:00:00.000000000 +0000
@@ -1,274 +0,0 @@
-# ISO 3166 alpha-2 country codes
-#
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-#
-# From Paul Eggert (2015-05-02):
-# This file contains a table of two-letter country codes.  Columns are
-# separated by a single tab.  Lines beginning with '#' are comments.
-# All text uses UTF-8 encoding.  The columns of the table are as follows:
-#
-# 1.  ISO 3166-1 alpha-2 country code, current as of
-#     ISO 3166-1 Newsletter VI-16 (2013-07-11).  See: Updates on ISO 3166
-#   http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
-# 2.  The usual English name for the coded region,
-#     chosen so that alphabetic sorting of subsets produces helpful lists.
-#     This is not the same as the English name in the ISO 3166 tables.
-#
-# The table is sorted by country code.
-#
-# This table is intended as an aid for users, to help them select time
-# zone data appropriate for their practical needs.  It is not intended
-# to take or endorse any position on legal or territorial claims.
-#
-#country-
-#code	name of country, territory, area, or subdivision
-AD	Andorra
-AE	United Arab Emirates
-AF	Afghanistan
-AG	Antigua & Barbuda
-AI	Anguilla
-AL	Albania
-AM	Armenia
-AO	Angola
-AQ	Antarctica
-AR	Argentina
-AS	Samoa (American)
-AT	Austria
-AU	Australia
-AW	Aruba
-AX	Ã…land Islands
-AZ	Azerbaijan
-BA	Bosnia & Herzegovina
-BB	Barbados
-BD	Bangladesh
-BE	Belgium
-BF	Burkina Faso
-BG	Bulgaria
-BH	Bahrain
-BI	Burundi
-BJ	Benin
-BL	St Barthelemy
-BM	Bermuda
-BN	Brunei
-BO	Bolivia
-BQ	Caribbean NL
-BR	Brazil
-BS	Bahamas
-BT	Bhutan
-BV	Bouvet Island
-BW	Botswana
-BY	Belarus
-BZ	Belize
-CA	Canada
-CC	Cocos (Keeling) Islands
-CD	Congo (Dem. Rep.)
-CF	Central African Rep.
-CG	Congo (Rep.)
-CH	Switzerland
-CI	Côte d'Ivoire
-CK	Cook Islands
-CL	Chile
-CM	Cameroon
-CN	China
-CO	Colombia
-CR	Costa Rica
-CU	Cuba
-CV	Cape Verde
-CW	Curacao
-CX	Christmas Island
-CY	Cyprus
-CZ	Czech Republic
-DE	Germany
-DJ	Djibouti
-DK	Denmark
-DM	Dominica
-DO	Dominican Republic
-DZ	Algeria
-EC	Ecuador
-EE	Estonia
-EG	Egypt
-EH	Western Sahara
-ER	Eritrea
-ES	Spain
-ET	Ethiopia
-FI	Finland
-FJ	Fiji
-FK	Falkland Islands
-FM	Micronesia
-FO	Faroe Islands
-FR	France
-GA	Gabon
-GB	Britain (UK)
-GD	Grenada
-GE	Georgia
-GF	French Guiana
-GG	Guernsey
-GH	Ghana
-GI	Gibraltar
-GL	Greenland
-GM	Gambia
-GN	Guinea
-GP	Guadeloupe
-GQ	Equatorial Guinea
-GR	Greece
-GS	South Georgia & the South Sandwich Islands
-GT	Guatemala
-GU	Guam
-GW	Guinea-Bissau
-GY	Guyana
-HK	Hong Kong
-HM	Heard Island & McDonald Islands
-HN	Honduras
-HR	Croatia
-HT	Haiti
-HU	Hungary
-ID	Indonesia
-IE	Ireland
-IL	Israel
-IM	Isle of Man
-IN	India
-IO	British Indian Ocean Territory
-IQ	Iraq
-IR	Iran
-IS	Iceland
-IT	Italy
-JE	Jersey
-JM	Jamaica
-JO	Jordan
-JP	Japan
-KE	Kenya
-KG	Kyrgyzstan
-KH	Cambodia
-KI	Kiribati
-KM	Comoros
-KN	St Kitts & Nevis
-KP	Korea (North)
-KR	Korea (South)
-KW	Kuwait
-KY	Cayman Islands
-KZ	Kazakhstan
-LA	Laos
-LB	Lebanon
-LC	St Lucia
-LI	Liechtenstein
-LK	Sri Lanka
-LR	Liberia
-LS	Lesotho
-LT	Lithuania
-LU	Luxembourg
-LV	Latvia
-LY	Libya
-MA	Morocco
-MC	Monaco
-MD	Moldova
-ME	Montenegro
-MF	St Martin (French)
-MG	Madagascar
-MH	Marshall Islands
-MK	Macedonia
-ML	Mali
-MM	Myanmar (Burma)
-MN	Mongolia
-MO	Macau
-MP	Northern Mariana Islands
-MQ	Martinique
-MR	Mauritania
-MS	Montserrat
-MT	Malta
-MU	Mauritius
-MV	Maldives
-MW	Malawi
-MX	Mexico
-MY	Malaysia
-MZ	Mozambique
-NA	Namibia
-NC	New Caledonia
-NE	Niger
-NF	Norfolk Island
-NG	Nigeria
-NI	Nicaragua
-NL	Netherlands
-NO	Norway
-NP	Nepal
-NR	Nauru
-NU	Niue
-NZ	New Zealand
-OM	Oman
-PA	Panama
-PE	Peru
-PF	French Polynesia
-PG	Papua New Guinea
-PH	Philippines
-PK	Pakistan
-PL	Poland
-PM	St Pierre & Miquelon
-PN	Pitcairn
-PR	Puerto Rico
-PS	Palestine
-PT	Portugal
-PW	Palau
-PY	Paraguay
-QA	Qatar
-RE	Réunion
-RO	Romania
-RS	Serbia
-RU	Russia
-RW	Rwanda
-SA	Saudi Arabia
-SB	Solomon Islands
-SC	Seychelles
-SD	Sudan
-SE	Sweden
-SG	Singapore
-SH	St Helena
-SI	Slovenia
-SJ	Svalbard & Jan Mayen
-SK	Slovakia
-SL	Sierra Leone
-SM	San Marino
-SN	Senegal
-SO	Somalia
-SR	Suriname
-SS	South Sudan
-ST	Sao Tome & Principe
-SV	El Salvador
-SX	St Maarten (Dutch)
-SY	Syria
-SZ	Swaziland
-TC	Turks & Caicos Is
-TD	Chad
-TF	French Southern & Antarctic Lands
-TG	Togo
-TH	Thailand
-TJ	Tajikistan
-TK	Tokelau
-TL	East Timor
-TM	Turkmenistan
-TN	Tunisia
-TO	Tonga
-TR	Turkey
-TT	Trinidad & Tobago
-TV	Tuvalu
-TW	Taiwan
-TZ	Tanzania
-UA	Ukraine
-UG	Uganda
-UM	US minor outlying islands
-US	United States
-UY	Uruguay
-UZ	Uzbekistan
-VA	Vatican City
-VC	St Vincent
-VE	Venezuela
-VG	Virgin Islands (UK)
-VI	Virgin Islands (US)
-VN	Vietnam
-VU	Vanuatu
-WF	Wallis & Futuna
-WS	Samoa (western)
-YE	Yemen
-YT	Mayotte
-ZA	South Africa
-ZM	Zambia
-ZW	Zimbabwe
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/leapseconds postgresql-9.5-9.5.8/src/timezone/data/leapseconds
--- postgresql-9.5-9.5.2/src/timezone/data/leapseconds	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/leapseconds	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-# Allowance for leap seconds added to each time zone file.
-
-# This file is in the public domain.
-
-# This file is generated automatically from the data in the public-domain
-# leap-seconds.list file available from most NIST time servers.
-# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
-# you should be able to pick up leap-seconds.list from a secondary NIST server.
-# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers.
-# For more about leap-seconds.list, please see
-# The NTP Timescale and Leap Seconds
-# http://www.eecis.udel.edu/~mills/leap.html
-
-# The International Earth Rotation and Reference Systems Service
-# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
-# (which measures the true angular orientation of the earth in space); see
-# Terry J Quinn, The BIPM and the accurate measure of time,
-# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
-# There were no leap seconds before 1972, because the official mechanism
-# accounting for the discrepancy between atomic time and the earth's rotation
-# did not exist until the early 1970s.
-
-# The correction (+ or -) is made at the given time, so lines
-# will typically look like:
-#	Leap	YEAR	MON	DAY	23:59:60	+	R/S
-# or
-#	Leap	YEAR	MON	DAY	23:59:59	-	R/S
-
-# If the leapsecond is Rolling (R) the given time is local time.
-# If the leapsecond is Stationary (S) the given time is UTC.
-
-# Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S
-Leap	1972	Jun	30	23:59:60	+	S
-Leap	1972	Dec	31	23:59:60	+	S
-Leap	1973	Dec	31	23:59:60	+	S
-Leap	1974	Dec	31	23:59:60	+	S
-Leap	1975	Dec	31	23:59:60	+	S
-Leap	1976	Dec	31	23:59:60	+	S
-Leap	1977	Dec	31	23:59:60	+	S
-Leap	1978	Dec	31	23:59:60	+	S
-Leap	1979	Dec	31	23:59:60	+	S
-Leap	1981	Jun	30	23:59:60	+	S
-Leap	1982	Jun	30	23:59:60	+	S
-Leap	1983	Jun	30	23:59:60	+	S
-Leap	1985	Jun	30	23:59:60	+	S
-Leap	1987	Dec	31	23:59:60	+	S
-Leap	1989	Dec	31	23:59:60	+	S
-Leap	1990	Dec	31	23:59:60	+	S
-Leap	1992	Jun	30	23:59:60	+	S
-Leap	1993	Jun	30	23:59:60	+	S
-Leap	1994	Jun	30	23:59:60	+	S
-Leap	1995	Dec	31	23:59:60	+	S
-Leap	1997	Jun	30	23:59:60	+	S
-Leap	1998	Dec	31	23:59:60	+	S
-Leap	2005	Dec	31	23:59:60	+	S
-Leap	2008	Dec	31	23:59:60	+	S
-Leap	2012	Jun	30	23:59:60	+	S
-Leap	2015	Jun	30	23:59:60	+	S
-
-#	Updated through IERS Bulletin C51
-#	File expires on:  28 December 2016
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/northamerica postgresql-9.5-9.5.8/src/timezone/data/northamerica
--- postgresql-9.5-9.5.2/src/timezone/data/northamerica	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/northamerica	2017-08-07 21:13:41.000000000 +0000
@@ -24,8 +24,32 @@
 # was the result of his proposals at the Convention of Railroad Trunk Lines
 # in New York City (1869-10).  His 1870 proposal was based on Washington, DC,
 # but in 1872-05 he moved the proposed origin to Greenwich.
-# His proposal was adopted by the railroads on 1883-11-18 at 12:00,
-# and the most of the country soon followed suit.
+
+# From Paul Eggert (2016-09-21):
+# Dowd's proposal left many details unresolved, such as where to draw
+# lines between time zones.  The key individual who made time zones
+# work in the US was William Frederick Allen - railway engineer,
+# managing editor of the Travelers' Guide, and secretary of the
+# General Time Convention, a railway standardization group.  Allen
+# spent months in dialogs with scientific and railway leaders,
+# developed a workable plan to institute time zones, and presented it
+# to the General Time Convention on 1883-04-11, saying that his plan
+# meant "local time would be practically abolished" - a plus for
+# railway scheduling.  By the next convention on 1883-10-11 nearly all
+# railroads had agreed and it took effect on 1883-11-18 at 12:00.
+# That Sunday was called the "day of two noons", as the eastern parts
+# of the new zones observed noon twice.  Allen witnessed the
+# transition in New York City, writing:
+#
+#   I heard the bells of St. Paul's strike on the old time.  Four
+#   minutes later, obedient to the electrical signal from the Naval
+#   Observatory ... the time-ball made its rapid descent, the chimes
+#   of old Trinity rang twelve measured strokes, and local time was
+#   abandoned, probably forever.
+#
+# Most of the US soon followed suit.  See:
+# Bartky IR. The adoption of standard time. Technol Cult 1989 Jan;30(1):25-56.
+# http://dx.doi.org/10.2307/3105430
 
 # From Paul Eggert (2005-04-16):
 # That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
@@ -154,22 +178,6 @@
 Zone	MST7MDT		 -7:00	US	M%sT
 Zone	PST8PDT		 -8:00	US	P%sT
 
-# From Bob Devine (1988-01-28):
-# ...Alaska (and Hawaii) had the timezone names changed in 1967.
-#    old			 new
-#    Pacific Standard Time(PST)  -same-
-#    Yukon Standard Time(YST)    -same-
-#    Central Alaska S.T. (CAT)   Alaska-Hawaii St[an]dard Time (AHST)
-#    Nome Standard Time (NT)     Bering Standard Time (BST)
-#
-# ...Alaska's timezone lines were redrawn in 1983 to give only 2 tz.
-#    The YST zone now covers nearly all of the state, AHST just part
-#    of the Aleutian islands.   No DST.
-
-# From Paul Eggert (1995-12-19):
-# The tables below use 'NST', not 'NT', for Nome Standard Time.
-# I invented 'CAWT' for Central Alaska War Time.
-
 # From U. S. Naval Observatory (1989-01-19):
 # USA  EASTERN       5 H  BEHIND UTC    NEW YORK, WASHINGTON
 # USA  EASTERN       4 H  BEHIND UTC    APR 3 - OCT 30
@@ -226,6 +234,21 @@
 #	Samoa standard time
 # The law doesn't give abbreviations.
 #
+# From Paul Eggert (2016-12-19):
+# Here are URLs for the 1918 and 1966 legislation:
+# http://uscode.house.gov/statviewer.htm?volume=40&page=451
+# http://uscode.house.gov/statviewer.htm?volume=80&page=108
+# Although the 1918 names were officially "United States Standard
+# Eastern Time" and similarly for "Central", "Mountain", "Pacific",
+# and "Alaska", in practice "Standard" was placed just before "Time",
+# as codified in 1966.  In practice, Alaska time was abbreviated "AST"
+# before 1968.  Summarizing the 1967 name changes:
+#	1918 names			1967 names
+#  -08	Standard Pacific Time (PST)	Pacific standard time (PST)
+#  -09	(unofficial) Yukon (YST)	Yukon standard time (YST)
+#  -10	Standard Alaska Time (AST)	Alaska-Hawaii standard time (AHST)
+#  -11	(unofficial) Nome (NST)		Bering standard time (BST)
+#
 # From Paul Eggert (2000-01-08), following a heads-up from Rives McDow:
 # Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time"
 # for time in Guam and the Northern Marianas.  See the file "australasia".
@@ -281,6 +304,15 @@
 # Roberts, city administrator in Phenix City. as saying "We are in the Central
 # time zone, but we do go by the Eastern time zone because so many people work
 # in Columbus."
+#
+# From Paul Eggert (2017-02-22):
+# Four cities are involved.  The two not mentioned above are Smiths Station
+# and Valley.  Barbara Brooks, Valley's assistant treasurer, heard it started
+# because West Point Pepperell textile mills were in Alabama while the
+# corporate office was in Georgia, and residents voted to keep Eastern
+# time even after the mills closed.  See: Kazek K. Did you know which
+# Alabama towns are in a different time zone?  al.com 2017-02-06.
+# http://www.al.com/living/index.ssf/2017/02/do_you_know_which_alabama_town.html
 
 # From Paul Eggert (2014-09-06):
 # Monthly Notices of the Royal Astronomical Society 44, 4 (1884-02-08), 208
@@ -413,11 +445,42 @@
 # north of the Salmon River, and the towns of Burgdorf and Warren),
 # Nevada (except West Wendover), Oregon (except the northern 3/4 of
 # Malheur county), and Washington
+
+# From Paul Eggert (2016-08-20):
+# In early February 1948, in response to California's electricity shortage,
+# PG&E changed power frequency from 60 to 59.5 Hz during daylight hours,
+# causing electric clocks to lose six minutes per day.  (This did not change
+# legal time, and is not part of the data here.)  See:
+# Ross SA. An energy crisis from the past: Northern California in 1948.
+# Working Paper No. 8, Institute of Governmental Studies, UC Berkeley,
+# 1973-11.  http://escholarship.org/uc/item/8x22k30c
+#
+# In another measure to save electricity, DST was instituted from 1948-03-14
+# at 02:01 to 1949-01-16 at 02:00, with the governor having the option to move
+# the fallback transition earlier.  See pages 3-4 of:
+# http://clerk.assembly.ca.gov/sites/clerk.assembly.ca.gov/files/archive/Statutes/1948/48Vol1_Chapters.pdf
+#
+# In response:
+#
+#   Governor Warren received a torrent of objecting mail, and it is not too much
+#   to speculate that the objections to Daylight Saving Time were one important
+#   factor in the defeat of the Dewey-Warren Presidential ticket in California.
+#     -- Ross, p 25
+#
+# On December 8 the governor exercised the option, setting the date to January 1
+# (LA Times 1948-12-09).  The transition time was 02:00 (LA Times 1949-01-01).
+#
+# Despite the controversy, in 1949 California voters approved Proposition 12,
+# which established DST from April's last Sunday at 01:00 until September's
+# last Sunday at 02:00. This was amended by 1962's Proposition 6, which changed
+# the fall-back date to October's last Sunday. See:
+# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
+# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule	CA	1948	only	-	Mar	14	2:00	1:00	D
+Rule	CA	1948	only	-	Mar	14	2:01	1:00	D
 Rule	CA	1949	only	-	Jan	 1	2:00	0	S
-Rule	CA	1950	1966	-	Apr	lastSun	2:00	1:00	D
+Rule	CA	1950	1966	-	Apr	lastSun	1:00	1:00	D
 Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
 Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -427,7 +490,7 @@
 			-8:00	US	P%sT
 
 # Alaska
-# AK%sT is the modern abbreviation for -9:00 per USNO.
+# AK%sT is the modern abbreviation for -09 per USNO.
 #
 # From Paul Eggert (2001-05-30):
 # Howse writes that Alaska switched from the Julian to the Gregorian calendar,
@@ -533,10 +596,8 @@
 			 -9:00	US	AK%sT
 Zone America/Anchorage	 14:00:24 -	LMT	1867 Oct 18
 			 -9:59:36 -	LMT	1900 Aug 20 12:00
-			-10:00	-	CAT	1942
-			-10:00	US	CAT/CAWT 1945 Aug 14 23:00u
-			-10:00	US	CAT/CAPT 1946 # Peace
-			-10:00	-	CAT	1967 Apr
+			-10:00	-	AST	1942
+			-10:00	US	A%sT	1967 Apr
 			-10:00	-	AHST	1969
 			-10:00	US	AH%sT	1983 Oct 30  2:00
 			 -9:00	US	Y%sT	1983 Nov 30
@@ -625,7 +686,6 @@
 			-10:30	1:00	HDT	1945 Sep 30  2:00
 			-10:30	-	HST	1947 Jun  8  2:00
 			-10:00	-	HST
-Link Pacific/Honolulu Pacific/Johnston
 
 # Now we turn to US areas that have diverged from the consensus since 1970.
 
@@ -1013,15 +1073,15 @@
 ################################################################################
 
 
-# From Paul Eggert (2014-10-31):
+# From Paul Eggert (2017-02-10):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
 # Unfortunately this book contains many errors and cites no sources.
 #
-# Gwillim Law writes that a good source
-# for recent time zone data is the International Air Transport
+# Many years ago Gwillim Law wrote that a good source
+# for time zone data was the International Air Transport
 # Association's Standard Schedules Information Manual (IATA SSIM),
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.  Except where otherwise noted,
@@ -2191,39 +2251,39 @@
 Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # aka Panniqtuuq
-Zone America/Pangnirtung 0	-	zzz	1921 # trading post est.
+Zone America/Pangnirtung 0	-	-00	1921 # trading post est.
 			-4:00	NT_YK	A%sT	1995 Apr Sun>=1  2:00
 			-5:00	Canada	E%sT	1999 Oct 31  2:00
 			-6:00	Canada	C%sT	2000 Oct 29  2:00
 			-5:00	Canada	E%sT
 # formerly Frobisher Bay
-Zone America/Iqaluit	0	-	zzz	1942 Aug # Frobisher Bay est.
+Zone America/Iqaluit	0	-	-00	1942 Aug # Frobisher Bay est.
 			-5:00	NT_YK	E%sT	1999 Oct 31  2:00
 			-6:00	Canada	C%sT	2000 Oct 29  2:00
 			-5:00	Canada	E%sT
 # aka Qausuittuq
-Zone America/Resolute	0	-	zzz	1947 Aug 31 # Resolute founded
+Zone America/Resolute	0	-	-00	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	-	EST	2007 Mar 11  3:00
 			-6:00	Canada	C%sT
 # aka Kangiqiniq
-Zone America/Rankin_Inlet 0	-	zzz	1957 # Rankin Inlet founded
+Zone America/Rankin_Inlet 0	-	-00	1957 # Rankin Inlet 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
 # aka Iqaluktuuttiaq
-Zone America/Cambridge_Bay 0	-	zzz	1920 # trading post est.?
+Zone America/Cambridge_Bay 0	-	-00	1920 # trading post est.?
 			-7:00	NT_YK	M%sT	1999 Oct 31  2:00
 			-6:00	Canada	C%sT	2000 Oct 29  2:00
 			-5:00	-	EST	2000 Nov  5  0:00
 			-6:00	-	CST	2001 Apr  1  3:00
 			-7:00	Canada	M%sT
-Zone America/Yellowknife 0	-	zzz	1935 # Yellowknife founded?
+Zone America/Yellowknife 0	-	-00	1935 # Yellowknife founded?
 			-7:00	NT_YK	M%sT	1980
 			-7:00	Canada	M%sT
-Zone America/Inuvik	0	-	zzz	1953 # Inuvik founded
+Zone America/Inuvik	0	-	-00	1953 # Inuvik founded
 			-8:00	NT_YK	P%sT	1979 Apr lastSun  2:00
 			-7:00	NT_YK	M%sT	1980
 			-7:00	Canada	M%sT
@@ -2476,6 +2536,15 @@
 			-5:00	-	EST	1982 Dec  2
 			-6:00	Mexico	C%sT
 # Coahuila, Nuevo León, Tamaulipas (near US border)
+# This includes the following municipalities:
+#   in Coahuila: Ocampo, Acuña, Zaragoza, Jiménez, Piedras Negras, Nava,
+#     Guerrero, Hidalgo.
+#   in Nuevo León: Anáhuac, Los Aldama.
+#   in Tamaulipas: Nuevo Laredo, Guerrero, Mier, Miguel Alemán, Camargo,
+#     Gustavo Díaz Ordaz, Reynosa, Río Bravo, Valle Hermoso, Matamoros.
+# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
+# 2016-03-12
+# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
 Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
 			-6:00	-	CST	1988
 			-6:00	US	C%sT	1989
@@ -2497,6 +2566,9 @@
 			-6:00	-	CST	2002 Feb 20
 			-6:00	Mexico	C%sT
 # Chihuahua (near US border)
+# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
+# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
+# (See the 2016-03-12 El Universal source mentioned above.)
 Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
 			-7:00	-	MST	1927 Jun 10 23:00
 			-6:00	-	CST	1930 Nov 15
@@ -2667,15 +2739,15 @@
 # Belize
 # Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Belize	1918	1942	-	Oct	Sun>=2	0:00	0:30	HD
-Rule	Belize	1919	1943	-	Feb	Sun>=9	0:00	0	S
-Rule	Belize	1973	only	-	Dec	 5	0:00	1:00	D
-Rule	Belize	1974	only	-	Feb	 9	0:00	0	S
-Rule	Belize	1982	only	-	Dec	18	0:00	1:00	D
-Rule	Belize	1983	only	-	Feb	12	0:00	0	S
+Rule	Belize	1918	1942	-	Oct	Sun>=2	0:00	0:30	-0530
+Rule	Belize	1919	1943	-	Feb	Sun>=9	0:00	0	CST
+Rule	Belize	1973	only	-	Dec	 5	0:00	1:00	CDT
+Rule	Belize	1974	only	-	Feb	 9	0:00	0	CST
+Rule	Belize	1982	only	-	Dec	18	0:00	1:00	CDT
+Rule	Belize	1983	only	-	Feb	12	0:00	0	CST
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Belize	-5:52:48 -	LMT	1912 Apr
-			-6:00	Belize	C%sT
+			-6:00	Belize	%s
 
 # Bermuda
 
@@ -2947,16 +3019,16 @@
 
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	DR	1966	only	-	Oct	30	0:00	1:00	D
-Rule	DR	1967	only	-	Feb	28	0:00	0	S
-Rule	DR	1969	1973	-	Oct	lastSun	0:00	0:30	HD
-Rule	DR	1970	only	-	Feb	21	0:00	0	S
-Rule	DR	1971	only	-	Jan	20	0:00	0	S
-Rule	DR	1972	1974	-	Jan	21	0:00	0	S
+Rule	DR	1966	only	-	Oct	30	0:00	1:00	EDT
+Rule	DR	1967	only	-	Feb	28	0:00	0	EST
+Rule	DR	1969	1973	-	Oct	lastSun	0:00	0:30	-0430
+Rule	DR	1970	only	-	Feb	21	0:00	0	EST
+Rule	DR	1971	only	-	Jan	20	0:00	0	EST
+Rule	DR	1972	1974	-	Jan	21	0:00	0	EST
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Santo_Domingo -4:39:36 -	LMT	1890
 			-4:40	-	SDMT	1933 Apr  1 12:00 # S. Dom. MT
-			-5:00	DR	E%sT	1974 Oct 27
+			-5:00	DR	%s	1974 Oct 27
 			-4:00	-	AST	2000 Oct 29  2:00
 			-5:00	US	E%sT	2000 Dec  3  1:00
 			-4:00	-	AST
@@ -3067,6 +3139,12 @@
 # http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
 # http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
 
+# From Steffen Thorsen (2017-03-12):
+# We have received 4 mails from different people telling that Haiti
+# has started DST again today, and this source seems to confirm that,
+# I have not been able to find a more authoritative source:
+# https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-haiti.html
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
 Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
@@ -3079,6 +3157,8 @@
 Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
 Rule	Haiti	2012	2015	-	Mar	Sun>=8	2:00	1:00	D
 Rule	Haiti	2012	2015	-	Nov	Sun>=1	2:00	0	S
+Rule	Haiti	2017	max	-	Mar	Sun>=8	2:00	1:00	D
+Rule	Haiti	2017	max	-	Nov	Sun>=1	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Port-au-Prince -4:49:20 -	LMT	1890
 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
@@ -3246,8 +3326,8 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 # St Pierre
 			-4:00	-	AST	1980 May
-			-3:00	-	PMST	1987 # Pierre & Miquelon Time
-			-3:00	Canada	PM%sT
+			-3:00	-	-03	1987
+			-3:00	Canada	-03/-02
 
 # St Vincent and the Grenadines
 # See America/Port_of_Spain.
@@ -3269,7 +3349,7 @@
 # indicating that the normal ET rules are followed.
 #
 # From Paul Eggert (2014-08-19):
-# The 2014-08-13 Cabinet meeting decided to stay on UTC-4 year-round.  See:
+# The 2014-08-13 Cabinet meeting decided to stay on UT -04 year-round.  See:
 # http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
 # Model this as a switch from EST/EDT to AST ...
 # From Chris Walton (2014-11-04):
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/southamerica postgresql-9.5-9.5.8/src/timezone/data/southamerica
--- postgresql-9.5-9.5.2/src/timezone/data/southamerica	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/southamerica	2017-08-07 21:13:41.000000000 +0000
@@ -6,15 +6,15 @@
 # tz@iana.org for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2014-10-31):
+# From Paul Eggert (2016-12-05):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
 # Unfortunately this book contains many errors and cites no sources.
 #
-# Gwillim Law writes that a good source
-# for recent time zone data is the International Air Transport
+# Many years ago Gwillim Law wrote that a good source
+# for time zone data was the International Air Transport
 # Association's Standard Schedules Information Manual (IATA SSIM),
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.  Except where otherwise noted,
@@ -24,32 +24,10 @@
 # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
 # http://www.jstor.org/stable/1774359
 #
-# Earlier editions of these tables used the North American style (e.g. ARST and
-# ARDT for Argentine Standard and Daylight Time), but the following quote
-# suggests that it's better to use European style (e.g. ART and ARST).
-#	I suggest the use of _Summer time_ instead of the more cumbersome
-#	_daylight-saving time_.  _Summer time_ seems to be in general use
-#	in Europe and South America.
-#	-- E O Cutler, _New York Times_ (1937-02-14), quoted in
-#	H L Mencken, _The American Language: Supplement I_ (1960), p 466
-#
-# Earlier editions of these tables also used the North American style
-# for time zones in Brazil, but this was incorrect, as Brazilians say
-# "summer time".  Reinaldo Goulart, a São Paulo businessman active in
-# the railroad sector, writes (1999-07-06):
-#	The subject of time zones is currently a matter of discussion/debate in
-#	Brazil.  Let's say that "the Brasília time" is considered the
-#	"official time" because Brasília is the capital city.
-#	The other three time zones are called "Brasília time "minus one" or
-#	"plus one" or "plus two".  As far as I know there is no such
-#	name/designation as "Eastern Time" or "Central Time".
-# So I invented the following (English-language) abbreviations for now.
-# Corrections are welcome!
-#		std	dst
-#	-2:00	FNT	FNST	Fernando de Noronha
-#	-3:00	BRT	BRST	Brasília
-#	-4:00	AMT	AMST	Amazon
-#	-5:00	ACT	ACST	Acre
+# These tables use numeric abbreviations like -03 and -0330 for
+# integer hour and minute UTC offsets.  Although earlier editions used
+# alphabetic time zone abbreviations, these abbreviations were
+# invented and did not reflect common practice.
 
 ###############################################################################
 
@@ -384,12 +362,6 @@
 #
 # So I guess a new set of rules, besides "Arg", must be made and the last
 # America/Argentina/San_Luis entries should change to use these...
-#
-# I'm enclosing a patch that does what I say... regretfully, the San Luis
-# timezone must be called "WART/WARST" even when most of the time (like,
-# right now) WARST == ART... that is, since last Sunday, all the country
-# is using UTC-3, but in my patch, San Luis calls it "WARST" and the rest
-# of the country calls it "ART".
 # ...
 
 # From Alexander Krivenyshev (2010-04-09):
@@ -410,9 +382,9 @@
 # stuck on Summer daylight savings time even though the summer is over.
 
 # From Paul Eggert (2013-09-05):
-# Perhaps San Luis operates on the legal fiction that it is at UTC-4
+# Perhaps San Luis operates on the legal fiction that it is at -04
 # with perpetual summer time, but ordinary usage typically seems to
-# just say it's at UTC-3; see, for example,
+# just say it's at -03; see, for example,
 # http://es.wikipedia.org/wiki/Hora_oficial_argentina
 # We've documented similar situations as being plain changes to
 # standard time, so let's do that here too.  This does not change UTC
@@ -428,11 +400,11 @@
 # Buenos Aires (BA), Capital Federal (CF),
 Zone America/Argentina/Buenos_Aires -3:53:48 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May    # Córdoba Mean Time
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	Arg	AR%sT
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	Arg	-03/-02
 #
 # Córdoba (CB), Santa Fe (SF), Entre Ríos (ER), Corrientes (CN), Misiones (MN),
 # Chaco (CC), Formosa (FM), Santiago del Estero (SE)
@@ -446,113 +418,113 @@
 #
 Zone America/Argentina/Cordoba -4:16:48 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1991 Mar  3
-			-4:00	-	WART	1991 Oct 20
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	Arg	AR%sT
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1991 Mar  3
+			-4:00	-	-04	1991 Oct 20
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	Arg	-03/-02
 #
 # Salta (SA), La Pampa (LP), Neuquén (NQ), Rio Negro (RN)
 Zone America/Argentina/Salta -4:21:40 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1991 Mar  3
-			-4:00	-	WART	1991 Oct 20
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	Arg	AR%sT	2008 Oct 18
-			-3:00	-	ART
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1991 Mar  3
+			-4:00	-	-04	1991 Oct 20
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	Arg	-03/-02	2008 Oct 18
+			-3:00	-	-03
 #
 # Tucumán (TM)
 Zone America/Argentina/Tucuman -4:20:52 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1991 Mar  3
-			-4:00	-	WART	1991 Oct 20
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	-	ART	2004 Jun  1
-			-4:00	-	WART	2004 Jun 13
-			-3:00	Arg	AR%sT
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1991 Mar  3
+			-4:00	-	-04	1991 Oct 20
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	-	-03	2004 Jun  1
+			-4:00	-	-04	2004 Jun 13
+			-3:00	Arg	-03/-02
 #
 # La Rioja (LR)
 Zone America/Argentina/La_Rioja -4:27:24 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1991 Mar  1
-			-4:00	-	WART	1991 May  7
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	-	ART	2004 Jun  1
-			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT	2008 Oct 18
-			-3:00	-	ART
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1991 Mar  1
+			-4:00	-	-04	1991 May  7
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	-	-03	2004 Jun  1
+			-4:00	-	-04	2004 Jun 20
+			-3:00	Arg	-03/-02	2008 Oct 18
+			-3:00	-	-03
 #
 # San Juan (SJ)
 Zone America/Argentina/San_Juan -4:34:04 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1991 Mar  1
-			-4:00	-	WART	1991 May  7
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	-	ART	2004 May 31
-			-4:00	-	WART	2004 Jul 25
-			-3:00	Arg	AR%sT	2008 Oct 18
-			-3:00	-	ART
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1991 Mar  1
+			-4:00	-	-04	1991 May  7
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	-	-03	2004 May 31
+			-4:00	-	-04	2004 Jul 25
+			-3:00	Arg	-03/-02	2008 Oct 18
+			-3:00	-	-03
 #
 # Jujuy (JY)
 Zone America/Argentina/Jujuy -4:21:12 -	LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1990 Mar  4
-			-4:00	-	WART	1990 Oct 28
-			-4:00	1:00	WARST	1991 Mar 17
-			-4:00	-	WART	1991 Oct  6
-			-3:00	1:00	ARST	1992
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	Arg	AR%sT	2008 Oct 18
-			-3:00	-	ART
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1990 Mar  4
+			-4:00	-	-04	1990 Oct 28
+			-4:00	1:00	-03	1991 Mar 17
+			-4:00	-	-04	1991 Oct  6
+			-3:00	1:00	-02	1992
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	Arg	-03/-02	2008 Oct 18
+			-3:00	-	-03
 #
 # Catamarca (CT), Chubut (CH)
 Zone America/Argentina/Catamarca -4:23:08 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1991 Mar  3
-			-4:00	-	WART	1991 Oct 20
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	-	ART	2004 Jun  1
-			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT	2008 Oct 18
-			-3:00	-	ART
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1991 Mar  3
+			-4:00	-	-04	1991 Oct 20
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	-	-03	2004 Jun  1
+			-4:00	-	-04	2004 Jun 20
+			-3:00	Arg	-03/-02	2008 Oct 18
+			-3:00	-	-03
 #
 # Mendoza (MZ)
 Zone America/Argentina/Mendoza -4:35:16 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1990 Mar  4
-			-4:00	-	WART	1990 Oct 15
-			-4:00	1:00	WARST	1991 Mar  1
-			-4:00	-	WART	1991 Oct 15
-			-4:00	1:00	WARST	1992 Mar  1
-			-4:00	-	WART	1992 Oct 18
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	-	ART	2004 May 23
-			-4:00	-	WART	2004 Sep 26
-			-3:00	Arg	AR%sT	2008 Oct 18
-			-3:00	-	ART
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1990 Mar  4
+			-4:00	-	-04	1990 Oct 15
+			-4:00	1:00	-03	1991 Mar  1
+			-4:00	-	-04	1991 Oct 15
+			-4:00	1:00	-03	1992 Mar  1
+			-4:00	-	-04	1992 Oct 18
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	-	-03	2004 May 23
+			-4:00	-	-04	2004 Sep 26
+			-3:00	Arg	-03/-02	2008 Oct 18
+			-3:00	-	-03
 #
 # San Luis (SL)
 
@@ -561,44 +533,44 @@
 
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1990
-			-3:00	1:00	ARST	1990 Mar 14
-			-4:00	-	WART	1990 Oct 15
-			-4:00	1:00	WARST	1991 Mar  1
-			-4:00	-	WART	1991 Jun  1
-			-3:00	-	ART	1999 Oct  3
-			-4:00	1:00	WARST	2000 Mar  3
-			-3:00	-	ART	2004 May 31
-			-4:00	-	WART	2004 Jul 25
-			-3:00	Arg	AR%sT	2008 Jan 21
-			-4:00	SanLuis	WAR%sT	2009 Oct 11
-			-3:00	-	ART
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1990
+			-3:00	1:00	-02	1990 Mar 14
+			-4:00	-	-04	1990 Oct 15
+			-4:00	1:00	-03	1991 Mar  1
+			-4:00	-	-04	1991 Jun  1
+			-3:00	-	-03	1999 Oct  3
+			-4:00	1:00	-03	2000 Mar  3
+			-3:00	-	-03	2004 May 31
+			-4:00	-	-04	2004 Jul 25
+			-3:00	Arg	-03/-02	2008 Jan 21
+			-4:00	SanLuis	-04/-03	2009 Oct 11
+			-3:00	-	-03
 #
 # Santa Cruz (SC)
 Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May    # Córdoba Mean Time
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	-	ART	2004 Jun  1
-			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT	2008 Oct 18
-			-3:00	-	ART
+			-4:16:48 -	CMT	1920 May
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	-	-03	2004 Jun  1
+			-4:00	-	-04	2004 Jun 20
+			-3:00	Arg	-03/-02	2008 Oct 18
+			-3:00	-	-03
 #
 # Tierra del Fuego, Antártida e Islas del Atlántico Sur (TF)
 Zone America/Argentina/Ushuaia -4:33:12 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May    # Córdoba Mean Time
-			-4:00	-	ART	1930 Dec
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1999 Oct  3
-			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	-	ART	2004 May 30
-			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT	2008 Oct 18
-			-3:00	-	ART
+			-4:16:48 -	CMT	1920 May
+			-4:00	-	-04	1930 Dec
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1999 Oct  3
+			-4:00	Arg	-04/-03	2000 Mar  3
+			-3:00	-	-03	2004 May 30
+			-4:00	-	-04	2004 Jun 20
+			-3:00	Arg	-03/-02	2008 Oct 18
+			-3:00	-	-03
 
 # Aruba
 Link America/Curacao America/Aruba
@@ -608,7 +580,7 @@
 Zone	America/La_Paz	-4:32:36 -	LMT	1890
 			-4:32:36 -	CMT	1931 Oct 15 # Calamarca MT
 			-4:32:36 1:00	BOST	1932 Mar 21 # Bolivia ST
-			-4:00	-	BOT	# Bolivia Time
+			-4:00	-	-04
 
 # Brazil
 
@@ -960,12 +932,12 @@
 #
 # Fernando de Noronha (administratively part of PE)
 Zone America/Noronha	-2:09:40 -	LMT	1914
-			-2:00	Brazil	FN%sT	1990 Sep 17
-			-2:00	-	FNT	1999 Sep 30
-			-2:00	Brazil	FN%sT	2000 Oct 15
-			-2:00	-	FNT	2001 Sep 13
-			-2:00	Brazil	FN%sT	2002 Oct  1
-			-2:00	-	FNT
+			-2:00	Brazil	-02/-01	1990 Sep 17
+			-2:00	-	-02	1999 Sep 30
+			-2:00	Brazil	-02/-01	2000 Oct 15
+			-2:00	-	-02	2001 Sep 13
+			-2:00	Brazil	-02/-01	2002 Oct  1
+			-2:00	-	-02
 # Other Atlantic islands have no permanent settlement.
 # These include Trindade and Martim Vaz (administratively part of ES),
 # Rocas Atoll (RN), and the St Peter and St Paul Archipelago (PE).
@@ -978,119 +950,119 @@
 # In the north a very small part from the river Javary (now Jari I guess,
 # the border with Amapá) to the Amazon, then to the Xingu.
 Zone America/Belem	-3:13:56 -	LMT	1914
-			-3:00	Brazil	BR%sT	1988 Sep 12
-			-3:00	-	BRT
+			-3:00	Brazil	-03/-02	1988 Sep 12
+			-3:00	-	-03
 #
 # west Pará (PA)
 # West Pará includes Altamira, Óbidos, Prainha, Oriximiná, and Santarém.
 Zone America/Santarem	-3:38:48 -	LMT	1914
-			-4:00	Brazil	AM%sT	1988 Sep 12
-			-4:00	-	AMT	2008 Jun 24  0:00
-			-3:00	-	BRT
+			-4:00	Brazil	-04/-03	1988 Sep 12
+			-4:00	-	-04	2008 Jun 24  0:00
+			-3:00	-	-03
 #
 # Maranhão (MA), Piauí (PI), Ceará (CE), Rio Grande do Norte (RN),
 # Paraíba (PB)
 Zone America/Fortaleza	-2:34:00 -	LMT	1914
-			-3:00	Brazil	BR%sT	1990 Sep 17
-			-3:00	-	BRT	1999 Sep 30
-			-3:00	Brazil	BR%sT	2000 Oct 22
-			-3:00	-	BRT	2001 Sep 13
-			-3:00	Brazil	BR%sT	2002 Oct  1
-			-3:00	-	BRT
+			-3:00	Brazil	-03/-02	1990 Sep 17
+			-3:00	-	-03	1999 Sep 30
+			-3:00	Brazil	-03/-02	2000 Oct 22
+			-3:00	-	-03	2001 Sep 13
+			-3:00	Brazil	-03/-02	2002 Oct  1
+			-3:00	-	-03
 #
 # Pernambuco (PE) (except Atlantic islands)
 Zone America/Recife	-2:19:36 -	LMT	1914
-			-3:00	Brazil	BR%sT	1990 Sep 17
-			-3:00	-	BRT	1999 Sep 30
-			-3:00	Brazil	BR%sT	2000 Oct 15
-			-3:00	-	BRT	2001 Sep 13
-			-3:00	Brazil	BR%sT	2002 Oct  1
-			-3:00	-	BRT
+			-3:00	Brazil	-03/-02	1990 Sep 17
+			-3:00	-	-03	1999 Sep 30
+			-3:00	Brazil	-03/-02	2000 Oct 15
+			-3:00	-	-03	2001 Sep 13
+			-3:00	Brazil	-03/-02	2002 Oct  1
+			-3:00	-	-03
 #
 # Tocantins (TO)
 Zone America/Araguaina	-3:12:48 -	LMT	1914
-			-3:00	Brazil	BR%sT	1990 Sep 17
-			-3:00	-	BRT	1995 Sep 14
-			-3:00	Brazil	BR%sT	2003 Sep 24
-			-3:00	-	BRT	2012 Oct 21
-			-3:00	Brazil	BR%sT	2013 Sep
-			-3:00	-	BRT
+			-3:00	Brazil	-03/-02	1990 Sep 17
+			-3:00	-	-03	1995 Sep 14
+			-3:00	Brazil	-03/-02	2003 Sep 24
+			-3:00	-	-03	2012 Oct 21
+			-3:00	Brazil	-03/-02	2013 Sep
+			-3:00	-	-03
 #
 # Alagoas (AL), Sergipe (SE)
 Zone America/Maceio	-2:22:52 -	LMT	1914
-			-3:00	Brazil	BR%sT	1990 Sep 17
-			-3:00	-	BRT	1995 Oct 13
-			-3:00	Brazil	BR%sT	1996 Sep  4
-			-3:00	-	BRT	1999 Sep 30
-			-3:00	Brazil	BR%sT	2000 Oct 22
-			-3:00	-	BRT	2001 Sep 13
-			-3:00	Brazil	BR%sT	2002 Oct  1
-			-3:00	-	BRT
+			-3:00	Brazil	-03/-02	1990 Sep 17
+			-3:00	-	-03	1995 Oct 13
+			-3:00	Brazil	-03/-02	1996 Sep  4
+			-3:00	-	-03	1999 Sep 30
+			-3:00	Brazil	-03/-02	2000 Oct 22
+			-3:00	-	-03	2001 Sep 13
+			-3:00	Brazil	-03/-02	2002 Oct  1
+			-3:00	-	-03
 #
 # Bahia (BA)
 # There are too many Salvadors elsewhere, so use America/Bahia instead
 # of America/Salvador.
 Zone America/Bahia	-2:34:04 -	LMT	1914
-			-3:00	Brazil	BR%sT	2003 Sep 24
-			-3:00	-	BRT	2011 Oct 16
-			-3:00	Brazil	BR%sT	2012 Oct 21
-			-3:00	-	BRT
+			-3:00	Brazil	-03/-02	2003 Sep 24
+			-3:00	-	-03	2011 Oct 16
+			-3:00	Brazil	-03/-02	2012 Oct 21
+			-3:00	-	-03
 #
 # Goiás (GO), Distrito Federal (DF), Minas Gerais (MG),
 # Espírito Santo (ES), Rio de Janeiro (RJ), São Paulo (SP), Paraná (PR),
 # Santa Catarina (SC), Rio Grande do Sul (RS)
 Zone America/Sao_Paulo	-3:06:28 -	LMT	1914
-			-3:00	Brazil	BR%sT	1963 Oct 23  0:00
-			-3:00	1:00	BRST	1964
-			-3:00	Brazil	BR%sT
+			-3:00	Brazil	-03/-02	1963 Oct 23  0:00
+			-3:00	1:00	-02	1964
+			-3:00	Brazil	-03/-02
 #
 # Mato Grosso do Sul (MS)
 Zone America/Campo_Grande -3:38:28 -	LMT	1914
-			-4:00	Brazil	AM%sT
+			-4:00	Brazil	-04/-03
 #
 # Mato Grosso (MT)
 Zone America/Cuiaba	-3:44:20 -	LMT	1914
-			-4:00	Brazil	AM%sT	2003 Sep 24
-			-4:00	-	AMT	2004 Oct  1
-			-4:00	Brazil	AM%sT
+			-4:00	Brazil	-04/-03	2003 Sep 24
+			-4:00	-	-04	2004 Oct  1
+			-4:00	Brazil	-04/-03
 #
 # Rondônia (RO)
 Zone America/Porto_Velho -4:15:36 -	LMT	1914
-			-4:00	Brazil	AM%sT	1988 Sep 12
-			-4:00	-	AMT
+			-4:00	Brazil	-04/-03	1988 Sep 12
+			-4:00	-	-04
 #
 # Roraima (RR)
 Zone America/Boa_Vista	-4:02:40 -	LMT	1914
-			-4:00	Brazil	AM%sT	1988 Sep 12
-			-4:00	-	AMT	1999 Sep 30
-			-4:00	Brazil	AM%sT	2000 Oct 15
-			-4:00	-	AMT
+			-4:00	Brazil	-04/-03	1988 Sep 12
+			-4:00	-	-04	1999 Sep 30
+			-4:00	Brazil	-04/-03	2000 Oct 15
+			-4:00	-	-04
 #
 # east Amazonas (AM): Boca do Acre, Jutaí, Manaus, Floriano Peixoto
 # The great circle line from Tabatinga to Porto Acre divides
 # east from west Amazonas.
 Zone America/Manaus	-4:00:04 -	LMT	1914
-			-4:00	Brazil	AM%sT	1988 Sep 12
-			-4:00	-	AMT	1993 Sep 28
-			-4:00	Brazil	AM%sT	1994 Sep 22
-			-4:00	-	AMT
+			-4:00	Brazil	-04/-03	1988 Sep 12
+			-4:00	-	-04	1993 Sep 28
+			-4:00	Brazil	-04/-03	1994 Sep 22
+			-4:00	-	-04
 #
 # west Amazonas (AM): Atalaia do Norte, Boca do Maoco, Benjamin Constant,
 #	Eirunepé, Envira, Ipixuna
 Zone America/Eirunepe	-4:39:28 -	LMT	1914
-			-5:00	Brazil	AC%sT	1988 Sep 12
-			-5:00	-	ACT	1993 Sep 28
-			-5:00	Brazil	AC%sT	1994 Sep 22
-			-5:00	-	ACT	2008 Jun 24  0:00
-			-4:00	-	AMT	2013 Nov 10
-			-5:00	-	ACT
+			-5:00	Brazil	-05/-04	1988 Sep 12
+			-5:00	-	-05	1993 Sep 28
+			-5:00	Brazil	-05/-04	1994 Sep 22
+			-5:00	-	-05	2008 Jun 24  0:00
+			-4:00	-	-04	2013 Nov 10
+			-5:00	-	-05
 #
 # Acre (AC)
 Zone America/Rio_Branco	-4:31:12 -	LMT	1914
-			-5:00	Brazil	AC%sT	1988 Sep 12
-			-5:00	-	ACT	2008 Jun 24  0:00
-			-4:00	-	AMT	2013 Nov 10
-			-5:00	-	ACT
+			-5:00	Brazil	-05/-04	1988 Sep 12
+			-5:00	-	-05	2008 Jun 24  0:00
+			-4:00	-	-04	2013 Nov 10
+			-5:00	-	-05
 
 # Chile
 
@@ -1235,6 +1207,18 @@
 # to mean 24:00 mainland time, not 24:00 local time, so that Easter
 # Island is always two hours behind the mainland.
 
+# From Juan Correa (2016-12-04):
+# Magallanes region ... will keep DST (UTC -3) all year round....
+# http://www.soychile.cl/Santiago/Sociedad/2016/12/04/433428/Bachelet-firmo-el-decreto-para-establecer-un-horario-unico-para-la-Region-de-Magallanes.aspx
+#
+# From Deborah Goldsmith (2017-01-19):
+# http://www.diariooficial.interior.gob.cl/publicaciones/2017/01/17/41660/01/1169626.pdf
+# From Paul Eggert (2017-01-19):
+# The above says the Magallanes change expires 2019-05-11 at 24:00,
+# so in theory, they will revert to -04/-03 after that, which means
+# they will switch from -03 to -04 one hour after Santiago does that day.
+# For now, assume that they will not revert.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -1275,22 +1259,35 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Santiago	-4:42:46 -	LMT	1890
 			-4:42:46 -	SMT	1910 Jan 10 # Santiago Mean Time
-			-5:00	-	CLT	1916 Jul  1 # Chile Time
+			-5:00	-	-05	1916 Jul  1
+			-4:42:46 -	SMT	1918 Sep 10
+			-4:00	-	-04	1919 Jul  1
+			-4:42:46 -	SMT	1927 Sep  1
+			-5:00	Chile	-05/-04	1932 Sep  1
+			-4:00	-	-04	1942 Jun  1
+			-5:00	-	-05	1942 Aug  1
+			-4:00	-	-04	1946 Jul 15
+			-4:00	1:00	-03	1946 Sep  1 # central Chile
+			-4:00	-	-04	1947 Apr  1
+			-5:00	-	-05	1947 May 21 23:00
+			-4:00	Chile	-04/-03
+Zone America/Punta_Arenas -4:43:40 -	LMT	1890
+			-4:42:46 -	SMT	1910 Jan 10
+			-5:00	-	-05	1916 Jul  1
 			-4:42:46 -	SMT	1918 Sep 10
-			-4:00	-	CLT	1919 Jul  1
+			-4:00	-	-04	1919 Jul  1
 			-4:42:46 -	SMT	1927 Sep  1
-			-5:00	Chile	CL%sT	1932 Sep  1
-			-4:00	-	CLT	1942 Jun  1
-			-5:00	-	CLT	1942 Aug  1
-			-4:00	-	CLT	1946 Jul 15
-			-4:00	1:00	CLST	1946 Sep  1 # central Chile
-			-4:00	-	CLT	1947 Apr  1
-			-5:00	-	CLT	1947 May 21 23:00
-			-4:00	Chile	CL%sT
+			-5:00	Chile	-05/-04	1932 Sep  1
+			-4:00	-	-04	1942 Jun  1
+			-5:00	-	-05	1942 Aug  1
+			-4:00	-	-04	1947 Apr  1
+			-5:00	-	-05	1947 May 21 23:00
+			-4:00	Chile	-04/-03	2016 Dec  4
+			-3:00	-	-03
 Zone Pacific/Easter	-7:17:28 -	LMT	1890
 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
-			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
-			-6:00	Chile	EAS%sT
+			-7:00	Chile	-07/-06	1982 Mar 14 3:00u # Easter Time
+			-6:00	Chile	-06/-05
 #
 # Salas y Gómez Island is uninhabited.
 # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
@@ -1309,10 +1306,11 @@
 # Palmer used to be supplied from Argentina.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Palmer	0	-	zzz	1965
-			-4:00	Arg	AR%sT	1969 Oct  5
-			-3:00	Arg	AR%sT	1982 May
-			-4:00	Chile	CL%sT
+Zone Antarctica/Palmer	0	-	-00	1965
+			-4:00	Arg	-04/-03	1969 Oct  5
+			-3:00	Arg	-03/-02	1982 May
+			-4:00	Chile	-04/-03	2016 Dec  4
+			-3:00	-	-03
 
 # Colombia
 
@@ -1325,7 +1323,7 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Bogota	-4:56:16 -	LMT	1884 Mar 13
 			-4:56:16 -	BMT	1914 Nov 23 # Bogotá Mean Time
-			-5:00	CO	CO%sT	# Colombia Time
+			-5:00	CO	-05/-04
 # Malpelo, Providencia, San Andres
 # no information; probably like America/Bogota
 
@@ -1349,7 +1347,7 @@
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12 # Willemstad
-			-4:30	-	ANT	1965 # Netherlands Antilles Time
+			-4:30	-	-0430	1965
 			-4:00	-	AST
 
 # From Arthur David Olson (2011-06-15):
@@ -1364,19 +1362,32 @@
 #
 # Milne says the Central and South American Telegraph Company used -5:24:15.
 #
-# From Paul Eggert (2007-03-04):
-# Apparently Ecuador had a failed experiment with DST in 1992.
-# <http://midena.gov.ec/content/view/1261/208/> (2007-02-27) and
-# <http://www.hoy.com.ec/NoticiaNue.asp?row_id=249856> (2006-11-06) both
-# talk about "hora Sixto".  Leave this alone for now, as we have no data.
+# From Alois Treindl (2016-12-15):
+# http://www.elcomercio.com/actualidad/hora-sixto-1993.html
+# ... Whether the law applied also to Galápagos, I do not know.
+# From Paul Eggert (2016-12-15):
+# http://www.elcomercio.com/afull/modificacion-husohorario-ecuador-presidentes-decreto.html
+# This says President Sixto Durán Ballén signed decree No. 285, which
+# established DST from 1992-11-28 to 1993-02-05; it does not give transition
+# times.  The people called it "hora de Sixto" ("Sixto hour").  The change did
+# not go over well; a popular song "Qué hora es" by Jaime Guevara had lyrics
+# that included "Amanecía en mitad de la noche, los guaguas iban a clase sin
+# sol" ("It was dawning in the middle of the night, the buses went to class
+# without sun").  Although Ballén's campaign slogan was "Ni un paso atrás"
+# (Not one step back), the clocks went back in 1993 and the experiment was not
+# repeated.  For now, assume transitions were at 00:00 local time country-wide.
+#
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Ecuador	1992	only	-	Nov	28	0:00	1:00	S
+Rule	Ecuador	1993	only	-	Feb	 5	0:00	0	-
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Guayaquil	-5:19:20 -	LMT	1890
 			-5:14:00 -	QMT	1931 # Quito Mean Time
-			-5:00	-	ECT	# Ecuador Time
+			-5:00	Ecuador	-05/-04
 Zone Pacific/Galapagos	-5:58:24 -	LMT	1931 # Puerto Baquerizo Moreno
-			-5:00	-	ECT	1986
-			-6:00	-	GALT	# Galápagos Time
+			-5:00	-	-05	1986
+			-6:00	Ecuador	-06/-05
 
 # Falklands
 
@@ -1476,25 +1487,24 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
 			-3:51:24 -	SMT	1912 Mar 12 # Stanley Mean Time
-			-4:00	Falk	FK%sT	1983 May    # Falkland Is Time
-			-3:00	Falk	FK%sT	1985 Sep 15
-			-4:00	Falk	FK%sT	2010 Sep  5  2:00
-			-3:00	-	FKST
+			-4:00	Falk	-04/-03	1983 May
+			-3:00	Falk	-03/-02	1985 Sep 15
+			-4:00	Falk	-04/-03	2010 Sep  5  2:00
+			-3:00	-	-03
 
 # French Guiana
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Cayenne	-3:29:20 -	LMT	1911 Jul
-			-4:00	-	GFT	1967 Oct # French Guiana Time
-			-3:00	-	GFT
+			-4:00	-	-04	1967 Oct
+			-3:00	-	-03
 
 # Guyana
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar    # Georgetown
-			-3:45	-	GBGT	1966 May 26 # Br Guiana Time
-			-3:45	-	GYT	1975 Jul 31 # Guyana Time
-			-3:00	-	GYT	1991
+			-3:45	-	-0345	1975 Jul 31
+			-3:00	-	-03	1991
 # IATA SSIM (1996-06) says -4:00.  Assume a 1991 switch.
-			-4:00	-	GYT
+			-4:00	-	-04
 
 # Paraguay
 #
@@ -1586,9 +1596,9 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Asuncion	-3:50:40 -	LMT	1890
 			-3:50:40 -	AMT	1931 Oct 10 # Asunción Mean Time
-			-4:00	-	PYT	1972 Oct    # Paraguay Time
-			-3:00	-	PYT	1974 Apr
-			-4:00	Para	PY%sT
+			-4:00	-	-04	1972 Oct
+			-3:00	-	-03	1974 Apr
+			-4:00	Para	-04/-03
 
 # Peru
 #
@@ -1615,12 +1625,12 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Lima	-5:08:12 -	LMT	1890
 			-5:08:36 -	LMT	1908 Jul 28 # Lima Mean Time?
-			-5:00	Peru	PE%sT	# Peru Time
+			-5:00	Peru	-05/-04
 
 # South Georgia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890 # Grytviken
-			-2:00	-	GST	# South Georgia Time
+			-2:00	-	-02
 
 # South Sandwich Is
 # uninhabited; scientific personnel have wintered
@@ -1630,9 +1640,8 @@
 Zone America/Paramaribo	-3:40:40 -	LMT	1911
 			-3:40:52 -	PMT	1935     # Paramaribo Mean Time
 			-3:40:36 -	PMT	1945 Oct    # The capital moved?
-			-3:30	-	NEGT	1975 Nov 20 # Dutch Guiana Time
-			-3:30	-	SRT	1984 Oct    # Suriname Time
-			-3:00	-	SRT
+			-3:30	-	-0330	1984 Oct
+			-3:00	-	-03
 
 # Trinidad and Tobago
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1735,11 +1744,16 @@
 # [dated 2015-06-29; repeals Decree 311/006 dated 2006-09-04]
 Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	S
 Rule	Uruguay	2007	2015	-	Mar	Sun>=8	 2:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+
+# This Zone can be simplified once we assume zic %z.
 Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 			-3:44:44 -	MMT	1920 May  1 # Montevideo MT
-			-3:30	Uruguay	UY%sT	1942 Dec 14 # Uruguay Time
-			-3:00	Uruguay	UY%sT
+			-3:30	Uruguay	-0330/-03 1942 Dec 14
+			-3:00	Uruguay	-03/-02	1968
+			-3:00	Uruguay	-03/-0230 1971
+			-3:00	Uruguay	-03/-02	1974
+			-3:00	Uruguay	-03/-0230 1974 Dec 22
+			-3:00	Uruguay	-03/-02
 
 # Venezuela
 #
@@ -1755,9 +1769,25 @@
 # resolution publication)
 # http://www.globovision.com/news.php?nid=72208
 
+# From Alexander Krivenyshev (2016-04-15):
+# https://actualidad.rt.com/actualidad/204758-venezuela-modificar-huso-horario-sequia-elnino
+#
+# From Paul Eggert (2016-04-15):
+# Clocks advance 30 minutes on 2016-05-01 at 02:30....
+# "'Venezuela's new time-zone: hours without light, hours without water,
+# hours of presidential broadcasts, hours of lines,' quipped comedian
+# Jean Mary Curró ...". See: Cawthorne A, Kai D. Venezuela scraps
+# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
+# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
+#
+# From Matt Johnson (2016-04-20):
+# ... published in the official Gazette [2016-04-18], here:
+# http://historico.tsj.gob.ve/gaceta_ext/abril/1842016/E-1842016-4551.pdf
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
-			-4:30	-	VET	1965 Jan  1  0:00 # Venezuela T.
-			-4:00	-	VET	2007 Dec  9  3:00
-			-4:30	-	VET
+			-4:30	-	-0430	1965 Jan  1  0:00
+			-4:00	-	-04	2007 Dec  9  3:00
+			-4:30	-	-0430	2016 May  1  2:30
+			-4:00	-	-04
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/yearistype.sh postgresql-9.5-9.5.8/src/timezone/data/yearistype.sh
--- postgresql-9.5-9.5.2/src/timezone/data/yearistype.sh	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/yearistype.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-: 'This file is in the public domain, so clarified as of'
-: '2006-07-17 by Arthur David Olson.'
-
-case $#-$1 in
-	2-|2-0*|2-*[!0-9]*)
-		echo "$0: wild year: $1" >&2
-		exit 1 ;;
-esac
-
-case $#-$2 in
-	2-even)
-		case $1 in
-			*[24680])			exit 0 ;;
-			*)				exit 1 ;;
-		esac ;;
-	2-nonpres|2-nonuspres)
-		case $1 in
-			*[02468][048]|*[13579][26])	exit 1 ;;
-			*)				exit 0 ;;
-		esac ;;
-	2-odd)
-		case $1 in
-			*[13579])			exit 0 ;;
-			*)				exit 1 ;;
-		esac ;;
-	2-uspres)
-		case $1 in
-			*[02468][048]|*[13579][26])	exit 0 ;;
-			*)				exit 1 ;;
-		esac ;;
-	2-*)
-		echo "$0: wild type: $2" >&2 ;;
-esac
-
-echo "$0: usage is $0 year even|odd|uspres|nonpres|nonuspres" >&2
-exit 1
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/zone1970.tab postgresql-9.5-9.5.8/src/timezone/data/zone1970.tab
--- postgresql-9.5-9.5.2/src/timezone/data/zone1970.tab	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/zone1970.tab	1970-01-01 00:00:00.000000000 +0000
@@ -1,374 +0,0 @@
-# tz zone descriptions
-#
-# This file is in the public domain.
-#
-# From Paul Eggert (2014-07-31):
-# This file contains a table where each row stands for a zone where
-# civil time stamps have agreed since 1970.  Columns are separated by
-# a single tab.  Lines beginning with '#' are comments.  All text uses
-# UTF-8 encoding.  The columns of the table are as follows:
-#
-# 1.  The countries that overlap the zone, as a comma-separated list
-#     of ISO 3166 2-character country codes.  See the file 'iso3166.tab'.
-# 2.  Latitude and longitude of the zone's principal location
-#     in ISO 6709 sign-degrees-minutes-seconds format,
-#     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
-#     first latitude (+ is north), then longitude (+ is east).
-# 3.  Zone name used in value of TZ environment variable.
-#     Please see the 'Theory' file for how zone names are chosen.
-#     If multiple zones overlap a country, each has a row in the
-#     table, with each column 1 containing the country code.
-# 4.  Comments; present if and only if a country has multiple zones.
-#
-# If a zone covers multiple countries, the most-populous city is used,
-# and that country is listed first in column 1; any other countries
-# are listed alphabetically by country code.  The table is sorted
-# first by country code, then (if possible) by an order within the
-# country that (1) makes some geographical sense, and (2) puts the
-# most populous zones first, where that does not contradict (1).
-#
-# This table is intended as an aid for users, to help them select time
-# zone data entries appropriate for their practical needs.  It is not
-# intended to take or endorse any position on legal or territorial claims.
-#
-#country-
-#codes	coordinates	TZ	comments
-AD	+4230+00131	Europe/Andorra
-AE,OM	+2518+05518	Asia/Dubai
-AF	+3431+06912	Asia/Kabul
-AL	+4120+01950	Europe/Tirane
-AM	+4011+04430	Asia/Yerevan
-AQ	-6617+11031	Antarctica/Casey	Casey
-AQ	-6835+07758	Antarctica/Davis	Davis
-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
-AQ	-6736+06253	Antarctica/Mawson	Mawson
-AQ	-6448-06406	Antarctica/Palmer	Palmer
-AQ	-6734-06808	Antarctica/Rothera	Rothera
-AQ	-690022+0393524	Antarctica/Syowa	Syowa
-AQ	-720041+0023206	Antarctica/Troll	Troll
-AQ	-7824+10654	Antarctica/Vostok	Vostok
-AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
-AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
-AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
-AR	-2649-06513	America/Argentina/Tucuman	Tucumán (TM)
-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
-AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
-AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
-AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
-AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
-AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
-AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
-AS,UM	-1416-17042	Pacific/Pago_Pago	Samoa, Midway
-AT	+4813+01620	Europe/Vienna
-AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
-AU	-3956+14352	Australia/Currie	Tasmania (King Island)
-AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
-AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
-AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
-AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
-AU	-3455+13835	Australia/Adelaide	South Australia
-AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia (most areas)
-AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
-AZ	+4023+04951	Asia/Baku
-BB	+1306-05937	America/Barbados
-BD	+2343+09025	Asia/Dhaka
-BE	+5050+00420	Europe/Brussels
-BG	+4241+02319	Europe/Sofia
-BM	+3217-06446	Atlantic/Bermuda
-BN	+0456+11455	Asia/Brunei
-BO	-1630-06809	America/La_Paz
-BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Pará (east); Amapá
-BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
-BR	-0803-03454	America/Recife	Pernambuco
-BR	-0712-04812	America/Araguaina	Tocantins
-BR	-0940-03543	America/Maceio	Alagoas, Sergipe
-BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
-BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
-BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0226-05452	America/Santarem	Pará (west)
-BR	-0846-06354	America/Porto_Velho	Rondônia
-BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	Amazonas (east)
-BR	-0640-06952	America/Eirunepe	Amazonas (west)
-BR	-0958-06748	America/Rio_Branco	Acre
-BS	+2505-07721	America/Nassau
-BT	+2728+08939	Asia/Thimphu
-BY	+5354+02734	Europe/Minsk
-BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
-CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
-CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
-CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
-CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
-CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
-CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
-CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
-CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
-CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
-CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
-CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
-CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
-CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
-CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
-CA	+5024-10439	America/Regina	CST - SK (most areas)
-CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
-CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
-CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
-CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
-CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
-CA	+4906-11631	America/Creston	MST - BC (Creston)
-CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
-CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
-CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
-CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
-CC	-1210+09655	Indian/Cocos
-CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
-CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
-CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	Chile (most areas)
-CL	-2709-10926	Pacific/Easter	Easter Island
-CN	+3114+12128	Asia/Shanghai	Beijing Time
-CN	+4348+08735	Asia/Urumqi	Xinjiang Time
-CO	+0436-07405	America/Bogota
-CR	+0956-08405	America/Costa_Rica
-CU	+2308-08222	America/Havana
-CV	+1455-02331	Atlantic/Cape_Verde
-CW,AW,BQ,SX	+1211-06900	America/Curacao
-CX	-1025+10543	Indian/Christmas
-CY	+3510+03322	Asia/Nicosia
-CZ,SK	+5005+01426	Europe/Prague
-DE	+5230+01322	Europe/Berlin	Germany (most areas)
-DK	+5540+01235	Europe/Copenhagen
-DO	+1828-06954	America/Santo_Domingo
-DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
-EC	-0054-08936	Pacific/Galapagos	Galápagos Islands
-EE	+5925+02445	Europe/Tallinn
-EG	+3003+03115	Africa/Cairo
-EH	+2709-01312	Africa/El_Aaiun
-ES	+4024-00341	Europe/Madrid	Spain (mainland)
-ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
-ES	+2806-01524	Atlantic/Canary	Canary Islands
-FI,AX	+6010+02458	Europe/Helsinki
-FJ	-1808+17825	Pacific/Fiji
-FK	-5142-05751	Atlantic/Stanley
-FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
-FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
-FM	+0519+16259	Pacific/Kosrae	Kosrae
-FO	+6201-00646	Atlantic/Faroe
-FR	+4852+00220	Europe/Paris
-GB,GG,IM,JE	+513030-0000731	Europe/London
-GE	+4143+04449	Asia/Tbilisi
-GF	+0456-05220	America/Cayenne
-GH	+0533-00013	Africa/Accra
-GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Godthab	Greenland (most areas)
-GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
-GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule/Pituffik
-GR	+3758+02343	Europe/Athens
-GS	-5416-03632	Atlantic/South_Georgia
-GT	+1438-09031	America/Guatemala
-GU,MP	+1328+14445	Pacific/Guam
-GW	+1151-01535	Africa/Bissau
-GY	+0648-05810	America/Guyana
-HK	+2217+11409	Asia/Hong_Kong
-HN	+1406-08713	America/Tegucigalpa
-HT	+1832-07220	America/Port-au-Prince
-HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java, Sumatra
-ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
-ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
-ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
-IE	+5320-00615	Europe/Dublin
-IL	+314650+0351326	Asia/Jerusalem
-IN	+2232+08822	Asia/Kolkata
-IO	-0720+07225	Indian/Chagos
-IQ	+3321+04425	Asia/Baghdad
-IR	+3540+05126	Asia/Tehran
-IS	+6409-02151	Atlantic/Reykjavik
-IT,SM,VA	+4154+01229	Europe/Rome
-JM	+175805-0764736	America/Jamaica
-JO	+3157+03556	Asia/Amman
-JP	+353916+1394441	Asia/Tokyo
-KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT	-0117+03649	Africa/Nairobi
-KG	+4254+07436	Asia/Bishkek
-KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
-KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
-KI	+0152-15720	Pacific/Kiritimati	Line Islands
-KP	+3901+12545	Asia/Pyongyang
-KR	+3733+12658	Asia/Seoul
-KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
-KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
-KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
-KZ	+5113+05121	Asia/Oral	West Kazakhstan
-LB	+3353+03530	Asia/Beirut
-LK	+0656+07951	Asia/Colombo
-LR	+0618-01047	Africa/Monrovia
-LT	+5441+02519	Europe/Vilnius
-LU	+4936+00609	Europe/Luxembourg
-LV	+5657+02406	Europe/Riga
-LY	+3254+01311	Africa/Tripoli
-MA	+3339-00735	Africa/Casablanca
-MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau
-MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
-MH	+0905+16720	Pacific/Kwajalein	Kwajalein
-MM	+1647+09610	Asia/Rangoon
-MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
-MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
-MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
-MO	+2214+11335	Asia/Macau
-MQ	+1436-06105	America/Martinique
-MT	+3554+01431	Europe/Malta
-MU	-2010+05730	Indian/Mauritius
-MV	+0410+07330	Indian/Maldives
-MX	+1924-09909	America/Mexico_City	Central Time
-MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
-MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
-MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas)
-MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)
-MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
-MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
-MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
-MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
-MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
-MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahía de Banderas
-MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
-MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
-MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time
-NA	-2234+01706	Africa/Windhoek
-NC	-2216+16627	Pacific/Noumea
-NF	-2903+16758	Pacific/Norfolk
-NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time
-NI	+1209-08617	America/Managua
-NL	+5222+00454	Europe/Amsterdam
-NO,SJ	+5955+01045	Europe/Oslo
-NP	+2743+08519	Asia/Kathmandu
-NR	-0031+16655	Pacific/Nauru
-NU	-1901-16955	Pacific/Niue
-NZ,AQ	-3652+17446	Pacific/Auckland	New Zealand time
-NZ	-4357-17633	Pacific/Chatham	Chatham Islands
-PA,KY	+0858-07932	America/Panama
-PE	-1203-07703	America/Lima
-PF	-1732-14934	Pacific/Tahiti	Society Islands
-PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
-PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
-PG	-0613+15534	Pacific/Bougainville	Bougainville
-PH	+1435+12100	Asia/Manila
-PK	+2452+06703	Asia/Karachi
-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	Gaza Strip
-PS	+313200+0350542	Asia/Hebron	West Bank
-PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
-PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-PT	+3744-02540	Atlantic/Azores	Azores
-PW	+0720+13429	Pacific/Palau
-PY	-2516-05740	America/Asuncion
-QA,BH	+2517+05132	Asia/Qatar
-RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet, Scattered Islands
-RO	+4426+02606	Europe/Bucharest
-RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
-RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
-RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
-RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
-RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Kirov, Saratov
-RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
-RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
-RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
-RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
-RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
-RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk, Tomsk
-RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
-RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
-RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
-RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
-RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
-RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
-RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
-RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
-RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
-RU	+5934+15048	Asia/Magadan	MSK+07 - Magadan
-RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
-RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
-RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
-RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
-SA,KW,YE	+2438+04643	Asia/Riyadh
-SB	-0932+16012	Pacific/Guadalcanal
-SC	-0440+05528	Indian/Mahe
-SD,SS	+1536+03232	Africa/Khartoum
-SE	+5920+01803	Europe/Stockholm
-SG	+0117+10351	Asia/Singapore
-SR	+0550-05510	America/Paramaribo
-SV	+1342-08912	America/El_Salvador
-SY	+3330+03618	Asia/Damascus
-TC	+2128-07108	America/Grand_Turk
-TD	+1207+01503	Africa/Ndjamena
-TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul Island, Amsterdam Island
-TH,KH,LA,VN	+1345+10031	Asia/Bangkok	Indochina (most areas)
-TJ	+3835+06848	Asia/Dushanbe
-TK	-0922-17114	Pacific/Fakaofo
-TL	-0833+12535	Asia/Dili
-TM	+3757+05823	Asia/Ashgabat
-TN	+3648+01011	Africa/Tunis
-TO	-2110-17510	Pacific/Tongatapu
-TR	+4101+02858	Europe/Istanbul
-TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
-TV	-0831+17913	Pacific/Funafuti
-TW	+2503+12130	Asia/Taipei
-UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
-UA	+4837+02218	Europe/Uzhgorod	Ruthenia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
-UM	+1917+16637	Pacific/Wake	Wake Island
-US	+404251-0740023	America/New_York	Eastern (most areas)
-US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
-US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
-US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
-US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
-US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
-US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
-US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
-US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
-US	+415100-0873900	America/Chicago	Central (most areas)
-US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
-US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
-US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
-US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
-US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
-US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
-US	+394421-1045903	America/Denver	Mountain (most areas)
-US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
-US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
-US	+340308-1181434	America/Los_Angeles	Pacific
-US	+611305-1495401	America/Anchorage	Alaska (most areas)
-US	+581807-1342511	America/Juneau	Alaska - Juneau area
-US	+571035-1351807	America/Sitka	Alaska - Sitka area
-US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
-US	+593249-1394338	America/Yakutat	Alaska - Yakutat
-US	+643004-1652423	America/Nome	Alaska (west)
-US	+515248-1763929	America/Adak	Aleutian Islands
-US,UM	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-3453-05611	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
-UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
-VE	+1030-06656	America/Caracas
-VN	+1045+10640	Asia/Ho_Chi_Minh	Vietnam (south)
-VU	-1740+16825	Pacific/Efate
-WF	-1318-17610	Pacific/Wallis
-WS	-1350-17144	Pacific/Apia
-ZA,LS,SZ	-2615+02800	Africa/Johannesburg
diff -Nru postgresql-9.5-9.5.2/src/timezone/data/zone.tab postgresql-9.5-9.5.8/src/timezone/data/zone.tab
--- postgresql-9.5-9.5.2/src/timezone/data/zone.tab	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/data/zone.tab	1970-01-01 00:00:00.000000000 +0000
@@ -1,443 +0,0 @@
-# tz zone descriptions (deprecated version)
-#
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-#
-# From Paul Eggert (2014-07-31):
-# This file is intended as a backward-compatibility aid for older programs.
-# New programs should use zone1970.tab.  This file is like zone1970.tab (see
-# zone1970.tab's comments), but with the following additional restrictions:
-#
-# 1.  This file contains only ASCII characters.
-# 2.  The first data column contains exactly one country code.
-#
-# Because of (2), each row stands for an area that is the intersection
-# of a region identified by a country code and of a zone where civil
-# clocks have agreed since 1970; this is a narrower definition than
-# that of zone1970.tab.
-#
-# This table is intended as an aid for users, to help them select time
-# zone data entries appropriate for their practical needs.  It is not
-# intended to take or endorse any position on legal or territorial claims.
-#
-#country-
-#code	coordinates	TZ			comments
-AD	+4230+00131	Europe/Andorra
-AE	+2518+05518	Asia/Dubai
-AF	+3431+06912	Asia/Kabul
-AG	+1703-06148	America/Antigua
-AI	+1812-06304	America/Anguilla
-AL	+4120+01950	Europe/Tirane
-AM	+4011+04430	Asia/Yerevan
-AO	-0848+01314	Africa/Luanda
-AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
-AQ	-6617+11031	Antarctica/Casey	Casey
-AQ	-6835+07758	Antarctica/Davis	Davis
-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
-AQ	-6736+06253	Antarctica/Mawson	Mawson
-AQ	-6448-06406	Antarctica/Palmer	Palmer
-AQ	-6734-06808	Antarctica/Rothera	Rothera
-AQ	-690022+0393524	Antarctica/Syowa	Syowa
-AQ	-720041+0023206	Antarctica/Troll	Troll
-AQ	-7824+10654	Antarctica/Vostok	Vostok
-AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
-AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
-AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
-AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
-AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
-AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
-AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
-AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
-AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
-AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
-AS	-1416-17042	Pacific/Pago_Pago
-AT	+4813+01620	Europe/Vienna
-AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
-AU	-3956+14352	Australia/Currie	Tasmania (King Island)
-AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
-AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
-AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
-AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
-AU	-3455+13835	Australia/Adelaide	South Australia
-AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia (most areas)
-AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
-AW	+1230-06958	America/Aruba
-AX	+6006+01957	Europe/Mariehamn
-AZ	+4023+04951	Asia/Baku
-BA	+4352+01825	Europe/Sarajevo
-BB	+1306-05937	America/Barbados
-BD	+2343+09025	Asia/Dhaka
-BE	+5050+00420	Europe/Brussels
-BF	+1222-00131	Africa/Ouagadougou
-BG	+4241+02319	Europe/Sofia
-BH	+2623+05035	Asia/Bahrain
-BI	-0323+02922	Africa/Bujumbura
-BJ	+0629+00237	Africa/Porto-Novo
-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	Para (east); Amapa
-BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
-BR	-0803-03454	America/Recife	Pernambuco
-BR	-0712-04812	America/Araguaina	Tocantins
-BR	-0940-03543	America/Maceio	Alagoas, Sergipe
-BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
-BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
-BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0226-05452	America/Santarem	Para (west)
-BR	-0846-06354	America/Porto_Velho	Rondonia
-BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	Amazonas (east)
-BR	-0640-06952	America/Eirunepe	Amazonas (west)
-BR	-0958-06748	America/Rio_Branco	Acre
-BS	+2505-07721	America/Nassau
-BT	+2728+08939	Asia/Thimphu
-BW	-2439+02555	Africa/Gaborone
-BY	+5354+02734	Europe/Minsk
-BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
-CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
-CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
-CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
-CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
-CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
-CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
-CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
-CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
-CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
-CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
-CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
-CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
-CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
-CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
-CA	+5024-10439	America/Regina	CST - SK (most areas)
-CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
-CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
-CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
-CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
-CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
-CA	+4906-11631	America/Creston	MST - BC (Creston)
-CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
-CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
-CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
-CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
-CC	-1210+09655	Indian/Cocos
-CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
-CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
-CF	+0422+01835	Africa/Bangui
-CG	-0416+01517	Africa/Brazzaville
-CH	+4723+00832	Europe/Zurich
-CI	+0519-00402	Africa/Abidjan
-CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	Chile (most areas)
-CL	-2709-10926	Pacific/Easter	Easter Island
-CM	+0403+00942	Africa/Douala
-CN	+3114+12128	Asia/Shanghai	Beijing Time
-CN	+4348+08735	Asia/Urumqi	Xinjiang Time
-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
-DE	+5230+01322	Europe/Berlin	Germany (most areas)
-DE	+4742+00841	Europe/Busingen	Busingen
-DJ	+1136+04309	Africa/Djibouti
-DK	+5540+01235	Europe/Copenhagen
-DM	+1518-06124	America/Dominica
-DO	+1828-06954	America/Santo_Domingo
-DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
-EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
-EE	+5925+02445	Europe/Tallinn
-EG	+3003+03115	Africa/Cairo
-EH	+2709-01312	Africa/El_Aaiun
-ER	+1520+03853	Africa/Asmara
-ES	+4024-00341	Europe/Madrid	Spain (mainland)
-ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
-ES	+2806-01524	Atlantic/Canary	Canary Islands
-ET	+0902+03842	Africa/Addis_Ababa
-FI	+6010+02458	Europe/Helsinki
-FJ	-1808+17825	Pacific/Fiji
-FK	-5142-05751	Atlantic/Stanley
-FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
-FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
-FM	+0519+16259	Pacific/Kosrae	Kosrae
-FO	+6201-00646	Atlantic/Faroe
-FR	+4852+00220	Europe/Paris
-GA	+0023+00927	Africa/Libreville
-GB	+513030-0000731	Europe/London
-GD	+1203-06145	America/Grenada
-GE	+4143+04449	Asia/Tbilisi
-GF	+0456-05220	America/Cayenne
-GG	+4927-00232	Europe/Guernsey
-GH	+0533-00013	Africa/Accra
-GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Godthab	Greenland (most areas)
-GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
-GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule/Pituffik
-GM	+1328-01639	Africa/Banjul
-GN	+0931-01343	Africa/Conakry
-GP	+1614-06132	America/Guadeloupe
-GQ	+0345+00847	Africa/Malabo
-GR	+3758+02343	Europe/Athens
-GS	-5416-03632	Atlantic/South_Georgia
-GT	+1438-09031	America/Guatemala
-GU	+1328+14445	Pacific/Guam
-GW	+1151-01535	Africa/Bissau
-GY	+0648-05810	America/Guyana
-HK	+2217+11409	Asia/Hong_Kong
-HN	+1406-08713	America/Tegucigalpa
-HR	+4548+01558	Europe/Zagreb
-HT	+1832-07220	America/Port-au-Prince
-HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java, Sumatra
-ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
-ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
-ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
-IE	+5320-00615	Europe/Dublin
-IL	+314650+0351326	Asia/Jerusalem
-IM	+5409-00428	Europe/Isle_of_Man
-IN	+2232+08822	Asia/Kolkata
-IO	-0720+07225	Indian/Chagos
-IQ	+3321+04425	Asia/Baghdad
-IR	+3540+05126	Asia/Tehran
-IS	+6409-02151	Atlantic/Reykjavik
-IT	+4154+01229	Europe/Rome
-JE	+4912-00207	Europe/Jersey
-JM	+175805-0764736	America/Jamaica
-JO	+3157+03556	Asia/Amman
-JP	+353916+1394441	Asia/Tokyo
-KE	-0117+03649	Africa/Nairobi
-KG	+4254+07436	Asia/Bishkek
-KH	+1133+10455	Asia/Phnom_Penh
-KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
-KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
-KI	+0152-15720	Pacific/Kiritimati	Line Islands
-KM	-1141+04316	Indian/Comoro
-KN	+1718-06243	America/St_Kitts
-KP	+3901+12545	Asia/Pyongyang
-KR	+3733+12658	Asia/Seoul
-KW	+2920+04759	Asia/Kuwait
-KY	+1918-08123	America/Cayman
-KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
-KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
-KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
-KZ	+5113+05121	Asia/Oral	West Kazakhstan
-LA	+1758+10236	Asia/Vientiane
-LB	+3353+03530	Asia/Beirut
-LC	+1401-06100	America/St_Lucia
-LI	+4709+00931	Europe/Vaduz
-LK	+0656+07951	Asia/Colombo
-LR	+0618-01047	Africa/Monrovia
-LS	-2928+02730	Africa/Maseru
-LT	+5441+02519	Europe/Vilnius
-LU	+4936+00609	Europe/Luxembourg
-LV	+5657+02406	Europe/Riga
-LY	+3254+01311	Africa/Tripoli
-MA	+3339-00735	Africa/Casablanca
-MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau
-ME	+4226+01916	Europe/Podgorica
-MF	+1804-06305	America/Marigot
-MG	-1855+04731	Indian/Antananarivo
-MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
-MH	+0905+16720	Pacific/Kwajalein	Kwajalein
-MK	+4159+02126	Europe/Skopje
-ML	+1239-00800	Africa/Bamako
-MM	+1647+09610	Asia/Rangoon
-MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
-MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
-MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
-MO	+2214+11335	Asia/Macau
-MP	+1512+14545	Pacific/Saipan
-MQ	+1436-06105	America/Martinique
-MR	+1806-01557	Africa/Nouakchott
-MS	+1643-06213	America/Montserrat
-MT	+3554+01431	Europe/Malta
-MU	-2010+05730	Indian/Mauritius
-MV	+0410+07330	Indian/Maldives
-MW	-1547+03500	Africa/Blantyre
-MX	+1924-09909	America/Mexico_City	Central Time
-MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
-MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
-MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
-MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border)
-MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
-MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
-MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
-MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
-MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
-MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahia de Banderas
-MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
-MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
-MZ	-2558+03235	Africa/Maputo
-NA	-2234+01706	Africa/Windhoek
-NC	-2216+16627	Pacific/Noumea
-NE	+1331+00207	Africa/Niamey
-NF	-2903+16758	Pacific/Norfolk
-NG	+0627+00324	Africa/Lagos
-NI	+1209-08617	America/Managua
-NL	+5222+00454	Europe/Amsterdam
-NO	+5955+01045	Europe/Oslo
-NP	+2743+08519	Asia/Kathmandu
-NR	-0031+16655	Pacific/Nauru
-NU	-1901-16955	Pacific/Niue
-NZ	-3652+17446	Pacific/Auckland	New Zealand (most areas)
-NZ	-4357-17633	Pacific/Chatham	Chatham Islands
-OM	+2336+05835	Asia/Muscat
-PA	+0858-07932	America/Panama
-PE	-1203-07703	America/Lima
-PF	-1732-14934	Pacific/Tahiti	Society Islands
-PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
-PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
-PG	-0613+15534	Pacific/Bougainville	Bougainville
-PH	+1435+12100	Asia/Manila
-PK	+2452+06703	Asia/Karachi
-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	Gaza Strip
-PS	+313200+0350542	Asia/Hebron	West Bank
-PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
-PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-PT	+3744-02540	Atlantic/Azores	Azores
-PW	+0720+13429	Pacific/Palau
-PY	-2516-05740	America/Asuncion
-QA	+2517+05132	Asia/Qatar
-RE	-2052+05528	Indian/Reunion
-RO	+4426+02606	Europe/Bucharest
-RS	+4450+02030	Europe/Belgrade
-RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
-RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
-RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
-RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Kirov, Saratov
-RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
-RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
-RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
-RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
-RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
-RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk, Tomsk
-RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
-RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
-RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
-RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
-RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
-RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
-RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
-RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
-RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
-RU	+5934+15048	Asia/Magadan	MSK+07 - Magadan
-RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
-RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
-RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
-RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
-RW	-0157+03004	Africa/Kigali
-SA	+2438+04643	Asia/Riyadh
-SB	-0932+16012	Pacific/Guadalcanal
-SC	-0440+05528	Indian/Mahe
-SD	+1536+03232	Africa/Khartoum
-SE	+5920+01803	Europe/Stockholm
-SG	+0117+10351	Asia/Singapore
-SH	-1555-00542	Atlantic/St_Helena
-SI	+4603+01431	Europe/Ljubljana
-SJ	+7800+01600	Arctic/Longyearbyen
-SK	+4809+01707	Europe/Bratislava
-SL	+0830-01315	Africa/Freetown
-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
-TD	+1207+01503	Africa/Ndjamena
-TF	-492110+0701303	Indian/Kerguelen
-TG	+0608+00113	Africa/Lome
-TH	+1345+10031	Asia/Bangkok
-TJ	+3835+06848	Asia/Dushanbe
-TK	-0922-17114	Pacific/Fakaofo
-TL	-0833+12535	Asia/Dili
-TM	+3757+05823	Asia/Ashgabat
-TN	+3648+01011	Africa/Tunis
-TO	-2110-17510	Pacific/Tongatapu
-TR	+4101+02858	Europe/Istanbul
-TT	+1039-06131	America/Port_of_Spain
-TV	-0831+17913	Pacific/Funafuti
-TW	+2503+12130	Asia/Taipei
-TZ	-0648+03917	Africa/Dar_es_Salaam
-UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
-UA	+4837+02218	Europe/Uzhgorod	Ruthenia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
-UG	+0019+03225	Africa/Kampala
-UM	+1645-16931	Pacific/Johnston	Johnston Atoll
-UM	+2813-17722	Pacific/Midway	Midway Islands
-UM	+1917+16637	Pacific/Wake	Wake Island
-US	+404251-0740023	America/New_York	Eastern (most areas)
-US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
-US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
-US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
-US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
-US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
-US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
-US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
-US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
-US	+415100-0873900	America/Chicago	Central (most areas)
-US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
-US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
-US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
-US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
-US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
-US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
-US	+394421-1045903	America/Denver	Mountain (most areas)
-US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
-US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
-US	+340308-1181434	America/Los_Angeles	Pacific
-US	+611305-1495401	America/Anchorage	Alaska (most areas)
-US	+581807-1342511	America/Juneau	Alaska - Juneau area
-US	+571035-1351807	America/Sitka	Alaska - Sitka area
-US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
-US	+593249-1394338	America/Yakutat	Alaska - Yakutat
-US	+643004-1652423	America/Nome	Alaska (west)
-US	+515248-1763929	America/Adak	Aleutian Islands
-US	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-3453-05611	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
-UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
-VA	+415408+0122711	Europe/Vatican
-VC	+1309-06114	America/St_Vincent
-VE	+1030-06656	America/Caracas
-VG	+1827-06437	America/Tortola
-VI	+1821-06456	America/St_Thomas
-VN	+1045+10640	Asia/Ho_Chi_Minh
-VU	-1740+16825	Pacific/Efate
-WF	-1318-17610	Pacific/Wallis
-WS	-1350-17144	Pacific/Apia
-YE	+1245+04512	Asia/Aden
-YT	-1247+04514	Indian/Mayotte
-ZA	-2615+02800	Africa/Johannesburg
-ZM	-1525+02817	Africa/Lusaka
-ZW	-1750+03103	Africa/Harare
diff -Nru postgresql-9.5-9.5.2/src/timezone/ialloc.c postgresql-9.5-9.5.8/src/timezone/ialloc.c
--- postgresql-9.5-9.5.2/src/timezone/ialloc.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/ialloc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/*
- * This file is in the public domain, so clarified as of
- * 2006-07-17 by Arthur David Olson.
- *
- * IDENTIFICATION
- *	  src/timezone/ialloc.c
- */
-
-#include "postgres_fe.h"
-
-#include "private.h"
-
-
-#define nonzero(n)	(((n) == 0) ? 1 : (n))
-
-char *
-imalloc(int n)
-{
-	return malloc((size_t) nonzero(n));
-}
-
-char *
-icalloc(int nelem, int elsize)
-{
-	if (nelem == 0 || elsize == 0)
-		nelem = elsize = 1;
-	return calloc((size_t) nelem, (size_t) elsize);
-}
-
-void *
-irealloc(void *pointer, int size)
-{
-	if (pointer == NULL)
-		return imalloc(size);
-	return realloc((void *) pointer, (size_t) nonzero(size));
-}
-
-char *
-icatalloc(char *old, const char *new)
-{
-	char	   *result;
-	int			oldsize,
-				newsize;
-
-	newsize = (new == NULL) ? 0 : strlen(new);
-	if (old == NULL)
-		oldsize = 0;
-	else if (newsize == 0)
-		return old;
-	else
-		oldsize = strlen(old);
-	if ((result = irealloc(old, oldsize + newsize + 1)) != NULL)
-		if (new != NULL)
-			(void) strcpy(result + oldsize, new);
-	return result;
-}
-
-char *
-icpyalloc(const char *string)
-{
-	return icatalloc((char *) NULL, string);
-}
-
-void
-ifree(char *p)
-{
-	if (p != NULL)
-		(void) free(p);
-}
-
-void
-icfree(char *p)
-{
-	if (p != NULL)
-		(void) free(p);
-}
diff -Nru postgresql-9.5-9.5.2/src/timezone/known_abbrevs.txt postgresql-9.5-9.5.8/src/timezone/known_abbrevs.txt
--- postgresql-9.5-9.5.2/src/timezone/known_abbrevs.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/known_abbrevs.txt	2017-08-07 21:13:41.000000000 +0000
@@ -1,191 +1,105 @@
++00	0
++00	0	D
++01	3600
++02	7200
++02	7200	D
 +03	10800
++0330	12600
 +04	14400
++0430	16200
++0430	16200	D
++05	18000
++0530	19800
++0545	20700
 +06	21600
++0630	23400
 +07	25200
++08	28800
++0845	31500
++09	32400
++10	36000
++1030	37800
++11	39600
++11	39600	D
++12	43200
++1245	45900
++13	46800
++13	46800	D
++1345	49500	D
++14	50400
++14	50400	D
+-00	0
+-01	-3600
+-02	-7200
+-02	-7200	D
+-03	-10800
+-03	-10800	D
+-04	-14400
+-05	-18000
+-05	-18000	D
+-06	-21600
+-07	-25200
+-08	-28800
+-09	-32400
+-0930	-34200
+-10	-36000
+-11	-39600
+-12	-43200
 ACDT	37800	D
 ACST	34200
-ACT	-18000
-ACWST	31500
 ADT	-10800	D
 AEDT	39600	D
 AEST	36000
-AFT	16200
 AKDT	-28800	D
 AKST	-32400
-ALMT	21600
-AMST	-10800	D
-AMT	-14400
-AMT	14400
-ANAT	43200
-AQTT	18000
-ART	-10800
 AST	-14400
-AST	10800
 AWST	28800
-AZOST	0	D
-AZOT	-3600
-AZT	14400
-BDT	21600
-BNT	28800
-BOT	-14400
-BRST	-7200	D
-BRT	-10800
 BST	3600	D
-BST	39600
-BTT	21600
 CAT	7200
-CCT	23400
 CDT	-14400	D
 CDT	-18000	D
 CEST	7200	D
 CET	3600
-CHADT	49500	D
-CHAST	45900
-CHOST	32400	D
-CHOT	28800
-CHUT	36000
-CKT	-36000
-CLST	-10800	D
-CLT	-14400
-COT	-18000
 CST	-18000
 CST	-21600
 CST	28800
-CVT	-3600
-CXT	25200
 ChST	36000
-DAVT	25200
-DDUT	36000
-EASST	-18000	D
-EAST	-21600
 EAT	10800
-ECT	-18000
 EDT	-14400	D
 EEST	10800	D
 EET	7200
-EGST	0	D
-EGT	-3600
 EST	-18000
-FJST	46800	D
-FJT	43200
-FKST	-10800
-FNT	-7200
-GALT	-21600
-GAMT	-32400
-GET	14400
-GFT	-10800
-GILT	43200
 GMT	0
-GST	-7200
-GST	14400
-GYT	-14400
 HDT	-32400	D
 HKT	28800
-HOVST	28800	D
-HOVT	25200
 HST	-36000
-ICT	25200
 IDT	10800	D
-IOT	21600
-IRDT	16200	D
-IRKT	28800
-IRST	12600
 IST	19800
 IST	3600	D
 IST	7200
 JST	32400
-KGT	21600
-KOST	39600
-KRAT	25200
 KST	30600
 KST	32400
-LHDT	39600	D
-LHST	37800
-LINT	50400
-MAGT	36000
-MART	-34200
-MAWT	18000
 MDT	-21600	D
 MEST	7200	D
 MET	3600
-MHT	43200
-MIST	39600
-MMT	23400
 MSK	10800
 MST	-25200
-MUT	14400
-MVT	18000
-MYT	28800
-NCT	39600
 NDT	-9000	D
-NFT	39600
-NOVT	21600
-NPT	20700
-NRT	43200
 NST	-12600
-NUT	-39600
 NZDT	46800	D
 NZST	43200
-OMST	21600
-ORAT	18000
 PDT	-25200	D
-PET	-18000
-PETT	43200
-PGT	36000
-PHOT	46800
-PHT	28800
 PKT	18000
-PMDT	-7200	D
-PMST	-10800
-PONT	39600
 PST	-28800
-PWT	32400
-PYST	-10800	D
-PYT	-14400
-QYZT	21600
-RET	14400
-ROTT	-10800
-SAKT	36000
-SAKT	39600
-SAMT	14400
 SAST	7200
-SBT	39600
-SCT	14400
-SGT	28800
-SRET	39600
-SRT	-10800
 SST	-39600
-SYOT	10800
-TAHT	-36000
-TFT	18000
-TJT	18000
-TKT	46800
-TLT	32400
-TMT	18000
-TOT	46800
-TVT	43200
-ULAST	32400	D
-ULAT	28800
+UCT	0
 UTC	0
-UYT	-10800
-UZT	18000
-VET	-16200
-VLAT	36000
-VOST	21600
-VUT	39600
-WAKT	43200
 WAST	7200	D
 WAT	3600
 WEST	3600	D
 WET	0
-WFT	43200
-WGST	-7200	D
-WGT	-10800
 WIB	25200
 WIT	32400
 WITA	28800
-WSDT	50400	D
-WSST	46800
-XJT	21600
-YAKT	32400
-YEKT	18000
diff -Nru postgresql-9.5-9.5.2/src/timezone/localtime.c postgresql-9.5-9.5.8/src/timezone/localtime.c
--- postgresql-9.5-9.5.2/src/timezone/localtime.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/localtime.c	2017-08-07 21:13:41.000000000 +0000
@@ -17,13 +17,14 @@
 #include <fcntl.h>
 
 #include "datatype/timestamp.h"
-#include "private.h"
 #include "pgtz.h"
+
+#include "private.h"
 #include "tzfile.h"
 
 
 #ifndef WILDABBR
-/*----------
+/*
  * Someone might make incorrect use of a time zone abbreviation:
  *	1.  They might reference tzname[0] before calling tzset (explicitly
  *		or implicitly).
@@ -36,20 +37,30 @@
  *	5.  They might reference tm.TM_ZONE after calling offtime.
  * What's best to do in the above cases is open to debate;
  * for now, we just set things up so that in any of the five cases
- * WILDABBR is used. Another possibility:	initialize tzname[0] to the
+ * WILDABBR is used. Another possibility: initialize tzname[0] to the
  * string "tzname[0] used before set", and similarly for the other cases.
  * And another: initialize tzname[0] to "ERA", with an explanation in the
  * manual page of what this "time zone abbreviation" means (doing this so
  * that tzname[0] has the "normal" length of three characters).
- *----------
  */
 #define WILDABBR	"   "
 #endif   /* !defined WILDABBR */
 
-static char wildabbr[] = WILDABBR;
+static const char wildabbr[] = WILDABBR;
 
 static const char gmt[] = "GMT";
 
+/* The minimum and maximum finite time values.  This assumes no padding.  */
+static const pg_time_t time_t_min = MINVAL(pg_time_t, TYPE_BIT(pg_time_t));
+static const pg_time_t time_t_max = MAXVAL(pg_time_t, TYPE_BIT(pg_time_t));
+
+/*
+ * We cache the result of trying to load the TZDEFRULES zone here.
+ * tzdefrules_loaded is 0 if not tried yet, +1 if good, -1 if failed.
+ */
+static struct state tzdefrules_s;
+static int	tzdefrules_loaded = 0;
+
 /*
  * The DST rules to use if TZ has no rules and we can't load TZDEFRULES.
  * We default to US rules as of 1999-08-17.
@@ -59,52 +70,36 @@
  */
 #define TZDEFRULESTRING ",M4.1.0,M10.5.0"
 
+/* structs ttinfo, lsinfo, state have been moved to pgtz.h */
+
+enum r_type
+{
+	JULIAN_DAY,					/* Jn = Julian day */
+	DAY_OF_YEAR,				/* n = day of year */
+	MONTH_NTH_DAY_OF_WEEK		/* Mm.n.d = month, week, day of week */
+};
+
 struct rule
 {
-	int			r_type;			/* type of rule--see below */
+	enum r_type r_type;			/* type of rule */
 	int			r_day;			/* day number of rule */
 	int			r_week;			/* week number of rule */
 	int			r_mon;			/* month number of rule */
-	long		r_time;			/* transition time of rule */
+	int32		r_time;			/* transition time of rule */
 };
 
-#define JULIAN_DAY		0		/* Jn - Julian day */
-#define DAY_OF_YEAR		1		/* n - day of year */
-#define MONTH_NTH_DAY_OF_WEEK	2		/* Mm.n.d - month, week, day of week */
-
 /*
  * Prototypes for static functions.
  */
 
-static long detzcode(const char *codep);
-static pg_time_t detzcode64(const char *codep);
-static int	differ_by_repeat(pg_time_t t1, pg_time_t t0);
-static const char *getzname(const char *strp);
-static const char *getqzname(const char *strp, int delim);
-static const char *getnum(const char *strp, int *nump, int min, int max);
-static const char *getsecs(const char *strp, long *secsp);
-static const char *getoffset(const char *strp, long *offsetp);
-static const char *getrule(const char *strp, struct rule * rulep);
-static void gmtload(struct state * sp);
-static struct pg_tm *gmtsub(const pg_time_t *timep, long offset,
-	   struct pg_tm * tmp);
-static struct pg_tm *localsub(const pg_time_t *timep, long offset,
-		 struct pg_tm * tmp, const pg_tz *tz);
-static int	increment_overflow(int *number, int delta);
-static pg_time_t transtime(pg_time_t janfirst, int year,
-		  const struct rule * rulep, long offset);
-static int	typesequiv(const struct state * sp, int a, int b);
-static struct pg_tm *timesub(const pg_time_t *timep, long offset,
-		const struct state * sp, struct pg_tm * tmp);
-
-/* GMT timezone */
-static struct state gmtmem;
-
-#define gmtptr		(&gmtmem)
+static struct pg_tm *gmtsub(pg_time_t const *, int32, struct pg_tm *);
+static bool increment_overflow(int *, int);
+static bool increment_overflow_time(pg_time_t *, int32);
+static struct pg_tm *timesub(pg_time_t const *, int32, struct state const *,
+		struct pg_tm *);
+static bool typesequiv(struct state const *, int, int);
 
 
-static int	gmt_is_set = 0;
-
 /*
  * Section 4.12.3 of X3.159-1989 requires that
  *	Except for the strftime function, these functions [asctime,
@@ -115,147 +110,281 @@
 
 static struct pg_tm tm;
 
+/* Initialize *S to a value based on GMTOFF, ISDST, and ABBRIND.  */
+static void
+init_ttinfo(struct ttinfo * s, int32 gmtoff, bool isdst, int abbrind)
+{
+	s->tt_gmtoff = gmtoff;
+	s->tt_isdst = isdst;
+	s->tt_abbrind = abbrind;
+	s->tt_ttisstd = false;
+	s->tt_ttisgmt = false;
+}
 
-static long
+static int32
 detzcode(const char *codep)
 {
-	long		result;
+	int32		result;
 	int			i;
+	int32		one = 1;
+	int32		halfmaxval = one << (32 - 2);
+	int32		maxval = halfmaxval - 1 + halfmaxval;
+	int32		minval = -1 - maxval;
 
-	result = (codep[0] & 0x80) ? ~0L : 0;
-	for (i = 0; i < 4; ++i)
+	result = codep[0] & 0x7f;
+	for (i = 1; i < 4; ++i)
 		result = (result << 8) | (codep[i] & 0xff);
+
+	if (codep[0] & 0x80)
+	{
+		/*
+		 * Do two's-complement negation even on non-two's-complement machines.
+		 * If the result would be minval - 1, return minval.
+		 */
+		result -= !TWOS_COMPLEMENT(int32) &&result != 0;
+		result += minval;
+	}
 	return result;
 }
 
-static pg_time_t
+static int64
 detzcode64(const char *codep)
 {
-	pg_time_t	result;
+	uint64		result;
 	int			i;
+	int64		one = 1;
+	int64		halfmaxval = one << (64 - 2);
+	int64		maxval = halfmaxval - 1 + halfmaxval;
+	int64		minval = -TWOS_COMPLEMENT(int64) -maxval;
 
-	result = (codep[0] & 0x80) ? (~(int64) 0) : 0;
-	for (i = 0; i < 8; ++i)
-		result = result * 256 + (codep[i] & 0xff);
+	result = codep[0] & 0x7f;
+	for (i = 1; i < 8; ++i)
+		result = (result << 8) | (codep[i] & 0xff);
+
+	if (codep[0] & 0x80)
+	{
+		/*
+		 * Do two's-complement negation even on non-two's-complement machines.
+		 * If the result would be minval - 1, return minval.
+		 */
+		result -= !TWOS_COMPLEMENT(int64) &&result != 0;
+		result += minval;
+	}
 	return result;
 }
 
-static int
-differ_by_repeat(pg_time_t t1, pg_time_t t0)
+static bool
+differ_by_repeat(const pg_time_t t1, const pg_time_t t0)
 {
-	if (TYPE_INTEGRAL(pg_time_t) &&
-		TYPE_BIT(pg_time_t) -TYPE_SIGNED(pg_time_t) <SECSPERREPEAT_BITS)
+	if (TYPE_BIT(pg_time_t) -TYPE_SIGNED(pg_time_t) <SECSPERREPEAT_BITS)
 		return 0;
 	return t1 - t0 == SECSPERREPEAT;
 }
 
-int
-tzload(const char *name, char *canonname, struct state * sp, int doextend)
+/* Input buffer for data read from a compiled tz file.  */
+union input_buffer
+{
+	/* The first part of the buffer, interpreted as a header.  */
+	struct tzhead tzhead;
+
+	/* The entire buffer.  */
+	char		buf[2 * sizeof(struct tzhead) + 2 * sizeof(struct state)
+					+			4 * TZ_MAX_TIMES];
+};
+
+/* Local storage needed for 'tzloadbody'.  */
+union local_storage
+{
+	/* We don't need the "fullname" member */
+
+	/* The results of analyzing the file's contents after it is opened.  */
+	struct
+	{
+		/* The input buffer.  */
+		union input_buffer u;
+
+		/* A temporary state used for parsing a TZ string in the file.  */
+		struct state st;
+	}			u;
+};
+
+/* Load tz data from the file named NAME into *SP.  Read extended
+ * format if DOEXTEND.  Use *LSP for temporary storage.  Return 0 on
+ * success, an errno value on failure.
+ * PG: If "canonname" is not NULL, then on success the canonical spelling of
+ * given name is stored there (the buffer must be > TZ_STRLEN_MAX bytes!).
+ */
+static int
+tzloadbody(char const * name, char *canonname, struct state * sp, bool doextend,
+		   union local_storage * lsp)
 {
-	const char *p;
 	int			i;
 	int			fid;
 	int			stored;
-	int			nread;
-	union
+	ssize_t		nread;
+	union input_buffer *up = &lsp->u.u;
+	int			tzheadsize = sizeof(struct tzhead);
+
+	sp->goback = sp->goahead = false;
+
+	if (!name)
 	{
-		struct tzhead tzhead;
-		char		buf[2 * sizeof(struct tzhead) +
-									2 * sizeof *sp +
-									4 * TZ_MAX_TIMES];
-	}			u;
+		name = TZDEFAULT;
+		if (!name)
+			return EINVAL;
+	}
 
-	sp->goback = sp->goahead = FALSE;
-	if (name == NULL && (name = TZDEFAULT) == NULL)
-		return -1;
 	if (name[0] == ':')
 		++name;
+
 	fid = pg_open_tzfile(name, canonname);
 	if (fid < 0)
-		return -1;
-	nread = read(fid, u.buf, sizeof u.buf);
-	if (close(fid) != 0 || nread <= 0)
-		return -1;
+		return ENOENT;			/* pg_open_tzfile may not set errno */
+
+	nread = read(fid, up->buf, sizeof up->buf);
+	if (nread < tzheadsize)
+	{
+		int			err = nread < 0 ? errno : EINVAL;
+
+		close(fid);
+		return err;
+	}
+	if (close(fid) < 0)
+		return errno;
 	for (stored = 4; stored <= 8; stored *= 2)
 	{
-		int			ttisstdcnt;
-		int			ttisgmtcnt;
+		int32		ttisstdcnt = detzcode(up->tzhead.tzh_ttisstdcnt);
+		int32		ttisgmtcnt = detzcode(up->tzhead.tzh_ttisgmtcnt);
+		int32		leapcnt = detzcode(up->tzhead.tzh_leapcnt);
+		int32		timecnt = detzcode(up->tzhead.tzh_timecnt);
+		int32		typecnt = detzcode(up->tzhead.tzh_typecnt);
+		int32		charcnt = detzcode(up->tzhead.tzh_charcnt);
+		char const *p = up->buf + tzheadsize;
+
+		if (!(0 <= leapcnt && leapcnt < TZ_MAX_LEAPS
+			  && 0 < typecnt && typecnt < TZ_MAX_TYPES
+			  && 0 <= timecnt && timecnt < TZ_MAX_TIMES
+			  && 0 <= charcnt && charcnt < TZ_MAX_CHARS
+			  && (ttisstdcnt == typecnt || ttisstdcnt == 0)
+			  && (ttisgmtcnt == typecnt || ttisgmtcnt == 0)))
+			return EINVAL;
+		if (nread
+			< (tzheadsize		/* struct tzhead */
+			   + timecnt * stored		/* ats */
+			   + timecnt		/* types */
+			   + typecnt * 6	/* ttinfos */
+			   + charcnt		/* chars */
+			   + leapcnt * (stored + 4) /* lsinfos */
+			   + ttisstdcnt		/* ttisstds */
+			   + ttisgmtcnt))	/* ttisgmts */
+			return EINVAL;
+		sp->leapcnt = leapcnt;
+		sp->timecnt = timecnt;
+		sp->typecnt = typecnt;
+		sp->charcnt = charcnt;
 
-		ttisstdcnt = (int) detzcode(u.tzhead.tzh_ttisstdcnt);
-		ttisgmtcnt = (int) detzcode(u.tzhead.tzh_ttisgmtcnt);
-		sp->leapcnt = (int) detzcode(u.tzhead.tzh_leapcnt);
-		sp->timecnt = (int) detzcode(u.tzhead.tzh_timecnt);
-		sp->typecnt = (int) detzcode(u.tzhead.tzh_typecnt);
-		sp->charcnt = (int) detzcode(u.tzhead.tzh_charcnt);
-		p = u.tzhead.tzh_charcnt + sizeof u.tzhead.tzh_charcnt;
-		if (sp->leapcnt < 0 || sp->leapcnt > TZ_MAX_LEAPS ||
-			sp->typecnt <= 0 || sp->typecnt > TZ_MAX_TYPES ||
-			sp->timecnt < 0 || sp->timecnt > TZ_MAX_TIMES ||
-			sp->charcnt < 0 || sp->charcnt > TZ_MAX_CHARS ||
-			(ttisstdcnt != sp->typecnt && ttisstdcnt != 0) ||
-			(ttisgmtcnt != sp->typecnt && ttisgmtcnt != 0))
-			return -1;
-		if (nread - (p - u.buf) <
-			sp->timecnt * stored +		/* ats */
-			sp->timecnt +		/* types */
-			sp->typecnt * 6 +	/* ttinfos */
-			sp->charcnt +		/* chars */
-			sp->leapcnt * (stored + 4) +		/* lsinfos */
-			ttisstdcnt +		/* ttisstds */
-			ttisgmtcnt)			/* ttisgmts */
-			return -1;
+		/*
+		 * Read transitions, discarding those out of pg_time_t range. But
+		 * pretend the last transition before time_t_min occurred at
+		 * time_t_min.
+		 */
+		timecnt = 0;
 		for (i = 0; i < sp->timecnt; ++i)
 		{
-			sp->ats[i] = (stored == 4) ? detzcode(p) : detzcode64(p);
+			int64		at
+			= stored == 4 ? detzcode(p) : detzcode64(p);
+
+			sp->types[i] = at <= time_t_max;
+			if (sp->types[i])
+			{
+				pg_time_t	attime
+				= ((TYPE_SIGNED(pg_time_t) ? at < time_t_min : at < 0)
+				   ? time_t_min : at);
+
+				if (timecnt && attime <= sp->ats[timecnt - 1])
+				{
+					if (attime < sp->ats[timecnt - 1])
+						return EINVAL;
+					sp->types[i - 1] = 0;
+					timecnt--;
+				}
+				sp->ats[timecnt++] = attime;
+			}
 			p += stored;
 		}
+
+		timecnt = 0;
 		for (i = 0; i < sp->timecnt; ++i)
 		{
-			sp->types[i] = (unsigned char) *p++;
-			if (sp->types[i] >= sp->typecnt)
-				return -1;
+			unsigned char typ = *p++;
+
+			if (sp->typecnt <= typ)
+				return EINVAL;
+			if (sp->types[i])
+				sp->types[timecnt++] = typ;
 		}
+		sp->timecnt = timecnt;
 		for (i = 0; i < sp->typecnt; ++i)
 		{
 			struct ttinfo *ttisp;
+			unsigned char isdst,
+						abbrind;
 
 			ttisp = &sp->ttis[i];
 			ttisp->tt_gmtoff = detzcode(p);
 			p += 4;
-			ttisp->tt_isdst = (unsigned char) *p++;
-			if (ttisp->tt_isdst != 0 && ttisp->tt_isdst != 1)
-				return -1;
-			ttisp->tt_abbrind = (unsigned char) *p++;
-			if (ttisp->tt_abbrind < 0 ||
-				ttisp->tt_abbrind > sp->charcnt)
-				return -1;
+			isdst = *p++;
+			if (!(isdst < 2))
+				return EINVAL;
+			ttisp->tt_isdst = isdst;
+			abbrind = *p++;
+			if (!(abbrind < sp->charcnt))
+				return EINVAL;
+			ttisp->tt_abbrind = abbrind;
 		}
 		for (i = 0; i < sp->charcnt; ++i)
 			sp->chars[i] = *p++;
 		sp->chars[i] = '\0';	/* ensure '\0' at end */
+
+		/* Read leap seconds, discarding those out of pg_time_t range.  */
+		leapcnt = 0;
 		for (i = 0; i < sp->leapcnt; ++i)
 		{
-			struct lsinfo *lsisp;
+			int64		tr = stored == 4 ? detzcode(p) : detzcode64(p);
+			int32		corr = detzcode(p + stored);
 
-			lsisp = &sp->lsis[i];
-			lsisp->ls_trans = (stored == 4) ? detzcode(p) : detzcode64(p);
-			p += stored;
-			lsisp->ls_corr = detzcode(p);
-			p += 4;
+			p += stored + 4;
+			if (tr <= time_t_max)
+			{
+				pg_time_t	trans
+				= ((TYPE_SIGNED(pg_time_t) ? tr < time_t_min : tr < 0)
+				   ? time_t_min : tr);
+
+				if (leapcnt && trans <= sp->lsis[leapcnt - 1].ls_trans)
+				{
+					if (trans < sp->lsis[leapcnt - 1].ls_trans)
+						return EINVAL;
+					leapcnt--;
+				}
+				sp->lsis[leapcnt].ls_trans = trans;
+				sp->lsis[leapcnt].ls_corr = corr;
+				leapcnt++;
+			}
 		}
+		sp->leapcnt = leapcnt;
+
 		for (i = 0; i < sp->typecnt; ++i)
 		{
 			struct ttinfo *ttisp;
 
 			ttisp = &sp->ttis[i];
 			if (ttisstdcnt == 0)
-				ttisp->tt_ttisstd = FALSE;
+				ttisp->tt_ttisstd = false;
 			else
 			{
+				if (*p != true && *p != false)
+					return EINVAL;
 				ttisp->tt_ttisstd = *p++;
-				if (ttisp->tt_ttisstd != TRUE &&
-					ttisp->tt_ttisstd != FALSE)
-					return -1;
 			}
 		}
 		for (i = 0; i < sp->typecnt; ++i)
@@ -264,99 +393,98 @@
 
 			ttisp = &sp->ttis[i];
 			if (ttisgmtcnt == 0)
-				ttisp->tt_ttisgmt = FALSE;
+				ttisp->tt_ttisgmt = false;
 			else
 			{
+				if (*p != true && *p != false)
+					return EINVAL;
 				ttisp->tt_ttisgmt = *p++;
-				if (ttisp->tt_ttisgmt != TRUE &&
-					ttisp->tt_ttisgmt != FALSE)
-					return -1;
 			}
 		}
 
 		/*
-		 * Out-of-sort ats should mean we're running on a signed time_t system
-		 * but using a data file with unsigned values (or vice versa).
-		 */
-		for (i = 0; i < sp->timecnt - 2; ++i)
-			if (sp->ats[i] > sp->ats[i + 1])
-			{
-				++i;
-				if (TYPE_SIGNED(pg_time_t))
-				{
-					/*
-					 * Ignore the end (easy).
-					 */
-					sp->timecnt = i;
-				}
-				else
-				{
-					/*
-					 * Ignore the beginning (harder).
-					 */
-					int			j;
-
-					for (j = 0; j + i < sp->timecnt; ++j)
-					{
-						sp->ats[j] = sp->ats[j + i];
-						sp->types[j] = sp->types[j + i];
-					}
-					sp->timecnt = j;
-				}
-				break;
-			}
-
-		/*
 		 * If this is an old file, we're done.
 		 */
-		if (u.tzhead.tzh_version[0] == '\0')
-			break;
-		nread -= p - u.buf;
-		for (i = 0; i < nread; ++i)
-			u.buf[i] = p[i];
-
-		/*
-		 * If this is a narrow integer time_t system, we're done.
-		 */
-		if (stored >= (int) sizeof(pg_time_t) && TYPE_INTEGRAL(pg_time_t))
+		if (up->tzhead.tzh_version[0] == '\0')
 			break;
+		nread -= p - up->buf;
+		memmove(up->buf, p, nread);
 	}
 	if (doextend && nread > 2 &&
-		u.buf[0] == '\n' && u.buf[nread - 1] == '\n' &&
+		up->buf[0] == '\n' && up->buf[nread - 1] == '\n' &&
 		sp->typecnt + 2 <= TZ_MAX_TYPES)
 	{
-		struct state ts;
-		int			result;
+		struct state *ts = &lsp->u.st;
+
+		up->buf[nread - 1] = '\0';
+		if (tzparse(&up->buf[1], ts, false)
+			&& ts->typecnt == 2)
+		{
+			/*
+			 * Attempt to reuse existing abbreviations. Without this,
+			 * America/Anchorage would be right on the edge after 2037 when
+			 * TZ_MAX_CHARS is 50, as sp->charcnt equals 40 (for LMT AST AWT
+			 * APT AHST AHDT YST AKDT AKST) and ts->charcnt equals 10 (for
+			 * AKST AKDT).  Reusing means sp->charcnt can stay 40 in this
+			 * example.
+			 */
+			int			gotabbr = 0;
+			int			charcnt = sp->charcnt;
+
+			for (i = 0; i < 2; i++)
+			{
+				char	   *tsabbr = ts->chars + ts->ttis[i].tt_abbrind;
+				int			j;
 
-		u.buf[nread - 1] = '\0';
-		result = tzparse(&u.buf[1], &ts, FALSE);
-		if (result == 0 && ts.typecnt == 2 &&
-			sp->charcnt + ts.charcnt <= TZ_MAX_CHARS)
-		{
-			for (i = 0; i < 2; ++i)
-				ts.ttis[i].tt_abbrind +=
-					sp->charcnt;
-			for (i = 0; i < ts.charcnt; ++i)
-				sp->chars[sp->charcnt++] =
-					ts.chars[i];
-			i = 0;
-			while (i < ts.timecnt &&
-				   ts.ats[i] <=
-				   sp->ats[sp->timecnt - 1])
-				++i;
-			while (i < ts.timecnt &&
-				   sp->timecnt < TZ_MAX_TIMES)
+				for (j = 0; j < charcnt; j++)
+					if (strcmp(sp->chars + j, tsabbr) == 0)
+					{
+						ts->ttis[i].tt_abbrind = j;
+						gotabbr++;
+						break;
+					}
+				if (!(j < charcnt))
+				{
+					int			tsabbrlen = strlen(tsabbr);
+
+					if (j + tsabbrlen < TZ_MAX_CHARS)
+					{
+						strcpy(sp->chars + j, tsabbr);
+						charcnt = j + tsabbrlen + 1;
+						ts->ttis[i].tt_abbrind = j;
+						gotabbr++;
+					}
+				}
+			}
+			if (gotabbr == 2)
 			{
-				sp->ats[sp->timecnt] =
-					ts.ats[i];
-				sp->types[sp->timecnt] =
-					sp->typecnt +
-					ts.types[i];
-				++sp->timecnt;
-				++i;
+				sp->charcnt = charcnt;
+
+				/*
+				 * Ignore any trailing, no-op transitions generated by zic as
+				 * they don't help here and can run afoul of bugs in zic 2016j
+				 * or earlier.
+				 */
+				while (1 < sp->timecnt
+					   && (sp->types[sp->timecnt - 1]
+						   == sp->types[sp->timecnt - 2]))
+					sp->timecnt--;
+
+				for (i = 0; i < ts->timecnt; i++)
+					if (sp->ats[sp->timecnt - 1] < ts->ats[i])
+						break;
+				while (i < ts->timecnt
+					   && sp->timecnt < TZ_MAX_TIMES)
+				{
+					sp->ats[sp->timecnt] = ts->ats[i];
+					sp->types[sp->timecnt] = (sp->typecnt
+											  + ts->types[i]);
+					sp->timecnt++;
+					i++;
+				}
+				sp->ttis[sp->typecnt++] = ts->ttis[0];
+				sp->ttis[sp->typecnt++] = ts->ttis[1];
 			}
-			sp->ttis[sp->typecnt++] = ts.ttis[0];
-			sp->ttis[sp->typecnt++] = ts.ttis[1];
 		}
 	}
 	if (sp->timecnt > 1)
@@ -365,7 +493,7 @@
 			if (typesequiv(sp, sp->types[i], sp->types[0]) &&
 				differ_by_repeat(sp->ats[i], sp->ats[0]))
 			{
-				sp->goback = TRUE;
+				sp->goback = true;
 				break;
 			}
 		for (i = sp->timecnt - 2; i >= 0; --i)
@@ -374,22 +502,81 @@
 				differ_by_repeat(sp->ats[sp->timecnt - 1],
 								 sp->ats[i]))
 			{
-				sp->goahead = TRUE;
+				sp->goahead = true;
+				break;
+			}
+	}
+
+	/*
+	 * If type 0 is is unused in transitions, it's the type to use for early
+	 * times.
+	 */
+	for (i = 0; i < sp->timecnt; ++i)
+		if (sp->types[i] == 0)
+			break;
+	i = i < sp->timecnt ? -1 : 0;
+
+	/*
+	 * Absent the above, if there are transition times and the first
+	 * transition is to a daylight time find the standard type less than and
+	 * closest to the type of the first transition.
+	 */
+	if (i < 0 && sp->timecnt > 0 && sp->ttis[sp->types[0]].tt_isdst)
+	{
+		i = sp->types[0];
+		while (--i >= 0)
+			if (!sp->ttis[i].tt_isdst)
+				break;
+	}
+
+	/*
+	 * If no result yet, find the first standard type. If there is none, punt
+	 * to type zero.
+	 */
+	if (i < 0)
+	{
+		i = 0;
+		while (sp->ttis[i].tt_isdst)
+			if (++i >= sp->typecnt)
+			{
+				i = 0;
 				break;
 			}
 	}
+	sp->defaulttype = i;
 	return 0;
 }
 
-static int
+/* Load tz data from the file named NAME into *SP.  Read extended
+ * format if DOEXTEND.  Return 0 on success, an errno value on failure.
+ * PG: If "canonname" is not NULL, then on success the canonical spelling of
+ * given name is stored there (the buffer must be > TZ_STRLEN_MAX bytes!).
+ */
+int
+tzload(const char *name, char *canonname, struct state * sp, bool doextend)
+{
+	union local_storage *lsp = malloc(sizeof *lsp);
+
+	if (!lsp)
+		return errno;
+	else
+	{
+		int			err = tzloadbody(name, canonname, sp, doextend, lsp);
+
+		free(lsp);
+		return err;
+	}
+}
+
+static bool
 typesequiv(const struct state * sp, int a, int b)
 {
-	int			result;
+	bool		result;
 
 	if (sp == NULL ||
 		a < 0 || a >= sp->typecnt ||
 		b < 0 || b >= sp->typecnt)
-		result = FALSE;
+		result = false;
 	else
 	{
 		const struct ttinfo *ap = &sp->ttis[a];
@@ -484,19 +671,19 @@
  * of seconds.
  */
 static const char *
-getsecs(const char *strp, long *secsp)
+getsecs(const char *strp, int32 *secsp)
 {
 	int			num;
 
 	/*
-	 * `HOURSPERDAY * DAYSPERWEEK - 1' allows quasi-Posix rules like
+	 * 'HOURSPERDAY * DAYSPERWEEK - 1' allows quasi-Posix rules like
 	 * "M10.4.6/26", which does not conform to Posix, but which specifies the
-	 * equivalent of ``02:00 on the first Sunday on or after 23 Oct''.
+	 * equivalent of "02:00 on the first Sunday on or after 23 Oct".
 	 */
 	strp = getnum(strp, &num, 0, HOURSPERDAY * DAYSPERWEEK - 1);
 	if (strp == NULL)
 		return NULL;
-	*secsp = num * (long) SECSPERHOUR;
+	*secsp = num * (int32) SECSPERHOUR;
 	if (*strp == ':')
 	{
 		++strp;
@@ -507,7 +694,7 @@
 		if (*strp == ':')
 		{
 			++strp;
-			/* `SECSPERMIN' allows for leap seconds. */
+			/* 'SECSPERMIN' allows for leap seconds.  */
 			strp = getnum(strp, &num, 0, SECSPERMIN);
 			if (strp == NULL)
 				return NULL;
@@ -524,13 +711,13 @@
  * Otherwise, return a pointer to the first character not part of the time.
  */
 static const char *
-getoffset(const char *strp, long *offsetp)
+getoffset(const char *strp, int32 *offsetp)
 {
-	int			neg = 0;
+	bool		neg = false;
 
 	if (*strp == '-')
 	{
-		neg = 1;
+		neg = true;
 		++strp;
 	}
 	else if (*strp == '+')
@@ -598,7 +785,7 @@
 		 * Time specified.
 		 */
 		++strp;
-		strp = getsecs(strp, &rulep->r_time);
+		strp = getoffset(strp, &rulep->r_time);
 	}
 	else
 		rulep->r_time = 2 * SECSPERHOUR;		/* default = 2:00:00 */
@@ -606,16 +793,15 @@
 }
 
 /*
- * Given the Epoch-relative time of January 1, 00:00:00 UTC, in a year, the
- * year, a rule, and the offset from UTC at the time that rule takes effect,
- * calculate the Epoch-relative time that rule takes effect.
- */
-static pg_time_t
-transtime(pg_time_t janfirst, int year,
-		  const struct rule * rulep, long offset)
+ * Given a year, a rule, and the offset from UT at the time that rule takes
+ * effect, calculate the year-relative time that rule takes effect.
+ */
+static int32
+transtime(int year, const struct rule * rulep,
+		  int32 offset)
 {
-	int			leapyear;
-	pg_time_t	value = 0;
+	bool		leapyear;
+	int32		value;
 	int			i,
 				d,
 				m1,
@@ -624,6 +810,7 @@
 				yy2,
 				dow;
 
+	INITIALIZE(value);
 	leapyear = isleap(year);
 	switch (rulep->r_type)
 	{
@@ -636,7 +823,7 @@
 			 * just add SECSPERDAY times the day number-1 to the time of
 			 * January 1, midnight, to get the day.
 			 */
-			value = janfirst + (rulep->r_day - 1) * SECSPERDAY;
+			value = (rulep->r_day - 1) * SECSPERDAY;
 			if (leapyear && rulep->r_day >= 60)
 				value += SECSPERDAY;
 			break;
@@ -647,7 +834,7 @@
 			 * n - day of year. Just add SECSPERDAY times the day number to
 			 * the time of January 1, midnight, to get the day.
 			 */
-			value = janfirst + rulep->r_day * SECSPERDAY;
+			value = rulep->r_day * SECSPERDAY;
 			break;
 
 		case MONTH_NTH_DAY_OF_WEEK:
@@ -655,9 +842,6 @@
 			/*
 			 * Mm.n.d - nth "dth day" of month m.
 			 */
-			value = janfirst;
-			for (i = 0; i < rulep->r_mon - 1; ++i)
-				value += mon_lengths[leapyear][i] * SECSPERDAY;
 
 			/*
 			 * Use Zeller's Congruence to get day-of-week of first day of
@@ -682,7 +866,7 @@
 			for (i = 1; i < rulep->r_week; ++i)
 			{
 				if (d + DAYSPERWEEK >=
-					mon_lengths[leapyear][rulep->r_mon - 1])
+					mon_lengths[(int) leapyear][rulep->r_mon - 1])
 					break;
 				d += DAYSPERWEEK;
 			}
@@ -690,14 +874,16 @@
 			/*
 			 * "d" is the day-of-month (zero-origin) of the day we want.
 			 */
-			value += d * SECSPERDAY;
+			value = d * SECSPERDAY;
+			for (i = 0; i < rulep->r_mon - 1; ++i)
+				value += mon_lengths[(int) leapyear][i] * SECSPERDAY;
 			break;
 	}
 
 	/*
-	 * "value" is the Epoch-relative time of 00:00:00 UTC on the day in
-	 * question.  To get the Epoch-relative time of the specified local time
-	 * on that day, add the transition time and the current offset from UTC.
+	 * "value" is the year-relative time of 00:00:00 UT on the day in
+	 * question. To get the year-relative time of the specified local time on
+	 * that day, add the transition time and the current offset from UT.
 	 */
 	return value + rulep->r_time + offset;
 }
@@ -705,38 +891,38 @@
 /*
  * Given a POSIX section 8-style TZ string, fill in the rule tables as
  * appropriate.
+ * Returns true on success, false on failure.
  */
-
-int
-tzparse(const char *name, struct state * sp, int lastditch)
+bool
+tzparse(const char *name, struct state * sp, bool lastditch)
 {
 	const char *stdname;
 	const char *dstname = NULL;
 	size_t		stdlen;
 	size_t		dstlen;
-	long		stdoffset;
-	long		dstoffset;
-	pg_time_t  *atp;
-	unsigned char *typep;
+	size_t		charcnt;
+	int32		stdoffset;
+	int32		dstoffset;
 	char	   *cp;
-	int			load_result;
+	bool		load_ok;
 
 	stdname = name;
 	if (lastditch)
 	{
+		/*
+		 * This is intentionally somewhat different from the IANA code.  We do
+		 * not want to invoke tzload() in the lastditch case: we can't assume
+		 * pg_open_tzfile() is sane yet, and we don't care about leap seconds
+		 * anyway.
+		 */
 		stdlen = strlen(name);	/* length of standard zone name */
 		name += stdlen;
 		if (stdlen >= sizeof sp->chars)
 			stdlen = (sizeof sp->chars) - 1;
+		charcnt = stdlen + 1;
 		stdoffset = 0;
-
-		/*
-		 * Unlike the original zic library, do NOT invoke tzload() here; we
-		 * can't assume pg_open_tzfile() is sane yet, and we don't care about
-		 * leap seconds anyway.
-		 */
-		sp->goback = sp->goahead = FALSE;
-		load_result = -1;
+		sp->goback = sp->goahead = false;		/* simulate failed tzload() */
+		load_ok = false;
 	}
 	else
 	{
@@ -746,7 +932,7 @@
 			stdname = name;
 			name = getqzname(name, '>');
 			if (*name != '>')
-				return (-1);
+				return false;
 			stdlen = name - stdname;
 			name++;
 		}
@@ -755,14 +941,31 @@
 			name = getzname(name);
 			stdlen = name - stdname;
 		}
-		if (*name == '\0')
-			return -1;
+		if (*name == '\0')		/* we allow empty STD abbrev, unlike IANA */
+			return false;
 		name = getoffset(name, &stdoffset);
 		if (name == NULL)
-			return -1;
-		load_result = tzload(TZDEFRULES, NULL, sp, FALSE);
+			return false;
+		charcnt = stdlen + 1;
+		if (sizeof sp->chars < charcnt)
+			return false;
+
+		/*
+		 * This bit also differs from the IANA code, which doesn't make any
+		 * attempt to avoid repetitive loadings of the TZDEFRULES zone.
+		 */
+		if (tzdefrules_loaded == 0)
+		{
+			if (tzload(TZDEFRULES, NULL, &tzdefrules_s, false) == 0)
+				tzdefrules_loaded = 1;
+			else
+				tzdefrules_loaded = -1;
+		}
+		load_ok = (tzdefrules_loaded > 0);
+		if (load_ok)
+			memcpy(sp, &tzdefrules_s, sizeof(struct state));
 	}
-	if (load_result != 0)
+	if (!load_ok)
 		sp->leapcnt = 0;		/* so, we're off a little */
 	if (*name != '\0')
 	{
@@ -771,7 +974,7 @@
 			dstname = ++name;
 			name = getqzname(name, '>');
 			if (*name != '>')
-				return -1;
+				return false;
 			dstlen = name - dstname;
 			name++;
 		}
@@ -781,93 +984,132 @@
 			name = getzname(name);
 			dstlen = name - dstname;	/* length of DST zone name */
 		}
+		if (!dstlen)
+			return false;
+		charcnt += dstlen + 1;
+		if (sizeof sp->chars < charcnt)
+			return false;
 		if (*name != '\0' && *name != ',' && *name != ';')
 		{
 			name = getoffset(name, &dstoffset);
 			if (name == NULL)
-				return -1;
+				return false;
 		}
 		else
 			dstoffset = stdoffset - SECSPERHOUR;
-		if (*name == '\0' && load_result != 0)
+		if (*name == '\0' && !load_ok)
 			name = TZDEFRULESTRING;
 		if (*name == ',' || *name == ';')
 		{
 			struct rule start;
 			struct rule end;
 			int			year;
+			int			yearlim;
+			int			timecnt;
 			pg_time_t	janfirst;
-			pg_time_t	starttime;
-			pg_time_t	endtime;
+			int32		janoffset = 0;
+			int			yearbeg;
 
 			++name;
 			if ((name = getrule(name, &start)) == NULL)
-				return -1;
+				return false;
 			if (*name++ != ',')
-				return -1;
+				return false;
 			if ((name = getrule(name, &end)) == NULL)
-				return -1;
+				return false;
 			if (*name != '\0')
-				return -1;
+				return false;
 			sp->typecnt = 2;	/* standard time and DST */
 
 			/*
 			 * Two transitions per year, from EPOCH_YEAR forward.
 			 */
-			sp->ttis[0].tt_gmtoff = -dstoffset;
-			sp->ttis[0].tt_isdst = 1;
-			sp->ttis[0].tt_abbrind = stdlen + 1;
-			sp->ttis[1].tt_gmtoff = -stdoffset;
-			sp->ttis[1].tt_isdst = 0;
-			sp->ttis[1].tt_abbrind = 0;
-			atp = sp->ats;
-			typep = sp->types;
+			init_ttinfo(&sp->ttis[0], -dstoffset, true, stdlen + 1);
+			init_ttinfo(&sp->ttis[1], -stdoffset, false, 0);
+			sp->defaulttype = 0;
+			timecnt = 0;
 			janfirst = 0;
-			sp->timecnt = 0;
-			for (year = EPOCH_YEAR;
-				 sp->timecnt + 2 <= TZ_MAX_TIMES;
-				 ++year)
+			yearbeg = EPOCH_YEAR;
+
+			do
 			{
-				pg_time_t	newfirst;
+				int32		yearsecs
+				= year_lengths[isleap(yearbeg - 1)] * SECSPERDAY;
 
-				starttime = transtime(janfirst, year, &start,
-									  stdoffset);
-				endtime = transtime(janfirst, year, &end,
-									dstoffset);
-				if (starttime > endtime)
+				yearbeg--;
+				if (increment_overflow_time(&janfirst, -yearsecs))
 				{
-					*atp++ = endtime;
-					*typep++ = 1;		/* DST ends */
-					*atp++ = starttime;
-					*typep++ = 0;		/* DST begins */
+					janoffset = -yearsecs;
+					break;
 				}
-				else
+			} while (EPOCH_YEAR - YEARSPERREPEAT / 2 < yearbeg);
+
+			yearlim = yearbeg + YEARSPERREPEAT + 1;
+			for (year = yearbeg; year < yearlim; year++)
+			{
+				int32
+							starttime = transtime(year, &start, stdoffset),
+							endtime = transtime(year, &end, dstoffset);
+				int32
+							yearsecs = (year_lengths[isleap(year)]
+										* SECSPERDAY);
+				bool		reversed = endtime < starttime;
+
+				if (reversed)
 				{
-					*atp++ = starttime;
-					*typep++ = 0;		/* DST begins */
-					*atp++ = endtime;
-					*typep++ = 1;		/* DST ends */
+					int32		swap = starttime;
+
+					starttime = endtime;
+					endtime = swap;
 				}
-				sp->timecnt += 2;
-				newfirst = janfirst;
-				newfirst += year_lengths[isleap(year)] *
-					SECSPERDAY;
-				if (newfirst <= janfirst)
+				if (reversed
+					|| (starttime < endtime
+						&& (endtime - starttime
+							< (yearsecs
+							   + (stdoffset - dstoffset)))))
+				{
+					if (TZ_MAX_TIMES - 2 < timecnt)
+						break;
+					sp->ats[timecnt] = janfirst;
+					if (!increment_overflow_time
+						(&sp->ats[timecnt],
+						 janoffset + starttime))
+						sp->types[timecnt++] = reversed;
+					else if (janoffset)
+						sp->defaulttype = reversed;
+					sp->ats[timecnt] = janfirst;
+					if (!increment_overflow_time
+						(&sp->ats[timecnt],
+						 janoffset + endtime))
+					{
+						sp->types[timecnt++] = !reversed;
+						yearlim = year + YEARSPERREPEAT + 1;
+					}
+					else if (janoffset)
+						sp->defaulttype = !reversed;
+				}
+				if (increment_overflow_time
+					(&janfirst, janoffset + yearsecs))
 					break;
-				janfirst = newfirst;
+				janoffset = 0;
 			}
+			sp->timecnt = timecnt;
+			if (!timecnt)
+				sp->typecnt = 1;	/* Perpetual DST.  */
+			else if (YEARSPERREPEAT < year - yearbeg)
+				sp->goback = sp->goahead = true;
 		}
 		else
 		{
-			long		theirstdoffset;
-			long		theirdstoffset;
-			long		theiroffset;
-			int			isdst;
+			int32		theirstdoffset;
+			int32		theirdstoffset;
+			int32		theiroffset;
+			bool		isdst;
 			int			i;
 			int			j;
 
 			if (*name != '\0')
-				return -1;
+				return false;
 
 			/*
 			 * Initial values of theirstdoffset and theirdstoffset.
@@ -898,7 +1140,7 @@
 			/*
 			 * Initially we're assumed to be in standard time.
 			 */
-			isdst = FALSE;
+			isdst = false;
 			theiroffset = theirstdoffset;
 
 			/*
@@ -945,15 +1187,12 @@
 			}
 
 			/*
-			 * Finally, fill in ttis. ttisstd and ttisgmt need not be handled.
+			 * Finally, fill in ttis.
 			 */
-			sp->ttis[0].tt_gmtoff = -stdoffset;
-			sp->ttis[0].tt_isdst = FALSE;
-			sp->ttis[0].tt_abbrind = 0;
-			sp->ttis[1].tt_gmtoff = -dstoffset;
-			sp->ttis[1].tt_isdst = TRUE;
-			sp->ttis[1].tt_abbrind = stdlen + 1;
+			init_ttinfo(&sp->ttis[0], -stdoffset, false, 0);
+			init_ttinfo(&sp->ttis[1], -dstoffset, true, stdlen + 1);
 			sp->typecnt = 2;
+			sp->defaulttype = 0;
 		}
 	}
 	else
@@ -961,75 +1200,61 @@
 		dstlen = 0;
 		sp->typecnt = 1;		/* only standard time */
 		sp->timecnt = 0;
-		sp->ttis[0].tt_gmtoff = -stdoffset;
-		sp->ttis[0].tt_isdst = 0;
-		sp->ttis[0].tt_abbrind = 0;
+		init_ttinfo(&sp->ttis[0], -stdoffset, false, 0);
+		sp->defaulttype = 0;
 	}
-	sp->charcnt = stdlen + 1;
-	if (dstlen != 0)
-		sp->charcnt += dstlen + 1;
-	if ((size_t) sp->charcnt > sizeof sp->chars)
-		return -1;
+	sp->charcnt = charcnt;
 	cp = sp->chars;
-	(void) strncpy(cp, stdname, stdlen);
+	memcpy(cp, stdname, stdlen);
 	cp += stdlen;
 	*cp++ = '\0';
 	if (dstlen != 0)
 	{
-		(void) strncpy(cp, dstname, dstlen);
+		memcpy(cp, dstname, dstlen);
 		*(cp + dstlen) = '\0';
 	}
-	return 0;
+	return true;
 }
 
 static void
 gmtload(struct state * sp)
 {
-	if (tzload(gmt, NULL, sp, TRUE) != 0)
-		(void) tzparse(gmt, sp, TRUE);
+	if (tzload(gmt, NULL, sp, true) != 0)
+		tzparse(gmt, sp, true);
 }
 
 
 /*
  * The easy way to behave "as if no library function calls" localtime
- * is to not call it--so we drop its guts into "localsub", which can be
- * freely called. (And no, the PANS doesn't require the above behavior--
+ * is to not call it, so we drop its guts into "localsub", which can be
+ * freely called. (And no, the PANS doesn't require the above behavior,
  * but it *is* desirable.)
- *
- * The unused offset argument is for the benefit of mktime variants.
  */
 static struct pg_tm *
-localsub(const pg_time_t *timep, long offset,
-		 struct pg_tm * tmp, const pg_tz *tz)
+localsub(struct state const * sp, pg_time_t const * timep,
+		 struct pg_tm * tmp)
 {
-	const struct state *sp;
 	const struct ttinfo *ttisp;
 	int			i;
 	struct pg_tm *result;
 	const pg_time_t t = *timep;
 
-	sp = &tz->state;
+	if (sp == NULL)
+		return gmtsub(timep, 0, tmp);
 	if ((sp->goback && t < sp->ats[0]) ||
 		(sp->goahead && t > sp->ats[sp->timecnt - 1]))
 	{
 		pg_time_t	newt = t;
 		pg_time_t	seconds;
-		pg_time_t	tcycles;
-		int64		icycles;
+		pg_time_t	years;
 
 		if (t < sp->ats[0])
 			seconds = sp->ats[0] - t;
 		else
 			seconds = t - sp->ats[sp->timecnt - 1];
 		--seconds;
-		tcycles = seconds / YEARSPERREPEAT / AVGSECSPERYEAR;
-		++tcycles;
-		icycles = tcycles;
-		if (tcycles - icycles >= 1 || icycles - tcycles >= 1)
-			return NULL;
-		seconds = icycles;
-		seconds *= YEARSPERREPEAT;
-		seconds *= AVGSECSPERYEAR;
+		years = (seconds / SECSPERREPEAT + 1) * YEARSPERREPEAT;
+		seconds = years * AVGSECSPERYEAR;
 		if (t < sp->ats[0])
 			newt += seconds;
 		else
@@ -1037,31 +1262,25 @@
 		if (newt < sp->ats[0] ||
 			newt > sp->ats[sp->timecnt - 1])
 			return NULL;		/* "cannot happen" */
-		result = localsub(&newt, offset, tmp, tz);
-		if (result == tmp)
+		result = localsub(sp, &newt, tmp);
+		if (result)
 		{
-			pg_time_t	newy;
+			int64		newy;
 
-			newy = tmp->tm_year;
+			newy = result->tm_year;
 			if (t < sp->ats[0])
-				newy -= icycles * YEARSPERREPEAT;
+				newy -= years;
 			else
-				newy += icycles * YEARSPERREPEAT;
-			tmp->tm_year = newy;
-			if (tmp->tm_year != newy)
+				newy += years;
+			if (!(INT_MIN <= newy && newy <= INT_MAX))
 				return NULL;
+			result->tm_year = newy;
 		}
 		return result;
 	}
 	if (sp->timecnt == 0 || t < sp->ats[0])
 	{
-		i = 0;
-		while (sp->ttis[i].tt_isdst)
-			if (++i >= sp->typecnt)
-			{
-				i = 0;
-				break;
-			}
+		i = sp->defaulttype;
 	}
 	else
 	{
@@ -1082,8 +1301,11 @@
 	ttisp = &sp->ttis[i];
 
 	result = timesub(&t, ttisp->tt_gmtoff, sp, tmp);
-	tmp->tm_isdst = ttisp->tt_isdst;
-	tmp->tm_zone = &sp->chars[ttisp->tt_abbrind];
+	if (result)
+	{
+		result->tm_isdst = ttisp->tt_isdst;
+		result->tm_zone = (char *) &sp->chars[ttisp->tt_abbrind];
+	}
 	return result;
 }
 
@@ -1091,29 +1313,35 @@
 struct pg_tm *
 pg_localtime(const pg_time_t *timep, const pg_tz *tz)
 {
-	return localsub(timep, 0L, &tm, tz);
+	return localsub(&tz->state, timep, &tm);
 }
 
 
 /*
  * gmtsub is to gmtime as localsub is to localtime.
+ *
+ * Except we have a private "struct state" for GMT, so no sp is passed in.
  */
 static struct pg_tm *
-gmtsub(const pg_time_t *timep, long offset, struct pg_tm * tmp)
+gmtsub(pg_time_t const * timep, int32 offset, struct pg_tm * tmp)
 {
 	struct pg_tm *result;
 
+	/* GMT timezone state data is kept here */
+	static struct state gmtmem;
+	static bool gmt_is_set = false;
+#define gmtptr		(&gmtmem)
+
 	if (!gmt_is_set)
 	{
-		gmt_is_set = TRUE;
+		gmt_is_set = true;
 		gmtload(gmtptr);
 	}
 	result = timesub(timep, offset, gmtptr, tmp);
 
 	/*
-	 * Could get fancy here and deliver something such as "UTC+xxxx" or
-	 * "UTC-xxxx" if offset is non-zero, but this is no time for a treasure
-	 * hunt.
+	 * Could get fancy here and deliver something such as "+xx" or "-xx" if
+	 * offset is non-zero, but this is no time for a treasure hunt.
 	 */
 	if (offset != 0)
 		tmp->tm_zone = wildabbr;
@@ -1126,7 +1354,7 @@
 struct pg_tm *
 pg_gmtime(const pg_time_t *timep)
 {
-	return gmtsub(timep, 0L, &tm);
+	return gmtsub(timep, 0, &tm);
 }
 
 /*
@@ -1140,24 +1368,23 @@
 		-(leaps_thru_end_of(-(y + 1)) + 1);
 }
 
-
 static struct pg_tm *
-timesub(const pg_time_t *timep, long offset,
+timesub(const pg_time_t *timep, int32 offset,
 		const struct state * sp, struct pg_tm * tmp)
 {
 	const struct lsinfo *lp;
 	pg_time_t	tdays;
 	int			idays;			/* unsigned would be so 2003 */
-	long		rem;
+	int64		rem;
 	int			y;
 	const int  *ip;
-	long		corr;
-	int			hit;
+	int64		corr;
+	bool		hit;
 	int			i;
 
 	corr = 0;
-	hit = 0;
-	i = sp->leapcnt;
+	hit = false;
+	i = (sp == NULL) ? 0 : sp->leapcnt;
 	while (--i >= 0)
 	{
 		lp = &sp->lsis[i];
@@ -1184,7 +1411,7 @@
 	}
 	y = EPOCH_YEAR;
 	tdays = *timep / SECSPERDAY;
-	rem = *timep - tdays * SECSPERDAY;
+	rem = *timep % SECSPERDAY;
 	while (tdays < 0 || tdays >= year_lengths[isleap(y)])
 	{
 		int			newy;
@@ -1193,27 +1420,21 @@
 		int			leapdays;
 
 		tdelta = tdays / DAYSPERLYEAR;
+		if (!((!TYPE_SIGNED(pg_time_t) ||INT_MIN <= tdelta)
+			  && tdelta <= INT_MAX))
+			goto out_of_range;
 		idelta = tdelta;
-		if (tdelta - idelta >= 1 || idelta - tdelta >= 1)
-			return NULL;
 		if (idelta == 0)
 			idelta = (tdays < 0) ? -1 : 1;
 		newy = y;
 		if (increment_overflow(&newy, idelta))
-			return NULL;
+			goto out_of_range;
 		leapdays = leaps_thru_end_of(newy - 1) -
 			leaps_thru_end_of(y - 1);
 		tdays -= ((pg_time_t) newy - y) * DAYSPERNYEAR;
 		tdays -= leapdays;
 		y = newy;
 	}
-	{
-		long		seconds;
-
-		seconds = tdays * SECSPERDAY + 0.5;
-		tdays = seconds / SECSPERDAY;
-		rem += seconds - tdays * SECSPERDAY;
-	}
 
 	/*
 	 * Given the range, we can now fearlessly cast...
@@ -1233,18 +1454,18 @@
 	while (idays < 0)
 	{
 		if (increment_overflow(&y, -1))
-			return NULL;
+			goto out_of_range;
 		idays += year_lengths[isleap(y)];
 	}
 	while (idays >= year_lengths[isleap(y)])
 	{
 		idays -= year_lengths[isleap(y)];
 		if (increment_overflow(&y, 1))
-			return NULL;
+			goto out_of_range;
 	}
 	tmp->tm_year = y;
 	if (increment_overflow(&tmp->tm_year, -TM_YEAR_BASE))
-		return NULL;
+		goto out_of_range;
 	tmp->tm_yday = idays;
 
 	/*
@@ -1275,20 +1496,49 @@
 	tmp->tm_isdst = 0;
 	tmp->tm_gmtoff = offset;
 	return tmp;
+
+out_of_range:
+	errno = EOVERFLOW;
+	return NULL;
 }
 
 /*
- * Simplified normalize logic courtesy Paul Eggert.
+ * Normalize logic courtesy Paul Eggert.
  */
 
-static int
-increment_overflow(int *number, int delta)
+static bool
+increment_overflow(int *ip, int j)
 {
-	int			number0;
+	int const	i = *ip;
+
+	/*----------
+	 * If i >= 0 there can only be overflow if i + j > INT_MAX
+	 * or if j > INT_MAX - i; given i >= 0, INT_MAX - i cannot overflow.
+	 * If i < 0 there can only be overflow if i + j < INT_MIN
+	 * or if j < INT_MIN - i; given i < 0, INT_MIN - i cannot overflow.
+	 *----------
+	 */
+	if ((i >= 0) ? (j > INT_MAX - i) : (j < INT_MIN - i))
+		return true;
+	*ip += j;
+	return false;
+}
 
-	number0 = *number;
-	*number += delta;
-	return (*number < number0) != (delta < 0);
+static bool
+increment_overflow_time(pg_time_t *tp, int32 j)
+{
+	/*----------
+	 * This is like
+	 * 'if (! (time_t_min <= *tp + j && *tp + j <= time_t_max)) ...',
+	 * except that it does the right thing even if *tp + j would overflow.
+	 *----------
+	 */
+	if (!(j < 0
+		  ? (TYPE_SIGNED(pg_time_t) ? time_t_min - j <= *tp : -1 - j < *tp)
+		  : *tp <= time_t_max - j))
+		return true;
+	*tp += j;
+	return false;
 }
 
 /*
@@ -1296,7 +1546,7 @@
  *
  * *timep and *tz are input arguments, the other parameters are output values.
  *
- * When the function result is 1, *boundary is set to the time_t
+ * When the function result is 1, *boundary is set to the pg_time_t
  * representation of the next DST transition time after *timep,
  * *before_gmtoff and *before_isdst are set to the GMT offset and isdst
  * state prevailing just before that boundary (in particular, the state
@@ -1453,8 +1703,8 @@
  * the meaning in use at or most recently before that time, or the meaning
  * in first use after that time if the abbrev was never used before that.
  *
- * On success, returns TRUE and sets *gmtoff and *isdst.  If the abbreviation
- * was never used at all in this zone, returns FALSE.
+ * On success, returns true and sets *gmtoff and *isdst.  If the abbreviation
+ * was never used at all in this zone, returns false.
  *
  * Note: abbrev is matched case-sensitively; it should be all-upper-case.
  */
@@ -1490,7 +1740,7 @@
 		abbrind++;
 	}
 	if (abbrind >= sp->charcnt)
-		return FALSE;			/* not there! */
+		return false;			/* not there! */
 
 	/*
 	 * Unlike pg_next_dst_boundary, we needn't sweat about extrapolation
@@ -1527,7 +1777,7 @@
 		{
 			*gmtoff = ttisp->tt_gmtoff;
 			*isdst = ttisp->tt_isdst;
-			return TRUE;
+			return true;
 		}
 	}
 
@@ -1541,23 +1791,23 @@
 		{
 			*gmtoff = ttisp->tt_gmtoff;
 			*isdst = ttisp->tt_isdst;
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;				/* hm, not actually used in any interval? */
+	return false;				/* hm, not actually used in any interval? */
 }
 
 /*
  * If the given timezone uses only one GMT offset, store that offset
- * into *gmtoff and return TRUE, else return FALSE.
+ * into *gmtoff and return true, else return false.
  */
 bool
 pg_get_timezone_offset(const pg_tz *tz, long int *gmtoff)
 {
 	/*
 	 * The zone could have more than one ttinfo, if it's historically used
-	 * more than one abbreviation.  We return TRUE as long as they all have
+	 * more than one abbreviation.  We return true as long as they all have
 	 * the same gmtoff.
 	 */
 	const struct state *sp;
diff -Nru postgresql-9.5-9.5.2/src/timezone/Makefile postgresql-9.5-9.5.8/src/timezone/Makefile
--- postgresql-9.5-9.5.2/src/timezone/Makefile	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/Makefile	2017-08-07 21:13:41.000000000 +0000
@@ -19,7 +19,7 @@
 OBJS= localtime.o strftime.o pgtz.o
 
 # files needed to build zic utility program
-ZICOBJS= zic.o ialloc.o scheck.o localtime.o $(WIN32RES)
+ZICOBJS= zic.o $(WIN32RES)
 
 # timezone data files
 TZDATA = africa antarctica asia australasia europe northamerica southamerica \
diff -Nru postgresql-9.5-9.5.2/src/timezone/pgtz.c postgresql-9.5-9.5.8/src/timezone/pgtz.c
--- postgresql-9.5-9.5.2/src/timezone/pgtz.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/pgtz.c	2017-08-07 21:13:41.000000000 +0000
@@ -17,6 +17,7 @@
 #include <sys/stat.h>
 #include <time.h>
 
+#include "datatype/timestamp.h"
 #include "miscadmin.h"
 #include "pgtz.h"
 #include "storage/fd.h"
@@ -79,12 +80,38 @@
 	int			fullnamelen;
 	int			orignamelen;
 
+	/* Initialize fullname with base name of tzdata directory */
+	strlcpy(fullname, pg_TZDIR(), sizeof(fullname));
+	orignamelen = fullnamelen = strlen(fullname);
+
+	if (fullnamelen + 1 + strlen(name) >= MAXPGPATH)
+		return -1;				/* not gonna fit */
+
+	/*
+	 * If the caller doesn't need the canonical spelling, first just try to
+	 * open the name as-is.  This can be expected to succeed if the given name
+	 * is already case-correct, or if the filesystem is case-insensitive; and
+	 * we don't need to distinguish those situations if we aren't tasked with
+	 * reporting the canonical spelling.
+	 */
+	if (canonname == NULL)
+	{
+		int			result;
+
+		fullname[fullnamelen] = '/';
+		/* test above ensured this will fit: */
+		strcpy(fullname + fullnamelen + 1, name);
+		result = open(fullname, O_RDONLY | PG_BINARY, 0);
+		if (result >= 0)
+			return result;
+		/* If that didn't work, fall through to do it the hard way */
+		fullname[fullnamelen] = '\0';
+	}
+
 	/*
 	 * Loop to split the given name into directory levels; for each level,
 	 * search using scan_directory_ci().
 	 */
-	strlcpy(fullname, pg_TZDIR(), sizeof(fullname));
-	orignamelen = fullnamelen = strlen(fullname);
 	fname = name;
 	for (;;)
 	{
@@ -96,8 +123,6 @@
 			fnamelen = slashptr - fname;
 		else
 			fnamelen = strlen(fname);
-		if (fullnamelen + 1 + fnamelen >= MAXPGPATH)
-			return -1;			/* not gonna fit */
 		if (!scan_directory_ci(fullname, fname, fnamelen,
 							   fullname + fullnamelen + 1,
 							   MAXPGPATH - fullnamelen - 1))
@@ -256,7 +281,7 @@
 	 */
 	if (strcmp(uppername, "GMT") == 0)
 	{
-		if (tzparse(uppername, &tzstate, TRUE) != 0)
+		if (!tzparse(uppername, &tzstate, true))
 		{
 			/* This really, really should not happen ... */
 			elog(ERROR, "could not initialize GMT time zone");
@@ -264,9 +289,9 @@
 		/* Use uppercase name as canonical */
 		strcpy(canonname, uppername);
 	}
-	else if (tzload(uppername, canonname, &tzstate, TRUE) != 0)
+	else if (tzload(uppername, canonname, &tzstate, true) != 0)
 	{
-		if (uppername[0] == ':' || tzparse(uppername, &tzstate, FALSE) != 0)
+		if (uppername[0] == ':' || !tzparse(uppername, &tzstate, false))
 		{
 			/* Unknown timezone. Fail our call instead of loading GMT! */
 			return NULL;
@@ -308,14 +333,14 @@
 	char		tzname[128];
 
 	snprintf(offsetstr, sizeof(offsetstr),
-			 "%02ld", absoffset / SECSPERHOUR);
-	absoffset %= SECSPERHOUR;
+			 "%02ld", absoffset / SECS_PER_HOUR);
+	absoffset %= SECS_PER_HOUR;
 	if (absoffset != 0)
 	{
 		snprintf(offsetstr + strlen(offsetstr),
 				 sizeof(offsetstr) - strlen(offsetstr),
-				 ":%02ld", absoffset / SECSPERMIN);
-		absoffset %= SECSPERMIN;
+				 ":%02ld", absoffset / SECS_PER_MINUTE);
+		absoffset %= SECS_PER_MINUTE;
 		if (absoffset != 0)
 			snprintf(offsetstr + strlen(offsetstr),
 					 sizeof(offsetstr) - strlen(offsetstr),
@@ -412,7 +437,7 @@
 	while (dir->depth >= 0)
 	{
 		struct dirent *direntry;
-		char		fullname[MAXPGPATH];
+		char		fullname[MAXPGPATH * 2];
 		struct stat statbuf;
 
 		direntry = ReadDir(dir->dirdesc[dir->depth], dir->dirname[dir->depth]);
@@ -429,7 +454,7 @@
 		if (direntry->d_name[0] == '.')
 			continue;
 
-		snprintf(fullname, MAXPGPATH, "%s/%s",
+		snprintf(fullname, sizeof(fullname), "%s/%s",
 				 dir->dirname[dir->depth], direntry->d_name);
 		if (stat(fullname, &statbuf) != 0)
 			ereport(ERROR,
@@ -457,10 +482,11 @@
 
 		/*
 		 * Load this timezone using tzload() not pg_tzset(), so we don't fill
-		 * the cache
+		 * the cache.  Also, don't ask for the canonical spelling: we already
+		 * know it, and pg_open_tzfile's way of finding it out is pretty
+		 * inefficient.
 		 */
-		if (tzload(fullname + dir->baselen, dir->tz.TZname, &dir->tz.state,
-				   TRUE) != 0)
+		if (tzload(fullname + dir->baselen, NULL, &dir->tz.state, true) != 0)
 		{
 			/* Zone could not be loaded, ignore it */
 			continue;
@@ -472,6 +498,10 @@
 			continue;
 		}
 
+		/* OK, return the canonical zone name spelling. */
+		strlcpy(dir->tz.TZname, fullname + dir->baselen,
+				sizeof(dir->tz.TZname));
+
 		/* Timezone loaded OK. */
 		return &dir->tz;
 	}
diff -Nru postgresql-9.5-9.5.2/src/timezone/pgtz.h postgresql-9.5-9.5.8/src/timezone/pgtz.h
--- postgresql-9.5-9.5.2/src/timezone/pgtz.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/pgtz.h	2017-08-07 21:13:41.000000000 +0000
@@ -16,25 +16,26 @@
 #ifndef _PGTZ_H
 #define _PGTZ_H
 
-#include "tzfile.h"
 #include "pgtime.h"
+#include "tzfile.h"
 
 
+#define SMALLEST(a, b)	(((a) < (b)) ? (a) : (b))
 #define BIGGEST(a, b)	(((a) > (b)) ? (a) : (b))
 
 struct ttinfo
 {								/* time type information */
-	long		tt_gmtoff;		/* UTC offset in seconds */
-	int			tt_isdst;		/* used to set tm_isdst */
+	int32		tt_gmtoff;		/* UT offset in seconds */
+	bool		tt_isdst;		/* used to set tm_isdst */
 	int			tt_abbrind;		/* abbreviation list index */
-	int			tt_ttisstd;		/* TRUE if transition is std time */
-	int			tt_ttisgmt;		/* TRUE if transition is UTC */
+	bool		tt_ttisstd;		/* transition is std time */
+	bool		tt_ttisgmt;		/* transition is UT */
 };
 
 struct lsinfo
 {								/* leap second information */
 	pg_time_t	ls_trans;		/* transition time */
-	long		ls_corr;		/* correction to apply */
+	int64		ls_corr;		/* correction to apply */
 };
 
 struct state
@@ -43,14 +44,15 @@
 	int			timecnt;
 	int			typecnt;
 	int			charcnt;
-	int			goback;
-	int			goahead;
+	bool		goback;
+	bool		goahead;
 	pg_time_t	ats[TZ_MAX_TIMES];
 	unsigned char types[TZ_MAX_TIMES];
 	struct ttinfo ttis[TZ_MAX_TYPES];
 	char		chars[BIGGEST(BIGGEST(TZ_MAX_CHARS + 1, 3 /* sizeof gmt */ ),
 										  (2 * (TZ_STRLEN_MAX + 1)))];
 	struct lsinfo lsis[TZ_MAX_LEAPS];
+	int			defaulttype;	/* for early times or if no transitions */
 };
 
 
@@ -67,7 +69,7 @@
 
 /* in localtime.c */
 extern int tzload(const char *name, char *canonname, struct state * sp,
-	   int doextend);
-extern int	tzparse(const char *name, struct state * sp, int lastditch);
+	   bool doextend);
+extern bool tzparse(const char *name, struct state * sp, bool lastditch);
 
 #endif   /* _PGTZ_H */
diff -Nru postgresql-9.5-9.5.2/src/timezone/private.h postgresql-9.5-9.5.8/src/timezone/private.h
--- postgresql-9.5-9.5.2/src/timezone/private.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/private.h	2017-08-07 21:13:41.000000000 +0000
@@ -23,8 +23,21 @@
 
 #include "pgtime.h"
 
+/* This string was in the Factory zone through version 2016f.  */
 #define GRANDPARENTED	"Local time zone must be set--see zic manual page"
 
+/*
+ * IANA has a bunch of HAVE_FOO #defines here, but in PG we want pretty
+ * much all of that to be done by PG's configure script.
+ */
+
+#ifndef ENOTSUP
+#define ENOTSUP EINVAL
+#endif
+#ifndef EOVERFLOW
+#define EOVERFLOW EINVAL
+#endif
+
 #ifndef WIFEXITED
 #define WIFEXITED(status)	(((status) & 0xff) == 0)
 #endif   /* !defined WIFEXITED */
@@ -35,6 +48,10 @@
 /* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX. */
 #define is_digit(c) ((unsigned)(c) - '0' <= 9)
 
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t) -1)
+#endif
+
 /*
  * SunOS 4.1.1 libraries lack remove.
  */
@@ -45,49 +62,26 @@
 #define remove	unlink
 #endif   /* !defined remove */
 
-/*
- * Private function declarations.
- */
-extern char *icalloc(int nelem, int elsize);
-extern char *icatalloc(char *old, const char *new);
-extern char *icpyalloc(const char *string);
-extern char *imalloc(int n);
-extern void *irealloc(void *pointer, int size);
-extern void icfree(char *pointer);
-extern void ifree(char *pointer);
-extern const char *scheck(const char *string, const char *format);
-
 
 /*
  * Finally, some convenience items.
  */
 
-#ifndef TRUE
-#define TRUE	1
-#endif   /* !defined TRUE */
-
-#ifndef FALSE
-#define FALSE	0
-#endif   /* !defined FALSE */
-
-#ifndef TYPE_BIT
 #define TYPE_BIT(type)	(sizeof (type) * CHAR_BIT)
-#endif   /* !defined TYPE_BIT */
-
-#ifndef TYPE_SIGNED
 #define TYPE_SIGNED(type) (((type) -1) < 0)
-#endif   /* !defined TYPE_SIGNED */
+#define TWOS_COMPLEMENT(t) ((t) ~ (t) 0 < 0)
 
 /*
- * Since the definition of TYPE_INTEGRAL contains floating point numbers,
- * it cannot be used in preprocessor directives.
- */
+ * Max and min values of the integer type T, of which only the bottom
+ * B bits are used, and where the highest-order used bit is considered
+ * to be a sign bit if T is signed.
+ */
+#define MAXVAL(t, b)						\
+  ((t) (((t) 1 << ((b) - 1 - TYPE_SIGNED(t)))			\
+	- 1 + ((t) 1 << ((b) - 1 - TYPE_SIGNED(t)))))
+#define MINVAL(t, b)						\
+  ((t) (TYPE_SIGNED(t) ? - TWOS_COMPLEMENT(t) - MAXVAL(t, b) : 0))
 
-#ifndef TYPE_INTEGRAL
-#define TYPE_INTEGRAL(type) (((type) 0.5) != 0.5)
-#endif   /* !defined TYPE_INTEGRAL */
-
-#ifndef INT_STRLEN_MAXIMUM
 /*
  * 302 / 1000 is log10(2.0) rounded up.
  * Subtract one for the sign bit if the type is signed;
@@ -95,34 +89,81 @@
  * add one more for a minus sign if the type is signed.
  */
 #define INT_STRLEN_MAXIMUM(type) \
-	((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type))
-#endif   /* !defined INT_STRLEN_MAXIMUM */
-
-#undef _
-#define _(msgid) (msgid)
-
-#ifndef YEARSPERREPEAT
-#define YEARSPERREPEAT			400		/* years before a Gregorian repeat */
-#endif   /* !defined YEARSPERREPEAT */
+	((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + \
+	1 + TYPE_SIGNED(type))
 
 /*
-** The Gregorian year averages 365.2425 days, which is 31556952 seconds.
-*/
+ * INITIALIZE(x)
+ */
+#define INITIALIZE(x)  ((x) = 0)
 
-#ifndef AVGSECSPERYEAR
-#define AVGSECSPERYEAR			31556952L
-#endif   /* !defined AVGSECSPERYEAR */
+#undef _
+#define _(msgid) (msgid)
 
-#ifndef SECSPERREPEAT
-#define SECSPERREPEAT			((int64) YEARSPERREPEAT * (int64) AVGSECSPERYEAR)
-#endif   /* !defined SECSPERREPEAT */
+/* Handy macros that are independent of tzfile implementation.  */
 
-#ifndef SECSPERREPEAT_BITS
-#define SECSPERREPEAT_BITS		34		/* ceil(log2(SECSPERREPEAT)) */
-#endif   /* !defined SECSPERREPEAT_BITS */
+#define YEARSPERREPEAT		400 /* years before a Gregorian repeat */
 
-/*
- * UNIX was a registered trademark of The Open Group in 2003.
- */
+#define SECSPERMIN	60
+#define MINSPERHOUR 60
+#define HOURSPERDAY 24
+#define DAYSPERWEEK 7
+#define DAYSPERNYEAR	365
+#define DAYSPERLYEAR	366
+#define SECSPERHOUR (SECSPERMIN * MINSPERHOUR)
+#define SECSPERDAY	((int32) SECSPERHOUR * HOURSPERDAY)
+#define MONSPERYEAR 12
+
+#define TM_SUNDAY	0
+#define TM_MONDAY	1
+#define TM_TUESDAY	2
+#define TM_WEDNESDAY	3
+#define TM_THURSDAY 4
+#define TM_FRIDAY	5
+#define TM_SATURDAY 6
+
+#define TM_JANUARY	0
+#define TM_FEBRUARY 1
+#define TM_MARCH	2
+#define TM_APRIL	3
+#define TM_MAY		4
+#define TM_JUNE		5
+#define TM_JULY		6
+#define TM_AUGUST	7
+#define TM_SEPTEMBER	8
+#define TM_OCTOBER	9
+#define TM_NOVEMBER 10
+#define TM_DECEMBER 11
+
+#define TM_YEAR_BASE	1900
+
+#define EPOCH_YEAR	1970
+#define EPOCH_WDAY	TM_THURSDAY
+
+#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
+
+/*
+ * Since everything in isleap is modulo 400 (or a factor of 400), we know that
+ *	isleap(y) == isleap(y % 400)
+ * and so
+ *	isleap(a + b) == isleap((a + b) % 400)
+ * or
+ *	isleap(a + b) == isleap(a % 400 + b % 400)
+ * This is true even if % means modulo rather than Fortran remainder
+ * (which is allowed by C89 but not C99).
+ * We use this to avoid addition overflow problems.
+ */
+
+#define isleap_sum(a, b)	isleap((a) % 400 + (b) % 400)
+
+
+/*
+ * The Gregorian year averages 365.2425 days, which is 31556952 seconds.
+ */
+
+#define AVGSECSPERYEAR		31556952L
+#define SECSPERREPEAT \
+  ((int64) YEARSPERREPEAT * (int64) AVGSECSPERYEAR)
+#define SECSPERREPEAT_BITS	34	/* ceil(log2(SECSPERREPEAT)) */
 
 #endif   /* !defined PRIVATE_H */
diff -Nru postgresql-9.5-9.5.2/src/timezone/README postgresql-9.5-9.5.8/src/timezone/README
--- postgresql-9.5-9.5.2/src/timezone/README	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/README	2017-08-07 21:13:41.000000000 +0000
@@ -1,26 +1,24 @@
 src/timezone/README
 
-Timezone
-========
+This is a PostgreSQL adapted version of the IANA timezone library from
 
-This is a PostgreSQL adapted version of the timezone library from
-http://www.iana.org/time-zones
+	http://www.iana.org/time-zones
 
-The source code can be found at:
+The latest versions of both the tzdata and tzcode tarballs are normally
+available right from that page.  Historical versions can be found
+elsewhere on the site.
 
-	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
-diffs in the upstream version should usually be propagated to our version.
+Since time zone rules change frequently in some parts of the world,
+we should endeavor to update the data files before each PostgreSQL
+release.  The code need not be updated as often, but we must track
+changes that might affect interpretation of the data files.
 
-The data files under data/ are an exact copy of the latest data set from:
 
-	ftp://ftp.iana.org/tz/releases/tzdata*.tar.gz
+Time Zone data
+==============
 
-Since time zone rules change frequently in some parts of the world,
-we should endeavor to update the data files before each PostgreSQL
-release.
+The data files under data/ are an exact copy of the latest tzdata set,
+except that we omit some files that are not of interest for our purposes.
 
 While the files under data/ can just be duplicated when updating, manual
 effort is needed to update the time zone abbreviation lists under tznames/.
@@ -32,7 +30,14 @@
 use according to the data/ files.  Compare this to known_abbrevs.txt,
 which is the list that existed last time the tznames/ files were updated.
 Update tznames/ as seems appropriate, then replace known_abbrevs.txt
-in the same commit.
+in the same commit.  Usually, if a known abbreviation has changed meaning,
+the appropriate fix is to make it refer to a long-form zone name instead
+of a fixed GMT offset.
+
+The core regression test suite does some simple validation of the zone
+data and abbreviations data (notably by checking that the pg_timezone_names
+and pg_timezone_abbrevs views don't throw errors).  It's worth running it
+as a cross-check on proposed updates.
 
 When there has been a new release of Windows (probably including Service
 Packs), the list of matching timezones need to be updated. Run the
@@ -40,3 +45,67 @@
 release and apply any new timezones that it detects. Never remove any
 mappings in case they are removed in Windows, since we still need to
 match properly on the old version.
+
+
+Time Zone code
+==============
+
+The code in this directory is currently synced with tzcode release 2017b.
+There are many cosmetic (and not so cosmetic) differences from the
+original tzcode library, but diffs in the upstream version should usually
+be propagated to our version.  Here are some notes about that.
+
+For the most part we want to use the upstream code as-is, but there are
+several considerations preventing an exact match:
+
+* For readability/maintainability we reformat the code to match our own
+conventions; this includes pgindent'ing it and getting rid of upstream's
+overuse of "register" declarations.  (It used to include conversion of
+old-style function declarations to C89 style, but thank goodness they
+fixed that.)
+
+* We need the code to follow Postgres' portability conventions; this
+includes relying on configure's results rather than hand-hacked #defines,
+and not relying on <stdint.h> features that may not exist on old systems.
+(In particular this means using Postgres' definitions of the int32 and
+int64 typedefs, not int_fast32_t/int_fast64_t.)
+
+* Since Postgres is typically built on a system that has its own copy
+of the <time.h> functions, we must avoid conflicting with those.  This
+mandates renaming typedef time_t to pg_time_t, and similarly for most
+other exposed names.
+
+* We have exposed the tzload() and tzparse() internal functions, and
+slightly modified the API of the former, in part because it now relies
+on our own pg_open_tzfile() rather than opening files for itself.
+
+* tzparse() is adjusted to cache the result of loading the TZDEFRULES
+zone, so that that's not repeated more than once per process.
+
+* There's a fair amount of code we don't need and have removed,
+including all the nonstandard optional APIs.  We have also added
+a few functions of our own at the bottom of localtime.c.
+
+* In zic.c, we have added support for a -P (print_abbrevs) switch, which
+is used to create the "abbrevs.txt" summary of currently-in-use zone
+abbreviations that was described above.
+
+
+The most convenient way to compare a new tzcode release to our code is
+to first run the tzcode source files through a sed filter like this:
+
+    sed -r \
+        -e 's/^([ \t]*)\*\*([ \t])/\1 *\2/' \
+        -e 's/^([ \t]*)\*\*$/\1 */' \
+        -e 's|^\*/| */|' \
+        -e 's/\bregister[ \t]//g' \
+        -e 's/int_fast32_t/int32/g' \
+        -e 's/int_fast64_t/int64/g' \
+        -e 's/struct[ \t]+tm\b/struct pg_tm/g' \
+        -e 's/\btime_t\b/pg_time_t/g' \
+
+and then run them through pgindent.  (The first three sed patterns deal
+with conversion of their block comment style to something pgindent
+won't make a hash of; the remainder address other points noted above.)
+After that, the files can be diff'd directly against our corresponding
+files.
diff -Nru postgresql-9.5-9.5.2/src/timezone/scheck.c postgresql-9.5-9.5.8/src/timezone/scheck.c
--- postgresql-9.5-9.5.2/src/timezone/scheck.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/scheck.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * This file is in the public domain, so clarified as of
- * 2006-07-17 by Arthur David Olson.
- *
- * IDENTIFICATION
- *	  src/timezone/scheck.c
- */
-
-#include "postgres_fe.h"
-
-#include "private.h"
-
-
-const char *
-scheck(const char *string, const char *format)
-{
-	char	   *fbuf;
-	const char *fp;
-	char	   *tp;
-	int			c;
-	const char *result;
-	char		dummy;
-
-	result = "";
-	if (string == NULL || format == NULL)
-		return result;
-	fbuf = imalloc((int) (2 * strlen(format) + 4));
-	if (fbuf == NULL)
-		return result;
-	fp = format;
-	tp = fbuf;
-	while ((*tp++ = c = *fp++) != '\0')
-	{
-		if (c != '%')
-			continue;
-		if (*fp == '%')
-		{
-			*tp++ = *fp++;
-			continue;
-		}
-		*tp++ = '*';
-		if (*fp == '*')
-			++fp;
-		while (is_digit(*fp))
-			*tp++ = *fp++;
-		if (*fp == 'l' || *fp == 'h')
-			*tp++ = *fp++;
-		else if (*fp == '[')
-			do
-				*tp++ = *fp++;
-			while (*fp != '\0' && *fp != ']');
-		if ((*tp++ = *fp++) == '\0')
-			break;
-	}
-	*(tp - 1) = '%';
-	*tp++ = 'c';
-	*tp = '\0';
-	if (sscanf(string, fbuf, &dummy) != 1)
-		result = (char *) format;
-	ifree(fbuf);
-	return result;
-}
diff -Nru postgresql-9.5-9.5.2/src/timezone/strftime.c postgresql-9.5-9.5.8/src/timezone/strftime.c
--- postgresql-9.5-9.5.2/src/timezone/strftime.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/strftime.c	2017-08-07 21:13:41.000000000 +0000
@@ -1,18 +1,38 @@
+/* Convert a broken-down timestamp to a string. */
+
 /*
- * Copyright (c) 1989 The Regents of the University of California.
+ * Copyright 1989 The Regents of the University of California.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley. The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *	  notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *	  notice, this list of conditions and the following disclaimer in the
+ *	  documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *	  may be used to endorse or promote products derived from this software
+ *	  without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Based on the UCB version with the copyright notice appearing above.
+ *
+ * This is ANSIish only when "multibyte character == plain character".
  *
  * IDENTIFICATION
  *	  src/timezone/strftime.c
@@ -24,7 +44,6 @@
 #include <locale.h>
 
 #include "private.h"
-#include "tzfile.h"
 
 
 struct lc_time_T
@@ -92,8 +111,7 @@
 static char *_conv(int, const char *, char *, const char *);
 static char *_fmt(const char *, const struct pg_tm *, char *,
 	 const char *, int *);
-static char *_yconv(const int, const int, const int, const int,
-	   char *, const char *const);
+static char *_yconv(int, int, bool, bool, char *, const char *);
 
 #define IN_NONE 0
 #define IN_SOME 1
@@ -109,7 +127,7 @@
 	int			warn;
 
 	warn = IN_NONE;
-	p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn);
+	p = _fmt(format, t, s, s + maxsize, &warn);
 	if (p == s + maxsize)
 		return 0;
 	*p = '\0';
@@ -162,8 +180,8 @@
 					 * ...whereas now POSIX 1003.2 calls for something
 					 * completely different. (ado, 1993-05-24)
 					 */
-					pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 0,
-								pt, ptlim);
+					pt = _yconv(t->tm_year, TM_YEAR_BASE,
+								true, false, pt, ptlim);
 					continue;
 				case 'c':
 					{
@@ -224,7 +242,7 @@
 				case 'K':
 
 					/*
-					 * * After all this time, still unclaimed!
+					 * After all this time, still unclaimed!
 					 */
 					pt = _add("kitchen sink", pt, ptlim);
 					continue;
@@ -296,7 +314,7 @@
  * (01-53)."
  * (ado, 1993-05-24)
  *
- * From "http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html" by Markus Kuhn:
+ * From <http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html> by Markus Kuhn:
  * "Week 01 of a year is per definition the first week which has the
  * Thursday in this year, which is equivalent to the week which contains
  * the fourth day of January. In other words, the first week of a new year
@@ -367,11 +385,13 @@
 						else if (*format == 'g')
 						{
 							*warnp = IN_ALL;
-							pt = _yconv(year, base, 0, 1,
+							pt = _yconv(year, base,
+										false, true,
 										pt, ptlim);
 						}
 						else
-							pt = _yconv(year, base, 1, 1,
+							pt = _yconv(year, base,
+										true, true,
 										pt, ptlim);
 					}
 					continue;
@@ -409,11 +429,13 @@
 					continue;
 				case 'y':
 					*warnp = IN_ALL;
-					pt = _yconv(t->tm_year, TM_YEAR_BASE, 0, 1,
+					pt = _yconv(t->tm_year, TM_YEAR_BASE,
+								false, true,
 								pt, ptlim);
 					continue;
 				case 'Y':
-					pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 1,
+					pt = _yconv(t->tm_year, TM_YEAR_BASE,
+								true, true,
 								pt, ptlim);
 					continue;
 				case 'Z':
@@ -427,13 +449,20 @@
 					continue;
 				case 'z':
 					{
-						int			diff;
+						long		diff;
 						char const *sign;
+						bool		negative;
 
 						if (t->tm_isdst < 0)
 							continue;
 						diff = t->tm_gmtoff;
-						if (diff < 0)
+						negative = diff < 0;
+						if (diff == 0)
+						{
+							if (t->tm_zone != NULL)
+								negative = t->tm_zone[0] == '-';
+						}
+						if (negative)
 						{
 							sign = "-";
 							diff = -diff;
@@ -441,9 +470,10 @@
 						else
 							sign = "+";
 						pt = _add(sign, pt, ptlim);
-						diff /= 60;
-						pt = _conv((diff / 60) * 100 + diff % 60,
-								   "%04d", pt, ptlim);
+						diff /= SECSPERMIN;
+						diff = (diff / MINSPERHOUR) * 100 +
+							(diff % MINSPERHOUR);
+						pt = _conv(diff, "%04d", pt, ptlim);
 					}
 					continue;
 				case '+':
@@ -473,7 +503,7 @@
 {
 	char		buf[INT_STRLEN_MAXIMUM(int) +1];
 
-	(void) sprintf(buf, format, n);
+	sprintf(buf, format, n);
 	return _add(buf, pt, ptlim);
 }
 
@@ -493,13 +523,13 @@
  * with more only if necessary.
  */
 static char *
-_yconv(const int a, const int b, const int convert_top,
-	   const int convert_yy, char *pt, const char *const ptlim)
+_yconv(int a, int b, bool convert_top, bool convert_yy,
+	   char *pt, const char *ptlim)
 {
 	int			lead;
 	int			trail;
 
-#define DIVISOR		  100
+#define DIVISOR 100
 	trail = a % DIVISOR + b % DIVISOR;
 	lead = a / DIVISOR + b / DIVISOR + trail / DIVISOR;
 	trail %= DIVISOR;
diff -Nru postgresql-9.5-9.5.2/src/timezone/tzfile.h postgresql-9.5-9.5.8/src/timezone/tzfile.h
--- postgresql-9.5-9.5.2/src/timezone/tzfile.h	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tzfile.h	2017-08-07 21:13:41.000000000 +0000
@@ -33,8 +33,8 @@
 struct tzhead
 {
 	char		tzh_magic[4];	/* TZ_MAGIC */
-	char		tzh_version[1]; /* '\0' or '2' as of 2005 */
-	char		tzh_reserved[15];		/* reserved--must be zero */
+	char		tzh_version[1]; /* '\0' or '2' or '3' as of 2013 */
+	char		tzh_reserved[15];		/* reserved; must be zero */
 	char		tzh_ttisgmtcnt[4];		/* coded number of trans. time flags */
 	char		tzh_ttisstdcnt[4];		/* coded number of trans. time flags */
 	char		tzh_leapcnt[4]; /* coded number of leap seconds */
@@ -43,30 +43,29 @@
 	char		tzh_charcnt[4]; /* coded number of abbr. chars */
 };
 
-/*----------
+/*
  * . . .followed by. . .
  *
  *	tzh_timecnt (char [4])s		coded transition times a la time(2)
  *	tzh_timecnt (unsigned char)s	types of local time starting at above
  *	tzh_typecnt repetitions of
- *		one (char [4])		coded UTC offset in seconds
+ *		one (char [4])		coded UT offset in seconds
  *		one (unsigned char) used to set tm_isdst
  *		one (unsigned char) that's an abbreviation list index
  *	tzh_charcnt (char)s		'\0'-terminated zone abbreviations
  *	tzh_leapcnt repetitions of
  *		one (char [4])		coded leap second transition times
  *		one (char [4])		total correction after above
- *	tzh_ttisstdcnt (char)s		indexed by type; if TRUE, transition
- *					time is standard time, if FALSE,
+ *	tzh_ttisstdcnt (char)s		indexed by type; if 1, transition
+ *					time is standard time, if 0,
  *					transition time is wall clock time
  *					if absent, transition times are
  *					assumed to be wall clock time
- *	tzh_ttisgmtcnt (char)s		indexed by type; if TRUE, transition
- *					time is UTC, if FALSE,
+ *	tzh_ttisgmtcnt (char)s		indexed by type; if 1, transition
+ *					time is UT, if 0,
  *					transition time is local time
  *					if absent, transition times are
  *					assumed to be local time
- *----------
  */
 
 /*
@@ -77,6 +76,13 @@
  * instants after the last transition time stored in the file
  * (with nothing between the newlines if there is no POSIX representation for
  * such instants).
+ *
+ * If tz_version is '3' or greater, the above is extended as follows.
+ * First, the POSIX TZ string's hour offset may range from -167
+ * through 167 as compared to the POSIX-required 0 through 24.
+ * Second, its DST start time may be January 1 at 00:00 and its stop
+ * time December 31 at 24:00 plus the difference between DST and
+ * standard time, indicating DST all year.
  */
 
 /*
@@ -84,8 +90,9 @@
  * exceed any of the limits below.
  */
 
-#define TZ_MAX_TIMES	1200
+#define TZ_MAX_TIMES	2000
 
+/* This must be at least 17 for Europe/Samara and Europe/Vilnius.  */
 #define TZ_MAX_TYPES	256		/* Limited by what (unsigned char)'s can hold */
 
 #define TZ_MAX_CHARS	50		/* Maximum number of abbreviation characters */
@@ -93,56 +100,4 @@
 
 #define TZ_MAX_LEAPS	50		/* Maximum number of leap second corrections */
 
-#define SECSPERMIN	60
-#define MINSPERHOUR 60
-#define HOURSPERDAY 24
-#define DAYSPERWEEK 7
-#define DAYSPERNYEAR	365
-#define DAYSPERLYEAR	366
-#define SECSPERHOUR (SECSPERMIN * MINSPERHOUR)
-#define SECSPERDAY	((long) SECSPERHOUR * HOURSPERDAY)
-#define MONSPERYEAR 12
-
-#define TM_SUNDAY	0
-#define TM_MONDAY	1
-#define TM_TUESDAY	2
-#define TM_WEDNESDAY	3
-#define TM_THURSDAY 4
-#define TM_FRIDAY	5
-#define TM_SATURDAY 6
-
-#define TM_JANUARY	0
-#define TM_FEBRUARY 1
-#define TM_MARCH	2
-#define TM_APRIL	3
-#define TM_MAY		4
-#define TM_JUNE		5
-#define TM_JULY		6
-#define TM_AUGUST	7
-#define TM_SEPTEMBER	8
-#define TM_OCTOBER	9
-#define TM_NOVEMBER 10
-#define TM_DECEMBER 11
-
-#define TM_YEAR_BASE	1900
-
-#define EPOCH_YEAR	1970
-#define EPOCH_WDAY	TM_THURSDAY
-
-#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
-
-/*
- * Since everything in isleap is modulo 400 (or a factor of 400), we know that
- *	  isleap(y) == isleap(y % 400)
- * and so
- *	  isleap(a + b) == isleap((a + b) % 400)
- * or
- *	  isleap(a + b) == isleap(a % 400 + b % 400)
- * This is true even if % means modulo rather than Fortran remainder
- * (which is allowed by C89 but not C99).
- * We use this to avoid addition overflow problems.
- */
-
-#define isleap_sum(a, b)	  isleap((a) % 400 + (b) % 400)
-
 #endif   /* !defined TZFILE_H */
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Africa.txt postgresql-9.5-9.5.8/src/timezone/tznames/Africa.txt
--- postgresql-9.5-9.5.2/src/timezone/tznames/Africa.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Africa.txt	2017-08-07 21:13:41.000000000 +0000
@@ -144,7 +144,7 @@
                  #     (Europe/London)
 # CONFLICT! SAST is not unique
 # Other timezones:
-#  - SAST South Australian Standard Time (not in zic)
+#  - SAST South Australian Standard Time (not in IANA database)
 SAST     7200    # South Africa Standard Time
                  #     (Africa/Johannesburg)
 WAST     7200 D  # West Africa Summer Time
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/America.txt postgresql-9.5-9.5.8/src/timezone/tznames/America.txt
--- postgresql-9.5-9.5.2/src/timezone/tznames/America.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/America.txt	2017-08-07 21:13:41.000000000 +0000
@@ -9,13 +9,11 @@
 
 # Acre time is sometimes called Acre Standard Time (AST) which leads to a
 # conflict with AST (see below at AST)
-ACT    -18000    # Acre Time
-                 #     (America/Eirunepe)
-                 #     (America/Rio_Branco)
+ACT    -18000    # Acre Time (obsolete)
 # CONFLICT! ACST is not unique
 # Other timezones:
 #  - ACST: Australian Central Standard Time
-ACST   -14400 D  # Acre Summer Time (obsolete, not in zic)
+ACST   -14400 D  # Acre Summer Time (obsolete, not in IANA database)
 ADT    -10800 D  # Atlantic Daylight Time
                  #     (America/Glace_Bay)
                  #     (America/Goose_Bay)
@@ -35,30 +33,13 @@
 # CONFLICT! AMST is not unique
 # Other timezones:
 #  - AMST: Armenia Summer Time (Asia)
-AMST   -10800 D  # Amazon Summer Time
-                 #     (America/Campo_Grande)
-                 #     (America/Cuiaba)
+AMST   -10800 D  # Amazon Summer Time (obsolete)
 # CONFLICT! AMT is not unique
 # Other timezones:
 #  - AMT: Armenia Time (Asia)
-AMT    -14400    # Amazon Time
-                 #     (America/Boa_Vista)
-                 #     (America/Campo_Grande)
-                 #     (America/Cuiaba)
-                 #     (America/Manaus)
-                 #     (America/Porto_Velho)
-ART    America/Argentina/Buenos_Aires  # Argentina Time
-                 #     (America/Argentina/Buenos_Aires)
-                 #     (America/Argentina/Cordoba)
-                 #     (America/Argentina/Tucuman)
-                 #     (America/Argentina/La_Rioja)
-                 #     (America/Argentina/San_Juan)
-                 #     (America/Argentina/Jujuy)
-                 #     (America/Argentina/Catamarca)
-                 #     (America/Argentina/Mendoza)
-                 #     (America/Argentina/Rio_Gallegos)
-                 #     (America/Argentina/Ushuaia)
-ARST    America/Argentina/Buenos_Aires  # Argentina Summer Time
+AMT    -14400    # Amazon Time (obsolete)
+ART    America/Argentina/Buenos_Aires  # Argentina Time (obsolete)
+ARST    America/Argentina/Buenos_Aires  # Argentina Summer Time (obsolete)
 # CONFLICT! AST is not unique
 # Other timezones:
 #  - AST: Arabic Standard Time (Asia)
@@ -90,19 +71,10 @@
                  #     (America/Thule)
                  #     (America/Tortola)
                  #     (Atlantic/Bermuda)
-BOT    -14400    # Bolivia Time
-                 #     (America/La_Paz)
-BRA    -10800    # Brazil Time (not in zic)
-BRST    -7200 D  # Brasil Summer Time
-                 #     (America/Sao_Paulo)
-BRT    -10800    # Brasil Time
-                 #     (America/Araguaina)
-                 #     (America/Bahia)
-                 #     (America/Belem)
-                 #     (America/Fortaleza)
-                 #     (America/Maceio)
-                 #     (America/Recife)
-                 #     (America/Sao_Paulo)
+BOT    -14400    # Bolivia Time (obsolete)
+BRA    -10800    # Brazil Time (not in IANA database)
+BRST    -7200 D  # Brasil Summer Time (obsolete)
+BRT    -10800    # Brasil Time (obsolete)
 # CONFLICT! CDT is not unique
 # Other timezones:
 #  - CDT: Central Daylight Time (America)
@@ -125,13 +97,9 @@
                  #     (America/Rainy_River)
                  #     (America/Rankin_Inlet)
                  #     (America/Winnipeg)
-CLST   -10800 D  # Chile Summer Time
-                 #     (America/Santiago)
-                 #     (Antarctica/Palmer)
-CLT    America/Santiago  # Chile Time
-                 #     (America/Santiago)
-                 #     (Antarctica/Palmer)
-COT    -18000    # Columbia Time (not in zic)
+CLST   -10800 D  # Chile Summer Time (obsolete)
+CLT    America/Santiago  # Chile Time (obsolete)
+COT    -18000    # Columbia Time (obsolete)
 # CONFLICT! CST is not unique
 # Other timezones:
 #  - CST: Central Standard Time (Australia)
@@ -156,9 +124,7 @@
                  #     (America/Regina)
                  #     (America/Swift_Current)
                  #     (America/Winnipeg)
-ECT    -18000    # Ecuador Time
-                 # Eastern Caribbean Time
-                 #     (America/Guayaquil)
+ECT    -18000    # Ecuador Time (obsolete)
 EDT    -14400 D  # Eastern Daylight Saving Time
                  #     (America/Detroit)
                  #     (America/Grand_Turk)
@@ -176,10 +142,8 @@
                  #     (America/Pangnirtung)
                  #     (America/Thunder_Bay)
                  #     (America/Toronto)
-EGST        0 D  # East Greenland Summer Time
-                 #     (America/Scoresbysund)
-EGT     -3600    # East Greenland Time (Svalbard & Jan Mayen)
-                 #     (America/Scoresbysund)
+EGST        0 D  # East Greenland Summer Time (obsolete)
+EGT     -3600    # East Greenland Time (Svalbard & Jan Mayen) (obsolete)
 # CONFLICT! EST is not unique
 # Other timezones:
 #  - EST: Eastern Standard Time (Australia)
@@ -205,12 +169,9 @@
                  #     (America/Pangnirtung)
                  #     (America/Thunder_Bay)
                  #     (America/Toronto)
-FNT     -7200    # Fernando de Noronha Time
-                 #     (America/Noronha)
-FNST    -3600 D  # Fernando de Noronha Summer Time (not in zic)
-                 #     (America/Noronha)
-GFT    -10800    # French Guiana Time
-                 #     (America/Cayenne)
+FNT     -7200    # Fernando de Noronha Time (obsolete)
+FNST    -3600 D  # Fernando de Noronha Summer Time (obsolete)
+GFT    -10800    # French Guiana Time (obsolete)
 GMT         0    # Greenwich Mean Time
                  #     (Africa/Abidjan)
                  #     (Africa/Bamako)
@@ -229,8 +190,7 @@
                  #     (Etc/GMT)
                  #     (Europe/Dublin)
                  #     (Europe/London)
-GYT    America/Guyana  # Guyana Time
-                 #     (America/Guyana)
+GYT    America/Guyana  # Guyana Time (obsolete)
 HADT   -32400 D  # Hawaii-Aleutian Daylight Time (obsolete abbreviation)
                  #     (America/Adak)
 HAST   -36000    # Hawaii-Aleutian Standard Time (obsolete abbreviation)
@@ -265,7 +225,7 @@
 # CONFLICT! NFT is not unique
 # Other timezones:
 #  - NFT: Norfolk Time (Pacific)
-NFT    -12600    # Newfoundland Time (not in zic)
+NFT    -12600    # Newfoundland Time (not in IANA database)
 NST    -12600    # Newfoundland Standard Time
                  #     (America/St_Johns)
 PDT    -25200 D  # Pacific Daylight Time
@@ -274,11 +234,9 @@
                  #     (America/Tijuana)
                  #     (America/Vancouver)
                  #     (America/Whitehorse)
-PET    -18000    # Peru Time (not in zic)
-PMDT    -7200 D  # Pierre & Miquelon Daylight Time
-                 #     (America/Miquelon)
-PMST   -10800    # Pierre & Miquelon Standard Time
-                 #     (America/Miquelon)
+PET    -18000    # Peru Time (obsolete)
+PMDT    -7200 D  # Pierre & Miquelon Daylight Time (obsolete)
+PMST   -10800    # Pierre & Miquelon Standard Time (obsolete)
 PST    -28800    # Pacific Standard Time
                  #     (America/Dawson)
                  #     (America/Los_Angeles)
@@ -286,19 +244,11 @@
                  #     (America/Vancouver)
                  #     (America/Whitehorse)
                  #     (Pacific/Pitcairn)
-PYST   -10800 D  # Paraguay Summer Time
-                 #     (America/Asuncion)
-PYT    America/Asuncion  # Paraguay Time
-                 #     (America/Asuncion)
-SRT    America/Paramaribo  # Suriname Time
-                 #     (America/Paramaribo)
+PYST   -10800 D  # Paraguay Summer Time (obsolete)
+PYT    America/Asuncion  # Paraguay Time (obsolete)
+SRT    America/Paramaribo  # Suriname Time (obsolete)
 UYST    -7200 D  # Uruguay Summer Time (obsolete)
-                 #     (America/Montevideo)
-UYT    -10800    # Uruguay Time
-                 #     (America/Montevideo)
-VET    America/Caracas  # Venezuela Time
-                 #     (America/Caracas)
-WGST    -7200 D  # Western Greenland Summer Time
-                 #     (America/Godthab)
-WGT    -10800    # West Greenland Time
-                 #     (America/Godthab)
+UYT    -10800    # Uruguay Time (obsolete)
+VET    America/Caracas  # Venezuela Time (obsolete)
+WGST    -7200 D  # Western Greenland Summer Time (obsolete)
+WGT    -10800    # West Greenland Time (obsolete)
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Antarctica.txt postgresql-9.5-9.5.8/src/timezone/tznames/Antarctica.txt
--- postgresql-9.5-9.5.2/src/timezone/tznames/Antarctica.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Antarctica.txt	2017-08-07 21:13:41.000000000 +0000
@@ -10,29 +10,18 @@
 AWST    28800    # Australian Western Standard Time
                  #     (Antarctica/Casey)
                  #     (Australia/Perth)
-CLST   -10800 D  # Chile Summer Time
-                 #     (America/Santiago)
-                 #     (Antarctica/Palmer)
-CLT    America/Santiago  # Chile Time
-                 #     (America/Santiago)
-                 #     (Antarctica/Palmer)
-DAVT    Antarctica/Davis  # Davis Time (Antarctica)
-                 #     (Antarctica/Davis)
-DDUT    36000    # Dumont-d`Urville Time (Antarctica)
-                 #     (Antarctica/DumontDUrville)
-MAWT    Antarctica/Mawson  # Mawson Time (Antarctica)
-                 #     (Antarctica/Mawson)
-MIST    39600    # Macquarie Island Time
-                 #     (Antarctica/Macquarie)
+CLST   -10800 D  # Chile Summer Time (obsolete)
+CLT    America/Santiago  # Chile Time (obsolete)
+DAVT    Antarctica/Davis  # Davis Time (Antarctica) (obsolete)
+DDUT    36000    # Dumont-d`Urville Time (Antarctica) (obsolete)
+MAWT    Antarctica/Mawson  # Mawson Time (Antarctica) (obsolete)
+MIST    39600    # Macquarie Island Time (obsolete)
 NZDT    46800 D  # New Zealand Daylight Time
                  #     (Antarctica/McMurdo)
                  #     (Pacific/Auckland)
 NZST    43200    # New Zealand Standard Time
                  #     (Antarctica/McMurdo)
                  #     (Pacific/Auckland)
-ROTT   -10800    # Rothera Time
-                 #     (Antarctica/Rothera)
-SYOT    10800    # Syowa Time
-                 #     (Antarctica/Syowa)
-VOST    21600    # Vostok time
-                 #     (Antarctica/Vostok)
+ROTT   -10800    # Rothera Time (obsolete)
+SYOT    10800    # Syowa Time (obsolete)
+VOST    21600    # Vostok time (obsolete)
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Asia.txt postgresql-9.5-9.5.8/src/timezone/tznames/Asia.txt
--- postgresql-9.5-9.5.2/src/timezone/tznames/Asia.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Asia.txt	2017-08-07 21:13:41.000000000 +0000
@@ -7,27 +7,21 @@
 # src/timezone/tznames/Asia.txt
 #
 
-AFT     16200    # Afghanistan Time
-                 #     (Asia/Kabul)
+AFT     16200    # Afghanistan Time (obsolete)
 ALMST   25200 D  # Alma-Ata Summer Time (obsolete)
-ALMT    21600    # Alma-Ata Time
-                 #     (Asia/Almaty)
+ALMT    21600    # Alma-Ata Time (obsolete)
 # CONFLICT! AMST is not unique
 # Other timezones:
 #  - AMST: Amazon Summer Time (America)
-AMST    Asia/Yerevan  # Armenia Summer Time
-                 #     (Asia/Yerevan)
+AMST    Asia/Yerevan  # Armenia Summer Time (obsolete)
 # CONFLICT! AMT is not unique
 # Other timezones:
 #  - AMT: Amazon Time (America)
-AMT     Asia/Yerevan  # Armenia Time
-                 #     (Asia/Yerevan)
+AMT     Asia/Yerevan  # Armenia Time (obsolete)
 ANAST   Asia/Anadyr  # Anadyr Summer Time (obsolete)
-ANAT    Asia/Anadyr  # Anadyr Time
-                 #     (Asia/Anadyr)
+ANAT    Asia/Anadyr  # Anadyr Time (obsolete)
 AQTST   Asia/Aqtau  # Aqtau Summer Time (obsolete)
-AQTT    Asia/Aqtau  # Aqtau Time
-                 #     (Asia/Aqtau)
+AQTT    Asia/Aqtau  # Aqtau Time (obsolete)
 # CONFLICT! AST is not unique
 # Other timezones:
 #  - AST: Atlantic Standard Time (America)
@@ -36,29 +30,16 @@
 #  - AST: Antigua Standard Time (America) same offset as Atlantic Standard Time
 #  - AST: Antilles Standard Time (America) same offset as Atlantic Standard Time
 #  - AST: Al Manamah Standard Time (Asia) same offset as Arabia Standard Time
-AST     10800    # Arabia Standard Time
-                 #     (Asia/Aden)
-                 #     (Asia/Baghdad)
-                 #     (Asia/Bahrain)
-                 #     (Asia/Kuwait)
-                 #     (Asia/Qatar)
-                 #     (Asia/Riyadh)
+AST     10800    # Arabia Standard Time (obsolete)
 AZST    Asia/Baku  # Azerbaijan Summer Time (obsolete)
-                 #     (Asia/Baku)
-AZT     Asia/Baku  # Azerbaijan Time
-                 #     (Asia/Baku)
-BDT     21600    # Bangladesh Time
-                 #     (Asia/Dhaka)
-BNT     28800    # Brunei Darussalam Time
-                 #     (Asia/Brunei)
-BORT    28800    # Borneo Time (Indonesia) (not in zic)
-BTT     21600    # Bhutan Time
-                 #     (Asia/Thimphu)
-CCT     28800    # China Coastal Time (not in zic)
-CHOST   Asia/Choibalsan  # Choibalsan Summer Time
-                 #     (Asia/Choibalsan)
-CHOT    Asia/Choibalsan  # Choibalsan Time
-                 #     (Asia/Choibalsan)
+AZT     Asia/Baku  # Azerbaijan Time (obsolete)
+BDT     21600    # Bangladesh Time (obsolete)
+BNT     28800    # Brunei Darussalam Time (obsolete)
+BORT    28800    # Borneo Time (Indonesia) (not in IANA database)
+BTT     21600    # Bhutan Time (obsolete)
+CCT     28800    # China Coastal Time (not in IANA database)
+CHOST   Asia/Choibalsan  # Choibalsan Summer Time (obsolete)
+CHOT    Asia/Choibalsan  # Choibalsan Time (obsolete)
 CIT     28800    # Central Indonesia Time (obsolete, WITA is now preferred)
 # CONFLICT! CST is not unique
 # Other timezones:
@@ -118,34 +99,23 @@
                  #     (Europe/Zaporozhye)
 EIT     32400    # East Indonesia Time (obsolete, WIT is now preferred)
 GEST    Asia/Tbilisi  # Georgia Summer Time (obsolete)
-GET     Asia/Tbilisi  # Georgia Time
-                 #     (Asia/Tbilisi)
+GET     Asia/Tbilisi  # Georgia Time (obsolete)
 # CONFLICT! GST is not unique
 # Other timezones:
 # - GST: South Georgia Time (Atlantic)
-GST     14400    # Gulf Standard Time
-                 #     (Asia/Dubai)
-                 #     (Asia/Muscat)
-HKT     28800    # Hong Kong Time (not in zic)
-HOVST   28800 D  # Hovd Summer Time
-                 #     (Asia/Hovd)
-HOVT    Asia/Hovd  # Hovd Time
-                 #     (Asia/Hovd)
-ICT     25200    # Indochina Time
-                 #     (Asia/Bangkok)
-                 #     (Asia/Phnom_Penh)
-                 #     (Asia/Saigon)
-                 #     (Asia/Vientiane)
+GST     14400    # Gulf Standard Time (obsolete)
+HKT     28800    # Hong Kong Time
+                 #     (Asia/Hong_Kong)
+HOVST   28800 D  # Hovd Summer Time (obsolete)
+HOVT    Asia/Hovd  # Hovd Time (obsolete)
+ICT     25200    # Indochina Time (obsolete)
 IDT     10800 D  # Israel Daylight Time
                  #     (Asia/Jerusalem)
-IRDT    Asia/Tehran  # Iran Daylight Time
-                 #     (Asia/Tehran)
+IRDT    Asia/Tehran  # Iran Daylight Time (obsolete)
 IRKST   Asia/Irkutsk  # Irkutsk Summer Time (obsolete)
-IRKT    Asia/Irkutsk  # Irkutsk Time
-                 #     (Asia/Irkutsk)
-IRST    Asia/Tehran  # Iran Standard Time
-                 #     (Asia/Tehran)
-IRT     12600    # Iran Time (not in zic)
+IRKT    Asia/Irkutsk  # Irkutsk Time (obsolete)
+IRST    Asia/Tehran  # Iran Standard Time (obsolete)
+IRT     12600    # Iran Time (not in IANA database)
 # CONFLICT! IST is not unique
 # Other timezones:
 # - IST: Irish Summer Time (Europe)
@@ -158,76 +128,50 @@
 # - IST: Indian Standard Time (Asia)
 IST      7200    # Israel Standard Time
                  #     (Asia/Jerusalem)
-JAYT    32400    # Jayapura Time (Indonesia) (not in zic)
+JAYT    32400    # Jayapura Time (Indonesia) (not in IANA database)
 JST     32400    # Japan Standard Time
                  #     (Asia/Tokyo)
-KDT     36000 D  # Korean Daylight Time (not in zic)
+KDT     36000 D  # Korean Daylight Time (not in IANA database)
 KGST    21600 D  # Kyrgyzstan Summer Time (obsolete)
-KGT     Asia/Bishkek  # Kyrgyzstan Time
-                 #     (Asia/Bishkek)
+KGT     Asia/Bishkek  # Kyrgyzstan Time (obsolete)
 KRAST   Asia/Krasnoyarsk  # Krasnoyarsk Summer Time (obsolete)
-KRAT    Asia/Krasnoyarsk  # Krasnoyarsk Time
-                 #     (Asia/Krasnoyarsk)
+KRAT    Asia/Krasnoyarsk  # Krasnoyarsk Time (obsolete)
 KST     Asia/Pyongyang    # Korean Standard Time
                  #     (Asia/Pyongyang)
 KST     32400    # Korean Standard Time
                  #     (Asia/Seoul)
 LKT     Asia/Colombo  # Lanka Time (obsolete)
 MAGST   Asia/Magadan  # Magadan Summer Time (obsolete)
-MAGT    Asia/Magadan  # Magadan Time
-                 #     (Asia/Magadan)
-MMT     23400    # Myanmar Time
-                 #     (Asia/Rangoon)
-MYT     28800    # Malaysia Time
-                 #     (Asia/Kuala_Lumpur)
-                 #     (Asia/Kuching)
+MAGT    Asia/Magadan  # Magadan Time (obsolete)
+MMT     23400    # Myanmar Time (obsolete)
+MYT     28800    # Malaysia Time (obsolete)
 NOVST   Asia/Novosibirsk  # Novosibirsk Summer Time (obsolete)
-NOVT    Asia/Novosibirsk  # Novosibirsk Time
-                 #     (Asia/Novosibirsk)
-NPT     20700    # Nepal Time
-                 #     (Asia/Katmandu)
+NOVT    Asia/Novosibirsk  # Novosibirsk Time (obsolete)
+NPT     20700    # Nepal Time (obsolete)
 OMSST   Asia/Omsk  # Omsk Summer Time (obsolete)
-OMST    Asia/Omsk  # Omsk Time
-                 #     (Asia/Omsk)
-ORAT    Asia/Oral  # Oral Time
-                 #     (Asia/Oral)
+OMST    Asia/Omsk  # Omsk Time (obsolete)
+ORAT    Asia/Oral  # Oral Time (obsolete)
 PETST   Asia/Kamchatka  # Petropavlovsk-Kamchatski Summer Time (obsolete)
-PETT    Asia/Kamchatka  # Petropavlovsk-Kamchatski Time
-                 #     (Asia/Kamchatka)
-PHT     28800    # Philippine Time
-                 #     (Asia/Manila)
+PETT    Asia/Kamchatka  # Petropavlovsk-Kamchatski Time (obsolete)
+PHT     28800    # Philippine Time (obsolete)
 PKT     18000    # Pakistan Time
                  #     (Asia/Karachi)
 PKST    21600 D  # Pakistan Summer Time
                  #     (Asia/Karachi)
-QYZT    21600    # Kizilorda Time
-                 #     (Asia/Qyzylorda)
+QYZT    21600    # Kizilorda Time (obsolete)
 SAKST   Asia/Sakhalin  # Sakhalin Summer Time (obsolete)
-SAKT    Asia/Sakhalin  # Sakhalin Time
-                 #     (Asia/Sakhalin)
-SGT     Asia/Singapore  # Singapore Time
-                 #     (Asia/Singapore)
-SRET    39600    # Srednekolymsk Time
-                 #     (Asia/Srednekolymsk)
-TJT     18000    # Tajikistan Time
-                 #     (Asia/Dushanbe)
-TLT     32400    # East Timor Time
-                 #     (Asia/Dili)
-TMT     Asia/Ashgabat  # Turkmenistan Time
-                 #     (Asia/Ashgabat)
-ULAST   32400 D  # Ulan Bator Summer Time
-                 #     (Asia/Ulaanbaatar)
-ULAT    Asia/Ulaanbaatar  # Ulan Bator Time
-                 #     (Asia/Ulaanbaatar)
-UZST    21600 D  # Uzbekistan Summer Time
-                 #     (Asia/Samarkand)
-                 #     (Asia/Tashkent)
-UZT     18000    # Uzbekistan Time
-                 #     (Asia/Samarkand)
-                 #     (Asia/Tashkent)
+SAKT    Asia/Sakhalin  # Sakhalin Time (obsolete)
+SGT     Asia/Singapore  # Singapore Time (obsolete)
+SRET    39600    # Srednekolymsk Time (obsolete)
+TJT     18000    # Tajikistan Time (obsolete)
+TLT     32400    # East Timor Time (obsolete)
+TMT     Asia/Ashgabat  # Turkmenistan Time (obsolete)
+ULAST   32400 D  # Ulan Bator Summer Time (obsolete)
+ULAT    Asia/Ulaanbaatar  # Ulan Bator Time (obsolete)
+UZST    21600 D  # Uzbekistan Summer Time (obsolete)
+UZT     18000    # Uzbekistan Time (obsolete)
 VLAST   Asia/Vladivostok  # Vladivostok Summer Time (obsolete)
-VLAT    Asia/Vladivostok  # Vladivostok Time
-                 #     (Asia/Vladivostok)
+VLAT    Asia/Vladivostok  # Vladivostok Time (obsolete)
 WIB     25200    # Waktu Indonesia Barat
                  #     (Asia/Jakarta)
                  #     (Asia/Pontianak)
@@ -235,11 +179,8 @@
                  #     (Asia/Jayapura)
 WITA    28800    # Waktu Indonesia Tengah
                  #     (Asia/Makassar)
-XJT     21600    # Xinjiang Time
-                 #     (Asia/Urumqi)
+XJT     21600    # Xinjiang Time (obsolete)
 YAKST   Asia/Yakutsk  # Yakutsk Summer Time (obsolete)
-YAKT    Asia/Yakutsk  # Yakutsk Time
-                 #     (Asia/Yakutsk)
+YAKT    Asia/Yakutsk  # Yakutsk Time (obsolete)
 YEKST   21600 D  # Yekaterinburg Summer Time (obsolete)
-YEKT    Asia/Yekaterinburg  # Yekaterinburg Time
-                 #     (Asia/Yekaterinburg)
+YEKT    Asia/Yekaterinburg  # Yekaterinburg Time (obsolete)
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Atlantic.txt postgresql-9.5-9.5.8/src/timezone/tznames/Atlantic.txt
--- postgresql-9.5-9.5.2/src/timezone/tznames/Atlantic.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Atlantic.txt	2017-08-07 21:13:41.000000000 +0000
@@ -44,14 +44,10 @@
                  #     (America/Thule)
                  #     (America/Tortola)
                  #     (Atlantic/Bermuda)
-AZOST       0 D  # Azores Summer Time
-                 #     (Atlantic/Azores)
-AZOT    -3600    # Azores Time
-                 #     (Atlantic/Azores)
-CVT     Atlantic/Cape_Verde  # Cape Verde Time
-                 #     (Atlantic/Cape_Verde)
-FKST    Atlantic/Stanley  # Falkland Islands Summer/Standard Time
-                 #     (Atlantic/Stanley)
+AZOST       0 D  # Azores Summer Time (obsolete)
+AZOT    -3600    # Azores Time (obsolete)
+CVT     Atlantic/Cape_Verde  # Cape Verde Time (obsolete)
+FKST    Atlantic/Stanley  # Falkland Islands Summer/Standard Time (obsolete)
 FKT     Atlantic/Stanley  # Falkland Islands Time (obsolete)
 GMT         0    # Greenwich Mean Time
                  #     (Africa/Abidjan)
@@ -74,8 +70,7 @@
 # CONFLICT! GST is not unique
 # Other timezones:
 # - GST: Gulf Standard Time (Asia)
-GST     -7200    # South Georgia Time (Atlantic)
-                 #     (Atlantic/South_Georgia)
+GST     -7200    # South Georgia Time (Atlantic) (obsolete)
 WEST     3600 D  # Western Europe Summer Time
                  #     (Atlantic/Canary)
                  #     (Atlantic/Faeroe)
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Australia postgresql-9.5-9.5.8/src/timezone/tznames/Australia
--- postgresql-9.5-9.5.2/src/timezone/tznames/Australia	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Australia	2017-08-07 21:13:41.000000000 +0000
@@ -19,9 +19,9 @@
 # in case of a conflict.
 @OVERRIDE
 
-CST     34200    # Central Standard Time (not in zic)
-EAST    36000    # East Australian Standard Time (not in zic)
-EST     36000    # Eastern Standard Time (not in zic)
-SAST    34200    # South Australian Standard Time (not in zic)
-SAT     34200    # South Australian Standard Time (not in zic)
-WST     28800    # Western Standard Time (not in zic)
+CST     34200    # Central Standard Time (not in IANA database)
+EAST    36000    # East Australian Standard Time (not in IANA database)
+EST     36000    # Eastern Standard Time (not in IANA database)
+SAST    34200    # South Australian Standard Time (not in IANA database)
+SAT     34200    # South Australian Standard Time (not in IANA database)
+WST     28800    # Western Standard Time (not in IANA database)
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Australia.txt postgresql-9.5-9.5.8/src/timezone/tznames/Australia.txt
--- postgresql-9.5-9.5.2/src/timezone/tznames/Australia.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Australia.txt	2017-08-07 21:13:41.000000000 +0000
@@ -7,7 +7,7 @@
 # src/timezone/tznames/Australia.txt
 #
 
-ACSST   37800 D  # Central Australia (not in zic)
+ACSST   37800 D  # Central Australia (not in IANA database)
 ACDT    37800 D  # Australian Central Daylight Time
                  #     (Australia/Adelaide)
                  #     (Australia/Broken_Hill)
@@ -16,9 +16,8 @@
                  #     (Australia/Adelaide)
                  #     (Australia/Broken_Hill)
                  #     (Australia/Darwin)
-ACWST   31500    # Australian Central Western Standard Time
-                 #     (Australia/Eucla)
-AESST   39600 D  # Australia Eastern Summer Standard Time (not in zic)
+ACWST   31500    # Australian Central Western Standard Time (obsolete)
+AESST   39600 D  # Australia Eastern Summer Standard Time (not in IANA database)
 AEDT    39600 D  # Australian Eastern Daylight Time
                  #     (Australia/Brisbane)
                  #     (Australia/Currie)
@@ -33,42 +32,40 @@
                  #     (Australia/Lindeman)
                  #     (Australia/Melbourne)
                  #     (Australia/Sydney)
-AWSST   32400 D  # Australia Western Summer Standard Time (not in zic)
+AWSST   32400 D  # Australia Western Summer Standard Time (not in IANA database)
 AWST    28800    # Australian Western Standard Time
                  #     (Australia/Perth)
-CADT    37800 D  # Central Australia Daylight-Saving Time (not in zic)
-CAST    34200    # Central Australia Standard Time (not in zic)
+CADT    37800 D  # Central Australia Daylight-Saving Time (not in IANA database)
+CAST    34200    # Central Australia Standard Time (not in IANA database)
 # CONFLICT! CST is not unique
 # Other timezones:
 #  - CST: Central Standard Time (America)
 #  - CST: China Standard Time (Asia)
 #  - CST: Cuba Central Standard Time (America)
-CST     34200    # Central Standard Time (not in zic)
-CWST    31500    # Central Western Standard Time (not in zic)
+CST     34200    # Central Standard Time (not in IANA database)
+CWST    31500    # Central Western Standard Time (not in IANA database)
 # CONFLICT! EAST is not unique
 # Other timezones:
 #  - EAST: Easter Island Time (Chile) (Pacific)
-EAST    36000    # East Australian Standard Time (not in zic)
+EAST    36000    # East Australian Standard Time (not in IANA database)
 # CONFLICT! EST is not unique
 # Other timezones:
 #  - EST: Eastern Standard Time (America)
-EST     36000    # Eastern Standard Time (not in zic)
-LHDT    Australia/Lord_Howe  # Lord Howe Daylight Time
-                 #     (Australia/Lord_Howe)
-LHST    37800    # Lord Howe Standard Time
-                 #     (Australia/Lord_Howe)
-LIGT    36000    # Melbourne, Australia (not in zic)
-NZT     43200    # New Zealand Time (not in zic)
-SADT    37800 D  # South Australian Daylight-Saving Time (not in zic)
+EST     36000    # Eastern Standard Time (not in IANA database)
+LHDT    Australia/Lord_Howe  # Lord Howe Daylight Time (obsolete)
+LHST    37800    # Lord Howe Standard Time (obsolete)
+LIGT    36000    # Melbourne, Australia (not in IANA database)
+NZT     43200    # New Zealand Time (not in IANA database)
+SADT    37800 D  # South Australian Daylight-Saving Time (not in IANA database)
 # CONFLICT! SAST is not unique
 # Other timezones:
 #  - SAST South Africa Standard Time
-SAST    34200    # South Australian Standard Time (not in zic)
-SAT     34200    # South Australian Standard Time (not in zic)
-WADT    28800 D  # West Australian Daylight-Saving Time (not in zic)
-WAST    25200    # West Australian Standard Time (not in zic)
-WDT     32400 D  # West Australian Daylight-Saving Time (not in zic)
+SAST    34200    # South Australian Standard Time (not in IANA database)
+SAT     34200    # South Australian Standard Time (not in IANA database)
+WADT    28800 D  # West Australian Daylight-Saving Time (not in IANA database)
+WAST    25200    # West Australian Standard Time (not in IANA database)
+WDT     32400 D  # West Australian Daylight-Saving Time (not in IANA database)
 # CONFLICT! WST is not unique
 # Other timezones:
 #  - WST: West Samoa Time
-WST     28800    # Western Standard Time (not in zic)
+WST     28800    # Western Standard Time (not in IANA database)
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Default postgresql-9.5-9.5.8/src/timezone/tznames/Default
--- postgresql-9.5-9.5.2/src/timezone/tznames/Default	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Default	2017-08-07 21:13:41.000000000 +0000
@@ -41,9 +41,7 @@
 
 # Acre time is sometimes called Acre Standard Time (AST) which leads to a
 # conflict with AST (see below at AST)
-ACT    -18000    # Acre Time
-                 #     (America/Eirunepe)
-                 #     (America/Rio_Branco)
+ACT    -18000    # Acre Time (obsolete)
 AKDT   -28800 D  # Alaska Daylight Time
                  #     (America/Anchorage)
                  #     (America/Juneau)
@@ -54,32 +52,13 @@
                  #     (America/Juneau)
                  #     (America/Nome)
                  #     (America/Yakutat)
-ART    America/Argentina/Buenos_Aires  # Argentina Time
-                 #     (America/Argentina/Buenos_Aires)
-                 #     (America/Argentina/Cordoba)
-                 #     (America/Argentina/Tucuman)
-                 #     (America/Argentina/La_Rioja)
-                 #     (America/Argentina/San_Juan)
-                 #     (America/Argentina/Jujuy)
-                 #     (America/Argentina/Catamarca)
-                 #     (America/Argentina/Mendoza)
-                 #     (America/Argentina/Rio_Gallegos)
-                 #     (America/Argentina/Ushuaia)
-ARST    America/Argentina/Buenos_Aires  # Argentina Summer Time
-BOT    -14400    # Bolivia Time
-                 #     (America/La_Paz)
-BRA    -10800    # Brazil Time (not in zic)
-BRST    -7200 D  # Brasil Summer Time
-                 #     (America/Sao_Paulo)
-BRT    -10800    # Brasil Time
-                 #     (America/Araguaina)
-                 #     (America/Bahia)
-                 #     (America/Belem)
-                 #     (America/Fortaleza)
-                 #     (America/Maceio)
-                 #     (America/Recife)
-                 #     (America/Sao_Paulo)
-COT    -18000    # Columbia Time (not in zic)
+ART    America/Argentina/Buenos_Aires  # Argentina Time (obsolete)
+ARST    America/Argentina/Buenos_Aires  # Argentina Summer Time (obsolete)
+BOT    -14400    # Bolivia Time (obsolete)
+BRA    -10800    # Brazil Time (not in IANA database)
+BRST    -7200 D  # Brasil Summer Time (obsolete)
+BRT    -10800    # Brasil Time (obsolete)
+COT    -18000    # Columbia Time (obsolete)
 # CONFLICT! CDT is not unique
 # Other timezones:
 #  - CDT: Mexico Central Daylight Time (America)
@@ -95,12 +74,8 @@
                  #     (America/Rainy_River)
                  #     (America/Rankin_Inlet)
                  #     (America/Winnipeg)
-CLST   -10800 D  # Chile Summer Time
-                 #     (America/Santiago)
-                 #     (Antarctica/Palmer)
-CLT    America/Santiago  # Chile Time
-                 #     (America/Santiago)
-                 #     (Antarctica/Palmer)
+CLST   -10800 D  # Chile Summer Time (obsolete)
+CLT    America/Santiago  # Chile Time (obsolete)
 # CONFLICT! CST is not unique
 # Other timezones:
 #  - CST: Central Standard Time (Australia)
@@ -135,10 +110,8 @@
                  #     (America/Pangnirtung)
                  #     (America/Thunder_Bay)
                  #     (America/Toronto)
-EGST        0 D  # East Greenland Summer Time
-                 #     (America/Scoresbysund)
-EGT     -3600    # East Greenland Time (Svalbard & Jan Mayen)
-                 #     (America/Scoresbysund)
+EGST        0 D  # East Greenland Summer Time (obsolete)
+EGT     -3600    # East Greenland Time (Svalbard & Jan Mayen) (obsolete)
 # CONFLICT! EST is not unique
 # Other timezones:
 #  - EST: Eastern Standard Time (Australia)
@@ -164,14 +137,10 @@
                  #     (America/Pangnirtung)
                  #     (America/Thunder_Bay)
                  #     (America/Toronto)
-FNT     -7200    # Fernando de Noronha Time
-                 #     (America/Noronha)
-FNST    -3600 D  # Fernando de Noronha Summer Time (not in zic)
-                 #     (America/Noronha)
-GFT    -10800    # French Guiana Time
-                 #     (America/Cayenne)
-GYT    America/Guyana  # Guyana Time
-                 #     (America/Guyana)
+FNT     -7200    # Fernando de Noronha Time (obsolete)
+FNST    -3600 D  # Fernando de Noronha Summer Time (obsolete)
+GFT    -10800    # French Guiana Time (obsolete)
+GYT    America/Guyana  # Guyana Time (obsolete)
 MDT    -21600 D  # Mexico Mountain Daylight Time
                  # Mountain Daylight Time
                  #     (America/Boise)
@@ -197,19 +166,21 @@
                  #     (America/Yellowknife)
 NDT     -9000 D  # Newfoundland Daylight Time
                  #     (America/St_Johns)
+# CONFLICT! NFT is not unique
+# Other timezones:
+#  - NFT: Norfolk Time (Pacific)
+NFT    -12600    # Newfoundland Time (not in IANA database)
 NST    -12600    # Newfoundland Standard Time
                  #     (America/St_Johns)
-PET    -18000    # Peru Time (not in zic)
+PET    -18000    # Peru Time (obsolete)
 PDT    -25200 D  # Pacific Daylight Time
                  #     (America/Dawson)
                  #     (America/Los_Angeles)
                  #     (America/Tijuana)
                  #     (America/Vancouver)
                  #     (America/Whitehorse)
-PMDT    -7200 D  # Pierre & Miquelon Daylight Time
-                 #     (America/Miquelon)
-PMST   -10800    # Pierre & Miquelon Standard Time
-                 #     (America/Miquelon)
+PMDT    -7200 D  # Pierre & Miquelon Daylight Time (obsolete)
+PMST   -10800    # Pierre & Miquelon Standard Time (obsolete)
 PST    -28800    # Pacific Standard Time
                  #     (America/Dawson)
                  #     (America/Los_Angeles)
@@ -217,150 +188,99 @@
                  #     (America/Vancouver)
                  #     (America/Whitehorse)
                  #     (Pacific/Pitcairn)
-PYST   -10800 D  # Paraguay Summer Time
-                 #     (America/Asuncion)
-PYT    America/Asuncion  # Paraguay Time
-                 #     (America/Asuncion)
+PYST   -10800 D  # Paraguay Summer Time (obsolete)
+PYT    America/Asuncion  # Paraguay Time (obsolete)
 UYST    -7200 D  # Uruguay Summer Time (obsolete)
-                 #     (America/Montevideo)
-UYT    -10800    # Uruguay Time
-                 #     (America/Montevideo)
-VET    America/Caracas  # Venezuela Time
-                 #     (America/Caracas)
-WGST    -7200 D  # Western Greenland Summer Time
-                 #     (America/Godthab)
-WGT    -10800    # West Greenland Time
-                 #     (America/Godthab)
+UYT    -10800    # Uruguay Time (obsolete)
+VET    America/Caracas  # Venezuela Time (obsolete)
+WGST    -7200 D  # Western Greenland Summer Time (obsolete)
+WGT    -10800    # West Greenland Time (obsolete)
 
 #################### ANTARCTICA ####################
 
-DAVT    Antarctica/Davis  # Davis Time (Antarctica)
-                 #     (Antarctica/Davis)
-DDUT    36000    # Dumont-d'Urville Time (Antarctica)
-                 #     (Antarctica/DumontDUrville)
-                 #     (Antarctica/Palmer)
-                 #     (America/Santiago)
-MAWT    Antarctica/Mawson  # Mawson Time (Antarctica)
-                 #     (Antarctica/Mawson)
+DAVT    Antarctica/Davis  # Davis Time (Antarctica) (obsolete)
+DDUT    36000    # Dumont-d'Urville Time (Antarctica) (obsolete)
+MAWT    Antarctica/Mawson  # Mawson Time (Antarctica) (obsolete)
 
 #################### ASIA ####################
 
-AFT     16200    # Afghanistan Time
-                 #     (Asia/Kabul)
-ALMT    21600    # Alma-Ata Time
-                 #     (Asia/Almaty)
+AFT     16200    # Afghanistan Time (obsolete)
+ALMT    21600    # Alma-Ata Time (obsolete)
 ALMST   25200 D  # Alma-Ata Summer Time (obsolete)
 # CONFLICT! AMST is not unique
 # Other timezones:
 #  - AMST: Amazon Summer Time (America)
-AMST    Asia/Yerevan  # Armenia Summer Time
-                 #     (Asia/Yerevan)
+AMST    Asia/Yerevan  # Armenia Summer Time (obsolete)
 # CONFLICT! AMT is not unique
 # Other timezones:
-#  - AMT: Amazon Time (America)
-AMT     Asia/Yerevan  # Armenia Time
-                 #     (Asia/Yerevan)
+#  - AMT: Armenia Time (Asia)
+AMT    -14400    # Amazon Time (obsolete)
 ANAST   Asia/Anadyr  # Anadyr Summer Time (obsolete)
-ANAT    Asia/Anadyr  # Anadyr Time
-                 #     (Asia/Anadyr)
+ANAT    Asia/Anadyr  # Anadyr Time (obsolete)
 AZST    Asia/Baku  # Azerbaijan Summer Time (obsolete)
-                 #     (Asia/Baku)
-AZT     Asia/Baku  # Azerbaijan Time
-                 #     (Asia/Baku)
-BDT     21600    # Bangladesh Time
-                 #     (Asia/Dhaka)
-BNT     28800    # Brunei Darussalam Time
-                 #     (Asia/Brunei)
-BORT    28800    # Borneo Time (Indonesia) (not in zic)
-BTT     21600    # Bhutan Time
-                 #     (Asia/Thimphu)
-CCT     28800    # China Coastal Time (not in zic)
+AZT     Asia/Baku  # Azerbaijan Time (obsolete)
+BDT     21600    # Bangladesh Time (obsolete)
+BNT     28800    # Brunei Darussalam Time (obsolete)
+BORT    28800    # Borneo Time (Indonesia) (not in IANA database)
+BTT     21600    # Bhutan Time (obsolete)
+CCT     28800    # China Coastal Time (not in IANA database)
 GEST    Asia/Tbilisi  # Georgia Summer Time (obsolete)
-GET     Asia/Tbilisi  # Georgia Time
-                 #     (Asia/Tbilisi)
-HKT     28800    # Hong Kong Time (not in zic)
-ICT     25200    # Indochina Time
-                 #     (Asia/Bangkok)
-                 #     (Asia/Phnom_Penh)
-                 #     (Asia/Saigon)
-                 #     (Asia/Vientiane)
+GET     Asia/Tbilisi  # Georgia Time (obsolete)
+HKT     28800    # Hong Kong Time
+                 #     (Asia/Hong_Kong)
+ICT     25200    # Indochina Time (obsolete)
 IDT     10800 D  # Israel Daylight Time
                  #     (Asia/Jerusalem)
 IRKST   Asia/Irkutsk  # Irkutsk Summer Time (obsolete)
-IRKT    Asia/Irkutsk  # Irkutsk Time
-                 #     (Asia/Irkutsk)
-IRT     12600    # Iran Time (not in zic)
+IRKT    Asia/Irkutsk  # Irkutsk Time (obsolete)
+IRT     12600    # Iran Time (not in IANA database)
 # CONFLICT! IST is not unique
 # Other timezones:
 # - IST: Irish Summer Time (Europe)
 # - IST: Indian Standard Time (Asia)
 IST      7200    # Israel Standard Time
                  #     (Asia/Jerusalem)
-JAYT    32400    # Jayapura Time (Indonesia) (not in zic)
+JAYT    32400    # Jayapura Time (Indonesia) (not in IANA database)
 JST     32400    # Japan Standard Time
                  #     (Asia/Tokyo)
-KDT     36000 D  # Korean Daylight Time (not in zic)
+KDT     36000 D  # Korean Daylight Time (not in IANA database)
 KGST    21600 D  # Kyrgyzstan Summer Time (obsolete)
-KGT     Asia/Bishkek  # Kyrgyzstan Time
-                 #     (Asia/Bishkek)
+KGT     Asia/Bishkek  # Kyrgyzstan Time (obsolete)
 KRAST   Asia/Krasnoyarsk  # Krasnoyarsk Summer Time (obsolete)
-KRAT    Asia/Krasnoyarsk  # Krasnoyarsk Time
-                 #     (Asia/Krasnoyarsk)
+KRAT    Asia/Krasnoyarsk  # Krasnoyarsk Time (obsolete)
 KST     32400    # Korean Standard Time
                  #     (Asia/Seoul)
 LKT     Asia/Colombo  # Lanka Time (obsolete)
 MAGST   Asia/Magadan  # Magadan Summer Time (obsolete)
-MAGT    Asia/Magadan  # Magadan Time
-                 #     (Asia/Magadan)
-MMT     23400    # Myanmar Time
-                 #     (Asia/Rangoon)
-MYT     28800    # Malaysia Time
-                 #     (Asia/Kuala_Lumpur)
-                 #     (Asia/Kuching)
+MAGT    Asia/Magadan  # Magadan Time (obsolete)
+MMT     23400    # Myanmar Time (obsolete)
+MYT     28800    # Malaysia Time (obsolete)
 NOVST   Asia/Novosibirsk  # Novosibirsk Summer Time (obsolete)
-NOVT    Asia/Novosibirsk  # Novosibirsk Time
-                 #     (Asia/Novosibirsk)
-NPT     20700    # Nepal Time
-                 #     (Asia/Katmandu)
+NOVT    Asia/Novosibirsk  # Novosibirsk Time (obsolete)
+NPT     20700    # Nepal Time (obsolete)
 OMSST   Asia/Omsk  # Omsk Summer Time (obsolete)
-OMST    Asia/Omsk  # Omsk Time
-                 #     (Asia/Omsk)
+OMST    Asia/Omsk  # Omsk Time (obsolete)
 PETST   Asia/Kamchatka  # Petropavlovsk-Kamchatski Summer Time (obsolete)
-PETT    Asia/Kamchatka  # Petropavlovsk-Kamchatski Time
-                 #     (Asia/Kamchatka)
-PHT     28800    # Philippine Time
-                 #     (Asia/Manila)
+PETT    Asia/Kamchatka  # Petropavlovsk-Kamchatski Time (obsolete)
+PHT     28800    # Philippine Time (obsolete)
 PKT     18000    # Pakistan Time
                  #     (Asia/Karachi)
 PKST    21600 D  # Pakistan Summer Time
                  #     (Asia/Karachi)
-SGT     Asia/Singapore  # Singapore Time
-                 #     (Asia/Singapore)
-TJT     18000    # Tajikistan Time
-                 #     (Asia/Dushanbe)
-TMT     Asia/Ashgabat  # Turkmenistan Time
-                 #     (Asia/Ashgabat)
-ULAST   32400 D  # Ulan Bator Summer Time
-                 #     (Asia/Ulaanbaatar)
-ULAT    Asia/Ulaanbaatar  # Ulan Bator Time
-                 #     (Asia/Ulaanbaatar)
-UZST    21600 D  # Uzbekistan Summer Time
-                 #     (Asia/Samarkand)
-                 #     (Asia/Tashkent)
-UZT     18000    # Uzbekistan Time
-                 #     (Asia/Samarkand)
-                 #     (Asia/Tashkent)
+SGT     Asia/Singapore  # Singapore Time (obsolete)
+TJT     18000    # Tajikistan Time (obsolete)
+TMT     Asia/Ashgabat  # Turkmenistan Time (obsolete)
+ULAST   32400 D  # Ulan Bator Summer Time (obsolete)
+ULAT    Asia/Ulaanbaatar  # Ulan Bator Time (obsolete)
+UZST    21600 D  # Uzbekistan Summer Time (obsolete)
+UZT     18000    # Uzbekistan Time (obsolete)
 VLAST   Asia/Vladivostok  # Vladivostok Summer Time (obsolete)
-VLAT    Asia/Vladivostok  # Vladivostok Time
-                 #     (Asia/Vladivostok)
-XJT     21600    # Xinjiang Time
-                 #     (Asia/Urumqi)
+VLAT    Asia/Vladivostok  # Vladivostok Time (obsolete)
+XJT     21600    # Xinjiang Time (obsolete)
 YAKST   Asia/Yakutsk  # Yakutsk Summer Time (obsolete)
-YAKT    Asia/Yakutsk  # Yakutsk Time
-                 #     (Asia/Yakutsk)
+YAKT    Asia/Yakutsk  # Yakutsk Time (obsolete)
 YEKST   21600 D  # Yekaterinburg Summer Time (obsolete)
-YEKT    Asia/Yekaterinburg  # Yekaterinburg Time
-                 #     (Asia/Yekaterinburg)
+YEKT    Asia/Yekaterinburg  # Yekaterinburg Time (obsolete)
 
 #################### ATLANTIC ####################
 
@@ -401,17 +321,14 @@
                  #     (America/Thule)
                  #     (America/Tortola)
                  #     (Atlantic/Bermuda)
-AZOST       0 D  # Azores Summer Time
-                 #     (Atlantic/Azores)
-AZOT    -3600    # Azores Time
-                 #     (Atlantic/Azores)
-FKST    Atlantic/Stanley  # Falkland Islands Summer/Standard Time
-                 #     (Atlantic/Stanley)
+AZOST       0 D  # Azores Summer Time (obsolete)
+AZOT    -3600    # Azores Time (obsolete)
+FKST    Atlantic/Stanley  # Falkland Islands Summer/Standard Time (obsolete)
 FKT     Atlantic/Stanley  # Falkland Islands Time (obsolete)
 
 #################### AUSTRALIA ####################
 
-ACSST   37800 D  # Australian Central Summer Standard Time (not in zic)
+ACSST   37800 D  # Australian Central Summer Standard Time (not in IANA database)
 ACDT    37800 D  # Australian Central Daylight Time
                  #     (Australia/Adelaide)
                  #     (Australia/Broken_Hill)
@@ -420,9 +337,8 @@
                  #     (Australia/Adelaide)
                  #     (Australia/Broken_Hill)
                  #     (Australia/Darwin)
-ACWST   31500    # Australian Central Western Standard Time
-                 #     (Australia/Eucla)
-AESST   39600 D  # Australian Eastern Summer Standard Time (not in zic)
+ACWST   31500    # Australian Central Western Standard Time (obsolete)
+AESST   39600 D  # Australian Eastern Summer Standard Time (not in IANA database)
 AEDT    39600 D  # Australian Eastern Daylight Time
                  #     (Australia/Brisbane)
                  #     (Australia/Currie)
@@ -437,21 +353,19 @@
                  #     (Australia/Lindeman)
                  #     (Australia/Melbourne)
                  #     (Australia/Sydney)
-AWSST   32400 D  # Australia Western Summer Standard Time (not in zic)
+AWSST   32400 D  # Australia Western Summer Standard Time (not in IANA database)
 AWST    28800    # Australian Western Standard Time
                  #     (Australia/Perth)
-CADT    37800 D  # Central Australia Daylight-Saving Time (not in zic)
-CAST    34200    # Central Australia Standard Time (not in zic)
-LHDT    Australia/Lord_Howe  # Lord Howe Daylight Time
-                 #     (Australia/Lord_Howe)
-LHST    37800    # Lord Howe Standard Time
-                 #     (Australia/Lord_Howe)
-LIGT    36000    # Melbourne, Australia (not in zic)
-NZT     43200    # New Zealand Time (not in zic)
-SADT    37800 D  # South Australian Daylight-Saving Time (not in zic)
-WADT    28800 D  # West Australian Daylight-Saving Time (not in zic)
-WAST    25200    # West Australian Standard Time (not in zic)
-WDT     32400 D  # West Australian Daylight-Saving Time (not in zic)
+CADT    37800 D  # Central Australia Daylight-Saving Time (not in IANA database)
+CAST    34200    # Central Australia Standard Time (not in IANA database)
+LHDT    Australia/Lord_Howe  # Lord Howe Daylight Time (obsolete)
+LHST    37800    # Lord Howe Standard Time (obsolete)
+LIGT    36000    # Melbourne, Australia (not in IANA database)
+NZT     43200    # New Zealand Time (not in IANA database)
+SADT    37800 D  # South Australian Daylight-Saving Time (not in IANA database)
+WADT    28800 D  # West Australian Daylight-Saving Time (not in IANA database)
+WAST    25200    # West Australian Standard Time (not in IANA database)
+WDT     32400 D  # West Australian Daylight-Saving Time (not in IANA database)
 
 #################### ETC ####################
 
@@ -475,7 +389,7 @@
                  #     (Europe/London)
 UCT         0    # Universal Coordinated Time
                  #     (Etc/UCT)
-UT          0    # Universal Time (not in zic)
+UT          0    # Universal Time (not in IANA database)
 UTC         0    # Coordinated Universal Time
 Z           0    # Zulu
 ZULU        0    # Zulu
@@ -634,10 +548,15 @@
 FET     10800    # Further-eastern European Time (obsolete)
                  #     (Europe/Kaliningrad)
                  #     (Europe/Minsk)
-MEST     7200 D  # Middle Europe Summer Time (not in zic)
-MET      3600    # Middle Europe Time (not in zic)
-METDST   7200 D  # Middle Europe Summer Time (not in zic)
-MEZ      3600    # Mitteleuropaeische Zeit (German) (not in zic)
+MEST     7200 D  # Middle Europe Summer Time
+                 #     (MET)
+MESZ     7200 D  # Mitteleuropaeische Sommerzeit (German)
+                 #     (attested in IANA comments though not their code)
+MET      3600    # Middle Europe Time
+                 #     (MET)
+METDST   7200 D  # Middle Europe Summer Time (not in IANA database)
+MEZ      3600    # Mitteleuropaeische Zeit (German)
+                 #     (attested in IANA comments though not their code)
 MSD     14400 D  # Moscow Daylight Time (obsolete)
 MSK     Europe/Moscow  # Moscow Time
                  #     (Europe/Moscow)
@@ -658,94 +577,53 @@
 
 #################### INDIAN ####################
 
-CXT     25200    # Christmas Island Time (Indian Ocean)
-                 #     (Indian/Christmas)
-IOT     Indian/Chagos  # British Indian Ocean Territory (Chagos)
-                 #     (Indian/Chagos)
-MUT     14400    # Mauritius Island Time
-                 #     (Indian/Mauritius)
-MUST    18000 D  # Mauritius Island Summer Time
-                 #     (Indian/Mauritius)
-MVT     18000    # Maldives Island Time
-                 #     (Indian/Maldives)
-RET     14400    # Reunion Time
-                 #     (Indian/Reunion)
-SCT     14400    # Seychelles Time
-                 #     (Indian/Mahe)
-TFT     18000    # Kerguelen Time
-                 #     (Indian/Kerguelen)
+CXT     25200    # Christmas Island Time (Indian Ocean) (obsolete)
+IOT     Indian/Chagos  # British Indian Ocean Territory (Chagos) (obsolete)
+MUT     14400    # Mauritius Island Time (obsolete)
+MUST    18000 D  # Mauritius Island Summer Time (obsolete)
+MVT     18000    # Maldives Island Time (obsolete)
+RET     14400    # Reunion Time (obsolete)
+SCT     14400    # Seychelles Time (obsolete)
+TFT     18000    # Kerguelen Time (obsolete)
 
 #################### PACIFIC ####################
 
-CHADT   49500 D  # Chatham Daylight Time (New Zealand)
-                 #     (Pacific/Chatham)
-CHAST   45900    # Chatham Standard Time (New Zealand)
-                 #     (Pacific/Chatham)
-CHUT    36000    # Chuuk Time
-                 #     (Pacific/Chuuk)
-CKT     Pacific/Rarotonga  # Cook Islands Time
-                 #     (Pacific/Rarotonga)
-EASST   Pacific/Easter  # Easter Island Summer Time
-                 #     (Pacific/Easter)
-EAST    Pacific/Easter  # Easter Island Time (Chile)
-                 #     (Pacific/Easter)
-FJST    46800 D  # Fiji Summer Time
-                 #     (Pacific/Fiji)
-FJT     43200    # Fiji Time
-                 #     (Pacific/Fiji)
-GALT   -21600    # Galapagos Time
-                 #     (Pacific/Galapagos)
-GAMT   -32400    # Gambier Time
-                 #     (Pacific/Gambier)
-GILT    43200    # Gilbert Islands Time
-                 #     (Pacific/Tarawa)
+CHADT   49500 D  # Chatham Daylight Time (New Zealand) (obsolete)
+CHAST   45900    # Chatham Standard Time (New Zealand) (obsolete)
+CHUT    36000    # Chuuk Time (obsolete)
+CKT     Pacific/Rarotonga  # Cook Islands Time (obsolete)
+EASST   Pacific/Easter  # Easter Island Summer Time (obsolete)
+EAST    Pacific/Easter  # Easter Island Time (Chile) (obsolete)
+FJST    46800 D  # Fiji Summer Time (obsolete)
+FJT     43200    # Fiji Time (obsolete)
+GALT   -21600    # Galapagos Time (obsolete)
+GAMT   -32400    # Gambier Time (obsolete)
+GILT    43200    # Gilbert Islands Time (obsolete)
 HST    -36000    # Hawaiian Standard Time
                  #     (Pacific/Honolulu)
                  #     (Pacific/Johnston)
-KOST    Pacific/Kosrae  # Kosrae Time
-                 #     (Pacific/Kosrae)
-LINT    Pacific/Kiritimati  # Line Islands Time (Kiribati)
-                 #     (Pacific/Kiritimati)
-MART   -34200    # Marquesas Time
-                 #     (Pacific/Marquesas)
-MHT     43200    # Kwajalein Time
-                 #     (Pacific/Kwajalein)
-                 #     (Pacific/Majuro)
-MPT     36000    # North Mariana Islands Time (not in zic)
-# CONFLICT! NFT is not unique
-# Other timezones:
-#  - NFT: Norfolk Time (Pacific)
-NFT    -12600    # Newfoundland Time (not in zic)
-NUT     Pacific/Niue  # Niue Time
-                 #     (Pacific/Niue)
+KOST    Pacific/Kosrae  # Kosrae Time (obsolete)
+LINT    Pacific/Kiritimati  # Line Islands Time (Kiribati) (obsolete)
+MART   -34200    # Marquesas Time (obsolete)
+MHT     43200    # Kwajalein Time (obsolete)
+MPT     36000    # North Mariana Islands Time (not in IANA database)
+NUT     Pacific/Niue  # Niue Time (obsolete)
 NZDT    46800 D  # New Zealand Daylight Time
                  #     (Antarctica/McMurdo)
                  #     (Pacific/Auckland)
 NZST    43200    # New Zealand Standard Time
                  #     (Antarctica/McMurdo)
                  #     (Pacific/Auckland)
-PGT     36000    # Papua New Guinea Time
-                 #     (Pacific/Port_Moresby)
-PHOT    Pacific/Enderbury  # Phoenix Islands Time (Kiribati)
-                 #     (Pacific/Enderbury)
-PONT    39600    # Ponape Time (Micronesia)
-                 #     (Pacific/Ponape)
-PWT     32400    # Palau Time
-                 #     (Pacific/Palau)
-TAHT   -36000    # Tahiti Time (zic says "TAHT", other sources "THAT")
-                 #     (Pacific/Tahiti)
-TKT     Pacific/Fakaofo  # Tokelau Time
-                 #     (Pacific/Fakaofo)
-TOT     46800    # Tonga Time
-                 #     (Pacific/Tongatapu)
-TRUT    36000    # Truk Time (zic used to say "TRUT", other sources say "TRUK")
-                 #     (Pacific/Truk)
-TVT     43200    # Tuvalu Time
-                 #     (Pacific/Funafuti)
-VUT     39600    # Vanuata Time
-                 #     (Pacific/Efate)
-WAKT    43200    # Wake Time
-                 #     (Pacific/Wake)
-WFT     43200    # Wallis and Futuna Time
-                 #     (Pacific/Wallis)
-YAPT    36000    # Yap Time (Micronesia) (not in zic)
+PGT     36000    # Papua New Guinea Time (obsolete)
+PHOT    Pacific/Enderbury  # Phoenix Islands Time (Kiribati) (obsolete)
+PONT    39600    # Ponape Time (Micronesia) (obsolete)
+PWT     32400    # Palau Time (obsolete)
+TAHT   -36000    # Tahiti Time (obsolete)
+TKT     Pacific/Fakaofo  # Tokelau Time (obsolete)
+TOT     46800    # Tonga Time (obsolete)
+TRUT    36000    # Truk Time (obsolete)
+TVT     43200    # Tuvalu Time (obsolete)
+VUT     39600    # Vanuata Time (obsolete)
+WAKT    43200    # Wake Time (obsolete)
+WFT     43200    # Wallis and Futuna Time (obsolete)
+YAPT    36000    # Yap Time (Micronesia) (not in IANA database)
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Etc.txt postgresql-9.5-9.5.8/src/timezone/tznames/Etc.txt
--- postgresql-9.5-9.5.2/src/timezone/tznames/Etc.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Etc.txt	2017-08-07 21:13:41.000000000 +0000
@@ -27,7 +27,7 @@
                  #     (Europe/London)
 UCT         0    # Universal Coordinated Time
                  #     (Etc/UCT)
-UT          0    # Universal Time (not in zic)
+UT          0    # Universal Time (not in IANA database)
 UTC         0    # Coordinated Universal Time
                  #     (Etc/UTC)
 Z           0    # Zulu
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Europe.txt postgresql-9.5-9.5.8/src/timezone/tznames/Europe.txt
--- postgresql-9.5-9.5.2/src/timezone/tznames/Europe.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Europe.txt	2017-08-07 21:13:41.000000000 +0000
@@ -182,17 +182,21 @@
 # - IST: Israel Standard Time (Asia)
 IST      3600 D  # Irish Summer Time
                  #     (Europe/Dublin)
-MEST     7200 D  # Middle Europe Summer Time (not in zic)
-MET      3600    # Middle Europe Time (not in zic)
-METDST   7200 D  # Middle Europe Summer Time (not in zic)
-MEZ      3600    # Mitteleuropäische Zeit (German) (not in zic)
+MEST     7200 D  # Middle Europe Summer Time
+                 #     (MET)
+MESZ     7200 D  # Mitteleuropäische Sommerzeit (German)
+                 #     (attested in IANA comments though not their code)
+MET      3600    # Middle Europe Time
+                 #     (MET)
+METDST   7200 D  # Middle Europe Summer Time (not in IANA database)
+MEZ      3600    # Mitteleuropäische Zeit (German)
+                 #     (attested in IANA comments though not their code)
 MSD     14400 D  # Moscow Daylight Time (obsolete)
 MSK     Europe/Moscow  # Moscow Time
                  #     (Europe/Moscow)
                  #     (Europe/Volgograd)
 SAMST   Europe/Samara  # Samara Summer Time (obsolete)
-SAMT    Europe/Samara  # Samara Time
-                 #     (Europe/Samara)
+SAMT    Europe/Samara  # Samara Time (obsolete)
 VOLT    Europe/Volgograd  # Volgograd Time (obsolete)
 WEST     3600 D  # Western Europe Summer Time
                  #     (Africa/Casablanca)
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Indian.txt postgresql-9.5-9.5.8/src/timezone/tznames/Indian.txt
--- postgresql-9.5-9.5.2/src/timezone/tznames/Indian.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Indian.txt	2017-08-07 21:13:41.000000000 +0000
@@ -7,10 +7,8 @@
 # src/timezone/tznames/Indian.txt
 #
 
-CCT     23400    # Cocos Islands Time (Indian Ocean)
-                 #     (Indian/Cocos)
-CXT     25200    # Christmas Island Time (Indian Ocean)
-                 #     (Indian/Christmas)
+CCT     23400    # Cocos Islands Time (Indian Ocean) (obsolete)
+CXT     25200    # Christmas Island Time (Indian Ocean) (obsolete)
 EAT     10800    # East Africa Time
                  #     (Africa/Addis_Ababa)
                  #     (Africa/Asmera)
@@ -23,17 +21,10 @@
                  #     (Indian/Antananarivo)
                  #     (Indian/Comoro)
                  #     (Indian/Mayotte)
-IOT     Indian/Chagos  # British Indian Ocean Territory (Chagos)
-                 #     (Indian/Chagos)
-MUT     14400    # Mauritius Island Time
-                 #     (Indian/Mauritius)
-MUST    18000 D  # Mauritius Island Summer Time
-                 #     (Indian/Mauritius)
-MVT     18000    # Maldives Island Time
-                 #     (Indian/Maldives)
-RET     14400    # Reunion Time
-                 #     (Indian/Reunion)
-SCT     14400    # Seychelles Time
-                 #     (Indian/Mahe)
-TFT     18000    # Kerguelen Time
-                 #     (Indian/Kerguelen)
+IOT     Indian/Chagos  # British Indian Ocean Territory (Chagos) (obsolete)
+MUT     14400    # Mauritius Island Time (obsolete)
+MUST    18000 D  # Mauritius Island Summer Time (obsolete)
+MVT     18000    # Maldives Island Time (obsolete)
+RET     14400    # Reunion Time (obsolete)
+SCT     14400    # Seychelles Time (obsolete)
+TFT     18000    # Kerguelen Time (obsolete)
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/Pacific.txt postgresql-9.5-9.5.8/src/timezone/tznames/Pacific.txt
--- postgresql-9.5-9.5.2/src/timezone/tznames/Pacific.txt	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/Pacific.txt	2017-08-07 21:13:41.000000000 +0000
@@ -10,72 +10,48 @@
 # CONFLICT! BST is not unique
 # Other timezones:
 #  - BST: British Summer Time
-BST     39600    # Bougainville Standard Time (Papua New Guinea)
-                 #     (Pacific/Bougainville)
-CHADT   49500 D  # Chatham Daylight Time (New Zealand)
-                 #     (Pacific/Chatham)
-CHAST   45900    # Chatham Standard Time (New Zealand)
-                 #     (Pacific/Chatham)
-ChST    36000    # Chamorro Standard Time (lower case "h" is as in zic)
+BST     39600    # Bougainville Standard Time (Papua New Guinea) (obsolete)
+CHADT   49500 D  # Chatham Daylight Time (New Zealand) (obsolete)
+CHAST   45900    # Chatham Standard Time (New Zealand) (obsolete)
+ChST    36000    # Chamorro Standard Time (lower case "h" is as in IANA database)
                  #     (Pacific/Guam)
                  #     (Pacific/Saipan)
-CHUT    36000    # Chuuk Time
-                 #     (Pacific/Chuuk)
-CKT     Pacific/Rarotonga  # Cook Islands Time
-                 #     (Pacific/Rarotonga)
-EASST   Pacific/Easter  # Easter Island Summer Time
-                 #     (Pacific/Easter)
+CHUT    36000    # Chuuk Time (obsolete)
+CKT     Pacific/Rarotonga  # Cook Islands Time (obsolete)
+EASST   Pacific/Easter  # Easter Island Summer Time (obsolete)
 # CONFLICT! EAST is not unique
 # Other timezones:
 #  - EAST: East Australian Standard Time (Australia)
-EAST    Pacific/Easter  # Easter Island Time (Chile)
-                 #     (Pacific/Easter)
-FJST    46800 D  # Fiji Summer Time (caution: this used to mean -46800)
-                 #     (Pacific/Fiji)
-FJT     43200    # Fiji Time (caution: this used to mean -43200)
-                 #     (Pacific/Fiji)
-GALT   -21600    # Galapagos Time
-                 #     (Pacific/Galapagos)
-GAMT   -32400    # Gambier Time
-                 #     (Pacific/Gambier)
-GILT    43200    # Gilbert Islands Time
-                 #     (Pacific/Tarawa)
+EAST    Pacific/Easter  # Easter Island Time (Chile) (obsolete)
+FJST    46800 D  # Fiji Summer Time (caution: this used to mean -46800) (obsolete)
+FJT     43200    # Fiji Time (caution: this used to mean -43200) (obsolete)
+GALT   -21600    # Galapagos Time (obsolete)
+GAMT   -32400    # Gambier Time (obsolete)
+GILT    43200    # Gilbert Islands Time (obsolete)
 HST    -36000    # Hawaiian Standard Time
                  #     (Pacific/Honolulu)
                  #     (Pacific/Johnston)
-KOST    Pacific/Kosrae  # Kosrae Time
-                 #     (Pacific/Kosrae)
-LINT    Pacific/Kiritimati  # Line Islands Time (Kiribati)
-                 #     (Pacific/Kiritimati)
-MART   -34200    # Marquesas Time
-                 #     (Pacific/Marquesas)
-MHT     43200    # Kwajalein Time
-                 #     (Pacific/Kwajalein)
-                 #     (Pacific/Majuro)
-MPT     36000    # North Mariana Islands Time (not in zic)
-NCT     39600    # New Caledonia Time
-                 #     (Pacific/Noumea)
+KOST    Pacific/Kosrae  # Kosrae Time (obsolete)
+LINT    Pacific/Kiritimati  # Line Islands Time (Kiribati) (obsolete)
+MART   -34200    # Marquesas Time (obsolete)
+MHT     43200    # Kwajalein Time (obsolete)
+MPT     36000    # North Mariana Islands Time (not in IANA database)
+NCT     39600    # New Caledonia Time (obsolete)
 # CONFLICT! NFT is not unique
 # Other timezones:
 #  - NFT: Newfoundland Time (America)
-NFT     Pacific/Norfolk  # Norfolk Time
-                 #     (Pacific/Norfolk)
-NRT     Pacific/Nauru  # Nauru Time
-                 #     (Pacific/Nauru)
-NUT     Pacific/Niue  # Niue Time
-                 #     (Pacific/Niue)
+NFT     Pacific/Norfolk  # Norfolk Time (obsolete)
+NRT     Pacific/Nauru  # Nauru Time (obsolete)
+NUT     Pacific/Niue  # Niue Time (obsolete)
 NZDT    46800 D  # New Zealand Daylight Time
                  #     (Antarctica/McMurdo)
                  #     (Pacific/Auckland)
 NZST    43200    # New Zealand Standard Time
                  #     (Antarctica/McMurdo)
                  #     (Pacific/Auckland)
-PGT     36000    # Papua New Guinea Time
-                 #     (Pacific/Port_Moresby)
-PHOT    Pacific/Enderbury  # Phoenix Islands Time (Kiribati)
-                 #     (Pacific/Enderbury)
-PONT    39600    # Ponape Time (Micronesia)
-                 #     (Pacific/Ponape)
+PGT     36000    # Papua New Guinea Time (obsolete)
+PHOT    Pacific/Enderbury  # Phoenix Islands Time (Kiribati) (obsolete)
+PONT    39600    # Ponape Time (Micronesia) (obsolete)
 PST    -28800    # Pacific Standard Time
                  #     (America/Dawson)
                  #     (America/Los_Angeles)
@@ -83,35 +59,23 @@
                  #     (America/Vancouver)
                  #     (America/Whitehorse)
                  #     (Pacific/Pitcairn)
-PWT     32400    # Palau Time
-                 #     (Pacific/Palau)
-SBT     39600    # Solomon Islands Time
-                 #     (Pacific/Guadalcanal)
+PWT     32400    # Palau Time (obsolete)
+SBT     39600    # Solomon Islands Time (obsolete)
 SST    -39600    # South Sumatran Time
                  #     (Pacific/Midway)
                  #     (Pacific/Pago_Pago)
-TAHT   -36000    # Tahiti Time (zic says "TAHT", other sources "THAT")
-                 #     (Pacific/Tahiti)
-TKT     Pacific/Fakaofo  # Tokelau Time
-                 #     (Pacific/Fakaofo)
-TOT     46800    # Tonga Time
-                 #     (Pacific/Tongatapu)
-TRUT    36000    # Truk Time (zic used to say "TRUT", other sources say "TRUK")
-                 #     (Pacific/Truk)
-TVT     43200    # Tuvalu Time
-                 #     (Pacific/Funafuti)
-VUT     39600    # Vanuata Time
-                 #     (Pacific/Efate)
-WAKT    43200    # Wake Time
-                 #     (Pacific/Wake)
-WFT     43200    # Wallis and Futuna Time
-                 #     (Pacific/Wallis)
-WSDT    50400 D  # West Samoa Daylight Time
-                 #     (Pacific/Apia)
-WSST    46800    # West Samoa Standard Time
-                 #     (Pacific/Apia)
+TAHT   -36000    # Tahiti Time (obsolete)
+TKT     Pacific/Fakaofo  # Tokelau Time (obsolete)
+TOT     46800    # Tonga Time (obsolete)
+TRUT    36000    # Truk Time (obsolete)
+TVT     43200    # Tuvalu Time (obsolete)
+VUT     39600    # Vanuata Time (obsolete)
+WAKT    43200    # Wake Time (obsolete)
+WFT     43200    # Wallis and Futuna Time (obsolete)
+WSDT    50400 D  # West Samoa Daylight Time (obsolete)
+WSST    46800    # West Samoa Standard Time (obsolete)
 # CONFLICT! WST is not unique
 # Other timezones:
 #  - WST: Western Standard Time (Australia)
-WST     46800    # West Samoa Time (caution: this used to mean -39600) (not in zic)
-YAPT    36000    # Yap Time (Micronesia) (not in zic)
+WST     46800    # West Samoa Time (caution: this used to mean -39600) (not in IANA database)
+YAPT    36000    # Yap Time (Micronesia) (not in IANA database)
diff -Nru postgresql-9.5-9.5.2/src/timezone/tznames/README postgresql-9.5-9.5.8/src/timezone/tznames/README
--- postgresql-9.5-9.5.2/src/timezone/tznames/README	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/tznames/README	2017-08-07 21:13:41.000000000 +0000
@@ -29,6 +29,12 @@
 The files named Africa.txt, etc, are not intended to be used directly as
 time zone abbreviation files. They contain reference definitions of time zone
 abbreviations that can be copied into a custom abbreviation file as needed.
-Note that these files (*.txt) are already a subset of the IANA timezone
-database files: we tried to list only those time zone abbreviations that
-(according to the IANA timezone database) appear to be still in use.
+These files contain most of the time zone abbreviations that were shown
+in the IANA timezone database circa 2010.
+
+However, it turns out that many of these abbreviations had simply been
+invented by the IANA timezone group, and do not have currency in real-world
+use.  The IANA group have changed their policy about that, and now prefer to
+use numeric UTC offsets whenever there's not an abbreviation with known
+real-world popularity.  A lot of these abbreviations therefore no longer
+appear in the IANA data, and so are marked "obsolete" in these data files.
diff -Nru postgresql-9.5-9.5.2/src/timezone/zic.c postgresql-9.5-9.5.8/src/timezone/zic.c
--- postgresql-9.5-9.5.2/src/timezone/zic.c	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/timezone/zic.c	2017-08-07 21:13:41.000000000 +0000
@@ -8,28 +8,28 @@
 
 #include "postgres_fe.h"
 
-#include <limits.h>
+#include <fcntl.h>
 #include <locale.h>
+#include <sys/stat.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "pg_getopt.h"
 
 #include "private.h"
-#include "pgtz.h"
 #include "tzfile.h"
 
-#define		  ZIC_VERSION	  '2'
+#define ZIC_VERSION_PRE_2013 '2'
+#define ZIC_VERSION '3'
 
 typedef int64 zic_t;
+#define ZIC_MIN PG_INT64_MIN
+#define ZIC_MAX PG_INT64_MAX
 
 #ifndef ZIC_MAX_ABBR_LEN_WO_WARN
 #define ZIC_MAX_ABBR_LEN_WO_WARN	  6
 #endif   /* !defined ZIC_MAX_ABBR_LEN_WO_WARN */
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #ifndef WIN32
 #ifdef S_IRUSR
 #define MKDIR_UMASK (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
@@ -37,38 +37,31 @@
 #define MKDIR_UMASK 0755
 #endif
 #endif
-
-static char elsieid[] = "@(#)zic.c	8.20";
-
-/*
- * On some ancient hosts, predicates like `isspace(C)' are defined
- * only if isascii(C) || C == EOF. Modern hosts obey the C Standard,
- * which says they are defined only if C == ((unsigned char) C) || C == EOF.
- * Neither the C Standard nor Posix require that `isascii' exist.
- * For portability, we check both ancient and modern requirements.
- * If isascii is not defined, the isascii check succeeds trivially.
- */
-#include <ctype.h>
-#ifndef isascii
-#define isascii(x) 1
+#ifndef AT_SYMLINK_FOLLOW
+#define linkat(fromdir, from, todir, to, flag) \
+	(itssymlink(from) ? (errno = ENOTSUP, -1) : link(from, to))
 #endif
 
-#define OFFSET_STRLEN_MAXIMUM (7 + INT_STRLEN_MAXIMUM(long))
-#define RULE_STRLEN_MAXIMUM   8 /* "Mdd.dd.d" */
+/* The maximum ptrdiff_t value, for pre-C99 platforms.  */
+#ifndef PTRDIFF_MAX
+static ptrdiff_t const PTRDIFF_MAX = MAXVAL(ptrdiff_t, TYPE_BIT(ptrdiff_t));
+#endif
 
-#define end(cp)		  (strchr((cp), '\0'))
+/* The type and printf format for line numbers.  */
+typedef int lineno_t;
+#define PRIdLINENO "d"
 
 struct rule
 {
 	const char *r_filename;
-	int			r_linenum;
+	lineno_t	r_linenum;
 	const char *r_name;
 
-	int			r_loyear;		/* for example, 1986 */
-	int			r_hiyear;		/* for example, 1986 */
+	zic_t		r_loyear;		/* for example, 1986 */
+	zic_t		r_hiyear;		/* for example, 1986 */
 	const char *r_yrtype;
-	int			r_lowasnum;
-	int			r_hiwasnum;
+	bool		r_lowasnum;
+	bool		r_hiwasnum;
 
 	int			r_month;		/* 0..11 */
 
@@ -76,15 +69,14 @@
 	int			r_dayofmonth;
 	int			r_wday;
 
-	long		r_tod;			/* time from midnight */
-	int			r_todisstd;		/* above is standard time if TRUE */
-	/* or wall clock time if FALSE */
-	int			r_todisgmt;		/* above is GMT if TRUE */
-	/* or local time if FALSE */
-	long		r_stdoff;		/* offset from standard time */
+	zic_t		r_tod;			/* time from midnight */
+	bool		r_todisstd;		/* above is standard time if 1 or wall clock
+								 * time if 0 */
+	bool		r_todisgmt;		/* above is GMT if 1 or local time if 0 */
+	zic_t		r_stdoff;		/* offset from standard time */
 	const char *r_abbrvar;		/* variable part of abbreviation */
 
-	int			r_todo;			/* a rule to do (used in outzone) */
+	bool		r_todo;			/* a rule to do (used in outzone) */
 	zic_t		r_temp;			/* used in outzone */
 };
 
@@ -99,91 +91,97 @@
 struct zone
 {
 	const char *z_filename;
-	int			z_linenum;
+	lineno_t	z_linenum;
 
 	const char *z_name;
-	long		z_gmtoff;
+	zic_t		z_gmtoff;
 	const char *z_rule;
 	const char *z_format;
+	char		z_format_specifier;
 
-	long		z_stdoff;
+	zic_t		z_stdoff;
 
 	struct rule *z_rules;
-	int			z_nrules;
+	ptrdiff_t	z_nrules;
 
 	struct rule z_untilrule;
 	zic_t		z_untiltime;
 };
 
 extern int	link(const char *fromname, const char *toname);
-static void addtt(const pg_time_t starttime, int type);
-static int addtype(long gmtoff, const char *abbr, int isdst,
-		int ttisstd, int ttisgmt);
-static void leapadd(const pg_time_t t, int positive, int rolling, int count);
+
+static void memory_exhausted(const char *msg) pg_attribute_noreturn();
+static void verror(const char *string, va_list args) pg_attribute_printf(1, 0);
+static void error(const char *string,...) pg_attribute_printf(1, 2);
+static void warning(const char *string,...) pg_attribute_printf(1, 2);
+static void usage(FILE *stream, int status) pg_attribute_noreturn();
+static void addtt(zic_t starttime, int type);
+static int	addtype(zic_t, char const *, bool, bool, bool);
+static void leapadd(zic_t, bool, int, int);
 static void adjleap(void);
 static void associate(void);
-static int	ciequal(const char *ap, const char *bp);
-static void convert(long val, char *buf);
-static void dolink(const char *fromfile, const char *tofile);
-static void doabbr(char *abbr, const char *format,
-	   const char *letters, int isdst, int doquotes);
-static void eat(const char *name, int num);
-static void eats(const char *name, int num,
-	 const char *rname, int rnum);
-static long eitol(int i);
-static void error(const char *message);
+static void dolink(const char *, const char *, bool);
 static char **getfields(char *buf);
-static long gethms(const char *string, const char *errstrng,
-	   int signable);
+static zic_t gethms(const char *string, const char *errstring,
+	   bool);
 static void infile(const char *filename);
 static void inleap(char **fields, int nfields);
 static void inlink(char **fields, int nfields);
 static void inrule(char **fields, int nfields);
-static int	inzcont(char **fields, int nfields);
-static int	inzone(char **fields, int nfields);
-static int	inzsub(char **fields, int nfields, int iscont);
-static int	itsabbr(const char *abbr, const char *word);
-static int	itsdir(const char *name);
-static int	lowerit(int c);
-static char *memcheck(char *tocheck);
-static int	mkdirs(char *filename);
+static bool inzcont(char **fields, int nfields);
+static bool inzone(char **fields, int nfields);
+static bool inzsub(char **, int, bool);
+static bool itsdir(char const *);
+static bool itssymlink(char const *);
+static bool is_alpha(char a);
+static char lowerit(char);
+static void mkdirs(char const *, bool);
 static void newabbr(const char *abbr);
-static long oadd(long t1, long t2);
-static void outzone(const struct zone * zp, int ntzones);
-static void puttzcode(long code, FILE *fp);
-static int	rcomp(const void *leftp, const void *rightp);
-static pg_time_t rpytime(const struct rule * rp, int wantedy);
+static zic_t oadd(zic_t t1, zic_t t2);
+static void outzone(const struct zone * zp, ptrdiff_t ntzones);
+static zic_t rpytime(const struct rule * rp, zic_t wantedy);
 static void rulesub(struct rule * rp,
 		const char *loyearp, const char *hiyearp,
 		const char *typep, const char *monthp,
 		const char *dayp, const char *timep);
-static void setboundaries(void);
-static pg_time_t tadd(const pg_time_t t1, long t2);
-static void usage(FILE *stream, int status);
-static void writezone(const char *name, const char *string);
-static int	yearistype(int year, const char *type);
+static zic_t tadd(zic_t t1, zic_t t2);
+static bool yearistype(zic_t year, const char *type);
+
+/* Bound on length of what %z can expand to.  */
+enum
+{
+PERCENT_Z_LEN_BOUND = sizeof "+995959" - 1};
+
+/* If true, work around a bug in Qt 5.6.1 and earlier, which mishandles
+   tz binary files whose POSIX-TZ-style strings contain '<'; see
+   QTBUG-53071 <https://bugreports.qt.io/browse/QTBUG-53071>.  This
+   workaround will no longer be needed when Qt 5.6.1 and earlier are
+   obsolete, say in the year 2021.  */
+enum
+{
+WORK_AROUND_QTBUG_53071 = true};
 
 static int	charcnt;
-static int	errors;
+static bool errors;
+static bool warnings;
 static const char *filename;
 static int	leapcnt;
-static int	leapseen;
-static int	leapminyear;
-static int	leapmaxyear;
-static int	linenum;
-static int	max_abbrvar_len;
+static bool leapseen;
+static zic_t leapminyear;
+static zic_t leapmaxyear;
+static lineno_t linenum;
+static int	max_abbrvar_len = PERCENT_Z_LEN_BOUND;
 static int	max_format_len;
-static zic_t max_time;
-static int	max_year;
-static zic_t min_time;
-static int	min_year;
-static int	noise;
-static int	print_abbrevs;
+static zic_t max_year;
+static zic_t min_year;
+static bool noise;
+static bool print_abbrevs;
 static zic_t print_cutoff;
 static const char *rfilename;
-static int	rlinenum;
+static lineno_t rlinenum;
 static const char *progname;
-static int	timecnt;
+static ptrdiff_t timecnt;
+static ptrdiff_t timecnt_alloc;
 static int	typecnt;
 
 /*
@@ -268,21 +266,24 @@
 #define YR_ONLY		2
 
 static struct rule *rules;
-static int	nrules;				/* number of rules */
+static ptrdiff_t nrules;		/* number of rules */
+static ptrdiff_t nrules_alloc;
 
 static struct zone *zones;
-static int	nzones;				/* number of zones */
+static ptrdiff_t nzones;		/* number of zones */
+static ptrdiff_t nzones_alloc;
 
 struct link
 {
 	const char *l_filename;
-	int			l_linenum;
+	lineno_t	l_linenum;
 	const char *l_from;
 	const char *l_to;
 };
 
 static struct link *links;
-static int	nlinks;
+static ptrdiff_t nlinks;
+static ptrdiff_t nlinks_alloc;
 
 struct lookup
 {
@@ -353,8 +354,8 @@
 };
 
 static struct lookup const leap_types[] = {
-	{"Rolling", TRUE},
-	{"Stationary", FALSE},
+	{"Rolling", true},
+	{"Stationary", false},
 	{NULL, 0}
 };
 
@@ -370,47 +371,86 @@
 static struct attype
 {
 	zic_t		at;
+	bool		dontmerge;
 	unsigned char type;
-}	attypes[TZ_MAX_TIMES];
-static long gmtoffs[TZ_MAX_TYPES];
+}	*attypes;
+static zic_t gmtoffs[TZ_MAX_TYPES];
 static char isdsts[TZ_MAX_TYPES];
 static unsigned char abbrinds[TZ_MAX_TYPES];
-static char ttisstds[TZ_MAX_TYPES];
-static char ttisgmts[TZ_MAX_TYPES];
+static bool ttisstds[TZ_MAX_TYPES];
+static bool ttisgmts[TZ_MAX_TYPES];
 static char chars[TZ_MAX_CHARS];
 static zic_t trans[TZ_MAX_LEAPS];
-static long corr[TZ_MAX_LEAPS];
+static zic_t corr[TZ_MAX_LEAPS];
 static char roll[TZ_MAX_LEAPS];
 
 /*
  * Memory allocation.
  */
 
-static char *
-memcheck(char *ptr)
+static void
+memory_exhausted(const char *msg)
+{
+	fprintf(stderr, _("%s: Memory exhausted: %s\n"), progname, msg);
+	exit(EXIT_FAILURE);
+}
+
+static size_t
+size_product(size_t nitems, size_t itemsize)
+{
+	if (SIZE_MAX / itemsize < nitems)
+		memory_exhausted(_("size overflow"));
+	return nitems * itemsize;
+}
+
+static void *
+memcheck(void *ptr)
 {
 	if (ptr == NULL)
+		memory_exhausted(strerror(errno));
+	return ptr;
+}
+
+static void *
+emalloc(size_t size)
+{
+	return memcheck(malloc(size));
+}
+
+static void *
+erealloc(void *ptr, size_t size)
+{
+	return memcheck(realloc(ptr, size));
+}
+
+static char *
+ecpyalloc(char const * str)
+{
+	return memcheck(strdup(str));
+}
+
+static void *
+growalloc(void *ptr, size_t itemsize, ptrdiff_t nitems, ptrdiff_t *nitems_alloc)
+{
+	if (nitems < *nitems_alloc)
+		return ptr;
+	else
 	{
-		const char *e = strerror(errno);
+		ptrdiff_t	amax = PTRDIFF_MAX - WORK_AROUND_QTBUG_53071;
 
-		(void) fprintf(stderr, _("%s: Memory exhausted: %s\n"),
-					   progname, e);
-		exit(EXIT_FAILURE);
+		if ((amax - 1) / 3 * 2 < *nitems_alloc)
+			memory_exhausted(_("integer overflow"));
+		*nitems_alloc += (*nitems_alloc >> 1) + 1;
+		return erealloc(ptr, size_product(*nitems_alloc, itemsize));
 	}
-	return ptr;
 }
 
-#define emalloc(size)		memcheck(imalloc(size))
-#define erealloc(ptr, size) memcheck(irealloc((ptr), (size)))
-#define ecpyalloc(ptr)		memcheck(icpyalloc(ptr))
-#define ecatalloc(oldp, newp)	memcheck(icatalloc((oldp), (newp)))
-
 /*
  * Error handling.
  */
 
 static void
-eats(const char *name, int num, const char *rname, int rnum)
+eats(char const * name, lineno_t num, char const * rname, lineno_t rnum)
 {
 	filename = name;
 	linenum = num;
@@ -419,51 +459,104 @@
 }
 
 static void
-eat(const char *name, int num)
+eat(char const * name, lineno_t num)
 {
-	eats(name, num, (char *) NULL, -1);
+	eats(name, num, NULL, -1);
 }
 
 static void
-error(const char *string)
+verror(const char *string, va_list args)
 {
 	/*
 	 * Match the format of "cc" to allow sh users to  zic ... 2>&1 | error -t
 	 * "*" -v on BSD systems.
 	 */
-	(void) fprintf(stderr, _("\"%s\", line %d: %s"),
-				   filename, linenum, string);
+	if (filename)
+		fprintf(stderr, _("\"%s\", line %" PRIdLINENO ": "), filename, linenum);
+	vfprintf(stderr, string, args);
 	if (rfilename != NULL)
-		(void) fprintf(stderr, _(" (rule from \"%s\", line %d)"),
-					   rfilename, rlinenum);
-	(void) fprintf(stderr, "\n");
-	++errors;
+		fprintf(stderr, _(" (rule from \"%s\", line %" PRIdLINENO ")"),
+				rfilename, rlinenum);
+	fprintf(stderr, "\n");
 }
 
 static void
-warning(const char *string)
+error(const char *string,...)
 {
-	char	   *cp;
+	va_list		args;
+
+	va_start(args, string);
+	verror(string, args);
+	va_end(args);
+	errors = true;
+}
 
-	cp = ecpyalloc(_("warning: "));
-	cp = ecatalloc(cp, string);
-	error(cp);
-	ifree(cp);
-	--errors;
+static void
+warning(const char *string,...)
+{
+	va_list		args;
+
+	fprintf(stderr, _("warning: "));
+	va_start(args, string);
+	verror(string, args);
+	va_end(args);
+	warnings = true;
+}
+
+static void
+close_file(FILE *stream, char const * dir, char const * name)
+{
+	char const *e = (ferror(stream) ? _("I/O error")
+					 : fclose(stream) != 0 ? strerror(errno) : NULL);
+
+	if (e)
+	{
+		fprintf(stderr, "%s: %s%s%s%s%s\n", progname,
+				dir ? dir : "", dir ? "/" : "",
+				name ? name : "", name ? ": " : "",
+				e);
+		exit(EXIT_FAILURE);
+	}
 }
 
 static void
 usage(FILE *stream, int status)
 {
-	(void) fprintf(stream, _("%s: usage is %s \
-[ --version ] [ --help ] [ -v ] [ -P ] [ -l localtime ] [ -p posixrules ] \\\n\
-\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n\
-\n\
-Report bugs to tz@elsie.nci.nih.gov.\n"),
-				   progname, progname);
+	fprintf(stream,
+			_("%s: usage is %s [ --version ] [ --help ] [ -v ] [ -P ] \\\n"
+			  "\t[ -l localtime ] [ -p posixrules ] [ -d directory ] \\\n"
+			  "\t[ -L leapseconds ] [ filename ... ]\n\n"
+			  "Report bugs to %s.\n"),
+			progname, progname, PACKAGE_BUGREPORT);
+	if (status == EXIT_SUCCESS)
+		close_file(stream, NULL, NULL);
 	exit(status);
 }
 
+/* Change the working directory to DIR, possibly creating DIR and its
+   ancestors.  After this is done, all files are accessed with names
+   relative to DIR.  */
+static void
+change_directory(char const * dir)
+{
+	if (chdir(dir) != 0)
+	{
+		int			chdir_errno = errno;
+
+		if (chdir_errno == ENOENT)
+		{
+			mkdirs(dir, false);
+			chdir_errno = chdir(dir) == 0 ? 0 : errno;
+		}
+		if (chdir_errno != 0)
+		{
+			fprintf(stderr, _("%s: Can't chdir to %s: %s\n"),
+					progname, dir, strerror(chdir_errno));
+			exit(EXIT_FAILURE);
+		}
+	}
+}
+
 static const char *psxrules;
 static const char *lcltime;
 static const char *directory;
@@ -473,27 +566,29 @@
 int
 main(int argc, char *argv[])
 {
-	int			i;
-	int			j;
-	int			c;
+	int			c,
+				k;
+	ptrdiff_t	i,
+				j;
 
 #ifndef WIN32
-	(void) umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH));
+	umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH));
 #endif   /* !WIN32 */
 	progname = argv[0];
 	if (TYPE_BIT(zic_t) <64)
 	{
-		(void) fprintf(stderr, "%s: %s\n", progname,
-					   _("wild compilation-time specification of zic_t"));
-		exit(EXIT_FAILURE);
-	}
-	for (i = 1; i < argc; ++i)
-		if (strcmp(argv[i], "--version") == 0)
-		{
-			(void) printf("%s\n", elsieid);
-			exit(EXIT_SUCCESS);
+		fprintf(stderr, "%s: %s\n", progname,
+				_("wild compilation-time specification of zic_t"));
+		return EXIT_FAILURE;
+	}
+	for (k = 1; k < argc; k++)
+		if (strcmp(argv[k], "--version") == 0)
+		{
+			printf("zic %s\n", PG_VERSION);
+			close_file(stdout, NULL, NULL);
+			return EXIT_SUCCESS;
 		}
-		else if (strcmp(argv[i], "--help") == 0)
+		else if (strcmp(argv[k], "--help") == 0)
 		{
 			usage(stdout, EXIT_SUCCESS);
 		}
@@ -507,10 +602,10 @@
 					directory = strdup(optarg);
 				else
 				{
-					(void) fprintf(stderr,
-								_("%s: More than one -d option specified\n"),
-								   progname);
-					exit(EXIT_FAILURE);
+					fprintf(stderr,
+							_("%s: More than one -d option specified\n"),
+							progname);
+					return EXIT_FAILURE;
 				}
 				break;
 			case 'l':
@@ -518,10 +613,10 @@
 					lcltime = strdup(optarg);
 				else
 				{
-					(void) fprintf(stderr,
-								_("%s: More than one -l option specified\n"),
-								   progname);
-					exit(EXIT_FAILURE);
+					fprintf(stderr,
+							_("%s: More than one -l option specified\n"),
+							progname);
+					return EXIT_FAILURE;
 				}
 				break;
 			case 'p':
@@ -529,10 +624,10 @@
 					psxrules = strdup(optarg);
 				else
 				{
-					(void) fprintf(stderr,
-								_("%s: More than one -p option specified\n"),
-								   progname);
-					exit(EXIT_FAILURE);
+					fprintf(stderr,
+							_("%s: More than one -p option specified\n"),
+							progname);
+					return EXIT_FAILURE;
 				}
 				break;
 			case 'y':
@@ -540,10 +635,10 @@
 					yitcommand = strdup(optarg);
 				else
 				{
-					(void) fprintf(stderr,
-								_("%s: More than one -y option specified\n"),
-								   progname);
-					exit(EXIT_FAILURE);
+					fprintf(stderr,
+							_("%s: More than one -y option specified\n"),
+							progname);
+					return EXIT_FAILURE;
 				}
 				break;
 			case 'L':
@@ -551,21 +646,21 @@
 					leapsec = strdup(optarg);
 				else
 				{
-					(void) fprintf(stderr,
-								_("%s: More than one -L option specified\n"),
-								   progname);
-					exit(EXIT_FAILURE);
+					fprintf(stderr,
+							_("%s: More than one -L option specified\n"),
+							progname);
+					return EXIT_FAILURE;
 				}
 				break;
 			case 'v':
-				noise = TRUE;
+				noise = true;
 				break;
 			case 'P':
-				print_abbrevs = TRUE;
+				print_abbrevs = true;
 				print_cutoff = time(NULL);
 				break;
 			case 's':
-				(void) printf("%s: -s ignored\n", progname);
+				warning(_("-s ignored"));
 				break;
 		}
 	if (optind == argc - 1 && strcmp(argv[optind], "=") == 0)
@@ -575,19 +670,18 @@
 	if (yitcommand == NULL)
 		yitcommand = "yearistype";
 
-	setboundaries();
-
 	if (optind < argc && leapsec != NULL)
 	{
 		infile(leapsec);
 		adjleap();
 	}
 
-	for (i = optind; i < argc; ++i)
-		infile(argv[i]);
+	for (k = optind; k < argc; k++)
+		infile(argv[k]);
 	if (errors)
-		exit(EXIT_FAILURE);
+		return EXIT_FAILURE;
 	associate();
+	change_directory(directory);
 	for (i = 0; i < nzones; i = j)
 	{
 		/*
@@ -604,7 +698,7 @@
 	for (i = 0; i < nlinks; ++i)
 	{
 		eat(links[i].l_filename, links[i].l_linenum);
-		dolink(links[i].l_from, links[i].l_to);
+		dolink(links[i].l_from, links[i].l_to, false);
 		if (noise)
 			for (j = 0; j < nlinks; ++j)
 				if (strcmp(links[i].l_to,
@@ -613,110 +707,343 @@
 	}
 	if (lcltime != NULL)
 	{
-		eat("command line", 1);
-		dolink(lcltime, TZDEFAULT);
+		eat(_("command line"), 1);
+		dolink(lcltime, TZDEFAULT, true);
 	}
 	if (psxrules != NULL)
 	{
-		eat("command line", 1);
-		dolink(psxrules, TZDEFRULES);
+		eat(_("command line"), 1);
+		dolink(psxrules, TZDEFRULES, true);
 	}
-	return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+	if (warnings && (ferror(stderr) || fclose(stderr) != 0))
+		return EXIT_FAILURE;
+	return errors ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
-static void
-dolink(const char *fromfield, const char *tofield)
+static bool
+componentcheck(char const * name, char const * component,
+			   char const * component_end)
 {
-	char	   *fromname;
-	char	   *toname;
+	enum
+	{
+	component_len_max = 14};
+	ptrdiff_t	component_len = component_end - component;
 
-	if (fromfield[0] == '/')
-		fromname = ecpyalloc(fromfield);
-	else
+	if (component_len == 0)
 	{
-		fromname = ecpyalloc(directory);
-		fromname = ecatalloc(fromname, "/");
-		fromname = ecatalloc(fromname, fromfield);
+		if (!*name)
+			error(_("empty file name"));
+		else
+			error(_(component == name
+					? "file name '%s' begins with '/'"
+					: *component_end
+					? "file name '%s' contains '//'"
+					: "file name '%s' ends with '/'"),
+				  name);
+		return false;
 	}
-	if (tofield[0] == '/')
-		toname = ecpyalloc(tofield);
-	else
+	if (0 < component_len && component_len <= 2
+		&& component[0] == '.' && component_end[-1] == '.')
+	{
+		int			len = component_len;
+
+		error(_("file name '%s' contains '%.*s' component"),
+			  name, len, component);
+		return false;
+	}
+	if (noise)
 	{
-		toname = ecpyalloc(directory);
-		toname = ecatalloc(toname, "/");
-		toname = ecatalloc(toname, tofield);
+		if (0 < component_len && component[0] == '-')
+			warning(_("file name '%s' component contains leading '-'"),
+					name);
+		if (component_len_max < component_len)
+			warning(_("file name '%s' contains overlength component"
+					  " '%.*s...'"),
+					name, component_len_max, component);
 	}
+	return true;
+}
+
+static bool
+namecheck(const char *name)
+{
+	char const *cp;
+
+	/* Benign characters in a portable file name.  */
+	static char const benign[] =
+	"-/_"
+	"abcdefghijklmnopqrstuvwxyz"
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+	/*
+	 * Non-control chars in the POSIX portable character set, excluding the
+	 * benign characters.
+	 */
+	static char const printable_and_not_benign[] =
+	" !\"#$%&'()*+,.0123456789:;<=>?@[\\]^`{|}~";
+
+	char const *component = name;
+
+	for (cp = name; *cp; cp++)
+	{
+		unsigned char c = *cp;
+
+		if (noise && !strchr(benign, c))
+		{
+			warning((strchr(printable_and_not_benign, c)
+					 ? _("file name '%s' contains byte '%c'")
+					 : _("file name '%s' contains byte '\\%o'")),
+					name, c);
+		}
+		if (c == '/')
+		{
+			if (!componentcheck(name, component, cp))
+				return false;
+			component = cp + 1;
+		}
+	}
+	return componentcheck(name, component, cp);
+}
+
+/*
+ * Create symlink contents suitable for symlinking FROM to TO, as a
+ * freshly allocated string.  FROM should be a relative file name, and
+ * is relative to the global variable DIRECTORY.  TO can be either
+ * relative or absolute.
+ */
+#ifdef HAVE_SYMLINK
+static char *
+relname(char const * from, char const * to)
+{
+	size_t		i,
+				taillen,
+				dotdotetcsize;
+	size_t		dir_len = 0,
+				dotdots = 0,
+				linksize = SIZE_MAX;
+	char const *f = from;
+	char	   *result = NULL;
+
+	if (*to == '/')
+	{
+		/* Make F absolute too.  */
+		size_t		len = strlen(directory);
+		bool		needslash = len && directory[len - 1] != '/';
+
+		linksize = len + needslash + strlen(from) + 1;
+		f = result = emalloc(linksize);
+		strcpy(result, directory);
+		result[len] = '/';
+		strcpy(result + len + needslash, from);
+	}
+	for (i = 0; f[i] && f[i] == to[i]; i++)
+		if (f[i] == '/')
+			dir_len = i + 1;
+	for (; to[i]; i++)
+		dotdots += to[i] == '/' && to[i - 1] != '/';
+	taillen = strlen(f + dir_len);
+	dotdotetcsize = 3 * dotdots + taillen + 1;
+	if (dotdotetcsize <= linksize)
+	{
+		if (!result)
+			result = emalloc(dotdotetcsize);
+		for (i = 0; i < dotdots; i++)
+			memcpy(result + 3 * i, "../", 3);
+		memmove(result + 3 * dotdots, f + dir_len, taillen + 1);
+	}
+	return result;
+}
+#endif   /* HAVE_SYMLINK */
+
+/* Hard link FROM to TO, following any symbolic links.
+   Return 0 if successful, an error number otherwise.  */
+static int
+hardlinkerr(char const * from, char const * to)
+{
+	int			r = linkat(AT_FDCWD, from, AT_FDCWD, to, AT_SYMLINK_FOLLOW);
+
+	return r == 0 ? 0 : errno;
+}
+
+static void
+dolink(char const * fromfield, char const * tofield, bool staysymlink)
+{
+	bool		todirs_made = false;
+	int			link_errno;
 
 	/*
 	 * We get to be careful here since there's a fair chance of root running
 	 * us.
 	 */
-	if (!itsdir(toname))
-		(void) remove(toname);
-	if (link(fromname, toname) != 0)
+	if (itsdir(fromfield))
 	{
-		int			result;
-
-		if (mkdirs(toname) != 0)
-			exit(EXIT_FAILURE);
+		fprintf(stderr, _("%s: link from %s/%s failed: %s\n"),
+				progname, directory, fromfield, strerror(EPERM));
+		exit(EXIT_FAILURE);
+	}
+	if (staysymlink)
+		staysymlink = itssymlink(tofield);
+	if (remove(tofield) == 0)
+		todirs_made = true;
+	else if (errno != ENOENT)
+	{
+		char const *e = strerror(errno);
 
-		result = link(fromname, toname);
+		fprintf(stderr, _("%s: Can't remove %s/%s: %s\n"),
+				progname, directory, tofield, e);
+		exit(EXIT_FAILURE);
+	}
+	link_errno = staysymlink ? ENOTSUP : hardlinkerr(fromfield, tofield);
+	if (link_errno == ENOENT && !todirs_made)
+	{
+		mkdirs(tofield, true);
+		todirs_made = true;
+		link_errno = hardlinkerr(fromfield, tofield);
+	}
+	if (link_errno != 0)
+	{
 #ifdef HAVE_SYMLINK
-		if (result != 0 &&
-			access(fromname, F_OK) == 0 &&
-			!itsdir(fromname))
-		{
-			const char *s = tofield;
-			char	   *symlinkcontents = NULL;
-
-			while ((s = strchr(s + 1, '/')) != NULL)
-				symlinkcontents = ecatalloc(symlinkcontents, "../");
-			symlinkcontents = ecatalloc(symlinkcontents, fromfield);
-
-			result = symlink(symlinkcontents, toname);
-			if (result == 0)
-				warning(_("hard link failed, symbolic link used"));
-			ifree(symlinkcontents);
+		bool		absolute = *fromfield == '/';
+		char	   *linkalloc = absolute ? NULL : relname(fromfield, tofield);
+		char const *contents = absolute ? fromfield : linkalloc;
+		int			symlink_errno = symlink(contents, tofield) == 0 ? 0 : errno;
+
+		if (symlink_errno == ENOENT && !todirs_made)
+		{
+			mkdirs(tofield, true);
+			symlink_errno = symlink(contents, tofield) == 0 ? 0 : errno;
+		}
+		free(linkalloc);
+		if (symlink_errno == 0)
+		{
+			if (link_errno != ENOTSUP)
+				warning(_("symbolic link used because hard link failed: %s"),
+						strerror(link_errno));
 		}
-#endif
-		if (result != 0)
+		else
+#endif   /* HAVE_SYMLINK */
 		{
-			const char *e = strerror(errno);
+			FILE	   *fp,
+					   *tp;
+			int			c;
 
-			(void) fprintf(stderr,
-						   _("%s: Cannot link from %s to %s: %s\n"),
-						   progname, fromname, toname, e);
-			exit(EXIT_FAILURE);
+			fp = fopen(fromfield, "rb");
+			if (!fp)
+			{
+				char const *e = strerror(errno);
+
+				fprintf(stderr, _("%s: Can't read %s/%s: %s\n"),
+						progname, directory, fromfield, e);
+				exit(EXIT_FAILURE);
+			}
+			tp = fopen(tofield, "wb");
+			if (!tp)
+			{
+				char const *e = strerror(errno);
+
+				fprintf(stderr, _("%s: Can't create %s/%s: %s\n"),
+						progname, directory, tofield, e);
+				exit(EXIT_FAILURE);
+			}
+			while ((c = getc(fp)) != EOF)
+				putc(c, tp);
+			close_file(fp, directory, fromfield);
+			close_file(tp, directory, tofield);
+			if (link_errno != ENOTSUP)
+				warning(_("copy used because hard link failed: %s"),
+						strerror(link_errno));
+#ifdef HAVE_SYMLINK
+			else if (symlink_errno != ENOTSUP)
+				warning(_("copy used because symbolic link failed: %s"),
+						strerror(symlink_errno));
+#endif
 		}
 	}
-	ifree(fromname);
-	ifree(toname);
 }
 
-#define TIME_T_BITS_IN_FILE   64
+#define TIME_T_BITS_IN_FILE 64
 
-static void
-setboundaries(void)
-{
-	int			i;
+static zic_t const min_time = MINVAL(zic_t, TIME_T_BITS_IN_FILE);
+static zic_t const max_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE);
 
-	min_time = -1;
-	for (i = 0; i < TIME_T_BITS_IN_FILE - 1; ++i)
-		min_time *= 2;
-	max_time = -(min_time + 1);
+/*
+ * Estimated time of the Big Bang, in seconds since the POSIX epoch.
+ * rounded downward to the negation of a power of two that is
+ * comfortably outside the error bounds.
+ *
+ * For the time of the Big Bang, see:
+ *
+ * Ade PAR, Aghanim N, Armitage-Caplan C et al.  Planck 2013 results.
+ * I. Overview of products and scientific results.
+ * arXiv:1303.5062 2013-03-20 20:10:01 UTC
+ * <http://arxiv.org/pdf/1303.5062v1> [PDF]
+ *
+ * Page 36, Table 9, row Age/Gyr, column Planck+WP+highL+BAO 68% limits
+ * gives the value 13.798 plus-or-minus 0.037 billion years.
+ * Multiplying this by 1000000000 and then by 31557600 (the number of
+ * seconds in an astronomical year) gives a value that is comfortably
+ * less than 2**59, so BIG_BANG is - 2**59.
+ *
+ * BIG_BANG is approximate, and may change in future versions.
+ * Please do not rely on its exact value.
+ */
+
+#ifndef BIG_BANG
+#define BIG_BANG (- (((zic_t) 1) << 59))
+#endif
+
+/* If true, work around GNOME bug 730332
+   <https://bugzilla.gnome.org/show_bug.cgi?id=730332>
+   by refusing to output time stamps before BIG_BANG.
+   Such time stamps are physically suspect anyway.
+
+   The GNOME bug is scheduled to be fixed in GNOME 3.22, and if so
+   this workaround will no longer be needed when GNOME 3.21 and
+   earlier are obsolete, say in the year 2021.  */
+enum
+{
+WORK_AROUND_GNOME_BUG_730332 = true};
+
+static const zic_t early_time = (WORK_AROUND_GNOME_BUG_730332
+								 ? BIG_BANG
+								 : MINVAL(zic_t, TIME_T_BITS_IN_FILE));
+
+/* Return true if NAME is a directory.  */
+static bool
+itsdir(char const * name)
+{
+	struct stat st;
+	int			res = stat(name, &st);
+#ifdef S_ISDIR
+	if (res == 0)
+		return S_ISDIR(st.st_mode) != 0;
+#endif
+	if (res == 0 || errno == EOVERFLOW)
+	{
+		size_t		n = strlen(name);
+		char	   *nameslashdot = emalloc(n + 3);
+		bool		dir;
+
+		memcpy(nameslashdot, name, n);
+		strcpy(&nameslashdot[n], &"/."[!(n && name[n - 1] != '/')]);
+		dir = stat(nameslashdot, &st) == 0 || errno == EOVERFLOW;
+		free(nameslashdot);
+		return dir;
+	}
+	return false;
 }
 
-static int
-itsdir(const char *name)
+/* Return true if NAME is a symbolic link.  */
+static bool
+itssymlink(char const * name)
 {
-	char	   *myname;
-	int			accres;
+#ifdef HAVE_SYMLINK
+	char		c;
 
-	myname = ecpyalloc(name);
-	myname = ecatalloc(myname, "/.");
-	accres = access(myname, F_OK);
-	ifree(myname);
-	return accres == 0;
+	return 0 <= readlink(name, &c, 1);
+#else
+	return false;
+#endif
 }
 
 /*
@@ -739,15 +1066,14 @@
 {
 	struct zone *zp;
 	struct rule *rp;
-	int			base,
+	ptrdiff_t	i,
+				j,
+				base,
 				out;
-	int			i,
-				j;
 
 	if (nrules != 0)
 	{
-		(void) qsort((void *) rules, (size_t) nrules,
-					 (size_t) sizeof *rules, rcomp);
+		qsort(rules, nrules, sizeof *rules, rcomp);
 		for (i = 0; i < nrules - 1; ++i)
 		{
 			if (strcmp(rules[i].r_name,
@@ -807,14 +1133,14 @@
 			 */
 			eat(zp->z_filename, zp->z_linenum);
 			zp->z_stdoff = gethms(zp->z_rule, _("unruly zone"),
-								  TRUE);
+								  true);
 
 			/*
 			 * Note, though, that if there's no rule, a '%s' in the format is
 			 * a bad thing.
 			 */
-			if (strchr(zp->z_format, '%') != NULL)
-				error(_("%s in ruleless zone"));
+			if (zp->z_format_specifier == 's')
+				error("%s", _("%s in ruleless zone"));
 		}
 	}
 	if (errors)
@@ -829,8 +1155,8 @@
 	char	   *cp;
 	const struct lookup *lp;
 	int			nfields;
-	int			wantcont;
-	int			num;
+	bool		wantcont;
+	lineno_t	num;
 	char		buf[BUFSIZ];
 
 	if (strcmp(name, "-") == 0)
@@ -842,15 +1168,15 @@
 	{
 		const char *e = strerror(errno);
 
-		(void) fprintf(stderr, _("%s: Cannot open %s: %s\n"),
-					   progname, name, e);
+		fprintf(stderr, _("%s: Cannot open %s: %s\n"),
+				progname, name, e);
 		exit(EXIT_FAILURE);
 	}
-	wantcont = FALSE;
+	wantcont = false;
 	for (num = 1;; ++num)
 	{
 		eat(name, num);
-		if (fgets(buf, (int) sizeof buf, fp) != buf)
+		if (fgets(buf, sizeof buf, fp) != buf)
 			break;
 		cp = strchr(buf, '\n');
 		if (cp == NULL)
@@ -881,70 +1207,58 @@
 			if (lp == NULL)
 				error(_("input line of unknown type"));
 			else
-				switch ((int) (lp->l_value))
+				switch (lp->l_value)
 				{
 					case LC_RULE:
 						inrule(fields, nfields);
-						wantcont = FALSE;
+						wantcont = false;
 						break;
 					case LC_ZONE:
 						wantcont = inzone(fields, nfields);
 						break;
 					case LC_LINK:
 						inlink(fields, nfields);
-						wantcont = FALSE;
+						wantcont = false;
 						break;
 					case LC_LEAP:
 						if (name != leapsec)
-							(void) fprintf(stderr,
-							_("%s: Leap line in non leap seconds file %s\n"),
-										   progname, name);
+							warning(_("%s: Leap line in non leap"
+									  " seconds file %s"),
+									progname, name);
 						else
 							inleap(fields, nfields);
-						wantcont = FALSE;
+						wantcont = false;
 						break;
 					default:	/* "cannot happen" */
-						(void) fprintf(stderr,
-									   _("%s: panic: Invalid l_value %d\n"),
-									   progname, lp->l_value);
+						fprintf(stderr,
+								_("%s: panic: Invalid l_value %d\n"),
+								progname, lp->l_value);
 						exit(EXIT_FAILURE);
 				}
 		}
-		ifree((char *) fields);
-	}
-	if (ferror(fp))
-	{
-		(void) fprintf(stderr, _("%s: Error reading %s\n"),
-					   progname, filename);
-		exit(EXIT_FAILURE);
-	}
-	if (fp != stdin && fclose(fp))
-	{
-		const char *e = strerror(errno);
-
-		(void) fprintf(stderr, _("%s: Error closing %s: %s\n"),
-					   progname, filename, e);
-		exit(EXIT_FAILURE);
+		free(fields);
 	}
+	close_file(fp, NULL, filename);
 	if (wantcont)
 		error(_("expected continuation line not found"));
 }
 
-/*----------
+/*
  * Convert a string of one of the forms
  *	h	-h	hh:mm	-hh:mm	hh:mm:ss	-hh:mm:ss
  * into a number of seconds.
  * A null string maps to zero.
  * Call error with errstring and return zero on errors.
- *----------
  */
-static long
-gethms(const char *string, const char *errstring, int signable)
+static zic_t
+gethms(char const * string, char const * errstring, bool signable)
 {
-	long		hh;
+	/* PG: make hh be int not zic_t to avoid sscanf portability issues */
+	int			hh;
 	int			mm,
 				ss,
 				sign;
+	char		xs;
 
 	if (string == NULL || *string == '\0')
 		return 0;
@@ -957,35 +1271,36 @@
 	}
 	else
 		sign = 1;
-	if (sscanf(string, scheck(string, "%ld"), &hh) == 1)
+	if (sscanf(string, "%d%c", &hh, &xs) == 1)
 		mm = ss = 0;
-	else if (sscanf(string, scheck(string, "%ld:%d"), &hh, &mm) == 2)
+	else if (sscanf(string, "%d:%d%c", &hh, &mm, &xs) == 2)
 		ss = 0;
-	else if (sscanf(string, scheck(string, "%ld:%d:%d"),
-					&hh, &mm, &ss) != 3)
+	else if (sscanf(string, "%d:%d:%d%c", &hh, &mm, &ss, &xs)
+			 != 3)
 	{
-		error(errstring);
+		error("%s", errstring);
 		return 0;
 	}
 	if (hh < 0 ||
 		mm < 0 || mm >= MINSPERHOUR ||
 		ss < 0 || ss > SECSPERMIN)
 	{
-		error(errstring);
+		error("%s", errstring);
 		return 0;
 	}
-	if (LONG_MAX / SECSPERHOUR < hh)
+	/* Some compilers warn that this test is unsatisfiable for 32-bit ints */
+#if INT_MAX > PG_INT32_MAX
+	if (ZIC_MAX / SECSPERHOUR < hh)
 	{
 		error(_("time overflow"));
 		return 0;
 	}
-	if (noise && hh == HOURSPERDAY && mm == 0 && ss == 0)
-		warning(_("24:00 not handled by pre-1998 versions of zic"));
+#endif
 	if (noise && (hh > HOURSPERDAY ||
 				  (hh == HOURSPERDAY && (mm != 0 || ss != 0))))
 		warning(_("values over 24 hours not handled by pre-2007 versions of zic"));
-	return oadd(eitol(sign) * hh * eitol(SECSPERHOUR),
-				eitol(sign) * (eitol(mm) * eitol(SECSPERMIN) + eitol(ss)));
+	return oadd(sign * (zic_t) hh * SECSPERHOUR,
+				sign * (mm * SECSPERMIN + ss));
 }
 
 static void
@@ -1005,80 +1320,71 @@
 	}
 	r.r_filename = filename;
 	r.r_linenum = linenum;
-	r.r_stdoff = gethms(fields[RF_STDOFF], _("invalid saved time"), TRUE);
+	r.r_stdoff = gethms(fields[RF_STDOFF], _("invalid saved time"), true);
 	rulesub(&r, fields[RF_LOYEAR], fields[RF_HIYEAR], fields[RF_COMMAND],
 			fields[RF_MONTH], fields[RF_DAY], fields[RF_TOD]);
 	r.r_name = ecpyalloc(fields[RF_NAME]);
 	r.r_abbrvar = ecpyalloc(fields[RF_ABBRVAR]);
 	if (max_abbrvar_len < strlen(r.r_abbrvar))
 		max_abbrvar_len = strlen(r.r_abbrvar);
-	rules = (struct rule *) (void *) erealloc((char *) rules,
-									   (int) ((nrules + 1) * sizeof *rules));
+	rules = growalloc(rules, sizeof *rules, nrules, &nrules_alloc);
 	rules[nrules++] = r;
 }
 
-static int
+static bool
 inzone(char **fields, int nfields)
 {
-	int			i;
-	static char *buf;
+	ptrdiff_t	i;
 
 	if (nfields < ZONE_MINFIELDS || nfields > ZONE_MAXFIELDS)
 	{
 		error(_("wrong number of fields on Zone line"));
-		return FALSE;
+		return false;
 	}
 	if (strcmp(fields[ZF_NAME], TZDEFAULT) == 0 && lcltime != NULL)
 	{
-		buf = erealloc(buf, (int) (132 + strlen(TZDEFAULT)));
-		(void) sprintf(buf,
-				  _("\"Zone %s\" line and -l option are mutually exclusive"),
-					   TZDEFAULT);
-		error(buf);
-		return FALSE;
+		error(
+			  _("\"Zone %s\" line and -l option are mutually exclusive"),
+			  TZDEFAULT);
+		return false;
 	}
 	if (strcmp(fields[ZF_NAME], TZDEFRULES) == 0 && psxrules != NULL)
 	{
-		buf = erealloc(buf, (int) (132 + strlen(TZDEFRULES)));
-		(void) sprintf(buf,
-				  _("\"Zone %s\" line and -p option are mutually exclusive"),
-					   TZDEFRULES);
-		error(buf);
-		return FALSE;
+		error(
+			  _("\"Zone %s\" line and -p option are mutually exclusive"),
+			  TZDEFRULES);
+		return false;
 	}
 	for (i = 0; i < nzones; ++i)
 		if (zones[i].z_name != NULL &&
 			strcmp(zones[i].z_name, fields[ZF_NAME]) == 0)
 		{
-			buf = erealloc(buf, (int) (132 +
-									   strlen(fields[ZF_NAME]) +
-									   strlen(zones[i].z_filename)));
-			(void) sprintf(buf,
-						   _("duplicate zone name %s (file \"%s\", line %d)"),
-						   fields[ZF_NAME],
-						   zones[i].z_filename,
-						   zones[i].z_linenum);
-			error(buf);
-			return FALSE;
+			error(_("duplicate zone name %s"
+					" (file \"%s\", line %" PRIdLINENO ")"),
+				  fields[ZF_NAME],
+				  zones[i].z_filename,
+				  zones[i].z_linenum);
+			return false;
 		}
-	return inzsub(fields, nfields, FALSE);
+	return inzsub(fields, nfields, false);
 }
 
-static int
+static bool
 inzcont(char **fields, int nfields)
 {
 	if (nfields < ZONEC_MINFIELDS || nfields > ZONEC_MAXFIELDS)
 	{
 		error(_("wrong number of fields on Zone continuation line"));
-		return FALSE;
+		return false;
 	}
-	return inzsub(fields, nfields, TRUE);
+	return inzsub(fields, nfields, true);
 }
 
-static int
-inzsub(char **fields, int nfields, int iscont)
+static bool
+inzsub(char **fields, int nfields, bool iscont)
 {
 	char	   *cp;
+	char	   *cp1;
 	static struct zone z;
 	int			i_gmtoff,
 				i_rule,
@@ -1087,7 +1393,7 @@
 				i_untilmonth;
 	int			i_untilday,
 				i_untiltime;
-	int			hasuntil;
+	bool		hasuntil;
 
 	if (iscont)
 	{
@@ -1100,6 +1406,8 @@
 		i_untiltime = ZFC_TILTIME;
 		z.z_name = NULL;
 	}
+	else if (!namecheck(fields[ZF_NAME]))
+		return false;
 	else
 	{
 		i_gmtoff = ZF_GMTOFF;
@@ -1113,17 +1421,26 @@
 	}
 	z.z_filename = filename;
 	z.z_linenum = linenum;
-	z.z_gmtoff = gethms(fields[i_gmtoff], _("invalid UTC offset"), TRUE);
+	z.z_gmtoff = gethms(fields[i_gmtoff], _("invalid UT offset"), true);
 	if ((cp = strchr(fields[i_format], '%')) != NULL)
 	{
-		if (*++cp != 's' || strchr(cp, '%') != NULL)
+		if ((*++cp != 's' && *cp != 'z') || strchr(cp, '%')
+			|| strchr(fields[i_format], '/'))
 		{
 			error(_("invalid abbreviation format"));
-			return FALSE;
+			return false;
 		}
 	}
 	z.z_rule = ecpyalloc(fields[i_rule]);
-	z.z_format = ecpyalloc(fields[i_format]);
+	z.z_format = cp1 = ecpyalloc(fields[i_format]);
+	z.z_format_specifier = cp ? *cp : '\0';
+	if (z.z_format_specifier == 'z')
+	{
+		if (noise)
+			warning(_("format '%s' not handled by pre-2015 versions of zic"),
+					z.z_format);
+		cp1[cp - fields[i_format]] = 's';
+	}
 	if (max_format_len < strlen(z.z_format))
 		max_format_len = strlen(z.z_format);
 	hasuntil = nfields > i_untilyear;
@@ -1149,11 +1466,10 @@
 			zones[nzones - 1].z_untiltime >= z.z_untiltime)
 		{
 			error(_("Zone continuation line end time is not after end time of previous line"));
-			return FALSE;
+			return false;
 		}
 	}
-	zones = (struct zone *) (void *) erealloc((char *) zones,
-									   (int) ((nzones + 1) * sizeof *zones));
+	zones = growalloc(zones, sizeof *zones, nzones, &nzones_alloc);
 	zones[nzones++] = z;
 
 	/*
@@ -1168,14 +1484,17 @@
 {
 	const char *cp;
 	const struct lookup *lp;
-	int			i,
+	zic_t		i,
 				j;
-	int			year,
-				month,
+
+	/* PG: make year be int not zic_t to avoid sscanf portability issues */
+	int			year;
+	int			month,
 				day;
-	long		dayoff,
+	zic_t		dayoff,
 				tod;
 	zic_t		t;
+	char		xs;
 
 	if (nfields != LEAP_FIELDS)
 	{
@@ -1184,7 +1503,7 @@
 	}
 	dayoff = 0;
 	cp = fields[LP_YEAR];
-	if (sscanf(cp, scheck(cp, "%d"), &year) != 1)
+	if (sscanf(cp, "%d%c", &year, &xs) != 1)
 	{
 		/*
 		 * Leapin' Lizards!
@@ -1196,7 +1515,7 @@
 		leapmaxyear = year;
 	if (!leapseen || leapminyear > year)
 		leapminyear = year;
-	leapseen = TRUE;
+	leapseen = true;
 	j = EPOCH_YEAR;
 	while (j != year)
 	{
@@ -1210,7 +1529,7 @@
 			--j;
 			i = -len_years[isleap(j)];
 		}
-		dayoff = oadd(dayoff, eitol(i));
+		dayoff = oadd(dayoff, i);
 	}
 	if ((lp = byword(fields[LP_MONTH], mon_names)) == NULL)
 	{
@@ -1222,17 +1541,17 @@
 	while (j != month)
 	{
 		i = len_months[isleap(year)][j];
-		dayoff = oadd(dayoff, eitol(i));
+		dayoff = oadd(dayoff, i);
 		++j;
 	}
 	cp = fields[LP_DAY];
-	if (sscanf(cp, scheck(cp, "%d"), &day) != 1 ||
+	if (sscanf(cp, "%d%c", &day, &xs) != 1 ||
 		day <= 0 || day > len_months[isleap(year)][month])
 	{
 		error(_("invalid day of month"));
 		return;
 	}
-	dayoff = oadd(dayoff, eitol(day - 1));
+	dayoff = oadd(dayoff, day - 1);
 	if (dayoff < min_time / SECSPERDAY)
 	{
 		error(_("time too small"));
@@ -1243,32 +1562,31 @@
 		error(_("time too large"));
 		return;
 	}
-	t = (zic_t) dayoff *SECSPERDAY;
-
-	tod = gethms(fields[LP_TIME], _("invalid time of day"), FALSE);
+	t = dayoff * SECSPERDAY;
+	tod = gethms(fields[LP_TIME], _("invalid time of day"), false);
 	cp = fields[LP_CORR];
 	{
-		int			positive;
+		bool		positive;
 		int			count;
 
 		if (strcmp(cp, "") == 0)
 		{						/* infile() turns "-" into "" */
-			positive = FALSE;
+			positive = false;
 			count = 1;
 		}
 		else if (strcmp(cp, "--") == 0)
 		{
-			positive = FALSE;
+			positive = false;
 			count = 2;
 		}
 		else if (strcmp(cp, "+") == 0)
 		{
-			positive = TRUE;
+			positive = true;
 			count = 1;
 		}
 		else if (strcmp(cp, "++") == 0)
 		{
-			positive = TRUE;
+			positive = true;
 			count = 2;
 		}
 		else
@@ -1281,7 +1599,13 @@
 			error(_("illegal Rolling/Stationary field on Leap line"));
 			return;
 		}
-		leapadd(tadd(t, tod), positive, lp->l_value, count);
+		t = tadd(t, tod);
+		if (t < early_time)
+		{
+			error(_("leap second precedes Big Bang"));
+			return;
+		}
+		leapadd(t, positive, lp->l_value, count);
 	}
 }
 
@@ -1300,17 +1624,13 @@
 		error(_("blank FROM field on Link line"));
 		return;
 	}
-	if (*fields[LF_TO] == '\0')
-	{
-		error(_("blank TO field on Link line"));
+	if (!namecheck(fields[LF_TO]))
 		return;
-	}
 	l.l_filename = filename;
 	l.l_linenum = linenum;
 	l.l_from = ecpyalloc(fields[LF_FROM]);
 	l.l_to = ecpyalloc(fields[LF_TO]);
-	links = (struct link *) (void *) erealloc((char *) links,
-									   (int) ((nlinks + 1) * sizeof *links));
+	links = growalloc(links, sizeof *links, nlinks, &nlinks_alloc);
 	links[nlinks++] = l;
 }
 
@@ -1323,6 +1643,10 @@
 	const char *cp;
 	char	   *dp;
 	char	   *ep;
+	char		xs;
+
+	/* PG: year_tmp is to avoid sscanf portability issues */
+	int			year_tmp;
 
 	if ((lp = byword(monthp, mon_names)) == NULL)
 	{
@@ -1330,8 +1654,8 @@
 		return;
 	}
 	rp->r_month = lp->l_value;
-	rp->r_todisstd = FALSE;
-	rp->r_todisgmt = FALSE;
+	rp->r_todisstd = false;
+	rp->r_todisgmt = false;
 	dp = ecpyalloc(timep);
 	if (*dp != '\0')
 	{
@@ -1339,26 +1663,26 @@
 		switch (lowerit(*ep))
 		{
 			case 's':			/* Standard */
-				rp->r_todisstd = TRUE;
-				rp->r_todisgmt = FALSE;
+				rp->r_todisstd = true;
+				rp->r_todisgmt = false;
 				*ep = '\0';
 				break;
 			case 'w':			/* Wall */
-				rp->r_todisstd = FALSE;
-				rp->r_todisgmt = FALSE;
+				rp->r_todisstd = false;
+				rp->r_todisgmt = false;
 				*ep = '\0';
 				break;
 			case 'g':			/* Greenwich */
 			case 'u':			/* Universal */
 			case 'z':			/* Zulu */
-				rp->r_todisstd = TRUE;
-				rp->r_todisgmt = TRUE;
+				rp->r_todisstd = true;
+				rp->r_todisgmt = true;
 				*ep = '\0';
 				break;
 		}
 	}
-	rp->r_tod = gethms(dp, _("invalid time of day"), FALSE);
-	ifree(dp);
+	rp->r_tod = gethms(dp, _("invalid time of day"), false);
+	free(dp);
 
 	/*
 	 * Year work.
@@ -1367,21 +1691,23 @@
 	lp = byword(cp, begin_years);
 	rp->r_lowasnum = lp == NULL;
 	if (!rp->r_lowasnum)
-		switch ((int) lp->l_value)
+		switch (lp->l_value)
 		{
 			case YR_MINIMUM:
-				rp->r_loyear = INT_MIN;
+				rp->r_loyear = ZIC_MIN;
 				break;
 			case YR_MAXIMUM:
-				rp->r_loyear = INT_MAX;
+				rp->r_loyear = ZIC_MAX;
 				break;
 			default:			/* "cannot happen" */
-				(void) fprintf(stderr,
-							   _("%s: panic: Invalid l_value %d\n"),
-							   progname, lp->l_value);
+				fprintf(stderr,
+						_("%s: panic: Invalid l_value %d\n"),
+						progname, lp->l_value);
 				exit(EXIT_FAILURE);
 		}
-	else if (sscanf(cp, scheck(cp, "%d"), &rp->r_loyear) != 1)
+	else if (sscanf(cp, "%d%c", &year_tmp, &xs) == 1)
+		rp->r_loyear = year_tmp;
+	else
 	{
 		error(_("invalid starting year"));
 		return;
@@ -1390,24 +1716,26 @@
 	lp = byword(cp, end_years);
 	rp->r_hiwasnum = lp == NULL;
 	if (!rp->r_hiwasnum)
-		switch ((int) lp->l_value)
+		switch (lp->l_value)
 		{
 			case YR_MINIMUM:
-				rp->r_hiyear = INT_MIN;
+				rp->r_hiyear = ZIC_MIN;
 				break;
 			case YR_MAXIMUM:
-				rp->r_hiyear = INT_MAX;
+				rp->r_hiyear = ZIC_MAX;
 				break;
 			case YR_ONLY:
 				rp->r_hiyear = rp->r_loyear;
 				break;
 			default:			/* "cannot happen" */
-				(void) fprintf(stderr,
-							   _("%s: panic: Invalid l_value %d\n"),
-							   progname, lp->l_value);
+				fprintf(stderr,
+						_("%s: panic: Invalid l_value %d\n"),
+						progname, lp->l_value);
 				exit(EXIT_FAILURE);
 		}
-	else if (sscanf(cp, scheck(cp, "%d"), &rp->r_hiyear) != 1)
+	else if (sscanf(cp, "%d%c", &year_tmp, &xs) == 1)
+		rp->r_hiyear = year_tmp;
+	else
 	{
 		error(_("invalid ending year"));
 		return;
@@ -1456,65 +1784,67 @@
 			if (*ep++ != '=')
 			{
 				error(_("invalid day of month"));
-				ifree(dp);
+				free(dp);
 				return;
 			}
 			if ((lp = byword(dp, wday_names)) == NULL)
 			{
 				error(_("invalid weekday name"));
-				ifree(dp);
+				free(dp);
 				return;
 			}
 			rp->r_wday = lp->l_value;
 		}
-		if (sscanf(ep, scheck(ep, "%d"), &rp->r_dayofmonth) != 1 ||
+		if (sscanf(ep, "%d%c", &rp->r_dayofmonth, &xs) != 1 ||
 			rp->r_dayofmonth <= 0 ||
 			(rp->r_dayofmonth > len_months[1][rp->r_month]))
 		{
 			error(_("invalid day of month"));
-			ifree(dp);
+			free(dp);
 			return;
 		}
 	}
-	ifree(dp);
+	free(dp);
 }
 
 static void
-convert(long val, char *buf)
+convert(const int32 val, char *const buf)
 {
 	int			i;
 	int			shift;
+	unsigned char *const b = (unsigned char *) buf;
 
 	for (i = 0, shift = 24; i < 4; ++i, shift -= 8)
-		buf[i] = val >> shift;
+		b[i] = val >> shift;
 }
 
 static void
-convert64(zic_t val, char *buf)
+convert64(const zic_t val, char *const buf)
 {
 	int			i;
 	int			shift;
+	unsigned char *const b = (unsigned char *) buf;
 
 	for (i = 0, shift = 56; i < 8; ++i, shift -= 8)
-		buf[i] = val >> shift;
+		b[i] = val >> shift;
 }
 
 static void
-puttzcode(long val, FILE *fp)
+puttzcode(const int32 val, FILE *const fp)
 {
 	char		buf[4];
 
 	convert(val, buf);
-	(void) fwrite((void *) buf, (size_t) sizeof buf, (size_t) 1, fp);
+	fwrite(buf, sizeof buf, 1, fp);
 }
 
 static void
-puttzcode64(zic_t val, FILE *fp)
+puttzcode64(const zic_t val, FILE *const fp)
 {
 	char		buf[8];
 
 	convert64(val, buf);
-	(void) fwrite((void *) buf, (size_t) sizeof buf, (size_t) 1, fp);
+	fwrite(buf, sizeof buf, 1, fp);
 }
 
 static int
@@ -1526,69 +1856,80 @@
 	return (a < b) ? -1 : (a > b);
 }
 
-static int
-is32(zic_t x)
+static bool
+is32(const zic_t x)
 {
 	return x == ((zic_t) ((int32) x));
 }
 
 static void
-writezone(const char *name, const char *string)
+writezone(const char *const name, const char *const string, char version)
 {
 	FILE	   *fp;
-	int			i,
+	ptrdiff_t	i,
 				j;
 	int			leapcnt32,
 				leapi32;
-	int			timecnt32,
+	ptrdiff_t	timecnt32,
 				timei32;
 	int			pass;
-	static char *fullname;
 	static const struct tzhead tzh0;
 	static struct tzhead tzh;
-	zic_t		ats[TZ_MAX_TIMES];
-	unsigned char types[TZ_MAX_TIMES];
+	bool		dir_checked = false;
+	zic_t		one = 1;
+	zic_t		y2038_boundary = one << 31;
+	ptrdiff_t	nats = timecnt + WORK_AROUND_QTBUG_53071;
+	zic_t	   *ats = emalloc(size_product(nats, sizeof *ats + 1));
+	void	   *typesptr = ats + nats;
+	unsigned char *types = typesptr;
 
 	/*
 	 * Sort.
 	 */
 	if (timecnt > 1)
-		(void) qsort((void *) attypes, (size_t) timecnt,
-					 (size_t) sizeof *attypes, atcomp);
+		qsort(attypes, timecnt, sizeof *attypes, atcomp);
 
 	/*
 	 * Optimize.
 	 */
 	{
-		int			fromi;
-		int			toi;
+		ptrdiff_t	fromi,
+					toi;
 
 		toi = 0;
 		fromi = 0;
-		while (fromi < timecnt && attypes[fromi].at < min_time)
+		while (fromi < timecnt && attypes[fromi].at < early_time)
 			++fromi;
-		if (isdsts[0] == 0)
-			while (fromi < timecnt && attypes[fromi].type == 0)
-				++fromi;		/* handled by default rule */
 		for (; fromi < timecnt; ++fromi)
 		{
-			if (toi != 0
-				&& ((attypes[fromi].at
-					 + gmtoffs[attypes[toi - 1].type])
-					<= (attypes[toi - 1].at
-						+ gmtoffs[toi == 1 ? 0
-								  : attypes[toi - 2].type])))
+			if (toi > 1 && ((attypes[fromi].at +
+							 gmtoffs[attypes[toi - 1].type]) <=
+							(attypes[toi - 1].at +
+							 gmtoffs[attypes[toi - 2].type])))
 			{
-				attypes[toi - 1].type = attypes[fromi].type;
+				attypes[toi - 1].type =
+					attypes[fromi].type;
 				continue;
 			}
-			if (toi == 0 ||
-				attypes[toi - 1].type != attypes[fromi].type)
+			if (toi == 0
+				|| attypes[fromi].dontmerge
+				|| attypes[toi - 1].type != attypes[fromi].type)
 				attypes[toi++] = attypes[fromi];
 		}
 		timecnt = toi;
 	}
 
+	if (noise && timecnt > 1200)
+	{
+		if (timecnt > TZ_MAX_TIMES)
+			warning(_("reference clients mishandle"
+					  " more than %d transition times"),
+					TZ_MAX_TIMES);
+		else
+			warning(_("pre-2014 clients may mishandle"
+					  " more than 1200 transition times"));
+	}
+
 	/*
 	 * Transfer.
 	 */
@@ -1599,6 +1940,20 @@
 	}
 
 	/*
+	 * Work around QTBUG-53071 for time stamps less than y2038_boundary - 1,
+	 * by inserting a no-op transition at time y2038_boundary - 1. This works
+	 * only for timestamps before the boundary, which should be good enough in
+	 * practice as QTBUG-53071 should be long-dead by 2038.
+	 */
+	if (WORK_AROUND_QTBUG_53071 && timecnt != 0
+		&& ats[timecnt - 1] < y2038_boundary - 1 && strchr(string, '<'))
+	{
+		ats[timecnt] = y2038_boundary - 1;
+		types[timecnt] = types[timecnt - 1];
+		timecnt++;
+	}
+
+	/*
 	 * Correct for leap seconds.
 	 */
 	for (i = 0; i < timecnt; ++i)
@@ -1626,6 +1981,15 @@
 		--timecnt32;
 		++timei32;
 	}
+
+	/*
+	 * Output an INT32_MIN "transition" if appropriate; see below.
+	 */
+	if (timei32 > 0 && ats[timei32] > PG_INT32_MIN)
+	{
+		--timei32;
+		++timecnt32;
+	}
 	while (leapcnt32 > 0 && !is32(trans[leapcnt32 - 1]))
 		--leapcnt32;
 	while (leapcnt32 > 0 && !is32(trans[leapi32]))
@@ -1633,53 +1997,59 @@
 		--leapcnt32;
 		++leapi32;
 	}
-	fullname = erealloc(fullname,
-						(int) (strlen(directory) + 1 + strlen(name) + 1));
-	(void) sprintf(fullname, "%s/%s", directory, name);
 
 	/*
 	 * Remove old file, if any, to snap links.
 	 */
-	if (!itsdir(fullname) && remove(fullname) != 0 && errno != ENOENT)
+	if (remove(name) == 0)
+		dir_checked = true;
+	else if (errno != ENOENT)
 	{
 		const char *e = strerror(errno);
 
-		(void) fprintf(stderr, _("%s: Cannot remove %s: %s\n"),
-					   progname, fullname, e);
+		fprintf(stderr, _("%s: Cannot remove %s/%s: %s\n"),
+				progname, directory, name, e);
 		exit(EXIT_FAILURE);
 	}
-	if ((fp = fopen(fullname, "wb")) == NULL)
+	fp = fopen(name, "wb");
+	if (!fp)
 	{
-		if (mkdirs(fullname) != 0)
-			(void) exit(EXIT_FAILURE);
-		if ((fp = fopen(fullname, "wb")) == NULL)
-		{
-			const char *e = strerror(errno);
+		int			fopen_errno = errno;
 
-			(void) fprintf(stderr, _("%s: Cannot create %s: %s\n"),
-						   progname, fullname, e);
+		if (fopen_errno == ENOENT && !dir_checked)
+		{
+			mkdirs(name, true);
+			fp = fopen(name, "wb");
+			fopen_errno = errno;
+		}
+		if (!fp)
+		{
+			fprintf(stderr, _("%s: Cannot create %s/%s: %s\n"),
+					progname, directory, name, strerror(fopen_errno));
 			exit(EXIT_FAILURE);
 		}
 	}
 	for (pass = 1; pass <= 2; ++pass)
 	{
-		register int thistimei,
-					thistimecnt;
-		register int thisleapi,
-					thisleapcnt;
-		register int thistimelim,
+		ptrdiff_t	thistimei,
+					thistimecnt,
+					thistimelim;
+		int			thisleapi,
+					thisleapcnt,
 					thisleaplim;
-		int			writetype[TZ_MAX_TIMES];
+		int			writetype[TZ_MAX_TYPES];
 		int			typemap[TZ_MAX_TYPES];
-		register int thistypecnt;
+		int			thistypecnt;
 		char		thischars[TZ_MAX_CHARS];
-		char		thischarcnt;
+		int			thischarcnt;
+		bool		toomanytimes;
 		int			indmap[TZ_MAX_CHARS];
 
 		if (pass == 1)
 		{
 			thistimei = timei32;
 			thistimecnt = timecnt32;
+			toomanytimes = thistimecnt >> 31 >> 1 != 0;
 			thisleapi = leapi32;
 			thisleapcnt = leapcnt32;
 		}
@@ -1687,9 +2057,12 @@
 		{
 			thistimei = 0;
 			thistimecnt = timecnt;
+			toomanytimes = thistimecnt >> 31 >> 31 >> 2 != 0;
 			thisleapi = 0;
 			thisleapcnt = leapcnt;
 		}
+		if (toomanytimes)
+			error(_("too many transition times"));
 		thistimelim = thistimei + thistimecnt;
 		thisleaplim = thisleapi + thisleapcnt;
 		for (i = 0; i < typecnt; ++i)
@@ -1697,24 +2070,79 @@
 		if (thistimecnt == 0)
 		{
 			/*
-			 * * No transition times fall in the current * (32- or 64-bit)
-			 * window.
+			 * No transition times fall in the current (32- or 64-bit) window.
 			 */
 			if (typecnt != 0)
-				writetype[typecnt - 1] = TRUE;
+				writetype[typecnt - 1] = true;
 		}
 		else
 		{
 			for (i = thistimei - 1; i < thistimelim; ++i)
 				if (i >= 0)
-					writetype[types[i]] = TRUE;
+					writetype[types[i]] = true;
 
 			/*
-			 * * For America/Godthab and Antarctica/Palmer
+			 * For America/Godthab and Antarctica/Palmer
 			 */
 			if (thistimei == 0)
-				writetype[0] = TRUE;
+				writetype[0] = true;
+		}
+#ifndef LEAVE_SOME_PRE_2011_SYSTEMS_IN_THE_LURCH
+
+		/*
+		 * For some pre-2011 systems: if the last-to-be-written standard (or
+		 * daylight) type has an offset different from the most recently used
+		 * offset, append an (unused) copy of the most recently used type (to
+		 * help get global "altzone" and "timezone" variables set correctly).
+		 */
+		{
+			int			mrudst,
+						mrustd,
+						hidst,
+						histd,
+						type;
+
+			hidst = histd = mrudst = mrustd = -1;
+			for (i = thistimei; i < thistimelim; ++i)
+				if (isdsts[types[i]])
+					mrudst = types[i];
+				else
+					mrustd = types[i];
+			for (i = 0; i < typecnt; ++i)
+				if (writetype[i])
+				{
+					if (isdsts[i])
+						hidst = i;
+					else
+						histd = i;
+				}
+			if (hidst >= 0 && mrudst >= 0 && hidst != mrudst &&
+				gmtoffs[hidst] != gmtoffs[mrudst])
+			{
+				isdsts[mrudst] = -1;
+				type = addtype(gmtoffs[mrudst],
+							   &chars[abbrinds[mrudst]],
+							   true,
+							   ttisstds[mrudst],
+							   ttisgmts[mrudst]);
+				isdsts[mrudst] = 1;
+				writetype[type] = true;
+			}
+			if (histd >= 0 && mrustd >= 0 && histd != mrustd &&
+				gmtoffs[histd] != gmtoffs[mrustd])
+			{
+				isdsts[mrustd] = -1;
+				type = addtype(gmtoffs[mrustd],
+							   &chars[abbrinds[mrustd]],
+							   false,
+							   ttisstds[mrustd],
+							   ttisgmts[mrustd]);
+				isdsts[mrustd] = 0;
+				writetype[type] = true;
+			}
 		}
+#endif   /* !defined
+								 * LEAVE_SOME_PRE_2011_SYSTEMS_IN_THE_LURCH */
 		thistypecnt = 0;
 		for (i = 0; i < typecnt; ++i)
 			typemap[i] = writetype[i] ? thistypecnt++ : -1;
@@ -1723,7 +2151,7 @@
 		thischarcnt = 0;
 		for (i = 0; i < typecnt; ++i)
 		{
-			register char *thisabbr;
+			char	   *thisabbr;
 
 			if (!writetype[i])
 				continue;
@@ -1735,23 +2163,21 @@
 					break;
 			if (j == thischarcnt)
 			{
-				(void) strcpy(&thischars[(int) thischarcnt],
-							  thisabbr);
+				strcpy(&thischars[thischarcnt], thisabbr);
 				thischarcnt += strlen(thisabbr) + 1;
 			}
 			indmap[abbrinds[i]] = j;
 		}
-#define DO(field)	(void) fwrite((void *) tzh.field, \
-				(size_t) sizeof tzh.field, (size_t) 1, fp)
+#define DO(field)	fwrite(tzh.field, sizeof tzh.field, 1, fp)
 		tzh = tzh0;
-		(void) strncpy(tzh.tzh_magic, TZ_MAGIC, sizeof tzh.tzh_magic);
-		tzh.tzh_version[0] = ZIC_VERSION;
-		convert(eitol(thistypecnt), tzh.tzh_ttisgmtcnt);
-		convert(eitol(thistypecnt), tzh.tzh_ttisstdcnt);
-		convert(eitol(thisleapcnt), tzh.tzh_leapcnt);
-		convert(eitol(thistimecnt), tzh.tzh_timecnt);
-		convert(eitol(thistypecnt), tzh.tzh_typecnt);
-		convert(eitol(thischarcnt), tzh.tzh_charcnt);
+		strncpy(tzh.tzh_magic, TZ_MAGIC, sizeof tzh.tzh_magic);
+		tzh.tzh_version[0] = version;
+		convert(thistypecnt, tzh.tzh_ttisgmtcnt);
+		convert(thistypecnt, tzh.tzh_ttisstdcnt);
+		convert(thisleapcnt, tzh.tzh_leapcnt);
+		convert(thistimecnt, tzh.tzh_timecnt);
+		convert(thistypecnt, tzh.tzh_typecnt);
+		convert(thischarcnt, tzh.tzh_charcnt);
 		DO(tzh_magic);
 		DO(tzh_version);
 		DO(tzh_reserved);
@@ -1764,7 +2190,12 @@
 #undef DO
 		for (i = thistimei; i < thistimelim; ++i)
 			if (pass == 1)
-				puttzcode((long) ats[i], fp);
+
+				/*
+				 * Output an INT32_MIN "transition" if appropriate; see above.
+				 */
+				puttzcode(((ats[i] < PG_INT32_MIN) ?
+						   PG_INT32_MIN : ats[i]), fp);
 			else
 			{
 				puttzcode64(ats[i], fp);
@@ -1779,7 +2210,7 @@
 					/* filter out assorted junk entries */
 					if (strcmp(thisabbrev, GRANDPARENTED) != 0 &&
 						strcmp(thisabbrev, "zzz") != 0)
-						fprintf(stdout, "%s\t%ld%s\n",
+						fprintf(stdout, "%s\t" INT64_FORMAT "%s\n",
 								thisabbrev,
 								gmtoffs[tm],
 								isdsts[tm] ? "\tD" : "");
@@ -1790,25 +2221,21 @@
 			unsigned char uc;
 
 			uc = typemap[types[i]];
-			(void) fwrite((void *) &uc,
-						  (size_t) sizeof uc,
-						  (size_t) 1,
-						  fp);
+			fwrite(&uc, sizeof uc, 1, fp);
 		}
 		for (i = 0; i < typecnt; ++i)
 			if (writetype[i])
 			{
 				puttzcode(gmtoffs[i], fp);
-				(void) putc(isdsts[i], fp);
-				(void) putc((unsigned char) indmap[abbrinds[i]], fp);
+				putc(isdsts[i], fp);
+				putc((unsigned char) indmap[abbrinds[i]], fp);
 			}
 		if (thischarcnt != 0)
-			(void) fwrite((void *) thischars,
-						  (size_t) sizeof thischars[0],
-						  (size_t) thischarcnt, fp);
+			fwrite(thischars, sizeof thischars[0],
+				   thischarcnt, fp);
 		for (i = thisleapi; i < thisleaplim; ++i)
 		{
-			register zic_t todo;
+			zic_t		todo;
 
 			if (roll[i])
 			{
@@ -1835,70 +2262,112 @@
 			else
 				todo = trans[i];
 			if (pass == 1)
-				puttzcode((long) todo, fp);
+				puttzcode(todo, fp);
 			else
 				puttzcode64(todo, fp);
 			puttzcode(corr[i], fp);
 		}
 		for (i = 0; i < typecnt; ++i)
 			if (writetype[i])
-				(void) putc(ttisstds[i], fp);
+				putc(ttisstds[i], fp);
 		for (i = 0; i < typecnt; ++i)
 			if (writetype[i])
-				(void) putc(ttisgmts[i], fp);
+				putc(ttisgmts[i], fp);
 	}
-	(void) fprintf(fp, "\n%s\n", string);
-	if (ferror(fp) || fclose(fp))
+	fprintf(fp, "\n%s\n", string);
+	close_file(fp, directory, name);
+	free(ats);
+}
+
+static char const *
+abbroffset(char *buf, zic_t offset)
+{
+	char		sign = '+';
+	int			seconds,
+				minutes;
+
+	if (offset < 0)
 	{
-		(void) fprintf(stderr, _("%s: Error writing %s\n"),
-					   progname, fullname);
-		exit(EXIT_FAILURE);
+		offset = -offset;
+		sign = '-';
+	}
+
+	seconds = offset % SECSPERMIN;
+	offset /= SECSPERMIN;
+	minutes = offset % MINSPERHOUR;
+	offset /= MINSPERHOUR;
+	if (100 <= offset)
+	{
+		error(_("%%z UTC offset magnitude exceeds 99:59:59"));
+		return "%z";
+	}
+	else
+	{
+		char	   *p = buf;
+
+		*p++ = sign;
+		*p++ = '0' + offset / 10;
+		*p++ = '0' + offset % 10;
+		if (minutes | seconds)
+		{
+			*p++ = '0' + minutes / 10;
+			*p++ = '0' + minutes % 10;
+			if (seconds)
+			{
+				*p++ = '0' + seconds / 10;
+				*p++ = '0' + seconds % 10;
+			}
+		}
+		*p = '\0';
+		return buf;
 	}
 }
 
-static void
-doabbr(char *abbr, const char *format, const char *letters, int isdst,
-	   int doquotes)
+static size_t
+doabbr(char *abbr, struct zone const * zp, char const * letters,
+	   zic_t stdoff, bool doquotes)
 {
 	char	   *cp;
 	char	   *slashp;
-	int			len;
+	size_t		len;
+	char const *format = zp->z_format;
 
 	slashp = strchr(format, '/');
 	if (slashp == NULL)
 	{
-		if (letters == NULL)
-			(void) strcpy(abbr, format);
-		else
-			(void) sprintf(abbr, format, letters);
+		char		letterbuf[PERCENT_Z_LEN_BOUND + 1];
+
+		if (zp->z_format_specifier == 'z')
+			letters = abbroffset(letterbuf, zp->z_gmtoff + stdoff);
+		else if (!letters)
+			letters = "%s";
+		sprintf(abbr, format, letters);
+	}
+	else if (stdoff != 0)
+	{
+		strcpy(abbr, slashp + 1);
 	}
-	else if (isdst)
-		(void) strcpy(abbr, slashp + 1);
 	else
 	{
-		if (slashp > format)
-			(void) strncpy(abbr, format,
-						   (unsigned) (slashp - format));
+		memcpy(abbr, format, slashp - format);
 		abbr[slashp - format] = '\0';
 	}
-	if (!doquotes)
-		return;
-	for (cp = abbr; *cp != '\0'; ++cp)
-		if (strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZ", *cp) == NULL &&
-			strchr("abcdefghijklmnopqrstuvwxyz", *cp) == NULL)
-			break;
 	len = strlen(abbr);
+	if (!doquotes)
+		return len;
+	for (cp = abbr; is_alpha(*cp); cp++)
+		continue;
 	if (len > 0 && *cp == '\0')
-		return;
+		return len;
 	abbr[len + 2] = '\0';
 	abbr[len + 1] = '>';
-	for (; len > 0; --len)
-		abbr[len] = abbr[len - 1];
+	memmove(abbr + 1, abbr, len);
 	abbr[0] = '<';
+	return len + 2;
 }
 
 static void
-updateminmax(int x)
+updateminmax(const zic_t x)
 {
 	if (min_year > x)
 		min_year = x;
@@ -1907,44 +2376,46 @@
 }
 
 static int
-stringoffset(char *result, long offset)
+stringoffset(char *result, zic_t offset)
 {
 	int			hours;
 	int			minutes;
 	int			seconds;
+	bool		negative = offset < 0;
+	int			len = negative;
 
-	result[0] = '\0';
-	if (offset < 0)
+	if (negative)
 	{
-		(void) strcpy(result, "-");
 		offset = -offset;
+		result[0] = '-';
 	}
 	seconds = offset % SECSPERMIN;
 	offset /= SECSPERMIN;
 	minutes = offset % MINSPERHOUR;
 	offset /= MINSPERHOUR;
 	hours = offset;
-	if (hours >= HOURSPERDAY)
+	if (hours >= HOURSPERDAY * DAYSPERWEEK)
 	{
 		result[0] = '\0';
-		return -1;
+		return 0;
 	}
-	(void) sprintf(end(result), "%d", hours);
+	len += sprintf(result + len, "%d", hours);
 	if (minutes != 0 || seconds != 0)
 	{
-		(void) sprintf(end(result), ":%02d", minutes);
+		len += sprintf(result + len, ":%02d", minutes);
 		if (seconds != 0)
-			(void) sprintf(end(result), ":%02d", seconds);
+			len += sprintf(result + len, ":%02d", seconds);
 	}
-	return 0;
+	return len;
 }
 
 static int
-stringrule(char *result, const struct rule * rp, long dstoff, long gmtoff)
+stringrule(char *result, const struct rule * const rp, const zic_t dstoff,
+		   const zic_t gmtoff)
 {
-	long		tod;
+	zic_t		tod = rp->r_tod;
+	int			compat = 0;
 
-	result = end(result);
 	if (rp->r_dycode == DC_DOM)
 	{
 		int			month,
@@ -1955,17 +2426,26 @@
 		total = 0;
 		for (month = 0; month < rp->r_month; ++month)
 			total += len_months[0][month];
-		(void) sprintf(result, "J%d", total + rp->r_dayofmonth);
+		/* Omit the "J" in Jan and Feb, as that's shorter.  */
+		if (rp->r_month <= 1)
+			result += sprintf(result, "%d", total + rp->r_dayofmonth - 1);
+		else
+			result += sprintf(result, "J%d", total + rp->r_dayofmonth);
 	}
 	else
 	{
 		int			week;
+		int			wday = rp->r_wday;
+		int			wdayoff;
 
 		if (rp->r_dycode == DC_DOWGEQ)
 		{
-			week = 1 + rp->r_dayofmonth / DAYSPERWEEK;
-			if ((week - 1) * DAYSPERWEEK + 1 != rp->r_dayofmonth)
-				return -1;
+			wdayoff = (rp->r_dayofmonth - 1) % DAYSPERWEEK;
+			if (wdayoff)
+				compat = 2013;
+			wday -= wdayoff;
+			tod += wdayoff * SECSPERDAY;
+			week = 1 + (rp->r_dayofmonth - 1) / DAYSPERWEEK;
 		}
 		else if (rp->r_dycode == DC_DOWLEQ)
 		{
@@ -1973,44 +2453,77 @@
 				week = 5;
 			else
 			{
-				week = 1 + rp->r_dayofmonth / DAYSPERWEEK;
-				if (week * DAYSPERWEEK - 1 != rp->r_dayofmonth)
-					return -1;
+				wdayoff = rp->r_dayofmonth % DAYSPERWEEK;
+				if (wdayoff)
+					compat = 2013;
+				wday -= wdayoff;
+				tod += wdayoff * SECSPERDAY;
+				week = rp->r_dayofmonth / DAYSPERWEEK;
 			}
 		}
 		else
 			return -1;			/* "cannot happen" */
-		(void) sprintf(result, "M%d.%d.%d",
-					   rp->r_month + 1, week, rp->r_wday);
+		if (wday < 0)
+			wday += DAYSPERWEEK;
+		result += sprintf(result, "M%d.%d.%d",
+						  rp->r_month + 1, week, wday);
 	}
-	tod = rp->r_tod;
 	if (rp->r_todisgmt)
 		tod += gmtoff;
 	if (rp->r_todisstd && rp->r_stdoff == 0)
 		tod += dstoff;
-	if (tod < 0)
-	{
-		result[0] = '\0';
-		return -1;
-	}
 	if (tod != 2 * SECSPERMIN * MINSPERHOUR)
 	{
-		(void) strcat(result, "/");
-		if (stringoffset(end(result), tod) != 0)
+		*result++ = '/';
+		if (!stringoffset(result, tod))
 			return -1;
+		if (tod < 0)
+		{
+			if (compat < 2013)
+				compat = 2013;
+		}
+		else if (SECSPERDAY <= tod)
+		{
+			if (compat < 1994)
+				compat = 1994;
+		}
 	}
-	return 0;
+	return compat;
 }
 
-static void
-stringzone(char *result, const struct zone * zpfirst, int zonecount)
+static int
+rule_cmp(struct rule const * a, struct rule const * b)
+{
+	if (!a)
+		return -!!b;
+	if (!b)
+		return 1;
+	if (a->r_hiyear != b->r_hiyear)
+		return a->r_hiyear < b->r_hiyear ? -1 : 1;
+	if (a->r_month - b->r_month != 0)
+		return a->r_month - b->r_month;
+	return a->r_dayofmonth - b->r_dayofmonth;
+}
+
+enum
+{
+YEAR_BY_YEAR_ZONE = 1};
+
+static int
+stringzone(char *result, struct zone const * zpfirst, ptrdiff_t zonecount)
 {
 	const struct zone *zp;
 	struct rule *rp;
 	struct rule *stdrp;
 	struct rule *dstrp;
-	int			i;
+	ptrdiff_t	i;
 	const char *abbrvar;
+	int			compat = 0;
+	int			c;
+	size_t		len;
+	int			offsetlen;
+	struct rule stdr,
+				dstr;
 
 	result[0] = '\0';
 	zp = zpfirst + zonecount - 1;
@@ -2018,7 +2531,7 @@
 	for (i = 0; i < zp->z_nrules; ++i)
 	{
 		rp = &zp->z_rules[i];
-		if (rp->r_hiwasnum || rp->r_hiyear != INT_MAX)
+		if (rp->r_hiwasnum || rp->r_hiyear != ZIC_MAX)
 			continue;
 		if (rp->r_yrtype != NULL)
 			continue;
@@ -2027,32 +2540,32 @@
 			if (stdrp == NULL)
 				stdrp = rp;
 			else
-				return;
+				return -1;
 		}
 		else
 		{
 			if (dstrp == NULL)
 				dstrp = rp;
 			else
-				return;
+				return -1;
 		}
 	}
 	if (stdrp == NULL && dstrp == NULL)
 	{
 		/*
-		 * There are no rules running through "max". Let's find the latest
-		 * rule.
+		 * There are no rules running through "max". Find the latest std rule
+		 * in stdabbrrp and latest rule of any type in stdrp.
 		 */
+		struct rule *stdabbrrp = NULL;
+
 		for (i = 0; i < zp->z_nrules; ++i)
 		{
 			rp = &zp->z_rules[i];
-			if (stdrp == NULL || rp->r_hiyear > stdrp->r_hiyear ||
-				(rp->r_hiyear == stdrp->r_hiyear &&
-				 rp->r_month > stdrp->r_month))
+			if (rp->r_stdoff == 0 && rule_cmp(stdabbrrp, rp) < 0)
+				stdabbrrp = rp;
+			if (rule_cmp(stdrp, rp) < 0)
 				stdrp = rp;
 		}
-		if (stdrp != NULL && stdrp->r_stdoff != 0)
-			return;				/* We end up in DST (a POSIX no-no). */
 
 		/*
 		 * Horrid special case: if year is 2037, presume this is a zone
@@ -2060,70 +2573,116 @@
 		 * zone.
 		 */
 		if (stdrp != NULL && stdrp->r_hiyear == 2037)
-			return;
+			return YEAR_BY_YEAR_ZONE;
+
+		if (stdrp != NULL && stdrp->r_stdoff != 0)
+		{
+			/* Perpetual DST.  */
+			dstr.r_month = TM_JANUARY;
+			dstr.r_dycode = DC_DOM;
+			dstr.r_dayofmonth = 1;
+			dstr.r_tod = 0;
+			dstr.r_todisstd = dstr.r_todisgmt = false;
+			dstr.r_stdoff = stdrp->r_stdoff;
+			dstr.r_abbrvar = stdrp->r_abbrvar;
+			stdr.r_month = TM_DECEMBER;
+			stdr.r_dycode = DC_DOM;
+			stdr.r_dayofmonth = 31;
+			stdr.r_tod = SECSPERDAY + stdrp->r_stdoff;
+			stdr.r_todisstd = stdr.r_todisgmt = false;
+			stdr.r_stdoff = 0;
+			stdr.r_abbrvar
+				= (stdabbrrp ? stdabbrrp->r_abbrvar : "");
+			dstrp = &dstr;
+			stdrp = &stdr;
+		}
 	}
 	if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0))
-		return;
+		return -1;
 	abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
-	doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);
-	if (stringoffset(end(result), -zp->z_gmtoff) != 0)
+	len = doabbr(result, zp, abbrvar, 0, true);
+	offsetlen = stringoffset(result + len, -zp->z_gmtoff);
+	if (!offsetlen)
 	{
 		result[0] = '\0';
-		return;
+		return -1;
 	}
+	len += offsetlen;
 	if (dstrp == NULL)
-		return;
-	doabbr(end(result), zp->z_format, dstrp->r_abbrvar, TRUE, TRUE);
+		return compat;
+	len += doabbr(result + len, zp, dstrp->r_abbrvar, dstrp->r_stdoff, true);
 	if (dstrp->r_stdoff != SECSPERMIN * MINSPERHOUR)
-		if (stringoffset(end(result),
-						 -(zp->z_gmtoff + dstrp->r_stdoff)) != 0)
+	{
+		offsetlen = stringoffset(result + len,
+								 -(zp->z_gmtoff + dstrp->r_stdoff));
+		if (!offsetlen)
 		{
 			result[0] = '\0';
-			return;
+			return -1;
 		}
-	(void) strcat(result, ",");
-	if (stringrule(result, dstrp, dstrp->r_stdoff, zp->z_gmtoff) != 0)
+		len += offsetlen;
+	}
+	result[len++] = ',';
+	c = stringrule(result + len, dstrp, dstrp->r_stdoff, zp->z_gmtoff);
+	if (c < 0)
 	{
 		result[0] = '\0';
-		return;
+		return -1;
 	}
-	(void) strcat(result, ",");
-	if (stringrule(result, stdrp, dstrp->r_stdoff, zp->z_gmtoff) != 0)
+	if (compat < c)
+		compat = c;
+	len += strlen(result + len);
+	result[len++] = ',';
+	c = stringrule(result + len, stdrp, dstrp->r_stdoff, zp->z_gmtoff);
+	if (c < 0)
 	{
 		result[0] = '\0';
-		return;
+		return -1;
 	}
+	if (compat < c)
+		compat = c;
+	return compat;
 }
 
 static void
-outzone(const struct zone * zpfirst, int zonecount)
+outzone(const struct zone * zpfirst, ptrdiff_t zonecount)
 {
 	const struct zone *zp;
 	struct rule *rp;
-	int			i,
+	ptrdiff_t	i,
 				j;
-	int			usestart,
+	bool		usestart,
 				useuntil;
-	zic_t		starttime = 0;
-	zic_t		untiltime = 0;
-	long		gmtoff;
-	long		stdoff;
-	int			year;
-	long		startoff;
-	int			startttisstd;
-	int			startttisgmt;
+	zic_t		starttime,
+				untiltime;
+	zic_t		gmtoff;
+	zic_t		stdoff;
+	zic_t		year;
+	zic_t		startoff;
+	bool		startttisstd;
+	bool		startttisgmt;
 	int			type;
 	char	   *startbuf;
 	char	   *ab;
 	char	   *envvar;
 	int			max_abbr_len;
 	int			max_envvar_len;
+	bool		prodstic;		/* all rules are min to max */
+	int			compat;
+	bool		do_extend;
+	char		version;
+	ptrdiff_t	lastatmax = -1;
+	zic_t		one = 1;
+	zic_t		y2038_boundary = one << 31;
+	zic_t		max_year0;
 
 	max_abbr_len = 2 + max_format_len + max_abbrvar_len;
 	max_envvar_len = 2 * max_abbr_len + 5 * 9;
 	startbuf = emalloc(max_abbr_len + 1);
 	ab = emalloc(max_abbr_len + 1);
 	envvar = emalloc(max_envvar_len + 1);
+	INITIALIZE(untiltime);
+	INITIALIZE(starttime);
 
 	/*
 	 * Now. . .finally. . .generate some useful data!
@@ -2131,18 +2690,19 @@
 	timecnt = 0;
 	typecnt = 0;
 	charcnt = 0;
+	prodstic = zonecount == 1;
 
 	/*
 	 * Thanks to Earl Chew for noting the need to unconditionally initialize
 	 * startttisstd.
 	 */
-	startttisstd = FALSE;
-	startttisgmt = FALSE;
+	startttisstd = false;
+	startttisgmt = false;
 	min_year = max_year = EPOCH_YEAR;
 	if (leapseen)
 	{
 		updateminmax(leapminyear);
-		updateminmax(leapmaxyear + (leapmaxyear < INT_MAX));
+		updateminmax(leapmaxyear + (leapmaxyear < ZIC_MAX));
 	}
 	for (i = 0; i < zonecount; ++i)
 	{
@@ -2156,42 +2716,81 @@
 				updateminmax(rp->r_loyear);
 			if (rp->r_hiwasnum)
 				updateminmax(rp->r_hiyear);
+			if (rp->r_lowasnum || rp->r_hiwasnum)
+				prodstic = false;
 		}
 	}
 
 	/*
 	 * Generate lots of data if a rule can't cover all future times.
 	 */
-	stringzone(envvar, zpfirst, zonecount);
-	if (noise && envvar[0] == '\0')
-	{
-		char	   *wp;
-
-		wp = ecpyalloc(_("no POSIX environment variable for zone"));
-		wp = ecatalloc(wp, " ");
-		wp = ecatalloc(wp, zpfirst->z_name);
-		warning(wp);
-		ifree(wp);
+	compat = stringzone(envvar, zpfirst, zonecount);
+	version = compat < 2013 ? ZIC_VERSION_PRE_2013 : ZIC_VERSION;
+	do_extend = compat < 0 || compat == YEAR_BY_YEAR_ZONE;
+	if (noise)
+	{
+		if (!*envvar)
+			warning("%s %s",
+					_("no POSIX environment variable for zone"),
+					zpfirst->z_name);
+		else if (compat != 0 && compat != YEAR_BY_YEAR_ZONE)
+		{
+			/*
+			 * Circa-COMPAT clients, and earlier clients, might not work for
+			 * this zone when given dates before 1970 or after 2038.
+			 */
+			warning(_("%s: pre-%d clients may mishandle"
+					  " distant timestamps"),
+					zpfirst->z_name, compat);
+		}
 	}
-	if (envvar[0] == '\0')
+	if (do_extend)
 	{
-		if (min_year >= INT_MIN + YEARSPERREPEAT)
-			min_year -= YEARSPERREPEAT;
+		/*
+		 * Search through a couple of extra years past the obvious 400, to
+		 * avoid edge cases.  For example, suppose a non-POSIX rule applies
+		 * from 2012 onwards and has transitions in March and September, plus
+		 * some one-off transitions in November 2013.  If zic looked only at
+		 * the last 400 years, it would set max_year=2413, with the intent
+		 * that the 400 years 2014 through 2413 will be repeated.  The last
+		 * transition listed in the tzfile would be in 2413-09, less than 400
+		 * years after the last one-off transition in 2013-11.  Two years
+		 * might be overkill, but with the kind of edge cases available we're
+		 * not sure that one year would suffice.
+		 */
+		enum
+		{
+		years_of_observations = YEARSPERREPEAT + 2};
+
+		if (min_year >= ZIC_MIN + years_of_observations)
+			min_year -= years_of_observations;
 		else
-			min_year = INT_MIN;
-		if (max_year <= INT_MAX - YEARSPERREPEAT)
-			max_year += YEARSPERREPEAT;
+			min_year = ZIC_MIN;
+		if (max_year <= ZIC_MAX - years_of_observations)
+			max_year += years_of_observations;
 		else
-			max_year = INT_MAX;
+			max_year = ZIC_MAX;
+
+		/*
+		 * Regardless of any of the above, for a "proDSTic" zone which
+		 * specifies that its rules always have and always will be in effect,
+		 * we only need one cycle to define the zone.
+		 */
+		if (prodstic)
+		{
+			min_year = 1900;
+			max_year = min_year + years_of_observations;
+		}
 	}
 
 	/*
-	 * For the benefit of older systems, generate data from 1900 through 2037.
+	 * For the benefit of older systems, generate data from 1900 through 2038.
 	 */
 	if (min_year > 1900)
 		min_year = 1900;
-	if (max_year < 2037)
-		max_year = 2037;
+	max_year0 = max_year;
+	if (max_year < 2038)
+		max_year = 2038;
 	for (i = 0; i < zonecount; ++i)
 	{
 		/*
@@ -2199,9 +2798,9 @@
 		 */
 		stdoff = 0;
 		zp = &zpfirst[i];
-		usestart = i > 0 && (zp - 1)->z_untiltime > min_time;
+		usestart = i > 0 && (zp - 1)->z_untiltime > early_time;
 		useuntil = i < (zonecount - 1);
-		if (useuntil && zp->z_untiltime <= min_time)
+		if (useuntil && zp->z_untiltime <= early_time)
 			continue;
 		gmtoff = zp->z_gmtoff;
 		eat(zp->z_filename, zp->z_linenum);
@@ -2210,18 +2809,17 @@
 		if (zp->z_nrules == 0)
 		{
 			stdoff = zp->z_stdoff;
-			doabbr(startbuf, zp->z_format,
-				   (char *) NULL, stdoff != 0, FALSE);
+			doabbr(startbuf, zp, NULL, stdoff, false);
 			type = addtype(oadd(zp->z_gmtoff, stdoff),
 						   startbuf, stdoff != 0, startttisstd,
 						   startttisgmt);
 			if (usestart)
 			{
 				addtt(starttime, type);
-				usestart = FALSE;
+				usestart = false;
 			}
-			else if (stdoff != 0)
-				addtt(min_time, type);
+			else
+				addtt(early_time, type);
 		}
 		else
 			for (year = min_year; year <= max_year; ++year)
@@ -2242,19 +2840,24 @@
 						year <= rp->r_hiyear &&
 						yearistype(year, rp->r_yrtype);
 					if (rp->r_todo)
+					{
 						rp->r_temp = rpytime(rp, year);
+						rp->r_todo
+							= (rp->r_temp < y2038_boundary
+							   || year <= max_year0);
+					}
 				}
 				for (;;)
 				{
-					int			k;
+					ptrdiff_t	k;
 					zic_t		jtime,
 								ktime = 0;
-					long		offset;
+					zic_t		offset;
 
 					if (useuntil)
 					{
 						/*
-						 * Turn untiltime into UTC assuming the current gmtoff
+						 * Turn untiltime into UT assuming the current gmtoff
 						 * and stdoff values.
 						 */
 						untiltime = zp->z_untiltime;
@@ -2291,46 +2894,62 @@
 							k = j;
 							ktime = jtime;
 						}
+						else if (jtime == ktime)
+						{
+							char const *dup_rules_msg =
+							_("two rules for same instant");
+
+							eats(zp->z_filename, zp->z_linenum,
+								 rp->r_filename, rp->r_linenum);
+							warning("%s", dup_rules_msg);
+							rp = &zp->z_rules[k];
+							eats(zp->z_filename, zp->z_linenum,
+								 rp->r_filename, rp->r_linenum);
+							error("%s", dup_rules_msg);
+						}
 					}
 					if (k < 0)
 						break;	/* go on to next year */
 					rp = &zp->z_rules[k];
-					rp->r_todo = FALSE;
+					rp->r_todo = false;
 					if (useuntil && ktime >= untiltime)
 						break;
 					stdoff = rp->r_stdoff;
 					if (usestart && ktime == starttime)
-						usestart = FALSE;
+						usestart = false;
 					if (usestart)
 					{
 						if (ktime < starttime)
 						{
 							startoff = oadd(zp->z_gmtoff,
 											stdoff);
-							doabbr(startbuf, zp->z_format,
+							doabbr(startbuf, zp,
 								   rp->r_abbrvar,
-								   rp->r_stdoff != 0,
-								   FALSE);
+								   rp->r_stdoff,
+								   false);
 							continue;
 						}
 						if (*startbuf == '\0' &&
 							startoff == oadd(zp->z_gmtoff, stdoff))
 						{
 							doabbr(startbuf,
-								   zp->z_format,
+								   zp,
 								   rp->r_abbrvar,
-								   rp->r_stdoff !=
-								   0,
-								   FALSE);
+								   rp->r_stdoff,
+								   false);
 						}
 					}
 					eats(zp->z_filename, zp->z_linenum,
 						 rp->r_filename, rp->r_linenum);
-					doabbr(ab, zp->z_format, rp->r_abbrvar,
-						   rp->r_stdoff != 0, FALSE);
+					doabbr(ab, zp, rp->r_abbrvar,
+						   rp->r_stdoff, false);
 					offset = oadd(zp->z_gmtoff, rp->r_stdoff);
 					type = addtype(offset, ab, rp->r_stdoff != 0,
 								   rp->r_todisstd, rp->r_todisgmt);
+					if (rp->r_hiyear == ZIC_MAX
+						&& !(0 <= lastatmax
+							 && ktime < attypes[lastatmax].at))
+						lastatmax = timecnt;
 					addtt(ktime, type);
 				}
 			}
@@ -2340,7 +2959,7 @@
 				zp->z_format != NULL &&
 				strchr(zp->z_format, '%') == NULL &&
 				strchr(zp->z_format, '/') == NULL)
-				(void) strcpy(startbuf, zp->z_format);
+				strcpy(startbuf, zp->z_format);
 			eat(zp->z_filename, zp->z_linenum);
 			if (*startbuf == '\0')
 				error(_("cannot determine time zone abbreviation to use just after until time"));
@@ -2366,62 +2985,71 @@
 				starttime = tadd(starttime, -gmtoff);
 		}
 	}
-	writezone(zpfirst->z_name, envvar);
-	ifree(startbuf);
-	ifree(ab);
-	ifree(envvar);
+	if (0 <= lastatmax)
+		attypes[lastatmax].dontmerge = true;
+	if (do_extend)
+	{
+		/*
+		 * If we're extending the explicitly listed observations for 400 years
+		 * because we can't fill the POSIX-TZ field, check whether we actually
+		 * ended up explicitly listing observations through that period.  If
+		 * there aren't any near the end of the 400-year period, add a
+		 * redundant one at the end of the final year, to make it clear that
+		 * we are claiming to have definite knowledge of the lack of
+		 * transitions up to that point.
+		 */
+		struct rule xr;
+		struct attype *lastat;
+
+		xr.r_month = TM_JANUARY;
+		xr.r_dycode = DC_DOM;
+		xr.r_dayofmonth = 1;
+		xr.r_tod = 0;
+		for (lastat = &attypes[0], i = 1; i < timecnt; i++)
+			if (attypes[i].at > lastat->at)
+				lastat = &attypes[i];
+		if (lastat->at < rpytime(&xr, max_year - 1))
+		{
+			addtt(rpytime(&xr, max_year + 1), typecnt - 1);
+			attypes[timecnt - 1].dontmerge = true;
+		}
+	}
+	writezone(zpfirst->z_name, envvar, version);
+	free(startbuf);
+	free(ab);
+	free(envvar);
 }
 
 static void
-addtt(const zic_t starttime, int type)
+addtt(zic_t starttime, int type)
 {
-	if (starttime <= min_time ||
-		(timecnt == 1 && attypes[0].at < min_time))
+	if (starttime <= early_time
+		|| (timecnt == 1 && attypes[0].at < early_time))
 	{
 		gmtoffs[0] = gmtoffs[type];
 		isdsts[0] = isdsts[type];
 		ttisstds[0] = ttisstds[type];
 		ttisgmts[0] = ttisgmts[type];
 		if (abbrinds[type] != 0)
-			(void) strcpy(chars, &chars[abbrinds[type]]);
+			strcpy(chars, &chars[abbrinds[type]]);
 		abbrinds[0] = 0;
 		charcnt = strlen(chars) + 1;
 		typecnt = 1;
 		timecnt = 0;
 		type = 0;
 	}
-	if (timecnt >= TZ_MAX_TIMES)
-	{
-		error(_("too many transitions?!"));
-		exit(EXIT_FAILURE);
-	}
+	attypes = growalloc(attypes, sizeof *attypes, timecnt, &timecnt_alloc);
 	attypes[timecnt].at = starttime;
+	attypes[timecnt].dontmerge = false;
 	attypes[timecnt].type = type;
 	++timecnt;
 }
 
 static int
-addtype(long gmtoff, const char *abbr, int isdst,
-		int ttisstd, int ttisgmt)
+addtype(zic_t gmtoff, char const * abbr, bool isdst, bool ttisstd, bool ttisgmt)
 {
-	int			i;
-	int			j;
-
-	if (isdst != TRUE && isdst != FALSE)
-	{
-		error(_("internal error - addtype called with bad isdst"));
-		exit(EXIT_FAILURE);
-	}
-	if (ttisstd != TRUE && ttisstd != FALSE)
-	{
-		error(_("internal error - addtype called with bad ttisstd"));
-		exit(EXIT_FAILURE);
-	}
-	if (ttisgmt != TRUE && ttisgmt != FALSE)
-	{
-		error(_("internal error - addtype called with bad ttisgmt"));
-		exit(EXIT_FAILURE);
-	}
+	int			i,
+				j;
 
 	/*
 	 * See if there's already an entry for this zone type. If so, just return
@@ -2446,7 +3074,7 @@
 	}
 	if (!(-1L - 2147483647L <= gmtoff && gmtoff <= 2147483647L))
 	{
-		error(_("UTC offset out of range"));
+		error(_("UT offset out of range"));
 		exit(EXIT_FAILURE);
 	}
 	gmtoffs[i] = gmtoff;
@@ -2465,10 +3093,10 @@
 }
 
 static void
-leapadd(const zic_t t, int positive, int rolling, int count)
+leapadd(zic_t t, bool positive, int rolling, int count)
 {
-	int			i;
-	int			j;
+	int			i,
+				j;
 
 	if (leapcnt + (positive ? count : 1) > TZ_MAX_LEAPS)
 	{
@@ -2494,7 +3122,7 @@
 			roll[j] = roll[j - 1];
 		}
 		trans[i] = t;
-		corr[i] = positive ? 1L : eitol(-count);
+		corr[i] = positive ? 1 : -count;
 		roll[i] = rolling;
 		++leapcnt;
 	} while (positive && --count != 0);
@@ -2504,7 +3132,7 @@
 adjleap(void)
 {
 	int			i;
-	long		last = 0;
+	zic_t		last = 0;
 
 	/*
 	 * propagate leap seconds forward
@@ -2516,61 +3144,223 @@
 	}
 }
 
-static int
-yearistype(int year, const char *type)
+static char *
+shellquote(char *b, char const * s)
+{
+	*b++ = '\'';
+	while (*s)
+	{
+		if (*s == '\'')
+			*b++ = '\'', *b++ = '\\', *b++ = '\'';
+		*b++ = *s++;
+	}
+	*b++ = '\'';
+	return b;
+}
+
+static bool
+yearistype(zic_t year, const char *type)
 {
-	static char *buf;
+	char	   *buf;
+	char	   *b;
 	int			result;
 
 	if (type == NULL || *type == '\0')
-		return TRUE;
-	buf = erealloc(buf, (int) (132 + strlen(yitcommand) + strlen(type)));
-	(void) sprintf(buf, "%s %d %s", yitcommand, year, type);
+		return true;
+	buf = emalloc(1 + 4 * strlen(yitcommand) + 2
+				  + INT_STRLEN_MAXIMUM(zic_t) +2 + 4 * strlen(type) + 2);
+	b = shellquote(buf, yitcommand);
+	*b++ = ' ';
+	b += sprintf(b, INT64_FORMAT, year);
+	*b++ = ' ';
+	b = shellquote(b, type);
+	*b = '\0';
 	result = system(buf);
 	if (WIFEXITED(result))
-		switch (WEXITSTATUS(result))
+	{
+		int			status = WEXITSTATUS(result);
+
+		if (status <= 1)
 		{
-			case 0:
-				return TRUE;
-			case 1:
-				return FALSE;
+			free(buf);
+			return status == 0;
 		}
+	}
 	error(_("Wild result from command execution"));
-	(void) fprintf(stderr, _("%s: command was '%s', result was %d\n"),
-				   progname, buf, result);
-	for (;;)
-		exit(EXIT_FAILURE);
-}
-
-static int
-lowerit(int a)
-{
-	a = (unsigned char) a;
-	return (isascii(a) && isupper(a)) ? tolower(a) : a;
+	fprintf(stderr, _("%s: command was '%s', result was %d\n"),
+			progname, buf, result);
+	exit(EXIT_FAILURE);
+}
+
+/* Is A a space character in the C locale?	*/
+static bool
+is_space(char a)
+{
+	switch (a)
+	{
+		default:
+			return false;
+		case ' ':
+		case '\f':
+		case '\n':
+		case '\r':
+		case '\t':
+		case '\v':
+			return true;
+	}
+}
+
+/* Is A an alphabetic character in the C locale?  */
+static bool
+is_alpha(char a)
+{
+	switch (a)
+	{
+		default:
+			return false;
+		case 'A':
+		case 'B':
+		case 'C':
+		case 'D':
+		case 'E':
+		case 'F':
+		case 'G':
+		case 'H':
+		case 'I':
+		case 'J':
+		case 'K':
+		case 'L':
+		case 'M':
+		case 'N':
+		case 'O':
+		case 'P':
+		case 'Q':
+		case 'R':
+		case 'S':
+		case 'T':
+		case 'U':
+		case 'V':
+		case 'W':
+		case 'X':
+		case 'Y':
+		case 'Z':
+		case 'a':
+		case 'b':
+		case 'c':
+		case 'd':
+		case 'e':
+		case 'f':
+		case 'g':
+		case 'h':
+		case 'i':
+		case 'j':
+		case 'k':
+		case 'l':
+		case 'm':
+		case 'n':
+		case 'o':
+		case 'p':
+		case 'q':
+		case 'r':
+		case 's':
+		case 't':
+		case 'u':
+		case 'v':
+		case 'w':
+		case 'x':
+		case 'y':
+		case 'z':
+			return true;
+	}
+}
+
+/* If A is an uppercase character in the C locale, return its lowercase
+ * counterpart.  Otherwise, return A.  */
+static char
+lowerit(char a)
+{
+	switch (a)
+	{
+		default:
+			return a;
+		case 'A':
+			return 'a';
+		case 'B':
+			return 'b';
+		case 'C':
+			return 'c';
+		case 'D':
+			return 'd';
+		case 'E':
+			return 'e';
+		case 'F':
+			return 'f';
+		case 'G':
+			return 'g';
+		case 'H':
+			return 'h';
+		case 'I':
+			return 'i';
+		case 'J':
+			return 'j';
+		case 'K':
+			return 'k';
+		case 'L':
+			return 'l';
+		case 'M':
+			return 'm';
+		case 'N':
+			return 'n';
+		case 'O':
+			return 'o';
+		case 'P':
+			return 'p';
+		case 'Q':
+			return 'q';
+		case 'R':
+			return 'r';
+		case 'S':
+			return 's';
+		case 'T':
+			return 't';
+		case 'U':
+			return 'u';
+		case 'V':
+			return 'v';
+		case 'W':
+			return 'w';
+		case 'X':
+			return 'x';
+		case 'Y':
+			return 'y';
+		case 'Z':
+			return 'z';
+	}
 }
 
-static int
+/* case-insensitive equality */
+static bool
 ciequal(const char *ap, const char *bp)
 {
 	while (lowerit(*ap) == lowerit(*bp++))
 		if (*ap++ == '\0')
-			return TRUE;
-	return FALSE;
+			return true;
+	return false;
 }
 
-static int
+static bool
 itsabbr(const char *abbr, const char *word)
 {
 	if (lowerit(*abbr) != lowerit(*word))
-		return FALSE;
+		return false;
 	++word;
 	while (*++abbr != '\0')
 		do
 		{
 			if (*word == '\0')
-				return FALSE;
+				return false;
 		} while (lowerit(*word++) != lowerit(*abbr));
-	return TRUE;
+	return true;
 }
 
 static const struct lookup *
@@ -2613,13 +3403,11 @@
 
 	if (cp == NULL)
 		return NULL;
-	array = (char **) (void *)
-		emalloc((int) ((strlen(cp) + 1) * sizeof *array));
+	array = emalloc(size_product(strlen(cp) + 1, sizeof *array));
 	nsubs = 0;
 	for (;;)
 	{
-		while (isascii((unsigned char) *cp) &&
-			   isspace((unsigned char) *cp))
+		while (is_space(*cp))
 			++cp;
 		if (*cp == '\0' || *cp == '#')
 			break;
@@ -2635,11 +3423,10 @@
 					else
 					{
 						error(_("Odd number of quotation marks"));
-						exit(1);
+						exit(EXIT_FAILURE);
 					}
-		} while (*cp != '\0' && *cp != '#' &&
-				 (!isascii(*cp) || !isspace((unsigned char) *cp)));
-		if (isascii(*cp) && isspace((unsigned char) *cp))
+		} while (*cp && *cp != '#' && !is_space(*cp));
+		if (is_space(*cp))
 			++cp;
 		*dp = '\0';
 	}
@@ -2647,55 +3434,62 @@
 	return array;
 }
 
-static long
-oadd(long t1, long t2)
+static void
+time_overflow(void)
 {
-	long		t;
-
-	t = t1 + t2;
-	if ((t2 > 0 && t <= t1) || (t2 < 0 && t >= t1))
-	{
-		error(_("time overflow"));
-		exit(EXIT_FAILURE);
-	}
-	return t;
+	error(_("time overflow"));
+	exit(EXIT_FAILURE);
 }
 
 static zic_t
-tadd(const zic_t t1, long t2)
+oadd(zic_t t1, zic_t t2)
 {
-	zic_t		t;
+	if (t1 < 0 ? t2 < ZIC_MIN - t1 : ZIC_MAX - t1 < t2)
+		time_overflow();
+	return t1 + t2;
+}
 
-	if (t1 == max_time && t2 > 0)
-		return max_time;
-	if (t1 == min_time && t2 < 0)
-		return min_time;
-	t = t1 + t2;
-	if ((t2 > 0 && t <= t1) || (t2 < 0 && t >= t1))
+static zic_t
+tadd(zic_t t1, zic_t t2)
+{
+	if (t1 < 0)
 	{
-		error(_("time overflow"));
-		exit(EXIT_FAILURE);
+		if (t2 < min_time - t1)
+		{
+			if (t1 != min_time)
+				time_overflow();
+			return min_time;
+		}
 	}
-	return t;
+	else
+	{
+		if (max_time - t1 < t2)
+		{
+			if (t1 != max_time)
+				time_overflow();
+			return max_time;
+		}
+	}
+	return t1 + t2;
 }
 
 /*
- * Given a rule, and a year, compute the date - in seconds since January 1,
- * 1970, 00:00 LOCAL time - in that year that the rule refers to.
+ * Given a rule, and a year, compute the date (in seconds since January 1,
+ * 1970, 00:00 LOCAL time) in that year that the rule refers to.
  */
 
 static zic_t
-rpytime(const struct rule * rp, int wantedy)
+rpytime(const struct rule * rp, zic_t wantedy)
 {
-	int			y,
-				m,
+	int			m,
 				i;
-	long		dayoff;			/* with a nod to Margaret O. */
-	zic_t		t;
+	zic_t		dayoff;			/* with a nod to Margaret O. */
+	zic_t		t,
+				y;
 
-	if (wantedy == INT_MIN)
+	if (wantedy == ZIC_MIN)
 		return min_time;
-	if (wantedy == INT_MAX)
+	if (wantedy == ZIC_MAX)
 		return max_time;
 	dayoff = 0;
 	m = TM_JANUARY;
@@ -2712,12 +3506,12 @@
 			--y;
 			i = -len_years[isleap(y)];
 		}
-		dayoff = oadd(dayoff, eitol(i));
+		dayoff = oadd(dayoff, i);
 	}
 	while (m != rp->r_month)
 	{
 		i = len_months[isleap(y)][m];
-		dayoff = oadd(dayoff, eitol(i));
+		dayoff = oadd(dayoff, i);
 		++m;
 	}
 	i = rp->r_dayofmonth;
@@ -2732,13 +3526,13 @@
 		}
 	}
 	--i;
-	dayoff = oadd(dayoff, eitol(i));
+	dayoff = oadd(dayoff, i);
 	if (rp->r_dycode == DC_DOWGEQ || rp->r_dycode == DC_DOWLEQ)
 	{
-		long		wday;
+		zic_t		wday;
 
-#define LDAYSPERWEEK	((long) DAYSPERWEEK)
-		wday = eitol(EPOCH_WDAY);
+#define LDAYSPERWEEK	((zic_t) DAYSPERWEEK)
+		wday = EPOCH_WDAY;
 
 		/*
 		 * Don't trust mod of negative numbers.
@@ -2751,17 +3545,17 @@
 			if (wday < 0)
 				wday += LDAYSPERWEEK;
 		}
-		while (wday != eitol(rp->r_wday))
+		while (wday != rp->r_wday)
 			if (rp->r_dycode == DC_DOWGEQ)
 			{
-				dayoff = oadd(dayoff, (long) 1);
+				dayoff = oadd(dayoff, 1);
 				if (++wday >= LDAYSPERWEEK)
 					wday = 0;
 				++i;
 			}
 			else
 			{
-				dayoff = oadd(dayoff, (long) -1);
+				dayoff = oadd(dayoff, -1);
 				if (--wday < 0)
 					wday = LDAYSPERWEEK - 1;
 				--i;
@@ -2769,7 +3563,7 @@
 		if (i < 0 || i >= len_months[isleap(y)][m])
 		{
 			if (noise)
-				warning(_("rule goes past start/end of month--\
+				warning(_("rule goes past start/end of month; \
 will not work with pre-2004 versions of zic"));
 		}
 	}
@@ -2790,28 +3584,21 @@
 	if (strcmp(string, GRANDPARENTED) != 0)
 	{
 		const char *cp;
-		char	   *wp;
+		const char *mp;
 
 		cp = string;
-		wp = NULL;
-		while (isalpha((unsigned char) *cp) || ('0' <= *cp && *cp <= '9')
+		mp = NULL;
+		while (is_alpha(*cp) || ('0' <= *cp && *cp <= '9')
 			   || *cp == '-' || *cp == '+')
 			++cp;
 		if (noise && cp - string < 3)
-			wp = _("time zone abbreviation has fewer than 3 characters");
+			mp = _("time zone abbreviation has fewer than 3 characters");
 		if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
-			wp = _("time zone abbreviation has too many characters");
+			mp = _("time zone abbreviation has too many characters");
 		if (*cp != '\0')
-			wp = _("time zone abbreviation differs from POSIX standard");
-		if (wp != NULL)
-		{
-			wp = ecpyalloc(wp);
-			wp = ecatalloc(wp, " (");
-			wp = ecatalloc(wp, string);
-			wp = ecatalloc(wp, ")");
-			warning(wp);
-			ifree(wp);
-		}
+			mp = _("time zone abbreviation differs from POSIX standard");
+		if (mp != NULL)
+			warning("%s (%s)", mp, string);
 	}
 	i = strlen(string) + 1;
 	if (charcnt + i > TZ_MAX_CHARS)
@@ -2819,81 +3606,63 @@
 		error(_("too many, or too long, time zone abbreviations"));
 		exit(EXIT_FAILURE);
 	}
-	(void) strcpy(&chars[charcnt], string);
-	charcnt += eitol(i);
+	strcpy(&chars[charcnt], string);
+	charcnt += i;
 }
 
-static int
-mkdirs(char *argname)
+/* Ensure that the directories of ARGNAME exist, by making any missing
+   ones.  If ANCESTORS, do this only for ARGNAME's ancestors; otherwise,
+   do it for ARGNAME too.  Exit with failure if there is trouble.
+   Do not consider an existing non-directory to be trouble.  */
+static void
+mkdirs(char const * argname, bool ancestors)
 {
 	char	   *name;
 	char	   *cp;
 
-	if (argname == NULL || *argname == '\0')
-		return 0;
 	cp = name = ecpyalloc(argname);
-	while ((cp = strchr(cp + 1, '/')) != NULL)
-	{
-		*cp = '\0';
+
+	/* Do not mkdir a root directory, as it must exist.  */
 #ifdef WIN32
+	if (is_alpha(name[0]) && name[1] == ':')
+		cp += 2;
+#endif
+	while (*cp == '/')
+		cp++;
+
+	while (cp && ((cp = strchr(cp, '/')) || !ancestors))
+	{
+		if (cp)
+			*cp = '\0';
 
 		/*
-		 * DOS drive specifier?
+		 * Try to create it.  It's OK if creation fails because the directory
+		 * already exists, perhaps because some other process just created it.
+		 * For simplicity do not check first whether it already exists, as
+		 * that is checked anyway if the mkdir fails.
 		 */
-		if (isalpha((unsigned char) name[0]) &&
-			name[1] == ':' && name[2] == '\0')
-		{
-			*cp = '/';
-			continue;
-		}
-#endif   /* WIN32 */
-		if (!itsdir(name))
+		if (mkdir(name, MKDIR_UMASK) != 0)
 		{
 			/*
-			 * It doesn't seem to exist, so we try to create it. Creation may
-			 * fail because of the directory being created by some other
-			 * multiprocessor, so we get to do extra checking.
+			 * For speed, skip itsdir if errno == EEXIST.  Since mkdirs is
+			 * called only after open fails with ENOENT on a subfile, EEXIST
+			 * implies itsdir here.
 			 */
-			if (mkdir(name, MKDIR_UMASK) != 0)
-			{
-				const char *e = strerror(errno);
+			int			err = errno;
 
-				if (errno != EEXIST || !itsdir(name))
-				{
-					(void) fprintf(stderr,
-								   _("%s: Cannot create directory %s: %s\n"),
-								   progname, name, e);
-					ifree(name);
-					return -1;
-				}
+			if (err != EEXIST && !itsdir(name))
+			{
+				error(_("%s: Cannot create directory %s: %s"),
+					  progname, name, strerror(err));
+				exit(EXIT_FAILURE);
 			}
 		}
-		*cp = '/';
+		if (cp)
+			*cp++ = '/';
 	}
-	ifree(name);
-	return 0;
+	free(name);
 }
 
-static long
-eitol(int i)
-{
-	long		l;
-
-	l = i;
-	if ((i < 0 && l >= 0) || (i == 0 && l != 0) || (i > 0 && l <= 0))
-	{
-		(void) fprintf(stderr,
-					   _("%s: %d did not sign extend correctly\n"),
-					   progname, i);
-		exit(EXIT_FAILURE);
-	}
-	return l;
-}
-
-/*
- * UNIX was a registered trademark of The Open Group in 2003.
- */
-
 
 #ifdef WIN32
 /*
@@ -2902,18 +3671,11 @@
 int
 link(const char *oldpath, const char *newpath)
 {
-	if (!CopyFile(oldpath, newpath, FALSE))
+	if (!CopyFile(oldpath, newpath, false))
+	{
+		_dosmaperr(GetLastError());
 		return -1;
+	}
 	return 0;
 }
 #endif
-
-/*
- *	This allows zic to compile by just returning a dummy value.
- *	localtime.c references it, but no one uses it from zic.
- */
-int
-pg_open_tzfile(const char *name, char *canonname)
-{
-	return -1;
-}
diff -Nru postgresql-9.5-9.5.2/src/tools/msvc/build.pl postgresql-9.5-9.5.8/src/tools/msvc/build.pl
--- postgresql-9.5-9.5.2/src/tools/msvc/build.pl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/tools/msvc/build.pl	2017-08-07 21:13:41.000000000 +0000
@@ -53,7 +53,7 @@
 if ($buildwhat and $vcver >= 10.00)
 {
 	system(
-"msbuild $buildwhat.vcxproj /verbosity:detailed /p:Configuration=$bconf");
+"msbuild $buildwhat.vcxproj /verbosity:normal /p:Configuration=$bconf");
 }
 elsif ($buildwhat)
 {
@@ -61,7 +61,7 @@
 }
 else
 {
-	system("msbuild pgsql.sln /verbosity:detailed /p:Configuration=$bconf");
+	system("msbuild pgsql.sln /verbosity:normal /p:Configuration=$bconf");
 }
 
 # report status
diff -Nru postgresql-9.5-9.5.2/src/tools/msvc/Install.pm postgresql-9.5-9.5.8/src/tools/msvc/Install.pm
--- postgresql-9.5-9.5.2/src/tools/msvc/Install.pm	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/tools/msvc/Install.pm	2017-08-07 21:13:41.000000000 +0000
@@ -24,8 +24,8 @@
 	'dropdb',        'droplang',       'dropuser',   'ecpg',
 	'libecpg',       'libecpg_compat', 'libpgtypes', 'libpq',
 	'pg_basebackup', 'pg_config',      'pg_dump',    'pg_dumpall',
-	'pg_isready',    'pg_receivexlog', 'pg_restore', 'psql',
-	'reindexdb',     'vacuumdb',       @client_contribs);
+	'pg_isready',    'pg_receivexlog', 'pg_recvlogical', 'pg_restore',
+	'psql', 'reindexdb',     'vacuumdb',       @client_contribs);
 
 sub lcopy
 {
@@ -217,7 +217,7 @@
 	my $conf   = shift;
 	my $target = shift;
 	my $rem =
-	  qr{Project\("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"\) = "([^"]+)"};
+	  qr{Project\("\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942\}"\) = "([^"]+)"};
 
 	my $sln = read_file("pgsql.sln") || croak "Could not open pgsql.sln\n";
 
@@ -380,13 +380,27 @@
 	my $conf   = shift;
 	my $mf     = read_file("src/timezone/Makefile");
 	$mf =~ s{\\\r?\n}{}g;
+
 	$mf =~ /^TZDATA\s*:?=\s*(.*)$/m
-	  || die "Could not find TZDATA row in timezone makefile\n";
+	  || die "Could not find TZDATA line in timezone makefile\n";
 	my @tzfiles = split /\s+/, $1;
-	unshift @tzfiles, '';
+
+	$mf =~ /^POSIXRULES\s*:?=\s*(.*)$/m
+	  || die "Could not find POSIXRULES line in timezone makefile\n";
+	my $posixrules = $1;
+	$posixrules =~ s/\s+//g;
+
 	print "Generating timezone files...";
-	system("$conf\\zic\\zic -d \"$target/share/timezone\" "
-		  . join(" src/timezone/data/", @tzfiles));
+
+	my @args = ("$conf/zic/zic", '-d', "$target/share/timezone",
+				'-p', "$posixrules");
+	foreach (@tzfiles)
+	{
+		my $tzfile = $_;
+		push(@args, "src/timezone/data/$tzfile")
+	}
+
+	system(@args);
 	print "\n";
 }
 
@@ -633,9 +647,10 @@
 		next unless (-d "src/include/$d");
 
 		EnsureDirectories("$target/include/server/$d");
-		system(
-qq{xcopy /s /i /q /r /y src\\include\\$d\\*.h "$ctarget\\include\\server\\$d\\"}
-		) && croak("Failed to copy include directory $d\n");
+		my @args = ('xcopy', '/s', '/i', '/q', '/r', '/y',
+				 "src\\include\\$d\\*.h",
+				 "$ctarget\\include\\server\\$d\\");
+		system(@args) && croak("Failed to copy include directory $d\n");
 	}
 	closedir($D);
 
@@ -688,9 +703,11 @@
 
 			EnsureDirectories($target, "share/locale/$lang",
 				"share/locale/$lang/LC_MESSAGES");
-			system(
-"\"$nlspath\\bin\\msgfmt\" -o \"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo\" $_"
-			) && croak("Could not run msgfmt on $dir\\$_");
+			my @args = ("$nlspath\\bin\\msgfmt",
+			   '-o',
+			   "$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
+			   $_);
+			system(@args) && croak("Could not run msgfmt on $dir\\$_");
 			print ".";
 		}
 	}
diff -Nru postgresql-9.5-9.5.2/src/tools/msvc/Mkvcbuild.pm postgresql-9.5-9.5.8/src/tools/msvc/Mkvcbuild.pm
--- postgresql-9.5-9.5.2/src/tools/msvc/Mkvcbuild.pm	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/tools/msvc/Mkvcbuild.pm	2017-08-07 21:13:41.000000000 +0000
@@ -180,20 +180,24 @@
 
 	if ($solution->{options}->{tcl})
 	{
+		my $found = 0;
 		my $pltcl =
 		  $solution->AddProject('pltcl', 'dll', 'PLs', 'src/pl/tcl');
 		$pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include');
 		$pltcl->AddReference($postgres);
-		if (-e $solution->{options}->{tcl} . '/lib/tcl85.lib')
-		{
-			$pltcl->AddLibrary(
-				$solution->{options}->{tcl} . '/lib/tcl85.lib');
-		}
-		else
+
+		for my $tclver (qw(86t 86 85 84))
 		{
-			$pltcl->AddLibrary(
-				$solution->{options}->{tcl} . '/lib/tcl84.lib');
+			my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib";
+			if (-e $tcllib)
+			{
+				$pltcl->AddLibrary($tcllib);
+				$found = 1;
+				last;
+			}
 		}
+		die "Unable to find $solution->{options}->{tcl}/lib/tcl<version>.lib"
+			unless $found;
 	}
 
 	$libpq = $solution->AddProject('libpq', 'dll', 'interfaces',
@@ -372,8 +376,7 @@
 	$pgrestore->AddLibrary('ws2_32.lib');
 
 	my $zic = $solution->AddProject('zic', 'exe', 'utils');
-	$zic->AddFiles('src/timezone', 'zic.c', 'ialloc.c', 'scheck.c',
-		'localtime.c');
+	$zic->AddFiles('src/timezone', 'zic.c');
 	$zic->AddDirResourceFile('src/timezone');
 	$zic->AddReference($libpgcommon, $libpgport);
 
@@ -505,7 +508,26 @@
 		my $plperl =
 		  $solution->AddProject('plperl', 'dll', 'PLs', 'src/pl/plperl');
 		$plperl->AddIncludeDir($solution->{options}->{perl} . '/lib/CORE');
-		$plperl->AddDefine('PLPERL_HAVE_UID_GID');
+
+		# Add defines from Perl's ccflags; see PGAC_CHECK_PERL_EMBED_CCFLAGS
+		my @perl_embed_ccflags;
+		foreach my $f (split(" ",$Config{ccflags}))
+		{
+			if ($f =~ /^-D[^_]/)
+			{
+				$f =~ s/\-D//;
+				push(@perl_embed_ccflags, $f);
+			}
+		}
+
+		# XXX this probably is redundant now?
+		push(@perl_embed_ccflags, 'PLPERL_HAVE_UID_GID');
+
+		foreach my $f (@perl_embed_ccflags)
+		{
+			$plperl->AddDefine($f);
+		}
+
 		foreach my $xs ('SPI.xs', 'Util.xs')
 		{
 			(my $xsc = $xs) =~ s/\.xs/.c/;
@@ -588,7 +610,11 @@
 			'hstore_plperl', 'contrib/hstore_plperl',
 			'plperl',        'src/pl/plperl',
 			'hstore',        'contrib/hstore');
-		$hstore_plperl->AddDefine('PLPERL_HAVE_UID_GID');
+
+		foreach my $f (@perl_embed_ccflags)
+		{
+			$hstore_plperl->AddDefine($f);
+		}
 	}
 
 	$mf =
diff -Nru postgresql-9.5-9.5.2/src/tools/msvc/MSBuildProject.pm postgresql-9.5-9.5.8/src/tools/msvc/MSBuildProject.pm
--- postgresql-9.5-9.5.2/src/tools/msvc/MSBuildProject.pm	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/tools/msvc/MSBuildProject.pm	2017-08-07 21:13:41.000000000 +0000
@@ -465,4 +465,27 @@
 	return $self;
 }
 
+package VC2015Project;
+
+#
+# Package that encapsulates a Visual C++ 2015 project file
+#
+
+use strict;
+use warnings;
+use base qw(VC2012Project);
+
+sub new
+{
+	my $classname = shift;
+	my $self      = $classname->SUPER::_new(@_);
+	bless($self, $classname);
+
+	$self->{vcver}           = '14.00';
+	$self->{PlatformToolset} = 'v140';
+	$self->{ToolsVersion}    = '14.0';
+
+	return $self;
+}
+
 1;
diff -Nru postgresql-9.5-9.5.2/src/tools/msvc/Solution.pm postgresql-9.5-9.5.8/src/tools/msvc/Solution.pm
--- postgresql-9.5-9.5.2/src/tools/msvc/Solution.pm	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/tools/msvc/Solution.pm	2017-08-07 21:13:41.000000000 +0000
@@ -496,10 +496,20 @@
 	if ($self->{options}->{openssl})
 	{
 		$proj->AddIncludeDir($self->{options}->{openssl} . '\include');
-		$proj->AddLibrary(
-			$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
-		$proj->AddLibrary(
-			$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
+		if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
+		{
+			$proj->AddLibrary(
+				$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
+			$proj->AddLibrary(
+				$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
+		}
+		else
+		{
+			$proj->AddLibrary(
+				$self->{options}->{openssl} . '\lib\ssleay32.lib', 1);
+			$proj->AddLibrary(
+				$self->{options}->{openssl} . '\lib\libeay32.lib', 1);
+		}
 	}
 	if ($self->{options}->{nls})
 	{
@@ -521,6 +531,7 @@
 	if ($self->{options}->{xml})
 	{
 		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
+		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
 		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
 	}
 	if ($self->{options}->{xslt})
@@ -761,6 +772,32 @@
 	$self->{MinimumVisualStudioVersion} = '10.0.40219.1';
 
 	return $self;
+}
+
+package VS2015Solution;
+
+#
+# Package that encapsulates a Visual Studio 2015 solution file
+#
+
+use Carp;
+use strict;
+use warnings;
+use base qw(Solution);
+
+sub new
+{
+	my $classname = shift;
+	my $self      = $classname->SUPER::_new(@_);
+	bless($self, $classname);
+
+	$self->{solutionFileVersion}        = '12.00';
+	$self->{vcver}                      = '14.00';
+	$self->{visualStudioName}           = 'Visual Studio 2015';
+	$self->{VisualStudioVersion}        = '14.0.24730.2';
+	$self->{MinimumVisualStudioVersion} = '10.0.40219.1';
+
+	return $self;
 }
 
 sub GetAdditionalHeaders
diff -Nru postgresql-9.5-9.5.2/src/tools/msvc/vcregress.pl postgresql-9.5-9.5.8/src/tools/msvc/vcregress.pl
--- postgresql-9.5-9.5.2/src/tools/msvc/vcregress.pl	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/tools/msvc/vcregress.pl	2017-08-07 21:13:41.000000000 +0000
@@ -34,7 +34,7 @@
 
 my $what = shift || "";
 if ($what =~
-/^(check|installcheck|plcheck|contribcheck|modulescheck|ecpgcheck|isolationcheck|upgradecheck|bincheck)$/i
+/^(check|installcheck|plcheck|contribcheck|modulescheck|ecpgcheck|isolationcheck|upgradecheck|bincheck|taptest)$/i
   )
 {
 	$what = uc $what;
@@ -54,13 +54,6 @@
 
 $ENV{PATH} = "$topdir/$Config/libpq;$ENV{PATH}";
 
-my $schedule = shift;
-unless ($schedule)
-{
-	$schedule = "serial";
-	$schedule = "parallel" if ($what eq 'CHECK' || $what =~ /PARALLEL/);
-}
-
 if ($ENV{PERL5LIB})
 {
 	$ENV{PERL5LIB} = "$topdir/src/tools/msvc;$ENV{PERL5LIB}";
@@ -89,13 +82,14 @@
 	MODULESCHECK   => \&modulescheck,
 	ISOLATIONCHECK => \&isolationcheck,
 	BINCHECK       => \&bincheck,
-	UPGRADECHECK   => \&upgradecheck,);
+	UPGRADECHECK   => \&upgradecheck,
+	TAPTEST        => \&taptest,);
 
 my $proc = $command{$what};
 
 exit 3 unless $proc;
 
-&$proc();
+&$proc(@ARGV);
 
 exit 0;
 
@@ -103,6 +97,7 @@
 
 sub installcheck
 {
+	my $schedule = shift || 'serial';
 	my @args = (
 		"../../../$Config/pg_regress/pg_regress",
 		"--dlpath=.",
@@ -118,6 +113,7 @@
 
 sub check
 {
+	my $schedule = shift || 'parallel';
 	InstallTemp();
 	chdir "${topdir}/src/test/regress";
 	my @args = (
@@ -143,8 +139,8 @@
 	exit $status if $status;
 	InstallTemp();
 	chdir "$topdir/src/interfaces/ecpg/test";
-	$schedule = "ecpg";
-	my @args = (
+	my $schedule = "ecpg";
+	my @args     = (
 		"../../../../$Config/pg_regress_ecpg/pg_regress_ecpg",
 		"--bindir=",
 		"--dbname=regress1,connectdb",
@@ -180,10 +176,19 @@
 	die "Tap tests not enabled in configuration"
 	  unless $config->{tap_tests};
 
+	my @flags;
+	foreach my $arg (0 .. scalar(@_))
+	{
+		next unless $_[$arg] =~ /^PROVE_FLAGS=(.*)/;
+		@flags = split(/\s+/, $1);
+		splice(@_,$arg,1);
+		last;
+	}
+
 	my $dir = shift;
 	chdir $dir;
 
-	my @args = ( "prove", "--verbose", "t/*.pl");
+	my @args = ("prove", @flags, "t/*.pl");
 
 	# adjust the environment for just this test
 	local %ENV = %ENV;
@@ -217,6 +222,26 @@
 	exit $mstat if $mstat;
 }
 
+sub taptest
+{
+	my $dir = shift;
+	my @args;
+
+	if ($dir =~ /^PROVE_FLAGS=/)
+	{
+		push(@args, $dir);
+		$dir = shift;
+	}
+
+	die "no tests found!" unless -d "$topdir/$dir/t";
+
+	push(@args,"$topdir/$dir");
+
+	InstallTemp();
+	my $status = tap_check(@args);
+	exit $status if $status;
+}
+
 sub plcheck
 {
 	chdir "../../pl";
@@ -369,6 +394,41 @@
 			$ENV{PGDATA}) == 0);
 }
 
+# This is similar to appendShellString().  Perl system(@args) bypasses
+# cmd.exe, so omit the caret escape layer.
+sub quote_system_arg
+{
+	my $arg = shift;
+
+	# Change N >= 0 backslashes before a double quote to 2N+1 backslashes.
+	$arg =~ s/(\\*)"/${\($1 . $1)}\\"/gs;
+
+	# Change N >= 1 backslashes at end of argument to 2N backslashes.
+	$arg =~ s/(\\+)$/${\($1 . $1)}/gs;
+
+	# Wrap the whole thing in unescaped double quotes.
+	return "\"$arg\"";
+}
+
+# Generate a database with a name made of a range of ASCII characters, useful
+# for testing pg_upgrade.
+sub generate_db
+{
+	my ($prefix, $from_char, $to_char, $suffix) = @_;
+
+	my $dbname = $prefix;
+	for my $i ($from_char .. $to_char)
+	{
+		next if $i == 7 || $i == 10 || $i == 13;    # skip BEL, LF, and CR
+		$dbname = $dbname . sprintf('%c', $i);
+	}
+	$dbname .= $suffix;
+
+	system('createdb', quote_system_arg($dbname));
+	my $status = $? >> 8;
+	exit $status if $status;
+}
+
 sub upgradecheck
 {
 	my $status;
@@ -400,35 +460,47 @@
 	print "\nRunning initdb on old cluster\n\n";
 	standard_initdb() or exit 1;
 	print "\nStarting old cluster\n\n";
-	system("pg_ctl start -l $logdir/postmaster1.log -w") == 0 or exit 1;
+	my @args = ('pg_ctl', 'start', '-l', "$logdir/postmaster1.log", '-w');
+	system(@args) == 0 or exit 1;
+
+	print "\nCreating databases with names covering most ASCII bytes\n\n";
+	generate_db("\\\"\\", 1,  45,  "\\\\\"\\\\\\");
+	generate_db('',       46, 90,  '');
+	generate_db('',       91, 127, '');
+
 	print "\nSetting up data for upgrading\n\n";
 	installcheck();
 
 	# now we can chdir into the source dir
 	chdir "$topdir/src/bin/pg_upgrade";
 	print "\nDumping old cluster\n\n";
-	system("pg_dumpall -f $tmp_root/dump1.sql") == 0 or exit 1;
+	@args = ('pg_dumpall', '-f', "$tmp_root/dump1.sql");
+	system(@args) == 0 or exit 1;
 	print "\nStopping old cluster\n\n";
 	system("pg_ctl -m fast stop") == 0 or exit 1;
 	$ENV{PGDATA} = "$data";
 	print "\nSetting up new cluster\n\n";
 	standard_initdb() or exit 1;
 	print "\nRunning pg_upgrade\n\n";
-	system("pg_upgrade -d $data.old -D $data -b $bindir -B $bindir") == 0
-	  or exit 1;
+	@args = ('pg_upgrade', '-d', "$data.old", '-D', $data, '-b', $bindir,
+			 '-B', $bindir);
+	system(@args) == 0 or exit 1;
 	print "\nStarting new cluster\n\n";
-	system("pg_ctl -l $logdir/postmaster2.log -w start") == 0 or exit 1;
+	@args = ('pg_ctl', '-l', "$logdir/postmaster2.log", '-w', 'start');
+	system(@args) == 0 or exit 1;
 	print "\nSetting up stats on new cluster\n\n";
 	system(".\\analyze_new_cluster.bat") == 0 or exit 1;
 	print "\nDumping new cluster\n\n";
-	system("pg_dumpall -f $tmp_root/dump2.sql") == 0 or exit 1;
+	@args = ('pg_dumpall', '-f', "$tmp_root/dump2.sql");
+	system(@args) == 0 or exit 1;
 	print "\nStopping new cluster\n\n";
 	system("pg_ctl -m fast stop") == 0 or exit 1;
 	print "\nDeleting old cluster\n\n";
 	system(".\\delete_old_cluster.bat") == 0 or exit 1;
 	print "\nComparing old and new cluster dumps\n\n";
 
-	system("diff -q $tmp_root/dump1.sql $tmp_root/dump2.sql");
+	@args = ('diff', '-q', "$tmp_root/dump1.sql", "$tmp_root/dump2.sql");
+	system(@args);
 	$status = $?;
 	if (!$status)
 	{
@@ -455,7 +527,6 @@
 	$m =~ s{\\\r?\n}{}g;
 	if ($m =~ /^\s*REGRESS_OPTS\s*\+?=(.*)/m)
 	{
-
 		# Substitute known Makefile variables, then ignore options that retain
 		# an unhandled variable reference.  Ignore anything that isn't an
 		# option starting with "--".
@@ -528,15 +599,33 @@
 
 sub InstallTemp
 {
-	print "Setting up temp install\n\n";
-	Install("$tmp_installdir", "all", $config);
+	unless ($ENV{NO_TEMP_INSTALL})
+	{
+		print "Setting up temp install\n\n";
+		Install("$tmp_installdir", "all", $config);
+	}
 	$ENV{PATH} = "$tmp_installdir/bin;$ENV{PATH}";
 }
 
 sub usage
 {
 	print STDERR
-	  "Usage: vcregress.pl ",
-"<check|installcheck|plcheck|contribcheck|isolationcheck|ecpgcheck|upgradecheck> [schedule]\n";
+	  "Usage: vcregress.pl <mode> [ <arg>]\n\n",
+	  "Options for <mode>:\n",
+	  "  bincheck       run tests of utilities in src/bin/\n",
+	  "  check          deploy instance and run regression tests on it\n",
+	  "  contribcheck   run tests of modules in contrib/\n",
+	  "  ecpgcheck      run regression tests of ECPG\n",
+	  "  installcheck   run regression tests on existing instance\n",
+	  "  isolationcheck run isolation tests\n",
+	  "  modulescheck   run tests of modules in src/test/modules/\n",
+	  "  plcheck        run tests of PL languages\n",
+	  "  taptest        run an arbitrary TAP test set\n",
+	  "  upgradecheck   run tests of pg_upgrade\n",
+	  "\nOptions for <arg>: (used by check and installcheck)\n",
+	  "  serial         serial mode\n",
+	  "  parallel       parallel mode\n",
+	  "\nOption for <arg>: for taptest\n",
+	  "  TEST_DIR       (required) directory where tests reside\n";
 	exit(1);
 }
diff -Nru postgresql-9.5-9.5.2/src/tools/msvc/VSObjectFactory.pm postgresql-9.5-9.5.8/src/tools/msvc/VSObjectFactory.pm
--- postgresql-9.5-9.5.2/src/tools/msvc/VSObjectFactory.pm	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/tools/msvc/VSObjectFactory.pm	2017-08-07 21:13:41.000000000 +0000
@@ -49,6 +49,10 @@
 	{
 		return new VS2013Solution(@_);
 	}
+	elsif ($visualStudioVersion eq '14.00')
+	{
+		return new VS2015Solution(@_);
+	}
 	else
 	{
 		croak "The requested Visual Studio version is not supported.";
@@ -84,6 +88,10 @@
 	{
 		return new VC2013Project(@_);
 	}
+	elsif ($visualStudioVersion eq '14.00')
+	{
+		return new VC2015Project(@_);
+	}
 	else
 	{
 		croak "The requested Visual Studio version is not supported.";
@@ -112,11 +120,11 @@
 sub _GetVisualStudioVersion
 {
 	my ($major, $minor) = @_;
-	if ($major > 12)
+	if ($major > 14)
 	{
 		carp
 "The determined version of Visual Studio is newer than the latest supported version. Returning the latest supported version instead.";
-		return '12.00';
+		return '14.00';
 	}
 	elsif ($major < 6)
 	{
diff -Nru postgresql-9.5-9.5.2/src/tools/pgindent/pgindent postgresql-9.5-9.5.8/src/tools/pgindent/pgindent
--- postgresql-9.5-9.5.2/src/tools/pgindent/pgindent	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/tools/pgindent/pgindent	2017-08-07 21:13:41.000000000 +0000
@@ -453,7 +453,7 @@
 	chdir "$code_base/src/tools/pgindent";
 
 	my $typedefs_list_url =
-	  "http://buildfarm.postgresql.org/cgi-bin/typedefs.pl";
+	  "https://buildfarm.postgresql.org/cgi-bin/typedefs.pl";
 
 	my $rv = getstore($typedefs_list_url, "tmp_typedefs.list");
 
@@ -463,7 +463,7 @@
 	$ENV{PGTYPEDEFS} = abs_path('tmp_typedefs.list');
 
 	my $pg_bsd_indent_url =
-	    "ftp://ftp.postgresql.org/pub/dev/pg_bsd_indent-"
+	    "https://ftp.postgresql.org/pub/dev/pg_bsd_indent-"
 	  . $INDENT_VERSION
 	  . ".tar.gz";
 
diff -Nru postgresql-9.5-9.5.2/src/tools/pgindent/README postgresql-9.5-9.5.8/src/tools/pgindent/README
--- postgresql-9.5-9.5.2/src/tools/pgindent/README	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/tools/pgindent/README	2017-08-07 21:13:41.000000000 +0000
@@ -20,7 +20,7 @@
 
 5) Download the typedef file from the buildfarm:
 
-	wget -O src/tools/pgindent/typedefs.list http://buildfarm.postgresql.org/cgi-bin/typedefs.pl
+	wget -O src/tools/pgindent/typedefs.list https://buildfarm.postgresql.org/cgi-bin/typedefs.pl
 
    (see http://www.pgbuildfarm.org/cgi-bin/typedefs.pl?show_list for a full list of typedefs,
     also http://adpgtech.blogspot.com/2015/05/running-pgindent-on-non-core-code-or.html)
@@ -67,7 +67,7 @@
 We have standardized on NetBSD's indent, and renamed it pg_bsd_indent.
 We have fixed a few bugs which requre the NetBSD source to be patched
 with indent.bsd.patch patch.  A fully patched version is available at
-ftp://ftp.postgresql.org/pub/dev.
+https://ftp.postgresql.org/pub/dev.
 
 GNU indent, version 2.2.6, has several problems, and is not recommended.
 These bugs become pretty major when you are doing >500k lines of code.
diff -Nru postgresql-9.5-9.5.2/src/tools/RELEASE_CHANGES postgresql-9.5-9.5.8/src/tools/RELEASE_CHANGES
--- postgresql-9.5-9.5.2/src/tools/RELEASE_CHANGES	2016-03-28 20:07:39.000000000 +0000
+++ postgresql-9.5-9.5.8/src/tools/RELEASE_CHANGES	2017-08-07 21:13:41.000000000 +0000
@@ -11,7 +11,7 @@
 	o run spellchecker on result
 	o add SGML markup
 
-* Update timezone data to match latest zic database and new
+* Update timezone data to match latest IANA timezone database and new
   Windows releases, if any (see src/timezone/README)
 
 * Translation updates